From f7275b7ad98d54b59be8498ac2fbbf29f215f7a8 Mon Sep 17 00:00:00 2001
From: Alex Kremer <akremer@ripple.com>
Date: Wed, 29 Apr 2026 16:17:35 +0100
Subject: [PATCH 01/11] chore: Enable clang-tidy v21 new checks (#7031)

---
 .clang-tidy                                   |   5 +
 include/xrpl/basics/Log.h                     |   3 +
 include/xrpl/basics/Mutex.hpp                 |   4 +-
 include/xrpl/basics/Number.h                  |  16 +-
 include/xrpl/basics/SlabAllocator.h           |   4 +-
 include/xrpl/basics/TaggedCache.h             |   6 +-
 include/xrpl/basics/TaggedCache.ipp           |  40 +-
 include/xrpl/basics/hardened_hash.h           |   2 +-
 include/xrpl/basics/random.h                  |   2 +-
 include/xrpl/beast/asio/io_latency_probe.h    |  10 +-
 include/xrpl/beast/test/yield_to.h            |   2 +-
 include/xrpl/beast/unit_test/match.h          |  32 +-
 include/xrpl/beast/unit_test/reporter.h       |   2 +
 include/xrpl/beast/unit_test/runner.h         |   8 +-
 include/xrpl/beast/unit_test/suite.h          |   8 +-
 include/xrpl/beast/utility/Journal.h          |   2 +
 include/xrpl/core/ClosureCounter.h            |   6 +-
 include/xrpl/core/Coro.ipp                    |  16 +-
 include/xrpl/core/Job.h                       |   2 +
 include/xrpl/core/PeerReservationTable.h      |   2 +-
 include/xrpl/core/detail/semaphore.h          |   4 +-
 include/xrpl/json/Writer.h                    |   2 +-
 include/xrpl/json/json_reader.h               |   2 +
 include/xrpl/json/json_value.h                |   6 +
 include/xrpl/ledger/ApplyView.h               |   2 +
 include/xrpl/ledger/PendingSaves.h            |   8 +-
 include/xrpl/ledger/helpers/AMMHelpers.h      |  45 +-
 include/xrpl/ledger/helpers/LendingHelpers.h  |   2 +-
 include/xrpl/ledger/helpers/TokenHelpers.h    |  14 +-
 include/xrpl/nodestore/NodeObject.h           |   2 +-
 include/xrpl/nodestore/Types.h                |   4 +-
 include/xrpl/nodestore/detail/codec.h         |   6 +-
 include/xrpl/protocol/ErrorCodes.h            |   4 +
 include/xrpl/protocol/LedgerFormats.h         |   4 +
 include/xrpl/protocol/MultiApiJson.h          |   7 +-
 include/xrpl/protocol/Permissions.h           |   5 +
 include/xrpl/protocol/SField.h                |   4 +
 include/xrpl/protocol/SOTemplate.h            |   5 +-
 include/xrpl/protocol/STAmount.h              |   2 +-
 include/xrpl/protocol/STBase.h                |   2 +
 include/xrpl/protocol/STObject.h              |   8 +-
 include/xrpl/protocol/STPathSet.h             |   2 +
 include/xrpl/protocol/SeqProxy.h              |   6 +-
 include/xrpl/protocol/TER.h                   |  12 +
 include/xrpl/protocol/TxFormats.h             |   2 +
 include/xrpl/resource/Disposition.h           |   2 +-
 include/xrpl/resource/detail/Entry.h          |   2 +-
 include/xrpl/resource/detail/Kind.h           |   2 +-
 include/xrpl/resource/detail/Logic.h          |  48 +-
 include/xrpl/resource/detail/Tuning.h         |   2 +
 include/xrpl/server/LoadFeeTrack.h            |  18 +-
 include/xrpl/server/detail/BaseHTTPPeer.h     |  10 +-
 include/xrpl/server/detail/ServerImpl.h       |   2 +
 include/xrpl/server/detail/io_list.h          |   4 +-
 include/xrpl/shamap/FullBelowCache.h          |   2 +
 include/xrpl/tx/Transactor.h                  |   2 +
 include/xrpl/tx/applySteps.h                  |   2 +-
 .../tx/invariants/InvariantCheckPrivilege.h   |   2 +
 include/xrpl/tx/invariants/MPTInvariant.h     |   4 +-
 include/xrpl/tx/paths/detail/Steps.h          |   2 +-
 include/xrpl/tx/paths/detail/StrandFlow.h     |   7 +-
 .../tx/transactors/account/SignerListSet.h    |   4 +-
 .../tx/transactors/system/LedgerStateFix.h    |   2 +-
 src/libxrpl/basics/Log.cpp                    |  14 +-
 src/libxrpl/basics/Number.cpp                 |  15 +-
 src/libxrpl/basics/ResolverAsio.cpp           |   2 +-
 .../beast/clock/basic_seconds_clock.cpp       |   2 +-
 src/libxrpl/beast/insight/StatsDCollector.cpp |   8 +-
 .../beast/utility/beast_PropertyStream.cpp    |  20 +-
 src/libxrpl/core/HashRouter.cpp               |  14 +-
 src/libxrpl/core/detail/JobQueue.cpp          |  18 +-
 src/libxrpl/core/detail/LoadMonitor.cpp       |   6 +-
 src/libxrpl/core/detail/Workers.cpp           |  10 +-
 src/libxrpl/crypto/csprng.cpp                 |   4 +-
 src/libxrpl/json/Output.cpp                   |   4 +-
 src/libxrpl/json/Writer.cpp                   |  16 +-
 src/libxrpl/ledger/AcceptedLedgerTx.cpp       |   4 +-
 src/libxrpl/ledger/BookListeners.cpp          |   6 +-
 src/libxrpl/ledger/CachedView.cpp             |   4 +-
 src/libxrpl/ledger/Ledger.cpp                 |   2 +-
 src/libxrpl/ledger/helpers/AMMHelpers.cpp     |  11 +-
 src/libxrpl/ledger/helpers/LendingHelpers.cpp |  25 +-
 src/libxrpl/ledger/helpers/TokenHelpers.cpp   |  20 +-
 src/libxrpl/nodestore/BatchWriter.cpp         |   4 +-
 src/libxrpl/nodestore/Database.cpp            |   4 +-
 src/libxrpl/nodestore/DatabaseNodeImp.cpp     |  10 +-
 src/libxrpl/nodestore/DatabaseRotatingImp.cpp |  28 +-
 src/libxrpl/nodestore/DecodedBlob.cpp         |  10 +-
 src/libxrpl/nodestore/ManagerImp.cpp          |   6 +-
 .../nodestore/backend/MemoryFactory.cpp       |  14 +-
 src/libxrpl/nodestore/backend/NuDBFactory.cpp |  12 +-
 src/libxrpl/nodestore/backend/NullFactory.cpp |   2 +-
 .../nodestore/backend/RocksDBFactory.cpp      |  15 +-
 src/libxrpl/protocol/AccountID.cpp            |   4 +-
 src/libxrpl/protocol/Rules.cpp                |   4 +-
 src/libxrpl/protocol/STAmount.cpp             |   2 +-
 src/libxrpl/protocol/STNumber.cpp             |   2 +-
 src/libxrpl/protocol/STObject.cpp             |  12 +-
 src/libxrpl/protocol/STTx.cpp                 |   2 +-
 src/libxrpl/rdb/DatabaseCon.cpp               |   6 +-
 src/libxrpl/rdb/SociDB.cpp                    |   6 +-
 src/libxrpl/resource/Consumer.cpp             |   4 +-
 src/libxrpl/resource/ResourceManager.cpp      |   2 +-
 src/libxrpl/server/InfoSub.cpp                |   8 +-
 src/libxrpl/server/LoadFeeTrack.cpp           |   4 +-
 src/libxrpl/shamap/SHAMap.cpp                 |   2 +-
 src/libxrpl/shamap/SHAMapDelta.cpp            |   6 +-
 src/libxrpl/shamap/SHAMapInnerNode.cpp        |   8 +-
 src/libxrpl/shamap/SHAMapNodeID.cpp           |   2 +
 src/libxrpl/tx/applySteps.cpp                 |   6 +-
 src/libxrpl/tx/invariants/AMMInvariant.cpp    |  12 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp  |  11 +-
 src/libxrpl/tx/invariants/MPTInvariant.cpp    |  21 +-
 src/libxrpl/tx/paths/BookStep.cpp             |   2 +-
 src/libxrpl/tx/paths/DirectStep.cpp           |   9 +-
 src/libxrpl/tx/paths/MPTEndpointStep.cpp      |  12 +-
 src/libxrpl/tx/paths/OfferStream.cpp          |  12 +-
 src/libxrpl/tx/paths/XRPEndpointStep.cpp      |   2 +-
 .../tx/transactors/account/AccountSet.cpp     |   8 +-
 .../tx/transactors/account/SignerListSet.cpp  |  16 +-
 .../tx/transactors/check/CheckCash.cpp        |   4 +-
 .../tx/transactors/dex/OfferCreate.cpp        |  23 +-
 .../tx/transactors/escrow/EscrowCreate.cpp    |  11 +-
 .../lending/LoanBrokerCoverClawback.cpp       |  12 +-
 .../lending/LoanBrokerCoverWithdraw.cpp       |   2 +-
 .../transactors/lending/LoanBrokerDelete.cpp  |   3 +-
 .../tx/transactors/lending/LoanDelete.cpp     |   2 +-
 .../tx/transactors/lending/LoanManage.cpp     |   6 +-
 .../tx/transactors/lending/LoanPay.cpp        |  38 +-
 .../tx/transactors/lending/LoanSet.cpp        |   2 +-
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp |  11 +-
 .../tx/transactors/system/LedgerStateFix.cpp  |   6 +-
 src/libxrpl/tx/transactors/token/Clawback.cpp |  22 +-
 src/test/app/AMMExtended_test.cpp             |   2 +-
 src/test/app/AMM_test.cpp                     |   9 +-
 src/test/app/Delegate_test.cpp                |  10 +-
 src/test/app/Invariants_test.cpp              |   2 +-
 src/test/app/LedgerHistory_test.cpp           |   4 +-
 src/test/app/LoanBroker_test.cpp              |  74 +-
 src/test/app/Loan_test.cpp                    |  43 +-
 src/test/app/MPToken_test.cpp                 |  52 +-
 src/test/app/NFTokenBurn_test.cpp             |   4 +-
 src/test/app/NFTokenDir_test.cpp              |  14 +-
 src/test/app/OfferMPT_test.cpp                |  64 +-
 src/test/app/Offer_test.cpp                   |  84 +--
 src/test/app/Path_test.cpp                    |   2 +-
 src/test/app/XChain_test.cpp                  |  41 +-
 src/test/basics/IOUAmount_test.cpp            |   3 +-
 src/test/basics/Number_test.cpp               | 210 +++---
 .../beast/beast_io_latency_probe_test.cpp     |   2 +-
 src/test/consensus/NegativeUNL_test.cpp       |   4 +-
 src/test/core/Coroutine_test.cpp              |   2 +-
 src/test/core/Workers_test.cpp                |   2 +-
 src/test/jtx/AMMTest.h                        |   2 +-
 src/test/jtx/Account.h                        |   2 +-
 src/test/jtx/CaptureLogs.h                    |   4 +-
 src/test/jtx/TestHelpers.h                    |   2 +-
 src/test/jtx/directory.h                      |   2 +-
 src/test/jtx/impl/AMMTest.cpp                 |   2 +-
 src/test/jtx/impl/Account.cpp                 |   9 +-
 src/test/jtx/impl/WSClient.cpp                |   4 +-
 src/test/jtx/impl/directory.cpp               |  14 +-
 src/test/jtx/impl/ledgerStateFixes.cpp        |   5 +-
 src/test/ledger/PaymentSandbox_test.cpp       |  83 ++-
 src/test/ledger/View_test.cpp                 |  65 +-
 src/test/nodestore/TestBase.h                 |  16 +-
 src/test/nodestore/Timing_test.cpp            |   6 +-
 src/test/nodestore/import_test.cpp            |   2 +-
 src/test/overlay/TMGetObjectByHash_test.cpp   |   3 +-
 src/test/overlay/reduce_relay_test.cpp        |   7 +-
 src/test/overlay/short_read_test.cpp          |   6 +-
 src/test/protocol/MultiApiJson_test.cpp       |  14 +-
 src/test/protocol/STNumber_test.cpp           |   7 +-
 src/test/protocol/SeqProxy_test.cpp           |   6 +-
 src/test/resource/Logic_test.cpp              |   8 +-
 src/test/rpc/AMMInfo_test.cpp                 |  34 +-
 src/test/rpc/GetAggregatePrice_test.cpp       |   3 +-
 src/test/rpc/RPCCall_test.cpp                 | 701 +++++++++---------
 src/test/shamap/FetchPack_test.cpp            |   2 +
 src/test/shamap/common.h                      |   4 +-
 src/test/unit_test/SuiteJournal.h             |   2 +-
 src/test/unit_test/multi_runner.cpp           |  10 +-
 src/test/unit_test/multi_runner.h             |   2 +
 src/tests/libxrpl/basics/Mutex.cpp            |   2 +-
 src/tests/libxrpl/json/Writer.cpp             |  26 +-
 src/xrpld/app/consensus/RCLConsensus.cpp      |  12 +-
 src/xrpld/app/consensus/RCLConsensus.h        |   2 +-
 src/xrpld/app/ledger/AccountStateSF.cpp       |   3 +-
 src/xrpld/app/ledger/LedgerHolder.h           |   6 +-
 src/xrpld/app/ledger/LedgerMaster.h           |   2 +-
 src/xrpld/app/ledger/LedgerReplayer.h         |   6 +-
 src/xrpld/app/ledger/LedgerToJson.h           |   2 +
 src/xrpld/app/ledger/OpenLedger.h             |   2 +-
 src/xrpld/app/ledger/OrderBookDBImpl.cpp      |  16 +-
 src/xrpld/app/ledger/TransactionStateSF.cpp   |   3 +-
 src/xrpld/app/ledger/detail/BuildLedger.cpp   |   4 +-
 src/xrpld/app/ledger/detail/InboundLedger.cpp |  13 +-
 .../app/ledger/detail/InboundLedgers.cpp      |   4 +-
 .../app/ledger/detail/InboundTransactions.cpp |  12 +-
 src/xrpld/app/ledger/detail/LedgerCleaner.cpp |  14 +-
 src/xrpld/app/ledger/detail/LedgerMaster.cpp  |  60 +-
 .../app/ledger/detail/LedgerReplayer.cpp      |  14 +-
 src/xrpld/app/ledger/detail/LedgerToJson.cpp  |   2 +-
 src/xrpld/app/ledger/detail/LocalTxs.cpp      |   8 +-
 src/xrpld/app/ledger/detail/OpenLedger.cpp    |  12 +-
 .../app/ledger/detail/TransactionAcquire.cpp  |   2 +
 .../app/ledger/detail/TransactionMaster.cpp   |   4 +-
 src/xrpld/app/main/Application.cpp            |   2 +-
 src/xrpld/app/main/LoadManager.cpp            |   6 +-
 src/xrpld/app/main/Main.cpp                   |   2 +-
 src/xrpld/app/misc/NegativeUNLVote.cpp        |  13 +-
 src/xrpld/app/misc/NegativeUNLVote.h          |   2 +-
 src/xrpld/app/misc/NetworkOPs.cpp             | 115 +--
 src/xrpld/app/misc/SHAMapStoreImp.cpp         |  44 +-
 src/xrpld/app/misc/SHAMapStoreImp.h           |   4 +-
 src/xrpld/app/misc/Transaction.h              |   4 +-
 src/xrpld/app/misc/TxQ.h                      |   6 +-
 src/xrpld/app/misc/ValidatorList.h            |  14 +-
 src/xrpld/app/misc/ValidatorSite.h            |  12 +-
 src/xrpld/app/misc/detail/AmendmentTable.cpp  |  56 +-
 src/xrpld/app/misc/detail/Transaction.cpp     |  14 +-
 src/xrpld/app/misc/detail/TxQ.cpp             |  26 +-
 src/xrpld/app/misc/detail/ValidatorList.cpp   |  22 +-
 src/xrpld/app/misc/detail/ValidatorSite.cpp   |  40 +-
 src/xrpld/app/rdb/backend/detail/Node.cpp     |   3 +-
 src/xrpld/consensus/Consensus.h               |   4 +-
 src/xrpld/consensus/ConsensusParms.h          |  14 +-
 src/xrpld/consensus/DisputedTx.h              |   2 +-
 src/xrpld/consensus/Validations.h             |  52 +-
 src/xrpld/overlay/detail/Cluster.cpp          |   8 +-
 src/xrpld/overlay/detail/Message.cpp          |   3 +-
 src/xrpld/overlay/detail/OverlayImpl.cpp      |  36 +-
 src/xrpld/overlay/detail/OverlayImpl.h        |   4 +-
 src/xrpld/overlay/detail/PeerImp.cpp          |  59 +-
 src/xrpld/overlay/detail/PeerImp.h            |   6 +-
 .../overlay/detail/PeerReservationTable.cpp   |   8 +-
 src/xrpld/overlay/detail/TrafficCount.h       | 233 +++---
 src/xrpld/overlay/detail/Tuning.h             |   2 +
 src/xrpld/overlay/detail/TxMetrics.cpp        |   8 +-
 src/xrpld/peerfinder/Slot.h                   |   2 +-
 src/xrpld/peerfinder/detail/Checker.h         |   6 +-
 src/xrpld/peerfinder/detail/Counts.h          |  12 +-
 src/xrpld/peerfinder/detail/Logic.h           |  74 +-
 .../peerfinder/detail/PeerfinderManager.cpp   |   2 +-
 src/xrpld/peerfinder/detail/SlotImp.cpp       |  17 +-
 src/xrpld/peerfinder/detail/StoreSqdb.h       |   2 +
 src/xrpld/peerfinder/detail/Tuning.h          |   4 +
 src/xrpld/perflog/detail/PerfLogImp.cpp       |  34 +-
 src/xrpld/rpc/detail/AssetCache.cpp           |   4 +-
 src/xrpld/rpc/detail/Handler.h                |   2 +
 src/xrpld/rpc/detail/PathRequest.cpp          |  14 +-
 src/xrpld/rpc/detail/PathRequestManager.cpp   |  12 +-
 src/xrpld/rpc/detail/Pathfinder.cpp           |  72 +-
 src/xrpld/rpc/detail/Pathfinder.h             |   4 +-
 src/xrpld/rpc/detail/RPCSub.cpp               |   8 +-
 src/xrpld/rpc/detail/ServerHandler.cpp        |   6 +-
 src/xrpld/rpc/detail/TransactionSign.cpp      |   2 +-
 src/xrpld/rpc/handlers/transaction/Submit.cpp |   2 +-
 src/xrpld/shamap/NodeFamily.cpp               |   6 +-
 259 files changed, 2193 insertions(+), 1888 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 6a967532db..6a7005b464 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -7,6 +7,7 @@ Checks: "-*,
   bugprone-bad-signal-to-kill-thread,
   bugprone-bool-pointer-implicit-conversion,
   bugprone-casting-through-void,
+  bugprone-capturing-this-in-member-variable,
   bugprone-chained-comparison,
   bugprone-compare-pointer-to-member-virtual-function,
   bugprone-copy-constructor-init,
@@ -28,6 +29,7 @@ Checks: "-*,
   bugprone-misplaced-operator-in-strlen-in-alloc,
   bugprone-misplaced-pointer-arithmetic-in-alloc,
   bugprone-misplaced-widening-cast,
+  bugprone-misleading-setter-of-reference,
   bugprone-move-forwarding-reference,
   bugprone-multi-level-implicit-pointer-conversion,
   bugprone-multiple-new-in-one-expression,
@@ -85,6 +87,7 @@ Checks: "-*,
   cppcoreguidelines-pro-type-static-cast-downcast,
   cppcoreguidelines-rvalue-reference-param-not-moved,
   cppcoreguidelines-use-default-member-init,
+  cppcoreguidelines-use-enum-class,
   cppcoreguidelines-virtual-class-destructor,
   hicpp-ignored-remove-result,
   misc-const-correctness,
@@ -109,6 +112,7 @@ Checks: "-*,
   modernize-use-nodiscard,
   modernize-use-override,
   modernize-use-ranges,
+  modernize-use-scoped-lock,
   modernize-use-starts-ends-with,
   modernize-use-std-numbers,
   modernize-use-using,
@@ -122,6 +126,7 @@ Checks: "-*,
   performance-move-constructor-init,
   performance-no-automatic-move,
   performance-trivially-destructible,
+  readability-ambiguous-smartptr-reset-call,
   readability-avoid-nested-conditional-operator,
   readability-avoid-return-with-void-value,
   readability-braces-around-statements,
diff --git a/include/xrpl/basics/Log.h b/include/xrpl/basics/Log.h
index 58cca4f486..5c63166d93 100644
--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -15,6 +15,7 @@
 namespace xrpl {
 
 // DEPRECATED use beast::severities::Severity instead
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum LogSeverity {
     lsINVALID = -1,  // used to indicate an invalid severity
     lsTRACE = 0,     // Very low-level progress information, details inside
@@ -207,6 +208,8 @@ public:
     fromString(std::string const& s);
 
 private:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // Maximum line length for log messages.
         // If the message exceeds this length it will be truncated with
diff --git a/include/xrpl/basics/Mutex.hpp b/include/xrpl/basics/Mutex.hpp
index 5855ee2017..4432e27b4b 100644
--- a/include/xrpl/basics/Mutex.hpp
+++ b/include/xrpl/basics/Mutex.hpp
@@ -131,7 +131,7 @@ public:
      * @tparam LockType The type of lock to use
      * @return A lock on the mutex and a reference to the protected data
      */
-    template <template <typename...> typename LockType = std::lock_guard>
+    template <template <typename...> typename LockType = std::scoped_lock>
     Lock<ProtectedDataType const, LockType, MutexType>
     lock() const
     {
@@ -144,7 +144,7 @@ public:
      * @tparam LockType The type of lock to use
      * @return A lock on the mutex and a reference to the protected data
      */
-    template <template <typename...> typename LockType = std::lock_guard>
+    template <template <typename...> typename LockType = std::scoped_lock>
     Lock<ProtectedDataType, LockType, MutexType>
     lock()
     {
diff --git a/include/xrpl/basics/Number.h b/include/xrpl/basics/Number.h
index d14b17a042..b82cb628b9 100644
--- a/include/xrpl/basics/Number.h
+++ b/include/xrpl/basics/Number.h
@@ -70,7 +70,7 @@ isPowerOfTen(T value)
 struct MantissaRange
 {
     using rep = std::uint64_t;
-    enum mantissa_scale { small, large };
+    enum class mantissa_scale { small, large };
 
     explicit constexpr MantissaRange(mantissa_scale scale_)
         : min(getMin(scale_)), log(logTen(min).value_or(-1)), scale(scale_)
@@ -88,9 +88,9 @@ private:
     {
         switch (scale_)
         {
-            case small:
+            case mantissa_scale::small:
                 return 1'000'000'000'000'000ULL;
-            case large:
+            case mantissa_scale::large:
                 return 1'000'000'000'000'000'000ULL;
             default:
                 // Since this can never be called outside a non-constexpr
@@ -384,7 +384,7 @@ public:
     root2(Number f);
 
     // Thread local rounding control.  Default is to_nearest
-    enum rounding_mode { to_nearest, towards_zero, downward, upward };
+    enum class rounding_mode { to_nearest, towards_zero, downward, upward };
     static rounding_mode
     getround();
     // Returns previously set mode
@@ -443,14 +443,14 @@ private:
     static thread_local rounding_mode mode_;
     // The available ranges for mantissa
 
-    constexpr static MantissaRange smallRange{MantissaRange::small};
+    constexpr static MantissaRange smallRange{MantissaRange::mantissa_scale::small};
     static_assert(isPowerOfTen(smallRange.min));
     static_assert(smallRange.min == 1'000'000'000'000'000LL);
     static_assert(smallRange.max == 9'999'999'999'999'999LL);
     static_assert(smallRange.log == 15);
     static_assert(smallRange.min < maxRep);
     static_assert(smallRange.max < maxRep);
-    constexpr static MantissaRange largeRange{MantissaRange::large};
+    constexpr static MantissaRange largeRange{MantissaRange::mantissa_scale::large};
     static_assert(isPowerOfTen(largeRange.min));
     static_assert(largeRange.min == 1'000'000'000'000'000'000ULL);
     static_assert(largeRange.max == internalrep(9'999'999'999'999'999'999ULL));
@@ -759,9 +759,9 @@ to_string(MantissaRange::mantissa_scale const& scale)
 {
     switch (scale)
     {
-        case MantissaRange::small:
+        case MantissaRange::mantissa_scale::small:
             return "small";
-        case MantissaRange::large:
+        case MantissaRange::mantissa_scale::large:
             return "large";
         default:
             throw std::runtime_error("Bad scale");
diff --git a/include/xrpl/basics/SlabAllocator.h b/include/xrpl/basics/SlabAllocator.h
index 39be029b42..ddcc89d2da 100644
--- a/include/xrpl/basics/SlabAllocator.h
+++ b/include/xrpl/basics/SlabAllocator.h
@@ -92,7 +92,7 @@ class SlabAllocator
             std::uint8_t* ret = nullptr;  // NOLINT(misc-const-correctness)
 
             {
-                std::lock_guard const l(m_);
+                std::scoped_lock const l(m_);
 
                 ret = l_;
 
@@ -121,7 +121,7 @@ class SlabAllocator
         {
             XRPL_ASSERT(own(ptr), "xrpl::SlabAllocator::SlabBlock::deallocate : own input");
 
-            std::lock_guard const l(m_);
+            std::scoped_lock const l(m_);
 
             // Use memcpy to avoid unaligned UB
             // (will optimize to equivalent code)
diff --git a/include/xrpl/basics/TaggedCache.h b/include/xrpl/basics/TaggedCache.h
index 8cb0c6bfdf..95703f0633 100644
--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -166,7 +166,7 @@ public:
 
 private:
     SharedPointerType
-    initialFetch(key_type const& key, std::lock_guard<mutex_type> const& l);
+    initialFetch(key_type const& key, std::scoped_lock<mutex_type> const& l);
 
     void
     collect_metrics();
@@ -266,7 +266,7 @@ private:
         typename KeyValueCacheType::map_type& partition,
         SweptPointersVector& stuffToSweep,
         std::atomic<int>& allRemovals,
-        std::lock_guard<std::recursive_mutex> const&);
+        std::scoped_lock<std::recursive_mutex> const&);
 
     [[nodiscard]] std::thread
     sweepHelper(
@@ -275,7 +275,7 @@ private:
         typename KeyOnlyCacheType::map_type& partition,
         SweptPointersVector&,
         std::atomic<int>& allRemovals,
-        std::lock_guard<std::recursive_mutex> const&);
+        std::scoped_lock<std::recursive_mutex> const&);
 
     beast::Journal m_journal;
     clock_type& m_clock;
diff --git a/include/xrpl/basics/TaggedCache.ipp b/include/xrpl/basics/TaggedCache.ipp
index 6879ad435d..67c80b554e 100644
--- a/include/xrpl/basics/TaggedCache.ipp
+++ b/include/xrpl/basics/TaggedCache.ipp
@@ -69,7 +69,7 @@ inline std::size_t
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     size() const
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     return m_cache.size();
 }
 
@@ -86,7 +86,7 @@ inline int
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getCacheSize() const
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     return m_cache_count;
 }
 
@@ -103,7 +103,7 @@ inline int
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getTrackSize() const
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     return m_cache.size();
 }
 
@@ -120,7 +120,7 @@ inline float
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getHitRate()
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     auto const total = static_cast<float>(m_hits + m_misses);
     return m_hits * (100.0f / std::max(1.0f, total));
 }
@@ -138,7 +138,7 @@ inline void
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     clear()
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     m_cache.clear();
     m_cache_count = 0;
 }
@@ -156,7 +156,7 @@ inline void
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     reset()
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     m_cache.clear();
     m_cache_count = 0;
     m_hits = 0;
@@ -177,7 +177,7 @@ inline bool
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     touch_if_exists(KeyComparable const& key)
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     auto const iter(m_cache.find(key));
     if (iter == m_cache.end())
     {
@@ -212,7 +212,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 
     auto const start = std::chrono::steady_clock::now();
     {
-        std::lock_guard lock(m_mutex);
+        std::scoped_lock lock(m_mutex);
 
         if (m_target_size == 0 || (static_cast<int>(m_cache.size()) <= m_target_size))
         {
@@ -269,7 +269,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 {
     // Remove from cache, if !valid, remove from map too. Returns true if
     // removed from cache
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
 
     auto cit = m_cache.find(key);
 
@@ -309,7 +309,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 {
     // Return canonical value, store if needed, refresh in cache
     // Return values: true=we had the data already
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
 
     auto cit = m_cache.find(key);
 
@@ -423,7 +423,7 @@ inline SharedPointerType
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     fetch(key_type const& key)
 {
-    std::lock_guard<mutex_type> l(m_mutex);
+    std::scoped_lock<mutex_type> l(m_mutex);
     auto ret = initialFetch(key, l);
     if (!ret)
         ++m_misses;
@@ -474,7 +474,7 @@ inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     insert(key_type const& key) -> std::enable_if_t<IsKeyCache, ReturnType>
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     clock_type::time_point const now(m_clock.now());
     auto [it, inserted] = m_cache.emplace(
         std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple(now));
@@ -538,7 +538,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     std::vector<key_type> v;
 
     {
-        std::lock_guard lock(m_mutex);
+        std::scoped_lock lock(m_mutex);
         v.reserve(m_cache.size());
         for (auto const& _ : m_cache)
             v.push_back(_.first);
@@ -560,7 +560,7 @@ inline double
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     rate() const
 {
-    std::lock_guard lock(m_mutex);
+    std::scoped_lock lock(m_mutex);
     auto const tot = m_hits + m_misses;
     if (tot == 0)
         return 0;
@@ -582,7 +582,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     fetch(key_type const& digest, Handler const& h)
 {
     {
-        std::lock_guard l(m_mutex);
+        std::scoped_lock l(m_mutex);
         if (auto ret = initialFetch(digest, l))
             return ret;
     }
@@ -591,7 +591,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     if (!sle)
         return {};
 
-    std::lock_guard l(m_mutex);
+    std::scoped_lock l(m_mutex);
     ++m_misses;
     auto const [it, inserted] = m_cache.emplace(digest, Entry(m_clock.now(), std::move(sle)));
     if (!inserted)
@@ -611,7 +611,7 @@ template <
     class Mutex>
 inline SharedPointerType
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    initialFetch(key_type const& key, std::lock_guard<mutex_type> const& l)
+    initialFetch(key_type const& key, std::scoped_lock<mutex_type> const& l)
 {
     auto cit = m_cache.find(key);
     if (cit == m_cache.end())
@@ -655,7 +655,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     {
         beast::insight::Gauge::value_type hit_rate(0);
         {
-            std::lock_guard lock(m_mutex);
+            std::scoped_lock lock(m_mutex);
             auto const total(m_hits + m_misses);
             if (total != 0)
                 hit_rate = (m_hits * 100) / total;
@@ -681,7 +681,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
         typename KeyValueCacheType::map_type& partition,
         SweptPointersVector& stuffToSweep,
         std::atomic<int>& allRemovals,
-        std::lock_guard<std::recursive_mutex> const&)
+        std::scoped_lock<std::recursive_mutex> const&)
 {
     return std::thread([&, this]() {
         int cacheRemovals = 0;
@@ -761,7 +761,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
         typename KeyOnlyCacheType::map_type& partition,
         SweptPointersVector&,
         std::atomic<int>& allRemovals,
-        std::lock_guard<std::recursive_mutex> const&)
+        std::scoped_lock<std::recursive_mutex> const&)
 {
     return std::thread([&, this]() {
         int cacheRemovals = 0;
diff --git a/include/xrpl/basics/hardened_hash.h b/include/xrpl/basics/hardened_hash.h
index 3ff14c22c8..2722a5a4a7 100644
--- a/include/xrpl/basics/hardened_hash.h
+++ b/include/xrpl/basics/hardened_hash.h
@@ -32,7 +32,7 @@ make_seed_pair() noexcept
         // state_t& operator=(state_t const&) = delete;
     };
     static state_t state;
-    std::lock_guard const lock(state.mutex);
+    std::scoped_lock const lock(state.mutex);
     return {state.dist(state.gen), state.dist(state.gen)};
 }
 
diff --git a/include/xrpl/basics/random.h b/include/xrpl/basics/random.h
index adf579442e..a4018b7e5f 100644
--- a/include/xrpl/basics/random.h
+++ b/include/xrpl/basics/random.h
@@ -60,7 +60,7 @@ default_prng()
     thread_local beast::xor_shift_engine engine = [] {
         std::uint64_t seed = 0;
         {
-            std::lock_guard const lk(m);
+            std::scoped_lock const lk(m);
             std::uniform_int_distribution<std::uint64_t> distribution{1};
             seed = distribution(seeder);
         }
diff --git a/include/xrpl/beast/asio/io_latency_probe.h b/include/xrpl/beast/asio/io_latency_probe.h
index dccb6d24b4..f85f399196 100644
--- a/include/xrpl/beast/asio/io_latency_probe.h
+++ b/include/xrpl/beast/asio/io_latency_probe.h
@@ -83,7 +83,7 @@ public:
     void
     sample_one(Handler&& handler)
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         if (m_cancel)
             throw std::logic_error("io_latency_probe is canceled");
         boost::asio::post(
@@ -98,7 +98,7 @@ public:
     void
     sample(Handler&& handler)
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         if (m_cancel)
             throw std::logic_error("io_latency_probe is canceled");
         boost::asio::post(
@@ -122,14 +122,14 @@ private:
     void
     addref()
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         ++m_count;
     }
 
     void
     release()
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         if (--m_count == 0)
             m_cond.notify_all();
     }
@@ -192,7 +192,7 @@ private:
             m_handler(elapsed);
 
             {
-                std::lock_guard const lock(m_probe->m_mutex);
+                std::scoped_lock const lock(m_probe->m_mutex);
                 if (m_probe->m_cancel)
                     return;
             }
diff --git a/include/xrpl/beast/test/yield_to.h b/include/xrpl/beast/test/yield_to.h
index 4723fb49b8..6c7f293122 100644
--- a/include/xrpl/beast/test/yield_to.h
+++ b/include/xrpl/beast/test/yield_to.h
@@ -115,7 +115,7 @@ enable_yield_to::spawn(F0&& f, FN&&... fn)
         boost::context::fixedsize_stack(2 * 1024 * 1024),
         [&](yield_context yield) {
             f(yield);
-            std::lock_guard const lock{m_};
+            std::scoped_lock const lock{m_};
             if (--running_ == 0)
                 cv_.notify_all();
         },
diff --git a/include/xrpl/beast/unit_test/match.h b/include/xrpl/beast/unit_test/match.h
index 084e2bc464..dbafd67da5 100644
--- a/include/xrpl/beast/unit_test/match.h
+++ b/include/xrpl/beast/unit_test/match.h
@@ -14,7 +14,7 @@ namespace beast::unit_test {
 class selector
 {
 public:
-    enum mode_t {
+    enum class mode_t {
         // Run all tests except manual ones
         all,
 
@@ -53,8 +53,8 @@ public:
 template <class>
 selector::selector(mode_t mode, std::string const& pattern) : mode_(mode), pat_(pattern)
 {
-    if (mode_ == automatch && pattern.empty())
-        mode_ = all;
+    if (mode_ == mode_t::automatch && pattern.empty())
+        mode_ = mode_t::all;
 }
 
 template <class>
@@ -63,18 +63,18 @@ selector::operator()(suite_info const& s)
 {
     switch (mode_)
     {
-        case automatch:
+        case mode_t::automatch:
             // suite or full name
             if (s.name() == pat_ || s.full_name() == pat_)
             {
-                mode_ = none;
+                mode_ = mode_t::none;
                 return true;
             }
 
             // check module
             if (pat_ == s.module())
             {
-                mode_ = module;
+                mode_ = mode_t::module;
                 library_ = s.library();
                 return !s.manual();
             }
@@ -82,7 +82,7 @@ selector::operator()(suite_info const& s)
             // check library
             if (pat_ == s.library())
             {
-                mode_ = library;
+                mode_ = mode_t::library;
                 return !s.manual();
             }
 
@@ -96,19 +96,19 @@ selector::operator()(suite_info const& s)
 
             return false;
 
-        case suite:
+        case mode_t::suite:
             return pat_ == s.name();
 
-        case module:
+        case mode_t::module:
             return pat_ == s.module() && !s.manual();
 
-        case library:
+        case mode_t::library:
             return pat_ == s.library() && !s.manual();
 
-        case none:
+        case mode_t::none:
             return false;
 
-        case all:
+        case mode_t::all:
         default:
             break;
     };
@@ -138,28 +138,28 @@ selector::operator()(suite_info const& s)
 inline selector
 match_auto(std::string const& name)
 {
-    return selector(selector::automatch, name);
+    return selector(selector::mode_t::automatch, name);
 }
 
 /** Return a predicate that matches all suites not marked manual. */
 inline selector
 match_all()
 {
-    return selector(selector::all);
+    return selector(selector::mode_t::all);
 }
 
 /** Returns a predicate that matches a specific suite. */
 inline selector
 match_suite(std::string const& name)
 {
-    return selector(selector::suite, name);
+    return selector(selector::mode_t::suite, name);
 }
 
 /** Returns a predicate that matches all suites in a library. */
 inline selector
 match_library(std::string const& name)
 {
-    return selector(selector::library, name);
+    return selector(selector::mode_t::library, name);
 }
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/reporter.h b/include/xrpl/beast/unit_test/reporter.h
index 066d628ea2..58bea93b2f 100644
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -62,6 +62,8 @@ private:
     {
         using run_time = std::pair<std::string, typename clock_type::duration>;
 
+        // Need to be named before converting
+        // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
         enum { max_top = 10 };
 
         std::size_t suites = 0;
diff --git a/include/xrpl/beast/unit_test/runner.h b/include/xrpl/beast/unit_test/runner.h
index 2fdfbefa57..5601a8725f 100644
--- a/include/xrpl/beast/unit_test/runner.h
+++ b/include/xrpl/beast/unit_test/runner.h
@@ -231,7 +231,7 @@ template <class>
 void
 runner::testcase(std::string const& name)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     // Name may not be empty
     BOOST_ASSERT(default_ || !name.empty());
     // Forgot to call pass or fail
@@ -247,7 +247,7 @@ template <class>
 void
 runner::pass()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
     on_pass();
@@ -258,7 +258,7 @@ template <class>
 void
 runner::fail(std::string const& reason)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
     on_fail(reason);
@@ -270,7 +270,7 @@ template <class>
 void
 runner::log(std::string const& s)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
     on_log(s);
diff --git a/include/xrpl/beast/unit_test/suite.h b/include/xrpl/beast/unit_test/suite.h
index a7b9d3bacb..c6967ecfe3 100644
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -37,7 +37,7 @@ make_reason(String const& reason, char const* file, int line)
 
 class Thread;
 
-enum abort_t { no_abort_on_fail, abort_on_fail };
+enum class abort_t { no_abort_on_fail, abort_on_fail };
 
 /** A testsuite class.
 
@@ -127,7 +127,7 @@ private:
             @param abort Determines if suite continues running after a failure.
         */
         void
-        operator()(std::string const& name, abort_t abort = no_abort_on_fail);
+        operator()(std::string const& name, abort_t abort = abort_t::no_abort_on_fail);
 
         scoped_testcase
         operator()(abort_t abort);
@@ -363,14 +363,14 @@ public:
 inline void
 suite::testcase_t::operator()(std::string const& name, abort_t abort)
 {
-    suite_.abort_ = abort == abort_on_fail;
+    suite_.abort_ = abort == abort_t::abort_on_fail;
     suite_.runner_->testcase(name);
 }
 
 inline suite::scoped_testcase
 suite::testcase_t::operator()(abort_t abort)
 {
-    suite_.abort_ = abort == abort_on_fail;
+    suite_.abort_ = abort == abort_t::abort_on_fail;
     return {suite_, ss_};
 }
 
diff --git a/include/xrpl/beast/utility/Journal.h b/include/xrpl/beast/utility/Journal.h
index a056ce8d79..45b7b671cb 100644
--- a/include/xrpl/beast/utility/Journal.h
+++ b/include/xrpl/beast/utility/Journal.h
@@ -9,6 +9,8 @@ namespace beast {
 /** A namespace for easy access to logging severity values. */
 namespace severities {
 /** Severity level / threshold of a Journal message. */
+// Hundreds of usages via logging macros
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Severity {
     kAll = 0,
 
diff --git a/include/xrpl/core/ClosureCounter.h b/include/xrpl/core/ClosureCounter.h
index bcdfa7d673..76e52cb3cd 100644
--- a/include/xrpl/core/ClosureCounter.h
+++ b/include/xrpl/core/ClosureCounter.h
@@ -56,7 +56,7 @@ private:
         // a lock.  This removes a small timing window that occurs if the
         // waiting thread is handling a spurious wakeup when closureCount_
         // drops to zero.
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
 
         // Update closureCount_.  Notify if stopping and closureCount_ == 0.
         if ((--closureCount_ == 0) && waitForClosures_)
@@ -170,7 +170,7 @@ public:
     {
         std::optional<Substitute<Closure>> ret;
 
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         if (!waitForClosures_)
             ret.emplace(*this, std::forward<Closure>(closure));
 
@@ -193,7 +193,7 @@ public:
     bool
     joined() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return waitForClosures_;
     }
 };
diff --git a/include/xrpl/core/Coro.ipp b/include/xrpl/core/Coro.ipp
index 38d921a658..2343f805a5 100644
--- a/include/xrpl/core/Coro.ipp
+++ b/include/xrpl/core/Coro.ipp
@@ -34,7 +34,7 @@ inline void
 JobQueue::Coro::yield() const
 {
     {
-        std::lock_guard lock(jq_.m_mutex);
+        std::scoped_lock lock(jq_.m_mutex);
         ++jq_.nSuspend_;
     }
     (*yield_)();
@@ -44,7 +44,7 @@ inline bool
 JobQueue::Coro::post()
 {
     {
-        std::lock_guard lk(mutex_run_);
+        std::scoped_lock lk(mutex_run_);
         running_ = true;
     }
 
@@ -55,7 +55,7 @@ JobQueue::Coro::post()
     }
 
     // The coroutine will not run.  Clean up running_.
-    std::lock_guard lk(mutex_run_);
+    std::scoped_lock lk(mutex_run_);
     running_ = false;
     cv_.notify_all();
     return false;
@@ -65,16 +65,16 @@ inline void
 JobQueue::Coro::resume()
 {
     {
-        std::lock_guard lk(mutex_run_);
+        std::scoped_lock lk(mutex_run_);
         running_ = true;
     }
     {
-        std::lock_guard lk(jq_.m_mutex);
+        std::scoped_lock lk(jq_.m_mutex);
         --jq_.nSuspend_;
     }
     auto saved = detail::getLocalValues().release();
     detail::getLocalValues().reset(&lvs_);
-    std::lock_guard lock(mutex_);
+    std::scoped_lock lock(mutex_);
     // A late resume() can arrive after the coroutine has already completed.
     // This is an expected (if rare) outcome of the race condition documented
     // in JobQueue.h:354-377 where post() schedules a resume job before the
@@ -89,7 +89,7 @@ JobQueue::Coro::resume()
     }
     detail::getLocalValues().release();
     detail::getLocalValues().reset(saved);
-    std::lock_guard lk(mutex_run_);
+    std::scoped_lock lk(mutex_run_);
     running_ = false;
     cv_.notify_all();
 }
@@ -113,7 +113,7 @@ JobQueue::Coro::expectEarlyExit()
         //
         // That said, since we're outside the Coro's stack, we need to
         // decrement the nSuspend that the Coro's call to yield caused.
-        std::lock_guard lock(jq_.m_mutex);
+        std::scoped_lock lock(jq_.m_mutex);
         --jq_.nSuspend_;
 #ifndef NDEBUG
         finished_ = true;
diff --git a/include/xrpl/core/Job.h b/include/xrpl/core/Job.h
index 9954fc4ba4..2fe5ab263c 100644
--- a/include/xrpl/core/Job.h
+++ b/include/xrpl/core/Job.h
@@ -11,6 +11,8 @@ namespace xrpl {
 // Note that this queue should only be used for CPU-bound jobs
 // It is primarily intended for signature checking
 
+// Protocol-wide
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum JobType {
     // Special type indicating an invalid job - will go away soon.
     jtINVALID = -1,
diff --git a/include/xrpl/core/PeerReservationTable.h b/include/xrpl/core/PeerReservationTable.h
index 0d107e879c..80ad7196c3 100644
--- a/include/xrpl/core/PeerReservationTable.h
+++ b/include/xrpl/core/PeerReservationTable.h
@@ -67,7 +67,7 @@ public:
     bool
     contains(PublicKey const& nodeId)
     {
-        std::lock_guard const lock(this->mutex_);
+        std::scoped_lock const lock(this->mutex_);
         return table_.contains({.nodeId = nodeId, .description = {}});
     }
 
diff --git a/include/xrpl/core/detail/semaphore.h b/include/xrpl/core/detail/semaphore.h
index b3bee00588..38b7329ab1 100644
--- a/include/xrpl/core/detail/semaphore.h
+++ b/include/xrpl/core/detail/semaphore.h
@@ -55,7 +55,7 @@ public:
     void
     notify()
     {
-        std::lock_guard const lock{m_mutex};
+        std::scoped_lock const lock{m_mutex};
         ++m_count;
         m_cond.notify_one();
     }
@@ -76,7 +76,7 @@ public:
     bool
     try_wait()
     {
-        std::lock_guard lock{m_mutex};
+        std::scoped_lock lock{m_mutex};
         if (m_count == 0)
             return false;
         --m_count;
diff --git a/include/xrpl/json/Writer.h b/include/xrpl/json/Writer.h
index e348e57825..34c4e8458a 100644
--- a/include/xrpl/json/Writer.h
+++ b/include/xrpl/json/Writer.h
@@ -107,7 +107,7 @@ namespace Json {
 class Writer
 {
 public:
-    enum CollectionType { array, object };
+    enum class CollectionType { array, object };
 
     explicit Writer(Output const& output);
     Writer(Writer&&) noexcept;
diff --git a/include/xrpl/json/json_reader.h b/include/xrpl/json/json_reader.h
index d53569fb33..543f0cfb9c 100644
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -70,6 +70,8 @@ public:
     static constexpr unsigned nest_limit{25};
 
 private:
+    // 53 files, protocol-wide
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum TokenType {
         tokenEndOfStream = 0,
         tokenObjectBegin,
diff --git a/include/xrpl/json/json_value.h b/include/xrpl/json/json_value.h
index 83b5142b27..def2696c5c 100644
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -15,6 +15,8 @@ namespace Json {
 
 /** \brief Type of the value held by a Value object.
  */
+// Used throughout JSON layer
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum ValueType {
     nullValue = 0,  ///< 'null' value
     intValue,       ///< signed integer value
@@ -147,6 +149,8 @@ private:
     class CZString
     {
     public:
+        // Stored as int field, implicit conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
         enum DuplicationPolicy { noDuplication = 0, duplicate, duplicateOnCopy };
         CZString(int index);
         CZString(char const* cstr, DuplicationPolicy allocate);
@@ -471,6 +475,8 @@ operator>=(Value const& x, Value const& y)
 class ValueAllocator
 {
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { unknown = (unsigned)-1 };
 
     virtual ~ValueAllocator() = default;
diff --git a/include/xrpl/ledger/ApplyView.h b/include/xrpl/ledger/ApplyView.h
index bd38b57a58..0aea9813b9 100644
--- a/include/xrpl/ledger/ApplyView.h
+++ b/include/xrpl/ledger/ApplyView.h
@@ -7,6 +7,8 @@
 
 namespace xrpl {
 
+// Bitwise flag enum with existing operator overloads
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum ApplyFlags : std::uint32_t {
     tapNONE = 0x00,
 
diff --git a/include/xrpl/ledger/PendingSaves.h b/include/xrpl/ledger/PendingSaves.h
index ff70d48bb9..a18292df68 100644
--- a/include/xrpl/ledger/PendingSaves.h
+++ b/include/xrpl/ledger/PendingSaves.h
@@ -31,7 +31,7 @@ public:
     bool
     startWork(LedgerIndex seq)
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
 
         auto it = map_.find(seq);
 
@@ -54,7 +54,7 @@ public:
     void
     finishWork(LedgerIndex seq)
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
 
         map_.erase(seq);
         await_.notify_all();
@@ -64,7 +64,7 @@ public:
     bool
     pending(LedgerIndex seq)
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return map_.contains(seq);
     }
 
@@ -117,7 +117,7 @@ public:
     std::map<LedgerIndex, bool>
     getSnapshot() const
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
 
         return map_;
     }
diff --git a/include/xrpl/ledger/helpers/AMMHelpers.h b/include/xrpl/ledger/helpers/AMMHelpers.h
index d261f9e018..9258d58fb6 100644
--- a/include/xrpl/ledger/helpers/AMMHelpers.h
+++ b/include/xrpl/ledger/helpers/AMMHelpers.h
@@ -28,7 +28,7 @@ reduceOffer(auto const& amount)
     static Number const reducedOfferPct(9999, -4);
 
     // Make sure the result is always less than amount or zero.
-    NumberRoundModeGuard const mg(Number::towards_zero);
+    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
     return amount * reducedOfferPct;
 }
 
@@ -180,7 +180,7 @@ getAMMOfferStartWithTakerGets(
     if (targetQuality.rate() == beast::zero)
         return std::nullopt;
 
-    NumberRoundModeGuard const mg(Number::to_nearest);
+    NumberRoundModeGuard const mg(Number::rounding_mode::to_nearest);
     auto const f = feeMult(tfee);
     auto const a = 1;
     auto const b = pool.in * (1 - 1 / f) / targetQuality.rate() - 2 * pool.out;
@@ -202,7 +202,7 @@ getAMMOfferStartWithTakerGets(
         // Round downward to minimize the offer and to maximize the quality.
         // This has the most impact when takerGets is XRP.
         auto const takerGets =
-            toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::downward);
+            toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::rounding_mode::downward);
         return TAmounts<TIn, TOut>{swapAssetOut(pool, takerGets, tfee), takerGets};
     };
 
@@ -247,7 +247,7 @@ getAMMOfferStartWithTakerPays(
     if (targetQuality.rate() == beast::zero)
         return std::nullopt;
 
-    NumberRoundModeGuard const mg(Number::to_nearest);
+    NumberRoundModeGuard const mg(Number::rounding_mode::to_nearest);
     auto const f = feeMult(tfee);
     auto const& a = f;
     auto const b = pool.in * (1 + f);
@@ -269,7 +269,7 @@ getAMMOfferStartWithTakerPays(
         // Round downward to minimize the offer and to maximize the quality.
         // This has the most impact when takerPays is XRP.
         auto const takerPays =
-            toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::downward);
+            toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::rounding_mode::downward);
         return TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
     };
 
@@ -341,7 +341,8 @@ changeSpotPriceQuality(
                                 << " " << to_string(pool.out) << " " << quality << " " << tfee;
                 return std::nullopt;
             }
-            auto const takerPays = toAmount<TIn>(getAsset(pool.in), nTakerPays, Number::upward);
+            auto const takerPays =
+                toAmount<TIn>(getAsset(pool.in), nTakerPays, Number::rounding_mode::upward);
             // should not fail
             if (auto amounts = TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
                 Quality{amounts} < quality &&
@@ -447,32 +448,32 @@ swapAssetIn(TAmounts<TIn, TOut> const& pool, TIn const& assetIn, std::uint16_t t
         // fee
         saveNumberRoundMode const _{Number::getround()};
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         auto const numerator = pool.in * pool.out;
         auto const fee = getFee(tfee);
 
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         auto const denom = pool.in + assetIn * (1 - fee);
 
         if (denom.signum() <= 0)
             return toAmount<TOut>(getAsset(pool.out), 0);
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         auto const ratio = numerator / denom;
 
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         auto const swapOut = pool.out - ratio;
 
         if (swapOut.signum() < 0)
             return toAmount<TOut>(getAsset(pool.out), 0);
 
-        return toAmount<TOut>(getAsset(pool.out), swapOut, Number::downward);
+        return toAmount<TOut>(getAsset(pool.out), swapOut, Number::rounding_mode::downward);
     }
 
     return toAmount<TOut>(
         getAsset(pool.out),
         pool.out - (pool.in * pool.out) / (pool.in + assetIn * feeMult(tfee)),
-        Number::downward);
+        Number::rounding_mode::downward);
 }
 
 /** Swap assetOut out of the pool and swap in a proportional amount
@@ -509,36 +510,36 @@ swapAssetOut(TAmounts<TIn, TOut> const& pool, TOut const& assetOut, std::uint16_
 
         saveNumberRoundMode const _{Number::getround()};
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         auto const numerator = pool.in * pool.out;
 
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         auto const denom = pool.out - assetOut;
         if (denom.signum() <= 0)
         {
             return toMaxAmount<TIn>(getAsset(pool.in));
         }
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         auto const ratio = numerator / denom;
         auto const numerator2 = ratio - pool.in;
         auto const fee = getFee(tfee);
 
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         auto const feeMult = 1 - fee;
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         auto const swapIn = numerator2 / feeMult;
         if (swapIn.signum() < 0)
             return toAmount<TIn>(getAsset(pool.in), 0);
 
-        return toAmount<TIn>(getAsset(pool.in), swapIn, Number::upward);
+        return toAmount<TIn>(getAsset(pool.in), swapIn, Number::rounding_mode::upward);
     }
 
     return toAmount<TIn>(
         getAsset(pool.in),
         ((pool.in * pool.out) / (pool.out - assetOut) - pool.in) / feeMult(tfee),
-        Number::upward);
+        Number::rounding_mode::upward);
 }
 
 /** Return square of n.
@@ -597,7 +598,8 @@ getLPTokenRounding(IsDeposit isDeposit)
 {
     // Minimize on deposit, maximize on withdraw to ensure
     // AMM invariant sqrt(poolAsset1 * poolAsset2) >= LPTokensBalance
-    return isDeposit == IsDeposit::Yes ? Number::downward : Number::upward;
+    return isDeposit == IsDeposit::Yes ? Number::rounding_mode::downward
+                                       : Number::rounding_mode::upward;
 }
 
 inline Number::rounding_mode
@@ -605,7 +607,8 @@ getAssetRounding(IsDeposit isDeposit)
 {
     // Maximize on deposit, minimize on withdraw to ensure
     // AMM invariant sqrt(poolAsset1 * poolAsset2) >= LPTokensBalance
-    return isDeposit == IsDeposit::Yes ? Number::upward : Number::downward;
+    return isDeposit == IsDeposit::Yes ? Number::rounding_mode::upward
+                                       : Number::rounding_mode::downward;
 }
 
 }  // namespace detail
diff --git a/include/xrpl/ledger/helpers/LendingHelpers.h b/include/xrpl/ledger/helpers/LendingHelpers.h
index 23b87de654..e1d8626b7c 100644
--- a/include/xrpl/ledger/helpers/LendingHelpers.h
+++ b/include/xrpl/ledger/helpers/LendingHelpers.h
@@ -19,7 +19,7 @@ loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval);
 inline Number
 roundPeriodicPayment(Asset const& asset, Number const& periodicPayment, std::int32_t scale)
 {
-    return roundToAsset(asset, periodicPayment, scale, Number::upward);
+    return roundToAsset(asset, periodicPayment, scale, Number::rounding_mode::upward);
 }
 
 /* Represents the breakdown of amounts to be paid and changes applied to the
diff --git a/include/xrpl/ledger/helpers/TokenHelpers.h b/include/xrpl/ledger/helpers/TokenHelpers.h
index c05308295a..8f83465da3 100644
--- a/include/xrpl/ledger/helpers/TokenHelpers.h
+++ b/include/xrpl/ledger/helpers/TokenHelpers.h
@@ -21,13 +21,13 @@ namespace xrpl {
 //------------------------------------------------------------------------------
 
 /** Controls the treatment of frozen account balances */
-enum FreezeHandling { fhIGNORE_FREEZE, fhZERO_IF_FROZEN };
+enum class FreezeHandling { fhIGNORE_FREEZE, fhZERO_IF_FROZEN };
 
 /** Controls the treatment of unauthorized MPT balances */
-enum AuthHandling { ahIGNORE_AUTH, ahZERO_IF_UNAUTHORIZED };
+enum class AuthHandling { ahIGNORE_AUTH, ahZERO_IF_UNAUTHORIZED };
 
 /** Controls whether to include the account's full spendable balance */
-enum SpendableHandling { shSIMPLE_BALANCE, shFULL_BALANCE };
+enum class SpendableHandling { shSIMPLE_BALANCE, shFULL_BALANCE };
 
 enum class WaiveTransferFee : bool { No = false, Yes };
 
@@ -135,7 +135,7 @@ accountHolds(
     AccountID const& issuer,
     FreezeHandling zeroIfFrozen,
     beast::Journal j,
-    SpendableHandling includeFullBalance = shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -144,7 +144,7 @@ accountHolds(
     Issue const& issue,
     FreezeHandling zeroIfFrozen,
     beast::Journal j,
-    SpendableHandling includeFullBalance = shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -154,7 +154,7 @@ accountHolds(
     FreezeHandling zeroIfFrozen,
     AuthHandling zeroIfUnauthorized,
     beast::Journal j,
-    SpendableHandling includeFullBalance = shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -164,7 +164,7 @@ accountHolds(
     FreezeHandling zeroIfFrozen,
     AuthHandling zeroIfUnauthorized,
     beast::Journal j,
-    SpendableHandling includeFullBalance = shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
 
 // Returns the amount an account can spend of the currency type saDefault, or
 // returns saDefault if this account is the issuer of the currency in
diff --git a/include/xrpl/nodestore/NodeObject.h b/include/xrpl/nodestore/NodeObject.h
index 6397ea2e4e..8759f244d2 100644
--- a/include/xrpl/nodestore/NodeObject.h
+++ b/include/xrpl/nodestore/NodeObject.h
@@ -9,7 +9,7 @@
 namespace xrpl {
 
 /** The types of node objects. */
-enum NodeObjectType : std::uint32_t {
+enum class NodeObjectType : std::uint32_t {
     hotUNKNOWN = 0,
     hotLEDGER = 1,
     hotACCOUNT_NODE = 3,
diff --git a/include/xrpl/nodestore/Types.h b/include/xrpl/nodestore/Types.h
index 851cbcfb8b..cc7d345067 100644
--- a/include/xrpl/nodestore/Types.h
+++ b/include/xrpl/nodestore/Types.h
@@ -6,6 +6,8 @@
 
 namespace xrpl::NodeStore {
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // This is only used to pre-allocate the array for
     // batch objects and does not affect the amount written.
@@ -20,7 +22,7 @@ enum {
 };
 
 /** Return codes from Backend operations. */
-enum Status {
+enum class Status {
     ok = 0,
     notFound = 1,
     dataCorrupt = 2,
diff --git a/include/xrpl/nodestore/detail/codec.h b/include/xrpl/nodestore/detail/codec.h
index c159558f83..e127062b80 100644
--- a/include/xrpl/nodestore/detail/codec.h
+++ b/include/xrpl/nodestore/detail/codec.h
@@ -127,7 +127,7 @@ nodeobject_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
             ostream os(out, result.second);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, hotUNKNOWN);
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
             write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::innerNode));
             if (mask == 0)
                 Throw<std::runtime_error>("nodeobject codec v1: empty inner node");
@@ -173,7 +173,7 @@ nodeobject_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
             ostream os(out, result.second);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, hotUNKNOWN);
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
             write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::innerNode));
             write(os, is(512), 512);
             break;
@@ -307,7 +307,7 @@ filter_inner(void* in, std::size_t in_size)
             ostream os(in, 9);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, hotUNKNOWN);
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
         }
     }
 }
diff --git a/include/xrpl/protocol/ErrorCodes.h b/include/xrpl/protocol/ErrorCodes.h
index 2f16415bdf..ed7f898312 100644
--- a/include/xrpl/protocol/ErrorCodes.h
+++ b/include/xrpl/protocol/ErrorCodes.h
@@ -17,6 +17,8 @@ namespace xrpl {
 //
 // Please only append to this table. Do not "fill-in" gaps and do not re-use
 // or repurpose error code values.
+// Protocol-wide, 50+ files
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum error_code_i {
     // -1 represents codes not listed in this enumeration
     rpcUNKNOWN = -1,
@@ -148,6 +150,8 @@ enum error_code_i {
 
     These values need to remain stable.
 */
+// Protocol-wide, 50+ files
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum warning_code_i {
     warnRPC_UNSUPPORTED_MAJORITY = 1001,
     warnRPC_AMENDMENT_BLOCKED = 1002,
diff --git a/include/xrpl/protocol/LedgerFormats.h b/include/xrpl/protocol/LedgerFormats.h
index 009a96533a..77ef9fcf1d 100644
--- a/include/xrpl/protocol/LedgerFormats.h
+++ b/include/xrpl/protocol/LedgerFormats.h
@@ -29,6 +29,8 @@ namespace xrpl {
 
     @ingroup protocol
 */
+// Protocol-critical, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum LedgerEntryType : std::uint16_t {
 
 #pragma push_macro("LEDGER_ENTRY")
@@ -214,6 +216,8 @@ enum LedgerEntryType : std::uint16_t {
 #define TO_VALUE(name, value) name = (value),
 #define NULL_NAME(name, values) values
 #define NULL_OUTPUT(name, value)
+// Bitwise flag enum
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum LedgerSpecificFlags : std::uint32_t { XMACRO(NULL_NAME, TO_VALUE, NULL_OUTPUT) };
 
 // Create getter functions for each set of flags using Meyer's singleton pattern.
diff --git a/include/xrpl/protocol/MultiApiJson.h b/include/xrpl/protocol/MultiApiJson.h
index 6a86aa35b8..6b0c799a56 100644
--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -66,8 +66,7 @@ struct MultiApiJson
             a[key] = v;
     }
 
-    // Intentionally not using class enum here, MultivarJson is scope enough
-    enum IsMemberResult : int { none = 0, some, all };
+    enum class IsMemberResult : int { none = 0, some, all };
 
     [[nodiscard]] IsMemberResult
     isMember(char const* key) const
@@ -80,8 +79,8 @@ struct MultiApiJson
         }
 
         if (count == 0)
-            return none;
-        return count < size ? some : all;
+            return IsMemberResult::none;
+        return count < size ? IsMemberResult::some : IsMemberResult::all;
     }
 
     static constexpr struct visitor_t final
diff --git a/include/xrpl/protocol/Permissions.h b/include/xrpl/protocol/Permissions.h
index 4d26ba7cf8..3ce8918a16 100644
--- a/include/xrpl/protocol/Permissions.h
+++ b/include/xrpl/protocol/Permissions.h
@@ -16,6 +16,8 @@ namespace xrpl {
  * conflicts with TxType, the GranularPermissionType is always set to a value
  * greater than the maximum value of uint16.
  */
+// Macro-generated, complex
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum GranularPermissionType : std::uint32_t {
 #pragma push_macro("PERMISSION")
 #undef PERMISSION
@@ -28,6 +30,9 @@ enum GranularPermissionType : std::uint32_t {
 #pragma pop_macro("PERMISSION")
 };
 
+// Injected bare enumerators (xrpl::delegable / xrpl::notDelegable) are required by preprocessor
+// tricks in tests and macro-generated code; enum class would break that.
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Delegation { delegable, notDelegable };
 
 class Permission
diff --git a/include/xrpl/protocol/SField.h b/include/xrpl/protocol/SField.h
index 7e42b9ec62..784de5511e 100644
--- a/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -87,6 +87,8 @@ class STCurrency;
 #define TO_ENUM(name, value) name = (value),
 #define TO_MAP(name, value) {#name, value},
 
+// Protocol infrastructure, 39+ files
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SerializedTypeID { XMACRO(TO_ENUM) };
 
 static std::map<std::string, int> const sTypeMap = {XMACRO(TO_MAP)};
@@ -125,6 +127,8 @@ field_code(int id, int index)
 class SField
 {
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         sMD_Never = 0x00,
         sMD_ChangeOrig = 0x01,     // original value when it changes
diff --git a/include/xrpl/protocol/SOTemplate.h b/include/xrpl/protocol/SOTemplate.h
index ca09fc3d71..3bfe07d049 100644
--- a/include/xrpl/protocol/SOTemplate.h
+++ b/include/xrpl/protocol/SOTemplate.h
@@ -11,6 +11,8 @@
 namespace xrpl {
 
 /** Kind of element in each entry of an SOTemplate. */
+// 2026 usages, 129 files
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SOEStyle {
     soeINVALID = -1,
     soeREQUIRED = 0,  // required
@@ -20,7 +22,8 @@ enum SOEStyle {
                       // constructed with STObject::makeInnerObject()
 };
 
-/** Amount fields that can support MPT */
+// Part of a Python-parsed DSL (transactions.macro); bare enumerator names required by the parser
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SOETxMPTIssue { soeMPTNone, soeMPTSupported, soeMPTNotSupported };
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h
index 06471df5c9..f681f811b7 100644
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -319,7 +319,7 @@ STAmount::STAmount(
     : STBase(name), mAsset(asset), mValue(mantissa), mOffset(exponent), mIsNegative(negative)
 {
     // mValue is uint64, but needs to fit in the range of int64
-    if (Number::getMantissaScale() == MantissaRange::small)
+    if (Number::getMantissaScale() == MantissaRange::mantissa_scale::small)
     {
         XRPL_ASSERT(
             mValue <= std::numeric_limits<std::int64_t>::max(),
diff --git a/include/xrpl/protocol/STBase.h b/include/xrpl/protocol/STBase.h
index 0beefe45f6..7ebf22fe8f 100644
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -18,6 +18,8 @@ struct JsonOptions
     using underlying_t = unsigned int;
     underlying_t value;
 
+    // Bitwise flags with operator~
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum values : underlying_t {
         // clang-format off
         none                        = 0b0000'0000,
diff --git a/include/xrpl/protocol/STObject.h b/include/xrpl/protocol/STObject.h
index d27112e17c..187bde6dae 100644
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -413,9 +413,9 @@ public:
     class FieldErr;
 
 private:
-    enum WhichFields : bool {
+    enum class WhichFields : bool {
         // These values are carefully chosen to do the right thing if passed
-        // to SField::shouldInclude (bool)
+        // to SField::shouldInclude (bool) via static_cast<bool>
         omitSigningFields = false,
         withAllFields = true
     };
@@ -987,7 +987,7 @@ STObject::isFree() const
 inline void
 STObject::addWithoutSigningFields(Serializer& s) const
 {
-    add(s, omitSigningFields);
+    add(s, WhichFields::omitSigningFields);
 }
 
 // VFALCO NOTE does this return an expensive copy of an object with a
@@ -997,7 +997,7 @@ inline Serializer
 STObject::getSerializer() const
 {
     Serializer s;
-    add(s, withAllFields);
+    add(s, WhichFields::withAllFields);
     return s;
 }
 
diff --git a/include/xrpl/protocol/STPathSet.h b/include/xrpl/protocol/STPathSet.h
index 38f4668b5d..ce9a73523c 100644
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -25,6 +25,8 @@ class STPathElement final : public CountedObject<STPathElement>
     std::size_t hash_value_;
 
 public:
+    // Bitwise values (typeCurrency | typeMPT)
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum Type {
         typeNone = 0x00,
         typeAccount = 0x01,   // Rippling through an account (vs taking an offer).
diff --git a/include/xrpl/protocol/SeqProxy.h b/include/xrpl/protocol/SeqProxy.h
index 86742bacc1..820004681d 100644
--- a/include/xrpl/protocol/SeqProxy.h
+++ b/include/xrpl/protocol/SeqProxy.h
@@ -35,7 +35,7 @@ namespace xrpl {
 class SeqProxy
 {
 public:
-    enum Type : std::uint8_t { seq = 0, ticket };
+    enum class Type : std::uint8_t { seq = 0, ticket };
 
 private:
     std::uint32_t value_;
@@ -67,13 +67,13 @@ public:
     [[nodiscard]] constexpr bool
     isSeq() const
     {
-        return type_ == seq;
+        return type_ == Type::seq;
     }
 
     [[nodiscard]] constexpr bool
     isTicket() const
     {
-        return type_ == ticket;
+        return type_ == Type::ticket;
     }
 
     // Occasionally it is convenient to be able to increase the value_
diff --git a/include/xrpl/protocol/TER.h b/include/xrpl/protocol/TER.h
index efec25962d..6494453b91 100644
--- a/include/xrpl/protocol/TER.h
+++ b/include/xrpl/protocol/TER.h
@@ -19,6 +19,8 @@ using TERUnderlyingType = int;
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TELcodes : TERUnderlyingType {
     // Note: Range is stable.
     // Exact numbers are used in ripple-binary-codec:
@@ -50,6 +52,8 @@ enum TELcodes : TERUnderlyingType {
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TEMcodes : TERUnderlyingType {
     // Note: Range is stable.
     // Exact numbers are used in ripple-binary-codec:
@@ -126,6 +130,8 @@ enum TEMcodes : TERUnderlyingType {
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TEFcodes : TERUnderlyingType {
     // Note: Range is stable.
     // Exact numbers are used in ripple-binary-codec:
@@ -170,6 +176,8 @@ enum TEFcodes : TERUnderlyingType {
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TERcodes : TERUnderlyingType {
     // Note: Range is stable.
     // Exact numbers are used in ripple-binary-codec:
@@ -214,6 +222,8 @@ enum TERcodes : TERUnderlyingType {
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TEScodes : TERUnderlyingType {
     // Note: Exact number must stay stable.  This code is stored by value
     // in metadata for historic transactions.
@@ -229,6 +239,8 @@ enum TEScodes : TERUnderlyingType {
 
 //------------------------------------------------------------------------------
 
+// Protocol-critical, mixed with custom TER wrapper type, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TECcodes : TERUnderlyingType {
     // Note: Exact numbers must stay stable.  These codes are stored by
     // value in metadata for historic transactions.
diff --git a/include/xrpl/protocol/TxFormats.h b/include/xrpl/protocol/TxFormats.h
index 563a28f39f..235fb7b16e 100644
--- a/include/xrpl/protocol/TxFormats.h
+++ b/include/xrpl/protocol/TxFormats.h
@@ -35,6 +35,8 @@ namespace xrpl {
     @ingroup protocol
 */
 // clang-format off
+// Protocol-critical, hundreds of usages
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum TxType : std::uint16_t
 {
 
diff --git a/include/xrpl/resource/Disposition.h b/include/xrpl/resource/Disposition.h
index 22830ad470..59a1c3840a 100644
--- a/include/xrpl/resource/Disposition.h
+++ b/include/xrpl/resource/Disposition.h
@@ -3,7 +3,7 @@
 namespace xrpl::Resource {
 
 /** The disposition of a consumer after applying a load charge. */
-enum Disposition {
+enum class Disposition {
     /** No action required. */
     ok
 
diff --git a/include/xrpl/resource/detail/Entry.h b/include/xrpl/resource/detail/Entry.h
index 89f27b2672..2cbf06d5c3 100644
--- a/include/xrpl/resource/detail/Entry.h
+++ b/include/xrpl/resource/detail/Entry.h
@@ -39,7 +39,7 @@ struct Entry : public beast::List<Entry>::Node
     [[nodiscard]] bool
     isUnlimited() const
     {
-        return key->kind == kindUnlimited;
+        return key->kind == Kind::kindUnlimited;
     }
 
     // Balance including remote contributions
diff --git a/include/xrpl/resource/detail/Kind.h b/include/xrpl/resource/detail/Kind.h
index 74115ba7f1..5cbddce6bb 100644
--- a/include/xrpl/resource/detail/Kind.h
+++ b/include/xrpl/resource/detail/Kind.h
@@ -10,6 +10,6 @@ namespace xrpl::Resource {
  *                subjected to administrative restrictions, such as
  *                use of some RPC commands like "stop".
  */
-enum Kind { kindInbound, kindOutbound, kindUnlimited };
+enum class Kind { kindInbound, kindOutbound, kindUnlimited };
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/detail/Logic.h b/include/xrpl/resource/detail/Logic.h
index b775f0a965..3102a1f119 100644
--- a/include/xrpl/resource/detail/Logic.h
+++ b/include/xrpl/resource/detail/Logic.h
@@ -92,11 +92,11 @@ public:
         Entry* entry(nullptr);
 
         {
-            std::lock_guard const _(lock_);
+            std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(kindInbound, address.at_port(0)),  // Key
-                std::make_tuple(m_clock.now()));                   // Entry
+                std::make_tuple(Kind::kindInbound, address.at_port(0)),  // Key
+                std::make_tuple(m_clock.now()));                         // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -122,11 +122,11 @@ public:
         Entry* entry(nullptr);
 
         {
-            std::lock_guard const _(lock_);
+            std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(kindOutbound, address),  // Key
-                std::make_tuple(m_clock.now()));         // Entry
+                std::make_tuple(Kind::kindOutbound, address),  // Key
+                std::make_tuple(m_clock.now()));               // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -155,11 +155,11 @@ public:
         Entry* entry(nullptr);
 
         {
-            std::lock_guard const _(lock_);
+            std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(kindUnlimited, address.at_port(1)),  // Key
-                std::make_tuple(m_clock.now()));                     // Entry
+                std::make_tuple(Kind::kindUnlimited, address.at_port(1)),  // Key
+                std::make_tuple(m_clock.now()));                           // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -190,7 +190,7 @@ public:
         clock_type::time_point const now(m_clock.now());
 
         Json::Value ret(Json::objectValue);
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         for (auto& inboundEntry : inbound_)
         {
@@ -235,7 +235,7 @@ public:
         clock_type::time_point const now(m_clock.now());
 
         Gossip gossip;
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         gossip.items.reserve(inbound_.size());
 
@@ -260,7 +260,7 @@ public:
     {
         auto const elapsed = m_clock.now();
         {
-            std::lock_guard const _(lock_);
+            std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = importTable_.emplace(
                 std::piecewise_construct,
                 std::make_tuple(origin),                                     // Key
@@ -317,7 +317,7 @@ public:
     void
     periodicActivity()
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         auto const elapsed = m_clock.now();
 
@@ -375,7 +375,7 @@ public:
     void
     erase(Table::iterator iter)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         Entry& entry(iter->second);
         XRPL_ASSERT(entry.refcount == 0, "xrpl::Resource::Logic::erase : entry not used");
         inactive_.erase(inactive_.iterator_to(entry));
@@ -385,27 +385,27 @@ public:
     void
     acquire(Entry& entry)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         ++entry.refcount;
     }
 
     void
     release(Entry& entry)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         if (--entry.refcount == 0)
         {
             JLOG(m_journal.debug()) << "Inactive " << entry;
 
             switch (entry.key->kind)
             {
-                case kindInbound:
+                case Kind::kindInbound:
                     inbound_.erase(inbound_.iterator_to(entry));
                     break;
-                case kindOutbound:
+                case Kind::kindOutbound:
                     outbound_.erase(outbound_.iterator_to(entry));
                     break;
-                case kindUnlimited:
+                case Kind::kindUnlimited:
                     admin_.erase(admin_.iterator_to(entry));
                     break;
                 default:
@@ -443,7 +443,7 @@ public:
         if (!context.empty())
             context = " (" + context + ")";
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         clock_type::time_point const now(m_clock.now());
         int const balance(entry.add(fee.cost(), now));
         JLOG(getStream(fee.cost(), m_journal)) << "Charging " << entry << " for " << fee << context;
@@ -456,7 +456,7 @@ public:
         if (entry.isUnlimited())
             return false;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         bool notify(false);
         auto const elapsed = m_clock.now();
         if (entry.balance(m_clock.now()) >= warningThreshold && elapsed != entry.lastWarningTime)
@@ -479,7 +479,7 @@ public:
         if (entry.isUnlimited())
             return false;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         bool drop(false);
         clock_type::time_point const now(m_clock.now());
         int const balance(entry.balance(now));
@@ -501,7 +501,7 @@ public:
     int
     balance(Entry& entry)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         return entry.balance(m_clock.now());
     }
 
@@ -530,7 +530,7 @@ public:
     {
         clock_type::time_point const now(m_clock.now());
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         {
             beast::PropertyStream::Set s("inbound", map);
diff --git a/include/xrpl/resource/detail/Tuning.h b/include/xrpl/resource/detail/Tuning.h
index 1c903d8cd4..d5e872d16c 100644
--- a/include/xrpl/resource/detail/Tuning.h
+++ b/include/xrpl/resource/detail/Tuning.h
@@ -5,6 +5,8 @@
 namespace xrpl::Resource {
 
 /** Tunable constants. */
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Balance at which a warning is issued
     warningThreshold = 5000
diff --git a/include/xrpl/server/LoadFeeTrack.h b/include/xrpl/server/LoadFeeTrack.h
index 6b9e96241c..e54ea4d280 100644
--- a/include/xrpl/server/LoadFeeTrack.h
+++ b/include/xrpl/server/LoadFeeTrack.h
@@ -35,28 +35,28 @@ public:
     setRemoteFee(std::uint32_t f)
     {
         JLOG(j_.trace()) << "setRemoteFee: " << f;
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         remoteTxnLoadFee_ = f;
     }
 
     std::uint32_t
     getRemoteFee() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return remoteTxnLoadFee_;
     }
 
     std::uint32_t
     getLocalFee() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return localTxnLoadFee_;
     }
 
     std::uint32_t
     getClusterFee() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return clusterTxnLoadFee_;
     }
 
@@ -69,14 +69,14 @@ public:
     std::uint32_t
     getLoadFactor() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return std::max({clusterTxnLoadFee_, localTxnLoadFee_, remoteTxnLoadFee_});
     }
 
     std::pair<std::uint32_t, std::uint32_t>
     getScalingFactors() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
 
         return std::make_pair(
             std::max(localTxnLoadFee_, remoteTxnLoadFee_),
@@ -87,7 +87,7 @@ public:
     setClusterFee(std::uint32_t fee)
     {
         JLOG(j_.trace()) << "setClusterFee: " << fee;
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         clusterTxnLoadFee_ = fee;
     }
 
@@ -99,14 +99,14 @@ public:
     bool
     isLoadedLocal() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return (raiseCount_ != 0) || (localTxnLoadFee_ != lftNormalFee);
     }
 
     bool
     isLoadedCluster() const
     {
-        std::lock_guard const sl(lock_);
+        std::scoped_lock const sl(lock_);
         return (raiseCount_ != 0) || (localTxnLoadFee_ != lftNormalFee) ||
             (clusterTxnLoadFee_ != lftNormalFee);
     }
diff --git a/include/xrpl/server/detail/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h
index a0f8e1f318..31820402ab 100644
--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -38,6 +38,8 @@ protected:
     using endpoint_type = boost::asio::ip::tcp::endpoint;
     using yield_context = boost::asio::yield_context;
 
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // Size of our read/write buffer
         bufferSize = 4 * 1024,
@@ -303,7 +305,7 @@ BaseHTTPPeer<Handler, Impl>::on_write(error_code const& ec, std::size_t bytes_tr
         return fail(ec, "write");
     bytes_out_ += bytes_transferred;
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         wq2_.clear();
         wq2_.reserve(wq_.size());
         std::swap(wq2_, wq_);
@@ -395,7 +397,7 @@ BaseHTTPPeer<Handler, Impl>::write(void const* buf, std::size_t bytes)
     if (bytes == 0)
         return;
     if ([&] {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             wq_.emplace_back(buf, bytes);
             return wq_.size() == 1 && wq2_.size() == 0;
         }())
@@ -449,7 +451,7 @@ BaseHTTPPeer<Handler, Impl>::complete()
     complete_ = true;
 
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         if (!wq_.empty() && !wq2_.empty())
             return;
     }
@@ -484,7 +486,7 @@ BaseHTTPPeer<Handler, Impl>::close(bool graceful)
     {
         graceful_ = true;
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             if (!wq_.empty() || !wq2_.empty())
                 return;
         }
diff --git a/include/xrpl/server/detail/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h
index 14d2b56fe4..2c3a8330e1 100644
--- a/include/xrpl/server/detail/ServerImpl.h
+++ b/include/xrpl/server/detail/ServerImpl.h
@@ -62,6 +62,8 @@ class ServerImpl : public Server
 private:
     using clock_type = std::chrono::system_clock;
 
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { historySize = 100 };
 
     Handler& handler_;
diff --git a/include/xrpl/server/detail/io_list.h b/include/xrpl/server/detail/io_list.h
index 8c25a89f79..67e04d04b6 100644
--- a/include/xrpl/server/detail/io_list.h
+++ b/include/xrpl/server/detail/io_list.h
@@ -165,7 +165,7 @@ io_list::work::destroy()
         return;
     std::function<void(void)> f;
     {
-        std::lock_guard const lock(ios_->m_);
+        std::scoped_lock const lock(ios_->m_);
         ios_->map_.erase(this);
         if (--ios_->n_ == 0 && ios_->closed_)
         {
@@ -195,7 +195,7 @@ io_list::emplace(Args&&... args)
     auto sp = std::make_shared<T>(std::forward<Args>(args)...);
     decltype(sp) dead;
 
-    std::lock_guard const lock(m_);
+    std::scoped_lock const lock(m_);
     if (!closed_)
     {
         ++n_;
diff --git a/include/xrpl/shamap/FullBelowCache.h b/include/xrpl/shamap/FullBelowCache.h
index 6a6da1463a..e17a640672 100644
--- a/include/xrpl/shamap/FullBelowCache.h
+++ b/include/xrpl/shamap/FullBelowCache.h
@@ -22,6 +22,8 @@ private:
     using CacheType = KeyCache;
 
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { defaultCacheTargetSize = 0 };
 
     using key_type = uint256;
diff --git a/include/xrpl/tx/Transactor.h b/include/xrpl/tx/Transactor.h
index e20ac70850..918bbe5da6 100644
--- a/include/xrpl/tx/Transactor.h
+++ b/include/xrpl/tx/Transactor.h
@@ -123,6 +123,8 @@ public:
     Transactor(Transactor const&) = delete;
     Transactor&
     operator=(Transactor const&) = delete;
+    // 68 transactor subclass files
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum ConsequencesFactoryType { Normal, Blocker, Custom };
 
     /** Process the transaction. */
diff --git a/include/xrpl/tx/applySteps.h b/include/xrpl/tx/applySteps.h
index 4f857bb7c1..dc4140956c 100644
--- a/include/xrpl/tx/applySteps.h
+++ b/include/xrpl/tx/applySteps.h
@@ -39,7 +39,7 @@ class TxConsequences
 public:
     /// Describes how the transaction affects subsequent
     /// transactions
-    enum Category {
+    enum class Category {
         /// Moves currency around, creates offers, etc.
         normal = 0,
         /// Affects the ability of subsequent transactions
diff --git a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
index 684e40c8cf..44131167b6 100644
--- a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
+++ b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
@@ -25,6 +25,8 @@ not have the relevant amendments enabled_. It's intentionally a pain in the neck
 so that bad code gets caught and fixed as early as possible.
 */
 
+// Bitwise flags, 86 files
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Privilege {
     noPriv = 0x0000,              // The transaction can not do any of the enumerated operations
     createAcct = 0x0001,          // The transaction can create a new ACCOUNT_ROOT object.
diff --git a/include/xrpl/tx/invariants/MPTInvariant.h b/include/xrpl/tx/invariants/MPTInvariant.h
index e3aa06016a..7f405814e7 100644
--- a/include/xrpl/tx/invariants/MPTInvariant.h
+++ b/include/xrpl/tx/invariants/MPTInvariant.h
@@ -35,10 +35,10 @@ public:
  */
 class ValidMPTPayment
 {
-    enum Order { Before = 0, After = 1 };
+    enum class Order { Before = 0, After = 1 };
     struct MPTData
     {
-        std::array<std::int64_t, After + 1> outstanding{};
+        std::array<std::int64_t, 2> outstanding{};
         // sum (MPT after - MPT before)
         std::int64_t mptAmount{0};
     };
diff --git a/include/xrpl/tx/paths/detail/Steps.h b/include/xrpl/tx/paths/detail/Steps.h
index b4d9d6e0b4..9b37f06ca9 100644
--- a/include/xrpl/tx/paths/detail/Steps.h
+++ b/include/xrpl/tx/paths/detail/Steps.h
@@ -21,7 +21,7 @@ class AMMContext;
 enum class DebtDirection { issues, redeems };
 enum class QualityDirection { in, out };
 enum class StrandDirection { forward, reverse };
-enum OfferCrossing { no = 0, yes = 1, sell = 2 };
+enum class OfferCrossing { no = 0, yes = 1, sell = 2 };
 
 inline bool
 redeems(DebtDirection dir)
diff --git a/include/xrpl/tx/paths/detail/StrandFlow.h b/include/xrpl/tx/paths/detail/StrandFlow.h
index ee23de27b3..03ec9cc871 100644
--- a/include/xrpl/tx/paths/detail/StrandFlow.h
+++ b/include/xrpl/tx/paths/detail/StrandFlow.h
@@ -665,7 +665,7 @@ flow(
             // the previous strand execution failed. It has to be reset
             // since this strand might not have AMM liquidity.
             ammContext.clear();
-            if (offerCrossing && limitQuality)
+            if (offerCrossing != OfferCrossing::no && limitQuality)
             {
                 auto const strandQ = qualityUpperBound(sb, *strand);
                 if (!strandQ || *strandQ < *limitQuality)
@@ -797,7 +797,8 @@ flow(
             // fixFillOrKill amendment:
             //   That case is handled here if tfSell is also not set; i.e,
             //   case 1.
-            if (!offerCrossing || (fillOrKillEnabled && offerCrossing != OfferCrossing::sell))
+            if (offerCrossing == OfferCrossing::no ||
+                (fillOrKillEnabled && offerCrossing != OfferCrossing::sell))
                 return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
         }
         else if (actualOut == beast::zero)
@@ -805,7 +806,7 @@ flow(
             return {tecPATH_DRY, std::move(ofrsToRmOnFail)};
         }
     }
-    if (offerCrossing &&
+    if (offerCrossing != OfferCrossing::no &&
         (!partialPayment && (!fillOrKillEnabled || offerCrossing == OfferCrossing::sell)))
     {
         // If we're offer crossing and partialPayment is *not* true, then
diff --git a/include/xrpl/tx/transactors/account/SignerListSet.h b/include/xrpl/tx/transactors/account/SignerListSet.h
index 1f1a68ccc8..12419076e3 100644
--- a/include/xrpl/tx/transactors/account/SignerListSet.h
+++ b/include/xrpl/tx/transactors/account/SignerListSet.h
@@ -18,8 +18,8 @@ class SignerListSet : public Transactor
 {
 private:
     // Values determined during preCompute for use later.
-    enum Operation { unknown, set, destroy };
-    Operation do_{unknown};
+    enum class Operation { unknown, set, destroy };
+    Operation do_{Operation::unknown};
     std::uint32_t quorum_{0};
     std::vector<SignerEntries::SignerEntry> signers_;
 
diff --git a/include/xrpl/tx/transactors/system/LedgerStateFix.h b/include/xrpl/tx/transactors/system/LedgerStateFix.h
index a236a52c74..da3cb33398 100644
--- a/include/xrpl/tx/transactors/system/LedgerStateFix.h
+++ b/include/xrpl/tx/transactors/system/LedgerStateFix.h
@@ -7,7 +7,7 @@ namespace xrpl {
 class LedgerStateFix : public Transactor
 {
 public:
-    enum FixType : std::uint16_t {
+    enum class FixType : std::uint16_t {
         nfTokenPageLink = 1,
     };
 
diff --git a/src/libxrpl/basics/Log.cpp b/src/libxrpl/basics/Log.cpp
index e855e1006b..eb93feaa3e 100644
--- a/src/libxrpl/basics/Log.cpp
+++ b/src/libxrpl/basics/Log.cpp
@@ -120,7 +120,7 @@ Logs::open(boost::filesystem::path const& pathToLogFile)
 beast::Journal::Sink&
 Logs::get(std::string const& name)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     auto const result = sinks_.emplace(name, makeSink(name, thresh_));
     return *result.first->second;
 }
@@ -146,7 +146,7 @@ Logs::threshold() const
 void
 Logs::threshold(beast::severities::Severity thresh)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     thresh_ = thresh;
     for (auto& sink : sinks_)
         sink.second->threshold(thresh);
@@ -156,7 +156,7 @@ std::vector<std::pair<std::string, std::string>>
 Logs::partition_severities() const
 {
     std::vector<std::pair<std::string, std::string>> list;
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     list.reserve(sinks_.size());
     for (auto const& [name, sink] : sinks_)
         list.emplace_back(name, toString(fromSeverity(sink->threshold())));
@@ -172,7 +172,7 @@ Logs::write(
 {
     std::string s;
     format(s, text, level, partition);
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     file_.writeln(s);
     if (!silent_)
         std::cerr << s << '\n';
@@ -184,7 +184,7 @@ Logs::write(
 std::string
 Logs::rotate()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     bool const wasOpened = file_.closeAndReopen();
     if (wasOpened)
         return "The log file was closed and reopened.";
@@ -412,7 +412,7 @@ public:
     std::unique_ptr<beast::Journal::Sink>
     set(std::unique_ptr<beast::Journal::Sink> sink)
     {
-        std::lock_guard const _(m_);
+        std::scoped_lock const _(m_);
 
         using std::swap;
         swap(holder_, sink);
@@ -432,7 +432,7 @@ public:
     beast::Journal::Sink&
     get()
     {
-        std::lock_guard const _(m_);
+        std::scoped_lock const _(m_);
         return sink_.get();
     }
 };
diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp
index 3b2b8670cb..ba444b77e0 100644
--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -27,7 +27,7 @@ using int128_t = __int128_t;
 
 namespace xrpl {
 
-thread_local Number::rounding_mode Number::mode_ = Number::to_nearest;
+thread_local Number::rounding_mode Number::mode_ = Number::rounding_mode::to_nearest;
 thread_local std::reference_wrapper<MantissaRange const> Number::range_ = largeRange;
 
 Number::rounding_mode
@@ -51,9 +51,10 @@ Number::getMantissaScale()
 void
 Number::setMantissaScale(MantissaRange::mantissa_scale scale)
 {
-    if (scale != MantissaRange::small && scale != MantissaRange::large)
+    if (scale != MantissaRange::mantissa_scale::small &&
+        scale != MantissaRange::mantissa_scale::large)
         LogicError("Unknown mantissa scale");
-    range_ = scale == MantissaRange::small ? smallRange : largeRange;
+    range_ = scale == MantissaRange::mantissa_scale::small ? smallRange : largeRange;
 }
 
 // Guard
@@ -176,10 +177,10 @@ Number::Guard::round() const noexcept
 {
     auto mode = Number::getround();
 
-    if (mode == towards_zero)
+    if (mode == rounding_mode::towards_zero)
         return -1;
 
-    if (mode == downward)
+    if (mode == rounding_mode::downward)
     {
         if (sbit_)
         {
@@ -189,7 +190,7 @@ Number::Guard::round() const noexcept
         return -1;
     }
 
-    if (mode == upward)
+    if (mode == rounding_mode::upward)
     {
         if (sbit_)
             return -1;
@@ -729,7 +730,7 @@ Number::operator/=(Number const& y)
     // f can be up to 10^(38-19) = 10^19 safely
     static_assert(smallRange.log == 15);
     static_assert(largeRange.log == 18);
-    bool const small = Number::getMantissaScale() == MantissaRange::small;
+    bool const small = Number::getMantissaScale() == MantissaRange::mantissa_scale::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");
 
diff --git a/src/libxrpl/basics/ResolverAsio.cpp b/src/libxrpl/basics/ResolverAsio.cpp
index fc71666768..0443aa3502 100644
--- a/src/libxrpl/basics/ResolverAsio.cpp
+++ b/src/libxrpl/basics/ResolverAsio.cpp
@@ -177,7 +177,7 @@ public:
         if (m_stopped.exchange(false))
         {
             {
-                std::lock_guard const lk{m_mut};
+                std::scoped_lock const lk{m_mut};
                 m_asyncHandlersCompleted = false;
             }
             addReference();
diff --git a/src/libxrpl/beast/clock/basic_seconds_clock.cpp b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
index 2b7ce57742..dc8f785974 100644
--- a/src/libxrpl/beast/clock/basic_seconds_clock.cpp
+++ b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
@@ -42,7 +42,7 @@ seconds_clock_thread::~seconds_clock_thread()
     XRPL_ASSERT(
         thread_.joinable(), "beast::seconds_clock_thread::~seconds_clock_thread : thread joinable");
     {
-        std::lock_guard const lock(mut_);
+        std::scoped_lock const lock(mut_);
         stop_ = true;
     }  // publish stop_ asap so if waiting thread times-out, it will see it
     cv_.notify_one();
diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp
index d11e85830f..a83a11d7d6 100644
--- a/src/libxrpl/beast/insight/StatsDCollector.cpp
+++ b/src/libxrpl/beast/insight/StatsDCollector.cpp
@@ -204,6 +204,8 @@ class StatsDCollectorImp : public StatsDCollector,
                            public std::enable_shared_from_this<StatsDCollectorImp>
 {
 private:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // max_packet_size = 484
         max_packet_size = 1472
@@ -293,14 +295,14 @@ public:
     void
     add(StatsDMetricBase& metric)
     {
-        std::lock_guard const _(metricsLock_);
+        std::scoped_lock const _(metricsLock_);
         metrics_.push_back(metric);
     }
 
     void
     remove(StatsDMetricBase& metric)
     {
-        std::lock_guard const _(metricsLock_);
+        std::scoped_lock const _(metricsLock_);
         metrics_.erase(metrics_.iterator_to(metric));
     }
 
@@ -444,7 +446,7 @@ public:
             return;
         }
 
-        std::lock_guard const _(metricsLock_);
+        std::scoped_lock const _(metricsLock_);
 
         for (auto& m : metrics_)
             m.do_process();
diff --git a/src/libxrpl/beast/utility/beast_PropertyStream.cpp b/src/libxrpl/beast/utility/beast_PropertyStream.cpp
index ddfe075132..62c192bf64 100644
--- a/src/libxrpl/beast/utility/beast_PropertyStream.cpp
+++ b/src/libxrpl/beast/utility/beast_PropertyStream.cpp
@@ -158,7 +158,7 @@ PropertyStream::Source::Source(std::string name) : m_name(std::move(name)), item
 
 PropertyStream::Source::~Source()
 {
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
     if (parent_ != nullptr)
         parent_->remove(*this);
     removeAll();
@@ -173,9 +173,7 @@ PropertyStream::Source::name() const
 void
 PropertyStream::Source::add(Source& source)
 {
-    std::lock(lock_, source.lock_);
-    std::lock_guard const lk1(lock_, std::adopt_lock);
-    std::lock_guard const lk2(source.lock_, std::adopt_lock);
+    std::scoped_lock const lock(lock_, source.lock_);
 
     XRPL_ASSERT(
         source.parent_ == nullptr, "beast::PropertyStream::Source::add : null source parent");
@@ -186,9 +184,7 @@ PropertyStream::Source::add(Source& source)
 void
 PropertyStream::Source::remove(Source& child)
 {
-    std::lock(lock_, child.lock_);
-    std::lock_guard const lk1(lock_, std::adopt_lock);
-    std::lock_guard const lk2(child.lock_, std::adopt_lock);
+    std::scoped_lock const lock(lock_, child.lock_);
 
     XRPL_ASSERT(
         child.parent_ == this, "beast::PropertyStream::Source::remove : child parent match");
@@ -199,10 +195,10 @@ PropertyStream::Source::remove(Source& child)
 void
 PropertyStream::Source::removeAll()
 {
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
     for (auto iter = children_.begin(); iter != children_.end();)
     {
-        std::lock_guard const _cl((*iter)->lock_);
+        std::scoped_lock const _cl((*iter)->lock_);
         remove(*(*iter));
     }
 }
@@ -222,7 +218,7 @@ PropertyStream::Source::write(PropertyStream& stream)
     Map map(m_name, stream);
     onWrite(map);
 
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
 
     for (auto& child : children_)
         child.source().write(stream);
@@ -324,7 +320,7 @@ PropertyStream::Source::find_one_deep(std::string const& name)
     if (found != nullptr)
         return found;
 
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
     for (auto& s : children_)
     {
         found = s.source().find_one_deep(name);
@@ -355,7 +351,7 @@ PropertyStream::Source::find_path(std::string path)
 PropertyStream::Source*
 PropertyStream::Source::find_one(std::string const& name)
 {
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
     for (auto& s : children_)
     {
         if (s.source().m_name == name)
diff --git a/src/libxrpl/core/HashRouter.cpp b/src/libxrpl/core/HashRouter.cpp
index 4175d83340..ecc2aa9f14 100644
--- a/src/libxrpl/core/HashRouter.cpp
+++ b/src/libxrpl/core/HashRouter.cpp
@@ -34,7 +34,7 @@ HashRouter::emplace(uint256 const& key) -> std::pair<Entry&, bool>
 void
 HashRouter::addSuppression(uint256 const& key)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     emplace(key);
 }
@@ -48,7 +48,7 @@ HashRouter::addSuppressionPeer(uint256 const& key, PeerShortID peer)
 std::pair<bool, std::optional<Stopwatch::time_point>>
 HashRouter::addSuppressionPeerWithStatus(uint256 const& key, PeerShortID peer)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto result = emplace(key);
     result.first.addPeer(peer);
@@ -58,7 +58,7 @@ HashRouter::addSuppressionPeerWithStatus(uint256 const& key, PeerShortID peer)
 bool
 HashRouter::addSuppressionPeer(uint256 const& key, PeerShortID peer, HashRouterFlags& flags)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto [s, created] = emplace(key);
     s.addPeer(peer);
@@ -73,7 +73,7 @@ HashRouter::shouldProcess(
     HashRouterFlags& flags,
     std::chrono::seconds tx_interval)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto result = emplace(key);
     auto& s = result.first;
@@ -85,7 +85,7 @@ HashRouter::shouldProcess(
 HashRouterFlags
 HashRouter::getFlags(uint256 const& key)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     return emplace(key).first.getFlags();
 }
@@ -95,7 +95,7 @@ HashRouter::setFlags(uint256 const& key, HashRouterFlags flags)
 {
     XRPL_ASSERT(static_cast<bool>(flags), "xrpl::HashRouter::setFlags : valid input");
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto& s = emplace(key).first;
 
@@ -109,7 +109,7 @@ HashRouter::setFlags(uint256 const& key, HashRouterFlags flags)
 auto
 HashRouter::shouldRelay(uint256 const& key) -> std::optional<std::set<PeerShortID>>
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto& s = emplace(key).first;
 
diff --git a/src/libxrpl/core/detail/JobQueue.cpp b/src/libxrpl/core/detail/JobQueue.cpp
index d55160f285..9e6756e0c0 100644
--- a/src/libxrpl/core/detail/JobQueue.cpp
+++ b/src/libxrpl/core/detail/JobQueue.cpp
@@ -39,7 +39,7 @@ JobQueue::JobQueue(
     job_count = m_collector->make_gauge("job_count");
 
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
 
         for (auto const& x : JobTypes::instance())
         {
@@ -65,7 +65,7 @@ JobQueue::~JobQueue()
 void
 JobQueue::collect()
 {
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
     job_count = m_jobSet.size();
 }
 
@@ -91,7 +91,7 @@ JobQueue::addRefCountedJob(JobType type, std::string const& name, JobFunction co
         "requires no threads");
 
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         auto result = m_jobSet.emplace(type, name, ++m_lastJob, data.load(), func);
         auto const& job = *result.first;
 
@@ -119,7 +119,7 @@ JobQueue::addRefCountedJob(JobType type, std::string const& name, JobFunction co
 int
 JobQueue::getJobCount(JobType t) const
 {
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
 
     JobDataMap::const_iterator const c = m_jobData.find(t);
 
@@ -129,7 +129,7 @@ JobQueue::getJobCount(JobType t) const
 int
 JobQueue::getJobCountTotal(JobType t) const
 {
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
 
     JobDataMap::const_iterator const c = m_jobData.find(t);
 
@@ -142,7 +142,7 @@ JobQueue::getJobCountGE(JobType t) const
     // return the number of jobs at this priority level or greater
     int ret = 0;
 
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
 
     for (auto const& x : m_jobData)
     {
@@ -192,7 +192,7 @@ JobQueue::getJson(int c)
 
     Json::Value priorities = Json::arrayValue;
 
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
 
     for (auto& x : m_jobData)
     {
@@ -349,7 +349,7 @@ JobQueue::processTask(int instance)
         {
             Job job;
             {
-                std::lock_guard const lock(m_mutex);
+                std::scoped_lock const lock(m_mutex);
                 getNextJob(job);
                 ++m_processCount;
             }
@@ -376,7 +376,7 @@ JobQueue::processTask(int instance)
     }
 
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         // Job should be destroyed before stopping
         // otherwise destructors with side effects can access
         // parent objects that are already destroyed.
diff --git a/src/libxrpl/core/detail/LoadMonitor.cpp b/src/libxrpl/core/detail/LoadMonitor.cpp
index 2cf4e1f6ea..aea535fb81 100644
--- a/src/libxrpl/core/detail/LoadMonitor.cpp
+++ b/src/libxrpl/core/detail/LoadMonitor.cpp
@@ -108,7 +108,7 @@ LoadMonitor::addLoadSample(LoadEvent const& s)
 void
 LoadMonitor::addSamples(int count, std::chrono::milliseconds latency)
 {
-    std::lock_guard const sl(mutex_);
+    std::scoped_lock const sl(mutex_);
 
     update();
     mCounts += count;
@@ -140,7 +140,7 @@ LoadMonitor::isOverTarget(std::chrono::milliseconds avg, std::chrono::millisecon
 bool
 LoadMonitor::isOver()
 {
-    std::lock_guard const sl(mutex_);
+    std::scoped_lock const sl(mutex_);
 
     update();
 
@@ -157,7 +157,7 @@ LoadMonitor::getStats()
     using namespace std::chrono_literals;
     Stats stats;
 
-    std::lock_guard const sl(mutex_);
+    std::scoped_lock const sl(mutex_);
 
     update();
 
diff --git a/src/libxrpl/core/detail/Workers.cpp b/src/libxrpl/core/detail/Workers.cpp
index e7d63c0900..a6f8885a86 100644
--- a/src/libxrpl/core/detail/Workers.cpp
+++ b/src/libxrpl/core/detail/Workers.cpp
@@ -151,7 +151,7 @@ Workers::Worker::Worker(Workers& workers, std::string threadName, int const inst
 Workers::Worker::~Worker()
 {
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         ++wakeCount_;
         shouldExit_ = true;
     }
@@ -163,7 +163,7 @@ Workers::Worker::~Worker()
 void
 Workers::Worker::notify()
 {
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
     ++wakeCount_;
     wakeup_.notify_one();
 }
@@ -179,7 +179,7 @@ Workers::Worker::run()
         //
         if (++m_workers.m_activeCount == 1)
         {
-            std::lock_guard const lk{m_workers.m_mut};
+            std::scoped_lock const lk{m_workers.m_mut};
             m_workers.m_allPaused = false;
         }
 
@@ -226,7 +226,7 @@ Workers::Worker::run()
             // the predicate evaluation and the actual sleep.
             if (--m_workers.m_runningTaskCount == 0)
             {
-                std::lock_guard const lk{m_workers.m_mut};
+                std::scoped_lock const lk{m_workers.m_mut};
                 m_workers.m_cv.notify_all();
             }
         }
@@ -242,7 +242,7 @@ Workers::Worker::run()
         //
         if (--m_workers.m_activeCount == 0)
         {
-            std::lock_guard const lk{m_workers.m_mut};
+            std::scoped_lock const lk{m_workers.m_mut};
             m_workers.m_allPaused = true;
             m_workers.m_cv.notify_all();
         }
diff --git a/src/libxrpl/crypto/csprng.cpp b/src/libxrpl/crypto/csprng.cpp
index dc16c9ac64..7aef9b2831 100644
--- a/src/libxrpl/crypto/csprng.cpp
+++ b/src/libxrpl/crypto/csprng.cpp
@@ -43,7 +43,7 @@ csprng_engine::mix_entropy(void* buffer, std::size_t count)
             e = rd();
     }
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     // We add data to the pool, but we conservatively assume that
     // it contributes no actual entropy.
@@ -60,7 +60,7 @@ csprng_engine::operator()(void* ptr, std::size_t count)
     // with thread support, so we don't need to grab a mutex.
     // https://mta.openssl.org/pipermail/openssl-users/2020-November/013146.html
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || !defined(OPENSSL_THREADS)
-    std::lock_guard lock(mutex_);
+    std::scoped_lock lock(mutex_);
 #endif
 
     auto const result = RAND_bytes(reinterpret_cast<unsigned char*>(ptr), count);
diff --git a/src/libxrpl/json/Output.cpp b/src/libxrpl/json/Output.cpp
index e588d21d3c..31d74db7e0 100644
--- a/src/libxrpl/json/Output.cpp
+++ b/src/libxrpl/json/Output.cpp
@@ -45,7 +45,7 @@ outputJson(Json::Value const& value, Writer& writer)
         }
 
         case Json::arrayValue: {
-            writer.startRoot(Writer::array);
+            writer.startRoot(Writer::CollectionType::array);
             for (auto const& i : value)
             {
                 writer.rawAppend();
@@ -56,7 +56,7 @@ outputJson(Json::Value const& value, Writer& writer)
         }
 
         case Json::objectValue: {
-            writer.startRoot(Writer::object);
+            writer.startRoot(Writer::CollectionType::object);
             auto members = value.getMemberNames();
             for (auto const& tag : members)
             {
diff --git a/src/libxrpl/json/Writer.cpp b/src/libxrpl/json/Writer.cpp
index b4a85e0170..188f0749f0 100644
--- a/src/libxrpl/json/Writer.cpp
+++ b/src/libxrpl/json/Writer.cpp
@@ -81,7 +81,7 @@ public:
     void
     start(CollectionType ct)
     {
-        char const ch = (ct == array) ? openBracket : openBrace;
+        char const ch = (ct == CollectionType::array) ? openBracket : openBrace;
         output({&ch, 1});
         stack_.emplace(Collection{.type = ct});
     }
@@ -134,7 +134,9 @@ public:
         auto t = stack_.top().type;
         if (t != type)
         {
-            check(false, "Not an " + ((type == array ? "array: " : "object: ") + message));
+            check(
+                false,
+                "Not an " + ((type == CollectionType::array ? "array: " : "object: ") + message));
         }
         if (stack_.top().isFirst)
         {
@@ -171,7 +173,7 @@ public:
     {
         check(!empty(), "Empty stack in finish()");
 
-        auto isArray = stack_.top().type == array;
+        auto isArray = stack_.top().type == CollectionType::array;
         auto ch = isArray ? closeBracket : closeBrace;
         output_({&ch, 1});
         stack_.pop();
@@ -301,7 +303,7 @@ Writer::finishAll()
 void
 Writer::rawAppend()
 {
-    impl_->nextCollectionEntry(array, "append");
+    impl_->nextCollectionEntry(CollectionType::array, "append");
 }
 
 void
@@ -309,7 +311,7 @@ Writer::rawSet(std::string const& tag)
 {
     check(!tag.empty(), "Tag can't be empty");
 
-    impl_->nextCollectionEntry(object, "set");
+    impl_->nextCollectionEntry(CollectionType::object, "set");
     impl_->writeObjectTag(tag);
 }
 
@@ -322,14 +324,14 @@ Writer::startRoot(CollectionType type)
 void
 Writer::startAppend(CollectionType type)
 {
-    impl_->nextCollectionEntry(array, "startAppend");
+    impl_->nextCollectionEntry(CollectionType::array, "startAppend");
     impl_->start(type);
 }
 
 void
 Writer::startSet(CollectionType type, std::string const& key)
 {
-    impl_->nextCollectionEntry(object, "startSet");
+    impl_->nextCollectionEntry(CollectionType::object, "startSet");
     impl_->writeObjectTag(key);
     impl_->start(type);
 }
diff --git a/src/libxrpl/ledger/AcceptedLedgerTx.cpp b/src/libxrpl/ledger/AcceptedLedgerTx.cpp
index e609f5bdc8..21baa24323 100644
--- a/src/libxrpl/ledger/AcceptedLedgerTx.cpp
+++ b/src/libxrpl/ledger/AcceptedLedgerTx.cpp
@@ -62,8 +62,8 @@ AcceptedLedgerTx::AcceptedLedgerTx(
                 *ledger,
                 account,
                 amount,
-                fhIGNORE_FREEZE,
-                ahIGNORE_AUTH,
+                FreezeHandling::fhIGNORE_FREEZE,
+                AuthHandling::ahIGNORE_AUTH,
                 beast::Journal{beast::Journal::getNullSink()});
             mJson[jss::transaction][jss::owner_funds] = ownerFunds.getText();
         }
diff --git a/src/libxrpl/ledger/BookListeners.cpp b/src/libxrpl/ledger/BookListeners.cpp
index 36d02427bc..d922dc3a67 100644
--- a/src/libxrpl/ledger/BookListeners.cpp
+++ b/src/libxrpl/ledger/BookListeners.cpp
@@ -13,21 +13,21 @@ namespace xrpl {
 void
 BookListeners::addSubscriber(InfoSub::ref sub)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     mListeners[sub->getSeq()] = sub;
 }
 
 void
 BookListeners::removeSubscriber(std::uint64_t seq)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     mListeners.erase(seq);
 }
 
 void
 BookListeners::publish(MultiApiJson const& jvObj, hash_set<std::uint64_t>& havePublished)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     auto it = mListeners.cbegin();
 
     while (it != mListeners.cend())
diff --git a/src/libxrpl/ledger/CachedView.cpp b/src/libxrpl/ledger/CachedView.cpp
index 6bbe2d828b..bb7ff97153 100644
--- a/src/libxrpl/ledger/CachedView.cpp
+++ b/src/libxrpl/ledger/CachedView.cpp
@@ -30,7 +30,7 @@ CachedViewImpl::read(Keylet const& k) const
 
     auto const digest = [&]() -> std::optional<uint256> {
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             auto const iter = map_.find(k.key);
             if (iter != map_.end())
             {
@@ -66,7 +66,7 @@ CachedViewImpl::read(Keylet const& k) const
         // Avoid acquiring this lock unless necessary. It is only necessary if
         // the key was not found in the map_. The lock is needed to add the key
         // and digest.
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         map_.emplace(k.key, *digest);
     }
     if (!sle || !k.check(*sle))
diff --git a/src/libxrpl/ledger/Ledger.cpp b/src/libxrpl/ledger/Ledger.cpp
index 18db482538..729f1ebce9 100644
--- a/src/libxrpl/ledger/Ledger.cpp
+++ b/src/libxrpl/ledger/Ledger.cpp
@@ -204,7 +204,7 @@ Ledger::Ledger(
         rawInsert(sle);
     }
 
-    stateMap_.flushDirty(hotACCOUNT_NODE);
+    stateMap_.flushDirty(NodeObjectType::hotACCOUNT_NODE);
     setImmutable();
 }
 
diff --git a/src/libxrpl/ledger/helpers/AMMHelpers.cpp b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
index 94ca2469f7..cc91dcaaf4 100644
--- a/src/libxrpl/ledger/helpers/AMMHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
@@ -46,7 +46,8 @@ STAmount
 ammLPTokens(STAmount const& asset1, STAmount const& asset2, Asset const& lptIssue)
 {
     // AMM invariant: sqrt(asset1 * asset2) >= LPTokensBalance
-    auto const rounding = isFeatureEnabled(fixAMMv1_3) ? Number::downward : Number::getround();
+    auto const rounding =
+        isFeatureEnabled(fixAMMv1_3) ? Number::rounding_mode::downward : Number::getround();
     NumberRoundModeGuard const g(rounding);
     auto const tokens = root2(asset1 * asset2);
     return toSTAmount(lptIssue, tokens);
@@ -77,7 +78,7 @@ lpTokensOut(
 
     // minimize tokens out
     auto const frac = (r - c) / (1 + c);
-    return multiply(lptAMMBalance, frac, Number::downward);
+    return multiply(lptAMMBalance, frac, Number::rounding_mode::downward);
 }
 
 /* Equation 4 solves equation 3 for b:
@@ -113,7 +114,7 @@ ammAssetIn(
 
     // maximize deposit
     auto const frac = solveQuadraticEq(a, b, c);
-    return multiply(asset1Balance, frac, Number::upward);
+    return multiply(asset1Balance, frac, Number::rounding_mode::upward);
 }
 
 /* Equation 7:
@@ -138,7 +139,7 @@ lpTokensIn(
 
     // maximize tokens in
     auto const frac = (c - root2(c * c - 4 * fr)) / 2;
-    return multiply(lptAMMBalance, frac, Number::upward);
+    return multiply(lptAMMBalance, frac, Number::rounding_mode::upward);
 }
 
 /* Equation 8 solves equation 7 for b:
@@ -168,7 +169,7 @@ ammAssetOut(
 
     // minimize withdraw
     auto const frac = (t1 * t1 - t1 * (2 - f)) / (t1 * f - 1);
-    return multiply(assetBalance, frac, Number::downward);
+    return multiply(assetBalance, frac, Number::rounding_mode::downward);
 }
 
 Number
diff --git a/src/libxrpl/ledger/helpers/LendingHelpers.cpp b/src/libxrpl/ledger/helpers/LendingHelpers.cpp
index caccca752d..a263791e39 100644
--- a/src/libxrpl/ledger/helpers/LendingHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/LendingHelpers.cpp
@@ -93,8 +93,8 @@ loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval)
 bool
 isRounded(Asset const& asset, Number const& value, std::int32_t scale)
 {
-    return roundToAsset(asset, value, scale, Number::downward) ==
-        roundToAsset(asset, value, scale, Number::upward);
+    return roundToAsset(asset, value, scale, Number::rounding_mode::downward) ==
+        roundToAsset(asset, value, scale, Number::rounding_mode::upward);
 }
 
 namespace detail {
@@ -458,7 +458,11 @@ tryOverpayment(
     // preserved rounding errors. This ensures the loan's tracked state remains
     // consistent with its payment history.
     auto const principalOutstanding = std::clamp(
-        roundToAsset(asset, newTheoreticalState.principalOutstanding, loanScale, Number::upward),
+        roundToAsset(
+            asset,
+            newTheoreticalState.principalOutstanding,
+            loanScale,
+            Number::rounding_mode::upward),
         numZero,
         roundedOldState.principalOutstanding);
     auto const totalValueOutstanding = std::clamp(
@@ -466,7 +470,7 @@ tryOverpayment(
             asset,
             principalOutstanding + newTheoreticalState.interestOutstanding(),
             loanScale,
-            Number::upward),
+            Number::rounding_mode::upward),
         numZero,
         roundedOldState.valueOutstanding);
     auto const managementFeeOutstanding = std::clamp(
@@ -836,7 +840,8 @@ computeFullPayment(
     // Split the full payment interest into net interest (to vault) and
     // management fee (to broker), applying proper rounding.
     auto const [roundedFullInterest, roundedFullManagementFee] = [&]() {
-        auto const interest = roundToAsset(asset, fullPaymentInterest, loanScale, Number::downward);
+        auto const interest =
+            roundToAsset(asset, fullPaymentInterest, loanScale, Number::rounding_mode::downward);
         return computeInterestAndFeeParts(asset, interest, managementFeeRate, loanScale);
     }();
 
@@ -1286,7 +1291,7 @@ checkLoanGuards(
     // loan can't be amortized in the specified number of payments, raise an
     // error
     {
-        NumberRoundModeGuard const mg(Number::upward);
+        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
 
         if (std::int64_t const computedPayments{
                 properties.loanState.valueOutstanding / roundedPayment};
@@ -1465,7 +1470,8 @@ computeManagementFee(
     TenthBips32 managementFeeRate,
     std::int32_t scale)
 {
-    return roundToAsset(asset, tenthBipsOfValue(value, managementFeeRate), scale, Number::downward);
+    return roundToAsset(
+        asset, tenthBipsOfValue(value, managementFeeRate), scale, Number::rounding_mode::downward);
 }
 
 /*
@@ -1519,7 +1525,8 @@ computeLoanProperties(
 
     auto const [totalValueOutstanding, loanScale] = [&]() {
         // only round up if there should be interest
-        NumberRoundModeGuard const mg(periodicRate == 0 ? Number::to_nearest : Number::upward);
+        NumberRoundModeGuard const mg(
+            periodicRate == 0 ? Number::rounding_mode::to_nearest : Number::rounding_mode::upward);
         // Use STAmount's internal rounding instead of roundToAsset, because
         // we're going to use this result to determine the scale for all the
         // other rounding.
@@ -1548,7 +1555,7 @@ computeLoanProperties(
     // validate that the principal fits in it, so to allow this function to
     // succeed, round it here, and let the caller do the validation.
     auto const roundedPrincipalOutstanding =
-        roundToAsset(asset, principalOutstanding, loanScale, Number::to_nearest);
+        roundToAsset(asset, principalOutstanding, loanScale, Number::rounding_mode::to_nearest);
 
     // Equation (31) from XLS-66 spec, Section A-2 Equation Glossary
     auto const totalInterestOutstanding = totalValueOutstanding - roundedPrincipalOutstanding;
diff --git a/src/libxrpl/ledger/helpers/TokenHelpers.cpp b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
index d5f1d5eb39..15b3dc0953 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -165,7 +165,7 @@ getLineIfUsable(
         return nullptr;
     }
 
-    if (zeroIfFrozen == fhZERO_IF_FROZEN)
+    if (zeroIfFrozen == FreezeHandling::fhZERO_IF_FROZEN)
     {
         if (isFrozen(view, account, currency, issuer) ||
             isDeepFrozen(view, account, currency, issuer))
@@ -252,7 +252,7 @@ accountHolds(
         return {xrpLiquid(view, account, 0, j)};
     }
 
-    bool const returnSpendable = (includeFullBalance == shFULL_BALANCE);
+    bool const returnSpendable = (includeFullBalance == SpendableHandling::shFULL_BALANCE);
     if (returnSpendable && account == issuer)
     {
         // If the account is the issuer, then their limit is effectively
@@ -290,7 +290,7 @@ accountHolds(
     beast::Journal j,
     SpendableHandling includeFullBalance)
 {
-    bool const returnSpendable = (includeFullBalance == shFULL_BALANCE);
+    bool const returnSpendable = (includeFullBalance == SpendableHandling::shFULL_BALANCE);
     STAmount amount{mptIssue};
     auto const& issuer = mptIssue.getIssuer();
     bool const mptokensV2 = view.rules().enabled(featureMPTokensV2);
@@ -317,7 +317,7 @@ accountHolds(
     {
         amount.clear(mptIssue);
     }
-    else if (zeroIfFrozen == fhZERO_IF_FROZEN && isFrozen(view, account, mptIssue))
+    else if (zeroIfFrozen == FreezeHandling::fhZERO_IF_FROZEN && isFrozen(view, account, mptIssue))
     {
         amount.clear(mptIssue);
     }
@@ -327,14 +327,14 @@ accountHolds(
 
         // Only if auth check is needed, as it needs to do an additional read
         // operation. Note featureSingleAssetVault will affect error codes.
-        if (zeroIfUnauthorized == ahZERO_IF_UNAUTHORIZED &&
+        if (zeroIfUnauthorized == AuthHandling::ahZERO_IF_UNAUTHORIZED &&
             view.rules().enabled(featureSingleAssetVault))
         {
             if (auto const err = requireAuth(view, mptIssue, account, AuthType::StrongAuth);
                 !isTesSuccess(err))
                 amount.clear(mptIssue);
         }
-        else if (zeroIfUnauthorized == ahZERO_IF_UNAUTHORIZED)
+        else if (zeroIfUnauthorized == AuthHandling::ahZERO_IF_UNAUTHORIZED)
         {
             auto const sleIssuance = view.read(keylet::mptIssuance(mptIssue.getMptID()));
 
@@ -401,7 +401,13 @@ accountFunds(
         [&](Issue const&) { return accountFunds(view, id, saDefault, freezeHandling, j); },
         [&](MPTIssue const&) {
             return accountHolds(
-                view, id, saDefault.asset(), freezeHandling, authHandling, j, shFULL_BALANCE);
+                view,
+                id,
+                saDefault.asset(),
+                freezeHandling,
+                authHandling,
+                j,
+                SpendableHandling::shFULL_BALANCE);
         });
 }
 
diff --git a/src/libxrpl/nodestore/BatchWriter.cpp b/src/libxrpl/nodestore/BatchWriter.cpp
index 9da6f504a9..b05c80ff00 100644
--- a/src/libxrpl/nodestore/BatchWriter.cpp
+++ b/src/libxrpl/nodestore/BatchWriter.cpp
@@ -47,7 +47,7 @@ BatchWriter::store(std::shared_ptr<NodeObject> const& object)
 int
 BatchWriter::getWriteLoad()
 {
-    std::lock_guard const sl(mWriteMutex);
+    std::scoped_lock const sl(mWriteMutex);
 
     return std::max(mWriteLoad, static_cast<int>(mWriteSet.size()));
 }
@@ -68,7 +68,7 @@ BatchWriter::writeBatch()
         set.reserve(batchWritePreallocationSize);
 
         {
-            std::lock_guard const sl(mWriteMutex);
+            std::scoped_lock const sl(mWriteMutex);
 
             mWriteSet.swap(set);
             XRPL_ASSERT(
diff --git a/src/libxrpl/nodestore/Database.cpp b/src/libxrpl/nodestore/Database.cpp
index ee8d2f56aa..fa69cba517 100644
--- a/src/libxrpl/nodestore/Database.cpp
+++ b/src/libxrpl/nodestore/Database.cpp
@@ -143,7 +143,7 @@ void
 Database::stop()
 {
     {
-        std::lock_guard const lock(readLock_);
+        std::scoped_lock const lock(readLock_);
 
         if (!readStopping_.exchange(true, std::memory_order_relaxed))
         {
@@ -179,7 +179,7 @@ Database::asyncFetch(
     std::uint32_t ledgerSeq,
     std::function<void(std::shared_ptr<NodeObject> const&)>&& cb)
 {
-    std::lock_guard const lock(readLock_);
+    std::scoped_lock const lock(readLock_);
 
     if (!isStopping())
     {
diff --git a/src/libxrpl/nodestore/DatabaseNodeImp.cpp b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
index 7722f711bb..1bb5f32308 100644
--- a/src/libxrpl/nodestore/DatabaseNodeImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
@@ -48,7 +48,7 @@ DatabaseNodeImp::fetchNodeObject(
     bool duplicate)
 {
     std::shared_ptr<NodeObject> nodeObject = nullptr;
-    Status status = ok;
+    Status status = Status::ok;
 
     try
     {
@@ -63,15 +63,15 @@ DatabaseNodeImp::fetchNodeObject(
 
     switch (status)
     {
-        case ok:
-        case notFound:
+        case Status::ok:
+        case Status::notFound:
             break;
-        case dataCorrupt:
+        case Status::dataCorrupt:
             JLOG(j_.fatal()) << "fetchNodeObject " << hash << ": nodestore data is corrupted";
             break;
         default:
             JLOG(j_.warn()) << "fetchNodeObject " << hash << ": backend returns unknown result "
-                            << status;
+                            << static_cast<int>(status);
             break;
     }
 
diff --git a/src/libxrpl/nodestore/DatabaseRotatingImp.cpp b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
index ef7431f5a3..de34af7773 100644
--- a/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
@@ -53,7 +53,7 @@ DatabaseRotatingImp::rotate(
     // deleted.
     std::shared_ptr<NodeStore::Backend> oldArchiveBackend;
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
 
         archiveBackend_->setDeletePath();
         oldArchiveBackend = std::move(archiveBackend_);
@@ -70,14 +70,14 @@ DatabaseRotatingImp::rotate(
 std::string
 DatabaseRotatingImp::getName() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return writableBackend_->getName();
 }
 
 std::int32_t
 DatabaseRotatingImp::getWriteLoad() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return writableBackend_->getWriteLoad();
 }
 
@@ -85,7 +85,7 @@ void
 DatabaseRotatingImp::importDatabase(Database& source)
 {
     auto const backend = [&] {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return writableBackend_;
     }();
 
@@ -95,7 +95,7 @@ DatabaseRotatingImp::importDatabase(Database& source)
 void
 DatabaseRotatingImp::sync()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     writableBackend_->sync();
 }
 
@@ -105,7 +105,7 @@ DatabaseRotatingImp::store(NodeObjectType type, Blob&& data, uint256 const& hash
     auto nObj = NodeObject::createObject(type, std::move(data), hash);
 
     auto const backend = [&] {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return writableBackend_;
     }();
 
@@ -121,7 +121,7 @@ DatabaseRotatingImp::fetchNodeObject(
     bool duplicate)
 {
     auto fetch = [&](std::shared_ptr<Backend> const& backend) {
-        Status status = ok;
+        Status status = Status::ok;
         std::shared_ptr<NodeObject> nodeObject;
         try
         {
@@ -135,14 +135,14 @@ DatabaseRotatingImp::fetchNodeObject(
 
         switch (status)
         {
-            case ok:
-            case notFound:
+            case Status::ok:
+            case Status::notFound:
                 break;
-            case dataCorrupt:
+            case Status::dataCorrupt:
                 JLOG(j_.fatal()) << "Corrupt NodeObject #" << hash;
                 break;
             default:
-                JLOG(j_.warn()) << "Unknown status=" << status;
+                JLOG(j_.warn()) << "Unknown status=" << static_cast<int>(status);
                 break;
         }
 
@@ -153,7 +153,7 @@ DatabaseRotatingImp::fetchNodeObject(
     std::shared_ptr<NodeObject> nodeObject;
 
     auto [writable, archive] = [&] {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return std::make_pair(writableBackend_, archiveBackend_);
     }();
 
@@ -167,7 +167,7 @@ DatabaseRotatingImp::fetchNodeObject(
         {
             {
                 // Refresh the writable backend pointer
-                std::lock_guard const lock(mutex_);
+                std::scoped_lock const lock(mutex_);
                 writable = writableBackend_;
             }
 
@@ -187,7 +187,7 @@ void
 DatabaseRotatingImp::for_each(std::function<void(std::shared_ptr<NodeObject>)> f)
 {
     auto [writable, archive] = [&] {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return std::make_pair(writableBackend_, archiveBackend_);
     }();
 
diff --git a/src/libxrpl/nodestore/DecodedBlob.cpp b/src/libxrpl/nodestore/DecodedBlob.cpp
index 1d60f2af86..437aef24da 100644
--- a/src/libxrpl/nodestore/DecodedBlob.cpp
+++ b/src/libxrpl/nodestore/DecodedBlob.cpp
@@ -25,7 +25,7 @@ DecodedBlob::DecodedBlob(void const* key, void const* value, int valueBytes)
 
     m_success = false;
     m_key = key;
-    m_objectType = hotUNKNOWN;
+    m_objectType = NodeObjectType::hotUNKNOWN;
     m_objectData = nullptr;
     m_dataBytes = std::max(0, valueBytes - 9);
 
@@ -46,10 +46,10 @@ DecodedBlob::DecodedBlob(void const* key, void const* value, int valueBytes)
             default:
                 break;
 
-            case hotUNKNOWN:
-            case hotLEDGER:
-            case hotACCOUNT_NODE:
-            case hotTRANSACTION_NODE:
+            case NodeObjectType::hotUNKNOWN:
+            case NodeObjectType::hotLEDGER:
+            case NodeObjectType::hotACCOUNT_NODE:
+            case NodeObjectType::hotTRANSACTION_NODE:
                 m_success = true;
                 break;
         }
diff --git a/src/libxrpl/nodestore/ManagerImp.cpp b/src/libxrpl/nodestore/ManagerImp.cpp
index 40a48f0875..1420bf3997 100644
--- a/src/libxrpl/nodestore/ManagerImp.cpp
+++ b/src/libxrpl/nodestore/ManagerImp.cpp
@@ -96,14 +96,14 @@ ManagerImp::make_Database(
 void
 ManagerImp::insert(Factory& factory)
 {
-    std::lock_guard const _(mutex_);
+    std::scoped_lock const _(mutex_);
     list_.push_back(&factory);
 }
 
 void
 ManagerImp::erase(Factory& factory)
 {
-    std::lock_guard const _(mutex_);
+    std::scoped_lock const _(mutex_);
     auto const iter =
         std::ranges::find_if(list_, [&factory](Factory* other) { return other == &factory; });
     XRPL_ASSERT(iter != list_.end(), "xrpl::NodeStore::ManagerImp::erase : valid input");
@@ -113,7 +113,7 @@ ManagerImp::erase(Factory& factory)
 Factory*
 ManagerImp::find(std::string const& name)
 {
-    std::lock_guard const _(mutex_);
+    std::scoped_lock const _(mutex_);
     auto const iter = std::ranges::find_if(
         list_, [&name](Factory* other) { return boost::iequals(name, other->getName()); });
     if (iter == list_.end())
diff --git a/src/libxrpl/nodestore/backend/MemoryFactory.cpp b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
index abf25013ce..ef07ebe957 100644
--- a/src/libxrpl/nodestore/backend/MemoryFactory.cpp
+++ b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
@@ -59,7 +59,7 @@ public:
     MemoryDB&
     open(std::string const& path)
     {
-        std::lock_guard const _(mutex_);
+        std::scoped_lock const _(mutex_);
         auto const result =
             map_.emplace(std::piecewise_construct, std::make_tuple(path), std::make_tuple());
         MemoryDB& db = result.first->second;
@@ -134,16 +134,16 @@ public:
     {
         XRPL_ASSERT(db_, "xrpl::NodeStore::MemoryBackend::fetch : non-null database");
 
-        std::lock_guard const _(db_->mutex);
+        std::scoped_lock const _(db_->mutex);
 
         Map::iterator const iter = db_->table.find(hash);
         if (iter == db_->table.end())
         {
             pObject->reset();
-            return notFound;
+            return Status::notFound;
         }
         *pObject = iter->second;
-        return ok;
+        return Status::ok;
     }
 
     std::pair<std::vector<std::shared_ptr<NodeObject>>, Status>
@@ -155,7 +155,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != ok)
+            if (status != Status::ok)
             {
                 results.push_back({});
             }
@@ -165,14 +165,14 @@ public:
             }
         }
 
-        return {results, ok};
+        return {results, Status::ok};
     }
 
     void
     store(std::shared_ptr<NodeObject> const& object) override
     {
         XRPL_ASSERT(db_, "xrpl::NodeStore::MemoryBackend::store : non-null database");
-        std::lock_guard const _(db_->mutex);
+        std::scoped_lock const _(db_->mutex);
         db_->table.emplace(object->getHash(), object);
     }
 
diff --git a/src/libxrpl/nodestore/backend/NuDBFactory.cpp b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
index 86540016da..18fe3c572e 100644
--- a/src/libxrpl/nodestore/backend/NuDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
@@ -207,7 +207,7 @@ public:
     Status
     fetch(uint256 const& hash, std::shared_ptr<NodeObject>* pno) override
     {
-        Status status = ok;
+        Status status = Status::ok;
         pno->reset();
         nudb::error_code ec;
         db_.fetch(
@@ -218,15 +218,15 @@ public:
                 DecodedBlob decoded(hash.data(), result.first, result.second);
                 if (!decoded.wasOk())
                 {
-                    status = dataCorrupt;
+                    status = Status::dataCorrupt;
                     return;
                 }
                 *pno = decoded.createObject();
-                status = ok;
+                status = Status::ok;
             },
             ec);
         if (ec == nudb::error::key_not_found)
-            return notFound;
+            return Status::notFound;
         if (ec)
             Throw<nudb::system_error>(ec);
         return status;
@@ -241,7 +241,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != ok)
+            if (status != Status::ok)
             {
                 results.push_back({});
             }
@@ -251,7 +251,7 @@ public:
             }
         }
 
-        return {results, ok};
+        return {results, Status::ok};
     }
 
     void
diff --git a/src/libxrpl/nodestore/backend/NullFactory.cpp b/src/libxrpl/nodestore/backend/NullFactory.cpp
index 02e6ca4dda..917ee3d8d0 100644
--- a/src/libxrpl/nodestore/backend/NullFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NullFactory.cpp
@@ -49,7 +49,7 @@ public:
     Status
     fetch(uint256 const&, std::shared_ptr<NodeObject>*) override
     {
-        return notFound;
+        return Status::notFound;
     }
 
     std::pair<std::vector<std::shared_ptr<NodeObject>>, Status>
diff --git a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
index 86dff9240d..be2506ec6f 100644
--- a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
@@ -285,7 +285,7 @@ public:
         XRPL_ASSERT(m_db, "xrpl::NodeStore::RocksDBBackend::fetch : non-null database");
         pObject->reset();
 
-        Status status(ok);
+        Status status(Status::ok);
 
         rocksdb::ReadOptions const options;
         rocksdb::Slice const slice(std::bit_cast<char const*>(hash.data()), m_keyBytes);
@@ -306,22 +306,23 @@ public:
             {
                 // Decoding failed, probably corrupted!
                 //
-                status = dataCorrupt;
+                status = Status::dataCorrupt;
             }
         }
         else
         {
             if (getStatus.IsCorruption())
             {
-                status = dataCorrupt;
+                status = Status::dataCorrupt;
             }
             else if (getStatus.IsNotFound())
             {
-                status = notFound;
+                status = Status::notFound;
             }
             else
             {
-                status = Status(customCode + unsafe_cast<int>(getStatus.code()));
+                status = static_cast<Status>(
+                    static_cast<int>(Status::customCode) + unsafe_cast<int>(getStatus.code()));
 
                 JLOG(m_journal.error()) << getStatus.ToString();
             }
@@ -339,7 +340,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != ok)
+            if (status != Status::ok)
             {
                 results.push_back({});
             }
@@ -349,7 +350,7 @@ public:
             }
         }
 
-        return {results, ok};
+        return {results, Status::ok};
     }
 
     void
diff --git a/src/libxrpl/protocol/AccountID.cpp b/src/libxrpl/protocol/AccountID.cpp
index a89dc8fd11..ffebde2c1a 100644
--- a/src/libxrpl/protocol/AccountID.cpp
+++ b/src/libxrpl/protocol/AccountID.cpp
@@ -56,7 +56,7 @@ public:
         packed_spinlock sl(locks_, index % 64);
 
         {
-            std::lock_guard const lock(sl);
+            std::scoped_lock const lock(sl);
 
             // The check against the first character of the encoding ensures
             // that we don't mishandle the case of the all-zero account:
@@ -69,7 +69,7 @@ public:
         XRPL_ASSERT(ret.size() <= 38, "xrpl::detail::AccountIdCache : maximum result size");
 
         {
-            std::lock_guard const lock(sl);
+            std::scoped_lock const lock(sl);
             cache_[index].id = id;
             std::strcpy(cache_[index].encoding, ret.c_str());
         }
diff --git a/src/libxrpl/protocol/Rules.cpp b/src/libxrpl/protocol/Rules.cpp
index 7a8d0144bb..3e4649a27f 100644
--- a/src/libxrpl/protocol/Rules.cpp
+++ b/src/libxrpl/protocol/Rules.cpp
@@ -40,7 +40,9 @@ setCurrentTransactionRules(std::optional<Rules> r)
     // the value is needed. That could get expensive fast.
     bool const enableLargeNumbers =
         !r || (r->enabled(featureSingleAssetVault) || r->enabled(featureLendingProtocol));
-    Number::setMantissaScale(enableLargeNumbers ? MantissaRange::large : MantissaRange::small);
+    Number::setMantissaScale(
+        enableLargeNumbers ? MantissaRange::mantissa_scale::large
+                           : MantissaRange::mantissa_scale::small);
 
     *getCurrentTransactionRulesRef() = std::move(r);
 }
diff --git a/src/libxrpl/protocol/STAmount.cpp b/src/libxrpl/protocol/STAmount.cpp
index 89992b823c..654bcf1be4 100644
--- a/src/libxrpl/protocol/STAmount.cpp
+++ b/src/libxrpl/protocol/STAmount.cpp
@@ -1612,7 +1612,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
     STAmount result = [&]() {
         // If appropriate, tell Number to round down.  This gives the desired
         // result from STAmount::canonicalize.
-        MightSaveRound const savedRound(Number::towards_zero);
+        MightSaveRound const savedRound(Number::rounding_mode::towards_zero);
         return STAmount(asset, amount, offset, resultNegative);
     }();
 
diff --git a/src/libxrpl/protocol/STNumber.cpp b/src/libxrpl/protocol/STNumber.cpp
index 25aa9eaa05..d506751f86 100644
--- a/src/libxrpl/protocol/STNumber.cpp
+++ b/src/libxrpl/protocol/STNumber.cpp
@@ -95,7 +95,7 @@ STNumber::add(Serializer& s) const
             // Json. Regardless, the only time we should be serializing an
             // STNumber is when the scale is large.
             XRPL_ASSERT_PARTS(
-                Number::getMantissaScale() == MantissaRange::large,
+                Number::getMantissaScale() == MantissaRange::mantissa_scale::large,
                 "xrpl::STNumber::add",
                 "STNumber only used with large mantissa scale");
 #endif
diff --git a/src/libxrpl/protocol/STObject.cpp b/src/libxrpl/protocol/STObject.cpp
index baece3ca56..9f032a0962 100644
--- a/src/libxrpl/protocol/STObject.cpp
+++ b/src/libxrpl/protocol/STObject.cpp
@@ -119,7 +119,7 @@ STObject::isDefault() const
 void
 STObject::add(Serializer& s) const
 {
-    add(s, withAllFields);  // just inner elements
+    add(s, WhichFields::withAllFields);  // just inner elements
 }
 
 STObject&
@@ -258,7 +258,7 @@ STObject::set(SerialIter& sit, int depth)
 
     // We want to ensure that the deserialized object does not contain any
     // duplicate fields. This is a key invariant:
-    auto const sf = getSortedFields(*this, withAllFields);
+    auto const sf = getSortedFields(*this, WhichFields::withAllFields);
 
     auto const dup = std::ranges::adjacent_find(sf, [](STBase const* lhs, STBase const* rhs) {
         return lhs->getFName() == rhs->getFName();
@@ -353,8 +353,8 @@ STObject::isEquivalent(STBase const& t) const
             });
     }
 
-    auto const sf1 = getSortedFields(*this, withAllFields);
-    auto const sf2 = getSortedFields(*v, withAllFields);
+    auto const sf1 = getSortedFields(*this, WhichFields::withAllFields);
+    auto const sf2 = getSortedFields(*v, WhichFields::withAllFields);
 
     return std::ranges::equal(sf1, sf2, [](STBase const* st1, STBase const* st2) {
         return (st1->getSType() == st2->getSType()) && st1->isEquivalent(*st2);
@@ -366,7 +366,7 @@ STObject::getHash(HashPrefix prefix) const
 {
     Serializer s;
     s.add32(prefix);
-    add(s, withAllFields);
+    add(s, WhichFields::withAllFields);
     return s.getSHA512Half();
 }
 
@@ -375,7 +375,7 @@ STObject::getSigningHash(HashPrefix prefix) const
 {
     Serializer s;
     s.add32(prefix);
-    add(s, omitSigningFields);
+    add(s, WhichFields::omitSigningFields);
     return s.getSHA512Half();
 }
 
diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 6da0d61b57..0dd567e6cc 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -203,7 +203,7 @@ STTx::getSeqProxy() const
         return SeqProxy::sequence(seq);
     }
 
-    return SeqProxy{SeqProxy::ticket, *ticketSeq};
+    return SeqProxy{SeqProxy::Type::ticket, *ticketSeq};
 }
 
 std::uint32_t
diff --git a/src/libxrpl/rdb/DatabaseCon.cpp b/src/libxrpl/rdb/DatabaseCon.cpp
index 5f4594b630..cc7692de78 100644
--- a/src/libxrpl/rdb/DatabaseCon.cpp
+++ b/src/libxrpl/rdb/DatabaseCon.cpp
@@ -30,7 +30,7 @@ public:
     std::shared_ptr<Checkpointer>
     fromId(std::uintptr_t id)
     {
-        std::lock_guard const l{mutex_};
+        std::scoped_lock const l{mutex_};
         auto it = checkpointers_.find(id);
         if (it != checkpointers_.end())
             return it->second;
@@ -40,7 +40,7 @@ public:
     void
     erase(std::uintptr_t id)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         checkpointers_.erase(id);
     }
 
@@ -50,7 +50,7 @@ public:
         JobQueue& jobQueue,
         ServiceRegistry& registry)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         auto const id = nextId_++;
         auto const r = makeCheckpointer(id, session, jobQueue, registry);
         checkpointers_[id] = r;
diff --git a/src/libxrpl/rdb/SociDB.cpp b/src/libxrpl/rdb/SociDB.cpp
index c6e40ae90b..1d69f1c984 100644
--- a/src/libxrpl/rdb/SociDB.cpp
+++ b/src/libxrpl/rdb/SociDB.cpp
@@ -238,7 +238,7 @@ public:
     schedule() override
     {
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             if (running_)
                 return;
             running_ = true;
@@ -258,7 +258,7 @@ public:
                         self->checkpoint();
                 }))
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             running_ = false;
         }
     }
@@ -286,7 +286,7 @@ public:
             JLOG(j_.trace()) << "WAL(" << fname << "): frames=" << log << ", written=" << ckpt;
         }
 
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         running_ = false;
     }
 
diff --git a/src/libxrpl/resource/Consumer.cpp b/src/libxrpl/resource/Consumer.cpp
index 3d03fa05db..c57344bd8f 100644
--- a/src/libxrpl/resource/Consumer.cpp
+++ b/src/libxrpl/resource/Consumer.cpp
@@ -78,7 +78,7 @@ Consumer::isUnlimited() const
 Disposition
 Consumer::disposition() const
 {
-    Disposition d = ok;
+    Disposition d = Disposition::ok;
     if ((m_logic != nullptr) && (m_entry != nullptr))
         d = m_logic->charge(*m_entry, Charge(0));
 
@@ -88,7 +88,7 @@ Consumer::disposition() const
 Disposition
 Consumer::charge(Charge const& what, std::string const& context)
 {
-    Disposition d = ok;
+    Disposition d = Disposition::ok;
 
     if ((m_logic != nullptr) && (m_entry != nullptr) && !m_entry->isUnlimited())
         d = m_logic->charge(*m_entry, what, context);
diff --git a/src/libxrpl/resource/ResourceManager.cpp b/src/libxrpl/resource/ResourceManager.cpp
index 6652c1a66b..e3f0ae8583 100644
--- a/src/libxrpl/resource/ResourceManager.cpp
+++ b/src/libxrpl/resource/ResourceManager.cpp
@@ -50,7 +50,7 @@ public:
     ~ManagerImp() override
     {
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             stop_ = true;
             cond_.notify_one();
         }
diff --git a/src/libxrpl/server/InfoSub.cpp b/src/libxrpl/server/InfoSub.cpp
index 30686dfe7e..c426d44646 100644
--- a/src/libxrpl/server/InfoSub.cpp
+++ b/src/libxrpl/server/InfoSub.cpp
@@ -73,7 +73,7 @@ InfoSub::onSendEmpty()
 void
 InfoSub::insertSubAccountInfo(AccountID const& account, bool rt)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     if (rt)
     {
@@ -88,7 +88,7 @@ InfoSub::insertSubAccountInfo(AccountID const& account, bool rt)
 void
 InfoSub::deleteSubAccountInfo(AccountID const& account, bool rt)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     if (rt)
     {
@@ -103,14 +103,14 @@ InfoSub::deleteSubAccountInfo(AccountID const& account, bool rt)
 bool
 InfoSub::insertSubAccountHistory(AccountID const& account)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     return accountHistorySubscriptions_.insert(account).second;
 }
 
 void
 InfoSub::deleteSubAccountHistory(AccountID const& account)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     accountHistorySubscriptions_.erase(account);
 }
 
diff --git a/src/libxrpl/server/LoadFeeTrack.cpp b/src/libxrpl/server/LoadFeeTrack.cpp
index 53fbb8cb84..2fa7e1beba 100644
--- a/src/libxrpl/server/LoadFeeTrack.cpp
+++ b/src/libxrpl/server/LoadFeeTrack.cpp
@@ -16,7 +16,7 @@ namespace xrpl {
 bool
 LoadFeeTrack::raiseLocalFee()
 {
-    std::lock_guard const sl(lock_);
+    std::scoped_lock const sl(lock_);
 
     if (++raiseCount_ < 2)
         return false;
@@ -41,7 +41,7 @@ LoadFeeTrack::raiseLocalFee()
 bool
 LoadFeeTrack::lowerLocalFee()
 {
-    std::lock_guard const sl(lock_);
+    std::scoped_lock const sl(lock_);
     std::uint32_t const origFee = localTxnLoadFee_;
     raiseCount_ = 0;
 
diff --git a/src/libxrpl/shamap/SHAMap.cpp b/src/libxrpl/shamap/SHAMap.cpp
index b638efc383..837724babe 100644
--- a/src/libxrpl/shamap/SHAMap.cpp
+++ b/src/libxrpl/shamap/SHAMap.cpp
@@ -975,7 +975,7 @@ int
 SHAMap::unshare()
 {
     // Don't share nodes with parent map
-    return walkSubTree(false, hotUNKNOWN);
+    return walkSubTree(false, NodeObjectType::hotUNKNOWN);
 }
 
 int
diff --git a/src/libxrpl/shamap/SHAMapDelta.cpp b/src/libxrpl/shamap/SHAMapDelta.cpp
index d8162710be..e80f28d25f 100644
--- a/src/libxrpl/shamap/SHAMapDelta.cpp
+++ b/src/libxrpl/shamap/SHAMapDelta.cpp
@@ -344,7 +344,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
                             }
                             else
                             {
-                                std::lock_guard const l{m};
+                                std::scoped_lock const l{m};
                                 missingNodes.emplace_back(type_, node->getChildHash(i));
                                 if (--maxMissing <= 0)
                                     return;
@@ -354,7 +354,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
                 }
                 catch (SHAMapMissingNode const& e)
                 {
-                    std::lock_guard const l(m);
+                    std::scoped_lock const l(m);
                     exceptions.push_back(e);
                 }
             },
@@ -364,7 +364,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
     for (std::thread& worker : workers)
         worker.join();
 
-    std::lock_guard const l(m);
+    std::scoped_lock const l(m);
     if (exceptions.empty())
         return true;
     std::stringstream ss;
diff --git a/src/libxrpl/shamap/SHAMapInnerNode.cpp b/src/libxrpl/shamap/SHAMapInnerNode.cpp
index d3324e91d0..38300beadb 100644
--- a/src/libxrpl/shamap/SHAMapInnerNode.cpp
+++ b/src/libxrpl/shamap/SHAMapInnerNode.cpp
@@ -99,7 +99,7 @@ SHAMapInnerNode::clone(std::uint32_t cowid) const
     }
 
     spinlock sl(lock_);
-    std::lock_guard const lock(sl);
+    std::scoped_lock const lock(sl);
 
     if (thisIsSparse)
     {
@@ -333,7 +333,7 @@ SHAMapInnerNode::getChildPointer(int branch)
         *getChildIndex(branch);  // NOLINT(bugprone-unchecked-optional-access) assert above
 
     packed_spinlock sl(lock_, index);
-    std::lock_guard const lock(sl);
+    std::scoped_lock const lock(sl);
     return hashesAndChildren_.getChildren()[index].get();
 }
 
@@ -349,7 +349,7 @@ SHAMapInnerNode::getChild(int branch)
         *getChildIndex(branch);  // NOLINT(bugprone-unchecked-optional-access) assert above
 
     packed_spinlock sl(lock_, index);
-    std::lock_guard const lock(sl);
+    std::scoped_lock const lock(sl);
     return hashesAndChildren_.getChildren()[index];
 }
 
@@ -383,7 +383,7 @@ SHAMapInnerNode::canonicalizeChild(int branch, intr_ptr::SharedPtr<SHAMapTreeNod
         "hash do match");
 
     packed_spinlock sl(lock_, childIndex);
-    std::lock_guard const lock(sl);
+    std::scoped_lock const lock(sl);
 
     if (children[childIndex])
     {
diff --git a/src/libxrpl/shamap/SHAMapNodeID.cpp b/src/libxrpl/shamap/SHAMapNodeID.cpp
index c2d93f20ee..6116a997b6 100644
--- a/src/libxrpl/shamap/SHAMapNodeID.cpp
+++ b/src/libxrpl/shamap/SHAMapNodeID.cpp
@@ -16,6 +16,8 @@ namespace xrpl {
 static uint256 const&
 depthMask(unsigned int depth)
 {
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { mask_size = 65 };
 
     struct masks_t
diff --git a/src/libxrpl/tx/applySteps.cpp b/src/libxrpl/tx/applySteps.cpp
index eb058e5ca6..a0667719c1 100644
--- a/src/libxrpl/tx/applySteps.cpp
+++ b/src/libxrpl/tx/applySteps.cpp
@@ -84,7 +84,7 @@ with_txn_type(Rules const& rules, TxType txnType, F&& f)
     else
     {
         // Without those features enabled, always use the old number rules.
-        mantissaScaleGuard.emplace(MantissaRange::small);
+        mantissaScaleGuard.emplace(MantissaRange::mantissa_scale::small);
     }
 
     switch (txnType)
@@ -130,7 +130,7 @@ template <class T>
 TxConsequences
 consequences_helper(PreflightContext const& ctx)
 {
-    return TxConsequences(ctx.tx, TxConsequences::blocker);
+    return TxConsequences(ctx.tx, TxConsequences::Category::blocker);
 };
 
 // For Transactor::Custom
@@ -279,7 +279,7 @@ TxConsequences::TxConsequences(STTx const& tx)
 
 TxConsequences::TxConsequences(STTx const& tx, Category category) : TxConsequences(tx)
 {
-    isBlocker_ = (category == blocker);
+    isBlocker_ = (category == Category::blocker);
 }
 
 TxConsequences::TxConsequences(STTx const& tx, XRPAmount potentialSpend) : TxConsequences(tx)
diff --git a/src/libxrpl/tx/invariants/AMMInvariant.cpp b/src/libxrpl/tx/invariants/AMMInvariant.cpp
index 30be382c91..af60f3fc55 100644
--- a/src/libxrpl/tx/invariants/AMMInvariant.cpp
+++ b/src/libxrpl/tx/invariants/AMMInvariant.cpp
@@ -146,8 +146,8 @@ ValidAMM::finalizeCreate(
             *ammAccount_,
             tx[sfAmount].asset(),
             tx[sfAmount2].asset(),
-            fhIGNORE_FREEZE,
-            ahIGNORE_AUTH,
+            FreezeHandling::fhIGNORE_FREEZE,
+            AuthHandling::ahIGNORE_AUTH,
             j);
         // Create invariant:
         // sqrt(amount * amount2) == LPTokens
@@ -210,7 +210,13 @@ ValidAMM::generalInvariant(
     // NOLINTBEGIN(bugprone-unchecked-optional-access) ammAccount_ and lptAMMBalanceAfter_ set
     // together in visitEntry; callers only invoke this inside else-of-if(!ammAccount_)
     auto const [amount, amount2] = ammPoolHolds(
-        view, *ammAccount_, tx[sfAsset], tx[sfAsset2], fhIGNORE_FREEZE, ahIGNORE_AUTH, j);
+        view,
+        *ammAccount_,
+        tx[sfAsset],
+        tx[sfAsset2],
+        FreezeHandling::fhIGNORE_FREEZE,
+        AuthHandling::ahIGNORE_AUTH,
+        j);
     // Deposit and Withdrawal invariant:
     // sqrt(amount * amount2) >= LPTokens
     // all balances are greater than zero
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index f2570d14e8..e97501f129 100644
--- a/src/libxrpl/tx/invariants/InvariantCheck.cpp
+++ b/src/libxrpl/tx/invariants/InvariantCheck.cpp
@@ -804,10 +804,17 @@ ValidClawback::finalize(
             AccountID const& holder = amount.getIssuer();
             STAmount const holderBalance = amount.asset().visit(
                 [&](Issue const& issue) {
-                    return accountHolds(view, holder, issue.currency, issuer, fhIGNORE_FREEZE, j);
+                    return accountHolds(
+                        view, holder, issue.currency, issuer, FreezeHandling::fhIGNORE_FREEZE, j);
                 },
                 [&](MPTIssue const& issue) {
-                    return accountHolds(view, issuer, issue, fhIGNORE_FREEZE, ahIGNORE_AUTH, j);
+                    return accountHolds(
+                        view,
+                        issuer,
+                        issue,
+                        FreezeHandling::fhIGNORE_FREEZE,
+                        AuthHandling::ahIGNORE_AUTH,
+                        j);
                 });
 
             if (holderBalance.signum() < 0)
diff --git a/src/libxrpl/tx/invariants/MPTInvariant.cpp b/src/libxrpl/tx/invariants/MPTInvariant.cpp
index e010b79b87..97db4aa385 100644
--- a/src/libxrpl/tx/invariants/MPTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/MPTInvariant.cpp
@@ -18,6 +18,7 @@
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/tx/invariants/InvariantCheckPrivilege.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 
@@ -303,7 +304,7 @@ ValidMPTPayment::visitEntry(
                 overflow_ = true;
                 return false;
             }
-            data_[makeKey(sle)].outstanding[order] = outstanding;
+            data_[makeKey(sle)].outstanding[static_cast<std::size_t>(order)] = outstanding;
         }
         else if (type == ltMPTOKEN)
         {
@@ -317,7 +318,7 @@ ValidMPTPayment::visitEntry(
             }
             auto const res = static_cast<std::int64_t>(mptAmt + lockedAmt);
             // subtract before from after
-            if (order == Before)
+            if (order == Order::Before)
             {
                 data_[makeKey(sle)].mptAmount -= res;
             }
@@ -329,7 +330,7 @@ ValidMPTPayment::visitEntry(
         return true;
     };
 
-    if (before && !update(*before, Before))
+    if (before && !update(*before, Order::Before))
         return;
 
     if (after)
@@ -338,7 +339,7 @@ ValidMPTPayment::visitEntry(
         {
             overflow_ = (*after)[sfOutstandingAmount] > maxMPTAmount(*after);
         }
-        if (!update(*after, After))
+        if (!update(*after, Order::After))
             return;
     }
 }
@@ -364,15 +365,17 @@ ValidMPTPayment::finalize(
         for (auto const& [id, data] : data_)
         {
             (void)id;
+            constexpr auto iBefore = static_cast<std::size_t>(Order::Before);
+            constexpr auto iAfter = static_cast<std::size_t>(Order::After);
             bool const addOverflows =
-                (data.mptAmount > 0 && data.outstanding[Before] > (signedMax - data.mptAmount)) ||
-                (data.mptAmount < 0 && data.outstanding[Before] < (-signedMax - data.mptAmount));
+                (data.mptAmount > 0 && data.outstanding[iBefore] > (signedMax - data.mptAmount)) ||
+                (data.mptAmount < 0 && data.outstanding[iBefore] < (-signedMax - data.mptAmount));
             if (addOverflows ||
-                data.outstanding[After] != (data.outstanding[Before] + data.mptAmount))
+                data.outstanding[iAfter] != (data.outstanding[iBefore] + data.mptAmount))
             {
                 JLOG(j.fatal()) << "Invariant failed: invalid OutstandingAmount balance "
-                                << data.outstanding[Before] << " " << data.outstanding[After] << " "
-                                << data.mptAmount;
+                                << data.outstanding[iBefore] << " " << data.outstanding[iAfter]
+                                << " " << data.mptAmount;
                 return !enforce;
             }
         }
diff --git a/src/libxrpl/tx/paths/BookStep.cpp b/src/libxrpl/tx/paths/BookStep.cpp
index 49a5f48034..480a702dc9 100644
--- a/src/libxrpl/tx/paths/BookStep.cpp
+++ b/src/libxrpl/tx/paths/BookStep.cpp
@@ -1492,7 +1492,7 @@ make_BookStepHelper(StrandContext const& ctx, Asset const& in, Asset const& out)
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing)
+    if (ctx.offerCrossing != OfferCrossing::no)
     {
         auto offerCrossingStep = std::make_unique<BookOfferCrossingStep<TIn, TOut>>(ctx, in, out);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/paths/DirectStep.cpp b/src/libxrpl/tx/paths/DirectStep.cpp
index a6f74c9c9f..c2ad818b73 100644
--- a/src/libxrpl/tx/paths/DirectStep.cpp
+++ b/src/libxrpl/tx/paths/DirectStep.cpp
@@ -479,8 +479,8 @@ template <class TDerived>
 std::pair<IOUAmount, DebtDirection>
 DirectStepI<TDerived>::maxPaymentFlow(ReadView const& sb) const
 {
-    auto const srcOwed =
-        toAmount<IOUAmount>(accountHolds(sb, src_, currency_, dst_, fhIGNORE_FREEZE, j_));
+    auto const srcOwed = toAmount<IOUAmount>(
+        accountHolds(sb, src_, currency_, dst_, FreezeHandling::fhIGNORE_FREEZE, j_));
 
     if (srcOwed.signum() > 0)
         return {srcOwed, DebtDirection::redeems};
@@ -496,7 +496,8 @@ DirectStepI<TDerived>::debtDirection(ReadView const& sb, StrandDirection dir) co
     if (dir == StrandDirection::forward && cache_)
         return cache_->srcDebtDir;
 
-    auto const srcOwed = accountHolds(sb, src_, currency_, dst_, fhIGNORE_FREEZE, j_);
+    auto const srcOwed =
+        accountHolds(sb, src_, currency_, dst_, FreezeHandling::fhIGNORE_FREEZE, j_);
     return srcOwed.signum() > 0 ? DebtDirection::redeems : DebtDirection::issues;
 }
 
@@ -930,7 +931,7 @@ make_DirectStepI(
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != 0u)
+    if (ctx.offerCrossing != OfferCrossing::no)
     {
         auto offerCrossingStep = std::make_unique<DirectIOfferCrossingStep>(ctx, src, dst, c);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/paths/MPTEndpointStep.cpp b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
index a79df25479..3dbc4e30cf 100644
--- a/src/libxrpl/tx/paths/MPTEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
@@ -382,8 +382,13 @@ MPTEndpointPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SL
 
     if (prevStep_ == nullptr)
     {
-        auto const owed =
-            accountFunds(ctx.view, src_, mptIssue_, fhIGNORE_FREEZE, ahIGNORE_AUTH, j_);
+        auto const owed = accountFunds(
+            ctx.view,
+            src_,
+            mptIssue_,
+            FreezeHandling::fhIGNORE_FREEZE,
+            AuthHandling::ahIGNORE_AUTH,
+            j_);
         // Already at MaximumAmount
         if (owed <= beast::zero)
             return tecPATH_DRY;
@@ -424,7 +429,8 @@ template <class TDerived>
 std::pair<MPTAmount, DebtDirection>
 MPTEndpointStep<TDerived>::maxPaymentFlow(ReadView const& sb) const
 {
-    auto const maxFlow = accountFunds(sb, src_, mptIssue_, fhIGNORE_FREEZE, ahIGNORE_AUTH, j_);
+    auto const maxFlow = accountFunds(
+        sb, src_, mptIssue_, FreezeHandling::fhIGNORE_FREEZE, AuthHandling::ahIGNORE_AUTH, j_);
 
     // From a holder to an issuer
     if (src_ != mptIssue_.getIssuer())
diff --git a/src/libxrpl/tx/paths/OfferStream.cpp b/src/libxrpl/tx/paths/OfferStream.cpp
index c2f2fed25b..67f9a294b7 100644
--- a/src/libxrpl/tx/paths/OfferStream.cpp
+++ b/src/libxrpl/tx/paths/OfferStream.cpp
@@ -266,8 +266,8 @@ TOfferStreamBase<TIn, TOut>::step()
             offer_.owner(),
             amount.out,
             offer_.assetOut(),
-            fhZERO_IF_FROZEN,
-            ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::fhZERO_IF_FROZEN,
+            AuthHandling::ahZERO_IF_UNAUTHORIZED,
             j_);
 
         // Check for unfunded offer
@@ -281,8 +281,8 @@ TOfferStreamBase<TIn, TOut>::step()
                 offer_.owner(),
                 amount.out,
                 offer_.assetOut(),
-                fhZERO_IF_FROZEN,
-                ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::fhZERO_IF_FROZEN,
+                AuthHandling::ahZERO_IF_UNAUTHORIZED,
                 j_);
 
             if (original_funds == *ownerFunds_)
@@ -306,8 +306,8 @@ TOfferStreamBase<TIn, TOut>::step()
                 offer_.owner(),
                 amount.out,
                 offer_.assetOut(),
-                fhZERO_IF_FROZEN,
-                ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::fhZERO_IF_FROZEN,
+                AuthHandling::ahZERO_IF_UNAUTHORIZED,
                 j_);
 
             if (original_funds == *ownerFunds_)
diff --git a/src/libxrpl/tx/paths/XRPEndpointStep.cpp b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
index 95228ed158..2310f72f34 100644
--- a/src/libxrpl/tx/paths/XRPEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
@@ -396,7 +396,7 @@ make_XRPEndpointStep(StrandContext const& ctx, AccountID const& acc)
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != 0u)
+    if (ctx.offerCrossing != OfferCrossing::no)
     {
         auto offerCrossingStep = std::make_unique<XRPEndpointOfferCrossingStep>(ctx, acc);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/transactors/account/AccountSet.cpp b/src/libxrpl/tx/transactors/account/AccountSet.cpp
index a892bd045c..e8555ecc04 100644
--- a/src/libxrpl/tx/transactors/account/AccountSet.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp
@@ -39,19 +39,19 @@ AccountSet::makeTxConsequences(PreflightContext const& ctx)
     auto getTxConsequencesCategory = [](STTx const& tx) {
         if (std::uint32_t const uTxFlags = tx.getFlags();
             uTxFlags & (tfRequireAuth | tfOptionalAuth))
-            return TxConsequences::blocker;
+            return TxConsequences::Category::blocker;
 
         if (auto const uSetFlag = tx[~sfSetFlag]; uSetFlag &&
             (*uSetFlag == asfRequireAuth || *uSetFlag == asfDisableMaster ||
              *uSetFlag == asfAccountTxnID))
-            return TxConsequences::blocker;
+            return TxConsequences::Category::blocker;
 
         if (auto const uClearFlag = tx[~sfClearFlag]; uClearFlag &&
             (*uClearFlag == asfRequireAuth || *uClearFlag == asfDisableMaster ||
              *uClearFlag == asfAccountTxnID))
-            return TxConsequences::blocker;
+            return TxConsequences::Category::blocker;
 
-        return TxConsequences::normal;
+        return TxConsequences::Category::normal;
     };
 
     return TxConsequences{ctx.tx, getTxConsequencesCategory(ctx.tx)};
diff --git a/src/libxrpl/tx/transactors/account/SignerListSet.cpp b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
index 87eb69e706..ee4cf583f4 100644
--- a/src/libxrpl/tx/transactors/account/SignerListSet.cpp
+++ b/src/libxrpl/tx/transactors/account/SignerListSet.cpp
@@ -46,7 +46,7 @@ SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journ
     // the list.  A zero quorum means we're destroying the list.
     auto const quorum = tx[sfSignerQuorum];
     std::vector<SignerEntries::SignerEntry> sign;
-    Operation op = unknown;
+    Operation op = Operation::unknown;
 
     bool const hasSignerEntries(tx.isFieldPresent(sfSignerEntries));
     if ((quorum != 0u) && hasSignerEntries)
@@ -60,11 +60,11 @@ SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journ
 
         // Save deserialized list for later.
         sign = std::move(*signers);
-        op = set;
+        op = Operation::set;
     }
     else if ((quorum == 0) && !hasSignerEntries)
     {
-        op = destroy;
+        op = Operation::destroy;
     }
 
     return std::make_tuple(tesSUCCESS, quorum, sign, op);
@@ -85,14 +85,14 @@ SignerListSet::preflight(PreflightContext const& ctx)
     if (!isTesSuccess(std::get<0>(result)))
         return std::get<0>(result);
 
-    if (std::get<3>(result) == unknown)
+    if (std::get<3>(result) == Operation::unknown)
     {
         // Neither a set nor a destroy.  Malformed.
         JLOG(ctx.j.trace()) << "Malformed transaction: Invalid signer set list format.";
         return temMALFORMED;
     }
 
-    if (std::get<3>(result) == set)
+    if (std::get<3>(result) == Operation::set)
     {
         // Validate our settings.
         auto const account = ctx.tx.getAccountID(sfAccount);
@@ -113,10 +113,10 @@ SignerListSet::doApply()
     // Perform the operation preCompute() decided on.
     switch (do_)
     {
-        case set:
+        case Operation::set:
             return replaceSignerList();
 
-        case destroy:
+        case Operation::destroy:
             return destroySignerList();
 
         default:
@@ -137,7 +137,7 @@ SignerListSet::preCompute()
         isTesSuccess(std::get<0>(result)),
         "xrpl::SignerListSet::preCompute : result is tesSUCCESS");
     XRPL_ASSERT(
-        std::get<3>(result) != unknown,
+        std::get<3>(result) != Operation::unknown,
         "xrpl::SignerListSet::preCompute : result is known operation");
 
     quorum_ = std::get<1>(result);
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index 4498a3cd8e..31bca0aa32 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -164,8 +164,8 @@ CheckCash::preclaim(PreclaimContext const& ctx)
                 ctx.view,
                 sleCheck->at(sfAccount),
                 value,
-                fhZERO_IF_FROZEN,
-                ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::fhZERO_IF_FROZEN,
+                AuthHandling::ahZERO_IF_UNAUTHORIZED,
                 ctx.j)};
 
             // Note that src will have one reserve's worth of additional XRP
diff --git a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
index 119f244185..1ce48145f3 100644
--- a/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
+++ b/src/libxrpl/tx/transactors/dex/OfferCreate.cpp
@@ -192,8 +192,13 @@ OfferCreate::preclaim(PreclaimContext const& ctx)
 
     // Allow unfunded MPT for issuer (OutstandingAmount >= MaximumAmount)
     if ((!saTakerGets.holds<MPTIssue>() || saTakerGets.getIssuer() != id) &&
-        accountFunds(ctx.view, id, saTakerGets, fhZERO_IF_FROZEN, ahZERO_IF_UNAUTHORIZED, viewJ) <=
-            beast::zero)
+        accountFunds(
+            ctx.view,
+            id,
+            saTakerGets,
+            FreezeHandling::fhZERO_IF_FROZEN,
+            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            viewJ) <= beast::zero)
     {
         JLOG(ctx.j.debug()) << "delay: Offers must be at least partially funded.";
         return tecUNFUNDED_OFFER;
@@ -338,7 +343,12 @@ OfferCreate::flowCross(
         // cause a user's available balance to go to 0 (by causing it to dip
         // below the reserve) so we check this case again.
         STAmount const inStartBalance = accountFunds(
-            psb, account_, takerAmount.in, fhZERO_IF_FROZEN, ahZERO_IF_UNAUTHORIZED, j_);
+            psb,
+            account_,
+            takerAmount.in,
+            FreezeHandling::fhZERO_IF_FROZEN,
+            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            j_);
         // Allow unfunded MPT issuer
         auto const disallowUnfunded =
             !inStartBalance.holds<MPTIssue>() || inStartBalance.getIssuer() != account_;
@@ -448,7 +458,12 @@ OfferCreate::flowCross(
         if (isTesSuccess(result.result()))
         {
             STAmount const takerInBalance = accountFunds(
-                psb, account_, takerAmount.in, fhZERO_IF_FROZEN, ahZERO_IF_UNAUTHORIZED, j_);
+                psb,
+                account_,
+                takerAmount.in,
+                FreezeHandling::fhZERO_IF_FROZEN,
+                AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                j_);
 
             if (disallowUnfunded && takerInBalance <= beast::zero)
             {
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index 9d16d41914..c112d3b349 100644
--- a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
+++ b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
@@ -228,8 +228,8 @@ escrowCreatePreclaimHelper<Issue>(
     if (isFrozen(ctx.view, dest, issue))
         return tecFROZEN;
 
-    STAmount const spendableAmount =
-        accountHolds(ctx.view, account, issue.currency, issuer, fhIGNORE_FREEZE, ctx.j);
+    STAmount const spendableAmount = accountHolds(
+        ctx.view, account, issue.currency, issuer, FreezeHandling::fhIGNORE_FREEZE, ctx.j);
 
     // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
     if (spendableAmount <= beast::zero)
@@ -305,7 +305,12 @@ escrowCreatePreclaimHelper<MPTIssue>(
         return ter;
 
     STAmount const spendableAmount = accountHolds(
-        ctx.view, account, amount.get<MPTIssue>(), fhIGNORE_FREEZE, ahIGNORE_AUTH, ctx.j);
+        ctx.view,
+        account,
+        amount.get<MPTIssue>(),
+        FreezeHandling::fhIGNORE_FREEZE,
+        AuthHandling::ahIGNORE_AUTH,
+        ctx.j);
 
     // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
     if (spendableAmount <= beast::zero)
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
index 36ff1cc2de..6dc57479e6 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverClawback.cpp
@@ -164,11 +164,11 @@ determineClawAmount(
 {
     auto const maxClawAmount = [&]() {
         // Always round the minimum required up
-        NumberRoundModeGuard const mg1(Number::upward);
+        NumberRoundModeGuard const mg1(Number::rounding_mode::upward);
         auto const minRequiredCover =
             tenthBipsOfValue(sleBroker[sfDebtTotal], TenthBips32(sleBroker[sfCoverRateMinimum]));
         // The subtraction probably won't round, but round down if it does.
-        NumberRoundModeGuard const mg2(Number::downward);
+        NumberRoundModeGuard const mg2(Number::rounding_mode::downward);
         return sleBroker[sfCoverAvailable] - minRequiredCover;
     }();
     if (maxClawAmount <= beast::zero)
@@ -295,8 +295,12 @@ LoanBrokerCoverClawback::preclaim(PreclaimContext const& ctx)
     // balance is actually there. It should always match `sfCoverAvailable`, so
     // if there isn't, this is an internal error.
     if (accountHolds(
-            ctx.view, brokerPseudoAccountID, vaultAsset, fhIGNORE_FREEZE, ahIGNORE_AUTH, ctx.j) <
-        clawAmount)
+            ctx.view,
+            brokerPseudoAccountID,
+            vaultAsset,
+            FreezeHandling::fhIGNORE_FREEZE,
+            AuthHandling::ahIGNORE_AUTH,
+            ctx.j) < clawAmount)
         return tecINTERNAL;  // tecINSUFFICIENT_FUNDS; LCOV_EXCL_LINE
 
     // Check if the vault asset issuer has the correct flags
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
index 7061ec99c3..06f2e518ab 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
@@ -133,7 +133,7 @@ LoanBrokerCoverWithdraw::preclaim(PreclaimContext const& ctx)
     auto const minimumCover = [&]() {
         // Always round the minimum required up.
         // Applies to `tenthBipsOfValue` as well as `roundToAsset`.
-        NumberRoundModeGuard const mg(Number::upward);
+        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
         return roundToAsset(
             vaultAsset,
             tenthBipsOfValue(currentDebtTotal, TenthBips32(sleBroker->at(sfCoverRateMinimum))),
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
index 6b1abe45aa..8343b6e931 100644
--- a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
@@ -81,7 +81,8 @@ LoanBrokerDelete::preclaim(PreclaimContext const& ctx)
         // Delete. This check is purely defensive.
         auto const scale = getAssetsTotalScale(vault);
 
-        auto const rounded = roundToAsset(asset, debtTotal, scale, Number::towards_zero);
+        auto const rounded =
+            roundToAsset(asset, debtTotal, scale, Number::rounding_mode::towards_zero);
 
         if (rounded != beast::zero)
         {
diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
index 784bef7d78..875af3a03b 100644
--- a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
@@ -124,7 +124,7 @@ LoanDelete::doApply()
                     vaultSle->at(sfAsset),
                     debtTotalProxy,
                     getAssetsTotalScale(vaultSle),
-                    Number::towards_zero) == beast::zero,
+                    Number::rounding_mode::towards_zero) == beast::zero,
                 "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 87afc2d908..de3de6ca25 100644
--- a/src/libxrpl/tx/transactors/lending/LoanManage.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanManage.cpp
@@ -167,7 +167,7 @@ LoanManage::defaultLoan(
     TenthBips32 const coverRateLiquidation{brokerSle->at(sfCoverRateLiquidation)};
     auto const defaultCovered = [&]() {
         // Always round the minimum required up.
-        NumberRoundModeGuard const mg(Number::upward);
+        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
         auto const minimumCover = tenthBipsOfValue(brokerDebtTotalProxy.value(), coverRateMinimum);
         // Round the liquidation amount up, too
         auto const covered = roundToAsset(
@@ -206,8 +206,8 @@ LoanManage::defaultLoan(
             // LCOV_EXCL_STOP
         }
 
-        auto const vaultDefaultRounded =
-            roundToAsset(vaultAsset, vaultDefaultAmount, vaultScale, Number::downward);
+        auto const vaultDefaultRounded = roundToAsset(
+            vaultAsset, vaultDefaultAmount, vaultScale, Number::rounding_mode::downward);
         vaultTotalProxy -= vaultDefaultRounded;
         // Increase the Asset Available of the Vault by liquidated First-Loss
         // Capital and any unclaimed funds amount:
diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
index c08518a93e..f24fdc19b3 100644
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -138,12 +138,14 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
 
     // If making an overpayment, count it as a full payment because it will do
     // about the same amount of work, if not more.
-    NumberRoundModeGuard const mg(tx.isFlag(tfLoanOverpayment) ? Number::upward : Number::downward);
+    NumberRoundModeGuard const mg(
+        tx.isFlag(tfLoanOverpayment) ? Number::rounding_mode::upward
+                                     : Number::rounding_mode::downward);
     // Estimate how many payments will be made
     Number const numPaymentEstimate = static_cast<std::int64_t>(amount / regularPayment);
 
     // Charge one base fee per paymentsPerFeeIncrement payments, rounding up.
-    Number::setround(Number::upward);
+    Number::setround(Number::rounding_mode::upward);
     auto const feeIncrements = std::max(
         std::int64_t(1),
         static_cast<std::int64_t>(numPaymentEstimate / loanPaymentsPerFeeIncrement));
@@ -240,8 +242,8 @@ LoanPay::preclaim(PreclaimContext const& ctx)
             ctx.view,
             account,
             asset,
-            fhZERO_IF_FROZEN,
-            ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::fhZERO_IF_FROZEN,
+            AuthHandling::ahZERO_IF_UNAUTHORIZED,
             ctx.j,
             SpendableHandling::shFULL_BALANCE);
         balance < amount)
@@ -298,7 +300,7 @@ LoanPay::doApply()
         // Round the minimum required cover up to be conservative. This ensures
         // CoverAvailable never drops below the theoretical minimum, protecting
         // the broker's solvency.
-        NumberRoundModeGuard const mg(Number::upward);
+        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
         return coverAvailableProxy >=
             roundToAsset(
                    asset, tenthBipsOfValue(debtTotalProxy.value(), coverRateMinimum), loanScale) &&
@@ -404,7 +406,7 @@ LoanPay::doApply()
 
     auto const totalPaidToVaultRaw = paymentParts->principalPaid + paymentParts->interestPaid;
     auto const totalPaidToVaultRounded =
-        roundToAsset(asset, totalPaidToVaultRaw, vaultScale, Number::downward);
+        roundToAsset(asset, totalPaidToVaultRaw, vaultScale, Number::rounding_mode::downward);
     XRPL_ASSERT_PARTS(
         !asset.integral() || totalPaidToVaultRaw == totalPaidToVaultRounded,
         "xrpl::LoanPay::doApply",
@@ -511,8 +513,8 @@ LoanPay::doApply()
         view,
         account_,
         asset,
-        fhIGNORE_FREEZE,
-        ahIGNORE_AUTH,
+        FreezeHandling::fhIGNORE_FREEZE,
+        AuthHandling::ahIGNORE_AUTH,
         j_,
         SpendableHandling::shFULL_BALANCE);
     auto const vaultBalanceBefore = account_ == vaultPseudoAccount
@@ -521,8 +523,8 @@ LoanPay::doApply()
               view,
               vaultPseudoAccount,
               asset,
-              fhIGNORE_FREEZE,
-              ahIGNORE_AUTH,
+              FreezeHandling::fhIGNORE_FREEZE,
+              AuthHandling::ahIGNORE_AUTH,
               j_,
               SpendableHandling::shFULL_BALANCE);
     auto const brokerBalanceBefore = account_ == brokerPayee
@@ -531,8 +533,8 @@ LoanPay::doApply()
               view,
               brokerPayee,
               asset,
-              fhIGNORE_FREEZE,
-              ahIGNORE_AUTH,
+              FreezeHandling::fhIGNORE_FREEZE,
+              AuthHandling::ahIGNORE_AUTH,
               j_,
               SpendableHandling::shFULL_BALANCE);
 #endif
@@ -588,8 +590,8 @@ LoanPay::doApply()
         view,
         account_,
         asset,
-        fhIGNORE_FREEZE,
-        ahIGNORE_AUTH,
+        FreezeHandling::fhIGNORE_FREEZE,
+        AuthHandling::ahIGNORE_AUTH,
         j_,
         SpendableHandling::shFULL_BALANCE);
     auto const vaultBalanceAfter = account_ == vaultPseudoAccount
@@ -598,8 +600,8 @@ LoanPay::doApply()
               view,
               vaultPseudoAccount,
               asset,
-              fhIGNORE_FREEZE,
-              ahIGNORE_AUTH,
+              FreezeHandling::fhIGNORE_FREEZE,
+              AuthHandling::ahIGNORE_AUTH,
               j_,
               SpendableHandling::shFULL_BALANCE);
     auto const brokerBalanceAfter = account_ == brokerPayee
@@ -608,8 +610,8 @@ LoanPay::doApply()
               view,
               brokerPayee,
               asset,
-              fhIGNORE_FREEZE,
-              ahIGNORE_AUTH,
+              FreezeHandling::fhIGNORE_FREEZE,
+              AuthHandling::ahIGNORE_AUTH,
               j_,
               SpendableHandling::shFULL_BALANCE);
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanSet.cpp b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
index 48a6005c7b..757ec0ec66 100644
--- a/src/libxrpl/tx/transactors/lending/LoanSet.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanSet.cpp
@@ -495,7 +495,7 @@ LoanSet::doApply()
         // Round the minimum required cover up to be conservative. This ensures
         // CoverAvailable never drops below the theoretical minimum, protecting
         // the broker's solvency.
-        NumberRoundModeGuard const mg(Number::upward);
+        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
         if (brokerSle->at(sfCoverAvailable) < tenthBipsOfValue(newDebtTotal, coverRateMinimum))
         {
             JLOG(j_.warn()) << "Insufficient first-loss capital to cover the loan.";
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index 296020ff95..9de382733d 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -189,7 +189,8 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
         // own currency
         auto const needed = bo->at(sfAmount);
 
-        if (accountFunds(ctx.view, (*bo)[sfOwner], needed, fhZERO_IF_FROZEN, ctx.j) < needed)
+        if (accountFunds(
+                ctx.view, (*bo)[sfOwner], needed, FreezeHandling::fhZERO_IF_FROZEN, ctx.j) < needed)
             return tecINSUFFICIENT_FUNDS;
 
         // Check that the account accepting the buy offer (he's selling the NFT)
@@ -257,7 +258,9 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
             // mode, because then we are confirming that the broker can
             // cover what the buyer will pay, which doesn't make sense, causes
             // an unnecessary tec, and is also resolved with this amendment.
-            if (accountFunds(ctx.view, ctx.tx[sfAccount], needed, fhZERO_IF_FROZEN, ctx.j) < needed)
+            if (accountFunds(
+                    ctx.view, ctx.tx[sfAccount], needed, FreezeHandling::fhZERO_IF_FROZEN, ctx.j) <
+                needed)
                 return tecINSUFFICIENT_FUNDS;
         }
 
@@ -345,9 +348,9 @@ NFTokenAcceptOffer::pay(AccountID const& from, AccountID const& to, STAmount con
     // just confirm that the end state is OK.
     if (!isTesSuccess(result))
         return result;
-    if (accountFunds(view(), from, amount, fhZERO_IF_FROZEN, j_).signum() < 0)
+    if (accountFunds(view(), from, amount, FreezeHandling::fhZERO_IF_FROZEN, j_).signum() < 0)
         return tecINSUFFICIENT_FUNDS;
-    if (accountFunds(view(), to, amount, fhZERO_IF_FROZEN, j_).signum() < 0)
+    if (accountFunds(view(), to, amount, FreezeHandling::fhZERO_IF_FROZEN, j_).signum() < 0)
         return tecINSUFFICIENT_FUNDS;
     return tesSUCCESS;
 }
diff --git a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
index 27cbad2e88..07ec677288 100644
--- a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
+++ b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
@@ -19,7 +19,7 @@ namespace xrpl {
 NotTEC
 LedgerStateFix::preflight(PreflightContext const& ctx)
 {
-    switch (ctx.tx[sfLedgerFixType])
+    switch (static_cast<FixType>(ctx.tx[sfLedgerFixType]))
     {
         case FixType::nfTokenPageLink:
             if (!ctx.tx.isFieldPresent(sfOwner))
@@ -44,7 +44,7 @@ LedgerStateFix::calculateBaseFee(ReadView const& view, STTx const& tx)
 TER
 LedgerStateFix::preclaim(PreclaimContext const& ctx)
 {
-    if (ctx.tx[sfLedgerFixType] == FixType::nfTokenPageLink)
+    if (static_cast<FixType>(ctx.tx[sfLedgerFixType]) == FixType::nfTokenPageLink)
     {
         AccountID const owner{ctx.tx[sfOwner]};
         if (!ctx.view.read(keylet::account(owner)))
@@ -60,7 +60,7 @@ LedgerStateFix::preclaim(PreclaimContext const& ctx)
 TER
 LedgerStateFix::doApply()
 {
-    if (ctx_.tx[sfLedgerFixType] == FixType::nfTokenPageLink)
+    if (static_cast<FixType>(ctx_.tx[sfLedgerFixType]) == FixType::nfTokenPageLink)
     {
         if (!nft::repairNFTokenDirectoryLinks(view(), ctx_.tx[sfOwner]))
             return tecFAILED_PROCESSING;
diff --git a/src/libxrpl/tx/transactors/token/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp
index c9e6d32f6c..ff20bd82c3 100644
--- a/src/libxrpl/tx/transactors/token/Clawback.cpp
+++ b/src/libxrpl/tx/transactors/token/Clawback.cpp
@@ -138,8 +138,12 @@ preclaimHelper<Issue>(
     // the available balance of a trustline is prone to new changes (eg.
     // XLS-34). So we must use `accountHolds`.
     if (accountHolds(
-            ctx.view, holder, clawAmount.get<Issue>().currency, issuer, fhIGNORE_FREEZE, ctx.j) <=
-        beast::zero)
+            ctx.view,
+            holder,
+            clawAmount.get<Issue>().currency,
+            issuer,
+            FreezeHandling::fhIGNORE_FREEZE,
+            ctx.j) <= beast::zero)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -169,8 +173,12 @@ preclaimHelper<MPTIssue>(
         return tecOBJECT_NOT_FOUND;
 
     if (accountHolds(
-            ctx.view, holder, clawAmount.get<MPTIssue>(), fhIGNORE_FREEZE, ahIGNORE_AUTH, ctx.j) <=
-        beast::zero)
+            ctx.view,
+            holder,
+            clawAmount.get<MPTIssue>(),
+            FreezeHandling::fhIGNORE_FREEZE,
+            AuthHandling::ahIGNORE_AUTH,
+            ctx.j) <= beast::zero)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -229,7 +237,7 @@ applyHelper<Issue>(ApplyContext& ctx)
         holder,
         clawAmount.get<Issue>().currency,
         clawAmount.getIssuer(),
-        fhIGNORE_FREEZE,
+        FreezeHandling::fhIGNORE_FREEZE,
         ctx.journal);
 
     return directSendNoFee(
@@ -249,8 +257,8 @@ applyHelper<MPTIssue>(ApplyContext& ctx)
         ctx.view(),
         holder,
         clawAmount.get<MPTIssue>(),
-        fhIGNORE_FREEZE,
-        ahIGNORE_AUTH,
+        FreezeHandling::fhIGNORE_FREEZE,
+        AuthHandling::ahIGNORE_AUTH,
         ctx.journal);
 
     return directSendNoFee(
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index c94f0f405f..9eb7eb1620 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -68,7 +68,7 @@ namespace xrpl::test {
 struct AMMExtended_test : public jtx::AMMTest
 {
     // Use small Number mantissas for the life of this test.
-    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::small};
+    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::mantissa_scale::small};
 
 private:
     void
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index d2d7fbf2c7..d79bd667dd 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -73,7 +73,7 @@ namespace xrpl::test {
 struct AMM_test : public jtx::AMMTest
 {
     // Use small Number mantissas for the life of this test.
-    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::small};
+    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::mantissa_scale::small};
 
 private:
     static FeatureBitset
@@ -5802,7 +5802,7 @@ private:
         Env const env(*this, features, std::make_unique<CaptureLogs>(&logs));
         auto rules = env.current()->rules();
         CurrentTransactionRulesGuard const rg(rules);
-        NumberMantissaScaleGuard const sg(MantissaRange::small);
+        NumberMantissaScaleGuard const sg(MantissaRange::mantissa_scale::small);
 
         for (auto const& t : tests)
         {
@@ -6792,8 +6792,9 @@ private:
     {
         auto const [amount, amount2, lptBalance] = amm.balances(GBP, EUR);
 
-        NumberMantissaScaleGuard const sg(MantissaRange::small);
-        NumberRoundModeGuard const g(env.enabled(fixAMMv1_3) ? Number::upward : Number::getround());
+        NumberMantissaScaleGuard const sg(MantissaRange::mantissa_scale::small);
+        NumberRoundModeGuard const g(
+            env.enabled(fixAMMv1_3) ? Number::rounding_mode::upward : Number::getround());
         auto const res = root2(amount * amount2);
 
         if (shouldFail)
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index 5ed8c79146..d5847c5a85 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -1860,10 +1860,10 @@ class Delegate_test : public beast::unit_test::suite
 #pragma push_macro("TRANSACTION")
 #undef TRANSACTION
 
-#define TRANSACTION(tag, value, name, delegable, ...) \
-    if (delegable == xrpl::delegable)                 \
-    {                                                 \
-        delegableCount++;                             \
+#define TRANSACTION(tag, value, name, txDelegable, ...) \
+    if (txDelegable == xrpl::delegable)                 \
+    {                                                   \
+        delegableCount++;                               \
     }
 
 #include <xrpl/protocol/detail/transactions.macro>
@@ -1889,7 +1889,7 @@ class Delegate_test : public beast::unit_test::suite
         // DO NOT modify expectedDelegableCount unless all scenarios, including
         // edge cases, have been fully tested and verified.
         // ====================================================================
-        std::size_t const expectedDelegableCount = 75;
+        std::size_t const expectedDelegableCount = 51;
 
         BEAST_EXPECTS(
             delegableCount == expectedDelegableCount,
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index 5153e9d71e..c7fe90daa7 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -4116,7 +4116,7 @@ class Invariants_test : public beast::unit_test::suite
             std::vector<ValidVault::DeltaInfo> values;
         };
 
-        NumberMantissaScaleGuard const g{MantissaRange::large};
+        NumberMantissaScaleGuard const g{MantissaRange::mantissa_scale::large};
 
         auto makeDelta = [&vaultAsset](Number const& n) -> ValidVault::DeltaInfo {
             return {.delta = n, .scale = scale(n, vaultAsset.raw())};
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index e78bdc588f..73944b617c 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -65,8 +65,8 @@ public:
         res->updateSkipList();
 
         {
-            res->stateMap().flushDirty(hotACCOUNT_NODE);
-            res->txMap().flushDirty(hotTRANSACTION_NODE);
+            res->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
+            res->txMap().flushDirty(NodeObjectType::hotTRANSACTION_NODE);
         }
         res->unshare();
 
diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp
index 55818b131c..1ffc34bdcc 100644
--- a/src/test/app/LoanBroker_test.cpp
+++ b/src/test/app/LoanBroker_test.cpp
@@ -847,7 +847,7 @@ class LoanBroker_test : public beast::unit_test::suite
         BEAST_EXPECT(env.ownerCount(alice) == aliceOriginalCount);
     }
 
-    enum LoanBrokerTest { CoverClawback, CoverDeposit, CoverWithdraw, Delete, Set };
+    enum class LoanBrokerTest { CoverClawback, CoverDeposit, CoverWithdraw, Delete, Set };
 
     void
     testLoanBroker(
@@ -922,7 +922,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env(jv, txflags(tfFullyCanonicalSig), ter(temINVALID));
         };
 
-        if (brokerTest == CoverDeposit)
+        if (brokerTest == LoanBrokerTest::CoverDeposit)
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() { return coverDeposit(alice, brokerKeylet.key, asset(10)); });
@@ -948,7 +948,7 @@ class LoanBroker_test : public beast::unit_test::suite
         }
         env.close();
 
-        if (brokerTest == CoverWithdraw)
+        if (brokerTest == LoanBrokerTest::CoverWithdraw)
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() { return coverWithdraw(alice, brokerKeylet.key, asset(10)); });
@@ -1001,7 +1001,7 @@ class LoanBroker_test : public beast::unit_test::suite
                 ter(tecPSEUDO_ACCOUNT));
         }
 
-        if (brokerTest == CoverClawback)
+        if (brokerTest == LoanBrokerTest::CoverClawback)
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() {
@@ -1038,7 +1038,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
         }
 
-        if (brokerTest == Delete)
+        if (brokerTest == LoanBrokerTest::Delete)
         {
             Account const borrower{"borrower"};
             env.fund(XRP(1'000), borrower);
@@ -1070,7 +1070,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env(del(alice, brokerKeylet.key));
         }
 
-        if (brokerTest == Set)
+        if (brokerTest == LoanBrokerTest::Set)
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() {
@@ -1138,7 +1138,7 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // Issue:
         // AllowTrustLineClawback is not set or NoFreeze is set
-        testLoanBroker({}, CoverClawback);
+        testLoanBroker({}, LoanBrokerTest::CoverClawback);
 
         // MPTIssue:
         // MPTCanClawback is not set
@@ -1147,7 +1147,7 @@ class LoanBroker_test : public beast::unit_test::suite
                 MPTTester const mpt({.env = env, .issuer = issuer, .holders = {alice}});
                 return mpt;
             },
-            CoverClawback);
+            LoanBrokerTest::CoverClawback);
     }
 
     void
@@ -1158,7 +1158,7 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // preclaim:
         // tecWRONG_ASSET, tecINSUFFICIENT_FUNDS, frozen asset
-        testLoanBroker({}, CoverDeposit);
+        testLoanBroker({}, LoanBrokerTest::CoverDeposit);
     }
 
     void
@@ -1177,7 +1177,7 @@ class LoanBroker_test : public beast::unit_test::suite
             second+third tecINSUFFICIENT_FUNDS (can this happen)?
         doApply: tecPATH_DRY (can it happen, funds already checked?)
          */
-        testLoanBroker({}, CoverWithdraw);
+        testLoanBroker({}, LoanBrokerTest::CoverWithdraw);
     }
 
     void
@@ -1191,7 +1191,7 @@ class LoanBroker_test : public beast::unit_test::suite
             accountSend failure, removeEmptyHolding failure,
             all tecHAS_OBLIGATIONS (can any of these happen?)
         */
-        testLoanBroker({}, Delete);
+        testLoanBroker({}, LoanBrokerTest::Delete);
     }
 
     void
@@ -1207,7 +1207,7 @@ class LoanBroker_test : public beast::unit_test::suite
             addEmptyHolding failure
             can any of these happen?
         */
-        testLoanBroker({}, Set);
+        testLoanBroker({}, LoanBrokerTest::Set);
     }
 
     void
@@ -1585,7 +1585,7 @@ class LoanBroker_test : public beast::unit_test::suite
         Account const dest("destination");
         auto const token = issuer["IOU"];
 
-        enum TrustState {
+        enum class TrustState {
             RequireAuth,
             ZeroLimit,
             ReachedLimit,
@@ -1601,10 +1601,10 @@ class LoanBroker_test : public beast::unit_test::suite
             auto setTrustLine = [&](Account const& acct, TrustState state) {
                 switch (state)
                 {
-                    case RequireAuth:
+                    case TrustState::RequireAuth:
                         env(trust(issuer, token(0), acct, tfSetfAuth));
                         break;
-                    case ZeroLimit: {
+                    case TrustState::ZeroLimit: {
                         auto jv = trust(acct, token(0));
                         // set QualityIn so that the trustline is not
                         // auto-deleted
@@ -1612,19 +1612,19 @@ class LoanBroker_test : public beast::unit_test::suite
                         env(jv);
                     }
                     break;
-                    case ReachedLimit: {
+                    case TrustState::ReachedLimit: {
                         env(trust(acct, token(1'000)));
                         env(pay(issuer, acct, token(1'000)));
                         env.close();
                     }
                     break;
-                    case NearLimit: {
+                    case TrustState::NearLimit: {
                         env(trust(acct, token(1'000)));
                         env(pay(issuer, acct, token(950)));
                         env.close();
                     }
                     break;
-                    case NoTrustLine:
+                    case TrustState::NoTrustLine:
                         // don't create a trustline
                         break;
                     default:
@@ -1636,12 +1636,12 @@ class LoanBroker_test : public beast::unit_test::suite
             env.fund(XRP(1'000), issuer, broker, dest);
             env.close();
 
-            if (trustState == RequireAuth)
+            if (trustState == TrustState::RequireAuth)
             {
                 env(fset(issuer, asfRequireAuth));
                 env.close();
 
-                setTrustLine(broker, RequireAuth);
+                setTrustLine(broker, TrustState::RequireAuth);
             }
 
             setTrustLine(dest, trustState);
@@ -1683,7 +1683,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             // Clearing RequireAuth shouldn't change the result
-            if (trustState == RequireAuth)
+            if (trustState == TrustState::RequireAuth)
             {
                 env(fclear(issuer, asfRequireAuth));
                 env.close();
@@ -1696,11 +1696,11 @@ class LoanBroker_test : public beast::unit_test::suite
             }
         };
 
-        test(RequireAuth);
-        test(ZeroLimit);
-        test(ReachedLimit);
-        test(NearLimit);
-        test(NoTrustLine);
+        test(TrustState::RequireAuth);
+        test(TrustState::ZeroLimit);
+        test(TrustState::ReachedLimit);
+        test(TrustState::NearLimit);
+        test(TrustState::NoTrustLine);
     }
 
     void
@@ -1711,24 +1711,24 @@ class LoanBroker_test : public beast::unit_test::suite
         Account const broker("issuer");
         Account const dest("destination");
 
-        enum MPTState {
+        enum class MPTState {
             RequireAuth,
             ReachedMAX,
             NoMPT,
         };
 
-        auto test = [&](MPTState MPTState) {
+        auto test = [&](MPTState mptState) {
             Env env(*this);
 
-            testcase << "RIPD-4274 MPT with state: " << static_cast<int>(MPTState);
+            testcase << "RIPD-4274 MPT with state: " << static_cast<int>(mptState);
 
             env.fund(XRP(1'000), issuer, broker, dest);
             env.close();
 
             auto const maybeToken = [&]() -> std::optional<MPT> {
-                switch (MPTState)
+                switch (mptState)
                 {
-                    case RequireAuth: {
+                    case MPTState::RequireAuth: {
                         auto tester = MPTTester(
                             {.env = env,
                              .issuer = issuer,
@@ -1742,7 +1742,7 @@ class LoanBroker_test : public beast::unit_test::suite
                             {.account = issuer, .holder = dest, .flags = tfMPTUnauthorize});
                         return tester;
                     }
-                    case ReachedMAX: {
+                    case MPTState::ReachedMAX: {
                         auto tester = MPTTester(
                             {.env = env,
                              .issuer = issuer,
@@ -1753,7 +1753,7 @@ class LoanBroker_test : public beast::unit_test::suite
                         BEAST_EXPECT(env.balance(issuer, tester) == tester(-4'000));
                         return tester;
                     }
-                    case NoMPT: {
+                    case MPTState::NoMPT: {
                         return MPTTester(
                             {.env = env,
                              .issuer = issuer,
@@ -1785,7 +1785,7 @@ class LoanBroker_test : public beast::unit_test::suite
                 ter(std::ignore));
 
             // Shouldn't fail if at MaximumAmount since no new tokens are issued
-            TER const err = MPTState == ReachedMAX ? TER(tesSUCCESS) : tecNO_AUTH;
+            TER const err = mptState == MPTState::ReachedMAX ? TER(tesSUCCESS) : tecNO_AUTH;
             BEAST_EXPECT(env.ter() == err);
             env.close();
 
@@ -1811,9 +1811,9 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
         };
 
-        test(RequireAuth);
-        test(ReachedMAX);
-        test(NoMPT);
+        test(MPTState::RequireAuth);
+        test(MPTState::ReachedMAX);
+        test(MPTState::NoMPT);
     }
 
     void
diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp
index 3fe727e368..f50a7f71d3 100644
--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -154,7 +154,7 @@ protected:
         [[nodiscard]] Number
         maxCoveredLoanValue(Number const& currentDebt) const
         {
-            NumberRoundModeGuard const mg(Number::downward);
+            NumberRoundModeGuard const mg(Number::rounding_mode::downward);
             auto debtLimit = coverDeposit * tenthBipsPerUnity.value() / coverRateMin.value();
 
             return debtLimit - currentDebt;
@@ -590,7 +590,7 @@ protected:
                  : std::max(broker.vaultScale(env), state.principalOutstanding.exponent())));
         BEAST_EXPECT(state.paymentInterval == 600);
         {
-            NumberRoundModeGuard const mg(Number::upward);
+            NumberRoundModeGuard const mg(Number::rounding_mode::upward);
             BEAST_EXPECT(
                 state.totalValue ==
                 roundToAsset(
@@ -913,8 +913,8 @@ protected:
         }
 
         // Include the service fee
-        STAmount const totalDue =
-            roundToScale(roundedPeriodicPayment + serviceFee, state.loanScale, Number::upward);
+        STAmount const totalDue = roundToScale(
+            roundedPeriodicPayment + serviceFee, state.loanScale, Number::rounding_mode::upward);
 
         auto currentRoundedState = constructLoanState(
             state.totalValue, state.principalOutstanding, state.managementFeeOutstanding);
@@ -2013,7 +2013,7 @@ protected:
                          ? 0
                          : std::max(
                                broker.vaultScale(env), state.principalOutstanding.exponent())));
-                NumberRoundModeGuard const mg(Number::upward);
+                NumberRoundModeGuard const mg(Number::rounding_mode::upward);
                 auto const defaultAmount = roundToAsset(
                     broker.asset,
                     std::min(
@@ -2317,7 +2317,7 @@ protected:
                     // service fee is 2
                     auto const startingPayments = state.paymentRemaining;
                     STAmount const payoffAmount = [&]() {
-                        NumberRoundModeGuard const mg(Number::upward);
+                        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
                         auto const rawPayoff =
                             startingPayments * (state.periodicPayment + broker.asset(2).value());
                         STAmount payoffAmount{broker.asset, rawPayoff};
@@ -2519,21 +2519,25 @@ protected:
                 BEAST_EXPECT(
                     roundedPeriodicPayment ==
                     roundToScale(
-                        broker.asset(Number(8333457002039338267, -17), Number::upward),
+                        broker.asset(
+                            Number(8333457002039338267, -17), Number::rounding_mode::upward),
                         state.loanScale,
-                        Number::upward));
+                        Number::rounding_mode::upward));
                 // 83334570.01162141
                 // Include the service fee
                 STAmount const totalDue = roundToScale(
-                    roundedPeriodicPayment + serviceFee, state.loanScale, Number::upward);
+                    roundedPeriodicPayment + serviceFee,
+                    state.loanScale,
+                    Number::rounding_mode::upward);
                 // Only check the first payment since the rounding
                 // may drift as payments are made
                 BEAST_EXPECT(
                     totalDue ==
                     roundToScale(
-                        broker.asset(Number(8533457002039338267, -17), Number::upward),
+                        broker.asset(
+                            Number(8533457002039338267, -17), Number::rounding_mode::upward),
                         state.loanScale,
-                        Number::upward));
+                        Number::rounding_mode::upward));
 
                 {
                     auto const raw = computeTheoreticalLoanState(
@@ -2561,9 +2565,9 @@ protected:
                 BEAST_EXPECT(
                     transactionAmount ==
                     roundToScale(
-                        broker.asset(Number(9533457002039400, -14), Number::upward),
+                        broker.asset(Number(9533457002039400, -14), Number::rounding_mode::upward),
                         state.loanScale,
-                        Number::upward));
+                        Number::rounding_mode::upward));
 
                 auto const initialState = state;
                 xrpl::detail::PaymentComponents totalPaid{
@@ -2651,11 +2655,16 @@ protected:
                     BEAST_EXPECT(
                         state.paymentRemaining < 12 ||
                         roundToAsset(
-                            broker.asset, deltas.principal, state.loanScale, Number::upward) ==
+                            broker.asset,
+                            deltas.principal,
+                            state.loanScale,
+                            Number::rounding_mode::upward) ==
                             roundToScale(
-                                broker.asset(Number(8333228691531218890, -17), Number::upward),
+                                broker.asset(
+                                    Number(8333228691531218890, -17),
+                                    Number::rounding_mode::upward),
                                 state.loanScale,
-                                Number::upward));
+                                Number::rounding_mode::upward));
                     BEAST_EXPECT(
                         paymentComponents.trackedPrincipalDelta >= beast::zero &&
                         paymentComponents.trackedPrincipalDelta <= state.principalOutstanding);
@@ -5239,7 +5248,7 @@ protected:
 
             // pay all but the last payment
             {
-                NumberRoundModeGuard const mg{Number::upward};
+                NumberRoundModeGuard const mg{Number::rounding_mode::upward};
                 Number const payment = beforeState.periodicPayment * (total - 1);
                 XRPAmount const payFee{baseFee * ((total - 1) / loanPaymentsPerFeeIncrement + 1)};
                 STAmount const paymentAmount =
diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
index a1c57ccbc2..681d2f2577 100644
--- a/src/test/app/MPToken_test.cpp
+++ b/src/test/app/MPToken_test.cpp
@@ -4182,18 +4182,18 @@ class MPToken_test : public beast::unit_test::suite
 
         // Holders are locked
         {
-            enum LockType { Global, Individual, None };
+            enum class LockType { Global, Individual, None };
             struct TestArg
             {
                 Account src;
                 Account dst;
                 Account offerOwner;
-                LockType srcFlag = None;
-                LockType dstFlag = None;
-                LockType offerFlagBuy = None;
-                LockType offerFlagSell = None;
-                LockType globalFlagBuy = None;
-                LockType globalFlagSell = None;
+                LockType srcFlag = LockType::None;
+                LockType dstFlag = LockType::None;
+                LockType offerFlagBuy = LockType::None;
+                LockType offerFlagSell = LockType::None;
+                LockType globalFlagBuy = LockType::None;
+                LockType globalFlagSell = LockType::None;
                 TER err = tesSUCCESS;
                 std::optional<TER> errIOU = std::nullopt;
             };
@@ -4238,11 +4238,11 @@ class MPToken_test : public beast::unit_test::suite
             };
             auto lock = [&]<typename Token>(
                             Env& env, Account const& account, Token& token, LockType lock) {
-                if (lock == None)
+                if (lock == LockType::None)
                     return;
                 if constexpr (std::is_same_v<Token, IOU>)
                 {
-                    if (lock == Global)
+                    if (lock == LockType::Global)
                     {
                         env(fset(gw, asfGlobalFreeze));
                     }
@@ -4254,7 +4254,7 @@ class MPToken_test : public beast::unit_test::suite
                 }
                 else if constexpr (std::is_same_v<Token, MPTTester>)
                 {
-                    if (lock == Global)
+                    if (lock == LockType::Global)
                     {
                         token.set({.flags = tfMPTLock});
                     }
@@ -4303,33 +4303,33 @@ class MPToken_test : public beast::unit_test::suite
             // clang-format off
             std::vector<TestArg> const tests = {
                     // src, dst, offer's owner are a holder
-                    {.src = alice, .dst = carol, .offerOwner = bob, .srcFlag = Individual, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = bob, .srcFlag = LockType::Individual, .err = tecPATH_DRY},
                     // dst can receive IOU even if the account is frozen
-                    {.src = alice, .dst = carol, .offerOwner = bob, .dstFlag = Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
-                    {.src = alice, .dst = carol, .offerOwner = bob, .globalFlagBuy = Global, .err = tecPATH_DRY},
-                    {.src = alice, .dst = carol, .offerOwner = bob, .globalFlagSell = Global, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = bob, .dstFlag = LockType::Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
+                    {.src = alice, .dst = carol, .offerOwner = bob, .globalFlagBuy = LockType::Global, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = bob, .globalFlagSell = LockType::Global, .err = tecPATH_DRY},
                     // offer's owner can receive IOU even if the account is frozen
-                    {.src = alice, .dst = carol, .offerOwner = bob, .offerFlagBuy = Individual, .err =
+                    {.src = alice, .dst = carol, .offerOwner = bob, .offerFlagBuy = LockType::Individual, .err =
                     tecPATH_PARTIAL, .errIOU = tesSUCCESS},
-                    {.src = alice, .dst = carol, .offerOwner = bob, .offerFlagSell = Individual, .err = tecPATH_PARTIAL},
+                    {.src = alice, .dst = carol, .offerOwner = bob, .offerFlagSell = LockType::Individual, .err = tecPATH_PARTIAL},
                     // src, dst are a holder, offer's owner is an issuer
-                    {.src = alice, .dst = carol, .offerOwner = gw, .srcFlag = Individual, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = gw, .srcFlag = LockType::Individual, .err = tecPATH_DRY},
                     // dst can receive IOU even if the account is frozen
-                    {.src = alice, .dst = carol, .offerOwner = gw, .dstFlag = Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
-                    {.src = alice, .dst = carol, .offerOwner = gw, .globalFlagBuy = Global, .err = tecPATH_DRY},
-                    {.src = alice, .dst = carol, .offerOwner = gw, .globalFlagSell = Global, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = gw, .dstFlag = LockType::Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
+                    {.src = alice, .dst = carol, .offerOwner = gw, .globalFlagBuy = LockType::Global, .err = tecPATH_DRY},
+                    {.src = alice, .dst = carol, .offerOwner = gw, .globalFlagSell = LockType::Global, .err = tecPATH_DRY},
                     // src is issuer, dst and offer's owner are a holder
                     // dst can receive IOU even if the account is frozen
-                    {.src = gw, .dst = carol, .offerOwner = bob, .dstFlag = Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
+                    {.src = gw, .dst = carol, .offerOwner = bob, .dstFlag = LockType::Individual, .err = tecPATH_DRY, .errIOU = tesSUCCESS},
                     // offer's owner can receive IOU from an issuer even if takerBuys is frozen, MPT offer is unfunded in this case
-                    {.src = gw, .dst = carol, .offerOwner = bob, .offerFlagBuy = Individual, .err = tecPATH_PARTIAL, .errIOU = tesSUCCESS},
-                    {.src = gw, .dst = carol, .offerOwner = bob, .offerFlagSell = Individual, .err = tecPATH_PARTIAL},
+                    {.src = gw, .dst = carol, .offerOwner = bob, .offerFlagBuy = LockType::Individual, .err = tecPATH_PARTIAL, .errIOU = tesSUCCESS},
+                    {.src = gw, .dst = carol, .offerOwner = bob, .offerFlagSell = LockType::Individual, .err = tecPATH_PARTIAL},
                     // dst is issuer, src and offer's owner are a holder
-                    {.src = alice, .dst = gw, .offerOwner = bob, .srcFlag = Individual, .err = tecPATH_DRY},
+                    {.src = alice, .dst = gw, .offerOwner = bob, .srcFlag = LockType::Individual, .err = tecPATH_DRY},
                     // offer's owner can receive IOU even if the account is frozen
-                    {.src = alice, .dst = gw, .offerOwner = bob, .offerFlagBuy = Individual, .err = tecPATH_PARTIAL,
+                    {.src = alice, .dst = gw, .offerOwner = bob, .offerFlagBuy = LockType::Individual, .err = tecPATH_PARTIAL,
                      .errIOU = tesSUCCESS},
-                    {.src = alice, .dst = gw, .offerOwner = bob, .offerFlagSell = Individual, .err = tecPATH_PARTIAL},
+                    {.src = alice, .dst = gw, .offerOwner = bob, .offerFlagSell = LockType::Individual, .err = tecPATH_PARTIAL},
             };
             // clang-format on
 
diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp
index 08d7b4305e..efb255ea2d 100644
--- a/src/test/app/NFTokenBurn_test.cpp
+++ b/src/test/app/NFTokenBurn_test.cpp
@@ -88,7 +88,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
     //
     // It uses the ledger RPC command to show the NFT pages in the ledger.
     // This parameter controls how noisy the output is.
-    enum Volume : bool {
+    enum class Volume : bool {
         quiet = false,
         noisy = true,
     };
@@ -123,7 +123,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
                     std::cout << tokenCount << " NFtokens in page "
                               << state[i][jss::index].asString() << std::endl;
 
-                    if (vol == noisy)
+                    if (vol == Volume::noisy)
                     {
                         std::cout << state[i].toStyledString() << std::endl;
                     }
diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp
index 5764e87f76..a1527e8601 100644
--- a/src/test/app/NFTokenDir_test.cpp
+++ b/src/test/app/NFTokenDir_test.cpp
@@ -42,7 +42,7 @@ class NFTokenDir_test : public beast::unit_test::suite
     //
     // It uses the ledger RPC command to show the NFT pages in the ledger.
     // This parameter controls how noisy the output is.
-    enum Volume : bool {
+    enum class Volume : bool {
         quiet = false,
         noisy = true,
     };
@@ -77,7 +77,7 @@ class NFTokenDir_test : public beast::unit_test::suite
                     std::cout << tokenCount << " NFtokens in page "
                               << state[i][jss::index].asString() << std::endl;
 
-                    if (vol == noisy)
+                    if (vol == Volume::noisy)
                     {
                         std::cout << state[i].toStyledString() << std::endl;
                     }
@@ -190,7 +190,7 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (std::string_view const seed : seeds)
             {
                 Account const& account =
-                    accounts.emplace_back(Account::base58Seed, std::string(seed));
+                    accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
                 env.fund(XRP(10000), account);
 
                 // Do not close the ledger inside the loop.  If accounts are
@@ -394,7 +394,7 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (std::string_view const seed : seeds)
             {
                 Account const& account =
-                    accounts.emplace_back(Account::base58Seed, std::string(seed));
+                    accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
                 env.fund(XRP(10000), account);
 
                 // Do not close the ledger inside the loop.  If accounts are
@@ -624,7 +624,8 @@ class NFTokenDir_test : public beast::unit_test::suite
         accounts.reserve(seeds.size());
         for (std::string_view const seed : seeds)
         {
-            Account const& account = accounts.emplace_back(Account::base58Seed, std::string(seed));
+            Account const& account =
+                accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
             env.fund(XRP(10000), account);
 
             // Do not close the ledger inside the loop.  If accounts are
@@ -787,7 +788,8 @@ class NFTokenDir_test : public beast::unit_test::suite
         accounts.reserve(seeds.size());
         for (std::string_view const seed : seeds)
         {
-            Account const& account = accounts.emplace_back(Account::base58Seed, std::string(seed));
+            Account const& account =
+                accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
             env.fund(XRP(10000), account);
 
             // Do not close the ledger inside the loop.  If accounts are
diff --git a/src/test/app/OfferMPT_test.cpp b/src/test/app/OfferMPT_test.cpp
index b07fe043d2..f67c2ce9c2 100644
--- a/src/test/app/OfferMPT_test.cpp
+++ b/src/test/app/OfferMPT_test.cpp
@@ -2013,7 +2013,7 @@ public:
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum preAuthType { noPreAuth, acctPreAuth };
+        enum class preAuthType { noPreAuth, acctPreAuth };
         struct TestData
         {
             std::string account;      // Account operated on
@@ -2032,37 +2032,37 @@ public:
         // clang-format off
         TestData const tests[]{
             // acct                     fundXrp        bookAmt   preTrust  offerAmt                   tec     spentXrp       balanceUSD offers  owners scale
-            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
-            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
-            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preAuth=noPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
-            {.account="deb",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},  // Account has enough to buy a little USD then the offer runs dry.
-            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
-            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
-            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
-            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
-            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
-            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
-            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preAuth=noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
+            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
+            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
+            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
+            {.account="deb",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},  // Account has enough to buy a little USD then the offer runs dry.
+            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
+            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
+            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
+            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
+            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
+            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
+            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
+            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
             //---------------- Pre-created MPT ---------------------
             // Unlike from IOU, an issuer can't pre-create MPToken for an account (see similar tests in Offer_test.cpp)
-            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preAuth=acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preAuth=acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="syd",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=3 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},
-            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preAuth=acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
-            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preAuth=acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preAuth=acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
-            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preAuth=acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="syd",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=3 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},
+            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
+            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
+            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
         };
         // clang-format on
 
@@ -2085,7 +2085,7 @@ public:
             // Optionally pre-authorize MPT for acct.
             // Note this is not really part of the test, so we expect there
             // to be enough XRP reserve for acct to create the trust line.
-            if (t.preAuth == acctPreAuth)
+            if (t.preAuth == preAuthType::acctPreAuth)
                 MUSD.authorize({.account = acct});
             env.close();
 
@@ -2120,7 +2120,7 @@ public:
                 BEAST_EXPECT(acctOffer[sfTakerPays] == USD(leftover));
             }
 
-            if (t.preAuth == noPreAuth)
+            if (t.preAuth == preAuthType::noPreAuth)
             {
                 if (t.balanceUsd.value().signum() != 0)
                 {
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 0c00c91f63..78bdd3fef2 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -2228,7 +2228,7 @@ public:
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
+        enum class preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
         struct TestData
         {
             std::string account;      // Account operated on
@@ -2246,45 +2246,45 @@ public:
         // clang-format off
         TestData const tests[]{
             // acct                     fundXrp        bookAmt   preTrust  offerAmount                   tec     spentXrp       balanceUSD offers  owners
-            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
-            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
-            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=noPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
-            {.account="deb", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},  // Account has enough to buy a little USD then the offer runs dry.
-            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
-            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
-            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
-            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
-            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
-            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
-            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preTrust=noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
+            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
+            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
+            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
+            {.account="deb", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},  // Account has enough to buy a little USD then the offer runs dry.
+            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
+            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
+            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
+            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
+            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
+            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
+            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
+            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
+            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
             //---------------- Pre-established trust lines ---------------------
-            {.account="abe",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="bud",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="che",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=gwPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="dan", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=0},
-            {.account="eli", .fundXrp=XRP(  20) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 1 * f, .balanceUsd=USD(     20),    .offers=0, .owners=0},
-            {.account="fyn",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
-            {.account="gar",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
-            {.account="hal",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
+            {.account="abe",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
+            {.account="bud",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
+            {.account="che",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
+            {.account="dan", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=0},
+            {.account="eli", .fundXrp=XRP(  20) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 1 * f, .balanceUsd=USD(     20),    .offers=0, .owners=0},
+            {.account="fyn",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
+            {.account="gar",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
+            {.account="hal",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
 
-            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preTrust=acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preTrust=acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="syd", .fundXrp=drops(10) + reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10) + 2 * f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},
-            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preTrust=acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
-            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preTrust=acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preTrust=acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
-            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preTrust=acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="syd", .fundXrp=drops(10) + reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10) + 2 * f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},
+            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
+            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
+            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
+            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
+            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
         };
         // clang-format on
 
@@ -2305,14 +2305,14 @@ public:
             std::uint32_t const gwOfferSeq = env.seq(gw) - 1;
 
             // Optionally pre-establish a trustline between gw and acct.
-            if (t.preTrust == gwPreTrust)
+            if (t.preTrust == preTrustType::gwPreTrust)
                 env(trust(gw, acct["USD"](1)));
             env.close();
 
             // Optionally pre-establish a trustline between acct and gw.
             // Note this is not really part of the test, so we expect there
             // to be enough XRP reserve for acct to create the trust line.
-            if (t.preTrust == acctPreTrust)
+            if (t.preTrust == preTrustType::acctPreTrust)
                 env(trust(acct, USD(1)));
             env.close();
 
@@ -2340,7 +2340,7 @@ public:
                 BEAST_EXPECT(acctOffer[sfTakerPays] == USD(leftover));
             }
 
-            if (t.preTrust == noPreTrust)
+            if (t.preTrust == preTrustType::noPreTrust)
             {
                 if (t.balanceUsd.value().signum() != 0)
                 {
@@ -2675,7 +2675,7 @@ public:
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
+        enum class preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
         struct TestData
         {
             std::string account;  // Account operated on
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index 505d052faa..e6d27de415 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -132,7 +132,7 @@ public:
         void
         signal()
         {
-            std::lock_guard const lk(mutex_);
+            std::scoped_lock const lk(mutex_);
             signaled_ = true;
             cv_.notify_all();
         }
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index 3f49ab42bb..c790895921 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -4025,7 +4025,7 @@ private:
         ChainStateTrack b_;
     };
 
-    enum SmState {
+    enum class SmState {
         st_initial,
         st_claim_id_created,
         st_attesting,
@@ -4034,8 +4034,6 @@ private:
         st_closed,
     };
 
-    enum Act_Flags { af_a2b = 1 << 0 };
-
     // --------------------------------------------------
     template <class T>
     class SmBase
@@ -4169,7 +4167,7 @@ private:
                 st.spend(dstDoor(), reward, num_attestors);
                 st.transfer(dstDoor(), cr.to, cr.amt);
                 st.env.env_.memoize(cr.to);
-                sm_state = st_completed;
+                sm_state = SmState::st_completed;
             };
 
             counters.create_callbacks[cr.claim_id - 1] = std::move(complete_cb);
@@ -4180,12 +4178,12 @@ private:
         {
             switch (sm_state)
             {
-                case st_initial:
+                case SmState::st_initial:
                     cr.claim_id = issue_account_create();
-                    sm_state = st_attesting;
+                    sm_state = SmState::st_attesting;
                     break;
 
-                case st_attesting:
+                case SmState::st_attesting:
                     attest(time, rnd);
                     break;
 
@@ -4193,14 +4191,14 @@ private:
                     assert(0);
                     break;
 
-                case st_completed:
+                case SmState::st_completed:
                     break;  // will get this once
             }
             return sm_state;
         }
 
     private:
-        SmState sm_state{st_initial};
+        SmState sm_state{SmState::st_initial};
         AccountCreate cr;
     };
 
@@ -4329,35 +4327,36 @@ private:
         {
             switch (sm_state)
             {
-                case st_initial:
+                case SmState::st_initial:
                     xfer.claim_id = create_claim_id();
-                    sm_state = st_claim_id_created;
+                    sm_state = SmState::st_claim_id_created;
                     break;
 
-                case st_claim_id_created:
+                case SmState::st_claim_id_created:
                     commit();
-                    sm_state = st_attesting;
+                    sm_state = SmState::st_attesting;
                     break;
 
-                case st_attesting:
+                case SmState::st_attesting:
                     if (attest(time, rnd))
                     {
-                        sm_state = xfer.with_claim == WithClaim::yes ? st_attested : st_completed;
+                        sm_state = xfer.with_claim == WithClaim::yes ? SmState::st_attested
+                                                                     : SmState::st_completed;
                     }
                     else
                     {
-                        sm_state = st_attesting;
+                        sm_state = SmState::st_attesting;
                     }
                     break;
 
-                case st_attested:
+                case SmState::st_attested:
                     assert(xfer.with_claim == WithClaim::yes);
                     claim();
-                    sm_state = st_completed;
+                    sm_state = SmState::st_completed;
                     break;
 
                 default:
-                case st_completed:
+                case SmState::st_completed:
                     assert(0);  // should have been removed
                     break;
             }
@@ -4366,7 +4365,7 @@ private:
 
     private:
         Transfer xfer;
-        SmState sm_state{st_initial};
+        SmState sm_state{SmState::st_initial};
     };
 
     // --------------------------------------------------
@@ -4413,7 +4412,7 @@ public:
                     return sm.advance(time, rnd);
                 };
                 auto& [t, sm] = *it;
-                if (t <= time && std::visit(vis, sm) == st_completed)
+                if (t <= time && std::visit(vis, sm) == SmState::st_completed)
                 {
                     it = sm_.erase(it);
                 }
diff --git a/src/test/basics/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp
index 95362c7545..5c01445e31 100644
--- a/src/test/basics/IOUAmount_test.cpp
+++ b/src/test/basics/IOUAmount_test.cpp
@@ -156,7 +156,8 @@ public:
             BEAST_EXPECTS(result == expected, ss.str());
         };
 
-        for (auto const mantissaSize : {MantissaRange::small, MantissaRange::large})
+        for (auto const mantissaSize :
+             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
         {
             NumberMantissaScaleGuard const mg(mantissaSize);
 
diff --git a/src/test/basics/Number_test.cpp b/src/test/basics/Number_test.cpp
index cc7ccaa8c2..607ae004b1 100644
--- a/src/test/basics/Number_test.cpp
+++ b/src/test/basics/Number_test.cpp
@@ -75,20 +75,21 @@ public:
 
         test(
             Number{std::numeric_limits<std::int64_t>::min()},
-            scale == MantissaRange::small
+            scale == MantissaRange::mantissa_scale::small
                 ? Number{-9'223'372'036'854'776, 3}
                 : Number{true, 9'223'372'036'854'775'808ULL, 0, Number::normalized{}},
             __LINE__);
         test(
             Number{std::numeric_limits<std::int64_t>::min() + 1},
-            scale == MantissaRange::small ? Number{-9'223'372'036'854'776, 3}
-                                          : Number{-9'223'372'036'854'775'807},
+            scale == MantissaRange::mantissa_scale::small ? Number{-9'223'372'036'854'776, 3}
+                                                          : Number{-9'223'372'036'854'775'807},
             __LINE__);
         test(
             Number{std::numeric_limits<std::int64_t>::max()},
             Number{
-                scale == MantissaRange::small ? 9'223'372'036'854'776
-                                              : std::numeric_limits<std::int64_t>::max(),
+                scale == MantissaRange::mantissa_scale::small
+                    ? 9'223'372'036'854'776
+                    : std::numeric_limits<std::int64_t>::max(),
                 18 - Number::mantissaLog()},
             __LINE__);
         caught = false;
@@ -207,7 +208,7 @@ public:
                 BEAST_EXPECTS(result == z, ss.str());
             }
         };
-        if (scale == MantissaRange::small)
+        if (scale == MantissaRange::mantissa_scale::small)
         {
             test(cSmall);
         }
@@ -303,7 +304,7 @@ public:
                 BEAST_EXPECTS(result == z, ss.str());
             }
         };
-        if (scale == MantissaRange::small)
+        if (scale == MantissaRange::mantissa_scale::small)
         {
             test(cSmall);
         }
@@ -330,7 +331,7 @@ public:
             }
         };
         auto tests = [&](auto const& cSmall, auto const& cLarge) {
-            if (scale == MantissaRange::small)
+            if (scale == MantissaRange::mantissa_scale::small)
             {
                 test(cSmall);
             }
@@ -341,7 +342,7 @@ public:
         };
         auto const maxMantissa = Number::maxMantissa();
 
-        saveNumberRoundMode const save{Number::setround(Number::to_nearest)};
+        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
         {
             auto const cSmall = std::to_array<Case>({
                 {Number{7}, Number{8}, Number{56}},
@@ -407,7 +408,7 @@ public:
             });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::towards_zero);
+        Number::setround(Number::rounding_mode::towards_zero);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " towards_zero";
         {
             auto const cSmall = std::to_array<Case>(
@@ -474,7 +475,7 @@ public:
                 });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " downward";
         {
             auto const cSmall = std::to_array<Case>(
@@ -541,7 +542,7 @@ public:
                 });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " upward";
         {
             auto const cSmall = std::to_array<Case>(
@@ -642,7 +643,7 @@ public:
         };
         auto const maxMantissa = Number::maxMantissa();
         auto tests = [&](auto const& cSmall, auto const& cLarge) {
-            if (scale == MantissaRange::small)
+            if (scale == MantissaRange::mantissa_scale::small)
             {
                 test(cSmall);
             }
@@ -651,7 +652,7 @@ public:
                 test(cLarge);
             }
         };
-        saveNumberRoundMode const save{Number::setround(Number::to_nearest)};
+        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -689,7 +690,7 @@ public:
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " towards_zero";
-        Number::setround(Number::towards_zero);
+        Number::setround(Number::rounding_mode::towards_zero);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -727,7 +728,7 @@ public:
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " downward";
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -765,7 +766,7 @@ public:
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " upward";
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -834,7 +835,7 @@ public:
         /*
         auto tests = [&](auto const& cSmall, auto const& cLarge) {
             test(cSmall);
-            if (scale != MantissaRange::small)
+            if (scale != MantissaRange::mantissa_scale::small)
                 test(cLarge);
         };
         */
@@ -864,9 +865,9 @@ public:
              Number{false, 55'108'98747006743627, -14, Number::normalized{}}},
         });
         test(cSmall);
-        if (Number::getMantissaScale() != MantissaRange::small)
+        if (Number::getMantissaScale() != MantissaRange::mantissa_scale::small)
         {
-            NumberRoundModeGuard const mg(Number::towards_zero);
+            NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
             test(cLarge);
         }
         bool caught = false;
@@ -1027,7 +1028,7 @@ public:
     {
         testcase << "test_to_integer " << to_string(Number::getMantissaScale());
         using Case = std::tuple<Number, std::int64_t>;
-        saveNumberRoundMode const save{Number::setround(Number::to_nearest)};
+        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1064,8 +1065,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        auto prev_mode = Number::setround(Number::towards_zero);
-        BEAST_EXPECT(prev_mode == Number::to_nearest);
+        auto prev_mode = Number::setround(Number::rounding_mode::towards_zero);
+        BEAST_EXPECT(prev_mode == Number::rounding_mode::to_nearest);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1102,8 +1103,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        prev_mode = Number::setround(Number::downward);
-        BEAST_EXPECT(prev_mode == Number::towards_zero);
+        prev_mode = Number::setround(Number::rounding_mode::downward);
+        BEAST_EXPECT(prev_mode == Number::rounding_mode::towards_zero);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1140,8 +1141,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        prev_mode = Number::setround(Number::upward);
-        BEAST_EXPECT(prev_mode == Number::downward);
+        prev_mode = Number::setround(Number::rounding_mode::upward);
+        BEAST_EXPECT(prev_mode == Number::rounding_mode::downward);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1236,13 +1237,13 @@ public:
 
         switch (scale)
         {
-            case MantissaRange::small:
+            case MantissaRange::mantissa_scale::small:
 
                 test(Number::min(), "1e-32753");
                 test(Number::max(), "9999999999999999e32768");
                 test(Number::lowest(), "-9999999999999999e32768");
                 {
-                    NumberRoundModeGuard const mg(Number::towards_zero);
+                    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
 
                     auto const maxMantissa = Number::maxMantissa();
                     BEAST_EXPECT(maxMantissa == 9'999'999'999'999'999);
@@ -1265,14 +1266,14 @@ public:
                         "9223372036854775e3");
                 }
                 break;
-            case MantissaRange::large:
+            case MantissaRange::mantissa_scale::large:
                 // Test the edges
                 // ((exponent < -(28)) || (exponent > -(8)))))
                 test(Number::min(), "1e-32750");
                 test(Number::max(), "9223372036854775807e32768");
                 test(Number::lowest(), "-9223372036854775807e32768");
                 {
-                    NumberRoundModeGuard const mg(Number::towards_zero);
+                    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
 
                     auto const maxMantissa = Number::maxMantissa();
                     BEAST_EXPECT(maxMantissa == 9'999'999'999'999'999'999ULL);
@@ -1348,19 +1349,19 @@ public:
         NumberSO const stNumberSO{true};
         Issue const issue;
         Number const n{7'518'783'80596, -5};
-        saveNumberRoundMode const save{Number::setround(Number::to_nearest)};
+        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
         auto res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518784});
 
-        Number::setround(Number::towards_zero);
+        Number::setround(Number::rounding_mode::towards_zero);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518783});
 
-        Number::setround(Number::downward);
+        Number::setround(Number::rounding_mode::downward);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518783});
 
-        Number::setround(Number::upward);
+        Number::setround(Number::rounding_mode::upward);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518784});
     }
@@ -1400,87 +1401,87 @@ public:
         std::map<Number, NumberRoundings> const expected{
             // Positive numbers
             {Number{13, -1},
-             {{Number::to_nearest, 1},
-              {Number::towards_zero, 1},
-              {Number::downward, 1},
-              {Number::upward, 2}}},
+             {{Number::rounding_mode::to_nearest, 1},
+              {Number::rounding_mode::towards_zero, 1},
+              {Number::rounding_mode::downward, 1},
+              {Number::rounding_mode::upward, 2}}},
             {Number{23, -1},
-             {{Number::to_nearest, 2},
-              {Number::towards_zero, 2},
-              {Number::downward, 2},
-              {Number::upward, 3}}},
+             {{Number::rounding_mode::to_nearest, 2},
+              {Number::rounding_mode::towards_zero, 2},
+              {Number::rounding_mode::downward, 2},
+              {Number::rounding_mode::upward, 3}}},
             {Number{15, -1},
-             {{Number::to_nearest, 2},
-              {Number::towards_zero, 1},
-              {Number::downward, 1},
-              {Number::upward, 2}}},
+             {{Number::rounding_mode::to_nearest, 2},
+              {Number::rounding_mode::towards_zero, 1},
+              {Number::rounding_mode::downward, 1},
+              {Number::rounding_mode::upward, 2}}},
             {Number{25, -1},
-             {{Number::to_nearest, 2},
-              {Number::towards_zero, 2},
-              {Number::downward, 2},
-              {Number::upward, 3}}},
+             {{Number::rounding_mode::to_nearest, 2},
+              {Number::rounding_mode::towards_zero, 2},
+              {Number::rounding_mode::downward, 2},
+              {Number::rounding_mode::upward, 3}}},
             {Number{152, -2},
-             {{Number::to_nearest, 2},
-              {Number::towards_zero, 1},
-              {Number::downward, 1},
-              {Number::upward, 2}}},
+             {{Number::rounding_mode::to_nearest, 2},
+              {Number::rounding_mode::towards_zero, 1},
+              {Number::rounding_mode::downward, 1},
+              {Number::rounding_mode::upward, 2}}},
             {Number{252, -2},
-             {{Number::to_nearest, 3},
-              {Number::towards_zero, 2},
-              {Number::downward, 2},
-              {Number::upward, 3}}},
+             {{Number::rounding_mode::to_nearest, 3},
+              {Number::rounding_mode::towards_zero, 2},
+              {Number::rounding_mode::downward, 2},
+              {Number::rounding_mode::upward, 3}}},
             {Number{17, -1},
-             {{Number::to_nearest, 2},
-              {Number::towards_zero, 1},
-              {Number::downward, 1},
-              {Number::upward, 2}}},
+             {{Number::rounding_mode::to_nearest, 2},
+              {Number::rounding_mode::towards_zero, 1},
+              {Number::rounding_mode::downward, 1},
+              {Number::rounding_mode::upward, 2}}},
             {Number{27, -1},
-             {{Number::to_nearest, 3},
-              {Number::towards_zero, 2},
-              {Number::downward, 2},
-              {Number::upward, 3}}},
+             {{Number::rounding_mode::to_nearest, 3},
+              {Number::rounding_mode::towards_zero, 2},
+              {Number::rounding_mode::downward, 2},
+              {Number::rounding_mode::upward, 3}}},
 
             // Negative numbers
             {Number{-13, -1},
-             {{Number::to_nearest, -1},
-              {Number::towards_zero, -1},
-              {Number::downward, -2},
-              {Number::upward, -1}}},
+             {{Number::rounding_mode::to_nearest, -1},
+              {Number::rounding_mode::towards_zero, -1},
+              {Number::rounding_mode::downward, -2},
+              {Number::rounding_mode::upward, -1}}},
             {Number{-23, -1},
-             {{Number::to_nearest, -2},
-              {Number::towards_zero, -2},
-              {Number::downward, -3},
-              {Number::upward, -2}}},
+             {{Number::rounding_mode::to_nearest, -2},
+              {Number::rounding_mode::towards_zero, -2},
+              {Number::rounding_mode::downward, -3},
+              {Number::rounding_mode::upward, -2}}},
             {Number{-15, -1},
-             {{Number::to_nearest, -2},
-              {Number::towards_zero, -1},
-              {Number::downward, -2},
-              {Number::upward, -1}}},
+             {{Number::rounding_mode::to_nearest, -2},
+              {Number::rounding_mode::towards_zero, -1},
+              {Number::rounding_mode::downward, -2},
+              {Number::rounding_mode::upward, -1}}},
             {Number{-25, -1},
-             {{Number::to_nearest, -2},
-              {Number::towards_zero, -2},
-              {Number::downward, -3},
-              {Number::upward, -2}}},
+             {{Number::rounding_mode::to_nearest, -2},
+              {Number::rounding_mode::towards_zero, -2},
+              {Number::rounding_mode::downward, -3},
+              {Number::rounding_mode::upward, -2}}},
             {Number{-152, -2},
-             {{Number::to_nearest, -2},
-              {Number::towards_zero, -1},
-              {Number::downward, -2},
-              {Number::upward, -1}}},
+             {{Number::rounding_mode::to_nearest, -2},
+              {Number::rounding_mode::towards_zero, -1},
+              {Number::rounding_mode::downward, -2},
+              {Number::rounding_mode::upward, -1}}},
             {Number{-252, -2},
-             {{Number::to_nearest, -3},
-              {Number::towards_zero, -2},
-              {Number::downward, -3},
-              {Number::upward, -2}}},
+             {{Number::rounding_mode::to_nearest, -3},
+              {Number::rounding_mode::towards_zero, -2},
+              {Number::rounding_mode::downward, -3},
+              {Number::rounding_mode::upward, -2}}},
             {Number{-17, -1},
-             {{Number::to_nearest, -2},
-              {Number::towards_zero, -1},
-              {Number::downward, -2},
-              {Number::upward, -1}}},
+             {{Number::rounding_mode::to_nearest, -2},
+              {Number::rounding_mode::towards_zero, -1},
+              {Number::rounding_mode::downward, -2},
+              {Number::rounding_mode::upward, -1}}},
             {Number{-27, -1},
-             {{Number::to_nearest, -3},
-              {Number::towards_zero, -2},
-              {Number::downward, -3},
-              {Number::upward, -2}}},
+             {{Number::rounding_mode::to_nearest, -3},
+              {Number::rounding_mode::towards_zero, -2},
+              {Number::rounding_mode::downward, -3},
+              {Number::rounding_mode::upward, -2}}},
         };
 
         for (auto const& [num, roundings] : expected)
@@ -1491,8 +1492,8 @@ public:
                 auto const res = static_cast<std::int64_t>(num);
                 BEAST_EXPECTS(
                     res == val,
-                    to_string(num) + " with mode " + std::to_string(mode) + " expected " +
-                        std::to_string(val) + " got " + std::to_string(res));
+                    to_string(num) + " with mode " + std::to_string(static_cast<int>(mode)) +
+                        " expected " + std::to_string(val) + " got " + std::to_string(res));
             }
         }
     }
@@ -1508,7 +1509,7 @@ public:
         Number const ten{10};
         BEAST_EXPECT(ten.exponent() <= 0);
 
-        if (scale == MantissaRange::small)
+        if (scale == MantissaRange::mantissa_scale::small)
         {
             BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > INITIAL_XRP.drops());
             BEAST_EXPECT(Number::maxMantissa() < INITIAL_XRP.drops());
@@ -1537,7 +1538,7 @@ public:
             // 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}));
 
-            NumberRoundModeGuard const mg(Number::towards_zero);
+            NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
 
             auto const maxMantissa = Number::maxMantissa();
             Number const max = Number{false, maxMantissa, 0, Number::normalized{}};
@@ -1553,7 +1554,8 @@ public:
     void
     run() override
     {
-        for (auto const scale : {MantissaRange::small, MantissaRange::large})
+        for (auto const scale :
+             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
         {
             NumberMantissaScaleGuard const sg(scale);
             testZero();
diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp
index dfd20eced0..206fdfc8b1 100644
--- a/src/test/beast/beast_io_latency_probe_test.cpp
+++ b/src/test/beast/beast_io_latency_probe_test.cpp
@@ -66,7 +66,7 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
                         wait_err = ec;
                     auto const end{MeasureClock::now()};
                     elapsed_times_.emplace_back(end - start);
-                    std::lock_guard const lk{mtx};
+                    std::scoped_lock const lk{mtx};
                     done = true;
                     cv.notify_one();
                 });
diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp
index a3987e8136..bb1bcb0c0f 100644
--- a/src/test/consensus/NegativeUNL_test.cpp
+++ b/src/test/consensus/NegativeUNL_test.cpp
@@ -738,9 +738,9 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
         PublicKey const toReEnableKey(derivePublicKey(KeyType::ed25519, randomSecretKey()));
         LedgerIndex const seq(1234);
         BEAST_EXPECT(countTx(txSet) == 0);
-        vote.addTx(seq, toDisableKey, NegativeUNLVote::ToDisable, txSet);
+        vote.addTx(seq, toDisableKey, NegativeUNLVote::NegativeUNLModify::ToDisable, txSet);
         BEAST_EXPECT(countTx(txSet) == 1);
-        vote.addTx(seq, toReEnableKey, NegativeUNLVote::ToReEnable, txSet);
+        vote.addTx(seq, toReEnableKey, NegativeUNLVote::NegativeUNLModify::ToReEnable, txSet);
         BEAST_EXPECT(countTx(txSet) == 2);
         // content of a tx is implicitly tested after applied to a ledger
         // in later test cases
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 38bafe08fd..9696451f6a 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -43,7 +43,7 @@ public:
         void
         signal()
         {
-            std::lock_guard const lk(mutex_);
+            std::scoped_lock const lk(mutex_);
             signaled_ = true;
             cv_.notify_all();
         }
diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp
index a5b579e810..e8a9f21816 100644
--- a/src/test/core/Workers_test.cpp
+++ b/src/test/core/Workers_test.cpp
@@ -89,7 +89,7 @@ public:
         void
         processTask(int instance) override
         {
-            std::lock_guard const lk{mut};
+            std::scoped_lock const lk{mut};
             if (--count == 0)
                 cv.notify_all();
         }
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index 8f46ef6f59..ffb186e0d6 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -140,7 +140,7 @@ protected:
         void
         signal()
         {
-            std::lock_guard const lk(mutex_);
+            std::scoped_lock const lk(mutex_);
             signaled_ = true;
             cv_.notify_all();
         }
diff --git a/src/test/jtx/Account.h b/src/test/jtx/Account.h
index c702bcffec..a30b974522 100644
--- a/src/test/jtx/Account.h
+++ b/src/test/jtx/Account.h
@@ -52,7 +52,7 @@ public:
      * secret key is unavailable, such as for pseudo-accounts. */
     explicit Account(std::string name, AccountID const& id);
 
-    enum AcctStringType { base58Seed, other };
+    enum class AcctStringType { base58Seed, other };
     /** Create an account from a base58 seed string.  Throws on invalid seed. */
     Account(AcctStringType stringType, std::string base58SeedStr);
 
diff --git a/src/test/jtx/CaptureLogs.h b/src/test/jtx/CaptureLogs.h
index 0e9598decd..491a341540 100644
--- a/src/test/jtx/CaptureLogs.h
+++ b/src/test/jtx/CaptureLogs.h
@@ -36,14 +36,14 @@ class CaptureLogs : public Logs
         void
         write(beast::severities::Severity level, std::string const& text) override
         {
-            std::lock_guard const lock(strmMutex_);
+            std::scoped_lock const lock(strmMutex_);
             strm_ << text;
         }
 
         void
         writeAlways(beast::severities::Severity level, std::string const& text) override
         {
-            std::lock_guard const lock(strmMutex_);
+            std::scoped_lock const lock(strmMutex_);
             strm_ << text;
         }
     };
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index e3119f4c71..ae52c50b89 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -464,7 +464,7 @@ public:
     void
     signal()
     {
-        std::lock_guard const lk(mutex_);
+        std::scoped_lock const lk(mutex_);
         signaled_ = true;
         cv_.notify_all();
     }
diff --git a/src/test/jtx/directory.h b/src/test/jtx/directory.h
index 0940c23623..08d8fef73e 100644
--- a/src/test/jtx/directory.h
+++ b/src/test/jtx/directory.h
@@ -12,7 +12,7 @@
 /** Directory operations. */
 namespace xrpl::test::jtx::directory {
 
-enum Error {
+enum class Error {
     DirectoryRootNotFound,
     DirectoryTooSmall,
     DirectoryPageDuplicate,
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index 24d831be7d..dbd8b690f7 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -137,7 +137,7 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
     for (auto const& features : arg.features)
     {
         // Use small Number mantissas for the life of this test.
-        NumberMantissaScaleGuard const sg{xrpl::MantissaRange::small};
+        NumberMantissaScaleGuard const sg{xrpl::MantissaRange::mantissa_scale::small};
 
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index 4e09940487..e93e6c6068 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -50,7 +50,7 @@ Account::fromCache(AcctStringType stringType, std::string name, KeyType type)
 
     auto const keys = [stringType, &name, type]() {
         // Special handling for base58Seeds.
-        if (stringType == base58Seed)
+        if (stringType == AcctStringType::base58Seed)
         {
             std::optional<Seed> const seed = parseBase58<Seed>(name);
             if (!seed.has_value())
@@ -68,12 +68,15 @@ Account::fromCache(AcctStringType stringType, std::string name, KeyType type)
 }
 
 Account::Account(std::string name, KeyType type)
-    : Account(fromCache(Account::other, std::move(name), type))
+    : Account(fromCache(Account::AcctStringType::other, std::move(name), type))
 {
 }
 
 Account::Account(AcctStringType stringType, std::string base58SeedStr)
-    : Account(fromCache(Account::base58Seed, std::move(base58SeedStr), KeyType::secp256k1))
+    : Account(fromCache(
+          Account::AcctStringType::base58Seed,
+          std::move(base58SeedStr),
+          KeyType::secp256k1))
 {
 }
 
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index a7db5e4302..72f9e25b7c 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -304,7 +304,7 @@ private:
         rb_.consume(rb_.size());
         auto m = std::make_shared<msg>(std::move(jv));
         {
-            std::lock_guard const lock(m_);
+            std::scoped_lock const lock(m_);
             msgs_.push_front(m);
             cv_.notify_all();
         }
@@ -318,7 +318,7 @@ private:
     void
     on_read_done()
     {
-        std::lock_guard const lock(m0_);
+        std::scoped_lock const lock(m0_);
         b0_ = true;
         cv0_.notify_all();
     }
diff --git a/src/test/jtx/impl/directory.cpp b/src/test/jtx/impl/directory.cpp
index ac4d81bdfb..0d545bd6f4 100644
--- a/src/test/jtx/impl/directory.cpp
+++ b/src/test/jtx/impl/directory.cpp
@@ -36,7 +36,7 @@ bumpLastPage(
         auto sleRoot = sb.peek(directory);
         if (!sleRoot)
         {
-            res = Unexpected<Error>(DirectoryRootNotFound);
+            res = Unexpected<Error>(Error::DirectoryRootNotFound);
             return false;
         }
 
@@ -44,26 +44,26 @@ bumpLastPage(
         auto const lastIndex = sleRoot->getFieldU64(sfIndexPrevious);
         if (lastIndex == 0)
         {
-            res = Unexpected<Error>(DirectoryTooSmall);
+            res = Unexpected<Error>(Error::DirectoryTooSmall);
             return false;
         }
 
         if (sb.exists(keylet::page(directory, newLastPage)))
         {
-            res = Unexpected<Error>(DirectoryPageDuplicate);
+            res = Unexpected<Error>(Error::DirectoryPageDuplicate);
             return false;
         }
 
         if (lastIndex >= newLastPage)
         {
-            res = Unexpected<Error>(InvalidLastPage);
+            res = Unexpected<Error>(Error::InvalidLastPage);
             return false;
         }
 
         auto slePage = sb.peek(keylet::page(directory, lastIndex));
         if (!slePage)
         {
-            res = Unexpected<Error>(DirectoryPageNotFound);
+            res = Unexpected<Error>(Error::DirectoryPageNotFound);
             return false;
         }
 
@@ -94,7 +94,7 @@ bumpLastPage(
             auto slePrev = sb.peek(keylet::page(directory, *prevIndex));
             if (!slePrev)
             {
-                res = Unexpected<Error>(DirectoryPageNotFound);
+                res = Unexpected<Error>(Error::DirectoryPageNotFound);
                 return false;
             }
             slePrev->setFieldU64(sfIndexNext, newLastPage);
@@ -109,7 +109,7 @@ bumpLastPage(
             {
                 if (!adjust(sb, key, newLastPage))
                 {
-                    res = Unexpected<Error>(AdjustmentError);
+                    res = Unexpected<Error>(Error::AdjustmentError);
                     return false;
                 }
             }
diff --git a/src/test/jtx/impl/ledgerStateFixes.cpp b/src/test/jtx/impl/ledgerStateFixes.cpp
index 99cd03cbb6..bc19915957 100644
--- a/src/test/jtx/impl/ledgerStateFixes.cpp
+++ b/src/test/jtx/impl/ledgerStateFixes.cpp
@@ -6,6 +6,8 @@
 #include <xrpl/protocol/jss.h>
 #include <xrpl/tx/transactors/system/LedgerStateFix.h>
 
+#include <cstdint>
+
 namespace xrpl::test::jtx::ledgerStateFix {
 
 // Fix NFTokenPage links on owner's account.  acct pays fee.
@@ -14,7 +16,8 @@ nftPageLinks(jtx::Account const& acct, jtx::Account const& owner)
 {
     Json::Value jv;
     jv[sfAccount.jsonName] = acct.human();
-    jv[sfLedgerFixType.jsonName] = LedgerStateFix::nfTokenPageLink;
+    jv[sfLedgerFixType.jsonName] =
+        static_cast<std::uint16_t>(LedgerStateFix::FixType::nfTokenPageLink);
     jv[sfOwner.jsonName] = owner.human();
     jv[sfTransactionType.jsonName] = jss::LedgerStateFix;
     return jv;
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index 0dc2cb6e74..a756eb312f 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -126,21 +126,23 @@ class PaymentSandbox_test : public beast::unit_test::suite
             ApplyViewImpl av(&*env.current(), tapNONE);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
             {
                 auto r = accountSend(av, gw1, alice, toCredit, j);
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount + toCredit);
             {
                 auto r = accountSend(av, alice, gw1, toDebit, j);
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount + toCredit - toDebit);
         }
 
@@ -149,17 +151,19 @@ class PaymentSandbox_test : public beast::unit_test::suite
             ApplyViewImpl av(&*env.current(), tapNONE);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             directSendNoFee(av, gw1, alice, toCredit, true, j);
             BEAST_EXPECT(
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount + toCredit);
 
             directSendNoFee(av, alice, gw1, toDebit, true, j);
             BEAST_EXPECT(
-                accountHolds(av, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount + toCredit - toDebit);
         }
 
@@ -169,15 +173,16 @@ class PaymentSandbox_test : public beast::unit_test::suite
             PaymentSandbox pv(&av);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             {
                 auto r = accountSend(pv, gw1, alice, toCredit, j);
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount);
 
             {
@@ -185,7 +190,8 @@ class PaymentSandbox_test : public beast::unit_test::suite
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount - toDebit);
         }
 
@@ -195,12 +201,13 @@ class PaymentSandbox_test : public beast::unit_test::suite
             PaymentSandbox pv(&av);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             directSendNoFee(pv, gw1, alice, toCredit, true, j);
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount);
         }
 
@@ -210,12 +217,13 @@ class PaymentSandbox_test : public beast::unit_test::suite
             PaymentSandbox pv(&av);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             BEAST_EXPECT(redeemIOU(pv, alice, toDebit, iss, j) == tesSUCCESS);
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount - toDebit);
         }
 
@@ -225,12 +233,13 @@ class PaymentSandbox_test : public beast::unit_test::suite
             PaymentSandbox pv(&av);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             BEAST_EXPECT(issueIOU(pv, alice, toCredit, iss, j) == tesSUCCESS);
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount);
         }
 
@@ -240,29 +249,40 @@ class PaymentSandbox_test : public beast::unit_test::suite
             PaymentSandbox pv(&av);
 
             auto const iss = USD_gw1;
-            auto const startingAmount =
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j);
+            auto const startingAmount = accountHolds(
+                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
 
             {
                 auto r = accountSend(pv, gw1, alice, toCredit, j);
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount);
 
             {
                 PaymentSandbox pv2(&pv);
                 BEAST_EXPECT(
-                    accountHolds(pv2, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
-                    startingAmount);
+                    accountHolds(
+                        pv2,
+                        alice,
+                        iss.currency,
+                        iss.account,
+                        FreezeHandling::fhIGNORE_FREEZE,
+                        j) == startingAmount);
                 {
                     auto r = accountSend(pv2, gw1, alice, toCredit, j);
                     BEAST_EXPECT(isTesSuccess(r));
                 }
                 BEAST_EXPECT(
-                    accountHolds(pv2, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
-                    startingAmount);
+                    accountHolds(
+                        pv2,
+                        alice,
+                        iss.currency,
+                        iss.account,
+                        FreezeHandling::fhIGNORE_FREEZE,
+                        j) == startingAmount);
             }
 
             {
@@ -270,7 +290,8 @@ class PaymentSandbox_test : public beast::unit_test::suite
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
-                accountHolds(pv, alice, iss.currency, iss.account, fhIGNORE_FREEZE, j) ==
+                accountHolds(
+                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
                 startingAmount - toDebit);
         }
     }
@@ -312,8 +333,8 @@ class PaymentSandbox_test : public beast::unit_test::suite
 
         auto accountFundsXRP =
             [](ReadView const& view, AccountID const& id, beast::Journal j) -> XRPAmount {
-            return toAmount<XRPAmount>(
-                accountHolds(view, id, xrpCurrency(), xrpAccount(), fhZERO_IF_FROZEN, j));
+            return toAmount<XRPAmount>(accountHolds(
+                view, id, xrpCurrency(), xrpAccount(), FreezeHandling::fhZERO_IF_FROZEN, j));
         };
 
         auto reserve = [](jtx::Env& env, std::uint32_t count) -> XRPAmount {
diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp
index cf2e478889..e0d757c0d3 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -787,7 +787,12 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(
                 USD(0) ==
                 accountHolds(
-                    *env.closed(), alice, USD.currency, gw, fhZERO_IF_FROZEN, env.journal));
+                    *env.closed(),
+                    alice,
+                    USD.currency,
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
 
             // Thaw gw and try again.
             env(fclear(gw, asfGlobalFreeze));
@@ -806,14 +811,26 @@ class View_test : public beast::unit_test::suite
             // Bob's balance should be zero if frozen.
             BEAST_EXPECT(
                 USD(0) ==
-                accountHolds(*env.closed(), bob, USD.currency, gw, fhZERO_IF_FROZEN, env.journal));
+                accountHolds(
+                    *env.closed(),
+                    bob,
+                    USD.currency,
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
 
             // gw thaws bob's trust line.  bob gets his money back.
             env(trust(gw, USD(100), bob, tfClearFreeze));
             env.close();
             BEAST_EXPECT(
                 USD(50) ==
-                accountHolds(*env.closed(), bob, USD.currency, gw, fhZERO_IF_FROZEN, env.journal));
+                accountHolds(
+                    *env.closed(),
+                    bob,
+                    USD.currency,
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
         }
         {
             // accountHolds().
@@ -824,17 +841,32 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(
                 EUR(0) ==
                 accountHolds(
-                    *env.closed(), carol, EUR.currency, gw, fhZERO_IF_FROZEN, env.journal));
+                    *env.closed(),
+                    carol,
+                    EUR.currency,
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
 
             // But carol does have USD.
             BEAST_EXPECT(
                 USD(50) ==
                 accountHolds(
-                    *env.closed(), carol, USD.currency, gw, fhZERO_IF_FROZEN, env.journal));
+                    *env.closed(),
+                    carol,
+                    USD.currency,
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
 
             // carol's XRP balance should be her holdings minus her reserve.
             auto const carolsXRP = accountHolds(
-                *env.closed(), carol, xrpCurrency(), xrpAccount(), fhZERO_IF_FROZEN, env.journal);
+                *env.closed(),
+                carol,
+                xrpCurrency(),
+                xrpAccount(),
+                FreezeHandling::fhZERO_IF_FROZEN,
+                env.journal);
             // carol's XRP balance:              10000
             // base reserve:                      -200
             // 1 trust line times its reserve: 1 * -50
@@ -851,28 +883,35 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(
                 XRP(0) ==
                 accountHolds(
-                    *env.closed(), carol, xrpCurrency(), gw, fhZERO_IF_FROZEN, env.journal));
+                    *env.closed(),
+                    carol,
+                    xrpCurrency(),
+                    gw,
+                    FreezeHandling::fhZERO_IF_FROZEN,
+                    env.journal));
         }
         {
             // accountFunds().
             // Gateways have whatever funds they claim to have.
-            auto const gwUSD =
-                accountFunds(*env.closed(), gw, USD(314159), fhZERO_IF_FROZEN, env.journal);
+            auto const gwUSD = accountFunds(
+                *env.closed(), gw, USD(314159), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
             BEAST_EXPECT(gwUSD == USD(314159));
 
             // carol has funds from the gateway.
-            auto carolsUSD =
-                accountFunds(*env.closed(), carol, USD(0), fhZERO_IF_FROZEN, env.journal);
+            auto carolsUSD = accountFunds(
+                *env.closed(), carol, USD(0), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
             BEAST_EXPECT(carolsUSD == USD(50));
 
             // If carol's funds are frozen she has no funds...
             env(fset(gw, asfGlobalFreeze));
             env.close();
-            carolsUSD = accountFunds(*env.closed(), carol, USD(0), fhZERO_IF_FROZEN, env.journal);
+            carolsUSD = accountFunds(
+                *env.closed(), carol, USD(0), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
             BEAST_EXPECT(carolsUSD == USD(0));
 
             // ... unless the query ignores the FROZEN state.
-            carolsUSD = accountFunds(*env.closed(), carol, USD(0), fhIGNORE_FREEZE, env.journal);
+            carolsUSD = accountFunds(
+                *env.closed(), carol, USD(0), FreezeHandling::fhIGNORE_FREEZE, env.journal);
             BEAST_EXPECT(carolsUSD == USD(50));
 
             // Just to be tidy, thaw gw.
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index e527942629..8ea32517d5 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -67,16 +67,16 @@ public:
                 switch (rand_int(rng, 3))
                 {
                     case 0:
-                        return hotLEDGER;
+                        return NodeObjectType::hotLEDGER;
                     case 1:
-                        return hotACCOUNT_NODE;
+                        return NodeObjectType::hotACCOUNT_NODE;
                     case 2:
-                        return hotTRANSACTION_NODE;
+                        return NodeObjectType::hotTRANSACTION_NODE;
                     case 3:
-                        return hotUNKNOWN;
+                        return NodeObjectType::hotUNKNOWN;
                     default:
                         // will never happen, but make static analysis tool happy.
-                        return hotUNKNOWN;
+                        return NodeObjectType::hotUNKNOWN;
                 }
             }();
 
@@ -140,9 +140,9 @@ public:
 
             Status const status = backend.fetch(batch[i]->getHash(), &object);
 
-            BEAST_EXPECT(status == ok);
+            BEAST_EXPECT(status == Status::ok);
 
-            if (status == ok)
+            if (status == Status::ok)
             {
                 BEAST_EXPECT(object != nullptr);
 
@@ -160,7 +160,7 @@ public:
 
             Status const status = backend.fetch(batch[i]->getHash(), &object);
 
-            BEAST_EXPECT(status == notFound);
+            BEAST_EXPECT(status == Status::notFound);
         }
     }
 
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index cc9881dbac..1145bc80f4 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -77,6 +77,8 @@ rngcpy(void* buffer, std::size_t bytes, Generator& g)
 class Sequence
 {
 private:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { minLedger = 1, maxLedger = 1000000, minSize = 250, maxSize = 1250 };
 
     beast::xor_shift_engine gen_;
@@ -135,6 +137,8 @@ public:
 class Timing_test : public beast::unit_test::suite
 {
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // percent of fetches for missing nodes
         missingNodePercent = 20
@@ -678,7 +682,7 @@ public:
     void
     run() override
     {
-        testcase("Timing", beast::unit_test::abort_on_fail);
+        testcase("Timing", beast::unit_test::abort_t::abort_on_fail);
 
         /*  Parameters:
 
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index 1341b98894..359f27ef7d 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -288,7 +288,7 @@ public:
     void
     run() override
     {
-        testcase(beast::unit_test::abort_on_fail) << arg();
+        testcase(beast::unit_test::abort_t::abort_on_fail) << arg();
 
         using namespace nudb;
         using namespace nudb::detail;
diff --git a/src/test/overlay/TMGetObjectByHash_test.cpp b/src/test/overlay/TMGetObjectByHash_test.cpp
index c1db5262d0..e42d4ffe75 100644
--- a/src/test/overlay/TMGetObjectByHash_test.cpp
+++ b/src/test/overlay/TMGetObjectByHash_test.cpp
@@ -158,7 +158,8 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
             hashes.push_back(hash);
 
             Blob data(100, static_cast<unsigned char>(i % 256));
-            nodeStore.store(hotLEDGER, std::move(data), hash, nodeStore.earliestLedgerSeq());
+            nodeStore.store(
+                NodeObjectType::hotLEDGER, std::move(data), hash, nodeStore.earliestLedgerSeq());
         }
 
         // Create a request with more objects than hardMaxReplyNodes
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index 21f3482ab5..1a650655f2 100644
--- a/src/test/overlay/reduce_relay_test.cpp
+++ b/src/test/overlay/reduce_relay_test.cpp
@@ -913,8 +913,8 @@ protected:
         return sp->id();
     }
 
-    enum State { On, Off, WaitReset };
-    enum EventType { LinkDown = 0, PeerDisconnected = 1 };
+    enum class State { On, Off, WaitReset };
+    enum class EventType { LinkDown = 0, PeerDisconnected = 1 };
     // Link down or Peer disconnect event
     // TBD - add new peer event
     // TBD - add overlapping type of events at any
@@ -938,7 +938,8 @@ protected:
     void
     random(bool log)
     {
-        std::unordered_map<EventType, Event> events{{LinkDown, {}}, {PeerDisconnected, {}}};
+        std::unordered_map<EventType, Event> events{
+            {EventType::LinkDown, {}}, {EventType::PeerDisconnected, {}}};
         time_point<ManualClock> lastCheck = ManualClock::now();
 
         network_.reset();
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 02c9312732..42959000a1 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -118,14 +118,14 @@ private:
         void
         add(std::shared_ptr<Child> const& child)
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             list_.emplace(child.get(), child);
         }
 
         void
         remove(Child* child)
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             list_.erase(child);
             if (list_.empty())
                 cond_.notify_one();
@@ -136,7 +136,7 @@ private:
         {
             std::vector<std::shared_ptr<Child>> v;
             {
-                std::lock_guard const lock(mutex_);
+                std::scoped_lock const lock(mutex_);
                 v.reserve(list_.size());
                 if (closed_)
                     return;
diff --git a/src/test/protocol/MultiApiJson_test.cpp b/src/test/protocol/MultiApiJson_test.cpp
index f0cbf805f3..f9f1ff1373 100644
--- a/src/test/protocol/MultiApiJson_test.cpp
+++ b/src/test/protocol/MultiApiJson_test.cpp
@@ -308,15 +308,15 @@ struct MultiApiJson_test : beast::unit_test::suite
             testcase("isMember");
 
             // Well defined behaviour even if we have different types of members
-            BEAST_EXPECT(subject.isMember("foo") == decltype(subject)::none);
+            BEAST_EXPECT(subject.isMember("foo") == decltype(subject)::IsMemberResult::none);
 
             {
                 // All variants have element "One", none have element "Two"
                 MultiApiJson<1, 2> s1{};
                 s1.val[0] = makeJson("One", 12);
                 s1.val[1] = makeJson("One", 42);
-                BEAST_EXPECT(s1.isMember("One") == decltype(s1)::all);
-                BEAST_EXPECT(s1.isMember("Two") == decltype(s1)::none);
+                BEAST_EXPECT(s1.isMember("One") == decltype(s1)::IsMemberResult::all);
+                BEAST_EXPECT(s1.isMember("Two") == decltype(s1)::IsMemberResult::none);
             }
 
             {
@@ -324,8 +324,8 @@ struct MultiApiJson_test : beast::unit_test::suite
                 MultiApiJson<1, 2> s2{};
                 s2.val[0] = makeJson("One", 12);
                 s2.val[1] = makeJson("Two", 42);
-                BEAST_EXPECT(s2.isMember("One") == decltype(s2)::some);
-                BEAST_EXPECT(s2.isMember("Two") == decltype(s2)::some);
+                BEAST_EXPECT(s2.isMember("One") == decltype(s2)::IsMemberResult::some);
+                BEAST_EXPECT(s2.isMember("Two") == decltype(s2)::IsMemberResult::some);
             }
 
             {
@@ -333,8 +333,8 @@ struct MultiApiJson_test : beast::unit_test::suite
                 MultiApiJson<1, 3> s3{};
                 s3.val[0] = makeJson("One", 12);
                 s3.val[1] = makeJson("One", 42);
-                BEAST_EXPECT(s3.isMember("One") == decltype(s3)::some);
-                BEAST_EXPECT(s3.isMember("Two") == decltype(s3)::none);
+                BEAST_EXPECT(s3.isMember("One") == decltype(s3)::IsMemberResult::some);
+                BEAST_EXPECT(s3.isMember("Two") == decltype(s3)::IsMemberResult::none);
             }
         }
 
diff --git a/src/test/protocol/STNumber_test.cpp b/src/test/protocol/STNumber_test.cpp
index 156f5b42aa..e2c1a91e64 100644
--- a/src/test/protocol/STNumber_test.cpp
+++ b/src/test/protocol/STNumber_test.cpp
@@ -101,12 +101,12 @@ struct STNumber_test : public beast::unit_test::suite
             BEAST_EXPECT(numberFromJson(sfNumber, "-0.000e6") == STNumber(sfNumber, 0));
 
             {
-                NumberRoundModeGuard const mg(Number::towards_zero);
+                NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
                 // maxint64 9,223,372,036,854,775,807
                 auto const maxInt = std::to_string(std::numeric_limits<std::int64_t>::max());
                 // minint64 -9,223,372,036,854,775,808
                 auto const minInt = std::to_string(std::numeric_limits<std::int64_t>::min());
-                if (Number::getMantissaScale() == MantissaRange::small)
+                if (Number::getMantissaScale() == MantissaRange::mantissa_scale::small)
                 {
                     BEAST_EXPECT(
                         numberFromJson(sfNumber, maxInt) ==
@@ -280,7 +280,8 @@ struct STNumber_test : public beast::unit_test::suite
     {
         static_assert(!std::is_convertible_v<STNumber*, Number*>);
 
-        for (auto const scale : {MantissaRange::small, MantissaRange::large})
+        for (auto const scale :
+             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
         {
             NumberMantissaScaleGuard const sg(scale);
             testcase << to_string(Number::getMantissaScale());
diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp
index d0764d7399..71b483425b 100644
--- a/src/test/protocol/SeqProxy_test.cpp
+++ b/src/test/protocol/SeqProxy_test.cpp
@@ -14,7 +14,7 @@ struct SeqProxy_test : public beast::unit_test::suite
     static constexpr bool
     expectValues(SeqProxy seqProx, std::uint32_t value, SeqProxy::Type type)
     {
-        bool const expectSeq{type == SeqProxy::seq};
+        bool const expectSeq{type == SeqProxy::Type::seq};
         return (seqProx.value() == value) && (seqProx.isSeq() == expectSeq) &&
             (seqProx.isTicket() == !expectSeq);
     }
@@ -65,8 +65,8 @@ struct SeqProxy_test : public beast::unit_test::suite
         // 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 uintMax{std::numeric_limits<std::uint32_t>::max()};
-        static constexpr SeqProxy::Type seq{SeqProxy::seq};
-        static constexpr SeqProxy::Type ticket{SeqProxy::ticket};
+        static constexpr SeqProxy::Type seq{SeqProxy::Type::seq};
+        static constexpr SeqProxy::Type ticket{SeqProxy::Type::ticket};
 
         static constexpr SeqProxy seqZero{seq, 0};
         static constexpr SeqProxy seqSmall{seq, 1};
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index f6da313b22..53fb81e436 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -114,7 +114,7 @@ public:
                     return;
                 }
 
-                if (c.charge(fee) == warn)
+                if (c.charge(fee) == Disposition::warn)
                 {
                     if (limited)
                     {
@@ -145,7 +145,7 @@ public:
                     return;
                 }
 
-                if (c.charge(fee) == drop)
+                if (c.charge(fee) == Disposition::drop)
                 {
                     // Disconnect abusive Consumer
                     BEAST_EXPECT(c.disconnect(j) == limited);
@@ -159,7 +159,7 @@ public:
         {
             Consumer const c(logic.newInboundEndpoint(addr));
             logic.periodicActivity();
-            if (c.disposition() != drop)
+            if (c.disposition() != Disposition::drop)
             {
                 if (limited)
                 {
@@ -185,7 +185,7 @@ public:
                 ++logic.clock();
                 logic.periodicActivity();
                 Consumer const c(logic.newInboundEndpoint(addr));
-                if (c.disposition() != drop)
+                if (c.disposition() != Disposition::drop)
                 {
                     readmitted = true;
                     break;
diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp
index 876c9b66f1..726d23db1d 100644
--- a/src/test/rpc/AMMInfo_test.cpp
+++ b/src/test/rpc/AMMInfo_test.cpp
@@ -37,13 +37,13 @@ public:
         using namespace jtx;
 
         Account const bogie("bogie");
-        enum TestAccount { None, Alice, Bogie };
+        enum class TestAccount { None, Alice, Bogie };
         auto accountId = [&](AMM const& ammAlice, TestAccount v) -> std::optional<AccountID> {
-            if (v == Alice)
+            if (v == TestAccount::Alice)
             {
                 return ammAlice.ammAccount();
             }
-            if (v == Bogie)
+            if (v == TestAccount::Bogie)
             {
                 return bogie;
             }
@@ -67,12 +67,12 @@ public:
 
         std::vector<std::tuple<std::optional<Issue>, std::optional<Issue>, TestAccount, bool>> const
             invalidParams = {
-                {xrpIssue(), std::nullopt, None, false},
-                {std::nullopt, USD, None, false},
-                {xrpIssue(), std::nullopt, Alice, false},
-                {std::nullopt, USD, Alice, false},
-                {xrpIssue(), USD, Alice, false},
-                {std::nullopt, std::nullopt, None, true}};
+                {xrpIssue(), std::nullopt, TestAccount::None, false},
+                {std::nullopt, USD, TestAccount::None, false},
+                {xrpIssue(), std::nullopt, TestAccount::Alice, false},
+                {std::nullopt, USD, TestAccount::Alice, false},
+                {xrpIssue(), USD, TestAccount::Alice, false},
+                {std::nullopt, std::nullopt, TestAccount::None, true}};
 
         // Invalid parameters
         testAMM([&](AMM& ammAlice, Env&) {
@@ -129,12 +129,12 @@ public:
 
         std::vector<std::tuple<std::optional<Issue>, std::optional<Issue>, TestAccount, bool>> const
             invalidParamsBadAccount = {
-                {xrpIssue(), std::nullopt, None, false},
-                {std::nullopt, USD, None, false},
-                {xrpIssue(), std::nullopt, Bogie, false},
-                {std::nullopt, USD, Bogie, false},
-                {xrpIssue(), USD, Bogie, false},
-                {std::nullopt, std::nullopt, None, true}};
+                {xrpIssue(), std::nullopt, TestAccount::None, false},
+                {std::nullopt, USD, TestAccount::None, false},
+                {xrpIssue(), std::nullopt, TestAccount::Bogie, false},
+                {std::nullopt, USD, TestAccount::Bogie, false},
+                {xrpIssue(), USD, TestAccount::Bogie, false},
+                {std::nullopt, std::nullopt, TestAccount::None, true}};
 
         // Invalid parameters *and* invalid AMM account, default API version
         testAMM([&](AMM& ammAlice, Env&) {
@@ -165,8 +165,8 @@ public:
                     3);
                 BEAST_EXPECT(
                     jv[jss::error_message] ==
-                    (acct == Bogie ? std::string("Account malformed.")
-                                   : std::string("Invalid parameters.")));
+                    (acct == TestAccount::Bogie ? std::string("Account malformed.")
+                                                : std::string("Invalid parameters.")));
             }
         });
     }
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index f4473c0aa3..ea8c498619 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -177,7 +177,8 @@ public:
             auto const all = testable_amendments();
             for (auto const& feats : {all - featureSingleAssetVault - featureLendingProtocol, all})
             {
-                for (auto const mantissaSize : {MantissaRange::small, MantissaRange::large})
+                for (auto const mantissaSize :
+                     {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
                 {
                     // Regardless of the features enabled, RPC is controlled by
                     // the global mantissa size. And since it's a thread-local,
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index 3ece97344c..409ba660d8 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -31,7 +31,7 @@ struct RPCCallTestData
     std::vector<char const*> const args;
 
     // If it throws, what does it throw?
-    enum Exception { no_exception = 0, bad_cast };
+    enum class Exception { no_exception = 0, bad_cast };
     Exception const throwsWhat;
 
     // Expected JSON response.
@@ -72,7 +72,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_channels: minimal.",
      __LINE__,
      {"account_channels", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -87,7 +87,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rD5MbavGfiSC5m7mkxy1FANuT7s3HxqpoF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -103,7 +103,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "r9emE59aTWb85t64dAebKrxYMBTpzK5yR7"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -119,7 +119,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -136,7 +136,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -154,7 +154,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "90210"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -171,7 +171,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_channels",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -189,7 +189,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -206,7 +206,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "account_channels",
          "",  // Note: very few values are detected as bad!
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -223,7 +223,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 1.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -236,7 +236,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 2.",
      __LINE__,
      {"account_currencies", "racb4o3DrdYxuCfyVa6vsLb7vgju9RFbBr"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -249,7 +249,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: ledger index.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "42"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -263,7 +263,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: validated ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -277,7 +277,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: current ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -293,7 +293,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_currencies",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -307,7 +307,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: too many arguments.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "spare1", "spare2"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -321,7 +321,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: invalid second argument.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "yup"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -339,7 +339,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_currencies",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_currencies",
     "params" : [
@@ -357,7 +357,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: minimal.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -370,7 +370,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with numeric ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -384,7 +384,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with text ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -400,7 +400,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -414,7 +414,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -430,7 +430,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_info",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -444,7 +444,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: too many arguments.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "extra1", "extra2"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_info",
     "params" : [
@@ -462,7 +462,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_info",
     "params" : [
@@ -480,7 +480,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_lines: minimal.",
      __LINE__,
      {"account_lines", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -493,7 +493,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_lines: peer.",
      __LINE__,
      {"account_lines", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -510,7 +510,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "888888888"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -528,7 +528,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "closed"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -546,7 +546,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "FFFFEEEEDDDDCCCCBBBBAAAA9999888877776666555544443333222211110000"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -563,7 +563,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_lines",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -582,7 +582,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "12345678",
       "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -603,7 +603,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "12345678",
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -624,7 +624,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -642,7 +642,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_lines",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -662,7 +662,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
             ""  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -680,7 +680,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
          "not_a_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -699,7 +699,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: minimal.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -712,7 +712,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with numeric ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -726,7 +726,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with text ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -742,7 +742,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_objects",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -756,7 +756,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -772,7 +772,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_objects",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -793,7 +793,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -814,7 +814,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -835,7 +835,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra3",
          "extra4",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -853,7 +853,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_objects",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -871,7 +871,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 1.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -889,7 +889,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 2.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -907,7 +907,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: minimal.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -920,7 +920,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with numeric ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -934,7 +934,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with text ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -950,7 +950,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_offers",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -964,7 +964,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -980,7 +980,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_offers",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -995,7 +995,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "account_offers: four arguments.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1015,7 +1015,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1033,7 +1033,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_offers",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1051,7 +1051,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 1.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1069,7 +1069,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 2.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1087,7 +1087,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: minimal.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1100,7 +1100,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index .",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "444"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1114,7 +1114,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index plus trailing params.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "707", "descending", "binary", "count"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1131,7 +1131,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1152,7 +1152,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "binary",
       "count",
       "descending"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1170,7 +1170,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max plus limit.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "247", "-1", "300"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1193,7 +1193,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "count",
       "descending",
       "binary"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1212,7 +1212,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max plus limit and offset.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "589", "590", "67", "45"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1236,7 +1236,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "45",
       "descending",
       "count"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1257,7 +1257,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_tx",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1280,7 +1280,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "descending",
       "count",
       "binary"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1295,7 +1295,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid accountID.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj9!VRWn96DkukG4bwdtyTh"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1312,7 +1312,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid ledger.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-478.7"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1328,7 +1328,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: max less than min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "580", "579"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         {
             R"({
     "method" : "account_tx",
@@ -1356,7 +1356,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "Binary", "-1"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {
@@ -1364,7 +1364,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer max.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "counts"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {
@@ -1372,7 +1372,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer offset.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1", "decending"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {
@@ -1380,7 +1380,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer limit.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1", "300", "false"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {// Note: this really shouldn't throw, but does at the moment.
@@ -1394,7 +1394,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "false",
       "false",
       "false"},
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
 
     // book_offers
@@ -1406,7 +1406,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD",
          "EUR",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1428,7 +1428,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1450,7 +1450,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "book_offers: add issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1473,7 +1473,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "666"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1498,7 +1498,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1523,7 +1523,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1552,7 +1552,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "200",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1583,7 +1583,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "200",
       "0",
       "MyMarker"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1609,7 +1609,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "book_offers",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1631,7 +1631,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0",
       "MyMarker",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1650,7 +1650,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1668,7 +1668,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1682,7 +1682,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"book_offers: invalid issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "not_a_valid_issuer"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1705,7 +1705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "not_a_ledger"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1734,7 +1734,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "not_a_number",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1753,7 +1753,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "can_delete",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1768,7 +1768,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967295",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1784,7 +1784,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1800,7 +1800,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "always",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1816,7 +1816,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "never",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1832,7 +1832,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "now",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1845,7 +1845,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: too many arguments.",
      __LINE__,
      {"can_delete", "always", "never"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1859,7 +1859,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: invalid argument.",
      __LINE__,
      {"can_delete", "invalid"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1876,7 +1876,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967296",
      },
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
     {// Note: this really shouldn't throw since it's a legitimate ledger hash.
      "can_delete: ledger hash with no alphas.",
@@ -1885,7 +1885,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "0123456701234567012345670123456701234567012345670123456701234567",
      },
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
 
     // channel_authorize
@@ -1896,7 +1896,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1915,7 +1915,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "secret_can_be_anything",
          "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1934,7 +1934,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "whatever",
       "whenever"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1952,7 +1952,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "whatever"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1969,7 +1969,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1986,7 +1986,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2003,7 +2003,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEZ",
       "2000"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2020,7 +2020,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2037,7 +2037,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2058,7 +2058,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "0",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2078,7 +2078,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2096,7 +2096,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"channel_verify",
       "aB4BXXLuPu8DpVuyq1DBiu3SrPdtK9AYZisKhu8mvkoiUD8J9Gov",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2115,7 +2115,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "DEADBEEF",
       "Whatever"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2133,7 +2133,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2151,7 +2151,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2169,7 +2169,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2187,7 +2187,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2205,7 +2205,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2223,7 +2223,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616",
       "DEADBEEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2241,7 +2241,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "40000000",
       "ThisIsNotHexadecimal"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2263,7 +2263,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "connect",
          "ThereIsNoCheckingOnTheIPFormat",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2276,7 +2276,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: ip and port.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2292,7 +2292,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "connect",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2306,7 +2306,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: too many arguments.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "connect",
     "params" : [
@@ -2325,7 +2325,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "-1",
      },
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
     {// Note: this should return an error but not throw.
      "connect: port too large.",
@@ -2335,7 +2335,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "4294967296",
      },
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
 
     // consensus_info
@@ -2345,7 +2345,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "consensus_info",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2357,7 +2357,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"consensus_info: too many arguments.",
      __LINE__,
      {"consensus_info", "whatever"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2378,7 +2378,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "source_account_NotValidated",
          "destination_account_NotValidated",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2395,7 +2395,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2421,7 +2421,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred6",
       "cred7",
       "cred8"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2440,7 +2440,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2458,7 +2458,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "deposit_authorized",
          "source_account_NotValidated",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2484,7 +2484,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred7",
       "cred8",
       "too_much"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2503,7 +2503,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "destination_account_NotValidated",
          "NotALedger",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2523,7 +2523,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "feature",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2535,7 +2535,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: with name.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2551,7 +2551,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA98"
       "76543210",
       "accept"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2565,7 +2565,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: reject.",
      __LINE__,
      {"feature", "0", "reject"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2579,7 +2579,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: too many arguments.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated", "accept", "anotherArg"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2597,7 +2597,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "featureNameOrHexIsNotValidated",
          "veto",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "feature",
     "params" : [
@@ -2616,7 +2616,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "fetch_info",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2628,7 +2628,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: clear.",
      __LINE__,
      {"fetch_info", "clear"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2641,7 +2641,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: too many arguments.",
      __LINE__,
      {"fetch_info", "clear", "other"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2655,7 +2655,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: other trailing argument.",
      __LINE__,
      {"fetch_info", "too"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2671,7 +2671,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: minimal.",
      __LINE__,
      {"gateway_balances", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2684,7 +2684,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with ledger index.",
      __LINE__,
      {"gateway_balances", "890765", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2698,7 +2698,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with text ledger index.",
      __LINE__,
      {"gateway_balances", "current", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2714,7 +2714,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"gateway_balances",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2728,7 +2728,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: 1 hotwallet.",
      __LINE__,
      {"gateway_balances", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "hotwallet_is_not_validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2749,7 +2749,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "hotwallet_is_not_validated_2",
          "hotwallet_is_not_validated_3",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2770,7 +2770,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "gateway_balances",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2784,7 +2784,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: empty first argument.",
      __LINE__,
      {"gateway_balances", ""},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2801,7 +2801,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "890765",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2818,7 +2818,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "current",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2835,7 +2835,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2854,7 +2854,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "get_counts",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2866,7 +2866,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: with maximum count.",
      __LINE__,
      {"get_counts", "100"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2879,7 +2879,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: too many arguments.",
      __LINE__,
      {"get_counts", "100", "whatever"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2896,12 +2896,12 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "get_counts",
          "-1",
      },
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
     {"get_counts: count too large.",
      __LINE__,
      {"get_counts", "4294967296"},
-     RPCCallTestData::bad_cast,
+     RPCCallTestData::Exception::bad_cast,
      R"()"},
 
     // json
@@ -2913,7 +2913,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "command",
     "params" : [
@@ -2931,7 +2931,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "command",
     "params" : [
@@ -2944,7 +2944,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too few arguments.",
      __LINE__,
      {"json", "command"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -2958,7 +2958,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too many arguments.",
      __LINE__,
      {"json", "command", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -2976,7 +2976,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"(["arg1","arg2"])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -2994,7 +2994,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json",
     "params" : [
@@ -3014,7 +3014,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3042,7 +3042,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]
         })",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3067,7 +3067,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"}])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3094,7 +3094,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]}
         ])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
    "params" : [
@@ -3116,7 +3116,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "json2",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3130,7 +3130,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json2: too many arguments.",
      __LINE__,
      {"json2", R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_this"})", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3147,7 +3147,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3170,7 +3170,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "method" : "json2",
@@ -3191,7 +3191,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.1","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.1",
@@ -3214,7 +3214,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3235,7 +3235,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.00","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3258,7 +3258,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","method":"call_1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "jsonrpc" : "2.0",
     "method" : "json2",
@@ -3279,7 +3279,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1"})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3302,7 +3302,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3319,7 +3319,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",[]}])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3342,7 +3342,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             }
         ])",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "json2",
     "params" : [
@@ -3365,7 +3365,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : true
         })",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
    "id" : "A1",
    "jsonrpc" : "2.0",
@@ -3388,7 +3388,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: minimal.",
      __LINE__,
      {"ledger"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3400,7 +3400,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index.",
      __LINE__,
      {"ledger", "4294967295"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3413,7 +3413,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: text ledger index.",
      __LINE__,
      {"ledger", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3426,7 +3426,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger hash.",
      __LINE__,
      {"ledger", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3439,7 +3439,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: full.",
      __LINE__,
      {"ledger", "current", "full"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3453,7 +3453,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: tx.",
      __LINE__,
      {"ledger", "closed", "tx"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3468,7 +3468,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: too many arguments.",
      __LINE__,
      {"ledger", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3481,7 +3481,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too small.",
      __LINE__,
      {"ledger", "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3494,7 +3494,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too big.",
      __LINE__,
      {"ledger", "4294967296"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3507,7 +3507,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: invalid ledger text.",
      __LINE__,
      {"ledger", "latest"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3520,7 +3520,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: unsupported final argument.",
      __LINE__,
      {"ledger", "current", "expand"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3536,7 +3536,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: minimal.",
      __LINE__,
      {"ledger_closed"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3548,7 +3548,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: too many arguments.",
      __LINE__,
      {"ledger_closed", "today"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3565,7 +3565,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: minimal.",
      __LINE__,
      {"ledger_current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3577,7 +3577,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: too many arguments.",
      __LINE__,
      {"ledger_current", "today"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3594,7 +3594,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index.",
      __LINE__,
      {"ledger_header", "4294967295"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3607,7 +3607,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger hash.",
      __LINE__,
      {"ledger_header", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3622,7 +3622,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_header",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3636,7 +3636,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: too many arguments.",
      __LINE__,
      {"ledger_header", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3650,7 +3650,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: text ledger index.",
      __LINE__,
      {"ledger_header", "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3663,7 +3663,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too small.",
      __LINE__,
      {"ledger_header", "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3676,7 +3676,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too big.",
      __LINE__,
      {"ledger_header", "4294967296"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3692,7 +3692,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index.",
      __LINE__,
      {"ledger_request", "4294967295"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3705,7 +3705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger hash.",
      __LINE__,
      {"ledger_request", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3720,7 +3720,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_request",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3734,7 +3734,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: too many arguments.",
      __LINE__,
      {"ledger_request", "4294967295", "spare"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3748,7 +3748,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: text ledger index.",
      __LINE__,
      {"ledger_request", "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3761,7 +3761,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too small.",
      __LINE__,
      {"ledger_request", "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3774,7 +3774,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too big.",
      __LINE__,
      {"ledger_request", "4294967296"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3792,7 +3792,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "log_level",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3804,7 +3804,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: fatal.",
      __LINE__,
      {"log_level", "fatal"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3817,7 +3817,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: error.",
      __LINE__,
      {"log_level", "error"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3830,7 +3830,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: warn.",
      __LINE__,
      {"log_level", "warn"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3843,7 +3843,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: debug.",
      __LINE__,
      {"log_level", "debug"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3856,7 +3856,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: trace.",
      __LINE__,
      {"log_level", "trace"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3869,7 +3869,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: base partition.",
      __LINE__,
      {"log_level", "base", "trace"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3883,7 +3883,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: partition_name.",
      __LINE__,
      {"log_level", "partition_name", "fatal"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3897,7 +3897,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: too many arguments.",
      __LINE__,
      {"log_level", "partition_name", "fatal", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3911,7 +3911,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: invalid severity.",
      __LINE__,
      {"log_level", "err"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3928,7 +3928,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "fatal",
          "partition_name",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3947,7 +3947,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "logrotate",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -3959,7 +3959,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"logrotate: too many arguments.",
      __LINE__,
      {"logrotate", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -3976,7 +3976,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: minimal.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -3989,7 +3989,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with numeric ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4003,7 +4003,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with text ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4019,7 +4019,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"owner_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4033,7 +4033,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4049,7 +4049,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "owner_info",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4069,7 +4069,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4087,7 +4087,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "owner_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4105,7 +4105,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4123,7 +4123,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::no_exception,
+        RPCCallTestData::Exception::no_exception,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4143,7 +4143,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "peers",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peers",
     "params" : [
@@ -4155,7 +4155,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peers: too many arguments.",
      __LINE__,
      {"peers", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peers",
     "params" : [
@@ -4172,7 +4172,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: minimal.",
      __LINE__,
      {"peer_reservations_add", "public_key_string"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4185,7 +4185,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: with description.",
      __LINE__,
      {"peer_reservations_add", "public_key_string", "public_key_description"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4199,7 +4199,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: too few arguments.",
      __LINE__,
      {"peer_reservations_add"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4213,7 +4213,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: too many arguments.",
      __LINE__,
      {"peer_reservations_add", "public_key_string", "public_key_description", "spare"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4230,7 +4230,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: minimal.",
      __LINE__,
      {"peer_reservations_del", "public_key_string"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4243,7 +4243,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: too few arguments.",
      __LINE__,
      {"peer_reservations_del"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4257,7 +4257,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: too many arguments.",
      __LINE__,
      {"peer_reservations_del", "public_key_string", "public_key_description", "spare"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4276,7 +4276,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ping",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ping",
     "params" : [
@@ -4288,7 +4288,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ping: too many arguments.",
      __LINE__,
      {"ping", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ping",
     "params" : [
@@ -4307,7 +4307,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "print",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4320,7 +4320,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "print: extra argument.",
      __LINE__,
      {"print", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4333,7 +4333,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"print: too many arguments.",
      __LINE__,
      {"print", "extra1", "extra2"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "print",
     "params" : [
@@ -4352,7 +4352,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "random",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "random",
     "params" : [
@@ -4364,7 +4364,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"random: too many arguments.",
      __LINE__,
      {"random", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "random",
     "params" : [
@@ -4384,7 +4384,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4397,7 +4397,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967295"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4411,7 +4411,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "closed"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4427,7 +4427,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"ripple_path_find",
       R"({"json_argument":true})",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4444,7 +4444,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ripple_path_find",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4458,7 +4458,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: too many arguments.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "current", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4475,7 +4475,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4489,7 +4489,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too small.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "-1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4503,7 +4503,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too big.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967296"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4517,7 +4517,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: invalid text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "cur"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4538,7 +4538,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4554,7 +4554,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4571,7 +4571,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: too few arguments.",
      __LINE__,
      {"sign", "contents_of_blob"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4585,7 +4585,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline flag with signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
         "method" : "sign",
         "params" : [
@@ -4609,7 +4609,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4627,7 +4627,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign",
     "params" : [
@@ -4641,7 +4641,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offlin"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
         "method" : "sign",
         "params" : [
@@ -4667,7 +4667,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4688,7 +4688,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "offline"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4710,7 +4710,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "my_secret",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4729,7 +4729,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       R"({"json_argument":true})",
       "offline",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4748,7 +4748,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4766,7 +4766,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "ofline"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4783,7 +4783,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: blob.",
      __LINE__,
      {"submit", "the blob is unvalidated and may be any length..."},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4800,7 +4800,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4818,7 +4818,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4833,7 +4833,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "submit: four arguments.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4850,7 +4850,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: offline flag with signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
         "method" : "submit",
         "params" : [
@@ -4874,7 +4874,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4892,7 +4892,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit",
     "params" : [
@@ -4906,7 +4906,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offlne"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
         "method" : "submit",
         "params" : [
@@ -4930,7 +4930,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4947,7 +4947,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit_multisigned",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4961,7 +4961,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit_multisigned: too many arguments.",
      __LINE__,
      {"submit_multisigned", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4978,7 +4978,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4998,7 +4998,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_info",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5010,7 +5010,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: counters.",
      __LINE__,
      {"server_info", "counters"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5023,7 +5023,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: too many arguments.",
      __LINE__,
      {"server_info", "counters", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5037,7 +5037,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: non-counters argument.",
      __LINE__,
      {"server_info", "counter"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5054,7 +5054,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_state",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5066,7 +5066,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: counters.",
      __LINE__,
      {"server_state", "counters"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5079,7 +5079,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: too many arguments.",
      __LINE__,
      {"server_state", "counters", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5093,7 +5093,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: non-counters argument.",
      __LINE__,
      {"server_state", "counter"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5110,7 +5110,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "stop",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "stop",
     "params" : [
@@ -5122,7 +5122,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"stop: too many arguments.",
      __LINE__,
      {"stop", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "stop",
     "params" : [
@@ -5141,7 +5141,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "4294967295"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5157,7 +5157,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "current"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5173,7 +5173,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5190,7 +5190,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "transaction_entry",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5207,7 +5207,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "validated",
       "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5225,7 +5225,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "validated",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5243,7 +5243,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUVW",
          "validated",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5261,7 +5261,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "0",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5279,7 +5279,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "4294967296",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5297,7 +5297,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA987654321",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5315,7 +5315,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210Z",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5332,7 +5332,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. minimal",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "1", "2"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5347,7 +5347,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. binary",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "binary", "1", "2"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5363,7 +5363,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: minimal.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5376,7 +5376,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: binary.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5392,7 +5392,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5406,7 +5406,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: too many arguments.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary", "1", "2", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5420,7 +5420,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: invalid final argument is apparently ignored.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "bin"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx",
     "params" : [
@@ -5436,7 +5436,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: minimal.",
      __LINE__,
      {"tx_history", "0"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5451,7 +5451,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx_history",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5465,7 +5465,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: too many arguments.",
      __LINE__,
      {"tx_history", "0", "1"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5481,7 +5481,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too small.",
         __LINE__,
         {"tx_history", "-1"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {
@@ -5489,7 +5489,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too big.",
         __LINE__,
         {"tx_history", "4294967296"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
     {
@@ -5497,7 +5497,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start not integer.",
         __LINE__,
         {"tx_history", "beginning"},
-        RPCCallTestData::bad_cast,
+        RPCCallTestData::Exception::bad_cast,
         R"()",
     },
 
@@ -5508,7 +5508,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unl_list",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5520,7 +5520,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unl_list: too many arguments.",
      __LINE__,
      {"unl_list", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5539,7 +5539,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "validation_create",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5551,7 +5551,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: with secret.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5564,7 +5564,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: too many arguments.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5583,7 +5583,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "version",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "version",
     "params" : [
@@ -5595,7 +5595,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"version: too many arguments.",
      __LINE__,
      {"version", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "version",
     "params" : [
@@ -5614,7 +5614,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "wallet_propose",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5626,7 +5626,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: with passphrase.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5639,7 +5639,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: too many arguments.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated", "extra"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5656,7 +5656,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"internal: minimal.",
      __LINE__,
      {"internal", "command_name"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5670,7 +5670,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"internal: with parameters.",
      __LINE__,
      {"internal", "command_name", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5686,7 +5686,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "internal",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "internal",
     "params" : [
@@ -5705,7 +5705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "path_find",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5719,7 +5719,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"path_find: with arguments.",
      __LINE__,
      {"path_find", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5738,7 +5738,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "subscribe",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5752,7 +5752,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"subscribe: with arguments.",
      __LINE__,
      {"subscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5771,7 +5771,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unsubscribe",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5785,7 +5785,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unsubscribe: with arguments.",
      __LINE__,
      {"unsubscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5804,7 +5804,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unknown_command",
      },
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -5816,7 +5816,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unknown_command: with arguments.",
      __LINE__,
      {"unknown_command", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::no_exception,
+     RPCCallTestData::Exception::no_exception,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -5884,7 +5884,7 @@ public:
             }
             catch (std::bad_cast const&)
             {
-                if ((rpcCallTest.throwsWhat == RPCCallTestData::bad_cast) &&
+                if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::bad_cast) &&
                     (std::strlen(expVersioned) == 0))
                 {
                     pass();
@@ -5913,7 +5913,8 @@ public:
             rmErrorCode(exp);
 
             // Pass if we didn't expect a throw and we got what we expected.
-            if ((rpcCallTest.throwsWhat == RPCCallTestData::no_exception) && (got == exp))
+            if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::no_exception) &&
+                (got == exp))
             {
                 pass();
             }
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index cd3bc99fa8..a68b0442d0 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -33,6 +33,8 @@ namespace xrpl::tests {
 class FetchPack_test : public beast::unit_test::suite
 {
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { tableItems = 100, tableItemsExtra = 20 };
 
     using Map = hash_map<SHAMapHash, Blob>;
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index 08910b5c5d..3f05bc2c57 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -91,8 +91,8 @@ public:
     void
     reset() override
     {
-        fbCache_->reset();
-        tnCache_->reset();
+        (*fbCache_).reset();
+        (*tnCache_).reset();
     }
 
     beast::manual_clock<std::chrono::steady_clock>
diff --git a/src/test/unit_test/SuiteJournal.h b/src/test/unit_test/SuiteJournal.h
index f4cbb5baa0..b0b3807dd3 100644
--- a/src/test/unit_test/SuiteJournal.h
+++ b/src/test/unit_test/SuiteJournal.h
@@ -69,7 +69,7 @@ SuiteJournalSink::writeAlways(beast::severities::Severity level, std::string con
     }();
 
     static std::mutex log_mutex;
-    std::lock_guard const lock(log_mutex);
+    std::scoped_lock const lock(log_mutex);
     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 a09110ca43..1dffece1da 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -167,7 +167,7 @@ template <bool IsParent>
 std::size_t
 multi_runner_base<IsParent>::inner::tests() const
 {
-    std::lock_guard const l{m_};
+    std::scoped_lock const l{m_};
     return results_.total;
 }
 
@@ -175,7 +175,7 @@ template <bool IsParent>
 std::size_t
 multi_runner_base<IsParent>::inner::suites() const
 {
-    std::lock_guard const l{m_};
+    std::scoped_lock const l{m_};
     return results_.suites;
 }
 
@@ -197,7 +197,7 @@ template <bool IsParent>
 void
 multi_runner_base<IsParent>::inner::add(results const& r)
 {
-    std::lock_guard const l{m_};
+    std::scoped_lock const l{m_};
     results_.merge(r);
 }
 
@@ -206,7 +206,7 @@ template <class S>
 void
 multi_runner_base<IsParent>::inner::print_results(S& s)
 {
-    std::lock_guard const l{m_};
+    std::scoped_lock const l{m_};
     results_.print(s);
 }
 
@@ -339,7 +339,7 @@ void
 multi_runner_base<IsParent>::message_queue_send(MessageType mt, std::string const& s)
 {
     // must use a mutex since the two "sends" must happen in order
-    std::lock_guard const l{inner_->m_};
+    std::scoped_lock const l{inner_->m_};
     message_queue_->send(&mt, sizeof(mt), /*priority*/ 0);
     message_queue_->send(s.c_str(), s.size(), /*priority*/ 0);
 }
diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h
index 0f675955de..4ccedf9498 100644
--- a/src/test/unit_test/multi_runner.h
+++ b/src/test/unit_test/multi_runner.h
@@ -59,6 +59,8 @@ struct results
     // pointers from different memory spaces do not co-mingle
     using run_time = std::pair<static_string, typename clock_type::duration>;
 
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum { max_top = 10 };
 
     std::size_t suites = 0;
diff --git a/src/tests/libxrpl/basics/Mutex.cpp b/src/tests/libxrpl/basics/Mutex.cpp
index e91781c463..260bd49da1 100644
--- a/src/tests/libxrpl/basics/Mutex.cpp
+++ b/src/tests/libxrpl/basics/Mutex.cpp
@@ -197,7 +197,7 @@ struct MutexDifferentLockTypesTest : ::testing::Test
 {
 };
 
-TEST_F(MutexDifferentLockTypesTest, lock_guard)
+TEST_F(MutexDifferentLockTypesTest, scoped_lock)
 {
     Mutex<int> m(0);
     {
diff --git a/src/tests/libxrpl/json/Writer.cpp b/src/tests/libxrpl/json/Writer.cpp
index a21f27199f..71fead1b69 100644
--- a/src/tests/libxrpl/json/Writer.cpp
+++ b/src/tests/libxrpl/json/Writer.cpp
@@ -83,11 +83,11 @@ TEST_F(WriterFixture, primitives)
 
 TEST_F(WriterFixture, empty)
 {
-    writer->startRoot(Writer::array);
+    writer->startRoot(Writer::CollectionType::array);
     writer->finish();
     checkOutputAndReset("[]");
 
-    writer->startRoot(Writer::object);
+    writer->startRoot(Writer::CollectionType::object);
     writer->finish();
     checkOutputAndReset("{}");
 }
@@ -112,7 +112,7 @@ TEST_F(WriterFixture, escaping)
 
 TEST_F(WriterFixture, array)
 {
-    writer->startRoot(Writer::array);
+    writer->startRoot(Writer::CollectionType::array);
     writer->append(12);
     writer->finish();
     checkOutputAndReset("[12]");
@@ -120,7 +120,7 @@ TEST_F(WriterFixture, array)
 
 TEST_F(WriterFixture, long_array)
 {
-    writer->startRoot(Writer::array);
+    writer->startRoot(Writer::CollectionType::array);
     writer->append(12);
     writer->append(true);
     writer->append("hello");
@@ -130,8 +130,8 @@ TEST_F(WriterFixture, long_array)
 
 TEST_F(WriterFixture, embedded_array_simple)
 {
-    writer->startRoot(Writer::array);
-    writer->startAppend(Writer::array);
+    writer->startRoot(Writer::CollectionType::array);
+    writer->startAppend(Writer::CollectionType::array);
     writer->finish();
     writer->finish();
     checkOutputAndReset("[[]]");
@@ -139,7 +139,7 @@ TEST_F(WriterFixture, embedded_array_simple)
 
 TEST_F(WriterFixture, object)
 {
-    writer->startRoot(Writer::object);
+    writer->startRoot(Writer::CollectionType::object);
     writer->set("hello", "world");
     writer->finish();
     checkOutputAndReset(R"({"hello":"world"})");
@@ -147,15 +147,15 @@ TEST_F(WriterFixture, object)
 
 TEST_F(WriterFixture, complex_object)
 {
-    writer->startRoot(Writer::object);
+    writer->startRoot(Writer::CollectionType::object);
     writer->set("hello", "world");
-    writer->startSet(Writer::array, "array");
+    writer->startSet(Writer::CollectionType::array, "array");
     writer->append(true);
     writer->append(12);
-    writer->startAppend(Writer::array);
-    writer->startAppend(Writer::object);
+    writer->startAppend(Writer::CollectionType::array);
+    writer->startAppend(Writer::CollectionType::object);
     writer->set("goodbye", "cruel world.");
-    writer->startSet(Writer::array, "subarray");
+    writer->startSet(Writer::CollectionType::array, "subarray");
     writer->append(23.5);
     writer->finishAll();
     checkOutputAndReset(
@@ -166,7 +166,7 @@ TEST_F(WriterFixture, json_value)
 {
     Json::Value value(Json::objectValue);
     value["foo"] = 23;
-    writer->startRoot(Writer::object);
+    writer->startRoot(Writer::CollectionType::object);
     writer->set("hello", value);
     writer->finish();
     checkOutputAndReset(R"({"hello":{"foo":23}})");
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index 6d99c2ee15..262f217680 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -907,7 +907,7 @@ RCLConsensus::getJson(bool full) const
 {
     Json::Value ret;
     {
-        std::lock_guard const _{mutex_};
+        std::scoped_lock const _{mutex_};
         ret = consensus_.getJson(full);
     }
     ret["validating"] = adaptor_.validating();
@@ -921,7 +921,7 @@ RCLConsensus::timerEntry(
 {
     try
     {
-        std::lock_guard const _{mutex_};
+        std::scoped_lock const _{mutex_};
         consensus_.timerEntry(now, clog);
     }
     catch (SHAMapMissingNode const& mn)
@@ -940,7 +940,7 @@ RCLConsensus::gotTxSet(NetClock::time_point const& now, RCLTxSet const& txSet)
 {
     try
     {
-        std::lock_guard const _{mutex_};
+        std::scoped_lock const _{mutex_};
         consensus_.gotTxSet(now, txSet);
     }
     catch (SHAMapMissingNode const& mn)
@@ -958,14 +958,14 @@ RCLConsensus::simulate(
     NetClock::time_point const& now,
     std::optional<std::chrono::milliseconds> consensusDelay)
 {
-    std::lock_guard const _{mutex_};
+    std::scoped_lock const _{mutex_};
     consensus_.simulate(now, consensusDelay);
 }
 
 bool
 RCLConsensus::peerProposal(NetClock::time_point const& now, RCLCxPeerPos const& newProposal)
 {
-    std::lock_guard const _{mutex_};
+    std::scoped_lock const _{mutex_};
     return consensus_.peerProposal(now, newProposal);
 }
 
@@ -1064,7 +1064,7 @@ RCLConsensus::startRound(
     hash_set<NodeID> const& nowTrusted,
     std::unique_ptr<std::stringstream> const& clog)
 {
-    std::lock_guard const _{mutex_};
+    std::scoped_lock const _{mutex_};
     consensus_.startRound(
         now, prevLgrId, prevLgr, nowUntrusted, adaptor_.preStartRound(prevLgr, nowTrusted), clog);
 }
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index c965ed3d87..b8695fd46e 100644
--- a/src/xrpld/app/consensus/RCLConsensus.h
+++ b/src/xrpld/app/consensus/RCLConsensus.h
@@ -472,7 +472,7 @@ public:
     RCLCxLedger::ID
     prevLedgerID() const
     {
-        std::lock_guard const _{mutex_};
+        std::scoped_lock const _{mutex_};
         return consensus_.prevLedgerID();
     }
 
diff --git a/src/xrpld/app/ledger/AccountStateSF.cpp b/src/xrpld/app/ledger/AccountStateSF.cpp
index d5fa5d83ff..bca527d3d0 100644
--- a/src/xrpld/app/ledger/AccountStateSF.cpp
+++ b/src/xrpld/app/ledger/AccountStateSF.cpp
@@ -19,7 +19,8 @@ AccountStateSF::gotNode(
     Blob&& nodeData,
     SHAMapNodeType) const
 {
-    db_.store(hotACCOUNT_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
+    db_.store(
+        NodeObjectType::hotACCOUNT_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
 }
 
 std::optional<Blob>
diff --git a/src/xrpld/app/ledger/LedgerHolder.h b/src/xrpld/app/ledger/LedgerHolder.h
index bf9d478c40..322ad85e23 100644
--- a/src/xrpld/app/ledger/LedgerHolder.h
+++ b/src/xrpld/app/ledger/LedgerHolder.h
@@ -28,7 +28,7 @@ public:
             LogicError("LedgerHolder::set with nullptr");
         if (!ledger->isImmutable())
             LogicError("LedgerHolder::set with mutable Ledger");
-        std::lock_guard const sl(m_lock);
+        std::scoped_lock const sl(m_lock);
         m_heldLedger = std::move(ledger);
     }
 
@@ -36,14 +36,14 @@ public:
     std::shared_ptr<Ledger const>
     get()
     {
-        std::lock_guard const sl(m_lock);
+        std::scoped_lock const sl(m_lock);
         return m_heldLedger;
     }
 
     bool
     empty()
     {
-        std::lock_guard const sl(m_lock);
+        std::scoped_lock const sl(m_lock);
         return m_heldLedger == nullptr;
     }
 
diff --git a/src/xrpld/app/ledger/LedgerMaster.h b/src/xrpld/app/ledger/LedgerMaster.h
index 1bd4530d6d..62970eab15 100644
--- a/src/xrpld/app/ledger/LedgerMaster.h
+++ b/src/xrpld/app/ledger/LedgerMaster.h
@@ -387,7 +387,7 @@ private:
     void
     collect_metrics()
     {
-        std::lock_guard const lock(m_mutex);
+        std::scoped_lock const lock(m_mutex);
         m_stats.validatedLedgerAge.set(getValidatedLedgerAge().count());
         m_stats.publishedLedgerAge.set(getPublishedLedgerAge().count());
     }
diff --git a/src/xrpld/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h
index ce2acb0699..9ea544c79b 100644
--- a/src/xrpld/app/ledger/LedgerReplayer.h
+++ b/src/xrpld/app/ledger/LedgerReplayer.h
@@ -103,21 +103,21 @@ public:
     std::size_t
     tasksSize() const
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         return tasks_.size();
     }
 
     std::size_t
     deltasSize() const
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         return deltas_.size();
     }
 
     std::size_t
     skipListsSize() const
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         return skipLists_.size();
     }
 
diff --git a/src/xrpld/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h
index 53985f343b..91878c3c1b 100644
--- a/src/xrpld/app/ledger/LedgerToJson.h
+++ b/src/xrpld/app/ledger/LedgerToJson.h
@@ -23,6 +23,8 @@ struct LedgerFill
             closeTime = context->ledgerMaster.getCloseTimeBySeq(ledger.seq());
     }
 
+    // Bitwise bitmask
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum Options {
         dumpTxrp = 1,
         dumpState = 2,
diff --git a/src/xrpld/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h
index 5b1d611b44..d55c9c97e3 100644
--- a/src/xrpld/app/ledger/OpenLedger.h
+++ b/src/xrpld/app/ledger/OpenLedger.h
@@ -169,7 +169,7 @@ private:
         ApplyFlags flags,
         beast::Journal j);
 
-    enum Result { success, failure, retry };
+    enum class Result { success, failure, retry };
 
     std::shared_ptr<OpenView>
     create(Rules const& rules, std::shared_ptr<Ledger const> const& ledger);
diff --git a/src/xrpld/app/ledger/OrderBookDBImpl.cpp b/src/xrpld/app/ledger/OrderBookDBImpl.cpp
index 1c64c5e6fa..4bfa982082 100644
--- a/src/xrpld/app/ledger/OrderBookDBImpl.cpp
+++ b/src/xrpld/app/ledger/OrderBookDBImpl.cpp
@@ -210,7 +210,7 @@ OrderBookDBImpl::update(std::shared_ptr<ReadView const> const& ledger)
     JLOG(j_.debug()) << "Update completed (" << ledger->seq() << "): " << cnt << " books found";
 
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
         allBooks_.swap(allBooks);
         xrpBooks_.swap(xrpBooks);
         domainBooks_.swap(domainBooks);
@@ -225,7 +225,7 @@ OrderBookDBImpl::addOrderBook(Book const& book)
 {
     bool const toXRP = isXRP(book.out);
 
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     if (book.domain)
     {
@@ -253,7 +253,7 @@ OrderBookDBImpl::getBooksByTakerPays(Asset const& asset, std::optional<uint256>
     std::vector<Book> ret;
 
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
 
         auto getBooks = [&](auto const& container, auto const& key) {
             if (auto it = container.find(key); it != container.end())
@@ -282,7 +282,7 @@ OrderBookDBImpl::getBooksByTakerPays(Asset const& asset, std::optional<uint256>
 int
 OrderBookDBImpl::getBookSize(Asset const& asset, std::optional<uint256> const& domain)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     if (!domain)
     {
@@ -301,7 +301,7 @@ OrderBookDBImpl::getBookSize(Asset const& asset, std::optional<uint256> const& d
 bool
 OrderBookDBImpl::isBookToXRP(Asset const& asset, std::optional<Domain> const& domain)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     if (domain)
         return xrpDomainBooks_.contains({asset, *domain});
     return xrpBooks_.contains(asset);
@@ -310,7 +310,7 @@ OrderBookDBImpl::isBookToXRP(Asset const& asset, std::optional<Domain> const& do
 BookListeners::pointer
 OrderBookDBImpl::makeBookListeners(Book const& book)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     auto ret = getBookListeners(book);
 
     if (!ret)
@@ -331,7 +331,7 @@ BookListeners::pointer
 OrderBookDBImpl::getBookListeners(Book const& book)
 {
     BookListeners::pointer ret;
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     auto it0 = mListeners.find(book);
     if (it0 != mListeners.end())
@@ -348,7 +348,7 @@ OrderBookDBImpl::processTxn(
     AcceptedLedgerTx const& alTx,
     MultiApiJson const& jvObj)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     // For this particular transaction, maintain the set of unique
     // subscriptions that have already published it.  This prevents sending
diff --git a/src/xrpld/app/ledger/TransactionStateSF.cpp b/src/xrpld/app/ledger/TransactionStateSF.cpp
index e2ec3ca7b6..201a2204a5 100644
--- a/src/xrpld/app/ledger/TransactionStateSF.cpp
+++ b/src/xrpld/app/ledger/TransactionStateSF.cpp
@@ -24,7 +24,8 @@ TransactionStateSF::gotNode(
     XRPL_ASSERT(
         type != SHAMapNodeType::tnTRANSACTION_NM,
         "xrpl::TransactionStateSF::gotNode : valid input");
-    db_.store(hotTRANSACTION_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
+    db_.store(
+        NodeObjectType::hotTRANSACTION_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
 }
 
 std::optional<Blob>
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index 8f5184336a..c75b1e0a12 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -63,8 +63,8 @@ buildLedgerImpl(
         // Write the final version of all modified SHAMap
         // nodes to the node store to preserve the new LCL
 
-        int const asf = built->stateMap().flushDirty(hotACCOUNT_NODE);
-        int const tmf = built->txMap().flushDirty(hotTRANSACTION_NODE);
+        int const asf = built->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
+        int const tmf = built->txMap().flushDirty(NodeObjectType::hotTRANSACTION_NODE);
         JLOG(j.debug()) << "Flushed " << asf << " accounts and " << tmf << " transaction nodes";
     }
     built->unshare();
diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp
index a65fae2ff3..52636d08c6 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -53,6 +53,8 @@ namespace xrpl {
 
 using namespace std::chrono_literals;
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Number of peers to start with
     peerCountStart = 5
@@ -276,7 +278,8 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
             if (std::addressof(dstDB) != std::addressof(srcDB))
             {
                 Blob blob{nodeObject->getData()};
-                dstDB.store(hotLEDGER, std::move(blob), hash_, mLedger->header().seq);
+                dstDB.store(
+                    NodeObjectType::hotLEDGER, std::move(blob), hash_, mLedger->header().seq);
             }
         }
         else
@@ -294,7 +297,7 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
 
             // Store the ledger header in the ledger's database
             mLedger->stateMap().family().db().store(
-                hotLEDGER, std::move(*data), hash_, mLedger->header().seq);
+                NodeObjectType::hotLEDGER, std::move(*data), hash_, mLedger->header().seq);
         }
 
         if (mSeq == 0)
@@ -820,7 +823,7 @@ InboundLedger::takeHeader(std::string const& data)
     Serializer s(data.size() + 4);
     s.add32(HashPrefix::ledgerMaster);
     s.addRaw(data.data(), data.size());
-    f->db().store(hotLEDGER, std::move(s.modData()), hash_, mSeq);
+    f->db().store(NodeObjectType::hotLEDGER, std::move(s.modData()), hash_, mSeq);
 
     if (mLedger->header().txHash.isZero())
         mHaveTransactions = true;
@@ -1021,7 +1024,7 @@ InboundLedger::gotData(
     std::weak_ptr<Peer> peer,
     std::shared_ptr<protocol::TMLedgerData> const& data)
 {
-    std::lock_guard const sl(mReceivedDataLock);
+    std::scoped_lock const sl(mReceivedDataLock);
 
     if (isDone())
         return false;
@@ -1233,7 +1236,7 @@ InboundLedger::runData()
         data.clear();
 
         {
-            std::lock_guard const sl(mReceivedDataLock);
+            std::scoped_lock const sl(mReceivedDataLock);
 
             if (mReceivedData.empty())
             {
diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
index 2207308737..a882f5be73 100644
--- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
@@ -284,7 +284,7 @@ public:
     std::size_t
     fetchRate() override
     {
-        std::lock_guard const lock(fetchRateMutex_);
+        std::scoped_lock const lock(fetchRateMutex_);
         return 60 * fetchRate_.value(m_clock.now());
     }
 
@@ -293,7 +293,7 @@ public:
     void
     onLedgerFetched() override
     {
-        std::lock_guard const lock(fetchRateMutex_);
+        std::scoped_lock const lock(fetchRateMutex_);
         fetchRate_.add(1, m_clock.now());
     }
 
diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
index 56c9c633f4..cbf0ac04d5 100644
--- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp
+++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
@@ -27,6 +27,8 @@
 
 namespace xrpl {
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Ideal number of peers to start with
     startPeers = 2,
@@ -77,7 +79,7 @@ public:
     getAcquire(uint256 const& hash)
     {
         {
-            std::lock_guard const sl(mLock);
+            std::scoped_lock const sl(mLock);
 
             auto it = m_map.find(hash);
 
@@ -93,7 +95,7 @@ public:
         TransactionAcquire::pointer ta;
 
         {
-            std::lock_guard const sl(mLock);
+            std::scoped_lock const sl(mLock);
 
             if (auto it = m_map.find(hash); it != m_map.end())
             {
@@ -176,7 +178,7 @@ public:
         bool isNew = true;
 
         {
-            std::lock_guard const sl(mLock);
+            std::scoped_lock const sl(mLock);
 
             auto& inboundSet = m_map[hash];
 
@@ -201,7 +203,7 @@ public:
     void
     newRound(std::uint32_t seq) override
     {
-        std::lock_guard const lock(mLock);
+        std::scoped_lock const lock(mLock);
 
         // Protect zero set from expiration
         m_zeroSet.mSeq = seq;
@@ -232,7 +234,7 @@ public:
     void
     stop() override
     {
-        std::lock_guard const lock(mLock);
+        std::scoped_lock const lock(mLock);
         stopping_ = true;
         m_map.clear();
     }
diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
index 850b60f4ed..d500c8ee7b 100644
--- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
@@ -98,7 +98,7 @@ public:
     {
         JLOG(j_.info()) << "Stopping";
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             shouldExit_ = true;
             wakeup_.notify_one();
         }
@@ -114,7 +114,7 @@ public:
     void
     onWrite(beast::PropertyStream::Map& map) override
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
 
         if (maxRange_ == 0)
         {
@@ -146,7 +146,7 @@ public:
         app_.getLedgerMaster().getFullValidatedRange(minRange, maxRange);
 
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
 
             maxRange_ = maxRange;
             minRange_ = minRange;
@@ -376,7 +376,7 @@ private:
     doLedgerCleaner()
     {
         auto shouldExit = [this] {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             return shouldExit_;
         };
 
@@ -397,7 +397,7 @@ private:
             }
 
             {
-                std::lock_guard const lock(mutex_);
+                std::scoped_lock const lock(mutex_);
                 if ((minRange_ > maxRange_) || (maxRange_ == 0) || (minRange_ == 0))
                 {
                     minRange_ = maxRange_ = 0;
@@ -425,7 +425,7 @@ private:
             if (fail)
             {
                 {
-                    std::lock_guard const lock(mutex_);
+                    std::scoped_lock const lock(mutex_);
                     ++failures_;
                 }
                 // Wait for acquiring to catch up to us
@@ -434,7 +434,7 @@ private:
             else
             {
                 {
-                    std::lock_guard const lock(mutex_);
+                    std::scoped_lock const lock(mutex_);
                     if (ledgerIndex == minRange_)
                         ++minRange_;
                     if (ledgerIndex == maxRange_)
diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
index c53249fa07..1c0e627cd0 100644
--- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
@@ -163,7 +163,7 @@ LedgerMaster::isCompatible(ReadView const& view, beast::Journal::Stream s, char
     }
 
     {
-        std::lock_guard const sl(m_mutex);
+        std::scoped_lock const sl(m_mutex);
 
         if ((mLastValidLedger.second != 0) &&
             !areCompatible(mLastValidLedger.first, mLastValidLedger.second, view, s, reason))
@@ -342,7 +342,7 @@ LedgerMaster::setPubLedger(std::shared_ptr<Ledger const> const& l)
 void
 LedgerMaster::addHeldTransaction(std::shared_ptr<Transaction> const& transaction)
 {
-    std::lock_guard const ml(m_mutex);
+    std::scoped_lock const ml(m_mutex);
     mHeldTransactions.insert(transaction->getSTransaction());
 }
 
@@ -425,7 +425,7 @@ LedgerMaster::switchLCL(std::shared_ptr<Ledger const> const& lastClosed)
         LogicError("The new last closed ledger is open!");
 
     {
-        std::lock_guard const ml(m_mutex);
+        std::scoped_lock const ml(m_mutex);
         mClosedLedger.set(lastClosed);
     }
 
@@ -463,7 +463,7 @@ void
 LedgerMaster::applyHeldTransactions()
 {
     CanonicalTXSet const set = [this]() {
-        std::lock_guard const sl(m_mutex);
+        std::scoped_lock const sl(m_mutex);
         // VFALCO NOTE The hash for an open ledger is undefined so we use
         // something that is a reasonable substitute.
         CanonicalTXSet set(app_.getOpenLedger().current()->header().parentHash);
@@ -478,7 +478,7 @@ LedgerMaster::applyHeldTransactions()
 std::shared_ptr<STTx const>
 LedgerMaster::popAcctTransaction(std::shared_ptr<STTx const> const& tx)
 {
-    std::lock_guard const sl(m_mutex);
+    std::scoped_lock const sl(m_mutex);
 
     return mHeldTransactions.popAcctTransaction(tx);
 }
@@ -492,14 +492,14 @@ LedgerMaster::setBuildingLedger(LedgerIndex i)
 bool
 LedgerMaster::haveLedger(std::uint32_t seq)
 {
-    std::lock_guard const sl(mCompleteLock);
+    std::scoped_lock const sl(mCompleteLock);
     return boost::icl::contains(mCompleteLedgers, seq);
 }
 
 void
 LedgerMaster::clearLedger(std::uint32_t seq)
 {
-    std::lock_guard const sl(mCompleteLock);
+    std::scoped_lock const sl(mCompleteLock);
     mCompleteLedgers.erase(seq);
 }
 
@@ -560,7 +560,7 @@ LedgerMaster::getFullValidatedRange(std::uint32_t& minVal, std::uint32_t& maxVal
 
     std::optional<std::uint32_t> maybeMin;
     {
-        std::lock_guard const sl(mCompleteLock);
+        std::scoped_lock const sl(mCompleteLock);
         maybeMin = prevMissing(mCompleteLedgers, maxVal);
     }
 
@@ -655,7 +655,7 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
     while (!app_.getJobQueue().isStopping() && seq > 0)
     {
         {
-            std::lock_guard const ml(m_mutex);
+            std::scoped_lock const ml(m_mutex);
             minHas = seq;
             --seq;
 
@@ -671,7 +671,7 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
                 return;
 
             {
-                std::lock_guard const ml(mCompleteLock);
+                std::scoped_lock const ml(mCompleteLock);
                 mCompleteLedgers.insert(range(minHas, maxHas));
             }
             maxHas = minHas;
@@ -699,11 +699,11 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
     }
 
     {
-        std::lock_guard const ml(mCompleteLock);
+        std::scoped_lock const ml(mCompleteLock);
         mCompleteLedgers.insert(range(minHas, maxHas));
     }
     {
-        std::lock_guard const ml(m_mutex);
+        std::scoped_lock const ml(m_mutex);
         mFillInProgress = 0;
         tryAdvance();
     }
@@ -841,12 +841,12 @@ LedgerMaster::setFullLedger(
     pendSaveValidated(app_, ledger, isSynchronous, isCurrent);
 
     {
-        std::lock_guard const ml(mCompleteLock);
+        std::scoped_lock const ml(mCompleteLock);
         mCompleteLedgers.insert(ledger->header().seq);
     }
 
     {
-        std::lock_guard const ml(m_mutex);
+        std::scoped_lock const ml(m_mutex);
 
         if (ledger->header().seq > mValidLedgerSeq)
             setValidLedger(ledger);
@@ -896,7 +896,7 @@ LedgerMaster::checkAccept(uint256 const& hash, std::uint32_t seq)
         valCount = validations.size();
         if (valCount >= app_.getValidators().quorum())
         {
-            std::lock_guard const ml(m_mutex);
+            std::scoped_lock const ml(m_mutex);
             if (seq > mLastValidLedger.second)
                 mLastValidLedger = std::make_pair(hash, seq);
         }
@@ -950,7 +950,7 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
 
     // Can we advance the last fully-validated ledger? If so, can we
     // publish?
-    std::lock_guard const ml(m_mutex);
+    std::scoped_lock const ml(m_mutex);
 
     if (ledger->header().seq <= mValidLedgerSeq)
         return;
@@ -1344,7 +1344,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
 void
 LedgerMaster::tryAdvance()
 {
-    std::lock_guard const ml(m_mutex);
+    std::scoped_lock const ml(m_mutex);
 
     // Can't advance without at least one fully-valid ledger
     mAdvanceWork = true;
@@ -1379,7 +1379,7 @@ void
 LedgerMaster::updatePaths()
 {
     {
-        std::lock_guard const ml(m_mutex);
+        std::scoped_lock const ml(m_mutex);
         if (app_.getOPs().isNeedNetworkLedger())
         {
             --mPathFindThread;
@@ -1394,7 +1394,7 @@ LedgerMaster::updatePaths()
         JLOG(m_journal.debug()) << "updatePaths running";
         std::shared_ptr<ReadView const> lastLedger;
         {
-            std::lock_guard const ml(m_mutex);
+            std::scoped_lock const ml(m_mutex);
 
             if (!mValidLedger.empty() &&
                 (!mPathLedger || (mPathLedger->header().seq != mValidLedgerSeq)))
@@ -1423,7 +1423,7 @@ LedgerMaster::updatePaths()
             if (age > 1min)
             {
                 JLOG(m_journal.debug()) << "Published ledger too old for updating paths";
-                std::lock_guard const ml(m_mutex);
+                std::scoped_lock const ml(m_mutex);
                 --mPathFindThread;
                 mPathLedger.reset();
                 return;
@@ -1434,7 +1434,7 @@ LedgerMaster::updatePaths()
         {
             auto& pathRequests = app_.getPathRequestManager();
             {
-                std::lock_guard const ml(m_mutex);
+                std::scoped_lock const ml(m_mutex);
                 if (!pathRequests.requestsPending())
                 {
                     --mPathFindThread;
@@ -1448,7 +1448,7 @@ LedgerMaster::updatePaths()
             JLOG(m_journal.debug()) << "Updating paths";
             pathRequests.updateAll(lastLedger);
 
-            std::lock_guard const ml(m_mutex);
+            std::scoped_lock const ml(m_mutex);
             if (!pathRequests.requestsPending())
             {
                 JLOG(m_journal.debug()) << "No path requests left. No need for further updating "
@@ -1492,7 +1492,7 @@ LedgerMaster::newPathRequest()
 bool
 LedgerMaster::isNewPathRequest()
 {
-    std::lock_guard const ml(m_mutex);
+    std::scoped_lock const ml(m_mutex);
     bool const ret = mPathFindNewRequest;
     mPathFindNewRequest = false;
     return ret;
@@ -1565,14 +1565,14 @@ LedgerMaster::getValidatedRules()
 std::shared_ptr<ReadView const>
 LedgerMaster::getPublishedLedger()
 {
-    std::lock_guard const lock(m_mutex);
+    std::scoped_lock const lock(m_mutex);
     return mPubLedger;
 }
 
 std::string
 LedgerMaster::getCompleteLedgers()
 {
-    std::lock_guard const sl(mCompleteLock);
+    std::scoped_lock const sl(mCompleteLock);
     return to_string(mCompleteLedgers);
 }
 
@@ -1731,7 +1731,7 @@ LedgerMaster::getLedgerByHash(uint256 const& hash)
 void
 LedgerMaster::setLedgerRangePresent(std::uint32_t minV, std::uint32_t maxV)
 {
-    std::lock_guard const sl(mCompleteLock);
+    std::scoped_lock const sl(mCompleteLock);
     mCompleteLedgers.insert(range(minV, maxV));
 }
 
@@ -1751,7 +1751,7 @@ LedgerMaster::getCacheHitRate()
 void
 LedgerMaster::clearPriorLedgers(LedgerIndex seq)
 {
-    std::lock_guard const sl(mCompleteLock);
+    std::scoped_lock const sl(mCompleteLock);
     if (seq > 0)
         mCompleteLedgers.erase(range(0u, seq - 1));
 }
@@ -1812,7 +1812,7 @@ LedgerMaster::fetchForHistory(
             setFullLedger(ledger, false, false);
             int fillInProgress = 0;
             {
-                std::lock_guard const lock(m_mutex);
+                std::scoped_lock const lock(m_mutex);
                 mHistLedger = ledger;
                 fillInProgress = mFillInProgress;
             }
@@ -1821,7 +1821,7 @@ LedgerMaster::fetchForHistory(
             {
                 {
                     // Previous ledger is in DB
-                    std::lock_guard const lock(m_mutex);
+                    std::scoped_lock const lock(m_mutex);
                     mFillInProgress = seq;
                 }
                 app_.getJobQueue().addJob(
@@ -1893,7 +1893,7 @@ LedgerMaster::doAdvance(std::unique_lock<std::recursive_mutex>& sl)
                 InboundLedger::Reason const reason = InboundLedger::Reason::HISTORY;
                 std::optional<std::uint32_t> missing;
                 {
-                    std::lock_guard const sll(mCompleteLock);
+                    std::scoped_lock const sll(mCompleteLock);
                     missing = prevMissing(
                         mCompleteLedgers,
                         mPubLedger->header().seq,
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
index 7779132b39..8f5d38132c 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
@@ -39,7 +39,7 @@ LedgerReplayer::LedgerReplayer(
 
 LedgerReplayer::~LedgerReplayer()
 {
-    std::lock_guard<std::mutex> const lock(mtx_);
+    std::scoped_lock const lock(mtx_);
     tasks_.clear();
 }
 
@@ -61,7 +61,7 @@ LedgerReplayer::replay(
     std::shared_ptr<SkipListAcquire> skipList;
     bool newSkipList = false;
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         if (app_.isStopping())
             return;
         if (tasks_.size() >= LedgerReplayParameters::MAX_TASKS)
@@ -139,7 +139,7 @@ LedgerReplayer::createDeltas(std::shared_ptr<LedgerReplayTask> task)
             std::shared_ptr<LedgerDeltaAcquire> delta;
             bool newDelta = false;
             {
-                std::lock_guard<std::mutex> const lock(mtx_);
+                std::scoped_lock const lock(mtx_);
                 if (app_.isStopping())
                     return;
                 auto i = deltas_.find(*skipListItem);
@@ -169,7 +169,7 @@ LedgerReplayer::gotSkipList(
 {
     std::shared_ptr<SkipListAcquire> skipList = {};
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         auto i = skipLists_.find(info.hash);
         if (i == skipLists_.end())
             return;
@@ -192,7 +192,7 @@ LedgerReplayer::gotReplayDelta(
 {
     std::shared_ptr<LedgerDeltaAcquire> delta = {};
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         auto i = deltas_.find(info.hash);
         if (i == deltas_.end())
             return;
@@ -213,7 +213,7 @@ LedgerReplayer::sweep()
 {
     auto const start = std::chrono::steady_clock::now();
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         JLOG(j_.debug()) << "Sweeping, LedgerReplayer has " << tasks_.size() << " tasks, "
                          << skipLists_.size() << " skipLists, and " << deltas_.size() << " deltas.";
 
@@ -260,7 +260,7 @@ LedgerReplayer::stop()
 {
     JLOG(j_.info()) << "Stopping...";
     {
-        std::lock_guard<std::mutex> const lock(mtx_);
+        std::scoped_lock const lock(mtx_);
         std::ranges::for_each(tasks_, [](auto& i) { i->cancel(); });
         tasks_.clear();
         auto lockAndCancel = [](auto& i) {
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index 8ba45fb515..2d244942e7 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -206,7 +206,7 @@ fillJsonTx(
                 fill.ledger,
                 account,
                 amount,
-                fhIGNORE_FREEZE,
+                FreezeHandling::fhIGNORE_FREEZE,
                 beast::Journal{beast::Journal::getNullSink()});
             txJson[jss::owner_funds] = ownerFunds.getText();
         }
diff --git a/src/xrpld/app/ledger/detail/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp
index 83d9c61c3c..6cc83261d1 100644
--- a/src/xrpld/app/ledger/detail/LocalTxs.cpp
+++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp
@@ -106,7 +106,7 @@ public:
     void
     push_back(LedgerIndex index, std::shared_ptr<STTx const> const& txn) override
     {
-        std::lock_guard const lock(m_lock);
+        std::scoped_lock const lock(m_lock);
 
         m_txns.emplace_back(index, txn);
     }
@@ -119,7 +119,7 @@ public:
         // Get the set of local transactions as a canonical
         // set (so they apply in a valid order)
         {
-            std::lock_guard const lock(m_lock);
+            std::scoped_lock const lock(m_lock);
 
             for (auto const& it : m_txns)
                 tset.insert(it.getTX());
@@ -133,7 +133,7 @@ public:
     void
     sweep(ReadView const& view) override
     {
-        std::lock_guard const lock(m_lock);
+        std::scoped_lock const lock(m_lock);
 
         m_txns.remove_if([&view](auto const& txn) {
             if (txn.isExpired(view.header().seq))
@@ -170,7 +170,7 @@ public:
     std::size_t
     size() override
     {
-        std::lock_guard const lock(m_lock);
+        std::scoped_lock const lock(m_lock);
 
         return m_txns.size();
     }
diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp
index 5db4e23e1e..20ddf27237 100644
--- a/src/xrpld/app/ledger/detail/OpenLedger.cpp
+++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp
@@ -47,26 +47,26 @@ OpenLedger::OpenLedger(
 bool
 OpenLedger::empty() const
 {
-    std::lock_guard const lock(modify_mutex_);
+    std::scoped_lock const lock(modify_mutex_);
     return current_->txCount() == 0;
 }
 
 std::shared_ptr<OpenView const>
 OpenLedger::current() const
 {
-    std::lock_guard const lock(current_mutex_);
+    std::scoped_lock const lock(current_mutex_);
     return current_;
 }
 
 bool
 OpenLedger::modify(modify_type const& f)
 {
-    std::lock_guard const lock1(modify_mutex_);
+    std::scoped_lock const lock1(modify_mutex_);
     auto next = std::make_shared<OpenView>(*current_);
     auto const changed = f(*next, j_);
     if (changed)
     {
-        std::lock_guard const lock2(current_mutex_);
+        std::scoped_lock const lock2(current_mutex_);
         current_ = std::move(next);
     }
     return changed;
@@ -95,7 +95,7 @@ OpenLedger::accept(
     // Block calls to modify, otherwise
     // new tx going into the open ledger
     // would get lost.
-    std::lock_guard const lock1(modify_mutex_);
+    std::scoped_lock const lock1(modify_mutex_);
     // Apply tx from the current open view
     if (!current_->txs.empty())
     {
@@ -153,7 +153,7 @@ OpenLedger::accept(
     }
 
     // Switch to the new open view
-    std::lock_guard const lock2(current_mutex_);
+    std::scoped_lock const lock2(current_mutex_);
     current_ = std::move(next);
 }
 
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
index b38c413344..686d33ce63 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
@@ -31,6 +31,8 @@ using namespace std::chrono_literals;
 // Timeout interval in milliseconds
 auto constexpr TX_ACQUIRE_TIMEOUT = 250ms;
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     NORM_TIMEOUTS = 4,
     MAX_TIMEOUTS = 20,
diff --git a/src/xrpld/app/ledger/detail/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
index 798c29dc05..bc0b7ca4ab 100644
--- a/src/xrpld/app/ledger/detail/TransactionMaster.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
@@ -50,7 +50,7 @@ TransactionMaster::inLedger(
     if (!txn)
         return false;
 
-    txn->setStatus(COMMITTED, ledger, tseq, netID);
+    txn->setStatus(TransStatus::COMMITTED, ledger, tseq, netID);
     return true;
 }
 
@@ -130,7 +130,7 @@ TransactionMaster::fetch(
     else
     {
         if (uCommitLedger != 0u)
-            iTx->setStatus(COMMITTED, uCommitLedger);
+            iTx->setStatus(TransStatus::COMMITTED, uCommitLedger);
 
         txn = iTx->getSTransaction();
     }
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index 005586eaba..d43f842eed 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -1885,7 +1885,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
             }
         }
 
-        loadLedger->stateMap().flushDirty(hotACCOUNT_NODE);
+        loadLedger->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
 
         XRPL_ASSERT(
             loadLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || loadLedger->read(keylet::fees()),
diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp
index 84c57ad360..4f9023dbc5 100644
--- a/src/xrpld/app/main/LoadManager.cpp
+++ b/src/xrpld/app/main/LoadManager.cpp
@@ -42,7 +42,7 @@ LoadManager::~LoadManager()
 void
 LoadManager::activateStallDetector()
 {
-    std::lock_guard const sl(mutex_);
+    std::scoped_lock const sl(mutex_);
     armed_ = true;
     lastHeartbeat_ = std::chrono::steady_clock::now();
 }
@@ -51,7 +51,7 @@ void
 LoadManager::heartbeat()
 {
     auto const heartbeat = std::chrono::steady_clock::now();
-    std::lock_guard const sl(mutex_);
+    std::scoped_lock const sl(mutex_);
     lastHeartbeat_ = heartbeat;
 }
 
@@ -70,7 +70,7 @@ void
 LoadManager::stop()
 {
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         stop_ = true;
         // There is at most one thread waiting on this condition.
         cv_.notify_all();
diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp
index 3da6e3a2ad..c774c77253 100644
--- a/src/xrpld/app/main/Main.cpp
+++ b/src/xrpld/app/main/Main.cpp
@@ -213,7 +213,7 @@ public:
         std::ranges::for_each(v, [this](std::string s) {
             boost::trim(s);
             if (selectors_.empty() || !s.empty())
-                selectors_.emplace_back(beast::unit_test::selector::automatch, s);
+                selectors_.emplace_back(beast::unit_test::selector::mode_t::automatch, s);
         });
     }
 
diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp
index 8db726ff48..c733de3bd3 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.cpp
+++ b/src/xrpld/app/misc/NegativeUNLVote.cpp
@@ -93,7 +93,7 @@ NegativeUNLVote::doVoting(
             auto n = choose(prevLedger->header().hash, candidates.toDisableCandidates);
             XRPL_ASSERT(
                 nidToKeyMap.contains(n), "xrpl::NegativeUNLVote::doVoting : found node to disable");
-            addTx(seq, nidToKeyMap.at(n), ToDisable, initialSet);
+            addTx(seq, nidToKeyMap.at(n), NegativeUNLModify::ToDisable, initialSet);
         }
 
         if (!candidates.toReEnableCandidates.empty())
@@ -101,7 +101,7 @@ NegativeUNLVote::doVoting(
             auto n = choose(prevLedger->header().hash, candidates.toReEnableCandidates);
             XRPL_ASSERT(
                 nidToKeyMap.contains(n), "xrpl::NegativeUNLVote::doVoting : found node to enable");
-            addTx(seq, nidToKeyMap.at(n), ToReEnable, initialSet);
+            addTx(seq, nidToKeyMap.at(n), NegativeUNLModify::ToReEnable, initialSet);
         }
     }
 }
@@ -114,7 +114,7 @@ NegativeUNLVote::addTx(
     std::shared_ptr<SHAMap> const& initialSet)
 {
     STTx const negUnlTx(ttUNL_MODIFY, [&](auto& obj) {
-        obj.setFieldU8(sfUNLModifyDisabling, modify == ToDisable ? 1 : 0);
+        obj.setFieldU8(sfUNLModifyDisabling, modify == NegativeUNLModify::ToDisable ? 1 : 0);
         obj.setFieldU32(sfLedgerSequence, seq);
         obj.setFieldVL(sfUNLModifyValidator, vp.slice());
     });
@@ -132,7 +132,8 @@ NegativeUNLVote::addTx(
         JLOG(j_.debug()) << "N-UNL: ledger seq=" << seq
                          << ", add a ttUNL_MODIFY Tx with txID: " << negUnlTx.getTransactionID()
                          << ", the validator to "
-                         << (modify == ToDisable ? "disable: " : "re-enable: ") << vp;
+                         << (modify == NegativeUNLModify::ToDisable ? "disable: " : "re-enable: ")
+                         << vp;
     }
 }
 
@@ -308,7 +309,7 @@ NegativeUNLVote::findAllCandidates(
 void
 NegativeUNLVote::newValidators(LedgerIndex seq, hash_set<NodeID> const& nowTrusted)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     for (auto const& n : nowTrusted)
     {
         if (!newValidators_.contains(n))
@@ -322,7 +323,7 @@ NegativeUNLVote::newValidators(LedgerIndex seq, hash_set<NodeID> const& nowTrust
 void
 NegativeUNLVote::purgeNewValidators(LedgerIndex seq)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     auto i = newValidators_.begin();
     while (i != newValidators_.end())
     {
diff --git a/src/xrpld/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h
index 2cc63cf8c5..02e84ccca1 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.h
+++ b/src/xrpld/app/misc/NegativeUNLVote.h
@@ -57,7 +57,7 @@ public:
      * A flag indicating whether a UNLModify Tx is to disable or to re-enable
      * a validator.
      */
-    enum NegativeUNLModify {
+    enum class NegativeUNLModify {
         ToDisable,  // UNLModify Tx is to disable a validator
         ToReEnable  // UNLModify Tx is to re-enable a validator
     };
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index 8de65d8b39..964a51e15e 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -257,7 +257,7 @@ class NetworkOPsImp final : public NetworkOPs
         CounterData
         getCounterData() const
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             return {
                 .counters = counters_,
                 .mode = mode_,
@@ -809,6 +809,8 @@ private:
 
     SubAccountHistoryMapType mSubAccountHistory;
 
+    // Used as array indices; converting to enum class would require casts at ~40 call sites.
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum SubTypes {
         sLedger,          // Accepted ledgers.
         sManifests,       // Received validator manifests.
@@ -1261,7 +1263,7 @@ NetworkOPsImp::preProcessTransaction(std::shared_ptr<Transaction>& transaction)
     {
         // cached bad
         JLOG(m_journal.warn()) << transaction->getID() << ": cached bad!\n";
-        transaction->setStatus(INVALID);
+        transaction->setStatus(TransStatus::INVALID);
         transaction->setResult(temBAD_SIGNATURE);
         return false;
     }
@@ -1274,7 +1276,7 @@ NetworkOPsImp::preProcessTransaction(std::shared_ptr<Transaction>& transaction)
     auto const sttx = *transaction->getSTransaction();
     if (sttx.isFlag(tfInnerBatchTxn) && view->rules().enabled(featureBatch))
     {
-        transaction->setStatus(INVALID);
+        transaction->setStatus(TransStatus::INVALID);
         transaction->setResult(temINVALID_FLAG);
         registry_.get().getHashRouter().setFlags(transaction->getID(), HashRouterFlags::BAD);
         return false;
@@ -1292,7 +1294,7 @@ NetworkOPsImp::preProcessTransaction(std::shared_ptr<Transaction>& transaction)
     if (validity == Validity::SigBad)
     {
         JLOG(m_journal.info()) << "Transaction has bad signature: " << reason;
-        transaction->setStatus(INVALID);
+        transaction->setStatus(TransStatus::INVALID);
         transaction->setResult(temBAD_SIGNATURE);
         registry_.get().getHashRouter().setFlags(transaction->getID(), HashRouterFlags::BAD);
         return false;
@@ -1333,7 +1335,7 @@ NetworkOPsImp::doTransactionAsync(
     bool bUnlimited,
     FailHard failType)
 {
-    std::lock_guard const lock(mMutex);
+    std::scoped_lock const lock(mMutex);
 
     if (transaction->getApplying())
         return;
@@ -1408,7 +1410,7 @@ NetworkOPsImp::processTransactionSet(CanonicalTXSet const& set)
         std::string reason;
         auto transaction = std::make_shared<Transaction>(tx, reason, registry_.get().getApp());
 
-        if (transaction->getStatus() == INVALID)
+        if (transaction->getStatus() == TransStatus::INVALID)
         {
             if (!reason.empty())
             {
@@ -1559,7 +1561,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             if (isTesSuccess(e.result))
             {
                 JLOG(m_journal.debug()) << "Transaction is now included in open ledger";
-                e.transaction->setStatus(INCLUDED);
+                e.transaction->setStatus(TransStatus::INCLUDED);
 
                 // Pop as many "reasonable" transactions for this account as
                 // possible. "Reasonable" means they have sequential sequence
@@ -1588,14 +1590,14 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             {
                 // duplicate or conflict
                 JLOG(m_journal.info()) << "Transaction is obsolete";
-                e.transaction->setStatus(OBSOLETE);
+                e.transaction->setStatus(TransStatus::OBSOLETE);
             }
             else if (e.result == terQUEUED)
             {
                 JLOG(m_journal.debug()) << "Transaction is likely to claim a"
                                         << " fee, but is queued until fee drops";
 
-                e.transaction->setStatus(HELD);
+                e.transaction->setStatus(TransStatus::HELD);
                 // Add to held transactions, because it could get
                 // kicked out of the queue, and this will try to
                 // put it back.
@@ -1634,7 +1636,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                     {
                         // transaction should be held
                         JLOG(m_journal.debug()) << "Transaction should be held: " << e.result;
-                        e.transaction->setStatus(HELD);
+                        e.transaction->setStatus(TransStatus::HELD);
                         m_ledgerMaster.addHeldTransaction(e.transaction);
                         e.transaction->setKept();
                     }
@@ -1649,7 +1651,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             else
             {
                 JLOG(m_journal.debug()) << "Status other than success " << e.result;
-                e.transaction->setStatus(INVALID);
+                e.transaction->setStatus(TransStatus::INVALID);
             }
 
             auto const enforceFailHard = e.failType == FailHard::yes && !isTesSuccess(e.result);
@@ -2190,7 +2192,7 @@ void
 NetworkOPsImp::pubManifest(Manifest const& mo)
 {
     // VFALCO consider std::shared_mutex
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     if (!mStreamMaps[sManifests].empty())
     {
@@ -2268,7 +2270,7 @@ NetworkOPsImp::pubServer()
     //             list into a local array while holding the lock then release
     //             the lock and call send on everyone.
     //
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     if (!mStreamMaps[sServer].empty())
     {
@@ -2327,7 +2329,7 @@ NetworkOPsImp::pubServer()
 void
 NetworkOPsImp::pubConsensus(ConsensusPhase phase)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     auto& streamMap = mStreamMaps[sConsensusPhase];
     if (!streamMap.empty())
@@ -2355,7 +2357,7 @@ void
 NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 {
     // VFALCO consider std::shared_mutex
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     if (!mStreamMaps[sValidations].empty())
     {
@@ -2460,7 +2462,7 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 void
 NetworkOPsImp::pubPeerStatus(std::function<Json::Value(void)> const& func)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     if (!mStreamMaps[sPeerStatus].empty())
     {
@@ -3017,7 +3019,7 @@ NetworkOPsImp::pubProposedTransaction(
     MultiApiJson jvObj = transJson(transaction, result, false, ledger, std::nullopt);
 
     {
-        std::lock_guard const sl(mSubLock);
+        std::scoped_lock const sl(mSubLock);
 
         auto it = mStreamMaps[sRTTransactions].begin();
         while (it != mStreamMaps[sRTTransactions].end())
@@ -3064,7 +3066,7 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
         JLOG(m_journal.debug()) << "Publishing ledger " << lpAccepted->header().seq << " "
                                 << lpAccepted->header().hash;
 
-        std::lock_guard const sl(mSubLock);
+        std::scoped_lock const sl(mSubLock);
 
         if (!mStreamMaps[sLedger].empty())
         {
@@ -3267,8 +3269,8 @@ NetworkOPsImp::transJson(
                 *ledger,
                 account,
                 amount,
-                fhIGNORE_FREEZE,
-                ahIGNORE_AUTH,
+                FreezeHandling::fhIGNORE_FREEZE,
+                AuthHandling::ahIGNORE_AUTH,
                 registry_.get().getJournal("View"));
             jvObj[jss::transaction][jss::owner_funds] = ownerFunds.getText();
         }
@@ -3309,7 +3311,7 @@ NetworkOPsImp::pubValidatedTransaction(
     MultiApiJson jvObj = transJson(stTxn, trResult, true, ledger, metaRef);
 
     {
-        std::lock_guard const sl(mSubLock);
+        std::scoped_lock const sl(mSubLock);
 
         auto it = mStreamMaps[sTransactions].begin();
         while (it != mStreamMaps[sTransactions].end())
@@ -3368,7 +3370,7 @@ NetworkOPsImp::pubAccountTransaction(
     std::vector<SubAccountHistoryInfo> accountHistoryNotify;
     auto const currLedgerSeq = ledger->seq();
     {
-        std::lock_guard const sl(mSubLock);
+        std::scoped_lock const sl(mSubLock);
 
         if (!mSubAccount.empty() || !mSubRTAccount.empty() || !mSubAccountHistory.empty())
         {
@@ -3471,7 +3473,7 @@ NetworkOPsImp::pubAccountTransaction(
             jvObj.set(jss::account_history_boundary, true);
 
         XRPL_ASSERT(
-            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::none,
+            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::none,
             "xrpl::NetworkOPsImp::pubAccountTransaction : "
             "account_history_tx_stream not set");
         for (auto& info : accountHistoryNotify)
@@ -3501,7 +3503,7 @@ NetworkOPsImp::pubProposedAccountTransaction(
     std::vector<SubAccountHistoryInfo> accountHistoryNotify;
 
     {
-        std::lock_guard const sl(mSubLock);
+        std::scoped_lock const sl(mSubLock);
 
         if (mSubRTAccount.empty())
             return;
@@ -3550,7 +3552,7 @@ NetworkOPsImp::pubProposedAccountTransaction(
         }
 
         XRPL_ASSERT(
-            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::none,
+            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::none,
             "xrpl::NetworkOPs::pubProposedAccountTransaction : "
             "account_history_tx_stream not set");
         for (auto& info : accountHistoryNotify)
@@ -3585,7 +3587,7 @@ NetworkOPsImp::subAccount(
         isrListener->insertSubAccountInfo(naAccountID, rt);
     }
 
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     for (auto const& naAccountID : vnaAccountIDs)
     {
@@ -3628,7 +3630,7 @@ NetworkOPsImp::unsubAccountInternal(
     hash_set<AccountID> const& vnaAccountIDs,
     bool rt)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     SubInfoMapType& subMap = rt ? mSubRTAccount : mSubAccount;
 
@@ -3934,7 +3936,7 @@ NetworkOPsImp::subAccountHistory(InfoSub::ref isrListener, AccountID const& acco
         return rpcINVALID_PARAMS;
     }
 
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     SubAccountHistoryInfoWeak ahi{
         .sinkWptr_ = isrListener, .index_ = std::make_shared<SubAccountHistoryIndex>(accountId)};
     auto simIterator = mSubAccountHistory.find(accountId);
@@ -3982,7 +3984,7 @@ NetworkOPsImp::unsubAccountHistoryInternal(
     AccountID const& account,
     bool historyOnly)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     auto simIterator = mSubAccountHistory.find(account);
     if (simIterator != mSubAccountHistory.end())
     {
@@ -4071,7 +4073,7 @@ NetworkOPsImp::subLedger(InfoSub::ref isrListener, Json::Value& jvResult)
         jvResult[jss::validated_ledgers] = registry_.get().getLedgerMaster().getCompleteLedgers();
     }
 
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sLedger].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4079,7 +4081,7 @@ NetworkOPsImp::subLedger(InfoSub::ref isrListener, Json::Value& jvResult)
 bool
 NetworkOPsImp::subBookChanges(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sBookChanges].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4087,7 +4089,7 @@ NetworkOPsImp::subBookChanges(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubLedger(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sLedger].erase(uSeq) != 0u;
 }
 
@@ -4095,7 +4097,7 @@ NetworkOPsImp::unsubLedger(std::uint64_t uSeq)
 bool
 NetworkOPsImp::unsubBookChanges(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sBookChanges].erase(uSeq) != 0u;
 }
 
@@ -4103,7 +4105,7 @@ NetworkOPsImp::unsubBookChanges(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subManifests(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sManifests].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4111,7 +4113,7 @@ NetworkOPsImp::subManifests(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubManifests(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sManifests].erase(uSeq) != 0u;
 }
 
@@ -4136,7 +4138,7 @@ NetworkOPsImp::subServer(InfoSub::ref isrListener, Json::Value& jvResult, bool a
     jvResult[jss::pubkey_node] =
         toBase58(TokenType::NodePublic, registry_.get().getApp().nodeIdentity().first);
 
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sServer].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4144,7 +4146,7 @@ NetworkOPsImp::subServer(InfoSub::ref isrListener, Json::Value& jvResult, bool a
 bool
 NetworkOPsImp::unsubServer(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sServer].erase(uSeq) != 0u;
 }
 
@@ -4152,7 +4154,7 @@ NetworkOPsImp::unsubServer(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subTransactions(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sTransactions].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4160,7 +4162,7 @@ NetworkOPsImp::subTransactions(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubTransactions(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sTransactions].erase(uSeq) != 0u;
 }
 
@@ -4168,7 +4170,7 @@ NetworkOPsImp::unsubTransactions(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subRTTransactions(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sRTTransactions].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4176,7 +4178,7 @@ NetworkOPsImp::subRTTransactions(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubRTTransactions(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sRTTransactions].erase(uSeq) != 0u;
 }
 
@@ -4184,7 +4186,7 @@ NetworkOPsImp::unsubRTTransactions(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subValidations(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sValidations].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4198,7 +4200,7 @@ NetworkOPsImp::stateAccounting(Json::Value& obj)
 bool
 NetworkOPsImp::unsubValidations(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sValidations].erase(uSeq) != 0u;
 }
 
@@ -4206,7 +4208,7 @@ NetworkOPsImp::unsubValidations(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subPeerStatus(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sPeerStatus].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4214,7 +4216,7 @@ NetworkOPsImp::subPeerStatus(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubPeerStatus(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sPeerStatus].erase(uSeq) != 0u;
 }
 
@@ -4222,7 +4224,7 @@ NetworkOPsImp::unsubPeerStatus(std::uint64_t uSeq)
 bool
 NetworkOPsImp::subConsensus(InfoSub::ref isrListener)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sConsensusPhase].emplace(isrListener->getSeq(), isrListener).second;
 }
 
@@ -4230,14 +4232,14 @@ NetworkOPsImp::subConsensus(InfoSub::ref isrListener)
 bool
 NetworkOPsImp::unsubConsensus(std::uint64_t uSeq)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     return mStreamMaps[sConsensusPhase].erase(uSeq) != 0u;
 }
 
 InfoSub::pointer
 NetworkOPsImp::findRpcSub(std::string const& strUrl)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     subRpcMapType::iterator const it = mRpcSubMap.find(strUrl);
 
@@ -4250,7 +4252,7 @@ NetworkOPsImp::findRpcSub(std::string const& strUrl)
 InfoSub::pointer
 NetworkOPsImp::addRpcSub(std::string const& strUrl, InfoSub::ref rspEntry)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
 
     mRpcSubMap.emplace(strUrl, rspEntry);
 
@@ -4260,7 +4262,7 @@ NetworkOPsImp::addRpcSub(std::string const& strUrl, InfoSub::ref rspEntry)
 bool
 NetworkOPsImp::tryRemoveRpcSub(std::string const& strUrl)
 {
-    std::lock_guard const sl(mSubLock);
+    std::scoped_lock const sl(mSubLock);
     auto pInfo = findRpcSub(strUrl);
 
     if (!pInfo)
@@ -4400,8 +4402,8 @@ NetworkOPsImp::getBookPage(
                             view,
                             uOfferOwnerID,
                             book.out,
-                            fhZERO_IF_FROZEN,
-                            ahZERO_IF_UNAUTHORIZED,
+                            FreezeHandling::fhZERO_IF_FROZEN,
+                            AuthHandling::ahZERO_IF_UNAUTHORIZED,
                             viewJ);
 
                         if (saOwnerFunds < beast::zero)
@@ -4545,7 +4547,10 @@ NetworkOPsImp::getBookPage(
                     // Did not find balance in table.
 
                     saOwnerFunds = lesActive.accountHolds(
-                        uOfferOwnerID, book.out.currency, book.out.account, fhZERO_IF_FROZEN);
+                        uOfferOwnerID,
+                        book.out.currency,
+                        book.out.account,
+                        FreezeHandling::fhZERO_IF_FROZEN);
 
                     if (saOwnerFunds.isNegative())
                     {
@@ -4621,7 +4626,7 @@ NetworkOPsImp::collect_metrics()
         std::chrono::steady_clock::now() - start);
     counters[static_cast<std::size_t>(mode)].dur += current;
 
-    std::lock_guard const lock(m_statsMutex);
+    std::scoped_lock const lock(m_statsMutex);
     m_stats.disconnected_duration.set(
         counters[static_cast<std::size_t>(OperatingMode::DISCONNECTED)].dur.count());
     m_stats.connected_duration.set(
@@ -4649,7 +4654,7 @@ NetworkOPsImp::StateAccounting::mode(OperatingMode om)
 {
     auto now = std::chrono::steady_clock::now();
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     ++counters_[static_cast<std::size_t>(om)].transitions;
     if (om == OperatingMode::FULL && counters_[static_cast<std::size_t>(om)].transitions == 1)
     {
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index 518d9f6b14..3a6cb1742d 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -45,14 +45,14 @@ namespace xrpl {
 void
 SHAMapStoreImp::SavedStateDB::init(BasicConfig const& config, std::string const& dbName)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     initStateDB(sqlDb_, config, dbName);
 }
 
 LedgerIndex
 SHAMapStoreImp::SavedStateDB::getCanDelete()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     return xrpl::getCanDelete(sqlDb_);
 }
@@ -60,7 +60,7 @@ SHAMapStoreImp::SavedStateDB::getCanDelete()
 LedgerIndex
 SHAMapStoreImp::SavedStateDB::setCanDelete(LedgerIndex canDelete)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     return xrpl::setCanDelete(sqlDb_, canDelete);
 }
@@ -68,7 +68,7 @@ SHAMapStoreImp::SavedStateDB::setCanDelete(LedgerIndex canDelete)
 SavedState
 SHAMapStoreImp::SavedStateDB::getState()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     return xrpl::getSavedState(sqlDb_);
 }
@@ -76,14 +76,14 @@ SHAMapStoreImp::SavedStateDB::getState()
 void
 SHAMapStoreImp::SavedStateDB::setState(SavedState const& state)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     xrpl::setSavedState(sqlDb_, state);
 }
 
 void
 SHAMapStoreImp::SavedStateDB::setLastRotated(LedgerIndex seq)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     xrpl::setLastRotated(sqlDb_, seq);
 }
 
@@ -209,7 +209,7 @@ void
 SHAMapStoreImp::onLedgerClosed(std::shared_ptr<Ledger const> const& ledger)
 {
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         newLedger_ = ledger;
         working_ = true;
     }
@@ -240,7 +240,7 @@ SHAMapStoreImp::copyNode(std::uint64_t& nodeCount, SHAMapTreeNode const& node)
         node.getHash().as_uint256(), 0, NodeStore::FetchType::synchronous, true);
     if ((++nodeCount % checkHealthInterval_) == 0u)
     {
-        if (healthWait() == stopping)
+        if (healthWait() == HealthResult::stopping)
             return false;
     }
 
@@ -290,7 +290,7 @@ SHAMapStoreImp::run()
         }
 
         bool const readyToRotate = validatedSeq >= lastRotated + deleteInterval_ &&
-            canDelete_ >= lastRotated - 1 && healthWait() == keepGoing;
+            canDelete_ >= lastRotated - 1 && healthWait() == HealthResult::keepGoing;
 
         // will delete up to (not including) lastRotated
         if (readyToRotate)
@@ -302,7 +302,7 @@ SHAMapStoreImp::run()
                                   << ledgerMaster_->getValidatedLedgerAge().count() << 's';
 
             clearPrior(lastRotated);
-            if (healthWait() == stopping)
+            if (healthWait() == HealthResult::stopping)
                 return;
 
             JLOG(journal_.debug()) << "copying ledger " << validatedSeq;
@@ -324,7 +324,7 @@ SHAMapStoreImp::run()
                 continue;
             }
 
-            if (healthWait() == stopping)
+            if (healthWait() == HealthResult::stopping)
                 return;
             // Only log if we completed without a "health" abort
             JLOG(journal_.debug())
@@ -332,7 +332,7 @@ SHAMapStoreImp::run()
 
             JLOG(journal_.debug()) << "freshening caches";
             freshenCaches();
-            if (healthWait() == stopping)
+            if (healthWait() == HealthResult::stopping)
                 return;
             // Only log if we completed without a "health" abort
             JLOG(journal_.debug()) << validatedSeq << " freshened caches";
@@ -342,7 +342,7 @@ SHAMapStoreImp::run()
             JLOG(journal_.debug()) << validatedSeq << " new backend " << newBackend->getName();
 
             clearCaches(validatedSeq);
-            if (healthWait() == stopping)
+            if (healthWait() == HealthResult::stopping)
                 return;
 
             lastRotated = validatedSeq;
@@ -506,7 +506,7 @@ SHAMapStoreImp::clearSql(
         min = *m;
     }
 
-    if (min > lastRotated || healthWait() == stopping)
+    if (min > lastRotated || healthWait() == HealthResult::stopping)
         return;
     if (min == lastRotated)
     {
@@ -525,11 +525,11 @@ SHAMapStoreImp::clearSql(
         deleteBeforeSeq(min);
         JLOG(journal_.trace()) << "End: Delete up to " << deleteBatch_ << " rows with LedgerSeq < "
                                << min << " from: " << TableName;
-        if (healthWait() == stopping)
+        if (healthWait() == HealthResult::stopping)
             return;
         if (min < lastRotated)
             std::this_thread::sleep_for(backOff_);
-        if (healthWait() == stopping)
+        if (healthWait() == HealthResult::stopping)
             return;
     }
     JLOG(journal_.debug()) << "finished deleting from: " << TableName;
@@ -563,7 +563,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
     JLOG(journal_.trace()) << "Begin: Clear internal ledgers up to " << lastRotated;
     ledgerMaster_->clearPriorLedgers(lastRotated);
     JLOG(journal_.trace()) << "End: Clear internal ledgers up to " << lastRotated;
-    if (healthWait() == stopping)
+    if (healthWait() == HealthResult::stopping)
         return;
 
     auto& db = app_.getRelationalDatabase();
@@ -573,7 +573,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "Ledgers",
         [&db]() -> std::optional<LedgerIndex> { return db.getMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteBeforeLedgerSeq(min); });
-    if (healthWait() == stopping)
+    if (healthWait() == HealthResult::stopping)
         return;
 
     if (!app_.config().useTxTables())
@@ -584,7 +584,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "Transactions",
         [&db]() -> std::optional<LedgerIndex> { return db.getTransactionsMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteTransactionsBeforeLedgerSeq(min); });
-    if (healthWait() == stopping)
+    if (healthWait() == HealthResult::stopping)
         return;
 
     clearSql(
@@ -592,7 +592,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "AccountTransactions",
         [&db]() -> std::optional<LedgerIndex> { return db.getAccountTransactionsMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteAccountTransactionsBeforeLedgerSeq(min); });
-    if (healthWait() == stopping)
+    if (healthWait() == HealthResult::stopping)
         return;
 }
 
@@ -615,7 +615,7 @@ SHAMapStoreImp::healthWait()
         lock.lock();
     }
 
-    return stop_ ? stopping : keepGoing;
+    return stop_ ? HealthResult::stopping : HealthResult::keepGoing;
 }
 
 void
@@ -624,7 +624,7 @@ SHAMapStoreImp::stop()
     if (thread_.joinable())
     {
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             stop_ = true;
             cond_.notify_one();
         }
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.h b/src/xrpld/app/misc/SHAMapStoreImp.h
index 08e3dd70eb..22cb06c0e4 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.h
+++ b/src/xrpld/app/misc/SHAMapStoreImp.h
@@ -170,7 +170,7 @@ private:
         for (auto const& key : cache.getKeys())
         {
             dbRotating_->fetchNodeObject(key, 0, NodeStore::FetchType::synchronous, true);
-            if (!(++check % checkHealthInterval_) && healthWait() == stopping)
+            if (!(++check % checkHealthInterval_) && healthWait() == HealthResult::stopping)
                 return true;
         }
 
@@ -201,7 +201,7 @@ private:
      *
      * @return Whether the server is stopping.
      */
-    enum HealthResult { stopping, keepGoing };
+    enum class HealthResult { stopping, keepGoing };
     [[nodiscard]] HealthResult
     healthWait();
 
diff --git a/src/xrpld/app/misc/Transaction.h b/src/xrpld/app/misc/Transaction.h
index 40e0a3d10d..43ef2094fe 100644
--- a/src/xrpld/app/misc/Transaction.h
+++ b/src/xrpld/app/misc/Transaction.h
@@ -23,7 +23,7 @@ namespace xrpl {
 class Application;
 class Rules;
 
-enum TransStatus {
+enum class TransStatus {
     NEW = 0,         // just received / generated
     INVALID = 1,     // no valid signature, insufficient funds
     INCLUDED = 2,    // added to the current ledger
@@ -369,7 +369,7 @@ private:
     LedgerIndex mLedgerIndex = 0;
     std::optional<uint32_t> mTxnSeq;
     std::optional<uint32_t> mNetworkID;
-    TransStatus mStatus = INVALID;
+    TransStatus mStatus = TransStatus::INVALID;
     TER mResult = temUNCERTAIN;
     /* Note that all access to mApplying are made by NetworkOPsImp,
         and must be done under that class's lock. This avoids the overhead of
diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h
index ce32755db1..c3dddd12ba 100644
--- a/src/xrpld/app/misc/TxQ.h
+++ b/src/xrpld/app/misc/TxQ.h
@@ -344,7 +344,7 @@ private:
     SeqProxy
     nextQueuableSeqImpl(
         std::shared_ptr<SLE const> const& sleAccount,
-        std::lock_guard<std::mutex> const&) const;
+        std::scoped_lock<std::mutex> const&) const;
 
     /**
         Track and use the fee escalation metrics of the
@@ -701,7 +701,7 @@ private:
         OpenView& view,
         ApplyFlags flags,
         FeeMetrics::Snapshot const& metricsSnapshot,
-        std::lock_guard<std::mutex> const& lock);
+        std::scoped_lock<std::mutex> const& lock);
 
     // Helper function for TxQ::apply.  If a transaction's fee is high enough,
     // attempt to directly apply that transaction to the ledger.
@@ -785,7 +785,7 @@ private:
         std::shared_ptr<SLE const> const& sleAccount,
         AccountMap::iterator const&,
         std::optional<TxQAccount::TxMap::iterator> const&,
-        std::lock_guard<std::mutex> const& lock);
+        std::scoped_lock<std::mutex> const& lock);
 
     /// Erase and return the next entry in byFee_ (lower fee level)
     FeeMultiSet::iterator_type erase(FeeMultiSet::const_iterator_type);
diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h
index 2c7900465c..ee6f14ed4c 100644
--- a/src/xrpld/app/misc/ValidatorList.h
+++ b/src/xrpld/app/misc/ValidatorList.h
@@ -207,7 +207,7 @@ class ValidatorList
     boost::filesystem::path const dataPath_;
     beast::Journal const j_;
     std::shared_mutex mutable mutex_;
-    using lock_guard = std::lock_guard<decltype(mutex_)>;
+    using scoped_lock = std::scoped_lock<decltype(mutex_)>;
     using shared_lock = std::shared_lock<decltype(mutex_)>;
 
     std::atomic<std::size_t> quorum_;
@@ -759,7 +759,7 @@ private:
         std::uint32_t version,
         std::string siteUri,
         std::optional<uint256> const& hash,
-        lock_guard const&);
+        scoped_lock const&);
 
     // This function updates the keyListings_ counts for all the trusted
     // master keys
@@ -768,7 +768,7 @@ private:
         PublicKey const& pubKey,
         PublisherList const& current,
         std::vector<PublicKey> const& oldList,
-        lock_guard const&);
+        scoped_lock const&);
 
     static void
     buildBlobInfos(
@@ -804,7 +804,7 @@ private:
     /** Get the filename used for caching UNLs
      */
     boost::filesystem::path
-    getCacheFileName(lock_guard const&, PublicKey const& pubKey) const;
+    getCacheFileName(scoped_lock const&, PublicKey const& pubKey) const;
 
     /** Build a Json representation of the collection, suitable for
         writing to a cache file, or serving to a /vl/ query
@@ -836,7 +836,7 @@ private:
     /** Write a JSON UNL to a cache file
      */
     void
-    cacheValidatorFile(lock_guard const& lock, PublicKey const& pubKey) const;
+    cacheValidatorFile(scoped_lock const& lock, PublicKey const& pubKey) const;
 
     /** Check response for trusted valid published list
 
@@ -848,7 +848,7 @@ private:
     */
     std::pair<ListDisposition, std::optional<PublicKey>>
     verify(
-        lock_guard const&,
+        scoped_lock const&,
         Json::Value& list,
         Manifest manifest,
         std::string const& blob,
@@ -865,7 +865,7 @@ private:
         Calling public member function is expected to lock mutex
     */
     bool
-    removePublisherList(lock_guard const&, PublicKey const& publisherKey, PublisherStatus reason);
+    removePublisherList(scoped_lock const&, PublicKey const& publisherKey, PublisherStatus reason);
 
     /** Return quorum for trusted validator set
 
diff --git a/src/xrpld/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h
index ab82ae168d..308b8f72bc 100644
--- a/src/xrpld/app/misc/ValidatorSite.h
+++ b/src/xrpld/app/misc/ValidatorSite.h
@@ -177,12 +177,12 @@ public:
 private:
     /// Load configured site URIs.
     bool
-    load(std::vector<std::string> const& siteURIs, std::lock_guard<std::mutex> const&);
+    load(std::vector<std::string> const& siteURIs, std::scoped_lock<std::mutex> const&);
 
     /// Queue next site to be fetched
     /// lock over site_mutex_ and state_mutex_ required
     void
-    setTimer(std::lock_guard<std::mutex> const&, std::lock_guard<std::mutex> const&);
+    setTimer(std::scoped_lock<std::mutex> const&, std::scoped_lock<std::mutex> const&);
 
     /// request took too long
     void
@@ -210,7 +210,7 @@ private:
     makeRequest(
         std::shared_ptr<Site::Resource> resource,
         std::size_t siteIdx,
-        std::lock_guard<std::mutex> const&);
+        std::scoped_lock<std::mutex> const&);
 
     /// Parse json response from validator list site.
     /// lock over sites_mutex_ required
@@ -218,7 +218,7 @@ private:
     parseJsonResponse(
         std::string const& res,
         std::size_t siteIdx,
-        std::lock_guard<std::mutex> const&);
+        std::scoped_lock<std::mutex> const&);
 
     /// Interpret a redirect response.
     /// lock over sites_mutex_ required
@@ -226,12 +226,12 @@ private:
     processRedirect(
         detail::response_type const& res,
         std::size_t siteIdx,
-        std::lock_guard<std::mutex> const&);
+        std::scoped_lock<std::mutex> const&);
 
     /// If no sites are provided, or a site fails to load,
     /// get a list of local cache files from the ValidatorList.
     bool
-    missingSite(std::lock_guard<std::mutex> const&);
+    missingSite(std::scoped_lock<std::mutex> const&);
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index 65342dac2f..1eee034a16 100644
--- a/src/xrpld/app/misc/detail/AmendmentTable.cpp
+++ b/src/xrpld/app/misc/detail/AmendmentTable.cpp
@@ -126,7 +126,7 @@ public:
     //
     // Call with AmendmentTable::mutex_ locked.
     void
-    trustChanged(hash_set<PublicKey> const& allTrusted, std::lock_guard<std::mutex> const& lock)
+    trustChanged(hash_set<PublicKey> const& allTrusted, std::scoped_lock<std::mutex> const& lock)
     {
         decltype(recordedVotes_) newRecordedVotes;
         newRecordedVotes.reserve(allTrusted.size());
@@ -162,7 +162,7 @@ public:
         std::vector<std::shared_ptr<STValidation>> const& valSet,
         NetClock::time_point const closeTime,
         beast::Journal j,
-        std::lock_guard<std::mutex> const& lock)
+        std::scoped_lock<std::mutex> const& lock)
     {
         // When we get an STValidation we save the upVotes it contains, but
         // we also set an expiration for those upVotes.  The following constant
@@ -259,7 +259,7 @@ public:
     //
     // Call with AmendmentTable::mutex_ locked.
     [[nodiscard]] std::pair<int, hash_map<uint256, int>>
-    getVotes(Rules const& rules, std::lock_guard<std::mutex> const& lock) const
+    getVotes(Rules const& rules, std::scoped_lock<std::mutex> const& lock) const
     {
         hash_map<uint256, int> ret;
         int available = 0;
@@ -319,7 +319,7 @@ public:
     AmendmentSet(
         Rules const& rules,
         TrustedVotes const& trustedVotes,
-        std::lock_guard<std::mutex> const& lock)
+        std::scoped_lock<std::mutex> const& lock)
     {
         // process validations for ledger before flag ledger.
         auto [trustedCount, newVotes] = trustedVotes.getVotes(rules, lock);
@@ -415,14 +415,14 @@ private:
 
     // Finds or creates state.  Must be called with mutex_ locked.
     AmendmentState&
-    add(uint256 const& amendment, std::lock_guard<std::mutex> const& lock);
+    add(uint256 const& amendment, std::scoped_lock<std::mutex> const& lock);
 
     // Finds existing state.  Must be called with mutex_ locked.
     AmendmentState*
-    get(uint256 const& amendment, std::lock_guard<std::mutex> const& lock);
+    get(uint256 const& amendment, std::scoped_lock<std::mutex> const& lock);
 
     AmendmentState const*
-    get(uint256 const& amendment, std::lock_guard<std::mutex> const& lock) const;
+    get(uint256 const& amendment, std::scoped_lock<std::mutex> const& lock) const;
 
     // Injects amendment json into v.  Must be called with mutex_ locked.
     void
@@ -431,7 +431,7 @@ private:
         uint256 const& amendment,
         AmendmentState const& state,
         bool isAdmin,
-        std::lock_guard<std::mutex> const& lock) const;
+        std::scoped_lock<std::mutex> const& lock) const;
 
     void
     persistVote(uint256 const& amendment, std::string const& name, AmendmentVote vote) const;
@@ -510,7 +510,7 @@ AmendmentTableImpl::AmendmentTableImpl(
     beast::Journal journal)
     : majorityTime_(majorityTime), j_(journal), db_(registry.getWalletDB())
 {
-    std::lock_guard lock(mutex_);
+    std::scoped_lock lock(mutex_);
 
     // Find out if the FeatureVotes table exists in WalletDB
     bool const featureVotesExist = [this]() {
@@ -633,21 +633,21 @@ AmendmentTableImpl::AmendmentTableImpl(
 }
 
 AmendmentState&
-AmendmentTableImpl::add(uint256 const& amendmentHash, std::lock_guard<std::mutex> const&)
+AmendmentTableImpl::add(uint256 const& amendmentHash, std::scoped_lock<std::mutex> const&)
 {
     // call with the mutex held
     return amendmentMap_[amendmentHash];
 }
 
 AmendmentState*
-AmendmentTableImpl::get(uint256 const& amendmentHash, std::lock_guard<std::mutex> const& lock)
+AmendmentTableImpl::get(uint256 const& amendmentHash, std::scoped_lock<std::mutex> const& lock)
 {
     // Forward to the const version of get.
     return const_cast<AmendmentState*>(std::as_const(*this).get(amendmentHash, lock));
 }
 
 AmendmentState const*
-AmendmentTableImpl::get(uint256 const& amendmentHash, std::lock_guard<std::mutex> const&) const
+AmendmentTableImpl::get(uint256 const& amendmentHash, std::scoped_lock<std::mutex> const&) const
 {
     // call with the mutex held
     auto ret = amendmentMap_.find(amendmentHash);
@@ -661,7 +661,7 @@ AmendmentTableImpl::get(uint256 const& amendmentHash, std::lock_guard<std::mutex
 uint256
 AmendmentTableImpl::find(std::string const& name) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     for (auto const& e : amendmentMap_)
     {
@@ -688,7 +688,7 @@ AmendmentTableImpl::persistVote(
 bool
 AmendmentTableImpl::veto(uint256 const& amendment)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     AmendmentState& s = add(amendment, lock);
 
     if (s.vote != AmendmentVote::up)
@@ -701,7 +701,7 @@ AmendmentTableImpl::veto(uint256 const& amendment)
 bool
 AmendmentTableImpl::unVeto(uint256 const& amendment)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     AmendmentState* const s = get(amendment, lock);
 
     if ((s == nullptr) || s->vote != AmendmentVote::down)
@@ -714,7 +714,7 @@ AmendmentTableImpl::unVeto(uint256 const& amendment)
 bool
 AmendmentTableImpl::enable(uint256 const& amendment)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     AmendmentState& s = add(amendment, lock);
 
     if (s.enabled)
@@ -734,7 +734,7 @@ AmendmentTableImpl::enable(uint256 const& amendment)
 bool
 AmendmentTableImpl::isEnabled(uint256 const& amendment) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     AmendmentState const* s = get(amendment, lock);
     return (s != nullptr) && s->enabled;
 }
@@ -742,7 +742,7 @@ AmendmentTableImpl::isEnabled(uint256 const& amendment) const
 bool
 AmendmentTableImpl::isSupported(uint256 const& amendment) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     AmendmentState const* s = get(amendment, lock);
     return (s != nullptr) && s->supported;
 }
@@ -750,14 +750,14 @@ AmendmentTableImpl::isSupported(uint256 const& amendment) const
 bool
 AmendmentTableImpl::hasUnsupportedEnabled() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return unsupportedEnabled_;
 }
 
 std::optional<NetClock::time_point>
 AmendmentTableImpl::firstUnsupportedExpected() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return firstUnsupportedExpected_;
 }
 
@@ -769,7 +769,7 @@ AmendmentTableImpl::doValidation(std::set<uint256> const& enabled) const
     std::vector<uint256> amendments;
 
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         amendments.reserve(amendmentMap_.size());
         for (auto const& e : amendmentMap_)
         {
@@ -807,7 +807,7 @@ AmendmentTableImpl::doVoting(
                      << enabledAmendments.size() << ", " << majorityAmendments.size() << ", "
                      << valSet.size();
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     // Keep a record of the votes we received.
     previousTrustedVotes_.recordVotes(rules, valSet, closeTime, j_, lock);
@@ -889,7 +889,7 @@ AmendmentTableImpl::doVoting(
 bool
 AmendmentTableImpl::needValidatedLedger(LedgerIndex ledgerSeq) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     // Is there a ledger in which an amendment could have been enabled
     // between these two ledger sequences?
@@ -906,7 +906,7 @@ AmendmentTableImpl::doValidatedLedger(
     for (auto& e : enabled)
         enable(e);
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     // Remember the ledger sequence of this update.
     lastUpdateSeq_ = ledgerSeq;
@@ -937,7 +937,7 @@ AmendmentTableImpl::doValidatedLedger(
 void
 AmendmentTableImpl::trustChanged(hash_set<PublicKey> const& allTrusted)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     previousTrustedVotes_.trustChanged(allTrusted, lock);
 }
 
@@ -947,7 +947,7 @@ AmendmentTableImpl::injectJson(
     uint256 const& id,
     AmendmentState const& fs,
     bool isAdmin,
-    std::lock_guard<std::mutex> const&) const
+    std::scoped_lock<std::mutex> const&) const
 {
     if (!fs.name.empty())
         v[jss::name] = fs.name;
@@ -985,7 +985,7 @@ AmendmentTableImpl::getJson(bool isAdmin) const
 {
     Json::Value ret(Json::objectValue);
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         for (auto const& e : amendmentMap_)
         {
             injectJson(
@@ -1001,7 +1001,7 @@ AmendmentTableImpl::getJson(uint256 const& amendmentID, bool isAdmin) const
     Json::Value ret = Json::objectValue;
 
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         AmendmentState const* a = get(amendmentID, lock);
         if (a != nullptr)
         {
diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp
index 758f560835..34a9613171 100644
--- a/src/xrpld/app/misc/detail/Transaction.cpp
+++ b/src/xrpld/app/misc/detail/Transaction.cpp
@@ -48,7 +48,7 @@ Transaction::Transaction(
         return;
     }
 
-    mStatus = NEW;
+    mStatus = TransStatus::NEW;
 }
 
 //
@@ -78,22 +78,22 @@ Transaction::sqlTransactionStatus(boost::optional<std::string> const& status)
     switch (static_cast<TxnSql>(c))
     {
         case TxnSql::txnSqlNew:
-            return NEW;
+            return TransStatus::NEW;
         case TxnSql::txnSqlConflict:
-            return CONFLICTED;
+            return TransStatus::CONFLICTED;
         case TxnSql::txnSqlHeld:
-            return HELD;
+            return TransStatus::HELD;
         case TxnSql::txnSqlValidated:
-            return COMMITTED;
+            return TransStatus::COMMITTED;
         case TxnSql::txnSqlIncluded:
-            return INCLUDED;
+            return TransStatus::INCLUDED;
         default:
             XRPL_ASSERT(
                 c == TxnSql::txnSqlUnknown,
                 "xrpl::Transaction::sqlTransactionStatus : unknown transaction status");
     }
 
-    return INVALID;
+    return TransStatus::INVALID;
 }
 
 Transaction::pointer
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index dde0988b4a..3e4a420e48 100644
--- a/src/xrpld/app/misc/detail/TxQ.cpp
+++ b/src/xrpld/app/misc/detail/TxQ.cpp
@@ -390,7 +390,7 @@ TxQ::canBeHeld(
     std::shared_ptr<SLE const> const& sleAccount,
     AccountMap::iterator const& accountIter,
     std::optional<TxQAccount::TxMap::iterator> const& replacementIter,
-    std::lock_guard<std::mutex> const& lock)
+    std::scoped_lock<std::mutex> const& lock)
 {
     // PreviousTxnID is deprecated and should never be used.
     // AccountTxnID is not supported by the transaction
@@ -775,7 +775,7 @@ TxQ::apply(
         return {terPRE_TICKET, false};
     }
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     // accountIter is not const because it may be updated further down.
     AccountMap::iterator accountIter = byAccount_.find(account);
@@ -1332,7 +1332,7 @@ TxQ::apply(
 void
 TxQ::processClosedLedger(Application& app, ReadView const& view, bool timeLeap)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     feeMetrics_.update(app, view, timeLeap, setup_);
     auto const& snapshot = feeMetrics_.getSnapshot();
@@ -1411,7 +1411,7 @@ TxQ::accept(Application& app, OpenView& view)
 
     auto ledgerChanged = false;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto const metricsSnapshot = feeMetrics_.getSnapshot();
 
@@ -1575,7 +1575,7 @@ TxQ::accept(Application& app, OpenView& view)
 SeqProxy
 TxQ::nextQueuableSeq(std::shared_ptr<SLE const> const& sleAccount) const
 {
-    std::lock_guard<std::mutex> const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return nextQueuableSeqImpl(sleAccount, lock);
 }
 
@@ -1588,7 +1588,7 @@ TxQ::nextQueuableSeq(std::shared_ptr<SLE const> const& sleAccount) const
 SeqProxy
 TxQ::nextQueuableSeqImpl(
     std::shared_ptr<SLE const> const& sleAccount,
-    std::lock_guard<std::mutex> const&) const
+    std::scoped_lock<std::mutex> const&) const
 {
     // If the account is not in the ledger or a non-account was passed
     // then return zero.  We have no idea.
@@ -1637,7 +1637,7 @@ TxQ::getRequiredFeeLevel(
     OpenView& view,
     ApplyFlags flags,
     FeeMetrics::Snapshot const& metricsSnapshot,
-    std::lock_guard<std::mutex> const& lock)
+    std::scoped_lock<std::mutex> const& lock)
 {
     return FeeMetrics::scaleFeeLevel(metricsSnapshot, view);
 }
@@ -1666,7 +1666,7 @@ TxQ::tryDirectApply(
         return {};
 
     FeeLevel64 const requiredFeeLevel = [this, &view, flags]() {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return getRequiredFeeLevel(view, flags, feeMetrics_.getSnapshot(), lock);
     }();
 
@@ -1690,7 +1690,7 @@ TxQ::tryDirectApply(
         {
             // If the applied transaction replaced a transaction in the
             // queue then remove the replaced transaction.
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
 
             AccountMap::iterator const accountIter = byAccount_.find(account);
             if (accountIter != byAccount_.end())
@@ -1739,7 +1739,7 @@ TxQ::getMetrics(OpenView const& view) const
 {
     Metrics result;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto const snapshot = feeMetrics_.getSnapshot();
 
@@ -1760,7 +1760,7 @@ TxQ::getTxRequiredFeeAndSeq(OpenView const& view, std::shared_ptr<STTx const> co
 {
     auto const account = (*tx)[sfAccount];
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto const snapshot = feeMetrics_.getSnapshot();
     auto const baseFee = calculateBaseFee(view, *tx);
@@ -1782,7 +1782,7 @@ TxQ::getAccountTxs(AccountID const& account) const
 {
     std::vector<TxDetails> result;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     AccountMap::const_iterator const accountIter{byAccount_.find(account)};
 
@@ -1802,7 +1802,7 @@ TxQ::getTxs() const
 {
     std::vector<TxDetails> result;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     result.reserve(byFee_.size());
 
diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp
index 8a62a71972..b9a32f1463 100644
--- a/src/xrpld/app/misc/detail/ValidatorList.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorList.cpp
@@ -169,7 +169,7 @@ ValidatorList::load(
         ")?"                 // end optional comment block
     );
 
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
 
     JLOG(j_.debug()) << "Loading configured trusted validator list publisher keys";
 
@@ -289,7 +289,7 @@ ValidatorList::load(
 }
 
 boost::filesystem::path
-ValidatorList::getCacheFileName(ValidatorList::lock_guard const&, PublicKey const& pubKey) const
+ValidatorList::getCacheFileName(ValidatorList::scoped_lock const&, PublicKey const& pubKey) const
 {
     return dataPath_ / (filePrefix_ + strHex(pubKey));
 }
@@ -366,7 +366,7 @@ ValidatorList::buildFileData(
 }
 
 void
-ValidatorList::cacheValidatorFile(ValidatorList::lock_guard const& lock, PublicKey const& pubKey)
+ValidatorList::cacheValidatorFile(ValidatorList::scoped_lock const& lock, PublicKey const& pubKey)
     const
 {
     if (dataPath_.empty())
@@ -982,7 +982,7 @@ ValidatorList::applyLists(
         1)
         return PublisherListStats{ListDisposition::unsupported_version};
 
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
 
     PublisherListStats result;
     for (auto const& blobInfo : blobs)
@@ -1052,7 +1052,7 @@ ValidatorList::updatePublisherList(
     PublicKey const& pubKey,
     PublisherList const& current,
     std::vector<PublicKey> const& oldList,
-    ValidatorList::lock_guard const&)
+    ValidatorList::scoped_lock const&)
 {
     // Update keyListings_ for added and removed keys
     std::vector<PublicKey> const& publisherList = current.list;
@@ -1121,7 +1121,7 @@ ValidatorList::applyList(
     std::uint32_t version,
     std::string siteUri,
     std::optional<uint256> const& hash,
-    ValidatorList::lock_guard const& lock)
+    ValidatorList::scoped_lock const& lock)
 {
     using namespace std::string_literals;
 
@@ -1286,7 +1286,7 @@ ValidatorList::loadLists()
     using namespace boost::filesystem;
     using namespace boost::system::errc;
 
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
 
     std::vector<std::string> sites;
     sites.reserve(publisherLists_.size());
@@ -1336,7 +1336,7 @@ ValidatorList::loadLists()
 // contain the default-constructed public keys
 std::pair<ListDisposition, std::optional<PublicKey>>
 ValidatorList::verify(
-    ValidatorList::lock_guard const& lock,
+    ValidatorList::scoped_lock const& lock,
     Json::Value& list,
     Manifest manifest,
     std::string const& blob,
@@ -1494,7 +1494,7 @@ ValidatorList::localPublicKey() const
 
 bool
 ValidatorList::removePublisherList(
-    ValidatorList::lock_guard const&,
+    ValidatorList::scoped_lock const&,
     PublicKey const& publisherKey,
     PublisherStatus reason)
 {
@@ -1901,7 +1901,7 @@ ValidatorList::updateTrusted(
     if (timeKeeper_.now() > closeTime + 30s)
         closeTime = timeKeeper_.now();
 
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
 
     // Rotate pending and remove expired published lists
     bool good = true;
@@ -2095,7 +2095,7 @@ ValidatorList::getNegativeUNL() const
 void
 ValidatorList::setNegativeUNL(hash_set<PublicKey> const& negUnl)
 {
-    std::lock_guard const lock{mutex_};
+    std::scoped_lock const lock{mutex_};
     negativeUNL_ = negUnl;
 }
 
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index 557a4e4f25..4c05ce5f09 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -130,7 +130,7 @@ ValidatorSite::~ValidatorSite()
 }
 
 bool
-ValidatorSite::missingSite(std::lock_guard<std::mutex> const& lock_sites)
+ValidatorSite::missingSite(std::scoped_lock<std::mutex> const& lock_sites)
 {
     auto const sites = app_.getValidators().loadLists();
     return sites.empty() || load(sites, lock_sites);
@@ -141,7 +141,7 @@ ValidatorSite::load(std::vector<std::string> const& siteURIs)
 {
     JLOG(j_.debug()) << "Loading configured validator list sites";
 
-    std::lock_guard const lock{sites_mutex_};
+    std::scoped_lock const lock{sites_mutex_};
 
     return load(siteURIs, lock);
 }
@@ -149,7 +149,7 @@ ValidatorSite::load(std::vector<std::string> const& siteURIs)
 bool
 ValidatorSite::load(
     std::vector<std::string> const& siteURIs,
-    std::lock_guard<std::mutex> const& lock_sites)
+    std::scoped_lock<std::mutex> const& lock_sites)
 {
     // If no sites are provided, act as if a site failed to load.
     if (siteURIs.empty())
@@ -178,8 +178,8 @@ ValidatorSite::load(
 void
 ValidatorSite::start()
 {
-    std::lock_guard const l0{sites_mutex_};
-    std::lock_guard const l1{state_mutex_};
+    std::scoped_lock const l0{sites_mutex_};
+    std::scoped_lock const l1{state_mutex_};
     if (timer_.expiry() == clock_type::time_point{})
         setTimer(l0, l1);
 }
@@ -219,8 +219,8 @@ ValidatorSite::stop()
 
 void
 ValidatorSite::setTimer(
-    std::lock_guard<std::mutex> const& site_lock,
-    std::lock_guard<std::mutex> const& state_lock)
+    std::scoped_lock<std::mutex> const& site_lock,
+    std::scoped_lock<std::mutex> const& state_lock)
 {
     auto next = std::ranges::min_element(
         sites_, [](Site const& a, Site const& b) { return a.nextRefresh < b.nextRefresh; });
@@ -240,13 +240,13 @@ void
 ValidatorSite::makeRequest(
     std::shared_ptr<Site::Resource> resource,
     std::size_t siteIdx,
-    std::lock_guard<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sites_lock)
 {
     fetching_ = true;
     sites_[siteIdx].activeResource = resource;
     std::shared_ptr<detail::Work> sp;
     auto timeoutCancel = [this]() {
-        std::lock_guard const lock_state{state_mutex_};
+        std::scoped_lock const lock_state{state_mutex_};
         // docs indicate cancel_one() can throw, but this
         // should be reconsidered if it changes to noexcept
         try
@@ -312,7 +312,7 @@ ValidatorSite::makeRequest(
     sp->run();
     // start a timer for the request, which shouldn't take more
     // than requestTimeout_ to complete
-    std::lock_guard const lock_state{state_mutex_};
+    std::scoped_lock const lock_state{state_mutex_};
     timer_.expires_after(requestTimeout_);
     timer_.async_wait([this, siteIdx](boost::system::error_code const& ec) {
         this->onRequestTimeout(siteIdx, ec);
@@ -326,7 +326,7 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
         return;
 
     {
-        std::lock_guard const lock_site{sites_mutex_};
+        std::scoped_lock const lock_site{sites_mutex_};
         // In some circumstances, both this function and the response
         // handler (onSiteFetch or onTextFetch) can get queued and
         // processed. In all observed cases, the response handler
@@ -343,7 +343,7 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
                                 "already been processed";
     }
 
-    std::lock_guard const lock_state{state_mutex_};
+    std::scoped_lock const lock_state{state_mutex_};
     if (auto sp = work_.lock())
         sp->cancel();
 }
@@ -362,7 +362,7 @@ ValidatorSite::onTimer(std::size_t siteIdx, error_code const& ec)
 
     try
     {
-        std::lock_guard const lock{sites_mutex_};
+        std::scoped_lock const lock{sites_mutex_};
         sites_[siteIdx].nextRefresh = clock_type::now() + sites_[siteIdx].refreshInterval;
         sites_[siteIdx].redirCount = 0;
         // the WorkSSL client ctor can throw if SSL init fails
@@ -383,7 +383,7 @@ void
 ValidatorSite::parseJsonResponse(
     std::string const& res,
     std::size_t siteIdx,
-    std::lock_guard<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sites_lock)
 {
     Json::Value const body = [&res, siteIdx, this]() {
         Json::Reader r;
@@ -501,7 +501,7 @@ std::shared_ptr<ValidatorSite::Site::Resource>
 ValidatorSite::processRedirect(
     detail::response_type const& res,
     std::size_t siteIdx,
-    std::lock_guard<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sites_lock)
 {
     using namespace boost::beast::http;
     std::shared_ptr<Site::Resource> newLocation;
@@ -545,7 +545,7 @@ ValidatorSite::onSiteFetch(
     detail::response_type const& res,
     std::size_t siteIdx)
 {
-    std::lock_guard lock_sites{sites_mutex_};
+    std::scoped_lock lock_sites{sites_mutex_};
     {
         if (endpoint != endpoint_type{})
             sites_[siteIdx].lastRequestEndpoint = endpoint;
@@ -617,7 +617,7 @@ ValidatorSite::onSiteFetch(
         sites_[siteIdx].activeResource.reset();
     }
 
-    std::lock_guard const lock_state{state_mutex_};
+    std::scoped_lock const lock_state{state_mutex_};
     fetching_ = false;
     if (!stopping_)
         setTimer(lock_sites, lock_state);
@@ -630,7 +630,7 @@ ValidatorSite::onTextFetch(
     std::string const& res,
     std::size_t siteIdx)
 {
-    std::lock_guard const lock_sites{sites_mutex_};
+    std::scoped_lock const lock_sites{sites_mutex_};
     {
         try
         {
@@ -657,7 +657,7 @@ ValidatorSite::onTextFetch(
         sites_[siteIdx].activeResource.reset();
     }
 
-    std::lock_guard const lock_state{state_mutex_};
+    std::scoped_lock const lock_state{state_mutex_};
     fetching_ = false;
     if (!stopping_)
         setTimer(lock_sites, lock_state);
@@ -673,7 +673,7 @@ ValidatorSite::getJson() const
     Json::Value jrr(Json::objectValue);
     Json::Value& jSites = (jrr[jss::validator_sites] = Json::arrayValue);
     {
-        std::lock_guard const lock{sites_mutex_};
+        std::scoped_lock const lock{sites_mutex_};
         for (Site const& site : sites_)
         {
             Json::Value& v = jSites.append(Json::objectValue);
diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp
index f1b5f4edc3..c698c7ca76 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/Node.cpp
@@ -249,7 +249,8 @@ saveValidatedLedger(
         Serializer s(128);
         s.add32(HashPrefix::ledgerMaster);
         addRaw(ledger->header(), s);
-        app.getNodeStore().store(hotLEDGER, std::move(s.modData()), ledger->header().hash, seq);
+        app.getNodeStore().store(
+            NodeObjectType::hotLEDGER, std::move(s.modData()), ledger->header().hash, seq);
     }
 
     std::shared_ptr<AcceptedLedger> aLedger;
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index 9edbebd429..32460516bd 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -551,7 +551,7 @@ private:
 
     NetClock::duration closeResolution_ = ledgerDefaultTimeResolution;
 
-    ConsensusParms::AvalancheState closeTimeAvalancheState_ = ConsensusParms::init;
+    ConsensusParms::AvalancheState closeTimeAvalancheState_ = ConsensusParms::AvalancheState::init;
 
     // Time it took for the last consensus round to converge
     std::chrono::milliseconds prevRoundTime_{};
@@ -677,7 +677,7 @@ Consensus<Adaptor>::startRoundInternal(
     previousLedger_ = prevLedger;
     result_.reset();
     convergePercent_ = 0;
-    closeTimeAvalancheState_ = ConsensusParms::init;
+    closeTimeAvalancheState_ = ConsensusParms::AvalancheState::init;
     haveCloseTimeConsensus_ = false;
     openTime_.reset(clock_.now());
     currPeerPositions_.clear();
diff --git a/src/xrpld/consensus/ConsensusParms.h b/src/xrpld/consensus/ConsensusParms.h
index c8b79c4de9..7b9ec5dcff 100644
--- a/src/xrpld/consensus/ConsensusParms.h
+++ b/src/xrpld/consensus/ConsensusParms.h
@@ -106,7 +106,7 @@ struct ConsensusParms
     // As a function of the percent this round's duration is of the prior round,
     // we increase the threshold for yes votes to add a transaction to our
     // position.
-    enum AvalancheState { init, mid, late, stuck };
+    enum class AvalancheState { init, mid, late, stuck };
     struct AvalancheCutoff
     {
         int const consensusTime;
@@ -121,14 +121,18 @@ struct ConsensusParms
     std::map<AvalancheState, AvalancheCutoff> const avalancheCutoffs{
         // {state, {time, percent, nextState}},
         // Initial state: 50% of nodes must vote yes
-        {init, {.consensusTime = 0, .consensusPct = 50, .next = mid}},
+        {AvalancheState::init,
+         {.consensusTime = 0, .consensusPct = 50, .next = AvalancheState::mid}},
         // mid-consensus starts after 50% of the previous round time, and
         // requires 65% yes
-        {mid, {.consensusTime = 50, .consensusPct = 65, .next = late}},
+        {AvalancheState::mid,
+         {.consensusTime = 50, .consensusPct = 65, .next = AvalancheState::late}},
         // late consensus starts after 85% time, and requires 70% yes
-        {late, {.consensusTime = 85, .consensusPct = 70, .next = stuck}},
+        {AvalancheState::late,
+         {.consensusTime = 85, .consensusPct = 70, .next = AvalancheState::stuck}},
         // we're stuck after 2x time, requires 95% yes votes
-        {stuck, {.consensusTime = 200, .consensusPct = 95, .next = stuck}},
+        {AvalancheState::stuck,
+         {.consensusTime = 200, .consensusPct = 95, .next = AvalancheState::stuck}},
     };
 
     //! Percentage of nodes required to reach agreement on ledger close time
diff --git a/src/xrpld/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h
index aff4ccae68..4320505d0f 100644
--- a/src/xrpld/consensus/DisputedTx.h
+++ b/src/xrpld/consensus/DisputedTx.h
@@ -185,7 +185,7 @@ private:
     //! The number of rounds we've gone without changing our vote
     std::size_t currentVoteCounter_ = 0;
     //! Which minimum acceptance percentage phase we are currently in
-    ConsensusParms::AvalancheState avalancheState_ = ConsensusParms::init;
+    ConsensusParms::AvalancheState avalancheState_ = ConsensusParms::AvalancheState::init;
     //! How long we have been in the current acceptance phase
     std::size_t avalancheCounter_ = 0;
     beast::Journal const j_;
diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h
index 46b0ef0b32..5edb1db77f 100644
--- a/src/xrpld/consensus/Validations.h
+++ b/src/xrpld/consensus/Validations.h
@@ -334,7 +334,7 @@ class Validations
 private:
     // Remove support of a validated ledger
     void
-    removeTrie(std::lock_guard<Mutex> const&, NodeID const& nodeID, Validation const& val)
+    removeTrie(std::scoped_lock<Mutex> const&, NodeID const& nodeID, Validation const& val)
     {
         {
             auto it = acquiring_.find(std::make_pair(val.seq(), val.ledgerID()));
@@ -357,7 +357,7 @@ private:
 
     // Check if any pending acquire ledger requests are complete
     void
-    checkAcquired(std::lock_guard<Mutex> const& lock)
+    checkAcquired(std::scoped_lock<Mutex> const& lock)
     {
         for (auto it = acquiring_.begin(); it != acquiring_.end();)
         {
@@ -377,7 +377,7 @@ private:
 
     // Update the trie to reflect a new validated ledger
     void
-    updateTrie(std::lock_guard<Mutex> const&, NodeID const& nodeID, Ledger ledger)
+    updateTrie(std::scoped_lock<Mutex> const&, NodeID const& nodeID, Ledger ledger)
     {
         auto const [it, inserted] = lastLedger_.emplace(nodeID, ledger);
         if (!inserted)
@@ -403,7 +403,7 @@ private:
     */
     void
     updateTrie(
-        std::lock_guard<Mutex> const& lock,
+        std::scoped_lock<Mutex> const& lock,
         NodeID const& nodeID,
         Validation const& val,
         std::optional<std::pair<Seq, ID>> prior)
@@ -457,7 +457,7 @@ private:
     */
     template <class F>
     auto
-    withTrie(std::lock_guard<Mutex> const& lock, F&& f)
+    withTrie(std::scoped_lock<Mutex> const& lock, F&& f)
     {
         // Call current to flush any stale validations
         current(lock, [](auto) {}, [](auto, auto) {});
@@ -483,7 +483,7 @@ private:
 
     template <class Pre, class F>
     void
-    current(std::lock_guard<Mutex> const& lock, Pre&& pre, F&& f)
+    current(std::scoped_lock<Mutex> const& lock, Pre&& pre, F&& f)
     {
         NetClock::time_point const t = adaptor_.now();
         pre(current_.size());
@@ -520,7 +520,7 @@ private:
     */
     template <class Pre, class F>
     void
-    byLedger(std::lock_guard<Mutex> const&, ID const& ledgerID, Pre&& pre, F&& f)
+    byLedger(std::scoped_lock<Mutex> const&, ID const& ledgerID, Pre&& pre, F&& f)
     {
         auto it = byLedger_.find(ledgerID);
         if (it != byLedger_.end())
@@ -575,7 +575,7 @@ public:
     bool
     canValidateSeq(Seq const s)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return localSeqEnforcer_(byLedger_.clock().now(), s, parms_);
     }
 
@@ -594,7 +594,7 @@ public:
             return ValStatus::stale;
 
         {
-            std::lock_guard const lock{mutex_};
+            std::scoped_lock const lock{mutex_};
 
             // Check that validation sequence is greater than any non-expired
             // validations sequence from that validator; if it's not, perform
@@ -682,7 +682,7 @@ public:
     void
     setSeqToKeep(Seq const& low, Seq const& high)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         XRPL_ASSERT(low < high, "xrpl::Validations::setSeqToKeep : valid inputs");
         toKeep_ = {low, high};
     }
@@ -697,7 +697,7 @@ public:
     {
         auto const start = std::chrono::steady_clock::now();
         {
-            std::lock_guard const lock{mutex_};
+            std::scoped_lock const lock{mutex_};
             if (toKeep_)
             {
                 // We only need to refresh the keep range when it's just about
@@ -754,7 +754,7 @@ public:
     void
     trustChanged(hash_set<NodeID> const& added, hash_set<NodeID> const& removed)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
 
         for (auto& [nodeId, validation] : current_)
         {
@@ -790,7 +790,7 @@ public:
     Json::Value
     getJsonTrie() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return trie_.getJson();
     }
 
@@ -809,7 +809,7 @@ public:
     std::optional<std::pair<Seq, ID>>
     getPreferred(Ledger const& curr)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         std::optional<SpanTip<Ledger>> preferred = withTrie(lock, [this](LedgerTrie<Ledger>& trie) {
             return trie.getPreferred(localSeqEnforcer_.largest());
         });
@@ -921,7 +921,7 @@ public:
     std::size_t
     getNodesAfter(Ledger const& ledger, ID const& ledgerID)
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
 
         // Use trie if ledger is the right one
         if (ledger.id() == ledgerID)
@@ -946,7 +946,7 @@ public:
     currentTrusted()
     {
         std::vector<WrappedValidationType> ret;
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         current(
             lock,
             [&](std::size_t numValidations) { ret.reserve(numValidations); },
@@ -965,7 +965,7 @@ public:
     getCurrentNodeIDs() -> hash_set<NodeID>
     {
         hash_set<NodeID> ret;
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         current(
             lock,
             [&](std::size_t numValidations) { ret.reserve(numValidations); },
@@ -983,7 +983,7 @@ public:
     numTrustedForLedger(ID const& ledgerID)
     {
         std::size_t count = 0;
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         byLedger(
             lock,
             ledgerID,
@@ -1005,7 +1005,7 @@ public:
     getTrustedForLedger(ID const& ledgerID, Seq const& seq)
     {
         std::vector<WrappedValidationType> res;
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         byLedger(
             lock,
             ledgerID,
@@ -1028,7 +1028,7 @@ public:
     fees(ID const& ledgerID, std::uint32_t baseFee)
     {
         std::vector<std::uint32_t> res;
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         byLedger(
             lock,
             ledgerID,
@@ -1055,7 +1055,7 @@ public:
     void
     flush()
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         current_.clear();
     }
 
@@ -1080,7 +1080,7 @@ public:
         std::size_t laggards = 0;
 
         current(
-            std::lock_guard{mutex_},
+            std::scoped_lock{mutex_},
             [](std::size_t) {},
             [&](NodeID const&, Validation const& v) {
                 if (adaptor_.now() < v.seenTime() + parms_.validationFRESHNESS &&
@@ -1098,28 +1098,28 @@ public:
     std::size_t
     sizeOfCurrentCache() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return current_.size();
     }
 
     std::size_t
     sizeOfSeqEnforcersCache() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return seqEnforcers_.size();
     }
 
     std::size_t
     sizeOfByLedgerCache() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return byLedger_.size();
     }
 
     std::size_t
     sizeOfBySequenceCache() const
     {
-        std::lock_guard const lock{mutex_};
+        std::scoped_lock const lock{mutex_};
         return bySequence_.size();
     }
 };
diff --git a/src/xrpld/overlay/detail/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp
index c74a9aa5bd..b15ed1859c 100644
--- a/src/xrpld/overlay/detail/Cluster.cpp
+++ b/src/xrpld/overlay/detail/Cluster.cpp
@@ -29,7 +29,7 @@ Cluster::Cluster(beast::Journal j) : j_(j)
 std::optional<std::string>
 Cluster::member(PublicKey const& identity) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto iter = nodes_.find(identity);
     if (iter == nodes_.end())
@@ -40,7 +40,7 @@ Cluster::member(PublicKey const& identity) const
 std::size_t
 Cluster::size() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     return nodes_.size();
 }
@@ -52,7 +52,7 @@ Cluster::update(
     std::uint32_t loadFee,
     NetClock::time_point reportTime)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto iter = nodes_.find(identity);
 
@@ -74,7 +74,7 @@ Cluster::update(
 void
 Cluster::for_each(std::function<void(ClusterNode const&)> func) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     for (auto const& ni : nodes_)
         func(ni);
 }
diff --git a/src/xrpld/overlay/detail/Message.cpp b/src/xrpld/overlay/detail/Message.cpp
index f8d3fbc8ff..eb8add8666 100644
--- a/src/xrpld/overlay/detail/Message.cpp
+++ b/src/xrpld/overlay/detail/Message.cpp
@@ -22,7 +22,8 @@ Message::Message(
     ::google::protobuf::Message const& message,
     protocol::MessageType type,
     std::optional<PublicKey> const& validator)
-    : category_(TrafficCount::categorize(message, type, false)), validatorKey_(validator)
+    : category_(static_cast<std::size_t>(TrafficCount::categorize(message, type, false)))
+    , validatorKey_(validator)
 {
     using namespace xrpl::compression;
 
diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp
index f29d97cb11..d17a556dd8 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -92,6 +92,8 @@
 namespace xrpl {
 
 namespace CrawlOptions {
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     Disabled = 0,
     Overlay = (1 << 0),
@@ -332,7 +334,7 @@ OverlayImpl::onHandoff(
             // As we are not on the strand, run() must be called
             // while holding the lock, otherwise new I/O can be
             // queued after a call to stop().
-            std::lock_guard<decltype(mutex_)> const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             {
                 auto const result = m_peers.emplace(peer->slot(), peer);
                 XRPL_ASSERT(result.second, "xrpl::OverlayImpl::onHandoff : peer is inserted");
@@ -455,7 +457,7 @@ OverlayImpl::connect(beast::IP::Endpoint const& remote_endpoint)
         app_.getJournal("Peer"),
         *this);
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     list_.emplace(p.get(), p);
     p->run();
 }
@@ -469,7 +471,7 @@ OverlayImpl::add_active(std::shared_ptr<PeerImp> const& peer)
     beast::WrappedSink sink{journal_.sink(), peer->prefix()};
     beast::Journal const journal{sink};
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     {
         auto const result = m_peers.emplace(peer->slot(), peer);
@@ -497,7 +499,7 @@ OverlayImpl::add_active(std::shared_ptr<PeerImp> const& peer)
 void
 OverlayImpl::remove(std::shared_ptr<PeerFinder::Slot> const& slot)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     auto const iter = m_peers.find(slot);
     XRPL_ASSERT(iter != m_peers.end(), "xrpl::OverlayImpl::remove : valid input");
     m_peers.erase(iter);
@@ -584,7 +586,7 @@ OverlayImpl::start()
             });
     }
     auto const timer = std::make_shared<Timer>(*this);
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     list_.emplace(timer.get(), timer);
     timer_ = timer;
     timer->async_wait();
@@ -637,7 +639,7 @@ OverlayImpl::activate(std::shared_ptr<PeerImp> const& peer)
 
     // Now track this peer
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         auto const result(ids_.emplace(
             std::piecewise_construct, std::make_tuple(peer->id()), std::make_tuple(peer)));
         XRPL_ASSERT(result.second, "xrpl::OverlayImpl::activate : peer ID is inserted");
@@ -653,7 +655,7 @@ OverlayImpl::activate(std::shared_ptr<PeerImp> const& peer)
 void
 OverlayImpl::onPeerDeactivate(Peer::id_t id)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     ids_.erase(id);
 }
 
@@ -732,7 +734,7 @@ OverlayImpl::reportOutboundTraffic(TrafficCount::category cat, int size)
 std::size_t
 OverlayImpl::size() const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     return ids_.size();
 }
 
@@ -1091,7 +1093,7 @@ OverlayImpl::getActivePeers(
     std::size_t& enabledInSkip) const
 {
     Overlay::PeerSequence ret;
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     active = ids_.size();
     disabled = enabledInSkip = 0;
@@ -1131,7 +1133,7 @@ OverlayImpl::checkTracking(std::uint32_t index)
 std::shared_ptr<Peer>
 OverlayImpl::findPeerByShortID(Peer::id_t const& id) const
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     auto const iter = ids_.find(id);
     if (iter != ids_.end())
         return iter->second.lock();
@@ -1143,7 +1145,7 @@ OverlayImpl::findPeerByShortID(Peer::id_t const& id) const
 std::shared_ptr<Peer>
 OverlayImpl::findPeerByPublicKey(PublicKey const& pubKey)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     // NOTE The purpose of peer is to delay the destruction of PeerImp
     std::shared_ptr<PeerImp> peer;
     for (auto const& e : ids_)
@@ -1204,7 +1206,7 @@ OverlayImpl::relay(protocol::TMValidation& m, uint256 const& uid, PublicKey cons
 std::shared_ptr<Message>
 OverlayImpl::getManifestsMessage()
 {
-    std::lock_guard const g(manifestLock_);
+    std::scoped_lock const g(manifestLock_);
 
     if (auto seq = app_.getValidatorManifests().sequence(); seq != manifestListSeq_)
     {
@@ -1323,7 +1325,7 @@ OverlayImpl::relay(
 void
 OverlayImpl::remove(Child& child)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     list_.erase(&child);
     if (list_.empty())
         cond_.notify_all();
@@ -1342,7 +1344,7 @@ OverlayImpl::stopChildren()
     // won't be called until vector<> children leaves scope.
     std::vector<std::shared_ptr<Child>> children;
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         if (!work_)
             return;
         work_ = std::nullopt;
@@ -1377,7 +1379,7 @@ OverlayImpl::sendEndpoints()
     {
         std::shared_ptr<PeerImp> peer;
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             auto const iter = m_peers.find(e.first);
             if (iter != m_peers.end())
                 peer = iter->second.lock();
@@ -1452,7 +1454,7 @@ OverlayImpl::updateSlotAndSquelch(
     for (auto id : peers)
     {
         slots_.updateSlotAndSquelch(key, validator, id, type, [&]() {
-            reportInboundTraffic(TrafficCount::squelch_ignored, 0);
+            reportInboundTraffic(TrafficCount::category::squelch_ignored, 0);
         });
     }
 }
@@ -1481,7 +1483,7 @@ OverlayImpl::updateSlotAndSquelch(
     }
 
     slots_.updateSlotAndSquelch(key, validator, peer, type, [&]() {
-        reportInboundTraffic(TrafficCount::squelch_ignored, 0);
+        reportInboundTraffic(TrafficCount::category::squelch_ignored, 0);
     });
 }
 
diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h
index 0c4990a6f4..caccd35562 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.h
+++ b/src/xrpld/overlay/detail/OverlayImpl.h
@@ -254,7 +254,7 @@ public:
     {
         std::vector<std::weak_ptr<PeerImp>> wp;
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
 
             // Iterate over a copy of the peer list because peer
             // destruction can invalidate iterators.
@@ -572,7 +572,7 @@ private:
     collect_metrics()
     {
         auto counts = m_traffic.getCounts();
-        std::lock_guard const lock(m_statsMutex);
+        std::scoped_lock const lock(m_statsMutex);
         XRPL_ASSERT(
             counts.size() == m_stats.trafficGauges.size(),
             "xrpl::OverlayImpl::collect_metrics : counts size do match");
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 46a640ec5c..01cad680ba 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -240,7 +240,7 @@ PeerImp::run()
         fail("Malformed handshake data (3)");
 
     {
-        std::lock_guard<std::mutex> const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         if (closed)
             closedLedgerHash_ = *closed;
         if (previous)
@@ -408,8 +408,8 @@ PeerImp::removeTxQueue(uint256 const& hash)
 void
 PeerImp::charge(Resource::Charge const& fee, std::string const& context)
 {
-    if ((usage_.charge(fee, context) == Resource::drop) && usage_.disconnect(p_journal_) &&
-        strand_.running_in_this_thread())
+    if ((usage_.charge(fee, context) == Resource::Disposition::drop) &&
+        usage_.disconnect(p_journal_) && strand_.running_in_this_thread())
     {
         // Sever the connection
         overlay_.incPeerDisconnectCharges();
@@ -478,7 +478,7 @@ PeerImp::json()
     ret[jss::protocol] = to_string(protocol_);
 
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         if (latency_)
             ret[jss::latency] = static_cast<Json::UInt>(latency_->count());
     }
@@ -510,7 +510,7 @@ PeerImp::json()
     uint256 closedLedgerHash;
     protocol::TMStatusChange last_status;
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         closedLedgerHash = closedLedgerHash_;
         last_status = last_status_;
     }
@@ -577,7 +577,7 @@ bool
 PeerImp::hasLedger(uint256 const& hash, std::uint32_t seq) const
 {
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         if ((seq != 0) && (seq >= minLedger_) && (seq <= maxLedger_) &&
             (tracking_.load() == Tracking::converged))
             return true;
@@ -590,7 +590,7 @@ PeerImp::hasLedger(uint256 const& hash, std::uint32_t seq) const
 void
 PeerImp::ledgerRange(std::uint32_t& minSeq, std::uint32_t& maxSeq) const
 {
-    std::lock_guard const sl(recentLock_);
+    std::scoped_lock const sl(recentLock_);
 
     minSeq = minLedger_;
     maxSeq = maxLedger_;
@@ -599,7 +599,7 @@ PeerImp::ledgerRange(std::uint32_t& minSeq, std::uint32_t& maxSeq) const
 bool
 PeerImp::hasTxSet(uint256 const& hash) const
 {
-    std::lock_guard const sl(recentLock_);
+    std::scoped_lock const sl(recentLock_);
     return std::ranges::find(recentTxSets_, hash) != recentTxSets_.end();
 }
 
@@ -608,7 +608,7 @@ PeerImp::cycleStatus()
 {
     // Operations on closedLedgerHash_ and previousLedgerHash_ must be
     // guarded by recentLock_.
-    std::lock_guard const sl(recentLock_);
+    std::scoped_lock const sl(recentLock_);
     previousLedgerHash_ = closedLedgerHash_;
     closedLedgerHash_.zero();
 }
@@ -616,7 +616,7 @@ PeerImp::cycleStatus()
 bool
 PeerImp::hasRange(std::uint32_t uMin, std::uint32_t uMax)
 {
-    std::lock_guard const sl(recentLock_);
+    std::scoped_lock const sl(recentLock_);
     return (tracking_ != Tracking::diverged) && (uMin >= minLedger_) && (uMax <= maxLedger_);
 }
 
@@ -813,7 +813,7 @@ PeerImp::onTimer(error_code const& ec)
         clock_type::duration duration;
 
         {
-            std::lock_guard const sl(recentLock_);
+            std::scoped_lock const sl(recentLock_);
             duration = clock_type::now() - trackingTime_;
         }
 
@@ -1267,7 +1267,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMPing> const& m)
             auto const rtt =
                 std::chrono::round<std::chrono::milliseconds>(clock_type::now() - lastPingTime_);
 
-            std::lock_guard const sl(recentLock_);
+            std::scoped_lock const sl(recentLock_);
 
             if (latency_)
             {
@@ -1964,7 +1964,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         m->set_networktime(app_.getTimeKeeper().now().time_since_epoch().count());
 
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         if (!last_status_.has_newstatus() || m->has_newstatus())
         {
             last_status_ = *m;
@@ -1984,7 +1984,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         {
             // Operations on closedLedgerHash_ and previousLedgerHash_ must be
             // guarded by recentLock_.
-            std::lock_guard const sl(recentLock_);
+            std::scoped_lock const sl(recentLock_);
             if (!closedLedgerHash_.isZero())
             {
                 outOfSync = true;
@@ -2006,7 +2006,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         {
             // Operations on closedLedgerHash_ and previousLedgerHash_ must be
             // guarded by recentLock_.
-            std::lock_guard const sl(recentLock_);
+            std::scoped_lock const sl(recentLock_);
             if (peerChangedLedgers)
             {
                 closedLedgerHash_ = m->ledgerhash();
@@ -2040,7 +2040,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
 
     if (m->has_firstseq() && m->has_lastseq())
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         minLedger_ = m->firstseq();
         maxLedger_ = m->lastseq();
@@ -2107,7 +2107,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         {
             uint256 closedLedgerHash{};
             {
-                std::lock_guard const sl(recentLock_);
+                std::scoped_lock const sl(recentLock_);
                 closedLedgerHash = closedLedgerHash_;
             }
             j[jss::ledger_hash] = to_string(closedLedgerHash);
@@ -2135,7 +2135,7 @@ PeerImp::checkTracking(std::uint32_t validationSeq)
     {
         // Extract the sequence number of the highest
         // ledger this peer has
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         serverSeq = maxLedger_;
     }
@@ -2161,7 +2161,7 @@ PeerImp::checkTracking(std::uint32_t seq1, std::uint32_t seq2)
     if ((diff > Tuning::divergedLedgerLimit) && (tracking_.load() != Tracking::diverged))
     {
         // The peer's ledger sequence is way off the validation's
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         tracking_ = Tracking::diverged;
         trackingTime_ = clock_type::now();
@@ -2181,7 +2181,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactionSet> const& m)
 
     if (m->status() == protocol::tsHAVE)
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         if (std::ranges::find(recentTxSets_, hash) != recentTxSets_.end())
         {
@@ -2248,7 +2248,7 @@ PeerImp::onValidatorListMessage(
         case ListDisposition::expired:
         // Future list
         case ListDisposition::pending: {
-            std::lock_guard<std::mutex> const sl(recentLock_);
+            std::scoped_lock const sl(recentLock_);
 
             XRPL_ASSERT(
                 applyResult.publisherKey,
@@ -2272,7 +2272,7 @@ PeerImp::onValidatorListMessage(
         case ListDisposition::known_sequence:
 #ifndef NDEBUG
         {
-            std::lock_guard<std::mutex> const sl(recentLock_);
+            std::scoped_lock<std::mutex> const sl(recentLock_);
             XRPL_ASSERT(
                 applyResult.sequence && applyResult.publisherKey,
                 "xrpl::PeerImp::onValidatorListMessage : nonzero sequence "
@@ -2838,7 +2838,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
 //--------------------------------------------------------------------------
 
 void
-PeerImp::addLedger(uint256 const& hash, std::lock_guard<std::mutex> const& lockedRecentLock)
+PeerImp::addLedger(uint256 const& hash, std::scoped_lock<std::mutex> const& lockedRecentLock)
 {
     // lockedRecentLock is passed as a reminder that recentLock_ must be
     // locked by the caller.
@@ -2925,7 +2925,8 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
         auto sttx = txn->getSTransaction();
         sttx->add(s);
         tx->set_rawtransaction(s.data(), s.size());
-        tx->set_status(txn->getStatus() == INCLUDED ? protocol::tsCURRENT : protocol::tsNEW);
+        tx->set_status(
+            txn->getStatus() == TransStatus::INCLUDED ? protocol::tsCURRENT : protocol::tsNEW);
         tx->set_receivetimestamp(app_.getTimeKeeper().now().time_since_epoch().count());
         tx->set_deferred(txn->getSubmitResult().queued);
     }
@@ -2989,10 +2990,10 @@ PeerImp::checkTransaction(
             std::string reason;
             auto tx = std::make_shared<Transaction>(stx, reason, app_);
             XRPL_ASSERT(
-                tx->getStatus() == NEW,
+                tx->getStatus() == TransStatus::NEW,
                 "xrpl::PeerImp::checkTransaction Transaction created "
                 "correctly");
-            if (tx->getStatus() == NEW)
+            if (tx->getStatus() == TransStatus::NEW)
             {
                 JLOG(p_journal_.debug()) << "Processing " << (batch ? "batch" : "unsolicited")
                                          << " pseudo-transaction tx " << tx->getID();
@@ -3044,7 +3045,7 @@ PeerImp::checkTransaction(
         std::string reason;
         auto tx = std::make_shared<Transaction>(stx, reason, app_);
 
-        if (tx->getStatus() == INVALID)
+        if (tx->getStatus() == TransStatus::INVALID)
         {
             if (!reason.empty())
             {
@@ -3557,7 +3558,7 @@ PeerImp::getScore(bool haveItem) const
 
     std::optional<std::chrono::milliseconds> latency;
     {
-        std::lock_guard const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
         latency = latency_;
     }
 
@@ -3576,7 +3577,7 @@ PeerImp::getScore(bool haveItem) const
 bool
 PeerImp::isHighLatency() const
 {
-    std::lock_guard const sl(recentLock_);
+    std::scoped_lock const sl(recentLock_);
     return latency_ >= peerHighLatency;
 }
 
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index f2cca1407a..d2cf46e838 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -428,7 +428,7 @@ public:
     std::optional<std::size_t>
     publisherListSequence(PublicKey const& pubKey) const override
     {
-        std::lock_guard<std::mutex> const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         auto iter = publisherListSequences_.find(pubKey);
         if (iter != publisherListSequences_.end())
@@ -439,7 +439,7 @@ public:
     void
     setPublisherListSequence(PublicKey const& pubKey, std::size_t const seq) override
     {
-        std::lock_guard<std::mutex> const sl(recentLock_);
+        std::scoped_lock const sl(recentLock_);
 
         publisherListSequences_[pubKey] = seq;
     }
@@ -744,7 +744,7 @@ private:
     // lockedRecentLock is passed as a reminder to callers that recentLock_
     // must be locked.
     void
-    addLedger(uint256 const& hash, std::lock_guard<std::mutex> const& lockedRecentLock);
+    addLedger(uint256 const& hash, std::scoped_lock<std::mutex> const& lockedRecentLock);
 
     void
     doFetchPack(std::shared_ptr<protocol::TMGetObjectByHash> const& packet);
diff --git a/src/xrpld/overlay/detail/PeerReservationTable.cpp b/src/xrpld/overlay/detail/PeerReservationTable.cpp
index f0e5f55a00..6f004a3b39 100644
--- a/src/xrpld/overlay/detail/PeerReservationTable.cpp
+++ b/src/xrpld/overlay/detail/PeerReservationTable.cpp
@@ -32,7 +32,7 @@ PeerReservationTable::list() const -> std::vector<PeerReservation>
 {
     std::vector<PeerReservation> list;
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         list.reserve(table_.size());
         std::ranges::copy(table_, std::back_inserter(list));
     }
@@ -49,7 +49,7 @@ PeerReservationTable::list() const -> std::vector<PeerReservation>
 bool
 PeerReservationTable::load(DatabaseCon& connection)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     connection_ = &connection;
     auto db = connection.checkoutDb();
@@ -64,7 +64,7 @@ PeerReservationTable::insert_or_assign(PeerReservation const& reservation)
 {
     std::optional<PeerReservation> previous;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto hint = table_.find(reservation);
     if (hint != table_.end())
@@ -98,7 +98,7 @@ PeerReservationTable::erase(PublicKey const& nodeId)
 {
     std::optional<PeerReservation> previous;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
 
     auto const it = table_.find({.nodeId = nodeId});
     if (it != table_.end())
diff --git a/src/xrpld/overlay/detail/TrafficCount.h b/src/xrpld/overlay/detail/TrafficCount.h
index 736c3b76e3..8597ca897c 100644
--- a/src/xrpld/overlay/detail/TrafficCount.h
+++ b/src/xrpld/overlay/detail/TrafficCount.h
@@ -29,7 +29,7 @@ namespace xrpl {
 class TrafficCount
 {
 public:
-    enum category : std::size_t;
+    enum class category : std::size_t;
 
     class TrafficStats
     {
@@ -63,7 +63,7 @@ public:
     // If you add entries to this enum, you need to update the initialization
     // of the arrays at the bottom of this file which map array numbers to
     // human-readable, monitoring-tool friendly names.
-    enum category : std::size_t {
+    enum class category : std::size_t {
         base,  // basic peer overhead, must be first
 
         cluster,    // cluster overhead
@@ -193,7 +193,8 @@ public:
     addCount(category cat, bool inbound, int bytes)
     {
         XRPL_ASSERT(
-            cat <= category::unknown, "xrpl::TrafficCount::addCount : valid category input");
+            static_cast<std::size_t>(cat) <= static_cast<std::size_t>(category::unknown),
+            "xrpl::TrafficCount::addCount : valid category input");
 
         auto it = counts_.find(cat);
 
@@ -227,62 +228,62 @@ public:
     to_string(category cat)
     {
         static std::unordered_map<category, std::string> const category_map = {
-            {base, "overhead"},
-            {cluster, "overhead_cluster"},
-            {overlay, "overhead_overlay"},
-            {manifests, "overhead_manifest"},
-            {transaction, "transactions"},
-            {transaction_duplicate, "transactions_duplicate"},
-            {proposal, "proposals"},
-            {proposal_untrusted, "proposals_untrusted"},
-            {proposal_duplicate, "proposals_duplicate"},
-            {validation, "validations"},
-            {validation_untrusted, "validations_untrusted"},
-            {validation_duplicate, "validations_duplicate"},
-            {validatorlist, "validator_lists"},
-            {squelch, "squelch"},
-            {squelch_suppressed, "squelch_suppressed"},
-            {squelch_ignored, "squelch_ignored"},
-            {get_set, "set_get"},
-            {share_set, "set_share"},
-            {ld_tsc_get, "ledger_data_Transaction_Set_candidate_get"},
-            {ld_tsc_share, "ledger_data_Transaction_Set_candidate_share"},
-            {ld_txn_get, "ledger_data_Transaction_Node_get"},
-            {ld_txn_share, "ledger_data_Transaction_Node_share"},
-            {ld_asn_get, "ledger_data_Account_State_Node_get"},
-            {ld_asn_share, "ledger_data_Account_State_Node_share"},
-            {ld_get, "ledger_data_get"},
-            {ld_share, "ledger_data_share"},
-            {gl_tsc_share, "ledger_Transaction_Set_candidate_share"},
-            {gl_tsc_get, "ledger_Transaction_Set_candidate_get"},
-            {gl_txn_share, "ledger_Transaction_node_share"},
-            {gl_txn_get, "ledger_Transaction_node_get"},
-            {gl_asn_share, "ledger_Account_State_node_share"},
-            {gl_asn_get, "ledger_Account_State_node_get"},
-            {gl_share, "ledger_share"},
-            {gl_get, "ledger_get"},
-            {share_hash_ledger, "getobject_Ledger_share"},
-            {get_hash_ledger, "getobject_Ledger_get"},
-            {share_hash_tx, "getobject_Transaction_share"},
-            {get_hash_tx, "getobject_Transaction_get"},
-            {share_hash_txnode, "getobject_Transaction_node_share"},
-            {get_hash_txnode, "getobject_Transaction_node_get"},
-            {share_hash_asnode, "getobject_Account_State_node_share"},
-            {get_hash_asnode, "getobject_Account_State_node_get"},
-            {share_cas_object, "getobject_CAS_share"},
-            {get_cas_object, "getobject_CAS_get"},
-            {share_fetch_pack, "getobject_Fetch_Pack_share"},
-            {get_fetch_pack, "getobject_Fetch Pack_get"},
-            {get_transactions, "getobject_Transactions_get"},
-            {share_hash, "getobject_share"},
-            {get_hash, "getobject_get"},
-            {proof_path_request, "proof_path_request"},
-            {proof_path_response, "proof_path_response"},
-            {replay_delta_request, "replay_delta_request"},
-            {replay_delta_response, "replay_delta_response"},
-            {have_transactions, "have_transactions"},
-            {requested_transactions, "requested_transactions"},
-            {total, "total"}};
+            {category::base, "overhead"},
+            {category::cluster, "overhead_cluster"},
+            {category::overlay, "overhead_overlay"},
+            {category::manifests, "overhead_manifest"},
+            {category::transaction, "transactions"},
+            {category::transaction_duplicate, "transactions_duplicate"},
+            {category::proposal, "proposals"},
+            {category::proposal_untrusted, "proposals_untrusted"},
+            {category::proposal_duplicate, "proposals_duplicate"},
+            {category::validation, "validations"},
+            {category::validation_untrusted, "validations_untrusted"},
+            {category::validation_duplicate, "validations_duplicate"},
+            {category::validatorlist, "validator_lists"},
+            {category::squelch, "squelch"},
+            {category::squelch_suppressed, "squelch_suppressed"},
+            {category::squelch_ignored, "squelch_ignored"},
+            {category::get_set, "set_get"},
+            {category::share_set, "set_share"},
+            {category::ld_tsc_get, "ledger_data_Transaction_Set_candidate_get"},
+            {category::ld_tsc_share, "ledger_data_Transaction_Set_candidate_share"},
+            {category::ld_txn_get, "ledger_data_Transaction_Node_get"},
+            {category::ld_txn_share, "ledger_data_Transaction_Node_share"},
+            {category::ld_asn_get, "ledger_data_Account_State_Node_get"},
+            {category::ld_asn_share, "ledger_data_Account_State_Node_share"},
+            {category::ld_get, "ledger_data_get"},
+            {category::ld_share, "ledger_data_share"},
+            {category::gl_tsc_share, "ledger_Transaction_Set_candidate_share"},
+            {category::gl_tsc_get, "ledger_Transaction_Set_candidate_get"},
+            {category::gl_txn_share, "ledger_Transaction_node_share"},
+            {category::gl_txn_get, "ledger_Transaction_node_get"},
+            {category::gl_asn_share, "ledger_Account_State_node_share"},
+            {category::gl_asn_get, "ledger_Account_State_node_get"},
+            {category::gl_share, "ledger_share"},
+            {category::gl_get, "ledger_get"},
+            {category::share_hash_ledger, "getobject_Ledger_share"},
+            {category::get_hash_ledger, "getobject_Ledger_get"},
+            {category::share_hash_tx, "getobject_Transaction_share"},
+            {category::get_hash_tx, "getobject_Transaction_get"},
+            {category::share_hash_txnode, "getobject_Transaction_node_share"},
+            {category::get_hash_txnode, "getobject_Transaction_node_get"},
+            {category::share_hash_asnode, "getobject_Account_State_node_share"},
+            {category::get_hash_asnode, "getobject_Account_State_node_get"},
+            {category::share_cas_object, "getobject_CAS_share"},
+            {category::get_cas_object, "getobject_CAS_get"},
+            {category::share_fetch_pack, "getobject_Fetch_Pack_share"},
+            {category::get_fetch_pack, "getobject_Fetch Pack_get"},
+            {category::get_transactions, "getobject_Transactions_get"},
+            {category::share_hash, "getobject_share"},
+            {category::get_hash, "getobject_get"},
+            {category::proof_path_request, "proof_path_request"},
+            {category::proof_path_response, "proof_path_response"},
+            {category::replay_delta_request, "replay_delta_request"},
+            {category::replay_delta_response, "replay_delta_response"},
+            {category::have_transactions, "have_transactions"},
+            {category::requested_transactions, "requested_transactions"},
+            {category::total, "total"}};
 
         if (auto it = category_map.find(cat); it != category_map.end())
             return it->second;
@@ -292,63 +293,63 @@ public:
 
 protected:
     std::unordered_map<category, TrafficStats> counts_{
-        {base, {base}},
-        {cluster, {cluster}},
-        {overlay, {overlay}},
-        {manifests, {manifests}},
-        {transaction, {transaction}},
-        {transaction_duplicate, {transaction_duplicate}},
-        {proposal, {proposal}},
-        {proposal_untrusted, {proposal_untrusted}},
-        {proposal_duplicate, {proposal_duplicate}},
-        {validation, {validation}},
-        {validation_untrusted, {validation_untrusted}},
-        {validation_duplicate, {validation_duplicate}},
-        {validatorlist, {validatorlist}},
-        {squelch, {squelch}},
-        {squelch_suppressed, {squelch_suppressed}},
-        {squelch_ignored, {squelch_ignored}},
-        {get_set, {get_set}},
-        {share_set, {share_set}},
-        {ld_tsc_get, {ld_tsc_get}},
-        {ld_tsc_share, {ld_tsc_share}},
-        {ld_txn_get, {ld_txn_get}},
-        {ld_txn_share, {ld_txn_share}},
-        {ld_asn_get, {ld_asn_get}},
-        {ld_asn_share, {ld_asn_share}},
-        {ld_get, {ld_get}},
-        {ld_share, {ld_share}},
-        {gl_tsc_share, {gl_tsc_share}},
-        {gl_tsc_get, {gl_tsc_get}},
-        {gl_txn_share, {gl_txn_share}},
-        {gl_txn_get, {gl_txn_get}},
-        {gl_asn_share, {gl_asn_share}},
-        {gl_asn_get, {gl_asn_get}},
-        {gl_share, {gl_share}},
-        {gl_get, {gl_get}},
-        {share_hash_ledger, {share_hash_ledger}},
-        {get_hash_ledger, {get_hash_ledger}},
-        {share_hash_tx, {share_hash_tx}},
-        {get_hash_tx, {get_hash_tx}},
-        {share_hash_txnode, {share_hash_txnode}},
-        {get_hash_txnode, {get_hash_txnode}},
-        {share_hash_asnode, {share_hash_asnode}},
-        {get_hash_asnode, {get_hash_asnode}},
-        {share_cas_object, {share_cas_object}},
-        {get_cas_object, {get_cas_object}},
-        {share_fetch_pack, {share_fetch_pack}},
-        {get_fetch_pack, {get_fetch_pack}},
-        {get_transactions, {get_transactions}},
-        {share_hash, {share_hash}},
-        {get_hash, {get_hash}},
-        {proof_path_request, {proof_path_request}},
-        {proof_path_response, {proof_path_response}},
-        {replay_delta_request, {replay_delta_request}},
-        {replay_delta_response, {replay_delta_response}},
-        {have_transactions, {have_transactions}},
-        {requested_transactions, {requested_transactions}},
-        {total, {total}},
-        {unknown, {unknown}},
+        {category::base, {category::base}},
+        {category::cluster, {category::cluster}},
+        {category::overlay, {category::overlay}},
+        {category::manifests, {category::manifests}},
+        {category::transaction, {category::transaction}},
+        {category::transaction_duplicate, {category::transaction_duplicate}},
+        {category::proposal, {category::proposal}},
+        {category::proposal_untrusted, {category::proposal_untrusted}},
+        {category::proposal_duplicate, {category::proposal_duplicate}},
+        {category::validation, {category::validation}},
+        {category::validation_untrusted, {category::validation_untrusted}},
+        {category::validation_duplicate, {category::validation_duplicate}},
+        {category::validatorlist, {category::validatorlist}},
+        {category::squelch, {category::squelch}},
+        {category::squelch_suppressed, {category::squelch_suppressed}},
+        {category::squelch_ignored, {category::squelch_ignored}},
+        {category::get_set, {category::get_set}},
+        {category::share_set, {category::share_set}},
+        {category::ld_tsc_get, {category::ld_tsc_get}},
+        {category::ld_tsc_share, {category::ld_tsc_share}},
+        {category::ld_txn_get, {category::ld_txn_get}},
+        {category::ld_txn_share, {category::ld_txn_share}},
+        {category::ld_asn_get, {category::ld_asn_get}},
+        {category::ld_asn_share, {category::ld_asn_share}},
+        {category::ld_get, {category::ld_get}},
+        {category::ld_share, {category::ld_share}},
+        {category::gl_tsc_share, {category::gl_tsc_share}},
+        {category::gl_tsc_get, {category::gl_tsc_get}},
+        {category::gl_txn_share, {category::gl_txn_share}},
+        {category::gl_txn_get, {category::gl_txn_get}},
+        {category::gl_asn_share, {category::gl_asn_share}},
+        {category::gl_asn_get, {category::gl_asn_get}},
+        {category::gl_share, {category::gl_share}},
+        {category::gl_get, {category::gl_get}},
+        {category::share_hash_ledger, {category::share_hash_ledger}},
+        {category::get_hash_ledger, {category::get_hash_ledger}},
+        {category::share_hash_tx, {category::share_hash_tx}},
+        {category::get_hash_tx, {category::get_hash_tx}},
+        {category::share_hash_txnode, {category::share_hash_txnode}},
+        {category::get_hash_txnode, {category::get_hash_txnode}},
+        {category::share_hash_asnode, {category::share_hash_asnode}},
+        {category::get_hash_asnode, {category::get_hash_asnode}},
+        {category::share_cas_object, {category::share_cas_object}},
+        {category::get_cas_object, {category::get_cas_object}},
+        {category::share_fetch_pack, {category::share_fetch_pack}},
+        {category::get_fetch_pack, {category::get_fetch_pack}},
+        {category::get_transactions, {category::get_transactions}},
+        {category::share_hash, {category::share_hash}},
+        {category::get_hash, {category::get_hash}},
+        {category::proof_path_request, {category::proof_path_request}},
+        {category::proof_path_response, {category::proof_path_response}},
+        {category::replay_delta_request, {category::replay_delta_request}},
+        {category::replay_delta_response, {category::replay_delta_response}},
+        {category::have_transactions, {category::have_transactions}},
+        {category::requested_transactions, {category::requested_transactions}},
+        {category::total, {category::total}},
+        {category::unknown, {category::unknown}},
     };
 };
 
diff --git a/src/xrpld/overlay/detail/Tuning.h b/src/xrpld/overlay/detail/Tuning.h
index 0471587fec..07cf2d2238 100644
--- a/src/xrpld/overlay/detail/Tuning.h
+++ b/src/xrpld/overlay/detail/Tuning.h
@@ -4,6 +4,8 @@
 
 namespace xrpl::Tuning {
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     /** How many ledgers off a server can be and we will
         still consider it converged */
diff --git a/src/xrpld/overlay/detail/TxMetrics.cpp b/src/xrpld/overlay/detail/TxMetrics.cpp
index 0a44c719f4..2bcf5f2f2f 100644
--- a/src/xrpld/overlay/detail/TxMetrics.cpp
+++ b/src/xrpld/overlay/detail/TxMetrics.cpp
@@ -17,7 +17,7 @@ void
 TxMetrics::addMetrics(protocol::MessageType type, std::uint32_t val)
 {
     auto add = [&](auto& m, std::uint32_t val) {
-        std::lock_guard const lock(mutex);
+        std::scoped_lock const lock(mutex);
         m.addMetrics(val);
     };
 
@@ -46,7 +46,7 @@ TxMetrics::addMetrics(protocol::MessageType type, std::uint32_t val)
 void
 TxMetrics::addMetrics(std::uint32_t selected, std::uint32_t suppressed, std::uint32_t notenabled)
 {
-    std::lock_guard const lock(mutex);
+    std::scoped_lock const lock(mutex);
     selectedPeers.addMetrics(selected);
     suppressedPeers.addMetrics(suppressed);
     notEnabled.addMetrics(notenabled);
@@ -55,7 +55,7 @@ TxMetrics::addMetrics(std::uint32_t selected, std::uint32_t suppressed, std::uin
 void
 TxMetrics::addMetrics(std::uint32_t missing)
 {
-    std::lock_guard const lock(mutex);
+    std::scoped_lock const lock(mutex);
     missingTx.addMetrics(missing);
 }
 
@@ -99,7 +99,7 @@ SingleMetrics::addMetrics(std::uint32_t val)
 Json::Value
 TxMetrics::json() const
 {
-    std::lock_guard const l(mutex);
+    std::scoped_lock const l(mutex);
 
     Json::Value ret(Json::objectValue);
 
diff --git a/src/xrpld/peerfinder/Slot.h b/src/xrpld/peerfinder/Slot.h
index 5c459b25ea..e67df7ee17 100644
--- a/src/xrpld/peerfinder/Slot.h
+++ b/src/xrpld/peerfinder/Slot.h
@@ -13,7 +13,7 @@ class Slot
 public:
     using ptr = std::shared_ptr<Slot>;
 
-    enum State { accept, connect, connected, active, closing };
+    enum class State { accept, connect, connected, active, closing };
 
     virtual ~Slot() = 0;
 
diff --git a/src/xrpld/peerfinder/detail/Checker.h b/src/xrpld/peerfinder/detail/Checker.h
index 3bd23f85db..820d030b23 100644
--- a/src/xrpld/peerfinder/detail/Checker.h
+++ b/src/xrpld/peerfinder/detail/Checker.h
@@ -149,7 +149,7 @@ template <class Protocol>
 void
 Checker<Protocol>::stop()
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     if (!stop_)
     {
         stop_ = true;
@@ -175,7 +175,7 @@ Checker<Protocol>::async_connect(beast::IP::Endpoint const& endpoint, Handler&&
     auto const op =
         std::make_shared<async_op<Handler>>(*this, io_context_, std::forward<Handler>(handler));
     {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         list_.push_back(*op);
     }
     op->socket_.async_connect(
@@ -187,7 +187,7 @@ template <class Protocol>
 void
 Checker<Protocol>::remove(basic_async_op& op)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     list_.erase(list_.iterator_to(op));
     if (list_.size() == 0)
         cond_.notify_all();
diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h
index 6d1221d331..367caed54b 100644
--- a/src/xrpld/peerfinder/detail/Counts.h
+++ b/src/xrpld/peerfinder/detail/Counts.h
@@ -35,7 +35,7 @@ public:
     {
         // Must be handshaked and in the right state
         XRPL_ASSERT(
-            s.state() == Slot::connected || s.state() == Slot::accept,
+            s.state() == Slot::State::connected || s.state() == Slot::State::accept,
             "xrpl::PeerFinder::Counts::can_activate : valid input state");
 
         if (s.fixed() || s.reserved())
@@ -241,13 +241,13 @@ private:
 
         switch (s.state())
         {
-            case Slot::accept:
+            case Slot::State::accept:
                 XRPL_ASSERT(s.inbound(), "xrpl::PeerFinder::Counts::adjust : input is inbound");
                 adjustCounter(m_acceptCount, dir);
                 break;
 
-            case Slot::connect:
-            case Slot::connected:
+            case Slot::State::connect:
+            case Slot::State::connected:
                 XRPL_ASSERT(
                     !s.inbound(),
                     "xrpl::PeerFinder::Counts::adjust : input is not "
@@ -255,7 +255,7 @@ private:
                 adjustCounter(m_attempts, dir);
                 break;
 
-            case Slot::active:
+            case Slot::State::active:
                 if (s.fixed())
                     adjustCounter(m_fixed_active, dir);
                 if (!s.fixed() && !s.reserved())
@@ -272,7 +272,7 @@ private:
                 adjustCounter(m_active, dir);
                 break;
 
-            case Slot::closing:
+            case Slot::State::closing:
                 adjustCounter(m_closingCount, dir);
                 break;
 
diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h
index 9e2cbedc64..c7e6c7d1f2 100644
--- a/src/xrpld/peerfinder/detail/Logic.h
+++ b/src/xrpld/peerfinder/detail/Logic.h
@@ -105,7 +105,7 @@ public:
     void
     load()
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         bootcache_.load();
     }
 
@@ -118,7 +118,7 @@ public:
     void
     stop()
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         stopping_ = true;
         if (fetchSource_ != nullptr)
             fetchSource_->cancel();
@@ -133,7 +133,7 @@ public:
     void
     config(Config const& c)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         config_ = c;
         counts_.onConfig(config_);
     }
@@ -141,7 +141,7 @@ public:
     Config
     config()
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         return config_;
     }
 
@@ -154,7 +154,7 @@ public:
     void
     addFixedPeer(std::string const& name, std::vector<beast::IP::Endpoint> const& addresses)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         if (addresses.empty())
         {
@@ -196,7 +196,7 @@ public:
         if (ec == boost::asio::error::operation_aborted)
             return;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         auto const iter(slots_.find(remoteAddress));
         if (iter == slots_.end())
         {
@@ -238,7 +238,7 @@ public:
         JLOG(m_journal.debug()) << beast::leftw(18) << "Logic accept" << remote_endpoint
                                 << " on local " << local_endpoint;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // Check for connection limit per address
         if (is_public(remote_endpoint))
@@ -286,7 +286,7 @@ public:
     {
         JLOG(m_journal.debug()) << beast::leftw(18) << "Logic connect " << remote_endpoint;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // Check for duplicate connection
         if (slots_.contains(remote_endpoint))
@@ -325,7 +325,7 @@ public:
 
         JLOG(journal.trace()) << "Logic connected on local " << local_endpoint;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // The object must exist in our table
         XRPL_ASSERT(
@@ -350,7 +350,7 @@ public:
 
         // Update counts
         counts_.remove(*slot);
-        slot->state(Slot::connected);
+        slot->state(Slot::State::connected);
         counts_.add(*slot);
         return true;
     }
@@ -364,7 +364,7 @@ public:
         JLOG(journal.debug()) << "Logic handshake " << slot->remote_endpoint() << " with "
                               << (reserved ? "reserved " : "") << "key " << key;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // The object must exist in our table
         XRPL_ASSERT(
@@ -372,7 +372,7 @@ public:
             "xrpl::PeerFinder::Logic::activate : valid slot input");
         // Must be accepted or connected
         XRPL_ASSERT(
-            slot->state() == Slot::accept || slot->state() == Slot::connected,
+            slot->state() == Slot::State::accept || slot->state() == Slot::State::connected,
             "xrpl::PeerFinder::Logic::activate : valid slot state");
 
         // Check for duplicate connection by key
@@ -437,7 +437,7 @@ public:
     std::vector<Endpoint>
     redirect(SlotImp::ptr const& slot)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         RedirectHandouts h(slot);
         livecache_.hops.shuffle();
         handout(&h, (&h) + 1, livecache_.hops.begin(), livecache_.hops.end());
@@ -455,7 +455,7 @@ public:
     {
         std::vector<beast::IP::Endpoint> none;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // Count how many more outbound attempts to make
         //
@@ -561,7 +561,7 @@ public:
     {
         std::vector<std::pair<std::shared_ptr<Slot>, std::vector<Endpoint>>> result;
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         clock_type::time_point const now = m_clock.now();
         if (m_whenBroadcast <= now)
@@ -574,7 +574,7 @@ public:
                 slots.reserve(slots_.size());
                 std::for_each(
                     slots_.cbegin(), slots_.cend(), [&slots](Slots::value_type const& value) {
-                        if (value.second->state() == Slot::active)
+                        if (value.second->state() == Slot::State::active)
                             slots.emplace_back(value.second);
                     });
                 std::shuffle(slots.begin(), slots.end(), default_prng());
@@ -640,7 +640,7 @@ public:
     void
     once_per_second()
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // Expire the Livecache
         livecache_.expire();
@@ -738,7 +738,7 @@ public:
         JLOG(journal.trace()) << "Endpoints contained " << list.size()
                               << ((list.size() > 1) ? " entries" : " entry");
 
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // The object must exist in our table
         XRPL_ASSERT(
@@ -747,7 +747,7 @@ public:
 
         // Must be handshaked!
         XRPL_ASSERT(
-            slot->state() == Slot::active,
+            slot->state() == Slot::State::active,
             "xrpl::PeerFinder::Logic::on_endpoints : valid slot state");
 
         clock_type::time_point const now(m_clock.now());
@@ -870,7 +870,7 @@ public:
     void
     on_closed(SlotImp::ptr const& slot)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         remove(slot);
 
@@ -878,7 +878,7 @@ public:
         beast::Journal const journal{sink};
 
         // Mark fixed slot failure
-        if (slot->fixed() && !slot->inbound() && slot->state() != Slot::active)
+        if (slot->fixed() && !slot->inbound() && slot->state() != Slot::State::active)
         {
             auto iter(fixed_.find(slot->remote_endpoint()));
             if (iter == fixed_.end())
@@ -895,12 +895,12 @@ public:
         // Do state specific bookkeeping
         switch (slot->state())
         {
-            case Slot::accept:
+            case Slot::State::accept:
                 JLOG(journal.trace()) << "Logic accept failed";
                 break;
 
-            case Slot::connect:
-            case Slot::connected:
+            case Slot::State::connect:
+            case Slot::State::connected:
                 bootcache_.on_failure(slot->remote_endpoint());
                 // VFALCO TODO If the address exists in the ephemeral/live
                 //             endpoint livecache then we should mark the
@@ -909,11 +909,11 @@ public:
                 // avoid propagating the address.
                 break;
 
-            case Slot::active:
+            case Slot::State::active:
                 JLOG(journal.trace()) << "Logic close";
                 break;
 
-            case Slot::closing:
+            case Slot::State::closing:
                 JLOG(journal.trace()) << "Logic finished";
                 break;
 
@@ -930,7 +930,7 @@ public:
     void
     on_failure(SlotImp::ptr const& slot)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         bootcache_.on_failure(slot->remote_endpoint());
     }
@@ -1023,7 +1023,7 @@ public:
     addBootcacheAddresses(IPAddresses const& list)
     {
         int count(0);
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
         for (auto const& addr : list)
         {
             if (bootcache_.insertStatic(addr))
@@ -1040,7 +1040,7 @@ public:
 
         {
             {
-                std::lock_guard const _(lock_);
+                std::scoped_lock const _(lock_);
                 if (stopping_)
                     return;
                 fetchSource_ = source;
@@ -1052,7 +1052,7 @@ public:
             source->fetch(results, m_journal);
 
             {
-                std::lock_guard const _(lock_);
+                std::scoped_lock const _(lock_);
                 if (stopping_)
                     return;
                 fetchSource_ = nullptr;
@@ -1123,7 +1123,7 @@ public:
     void
     onWrite(beast::PropertyStream::Map& map)
     {
-        std::lock_guard const _(lock_);
+        std::scoped_lock const _(lock_);
 
         // VFALCO NOTE These ugly casts are needed because
         //             of how std::size_t is declared on some linuxes
@@ -1174,15 +1174,15 @@ public:
     {
         switch (state)
         {
-            case Slot::accept:
+            case Slot::State::accept:
                 return "accept";
-            case Slot::connect:
+            case Slot::State::connect:
                 return "connect";
-            case Slot::connected:
+            case Slot::State::connected:
                 return "connected";
-            case Slot::active:
+            case Slot::State::active:
                 return "active";
-            case Slot::closing:
+            case Slot::State::closing:
                 return "closing";
             default:
                 break;
@@ -1201,7 +1201,7 @@ Logic<Checker>::onRedirects(
     FwdIter last,
     boost::asio::ip::tcp::endpoint const& remote_address)
 {
-    std::lock_guard const _(lock_);
+    std::scoped_lock const _(lock_);
     std::size_t n = 0;
     for (; first != last && n < Tuning::maxRedirects; ++first, ++n)
         bootcache_.insert(beast::IPAddressConversion::from_asio(*first));
diff --git a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
index 2858586120..d2378a2fbb 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
@@ -243,7 +243,7 @@ private:
     void
     collect_metrics()
     {
-        std::lock_guard const lock(m_statsMutex);
+        std::scoped_lock const lock(m_statsMutex);
         m_stats.activeInboundPeers = m_logic.counts_.inboundActive();
         m_stats.activeOutboundPeers = m_logic.counts_.out_active();
     }
diff --git a/src/xrpld/peerfinder/detail/SlotImp.cpp b/src/xrpld/peerfinder/detail/SlotImp.cpp
index f763a154aa..e7cc751472 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.cpp
+++ b/src/xrpld/peerfinder/detail/SlotImp.cpp
@@ -22,7 +22,7 @@ SlotImp::SlotImp(
     , m_inbound(true)
     , m_fixed(fixed)
     , m_reserved(false)
-    , m_state(accept)
+    , m_state(State::accept)
     , m_remote_endpoint(std::move(remote_endpoint))
     , m_local_endpoint(local_endpoint)
     , m_listening_port(unknownPort)
@@ -37,7 +37,7 @@ SlotImp::SlotImp(beast::IP::Endpoint remote_endpoint, bool fixed, clock_type& cl
     , m_inbound(false)
     , m_fixed(fixed)
     , m_reserved(false)
-    , m_state(connect)
+    , m_state(State::connect)
     , m_remote_endpoint(std::move(remote_endpoint))
     , m_listening_port(unknownPort)
     , checked(true)
@@ -50,7 +50,8 @@ void
 SlotImp::state(State state_)
 {
     // Must go through activate() to set active state
-    XRPL_ASSERT(state_ != active, "xrpl::PeerFinder::SlotImp::state : input state is not active");
+    XRPL_ASSERT(
+        state_ != State::active, "xrpl::PeerFinder::SlotImp::state : input state is not active");
 
     // The state must be different
     XRPL_ASSERT(
@@ -60,18 +61,18 @@ SlotImp::state(State state_)
 
     // You can't transition into the initial states
     XRPL_ASSERT(
-        state_ != accept && state_ != connect,
+        state_ != State::accept && state_ != State::connect,
         "xrpl::PeerFinder::SlotImp::state : input state is not an initial");
 
     // Can only become connected from outbound connect state
     XRPL_ASSERT(
-        state_ != connected || (!m_inbound && m_state == connect),
+        state_ != State::connected || (!m_inbound && m_state == State::connect),
         "xrpl::PeerFinder::SlotImp::state : input state is not connected an "
         "invalid state");
 
     // Can't gracefully close on an outbound connection attempt
     XRPL_ASSERT(
-        state_ != closing || m_state != connect,
+        state_ != State::closing || m_state != State::connect,
         "xrpl::PeerFinder::SlotImp::state : input state is not closing an "
         "invalid state");
 
@@ -83,10 +84,10 @@ SlotImp::activate(clock_type::time_point const& now)
 {
     // Can only become active from the accept or connected state
     XRPL_ASSERT(
-        m_state == accept || m_state == connected,
+        m_state == State::accept || m_state == State::connected,
         "xrpl::PeerFinder::SlotImp::activate : valid state");
 
-    m_state = active;
+    m_state = State::active;
     whenAcceptEndpoints = now;
 }
 
diff --git a/src/xrpld/peerfinder/detail/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h
index 626a82c932..1d5ce50184 100644
--- a/src/xrpld/peerfinder/detail/StoreSqdb.h
+++ b/src/xrpld/peerfinder/detail/StoreSqdb.h
@@ -15,6 +15,8 @@ private:
     soci::session m_sqlDb;
 
 public:
+    // Need to be named before converting
+    // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // This determines the on-database format of the data
         currentSchemaVersion = 4
diff --git a/src/xrpld/peerfinder/detail/Tuning.h b/src/xrpld/peerfinder/detail/Tuning.h
index 23a96a7374..e166ae32b8 100644
--- a/src/xrpld/peerfinder/detail/Tuning.h
+++ b/src/xrpld/peerfinder/detail/Tuning.h
@@ -6,6 +6,8 @@
 /** @{ */
 namespace xrpl::PeerFinder::Tuning {
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     //---------------------------------------------------------
     //
@@ -61,6 +63,8 @@ static std::array<int, 10> const connectionBackoff{{1, 1, 2, 3, 5, 8, 13, 21, 34
 //
 //------------------------------------------------------------------------------
 
+// Need to be named before converting
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Threshold of cache entries above which we trim.
     bootcacheSize = 1000
diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp
index 6b80d29cc6..64950fc689 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.cpp
+++ b/src/xrpld/perflog/detail/PerfLogImp.cpp
@@ -79,7 +79,7 @@ PerfLogImp::Counters::countersJson() const
     {
         Rpc value;
         {
-            std::lock_guard const lock(proc.second.mutex);
+            std::scoped_lock const lock(proc.second.mutex);
             if ((proc.second.value.started == 0u) && (proc.second.value.finished == 0u) &&
                 (proc.second.value.errored == 0u))
             {
@@ -117,7 +117,7 @@ PerfLogImp::Counters::countersJson() const
     {
         Jq value;
         {
-            std::lock_guard const lock(proc.second.mutex);
+            std::scoped_lock const lock(proc.second.mutex);
             if ((proc.second.value.queued == 0u) && (proc.second.value.started == 0u) &&
                 (proc.second.value.finished == 0u))
             {
@@ -166,7 +166,7 @@ PerfLogImp::Counters::currentJson() const
 
     Json::Value jobsArray(Json::arrayValue);
     auto const jobs = [this] {
-        std::lock_guard const lock(jobsMutex_);
+        std::scoped_lock const lock(jobsMutex_);
         return jobs_;
     }();
 
@@ -184,7 +184,7 @@ PerfLogImp::Counters::currentJson() const
     Json::Value methodsArray(Json::arrayValue);
     std::vector<MethodStart> methods;
     {
-        std::lock_guard const lock(methodsMutex_);
+        std::scoped_lock const lock(methodsMutex_);
         methods.reserve(methods_.size());
         for (auto const& m : methods_)
             methods.push_back(m.second);
@@ -280,7 +280,7 @@ PerfLogImp::report()
     Json::Value report(Json::objectValue);
     report[jss::time] = to_string(std::chrono::floor<microseconds>(present));
     {
-        std::lock_guard const lock{counters_.jobsMutex_};
+        std::scoped_lock const lock{counters_.jobsMutex_};
         report[jss::workers] = static_cast<unsigned int>(counters_.jobs_.size());
     }
     report[jss::hostid] = hostname_;
@@ -321,10 +321,10 @@ PerfLogImp::rpcStart(std::string const& method, std::uint64_t const requestId)
     }
 
     {
-        std::lock_guard const lock(counter->second.mutex);
+        std::scoped_lock const lock(counter->second.mutex);
         ++counter->second.value.started;
     }
-    std::lock_guard const lock(counters_.methodsMutex_);
+    std::scoped_lock const lock(counters_.methodsMutex_);
     counters_.methods_[requestId] = {counter->first.c_str(), steady_clock::now()};
 }
 
@@ -341,7 +341,7 @@ PerfLogImp::rpcEnd(std::string const& method, std::uint64_t const requestId, boo
     }
     steady_time_point startTime;
     {
-        std::lock_guard const lock(counters_.methodsMutex_);
+        std::scoped_lock const lock(counters_.methodsMutex_);
         auto const e = counters_.methods_.find(requestId);
         if (e != counters_.methods_.end())
         {
@@ -355,7 +355,7 @@ PerfLogImp::rpcEnd(std::string const& method, std::uint64_t const requestId, boo
             // LCOV_EXCL_STOP
         }
     }
-    std::lock_guard const lock(counter->second.mutex);
+    std::scoped_lock const lock(counter->second.mutex);
     if (finish)
     {
         ++counter->second.value.finished;
@@ -379,7 +379,7 @@ PerfLogImp::jobQueue(JobType const type)
         return;
         // LCOV_EXCL_STOP
     }
-    std::lock_guard const lock(counter->second.mutex);
+    std::scoped_lock const lock(counter->second.mutex);
     ++counter->second.value.queued;
 }
 
@@ -400,11 +400,11 @@ PerfLogImp::jobStart(
     }
 
     {
-        std::lock_guard const lock(counter->second.mutex);
+        std::scoped_lock const lock(counter->second.mutex);
         ++counter->second.value.started;
         counter->second.value.queuedDuration += dur;
     }
-    std::lock_guard const lock(counters_.jobsMutex_);
+    std::scoped_lock const lock(counters_.jobsMutex_);
     if (instance >= 0 && instance < counters_.jobs_.size())
         counters_.jobs_[instance] = {type, startTime};
 }
@@ -422,11 +422,11 @@ PerfLogImp::jobFinish(JobType const type, microseconds dur, int instance)
     }
 
     {
-        std::lock_guard const lock(counter->second.mutex);
+        std::scoped_lock const lock(counter->second.mutex);
         ++counter->second.value.finished;
         counter->second.value.runningDuration += dur;
     }
-    std::lock_guard const lock(counters_.jobsMutex_);
+    std::scoped_lock const lock(counters_.jobsMutex_);
     if (instance >= 0 && instance < counters_.jobs_.size())
         counters_.jobs_[instance] = {jtINVALID, steady_time_point()};
 }
@@ -434,7 +434,7 @@ PerfLogImp::jobFinish(JobType const type, microseconds dur, int instance)
 void
 PerfLogImp::resizeJobs(int const resize)
 {
-    std::lock_guard const lock(counters_.jobsMutex_);
+    std::scoped_lock const lock(counters_.jobsMutex_);
     if (resize > counters_.jobs_.size())
         counters_.jobs_.resize(resize, {jtINVALID, steady_time_point()});
 }
@@ -445,7 +445,7 @@ PerfLogImp::rotate()
     if (setup_.perfLog.empty())
         return;
 
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     rotate_ = true;
     cond_.notify_one();
 }
@@ -463,7 +463,7 @@ PerfLogImp::stop()
     if (thread_.joinable())
     {
         {
-            std::lock_guard const lock(mutex_);
+            std::scoped_lock const lock(mutex_);
             stop_ = true;
             cond_.notify_one();
         }
diff --git a/src/xrpld/rpc/detail/AssetCache.cpp b/src/xrpld/rpc/detail/AssetCache.cpp
index bbe8fefc98..28924ceb5f 100644
--- a/src/xrpld/rpc/detail/AssetCache.cpp
+++ b/src/xrpld/rpc/detail/AssetCache.cpp
@@ -45,7 +45,7 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
         direction == LineDirection::outgoing ? LineDirection::incoming : LineDirection::outgoing,
         hash);
 
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     auto [it, inserted] = [&]() {
         if (auto otheriter = lines_.find(otherkey); otheriter != lines_.end())
@@ -118,7 +118,7 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
 std::shared_ptr<std::vector<PathFindMPT>> const&
 AssetCache::getMPTs(xrpl::AccountID const& account)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     if (auto it = mpts_.find(account); it != mpts_.end())
         return it->second;
diff --git a/src/xrpld/rpc/detail/Handler.h b/src/xrpld/rpc/detail/Handler.h
index d249409ffe..94d0ca87cf 100644
--- a/src/xrpld/rpc/detail/Handler.h
+++ b/src/xrpld/rpc/detail/Handler.h
@@ -15,6 +15,8 @@ class Object;
 namespace xrpl::RPC {
 
 // Under what condition can we call this RPC?
+// Bitwise flags
+// NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Condition {
     NO_CONDITION = 0,
     NEEDS_NETWORK_CONNECTION = 1,
diff --git a/src/xrpld/rpc/detail/PathRequest.cpp b/src/xrpld/rpc/detail/PathRequest.cpp
index 1719567357..9707536cc8 100644
--- a/src/xrpld/rpc/detail/PathRequest.cpp
+++ b/src/xrpld/rpc/detail/PathRequest.cpp
@@ -121,7 +121,7 @@ PathRequest::~PathRequest()
 bool
 PathRequest::isNew()
 {
-    std::lock_guard const sl(mIndexLock);
+    std::scoped_lock const sl(mIndexLock);
 
     // does this path request still need its first full path
     return mLastIndex == 0;
@@ -130,7 +130,7 @@ PathRequest::isNew()
 bool
 PathRequest::needsUpdate(bool newOnly, LedgerIndex index)
 {
-    std::lock_guard const sl(mIndexLock);
+    std::scoped_lock const sl(mIndexLock);
 
     if (mInProgress)
     {
@@ -162,7 +162,7 @@ PathRequest::hasCompletion()
 void
 PathRequest::updateComplete()
 {
-    std::lock_guard const sl(mIndexLock);
+    std::scoped_lock const sl(mIndexLock);
 
     XRPL_ASSERT(mInProgress, "xrpl::PathRequest::updateComplete : in progress");
     mInProgress = false;
@@ -476,7 +476,7 @@ Json::Value
 PathRequest::doClose()
 {
     JLOG(m_journal.debug()) << iIdentifier << " closed";
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     jvStatus[jss::closed] = true;
     return jvStatus;
 }
@@ -484,7 +484,7 @@ PathRequest::doClose()
 Json::Value
 PathRequest::doStatus(Json::Value const&)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     jvStatus[jss::status] = jss::success;
     return jvStatus;
 }
@@ -714,7 +714,7 @@ PathRequest::doUpdate(
     JLOG(m_journal.debug()) << iIdentifier << " update " << (fast ? "fast" : "normal");
 
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
 
         if (!isValid(cache))
             return jvStatus;
@@ -805,7 +805,7 @@ PathRequest::doUpdate(
     }
 
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
         jvStatus = newStatus;
     }
 
diff --git a/src/xrpld/rpc/detail/PathRequestManager.cpp b/src/xrpld/rpc/detail/PathRequestManager.cpp
index 7508884be1..b05737197e 100644
--- a/src/xrpld/rpc/detail/PathRequestManager.cpp
+++ b/src/xrpld/rpc/detail/PathRequestManager.cpp
@@ -32,7 +32,7 @@ namespace xrpl {
 std::shared_ptr<AssetCache>
 PathRequestManager::getAssetCache(std::shared_ptr<ReadView const> const& ledger, bool authoritative)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     auto assetCache = assetCache_.lock();
 
@@ -66,7 +66,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 
     // Get the ledger and cache we should be using
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
         requests = requests_;
         cache = getAssetCache(inLedger, true);
     }
@@ -145,7 +145,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 
             if (remove)
             {
-                std::lock_guard const sl(mLock);
+                std::scoped_lock const sl(mLock);
 
                 // Remove any dangling weak pointers or weak
                 // pointers that refer to this path request.
@@ -189,7 +189,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
         std::shared_ptr<AssetCache> lastCache;
         {
             // Get the latest requests, cache, and ledger for next pass
-            std::lock_guard const sl(mLock);
+            std::scoped_lock const sl(mLock);
 
             if (requests_.empty())
                 break;
@@ -206,14 +206,14 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 bool
 PathRequestManager::requestsPending() const
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
     return !requests_.empty();
 }
 
 void
 PathRequestManager::insertPathRequest(PathRequest::pointer const& req)
 {
-    std::lock_guard const sl(mLock);
+    std::scoped_lock const sl(mLock);
 
     // Insert after any older unserviced requests but before
     // any serviced requests
diff --git a/src/xrpld/rpc/detail/Pathfinder.cpp b/src/xrpld/rpc/detail/Pathfinder.cpp
index a31d4522a7..ed486c80a8 100644
--- a/src/xrpld/rpc/detail/Pathfinder.cpp
+++ b/src/xrpld/rpc/detail/Pathfinder.cpp
@@ -39,9 +39,23 @@
 #include <map>
 #include <memory>
 #include <optional>
+#include <ostream>
 #include <string>
 #include <vector>
 
+namespace xrpl {
+static std::ostream&
+operator<<(std::ostream& os, Pathfinder::NodeType t)
+{
+    return os << static_cast<int>(t);
+}
+static std::ostream&
+operator<<(std::ostream& os, Pathfinder::PaymentType t)
+{
+    return os << static_cast<int>(t);
+}
+}  // namespace xrpl
+
 /*
 
 Core Pathfinding Engine
@@ -139,22 +153,22 @@ pathTypeToString(Pathfinder::PathType const& type)
     {
         switch (node)
         {
-            case Pathfinder::nt_SOURCE:
+            case Pathfinder::NodeType::nt_SOURCE:
                 ret.append("s");
                 break;
-            case Pathfinder::nt_ACCOUNTS:
+            case Pathfinder::NodeType::nt_ACCOUNTS:
                 ret.append("a");
                 break;
-            case Pathfinder::nt_BOOKS:
+            case Pathfinder::NodeType::nt_BOOKS:
                 ret.append("b");
                 break;
-            case Pathfinder::nt_XRP_BOOK:
+            case Pathfinder::NodeType::nt_XRP_BOOK:
                 ret.append("x");
                 break;
-            case Pathfinder::nt_DEST_BOOK:
+            case Pathfinder::NodeType::nt_DEST_BOOK:
                 ret.append("f");
                 break;
-            case Pathfinder::nt_DESTINATION:
+            case Pathfinder::NodeType::nt_DESTINATION:
                 ret.append("d");
                 break;
         }
@@ -310,36 +324,36 @@ Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continue
 
     // Now compute the payment type from the types of the source and destination
     // currencies.
-    PaymentType paymentType = pt_XRP_to_XRP;
+    PaymentType paymentType = PaymentType::pt_XRP_to_XRP;
     if (bSrcXrp && bDstXrp)
     {
         // XRP -> XRP
         JLOG(j_.debug()) << "XRP to XRP payment";
-        paymentType = pt_XRP_to_XRP;
+        paymentType = PaymentType::pt_XRP_to_XRP;
     }
     else if (bSrcXrp)
     {
         // XRP -> non-XRP
         JLOG(j_.debug()) << "XRP to non-XRP payment";
-        paymentType = pt_XRP_to_nonXRP;
+        paymentType = PaymentType::pt_XRP_to_nonXRP;
     }
     else if (bDstXrp)
     {
         // non-XRP -> XRP
         JLOG(j_.debug()) << "non-XRP to XRP payment";
-        paymentType = pt_nonXRP_to_XRP;
+        paymentType = PaymentType::pt_nonXRP_to_XRP;
     }
     else if (mSrcPathAsset == mDstAmount.asset())
     {
         // non-XRP -> non-XRP - Same currency
         JLOG(j_.debug()) << "non-XRP to non-XRP - same currency";
-        paymentType = pt_nonXRP_to_same;
+        paymentType = PaymentType::pt_nonXRP_to_same;
     }
     else
     {
         // non-XRP to non-XRP - Different currency
         JLOG(j_.debug()) << "non-XRP to non-XRP - cross currency";
-        paymentType = pt_nonXRP_to_nonXRP;
+        paymentType = PaymentType::pt_nonXRP_to_nonXRP;
     }
 
     // Now iterate over all paths for that paymentType.
@@ -888,29 +902,29 @@ Pathfinder::addPathsForType(
     auto nodeType = pathType.back();
     switch (nodeType)
     {
-        case nt_SOURCE:
+        case NodeType::nt_SOURCE:
             // Source must always be at the start, so pathsOut has to be empty.
             XRPL_ASSERT(pathsOut.empty(), "xrpl::Pathfinder::addPathsForType : empty paths");
             pathsOut.push_back(STPath());
             break;
 
-        case nt_ACCOUNTS:
+        case NodeType::nt_ACCOUNTS:
             addLinks(parentPaths, pathsOut, afADD_ACCOUNTS, continueCallback);
             break;
 
-        case nt_BOOKS:
+        case NodeType::nt_BOOKS:
             addLinks(parentPaths, pathsOut, afADD_BOOKS, continueCallback);
             break;
 
-        case nt_XRP_BOOK:
+        case NodeType::nt_XRP_BOOK:
             addLinks(parentPaths, pathsOut, afADD_BOOKS | afOB_XRP, continueCallback);
             break;
 
-        case nt_DEST_BOOK:
+        case NodeType::nt_DEST_BOOK:
             addLinks(parentPaths, pathsOut, afADD_BOOKS | afOB_LAST, continueCallback);
             break;
 
-        case nt_DESTINATION:
+        case NodeType::nt_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?
@@ -1321,29 +1335,29 @@ makePath(char const* string)
         switch (*string++)
         {
             case 's':  // source
-                ret.push_back(Pathfinder::nt_SOURCE);
+                ret.push_back(Pathfinder::NodeType::nt_SOURCE);
                 break;
 
             case 'a':  // accounts
-                ret.push_back(Pathfinder::nt_ACCOUNTS);
+                ret.push_back(Pathfinder::NodeType::nt_ACCOUNTS);
                 break;
 
             case 'b':  // books
-                ret.push_back(Pathfinder::nt_BOOKS);
+                ret.push_back(Pathfinder::NodeType::nt_BOOKS);
                 break;
 
             case 'x':  // xrp book
-                ret.push_back(Pathfinder::nt_XRP_BOOK);
+                ret.push_back(Pathfinder::NodeType::nt_XRP_BOOK);
                 break;
 
             case 'f':  // book to final currency
-                ret.push_back(Pathfinder::nt_DEST_BOOK);
+                ret.push_back(Pathfinder::NodeType::nt_DEST_BOOK);
                 break;
 
             case 'd':
                 // Destination (with account, if required and not already
                 // present).
-                ret.push_back(Pathfinder::nt_DESTINATION);
+                ret.push_back(Pathfinder::NodeType::nt_DESTINATION);
                 break;
 
             case 0:
@@ -1376,11 +1390,11 @@ Pathfinder::initPathTable()
     // CAUTION: Do not include rules that build default paths
 
     mPathTable.clear();
-    fillPaths(pt_XRP_to_XRP, {});
+    fillPaths(PaymentType::pt_XRP_to_XRP, {});
     /* cspell: disable */
 
     fillPaths(
-        pt_XRP_to_nonXRP,
+        PaymentType::pt_XRP_to_nonXRP,
         {{1, "sfd"},    // source -> book -> gateway
          {3, "sfad"},   // source -> book -> account -> destination
          {5, "sfaad"},  // source -> book -> account -> account -> destination
@@ -1390,7 +1404,7 @@ Pathfinder::initPathTable()
          {10, "sbafad"}});
 
     fillPaths(
-        pt_nonXRP_to_XRP,
+        PaymentType::pt_nonXRP_to_XRP,
         {{1, "sxd"},   // gateway buys XRP
          {2, "saxd"},  // source -> gateway -> book(XRP) -> dest
          {6, "saaxd"},
@@ -1400,7 +1414,7 @@ Pathfinder::initPathTable()
 
     // non-XRP to non-XRP (same currency)
     fillPaths(
-        pt_nonXRP_to_same,
+        PaymentType::pt_nonXRP_to_same,
         {
             {1, "sad"},   // source -> gateway -> destination
             {1, "sfd"},   // source -> book -> destination
@@ -1419,7 +1433,7 @@ Pathfinder::initPathTable()
 
     // non-XRP to non-XRP (different currency)
     fillPaths(
-        pt_nonXRP_to_nonXRP,
+        PaymentType::pt_nonXRP_to_nonXRP,
         {
             {1, "sfad"},
             {1, "safd"},
diff --git a/src/xrpld/rpc/detail/Pathfinder.h b/src/xrpld/rpc/detail/Pathfinder.h
index 964ec8c1d1..b4380c04ca 100644
--- a/src/xrpld/rpc/detail/Pathfinder.h
+++ b/src/xrpld/rpc/detail/Pathfinder.h
@@ -60,7 +60,7 @@ public:
         AccountID const& srcIssuer,
         std::function<bool(void)> const& continueCallback = {});
 
-    enum NodeType {
+    enum class NodeType {
         nt_SOURCE,      // The source account: with an issuer account, if needed.
         nt_ACCOUNTS,    // Accounts that connect from this source/currency.
         nt_BOOKS,       // Order books that connect to this currency.
@@ -74,7 +74,7 @@ public:
 
     // PaymentType represents the types of the source and destination currencies
     // in a path request.
-    enum PaymentType {
+    enum class PaymentType {
         pt_XRP_to_XRP,
         pt_XRP_to_nonXRP,
         pt_nonXRP_to_XRP,
diff --git a/src/xrpld/rpc/detail/RPCSub.cpp b/src/xrpld/rpc/detail/RPCSub.cpp
index f9cd860908..f102f919c4 100644
--- a/src/xrpld/rpc/detail/RPCSub.cpp
+++ b/src/xrpld/rpc/detail/RPCSub.cpp
@@ -84,7 +84,7 @@ public:
     void
     send(Json::Value const& jvObj, bool broadcast) override
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
 
         auto jm = broadcast ? j_.debug() : j_.info();
         JLOG(jm) << "RPCCall::fromNetwork push: " << jvObj;
@@ -104,7 +104,7 @@ public:
     void
     setUsername(std::string const& strUsername) override
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
 
         mUsername = strUsername;
     }
@@ -112,7 +112,7 @@ public:
     void
     setPassword(std::string const& strPassword) override
     {
-        std::lock_guard const sl(mLock);
+        std::scoped_lock const sl(mLock);
 
         mPassword = strPassword;
     }
@@ -130,7 +130,7 @@ private:
         {
             {
                 // Obtain the lock to manipulate the queue and change sending.
-                std::lock_guard const sl(mLock);
+                std::scoped_lock const sl(mLock);
 
                 if (mDeque.empty())
                 {
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index db6dad2f1c..1000df064f 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -194,7 +194,7 @@ ServerHandler::onAccept(Session& session, boost::asio::ip::tcp::endpoint endpoin
     auto const& port = session.port();
 
     auto const c = [this, &port]() {
-        std::lock_guard const lock(mutex_);
+        std::scoped_lock const lock(mutex_);
         return ++count_[port];
     }();
 
@@ -378,14 +378,14 @@ ServerHandler::onWSMessage(
 void
 ServerHandler::onClose(Session& session, boost::system::error_code const&)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     --count_[session.port()];
 }
 
 void
 ServerHandler::onStopped(Server&)
 {
-    std::lock_guard const lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     stopped_ = true;
     condition_.notify_one();
 }
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 85d5a62efc..7a60dc1f2c 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -700,7 +700,7 @@ transactionConstructImpl(
     {
         std::string reason;
         tpTrans = std::make_shared<Transaction>(stTx, reason, app);
-        if (tpTrans->getStatus() != NEW)
+        if (tpTrans->getStatus() != TransStatus::NEW)
         {
             ret.first = RPC::make_error(rpcINTERNAL, "Unable to construct transaction: " + reason);
             return ret;
diff --git a/src/xrpld/rpc/handlers/transaction/Submit.cpp b/src/xrpld/rpc/handlers/transaction/Submit.cpp
index 73260c0661..936579c276 100644
--- a/src/xrpld/rpc/handlers/transaction/Submit.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Submit.cpp
@@ -107,7 +107,7 @@ doSubmit(RPC::JsonContext& context)
 
     std::string reason;
     auto transaction = std::make_shared<Transaction>(stTx, reason, context.app);
-    if (transaction->getStatus() != NEW)
+    if (transaction->getStatus() != TransStatus::NEW)
     {
         jvResult[jss::error] = "invalidTransaction";
         jvResult[jss::error_exception] = "fails local checks: " + reason;
diff --git a/src/xrpld/shamap/NodeFamily.cpp b/src/xrpld/shamap/NodeFamily.cpp
index 2c47515498..bf1b598620 100644
--- a/src/xrpld/shamap/NodeFamily.cpp
+++ b/src/xrpld/shamap/NodeFamily.cpp
@@ -53,12 +53,12 @@ void
 NodeFamily::reset()
 {
     {
-        std::lock_guard const lock(maxSeqMutex_);
+        std::scoped_lock const lock(maxSeqMutex_);
         maxSeq_ = 0;
     }
 
-    fbCache_->reset();
-    tnCache_->reset();
+    (*fbCache_).reset();
+    (*tnCache_).reset();
 }
 
 void

From 7be98d95de02ea387ba4744c92f7c0fae42086ee Mon Sep 17 00:00:00 2001
From: Mayukha Vadari <mvadari@ripple.com>
Date: Wed, 29 Apr 2026 14:05:34 -0400
Subject: [PATCH 02/11] fix: Make assorted RPC fixes (#6529)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 API-CHANGELOG.md                              |   8 ++
 src/test/app/PayChan_test.cpp                 |  22 +++-
 src/test/rpc/LedgerData_test.cpp              |  10 ++
 src/test/rpc/LedgerRPC_test.cpp               |  17 +++
 src/test/rpc/Roles_test.cpp                   |  17 +++
 src/test/rpc/Submit_test.cpp                  |  98 +++++++++++++++++
 src/test/rpc/Subscribe_test.cpp               | 101 ++++++++++++------
 src/xrpld/rpc/detail/Role.cpp                 |   8 +-
 src/xrpld/rpc/detail/TransactionSign.cpp      |   6 +-
 .../rpc/handlers/account/AccountChannels.cpp  |   4 +
 .../rpc/handlers/account/AccountInfo.cpp      |   7 +-
 .../rpc/handlers/account/NoRippleCheck.cpp    |   8 +-
 src/xrpld/rpc/handlers/ledger/Ledger.cpp      |  62 ++++++++---
 src/xrpld/rpc/handlers/ledger/LedgerData.cpp  |   8 +-
 .../handlers/orderbook/GetAggregatePrice.cpp  |   1 -
 .../rpc/handlers/subscribe/Subscribe.cpp      |   4 +-
 src/xrpld/rpc/handlers/transaction/Submit.cpp |  18 +++-
 17 files changed, 328 insertions(+), 71 deletions(-)
 create mode 100644 src/test/rpc/Submit_test.cpp

diff --git a/API-CHANGELOG.md b/API-CHANGELOG.md
index d5faaf70af..e98239d1ab 100644
--- a/API-CHANGELOG.md
+++ b/API-CHANGELOG.md
@@ -40,6 +40,14 @@ This section contains changes targeting a future version.
 - Peer Crawler: The `port` field in `overlay.active[]` now consistently returns an integer instead of a string for outbound peers. [#6318](https://github.com/XRPLF/rippled/pull/6318)
 - `ping`: The `ip` field is no longer returned as an empty string for proxied connections without a forwarded-for header. It is now omitted, consistent with the behavior for identified connections. [#6730](https://github.com/XRPLF/rippled/pull/6730)
 - gRPC `GetLedgerDiff`: Fixed error message that incorrectly said "base ledger not validated" when the desired ledger was not validated. [#6730](https://github.com/XRPLF/rippled/pull/6730)
+- `account_channels`: The `destination_account` field now returns an error if the value is not a string. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `subscribe`: The `taker` field in the `books` array now returns an error if the value is not a string. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `account_info`: The `urlgravatar` field now uses HTTPS instead of HTTP. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `ledger`: The `full`, `accounts`, `transactions`, `expand`, `binary`, `owner_funds`, and `queue` fields now return an error if the value is not a boolean. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `ledger_data`: The `binary` field now returns an error if the value is not a boolean. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `submit`: The `fail_hard` field now returns an error if the value is not a boolean. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- `subscribe`: The `taker` field in the `books` array now returns `actMalformed` instead of `badIssuer` if the value is not a valid account. [#6529](https://github.com/XRPLF/rippled/pull/6529)
+- Fixed a bug in `Forwarded` HTTP header parsing where the extracted IP address could be incorrect when no comma or semicolon delimiter follows the address. This could cause the server to misidentify a client's IP address when operating behind a reverse proxy. [#6529](https://github.com/XRPLF/rippled/pull/6529)
 
 ## XRP Ledger server version 3.1.0
 
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index 1f4376a656..f69187c50f 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -1019,7 +1019,8 @@ struct PayChan_test : public beast::unit_test::suite
             auto testInvalidAccountParam = [&](auto const& param) {
                 Json::Value params;
                 params[jss::account] = param;
-                auto jrr = env.rpc("json", "account_channels", to_string(params))[jss::result];
+                auto const jrr =
+                    env.rpc("json", "account_channels", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
                 BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'account'.");
             };
@@ -1031,6 +1032,25 @@ struct PayChan_test : public beast::unit_test::suite
             testInvalidAccountParam(Json::Value(Json::objectValue));
             testInvalidAccountParam(Json::Value(Json::arrayValue));
         }
+        {
+            // test destination_account non-string
+            auto testInvalidDestAccountParam = [&](auto const& param) {
+                Json::Value params;
+                params[jss::account] = alice.human();
+                params[jss::destination_account] = param;
+                auto const jrr =
+                    env.rpc("json", "account_channels", to_string(params))[jss::result];
+                BEAST_EXPECT(jrr[jss::error] == "invalidParams");
+                BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'destination_account'.");
+            };
+
+            testInvalidDestAccountParam(1);
+            testInvalidDestAccountParam(1.1);
+            testInvalidDestAccountParam(true);
+            testInvalidDestAccountParam(Json::Value(Json::nullValue));
+            testInvalidDestAccountParam(Json::Value(Json::objectValue));
+            testInvalidDestAccountParam(Json::Value(Json::arrayValue));
+        }
         {
             auto const r = env.rpc("account_channels", alice.human(), bob.human());
             BEAST_EXPECT(r[jss::result][jss::channels].size() == 1);
diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp
index 612899e47d..32d26f770c 100644
--- a/src/test/rpc/LedgerData_test.cpp
+++ b/src/test/rpc/LedgerData_test.cpp
@@ -165,6 +165,16 @@ public:
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error_message] == "ledgerNotFound");
         }
+
+        {
+            // binary not a boolean
+            Json::Value jvParams;
+            jvParams[jss::binary] = "true";
+            auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
+            BEAST_EXPECT(jrr[jss::error] == "invalidParams");
+            BEAST_EXPECT(jrr[jss::status] == "error");
+            BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'binary', not boolean.");
+        }
     }
 
     void
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index c8c40ce0cc..48fcfd2dec 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -165,6 +165,23 @@ class LedgerRPC_test : public beast::unit_test::suite
             auto const ret = env.rpc("json", "ledger", "{ \"ledger_index\" : 1000000000000000 }");
             checkErrorValue(ret, "invalidParams", "Invalid parameters.");
         }
+
+        {
+            // test all boolean fields with non-boolean values
+            auto testBooleanField = [&](Json::StaticString const& field) {
+                Json::Value jvParams;
+                jvParams[field] = "blah";
+                auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
+                checkErrorValue(jrr, "invalidParams", "Invalid parameters.");
+            };
+            testBooleanField(jss::full);
+            testBooleanField(jss::accounts);
+            testBooleanField(jss::transactions);
+            testBooleanField(jss::expand);
+            testBooleanField(jss::binary);
+            testBooleanField(jss::owner_funds);
+            testBooleanField(jss::queue);
+        }
     }
 
     void
diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp
index eaf6143f5d..c2b1d36a0b 100644
--- a/src/test/rpc/Roles_test.cpp
+++ b/src/test/rpc/Roles_test.cpp
@@ -25,6 +25,7 @@ class Roles_test : public beast::unit_test::suite
     void
     testRoles()
     {
+        testcase("Roles");
         using namespace test::jtx;
 
         {
@@ -224,6 +225,21 @@ class Roles_test : public beast::unit_test::suite
             BEAST_EXPECT(rpcRes["role"] == "proxied");
             BEAST_EXPECT(rpcRes["ip"] == "::11:22:33:44:45.55.65.75");
             BEAST_EXPECT(isValidIpAddress(rpcRes["ip"].asString()));
+
+            // Test: "for=" not at the beginning AND no trailing delimiter.
+            // This exercises the fix for the buffer over-read bug where
+            // the remaining length was incorrectly calculated.
+            headers["Forwarded"] = "by=203.0.113.43;for=1.2.3.4";
+            rpcRes = env.rpc(headers, "ping")["result"];
+            BEAST_EXPECT(rpcRes["role"] == "proxied");
+            BEAST_EXPECT(rpcRes["ip"] == "1.2.3.4");
+            BEAST_EXPECT(isValidIpAddress(rpcRes["ip"].asString()));
+
+            headers["Forwarded"] = "proto=https;by=proxy.example.com;for=5.6.7.8";
+            rpcRes = env.rpc(headers, "ping")["result"];
+            BEAST_EXPECT(rpcRes["role"] == "proxied");
+            BEAST_EXPECT(rpcRes["ip"] == "5.6.7.8");
+            BEAST_EXPECT(isValidIpAddress(rpcRes["ip"].asString()));
         }
 
         {
@@ -252,6 +268,7 @@ class Roles_test : public beast::unit_test::suite
     testInvalidIpAddresses()
     {
         using namespace test::jtx;
+        testcase("Invalid IP addresses");
 
         {
             Env env(*this);
diff --git a/src/test/rpc/Submit_test.cpp b/src/test/rpc/Submit_test.cpp
new file mode 100644
index 0000000000..ea5ef145c4
--- /dev/null
+++ b/src/test/rpc/Submit_test.cpp
@@ -0,0 +1,98 @@
+#include <test/jtx/Account.h>
+#include <test/jtx/Env.h>
+#include <test/jtx/JTx.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/pay.h>
+
+#include <xrpl/basics/strHex.h>
+#include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/Seed.h>
+#include <xrpl/protocol/jss.h>
+
+namespace xrpl::test {
+
+class Submit_test : public beast::unit_test::suite
+{
+public:
+    void
+    testFailHardValidation()
+    {
+        testcase("fail_hard parameter validation");
+        using namespace jtx;
+        Env env(*this);
+        Account const alice{"alice"};
+        Account const bob{"bob"};
+        env.fund(XRP(10000), alice, bob);
+        env.close();
+
+        // Lambda to test invalid fail_hard parameter types
+        auto testInvalidFailHard = [&](auto const& param) {
+            // Test with tx_blob path
+            {
+                JTx const jt = env.jt(pay(alice, bob, XRP(1)));
+                auto const txBlob = strHex(jt.stx->getSerializer().slice());
+
+                Json::Value params;
+                params[jss::tx_blob] = txBlob;
+                params[jss::fail_hard] = param;
+                auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
+                BEAST_EXPECT(jrr[jss::error] == "invalidParams");
+                BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'fail_hard', not boolean.");
+            }
+
+            // Test with tx_json path (deprecated signing)
+            {
+                Json::Value params;
+                params[jss::secret] = toBase58(generateSeed("alice"));
+                params[jss::tx_json] = pay("alice", "bob", XRP(1));
+                params[jss::fail_hard] = param;
+                auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
+                BEAST_EXPECT(jrr[jss::error] == "invalidParams");
+                BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'fail_hard', not boolean.");
+            }
+        };
+
+        // Test all invalid types
+        testInvalidFailHard("true");
+        testInvalidFailHard("yes");
+        testInvalidFailHard(1);
+        testInvalidFailHard(0);
+        testInvalidFailHard(1.5);
+        testInvalidFailHard(Json::Value(Json::objectValue));
+        testInvalidFailHard(Json::Value(Json::arrayValue));
+
+        // Valid boolean values should work (not return invalidParams)
+        {
+            JTx const jt = env.jt(pay(alice, bob, XRP(1)));
+            auto const txBlob = strHex(jt.stx->getSerializer().slice());
+
+            Json::Value params;
+            params[jss::tx_blob] = txBlob;
+            params[jss::fail_hard] = true;
+            auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
+            BEAST_EXPECT(!jrr.isMember(jss::error) || jrr[jss::error] != "invalidParams");
+        }
+        {
+            JTx const jt = env.jt(pay(alice, bob, XRP(1)));
+            auto const txBlob = strHex(jt.stx->getSerializer().slice());
+
+            Json::Value params;
+            params[jss::tx_blob] = txBlob;
+            params[jss::fail_hard] = false;
+            auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
+            BEAST_EXPECT(!jrr.isMember(jss::error) || jrr[jss::error] != "invalidParams");
+        }
+    }
+
+    void
+    run() override
+    {
+        testFailHardValidation();
+    }
+};
+
+BEAST_DEFINE_TESTSUITE(Submit, rpc, xrpl);
+
+}  // namespace xrpl::test
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index 02c4fd8c8d..0e43713c2a 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -214,16 +214,12 @@ public:
             // Check stream update for payment transaction
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 return jv[jss::meta]["AffectedNodes"][1u]["CreatedNode"]["NewFields"]
-                         [jss::Account]  //
-                    == Account("alice").human() &&
-                    jv[jss::transaction][jss::TransactionType]  //
-                    == jss::Payment &&
-                    jv[jss::transaction][jss::DeliverMax]  //
-                    == std::to_string(10000000000 + baseFee) &&
-                    jv[jss::transaction][jss::Fee]  //
-                    == std::to_string(baseFee) &&
-                    jv[jss::transaction][jss::Sequence]  //
-                    == 1;
+                         [jss::Account] == Account("alice").human() &&
+                    jv[jss::transaction][jss::TransactionType] == jss::Payment &&
+                    jv[jss::transaction][jss::DeliverMax] ==
+                    std::to_string(10000000000 + baseFee) &&
+                    jv[jss::transaction][jss::Fee] == std::to_string(baseFee) &&
+                    jv[jss::transaction][jss::Sequence] == 1;
             }));
 
             // Check stream update for accountset transaction
@@ -579,7 +575,7 @@ public:
         auto wsc = makeWSClient(env.app().config());
 
         {
-            auto jr = env.rpc("json", method, "{}")[jss::result];
+            auto const jr = env.rpc("json", method, "{}")[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
             BEAST_EXPECT(jr[jss::error_message] == "Invalid parameters.");
         }
@@ -589,7 +585,7 @@ public:
             jv[jss::url] = "not-a-url";
             jv[jss::username] = "admin";
             jv[jss::password] = "password";
-            auto jr = env.rpc("json", method, to_string(jv))[jss::result];
+            auto const jr = env.rpc("json", method, to_string(jv))[jss::result];
             if (subscribe)
             {
                 BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -602,7 +598,7 @@ public:
         {
             Json::Value jv;
             jv[jss::url] = "ftp://scheme.not.supported.tld";
-            auto jr = env.rpc("json", method, to_string(jv))[jss::result];
+            auto const jr = env.rpc("json", method, to_string(jv))[jss::result];
             if (subscribe)
             {
                 BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -614,7 +610,7 @@ public:
             Env env_nonadmin{*this, single_thread_io(no_admin(envconfig()))};
             Json::Value jv;
             jv[jss::url] = "no-url";
-            auto jr = env_nonadmin.rpc("json", method, to_string(jv))[jss::result];
+            auto const jr = env_nonadmin.rpc("json", method, to_string(jv))[jss::result];
             BEAST_EXPECT(jr[jss::error] == "noPermission");
             BEAST_EXPECT(jr[jss::error_message] == "You don't have permission for this command.");
         }
@@ -634,7 +630,7 @@ public:
             {
                 Json::Value jv;
                 jv[f] = nonArray;
-                auto jr = wsc->invoke(method, jv)[jss::result];
+                auto const jr = wsc->invoke(method, jv)[jss::result];
                 BEAST_EXPECT(jr[jss::error] == "invalidParams");
                 BEAST_EXPECT(jr[jss::error_message] == "Invalid parameters.");
             }
@@ -642,7 +638,7 @@ public:
             {
                 Json::Value jv;
                 jv[f] = Json::arrayValue;
-                auto jr = wsc->invoke(method, jv)[jss::result];
+                auto const jr = wsc->invoke(method, jv)[jss::result];
                 BEAST_EXPECT(jr[jss::error] == "actMalformed");
                 BEAST_EXPECT(jr[jss::error_message] == "Account malformed.");
             }
@@ -652,7 +648,7 @@ public:
         {
             Json::Value jv;
             jv[jss::books] = nonArray;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
             BEAST_EXPECT(jr[jss::error_message] == "Invalid parameters.");
         }
@@ -661,7 +657,7 @@ public:
             Json::Value jv;
             jv[jss::books] = Json::arrayValue;
             jv[jss::books][0u] = 1;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
             BEAST_EXPECT(jr[jss::error_message] == "Invalid parameters.");
         }
@@ -672,7 +668,7 @@ public:
             jv[jss::books][0u] = Json::objectValue;
             jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
             jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "srcCurMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Source currency is malformed.");
         }
@@ -684,7 +680,7 @@ public:
             jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
             jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "ZZZZ";
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "srcCurMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Source currency is malformed.");
         }
@@ -697,7 +693,7 @@ public:
             jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_pays][jss::issuer] = 1;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "srcIsrMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Source issuer is malformed.");
         }
@@ -710,7 +706,7 @@ public:
             jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_pays][jss::issuer] = Account{"gateway"}.human() + "DEAD";
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "srcIsrMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Source issuer is malformed.");
         }
@@ -722,7 +718,7 @@ public:
             jv[jss::books][0u][jss::taker_pays] =
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
             jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             // NOTE: this error is slightly incongruous with the
             // equivalent source currency error
             BEAST_EXPECT(jr[jss::error] == "dstAmtMalformed");
@@ -737,7 +733,7 @@ public:
             jv[jss::books][0u][jss::taker_pays] =
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "ZZZZ";
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             // NOTE: this error is slightly incongruous with the
             // equivalent source currency error
             BEAST_EXPECT(jr[jss::error] == "dstAmtMalformed");
@@ -753,7 +749,7 @@ public:
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_gets][jss::issuer] = 1;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "dstIsrMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Destination issuer is malformed.");
         }
@@ -766,7 +762,7 @@ public:
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_gets][jss::issuer] = Account{"gateway"}.human() + "DEAD";
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "dstIsrMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Destination issuer is malformed.");
         }
@@ -779,7 +775,7 @@ public:
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
             jv[jss::books][0u][jss::taker_gets] =
                 Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "badMarket");
             BEAST_EXPECT(jr[jss::error_message] == "No such market.");
         }
@@ -788,7 +784,7 @@ public:
         {
             Json::Value jv;
             jv[jss::streams] = nonArray;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
             BEAST_EXPECT(jr[jss::error_message] == "Invalid parameters.");
         }
@@ -797,7 +793,7 @@ public:
             Json::Value jv;
             jv[jss::streams] = Json::arrayValue;
             jv[jss::streams][0u] = 1;
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "malformedStream");
             BEAST_EXPECT(jr[jss::error_message] == "Stream malformed.");
         }
@@ -806,10 +802,55 @@ public:
             Json::Value jv;
             jv[jss::streams] = Json::arrayValue;
             jv[jss::streams][0u] = "not_a_stream";
-            auto jr = wsc->invoke(method, jv)[jss::result];
+            auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "malformedStream");
             BEAST_EXPECT(jr[jss::error_message] == "Stream malformed.");
         }
+
+        if (subscribe)
+        {
+            // invalid taker - not a string
+            {
+                Json::Value jv;
+                jv[jss::books] = Json::arrayValue;
+                jv[jss::books][0u] = Json::objectValue;
+                jv[jss::books][0u][jss::taker_pays] =
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
+                jv[jss::books][0u][jss::taker] = 1;
+                auto const jr = wsc->invoke(method, jv)[jss::result];
+                BEAST_EXPECTS(jr[jss::error] == "actMalformed", jr.toStyledString());
+                BEAST_EXPECT(jr[jss::error_message] == "Account malformed.");
+            }
+
+            // invalid taker - malformed account string
+            {
+                Json::Value jv;
+                jv[jss::books] = Json::arrayValue;
+                jv[jss::books][0u] = Json::objectValue;
+                jv[jss::books][0u][jss::taker_pays] =
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
+                jv[jss::books][0u][jss::taker] = "not_an_account";
+                auto const jr = wsc->invoke(method, jv)[jss::result];
+                BEAST_EXPECTS(jr[jss::error] == "actMalformed", jr.toStyledString());
+                BEAST_EXPECT(jr[jss::error_message] == "Account malformed.");
+            }
+
+            // invalid taker - account string with extra characters
+            {
+                Json::Value jv;
+                jv[jss::books] = Json::arrayValue;
+                jv[jss::books][0u] = Json::objectValue;
+                jv[jss::books][0u][jss::taker_pays] =
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
+                jv[jss::books][0u][jss::taker] = Account{"alice"}.human() + "DEAD";
+                auto const jr = wsc->invoke(method, jv)[jss::result];
+                BEAST_EXPECTS(jr[jss::error] == "actMalformed", jr.toStyledString());
+                BEAST_EXPECT(jr[jss::error_message] == "Account malformed.");
+            }
+        }
     }
 
     void
diff --git a/src/xrpld/rpc/detail/Role.cpp b/src/xrpld/rpc/detail/Role.cpp
index 325b7eb3c6..f28905ba20 100644
--- a/src/xrpld/rpc/detail/Role.cpp
+++ b/src/xrpld/rpc/detail/Role.cpp
@@ -272,12 +272,12 @@ forwardedFor(http_request_type const& request)
 
         // We found a "for=".  Scan for the end of the IP address.
         std::size_t const pos = [&found, &it]() {
-            std::size_t const pos =
-                std::string_view(found, it->value().end() - found).find_first_of(",;");
-            if (pos != std::string_view::npos)
+            auto const remaining = static_cast<std::size_t>(it->value().end() - found);
+            if (std::size_t const pos = std::string_view(found, remaining).find_first_of(",;");
+                pos != std::string_view::npos)
                 return pos;
 
-            return it->value().size() - forStr.size();
+            return remaining;
         }();
 
         return extractIpAddrFromField({found, pos});
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 7a60dc1f2c..284279fa3f 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -575,11 +575,7 @@ transactionPreProcessImpl(
 
     if (verify)
     {
-        if (!sle)
-        {
-            // XXX Ignore transactions for accounts not created.
-            return rpcError(rpcSRC_ACT_NOT_FOUND);
-        }
+        // sle validity is checked above
 
         JLOG(j.trace()) << "verify: " << toBase58(calcAccountID(pk)) << " : "
                         << toBase58(srcAddressID);
diff --git a/src/xrpld/rpc/handlers/account/AccountChannels.cpp b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
index 1fa492a3c0..51282f699f 100644
--- a/src/xrpld/rpc/handlers/account/AccountChannels.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
@@ -95,7 +95,11 @@ doAccountChannels(RPC::JsonContext& context)
 
     std::string strDst;
     if (params.isMember(jss::destination_account))
+    {
+        if (!params[jss::destination_account].isString())
+            return RPC::invalid_field_error(jss::destination_account);
         strDst = params[jss::destination_account].asString();
+    }
 
     auto const raDstAccount = [&]() -> std::optional<AccountID> {
         return strDst.empty() ? std::nullopt : parseBase58<AccountID>(strDst);
diff --git a/src/xrpld/rpc/handlers/account/AccountInfo.cpp b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
index 019ff83def..c1c6c71339 100644
--- a/src/xrpld/rpc/handlers/account/AccountInfo.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
@@ -58,10 +58,9 @@ injectSLE(Json::Value& jv, SLE const& sle)
             Blob const b(hash.begin(), hash.end());
             std::string md5 = strHex(makeSlice(b));
             boost::to_lower(md5);
-            // VFALCO TODO Give a name and move this constant
-            //             to a more visible location. Also
-            //             shouldn't this be https?
-            jv[jss::urlgravatar] = str(boost::format("http://www.gravatar.com/avatar/%s") % md5);
+            // VFALCO TODO Give a name to this constant and move it
+            //             to a more visible location.
+            jv[jss::urlgravatar] = str(boost::format("https://www.gravatar.com/avatar/%s") % md5);
         }
     }
     else
diff --git a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
index 54964be8da..d05d74170f 100644
--- a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
@@ -118,14 +118,14 @@ doNoRippleCheck(RPC::JsonContext& context)
 
     bool const bDefaultRipple = (sle->getFieldU32(sfFlags) & lsfDefaultRipple) != 0u;
 
-    if ((static_cast<int>(bDefaultRipple) & static_cast<int>(!roleGateway)) != 0)
+    if (bDefaultRipple && !roleGateway)
     {
         problems.append(
             "You appear to have set your default ripple flag even though you "
             "are not a gateway. This is not recommended unless you are "
             "experimenting");
     }
-    else if ((static_cast<int>(roleGateway) & static_cast<int>(!bDefaultRipple)) != 0)
+    else if (roleGateway && !bDefaultRipple)
     {
         problems.append("You should immediately set your default ripple flag");
         if (transactions)
@@ -148,12 +148,12 @@ doNoRippleCheck(RPC::JsonContext& context)
 
                 std::string problem;
                 bool needFix = false;
-                if (bNoRipple & roleGateway)
+                if (bNoRipple && roleGateway)
                 {
                     problem = "You should clear the no ripple flag on your ";
                     needFix = true;
                 }
-                else if (!roleGateway & !bNoRipple)
+                else if (!roleGateway && !bNoRipple)
                 {
                     problem = "You should probably set the no ripple flag on your ";
                     needFix = true;
diff --git a/src/xrpld/rpc/handlers/ledger/Ledger.cpp b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
index dd2280b51c..dc5f24dffc 100644
--- a/src/xrpld/rpc/handlers/ledger/Ledger.cpp
+++ b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
@@ -8,6 +8,7 @@
 #include <xrpld/rpc/Status.h>
 #include <xrpld/rpc/detail/RPCLedgerHelpers.h>
 
+#include <xrpl/basics/Expected.h>
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
@@ -42,28 +43,56 @@ Status
 LedgerHandler::check()
 {
     auto const& params = context_.params;
+
+    auto getBool = [&](Json::StaticString const& field) -> Expected<bool, Status> {
+        if (!params.isMember(field))
+        {
+            return false;
+        }
+        if (!params[field].isBool())
+        {
+            return Unexpected(rpcINVALID_PARAMS);
+        }
+
+        return params[field].asBool();
+    };
+
+    auto const full = getBool(jss::full);
+    auto const transactions = getBool(jss::transactions);
+    auto const accounts = getBool(jss::accounts);
+    auto const expand = getBool(jss::expand);
+    auto const binary = getBool(jss::binary);
+    auto const owner_funds = getBool(jss::owner_funds);
+    auto const queue = getBool(jss::queue);
+
+    if (!full.has_value())
+        return full.error();
+    if (!transactions.has_value())
+        return transactions.error();
+    if (!accounts.has_value())
+        return accounts.error();
+    if (!expand.has_value())
+        return expand.error();
+    if (!binary.has_value())
+        return binary.error();
+    if (!owner_funds.has_value())
+        return owner_funds.error();
+    if (!queue.has_value())
+        return queue.error();
+
+    options_ = (*full ? LedgerFill::full : 0) | (*expand ? LedgerFill::expand : 0) |
+        (*transactions ? LedgerFill::dumpTxrp : 0) | (*accounts ? LedgerFill::dumpState : 0) |
+        (*binary ? LedgerFill::binary : 0) | (*owner_funds ? LedgerFill::ownerFunds : 0) |
+        (*queue ? LedgerFill::dumpQueue : 0);
+
     bool const needsLedger = params.isMember(jss::ledger) || params.isMember(jss::ledger_hash) ||
         params.isMember(jss::ledger_index);
     if (!needsLedger)
         return Status::OK;
-
     if (auto s = lookupLedger(ledger_, context_, result_))
         return s;
 
-    bool const full = params[jss::full].asBool();
-    bool const transactions = params[jss::transactions].asBool();
-    bool const accounts = params[jss::accounts].asBool();
-    bool const expand = params[jss::expand].asBool();
-    bool const binary = params[jss::binary].asBool();
-    bool const owner_funds = params[jss::owner_funds].asBool();
-    bool const queue = params[jss::queue].asBool();
-
-    options_ = (full ? LedgerFill::full : 0) | (expand ? LedgerFill::expand : 0) |
-        (transactions ? LedgerFill::dumpTxrp : 0) | (accounts ? LedgerFill::dumpState : 0) |
-        (binary ? LedgerFill::binary : 0) | (owner_funds ? LedgerFill::ownerFunds : 0) |
-        (queue ? LedgerFill::dumpQueue : 0);
-
-    if (full || accounts)
+    if (*full || *accounts)
     {
         // Until some sane way to get full ledgers has been implemented,
         // disallow retrieving all state nodes.
@@ -76,7 +105,8 @@ LedgerHandler::check()
         }
         context_.loadType = binary ? Resource::feeMediumBurdenRPC : Resource::feeHeavyBurdenRPC;
     }
-    if (queue)
+
+    if (*queue)
     {
         if (!ledger_ || !ledger_->open())
         {
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerData.cpp b/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
index f0a361d951..367eaa8973 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
@@ -54,7 +54,13 @@ doLedgerData(RPC::JsonContext& context)
             return RPC::expected_field_error(jss::marker, "valid");
     }
 
-    bool const isBinary = params[jss::binary].asBool();
+    bool isBinary = false;
+    if (params.isMember(jss::binary))
+    {
+        if (!params[jss::binary].isBool())
+            return RPC::expected_field_error(jss::binary, "boolean");
+        isBinary = params[jss::binary].asBool();
+    }
 
     int limit = -1;
     if (params.isMember(jss::limit))
diff --git a/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
index 10359c810e..7db7c2312e 100644
--- a/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
@@ -241,7 +241,6 @@ doGetAggregatePrice(RPC::JsonContext& context)
         return result;
     }
 
-    // Get the ledger
     std::shared_ptr<ReadView const> ledger;
     result = RPC::lookupLedger(ledger, context);
     if (!ledger)
diff --git a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
index 9be273587d..f5e33922dc 100644
--- a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
@@ -248,9 +248,11 @@ doSubscribe(RPC::JsonContext& context)
 
             if (j.isMember(jss::taker))
             {
+                if (!j[jss::taker].isString())
+                    return rpcError(rpcACT_MALFORMED);
                 takerID = parseBase58<AccountID>(j[jss::taker].asString());
                 if (!takerID)
-                    return rpcError(rpcBAD_ISSUER);
+                    return rpcError(rpcACT_MALFORMED);
             }
 
             if (j.isMember(jss::domain))
diff --git a/src/xrpld/rpc/handlers/transaction/Submit.cpp b/src/xrpld/rpc/handlers/transaction/Submit.cpp
index 936579c276..8b54083628 100644
--- a/src/xrpld/rpc/handlers/transaction/Submit.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Submit.cpp
@@ -4,10 +4,12 @@
 #include <xrpld/rpc/Role.h>
 #include <xrpld/rpc/detail/TransactionSign.h>
 
+#include <xrpl/basics/Expected.h>
 #include <xrpl/basics/Slice.h>
 #include <xrpl/basics/StringUtilities.h>
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/basics/strHex.h>
+#include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/RPCErr.h>
 #include <xrpl/protocol/STTx.h>
@@ -24,11 +26,15 @@
 
 namespace xrpl {
 
-static NetworkOPs::FailHard
+static Expected<NetworkOPs::FailHard, Json::Value>
 getFailHard(RPC::JsonContext const& context)
 {
+    if (context.params.isMember(jss::fail_hard) && !context.params[jss::fail_hard].isBool())
+    {
+        return Unexpected(RPC::expected_field_error(jss::fail_hard, "boolean"));
+    }
     return NetworkOPs::doFailHard(
-        context.params.isMember("fail_hard") && context.params["fail_hard"].asBool());
+        context.params.isMember(jss::fail_hard) && context.params[jss::fail_hard].asBool());
 }
 
 // {
@@ -43,6 +49,8 @@ doSubmit(RPC::JsonContext& context)
     if (!context.params.isMember(jss::tx_blob))
     {
         auto const failType = getFailHard(context);
+        if (!failType)
+            return failType.error();
 
         if (context.role != Role::ADMIN && !context.app.config().canSign())
             return RPC::make_error(rpcNOT_SUPPORTED, "Signing is not supported by this server.");
@@ -50,7 +58,7 @@ doSubmit(RPC::JsonContext& context)
         auto ret = RPC::transactionSubmit(
             context.params,
             context.apiVersion,
-            failType,
+            *failType,
             context.role,
             context.ledgerMaster.getValidatedLedgerAge(),
             context.app,
@@ -118,8 +126,10 @@ doSubmit(RPC::JsonContext& context)
     try
     {
         auto const failType = getFailHard(context);
+        if (!failType)
+            return failType.error();
 
-        context.netOps.processTransaction(transaction, isUnlimited(context.role), true, failType);
+        context.netOps.processTransaction(transaction, isUnlimited(context.role), true, *failType);
     }
     catch (std::exception& e)
     {

From 6ae090ba45d91bac63177f121b6d0f628d49421f Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Wed, 29 Apr 2026 19:14:16 +0100
Subject: [PATCH 03/11] ci: Use print-env from XRPLF/actions (#7052)

---
 .github/actions/print-env/action.yml          | 43 -------------------
 .github/dependabot.yml                        | 11 -----
 .github/workflows/pre-commit.yml              |  2 +-
 .../workflows/reusable-build-test-config.yml  |  2 +-
 .../workflows/reusable-clang-tidy-files.yml   |  2 +-
 .github/workflows/upload-conan-deps.yml       |  2 +-
 6 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 .github/actions/print-env/action.yml

diff --git a/.github/actions/print-env/action.yml b/.github/actions/print-env/action.yml
deleted file mode 100644
index 3527ca6f02..0000000000
--- a/.github/actions/print-env/action.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Print build environment
-description: "Print environment and some tooling versions"
-
-runs:
-  using: composite
-  steps:
-    - name: Check configuration (Windows)
-      if: ${{ runner.os == 'Windows' }}
-      shell: bash
-      run: |
-        echo 'Checking environment variables.'
-        set
-
-    - name: Check configuration (Linux and macOS)
-      if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
-      shell: bash
-      run: |
-        echo 'Checking path.'
-        echo ${PATH} | tr ':' '\n'
-
-        echo 'Checking environment variables.'
-        env | sort
-
-        echo 'Checking compiler version.'
-        ${{ runner.os == 'Linux' && '${CC}' || 'clang' }} --version
-
-        echo 'Checking Ninja version.'
-        ninja --version
-
-        echo 'Checking nproc version.'
-        nproc --version
-
-    - name: Check configuration (all)
-      shell: bash
-      run: |
-        echo 'Checking Ccache version.'
-        ccache --version
-
-        echo 'Checking CMake version.'
-        cmake --version
-
-        echo 'Checking Conan version.'
-        conan --version
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 66e319e0e7..0e6b840fe7 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -33,17 +33,6 @@ updates:
       prefix: "ci: [DEPENDABOT] "
     target-branch: develop
 
-  - package-ecosystem: github-actions
-    directory: .github/actions/print-env/
-    schedule:
-      interval: weekly
-      day: monday
-      time: "04:00"
-      timezone: Etc/GMT
-    commit-message:
-      prefix: "ci: [DEPENDABOT] "
-    target-branch: develop
-
   - package-ecosystem: github-actions
     directory: .github/actions/setup-conan/
     schedule:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 89255f0e47..2f15b82266 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   # Call the workflow in the XRPLF/actions repo that runs the pre-commit hooks.
   run-hooks:
-    uses: XRPLF/actions/.github/workflows/pre-commit.yml@9307df762265e15c745ddcdb38a581c989f7f349
+    uses: XRPLF/actions/.github/workflows/pre-commit.yml@5e942d61bf32f7557a7c159cfac4712a687b3e3a
     with:
       runs_on: ubuntu-latest
       container: '{ "image": "ghcr.io/xrplf/ci/tools-rippled-pre-commit:sha-41ec7c1" }'
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index c2c862d73f..b4cb266004 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -116,7 +116,7 @@ jobs:
         run: echo "CCACHE_LOGFILE=${{ runner.temp }}/ccache.log" >> "${GITHUB_ENV}"
 
       - name: Print build environment
-        uses: ./.github/actions/print-env
+        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
diff --git a/.github/workflows/reusable-clang-tidy-files.yml b/.github/workflows/reusable-clang-tidy-files.yml
index 9b99f418b1..75969060a5 100644
--- a/.github/workflows/reusable-clang-tidy-files.yml
+++ b/.github/workflows/reusable-clang-tidy-files.yml
@@ -40,7 +40,7 @@ jobs:
           enable_ccache: false
 
       - name: Print build environment
-        uses: ./.github/actions/print-env
+        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml
index f14efde05b..49c9ab041a 100644
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.github/workflows/upload-conan-deps.yml
@@ -75,7 +75,7 @@ jobs:
           enable_ccache: false
 
       - name: Print build environment
-        uses: ./.github/actions/print-env
+        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf

From dbd646bd537835a8f7b0b3b78d079f5e931dcee5 Mon Sep 17 00:00:00 2001
From: Zhiyuan Wang <96991820+Kassaking7@users.noreply.github.com>
Date: Wed, 29 Apr 2026 14:17:01 -0400
Subject: [PATCH 04/11] fix: Store `Delegate` object in delegating and
 authorized account directories for proper deletion (#6681)

---
 API-CHANGELOG.md                              |   2 +
 .../xrpl/protocol/detail/ledger_entries.macro |   1 +
 .../ledger_entries/Delegate.h                 |  35 ++++
 .../tx/transactors/delegate/DelegateSet.h     |   6 +-
 .../tx/transactors/account/AccountDelete.cpp  |   6 +-
 .../tx/transactors/delegate/DelegateSet.cpp   |  43 +++-
 src/test/app/Delegate_test.cpp                | 191 ++++++++++++++++--
 .../ledger_entries/DelegateTests.cpp          |  52 +++++
 8 files changed, 298 insertions(+), 38 deletions(-)

diff --git a/API-CHANGELOG.md b/API-CHANGELOG.md
index e98239d1ab..56a45c132a 100644
--- a/API-CHANGELOG.md
+++ b/API-CHANGELOG.md
@@ -28,6 +28,8 @@ This section contains changes targeting a future version.
 
 ### Additions
 
+- `ledger_entry`, `account_objects`: The `Delegate` ledger entry now includes an optional `DestinationNode` field, which stores the index into the authorized account's owner directory. This field is present on entries created after bidirectional directory tracking was introduced and may appear in RPC responses for those entries. ([#6681](https://github.com/XRPLF/rippled/pull/6681))
+
 - `server_definitions`: Added the following new sections to the response ([#6321](https://github.com/XRPLF/rippled/pull/6321)):
   - `TRANSACTION_FORMATS`: Describes the fields and their optionality for each transaction type, including common fields shared across all transactions.
   - `LEDGER_ENTRY_FORMATS`: Describes the fields and their optionality for each ledger entry type, including common fields shared across all ledger entries.
diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro
index e4182f0cba..93cef79ef7 100644
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -466,6 +466,7 @@ LEDGER_ENTRY(ltDELEGATE, 0x0083, Delegate, delegate, ({
     {sfAuthorize,            soeREQUIRED},
     {sfPermissions,          soeREQUIRED},
     {sfOwnerNode,            soeREQUIRED},
+    {sfDestinationNode,      soeOPTIONAL},
     {sfPreviousTxnID,        soeREQUIRED},
     {sfPreviousTxnLgrSeq,    soeREQUIRED},
 }))
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Delegate.h b/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
index 4d937eb99a..e2660632cd 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
@@ -90,6 +90,30 @@ public:
         return this->sle_->at(sfOwnerNode);
     }
 
+    /**
+     * @brief Get sfDestinationNode (soeOPTIONAL)
+     * @return The field value, or std::nullopt if not present.
+     */
+    [[nodiscard]]
+    protocol_autogen::Optional<SF_UINT64::type::value_type>
+    getDestinationNode() const
+    {
+        if (hasDestinationNode())
+            return this->sle_->at(sfDestinationNode);
+        return std::nullopt;
+    }
+
+    /**
+     * @brief Check if sfDestinationNode is present.
+     * @return True if the field is present, false otherwise.
+     */
+    [[nodiscard]]
+    bool
+    hasDestinationNode() const
+    {
+        return this->sle_->isFieldPresent(sfDestinationNode);
+    }
+
     /**
      * @brief Get sfPreviousTxnID (soeREQUIRED)
      * @return The field value.
@@ -203,6 +227,17 @@ public:
         return *this;
     }
 
+    /**
+     * @brief Set sfDestinationNode (soeOPTIONAL)
+     * @return Reference to this builder for method chaining.
+     */
+    DelegateBuilder&
+    setDestinationNode(std::decay_t<typename SF_UINT64::type::value_type> const& value)
+    {
+        object_[sfDestinationNode] = value;
+        return *this;
+    }
+
     /**
      * @brief Set sfPreviousTxnID (soeREQUIRED)
      * @return Reference to this builder for method chaining.
diff --git a/include/xrpl/tx/transactors/delegate/DelegateSet.h b/include/xrpl/tx/transactors/delegate/DelegateSet.h
index 25cb21e9b5..eaa22532ae 100644
--- a/include/xrpl/tx/transactors/delegate/DelegateSet.h
+++ b/include/xrpl/tx/transactors/delegate/DelegateSet.h
@@ -38,11 +38,7 @@ public:
 
     // Interface used by AccountDelete
     static TER
-    deleteDelegate(
-        ApplyView& view,
-        std::shared_ptr<SLE> const& sle,
-        AccountID const& account,
-        beast::Journal j);
+    deleteDelegate(ApplyView& view, std::shared_ptr<SLE> const& sle, beast::Journal j);
 };
 
 }  // namespace xrpl
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index 596a8a1560..b687ed0bd7 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -179,12 +179,12 @@ TER
 removeDelegateFromLedger(
     ServiceRegistry&,
     ApplyView& view,
-    AccountID const& account,
-    uint256 const& delIndex,
+    AccountID const&,
+    uint256 const&,
     std::shared_ptr<SLE> const& sleDel,
     beast::Journal j)
 {
-    return DelegateSet::deleteDelegate(view, sleDel, account, j);
+    return DelegateSet::deleteDelegate(view, sleDel, j);
 }
 
 // Return nullptr if the LedgerEntryType represents an obligation that can't
diff --git a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
index 9fd67f877d..c211231902 100644
--- a/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
+++ b/src/libxrpl/tx/transactors/delegate/DelegateSet.cpp
@@ -5,7 +5,6 @@
 #include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/ledger/helpers/DirectoryHelpers.h>
-#include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/SField.h>
@@ -83,7 +82,7 @@ DelegateSet::doApply()
         if (permissions.empty())
         {
             // if permissions array is empty, delete the ledger object.
-            return deleteDelegate(view(), sle, account_, j_);
+            return deleteDelegate(view(), sle, j_);
         }
 
         sle->setFieldArray(sfPermissions, permissions);
@@ -106,6 +105,8 @@ DelegateSet::doApply()
     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_));
 
@@ -113,6 +114,17 @@ DelegateSet::doApply()
         return tecDIR_FULL;  // LCOV_EXCL_LINE
 
     (*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.
+    auto const destPage = ctx_.view().dirInsert(
+        keylet::ownerDir(authAccount), delegateKey, describeOwnerDir(authAccount));
+
+    if (!destPage)
+        return tecDIR_FULL;  // LCOV_EXCL_LINE
+
+    (*sle)[sfDestinationNode] = *destPage;
+
     ctx_.view().insert(sle);
     adjustOwnerCount(ctx_.view(), sleOwner, 1, ctx_.journal);
 
@@ -120,16 +132,16 @@ DelegateSet::doApply()
 }
 
 TER
-DelegateSet::deleteDelegate(
-    ApplyView& view,
-    std::shared_ptr<SLE> const& sle,
-    AccountID const& account,
-    beast::Journal j)
+DelegateSet::deleteDelegate(ApplyView& view, std::shared_ptr<SLE> const& sle, beast::Journal j)
 {
     if (!sle)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
-    if (!view.dirRemove(keylet::ownerDir(account), (*sle)[sfOwnerNode], sle->key(), false))
+    auto const delegator = (*sle)[sfAccount];
+    auto const delegatee = (*sle)[sfAuthorize];
+
+    // Remove from delegating account's owner directory
+    if (!view.dirRemove(keylet::ownerDir(delegator), (*sle)[sfOwnerNode], sle->key(), false))
     {
         // LCOV_EXCL_START
         JLOG(j.fatal()) << "Unable to delete Delegate from owner.";
@@ -137,7 +149,20 @@ DelegateSet::deleteDelegate(
         // LCOV_EXCL_STOP
     }
 
-    auto const sleOwner = view.peek(keylet::account(account));
+    // Remove from authorized account's owner directory, if present
+    if (auto const optPage = (*sle)[~sfDestinationNode])
+    {
+        if (!view.dirRemove(keylet::ownerDir(delegatee), *optPage, sle->key(), false))
+        {
+            // LCOV_EXCL_START
+            JLOG(j.fatal()) << "Unable to delete Delegate from authorized account.";
+            return tefBAD_LEDGER;
+            // LCOV_EXCL_STOP
+        }
+    }
+
+    // Only the delegating account's owner count was incremented on creation
+    auto const sleOwner = view.peek(keylet::account(delegator));
     if (!sleOwner)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index d5847c5a85..fdcbbc7a1d 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -28,6 +28,7 @@
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/ledger/Dir.h>
 #include <xrpl/ledger/helpers/DelegateHelpers.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
@@ -41,6 +42,7 @@
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -584,32 +586,179 @@ class Delegate_test : public beast::unit_test::suite
         testcase("test deleting account");
         using namespace jtx;
 
-        Env env(*this);
-        Account const alice{"alice"};
-        Account const bob{"bob"};
-        env.fund(XRP(100000), alice, bob);
-        env.close();
-
-        env(delegate::set(alice, bob, {"Payment"}));
-        env.close();
-        BEAST_EXPECT(env.closed()->exists(keylet::delegate(alice.id(), bob.id())));
-
-        for (std::uint32_t i = 0; i < 256; ++i)
+        // Delegator (alice) deletes account: Delegate object is cleaned up from
+        // both alice's and bob's owner directories.
+        {
+            Env env(*this);
+            Account const alice{"alice"};
+            Account const bob{"bob"};
+            Account const carol{"carol"};
+            env.fund(XRP(100000), alice, bob, carol);
             env.close();
 
-        auto const aliceBalance = env.balance(alice);
-        auto const bobBalance = env.balance(bob);
+            env(delegate::set(alice, bob, {"Payment"}));
+            env.close();
 
-        // alice deletes account, this will remove the Delegate object
-        auto const deleteFee = drops(env.current()->fees().increment);
-        env(acctdelete(alice, bob), fee(deleteFee));
-        env.close();
+            auto const delegateKey = keylet::delegate(alice.id(), bob.id());
+            BEAST_EXPECT(env.closed()->exists(delegateKey));
 
-        BEAST_EXPECT(!env.closed()->exists(keylet::account(alice.id())));
-        BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(alice.id())));
-        BEAST_EXPECT(env.balance(bob) == bobBalance + aliceBalance - deleteFee);
+            auto hasKey = [](xrpl::Dir const& dir, uint256 const& key) {
+                return std::any_of(  // NOLINT(modernize-use-ranges)
+                    dir.begin(), dir.end(), [&](auto const& sle) { return sle->key() == key; });
+            };
 
-        BEAST_EXPECT(!env.closed()->exists(keylet::delegate(alice.id(), bob.id())));
+            // Delegate object should appear in both alice's and bob's directories
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(alice.id())), delegateKey.key));
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(bob.id())), delegateKey.key));
+
+            for (std::uint32_t i = 0; i < 256; ++i)
+                env.close();
+
+            auto const aliceBalance = env.balance(alice);
+            auto const carolBalance = env.balance(carol);
+
+            // alice deletes account, this will remove the Delegate object from
+            // both alice's and bob's owner directories
+            auto const deleteFee = drops(env.current()->fees().increment);
+            env(acctdelete(alice, carol), fee(deleteFee));
+            env.close();
+
+            BEAST_EXPECT(!env.closed()->exists(keylet::account(alice.id())));
+            BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(alice.id())));
+            BEAST_EXPECT(!env.closed()->exists(delegateKey));
+            // bob's directory should no longer reference the Delegate object
+            BEAST_EXPECT(
+                !hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(bob.id())), delegateKey.key));
+            BEAST_EXPECT(env.balance(carol) == carolBalance + aliceBalance - deleteFee);
+        }
+
+        // Delegatee (bob) deletes account: Delegate object is cleaned up from
+        // both alice's and bob's owner directories, freeing alice's reserve so
+        // she can subsequently delete her own account.
+        {
+            Env env(*this);
+            Account const alice{"alice"};
+            Account const bob{"bob"};
+            Account const carol{"carol"};
+            env.fund(XRP(100000), alice, bob, carol);
+            env.close();
+
+            env(delegate::set(alice, bob, {"Payment"}));
+            env.close();
+
+            auto const delegateKey = keylet::delegate(alice.id(), bob.id());
+            BEAST_EXPECT(env.closed()->exists(delegateKey));
+
+            auto hasKey = [](xrpl::Dir const& dir, uint256 const& key) {
+                return std::any_of(  // NOLINT(modernize-use-ranges)
+                    dir.begin(), dir.end(), [&](auto const& sle) { return sle->key() == key; });
+            };
+
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(alice.id())), delegateKey.key));
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(bob.id())), delegateKey.key));
+
+            // The Delegate entry counts against alice's ownerCount.
+            auto const sleAlice = env.closed()->read(keylet::account(alice.id()));
+            BEAST_EXPECT(sleAlice);
+            BEAST_EXPECT(sleAlice->getFieldU32(sfOwnerCount) == 1);
+
+            for (std::uint32_t i = 0; i < 256; ++i)
+                env.close();
+
+            auto const bobBalance = env.balance(bob);
+            auto const carolBalance = env.balance(carol);
+
+            // bob (the authorized/delegatee account) deletes his account.
+            // This must clean up the Delegate object from both alice's and
+            // bob's owner directories so alice's delegation does not survive
+            // a potential account resurrection.
+            auto const deleteFee = drops(env.current()->fees().increment);
+            env(acctdelete(bob, carol), fee(deleteFee));
+            env.close();
+
+            BEAST_EXPECT(!env.closed()->exists(keylet::account(bob.id())));
+            BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(bob.id())));
+            BEAST_EXPECT(!env.closed()->exists(delegateKey));
+            // alice's directory should no longer reference the Delegate object
+            BEAST_EXPECT(
+                !hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(alice.id())), delegateKey.key));
+            BEAST_EXPECT(env.balance(carol) == carolBalance + bobBalance - deleteFee);
+
+            // alice's ownerCount is now 0; she can delete her own account.
+            auto const sleAlice2 = env.closed()->read(keylet::account(alice.id()));
+            BEAST_EXPECT(sleAlice2);
+            BEAST_EXPECT(sleAlice2->getFieldU32(sfOwnerCount) == 0);
+
+            auto const aliceDeleteFee = drops(env.current()->fees().increment);
+            env(acctdelete(alice, carol), fee(aliceDeleteFee));
+            env.close();
+
+            BEAST_EXPECT(!env.closed()->exists(keylet::account(alice.id())));
+        }
+
+        // Multiple delegators -> same delegatee: when the delegatee (bob)
+        // deletes his account, ALL Delegate objects (from alice and carol)
+        // must be cleaned up from every delegator's directory.
+        {
+            Env env(*this);
+            Account const alice{"alice"};
+            Account const bob{"bob"};
+            Account const carol{"carol"};
+            Account const dave{"dave"};
+            env.fund(XRP(100000), alice, bob, carol, dave);
+            env.close();
+
+            // Both alice and carol delegate to bob
+            env(delegate::set(alice, bob, {"Payment"}));
+            env(delegate::set(carol, bob, {"EscrowCreate"}));
+            env.close();
+
+            auto const aliceBobKey = keylet::delegate(alice.id(), bob.id());
+            auto const carolBobKey = keylet::delegate(carol.id(), bob.id());
+
+            auto hasKey = [](xrpl::Dir const& dir, uint256 const& key) {
+                return std::any_of(  // NOLINT(modernize-use-ranges)
+                    dir.begin(), dir.end(), [&](auto const& sle) { return sle->key() == key; });
+            };
+
+            // Both Delegate objects exist and are in bob's directory
+            BEAST_EXPECT(env.closed()->exists(aliceBobKey));
+            BEAST_EXPECT(env.closed()->exists(carolBobKey));
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(bob.id())), aliceBobKey.key));
+            BEAST_EXPECT(
+                hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(bob.id())), carolBobKey.key));
+
+            for (std::uint32_t i = 0; i < 256; ++i)
+                env.close();
+
+            auto const bobBalance = env.balance(bob);
+            auto const daveBalance = env.balance(dave);
+
+            auto const deleteFee = drops(env.current()->fees().increment);
+            env(acctdelete(bob, dave), fee(deleteFee));
+            env.close();
+
+            // bob's account and directory are gone
+            BEAST_EXPECT(!env.closed()->exists(keylet::account(bob.id())));
+            BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(bob.id())));
+
+            // Both Delegate objects are erased
+            BEAST_EXPECT(!env.closed()->exists(aliceBobKey));
+            BEAST_EXPECT(!env.closed()->exists(carolBobKey));
+
+            // alice's and carol's directories no longer reference the objects
+            BEAST_EXPECT(
+                !hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(alice.id())), aliceBobKey.key));
+            BEAST_EXPECT(
+                !hasKey(xrpl::Dir(*env.closed(), keylet::ownerDir(carol.id())), carolBobKey.key));
+
+            BEAST_EXPECT(env.balance(dave) == daveBalance + bobBalance - deleteFee);
+        }
     }
 
     void
diff --git a/src/tests/libxrpl/protocol_autogen/ledger_entries/DelegateTests.cpp b/src/tests/libxrpl/protocol_autogen/ledger_entries/DelegateTests.cpp
index 68d0e6c08e..24c7c97d7f 100644
--- a/src/tests/libxrpl/protocol_autogen/ledger_entries/DelegateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/ledger_entries/DelegateTests.cpp
@@ -24,6 +24,7 @@ TEST(DelegateTests, BuilderSettersRoundTrip)
     auto const authorizeValue = canonical_ACCOUNT();
     auto const permissionsValue = canonical_ARRAY();
     auto const ownerNodeValue = canonical_UINT64();
+    auto const destinationNodeValue = canonical_UINT64();
     auto const previousTxnIDValue = canonical_UINT256();
     auto const previousTxnLgrSeqValue = canonical_UINT32();
 
@@ -36,6 +37,7 @@ TEST(DelegateTests, BuilderSettersRoundTrip)
         previousTxnLgrSeqValue
     };
 
+    builder.setDestinationNode(destinationNodeValue);
 
     builder.setLedgerIndex(index);
     builder.setFlags(0x1u);
@@ -82,6 +84,14 @@ TEST(DelegateTests, BuilderSettersRoundTrip)
         expectEqualField(expected, actual, "sfPreviousTxnLgrSeq");
     }
 
+    {
+        auto const& expected = destinationNodeValue;
+        auto const actualOpt = entry.getDestinationNode();
+        ASSERT_TRUE(actualOpt.has_value());
+        expectEqualField(expected, *actualOpt, "sfDestinationNode");
+        EXPECT_TRUE(entry.hasDestinationNode());
+    }
+
     EXPECT_TRUE(entry.hasLedgerIndex());
     auto const ledgerIndex = entry.getLedgerIndex();
     ASSERT_TRUE(ledgerIndex.has_value());
@@ -99,6 +109,7 @@ TEST(DelegateTests, BuilderFromSleRoundTrip)
     auto const authorizeValue = canonical_ACCOUNT();
     auto const permissionsValue = canonical_ARRAY();
     auto const ownerNodeValue = canonical_UINT64();
+    auto const destinationNodeValue = canonical_UINT64();
     auto const previousTxnIDValue = canonical_UINT256();
     auto const previousTxnLgrSeqValue = canonical_UINT32();
 
@@ -108,6 +119,7 @@ TEST(DelegateTests, BuilderFromSleRoundTrip)
     sle->at(sfAuthorize) = authorizeValue;
     sle->setFieldArray(sfPermissions, permissionsValue);
     sle->at(sfOwnerNode) = ownerNodeValue;
+    sle->at(sfDestinationNode) = destinationNodeValue;
     sle->at(sfPreviousTxnID) = previousTxnIDValue;
     sle->at(sfPreviousTxnLgrSeq) = previousTxnLgrSeqValue;
 
@@ -180,6 +192,19 @@ TEST(DelegateTests, BuilderFromSleRoundTrip)
         expectEqualField(expected, fromBuilder, "sfPreviousTxnLgrSeq");
     }
 
+    {
+        auto const& expected = destinationNodeValue;
+
+        auto const fromSleOpt = entryFromSle.getDestinationNode();
+        auto const fromBuilderOpt = entryFromBuilder.getDestinationNode();
+
+        ASSERT_TRUE(fromSleOpt.has_value());
+        ASSERT_TRUE(fromBuilderOpt.has_value());
+
+        expectEqualField(expected, *fromSleOpt, "sfDestinationNode");
+        expectEqualField(expected, *fromBuilderOpt, "sfDestinationNode");
+    }
+
     EXPECT_EQ(entryFromSle.getKey(), index);
     EXPECT_EQ(entryFromBuilder.getKey(), index);
 }
@@ -220,4 +245,31 @@ TEST(DelegateTests, BuilderThrowsOnWrongEntryType)
     EXPECT_THROW(DelegateBuilder{wrongEntry.getSle()}, std::runtime_error);
 }
 
+// 5) Build with only required fields and verify optional fields return nullopt.
+TEST(DelegateTests, OptionalFieldsReturnNullopt)
+{
+    uint256 const index{3u};
+
+    auto const accountValue = canonical_ACCOUNT();
+    auto const authorizeValue = canonical_ACCOUNT();
+    auto const permissionsValue = canonical_ARRAY();
+    auto const ownerNodeValue = canonical_UINT64();
+    auto const previousTxnIDValue = canonical_UINT256();
+    auto const previousTxnLgrSeqValue = canonical_UINT32();
+
+    DelegateBuilder builder{
+        accountValue,
+        authorizeValue,
+        permissionsValue,
+        ownerNodeValue,
+        previousTxnIDValue,
+        previousTxnLgrSeqValue
+    };
+
+    auto const entry = builder.build(index);
+
+    // Verify optional fields are not present
+    EXPECT_FALSE(entry.hasDestinationNode());
+    EXPECT_FALSE(entry.getDestinationNode().has_value());
+}
 }

From 4d0ea8ae36778ae200178985a2318fb835cea8d3 Mon Sep 17 00:00:00 2001
From: Bart <bthomee@users.noreply.github.com>
Date: Thu, 30 Apr 2026 06:22:11 -0400
Subject: [PATCH 05/11] refactor: Apply various minor improvements and
 corrections (#7045)

Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>
---
 include/xrpl/protocol/detail/features.macro   |  1 -
 src/libxrpl/beast/core/CurrentThreadName.cpp  |  9 ++----
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp | 20 +++++-------
 src/test/app/NFToken_test.cpp                 | 32 +++++++++----------
 src/test/rpc/LedgerEntry_test.cpp             |  4 +--
 src/xrpld/overlay/detail/PeerImp.cpp          |  2 +-
 src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp |  2 +-
 7 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro
index bad43dd6ed..8fbc28123f 100644
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -19,7 +19,6 @@ XRPL_FIX    (Cleanup3_2_0,                Supported::no, VoteBehavior::DefaultNo
 XRPL_FEATURE(MPTokensV2,                  Supported::no, VoteBehavior::DefaultNo)
 XRPL_FIX    (Security3_1_3,               Supported::no, VoteBehavior::DefaultNo)
 XRPL_FIX    (PermissionedDomainInvariant, Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (ExpiredNFTokenOfferRemoval,  Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FIX    (BatchInnerSigs,              Supported::no, VoteBehavior::DefaultNo)
 XRPL_FEATURE(LendingProtocol,             Supported::yes, VoteBehavior::DefaultNo)
 XRPL_FEATURE(PermissionDelegationV1_1,    Supported::no,  VoteBehavior::DefaultNo)
diff --git a/src/libxrpl/beast/core/CurrentThreadName.cpp b/src/libxrpl/beast/core/CurrentThreadName.cpp
index ccd3df5f74..fd8a4764fa 100644
--- a/src/libxrpl/beast/core/CurrentThreadName.cpp
+++ b/src/libxrpl/beast/core/CurrentThreadName.cpp
@@ -81,12 +81,9 @@ setCurrentThreadNameImpl(std::string_view name)
 {
     // truncate and set the thread name.
     char boundedName[maxThreadNameLength + 1];
-    std::snprintf(
-        boundedName,
-        sizeof(boundedName),
-        "%.*s",
-        static_cast<int>(maxThreadNameLength),
-        name.data());  // NOLINT(bugprone-suspicious-stringview-data-usage)
+    auto const boundedSize = name.size() < maxThreadNameLength ? name.size() : maxThreadNameLength;
+    name.copy(boundedName, boundedSize);
+    boundedName[boundedSize] = '\0';
 
     pthread_setname_np(pthread_self(), boundedName);
 
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
index 9de382733d..099b174778 100644
--- a/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
+++ b/src/libxrpl/tx/transactors/nft/NFTokenAcceptOffer.cpp
@@ -68,15 +68,12 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
 
             if (hasExpired(ctx.view, (*offerSLE)[~sfExpiration]))
             {
-                // Before fixExpiredNFTokenOfferRemoval amendment, expired
-                // offers caused tecEXPIRED in preclaim, leaving them on ledger
-                // forever. After the amendment, we allow expired offers to
-                // reach doApply() where they get deleted and tecEXPIRED is
-                // returned.
-                if (!ctx.view.rules().enabled(fixExpiredNFTokenOfferRemoval))
+                // Before fixSecurity3_1_3 amendment, expired offers caused tecEXPIRED in preclaim,
+                // leaving them on ledger forever. After the amendment, we allow expired offers to
+                // reach doApply() where they get deleted and tecEXPIRED is returned.
+                if (!ctx.view.rules().enabled(fixSecurity3_1_3))
                     return {nullptr, tecEXPIRED};
-                // Amendment enabled: return the expired offer to be handled in
-                // doApply
+                // Amendment enabled: return the expired offer to be handled in doApply.
             }
 
             if ((*offerSLE)[sfAmount].negative())
@@ -453,10 +450,9 @@ NFTokenAcceptOffer::doApply()
     auto bo = loadToken(ctx_.tx[~sfNFTokenBuyOffer]);
     auto so = loadToken(ctx_.tx[~sfNFTokenSellOffer]);
 
-    // With fixExpiredNFTokenOfferRemoval amendment, check for expired offers
-    // and delete them, returning tecEXPIRED. This ensures expired offers
-    // are properly cleaned up from the ledger.
-    if (view().rules().enabled(fixExpiredNFTokenOfferRemoval))
+    // With fixSecurity3_1_3 amendment, check for expired offers and delete them, returning
+    // tecEXPIRED. This ensures expired offers are properly cleaned up from the ledger.
+    if (view().rules().enabled(fixSecurity3_1_3))
     {
         bool foundExpired = false;
 
diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp
index 40934cc095..a9252d2b5e 100644
--- a/src/test/app/NFToken_test.cpp
+++ b/src/test/app/NFToken_test.cpp
@@ -1096,10 +1096,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // The buy offer must not have expired.
         // NOTE: this is only a preclaim check with the
-        // fixExpiredNFTokenOfferRemoval amendment disabled.
+        // fixSecurity3_1_3 amendment disabled.
         env(token::acceptBuyOffer(alice, buyerExpOfferIndex), ter(tecEXPIRED));
         env.close();
-        if (features[fixExpiredNFTokenOfferRemoval])
+        if (features[fixSecurity3_1_3])
         {
             buyerCount--;
         }
@@ -1117,12 +1117,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // The sell offer must not have expired.
         // NOTE: this is only a preclaim check with the
-        // fixExpiredNFTokenOfferRemoval amendment disabled.
+        // fixSecurity3_1_3 amendment disabled.
         env(token::acceptSellOffer(buyer, aliceExpOfferIndex), ter(tecEXPIRED));
         env.close();
         // Alice's count is decremented by one when the expired offer is
         // removed.
-        if (features[fixExpiredNFTokenOfferRemoval])
+        if (features[fixSecurity3_1_3])
         {
             aliceCount--;
         }
@@ -3101,10 +3101,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // No one can accept an expired sell offer.
             env(token::acceptSellOffer(buyer, offer1), ter(tecEXPIRED));
 
-            // With fixExpiredNFTokenOfferRemoval amendment, the first accept
+            // With fixSecurity3_1_3 amendment, the first accept
             // attempt deletes the expired offer. Without the amendment,
             // the offer remains and we can try to accept it again.
-            if (features[fixExpiredNFTokenOfferRemoval])
+            if (features[fixSecurity3_1_3])
             {
                 // After amendment: offer was deleted by first accept attempt
                 minterCount--;
@@ -3123,7 +3123,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == minterCount);
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
-            if (!features[fixExpiredNFTokenOfferRemoval])
+            if (!features[fixSecurity3_1_3])
             {
                 // Before amendment: expired offer still exists and needs to be
                 // cancelled
@@ -3189,10 +3189,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // An expired buy offer cannot be accepted.
             env(token::acceptBuyOffer(minter, offer1), ter(tecEXPIRED));
 
-            // With fixExpiredNFTokenOfferRemoval amendment, the first accept
+            // With fixSecurity3_1_3 amendment, the first accept
             // attempt deletes the expired offer. Without the amendment,
             // the offer remains and we can try to accept it again.
-            if (features[fixExpiredNFTokenOfferRemoval])
+            if (features[fixSecurity3_1_3])
             {
                 // After amendment: offer was deleted by first accept attempt
                 buyerCount--;
@@ -3211,7 +3211,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == minterCount);
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
-            if (!features[fixExpiredNFTokenOfferRemoval])
+            if (!features[fixSecurity3_1_3])
             {
                 // Before amendment: expired offer still exists and can be
                 // cancelled
@@ -3288,7 +3288,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(token::brokerOffers(issuer, buyOffer1, sellOffer1), ter(tecEXPIRED));
             env.close();
 
-            if (features[fixExpiredNFTokenOfferRemoval])
+            if (features[fixSecurity3_1_3])
             {
                 // With amendment: expired offers are deleted
                 minterCount--;
@@ -3298,7 +3298,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == minterCount);
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
-            if (features[fixExpiredNFTokenOfferRemoval])
+            if (features[fixSecurity3_1_3])
             {
                 // The buy offer was deleted, so no need to cancel it
                 // The sell offer still exists, so we can cancel it
@@ -3377,7 +3377,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
-            if (features[fixExpiredNFTokenOfferRemoval])
+            if (features[fixSecurity3_1_3])
             {
                 // After amendment: expired offers were deleted during broker
                 // attempt
@@ -3463,7 +3463,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // The expired offers are still in the ledger.
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
-            if (!features[fixExpiredNFTokenOfferRemoval])
+            if (!features[fixSecurity3_1_3])
             {
                 // Before amendment: expired offers still exist in ledger
                 BEAST_EXPECT(ownerCount(env, minter) == 2);
@@ -7190,7 +7190,7 @@ public:
     {
         testWithFeats(
             allFeatures - fixNFTokenReserve - featureNFTokenMintOffer - featureDynamicNFT -
-            fixExpiredNFTokenOfferRemoval);
+            fixSecurity3_1_3);
     }
 };
 
@@ -7227,7 +7227,7 @@ class NFTokenWOExpiredOfferRemoval_test : public NFTokenBaseUtil_test
     void
     run() override
     {
-        testWithFeats(allFeatures - fixExpiredNFTokenOfferRemoval);
+        testWithFeats(allFeatures - fixSecurity3_1_3);
     }
 };
 
diff --git a/src/test/rpc/LedgerEntry_test.cpp b/src/test/rpc/LedgerEntry_test.cpp
index d208d718f4..d6e1ccc2ce 100644
--- a/src/test/rpc/LedgerEntry_test.cpp
+++ b/src/test/rpc/LedgerEntry_test.cpp
@@ -1201,7 +1201,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             checkErrorValue(
                 jrr[jss::result],
                 "malformedAuthorizedCredentials",
-                "Invalid field 'authorized_credentials', not array.");
+                "Invalid field 'authorized_credentials', not array of objects.");
         }
 
         {
@@ -1219,7 +1219,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             checkErrorValue(
                 jrr[jss::result],
                 "malformedAuthorizedCredentials",
-                "Invalid field 'authorized_credentials', not array.");
+                "Invalid field 'authorized_credentials', not array of objects.");
         }
 
         {
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 01cad680ba..d90bbaff22 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -2639,7 +2639,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
                     {
                         fee_.update(
                             Resource::feeModerateBurdenPeer,
-                            " Reply limit reached. Truncating reply.");
+                            "Reply limit reached. Truncating reply.");
                         break;
                     }
                 }
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
index 4de75da1b0..fe59cf27f3 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
@@ -267,7 +267,7 @@ parseAuthorizeCredentials(Json::Value const& jv)
         if (!jo.isObject())
         {
             return LedgerEntryHelpers::invalidFieldError(
-                "malformedAuthorizedCredentials", jss::authorized_credentials, "array");
+                "malformedAuthorizedCredentials", jss::authorized_credentials, "array of objects");
         }
 
         if (auto const value = LedgerEntryHelpers::hasRequired(

From 6407f0fa52ca6322e1a0186d8dd9adf880b98150 Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Thu, 30 Apr 2026 11:36:12 +0100
Subject: [PATCH 06/11] fix: Address code review comments regarding
 `boost::coroutine2` (#6977)

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
---
 cmake/XrplInterface.cmake  |  1 -
 conan/profiles/sanitizers  |  7 +++++++
 conanfile.py               |  6 ------
 include/xrpl/core/Coro.ipp | 12 +++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cmake/XrplInterface.cmake b/cmake/XrplInterface.cmake
index 7add613f5a..825cb63310 100644
--- a/cmake/XrplInterface.cmake
+++ b/cmake/XrplInterface.cmake
@@ -23,7 +23,6 @@ target_compile_definitions(
         BOOST_FILESYSTEM_NO_DEPRECATED
         >
         $<$<NOT:$<BOOL:${boost_show_deprecated}>>:
-        BOOST_COROUTINES2_NO_DEPRECATION_WARNING
         BOOST_BEAST_ALLOW_DEPRECATED
         BOOST_FILESYSTEM_DEPRECATED
         >
diff --git a/conan/profiles/sanitizers b/conan/profiles/sanitizers
index 6d37425f43..073fcf3072 100644
--- a/conan/profiles/sanitizers
+++ b/conan/profiles/sanitizers
@@ -82,5 +82,12 @@ tools.info.package_id:confs+=["tools.build:cxxflags", "tools.build:exelinkflags"
         boost/*:without_context=False
         # Boost stacktrace fails to build with some sanitizers
         boost/*:without_stacktrace=True
+    {% elif "thread" in sanitizers %}
+        # Build Boost.Context with ucontext backend for TSAN. fcontext (assembly)
+        # has no TSAN annotations, so without this the BOOST_USE_TSAN/BOOST_USE_UCONTEXT
+        # defines in [conf] would be ineffective.
+        boost/*:extra_b2_flags=context-impl=ucontext thread-sanitizer=on define=BOOST_USE_TSAN=1
+        boost/*:without_context=False
+        boost/*:without_stacktrace=True
     {% endif %}
 {% endif %}
diff --git a/conanfile.py b/conanfile.py
index 4949516bfe..66de2e2d57 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -129,12 +129,6 @@ class Xrpl(ConanFile):
         if self.settings.compiler in ["clang", "gcc"]:
             self.options["boost"].without_cobalt = True
 
-        # Check if environment variable exists
-        if "SANITIZERS" in os.environ:
-            sanitizers = os.environ["SANITIZERS"]
-            if "address" in sanitizers.lower():
-                self.default_options["fPIC"] = False
-
     def requirements(self):
         self.requires("boost/1.90.0", force=True, transitive_headers=True)
         self.requires("date/3.0.4", transitive_headers=True)
diff --git a/include/xrpl/core/Coro.ipp b/include/xrpl/core/Coro.ipp
index 2343f805a5..e7461b1b85 100644
--- a/include/xrpl/core/Coro.ipp
+++ b/include/xrpl/core/Coro.ipp
@@ -2,17 +2,19 @@
 
 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 coroStackSize = 1536 * 1024;
+
 template <class F>
 JobQueue::Coro::Coro(Coro_create_t, JobQueue& jq, JobType type, std::string const& name, F&& f)
     : jq_(jq)
     , type_(type)
     , name_(name)
     , coro_(
-          // Stack size of 1MB wasn't sufficient for deep calls. ASAN tests flagged the issue. Hence
-          // increasing the size to 1.5MB.
-          boost::context::protected_fixedsize_stack(1536 * 1024),
-          [this, fn = std::forward<F>(f)](
-              boost::coroutines2::asymmetric_coroutine<void>::push_type& do_yield) {
+          boost::context::protected_fixedsize_stack(coroStackSize),
+          [this,
+           fn = std::forward<F>(f)](boost::coroutines2::coroutine<void>::push_type& do_yield) {
               yield_ = &do_yield;
               yield();
               fn(shared_from_this());

From 31180f94c23476626703ae6e47c842bdd171104e Mon Sep 17 00:00:00 2001
From: Vito Tumas <5780819+Tapanito@users.noreply.github.com>
Date: Thu, 30 Apr 2026 15:05:09 +0200
Subject: [PATCH 07/11] fix: Prevents overwriting a bool value in an invariant
 (#6609)

Co-authored-by: Ed Hennis <ed@ripple.com>
---
 include/xrpl/protocol/Rules.h                |  15 ++
 src/libxrpl/protocol/Rules.cpp               |  12 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp |  41 ++++-
 src/test/app/AMM_test.cpp                    |   4 +-
 src/test/app/Batch_test.cpp                  |   3 +-
 src/test/app/Invariants_test.cpp             | 161 +++++++++++++++++--
 src/test/app/LoanBroker_test.cpp             |   4 +-
 src/test/app/Loan_test.cpp                   |   4 +-
 src/test/app/Vault_test.cpp                  |  45 +++---
 src/test/rpc/GatewayBalances_test.cpp        |   4 +-
 10 files changed, 240 insertions(+), 53 deletions(-)

diff --git a/include/xrpl/protocol/Rules.h b/include/xrpl/protocol/Rules.h
index 7faf602cfd..604bb24700 100644
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -8,6 +8,21 @@
 
 namespace xrpl {
 
+/** Check whether a feature is enabled in the current ledger rules
+ *
+ * @param feature The feature to be tested.
+ * @param resultIfNoRules What to return if called from outside a Transactor context.
+ */
+bool
+isFeatureEnabled(uint256 const& feature, bool resultIfNoRules);
+
+/** Check whether a feature is enabled in the current ledger rules
+ *
+ * @param feature The feature to be tested.
+ *
+ * Returns false if no global Rules object is available. i.e. Outside of
+ * a Transactor context
+ */
 bool
 isFeatureEnabled(uint256 const& feature);
 
diff --git a/src/libxrpl/protocol/Rules.cpp b/src/libxrpl/protocol/Rules.cpp
index 3e4649a27f..cf261a631b 100644
--- a/src/libxrpl/protocol/Rules.cpp
+++ b/src/libxrpl/protocol/Rules.cpp
@@ -141,10 +141,18 @@ Rules::operator!=(Rules const& other) const
 }
 
 bool
-isFeatureEnabled(uint256 const& feature)
+isFeatureEnabled(uint256 const& feature, bool resultIfNoRules)
 {
     auto const& rules = getCurrentTransactionRules();
-    return rules && rules->enabled(feature);
+    if (!rules)
+        return resultIfNoRules;
+    return rules->enabled(feature);
+}
+
+bool
+isFeatureEnabled(uint256 const& feature)
+{
+    return isFeatureEnabled(feature, false);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index e97501f129..2f12c7ce1e 100644
--- a/src/libxrpl/tx/invariants/InvariantCheck.cpp
+++ b/src/libxrpl/tx/invariants/InvariantCheck.cpp
@@ -16,6 +16,7 @@
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STLedgerEntry.h>
@@ -337,9 +338,11 @@ NoZeroEscrow::visitEntry(
 
     auto checkAmount = [this](std::int64_t amount) {
         if (amount > maxMPTokenAmount || amount < 0)
-            bad_ = true;
+            bad_ |= true;
     };
 
+    bool const overwriteFixEnabled = isFeatureEnabled(fixSecurity3_1_3, true);
+
     if (after && after->getType() == ltMPTOKEN_ISSUANCE)
     {
         auto const outstanding = (*after)[sfOutstandingAmount];
@@ -347,7 +350,15 @@ NoZeroEscrow::visitEntry(
         if (auto const locked = (*after)[~sfLockedAmount])
         {
             checkAmount(*locked);
-            bad_ = outstanding < *locked;
+            bool const isBad = outstanding < *locked;
+            if (overwriteFixEnabled)
+            {
+                bad_ |= isBad;
+            }
+            else
+            {
+                bad_ = isBad;
+            }
         }
     }
 
@@ -367,7 +378,7 @@ NoZeroEscrow::finalize(
     STTx const& txn,
     TER const,
     XRPAmount const,
-    ReadView const& rv,
+    ReadView const&,
     beast::Journal const& j) const
 {
     if (bad_)
@@ -617,13 +628,23 @@ NoXRPTrustLines::visitEntry(
     std::shared_ptr<SLE const> const&,
     std::shared_ptr<SLE const> const& after)
 {
+    bool const overwriteFixEnabled = isFeatureEnabled(fixSecurity3_1_3, true);
+
     if (after && after->getType() == ltRIPPLE_STATE)
     {
         // checking the issue directly here instead of
         // relying on .native() just in case native somehow
         // were systematically incorrect
-        xrpTrustLine_ = after->getFieldAmount(sfLowLimit).asset() == xrpIssue() ||
+        bool const isXrp = after->getFieldAmount(sfLowLimit).asset() == xrpIssue() ||
             after->getFieldAmount(sfHighLimit).asset() == xrpIssue();
+        if (overwriteFixEnabled)
+        {
+            xrpTrustLine_ |= isXrp;
+        }
+        else
+        {
+            xrpTrustLine_ = isXrp;
+        }
     }
 }
 
@@ -652,6 +673,8 @@ NoDeepFreezeTrustLinesWithoutFreeze::visitEntry(
 {
     if (after && after->getType() == ltRIPPLE_STATE)
     {
+        bool const overwriteFixEnabled = isFeatureEnabled(fixSecurity3_1_3, true);
+
         std::uint32_t const uFlags = after->getFieldU32(sfFlags);
         bool const lowFreeze = (uFlags & lsfLowFreeze) != 0u;
         bool const lowDeepFreeze = (uFlags & lsfLowDeepFreeze) != 0u;
@@ -659,7 +682,15 @@ NoDeepFreezeTrustLinesWithoutFreeze::visitEntry(
         bool const highFreeze = (uFlags & lsfHighFreeze) != 0u;
         bool const highDeepFreeze = (uFlags & lsfHighDeepFreeze) != 0u;
 
-        deepFreezeWithoutFreeze_ = (lowDeepFreeze && !lowFreeze) || (highDeepFreeze && !highFreeze);
+        bool const bad = (lowDeepFreeze && !lowFreeze) || (highDeepFreeze && !highFreeze);
+        if (overwriteFixEnabled)
+        {
+            deepFreezeWithoutFreeze_ |= bad;
+        }
+        else
+        {
+            deepFreezeWithoutFreeze_ = bad;
+        }
     }
 }
 
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index d79bd667dd..b25705becc 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -101,7 +101,7 @@ private:
             {},
             0,
             {},
-            {testable_amendments() | featureSingleAssetVault});
+            {testable_amendments()});
 #endif
 
         // XRP to IOU, without featureSingleAssetVault
@@ -6733,7 +6733,7 @@ private:
         };
 
         testCase("tecDUPLICATE", testable_amendments() - featureSingleAssetVault);
-        testCase("terADDRESS_COLLISION", testable_amendments() | featureSingleAssetVault);
+        testCase("terADDRESS_COLLISION", testable_amendments());
     }
 
     void
diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp
index 6d8e1f2de3..56d398f8f2 100644
--- a/src/test/app/Batch_test.cpp
+++ b/src/test/app/Batch_test.cpp
@@ -2663,8 +2663,7 @@ class Batch_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        test::jtx::Env env{
-            *this, features | featureSingleAssetVault | featureLendingProtocol | featureMPTokensV1};
+        test::jtx::Env env{*this, features};
 
         Account const issuer{"issuer"};
         // For simplicity, lender will be the sole actor for the vault &
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index c7fe90daa7..36ba3e98ec 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -32,6 +32,7 @@
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/SOTemplate.h>
 #include <xrpl/protocol/STAmount.h>
@@ -93,8 +94,7 @@ class Invariants_test : public beast::unit_test::suite
     static FeatureBitset
     defaultAmendments()
     {
-        return xrpl::test::jtx::testable_amendments() | featureInvariantsV1_1 |
-            featureSingleAssetVault;
+        return xrpl::test::jtx::testable_amendments() | featureInvariantsV1_1 | fixSecurity3_1_3;
     }
 
     /** Run a specific test case to put the ledger into a state that will be
@@ -180,6 +180,10 @@ class Invariants_test : public beast::unit_test::suite
         beast::Journal const jlog{sink};
         ApplyContext ac{env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, jlog};
 
+        // Invariants normally run in the Transaction's "apply" (operator()) context, and can always
+        // access global Rules.
+        CurrentTransactionRulesGuard const rg(ov.rules());
+
         BEAST_EXPECT(precheck(A1, A2, ac));
 
         auto transactor = makeTransactor(ac);
@@ -934,7 +938,7 @@ class Invariants_test : public beast::unit_test::suite
                     return false;
                 auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 STAmount const amt(mpt, -1);
                 sleNew->setFieldAmount(sfAmount, amt);
                 ac.view().insert(sleNew);
@@ -950,7 +954,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, -1);
                 ac.view().insert(sleNew);
@@ -966,7 +970,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfLockedAmount, -1);
                 ac.view().insert(sleNew);
@@ -982,7 +986,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, 1);
                 sleNew->setFieldU64(sfLockedAmount, 10);
@@ -999,7 +1003,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A1));
                 sleNew->setFieldU64(sfMPTAmount, -1);
                 ac.view().insert(sleNew);
@@ -1015,7 +1019,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A1));
                 sleNew->setFieldU64(sfLockedAmount, -1);
                 ac.view().insert(sleNew);
@@ -3968,7 +3972,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(sle->getFieldU32(sfSequence), A1)}};
+                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), A1)};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, 110);
                 sleNew->setFieldU64(sfMaximumAmount, 100);
@@ -3985,7 +3989,7 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{MPTIssue{makeMptID(sle->getFieldU32(sfSequence), A1)}};
+                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), A1)};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, 100);
                 sleNew->setFieldU64(sfMaximumAmount, 100);
@@ -4056,7 +4060,7 @@ class Invariants_test : public beast::unit_test::suite
                     auto seq = sle->getFieldU32(sfSequence);
                     for (int i = 0; i < nTokens; ++i)
                     {
-                        MPTIssue const mpt{MPTIssue{makeMptID(seq + i, A1)}};
+                        MPTIssue const mpt{makeMptID(seq + i, A1)};
                         auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                         ac.view().insert(sleNew);
 
@@ -4101,6 +4105,139 @@ class Invariants_test : public beast::unit_test::suite
         }
     }
 
+    // Test the invariant overwrite fix for both pre- and post-amendment
+    // behavior. With the fix enabled, |= accumulates violations across
+    // entries so a later valid entry cannot clear an earlier violation.
+    // Without the fix, = assignment means the last-visited entry wins.
+    void
+    testInvariantOverwrite(FeatureBitset features)
+    {
+        using namespace test::jtx;
+        bool const fixEnabled = features[fixSecurity3_1_3];
+        std::initializer_list<TER> const failTers = {tecINVARIANT_FAILED, tefINVARIANT_FAILED};
+        std::initializer_list<TER> const passTers = {tesSUCCESS, tesSUCCESS};
+
+        // Insert two trust line SLEs in hash-sorted order, with the "bad"
+        // entry at the lower-sorting key so it is visited first by
+        // ApplyStateTable::visit(). The configurer callables receive the
+        // SLE and the Issue corresponding to that side's keylet currency.
+        auto const insertOrderedTrustLinePair = [](ApplyContext& ac,
+                                                   Account const& A1,
+                                                   Account const& A2,
+                                                   Account const& A3,
+                                                   auto const& badConfig,
+                                                   auto const& goodConfig) {
+            char const* const c1 = "USD";
+            char const* const c2 = "EUR";
+            auto const k1 = keylet::line(A1, A2, A1[c1].currency);
+            auto const k2 = keylet::line(A1, A3, A1[c2].currency);
+
+            bool const k1First = k1.key < k2.key;
+            auto const& badKey = k1First ? k1 : k2;
+            auto const& goodKey = k1First ? k2 : k1;
+            Issue const badIss{k1First ? A1[c1].currency : A1[c2].currency, A1.id()};
+            Issue const goodIss{k1First ? A1[c2].currency : A1[c1].currency, A1.id()};
+
+            auto const sleBad = std::make_shared<SLE>(badKey);
+            badConfig(*sleBad, badIss);
+            ac.view().insert(sleBad);
+
+            auto const sleGood = std::make_shared<SLE>(goodKey);
+            goodConfig(*sleGood, goodIss);
+            ac.view().insert(sleGood);
+        };
+
+        // Regression: bad XRP trust line followed by a valid trust line.
+        // With the fix, the invariant catches the violation. Without it,
+        // the valid entry overwrites the flag to false. The keylet
+        // currencies are non-XRP (the invariant inspects sfLowLimit /
+        // sfHighLimit issue, not the keylet currency).
+        testcase << "overwrite: NoXRPTrustLines" + std::string(fixEnabled ? " fix" : "");
+        doInvariantCheck(
+            Env(*this, features),
+            fixEnabled ? std::vector<std::string>{{"an XRP trust line was created"}}
+                       : std::vector<std::string>{},
+            [&insertOrderedTrustLinePair](Account const& A1, Account const& A2, ApplyContext& ac) {
+                Account const A3{"A3"};
+                insertOrderedTrustLinePair(
+                    ac,
+                    A1,
+                    A2,
+                    A3,
+                    [](SLE& sle, Issue const& iss) {
+                        // sfLowLimit has xrpIssue, making isXrp = true
+                        sle.setFieldAmount(sfLowLimit, STAmount{xrpIssue(), 0});
+                        sle.setFieldAmount(sfHighLimit, STAmount{iss, 0});
+                    },
+                    [](SLE& sle, Issue const& iss) {
+                        sle.setFieldAmount(sfLowLimit, STAmount{iss, 0});
+                        sle.setFieldAmount(sfHighLimit, STAmount{iss, 0});
+                    });
+                return true;
+            },
+            XRPAmount{},
+            STTx{ttACCOUNT_SET, [](STObject&) {}},
+            fixEnabled ? failTers : passTers);
+
+        // Regression: bad deep-freeze trust line followed by a valid one.
+        testcase << "overwrite: NoDeepFreeze" + std::string(fixEnabled ? " fix" : "");
+        doInvariantCheck(
+            Env(*this, features),
+            fixEnabled ? std::vector<std::string>{{"a trust line with deep freeze flag without "
+                                                   "normal freeze was created"}}
+                       : std::vector<std::string>{},
+            [&insertOrderedTrustLinePair](Account const& A1, Account const& A2, ApplyContext& ac) {
+                Account const A3{"A3"};
+                insertOrderedTrustLinePair(
+                    ac,
+                    A1,
+                    A2,
+                    A3,
+                    [](SLE& sle, Issue const& iss) {
+                        sle.setFieldAmount(sfLowLimit, STAmount{iss, 0});
+                        sle.setFieldAmount(sfHighLimit, STAmount{iss, 0});
+                        sle.setFieldU32(sfFlags, lsfLowDeepFreeze);
+                    },
+                    [](SLE& sle, Issue const& iss) {
+                        sle.setFieldAmount(sfLowLimit, STAmount{iss, 0});
+                        sle.setFieldAmount(sfHighLimit, STAmount{iss, 0});
+                        sle.setFieldU32(sfFlags, 0u);
+                    });
+                return true;
+            },
+            XRPAmount{},
+            STTx{ttACCOUNT_SET, [](STObject&) {}},
+            fixEnabled ? failTers : passTers);
+
+        // Regression: MPT OutstandingAmount exceeds max, but locked <=
+        // outstanding. Plain assignment would overwrite bad_ = true.
+        // With the fix, NoZeroEscrow catches it.
+        // Without the fix, NoZeroEscrow passes but ValidMPTIssuance
+        // still fires ("a MPT issuance was created").
+        testcase << "overwrite: NoZeroEscrow MPT" + std::string(fixEnabled ? " fix" : "");
+        doInvariantCheck(
+            Env(*this, features),
+            fixEnabled ? std::vector<std::string>{{"escrow specifies invalid amount"}}
+                       : std::vector<std::string>{{"a MPT issuance was created"}},
+            [](Account const& A1, Account const&, ApplyContext& ac) {
+                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                if (!sle)
+                    return false;
+
+                MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
+                auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
+                // outstanding exceeds maxMPTokenAmount -> checkAmount sets bad_
+                sleNew->setFieldU64(sfOutstandingAmount, maxMPTokenAmount + 1);
+                // locked is valid and <= outstanding -> must NOT clear bad_
+                sleNew->setFieldU64(sfLockedAmount, 10);
+                ac.view().insert(sleNew);
+                return true;
+            },
+            XRPAmount{},
+            STTx{ttACCOUNT_SET, [](STObject&) {}},
+            failTers);
+    }
+
     void
     testVaultComputeCoarsestScale()
     {
@@ -4253,6 +4390,8 @@ public:
         testValidLoanBroker();
         testVault();
         testMPT();
+        testInvariantOverwrite(defaultAmendments());
+        testInvariantOverwrite(defaultAmendments() - fixSecurity3_1_3);
         testVaultComputeCoarsestScale();
     }
 };
diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp
index 1ffc34bdcc..3bdd346877 100644
--- a/src/test/app/LoanBroker_test.cpp
+++ b/src/test/app/LoanBroker_test.cpp
@@ -63,9 +63,7 @@ class LoanBroker_test : public beast::unit_test::suite
 {
     // Ensure that all the features needed for Lending Protocol are included,
     // even if they are set to unsupported.
-    FeatureBitset const all{
-        jtx::testable_amendments() | featureMPTokensV1 | featureSingleAssetVault |
-        featureLendingProtocol};
+    FeatureBitset const all{jtx::testable_amendments()};
 
     void
     testDisabled()
diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp
index f50a7f71d3..ad87603661 100644
--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -87,9 +87,7 @@ class Loan_test : public beast::unit_test::suite
 protected:
     // Ensure that all the features needed for Lending Protocol are included,
     // even if they are set to unsupported.
-    FeatureBitset const all{
-        jtx::testable_amendments() | featureMPTokensV1 | featureSingleAssetVault |
-        featureLendingProtocol};
+    FeatureBitset const all{jtx::testable_amendments()};
 
     std::string const iouCurrency{"IOU"};
 
diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index 0e6b680ff3..775d579b9b 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -536,7 +536,7 @@ class Vault_test : public beast::unit_test::suite
 
         auto testCases = [&, this](
                              std::string prefix, std::function<PrettyAsset(Env & env)> setup) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
 
             Vault vault{env};
             env.fund(XRP(1000), issuer, owner, depositor, charlie, dave);
@@ -589,7 +589,7 @@ class Vault_test : public beast::unit_test::suite
 
         struct CaseArgs
         {
-            FeatureBitset features = testable_amendments() | featureSingleAssetVault;
+            FeatureBitset features = testable_amendments();
         };
 
         auto testCase = [&, this](
@@ -802,8 +802,7 @@ class Vault_test : public beast::unit_test::suite
                     env(tx, ter{temDISABLED});
                 }
             },
-            {.features =
-                 (testable_amendments() | featureSingleAssetVault) - featurePermissionedDomains});
+            {.features = (testable_amendments()) - featurePermissionedDomains});
 
         testCase([&](Env& env,
                      Account const& issuer,
@@ -1114,10 +1113,11 @@ class Vault_test : public beast::unit_test::suite
                                 Account const& depositor,
                                 Asset const& asset,
                                 Vault& vault)> test) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
+
             env.fund(XRP(1000), issuer, owner, depositor);
             env.close();
             Vault vault{env};
@@ -1278,8 +1278,7 @@ class Vault_test : public beast::unit_test::suite
         {
             {
                 testcase("IOU fail because MPT is disabled");
-                Env env{
-                    *this, (testable_amendments() - featureMPTokensV1) | featureSingleAssetVault};
+                Env env{*this, (testable_amendments() - featureMPTokensV1)};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1295,7 +1294,7 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 testcase("IOU fail create frozen");
-                Env env{*this, testable_amendments() | featureSingleAssetVault};
+                Env env{*this, testable_amendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1313,7 +1312,7 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 testcase("IOU fail create no ripling");
-                Env env{*this, testable_amendments() | featureSingleAssetVault};
+                Env env{*this, testable_amendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1330,7 +1329,7 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 testcase("IOU no issuer");
-                Env env{*this, testable_amendments() | featureSingleAssetVault};
+                Env env{*this, testable_amendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), owner);
@@ -1348,7 +1347,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("IOU fail create vault for AMM LPToken");
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const gw("gateway");
             Account const alice("alice");
             Account const carol("carol");
@@ -1410,7 +1409,7 @@ class Vault_test : public beast::unit_test::suite
                                 Account const& depositor,
                                 Asset const& asset,
                                 Vault& vault)> test) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -1469,7 +1468,7 @@ class Vault_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
 
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const issuer{"issuer"};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
@@ -1582,7 +1581,7 @@ class Vault_test : public beast::unit_test::suite
                                 Vault& vault,
                                 MPTTester& mptt)> test,
                             CaseArgs args = {}) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -2206,7 +2205,7 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("MPT shares to a vault");
 
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             env.fund(XRP(1000000), owner, issuer);
@@ -2338,7 +2337,7 @@ class Vault_test : public beast::unit_test::suite
                                 PrettyAsset const& asset,
                                 std::function<MPTID(xrpl::Keylet)> issuanceId)> test,
                             CaseArgs args = {}) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             Account const charlie{"charlie"};
@@ -3020,7 +3019,7 @@ class Vault_test : public beast::unit_test::suite
 
         testcase("private vault");
 
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const issuer{"issuer"};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
@@ -3268,7 +3267,7 @@ class Vault_test : public beast::unit_test::suite
 
         testcase("private XRP vault");
 
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
         Account const alice{"charlie"};
@@ -3365,7 +3364,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         testcase("fail pseudo-account allocation");
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const owner{"owner"};
         Vault const vault{env};
         env.fund(XRP(1000), owner);
@@ -3408,7 +3407,7 @@ class Vault_test : public beast::unit_test::suite
 
         auto testCase = [&, this](
                             std::uint8_t scale, std::function<void(Env & env, Data data)> test) {
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testable_amendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             Account const depositor{"depositor"};
@@ -4241,7 +4240,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         testcase("RPC");
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const owner{"owner"};
         Account const issuer{"issuer"};
         Vault const vault{env};
@@ -5369,7 +5368,7 @@ class Vault_test : public beast::unit_test::suite
             }
         };
 
-        Account owner{"alice"};
+        Account const owner{"alice"};
         Account const depositor{"bob"};
         Account const issuer{"issuer"};
 
@@ -5477,7 +5476,7 @@ class Vault_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        Env env{*this, testable_amendments() | featureSingleAssetVault};
+        Env env{*this, testable_amendments()};
         Account const owner{"owner"};
         Account const issuer{"issuer"};
 
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index be51f60f02..95c7d425c1 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -239,8 +239,8 @@ public:
         using namespace std::chrono_literals;
         using namespace jtx;
 
-        // Ensure MPT is enabled
-        FeatureBitset const features = testable_amendments() | featureMPTokensV1;
+        // testable_amendments() includes MPT
+        FeatureBitset const features = testable_amendments();
         Env env(*this, features);
 
         Account const alice{"alice"};

From c6053f5d640a66c21c5704b321ae427dc1a84b1b Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Thu, 30 Apr 2026 14:33:33 +0100
Subject: [PATCH 08/11] fix: Gate -mcmodel flags to x86_64 in sanitizer builds
 (#7049)

Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
---
 cmake/XrplSanitizers.cmake | 12 ++++++++----
 conan/profiles/sanitizers  |  9 +++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/cmake/XrplSanitizers.cmake b/cmake/XrplSanitizers.cmake
index f9630f6856..2228381286 100644
--- a/cmake/XrplSanitizers.cmake
+++ b/cmake/XrplSanitizers.cmake
@@ -34,10 +34,12 @@
      * -fsanitize=<types>: Links sanitizer runtime libraries
      * -mcmodel=large/medium: (GCC only) Matches compile-time code model
 
-   - SANITIZERS_RELOCATION_FLAGS: (GCC only) Code model flags for linking.
+   - SANITIZERS_RELOCATION_FLAGS: (GCC only, x86_64 only) Code model flags for linking.
      Used to handle large instrumented binaries on x86_64:
      * -mcmodel=large: For AddressSanitizer (prevents relocation errors)
      * -mcmodel=medium: For ThreadSanitizer (large model is incompatible)
+     On ARM64, these flags are omitted since GCC does not support
+     -mcmodel=large with -fPIC, and -mcmodel=medium does not exist.
 #]===================================================================]
 
 include(CompilationEnv)
@@ -151,9 +153,11 @@ if(is_gcc)
     elseif(enable_tsan)
         # GCC doesn't support atomic_thread_fence with tsan. Suppress warnings.
         list(APPEND SANITIZERS_COMPILE_FLAGS "-Wno-tsan")
-        message(STATUS "  Using medium code model (-mcmodel=medium)")
-        list(APPEND SANITIZERS_COMPILE_FLAGS "-mcmodel=medium")
-        list(APPEND SANITIZERS_RELOCATION_FLAGS "-mcmodel=medium")
+        if(is_amd64)
+            message(STATUS "  Using medium code model (-mcmodel=medium)")
+            list(APPEND SANITIZERS_COMPILE_FLAGS "-mcmodel=medium")
+            list(APPEND SANITIZERS_RELOCATION_FLAGS "-mcmodel=medium")
+        endif()
     endif()
 
     # Join sanitizer flags with commas for -fsanitize option
diff --git a/conan/profiles/sanitizers b/conan/profiles/sanitizers
index 073fcf3072..800e6eb48c 100644
--- a/conan/profiles/sanitizers
+++ b/conan/profiles/sanitizers
@@ -1,5 +1,6 @@
 include(default)
 {% set compiler, version, compiler_exe = detect_api.detect_default_compiler() %}
+{% set arch = detect_api.detect_arch() %}
 {% set sanitizers = os.getenv("SANITIZERS") %}
 
 [conf]
@@ -13,12 +14,16 @@ include(default)
 
             {% if "address" in sanitizers %}
                 {% set _ = sanitizer_list.append("address") %}
-                {% set model_code = "-mcmodel=large" %}
+                {% if arch == "x86_64" %}
+                    {% set model_code = "-mcmodel=large" %}
+                {% endif %}
                 {% set _ = defines.append("BOOST_USE_ASAN")%}
                 {% set _ = defines.append("BOOST_USE_UCONTEXT")%}
             {% elif "thread" in sanitizers %}
                 {% set _ = sanitizer_list.append("thread") %}
-                {% set model_code = "-mcmodel=medium" %}
+                {% if arch == "x86_64" %}
+                    {% set model_code = "-mcmodel=medium" %}
+                {% endif %}
                 {% set _ = extra_cxxflags.append("-Wno-tsan") %}
                 {% set _ = defines.append("BOOST_USE_TSAN")%}
                 {% set _ = defines.append("BOOST_USE_UCONTEXT")%}

From 37b895b678e3a30c3724153442ecc85b72c5055f Mon Sep 17 00:00:00 2001
From: Ayaz Salikhov <mathbunnyru@users.noreply.github.com>
Date: Fri, 1 May 2026 10:44:52 +0100
Subject: [PATCH 09/11] ci: Rename print-env -> print-build-env (#7061)

---
 .github/workflows/reusable-build-test-config.yml | 2 +-
 .github/workflows/reusable-clang-tidy-files.yml  | 2 +-
 .github/workflows/upload-conan-deps.yml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index b4cb266004..ae998faebd 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -116,7 +116,7 @@ jobs:
         run: echo "CCACHE_LOGFILE=${{ runner.temp }}/ccache.log" >> "${GITHUB_ENV}"
 
       - name: Print build environment
-        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
+        uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
diff --git a/.github/workflows/reusable-clang-tidy-files.yml b/.github/workflows/reusable-clang-tidy-files.yml
index 75969060a5..3c71c510b3 100644
--- a/.github/workflows/reusable-clang-tidy-files.yml
+++ b/.github/workflows/reusable-clang-tidy-files.yml
@@ -40,7 +40,7 @@ jobs:
           enable_ccache: false
 
       - name: Print build environment
-        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
+        uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml
index 49c9ab041a..34dce28334 100644
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.github/workflows/upload-conan-deps.yml
@@ -75,7 +75,7 @@ jobs:
           enable_ccache: false
 
       - name: Print build environment
-        uses: XRPLF/actions/print-env@8f811899319ef002e7a088c77c57d95aba602a97
+        uses: XRPLF/actions/print-build-env@59dec886e4afb05a1724443af08baccbc045b574
 
       - name: Get number of processors
         uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf

From 182d844996ff56201a63318542c646da05c2593d Mon Sep 17 00:00:00 2001
From: Bart <bthomee@users.noreply.github.com>
Date: Fri, 1 May 2026 05:50:00 -0400
Subject: [PATCH 10/11] refactor: Revert certain `Throw`s by `LogicError`s
 (#7036)

Co-authored-by: Bart <11445373+bthomee@users.noreply.github.com>
---
 include/xrpl/ledger/Ledger.h  | 13 -------------
 src/libxrpl/ledger/Ledger.cpp | 33 +++++----------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/include/xrpl/ledger/Ledger.h b/include/xrpl/ledger/Ledger.h
index 69fb27975d..62303ba3d2 100644
--- a/include/xrpl/ledger/Ledger.h
+++ b/include/xrpl/ledger/Ledger.h
@@ -229,19 +229,6 @@ public:
         std::shared_ptr<Serializer const> const& txn,
         std::shared_ptr<Serializer const> const& metaData) override;
 
-    // Insert the transaction, and return the hash of the SHAMap leaf node
-    // holding the transaction. The hash can be used to fetch the transaction
-    // directly, instead of traversing the SHAMap
-    // @param key transaction ID
-    // @param txn transaction
-    // @param metaData transaction metadata
-    // @return hash of SHAMap leaf node that holds the transaction
-    uint256
-    rawTxInsertWithHash(
-        uint256 const& key,
-        std::shared_ptr<Serializer const> const& txn,
-        std::shared_ptr<Serializer const> const& metaData);
-
     //--------------------------------------------------------------------------
 
     void
diff --git a/src/libxrpl/ledger/Ledger.cpp b/src/libxrpl/ledger/Ledger.cpp
index 729f1ebce9..6630d4f9bf 100644
--- a/src/libxrpl/ledger/Ledger.cpp
+++ b/src/libxrpl/ledger/Ledger.cpp
@@ -14,7 +14,6 @@
 #include <xrpl/nodestore/NodeObject.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Fees.h>
-#include <xrpl/protocol/HashPrefix.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/KeyType.h>
 #include <xrpl/protocol/Keylet.h>
@@ -31,7 +30,6 @@
 #include <xrpl/protocol/Seed.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/SystemParameters.h>
-#include <xrpl/protocol/digest.h>
 #include <xrpl/shamap/Family.h>
 #include <xrpl/shamap/SHAMap.h>
 #include <xrpl/shamap/SHAMapItem.h>
@@ -43,7 +41,6 @@
 #include <exception>
 #include <memory>
 #include <optional>
-#include <stdexcept>
 #include <utility>
 #include <vector>
 
@@ -493,14 +490,14 @@ void
 Ledger::rawErase(std::shared_ptr<SLE> const& sle)
 {
     if (!stateMap_.delItem(sle->key()))
-        Throw<std::logic_error>("Ledger::rawErase: key not found");
+        LogicError("Ledger::rawErase: key not found");
 }
 
 void
 Ledger::rawErase(uint256 const& key)
 {
     if (!stateMap_.delItem(key))
-        Throw<std::logic_error>("Ledger::rawErase: key not found");
+        LogicError("Ledger::rawErase: key not found");
 }
 
 void
@@ -510,7 +507,7 @@ Ledger::rawInsert(std::shared_ptr<SLE> const& sle)
     sle->add(ss);
     if (!stateMap_.addGiveItem(
             SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(sle->key(), ss.slice())))
-        Throw<std::logic_error>("Ledger::rawInsert: key already exists");
+        LogicError("Ledger::rawInsert: key already exists");
 }
 
 void
@@ -520,7 +517,7 @@ Ledger::rawReplace(std::shared_ptr<SLE> const& sle)
     sle->add(ss);
     if (!stateMap_.updateGiveItem(
             SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(sle->key(), ss.slice())))
-        Throw<std::logic_error>("Ledger::rawReplace: key not found");
+        LogicError("Ledger::rawReplace: key not found");
 }
 
 void
@@ -536,27 +533,7 @@ Ledger::rawTxInsert(
     s.addVL(txn->peekData());
     s.addVL(metaData->peekData());
     if (!txMap_.addGiveItem(SHAMapNodeType::tnTRANSACTION_MD, make_shamapitem(key, s.slice())))
-        Throw<std::logic_error>("duplicate_tx: " + to_string(key));
-}
-
-uint256
-Ledger::rawTxInsertWithHash(
-    uint256 const& key,
-    std::shared_ptr<Serializer const> const& txn,
-    std::shared_ptr<Serializer const> const& metaData)
-{
-    XRPL_ASSERT(metaData, "xrpl::Ledger::rawTxInsertWithHash : non-null metadata input");
-
-    // low-level - just add to table
-    Serializer s(txn->getDataLength() + metaData->getDataLength() + 16);
-    s.addVL(txn->peekData());
-    s.addVL(metaData->peekData());
-    auto item = make_shamapitem(key, s.slice());
-    auto hash = sha512Half(HashPrefix::txNode, item->slice(), item->key());
-    if (!txMap_.addGiveItem(SHAMapNodeType::tnTRANSACTION_MD, std::move(item)))
-        Throw<std::logic_error>("duplicate_tx: " + to_string(key));
-
-    return hash;
+        LogicError("duplicate_tx: " + to_string(key));
 }
 
 bool

From 8995564ed6b9e453e144bb663303072a3c1ba305 Mon Sep 17 00:00:00 2001
From: Alex Kremer <akremer@ripple.com>
Date: Sun, 3 May 2026 11:31:53 +0100
Subject: [PATCH 11/11] refactor: Enable clang-tidy
 `readability-identifier-naming` check (#6571)

---
 .clang-tidy                                   |   76 +-
 .github/scripts/rename/config.sh              |    2 +-
 .github/scripts/rename/docs.sh                |    2 +-
 .../workflows/reusable-clang-tidy-files.yml   |    2 +-
 CONTRIBUTING.md                               |    4 +-
 cmake/scripts/codegen/macro_parser_common.py  |   10 +-
 .../codegen/templates/LedgerEntry.h.mako      |   12 +-
 .../templates/LedgerEntryTests.cpp.mako       |    4 +-
 .../codegen/templates/Transaction.h.mako      |   12 +-
 .../templates/TransactionTests.cpp.mako       |   14 +-
 docs/build/sanitizers.md                      |    2 +-
 docs/consensus.md                             |    2 +-
 include/xrpl/basics/BasicConfig.h             |   32 +-
 include/xrpl/basics/CountedObject.h           |   14 +-
 include/xrpl/basics/DecayingSample.h          |   24 +-
 include/xrpl/basics/Expected.h                |   24 +-
 include/xrpl/basics/IntrusivePointer.h        |   22 +-
 include/xrpl/basics/IntrusivePointer.ipp      |   90 +-
 include/xrpl/basics/IntrusiveRefCounts.h      |  140 +-
 include/xrpl/basics/LocalValue.h              |   10 +-
 include/xrpl/basics/Log.h                     |   22 +-
 include/xrpl/basics/Number.h                  |  170 +-
 include/xrpl/basics/RangeSet.h                |    2 +-
 include/xrpl/basics/Resolver.h                |    2 +-
 include/xrpl/basics/ResolverAsio.h            |    2 +-
 include/xrpl/basics/SHAMapHash.h              |    6 +-
 include/xrpl/basics/SharedWeakCachePointer.h  |    2 +-
 .../xrpl/basics/SharedWeakCachePointer.ipp    |    6 +-
 include/xrpl/basics/SlabAllocator.h           |   63 +-
 include/xrpl/basics/Slice.h                   |    4 +-
 include/xrpl/basics/StringUtilities.h         |   20 +-
 include/xrpl/basics/TaggedCache.h             |   53 +-
 include/xrpl/basics/TaggedCache.ipp           |  230 +-
 include/xrpl/basics/ToString.h                |   10 +-
 include/xrpl/basics/UnorderedContainers.h     |   22 +-
 include/xrpl/basics/UptimeClock.h             |   17 +-
 include/xrpl/basics/algorithm.h               |    4 +-
 include/xrpl/basics/base64.h                  |    8 +-
 include/xrpl/basics/base_uint.h               |  194 +-
 include/xrpl/basics/chrono.h                  |   22 +-
 include/xrpl/basics/contract.h                |   10 +-
 include/xrpl/basics/hardened_hash.h           |   22 +-
 include/xrpl/basics/make_SSLContext.h         |    4 +-
 include/xrpl/basics/mulDiv.h                  |    2 +-
 .../xrpl/basics/partitioned_unordered_map.h   |  172 +-
 include/xrpl/basics/random.h                  |   52 +-
 include/xrpl/basics/safe_cast.h               |   28 +-
 include/xrpl/basics/scope.h                   |   70 +-
 include/xrpl/basics/spinlock.h                |   31 +-
 include/xrpl/basics/tagged_integer.h          |  132 +-
 include/xrpl/beast/asio/io_latency_probe.h    |  149 +-
 include/xrpl/beast/clock/abstract_clock.h     |   26 +-
 .../xrpl/beast/clock/basic_seconds_clock.h    |    7 +-
 include/xrpl/beast/clock/manual_clock.h       |   20 +-
 include/xrpl/beast/container/aged_container.h |    4 +-
 .../beast/container/aged_container_utility.h  |    2 +-
 include/xrpl/beast/container/aged_map.h       |    2 +-
 include/xrpl/beast/container/aged_multimap.h  |    2 +-
 include/xrpl/beast/container/aged_multiset.h  |    3 +-
 include/xrpl/beast/container/aged_set.h       |    2 +-
 .../xrpl/beast/container/aged_unordered_map.h |    3 +-
 .../beast/container/aged_unordered_multimap.h |    3 +-
 .../beast/container/aged_unordered_multiset.h |    2 +-
 .../xrpl/beast/container/aged_unordered_set.h |    3 +-
 .../detail/aged_associative_container.h       |   10 +-
 .../detail/aged_container_iterator.h          |   87 +-
 .../container/detail/aged_ordered_container.h |  907 ++-
 .../detail/aged_unordered_container.h         | 1357 +++--
 .../detail/empty_base_optimization.h          |   40 +-
 include/xrpl/beast/core/CurrentThreadName.h   |    4 +-
 include/xrpl/beast/core/List.h                |  108 +-
 include/xrpl/beast/core/LockFreeStack.h       |   68 +-
 include/xrpl/beast/hash/hash_append.h         |  130 +-
 include/xrpl/beast/hash/uhash.h               |    6 +-
 include/xrpl/beast/hash/xxhasher.h            |   22 +-
 include/xrpl/beast/insight/Collector.h        |   38 +-
 include/xrpl/beast/insight/Counter.h          |    8 +-
 include/xrpl/beast/insight/Event.h            |   10 +-
 include/xrpl/beast/insight/Gauge.h            |   14 +-
 include/xrpl/beast/insight/Groups.h           |    2 +-
 include/xrpl/beast/insight/Hook.h             |    6 +-
 include/xrpl/beast/insight/Meter.h            |   10 +-
 include/xrpl/beast/insight/NullCollector.h    |    2 +-
 include/xrpl/beast/insight/StatsDCollector.h  |    2 +-
 include/xrpl/beast/net/IPAddress.h            |   16 +-
 include/xrpl/beast/net/IPAddressConversion.h  |   24 +-
 include/xrpl/beast/net/IPAddressV4.h          |    6 +-
 include/xrpl/beast/net/IPAddressV6.h          |    4 +-
 include/xrpl/beast/net/IPEndpoint.h           |   62 +-
 include/xrpl/beast/rfc2616.h                  |   68 +-
 include/xrpl/beast/test/yield_to.h            |   15 +-
 include/xrpl/beast/type_name.h                |    2 +-
 include/xrpl/beast/unit_test/amount.h         |   16 +-
 .../beast/unit_test/detail/const_container.h  |   20 +-
 include/xrpl/beast/unit_test/global_suites.h  |   20 +-
 include/xrpl/beast/unit_test/match.h          |   78 +-
 include/xrpl/beast/unit_test/recorder.h       |   44 +-
 include/xrpl/beast/unit_test/reporter.h       |   88 +-
 include/xrpl/beast/unit_test/results.h        |   44 +-
 include/xrpl/beast/unit_test/runner.h         |   76 +-
 include/xrpl/beast/unit_test/suite.h          |  150 +-
 include/xrpl/beast/unit_test/suite_info.h     |   29 +-
 include/xrpl/beast/unit_test/suite_list.h     |    6 +-
 include/xrpl/beast/unit_test/thread.h         |   12 +-
 include/xrpl/beast/utility/Journal.h          |   94 +-
 include/xrpl/beast/utility/PropertyStream.h   |   52 +-
 include/xrpl/beast/utility/Zero.h             |   28 +-
 include/xrpl/beast/utility/maybe_const.h      |    6 +-
 include/xrpl/beast/utility/rngfill.h          |   20 +-
 include/xrpl/beast/utility/temp_dir.h         |   12 +-
 include/xrpl/beast/xor_shift_engine.h         |   20 +-
 include/xrpl/conditions/Condition.h           |   12 +-
 include/xrpl/conditions/Fulfillment.h         |    2 +-
 .../xrpl/conditions/detail/PreimageSha256.h   |   14 +-
 include/xrpl/conditions/detail/error.h        |   42 +-
 include/xrpl/conditions/detail/utils.h        |   26 +-
 include/xrpl/core/ClosureCounter.h            |   20 +-
 include/xrpl/core/Coro.ipp                    |   33 +-
 include/xrpl/core/HashRouter.h                |    4 +-
 include/xrpl/core/Job.h                       |  108 +-
 include/xrpl/core/JobQueue.h                  |   43 +-
 include/xrpl/core/JobTypeData.h               |   18 +-
 include/xrpl/core/JobTypeInfo.h               |   32 +-
 include/xrpl/core/JobTypes.h                  |  136 +-
 include/xrpl/core/LoadMonitor.h               |   14 +-
 include/xrpl/core/PeerReservationTable.h      |   10 +-
 include/xrpl/core/PerfLog.h                   |   14 +-
 include/xrpl/core/detail/Workers.h            |   26 +-
 include/xrpl/core/detail/semaphore.h          |   34 +-
 include/xrpl/crypto/RFC1751.h                 |    2 +-
 include/xrpl/crypto/csprng.h                  |   24 +-
 include/xrpl/crypto/secure_erase.h            |    2 +-
 include/xrpl/json/JsonPropertyStream.h        |   20 +-
 include/xrpl/json/Output.h                    |   12 +-
 include/xrpl/json/Writer.h                    |   16 +-
 include/xrpl/json/detail/json_assert.h        |    2 +-
 include/xrpl/json/json_errors.h               |    6 +-
 include/xrpl/json/json_forwards.h             |    4 +-
 include/xrpl/json/json_reader.h               |   54 +-
 include/xrpl/json/json_value.h                |   81 +-
 include/xrpl/json/json_writer.h               |   62 +-
 include/xrpl/json/to_string.h                 |    8 +-
 include/xrpl/ledger/AcceptedLedgerTx.h        |   28 +-
 include/xrpl/ledger/AmendmentTable.h          |   12 +-
 include/xrpl/ledger/ApplyView.h               |   36 +-
 include/xrpl/ledger/BookDirs.h                |   11 +-
 include/xrpl/ledger/BookListeners.h           |    4 +-
 include/xrpl/ledger/CachedView.h              |   12 +-
 include/xrpl/ledger/Dir.h                     |   24 +-
 include/xrpl/ledger/Ledger.h                  |   26 +-
 include/xrpl/ledger/LedgerTiming.h            |   28 +-
 include/xrpl/ledger/OpenView.h                |   48 +-
 include/xrpl/ledger/ReadView.h                |   36 +-
 include/xrpl/ledger/detail/ApplyStateTable.h  |    8 +-
 include/xrpl/ledger/detail/ApplyViewBase.h    |   10 +-
 include/xrpl/ledger/detail/RawStateTable.h    |   32 +-
 include/xrpl/ledger/detail/ReadViewFwdRange.h |   32 +-
 .../xrpl/ledger/detail/ReadViewFwdRange.ipp   |   30 +-
 include/xrpl/ledger/helpers/AMMHelpers.h      |   64 +-
 include/xrpl/ledger/helpers/EscrowHelpers.h   |    4 +-
 include/xrpl/ledger/helpers/LendingHelpers.h  |   24 +-
 include/xrpl/ledger/helpers/NFTokenHelpers.h  |    4 +-
 include/xrpl/ledger/helpers/TokenHelpers.h    |   14 +-
 include/xrpl/ledger/helpers/VaultHelpers.h    |    4 +-
 include/xrpl/net/AutoSocket.h                 |  146 +-
 include/xrpl/net/HTTPClient.h                 |    8 +-
 include/xrpl/net/HTTPClientSSLContext.h       |    4 +-
 include/xrpl/nodestore/Backend.h              |    2 +-
 include/xrpl/nodestore/Database.h             |    6 +-
 include/xrpl/nodestore/Manager.h              |    4 +-
 include/xrpl/nodestore/NodeObject.h           |   18 +-
 include/xrpl/nodestore/Scheduler.h            |    4 +-
 include/xrpl/nodestore/Types.h                |   16 +-
 include/xrpl/nodestore/detail/BatchWriter.h   |   14 +-
 .../xrpl/nodestore/detail/DatabaseNodeImp.h   |    4 +-
 .../nodestore/detail/DatabaseRotatingImp.h    |    2 +-
 include/xrpl/nodestore/detail/DecodedBlob.h   |   12 +-
 include/xrpl/nodestore/detail/ManagerImp.h    |    6 +-
 include/xrpl/nodestore/detail/codec.h         |  108 +-
 include/xrpl/nodestore/detail/varint.h        |   12 +-
 include/xrpl/protocol/AMMCore.h               |   24 +-
 include/xrpl/protocol/AccountID.h             |   12 +-
 include/xrpl/protocol/AmountConversions.h     |   40 +-
 include/xrpl/protocol/ApiVersion.h            |   98 +-
 include/xrpl/protocol/Asset.h                 |   36 +-
 include/xrpl/protocol/Batch.h                 |    2 +-
 include/xrpl/protocol/Book.h                  |   22 +-
 include/xrpl/protocol/Concepts.h              |    6 +-
 include/xrpl/protocol/ErrorCodes.h            |  280 +-
 include/xrpl/protocol/Feature.h               |   24 +-
 include/xrpl/protocol/Fees.h                  |    6 +-
 include/xrpl/protocol/HashPrefix.h            |   26 +-
 include/xrpl/protocol/IOUAmount.h             |    2 +-
 include/xrpl/protocol/Indexes.h               |   40 +-
 include/xrpl/protocol/Issue.h                 |   16 +-
 include/xrpl/protocol/KeyType.h               |   12 +-
 include/xrpl/protocol/Keylet.h                |    2 +-
 include/xrpl/protocol/KnownFormats.h          |    4 +-
 include/xrpl/protocol/LedgerFormats.h         |    4 +
 include/xrpl/protocol/LedgerHeader.h          |   14 +-
 include/xrpl/protocol/MPTAmount.h             |    2 +-
 include/xrpl/protocol/MPTIssue.h              |   16 +-
 include/xrpl/protocol/MultiApiJson.h          |   64 +-
 .../xrpl/protocol/NFTSyntheticSerializer.h    |    2 +-
 include/xrpl/protocol/NFTokenID.h             |    2 +-
 include/xrpl/protocol/NFTokenOfferID.h        |    2 +-
 include/xrpl/protocol/PathAsset.h             |   10 +-
 include/xrpl/protocol/PayChan.h               |    2 +-
 include/xrpl/protocol/Permissions.h           |    2 +-
 include/xrpl/protocol/Protocol.h              |  130 +-
 include/xrpl/protocol/PublicKey.h             |   20 +-
 include/xrpl/protocol/Quality.h               |   94 +-
 include/xrpl/protocol/QualityFunction.h       |    2 +-
 include/xrpl/protocol/RPCErr.h                |    6 +-
 include/xrpl/protocol/Rate.h                  |    2 +-
 include/xrpl/protocol/Rules.h                 |    8 +-
 include/xrpl/protocol/SField.h                |   84 +-
 include/xrpl/protocol/SOTemplate.h            |   15 +-
 include/xrpl/protocol/STAmount.h              |  148 +-
 include/xrpl/protocol/STArray.h               |   29 +-
 include/xrpl/protocol/STBase.h                |   28 +-
 include/xrpl/protocol/STBitString.h           |    8 +-
 include/xrpl/protocol/STBlob.h                |    2 +-
 include/xrpl/protocol/STCurrency.h            |    4 +-
 include/xrpl/protocol/STInteger.h             |    2 +-
 include/xrpl/protocol/STIssue.h               |    4 +-
 include/xrpl/protocol/STLedgerEntry.h         |    4 +-
 include/xrpl/protocol/STNumber.h              |    2 +-
 include/xrpl/protocol/STObject.h              |   72 +-
 include/xrpl/protocol/STParsedJSON.h          |    4 +-
 include/xrpl/protocol/STPathSet.h             |  184 +-
 include/xrpl/protocol/STTx.h                  |   20 +-
 include/xrpl/protocol/STValidation.h          |   26 +-
 include/xrpl/protocol/STVector256.h           |   48 +-
 include/xrpl/protocol/STXChainBridge.h        |   26 +-
 include/xrpl/protocol/SecretKey.h             |    8 +-
 include/xrpl/protocol/SeqProxy.h              |    8 +-
 include/xrpl/protocol/Serializer.h            |  104 +-
 include/xrpl/protocol/SystemParameters.h      |   28 +-
 include/xrpl/protocol/TER.h                   |   22 +-
 include/xrpl/protocol/TxFlags.h               |    4 +
 include/xrpl/protocol/TxFormats.h             |    8 +-
 include/xrpl/protocol/TxMeta.h                |    2 +-
 include/xrpl/protocol/UintTypes.h             |   16 +-
 include/xrpl/protocol/Units.h                 |   42 +-
 include/xrpl/protocol/XChainAttestations.h    |  156 +-
 include/xrpl/protocol/XRPAmount.h             |   20 +-
 include/xrpl/protocol/detail/STVar.h          |   32 +-
 include/xrpl/protocol/detail/b58_utils.h      |   80 +-
 include/xrpl/protocol/detail/features.macro   |  110 +-
 .../xrpl/protocol/detail/ledger_entries.macro |  624 +-
 include/xrpl/protocol/detail/secp256k1.h      |   10 +-
 include/xrpl/protocol/detail/sfields.macro    |   56 +-
 include/xrpl/protocol/detail/token_errors.h   |   46 +-
 .../xrpl/protocol/detail/transactions.macro   |  872 +--
 include/xrpl/protocol/digest.h                |   42 +-
 include/xrpl/protocol/json_get_or_throw.h     |   34 +-
 include/xrpl/protocol/jss.h                   |   11 +-
 include/xrpl/protocol/nft.h                   |   12 +-
 include/xrpl/protocol/nftPageMask.h           |    2 +-
 include/xrpl/protocol/tokens.h                |    8 +-
 .../protocol_autogen/STObjectValidation.h     |    4 +-
 .../protocol_autogen/TransactionBuilderBase.h |    4 +-
 .../protocol_autogen/ledger_entries/AMM.h     |   42 +-
 .../ledger_entries/AccountRoot.h              |   94 +-
 .../ledger_entries/Amendments.h               |   18 +-
 .../protocol_autogen/ledger_entries/Bridge.h  |   42 +-
 .../protocol_autogen/ledger_entries/Check.h   |   50 +-
 .../ledger_entries/Credential.h               |   38 +-
 .../protocol_autogen/ledger_entries/DID.h     |   30 +-
 .../ledger_entries/Delegate.h                 |   30 +-
 .../ledger_entries/DepositPreauth.h           |   26 +-
 .../ledger_entries/DirectoryNode.h            |   66 +-
 .../protocol_autogen/ledger_entries/Escrow.h  |   62 +-
 .../ledger_entries/FeeSettings.h              |   38 +-
 .../ledger_entries/LedgerHashes.h             |   14 +-
 .../protocol_autogen/ledger_entries/Loan.h    |  110 +-
 .../ledger_entries/LoanBroker.h               |   70 +-
 .../protocol_autogen/ledger_entries/MPToken.h |   30 +-
 .../ledger_entries/MPTokenIssuance.h          |   54 +-
 .../ledger_entries/NFTokenOffer.h             |   38 +-
 .../ledger_entries/NFTokenPage.h              |   22 +-
 .../ledger_entries/NegativeUNL.h              |   22 +-
 .../protocol_autogen/ledger_entries/Offer.h   |   50 +-
 .../protocol_autogen/ledger_entries/Oracle.h  |   42 +-
 .../ledger_entries/PayChannel.h               |   62 +-
 .../ledger_entries/PermissionedDomain.h       |   26 +-
 .../ledger_entries/RippleState.h              |   46 +-
 .../ledger_entries/SignerList.h               |   30 +-
 .../protocol_autogen/ledger_entries/Ticket.h  |   22 +-
 .../protocol_autogen/ledger_entries/Vault.h   |   62 +-
 .../ledger_entries/XChainOwnedClaimID.h       |   38 +-
 .../XChainOwnedCreateAccountClaimID.h         |   30 +-
 .../protocol_autogen/transactions/AMMBid.h    |   26 +-
 .../transactions/AMMClawback.h                |   22 +-
 .../protocol_autogen/transactions/AMMCreate.h |   18 +-
 .../protocol_autogen/transactions/AMMDelete.h |   14 +-
 .../transactions/AMMDeposit.h                 |   34 +-
 .../protocol_autogen/transactions/AMMVote.h   |   18 +-
 .../transactions/AMMWithdraw.h                |   30 +-
 .../transactions/AccountDelete.h              |   18 +-
 .../transactions/AccountSet.h                 |   46 +-
 .../protocol_autogen/transactions/Batch.h     |   14 +-
 .../transactions/CheckCancel.h                |   10 +-
 .../protocol_autogen/transactions/CheckCash.h |   18 +-
 .../transactions/CheckCreate.h                |   26 +-
 .../protocol_autogen/transactions/Clawback.h  |   14 +-
 .../transactions/CredentialAccept.h           |   14 +-
 .../transactions/CredentialCreate.h           |   22 +-
 .../transactions/CredentialDelete.h           |   18 +-
 .../protocol_autogen/transactions/DIDDelete.h |    6 +-
 .../protocol_autogen/transactions/DIDSet.h    |   18 +-
 .../transactions/DelegateSet.h                |   14 +-
 .../transactions/DepositPreauth.h             |   22 +-
 .../transactions/EnableAmendment.h            |   14 +-
 .../transactions/EscrowCancel.h               |   14 +-
 .../transactions/EscrowCreate.h               |   30 +-
 .../transactions/EscrowFinish.h               |   26 +-
 .../transactions/LedgerStateFix.h             |   14 +-
 .../transactions/LoanBrokerCoverClawback.h    |   14 +-
 .../transactions/LoanBrokerCoverDeposit.h     |   14 +-
 .../transactions/LoanBrokerCoverWithdraw.h    |   22 +-
 .../transactions/LoanBrokerDelete.h           |   10 +-
 .../transactions/LoanBrokerSet.h              |   34 +-
 .../transactions/LoanDelete.h                 |   10 +-
 .../transactions/LoanManage.h                 |   10 +-
 .../protocol_autogen/transactions/LoanPay.h   |   14 +-
 .../protocol_autogen/transactions/LoanSet.h   |   74 +-
 .../transactions/MPTokenAuthorize.h           |   14 +-
 .../transactions/MPTokenIssuanceCreate.h      |   30 +-
 .../transactions/MPTokenIssuanceDestroy.h     |   10 +-
 .../transactions/MPTokenIssuanceSet.h         |   30 +-
 .../transactions/NFTokenAcceptOffer.h         |   18 +-
 .../transactions/NFTokenBurn.h                |   14 +-
 .../transactions/NFTokenCancelOffer.h         |   10 +-
 .../transactions/NFTokenCreateOffer.h         |   26 +-
 .../transactions/NFTokenMint.h                |   34 +-
 .../transactions/NFTokenModify.h              |   18 +-
 .../transactions/OfferCancel.h                |   10 +-
 .../transactions/OfferCreate.h                |   26 +-
 .../transactions/OracleDelete.h               |   10 +-
 .../protocol_autogen/transactions/OracleSet.h |   30 +-
 .../protocol_autogen/transactions/Payment.h   |   42 +-
 .../transactions/PaymentChannelClaim.h        |   30 +-
 .../transactions/PaymentChannelCreate.h       |   30 +-
 .../transactions/PaymentChannelFund.h         |   18 +-
 .../transactions/PermissionedDomainDelete.h   |   10 +-
 .../transactions/PermissionedDomainSet.h      |   14 +-
 .../protocol_autogen/transactions/SetFee.h    |   38 +-
 .../transactions/SetRegularKey.h              |   10 +-
 .../transactions/SignerListSet.h              |   14 +-
 .../transactions/TicketCreate.h               |   10 +-
 .../protocol_autogen/transactions/TrustSet.h  |   18 +-
 .../protocol_autogen/transactions/UNLModify.h |   18 +-
 .../transactions/VaultClawback.h              |   18 +-
 .../transactions/VaultCreate.h                |   34 +-
 .../transactions/VaultDelete.h                |   10 +-
 .../transactions/VaultDeposit.h               |   14 +-
 .../protocol_autogen/transactions/VaultSet.h  |   22 +-
 .../transactions/VaultWithdraw.h              |   22 +-
 .../transactions/XChainAccountCreateCommit.h  |   22 +-
 .../XChainAddAccountCreateAttestation.h       |   50 +-
 .../transactions/XChainAddClaimAttestation.h  |   46 +-
 .../transactions/XChainClaim.h                |   26 +-
 .../transactions/XChainCommit.h               |   22 +-
 .../transactions/XChainCreateBridge.h         |   18 +-
 .../transactions/XChainCreateClaimID.h        |   18 +-
 .../transactions/XChainModifyBridge.h         |   18 +-
 include/xrpl/rdb/DBInit.h                     |   20 +-
 include/xrpl/rdb/RelationalDatabase.h         |    2 +-
 include/xrpl/resource/Charge.h                |    6 +-
 include/xrpl/resource/Consumer.h              |    6 +-
 include/xrpl/resource/Disposition.h           |    6 +-
 include/xrpl/resource/Fees.h                  |   31 +-
 include/xrpl/resource/ResourceManager.h       |    6 +-
 include/xrpl/resource/detail/Entry.h          |   10 +-
 include/xrpl/resource/detail/Key.h            |   10 +-
 include/xrpl/resource/detail/Kind.h           |    2 +-
 include/xrpl/resource/detail/Logic.h          |  170 +-
 include/xrpl/resource/detail/Tuning.h         |   12 +-
 include/xrpl/server/InfoSub.h                 |   30 +-
 include/xrpl/server/LoadFeeTrack.h            |   22 +-
 include/xrpl/server/Manifest.h                |   40 +-
 include/xrpl/server/NetworkOPs.h              |   20 +-
 include/xrpl/server/Port.h                    |    4 +-
 include/xrpl/server/Server.h                  |    4 +-
 include/xrpl/server/Session.h                 |    2 +-
 include/xrpl/server/SimpleWriter.h            |    4 +-
 include/xrpl/server/WSSession.h               |    2 +-
 include/xrpl/server/Wallet.h                  |   12 +-
 include/xrpl/server/detail/BaseHTTPPeer.h     |  124 +-
 include/xrpl/server/detail/BasePeer.h         |   14 +-
 include/xrpl/server/detail/BaseWSPeer.h       |  116 +-
 include/xrpl/server/detail/Door.h             |  100 +-
 include/xrpl/server/detail/JSONRPCUtil.h      |    2 +-
 include/xrpl/server/detail/LowestLayer.h      |    2 +-
 include/xrpl/server/detail/PlainHTTPPeer.h    |   22 +-
 include/xrpl/server/detail/PlainWSPeer.h      |    6 +-
 include/xrpl/server/detail/SSLHTTPPeer.h      |   42 +-
 include/xrpl/server/detail/SSLWSPeer.h        |   16 +-
 include/xrpl/server/detail/ServerImpl.h       |   18 +-
 include/xrpl/server/detail/io_list.h          |   42 +-
 include/xrpl/shamap/FullBelowCache.h          |   34 +-
 include/xrpl/shamap/SHAMap.h                  |  112 +-
 .../xrpl/shamap/SHAMapAccountStateLeafNode.h  |   10 +-
 include/xrpl/shamap/SHAMapAddNode.h           |   44 +-
 include/xrpl/shamap/SHAMapInnerNode.h         |    6 +-
 include/xrpl/shamap/SHAMapItem.h              |   16 +-
 include/xrpl/shamap/SHAMapLeafNode.h          |    2 +-
 include/xrpl/shamap/SHAMapMissingNode.h       |    2 +-
 include/xrpl/shamap/SHAMapTreeNode.h          |   20 +-
 include/xrpl/shamap/SHAMapTxLeafNode.h        |   10 +-
 .../xrpl/shamap/SHAMapTxPlusMetaLeafNode.h    |   10 +-
 include/xrpl/shamap/detail/TaggedPointer.h    |    4 +-
 include/xrpl/shamap/detail/TaggedPointer.ipp  |  147 +-
 include/xrpl/tx/ApplyContext.h                |    2 +-
 include/xrpl/tx/Transactor.h                  |   86 +-
 include/xrpl/tx/applySteps.h                  |   32 +-
 include/xrpl/tx/invariants/InvariantCheck.h   |    4 +-
 .../tx/invariants/InvariantCheckPrivilege.h   |   36 +-
 include/xrpl/tx/invariants/NFTInvariant.h     |    8 +-
 .../invariants/PermissionedDomainInvariant.h  |    8 +-
 include/xrpl/tx/invariants/VaultInvariant.h   |    8 +-
 include/xrpl/tx/paths/AMMLiquidity.h          |    2 +-
 include/xrpl/tx/paths/AMMOffer.h              |    2 +-
 include/xrpl/tx/paths/BookTip.h               |   22 +-
 include/xrpl/tx/paths/Offer.h                 |   64 +-
 include/xrpl/tx/paths/RippleCalc.h            |    2 +-
 include/xrpl/tx/paths/detail/FlatSets.h       |    2 +-
 include/xrpl/tx/paths/detail/FlowDebugInfo.h  |   32 +-
 include/xrpl/tx/paths/detail/Steps.h          |   64 +-
 include/xrpl/tx/paths/detail/StrandFlow.h     |  127 +-
 .../tx/transactors/account/AccountDelete.h    |    2 +-
 .../xrpl/tx/transactors/account/AccountSet.h  |    2 +-
 .../tx/transactors/account/SetRegularKey.h    |    2 +-
 .../tx/transactors/account/SignerListSet.h    |    6 +-
 .../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 |    8 +-
 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    |    4 +-
 .../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            |   22 +-
 src/libxrpl/basics/CountedObject.cpp          |   10 +-
 src/libxrpl/basics/Log.cpp                    |  128 +-
 src/libxrpl/basics/MallocTrim.cpp             |   14 +-
 src/libxrpl/basics/Number.cpp                 |  278 +-
 src/libxrpl/basics/ResolverAsio.cpp           |  200 +-
 src/libxrpl/basics/StringUtilities.cpp        |   16 +-
 src/libxrpl/basics/UptimeClock.cpp            |   25 +-
 src/libxrpl/basics/base64.cpp                 |   28 +-
 src/libxrpl/basics/contract.cpp               |    4 +-
 src/libxrpl/basics/make_SSLContext.cpp        |  106 +-
 src/libxrpl/basics/mulDiv.cpp                 |    2 +-
 .../beast/clock/basic_seconds_clock.cpp       |   28 +-
 src/libxrpl/beast/core/CurrentThreadName.cpp  |   16 +-
 src/libxrpl/beast/core/SemanticVersion.cpp    |   30 +-
 src/libxrpl/beast/insight/Groups.cpp          |   50 +-
 src/libxrpl/beast/insight/NullCollector.cpp   |   12 +-
 src/libxrpl/beast/insight/StatsDCollector.cpp |  316 +-
 src/libxrpl/beast/net/IPAddressConversion.cpp |    8 +-
 src/libxrpl/beast/net/IPAddressV4.cpp         |   12 +-
 src/libxrpl/beast/net/IPAddressV6.cpp         |    8 +-
 src/libxrpl/beast/net/IPEndpoint.cpp          |   12 +-
 src/libxrpl/beast/utility/beast_Journal.cpp   |   28 +-
 .../beast/utility/beast_PropertyStream.cpp    |  154 +-
 src/libxrpl/conditions/Condition.cpp          |   46 +-
 src/libxrpl/conditions/Fulfillment.cpp        |   34 +-
 src/libxrpl/conditions/error.cpp              |   51 +-
 src/libxrpl/core/HashRouter.cpp               |    4 +-
 src/libxrpl/core/detail/Job.cpp               |   48 +-
 src/libxrpl/core/detail/JobQueue.cpp          |  164 +-
 src/libxrpl/core/detail/LoadMonitor.cpp       |   70 +-
 src/libxrpl/core/detail/Workers.cpp           |   96 +-
 src/libxrpl/crypto/RFC1751.cpp                |   14 +-
 src/libxrpl/crypto/csprng.cpp                 |   20 +-
 src/libxrpl/crypto/secure_erase.cpp           |    2 +-
 src/libxrpl/json/JsonPropertyStream.cpp       |   82 +-
 src/libxrpl/json/Output.cpp                   |   30 +-
 src/libxrpl/json/Writer.cpp                   |   60 +-
 src/libxrpl/json/json_reader.cpp              |  176 +-
 src/libxrpl/json/json_value.cpp               |  668 +--
 src/libxrpl/json/json_valueiterator.cpp       |   14 +-
 src/libxrpl/json/json_writer.cpp              |   66 +-
 src/libxrpl/json/to_string.cpp                |    4 +-
 src/libxrpl/ledger/AcceptedLedgerTx.cpp       |   40 +-
 src/libxrpl/ledger/ApplyStateTable.cpp        |  150 +-
 src/libxrpl/ledger/ApplyView.cpp              |   67 +-
 src/libxrpl/ledger/ApplyViewBase.cpp          |   10 +-
 src/libxrpl/ledger/BookDirs.cpp               |   26 +-
 src/libxrpl/ledger/BookListeners.cpp          |   18 +-
 src/libxrpl/ledger/CachedView.cpp             |   12 +-
 src/libxrpl/ledger/CanonicalTXSet.cpp         |    4 +-
 src/libxrpl/ledger/Dir.cpp                    |   30 +-
 src/libxrpl/ledger/Ledger.cpp                 |  143 +-
 src/libxrpl/ledger/OpenView.cpp               |   34 +-
 src/libxrpl/ledger/PaymentSandbox.cpp         |    2 +-
 src/libxrpl/ledger/RawStateTable.cpp          |   76 +-
 src/libxrpl/ledger/ReadView.cpp               |   28 +-
 src/libxrpl/ledger/View.cpp                   |   12 +-
 src/libxrpl/ledger/helpers/AMMHelpers.cpp     |   32 +-
 .../ledger/helpers/AccountRootHelpers.cpp     |   22 +-
 .../ledger/helpers/CredentialHelpers.cpp      |    6 +-
 src/libxrpl/ledger/helpers/LendingHelpers.cpp |  142 +-
 src/libxrpl/ledger/helpers/MPTokenHelpers.cpp |   18 +-
 src/libxrpl/ledger/helpers/NFTokenHelpers.cpp |   55 +-
 src/libxrpl/ledger/helpers/OfferHelpers.cpp   |    1 +
 .../ledger/helpers/RippleStateHelpers.cpp     |   52 +-
 src/libxrpl/ledger/helpers/TokenHelpers.cpp   |  100 +-
 src/libxrpl/ledger/helpers/VaultHelpers.cpp   |    2 +-
 src/libxrpl/net/HTTPClient.cpp                |  262 +-
 src/libxrpl/nodestore/BatchWriter.cpp         |   46 +-
 src/libxrpl/nodestore/Database.cpp            |   16 +-
 src/libxrpl/nodestore/DatabaseNodeImp.cpp     |   10 +-
 src/libxrpl/nodestore/DatabaseRotatingImp.cpp |   16 +-
 src/libxrpl/nodestore/DecodedBlob.cpp         |   34 +-
 src/libxrpl/nodestore/ManagerImp.cpp          |   19 +-
 src/libxrpl/nodestore/NodeObject.cpp          |    8 +-
 .../nodestore/backend/MemoryFactory.cpp       |   20 +-
 src/libxrpl/nodestore/backend/NuDBFactory.cpp |  150 +-
 src/libxrpl/nodestore/backend/NullFactory.cpp |    6 +-
 .../nodestore/backend/RocksDBFactory.cpp      |  181 +-
 src/libxrpl/protocol/AMMCore.cpp              |   18 +-
 src/libxrpl/protocol/AccountID.cpp            |   32 +-
 src/libxrpl/protocol/Asset.cpp                |    6 +-
 src/libxrpl/protocol/BuildInfo.cpp            |   24 +-
 src/libxrpl/protocol/ErrorCodes.cpp           |  202 +-
 src/libxrpl/protocol/Feature.cpp              |  141 +-
 src/libxrpl/protocol/IOUAmount.cpp            |   78 +-
 src/libxrpl/protocol/Indexes.cpp              |  193 +-
 src/libxrpl/protocol/InnerObjectFormats.cpp   |  144 +-
 src/libxrpl/protocol/Issue.cpp                |   26 +-
 src/libxrpl/protocol/LedgerFormats.cpp        |   14 +-
 src/libxrpl/protocol/LedgerHeader.cpp         |    2 +-
 src/libxrpl/protocol/MPTIssue.cpp             |   16 +-
 .../protocol/NFTSyntheticSerializer.cpp       |    2 +-
 src/libxrpl/protocol/NFTokenID.cpp            |    4 +-
 src/libxrpl/protocol/NFTokenOfferID.cpp       |    2 +-
 src/libxrpl/protocol/Permissions.cpp          |    6 +-
 src/libxrpl/protocol/Protocol.cpp             |    4 +-
 src/libxrpl/protocol/PublicKey.cpp            |   82 +-
 src/libxrpl/protocol/Quality.cpp              |   65 +-
 src/libxrpl/protocol/QualityFunction.cpp      |    6 +-
 src/libxrpl/protocol/RPCErr.cpp               |   10 +-
 src/libxrpl/protocol/Rate2.cpp                |   28 +-
 src/libxrpl/protocol/Rules.cpp                |   24 +-
 src/libxrpl/protocol/SField.cpp               |   49 +-
 src/libxrpl/protocol/STAccount.cpp            |   10 +-
 src/libxrpl/protocol/STAmount.cpp             |  503 +-
 src/libxrpl/protocol/STArray.cpp              |    6 +-
 src/libxrpl/protocol/STBase.cpp               |   26 +-
 src/libxrpl/protocol/STCurrency.cpp           |    6 +-
 src/libxrpl/protocol/STInteger.cpp            |   21 +-
 src/libxrpl/protocol/STIssue.cpp              |    6 +-
 src/libxrpl/protocol/STLedgerEntry.cpp        |   13 +-
 src/libxrpl/protocol/STNumber.cpp             |   15 +-
 src/libxrpl/protocol/STObject.cpp             |   78 +-
 src/libxrpl/protocol/STParsedJSON.cpp         |  464 +-
 src/libxrpl/protocol/STPathSet.cpp            |   94 +-
 src/libxrpl/protocol/STTakesAsset.cpp         |    8 +-
 src/libxrpl/protocol/STTx.cpp                 |   86 +-
 src/libxrpl/protocol/STValidation.cpp         |   51 +-
 src/libxrpl/protocol/STVar.cpp                |   27 +-
 src/libxrpl/protocol/STVector256.cpp          |   16 +-
 src/libxrpl/protocol/STXChainBridge.cpp       |   22 +-
 src/libxrpl/protocol/SecretKey.cpp            |  102 +-
 src/libxrpl/protocol/Seed.cpp                 |   10 +-
 src/libxrpl/protocol/Serializer.cpp           |   61 +-
 src/libxrpl/protocol/Sign.cpp                 |    2 +-
 src/libxrpl/protocol/TER.cpp                  |   10 +-
 src/libxrpl/protocol/TxFormats.cpp            |   42 +-
 src/libxrpl/protocol/TxMeta.cpp               |    6 +-
 src/libxrpl/protocol/UintTypes.cpp            |   46 +-
 src/libxrpl/protocol/XChainAttestations.cpp   |  346 +-
 src/libxrpl/protocol/digest.cpp               |   24 +-
 src/libxrpl/protocol/tokens.cpp               |  246 +-
 src/libxrpl/rdb/DatabaseCon.cpp               |    8 +-
 src/libxrpl/rdb/SociDB.cpp                    |    6 +-
 src/libxrpl/resource/Charge.cpp               |   18 +-
 src/libxrpl/resource/Consumer.cpp             |   72 +-
 src/libxrpl/resource/Fees.cpp                 |   30 +-
 src/libxrpl/resource/ResourceManager.cpp      |   10 +-
 src/libxrpl/server/InfoSub.cpp                |   38 +-
 src/libxrpl/server/JSONRPCUtil.cpp            |   10 +-
 src/libxrpl/server/LoadFeeTrack.cpp           |   10 +-
 src/libxrpl/server/Manifest.cpp               |   68 +-
 src/libxrpl/server/Port.cpp                   |   40 +-
 src/libxrpl/server/Vacuum.cpp                 |    6 +-
 src/libxrpl/server/Wallet.cpp                 |   38 +-
 src/libxrpl/shamap/SHAMap.cpp                 |  142 +-
 src/libxrpl/shamap/SHAMapDelta.cpp            |   30 +-
 src/libxrpl/shamap/SHAMapInnerNode.cpp        |   65 +-
 src/libxrpl/shamap/SHAMapLeafNode.cpp         |    6 +-
 src/libxrpl/shamap/SHAMapNodeID.cpp           |   28 +-
 src/libxrpl/shamap/SHAMapSync.cpp             |  166 +-
 src/libxrpl/shamap/SHAMapTreeNode.cpp         |   61 +-
 src/libxrpl/tx/ApplyContext.cpp               |   28 +-
 src/libxrpl/tx/SignerEntries.cpp              |    2 +-
 src/libxrpl/tx/Transactor.cpp                 |   84 +-
 src/libxrpl/tx/apply.cpp                      |   40 +-
 src/libxrpl/tx/applySteps.cpp                 |   62 +-
 src/libxrpl/tx/invariants/AMMInvariant.cpp    |   20 +-
 src/libxrpl/tx/invariants/FreezeInvariant.cpp |    2 +-
 src/libxrpl/tx/invariants/InvariantCheck.cpp  |  124 +-
 .../tx/invariants/LoanBrokerInvariant.cpp     |    4 +-
 src/libxrpl/tx/invariants/LoanInvariant.cpp   |   12 +-
 src/libxrpl/tx/invariants/MPTInvariant.cpp    |   37 +-
 src/libxrpl/tx/invariants/NFTInvariant.cpp    |   52 +-
 .../PermissionedDomainInvariant.cpp           |   28 +-
 src/libxrpl/tx/invariants/VaultInvariant.cpp  |   56 +-
 src/libxrpl/tx/paths/AMMLiquidity.cpp         |   34 +-
 src/libxrpl/tx/paths/AMMOffer.cpp             |    6 +-
 src/libxrpl/tx/paths/BookStep.cpp             |  132 +-
 src/libxrpl/tx/paths/BookTip.cpp              |   30 +-
 src/libxrpl/tx/paths/DirectStep.cpp           |   61 +-
 src/libxrpl/tx/paths/Flow.cpp                 |    4 +-
 src/libxrpl/tx/paths/MPTEndpointStep.cpp      |   67 +-
 src/libxrpl/tx/paths/OfferStream.cpp          |   32 +-
 src/libxrpl/tx/paths/PaySteps.cpp             |  144 +-
 src/libxrpl/tx/paths/RippleCalc.cpp           |    6 +-
 src/libxrpl/tx/paths/XRPEndpointStep.cpp      |   14 +-
 .../tx/transactors/account/AccountDelete.cpp  |   16 +-
 .../tx/transactors/account/AccountSet.cpp     |   16 +-
 .../tx/transactors/account/SignerListSet.cpp  |   34 +-
 .../tx/transactors/bridge/XChainBridge.cpp    |  112 +-
 .../tx/transactors/check/CheckCash.cpp        |   24 +-
 .../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     |   66 +-
 .../tx/transactors/dex/AMMClawback.cpp        |   28 +-
 src/libxrpl/tx/transactors/dex/AMMCreate.cpp  |   50 +-
 src/libxrpl/tx/transactors/dex/AMMDelete.cpp  |    2 +-
 src/libxrpl/tx/transactors/dex/AMMDeposit.cpp |   66 +-
 src/libxrpl/tx/transactors/dex/AMMVote.cpp    |   53 +-
 .../tx/transactors/dex/AMMWithdraw.cpp        |   66 +-
 .../tx/transactors/dex/OfferCreate.cpp        |  116 +-
 src/libxrpl/tx/transactors/did/DIDSet.cpp     |    5 +-
 .../tx/transactors/escrow/EscrowCancel.cpp    |    2 +-
 .../tx/transactors/escrow/EscrowCreate.cpp    |   24 +-
 .../tx/transactors/escrow/EscrowFinish.cpp    |   20 +-
 .../lending/LoanBrokerCoverClawback.cpp       |   18 +-
 .../lending/LoanBrokerCoverDeposit.cpp        |   10 +-
 .../lending/LoanBrokerCoverWithdraw.cpp       |   12 +-
 .../transactors/lending/LoanBrokerDelete.cpp  |   10 +-
 .../tx/transactors/lending/LoanBrokerSet.cpp  |   18 +-
 .../tx/transactors/lending/LoanDelete.cpp     |    6 +-
 .../tx/transactors/lending/LoanManage.cpp     |    8 +-
 .../tx/transactors/lending/LoanPay.cpp        |  110 +-
 .../tx/transactors/lending/LoanSet.cpp        |   48 +-
 .../tx/transactors/nft/NFTokenAcceptOffer.cpp |   26 +-
 .../tx/transactors/nft/NFTokenBurn.cpp        |   12 +-
 .../tx/transactors/nft/NFTokenCancelOffer.cpp |    2 +-
 .../tx/transactors/nft/NFTokenMint.cpp        |    6 +-
 .../tx/transactors/nft/NFTokenModify.cpp      |    4 +-
 .../tx/transactors/oracle/OracleSet.cpp       |   25 +-
 .../tx/transactors/payment/DepositPreauth.cpp |    4 +-
 .../tx/transactors/payment/Payment.cpp        |   46 +-
 .../payment_channel/PaymentChannelClaim.cpp   |    6 +-
 .../payment_channel/PaymentChannelCreate.cpp  |    2 +-
 .../payment_channel/PaymentChannelFund.cpp    |    2 +-
 .../PermissionedDomainDelete.cpp              |    2 +-
 .../PermissionedDomainSet.cpp                 |    6 +-
 src/libxrpl/tx/transactors/system/Batch.cpp   |   30 +-
 src/libxrpl/tx/transactors/system/Change.cpp  |   12 +-
 .../tx/transactors/system/LedgerStateFix.cpp  |    6 +-
 .../tx/transactors/system/TicketCreate.cpp    |    8 +-
 src/libxrpl/tx/transactors/token/Clawback.cpp |   24 +-
 .../token/MPTokenIssuanceCreate.cpp           |    8 +-
 .../transactors/token/MPTokenIssuanceSet.cpp  |   23 +-
 src/libxrpl/tx/transactors/token/TrustSet.cpp |   13 +-
 .../tx/transactors/vault/VaultClawback.cpp    |   47 +-
 .../tx/transactors/vault/VaultCreate.cpp      |   18 +-
 .../tx/transactors/vault/VaultDelete.cpp      |    2 +-
 .../tx/transactors/vault/VaultDeposit.cpp     |   18 +-
 src/libxrpl/tx/transactors/vault/VaultSet.cpp |   10 +-
 .../tx/transactors/vault/VaultWithdraw.cpp    |   18 +-
 src/test/app/AMMCalc_test.cpp                 |   26 +-
 src/test/app/AMMClawbackMPT_test.cpp          | 1188 ++--
 src/test/app/AMMClawback_test.cpp             | 1142 ++--
 src/test/app/AMMExtendedMPT_test.cpp          | 2947 +++++-----
 src/test/app/AMMExtended_test.cpp             | 2372 ++++----
 src/test/app/AMMMPT_test.cpp                  | 5021 +++++++++--------
 src/test/app/AMM_test.cpp                     | 2983 +++++-----
 src/test/app/AccountDelete_test.cpp           |  200 +-
 src/test/app/AccountSet_test.cpp              |  128 +-
 src/test/app/AccountTxPaging_test.cpp         |   72 +-
 src/test/app/AmendmentTable_test.cpp          |   34 +-
 src/test/app/Batch_test.cpp                   | 1168 ++--
 src/test/app/CheckMPT_test.cpp                |  909 ++-
 src/test/app/Check_test.cpp                   |  941 +--
 src/test/app/Clawback_test.cpp                |  318 +-
 src/test/app/Credentials_test.cpp             |  118 +-
 src/test/app/CrossingLimitsMPT_test.cpp       |  216 +-
 src/test/app/CrossingLimits_test.cpp          |  226 +-
 src/test/app/DID_test.cpp                     |   62 +-
 src/test/app/DNS_test.cpp                     |    4 +-
 src/test/app/Delegate_test.cpp                |  530 +-
 src/test/app/DeliverMin_test.cpp              |  150 +-
 src/test/app/DepositAuth_test.cpp             |  336 +-
 src/test/app/Discrepancy_test.cpp             |   82 +-
 src/test/app/EscrowToken_test.cpp             | 2210 ++++----
 src/test/app/Escrow_test.cpp                  |  950 ++--
 src/test/app/FeeVote_test.cpp                 |   74 +-
 src/test/app/FixNFTokenPageLinks_test.cpp     |  120 +-
 src/test/app/FlowMPT_test.cpp                 | 1060 ++--
 src/test/app/Flow_test.cpp                    |  754 +--
 src/test/app/Freeze_test.cpp                  | 1142 ++--
 src/test/app/GRPCServerTLS_test.cpp           |    2 +-
 src/test/app/HashRouter_test.cpp              |   16 +-
 src/test/app/Invariants_test.cpp              | 1467 ++---
 src/test/app/LPTokenTransfer_test.cpp         |  350 +-
 src/test/app/LedgerHistory_test.cpp           |   18 +-
 src/test/app/LedgerLoad_test.cpp              |   32 +-
 src/test/app/LedgerMaster_test.cpp            |    4 +-
 src/test/app/LedgerReplay_test.cpp            |  109 +-
 src/test/app/LendingHelpers_test.cpp          |   10 +-
 src/test/app/LoadFeeTrack_test.cpp            |   14 +-
 src/test/app/LoanBroker_test.cpp              |  520 +-
 src/test/app/Loan_test.cpp                    | 1693 +++---
 src/test/app/MPToken_test.cpp                 | 3024 +++++-----
 src/test/app/Manifest_test.cpp                |  215 +-
 src/test/app/MultiSign_test.cpp               |  796 +--
 src/test/app/NFTokenAuth_test.cpp             |  410 +-
 src/test/app/NFTokenBurn_test.cpp             |  206 +-
 src/test/app/NFTokenDir_test.cpp              |  162 +-
 src/test/app/NFToken_test.cpp                 | 1414 ++---
 src/test/app/NetworkID_test.cpp               |   18 +-
 src/test/app/NetworkOPs_test.cpp              |    8 +-
 src/test/app/OfferMPT_test.cpp                | 2175 +++----
 src/test/app/OfferStream_test.cpp             |    2 +-
 src/test/app/Offer_test.cpp                   | 2437 ++++----
 src/test/app/Oracle_test.cpp                  |  162 +-
 src/test/app/OversizeMeta_test.cpp            |   44 +-
 src/test/app/PathMPT_test.cpp                 |  220 +-
 src/test/app/Path_test.cpp                    | 1284 ++---
 src/test/app/PayChan_test.cpp                 |  239 +-
 src/test/app/PayStrandMPT_test.cpp            |  284 +-
 src/test/app/PayStrand_test.cpp               |  438 +-
 src/test/app/PermissionedDEX_test.cpp         |  810 +--
 src/test/app/PermissionedDomains_test.cpp     |   91 +-
 src/test/app/PseudoTx_test.cpp                |    6 +-
 src/test/app/RCLValidations_test.cpp          |   54 +-
 src/test/app/ReducedOffer_test.cpp            |  139 +-
 src/test/app/Regression_test.cpp              |   65 +-
 src/test/app/SHAMapStore_test.cpp             |   86 +-
 src/test/app/SetAuth_test.cpp                 |   28 +-
 src/test/app/SetRegularKey_test.cpp           |   58 +-
 src/test/app/TheoreticalQuality_test.cpp      |   92 +-
 src/test/app/Ticket_test.cpp                  |  248 +-
 src/test/app/Transaction_ordering_test.cpp    |   16 +-
 src/test/app/TrustAndBalance_test.cpp         |  140 +-
 src/test/app/TrustSet_test.cpp                |  114 +-
 src/test/app/TxQ_test.cpp                     | 1429 +++--
 src/test/app/ValidatorKeys_test.cpp           |   39 +-
 src/test/app/ValidatorList_test.cpp           |  316 +-
 src/test/app/ValidatorSite_test.cpp           |   72 +-
 src/test/app/Vault_test.cpp                   |  984 ++--
 src/test/app/XChain_test.cpp                  | 2312 ++++----
 src/test/app/tx/apply_test.cpp                |   10 +-
 src/test/basics/Buffer_test.cpp               |    2 +-
 src/test/basics/DetectCrash_test.cpp          |    2 +-
 src/test/basics/Expected_test.cpp             |    2 +-
 src/test/basics/FileUtilities_test.cpp        |   10 +-
 src/test/basics/IOUAmount_test.cpp            |  100 +-
 src/test/basics/IntrusiveShared_test.cpp      |  334 +-
 src/test/basics/KeyCache_test.cpp             |    8 +-
 src/test/basics/Number_test.cpp               |  450 +-
 src/test/basics/PerfLog_test.cpp              |  196 +-
 src/test/basics/StringUtilities_test.cpp      |   44 +-
 src/test/basics/TaggedCache_test.cpp          |    6 +-
 src/test/basics/Units_test.cpp                |   46 +-
 src/test/basics/XRPAmount_test.cpp            |   85 +-
 src/test/basics/base58_test.cpp               |   50 +-
 src/test/basics/base_uint_test.cpp            |   75 +-
 src/test/basics/hardened_hash_test.cpp        |  102 +-
 src/test/basics/join_test.cpp                 |    6 +-
 src/test/beast/IPEndpointCommon.h             |   42 +-
 src/test/beast/IPEndpoint_test.cpp            |  136 +-
 src/test/beast/LexicalCast_test.cpp           |    2 +-
 src/test/beast/SemanticVersion_test.cpp       |    2 +-
 .../beast/aged_associative_container_test.cpp |  252 +-
 .../beast/beast_CurrentThreadName_test.cpp    |    4 +-
 src/test/beast/beast_Journal_test.cpp         |   18 +-
 src/test/beast/beast_PropertyStream_test.cpp  |  149 +-
 src/test/beast/beast_Zero_test.cpp            |   68 +-
 src/test/beast/beast_abstract_clock_test.cpp  |   16 +-
 .../beast/beast_basic_seconds_clock_test.cpp  |    6 +-
 .../beast/beast_io_latency_probe_test.cpp     |   95 +-
 src/test/beast/define_print.cpp               |   10 +-
 src/test/beast/xxhasher_test.cpp              |   50 +-
 src/test/conditions/PreimageSha256_test.cpp   |    4 +-
 .../consensus/ByzantineFailureSim_test.cpp    |    2 +-
 src/test/consensus/Consensus_test.cpp         |   16 +-
 .../DistributedValidatorsSim_test.cpp         |    2 +-
 src/test/consensus/LedgerTiming_test.cpp      |   14 +-
 src/test/consensus/LedgerTrie_test.cpp        |    2 +-
 src/test/consensus/NegativeUNL_test.cpp       |  439 +-
 .../consensus/RCLCensorshipDetector_test.cpp  |    2 +-
 src/test/consensus/ScaleFreeSim_test.cpp      |    8 +-
 src/test/consensus/Validations_test.cpp       |  181 +-
 src/test/core/ClosureCounter_test.cpp         |   12 +-
 src/test/core/Config_test.cpp                 |  159 +-
 src/test/core/Coroutine_test.cpp              |   56 +-
 src/test/core/JobQueue_test.cpp               |   12 +-
 src/test/core/Workers_test.cpp                |   10 +-
 src/test/csf/BasicNetwork.h                   |   30 +-
 src/test/csf/BasicNetwork_test.cpp            |   10 +-
 src/test/csf/Digraph.h                        |    6 +-
 src/test/csf/Digraph_test.cpp                 |    2 +-
 src/test/csf/Histogram.h                      |   12 +-
 src/test/csf/Histogram_test.cpp               |    2 +-
 src/test/csf/Peer.h                           |   19 +-
 src/test/csf/PeerGroup.h                      |    2 +-
 src/test/csf/Scheduler.h                      |  122 +-
 src/test/csf/Scheduler_test.cpp               |   12 +-
 src/test/csf/Sim.h                            |   16 +-
 src/test/csf/SimTime.h                        |    2 +-
 src/test/csf/Tx.h                             |   16 +-
 src/test/csf/Validation.h                     |    2 +-
 src/test/csf/collectors.h                     |   28 +-
 src/test/csf/impl/Sim.cpp                     |   10 +-
 src/test/csf/impl/ledgers.cpp                 |    8 +-
 src/test/csf/ledgers.h                        |   16 +-
 src/test/csf/random.h                         |    4 +-
 src/test/json/TestOutputSuite.h               |    4 +-
 src/test/jtx/AMM.h                            |  102 +-
 src/test/jtx/AMMTest.h                        |   44 +-
 src/test/jtx/AbstractClient.h                 |    6 +-
 src/test/jtx/Account.h                        |   16 +-
 src/test/jtx/CaptureLogs.h                    |    2 +-
 src/test/jtx/CheckMessageLogs.h               |    2 +-
 src/test/jtx/Env.h                            |  112 +-
 src/test/jtx/Env_ss.h                         |   16 +-
 src/test/jtx/Env_test.cpp                     |  324 +-
 src/test/jtx/JSONRPCClient.h                  |    2 +-
 src/test/jtx/JTx.h                            |   46 +-
 src/test/jtx/Oracle.h                         |   47 +-
 src/test/jtx/PathSet.h                        |   86 +-
 src/test/jtx/SignerUtils.h                    |    4 +-
 src/test/jtx/TestHelpers.h                    |  235 +-
 src/test/jtx/TestSuite.h                      |    2 +-
 src/test/jtx/TrustedPublisherServer.h         |  110 +-
 src/test/jtx/WSClient.h                       |    8 +-
 src/test/jtx/WSClient_test.cpp                |    6 +-
 src/test/jtx/account_txn_id.h                 |    4 +-
 src/test/jtx/acctdelete.h                     |    2 +-
 src/test/jtx/amount.h                         |   75 +-
 src/test/jtx/attester.h                       |    4 +-
 src/test/jtx/balance.h                        |    8 +-
 src/test/jtx/basic_prop.h                     |   20 +-
 src/test/jtx/batch.h                          |   32 +-
 src/test/jtx/check.h                          |    8 +-
 src/test/jtx/credentials.h                    |   20 +-
 src/test/jtx/delegate.h                       |    8 +-
 src/test/jtx/delivermin.h                     |    4 +-
 src/test/jtx/deposit.h                        |   16 +-
 src/test/jtx/did.h                            |   18 +-
 src/test/jtx/directory.h                      |    2 +-
 src/test/jtx/domain.h                         |    4 +-
 src/test/jtx/envconfig.h                      |   18 +-
 src/test/jtx/escrow.h                         |   38 +-
 src/test/jtx/fee.h                            |   12 +-
 src/test/jtx/flags.h                          |   26 +-
 src/test/jtx/impl/AMM.cpp                     |  156 +-
 src/test/jtx/impl/AMMTest.cpp                 |   41 +-
 src/test/jtx/impl/Account.cpp                 |   30 +-
 src/test/jtx/impl/Env.cpp                     |  124 +-
 src/test/jtx/impl/JSONRPCClient.cpp           |   28 +-
 src/test/jtx/impl/Oracle.cpp                  |   52 +-
 src/test/jtx/impl/TestHelpers.cpp             |  225 +-
 src/test/jtx/impl/WSClient.cpp                |   60 +-
 src/test/jtx/impl/account_txn_id.cpp          |    2 +-
 src/test/jtx/impl/acctdelete.cpp              |    4 +-
 src/test/jtx/impl/amount.cpp                  |   19 +-
 src/test/jtx/impl/attester.cpp                |    4 +-
 src/test/jtx/impl/balance.cpp                 |   12 +-
 src/test/jtx/impl/batch.cpp                   |   24 +-
 src/test/jtx/impl/check.cpp                   |   16 +-
 src/test/jtx/impl/creds.cpp                   |   20 +-
 src/test/jtx/impl/delegate.cpp                |   14 +-
 src/test/jtx/impl/delivermin.cpp              |    4 +-
 src/test/jtx/impl/deposit.cpp                 |   24 +-
 src/test/jtx/impl/dids.cpp                    |   12 +-
 src/test/jtx/impl/directory.cpp               |    4 +-
 src/test/jtx/impl/domain.cpp                  |    2 +-
 src/test/jtx/impl/envconfig.cpp               |   24 +-
 src/test/jtx/impl/escrow.cpp                  |   14 +-
 src/test/jtx/impl/fee.cpp                     |    6 +-
 src/test/jtx/impl/flags.cpp                   |    8 +-
 src/test/jtx/impl/invoice_id.cpp              |    2 +-
 src/test/jtx/impl/jtx_json.cpp                |   12 +-
 src/test/jtx/impl/last_ledger_sequence.cpp    |    2 +-
 src/test/jtx/impl/ledgerStateFixes.cpp        |    7 +-
 src/test/jtx/impl/memo.cpp                    |    8 +-
 src/test/jtx/impl/mpt.cpp                     |   90 +-
 src/test/jtx/impl/multisign.cpp               |   20 +-
 src/test/jtx/impl/offer.cpp                   |   14 +-
 src/test/jtx/impl/owners.cpp                  |    8 +-
 src/test/jtx/impl/paths.cpp                   |   26 +-
 src/test/jtx/impl/pay.cpp                     |    8 +-
 src/test/jtx/impl/permissioned_domains.cpp    |   32 +-
 src/test/jtx/impl/quality2.cpp                |   14 +-
 src/test/jtx/impl/rate.cpp                    |    4 +-
 src/test/jtx/impl/regkey.cpp                  |   10 +-
 src/test/jtx/impl/sendmax.cpp                 |    4 +-
 src/test/jtx/impl/seq.cpp                     |    4 +-
 src/test/jtx/impl/sig.cpp                     |    4 +-
 src/test/jtx/impl/tag.cpp                     |    4 +-
 src/test/jtx/impl/ticket.cpp                  |    8 +-
 src/test/jtx/impl/token.cpp                   |   68 +-
 src/test/jtx/impl/trust.cpp                   |   18 +-
 src/test/jtx/impl/txflags.cpp                 |    2 +-
 src/test/jtx/impl/utility.cpp                 |   24 +-
 src/test/jtx/impl/vault.cpp                   |   32 +-
 src/test/jtx/impl/xchain_bridge.cpp           |  187 +-
 src/test/jtx/invoice_id.h                     |    4 +-
 src/test/jtx/jtx_json.h                       |   14 +-
 src/test/jtx/last_ledger_sequence.h           |    4 +-
 src/test/jtx/ledgerStateFix.h                 |    2 +-
 src/test/jtx/memo.h                           |   16 +-
 src/test/jtx/mpt.h                            |   36 +-
 src/test/jtx/multisign.h                      |   48 +-
 src/test/jtx/noop.h                           |    2 +-
 src/test/jtx/offer.h                          |    6 +-
 src/test/jtx/owners.h                         |   20 +-
 src/test/jtx/paths.h                          |   34 +-
 src/test/jtx/pay.h                            |    4 +-
 src/test/jtx/permissioned_domains.h           |    8 +-
 src/test/jtx/prop.h                           |   10 +-
 src/test/jtx/quality.h                        |   16 +-
 src/test/jtx/rate.h                           |    2 +-
 src/test/jtx/regkey.h                         |    6 +-
 src/test/jtx/require.h                        |   10 +-
 src/test/jtx/rpc.h                            |   14 +-
 src/test/jtx/sendmax.h                        |    4 +-
 src/test/jtx/seq.h                            |    8 +-
 src/test/jtx/sig.h                            |   16 +-
 src/test/jtx/tag.h                            |    8 +-
 src/test/jtx/tags.h                           |   26 +-
 src/test/jtx/ter.h                            |    6 +-
 src/test/jtx/ticket.h                         |    8 +-
 src/test/jtx/token.h                          |   58 +-
 src/test/jtx/trust.h                          |    6 +-
 src/test/jtx/txflags.h                        |    4 +-
 src/test/jtx/utility.h                        |   16 +-
 src/test/jtx/vault.h                          |   12 +-
 src/test/jtx/xchain_bridge.h                  |  112 +-
 src/test/ledger/BookDirs_test.cpp             |   26 +-
 src/test/ledger/Directory_test.cpp            |  118 +-
 src/test/ledger/PaymentSandbox_test.cpp       |  179 +-
 src/test/ledger/PendingSaves_test.cpp         |    2 +-
 src/test/ledger/SkipList_test.cpp             |    4 +-
 src/test/ledger/View_test.cpp                 |  350 +-
 src/test/nodestore/Backend_test.cpp           |    6 +-
 src/test/nodestore/Basics_test.cpp            |    8 +-
 src/test/nodestore/Database_test.cpp          |   80 +-
 src/test/nodestore/NuDBFactory_test.cpp       |   64 +-
 src/test/nodestore/TestBase.h                 |   28 +-
 src/test/nodestore/Timing_test.cpp            |  147 +-
 src/test/nodestore/import_test.cpp            |   84 +-
 src/test/nodestore/varint_test.cpp            |   14 +-
 src/test/overlay/ProtocolVersion_test.cpp     |   16 +-
 src/test/overlay/TMGetObjectByHash_test.cpp   |   28 +-
 src/test/overlay/cluster_test.cpp             |    2 +-
 src/test/overlay/compression_test.cpp         |   72 +-
 src/test/overlay/handshake_test.cpp           |    2 +-
 src/test/overlay/reduce_relay_test.cpp        |  261 +-
 src/test/overlay/short_read_test.cpp          |  302 +-
 src/test/overlay/traffic_count_test.cpp       |   20 +-
 src/test/overlay/tx_reduce_relay_test.cpp     |   40 +-
 src/test/peerfinder/Livecache_test.cpp        |   38 +-
 src/test/peerfinder/PeerFinder_test.cpp       |  190 +-
 src/test/protocol/ApiVersion_test.cpp         |   27 +-
 src/test/protocol/BuildInfo_test.cpp          |    2 +-
 src/test/protocol/Hooks_test.cpp              |   14 +-
 src/test/protocol/InnerObjectFormats_test.cpp |   14 +-
 src/test/protocol/Issue_test.cpp              |   42 +-
 src/test/protocol/Memo_test.cpp               |   14 +-
 src/test/protocol/MultiApiJson_test.cpp       |  383 +-
 src/test/protocol/PublicKey_test.cpp          |   58 +-
 src/test/protocol/Quality_test.cpp            |   96 +-
 src/test/protocol/STAccount_test.cpp          |    2 +-
 src/test/protocol/STAmount_test.cpp           |   76 +-
 src/test/protocol/STInteger_test.cpp          |   36 +-
 src/test/protocol/STIssue_test.cpp            |   20 +-
 src/test/protocol/STNumber_test.cpp           |   44 +-
 src/test/protocol/STObject_test.cpp           |   72 +-
 src/test/protocol/STParsedJSON_test.cpp       |  638 +--
 src/test/protocol/STTx_test.cpp               |   64 +-
 src/test/protocol/STValidation_test.cpp       |   38 +-
 src/test/protocol/SecretKey_test.cpp          |   36 +-
 src/test/protocol/Seed_test.cpp               |   38 +-
 src/test/protocol/SeqProxy_test.cpp           |  270 +-
 src/test/protocol/Serializer_test.cpp         |    2 +-
 src/test/protocol/TER_test.cpp                |   24 +-
 src/test/resource/Logic_test.cpp              |   32 +-
 src/test/rpc/AMMInfo_test.cpp                 |   48 +-
 src/test/rpc/AccountCurrencies_test.cpp       |   30 +-
 src/test/rpc/AccountInfo_test.cpp             |   78 +-
 src/test/rpc/AccountLines_test.cpp            |  318 +-
 src/test/rpc/AccountObjects_test.cpp          |  329 +-
 src/test/rpc/AccountOffers_test.cpp           |  115 +-
 src/test/rpc/AccountTx_test.cpp               |  224 +-
 src/test/rpc/AmendmentBlocked_test.cpp        |  102 +-
 src/test/rpc/BookChanges_test.cpp             |   18 +-
 src/test/rpc/Book_test.cpp                    |  528 +-
 src/test/rpc/Connect_test.cpp                 |    2 +-
 src/test/rpc/DeliveredAmount_test.cpp         |   68 +-
 src/test/rpc/DepositAuthorized_test.cpp       |   79 +-
 src/test/rpc/Feature_test.cpp                 |   62 +-
 src/test/rpc/GRPCTestClientBase.h             |    4 +-
 src/test/rpc/GatewayBalances_test.cpp         |   58 +-
 src/test/rpc/GetAggregatePrice_test.cpp       |   31 +-
 src/test/rpc/GetCounts_test.cpp               |    4 +-
 src/test/rpc/Handler_test.cpp                 |   14 +-
 src/test/rpc/JSONRPC_test.cpp                 |  246 +-
 src/test/rpc/KeyGeneration_test.cpp           |  366 +-
 src/test/rpc/LedgerClosed_test.cpp            |   26 +-
 src/test/rpc/LedgerData_test.cpp              |   98 +-
 src/test/rpc/LedgerEntry_test.cpp             |  742 ++-
 src/test/rpc/LedgerHeader_test.cpp            |   14 +-
 src/test/rpc/LedgerRPC_test.cpp               |   62 +-
 src/test/rpc/LedgerRequest_test.cpp           |   96 +-
 src/test/rpc/ManifestRPC_test.cpp             |    2 +-
 src/test/rpc/NoRippleCheck_test.cpp           |   62 +-
 src/test/rpc/NoRipple_test.cpp                |   70 +-
 src/test/rpc/OwnerInfo_test.cpp               |   68 +-
 src/test/rpc/Peers_test.cpp                   |    4 +-
 src/test/rpc/RPCCall_test.cpp                 |  755 ++-
 src/test/rpc/RPCHelpers_test.cpp              |   20 +-
 src/test/rpc/RPCOverload_test.cpp             |    6 +-
 src/test/rpc/RobustTransaction_test.cpp       |   46 +-
 src/test/rpc/Roles_test.cpp                   |   16 +-
 src/test/rpc/ServerDefinitions_test.cpp       |  130 +-
 src/test/rpc/ServerInfo_test.cpp              |   31 +-
 src/test/rpc/Simulate_test.cpp                |  374 +-
 src/test/rpc/Status_test.cpp                  |   40 +-
 src/test/rpc/Submit_test.cpp                  |   14 +-
 src/test/rpc/Subscribe_test.cpp               |  338 +-
 src/test/rpc/TransactionEntry_test.cpp        |  120 +-
 src/test/rpc/TransactionHistory_test.cpp      |   26 +-
 src/test/rpc/Transaction_test.cpp             |  182 +-
 src/test/rpc/ValidatorInfo_test.cpp           |   14 +-
 src/test/rpc/ValidatorRPC_test.cpp            |   26 +-
 src/test/rpc/Version_test.cpp                 |   95 +-
 src/test/server/ServerStatus_test.cpp         |  194 +-
 src/test/server/Server_test.cpp               |   42 +-
 src/test/shamap/FetchPack_test.cpp            |   36 +-
 src/test/shamap/SHAMapSync_test.cpp           |   16 +-
 src/test/shamap/SHAMap_test.cpp               |   80 +-
 src/test/shamap/common.h                      |    4 +-
 src/test/unit_test/FileDirGuard.h             |   10 +-
 src/test/unit_test/SuiteJournal.h             |   26 +-
 src/test/unit_test/multi_runner.cpp           |  262 +-
 src/test/unit_test/multi_runner.h             |  158 +-
 src/test/unit_test/utils.h                    |    4 +-
 src/tests/libxrpl/basics/MallocTrim.cpp       |    2 +-
 src/tests/libxrpl/basics/Mutex.cpp            |   10 +-
 src/tests/libxrpl/basics/RangeSet.cpp         |   22 +-
 src/tests/libxrpl/basics/Slice.cpp            |   34 +-
 src/tests/libxrpl/basics/base64.cpp           |    6 +-
 src/tests/libxrpl/basics/contract.cpp         |    2 +-
 src/tests/libxrpl/basics/scope.cpp            |   48 +-
 src/tests/libxrpl/basics/tagged_integer.cpp   |    8 +-
 src/tests/libxrpl/crypto/csprng.cpp           |    8 +-
 src/tests/libxrpl/helpers/Account.h           |    2 +-
 src/tests/libxrpl/helpers/IOU.h               |    2 +-
 src/tests/libxrpl/helpers/TestFamily.h        |    2 +-
 .../libxrpl/helpers/TestServiceRegistry.h     |    4 +-
 src/tests/libxrpl/helpers/TestSink.cpp        |   32 +-
 src/tests/libxrpl/helpers/TestSink.h          |    2 +-
 src/tests/libxrpl/helpers/TxTest.cpp          |   14 +-
 src/tests/libxrpl/helpers/TxTest.h            |    8 +-
 src/tests/libxrpl/json/Output.cpp             |    8 +-
 src/tests/libxrpl/json/Value.cpp              |  586 +-
 src/tests/libxrpl/json/Writer.cpp             |  112 +-
 .../libxrpl/protocol_autogen/TestHelpers.h    |    4 +-
 .../transactions/AMMBidTests.cpp              |   10 +-
 .../transactions/AMMClawbackTests.cpp         |   10 +-
 .../transactions/AMMCreateTests.cpp           |    8 +-
 .../transactions/AMMDeleteTests.cpp           |    8 +-
 .../transactions/AMMDepositTests.cpp          |   10 +-
 .../transactions/AMMVoteTests.cpp             |    8 +-
 .../transactions/AMMWithdrawTests.cpp         |   10 +-
 .../transactions/AccountDeleteTests.cpp       |   10 +-
 .../transactions/AccountSetTests.cpp          |   10 +-
 .../transactions/BatchTests.cpp               |   10 +-
 .../transactions/CheckCancelTests.cpp         |    8 +-
 .../transactions/CheckCashTests.cpp           |   10 +-
 .../transactions/CheckCreateTests.cpp         |   10 +-
 .../transactions/ClawbackTests.cpp            |   10 +-
 .../transactions/CredentialAcceptTests.cpp    |    8 +-
 .../transactions/CredentialCreateTests.cpp    |   10 +-
 .../transactions/CredentialDeleteTests.cpp    |   10 +-
 .../transactions/DIDDeleteTests.cpp           |    8 +-
 .../transactions/DIDSetTests.cpp              |   10 +-
 .../transactions/DelegateSetTests.cpp         |    8 +-
 .../transactions/DepositPreauthTests.cpp      |   10 +-
 .../transactions/EnableAmendmentTests.cpp     |    8 +-
 .../transactions/EscrowCancelTests.cpp        |    8 +-
 .../transactions/EscrowCreateTests.cpp        |   10 +-
 .../transactions/EscrowFinishTests.cpp        |   10 +-
 .../transactions/LedgerStateFixTests.cpp      |   10 +-
 .../LoanBrokerCoverClawbackTests.cpp          |   10 +-
 .../LoanBrokerCoverDepositTests.cpp           |    8 +-
 .../LoanBrokerCoverWithdrawTests.cpp          |   10 +-
 .../transactions/LoanBrokerDeleteTests.cpp    |    8 +-
 .../transactions/LoanBrokerSetTests.cpp       |   10 +-
 .../transactions/LoanDeleteTests.cpp          |    8 +-
 .../transactions/LoanManageTests.cpp          |    8 +-
 .../transactions/LoanPayTests.cpp             |    8 +-
 .../transactions/LoanSetTests.cpp             |   10 +-
 .../transactions/MPTokenAuthorizeTests.cpp    |   10 +-
 .../MPTokenIssuanceCreateTests.cpp            |   10 +-
 .../MPTokenIssuanceDestroyTests.cpp           |    8 +-
 .../transactions/MPTokenIssuanceSetTests.cpp  |   10 +-
 .../transactions/NFTokenAcceptOfferTests.cpp  |   10 +-
 .../transactions/NFTokenBurnTests.cpp         |   10 +-
 .../transactions/NFTokenCancelOfferTests.cpp  |    8 +-
 .../transactions/NFTokenCreateOfferTests.cpp  |   10 +-
 .../transactions/NFTokenMintTests.cpp         |   10 +-
 .../transactions/NFTokenModifyTests.cpp       |   10 +-
 .../transactions/OfferCancelTests.cpp         |    8 +-
 .../transactions/OfferCreateTests.cpp         |   10 +-
 .../transactions/OracleDeleteTests.cpp        |    8 +-
 .../transactions/OracleSetTests.cpp           |   10 +-
 .../transactions/PaymentChannelClaimTests.cpp |   10 +-
 .../PaymentChannelCreateTests.cpp             |   10 +-
 .../transactions/PaymentChannelFundTests.cpp  |   10 +-
 .../transactions/PaymentTests.cpp             |   10 +-
 .../PermissionedDomainDeleteTests.cpp         |    8 +-
 .../PermissionedDomainSetTests.cpp            |   10 +-
 .../transactions/SetFeeTests.cpp              |   10 +-
 .../transactions/SetRegularKeyTests.cpp       |   10 +-
 .../transactions/SignerListSetTests.cpp       |   10 +-
 .../transactions/TicketCreateTests.cpp        |    8 +-
 .../transactions/TrustSetTests.cpp            |   10 +-
 .../transactions/UNLModifyTests.cpp           |    8 +-
 .../transactions/VaultClawbackTests.cpp       |   10 +-
 .../transactions/VaultCreateTests.cpp         |   10 +-
 .../transactions/VaultDeleteTests.cpp         |    8 +-
 .../transactions/VaultDepositTests.cpp        |    8 +-
 .../transactions/VaultSetTests.cpp            |   10 +-
 .../transactions/VaultWithdrawTests.cpp       |   10 +-
 .../XChainAccountCreateCommitTests.cpp        |    8 +-
 ...XChainAddAccountCreateAttestationTests.cpp |    8 +-
 .../XChainAddClaimAttestationTests.cpp        |   10 +-
 .../transactions/XChainClaimTests.cpp         |   10 +-
 .../transactions/XChainCommitTests.cpp        |   10 +-
 .../transactions/XChainCreateBridgeTests.cpp  |   10 +-
 .../transactions/XChainCreateClaimIDTests.cpp |    8 +-
 .../transactions/XChainModifyBridgeTests.cpp  |   10 +-
 src/tests/libxrpl/tx/AccountSet.cpp           |   65 +-
 .../app/consensus/RCLCensorshipDetector.h     |    6 +-
 src/xrpld/app/consensus/RCLConsensus.cpp      |  102 +-
 src/xrpld/app/consensus/RCLConsensus.h        |   12 +-
 src/xrpld/app/consensus/RCLCxLedger.h         |   22 +-
 src/xrpld/app/consensus/RCLCxPeerPos.cpp      |    2 +-
 src/xrpld/app/consensus/RCLCxPeerPos.h        |    6 +-
 src/xrpld/app/consensus/RCLCxTx.h             |   28 +-
 src/xrpld/app/consensus/RCLValidations.cpp    |   10 +-
 src/xrpld/app/consensus/RCLValidations.h      |    4 +-
 src/xrpld/app/ledger/AcceptedLedger.cpp       |    2 +-
 src/xrpld/app/ledger/AcceptedLedger.h         |    4 +-
 src/xrpld/app/ledger/AccountStateSF.cpp       |    5 +-
 src/xrpld/app/ledger/ConsensusTransSetSF.cpp  |   18 +-
 src/xrpld/app/ledger/ConsensusTransSetSF.h    |    2 +-
 src/xrpld/app/ledger/InboundLedger.h          |   48 +-
 src/xrpld/app/ledger/InboundLedgers.h         |    6 +-
 src/xrpld/app/ledger/InboundTransactions.h    |    4 +-
 src/xrpld/app/ledger/LedgerCleaner.h          |    4 +-
 src/xrpld/app/ledger/LedgerHistory.cpp        |  124 +-
 src/xrpld/app/ledger/LedgerHistory.h          |   22 +-
 src/xrpld/app/ledger/LedgerHolder.h           |   20 +-
 src/xrpld/app/ledger/LedgerMaster.h           |   74 +-
 src/xrpld/app/ledger/LedgerReplayTask.h       |   16 +-
 src/xrpld/app/ledger/LedgerReplayer.h         |   24 +-
 src/xrpld/app/ledger/LedgerToJson.h           |   24 +-
 src/xrpld/app/ledger/LocalTxs.h               |    6 +-
 src/xrpld/app/ledger/OpenLedger.h             |   16 +-
 src/xrpld/app/ledger/OrderBookDBImpl.cpp      |   26 +-
 src/xrpld/app/ledger/OrderBookDBImpl.h        |    6 +-
 src/xrpld/app/ledger/TransactionMaster.h      |   10 +-
 src/xrpld/app/ledger/TransactionStateSF.cpp   |    7 +-
 src/xrpld/app/ledger/detail/BuildLedger.cpp   |   12 +-
 src/xrpld/app/ledger/detail/InboundLedger.cpp |  409 +-
 .../app/ledger/detail/InboundLedgers.cpp      |  122 +-
 .../app/ledger/detail/InboundTransactions.cpp |  120 +-
 src/xrpld/app/ledger/detail/LedgerCleaner.cpp |   20 +-
 .../app/ledger/detail/LedgerDeltaAcquire.cpp  |   18 +-
 .../app/ledger/detail/LedgerDeltaAcquire.h    |    2 +-
 src/xrpld/app/ledger/detail/LedgerMaster.cpp  |  624 +-
 .../app/ledger/detail/LedgerPersistence.cpp   |    6 +-
 .../ledger/detail/LedgerReplayMsgHandler.cpp  |    8 +-
 .../app/ledger/detail/LedgerReplayTask.cpp    |   59 +-
 .../app/ledger/detail/LedgerReplayer.cpp      |   34 +-
 src/xrpld/app/ledger/detail/LedgerToJson.cpp  |   74 +-
 src/xrpld/app/ledger/detail/LocalTxs.cpp      |   58 +-
 src/xrpld/app/ledger/detail/OpenLedger.cpp    |   13 +-
 .../app/ledger/detail/SkipListAcquire.cpp     |   14 +-
 src/xrpld/app/ledger/detail/TimeoutCounter.h  |   12 +-
 .../app/ledger/detail/TransactionAcquire.cpp  |   50 +-
 .../app/ledger/detail/TransactionAcquire.h    |    6 +-
 .../app/ledger/detail/TransactionMaster.cpp   |   42 +-
 src/xrpld/app/main/Application.cpp            |  664 +--
 src/xrpld/app/main/Application.h              |    2 +-
 src/xrpld/app/main/BasicApp.h                 |    4 +-
 src/xrpld/app/main/CollectorManager.cpp       |   24 +-
 src/xrpld/app/main/CollectorManager.h         |    2 +-
 src/xrpld/app/main/GRPCServer.cpp             |   42 +-
 src/xrpld/app/main/GRPCServer.h               |    2 +-
 src/xrpld/app/main/LoadManager.cpp            |   18 +-
 src/xrpld/app/main/LoadManager.h              |    4 +-
 src/xrpld/app/main/Main.cpp                   |   88 +-
 src/xrpld/app/main/NodeIdentity.cpp           |    4 +-
 src/xrpld/app/main/NodeStoreScheduler.cpp     |    6 +-
 src/xrpld/app/main/Tuning.h                   |    6 +-
 src/xrpld/app/misc/DeliverMax.h               |    6 +-
 src/xrpld/app/misc/FeeVote.h                  |    2 +-
 src/xrpld/app/misc/FeeVoteImpl.cpp            |   11 +-
 src/xrpld/app/misc/NegativeUNLVote.cpp        |   35 +-
 src/xrpld/app/misc/NegativeUNLVote.h          |   10 +-
 src/xrpld/app/misc/NetworkOPs.cpp             | 1274 +++--
 src/xrpld/app/misc/SHAMapStore.h              |    4 +-
 src/xrpld/app/misc/SHAMapStoreImp.cpp         |  104 +-
 src/xrpld/app/misc/SHAMapStoreImp.h           |   26 +-
 src/xrpld/app/misc/Transaction.h              |   58 +-
 src/xrpld/app/misc/TxQ.h                      |   56 +-
 src/xrpld/app/misc/ValidatorKeys.h            |    4 +-
 src/xrpld/app/misc/ValidatorList.h            |   72 +-
 src/xrpld/app/misc/ValidatorSite.h            |    6 +-
 src/xrpld/app/misc/detail/AccountTxPaging.cpp |    8 +-
 src/xrpld/app/misc/detail/AccountTxPaging.h   |    2 +-
 src/xrpld/app/misc/detail/AmendmentTable.cpp  |  108 +-
 src/xrpld/app/misc/detail/DeliverMax.cpp      |    8 +-
 src/xrpld/app/misc/detail/Transaction.cpp     |   60 +-
 src/xrpld/app/misc/detail/TxQ.cpp             |   97 +-
 src/xrpld/app/misc/detail/ValidatorKeys.cpp   |    8 +-
 src/xrpld/app/misc/detail/ValidatorList.cpp   |  270 +-
 src/xrpld/app/misc/detail/ValidatorSite.cpp   |  100 +-
 .../app/misc/detail/setup_HashRouter.cpp      |    2 +-
 src/xrpld/app/misc/make_NetworkOPs.h          |    4 +-
 src/xrpld/app/misc/setup_HashRouter.h         |    2 +-
 src/xrpld/app/rdb/backend/SQLiteDatabase.h    |    6 +-
 src/xrpld/app/rdb/backend/detail/Node.cpp     |  114 +-
 src/xrpld/app/rdb/backend/detail/Node.h       |   12 +-
 .../app/rdb/backend/detail/SQLiteDatabase.cpp |   36 +-
 src/xrpld/app/rdb/detail/PeerFinder.cpp       |   10 +-
 src/xrpld/consensus/Consensus.cpp             |    6 +-
 src/xrpld/consensus/Consensus.h               |  118 +-
 src/xrpld/consensus/ConsensusParms.h          |   18 +-
 src/xrpld/consensus/ConsensusProposal.h       |   58 +-
 src/xrpld/consensus/ConsensusTypes.h          |   28 +-
 src/xrpld/consensus/DisputedTx.h              |   54 +-
 src/xrpld/consensus/LedgerTrie.h              |   60 +-
 src/xrpld/consensus/Validations.h             |   56 +-
 src/xrpld/core/Config.h                       |   70 +-
 src/xrpld/core/TimeKeeper.h                   |    4 +-
 src/xrpld/core/detail/Config.cpp              |  236 +-
 src/xrpld/overlay/Cluster.h                   |    2 +-
 src/xrpld/overlay/ClusterNode.h               |   10 +-
 src/xrpld/overlay/Compression.h               |    4 +-
 src/xrpld/overlay/Message.h                   |    2 +-
 src/xrpld/overlay/Overlay.h                   |   10 +-
 src/xrpld/overlay/Peer.h                      |    2 +-
 src/xrpld/overlay/PeerSet.h                   |    4 +-
 src/xrpld/overlay/ReduceRelayCommon.h         |   24 +-
 src/xrpld/overlay/Slot.h                      |  148 +-
 src/xrpld/overlay/Squelch.h                   |   22 +-
 src/xrpld/overlay/detail/Cluster.cpp          |    8 +-
 src/xrpld/overlay/detail/ConnectAttempt.cpp   |   78 +-
 src/xrpld/overlay/detail/ConnectAttempt.h     |   30 +-
 src/xrpld/overlay/detail/Handshake.cpp        |   79 +-
 src/xrpld/overlay/detail/Handshake.h          |   34 +-
 src/xrpld/overlay/detail/Message.cpp          |   18 +-
 src/xrpld/overlay/detail/OverlayImpl.cpp      |  380 +-
 src/xrpld/overlay/detail/OverlayImpl.h        |   94 +-
 src/xrpld/overlay/detail/PeerImp.cpp          |  815 ++-
 src/xrpld/overlay/detail/PeerImp.h            |   82 +-
 .../overlay/detail/PeerReservationTable.cpp   |    8 +-
 src/xrpld/overlay/detail/PeerSet.cpp          |    8 +-
 src/xrpld/overlay/detail/ProtocolMessage.h    |    8 +-
 src/xrpld/overlay/detail/ProtocolVersion.cpp  |   26 +-
 src/xrpld/overlay/detail/ProtocolVersion.h    |    2 +-
 src/xrpld/overlay/detail/TrafficCount.cpp     |  104 +-
 src/xrpld/overlay/detail/TrafficCount.h       |  363 +-
 src/xrpld/overlay/detail/Tuning.h             |   22 +-
 src/xrpld/overlay/detail/TxMetrics.cpp        |    4 +-
 src/xrpld/overlay/detail/TxMetrics.h          |    2 +-
 src/xrpld/overlay/make_Overlay.h              |    6 +-
 src/xrpld/overlay/predicates.h                |   38 +-
 src/xrpld/peerfinder/PeerfinderManager.h      |   38 +-
 src/xrpld/peerfinder/Slot.h                   |   10 +-
 src/xrpld/peerfinder/detail/Bootcache.cpp     |  102 +-
 src/xrpld/peerfinder/detail/Bootcache.h       |   26 +-
 src/xrpld/peerfinder/detail/Checker.h         |   63 +-
 src/xrpld/peerfinder/detail/Counts.h          |  135 +-
 src/xrpld/peerfinder/detail/Endpoint.cpp      |    4 +-
 src/xrpld/peerfinder/detail/Fixed.h           |   16 +-
 src/xrpld/peerfinder/detail/Handouts.h        |   74 +-
 src/xrpld/peerfinder/detail/Livecache.h       |  156 +-
 src/xrpld/peerfinder/detail/Logic.h           |  518 +-
 .../peerfinder/detail/PeerfinderConfig.cpp    |    8 +-
 .../peerfinder/detail/PeerfinderManager.cpp   |  112 +-
 src/xrpld/peerfinder/detail/SlotImp.cpp       |   68 +-
 src/xrpld/peerfinder/detail/SlotImp.h         |   80 +-
 src/xrpld/peerfinder/detail/SourceStrings.cpp |   22 +-
 src/xrpld/peerfinder/detail/SourceStrings.h   |    2 +-
 src/xrpld/peerfinder/detail/StoreSqdb.h       |   22 +-
 src/xrpld/peerfinder/detail/Tuning.h          |   36 +-
 src/xrpld/peerfinder/detail/iosformat.h       |   46 +-
 src/xrpld/peerfinder/make_Manager.h           |    4 +-
 src/xrpld/perflog/detail/PerfLogImp.cpp       |  118 +-
 src/xrpld/perflog/detail/PerfLogImp.h         |   22 +-
 src/xrpld/rpc/BookChanges.h                   |   20 +-
 src/xrpld/rpc/CTID.h                          |   18 +-
 src/xrpld/rpc/Context.h                       |    2 +-
 src/xrpld/rpc/DeliveredAmount.h               |   10 +-
 src/xrpld/rpc/MPTokenIssuanceID.h             |    2 +-
 src/xrpld/rpc/RPCCall.h                       |   14 +-
 src/xrpld/rpc/RPCHandler.h                    |    4 +-
 src/xrpld/rpc/RPCSub.h                        |    6 +-
 src/xrpld/rpc/Request.h                       |   53 -
 src/xrpld/rpc/Role.h                          |    4 +-
 src/xrpld/rpc/ServerHandler.h                 |   36 +-
 src/xrpld/rpc/Status.h                        |   37 +-
 src/xrpld/rpc/detail/AccountAssets.cpp        |    6 +-
 src/xrpld/rpc/detail/AssetCache.cpp           |   17 +-
 src/xrpld/rpc/detail/AssetCache.h             |   22 +-
 src/xrpld/rpc/detail/DeliveredAmount.cpp      |   14 +-
 src/xrpld/rpc/detail/Handler.cpp              |  599 +-
 src/xrpld/rpc/detail/Handler.h                |   70 +-
 src/xrpld/rpc/detail/LegacyPathFind.cpp       |   12 +-
 src/xrpld/rpc/detail/LegacyPathFind.h         |    4 +-
 src/xrpld/rpc/detail/MPTokenIssuanceID.cpp    |    2 +-
 src/xrpld/rpc/detail/PathRequest.cpp          |  436 +-
 src/xrpld/rpc/detail/PathRequest.h            |   58 +-
 src/xrpld/rpc/detail/PathRequestManager.cpp   |   48 +-
 src/xrpld/rpc/detail/PathRequestManager.h     |   32 +-
 src/xrpld/rpc/detail/Pathfinder.cpp           |  415 +-
 src/xrpld/rpc/detail/Pathfinder.h             |   72 +-
 src/xrpld/rpc/detail/PathfinderUtils.h        |    6 +-
 src/xrpld/rpc/detail/RPCCall.cpp              |  494 +-
 src/xrpld/rpc/detail/RPCHandler.cpp           |   56 +-
 src/xrpld/rpc/detail/RPCHelpers.cpp           |  120 +-
 src/xrpld/rpc/detail/RPCHelpers.h             |   22 +-
 src/xrpld/rpc/detail/RPCLedgerHelpers.cpp     |  112 +-
 src/xrpld/rpc/detail/RPCLedgerHelpers.h       |   24 +-
 src/xrpld/rpc/detail/RPCSub.cpp               |  108 +-
 src/xrpld/rpc/detail/Role.cpp                 |   20 +-
 src/xrpld/rpc/detail/ServerHandler.cpp        |  361 +-
 src/xrpld/rpc/detail/Status.cpp               |   10 +-
 src/xrpld/rpc/detail/TransactionSign.cpp      |  471 +-
 src/xrpld/rpc/detail/TransactionSign.h        |   36 +-
 src/xrpld/rpc/detail/TrustLine.cpp            |   26 +-
 src/xrpld/rpc/detail/TrustLine.h              |   48 +-
 src/xrpld/rpc/detail/Tuning.h                 |   42 +-
 src/xrpld/rpc/detail/WSInfoSub.h              |   10 +-
 src/xrpld/rpc/handlers/ChannelVerify.cpp      |   18 +-
 src/xrpld/rpc/handlers/Handlers.h             |  144 +-
 src/xrpld/rpc/handlers/VaultInfo.cpp          |   26 +-
 .../rpc/handlers/account/AccountChannels.cpp  |   42 +-
 .../handlers/account/AccountCurrencies.cpp    |   16 +-
 .../rpc/handlers/account/AccountInfo.cpp      |   60 +-
 .../rpc/handlers/account/AccountLines.cpp     |   40 +-
 .../rpc/handlers/account/AccountNFTs.cpp      |   34 +-
 .../rpc/handlers/account/AccountObjects.cpp   |   58 +-
 .../rpc/handlers/account/AccountOffers.cpp    |   38 +-
 src/xrpld/rpc/handlers/account/AccountTx.cpp  |   90 +-
 .../rpc/handlers/account/GatewayBalances.cpp  |   39 +-
 .../rpc/handlers/account/NoRippleCheck.cpp    |   36 +-
 src/xrpld/rpc/handlers/account/OwnerInfo.cpp  |   10 +-
 src/xrpld/rpc/handlers/admin/BlackList.cpp    |    2 +-
 src/xrpld/rpc/handlers/admin/UnlList.cpp      |    8 +-
 .../rpc/handlers/admin/data/CanDelete.cpp     |   14 +-
 .../rpc/handlers/admin/data/LedgerCleaner.cpp |    2 +-
 .../rpc/handlers/admin/data/LedgerRequest.cpp |    6 +-
 .../admin/keygen/ValidationCreate.cpp         |   14 +-
 .../handlers/admin/keygen/WalletPropose.cpp   |   26 +-
 .../rpc/handlers/admin/keygen/WalletPropose.h |    4 +-
 src/xrpld/rpc/handlers/admin/log/LogLevel.cpp |   18 +-
 .../rpc/handlers/admin/log/LogRotate.cpp      |    2 +-
 src/xrpld/rpc/handlers/admin/peer/Connect.cpp |   22 +-
 .../admin/peer/PeerReservationsAdd.cpp        |   14 +-
 .../admin/peer/PeerReservationsDel.cpp        |   10 +-
 .../admin/peer/PeerReservationsList.cpp       |    8 +-
 src/xrpld/rpc/handlers/admin/peer/Peers.cpp   |   10 +-
 .../admin/server_control/LedgerAccept.cpp     |    4 +-
 .../handlers/admin/server_control/Stop.cpp    |    2 +-
 .../admin/signing/ChannelAuthorize.cpp        |   24 +-
 src/xrpld/rpc/handlers/admin/signing/Sign.cpp |    6 +-
 .../rpc/handlers/admin/signing/SignFor.cpp    |    6 +-
 .../handlers/admin/status/ConsensusInfo.cpp   |    4 +-
 .../rpc/handlers/admin/status/FetchInfo.cpp   |    4 +-
 .../rpc/handlers/admin/status/GetCounts.cpp   |   10 +-
 .../rpc/handlers/admin/status/GetCounts.h     |    2 +-
 src/xrpld/rpc/handlers/admin/status/Print.cpp |    2 +-
 .../handlers/admin/status/ValidatorInfo.cpp   |    8 +-
 .../admin/status/ValidatorListSites.cpp       |    2 +-
 .../rpc/handlers/admin/status/Validators.cpp  |    2 +-
 src/xrpld/rpc/handlers/ledger/Ledger.cpp      |   55 +-
 src/xrpld/rpc/handlers/ledger/Ledger.h        |   16 +-
 .../rpc/handlers/ledger/LedgerClosed.cpp      |    4 +-
 .../rpc/handlers/ledger/LedgerCurrent.cpp     |    4 +-
 src/xrpld/rpc/handlers/ledger/LedgerData.cpp  |   32 +-
 src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp |  277 +-
 .../rpc/handlers/ledger/LedgerEntryHelpers.h  |   90 +-
 .../rpc/handlers/ledger/LedgerHeader.cpp      |    2 +-
 src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp  |   61 +-
 .../rpc/handlers/orderbook/BookChanges.cpp    |    4 +-
 .../rpc/handlers/orderbook/BookOffers.cpp     |  119 +-
 .../handlers/orderbook/DepositAuthorized.cpp  |   62 +-
 .../handlers/orderbook/GetAggregatePrice.cpp  |   82 +-
 .../rpc/handlers/orderbook/NFTBuyOffers.cpp   |    8 +-
 .../rpc/handlers/orderbook/NFTOffersHelpers.h |   26 +-
 .../rpc/handlers/orderbook/NFTSellOffers.cpp  |    8 +-
 src/xrpld/rpc/handlers/orderbook/PathFind.cpp |   16 +-
 .../rpc/handlers/orderbook/RipplePathFind.cpp |   16 +-
 .../rpc/handlers/server_info/Feature.cpp      |   14 +-
 src/xrpld/rpc/handlers/server_info/Fee.cpp    |    6 +-
 .../rpc/handlers/server_info/Manifest.cpp     |   12 +-
 .../server_info/ServerDefinitions.cpp         |   94 +-
 .../handlers/server_info/ServerDefinitions.h  |    2 +-
 .../rpc/handlers/server_info/ServerInfo.cpp   |    4 +-
 .../rpc/handlers/server_info/ServerState.cpp  |    4 +-
 src/xrpld/rpc/handlers/server_info/Version.h  |   12 +-
 .../rpc/handlers/subscribe/Subscribe.cpp      |   68 +-
 .../rpc/handlers/subscribe/Unsubscribe.cpp    |   40 +-
 .../rpc/handlers/transaction/Simulate.cpp     |  124 +-
 src/xrpld/rpc/handlers/transaction/Submit.cpp |   22 +-
 .../transaction/SubmitMultiSigned.cpp         |    4 +-
 .../handlers/transaction/TransactionEntry.cpp |   16 +-
 src/xrpld/rpc/handlers/transaction/Tx.cpp     |   66 +-
 .../rpc/handlers/transaction/TxHistory.cpp    |   20 +-
 .../handlers/transaction/TxReduceRelay.cpp    |    2 +-
 src/xrpld/rpc/handlers/utility/Ping.cpp       |    4 +-
 src/xrpld/rpc/handlers/utility/Random.cpp     |    8 +-
 src/xrpld/rpc/json_body.h                     |   18 +-
 src/xrpld/shamap/NodeFamily.cpp               |    8 +-
 1498 files changed, 58858 insertions(+), 58914 deletions(-)
 delete mode 100644 src/xrpld/rpc/Request.h

diff --git a/.clang-tidy b/.clang-tidy
index 6a7005b464..daacf4f00e 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,4 @@
 ---
-# This entire group of checks was applied to all cpp files but not all header files.
-# ---
 Checks: "-*,
   bugprone-argument-comment,
   bugprone-assert-side-effect,
@@ -137,6 +135,7 @@ Checks: "-*,
   readability-duplicate-include,
   readability-else-after-return,
   readability-enum-initial-value,
+  readability-identifier-naming,
   readability-implicit-bool-conversion,
   readability-make-member-function-const,
   readability-math-missing-parentheses,
@@ -154,52 +153,47 @@ Checks: "-*,
   readability-use-std-min-max
   "
 # ---
-# other checks that have issues that need to be resolved:
-#
 # readability-inconsistent-declaration-parameter-name, # in this codebase this check will break a lot of arg names
 # readability-static-accessed-through-instance,        # this check is probably unnecessary. it makes the code less readable
-# readability-identifier-naming,                       # https://github.com/XRPLF/rippled/pull/6571
 # ---
-#
 CheckOptions:
   readability-braces-around-statements.ShortStatementLines: 2
-  #   readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
-  #   readability-identifier-naming.ClassCase: CamelCase
-  #   readability-identifier-naming.StructCase: CamelCase
-  #   readability-identifier-naming.UnionCase: CamelCase
-  #   readability-identifier-naming.EnumCase: CamelCase
-  #   readability-identifier-naming.EnumConstantCase: CamelCase
-  #   readability-identifier-naming.ScopedEnumConstantCase: CamelCase
-  #   readability-identifier-naming.GlobalConstantCase: UPPER_CASE
-  #   readability-identifier-naming.GlobalConstantPrefix: "k"
-  #   readability-identifier-naming.GlobalVariableCase: CamelCase
-  #   readability-identifier-naming.GlobalVariablePrefix: "g"
-  #   readability-identifier-naming.ConstexprFunctionCase: camelBack
-  #   readability-identifier-naming.ConstexprMethodCase: camelBack
-  #   readability-identifier-naming.ClassMethodCase: camelBack
-  #   readability-identifier-naming.ClassMemberCase: camelBack
-  #   readability-identifier-naming.ClassConstantCase: UPPER_CASE
-  #   readability-identifier-naming.ClassConstantPrefix: "k"
-  #   readability-identifier-naming.StaticConstantCase: UPPER_CASE
-  #   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.LocalConstantCase: camelBack
-  #   readability-identifier-naming.LocalVariableCase: camelBack
-  #   readability-identifier-naming.TemplateParameterCase: CamelCase
-  #   readability-identifier-naming.ParameterCase: camelBack
-  #   readability-identifier-naming.FunctionCase: camelBack
-  #   readability-identifier-naming.MemberCase: camelBack
-  #   readability-identifier-naming.PrivateMemberSuffix: _
-  #   readability-identifier-naming.ProtectedMemberSuffix: _
-  #   readability-identifier-naming.PublicMemberSuffix: ""
-  #   readability-identifier-naming.FunctionIgnoredRegexp: ".*tag_invoke.*"
+  readability-identifier-naming.MacroDefinitionCase: UPPER_CASE
+  readability-identifier-naming.ClassCase: CamelCase
+  readability-identifier-naming.StructCase: CamelCase
+  readability-identifier-naming.UnionCase: CamelCase
+  readability-identifier-naming.EnumCase: CamelCase
+  readability-identifier-naming.EnumConstantCase: CamelCase
+  readability-identifier-naming.ScopedEnumConstantCase: CamelCase
+  readability-identifier-naming.GlobalConstantCase: UPPER_CASE
+  readability-identifier-naming.GlobalConstantPrefix: "k"
+  readability-identifier-naming.GlobalVariableCase: CamelCase
+  readability-identifier-naming.GlobalVariablePrefix: "g"
+  readability-identifier-naming.ConstexprFunctionCase: camelBack
+  readability-identifier-naming.ConstexprMethodCase: camelBack
+  readability-identifier-naming.ClassMethodCase: camelBack
+  readability-identifier-naming.ClassMemberCase: camelBack
+  readability-identifier-naming.ClassConstantCase: UPPER_CASE
+  readability-identifier-naming.ClassConstantPrefix: "k"
+  readability-identifier-naming.StaticConstantCase: UPPER_CASE
+  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.LocalConstantCase: camelBack
+  readability-identifier-naming.LocalVariableCase: camelBack
+  readability-identifier-naming.TemplateParameterCase: CamelCase
+  readability-identifier-naming.ParameterCase: camelBack
+  readability-identifier-naming.FunctionCase: camelBack
+  readability-identifier-naming.MemberCase: camelBack
+  readability-identifier-naming.PrivateMemberSuffix: _
+  readability-identifier-naming.ProtectedMemberSuffix: _
+  readability-identifier-naming.PublicMemberSuffix: ""
+  readability-identifier-naming.GlobalFunctionIgnoredRegexp: "^(to_string|hash_append|tuple_hash)$"
   bugprone-unsafe-functions.ReportMoreUnsafeFunctions: true
   bugprone-unused-return-value.CheckedReturnTypes: ::std::error_code;::std::error_condition;::std::errc
   misc-include-cleaner.IgnoreHeaders: ".*/(detail|impl)/.*;.*fwd\\.h(pp)?;time.h;stdlib.h;sqlite3.h;netinet/in\\.h;sys/resource\\.h;sys/sysinfo\\.h;linux/sysinfo\\.h;__chrono/.*;bits/.*;_abort\\.h;boost/uuid/uuid_hash.hpp;boost/beast/core/flat_buffer\\.hpp;boost/beast/http/field\\.hpp;boost/beast/http/dynamic_body\\.hpp;boost/beast/http/message\\.hpp;boost/beast/http/read\\.hpp;boost/beast/http/write\\.hpp;openssl/obj_mac\\.h"
-#
-HeaderFilterRegex: '^.*/(test|xrpl|xrpld)/.*\.(h|hpp)$'
+HeaderFilterRegex: '^.*/(test|xrpl|xrpld)/.*\.(h|hpp|ipp)$'
 ExcludeHeaderFilterRegex: '^.*/protocol_autogen/.*\.(h|hpp)$'
 WarningsAsErrors: "*"
diff --git a/.github/scripts/rename/config.sh b/.github/scripts/rename/config.sh
index b7aff82cdf..a27d0823a9 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/configLegacyName = "xrpld.cfg"/configLegacyName = "rippled.cfg"/g' src/xrpld/core/detail/Config.cpp
+${SED_COMMAND} -i 's/kCONFIG_LEGACY_NAME = "xrpld.cfg"/kCONFIG_LEGACY_NAME = "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 59cc5665bf..23ff76bc05 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/configLegacyName = "xrpld.cfg"/configLegacyName = "rippled.cfg"/' src/xrpld/core/detail/Config.cpp
+${SED_COMMAND} -i 's/kCONFIG_LEGACY_NAME = "xrpld.cfg"/kCONFIG_LEGACY_NAME = "rippled.cfg"/' src/xrpld/core/detail/Config.cpp
 
 popd
 echo "Renaming complete."
diff --git a/.github/workflows/reusable-clang-tidy-files.yml b/.github/workflows/reusable-clang-tidy-files.yml
index 3c71c510b3..7b35b2d968 100644
--- a/.github/workflows/reusable-clang-tidy-files.yml
+++ b/.github/workflows/reusable-clang-tidy-files.yml
@@ -20,7 +20,7 @@ env:
   # Conan installs the generators in the build/generators directory, see the
   # layout() method in conanfile.py. We then run CMake from the build directory.
   BUILD_DIR: build
-  BUILD_TYPE: Release
+  BUILD_TYPE: Debug # Debug so that ASSERTS and such participate in clang-tidy check
 
 jobs:
   run-clang-tidy:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56d3b48057..25dd7ac059 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -348,8 +348,8 @@ For this reason:
 - Contract description for `UNREACHABLE` should describe the _unexpected_
   situation which caused the line to have been reached.
 - Example good name for an
-  `UNREACHABLE` macro `"Json::operator==(Value, Value) : invalid type"`; example
-  good name for an `XRPL_ASSERT` macro `"Json::Value::asCString : valid type"`.
+  `UNREACHABLE` macro `"json::operator==(Value, Value) : invalid type"`; example
+  good name for an `XRPL_ASSERT` macro `"json::Value::asCString : valid type"`.
 - Example **bad** name
   `"RFC1751::insert(char* s, int x, int start, int length) : length is greater than or equal zero"`
   (missing namespace, unnecessary full function signature, description too verbose).
diff --git a/cmake/scripts/codegen/macro_parser_common.py b/cmake/scripts/codegen/macro_parser_common.py
index eae4df39db..40cd9f50c5 100644
--- a/cmake/scripts/codegen/macro_parser_common.py
+++ b/cmake/scripts/codegen/macro_parser_common.py
@@ -152,10 +152,10 @@ def parse_sfields_macro(sfields_path):
 
 def create_field_list_parser():
     """Create a pyparsing parser for field lists like '({...})'."""
-    # A field identifier (e.g., sfDestination, soeREQUIRED, soeMPTSupported)
+    # A field identifier (e.g., sfDestination, SoeRequired, SoeMptSupported)
     field_identifier = pp.Word(pp.alphas + "_", pp.alphanums + "_")
 
-    # A single field definition: {sfName, soeREQUIRED, ...}
+    # A single field definition: {sfName, SoeRequired, ...}
     # Allow optional trailing comma inside the braces
     field_def = (
         pp.Suppress("{")
@@ -185,8 +185,8 @@ def parse_field_list(fields_str):
 
     Args:
         fields_str: A string like '({
-            {sfDestination, soeREQUIRED},
-            {sfAmount, soeREQUIRED, soeMPTSupported}
+            {sfDestination, SoeRequired},
+            {sfAmount, SoeRequired, SoeMptSupported}
         })'
 
     Returns:
@@ -205,7 +205,7 @@ def parse_field_list(fields_str):
             field_name = field_parts[0]
             requirement = field_parts[1]
             flags = list(field_parts[2:]) if len(field_parts) > 2 else []
-            supports_mpt = "soeMPTSupported" in flags
+            supports_mpt = "SoeMptSupported" in flags
 
             fields.append(
                 {
diff --git a/cmake/scripts/codegen/templates/LedgerEntry.h.mako b/cmake/scripts/codegen/templates/LedgerEntry.h.mako
index fdb55a973a..31029cd311 100644
--- a/cmake/scripts/codegen/templates/LedgerEntry.h.mako
+++ b/cmake/scripts/codegen/templates/LedgerEntry.h.mako
@@ -52,13 +52,13 @@ public:
 % if field.get('mpt_support'):
      * MPT Support: ${field['mpt_support']}
 % endif
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
      * @return The field value.
 % else:
      * @return The field value, or std::nullopt if not present.
 % endif
      */
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
     [[nodiscard]]
     ${field['typeData']['return_type']}
     get${field['name'][2:]}() const
@@ -94,13 +94,13 @@ public:
      * MPT Support: ${field['mpt_support']}
 % endif
      * @note This is an untyped field (${field.get('cppType', 'unknown')}).
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
      * @return The field value.
 % else:
      * @return The field value, or std::nullopt if not present.
 % endif
      */
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
     [[nodiscard]]
     ${field['typeData']['return_type']}
     get${field['name'][2:]}() const
@@ -133,13 +133,13 @@ public:
 };
 
 <%
-    required_fields = [f for f in fields if f['requirement'] == 'soeREQUIRED']
+    required_fields = [f for f in fields if f['requirement'] == 'SoeRequired']
 %>\
 /**
  * @brief Builder for ${name} ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class ${name}Builder : public LedgerEntryBuilderBase<${name}Builder>
diff --git a/cmake/scripts/codegen/templates/LedgerEntryTests.cpp.mako b/cmake/scripts/codegen/templates/LedgerEntryTests.cpp.mako
index 35ce57f17b..011cf933dd 100644
--- a/cmake/scripts/codegen/templates/LedgerEntryTests.cpp.mako
+++ b/cmake/scripts/codegen/templates/LedgerEntryTests.cpp.mako
@@ -1,7 +1,7 @@
 // Auto-generated unit tests for ledger entry ${name}
 <%
-    required_fields = [f for f in fields if f["requirement"] == "soeREQUIRED"]
-    optional_fields = [f for f in fields if f["requirement"] != "soeREQUIRED"]
+    required_fields = [f for f in fields if f["requirement"] == "SoeRequired"]
+    optional_fields = [f for f in fields if f["requirement"] != "SoeRequired"]
 
     def canonical_expr(field):
         return f"canonical_{field['stiSuffix']}()"
diff --git a/cmake/scripts/codegen/templates/Transaction.h.mako b/cmake/scripts/codegen/templates/Transaction.h.mako
index 62c51a5c97..d3b303d9d6 100644
--- a/cmake/scripts/codegen/templates/Transaction.h.mako
+++ b/cmake/scripts/codegen/templates/Transaction.h.mako
@@ -54,13 +54,13 @@ public:
 % if field.get('supports_mpt'):
      * @note This field supports MPT (Multi-Purpose Token) amounts.
 % endif
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
      * @return The field value.
 % else:
      * @return The field value, or std::nullopt if not present.
 % endif
      */
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
     [[nodiscard]]
     ${field['typeData']['return_type']}
     get${field['name'][2:]}() const
@@ -97,13 +97,13 @@ public:
      * @note This field supports MPT (Multi-Purpose Token) amounts.
 % endif
      * @note This is an untyped field.
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
      * @return The field value.
 % else:
      * @return The field value, or std::nullopt if not present.
 % endif
      */
-% if field['requirement'] == 'soeREQUIRED':
+% if field['requirement'] == 'SoeRequired':
     [[nodiscard]]
     ${field['typeData']['return_type']}
     get${field['name'][2:]}() const
@@ -136,13 +136,13 @@ public:
 };
 
 <%
-    required_fields = [f for f in fields if f['requirement'] == 'soeREQUIRED']
+    required_fields = [f for f in fields if f['requirement'] == 'SoeRequired']
 %>\
 /**
  * @brief Builder for ${name} transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class ${name}Builder : public TransactionBuilderBase<${name}Builder>
diff --git a/cmake/scripts/codegen/templates/TransactionTests.cpp.mako b/cmake/scripts/codegen/templates/TransactionTests.cpp.mako
index b6bd5cd831..14ceaffd09 100644
--- a/cmake/scripts/codegen/templates/TransactionTests.cpp.mako
+++ b/cmake/scripts/codegen/templates/TransactionTests.cpp.mako
@@ -1,7 +1,7 @@
 // Auto-generated unit tests for transaction ${name}
 <%
-    required_fields = [f for f in fields if f["requirement"] == "soeREQUIRED"]
-    optional_fields = [f for f in fields if f["requirement"] != "soeREQUIRED"]
+    required_fields = [f for f in fields if f["requirement"] == "SoeRequired"]
+    optional_fields = [f for f in fields if f["requirement"] != "SoeRequired"]
 
     def canonical_expr(field):
         return f"canonical_{field['stiSuffix']}()"
@@ -33,7 +33,7 @@ TEST(Transactions${name}Tests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("test${name}"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("test${name}"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -101,7 +101,7 @@ TEST(Transactions${name}Tests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("test${name}FromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("test${name}FromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -168,7 +168,7 @@ TEST(Transactions${name}Tests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
 % if wrong_tx_include == "AccountSet":
@@ -186,7 +186,7 @@ TEST(Transactions${name}Tests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
 % if wrong_tx_include == "AccountSet":
@@ -205,7 +205,7 @@ TEST(Transactions${name}Tests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("test${name}Nullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("test${name}Nullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/docs/build/sanitizers.md b/docs/build/sanitizers.md
index 7677775a3d..e4949bcf86 100644
--- a/docs/build/sanitizers.md
+++ b/docs/build/sanitizers.md
@@ -98,7 +98,7 @@ export LSAN_OPTIONS="include=sanitizers/suppressions/runtime-lsan-options.txt:su
 
 **Why `detect_container_overflow=0`?**
 
-- Boost intrusive containers (used in `aged_unordered_container`) trigger false positives
+- Boost intrusive containers (used in `AgedUnorderedContainer`) trigger false positives
 - Boost context switching (used in `Workers.cpp`) confuses ASAN's stack tracking
 - Since we usually don't build Boost (because we don't want to instrument Boost and detect issues in Boost code) with ASAN but use Boost containers in ASAN instrumented xrpld code, it generates false positives.
 - Building dependencies with ASAN instrumentation reduces false positives. But we don't want to instrument dependencies like Boost with ASAN because it is slow (to compile as well as run tests) and not necessary.
diff --git a/docs/consensus.md b/docs/consensus.md
index 0da23b708a..2850cf784e 100644
--- a/docs/consensus.md
+++ b/docs/consensus.md
@@ -477,7 +477,7 @@ struct Ledger
   // The parent ledger's close time
   NetClock::time_point parentCloseTime() const;
 
-  Json::Value getJson() const;
+  json::Value getJson() const;
 
   //... implementation specific
 };
diff --git a/include/xrpl/basics/BasicConfig.h b/include/xrpl/basics/BasicConfig.h
index 0639fb6c4d..5a82f7d081 100644
--- a/include/xrpl/basics/BasicConfig.h
+++ b/include/xrpl/basics/BasicConfig.h
@@ -27,7 +27,7 @@ private:
     std::unordered_map<std::string, std::string> lookup_;
     std::vector<std::string> lines_;
     std::vector<std::string> values_;
-    bool had_trailing_comments_ = false;
+    bool hadTrailingComments_ = false;
 
     using const_iterator = decltype(lookup_)::const_iterator;
 
@@ -133,7 +133,7 @@ public:
     /// Returns a value if present, else another value.
     template <class T>
     [[nodiscard]] T
-    value_or(std::string const& name, T const& other) const
+    valueOr(std::string const& name, T const& other) const
     {
         auto const v = get<T>(name);
         return v.has_value() ? *v : other;
@@ -142,9 +142,9 @@ public:
     // indicates if trailing comments were seen
     // during the appending of any lines/values
     [[nodiscard]] bool
-    had_trailing_comments() const
+    hadTrailingComments() const
     {
-        return had_trailing_comments_;
+        return hadTrailingComments_;
     }
 
     friend std::ostream&
@@ -273,9 +273,9 @@ public:
     // indicates if trailing comments were seen
     // in any loaded Sections
     [[nodiscard]] bool
-    had_trailing_comments() const
+    hadTrailingComments() const
     {
-        return std::ranges::any_of(map_, [](auto s) { return s.second.had_trailing_comments(); });
+        return std::ranges::any_of(map_, [](auto s) { return s.second.hadTrailingComments(); });
     }
 
 protected:
@@ -294,17 +294,17 @@ template <class T>
 bool
 set(T& target, std::string const& name, Section const& section)
 {
-    bool found_and_valid = false;
+    bool foundAndValid = false;
     try
     {
         auto const val = section.get<T>(name);
-        if ((found_and_valid = val.has_value()))
+        if ((foundAndValid = val.has_value()))
             target = *val;
     }
     catch (boost::bad_lexical_cast const&)  // NOLINT(bugprone-empty-catch)
     {
     }
-    return found_and_valid;
+    return foundAndValid;
 }
 
 /** Set a value from a configuration Section
@@ -316,10 +316,10 @@ template <class T>
 bool
 set(T& target, T const& defaultValue, std::string const& name, Section const& section)
 {
-    bool const found_and_valid = set<T>(target, name, section);
-    if (!found_and_valid)
+    bool const foundAndValid = set<T>(target, name, section);
+    if (!foundAndValid)
         target = defaultValue;
-    return found_and_valid;
+    return foundAndValid;
 }
 
 /** Retrieve a key/value pair from a section.
@@ -333,7 +333,7 @@ get(Section const& section, std::string const& name, T const& defaultValue = T{}
 {
     try
     {
-        return section.value_or<T>(name, defaultValue);
+        return section.valueOr<T>(name, defaultValue);
     }
     catch (boost::bad_lexical_cast const&)  // NOLINT(bugprone-empty-catch)
     {
@@ -358,17 +358,17 @@ get(Section const& section, std::string const& name, char const* defaultValue)
 
 template <class T>
 bool
-get_if_exists(Section const& section, std::string const& name, T& v)
+getIfExists(Section const& section, std::string const& name, T& v)
 {
     return set<T>(v, name, section);
 }
 
 template <>
 inline bool
-get_if_exists<bool>(Section const& section, std::string const& name, bool& v)
+getIfExists<bool>(Section const& section, std::string const& name, bool& v)
 {
     int intVal = 0;
-    auto stat = get_if_exists(section, name, intVal);
+    auto stat = getIfExists(section, name, intVal);
     if (stat)
         v = bool(intVal);
     return stat;
diff --git a/include/xrpl/basics/CountedObject.h b/include/xrpl/basics/CountedObject.h
index 379fd49837..275894673e 100644
--- a/include/xrpl/basics/CountedObject.h
+++ b/include/xrpl/basics/CountedObject.h
@@ -38,11 +38,11 @@ public:
 
             do
             {
-                head = instance.m_head.load();
+                head = instance.head_.load();
                 next_ = head;
-            } while (instance.m_head.exchange(this) != head);
+            } while (instance.head_.exchange(this) != head);
 
-            ++instance.m_count;
+            ++instance.count_;
         }
 
         ~Counter() noexcept = default;
@@ -88,8 +88,8 @@ private:
     ~CountedObjects() noexcept = default;
 
 private:
-    std::atomic<int> m_count;
-    std::atomic<Counter*> m_head;
+    std::atomic<int> count_;
+    std::atomic<Counter*> head_;
 };
 
 //------------------------------------------------------------------------------
@@ -108,8 +108,8 @@ private:
     static auto&
     getCounter() noexcept
     {
-        static CountedObjects::Counter c{beast::type_name<Object>()};
-        return c;
+        static CountedObjects::Counter kC{beast::typeName<Object>()};
+        return kC;
     }
 
     CountedObject() noexcept
diff --git a/include/xrpl/basics/DecayingSample.h b/include/xrpl/basics/DecayingSample.h
index 8f6e729acf..d1861ebc4a 100644
--- a/include/xrpl/basics/DecayingSample.h
+++ b/include/xrpl/basics/DecayingSample.h
@@ -20,7 +20,7 @@ public:
     /**
         @param now Start time of DecayingSample.
     */
-    explicit DecayingSample(time_point now) : m_value(value_type()), m_when(now)
+    explicit DecayingSample(time_point now) : value_(value_type()), when_(now)
     {
     }
 
@@ -31,8 +31,8 @@ public:
     add(value_type value, time_point now)
     {
         decay(now);
-        m_value += value;
-        return m_value / Window;
+        value_ += value;
+        return value_ / Window;
     }
 
     /** Retrieve the current value in normalized units.
@@ -42,7 +42,7 @@ public:
     value(time_point now)
     {
         decay(now);
-        return m_value / Window;
+        return value_ / Window;
     }
 
 private:
@@ -50,38 +50,38 @@ private:
     void
     decay(time_point now)
     {
-        if (now == m_when)
+        if (now == when_)
             return;
 
-        if (m_value != value_type())
+        if (value_ != value_type())
         {
             std::size_t elapsed =
-                std::chrono::duration_cast<std::chrono::seconds>(now - m_when).count();
+                std::chrono::duration_cast<std::chrono::seconds>(now - when_).count();
 
             // A span larger than four times the window decays the
             // value to an insignificant amount so just reset it.
             //
             if (elapsed > 4 * Window)
             {
-                m_value = value_type();
+                value_ = value_type();
             }
             else
             {
                 for (; elapsed > 0; --elapsed)
                 {
-                    m_value -= (m_value + Window - 1) / Window;
+                    value_ -= (value_ + Window - 1) / Window;
                 }
             }
         }
 
-        m_when = now;
+        when_ = now;
     }
 
     // Current value in exponential units
-    value_type m_value;
+    value_type value_;
 
     // Last time the aging function was applied
-    time_point m_when;
+    time_point when_;
 };
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/basics/Expected.h b/include/xrpl/basics/Expected.h
index f4d8e5019a..74a0e76eef 100644
--- a/include/xrpl/basics/Expected.h
+++ b/include/xrpl/basics/Expected.h
@@ -16,9 +16,9 @@ namespace xrpl {
 */
 
 // Exception thrown by an invalid access to Expected.
-struct bad_expected_access : public std::runtime_error
+struct BadExpectedAccess : public std::runtime_error
 {
-    bad_expected_access() : runtime_error("bad expected access")
+    BadExpectedAccess() : runtime_error("bad expected access")
     {
     }
 };
@@ -26,30 +26,33 @@ struct bad_expected_access : public std::runtime_error
 namespace detail {
 
 // Custom policy for Expected.  Always throw on an invalid access.
-struct throw_policy : public boost::outcome_v2::policy::base
+struct ThrowPolicy : public boost::outcome_v2::policy::base
 {
     template <class Impl>
     static constexpr void
+    // NOLINTNEXTLINE(readability-identifier-naming)
     wide_value_check(Impl&& self)
     {
         if (!base::_has_value(std::forward<Impl>(self)))
-            Throw<bad_expected_access>();
+            Throw<BadExpectedAccess>();
     }
 
     template <class Impl>
     static constexpr void
+    // NOLINTNEXTLINE(readability-identifier-naming)
     wide_error_check(Impl&& self)
     {
         if (!base::_has_error(std::forward<Impl>(self)))
-            Throw<bad_expected_access>();
+            Throw<BadExpectedAccess>();
     }
 
     template <class Impl>
     static constexpr void
+    // NOLINTNEXTLINE(readability-identifier-naming)
     wide_exception_check(Impl&& self)
     {
         if (!base::_has_exception(std::forward<Impl>(self)))
-            Throw<bad_expected_access>();
+            Throw<BadExpectedAccess>();
     }
 };
 
@@ -107,9 +110,9 @@ Unexpected(E (&)[N]) -> Unexpected<E const*>;
 
 // Definition of Expected.  All of the machinery comes from boost::result.
 template <class T, class E>
-class [[nodiscard]] Expected : private boost::outcome_v2::result<T, E, detail::throw_policy>
+class [[nodiscard]] Expected : private boost::outcome_v2::result<T, E, detail::ThrowPolicy>
 {
-    using Base = boost::outcome_v2::result<T, E, detail::throw_policy>;
+    using Base = boost::outcome_v2::result<T, E, detail::ThrowPolicy>;
 
 public:
     template <typename U>
@@ -126,6 +129,7 @@ public:
     }
 
     [[nodiscard]] constexpr bool
+    // NOLINTNEXTLINE(readability-identifier-naming)
     has_value() const
     {
         return Base::has_value();
@@ -193,9 +197,9 @@ public:
 // (without a value) or the reason for the failure.
 template <class E>
 class [[nodiscard]]
-Expected<void, E> : private boost::outcome_v2::result<void, E, detail::throw_policy>
+Expected<void, E> : private boost::outcome_v2::result<void, E, detail::ThrowPolicy>
 {
-    using Base = boost::outcome_v2::result<void, E, detail::throw_policy>;
+    using Base = boost::outcome_v2::result<void, E, detail::ThrowPolicy>;
 
 public:
     // The default constructor makes a successful Expected<void, E>.
diff --git a/include/xrpl/basics/IntrusivePointer.h b/include/xrpl/basics/IntrusivePointer.h
index 019e71a727..06ee3e5bb4 100644
--- a/include/xrpl/basics/IntrusivePointer.h
+++ b/include/xrpl/basics/IntrusivePointer.h
@@ -164,11 +164,11 @@ public:
 
     /** Return the strong count */
     [[nodiscard]] std::size_t
-    use_count() const;
+    useCount() const;
 
     template <class TT, class... Args>
     friend SharedIntrusive<TT>
-    make_SharedIntrusive(Args&&... args);
+    makeSharedIntrusive(Args&&... args);
 
     template <class TT>
     friend class SharedIntrusive;
@@ -364,7 +364,7 @@ public:
      * return 0
      */
     [[nodiscard]] std::size_t
-    use_count() const;
+    useCount() const;
 
     /** Return true if there is a non-zero strong count. */
     [[nodiscard]] bool
@@ -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 tagMask = 1;
-    static constexpr std::uintptr_t ptrMask = ~tagMask;
+    static constexpr std::uintptr_t kTAG_MASK = 1;
+    static constexpr std::uintptr_t kPTR_MASK = ~kTAG_MASK;
 
 private:
     /** Return the raw pointer held by this object.
@@ -415,7 +415,7 @@ private:
     [[nodiscard]] T*
     unsafeGetRawPtr() const;
 
-    enum class RefStrength { strong, weak };
+    enum class RefStrength { Strong, Weak };
     /** Set the raw pointer and tag bit directly.
      */
     void
@@ -442,7 +442,7 @@ private:
 */
 template <class TT, class... Args>
 SharedIntrusive<TT>
-make_SharedIntrusive(Args&&... args)
+makeSharedIntrusive(Args&&... args)
 {
     auto p = new TT(std::forward<Args>(args)...);
 
@@ -469,21 +469,21 @@ using SharedWeakUnionPtr = SharedWeakUnion<T>;
 
 template <class T, class... A>
 SharedPtr<T>
-make_shared(A&&... args)
+makeShared(A&&... args)
 {
-    return make_SharedIntrusive<T>(std::forward<A>(args)...);
+    return makeSharedIntrusive<T>(std::forward<A>(args)...);
 }
 
 template <class T, class TT>
 SharedPtr<T>
-static_pointer_cast(TT const& v)
+staticPointerCast(TT const& v)
 {
     return SharedPtr<T>(StaticCastTagSharedIntrusive{}, v);
 }
 
 template <class T, class TT>
 SharedPtr<T>
-dynamic_pointer_cast(TT const& v)
+dynamicPointerCast(TT const& v)
 {
     return SharedPtr<T>(DynamicCastTagSharedIntrusive{}, v);
 }
diff --git a/include/xrpl/basics/IntrusivePointer.ipp b/include/xrpl/basics/IntrusivePointer.ipp
index 59caf5a931..f229df8b27 100644
--- a/include/xrpl/basics/IntrusivePointer.ipp
+++ b/include/xrpl/basics/IntrusivePointer.ipp
@@ -43,14 +43,16 @@ SharedIntrusive<T>::SharedIntrusive(SharedIntrusive<TT> const& rhs)
 }
 
 template <class T>
-SharedIntrusive<T>::SharedIntrusive(SharedIntrusive&& rhs) : ptr_{rhs.unsafeExchange(nullptr)}
+SharedIntrusive<T>::SharedIntrusive(SharedIntrusive&& rhs)
+    : ptr_{std::move(rhs).unsafeExchange(nullptr)}
 {
 }
 
 template <class T>
 template <class TT>
     requires std::convertible_to<TT*, T*>
-SharedIntrusive<T>::SharedIntrusive(SharedIntrusive<TT>&& rhs) : ptr_{rhs.unsafeExchange(nullptr)}
+SharedIntrusive<T>::SharedIntrusive(SharedIntrusive<TT>&& rhs)
+    : ptr_{std::move(rhs).unsafeExchange(nullptr)}
 {
 }
 template <class T>
@@ -93,7 +95,7 @@ SharedIntrusive<T>::operator=(SharedIntrusive&& rhs)
     if (this == &rhs)
         return *this;
 
-    unsafeReleaseAndStore(rhs.unsafeExchange(nullptr));
+    unsafeReleaseAndStore(std::move(rhs).unsafeExchange(nullptr));
     return *this;
 }
 
@@ -105,7 +107,7 @@ SharedIntrusive<T>::operator=(SharedIntrusive<TT>&& rhs)
 {
     static_assert(!std::is_same_v<T, TT>, "This overload should not be instantiated for T == TT");
 
-    unsafeReleaseAndStore(rhs.unsafeExchange(nullptr));
+    unsafeReleaseAndStore(std::move(rhs).unsafeExchange(nullptr));
     return *this;
 }
 
@@ -157,7 +159,7 @@ SharedIntrusive<T>::SharedIntrusive(StaticCastTagSharedIntrusive, SharedIntrusiv
 template <class T>
 template <class TT>
 SharedIntrusive<T>::SharedIntrusive(StaticCastTagSharedIntrusive, SharedIntrusive<TT>&& rhs)
-    : ptr_{static_cast<T*>(rhs.unsafeExchange(nullptr))}
+    : ptr_{static_cast<T*>(std::move(rhs).unsafeExchange(nullptr))}
 {
 }
 
@@ -184,8 +186,10 @@ SharedIntrusive<T>::SharedIntrusive(DynamicCastTagSharedIntrusive, SharedIntrusi
     {
         ptr_ = dynamic_cast<T*>(toSet);
         if (!ptr_)
+        {
             // need to set the pointer back or will leak
-            rhs.unsafeExchange(toSet);
+            std::move(rhs).unsafeExchange(toSet);
+        }
     }
 }
 
@@ -226,10 +230,10 @@ SharedIntrusive<T>::get() const
 
 template <class T>
 std::size_t
-SharedIntrusive<T>::use_count() const
+SharedIntrusive<T>::useCount() const
 {
     if (auto p = unsafeGetRawPtr())
-        return p->use_count();
+        return p->useCount();
     return 0;
 }
 
@@ -266,12 +270,12 @@ SharedIntrusive<T>::unsafeReleaseAndStore(T* next)
     auto action = prev->releaseStrongRef();
     switch (action)
     {
-        case noop:
+        case NoOp:
             break;
-        case destroy:
+        case Destroy:
             delete prev;
             break;
-        case partialDestroy:
+        case PartialDestroy:
             prev->partialDestructor();
             partialDestructorFinished(&prev);
             // prev is null and may no longer be used
@@ -345,7 +349,7 @@ template <class T>
 bool
 WeakIntrusive<T>::expired() const
 {
-    return (!ptr_ || ptr_->expired());
+    return ((ptr_ == nullptr) || ptr_->expired());
 }
 
 template <class T>
@@ -360,16 +364,16 @@ template <class T>
 void
 WeakIntrusive<T>::unsafeReleaseNoStore()
 {
-    if (!ptr_)
+    if (ptr_ == nullptr)
         return;
 
     using enum ReleaseWeakRefAction;
     auto action = ptr_->releaseWeakRef();
     switch (action)
     {
-        case noop:
+        case NoOp:
             break;
-        case destroy:
+        case Destroy:
             delete ptr_;
             break;
     }
@@ -385,9 +389,13 @@ SharedWeakUnion<T>::SharedWeakUnion(SharedWeakUnion const& rhs) : tp_{rhs.tp_}
         return;
 
     if (rhs.isStrong())
+    {
         p->addStrongRef();
+    }
     else
+    {
         p->addWeakRef();
+    }
 }
 
 template <class T>
@@ -398,7 +406,7 @@ SharedWeakUnion<T>::SharedWeakUnion(SharedIntrusive<TT> const& rhs)
     auto p = rhs.unsafeGetRawPtr();
     if (p)
         p->addStrongRef();
-    unsafeSetRawPtr(p, RefStrength::strong);
+    unsafeSetRawPtr(p, RefStrength::Strong);
 }
 
 template <class T>
@@ -414,8 +422,8 @@ SharedWeakUnion<T>::SharedWeakUnion(SharedIntrusive<TT>&& rhs)
 {
     auto p = rhs.unsafeGetRawPtr();
     if (p)
-        unsafeSetRawPtr(p, RefStrength::strong);
-    rhs.unsafeSetRawPtr(nullptr);
+        unsafeSetRawPtr(p, RefStrength::Strong);
+    std::move(rhs).unsafeSetRawPtr(nullptr);
 }
 
 template <class T>
@@ -431,12 +439,12 @@ SharedWeakUnion<T>::operator=(SharedWeakUnion const& rhs)
         if (rhs.isStrong())
         {
             p->addStrongRef();
-            unsafeSetRawPtr(p, RefStrength::strong);
+            unsafeSetRawPtr(p, RefStrength::Strong);
         }
         else
         {
             p->addWeakRef();
-            unsafeSetRawPtr(p, RefStrength::weak);
+            unsafeSetRawPtr(p, RefStrength::Weak);
         }
     }
     else
@@ -456,7 +464,7 @@ SharedWeakUnion<T>::operator=(SharedIntrusive<TT> const& rhs)
     auto p = rhs.unsafeGetRawPtr();
     if (p)
         p->addStrongRef();
-    unsafeSetRawPtr(p, RefStrength::strong);
+    unsafeSetRawPtr(p, RefStrength::Strong);
     return *this;
 }
 
@@ -467,8 +475,8 @@ SharedWeakUnion<T>&
 SharedWeakUnion<T>::operator=(SharedIntrusive<TT>&& rhs)
 {
     unsafeReleaseNoStore();
-    unsafeSetRawPtr(rhs.unsafeGetRawPtr(), RefStrength::strong);
-    rhs.unsafeSetRawPtr(nullptr);
+    unsafeSetRawPtr(rhs.unsafeGetRawPtr(), RefStrength::Strong);
+    std::move(rhs).unsafeSetRawPtr(nullptr);
     return *this;
 }
 
@@ -517,10 +525,10 @@ SharedWeakUnion<T>::get() const
 
 template <class T>
 std::size_t
-SharedWeakUnion<T>::use_count() const
+SharedWeakUnion<T>::useCount() const
 {
     if (auto p = get())
-        return p->use_count();
+        return p->useCount();
     return 0;
 }
 
@@ -559,14 +567,14 @@ template <class T>
 bool
 SharedWeakUnion<T>::isStrong() const
 {
-    return !(tp_ & tagMask);
+    return (tp_ & kTAG_MASK) == 0u;
 }
 
 template <class T>
 bool
 SharedWeakUnion<T>::isWeak() const
 {
-    return tp_ & tagMask;
+    return (tp_ & kTAG_MASK) != 0u;
 }
 
 template <class T>
@@ -581,10 +589,10 @@ SharedWeakUnion<T>::convertToStrong()
     {
         [[maybe_unused]] auto action = p->releaseWeakRef();
         XRPL_ASSERT(
-            (action == ReleaseWeakRefAction::noop),
+            (action == ReleaseWeakRefAction::NoOp),
             "xrpl::SharedWeakUnion::convertToStrong : "
             "action is noop");
-        unsafeSetRawPtr(p, RefStrength::strong);
+        unsafeSetRawPtr(p, RefStrength::Strong);
         return true;
     }
     return false;
@@ -605,9 +613,9 @@ SharedWeakUnion<T>::convertToWeak()
     auto action = p->addWeakReleaseStrongRef();
     switch (action)
     {
-        case noop:
+        case NoOp:
             break;
-        case destroy:
+        case Destroy:
             // We just added a weak ref. How could we destroy?
             // LCOV_EXCL_START
             UNREACHABLE(
@@ -617,7 +625,7 @@ SharedWeakUnion<T>::convertToWeak()
             unsafeSetRawPtr(nullptr);
             return true;  // Should never happen
             // LCOV_EXCL_STOP
-        case partialDestroy:
+        case PartialDestroy:
             // This is a weird case. We just converted the last strong
             // pointer to a weak pointer.
             p->partialDestructor();
@@ -625,7 +633,7 @@ SharedWeakUnion<T>::convertToWeak()
             // p is null and may no longer be used
             break;
     }
-    unsafeSetRawPtr(p, RefStrength::weak);
+    unsafeSetRawPtr(p, RefStrength::Weak);
     return true;
 }
 
@@ -633,7 +641,7 @@ template <class T>
 T*
 SharedWeakUnion<T>::unsafeGetRawPtr() const
 {
-    return reinterpret_cast<T*>(tp_ & ptrMask);
+    return reinterpret_cast<T*>(tp_ & kPTR_MASK);
 }
 
 template <class T>
@@ -641,8 +649,8 @@ void
 SharedWeakUnion<T>::unsafeSetRawPtr(T* p, RefStrength rs)
 {
     tp_ = reinterpret_cast<std::uintptr_t>(p);
-    if (tp_ && rs == RefStrength::weak)
-        tp_ |= tagMask;
+    if (tp_ && rs == RefStrength::Weak)
+        tp_ |= kTAG_MASK;
 }
 
 template <class T>
@@ -666,12 +674,12 @@ SharedWeakUnion<T>::unsafeReleaseNoStore()
         auto strongAction = p->releaseStrongRef();
         switch (strongAction)
         {
-            case noop:
+            case NoOp:
                 break;
-            case destroy:
+            case Destroy:
                 delete p;
                 break;
-            case partialDestroy:
+            case PartialDestroy:
                 p->partialDestructor();
                 partialDestructorFinished(&p);
                 // p is null and may no longer be used
@@ -684,9 +692,9 @@ SharedWeakUnion<T>::unsafeReleaseNoStore()
         auto weakAction = p->releaseWeakRef();
         switch (weakAction)
         {
-            case noop:
+            case NoOp:
                 break;
-            case destroy:
+            case Destroy:
                 delete p;
                 break;
         }
diff --git a/include/xrpl/basics/IntrusiveRefCounts.h b/include/xrpl/basics/IntrusiveRefCounts.h
index e7c31bde93..f0689197d7 100644
--- a/include/xrpl/basics/IntrusiveRefCounts.h
+++ b/include/xrpl/basics/IntrusiveRefCounts.h
@@ -18,7 +18,7 @@ namespace xrpl {
     destroy: Run the destructor. This action will occur when either the strong
     count or weak count is decremented and the other count is also zero.
  */
-enum class ReleaseStrongRefAction { noop, partialDestroy, destroy };
+enum class ReleaseStrongRefAction { NoOp, PartialDestroy, Destroy };
 
 /** Action to perform when releasing a weak pointer.
 
@@ -28,7 +28,7 @@ enum class ReleaseStrongRefAction { noop, partialDestroy, destroy };
     destroy: Run the destructor. This action will occur when either the strong
     count or weak count is decremented and the other count is also zero.
  */
-enum class ReleaseWeakRefAction { noop, destroy };
+enum class ReleaseWeakRefAction { NoOp, Destroy };
 
 /** Implement the strong count, weak count, and bit flags for an intrusive
     pointer.
@@ -71,7 +71,7 @@ struct IntrusiveRefCounts
     expired() const noexcept;
 
     std::size_t
-    use_count() const noexcept;
+    useCount() const noexcept;
 
     // This function MUST be called after a partial destructor finishes running.
     // Calling this function may cause other threads to delete the object
@@ -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 StrongCountNumBits = sizeof(CountType) * 8;
-    static constexpr size_t WeakCountNumBits = StrongCountNumBits - 2;
+    static constexpr size_t kSTRONG_COUNT_NUM_BITS = sizeof(CountType) * 8;
+    static constexpr size_t kWEAK_COUNT_NUM_BITS = kSTRONG_COUNT_NUM_BITS - 2;
     using FieldType = std::uint32_t;
-    static constexpr size_t FieldTypeBits = sizeof(FieldType) * 8;
-    static constexpr FieldType one = 1;
+    static constexpr size_t kFIELD_TYPE_BITS = 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{strongDelta};
+    mutable std::atomic<FieldType> refCounts_{kSTRONG_DELTA};
 
     /**  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 strongDelta = 1;
+    static constexpr FieldType kSTRONG_DELTA = 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 weakDelta = (one << StrongCountNumBits);
+    static constexpr FieldType kWEAK_DELTA = (kONE << kSTRONG_COUNT_NUM_BITS);
 
     /**  Flag that is set when the partialDestroy function has started running
          (or is about to start running).
@@ -159,33 +159,34 @@ private:
          See description of the `refCounts` field for a fuller description of
          this field.
       */
-    static constexpr FieldType partialDestroyStartedMask = (one << (FieldTypeBits - 1));
+    static constexpr FieldType kPARTIAL_DESTROY_STARTED_MASK = (kONE << (kFIELD_TYPE_BITS - 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 partialDestroyFinishedMask = (one << (FieldTypeBits - 2));
+    static constexpr FieldType kPARTIAL_DESTROY_FINISHED_MASK = (kONE << (kFIELD_TYPE_BITS - 2));
 
     /** Mask that will zero out all the `count` bits and leave the tag bits
         unchanged.
       */
-    static constexpr FieldType tagMask = partialDestroyStartedMask | partialDestroyFinishedMask;
+    static constexpr FieldType kTAG_MASK =
+        kPARTIAL_DESTROY_STARTED_MASK | kPARTIAL_DESTROY_FINISHED_MASK;
 
     /** Mask that will zero out the `tag` bits and leave the count bits
         unchanged.
       */
-    static constexpr FieldType valueMask = ~tagMask;
+    static constexpr FieldType kVALUE_MASK = ~kTAG_MASK;
 
     /** Mask that will zero out everything except the strong count.
      */
-    static constexpr FieldType strongMask = ((one << StrongCountNumBits) - 1) & valueMask;
+    static constexpr FieldType kSTRONG_MASK = ((kONE << kSTRONG_COUNT_NUM_BITS) - 1) & kVALUE_MASK;
 
     /** Mask that will zero out everything except the weak count.
      */
-    static constexpr FieldType weakMask =
-        (((one << WeakCountNumBits) - 1) << StrongCountNumBits) & valueMask;
+    static constexpr FieldType kWEAK_MASK =
+        (((kONE << kWEAK_COUNT_NUM_BITS) - 1) << kSTRONG_COUNT_NUM_BITS) & kVALUE_MASK;
 
     /** Unpack the count and tag fields from the packed atomic integer form. */
     struct RefCountPair
@@ -210,29 +211,29 @@ private:
         [[nodiscard]] FieldType
         combinedValue() const noexcept;
 
-        static constexpr CountType maxStrongValue =
-            static_cast<CountType>((one << StrongCountNumBits) - 1);
-        static constexpr CountType maxWeakValue =
-            static_cast<CountType>((one << WeakCountNumBits) - 1);
+        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);
         /**  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 checkStrongMaxValue = maxStrongValue - 32;
-        static constexpr CountType checkWeakMaxValue = maxWeakValue - 32;
+        static constexpr CountType kCHECK_STRONG_MAX_VALUE = kMAX_STRONG_VALUE - 32;
+        static constexpr CountType kCHECK_WEAK_MAX_VALUE = kMAX_WEAK_VALUE - 32;
     };
 };
 
 inline void
 IntrusiveRefCounts::addStrongRef() const noexcept
 {
-    refCounts.fetch_add(strongDelta, std::memory_order_acq_rel);
+    refCounts_.fetch_add(kSTRONG_DELTA, std::memory_order_acq_rel);
 }
 
 inline void
 IntrusiveRefCounts::addWeakRef() const noexcept
 {
-    refCounts.fetch_add(weakDelta, std::memory_order_acq_rel);
+    refCounts_.fetch_add(kWEAK_DELTA, std::memory_order_acq_rel);
 }
 
 inline ReleaseStrongRefAction
@@ -246,36 +247,36 @@ IntrusiveRefCounts::releaseStrongRef() const
     // conditional `fetch_or`. This loop will almost always run once.
 
     using enum ReleaseStrongRefAction;
-    auto prevIntVal = refCounts.load(std::memory_order_acquire);
+    auto prevIntVal = refCounts_.load(std::memory_order_acquire);
     while (true)
     {
         RefCountPair const prevVal{prevIntVal};
         XRPL_ASSERT(
-            (prevVal.strong >= strongDelta),
+            (prevVal.strong >= kSTRONG_DELTA),
             "xrpl::IntrusiveRefCounts::releaseStrongRef : previous ref "
             "higher than new");
-        auto nextIntVal = prevIntVal - strongDelta;
-        ReleaseStrongRefAction action = noop;
+        auto nextIntVal = prevIntVal - kSTRONG_DELTA;
+        ReleaseStrongRefAction action = NoOp;
         if (prevVal.strong == 1)
         {
             if (prevVal.weak == 0)
             {
-                action = destroy;
+                action = Destroy;
             }
             else
             {
-                nextIntVal |= partialDestroyStartedMask;
-                action = partialDestroy;
+                nextIntVal |= kPARTIAL_DESTROY_STARTED_MASK;
+                action = PartialDestroy;
             }
         }
 
-        if (refCounts.compare_exchange_weak(prevIntVal, nextIntVal, std::memory_order_acq_rel))
+        if (refCounts_.compare_exchange_weak(prevIntVal, nextIntVal, std::memory_order_acq_rel))
         {
             // Can't be in partial destroy because only decrementing the strong
             // count to zero can start a partial destroy, and that can't happen
             // twice.
             XRPL_ASSERT(
-                (action == noop) || !(prevIntVal & partialDestroyStartedMask),
+                (action == NoOp) || !(prevIntVal & kPARTIAL_DESTROY_STARTED_MASK),
                 "xrpl::IntrusiveRefCounts::releaseStrongRef : not in partial "
                 "destroy");
             return action;
@@ -288,9 +289,9 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
 {
     using enum ReleaseStrongRefAction;
 
-    static_assert(weakDelta > strongDelta);
-    auto constexpr delta = weakDelta - strongDelta;
-    auto prevIntVal = refCounts.load(std::memory_order_acquire);
+    static_assert(kWEAK_DELTA > kSTRONG_DELTA);
+    auto constexpr kDELTA = kWEAK_DELTA - kSTRONG_DELTA;
+    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
     // the flags depend on the current value of the counts).
@@ -311,24 +312,24 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
             "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not in "
             "partial destroy");
 
-        auto nextIntVal = prevIntVal + delta;
-        ReleaseStrongRefAction action = noop;
+        auto nextIntVal = prevIntVal + kDELTA;
+        ReleaseStrongRefAction action = NoOp;
         if (prevVal.strong == 1)
         {
             if (prevVal.weak == 0)
             {
-                action = noop;
+                action = NoOp;
             }
             else
             {
-                nextIntVal |= partialDestroyStartedMask;
-                action = partialDestroy;
+                nextIntVal |= kPARTIAL_DESTROY_STARTED_MASK;
+                action = PartialDestroy;
             }
         }
-        if (refCounts.compare_exchange_weak(prevIntVal, nextIntVal, std::memory_order_acq_rel))
+        if (refCounts_.compare_exchange_weak(prevIntVal, nextIntVal, std::memory_order_acq_rel))
         {
             XRPL_ASSERT(
-                (!(prevIntVal & partialDestroyStartedMask)),
+                (!(prevIntVal & kPARTIAL_DESTROY_STARTED_MASK)),
                 "xrpl::IntrusiveRefCounts::addWeakReleaseStrongRef : not "
                 "started partial destroy");
             return action;
@@ -339,7 +340,7 @@ IntrusiveRefCounts::addWeakReleaseStrongRef() const
 inline ReleaseWeakRefAction
 IntrusiveRefCounts::releaseWeakRef() const
 {
-    auto prevIntVal = refCounts.fetch_sub(weakDelta, std::memory_order_acq_rel);
+    auto prevIntVal = refCounts_.fetch_sub(kWEAK_DELTA, std::memory_order_acq_rel);
     RefCountPair prev = prevIntVal;
     if (prev.weak == 1 && prev.strong == 0)
     {
@@ -348,19 +349,19 @@ IntrusiveRefCounts::releaseWeakRef() const
             // This case should only be hit if the partialDestroyStartedBit is
             // set non-atomically (and even then very rarely). The code is kept
             // in case we need to set the flag non-atomically for perf reasons.
-            refCounts.wait(prevIntVal, std::memory_order_acquire);
-            prevIntVal = refCounts.load(std::memory_order_acquire);
+            refCounts_.wait(prevIntVal, std::memory_order_acquire);
+            prevIntVal = refCounts_.load(std::memory_order_acquire);
             prev = RefCountPair{prevIntVal};
         }
         if (prev.partialDestroyFinishedBit == 0u)
         {
             // partial destroy MUST finish before running a full destroy (when
             // using weak pointers)
-            refCounts.wait(prevIntVal - weakDelta, std::memory_order_acquire);
+            refCounts_.wait(prevIntVal - kWEAK_DELTA, std::memory_order_acquire);
         }
-        return ReleaseWeakRefAction::destroy;
+        return ReleaseWeakRefAction::Destroy;
     }
-    return ReleaseWeakRefAction::noop;
+    return ReleaseWeakRefAction::NoOp;
 }
 
 inline bool
@@ -369,13 +370,13 @@ IntrusiveRefCounts::checkoutStrongRefFromWeak() const noexcept
     auto curValue = RefCountPair{1, 1}.combinedValue();
     auto desiredValue = RefCountPair{2, 1}.combinedValue();
 
-    while (!refCounts.compare_exchange_weak(curValue, desiredValue, std::memory_order_acq_rel))
+    while (!refCounts_.compare_exchange_weak(curValue, desiredValue, std::memory_order_acq_rel))
     {
         RefCountPair const prev{curValue};
         if (prev.strong == 0u)
             return false;
 
-        desiredValue = curValue + strongDelta;
+        desiredValue = curValue + kSTRONG_DELTA;
     }
     return true;
 }
@@ -383,38 +384,39 @@ IntrusiveRefCounts::checkoutStrongRefFromWeak() const noexcept
 inline bool
 IntrusiveRefCounts::expired() const noexcept
 {
-    RefCountPair const val = refCounts.load(std::memory_order_acquire);
+    RefCountPair const val = refCounts_.load(std::memory_order_acquire);
     return val.strong == 0;
 }
 
 inline std::size_t
-IntrusiveRefCounts::use_count() const noexcept
+IntrusiveRefCounts::useCount() const noexcept
 {
-    RefCountPair const val = refCounts.load(std::memory_order_acquire);
+    RefCountPair const val = refCounts_.load(std::memory_order_acquire);
     return val.strong;
 }
 
 inline IntrusiveRefCounts::~IntrusiveRefCounts() noexcept
 {
 #ifndef NDEBUG
-    auto v = refCounts.load(std::memory_order_acquire);
+    auto v = refCounts_.load(std::memory_order_acquire);
     XRPL_ASSERT(
-        (!(v & valueMask)), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : count must be zero");
-    auto t = v & tagMask;
-    XRPL_ASSERT((!t || t == tagMask), "xrpl::IntrusiveRefCounts::~IntrusiveRefCounts : valid tag");
+        (!(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");
 #endif
 }
 
 //------------------------------------------------------------------------------
 
 inline IntrusiveRefCounts::RefCountPair::RefCountPair(IntrusiveRefCounts::FieldType v) noexcept
-    : strong{static_cast<CountType>(v & strongMask)}
-    , weak{static_cast<CountType>((v & weakMask) >> StrongCountNumBits)}
-    , partialDestroyStartedBit{v & partialDestroyStartedMask}
-    , partialDestroyFinishedBit{v & partialDestroyFinishedMask}
+    : 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}
 {
     XRPL_ASSERT(
-        (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
+        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
         "xrpl::IntrusiveRefCounts::RefCountPair(FieldType) : inputs inside "
         "range");
 }
@@ -425,7 +427,7 @@ inline IntrusiveRefCounts::RefCountPair::RefCountPair(
     : strong{s}, weak{w}
 {
     XRPL_ASSERT(
-        (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
+        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
         "xrpl::IntrusiveRefCounts::RefCountPair(CountType, CountType) : "
         "inputs inside range");
 }
@@ -434,11 +436,11 @@ inline IntrusiveRefCounts::FieldType
 IntrusiveRefCounts::RefCountPair::combinedValue() const noexcept
 {
     XRPL_ASSERT(
-        (strong < checkStrongMaxValue && weak < checkWeakMaxValue),
+        (strong < kCHECK_STRONG_MAX_VALUE && weak < kCHECK_WEAK_MAX_VALUE),
         "xrpl::IntrusiveRefCounts::RefCountPair::combinedValue : inputs "
         "inside range");
     return (static_cast<IntrusiveRefCounts::FieldType>(weak)
-            << IntrusiveRefCounts::StrongCountNumBits) |
+            << IntrusiveRefCounts::kSTRONG_COUNT_NUM_BITS) |
         static_cast<IntrusiveRefCounts::FieldType>(strong) | partialDestroyStartedBit |
         partialDestroyFinishedBit;
 }
@@ -449,7 +451,7 @@ partialDestructorFinished(T** o)
 {
     T& self = **o;
     IntrusiveRefCounts::RefCountPair const p =
-        self.refCounts.fetch_or(IntrusiveRefCounts::partialDestroyFinishedMask);
+        self.refCounts_.fetch_or(IntrusiveRefCounts::kPARTIAL_DESTROY_FINISHED_MASK);
     XRPL_ASSERT(
         (!p.partialDestroyFinishedBit && p.partialDestroyStartedBit && !p.strong),
         "xrpl::partialDestructorFinished : not a weak ref");
@@ -458,7 +460,7 @@ partialDestructorFinished(T** o)
         // There was a weak count before the partial destructor ran (or we would
         // have run the full destructor) and now there isn't a weak count. Some
         // thread is waiting to run the destructor.
-        self.refCounts.notify_one();
+        self.refCounts_.notify_one();
     }
     // Set the pointer to null to emphasize that the object shouldn't be used
     // after calling this function as it may be destroyed in another thread.
diff --git a/include/xrpl/basics/LocalValue.h b/include/xrpl/basics/LocalValue.h
index 421ea7af23..f39df425a6 100644
--- a/include/xrpl/basics/LocalValue.h
+++ b/include/xrpl/basics/LocalValue.h
@@ -26,17 +26,17 @@ struct LocalValues
     template <class T>
     struct Value : BasicValue
     {
-        T t_;
+        T t;
 
         Value() = default;
-        explicit Value(T t) : t_(std::move(t))
+        explicit Value(T t) : t(std::move(t))
         {
         }
 
         void*
         get() override
         {
-            return &t_;
+            return &t;
         }
     };
 
@@ -55,8 +55,8 @@ template <class = void>
 boost::thread_specific_ptr<detail::LocalValues>&
 getLocalValues()
 {
-    static boost::thread_specific_ptr<detail::LocalValues> tsp(&detail::LocalValues::cleanup);
-    return tsp;
+    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 5c63166d93..8e6532f7c0 100644
--- a/include/xrpl/basics/Log.h
+++ b/include/xrpl/basics/Log.h
@@ -17,15 +17,15 @@ namespace xrpl {
 // DEPRECATED use beast::severities::Severity instead
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum LogSeverity {
-    lsINVALID = -1,  // used to indicate an invalid severity
-    lsTRACE = 0,     // Very low-level progress information, details inside
+    LSInvalid = -1,  // used to indicate an invalid severity
+    LSTrace = 0,     // Very low-level progress information, details inside
                      // an operation
-    lsDEBUG = 1,     // Function-level progress information, operations
-    lsINFO = 2,      // Server-level progress information, major operations
-    lsWARNING = 3,   // Conditions that warrant human attention, may indicate
+    LSDebug = 1,     // Function-level progress information, operations
+    LSInfo = 2,      // Server-level progress information, major operations
+    LSWarning = 3,   // Conditions that warrant human attention, may indicate
                      // a problem
-    lsERROR = 4,     // A condition that indicates a problem
-    lsFATAL = 5      // A severe condition that indicates a server problem
+    LSError = 4,     // A condition that indicates a problem
+    LSFatal = 5      // A severe condition that indicates a server problem
 };
 
 /** Manages partitions for logging. */
@@ -130,8 +130,8 @@ private:
         /** @} */
 
     private:
-        std::unique_ptr<std::ofstream> m_stream;
-        boost::filesystem::path m_path;
+        std::unique_ptr<std::ofstream> stream_;
+        boost::filesystem::path path_;
     };
 
     std::mutex mutable mutex_;
@@ -168,7 +168,7 @@ public:
     threshold(beast::severities::Severity thresh);
 
     std::vector<std::pair<std::string, std::string>>
-    partition_severities() const;
+    partitionSeverities() const;
 
     void
     write(
@@ -214,7 +214,7 @@ private:
         // Maximum line length for log messages.
         // If the message exceeds this length it will be truncated with
         // ellipses.
-        maximumMessageCharacters = 12 * 1024
+        MaximumMessageCharacters = 12 * 1024
     };
 
     static void
diff --git a/include/xrpl/basics/Number.h b/include/xrpl/basics/Number.h
index b82cb628b9..cdb9014a87 100644
--- a/include/xrpl/basics/Number.h
+++ b/include/xrpl/basics/Number.h
@@ -70,27 +70,27 @@ isPowerOfTen(T value)
 struct MantissaRange
 {
     using rep = std::uint64_t;
-    enum class mantissa_scale { small, large };
+    enum class MantissaScale { Small, Large };
 
-    explicit constexpr MantissaRange(mantissa_scale scale_)
-        : min(getMin(scale_)), log(logTen(min).value_or(-1)), scale(scale_)
+    explicit constexpr MantissaRange(MantissaScale scale)
+        : min(getMin(scale)), log(logTen(min).value_or(-1)), scale(scale)
     {
     }
 
     rep min;
     rep max{(min * 10) - 1};
     int log;
-    mantissa_scale scale;
+    MantissaScale scale;
 
 private:
     static constexpr rep
-    getMin(mantissa_scale scale_)
+    getMin(MantissaScale scale)
     {
-        switch (scale_)
+        switch (scale)
         {
-            case mantissa_scale::small:
+            case MantissaScale::Small:
                 return 1'000'000'000'000'000ULL;
-            case mantissa_scale::large:
+            case MantissaScale::Large:
                 return 1'000'000'000'000'000'000ULL;
             default:
                 // Since this can never be called outside a non-constexpr
@@ -214,26 +214,26 @@ class Number
 
 public:
     // The range for the exponent when normalized
-    constexpr static int minExponent = -32768;
-    constexpr static int maxExponent = 32768;
+    constexpr static int kMIN_EXPONENT = -32768;
+    constexpr static int kMAX_EXPONENT = 32768;
 
-    constexpr static internalrep maxRep = std::numeric_limits<rep>::max();
-    static_assert(maxRep == 9'223'372'036'854'775'807);
-    static_assert(-maxRep == std::numeric_limits<rep>::min() + 1);
+    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);
 
     // May need to make unchecked private
-    struct unchecked
+    struct Unchecked
     {
-        explicit unchecked() = default;
+        explicit Unchecked() = default;
     };
 
     // Like unchecked, normalized is used with the ctors that take an
     // internalrep mantissa. Unlike unchecked, those ctors will normalize the
     // value.
     // Only unit tests are expected to use this class
-    struct normalized
+    struct Normalized
     {
-        explicit normalized() = default;
+        explicit Normalized() = default;
     };
 
     explicit constexpr Number() = default;
@@ -244,13 +244,13 @@ public:
         bool negative,
         internalrep mantissa,
         int exponent,
-        unchecked) noexcept;
+        Unchecked) noexcept;
     // Assume unsigned values are... unsigned. i.e. positive
-    explicit constexpr Number(internalrep mantissa, int exponent, unchecked) noexcept;
+    explicit constexpr Number(internalrep mantissa, int exponent, Unchecked) noexcept;
     // Only unit tests are expected to use this ctor
-    explicit Number(bool negative, internalrep mantissa, int exponent, normalized);
+    explicit Number(bool negative, internalrep mantissa, int exponent, Normalized);
     // Assume unsigned values are... unsigned. i.e. positive
-    explicit Number(internalrep mantissa, int exponent, normalized);
+    explicit Number(internalrep mantissa, int exponent, Normalized);
 
     [[nodiscard]] constexpr rep
     mantissa() const noexcept;
@@ -384,42 +384,44 @@ public:
     root2(Number f);
 
     // Thread local rounding control.  Default is to_nearest
-    enum class rounding_mode { to_nearest, towards_zero, downward, upward };
-    static rounding_mode
+    enum class RoundingMode { ToNearest, TowardsZero, Downward, Upward };
+
+    static RoundingMode
     getround();
-    // Returns previously set mode
-    static rounding_mode
-    setround(rounding_mode mode);
+
+    static RoundingMode
+    setround(RoundingMode inMode);
 
     /** Returns which mantissa scale is currently in use for normalization.
      *
      * If you think you need to call this outside of unit tests, no you don't.
      */
-    static MantissaRange::mantissa_scale
+    static MantissaRange::MantissaScale
     getMantissaScale();
+
     /** Changes which mantissa scale is used for normalization.
      *
      * If you think you need to call this outside of unit tests, no you don't.
      */
     static void
-    setMantissaScale(MantissaRange::mantissa_scale scale);
+    setMantissaScale(MantissaRange::MantissaScale scale);
 
     static internalrep
     minMantissa()
     {
-        return range_.get().min;
+        return kRANGE.get().min;
     }
 
     static internalrep
     maxMantissa()
     {
-        return range_.get().max;
+        return kRANGE.get().max;
     }
 
     static int
     mantissaLog()
     {
-        return range_.get().log;
+        return kRANGE.get().log;
     }
 
     /// oneSmall is needed because the ranges are private
@@ -440,28 +442,28 @@ public:
     normalizeToRange(T minMantissa, T maxMantissa) const;
 
 private:
-    static thread_local rounding_mode mode_;
+    static thread_local RoundingMode mode;
     // The available ranges for mantissa
 
-    constexpr static MantissaRange smallRange{MantissaRange::mantissa_scale::small};
-    static_assert(isPowerOfTen(smallRange.min));
-    static_assert(smallRange.min == 1'000'000'000'000'000LL);
-    static_assert(smallRange.max == 9'999'999'999'999'999LL);
-    static_assert(smallRange.log == 15);
-    static_assert(smallRange.min < maxRep);
-    static_assert(smallRange.max < maxRep);
-    constexpr static MantissaRange largeRange{MantissaRange::mantissa_scale::large};
-    static_assert(isPowerOfTen(largeRange.min));
-    static_assert(largeRange.min == 1'000'000'000'000'000'000ULL);
-    static_assert(largeRange.max == internalrep(9'999'999'999'999'999'999ULL));
-    static_assert(largeRange.log == 18);
-    static_assert(largeRange.min < maxRep);
-    static_assert(largeRange.max > maxRep);
+    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);
 
     // 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> range_;
+    static thread_local std::reference_wrapper<MantissaRange const> kRANGE;
 
     void
     normalize();
@@ -469,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 range_, 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>
@@ -485,8 +487,8 @@ private:
     friend void
     doNormalize(
         bool& negative,
-        T& mantissa_,
-        int& exponent_,
+        T& mantissa,
+        int& exponent,
         MantissaRange::rep const& minMantissa,
         MantissaRange::rep const& maxMantissa);
 
@@ -509,31 +511,31 @@ private:
     class Guard;
 };
 
-constexpr Number::Number(bool negative, internalrep mantissa, int exponent, unchecked) noexcept
+constexpr Number::Number(bool negative, internalrep mantissa, int exponent, Unchecked) noexcept
     : negative_(negative), mantissa_{mantissa}, exponent_{exponent}
 {
 }
 
-constexpr Number::Number(internalrep mantissa, int exponent, unchecked) noexcept
-    : Number(false, mantissa, exponent, unchecked{})
+constexpr Number::Number(internalrep mantissa, int exponent, Unchecked) noexcept
+    : Number(false, mantissa, exponent, Unchecked{})
 {
 }
 
-constexpr static Number numZero{};
+constexpr static Number kNUM_ZERO{};
 
-inline Number::Number(bool negative, internalrep mantissa, int exponent, normalized)
-    : Number(negative, mantissa, exponent, unchecked{})
+inline Number::Number(bool negative, internalrep mantissa, int exponent, Normalized)
+    : Number(negative, mantissa, exponent, Unchecked{})
 {
     normalize();
 }
 
-inline Number::Number(internalrep mantissa, int exponent, normalized)
-    : Number(false, mantissa, exponent, normalized{})
+inline Number::Number(internalrep mantissa, int exponent, Normalized)
+    : Number(false, mantissa, exponent, Normalized{})
 {
 }
 
 inline Number::Number(rep mantissa, int exponent)
-    : Number(mantissa < 0, externalToInternal(mantissa), exponent, normalized{})
+    : Number(mantissa < 0, externalToInternal(mantissa), exponent, Normalized{})
 {
 }
 
@@ -550,10 +552,10 @@ constexpr Number::rep
 Number::mantissa() const noexcept
 {
     auto m = mantissa_;
-    if (m > maxRep)
+    if (m > kMAX_REP)
     {
         XRPL_ASSERT_PARTS(
-            !isnormal() || (m % 10 == 0 && m / 10 <= maxRep),
+            !isnormal() || (m % 10 == 0 && m / 10 <= kMAX_REP),
             "xrpl::Number::mantissa",
             "large normalized mantissa has no remainder");
         m /= 10;
@@ -571,10 +573,10 @@ constexpr int
 Number::exponent() const noexcept
 {
     auto e = exponent_;
-    if (mantissa_ > maxRep)
+    if (mantissa_ > kMAX_REP)
     {
         XRPL_ASSERT_PARTS(
-            !isnormal() || (mantissa_ % 10 == 0 && mantissa_ / 10 <= maxRep),
+            !isnormal() || (mantissa_ % 10 == 0 && mantissa_ / 10 <= kMAX_REP),
             "xrpl::Number::exponent",
             "large normalized mantissa has no remainder");
         ++e;
@@ -669,29 +671,29 @@ operator/(Number const& x, Number const& y)
 inline Number
 Number::min() noexcept
 {
-    return Number{false, range_.get().min, minExponent, unchecked{}};
+    return Number{false, kRANGE.get().min, kMIN_EXPONENT, Unchecked{}};
 }
 
 inline Number
 Number::max() noexcept
 {
-    return Number{false, std::min(range_.get().max, maxRep), maxExponent, unchecked{}};
+    return Number{false, std::min(kRANGE.get().max, kMAX_REP), kMAX_EXPONENT, Unchecked{}};
 }
 
 inline Number
 Number::lowest() noexcept
 {
-    return Number{true, std::min(range_.get().max, maxRep), maxExponent, unchecked{}};
+    return Number{true, std::min(kRANGE.get().max, kMAX_REP), kMAX_EXPONENT, Unchecked{}};
 }
 
 inline bool
 Number::isnormal() const noexcept
 {
-    MantissaRange const& range = range_;
-    auto const abs_m = mantissa_;
+    MantissaRange const& range = kRANGE;
+    auto const absM = mantissa_;
     return *this == Number{} ||
-        (range.min <= abs_m && abs_m <= range.max && (abs_m <= maxRep || abs_m % 10 == 0) &&
-         minExponent <= exponent_ && exponent_ <= maxExponent);
+        (range.min <= absM && absM <= range.max && (absM <= kMAX_REP || absM % 10 == 0) &&
+         kMIN_EXPONENT <= exponent_ && exponent_ <= kMAX_EXPONENT);
 }
 
 template <Integral64 T>
@@ -755,34 +757,34 @@ squelch(Number const& x, Number const& limit) noexcept
 }
 
 inline std::string
-to_string(MantissaRange::mantissa_scale const& scale)
+to_string(MantissaRange::MantissaScale const& scale)
 {
     switch (scale)
     {
-        case MantissaRange::mantissa_scale::small:
+        case MantissaRange::MantissaScale::Small:
             return "small";
-        case MantissaRange::mantissa_scale::large:
+        case MantissaRange::MantissaScale::Large:
             return "large";
         default:
             throw std::runtime_error("Bad scale");
     }
 }
 
-class saveNumberRoundMode
+class SaveNumberRoundMode
 {
-    Number::rounding_mode mode_;
+    Number::RoundingMode mode_;
 
 public:
-    ~saveNumberRoundMode()
+    ~SaveNumberRoundMode()
     {
         Number::setround(mode_);
     }
-    explicit saveNumberRoundMode(Number::rounding_mode mode) noexcept : mode_{mode}
+    explicit SaveNumberRoundMode(Number::RoundingMode mode) noexcept : mode_{mode}
     {
     }
-    saveNumberRoundMode(saveNumberRoundMode const&) = delete;
-    saveNumberRoundMode&
-    operator=(saveNumberRoundMode const&) = delete;
+    SaveNumberRoundMode(SaveNumberRoundMode const&) = delete;
+    SaveNumberRoundMode&
+    operator=(SaveNumberRoundMode const&) = delete;
 };
 
 // saveNumberRoundMode doesn't do quite enough for us.  What we want is a
@@ -791,10 +793,10 @@ public:
 // build it here.
 class NumberRoundModeGuard
 {
-    saveNumberRoundMode saved_;
+    SaveNumberRoundMode saved_;
 
 public:
-    explicit NumberRoundModeGuard(Number::rounding_mode mode) noexcept
+    explicit NumberRoundModeGuard(Number::RoundingMode mode) noexcept
         : saved_{Number::setround(mode)}
     {
     }
@@ -812,10 +814,10 @@ public:
  */
 class NumberMantissaScaleGuard
 {
-    MantissaRange::mantissa_scale const saved_;
+    MantissaRange::MantissaScale const saved_;
 
 public:
-    explicit NumberMantissaScaleGuard(MantissaRange::mantissa_scale scale) noexcept
+    explicit NumberMantissaScaleGuard(MantissaRange::MantissaScale scale) noexcept
         : saved_{Number::getMantissaScale()}
     {
         Number::setMantissaScale(scale);
diff --git a/include/xrpl/basics/RangeSet.h b/include/xrpl/basics/RangeSet.h
index 4e54624056..e1cee8b6c4 100644
--- a/include/xrpl/basics/RangeSet.h
+++ b/include/xrpl/basics/RangeSet.h
@@ -101,7 +101,7 @@ to_string(RangeSet<T> const& rs)
 */
 template <class T>
 [[nodiscard]] bool
-from_string(RangeSet<T>& rs, std::string const& s)
+fromString(RangeSet<T>& rs, std::string const& s)
 {
     std::vector<std::string> intervals;
     std::vector<std::string> tokens;
diff --git a/include/xrpl/basics/Resolver.h b/include/xrpl/basics/Resolver.h
index 5bfa6796d2..3b6a950247 100644
--- a/include/xrpl/basics/Resolver.h
+++ b/include/xrpl/basics/Resolver.h
@@ -16,7 +16,7 @@ public:
 
     /** Issue an asynchronous stop request. */
     virtual void
-    stop_async() = 0;
+    stopAsync() = 0;
 
     /** Issue a synchronous stop request. */
     virtual void
diff --git a/include/xrpl/basics/ResolverAsio.h b/include/xrpl/basics/ResolverAsio.h
index d0dcc9f185..2764777327 100644
--- a/include/xrpl/basics/ResolverAsio.h
+++ b/include/xrpl/basics/ResolverAsio.h
@@ -13,7 +13,7 @@ public:
     explicit ResolverAsio() = default;
 
     static std::unique_ptr<ResolverAsio>
-    New(boost::asio::io_context&, beast::Journal);
+    make(boost::asio::io_context&, beast::Journal);
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/SHAMapHash.h b/include/xrpl/basics/SHAMapHash.h
index bf688be7da..3b93d1f151 100644
--- a/include/xrpl/basics/SHAMapHash.h
+++ b/include/xrpl/basics/SHAMapHash.h
@@ -21,12 +21,12 @@ public:
     }
 
     [[nodiscard]] uint256 const&
-    as_uint256() const
+    asUint256() const
     {
         return hash_;
     }
     uint256&
-    as_uint256()
+    asUint256()
     {
         return hash_;
     }
@@ -93,7 +93,7 @@ template <>
 inline std::size_t
 extract(SHAMapHash const& key)
 {
-    return *reinterpret_cast<std::size_t const*>(key.as_uint256().data());
+    return *reinterpret_cast<std::size_t const*>(key.asUint256().data());
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/SharedWeakCachePointer.h b/include/xrpl/basics/SharedWeakCachePointer.h
index 05d3891e5f..c2c3239eea 100644
--- a/include/xrpl/basics/SharedWeakCachePointer.h
+++ b/include/xrpl/basics/SharedWeakCachePointer.h
@@ -73,7 +73,7 @@ public:
     /** If this is a strong pointer, return the strong count. Otherwise return 0
      */
     [[nodiscard]] std::size_t
-    use_count() const;
+    useCount() const;
 
     /** Return true if there is a non-zero strong count. */
     [[nodiscard]] bool
diff --git a/include/xrpl/basics/SharedWeakCachePointer.ipp b/include/xrpl/basics/SharedWeakCachePointer.ipp
index bb1e201ca8..2f8345e645 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 empty;
+    static std::shared_ptr<T> const kEMPTY;
     if (auto p = std::get_if<std::shared_ptr<T>>(&combo_))
         return *p;
-    return empty;
+    return kEMPTY;
 }
 
 template <class T>
@@ -86,7 +86,7 @@ SharedWeakCachePointer<T>::get() const
 
 template <class T>
 std::size_t
-SharedWeakCachePointer<T>::use_count() const
+SharedWeakCachePointer<T>::useCount() const
 {
     if (auto p = std::get_if<std::shared_ptr<T>>(&combo_))
         return p->use_count();
diff --git a/include/xrpl/basics/SlabAllocator.h b/include/xrpl/basics/SlabAllocator.h
index ddcc89d2da..0172b1ade2 100644
--- a/include/xrpl/basics/SlabAllocator.h
+++ b/include/xrpl/basics/SlabAllocator.h
@@ -36,32 +36,32 @@ class SlabAllocator
     struct SlabBlock
     {
         // A mutex to protect the freelist for this block:
-        std::mutex m_;
+        std::mutex m;
 
         // A linked list of appropriately sized free buffers:
-        std::uint8_t* l_ = nullptr;
+        std::uint8_t* l = nullptr;
 
         // The next memory block
-        SlabBlock* next_;
+        SlabBlock* next;
 
         // The underlying memory block:
-        std::uint8_t const* const p_ = nullptr;
+        std::uint8_t const* const p = nullptr;
 
         // The extent of the underlying memory block:
-        std::size_t const size_;
+        std::size_t const size;
 
         SlabBlock(SlabBlock* next, std::uint8_t* data, std::size_t size, std::size_t item)
-            : next_(next), p_(data), size_(size)
+            : next(next), p(data), size(size)
         {
             // We don't need to grab the mutex here, since we're the only
             // ones with access at this moment.
 
-            while (data + item <= p_ + size_)
+            while (data + item <= p + size)
             {
                 // Use memcpy to avoid unaligned UB
                 // (will optimize to equivalent code)
-                std::memcpy(data, static_cast<void const*>(&l_), sizeof(std::uint8_t*));
-                l_ = data;
+                std::memcpy(data, static_cast<void const*>(&l), sizeof(std::uint8_t*));
+                l = data;
                 data += item;
             }
         }
@@ -81,9 +81,9 @@ class SlabAllocator
 
         /** Determines whether the given pointer belongs to this allocator */
         bool
-        own(std::uint8_t const* p) const noexcept
+        own(std::uint8_t const* pIn) const noexcept
         {
-            return (p >= p_) && (p < p_ + size_);
+            return (pIn >= p) && (pIn < p + size);
         }
 
         std::uint8_t*
@@ -92,15 +92,14 @@ class SlabAllocator
             std::uint8_t* ret = nullptr;  // NOLINT(misc-const-correctness)
 
             {
-                std::scoped_lock const l(m_);
-
-                ret = l_;
+                std::scoped_lock const lock(m);
+                ret = l;
 
                 if (ret != nullptr)
                 {
                     // Use memcpy to avoid unaligned UB
                     // (will optimize to equivalent code)
-                    std::memcpy(static_cast<void*>(&l_), ret, sizeof(std::uint8_t*));
+                    std::memcpy(static_cast<void*>(&l), ret, sizeof(std::uint8_t*));
                 }
             }
 
@@ -121,12 +120,12 @@ class SlabAllocator
         {
             XRPL_ASSERT(own(ptr), "xrpl::SlabAllocator::SlabBlock::deallocate : own input");
 
-            std::scoped_lock const l(m_);
+            std::scoped_lock const lock(m);
 
             // Use memcpy to avoid unaligned UB
             // (will optimize to equivalent code)
-            std::memcpy(ptr, static_cast<void const*>(&l_), sizeof(std::uint8_t*));
-            l_ = ptr;
+            std::memcpy(ptr, static_cast<void const*>(&l), sizeof(std::uint8_t*));
+            l = ptr;
         }
     };
 
@@ -201,7 +200,7 @@ public:
             if (auto ret = slab->allocate())
                 return ret;
 
-            slab = slab->next_;
+            slab = slab->next;
         }
 
         // No slab can satisfy our request, so we attempt to allocate a new
@@ -242,7 +241,7 @@ public:
 
         // Link the new slab
         while (!slabs_.compare_exchange_weak(
-            slab->next_, slab, std::memory_order_release, std::memory_order_relaxed))
+            slab->next, slab, std::memory_order_release, std::memory_order_relaxed))
         {
             ;  // Nothing to do
         }
@@ -265,7 +264,7 @@ public:
             "xrpl::SlabAllocator::SlabAllocator::deallocate : non-null "
             "input");
 
-        for (auto slab = slabs_.load(); slab != nullptr; slab = slab->next_)
+        for (auto slab = slabs_.load(); slab != nullptr; slab = slab->next)
         {
             if (slab->own(ptr))
             {
@@ -294,16 +293,16 @@ public:
         friend class SlabAllocatorSet;
 
     private:
-        std::size_t extra;
-        std::size_t alloc;
-        std::size_t align;
+        std::size_t extra_;
+        std::size_t alloc_;
+        std::size_t align_;
 
     public:
         constexpr SlabConfig(
-            std::size_t extra_,
-            std::size_t alloc_ = 0,
-            std::size_t align_ = alignof(Type))
-            : extra(extra_), alloc(alloc_), align(align_)
+            std::size_t extra,
+            std::size_t alloc = 0,
+            std::size_t align = alignof(Type))
+            : extra_(extra), alloc_(alloc), align_(align)
         {
         }
     };
@@ -313,22 +312,22 @@ public:
         // Ensure that the specified allocators are sorted from smallest to
         // largest by size:
         std::sort(std::begin(cfg), std::end(cfg), [](SlabConfig const& a, SlabConfig const& b) {
-            return a.extra < b.extra;
+            return a.extra_ < b.extra_;
         });
 
         // We should never have two slabs of the same size
         if (std::adjacent_find(
                 std::begin(cfg), std::end(cfg), [](SlabConfig const& a, SlabConfig const& b) {
-                    return a.extra == b.extra;
+                    return a.extra_ == b.extra_;
                 }) != cfg.end())
         {
             throw std::runtime_error(
-                "SlabAllocatorSet<" + beast::type_name<Type>() + ">: duplicate slab size");
+                "SlabAllocatorSet<" + beast::typeName<Type>() + ">: duplicate slab size");
         }
 
         for (auto const& c : cfg)
         {
-            auto& a = allocators_.emplace_back(c.extra, c.alloc, c.align);
+            auto& a = allocators_.emplace_back(c.extra_, c.alloc_, c.align_);
 
             if (a.size() > maxSize_)
                 maxSize_ = a.size();
diff --git a/include/xrpl/basics/Slice.h b/include/xrpl/basics/Slice.h
index 4be7d9d0bb..948d012958 100644
--- a/include/xrpl/basics/Slice.h
+++ b/include/xrpl/basics/Slice.h
@@ -110,7 +110,7 @@ public:
 
     /** Shrinks the slice by moving its start forward by n characters. */
     void
-    remove_prefix(std::size_t n)
+    removePrefix(std::size_t n)
     {
         data_ += n;
         size_ -= n;
@@ -118,7 +118,7 @@ public:
 
     /** Shrinks the slice by moving its end backward by n characters. */
     void
-    remove_suffix(std::size_t n)
+    removeSuffix(std::size_t n)
     {
         size_ -= n;
     }
diff --git a/include/xrpl/basics/StringUtilities.h b/include/xrpl/basics/StringUtilities.h
index 592eee6d53..c9f26026be 100644
--- a/include/xrpl/basics/StringUtilities.h
+++ b/include/xrpl/basics/StringUtilities.h
@@ -30,7 +30,7 @@ template <class Iterator>
 std::optional<Blob>
 strUnHex(std::size_t strSize, Iterator begin, Iterator end)
 {
-    static constexpr std::array<int, 256> const digitLookupTable = []() {
+    static constexpr std::array<int, 256> const kDIGIT_LOOKUP_TABLE = []() {
         std::array<int, 256> t{};
 
         for (auto& x : t)
@@ -56,7 +56,7 @@ strUnHex(std::size_t strSize, Iterator begin, Iterator end)
 
     if (strSize & 1)
     {
-        int c = digitLookupTable[*iter++];
+        int c = kDIGIT_LOOKUP_TABLE[*iter++];
 
         if (c < 0)
             return {};
@@ -66,12 +66,12 @@ strUnHex(std::size_t strSize, Iterator begin, Iterator end)
 
     while (iter != end)
     {
-        int const cHigh = digitLookupTable[*iter++];
+        int const cHigh = kDIGIT_LOOKUP_TABLE[*iter++];
 
         if (cHigh < 0)
             return {};
 
-        int const cLow = digitLookupTable[*iter++];
+        int const cLow = kDIGIT_LOOKUP_TABLE[*iter++];
 
         if (cLow < 0)
             return {};
@@ -94,9 +94,9 @@ strViewUnHex(std::string_view strSrc)
     return strUnHex(strSrc.size(), strSrc.cbegin(), strSrc.cend());
 }
 
-struct parsedURL
+struct ParsedUrl
 {
-    explicit parsedURL() = default;
+    explicit ParsedUrl() = default;
 
     std::string scheme;
     std::string username;
@@ -106,7 +106,7 @@ struct parsedURL
     std::string path;
 
     bool
-    operator==(parsedURL const& other) const
+    operator==(ParsedUrl const& other) const
     {
         return scheme == other.scheme && domain == other.domain && port == other.port &&
             path == other.path;
@@ -114,13 +114,13 @@ struct parsedURL
 };
 
 bool
-parseUrl(parsedURL& pUrl, std::string const& strUrl);
+parseUrl(ParsedUrl& pUrl, std::string const& strUrl);
 
 std::string
-trim_whitespace(std::string str);
+trimWhitespace(std::string str);
 
 std::optional<std::uint64_t>
-to_uint64(std::string const& s);
+toUint64(std::string const& s);
 
 /** Determines if the given string looks like a TOML-file hosting domain.
 
diff --git a/include/xrpl/basics/TaggedCache.h b/include/xrpl/basics/TaggedCache.h
index 95703f0633..52b866cdad 100644
--- a/include/xrpl/basics/TaggedCache.h
+++ b/include/xrpl/basics/TaggedCache.h
@@ -35,7 +35,7 @@ template <
     bool IsKeyCache = false,
     class SharedWeakUnionPointerType = SharedWeakCachePointer<T>,
     class SharedPointerType = std::shared_ptr<T>,
-    class Hash = hardened_hash<>,
+    class Hash = HardenedHash<>,
     class KeyEqual = std::equal_to<Key>,
     class Mutex = std::recursive_mutex>
 class TaggedCache
@@ -44,7 +44,7 @@ public:
     using mutex_type = Mutex;
     using key_type = Key;
     using mapped_type = T;
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
     using shared_weak_combo_pointer_type = SharedWeakUnionPointerType;
     using shared_pointer_type = SharedPointerType;
 
@@ -55,7 +55,7 @@ public:
         clock_type::duration expiration,
         clock_type& clock,
         beast::Journal journal,
-        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::New());
+        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make());
 
 public:
     /** Return the clock associated with the cache. */
@@ -86,7 +86,7 @@ public:
     */
     template <class KeyComparable>
     bool
-    touch_if_exists(KeyComparable const& key);
+    touchIfExists(KeyComparable const& key);
 
     using SweptPointersVector = std::vector<SharedWeakUnionPointerType>;
 
@@ -115,10 +115,10 @@ public:
     canonicalize(key_type const& key, SharedPointerType& data, R&& replaceCallback);
 
     bool
-    canonicalize_replace_cache(key_type const& key, SharedPointerType const& data);
+    canonicalizeReplaceCache(key_type const& key, SharedPointerType const& data);
 
     bool
-    canonicalize_replace_client(key_type const& key, SharedPointerType& data);
+    canonicalizeReplaceClient(key_type const& key, SharedPointerType& data);
 
     SharedPointerType
     fetch(key_type const& key);
@@ -169,7 +169,7 @@ private:
     initialFetch(key_type const& key, std::scoped_lock<mutex_type> const& l);
 
     void
-    collect_metrics();
+    collectMetrics();
 
 private:
     struct Stats
@@ -179,9 +179,9 @@ private:
             std::string const& prefix,
             Handler const& handler,
             beast::insight::Collector::ptr const& collector)
-            : hook(collector->make_hook(handler))
-            , size(collector->make_gauge(prefix, "size"))
-            , hit_rate(collector->make_gauge(prefix, "hit_rate"))
+            : hook(collector->makeHook(handler))
+            , size(collector->makeGauge(prefix, "size"))
+            , hit_rate(collector->makeGauge(prefix, "hit_rate"))
 
         {
         }
@@ -199,8 +199,7 @@ private:
     public:
         clock_type::time_point last_access;
 
-        explicit KeyOnlyEntry(clock_type::time_point const& last_access_)
-            : last_access(last_access_)
+        explicit KeyOnlyEntry(clock_type::time_point const& lastAccess) : last_access(lastAccess)
         {
         }
 
@@ -217,8 +216,8 @@ private:
         shared_weak_combo_pointer_type ptr;
         clock_type::time_point last_access;
 
-        ValueEntry(clock_type::time_point const& last_access_, shared_pointer_type const& ptr_)
-            : ptr(ptr_), last_access(last_access_)
+        ValueEntry(clock_type::time_point const& lastAccess, shared_pointer_type const& ptr)
+            : ptr(ptr), last_access(lastAccess)
         {
         }
 
@@ -261,7 +260,7 @@ private:
 
     [[nodiscard]] std::thread
     sweepHelper(
-        clock_type::time_point const& when_expire,
+        clock_type::time_point const& whenExpire,
         [[maybe_unused]] clock_type::time_point const& now,
         typename KeyValueCacheType::map_type& partition,
         SweptPointersVector& stuffToSweep,
@@ -270,33 +269,33 @@ private:
 
     [[nodiscard]] std::thread
     sweepHelper(
-        clock_type::time_point const& when_expire,
+        clock_type::time_point const& whenExpire,
         clock_type::time_point const& now,
         typename KeyOnlyCacheType::map_type& partition,
         SweptPointersVector&,
         std::atomic<int>& allRemovals,
         std::scoped_lock<std::recursive_mutex> const&);
 
-    beast::Journal m_journal;
-    clock_type& m_clock;
-    Stats m_stats;
+    beast::Journal journal_;
+    clock_type& clock_;
+    Stats stats_;
 
-    mutex_type mutable m_mutex;
+    mutex_type mutable mutex_;
 
     // Used for logging
-    std::string m_name;
+    std::string name_;
 
     // Desired number of cache entries (0 = ignore)
-    int const m_target_size;
+    int const target_size_;
 
     // Desired maximum cache age
-    clock_type::duration const m_target_age;
+    clock_type::duration const target_age_;
 
     // Number of items cached
-    int m_cache_count{0};
-    cache_type m_cache;  // Hold strong reference to recent objects
-    std::uint64_t m_hits{0};
-    std::uint64_t m_misses{0};
+    int cache_count_{0};
+    cache_type cache_;  // Hold strong reference to recent objects
+    std::uint64_t hits_{0};
+    std::uint64_t misses_{0};
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/TaggedCache.ipp b/include/xrpl/basics/TaggedCache.ipp
index 67c80b554e..8ef9e16570 100644
--- a/include/xrpl/basics/TaggedCache.ipp
+++ b/include/xrpl/basics/TaggedCache.ipp
@@ -30,13 +30,12 @@ inline TaggedCache<
         clock_type& clock,
         beast::Journal journal,
         beast::insight::Collector::ptr const& collector)
-    : m_journal(journal)
-    , m_clock(clock)
-    , m_stats(name, std::bind(&TaggedCache::collect_metrics, this), collector)
-    , m_name(name)
-    , m_target_size(size)
-    , m_target_age(expiration)
-
+    : journal_(journal)
+    , clock_(clock)
+    , stats_(name, std::bind(&TaggedCache::collectMetrics, this), collector)
+    , name_(name)
+    , target_size_(size)
+    , target_age_(expiration)
 {
 }
 
@@ -53,7 +52,7 @@ inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     clock() -> clock_type&
 {
-    return m_clock;
+    return clock_;
 }
 
 template <
@@ -69,8 +68,8 @@ inline std::size_t
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     size() const
 {
-    std::scoped_lock lock(m_mutex);
-    return m_cache.size();
+    std::scoped_lock const lock(mutex_);
+    return cache_.size();
 }
 
 template <
@@ -86,8 +85,8 @@ inline int
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getCacheSize() const
 {
-    std::scoped_lock lock(m_mutex);
-    return m_cache_count;
+    std::scoped_lock const lock(mutex_);
+    return cache_count_;
 }
 
 template <
@@ -103,8 +102,8 @@ inline int
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getTrackSize() const
 {
-    std::scoped_lock lock(m_mutex);
-    return m_cache.size();
+    std::scoped_lock const lock(mutex_);
+    return cache_.size();
 }
 
 template <
@@ -120,9 +119,9 @@ inline float
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     getHitRate()
 {
-    std::scoped_lock lock(m_mutex);
-    auto const total = static_cast<float>(m_hits + m_misses);
-    return m_hits * (100.0f / std::max(1.0f, total));
+    std::scoped_lock const lock(mutex_);
+    auto const total = static_cast<float>(hits_ + misses_);
+    return hits_ * (100.0f / std::max(1.0f, total));
 }
 
 template <
@@ -138,9 +137,9 @@ inline void
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     clear()
 {
-    std::scoped_lock lock(m_mutex);
-    m_cache.clear();
-    m_cache_count = 0;
+    std::scoped_lock const lock(mutex_);
+    cache_.clear();
+    cache_count_ = 0;
 }
 
 template <
@@ -156,11 +155,11 @@ inline void
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     reset()
 {
-    std::scoped_lock lock(m_mutex);
-    m_cache.clear();
-    m_cache_count = 0;
-    m_hits = 0;
-    m_misses = 0;
+    std::scoped_lock const lock(mutex_);
+    cache_.clear();
+    cache_count_ = 0;
+    hits_ = 0;
+    misses_ = 0;
 }
 
 template <
@@ -175,17 +174,17 @@ template <
 template <class KeyComparable>
 inline bool
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    touch_if_exists(KeyComparable const& key)
+    touchIfExists(KeyComparable const& key)
 {
-    std::scoped_lock lock(m_mutex);
-    auto const iter(m_cache.find(key));
-    if (iter == m_cache.end())
+    std::scoped_lock const lock(mutex_);
+    auto const iter(cache_.find(key));
+    if (iter == cache_.end())
     {
-        ++m_stats.misses;
+        ++stats_.misses;
         return false;
     }
-    iter->second.touch(m_clock.now());
-    ++m_stats.hits;
+    iter->second.touch(clock_.now());
+    ++stats_.hits;
     return true;
 }
 
@@ -205,53 +204,53 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     // Keep references to all the stuff we sweep
     // For performance, each worker thread should exit before the swept data
     // is destroyed but still within the main cache lock.
-    std::vector<SweptPointersVector> allStuffToSweep(m_cache.partitions());
+    std::vector<SweptPointersVector> allStuffToSweep(cache_.partitions());
 
-    clock_type::time_point const now(m_clock.now());
-    clock_type::time_point when_expire;
+    clock_type::time_point const now(clock_.now());
+    clock_type::time_point whenExpire;
 
     auto const start = std::chrono::steady_clock::now();
     {
-        std::scoped_lock lock(m_mutex);
+        std::scoped_lock const lock(mutex_);
 
-        if (m_target_size == 0 || (static_cast<int>(m_cache.size()) <= m_target_size))
+        if (target_size_ == 0 || (static_cast<int>(cache_.size()) <= target_size_))
         {
-            when_expire = now - m_target_age;
+            whenExpire = now - target_age_;
         }
         else
         {
-            when_expire = now - m_target_age * m_target_size / m_cache.size();
+            whenExpire = now - (target_age_ * target_size_ / cache_.size());
 
             clock_type::duration const minimumAge(std::chrono::seconds(1));
-            if (when_expire > (now - minimumAge))
-                when_expire = now - minimumAge;
+            if (whenExpire > (now - minimumAge))
+                whenExpire = now - minimumAge;
 
-            JLOG(m_journal.trace())
-                << m_name << " is growing fast " << m_cache.size() << " of " << m_target_size
-                << " aging at " << (now - when_expire).count() << " of " << m_target_age.count();
+            JLOG(journal_.trace())
+                << name_ << " is growing fast " << cache_.size() << " of " << target_size_
+                << " aging at " << (now - whenExpire).count() << " of " << target_age_.count();
         }
 
         std::vector<std::thread> workers;
-        workers.reserve(m_cache.partitions());
+        workers.reserve(cache_.partitions());
         std::atomic<int> allRemovals = 0;
 
-        for (std::size_t p = 0; p < m_cache.partitions(); ++p)
+        for (std::size_t p = 0; p < cache_.partitions(); ++p)
         {
             workers.push_back(sweepHelper(
-                when_expire, now, m_cache.map()[p], allStuffToSweep[p], allRemovals, lock));
+                whenExpire, now, cache_.map()[p], allStuffToSweep[p], allRemovals, lock));
         }
         for (std::thread& worker : workers)
             worker.join();
 
-        m_cache_count -= allRemovals;
+        cache_count_ -= allRemovals;
     }
     // At this point allStuffToSweep will go out of scope outside the lock
     // and decrement the reference count on each strong pointer.
-    JLOG(m_journal.debug()) << m_name << " TaggedCache sweep lock duration "
-                            << std::chrono::duration_cast<std::chrono::milliseconds>(
-                                   std::chrono::steady_clock::now() - start)
-                                   .count()
-                            << "ms";
+    JLOG(journal_.debug()) << name_ << " TaggedCache sweep lock duration "
+                           << std::chrono::duration_cast<std::chrono::milliseconds>(
+                                  std::chrono::steady_clock::now() - start)
+                                  .count()
+                           << "ms";
 }
 
 template <
@@ -267,13 +266,12 @@ inline bool
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     del(key_type const& key, bool valid)
 {
-    // Remove from cache, if !valid, remove from map too. Returns true if
-    // removed from cache
-    std::scoped_lock lock(m_mutex);
+    // Remove from cache, if !valid, remove from map too. Returns true if removed from cache
+    std::scoped_lock const lock(mutex_);
 
-    auto cit = m_cache.find(key);
+    auto cit = cache_.find(key);
 
-    if (cit == m_cache.end())
+    if (cit == cache_.end())
         return false;
 
     Entry& entry = cit->second;
@@ -282,13 +280,13 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 
     if (entry.isCached())
     {
-        --m_cache_count;
+        --cache_count_;
         entry.ptr.convertToWeak();
         ret = true;
     }
 
     if (!valid || entry.isExpired())
-        m_cache.erase(cit);
+        cache_.erase(cit);
 
     return ret;
 }
@@ -309,22 +307,22 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 {
     // Return canonical value, store if needed, refresh in cache
     // Return values: true=we had the data already
-    std::scoped_lock lock(m_mutex);
+    std::scoped_lock const lock(mutex_);
 
-    auto cit = m_cache.find(key);
+    auto cit = cache_.find(key);
 
-    if (cit == m_cache.end())
+    if (cit == cache_.end())
     {
-        m_cache.emplace(
+        cache_.emplace(
             std::piecewise_construct,
             std::forward_as_tuple(key),
-            std::forward_as_tuple(m_clock.now(), data));
-        ++m_cache_count;
+            std::forward_as_tuple(clock_.now(), data));
+        ++cache_count_;
         return false;
     }
 
     Entry& entry = cit->second;
-    entry.touch(m_clock.now());
+    entry.touch(clock_.now());
 
     auto shouldReplace = [&] {
         if constexpr (std::is_invocable_r_v<bool, R>)
@@ -368,12 +366,12 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
             data = cachedData;
         }
 
-        ++m_cache_count;
+        ++cache_count_;
         return true;
     }
 
     entry.ptr = data;
-    ++m_cache_count;
+    ++cache_count_;
 
     return false;
 }
@@ -389,7 +387,7 @@ template <
     class Mutex>
 inline bool
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    canonicalize_replace_cache(key_type const& key, SharedPointerType const& data)
+    canonicalizeReplaceCache(key_type const& key, SharedPointerType const& data)
 {
     return canonicalize(key, const_cast<SharedPointerType&>(data), []() { return true; });
 }
@@ -405,7 +403,7 @@ template <
     class Mutex>
 inline bool
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    canonicalize_replace_client(key_type const& key, SharedPointerType& data)
+    canonicalizeReplaceClient(key_type const& key, SharedPointerType& data)
 {
     return canonicalize(key, data, []() { return false; });
 }
@@ -423,10 +421,10 @@ inline SharedPointerType
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     fetch(key_type const& key)
 {
-    std::scoped_lock<mutex_type> l(m_mutex);
+    std::scoped_lock<mutex_type> const l(mutex_);
     auto ret = initialFetch(key, l);
     if (!ret)
-        ++m_misses;
+        ++misses_;
     return ret;
 }
 
@@ -451,12 +449,12 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     if constexpr (std::is_same_v<std::shared_ptr<T>, SharedPointerType>)
     {
         auto p = std::make_shared<T>(std::cref(value));
-        return canonicalize_replace_client(key, p);
+        return canonicalizeReplaceClient(key, p);
     }
     if constexpr (std::is_same_v<intr_ptr::SharedPtr<T>, SharedPointerType>)
     {
-        auto p = intr_ptr::make_shared<T>(std::cref(value));
-        return canonicalize_replace_client(key, p);
+        auto p = intr_ptr::makeShared<T>(std::cref(value));
+        return canonicalizeReplaceClient(key, p);
     }
 }
 
@@ -474,9 +472,9 @@ inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     insert(key_type const& key) -> std::enable_if_t<IsKeyCache, ReturnType>
 {
-    std::scoped_lock lock(m_mutex);
-    clock_type::time_point const now(m_clock.now());
-    auto [it, inserted] = m_cache.emplace(
+    std::scoped_lock const lock(mutex_);
+    clock_type::time_point const now(clock_.now());
+    auto [it, inserted] = cache_.emplace(
         std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple(now));
     if (!inserted)
         it->second.last_access = now;
@@ -519,7 +517,7 @@ inline auto
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     peekMutex() -> mutex_type&
 {
-    return m_mutex;
+    return mutex_;
 }
 
 template <
@@ -538,9 +536,9 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     std::vector<key_type> v;
 
     {
-        std::scoped_lock lock(m_mutex);
-        v.reserve(m_cache.size());
-        for (auto const& _ : m_cache)
+        std::scoped_lock const lock(mutex_);
+        v.reserve(cache_.size());
+        for (auto const& _ : cache_)
             v.push_back(_.first);
     }
 
@@ -560,11 +558,11 @@ inline double
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     rate() const
 {
-    std::scoped_lock lock(m_mutex);
-    auto const tot = m_hits + m_misses;
+    std::scoped_lock const lock(mutex_);
+    auto const tot = hits_ + misses_;
     if (tot == 0)
         return 0;
-    return double(m_hits) / tot;
+    return double(hits_) / tot;
 }
 
 template <
@@ -582,7 +580,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     fetch(key_type const& digest, Handler const& h)
 {
     {
-        std::scoped_lock l(m_mutex);
+        std::scoped_lock const l(mutex_);
         if (auto ret = initialFetch(digest, l))
             return ret;
     }
@@ -591,11 +589,11 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
     if (!sle)
         return {};
 
-    std::scoped_lock l(m_mutex);
-    ++m_misses;
-    auto const [it, inserted] = m_cache.emplace(digest, Entry(m_clock.now(), std::move(sle)));
+    std::scoped_lock const l(mutex_);
+    ++misses_;
+    auto const [it, inserted] = cache_.emplace(digest, Entry(clock_.now(), std::move(sle)));
     if (!inserted)
-        it->second.touch(m_clock.now());
+        it->second.touch(clock_.now());
     return it->second.ptr.getStrong();
 }
 // End CachedSLEs functions.
@@ -613,27 +611,27 @@ inline SharedPointerType
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     initialFetch(key_type const& key, std::scoped_lock<mutex_type> const& l)
 {
-    auto cit = m_cache.find(key);
-    if (cit == m_cache.end())
+    auto cit = cache_.find(key);
+    if (cit == cache_.end())
         return {};
 
     Entry& entry = cit->second;
     if (entry.isCached())
     {
-        ++m_hits;
-        entry.touch(m_clock.now());
+        ++hits_;
+        entry.touch(clock_.now());
         return entry.ptr.getStrong();
     }
     entry.ptr = entry.lock();
     if (entry.isCached())
     {
         // independent of cache size, so not counted as a hit
-        ++m_cache_count;
-        entry.touch(m_clock.now());
+        ++cache_count_;
+        entry.touch(clock_.now());
         return entry.ptr.getStrong();
     }
 
-    m_cache.erase(cit);
+    cache_.erase(cit);
     return {};
 }
 
@@ -648,19 +646,19 @@ template <
     class Mutex>
 inline void
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
-    collect_metrics()
+    collectMetrics()
 {
-    m_stats.size.set(getCacheSize());
+    stats_.size.set(getCacheSize());
 
     {
-        beast::insight::Gauge::value_type hit_rate(0);
+        beast::insight::Gauge::value_type hitRate(0);
         {
-            std::scoped_lock lock(m_mutex);
-            auto const total(m_hits + m_misses);
+            std::scoped_lock const lock(mutex_);
+            auto const total(hits_ + misses_);
             if (total != 0)
-                hit_rate = (m_hits * 100) / total;
+                hitRate = (hits_ * 100) / total;
         }
-        m_stats.hit_rate.set(hit_rate);
+        stats_.hit_rate.set(hitRate);
     }
 }
 
@@ -676,7 +674,7 @@ template <
 inline std::thread
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     sweepHelper(
-        clock_type::time_point const& when_expire,
+        clock_type::time_point const& whenExpire,
         [[maybe_unused]] clock_type::time_point const& now,
         typename KeyValueCacheType::map_type& partition,
         SweptPointersVector& stuffToSweep,
@@ -708,11 +706,11 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
                         ++cit;
                     }
                 }
-                else if (cit->second.last_access <= when_expire)
+                else if (cit->second.last_access <= whenExpire)
                 {
                     // strong, expired
                     ++cacheRemovals;
-                    if (cit->second.ptr.use_count() == 1)
+                    if (cit->second.ptr.useCount() == 1)
                     {
                         stuffToSweep.emplace_back(std::move(cit->second.ptr));
                         ++mapRemovals;
@@ -735,8 +733,8 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
 
         if (mapRemovals || cacheRemovals)
         {
-            JLOG(m_journal.debug())
-                << "TaggedCache partition sweep " << m_name << ": cache = " << partition.size()
+            JLOG(journal_.debug())
+                << "TaggedCache partition sweep " << name_ << ": cache = " << partition.size()
                 << "-" << cacheRemovals << ", map-=" << mapRemovals;
         }
 
@@ -756,7 +754,7 @@ template <
 inline std::thread
 TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash, KeyEqual, Mutex>::
     sweepHelper(
-        clock_type::time_point const& when_expire,
+        clock_type::time_point const& whenExpire,
         clock_type::time_point const& now,
         typename KeyOnlyCacheType::map_type& partition,
         SweptPointersVector&,
@@ -764,8 +762,10 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
         std::scoped_lock<std::recursive_mutex> const&)
 {
     return std::thread([&, this]() {
+        // NOLINTBEGIN https://github.com/XRPLF/rippled/issues/7056
         int cacheRemovals = 0;
         int mapRemovals = 0;
+        // NOLINTEND
 
         // Keep references to all the stuff we sweep
         // so that we can destroy them outside the lock.
@@ -778,7 +778,7 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
                     cit->second.last_access = now;
                     ++cit;
                 }
-                else if (cit->second.last_access <= when_expire)
+                else if (cit->second.last_access <= whenExpire)
                 {
                     cit = partition.erase(cit);
                 }
@@ -789,10 +789,10 @@ TaggedCache<Key, T, IsKeyCache, SharedWeakUnionPointer, SharedPointerType, Hash,
             }
         }
 
-        if (mapRemovals || cacheRemovals)
+        if (mapRemovals > 0 || cacheRemovals > 0)
         {
-            JLOG(m_journal.debug())
-                << "TaggedCache partition sweep " << m_name << ": cache = " << partition.size()
+            JLOG(journal_.debug())
+                << "TaggedCache partition sweep " << name_ << ": cache = " << partition.size()
                 << "-" << cacheRemovals << ", map-=" << mapRemovals;
         }
 
diff --git a/include/xrpl/basics/ToString.h b/include/xrpl/basics/ToString.h
index 28f0245404..7764c1e3e3 100644
--- a/include/xrpl/basics/ToString.h
+++ b/include/xrpl/basics/ToString.h
@@ -13,31 +13,31 @@ namespace xrpl {
 
 template <class T>
 std::enable_if_t<std::is_arithmetic_v<T>, std::string>
-to_string(T t)
+to_string(T t)  // NOLINT(readability-identifier-naming)
 {
     return std::to_string(t);
 }
 
 inline std::string
-to_string(bool b)
+to_string(bool b)  // NOLINT(readability-identifier-naming)
 {
     return b ? "true" : "false";
 }
 
 inline std::string
-to_string(char c)
+to_string(char c)  // NOLINT(readability-identifier-naming)
 {
     return std::string(1, c);
 }
 
 inline std::string
-to_string(std::string s)
+to_string(std::string s)  // NOLINT(readability-identifier-naming)
 {
     return s;
 }
 
 inline std::string
-to_string(char const* s)
+to_string(char const* s)  // NOLINT(readability-identifier-naming)
 {
     return s;
 }
diff --git a/include/xrpl/basics/UnorderedContainers.h b/include/xrpl/basics/UnorderedContainers.h
index c614f9ea80..5a417d5045 100644
--- a/include/xrpl/basics/UnorderedContainers.h
+++ b/include/xrpl/basics/UnorderedContainers.h
@@ -28,7 +28,7 @@ namespace xrpl {
 template <
     class Key,
     class Value,
-    class Hash = beast::uhash<>,
+    class Hash = beast::Uhash<>,
     class Pred = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, Value>>>
 using hash_map = std::unordered_map<Key, Value, Hash, Pred, Allocator>;
@@ -36,33 +36,33 @@ using hash_map = std::unordered_map<Key, Value, Hash, Pred, Allocator>;
 template <
     class Key,
     class Value,
-    class Hash = beast::uhash<>,
+    class Hash = beast::Uhash<>,
     class Pred = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, Value>>>
 using hash_multimap = std::unordered_multimap<Key, Value, Hash, Pred, Allocator>;
 
 template <
     class Value,
-    class Hash = beast::uhash<>,
+    class Hash = beast::Uhash<>,
     class Pred = std::equal_to<Value>,
     class Allocator = std::allocator<Value>>
 using hash_set = std::unordered_set<Value, Hash, Pred, Allocator>;
 
 template <
     class Value,
-    class Hash = beast::uhash<>,
+    class Hash = beast::Uhash<>,
     class Pred = std::equal_to<Value>,
     class Allocator = std::allocator<Value>>
 using hash_multiset = std::unordered_multiset<Value, Hash, Pred, Allocator>;
 
 // hardened_hash containers
 
-using strong_hash = beast::xxhasher;
+using strong_hash = beast::Xxhasher;
 
 template <
     class Key,
     class Value,
-    class Hash = hardened_hash<strong_hash>,
+    class Hash = HardenedHash<strong_hash>,
     class Pred = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, Value>>>
 using hardened_hash_map = std::unordered_map<Key, Value, Hash, Pred, Allocator>;
@@ -70,29 +70,29 @@ using hardened_hash_map = std::unordered_map<Key, Value, Hash, Pred, Allocator>;
 template <
     class Key,
     class Value,
-    class Hash = hardened_hash<strong_hash>,
+    class Hash = HardenedHash<strong_hash>,
     class Pred = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, Value>>>
-using hardened_partitioned_hash_map = partitioned_unordered_map<Key, Value, Hash, Pred, Allocator>;
+using hardened_partitioned_hash_map = PartitionedUnorderedMap<Key, Value, Hash, Pred, Allocator>;
 
 template <
     class Key,
     class Value,
-    class Hash = hardened_hash<strong_hash>,
+    class Hash = HardenedHash<strong_hash>,
     class Pred = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, Value>>>
 using hardened_hash_multimap = std::unordered_multimap<Key, Value, Hash, Pred, Allocator>;
 
 template <
     class Value,
-    class Hash = hardened_hash<strong_hash>,
+    class Hash = HardenedHash<strong_hash>,
     class Pred = std::equal_to<Value>,
     class Allocator = std::allocator<Value>>
 using hardened_hash_set = std::unordered_set<Value, Hash, Pred, Allocator>;
 
 template <
     class Value,
-    class Hash = hardened_hash<strong_hash>,
+    class Hash = HardenedHash<strong_hash>,
     class Pred = std::equal_to<Value>,
     class Allocator = std::allocator<Value>>
 using hardened_hash_multiset = std::unordered_multiset<Value, Hash, Pred, Allocator>;
diff --git a/include/xrpl/basics/UptimeClock.h b/include/xrpl/basics/UptimeClock.h
index 3f2e09bbe3..bb7d4fd77a 100644
--- a/include/xrpl/basics/UptimeClock.h
+++ b/include/xrpl/basics/UptimeClock.h
@@ -21,7 +21,8 @@ public:
     using period = std::ratio<1>;
     using duration = std::chrono::duration<rep, period>;
     using time_point = std::chrono::time_point<UptimeClock>;
-    static constexpr bool is_steady = std::chrono::system_clock::is_steady;
+    static constexpr bool is_steady =  // NOLINT(readability-identifier-naming)
+        std::chrono::system_clock::is_steady;
 
     explicit UptimeClock() = default;
 
@@ -29,19 +30,19 @@ public:
     now();  // seconds since xrpld program start
 
 private:
-    static std::atomic<rep> now_;
-    static std::atomic<bool> stop_;
+    static std::atomic<rep> kNOW;
+    static std::atomic<bool> kSTOP;
 
-    struct update_thread : private std::thread
+    struct UpdateThread : private std::thread
     {
-        ~update_thread();
-        update_thread(update_thread&&) = default;
+        ~UpdateThread();
+        UpdateThread(UpdateThread&&) = default;
 
         using std::thread::thread;
     };
 
-    static update_thread
-    start_clock();
+    static UpdateThread
+    startClock();
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/algorithm.h b/include/xrpl/basics/algorithm.h
index 9dae731a89..6efd8fbe8d 100644
--- a/include/xrpl/basics/algorithm.h
+++ b/include/xrpl/basics/algorithm.h
@@ -13,7 +13,7 @@ namespace xrpl {
 // Note: This algorithm is evolved from std::set_intersection.
 template <class InputIter1, class InputIter2, class Action, class Comp>
 void
-generalized_set_intersection(
+generalizedSetIntersection(
     InputIter1 first1,
     InputIter1 last1,
     InputIter2 first2,
@@ -53,7 +53,7 @@ generalized_set_intersection(
 // std::set_intersection.
 template <class FwdIter1, class InputIter2, class Pred, class Comp>
 FwdIter1
-remove_if_intersect_or_match(
+removeIfIntersectOrMatch(
     FwdIter1 first1,
     FwdIter1 last1,
     InputIter2 first2,
diff --git a/include/xrpl/basics/base64.h b/include/xrpl/basics/base64.h
index 1725ee42f6..ed30e40a36 100644
--- a/include/xrpl/basics/base64.h
+++ b/include/xrpl/basics/base64.h
@@ -40,15 +40,15 @@
 namespace xrpl {
 
 std::string
-base64_encode(std::uint8_t const* data, std::size_t len);
+base64Encode(std::uint8_t const* data, std::size_t len);
 
 inline std::string
-base64_encode(std::string const& s)
+base64Encode(std::string const& s)
 {
-    return base64_encode(reinterpret_cast<std::uint8_t const*>(s.data()), s.size());
+    return base64Encode(reinterpret_cast<std::uint8_t const*>(s.data()), s.size());
 }
 
 std::string
-base64_decode(std::string_view data);
+base64Decode(std::string_view data);
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/base_uint.h b/include/xrpl/basics/base_uint.h
index b6ff5ea9c0..15fc4f6966 100644
--- a/include/xrpl/basics/base_uint.h
+++ b/include/xrpl/basics/base_uint.h
@@ -27,12 +27,12 @@ namespace xrpl {
 namespace detail {
 
 template <class Container, class = std::void_t<>>
-struct is_contiguous_container : std::false_type
+struct IsContiguousContainer : std::false_type
 {
 };
 
 template <class Container>
-struct is_contiguous_container<
+struct IsContiguousContainer<
     Container,
     std::void_t<
         decltype(std::declval<Container const>().size()),
@@ -42,7 +42,7 @@ struct is_contiguous_container<
 };
 
 template <>
-struct is_contiguous_container<Slice> : std::true_type
+struct IsContiguousContainer<Slice> : std::true_type
 {
 };
 
@@ -62,18 +62,18 @@ struct is_contiguous_container<Slice> : std::true_type
                       number of bits.
  */
 template <std::size_t Bits, class Tag = void>
-class base_uint
+class BaseUint
 {
     static_assert((Bits % 32) == 0, "The length of a base_uint in bits must be a multiple of 32.");
 
     static_assert(Bits >= 64, "The length of a base_uint in bits must be at least 64.");
 
-    static constexpr std::size_t WIDTH = 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, WIDTH> data_;
+    std::array<std::uint32_t, kWIDTH> data_;
 
 public:
     //--------------------------------------------------------------------------
@@ -81,8 +81,8 @@ public:
     // STL Container Interface
     //
 
-    static std::size_t constexpr bytes = Bits / 8;
-    static_assert(sizeof(data_) == bytes, "");
+    static std::size_t constexpr kBYTES = Bits / 8;
+    static_assert(sizeof(data_) == kBYTES, "");
 
     using size_type = std::size_t;
     using difference_type = std::ptrdiff_t;
@@ -116,7 +116,7 @@ public:
     iterator
     end()
     {
-        return data() + bytes;
+        return data() + kBYTES;
     }
     [[nodiscard]] const_iterator
     begin() const
@@ -126,7 +126,7 @@ public:
     [[nodiscard]] const_iterator
     end() const
     {
-        return data() + bytes;
+        return data() + kBYTES;
     }
     [[nodiscard]] const_iterator
     cbegin() const
@@ -136,14 +136,14 @@ public:
     [[nodiscard]] const_iterator
     cend() const
     {
-        return data() + bytes;
+        return data() + kBYTES;
     }
 
     /** Value hashing function.
         The seed prevents crafted inputs from causing degenerate parent
        containers.
     */
-    using hasher = hardened_hash<>;
+    using hasher = HardenedHash<>;
 
     //--------------------------------------------------------------------------
 
@@ -160,16 +160,16 @@ private:
         explicit VoidHelper() = default;
     };
 
-    explicit base_uint(void const* data, VoidHelper)
+    explicit BaseUint(void const* data, VoidHelper)
     {
-        memcpy(data_.data(), data, bytes);
+        memcpy(data_.data(), data, kBYTES);
     }
 
     // Helper function to initialize a base_uint from a std::string_view.
     enum class ParseResult {
-        okay,
-        badLength,
-        badChar,
+        Okay,
+        BadLength,
+        BadChar,
     };
 
     constexpr Expected<decltype(data_), ParseResult>
@@ -180,7 +180,7 @@ private:
         auto hexCharToUInt = [](char c, std::uint32_t shift, std::uint32_t& accum) -> ParseResult {
             std::uint32_t nibble = 0xFFu;
             if (c < '0' || c > 'f')
-                return ParseResult::badChar;
+                return ParseResult::BadChar;
 
             if (c >= 'a')
             {
@@ -196,11 +196,11 @@ private:
             }
 
             if (nibble > 0xFu)
-                return ParseResult::badChar;
+                return ParseResult::BadChar;
 
             accum |= (nibble << shift);
 
-            return ParseResult::okay;
+            return ParseResult::Okay;
         };
 
         decltype(data_) ret{};
@@ -211,7 +211,7 @@ private:
         }
 
         if (sv.size() != size() * 2)
-            return Unexpected(ParseResult::badLength);
+            return Unexpected(ParseResult::BadLength);
 
         std::size_t i = 0u;
         auto in = sv.begin();
@@ -221,7 +221,7 @@ private:
             for (std::uint32_t const shift : {4u, 0u, 12u, 8u, 20u, 16u, 28u, 24u})
             {
                 if (auto const result = hexCharToUInt(*in++, shift, accum);
-                    result != ParseResult::okay)
+                    result != ParseResult::Okay)
                     return Unexpected(result);
             }
             ret[i++] = accum;
@@ -235,7 +235,7 @@ private:
         auto const result = parseFromStringView(sv);
         if (!result)
         {
-            if (result.error() == ParseResult::badLength)
+            if (result.error() == ParseResult::BadLength)
                 Throw<std::invalid_argument>("invalid length for hex string");
 
             Throw<std::range_error>("invalid hex character");
@@ -244,15 +244,15 @@ private:
     }
 
 public:
-    constexpr base_uint() : data_{}
+    constexpr BaseUint() : data_{}
     {
     }
 
-    constexpr base_uint(beast::Zero) : data_{}
+    constexpr BaseUint(beast::Zero) : data_{}
     {
     }
 
-    explicit base_uint(std::uint64_t b)
+    explicit BaseUint(std::uint64_t b)
     {
         *this = b;
     }
@@ -260,7 +260,7 @@ public:
     // This constructor is intended to be used at compile time since it might
     // throw at runtime.  Consider declaring this constructor consteval once
     // we get to C++23.
-    explicit constexpr base_uint(std::string_view sv) noexcept(false)
+    explicit constexpr BaseUint(std::string_view sv) noexcept(false)
         : data_(parseFromStringViewThrows(sv))
     {
     }
@@ -268,9 +268,9 @@ public:
     template <
         class Container,
         class = std::enable_if_t<
-            detail::is_contiguous_container<Container>::value &&
+            detail::IsContiguousContainer<Container>::value &&
             std::is_trivially_copyable_v<typename Container::value_type>>>
-    explicit base_uint(Container const& c)
+    explicit BaseUint(Container const& c)
     {
         XRPL_ASSERT(
             c.size() * sizeof(typename Container::value_type) == size(),
@@ -280,9 +280,9 @@ public:
 
     template <class Container>
     std::enable_if_t<
-        detail::is_contiguous_container<Container>::value &&
+        detail::IsContiguousContainer<Container>::value &&
             std::is_trivially_copyable_v<typename Container::value_type>,
-        base_uint&>
+        BaseUint&>
     operator=(Container const& c)
     {
         XRPL_ASSERT(
@@ -295,14 +295,14 @@ public:
     /* Construct from a raw pointer.
         The buffer pointed to by `data` must be at least Bits/8 bytes.
     */
-    static base_uint
+    static BaseUint
     fromVoid(void const* data)
     {
-        return base_uint(data, VoidHelper());
+        return BaseUint(data, VoidHelper());
     }
 
     template <class T>
-    static std::optional<base_uint>
+    static std::optional<BaseUint>
     fromVoidChecked(T const& from)
     {
         if (from.size() != size())
@@ -313,7 +313,7 @@ public:
     [[nodiscard]] constexpr int
     signum() const
     {
-        for (int i = 0; i < WIDTH; i++)
+        for (int i = 0; i < kWIDTH; i++)
         {
             if (data_[i] != 0)
                 return 1;
@@ -325,24 +325,24 @@ public:
     bool
     operator!() const
     {
-        return *this == beast::zero;
+        return *this == beast::kZERO;
     }
 
-    constexpr base_uint
+    constexpr BaseUint
     operator~() const
     {
-        base_uint ret;
+        BaseUint ret;
 
-        for (int i = 0; i < WIDTH; i++)
+        for (int i = 0; i < kWIDTH; i++)
             ret.data_[i] = ~data_[i];
 
         return ret;
     }
 
-    base_uint&
+    BaseUint&
     operator=(std::uint64_t uHost)
     {
-        *this = beast::zero;
+        *this = beast::kZERO;
         // NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
         union
         {
@@ -352,43 +352,43 @@ public:
         // NOLINTEND(cppcoreguidelines-pro-type-member-init)
         // Put in least significant bits.
         ul = boost::endian::native_to_big(uHost);
-        data_[WIDTH - 2] = u[0];
-        data_[WIDTH - 1] = u[1];
+        data_[kWIDTH - 2] = u[0];
+        data_[kWIDTH - 1] = u[1];
         return *this;
     }
 
-    base_uint&
-    operator^=(base_uint const& b)
+    BaseUint&
+    operator^=(BaseUint const& b)
     {
-        for (int i = 0; i < WIDTH; i++)
+        for (int i = 0; i < kWIDTH; i++)
             data_[i] ^= b.data_[i];
 
         return *this;
     }
 
-    base_uint&
-    operator&=(base_uint const& b)
+    BaseUint&
+    operator&=(BaseUint const& b)
     {
-        for (int i = 0; i < WIDTH; i++)
+        for (int i = 0; i < kWIDTH; i++)
             data_[i] &= b.data_[i];
 
         return *this;
     }
 
-    base_uint&
-    operator|=(base_uint const& b)
+    BaseUint&
+    operator|=(BaseUint const& b)
     {
-        for (int i = 0; i < WIDTH; i++)
+        for (int i = 0; i < kWIDTH; i++)
             data_[i] |= b.data_[i];
 
         return *this;
     }
 
-    base_uint&
+    BaseUint&
     operator++()
     {
         // prefix operator
-        for (int i = WIDTH - 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)
@@ -398,20 +398,20 @@ public:
         return *this;
     }
 
-    base_uint
+    BaseUint
     operator++(int)
     {
         // postfix operator
-        base_uint const ret = *this;
+        BaseUint const ret = *this;
         ++(*this);
 
         return ret;
     }
 
-    base_uint&
+    BaseUint&
     operator--()
     {
-        for (int i = WIDTH - 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);
@@ -423,36 +423,36 @@ public:
         return *this;
     }
 
-    base_uint
+    BaseUint
     operator--(int)
     {
         // postfix operator
-        base_uint const ret = *this;
+        BaseUint const ret = *this;
         --(*this);
 
         return ret;
     }
 
-    [[nodiscard]] base_uint
+    [[nodiscard]] BaseUint
     next() const
     {
         auto ret = *this;
         return ++ret;
     }
 
-    [[nodiscard]] base_uint
+    [[nodiscard]] BaseUint
     prev() const
     {
         auto ret = *this;
         return --ret;
     }
 
-    base_uint&
-    operator+=(base_uint const& b)
+    BaseUint&
+    operator+=(BaseUint const& b)
     {
         std::uint64_t carry = 0;
 
-        for (int i = WIDTH - 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]);
@@ -466,7 +466,7 @@ public:
 
     template <class Hasher>
     friend void
-    hash_append(Hasher& h, base_uint const& a) noexcept
+    hash_append(Hasher& h, BaseUint const& a) noexcept
     {
         // Do not allow any endian transformations on this memory
         h(a.data_.data(), sizeof(a.data_));
@@ -506,10 +506,10 @@ public:
     constexpr static std::size_t
     size()
     {
-        return bytes;
+        return kBYTES;
     }
 
-    base_uint<Bits, Tag>&
+    BaseUint<Bits, Tag>&
     operator=(beast::Zero)
     {
         data_.fill(0);
@@ -520,28 +520,28 @@ public:
     [[nodiscard]] bool
     isZero() const
     {
-        return *this == beast::zero;
+        return *this == beast::kZERO;
     }
     [[nodiscard]] bool
     isNonZero() const
     {
-        return *this != beast::zero;
+        return *this != beast::kZERO;
     }
     void
     zero()
     {
-        *this = beast::zero;
+        *this = beast::kZERO;
     }
 };
 
-using uint128 = base_uint<128>;
-using uint160 = base_uint<160>;
-using uint256 = base_uint<256>;
-using uint192 = base_uint<192>;
+using uint128 = BaseUint<128>;
+using uint160 = BaseUint<160>;
+using uint256 = BaseUint<256>;
+using uint192 = BaseUint<192>;
 
 template <std::size_t Bits, class Tag>
 [[nodiscard]] constexpr std::strong_ordering
-operator<=>(base_uint<Bits, Tag> const& lhs, base_uint<Bits, Tag> const& rhs)
+operator<=>(BaseUint<Bits, Tag> const& lhs, BaseUint<Bits, Tag> const& rhs)
 {
     // This comparison might seem wrong on a casual inspection because it
     // compares data internally stored as std::uint32_t byte-by-byte. But
@@ -562,7 +562,7 @@ operator<=>(base_uint<Bits, Tag> const& lhs, base_uint<Bits, Tag> const& rhs)
 
 template <std::size_t Bits, typename Tag>
 [[nodiscard]] constexpr bool
-operator==(base_uint<Bits, Tag> const& lhs, base_uint<Bits, Tag> const& rhs)
+operator==(BaseUint<Bits, Tag> const& lhs, BaseUint<Bits, Tag> const& rhs)
 {
     return (lhs <=> rhs) == 0;
 }
@@ -570,59 +570,59 @@ operator==(base_uint<Bits, Tag> const& lhs, base_uint<Bits, Tag> const& rhs)
 //------------------------------------------------------------------------------
 template <std::size_t Bits, class Tag>
 constexpr bool
-operator==(base_uint<Bits, Tag> const& a, std::uint64_t b)
+operator==(BaseUint<Bits, Tag> const& a, std::uint64_t b)
 {
-    return a == base_uint<Bits, Tag>(b);
+    return a == BaseUint<Bits, Tag>(b);
 }
 
 //------------------------------------------------------------------------------
 template <std::size_t Bits, class Tag>
-constexpr base_uint<Bits, Tag>
-operator^(base_uint<Bits, Tag> const& a, base_uint<Bits, Tag> const& b)
+constexpr BaseUint<Bits, Tag>
+operator^(BaseUint<Bits, Tag> const& a, BaseUint<Bits, Tag> const& b)
 {
-    return base_uint<Bits, Tag>(a) ^= b;
+    return BaseUint<Bits, Tag>(a) ^= b;
 }
 
 template <std::size_t Bits, class Tag>
-constexpr base_uint<Bits, Tag>
-operator&(base_uint<Bits, Tag> const& a, base_uint<Bits, Tag> const& b)
+constexpr BaseUint<Bits, Tag>
+operator&(BaseUint<Bits, Tag> const& a, BaseUint<Bits, Tag> const& b)
 {
-    return base_uint<Bits, Tag>(a) &= b;
+    return BaseUint<Bits, Tag>(a) &= b;
 }
 
 template <std::size_t Bits, class Tag>
-constexpr base_uint<Bits, Tag>
-operator|(base_uint<Bits, Tag> const& a, base_uint<Bits, Tag> const& b)
+constexpr BaseUint<Bits, Tag>
+operator|(BaseUint<Bits, Tag> const& a, BaseUint<Bits, Tag> const& b)
 {
-    return base_uint<Bits, Tag>(a) |= b;
+    return BaseUint<Bits, Tag>(a) |= b;
 }
 
 template <std::size_t Bits, class Tag>
-constexpr base_uint<Bits, Tag>
-operator+(base_uint<Bits, Tag> const& a, base_uint<Bits, Tag> const& b)
+constexpr BaseUint<Bits, Tag>
+operator+(BaseUint<Bits, Tag> const& a, BaseUint<Bits, Tag> const& b)
 {
-    return base_uint<Bits, Tag>(a) += b;
+    return BaseUint<Bits, Tag>(a) += b;
 }
 
 //------------------------------------------------------------------------------
 template <std::size_t Bits, class Tag>
 inline std::string
-to_string(base_uint<Bits, Tag> const& a)
+to_string(BaseUint<Bits, Tag> const& a)
 {
     return strHex(a.cbegin(), a.cend());
 }
 
 template <std::size_t Bits, class Tag>
 inline std::string
-to_short_string(base_uint<Bits, Tag> const& a)
+toShortString(BaseUint<Bits, Tag> const& a)
 {
-    static_assert(base_uint<Bits, Tag>::bytes > 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) + "...";
 }
 
 template <std::size_t Bits, class Tag>
 inline std::ostream&
-operator<<(std::ostream& out, base_uint<Bits, Tag> const& u)
+operator<<(std::ostream& out, BaseUint<Bits, Tag> const& u)
 {
     return out << to_string(u);
 }
@@ -650,9 +650,9 @@ static_assert(sizeof(uint256) == 256 / 8, "There should be no padding bytes");
 namespace beast {
 
 template <std::size_t Bits, class Tag>
-struct is_uniquely_represented<xrpl::base_uint<Bits, Tag>> : public std::true_type
+struct IsUniquelyRepresented<xrpl::BaseUint<Bits, Tag>> : public std::true_type
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
 }  // namespace beast
diff --git a/include/xrpl/basics/chrono.h b/include/xrpl/basics/chrono.h
index a9f12b041c..8b71be04b4 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 epoch_offset =
+constexpr static std::chrono::seconds kEPOCH_OFFSET =
     date::sys_days{date::year{2000} / 1 / 1} - date::sys_days{date::year{1970} / 1 / 1};
 
-static_assert(epoch_offset.count() == 946684800);
+static_assert(kEPOCH_OFFSET.count() == 946684800);
 
 class NetClock
 {
@@ -45,7 +45,7 @@ public:
     using duration = std::chrono::duration<rep, period>;
     using time_point = std::chrono::time_point<NetClock>;
 
-    static bool const is_steady = false;
+    static bool const is_steady = false;  // NOLINT(readability-identifier-naming)
 };
 
 template <class Duration>
@@ -60,42 +60,42 @@ 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() + epoch_offset});
+    return to_string(system_clock::time_point{tp.time_since_epoch() + kEPOCH_OFFSET});
 }
 
 template <class Duration>
 std::string
-to_string_iso(date::sys_time<Duration> tp)
+toStringIso(date::sys_time<Duration> tp)
 {
     using namespace std::chrono;
     return date::format("%FT%TZ", tp);
 }
 
 inline std::string
-to_string_iso(NetClock::time_point tp)
+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 to_string_iso(date::sys_time<NetClock::duration>{tp.time_since_epoch() + epoch_offset});
+    return toStringIso(date::sys_time<NetClock::duration>{tp.time_since_epoch() + kEPOCH_OFFSET});
 }
 
 /** A clock for measuring elapsed time.
 
     The epoch is unspecified.
 */
-using Stopwatch = beast::abstract_clock<std::chrono::steady_clock>;
+using Stopwatch = beast::AbstractClock<std::chrono::steady_clock>;
 
 /** A manual Stopwatch for unit tests. */
-using TestStopwatch = beast::manual_clock<std::chrono::steady_clock>;
+using TestStopwatch = beast::ManualClock<std::chrono::steady_clock>;
 
 /** Returns an instance of a wall clock. */
 inline Stopwatch&
 stopwatch()
 {
-    using Clock = beast::basic_seconds_clock;
+    using Clock = beast::BasicSecondsClock;
     using Facade = Clock::Clock;
-    return beast::get_abstract_clock<Facade, Clock>();
+    return beast::getAbstractClock<Facade, Clock>();
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/contract.h b/include/xrpl/basics/contract.h
index 0d9f567416..0e90687de3 100644
--- a/include/xrpl/basics/contract.h
+++ b/include/xrpl/basics/contract.h
@@ -17,7 +17,7 @@ namespace xrpl {
 
 /** Generates and logs a call stack */
 void
-LogThrow(std::string const& title);
+logThrow(std::string const& title);
 
 /** Rethrow the exception currently being handled.
 
@@ -30,9 +30,9 @@ LogThrow(std::string const& title);
     triggering false positives, since it throws.
 */
 [[noreturn]] XRPL_NO_SANITIZE_ADDRESS inline void
-Rethrow()
+rethrow()
 {
-    LogThrow("Re-throwing exception");
+    logThrow("Re-throwing exception");
     throw;
 }
 
@@ -52,12 +52,12 @@ Throw(Args&&... args)
         std::is_convertible_v<E*, std::exception*>, "Exception must derive from std::exception.");
 
     E e(std::forward<Args>(args)...);
-    LogThrow(std::string("Throwing exception of type " + beast::type_name<E>() + ": ") + e.what());
+    logThrow(std::string("Throwing exception of type " + beast::typeName<E>() + ": ") + e.what());
     throw std::move(e);
 }
 
 /** Called when faulty logic causes a broken invariant. */
 [[noreturn]] void
-LogicError(std::string const& how) noexcept;
+logicError(std::string const& how) noexcept;
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/hardened_hash.h b/include/xrpl/basics/hardened_hash.h
index 2722a5a4a7..07f5aded4c 100644
--- a/include/xrpl/basics/hardened_hash.h
+++ b/include/xrpl/basics/hardened_hash.h
@@ -16,24 +16,24 @@ using seed_pair = std::pair<std::uint64_t, std::uint64_t>;
 
 template <bool = true>
 seed_pair
-make_seed_pair() noexcept
+makeSeedPair() noexcept
 {
-    struct state_t
+    struct StateT
     {
         std::mutex mutex;
         std::random_device rng;
         std::mt19937_64 gen;
         std::uniform_int_distribution<std::uint64_t> dist;
 
-        state_t() : gen(rng())
+        StateT() : gen(rng())
         {
         }
         // state_t(state_t const&) = delete;
         // state_t& operator=(state_t const&) = delete;
     };
-    static state_t state;
-    std::scoped_lock const lock(state.mutex);
-    return {state.dist(state.gen), state.dist(state.gen)};
+    static StateT kSTATE;
+    std::scoped_lock const lock(kSTATE.mutex);
+    return {kSTATE.dist(kSTATE.gen), kSTATE.dist(kSTATE.gen)};
 }
 
 }  // namespace detail
@@ -68,22 +68,22 @@ make_seed_pair() noexcept
    see https://131002.net/siphash/#at
 */
 
-template <class HashAlgorithm = beast::xxhasher>
-class hardened_hash
+template <class HashAlgorithm = beast::Xxhasher>
+class HardenedHash
 {
 private:
-    detail::seed_pair m_seeds{detail::make_seed_pair<>()};
+    detail::seed_pair seeds_{detail::makeSeedPair<>()};
 
 public:
     using result_type = typename HashAlgorithm::result_type;
 
-    hardened_hash() = default;
+    HardenedHash() = default;
 
     template <class T>
     result_type
     operator()(T const& t) const noexcept
     {
-        HashAlgorithm h(m_seeds.first, m_seeds.second);
+        HashAlgorithm h(seeds_.first, seeds_.second);
         hash_append(h, t);
         return static_cast<result_type>(h);
     }
diff --git a/include/xrpl/basics/make_SSLContext.h b/include/xrpl/basics/make_SSLContext.h
index 1714d3e58c..46f6a15e84 100644
--- a/include/xrpl/basics/make_SSLContext.h
+++ b/include/xrpl/basics/make_SSLContext.h
@@ -8,11 +8,11 @@ namespace xrpl {
 
 /** Create a self-signed SSL context that allows anonymous Diffie Hellman. */
 std::shared_ptr<boost::asio::ssl::context>
-make_SSLContext(std::string const& cipherList);
+makeSslContext(std::string const& cipherList);
 
 /** Create an authenticated SSL context using the specified files. */
 std::shared_ptr<boost::asio::ssl::context>
-make_SSLContextAuthed(
+makeSslContextAuthed(
     std::string const& keyFile,
     std::string const& certFile,
     std::string const& chainFile,
diff --git a/include/xrpl/basics/mulDiv.h b/include/xrpl/basics/mulDiv.h
index 2495f07728..8a9bc4f5dc 100644
--- a/include/xrpl/basics/mulDiv.h
+++ b/include/xrpl/basics/mulDiv.h
@@ -5,7 +5,7 @@
 #include <optional>
 
 namespace xrpl {
-auto constexpr muldiv_max = std::numeric_limits<std::uint64_t>::max();
+auto constexpr kMULDIV_MAX = 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/partitioned_unordered_map.h b/include/xrpl/basics/partitioned_unordered_map.h
index 33fe63e91b..5f32cca8af 100644
--- a/include/xrpl/basics/partitioned_unordered_map.h
+++ b/include/xrpl/basics/partitioned_unordered_map.h
@@ -24,7 +24,7 @@ template <>
 inline std::size_t
 extract(std::string const& key)
 {
-    return ::beast::uhash<>{}(key);
+    return ::beast::Uhash<>{}(key);
 }
 
 template <
@@ -33,7 +33,7 @@ template <
     typename Hash,
     typename Pred = std::equal_to<Key>,
     typename Alloc = std::allocator<std::pair<Key const, Value>>>
-class partitioned_unordered_map
+class PartitionedUnorderedMap
 {
     std::size_t partitions_;
 
@@ -53,46 +53,46 @@ public:
     using map_type = std::unordered_map<key_type, mapped_type, hasher, key_equal, allocator_type>;
     using partition_map_type = std::vector<map_type>;
 
-    struct iterator
+    struct Iterator
     {
         using iterator_category = std::forward_iterator_tag;
-        partition_map_type* map_{nullptr};
-        typename partition_map_type::iterator ait_{};
-        typename map_type::iterator mit_;
+        partition_map_type* map{nullptr};
+        typename partition_map_type::iterator ait{};
+        typename map_type::iterator mit;
 
-        iterator() = default;
+        Iterator() = default;
 
-        iterator(partition_map_type* map) : map_(map)
+        Iterator(partition_map_type* m) : map(m)
         {
         }
 
         reference
         operator*() const
         {
-            return *mit_;
+            return *mit;
         }
 
         pointer
         operator->() const
         {
-            return &(*mit_);
+            return &(*mit);
         }
 
         void
         inc()
         {
-            ++mit_;
-            while (mit_ == ait_->end())
+            ++mit;
+            while (mit == ait->end())
             {
-                ++ait_;
-                if (ait_ == map_->end())
+                ++ait;
+                if (ait == map->end())
                     return;
-                mit_ = ait_->begin();
+                mit = ait->begin();
             }
         }
 
         // ++it
-        iterator&
+        Iterator&
         operator++()
         {
             inc();
@@ -100,75 +100,75 @@ public:
         }
 
         // it++
-        iterator
+        Iterator
         operator++(int)
         {
-            iterator tmp(*this);
+            Iterator tmp(*this);
             inc();
             return tmp;
         }
 
         friend bool
-        operator==(iterator const& lhs, iterator const& rhs)
+        operator==(Iterator const& lhs, Iterator const& rhs)
         {
-            return lhs.map_ == rhs.map_ && lhs.ait_ == rhs.ait_ && lhs.mit_ == rhs.mit_;
+            return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
         }
 
         friend bool
-        operator!=(iterator const& lhs, iterator const& rhs)
+        operator!=(Iterator const& lhs, Iterator const& rhs)
         {
             return !(lhs == rhs);
         }
     };
 
-    struct const_iterator
+    struct ConstIterator
     {
         using iterator_category = std::forward_iterator_tag;
 
-        partition_map_type* map_{nullptr};
-        typename partition_map_type::iterator ait_{};
-        typename map_type::iterator mit_;
+        partition_map_type* map{nullptr};
+        typename partition_map_type::iterator ait{};
+        typename map_type::iterator mit;
 
-        const_iterator() = default;
+        ConstIterator() = default;
 
-        const_iterator(partition_map_type* map) : map_(map)
+        ConstIterator(partition_map_type* m) : map(m)
         {
         }
 
-        const_iterator(iterator const& orig)
+        ConstIterator(Iterator const& orig)
         {
-            map_ = orig.map_;
-            ait_ = orig.ait_;
-            mit_ = orig.mit_;
+            map = orig.map;
+            ait = orig.ait;
+            mit = orig.mit;
         }
 
         const_reference
         operator*() const
         {
-            return *mit_;
+            return *mit;
         }
 
         const_pointer
         operator->() const
         {
-            return &(*mit_);
+            return &(*mit);
         }
 
         void
         inc()
         {
-            ++mit_;
-            while (mit_ == ait_->end())
+            ++mit;
+            while (mit == ait->end())
             {
-                ++ait_;
-                if (ait_ == map_->end())
+                ++ait;
+                if (ait == map->end())
                     return;
-                mit_ = ait_->begin();
+                mit = ait->begin();
             }
         }
 
         // ++it
-        const_iterator&
+        ConstIterator&
         operator++()
         {
             inc();
@@ -176,22 +176,22 @@ public:
         }
 
         // it++
-        const_iterator
+        ConstIterator
         operator++(int)
         {
-            const_iterator tmp(*this);
+            ConstIterator tmp(*this);
             inc();
             return tmp;
         }
 
         friend bool
-        operator==(const_iterator const& lhs, const_iterator const& rhs)
+        operator==(ConstIterator const& lhs, ConstIterator const& rhs)
         {
-            return lhs.map_ == rhs.map_ && lhs.ait_ == rhs.ait_ && lhs.mit_ == rhs.mit_;
+            return lhs.map == rhs.map && lhs.ait == rhs.ait && lhs.mit == rhs.mit;
         }
 
         friend bool
-        operator!=(const_iterator const& lhs, const_iterator const& rhs)
+        operator!=(ConstIterator const& lhs, ConstIterator const& rhs)
         {
             return !(lhs == rhs);
         }
@@ -208,26 +208,26 @@ private:
     static void
     end(T& it)
     {
-        it.ait_ = it.map_->end();
-        it.mit_ = it.map_->back().end();
+        it.ait = it.map->end();
+        it.mit = it.map->back().end();
     }
 
     template <class T>
     static void
     begin(T& it)
     {
-        for (it.ait_ = it.map_->begin(); it.ait_ != it.map_->end(); ++it.ait_)
+        for (it.ait = it.map->begin(); it.ait != it.map->end(); ++it.ait)
         {
-            if (it.ait_->begin() == it.ait_->end())
+            if (it.ait->begin() == it.ait->end())
                 continue;
-            it.mit_ = it.ait_->begin();
+            it.mit = it.ait->begin();
             return;
         }
         end(it);
     }
 
 public:
-    partitioned_unordered_map(std::optional<std::size_t> partitions = std::nullopt)
+    PartitionedUnorderedMap(std::optional<std::size_t> partitions = std::nullopt)
     {
         // Set partitions to the number of hardware threads if the parameter
         // is either empty or set to 0.
@@ -252,45 +252,45 @@ public:
         return map_;
     }
 
-    iterator
+    Iterator
     begin()
     {
-        iterator it(&map_);
+        Iterator it(&map_);
         begin(it);
         return it;
     }
 
-    const_iterator
+    ConstIterator
     cbegin() const
     {
-        const_iterator it(&map_);
+        ConstIterator it(&map_);
         begin(it);
         return it;
     }
 
-    const_iterator
+    ConstIterator
     begin() const
     {
         return cbegin();
     }
 
-    iterator
+    Iterator
     end()
     {
-        iterator it(&map_);
+        Iterator it(&map_);
         end(it);
         return it;
     }
 
-    const_iterator
+    ConstIterator
     cend() const
     {
-        const_iterator it(&map_);
+        ConstIterator it(&map_);
         end(it);
         return it;
     }
 
-    const_iterator
+    ConstIterator
     end() const
     {
         return cend();
@@ -301,50 +301,50 @@ private:
     void
     find(key_type const& key, T& it) const
     {
-        it.ait_ = it.map_->begin() + partitioner(key);
-        it.mit_ = it.ait_->find(key);
-        if (it.mit_ == it.ait_->end())
+        it.ait = it.map->begin() + partitioner(key);
+        it.mit = it.ait->find(key);
+        if (it.mit == it.ait->end())
             end(it);
     }
 
 public:
-    iterator
+    Iterator
     find(key_type const& key)
     {
-        iterator it(&map_);
+        Iterator it(&map_);
         find(key, it);
         return it;
     }
 
-    const_iterator
+    ConstIterator
     find(key_type const& key) const
     {
-        const_iterator it(&map_);
+        ConstIterator it(&map_);
         find(key, it);
         return it;
     }
 
     template <class T, class U>
-    std::pair<iterator, bool>
+    std::pair<Iterator, bool>
     emplace(std::piecewise_construct_t const&, T&& keyTuple, U&& valueTuple)
     {
         auto const& key = std::get<0>(keyTuple);
-        iterator it(&map_);
-        it.ait_ = it.map_->begin() + partitioner(key);
-        auto [eit, inserted] = it.ait_->emplace(
+        Iterator it(&map_);
+        it.ait = it.map->begin() + partitioner(key);
+        auto [eit, inserted] = it.ait->emplace(
             std::piecewise_construct, std::forward<T>(keyTuple), std::forward<U>(valueTuple));
-        it.mit_ = eit;
+        it.mit = eit;
         return {it, inserted};
     }
 
     template <class T, class U>
-    std::pair<iterator, bool>
+    std::pair<Iterator, bool>
     emplace(T&& key, U&& val)
     {
-        iterator it(&map_);
-        it.ait_ = it.map_->begin() + partitioner(key);
-        auto [eit, inserted] = it.ait_->emplace(std::forward<T>(key), std::forward<U>(val));
-        it.mit_ = eit;
+        Iterator it(&map_);
+        it.ait = it.map->begin() + partitioner(key);
+        auto [eit, inserted] = it.ait->emplace(std::forward<T>(key), std::forward<U>(val));
+        it.mit = eit;
         return {it, inserted};
     }
 
@@ -355,19 +355,19 @@ public:
             p.clear();
     }
 
-    iterator
-    erase(const_iterator position)
+    Iterator
+    erase(ConstIterator position)
     {
-        iterator it(&map_);
-        it.ait_ = position.ait_;
-        it.mit_ = position.ait_->erase(position.mit_);
+        Iterator it(&map_);
+        it.ait = position.ait;
+        it.mit = position.ait->erase(position.mit);
 
-        while (it.mit_ == it.ait_->end())
+        while (it.mit == it.ait->end())
         {
-            ++it.ait_;
-            if (it.ait_ == it.map_->end())
+            ++it.ait;
+            if (it.ait == it.map->end())
                 break;
-            it.mit_ = it.ait_->begin();
+            it.mit = it.ait->begin();
         }
 
         return it;
diff --git a/include/xrpl/basics/random.h b/include/xrpl/basics/random.h
index a4018b7e5f..ca51ef9364 100644
--- a/include/xrpl/basics/random.h
+++ b/include/xrpl/basics/random.h
@@ -44,30 +44,30 @@ using is_engine = std::is_invocable_r<Result, Engine>;
     will be randomly seeded.
 */
 inline beast::xor_shift_engine&
-default_prng()
+defaultPrng()
 {
     // This is used to seed the thread-specific PRNGs on demand
-    static beast::xor_shift_engine seeder = [] {
+    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));
     }();
 
     // This protects the seeder
-    static std::mutex m;
+    static std::mutex kM;
 
     // The thread-specific PRNGs:
-    thread_local beast::xor_shift_engine engine = [] {
+    thread_local beast::xor_shift_engine kENGINE = [] {
         std::uint64_t seed = 0;
         {
-            std::scoped_lock const lk(m);
+            std::scoped_lock const lk(kM);
             std::uniform_int_distribution<std::uint64_t> distribution{1};
-            seed = distribution(seeder);
+            seed = distribution(kSEEDER);
         }
         return beast::xor_shift_engine{seed};
     }();
 
-    return engine;
+    return kENGINE;
 }
 
 /** Return a uniformly distributed random integer.
@@ -92,7 +92,7 @@ default_prng()
 /** @{ */
 template <class Engine, class Integral>
 std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
-rand_int(Engine& engine, Integral min, Integral max)
+randInt(Engine& engine, Integral min, Integral max)
 {
     XRPL_ASSERT(max > min, "xrpl::rand_int : max over min inputs");
 
@@ -104,37 +104,37 @@ rand_int(Engine& engine, Integral min, Integral max)
 
 template <class Integral>
 std::enable_if_t<std::is_integral_v<Integral>, Integral>
-rand_int(Integral min, Integral max)
+randInt(Integral min, Integral max)
 {
-    return rand_int(default_prng(), min, max);
+    return randInt(defaultPrng(), min, max);
 }
 
 template <class Engine, class Integral>
 std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
-rand_int(Engine& engine, Integral max)
+randInt(Engine& engine, Integral max)
 {
-    return rand_int(engine, Integral(0), max);
+    return randInt(engine, Integral(0), max);
 }
 
 template <class Integral>
 std::enable_if_t<std::is_integral_v<Integral>, Integral>
-rand_int(Integral max)
+randInt(Integral max)
 {
-    return rand_int(default_prng(), max);
+    return randInt(defaultPrng(), max);
 }
 
 template <class Integral, class Engine>
 std::enable_if_t<std::is_integral_v<Integral> && detail::is_engine<Engine>::value, Integral>
-rand_int(Engine& engine)
+randInt(Engine& engine)
 {
-    return rand_int(engine, std::numeric_limits<Integral>::max());
+    return randInt(engine, std::numeric_limits<Integral>::max());
 }
 
 template <class Integral = int>
 std::enable_if_t<std::is_integral_v<Integral>, Integral>
-rand_int()
+randInt()
 {
-    return rand_int(default_prng(), std::numeric_limits<Integral>::max());
+    return randInt(defaultPrng(), std::numeric_limits<Integral>::max());
 }
 /** @} */
 
@@ -145,17 +145,17 @@ std::enable_if_t<
     (std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>) &&
         detail::is_engine<Engine>::value,
     Byte>
-rand_byte(Engine& engine)
+randByte(Engine& engine)
 {
-    return static_cast<Byte>(rand_int<Engine, std::uint32_t>(
+    return static_cast<Byte>(randInt<Engine, std::uint32_t>(
         engine, std::numeric_limits<Byte>::min(), std::numeric_limits<Byte>::max()));
 }
 
 template <class Byte = std::uint8_t>
 std::enable_if_t<(std::is_same_v<Byte, unsigned char> || std::is_same_v<Byte, std::uint8_t>), Byte>
-rand_byte()
+randByte()
 {
-    return rand_byte<Byte>(default_prng());
+    return randByte<Byte>(defaultPrng());
 }
 /** @} */
 
@@ -163,15 +163,15 @@ rand_byte()
 /** @{ */
 template <class Engine>
 inline bool
-rand_bool(Engine& engine)
+randBool(Engine& engine)
 {
-    return rand_int(engine, 1) == 1;
+    return randInt(engine, 1) == 1;
 }
 
 inline bool
-rand_bool()
+randBool()
 {
-    return rand_bool(default_prng());
+    return randBool(defaultPrng());
 }
 /** @} */
 
diff --git a/include/xrpl/basics/safe_cast.h b/include/xrpl/basics/safe_cast.h
index c167e660ce..b9a7aa1fa0 100644
--- a/include/xrpl/basics/safe_cast.h
+++ b/include/xrpl/basics/safe_cast.h
@@ -18,29 +18,29 @@ concept SafeToCast = (std::is_integral_v<Src> && std::is_integral_v<Dest>) &&
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_integral_v<Src>, Dest>
-safe_cast(Src s) noexcept
+safeCast(Src s) noexcept
 {
     static_assert(
         std::is_signed_v<Dest> || std::is_unsigned_v<Src>, "Cannot cast signed to unsigned");
-    constexpr unsigned not_same = std::is_signed_v<Dest> != std::is_signed_v<Src>;
+    constexpr unsigned kNOT_SAME = std::is_signed_v<Dest> != std::is_signed_v<Src>;
     static_assert(
-        sizeof(Dest) >= sizeof(Src) + not_same,
+        sizeof(Dest) >= sizeof(Src) + kNOT_SAME,
         "Destination is too small to hold all values of source");
     return static_cast<Dest>(s);
 }
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_enum_v<Dest> && std::is_integral_v<Src>, Dest>
-safe_cast(Src s) noexcept
+safeCast(Src s) noexcept
 {
-    return static_cast<Dest>(safe_cast<std::underlying_type_t<Dest>>(s));
+    return static_cast<Dest>(safeCast<std::underlying_type_t<Dest>>(s));
 }
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_enum_v<Src>, Dest>
-safe_cast(Src s) noexcept
+safeCast(Src s) noexcept
 {
-    return safe_cast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
+    return safeCast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
 }
 
 // unsafe_cast explicitly flags a static_cast as not necessarily able to hold
@@ -49,7 +49,7 @@ safe_cast(Src s) noexcept
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_integral_v<Src>, Dest>
-unsafe_cast(Src s) noexcept
+unsafeCast(Src s) noexcept
 {
     static_assert(
         !SafeToCast<Src, Dest>,
@@ -60,22 +60,22 @@ unsafe_cast(Src s) noexcept
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_enum_v<Dest> && std::is_integral_v<Src>, Dest>
-unsafe_cast(Src s) noexcept
+unsafeCast(Src s) noexcept
 {
-    return static_cast<Dest>(unsafe_cast<std::underlying_type_t<Dest>>(s));
+    return static_cast<Dest>(unsafeCast<std::underlying_type_t<Dest>>(s));
 }
 
 template <class Dest, class Src>
 constexpr std::enable_if_t<std::is_integral_v<Dest> && std::is_enum_v<Src>, Dest>
-unsafe_cast(Src s) noexcept
+unsafeCast(Src s) noexcept
 {
-    return unsafe_cast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
+    return unsafeCast<Dest>(static_cast<std::underlying_type_t<Src>>(s));
 }
 
 template <class Dest, class Src>
     requires std::is_pointer_v<Dest>
 inline Dest
-safe_downcast(Src* s) noexcept
+safeDowncast(Src* s) noexcept
 {
 #ifdef NDEBUG
     return static_cast<Dest>(s);  // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
@@ -89,7 +89,7 @@ safe_downcast(Src* s) noexcept
 template <class Dest, class Src>
     requires std::is_lvalue_reference_v<Dest>
 inline Dest
-safe_downcast(Src& s) noexcept
+safeDowncast(Src& s) noexcept
 {
 #ifndef NDEBUG
     XRPL_ASSERT(
diff --git a/include/xrpl/basics/scope.h b/include/xrpl/basics/scope.h
index 1d5524ba35..64f91727fa 100644
--- a/include/xrpl/basics/scope.h
+++ b/include/xrpl/basics/scope.h
@@ -22,19 +22,19 @@ namespace xrpl {
 // to enforce this restriction.
 
 template <class EF>
-class scope_exit
+class ScopeExit
 {
     EF exit_function_;
     bool execute_on_destruction_{true};
 
 public:
-    ~scope_exit()
+    ~ScopeExit()
     {
         if (execute_on_destruction_)
             exit_function_();
     }
 
-    scope_exit(scope_exit&& rhs) noexcept(
+    ScopeExit(ScopeExit&& rhs) noexcept(
         std::is_nothrow_move_constructible_v<EF> || std::is_nothrow_copy_constructible_v<EF>)
         : exit_function_{std::forward<EF>(rhs.exit_function_)}
         , execute_on_destruction_{rhs.execute_on_destruction_}
@@ -42,14 +42,14 @@ public:
         rhs.release();
     }
 
-    scope_exit&
-    operator=(scope_exit&&) = delete;
+    ScopeExit&
+    operator=(ScopeExit&&) = delete;
 
     template <class EFP>
-    explicit scope_exit(
+    explicit ScopeExit(
         EFP&& f,
         std::enable_if_t<
-            !std::is_same_v<std::remove_cv_t<EFP>, scope_exit> &&
+            !std::is_same_v<std::remove_cv_t<EFP>, ScopeExit> &&
             std::is_constructible_v<EF, EFP>>* = 0) noexcept
         : exit_function_{std::forward<EFP>(f)}
     {
@@ -64,23 +64,23 @@ public:
 };
 
 template <class EF>
-scope_exit(EF) -> scope_exit<EF>;
+ScopeExit(EF) -> ScopeExit<EF>;
 
 template <class EF>
-class scope_fail
+class ScopeFail
 {
     EF exit_function_;
     bool execute_on_destruction_{true};
     int uncaught_on_creation_{std::uncaught_exceptions()};
 
 public:
-    ~scope_fail()
+    ~ScopeFail()
     {
         if (execute_on_destruction_ && std::uncaught_exceptions() > uncaught_on_creation_)
             exit_function_();
     }
 
-    scope_fail(scope_fail&& rhs) noexcept(
+    ScopeFail(ScopeFail&& rhs) noexcept(
         std::is_nothrow_move_constructible_v<EF> || std::is_nothrow_copy_constructible_v<EF>)
         : exit_function_{std::forward<EF>(rhs.exit_function_)}
         , execute_on_destruction_{rhs.execute_on_destruction_}
@@ -89,14 +89,14 @@ public:
         rhs.release();
     }
 
-    scope_fail&
-    operator=(scope_fail&&) = delete;
+    ScopeFail&
+    operator=(ScopeFail&&) = delete;
 
     template <class EFP>
-    explicit scope_fail(
+    explicit ScopeFail(
         EFP&& f,
         std::enable_if_t<
-            !std::is_same_v<std::remove_cv_t<EFP>, scope_fail> &&
+            !std::is_same_v<std::remove_cv_t<EFP>, ScopeFail> &&
             std::is_constructible_v<EF, EFP>>* = 0) noexcept
         : exit_function_{std::forward<EFP>(f)}
     {
@@ -111,23 +111,23 @@ public:
 };
 
 template <class EF>
-scope_fail(EF) -> scope_fail<EF>;
+ScopeFail(EF) -> ScopeFail<EF>;
 
 template <class EF>
-class scope_success
+class ScopeSuccess
 {
     EF exit_function_;
     bool execute_on_destruction_{true};
     int uncaught_on_creation_{std::uncaught_exceptions()};
 
 public:
-    ~scope_success() noexcept(noexcept(exit_function_()))
+    ~ScopeSuccess() noexcept(noexcept(exit_function_()))
     {
         if (execute_on_destruction_ && std::uncaught_exceptions() <= uncaught_on_creation_)
             exit_function_();
     }
 
-    scope_success(scope_success&& rhs) noexcept(
+    ScopeSuccess(ScopeSuccess&& rhs) noexcept(
         std::is_nothrow_move_constructible_v<EF> || std::is_nothrow_copy_constructible_v<EF>)
         : exit_function_{std::forward<EF>(rhs.exit_function_)}
         , execute_on_destruction_{rhs.execute_on_destruction_}
@@ -136,14 +136,14 @@ public:
         rhs.release();
     }
 
-    scope_success&
-    operator=(scope_success&&) = delete;
+    ScopeSuccess&
+    operator=(ScopeSuccess&&) = delete;
 
     template <class EFP>
-    explicit scope_success(
+    explicit ScopeSuccess(
         EFP&& f,
         std::enable_if_t<
-            !std::is_same_v<std::remove_cv_t<EFP>, scope_success> &&
+            !std::is_same_v<std::remove_cv_t<EFP>, ScopeSuccess> &&
             std::is_constructible_v<EF, EFP>>* =
             0) noexcept(std::is_nothrow_constructible_v<EF, EFP> || std::is_nothrow_constructible_v<EF, EFP&>)
         : exit_function_{std::forward<EFP>(f)}
@@ -158,7 +158,7 @@ public:
 };
 
 template <class EF>
-scope_success(EF) -> scope_success<EF>;
+ScopeSuccess(EF) -> ScopeSuccess<EF>;
 
 /**
     Automatically unlocks and re-locks a unique_lock object.
@@ -198,29 +198,29 @@ scope_success(EF) -> scope_success<EF>;
 */
 
 template <class Mutex>
-class scope_unlock
+class ScopeUnlock
 {
-    std::unique_lock<Mutex>* plock;
+    std::unique_lock<Mutex>* plock_;
 
 public:
-    explicit scope_unlock(std::unique_lock<Mutex>& lock) noexcept(true) : plock(&lock)
+    explicit ScopeUnlock(std::unique_lock<Mutex>& lock) noexcept(true) : plock_(&lock)
     {
-        XRPL_ASSERT(plock->owns_lock(), "xrpl::scope_unlock::scope_unlock : mutex must be locked");
-        plock->unlock();
+        XRPL_ASSERT(plock_->owns_lock(), "xrpl::scope_unlock::scope_unlock : mutex must be locked");
+        plock_->unlock();
     }
 
     // Immovable type
-    scope_unlock(scope_unlock const&) = delete;
-    scope_unlock&
-    operator=(scope_unlock const&) = delete;
+    ScopeUnlock(ScopeUnlock const&) = delete;
+    ScopeUnlock&
+    operator=(ScopeUnlock const&) = delete;
 
-    ~scope_unlock() noexcept(true)
+    ~ScopeUnlock() noexcept(true)
     {
-        plock->lock();
+        plock_->lock();
     }
 };
 
 template <class Mutex>
-scope_unlock(std::unique_lock<Mutex>&) -> scope_unlock<Mutex>;
+ScopeUnlock(std::unique_lock<Mutex>&) -> ScopeUnlock<Mutex>;
 
 }  // namespace xrpl
diff --git a/include/xrpl/basics/spinlock.h b/include/xrpl/basics/spinlock.h
index eb60e85962..3518b94680 100644
--- a/include/xrpl/basics/spinlock.h
+++ b/include/xrpl/basics/spinlock.h
@@ -26,7 +26,7 @@ namespace detail {
     specific amount of time, to prevent this.
  */
 inline void
-spin_pause() noexcept
+spinPause() noexcept
 {
 #ifdef __aarch64__
     asm volatile("yield");
@@ -71,7 +71,7 @@ spin_pause() noexcept
         https://en.cppreference.com/w/cpp/named_req/Lockable
  */
 template <class T>
-class packed_spinlock
+class PackedSpinlock
 {
     // clang-format off
     static_assert(std::is_unsigned_v<T>);
@@ -87,9 +87,9 @@ private:
     T const mask_;
 
 public:
-    packed_spinlock(packed_spinlock const&) = delete;
-    packed_spinlock&
-    operator=(packed_spinlock const&) = delete;
+    PackedSpinlock(PackedSpinlock const&) = delete;
+    PackedSpinlock&
+    operator=(PackedSpinlock const&) = delete;
 
     /** A single spinlock packed inside the specified atomic
 
@@ -99,8 +99,7 @@ public:
         @note For performance reasons, you should strive to have `lock` be
               on a cacheline by itself.
      */
-    packed_spinlock(std::atomic<T>& lock, int index)
-        : bits_(lock), mask_(static_cast<T>(1) << index)
+    PackedSpinlock(std::atomic<T>& lock, int index) : bits_(lock), mask_(static_cast<T>(1) << index)
     {
         XRPL_ASSERT(
             index >= 0 && (mask_ != 0),
@@ -108,7 +107,7 @@ public:
     }
 
     [[nodiscard]] bool
-    try_lock()
+    try_lock()  // NOLINT(readability-identifier-naming)
     {
         return (bits_.fetch_or(mask_, std::memory_order_acquire) & mask_) == 0;
     }
@@ -123,7 +122,7 @@ public:
             // of contention by avoiding writes that would definitely not
             // result in the lock being acquired.
             while ((bits_.load(std::memory_order_relaxed) & mask_) != 0)
-                detail::spin_pause();
+                detail::spinPause();
         }
     }
 
@@ -147,7 +146,7 @@ public:
         https://en.cppreference.com/w/cpp/named_req/Lockable
  */
 template <class T>
-class spinlock
+class Spinlock
 {
     static_assert(std::is_unsigned_v<T>);
     static_assert(std::atomic<T>::is_always_lock_free);
@@ -156,9 +155,9 @@ private:
     std::atomic<T>& lock_;
 
 public:
-    spinlock(spinlock const&) = delete;
-    spinlock&
-    operator=(spinlock const&) = delete;
+    Spinlock(Spinlock const&) = delete;
+    Spinlock&
+    operator=(Spinlock const&) = delete;
 
     /** Grabs the
 
@@ -167,12 +166,12 @@ public:
         @note For performance reasons, you should strive to have `lock` be
               on a cacheline by itself.
      */
-    spinlock(std::atomic<T>& lock) : lock_(lock)
+    Spinlock(std::atomic<T>& lock) : lock_(lock)
     {
     }
 
     [[nodiscard]] bool
-    try_lock()
+    try_lock()  // NOLINT(readability-identifier-naming)
     {
         T expected = 0;
 
@@ -193,7 +192,7 @@ public:
             // of contention by avoiding writes that would definitely not
             // result in the lock being acquired.
             while (lock_.load(std::memory_order_relaxed) != 0)
-                detail::spin_pause();
+                detail::spinPause();
         }
     }
 
diff --git a/include/xrpl/basics/tagged_integer.h b/include/xrpl/basics/tagged_integer.h
index 129c586126..ddcde479f3 100644
--- a/include/xrpl/basics/tagged_integer.h
+++ b/include/xrpl/basics/tagged_integer.h
@@ -23,171 +23,171 @@ namespace xrpl {
     allowed arithmetic operations.
 */
 template <class Int, class Tag>
-class tagged_integer : boost::totally_ordered<
-                           tagged_integer<Int, Tag>,
-                           boost::integer_arithmetic<
-                               tagged_integer<Int, Tag>,
-                               boost::bitwise<
-                                   tagged_integer<Int, Tag>,
-                                   boost::unit_steppable<
-                                       tagged_integer<Int, Tag>,
-                                       boost::shiftable<tagged_integer<Int, Tag>>>>>>
+class TaggedInteger : boost::totally_ordered<
+                          TaggedInteger<Int, Tag>,
+                          boost::integer_arithmetic<
+                              TaggedInteger<Int, Tag>,
+                              boost::bitwise<
+                                  TaggedInteger<Int, Tag>,
+                                  boost::unit_steppable<
+                                      TaggedInteger<Int, Tag>,
+                                      boost::shiftable<TaggedInteger<Int, Tag>>>>>>
 {
 private:
-    Int m_value;
+    Int value_;
 
 public:
     using value_type = Int;
     using tag_type = Tag;
 
-    tagged_integer() = default;
+    TaggedInteger() = default;
 
     template <
         class OtherInt,
         class = std::enable_if_t<std::is_integral_v<OtherInt> && sizeof(OtherInt) <= sizeof(Int)>>
-    explicit constexpr tagged_integer(OtherInt value) noexcept : m_value(value)
+    explicit constexpr TaggedInteger(OtherInt value) noexcept : value_(value)
     {
-        static_assert(sizeof(tagged_integer) == sizeof(Int), "tagged_integer is adding padding");
+        static_assert(sizeof(TaggedInteger) == sizeof(Int), "tagged_integer is adding padding");
     }
 
     bool
-    operator<(tagged_integer const& rhs) const noexcept
+    operator<(TaggedInteger const& rhs) const noexcept
     {
-        return m_value < rhs.m_value;
+        return value_ < rhs.value_;
     }
 
     bool
-    operator==(tagged_integer const& rhs) const noexcept
+    operator==(TaggedInteger const& rhs) const noexcept
     {
-        return m_value == rhs.m_value;
+        return value_ == rhs.value_;
     }
 
-    tagged_integer&
-    operator+=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator+=(TaggedInteger const& rhs) noexcept
     {
-        m_value += rhs.m_value;
+        value_ += rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator-=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator-=(TaggedInteger const& rhs) noexcept
     {
-        m_value -= rhs.m_value;
+        value_ -= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator*=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator*=(TaggedInteger const& rhs) noexcept
     {
-        m_value *= rhs.m_value;
+        value_ *= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator/=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator/=(TaggedInteger const& rhs) noexcept
     {
-        m_value /= rhs.m_value;
+        value_ /= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator%=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator%=(TaggedInteger const& rhs) noexcept
     {
-        m_value %= rhs.m_value;
+        value_ %= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator|=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator|=(TaggedInteger const& rhs) noexcept
     {
-        m_value |= rhs.m_value;
+        value_ |= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator&=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator&=(TaggedInteger const& rhs) noexcept
     {
-        m_value &= rhs.m_value;
+        value_ &= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator^=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator^=(TaggedInteger const& rhs) noexcept
     {
-        m_value ^= rhs.m_value;
+        value_ ^= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator<<=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator<<=(TaggedInteger const& rhs) noexcept
     {
-        m_value <<= rhs.m_value;
+        value_ <<= rhs.value_;
         return *this;
     }
 
-    tagged_integer&
-    operator>>=(tagged_integer const& rhs) noexcept
+    TaggedInteger&
+    operator>>=(TaggedInteger const& rhs) noexcept
     {
-        m_value >>= rhs.m_value;
+        value_ >>= rhs.value_;
         return *this;
     }
 
-    tagged_integer
+    TaggedInteger
     operator~() const noexcept
     {
-        return tagged_integer{~m_value};
+        return TaggedInteger{~value_};
     }
 
-    tagged_integer
+    TaggedInteger
     operator+() const noexcept
     {
         return *this;
     }
 
-    tagged_integer
+    TaggedInteger
     operator-() const noexcept
     {
-        return tagged_integer{-m_value};
+        return TaggedInteger{-value_};
     }
 
-    tagged_integer&
+    TaggedInteger&
     operator++() noexcept
     {
-        ++m_value;
+        ++value_;
         return *this;
     }
 
-    tagged_integer&
+    TaggedInteger&
     operator--() noexcept
     {
-        --m_value;
+        --value_;
         return *this;
     }
 
     explicit
     operator Int() const noexcept
     {
-        return m_value;
+        return value_;
     }
 
     friend std::ostream&
-    operator<<(std::ostream& s, tagged_integer const& t)
+    operator<<(std::ostream& s, TaggedInteger const& t)
     {
-        s << t.m_value;
+        s << t.value_;
         return s;
     }
 
     friend std::istream&
-    operator>>(std::istream& s, tagged_integer& t)
+    operator>>(std::istream& s, TaggedInteger& t)
     {
-        s >> t.m_value;
+        s >> t.value_;
         return s;
     }
 
     friend std::string
-    to_string(tagged_integer const& t)
+    to_string(TaggedInteger const& t)
     {
-        return std::to_string(t.m_value);
+        return std::to_string(t.value_);
     }
 };
 
@@ -195,10 +195,10 @@ public:
 
 namespace beast {
 template <class Int, class Tag, class HashAlgorithm>
-struct is_contiguously_hashable<xrpl::tagged_integer<Int, Tag>, HashAlgorithm>
-    : public is_contiguously_hashable<Int, HashAlgorithm>
+struct IsContiguouslyHashable<xrpl::TaggedInteger<Int, Tag>, HashAlgorithm>
+    : public IsContiguouslyHashable<Int, HashAlgorithm>
 {
-    explicit is_contiguously_hashable() = default;
+    explicit IsContiguouslyHashable() = default;
 };
 
 }  // namespace beast
diff --git a/include/xrpl/beast/asio/io_latency_probe.h b/include/xrpl/beast/asio/io_latency_probe.h
index f85f399196..4ba985e579 100644
--- a/include/xrpl/beast/asio/io_latency_probe.h
+++ b/include/xrpl/beast/asio/io_latency_probe.h
@@ -15,44 +15,44 @@ namespace beast {
 
 /** Measures handler latency on an io_context queue. */
 template <class Clock>
-class io_latency_probe
+class IoLatencyProbe
 {
 private:
     using duration = typename Clock::duration;
     using time_point = typename Clock::time_point;
 
-    std::recursive_mutex m_mutex;
-    std::condition_variable_any m_cond;
-    std::size_t m_count{1};
-    duration const m_period;
-    boost::asio::io_context& m_ios;
-    boost::asio::basic_waitable_timer<std::chrono::steady_clock> m_timer;
-    bool m_cancel{false};
+    std::recursive_mutex mutex_;
+    std::condition_variable_any cond_;
+    std::size_t count_{1};
+    duration const period_;
+    boost::asio::io_context& ios_;
+    boost::asio::basic_waitable_timer<std::chrono::steady_clock> timer_;
+    bool cancel_{false};
 
 public:
-    io_latency_probe(duration const& period, boost::asio::io_context& ios)
-        : m_period(period), m_ios(ios), m_timer(m_ios)
+    IoLatencyProbe(duration const& period, boost::asio::io_context& ios)
+        : period_(period), ios_(ios), timer_(ios_)
     {
     }
 
-    ~io_latency_probe()
+    ~IoLatencyProbe()
     {
-        std::unique_lock<decltype(m_mutex)> lock(m_mutex);
+        std::unique_lock<decltype(mutex_)> lock(mutex_);
         cancel(lock, true);
     }
 
     /** Return the io_context associated with the latency probe. */
     /** @{ */
     boost::asio::io_context&
-    get_io_context()
+    getIoContext()
     {
-        return m_ios;
+        return ios_;
     }
 
     [[nodiscard]] boost::asio::io_context const&
-    get_io_context() const
+    getIoContext() const
     {
-        return m_ios;
+        return ios_;
     }
     /** @} */
 
@@ -63,14 +63,14 @@ public:
     void
     cancel()
     {
-        std::unique_lock<decltype(m_mutex)> lock(m_mutex);
+        std::unique_lock<decltype(mutex_)> lock(mutex_);
         cancel(lock, true);
     }
 
     void
-    cancel_async()
+    cancelAsync()
     {
-        std::unique_lock<decltype(m_mutex)> lock(m_mutex);
+        std::unique_lock<decltype(mutex_)> lock(mutex_);
         cancel(lock, false);
     }
     /** @} */
@@ -81,13 +81,13 @@ public:
     */
     template <class Handler>
     void
-    sample_one(Handler&& handler)
+    sampleOne(Handler&& handler)
     {
-        std::scoped_lock const lock(m_mutex);
-        if (m_cancel)
+        std::scoped_lock const lock(mutex_);
+        if (cancel_)
             throw std::logic_error("io_latency_probe is canceled");
         boost::asio::post(
-            m_ios, sample_op<Handler>(std::forward<Handler>(handler), Clock::now(), false, this));
+            ios_, SampleOp<Handler>(std::forward<Handler>(handler), Clock::now(), false, this));
     }
 
     /** Initiate continuous i/o latency sampling.
@@ -98,125 +98,123 @@ public:
     void
     sample(Handler&& handler)
     {
-        std::scoped_lock const lock(m_mutex);
-        if (m_cancel)
+        std::scoped_lock const lock(mutex_);
+        if (cancel_)
             throw std::logic_error("io_latency_probe is canceled");
         boost::asio::post(
-            m_ios, sample_op<Handler>(std::forward<Handler>(handler), Clock::now(), true, this));
+            ios_, SampleOp<Handler>(std::forward<Handler>(handler), Clock::now(), true, this));
     }
 
 private:
     void
-    cancel(std::unique_lock<decltype(m_mutex)>& lock, bool wait)
+    cancel(std::unique_lock<decltype(mutex_)>& lock, bool wait)
     {
-        if (!m_cancel)
+        if (!cancel_)
         {
-            --m_count;
-            m_cancel = true;
+            --count_;
+            cancel_ = true;
         }
 
         if (wait)
-            m_cond.wait(lock, [this] { return this->m_count == 0; });
+            cond_.wait(lock, [this] { return this->count_ == 0; });
     }
 
     void
     addref()
     {
-        std::scoped_lock const lock(m_mutex);
-        ++m_count;
+        std::scoped_lock const lock(mutex_);
+        ++count_;
     }
 
     void
     release()
     {
-        std::scoped_lock const lock(m_mutex);
-        if (--m_count == 0)
-            m_cond.notify_all();
+        std::scoped_lock const lock(mutex_);
+        if (--count_ == 0)
+            cond_.notify_all();
     }
 
     template <class Handler>
-    struct sample_op
+    struct SampleOp
     {
-        Handler m_handler;
-        time_point m_start;
-        bool m_repeat;
-        io_latency_probe* m_probe;
+        Handler handler;
+        time_point start;
+        bool repeat;
+        IoLatencyProbe* probe;
 
-        sample_op(
+        SampleOp(
             Handler const& handler,
             time_point const& start,
             bool repeat,
-            io_latency_probe* probe)
-            : m_handler(handler), m_start(start), m_repeat(repeat), m_probe(probe)
+            IoLatencyProbe* probe)
+            : handler(handler), start(start), repeat(repeat), probe(probe)
         {
             XRPL_ASSERT(
-                m_probe,
+                probe,
                 "beast::io_latency_probe::sample_op::sample_op : non-null "
                 "probe input");
-            m_probe->addref();
+            probe->addref();
         }
 
-        sample_op(sample_op&& from) noexcept
-            : m_handler(std::move(from.m_handler))
-            , m_start(from.m_start)
-            , m_repeat(from.m_repeat)
-            , m_probe(from.m_probe)
+        SampleOp(SampleOp&& from) noexcept
+            : handler(std::move(from.handler))
+            , start(from.start)
+            , repeat(from.repeat)
+            , probe(from.probe)
         {
             XRPL_ASSERT(
-                m_probe,
+                probe,
                 "beast::io_latency_probe::sample_op::sample_op(sample_op&&) : "
                 "non-null probe input");
-            from.m_probe = nullptr;
+            from.probe = nullptr;
         }
 
-        sample_op(sample_op const&) = delete;
-        sample_op
-        operator=(sample_op const&) = delete;
-        sample_op&
-        operator=(sample_op&&) = delete;
+        SampleOp(SampleOp const&) = delete;
+        SampleOp
+        operator=(SampleOp const&) = delete;
+        SampleOp&
+        operator=(SampleOp&&) = delete;
 
-        ~sample_op()
+        ~SampleOp()
         {
-            if (m_probe)
-                m_probe->release();
+            if (probe)
+                probe->release();
         }
 
         void
         operator()() const
         {
-            if (m_probe == nullptr)
+            if (probe == nullptr)
                 return;
             typename Clock::time_point const now(Clock::now());
-            typename Clock::duration const elapsed(now - m_start);
+            typename Clock::duration const elapsed(now - start);
 
-            m_handler(elapsed);
+            handler(elapsed);
 
             {
-                std::scoped_lock const lock(m_probe->m_mutex);
-                if (m_probe->m_cancel)
+                std::scoped_lock const lock(probe->mutex_);
+                if (probe->cancel_)
                     return;
             }
 
-            if (m_repeat)
+            if (repeat)
             {
                 // Calculate when we want to sample again, and
                 // adjust for the expected latency.
                 //
-                typename Clock::time_point const when(now + m_probe->m_period - (2 * elapsed));
+                typename Clock::time_point const when(now + probe->period_ - (2 * elapsed));
 
                 if (when <= now)
                 {
                     // The latency is too high to maintain the desired
                     // period so don't bother with a timer.
                     //
-                    boost::asio::post(
-                        m_probe->m_ios, sample_op<Handler>(m_handler, now, m_repeat, m_probe));
+                    boost::asio::post(probe->ios_, SampleOp<Handler>(handler, now, repeat, probe));
                 }
                 else
                 {
-                    m_probe->m_timer.expires_after(when - now);
-                    m_probe->m_timer.async_wait(
-                        sample_op<Handler>(m_handler, now, m_repeat, m_probe));
+                    probe->timer_.expires_after(when - now);
+                    probe->timer_.async_wait(SampleOp<Handler>(handler, now, repeat, probe));
                 }
             }
         }
@@ -224,11 +222,10 @@ private:
         void
         operator()(boost::system::error_code const& ec)
         {
-            if (m_probe == nullptr)
+            if (probe == nullptr)
                 return;
             typename Clock::time_point const now(Clock::now());
-            boost::asio::post(
-                m_probe->m_ios, sample_op<Handler>(m_handler, now, m_repeat, m_probe));
+            boost::asio::post(probe->ios_, SampleOp<Handler>(handler, now, repeat, probe));
         }
     };
 };
diff --git a/include/xrpl/beast/clock/abstract_clock.h b/include/xrpl/beast/clock/abstract_clock.h
index 09de3f891d..67320ceabc 100644
--- a/include/xrpl/beast/clock/abstract_clock.h
+++ b/include/xrpl/beast/clock/abstract_clock.h
@@ -31,7 +31,7 @@ namespace beast {
         http://en.cppreference.com/w/cpp/concept/Clock
 */
 template <class Clock>
-class abstract_clock
+class AbstractClock
 {
 public:
     using rep = typename Clock::rep;
@@ -40,11 +40,11 @@ public:
     using time_point = typename Clock::time_point;
     using clock_type = Clock;
 
-    static bool const is_steady = Clock::is_steady;
+    static bool const is_steady = Clock::is_steady;  // NOLINT(readability-identifier-naming)
 
-    virtual ~abstract_clock() = default;
-    abstract_clock() = default;
-    abstract_clock(abstract_clock const&) = default;
+    virtual ~AbstractClock() = default;
+    AbstractClock() = default;
+    AbstractClock(AbstractClock const&) = default;
 
     /** Returns the current time. */
     [[nodiscard]] virtual time_point
@@ -56,12 +56,12 @@ public:
 namespace detail {
 
 template <class Facade, class Clock>
-struct abstract_clock_wrapper : public abstract_clock<Facade>
+struct AbstractClockWrapper : public AbstractClock<Facade>
 {
-    explicit abstract_clock_wrapper() = default;
+    explicit AbstractClockWrapper() = default;
 
-    using typename abstract_clock<Facade>::duration;
-    using typename abstract_clock<Facade>::time_point;
+    using typename AbstractClock<Facade>::duration;
+    using typename AbstractClock<Facade>::time_point;
 
     [[nodiscard]] time_point
     now() const override
@@ -80,11 +80,11 @@ struct abstract_clock_wrapper : public abstract_clock<Facade>
     @tparam Clock The actual concrete clock to use.
 */
 template <class Facade, class Clock = Facade>
-abstract_clock<Facade>&
-get_abstract_clock()
+AbstractClock<Facade>&
+getAbstractClock()
 {
-    static detail::abstract_clock_wrapper<Facade, Clock> clock;
-    return clock;
+    static detail::AbstractClockWrapper<Facade, Clock> kCLOCK;
+    return kCLOCK;
 }
 
 }  // namespace beast
diff --git a/include/xrpl/beast/clock/basic_seconds_clock.h b/include/xrpl/beast/clock/basic_seconds_clock.h
index 5205d92fef..8460dbe26b 100644
--- a/include/xrpl/beast/clock/basic_seconds_clock.h
+++ b/include/xrpl/beast/clock/basic_seconds_clock.h
@@ -13,19 +13,20 @@ namespace beast {
     @tparam Clock A type meeting these requirements:
         http://en.cppreference.com/w/cpp/concept/Clock
 */
-class basic_seconds_clock
+class BasicSecondsClock
 {
 public:
     using Clock = std::chrono::steady_clock;
 
-    explicit basic_seconds_clock() = default;
+    explicit BasicSecondsClock() = default;
 
     using rep = typename Clock::rep;
     using period = typename Clock::period;
     using duration = typename Clock::duration;
     using time_point = typename Clock::time_point;
 
-    static bool const is_steady = Clock::is_steady;
+    static bool const is_steady =  // NOLINT(readability-identifier-naming)
+        Clock::is_steady;
 
     static time_point
     now();
diff --git a/include/xrpl/beast/clock/manual_clock.h b/include/xrpl/beast/clock/manual_clock.h
index 3cabdc0ea8..8b3e4e63c6 100644
--- a/include/xrpl/beast/clock/manual_clock.h
+++ b/include/xrpl/beast/clock/manual_clock.h
@@ -17,18 +17,18 @@ namespace beast {
         http://en.cppreference.com/w/cpp/concept/Clock
 */
 template <class Clock>
-class manual_clock : public abstract_clock<Clock>
+class ManualClock : public AbstractClock<Clock>
 {
 public:
-    using typename abstract_clock<Clock>::rep;
-    using typename abstract_clock<Clock>::duration;
-    using typename abstract_clock<Clock>::time_point;
+    using typename AbstractClock<Clock>::rep;
+    using typename AbstractClock<Clock>::duration;
+    using typename AbstractClock<Clock>::time_point;
 
 private:
     time_point now_;
 
 public:
-    explicit manual_clock(time_point const& now = time_point(duration(0))) : now_(now)
+    explicit ManualClock(time_point const& now = time_point(duration(0))) : now_(now)
     {
     }
 
@@ -44,16 +44,16 @@ public:
     {
         XRPL_ASSERT(
             !Clock::is_steady || when >= now_,
-            "beast::manual_clock::set(time_point) : forward input");
+            "beast::ManualClock::set(time_point) : forward input");
         now_ = when;
     }
 
     /** Convenience for setting the time in seconds from epoch. */
     template <class Integer>
     void
-    set(Integer seconds_from_epoch)
+    set(Integer secondsFromEpoch)
     {
-        set(time_point(duration(std::chrono::seconds(seconds_from_epoch))));
+        set(time_point(duration(std::chrono::seconds(secondsFromEpoch))));
     }
 
     /** Advance the clock by a duration. */
@@ -63,12 +63,12 @@ public:
     {
         XRPL_ASSERT(
             !Clock::is_steady || (now_ + elapsed) >= now_,
-            "beast::manual_clock::advance(duration) : forward input");
+            "beast::ManualClock::advance(duration) : forward input");
         now_ += elapsed;
     }
 
     /** Convenience for advancing the clock by one second. */
-    manual_clock&
+    ManualClock&
     operator++()
     {
         advance(std::chrono::seconds(1));
diff --git a/include/xrpl/beast/container/aged_container.h b/include/xrpl/beast/container/aged_container.h
index dd622fcd9a..4b486440c9 100644
--- a/include/xrpl/beast/container/aged_container.h
+++ b/include/xrpl/beast/container/aged_container.h
@@ -5,9 +5,9 @@
 namespace beast {
 
 template <class T>
-struct is_aged_container : std::false_type
+struct IsAgedContainer : std::false_type
 {
-    explicit is_aged_container() = default;
+    explicit IsAgedContainer() = default;
 };
 
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_container_utility.h b/include/xrpl/beast/container/aged_container_utility.h
index 47aa8a5e66..879672e9cf 100644
--- a/include/xrpl/beast/container/aged_container_utility.h
+++ b/include/xrpl/beast/container/aged_container_utility.h
@@ -9,7 +9,7 @@ namespace beast {
 
 /** Expire aged container items past the specified age. */
 template <class AgedContainer, class Rep, class Period>
-std::enable_if_t<is_aged_container<AgedContainer>::value, std::size_t>
+std::enable_if_t<IsAgedContainer<AgedContainer>::value, std::size_t>
 expire(AgedContainer& c, std::chrono::duration<Rep, Period> const& age)
 {
     std::size_t n(0);
diff --git a/include/xrpl/beast/container/aged_map.h b/include/xrpl/beast/container/aged_map.h
index 3815f44329..c1f6943451 100644
--- a/include/xrpl/beast/container/aged_map.h
+++ b/include/xrpl/beast/container/aged_map.h
@@ -14,6 +14,6 @@ template <
     class Clock = std::chrono::steady_clock,
     class Compare = std::less<Key>,
     class Allocator = std::allocator<std::pair<Key const, T>>>
-using aged_map = detail::aged_ordered_container<false, true, Key, T, Clock, Compare, Allocator>;
+using aged_map = detail::AgedOrderedContainer<false, true, Key, T, Clock, Compare, Allocator>;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_multimap.h b/include/xrpl/beast/container/aged_multimap.h
index bb098b63b2..65efd1bbf9 100644
--- a/include/xrpl/beast/container/aged_multimap.h
+++ b/include/xrpl/beast/container/aged_multimap.h
@@ -14,6 +14,6 @@ template <
     class Clock = std::chrono::steady_clock,
     class Compare = std::less<Key>,
     class Allocator = std::allocator<std::pair<Key const, T>>>
-using aged_multimap = detail::aged_ordered_container<true, true, Key, T, Clock, Compare, Allocator>;
+using aged_multimap = detail::AgedOrderedContainer<true, true, Key, T, Clock, Compare, Allocator>;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_multiset.h b/include/xrpl/beast/container/aged_multiset.h
index 60682db0ca..c31afb8c26 100644
--- a/include/xrpl/beast/container/aged_multiset.h
+++ b/include/xrpl/beast/container/aged_multiset.h
@@ -14,5 +14,6 @@ template <
     class Compare = std::less<Key>,
     class Allocator = std::allocator<Key>>
 using aged_multiset =
-    detail::aged_ordered_container<true, false, Key, void, Clock, Compare, Allocator>;
+    detail::AgedOrderedContainer<true, false, Key, void, Clock, Compare, Allocator>;
+
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_set.h b/include/xrpl/beast/container/aged_set.h
index 76ff40b63a..280572be79 100644
--- a/include/xrpl/beast/container/aged_set.h
+++ b/include/xrpl/beast/container/aged_set.h
@@ -13,6 +13,6 @@ template <
     class Clock = std::chrono::steady_clock,
     class Compare = std::less<Key>,
     class Allocator = std::allocator<Key>>
-using aged_set = detail::aged_ordered_container<false, false, Key, void, Clock, Compare, Allocator>;
+using aged_set = detail::AgedOrderedContainer<false, false, Key, void, Clock, Compare, Allocator>;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_unordered_map.h b/include/xrpl/beast/container/aged_unordered_map.h
index ea53320e91..a2189e2409 100644
--- a/include/xrpl/beast/container/aged_unordered_map.h
+++ b/include/xrpl/beast/container/aged_unordered_map.h
@@ -16,5 +16,6 @@ template <
     class KeyEqual = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, T>>>
 using aged_unordered_map =
-    detail::aged_unordered_container<false, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
+    detail::AgedUnorderedContainer<false, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
+
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_unordered_multimap.h b/include/xrpl/beast/container/aged_unordered_multimap.h
index 9cb1443cad..f1348ed39f 100644
--- a/include/xrpl/beast/container/aged_unordered_multimap.h
+++ b/include/xrpl/beast/container/aged_unordered_multimap.h
@@ -16,5 +16,6 @@ template <
     class KeyEqual = std::equal_to<Key>,
     class Allocator = std::allocator<std::pair<Key const, T>>>
 using aged_unordered_multimap =
-    detail::aged_unordered_container<true, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
+    detail::AgedUnorderedContainer<true, true, Key, T, Clock, Hash, KeyEqual, Allocator>;
+
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_unordered_multiset.h b/include/xrpl/beast/container/aged_unordered_multiset.h
index ced01987aa..a178c62544 100644
--- a/include/xrpl/beast/container/aged_unordered_multiset.h
+++ b/include/xrpl/beast/container/aged_unordered_multiset.h
@@ -15,6 +15,6 @@ template <
     class KeyEqual = std::equal_to<Key>,
     class Allocator = std::allocator<Key>>
 using aged_unordered_multiset =
-    detail::aged_unordered_container<true, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
+    detail::AgedUnorderedContainer<true, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/container/aged_unordered_set.h b/include/xrpl/beast/container/aged_unordered_set.h
index 3f4575f6bc..b37ec23e90 100644
--- a/include/xrpl/beast/container/aged_unordered_set.h
+++ b/include/xrpl/beast/container/aged_unordered_set.h
@@ -15,5 +15,6 @@ template <
     class KeyEqual = std::equal_to<Key>,
     class Allocator = std::allocator<Key>>
 using aged_unordered_set =
-    detail::aged_unordered_container<false, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
+    detail::AgedUnorderedContainer<false, false, Key, void, Clock, Hash, KeyEqual, Allocator>;
+
 }  // namespace beast
diff --git a/include/xrpl/beast/container/detail/aged_associative_container.h b/include/xrpl/beast/container/detail/aged_associative_container.h
index 5d3534004c..54246c8e39 100644
--- a/include/xrpl/beast/container/detail/aged_associative_container.h
+++ b/include/xrpl/beast/container/detail/aged_associative_container.h
@@ -3,10 +3,10 @@
 namespace beast::detail {
 
 // Extracts the key portion of value
-template <bool maybe_map>
-struct aged_associative_container_extract_t
+template <bool MaybeMap>
+struct AgedAssociativeContainerExtractT
 {
-    explicit aged_associative_container_extract_t() = default;
+    explicit AgedAssociativeContainerExtractT() = default;
 
     template <class Value>
     decltype(Value::first) const&
@@ -17,9 +17,9 @@ struct aged_associative_container_extract_t
 };
 
 template <>
-struct aged_associative_container_extract_t<false>
+struct AgedAssociativeContainerExtractT<false>
 {
-    explicit aged_associative_container_extract_t() = default;
+    explicit AgedAssociativeContainerExtractT() = default;
 
     template <class Value>
     Value const&
diff --git a/include/xrpl/beast/container/detail/aged_container_iterator.h b/include/xrpl/beast/container/detail/aged_container_iterator.h
index ffa251b7a6..8d44646cd4 100644
--- a/include/xrpl/beast/container/detail/aged_container_iterator.h
+++ b/include/xrpl/beast/container/detail/aged_container_iterator.h
@@ -12,137 +12,136 @@ class aged_ordered_container;
 namespace detail {
 
 // If Iterator is SCARY then this iterator will be as well.
-template <bool is_const, class Iterator>
-class aged_container_iterator
+template <bool IsConst, class Iterator>
+class AgedContainerIterator
 {
 public:
     using iterator_category = typename std::iterator_traits<Iterator>::iterator_category;
     using value_type = std::conditional_t<
-        is_const,
-        typename Iterator::value_type::stashed::value_type const,
-        typename Iterator::value_type::stashed::value_type>;
+        IsConst,
+        typename Iterator::value_type::Stashed::value_type const,
+        typename Iterator::value_type::Stashed::value_type>;
     using difference_type = typename std::iterator_traits<Iterator>::difference_type;
     using pointer = value_type*;
     using reference = value_type&;
-    using time_point = typename Iterator::value_type::stashed::time_point;
+    using time_point = typename Iterator::value_type::Stashed::time_point;
 
-    aged_container_iterator() = default;
+    AgedContainerIterator() = default;
 
     // Disable constructing a const_iterator from a non-const_iterator.
     // Converting between reverse and non-reverse iterators should be explicit.
     template <
-        bool other_is_const,
+        bool OtherIsConst,
         class OtherIterator,
         class = std::enable_if_t<
-            (!other_is_const || is_const) &&
+            (!OtherIsConst || IsConst) &&
             !static_cast<bool>(std::is_same_v<Iterator, OtherIterator>)>>
-    explicit aged_container_iterator(
-        aged_container_iterator<other_is_const, OtherIterator> const& other)
-        : m_iter(other.m_iter)
+    explicit AgedContainerIterator(AgedContainerIterator<OtherIsConst, OtherIterator> const& other)
+        : iter_(other.iter_)
     {
     }
 
     // Disable constructing a const_iterator from a non-const_iterator.
-    template <bool other_is_const, class = std::enable_if_t<!other_is_const || is_const>>
-    aged_container_iterator(aged_container_iterator<other_is_const, Iterator> const& other)
-        : m_iter(other.m_iter)
+    template <bool OtherIsConst, class = std::enable_if_t<!OtherIsConst || IsConst>>
+    AgedContainerIterator(AgedContainerIterator<OtherIsConst, Iterator> const& other)
+        : iter_(other.iter_)
     {
     }
 
     // Disable assigning a const_iterator to a non-const iterator
-    template <bool other_is_const, class OtherIterator>
+    template <bool OtherIsConst, class OtherIterator>
     auto
-    operator=(aged_container_iterator<other_is_const, OtherIterator> const& other)
-        -> std::enable_if_t<!other_is_const || is_const, aged_container_iterator&>
+    operator=(AgedContainerIterator<OtherIsConst, OtherIterator> const& other)
+        -> std::enable_if_t<!OtherIsConst || IsConst, AgedContainerIterator&>
     {
-        m_iter = other.m_iter;
+        iter_ = other.iter_;
         return *this;
     }
 
-    template <bool other_is_const, class OtherIterator>
+    template <bool OtherIsConst, class OtherIterator>
     bool
-    operator==(aged_container_iterator<other_is_const, OtherIterator> const& other) const
+    operator==(AgedContainerIterator<OtherIsConst, OtherIterator> const& other) const
     {
-        return m_iter == other.m_iter;
+        return iter_ == other.iter_;
     }
 
-    template <bool other_is_const, class OtherIterator>
+    template <bool OtherIsConst, class OtherIterator>
     bool
-    operator!=(aged_container_iterator<other_is_const, OtherIterator> const& other) const
+    operator!=(AgedContainerIterator<OtherIsConst, OtherIterator> const& other) const
     {
-        return m_iter != other.m_iter;
+        return iter_ != other.iter_;
     }
 
-    aged_container_iterator&
+    AgedContainerIterator&
     operator++()
     {
-        ++m_iter;
+        ++iter_;
         return *this;
     }
 
-    aged_container_iterator
+    AgedContainerIterator
     operator++(int)
     {
-        aged_container_iterator const prev(*this);
-        ++m_iter;
+        AgedContainerIterator const prev(*this);
+        ++iter_;
         return prev;
     }
 
-    aged_container_iterator&
+    AgedContainerIterator&
     operator--()
     {
-        --m_iter;
+        --iter_;
         return *this;
     }
 
-    aged_container_iterator
+    AgedContainerIterator
     operator--(int)
     {
-        aged_container_iterator const prev(*this);
-        --m_iter;
+        AgedContainerIterator const prev(*this);
+        --iter_;
         return prev;
     }
 
     reference
     operator*() const
     {
-        return m_iter->value;
+        return iter_->value;
     }
 
     pointer
     operator->() const
     {
-        return &m_iter->value;
+        return &iter_->value;
     }
 
     [[nodiscard]] time_point const&
     when() const
     {
-        return m_iter->when;
+        return iter_->when;
     }
 
 private:
     template <bool, bool, class, class, class, class, class>
-    friend class aged_ordered_container;
+    friend class AgedOrderedContainer;
 
     template <bool, bool, class, class, class, class, class, class>
-    friend class aged_unordered_container;
+    friend class AgedUnorderedContainer;
 
     template <bool, class>
-    friend class aged_container_iterator;
+    friend class AgedContainerIterator;
 
     template <class OtherIterator>
-    aged_container_iterator(OtherIterator iter) : m_iter(std::move(iter))
+    AgedContainerIterator(OtherIterator iter) : iter_(std::move(iter))
     {
     }
 
     [[nodiscard]] Iterator const&
     iterator() const
     {
-        return m_iter;
+        return iter_;
     }
 
-    Iterator m_iter;
+    Iterator iter_;
 };
 
 }  // namespace detail
diff --git a/include/xrpl/beast/container/detail/aged_ordered_container.h b/include/xrpl/beast/container/detail/aged_ordered_container.h
index 83a2882746..ad368f2754 100644
--- a/include/xrpl/beast/container/detail/aged_ordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_ordered_container.h
@@ -23,15 +23,15 @@ namespace detail {
 // Traits templates used to discern reverse_iterators, which are disallowed
 // for mutating operations.
 template <class It>
-struct is_boost_reverse_iterator : std::false_type
+struct IsBoostReverseIterator : std::false_type
 {
-    explicit is_boost_reverse_iterator() = default;
+    explicit IsBoostReverseIterator() = default;
 };
 
 template <class It>
-struct is_boost_reverse_iterator<boost::intrusive::reverse_iterator<It>> : std::true_type
+struct IsBoostReverseIterator<boost::intrusive::reverse_iterator<It>> : std::true_type
 {
-    explicit is_boost_reverse_iterator() = default;
+    explicit IsBoostReverseIterator() = default;
 };
 
 /** Associative container where each element is also indexed by time.
@@ -58,10 +58,10 @@ template <
     class Clock = std::chrono::steady_clock,
     class Compare = std::less<Key>,
     class Allocator = std::allocator<std::conditional_t<IsMap, std::pair<Key const, T>, Key>>>
-class aged_ordered_container
+class AgedOrderedContainer
 {
 public:
-    using clock_type = abstract_clock<Clock>;
+    using clock_type = AbstractClock<Clock>;
     using time_point = typename clock_type::time_point;
     using duration = typename clock_type::duration;
     using key_type = Key;
@@ -79,39 +79,38 @@ private:
     static Key const&
     extract(value_type const& value)
     {
-        return aged_associative_container_extract_t<IsMap>()(value);
+        return AgedAssociativeContainerExtractT<IsMap>()(value);
     }
 
     // VFALCO TODO hoist to remove template argument dependencies
-    struct element : boost::intrusive::set_base_hook<
+    struct Element : boost::intrusive::set_base_hook<
                          boost::intrusive::link_mode<boost::intrusive::normal_link>>,
                      boost::intrusive::list_base_hook<
                          boost::intrusive::link_mode<boost::intrusive::normal_link>>
     {
         // Stash types here so the iterator doesn't
         // need to see the container declaration.
-        struct stashed
+        struct Stashed
         {
-            explicit stashed() = default;
+            explicit Stashed() = default;
 
-            using value_type = typename aged_ordered_container::value_type;
-            using time_point = typename aged_ordered_container::time_point;
+            using value_type = typename AgedOrderedContainer::value_type;
+            using time_point = typename AgedOrderedContainer::time_point;
         };
 
-        element(time_point const& when_, value_type const& value_) : value(value_), when(when_)
+        Element(time_point const& when, value_type const& value) : value(value), when(when)
         {
         }
 
-        element(time_point const& when_, value_type&& value_)
-            : value(std::move(value_)), when(when_)
+        Element(time_point const& when, value_type&& value) : value(std::move(value)), when(when)
         {
         }
 
         template <
             class... Args,
             class = std::enable_if_t<std::is_constructible_v<value_type, Args...>>>
-        element(time_point const& when_, Args&&... args)
-            : value(std::forward<Args>(args)...), when(when_)
+        Element(time_point const& when, Args&&... args)
+            : value(std::forward<Args>(args)...), when(when)
         {
         }
 
@@ -120,7 +119,7 @@ private:
     };
 
     // VFALCO TODO This should only be enabled for maps.
-    class pair_value_compare : public Compare
+    class PairValueCompare : public Compare
     {
     public:
         using first_argument = value_type;
@@ -133,16 +132,16 @@ private:
             return Compare::operator()(lhs.first, rhs.first);
         }
 
-        pair_value_compare() = default;
+        PairValueCompare() = default;
 
-        pair_value_compare(pair_value_compare const& other) : Compare(other)
+        PairValueCompare(PairValueCompare const& other) : Compare(other)
         {
         }
 
     private:
-        friend aged_ordered_container;
+        friend AgedOrderedContainer;
 
-        pair_value_compare(Compare const& compare) : Compare(compare)
+        PairValueCompare(Compare const& compare) : Compare(compare)
         {
         }
     };
@@ -153,7 +152,7 @@ private:
     {
     public:
         using first_argument = Key;
-        using second_argument = element;
+        using second_argument = Element;
         using result_type = bool;
 
         KeyValueCompare() = default;
@@ -163,19 +162,19 @@ private:
         }
 
         bool
-        operator()(Key const& k, element const& e) const
+        operator()(Key const& k, Element const& e) const
         {
             return Compare::operator()(k, extract(e.value));
         }
 
         bool
-        operator()(element const& e, Key const& k) const
+        operator()(Element const& e, Key const& k) const
         {
             return Compare::operator()(extract(e.value), k);
         }
 
         bool
-        operator()(element const& x, element const& y) const
+        operator()(Element const& x, Element const& y) const
         {
             return Compare::operator()(extract(x.value), extract(y.value));
         }
@@ -194,82 +193,82 @@ private:
     };
 
     using list_type = typename boost::intrusive::
-        make_list<element, boost::intrusive::constant_time_size<false>>::type;
+        make_list<Element, boost::intrusive::constant_time_size<false>>::type;
 
     using cont_type = std::conditional_t<
         IsMulti,
         typename boost::intrusive::make_multiset<
-            element,
+            Element,
             boost::intrusive::constant_time_size<true>,
             boost::intrusive::compare<KeyValueCompare>>::type,
         typename boost::intrusive::make_set<
-            element,
+            Element,
             boost::intrusive::constant_time_size<true>,
             boost::intrusive::compare<KeyValueCompare>>::type>;
 
     using ElementAllocator =
-        typename std::allocator_traits<Allocator>::template rebind_alloc<element>;
+        typename std::allocator_traits<Allocator>::template rebind_alloc<Element>;
 
     using ElementAllocatorTraits = std::allocator_traits<ElementAllocator>;
 
-    class config_t : private KeyValueCompare,
-                     public beast::detail::empty_base_optimization<ElementAllocator>
+    class ConfigT : private KeyValueCompare,
+                    public beast::detail::EmptyBaseOptimization<ElementAllocator>
     {
     public:
-        explicit config_t(clock_type& clock_) : clock(clock_)
+        explicit ConfigT(clock_type& clock) : clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Compare const& comp) : KeyValueCompare(comp), clock(clock_)
+        ConfigT(clock_type& clock, Compare const& comp) : KeyValueCompare(comp), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Allocator const& alloc_)
-            : beast::detail::empty_base_optimization<ElementAllocator>(alloc_), clock(clock_)
+        ConfigT(clock_type& clock, Allocator const& alloc)
+            : beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Compare const& comp, Allocator const& alloc_)
+        ConfigT(clock_type& clock, Compare const& comp, Allocator const& alloc)
             : KeyValueCompare(comp)
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc_)
-            , clock(clock_)
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
+            , clock(clock)
         {
         }
 
-        config_t(config_t const& other)
-            : KeyValueCompare(other.key_compare())
-            , beast::detail::empty_base_optimization<ElementAllocator>(
+        ConfigT(ConfigT const& other)
+            : KeyValueCompare(other.keyCompare())
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(
                   ElementAllocatorTraits::select_on_container_copy_construction(other.alloc()))
             , clock(other.clock)
         {
         }
 
-        config_t(config_t const& other, Allocator const& alloc)
-            : KeyValueCompare(other.key_compare())
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc)
+        ConfigT(ConfigT const& other, Allocator const& alloc)
+            : KeyValueCompare(other.keyCompare())
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
             , clock(other.clock)
         {
         }
 
-        config_t(config_t&& other)
-            : KeyValueCompare(std::move(other.key_compare()))
-            , beast::detail::empty_base_optimization<ElementAllocator>(std::move(
-                  static_cast<beast::detail::empty_base_optimization<ElementAllocator>&>(other)))
+        ConfigT(ConfigT&& other)
+            : KeyValueCompare(std::move(other.keyCompare()))
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(std::move(
+                  static_cast<beast::detail::EmptyBaseOptimization<ElementAllocator>&>(other)))
             , clock(other.clock)
         {
         }
 
-        config_t(
-            config_t&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
+        ConfigT(
+            ConfigT&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
             Allocator const& alloc)
-            : KeyValueCompare(std::move(other.key_compare()))
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc)
+            : KeyValueCompare(std::move(other.keyCompare()))
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
             , clock(other.clock)
         {
         }
 
-        config_t&
-        operator=(config_t const& other)
+        ConfigT&
+        operator=(ConfigT const& other)
         {
             if (this != &other)
             {
@@ -280,8 +279,8 @@ private:
             return *this;
         }
 
-        config_t&
-        operator=(config_t&& other)
+        ConfigT&
+        operator=(ConfigT&& other)
         {
             compare() = std::move(other.compare());
             alloc() = std::move(other.alloc());
@@ -302,13 +301,13 @@ private:
         }
 
         KeyValueCompare&
-        key_compare()
+        keyCompare()
         {
             return *this;
         }
 
         [[nodiscard]] KeyValueCompare const&
-        key_compare() const
+        keyCompare() const
         {
             return *this;
         }
@@ -316,61 +315,61 @@ private:
         ElementAllocator&
         alloc()
         {
-            return beast::detail::empty_base_optimization<ElementAllocator>::member();
+            return beast::detail::EmptyBaseOptimization<ElementAllocator>::member();
         }
 
         [[nodiscard]] ElementAllocator const&
         alloc() const
         {
-            return beast::detail::empty_base_optimization<ElementAllocator>::member();
+            return beast::detail::EmptyBaseOptimization<ElementAllocator>::member();
         }
 
         std::reference_wrapper<clock_type> clock;
     };
 
     template <class... Args>
-    element*
-    new_element(Args&&... args)
+    Element*
+    newElement(Args&&... args)
     {
         struct Deleter
         {
-            std::reference_wrapper<ElementAllocator> a_;
-            Deleter(ElementAllocator& a) : a_(a)
+            std::reference_wrapper<ElementAllocator> a;
+            Deleter(ElementAllocator& a) : a(a)
             {
             }
 
             void
-            operator()(element* p)
+            operator()(Element* p)
             {
-                ElementAllocatorTraits::deallocate(a_.get(), p, 1);
+                ElementAllocatorTraits::deallocate(a.get(), p, 1);
             }
         };
 
-        std::unique_ptr<element, Deleter> p(
-            ElementAllocatorTraits::allocate(m_config.alloc(), 1), Deleter(m_config.alloc()));
+        std::unique_ptr<Element, Deleter> p(
+            ElementAllocatorTraits::allocate(config_.alloc(), 1), Deleter(config_.alloc()));
         ElementAllocatorTraits::construct(
-            m_config.alloc(), p.get(), clock().now(), std::forward<Args>(args)...);
+            config_.alloc(), p.get(), clock().now(), std::forward<Args>(args)...);
         return p.release();
     }
 
     void
-    delete_element(element const* p)
+    deleteElement(Element const* p)
     {
-        ElementAllocatorTraits::destroy(m_config.alloc(), p);
-        ElementAllocatorTraits::deallocate(m_config.alloc(), const_cast<element*>(p), 1);
+        ElementAllocatorTraits::destroy(config_.alloc(), p);
+        ElementAllocatorTraits::deallocate(config_.alloc(), const_cast<Element*>(p), 1);
     }
 
     void
-    unlink_and_delete_element(element const* p)
+    unlinkAndDeleteElement(Element const* p)
     {
-        chronological.list.erase(chronological.list.iterator_to(*p));
-        m_cont.erase(m_cont.iterator_to(*p));
-        delete_element(p);
+        chronological.list_.erase(chronological.list_.iterator_to(*p));
+        cont_.erase(cont_.iterator_to(*p));
+        deleteElement(p);
     }
 
 public:
     using key_compare = Compare;
-    using value_compare = std::conditional_t<IsMap, pair_value_compare, Compare>;
+    using value_compare = std::conditional_t<IsMap, PairValueCompare, Compare>;
     using allocator_type = Allocator;
     using reference = value_type&;
     using const_reference = value_type const&;
@@ -379,13 +378,12 @@ public:
 
     // A set iterator (IsMap==false) is always const
     // because the elements of a set are immutable.
-    using iterator = beast::detail::aged_container_iterator<!IsMap, typename cont_type::iterator>;
-    using const_iterator =
-        beast::detail::aged_container_iterator<true, typename cont_type::iterator>;
+    using iterator = beast::detail::AgedContainerIterator<!IsMap, typename cont_type::iterator>;
+    using const_iterator = beast::detail::AgedContainerIterator<true, typename cont_type::iterator>;
     using reverse_iterator =
-        beast::detail::aged_container_iterator<!IsMap, typename cont_type::reverse_iterator>;
+        beast::detail::AgedContainerIterator<!IsMap, typename cont_type::reverse_iterator>;
     using const_reverse_iterator =
-        beast::detail::aged_container_iterator<true, typename cont_type::reverse_iterator>;
+        beast::detail::AgedContainerIterator<true, typename cont_type::reverse_iterator>;
 
     //--------------------------------------------------------------------------
     //
@@ -396,118 +394,117 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    class chronological_t
+    class ChronologicalT
     {
-        chronological_t() = default;
+        ChronologicalT() = default;
 
     public:
         // A set iterator (IsMap==false) is always const
         // because the elements of a set are immutable.
-        using iterator =
-            beast::detail::aged_container_iterator<!IsMap, typename list_type::iterator>;
+        using iterator = beast::detail::AgedContainerIterator<!IsMap, typename list_type::iterator>;
         using const_iterator =
-            beast::detail::aged_container_iterator<true, typename list_type::iterator>;
+            beast::detail::AgedContainerIterator<true, typename list_type::iterator>;
         using reverse_iterator =
-            beast::detail::aged_container_iterator<!IsMap, typename list_type::reverse_iterator>;
+            beast::detail::AgedContainerIterator<!IsMap, typename list_type::reverse_iterator>;
         using const_reverse_iterator =
-            beast::detail::aged_container_iterator<true, typename list_type::reverse_iterator>;
+            beast::detail::AgedContainerIterator<true, typename list_type::reverse_iterator>;
 
         iterator
         begin()
         {
-            return iterator(list.begin());
+            return iterator(list_.begin());
         }
 
         const_iterator
         begin() const
         {
-            return const_iterator(list.begin());
+            return const_iterator(list_.begin());
         }
 
         const_iterator
         cbegin() const
         {
-            return const_iterator(list.begin());
+            return const_iterator(list_.begin());
         }
 
         iterator
         end()
         {
-            return iterator(list.end());
+            return iterator(list_.end());
         }
 
         const_iterator
         end() const
         {
-            return const_iterator(list.end());
+            return const_iterator(list_.end());
         }
 
         const_iterator
         cend() const
         {
-            return const_iterator(list.end());
+            return const_iterator(list_.end());
         }
 
         reverse_iterator
         rbegin()
         {
-            return reverse_iterator(list.rbegin());
+            return reverse_iterator(list_.rbegin());
         }
 
         const_reverse_iterator
         rbegin() const
         {
-            return const_reverse_iterator(list.rbegin());
+            return const_reverse_iterator(list_.rbegin());
         }
 
         const_reverse_iterator
         crbegin() const
         {
-            return const_reverse_iterator(list.rbegin());
+            return const_reverse_iterator(list_.rbegin());
         }
 
         reverse_iterator
         rend()
         {
-            return reverse_iterator(list.rend());
+            return reverse_iterator(list_.rend());
         }
 
         const_reverse_iterator
         rend() const
         {
-            return const_reverse_iterator(list.rend());
+            return const_reverse_iterator(list_.rend());
         }
 
         const_reverse_iterator
         crend() const
         {
-            return const_reverse_iterator(list.rend());
+            return const_reverse_iterator(list_.rend());
         }
 
         iterator
-        iterator_to(value_type& value)
+        iteratorTo(value_type& value)
         {
-            static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-            return list.iterator_to(*reinterpret_cast<element*>(
+            static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+            return list_.iterator_to(*reinterpret_cast<Element*>(
                 reinterpret_cast<uint8_t*>(&value) -
-                ((std::size_t)std::addressof(((element*)0)->member))));
+                ((std::size_t)std::addressof(((Element*)0)->member))));
         }
 
         const_iterator
-        iterator_to(value_type const& value) const
+        iteratorTo(value_type const& value) const
         {
-            static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-            return list.iterator_to(*reinterpret_cast<element const*>(
+            static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+            return list_.iterator_to(*reinterpret_cast<Element const*>(
                 reinterpret_cast<uint8_t const*>(&value) -
-                ((std::size_t)std::addressof(((element*)0)->member))));
+                ((std::size_t)std::addressof(((Element*)0)->member))));
         }
 
-        chronological_t(chronological_t const&) = delete;
-        chronological_t(chronological_t&&) = delete;
+        ChronologicalT(ChronologicalT const&) = delete;
+        ChronologicalT(ChronologicalT&&) = delete;
 
     private:
-        friend class aged_ordered_container;
-        list_type mutable list;
+        friend class AgedOrderedContainer;
+        list_type mutable list_;
     } chronological;
 
     //--------------------------------------------------------------------------
@@ -516,89 +513,89 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    aged_ordered_container() = delete;
+    AgedOrderedContainer() = delete;
 
-    explicit aged_ordered_container(clock_type& clock);
+    explicit AgedOrderedContainer(clock_type& clock);
 
-    aged_ordered_container(clock_type& clock, Compare const& comp);
+    AgedOrderedContainer(clock_type& clock, Compare const& comp);
 
-    aged_ordered_container(clock_type& clock, Allocator const& alloc);
+    AgedOrderedContainer(clock_type& clock, Allocator const& alloc);
 
-    aged_ordered_container(clock_type& clock, Compare const& comp, Allocator const& alloc);
+    AgedOrderedContainer(clock_type& clock, Compare const& comp, Allocator const& alloc);
 
     template <class InputIt>
-    aged_ordered_container(InputIt first, InputIt last, clock_type& clock);
+    AgedOrderedContainer(InputIt first, InputIt last, clock_type& clock);
 
     template <class InputIt>
-    aged_ordered_container(InputIt first, InputIt last, clock_type& clock, Compare const& comp);
+    AgedOrderedContainer(InputIt first, InputIt last, clock_type& clock, Compare const& comp);
 
     template <class InputIt>
-    aged_ordered_container(InputIt first, InputIt last, clock_type& clock, Allocator const& alloc);
+    AgedOrderedContainer(InputIt first, InputIt last, clock_type& clock, Allocator const& alloc);
 
     template <class InputIt>
-    aged_ordered_container(
+    AgedOrderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Compare const& comp,
         Allocator const& alloc);
 
-    aged_ordered_container(aged_ordered_container const& other);
+    AgedOrderedContainer(AgedOrderedContainer const& other);
 
-    aged_ordered_container(aged_ordered_container const& other, Allocator const& alloc);
+    AgedOrderedContainer(AgedOrderedContainer const& other, Allocator const& alloc);
 
-    aged_ordered_container(aged_ordered_container&& other);
+    AgedOrderedContainer(AgedOrderedContainer&& other);
 
-    aged_ordered_container(
+    AgedOrderedContainer(
         // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
-        aged_ordered_container&& other,
+        AgedOrderedContainer&& other,
         Allocator const& alloc);
 
-    aged_ordered_container(std::initializer_list<value_type> init, clock_type& clock);
+    AgedOrderedContainer(std::initializer_list<value_type> init, clock_type& clock);
 
-    aged_ordered_container(
+    AgedOrderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Compare const& comp);
 
-    aged_ordered_container(
+    AgedOrderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Allocator const& alloc);
 
-    aged_ordered_container(
+    AgedOrderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Compare const& comp,
         Allocator const& alloc);
 
-    ~aged_ordered_container();
+    ~AgedOrderedContainer();
 
-    aged_ordered_container&
-    operator=(aged_ordered_container const& other);
+    AgedOrderedContainer&
+    operator=(AgedOrderedContainer const& other);
 
-    aged_ordered_container&
-    operator=(aged_ordered_container&& other);
+    AgedOrderedContainer&
+    operator=(AgedOrderedContainer&& other);
 
-    aged_ordered_container&
+    AgedOrderedContainer&
     operator=(std::initializer_list<value_type> init);
 
     allocator_type
-    get_allocator() const
+    getAllocator() const
     {
-        return m_config.alloc();
+        return config_.alloc();
     }
 
     clock_type&
     clock()
     {
-        return m_config.clock;
+        return config_.clock;
     }
 
     clock_type const&
     clock() const
     {
-        return m_config.clock;
+        return config_.clock;
     }
 
     //--------------------------------------------------------------------------
@@ -609,31 +606,31 @@ public:
 
     template <
         class K,
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     at(K const& k);
 
     template <
         class K,
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     typename std::conditional<IsMap, T, void*>::type const&
     at(K const& k) const;
 
     template <
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     operator[](Key const& key);
 
     template <
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     operator[](Key&& key);
 
@@ -646,91 +643,91 @@ public:
     iterator
     begin()
     {
-        return iterator(m_cont.begin());
+        return iterator(cont_.begin());
     }
 
     const_iterator
     begin() const
     {
-        return const_iterator(m_cont.begin());
+        return const_iterator(cont_.begin());
     }
 
     const_iterator
     cbegin() const
     {
-        return const_iterator(m_cont.begin());
+        return const_iterator(cont_.begin());
     }
 
     iterator
     end()
     {
-        return iterator(m_cont.end());
+        return iterator(cont_.end());
     }
 
     const_iterator
     end() const
     {
-        return const_iterator(m_cont.end());
+        return const_iterator(cont_.end());
     }
 
     const_iterator
     cend() const
     {
-        return const_iterator(m_cont.end());
+        return const_iterator(cont_.end());
     }
 
     reverse_iterator
     rbegin()
     {
-        return reverse_iterator(m_cont.rbegin());
+        return reverse_iterator(cont_.rbegin());
     }
 
     const_reverse_iterator
     rbegin() const
     {
-        return const_reverse_iterator(m_cont.rbegin());
+        return const_reverse_iterator(cont_.rbegin());
     }
 
     const_reverse_iterator
     crbegin() const
     {
-        return const_reverse_iterator(m_cont.rbegin());
+        return const_reverse_iterator(cont_.rbegin());
     }
 
     reverse_iterator
     rend()
     {
-        return reverse_iterator(m_cont.rend());
+        return reverse_iterator(cont_.rend());
     }
 
     const_reverse_iterator
     rend() const
     {
-        return const_reverse_iterator(m_cont.rend());
+        return const_reverse_iterator(cont_.rend());
     }
 
     const_reverse_iterator
     crend() const
     {
-        return const_reverse_iterator(m_cont.rend());
+        return const_reverse_iterator(cont_.rend());
     }
 
     iterator
-    iterator_to(value_type& value)
+    iteratorTo(value_type& value)
     {
-        static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-        return m_cont.iterator_to(*reinterpret_cast<element*>(
+        static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+        return cont_.iterator_to(*reinterpret_cast<Element*>(
             reinterpret_cast<uint8_t*>(&value) -
-            ((std::size_t)std::addressof(((element*)0)->member))));
+            ((std::size_t)std::addressof(((Element*)0)->member))));
     }
 
     const_iterator
-    iterator_to(value_type const& value) const
+    iteratorTo(value_type const& value) const
     {
-        static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-        return m_cont.iterator_to(*reinterpret_cast<element const*>(
+        static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+        return cont_.iterator_to(*reinterpret_cast<Element const*>(
             reinterpret_cast<uint8_t const*>(&value) -
-            ((std::size_t)std::addressof(((element*)0)->member))));
+            ((std::size_t)std::addressof(((Element*)0)->member))));
     }
 
     //--------------------------------------------------------------------------
@@ -742,19 +739,19 @@ public:
     bool
     empty() const noexcept
     {
-        return m_cont.empty();
+        return cont_.empty();
     }
 
     size_type
     size() const noexcept
     {
-        return m_cont.size();
+        return cont_.size();
     }
 
     size_type
-    max_size() const noexcept
+    maxSize() const noexcept
     {
-        return m_config.max_size();
+        return config_.max_size();
     }
 
     //--------------------------------------------------------------------------
@@ -767,37 +764,36 @@ public:
     clear();
 
     // map, set
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    insert(value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::enable_if_t<maybe_multi, iterator>;
+    insert(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // set
-    template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
+    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
     insert(value_type&& value)
-        -> std::enable_if_t<!maybe_multi && !maybe_map, std::pair<iterator, bool>>;
+        -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>;
 
     // multiset
-    template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
+    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> std::enable_if_t<maybe_multi && !maybe_map, iterator>;
+    insert(value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>;
 
     //---
 
     // map, set
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(const_iterator hint, value_type const& value)
-        -> std::enable_if_t<!maybe_multi, iterator>;
+    insert(const_iterator hint, value_type const& value) -> std::enable_if_t<!MaybeMulti, iterator>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
     {
         // VFALCO TODO Figure out how to utilize 'hint'
@@ -805,13 +801,13 @@ public:
     }
 
     // map, set
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(const_iterator hint, value_type&& value) -> std::enable_if_t<!maybe_multi, iterator>;
+    insert(const_iterator hint, value_type&& value) -> std::enable_if_t<!MaybeMulti, iterator>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
     {
         // VFALCO TODO Figure out how to utilize 'hint'
@@ -819,9 +815,9 @@ public:
     }
 
     // map, multimap
-    template <class P, bool maybe_map = IsMap>
+    template <class P, bool MaybeMap = IsMap>
     std::enable_if_t<
-        maybe_map && std::is_constructible_v<value_type, P&&>,
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
         std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(P&& value)
     {
@@ -829,13 +825,13 @@ public:
     }
 
     // map, multimap
-    template <class P, bool maybe_map = IsMap>
+    template <class P, bool MaybeMap = IsMap>
     std::enable_if_t<
-        maybe_map && std::is_constructible_v<value_type, P&&>,
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
         std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(const_iterator hint, P&& value)
     {
-        return emplace_hint(hint, std::forward<P>(value));
+        return emplaceHint(hint, std::forward<P>(value));
     }
 
     template <class InputIt>
@@ -853,65 +849,65 @@ public:
     }
 
     // map, set
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    emplace(Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::enable_if_t<maybe_multi, iterator>;
+    emplace(Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // map, set
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace_hint(const_iterator hint, Args&&... args)
-        -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    emplaceHint(const_iterator hint, Args&&... args)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
-    template <bool maybe_multi = IsMulti, class... Args>
-    std::enable_if_t<maybe_multi, iterator>
-    emplace_hint(const_iterator /*hint*/, Args&&... args)
+    template <bool MaybeMulti = IsMulti, class... Args>
+    std::enable_if_t<MaybeMulti, iterator>
+    emplaceHint(const_iterator /*hint*/, Args&&... args)
     {
         // VFALCO TODO Figure out how to utilize 'hint'
-        return emplace<maybe_multi>(std::forward<Args>(args)...);
+        return emplace<MaybeMulti>(std::forward<Args>(args)...);
     }
 
     // enable_if prevents erase (reverse_iterator pos) from compiling
     template <
-        bool is_const,
+        bool IsConst,
         class Iterator,
-        class = std::enable_if_t<!is_boost_reverse_iterator<Iterator>::value>>
-    beast::detail::aged_container_iterator<false, Iterator>
-    erase(beast::detail::aged_container_iterator<is_const, Iterator> pos);
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
+    beast::detail::AgedContainerIterator<false, Iterator>
+    erase(beast::detail::AgedContainerIterator<IsConst, Iterator> pos);
 
     // enable_if prevents erase (reverse_iterator first, reverse_iterator last)
     // from compiling
     template <
-        bool is_const,
+        bool IsConst,
         class Iterator,
-        class = std::enable_if_t<!is_boost_reverse_iterator<Iterator>::value>>
-    beast::detail::aged_container_iterator<false, Iterator>
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
+    beast::detail::AgedContainerIterator<false, Iterator>
     erase(
-        beast::detail::aged_container_iterator<is_const, Iterator> first,
-        beast::detail::aged_container_iterator<is_const, Iterator> last);
+        beast::detail::AgedContainerIterator<IsConst, Iterator> first,
+        beast::detail::AgedContainerIterator<IsConst, Iterator> last);
 
     template <class K>
     auto
     erase(K const& k) -> size_type;
 
     void
-    swap(aged_ordered_container& other) noexcept;
+    swap(AgedOrderedContainer& other) noexcept;
 
     //--------------------------------------------------------------------------
 
     // enable_if prevents touch (reverse_iterator pos) from compiling
     template <
-        bool is_const,
+        bool IsConst,
         class Iterator,
-        class = std::enable_if_t<!is_boost_reverse_iterator<Iterator>::value>>
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     void
-    touch(beast::detail::aged_container_iterator<is_const, Iterator> pos)
+    touch(beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
     {
         touch(pos, clock().now());
     }
@@ -931,7 +927,7 @@ public:
     size_type
     count(K const& k) const
     {
-        return m_cont.count(k, std::cref(m_config.key_compare()));
+        return cont_.count(k, std::cref(config_.keyCompare()));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
@@ -939,7 +935,7 @@ public:
     iterator
     find(K const& k)
     {
-        return iterator(m_cont.find(k, std::cref(m_config.key_compare())));
+        return iterator(cont_.find(k, std::cref(config_.keyCompare())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
@@ -947,57 +943,57 @@ public:
     const_iterator
     find(K const& k) const
     {
-        return const_iterator(m_cont.find(k, std::cref(m_config.key_compare())));
+        return const_iterator(cont_.find(k, std::cref(config_.keyCompare())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     std::pair<iterator, iterator>
-    equal_range(K const& k)
+    equalRange(K const& k)
     {
-        auto const r(m_cont.equal_range(k, std::cref(m_config.key_compare())));
+        auto const r(cont_.equal_range(k, std::cref(config_.keyCompare())));
         return std::make_pair(iterator(r.first), iterator(r.second));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     std::pair<const_iterator, const_iterator>
-    equal_range(K const& k) const
+    equalRange(K const& k) const
     {
-        auto const r(m_cont.equal_range(k, std::cref(m_config.key_compare())));
+        auto const r(cont_.equal_range(k, std::cref(config_.keyCompare())));
         return std::make_pair(const_iterator(r.first), const_iterator(r.second));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     iterator
-    lower_bound(K const& k)
+    lowerBound(K const& k)
     {
-        return iterator(m_cont.lower_bound(k, std::cref(m_config.key_compare())));
+        return iterator(cont_.lower_bound(k, std::cref(config_.keyCompare())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     const_iterator
-    lower_bound(K const& k) const
+    lowerBound(K const& k) const
     {
-        return const_iterator(m_cont.lower_bound(k, std::cref(m_config.key_compare())));
+        return const_iterator(cont_.lower_bound(k, std::cref(config_.keyCompare())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     iterator
-    upper_bound(K const& k)
+    upperBound(K const& k)
     {
-        return iterator(m_cont.upper_bound(k, std::cref(m_config.key_compare())));
+        return iterator(cont_.upper_bound(k, std::cref(config_.keyCompare())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     const_iterator
-    upper_bound(K const& k) const
+    upperBound(K const& k) const
     {
-        return const_iterator(m_cont.upper_bound(k, std::cref(m_config.key_compare())));
+        return const_iterator(cont_.upper_bound(k, std::cref(config_.keyCompare())));
     }
 
     //--------------------------------------------------------------------------
@@ -1007,16 +1003,16 @@ public:
     //--------------------------------------------------------------------------
 
     key_compare
-    key_comp() const
+    keyComp() const
     {
-        return m_config.compare();
+        return config_.compare();
     }
 
     // VFALCO TODO Should this return const reference for set?
     value_compare
-    value_comp() const
+    valueComp() const
     {
-        return value_compare(m_config.compare());
+        return value_compare(config_.compare());
     }
 
     //--------------------------------------------------------------------------
@@ -1036,7 +1032,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator==(aged_ordered_container<
+    operator==(AgedOrderedContainer<
                OtherIsMulti,
                OtherIsMap,
                Key,
@@ -1052,7 +1048,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator!=(aged_ordered_container<
+    operator!=(AgedOrderedContainer<
                OtherIsMulti,
                OtherIsMap,
                Key,
@@ -1071,7 +1067,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator<(aged_ordered_container<
+    operator<(AgedOrderedContainer<
               OtherIsMulti,
               OtherIsMap,
               Key,
@@ -1080,7 +1076,7 @@ public:
               Compare,
               OtherAllocator> const& other) const
     {
-        value_compare const comp(value_comp());
+        value_compare const comp(valueComp());
         return std::lexicographical_compare(cbegin(), cend(), other.cbegin(), other.cend(), comp);
     }
 
@@ -1091,7 +1087,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator<=(aged_ordered_container<
+    operator<=(AgedOrderedContainer<
                OtherIsMulti,
                OtherIsMap,
                Key,
@@ -1110,7 +1106,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator>(aged_ordered_container<
+    operator>(AgedOrderedContainer<
               OtherIsMulti,
               OtherIsMap,
               Key,
@@ -1129,7 +1125,7 @@ public:
         class OtherDuration,
         class OtherAllocator>
     bool
-    operator>=(aged_ordered_container<
+    operator>=(AgedOrderedContainer<
                OtherIsMulti,
                OtherIsMap,
                Key,
@@ -1144,155 +1140,155 @@ public:
 private:
     // enable_if prevents erase (reverse_iterator pos, now) from compiling
     template <
-        bool is_const,
+        bool IsConst,
         class Iterator,
-        class = std::enable_if_t<!is_boost_reverse_iterator<Iterator>::value>>
+        class = std::enable_if_t<!IsBoostReverseIterator<Iterator>::value>>
     void
     touch(
-        beast::detail::aged_container_iterator<is_const, Iterator> pos,
+        beast::detail::AgedContainerIterator<IsConst, Iterator> pos,
         typename clock_type::time_point const& now);
 
     template <
-        bool maybe_propagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    std::enable_if_t<maybe_propagate>
-    swap_data(aged_ordered_container& other) noexcept;
+        bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
+    std::enable_if_t<MaybePropagate>
+    swapData(AgedOrderedContainer& other) noexcept;
 
     template <
-        bool maybe_propagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    std::enable_if_t<!maybe_propagate>
-    swap_data(aged_ordered_container& other) noexcept;
+        bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
+    std::enable_if_t<!MaybePropagate>
+    swapData(AgedOrderedContainer& other) noexcept;
 
 private:
-    config_t m_config;
-    cont_type mutable m_cont;
+    ConfigT config_;
+    cont_type mutable cont_;
 };
 
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     clock_type& clock)
-    : m_config(clock)
+    : config_(clock)
 {
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     clock_type& clock,
     Compare const& comp)
-    : m_config(clock, comp), m_cont(comp)
+    : config_(clock, comp), cont_(comp)
 {
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     clock_type& clock,
     Allocator const& alloc)
-    : m_config(clock, alloc)
+    : config_(clock, alloc)
 {
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     clock_type& clock,
     Compare const& comp,
     Allocator const& alloc)
-    : m_config(clock, comp, alloc), m_cont(comp)
+    : config_(clock, comp, alloc), cont_(comp)
 {
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class InputIt>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     InputIt first,
     InputIt last,
     clock_type& clock)
-    : m_config(clock)
+    : config_(clock)
 {
     insert(first, last);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class InputIt>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     InputIt first,
     InputIt last,
     clock_type& clock,
     Compare const& comp)
-    : m_config(clock, comp), m_cont(comp)
+    : config_(clock, comp), cont_(comp)
 {
     insert(first, last);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class InputIt>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     InputIt first,
     InputIt last,
     clock_type& clock,
     Allocator const& alloc)
-    : m_config(clock, alloc)
+    : config_(clock, alloc)
 {
     insert(first, last);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class InputIt>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     InputIt first,
     InputIt last,
     clock_type& clock,
     Compare const& comp,
     Allocator const& alloc)
-    : m_config(clock, comp, alloc), m_cont(comp)
+    : config_(clock, comp, alloc), cont_(comp)
 {
     insert(first, last);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
-    aged_ordered_container const& other)
-    : m_config(other.m_config)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
+    AgedOrderedContainer const& other)
+    : config_(other.config_)
 #if BOOST_VERSION >= 108000
-    , m_cont(other.m_cont.get_comp())
+    , cont_(other.cont_.get_comp())
 #else
-    , m_cont(other.m_cont.comp())
+    , cont_(other.cont_.comp())
 #endif
 {
     insert(other.cbegin(), other.cend());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
-    aged_ordered_container const& other,
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
+    AgedOrderedContainer const& other,
     Allocator const& alloc)
-    : m_config(other.m_config, alloc)
+    : config_(other.config_, alloc)
 #if BOOST_VERSION >= 108000
-    , m_cont(other.m_cont.get_comp())
+    , cont_(other.cont_.get_comp())
 #else
-    , m_cont(other.m_cont.comp())
+    , cont_(other.cont_.comp())
 #endif
 {
     insert(other.cbegin(), other.cend());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
-    aged_ordered_container&& other)
-    : m_config(std::move(other.m_config)), m_cont(std::move(other.m_cont))
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
+    AgedOrderedContainer&& other)
+    : config_(std::move(other.config_)), cont_(std::move(other.cont_))
 {
-    chronological.list = std::move(other.chronological.list);
+    chronological.list_ = std::move(other.chronological.list_);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
-    aged_ordered_container&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
+    AgedOrderedContainer&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
     Allocator const& alloc)
-    : m_config(std::move(other.m_config), alloc)
+    : config_(std::move(other.config_), alloc)
 #if BOOST_VERSION >= 108000
-    , m_cont(std::move(other.m_cont.get_comp()))
+    , cont_(std::move(other.cont_.get_comp()))
 #else
-    , m_cont(std::move(other.m_cont.comp()))
+    , cont_(std::move(other.cont_.comp()))
 #endif
 
 {
@@ -1301,60 +1297,60 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     std::initializer_list<value_type> init,
     clock_type& clock)
-    : m_config(clock)
+    : config_(clock)
 {
     insert(init.begin(), init.end());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     std::initializer_list<value_type> init,
     clock_type& clock,
     Compare const& comp)
-    : m_config(clock, comp), m_cont(comp)
+    : config_(clock, comp), cont_(comp)
 {
     insert(init.begin(), init.end());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     std::initializer_list<value_type> init,
     clock_type& clock,
     Allocator const& alloc)
-    : m_config(clock, alloc)
+    : config_(clock, alloc)
 {
     insert(init.begin(), init.end());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::aged_ordered_container(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::AgedOrderedContainer(
     std::initializer_list<value_type> init,
     clock_type& clock,
     Compare const& comp,
     Allocator const& alloc)
-    : m_config(clock, comp, alloc), m_cont(comp)
+    : config_(clock, comp, alloc), cont_(comp)
 {
     insert(init.begin(), init.end());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::~aged_ordered_container()
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::~AgedOrderedContainer()
 {
     clear();
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
-    aged_ordered_container const& other) -> aged_ordered_container&
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
+    AgedOrderedContainer const& other) -> AgedOrderedContainer&
 {
     if (this != &other)
     {
         clear();
-        this->m_config = other.m_config;
+        this->config_ = other.config_;
         insert(other.begin(), other.end());
     }
     return *this;
@@ -1362,11 +1358,11 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
-    aged_ordered_container&& other) -> aged_ordered_container&
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
+    AgedOrderedContainer&& other) -> AgedOrderedContainer&
 {
     clear();
-    this->m_config = std::move(other.m_config);
+    this->config_ = std::move(other.config_);
     insert(other.begin(), other.end());
     other.clear();
     return *this;
@@ -1374,8 +1370,8 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
-    std::initializer_list<value_type> init) -> aged_ordered_container&
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator=(
+    std::initializer_list<value_type> init) -> AgedOrderedContainer&
 {
     clear();
     insert(init);
@@ -1385,61 +1381,60 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <class K, bool maybe_multi, bool maybe_map, class>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k)
 {
-    auto const iter(m_cont.find(k, std::cref(m_config.key_compare())));
-    if (iter == m_cont.end())
+    auto const iter(cont_.find(k, std::cref(config_.keyCompare())));
+    if (iter == cont_.end())
         throw std::out_of_range("key not found");
     return iter->value.second;
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <class K, bool maybe_multi, bool maybe_map, class>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 typename std::conditional<IsMap, T, void*>::type const&
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k) const
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::at(K const& k) const
 {
-    auto const iter(m_cont.find(k, std::cref(m_config.key_compare())));
-    if (iter == m_cont.end())
+    auto const iter(cont_.find(k, std::cref(config_.keyCompare())));
+    if (iter == cont_.end())
         throw std::out_of_range("key not found");
     return iter->value.second;
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, bool maybe_map, class>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](
-    Key const& key)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](Key const& key)
 {
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(key, std::cref(m_config.key_compare()), d));
+    auto const result(cont_.insert_check(key, std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(
+        Element* const p(newElement(
             std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple()));
-        m_cont.insert_commit(*p, d);
-        chronological.list.push_back(*p);
+        cont_.insert_commit(*p, d);
+        chronological.list_.push_back(*p);
         return p->value.second;
     }
     return result.first->value.second;
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, bool maybe_map, class>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](Key&& key)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator[](Key&& key)
 {
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(key, std::cref(m_config.key_compare()), d));
+    auto const result(cont_.insert_check(key, std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(
+        Element* const p(newElement(
             std::piecewise_construct,
             std::forward_as_tuple(std::move(key)),
             std::forward_as_tuple()));
-        m_cont.insert_commit(*p, d);
-        chronological.list.push_back(*p);
+        cont_.insert_commit(*p, d);
+        chronological.list_.push_back(*p);
         return p->value.second;
     }
     return result.first->value.second;
@@ -1449,28 +1444,28 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 void
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::clear()
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::clear()
 {
-    for (auto iter(chronological.list.begin()); iter != chronological.list.end();)
-        delete_element(&*iter++);
-    chronological.list.clear();
-    m_cont.clear();
+    for (auto iter(chronological.list_.begin()); iter != chronological.list_.end();)
+        deleteElement(&*iter++);
+    chronological.list_.clear();
+    cont_.clear();
 }
 
 // map, set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type const& value) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(extract(value), std::cref(m_config.key_compare()), d));
+    auto const result(cont_.insert_check(extract(value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(value));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(value));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
     return std::make_pair(iterator(result.first), false);
@@ -1478,32 +1473,32 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::inser
 
 // multimap, multiset
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type const& value) -> std::enable_if_t<maybe_multi, iterator>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
-    auto const before(m_cont.upper_bound(extract(value), std::cref(m_config.key_compare())));
-    element* const p(new_element(value));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert_before(before, *p));
+    auto const before(cont_.upper_bound(extract(value), std::cref(config_.keyCompare())));
+    Element* const p(newElement(value));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert_before(before, *p));
     return iterator(iter);
 }
 
 // set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, bool maybe_map>
+template <bool MaybeMulti, bool MaybeMap>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type&& value) -> std::enable_if_t<!maybe_multi && !maybe_map, std::pair<iterator, bool>>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(value_type&& value)
+    -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(extract(value), std::cref(m_config.key_compare()), d));
+    auto const result(cont_.insert_check(extract(value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(std::move(value)));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(std::move(value)));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
     return std::make_pair(iterator(result.first), false);
@@ -1511,15 +1506,15 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::inser
 
 // multiset
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, bool maybe_map>
+template <bool MaybeMulti, bool MaybeMap>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
-    value_type&& value) -> std::enable_if_t<maybe_multi && !maybe_map, iterator>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(value_type&& value)
+    -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>
 {
-    auto const before(m_cont.upper_bound(extract(value), std::cref(m_config.key_compare())));
-    element* const p(new_element(std::move(value)));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert_before(before, *p));
+    auto const before(cont_.upper_bound(extract(value), std::cref(config_.keyCompare())));
+    Element* const p(newElement(std::move(value)));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert_before(before, *p));
     return iterator(iter);
 }
 
@@ -1527,20 +1522,20 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::inser
 
 // map, set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
     const_iterator hint,
-    value_type const& value) -> std::enable_if_t<!maybe_multi, iterator>
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, iterator>
 {
     typename cont_type::insert_commit_data d;
     auto const result(
-        m_cont.insert_check(hint.iterator(), extract(value), std::cref(m_config.key_compare()), d));
+        cont_.insert_check(hint.iterator(), extract(value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(value));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(value));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return iterator(iter);
     }
     return iterator(result.first);
@@ -1548,20 +1543,20 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::inser
 
 // map, set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::insert(
     const_iterator hint,
-    value_type&& value) -> std::enable_if_t<!maybe_multi, iterator>
+    value_type&& value) -> std::enable_if_t<!MaybeMulti, iterator>
 {
     typename cont_type::insert_commit_data d;
     auto const result(
-        m_cont.insert_check(hint.iterator(), extract(value), std::cref(m_config.key_compare()), d));
+        cont_.insert_check(hint.iterator(), extract(value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        element* const p(new_element(std::move(value)));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(std::move(value)));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return iterator(iter);
     }
     return iterator(result.first);
@@ -1569,102 +1564,102 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::inser
 
 // map, set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
-    -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
+    -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
-    element* const p(new_element(std::forward<Args>(args)...));
+    Element* const p(newElement(std::forward<Args>(args)...));
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(extract(p->value), std::cref(m_config.key_compare()), d));
+    auto const result(cont_.insert_check(extract(p->value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
-    delete_element(p);
+    deleteElement(p);
     return std::make_pair(iterator(result.first), false);
 }
 
 // multiset, multimap
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
-    -> std::enable_if_t<maybe_multi, iterator>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace(Args&&... args)
+    -> std::enable_if_t<MaybeMulti, iterator>
 {
-    element* const p(new_element(std::forward<Args>(args)...));
-    auto const before(m_cont.upper_bound(extract(p->value), std::cref(m_config.key_compare())));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert_before(before, *p));
+    Element* const p(newElement(std::forward<Args>(args)...));
+    auto const before(cont_.upper_bound(extract(p->value), std::cref(config_.keyCompare())));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert_before(before, *p));
     return iterator(iter);
 }
 
 // map, set
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplace_hint(
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::emplaceHint(
     const_iterator hint,
-    Args&&... args) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
-    element* const p(new_element(std::forward<Args>(args)...));
+    Element* const p(newElement(std::forward<Args>(args)...));
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        hint.iterator(), extract(p->value), std::cref(m_config.key_compare()), d));
+    auto const result(
+        cont_.insert_check(hint.iterator(), extract(p->value), std::cref(config_.keyCompare()), d));
     if (result.second)
     {
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
-    delete_element(p);
+    deleteElement(p);
     return std::make_pair(iterator(result.first), false);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool is_const, class Iterator, class>
-beast::detail::aged_container_iterator<false, Iterator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
-    beast::detail::aged_container_iterator<is_const, Iterator> pos)
+template <bool IsConst, class Iterator, class>
+beast::detail::AgedContainerIterator<false, Iterator>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
+    beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
 {
-    unlink_and_delete_element(&*((pos++).iterator()));
-    return beast::detail::aged_container_iterator<false, Iterator>(pos.iterator());
+    unlinkAndDeleteElement(&*((pos++).iterator()));
+    return beast::detail::AgedContainerIterator<false, Iterator>(pos.iterator());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool is_const, class Iterator, class>
-beast::detail::aged_container_iterator<false, Iterator>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
-    beast::detail::aged_container_iterator<is_const, Iterator> first,
-    beast::detail::aged_container_iterator<is_const, Iterator> last)
+template <bool IsConst, class Iterator, class>
+beast::detail::AgedContainerIterator<false, Iterator>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(
+    beast::detail::AgedContainerIterator<IsConst, Iterator> first,
+    beast::detail::AgedContainerIterator<IsConst, Iterator> last)
 {
     for (; first != last;)
-        unlink_and_delete_element(&*((first++).iterator()));
+        unlinkAndDeleteElement(&*((first++).iterator()));
 
-    return beast::detail::aged_container_iterator<false, Iterator>(first.iterator());
+    return beast::detail::AgedContainerIterator<false, Iterator>(first.iterator());
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class K>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(K const& k)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase(K const& k)
     -> size_type
 {
-    auto iter(m_cont.find(k, std::cref(m_config.key_compare())));
-    if (iter == m_cont.end())
+    auto iter(cont_.find(k, std::cref(config_.keyCompare())));
+    if (iter == cont_.end())
         return 0;
     size_type n(0);
     for (;;)
     {
         auto p(&*iter++);
-        bool const done(m_config(*p, extract(iter->value)));
-        unlink_and_delete_element(p);
+        bool const done(config_(*p, extract(iter->value)));
+        unlinkAndDeleteElement(p);
         ++n;
         if (done)
             break;
@@ -1674,12 +1669,12 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::erase
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 void
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap(
-    aged_ordered_container& other) noexcept
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap(
+    AgedOrderedContainer& other) noexcept
 {
-    swap_data(other);
+    swapData(other);
     std::swap(chronological, other.chronological);
-    std::swap(m_cont, other.m_cont);
+    std::swap(cont_, other.cont_);
 }
 
 //------------------------------------------------------------------------------
@@ -1687,12 +1682,12 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap(
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 template <class K>
 auto
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(K const& k)
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(K const& k)
     -> size_type
 {
     auto const now(clock().now());
     size_type n(0);
-    auto const range(equal_range(k));
+    auto const range(equalRange(k));
     for (auto iter : range)
     {
         touch(iter, now);
@@ -1711,8 +1706,8 @@ template <
     class OtherDuration,
     class OtherAllocator>
 bool
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator==(
-    aged_ordered_container<
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::operator==(
+    AgedOrderedContainer<
         OtherIsMulti,
         OtherIsMap,
         Key,
@@ -1721,7 +1716,7 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
         Compare,
         OtherAllocator> const& other) const
 {
-    using Other = aged_ordered_container<
+    using Other = AgedOrderedContainer<
         OtherIsMulti,
         OtherIsMap,
         Key,
@@ -1745,37 +1740,37 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::opera
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool is_const, class Iterator, class>
+template <bool IsConst, class Iterator, class>
 void
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(
-    beast::detail::aged_container_iterator<is_const, Iterator> pos,
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::touch(
+    beast::detail::AgedContainerIterator<IsConst, Iterator> pos,
     typename clock_type::time_point const& now)
 {
     auto& e(*pos.iterator());
     e.when = now;
-    chronological.list.erase(chronological.list.iterator_to(e));
-    chronological.list.push_back(e);
+    chronological.list_.erase(chronological.list_.iterator_to(e));
+    chronological.list_.push_back(e);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_propagate>
-std::enable_if_t<maybe_propagate>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap_data(
-    aged_ordered_container& other) noexcept
+template <bool MaybePropagate>
+std::enable_if_t<MaybePropagate>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swapData(
+    AgedOrderedContainer& other) noexcept
 {
-    std::swap(m_config.key_compare(), other.m_config.key_compare());
-    std::swap(m_config.alloc(), other.m_config.alloc());
-    std::swap(m_config.clock, other.m_config.clock);
+    std::swap(config_.keyCompare(), other.config_.keyCompare());
+    std::swap(config_.alloc(), other.config_.alloc());
+    std::swap(config_.clock, other.config_.clock);
 }
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-template <bool maybe_propagate>
-std::enable_if_t<!maybe_propagate>
-aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap_data(
-    aged_ordered_container& other) noexcept
+template <bool MaybePropagate>
+std::enable_if_t<!MaybePropagate>
+AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swapData(
+    AgedOrderedContainer& other) noexcept
 {
-    std::swap(m_config.key_compare(), other.m_config.key_compare());
-    std::swap(m_config.clock, other.m_config.clock);
+    std::swap(config_.keyCompare(), other.config_.keyCompare());
+    std::swap(config_.clock, other.config_.clock);
 }
 
 }  // namespace detail
@@ -1783,11 +1778,11 @@ aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>::swap_
 //------------------------------------------------------------------------------
 
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
-struct is_aged_container<
-    beast::detail::aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>>
+struct IsAgedContainer<
+    beast::detail::AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>>
     : std::true_type
 {
-    explicit is_aged_container() = default;
+    explicit IsAgedContainer() = default;
 };
 
 // Free functions
@@ -1795,8 +1790,8 @@ struct is_aged_container<
 template <bool IsMulti, bool IsMap, class Key, class T, class Clock, class Compare, class Allocator>
 void
 swap(
-    beast::detail::aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>& lhs,
-    beast::detail::aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>&
+    beast::detail::AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>& lhs,
+    beast::detail::AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>&
         rhs) noexcept
 {
     lhs.swap(rhs);
@@ -1815,7 +1810,7 @@ template <
     class Period>
 std::size_t
 expire(
-    detail::aged_ordered_container<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>& c,
+    detail::AgedOrderedContainer<IsMulti, IsMap, Key, T, Clock, Compare, Allocator>& c,
     std::chrono::duration<Rep, Period> const& age)
 {
     std::size_t n(0);
diff --git a/include/xrpl/beast/container/detail/aged_unordered_container.h b/include/xrpl/beast/container/detail/aged_unordered_container.h
index 7fe3a8b38a..78a2a5a32d 100644
--- a/include/xrpl/beast/container/detail/aged_unordered_container.h
+++ b/include/xrpl/beast/container/detail/aged_unordered_container.h
@@ -63,10 +63,10 @@ template <
     class Hash = std::hash<Key>,
     class KeyEqual = std::equal_to<Key>,
     class Allocator = std::allocator<std::conditional_t<IsMap, std::pair<Key const, T>, Key>>>
-class aged_unordered_container
+class AgedUnorderedContainer
 {
 public:
-    using clock_type = abstract_clock<Clock>;
+    using clock_type = AbstractClock<Clock>;
     using time_point = typename clock_type::time_point;
     using duration = typename clock_type::duration;
     using key_type = Key;
@@ -84,39 +84,38 @@ private:
     static Key const&
     extract(value_type const& value)
     {
-        return aged_associative_container_extract_t<IsMap>()(value);
+        return AgedAssociativeContainerExtractT<IsMap>()(value);
     }
 
     // VFALCO TODO hoist to remove template argument dependencies
-    struct element : boost::intrusive::unordered_set_base_hook<
+    struct Element : boost::intrusive::unordered_set_base_hook<
                          boost::intrusive::link_mode<boost::intrusive::normal_link>>,
                      boost::intrusive::list_base_hook<
                          boost::intrusive::link_mode<boost::intrusive::normal_link>>
     {
         // Stash types here so the iterator doesn't
         // need to see the container declaration.
-        struct stashed
+        struct Stashed
         {
-            explicit stashed() = default;
+            explicit Stashed() = default;
 
-            using value_type = typename aged_unordered_container::value_type;
-            using time_point = typename aged_unordered_container::time_point;
+            using value_type = typename AgedUnorderedContainer::value_type;
+            using time_point = typename AgedUnorderedContainer::time_point;
         };
 
-        element(time_point const& when_, value_type const& value_) : value(value_), when(when_)
+        Element(time_point const& when, value_type const& value) : value(value), when(when)
         {
         }
 
-        element(time_point const& when_, value_type&& value_)
-            : value(std::move(value_)), when(when_)
+        Element(time_point const& when, value_type&& value) : value(std::move(value)), when(when)
         {
         }
 
         template <
             class... Args,
             class = std::enable_if_t<std::is_constructible_v<value_type, Args...>>>
-        element(time_point const& when_, Args&&... args)
-            : value(std::forward<Args>(args)...), when(when_)
+        Element(time_point const& when, Args&&... args)
+            : value(std::forward<Args>(args)...), when(when)
         {
         }
 
@@ -128,7 +127,7 @@ private:
     class ValueHash : public Hash
     {
     public:
-        using argument_type = element;
+        using argument_type = Element;
         using result_type = size_t;
 
         ValueHash() = default;
@@ -138,19 +137,19 @@ private:
         }
 
         std::size_t
-        operator()(element const& e) const
+        operator()(Element const& e) const
         {
             return Hash::operator()(extract(e.value));
         }
 
         Hash&
-        hash_function()
+        hashFunction()
         {
             return *this;
         }
 
         [[nodiscard]] Hash const&
-        hash_function() const
+        hashFunction() const
         {
             return *this;
         }
@@ -162,7 +161,7 @@ private:
     {
     public:
         using first_argument_type = Key;
-        using second_argument_type = element;
+        using second_argument_type = Element;
         using result_type = bool;
 
         KeyValueEqual() = default;
@@ -172,49 +171,49 @@ private:
         }
 
         bool
-        operator()(Key const& k, element const& e) const
+        operator()(Key const& k, Element const& e) const
         {
             return KeyEqual::operator()(k, extract(e.value));
         }
 
         bool
-        operator()(element const& e, Key const& k) const
+        operator()(Element const& e, Key const& k) const
         {
             return KeyEqual::operator()(extract(e.value), k);
         }
 
         bool
-        operator()(element const& lhs, element const& rhs) const
+        operator()(Element const& lhs, Element const& rhs) const
         {
             return KeyEqual::operator()(extract(lhs.value), extract(rhs.value));
         }
 
         KeyEqual&
-        key_eq()
+        keyEq()
         {
             return *this;
         }
 
         [[nodiscard]] KeyEqual const&
-        key_eq() const
+        keyEq() const
         {
             return *this;
         }
     };
 
     using list_type = typename boost::intrusive::
-        make_list<element, boost::intrusive::constant_time_size<false>>::type;
+        make_list<Element, boost::intrusive::constant_time_size<false>>::type;
 
     using cont_type = std::conditional_t<
         IsMulti,
         typename boost::intrusive::make_unordered_multiset<
-            element,
+            Element,
             boost::intrusive::constant_time_size<true>,
             boost::intrusive::hash<ValueHash>,
             boost::intrusive::equal<KeyValueEqual>,
             boost::intrusive::cache_begin<true>>::type,
         typename boost::intrusive::make_unordered_set<
-            element,
+            Element,
             boost::intrusive::constant_time_size<true>,
             boost::intrusive::hash<ValueHash>,
             boost::intrusive::equal<KeyValueEqual>,
@@ -224,182 +223,181 @@ private:
     using bucket_traits = typename cont_type::bucket_traits;
 
     using ElementAllocator =
-        typename std::allocator_traits<Allocator>::template rebind_alloc<element>;
+        typename std::allocator_traits<Allocator>::template rebind_alloc<Element>;
 
     using ElementAllocatorTraits = std::allocator_traits<ElementAllocator>;
 
     using BucketAllocator =
-        typename std::allocator_traits<Allocator>::template rebind_alloc<element>;
+        typename std::allocator_traits<Allocator>::template rebind_alloc<Element>;
 
     using BucketAllocatorTraits = std::allocator_traits<BucketAllocator>;
 
-    class config_t : private ValueHash,
-                     private KeyValueEqual,
-                     private beast::detail::empty_base_optimization<ElementAllocator>
+    class ConfigT : private ValueHash,
+                    private KeyValueEqual,
+                    private beast::detail::EmptyBaseOptimization<ElementAllocator>
     {
     public:
-        explicit config_t(clock_type& clock_) : clock(clock_)
+        explicit ConfigT(clock_type& clock) : clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Hash const& hash) : ValueHash(hash), clock(clock_)
+        ConfigT(clock_type& clock, Hash const& hash) : ValueHash(hash), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, KeyEqual const& keyEqual)
-            : KeyValueEqual(keyEqual), clock(clock_)
+        ConfigT(clock_type& clock, KeyEqual const& keyEqual) : KeyValueEqual(keyEqual), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Allocator const& alloc_)
-            : beast::detail::empty_base_optimization<ElementAllocator>(alloc_), clock(clock_)
+        ConfigT(clock_type& clock, Allocator const& alloc)
+            : beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Hash const& hash, KeyEqual const& keyEqual)
-            : ValueHash(hash), KeyValueEqual(keyEqual), clock(clock_)
+        ConfigT(clock_type& clock, Hash const& hash, KeyEqual const& keyEqual)
+            : ValueHash(hash), KeyValueEqual(keyEqual), clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, Hash const& hash, Allocator const& alloc_)
+        ConfigT(clock_type& clock, Hash const& hash, Allocator const& alloc)
             : ValueHash(hash)
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc_)
-            , clock(clock_)
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
+            , clock(clock)
         {
         }
 
-        config_t(clock_type& clock_, KeyEqual const& keyEqual, Allocator const& alloc_)
+        ConfigT(clock_type& clock, KeyEqual const& keyEqual, Allocator const& alloc)
             : KeyValueEqual(keyEqual)
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc_)
-            , clock(clock_)
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
+            , clock(clock)
         {
         }
 
-        config_t(
-            clock_type& clock_,
+        ConfigT(
+            clock_type& clock,
             Hash const& hash,
             KeyEqual const& keyEqual,
-            Allocator const& alloc_)
+            Allocator const& alloc)
             : ValueHash(hash)
             , KeyValueEqual(keyEqual)
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc_)
-            , clock(clock_)
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
+            , clock(clock)
         {
         }
 
-        config_t(config_t const& other)
-            : ValueHash(other.hash_function())
-            , KeyValueEqual(other.key_eq())
-            , beast::detail::empty_base_optimization<ElementAllocator>(
+        ConfigT(ConfigT const& other)
+            : ValueHash(other.hashFunction())
+            , KeyValueEqual(other.keyEq())
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(
                   ElementAllocatorTraits::select_on_container_copy_construction(other.alloc()))
             , clock(other.clock)
         {
         }
 
-        config_t(config_t const& other, Allocator const& alloc)
-            : ValueHash(other.hash_function())
-            , KeyValueEqual(other.key_eq())
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc)
+        ConfigT(ConfigT const& other, Allocator const& alloc)
+            : ValueHash(other.hashFunction())
+            , KeyValueEqual(other.keyEq())
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
             , clock(other.clock)
         {
         }
 
-        config_t(config_t&& other)
-            : ValueHash(std::move(other.hash_function()))
-            , KeyValueEqual(std::move(other.key_eq()))
-            , beast::detail::empty_base_optimization<ElementAllocator>(std::move(other.alloc()))
+        ConfigT(ConfigT&& other)
+            : ValueHash(std::move(other.hashFunction()))
+            , KeyValueEqual(std::move(other.keyEq()))
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(std::move(other.alloc()))
             , clock(other.clock)
         {
         }
 
-        config_t(
-            config_t&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
+        ConfigT(
+            ConfigT&& other,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
             Allocator const& alloc)
-            : ValueHash(std::move(other.hash_function()))
-            , KeyValueEqual(std::move(other.key_eq()))
-            , beast::detail::empty_base_optimization<ElementAllocator>(alloc)
+            : ValueHash(std::move(other.hashFunction()))
+            , KeyValueEqual(std::move(other.keyEq()))
+            , beast::detail::EmptyBaseOptimization<ElementAllocator>(alloc)
             , clock(other.clock)
         {
         }
 
-        config_t&
-        operator=(config_t const& other)
+        ConfigT&
+        operator=(ConfigT const& other)
         {
-            hash_function() = other.hash_function();
-            key_eq() = other.key_eq();
+            hashFunction() = other.hashFunction();
+            keyEq() = other.keyEq();
             alloc() = other.alloc();
             clock = other.clock;
             return *this;
         }
 
-        config_t&
-        operator=(config_t&& other)
+        ConfigT&
+        operator=(ConfigT&& other)
         {
-            hash_function() = std::move(other.hash_function());
-            key_eq() = std::move(other.key_eq());
+            hashFunction() = std::move(other.hashFunction());
+            keyEq() = std::move(other.keyEq());
             alloc() = std::move(other.alloc());
             clock = other.clock;
             return *this;
         }
 
         ValueHash&
-        value_hash()
+        valueHash()
         {
             return *this;
         }
 
         [[nodiscard]] ValueHash const&
-        value_hash() const
+        valueHash() const
         {
             return *this;
         }
 
         Hash&
-        hash_function()
+        hashFunction()
         {
-            return ValueHash::hash_function();
+            return ValueHash::hashFunction();
         }
 
         [[nodiscard]] Hash const&
-        hash_function() const
+        hashFunction() const
         {
-            return ValueHash::hash_function();
+            return ValueHash::hashFunction();
         }
 
         KeyValueEqual&
-        key_value_equal()
+        keyValueEqual()
         {
             return *this;
         }
 
         [[nodiscard]] KeyValueEqual const&
-        key_value_equal() const
+        keyValueEqual() const
         {
             return *this;
         }
 
         KeyEqual&
-        key_eq()
+        keyEq()
         {
-            return key_value_equal().key_eq();
+            return keyValueEqual().keyEq();
         }
 
         [[nodiscard]] KeyEqual const&
-        key_eq() const
+        keyEq() const
         {
-            return key_value_equal().key_eq();
+            return keyValueEqual().keyEq();
         }
 
         ElementAllocator&
         alloc()
         {
-            return beast::detail::empty_base_optimization<ElementAllocator>::member();
+            return beast::detail::EmptyBaseOptimization<ElementAllocator>::member();
         }
 
         [[nodiscard]] ElementAllocator const&
         alloc() const
         {
-            return beast::detail::empty_base_optimization<ElementAllocator>::member();
+            return beast::detail::EmptyBaseOptimization<ElementAllocator>::member();
         }
 
         std::reference_wrapper<clock_type> clock;
@@ -412,43 +410,43 @@ private:
             bucket_type,
             typename std::allocator_traits<Allocator>::template rebind_alloc<bucket_type>>;
 
-        Buckets() : m_max_load_factor(1.f), m_vec()
+        Buckets() : maxLoadFactor_(1.f), vec_()
         {
-            m_vec.resize(cont_type::suggested_upper_bucket_count(0));
+            vec_.resize(cont_type::suggested_upper_bucket_count(0));
         }
 
-        Buckets(Allocator const& alloc) : m_max_load_factor(1.f), m_vec(alloc)
+        Buckets(Allocator const& alloc) : maxLoadFactor_(1.f), vec_(alloc)
         {
-            m_vec.resize(cont_type::suggested_upper_bucket_count(0));
+            vec_.resize(cont_type::suggested_upper_bucket_count(0));
         }
 
         operator bucket_traits()
         {
-            return bucket_traits(&m_vec[0], m_vec.size());
+            return bucket_traits(&vec_[0], vec_.size());
         }
 
         void
         clear()
         {
-            m_vec.clear();
+            vec_.clear();
         }
 
         [[nodiscard]] size_type
-        max_bucket_count() const
+        maxBucketCount() const
         {
-            return m_vec.max_size();
+            return vec_.max_size();
         }
 
         float&
-        max_load_factor()
+        maxLoadFactor()
         {
-            return m_max_load_factor;
+            return maxLoadFactor_;
         }
 
         [[nodiscard]] float const&
-        max_load_factor() const
+        maxLoadFactor() const
         {
-            return m_max_load_factor;
+            return maxLoadFactor_;
         }
 
         // count is the number of buckets
@@ -456,17 +454,17 @@ private:
         void
         rehash(size_type count, Container& c)
         {
-            size_type const size(m_vec.size());
+            size_type const size(vec_.size());
             if (count == size)
                 return;
-            if (count > m_vec.capacity())
+            if (count > vec_.capacity())
             {
                 // Need two vectors otherwise we
                 // will destroy non-empty buckets.
-                vec_type vec(m_vec.get_allocator());
-                std::swap(m_vec, vec);
-                m_vec.resize(count);
-                c.rehash(bucket_traits(&m_vec[0], m_vec.size()));
+                vec_type vec(vec_.get_allocator());
+                std::swap(vec_, vec);
+                vec_.resize(count);
+                c.rehash(bucket_traits(&vec_[0], vec_.size()));
                 return;
             }
             // Rehash in place.
@@ -474,14 +472,14 @@ private:
             {
                 // This should not reallocate since
                 // we checked capacity earlier.
-                m_vec.resize(count);
-                c.rehash(bucket_traits(&m_vec[0], count));
+                vec_.resize(count);
+                c.rehash(bucket_traits(&vec_[0], count));
                 return;
             }
             // Resize must happen after rehash otherwise
             // we might destroy non-empty buckets.
-            c.rehash(bucket_traits(&m_vec[0], count));
-            m_vec.resize(count);
+            c.rehash(bucket_traits(&vec_[0], count));
+            vec_.resize(count);
         }
 
         // Resize the buckets to accommodate at least n items.
@@ -494,48 +492,48 @@ private:
         }
 
     private:
-        float m_max_load_factor;
-        vec_type m_vec;
+        float maxLoadFactor_;
+        vec_type vec_;
     };
 
     template <class... Args>
-    element*
-    new_element(Args&&... args)
+    Element*
+    newElement(Args&&... args)
     {
         struct Deleter
         {
-            std::reference_wrapper<ElementAllocator> a_;
-            Deleter(ElementAllocator& a) : a_(a)
+            std::reference_wrapper<ElementAllocator> a;
+            Deleter(ElementAllocator& a) : a(a)
             {
             }
 
             void
-            operator()(element* p)
+            operator()(Element* p)
             {
-                ElementAllocatorTraits::deallocate(a_.get(), p, 1);
+                ElementAllocatorTraits::deallocate(a.get(), p, 1);
             }
         };
 
-        std::unique_ptr<element, Deleter> p(
-            ElementAllocatorTraits::allocate(m_config.alloc(), 1), Deleter(m_config.alloc()));
+        std::unique_ptr<Element, Deleter> p(
+            ElementAllocatorTraits::allocate(config_.alloc(), 1), Deleter(config_.alloc()));
         ElementAllocatorTraits::construct(
-            m_config.alloc(), p.get(), clock().now(), std::forward<Args>(args)...);
+            config_.alloc(), p.get(), clock().now(), std::forward<Args>(args)...);
         return p.release();
     }
 
     void
-    delete_element(element const* p)
+    deleteElement(Element const* p)
     {
-        ElementAllocatorTraits::destroy(m_config.alloc(), p);
-        ElementAllocatorTraits::deallocate(m_config.alloc(), const_cast<element*>(p), 1);
+        ElementAllocatorTraits::destroy(config_.alloc(), p);
+        ElementAllocatorTraits::deallocate(config_.alloc(), const_cast<Element*>(p), 1);
     }
 
     void
-    unlink_and_delete_element(element const* p)
+    unlinkAndDeleteElement(Element const* p)
     {
-        chronological.list.erase(chronological.list.iterator_to(*p));
-        m_cont.erase(m_cont.iterator_to(*p));
-        delete_element(p);
+        chronological.list_.erase(chronological.list_.iterator_to(*p));
+        cont_.erase(cont_.iterator_to(*p));
+        deleteElement(p);
     }
 
 public:
@@ -549,14 +547,13 @@ public:
 
     // A set iterator (IsMap==false) is always const
     // because the elements of a set are immutable.
-    using iterator = beast::detail::aged_container_iterator<!IsMap, typename cont_type::iterator>;
-    using const_iterator =
-        beast::detail::aged_container_iterator<true, typename cont_type::iterator>;
+    using iterator = beast::detail::AgedContainerIterator<!IsMap, typename cont_type::iterator>;
+    using const_iterator = beast::detail::AgedContainerIterator<true, typename cont_type::iterator>;
 
     using local_iterator =
-        beast::detail::aged_container_iterator<!IsMap, typename cont_type::local_iterator>;
+        beast::detail::AgedContainerIterator<!IsMap, typename cont_type::local_iterator>;
     using const_local_iterator =
-        beast::detail::aged_container_iterator<true, typename cont_type::local_iterator>;
+        beast::detail::AgedContainerIterator<true, typename cont_type::local_iterator>;
 
     //--------------------------------------------------------------------------
     //
@@ -567,117 +564,116 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    class chronological_t
+    class ChronologicalT
     {
     public:
         // A set iterator (IsMap==false) is always const
         // because the elements of a set are immutable.
-        using iterator =
-            beast::detail::aged_container_iterator<!IsMap, typename list_type::iterator>;
+        using iterator = beast::detail::AgedContainerIterator<!IsMap, typename list_type::iterator>;
         using const_iterator =
-            beast::detail::aged_container_iterator<true, typename list_type::iterator>;
+            beast::detail::AgedContainerIterator<true, typename list_type::iterator>;
         using reverse_iterator =
-            beast::detail::aged_container_iterator<!IsMap, typename list_type::reverse_iterator>;
+            beast::detail::AgedContainerIterator<!IsMap, typename list_type::reverse_iterator>;
         using const_reverse_iterator =
-            beast::detail::aged_container_iterator<true, typename list_type::reverse_iterator>;
+            beast::detail::AgedContainerIterator<true, typename list_type::reverse_iterator>;
 
         iterator
         begin()
         {
-            return iterator(list.begin());
+            return iterator(list_.begin());
         }
 
         const_iterator
         begin() const
         {
-            return const_iterator(list.begin());
+            return const_iterator(list_.begin());
         }
 
         const_iterator
         cbegin() const
         {
-            return const_iterator(list.begin());
+            return const_iterator(list_.begin());
         }
 
         iterator
         end()
         {
-            return iterator(list.end());
+            return iterator(list_.end());
         }
 
         const_iterator
         end() const
         {
-            return const_iterator(list.end());
+            return const_iterator(list_.end());
         }
 
         const_iterator
         cend() const
         {
-            return const_iterator(list.end());
+            return const_iterator(list_.end());
         }
 
         reverse_iterator
         rbegin()
         {
-            return reverse_iterator(list.rbegin());
+            return reverse_iterator(list_.rbegin());
         }
 
         const_reverse_iterator
         rbegin() const
         {
-            return const_reverse_iterator(list.rbegin());
+            return const_reverse_iterator(list_.rbegin());
         }
 
         const_reverse_iterator
         crbegin() const
         {
-            return const_reverse_iterator(list.rbegin());
+            return const_reverse_iterator(list_.rbegin());
         }
 
         reverse_iterator
         rend()
         {
-            return reverse_iterator(list.rend());
+            return reverse_iterator(list_.rend());
         }
 
         const_reverse_iterator
         rend() const
         {
-            return const_reverse_iterator(list.rend());
+            return const_reverse_iterator(list_.rend());
         }
 
         const_reverse_iterator
         crend() const
         {
-            return const_reverse_iterator(list.rend());
+            return const_reverse_iterator(list_.rend());
         }
 
         iterator
-        iterator_to(value_type& value)
+        iteratorTo(value_type& value)
         {
-            static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-            return list.iterator_to(*reinterpret_cast<element*>(
+            static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+            return list_.iterator_to(*reinterpret_cast<Element*>(
                 reinterpret_cast<uint8_t*>(&value) -
-                ((std::size_t)std::addressof(((element*)0)->member))));
+                ((std::size_t)std::addressof(((Element*)0)->member))));
         }
 
         const_iterator
-        iterator_to(value_type const& value) const
+        iteratorTo(value_type const& value) const
         {
-            static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-            return list.iterator_to(*reinterpret_cast<element const*>(
+            static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+            return list_.iterator_to(*reinterpret_cast<Element const*>(
                 reinterpret_cast<uint8_t const*>(&value) -
-                ((std::size_t)std::addressof(((element*)0)->member))));
+                ((std::size_t)std::addressof(((Element*)0)->member))));
         }
 
-        chronological_t(chronological_t const&) = delete;
-        chronological_t(chronological_t&&) = delete;
-        chronological_t() = default;
+        ChronologicalT(ChronologicalT const&) = delete;
+        ChronologicalT(ChronologicalT&&) = delete;
+        ChronologicalT() = default;
 
     private:
-        friend class aged_unordered_container;
-        list_type mutable list;
+        friend class AgedUnorderedContainer;
+        list_type mutable list_;
     } chronological;
 
     //--------------------------------------------------------------------------
@@ -686,58 +682,50 @@ public:
     //
     //--------------------------------------------------------------------------
 
-    aged_unordered_container() = delete;
+    AgedUnorderedContainer() = delete;
 
-    explicit aged_unordered_container(clock_type& clock);
+    explicit AgedUnorderedContainer(clock_type& clock);
 
-    aged_unordered_container(clock_type& clock, Hash const& hash);
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash);
 
-    aged_unordered_container(clock_type& clock, KeyEqual const& key_eq);
+    AgedUnorderedContainer(clock_type& clock, KeyEqual const& keyEq);
 
-    aged_unordered_container(clock_type& clock, Allocator const& alloc);
+    AgedUnorderedContainer(clock_type& clock, Allocator const& alloc);
 
-    aged_unordered_container(clock_type& clock, Hash const& hash, KeyEqual const& key_eq);
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash, KeyEqual const& keyEq);
 
-    aged_unordered_container(clock_type& clock, Hash const& hash, Allocator const& alloc);
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash, Allocator const& alloc);
 
-    aged_unordered_container(clock_type& clock, KeyEqual const& key_eq, Allocator const& alloc);
+    AgedUnorderedContainer(clock_type& clock, KeyEqual const& keyEq, Allocator const& alloc);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc);
 
     template <class InputIt>
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock);
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock);
 
     template <class InputIt>
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock, Hash const& hash);
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, Hash const& hash);
 
     template <class InputIt>
-    aged_unordered_container(
-        InputIt first,
-        InputIt last,
-        clock_type& clock,
-        KeyEqual const& key_eq);
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, KeyEqual const& keyEq);
 
     template <class InputIt>
-    aged_unordered_container(
-        InputIt first,
-        InputIt last,
-        clock_type& clock,
-        Allocator const& alloc);
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, Allocator const& alloc);
 
     template <class InputIt>
-    aged_unordered_container(
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq);
+        KeyEqual const& keyEq);
 
     template <class InputIt>
-    aged_unordered_container(
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
@@ -745,102 +733,102 @@ public:
         Allocator const& alloc);
 
     template <class InputIt>
-    aged_unordered_container(
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc);
 
     template <class InputIt>
-    aged_unordered_container(
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc);
 
-    aged_unordered_container(aged_unordered_container const& other);
+    AgedUnorderedContainer(AgedUnorderedContainer const& other);
 
-    aged_unordered_container(aged_unordered_container const& other, Allocator const& alloc);
+    AgedUnorderedContainer(AgedUnorderedContainer const& other, Allocator const& alloc);
 
-    aged_unordered_container(aged_unordered_container&& other);
+    AgedUnorderedContainer(AgedUnorderedContainer&& other);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
-        aged_unordered_container&& other,
+        AgedUnorderedContainer&& other,
         Allocator const& alloc);
 
-    aged_unordered_container(std::initializer_list<value_type> init, clock_type& clock);
+    AgedUnorderedContainer(std::initializer_list<value_type> init, clock_type& clock);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
-        KeyEqual const& key_eq);
+        KeyEqual const& keyEq);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Allocator const& alloc);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq);
+        KeyEqual const& keyEq);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
         Allocator const& alloc);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc);
 
-    aged_unordered_container(
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc);
 
-    ~aged_unordered_container();
+    ~AgedUnorderedContainer();
 
-    aged_unordered_container&
-    operator=(aged_unordered_container const& other);
+    AgedUnorderedContainer&
+    operator=(AgedUnorderedContainer const& other);
 
-    aged_unordered_container&
-    operator=(aged_unordered_container&& other);
+    AgedUnorderedContainer&
+    operator=(AgedUnorderedContainer&& other);
 
-    aged_unordered_container&
+    AgedUnorderedContainer&
     operator=(std::initializer_list<value_type> init);
 
     allocator_type
-    get_allocator() const
+    getAllocator() const
     {
-        return m_config.alloc();
+        return config_.alloc();
     }
 
     clock_type&
     clock()
     {
-        return m_config.clock;
+        return config_.clock;
     }
 
     clock_type const&
     clock() const
     {
-        return m_config.clock;
+        return config_.clock;
     }
 
     //--------------------------------------------------------------------------
@@ -851,31 +839,31 @@ public:
 
     template <
         class K,
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     at(K const& k);
 
     template <
         class K,
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     typename std::conditional<IsMap, T, void*>::type const&
     at(K const& k) const;
 
     template <
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     operator[](Key const& key);
 
     template <
-        bool maybe_multi = IsMulti,
-        bool maybe_map = IsMap,
-        class = std::enable_if_t<maybe_map && !maybe_multi>>
+        bool MaybeMulti = IsMulti,
+        bool MaybeMap = IsMap,
+        class = std::enable_if_t<MaybeMap && !MaybeMulti>>
     std::conditional_t<IsMap, T, void*>&
     operator[](Key&& key);
 
@@ -888,55 +876,55 @@ public:
     iterator
     begin()
     {
-        return iterator(m_cont.begin());
+        return iterator(cont_.begin());
     }
 
     const_iterator
     begin() const
     {
-        return const_iterator(m_cont.begin());
+        return const_iterator(cont_.begin());
     }
 
     const_iterator
     cbegin() const
     {
-        return const_iterator(m_cont.begin());
+        return const_iterator(cont_.begin());
     }
 
     iterator
     end()
     {
-        return iterator(m_cont.end());
+        return iterator(cont_.end());
     }
 
     const_iterator
     end() const
     {
-        return const_iterator(m_cont.end());
+        return const_iterator(cont_.end());
     }
 
     const_iterator
     cend() const
     {
-        return const_iterator(m_cont.end());
+        return const_iterator(cont_.end());
     }
 
     iterator
-    iterator_to(value_type& value)
+    iteratorTo(value_type& value)
     {
-        static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-        return m_cont.iterator_to(*reinterpret_cast<element*>(
+        static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+        return cont_.iterator_to(*reinterpret_cast<Element*>(
             reinterpret_cast<uint8_t*>(&value) -
-            ((std::size_t)std::addressof(((element*)0)->member))));
+            ((std::size_t)std::addressof(((Element*)0)->member))));
     }
 
     const_iterator
-    iterator_to(value_type const& value) const
+    iteratorTo(value_type const& value) const
     {
-        static_assert(std::is_standard_layout_v<element>, "must be standard layout");
-        return m_cont.iterator_to(*reinterpret_cast<element const*>(
+        static_assert(std::is_standard_layout_v<Element>, "must be standard layout");
+        return cont_.iterator_to(*reinterpret_cast<Element const*>(
             reinterpret_cast<uint8_t const*>(&value) -
-            ((std::size_t)std::addressof(((element*)0)->member))));
+            ((std::size_t)std::addressof(((Element*)0)->member))));
     }
 
     //--------------------------------------------------------------------------
@@ -948,19 +936,19 @@ public:
     bool
     empty() const noexcept
     {
-        return m_cont.empty();
+        return cont_.empty();
     }
 
     size_type
     size() const noexcept
     {
-        return m_cont.size();
+        return cont_.size();
     }
 
     size_type
-    max_size() const noexcept
+    maxSize() const noexcept
     {
-        return m_config.max_size();
+        return config_.max_size();
     }
 
     //--------------------------------------------------------------------------
@@ -973,29 +961,29 @@ public:
     clear();
 
     // map, set
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    insert(value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert(value_type const& value) -> std::enable_if_t<maybe_multi, iterator>;
+    insert(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // map, set
-    template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
+    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
     insert(value_type&& value)
-        -> std::enable_if_t<!maybe_multi && !maybe_map, std::pair<iterator, bool>>;
+        -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti, bool maybe_map = IsMap>
+    template <bool MaybeMulti = IsMulti, bool MaybeMap = IsMap>
     auto
-    insert(value_type&& value) -> std::enable_if_t<maybe_multi && !maybe_map, iterator>;
+    insert(value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>;
 
     // map, set
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<!maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<!MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
     {
         // Hint is ignored but we provide the interface so
@@ -1004,8 +992,8 @@ public:
     }
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type const& value)
     {
         // VFALCO TODO The hint could be used to let
@@ -1014,8 +1002,8 @@ public:
     }
 
     // map, set
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<!maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<!MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
     {
         // Hint is ignored but we provide the interface so
@@ -1024,8 +1012,8 @@ public:
     }
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
-    std::enable_if_t<maybe_multi, iterator>
+    template <bool MaybeMulti = IsMulti>
+    std::enable_if_t<MaybeMulti, iterator>
     insert(const_iterator /*hint*/, value_type&& value)
     {
         // VFALCO TODO The hint could be used to let
@@ -1034,9 +1022,9 @@ public:
     }
 
     // map, multimap
-    template <class P, bool maybe_map = IsMap>
+    template <class P, bool MaybeMap = IsMap>
     std::enable_if_t<
-        maybe_map && std::is_constructible_v<value_type, P&&>,
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
         std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(P&& value)
     {
@@ -1044,13 +1032,13 @@ public:
     }
 
     // map, multimap
-    template <class P, bool maybe_map = IsMap>
+    template <class P, bool MaybeMap = IsMap>
     std::enable_if_t<
-        maybe_map && std::is_constructible_v<value_type, P&&>,
+        MaybeMap && std::is_constructible_v<value_type, P&&>,
         std::conditional_t<IsMulti, iterator, std::pair<iterator, bool>>>
     insert(const_iterator hint, P&& value)
     {
-        return emplace_hint(hint, std::forward<P>(value));
+        return emplaceHint(hint, std::forward<P>(value));
     }
 
     template <class InputIt>
@@ -1067,51 +1055,51 @@ public:
     }
 
     // set, map
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    emplace(Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace(Args&&... args) -> std::enable_if_t<maybe_multi, iterator>;
+    emplace(Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>;
 
     // set, map
-    template <bool maybe_multi = IsMulti, class... Args>
+    template <bool MaybeMulti = IsMulti, class... Args>
     auto
-    emplace_hint(const_iterator /*hint*/, Args&&... args)
-        -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    emplaceHint(const_iterator /*hint*/, Args&&... args)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multiset, multimap
-    template <bool maybe_multi = IsMulti, class... Args>
-    std::enable_if_t<maybe_multi, iterator>
-    emplace_hint(const_iterator /*hint*/, Args&&... args)
+    template <bool MaybeMulti = IsMulti, class... Args>
+    std::enable_if_t<MaybeMulti, iterator>
+    emplaceHint(const_iterator /*hint*/, Args&&... args)
     {
         // VFALCO TODO The hint could be used for multi, to let
         //             the client order equal ranges
-        return emplace<maybe_multi>(std::forward<Args>(args)...);
+        return emplace<MaybeMulti>(std::forward<Args>(args)...);
     }
 
-    template <bool is_const, class Iterator>
-    beast::detail::aged_container_iterator<false, Iterator>
-    erase(beast::detail::aged_container_iterator<is_const, Iterator> pos);
+    template <bool IsConst, class Iterator>
+    beast::detail::AgedContainerIterator<false, Iterator>
+    erase(beast::detail::AgedContainerIterator<IsConst, Iterator> pos);
 
-    template <bool is_const, class Iterator>
-    beast::detail::aged_container_iterator<false, Iterator>
+    template <bool IsConst, class Iterator>
+    beast::detail::AgedContainerIterator<false, Iterator>
     erase(
-        beast::detail::aged_container_iterator<is_const, Iterator> first,
-        beast::detail::aged_container_iterator<is_const, Iterator> last);
+        beast::detail::AgedContainerIterator<IsConst, Iterator> first,
+        beast::detail::AgedContainerIterator<IsConst, Iterator> last);
 
     template <class K>
     auto
     erase(K const& k) -> size_type;
 
     void
-    swap(aged_unordered_container& other) noexcept;
+    swap(AgedUnorderedContainer& other) noexcept;
 
-    template <bool is_const, class Iterator>
+    template <bool IsConst, class Iterator>
     void
-    touch(beast::detail::aged_container_iterator<is_const, Iterator> pos)
+    touch(beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
     {
         touch(pos, clock().now());
     }
@@ -1131,8 +1119,8 @@ public:
     size_type
     count(K const& k) const
     {
-        return m_cont.count(
-            k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal()));
+        return cont_.count(
+            k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
@@ -1140,8 +1128,8 @@ public:
     iterator
     find(K const& k)
     {
-        return iterator(m_cont.find(
-            k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
+        return iterator(
+            cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
@@ -1149,27 +1137,27 @@ public:
     const_iterator
     find(K const& k) const
     {
-        return const_iterator(m_cont.find(
-            k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
+        return const_iterator(
+            cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     std::pair<iterator, iterator>
-    equal_range(K const& k)
+    equalRange(K const& k)
     {
-        auto const r(m_cont.equal_range(
-            k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
+        auto const r(cont_.equal_range(
+            k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
         return std::make_pair(iterator(r.first), iterator(r.second));
     }
 
     // VFALCO TODO Respect is_transparent (c++14)
     template <class K>
     std::pair<const_iterator, const_iterator>
-    equal_range(K const& k) const
+    equalRange(K const& k) const
     {
-        auto const r(m_cont.equal_range(
-            k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
+        auto const r(cont_.equal_range(
+            k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
         return std::make_pair(const_iterator(r.first), const_iterator(r.second));
     }
 
@@ -1182,65 +1170,65 @@ public:
     local_iterator
     begin(size_type n)
     {
-        return local_iterator(m_cont.begin(n));
+        return local_iterator(cont_.begin(n));
     }
 
     const_local_iterator
     begin(size_type n) const
     {
-        return const_local_iterator(m_cont.begin(n));
+        return const_local_iterator(cont_.begin(n));
     }
 
     const_local_iterator
     cbegin(size_type n) const
     {
-        return const_local_iterator(m_cont.begin(n));
+        return const_local_iterator(cont_.begin(n));
     }
 
     local_iterator
     end(size_type n)
     {
-        return local_iterator(m_cont.end(n));
+        return local_iterator(cont_.end(n));
     }
 
     const_local_iterator
     end(size_type n) const
     {
-        return const_local_iterator(m_cont.end(n));
+        return const_local_iterator(cont_.end(n));
     }
 
     const_local_iterator
     cend(size_type n) const
     {
-        return const_local_iterator(m_cont.end(n));
+        return const_local_iterator(cont_.end(n));
     }
 
     size_type
-    bucket_count() const
+    bucketCount() const
     {
-        return m_cont.bucket_count();
+        return cont_.bucket_count();
     }
 
     size_type
-    max_bucket_count() const
+    maxBucketCount() const
     {
-        return m_buck.max_bucket_count();
+        return buck_.maxBucketCount();
     }
 
     size_type
-    bucket_size(size_type n) const
+    bucketSize(size_type n) const
     {
-        return m_cont.bucket_size(n);
+        return cont_.bucket_size(n);
     }
 
     size_type
     bucket(Key const& k) const
     {
         XRPL_ASSERT(
-            bucket_count() != 0,
-            "beast::detail::aged_unordered_container::bucket : nonzero bucket "
+            bucketCount() != 0,
+            "beast::detail::AgedUnorderedContainer::bucket : nonzero bucket "
             "count");
-        return m_cont.bucket(k, std::cref(m_config.hash_function()));
+        return cont_.bucket(k, std::cref(config_.hashFunction()));
     }
 
     //--------------------------------------------------------------------------
@@ -1250,34 +1238,34 @@ public:
     //--------------------------------------------------------------------------
 
     float
-    load_factor() const
+    loadFactor() const
     {
-        return size() / static_cast<float>(m_cont.bucket_count());
+        return size() / static_cast<float>(cont_.bucket_count());
     }
 
     float
-    max_load_factor() const
+    maxLoadFactor() const
     {
-        return m_buck.max_load_factor();
+        return buck_.maxLoadFactor();
     }
 
     void
-    max_load_factor(float ml)
+    maxLoadFactor(float ml)
     {
-        m_buck.max_load_factor() = std::max(ml, m_buck.max_load_factor());
+        buck_.maxLoadFactor() = std::max(ml, buck_.maxLoadFactor());
     }
 
     void
     rehash(size_type count)
     {
-        count = std::max(count, size_type(size() / max_load_factor()));
-        m_buck.rehash(count, m_cont);
+        count = std::max(count, size_type(size() / maxLoadFactor()));
+        buck_.rehash(count, cont_);
     }
 
     void
     reserve(size_type count)
     {
-        rehash(std::ceil(count / max_load_factor()));
+        rehash(std::ceil(count / maxLoadFactor()));
     }
 
     //--------------------------------------------------------------------------
@@ -1287,15 +1275,15 @@ public:
     //--------------------------------------------------------------------------
 
     hasher const&
-    hash_function() const
+    hashFunction() const
     {
-        return m_config.hash_function();
+        return config_.hashFunction();
     }
 
     key_equal const&
-    key_eq() const
+    keyEq() const
     {
-        return m_config.key_eq();
+        return config_.keyEq();
     }
 
     //--------------------------------------------------------------------------
@@ -1315,9 +1303,9 @@ public:
         class OtherDuration,
         class OtherHash,
         class OtherAllocator,
-        bool maybe_multi = IsMulti>
-    std::enable_if_t<!maybe_multi, bool>
-    operator==(aged_unordered_container<
+        bool MaybeMulti = IsMulti>
+    std::enable_if_t<!MaybeMulti, bool>
+    operator==(AgedUnorderedContainer<
                false,
                OtherIsMap,
                OtherKey,
@@ -1334,9 +1322,9 @@ public:
         class OtherDuration,
         class OtherHash,
         class OtherAllocator,
-        bool maybe_multi = IsMulti>
-    std::enable_if_t<maybe_multi, bool>
-    operator==(aged_unordered_container<
+        bool MaybeMulti = IsMulti>
+    std::enable_if_t<MaybeMulti, bool>
+    operator==(AgedUnorderedContainer<
                true,
                OtherIsMap,
                OtherKey,
@@ -1355,7 +1343,7 @@ public:
         class OtherHash,
         class OtherAllocator>
     bool
-    operator!=(aged_unordered_container<
+    operator!=(AgedUnorderedContainer<
                OtherIsMulti,
                OtherIsMap,
                OtherKey,
@@ -1370,39 +1358,39 @@ public:
 
 private:
     bool
-    would_exceed(size_type additional) const
+    wouldExceed(size_type additional) const
     {
-        return size() + additional > bucket_count() * max_load_factor();
+        return size() + additional > bucketCount() * maxLoadFactor();
     }
 
     void
-    maybe_rehash(size_type additional)
+    maybeRehash(size_type additional)
     {
-        if (would_exceed(additional))
-            m_buck.resize(size() + additional, m_cont);
+        if (wouldExceed(additional))
+            buck_.resize(size() + additional, cont_);
         XRPL_ASSERT(
-            load_factor() <= max_load_factor(),
-            "beast::detail::aged_unordered_container::maybe_rehash : maximum "
+            loadFactor() <= maxLoadFactor(),
+            "beast::detail::AgedUnorderedContainer::maybe_rehash : maximum "
             "load factor");
     }
 
     // map, set
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert_unchecked(value_type const& value)
-        -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>;
+    insertUnchecked(value_type const& value)
+        -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>;
 
     // multimap, multiset
-    template <bool maybe_multi = IsMulti>
+    template <bool MaybeMulti = IsMulti>
     auto
-    insert_unchecked(value_type const& value) -> std::enable_if_t<maybe_multi, iterator>;
+    insertUnchecked(value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>;
 
     template <class InputIt>
     void
-    insert_unchecked(InputIt first, InputIt last)
+    insertUnchecked(InputIt first, InputIt last)
     {
         for (; first != last; ++first)
-            insert_unchecked(*first);
+            insertUnchecked(*first);
     }
 
     template <class InputIt>
@@ -1418,45 +1406,47 @@ private:
     insert(InputIt first, InputIt last, std::random_access_iterator_tag)
     {
         auto const n(std::distance(first, last));
-        maybe_rehash(n);
-        insert_unchecked(first, last);
+        maybeRehash(n);
+        insertUnchecked(first, last);
     }
 
-    template <bool is_const, class Iterator>
+    template <bool IsConst, class Iterator>
     void
     touch(
-        beast::detail::aged_container_iterator<is_const, Iterator> pos,
+        beast::detail::AgedContainerIterator<IsConst, Iterator> pos,
         typename clock_type::time_point const& now)
     {
         auto& e(*pos.iterator());
         e.when = now;
-        chronological.list.erase(chronological.list.iterator_to(e));
-        chronological.list.push_back(e);
+        chronological.list_.erase(chronological.list_.iterator_to(e));
+        chronological.list_.push_back(e);
     }
 
     template <
-        bool maybe_propagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    std::enable_if_t<maybe_propagate>
-    swap_data(aged_unordered_container& other) noexcept
+        bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
+    std::enable_if_t<MaybePropagate>
+    swapData(AgedUnorderedContainer& other) noexcept
     {
-        std::swap(m_config.key_compare(), other.m_config.key_compare());
-        std::swap(m_config.alloc(), other.m_config.alloc());
-        std::swap(m_config.clock, other.m_config.clock);
+        std::swap(config_.hashFunction(), other.config_.hashFunction());
+        std::swap(config_.keyEq(), other.config_.keyEq());
+        std::swap(config_.alloc(), other.config_.alloc());
+        std::swap(config_.clock, other.config_.clock);
     }
 
     template <
-        bool maybe_propagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
-    std::enable_if_t<!maybe_propagate>
-    swap_data(aged_unordered_container& other) noexcept
+        bool MaybePropagate = std::allocator_traits<Allocator>::propagate_on_container_swap::value>
+    std::enable_if_t<!MaybePropagate>
+    swapData(AgedUnorderedContainer& other) noexcept
     {
-        std::swap(m_config.key_compare(), other.m_config.key_compare());
-        std::swap(m_config.clock, other.m_config.clock);
+        std::swap(config_.hashFunction(), other.config_.hashFunction());
+        std::swap(config_.keyEq(), other.config_.keyEq());
+        std::swap(config_.clock, other.config_.clock);
     }
 
 private:
-    config_t m_config;
-    Buckets m_buck;
-    cont_type mutable m_cont;
+    ConfigT config_;
+    Buckets buck_;
+    cont_type mutable cont_;
 };
 
 //------------------------------------------------------------------------------
@@ -1470,10 +1460,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock)
-    : m_config(clock)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock)
+    : config_(clock)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1486,10 +1476,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, Hash const& hash)
-    : m_config(clock, hash)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash)
+    : config_(clock, hash)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1502,10 +1492,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, KeyEqual const& key_eq)
-    : m_config(clock, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, KeyEqual const& keyEq)
+    : config_(clock, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1518,11 +1508,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, Allocator const& alloc)
-    : m_config(clock, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, Allocator const& alloc)
+    : config_(clock, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1535,10 +1525,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, Hash const& hash, KeyEqual const& key_eq)
-    : m_config(clock, hash, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash, KeyEqual const& keyEq)
+    : config_(clock, hash, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1551,11 +1541,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, Hash const& hash, Allocator const& alloc)
-    : m_config(clock, hash, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, Hash const& hash, Allocator const& alloc)
+    : config_(clock, hash, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1568,11 +1558,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(clock_type& clock, KeyEqual const& key_eq, Allocator const& alloc)
-    : m_config(clock, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(clock_type& clock, KeyEqual const& keyEq, Allocator const& alloc)
+    : config_(clock, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1585,15 +1575,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc)
-    : m_config(clock, hash, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
 }
 
@@ -1607,10 +1597,10 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock)
-    : m_config(clock)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock)
+    : config_(clock)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1625,10 +1615,10 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock, Hash const& hash)
-    : m_config(clock, hash)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, Hash const& hash)
+    : config_(clock, hash)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1643,10 +1633,10 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock, KeyEqual const& key_eq)
-    : m_config(clock, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, KeyEqual const& keyEq)
+    : config_(clock, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1661,11 +1651,11 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(InputIt first, InputIt last, clock_type& clock, Allocator const& alloc)
-    : m_config(clock, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(InputIt first, InputIt last, clock_type& clock, Allocator const& alloc)
+    : config_(clock, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1680,15 +1670,15 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq)
-    : m_config(clock, hash, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+        KeyEqual const& keyEq)
+    : config_(clock, hash, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1703,16 +1693,16 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Hash const& hash,
         Allocator const& alloc)
-    : m_config(clock, hash, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1727,16 +1717,16 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc)
-    : m_config(clock, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1751,17 +1741,17 @@ template <
     class KeyEqual,
     class Allocator>
 template <class InputIt>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         InputIt first,
         InputIt last,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc)
-    : m_config(clock, hash, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(first, last);
 }
@@ -1775,11 +1765,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(aged_unordered_container const& other)
-    : m_config(other.m_config)
-    , m_buck(m_config.alloc())
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(AgedUnorderedContainer const& other)
+    : config_(other.config_)
+    , buck_(config_.alloc())
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(other.cbegin(), other.cend());
 }
@@ -1793,11 +1783,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(aged_unordered_container const& other, Allocator const& alloc)
-    : m_config(other.m_config, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(AgedUnorderedContainer const& other, Allocator const& alloc)
+    : config_(other.config_, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(other.cbegin(), other.cend());
 }
@@ -1811,13 +1801,13 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(aged_unordered_container&& other)
-    : m_config(std::move(other.m_config))
-    , m_buck(std::move(other.m_buck))
-    , m_cont(std::move(other.m_cont))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(AgedUnorderedContainer&& other)
+    : config_(std::move(other.config_))
+    , buck_(std::move(other.buck_))
+    , cont_(std::move(other.cont_))
 {
-    chronological.list = std::move(other.chronological.list);
+    chronological.list_ = std::move(other.chronological.list_);
 }
 
 template <
@@ -1829,14 +1819,14 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
-        aged_unordered_container&& other,
+        AgedUnorderedContainer&& other,
         Allocator const& alloc)
-    : m_config(std::move(other.m_config), alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(std::move(other.config_), alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(other.cbegin(), other.cend());
     other.clear();
@@ -1851,10 +1841,10 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(std::initializer_list<value_type> init, clock_type& clock)
-    : m_config(clock)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(std::initializer_list<value_type> init, clock_type& clock)
+    : config_(clock)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1868,13 +1858,13 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash)
-    : m_config(clock, hash)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1888,13 +1878,13 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
-        KeyEqual const& key_eq)
-    : m_config(clock, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+        KeyEqual const& keyEq)
+    : config_(clock, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1908,14 +1898,14 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Allocator const& alloc)
-    : m_config(clock, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1929,14 +1919,14 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq)
-    : m_config(clock, hash, key_eq)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+        KeyEqual const& keyEq)
+    : config_(clock, hash, keyEq)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1950,15 +1940,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
         Allocator const& alloc)
-    : m_config(clock, hash, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1972,15 +1962,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc)
-    : m_config(clock, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -1994,16 +1984,16 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    aged_unordered_container(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    AgedUnorderedContainer(
         std::initializer_list<value_type> init,
         clock_type& clock,
         Hash const& hash,
-        KeyEqual const& key_eq,
+        KeyEqual const& keyEq,
         Allocator const& alloc)
-    : m_config(clock, hash, key_eq, alloc)
-    , m_buck(alloc)
-    , m_cont(m_buck, std::cref(m_config.value_hash()), std::cref(m_config.key_value_equal()))
+    : config_(clock, hash, keyEq, alloc)
+    , buck_(alloc)
+    , cont_(buck_, std::cref(config_.valueHash()), std::cref(config_.keyValueEqual()))
 {
     insert(init.begin(), init.end());
 }
@@ -2017,8 +2007,8 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    ~aged_unordered_container()
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
+    ~AgedUnorderedContainer()
 {
     clear();
 }
@@ -2033,17 +2023,17 @@ template <
     class KeyEqual,
     class Allocator>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
-    aged_unordered_container const& other) -> aged_unordered_container&
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
+    AgedUnorderedContainer const& other) -> AgedUnorderedContainer&
 {
     if (this != &other)
     {
         size_type const n(other.size());
         clear();
-        m_config = other.m_config;
-        m_buck = Buckets(m_config.alloc());
-        maybe_rehash(n);
-        insert_unchecked(other.begin(), other.end());
+        config_ = other.config_;
+        buck_ = Buckets(config_.alloc());
+        maybeRehash(n);
+        insertUnchecked(other.begin(), other.end());
     }
     return *this;
 }
@@ -2058,15 +2048,15 @@ template <
     class KeyEqual,
     class Allocator>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
-    aged_unordered_container&& other) -> aged_unordered_container&
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
+    AgedUnorderedContainer&& other) -> AgedUnorderedContainer&
 {
     size_type const n(other.size());
     clear();
-    m_config = std::move(other.m_config);
-    m_buck = Buckets(m_config.alloc());
-    maybe_rehash(n);
-    insert_unchecked(other.begin(), other.end());
+    config_ = std::move(other.config_);
+    buck_ = Buckets(config_.alloc());
+    maybeRehash(n);
+    insertUnchecked(other.begin(), other.end());
     other.clear();
     return *this;
 }
@@ -2081,8 +2071,8 @@ template <
     class KeyEqual,
     class Allocator>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
-    std::initializer_list<value_type> init) -> aged_unordered_container&
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator=(
+    std::initializer_list<value_type> init) -> AgedUnorderedContainer&
 {
     clear();
     insert(init);
@@ -2100,13 +2090,13 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <class K, bool maybe_multi, bool maybe_map, class>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(K const& k)
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(K const& k)
 {
     auto const iter(
-        m_cont.find(k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
-    if (iter == m_cont.end())
+        cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
+    if (iter == cont_.end())
         throw std::out_of_range("key not found");
     return iter->value.second;
 }
@@ -2120,14 +2110,14 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <class K, bool maybe_multi, bool maybe_map, class>
+template <class K, bool MaybeMulti, bool MaybeMap, class>
 typename std::conditional<IsMap, T, void*>::type const&
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::at(
     K const& k) const
 {
     auto const iter(
-        m_cont.find(k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
-    if (iter == m_cont.end())
+        cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
+    if (iter == cont_.end())
         throw std::out_of_range("key not found");
     return iter->value.second;
 }
@@ -2141,21 +2131,21 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, bool maybe_map, class>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
     Key const& key)
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        key, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal()), d));
+    auto const result(cont_.insert_check(
+        key, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()), d));
     if (result.second)
     {
-        element* const p(new_element(
+        Element* const p(newElement(
             std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple()));
-        m_cont.insert_commit(*p, d);
-        chronological.list.push_back(*p);
+        cont_.insert_commit(*p, d);
+        chronological.list_.push_back(*p);
         return p->value.second;
     }
     return result.first->value.second;
@@ -2170,23 +2160,23 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, bool maybe_map, class>
+template <bool MaybeMulti, bool MaybeMap, class>
 std::conditional_t<IsMap, T, void*>&
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator[](
     Key&& key)
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        key, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal()), d));
+    auto const result(cont_.insert_check(
+        key, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()), d));
     if (result.second)
     {
-        element* const p(new_element(
+        Element* const p(newElement(
             std::piecewise_construct,
             std::forward_as_tuple(std::move(key)),
             std::forward_as_tuple()));
-        m_cont.insert_commit(*p, d);
-        chronological.list.push_back(*p);
+        cont_.insert_commit(*p, d);
+        chronological.list_.push_back(*p);
         return p->value.second;
     }
     return result.first->value.second;
@@ -2204,13 +2194,13 @@ template <
     class KeyEqual,
     class Allocator>
 void
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::clear()
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::clear()
 {
-    for (auto iter(chronological.list.begin()); iter != chronological.list.end();)
-        unlink_and_delete_element(&*iter++);
-    chronological.list.clear();
-    m_cont.clear();
-    m_buck.clear();
+    for (auto iter(chronological.list_.begin()); iter != chronological.list_.end();)
+        unlinkAndDeleteElement(&*iter++);
+    chronological.list_.clear();
+    cont_.clear();
+    buck_.clear();
 }
 
 // map, set
@@ -2223,23 +2213,20 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type const& value) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        extract(value),
-        std::cref(m_config.hash_function()),
-        std::cref(m_config.key_value_equal()),
-        d));
+    auto const result(cont_.insert_check(
+        extract(value), std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()), d));
     if (result.second)
     {
-        element* const p(new_element(value));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(value));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
     return std::make_pair(iterator(result.first), false);
@@ -2255,15 +2242,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type const& value) -> std::enable_if_t<maybe_multi, iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
-    maybe_rehash(1);
-    element* const p(new_element(value));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert(*p));
+    maybeRehash(1);
+    Element* const p(newElement(value));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert(*p));
     return iterator(iter);
 }
 
@@ -2277,23 +2264,20 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, bool maybe_map>
+template <bool MaybeMulti, bool MaybeMap>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type&& value) -> std::enable_if_t<!maybe_multi && !maybe_map, std::pair<iterator, bool>>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
+    value_type&& value) -> std::enable_if_t<!MaybeMulti && !MaybeMap, std::pair<iterator, bool>>
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        extract(value),
-        std::cref(m_config.hash_function()),
-        std::cref(m_config.key_value_equal()),
-        d));
+    auto const result(cont_.insert_check(
+        extract(value), std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()), d));
     if (result.second)
     {
-        element* const p(new_element(std::move(value)));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(std::move(value)));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
     return std::make_pair(iterator(result.first), false);
@@ -2309,15 +2293,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, bool maybe_map>
+template <bool MaybeMulti, bool MaybeMap>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
-    value_type&& value) -> std::enable_if_t<maybe_multi && !maybe_map, iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insert(
+    value_type&& value) -> std::enable_if_t<MaybeMulti && !MaybeMap, iterator>
 {
-    maybe_rehash(1);
-    element* const p(new_element(std::move(value)));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert(*p));
+    maybeRehash(1);
+    Element* const p(newElement(std::move(value)));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert(*p));
     return iterator(iter);
 }
 
@@ -2332,22 +2316,22 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
-    Args&&... args) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
-    element* const p(new_element(std::forward<Args>(args)...));
-    auto const result(m_cont.insert(*p));
+    Element* const p(newElement(std::forward<Args>(args)...));
+    auto const result(cont_.insert(*p));
     if (result.second)
     {
-        chronological.list.push_back(*p);
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(result.first), true);
     }
-    delete_element(p);
+    deleteElement(p);
     return std::make_pair(iterator(result.first), false);
 }
 #else   // As original, use insert_check() / insert_commit () pair.
@@ -2363,7 +2347,7 @@ template <
     class Allocator>
 template <bool maybe_multi, class... Args>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
     Args&&... args) -> typename std::enable_if<!maybe_multi, std::pair<iterator, bool>>::type
 {
     maybe_rehash(1);
@@ -2373,8 +2357,8 @@ aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocato
     typename cont_type::insert_commit_data d;
     auto const result(m_cont.insert_check(
         extract(p->value),
-        std::cref(m_config.hash_function()),
-        std::cref(m_config.key_value_equal()),
+        std::cref(m_config.hashFunction()),
+        std::cref(m_config.keyValueEqual()),
         d));
     if (result.second)
     {
@@ -2397,15 +2381,15 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
-    Args&&... args) -> std::enable_if_t<maybe_multi, iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace(
+    Args&&... args) -> std::enable_if_t<MaybeMulti, iterator>
 {
-    maybe_rehash(1);
-    element* const p(new_element(std::forward<Args>(args)...));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert(*p));
+    maybeRehash(1);
+    Element* const p(newElement(std::forward<Args>(args)...));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert(*p));
     return iterator(iter);
 }
 
@@ -2419,29 +2403,29 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi, class... Args>
+template <bool MaybeMulti, class... Args>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplace_hint(
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::emplaceHint(
     const_iterator /*hint*/,
-    Args&&... args) -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+    Args&&... args) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
-    maybe_rehash(1);
+    maybeRehash(1);
     // VFALCO NOTE Its unfortunate that we need to
     //             construct element here
-    element* const p(new_element(std::forward<Args>(args)...));
+    Element* const p(newElement(std::forward<Args>(args)...));
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
+    auto const result(cont_.insert_check(
         extract(p->value),
-        std::cref(m_config.hash_function()),
-        std::cref(m_config.key_value_equal()),
+        std::cref(config_.hashFunction()),
+        std::cref(config_.keyValueEqual()),
         d));
     if (result.second)
     {
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
-    delete_element(p);
+    deleteElement(p);
     return std::make_pair(iterator(result.first), false);
 }
 
@@ -2454,13 +2438,13 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool is_const, class Iterator>
-beast::detail::aged_container_iterator<false, Iterator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(
-    beast::detail::aged_container_iterator<is_const, Iterator> pos)
+template <bool IsConst, class Iterator>
+beast::detail::AgedContainerIterator<false, Iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(
+    beast::detail::AgedContainerIterator<IsConst, Iterator> pos)
 {
-    unlink_and_delete_element(&*((pos++).iterator()));
-    return beast::detail::aged_container_iterator<false, Iterator>(pos.iterator());
+    unlinkAndDeleteElement(&*((pos++).iterator()));
+    return beast::detail::AgedContainerIterator<false, Iterator>(pos.iterator());
 }
 
 template <
@@ -2472,16 +2456,16 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool is_const, class Iterator>
-beast::detail::aged_container_iterator<false, Iterator>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(
-    beast::detail::aged_container_iterator<is_const, Iterator> first,
-    beast::detail::aged_container_iterator<is_const, Iterator> last)
+template <bool IsConst, class Iterator>
+beast::detail::AgedContainerIterator<false, Iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(
+    beast::detail::AgedContainerIterator<IsConst, Iterator> first,
+    beast::detail::AgedContainerIterator<IsConst, Iterator> last)
 {
     for (; first != last;)
-        unlink_and_delete_element(&*((first++).iterator()));
+        unlinkAndDeleteElement(&*((first++).iterator()));
 
-    return beast::detail::aged_container_iterator<false, Iterator>(first.iterator());
+    return beast::detail::AgedContainerIterator<false, Iterator>(first.iterator());
 }
 
 template <
@@ -2495,19 +2479,18 @@ template <
     class Allocator>
 template <class K>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(
-    K const& k) -> size_type
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::erase(K const& k)
+    -> size_type
 {
-    auto iter(
-        m_cont.find(k, std::cref(m_config.hash_function()), std::cref(m_config.key_value_equal())));
-    if (iter == m_cont.end())
+    auto iter(cont_.find(k, std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual())));
+    if (iter == cont_.end())
         return 0;
     size_type n(0);
     for (;;)
     {
         auto p(&*iter++);
-        bool const done(m_config(*p, extract(iter->value)));
-        unlink_and_delete_element(p);
+        bool const done(config_(*p, extract(iter->value)));
+        unlinkAndDeleteElement(p);
         ++n;
         if (done)
             break;
@@ -2525,12 +2508,12 @@ template <
     class KeyEqual,
     class Allocator>
 void
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::swap(
-    aged_unordered_container& other) noexcept
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::swap(
+    AgedUnorderedContainer& other) noexcept
 {
-    swap_data(other);
+    swapData(other);
     std::swap(chronological, other.chronological);
-    std::swap(m_cont, other.m_cont);
+    std::swap(cont_, other.cont_);
 }
 
 template <
@@ -2544,8 +2527,8 @@ template <
     class Allocator>
 template <class K>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::touch(
-    K const& k) -> size_type
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::touch(K const& k)
+    -> size_type
 {
     auto const now(clock().now());
     size_type n(0);
@@ -2574,10 +2557,10 @@ template <
     class OtherDuration,
     class OtherHash,
     class OtherAllocator,
-    bool maybe_multi>
-std::enable_if_t<!maybe_multi, bool>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
-    aged_unordered_container<
+    bool MaybeMulti>
+std::enable_if_t<!MaybeMulti, bool>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
+    AgedUnorderedContainer<
         false,
         OtherIsMap,
         OtherKey,
@@ -2614,10 +2597,10 @@ template <
     class OtherDuration,
     class OtherHash,
     class OtherAllocator,
-    bool maybe_multi>
-std::enable_if_t<maybe_multi, bool>
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
-    aged_unordered_container<
+    bool MaybeMulti>
+std::enable_if_t<MaybeMulti, bool>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::operator==(
+    AgedUnorderedContainer<
         true,
         OtherIsMap,
         OtherKey,
@@ -2632,8 +2615,8 @@ aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocato
     for (auto iter(cbegin()), last(cend()); iter != last;)
     {
         auto const& k(extract(*iter));
-        auto const eq(equal_range(k));
-        auto const oeq(other.equal_range(k));
+        auto const eq(equalRange(k));
+        auto const oeq(other.equalRange(k));
 #if BEAST_NO_CXX14_IS_PERMUTATION
         if (std::distance(eq.first, eq.second) != std::distance(oeq.first, oeq.second) ||
             !std::is_permutation(eq.first, eq.second, oeq.first))
@@ -2659,23 +2642,19 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    insert_unchecked(value_type const& value)
-        -> std::enable_if_t<!maybe_multi, std::pair<iterator, bool>>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insertUnchecked(
+    value_type const& value) -> std::enable_if_t<!MaybeMulti, std::pair<iterator, bool>>
 {
     typename cont_type::insert_commit_data d;
-    auto const result(m_cont.insert_check(
-        extract(value),
-        std::cref(m_config.hash_function()),
-        std::cref(m_config.key_value_equal()),
-        d));
+    auto const result(cont_.insert_check(
+        extract(value), std::cref(config_.hashFunction()), std::cref(config_.keyValueEqual()), d));
     if (result.second)
     {
-        element* const p(new_element(value));
-        auto const iter(m_cont.insert_commit(*p, d));
-        chronological.list.push_back(*p);
+        Element* const p(newElement(value));
+        auto const iter(cont_.insert_commit(*p, d));
+        chronological.list_.push_back(*p);
         return std::make_pair(iterator(iter), true);
     }
     return std::make_pair(iterator(result.first), false);
@@ -2691,14 +2670,14 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-template <bool maybe_multi>
+template <bool MaybeMulti>
 auto
-aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::
-    insert_unchecked(value_type const& value) -> std::enable_if_t<maybe_multi, iterator>
+AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>::insertUnchecked(
+    value_type const& value) -> std::enable_if_t<MaybeMulti, iterator>
 {
-    element* const p(new_element(value));
-    chronological.list.push_back(*p);
-    auto const iter(m_cont.insert(*p));
+    Element* const p(newElement(value));
+    chronological.list_.push_back(*p);
+    auto const iter(cont_.insert(*p));
     return iterator(iter);
 }
 
@@ -2717,12 +2696,11 @@ template <
     class Hash,
     class KeyEqual,
     class Allocator>
-struct is_aged_container<
-    beast::detail::
-        aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>>
+struct IsAgedContainer<
+    beast::detail::AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>>
     : std::true_type
 {
-    explicit is_aged_container() = default;
+    explicit IsAgedContainer() = default;
 };
 
 // Free functions
@@ -2738,11 +2716,10 @@ template <
     class Allocator>
 void
 swap(
-    beast::detail::
-        aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>& lhs,
-    beast::detail::
-        aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>&
-            rhs) noexcept
+    beast::detail::AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>&
+        lhs,
+    beast::detail::AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>&
+        rhs) noexcept
 {
     lhs.swap(rhs);
 }
@@ -2761,8 +2738,8 @@ template <
     class Period>
 std::size_t
 expire(
-    beast::detail::
-        aged_unordered_container<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>& c,
+    beast::detail::AgedUnorderedContainer<IsMulti, IsMap, Key, T, Clock, Hash, KeyEqual, Allocator>&
+        c,
     std::chrono::duration<Rep, Period> const& age) noexcept
 {
     std::size_t n(0);
diff --git a/include/xrpl/beast/container/detail/empty_base_optimization.h b/include/xrpl/beast/container/detail/empty_base_optimization.h
index 230845102d..64809fdb77 100644
--- a/include/xrpl/beast/container/detail/empty_base_optimization.h
+++ b/include/xrpl/beast/container/detail/empty_base_optimization.h
@@ -14,25 +14,25 @@
 namespace beast::detail {
 
 template <class T>
-struct is_empty_base_optimization_derived
+struct IsEmptyBaseOptimizationDerived
     : std::integral_constant<bool, std::is_empty_v<T> && !boost::is_final<T>::value>
 {
 };
 
-template <class T, int UniqueID = 0, bool isDerived = is_empty_base_optimization_derived<T>::value>
-class empty_base_optimization : private T
+template <class T, int UniqueID = 0, bool IsDerived = IsEmptyBaseOptimizationDerived<T>::value>
+class EmptyBaseOptimization : private T
 {
 public:
-    empty_base_optimization() = default;
-    empty_base_optimization(empty_base_optimization&&) = default;
-    empty_base_optimization(empty_base_optimization const&) = default;
-    empty_base_optimization&
-    operator=(empty_base_optimization&&) = default;
-    empty_base_optimization&
-    operator=(empty_base_optimization const&) = default;
+    EmptyBaseOptimization() = default;
+    EmptyBaseOptimization(EmptyBaseOptimization&&) = default;
+    EmptyBaseOptimization(EmptyBaseOptimization const&) = default;
+    EmptyBaseOptimization&
+    operator=(EmptyBaseOptimization&&) = default;
+    EmptyBaseOptimization&
+    operator=(EmptyBaseOptimization const&) = default;
 
     template <class Arg1, class... ArgN>
-    explicit empty_base_optimization(Arg1&& arg1, ArgN&&... argn)
+    explicit EmptyBaseOptimization(Arg1&& arg1, ArgN&&... argn)
         : T(std::forward<Arg1>(arg1), std::forward<ArgN>(argn)...)
     {
     }
@@ -53,21 +53,21 @@ public:
 //------------------------------------------------------------------------------
 
 template <class T, int UniqueID>
-class empty_base_optimization<T, UniqueID, false>
+class EmptyBaseOptimization<T, UniqueID, false>
 {
     T t_;
 
 public:
-    empty_base_optimization() = default;
-    empty_base_optimization(empty_base_optimization&&) = default;
-    empty_base_optimization(empty_base_optimization const&) = default;
-    empty_base_optimization&
-    operator=(empty_base_optimization&&) = default;
-    empty_base_optimization&
-    operator=(empty_base_optimization const&) = default;
+    EmptyBaseOptimization() = default;
+    EmptyBaseOptimization(EmptyBaseOptimization&&) = default;
+    EmptyBaseOptimization(EmptyBaseOptimization const&) = default;
+    EmptyBaseOptimization&
+    operator=(EmptyBaseOptimization&&) = default;
+    EmptyBaseOptimization&
+    operator=(EmptyBaseOptimization const&) = default;
 
     template <class Arg1, class... ArgN>
-    explicit empty_base_optimization(Arg1&& arg1, ArgN&&... argn)
+    explicit EmptyBaseOptimization(Arg1&& arg1, ArgN&&... argn)
         : t_(std::forward<Arg1>(arg1), std::forward<ArgN>(argn)...)
     {
     }
diff --git a/include/xrpl/beast/core/CurrentThreadName.h b/include/xrpl/beast/core/CurrentThreadName.h
index 8e99ee90da..9bf062a885 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 maxThreadNameLength = 15;
+constexpr std::size_t kMAX_THREAD_NAME_LENGTH = 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 <= maxThreadNameLength + 1, "Thread name cannot exceed 15 characters");
+    static_assert(N <= kMAX_THREAD_NAME_LENGTH + 1, "Thread name cannot exceed 15 characters");
 
     setCurrentThreadName(std::string_view(newThreadName, N - 1));
 }
diff --git a/include/xrpl/beast/core/List.h b/include/xrpl/beast/core/List.h
index 30a5166c62..946126a004 100644
--- a/include/xrpl/beast/core/List.h
+++ b/include/xrpl/beast/core/List.h
@@ -45,8 +45,8 @@ class ListNode
     template <typename>
     friend class ListIterator;
 
-    ListNode* m_next = nullptr;
-    ListNode* m_prev = nullptr;
+    ListNode* next_ = nullptr;
+    ListNode* prev_ = nullptr;
 };
 
 //------------------------------------------------------------------------------
@@ -62,12 +62,12 @@ public:
     using reference = value_type&;
     using size_type = std::size_t;
 
-    ListIterator(N* node = nullptr) noexcept : m_node(node)
+    ListIterator(N* node = nullptr) noexcept : node_(node)
     {
     }
 
     template <typename M>
-    ListIterator(ListIterator<M> const& other) noexcept : m_node(other.m_node)
+    ListIterator(ListIterator<M> const& other) noexcept : node_(other.node_)
     {
     }
 
@@ -75,7 +75,7 @@ public:
     bool
     operator==(ListIterator<M> const& other) const noexcept
     {
-        return m_node == other.m_node;
+        return node_ == other.node_;
     }
 
     template <typename M>
@@ -131,22 +131,22 @@ private:
     [[nodiscard]] reference
     dereference() const noexcept
     {
-        return static_cast<reference>(*m_node);
+        return static_cast<reference>(*node_);
     }
 
     void
     increment() noexcept
     {
-        m_node = m_node->m_next;
+        node_ = node_->next_;
     }
 
     void
     decrement() noexcept
     {
-        m_node = m_node->m_prev;
+        node_ = node_->prev_;
     }
 
-    N* m_node;
+    N* node_;
 };
 
 }  // namespace detail
@@ -161,11 +161,11 @@ private:
 
     struct Object : List <Object>::Node
     {
-        explicit Object (int value) : m_value (value)
+        explicit Object (int value) : value_ (value)
         {
         }
 
-        int m_value;
+        int value_;
     };
 
     @endcode
@@ -190,7 +190,7 @@ private:
     @code
 
     for (List <Object>::iterator iter = list.begin(); iter != list.end; ++iter)
-        std::cout << iter->m_value;
+        std::cout << iter->value_;
 
     @endcode
 
@@ -199,10 +199,10 @@ private:
     @code
 
     BOOST_FOREACH (Object& object, list)  // boost only
-        std::cout << object.m_value;
+        std::cout << object.value_;
 
     for (Object& object : list)           // C++11 only
-        std::cout << object.m_value;
+        std::cout << object.value_;
 
     @endcode
 
@@ -275,8 +275,8 @@ public:
     /** Create an empty list. */
     List()
     {
-        m_head.m_prev = nullptr;  // identifies the head
-        m_tail.m_next = nullptr;  // identifies the tail
+        head_.prev_ = nullptr;  // identifies the head
+        tail_.next_ = nullptr;  // identifies the tail
         clear();
     }
 
@@ -297,7 +297,7 @@ public:
     [[nodiscard]] size_type
     size() const noexcept
     {
-        return m_size;
+        return size_;
     }
 
     /** Obtain a reference to the first element.
@@ -307,7 +307,7 @@ public:
     reference
     front() noexcept
     {
-        return element_from(m_head.m_next);
+        return element_from(head_.next_);
     }
 
     /** Obtain a const reference to the first element.
@@ -317,7 +317,7 @@ public:
     [[nodiscard]] const_reference
     front() const noexcept
     {
-        return element_from(m_head.m_next);
+        return element_from(head_.next_);
     }
 
     /** Obtain a reference to the last element.
@@ -327,7 +327,7 @@ public:
     reference
     back() noexcept
     {
-        return element_from(m_tail.m_prev);
+        return element_from(tail_.prev_);
     }
 
     /** Obtain a const reference to the last element.
@@ -337,7 +337,7 @@ public:
     [[nodiscard]] const_reference
     back() const noexcept
     {
-        return element_from(m_tail.m_prev);
+        return element_from(tail_.prev_);
     }
 
     /** Obtain an iterator to the beginning of the list.
@@ -346,7 +346,7 @@ public:
     iterator
     begin() noexcept
     {
-        return iterator(m_head.m_next);
+        return iterator(head_.next_);
     }
 
     /** Obtain a const iterator to the beginning of the list.
@@ -355,7 +355,7 @@ public:
     [[nodiscard]] const_iterator
     begin() const noexcept
     {
-        return const_iterator(m_head.m_next);
+        return const_iterator(head_.next_);
     }
 
     /** Obtain a const iterator to the beginning of the list.
@@ -364,7 +364,7 @@ public:
     [[nodiscard]] const_iterator
     cbegin() const noexcept
     {
-        return const_iterator(m_head.m_next);
+        return const_iterator(head_.next_);
     }
 
     /** Obtain a iterator to the end of the list.
@@ -373,7 +373,7 @@ public:
     iterator
     end() noexcept
     {
-        return iterator(&m_tail);
+        return iterator(&tail_);
     }
 
     /** Obtain a const iterator to the end of the list.
@@ -382,7 +382,7 @@ public:
     [[nodiscard]] const_iterator
     end() const noexcept
     {
-        return const_iterator(&m_tail);
+        return const_iterator(&tail_);
     }
 
     /** Obtain a const iterator to the end of the list
@@ -391,7 +391,7 @@ public:
     [[nodiscard]] const_iterator
     cend() const noexcept
     {
-        return const_iterator(&m_tail);
+        return const_iterator(&tail_);
     }
 
     /** Clear the list.
@@ -400,9 +400,9 @@ public:
     void
     clear() noexcept
     {
-        m_head.m_next = &m_tail;
-        m_tail.m_prev = &m_head;
-        m_size = 0;
+        head_.next_ = &tail_;
+        tail_.prev_ = &head_;
+        size_ = 0;
     }
 
     /** Insert an element.
@@ -415,11 +415,11 @@ public:
     insert(iterator pos, T& element) noexcept
     {
         Node* node = static_cast<Node*>(&element);
-        node->m_next = &*pos;
-        node->m_prev = node->m_next->m_prev;
-        node->m_next->m_prev = node;
-        node->m_prev->m_next = node;
-        ++m_size;
+        node->next_ = &*pos;
+        node->prev_ = node->next_->prev_;
+        node->next_->prev_ = node;
+        node->prev_->next_ = node;
+        ++size_;
         return iterator(node);
     }
 
@@ -434,11 +434,11 @@ public:
         if (!other.empty())
         {
             Node* before = &*pos;
-            other.m_head.m_next->m_prev = before->m_prev;
-            before->m_prev->m_next = other.m_head.m_next;
-            other.m_tail.m_prev->m_next = before;
-            before->m_prev = other.m_tail.m_prev;
-            m_size += other.m_size;
+            other.head_.next_->prev_ = before->prev_;
+            before->prev_->next_ = other.head_.next_;
+            other.tail_.prev_->next_ = before;
+            before->prev_ = other.tail_.prev_;
+            size_ += other.size_;
             other.clear();
         }
     }
@@ -453,9 +453,9 @@ public:
     {
         Node const* node = &*pos;
         ++pos;
-        node->m_next->m_prev = node->m_prev;
-        node->m_prev->m_next = node->m_next;
-        --m_size;
+        node->next_->prev_ = node->prev_;
+        node->prev_->next_ = node->next_;
+        --size_;
         return pos;
     }
 
@@ -464,7 +464,7 @@ public:
         @param element The element to insert.
     */
     iterator
-    push_front(T& element) noexcept
+    pushFront(T& element) noexcept
     {
         return insert(begin(), element);
     }
@@ -474,7 +474,7 @@ public:
         @return A reference to the popped element.
     */
     T&
-    pop_front() noexcept
+    popFront() noexcept
     {
         T& element(front());
         erase(begin());
@@ -486,7 +486,7 @@ public:
         @param element The element to append.
     */
     iterator
-    push_back(T& element) noexcept
+    pushBack(T& element) noexcept
     {
         return insert(end(), element);
     }
@@ -496,7 +496,7 @@ public:
         @return A reference to the popped element.
     */
     T&
-    pop_back() noexcept
+    popBack() noexcept
     {
         T& element(back());
         erase(--end());
@@ -539,7 +539,7 @@ public:
         @return An iterator to the element.
     */
     iterator
-    iterator_to(T& element) const noexcept
+    iteratorTo(T& element) const noexcept
     {
         return iterator(static_cast<Node*>(&element));
     }
@@ -550,28 +550,28 @@ public:
         @return A const iterator to the element.
     */
     [[nodiscard]] const_iterator
-    const_iterator_to(T const& element) const noexcept
+    constIteratorTo(T const& element) const noexcept
     {
         return const_iterator(static_cast<Node const*>(&element));
     }
 
 private:
     reference
-    element_from(Node* node) noexcept
+    elementFrom(Node* node) noexcept
     {
         return *(static_cast<pointer>(node));
     }
 
     const_reference
-    element_from(Node const* node) const noexcept
+    elementFrom(Node const* node) const noexcept
     {
         return *(static_cast<const_pointer>(node));
     }
 
 private:
-    size_type m_size = 0u;
-    Node m_head;
-    Node m_tail;
+    size_type size_ = 0u;
+    Node head_;
+    Node tail_;
 };
 
 }  // namespace beast
diff --git a/include/xrpl/beast/core/LockFreeStack.h b/include/xrpl/beast/core/LockFreeStack.h
index 03598915df..6b8f686246 100644
--- a/include/xrpl/beast/core/LockFreeStack.h
+++ b/include/xrpl/beast/core/LockFreeStack.h
@@ -26,27 +26,27 @@ public:
 
     LockFreeStackIterator() = default;
 
-    LockFreeStackIterator(NodePtr node) : m_node(node)
+    LockFreeStackIterator(NodePtr node) : node_(node)
     {
     }
 
     template <bool OtherIsConst>
     explicit LockFreeStackIterator(LockFreeStackIterator<Container, OtherIsConst> const& other)
-        : m_node(other.m_node)
+        : node_(other.node_)
     {
     }
 
     LockFreeStackIterator&
     operator=(NodePtr node)
     {
-        m_node = node;
+        node_ = node;
         return static_cast<LockFreeStackIterator&>(*this);
     }
 
     LockFreeStackIterator&
     operator++()
     {
-        m_node = m_node->m_next.load();
+        node_ = node_->next_.load();
         return static_cast<LockFreeStackIterator&>(*this);
     }
 
@@ -54,14 +54,14 @@ public:
     operator++(int)
     {
         LockFreeStackIterator result(*this);
-        m_node = m_node->m_next;
+        node_ = node_->next_;
         return result;
     }
 
     NodePtr
     node() const
     {
-        return m_node;
+        return node_;
     }
 
     reference
@@ -73,11 +73,11 @@ public:
     pointer
     operator->() const
     {
-        return static_cast<pointer>(m_node);
+        return static_cast<pointer>(node_);
     }
 
 private:
-    NodePtr m_node{};
+    NodePtr node_{};
 };
 
 //------------------------------------------------------------------------------
@@ -121,11 +121,11 @@ public:
     class Node
     {
     public:
-        Node() : m_next(nullptr)
+        Node() : next_(nullptr)
         {
         }
 
-        explicit Node(Node* next) : m_next(next)
+        explicit Node(Node* next) : next_(next)
         {
         }
 
@@ -139,7 +139,7 @@ public:
         template <class Container, bool IsConst>
         friend class LockFreeStackIterator;
 
-        std::atomic<Node*> m_next;
+        std::atomic<Node*> next_;
     };
 
 public:
@@ -153,7 +153,7 @@ public:
     using iterator = LockFreeStackIterator<LockFreeStack<Element, Tag>, false>;
     using const_iterator = LockFreeStackIterator<LockFreeStack<Element, Tag>, true>;
 
-    LockFreeStack() : m_end(nullptr), m_head(&m_end)
+    LockFreeStack() : end_(nullptr), head_(&end_)
     {
     }
 
@@ -165,7 +165,7 @@ public:
     [[nodiscard]] bool
     empty() const
     {
-        return m_head.load() == &m_end;
+        return head_.load() == &end_;
     }
 
     /** Push a node onto the stack.
@@ -181,16 +181,16 @@ public:
     */
     // VFALCO NOTE Fix this, shouldn't it be a reference like intrusive list?
     bool
-    push_front(Node* node)
+    pushFront(Node* node)
     {
         bool first = false;
-        Node* old_head = m_head.load(std::memory_order_relaxed);
+        Node* oldHead = head_.load(std::memory_order_relaxed);
         do
         {
-            first = (old_head == &m_end);
-            node->m_next = old_head;
-        } while (!m_head.compare_exchange_strong(
-            old_head, node, std::memory_order_release, std::memory_order_relaxed));
+            first = (oldHead == &end_);
+            node->next_ = oldHead;
+        } while (!head_.compare_exchange_strong(
+            oldHead, node, std::memory_order_release, std::memory_order_relaxed));
         return first;
     }
 
@@ -204,17 +204,17 @@ public:
                 was empty.
     */
     Element*
-    pop_front()
+    popFront()
     {
-        Node* node = m_head.load();
-        Node* new_head = nullptr;
+        Node* node = head_.load();
+        Node* newHead = nullptr;
         do
         {
-            if (node == &m_end)
+            if (node == &end_)
                 return nullptr;
-            new_head = node->m_next.load();
-        } while (!m_head.compare_exchange_strong(
-            node, new_head, std::memory_order_release, std::memory_order_relaxed));
+            newHead = node->next_.load();
+        } while (!head_.compare_exchange_strong(
+            node, newHead, std::memory_order_release, std::memory_order_relaxed));
         return static_cast<Element*>(node);
     }
 
@@ -228,43 +228,43 @@ public:
     iterator
     begin()
     {
-        return iterator(m_head.load());
+        return iterator(head_.load());
     }
 
     iterator
     end()
     {
-        return iterator(&m_end);
+        return iterator(&end_);
     }
 
     [[nodiscard]] const_iterator
     begin() const
     {
-        return const_iterator(m_head.load());
+        return const_iterator(head_.load());
     }
 
     [[nodiscard]] const_iterator
     end() const
     {
-        return const_iterator(&m_end);
+        return const_iterator(&end_);
     }
 
     [[nodiscard]] const_iterator
     cbegin() const
     {
-        return const_iterator(m_head.load());
+        return const_iterator(head_.load());
     }
 
     [[nodiscard]] const_iterator
     cend() const
     {
-        return const_iterator(&m_end);
+        return const_iterator(&end_);
     }
     /** @} */
 
 private:
-    Node m_end;
-    std::atomic<Node*> m_head;
+    Node end_;
+    std::atomic<Node*> head_;
 };
 
 }  // namespace beast
diff --git a/include/xrpl/beast/hash/hash_append.h b/include/xrpl/beast/hash/hash_append.h
index 3161ab3ce2..25ce668166 100644
--- a/include/xrpl/beast/hash/hash_append.h
+++ b/include/xrpl/beast/hash/hash_append.h
@@ -24,7 +24,7 @@ namespace detail {
 template <class T>
 /*constexpr*/
 inline void
-reverse_bytes(T& t)
+reverseBytes(T& t)
 {
     unsigned char* bytes =
         static_cast<unsigned char*>(std::memmove(std::addressof(t), std::addressof(t), sizeof(T)));
@@ -35,14 +35,14 @@ reverse_bytes(T& t)
 template <class T>
 /*constexpr*/
 inline void
-maybe_reverse_bytes(T& t, std::false_type)
+maybeReverseBytes(T& t, std::false_type)
 {
 }
 
 template <class T>
 /*constexpr*/
 inline void
-maybe_reverse_bytes(T& t, std::true_type)
+maybeReverseBytes(T& t, std::true_type)
 {
     reverse_bytes(t);
 }
@@ -50,15 +50,15 @@ maybe_reverse_bytes(T& t, std::true_type)
 template <class T, class Hasher>
 /*constexpr*/
 inline void
-maybe_reverse_bytes(T& t, Hasher&)
+maybeReverseBytes(T& t, Hasher&)
 {
-    maybe_reverse_bytes(
-        t, std::integral_constant<bool, Hasher::endian != boost::endian::order::native>{});
+    maybeReverseBytes(
+        t, std::integral_constant<bool, Hasher::kENDIAN != boost::endian::order::native>{});
 }
 
 }  // namespace detail
 
-// is_uniquely_represented<T>
+// IsUniquelyRepresented<T>
 
 // A type T is contiguously hashable if for all combinations of two values of
 // a type, say x and y, if x == y, then it must also be true that
@@ -66,78 +66,78 @@ maybe_reverse_bytes(T& t, Hasher&)
 // then x and y have the same bit pattern representation.
 
 template <class T>
-struct is_uniquely_represented
+struct IsUniquelyRepresented
     : public std::integral_constant<
           bool,
           std::is_integral_v<T> || std::is_enum_v<T> || std::is_pointer_v<T>>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
 template <class T>
-struct is_uniquely_represented<T const> : public is_uniquely_represented<T>
+struct IsUniquelyRepresented<T const> : public IsUniquelyRepresented<T>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
 template <class T>
-struct is_uniquely_represented<T volatile> : public is_uniquely_represented<T>
+struct IsUniquelyRepresented<T volatile> : public IsUniquelyRepresented<T>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
 template <class T>
-struct is_uniquely_represented<T const volatile> : public is_uniquely_represented<T>
+struct IsUniquelyRepresented<T const volatile> : public IsUniquelyRepresented<T>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
-// is_uniquely_represented<std::pair<T, U>>
+// IsUniquelyRepresented<std::pair<T, U>>
 
 template <class T, class U>
-struct is_uniquely_represented<std::pair<T, U>>
+struct IsUniquelyRepresented<std::pair<T, U>>
     : public std::integral_constant<
           bool,
-          is_uniquely_represented<T>::value && is_uniquely_represented<U>::value &&
+          IsUniquelyRepresented<T>::value && IsUniquelyRepresented<U>::value &&
               sizeof(T) + sizeof(U) == sizeof(std::pair<T, U>)>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
-// is_uniquely_represented<std::tuple<T...>>
+// IsUniquelyRepresented<std::tuple<T...>>
 
 template <class... T>
-struct is_uniquely_represented<std::tuple<T...>>
+struct IsUniquelyRepresented<std::tuple<T...>>
     : public std::integral_constant<
           bool,
-          std::conjunction_v<is_uniquely_represented<T>...> &&
+          std::conjunction_v<IsUniquelyRepresented<T>...> &&
               sizeof(std::tuple<T...>) == (sizeof(T) + ...)>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
-// is_uniquely_represented<T[N]>
+// IsUniquelyRepresented<T[N]>
 
 template <class T, std::size_t N>
-struct is_uniquely_represented<T[N]> : public is_uniquely_represented<T>
+struct IsUniquelyRepresented<T[N]> : public IsUniquelyRepresented<T>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
-// is_uniquely_represented<std::array<T, N>>
+// IsUniquelyRepresented<std::array<T, N>>
 
 template <class T, std::size_t N>
-struct is_uniquely_represented<std::array<T, N>>
+struct IsUniquelyRepresented<std::array<T, N>>
     : public std::integral_constant<
           bool,
-          is_uniquely_represented<T>::value && sizeof(T) * N == sizeof(std::array<T, N>)>
+          IsUniquelyRepresented<T>::value && sizeof(T) * N == sizeof(std::array<T, N>)>
 {
-    explicit is_uniquely_represented() = default;
+    explicit IsUniquelyRepresented() = default;
 };
 
 /** Metafunction returning `true` if the type can be hashed in one call.
 
-    For `is_contiguously_hashable<T>::value` to be true, then for every
+    For `IsContiguouslyHashable<T>::value` to be true, then for every
     combination of possible values of `T` held in `x` and `y`,
     if `x == y`, then it must be true that `memcmp(&x, &y, sizeof(T))`
     return 0; i.e. that `x` and `y` are represented by the same bit pattern.
@@ -150,23 +150,23 @@ struct is_uniquely_represented<std::array<T, N>>
 */
 /** @{ */
 template <class T, class HashAlgorithm>
-struct is_contiguously_hashable
+struct IsContiguouslyHashable
     : public std::integral_constant<
           bool,
-          is_uniquely_represented<T>::value &&
-              (sizeof(T) == 1 || HashAlgorithm::endian == boost::endian::order::native)>
+          IsUniquelyRepresented<T>::value &&
+              (sizeof(T) == 1 || HashAlgorithm::kENDIAN == boost::endian::order::native)>
 {
-    explicit is_contiguously_hashable() = default;
+    explicit IsContiguouslyHashable() = default;
 };
 
 template <class T, std::size_t N, class HashAlgorithm>
-struct is_contiguously_hashable<T[N], HashAlgorithm>
+struct IsContiguouslyHashable<T[N], HashAlgorithm>
     : public std::integral_constant<
           bool,
-          is_uniquely_represented<T[N]>::value &&
+          IsUniquelyRepresented<T[N]>::value &&
               (sizeof(T) == 1 || HashAlgorithm::endian == boost::endian::order::native)>
 {
-    explicit is_contiguously_hashable() = default;
+    explicit IsContiguouslyHashable() = default;
 };
 /** @} */
 
@@ -200,7 +200,7 @@ struct is_contiguously_hashable<T[N], HashAlgorithm>
 // scalars
 
 template <class Hasher, class T>
-inline std::enable_if_t<is_contiguously_hashable<T, Hasher>::value>
+inline std::enable_if_t<IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, T const& t) noexcept
 {
     // NOLINTNEXTLINE(bugprone-sizeof-expression)
@@ -209,11 +209,11 @@ hash_append(Hasher& h, T const& t) noexcept
 
 template <class Hasher, class T>
 inline std::enable_if_t<
-    !is_contiguously_hashable<T, Hasher>::value &&
+    !IsContiguouslyHashable<T, Hasher>::value &&
     (std::is_integral_v<T> || std::is_pointer_v<T> || std::is_enum_v<T>)>
 hash_append(Hasher& h, T t) noexcept
 {
-    detail::reverse_bytes(t);
+    detail::reverseBytes(t);
     h(std::addressof(t), sizeof(t));
 }
 
@@ -223,7 +223,7 @@ hash_append(Hasher& h, T t) noexcept
 {
     if (t == 0)
         t = 0;
-    detail::maybe_reverse_bytes(t, h);
+    detail::maybeReverseBytes(t, h);
     h(&t, sizeof(t));
 }
 
@@ -232,42 +232,42 @@ inline void
 hash_append(Hasher& h, std::nullptr_t) noexcept
 {
     void const* p = nullptr;
-    detail::maybe_reverse_bytes(p, h);
+    detail::maybeReverseBytes(p, h);
     h(&p, sizeof(p));
 }
 
 // Forward declarations for ADL purposes
 
 template <class Hasher, class T, std::size_t N>
-std::enable_if_t<!is_contiguously_hashable<T, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, T (&a)[N]) noexcept;
 
 template <class Hasher, class CharT, class Traits, class Alloc>
-std::enable_if_t<!is_contiguously_hashable<CharT, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<CharT, Hasher>::value>
 hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcept;
 
 template <class Hasher, class CharT, class Traits, class Alloc>
-std::enable_if_t<is_contiguously_hashable<CharT, Hasher>::value>
+std::enable_if_t<IsContiguouslyHashable<CharT, Hasher>::value>
 hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcept;
 
 template <class Hasher, class T, class U>
-std::enable_if_t<!is_contiguously_hashable<std::pair<T, U>, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<std::pair<T, U>, Hasher>::value>
 hash_append(Hasher& h, std::pair<T, U> const& p) noexcept;
 
 template <class Hasher, class T, class Alloc>
-std::enable_if_t<!is_contiguously_hashable<T, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept;
 
 template <class Hasher, class T, class Alloc>
-std::enable_if_t<is_contiguously_hashable<T, Hasher>::value>
+std::enable_if_t<IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept;
 
 template <class Hasher, class T, std::size_t N>
-std::enable_if_t<!is_contiguously_hashable<std::array<T, N>, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<std::array<T, N>, Hasher>::value>
 hash_append(Hasher& h, std::array<T, N> const& a) noexcept;
 
 template <class Hasher, class... T>
-std::enable_if_t<!is_contiguously_hashable<std::tuple<T...>, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<std::tuple<T...>, Hasher>::value>
 hash_append(Hasher& h, std::tuple<T...> const& t) noexcept;
 
 template <class Hasher, class Key, class T, class Hash, class Pred, class Alloc>
@@ -279,10 +279,10 @@ void
 hash_append(Hasher& h, std::unordered_set<Key, Hash, Pred, Alloc> const& s);
 
 template <class Hasher, class Key, class Compare, class Alloc>
-std::enable_if_t<!is_contiguously_hashable<Key, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<Key, Hasher>::value>
 hash_append(Hasher& h, boost::container::flat_set<Key, Compare, Alloc> const& v) noexcept;
 template <class Hasher, class Key, class Compare, class Alloc>
-std::enable_if_t<is_contiguously_hashable<Key, Hasher>::value>
+std::enable_if_t<IsContiguouslyHashable<Key, Hasher>::value>
 hash_append(Hasher& h, boost::container::flat_set<Key, Compare, Alloc> const& v) noexcept;
 template <class Hasher, class T0, class T1, class... T>
 void
@@ -291,7 +291,7 @@ hash_append(Hasher& h, T0 const& t0, T1 const& t1, T const&... t) noexcept;
 // c-array
 
 template <class Hasher, class T, std::size_t N>
-std::enable_if_t<!is_contiguously_hashable<T, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, T (&a)[N]) noexcept
 {
     for (auto const& t : a)
@@ -301,7 +301,7 @@ hash_append(Hasher& h, T (&a)[N]) noexcept
 // basic_string
 
 template <class Hasher, class CharT, class Traits, class Alloc>
-inline std::enable_if_t<!is_contiguously_hashable<CharT, Hasher>::value>
+inline std::enable_if_t<!IsContiguouslyHashable<CharT, Hasher>::value>
 hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcept
 {
     for (auto c : s)
@@ -310,7 +310,7 @@ hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcep
 }
 
 template <class Hasher, class CharT, class Traits, class Alloc>
-inline std::enable_if_t<is_contiguously_hashable<CharT, Hasher>::value>
+inline std::enable_if_t<IsContiguouslyHashable<CharT, Hasher>::value>
 hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcept
 {
     h(s.data(), s.size() * sizeof(CharT));
@@ -320,7 +320,7 @@ hash_append(Hasher& h, std::basic_string<CharT, Traits, Alloc> const& s) noexcep
 // pair
 
 template <class Hasher, class T, class U>
-inline std::enable_if_t<!is_contiguously_hashable<std::pair<T, U>, Hasher>::value>
+inline std::enable_if_t<!IsContiguouslyHashable<std::pair<T, U>, Hasher>::value>
 hash_append(Hasher& h, std::pair<T, U> const& p) noexcept
 {
     hash_append(h, p.first, p.second);
@@ -329,7 +329,7 @@ hash_append(Hasher& h, std::pair<T, U> const& p) noexcept
 // vector
 
 template <class Hasher, class T, class Alloc>
-inline std::enable_if_t<!is_contiguously_hashable<T, Hasher>::value>
+inline std::enable_if_t<!IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept
 {
     for (auto const& t : v)
@@ -338,7 +338,7 @@ hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept
 }
 
 template <class Hasher, class T, class Alloc>
-inline std::enable_if_t<is_contiguously_hashable<T, Hasher>::value>
+inline std::enable_if_t<IsContiguouslyHashable<T, Hasher>::value>
 hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept
 {
     h(v.data(), v.size() * sizeof(T));
@@ -348,7 +348,7 @@ hash_append(Hasher& h, std::vector<T, Alloc> const& v) noexcept
 // array
 
 template <class Hasher, class T, std::size_t N>
-std::enable_if_t<!is_contiguously_hashable<std::array<T, N>, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<std::array<T, N>, Hasher>::value>
 hash_append(Hasher& h, std::array<T, N> const& a) noexcept
 {
     for (auto const& t : a)
@@ -356,14 +356,14 @@ hash_append(Hasher& h, std::array<T, N> const& a) noexcept
 }
 
 template <class Hasher, class Key, class Compare, class Alloc>
-std::enable_if_t<!is_contiguously_hashable<Key, Hasher>::value>
+std::enable_if_t<!IsContiguouslyHashable<Key, Hasher>::value>
 hash_append(Hasher& h, boost::container::flat_set<Key, Compare, Alloc> const& v) noexcept
 {
     for (auto const& t : v)
         hash_append(h, t);
 }
 template <class Hasher, class Key, class Compare, class Alloc>
-std::enable_if_t<is_contiguously_hashable<Key, Hasher>::value>
+std::enable_if_t<IsContiguouslyHashable<Key, Hasher>::value>
 hash_append(Hasher& h, boost::container::flat_set<Key, Compare, Alloc> const& v) noexcept
 {
     h(&(v.begin()), v.size() * sizeof(Key));
@@ -373,13 +373,13 @@ hash_append(Hasher& h, boost::container::flat_set<Key, Compare, Alloc> const& v)
 namespace detail {
 
 inline void
-for_each_item(...) noexcept
+forEachItem(...) noexcept
 {
 }
 
 template <class Hasher, class T>
 inline int
-hash_one(Hasher& h, T const& t) noexcept
+hashOne(Hasher& h, T const& t) noexcept
 {
     hash_append(h, t);
     return 0;
@@ -395,7 +395,7 @@ tuple_hash(Hasher& h, std::tuple<T...> const& t, std::index_sequence<I...>) noex
 }  // namespace detail
 
 template <class Hasher, class... T>
-inline std::enable_if_t<!is_contiguously_hashable<std::tuple<T...>, Hasher>::value>
+inline std::enable_if_t<!IsContiguouslyHashable<std::tuple<T...>, Hasher>::value>
 hash_append(Hasher& h, std::tuple<T...> const& t) noexcept
 {
     detail::tuple_hash(h, t, std::index_sequence_for<T...>{});
diff --git a/include/xrpl/beast/hash/uhash.h b/include/xrpl/beast/hash/uhash.h
index 4f66f058a8..97461f67c7 100644
--- a/include/xrpl/beast/hash/uhash.h
+++ b/include/xrpl/beast/hash/uhash.h
@@ -6,10 +6,10 @@
 namespace beast {
 
 // Universal hash function
-template <class Hasher = xxhasher>
-struct uhash
+template <class Hasher = Xxhasher>
+struct Uhash
 {
-    uhash() = default;
+    Uhash() = default;
 
     using result_type = typename Hasher::result_type;
 
diff --git a/include/xrpl/beast/hash/xxhasher.h b/include/xrpl/beast/hash/xxhasher.h
index 5cd060e465..01485e1e85 100644
--- a/include/xrpl/beast/hash/xxhasher.h
+++ b/include/xrpl/beast/hash/xxhasher.h
@@ -12,7 +12,7 @@
 
 namespace beast {
 
-class xxhasher
+class Xxhasher
 {
 public:
     using result_type = std::size_t;
@@ -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 INTERNAL_BUFFER_SIZE = 64;
+    static constexpr std::size_t kINTERNAL_BUFFER_SIZE = 64;
 
-    alignas(64) std::array<std::uint8_t, INTERNAL_BUFFER_SIZE> buffer_{};
+    alignas(64) std::array<std::uint8_t, kINTERNAL_BUFFER_SIZE> buffer_{};
     std::span<std::uint8_t> readBuffer_;
     std::span<std::uint8_t> writeBuffer_;
 
@@ -102,18 +102,18 @@ private:
     }
 
 public:
-    static constexpr auto const endian = boost::endian::order::native;
+    static constexpr auto const kENDIAN = boost::endian::order::native;
 
-    xxhasher(xxhasher const&) = delete;
-    xxhasher&
-    operator=(xxhasher const&) = delete;
+    Xxhasher(Xxhasher const&) = delete;
+    Xxhasher&
+    operator=(Xxhasher const&) = delete;
 
-    xxhasher()
+    Xxhasher()
     {
         resetBuffers();
     }
 
-    ~xxhasher() noexcept
+    ~Xxhasher() noexcept
     {
         if (state_ != nullptr)
         {
@@ -122,13 +122,13 @@ public:
     }
 
     template <class Seed, std::enable_if_t<std::is_unsigned_v<Seed>>* = nullptr>
-    explicit xxhasher(Seed seed) : seed_(seed)
+    explicit Xxhasher(Seed seed) : seed_(seed)
     {
         resetBuffers();
     }
 
     template <class Seed, std::enable_if_t<std::is_unsigned_v<Seed>>* = nullptr>
-    xxhasher(Seed seed, Seed) : seed_(seed)
+    Xxhasher(Seed seed, Seed) : seed_(seed)
     {
         resetBuffers();
     }
diff --git a/include/xrpl/beast/insight/Collector.h b/include/xrpl/beast/insight/Collector.h
index 1d18c7e15c..2e73d60400 100644
--- a/include/xrpl/beast/insight/Collector.h
+++ b/include/xrpl/beast/insight/Collector.h
@@ -42,13 +42,13 @@ public:
     /** @{ */
     template <class Handler>
     Hook
-    make_hook(Handler handler)
+    makeHook(Handler handler)
     {
-        return make_hook(HookImpl::HandlerType(handler));
+        return makeHook(HookImpl::HandlerType(handler));
     }
 
     virtual Hook
-    make_hook(HookImpl::HandlerType const& handler) = 0;
+    makeHook(HookImpl::HandlerType const& handler) = 0;
     /** @} */
 
     /** Create a counter with the specified name.
@@ -56,14 +56,14 @@ public:
     */
     /** @{ */
     virtual Counter
-    make_counter(std::string const& name) = 0;
+    makeCounter(std::string const& name) = 0;
 
     Counter
-    make_counter(std::string const& prefix, std::string const& name)
+    makeCounter(std::string const& prefix, std::string const& name)
     {
         if (prefix.empty())
-            return make_counter(name);
-        return make_counter(prefix + "." + name);
+            return makeCounter(name);
+        return makeCounter(prefix + "." + name);
     }
     /** @} */
 
@@ -72,14 +72,14 @@ public:
     */
     /** @{ */
     virtual Event
-    make_event(std::string const& name) = 0;
+    makeEvent(std::string const& name) = 0;
 
     Event
-    make_event(std::string const& prefix, std::string const& name)
+    makeEvent(std::string const& prefix, std::string const& name)
     {
         if (prefix.empty())
-            return make_event(name);
-        return make_event(prefix + "." + name);
+            return makeEvent(name);
+        return makeEvent(prefix + "." + name);
     }
     /** @} */
 
@@ -88,14 +88,14 @@ public:
     */
     /** @{ */
     virtual Gauge
-    make_gauge(std::string const& name) = 0;
+    makeGauge(std::string const& name) = 0;
 
     Gauge
-    make_gauge(std::string const& prefix, std::string const& name)
+    makeGauge(std::string const& prefix, std::string const& name)
     {
         if (prefix.empty())
-            return make_gauge(name);
-        return make_gauge(prefix + "." + name);
+            return makeGauge(name);
+        return makeGauge(prefix + "." + name);
     }
     /** @} */
 
@@ -104,14 +104,14 @@ public:
     */
     /** @{ */
     virtual Meter
-    make_meter(std::string const& name) = 0;
+    makeMeter(std::string const& name) = 0;
 
     Meter
-    make_meter(std::string const& prefix, std::string const& name)
+    makeMeter(std::string const& prefix, std::string const& name)
     {
         if (prefix.empty())
-            return make_meter(name);
-        return make_meter(prefix + "." + name);
+            return makeMeter(name);
+        return makeMeter(prefix + "." + name);
     }
     /** @} */
 };
diff --git a/include/xrpl/beast/insight/Counter.h b/include/xrpl/beast/insight/Counter.h
index c5b8178c2d..71ace4bb4e 100644
--- a/include/xrpl/beast/insight/Counter.h
+++ b/include/xrpl/beast/insight/Counter.h
@@ -29,7 +29,7 @@ public:
         factory function in the Collector interface.
         @see Collector.
     */
-    explicit Counter(std::shared_ptr<CounterImpl> const& impl) : m_impl(impl)
+    explicit Counter(std::shared_ptr<CounterImpl> const& impl) : impl_(impl)
     {
     }
 
@@ -38,8 +38,8 @@ public:
     void
     increment(value_type amount) const
     {
-        if (m_impl)
-            m_impl->increment(amount);
+        if (impl_)
+            impl_->increment(amount);
     }
 
     Counter const&
@@ -85,7 +85,7 @@ public:
     }
 
 private:
-    std::shared_ptr<CounterImpl> m_impl;
+    std::shared_ptr<CounterImpl> impl_;
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/Event.h b/include/xrpl/beast/insight/Event.h
index 28994db956..5e424a0f9b 100644
--- a/include/xrpl/beast/insight/Event.h
+++ b/include/xrpl/beast/insight/Event.h
@@ -31,7 +31,7 @@ public:
         factory function in the Collector interface.
         @see Collector.
     */
-    explicit Event(std::shared_ptr<EventImpl> const& impl) : m_impl(impl)
+    explicit Event(std::shared_ptr<EventImpl> const& impl) : impl_(impl)
     {
     }
 
@@ -41,18 +41,18 @@ public:
     notify(std::chrono::duration<Rep, Period> const& value) const
     {
         using namespace std::chrono;
-        if (m_impl)
-            m_impl->notify(ceil<value_type>(value));
+        if (impl_)
+            impl_->notify(ceil<value_type>(value));
     }
 
     [[nodiscard]] std::shared_ptr<EventImpl> const&
     impl() const
     {
-        return m_impl;
+        return impl_;
     }
 
 private:
-    std::shared_ptr<EventImpl> m_impl;
+    std::shared_ptr<EventImpl> impl_;
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/Gauge.h b/include/xrpl/beast/insight/Gauge.h
index 8a7de33e2e..dd2c4bc6b6 100644
--- a/include/xrpl/beast/insight/Gauge.h
+++ b/include/xrpl/beast/insight/Gauge.h
@@ -31,7 +31,7 @@ public:
         factory function in the Collector interface.
         @see Collector.
     */
-    explicit Gauge(std::shared_ptr<GaugeImpl> const& impl) : m_impl(impl)
+    explicit Gauge(std::shared_ptr<GaugeImpl> const& impl) : impl_(impl)
     {
     }
 
@@ -44,8 +44,8 @@ public:
     void
     set(value_type value) const
     {
-        if (m_impl)
-            m_impl->set(value);
+        if (impl_)
+            impl_->set(value);
     }
 
     Gauge const&
@@ -61,8 +61,8 @@ public:
     void
     increment(difference_type amount) const
     {
-        if (m_impl)
-            m_impl->increment(amount);
+        if (impl_)
+            impl_->increment(amount);
     }
 
     Gauge const&
@@ -111,11 +111,11 @@ public:
     [[nodiscard]] std::shared_ptr<GaugeImpl> const&
     impl() const
     {
-        return m_impl;
+        return impl_;
     }
 
 private:
-    std::shared_ptr<GaugeImpl> m_impl;
+    std::shared_ptr<GaugeImpl> impl_;
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/Groups.h b/include/xrpl/beast/insight/Groups.h
index abc1aa004b..cfe4d99bdc 100644
--- a/include/xrpl/beast/insight/Groups.h
+++ b/include/xrpl/beast/insight/Groups.h
@@ -29,6 +29,6 @@ public:
 
 /** Create a group container that uses the specified collector. */
 std::unique_ptr<Groups>
-make_Groups(Collector::ptr const& collector);
+makeGroups(Collector::ptr const& collector);
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/Hook.h b/include/xrpl/beast/insight/Hook.h
index d873411390..1cb6cae5d9 100644
--- a/include/xrpl/beast/insight/Hook.h
+++ b/include/xrpl/beast/insight/Hook.h
@@ -20,18 +20,18 @@ public:
         factory function in the Collector interface.
         @see Collector.
     */
-    explicit Hook(std::shared_ptr<HookImpl> const& impl) : m_impl(impl)
+    explicit Hook(std::shared_ptr<HookImpl> const& impl) : impl_(impl)
     {
     }
 
     [[nodiscard]] std::shared_ptr<HookImpl> const&
     impl() const
     {
-        return m_impl;
+        return impl_;
     }
 
 private:
-    std::shared_ptr<HookImpl> m_impl;
+    std::shared_ptr<HookImpl> impl_;
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/Meter.h b/include/xrpl/beast/insight/Meter.h
index 93ae237956..03aa17c313 100644
--- a/include/xrpl/beast/insight/Meter.h
+++ b/include/xrpl/beast/insight/Meter.h
@@ -28,7 +28,7 @@ public:
         factory function in the Collector interface.
         @see Collector.
     */
-    explicit Meter(std::shared_ptr<MeterImpl> const& impl) : m_impl(impl)
+    explicit Meter(std::shared_ptr<MeterImpl> const& impl) : impl_(impl)
     {
     }
 
@@ -37,8 +37,8 @@ public:
     void
     increment(value_type amount) const
     {
-        if (m_impl)
-            m_impl->increment(amount);
+        if (impl_)
+            impl_->increment(amount);
     }
 
     Meter const&
@@ -66,11 +66,11 @@ public:
     [[nodiscard]] std::shared_ptr<MeterImpl> const&
     impl() const
     {
-        return m_impl;
+        return impl_;
     }
 
 private:
-    std::shared_ptr<MeterImpl> m_impl;
+    std::shared_ptr<MeterImpl> impl_;
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/NullCollector.h b/include/xrpl/beast/insight/NullCollector.h
index e6404c8f2c..b865526ade 100644
--- a/include/xrpl/beast/insight/NullCollector.h
+++ b/include/xrpl/beast/insight/NullCollector.h
@@ -11,7 +11,7 @@ public:
     explicit NullCollector() = default;
 
     static std::shared_ptr<Collector>
-    New();
+    make();
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/insight/StatsDCollector.h b/include/xrpl/beast/insight/StatsDCollector.h
index 161f351763..ad436dc626 100644
--- a/include/xrpl/beast/insight/StatsDCollector.h
+++ b/include/xrpl/beast/insight/StatsDCollector.h
@@ -21,7 +21,7 @@ public:
         @param journal Destination for logging output.
     */
     static std::shared_ptr<StatsDCollector>
-    New(IP::Endpoint const& address, std::string const& prefix, Journal journal);
+    make(IP::Endpoint const& address, std::string const& prefix, Journal journal);
 };
 
 }  // namespace beast::insight
diff --git a/include/xrpl/beast/net/IPAddress.h b/include/xrpl/beast/net/IPAddress.h
index 277a43e5d8..67deaaa787 100644
--- a/include/xrpl/beast/net/IPAddress.h
+++ b/include/xrpl/beast/net/IPAddress.h
@@ -27,37 +27,37 @@ to_string(Address const& addr)
 
 /** Returns `true` if this is a loopback address. */
 inline bool
-is_loopback(Address const& addr)
+isLoopback(Address const& addr)
 {
     return addr.is_loopback();
 }
 
 /** Returns `true` if the address is unspecified. */
 inline bool
-is_unspecified(Address const& addr)
+isUnspecified(Address const& addr)
 {
     return addr.is_unspecified();
 }
 
 /** Returns `true` if the address is a multicast address. */
 inline bool
-is_multicast(Address const& addr)
+isMulticast(Address const& addr)
 {
     return addr.is_multicast();
 }
 
 /** Returns `true` if the address is a private unroutable address. */
 inline bool
-is_private(Address const& addr)
+isPrivate(Address const& addr)
 {
-    return (addr.is_v4()) ? is_private(addr.to_v4()) : is_private(addr.to_v6());
+    return (addr.is_v4()) ? isPrivate(addr.to_v4()) : isPrivate(addr.to_v6());
 }
 
 /** Returns `true` if the address is a public routable address. */
 inline bool
-is_public(Address const& addr)
+isPublic(Address const& addr)
 {
-    return (addr.is_v4()) ? is_public(addr.to_v4()) : is_public(addr.to_v6());
+    return (addr.is_v4()) ? isPublic(addr.to_v4()) : isPublic(addr.to_v6());
 }
 
 }  // namespace IP
@@ -95,7 +95,7 @@ struct hash<::beast::IP::Address>
     std::size_t
     operator()(::beast::IP::Address const& addr) const
     {
-        return ::beast::uhash<>{}(addr);
+        return ::beast::Uhash<>{}(addr);
     }
 };
 }  // namespace boost
diff --git a/include/xrpl/beast/net/IPAddressConversion.h b/include/xrpl/beast/net/IPAddressConversion.h
index 4e0328c113..b5fb697233 100644
--- a/include/xrpl/beast/net/IPAddressConversion.h
+++ b/include/xrpl/beast/net/IPAddressConversion.h
@@ -10,21 +10,21 @@ namespace beast::IP {
     The port is set to zero.
 */
 Endpoint
-from_asio(boost::asio::ip::address const& address);
+fromAsio(boost::asio::ip::address const& address);
 
 /** Convert to Endpoint. */
 Endpoint
-from_asio(boost::asio::ip::tcp::endpoint const& endpoint);
+fromAsio(boost::asio::ip::tcp::endpoint const& endpoint);
 
 /** Convert to asio::ip::address.
     The port is ignored.
 */
 boost::asio::ip::address
-to_asio_address(Endpoint const& endpoint);
+toAsioAddress(Endpoint const& endpoint);
 
 /** Convert to asio::ip::tcp::endpoint. */
 boost::asio::ip::tcp::endpoint
-to_asio_endpoint(Endpoint const& endpoint);
+toAsioEndpoint(Endpoint const& endpoint);
 
 }  // namespace beast::IP
 
@@ -36,24 +36,24 @@ struct IPAddressConversion
     explicit IPAddressConversion() = default;
 
     static IP::Endpoint
-    from_asio(boost::asio::ip::address const& address)
+    fromAsio(boost::asio::ip::address const& address)
     {
-        return IP::from_asio(address);
+        return IP::fromAsio(address);
     }
     static IP::Endpoint
-    from_asio(boost::asio::ip::tcp::endpoint const& endpoint)
+    fromAsio(boost::asio::ip::tcp::endpoint const& endpoint)
     {
-        return IP::from_asio(endpoint);
+        return IP::fromAsio(endpoint);
     }
     static boost::asio::ip::address
-    to_asio_address(IP::Endpoint const& address)
+    toAsioAddress(IP::Endpoint const& address)
     {
-        return IP::to_asio_address(address);
+        return IP::toAsioAddress(address);
     }
     static boost::asio::ip::tcp::endpoint
-    to_asio_endpoint(IP::Endpoint const& address)
+    toAsioEndpoint(IP::Endpoint const& address)
     {
-        return IP::to_asio_endpoint(address);
+        return IP::toAsioEndpoint(address);
     }
 };
 
diff --git a/include/xrpl/beast/net/IPAddressV4.h b/include/xrpl/beast/net/IPAddressV4.h
index 15bb959f49..dbe5a6095f 100644
--- a/include/xrpl/beast/net/IPAddressV4.h
+++ b/include/xrpl/beast/net/IPAddressV4.h
@@ -10,16 +10,16 @@ using AddressV4 = boost::asio::ip::address_v4;
 
 /** Returns `true` if the address is a private unroutable address. */
 bool
-is_private(AddressV4 const& addr);
+isPrivate(AddressV4 const& addr);
 
 /** Returns `true` if the address is a public routable address. */
 bool
-is_public(AddressV4 const& addr);
+isPublic(AddressV4 const& addr);
 
 /** Returns the address class for the given address.
     @note Class 'D' represents multicast addresses (224.*.*.*).
 */
 char
-get_class(AddressV4 const& address);
+getClass(AddressV4 const& address);
 
 }  // namespace beast::IP
diff --git a/include/xrpl/beast/net/IPAddressV6.h b/include/xrpl/beast/net/IPAddressV6.h
index 83ac6d4dab..10f806417d 100644
--- a/include/xrpl/beast/net/IPAddressV6.h
+++ b/include/xrpl/beast/net/IPAddressV6.h
@@ -10,10 +10,10 @@ using AddressV6 = boost::asio::ip::address_v6;
 
 /** Returns `true` if the address is a private unroutable address. */
 bool
-is_private(AddressV6 const& addr);
+isPrivate(AddressV6 const& addr);
 
 /** Returns `true` if the address is a public routable address. */
 bool
-is_public(AddressV6 const& addr);
+isPublic(AddressV6 const& addr);
 
 }  // namespace beast::IP
diff --git a/include/xrpl/beast/net/IPEndpoint.h b/include/xrpl/beast/net/IPEndpoint.h
index 15d86d75fe..fec6e1556f 100644
--- a/include/xrpl/beast/net/IPEndpoint.h
+++ b/include/xrpl/beast/net/IPEndpoint.h
@@ -27,56 +27,56 @@ public:
         @return An optional endpoint; will be `std::nullopt` on failure
     */
     static std::optional<Endpoint>
-    from_string_checked(std::string const& s);
+    fromStringChecked(std::string const& s);
     static Endpoint
-    from_string(std::string const& s);
+    fromString(std::string const& s);
 
     /** Returns a string representing the endpoint. */
     [[nodiscard]] std::string
-    to_string() const;
+    toString() const;
 
     /** Returns the port number on the endpoint. */
     [[nodiscard]] Port
     port() const
     {
-        return m_port;
+        return port_;
     }
 
     /** Returns a new Endpoint with a different port. */
     [[nodiscard]] Endpoint
-    at_port(Port port) const
+    atPort(Port port) const
     {
-        return Endpoint(m_addr, port);
+        return Endpoint(addr_, port);
     }
 
     /** Returns the address portion of this endpoint. */
     [[nodiscard]] Address const&
     address() const
     {
-        return m_addr;
+        return addr_;
     }
 
     /** Convenience accessors for the address part. */
     /** @{ */
     [[nodiscard]] bool
-    is_v4() const
+    isV4() const
     {
-        return m_addr.is_v4();
+        return addr_.is_v4();
     }
     [[nodiscard]] bool
-    is_v6() const
+    isV6() const
     {
-        return m_addr.is_v6();
+        return addr_.is_v6();
     }
     [[nodiscard]] AddressV4
-    to_v4() const
+    toV4() const
     {
-        return m_addr.to_v4();
+        return addr_.to_v4();
     }
     [[nodiscard]] AddressV6
-    to_v6() const
+    toV6() const
     {
-        return m_addr.to_v6();
+        return addr_.to_v6();
     }
     /** @} */
 
@@ -114,12 +114,12 @@ public:
     hash_append(Hasher& h, Endpoint const& endpoint)
     {
         using ::beast::hash_append;
-        hash_append(h, endpoint.m_addr, endpoint.m_port);
+        hash_append(h, endpoint.addr_, endpoint.port_);
     }
 
 private:
-    Address m_addr;
-    Port m_port;
+    Address addr_;
+    Port port_;
 };
 
 //------------------------------------------------------------------------------
@@ -128,37 +128,37 @@ private:
 
 /** Returns `true` if the endpoint is a loopback address. */
 inline bool
-is_loopback(Endpoint const& endpoint)
+isLoopback(Endpoint const& endpoint)
 {
-    return is_loopback(endpoint.address());
+    return isLoopback(endpoint.address());
 }
 
 /** Returns `true` if the endpoint is unspecified. */
 inline bool
-is_unspecified(Endpoint const& endpoint)
+isUnspecified(Endpoint const& endpoint)
 {
-    return is_unspecified(endpoint.address());
+    return isUnspecified(endpoint.address());
 }
 
 /** Returns `true` if the endpoint is a multicast address. */
 inline bool
-is_multicast(Endpoint const& endpoint)
+isMulticast(Endpoint const& endpoint)
 {
-    return is_multicast(endpoint.address());
+    return isMulticast(endpoint.address());
 }
 
 /** Returns `true` if the endpoint is a private unroutable address. */
 inline bool
-is_private(Endpoint const& endpoint)
+isPrivate(Endpoint const& endpoint)
 {
-    return is_private(endpoint.address());
+    return isPrivate(endpoint.address());
 }
 
 /** Returns `true` if the endpoint is a public routable address. */
 inline bool
-is_public(Endpoint const& endpoint)
+isPublic(Endpoint const& endpoint)
 {
-    return is_public(endpoint.address());
+    return isPublic(endpoint.address());
 }
 
 //------------------------------------------------------------------------------
@@ -167,7 +167,7 @@ is_public(Endpoint const& endpoint)
 inline std::string
 to_string(Endpoint const& endpoint)
 {
-    return endpoint.to_string();
+    return endpoint.toString();
 }
 
 /** Output stream conversion. */
@@ -197,7 +197,7 @@ struct hash<::beast::IP::Endpoint>
     std::size_t
     operator()(::beast::IP::Endpoint const& endpoint) const
     {
-        return ::beast::uhash<>{}(endpoint);
+        return ::beast::Uhash<>{}(endpoint);
     }
 };
 }  // namespace std
@@ -212,7 +212,7 @@ struct hash<::beast::IP::Endpoint>
     std::size_t
     operator()(::beast::IP::Endpoint const& endpoint) const
     {
-        return ::beast::uhash<>{}(endpoint);
+        return ::beast::Uhash<>{}(endpoint);
     }
 };
 }  // namespace boost
diff --git a/include/xrpl/beast/rfc2616.h b/include/xrpl/beast/rfc2616.h
index 7278119c3b..cf80bd26c0 100644
--- a/include/xrpl/beast/rfc2616.h
+++ b/include/xrpl/beast/rfc2616.h
@@ -16,9 +16,9 @@ namespace beast::rfc2616 {
 
 namespace detail {
 
-struct ci_equal_pred
+struct CiEqualPred
 {
-    explicit ci_equal_pred() = default;
+    explicit CiEqualPred() = default;
 
     bool
     operator()(char c1, char c2)
@@ -34,14 +34,14 @@ struct ci_equal_pred
     This excludes the CRLF sequence allowed for line continuations.
 */
 inline bool
-is_lws(char c)
+isLws(char c)
 {
     return c == ' ' || c == '\t';
 }
 
 /** Returns `true` if `c` is any whitespace character. */
 inline bool
-is_white(char c)
+isWhite(char c)
 {
     switch (c)
     {
@@ -59,14 +59,14 @@ is_white(char c)
 
 template <class FwdIter>
 FwdIter
-trim_right(FwdIter first, FwdIter last)
+trimRight(FwdIter first, FwdIter last)
 {
     if (first == last)
         return last;
     do
     {
         --last;
-        if (!is_white(*last))
+        if (!isWhite(*last))
             return ++last;
     } while (last != first);
     return first;
@@ -74,13 +74,13 @@ trim_right(FwdIter first, FwdIter last)
 
 template <class String>
 String
-trim_right(String const& s)
+trimRight(String const& s)
 {
     using std::begin;
     using std::end;
     auto first(begin(s));
     auto last(end(s));
-    last = trim_right(first, last);
+    last = trimRight(first, last);
     return {first, last};
 }
 
@@ -143,7 +143,7 @@ split(FwdIt first, FwdIt last, Char delim)
         }
         else if (*iter == delim)
         {
-            e = trim_right(e);
+            e = trimRight(e);
             if (!e.empty())
             {
                 result.emplace_back(std::move(e));
@@ -151,7 +151,7 @@ split(FwdIt first, FwdIt last, Char delim)
             }
             ++iter;
         }
-        else if (is_lws(*iter))
+        else if (isLws(*iter))
         {
             ++iter;
         }
@@ -163,7 +163,7 @@ split(FwdIt first, FwdIt last, Char delim)
 
     if (!e.empty())
     {
-        e = trim_right(e);
+        e = trimRight(e);
         if (!e.empty())
             result.emplace_back(std::move(e));
     }
@@ -174,16 +174,16 @@ template <
     class FwdIt,
     class Result = std::vector<std::basic_string<typename std::iterator_traits<FwdIt>::value_type>>>
 Result
-split_commas(FwdIt first, FwdIt last)
+splitCommas(FwdIt first, FwdIt last)
 {
     return split(first, last, ',');
 }
 
 template <class Result = std::vector<std::string>>
 Result
-split_commas(boost::beast::string_view const& s)
+splitCommas(boost::beast::string_view const& s)
 {
-    return split_commas(s.begin(), s.end());
+    return splitCommas(s.begin(), s.end());
 }
 
 //------------------------------------------------------------------------------
@@ -196,7 +196,7 @@ split_commas(boost::beast::string_view const& s)
 
     @note Values returned may contain backslash escapes.
 */
-class list_iterator
+class ListIterator
 {
     using iter_type = boost::string_ref::const_iterator;
 
@@ -211,20 +211,20 @@ public:
     using difference_type = std::ptrdiff_t;
     using iterator_category = std::forward_iterator_tag;
 
-    list_iterator(iter_type begin, iter_type end) : it_(begin), end_(end)
+    ListIterator(iter_type begin, iter_type end) : it_(begin), end_(end)
     {
         if (it_ != end_)
             increment();
     }
 
     bool
-    operator==(list_iterator const& other) const
+    operator==(ListIterator const& other) const
     {
         return other.it_ == it_ && other.end_ == end_ && other.value_.size() == value_.size();
     }
 
     bool
-    operator!=(list_iterator const& other) const
+    operator!=(ListIterator const& other) const
     {
         return !(*this == other);
     }
@@ -241,14 +241,14 @@ public:
         return &*(*this);
     }
 
-    list_iterator&
+    ListIterator&
     operator++()
     {
         increment();
         return *this;
     }
 
-    list_iterator
+    ListIterator
     operator++(int)
     {
         auto temp = *this;
@@ -264,7 +264,7 @@ private:
 
 template <class>
 void
-list_iterator::increment()
+ListIterator::increment()
 {
     using namespace detail;
     value_.clear();
@@ -302,7 +302,7 @@ list_iterator::increment()
             it_++;
             continue;
         }
-        else if (is_lws(*it_))
+        else if (isLws(*it_))
         {
             ++it_;
             continue;
@@ -313,7 +313,7 @@ list_iterator::increment()
             for (;;)
             {
                 ++it_;
-                if (it_ == end_ || *it_ == ',' || is_lws(*it_))
+                if (it_ == end_ || *it_ == ',' || isLws(*it_))
                 {
                     value_ = boost::string_ref(&*start, std::distance(start, it_));
                     return;
@@ -327,17 +327,17 @@ list_iterator::increment()
     A case-insensitive comparison is used.
 */
 inline bool
-ci_equal(boost::string_ref s1, boost::string_ref s2)
+ciEqual(boost::string_ref s1, boost::string_ref s2)
 {
-    return boost::range::equal(s1, s2, detail::ci_equal_pred{});
+    return boost::range::equal(s1, s2, detail::CiEqualPred{});
 }
 
 /** Returns a range representing the list. */
-inline boost::iterator_range<list_iterator>
-make_list(boost::string_ref const& field)
+inline boost::iterator_range<ListIterator>
+makeList(boost::string_ref const& field)
 {
-    return boost::iterator_range<list_iterator>{
-        list_iterator{field.begin(), field.end()}, list_iterator{field.end(), field.end()}};
+    return boost::iterator_range<ListIterator>{
+        ListIterator{field.begin(), field.end()}, ListIterator{field.end(), field.end()}};
 }
 
 /** Returns true if the specified token exists in the list.
@@ -346,19 +346,19 @@ make_list(boost::string_ref const& field)
 */
 template <class = void>
 bool
-token_in_list(boost::string_ref const& value, boost::string_ref const& token)
+tokenInList(boost::string_ref const& value, boost::string_ref const& token)
 {
-    for (auto const& item : make_list(value))
+    for (auto const& item : makeList(value))
     {
-        if (ci_equal(item, token))
+        if (ciEqual(item, token))
             return true;
     }
     return false;
 }
 
-template <bool isRequest, class Body, class Fields>
+template <bool IsRequest, class Body, class Fields>
 bool
-is_keep_alive(boost::beast::http::message<isRequest, Body, Fields> const& m)
+isKeepAlive(boost::beast::http::message<IsRequest, Body, Fields> const& m)
 {
     if (m.version() <= 10)
     {
diff --git a/include/xrpl/beast/test/yield_to.h b/include/xrpl/beast/test/yield_to.h
index 6c7f293122..84d7d8846d 100644
--- a/include/xrpl/beast/test/yield_to.h
+++ b/include/xrpl/beast/test/yield_to.h
@@ -23,7 +23,7 @@ namespace beast::test {
     functions inside coroutines. This is handy for testing
     asynchronous asio code.
 */
-class enable_yield_to
+class EnableYieldTo
 {
 protected:
     boost::asio::io_context ios_;
@@ -39,8 +39,7 @@ public:
     /// The type of yield context passed to functions.
     using yield_context = boost::asio::yield_context;
 
-    explicit enable_yield_to(std::size_t concurrency = 1)
-        : work_(boost::asio::make_work_guard(ios_))
+    explicit EnableYieldTo(std::size_t concurrency = 1) : work_(boost::asio::make_work_guard(ios_))
     {
         threads_.reserve(concurrency);
         for (std::size_t i = 0; i < concurrency; ++i)
@@ -49,7 +48,7 @@ public:
         }
     }
 
-    ~enable_yield_to()
+    ~EnableYieldTo()
     {
         work_ = boost::none;
         for (auto& t : threads_)
@@ -58,7 +57,7 @@ public:
 
     /// Return the `io_context` associated with the object
     boost::asio::io_context&
-    get_io_context()
+    getIoContext()
     {
         return ios_;
     }
@@ -81,7 +80,7 @@ public:
 #else
     template <class F0, class... FN>
     void
-    yield_to(F0&& f0, FN&&... fn);
+    yieldTo(F0&& f0, FN&&... fn);
 #endif
 
 private:
@@ -97,7 +96,7 @@ private:
 
 template <class F0, class... FN>
 void
-enable_yield_to::yield_to(F0&& f0, FN&&... fn)
+EnableYieldTo::yieldTo(F0&& f0, FN&&... fn)
 {
     running_ = 1 + sizeof...(FN);
     spawn(f0, fn...);
@@ -107,7 +106,7 @@ enable_yield_to::yield_to(F0&& f0, FN&&... fn)
 
 template <class F0, class... FN>
 inline void
-enable_yield_to::spawn(F0&& f, FN&&... fn)
+EnableYieldTo::spawn(F0&& f, FN&&... fn)
 {
     boost::asio::spawn(
         ios_,
diff --git a/include/xrpl/beast/type_name.h b/include/xrpl/beast/type_name.h
index d12f9c4b90..ae7b681af9 100644
--- a/include/xrpl/beast/type_name.h
+++ b/include/xrpl/beast/type_name.h
@@ -13,7 +13,7 @@ namespace beast {
 
 template <typename T>
 std::string
-type_name()
+typeName()
 {
     using TR = std::remove_reference_t<T>;
 
diff --git a/include/xrpl/beast/unit_test/amount.h b/include/xrpl/beast/unit_test/amount.h
index ae1dd8fe31..3a392f393f 100644
--- a/include/xrpl/beast/unit_test/amount.h
+++ b/include/xrpl/beast/unit_test/amount.h
@@ -11,31 +11,31 @@
 namespace beast::unit_test {
 
 /** Utility for producing nicely composed output of amounts with units. */
-class amount
+class Amount
 {
 private:
     std::size_t n_;
     std::string const& what_;
 
 public:
-    amount(amount const&) = default;
-    amount&
-    operator=(amount const&) = delete;
+    Amount(Amount const&) = default;
+    Amount&
+    operator=(Amount const&) = delete;
 
     template <class = void>
-    amount(std::size_t n, std::string const& what);
+    Amount(std::size_t n, std::string const& what);
 
     friend std::ostream&
-    operator<<(std::ostream& s, amount const& t);
+    operator<<(std::ostream& s, Amount const& t);
 };
 
 template <class>
-amount::amount(std::size_t n, std::string const& what) : n_(n), what_(what)
+Amount::Amount(std::size_t n, std::string const& what) : n_(n), what_(what)
 {
 }
 
 inline std::ostream&
-operator<<(std::ostream& s, amount const& t)
+operator<<(std::ostream& s, Amount const& t)
 {
     s << t.n_ << " " << t.what_ << ((t.n_ != 1) ? "s" : "");
     return s;
diff --git a/include/xrpl/beast/unit_test/detail/const_container.h b/include/xrpl/beast/unit_test/detail/const_container.h
index a36423f0ef..c171771e45 100644
--- a/include/xrpl/beast/unit_test/detail/const_container.h
+++ b/include/xrpl/beast/unit_test/detail/const_container.h
@@ -11,24 +11,24 @@ namespace beast::unit_test::detail {
     provide additional behavior.
 */
 template <class Container>
-class const_container
+class ConstContainer
 {
 private:
     using cont_type = Container;
 
-    cont_type m_cont;
+    cont_type cont_;
 
 protected:
     cont_type&
     cont()
     {
-        return m_cont;
+        return cont_;
     }
 
     [[nodiscard]] cont_type const&
     cont() const
     {
-        return m_cont;
+        return cont_;
     }
 
 public:
@@ -42,14 +42,14 @@ public:
     [[nodiscard]] bool
     empty() const
     {
-        return m_cont.empty();
+        return cont_.empty();
     }
 
     /** Returns the number of items in the container. */
     [[nodiscard]] size_type
     size() const
     {
-        return m_cont.size();
+        return cont_.size();
     }
 
     /** Returns forward iterators for traversal. */
@@ -57,25 +57,25 @@ public:
     [[nodiscard]] const_iterator
     begin() const
     {
-        return m_cont.cbegin();
+        return cont_.cbegin();
     }
 
     [[nodiscard]] const_iterator
     cbegin() const
     {
-        return m_cont.cbegin();
+        return cont_.cbegin();
     }
 
     [[nodiscard]] const_iterator
     end() const
     {
-        return m_cont.cend();
+        return cont_.cend();
     }
 
     [[nodiscard]] const_iterator
     cend() const
     {
-        return m_cont.cend();
+        return cont_.cend();
     }
     /** @} */
 };
diff --git a/include/xrpl/beast/unit_test/global_suites.h b/include/xrpl/beast/unit_test/global_suites.h
index ca33ddb11c..72ed738bdb 100644
--- a/include/xrpl/beast/unit_test/global_suites.h
+++ b/include/xrpl/beast/unit_test/global_suites.h
@@ -11,34 +11,34 @@ namespace beast::unit_test {
 namespace detail {
 
 /// Holds test suites registered during static initialization.
-inline suite_list&
-global_suites()
+inline SuiteList&
+globalSuites()
 {
-    static suite_list s;
-    return s;
+    static SuiteList kS;
+    return kS;
 }
 
 template <class Suite>
-struct insert_suite
+struct InsertSuite
 {
-    insert_suite(
+    InsertSuite(
         char const* name,
         char const* module,
         char const* library,
         bool manual,
         int priority)
     {
-        global_suites().insert<Suite>(name, module, library, manual, priority);
+        globalSuites().insert<Suite>(name, module, library, manual, priority);
     }
 };
 
 }  // namespace detail
 
 /// Holds test suites registered during static initialization.
-inline suite_list const&
-global_suites()
+inline SuiteList const&
+globalSuites()
 {
-    return detail::global_suites();
+    return detail::globalSuites();
 }
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/match.h b/include/xrpl/beast/unit_test/match.h
index dbafd67da5..222c4ea656 100644
--- a/include/xrpl/beast/unit_test/match.h
+++ b/include/xrpl/beast/unit_test/match.h
@@ -11,70 +11,70 @@
 namespace beast::unit_test {
 
 // Predicate for implementing matches
-class selector
+class Selector
 {
 public:
-    enum class mode_t {
+    enum class ModeT {
         // Run all tests except manual ones
-        all,
+        All,
 
         // Run tests that match in any field
-        automatch,
+        Automatch,
 
         // Match on suite
-        suite,
+        Suite,
 
         // Match on library
-        library,
+        Library,
 
         // Match on module (used internally)
-        module,
+        Module,
 
         // Match nothing (used internally)
-        none
+        None
     };
 
 private:
-    mode_t mode_;
+    ModeT mode_;
     std::string pat_;
     std::string library_;
 
 public:
     template <class = void>
-    explicit selector(mode_t mode, std::string const& pattern = "");
+    explicit Selector(ModeT mode, std::string const& pattern = "");
 
     template <class = void>
     bool
-    operator()(suite_info const& s);
+    operator()(SuiteInfo const& s);
 };
 
 //------------------------------------------------------------------------------
 
 template <class>
-selector::selector(mode_t mode, std::string const& pattern) : mode_(mode), pat_(pattern)
+Selector::Selector(ModeT mode, std::string const& pattern) : mode_(mode), pat_(pattern)
 {
-    if (mode_ == mode_t::automatch && pattern.empty())
-        mode_ = mode_t::all;
+    if (mode_ == ModeT::Automatch && pattern.empty())
+        mode_ = ModeT::All;
 }
 
 template <class>
 bool
-selector::operator()(suite_info const& s)
+Selector::operator()(SuiteInfo const& s)
 {
     switch (mode_)
     {
-        case mode_t::automatch:
+        case ModeT::Automatch:
             // suite or full name
-            if (s.name() == pat_ || s.full_name() == pat_)
+            if (s.name() == pat_ || s.fullName() == pat_)
             {
-                mode_ = mode_t::none;
+                mode_ = ModeT::None;
                 return true;
             }
 
             // check module
             if (pat_ == s.module())
             {
-                mode_ = mode_t::module;
+                mode_ = ModeT::Module;
                 library_ = s.library();
                 return !s.manual();
             }
@@ -82,12 +82,12 @@ selector::operator()(suite_info const& s)
             // check library
             if (pat_ == s.library())
             {
-                mode_ = mode_t::library;
+                mode_ = ModeT::Library;
                 return !s.manual();
             }
 
             // check start of name
-            if (s.name().starts_with(pat_) || s.full_name().starts_with(pat_))
+            if (s.name().starts_with(pat_) || s.fullName().starts_with(pat_))
             {
                 // Don't change the mode so that the partial pattern can match
                 // more than once
@@ -96,19 +96,19 @@ selector::operator()(suite_info const& s)
 
             return false;
 
-        case mode_t::suite:
+        case ModeT::Suite:
             return pat_ == s.name();
 
-        case mode_t::module:
+        case ModeT::Module:
             return pat_ == s.module() && !s.manual();
 
-        case mode_t::library:
+        case ModeT::Library:
             return pat_ == s.library() && !s.manual();
 
-        case mode_t::none:
+        case ModeT::None:
             return false;
 
-        case mode_t::all:
+        case ModeT::All:
         default:
             break;
     };
@@ -122,7 +122,7 @@ selector::operator()(suite_info const& s)
 
 /** Returns a predicate that implements a smart matching rule.
     The predicate checks the suite, module, and library fields of the
-    suite_info in that order. When it finds a match, it changes modes
+    SuiteInfo in that order. When it finds a match, it changes modes
     depending on what was found:
 
         If a suite is matched first, then only the suite is selected. The
@@ -135,31 +135,31 @@ selector::operator()(suite_info const& s)
         not marked manual are selected from then on.
 
 */
-inline selector
-match_auto(std::string const& name)
+inline Selector
+matchAuto(std::string const& name)
 {
-    return selector(selector::mode_t::automatch, name);
+    return Selector(Selector::ModeT::Automatch, name);
 }
 
 /** Return a predicate that matches all suites not marked manual. */
-inline selector
-match_all()
+inline Selector
+matchAll()
 {
-    return selector(selector::mode_t::all);
+    return Selector(Selector::ModeT::All);
 }
 
 /** Returns a predicate that matches a specific suite. */
-inline selector
-match_suite(std::string const& name)
+inline Selector
+matchSuite(std::string const& name)
 {
-    return selector(selector::mode_t::suite, name);
+    return Selector(Selector::ModeT::Suite, name);
 }
 
 /** Returns a predicate that matches all suites in a library. */
-inline selector
-match_library(std::string const& name)
+inline Selector
+matchLibrary(std::string const& name)
 {
-    return selector(selector::mode_t::library, name);
+    return Selector(Selector::ModeT::Library, name);
 }
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/recorder.h b/include/xrpl/beast/unit_test/recorder.h
index 55305a4b70..2ed88d4a46 100644
--- a/include/xrpl/beast/unit_test/recorder.h
+++ b/include/xrpl/beast/unit_test/recorder.h
@@ -10,65 +10,65 @@
 namespace beast::unit_test {
 
 /** A test runner that stores the results. */
-class recorder : public runner
+class Recorder : public Runner
 {
 private:
-    results m_results;
-    suite_results m_suite;
-    case_results m_case;
+    Results results_;
+    SuiteResults suite_;
+    CaseResults case_;
 
 public:
-    recorder() = default;
+    Recorder() = default;
 
     /** Returns a report with the results of all completed suites. */
-    [[nodiscard]] results const&
+    [[nodiscard]] Results const&
     report() const
     {
-        return m_results;
+        return results_;
     }
 
 private:
     void
-    on_suite_begin(suite_info const& info) override
+    onSuiteBegin(SuiteInfo const& info) override
     {
-        m_suite = suite_results(info.full_name());
+        suite_ = SuiteResults(info.fullName());
     }
 
     void
-    on_suite_end() override
+    onSuiteEnd() override
     {
-        m_results.insert(std::move(m_suite));
+        results_.insert(std::move(suite_));
     }
 
     void
-    on_case_begin(std::string const& name) override
+    onCaseBegin(std::string const& name) override
     {
-        m_case = case_results(name);
+        case_ = CaseResults(name);
     }
 
     void
-    on_case_end() override
+    onCaseEnd() override
     {
-        if (!m_case.tests.empty())
-            m_suite.insert(std::move(m_case));
+        if (!case_.tests.empty())
+            suite_.insert(std::move(case_));
     }
 
     void
-    on_pass() override
+    onPass() override
     {
-        m_case.tests.pass();
+        case_.tests.pass();
     }
 
     void
-    on_fail(std::string const& reason) override
+    onFail(std::string const& reason) override
     {
-        m_case.tests.fail(reason);
+        case_.tests.fail(reason);
     }
 
     void
-    on_log(std::string const& s) override
+    onLog(std::string const& s) override
     {
-        m_case.log.insert(s);
+        case_.log.insert(s);
     }
 };
 
diff --git a/include/xrpl/beast/unit_test/reporter.h b/include/xrpl/beast/unit_test/reporter.h
index 58bea93b2f..d2ba624f4a 100644
--- a/include/xrpl/beast/unit_test/reporter.h
+++ b/include/xrpl/beast/unit_test/reporter.h
@@ -26,23 +26,23 @@ namespace detail {
     The totals are output when the object is destroyed.
 */
 template <class = void>
-class reporter : public runner
+class Reporter : public Runner
 {
 private:
     using clock_type = std::chrono::steady_clock;
 
-    struct case_results
+    struct CaseResults
     {
         std::string name;
         std::size_t total = 0;
         std::size_t failed = 0;
 
-        explicit case_results(std::string name_ = "") : name(std::move(name_))
+        explicit CaseResults(std::string name = "") : name(std::move(name))
         {
         }
     };
 
-    struct suite_results
+    struct SuiteResults
     {
         std::string name;
         std::size_t cases = 0;
@@ -50,21 +50,21 @@ private:
         std::size_t failed = 0;
         typename clock_type::time_point start = clock_type::now();
 
-        explicit suite_results(std::string name_ = "") : name(std::move(name_))
+        explicit SuiteResults(std::string name = "") : name(std::move(name))
         {
         }
 
         void
-        add(case_results const& r);
+        add(CaseResults const& r);
     };
 
-    struct results
+    struct Results
     {
         using run_time = std::pair<std::string, typename clock_type::duration>;
 
         // Need to be named before converting
         // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-        enum { max_top = 10 };
+        enum { MaxTop = 10 };
 
         std::size_t suites = 0;
         std::size_t cases = 0;
@@ -74,54 +74,54 @@ private:
         typename clock_type::time_point start = clock_type::now();
 
         void
-        add(suite_results const& r);
+        add(SuiteResults const& r);
     };
 
     std::ostream& os_;
-    results results_;
-    suite_results suite_results_;
-    case_results case_results_;
+    Results results_;
+    SuiteResults suite_results_;
+    CaseResults case_results_;
 
 public:
-    reporter(reporter const&) = delete;
-    reporter&
-    operator=(reporter const&) = delete;
+    Reporter(Reporter const&) = delete;
+    Reporter&
+    operator=(Reporter const&) = delete;
 
-    ~reporter() override;
+    ~Reporter() override;
 
-    explicit reporter(std::ostream& os = std::cout);
+    explicit Reporter(std::ostream& os = std::cout);
 
 private:
     static std::string
     fmtdur(typename clock_type::duration const& d);
 
     void
-    on_suite_begin(suite_info const& info) override;
+    onSuiteBegin(SuiteInfo const& info) override;
 
     void
-    on_suite_end() override;
+    onSuiteEnd() override;
 
     void
-    on_case_begin(std::string const& name) override;
+    onCaseBegin(std::string const& name) override;
 
     void
-    on_case_end() override;
+    onCaseEnd() override;
 
     void
-    on_pass() override;
+    onPass() override;
 
     void
-    on_fail(std::string const& reason) override;
+    onFail(std::string const& reason) override;
 
     void
-    on_log(std::string const& s) override;
+    onLog(std::string const& s) override;
 };
 
 //------------------------------------------------------------------------------
 
 template <class Unused>
 void
-reporter<Unused>::suite_results::add(case_results const& r)
+Reporter<Unused>::SuiteResults::add(CaseResults const& r)
 {
     ++cases;
     total += r.total;
@@ -130,7 +130,7 @@ reporter<Unused>::suite_results::add(case_results const& r)
 
 template <class Unused>
 void
-reporter<Unused>::results::add(suite_results const& r)
+Reporter<Unused>::Results::add(SuiteResults const& r)
 {
     ++suites;
     total += r.total;
@@ -148,11 +148,11 @@ reporter<Unused>::results::add(suite_results const& r)
             });
         if (iter != top.end())
         {
-            if (top.size() == max_top)
+            if (top.size() == MaxTop)
                 top.resize(top.size() - 1);
             top.emplace(iter, r.name, elapsed);
         }
-        else if (top.size() < max_top)
+        else if (top.size() < MaxTop)
         {
             top.emplace_back(r.name, elapsed);
         }
@@ -162,12 +162,12 @@ reporter<Unused>::results::add(suite_results const& r)
 //------------------------------------------------------------------------------
 
 template <class Unused>
-reporter<Unused>::reporter(std::ostream& os) : os_(os)
+Reporter<Unused>::Reporter(std::ostream& os) : os_(os)
 {
 }
 
 template <class Unused>
-reporter<Unused>::~reporter()
+Reporter<Unused>::~Reporter()
 {
     if (results_.top.size() > 0)
     {
@@ -176,14 +176,14 @@ reporter<Unused>::~reporter()
             os_ << std::setw(8) << fmtdur(i.second) << " " << i.first << '\n';
     }
     auto const elapsed = clock_type::now() - results_.start;
-    os_ << fmtdur(elapsed) << ", " << amount{results_.suites, "suite"} << ", "
-        << amount{results_.cases, "case"} << ", " << amount{results_.total, "test"} << " total, "
-        << amount{results_.failed, "failure"} << std::endl;
+    os_ << fmtdur(elapsed) << ", " << Amount{results_.suites, "suite"} << ", "
+        << Amount{results_.cases, "case"} << ", " << Amount{results_.total, "test"} << " total, "
+        << Amount{results_.failed, "failure"} << std::endl;
 }
 
 template <class Unused>
 std::string
-reporter<Unused>::fmtdur(typename clock_type::duration const& d)
+Reporter<Unused>::fmtdur(typename clock_type::duration const& d)
 {
     using namespace std::chrono;
     auto const ms = duration_cast<milliseconds>(d);
@@ -196,44 +196,44 @@ reporter<Unused>::fmtdur(typename clock_type::duration const& d)
 
 template <class Unused>
 void
-reporter<Unused>::on_suite_begin(suite_info const& info)
+Reporter<Unused>::onSuiteBegin(SuiteInfo const& info)
 {
-    suite_results_ = suite_results{info.full_name()};
+    suite_results_ = SuiteResults{info.fullName()};
 }
 
 template <class Unused>
 void
-reporter<Unused>::on_suite_end()
+Reporter<Unused>::onSuiteEnd()
 {
     results_.add(suite_results_);
 }
 
 template <class Unused>
 void
-reporter<Unused>::on_case_begin(std::string const& name)
+Reporter<Unused>::onCaseBegin(std::string const& name)
 {
-    case_results_ = case_results(name);
+    case_results_ = CaseResults(name);
     os_ << suite_results_.name << (case_results_.name.empty() ? "" : (" " + case_results_.name))
         << std::endl;
 }
 
 template <class Unused>
 void
-reporter<Unused>::on_case_end()
+Reporter<Unused>::onCaseEnd()
 {
     suite_results_.add(case_results_);
 }
 
 template <class Unused>
 void
-reporter<Unused>::on_pass()
+Reporter<Unused>::onPass()
 {
     ++case_results_.total;
 }
 
 template <class Unused>
 void
-reporter<Unused>::on_fail(std::string const& reason)
+Reporter<Unused>::onFail(std::string const& reason)
 {
     ++case_results_.failed;
     ++case_results_.total;
@@ -243,13 +243,13 @@ reporter<Unused>::on_fail(std::string const& reason)
 
 template <class Unused>
 void
-reporter<Unused>::on_log(std::string const& s)
+Reporter<Unused>::onLog(std::string const& s)
 {
     os_ << s;
 }
 
 }  // namespace detail
 
-using reporter = detail::reporter<>;
+using reporter = detail::Reporter<>;
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/results.h b/include/xrpl/beast/unit_test/results.h
index 71c9aff47f..02aa9730d1 100644
--- a/include/xrpl/beast/unit_test/results.h
+++ b/include/xrpl/beast/unit_test/results.h
@@ -13,17 +13,17 @@
 namespace beast::unit_test {
 
 /** Holds a set of test condition outcomes in a testcase. */
-class case_results
+class CaseResults
 {
 public:
     /** Holds the result of evaluating one test condition. */
-    struct test
+    struct Test
     {
-        explicit test(bool pass_) : pass(pass_)
+        explicit Test(bool pass) : pass(pass)
         {
         }
 
-        test(bool pass_, std::string reason_) : pass(pass_), reason(std::move(reason_))
+        Test(bool pass, std::string reason) : pass(pass), reason(std::move(reason))
         {
         }
 
@@ -32,13 +32,13 @@ public:
     };
 
 private:
-    class tests_t : public detail::const_container<std::vector<test>>
+    class TestsT : public detail::ConstContainer<std::vector<Test>>
     {
     private:
         std::size_t failed_{0};
 
     public:
-        tests_t() = default;
+        TestsT() = default;
 
         /** Returns the total number of test conditions. */
         [[nodiscard]] std::size_t
@@ -70,7 +70,7 @@ private:
         }
     };
 
-    class log_t : public detail::const_container<std::vector<std::string>>
+    class LogT : public detail::ConstContainer<std::vector<std::string>>
     {
     public:
         /** Insert a string into the log. */
@@ -84,7 +84,7 @@ private:
     std::string name_;
 
 public:
-    explicit case_results(std::string name = "") : name_(std::move(name))
+    explicit CaseResults(std::string name = "") : name_(std::move(name))
     {
     }
 
@@ -96,16 +96,16 @@ public:
     }
 
     /** Memberspace for a container of test condition outcomes. */
-    tests_t tests;
+    TestsT tests;
 
     /** Memberspace for a container of testcase log messages. */
-    log_t log;
+    LogT log;
 };
 
 //--------------------------------------------------------------------------
 
 /** Holds the set of testcase results in a suite. */
-class suite_results : public detail::const_container<std::vector<case_results>>
+class SuiteResults : public detail::ConstContainer<std::vector<CaseResults>>
 {
 private:
     std::string name_;
@@ -113,7 +113,7 @@ private:
     std::size_t failed_ = 0;
 
 public:
-    explicit suite_results(std::string name = "") : name_(std::move(name))
+    explicit SuiteResults(std::string name = "") : name_(std::move(name))
     {
     }
 
@@ -141,7 +141,7 @@ public:
     /** Insert a set of testcase results. */
     /** @{ */
     void
-    insert(case_results&& r)
+    insert(CaseResults&& r)
     {
         total_ += r.tests.total();
         failed_ += r.tests.failed();
@@ -149,7 +149,7 @@ public:
     }
 
     void
-    insert(case_results const& r)
+    insert(CaseResults const& r)
     {
         cont().push_back(r);
         total_ += r.tests.total();
@@ -162,21 +162,21 @@ public:
 
 // VFALCO TODO Make this a template class using scoped allocators
 /** Holds the results of running a set of testsuites. */
-class results : public detail::const_container<std::vector<suite_results>>
+class Results : public detail::ConstContainer<std::vector<SuiteResults>>
 {
 private:
-    std::size_t m_cases{0};
+    std::size_t cases_{0};
     std::size_t total_{0};
     std::size_t failed_{0};
 
 public:
-    results() = default;
+    Results() = default;
 
     /** Returns the total number of test cases. */
     [[nodiscard]] std::size_t
     cases() const
     {
-        return m_cases;
+        return cases_;
     }
 
     /** Returns the total number of test conditions. */
@@ -196,18 +196,18 @@ public:
     /** Insert a set of suite results. */
     /** @{ */
     void
-    insert(suite_results&& r)
+    insert(SuiteResults&& r)
     {
-        m_cases += r.size();
+        cases_ += r.size();
         total_ += r.total();
         failed_ += r.failed();
         cont().emplace_back(std::move(r));
     }
 
     void
-    insert(suite_results const& r)
+    insert(SuiteResults const& r)
     {
-        m_cases += r.size();
+        cases_ += r.size();
         total_ += r.total();
         failed_ += r.failed();
         cont().push_back(r);
diff --git a/include/xrpl/beast/unit_test/runner.h b/include/xrpl/beast/unit_test/runner.h
index 5601a8725f..b88bfc5fe1 100644
--- a/include/xrpl/beast/unit_test/runner.h
+++ b/include/xrpl/beast/unit_test/runner.h
@@ -18,7 +18,7 @@ namespace beast::unit_test {
     Derived classes can customize the reporting behavior. This interface is
     injected into the unit_test class to receive the results of the tests.
 */
-class runner
+class Runner
 {
     std::string arg_;
     bool default_ = false;
@@ -27,11 +27,11 @@ class runner
     std::recursive_mutex mutex_;
 
 public:
-    runner() = default;
-    virtual ~runner() = default;
-    runner(runner const&) = delete;
-    runner&
-    operator=(runner const&) = delete;
+    Runner() = default;
+    virtual ~Runner() = default;
+    Runner(Runner const&) = delete;
+    Runner&
+    operator=(Runner const&) = delete;
 
     /** Set the argument string.
 
@@ -58,12 +58,12 @@ public:
     */
     template <class = void>
     bool
-    run(suite_info const& s);
+    run(SuiteInfo const& s);
 
     /** Run a sequence of suites.
         The expression
             `FwdIter::value_type`
-        must be convertible to `suite_info`.
+        must be convertible to `SuiteInfo`.
         @return `true` if any conditions failed.
     */
     template <class FwdIter>
@@ -73,77 +73,77 @@ public:
     /** Conditionally run a sequence of suites.
         pred will be called as:
         @code
-            bool pred(suite_info const&);
+            bool pred(SuiteInfo const&);
         @endcode
         @return `true` if any conditions failed.
     */
     template <class FwdIter, class Pred>
     bool
-    run_if(FwdIter first, FwdIter last, Pred pred = Pred{});
+    runIf(FwdIter first, FwdIter last, Pred pred = Pred{});
 
     /** Run all suites in a container.
         @return `true` if any conditions failed.
     */
     template <class SequenceContainer>
     bool
-    run_each(SequenceContainer const& c);
+    runEach(SequenceContainer const& c);
 
     /** Conditionally run suites in a container.
         pred will be called as:
         @code
-            bool pred(suite_info const&);
+            bool pred(SuiteInfo const&);
         @endcode
         @return `true` if any conditions failed.
     */
     template <class SequenceContainer, class Pred>
     bool
-    run_each_if(SequenceContainer const& c, Pred pred = Pred{});
+    runEachIf(SequenceContainer const& c, Pred pred = Pred{});
 
 protected:
     /// Called when a new suite starts.
     virtual void
-    on_suite_begin(suite_info const&)
+    onSuiteBegin(SuiteInfo const&)
     {
     }
 
     /// Called when a suite ends.
     virtual void
-    on_suite_end()
+    onSuiteEnd()
     {
     }
 
     /// Called when a new case starts.
     virtual void
-    on_case_begin(std::string const&)
+    onCaseBegin(std::string const&)
     {
     }
 
     /// Called when a new case ends.
     virtual void
-    on_case_end()
+    onCaseEnd()
     {
     }
 
     /// Called for each passing condition.
     virtual void
-    on_pass()
+    onPass()
     {
     }
 
     /// Called for each failing condition.
     virtual void
-    on_fail(std::string const&)
+    onFail(std::string const&)
     {
     }
 
     /// Called when a test logs output.
     virtual void
-    on_log(std::string const&)
+    onLog(std::string const&)
     {
     }
 
 private:
-    friend class suite;
+    friend class Suite;
 
     // Start a new testcase.
     template <class = void>
@@ -167,23 +167,23 @@ private:
 
 template <class>
 bool
-runner::run(suite_info const& s)
+Runner::run(SuiteInfo const& s)
 {
     // Enable 'default' testcase
     default_ = true;
     failed_ = false;
-    on_suite_begin(s);
+    onSuiteBegin(s);
     s.run(*this);
     // Forgot to call pass or fail.
     BOOST_ASSERT(cond_);
-    on_case_end();
-    on_suite_end();
+    onCaseEnd();
+    onSuiteEnd();
     return failed_;
 }
 
 template <class FwdIter>
 bool
-runner::run(FwdIter first, FwdIter last)
+Runner::run(FwdIter first, FwdIter last)
 {
     bool failed(false);
     for (; first != last; ++first)
@@ -193,7 +193,7 @@ runner::run(FwdIter first, FwdIter last)
 
 template <class FwdIter, class Pred>
 bool
-runner::run_if(FwdIter first, FwdIter last, Pred pred)
+Runner::runIf(FwdIter first, FwdIter last, Pred pred)
 {
     bool failed(false);
     for (; first != last; ++first)
@@ -206,7 +206,7 @@ runner::run_if(FwdIter first, FwdIter last, Pred pred)
 
 template <class SequenceContainer>
 bool
-runner::run_each(SequenceContainer const& c)
+Runner::runEach(SequenceContainer const& c)
 {
     bool failed(false);
     for (auto const& s : c)
@@ -216,7 +216,7 @@ runner::run_each(SequenceContainer const& c)
 
 template <class SequenceContainer, class Pred>
 bool
-runner::run_each_if(SequenceContainer const& c, Pred pred)
+Runner::runEachIf(SequenceContainer const& c, Pred pred)
 {
     bool failed(false);
     for (auto const& s : c)
@@ -229,7 +229,7 @@ runner::run_each_if(SequenceContainer const& c, Pred pred)
 
 template <class>
 void
-runner::testcase(std::string const& name)
+Runner::testcase(std::string const& name)
 {
     std::scoped_lock const lock(mutex_);
     // Name may not be empty
@@ -237,43 +237,43 @@ runner::testcase(std::string const& name)
     // Forgot to call pass or fail
     BOOST_ASSERT(default_ || cond_);
     if (!default_)
-        on_case_end();
+        onCaseEnd();
     default_ = false;
     cond_ = false;
-    on_case_begin(name);
+    onCaseBegin(name);
 }
 
 template <class>
 void
-runner::pass()
+Runner::pass()
 {
     std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
-    on_pass();
+    onPass();
     cond_ = true;
 }
 
 template <class>
 void
-runner::fail(std::string const& reason)
+Runner::fail(std::string const& reason)
 {
     std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
-    on_fail(reason);
+    onFail(reason);
     failed_ = true;
     cond_ = true;
 }
 
 template <class>
 void
-runner::log(std::string const& s)
+Runner::log(std::string const& s)
 {
     std::scoped_lock const lock(mutex_);
     if (default_)
         testcase("");
-    on_log(s);
+    onLog(s);
 }
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/suite.h b/include/xrpl/beast/unit_test/suite.h
index c6967ecfe3..999058b7f1 100644
--- a/include/xrpl/beast/unit_test/suite.h
+++ b/include/xrpl/beast/unit_test/suite.h
@@ -20,7 +20,7 @@ namespace detail {
 
 template <class String>
 static std::string
-make_reason(String const& reason, char const* file, int line)
+makeReason(String const& reason, char const* file, int line)
 {
     std::string s(reason);
     if (!s.empty())
@@ -37,7 +37,7 @@ make_reason(String const& reason, char const* file, int line)
 
 class Thread;
 
-enum class abort_t { no_abort_on_fail, abort_on_fail };
+enum class AbortT { NoAbortOnFail, AbortOnFail };
 
 /** A testsuite class.
 
@@ -46,16 +46,16 @@ enum class abort_t { no_abort_on_fail, abort_on_fail };
     derive from it and use the BEAST_DEFINE_UNIT_TEST macro in a
     translation unit.
 */
-class suite
+class Suite
 {
 private:
     bool abort_ = false;
     bool aborted_ = false;
-    runner* runner_ = nullptr;
+    Runner* runner_ = nullptr;
 
     // This exception is thrown internally to stop the current suite
     // in the event of a failure, if the option to stop is set.
-    struct abort_exception : public std::exception
+    struct AbortException : public std::exception
     {
         [[nodiscard]] char const*
         what() const noexcept override
@@ -65,16 +65,16 @@ private:
     };
 
     template <class CharT, class Traits, class Allocator>
-    class log_buf : public std::basic_stringbuf<CharT, Traits, Allocator>
+    class LogBuf : public std::basic_stringbuf<CharT, Traits, Allocator>
     {
-        suite& suite_;
+        Suite& suite_;
 
     public:
-        explicit log_buf(suite& self) : suite_(self)
+        explicit LogBuf(Suite& self) : suite_(self)
         {
         }
 
-        ~log_buf() override
+        ~LogBuf() override
         {
             sync();
         }
@@ -94,25 +94,25 @@ private:
         class CharT,
         class Traits = std::char_traits<CharT>,
         class Allocator = std::allocator<CharT>>
-    class log_os : public std::basic_ostream<CharT, Traits>
+    class LogOs : public std::basic_ostream<CharT, Traits>
     {
-        log_buf<CharT, Traits, Allocator> buf_;
+        LogBuf<CharT, Traits, Allocator> buf_;
 
     public:
-        explicit log_os(suite& self) : std::basic_ostream<CharT, Traits>(&buf_), buf_(self)
+        explicit LogOs(Suite& self) : std::basic_ostream<CharT, Traits>(&buf_), buf_(self)
         {
         }
     };
 
-    class scoped_testcase;
+    class ScopedTestcase;
 
-    class testcase_t
+    class TestcaseT
     {
-        suite& suite_;
+        Suite& suite_;
         std::stringstream ss_;
 
     public:
-        explicit testcase_t(suite& self) : suite_(self)
+        explicit TestcaseT(Suite& self) : suite_(self)
         {
         }
 
@@ -127,13 +127,13 @@ private:
             @param abort Determines if suite continues running after a failure.
         */
         void
-        operator()(std::string const& name, abort_t abort = abort_t::no_abort_on_fail);
+        operator()(std::string const& name, AbortT abort = AbortT::NoAbortOnFail);
 
-        scoped_testcase
-        operator()(abort_t abort);
+        ScopedTestcase
+        operator()(AbortT abort);
 
         template <class T>
-        scoped_testcase
+        ScopedTestcase
         operator<<(T const& t);
     };
 
@@ -143,28 +143,28 @@ public:
         Text sent to the log output stream will be forwarded to
         the output stream associated with the runner.
     */
-    log_os<char> log;
+    LogOs<char> log;
 
     /** Memberspace for declaring test cases. */
-    testcase_t testcase;
+    TestcaseT testcase;
 
     /** Returns the "current" running suite.
         If no suite is running, nullptr is returned.
     */
-    static suite*
-    this_suite()
+    static Suite*
+    thisSuite()
     {
-        return *p_this_suite();
+        return *pThisSuite();
     }
 
-    suite() : log(*this), testcase(*this)
+    Suite() : log(*this), testcase(*this)
     {
     }
 
-    virtual ~suite() = default;
-    suite(suite const&) = delete;
-    suite&
-    operator=(suite const&) = delete;
+    virtual ~Suite() = default;
+    Suite(Suite const&) = delete;
+    Suite&
+    operator=(Suite const&) = delete;
 
     /** Invokes the test using the specified runner.
 
@@ -175,7 +175,7 @@ public:
     */
     template <class = void>
     void
-    operator()(runner& r);
+    operator()(Runner& r);
 
     /** Record a successful test condition. */
     template <class = void>
@@ -296,11 +296,11 @@ public:
 private:
     friend class Thread;
 
-    static suite**
-    p_this_suite()
+    static Suite**
+    pThisSuite()
     {
-        static suite* pts = nullptr;  // NOLINT(misc-const-correctness)
-        return &pts;
+        static Suite* kP_TS = nullptr;  // NOLINT TODO
+        return &kP_TS;
     }
 
     /** Runs the suite. */
@@ -308,41 +308,41 @@ private:
     run() = 0;
 
     void
-    propagate_abort() const;
+    propagateAbort() const;
 
     template <class = void>
     void
-    run(runner& r);
+    run(Runner& r);
 };
 
 //------------------------------------------------------------------------------
 
 // Helper for streaming testcase names
-class suite::scoped_testcase
+class Suite::ScopedTestcase
 {
 private:
-    suite& suite_;
+    Suite& suite_;
     std::stringstream& ss_;
 
 public:
-    scoped_testcase&
-    operator=(scoped_testcase const&) = delete;
+    ScopedTestcase&
+    operator=(ScopedTestcase const&) = delete;
 
-    ~scoped_testcase()
+    ~ScopedTestcase()
     {
         auto const& name = ss_.str();
         if (!name.empty())
             suite_.runner_->testcase(name);
     }
 
-    scoped_testcase(suite& self, std::stringstream& ss) : suite_(self), ss_(ss)
+    ScopedTestcase(Suite& self, std::stringstream& ss) : suite_(self), ss_(ss)
     {
         ss_.clear();
         ss_.str({});
     }
 
     template <class T>
-    scoped_testcase(suite& self, std::stringstream& ss, T const& t) : suite_(self), ss_(ss)
+    ScopedTestcase(Suite& self, std::stringstream& ss, T const& t) : suite_(self), ss_(ss)
     {
         ss_.clear();
         ss_.str({});
@@ -350,7 +350,7 @@ public:
     }
 
     template <class T>
-    scoped_testcase&
+    ScopedTestcase&
     operator<<(T const& t)
     {
         ss_ << t;
@@ -361,22 +361,22 @@ public:
 //------------------------------------------------------------------------------
 
 inline void
-suite::testcase_t::operator()(std::string const& name, abort_t abort)
+Suite::TestcaseT::operator()(std::string const& name, AbortT abort)
 {
-    suite_.abort_ = abort == abort_t::abort_on_fail;
+    suite_.abort_ = abort == AbortT::AbortOnFail;
     suite_.runner_->testcase(name);
 }
 
-inline suite::scoped_testcase
-suite::testcase_t::operator()(abort_t abort)
+inline Suite::ScopedTestcase
+Suite::TestcaseT::operator()(AbortT abort)
 {
-    suite_.abort_ = abort == abort_t::abort_on_fail;
+    suite_.abort_ = abort == AbortT::AbortOnFail;
     return {suite_, ss_};
 }
 
 template <class T>
-inline suite::scoped_testcase
-suite::testcase_t::operator<<(T const& t)
+inline Suite::ScopedTestcase
+Suite::TestcaseT::operator<<(T const& t)
 {
     return {suite_, ss_, t};
 }
@@ -385,24 +385,24 @@ suite::testcase_t::operator<<(T const& t)
 
 template <class>
 void
-suite::operator()(runner& r)
+Suite::operator()(Runner& r)
 {
-    *p_this_suite() = this;
+    *pThisSuite() = this;
     try
     {
         run(r);
-        *p_this_suite() = nullptr;
+        *pThisSuite() = nullptr;
     }
     catch (...)
     {
-        *p_this_suite() = nullptr;
+        *pThisSuite() = nullptr;
         throw;
     }
 }
 
 template <class Condition, class String>
 bool
-suite::expect(Condition const& shouldBeTrue, String const& reason)
+Suite::expect(Condition const& shouldBeTrue, String const& reason)
 {
     if (shouldBeTrue)
     {
@@ -415,14 +415,14 @@ suite::expect(Condition const& shouldBeTrue, String const& reason)
 
 template <class Condition, class String>
 bool
-suite::expect(Condition const& shouldBeTrue, String const& reason, char const* file, int line)
+Suite::expect(Condition const& shouldBeTrue, String const& reason, char const* file, int line)
 {
     if (shouldBeTrue)
     {
         pass();
         return true;
     }
-    fail(detail::make_reason(reason, file, line));
+    fail(detail::makeReason(reason, file, line));
     return false;
 }
 
@@ -430,7 +430,7 @@ suite::expect(Condition const& shouldBeTrue, String const& reason, char const* f
 
 template <class F, class String>
 bool
-suite::except(F&& f, String const& reason)
+Suite::except(F&& f, String const& reason)
 {
     try
     {
@@ -447,7 +447,7 @@ suite::except(F&& f, String const& reason)
 
 template <class E, class F, class String>
 bool
-suite::except(F&& f, String const& reason)
+Suite::except(F&& f, String const& reason)
 {
     try
     {
@@ -464,7 +464,7 @@ suite::except(F&& f, String const& reason)
 
 template <class F, class String>
 bool
-suite::unexcept(F&& f, String const& reason)
+Suite::unexcept(F&& f, String const& reason)
 {
     try
     {
@@ -481,7 +481,7 @@ suite::unexcept(F&& f, String const& reason)
 
 template <class Condition, class String>
 bool
-suite::unexpected(Condition shouldBeFalse, String const& reason)
+Suite::unexpected(Condition shouldBeFalse, String const& reason)
 {
     bool const b = static_cast<bool>(shouldBeFalse);
     if (!b)
@@ -497,43 +497,43 @@ suite::unexpected(Condition shouldBeFalse, String const& reason)
 
 template <class>
 void
-suite::pass()
+Suite::pass()
 {
-    propagate_abort();
+    propagateAbort();
     runner_->pass();
 }
 
 // ::fail
 template <class>
 void
-suite::fail(std::string const& reason)
+Suite::fail(std::string const& reason)
 {
-    propagate_abort();
+    propagateAbort();
     runner_->fail(reason);
     if (abort_)
     {
         aborted_ = true;
-        BOOST_THROW_EXCEPTION(abort_exception());
+        BOOST_THROW_EXCEPTION(AbortException());
     }
 }
 
 template <class String>
 void
-suite::fail(String const& reason, char const* file, int line)
+Suite::fail(String const& reason, char const* file, int line)
 {
-    fail(detail::make_reason(reason, file, line));
+    fail(detail::makeReason(reason, file, line));
 }
 
 inline void
-suite::propagate_abort() const
+Suite::propagateAbort() const
 {
     if (abort_ && aborted_)
-        BOOST_THROW_EXCEPTION(abort_exception());
+        BOOST_THROW_EXCEPTION(AbortException());
 }
 
 template <class>
 void
-suite::run(runner& r)
+Suite::run(Runner& r)
 {
     runner_ = &r;
 
@@ -541,7 +541,7 @@ suite::run(runner& r)
     {
         run();
     }
-    catch (abort_exception const&)  // NOLINT(bugprone-empty-catch)
+    catch (AbortException const&)  // NOLINT(bugprone-empty-catch)
     {
         // ends the suite
     }
@@ -579,7 +579,7 @@ suite::run(runner& r)
 // detail:
 // This inserts the suite with the given manual flag
 #define BEAST_DEFINE_TESTSUITE_INSERT(Class, Module, Library, manual, priority) \
-    static beast::unit_test::detail::insert_suite<Class##_test>                 \
+    static beast::unit_test::detail::InsertSuite<Class##_test>                  \
         Library##Module##Class##_test_instance(#Class, #Module, #Library, manual, priority)
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/beast/unit_test/suite_info.h b/include/xrpl/beast/unit_test/suite_info.h
index e814d518cb..c09a0c2257 100644
--- a/include/xrpl/beast/unit_test/suite_info.h
+++ b/include/xrpl/beast/unit_test/suite_info.h
@@ -11,12 +11,12 @@
 
 namespace beast::unit_test {
 
-class runner;
+class Runner;
 
 /** Associates a unit test type with metadata. */
-class suite_info
+class SuiteInfo
 {
-    using run_type = std::function<void(runner&)>;
+    using run_type = std::function<void(Runner&)>;
 
     std::string name_;
     std::string module_;
@@ -26,7 +26,7 @@ class suite_info
     run_type run_;
 
 public:
-    suite_info(
+    SuiteInfo(
         std::string name,
         std::string module,
         std::string library,
@@ -69,20 +69,20 @@ public:
 
     /// Return the canonical suite name as a string.
     [[nodiscard]] std::string
-    full_name() const
+    fullName() const
     {
         return library_ + "." + module_ + "." + name_;
     }
 
     /// Run a new instance of the associated test suite.
     void
-    run(runner& r) const
+    run(Runner& r) const
     {
         run_(r);
     }
 
     friend bool
-    operator<(suite_info const& lhs, suite_info const& rhs)
+    operator<(SuiteInfo const& lhs, SuiteInfo const& rhs)
     {
         // we want higher priority suites sorted first, thus the negation
         // of priority value here
@@ -93,18 +93,13 @@ public:
 
 //------------------------------------------------------------------------------
 
-/// Convenience for producing suite_info for a given test type.
+/// Convenience for producing SuiteInfo for a given test type.
 template <class Suite>
-suite_info
-make_suite_info(
-    std::string name,
-    std::string module,
-    std::string library,
-    bool manual,
-    int priority)
+SuiteInfo
+makeSuiteInfo(std::string name, std::string module, std::string library, bool manual, int priority)
 {
-    return suite_info(
-        std::move(name), std::move(module), std::move(library), manual, priority, [](runner& r) {
+    return SuiteInfo(
+        std::move(name), std::move(module), std::move(library), manual, priority, [](Runner& r) {
             Suite{}(r);
         });
 }
diff --git a/include/xrpl/beast/unit_test/suite_list.h b/include/xrpl/beast/unit_test/suite_list.h
index deffbdfe84..748f994602 100644
--- a/include/xrpl/beast/unit_test/suite_list.h
+++ b/include/xrpl/beast/unit_test/suite_list.h
@@ -16,7 +16,7 @@
 namespace beast::unit_test {
 
 /// A container of test suites.
-class suite_list : public detail::const_container<std::set<suite_info>>
+class SuiteList : public detail::ConstContainer<std::set<SuiteInfo>>
 {
 private:
 #ifndef NDEBUG
@@ -38,7 +38,7 @@ public:
 
 template <class Suite>
 void
-suite_list::insert(
+SuiteList::insert(
     char const* name,
     char const* module,
     char const* library,
@@ -58,7 +58,7 @@ suite_list::insert(
         BOOST_ASSERT(result.second);  // Duplicate type
     }
 #endif
-    cont().emplace(make_suite_info<Suite>(name, module, library, manual, priority));
+    cont().emplace(makeSuiteInfo<Suite>(name, module, library, manual, priority));
 }
 
 }  // namespace beast::unit_test
diff --git a/include/xrpl/beast/unit_test/thread.h b/include/xrpl/beast/unit_test/thread.h
index aa9ff3b0d9..7ae093eb85 100644
--- a/include/xrpl/beast/unit_test/thread.h
+++ b/include/xrpl/beast/unit_test/thread.h
@@ -16,7 +16,7 @@ namespace beast::unit_test {
 class Thread
 {
 private:
-    suite* s_ = nullptr;
+    Suite* s_ = nullptr;
     std::thread t_;
 
 public:
@@ -41,7 +41,7 @@ public:
     }
 
     template <class F, class... Args>
-    explicit Thread(suite& s, F&& f, Args&&... args) : s_(&s)
+    explicit Thread(Suite& s, F&& f, Args&&... args) : s_(&s)
     {
         std::function<void(void)> b = std::bind(std::forward<F>(f), std::forward<Args>(args)...);
         t_ = std::thread(&Thread::run, this, std::move(b));
@@ -54,13 +54,13 @@ public:
     }
 
     [[nodiscard]] std::thread::id
-    get_id() const
+    getId() const
     {
         return t_.get_id();
     }
 
     static unsigned
-    hardware_concurrency() noexcept
+    hardwareConcurrency() noexcept
     {
         return std::thread::hardware_concurrency();
     }
@@ -69,7 +69,7 @@ public:
     join()
     {
         t_.join();
-        s_->propagate_abort();
+        s_->propagateAbort();
     }
 
     void
@@ -93,7 +93,7 @@ private:
         {
             f();
         }
-        catch (suite::abort_exception const&)  // NOLINT(bugprone-empty-catch)
+        catch (Suite::AbortException const&)  // NOLINT(bugprone-empty-catch)
         {
         }
         catch (std::exception const& e)
diff --git a/include/xrpl/beast/utility/Journal.h b/include/xrpl/beast/utility/Journal.h
index 45b7b671cb..0fd0019235 100644
--- a/include/xrpl/beast/utility/Journal.h
+++ b/include/xrpl/beast/utility/Journal.h
@@ -12,17 +12,17 @@ namespace severities {
 // Hundreds of usages via logging macros
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Severity {
-    kAll = 0,
+    KAll = 0,
 
-    kTrace = kAll,
-    kDebug = 1,
-    kInfo = 2,
-    kWarning = 3,
-    kError = 4,
-    kFatal = 5,
+    KTrace = KAll,
+    KDebug = 1,
+    KInfo = 2,
+    KWarning = 3,
+    KError = 4,
+    KFatal = 5,
 
-    kDisabled = 6,
-    kNone = kDisabled
+    KDisabled = 6,
+    KNone = KDisabled
 };
 }  // namespace severities
 
@@ -47,8 +47,8 @@ private:
     // Severity level / threshold of a Journal message.
     using Severity = severities::Severity;
 
-    // Invariant: m_sink always points to a valid Sink
-    Sink* m_sink;
+    // Invariant: sink_ always points to a valid Sink
+    Sink* sink_;
 
 public:
     //--------------------------------------------------------------------------
@@ -108,7 +108,7 @@ public:
 
     private:
         Severity thresh_;
-        bool m_console;
+        bool console_;
     };
 
 #ifndef __INTELLISENSE__
@@ -132,7 +132,7 @@ public:
     class ScopedStream
     {
     public:
-        ScopedStream(ScopedStream const& other) : ScopedStream(other.m_sink, other.m_level)
+        ScopedStream(ScopedStream const& other) : ScopedStream(other.sink_, other.level_)
         {
         }
 
@@ -151,7 +151,7 @@ public:
         std::ostringstream&
         ostream() const
         {
-            return m_ostream;
+            return ostream_;
         }
 
         std::ostream&
@@ -162,9 +162,9 @@ public:
         operator<<(T const& t) const;
 
     private:
-        Sink& m_sink;
-        Severity const m_level;
-        std::ostringstream mutable m_ostream;
+        Sink& sink_;
+        Severity const level_;
+        std::ostringstream mutable ostream_;
     };
 
 #ifndef __INTELLISENSE__
@@ -183,7 +183,7 @@ public:
     {
     public:
         /** Create a stream which produces no output. */
-        explicit Stream() : m_sink(getNullSink()), m_level(severities::kDisabled)
+        explicit Stream() : sink_(getNullSink()), level_(severities::KDisabled)
         {
         }
 
@@ -191,14 +191,14 @@ public:
 
             Constructor is inlined so checking active() very inexpensive.
         */
-        Stream(Sink& sink, Severity level) : m_sink(sink), m_level(level)
+        Stream(Sink& sink, Severity level) : sink_(sink), level_(level)
         {
             XRPL_ASSERT(
-                m_level < severities::kDisabled, "beast::Journal::Stream::Stream : maximum level");
+                level_ < severities::KDisabled, "beast::Journal::Stream::Stream : maximum level");
         }
 
         /** Construct or copy another Stream. */
-        Stream(Stream const& other) : Stream(other.m_sink, other.m_level)
+        Stream(Stream const& other) : Stream(other.sink_, other.level_)
         {
         }
 
@@ -209,14 +209,14 @@ public:
         [[nodiscard]] Sink&
         sink() const
         {
-            return m_sink;
+            return sink_;
         }
 
         /** Returns the Severity level of messages this Stream reports. */
         [[nodiscard]] Severity
         level() const
         {
-            return m_level;
+            return level_;
         }
 
         /** Returns `true` if sink logs anything at this stream's level. */
@@ -224,7 +224,7 @@ public:
         [[nodiscard]] bool
         active() const
         {
-            return m_sink.active(m_level);
+            return sink_.active(level_);
         }
 
         explicit
@@ -245,8 +245,8 @@ public:
         /** @} */
 
     private:
-        Sink& m_sink;
-        Severity m_level;
+        Sink& sink_;
+        Severity level_;
     };
 
 #ifndef __INTELLISENSE__
@@ -264,7 +264,7 @@ public:
     Journal() = delete;
 
     /** Create a journal that writes to the specified sink. */
-    explicit Journal(Sink& sink) : m_sink(&sink)
+    explicit Journal(Sink& sink) : sink_(&sink)
     {
     }
 
@@ -272,14 +272,14 @@ public:
     [[nodiscard]] Sink&
     sink() const
     {
-        return *m_sink;
+        return *sink_;
     }
 
     /** Returns a stream for this sink, with the specified severity level. */
     [[nodiscard]] Stream
     stream(Severity level) const
     {
-        return Stream(*m_sink, level);
+        return Stream(*sink_, level);
     }
 
     /** Returns `true` if any message would be logged at this severity level.
@@ -289,7 +289,7 @@ public:
     [[nodiscard]] bool
     active(Severity level) const
     {
-        return m_sink->active(level);
+        return sink_->active(level);
     }
 
     /** Severity stream access functions. */
@@ -297,37 +297,37 @@ public:
     [[nodiscard]] Stream
     trace() const
     {
-        return {*m_sink, severities::kTrace};
+        return {*sink_, severities::KTrace};
     }
 
     [[nodiscard]] Stream
     debug() const
     {
-        return {*m_sink, severities::kDebug};
+        return {*sink_, severities::KDebug};
     }
 
     [[nodiscard]] Stream
     info() const
     {
-        return {*m_sink, severities::kInfo};
+        return {*sink_, severities::KInfo};
     }
 
     [[nodiscard]] Stream
     warn() const
     {
-        return {*m_sink, severities::kWarning};
+        return {*sink_, severities::KWarning};
     }
 
     [[nodiscard]] Stream
     error() const
     {
-        return {*m_sink, severities::kError};
+        return {*sink_, severities::KError};
     }
 
     [[nodiscard]] Stream
     fatal() const
     {
-        return {*m_sink, severities::kFatal};
+        return {*sink_, severities::KFatal};
     }
     /** @} */
 };
@@ -347,15 +347,15 @@ template <typename T>
 Journal::ScopedStream::ScopedStream(Journal::Stream const& stream, T const& t)
     : ScopedStream(stream.sink(), stream.level())
 {
-    m_ostream << t;
+    ostream_ << t;
 }
 
 template <typename T>
 std::ostream&
 Journal::ScopedStream::operator<<(T const& t) const
 {
-    m_ostream << t;
-    return m_ostream;
+    ostream_ << t;
+    return ostream_;
 }
 
 //------------------------------------------------------------------------------
@@ -370,7 +370,7 @@ Journal::Stream::operator<<(T const& t) const
 namespace detail {
 
 template <class CharT, class Traits = std::char_traits<CharT>>
-class logstream_buf : public std::basic_stringbuf<CharT, Traits>
+class LogStreamBuf : public std::basic_stringbuf<CharT, Traits>
 {
     beast::Journal::Stream strm_;
 
@@ -389,11 +389,11 @@ class logstream_buf : public std::basic_stringbuf<CharT, Traits>
     }
 
 public:
-    explicit logstream_buf(beast::Journal::Stream const& strm) : strm_(strm)
+    explicit LogStreamBuf(beast::Journal::Stream const& strm) : strm_(strm)
     {
     }
 
-    ~logstream_buf() override
+    ~LogStreamBuf() override
     {
         sync();
     }
@@ -414,7 +414,7 @@ public:
 }  // namespace detail
 
 template <class CharT, class Traits = std::char_traits<CharT>>
-class basic_logstream : public std::basic_ostream<CharT, Traits>
+class BasicLogstream : public std::basic_ostream<CharT, Traits>
 {
     using char_type = CharT;
     using traits_type = Traits;
@@ -422,16 +422,16 @@ class basic_logstream : public std::basic_ostream<CharT, Traits>
     using pos_type = typename traits_type::pos_type;
     using off_type = typename traits_type::off_type;
 
-    detail::logstream_buf<CharT, Traits> buf_;
+    detail::LogStreamBuf<CharT, Traits> buf_;
 
 public:
-    explicit basic_logstream(beast::Journal::Stream const& strm)
+    explicit BasicLogstream(beast::Journal::Stream const& strm)
         : std::basic_ostream<CharT, Traits>(&buf_), buf_(strm)
     {
     }
 };
 
-using logstream = basic_logstream<char>;
-using logwstream = basic_logstream<wchar_t>;
+using logstream = BasicLogstream<char>;
+using logwstream = BasicLogstream<wchar_t>;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/utility/PropertyStream.h b/include/xrpl/beast/utility/PropertyStream.h
index 39e354cc31..62de019edd 100644
--- a/include/xrpl/beast/utility/PropertyStream.h
+++ b/include/xrpl/beast/utility/PropertyStream.h
@@ -23,11 +23,11 @@ public:
 
 protected:
     virtual void
-    map_begin() = 0;
+    mapBegin() = 0;
     virtual void
-    map_begin(std::string const& key) = 0;
+    mapBegin(std::string const& key) = 0;
     virtual void
-    map_end() = 0;
+    mapEnd() = 0;
 
     virtual void
     add(std::string const& key, std::string const& value) = 0;
@@ -40,7 +40,7 @@ protected:
 
     template <typename Value>
     void
-    lexical_add(std::string const& key, Value value)
+    lexicalAdd(std::string const& key, Value value)
     {
         std::stringstream ss;
         ss << value;
@@ -79,11 +79,11 @@ protected:
     add(std::string const& key, long double value);
 
     virtual void
-    array_begin() = 0;
+    arrayBegin() = 0;
     virtual void
-    array_begin(std::string const& key) = 0;
+    arrayBegin(std::string const& key) = 0;
     virtual void
-    array_end() = 0;
+    arrayEnd() = 0;
 
     virtual void
     add(std::string const& value) = 0;
@@ -96,7 +96,7 @@ protected:
 
     template <typename Value>
     void
-    lexical_add(Value value)
+    lexicalAdd(Value value)
     {
         std::stringstream ss;
         ss << value;
@@ -157,7 +157,7 @@ public:
     operator*() const;
 
 private:
-    Source* m_source;
+    Source* source_;
 };
 
 //------------------------------------------------------------------------------
@@ -169,9 +169,9 @@ private:
 class PropertyStream::Proxy
 {
 private:
-    Map const* m_map;
-    std::string m_key;
-    std::ostringstream mutable m_ostream;
+    Map const* map_;
+    std::string key_;
+    std::ostringstream mutable ostream_;
 
 public:
     Proxy(Map const& map, std::string key);
@@ -189,7 +189,7 @@ public:
     std::ostream&
     operator<<(T const& t) const
     {
-        return m_ostream << t;
+        return ostream_ << t;
     }
 };
 
@@ -202,7 +202,7 @@ public:
 class PropertyStream::Map
 {
 private:
-    PropertyStream& m_stream;
+    PropertyStream& stream_;
 
 public:
     explicit Map(PropertyStream& stream);
@@ -224,7 +224,7 @@ public:
     void
     add(std::string const& key, Value value) const
     {
-        m_stream.add(key, value);
+        stream_.add(key, value);
     }
 
     template <typename Key, typename Value>
@@ -261,7 +261,7 @@ template <typename Value>
 PropertyStream::Proxy&
 PropertyStream::Proxy::operator=(Value value)
 {
-    m_map->add(m_key, value);
+    map_->add(key_, value);
     return *this;
 }
 
@@ -274,7 +274,7 @@ PropertyStream::Proxy::operator=(Value value)
 class PropertyStream::Set
 {
 private:
-    PropertyStream& m_stream;
+    PropertyStream& stream_;
 
 public:
     Set(std::string const& key, Map& map);
@@ -294,7 +294,7 @@ public:
     void
     add(Value value) const
     {
-        m_stream.add(value);
+        stream_.add(value);
     }
 };
 
@@ -308,7 +308,7 @@ public:
 class PropertyStream::Source
 {
 private:
-    std::string const m_name;
+    std::string const name_;
     std::recursive_mutex lock_;
     Item item_;
     Source* parent_{nullptr};
@@ -351,7 +351,7 @@ public:
 
     /** Write only this Source to the stream. */
     void
-    write_one(PropertyStream& stream);
+    writeOne(PropertyStream& stream);
 
     /** write this source and all its children recursively to the stream. */
     void
@@ -384,18 +384,18 @@ public:
     find(std::string path);
 
     Source*
-    find_one_deep(std::string const& name);
+    findOneDeep(std::string const& name);
     PropertyStream::Source*
-    find_path(std::string path);
+    findPath(std::string path);
     PropertyStream::Source*
-    find_one(std::string const& name);
+    findOne(std::string const& name);
 
     static bool
-    peel_leading_slash(std::string* path);
+    peelLeadingSlash(std::string* path);
     static bool
-    peel_trailing_slashstar(std::string* path);
+    peelTrailingSlashstar(std::string* path);
     static std::string
-    peel_name(std::string* path);
+    peelName(std::string* path);
 
     //--------------------------------------------------------------------------
 
diff --git a/include/xrpl/beast/utility/Zero.h b/include/xrpl/beast/utility/Zero.h
index ff212b9c98..7825bb96e0 100644
--- a/include/xrpl/beast/utility/Zero.h
+++ b/include/xrpl/beast/utility/Zero.h
@@ -27,7 +27,7 @@ struct Zero
 };
 
 namespace {
-constexpr Zero zero{};
+constexpr Zero kZERO{};
 }  // namespace
 
 /** Default implementation of signum calls the method on the class. */
@@ -44,7 +44,7 @@ namespace detail::zero_helper {
 // be made from a namespace that does not include overloads of the function..
 template <class T>
 auto
-call_signum(T const& t)
+callSignum(T const& t)
 {
     return signum(t);
 }
@@ -57,42 +57,42 @@ template <typename T>
 bool
 operator==(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) == 0;
+    return detail::zero_helper::callSignum(t) == 0;
 }
 
 template <typename T>
 bool
 operator!=(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) != 0;
+    return detail::zero_helper::callSignum(t) != 0;
 }
 
 template <typename T>
 bool
 operator<(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) < 0;
+    return detail::zero_helper::callSignum(t) < 0;
 }
 
 template <typename T>
 bool
 operator>(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) > 0;
+    return detail::zero_helper::callSignum(t) > 0;
 }
 
 template <typename T>
 bool
 operator>=(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) >= 0;
+    return detail::zero_helper::callSignum(t) >= 0;
 }
 
 template <typename T>
 bool
 operator<=(T const& t, Zero)
 {
-    return detail::zero_helper::call_signum(t) <= 0;
+    return detail::zero_helper::callSignum(t) <= 0;
 }
 
 // Handle operators where T is on the right side by
@@ -102,42 +102,42 @@ template <typename T>
 bool
 operator==(Zero, T const& t)
 {
-    return t == zero;
+    return t == kZERO;
 }
 
 template <typename T>
 bool
 operator!=(Zero, T const& t)
 {
-    return t != zero;
+    return t != kZERO;
 }
 
 template <typename T>
 bool
 operator<(Zero, T const& t)
 {
-    return t > zero;
+    return t > kZERO;
 }
 
 template <typename T>
 bool
 operator>(Zero, T const& t)
 {
-    return t < zero;
+    return t < kZERO;
 }
 
 template <typename T>
 bool
 operator>=(Zero, T const& t)
 {
-    return t <= zero;
+    return t <= kZERO;
 }
 
 template <typename T>
 bool
 operator<=(Zero, T const& t)
 {
-    return t >= zero;
+    return t >= kZERO;
 }
 
 }  // namespace beast
diff --git a/include/xrpl/beast/utility/maybe_const.h b/include/xrpl/beast/utility/maybe_const.h
index bcfd7a7532..40904471be 100644
--- a/include/xrpl/beast/utility/maybe_const.h
+++ b/include/xrpl/beast/utility/maybe_const.h
@@ -6,15 +6,15 @@ namespace beast {
 
 /** Makes T const or non const depending on a bool. */
 template <bool IsConst, class T>
-struct maybe_const
+struct MaybeConst
 {
-    explicit maybe_const() = default;
+    explicit MaybeConst() = default;
     using type = std::
         conditional_t<IsConst, typename std::remove_const<T>::type const, std::remove_const_t<T>>;
 };
 
 /** Alias for omitting `typename`. */
 template <bool IsConst, class T>
-using maybe_const_t = typename maybe_const<IsConst, T>::type;
+using maybe_const_t = typename MaybeConst<IsConst, T>::type;
 
 }  // namespace beast
diff --git a/include/xrpl/beast/utility/rngfill.h b/include/xrpl/beast/utility/rngfill.h
index f6ac46476d..1bc8350d4f 100644
--- a/include/xrpl/beast/utility/rngfill.h
+++ b/include/xrpl/beast/utility/rngfill.h
@@ -14,24 +14,24 @@ void
 rngfill(void* const buffer, std::size_t const bytes, Generator& g)
 {
     using result_type = typename Generator::result_type;
-    constexpr std::size_t result_size = sizeof(result_type);
+    constexpr std::size_t kRESULT_SIZE = sizeof(result_type);
 
-    std::uint8_t* const buffer_start = static_cast<std::uint8_t*>(buffer);
-    std::size_t const complete_iterations = bytes / result_size;
-    std::size_t const bytes_remaining = bytes % result_size;
+    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;
 
-    for (std::size_t count = 0; count < complete_iterations; ++count)
+    for (std::size_t count = 0; count < completeIterations; ++count)
     {
         result_type const v = g();
-        std::size_t const offset = count * result_size;
-        std::memcpy(buffer_start + offset, &v, result_size);
+        std::size_t const offset = count * kRESULT_SIZE;
+        std::memcpy(bufferStart + offset, &v, kRESULT_SIZE);
     }
 
-    if (bytes_remaining > 0)
+    if (bytesRemaining > 0)
     {
         result_type const v = g();
-        std::size_t const offset = complete_iterations * result_size;
-        std::memcpy(buffer_start + offset, &v, bytes_remaining);
+        std::size_t const offset = completeIterations * kRESULT_SIZE;
+        std::memcpy(bufferStart + offset, &v, bytesRemaining);
     }
 }
 
diff --git a/include/xrpl/beast/utility/temp_dir.h b/include/xrpl/beast/utility/temp_dir.h
index 09e68c4e6b..ec661b51c4 100644
--- a/include/xrpl/beast/utility/temp_dir.h
+++ b/include/xrpl/beast/utility/temp_dir.h
@@ -11,19 +11,19 @@ namespace beast {
     The directory and all its contents are deleted when
     the instance of `temp_dir` is destroyed.
 */
-class temp_dir
+class TempDir
 {
     boost::filesystem::path path_;
 
 public:
 #if !GENERATING_DOCS
-    temp_dir(temp_dir const&) = delete;
-    temp_dir&
-    operator=(temp_dir const&) = delete;
+    TempDir(TempDir const&) = delete;
+    TempDir&
+    operator=(TempDir const&) = delete;
 #endif
 
     /// Construct a temporary directory.
-    temp_dir()
+    TempDir()
     {
         auto const dir = boost::filesystem::temp_directory_path();
         do
@@ -34,7 +34,7 @@ public:
     }
 
     /// Destroy a temporary directory.
-    ~temp_dir()
+    ~TempDir()
     {
         // use non-throwing calls in the destructor
         boost::system::error_code ec;
diff --git a/include/xrpl/beast/xor_shift_engine.h b/include/xrpl/beast/xor_shift_engine.h
index 85504f51aa..3a5345934e 100644
--- a/include/xrpl/beast/xor_shift_engine.h
+++ b/include/xrpl/beast/xor_shift_engine.h
@@ -9,16 +9,16 @@ namespace beast {
 namespace detail {
 
 template <class = void>
-class xor_shift_engine
+class XorShiftEngine
 {
 public:
     using result_type = std::uint64_t;
 
-    xor_shift_engine(xor_shift_engine const&) = default;
-    xor_shift_engine&
-    operator=(xor_shift_engine const&) = default;
+    XorShiftEngine(XorShiftEngine const&) = default;
+    XorShiftEngine&
+    operator=(XorShiftEngine const&) = default;
 
-    explicit xor_shift_engine(result_type val = 1977u);
+    explicit XorShiftEngine(result_type val = 1977u);
 
     void
     seed(result_type seed);
@@ -44,14 +44,14 @@ private:
 };
 
 template <class Unused>
-xor_shift_engine<Unused>::xor_shift_engine(result_type val)
+XorShiftEngine<Unused>::XorShiftEngine(result_type val)
 {
     seed(val);
 }
 
 template <class Unused>
 void
-xor_shift_engine<Unused>::seed(result_type seed)
+XorShiftEngine<Unused>::seed(result_type seed)
 {
     if (seed == 0)
         throw std::domain_error("invalid seed");
@@ -61,7 +61,7 @@ xor_shift_engine<Unused>::seed(result_type seed)
 
 template <class Unused>
 auto
-xor_shift_engine<Unused>::operator()() -> result_type
+XorShiftEngine<Unused>::operator()() -> result_type
 {
     result_type s1 = s_[0];
     result_type const s0 = s_[1];
@@ -72,7 +72,7 @@ xor_shift_engine<Unused>::operator()() -> result_type
 
 template <class Unused>
 auto
-xor_shift_engine<Unused>::murmurhash3(result_type x) -> result_type
+XorShiftEngine<Unused>::murmurhash3(result_type x) -> result_type
 {
     x ^= x >> 33;
     x *= 0xff51afd7ed558ccdULL;
@@ -91,6 +91,6 @@ xor_shift_engine<Unused>::murmurhash3(result_type x) -> result_type
     http://xorshift.di.unimi.it/xorshift128plus.c
     does not accept seed==0
 */
-using xor_shift_engine = detail::xor_shift_engine<>;
+using xor_shift_engine = detail::XorShiftEngine<>;
 
 }  // namespace beast
diff --git a/include/xrpl/conditions/Condition.h b/include/xrpl/conditions/Condition.h
index 4b24c5a289..0d45245585 100644
--- a/include/xrpl/conditions/Condition.h
+++ b/include/xrpl/conditions/Condition.h
@@ -10,11 +10,11 @@
 namespace xrpl::cryptoconditions {
 
 enum class Type : std::uint8_t {
-    preimageSha256 = 0,
-    prefixSha256 = 1,
-    thresholdSha256 = 2,
-    rsaSha256 = 3,
-    ed25519Sha256 = 4
+    PreimageSha256 = 0,
+    PrefixSha256 = 1,
+    ThresholdSha256 = 2,
+    RsaSha256 = 3,
+    Ed25519Sha256 = 4
 };
 
 class Condition
@@ -27,7 +27,7 @@ public:
               that were previously considered valid to no longer
               be allowed.
     */
-    static constexpr std::size_t maxSerializedCondition = 128;
+    static constexpr std::size_t kMAX_SERIALIZED_CONDITION = 128;
 
     /** Load a condition from its binary form
 
diff --git a/include/xrpl/conditions/Fulfillment.h b/include/xrpl/conditions/Fulfillment.h
index cf28e29185..8b315297d7 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 maxSerializedFulfillment = 256;
+    static constexpr std::size_t kMAX_SERIALIZED_FULFILLMENT = 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 1e5e93eb89..e3018f754c 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 maxPreimageLength = 128;
+    static constexpr std::size_t kMAX_PREIMAGE_LENGTH = 128;
 
     /** Parse the payload for a PreimageSha256 condition
 
@@ -49,25 +49,25 @@ public:
 
         if (!isPrimitive(p) || !isContextSpecific(p))
         {
-            ec = error::incorrect_encoding;
+            ec = Error::IncorrectEncoding;
             return {};
         }
 
         if (p.tag != 0)
         {
-            ec = error::unexpected_tag;
+            ec = Error::UnexpectedTag;
             return {};
         }
 
         if (s.size() != p.length)
         {
-            ec = error::trailing_garbage;
+            ec = Error::TrailingGarbage;
             return {};
         }
 
-        if (s.size() > maxPreimageLength)
+        if (s.size() > kMAX_PREIMAGE_LENGTH)
         {
-            ec = error::preimage_too_long;
+            ec = Error::PreimageTooLong;
             return {};
         }
 
@@ -93,7 +93,7 @@ public:
     [[nodiscard]] Type
     type() const override
     {
-        return Type::preimageSha256;
+        return Type::PreimageSha256;
     }
 
     [[nodiscard]] Buffer
diff --git a/include/xrpl/conditions/detail/error.h b/include/xrpl/conditions/detail/error.h
index 73cee4c9f3..578add1705 100644
--- a/include/xrpl/conditions/detail/error.h
+++ b/include/xrpl/conditions/detail/error.h
@@ -4,39 +4,39 @@
 
 namespace xrpl::cryptoconditions {
 
-enum class error {
-    generic = 1,
-    unsupported_type,
-    unsupported_subtype,
-    unknown_type,
-    unknown_subtype,
-    fingerprint_size,
-    incorrect_encoding,
-    trailing_garbage,
-    buffer_empty,
-    buffer_overfull,
-    buffer_underfull,
-    malformed_encoding,
-    short_preamble,
-    unexpected_tag,
-    long_tag,
-    large_size,
-    preimage_too_long
+enum class Error {
+    Generic = 1,
+    UnsupportedType,
+    UnsupportedSubtype,
+    UnknownType,
+    UnknownSubtype,
+    FingerprintSize,
+    IncorrectEncoding,
+    TrailingGarbage,
+    BufferEmpty,
+    BufferOverfull,
+    BufferUnderfull,
+    MalformedEncoding,
+    ShortPreamble,
+    UnexpectedTag,
+    LongTag,
+    LargeSize,
+    PreimageTooLong
 };
 
 std::error_code
-make_error_code(error ev);
+make_error_code(Error ev);
 
 }  // namespace xrpl::cryptoconditions
 
 namespace std {
 
 template <>
-struct is_error_code_enum<xrpl::cryptoconditions::error>
+struct is_error_code_enum<xrpl::cryptoconditions::Error>
 {
     explicit is_error_code_enum() = default;
 
-    static bool const value = true;
+    static bool const value = true;  // NOLINT(readability-identifier-naming)
 };
 
 }  // namespace std
diff --git a/include/xrpl/conditions/detail/utils.h b/include/xrpl/conditions/detail/utils.h
index 8629987b8b..87f2265034 100644
--- a/include/xrpl/conditions/detail/utils.h
+++ b/include/xrpl/conditions/detail/utils.h
@@ -68,7 +68,7 @@ parsePreamble(Slice& s, std::error_code& ec)
 
     if (s.size() < 2)
     {
-        ec = error::short_preamble;
+        ec = Error::ShortPreamble;
         return p;
     }
 
@@ -79,7 +79,7 @@ parsePreamble(Slice& s, std::error_code& ec)
 
     if (p.tag == 0x1F)
     {  // Long tag form, which we do not support:
-        ec = error::long_tag;
+        ec = Error::LongTag;
         return p;
     }
 
@@ -92,19 +92,19 @@ parsePreamble(Slice& s, std::error_code& ec)
 
         if (cnt == 0)
         {
-            ec = error::malformed_encoding;
+            ec = Error::MalformedEncoding;
             return p;
         }
 
         if (cnt > sizeof(std::size_t))
         {
-            ec = error::large_size;
+            ec = Error::LargeSize;
             return p;
         }
 
         if (cnt > s.size())
         {
-            ec = error::short_preamble;
+            ec = Error::ShortPreamble;
             return p;
         }
 
@@ -117,7 +117,7 @@ parsePreamble(Slice& s, std::error_code& ec)
 
         if (p.length == 0)
         {
-            ec = error::malformed_encoding;
+            ec = Error::MalformedEncoding;
             return p;
         }
     }
@@ -130,13 +130,13 @@ parseOctetString(Slice& s, std::uint32_t count, std::error_code& ec)
 {
     if (count > s.size())
     {
-        ec = error::buffer_underfull;
+        ec = Error::BufferUnderfull;
         return {};
     }
 
     if (count > 65535)
     {
-        ec = error::large_size;
+        ec = Error::LargeSize;
         return {};
     }
 
@@ -154,13 +154,13 @@ parseInteger(Slice& s, std::size_t count, std::error_code& ec)
     if (s.empty())
     {
         // can never have zero sized integers
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return v;
     }
 
     if (count > s.size())
     {
-        ec = error::buffer_underfull;
+        ec = Error::BufferUnderfull;
         return v;
     }
 
@@ -169,14 +169,14 @@ parseInteger(Slice& s, std::size_t count, std::error_code& ec)
     size_t const maxLength = isSigned ? sizeof(Integer) : sizeof(Integer) + 1;
     if (count > maxLength)
     {
-        ec = error::large_size;
+        ec = Error::LargeSize;
         return v;
     }
 
     if (!isSigned && (s[0] & (1 << 7)))
     {
         // trying to decode a negative number into a positive value
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return v;
     }
 
@@ -184,7 +184,7 @@ parseInteger(Slice& s, std::size_t count, std::error_code& ec)
     {
         // since integers are coded as two's complement, the first byte may
         // be zero for unsigned reps
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return v;
     }
 
diff --git a/include/xrpl/core/ClosureCounter.h b/include/xrpl/core/ClosureCounter.h
index 76e52cb3cd..fb13047f40 100644
--- a/include/xrpl/core/ClosureCounter.h
+++ b/include/xrpl/core/ClosureCounter.h
@@ -27,10 +27,10 @@ namespace xrpl {
  * the caller that they should drop the closure and cancel their operation.
  * `join` blocks until all existing closure substitutes are destroyed.
  *
- * \tparam Ret_t The return type of the closure.
- * \tparam Args_t The argument types of the closure.
+ * \tparam Ret The return type of the closure.
+ * \tparam Args The argument types of the closure.
  */
-template <typename Ret_t, typename... Args_t>
+template <typename Ret, typename... Args>
 class ClosureCounter
 {
 private:
@@ -75,8 +75,8 @@ private:
         std::remove_reference_t<Closure> closure_{};
 
         static_assert(
-            std::is_same_v<decltype(closure_(std::declval<Args_t>()...)), Ret_t>,
-            "Closure arguments don't match ClosureCounter Ret_t or Args_t");
+            std::is_same_v<decltype(closure_(std::declval<Args>()...)), Ret>,
+            "Closure arguments don't match ClosureCounter Ret or Args");
 
     public:
         Substitute() = delete;
@@ -110,13 +110,13 @@ private:
             --counter_;
         }
 
-        // Note that Args_t is not deduced, it is explicit.  So Args_t&&
+        // Note that Args is not deduced, it is explicit.  So Args&&
         // would be an rvalue reference, not a forwarding reference.  We
         // want to forward exactly what the user declared.
-        Ret_t
-        operator()(Args_t... args)
+        Ret
+        operator()(Args... args)
         {
-            return closure_(std::forward<Args_t>(args)...);
+            return closure_(std::forward<Args>(args)...);
         }
     };
 
@@ -159,7 +159,7 @@ public:
 
     /** Wrap the passed closure with a reference counter.
 
-        @param closure Closure that accepts Args_t parameters and returns Ret_t.
+        @param closure Closure that accepts Args parameters and returns Ret.
         @return If join() has been called returns std::nullopt.  Otherwise
                 returns a std::optional that wraps closure with a
                 reference counter.
diff --git a/include/xrpl/core/Coro.ipp b/include/xrpl/core/Coro.ipp
index e7461b1b85..4b876dc68d 100644
--- a/include/xrpl/core/Coro.ipp
+++ b/include/xrpl/core/Coro.ipp
@@ -1,21 +1,22 @@
 #pragma once
 
+#include <utility>
+
 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 coroStackSize = 1536 * 1024;
+constexpr std::size_t kCORO_STACK_SIZE = 1536 * 1024;
 
 template <class F>
-JobQueue::Coro::Coro(Coro_create_t, JobQueue& jq, JobType type, std::string const& name, F&& f)
+JobQueue::Coro::Coro(CoroCreateT, JobQueue& jq, JobType type, std::string name, F&& f)
     : jq_(jq)
     , type_(type)
-    , name_(name)
+    , name_(std::move(name))
     , coro_(
-          boost::context::protected_fixedsize_stack(coroStackSize),
-          [this,
-           fn = std::forward<F>(f)](boost::coroutines2::coroutine<void>::push_type& do_yield) {
-              yield_ = &do_yield;
+          boost::context::protected_fixedsize_stack(kCORO_STACK_SIZE),
+          [this, fn = std::forward<F>(f)](boost::coroutines2::coroutine<void>::push_type& doYield) {
+              yield_ = &doYield;
               yield();
               fn(shared_from_this());
 #ifndef NDEBUG
@@ -36,7 +37,7 @@ inline void
 JobQueue::Coro::yield() const
 {
     {
-        std::scoped_lock lock(jq_.m_mutex);
+        std::scoped_lock const lock(jq_.mutex_);
         ++jq_.nSuspend_;
     }
     (*yield_)();
@@ -46,7 +47,7 @@ inline bool
 JobQueue::Coro::post()
 {
     {
-        std::scoped_lock lk(mutex_run_);
+        std::scoped_lock const lk(mutex_run_);
         running_ = true;
     }
 
@@ -57,7 +58,7 @@ JobQueue::Coro::post()
     }
 
     // The coroutine will not run.  Clean up running_.
-    std::scoped_lock lk(mutex_run_);
+    std::scoped_lock const lk(mutex_run_);
     running_ = false;
     cv_.notify_all();
     return false;
@@ -67,16 +68,16 @@ inline void
 JobQueue::Coro::resume()
 {
     {
-        std::scoped_lock lk(mutex_run_);
+        std::scoped_lock const lk(mutex_run_);
         running_ = true;
     }
     {
-        std::scoped_lock lk(jq_.m_mutex);
+        std::scoped_lock const lk(jq_.mutex_);
         --jq_.nSuspend_;
     }
     auto saved = detail::getLocalValues().release();
     detail::getLocalValues().reset(&lvs_);
-    std::scoped_lock lock(mutex_);
+    std::scoped_lock const lock(mutex_);
     // A late resume() can arrive after the coroutine has already completed.
     // This is an expected (if rare) outcome of the race condition documented
     // in JobQueue.h:354-377 where post() schedules a resume job before the
@@ -91,7 +92,7 @@ JobQueue::Coro::resume()
     }
     detail::getLocalValues().release();
     detail::getLocalValues().reset(saved);
-    std::scoped_lock lk(mutex_run_);
+    std::scoped_lock const lk(mutex_run_);
     running_ = false;
     cv_.notify_all();
 }
@@ -115,7 +116,7 @@ JobQueue::Coro::expectEarlyExit()
         //
         // That said, since we're outside the Coro's stack, we need to
         // decrement the nSuspend that the Coro's call to yield caused.
-        std::scoped_lock lock(jq_.m_mutex);
+        std::scoped_lock const lock(jq_.mutex_);
         --jq_.nSuspend_;
 #ifndef NDEBUG
         finished_ = true;
@@ -127,7 +128,7 @@ inline void
 JobQueue::Coro::join()
 {
     std::unique_lock<std::mutex> lk(mutex_run_);
-    cv_.wait(lk, [this]() { return running_ == false; });
+    cv_.wait(lk, [this]() { return !running_; });
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/core/HashRouter.h b/include/xrpl/core/HashRouter.h
index 230fc06dbc..d36b8aee6e 100644
--- a/include/xrpl/core/HashRouter.h
+++ b/include/xrpl/core/HashRouter.h
@@ -212,7 +212,7 @@ public:
         uint256 const& key,
         PeerShortID peer,
         HashRouterFlags& flags,
-        std::chrono::seconds tx_interval);
+        std::chrono::seconds txInterval);
 
     /** Set the flags on a hash.
 
@@ -250,7 +250,7 @@ private:
     Setup const setup_;
 
     // Stores all suppressed hashes and their expiration time
-    beast::aged_unordered_map<uint256, Entry, Stopwatch::clock_type, hardened_hash<strong_hash>>
+    beast::aged_unordered_map<uint256, Entry, Stopwatch::clock_type, HardenedHash<strong_hash>>
         suppressionMap_;
 };
 
diff --git a/include/xrpl/core/Job.h b/include/xrpl/core/Job.h
index 2fe5ab263c..b62488dec6 100644
--- a/include/xrpl/core/Job.h
+++ b/include/xrpl/core/Job.h
@@ -15,62 +15,62 @@ namespace xrpl {
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum JobType {
     // Special type indicating an invalid job - will go away soon.
-    jtINVALID = -1,
+    JtInvalid = -1,
 
     // Job types - the position in this enum indicates the job priority with
     // earlier jobs having lower priority than later jobs. If you wish to
     // insert a job at a specific priority, simply add it at the right location.
 
-    jtPACK,               // Make a fetch pack for a peer
-    jtPUBOLDLEDGER,       // An old ledger has been accepted
-    jtCLIENT,             // A placeholder for the priority of all jtCLIENT jobs
-    jtCLIENT_SUBSCRIBE,   // A websocket subscription by a client
-    jtCLIENT_FEE_CHANGE,  // Subscription for fee change by a client
-    jtCLIENT_CONSENSUS,   // Subscription for consensus state change by a client
-    jtCLIENT_ACCT_HIST,   // Subscription for account history by a client
-    jtCLIENT_RPC,         // Client RPC request
-    jtCLIENT_WEBSOCKET,   // Client websocket request
-    jtRPC,                // A websocket command from the client
-    jtSWEEP,              // Sweep for stale structures
-    jtVALIDATION_ut,      // A validation from an untrusted source
-    jtMANIFEST,           // A validator's manifest
-    jtUPDATE_PF,          // Update pathfinding requests
-    jtTRANSACTION_l,      // A local transaction
-    jtREPLAY_REQ,         // Peer request a ledger delta or a skip list
-    jtLEDGER_REQ,         // Peer request ledger/txnset data
-    jtPROPOSAL_ut,        // A proposal from an untrusted source
-    jtREPLAY_TASK,        // A Ledger replay task/subtask
-    jtTRANSACTION,        // A transaction received from the network
-    jtMISSING_TXN,        // Request missing transactions
-    jtREQUESTED_TXN,      // Reply with requested transactions
-    jtBATCH,              // Apply batched transactions
-    jtLEDGER_DATA,        // Received data for a ledger we're acquiring
-    jtADVANCE,            // Advance validated/acquired ledgers
-    jtPUBLEDGER,          // Publish a fully-accepted ledger
-    jtTXN_DATA,           // Fetch a proposed set
-    jtWAL,                // Write-ahead logging
-    jtVALIDATION_t,       // A validation from a trusted source
-    jtWRITE,              // Write out hashed objects
-    jtACCEPT,             // Accept a consensus ledger
-    jtPROPOSAL_t,         // A proposal from a trusted source
-    jtNETOP_CLUSTER,      // NetworkOPs cluster peer report
-    jtNETOP_TIMER,        // NetworkOPs net timer processing
-    jtADMIN,              // An administrative operation
+    JtPack,             // Make a fetch pack for a peer
+    JtPuboldledger,     // An old ledger has been accepted
+    JtClient,           // A placeholder for the priority of all jtCLIENT jobs
+    JtClientSubscribe,  // A websocket subscription by a client
+    JtClientFeeChange,  // Subscription for fee change by a client
+    JtClientConsensus,  // Subscription for consensus state change by a client
+    JtClientAcctHist,   // Subscription for account history by a client
+    JtClientRpc,        // Client RPC request
+    JtClientWebsocket,  // Client websocket request
+    JtRpc,              // A websocket command from the client
+    JtSweep,            // Sweep for stale structures
+    JtValidationUt,     // A validation from an untrusted source
+    JtManifest,         // A validator's manifest
+    JtUpdatePf,         // Update pathfinding requests
+    JtTransactionL,     // A local transaction
+    JtReplayReq,        // Peer request a ledger delta or a skip list
+    JtLedgerReq,        // Peer request ledger/txnset data
+    JtProposalUt,       // A proposal from an untrusted source
+    JtReplayTask,       // A Ledger replay task/subtask
+    JtTransaction,      // A transaction received from the network
+    JtMissingTxn,       // Request missing transactions
+    JtRequestedTxn,     // Reply with requested transactions
+    JtBatch,            // Apply batched transactions
+    JtLedgerData,       // Received data for a ledger we're acquiring
+    JtAdvance,          // Advance validated/acquired ledgers
+    JtPubledger,        // Publish a fully-accepted ledger
+    JtTxnData,          // Fetch a proposed set
+    JtWal,              // Write-ahead logging
+    JtValidationT,      // A validation from a trusted source
+    JtWrite,            // Write out hashed objects
+    JtAccept,           // Accept a consensus ledger
+    JtProposalT,        // A proposal from a trusted source
+    JtNetopCluster,     // NetworkOPs cluster peer report
+    JtNetopTimer,       // NetworkOPs net timer processing
+    JtAdmin,            // An administrative operation
 
     // Special job types which are not dispatched by the job pool
-    jtPEER,
-    jtDISK,
-    jtTXN_PROC,
-    jtOB_SETUP,
-    jtPATH_FIND,
-    jtHO_READ,
-    jtHO_WRITE,
-    jtGENERIC,  // Used just to measure time
+    JtPeer,
+    JtDisk,
+    JtTxnProc,
+    JtObSetup,
+    JtPathFind,
+    JtHoRead,
+    JtHoWrite,
+    JtGeneric,  // Used just to measure time
 
     // Node store monitoring
-    jtNS_SYNC_READ,
-    jtNS_ASYNC_READ,
-    jtNS_WRITE,
+    JtNsSyncRead,
+    JtNsAsyncRead,
+    JtNsWrite,
 };
 
 class Job : public CountedObject<Job>
@@ -105,7 +105,7 @@ public:
 
     /** Returns the time when the job was queued. */
     [[nodiscard]] clock_type::time_point const&
-    queue_time() const;
+    queueTime() const;
 
     void
     doJob();
@@ -122,12 +122,12 @@ public:
     operator>=(Job const& j) const;
 
 private:
-    JobType mType;
-    std::uint64_t mJobIndex;
-    std::function<void()> mJob;
-    std::shared_ptr<LoadEvent> m_loadEvent;
-    std::string mName;
-    clock_type::time_point m_queue_time;
+    JobType type_;
+    std::uint64_t jobIndex_;
+    std::function<void()> job_;
+    std::shared_ptr<LoadEvent> loadEvent_;
+    std::string name_;
+    clock_type::time_point queue_time_;
 };
 
 using JobCounter = ClosureCounter<void>;
diff --git a/include/xrpl/core/JobQueue.h b/include/xrpl/core/JobQueue.h
index bac616470a..2a96ea45fa 100644
--- a/include/xrpl/core/JobQueue.h
+++ b/include/xrpl/core/JobQueue.h
@@ -24,9 +24,9 @@ class PerfLog;
 }  // namespace perf
 
 class Logs;
-struct Coro_create_t
+struct CoroCreateT
 {
-    explicit Coro_create_t() = default;
+    explicit CoroCreateT() = default;
 };
 
 /** A pool of threads to perform work.
@@ -54,16 +54,15 @@ public:
         std::mutex mutex_;
         std::mutex mutex_run_;
         std::condition_variable cv_;
+        boost::coroutines2::coroutine<void>::push_type* yield_{};
         boost::coroutines2::coroutine<void>::pull_type coro_;
-        boost::coroutines2::coroutine<void>::push_type* yield_;
 #ifndef NDEBUG
         bool finished_ = false;
 #endif
 
     public:
-        // Private: Used in the implementation
         template <class F>
-        Coro(Coro_create_t, JobQueue&, JobType, std::string const&, F&&);
+        Coro(CoroCreateT, JobQueue&, JobType, std::string, F&&);
 
         // Not copy-constructible or assignable
         Coro(Coro const&) = delete;
@@ -200,7 +199,7 @@ public:
     isOverloaded();
 
     // Cannot be const because LoadMonitor has no const methods.
-    Json::Value
+    json::Value
     getJson(int c = 0);
 
     /** Block until no jobs running. */
@@ -226,29 +225,29 @@ private:
 
     using JobDataMap = std::map<JobType, JobTypeData>;
 
-    beast::Journal m_journal;
-    mutable std::mutex m_mutex;
-    std::uint64_t m_lastJob{0};
-    std::set<Job> m_jobSet;
+    beast::Journal journal_;
+    mutable std::mutex mutex_;
+    std::uint64_t lastJob_{0};
+    std::set<Job> jobSet_;
     JobCounter jobCounter_;
     std::atomic_bool stopping_{false};
     std::atomic_bool stopped_{false};
-    JobDataMap m_jobData;
-    JobTypeData m_invalidJobData;
+    JobDataMap jobData_;
+    JobTypeData invalidJobData_;
 
     // The number of jobs currently in processTask()
-    int m_processCount{0};
+    int processCount_{0};
 
     // The number of suspended coroutines
     int nSuspend_ = 0;
 
-    Workers m_workers;
+    Workers workers_;
 
     // Statistics tracking
     perf::PerfLog& perfLog_;
-    beast::insight::Collector::ptr m_collector;
-    beast::insight::Gauge job_count;
-    beast::insight::Hook hook;
+    beast::insight::Collector::ptr collector_;
+    beast::insight::Gauge job_count_;
+    beast::insight::Hook hook_;
 
     std::condition_variable cv_;
 
@@ -274,12 +273,12 @@ private:
     //  A Job in the JobSet whose slots count for its type is greater than zero.
     //
     // Pre-conditions:
-    //  mJobSet must not be empty.
-    //  mJobSet holds at least one RunnableJob
+    //  jobSet_ must not be empty.
+    //  jobSet_ holds at least one RunnableJob
     //
     // Post-conditions:
     //  job is a valid Job object.
-    //  job is removed from mJobQueue.
+    //  job is removed from jobQueue_.
     //  Waiting job count of its type is decremented
     //  Running job count of its type is incremented
     //
@@ -291,7 +290,7 @@ private:
     // Indicates that a running Job has completed its task.
     //
     // Pre-conditions:
-    //  Job must not exist in mJobSet.
+    //  Job must not exist in jobSet_.
     //  The JobType must not be invalid.
     //
     // Post-conditions:
@@ -397,7 +396,7 @@ JobQueue::postCoro(JobType t, std::string const& name, F&& f)
         Last param is the function the coroutine runs. Signature of
         void(std::shared_ptr<Coro>).
     */
-    auto coro = std::make_shared<Coro>(Coro_create_t{}, *this, t, name, std::forward<F>(f));
+    auto coro = std::make_shared<Coro>(CoroCreateT{}, *this, t, name, std::forward<F>(f));
     if (!coro->post())
     {
         // The Coro was not successfully posted.  Disable it so it's destructor
diff --git a/include/xrpl/core/JobTypeData.h b/include/xrpl/core/JobTypeData.h
index 20a85e04c1..4e9f95dc04 100644
--- a/include/xrpl/core/JobTypeData.h
+++ b/include/xrpl/core/JobTypeData.h
@@ -11,10 +11,10 @@ namespace xrpl {
 struct JobTypeData
 {
 private:
-    LoadMonitor m_load;
+    LoadMonitor load_;
 
     /* Support for insight */
-    beast::insight::Collector::ptr m_collector;
+    beast::insight::Collector::ptr collector_;
 
 public:
     /* The job category which we represent */
@@ -34,18 +34,18 @@ public:
     beast::insight::Event execute;
 
     JobTypeData(
-        JobTypeInfo const& info_,
+        JobTypeInfo const& info,
         beast::insight::Collector::ptr collector,
         Logs& logs) noexcept
-        : m_load(logs.journal("LoadMonitor")), m_collector(std::move(collector)), info(info_)
+        : load_(logs.journal("LoadMonitor")), collector_(std::move(collector)), info(info)
 
     {
-        m_load.setTargetLatency(info.getAverageLatency(), info.getPeakLatency());
+        load_.setTargetLatency(info.getAverageLatency(), info.getPeakLatency());
 
         if (!info.special())
         {
-            dequeue = m_collector->make_event(info.name() + "_q");
-            execute = m_collector->make_event(info.name());
+            dequeue = collector_->makeEvent(info.name() + "_q");
+            execute = collector_->makeEvent(info.name());
         }
     }
 
@@ -69,13 +69,13 @@ public:
     LoadMonitor&
     load()
     {
-        return m_load;
+        return load_;
     }
 
     LoadMonitor::Stats
     stats()
     {
-        return m_load.getStats();
+        return load_.getStats();
     }
 };
 
diff --git a/include/xrpl/core/JobTypeInfo.h b/include/xrpl/core/JobTypeInfo.h
index 81c4557be2..430e80b388 100644
--- a/include/xrpl/core/JobTypeInfo.h
+++ b/include/xrpl/core/JobTypeInfo.h
@@ -8,19 +8,19 @@ namespace xrpl {
 class JobTypeInfo
 {
 private:
-    JobType const m_type;
-    std::string const m_name;
+    JobType const type_;
+    std::string const name_;
 
     /** The limit on the number of running jobs for this job type.
 
         A limit of 0 marks this as a "special job" which is not
         dispatched via the job queue.
      */
-    int const m_limit;
+    int const limit_;
 
     /** Average and peak latencies for this job type. 0 is none specified */
-    std::chrono::milliseconds const m_avgLatency;
-    std::chrono::milliseconds const m_peakLatency;
+    std::chrono::milliseconds const avgLatency_;
+    std::chrono::milliseconds const peakLatency_;
 
 public:
     // Not default constructible
@@ -32,48 +32,48 @@ public:
         int limit,
         std::chrono::milliseconds avgLatency,
         std::chrono::milliseconds peakLatency)
-        : m_type(type)
-        , m_name(std::move(name))
-        , m_limit(limit)
-        , m_avgLatency(avgLatency)
-        , m_peakLatency(peakLatency)
+        : type_(type)
+        , name_(std::move(name))
+        , limit_(limit)
+        , avgLatency_(avgLatency)
+        , peakLatency_(peakLatency)
     {
     }
 
     [[nodiscard]] JobType
     type() const
     {
-        return m_type;
+        return type_;
     }
 
     [[nodiscard]] std::string const&
     name() const
     {
-        return m_name;
+        return name_;
     }
 
     [[nodiscard]] int
     limit() const
     {
-        return m_limit;
+        return limit_;
     }
 
     [[nodiscard]] bool
     special() const
     {
-        return m_limit == 0;
+        return limit_ == 0;
     }
 
     [[nodiscard]] std::chrono::milliseconds
     getAverageLatency() const
     {
-        return m_avgLatency;
+        return avgLatency_;
     }
 
     [[nodiscard]] std::chrono::milliseconds
     getPeakLatency() const
     {
-        return m_peakLatency;
+        return peakLatency_;
     }
 };
 
diff --git a/include/xrpl/core/JobTypes.h b/include/xrpl/core/JobTypes.h
index cc5b54fea7..32a793c9dc 100644
--- a/include/xrpl/core/JobTypes.h
+++ b/include/xrpl/core/JobTypes.h
@@ -16,8 +16,8 @@ public:
 
 private:
     JobTypes()
-        : m_unknown(
-              jtINVALID,
+        : unknown(
+              JtInvalid,
               "invalid",
               0,
               std::chrono::milliseconds{0},
@@ -32,15 +32,13 @@ private:
                        int limit,
                        std::chrono::milliseconds avgLatency,
                        std::chrono::milliseconds peakLatency) {
-            XRPL_ASSERT(
-                !m_map.contains(jt), "xrpl::JobTypes::JobTypes::add : unique job type input");
+            XRPL_ASSERT(!map.contains(jt), "xrpl::JobTypes::JobTypes::add : unique job type input");
 
             [[maybe_unused]] auto const inserted =
-                m_map
-                    .emplace(
-                        std::piecewise_construct,
-                        std::forward_as_tuple(jt),
-                        std::forward_as_tuple(jt, name, limit, avgLatency, peakLatency))
+                map.emplace(
+                       std::piecewise_construct,
+                       std::forward_as_tuple(jt),
+                       std::forward_as_tuple(jt, name, limit, avgLatency, peakLatency))
                     .second;
 
             XRPL_ASSERT(inserted == true, "xrpl::JobTypes::JobTypes::add : input is inserted");
@@ -49,53 +47,53 @@ private:
         // clang-format off
         //                                                           avg     peak
         //  JobType               name                    limit    latency  latency
-        add(jtPACK,              "makeFetchPack",               1,     0ms,     0ms);
-        add(jtPUBOLDLEDGER,      "publishAcqLedger",            2, 10000ms, 15000ms);
-        add(jtVALIDATION_ut,     "untrustedValidation",  maxLimit,  2000ms,  5000ms);
-        add(jtMANIFEST,          "manifest",             maxLimit,  2000ms,  5000ms);
-        add(jtTRANSACTION_l,     "localTransaction",     maxLimit,   100ms,   500ms);
-        add(jtREPLAY_REQ,        "ledgerReplayRequest",        10,   250ms,  1000ms);
-        add(jtLEDGER_REQ,        "ledgerRequest",               3,     0ms,     0ms);
-        add(jtPROPOSAL_ut,       "untrustedProposal",    maxLimit,   500ms,  1250ms);
-        add(jtREPLAY_TASK,       "ledgerReplayTask",     maxLimit,     0ms,     0ms);
-        add(jtLEDGER_DATA,       "ledgerData",                  3,     0ms,     0ms);
-        add(jtCLIENT,            "clientCommand",        maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_SUBSCRIBE,  "clientSubscribe",      maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_FEE_CHANGE, "clientFeeChange",      maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_CONSENSUS,  "clientConsensus",      maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_ACCT_HIST,  "clientAccountHistory", maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_RPC,        "clientRPC",            maxLimit,  2000ms,  5000ms);
-        add(jtCLIENT_WEBSOCKET,  "clientWebsocket",      maxLimit,  2000ms,  5000ms);
-        add(jtRPC,               "RPC",                  maxLimit,     0ms,     0ms);
-        add(jtUPDATE_PF,         "updatePaths",                 1,     0ms,     0ms);
-        add(jtTRANSACTION,       "transaction",          maxLimit,   250ms,  1000ms);
-        add(jtBATCH,             "batch",                maxLimit,   250ms,  1000ms);
-        add(jtADVANCE,           "advanceLedger",        maxLimit,     0ms,     0ms);
-        add(jtPUBLEDGER,         "publishNewLedger",     maxLimit,  3000ms,  4500ms);
-        add(jtTXN_DATA,          "fetchTxnData",                5,     0ms,     0ms);
-        add(jtWAL,               "writeAhead",           maxLimit,  1000ms,  2500ms);
-        add(jtVALIDATION_t,      "trustedValidation",    maxLimit,   500ms,  1500ms);
-        add(jtWRITE,             "writeObjects",         maxLimit,  1750ms,  2500ms);
-        add(jtACCEPT,            "acceptLedger",         maxLimit,     0ms,     0ms);
-        add(jtPROPOSAL_t,        "trustedProposal",      maxLimit,   100ms,   500ms);
-        add(jtSWEEP,             "sweep",                       1,     0ms,     0ms);
-        add(jtNETOP_CLUSTER,     "clusterReport",               1,  9999ms,  9999ms);
-        add(jtNETOP_TIMER,       "heartbeat",                   1,   999ms,   999ms);
-        add(jtADMIN,             "administration",       maxLimit,     0ms,     0ms);
-        add(jtMISSING_TXN,       "handleHaveTransactions",   1200,     0ms,     0ms);
-        add(jtREQUESTED_TXN,     "doTransactions",           1200,     0ms,     0ms);
+        add(JtPack,              "makeFetchPack",               1,     0ms,     0ms);
+        add(JtPuboldledger,      "publishAcqLedger",            2, 10000ms, 15000ms);
+        add(JtValidationUt,     "untrustedValidation",  maxLimit,  2000ms,  5000ms);
+        add(JtManifest,          "manifest",             maxLimit,  2000ms,  5000ms);
+        add(JtTransactionL,     "localTransaction",     maxLimit,   100ms,   500ms);
+        add(JtReplayReq,        "ledgerReplayRequest",        10,   250ms,  1000ms);
+        add(JtLedgerReq,        "ledgerRequest",               3,     0ms,     0ms);
+        add(JtProposalUt,       "untrustedProposal",    maxLimit,   500ms,  1250ms);
+        add(JtReplayTask,       "ledgerReplayTask",     maxLimit,     0ms,     0ms);
+        add(JtLedgerData,       "ledgerData",                  3,     0ms,     0ms);
+        add(JtClient,            "clientCommand",        maxLimit,  2000ms,  5000ms);
+        add(JtClientSubscribe,  "clientSubscribe",      maxLimit,  2000ms,  5000ms);
+        add(JtClientFeeChange, "clientFeeChange",      maxLimit,  2000ms,  5000ms);
+        add(JtClientConsensus,  "clientConsensus",      maxLimit,  2000ms,  5000ms);
+        add(JtClientAcctHist,  "clientAccountHistory", maxLimit,  2000ms,  5000ms);
+        add(JtClientRpc,        "clientRPC",            maxLimit,  2000ms,  5000ms);
+        add(JtClientWebsocket,  "clientWebsocket",      maxLimit,  2000ms,  5000ms);
+        add(JtRpc,               "RPC",                  maxLimit,     0ms,     0ms);
+        add(JtUpdatePf,         "updatePaths",                 1,     0ms,     0ms);
+        add(JtTransaction,       "transaction",          maxLimit,   250ms,  1000ms);
+        add(JtBatch,             "batch",                maxLimit,   250ms,  1000ms);
+        add(JtAdvance,           "advanceLedger",        maxLimit,     0ms,     0ms);
+        add(JtPubledger,         "publishNewLedger",     maxLimit,  3000ms,  4500ms);
+        add(JtTxnData,          "fetchTxnData",                5,     0ms,     0ms);
+        add(JtWal,               "writeAhead",           maxLimit,  1000ms,  2500ms);
+        add(JtValidationT,      "trustedValidation",    maxLimit,   500ms,  1500ms);
+        add(JtWrite,             "writeObjects",         maxLimit,  1750ms,  2500ms);
+        add(JtAccept,            "acceptLedger",         maxLimit,     0ms,     0ms);
+        add(JtProposalT,        "trustedProposal",      maxLimit,   100ms,   500ms);
+        add(JtSweep,             "sweep",                       1,     0ms,     0ms);
+        add(JtNetopCluster,     "clusterReport",               1,  9999ms,  9999ms);
+        add(JtNetopTimer,       "heartbeat",                   1,   999ms,   999ms);
+        add(JtAdmin,             "administration",       maxLimit,     0ms,     0ms);
+        add(JtMissingTxn,       "handleHaveTransactions",   1200,     0ms,     0ms);
+        add(JtRequestedTxn,     "doTransactions",           1200,     0ms,     0ms);
 
-        add(jtPEER,              "peerCommand",                 0,   200ms,  2500ms);
-        add(jtDISK,              "diskAccess",                  0,   500ms,  1000ms);
-        add(jtTXN_PROC,          "processTransaction",          0,     0ms,     0ms);
-        add(jtOB_SETUP,          "orderBookSetup",              0,     0ms,     0ms);
-        add(jtPATH_FIND,         "pathFind",                    0,     0ms,     0ms);
-        add(jtHO_READ,           "nodeRead",                    0,     0ms,     0ms);
-        add(jtHO_WRITE,          "nodeWrite",                   0,     0ms,     0ms);
-        add(jtGENERIC,           "generic",                     0,     0ms,     0ms);
-        add(jtNS_SYNC_READ,      "SyncReadNode",                0,     0ms,     0ms);
-        add(jtNS_ASYNC_READ,     "AsyncReadNode",               0,     0ms,     0ms);
-        add(jtNS_WRITE,          "WriteNode",                   0,     0ms,     0ms);
+        add(JtPeer,              "peerCommand",                 0,   200ms,  2500ms);
+        add(JtDisk,              "diskAccess",                  0,   500ms,  1000ms);
+        add(JtTxnProc,          "processTransaction",          0,     0ms,     0ms);
+        add(JtObSetup,          "orderBookSetup",              0,     0ms,     0ms);
+        add(JtPathFind,         "pathFind",                    0,     0ms,     0ms);
+        add(JtHoRead,           "nodeRead",                    0,     0ms,     0ms);
+        add(JtHoWrite,          "nodeWrite",                   0,     0ms,     0ms);
+        add(JtGeneric,           "generic",                     0,     0ms,     0ms);
+        add(JtNsSyncRead,      "SyncReadNode",                0,     0ms,     0ms);
+        add(JtNsAsyncRead,     "AsyncReadNode",               0,     0ms,     0ms);
+        add(JtNsWrite,          "WriteNode",                   0,     0ms,     0ms);
         // clang-format on
     }
 
@@ -103,8 +101,8 @@ public:
     static JobTypes const&
     instance()
     {
-        static JobTypes const types;
-        return types;
+        static JobTypes const kTYPES;
+        return kTYPES;
     }
 
     static std::string const&
@@ -116,53 +114,53 @@ public:
     [[nodiscard]] JobTypeInfo const&
     get(JobType jt) const
     {
-        Map::const_iterator const iter(m_map.find(jt));
-        XRPL_ASSERT(iter != m_map.end(), "xrpl::JobTypes::get : valid input");
+        Map::const_iterator const iter(map.find(jt));
+        XRPL_ASSERT(iter != map.end(), "xrpl::JobTypes::get : valid input");
 
-        if (iter != m_map.end())
+        if (iter != map.end())
             return iter->second;
 
-        return m_unknown;
+        return unknown;
     }
 
     [[nodiscard]] JobTypeInfo const&
     getInvalid() const
     {
-        return m_unknown;
+        return unknown;
     }
 
     [[nodiscard]] Map::size_type
     size() const
     {
-        return m_map.size();
+        return map.size();
     }
 
     [[nodiscard]] const_iterator
     begin() const
     {
-        return m_map.cbegin();
+        return map.cbegin();
     }
 
     [[nodiscard]] const_iterator
     cbegin() const
     {
-        return m_map.cbegin();
+        return map.cbegin();
     }
 
     [[nodiscard]] const_iterator
     end() const
     {
-        return m_map.cend();
+        return map.cend();
     }
 
     [[nodiscard]] const_iterator
     cend() const
     {
-        return m_map.cend();
+        return map.cend();
     }
 
-    JobTypeInfo m_unknown;
-    Map m_map;
+    JobTypeInfo unknown;
+    Map map;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/core/LoadMonitor.h b/include/xrpl/core/LoadMonitor.h
index b8777a7056..32a813baa7 100644
--- a/include/xrpl/core/LoadMonitor.h
+++ b/include/xrpl/core/LoadMonitor.h
@@ -54,13 +54,13 @@ private:
 
     std::mutex mutex_;
 
-    std::uint64_t mCounts{0};
-    int mLatencyEvents{0};
-    std::chrono::milliseconds mLatencyMSAvg;
-    std::chrono::milliseconds mLatencyMSPeak;
-    std::chrono::milliseconds mTargetLatencyAvg;
-    std::chrono::milliseconds mTargetLatencyPk;
-    UptimeClock::time_point mLastUpdate;
+    std::uint64_t counts_{0};
+    int latencyEvents_{0};
+    std::chrono::milliseconds latencyMSAvg_;
+    std::chrono::milliseconds latencyMSPeak_;
+    std::chrono::milliseconds targetLatencyAvg_;
+    std::chrono::milliseconds targetLatencyPk_;
+    UptimeClock::time_point lastUpdate_;
     beast::Journal const j_;
 };
 
diff --git a/include/xrpl/core/PeerReservationTable.h b/include/xrpl/core/PeerReservationTable.h
index 80ad7196c3..a9ab894124 100644
--- a/include/xrpl/core/PeerReservationTable.h
+++ b/include/xrpl/core/PeerReservationTable.h
@@ -23,11 +23,13 @@ public:
     std::string description = {};  // NOLINT(readability-redundant-member-init)
 
     [[nodiscard]] auto
-    toJson() const -> Json::Value;
+    toJson() const -> json::Value;
 
     template <typename Hasher>
     friend void
-    hash_append(Hasher& h, PeerReservation const& x) noexcept
+    hash_append(
+        Hasher& h,
+        PeerReservation const& x) noexcept  // NOLINT(readability-identifier-naming)
     {
         using beast::hash_append;
         hash_append(h, x.nodeId);
@@ -81,7 +83,7 @@ public:
      * @throw soci::soci_error
      */
     std::optional<PeerReservation>
-    insert_or_assign(PeerReservation const& reservation);
+    insertOrAssign(PeerReservation const& reservation);
 
     /**
      * @return the erased reservation if it existed
@@ -93,7 +95,7 @@ private:
     beast::Journal mutable journal_;
     std::mutex mutable mutex_;
     DatabaseCon* connection_{};
-    std::unordered_set<PeerReservation, beast::uhash<>, KeyEqual> table_;
+    std::unordered_set<PeerReservation, beast::Uhash<>, KeyEqual> table_;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/core/PerfLog.h b/include/xrpl/core/PerfLog.h
index 7151d09b08..38318c745d 100644
--- a/include/xrpl/core/PerfLog.h
+++ b/include/xrpl/core/PerfLog.h
@@ -121,7 +121,7 @@ public:
      *
      * @return Counters Json object
      */
-    [[nodiscard]] virtual Json::Value
+    [[nodiscard]] virtual json::Value
     countersJson() const = 0;
 
     /**
@@ -129,7 +129,7 @@ public:
      *
      * @return Current executing jobs and RPC calls and durations
      */
-    [[nodiscard]] virtual Json::Value
+    [[nodiscard]] virtual json::Value
     currentJson() const = 0;
 
     /**
@@ -148,10 +148,10 @@ public:
 };
 
 PerfLog::Setup
-setup_PerfLog(Section const& section, boost::filesystem::path const& configDir);
+setupPerfLog(Section const& section, boost::filesystem::path const& configDir);
 
 std::unique_ptr<PerfLog>
-make_PerfLog(
+makePerfLog(
     PerfLog::Setup const& setup,
     Application& app,
     beast::Journal journal,
@@ -165,12 +165,12 @@ measureDurationAndLog(
     std::chrono::duration<Rep, Period> maxDelay,
     beast::Journal const& journal)
 {
-    auto start_time = std::chrono::high_resolution_clock::now();
+    auto startTime = std::chrono::high_resolution_clock::now();
 
     auto result = func();
 
-    auto end_time = std::chrono::high_resolution_clock::now();
-    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
+    auto endTime = std::chrono::high_resolution_clock::now();
+    auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime);
     if (duration > maxDelay)
     {
         JLOG(journal.warn()) << actionDescription << " took " << duration.count() << " ms";
diff --git a/include/xrpl/core/detail/Workers.h b/include/xrpl/core/detail/Workers.h
index fb9004a9b6..d20ebf7a64 100644
--- a/include/xrpl/core/detail/Workers.h
+++ b/include/xrpl/core/detail/Workers.h
@@ -176,7 +176,7 @@ private:
         run();
 
     private:
-        Workers& m_workers;
+        Workers& workers_;
         std::string const threadName_;
         int const instance_;
 
@@ -192,19 +192,19 @@ private:
     deleteWorkers(beast::LockFreeStack<Worker>& stack);
 
 private:
-    Callback& m_callback;
+    Callback& callback_;
     perf::PerfLog* perfLog_;
-    std::string m_threadNames;     // The name to give each thread
-    std::condition_variable m_cv;  // signaled when all threads paused
-    std::mutex m_mut;
-    bool m_allPaused{true};
-    semaphore m_semaphore;                             // each pending task is 1 resource
-    int m_numberOfThreads{0};                          // how many we want active now
-    std::atomic<int> m_activeCount;                    // to know when all are paused
-    std::atomic<int> m_pauseCount;                     // how many threads need to pause now
-    std::atomic<int> m_runningTaskCount;               // how many calls to processTask() active
-    beast::LockFreeStack<Worker> m_everyone;           // holds all created workers
-    beast::LockFreeStack<Worker, PausedTag> m_paused;  // holds just paused workers
+    std::string threadNames_;     // The name to give each thread
+    std::condition_variable cv_;  // signaled when all threads paused
+    std::mutex mut_;
+    bool allPaused_{true};
+    semaphore semaphore_;                             // each pending task is 1 resource
+    int numberOfThreads_{0};                          // how many we want active now
+    std::atomic<int> activeCount_;                    // to know when all are paused
+    std::atomic<int> pauseCount_;                     // how many threads need to pause now
+    std::atomic<int> runningTaskCount_;               // how many calls to processTask() active
+    beast::LockFreeStack<Worker> everyone_;           // holds all created workers
+    beast::LockFreeStack<Worker, PausedTag> paused_;  // holds just paused workers
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/core/detail/semaphore.h b/include/xrpl/core/detail/semaphore.h
index 38b7329ab1..7bc83f86f5 100644
--- a/include/xrpl/core/detail/semaphore.h
+++ b/include/xrpl/core/detail/semaphore.h
@@ -34,12 +34,12 @@
 namespace xrpl {
 
 template <class Mutex, class CondVar>
-class basic_semaphore
+class BasicSemaphore
 {
 private:
-    Mutex m_mutex;
-    CondVar m_cond;
-    std::size_t m_count;
+    Mutex mutex_;
+    CondVar cond_;
+    std::size_t count_;
 
 public:
     using size_type = std::size_t;
@@ -47,7 +47,7 @@ public:
     /** Create the semaphore, with an optional initial count.
         If unspecified, the initial count is zero.
     */
-    explicit basic_semaphore(size_type count = 0) : m_count(count)
+    explicit BasicSemaphore(size_type count = 0) : count_(count)
     {
     }
 
@@ -55,35 +55,35 @@ public:
     void
     notify()
     {
-        std::scoped_lock const lock{m_mutex};
-        ++m_count;
-        m_cond.notify_one();
+        std::scoped_lock const lock{mutex_};
+        ++count_;
+        cond_.notify_one();
     }
 
     /** Block until notify is called. */
     void
     wait()
     {
-        std::unique_lock lock{m_mutex};
-        while (m_count == 0)
-            m_cond.wait(lock);
-        --m_count;
+        std::unique_lock lock{mutex_};
+        while (count_ == 0)
+            cond_.wait(lock);
+        --count_;
     }
 
     /** Perform a non-blocking wait.
         @return `true` If the wait would be satisfied.
     */
     bool
-    try_wait()
+    tryWait()
     {
-        std::scoped_lock lock{m_mutex};
-        if (m_count == 0)
+        std::scoped_lock lock{mutex_};
+        if (count_ == 0)
             return false;
-        --m_count;
+        --count_;
         return true;
     }
 };
 
-using semaphore = basic_semaphore<std::mutex, std::condition_variable>;
+using semaphore = BasicSemaphore<std::mutex, std::condition_variable>;
 
 }  // namespace xrpl
diff --git a/include/xrpl/crypto/RFC1751.h b/include/xrpl/crypto/RFC1751.h
index 64b3e08813..c99c691ba0 100644
--- a/include/xrpl/crypto/RFC1751.h
+++ b/include/xrpl/crypto/RFC1751.h
@@ -38,7 +38,7 @@ private:
     static int
     etob(std::string& strData, std::vector<std::string> vsHuman);
 
-    static char const* s_dictionary[];
+    static char const* dictionary[];
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/crypto/csprng.h b/include/xrpl/crypto/csprng.h
index e5135c96d7..e386d9d11e 100644
--- a/include/xrpl/crypto/csprng.h
+++ b/include/xrpl/crypto/csprng.h
@@ -12,7 +12,7 @@ namespace xrpl {
 
     Meets the requirements of UniformRandomNumberEngine
 */
-class csprng_engine
+class CsprngEngine
 {
 private:
     std::mutex mutex_;
@@ -20,20 +20,20 @@ private:
 public:
     using result_type = std::uint64_t;
 
-    csprng_engine(csprng_engine const&) = delete;
-    csprng_engine&
-    operator=(csprng_engine const&) = delete;
+    CsprngEngine(CsprngEngine const&) = delete;
+    CsprngEngine&
+    operator=(CsprngEngine const&) = delete;
 
-    csprng_engine(csprng_engine&&) = delete;
-    csprng_engine&
-    operator=(csprng_engine&&) = delete;
+    CsprngEngine(CsprngEngine&&) = delete;
+    CsprngEngine&
+    operator=(CsprngEngine&&) = delete;
 
-    csprng_engine();
-    ~csprng_engine();
+    CsprngEngine();
+    ~CsprngEngine();
 
     /** Mix entropy into the pool */
     void
-    mix_entropy(void* buffer = nullptr, std::size_t count = 0);
+    mixEntropy(void* buffer = nullptr, std::size_t count = 0);
 
     /** Generate a random integer */
     result_type
@@ -66,7 +66,7 @@ public:
 
     This meets the requirements of UniformRandomNumberEngine
 */
-csprng_engine&
-crypto_prng();
+CsprngEngine&
+cryptoPrng();
 
 }  // namespace xrpl
diff --git a/include/xrpl/crypto/secure_erase.h b/include/xrpl/crypto/secure_erase.h
index 2815a8531a..74284b03f7 100644
--- a/include/xrpl/crypto/secure_erase.h
+++ b/include/xrpl/crypto/secure_erase.h
@@ -19,6 +19,6 @@ namespace xrpl {
     http://www.daemonology.net/blog/2014-09-06-zeroing-buffers-is-insufficient.html
 */
 void
-secure_erase(void* dest, std::size_t bytes);
+secureErase(void* dest, std::size_t bytes);
 
 }  // namespace xrpl
diff --git a/include/xrpl/json/JsonPropertyStream.h b/include/xrpl/json/JsonPropertyStream.h
index e0a13c4001..47d3c9fdfa 100644
--- a/include/xrpl/json/JsonPropertyStream.h
+++ b/include/xrpl/json/JsonPropertyStream.h
@@ -5,25 +5,25 @@
 
 namespace xrpl {
 
-/** A PropertyStream::Sink which produces a Json::Value of type objectValue. */
+/** A PropertyStream::Sink which produces a json::Value of type objectValue. */
 class JsonPropertyStream : public beast::PropertyStream
 {
 public:
-    Json::Value m_top;
-    std::vector<Json::Value*> m_stack;
+    json::Value topValue;  // TODO: rename: clashes with top() method
+    std::vector<json::Value*> stack;
 
 public:
     JsonPropertyStream();
-    [[nodiscard]] Json::Value const&
+    [[nodiscard]] json::Value const&
     top() const;
 
 protected:
     void
-    map_begin() override;
+    mapBegin() override;
     void
-    map_begin(std::string const& key) override;
+    mapBegin(std::string const& key) override;
     void
-    map_end() override;
+    mapEnd() override;
     void
     add(std::string const& key, short value) override;
     void
@@ -41,11 +41,11 @@ protected:
     void
     add(std::string const& key, std::string const& v) override;
     void
-    array_begin() override;
+    arrayBegin() override;
     void
-    array_begin(std::string const& key) override;
+    arrayBegin(std::string const& key) override;
     void
-    array_end() override;
+    arrayEnd() override;
 
     void
     add(short value) override;
diff --git a/include/xrpl/json/Output.h b/include/xrpl/json/Output.h
index b0ba3fa6d4..c01253f713 100644
--- a/include/xrpl/json/Output.h
+++ b/include/xrpl/json/Output.h
@@ -5,7 +5,7 @@
 #include <functional>
 #include <string>
 
-namespace Json {
+namespace json {
 
 class Value;
 
@@ -20,17 +20,17 @@ stringOutput(std::string& s)
 /** Writes a minimal representation of a Json value to an Output in O(n) time.
 
     Data is streamed right to the output, so only a marginal amount of memory is
-    used.  This can be very important for a very large Json::Value.
+    used.  This can be very important for a very large json::Value.
  */
 void
-outputJson(Json::Value const&, Output const&);
+outputJson(json::Value const&, Output const&);
 
-/** Return the minimal string representation of a Json::Value in O(n) time.
+/** Return the minimal string representation of a json::Value in O(n) time.
 
     This requires a memory allocation for the full size of the output.
     If possible, use outputJson().
  */
 std::string
-jsonAsString(Json::Value const&);
+jsonAsString(json::Value const&);
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/Writer.h b/include/xrpl/json/Writer.h
index 34c4e8458a..664a2a75c1 100644
--- a/include/xrpl/json/Writer.h
+++ b/include/xrpl/json/Writer.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace Json {
+namespace json {
 
 /**
  *  Writer implements an O(1)-space, O(1)-granular output JSON writer.
@@ -107,7 +107,7 @@ namespace Json {
 class Writer
 {
 public:
-    enum class CollectionType { array, object };
+    enum class CollectionType { Array, Object };
 
     explicit Writer(Output const& output);
     Writer(Writer&&) noexcept;
@@ -138,7 +138,7 @@ public:
     /** Append a value to an array.
      *
      *  Scalar must be a scalar - that is, a number, boolean, string, string
-     *  literal, nullptr or Json::Value
+     *  literal, nullptr or json::Value
      */
     template <typename Scalar>
     void
@@ -188,9 +188,9 @@ public:
     void
     output(char const*);
 
-    /*** Output a Json::Value. */
+    /*** Output a json::Value. */
     void
-    output(Json::Value const&);
+    output(json::Value const&);
 
     /** Output a null. */
     void output(std::nullptr_t);
@@ -216,9 +216,9 @@ public:
     }
 
     void
-    output(Json::StaticString const& t)
+    output(json::StaticString const& t)
     {
-        output(t.c_str());
+        output(t.cStr());
     }
 
 private:
@@ -236,4 +236,4 @@ check(bool condition, std::string const& message)
         xrpl::Throw<std::logic_error>(message);
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/detail/json_assert.h b/include/xrpl/json/detail/json_assert.h
index e9a66ccef1..8e33f45b65 100644
--- a/include/xrpl/json/detail/json_assert.h
+++ b/include/xrpl/json/detail/json_assert.h
@@ -5,4 +5,4 @@
 
 #define JSON_ASSERT_MESSAGE(condition, message) \
     if (!(condition))                           \
-        xrpl::Throw<Json::error>(message);
+        xrpl::Throw<json::Error>(message);
diff --git a/include/xrpl/json/json_errors.h b/include/xrpl/json/json_errors.h
index 5cbf3bd2a5..9cf94e76c1 100644
--- a/include/xrpl/json/json_errors.h
+++ b/include/xrpl/json/json_errors.h
@@ -2,11 +2,11 @@
 
 #include <stdexcept>
 
-namespace Json {
+namespace json {
 
-struct error : std::runtime_error
+struct Error : std::runtime_error
 {
     using std::runtime_error::runtime_error;
 };
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/json_forwards.h b/include/xrpl/json/json_forwards.h
index 612648a5f4..7da8dba418 100644
--- a/include/xrpl/json/json_forwards.h
+++ b/include/xrpl/json/json_forwards.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Json {
+namespace json {
 
 // value.h
 using Int = int;
@@ -11,4 +11,4 @@ class ValueIteratorBase;
 class ValueIterator;
 class ValueConstIterator;
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/json_reader.h b/include/xrpl/json/json_reader.h
index 543f0cfb9c..8ce565dbbc 100644
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -7,7 +7,7 @@
 
 #include <stack>
 
-namespace Json {
+namespace json {
 
 /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
  * Value.
@@ -45,7 +45,7 @@ public:
     parse(char const* beginDoc, char const* endDoc, Value& root);
 
     /// \brief Parse from input stream.
-    /// \see Json::operator>>(std::istream&, Json::Value&).
+    /// \see json::operator>>(std::istream&, json::Value&).
     bool
     parse(std::istream& is, Value& root);
 
@@ -67,27 +67,27 @@ public:
     [[nodiscard]] std::string
     getFormattedErrorMessages() const;
 
-    static constexpr unsigned nest_limit{25};
+    static constexpr unsigned kNEST_LIMIT{25};
 
 private:
     // 53 files, protocol-wide
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum TokenType {
-        tokenEndOfStream = 0,
-        tokenObjectBegin,
-        tokenObjectEnd,
-        tokenArrayBegin,
-        tokenArrayEnd,
-        tokenString,
-        tokenInteger,
-        tokenDouble,
-        tokenTrue,
-        tokenFalse,
-        tokenNull,
-        tokenArraySeparator,
-        tokenMemberSeparator,
-        tokenComment,
-        tokenError
+        TokenEndOfStream = 0,
+        TokenObjectBegin,
+        TokenObjectEnd,
+        TokenArrayBegin,
+        TokenArrayEnd,
+        TokenString,
+        TokenInteger,
+        TokenDouble,
+        TokenTrue,
+        TokenFalse,
+        TokenNull,
+        TokenArraySeparator,
+        TokenMemberSeparator,
+        TokenComment,
+        TokenError
     };
 
     class Token
@@ -95,9 +95,9 @@ private:
     public:
         explicit Token() = default;
 
-        TokenType type_;
-        Location start_;
-        Location end_;
+        TokenType type;
+        Location start;
+        Location end;
     };
 
     class ErrorInfo
@@ -105,9 +105,9 @@ private:
     public:
         explicit ErrorInfo() = default;
 
-        Token token_{};
-        std::string message_;
-        Location extra_{};
+        Token token{};
+        std::string message;
+        Location extra{};
     };
 
     using Errors = std::deque<ErrorInfo>;
@@ -201,7 +201,7 @@ Reader::parse(Value& root, BufferSequence const& bs)
  This can be used to read a file into a particular sub-object.
  For example:
  \code
- Json::Value root;
+ json::Value root;
  cin >> root["dir"]["file"];
  cout << root;
  \endcode
@@ -216,9 +216,9 @@ Reader::parse(Value& root, BufferSequence const& bs)
  }
  \endverbatim
  \throw std::exception on parse error.
- \see Json::operator<<()
+ \see json::operator<<()
 */
 std::istream&
 operator>>(std::istream&, Value&);
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/json_value.h b/include/xrpl/json/json_value.h
index def2696c5c..2344da3788 100644
--- a/include/xrpl/json/json_value.h
+++ b/include/xrpl/json/json_value.h
@@ -11,21 +11,21 @@
 
 /** \brief JSON (JavaScript Object Notation).
  */
-namespace Json {
+namespace json {
 
 /** \brief Type of the value held by a Value object.
  */
 // Used throughout JSON layer
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum ValueType {
-    nullValue = 0,  ///< 'null' value
-    intValue,       ///< signed integer value
-    uintValue,      ///< unsigned integer value
-    realValue,      ///< double value
-    stringValue,    ///< UTF-8 string value
-    booleanValue,   ///< bool value
-    arrayValue,     ///< array value (ordered list)
-    objectValue     ///< object value (collection of name/value pairs).
+    NullValue = 0,  ///< 'null' value
+    IntValue,       ///< signed integer value
+    UintValue,      ///< unsigned integer value
+    RealValue,      ///< double value
+    StringValue,    ///< UTF-8 string value
+    BooleanValue,   ///< bool value
+    ArrayValue,     ///< array value (ordered list)
+    ObjectValue     ///< object value (collection of name/value pairs).
 };
 
 /** \brief Lightweight wrapper to tag static string.
@@ -36,8 +36,8 @@ enum ValueType {
  *
  * Example of usage:
  * \code
- * Json::Value aValue( StaticString("some text") );
- * Json::Value object;
+ * json::Value aValue( StaticString("some text") );
+ * json::Value object;
  * static const StaticString code("code");
  * object[code] = 1234;
  * \endcode
@@ -56,7 +56,7 @@ public:
     }
 
     [[nodiscard]] constexpr char const*
-    c_str() const
+    cStr() const
     {
         return str_;
     }
@@ -68,7 +68,7 @@ private:
 inline bool
 operator==(StaticString x, StaticString y)
 {
-    return strcmp(x.c_str(), y.c_str()) == 0;
+    return strcmp(x.cStr(), y.cStr()) == 0;
 }
 
 inline bool
@@ -80,7 +80,7 @@ operator!=(StaticString x, StaticString y)
 inline bool
 operator==(std::string const& x, StaticString y)
 {
-    return strcmp(x.c_str(), y.c_str()) == 0;
+    return strcmp(x.c_str(), y.cStr()) == 0;
 }
 
 inline bool
@@ -136,14 +136,14 @@ public:
     using Members = std::vector<std::string>;
     using iterator = ValueIterator;
     using const_iterator = ValueConstIterator;
-    using UInt = Json::UInt;
-    using Int = Json::Int;
+    using UInt = json::UInt;
+    using Int = json::Int;
     using ArrayIndex = UInt;
 
-    static Value const null;
-    static constexpr Int minInt = std::numeric_limits<Int>::min();
-    static constexpr Int maxInt = std::numeric_limits<Int>::max();
-    static constexpr UInt maxUInt = std::numeric_limits<UInt>::max();
+    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_U_INT = std::numeric_limits<UInt>::max();
 
 private:
     class CZString
@@ -151,7 +151,8 @@ private:
     public:
         // Stored as int field, implicit conversion
         // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-        enum DuplicationPolicy { noDuplication = 0, duplicate, duplicateOnCopy };
+        enum DuplicationPolicy { NoDuplication = 0, Duplicate, DuplicateOnCopy };
+
         CZString(int index);
         CZString(char const* cstr, DuplicationPolicy allocate);
         CZString(CZString const& other);
@@ -165,7 +166,7 @@ private:
         [[nodiscard]] int
         index() const;
         [[nodiscard]] char const*
-        c_str() const;
+        cStr() const;
         [[nodiscard]] bool
         isStaticString() const;
 
@@ -188,12 +189,12 @@ public:
 
            Examples:
     \code
-    Json::Value null_value; // null
-    Json::Value arr_value(Json::arrayValue); // []
-    Json::Value obj_value(Json::objectValue); // {}
+    json::Value null_value; // null
+    json::Value arr_value(json::arrayValue); // []
+    json::Value obj_value(json::objectValue); // {}
     \endcode
          */
-    Value(ValueType type = nullValue);
+    Value(ValueType type = NullValue);
     Value(Int value);
     Value(UInt value);
     Value(double value);
@@ -207,7 +208,7 @@ public:
      * constructor.
      * Example of usage:
      * \code
-     * Json::Value aValue( StaticString("some text") );
+     * json::Value aValue( StaticString("some text") );
      * \endcode
      */
     Value(StaticString const& value);
@@ -345,7 +346,7 @@ public:
      * the new entry is not duplicated.
      * Example of use:
      * \code
-     * Json::Value object;
+     * json::Value object;
      * static const StaticString code("code");
      * object[code] = 1234;
      * \endcode
@@ -417,19 +418,19 @@ private:
 private:
     union ValueHolder
     {
-        Int int_;
-        UInt uint_;
-        double real_;
-        bool bool_;
-        char* string_;
-        ObjectValues* map_{nullptr};
+        Int intVal;
+        UInt uintVal;
+        double realVal;
+        bool boolVal;
+        char* stringVal;
+        ObjectValues* mapVal{nullptr};
     } value_;
     ValueType type_ : 8;
     int allocated_ : 1 {};  // Notes: if declared as bool, bitfield is useless.
 };
 
 inline Value
-to_json(xrpl::Number const& number)
+toJson(xrpl::Number const& number)
 {
     return to_string(number);
 }
@@ -468,16 +469,16 @@ operator>=(Value const& x, Value const& y)
  * string value memory management done by Value.
  *
  * - makeMemberName() and releaseMemberName() are called to respectively
- * duplicate and free an Json::objectValue member name.
+ * duplicate and free an json::objectValue member name.
  * - duplicateStringValue() and releaseStringValue() are called similarly to
- *   duplicate and free a Json::stringValue value.
+ *   duplicate and free a json::stringValue value.
  */
 class ValueAllocator
 {
 public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { unknown = (unsigned)-1 };
+    enum { Unknown = (unsigned)-1 };
 
     virtual ~ValueAllocator() = default;
 
@@ -486,7 +487,7 @@ public:
     virtual void
     releaseMemberName(char* memberName) = 0;
     virtual char*
-    duplicateStringValue(char const* value, unsigned int length = unknown) = 0;
+    duplicateStringValue(char const* value, unsigned int length = Unknown) = 0;
     virtual void
     releaseStringValue(char* value) = 0;
 };
@@ -681,4 +682,4 @@ public:
     }
 };
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/json_writer.h b/include/xrpl/json/json_writer.h
index 45961fe030..8e5e819b10 100644
--- a/include/xrpl/json/json_writer.h
+++ b/include/xrpl/json/json_writer.h
@@ -6,7 +6,7 @@
 #include <ostream>
 #include <vector>
 
-namespace Json {
+namespace json {
 
 class Value;
 
@@ -182,7 +182,7 @@ std::string
 valueToQuotedString(char const* value);
 
 /// \brief Output using the StyledStreamWriter.
-/// \see Json::operator>>()
+/// \see json::operator>>()
 std::ostream&
 operator<<(std::ostream&, Value const& root);
 
@@ -193,55 +193,55 @@ namespace detail {
 
 template <class Write>
 void
-write_string(Write const& write, std::string const& s)
+writeString(Write const& write, std::string const& s)
 {
     write(s.data(), s.size());
 }
 
 template <class Write>
 void
-write_value(Write const& write, Value const& value)
+writeValue(Write const& write, Value const& value)
 {
     switch (value.type())
     {
-        case nullValue:
+        case NullValue:
             write("null", 4);
             break;
 
-        case intValue:
-            write_string(write, valueToString(value.asInt()));
+        case IntValue:
+            writeString(write, valueToString(value.asInt()));
             break;
 
-        case uintValue:
-            write_string(write, valueToString(value.asUInt()));
+        case UintValue:
+            writeString(write, valueToString(value.asUInt()));
             break;
 
-        case realValue:
-            write_string(write, valueToString(value.asDouble()));
+        case RealValue:
+            writeString(write, valueToString(value.asDouble()));
             break;
 
-        case stringValue:
-            write_string(write, valueToQuotedString(value.asCString()));
+        case StringValue:
+            writeString(write, valueToQuotedString(value.asCString()));
             break;
 
-        case booleanValue:
-            write_string(write, valueToString(value.asBool()));
+        case BooleanValue:
+            writeString(write, valueToString(value.asBool()));
             break;
 
-        case arrayValue: {
+        case ArrayValue: {
             write("[", 1);
             int const size = value.size();
             for (int index = 0; index < size; ++index)
             {
                 if (index > 0)
                     write(",", 1);
-                write_value(write, value[index]);
+                writeValue(write, value[index]);
             }
             write("]", 1);
             break;
         }
 
-        case objectValue: {
+        case ObjectValue: {
             Value::Members const members = value.getMemberNames();
             write("{", 1);
             for (auto it = members.begin(); it != members.end(); ++it)
@@ -250,9 +250,9 @@ write_value(Write const& write, Value const& value)
                 if (it != members.begin())
                     write(",", 1);
 
-                write_string(write, valueToQuotedString(name.c_str()));
+                writeString(write, valueToQuotedString(name.c_str()));
                 write(":", 1);
-                write_value(write, value[name]);
+                writeValue(write, value[name]);
             }
             write("}", 1);
             break;
@@ -264,15 +264,15 @@ write_value(Write const& write, Value const& value)
 
 /** Stream compact JSON to the specified function.
 
-    @param jv The Json::Value to write
+    @param jv The json::Value to write
     @param write Invocable with signature void(void const*, std::size_t) that
                  is called when output should be written to the stream.
 */
 template <class Write>
 void
-stream(Json::Value const& jv, Write const& write)
+stream(json::Value const& jv, Write const& write)
 {
-    detail::write_value(write, jv);
+    detail::writeValue(write, jv);
     write("\n", 1);
 }
 
@@ -280,37 +280,37 @@ stream(Json::Value const& jv, Write const& write)
 
     Use
 
-        Json::Value jv;
-        out << Json::Compact{jv}
+        json::Value jv;
+        out << json::Compact{jv}
 
     to write a single-line, compact version of `jv` to the stream, rather
     than the styled format that comes from undecorated streaming.
 */
 class Compact
 {
-    Json::Value jv_;
+    json::Value jv_;
 
 public:
-    /** Wrap a Json::Value for compact streaming
+    /** Wrap a json::Value for compact streaming
 
-        @param jv The Json::Value to stream
+        @param jv The json::Value to stream
 
         @note For now, we do not support wrapping lvalues to avoid
               potentially costly copies. If we find a need, we can consider
               adding support for compact lvalue streaming in the future.
     */
-    Compact(Json::Value&& jv) : jv_{std::move(jv)}
+    Compact(json::Value&& jv) : jv_{std::move(jv)}
     {
     }
 
     friend std::ostream&
     operator<<(std::ostream& o, Compact const& cJv)
     {
-        detail::write_value(
+        detail::writeValue(
             [&o](void const* data, std::size_t n) { o.write(static_cast<char const*>(data), n); },
             cJv.jv_);
         return o;
     }
 };
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/json/to_string.h b/include/xrpl/json/to_string.h
index c9820e2e55..1d7b4c785a 100644
--- a/include/xrpl/json/to_string.h
+++ b/include/xrpl/json/to_string.h
@@ -4,14 +4,14 @@
 
 #include <string>
 
-namespace Json {
+namespace json {
 
-/** Writes a Json::Value to an std::string. */
+/** Writes a json::Value to an std::string. */
 std::string
 to_string(Value const&);
 
-/** Writes a Json::Value to an std::string. */
+/** Writes a json::Value to an std::string. */
 std::string
 pretty(Value const&);
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/ledger/AcceptedLedgerTx.h b/include/xrpl/ledger/AcceptedLedgerTx.h
index 5d6d471ba0..0a1592f6e1 100644
--- a/include/xrpl/ledger/AcceptedLedgerTx.h
+++ b/include/xrpl/ledger/AcceptedLedgerTx.h
@@ -33,55 +33,55 @@ public:
     [[nodiscard]] std::shared_ptr<STTx const> const&
     getTxn() const
     {
-        return mTxn;
+        return txn_;
     }
     [[nodiscard]] TxMeta const&
     getMeta() const
     {
-        return mMeta;
+        return meta_;
     }
 
     [[nodiscard]] boost::container::flat_set<AccountID> const&
     getAffected() const
     {
-        return mAffected;
+        return affected_;
     }
 
     [[nodiscard]] TxID
     getTransactionID() const
     {
-        return mTxn->getTransactionID();
+        return txn_->getTransactionID();
     }
     [[nodiscard]] TxType
     getTxnType() const
     {
-        return mTxn->getTxnType();
+        return txn_->getTxnType();
     }
     [[nodiscard]] TER
     getResult() const
     {
-        return mMeta.getResultTER();
+        return meta_.getResultTER();
     }
     [[nodiscard]] std::uint32_t
     getTxnSeq() const
     {
-        return mMeta.getIndex();
+        return meta_.getIndex();
     }
     [[nodiscard]] std::string
     getEscMeta() const;
 
-    [[nodiscard]] Json::Value const&
+    [[nodiscard]] json::Value const&
     getJson() const
     {
-        return mJson;
+        return json_;
     }
 
 private:
-    std::shared_ptr<STTx const> mTxn;
-    TxMeta mMeta;
-    boost::container::flat_set<AccountID> mAffected;
-    Blob mRawMeta;
-    Json::Value mJson;
+    std::shared_ptr<STTx const> txn_;
+    TxMeta meta_;
+    boost::container::flat_set<AccountID> affected_;
+    Blob rawMeta_;
+    json::Value json_;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/ledger/AmendmentTable.h b/include/xrpl/ledger/AmendmentTable.h
index 8f40ccb413..a15433813d 100644
--- a/include/xrpl/ledger/AmendmentTable.h
+++ b/include/xrpl/ledger/AmendmentTable.h
@@ -64,11 +64,11 @@ public:
     [[nodiscard]] virtual std::optional<NetClock::time_point>
     firstUnsupportedExpected() const = 0;
 
-    [[nodiscard]] virtual Json::Value
+    [[nodiscard]] virtual json::Value
     getJson(bool isAdmin) const = 0;
 
-    /** Returns a Json::objectValue. */
-    [[nodiscard]] virtual Json::Value
+    /** Returns a json::objectValue. */
+    [[nodiscard]] virtual json::Value
     getJson(uint256 const& amendment, bool isAdmin) const = 0;
 
     /** Called when a new fully-validated ledger is accepted. */
@@ -163,14 +163,14 @@ public:
                             << amendTx;
 
             initialPosition->addGiveItem(
-                SHAMapNodeType::tnTRANSACTION_NM,
-                make_shamapitem(amendTx.getTransactionID(), s.slice()));
+                SHAMapNodeType::TnTransactionNm,
+                makeShamapitem(amendTx.getTransactionID(), s.slice()));
         }
     }
 };
 
 std::unique_ptr<AmendmentTable>
-make_AmendmentTable(
+makeAmendmentTable(
     ServiceRegistry& registry,
     std::chrono::seconds majorityTime,
     std::vector<AmendmentTable::FeatureInfo> const& supported,
diff --git a/include/xrpl/ledger/ApplyView.h b/include/xrpl/ledger/ApplyView.h
index 0aea9813b9..f825311e1d 100644
--- a/include/xrpl/ledger/ApplyView.h
+++ b/include/xrpl/ledger/ApplyView.h
@@ -10,56 +10,56 @@ namespace xrpl {
 // Bitwise flag enum with existing operator overloads
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum ApplyFlags : std::uint32_t {
-    tapNONE = 0x00,
+    TapNone = 0x00,
 
     // This is a local transaction with the
     // fail_hard flag set.
-    tapFAIL_HARD = 0x10,
+    TapFailHard = 0x10,
 
     // This is not the transaction's last pass
     // Transaction can be retried, soft failures allowed
-    tapRETRY = 0x20,
+    TapRetry = 0x20,
 
     // Transaction came from a privileged source
-    tapUNLIMITED = 0x400,
+    TapUnlimited = 0x400,
 
     // Transaction is executing as part of a batch
-    tapBATCH = 0x800,
+    TapBatch = 0x800,
 
     // Transaction shouldn't be applied
     // Signatures shouldn't be checked
-    tapDRY_RUN = 0x1000
+    TapDryRun = 0x1000
 };
 
 constexpr ApplyFlags
 operator|(ApplyFlags const& lhs, ApplyFlags const& rhs)
 {
-    return safe_cast<ApplyFlags>(
-        safe_cast<std::underlying_type_t<ApplyFlags>>(lhs) |
-        safe_cast<std::underlying_type_t<ApplyFlags>>(rhs));
+    return safeCast<ApplyFlags>(
+        safeCast<std::underlying_type_t<ApplyFlags>>(lhs) |
+        safeCast<std::underlying_type_t<ApplyFlags>>(rhs));
 }
 
-static_assert((tapFAIL_HARD | tapRETRY) == safe_cast<ApplyFlags>(0x30u), "ApplyFlags operator |");
-static_assert((tapRETRY | tapFAIL_HARD) == safe_cast<ApplyFlags>(0x30u), "ApplyFlags operator |");
+static_assert((TapFailHard | TapRetry) == safeCast<ApplyFlags>(0x30u), "ApplyFlags operator |");
+static_assert((TapRetry | TapFailHard) == safeCast<ApplyFlags>(0x30u), "ApplyFlags operator |");
 
 constexpr ApplyFlags
 operator&(ApplyFlags const& lhs, ApplyFlags const& rhs)
 {
-    return safe_cast<ApplyFlags>(
-        safe_cast<std::underlying_type_t<ApplyFlags>>(lhs) &
-        safe_cast<std::underlying_type_t<ApplyFlags>>(rhs));
+    return safeCast<ApplyFlags>(
+        safeCast<std::underlying_type_t<ApplyFlags>>(lhs) &
+        safeCast<std::underlying_type_t<ApplyFlags>>(rhs));
 }
 
-static_assert((tapFAIL_HARD & tapRETRY) == tapNONE, "ApplyFlags operator &");
-static_assert((tapRETRY & tapFAIL_HARD) == tapNONE, "ApplyFlags operator &");
+static_assert((TapFailHard & TapRetry) == TapNone, "ApplyFlags operator &");
+static_assert((TapRetry & TapFailHard) == TapNone, "ApplyFlags operator &");
 
 constexpr ApplyFlags
 operator~(ApplyFlags const& flags)
 {
-    return safe_cast<ApplyFlags>(~safe_cast<std::underlying_type_t<ApplyFlags>>(flags));
+    return safeCast<ApplyFlags>(~safeCast<std::underlying_type_t<ApplyFlags>>(flags));
 }
 
-static_assert(~tapRETRY == safe_cast<ApplyFlags>(0xFFFFFFDFu), "ApplyFlags operator ~");
+static_assert(~TapRetry == safeCast<ApplyFlags>(0xFFFFFFDFu), "ApplyFlags operator ~");
 
 inline ApplyFlags
 operator|=(ApplyFlags& lhs, ApplyFlags const& rhs)
diff --git a/include/xrpl/ledger/BookDirs.h b/include/xrpl/ledger/BookDirs.h
index 4cbbbd78ce..afde6ee7b3 100644
--- a/include/xrpl/ledger/BookDirs.h
+++ b/include/xrpl/ledger/BookDirs.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ReadView.h>
 
 namespace xrpl {
@@ -17,7 +16,7 @@ private:
     uint256 index_;
 
 public:
-    class const_iterator;
+    class const_iterator;  // NOLINT(readability-identifier-naming)
     using value_type = std::shared_ptr<SLE const>;
 
     BookDirs(ReadView const&, Book const&);
@@ -29,7 +28,7 @@ public:
     end() const;
 };
 
-class BookDirs::const_iterator
+class BookDirs::const_iterator  // NOLINT(readability-identifier-naming)
 {
 public:
     using value_type = BookDirs::value_type;
@@ -67,8 +66,8 @@ public:
 private:
     friend class BookDirs;
 
-    const_iterator(ReadView const& view, uint256 const& root, uint256 const& dir_key)
-        : view_(&view), root_(root), key_(dir_key), cur_key_(dir_key)
+    const_iterator(ReadView const& view, uint256 const& root, uint256 const& dirKey)
+        : view_(&view), root_(root), key_(dirKey), cur_key_(dirKey)
     {
     }
 
@@ -81,8 +80,6 @@ private:
     unsigned int entry_ = 0;
     uint256 index_;
     std::optional<value_type> mutable cache_;
-
-    static beast::Journal j_;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/ledger/BookListeners.h b/include/xrpl/ledger/BookListeners.h
index c77271b20e..3b96aca680 100644
--- a/include/xrpl/ledger/BookListeners.h
+++ b/include/xrpl/ledger/BookListeners.h
@@ -41,9 +41,9 @@ public:
     publish(MultiApiJson const& jvObj, hash_set<std::uint64_t>& havePublished);
 
 private:
-    std::recursive_mutex mLock;
+    std::recursive_mutex lock_;
 
-    hash_map<std::uint64_t, InfoSub::wptr> mListeners;
+    hash_map<std::uint64_t, InfoSub::wptr> listeners_;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/ledger/CachedView.h b/include/xrpl/ledger/CachedView.h
index 5dad2598f4..34a75e4c07 100644
--- a/include/xrpl/ledger/CachedView.h
+++ b/include/xrpl/ledger/CachedView.h
@@ -17,7 +17,7 @@ private:
     DigestAwareReadView const& base_;
     CachedSLEs& cache_;
     std::mutex mutable mutex_;
-    std::unordered_map<key_type, uint256, hardened_hash<>> mutable map_;
+    std::unordered_map<key_type, uint256, HardenedHash<>> mutable map_;
 
 public:
     CachedViewImpl() = delete;
@@ -69,31 +69,31 @@ public:
         return base_.succ(key, last);
     }
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesBegin() const override
     {
         return base_.slesBegin();
     }
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesEnd() const override
     {
         return base_.slesEnd();
     }
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesUpperBound(uint256 const& key) const override
     {
         return base_.slesUpperBound(key);
     }
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsBegin() const override
     {
         return base_.txsBegin();
     }
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsEnd() const override
     {
         return base_.txsEnd();
diff --git a/include/xrpl/ledger/Dir.h b/include/xrpl/ledger/Dir.h
index 940107bf93..cfbef357b1 100644
--- a/include/xrpl/ledger/Dir.h
+++ b/include/xrpl/ledger/Dir.h
@@ -26,19 +26,19 @@ private:
     STVector256 const* indexes_ = nullptr;
 
 public:
-    class const_iterator;
+    class ConstIterator;
     using value_type = std::shared_ptr<SLE const>;
 
     Dir(ReadView const&, Keylet const&);
 
-    [[nodiscard]] const_iterator
+    [[nodiscard]] ConstIterator
     begin() const;
 
-    [[nodiscard]] const_iterator
+    [[nodiscard]] ConstIterator
     end() const;
 };
 
-class Dir::const_iterator
+class Dir::ConstIterator
 {
 public:
     using value_type = Dir::value_type;
@@ -48,10 +48,10 @@ public:
     using iterator_category = std::forward_iterator_tag;
 
     bool
-    operator==(const_iterator const& other) const;
+    operator==(ConstIterator const& other) const;
 
     bool
-    operator!=(const_iterator const& other) const
+    operator!=(ConstIterator const& other) const
     {
         return !(*this == other);
     }
@@ -65,17 +65,17 @@ public:
         return &**this;
     }
 
-    const_iterator&
+    ConstIterator&
     operator++();
 
-    const_iterator
+    ConstIterator
     operator++(int);
 
-    const_iterator&
-    next_page();
+    ConstIterator&
+    nextPage();
 
     std::size_t
-    page_size();
+    pageSize();
 
     Keylet const&
     page() const
@@ -92,7 +92,7 @@ public:
 private:
     friend class Dir;
 
-    const_iterator(ReadView const& view, Keylet const& root, Keylet const& page)
+    ConstIterator(ReadView const& view, Keylet const& root, Keylet const& page)
         : view_(&view), root_(root), page_(page)
     {
     }
diff --git a/include/xrpl/ledger/Ledger.h b/include/xrpl/ledger/Ledger.h
index 62303ba3d2..2d6f48db2d 100644
--- a/include/xrpl/ledger/Ledger.h
+++ b/include/xrpl/ledger/Ledger.h
@@ -20,11 +20,11 @@ class TransactionMaster;
 
 class SqliteStatement;
 
-struct create_genesis_t
+struct CreateGenesisT
 {
-    explicit create_genesis_t() = default;
+    explicit CreateGenesisT() = default;
 };
-extern create_genesis_t const create_genesis;
+extern CreateGenesisT const kCREATE_GENESIS;
 
 /** Holds a ledger.
 
@@ -81,7 +81,7 @@ public:
         Amendments specified are enabled in the genesis ledger
     */
     Ledger(
-        create_genesis_t,
+        CreateGenesisT,
         Rules rules,
         Fees const& fees,
         std::vector<uint256> const& amendments,
@@ -169,19 +169,19 @@ public:
     std::shared_ptr<SLE const>
     read(Keylet const& k) const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesBegin() const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesEnd() const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesUpperBound(uint256 const& key) const override;
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsBegin() const override;
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsEnd() const override;
 
     bool
@@ -249,7 +249,7 @@ public:
     bool
     isImmutable() const
     {
-        return mImmutable;
+        return immutable_;
     }
 
     /*  Mark this ledger as "should be full".
@@ -365,8 +365,8 @@ public:
     peek(Keylet const& k) const;
 
 private:
-    class sles_iter_impl;
-    class txs_iter_impl;
+    class SlesIterImpl;
+    class TxsIterImpl;
 
     bool
     setup();
@@ -392,7 +392,7 @@ private:
     static std::pair<std::shared_ptr<STTx const>, std::shared_ptr<STObject const>>
     deserializeTxPlusMeta(SHAMapItem const& item);
 
-    bool mImmutable;
+    bool immutable_;
 
     // A SHAMap containing the transactions associated with this ledger.
     SHAMap mutable txMap_;
diff --git a/include/xrpl/ledger/LedgerTiming.h b/include/xrpl/ledger/LedgerTiming.h
index 8171beed3c..dce28bd44b 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 ledgerPossibleTimeResolutions[] = {
+std::chrono::seconds constexpr kLEDGER_POSSIBLE_TIME_RESOLUTIONS[] = {
     std::chrono::seconds{10},
     std::chrono::seconds{20},
     std::chrono::seconds{30},
@@ -21,16 +21,16 @@ std::chrono::seconds constexpr ledgerPossibleTimeResolutions[] = {
     std::chrono::seconds{120}};
 
 //! Initial resolution of ledger close time.
-auto constexpr ledgerDefaultTimeResolution = ledgerPossibleTimeResolutions[2];
+auto constexpr kLEDGER_DEFAULT_TIME_RESOLUTION = kLEDGER_POSSIBLE_TIME_RESOLUTIONS[2];
 
 //! Close time resolution in genesis ledger
-auto constexpr ledgerGenesisTimeResolution = ledgerPossibleTimeResolutions[0];
+auto constexpr kLEDGER_GENESIS_TIME_RESOLUTION = kLEDGER_POSSIBLE_TIME_RESOLUTIONS[0];
 
 //! How often we increase the close time resolution (in numbers of ledgers)
-auto constexpr increaseLedgerTimeResolutionEvery = 8;
+auto constexpr kINCREASE_LEDGER_TIME_RESOLUTION_EVERY = 8;
 
 //! How often we decrease the close time resolution (in numbers of ledgers)
-auto constexpr decreaseLedgerTimeResolutionEvery = 1;
+auto constexpr kDECREASE_LEDGER_TIME_RESOLUTION_EVERY = 1;
 
 /** Calculates the close time resolution for the specified ledger.
 
@@ -46,7 +46,7 @@ auto constexpr decreaseLedgerTimeResolutionEvery = 1;
     @param ledgerSeq the sequence number of the new ledger
 
     @pre previousResolution must be a valid bin
-         from @ref ledgerPossibleTimeResolutions
+         from @ref kLEDGER_POSSIBLE_TIME_RESOLUTIONS
 
     @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(ledgerPossibleTimeResolutions),
-        std::end(ledgerPossibleTimeResolutions),
+        std::begin(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
+        std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
         previousResolution);
     XRPL_ASSERT(
-        iter != std::end(ledgerPossibleTimeResolutions),
+        iter != std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS),
         "xrpl::getNextLedgerTimeResolution : found time resolution");
 
     // This should never happen, but just as a precaution
-    if (iter == std::end(ledgerPossibleTimeResolutions))
+    if (iter == std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
         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{decreaseLedgerTimeResolutionEvery} == Seq{0}))
+    if (!previousAgree && (ledgerSeq % Seq{kDECREASE_LEDGER_TIME_RESOLUTION_EVERY} == Seq{0}))
     {
-        if (++iter != std::end(ledgerPossibleTimeResolutions))
+        if (++iter != std::end(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
             return *iter;
     }
 
     // If we previously agreed, we try to increase the resolution to determine
     // if we can continue to agree.
-    if (previousAgree && (ledgerSeq % Seq{increaseLedgerTimeResolutionEvery} == Seq{0}))
+    if (previousAgree && (ledgerSeq % Seq{kINCREASE_LEDGER_TIME_RESOLUTION_EVERY} == Seq{0}))
     {
-        if (iter-- != std::begin(ledgerPossibleTimeResolutions))
+        if (iter-- != std::begin(kLEDGER_POSSIBLE_TIME_RESOLUTIONS))
             return *iter;
     }
 
diff --git a/include/xrpl/ledger/OpenView.h b/include/xrpl/ledger/OpenView.h
index 3420aa1df0..59ab733211 100644
--- a/include/xrpl/ledger/OpenView.h
+++ b/include/xrpl/ledger/OpenView.h
@@ -20,20 +20,20 @@ namespace xrpl {
     rules of open ledgers applied during transaction
     processing.
  */
-inline constexpr struct open_ledger_t
+inline constexpr struct OpenLedgerT
 {
-    explicit constexpr open_ledger_t() = default;
-} open_ledger{};
+    explicit constexpr OpenLedgerT() = default;
+} kOPEN_LEDGER{};
 
 /** Batch view construction tag.
 
     Views constructed with this tag are part of a stack of views
     used during batch transaction applied.
  */
-inline constexpr struct batch_view_t
+inline constexpr struct BatchViewT
 {
-    explicit constexpr batch_view_t() = default;
-} batch_view{};
+    explicit constexpr BatchViewT() = default;
+} kBATCH_VIEW{};
 
 //------------------------------------------------------------------------------
 
@@ -47,20 +47,20 @@ 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 initialBufferSize = kilobytes(256);
+    static constexpr size_t kINITIAL_BUFFER_SIZE = kilobytes(256);
 
-    class txs_iter_impl;
+    class TxsIterImpl;
 
-    struct txData
+    struct TxData
     {
         std::shared_ptr<Serializer const> txn;
         std::shared_ptr<Serializer const> meta;
 
         // Constructor needed for emplacement in std::map
-        txData(
-            std::shared_ptr<Serializer const> const& txn_,
-            std::shared_ptr<Serializer const> const& meta_)
-            : txn(txn_), meta(meta_)
+        TxData(
+            std::shared_ptr<Serializer const> const& txn,
+            std::shared_ptr<Serializer const> const& meta)
+            : txn(txn), meta(meta)
         {
         }
     };
@@ -70,9 +70,9 @@ private:
     // functions b/c clang does not support pmr yet (as-of 9/2020)
     using txs_map = std::map<
         key_type,
-        txData,
+        TxData,
         std::less<key_type>,
-        boost::container::pmr::polymorphic_allocator<std::pair<key_type const, txData>>>;
+        boost::container::pmr::polymorphic_allocator<std::pair<key_type const, TxData>>>;
 
     // monotonic_resource_ must outlive `items_`. Make a pointer so it may be
     // easily moved.
@@ -133,17 +133,17 @@ public:
         all newly inserted tx.
     */
     OpenView(
-        open_ledger_t,
+        OpenLedgerT,
         ReadView const* base,
         Rules rules,
         std::shared_ptr<void const> hold = nullptr);
 
-    OpenView(open_ledger_t, Rules const& rules, std::shared_ptr<ReadView const> const& base)
-        : OpenView(open_ledger, &*base, rules, base)
+    OpenView(OpenLedgerT, Rules const& rules, std::shared_ptr<ReadView const> const& base)
+        : OpenView(kOPEN_LEDGER, &*base, rules, base)
     {
     }
 
-    OpenView(batch_view_t, OpenView& base) : OpenView(std::addressof(base))
+    OpenView(BatchViewT, OpenView& base) : OpenView(std::addressof(base))
     {
         baseTxCount_ = base.txCount();
     }
@@ -200,19 +200,19 @@ public:
     std::shared_ptr<SLE const>
     read(Keylet const& k) const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesBegin() const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesEnd() const override;
 
-    std::unique_ptr<sles_type::iter_base>
+    std::unique_ptr<SlesType::iter_base>
     slesUpperBound(uint256 const& key) const override;
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsBegin() const override;
 
-    std::unique_ptr<txs_type::iter_base>
+    std::unique_ptr<TxsType::iter_base>
     txsEnd() const override;
 
     bool
diff --git a/include/xrpl/ledger/ReadView.h b/include/xrpl/ledger/ReadView.h
index bb0aa56507..4f9bf9c31d 100644
--- a/include/xrpl/ledger/ReadView.h
+++ b/include/xrpl/ledger/ReadView.h
@@ -36,25 +36,25 @@ public:
 
     using mapped_type = std::shared_ptr<SLE const>;
 
-    struct sles_type : detail::ReadViewFwdRange<std::shared_ptr<SLE const>>
+    struct SlesType : detail::ReadViewFwdRange<std::shared_ptr<SLE const>>
     {
-        explicit sles_type(ReadView const& view);
-        [[nodiscard]] iterator
+        explicit SlesType(ReadView const& view);
+        [[nodiscard]] Iterator
         begin() const;
-        [[nodiscard]] iterator
+        [[nodiscard]] Iterator
         end() const;
-        [[nodiscard]] iterator
-        upper_bound(key_type const& key) const;
+        [[nodiscard]] Iterator
+        upperBound(key_type const& key) const;
     };
 
-    struct txs_type : detail::ReadViewFwdRange<tx_type>
+    struct TxsType : detail::ReadViewFwdRange<tx_type>
     {
-        explicit txs_type(ReadView const& view);
+        explicit TxsType(ReadView const& view);
         [[nodiscard]] bool
         empty() const;
-        [[nodiscard]] iterator
+        [[nodiscard]] Iterator
         begin() const;
-        [[nodiscard]] iterator
+        [[nodiscard]] Iterator
         end() const;
     };
 
@@ -189,23 +189,23 @@ public:
     }
 
     // used by the implementation
-    [[nodiscard]] virtual std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] virtual std::unique_ptr<SlesType::iter_base>
     slesBegin() const = 0;
 
     // used by the implementation
-    [[nodiscard]] virtual std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] virtual std::unique_ptr<SlesType::iter_base>
     slesEnd() const = 0;
 
     // used by the implementation
-    [[nodiscard]] virtual std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] virtual std::unique_ptr<SlesType::iter_base>
     slesUpperBound(key_type const& key) const = 0;
 
     // used by the implementation
-    [[nodiscard]] virtual std::unique_ptr<txs_type::iter_base>
+    [[nodiscard]] virtual std::unique_ptr<TxsType::iter_base>
     txsBegin() const = 0;
 
     // used by the implementation
-    [[nodiscard]] virtual std::unique_ptr<txs_type::iter_base>
+    [[nodiscard]] virtual std::unique_ptr<TxsType::iter_base>
     txsEnd() const = 0;
 
     /** Returns `true` if a tx exists in the tx map.
@@ -236,10 +236,10 @@ public:
         @note Visiting each state entry in the ledger can
               become quite expensive as the ledger grows.
     */
-    sles_type sles;
+    SlesType sles;
 
     // The range of transactions
-    txs_type txs;
+    TxsType txs;
 };
 
 //------------------------------------------------------------------------------
@@ -269,7 +269,7 @@ makeRulesGivenLedger(DigestAwareReadView const& ledger, Rules const& current);
 Rules
 makeRulesGivenLedger(
     DigestAwareReadView const& ledger,
-    std::unordered_set<uint256, beast::uhash<>> const& presets);
+    std::unordered_set<uint256, beast::Uhash<>> const& presets);
 
 }  // namespace xrpl
 
diff --git a/include/xrpl/ledger/detail/ApplyStateTable.h b/include/xrpl/ledger/detail/ApplyStateTable.h
index 93b639f54b..7b18f742b4 100644
--- a/include/xrpl/ledger/detail/ApplyStateTable.h
+++ b/include/xrpl/ledger/detail/ApplyStateTable.h
@@ -20,10 +20,10 @@ public:
 
 private:
     enum class Action {
-        cache,
-        erase,
-        insert,
-        modify,
+        Cache,
+        Erase,
+        Insert,
+        Modify,
     };
 
     using items_t = std::map<key_type, std::pair<Action, std::shared_ptr<SLE>>>;
diff --git a/include/xrpl/ledger/detail/ApplyViewBase.h b/include/xrpl/ledger/detail/ApplyViewBase.h
index d6a293610a..558c9e5d4d 100644
--- a/include/xrpl/ledger/detail/ApplyViewBase.h
+++ b/include/xrpl/ledger/detail/ApplyViewBase.h
@@ -43,19 +43,19 @@ public:
     [[nodiscard]] std::shared_ptr<SLE const>
     read(Keylet const& k) const override;
 
-    [[nodiscard]] std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<SlesType::iter_base>
     slesBegin() const override;
 
-    [[nodiscard]] std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<SlesType::iter_base>
     slesEnd() const override;
 
-    [[nodiscard]] std::unique_ptr<sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<SlesType::iter_base>
     slesUpperBound(uint256 const& key) const override;
 
-    [[nodiscard]] std::unique_ptr<txs_type::iter_base>
+    [[nodiscard]] std::unique_ptr<TxsType::iter_base>
     txsBegin() const override;
 
-    [[nodiscard]] std::unique_ptr<txs_type::iter_base>
+    [[nodiscard]] std::unique_ptr<TxsType::iter_base>
     txsEnd() const override;
 
     [[nodiscard]] bool
diff --git a/include/xrpl/ledger/detail/RawStateTable.h b/include/xrpl/ledger/detail/RawStateTable.h
index ec5cb05981..169a7c505e 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 initialBufferSize = kilobytes(256);
+    static constexpr size_t kINITIAL_BUFFER_SIZE = kilobytes(256);
 
     RawStateTable()
-        : monotonic_resource_{
-              std::make_unique<boost::container::pmr::monotonic_buffer_resource>(initialBufferSize)}
+        : monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
+              kINITIAL_BUFFER_SIZE)}
         , items_{monotonic_resource_.get()} {};
 
     RawStateTable(RawStateTable const& rhs)
-        : monotonic_resource_{
-              std::make_unique<boost::container::pmr::monotonic_buffer_resource>(initialBufferSize)}
+        : monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
+              kINITIAL_BUFFER_SIZE)}
         , items_{rhs.items_, monotonic_resource_.get()}
         , dropsDestroyed_{rhs.dropsDestroyed_} {};
 
@@ -63,31 +63,31 @@ public:
     void
     destroyXRP(XRPAmount const& fee);
 
-    [[nodiscard]] std::unique_ptr<ReadView::sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<ReadView::SlesType::iter_base>
     slesBegin(ReadView const& base) const;
 
-    [[nodiscard]] std::unique_ptr<ReadView::sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<ReadView::SlesType::iter_base>
     slesEnd(ReadView const& base) const;
 
-    [[nodiscard]] std::unique_ptr<ReadView::sles_type::iter_base>
+    [[nodiscard]] std::unique_ptr<ReadView::SlesType::iter_base>
     slesUpperBound(ReadView const& base, uint256 const& key) const;
 
 private:
     enum class Action {
-        erase,
-        insert,
-        replace,
+        Erase,
+        Insert,
+        Replace,
     };
 
-    class sles_iter_impl;
+    class SlesIterImpl;
 
-    struct sleAction
+    struct SleAction
     {
         Action action;
         std::shared_ptr<SLE> sle;
 
         // Constructor needed for emplacement in std::map
-        sleAction(Action action_, std::shared_ptr<SLE> const& sle_) : action(action_), sle(sle_)
+        SleAction(Action action, std::shared_ptr<SLE> const& sle) : action(action), sle(sle)
         {
         }
     };
@@ -96,9 +96,9 @@ private:
     // functions b/c clang does not support pmr yet (as-of 9/2020)
     using items_t = std::map<
         key_type,
-        sleAction,
+        SleAction,
         std::less<key_type>,
-        boost::container::pmr::polymorphic_allocator<std::pair<key_type const, sleAction>>>;
+        boost::container::pmr::polymorphic_allocator<std::pair<key_type const, SleAction>>>;
     // monotonic_resource_ must outlive `items_`. Make a pointer so it may be
     // easily moved.
     std::unique_ptr<boost::container::pmr::monotonic_buffer_resource> monotonic_resource_;
diff --git a/include/xrpl/ledger/detail/ReadViewFwdRange.h b/include/xrpl/ledger/detail/ReadViewFwdRange.h
index 74fe0447dc..c548ccb101 100644
--- a/include/xrpl/ledger/detail/ReadViewFwdRange.h
+++ b/include/xrpl/ledger/detail/ReadViewFwdRange.h
@@ -53,7 +53,7 @@ public:
         "ReadViewFwdRange move and move assign constructors should be "
         "noexcept");
 
-    class iterator
+    class Iterator
     {
     public:
         using value_type = ValueType;
@@ -66,25 +66,25 @@ public:
 
         using iterator_category = std::forward_iterator_tag;
 
-        iterator() = default;
+        Iterator() = default;
 
-        iterator(iterator const& other);
-        iterator(iterator&& other) noexcept;
+        Iterator(Iterator const& other);
+        Iterator(Iterator&& other) noexcept;
 
         // Used by the implementation
-        explicit iterator(ReadView const* view, std::unique_ptr<iter_base> impl);
+        explicit Iterator(ReadView const* view, std::unique_ptr<iter_base> impl);
 
-        iterator&
-        operator=(iterator const& other);
+        Iterator&
+        operator=(Iterator const& other);
 
-        iterator&
-        operator=(iterator&& other) noexcept;
+        Iterator&
+        operator=(Iterator&& other) noexcept;
 
         bool
-        operator==(iterator const& other) const;
+        operator==(Iterator const& other) const;
 
         bool
-        operator!=(iterator const& other) const;
+        operator!=(Iterator const& other) const;
 
         // Can throw
         reference
@@ -94,10 +94,10 @@ public:
         pointer
         operator->() const;
 
-        iterator&
+        Iterator&
         operator++();
 
-        iterator
+        Iterator
         operator++(int);
 
     private:
@@ -106,10 +106,10 @@ public:
         std::optional<value_type> mutable cache_;
     };
 
-    static_assert(std::is_nothrow_move_constructible<iterator>{}, "");
-    static_assert(std::is_nothrow_move_assignable<iterator>{}, "");
+    static_assert(std::is_nothrow_move_constructible<Iterator>{}, "");
+    static_assert(std::is_nothrow_move_assignable<Iterator>{}, "");
 
-    using const_iterator = iterator;
+    using const_iterator = Iterator;
 
     using value_type = ValueType;
 
diff --git a/include/xrpl/ledger/detail/ReadViewFwdRange.ipp b/include/xrpl/ledger/detail/ReadViewFwdRange.ipp
index ce6754b39c..c7cbc5ee61 100644
--- a/include/xrpl/ledger/detail/ReadViewFwdRange.ipp
+++ b/include/xrpl/ledger/detail/ReadViewFwdRange.ipp
@@ -1,22 +1,21 @@
 #pragma once
 
-namespace xrpl {
-namespace detail {
+namespace xrpl::detail {
 
 template <class ValueType>
-ReadViewFwdRange<ValueType>::iterator::iterator(iterator const& other)
+ReadViewFwdRange<ValueType>::Iterator::Iterator(Iterator const& other)
     : view_(other.view_), impl_(other.impl_ ? other.impl_->copy() : nullptr), cache_(other.cache_)
 {
 }
 
 template <class ValueType>
-ReadViewFwdRange<ValueType>::iterator::iterator(iterator&& other) noexcept
+ReadViewFwdRange<ValueType>::Iterator::Iterator(Iterator&& other) noexcept
     : view_(other.view_), impl_(std::move(other.impl_)), cache_(std::move(other.cache_))
 {
 }
 
 template <class ValueType>
-ReadViewFwdRange<ValueType>::iterator::iterator(
+ReadViewFwdRange<ValueType>::Iterator::Iterator(
     ReadView const* view,
     std::unique_ptr<iter_base> impl)
     : view_(view), impl_(std::move(impl))
@@ -25,7 +24,7 @@ ReadViewFwdRange<ValueType>::iterator::iterator(
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator=(iterator const& other) -> iterator&
+ReadViewFwdRange<ValueType>::Iterator::operator=(Iterator const& other) -> Iterator&
 {
     if (this != &other)
     {
@@ -38,7 +37,7 @@ ReadViewFwdRange<ValueType>::iterator::operator=(iterator const& other) -> itera
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator=(iterator&& other) noexcept -> iterator&
+ReadViewFwdRange<ValueType>::Iterator::operator=(Iterator&& other) noexcept -> Iterator&
 {
     if (this != &other)
     {
@@ -52,7 +51,7 @@ ReadViewFwdRange<ValueType>::iterator::operator=(iterator&& other) noexcept -> i
 
 template <class ValueType>
 bool
-ReadViewFwdRange<ValueType>::iterator::operator==(iterator const& other) const
+ReadViewFwdRange<ValueType>::Iterator::operator==(Iterator const& other) const
 {
     XRPL_ASSERT(
         view_ == other.view_,
@@ -67,14 +66,14 @@ ReadViewFwdRange<ValueType>::iterator::operator==(iterator const& other) const
 
 template <class ValueType>
 bool
-ReadViewFwdRange<ValueType>::iterator::operator!=(iterator const& other) const
+ReadViewFwdRange<ValueType>::Iterator::operator!=(Iterator const& other) const
 {
     return !(*this == other);
 }
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator*() const -> reference
+ReadViewFwdRange<ValueType>::Iterator::operator*() const -> reference
 {
     if (!cache_)
         cache_ = impl_->dereference();
@@ -83,14 +82,14 @@ ReadViewFwdRange<ValueType>::iterator::operator*() const -> reference
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator->() const -> pointer
+ReadViewFwdRange<ValueType>::Iterator::operator->() const -> pointer
 {
     return &**this;
 }
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator++() -> iterator&
+ReadViewFwdRange<ValueType>::Iterator::operator++() -> Iterator&
 {
     impl_->increment();
     cache_.reset();
@@ -99,13 +98,12 @@ ReadViewFwdRange<ValueType>::iterator::operator++() -> iterator&
 
 template <class ValueType>
 auto
-ReadViewFwdRange<ValueType>::iterator::operator++(int) -> iterator
+ReadViewFwdRange<ValueType>::Iterator::operator++(int) -> Iterator
 {
-    iterator prev(view_, impl_->copy());
+    Iterator prev(view_, impl_->copy());
     prev.cache_ = std::move(cache_);
     ++(*this);
     return prev;
 }
 
-}  // namespace detail
-}  // namespace xrpl
+}  // namespace xrpl::detail
diff --git a/include/xrpl/ledger/helpers/AMMHelpers.h b/include/xrpl/ledger/helpers/AMMHelpers.h
index 9258d58fb6..c62437bf75 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 reducedOfferPct(9999, -4);
+    static Number const kREDUCED_OFFER_PCT(9999, -4);
 
     // Make sure the result is always less than amount or zero.
-    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
-    return amount * reducedOfferPct;
+    NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
+    return amount * kREDUCED_OFFER_PCT;
 }
 
 }  // namespace detail
@@ -177,10 +177,10 @@ getAMMOfferStartWithTakerGets(
     Quality const& targetQuality,
     std::uint16_t const& tfee)
 {
-    if (targetQuality.rate() == beast::zero)
+    if (targetQuality.rate() == beast::kZERO)
         return std::nullopt;
 
-    NumberRoundModeGuard const mg(Number::rounding_mode::to_nearest);
+    NumberRoundModeGuard const mg(Number::RoundingMode::ToNearest);
     auto const f = feeMult(tfee);
     auto const a = 1;
     auto const b = pool.in * (1 - 1 / f) / targetQuality.rate() - 2 * pool.out;
@@ -202,7 +202,7 @@ getAMMOfferStartWithTakerGets(
         // Round downward to minimize the offer and to maximize the quality.
         // This has the most impact when takerGets is XRP.
         auto const takerGets =
-            toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::rounding_mode::downward);
+            toAmount<TOut>(getAsset(pool.out), nTakerGetsProposed, Number::RoundingMode::Downward);
         return TAmounts<TIn, TOut>{swapAssetOut(pool, takerGets, tfee), takerGets};
     };
 
@@ -244,10 +244,10 @@ getAMMOfferStartWithTakerPays(
     Quality const& targetQuality,
     std::uint16_t tfee)
 {
-    if (targetQuality.rate() == beast::zero)
+    if (targetQuality.rate() == beast::kZERO)
         return std::nullopt;
 
-    NumberRoundModeGuard const mg(Number::rounding_mode::to_nearest);
+    NumberRoundModeGuard const mg(Number::RoundingMode::ToNearest);
     auto const f = feeMult(tfee);
     auto const& a = f;
     auto const b = pool.in * (1 + f);
@@ -269,7 +269,7 @@ getAMMOfferStartWithTakerPays(
         // Round downward to minimize the offer and to maximize the quality.
         // This has the most impact when takerPays is XRP.
         auto const takerPays =
-            toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::rounding_mode::downward);
+            toAmount<TIn>(getAsset(pool.in), nTakerPaysProposed, Number::RoundingMode::Downward);
         return TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
     };
 
@@ -342,7 +342,7 @@ changeSpotPriceQuality(
                 return std::nullopt;
             }
             auto const takerPays =
-                toAmount<TIn>(getAsset(pool.in), nTakerPays, Number::rounding_mode::upward);
+                toAmount<TIn>(getAsset(pool.in), nTakerPays, Number::RoundingMode::Upward);
             // should not fail
             if (auto amounts = TAmounts<TIn, TOut>{takerPays, swapAssetIn(pool, takerPays, tfee)};
                 Quality{amounts} < quality &&
@@ -446,34 +446,34 @@ swapAssetIn(TAmounts<TIn, TOut> const& pool, TIn const& assetIn, std::uint16_t t
         // 1-fee
         // maximize:
         // fee
-        saveNumberRoundMode const _{Number::getround()};
+        SaveNumberRoundMode const _{Number::getround()};
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         auto const numerator = pool.in * pool.out;
         auto const fee = getFee(tfee);
 
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         auto const denom = pool.in + assetIn * (1 - fee);
 
         if (denom.signum() <= 0)
             return toAmount<TOut>(getAsset(pool.out), 0);
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         auto const ratio = numerator / denom;
 
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         auto const swapOut = pool.out - ratio;
 
         if (swapOut.signum() < 0)
             return toAmount<TOut>(getAsset(pool.out), 0);
 
-        return toAmount<TOut>(getAsset(pool.out), swapOut, Number::rounding_mode::downward);
+        return toAmount<TOut>(getAsset(pool.out), swapOut, Number::RoundingMode::Downward);
     }
 
     return toAmount<TOut>(
         getAsset(pool.out),
         pool.out - (pool.in * pool.out) / (pool.in + assetIn * feeMult(tfee)),
-        Number::rounding_mode::downward);
+        Number::RoundingMode::Downward);
 }
 
 /** Swap assetOut out of the pool and swap in a proportional amount
@@ -508,38 +508,38 @@ swapAssetOut(TAmounts<TIn, TOut> const& pool, TOut const& assetOut, std::uint16_
         // maximize:
         // tfee/100000
 
-        saveNumberRoundMode const _{Number::getround()};
+        SaveNumberRoundMode const _{Number::getround()};
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         auto const numerator = pool.in * pool.out;
 
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         auto const denom = pool.out - assetOut;
         if (denom.signum() <= 0)
         {
             return toMaxAmount<TIn>(getAsset(pool.in));
         }
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         auto const ratio = numerator / denom;
         auto const numerator2 = ratio - pool.in;
         auto const fee = getFee(tfee);
 
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         auto const feeMult = 1 - fee;
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         auto const swapIn = numerator2 / feeMult;
         if (swapIn.signum() < 0)
             return toAmount<TIn>(getAsset(pool.in), 0);
 
-        return toAmount<TIn>(getAsset(pool.in), swapIn, Number::rounding_mode::upward);
+        return toAmount<TIn>(getAsset(pool.in), swapIn, Number::RoundingMode::Upward);
     }
 
     return toAmount<TIn>(
         getAsset(pool.in),
         ((pool.in * pool.out) / (pool.out - assetOut) - pool.in) / feeMult(tfee),
-        Number::rounding_mode::upward);
+        Number::RoundingMode::Upward);
 }
 
 /** Return square of n.
@@ -589,26 +589,26 @@ Number
 solveQuadraticEq(Number const& a, Number const& b, Number const& c);
 
 STAmount
-multiply(STAmount const& amount, Number const& frac, Number::rounding_mode rm);
+multiply(STAmount const& amount, Number const& frac, Number::RoundingMode rm);
 
 namespace detail {
 
-inline Number::rounding_mode
+inline Number::RoundingMode
 getLPTokenRounding(IsDeposit isDeposit)
 {
     // Minimize on deposit, maximize on withdraw to ensure
     // AMM invariant sqrt(poolAsset1 * poolAsset2) >= LPTokensBalance
-    return isDeposit == IsDeposit::Yes ? Number::rounding_mode::downward
-                                       : Number::rounding_mode::upward;
+    return isDeposit == IsDeposit::Yes ? Number::RoundingMode::Downward
+                                       : Number::RoundingMode::Upward;
 }
 
-inline Number::rounding_mode
+inline Number::RoundingMode
 getAssetRounding(IsDeposit isDeposit)
 {
     // Maximize on deposit, minimize on withdraw to ensure
     // AMM invariant sqrt(poolAsset1 * poolAsset2) >= LPTokensBalance
-    return isDeposit == IsDeposit::Yes ? Number::rounding_mode::upward
-                                       : Number::rounding_mode::downward;
+    return isDeposit == IsDeposit::Yes ? Number::RoundingMode::Upward
+                                       : Number::RoundingMode::Downward;
 }
 
 }  // namespace detail
diff --git a/include/xrpl/ledger/helpers/EscrowHelpers.h b/include/xrpl/ledger/helpers/EscrowHelpers.h
index b44601594d..5aa5214b1f 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 != parityRate)
+    if ((!senderIssuer && !receiverIssuer) && lockedRate != kPARITY_RATE)
     {
         // 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 != parityRate)
+    if ((!senderIssuer && !receiverIssuer) && lockedRate != kPARITY_RATE)
     {
         // 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 e1d8626b7c..83ce8e5efa 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 secondsInYear = 365 * 24 * 60 * 60;
+static constexpr std::uint32_t kSECONDS_IN_YEAR = 365 * 24 * 60 * 60;
 
 Number
 loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval);
@@ -19,7 +19,7 @@ loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval);
 inline Number
 roundPeriodicPayment(Asset const& asset, Number const& periodicPayment, std::int32_t scale)
 {
-    return roundToAsset(asset, periodicPayment, scale, Number::rounding_mode::upward);
+    return roundToAsset(asset, periodicPayment, scale, Number::RoundingMode::Upward);
 }
 
 /* Represents the breakdown of amounts to be paid and changes applied to the
@@ -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 = numZero;
+    Number principalPaid = kNUM_ZERO;
 
     // 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 = numZero;
+    Number interestPaid = kNUM_ZERO;
 
     // 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 = numZero;
+    Number valueChange = kNUM_ZERO;
 
     /* 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 = numZero;
+    Number feePaid = kNUM_ZERO;
 
     LoanPaymentParts&
     operator+=(LoanPaymentParts const& other);
@@ -161,7 +161,7 @@ adjustImpreciseNumber(
 {
     value = roundToAsset(asset, value + adjustment, vaultScale);
 
-    if (*value < beast::zero)
+    if (*value < beast::kZERO)
         value = 0;
 }
 
@@ -169,7 +169,7 @@ inline int
 getAssetsTotalScale(SLE::const_ref vaultSle)
 {
     if (!vaultSle)
-        return Number::minExponent - 1;  // LCOV_EXCL_LINE
+        return Number::kMIN_EXPONENT - 1;  // LCOV_EXCL_LINE
     return scale(vaultSle->at(sfAssetsTotal), vaultSle->at(sfAsset));
 }
 
@@ -222,7 +222,7 @@ namespace detail {
 // These classes and functions should only be accessed by LendingHelper
 // functions and unit tests
 
-enum class PaymentSpecialCase { none, final, extra };
+enum class PaymentSpecialCase { None, Final, Extra };
 
 /* Represents a single loan payment component parts.
 
@@ -258,7 +258,7 @@ struct PaymentComponents
     // - none: Regular scheduled payment
     // - final: The last payment that closes out the loan
     // - extra: An additional payment beyond the regular schedule (overpayment)
-    PaymentSpecialCase specialCase = PaymentSpecialCase::none;
+    PaymentSpecialCase specialCase = PaymentSpecialCase::None;
 
     // Calculates the tracked interest portion of this payment.
     // This is derived from the other components as:
@@ -310,7 +310,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 = numZero)
+    ExtendedPaymentComponents(PaymentComponents const& p, Number fee, Number interest = kNUM_ZERO)
         : PaymentComponents(p)
         , untrackedManagementFee(fee)
         , untrackedInterest(interest)
@@ -462,7 +462,7 @@ isRounded(Asset const& asset, Number const& value, std::int32_t scale);
 // regular, late, and full are mutually exclusive.
 // overpayment is an "add on" to a regular payment, and follows that path with
 // potential extra work at the end.
-enum class LoanPaymentType { regular = 0, late, full, overpayment };
+enum class LoanPaymentType { Regular = 0, Late, Full, Overpayment };
 
 Expected<LoanPaymentParts, TER>
 loanMakePayment(
diff --git a/include/xrpl/ledger/helpers/NFTokenHelpers.h b/include/xrpl/ledger/helpers/NFTokenHelpers.h
index 49fd520d51..4294e1ca13 100644
--- a/include/xrpl/ledger/helpers/NFTokenHelpers.h
+++ b/include/xrpl/ledger/helpers/NFTokenHelpers.h
@@ -30,8 +30,8 @@ struct TokenAndPage
     STObject token;
     std::shared_ptr<SLE> page;
 
-    TokenAndPage(STObject token_, std::shared_ptr<SLE> page_)
-        : token(std::move(token_)), page(std::move(page_))
+    TokenAndPage(STObject token, std::shared_ptr<SLE> page)
+        : token(std::move(token)), page(std::move(page))
     {
     }
 };
diff --git a/include/xrpl/ledger/helpers/TokenHelpers.h b/include/xrpl/ledger/helpers/TokenHelpers.h
index 8f83465da3..3d41ac47cd 100644
--- a/include/xrpl/ledger/helpers/TokenHelpers.h
+++ b/include/xrpl/ledger/helpers/TokenHelpers.h
@@ -21,13 +21,13 @@ namespace xrpl {
 //------------------------------------------------------------------------------
 
 /** Controls the treatment of frozen account balances */
-enum class FreezeHandling { fhIGNORE_FREEZE, fhZERO_IF_FROZEN };
+enum class FreezeHandling { IgnoreFreeze, ZeroIfFrozen };
 
 /** Controls the treatment of unauthorized MPT balances */
-enum class AuthHandling { ahIGNORE_AUTH, ahZERO_IF_UNAUTHORIZED };
+enum class AuthHandling { IgnoreAuth, ZeroIfUnauthorized };
 
 /** Controls whether to include the account's full spendable balance */
-enum class SpendableHandling { shSIMPLE_BALANCE, shFULL_BALANCE };
+enum class SpendableHandling { SimpleBalance, FullBalance };
 
 enum class WaiveTransferFee : bool { No = false, Yes };
 
@@ -135,7 +135,7 @@ accountHolds(
     AccountID const& issuer,
     FreezeHandling zeroIfFrozen,
     beast::Journal j,
-    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::SimpleBalance);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -144,7 +144,7 @@ accountHolds(
     Issue const& issue,
     FreezeHandling zeroIfFrozen,
     beast::Journal j,
-    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::SimpleBalance);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -154,7 +154,7 @@ accountHolds(
     FreezeHandling zeroIfFrozen,
     AuthHandling zeroIfUnauthorized,
     beast::Journal j,
-    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::SimpleBalance);
 
 [[nodiscard]] STAmount
 accountHolds(
@@ -164,7 +164,7 @@ accountHolds(
     FreezeHandling zeroIfFrozen,
     AuthHandling zeroIfUnauthorized,
     beast::Journal j,
-    SpendableHandling includeFullBalance = SpendableHandling::shSIMPLE_BALANCE);
+    SpendableHandling includeFullBalance = SpendableHandling::SimpleBalance);
 
 // Returns the amount an account can spend of the currency type saDefault, or
 // returns saDefault if this account is the issuer of the currency in
diff --git a/include/xrpl/ledger/helpers/VaultHelpers.h b/include/xrpl/ledger/helpers/VaultHelpers.h
index 8aef30aa27..14b0c004cb 100644
--- a/include/xrpl/ledger/helpers/VaultHelpers.h
+++ b/include/xrpl/ledger/helpers/VaultHelpers.h
@@ -41,7 +41,7 @@ sharesToAssetsDeposit(
     STAmount const& shares);
 
 /** Controls whether to truncate shares instead of rounding. */
-enum class TruncateShares : bool { no = false, yes = true };
+enum class TruncateShares : bool { No = false, Yes = true };
 
 /** From the perspective of a vault, return the number of shares to demand from
     the depositor when they ask to withdraw a fixed amount of assets. Since
@@ -60,7 +60,7 @@ assetsToSharesWithdraw(
     std::shared_ptr<SLE const> const& vault,
     std::shared_ptr<SLE const> const& issuance,
     STAmount const& assets,
-    TruncateShares truncate = TruncateShares::no);
+    TruncateShares truncate = TruncateShares::No);
 
 /** From the perspective of a vault, return the number of assets to give the
     depositor when they redeem a fixed amount of shares. Note, since shares are
diff --git a/include/xrpl/net/AutoSocket.h b/include/xrpl/net/AutoSocket.h
index 4dc20ffc5c..16ed0d6ca9 100644
--- a/include/xrpl/net/AutoSocket.h
+++ b/include/xrpl/net/AutoSocket.h
@@ -31,11 +31,11 @@ public:
         boost::asio::ssl::context& c,
         bool secureOnly,
         bool plainOnly)
-        : mSecure(secureOnly)
-        , mBuffer((plainOnly || secureOnly) ? 0 : 4)
+        : secure_(secureOnly)
+        , buffer_((plainOnly || secureOnly) ? 0 : 4)
         , j_{beast::Journal::getNullSink()}
     {
-        mSocket = std::make_unique<ssl_socket>(s, c);
+        socket_ = std::make_unique<ssl_socket>(s, c);
     }
 
     AutoSocket(boost::asio::io_context& s, boost::asio::ssl::context& c)
@@ -46,74 +46,74 @@ public:
     [[nodiscard]] bool
     isSecure() const
     {
-        return mSecure;
+        return secure_;
     }
     ssl_socket&
-    SSLSocket()
+    sslSocket()
     {
-        return *mSocket;
+        return *socket_;
     }
     plain_socket&
-    PlainSocket()
+    plainSocket()
     {
-        return mSocket->next_layer();
+        return socket_->next_layer();
     }
 
     beast::IP::Endpoint
-    local_endpoint()
+    localEndpoint()
     {
-        return beast::IP::from_asio(lowest_layer().local_endpoint());
+        return beast::IP::fromAsio(lowestLayer().local_endpoint());
     }
 
     beast::IP::Endpoint
-    remote_endpoint()
+    remoteEndpoint()
     {
-        return beast::IP::from_asio(lowest_layer().remote_endpoint());
+        return beast::IP::fromAsio(lowestLayer().remote_endpoint());
     }
 
     lowest_layer_type&
-    lowest_layer()
+    lowestLayer()
     {
-        return mSocket->lowest_layer();
+        return socket_->lowest_layer();
     }
 
     void
     swap(AutoSocket& s) noexcept
     {
-        mBuffer.swap(s.mBuffer);
-        mSocket.swap(s.mSocket);
-        std::swap(mSecure, s.mSecure);
+        buffer_.swap(s.buffer_);
+        socket_.swap(s.socket_);
+        std::swap(secure_, s.secure_);
     }
 
     boost::system::error_code
     cancel(boost::system::error_code& ec)
     {
-        return lowest_layer().cancel(ec);
+        return lowestLayer().cancel(ec);
     }
 
     void
-    async_handshake(handshake_type type, callback cbFunc)
+    asyncHandshake(handshake_type type, callback cbFunc)
     {
-        if ((type == ssl_socket::client) || (mSecure))
+        if ((type == ssl_socket::client) || (secure_))
         {
             // must be ssl
-            mSecure = true;
-            mSocket->async_handshake(type, cbFunc);
+            secure_ = true;
+            socket_->async_handshake(type, cbFunc);
         }
-        else if (mBuffer.empty())
+        else if (buffer_.empty())
         {
             // must be plain
-            mSecure = false;
-            post(mSocket->get_executor(), boost::beast::bind_handler(cbFunc, error_code()));
+            secure_ = false;
+            post(socket_->get_executor(), boost::beast::bind_handler(cbFunc, error_code()));
         }
         else
         {
             // autodetect
-            mSocket->next_layer().async_receive(
-                boost::asio::buffer(mBuffer),
+            socket_->next_layer().async_receive(
+                boost::asio::buffer(buffer_),
                 boost::asio::socket_base::message_peek,
                 std::bind(
-                    &AutoSocket::handle_autodetect,
+                    &AutoSocket::handleAutodetect,
                     this,
                     cbFunc,
                     std::placeholders::_1,
@@ -123,176 +123,176 @@ public:
 
     template <typename ShutdownHandler>
     void
-    async_shutdown(ShutdownHandler handler)
+    asyncShutdown(ShutdownHandler handler)
     {
         if (isSecure())
         {
-            mSocket->async_shutdown(handler);
+            socket_->async_shutdown(handler);
         }
         else
         {
             error_code ec;
             try
             {
-                lowest_layer().shutdown(plain_socket::shutdown_both);
+                lowestLayer().shutdown(plain_socket::shutdown_both);
             }
             catch (boost::system::system_error const& e)
             {
                 ec = e.code();
             }
-            post(mSocket->get_executor(), boost::beast::bind_handler(handler, ec));
+            post(socket_->get_executor(), boost::beast::bind_handler(handler, ec));
         }
     }
 
     template <typename Seq, typename Handler>
     void
-    async_read_some(Seq const& buffers, Handler handler)
+    asyncReadSome(Seq const& buffers, Handler handler)
     {
         if (isSecure())
         {
-            mSocket->async_read_some(buffers, handler);
+            socket_->async_read_some(buffers, handler);
         }
         else
         {
-            PlainSocket().async_read_some(buffers, handler);
+            plainSocket().async_read_some(buffers, handler);
         }
     }
 
     template <typename Seq, typename Condition, typename Handler>
     void
-    async_read_until(Seq const& buffers, Condition condition, Handler handler)
+    asyncReadUntil(Seq const& buffers, Condition condition, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read_until(*mSocket, buffers, condition, handler);
+            boost::asio::async_read_until(*socket_, buffers, condition, handler);
         }
         else
         {
-            boost::asio::async_read_until(PlainSocket(), buffers, condition, handler);
+            boost::asio::async_read_until(plainSocket(), buffers, condition, handler);
         }
     }
 
     template <typename Allocator, typename Handler>
     void
-    async_read_until(
+    asyncReadUntil(
         boost::asio::basic_streambuf<Allocator>& buffers,
         std::string const& delim,
         Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read_until(*mSocket, buffers, delim, handler);
+            boost::asio::async_read_until(*socket_, buffers, delim, handler);
         }
         else
         {
-            boost::asio::async_read_until(PlainSocket(), buffers, delim, handler);
+            boost::asio::async_read_until(plainSocket(), buffers, delim, handler);
         }
     }
 
     template <typename Allocator, typename MatchCondition, typename Handler>
     void
-    async_read_until(
+    asyncReadUntil(
         boost::asio::basic_streambuf<Allocator>& buffers,
         MatchCondition cond,
         Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read_until(*mSocket, buffers, cond, handler);
+            boost::asio::async_read_until(*socket_, buffers, cond, handler);
         }
         else
         {
-            boost::asio::async_read_until(PlainSocket(), buffers, cond, handler);
+            boost::asio::async_read_until(plainSocket(), buffers, cond, handler);
         }
     }
 
     template <typename Buf, typename Handler>
     void
-    async_write(Buf const& buffers, Handler handler)
+    asyncWrite(Buf const& buffers, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_write(*mSocket, buffers, handler);
+            boost::asio::async_write(*socket_, buffers, handler);
         }
         else
         {
-            boost::asio::async_write(PlainSocket(), buffers, handler);
+            boost::asio::async_write(plainSocket(), buffers, handler);
         }
     }
 
     template <typename Allocator, typename Handler>
     void
-    async_write(boost::asio::basic_streambuf<Allocator>& buffers, Handler handler)
+    asyncWrite(boost::asio::basic_streambuf<Allocator>& buffers, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_write(*mSocket, buffers, handler);
+            boost::asio::async_write(*socket_, buffers, handler);
         }
         else
         {
-            boost::asio::async_write(PlainSocket(), buffers, handler);
+            boost::asio::async_write(plainSocket(), buffers, handler);
         }
     }
 
     template <typename Buf, typename Condition, typename Handler>
     void
-    async_read(Buf const& buffers, Condition cond, Handler handler)
+    asyncRead(Buf const& buffers, Condition cond, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read(*mSocket, buffers, cond, handler);
+            boost::asio::async_read(*socket_, buffers, cond, handler);
         }
         else
         {
-            boost::asio::async_read(PlainSocket(), buffers, cond, handler);
+            boost::asio::async_read(plainSocket(), buffers, cond, handler);
         }
     }
 
     template <typename Allocator, typename Condition, typename Handler>
     void
-    async_read(boost::asio::basic_streambuf<Allocator>& buffers, Condition cond, Handler handler)
+    asyncRead(boost::asio::basic_streambuf<Allocator>& buffers, Condition cond, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read(*mSocket, buffers, cond, handler);
+            boost::asio::async_read(*socket_, buffers, cond, handler);
         }
         else
         {
-            boost::asio::async_read(PlainSocket(), buffers, cond, handler);
+            boost::asio::async_read(plainSocket(), buffers, cond, handler);
         }
     }
 
     template <typename Buf, typename Handler>
     void
-    async_read(Buf const& buffers, Handler handler)
+    asyncRead(Buf const& buffers, Handler handler)
     {
         if (isSecure())
         {
-            boost::asio::async_read(*mSocket, buffers, handler);
+            boost::asio::async_read(*socket_, buffers, handler);
         }
         else
         {
-            boost::asio::async_read(PlainSocket(), buffers, handler);
+            boost::asio::async_read(plainSocket(), buffers, handler);
         }
     }
 
     template <typename Seq, typename Handler>
     void
-    async_write_some(Seq const& buffers, Handler handler)
+    asyncWriteSome(Seq const& buffers, Handler handler)
     {
         if (isSecure())
         {
-            mSocket->async_write_some(buffers, handler);
+            socket_->async_write_some(buffers, handler);
         }
         else
         {
-            PlainSocket().async_write_some(buffers, handler);
+            plainSocket().async_write_some(buffers, handler);
         }
     }
 
 protected:
     void
-    handle_autodetect(callback cbFunc, error_code const& ec, size_t bytesTransferred)
+    handleAutodetect(callback cbFunc, error_code const& ec, size_t bytesTransferred)
     {
         using namespace xrpl;
 
@@ -302,28 +302,28 @@ protected:
             cbFunc(ec);
         }
         else if (
-            (mBuffer[0] < 127) && (mBuffer[0] > 31) &&
-            ((bytesTransferred < 2) || ((mBuffer[1] < 127) && (mBuffer[1] > 31))) &&
-            ((bytesTransferred < 3) || ((mBuffer[2] < 127) && (mBuffer[2] > 31))) &&
-            ((bytesTransferred < 4) || ((mBuffer[3] < 127) && (mBuffer[3] > 31))))
+            (buffer_[0] < 127) && (buffer_[0] > 31) &&
+            ((bytesTransferred < 2) || ((buffer_[1] < 127) && (buffer_[1] > 31))) &&
+            ((bytesTransferred < 3) || ((buffer_[2] < 127) && (buffer_[2] > 31))) &&
+            ((bytesTransferred < 4) || ((buffer_[3] < 127) && (buffer_[3] > 31))))
         {
             // not ssl
             JLOG(j_.trace()) << "non-SSL";
-            mSecure = false;
+            secure_ = false;
             cbFunc(ec);
         }
         else
         {
             // ssl
             JLOG(j_.trace()) << "SSL";
-            mSecure = true;
-            mSocket->async_handshake(ssl_socket::server, cbFunc);
+            secure_ = true;
+            socket_->async_handshake(ssl_socket::server, cbFunc);
         }
     }
 
 private:
-    socket_ptr mSocket;
-    bool mSecure;
-    std::vector<char> mBuffer;
+    socket_ptr socket_;
+    bool secure_;
+    std::vector<char> buffer_;
     beast::Journal j_;
 };
diff --git a/include/xrpl/net/HTTPClient.h b/include/xrpl/net/HTTPClient.h
index c176e2d2e8..ea0c5d72cd 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 maxClientHeaderBytes = kilobytes(32);
+    static constexpr auto kMAX_CLIENT_HEADER_BYTES = kilobytes(32);
 
     static void
     initializeSSLContext(
@@ -43,7 +43,7 @@ public:
 
     static void
     get(bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         std::deque<std::string> deqSites,
         unsigned short const port,
         std::string const& strPath,
@@ -57,7 +57,7 @@ public:
 
     static void
     get(bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         std::string strSite,
         unsigned short const port,
         std::string const& strPath,
@@ -72,7 +72,7 @@ public:
     static void
     request(
         bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         std::string strSite,
         unsigned short const port,
         std::function<void(boost::asio::streambuf& sb, std::string const& strHost)> build,
diff --git a/include/xrpl/net/HTTPClientSSLContext.h b/include/xrpl/net/HTTPClientSSLContext.h
index 060746b7d8..d1744bbce4 100644
--- a/include/xrpl/net/HTTPClientSSLContext.h
+++ b/include/xrpl/net/HTTPClientSSLContext.h
@@ -120,7 +120,7 @@ public:
             {
                 strm.set_verify_callback(
                     std::bind(
-                        &rfc6125_verify, host, std::placeholders::_1, std::placeholders::_2, j_),
+                        &rfc6125Verify, host, std::placeholders::_1, std::placeholders::_2, j_),
                     ec);
             }
         }
@@ -138,7 +138,7 @@ public:
      * @param j journal for logging
      */
     static bool
-    rfc6125_verify(
+    rfc6125Verify(
         std::string const& domain,
         bool preverified,
         boost::asio::ssl::verify_context& ctx,
diff --git a/include/xrpl/nodestore/Backend.h b/include/xrpl/nodestore/Backend.h
index 7f9dd172cc..124cd99db5 100644
--- a/include/xrpl/nodestore/Backend.h
+++ b/include/xrpl/nodestore/Backend.h
@@ -113,7 +113,7 @@ public:
         @see import
     */
     virtual void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) = 0;
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) = 0;
 
     /** Estimate the number of write operations pending. */
     virtual int
diff --git a/include/xrpl/nodestore/Database.h b/include/xrpl/nodestore/Database.h
index c21c1e27dd..ca2dde560c 100644
--- a/include/xrpl/nodestore/Database.h
+++ b/include/xrpl/nodestore/Database.h
@@ -110,7 +110,7 @@ public:
     fetchNodeObject(
         uint256 const& hash,
         std::uint32_t ledgerSeq = 0,
-        FetchType fetchType = FetchType::synchronous,
+        FetchType fetchType = FetchType::Synchronous,
         bool duplicate = false);
 
     /** Fetch an object without waiting.
@@ -166,7 +166,7 @@ public:
     }
 
     void
-    getCountsJson(Json::Value& obj);
+    getCountsJson(json::Value& obj);
 
     /** Returns the number of file descriptors the database expects to need */
     int
@@ -266,7 +266,7 @@ private:
         @see import
     */
     virtual void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) = 0;
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) = 0;
 
     void
     threadEntry();
diff --git a/include/xrpl/nodestore/Manager.h b/include/xrpl/nodestore/Manager.h
index 7f718d7835..1c4e5b63cf 100644
--- a/include/xrpl/nodestore/Manager.h
+++ b/include/xrpl/nodestore/Manager.h
@@ -36,7 +36,7 @@ public:
 
     /** Create a backend. */
     virtual std::unique_ptr<Backend>
-    make_Backend(
+    makeBackend(
         Section const& parameters,
         std::size_t burstSize,
         Scheduler& scheduler,
@@ -71,7 +71,7 @@ public:
         @return The opened database.
     */
     virtual std::unique_ptr<Database>
-    make_Database(
+    makeDatabase(
         std::size_t burstSize,
         Scheduler& scheduler,
         int readThreads,
diff --git a/include/xrpl/nodestore/NodeObject.h b/include/xrpl/nodestore/NodeObject.h
index 8759f244d2..2a216606c4 100644
--- a/include/xrpl/nodestore/NodeObject.h
+++ b/include/xrpl/nodestore/NodeObject.h
@@ -10,11 +10,11 @@ namespace xrpl {
 
 /** The types of node objects. */
 enum class NodeObjectType : std::uint32_t {
-    hotUNKNOWN = 0,
-    hotLEDGER = 1,
-    hotACCOUNT_NODE = 3,
-    hotTRANSACTION_NODE = 4,
-    hotDUMMY = 512  // an invalid or missing object
+    Unknown = 0,
+    Ledger = 1,
+    AccountNode = 3,
+    TransactionNode = 4,
+    Dummy = 512  // an invalid or missing object
 };
 
 /** A simple object that the Ledger uses to store entries.
@@ -29,7 +29,7 @@ enum class NodeObjectType : std::uint32_t {
 class NodeObject : public CountedObject<NodeObject>
 {
 public:
-    static constexpr std::size_t keyBytes = 32;
+    static constexpr std::size_t kKEY_BYTES = 32;
 
 private:
     // This hack is used to make the constructor effectively private
@@ -71,9 +71,9 @@ public:
     getData() const;
 
 private:
-    NodeObjectType const mType;
-    uint256 const mHash;
-    Blob const mData;
+    NodeObjectType const type_;
+    uint256 const hash_;
+    Blob const data_;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/nodestore/Scheduler.h b/include/xrpl/nodestore/Scheduler.h
index bf256648aa..588ff19bdc 100644
--- a/include/xrpl/nodestore/Scheduler.h
+++ b/include/xrpl/nodestore/Scheduler.h
@@ -6,12 +6,12 @@
 
 namespace xrpl::NodeStore {
 
-enum class FetchType { synchronous, async };
+enum class FetchType { Synchronous, Async };
 
 /** Contains information about a fetch operation. */
 struct FetchReport
 {
-    explicit FetchReport(FetchType fetchType_) : fetchType(fetchType_)
+    explicit FetchReport(FetchType fetchType) : fetchType(fetchType)
     {
     }
 
diff --git a/include/xrpl/nodestore/Types.h b/include/xrpl/nodestore/Types.h
index cc7d345067..2b5d9ac770 100644
--- a/include/xrpl/nodestore/Types.h
+++ b/include/xrpl/nodestore/Types.h
@@ -12,24 +12,24 @@ enum {
     // This is only used to pre-allocate the array for
     // batch objects and does not affect the amount written.
     //
-    batchWritePreallocationSize = 256,
+    BatchWritePreallocationSize = 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.
     //
-    batchWriteLimitSize = 65536
+    BatchWriteLimitSize = 65536
 };
 
 /** Return codes from Backend operations. */
 enum class Status {
-    ok = 0,
-    notFound = 1,
-    dataCorrupt = 2,
-    unknown = 3,
-    backendError = 4,
+    Ok = 0,
+    NotFound = 1,
+    DataCorrupt = 2,
+    Unknown = 3,
+    BackendError = 4,
 
-    customCode = 100
+    CustomCode = 100
 };
 
 /** A batch of NodeObjects to write at once. */
diff --git a/include/xrpl/nodestore/detail/BatchWriter.h b/include/xrpl/nodestore/detail/BatchWriter.h
index 1112ccc324..b0383838dc 100644
--- a/include/xrpl/nodestore/detail/BatchWriter.h
+++ b/include/xrpl/nodestore/detail/BatchWriter.h
@@ -66,13 +66,13 @@ private:
     using LockType = std::recursive_mutex;
     using CondvarType = std::condition_variable_any;
 
-    Callback& m_callback;
-    Scheduler& m_scheduler;
-    LockType mWriteMutex;
-    CondvarType mWriteCondition;
-    int mWriteLoad{0};
-    bool mWritePending{false};
-    Batch mWriteSet;
+    Callback& callback_;
+    Scheduler& scheduler_;
+    LockType writeMutex_;
+    CondvarType writeCondition_;
+    int writeLoad_{0};
+    bool writePending_{false};
+    Batch writeSet_;
 };
 
 }  // namespace xrpl::NodeStore
diff --git a/include/xrpl/nodestore/detail/DatabaseNodeImp.h b/include/xrpl/nodestore/detail/DatabaseNodeImp.h
index 88fb994bee..add66c51a7 100644
--- a/include/xrpl/nodestore/detail/DatabaseNodeImp.h
+++ b/include/xrpl/nodestore/detail/DatabaseNodeImp.h
@@ -85,9 +85,9 @@ private:
         override;
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override
     {
-        backend_->for_each(f);
+        backend_->forEach(f);
     }
 };
 
diff --git a/include/xrpl/nodestore/detail/DatabaseRotatingImp.h b/include/xrpl/nodestore/detail/DatabaseRotatingImp.h
index 7010c87ebf..39441ef4d8 100644
--- a/include/xrpl/nodestore/detail/DatabaseRotatingImp.h
+++ b/include/xrpl/nodestore/detail/DatabaseRotatingImp.h
@@ -65,7 +65,7 @@ private:
         override;
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override;
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override;
 };
 
 }  // namespace xrpl::NodeStore
diff --git a/include/xrpl/nodestore/detail/DecodedBlob.h b/include/xrpl/nodestore/detail/DecodedBlob.h
index 8c75e58d48..90a7b6c9cb 100644
--- a/include/xrpl/nodestore/detail/DecodedBlob.h
+++ b/include/xrpl/nodestore/detail/DecodedBlob.h
@@ -24,7 +24,7 @@ public:
     [[nodiscard]] bool
     wasOk() const noexcept
     {
-        return m_success;
+        return success_;
     }
 
     /** Create a NodeObject from this data. */
@@ -32,12 +32,12 @@ public:
     createObject();
 
 private:
-    bool m_success;
+    bool success_;
 
-    void const* m_key;
-    NodeObjectType m_objectType;
-    unsigned char const* m_objectData;
-    int m_dataBytes;
+    void const* key_;
+    NodeObjectType objectType_;
+    unsigned char const* objectData_;
+    int dataBytes_;
 };
 
 }  // namespace xrpl::NodeStore
diff --git a/include/xrpl/nodestore/detail/ManagerImp.h b/include/xrpl/nodestore/detail/ManagerImp.h
index 46363f9dab..98aec6459b 100644
--- a/include/xrpl/nodestore/detail/ManagerImp.h
+++ b/include/xrpl/nodestore/detail/ManagerImp.h
@@ -15,7 +15,7 @@ public:
     instance();
 
     static void
-    missing_backend();
+    missingBackend();
 
     ManagerImp();
 
@@ -31,14 +31,14 @@ public:
     erase(Factory& factory) override;
 
     std::unique_ptr<Backend>
-    make_Backend(
+    makeBackend(
         Section const& parameters,
         std::size_t burstSize,
         Scheduler& scheduler,
         beast::Journal journal) override;
 
     std::unique_ptr<Database>
-    make_Database(
+    makeDatabase(
         std::size_t burstSize,
         Scheduler& scheduler,
         int readThreads,
diff --git a/include/xrpl/nodestore/detail/codec.h b/include/xrpl/nodestore/detail/codec.h
index e127062b80..4dedc54902 100644
--- a/include/xrpl/nodestore/detail/codec.h
+++ b/include/xrpl/nodestore/detail/codec.h
@@ -21,16 +21,16 @@ namespace xrpl::NodeStore {
 
 template <class BufferFactory>
 std::pair<void const*, std::size_t>
-lz4_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
+lz4Decompress(void const* in, std::size_t inSize, BufferFactory&& bf)
 {
-    if (static_cast<int>(in_size) < 0)
+    if (static_cast<int>(inSize) < 0)
         Throw<std::runtime_error>("lz4_decompress: integer overflow (input)");
 
     std::size_t outSize = 0;
 
-    auto const n = read_varint(reinterpret_cast<std::uint8_t const*>(in), in_size, outSize);
+    auto const n = readVarint(reinterpret_cast<std::uint8_t const*>(in), inSize, outSize);
 
-    if (n == 0 || n >= in_size)
+    if (n == 0 || n >= inSize)
         Throw<std::runtime_error>("lz4_decompress: invalid blob");
 
     if (static_cast<int>(outSize) <= 0)
@@ -41,7 +41,7 @@ lz4_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
     if (LZ4_decompress_safe(
             reinterpret_cast<char const*>(in) + n,
             reinterpret_cast<char*>(out),
-            static_cast<int>(in_size - n),
+            static_cast<int>(inSize - n),
             static_cast<int>(outSize)) != static_cast<int>(outSize))
         Throw<std::runtime_error>("lz4_decompress: LZ4_decompress_safe");
 
@@ -50,22 +50,22 @@ lz4_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
 
 template <class BufferFactory>
 std::pair<void const*, std::size_t>
-lz4_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
+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>::max> vi{};
-    auto const n = write_varint(vi.data(), in_size);
-    auto const out_max = LZ4_compressBound(in_size);
-    std::uint8_t* out = reinterpret_cast<std::uint8_t*>(bf(n + out_max));
+    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));
     result.first = out;
     std::memcpy(out, vi.data(), n);
-    auto const out_size = LZ4_compress_default(
-        reinterpret_cast<char const*>(in), reinterpret_cast<char*>(out + n), in_size, out_max);
-    if (out_size == 0)
+    auto const outSize = LZ4_compress_default(
+        reinterpret_cast<char const*>(in), reinterpret_cast<char*>(out + n), inSize, outMax);
+    if (outSize == 0)
         Throw<std::runtime_error>("lz4 compress");
-    result.second = n + out_size;
+    result.second = n + outSize;
     return result;
 }
 
@@ -82,17 +82,17 @@ lz4_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
 
 template <class BufferFactory>
 std::pair<void const*, std::size_t>
-nodeobject_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
+nodeobjectDecompress(void const* in, std::size_t inSize, BufferFactory&& bf)
 {
     using namespace nudb::detail;
 
     std::uint8_t const* p = reinterpret_cast<std::uint8_t const*>(in);
     std::size_t type = 0;
-    auto const vn = read_varint(p, in_size, type);
+    auto const vn = readVarint(p, inSize, type);
     if (vn == 0)
         Throw<std::runtime_error>("nodeobject decompress");
     p += vn;
-    in_size -= vn;
+    inSize -= vn;
 
     std::pair<void const*, std::size_t> result;
     switch (type)
@@ -100,35 +100,35 @@ nodeobject_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
         case 0:  // uncompressed
         {
             result.first = p;
-            result.second = in_size;
+            result.second = inSize;
             break;
         }
         case 1:  // lz4
         {
-            result = lz4_decompress(p, in_size, bf);
+            result = lz4Decompress(p, inSize, bf);
             break;
         }
         case 2:  // compressed v1 inner node
         {
             auto const hs = field<std::uint16_t>::size;  // Mask
-            if (in_size < hs + 32)
+            if (inSize < hs + 32)
             {
                 Throw<std::runtime_error>(
                     "nodeobject codec v1: short inner node size: " + std::string("in_size = ") +
-                    std::to_string(in_size) + " hs = " + std::to_string(hs));
+                    std::to_string(inSize) + " hs = " + std::to_string(hs));
             }
-            istream is(p, in_size);
+            istream is(p, inSize);
             std::uint16_t mask = 0;
             read<std::uint16_t>(is, mask);  // Mask
-            in_size -= hs;
+            inSize -= hs;
             result.second = 525;
             void* const out = bf(result.second);
             result.first = out;
             ostream os(out, result.second);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
-            write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::innerNode));
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::Unknown));
+            write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::InnerNode));
             if (mask == 0)
                 Throw<std::runtime_error>("nodeobject codec v1: empty inner node");
             std::uint16_t bit = 0x8000;
@@ -136,45 +136,45 @@ nodeobject_decompress(void const* in, std::size_t in_size, BufferFactory&& bf)
             {
                 if (mask & bit)
                 {
-                    if (in_size < 32)
+                    if (inSize < 32)
                     {
                         Throw<std::runtime_error>(
                             "nodeobject codec v1: short inner node subsize: " +
-                            std::string("in_size = ") + std::to_string(in_size) +
+                            std::string("in_size = ") + std::to_string(inSize) +
                             " i = " + std::to_string(i));
                     }
                     std::memcpy(os.data(32), is(32), 32);
-                    in_size -= 32;
+                    inSize -= 32;
                 }
                 else
                 {
                     std::memset(os.data(32), 0, 32);
                 }
             }
-            if (in_size > 0)
+            if (inSize > 0)
             {
                 Throw<std::runtime_error>(
-                    "nodeobject codec v1: long inner node, in_size = " + std::to_string(in_size));
+                    "nodeobject codec v1: long inner node, in_size = " + std::to_string(inSize));
             }
             break;
         }
         case 3:  // full v1 inner node
         {
-            if (in_size != 16 * 32)
+            if (inSize != 16 * 32)
             {  // hashes
                 Throw<std::runtime_error>(
                     "nodeobject codec v1: short full inner node, in_size = " +
-                    std::to_string(in_size));
+                    std::to_string(inSize));
             }
-            istream is(p, in_size);
+            istream is(p, inSize);
             result.second = 525;
             void* const out = bf(result.second);
             result.first = out;
             ostream os(out, result.second);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
-            write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::innerNode));
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::Unknown));
+            write<std::uint32_t>(os, static_cast<std::uint32_t>(HashPrefix::InnerNode));
             write(os, is(512), 512);
             break;
         }
@@ -188,21 +188,21 @@ template <class = void>
 void const*
 zero32()
 {
-    static std::array<char, 32> v{};
-    return v.data();
+    static std::array<char, 32> kV{};
+    return kV.data();
 }
 
 template <class BufferFactory>
 std::pair<void const*, std::size_t>
-nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
+nodeobjectCompress(void const* in, std::size_t inSize, BufferFactory&& bf)
 {
     using std::runtime_error;
     using namespace nudb::detail;
 
     // Check for inner node v1
-    if (in_size == 525)
+    if (inSize == 525)
     {
-        istream is(in, in_size);
+        istream is(in, inSize);
         std::uint32_t index = 0;
         std::uint32_t unused = 0;
         std::uint8_t kind = 0;
@@ -211,7 +211,7 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
         read<std::uint32_t>(is, unused);
         read<std::uint8_t>(is, kind);
         read<std::uint32_t>(is, prefix);
-        if (safe_cast<HashPrefix>(prefix) == HashPrefix::innerNode)
+        if (safeCast<HashPrefix>(prefix) == HashPrefix::InnerNode)
         {
             std::size_t n = 0;
             std::uint16_t mask = 0;
@@ -230,7 +230,7 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
             {
                 // 2 = v1 inner node compressed
                 auto const type = 2U;
-                auto const vs = size_varint(type);
+                auto const vs = sizeVarint(type);
                 result.second = vs + field<std::uint16_t>::size +  // mask
                     (n * 32);                                      // hashes
                 std::uint8_t* out = reinterpret_cast<std::uint8_t*>(bf(result.second));
@@ -243,7 +243,7 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
             }
             // 3 = full v1 inner node
             auto const type = 3U;
-            auto const vs = size_varint(type);
+            auto const vs = sizeVarint(type);
             result.second = vs + (n * 32);  // hashes
             std::uint8_t* out = reinterpret_cast<std::uint8_t*>(bf(result.second));
             result.first = out;
@@ -254,18 +254,18 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
         }
     }
 
-    std::array<std::uint8_t, varint_traits<std::size_t>::max> vi{};
+    std::array<std::uint8_t, varint_traits<std::size_t>::kMAX> vi{};
 
-    constexpr std::size_t codecType = 1;
-    auto const vn = write_varint(vi.data(), codecType);
+    constexpr std::size_t kCODEC_TYPE = 1;
+    auto const vn = writeVarint(vi.data(), kCODEC_TYPE);
     std::pair<void const*, std::size_t> result;
-    switch (codecType)
+    switch (kCODEC_TYPE)
     {
         // case 0 was uncompressed data; we always compress now.
         case 1:  // lz4
         {
             std::uint8_t* p = nullptr;
-            auto const lzr = NodeStore::lz4_compress(in, in_size, [&p, &vn, &bf](std::size_t n) {
+            auto const lzr = NodeStore::lz4Compress(in, inSize, [&p, &vn, &bf](std::size_t n) {
                 p = reinterpret_cast<std::uint8_t*>(bf(vn + n));
                 return p + vn;
             });
@@ -275,7 +275,7 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
             break;
         }
         default:
-            Throw<std::logic_error>("nodeobject codec: unknown=" + std::to_string(codecType));
+            Throw<std::logic_error>("nodeobject codec: unknown=" + std::to_string(kCODEC_TYPE));
     };
     return result;
 }
@@ -286,14 +286,14 @@ nodeobject_compress(void const* in, std::size_t in_size, BufferFactory&& bf)
 //
 template <class = void>
 void
-filter_inner(void* in, std::size_t in_size)
+filterInner(void* in, std::size_t inSize)
 {
     using namespace nudb::detail;
 
     // Check for inner node
-    if (in_size == 525)
+    if (inSize == 525)
     {
-        istream is(in, in_size);
+        istream is(in, inSize);
         std::uint32_t index = 0;
         std::uint32_t unused = 0;
         std::uint8_t kind = 0;
@@ -302,12 +302,12 @@ filter_inner(void* in, std::size_t in_size)
         read<std::uint32_t>(is, unused);
         read<std::uint8_t>(is, kind);
         read<std::uint32_t>(is, prefix);
-        if (safe_cast<HashPrefix>(prefix) == HashPrefix::innerNode)
+        if (safeCast<HashPrefix>(prefix) == HashPrefix::InnerNode)
         {
             ostream os(in, 9);
             write<std::uint32_t>(os, 0);
             write<std::uint32_t>(os, 0);
-            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::hotUNKNOWN));
+            write<std::uint8_t>(os, static_cast<std::uint8_t>(NodeObjectType::Unknown));
         }
     }
 }
diff --git a/include/xrpl/nodestore/detail/varint.h b/include/xrpl/nodestore/detail/varint.h
index 7c2a3756ff..c98b36e322 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 max = (8 * sizeof(T) + 6) / 7;
+    static std::size_t constexpr kMAX = (8 * sizeof(T) + 6) / 7;
 };
 
 // Returns: Number of bytes consumed or 0 on error,
@@ -33,7 +33,7 @@ struct varint_traits<T, true>
 //
 template <class = void>
 std::size_t
-read_varint(void const* buf, std::size_t buflen, std::size_t& t)
+readVarint(void const* buf, std::size_t buflen, std::size_t& t)
 {
     if (buflen == 0)
         return 0;
@@ -69,7 +69,7 @@ read_varint(void const* buf, std::size_t buflen, std::size_t& t)
 
 template <class T, std::enable_if_t<std::is_unsigned_v<T>>* = nullptr>
 std::size_t
-size_varint(T v)
+sizeVarint(T v)
 {
     std::size_t n = 0;
     do
@@ -82,7 +82,7 @@ size_varint(T v)
 
 template <class = void>
 std::size_t
-write_varint(void* p0, std::size_t v)
+writeVarint(void* p0, std::size_t v)
 {
     // NOLINTNEXTLINE(misc-const-correctness)
     std::uint8_t* p = reinterpret_cast<std::uint8_t*>(p0);
@@ -107,7 +107,7 @@ read(nudb::detail::istream& is, std::size_t& u)
     auto p1 = p0;
     while (*p1++ & 0x80)
         is(1);
-    read_varint(p0, p1 - p0, u);
+    readVarint(p0, p1 - p0, u);
 }
 
 // output stream
@@ -116,7 +116,7 @@ template <class T, std::enable_if_t<std::is_same_v<T, varint>>* = nullptr>
 void
 write(nudb::detail::ostream& os, std::size_t t)
 {
-    write_varint(os.data(size_varint(t)), t);
+    writeVarint(os.data(sizeVarint(t)), t);
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/include/xrpl/protocol/AMMCore.h b/include/xrpl/protocol/AMMCore.h
index 7a835b44cd..9d8f8c62b0 100644
--- a/include/xrpl/protocol/AMMCore.h
+++ b/include/xrpl/protocol/AMMCore.h
@@ -8,21 +8,21 @@
 
 namespace xrpl {
 
-std::uint16_t constexpr TRADING_FEE_THRESHOLD = 1000;  // 1%
+std::uint16_t constexpr kTRADING_FEE_THRESHOLD = 1000;  // 1%
 
 // Auction slot
-std::uint32_t constexpr TOTAL_TIME_SLOT_SECS = 24 * 3600;
-std::uint16_t constexpr AUCTION_SLOT_TIME_INTERVALS = 20;
-std::uint16_t constexpr AUCTION_SLOT_MAX_AUTH_ACCOUNTS = 4;
-std::uint32_t constexpr AUCTION_SLOT_FEE_SCALE_FACTOR = 100000;
-std::uint32_t constexpr AUCTION_SLOT_DISCOUNTED_FEE_FRACTION = 10;
-std::uint32_t constexpr AUCTION_SLOT_MIN_FEE_FRACTION = 25;
-std::uint32_t constexpr AUCTION_SLOT_INTERVAL_DURATION =
-    TOTAL_TIME_SLOT_SECS / AUCTION_SLOT_TIME_INTERVALS;
+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;
 
 // Votes
-std::uint16_t constexpr VOTE_MAX_SLOTS = 8;
-std::uint32_t constexpr VOTE_WEIGHT_SCALE_FACTOR = 100000;
+std::uint16_t constexpr kVOTE_MAX_SLOTS = 8;
+std::uint32_t constexpr kVOTE_WEIGHT_SCALE_FACTOR = 100000;
 
 class STObject;
 class STAmount;
@@ -77,7 +77,7 @@ ammEnabled(Rules const&);
 inline Number
 getFee(std::uint16_t tfee)
 {
-    return Number{tfee} / AUCTION_SLOT_FEE_SCALE_FACTOR;
+    return Number{tfee} / kAUCTION_SLOT_FEE_SCALE_FACTOR;
 }
 
 /** Get fee multiplier (1 - tfee)
diff --git a/include/xrpl/protocol/AccountID.h b/include/xrpl/protocol/AccountID.h
index 641f2f15c1..e22c3b8edd 100644
--- a/include/xrpl/protocol/AccountID.h
+++ b/include/xrpl/protocol/AccountID.h
@@ -25,7 +25,7 @@ public:
 }  // namespace detail
 
 /** A 160-bit unsigned that uniquely identifies an account. */
-using AccountID = base_uint<160, detail::AccountIDTag>;
+using AccountID = BaseUint<160, detail::AccountIDTag>;
 
 /** Convert AccountID to base58 checked string */
 std::string
@@ -63,13 +63,13 @@ noAccount();
 */
 // DEPRECATED
 bool
-to_issuer(AccountID&, std::string const&);
+toIssuer(AccountID&, std::string const&);
 
 // DEPRECATED Should be checking the currency or native flag
 inline bool
 isXRP(AccountID const& c)
 {
-    return c == beast::zero;
+    return c == beast::kZERO;
 }
 
 // DEPRECATED
@@ -105,10 +105,10 @@ initAccountIdCache(std::size_t count);
 }  // namespace xrpl
 
 //------------------------------------------------------------------------------
-namespace Json {
+namespace json {
 template <>
 inline xrpl::AccountID
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
 
@@ -117,7 +117,7 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
         return *r;
     Throw<JsonTypeMismatchError>(field.getJsonName(), "AccountID");
 }
-}  // namespace Json
+}  // namespace json
 
 //------------------------------------------------------------------------------
 
diff --git a/include/xrpl/protocol/AmountConversions.h b/include/xrpl/protocol/AmountConversions.h
index 9fb45e7bf8..53b7dace3c 100644
--- a/include/xrpl/protocol/AmountConversions.h
+++ b/include/xrpl/protocol/AmountConversions.h
@@ -15,7 +15,7 @@ toSTAmount(IOUAmount const& iou, Asset const& asset)
     XRPL_ASSERT(asset.holds<Issue>(), "xrpl::toSTAmount : is Issue");
     bool const isNeg = iou.signum() < 0;
     std::uint64_t const umant = isNeg ? -iou.mantissa() : iou.mantissa();
-    return STAmount(asset, umant, iou.exponent(), isNeg, STAmount::unchecked());
+    return STAmount(asset, umant, iou.exponent(), isNeg, STAmount::Unchecked());
 }
 
 inline STAmount
@@ -96,9 +96,9 @@ inline MPTAmount
 toAmount<MPTAmount>(STAmount const& amt)
 {
     XRPL_ASSERT(
-        amt.holds<MPTIssue>() && amt.mantissa() <= maxMPTokenAmount && amt.exponent() == 0,
+        amt.holds<MPTIssue>() && amt.mantissa() <= kMAX_MP_TOKEN_AMOUNT && amt.exponent() == 0,
         "xrpl::toAmount<MPTAmount> : maximum mantissa");
-    if (amt.mantissa() > maxMPTokenAmount || amt.exponent() != 0)
+    if (amt.mantissa() > kMAX_MP_TOKEN_AMOUNT || 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();
@@ -141,9 +141,9 @@ toAmount<MPTAmount>(MPTAmount const& amt)
 
 template <typename T>
 T
-toAmount(Asset const& asset, Number const& n, Number::rounding_mode mode = Number::getround())
+toAmount(Asset const& asset, Number const& n, Number::RoundingMode mode = Number::getround())
 {
-    saveNumberRoundMode const rm(Number::getround());
+    SaveNumberRoundMode const rm(Number::getround());
     if (isXRP(asset))
         Number::setround(mode);
 
@@ -167,8 +167,8 @@ toAmount(Asset const& asset, Number const& n, Number::rounding_mode mode = Numbe
     }
     else
     {
-        constexpr bool alwaysFalse = !std::is_same_v<T, T>;
-        static_assert(alwaysFalse, "Unsupported type for toAmount");
+        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
+        static_assert(kALWAYS_FALSE, "Unsupported type for toAmount");
     }
 }
 
@@ -178,35 +178,35 @@ toMaxAmount(Asset const& asset)
 {
     if constexpr (std::is_same_v<IOUAmount, T>)
     {
-        return IOUAmount(STAmount::cMaxValue, STAmount::cMaxOffset);
+        return IOUAmount(STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
     }
     else if constexpr (std::is_same_v<XRPAmount, T>)
     {
-        return XRPAmount(static_cast<std::int64_t>(STAmount::cMaxNativeN));
+        return XRPAmount(static_cast<std::int64_t>(STAmount::kMAX_NATIVE_N));
     }
     else if constexpr (std::is_same_v<MPTAmount, T>)
     {
-        return MPTAmount(maxMPTokenAmount);
+        return MPTAmount(kMAX_MP_TOKEN_AMOUNT);
     }
     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::cMaxNativeN));
-                return STAmount(issue, STAmount::cMaxValue, STAmount::cMaxOffset);
+                    return STAmount(issue, static_cast<std::int64_t>(STAmount::kMAX_NATIVE_N));
+                return STAmount(issue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
             },
-            [](MPTIssue const& issue) { return STAmount(issue, maxMPTokenAmount); });
+            [](MPTIssue const& issue) { return STAmount(issue, kMAX_MP_TOKEN_AMOUNT); });
     }
     else
     {
-        constexpr bool alwaysFalse = !std::is_same_v<T, T>;
-        static_assert(alwaysFalse, "Unsupported type for toMaxAmount");
+        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
+        static_assert(kALWAYS_FALSE, "Unsupported type for toMaxAmount");
     }
 }
 
 inline STAmount
-toSTAmount(Asset const& asset, Number const& n, Number::rounding_mode mode = Number::getround())
+toSTAmount(Asset const& asset, Number const& n, Number::RoundingMode mode = Number::getround())
 {
     return toAmount<STAmount>(asset, n, mode);
 }
@@ -233,8 +233,8 @@ getAsset(T const& amt)
     }
     else
     {
-        constexpr bool alwaysFalse = !std::is_same_v<T, T>;
-        static_assert(alwaysFalse, "Unsupported type for getIssue");
+        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
+        static_assert(kALWAYS_FALSE, "Unsupported type for getIssue");
     }
 }
 
@@ -260,8 +260,8 @@ get(STAmount const& a)
     }
     else
     {
-        constexpr bool alwaysFalse = !std::is_same_v<T, T>;
-        static_assert(alwaysFalse, "Unsupported type for get");
+        constexpr bool kALWAYS_FALSE = !std::is_same_v<T, T>;
+        static_assert(kALWAYS_FALSE, "Unsupported type for get");
     }
 }
 
diff --git a/include/xrpl/protocol/ApiVersion.h b/include/xrpl/protocol/ApiVersion.h
index 653b4830bf..3399152363 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> apiVersion = {};
+constexpr static std::integral_constant<unsigned, Version> kAPI_VERSION = {};
 
-constexpr static auto apiInvalidVersion = apiVersion<0>;
-constexpr static auto apiMinimumSupportedVersion = apiVersion<1>;
-constexpr static auto apiMaximumSupportedVersion = apiVersion<2>;
-constexpr static auto apiVersionIfUnspecified = apiVersion<1>;
-constexpr static auto apiCommandLineVersion = apiVersion<1>;  // TODO Bump to 2 later
-constexpr static auto apiBetaVersion = apiVersion<3>;
-constexpr static auto apiMaximumValidVersion = apiBetaVersion;
+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_assert(apiInvalidVersion < apiMinimumSupportedVersion);
+static_assert(kAPI_INVALID_VERSION < kAPI_MINIMUM_SUPPORTED_VERSION);
 static_assert(
-    apiVersionIfUnspecified >= apiMinimumSupportedVersion &&
-    apiVersionIfUnspecified <= apiMaximumSupportedVersion);
+    kAPI_VERSION_IF_UNSPECIFIED >= kAPI_MINIMUM_SUPPORTED_VERSION &&
+    kAPI_VERSION_IF_UNSPECIFIED <= kAPI_MAXIMUM_SUPPORTED_VERSION);
 static_assert(
-    apiCommandLineVersion >= apiMinimumSupportedVersion &&
-    apiCommandLineVersion <= apiMaximumSupportedVersion);
-static_assert(apiMaximumSupportedVersion >= apiMinimumSupportedVersion);
-static_assert(apiBetaVersion >= apiMaximumSupportedVersion);
-static_assert(apiMaximumValidVersion >= apiMaximumSupportedVersion);
+    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);
 
 inline void
-setVersion(Json::Value& parent, unsigned int apiVersion, bool betaEnabled)
+setVersion(json::Value& parent, unsigned int apiVersion, bool betaEnabled)
 {
-    XRPL_ASSERT(apiVersion != apiInvalidVersion, "xrpl::RPC::setVersion : input is valid");
+    XRPL_ASSERT(apiVersion != kAPI_INVALID_VERSION, "xrpl::RPC::setVersion : input is valid");
 
-    auto& retObj = parent[jss::version] = Json::objectValue;
+    auto& retObj = parent[jss::version] = json::ObjectValue;
 
-    if (apiVersion == apiVersionIfUnspecified)
+    if (apiVersion == kAPI_VERSION_IF_UNSPECIFIED)
     {
         // API version numbers used in API version 1
-        static beast::SemanticVersion const firstVersion{"1.0.0"};
-        static beast::SemanticVersion const goodVersion{"1.0.0"};
-        static beast::SemanticVersion const lastVersion{"1.0.0"};
+        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"};
 
-        retObj[jss::first] = firstVersion.print();
-        retObj[jss::good] = goodVersion.print();
-        retObj[jss::last] = lastVersion.print();
+        retObj[jss::first] = kFIRST_VERSION.print();
+        retObj[jss::good] = kGOOD_VERSION.print();
+        retObj[jss::last] = kLAST_VERSION.print();
     }
     else
     {
-        retObj[jss::first] = apiMinimumSupportedVersion.value;
-        retObj[jss::last] = betaEnabled ? apiBetaVersion : apiMaximumSupportedVersion;
+        retObj[jss::first] = kAPI_MINIMUM_SUPPORTED_VERSION.value;
+        retObj[jss::last] = betaEnabled ? kAPI_BETA_VERSION : kAPI_MAXIMUM_SUPPORTED_VERSION;
     }
 }
 
@@ -96,11 +96,11 @@ setVersion(Json::Value& parent, unsigned int apiVersion, bool betaEnabled)
  * @return the api version number
  */
 inline unsigned int
-getAPIVersionNumber(Json::Value const& jv, bool betaEnabled)
+getAPIVersionNumber(json::Value const& jv, bool betaEnabled)
 {
-    static Json::Value const minVersion(RPC::apiMinimumSupportedVersion);
-    Json::Value const maxVersion(
-        betaEnabled ? RPC::apiBetaVersion : RPC::apiMaximumSupportedVersion);
+    static json::Value const kMIN_VERSION(RPC::kAPI_MINIMUM_SUPPORTED_VERSION);
+    json::Value const maxVersion(
+        betaEnabled ? RPC::kAPI_BETA_VERSION : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION);
 
     if (jv.isObject())
     {
@@ -109,52 +109,52 @@ getAPIVersionNumber(Json::Value const& jv, bool betaEnabled)
             auto const specifiedVersion = jv[jss::api_version];
             if (!specifiedVersion.isInt() && !specifiedVersion.isUInt())
             {
-                return RPC::apiInvalidVersion;
+                return RPC::kAPI_INVALID_VERSION;
             }
             auto const specifiedVersionInt = specifiedVersion.asInt();
-            if (specifiedVersionInt < minVersion || specifiedVersionInt > maxVersion)
+            if (specifiedVersionInt < kMIN_VERSION || specifiedVersionInt > maxVersion)
             {
-                return RPC::apiInvalidVersion;
+                return RPC::kAPI_INVALID_VERSION;
             }
             return specifiedVersionInt;
         }
     }
 
-    return RPC::apiVersionIfUnspecified;
+    return RPC::kAPI_VERSION_IF_UNSPECIFIED;
 }
 
 }  // namespace RPC
 
-template <unsigned minVer, unsigned maxVer, typename Fn, typename... Args>
+template <unsigned MinVer, unsigned MaxVer, typename Fn, typename... Args>
 void
 forApiVersions(Fn const& fn, Args&&... args)
-    requires                                        //
-    (maxVer >= minVer) &&                           //
-    (minVer >= RPC::apiMinimumSupportedVersion) &&  //
-    (RPC::apiMaximumValidVersion >= maxVer) && requires {
-        fn(std::integral_constant<unsigned int, minVer>{}, std::forward<Args>(args)...);
-        fn(std::integral_constant<unsigned int, maxVer>{}, std::forward<Args>(args)...);
+    requires                                            //
+    (MaxVer >= MinVer) &&                               //
+    (MinVer >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION) &&  //
+    (RPC::kAPI_MAXIMUM_VALID_VERSION >= 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 size = maxVer + 1 - minVer;
-    [&]<std::size_t... offset>(std::index_sequence<offset...>) {
+    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)...)),
+             std::integral_constant<unsigned int, MinVer + Offset>{}, std::forward<Args>(args)...)),
          ...);
         // NOLINTEND(bugprone-use-after-move)
-    }(std::make_index_sequence<size>{});
+    }(std::make_index_sequence<kSIZE>{});
 }
 
 template <typename Fn, typename... Args>
 void
 forAllApiVersions(Fn const& fn, Args&&... args)
     requires requires {
-        forApiVersions<RPC::apiMinimumSupportedVersion, RPC::apiMaximumValidVersion>(
+        forApiVersions<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>(
             fn, std::forward<Args>(args)...);
     }
 {
-    forApiVersions<RPC::apiMinimumSupportedVersion, RPC::apiMaximumValidVersion>(
+    forApiVersions<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>(
         fn, std::forward<Args>(args)...);
 }
 
diff --git a/include/xrpl/protocol/Asset.h b/include/xrpl/protocol/Asset.h
index 920e62f2c4..e0f4aa08a2 100644
--- a/include/xrpl/protocol/Asset.h
+++ b/include/xrpl/protocol/Asset.h
@@ -30,8 +30,8 @@ struct BadAsset
 inline BadAsset const&
 badAsset()
 {
-    static BadAsset const a;
-    return a;
+    static BadAsset const kA;
+    return kA;
 }
 
 /* Asset is an abstraction of three different issue types: XRP, IOU, MPT.
@@ -93,7 +93,7 @@ public:
     token() const;
 
     void
-    setJson(Json::Value& jv) const;
+    setJson(json::Value& jv) const;
 
     STAmount
     operator()(Number const&) const;
@@ -148,15 +148,15 @@ public:
 };
 
 template <ValidIssueType TIss>
-constexpr bool is_issue_v = std::is_same_v<TIss, Issue>;
+constexpr bool kIS_ISSUE_V = std::is_same_v<TIss, Issue>;
 
 template <ValidIssueType TIss>
-constexpr bool is_mptissue_v = std::is_same_v<TIss, MPTIssue>;
+constexpr bool kIS_MPTISSUE_V = std::is_same_v<TIss, MPTIssue>;
 
-inline Json::Value
-to_json(Asset const& asset)
+inline json::Value
+toJson(Asset const& asset)
 {
-    Json::Value jv;
+    json::Value jv;
     asset.setJson(jv);
     return jv;
 }
@@ -205,13 +205,13 @@ Asset::getAmountType() const
 {
     return visit(
         [&](Issue const& issue) -> Asset::AmtType {
-            constexpr AmountType<XRPAmount> xrp;
-            constexpr AmountType<IOUAmount> iou;
-            return native() ? AmtType(xrp) : AmtType(iou);
+            constexpr AmountType<XRPAmount> kXRP;
+            constexpr AmountType<IOUAmount> kIOU;
+            return native() ? AmtType(kXRP) : AmtType(kIOU);
         },
         [&](MPTIssue const& issue) -> Asset::AmtType {
-            constexpr AmountType<MPTAmount> mpt;
-            return AmtType(mpt);
+            constexpr AmountType<MPTAmount> kMPT;
+            return AmtType(kMPT);
         });
 }
 
@@ -237,12 +237,12 @@ constexpr std::weak_ordering
 operator<=>(Asset const& lhs, Asset const& rhs)
 {
     return std::visit(
-        []<ValidIssueType TLhs, ValidIssueType TRhs>(TLhs const& lhs_, TRhs const& rhs_) {
+        []<ValidIssueType TLhs, ValidIssueType TRhs>(TLhs const& lhs, TRhs const& rhs) {
             if constexpr (std::is_same_v<TLhs, TRhs>)
             {
-                return std::weak_ordering(lhs_ <=> rhs_);
+                return std::weak_ordering(lhs <=> rhs);
             }
-            else if constexpr (is_issue_v<TLhs> && is_mptissue_v<TRhs>)
+            else if constexpr (kIS_ISSUE_V<TLhs> && kIS_MPTISSUE_V<TRhs>)
             {
                 return std::weak_ordering::greater;
             }
@@ -303,10 +303,10 @@ std::string
 to_string(Asset const& asset);
 
 bool
-validJSONAsset(Json::Value const& jv);
+validJSONAsset(json::Value const& jv);
 
 Asset
-assetFromJson(Json::Value const& jv);
+assetFromJson(json::Value const& jv);
 
 inline bool
 isConsistent(Asset const& asset)
diff --git a/include/xrpl/protocol/Batch.h b/include/xrpl/protocol/Batch.h
index 91fb8e5a9d..fa7641af70 100644
--- a/include/xrpl/protocol/Batch.h
+++ b/include/xrpl/protocol/Batch.h
@@ -7,7 +7,7 @@ namespace xrpl {
 inline void
 serializeBatch(Serializer& msg, std::uint32_t const& flags, std::vector<uint256> const& txids)
 {
-    msg.add32(HashPrefix::batch);
+    msg.add32(HashPrefix::Batch);
     msg.add32(flags);
     msg.add32(std::uint32_t(txids.size()));
     for (auto const& txid : txids)
diff --git a/include/xrpl/protocol/Book.h b/include/xrpl/protocol/Book.h
index cda4daf603..fc36abddc4 100644
--- a/include/xrpl/protocol/Book.h
+++ b/include/xrpl/protocol/Book.h
@@ -21,8 +21,8 @@ public:
 
     Book() = default;
 
-    Book(Asset const& in_, Asset const& out_, std::optional<uint256> const& domain_)
-        : in(in_), out(out_), domain(domain_)
+    Book(Asset const& in, Asset const& out, std::optional<uint256> const& domain)
+        : in(in), out(out), domain(domain)
     {
     }
 };
@@ -140,8 +140,8 @@ private:
     using issue_hasher = std::hash<xrpl::Issue>;
     using mptissue_hasher = std::hash<xrpl::MPTIssue>;
 
-    issue_hasher m_issue_hasher;
-    mptissue_hasher m_mptissue_hasher;
+    issue_hasher m_issue_hasher_;
+    mptissue_hasher m_mptissue_hasher_;
 
 public:
     explicit hash() = default;
@@ -151,11 +151,11 @@ public:
     {
         return asset.visit(
             [&](xrpl::Issue const& issue) {
-                value_type const result(m_issue_hasher(issue));
+                value_type const result(m_issue_hasher_(issue));
                 return result;
             },
             [&](xrpl::MPTIssue const& issue) {
-                value_type const result(m_mptissue_hasher(issue));
+                value_type const result(m_mptissue_hasher_(issue));
                 return result;
             });
     }
@@ -170,8 +170,8 @@ private:
     using asset_hasher = std::hash<xrpl::Asset>;
     using uint256_hasher = xrpl::uint256::hasher;
 
-    asset_hasher m_asset_hasher;
-    uint256_hasher m_uint256_hasher;
+    asset_hasher issue_hasher_;
+    uint256_hasher uint256_hasher_;
 
 public:
     hash() = default;
@@ -182,11 +182,11 @@ public:
     value_type
     operator()(argument_type const& value) const
     {
-        value_type result(m_asset_hasher(value.in));
-        boost::hash_combine(result, m_asset_hasher(value.out));
+        value_type result(issue_hasher_(value.in));
+        boost::hash_combine(result, issue_hasher_(value.out));
 
         if (value.domain)
-            boost::hash_combine(result, m_uint256_hasher(*value.domain));
+            boost::hash_combine(result, uint256_hasher_(*value.domain));
 
         return result;
     }
diff --git a/include/xrpl/protocol/Concepts.h b/include/xrpl/protocol/Concepts.h
index 5f2eb3c7c8..e909aff805 100644
--- a/include/xrpl/protocol/Concepts.h
+++ b/include/xrpl/protocol/Concepts.h
@@ -59,7 +59,7 @@ struct CombineVisitors : Ts...
 // robust than class template argument deduction (CTAD) via the deduction guide.
 template <typename... Ts>
 constexpr CombineVisitors<std::decay_t<Ts>...>
-make_combine_visitors(Ts&&... ts)
+makeCombineVisitors(Ts&&... ts)
 {
     // std::decay_t<Ts> is used to remove references/constness from the lambda
     // types before they are passed as template arguments to the CombineVisitors
@@ -74,11 +74,11 @@ constexpr auto
 visit(Variant&& v, Visitors&&... visitors) -> decltype(auto)
 {
     // Use the function template helper instead of raw CTAD.
-    auto visitor_set = make_combine_visitors(std::forward<Visitors>(visitors)...);
+    auto visitorSet = makeCombineVisitors(std::forward<Visitors>(visitors)...);
 
     // Delegate to std::visit, perfectly forwarding the variant and the visitor
     // set.
-    return std::visit(visitor_set, std::forward<Variant>(v));
+    return std::visit(visitorSet, std::forward<Variant>(v));
 }
 
 }  // namespace detail
diff --git a/include/xrpl/protocol/ErrorCodes.h b/include/xrpl/protocol/ErrorCodes.h
index ed7f898312..a91adfc55a 100644
--- a/include/xrpl/protocol/ErrorCodes.h
+++ b/include/xrpl/protocol/ErrorCodes.h
@@ -19,131 +19,131 @@ namespace xrpl {
 // or repurpose error code values.
 // Protocol-wide, 50+ files
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum error_code_i {
+enum ErrorCodeI {
     // -1 represents codes not listed in this enumeration
-    rpcUNKNOWN = -1,
+    RpcUnknown = -1,
 
-    rpcSUCCESS = 0,
+    RpcSuccess = 0,
 
-    rpcBAD_SYNTAX = 1,
-    rpcJSON_RPC = 2,
-    rpcFORBIDDEN = 3,
+    RpcBadSyntax = 1,
+    RpcJsonRpc = 2,
+    RpcForbidden = 3,
 
-    rpcWRONG_NETWORK = 4,
+    RpcWrongNetwork = 4,
     // Misc failure
     // unused                  5,
-    rpcNO_PERMISSION = 6,
-    rpcNO_EVENTS = 7,
+    RpcNoPermission = 6,
+    RpcNoEvents = 7,
     // unused                  8,
-    rpcTOO_BUSY = 9,
-    rpcSLOW_DOWN = 10,
-    rpcHIGH_FEE = 11,
-    rpcNOT_ENABLED = 12,
-    rpcNOT_READY = 13,
-    rpcAMENDMENT_BLOCKED = 14,
+    RpcTooBusy = 9,
+    RpcSlowDown = 10,
+    RpcHighFee = 11,
+    RpcNotEnabled = 12,
+    RpcNotReady = 13,
+    RpcAmendmentBlocked = 14,
 
     // Networking
-    rpcNO_CLOSED = 15,
-    rpcNO_CURRENT = 16,
-    rpcNO_NETWORK = 17,
-    rpcNOT_SYNCED = 18,
+    RpcNoClosed = 15,
+    RpcNoCurrent = 16,
+    RpcNoNetwork = 17,
+    RpcNotSynced = 18,
 
     // Ledger state
-    rpcACT_NOT_FOUND = 19,
+    RpcActNotFound = 19,
     // unused                  20,
-    rpcLGR_NOT_FOUND = 21,
-    rpcLGR_NOT_VALIDATED = 22,
-    rpcMASTER_DISABLED = 23,
+    RpcLgrNotFound = 21,
+    RpcLgrNotValidated = 22,
+    RpcMasterDisabled = 23,
     // unused                  24,
     // unused                  25,
     // unused                  26,
     // unused                  27,
     // unused                  28,
-    rpcTXN_NOT_FOUND = 29,
-    rpcINVALID_HOTWALLET = 30,
+    RpcTxnNotFound = 29,
+    RpcInvalidHotwallet = 30,
 
     // Malformed command
-    rpcINVALID_PARAMS = 31,
-    rpcUNKNOWN_COMMAND = 32,
-    rpcNO_PF_REQUEST = 33,
+    RpcInvalidParams = 31,
+    RpcUnknownCommand = 32,
+    RpcNoPfRequest = 33,
 
     // Bad parameter
     // NOT USED DO NOT USE AGAIN rpcACT_BITCOIN = 34,
-    rpcACT_MALFORMED = 35,
-    rpcALREADY_MULTISIG = 36,
-    rpcALREADY_SINGLE_SIG = 37,
+    RpcActMalformed = 35,
+    RpcAlreadyMultisig = 36,
+    RpcAlreadySingleSig = 37,
     // unused                  38,
     // unused                  39,
-    rpcBAD_FEATURE = 40,
-    rpcBAD_ISSUER = 41,
-    rpcBAD_MARKET = 42,
-    rpcBAD_SECRET = 43,
-    rpcBAD_SEED = 44,
-    rpcCHANNEL_MALFORMED = 45,
-    rpcCHANNEL_AMT_MALFORMED = 46,
-    rpcCOMMAND_MISSING = 47,
-    rpcDST_ACT_MALFORMED = 48,
-    rpcDST_ACT_MISSING = 49,
-    rpcDST_ACT_NOT_FOUND = 50,
-    rpcDST_AMT_MALFORMED = 51,
-    rpcDST_AMT_MISSING = 52,
-    rpcDST_ISR_MALFORMED = 53,
+    RpcBadFeature = 40,
+    RpcBadIssuer = 41,
+    RpcBadMarket = 42,
+    RpcBadSecret = 43,
+    RpcBadSeed = 44,
+    RpcChannelMalformed = 45,
+    RpcChannelAmtMalformed = 46,
+    RpcCommandMissing = 47,
+    RpcDstActMalformed = 48,
+    RpcDstActMissing = 49,
+    RpcDstActNotFound = 50,
+    RpcDstAmtMalformed = 51,
+    RpcDstAmtMissing = 52,
+    RpcDstIsrMalformed = 53,
     // unused                  54,
     // unused                  55,
     // unused                  56,
-    rpcLGR_IDXS_INVALID = 57,
-    rpcLGR_IDX_MALFORMED = 58,
+    RpcLgrIdxsInvalid = 57,
+    RpcLgrIdxMalformed = 58,
     // unused                  59,
     // unused                  60,
     // unused                  61,
-    rpcPUBLIC_MALFORMED = 62,
-    rpcSIGNING_MALFORMED = 63,
-    rpcSENDMAX_MALFORMED = 64,
-    rpcSRC_ACT_MALFORMED = 65,
-    rpcSRC_ACT_MISSING = 66,
-    rpcSRC_ACT_NOT_FOUND = 67,
-    rpcDELEGATE_ACT_NOT_FOUND = 68,
-    rpcSRC_CUR_MALFORMED = 69,
-    rpcSRC_ISR_MALFORMED = 70,
-    rpcSTREAM_MALFORMED = 71,
-    rpcATX_DEPRECATED = 72,
+    RpcPublicMalformed = 62,
+    RpcSigningMalformed = 63,
+    RpcSendmaxMalformed = 64,
+    RpcSrcActMalformed = 65,
+    RpcSrcActMissing = 66,
+    RpcSrcActNotFound = 67,
+    RpcDelegateActNotFound = 68,
+    RpcSrcCurMalformed = 69,
+    RpcSrcIsrMalformed = 70,
+    RpcStreamMalformed = 71,
+    RpcAtxDeprecated = 72,
 
     // Internal error (should never happen)
-    rpcINTERNAL = 73,  // Generic internal error.
-    rpcNOT_IMPL = 74,
-    rpcNOT_SUPPORTED = 75,
-    rpcBAD_KEY_TYPE = 76,
-    rpcDB_DESERIALIZATION = 77,
-    rpcEXCESSIVE_LGR_RANGE = 78,
-    rpcINVALID_LGR_RANGE = 79,
-    rpcEXPIRED_VALIDATOR_LIST = 80,
+    RpcInternal = 73,  // Generic internal error.
+    RpcNotImpl = 74,
+    RpcNotSupported = 75,
+    RpcBadKeyType = 76,
+    RpcDbDeserialization = 77,
+    RpcExcessiveLgrRange = 78,
+    RpcInvalidLgrRange = 79,
+    RpcExpiredValidatorList = 80,
 
     // unused = 90,
     // DEPRECATED. New code must not use this value.
-    rpcREPORTING_UNSUPPORTED = 91,
+    RpcReportingUnsupported = 91,
 
-    rpcOBJECT_NOT_FOUND = 92,
+    RpcObjectNotFound = 92,
 
     // AMM
-    rpcISSUE_MALFORMED = 93,
+    RpcIssueMalformed = 93,
 
     // Oracle
-    rpcORACLE_MALFORMED = 94,
+    RpcOracleMalformed = 94,
 
     // deposit_authorized + credentials
-    rpcBAD_CREDENTIALS = 95,
+    RpcBadCredentials = 95,
 
     // Simulate
-    rpcTX_SIGNED = 96,
+    RpcTxSigned = 96,
 
     // Pathfinding
-    rpcDOMAIN_MALFORMED = 97,
+    RpcDomainMalformed = 97,
 
     // ledger_entry
-    rpcENTRY_NOT_FOUND = 98,
-    rpcUNEXPECTED_LEDGER_TYPE = 99,
+    RpcEntryNotFound = 98,
+    RpcUnexpectedLedgerType = 99,
 
-    rpcLAST = rpcUNEXPECTED_LEDGER_TYPE  // rpcLAST should always equal the last code.
+    RpcLast = RpcUnexpectedLedgerType  // rpcLAST should always equal the last code.
 };
 
 /** Codes returned in the `warnings` array of certain RPC commands.
@@ -152,13 +152,13 @@ enum error_code_i {
 */
 // Protocol-wide, 50+ files
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum warning_code_i {
-    warnRPC_UNSUPPORTED_MAJORITY = 1001,
-    warnRPC_AMENDMENT_BLOCKED = 1002,
-    warnRPC_EXPIRED_VALIDATOR_LIST = 1003,
+enum WarningCodeI {
+    WarnRpcUnsupportedMajority = 1001,
+    WarnRpcAmendmentBlocked = 1002,
+    WarnRpcExpiredValidatorList = 1003,
     // unused = 1004
-    warnRPC_FIELDS_DEPRECATED = 2004,  // xrpld needs to maintain
-                                       // compatibility with Clio on this code.
+    WarnRpcFieldsDeprecated = 2004,  // xrpld needs to maintain
+                                     // compatibility with Clio on this code.
 };
 
 //------------------------------------------------------------------------------
@@ -172,163 +172,159 @@ struct ErrorInfo
 {
     // Default ctor needed to produce an empty std::array during constexpr eval.
     constexpr ErrorInfo()
-        : code(rpcUNKNOWN), token("unknown"), message("An unknown error code."), http_status(200)
+        : code(RpcUnknown), token("unknown"), message("An unknown error code."), http_status(200)
     {
     }
 
-    constexpr ErrorInfo(error_code_i code_, char const* token_, char const* message_)
-        : code(code_), token(token_), message(message_), http_status(200)
+    constexpr ErrorInfo(ErrorCodeI code, char const* token, char const* message)
+        : code(code), token(token), message(message), http_status(200)
     {
     }
 
-    constexpr ErrorInfo(
-        error_code_i code_,
-        char const* token_,
-        char const* message_,
-        int http_status_)
-        : code(code_), token(token_), message(message_), http_status(http_status_)
+    constexpr ErrorInfo(ErrorCodeI code, char const* token, char const* message, int httpStatus)
+        : code(code), token(token), message(message), http_status(httpStatus)
     {
     }
 
-    error_code_i code;
-    Json::StaticString token;
-    Json::StaticString message;
+    ErrorCodeI code;
+    json::StaticString token;
+    json::StaticString message;
     int http_status;
 };
 
 /** Returns an ErrorInfo that reflects the error code. */
 ErrorInfo const&
-get_error_info(error_code_i code);
+getErrorInfo(ErrorCodeI code);
 
 /** Add or update the json update to reflect the error code. */
 /** @{ */
 void
-inject_error(error_code_i code, Json::Value& json);
+injectError(ErrorCodeI code, json::Value& json);
 
 void
-inject_error(error_code_i code, std::string const& message, Json::Value& json);
+injectError(ErrorCodeI code, std::string const& message, json::Value& json);
 /** @} */
 
 /** Returns a new json object that reflects the error code. */
 /** @{ */
-Json::Value
-make_error(error_code_i code);
-Json::Value
-make_error(error_code_i code, std::string const& message);
+json::Value
+makeError(ErrorCodeI code);
+json::Value
+makeError(ErrorCodeI code, std::string const& message);
 /** @} */
 
 /** Returns a new json object that indicates invalid parameters. */
 /** @{ */
-inline Json::Value
-make_param_error(std::string const& message)
+inline json::Value
+makeParamError(std::string const& message)
 {
-    return make_error(rpcINVALID_PARAMS, message);
+    return makeError(RpcInvalidParams, message);
 }
 
 inline std::string
-missing_field_message(std::string const& name)
+missingFieldMessage(std::string const& name)
 {
     return "Missing field '" + name + "'.";
 }
 
-inline Json::Value
-missing_field_error(std::string const& name)
+inline json::Value
+missingFieldError(std::string const& name)
 {
-    return make_param_error(missing_field_message(name));
+    return makeParamError(missingFieldMessage(name));
 }
 
-inline Json::Value
-missing_field_error(Json::StaticString name)
+inline json::Value
+missingFieldError(json::StaticString name)
 {
-    return missing_field_error(std::string(name));
+    return missingFieldError(std::string(name));
 }
 
 inline std::string
-object_field_message(std::string const& name)
+objectFieldMessage(std::string const& name)
 {
     return "Invalid field '" + name + "', not object.";
 }
 
-inline Json::Value
-object_field_error(std::string const& name)
+inline json::Value
+objectFieldError(std::string const& name)
 {
-    return make_param_error(object_field_message(name));
+    return makeParamError(objectFieldMessage(name));
 }
 
-inline Json::Value
-object_field_error(Json::StaticString name)
+inline json::Value
+objectFieldError(json::StaticString name)
 {
-    return object_field_error(std::string(name));
+    return objectFieldError(std::string(name));
 }
 
 inline std::string
-invalid_field_message(std::string const& name)
+invalidFieldMessage(std::string const& name)
 {
     return "Invalid field '" + name + "'.";
 }
 
 inline std::string
-invalid_field_message(Json::StaticString name)
+invalidFieldMessage(json::StaticString name)
 {
-    return invalid_field_message(std::string(name));
+    return invalidFieldMessage(std::string(name));
 }
 
-inline Json::Value
-invalid_field_error(std::string const& name)
+inline json::Value
+invalidFieldError(std::string const& name)
 {
-    return make_param_error(invalid_field_message(name));
+    return makeParamError(invalidFieldMessage(name));
 }
 
-inline Json::Value
-invalid_field_error(Json::StaticString name)
+inline json::Value
+invalidFieldError(json::StaticString name)
 {
-    return invalid_field_error(std::string(name));
+    return invalidFieldError(std::string(name));
 }
 
 inline std::string
-expected_field_message(std::string const& name, std::string const& type)
+expectedFieldMessage(std::string const& name, std::string const& type)
 {
     return "Invalid field '" + name + "', not " + type + ".";
 }
 
 inline std::string
-expected_field_message(Json::StaticString name, std::string const& type)
+expectedFieldMessage(json::StaticString name, std::string const& type)
 {
-    return expected_field_message(std::string(name), type);
+    return expectedFieldMessage(std::string(name), type);
 }
 
-inline Json::Value
-expected_field_error(std::string const& name, std::string const& type)
+inline json::Value
+expectedFieldError(std::string const& name, std::string const& type)
 {
-    return make_param_error(expected_field_message(name, type));
+    return makeParamError(expectedFieldMessage(name, type));
 }
 
-inline Json::Value
-expected_field_error(Json::StaticString name, std::string const& type)
+inline json::Value
+expectedFieldError(json::StaticString name, std::string const& type)
 {
-    return expected_field_error(std::string(name), type);
+    return expectedFieldError(std::string(name), type);
 }
 
-inline Json::Value
-not_validator_error()
+inline json::Value
+notValidatorError()
 {
-    return make_param_error("not a validator");
+    return makeParamError("not a validator");
 }
 
 /** @} */
 
 /** Returns `true` if the json contains an rpc error specification. */
 bool
-contains_error(Json::Value const& json);
+containsError(json::Value const& json);
 
 /** Returns http status that corresponds to the error code. */
 int
-error_code_http_status(error_code_i code);
+errorCodeHttpStatus(ErrorCodeI code);
 
 }  // namespace RPC
 
 /** Returns a single string with the contents of an RPC error. */
 std::string
-rpcErrorString(Json::Value const& jv);
+rpcErrorString(json::Value const& jv);
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h
index 8f96935ca1..281e598bf7 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 maxFeatureNameSize = 63;
+static constexpr std::size_t kMAX_FEATURE_NAME_SIZE = 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 reservedFeatureNameSize = 32;
+static constexpr std::size_t kRESERVED_FEATURE_NAME_SIZE = 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
@@ -79,27 +79,27 @@ static constexpr std::size_t reservedFeatureNameSize = 32;
 consteval auto
 validFeatureNameSize(auto fn) -> bool
 {
-    constexpr char const* n = fn();
+    constexpr char const* kN = fn();
     // Note, std::strlen is not constexpr, we need to implement our own here.
-    constexpr std::size_t N = [](auto n) {
+    constexpr std::size_t kLEN = [](auto n) {
         std::size_t ret = 0;
         for (auto ptr = n; *ptr != '\0'; ret++, ++ptr)
             ;
         return ret;
-    }(n);
-    return N != reservedFeatureNameSize &&  //
-        N <= maxFeatureNameSize;
+    }(kN);
+    return kLEN != kRESERVED_FEATURE_NAME_SIZE &&  //
+        kLEN <= kMAX_FEATURE_NAME_SIZE;
 }
 
 consteval auto
 validFeatureName(auto fn) -> bool
 {
-    constexpr char const* n = fn();
+    constexpr char const* kN = fn();
     // Prevent the use of visually confusable characters and enforce that feature names
     // are always valid ASCII. This is needed because C++ allows Unicode identifiers.
     // Characters below 0x20 are nonprintable control characters, and characters with the 0x80 bit
     // set are non-ASCII (e.g. UTF-8 encoding of Unicode), so both are disallowed.
-    for (auto ptr = n; *ptr != '\0'; ++ptr)
+    for (auto ptr = kN; *ptr != '\0'; ++ptr)
     {
         if (*ptr & 0x80 || *ptr < 0x20)
             return false;
@@ -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 numFeatures =
+static constexpr std::size_t kNUM_FEATURES =
     (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::numFeatures>
+class FeatureBitset : private std::bitset<detail::kNUM_FEATURES>
 {
-    using base = std::bitset<detail::numFeatures>;
+    using base = std::bitset<detail::kNUM_FEATURES>;
 
     template <class... Fs>
     void
diff --git a/include/xrpl/protocol/Fees.h b/include/xrpl/protocol/Fees.h
index 6c398735ad..c94ba31b8a 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 FEE_UNITS_DEPRECATED = 10;
+inline constexpr std::uint32_t kFEE_UNITS_DEPRECATED = 10;
 
 /** Reflects the fee settings for a particular ledger.
 
@@ -29,8 +29,8 @@ struct Fees
     Fees&
     operator=(Fees const&) = default;
 
-    Fees(XRPAmount base_, XRPAmount reserve_, XRPAmount increment_)
-        : base(base_), reserve(reserve_), increment(increment_)
+    Fees(XRPAmount base, XRPAmount reserve, XRPAmount increment)
+        : base(base), reserve(reserve), increment(increment)
     {
     }
 
diff --git a/include/xrpl/protocol/HashPrefix.h b/include/xrpl/protocol/HashPrefix.h
index 305b4bfd49..1b05d450a1 100644
--- a/include/xrpl/protocol/HashPrefix.h
+++ b/include/xrpl/protocol/HashPrefix.h
@@ -9,7 +9,7 @@ namespace xrpl {
 namespace detail {
 
 constexpr std::uint32_t
-make_hash_prefix(char a, char b, char c)
+makeHashPrefix(char a, char b, char c)
 {
     return (static_cast<std::uint32_t>(a) << 24) + (static_cast<std::uint32_t>(b) << 16) +
         (static_cast<std::uint32_t>(c) << 8);
@@ -33,40 +33,40 @@ make_hash_prefix(char a, char b, char c)
 */
 enum class HashPrefix : std::uint32_t {
     /** transaction plus signature to give transaction ID */
-    transactionID = detail::make_hash_prefix('T', 'X', 'N'),
+    TransactionId = detail::makeHashPrefix('T', 'X', 'N'),
 
     /** transaction plus metadata */
-    txNode = detail::make_hash_prefix('S', 'N', 'D'),
+    TxNode = detail::makeHashPrefix('S', 'N', 'D'),
 
     /** account state */
-    leafNode = detail::make_hash_prefix('M', 'L', 'N'),
+    LeafNode = detail::makeHashPrefix('M', 'L', 'N'),
 
     /** inner node in V1 tree */
-    innerNode = detail::make_hash_prefix('M', 'I', 'N'),
+    InnerNode = detail::makeHashPrefix('M', 'I', 'N'),
 
     /** ledger master data for signing */
-    ledgerMaster = detail::make_hash_prefix('L', 'W', 'R'),
+    LedgerMaster = detail::makeHashPrefix('L', 'W', 'R'),
 
     /** inner transaction to sign */
-    txSign = detail::make_hash_prefix('S', 'T', 'X'),
+    TxSign = detail::makeHashPrefix('S', 'T', 'X'),
 
     /** inner transaction to multi-sign */
-    txMultiSign = detail::make_hash_prefix('S', 'M', 'T'),
+    TxMultiSign = detail::makeHashPrefix('S', 'M', 'T'),
 
     /** validation for signing */
-    validation = detail::make_hash_prefix('V', 'A', 'L'),
+    Validation = detail::makeHashPrefix('V', 'A', 'L'),
 
     /** proposal for signing */
-    proposal = detail::make_hash_prefix('P', 'R', 'P'),
+    Proposal = detail::makeHashPrefix('P', 'R', 'P'),
 
     /** Manifest */
-    manifest = detail::make_hash_prefix('M', 'A', 'N'),
+    Manifest = detail::makeHashPrefix('M', 'A', 'N'),
 
     /** Payment Channel Claim */
-    paymentChannelClaim = detail::make_hash_prefix('C', 'L', 'M'),
+    PaymentChannelClaim = detail::makeHashPrefix('C', 'L', 'M'),
 
     /** Batch */
-    batch = detail::make_hash_prefix('B', 'C', 'H'),
+    Batch = detail::makeHashPrefix('B', 'C', 'H'),
 };
 
 template <class Hasher>
diff --git a/include/xrpl/protocol/IOUAmount.h b/include/xrpl/protocol/IOUAmount.h
index 1654a357f1..6ce773fabd 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::zero;
+    *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 f4dd5e6816..14e7d95e23 100644
--- a/include/xrpl/protocol/Indexes.h
+++ b/include/xrpl/protocol/Indexes.h
@@ -75,14 +75,14 @@ Keylet const&
 negativeUNL() noexcept;
 
 /** The beginning of an order book */
-struct book_t
+struct BookT
 {
-    explicit book_t() = default;
+    explicit BookT() = default;
 
     Keylet
     operator()(Book const& b) const;
 };
-static book_t const book{};
+static BookT const kBOOK{};
 
 /** The index of a trust line for a given currency
 
@@ -119,19 +119,19 @@ Keylet
 quality(Keylet const& k, std::uint64_t q) noexcept;
 
 /** The directory for the next lower quality */
-struct next_t
+struct NextT
 {
-    explicit next_t() = default;
+    explicit NextT() = default;
 
     Keylet
     operator()(Keylet const& k) const;
 };
-static next_t const next{};
+static NextT const kNEXT{};
 
 /** A ticket belonging to an account */
-struct ticket_t
+struct TicketT
 {
-    explicit ticket_t() = default;
+    explicit TicketT() = default;
 
     Keylet
     operator()(AccountID const& id, std::uint32_t ticketSeq) const;
@@ -145,7 +145,7 @@ struct ticket_t
         return {ltTICKET, key};
     }
 };
-static ticket_t const ticket{};
+static TicketT const kTICKET{};
 
 /** A SignerList */
 Keylet
@@ -221,11 +221,11 @@ payChan(AccountID const& src, AccountID const& dst, std::uint32_t seq) noexcept;
 /** @{ */
 /** A keylet for the owner's first possible NFT page. */
 Keylet
-nftpage_min(AccountID const& owner);
+nftpageMin(AccountID const& owner);
 
 /** A keylet for the owner's last possible NFT page. */
 Keylet
-nftpage_max(AccountID const& owner);
+nftpageMax(AccountID const& owner);
 
 Keylet
 nftpage(Keylet const& k, uint256 const& token);
@@ -243,11 +243,11 @@ nftoffer(uint256 const& offer)
 
 /** The directory of buy offers for the specified NFT */
 Keylet
-nft_buys(uint256 const& id) noexcept;
+nftBuys(uint256 const& id) noexcept;
 
 /** The directory of sell offers for the specified NFT */
 Keylet
-nft_sells(uint256 const& id) noexcept;
+nftSells(uint256 const& id) noexcept;
 
 /** AMM entry */
 Keylet
@@ -362,25 +362,25 @@ getTicketIndex(AccountID const& account, std::uint32_t uSequence);
 uint256
 getTicketIndex(AccountID const& account, SeqProxy ticketSeq);
 
-template <class... keyletParams>
+template <class... KeyletParams>
 // NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
-struct keyletDesc
+struct KeyletDesc
 {
-    std::function<Keylet(keyletParams...)> function;
-    Json::StaticString expectedLEName;
+    std::function<Keylet(KeyletParams...)> function;
+    json::StaticString expectedLEName;
     bool includeInTests{};
 };
 
 // This list should include all of the keylet functions that take a single
 // AccountID parameter.
-std::array<keyletDesc<AccountID const&>, 6> const directAccountKeylets{
+std::array<KeyletDesc<AccountID const&>, 6> const kDIRECT_ACCOUNT_KEYLETS{
     {{.function = &keylet::account, .expectedLEName = jss::AccountRoot, .includeInTests = false},
      {.function = &keylet::ownerDir, .expectedLEName = jss::DirectoryNode, .includeInTests = true},
      {.function = &keylet::signers, .expectedLEName = jss::SignerList, .includeInTests = true},
      // It's normally impossible to create an item at nftpage_min, but
      // test it anyway, since the invariant checks for it.
-     {.function = &keylet::nftpage_min, .expectedLEName = jss::NFTokenPage, .includeInTests = true},
-     {.function = &keylet::nftpage_max, .expectedLEName = jss::NFTokenPage, .includeInTests = true},
+     {.function = &keylet::nftpageMin, .expectedLEName = jss::NFTokenPage, .includeInTests = true},
+     {.function = &keylet::nftpageMax, .expectedLEName = jss::NFTokenPage, .includeInTests = true},
      {.function = &keylet::did, .expectedLEName = jss::DID, .includeInTests = true}}};
 
 MPTID
diff --git a/include/xrpl/protocol/Issue.h b/include/xrpl/protocol/Issue.h
index fa9c4ebd1f..3b74b9132a 100644
--- a/include/xrpl/protocol/Issue.h
+++ b/include/xrpl/protocol/Issue.h
@@ -31,7 +31,7 @@ public:
     getText() const;
 
     void
-    setJson(Json::Value& jv) const;
+    setJson(json::Value& jv) const;
 
     [[nodiscard]] bool
     native() const;
@@ -49,11 +49,11 @@ isConsistent(Issue const& ac);
 std::string
 to_string(Issue const& ac);
 
-Json::Value
-to_json(Issue const& is);
+json::Value
+toJson(Issue const& is);
 
 Issue
-issueFromJson(Json::Value const& v);
+issueFromJson(json::Value const& v);
 
 std::ostream&
 operator<<(std::ostream& os, Issue const& x);
@@ -96,16 +96,16 @@ operator<=>(Issue const& lhs, Issue const& rhs)
 inline Issue const&
 xrpIssue()
 {
-    static Issue const issue{xrpCurrency(), xrpAccount()};
-    return issue;
+    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 issue{noCurrency(), noAccount()};
-    return issue;
+    static Issue const kISSUE{noCurrency(), noAccount()};
+    return kISSUE;
 }
 
 inline bool
diff --git a/include/xrpl/protocol/KeyType.h b/include/xrpl/protocol/KeyType.h
index d05e421e4b..c709eb897a 100644
--- a/include/xrpl/protocol/KeyType.h
+++ b/include/xrpl/protocol/KeyType.h
@@ -6,18 +6,18 @@
 namespace xrpl {
 
 enum class KeyType {
-    secp256k1 = 0,
-    ed25519 = 1,
+    Secp256k1 = 0,
+    Ed25519 = 1,
 };
 
 inline std::optional<KeyType>
 keyTypeFromString(std::string const& s)
 {
     if (s == "secp256k1")
-        return KeyType::secp256k1;
+        return KeyType::Secp256k1;
 
     if (s == "ed25519")
-        return KeyType::ed25519;
+        return KeyType::Ed25519;
 
     return {};
 }
@@ -25,10 +25,10 @@ keyTypeFromString(std::string const& s)
 inline char const*
 to_string(KeyType type)
 {
-    if (type == KeyType::secp256k1)
+    if (type == KeyType::Secp256k1)
         return "secp256k1";
 
-    if (type == KeyType::ed25519)
+    if (type == KeyType::Ed25519)
         return "ed25519";
 
     return "INVALID";
diff --git a/include/xrpl/protocol/Keylet.h b/include/xrpl/protocol/Keylet.h
index 6795516795..19704e2a11 100644
--- a/include/xrpl/protocol/Keylet.h
+++ b/include/xrpl/protocol/Keylet.h
@@ -20,7 +20,7 @@ struct Keylet
     uint256 key;
     LedgerEntryType type;
 
-    Keylet(LedgerEntryType type_, uint256 const& key_) : key(key_), type(type_)
+    Keylet(LedgerEntryType type, uint256 const& key) : key(key), type(type)
     {
     }
 
diff --git a/include/xrpl/protocol/KnownFormats.h b/include/xrpl/protocol/KnownFormats.h
index 12d900572f..9aa914ba97 100644
--- a/include/xrpl/protocol/KnownFormats.h
+++ b/include/xrpl/protocol/KnownFormats.h
@@ -75,7 +75,7 @@ public:
         Derived classes will load the object with all the known formats.
     */
 private:
-    KnownFormats() : name_(beast::type_name<Derived>())
+    KnownFormats() : name_(beast::typeName<Derived>())
     {
     }
 
@@ -159,7 +159,7 @@ protected:
     {
         if (auto const item = findByType(type))
         {
-            LogicError(
+            logicError(
                 std::string("Duplicate key for item '") + name + "': already maps to " +
                 item->getName());
         }
diff --git a/include/xrpl/protocol/LedgerFormats.h b/include/xrpl/protocol/LedgerFormats.h
index 77ef9fcf1d..99d5d818f1 100644
--- a/include/xrpl/protocol/LedgerFormats.h
+++ b/include/xrpl/protocol/LedgerFormats.h
@@ -1,5 +1,7 @@
 #pragma once
 
+// NOLINTBEGIN(readability-identifier-naming)
+
 #include <xrpl/protocol/KnownFormats.h>
 
 #include <map>
@@ -298,3 +300,5 @@ public:
 };
 
 }  // namespace xrpl
+
+// NOLINTEND(readability-identifier-naming)
diff --git a/include/xrpl/protocol/LedgerHeader.h b/include/xrpl/protocol/LedgerHeader.h
index 1035e5e892..68dd5e24b9 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::zero;
-    uint256 txHash = beast::zero;
-    uint256 accountHash = beast::zero;
-    uint256 parentHash = beast::zero;
+    uint256 hash = beast::kZERO;
+    uint256 txHash = beast::kZERO;
+    uint256 accountHash = beast::kZERO;
+    uint256 parentHash = beast::kZERO;
 
-    XRPAmount drops = beast::zero;
+    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 sLCF_NoConsensusTime = 0x01;
+static std::uint32_t const kS_LCF_NO_CONSENSUS_TIME = 0x01;
 
 inline bool
 getCloseAgree(LedgerHeader const& info)
 {
-    return (info.closeFlags & sLCF_NoConsensusTime) == 0;
+    return (info.closeFlags & kS_LCF_NO_CONSENSUS_TIME) == 0;
 }
 
 void
diff --git a/include/xrpl/protocol/MPTAmount.h b/include/xrpl/protocol/MPTAmount.h
index 9d0e0901bf..b4907774d2 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::zero;
+    *this = beast::kZERO;
 }
 
 constexpr MPTAmount&
diff --git a/include/xrpl/protocol/MPTIssue.h b/include/xrpl/protocol/MPTIssue.h
index c467382f07..f55029f50d 100644
--- a/include/xrpl/protocol/MPTIssue.h
+++ b/include/xrpl/protocol/MPTIssue.h
@@ -39,7 +39,7 @@ public:
     getText() const;
 
     void
-    setJson(Json::Value& jv) const;
+    setJson(json::Value& jv) const;
 
     friend constexpr bool
     operator==(MPTIssue const& lhs, MPTIssue const& rhs);
@@ -102,15 +102,15 @@ getMPTIssuer(MPTID&&) = delete;
 inline MPTID
 noMPT()
 {
-    static MPTIssue const mpt{0, noAccount()};
-    return mpt.getMptID();
+    static MPTIssue const kMPT{0, noAccount()};
+    return kMPT.getMptID();
 }
 
 inline MPTID
 badMPT()
 {
-    static MPTIssue const mpt{0, xrpAccount()};
-    return mpt.getMptID();
+    static MPTIssue const kMPT{0, xrpAccount()};
+    return kMPT.getMptID();
 }
 
 template <class Hasher>
@@ -121,14 +121,14 @@ hash_append(Hasher& h, MPTIssue const& r)
     hash_append(h, r.getMptID());
 }
 
-Json::Value
-to_json(MPTIssue const& mptIssue);
+json::Value
+toJson(MPTIssue const& mptIssue);
 
 std::string
 to_string(MPTIssue const& mptIssue);
 
 MPTIssue
-mptIssueFromJson(Json::Value const& jv);
+mptIssueFromJson(json::Value const& jv);
 
 std::ostream&
 operator<<(std::ostream& os, MPTIssue const& x);
diff --git a/include/xrpl/protocol/MultiApiJson.h b/include/xrpl/protocol/MultiApiJson.h
index 6b0c799a56..5a7dfcd731 100644
--- a/include/xrpl/protocol/MultiApiJson.h
+++ b/include/xrpl/protocol/MultiApiJson.h
@@ -15,16 +15,16 @@ namespace xrpl {
 
 namespace detail {
 template <typename T>
-constexpr bool is_integral_constant = false;
+constexpr bool kIS_INTEGRAL_CONSTANT = false;
 template <typename I, auto A>
-constexpr bool is_integral_constant<std::integral_constant<I, A>&> = true;
+constexpr bool kIS_INTEGRAL_CONSTANT<std::integral_constant<I, A>&> = true;
 template <typename I, auto A>
-constexpr bool is_integral_constant<std::integral_constant<I, A> const&> = true;
+constexpr bool kIS_INTEGRAL_CONSTANT<std::integral_constant<I, A> const&> = true;
 
 template <typename T>
-concept some_integral_constant = detail::is_integral_constant<T&>;
+concept some_integral_constant = detail::kIS_INTEGRAL_CONSTANT<T&>;
 
-// This class is designed to wrap a collection of _almost_ identical Json::Value
+// 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
 // index). It is used e.g. when we need to publish JSON data to users supporting
 // different API versions. We allow manipulation and inspection of all objects
@@ -47,12 +47,12 @@ struct MultiApiJson
         return (v < MinVer) ? 0 : static_cast<std::size_t>(v - MinVer);
     }
 
-    constexpr static std::size_t size = MaxVer + 1 - MinVer;
-    std::array<Json::Value, size> val = {};
+    constexpr static std::size_t kSIZE = MaxVer + 1 - MinVer;
+    std::array<json::Value, kSIZE> val = {};
 
-    explicit MultiApiJson(Json::Value const& init = {})
+    explicit MultiApiJson(json::Value const& init = {})
     {
-        if (init == Json::Value{})
+        if (init == json::Value{})
             return;  // All elements are already default-initialized
         for (auto& v : val)
             v = init;
@@ -60,13 +60,13 @@ struct MultiApiJson
 
     void
     set(char const* key, auto const& v)
-        requires std::constructible_from<Json::Value, decltype(v)>
+        requires std::constructible_from<json::Value, decltype(v)>
     {
         for (auto& a : this->val)
             a[key] = v;
     }
 
-    enum class IsMemberResult : int { none = 0, some, all };
+    enum class IsMemberResult : int { None = 0, Some, All };
 
     [[nodiscard]] IsMemberResult
     isMember(char const* key) const
@@ -79,11 +79,11 @@ struct MultiApiJson
         }
 
         if (count == 0)
-            return IsMemberResult::none;
-        return count < size ? IsMemberResult::some : IsMemberResult::all;
+            return IsMemberResult::None;
+        return count < kSIZE ? IsMemberResult::Some : IsMemberResult::All;
     }
 
-    static constexpr struct visitor_t final
+    static constexpr struct VisitorT final
     {
         // integral_constant version, extra arguments
         template <typename Json, unsigned int Version, typename... Args, typename Fn>
@@ -100,7 +100,7 @@ struct MultiApiJson
                 std::integral_constant<unsigned int, Version>,
                 Args&&...>
         {
-            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < size);
+            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) < size);
+            static_assert(valid(Version) && index(Version) >= 0 && index(Version) < kSIZE);
             return std::invoke(fn, json.val[index(Version)]);
         }
 
@@ -124,8 +124,8 @@ struct MultiApiJson
             -> std::invoke_result_t<Fn, decltype(json.val[0]), Version, Args&&...>
         {
             XRPL_ASSERT(
-                valid(version) && index(version) >= 0 && index(version) < size,
-                "xrpl::detail::MultiApiJson::operator<Args...>() : valid "
+                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) < size,
-                "xrpl::detail::MultiApiJson::operator() : valid version");
+                valid(version) && index(version) >= 0 && index(version) < kSIZE,
+                "xrpl::detail::MultiApijson::operator() : valid version");
             return std::invoke(fn, json.val[index(version)]);
         }
-    } visitor = {};
+    } kVISITOR = {};
 
     auto
     visit()
     {
         return [self = this](auto... args)
             requires requires {
-                visitor(std::declval<MultiApiJson&>(), std::declval<decltype(args)>()...);
+                kVISITOR(std::declval<MultiApiJson&>(), std::declval<decltype(args)>()...);
             }
-        { return visitor(*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 {
-                visitor(std::declval<MultiApiJson const&>(), std::declval<decltype(args)>()...);
+                kVISITOR(std::declval<MultiApiJson const&>(), std::declval<decltype(args)>()...);
             }
-        { return visitor(*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<visitor_t, MultiApiJson&, Args...>
+    visit(Args... args) -> std::invoke_result_t<VisitorT, MultiApiJson&, Args...>
         requires(sizeof...(args) > 0) &&
-        requires { visitor(*this, std::forward<decltype(args)>(args)...); }
+        requires { kVISITOR(*this, std::forward<decltype(args)>(args)...); }
     {
-        return visitor(*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<visitor_t, MultiApiJson const&, Args...>
+    visit(Args... args) const -> std::invoke_result_t<VisitorT, MultiApiJson const&, Args...>
         requires(sizeof...(args) > 0) &&
-        requires { visitor(*this, std::forward<decltype(args)>(args)...); }
+        requires { kVISITOR(*this, std::forward<decltype(args)>(args)...); }
     {
-        return visitor(*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::apiMinimumSupportedVersion, RPC::apiMaximumValidVersion>;
+    detail::MultiApiJson<RPC::kAPI_MINIMUM_SUPPORTED_VERSION, RPC::kAPI_MAXIMUM_VALID_VERSION>;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/NFTSyntheticSerializer.h b/include/xrpl/protocol/NFTSyntheticSerializer.h
index dcfd132ed8..a1d8bce985 100644
--- a/include/xrpl/protocol/NFTSyntheticSerializer.h
+++ b/include/xrpl/protocol/NFTSyntheticSerializer.h
@@ -14,7 +14,7 @@ namespace xrpl::RPC {
    @{
  */
 void
-insertNFTSyntheticInJson(Json::Value&, std::shared_ptr<STTx const> const&, TxMeta const&);
+insertNFTSyntheticInJson(json::Value&, std::shared_ptr<STTx const> const&, TxMeta const&);
 /** @} */
 
 }  // namespace xrpl::RPC
diff --git a/include/xrpl/protocol/NFTokenID.h b/include/xrpl/protocol/NFTokenID.h
index 4bdacc1095..f61c6bd5cb 100644
--- a/include/xrpl/protocol/NFTokenID.h
+++ b/include/xrpl/protocol/NFTokenID.h
@@ -30,7 +30,7 @@ getNFTokenIDFromDeletedOffer(TxMeta const& transactionMeta);
 
 void
 insertNFTokenID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta);
 /** @} */
diff --git a/include/xrpl/protocol/NFTokenOfferID.h b/include/xrpl/protocol/NFTokenOfferID.h
index 01b0ced638..c4a80356bf 100644
--- a/include/xrpl/protocol/NFTokenOfferID.h
+++ b/include/xrpl/protocol/NFTokenOfferID.h
@@ -27,7 +27,7 @@ getOfferIDFromCreatedOffer(TxMeta const& transactionMeta);
 
 void
 insertNFTokenOfferID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta);
 /** @} */
diff --git a/include/xrpl/protocol/PathAsset.h b/include/xrpl/protocol/PathAsset.h
index 67b78f2191..4c4a3f7af4 100644
--- a/include/xrpl/protocol/PathAsset.h
+++ b/include/xrpl/protocol/PathAsset.h
@@ -52,10 +52,10 @@ public:
 };
 
 template <ValidPathAsset PA>
-constexpr bool is_currency_v = std::is_same_v<PA, Currency>;
+constexpr bool kIS_CURRENCY_V = std::is_same_v<PA, Currency>;
 
 template <ValidPathAsset PA>
-constexpr bool is_mptid_v = std::is_same_v<PA, MPTID>;
+constexpr bool kIS_MPTID_V = std::is_same_v<PA, MPTID>;
 
 inline PathAsset::PathAsset(Asset const& asset)
 {
@@ -72,7 +72,7 @@ PathAsset::holds() const
 }
 
 template <ValidPathAsset T>
-T const&
+[[nodiscard]] [[nodiscard]] T const&
 PathAsset::get() const
 {
     if (!holds<T>())
@@ -98,10 +98,10 @@ constexpr bool
 operator==(PathAsset const& lhs, PathAsset const& rhs)
 {
     return std::visit(
-        []<ValidPathAsset TLhs, ValidPathAsset TRhs>(TLhs const& lhs_, TRhs const& rhs_) {
+        []<ValidPathAsset TLhs, ValidPathAsset TRhs>(TLhs const& lhs, TRhs const& rhs) {
             if constexpr (std::is_same_v<TLhs, TRhs>)
             {
-                return lhs_ == rhs_;
+                return lhs == rhs;
             }
             else
             {
diff --git a/include/xrpl/protocol/PayChan.h b/include/xrpl/protocol/PayChan.h
index 0a1496ca8e..d8f4e0f527 100644
--- a/include/xrpl/protocol/PayChan.h
+++ b/include/xrpl/protocol/PayChan.h
@@ -10,7 +10,7 @@ namespace xrpl {
 inline void
 serializePayChanAuthorization(Serializer& msg, uint256 const& key, XRPAmount const& amt)
 {
-    msg.add32(HashPrefix::paymentChannelClaim);
+    msg.add32(HashPrefix::PaymentChannelClaim);
     msg.addBitString(key);
     msg.add64(amt.drops());
 }
diff --git a/include/xrpl/protocol/Permissions.h b/include/xrpl/protocol/Permissions.h
index 3ce8918a16..5d56fa4461 100644
--- a/include/xrpl/protocol/Permissions.h
+++ b/include/xrpl/protocol/Permissions.h
@@ -33,7 +33,7 @@ enum GranularPermissionType : std::uint32_t {
 // Injected bare enumerators (xrpl::delegable / xrpl::notDelegable) are required by preprocessor
 // tricks in tests and macro-generated code; enum class would break that.
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum Delegation { delegable, notDelegable };
+enum Delegation { Delegable, NotDelegable };
 
 class Permission
 {
diff --git a/include/xrpl/protocol/Protocol.h b/include/xrpl/protocol/Protocol.h
index 0db7b217f0..50b2425016 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 txMinSizeBytes = 32;
+std::size_t constexpr kTX_MIN_SIZE_BYTES = 32;
 
 /** Largest legal byte size of a transaction. */
-std::size_t constexpr txMaxSizeBytes = megabytes(1);
+std::size_t constexpr kTX_MAX_SIZE_BYTES = megabytes(1);
 
 /** The maximum number of unfunded offers to delete at once */
-std::size_t constexpr unfundedOfferRemoveLimit = 1000;
+std::size_t constexpr kUNFUNDED_OFFER_REMOVE_LIMIT = 1000;
 
 /** The maximum number of expired offers to delete at once */
-std::size_t constexpr expiredOfferRemoveLimit = 256;
+std::size_t constexpr kEXPIRED_OFFER_REMOVE_LIMIT = 256;
 
 /** The maximum number of metadata entries allowed in one transaction */
-std::size_t constexpr oversizeMetaDataCap = 5200;
+std::size_t constexpr kOVERSIZE_META_DATA_CAP = 5200;
 
 /** The maximum number of entries per directory page */
-std::size_t constexpr dirNodeMaxEntries = 32;
+std::size_t constexpr kDIR_NODE_MAX_ENTRIES = 32;
 
 /** The maximum number of pages allowed in a directory
 
     Made obsolete by fixDirectoryLimit amendment.
 */
-std::uint64_t constexpr dirNodeMaxPages = 262144;
+std::uint64_t constexpr kDIR_NODE_MAX_PAGES = 262144;
 
 /** The maximum number of items in an NFT page */
-std::size_t constexpr dirMaxTokensPerPage = 32;
+std::size_t constexpr kDIR_MAX_TOKENS_PER_PAGE = 32;
 
 /** The maximum number of owner directory entries for account to be deletable */
-std::size_t constexpr maxDeletableDirEntries = 1000;
+std::size_t constexpr kMAX_DELETABLE_DIR_ENTRIES = 1000;
 
 /** The maximum number of token offers that can be canceled at once */
-std::size_t constexpr maxTokenOfferCancelCount = 500;
+std::size_t constexpr kMAX_TOKEN_OFFER_CANCEL_COUNT = 500;
 
 /** The maximum number of offers in an offer directory for NFT to be burnable */
-std::size_t constexpr maxDeletableTokenOfferEntries = 500;
+std::size_t constexpr kMAX_DELETABLE_TOKEN_OFFER_ENTRIES = 500;
 
 /** The maximum token transfer fee allowed.
 
@@ -63,7 +63,7 @@ std::size_t constexpr maxDeletableTokenOfferEntries = 500;
     Note that for extremely low transfer fees values, it is possible that the
     calculated fee will be 0.
  */
-std::uint16_t constexpr maxTransferFee = 50000;
+std::uint16_t constexpr kMAX_TRANSFER_FEE = 50000;
 
 /** There are 10,000 basis points (bips) in 100%.
  *
@@ -81,32 +81,32 @@ std::uint16_t constexpr maxTransferFee = 50000;
  *
  * Example: 50% is 0.50 * bipsPerUnity = 5,000 bps.
  */
-Bips32 constexpr bipsPerUnity(100 * 100);
-static_assert(bipsPerUnity == Bips32{10'000});
-TenthBips32 constexpr tenthBipsPerUnity(bipsPerUnity.value() * 10);
-static_assert(tenthBipsPerUnity == TenthBips32(100'000));
+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
 percentageToBips(std::uint32_t percentage)
 {
-    return Bips32(percentage * bipsPerUnity.value() / 100);
+    return Bips32(percentage * kBIPS_PER_UNITY.value() / 100);
 }
 constexpr TenthBips32
 percentageToTenthBips(std::uint32_t percentage)
 {
-    return TenthBips32(percentage * tenthBipsPerUnity.value() / 100);
+    return TenthBips32(percentage * kTENTH_BIPS_PER_UNITY.value() / 100);
 }
 template <typename T, class TBips>
 constexpr T
 bipsOfValue(T value, Bips<TBips> bips)
 {
-    return value * bips.value() / bipsPerUnity.value();
+    return value * bips.value() / kBIPS_PER_UNITY.value();
 }
 template <typename T, class TBips>
 constexpr T
 tenthBipsOfValue(T value, TenthBips<TBips> bips)
 {
-    return value * bips.value() / tenthBipsPerUnity.value();
+    return value * bips.value() / kTENTH_BIPS_PER_UNITY.value();
 }
 
 namespace Lending {
@@ -114,54 +114,54 @@ namespace Lending {
 
     Valid values are between 0 and 10% inclusive.
 */
-TenthBips16 constexpr maxManagementFeeRate(
-    unsafe_cast<std::uint16_t>(percentageToTenthBips(10).value()));
-static_assert(maxManagementFeeRate == TenthBips16(std::uint16_t(10'000u)));
+TenthBips16 constexpr kMAX_MANAGEMENT_FEE_RATE(
+    unsafeCast<std::uint16_t>(percentageToTenthBips(10).value()));
+static_assert(kMAX_MANAGEMENT_FEE_RATE == 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 maxCoverRate = percentageToTenthBips(100);
-static_assert(maxCoverRate == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_COVER_RATE = percentageToTenthBips(100);
+static_assert(kMAX_COVER_RATE == TenthBips32(100'000u));
 
 /** The maximum overpayment fee on a loan in 1/10 bips.
 *
     Valid values are between 0 and 100% inclusive.
 */
-TenthBips32 constexpr maxOverpaymentFee = percentageToTenthBips(100);
-static_assert(maxOverpaymentFee == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_OVERPAYMENT_FEE = percentageToTenthBips(100);
+static_assert(kMAX_OVERPAYMENT_FEE == TenthBips32(100'000u));
 
 /** Annualized interest rate of the Loan in 1/10 bips.
  *
  * Valid values are between 0 and 100% inclusive.
  */
-TenthBips32 constexpr maxInterestRate = percentageToTenthBips(100);
-static_assert(maxInterestRate == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_INTEREST_RATE = percentageToTenthBips(100);
+static_assert(kMAX_INTEREST_RATE == 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 maxLateInterestRate = percentageToTenthBips(100);
-static_assert(maxLateInterestRate == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_LATE_INTEREST_RATE = percentageToTenthBips(100);
+static_assert(kMAX_LATE_INTEREST_RATE == 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 maxCloseInterestRate = percentageToTenthBips(100);
-static_assert(maxCloseInterestRate == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_CLOSE_INTEREST_RATE = percentageToTenthBips(100);
+static_assert(kMAX_CLOSE_INTEREST_RATE == 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 maxOverpaymentInterestRate = percentageToTenthBips(100);
-static_assert(maxOverpaymentInterestRate == TenthBips32(100'000u));
+TenthBips32 constexpr kMAX_OVERPAYMENT_INTEREST_RATE = percentageToTenthBips(100);
+static_assert(kMAX_OVERPAYMENT_INTEREST_RATE == TenthBips32(100'000u));
 
 /** LoanPay transaction cost will be one base fee per X combined payments
  *
@@ -172,7 +172,7 @@ static_assert(maxOverpaymentInterestRate == TenthBips32(100'000u));
  * This number was chosen arbitrarily, but should not be changed once released
  * without an amendment
  */
-static constexpr int loanPaymentsPerFeeIncrement = 5;
+static constexpr int kLOAN_PAYMENTS_PER_FEE_INCREMENT = 5;
 
 /** Maximum number of combined payments that a LoanPay transaction will process
  *
@@ -196,65 +196,65 @@ static constexpr int loanPaymentsPerFeeIncrement = 5;
  * This number was chosen arbitrarily, but should not be changed once released
  * without an amendment
  */
-static constexpr int loanMaximumPaymentsPerTransaction = 100;
+static constexpr int kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION = 100;
 }  // namespace Lending
 
 /** The maximum length of a URI inside an NFT */
-std::size_t constexpr maxTokenURILength = 256;
+std::size_t constexpr kMAX_TOKEN_URI_LENGTH = 256;
 
 /** The maximum length of a Data element inside a DID */
-std::size_t constexpr maxDIDDocumentLength = 256;
+std::size_t constexpr kMAX_DID_DOCUMENT_LENGTH = 256;
 
 /** The maximum length of a URI inside a DID */
-std::size_t constexpr maxDIDURILength = 256;
+std::size_t constexpr kMAX_DIDURI_LENGTH = 256;
 
 /** The maximum length of an Attestation inside a DID */
-std::size_t constexpr maxDIDDataLength = 256;
+std::size_t constexpr kMAX_DID_DATA_LENGTH = 256;
 
 /** The maximum length of a domain */
-std::size_t constexpr maxDomainLength = 256;
+std::size_t constexpr kMAX_DOMAIN_LENGTH = 256;
 
 /** The maximum length of a URI inside a Credential */
-std::size_t constexpr maxCredentialURILength = 256;
+std::size_t constexpr kMAX_CREDENTIAL_URI_LENGTH = 256;
 
 /** The maximum length of a CredentialType inside a Credential */
-std::size_t constexpr maxCredentialTypeLength = 64;
+std::size_t constexpr kMAX_CREDENTIAL_TYPE_LENGTH = 64;
 
 /** The maximum number of credentials can be passed in array */
-std::size_t constexpr maxCredentialsArraySize = 8;
+std::size_t constexpr kMAX_CREDENTIALS_ARRAY_SIZE = 8;
 
 /** The maximum number of credentials can be passed in array for permissioned
  * domain */
-std::size_t constexpr maxPermissionedDomainCredentialsArraySize = 10;
+std::size_t constexpr kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE = 10;
 
 /** The maximum length of MPTokenMetadata */
-std::size_t constexpr maxMPTokenMetadataLength = 1024;
+std::size_t constexpr kMAX_MP_TOKEN_METADATA_LENGTH = 1024;
 
 /** The maximum amount of MPTokenIssuance */
-std::uint64_t constexpr maxMPTokenAmount = 0x7FFF'FFFF'FFFF'FFFFull;
-static_assert(Number::maxRep >= maxMPTokenAmount);
+std::uint64_t constexpr kMAX_MP_TOKEN_AMOUNT = 0x7FFF'FFFF'FFFF'FFFFull;
+static_assert(Number::kMAX_REP >= kMAX_MP_TOKEN_AMOUNT);
 
 /** The maximum length of Data payload */
-std::size_t constexpr maxDataPayloadLength = 256;
+std::size_t constexpr kMAX_DATA_PAYLOAD_LENGTH = 256;
 
 /** Vault withdrawal policies */
-std::uint8_t constexpr vaultStrategyFirstComeFirstServe = 1;
+std::uint8_t constexpr kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE = 1;
 
 /** Default IOU scale factor for a Vault */
-std::uint8_t constexpr vaultDefaultIOUScale = 6;
+std::uint8_t constexpr kVAULT_DEFAULT_IOU_SCALE = 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 vaultMaximumIOUScale = 18;
+std::uint8_t constexpr kVAULT_MAXIMUM_IOU_SCALE = 18;
 
 /** Maximum recursion depth for vault shares being put as an asset inside
  * another vault; counted from 0 */
-std::uint8_t constexpr maxAssetCheckDepth = 5;
+std::uint8_t constexpr kMAX_ASSET_CHECK_DEPTH = 5;
 
 /** A ledger index. */
 using LedgerIndex = std::uint32_t;
 
-std::uint32_t constexpr FLAG_LEDGER_INTERVAL = 256;
+std::uint32_t constexpr kFLAG_LEDGER_INTERVAL = 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 maxDeletableAMMTrustLines = 512;
+std::uint16_t constexpr kMAX_DELETABLE_AMM_TRUST_LINES = 512;
 
 /** The maximum length of a URI inside an Oracle */
-std::size_t constexpr maxOracleURI = 256;
+std::size_t constexpr kMAX_ORACLE_URI = 256;
 
 /** The maximum length of a Provider inside an Oracle */
-std::size_t constexpr maxOracleProvider = 256;
+std::size_t constexpr kMAX_ORACLE_PROVIDER = 256;
 
 /** The maximum size of a data series array inside an Oracle */
-std::size_t constexpr maxOracleDataSeries = 10;
+std::size_t constexpr kMAX_ORACLE_DATA_SERIES = 10;
 
 /** The maximum length of a SymbolClass inside an Oracle */
-std::size_t constexpr maxOracleSymbolClass = 16;
+std::size_t constexpr kMAX_ORACLE_SYMBOL_CLASS = 16;
 
 /** The maximum allowed time difference between lastUpdateTime and the time
     of the last closed ledger
 */
-std::size_t constexpr maxLastUpdateTimeDelta = 300;
+std::size_t constexpr kMAX_LAST_UPDATE_TIME_DELTA = 300;
 
 /** The maximum price scaling factor
  */
-std::size_t constexpr maxPriceScale = 20;
+std::size_t constexpr kMAX_PRICE_SCALE = 20;
 
 /** The maximum percentage of outliers to trim
  */
-std::size_t constexpr maxTrim = 25;
+std::size_t constexpr kMAX_TRIM = 25;
 
 /** The maximum number of delegate permissions an account can grant
  */
-std::size_t constexpr permissionMaxSize = 10;
+std::size_t constexpr kPERMISSION_MAX_SIZE = 10;
 
 /** The maximum number of transactions that can be in a batch. */
-std::size_t constexpr maxBatchTxCount = 8;
+std::size_t constexpr kMAX_BATCH_TX_COUNT = 8;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/PublicKey.h b/include/xrpl/protocol/PublicKey.h
index 9ec82dde97..75b898a71c 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 size_ = 33;
-    std::uint8_t buf_[size_]{};  // 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 size_;
+        return kSIZE;
     }
 
     [[nodiscard]] const_iterator
@@ -90,19 +90,19 @@ public:
     [[nodiscard]] const_iterator
     end() const noexcept
     {
-        return buf_ + size_;
+        return buf_ + kSIZE;
     }
 
     [[nodiscard]] const_iterator
     cend() const noexcept
     {
-        return buf_ + size_;
+        return buf_ + kSIZE;
     }
 
     [[nodiscard]] Slice
     slice() const noexcept
     {
-        return {buf_, size_};
+        return {buf_, kSIZE};
     }
 
     operator Slice() const noexcept
@@ -168,7 +168,7 @@ template <>
 std::optional<PublicKey>
 parseBase58(TokenType type, std::string const& s);
 
-enum class ECDSACanonicality { canonical, fullyCanonical };
+enum class ECDSACanonicality { Canonical, FullyCanonical };
 
 /** Determines the canonicality of a signature.
 
@@ -260,10 +260,10 @@ getFingerprint(
 
 //------------------------------------------------------------------------------
 
-namespace Json {
+namespace json {
 template <>
 inline xrpl::PublicKey
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
     std::string const b58 = getOrThrow<std::string>(v, field);
@@ -279,4 +279,4 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
     }
     Throw<JsonTypeMismatchError>(field.getJsonName(), "PublicKey");
 }
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/protocol/Quality.h b/include/xrpl/protocol/Quality.h
index 2d4ea2f652..115e4498df 100644
--- a/include/xrpl/protocol/Quality.h
+++ b/include/xrpl/protocol/Quality.h
@@ -26,11 +26,11 @@ struct TAmounts
 {
     TAmounts() = default;
 
-    TAmounts(beast::Zero, beast::Zero) : in(beast::zero), out(beast::zero)
+    TAmounts(beast::Zero, beast::Zero) : in(beast::kZERO), out(beast::kZERO)
     {
     }
 
-    TAmounts(In in_, Out out_) : in(std::move(in_)), out(std::move(out_))
+    TAmounts(In in, Out out) : in(std::move(in)), out(std::move(out))
     {
     }
 
@@ -38,7 +38,7 @@ struct TAmounts
     [[nodiscard]] bool
     empty() const noexcept
     {
-        return in <= beast::zero || out <= beast::zero;
+        return in <= beast::kZERO || out <= beast::kZERO;
     }
 
     TAmounts&
@@ -94,15 +94,15 @@ public:
     // have lower unsigned integer representations.
     using value_type = std::uint64_t;
 
-    static int const minTickSize = 3;
-    static int const maxTickSize = 16;
+    static int const kMIN_TICK_SIZE = 3;
+    static int const kMAX_TICK_SIZE = 16;
 
 private:
     // This has the same representation as STAmount, see the comment on the
     // STAmount. However, this class does not always use the canonical
     // representation. In particular, the increment and decrement operators may
     // cause a non-canonical representation.
-    value_type m_value;
+    value_type value_;
 
 public:
     Quality() = default;
@@ -148,7 +148,7 @@ public:
     [[nodiscard]] STAmount
     rate() const
     {
-        return amountFromQuality(m_value);
+        return amountFromQuality(value_);
     }
 
     /** Returns the quality rounded up to the specified number
@@ -162,42 +162,42 @@ public:
         to prevent money creation.
     */
     [[nodiscard]] Amounts
-    ceil_in(Amounts const& amount, STAmount const& limit) const;
+    ceilIn(Amounts const& amount, STAmount const& limit) const;
 
     template <class In, class Out>
     [[nodiscard]] TAmounts<In, Out>
-    ceil_in(TAmounts<In, Out> const& amount, In const& limit) const;
+    ceilIn(TAmounts<In, Out> const& amount, In const& limit) const;
 
     // Some of the underlying rounding functions called by ceil_in() ignored
     // low order bits that could influence rounding decisions.  This "strict"
     // method uses underlying functions that pay attention to all the bits.
     [[nodiscard]] Amounts
-    ceil_in_strict(Amounts const& amount, STAmount const& limit, bool roundUp) const;
+    ceilInStrict(Amounts const& amount, STAmount const& limit, bool roundUp) const;
 
     template <class In, class Out>
     [[nodiscard]] TAmounts<In, Out>
-    ceil_in_strict(TAmounts<In, Out> const& amount, In const& limit, bool roundUp) const;
+    ceilInStrict(TAmounts<In, Out> const& amount, In const& limit, bool roundUp) const;
 
     /** Returns the scaled amount with out capped.
         Math is avoided if the result is exact. The input is clamped
         to prevent money creation.
     */
     [[nodiscard]] Amounts
-    ceil_out(Amounts const& amount, STAmount const& limit) const;
+    ceilOut(Amounts const& amount, STAmount const& limit) const;
 
     template <class In, class Out>
     [[nodiscard]] TAmounts<In, Out>
-    ceil_out(TAmounts<In, Out> const& amount, Out const& limit) const;
+    ceilOut(TAmounts<In, Out> const& amount, Out const& limit) const;
 
     // Some of the underlying rounding functions called by ceil_out() ignored
     // low order bits that could influence rounding decisions.  This "strict"
     // method uses underlying functions that pay attention to all the bits.
     [[nodiscard]] Amounts
-    ceil_out_strict(Amounts const& amount, STAmount const& limit, bool roundUp) const;
+    ceilOutStrict(Amounts const& amount, STAmount const& limit, bool roundUp) const;
 
     template <class In, class Out>
     [[nodiscard]] TAmounts<In, Out>
-    ceil_out_strict(TAmounts<In, Out> const& amount, Out const& limit, bool roundUp) const;
+    ceilOutStrict(TAmounts<In, Out> const& amount, Out const& limit, bool roundUp) const;
 
 private:
     // The ceil_in and ceil_out methods that deal in TAmount all convert
@@ -205,11 +205,11 @@ private:
     // This helper function takes care of all the conversion operations.
     template <class In, class Out, class Lim, typename FnPtr, std::same_as<bool>... Round>
     [[nodiscard]] TAmounts<In, Out>
-    ceil_TAmounts_helper(
+    ceilTAmountsHelper(
         TAmounts<In, Out> const& amount,
         Lim const& limit,
-        Lim const& limit_cmp,
-        FnPtr ceil_function,
+        Lim const& limitCmp,
+        FnPtr ceilFunction,
         Round... round) const;
 
 public:
@@ -220,13 +220,13 @@ public:
     friend bool
     operator<(Quality const& lhs, Quality const& rhs) noexcept
     {
-        return lhs.m_value > rhs.m_value;
+        return lhs.value_ > rhs.value_;
     }
 
     friend bool
     operator>(Quality const& lhs, Quality const& rhs) noexcept
     {
-        return lhs.m_value < rhs.m_value;
+        return lhs.value_ < rhs.value_;
     }
 
     friend bool
@@ -244,7 +244,7 @@ public:
     friend bool
     operator==(Quality const& lhs, Quality const& rhs) noexcept
     {
-        return lhs.m_value == rhs.m_value;
+        return lhs.value_ == rhs.value_;
     }
 
     friend bool
@@ -256,7 +256,7 @@ public:
     friend std::ostream&
     operator<<(std::ostream& os, Quality const& quality)
     {
-        os << quality.m_value;
+        os << quality.value_;
         return os;
     }
 
@@ -266,12 +266,12 @@ public:
     relativeDistance(Quality const& q1, Quality const& q2)
     {
         XRPL_ASSERT(
-            q1.m_value > 0 && q2.m_value > 0, "xrpl::Quality::relativeDistance : minimum inputs");
+            q1.value_ > 0 && q2.value_ > 0, "xrpl::Quality::relativeDistance : minimum inputs");
 
-        if (q1.m_value == q2.m_value)  // make expected common case fast
+        if (q1.value_ == q2.value_)  // make expected common case fast
             return 0;
 
-        auto const [minV, maxV] = std::minmax(q1.m_value, q2.m_value);
+        auto const [minV, maxV] = std::minmax(q1.value_, q2.value_);
 
         auto mantissa = [](std::uint64_t rate) { return rate & ~(255ull << (64 - 8)); };
         auto exponent = [](std::uint64_t rate) { return static_cast<int>(rate >> (64 - 8)) - 100; };
@@ -293,66 +293,66 @@ public:
 
 template <class In, class Out, class Lim, typename FnPtr, std::same_as<bool>... Round>
 TAmounts<In, Out>
-Quality::ceil_TAmounts_helper(
+Quality::ceilTAmountsHelper(
     TAmounts<In, Out> const& amount,
     Lim const& limit,
-    Lim const& limit_cmp,
-    FnPtr ceil_function,
+    Lim const& limitCmp,
+    FnPtr ceilFunction,
     Round... roundUp) const
 {
-    if (limit_cmp <= limit)
+    if (limitCmp <= limit)
         return amount;
 
     // Use the existing STAmount implementation for now, but consider
     // replacing with code specific to IOUAMount and XRPAmount
     Amounts const stAmt(toSTAmount(amount.in), toSTAmount(amount.out));
     STAmount const stLim(toSTAmount(limit));
-    Amounts const stRes = ((*this).*ceil_function)(stAmt, stLim, roundUp...);
+    Amounts const stRes = ((*this).*ceilFunction)(stAmt, stLim, roundUp...);
     return TAmounts<In, Out>(toAmount<In>(stRes.in), toAmount<Out>(stRes.out));
 }
 
 template <class In, class Out>
 TAmounts<In, Out>
-Quality::ceil_in(TAmounts<In, Out> const& amount, In const& limit) const
+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::*ceil_in_fn_ptr)(Amounts const&, STAmount const&) const =
-        &Quality::ceil_in;
+    static constexpr Amounts (Quality::*kCEIL_IN_FN_PTR)(Amounts const&, STAmount const&) const =
+        &Quality::ceilIn;
 
-    return ceil_TAmounts_helper(amount, limit, amount.in, ceil_in_fn_ptr);
+    return ceilTAmountsHelper(amount, limit, amount.in, kCEIL_IN_FN_PTR);
 }
 
 template <class In, class Out>
 TAmounts<In, Out>
-Quality::ceil_in_strict(TAmounts<In, Out> const& amount, In const& limit, bool roundUp) const
+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::*ceil_in_fn_ptr)(Amounts const&, STAmount const&, bool)
-        const = &Quality::ceil_in_strict;
+    static constexpr Amounts (Quality::*kCEIL_IN_FN_PTR)(Amounts const&, STAmount const&, bool)
+        const = &Quality::ceilInStrict;
 
-    return ceil_TAmounts_helper(amount, limit, amount.in, ceil_in_fn_ptr, roundUp);
+    return ceilTAmountsHelper(amount, limit, amount.in, kCEIL_IN_FN_PTR, roundUp);
 }
 
 template <class In, class Out>
 TAmounts<In, Out>
-Quality::ceil_out(TAmounts<In, Out> const& amount, Out const& limit) const
+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::*ceil_out_fn_ptr)(Amounts const&, STAmount const&) const =
-        &Quality::ceil_out;
+    static constexpr Amounts (Quality::*kCEIL_OUT_FN_PTR)(Amounts const&, STAmount const&) const =
+        &Quality::ceilOut;
 
-    return ceil_TAmounts_helper(amount, limit, amount.out, ceil_out_fn_ptr);
+    return ceil_TAmounts_helper(amount, limit, amount.out, kCEIL_OUT_FN_PTR);
 }
 
 template <class In, class Out>
 TAmounts<In, Out>
-Quality::ceil_out_strict(TAmounts<In, Out> const& amount, Out const& limit, bool roundUp) const
+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::*ceil_out_fn_ptr)(Amounts const&, STAmount const&, bool)
-        const = &Quality::ceil_out_strict;
+    static constexpr Amounts (Quality::*kCEIL_OUT_FN_PTR)(Amounts const&, STAmount const&, bool)
+        const = &Quality::ceilOutStrict;
 
-    return ceil_TAmounts_helper(amount, limit, amount.out, ceil_out_fn_ptr, roundUp);
+    return ceilTAmountsHelper(amount, limit, amount.out, kCEIL_OUT_FN_PTR, roundUp);
 }
 
 /** Calculate the quality of a two-hop path given the two hops.
@@ -360,6 +360,6 @@ Quality::ceil_out_strict(TAmounts<In, Out> const& amount, Out const& limit, bool
     @param rhs  The second leg of the path: intermediate to output.
 */
 Quality
-composed_quality(Quality const& lhs, Quality const& rhs);
+composedQuality(Quality const& lhs, Quality const& rhs);
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/QualityFunction.h b/include/xrpl/protocol/QualityFunction.h
index 672c529c38..f7f92e50da 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::zero || amounts.out <= beast::zero)
+    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/RPCErr.h b/include/xrpl/protocol/RPCErr.h
index e42bf5e637..1439146e0e 100644
--- a/include/xrpl/protocol/RPCErr.h
+++ b/include/xrpl/protocol/RPCErr.h
@@ -7,8 +7,8 @@ namespace xrpl {
 
 // VFALCO NOTE these are deprecated
 bool
-isRpcError(Json::Value jvResult);
-Json::Value
-rpcError(error_code_i iError);
+isRpcError(json::Value jvResult);
+json::Value
+rpcError(ErrorCodeI iError);
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/Rate.h b/include/xrpl/protocol/Rate.h
index e57d7e3a99..5dcd62a295 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 parityRate;
+extern Rate const kPARITY_RATE;
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/Rules.h b/include/xrpl/protocol/Rules.h
index 604bb24700..fbbd3d8805 100644
--- a/include/xrpl/protocol/Rules.h
+++ b/include/xrpl/protocol/Rules.h
@@ -56,7 +56,7 @@ public:
         These are the rules reflected by
         the genesis ledger.
     */
-    explicit Rules(std::unordered_set<uint256, beast::uhash<>> const& presets);
+    explicit Rules(std::unordered_set<uint256, beast::Uhash<>> const& presets);
 
 private:
     // Allow a friend function to construct Rules.
@@ -66,14 +66,14 @@ private:
     friend Rules
     makeRulesGivenLedger(
         DigestAwareReadView const& ledger,
-        std::unordered_set<uint256, beast::uhash<>> const& presets);
+        std::unordered_set<uint256, beast::Uhash<>> const& presets);
 
     Rules(
-        std::unordered_set<uint256, beast::uhash<>> const& presets,
+        std::unordered_set<uint256, beast::Uhash<>> const& presets,
         std::optional<uint256> const& digest,
         STVector256 const& amendments);
 
-    [[nodiscard]] std::unordered_set<uint256, beast::uhash<>> const&
+    [[nodiscard]] std::unordered_set<uint256, beast::Uhash<>> const&
     presets() const;
 
 public:
diff --git a/include/xrpl/protocol/SField.h b/include/xrpl/protocol/SField.h
index 784de5511e..45e4d8932e 100644
--- a/include/xrpl/protocol/SField.h
+++ b/include/xrpl/protocol/SField.h
@@ -34,6 +34,7 @@ class STXChainBridge;
 class STVector256;
 class STCurrency;
 
+// NOLINTBEGIN(readability-identifier-naming)
 #pragma push_macro("XMACRO")
 #undef XMACRO
 
@@ -91,7 +92,7 @@ class STCurrency;
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SerializedTypeID { XMACRO(TO_ENUM) };
 
-static std::map<std::string, int> const sTypeMap = {XMACRO(TO_MAP)};
+static std::map<std::string, int> const kS_TYPE_MAP = {XMACRO(TO_MAP)};
 
 #undef XMACRO
 #undef TO_ENUM
@@ -99,17 +100,18 @@ static std::map<std::string, int> const sTypeMap = {XMACRO(TO_MAP)};
 #pragma pop_macro("XMACRO")
 #pragma pop_macro("TO_ENUM")
 #pragma pop_macro("TO_MAP")
+// NOLINTEND(readability-identifier-naming)
 
 // constexpr
 inline int
-field_code(SerializedTypeID id, int index)
+fieldCode(SerializedTypeID id, int index)
 {
-    return (safe_cast<int>(id) << 16) | index;
+    return (safeCast<int>(id) << 16) | index;
 }
 
 // constexpr
 inline int
-field_code(int id, int index)
+fieldCode(int id, int index)
 {
     return (id << 16) | index;
 }
@@ -130,32 +132,32 @@ public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
-        sMD_Never = 0x00,
-        sMD_ChangeOrig = 0x01,     // original value when it changes
-        sMD_ChangeNew = 0x02,      // new value when it changes
-        sMD_DeleteFinal = 0x04,    // final value when it is deleted
-        sMD_Create = 0x08,         // value when it's created
-        sMD_Always = 0x10,         // value when node containing it is affected at all
-        sMD_BaseTen = 0x20,        // value is treated as base 10, overriding behavior
-        sMD_PseudoAccount = 0x40,  // if this field is set in an ACCOUNT_ROOT
-                                   // _only_, then it is a pseudo-account
-        sMD_NeedsAsset = 0x80,     // This field needs to be associated with an
-                                   // asset before it is serialized as a ledger
-                                   // object. Intended for STNumber.
-        sMD_Default = sMD_ChangeOrig | sMD_ChangeNew | sMD_DeleteFinal | sMD_Create
+        SMdNever = 0x00,
+        SMdChangeOrig = 0x01,     // original value when it changes
+        SMdChangeNew = 0x02,      // new value when it changes
+        SMdDeleteFinal = 0x04,    // final value when it is deleted
+        SMdCreate = 0x08,         // value when it's created
+        SMdAlways = 0x10,         // value when node containing it is affected at all
+        SMdBaseTen = 0x20,        // value is treated as base 10, overriding behavior
+        SMdPseudoAccount = 0x40,  // if this field is set in an ACCOUNT_ROOT
+                                  // _only_, then it is a pseudo-account
+        SMdNeedsAsset = 0x80,     // This field needs to be associated with an
+                                  // asset before it is serialized as a ledger
+                                  // object. Intended for STNumber.
+        SMdDefault = SMdChangeOrig | SMdChangeNew | SMdDeleteFinal | SMdCreate
     };
 
-    enum class IsSigning : unsigned char { no, yes };
-    static IsSigning const notSigning = IsSigning::no;
+    enum class IsSigning : unsigned char { No, Yes };
+    static IsSigning const kNOT_SIGNING = IsSigning::No;
 
-    int const fieldCode;               // (type<<16)|index
+    int const fieldCodeMem;            // (type<<16)|index // TODO: rename, clashes with function
     SerializedTypeID const fieldType;  // STI_*
     int const fieldValue;              // Code number for protocol
     std::string const fieldName;
     int const fieldMeta;
     int const fieldNum;
     IsSigning const signingField;
-    Json::StaticString const jsonName;
+    json::StaticString const jsonName;
 
     SField(SField const&) = delete;
     SField&
@@ -165,17 +167,17 @@ public:
     operator=(SField&&) = delete;
 
 public:
-    struct private_access_tag_t;  // public, but still an implementation detail
+    struct PrivateAccessTagT;  // public, but still an implementation detail
 
     // These constructors can only be called from SField.cpp
     SField(
-        private_access_tag_t,
+        PrivateAccessTagT,
         SerializedTypeID tid,
         int fv,
         char const* fn,
-        int meta = sMD_Default,
-        IsSigning signing = IsSigning::yes);
-    explicit SField(private_access_tag_t, int fc, char const* fn);
+        int meta = SMdDefault,
+        IsSigning signing = IsSigning::Yes);
+    explicit SField(PrivateAccessTagT, int fc, char const* fn);
 
     static SField const&
     getField(int fieldCode);
@@ -184,13 +186,13 @@ public:
     static SField const&
     getField(int type, int value)
     {
-        return getField(field_code(type, value));
+        return getField(fieldCode(type, value));
     }
 
     static SField const&
     getField(SerializedTypeID type, int value)
     {
-        return getField(field_code(type, value));
+        return getField(fieldCode(type, value));
     }
 
     [[nodiscard]] std::string const&
@@ -202,16 +204,16 @@ public:
     [[nodiscard]] bool
     hasName() const
     {
-        return fieldCode > 0;
+        return fieldCodeMem > 0;
     }
 
-    [[nodiscard]] Json::StaticString const&
+    [[nodiscard]] json::StaticString const&
     getJsonName() const
     {
         return jsonName;
     }
 
-    operator Json::StaticString const&() const
+    operator json::StaticString const&() const
     {
         return jsonName;
     }
@@ -219,13 +221,13 @@ public:
     [[nodiscard]] bool
     isInvalid() const
     {
-        return fieldCode == -1;
+        return fieldCodeMem == -1;
     }
 
     [[nodiscard]] bool
     isUseful() const
     {
-        return fieldCode > 0;
+        return fieldCodeMem > 0;
     }
 
     [[nodiscard]] bool
@@ -247,7 +249,7 @@ public:
     [[nodiscard]] int
     getCode() const
     {
-        return fieldCode;
+        return fieldCodeMem;
     }
     [[nodiscard]] int
     getNum() const
@@ -269,19 +271,19 @@ public:
     [[nodiscard]] bool
     shouldInclude(bool withSigningField) const
     {
-        return (fieldValue < 256) && (withSigningField || (signingField == IsSigning::yes));
+        return (fieldValue < 256) && (withSigningField || (signingField == IsSigning::Yes));
     }
 
     bool
     operator==(SField const& f) const
     {
-        return fieldCode == f.fieldCode;
+        return fieldCodeMem == f.fieldCodeMem;
     }
 
     bool
     operator!=(SField const& f) const
     {
-        return fieldCode != f.fieldCode;
+        return fieldCodeMem != f.fieldCodeMem;
     }
 
     static int
@@ -306,7 +308,7 @@ struct TypedField : SField
     using type = T;
 
     template <class... Args>
-    explicit TypedField(private_access_tag_t pat, Args&&... args);
+    explicit TypedField(PrivateAccessTagT pat, Args&&... args);
 };
 
 /** Indicate std::optional field semantics. */
@@ -315,7 +317,7 @@ struct OptionaledField
 {
     TypedField<T> const* f;
 
-    explicit OptionaledField(TypedField<T> const& f_) : f(&f_)
+    explicit OptionaledField(TypedField<T> const& f) : f(&f)
     {
     }
 };
@@ -366,8 +368,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 sfInvalid;
-extern SField const sfGeneric;
+extern SField const kSF_INVALID;
+extern SField const kSF_GENERIC;
 
 #include <xrpl/protocol/detail/sfields.macro>
 
diff --git a/include/xrpl/protocol/SOTemplate.h b/include/xrpl/protocol/SOTemplate.h
index 3bfe07d049..72e0573d29 100644
--- a/include/xrpl/protocol/SOTemplate.h
+++ b/include/xrpl/protocol/SOTemplate.h
@@ -14,17 +14,18 @@ namespace xrpl {
 // 2026 usages, 129 files
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum SOEStyle {
-    soeINVALID = -1,
-    soeREQUIRED = 0,  // required
-    soeOPTIONAL = 1,  // optional, may be present with default value
-    soeDEFAULT = 2,   // optional, if present, must not have default value
+    SoeInvalid = -1,
+    SoeRequired = 0,  // required
+    SoeOptional = 1,  // optional, may be present with default value
+    SoeDefault = 2,   // optional, if present, must not have default value
                       // inner object with the default fields has to be
                       // constructed with STObject::makeInnerObject()
 };
 
 // Part of a Python-parsed DSL (transactions.macro); bare enumerator names required by the parser
+/** Amount fields that can support MPT */
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-enum SOETxMPTIssue { soeMPTNone, soeMPTSupported, soeMPTNotSupported };
+enum SOETxMPTIssue { SoeMptNone, SoeMptSupported, SoeMptNotSupported };
 
 //------------------------------------------------------------------------------
 
@@ -34,7 +35,7 @@ class SOElement
     // Use std::reference_wrapper so SOElement can be stored in a std::vector.
     std::reference_wrapper<SField const> sField_;
     SOEStyle style_;
-    SOETxMPTIssue supportMpt_ = soeMPTNone;
+    SOETxMPTIssue supportMpt_ = SoeMptNone;
 
 private:
     void
@@ -60,7 +61,7 @@ public:
     SOElement(
         TypedField<T> const& fieldName,
         SOEStyle style,
-        SOETxMPTIssue supportMpt = soeMPTNotSupported)
+        SOETxMPTIssue supportMpt = SoeMptNotSupported)
         : sField_(fieldName), style_(style), supportMpt_(supportMpt)
     {
         init(fieldName);
diff --git a/include/xrpl/protocol/STAmount.h b/include/xrpl/protocol/STAmount.h
index f681f811b7..7fa6ef88ae 100644
--- a/include/xrpl/protocol/STAmount.h
+++ b/include/xrpl/protocol/STAmount.h
@@ -34,39 +34,39 @@ public:
     using rep = std::pair<mantissa_type, exponent_type>;
 
 private:
-    Asset mAsset;
-    mantissa_type mValue{};
-    exponent_type mOffset;
-    bool mIsNegative{};
+    Asset asset_;
+    mantissa_type value_{};
+    exponent_type offset_;
+    bool isNegative_{};
 
 public:
     using value_type = STAmount;
 
-    constexpr static int cMinOffset = -96;
-    constexpr static int cMaxOffset = 80;
+    constexpr static int kMIN_OFFSET = -96;
+    constexpr static int kMAX_OFFSET = 80;
 
     // Maximum native value supported by the code
-    constexpr static std::uint64_t cMinValue = 1'000'000'000'000'000ull;
-    static_assert(isPowerOfTen(cMinValue));
-    constexpr static std::uint64_t cMaxValue = (cMinValue * 10) - 1;
-    static_assert(cMaxValue == 9'999'999'999'999'999ull);
-    constexpr static std::uint64_t cMaxNative = 9'000'000'000'000'000'000ull;
+    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;
 
     // Max native value on network.
-    constexpr static std::uint64_t cMaxNativeN = 100'000'000'000'000'000ull;
-    constexpr static std::uint64_t cIssuedCurrency = 0x8'000'000'000'000'000ull;
-    constexpr static std::uint64_t cPositive = 0x4'000'000'000'000'000ull;
-    constexpr static std::uint64_t cMPToken = 0x2'000'000'000'000'000ull;
-    constexpr static std::uint64_t cValueMask = ~(cPositive | cMPToken);
+    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 std::uint64_t const uRateOne;
+    static std::uint64_t const kU_RATE_ONE;
 
     //--------------------------------------------------------------------------
     STAmount(SerialIter& sit, SField const& name);
 
-    struct unchecked
+    struct Unchecked
     {
-        explicit unchecked() = default;
+        explicit Unchecked() = default;
     };
 
     // Do not call canonicalize
@@ -77,7 +77,7 @@ public:
         mantissa_type mantissa,
         exponent_type exponent,
         bool negative,
-        unchecked);
+        Unchecked);
 
     template <AssetType A>
     STAmount(
@@ -85,7 +85,7 @@ public:
         mantissa_type mantissa,
         exponent_type exponent,
         bool negative,
-        unchecked);
+        Unchecked);
 
     // Call canonicalize
     template <AssetType A>
@@ -106,7 +106,7 @@ public:
 
     template <AssetType A>
     STAmount(A const& asset, std::uint64_t mantissa = 0, int exponent = 0, bool negative = false)
-        : mAsset(asset), mValue(mantissa), mOffset(exponent), mIsNegative(negative)
+        : asset_(asset), value_(mantissa), offset_(exponent), isNegative_(negative)
     {
         canonicalize();
     }
@@ -179,7 +179,7 @@ public:
     zeroed() const;
 
     void
-    setJson(Json::Value&) const;
+    setJson(json::Value&) const;
 
     [[nodiscard]] STAmount const&
     value() const noexcept;
@@ -241,7 +241,7 @@ public:
     [[nodiscard]] std::string
     getText() const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions = JsonOptions::none) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions = JsonOptions::KNone) const override;
 
     void
     add(Serializer& s) const override;
@@ -293,8 +293,8 @@ STAmount::STAmount(
     mantissa_type mantissa,
     exponent_type exponent,
     bool negative,
-    unchecked)
-    : STBase(name), mAsset(asset), mValue(mantissa), mOffset(exponent), mIsNegative(negative)
+    Unchecked)
+    : STBase(name), asset_(asset), value_(mantissa), offset_(exponent), isNegative_(negative)
 {
 }
 
@@ -304,8 +304,8 @@ STAmount::STAmount(
     mantissa_type mantissa,
     exponent_type exponent,
     bool negative,
-    unchecked)
-    : mAsset(asset), mValue(mantissa), mOffset(exponent), mIsNegative(negative)
+    Unchecked)
+    : asset_(asset), value_(mantissa), offset_(exponent), isNegative_(negative)
 {
 }
 
@@ -316,19 +316,19 @@ STAmount::STAmount(
     std::uint64_t mantissa,
     int exponent,
     bool negative)
-    : STBase(name), mAsset(asset), mValue(mantissa), mOffset(exponent), mIsNegative(negative)
+    : STBase(name), asset_(asset), value_(mantissa), offset_(exponent), isNegative_(negative)
 {
-    // mValue is uint64, but needs to fit in the range of int64
-    if (Number::getMantissaScale() == MantissaRange::mantissa_scale::small)
+    // value_ is uint64, but needs to fit in the range of int64
+    if (Number::getMantissaScale() == MantissaRange::MantissaScale::Small)
     {
         XRPL_ASSERT(
-            mValue <= std::numeric_limits<std::int64_t>::max(),
+            value_ <= std::numeric_limits<std::int64_t>::max(),
             "xrpl::STAmount::STAmount(SField, A, std::uint64_t, int, bool) : "
             "maximum mantissa input");
     }
     else
     {
-        if (integral() && mValue > std::numeric_limits<std::int64_t>::max())
+        if (integral() && value_ > std::numeric_limits<std::int64_t>::max())
             throw std::overflow_error("STAmount mantissa is too large " + std::to_string(mantissa));
     }
     canonicalize();
@@ -336,7 +336,7 @@ STAmount::STAmount(
 
 template <AssetType A>
 STAmount::STAmount(A const& asset, std::int64_t mantissa, int exponent)
-    : mAsset(asset), mOffset(exponent)
+    : asset_(asset), offset_(exponent)
 {
     set(mantissa);
     canonicalize();
@@ -344,42 +344,42 @@ STAmount::STAmount(A const& asset, std::int64_t mantissa, int exponent)
 
 template <AssetType A>
 STAmount::STAmount(A const& asset, std::uint32_t mantissa, int exponent, bool negative)
-    : STAmount(asset, safe_cast<std::uint64_t>(mantissa), exponent, negative)
+    : STAmount(asset, safeCast<std::uint64_t>(mantissa), exponent, negative)
 {
 }
 
 template <AssetType A>
 STAmount::STAmount(A const& asset, int mantissa, int exponent)
-    : STAmount(asset, safe_cast<std::int64_t>(mantissa), exponent)
+    : STAmount(asset, safeCast<std::int64_t>(mantissa), exponent)
 {
 }
 
 // Legacy support for new-style amounts
 inline STAmount::STAmount(IOUAmount const& amount, Issue const& issue)
-    : mAsset(issue), mOffset(amount.exponent()), mIsNegative(amount < beast::zero)
+    : asset_(issue), offset_(amount.exponent()), isNegative_(amount < beast::kZERO)
 {
-    if (mIsNegative)
+    if (isNegative_)
     {
-        mValue = unsafe_cast<std::uint64_t>(-amount.mantissa());
+        value_ = unsafeCast<std::uint64_t>(-amount.mantissa());
     }
     else
     {
-        mValue = unsafe_cast<std::uint64_t>(amount.mantissa());
+        value_ = unsafeCast<std::uint64_t>(amount.mantissa());
     }
 
     canonicalize();
 }
 
 inline STAmount::STAmount(MPTAmount const& amount, MPTIssue const& mptIssue)
-    : mAsset(mptIssue), mOffset(0), mIsNegative(amount < beast::zero)
+    : asset_(mptIssue), offset_(0), isNegative_(amount < beast::kZERO)
 {
-    if (mIsNegative)
+    if (isNegative_)
     {
-        mValue = unsafe_cast<std::uint64_t>(-amount.value());
+        value_ = unsafeCast<std::uint64_t>(-amount.value());
     }
     else
     {
-        mValue = unsafe_cast<std::uint64_t>(amount.value());
+        value_ = unsafeCast<std::uint64_t>(amount.value());
     }
 
     canonicalize();
@@ -399,10 +399,10 @@ STAmount
 amountFromString(Asset const& asset, std::string const& amount);
 
 STAmount
-amountFromJson(SField const& name, Json::Value const& v);
+amountFromJson(SField const& name, json::Value const& v);
 
 bool
-amountFromJsonNoThrow(STAmount& result, Json::Value const& jvSource);
+amountFromJsonNoThrow(STAmount& result, json::Value const& jvSource);
 
 // IOUAmount and XRPAmount define toSTAmount, defining this
 // trivial conversion here makes writing generic code easier
@@ -421,84 +421,84 @@ toSTAmount(STAmount const& a)
 inline int
 STAmount::exponent() const noexcept
 {
-    return mOffset;
+    return offset_;
 }
 
 inline bool
 STAmount::integral() const noexcept
 {
-    return mAsset.integral();
+    return asset_.integral();
 }
 
 inline bool
 STAmount::native() const noexcept
 {
-    return mAsset.native();
+    return asset_.native();
 }
 
 template <ValidIssueType TIss>
 constexpr bool
 STAmount::holds() const noexcept
 {
-    return mAsset.holds<TIss>();
+    return asset_.holds<TIss>();
 }
 
 inline bool
 STAmount::negative() const noexcept
 {
-    return mIsNegative;
+    return isNegative_;
 }
 
 inline std::uint64_t
 STAmount::mantissa() const noexcept
 {
-    return mValue;
+    return value_;
 }
 
 inline Asset const&
 STAmount::asset() const
 {
-    return mAsset;
+    return asset_;
 }
 
 template <ValidIssueType TIss>
 [[nodiscard]] constexpr TIss const&
 STAmount::get() const
 {
-    return mAsset.get<TIss>();
+    return asset_.get<TIss>();
 }
 
 template <ValidIssueType TIss>
 TIss&
 STAmount::get()
 {
-    return mAsset.get<TIss>();
+    return asset_.get<TIss>();
 }
 
 inline AccountID const&
 STAmount::getIssuer() const
 {
-    return mAsset.getIssuer();
+    return asset_.getIssuer();
 }
 
 inline int
 STAmount::signum() const noexcept
 {
-    if (mValue == 0u)
+    if (value_ == 0u)
         return 0;
-    return mIsNegative ? -1 : 1;
+    return isNegative_ ? -1 : 1;
 }
 
 inline STAmount
 STAmount::zeroed() const
 {
-    return STAmount(mAsset);
+    return STAmount(asset_);
 }
 
 inline STAmount::
 operator bool() const noexcept
 {
-    return *this != beast::zero;
+    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(cMinValue, cMaxValue);
+    auto const [mantissa, exponent] = working.normalizeToRange(kMIN_VALUE, kMAX_VALUE);
 
     return STAmount{asset, mantissa, exponent, negative};
 }
@@ -548,8 +548,8 @@ STAmount::fromNumber(A const& a, Number const& number)
 inline void
 STAmount::negate()
 {
-    if (*this != beast::zero)
-        mIsNegative = !mIsNegative;
+    if (*this != beast::kZERO)
+        isNegative_ = !isNegative_;
 }
 
 inline void
@@ -557,9 +557,9 @@ STAmount::clear()
 {
     // The -100 is used to allow 0 to sort less than a small positive values
     // which have a negative exponent.
-    mOffset = integral() ? 0 : -100;
-    mValue = 0;
-    mIsNegative = false;
+    offset_ = integral() ? 0 : -100;
+    value_ = 0;
+    isNegative_ = false;
 }
 
 inline void
@@ -578,7 +578,7 @@ STAmount::value() const noexcept
 inline bool
 isLegalNet(STAmount const& value)
 {
-    return !value.native() || (value.mantissa() <= STAmount::cMaxNativeN);
+    return !value.native() || (value.mantissa() <= STAmount::kMAX_NATIVE_N);
 }
 
 //------------------------------------------------------------------------------
@@ -674,7 +674,7 @@ getRate(STAmount const& offerOut, STAmount const& offerIn);
 roundToScale(
     STAmount const& value,
     std::int32_t scale,
-    Number::rounding_mode rounding = Number::getround());
+    Number::RoundingMode rounding = Number::getround());
 
 /** Round an arbitrary precision Number IN PLACE to the precision of a given
  * Asset.
@@ -709,7 +709,7 @@ roundToAsset(
     A const& asset,
     Number const& value,
     std::int32_t scale,
-    Number::rounding_mode rounding = Number::getround())
+    Number::RoundingMode rounding = Number::getround())
 {
     NumberRoundModeGuard const mg(rounding);
     STAmount const ret{asset, value};
@@ -752,16 +752,16 @@ scale(Number const& number, Asset const& asset)
 }  // namespace xrpl
 
 //------------------------------------------------------------------------------
-namespace Json {
+namespace json {
 template <>
 inline xrpl::STAmount
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
-    Json::StaticString const& key = field.getJsonName();
+    json::StaticString const& key = field.getJsonName();
     if (!v.isMember(key))
         Throw<JsonMissingKeyError>(key);
-    Json::Value const& inner = v[key];
+    json::Value const& inner = v[key];
     return amountFromJson(field, inner);
 }
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/protocol/STArray.h b/include/xrpl/protocol/STArray.h
index f1ac58075b..61753c52dc 100644
--- a/include/xrpl/protocol/STArray.h
+++ b/include/xrpl/protocol/STArray.h
@@ -58,13 +58,28 @@ public:
 
     template <class... Args>
     void
-    emplace_back(Args&&... args);
+    emplaceBack(Args&&... args);
 
     void
-    push_back(STObject const& object);
+    pushBack(STObject const& object);
 
     void
-    push_back(STObject&& object);
+    pushBack(STObject&& object);
+
+    // STL-compatible alias required by std::back_insert_iterator
+    void
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    push_back(STObject const& object)
+    {
+        pushBack(object);
+    }
+
+    void
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    push_back(STObject&& object)
+    {
+        pushBack(std::move(object));
+    }
 
     iterator
     begin();
@@ -99,7 +114,7 @@ public:
     [[nodiscard]] std::string
     getText() const override;
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson(JsonOptions index) const override;
 
     void
@@ -180,19 +195,19 @@ STArray::back() const
 
 template <class... Args>
 inline void
-STArray::emplace_back(Args&&... args)
+STArray::emplaceBack(Args&&... args)
 {
     v_.emplace_back(std::forward<Args>(args)...);
 }
 
 inline void
-STArray::push_back(STObject const& object)
+STArray::pushBack(STObject const& object)
 {
     v_.push_back(object);
 }
 
 inline void
-STArray::push_back(STObject&& object)
+STArray::pushBack(STObject&& object)
 {
     v_.push_back(std::move(object));
 }
diff --git a/include/xrpl/protocol/STBase.h b/include/xrpl/protocol/STBase.h
index 7ebf22fe8f..cba0bfbe74 100644
--- a/include/xrpl/protocol/STBase.h
+++ b/include/xrpl/protocol/STBase.h
@@ -20,14 +20,14 @@ struct JsonOptions
 
     // Bitwise flags with operator~
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum values : underlying_t {
+    enum Values : underlying_t {
         // clang-format off
-        none                        = 0b0000'0000,
-        include_date                = 0b0000'0001,
-        disable_API_prior_V2        = 0b0000'0010,
+        KNone                       = 0b0000'0000,
+        KIncludeDate               = 0b0000'0001,
+        KDisableApiPriorV2       = 0b0000'0010,
 
-        // IMPORTANT `_all` must be union of all of the above; see also operator~
-        _all                        = 0b0000'0011
+        // IMPORTANT `kALL` must be union of all of the above; see also operator~
+        KAll                        = 0b0000'0011
         // clang-format on
     };
 
@@ -65,22 +65,22 @@ struct JsonOptions
     }
 
     /// Returns JsonOptions binary negation, can be used with & (above) for set
-    /// difference e.g. `(options & ~JsonOptions::include_date)`
+    /// difference e.g. `(options & ~JsonOptions::kINCLUDE_DATE)`
     [[nodiscard]] constexpr JsonOptions friend
     operator~(JsonOptions v) noexcept
     {
-        return {~v.value & static_cast<underlying_t>(_all)};
+        return {~v.value & static_cast<underlying_t>(KAll)};
     }
 };
 
 template <typename T>
     requires requires(T const& t) {
-        { t.getJson(JsonOptions::none) } -> std::convertible_to<Json::Value>;
+        { t.getJson(JsonOptions::KNone) } -> std::convertible_to<json::Value>;
     }
-Json::Value
-to_json(T const& t)
+json::Value
+toJson(T const& t)
 {
-    return t.getJson(JsonOptions::none);
+    return t.getJson(JsonOptions::KNone);
 }
 
 namespace detail {
@@ -115,7 +115,7 @@ class STVar;
 */
 class STBase
 {
-    SField const* fName;
+    SField const* fName_;
 
 public:
     virtual ~STBase() = default;
@@ -148,7 +148,7 @@ public:
     [[nodiscard]] virtual std::string
     getText() const;
 
-    [[nodiscard]] virtual Json::Value getJson(JsonOptions = JsonOptions::none) const;
+    [[nodiscard]] virtual json::Value getJson(JsonOptions = JsonOptions::KNone) const;
 
     virtual void
     add(Serializer& s) const;
diff --git a/include/xrpl/protocol/STBitString.h b/include/xrpl/protocol/STBitString.h
index 6f2e08e401..efb98cfe27 100644
--- a/include/xrpl/protocol/STBitString.h
+++ b/include/xrpl/protocol/STBitString.h
@@ -16,7 +16,7 @@ class STBitString final : public STBase, public CountedObject<STBitString<Bits>>
     static_assert(Bits > 0, "Number of bits must be positive");
 
 public:
-    using value_type = base_uint<Bits>;
+    using value_type = BaseUint<Bits>;
 
 private:
     value_type value_{};
@@ -46,7 +46,7 @@ public:
 
     template <typename Tag>
     void
-    setValue(base_uint<Bits, Tag> const& v);
+    setValue(BaseUint<Bits, Tag> const& v);
 
     [[nodiscard]] value_type const&
     value() const;
@@ -157,7 +157,7 @@ STBitString<Bits>::add(Serializer& s) const
 template <int Bits>
 template <typename Tag>
 void
-STBitString<Bits>::setValue(base_uint<Bits, Tag> const& v)
+STBitString<Bits>::setValue(BaseUint<Bits, Tag> const& v)
 {
     value_ = v;
 }
@@ -180,7 +180,7 @@ template <int Bits>
 bool
 STBitString<Bits>::isDefault() const
 {
-    return value_ == beast::zero;
+    return value_ == beast::kZERO;
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STBlob.h b/include/xrpl/protocol/STBlob.h
index 0667c54e30..84f44f1b78 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 = sfGeneric);
+    STBlob(SerialIter&, SField const& name = kSF_GENERIC);
 
     [[nodiscard]] std::size_t
     size() const;
diff --git a/include/xrpl/protocol/STCurrency.h b/include/xrpl/protocol/STCurrency.h
index a81b589a2c..55d1ab1e74 100644
--- a/include/xrpl/protocol/STCurrency.h
+++ b/include/xrpl/protocol/STCurrency.h
@@ -39,7 +39,7 @@ public:
     [[nodiscard]] std::string
     getText() const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     void
     add(Serializer& s) const override;
@@ -63,7 +63,7 @@ private:
 };
 
 STCurrency
-currencyFromJson(SField const& name, Json::Value const& v);
+currencyFromJson(SField const& name, json::Value const& v);
 
 inline Currency const&
 STCurrency::currency() const
diff --git a/include/xrpl/protocol/STInteger.h b/include/xrpl/protocol/STInteger.h
index 5f6e8c8800..4e3c9a8923 100644
--- a/include/xrpl/protocol/STInteger.h
+++ b/include/xrpl/protocol/STInteger.h
@@ -22,7 +22,7 @@ public:
     [[nodiscard]] SerializedTypeID
     getSType() const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     [[nodiscard]] std::string
     getText() const override;
diff --git a/include/xrpl/protocol/STIssue.h b/include/xrpl/protocol/STIssue.h
index 8a64f39336..f5e1f61168 100644
--- a/include/xrpl/protocol/STIssue.h
+++ b/include/xrpl/protocol/STIssue.h
@@ -49,7 +49,7 @@ public:
     [[nodiscard]] std::string
     getText() const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     void
     add(Serializer& s) const override;
@@ -89,7 +89,7 @@ STIssue::STIssue(SField const& name, A const& asset) : STBase{name}, asset_{asse
 }
 
 STIssue
-issueFromJson(SField const& name, Json::Value const& v);
+issueFromJson(SField const& name, json::Value const& v);
 
 template <ValidIssueType TIss>
 bool
diff --git a/include/xrpl/protocol/STLedgerEntry.h b/include/xrpl/protocol/STLedgerEntry.h
index 2e884bc2bf..e37b132806 100644
--- a/include/xrpl/protocol/STLedgerEntry.h
+++ b/include/xrpl/protocol/STLedgerEntry.h
@@ -37,8 +37,8 @@ public:
     [[nodiscard]] std::string
     getText() const override;
 
-    [[nodiscard]] Json::Value
-    getJson(JsonOptions options = JsonOptions::none) const override;
+    [[nodiscard]] json::Value
+    getJson(JsonOptions options = JsonOptions::KNone) const override;
 
     /** Returns the 'key' (or 'index') of this item.
         The key identifies this entry's position in
diff --git a/include/xrpl/protocol/STNumber.h b/include/xrpl/protocol/STNumber.h
index 802bdf671f..8594a292f4 100644
--- a/include/xrpl/protocol/STNumber.h
+++ b/include/xrpl/protocol/STNumber.h
@@ -96,6 +96,6 @@ NumberParts
 partsFromString(std::string const& number);
 
 STNumber
-numberFromJson(SField const& field, Json::Value const& value);
+numberFromJson(SField const& field, json::Value const& value);
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STObject.h b/include/xrpl/protocol/STObject.h
index 187bde6dae..a9e46e8717 100644
--- a/include/xrpl/protocol/STObject.h
+++ b/include/xrpl/protocol/STObject.h
@@ -57,7 +57,7 @@ class STObject : public STBase, public CountedObject<STObject>
     using list_type = std::vector<detail::STVar>;
 
     list_type v_;
-    SOTemplate const* mType{};
+    SOTemplate const* type_{};
 
 public:
     using iterator = boost::transform_iterator<Transform, STObject::list_type::const_iterator>;
@@ -132,7 +132,7 @@ public:
     getText() const override;
 
     // TODO(tom): options should be an enum.
-    [[nodiscard]] Json::Value getJson(JsonOptions = JsonOptions::none) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions = JsonOptions::KNone) const override;
 
     void
     addWithoutSigningFields(Serializer& s) const;
@@ -142,7 +142,7 @@ public:
 
     template <class... Args>
     std::size_t
-    emplace_back(Args&&... args);
+    emplaceBack(Args&&... args);
 
     [[nodiscard]] int
     getCount() const;
@@ -381,7 +381,7 @@ public:
 
     template <class Tag>
     void
-    setFieldH160(SField const& field, base_uint<160, Tag> const& v);
+    setFieldH160(SField const& field, BaseUint<160, Tag> const& v);
 
     STObject&
     peekFieldObject(SField const& field);
@@ -415,9 +415,9 @@ public:
 private:
     enum class WhichFields : bool {
         // These values are carefully chosen to do the right thing if passed
-        // to SField::shouldInclude (bool) via static_cast<bool>
-        omitSigningFields = false,
-        withAllFields = true
+        // to SField::shouldInclude (bool)
+        OmitSigningFields = false,
+        WithAllFields = true
     };
 
     void
@@ -667,7 +667,7 @@ public:
 
     // Emulate std::optional::value_or
     [[nodiscard]] value_type
-    value_or(value_type val) const;
+    valueOr(value_type val) const;
 
     OptionalProxy&
     operator=(std::nullopt_t const&);
@@ -692,7 +692,7 @@ private:
     disengage();
 
     [[nodiscard]] optional_type
-    optional_value() const;
+    optionalValue() const;
 };
 
 class STObject::FieldErr : public std::runtime_error
@@ -703,16 +703,16 @@ class STObject::FieldErr : public std::runtime_error
 template <class T>
 STObject::Proxy<T>::Proxy(STObject* st, TypedField<T> const* f) : st_(st), f_(f)
 {
-    if (st_->mType != nullptr)
+    if (st_->type_ != nullptr)
     {
         // STObject has associated template
         if (!st_->peekAtPField(*f_))
             Throw<STObject::FieldErr>("Template field error '" + this->f_->getName() + "'");
-        style_ = st_->mType->style(*f_);
+        style_ = st_->type_->style(*f_);
     }
     else
     {
-        style_ = soeINVALID;
+        style_ = SoeInvalid;
     }
 }
 
@@ -723,11 +723,11 @@ STObject::Proxy<T>::value() const -> value_type
     auto const t = find();
     if (t)
         return t->value();
-    if (style_ == soeINVALID)
+    if (style_ == SoeInvalid)
     {
         Throw<STObject::FieldErr>("Value requested from invalid STObject.");
     }
-    if (style_ != soeDEFAULT)
+    if (style_ != SoeDefault)
     {
         Throw<STObject::FieldErr>("Missing field '" + this->f_->getName() + "'");
     }
@@ -762,13 +762,13 @@ template <class U>
 void
 STObject::Proxy<T>::assign(U&& u)
 {
-    if (style_ == soeDEFAULT && u == value_type{})
+    if (style_ == SoeDefault && u == value_type{})
     {
         st_->makeFieldAbsent(*f_);
         return;
     }
     T* t = nullptr;
-    if (style_ == soeINVALID)
+    if (style_ == SoeInvalid)
     {
         t = dynamic_cast<T*>(st_->getPField(*f_, true));
     }
@@ -836,14 +836,14 @@ template <class T>
 STObject::OptionalProxy<T>::
 operator typename STObject::OptionalProxy<T>::optional_type() const
 {
-    return optional_value();
+    return optionalValue();
 }
 
 template <class T>
 typename STObject::OptionalProxy<T>::optional_type
 STObject::OptionalProxy<T>::operator~() const
 {
-    return optional_value();
+    return optionalValue();
 }
 
 template <class T>
@@ -904,16 +904,16 @@ template <class T>
 bool
 STObject::OptionalProxy<T>::engaged() const noexcept
 {
-    return this->style_ == soeDEFAULT || this->find() != nullptr;
+    return this->style_ == SoeDefault || this->find() != nullptr;
 }
 
 template <class T>
 void
 STObject::OptionalProxy<T>::disengage()
 {
-    if (this->style_ == soeREQUIRED || this->style_ == soeDEFAULT)
+    if (this->style_ == SoeRequired || this->style_ == SoeDefault)
         Throw<STObject::FieldErr>("Template field error '" + this->f_->getName() + "'");
-    if (this->style_ == soeINVALID)
+    if (this->style_ == SoeInvalid)
     {
         this->st_->delField(*this->f_);
     }
@@ -925,7 +925,7 @@ STObject::OptionalProxy<T>::disengage()
 
 template <class T>
 auto
-STObject::OptionalProxy<T>::optional_value() const -> optional_type
+STObject::OptionalProxy<T>::optionalValue() const -> optional_type
 {
     if (!engaged())
         return std::nullopt;
@@ -934,7 +934,7 @@ STObject::OptionalProxy<T>::optional_value() const -> optional_type
 
 template <class T>
 typename STObject::OptionalProxy<T>::value_type
-STObject::OptionalProxy<T>::value_or(value_type val) const
+STObject::OptionalProxy<T>::valueOr(value_type val) const
 {
     return engaged() ? this->value() : val;
 }
@@ -981,13 +981,13 @@ STObject::reserve(std::size_t n)
 inline bool
 STObject::isFree() const
 {
-    return mType == nullptr;
+    return type_ == nullptr;
 }
 
 inline void
 STObject::addWithoutSigningFields(Serializer& s) const
 {
-    add(s, WhichFields::omitSigningFields);
+    add(s, WhichFields::OmitSigningFields);
 }
 
 // VFALCO NOTE does this return an expensive copy of an object with a
@@ -997,13 +997,13 @@ inline Serializer
 STObject::getSerializer() const
 {
     Serializer s;
-    add(s, WhichFields::withAllFields);
+    add(s, WhichFields::WithAllFields);
     return s;
 }
 
 template <class... Args>
 inline std::size_t
-STObject::emplace_back(Args&&... args)
+STObject::emplaceBack(Args&&... args)
 {
     v_.emplace_back(std::forward<Args>(args)...);
     return v_.size() - 1;
@@ -1082,21 +1082,21 @@ STObject::at(TypedField<T> const& f) const
     if (auto const u = dynamic_cast<T const*>(b))
         return u->value();
 
-    XRPL_ASSERT(mType, "xrpl::STObject::at(TypedField auto) : field template non-null");
+    XRPL_ASSERT(type_, "xrpl::STObject::at(TypedField auto) : field template non-null");
     XRPL_ASSERT(
         b->getSType() == STI_NOTPRESENT, "xrpl::STObject::at(TypedField auto) : type not present");
 
-    if (mType->style(f) == soeOPTIONAL)
+    if (type_->style(f) == SoeOptional)
         Throw<STObject::FieldErr>("Missing optional field: " + f.getName());
 
     XRPL_ASSERT(
-        mType->style(f) == soeDEFAULT,
+        type_->style(f) == SoeDefault,
         "xrpl::STObject::at(TypedField auto) : template style is default");
 
     // Used to help handle the case where value_type is a const reference,
     // otherwise we would return the address of a temporary.
-    static std::decay_t<typename T::value_type> const dv{};
-    return dv;
+    static std::decay_t<typename T::value_type> const kDV{};
+    return kDV;
 }
 
 template <class T>
@@ -1110,16 +1110,16 @@ STObject::at(OptionaledField<T> const& of) const
     if (!u)
     {
         XRPL_ASSERT(
-            mType,
+            type_,
             "xrpl::STObject::at(OptionaledField auto) : field template "
             "non-null");
         XRPL_ASSERT(
             b->getSType() == STI_NOTPRESENT,
             "xrpl::STObject::at(OptionaledField auto) : type not present");
-        if (mType->style(*of.f) == soeOPTIONAL)
+        if (type_->style(*of.f) == SoeOptional)
             return std::nullopt;
         XRPL_ASSERT(
-            mType->style(*of.f) == soeDEFAULT,
+            type_->style(*of.f) == SoeDefault,
             "xrpl::STObject::at(OptionaledField auto) : template style is "
             "default");
         return typename T::value_type{};
@@ -1143,7 +1143,7 @@ STObject::at(OptionaledField<T> const& of) -> OptionalProxy<T>
 
 template <class Tag>
 void
-STObject::setFieldH160(SField const& field, base_uint<160, Tag> const& v)
+STObject::setFieldH160(SField const& field, BaseUint<160, Tag> const& v)
 {
     STBase* rf = getPField(field, true);
 
diff --git a/include/xrpl/protocol/STParsedJSON.h b/include/xrpl/protocol/STParsedJSON.h
index 772785fd70..d5b4f33be7 100644
--- a/include/xrpl/protocol/STParsedJSON.h
+++ b/include/xrpl/protocol/STParsedJSON.h
@@ -19,7 +19,7 @@ public:
         @param name The name of the JSON field, used in diagnostics.
         @param json The JSON-RPC to parse.
     */
-    STParsedJSONObject(std::string const& name, Json::Value const& json);
+    STParsedJSONObject(std::string const& name, json::Value const& json);
 
     STParsedJSONObject() = delete;
     STParsedJSONObject(STParsedJSONObject const&) = delete;
@@ -31,7 +31,7 @@ public:
     std::optional<STObject> object;
 
     /** On failure, an appropriate set of error values. */
-    Json::Value error;
+    json::Value error;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STPathSet.h b/include/xrpl/protocol/STPathSet.h
index ce9a73523c..a1891164f6 100644
--- a/include/xrpl/protocol/STPathSet.h
+++ b/include/xrpl/protocol/STPathSet.h
@@ -16,10 +16,10 @@ namespace xrpl {
 
 class STPathElement final : public CountedObject<STPathElement>
 {
-    unsigned int mType;
-    AccountID mAccountID;
-    PathAsset mAssetID;
-    AccountID mIssuerID;
+    unsigned int type_;
+    AccountID accountID_;
+    PathAsset assetID_;
+    AccountID issuerID_;
 
     bool is_offer_;
     std::size_t hash_value_;
@@ -28,14 +28,14 @@ public:
     // Bitwise values (typeCurrency | typeMPT)
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum Type {
-        typeNone = 0x00,
-        typeAccount = 0x01,   // Rippling through an account (vs taking an offer).
-        typeCurrency = 0x10,  // Currency follows.
-        typeIssuer = 0x20,    // Issuer follows.
-        typeMPT = 0x40,       // MPT follows.
-        typeBoundary = 0xFF,  // Boundary between alternate paths.
-        typeAsset = typeCurrency | typeMPT,
-        typeAll = typeAccount | typeCurrency | typeIssuer | typeMPT,
+        TypeNone = 0x00,
+        TypeAccount = 0x01,   // Rippling through an account (vs taking an offer).
+        TypeCurrency = 0x10,  // Currency follows.
+        TypeIssuer = 0x20,    // Issuer follows.
+        TypeMpt = 0x40,       // MPT follows.
+        TypeBoundary = 0xFF,  // Boundary between alternate paths.
+        TypeAsset = TypeCurrency | TypeMpt,
+        TypeAll = TypeAccount | TypeCurrency | TypeIssuer | TypeMpt,
         // Combination of all types.
     };
 
@@ -113,12 +113,12 @@ public:
 
 private:
     static std::size_t
-    get_hash(STPathElement const& element);
+    getHash(STPathElement const& element);
 };
 
 class STPath final : public CountedObject<STPath>
 {
-    std::vector<STPathElement> mPath;
+    std::vector<STPathElement> path_;
 
 public:
     STPath() = default;
@@ -132,16 +132,16 @@ public:
     empty() const;
 
     void
-    push_back(STPathElement const& e);
+    pushBack(STPathElement const& e);
 
     template <typename... Args>
     void
-    emplace_back(Args&&... args);
+    emplaceBack(Args&&... args);
 
     [[nodiscard]] bool
     hasSeen(AccountID const& account, PathAsset const& asset, AccountID const& issuer) const;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const;
+    [[nodiscard]] json::Value getJson(JsonOptions) const;
 
     [[nodiscard]] std::vector<STPathElement>::const_iterator
     begin() const;
@@ -173,7 +173,7 @@ public:
 // A set of zero or more payment paths
 class STPathSet final : public STBase, public CountedObject<STPathSet>
 {
-    std::vector<STPath> value;
+    std::vector<STPath> value_;
 
 public:
     STPathSet() = default;
@@ -184,7 +184,7 @@ public:
     void
     add(Serializer& s) const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     [[nodiscard]] SerializedTypeID
     getSType() const override;
@@ -218,11 +218,11 @@ public:
     empty() const;
 
     void
-    push_back(STPath const& e);
+    pushBack(STPath const& e);
 
     template <typename... Args>
     void
-    emplace_back(Args&&... args);
+    emplaceBack(Args&&... args);
 
 private:
     STBase*
@@ -235,16 +235,16 @@ private:
 
 // ------------ STPathElement ------------
 
-inline STPathElement::STPathElement() : mType(typeNone), is_offer_(true)
+inline STPathElement::STPathElement() : type_(TypeNone), is_offer_(true)
 {
-    hash_value_ = get_hash(*this);
+    hash_value_ = getHash(*this);
 }
 
 inline STPathElement::STPathElement(
     std::optional<AccountID> const& account,
     std::optional<PathAsset> const& asset,
     std::optional<AccountID> const& issuer)
-    : mType(typeNone)
+    : type_(TypeNone)
 {
     if (!account)
     {
@@ -253,26 +253,26 @@ inline STPathElement::STPathElement(
     else
     {
         is_offer_ = false;
-        mAccountID = *account;
-        mType |= typeAccount;
+        accountID_ = *account;
+        type_ |= TypeAccount;
         XRPL_ASSERT(
-            mAccountID != noAccount(), "xrpl::STPathElement::STPathElement : account is set");
+            accountID_ != noAccount(), "xrpl::STPathElement::STPathElement : account is set");
     }
 
     if (asset)
     {
-        mAssetID = *asset;
-        mType |= mAssetID.holds<Currency>() ? typeCurrency : typeMPT;
+        assetID_ = *asset;
+        type_ |= assetID_.holds<Currency>() ? TypeCurrency : TypeMpt;
     }
 
     if (issuer)
     {
-        mIssuerID = *issuer;
-        mType |= typeIssuer;
-        XRPL_ASSERT(mIssuerID != noAccount(), "xrpl::STPathElement::STPathElement : issuer is set");
+        issuerID_ = *issuer;
+        type_ |= TypeIssuer;
+        XRPL_ASSERT(issuerID_ != noAccount(), "xrpl::STPathElement::STPathElement : issuer is set");
     }
 
-    hash_value_ = get_hash(*this);
+    hash_value_ = getHash(*this);
 }
 
 inline STPathElement::STPathElement(
@@ -280,22 +280,22 @@ inline STPathElement::STPathElement(
     PathAsset const& asset,
     AccountID const& issuer,
     bool forceAsset)
-    : mType(typeNone)
-    , mAccountID(account)
-    , mAssetID(asset)
-    , mIssuerID(issuer)
-    , is_offer_(isXRP(mAccountID))
+    : type_(TypeNone)
+    , accountID_(account)
+    , assetID_(asset)
+    , issuerID_(issuer)
+    , is_offer_(isXRP(accountID_))
 {
     if (!is_offer_)
-        mType |= typeAccount;
+        type_ |= TypeAccount;
 
-    if (forceAsset || !isXRP(mAssetID))
-        mType |= asset.holds<Currency>() ? typeCurrency : typeMPT;
+    if (forceAsset || !isXRP(assetID_))
+        type_ |= asset.holds<Currency>() ? TypeCurrency : TypeMpt;
 
     if (!isXRP(issuer))
-        mType |= typeIssuer;
+        type_ |= TypeIssuer;
 
-    hash_value_ = get_hash(*this);
+    hash_value_ = getHash(*this);
 }
 
 inline STPathElement::STPathElement(
@@ -303,24 +303,22 @@ inline STPathElement::STPathElement(
     AccountID const& account,
     PathAsset const& asset,
     AccountID const& issuer)
-    : mType(uType)
-    , mAccountID(account)
-    , mAssetID(asset)
-    , mIssuerID(issuer)
-    , is_offer_(isXRP(mAccountID))
+    : type_(uType)
+    , accountID_(account)
+    , assetID_(asset)
+    , issuerID_(issuer)
+    , is_offer_(isXRP(accountID_))
 {
-    // uType could be assetType; i.e. either Currency or MPTID.
-    // Get the actual type.
-    mAssetID.visit(
-        [&](Currency const&) { mType = mType & (~Type::typeMPT); },
-        [&](MPTID const&) { mType = mType & (~Type::typeCurrency); });
-    hash_value_ = get_hash(*this);
+    assetID_.visit(
+        [&](Currency const&) { type_ = type_ & (~Type::TypeMpt); },
+        [&](MPTID const&) { type_ = type_ & (~Type::TypeCurrency); });
+    hash_value_ = getHash(*this);
 }
 
 inline auto
 STPathElement::getNodeType() const
 {
-    return mType;
+    return type_;
 }
 
 inline bool
@@ -338,37 +336,37 @@ STPathElement::isAccount() const
 inline bool
 STPathElement::isType(Type const& pe) const
 {
-    return (mType & pe) != 0u;
+    return (type_ & pe) != 0u;
 }
 
 inline bool
 STPathElement::hasIssuer() const
 {
-    return isType(STPathElement::typeIssuer);
+    return isType(STPathElement::TypeIssuer);
 }
 
 inline bool
 STPathElement::hasCurrency() const
 {
-    return isType(STPathElement::typeCurrency);
+    return isType(STPathElement::TypeCurrency);
 }
 
 inline bool
 STPathElement::hasMPT() const
 {
-    return isType(STPathElement::typeMPT);
+    return isType(STPathElement::TypeMpt);
 }
 
 inline bool
 STPathElement::hasAsset() const
 {
-    return isType(STPathElement::typeAsset);
+    return isType(STPathElement::TypeAsset);
 }
 
 inline bool
 STPathElement::isNone() const
 {
-    return getNodeType() == STPathElement::typeNone;
+    return getNodeType() == STPathElement::TypeNone;
 }
 
 // Nodes are either an account ID or a offer prefix. Offer prefixs denote a
@@ -376,38 +374,38 @@ STPathElement::isNone() const
 inline AccountID const&
 STPathElement::getAccountID() const
 {
-    return mAccountID;
+    return accountID_;
 }
 
 inline PathAsset const&
 STPathElement::getPathAsset() const
 {
-    return mAssetID;
+    return assetID_;
 }
 
 inline Currency const&
 STPathElement::getCurrency() const
 {
-    return mAssetID.get<Currency>();
+    return assetID_.get<Currency>();
 }
 
 inline MPTID const&
 STPathElement::getMPTID() const
 {
-    return mAssetID.get<MPTID>();
+    return assetID_.get<MPTID>();
 }
 
 inline AccountID const&
 STPathElement::getIssuerID() const
 {
-    return mIssuerID;
+    return issuerID_;
 }
 
 inline bool
 STPathElement::operator==(STPathElement const& t) const
 {
-    return (mType & typeAccount) == (t.mType & typeAccount) && hash_value_ == t.hash_value_ &&
-        mAccountID == t.mAccountID && mAssetID == t.mAssetID && mIssuerID == t.mIssuerID;
+    return (type_ & TypeAccount) == (t.type_ & TypeAccount) && hash_value_ == t.hash_value_ &&
+        accountID_ == t.accountID_ && assetID_ == t.assetID_ && issuerID_ == t.issuerID_;
 }
 
 inline bool
@@ -418,81 +416,81 @@ STPathElement::operator!=(STPathElement const& t) const
 
 // ------------ STPath ------------
 
-inline STPath::STPath(std::vector<STPathElement> p) : mPath(std::move(p))
+inline STPath::STPath(std::vector<STPathElement> p) : path_(std::move(p))
 {
 }
 
 inline std::vector<STPathElement>::size_type
 STPath::size() const
 {
-    return mPath.size();
+    return path_.size();
 }
 
 inline bool
 STPath::empty() const
 {
-    return mPath.empty();
+    return path_.empty();
 }
 
 inline void
-STPath::push_back(STPathElement const& e)
+STPath::pushBack(STPathElement const& e)
 {
-    mPath.push_back(e);
+    path_.push_back(e);
 }
 
 template <typename... Args>
 inline void
-STPath::emplace_back(Args&&... args)
+STPath::emplaceBack(Args&&... args)
 {
-    mPath.emplace_back(std::forward<Args>(args)...);
+    path_.emplace_back(std::forward<Args>(args)...);
 }
 
 inline std::vector<STPathElement>::const_iterator
 STPath::begin() const
 {
-    return mPath.begin();
+    return path_.begin();
 }
 
 inline std::vector<STPathElement>::const_iterator
 STPath::end() const
 {
-    return mPath.end();
+    return path_.end();
 }
 
 inline bool
 STPath::operator==(STPath const& t) const
 {
-    return mPath == t.mPath;
+    return path_ == t.path_;
 }
 
 inline std::vector<STPathElement>::const_reference
 STPath::back() const
 {
-    return mPath.back();
+    return path_.back();
 }
 
 inline std::vector<STPathElement>::const_reference
 STPath::front() const
 {
-    return mPath.front();
+    return path_.front();
 }
 
 inline STPathElement&
 STPath::operator[](int i)
 {
-    return mPath[i];
+    return path_[i];
 }
 
 inline STPathElement const&
 STPath::operator[](int i) const
 {
-    return mPath[i];
+    return path_[i];
 }
 
 inline void
 STPath::reserve(size_t s)
 {
-    mPath.reserve(s);
+    path_.reserve(s);
 }
 
 // ------------ STPathSet ------------
@@ -505,50 +503,50 @@ inline STPathSet::STPathSet(SField const& n) : STBase(n)
 inline std::vector<STPath>::const_reference
 STPathSet::operator[](std::vector<STPath>::size_type n) const
 {
-    return value[n];
+    return value_[n];
 }
 
 inline std::vector<STPath>::reference
 STPathSet::operator[](std::vector<STPath>::size_type n)
 {
-    return value[n];
+    return value_[n];
 }
 
 inline std::vector<STPath>::const_iterator
 STPathSet::begin() const
 {
-    return value.begin();
+    return value_.begin();
 }
 
 inline std::vector<STPath>::const_iterator
 STPathSet::end() const
 {
-    return value.end();
+    return value_.end();
 }
 
 inline std::vector<STPath>::size_type
 STPathSet::size() const
 {
-    return value.size();
+    return value_.size();
 }
 
 inline bool
 STPathSet::empty() const
 {
-    return value.empty();
+    return value_.empty();
 }
 
 inline void
-STPathSet::push_back(STPath const& e)
+STPathSet::pushBack(STPath const& e)
 {
-    value.push_back(e);
+    value_.push_back(e);
 }
 
 template <typename... Args>
 inline void
-STPathSet::emplace_back(Args&&... args)
+STPathSet::emplaceBack(Args&&... args)
 {
-    value.emplace_back(std::forward<Args>(args)...);
+    value_.emplace_back(std::forward<Args>(args)...);
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STTx.h b/include/xrpl/protocol/STTx.h
index b27d9e0637..d1bd32848f 100644
--- a/include/xrpl/protocol/STTx.h
+++ b/include/xrpl/protocol/STTx.h
@@ -16,12 +16,12 @@
 namespace xrpl {
 
 enum class TxnSql : char {
-    txnSqlNew = 'N',
-    txnSqlConflict = 'C',
-    txnSqlHeld = 'H',
-    txnSqlValidated = 'V',
-    txnSqlIncluded = 'I',
-    txnSqlUnknown = 'U'
+    New = 'N',
+    Conflict = 'C',
+    Held = 'H',
+    Validated = 'V',
+    Included = 'I',
+    Unknown = 'U'
 };
 
 class STTx final : public STObject, public CountedObject<STTx>
@@ -30,8 +30,8 @@ class STTx final : public STObject, public CountedObject<STTx>
     TxType tx_type_;
 
 public:
-    static constexpr std::size_t minMultiSigners = 1;
-    static constexpr std::size_t maxMultiSigners = 32;
+    static constexpr std::size_t kMIN_MULTI_SIGNERS = 1;
+    static constexpr std::size_t kMAX_MULTI_SIGNERS = 32;
 
     STTx() = delete;
     STTx(STTx const& other) = default;
@@ -92,10 +92,10 @@ public:
     uint256
     getTransactionID() const;
 
-    Json::Value
+    json::Value
     getJson(JsonOptions options) const override;
 
-    Json::Value
+    json::Value
     getJson(JsonOptions options, bool binary) const;
 
     void
diff --git a/include/xrpl/protocol/STValidation.h b/include/xrpl/protocol/STValidation.h
index c645336b59..27d5ef1051 100644
--- a/include/xrpl/protocol/STValidation.h
+++ b/include/xrpl/protocol/STValidation.h
@@ -16,14 +16,14 @@ namespace xrpl {
 // Validation flags
 
 // This is a full (as opposed to a partial) validation
-constexpr std::uint32_t vfFullValidation = 0x00000001;
+constexpr std::uint32_t kVF_FULL_VALIDATION = 0x00000001;
 
 // The signature is fully canonical
-constexpr std::uint32_t vfFullyCanonicalSig = 0x80000000;
+constexpr std::uint32_t kVF_FULLY_CANONICAL_SIG = 0x80000000;
 
 class STValidation final : public STObject, public CountedObject<STValidation>
 {
-    bool mTrusted = false;
+    bool trusted_ = false;
 
     // Determines the validity of the signature in this validation; unseated
     // optional if we haven't yet checked it, a boolean otherwise.
@@ -151,7 +151,7 @@ STValidation::STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, bool ch
     , signingPubKey_([this]() {
         auto const spk = getFieldVL(sfSigningPubKey);
 
-        if (publicKeyType(makeSlice(spk)) != KeyType::secp256k1)
+        if (publicKeyType(makeSlice(spk)) != KeyType::Secp256k1)
             Throw<std::runtime_error>("Invalid public key in validation");
 
         return PublicKey{makeSlice(spk)};
@@ -161,7 +161,7 @@ STValidation::STValidation(SerialIter& sit, LookupNodeID&& lookupNodeID, bool ch
     if (checkSignature && !isValid())
     {
         JLOG(debugLog().error()) << "Invalid signature in validation: "
-                                 << getJson(JsonOptions::none);
+                                 << getJson(JsonOptions::KNone);
         Throw<std::runtime_error>("Invalid signature in validation");
     }
 
@@ -194,8 +194,8 @@ STValidation::STValidation(
         "node");
 
     // First, set our own public key:
-    if (publicKeyType(pk) != KeyType::secp256k1)
-        LogicError("We can only use secp256k1 keys for signing validations");
+    if (publicKeyType(pk) != KeyType::Secp256k1)
+        logicError("We can only use secp256k1 keys for signing validations");
 
     setFieldVL(sfSigningPubKey, pk.slice());
     setFieldU32(sfSigningTime, signTime.time_since_epoch().count());
@@ -204,15 +204,15 @@ STValidation::STValidation(
     f(*this);
 
     // Finally, sign the validation and mark it as trusted:
-    setFlag(vfFullyCanonicalSig);
+    setFlag(kVF_FULLY_CANONICAL_SIG);
     setFieldVL(sfSignature, signDigest(pk, sk, getSigningHash()));
     setTrusted();
 
     // Check to ensure that all required fields are present.
     for (auto const& e : validationFormat())
     {
-        if (e.style() == soeREQUIRED && !isFieldPresent(e.sField()))
-            LogicError("Required field '" + e.sField().getName() + "' missing from validation.");
+        if (e.style() == SoeRequired && !isFieldPresent(e.sField()))
+            logicError("Required field '" + e.sField().getName() + "' missing from validation.");
     }
 
     // We just signed this, so it should be valid.
@@ -234,19 +234,19 @@ STValidation::getNodeID() const noexcept
 inline bool
 STValidation::isTrusted() const noexcept
 {
-    return mTrusted;
+    return trusted_;
 }
 
 inline void
 STValidation::setTrusted()
 {
-    mTrusted = true;
+    trusted_ = true;
 }
 
 inline void
 STValidation::setUntrusted()
 {
-    mTrusted = false;
+    trusted_ = false;
 }
 
 inline void
diff --git a/include/xrpl/protocol/STVector256.h b/include/xrpl/protocol/STVector256.h
index c650c565ce..ab3a2f99e3 100644
--- a/include/xrpl/protocol/STVector256.h
+++ b/include/xrpl/protocol/STVector256.h
@@ -9,7 +9,7 @@ namespace xrpl {
 
 class STVector256 : public STBase, public CountedObject<STVector256>
 {
-    std::vector<uint256> mValue;
+    std::vector<uint256> value_;
 
 public:
     using value_type = std::vector<uint256> const&;
@@ -27,7 +27,7 @@ public:
     void
     add(Serializer& s) const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     [[nodiscard]] bool
     isEquivalent(STBase const& t) const override;
@@ -70,7 +70,7 @@ public:
     insert(std::vector<uint256>::const_iterator pos, uint256 const& value);
 
     void
-    push_back(uint256 const& v);
+    pushBack(uint256 const& v);
 
     std::vector<uint256>::iterator
     begin();
@@ -103,124 +103,124 @@ inline STVector256::STVector256(SField const& n) : STBase(n)
 {
 }
 
-inline STVector256::STVector256(std::vector<uint256> const& vector) : mValue(vector)
+inline STVector256::STVector256(std::vector<uint256> const& vector) : value_(vector)
 {
 }
 
 inline STVector256::STVector256(SField const& n, std::vector<uint256> const& vector)
-    : STBase(n), mValue(vector)
+    : STBase(n), value_(vector)
 {
 }
 
 inline STVector256&
 STVector256::operator=(std::vector<uint256> const& v)
 {
-    mValue = v;
+    value_ = v;
     return *this;
 }
 
 inline STVector256&
 STVector256::operator=(std::vector<uint256>&& v)
 {
-    mValue = std::move(v);
+    value_ = std::move(v);
     return *this;
 }
 
 inline void
 STVector256::setValue(STVector256 const& v)
 {
-    mValue = v.mValue;
+    value_ = v.value_;
 }
 
 /** Retrieve a copy of the vector we contain */
 inline STVector256::
 operator std::vector<uint256>() const
 {
-    return mValue;
+    return value_;
 }
 
 inline std::size_t
 STVector256::size() const
 {
-    return mValue.size();
+    return value_.size();
 }
 
 inline void
 STVector256::resize(std::size_t n)
 {
-    mValue.resize(n);
+    value_.resize(n);
 }
 
 inline bool
 STVector256::empty() const
 {
-    return mValue.empty();
+    return value_.empty();
 }
 
 inline std::vector<uint256>::reference
 STVector256::operator[](std::vector<uint256>::size_type n)
 {
-    return mValue[n];
+    return value_[n];
 }
 
 inline std::vector<uint256>::const_reference
 STVector256::operator[](std::vector<uint256>::size_type n) const
 {
-    return mValue[n];
+    return value_[n];
 }
 
 inline std::vector<uint256> const&
 STVector256::value() const
 {
-    return mValue;
+    return value_;
 }
 
 inline std::vector<uint256>::iterator
 STVector256::insert(std::vector<uint256>::const_iterator pos, uint256 const& value)
 {
-    return mValue.insert(pos, value);
+    return value_.insert(pos, value);
 }
 
 inline void
-STVector256::push_back(uint256 const& v)
+STVector256::pushBack(uint256 const& v)
 {
-    mValue.push_back(v);
+    value_.push_back(v);
 }
 
 inline std::vector<uint256>::iterator
 STVector256::begin()
 {
-    return mValue.begin();
+    return value_.begin();
 }
 
 inline std::vector<uint256>::const_iterator
 STVector256::begin() const
 {
-    return mValue.begin();
+    return value_.begin();
 }
 
 inline std::vector<uint256>::iterator
 STVector256::end()
 {
-    return mValue.end();
+    return value_.end();
 }
 
 inline std::vector<uint256>::const_iterator
 STVector256::end() const
 {
-    return mValue.end();
+    return value_.end();
 }
 
 inline std::vector<uint256>::iterator
 STVector256::erase(std::vector<uint256>::iterator position)
 {
-    return mValue.erase(position);
+    return value_.erase(position);
 }
 
 inline void
 STVector256::clear() noexcept
 {
-    mValue.clear();
+    value_.clear();
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/STXChainBridge.h b/include/xrpl/protocol/STXChainBridge.h
index 2dc2fbce48..292ffe2767 100644
--- a/include/xrpl/protocol/STXChainBridge.h
+++ b/include/xrpl/protocol/STXChainBridge.h
@@ -20,7 +20,7 @@ class STXChainBridge final : public STBase, public CountedObject<STXChainBridge>
 public:
     using value_type = STXChainBridge;
 
-    enum class ChainType { locking, issuing };
+    enum class ChainType { Locking, Issuing };
 
     static ChainType
     otherChain(ChainType ct);
@@ -45,9 +45,9 @@ public:
         AccountID const& dstChainDoor,
         Issue const& dstChainIssue);
 
-    explicit STXChainBridge(Json::Value const& v);
+    explicit STXChainBridge(json::Value const& v);
 
-    explicit STXChainBridge(SField const& name, Json::Value const& v);
+    explicit STXChainBridge(SField const& name, json::Value const& v);
 
     explicit STXChainBridge(SerialIter& sit, SField const& name);
 
@@ -81,7 +81,7 @@ public:
     [[nodiscard]] SerializedTypeID
     getSType() const override;
 
-    [[nodiscard]] Json::Value getJson(JsonOptions) const override;
+    [[nodiscard]] json::Value getJson(JsonOptions) const override;
 
     void
     add(Serializer& s) const override;
@@ -174,7 +174,7 @@ STXChainBridge::value() const noexcept
 inline AccountID const&
 STXChainBridge::door(ChainType ct) const
 {
-    if (ct == ChainType::locking)
+    if (ct == ChainType::Locking)
         return lockingChainDoor();
     return issuingChainDoor();
 }
@@ -182,7 +182,7 @@ STXChainBridge::door(ChainType ct) const
 inline Issue const&
 STXChainBridge::issue(ChainType ct) const
 {
-    if (ct == ChainType::locking)
+    if (ct == ChainType::Locking)
         return lockingChainIssue();
     return issuingChainIssue();
 }
@@ -190,25 +190,25 @@ STXChainBridge::issue(ChainType ct) const
 inline STXChainBridge::ChainType
 STXChainBridge::otherChain(ChainType ct)
 {
-    if (ct == ChainType::locking)
-        return ChainType::issuing;
-    return ChainType::locking;
+    if (ct == ChainType::Locking)
+        return ChainType::Issuing;
+    return ChainType::Locking;
 }
 
 inline STXChainBridge::ChainType
 STXChainBridge::srcChain(bool wasLockingChainSend)
 {
     if (wasLockingChainSend)
-        return ChainType::locking;
-    return ChainType::issuing;
+        return ChainType::Locking;
+    return ChainType::Issuing;
 }
 
 inline STXChainBridge::ChainType
 STXChainBridge::dstChain(bool wasLockingChainSend)
 {
     if (wasLockingChainSend)
-        return ChainType::issuing;
-    return ChainType::locking;
+        return ChainType::Issuing;
+    return ChainType::Locking;
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/SecretKey.h b/include/xrpl/protocol/SecretKey.h
index 462a48f4bd..9af27e9709 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 size_ = 32;
+    static constexpr std::size_t kSIZE = 32;
 
 private:
-    std::uint8_t buf_[size_]{};
+    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, size_> const& data);
+    SecretKey(std::array<std::uint8_t, kSIZE> const& data);
     SecretKey(Slice const& slice);
 
     [[nodiscard]] std::uint8_t const*
@@ -58,7 +58,7 @@ public:
         to avoid accidental exposure of secret key material.
     */
     [[nodiscard]] std::string
-    to_string() const;
+    toString() const;
 
     [[nodiscard]] const_iterator
     begin() const noexcept
diff --git a/include/xrpl/protocol/SeqProxy.h b/include/xrpl/protocol/SeqProxy.h
index 820004681d..be040cceec 100644
--- a/include/xrpl/protocol/SeqProxy.h
+++ b/include/xrpl/protocol/SeqProxy.h
@@ -35,7 +35,7 @@ namespace xrpl {
 class SeqProxy
 {
 public:
-    enum class Type : std::uint8_t { seq = 0, ticket };
+    enum class Type : std::uint8_t { Seq = 0, Ticket };
 
 private:
     std::uint32_t value_;
@@ -55,7 +55,7 @@ public:
     static constexpr SeqProxy
     sequence(std::uint32_t v)
     {
-        return SeqProxy{Type::seq, v};
+        return SeqProxy{Type::Seq, v};
     }
 
     [[nodiscard]] constexpr std::uint32_t
@@ -67,13 +67,13 @@ public:
     [[nodiscard]] constexpr bool
     isSeq() const
     {
-        return type_ == Type::seq;
+        return type_ == Type::Seq;
     }
 
     [[nodiscard]] constexpr bool
     isTicket() const
     {
-        return type_ == Type::ticket;
+        return type_ == Type::Ticket;
     }
 
     // Occasionally it is convenient to be able to increase the value_
diff --git a/include/xrpl/protocol/Serializer.h b/include/xrpl/protocol/Serializer.h
index e14d008cd1..385c09009a 100644
--- a/include/xrpl/protocol/Serializer.h
+++ b/include/xrpl/protocol/Serializer.h
@@ -21,41 +21,41 @@ class Serializer
 {
 private:
     // DEPRECATED
-    Blob mData;
+    Blob data_;
 
 public:
     explicit Serializer(int n = 256)
     {
-        mData.reserve(n);
+        data_.reserve(n);
     }
 
     Serializer(void const* data, std::size_t size)
     {
-        mData.resize(size);
+        data_.resize(size);
 
         if (size != 0u)
         {
             XRPL_ASSERT(data, "xrpl::Serializer::Serializer(void const*) : non-null input");
-            std::memcpy(mData.data(), data, size);
+            std::memcpy(data_.data(), data, size);
         }
     }
 
     [[nodiscard]] Slice
     slice() const noexcept
     {
-        return Slice(mData.data(), mData.size());
+        return Slice(data_.data(), data_.size());
     }
 
     [[nodiscard]] std::size_t
     size() const noexcept
     {
-        return mData.size();
+        return data_.size();
     }
 
     [[nodiscard]] void const*
     data() const noexcept
     {
-        return mData.data();
+        return data_.data();
     }
 
     // assemble functions
@@ -69,11 +69,11 @@ public:
     int
     add32(T i)
     {
-        int const ret = mData.size();
-        mData.push_back(static_cast<unsigned char>((i >> 24) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 16) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 8) & 0xff));
-        mData.push_back(static_cast<unsigned char>(i & 0xff));
+        int const ret = data_.size();
+        data_.push_back(static_cast<unsigned char>((i >> 24) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 16) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 8) & 0xff));
+        data_.push_back(static_cast<unsigned char>(i & 0xff));
         return ret;
     }
 
@@ -85,15 +85,15 @@ public:
     int
     add64(T i)
     {
-        int const ret = mData.size();
-        mData.push_back(static_cast<unsigned char>((i >> 56) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 48) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 40) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 32) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 24) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 16) & 0xff));
-        mData.push_back(static_cast<unsigned char>((i >> 8) & 0xff));
-        mData.push_back(static_cast<unsigned char>(i & 0xff));
+        int const ret = data_.size();
+        data_.push_back(static_cast<unsigned char>((i >> 56) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 48) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 40) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 32) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 24) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 16) & 0xff));
+        data_.push_back(static_cast<unsigned char>((i >> 8) & 0xff));
+        data_.push_back(static_cast<unsigned char>(i & 0xff));
         return ret;
     }
 
@@ -102,7 +102,7 @@ public:
 
     template <std::size_t Bits, class Tag>
     int
-    addBitString(base_uint<Bits, Tag> const& v)
+    addBitString(BaseUint<Bits, Tag> const& v)
     {
         return addRaw(v.data(), v.size());
     }
@@ -134,13 +134,13 @@ public:
     bool
     getInteger(Integer& number, int offset)
     {
-        static auto const bytes = sizeof(Integer);
-        if ((offset + bytes) > mData.size())
+        static auto const kBYTES = sizeof(Integer);
+        if ((offset + kBYTES) > data_.size())
             return false;
         number = 0;
 
-        auto ptr = &mData[offset];
-        for (auto i = 0; i < bytes; ++i)
+        auto ptr = &data_[offset];
+        for (auto i = 0; i < kBYTES; ++i)
         {
             if (i)
                 number <<= 8;
@@ -151,11 +151,11 @@ public:
 
     template <std::size_t Bits, typename Tag = void>
     bool
-    getBitString(base_uint<Bits, Tag>& data, int offset) const
+    getBitString(BaseUint<Bits, Tag>& data, int offset) const
     {
-        auto success = (offset + (Bits / 8)) <= mData.size();
+        auto success = (offset + (Bits / 8)) <= data_.size();
         if (success)
-            memcpy(data.begin(), &(mData.front()) + offset, (Bits / 8));
+            memcpy(data.begin(), &(data_.front()) + offset, (Bits / 8));
         return success;
     }
 
@@ -164,7 +164,7 @@ public:
     int
     addFieldID(SerializedTypeID type, int name)
     {
-        return addFieldID(safe_cast<int>(type), name);
+        return addFieldID(safeCast<int>(type), name);
     }
 
     // DEPRECATED
@@ -175,38 +175,38 @@ public:
     [[nodiscard]] Blob const&
     peekData() const
     {
-        return mData;
+        return data_;
     }
     [[nodiscard]] Blob
     getData() const
     {
-        return mData;
+        return data_;
     }
     Blob&
     modData()
     {
-        return mData;
+        return data_;
     }
 
     [[nodiscard]] int
     getDataLength() const
     {
-        return mData.size();
+        return data_.size();
     }
     [[nodiscard]] void const*
     getDataPtr() const
     {
-        return mData.data();
+        return data_.data();
     }
     void*
     getDataPtr()
     {
-        return mData.data();
+        return data_.data();
     }
     [[nodiscard]] int
     getLength() const
     {
-        return mData.size();
+        return data_.size();
     }
     [[nodiscard]] std::string
     getString() const
@@ -216,7 +216,7 @@ public:
     void
     erase()
     {
-        mData.clear();
+        data_.clear();
     }
     bool
     chop(int num);
@@ -225,58 +225,58 @@ public:
     Blob ::iterator
     begin()
     {
-        return mData.begin();
+        return data_.begin();
     }
     Blob ::iterator
     end()
     {
-        return mData.end();
+        return data_.end();
     }
     [[nodiscard]] Blob ::const_iterator
     begin() const
     {
-        return mData.begin();
+        return data_.begin();
     }
     [[nodiscard]] Blob ::const_iterator
     end() const
     {
-        return mData.end();
+        return data_.end();
     }
     void
     reserve(size_t n)
     {
-        mData.reserve(n);
+        data_.reserve(n);
     }
     void
     resize(size_t n)
     {
-        mData.resize(n);
+        data_.resize(n);
     }
     [[nodiscard]] size_t
     capacity() const
     {
-        return mData.capacity();
+        return data_.capacity();
     }
 
     bool
     operator==(Blob const& v) const
     {
-        return v == mData;
+        return v == data_;
     }
     bool
     operator!=(Blob const& v) const
     {
-        return v != mData;
+        return v != data_;
     }
     bool
     operator==(Serializer const& v) const
     {
-        return v.mData == mData;
+        return v.data_ == data_;
     }
     bool
     operator!=(Serializer const& v) const
     {
-        return v.mData != mData;
+        return v.data_ != data_;
     }
 
     static int
@@ -369,7 +369,7 @@ public:
     geti64();
 
     template <std::size_t Bits, class Tag = void>
-    base_uint<Bits, Tag>
+    BaseUint<Bits, Tag>
     getBitString();
 
     uint128
@@ -428,7 +428,7 @@ public:
 };
 
 template <std::size_t Bits, class Tag>
-base_uint<Bits, Tag>
+BaseUint<Bits, Tag>
 SerialIter::getBitString()
 {
     auto const n = Bits / 8;
@@ -442,7 +442,7 @@ SerialIter::getBitString()
     used_ += n;
     remain_ -= n;
 
-    return base_uint<Bits, Tag>::fromVoid(x);
+    return BaseUint<Bits, Tag>::fromVoid(x);
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/SystemParameters.h b/include/xrpl/protocol/SystemParameters.h
index b51e011533..029c0418b5 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 name = "xrpld";
-    return name;
+    static std::string const kNAME = "xrpld";
+    return kNAME;
 }
 
 /** Configure the native currency. */
 
 /** Number of drops in the genesis account. */
-constexpr XRPAmount INITIAL_XRP{100'000'000'000 * DROPS_PER_XRP};
-static_assert(INITIAL_XRP.drops() == 100'000'000'000'000'000);
-static_assert(Number::maxRep >= INITIAL_XRP.drops());
+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());
 
 /** Returns true if the amount does not exceed the initial XRP in existence. */
 inline bool
 isLegalAmount(XRPAmount const& amount)
 {
-    return amount <= INITIAL_XRP;
+    return amount <= kINITIAL_XRP;
 }
 
 /** 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 >= -INITIAL_XRP && amount <= INITIAL_XRP;
+    return amount >= -kINITIAL_XRP && amount <= kINITIAL_XRP;
 }
 
 /* The currency code for the native currency. */
 static inline std::string const&
 systemCurrencyCode()
 {
-    static std::string const code = "XRP";
-    return code;
+    static std::string const kCODE = "XRP";
+    return kCODE;
 }
 
 /** The XRP ledger network's earliest allowed sequence */
-static constexpr std::uint32_t XRP_LEDGER_EARLIEST_SEQ{32570u};
+static constexpr std::uint32_t kXRP_LEDGER_EARLIEST_SEQ{32570u};
 
 /** The XRP Ledger mainnet's earliest ledger with a FeeSettings object. Only
  * used in asserts and tests. */
-static constexpr std::uint32_t XRP_LEDGER_EARLIEST_FEES{562177u};
+static constexpr std::uint32_t kXRP_LEDGER_EARLIEST_FEES{562177u};
 
 /** The minimum amount of support an amendment should have. */
-constexpr std::ratio<80, 100> amendmentMajorityCalcThreshold;
+constexpr std::ratio<80, 100> kAMENDMENT_MAJORITY_CALC_THRESHOLD;
 
 /** The minimum amount of time an amendment must hold a majority */
-constexpr std::chrono::seconds const defaultAmendmentMajorityTime = weeks{2};
+constexpr std::chrono::seconds const kDEFAULT_AMENDMENT_MAJORITY_TIME = weeks{2};
 
 }  // namespace xrpl
 
 /** Default peer port (IANA registered) */
-inline std::uint16_t constexpr DEFAULT_PEER_PORT{2459};
+inline std::uint16_t constexpr kDEFAULT_PEER_PORT{2459};
diff --git a/include/xrpl/protocol/TER.h b/include/xrpl/protocol/TER.h
index 6494453b91..c89610f354 100644
--- a/include/xrpl/protocol/TER.h
+++ b/include/xrpl/protocol/TER.h
@@ -1,5 +1,7 @@
 #pragma once
 
+// NOLINTBEGIN(readability-identifier-naming)
+
 #include <xrpl/basics/safe_cast.h>
 #include <xrpl/json/json_value.h>
 
@@ -364,37 +366,37 @@ enum TECcodes : TERUnderlyingType {
 constexpr TERUnderlyingType
 TERtoInt(TELcodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 constexpr TERUnderlyingType
 TERtoInt(TEMcodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 constexpr TERUnderlyingType
 TERtoInt(TEFcodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 constexpr TERUnderlyingType
 TERtoInt(TERcodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 constexpr TERUnderlyingType
 TERtoInt(TEScodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 constexpr TERUnderlyingType
 TERtoInt(TECcodes v)
 {
-    return safe_cast<TERUnderlyingType>(v);
+    return safeCast<TERUnderlyingType>(v);
 }
 
 //------------------------------------------------------------------------------
@@ -455,11 +457,11 @@ public:
         return code_ != tesSUCCESS;
     }
 
-    // Conversion to Json::Value allows assignment to Json::Objects
+    // Conversion to json::Value allows assignment to json::Objects
     // without casting.
-    operator Json::Value() const
+    operator json::Value() const
     {
-        return Json::Value{code_};
+        return json::Value{code_};
     }
 
     // Streaming operator.
@@ -680,3 +682,5 @@ std::optional<TER>
 transCode(std::string const& token);
 
 }  // namespace xrpl
+
+// NOLINTEND(readability-identifier-naming)
diff --git a/include/xrpl/protocol/TxFlags.h b/include/xrpl/protocol/TxFlags.h
index 7bbbd12707..4652cc1bf0 100644
--- a/include/xrpl/protocol/TxFlags.h
+++ b/include/xrpl/protocol/TxFlags.h
@@ -1,5 +1,7 @@
 #pragma once
 
+// NOLINTBEGIN(readability-identifier-naming)
+
 #include <xrpl/protocol/LedgerFormats.h>
 
 #include <cstdint>
@@ -444,3 +446,5 @@ getAsfFlagMap()
 #pragma pop_macro("ACCOUNTSET_FLAGS")
 
 }  // namespace xrpl
+
+// NOLINTEND(readability-identifier-naming)
diff --git a/include/xrpl/protocol/TxFormats.h b/include/xrpl/protocol/TxFormats.h
index 235fb7b16e..77ab069feb 100644
--- a/include/xrpl/protocol/TxFormats.h
+++ b/include/xrpl/protocol/TxFormats.h
@@ -51,16 +51,16 @@ enum TxType : std::uint16_t
 #pragma pop_macro("TRANSACTION")
 
     /** This transaction type is deprecated; it is retained for historical purposes. */
-    ttNICKNAME_SET [[deprecated("This transaction type is not supported and should not be used.")]] = 6,
+    TtNicknameSet [[deprecated("This transaction type is not supported and should not be used.")]] = 6,
 
     /** This transaction type is deprecated; it is retained for historical purposes. */
-    ttCONTRACT [[deprecated("This transaction type is not supported and should not be used.")]] = 9,
+    TtContract [[deprecated("This transaction type is not supported and should not be used.")]] = 9,
 
     /** This identifier was never used, but the slot is reserved for historical purposes. */
-    ttSPINAL_TAP [[deprecated("This transaction type is not supported and should not be used.")]] = 11,
+    TtSpinalTap [[deprecated("This transaction type is not supported and should not be used.")]] = 11,
 
     /** This transaction type installs a hook. */
-    ttHOOK_SET [[maybe_unused]] = 22,
+    TtHookSet [[maybe_unused]] = 22,
 };
 // clang-format on
 
diff --git a/include/xrpl/protocol/TxMeta.h b/include/xrpl/protocol/TxMeta.h
index 31be3bdb47..6895350e9f 100644
--- a/include/xrpl/protocol/TxMeta.h
+++ b/include/xrpl/protocol/TxMeta.h
@@ -55,7 +55,7 @@ public:
     [[nodiscard]] boost::container::flat_set<AccountID>
     getAffectedAccounts() const;
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson(JsonOptions p) const
     {
         return getAsObject().getJson(p);
diff --git a/include/xrpl/protocol/UintTypes.h b/include/xrpl/protocol/UintTypes.h
index fd48244d89..6fb0648b5f 100644
--- a/include/xrpl/protocol/UintTypes.h
+++ b/include/xrpl/protocol/UintTypes.h
@@ -30,21 +30,21 @@ public:
 
 /** Directory is an index into the directory of offer books.
     The last 64 bits of this are the quality. */
-using Directory = base_uint<256, detail::DirectoryTag>;
+using Directory = BaseUint<256, detail::DirectoryTag>;
 
 /** Currency is a hash representing a specific currency. */
-using Currency = base_uint<160, detail::CurrencyTag>;
+using Currency = BaseUint<160, detail::CurrencyTag>;
 
 /** NodeID is a 160-bit hash representing one node. */
-using NodeID = base_uint<160, detail::NodeIDTag>;
+using NodeID = BaseUint<160, detail::NodeIDTag>;
 
 /** MPTID is a 192-bit value representing MPT Issuance ID,
  * which is a concatenation of a 32-bit sequence (big endian)
  * and a 160-bit account */
-using MPTID = base_uint<192>;
+using MPTID = BaseUint<192>;
 
 /** Domain is a 256-bit hash representing a specific domain. */
-using Domain = base_uint<256>;
+using Domain = BaseUint<256>;
 
 /** XRP currency. */
 Currency const&
@@ -62,7 +62,7 @@ badCurrency();
 inline bool
 isXRP(Currency const& c)
 {
-    return c == beast::zero;
+    return c == beast::kZERO;
 }
 
 /** Returns "", "XRP", or three letter ISO code. */
@@ -77,7 +77,7 @@ to_string(Currency const& c);
           to rewrite some unit test code.
 */
 bool
-to_currency(Currency&, std::string const&);
+toCurrency(Currency&, std::string const&);
 
 /** Tries to convert a string to a Currency, returns noCurrency() on failure.
 
@@ -86,7 +86,7 @@ to_currency(Currency&, std::string const&);
           everywhere and may mean having to rewrite some unit test code.
 */
 Currency
-to_currency(std::string const&);
+toCurrency(std::string const&);
 
 inline std::ostream&
 operator<<(std::ostream& os, Currency const& x)
diff --git a/include/xrpl/protocol/Units.h b/include/xrpl/protocol/Units.h
index 8faabd7138..dd5cfdeffd 100644
--- a/include/xrpl/protocol/Units.h
+++ b/include/xrpl/protocol/Units.h
@@ -117,7 +117,7 @@ public:
     template <Compatible<ValueUnit> Other>
     constexpr ValueUnit(ValueUnit<unit_type, Other> const& value)
         requires SafeToCast<Other, value_type>
-        : ValueUnit(safe_cast<value_type>(value.value()))
+        : ValueUnit(safeCast<value_type>(value.value()))
     {
     }
 
@@ -209,7 +209,7 @@ public:
         return *this;
     }
 
-    template <Integral transparent = value_type>
+    template <Integral Transparent = value_type>
     ValueUnit&
     operator%=(value_type const& rhs)
     {
@@ -291,22 +291,22 @@ public:
     // known valid type tags can be converted to JSON. At the time
     // of implementation, that includes all known tags, but more may
     // be added in the future.
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     jsonClipped() const
         requires Usable<ValueUnit>
     {
         if constexpr (std::is_integral_v<value_type>)
         {
             using jsontype =
-                std::conditional_t<std::is_signed_v<value_type>, Json::Int, Json::UInt>;
+                std::conditional_t<std::is_signed_v<value_type>, json::Int, json::UInt>;
 
-            constexpr auto min = std::numeric_limits<jsontype>::min();
-            constexpr auto max = std::numeric_limits<jsontype>::max();
+            constexpr auto kMIN = std::numeric_limits<jsontype>::min();
+            constexpr auto kMAX = std::numeric_limits<jsontype>::max();
 
-            if (value_ < min)
-                return min;
-            if (value_ > max)
-                return max;
+            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 max = 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() > max)
+        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 > max)
+    if (quotient > kMAX)
         return std::nullopt;
 
     return Dest{static_cast<desttype>(quotient)};
@@ -494,34 +494,34 @@ mulDiv(std::uint64_t value, Source1 mul, Source2 div)
 
 template <unit::IntegralValue Dest, unit::CastableValue<Dest> Src>
 constexpr Dest
-safe_cast(Src s) noexcept
+safeCast(Src s) noexcept
 {
     // Dest may not have an explicit value constructor
-    return Dest{safe_cast<typename Dest::value_type>(s.value())};
+    return Dest{safeCast<typename Dest::value_type>(s.value())};
 }
 
 template <unit::IntegralValue Dest, unit::Integral Src>
 constexpr Dest
-safe_cast(Src s) noexcept
+safeCast(Src s) noexcept
 {
     // Dest may not have an explicit value constructor
-    return Dest{safe_cast<typename Dest::value_type>(s)};
+    return Dest{safeCast<typename Dest::value_type>(s)};
 }
 
 template <unit::IntegralValue Dest, unit::CastableValue<Dest> Src>
 constexpr Dest
-unsafe_cast(Src s) noexcept
+unsafeCast(Src s) noexcept
 {
     // Dest may not have an explicit value constructor
-    return Dest{unsafe_cast<typename Dest::value_type>(s.value())};
+    return Dest{unsafeCast<typename Dest::value_type>(s.value())};
 }
 
 template <unit::IntegralValue Dest, unit::Integral Src>
 constexpr Dest
-unsafe_cast(Src s) noexcept
+unsafeCast(Src s) noexcept
 {
     // Dest may not have an explicit value constructor
-    return Dest{unsafe_cast<typename Dest::value_type>(s)};
+    return Dest{unsafeCast<typename Dest::value_type>(s)};
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/XChainAttestations.h b/include/xrpl/protocol/XChainAttestations.h
index 83bb6267a2..d8a35a29e3 100644
--- a/include/xrpl/protocol/XChainAttestations.h
+++ b/include/xrpl/protocol/XChainAttestations.h
@@ -42,13 +42,13 @@ struct AttestationBase
     bool wasLockingChainSend;
 
     explicit AttestationBase(
-        AccountID attestationSignerAccount_,
-        PublicKey const& publicKey_,
-        Buffer signature_,
-        AccountID const& sendingAccount_,
-        STAmount sendingAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_);
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend);
 
     AttestationBase(AttestationBase const&) = default;
 
@@ -63,7 +63,7 @@ struct AttestationBase
 
 protected:
     explicit AttestationBase(STObject const& o);
-    explicit AttestationBase(Json::Value const& v);
+    explicit AttestationBase(json::Value const& v);
 
     [[nodiscard]] static bool
     equalHelper(AttestationBase const& lhs, AttestationBase const& rhs);
@@ -86,30 +86,30 @@ struct AttestationClaim : AttestationBase
     std::optional<AccountID> dst;
 
     explicit AttestationClaim(
-        AccountID attestationSignerAccount_,
-        PublicKey const& publicKey_,
-        Buffer signature_,
-        AccountID const& sendingAccount_,
-        STAmount const& sendingAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
-        std::uint64_t claimID_,
-        std::optional<AccountID> const& dst_);
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t claimId,
+        std::optional<AccountID> const& dst);
 
     explicit AttestationClaim(
         STXChainBridge const& bridge,
-        AccountID attestationSignerAccount_,
-        PublicKey const& publicKey_,
-        SecretKey const& secretKey_,
-        AccountID const& sendingAccount_,
-        STAmount const& sendingAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
-        std::uint64_t claimID_,
-        std::optional<AccountID> const& dst_);
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        SecretKey const& secretKey,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t claimId,
+        std::optional<AccountID> const& dst);
 
     explicit AttestationClaim(STObject const& o);
-    explicit AttestationClaim(Json::Value const& v);
+    explicit AttestationClaim(json::Value const& v);
 
     [[nodiscard]] STObject
     toSTObject() const;
@@ -162,32 +162,32 @@ struct AttestationCreateAccount : AttestationBase
 
     explicit AttestationCreateAccount(STObject const& o);
 
-    explicit AttestationCreateAccount(Json::Value const& v);
+    explicit AttestationCreateAccount(json::Value const& v);
 
     explicit AttestationCreateAccount(
-        AccountID attestationSignerAccount_,
-        PublicKey const& publicKey_,
-        Buffer signature_,
-        AccountID const& sendingAccount_,
-        STAmount const& sendingAmount_,
-        STAmount rewardAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
-        std::uint64_t createCount_,
-        AccountID const& toCreate_);
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        Buffer signature,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        STAmount rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t createCount,
+        AccountID const& toCreate);
 
     explicit AttestationCreateAccount(
         STXChainBridge const& bridge,
-        AccountID attestationSignerAccount_,
-        PublicKey const& publicKey_,
-        SecretKey const& secretKey_,
-        AccountID const& sendingAccount_,
-        STAmount const& sendingAmount_,
-        STAmount const& rewardAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
-        std::uint64_t createCount_,
-        AccountID const& toCreate_);
+        AccountID attestationSignerAccount,
+        PublicKey const& publicKey,
+        SecretKey const& secretKey,
+        AccountID const& sendingAccount,
+        STAmount const& sendingAmount,
+        STAmount const& rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        std::uint64_t createCount,
+        AccountID const& toCreate);
 
     [[nodiscard]] STObject
     toSTObject() const;
@@ -232,17 +232,17 @@ struct CmpByCreateCount
 // Result when checking when two attestation match.
 enum class AttestationMatch {
     // One of the fields doesn't match, and it isn't the dst field
-    nonDstMismatch,
+    NonDstMismatch,
     // all of the fields match, except the dst field
-    matchExceptDst,
+    MatchExceptDst,
     // all of the fields match
-    match
+    Match
 };
 
 struct XChainClaimAttestation
 {
     using TSignedAttestation = Attestations::AttestationClaim;
-    static SField const& ArrayFieldName;
+    static SField const& arrayFieldName;
 
     AccountID keyAccount;
     PublicKey publicKey;
@@ -264,26 +264,26 @@ struct XChainClaimAttestation
     };
 
     explicit XChainClaimAttestation(
-        AccountID const& keyAccount_,
-        PublicKey const& publicKey_,
-        STAmount const& amount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
+        AccountID const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
         std::optional<AccountID> const& dst);
 
     explicit XChainClaimAttestation(
-        STAccount const& keyAccount_,
-        PublicKey const& publicKey_,
-        STAmount const& amount_,
-        STAccount const& rewardAccount_,
-        bool wasLockingChainSend_,
+        STAccount const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        STAccount const& rewardAccount,
+        bool wasLockingChainSend,
         std::optional<STAccount> const& dst);
 
     explicit XChainClaimAttestation(TSignedAttestation const& claimAtt);
 
     explicit XChainClaimAttestation(STObject const& o);
 
-    explicit XChainClaimAttestation(Json::Value const& v);
+    explicit XChainClaimAttestation(json::Value const& v);
 
     [[nodiscard]] AttestationMatch
     match(MatchFields const& rhs) const;
@@ -298,7 +298,7 @@ struct XChainClaimAttestation
 struct XChainCreateAccountAttestation
 {
     using TSignedAttestation = Attestations::AttestationCreateAccount;
-    static SField const& ArrayFieldName;
+    static SField const& arrayFieldName;
 
     AccountID keyAccount;
     PublicKey publicKey;
@@ -319,19 +319,19 @@ struct XChainCreateAccountAttestation
     };
 
     explicit XChainCreateAccountAttestation(
-        AccountID const& keyAccount_,
-        PublicKey const& publicKey_,
-        STAmount const& amount_,
-        STAmount const& rewardAmount_,
-        AccountID const& rewardAccount_,
-        bool wasLockingChainSend_,
-        AccountID const& dst_);
+        AccountID const& keyAccount,
+        PublicKey const& publicKey,
+        STAmount const& amount,
+        STAmount const& rewardAmount,
+        AccountID const& rewardAccount,
+        bool wasLockingChainSend,
+        AccountID const& dst);
 
     explicit XChainCreateAccountAttestation(TSignedAttestation const& claimAtt);
 
     explicit XChainCreateAccountAttestation(STObject const& o);
 
-    explicit XChainCreateAccountAttestation(Json::Value const& v);
+    explicit XChainCreateAccountAttestation(json::Value const& v);
 
     [[nodiscard]] STObject
     toSTObject() const;
@@ -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 maxAttestations = 256;
+    static constexpr std::uint32_t kMAX_ATTESTATIONS = 256;
     AttCollection attestations_;
 
 protected:
@@ -372,7 +372,7 @@ public:
 
     explicit XChainAttestationsBase(AttCollection&& sigs);
 
-    explicit XChainAttestationsBase(Json::Value const& v);
+    explicit XChainAttestationsBase(json::Value const& v);
 
     explicit XChainAttestationsBase(STArray const& arr);
 
@@ -393,7 +393,7 @@ public:
 
     template <class F>
     std::size_t
-    erase_if(F&& f);
+    eraseIf(F&& f);
 
     [[nodiscard]] std::size_t
     size() const;
@@ -406,7 +406,7 @@ public:
 
     template <class T>
     void
-    emplace_back(T&& att);
+    emplaceBack(T&& att);
 };
 
 template <class TAttestation>
@@ -428,7 +428,7 @@ XChainAttestationsBase<TAttestation>::attestations() const
 template <class TAttestation>
 template <class T>
 inline void
-XChainAttestationsBase<TAttestation>::emplace_back(T&& att)
+XChainAttestationsBase<TAttestation>::emplaceBack(T&& att)
 {
     attestations_.emplace_back(std::forward<T>(att));
 };
@@ -436,7 +436,7 @@ XChainAttestationsBase<TAttestation>::emplace_back(T&& att)
 template <class TAttestation>
 template <class F>
 inline std::size_t
-XChainAttestationsBase<TAttestation>::erase_if(F&& f)
+XChainAttestationsBase<TAttestation>::eraseIf(F&& f)
 {
     return std::erase_if(attestations_, std::forward<F>(f));
 }
diff --git a/include/xrpl/protocol/XRPAmount.h b/include/xrpl/protocol/XRPAmount.h
index bc7ef891dc..067ea511da 100644
--- a/include/xrpl/protocol/XRPAmount.h
+++ b/include/xrpl/protocol/XRPAmount.h
@@ -195,21 +195,21 @@ public:
      * in contexts that don't expect the value to ever approach
      * the 32-bit limits (i.e. fees and reserves).
      */
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     jsonClipped() const
     {
         static_assert(
             std::is_signed_v<value_type> && std::is_integral_v<value_type>,
             "Expected XRPAmount to be a signed integral type");
 
-        constexpr auto min = std::numeric_limits<Json::Int>::min();
-        constexpr auto max = 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_ < min)
-            return min;
-        if (drops_ > max)
-            return max;
-        return static_cast<Json::Int>(drops_);
+        if (drops_ < kMIN)
+            return kMIN;
+        if (drops_ > kMAX)
+            return kMAX;
+        return static_cast<json::Int>(drops_);
     }
 
     /** Returns the underlying value. Code SHOULD NOT call this
@@ -237,12 +237,12 @@ public:
 };
 
 /** Number of drops per 1 XRP */
-constexpr XRPAmount DROPS_PER_XRP{1'000'000};
+constexpr XRPAmount kDROPS_PER_XRP{1'000'000};
 
 constexpr double
 XRPAmount::decimalXRP() const
 {
-    return static_cast<double>(drops_) / DROPS_PER_XRP.drops();
+    return static_cast<double>(drops_) / kDROPS_PER_XRP.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 c819740a90..52045965fd 100644
--- a/include/xrpl/protocol/detail/STVar.h
+++ b/include/xrpl/protocol/detail/STVar.h
@@ -9,18 +9,18 @@
 
 namespace xrpl::detail {
 
-struct defaultObject_t
+struct DefaultObjectT
 {
-    explicit defaultObject_t() = default;
+    explicit DefaultObjectT() = default;
 };
 
-struct nonPresentObject_t
+struct NonPresentObjectT
 {
-    explicit nonPresentObject_t() = default;
+    explicit NonPresentObjectT() = default;
 };
 
-extern defaultObject_t defaultObject;
-extern nonPresentObject_t nonPresentObject;
+extern DefaultObjectT gDefaultObject;
+extern NonPresentObjectT gNonPresentObject;
 
 // Concept to constrain STVar constructors, which
 // instantiate ST* types from SerializedTypeID
@@ -35,9 +35,9 @@ class STVar
 {
 private:
     // The largest "small object" we can accommodate
-    static std::size_t constexpr max_size = 72;
+    static std::size_t constexpr kMAX_SIZE = 72;
 
-    std::aligned_storage<max_size>::type d_ = {};
+    std::aligned_storage<kMAX_SIZE>::type d_ = {};
     STBase* p_ = nullptr;
 
 public:
@@ -51,16 +51,16 @@ public:
 
     STVar(STBase&& t)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
     {
-        p_ = t.move(max_size, &d_);
+        p_ = t.move(kMAX_SIZE, &d_);
     }
 
     STVar(STBase const& t)
     {
-        p_ = t.copy(max_size, &d_);
+        p_ = t.copy(kMAX_SIZE, &d_);
     }
 
-    STVar(defaultObject_t, SField const& name);
-    STVar(nonPresentObject_t, SField const& name);
+    STVar(DefaultObjectT, SField const& name);
+    STVar(NonPresentObjectT, SField const& name);
     STVar(SerialIter& sit, SField const& name, int depth = 0);
 
     STBase&
@@ -96,7 +96,7 @@ public:
 
     template <class T, class... Args>
     friend STVar
-    make_stvar(Args&&... args);
+    makeStvar(Args&&... args);
 
 private:
     STVar() = default;
@@ -110,7 +110,7 @@ private:
     void
     construct(Args&&... args)
     {
-        if constexpr (sizeof(T) > max_size)
+        if constexpr (sizeof(T) > kMAX_SIZE)
         {
             p_ = new T(std::forward<Args>(args)...);
         }
@@ -130,7 +130,7 @@ private:
     constructST(SerializedTypeID id, int depth, Args&&... arg);
 
     [[nodiscard]] bool
-    on_heap() const
+    onHeap() const
     {
         return static_cast<void const*>(p_) != static_cast<void const*>(&d_);
     }
@@ -138,7 +138,7 @@ private:
 
 template <class T, class... Args>
 inline STVar
-make_stvar(Args&&... args)
+makeStvar(Args&&... args)
 {
     STVar st;
     st.construct<T>(std::forward<Args>(args)...);
diff --git a/include/xrpl/protocol/detail/b58_utils.h b/include/xrpl/protocol/detail/b58_utils.h
index ec0e159230..f860dc40c4 100644
--- a/include/xrpl/protocol/detail/b58_utils.h
+++ b/include/xrpl/protocol/detail/b58_utils.h
@@ -22,14 +22,14 @@ namespace b58_fast::detail {
 
 // This optimizes to what hand written asm would do (single divide)
 [[nodiscard]] inline std::tuple<std::uint64_t, std::uint64_t>
-div_rem(std::uint64_t a, std::uint64_t b)
+divRem(std::uint64_t a, std::uint64_t b)
 {
     return {a / b, a % b};
 }
 
 // This optimizes to what hand written asm would do (single multiply)
 [[nodiscard]] inline std::tuple<std::uint64_t, std::uint64_t>
-carrying_mul(std::uint64_t a, std::uint64_t b, std::uint64_t carry)
+carryingMul(std::uint64_t a, std::uint64_t b, std::uint64_t carry)
 {
     unsigned __int128 const x = a;
     unsigned __int128 const y = b;
@@ -38,7 +38,7 @@ carrying_mul(std::uint64_t a, std::uint64_t b, std::uint64_t carry)
 }
 
 [[nodiscard]] inline std::tuple<std::uint64_t, std::uint64_t>
-carrying_add(std::uint64_t a, std::uint64_t b)
+carryingAdd(std::uint64_t a, std::uint64_t b)
 {
     unsigned __int128 const x = a;
     unsigned __int128 const y = b;
@@ -52,58 +52,58 @@ carrying_add(std::uint64_t a, std::uint64_t b)
 // panics if overflows (this is a specialized adder for b58 decoding.
 // it should never overflow).
 [[nodiscard]] inline TokenCodecErrc
-inplace_bigint_add(std::span<std::uint64_t> a, std::uint64_t b)
+inplaceBigintAdd(std::span<std::uint64_t> a, std::uint64_t b)
 {
     if (a.size() <= 1)
     {
-        return TokenCodecErrc::inputTooSmall;
+        return TokenCodecErrc::InputTooSmall;
     }
 
     std::uint64_t carry = 0;
-    std::tie(a[0], carry) = carrying_add(a[0], b);
+    std::tie(a[0], carry) = carryingAdd(a[0], b);
 
     for (auto& v : a.subspan(1))
     {
         if (carry == 0u)
         {
-            return TokenCodecErrc::success;
+            return TokenCodecErrc::Success;
         }
-        std::tie(v, carry) = carrying_add(v, 1);
+        std::tie(v, carry) = carryingAdd(v, 1);
     }
     if (carry != 0u)
     {
-        return TokenCodecErrc::overflowAdd;
+        return TokenCodecErrc::OverflowAdd;
     }
-    return TokenCodecErrc::success;
+    return TokenCodecErrc::Success;
 }
 
 [[nodiscard]] inline TokenCodecErrc
-inplace_bigint_mul(std::span<std::uint64_t> a, std::uint64_t b)
+inplaceBigintMul(std::span<std::uint64_t> a, std::uint64_t b)
 {
     if (a.empty())
     {
-        return TokenCodecErrc::inputTooSmall;
+        return TokenCodecErrc::InputTooSmall;
     }
 
-    auto const last_index = a.size() - 1;
-    if (a[last_index] != 0)
+    auto const lastIndex = a.size() - 1;
+    if (a[lastIndex] != 0)
     {
-        return TokenCodecErrc::inputTooLarge;
+        return TokenCodecErrc::InputTooLarge;
     }
 
     std::uint64_t carry = 0;
-    for (auto& coeff : a.subspan(0, last_index))
+    for (auto& coeff : a.subspan(0, lastIndex))
     {
-        std::tie(coeff, carry) = carrying_mul(coeff, b, carry);
+        std::tie(coeff, carry) = carryingMul(coeff, b, carry);
     }
-    a[last_index] = carry;
-    return TokenCodecErrc::success;
+    a[lastIndex] = carry;
+    return TokenCodecErrc::Success;
 }
 
 // divide a "big uint" value inplace and return the mod
 // numerator is stored so smallest coefficients come first
 [[nodiscard]] inline std::uint64_t
-inplace_bigint_div_rem(std::span<uint64_t> numerator, std::uint64_t divisor)
+inplaceBigintDivRem(std::span<uint64_t> numerator, std::uint64_t divisor)
 {
     if (numerator.empty())
     {
@@ -111,60 +111,60 @@ inplace_bigint_div_rem(std::span<uint64_t> numerator, std::uint64_t divisor)
         // the a null set of numbers to be zero, so the remainder is also zero.
         // LCOV_EXCL_START
         UNREACHABLE(
-            "xrpl::b58_fast::detail::inplace_bigint_div_rem : empty "
+            "xrpl::b58_fast::detail::inplaceBigintDivRem : empty "
             "numerator");
         return 0;
         // LCOV_EXCL_STOP
     }
 
-    auto to_u128 = [](std::uint64_t high, std::uint64_t low) -> unsigned __int128 {
+    auto toU128 = [](std::uint64_t high, std::uint64_t low) -> unsigned __int128 {
         unsigned __int128 const high128 = high;
         unsigned __int128 const low128 = low;
         return ((high128 << 64) | low128);
     };
-    auto div_rem_64 = [](unsigned __int128 num,
-                         std::uint64_t denom) -> std::tuple<std::uint64_t, std::uint64_t> {
+    auto divRe64 = [](unsigned __int128 num,
+                      std::uint64_t denom) -> std::tuple<std::uint64_t, std::uint64_t> {
         unsigned __int128 const denom128 = denom;
         unsigned __int128 const d = num / denom128;
         unsigned __int128 const r = num - (denom128 * d);
         XRPL_ASSERT(
             d >> 64 == 0,
-            "xrpl::b58_fast::detail::inplace_bigint_div_rem::div_rem_64 : "
+            "xrpl::b58_fast::detail::inplaceBigintDivRem::divRe64 : "
             "valid division result");
         XRPL_ASSERT(
             r >> 64 == 0,
-            "xrpl::b58_fast::detail::inplace_bigint_div_rem::div_rem_64 : "
+            "xrpl::b58_fast::detail::inplaceBigintDivRem::divRe64 : "
             "valid remainder");
         return {static_cast<std::uint64_t>(d), static_cast<std::uint64_t>(r)};
     };
 
-    std::uint64_t prev_rem = 0;
-    int const last_index = numerator.size() - 1;
-    std::tie(numerator[last_index], prev_rem) = div_rem(numerator[last_index], divisor);
-    for (int i = last_index - 1; i >= 0; --i)
+    std::uint64_t prevRem = 0;
+    int const lastIndex = numerator.size() - 1;
+    std::tie(numerator[lastIndex], prevRem) = divRem(numerator[lastIndex], divisor);
+    for (int i = lastIndex - 1; i >= 0; --i)
     {
-        unsigned __int128 const cur_num = to_u128(prev_rem, numerator[i]);
-        std::tie(numerator[i], prev_rem) = div_rem_64(cur_num, divisor);
+        unsigned __int128 const curNum = toU128(prevRem, numerator[i]);
+        std::tie(numerator[i], prevRem) = divRe64(curNum, divisor);
     }
-    return prev_rem;
+    return prevRem;
 }
 
 // convert from base 58^10 to base 58
 // put largest coeffs first
 // the `_be` suffix stands for "big endian"
 [[nodiscard]] inline std::array<std::uint8_t, 10>
-b58_10_to_b58_be(std::uint64_t input)
+b5810ToB58Be(std::uint64_t input)
 {
-    [[maybe_unused]] static constexpr std::uint64_t B_58_10 = 430804206899405824;  // 58^10;
-    XRPL_ASSERT(input < B_58_10, "xrpl::b58_fast::detail::b58_10_to_b58_be : valid input");
-    constexpr std::size_t resultSize = 10;
-    std::array<std::uint8_t, resultSize> result{};
+    [[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{};
     int i = 0;
     while (input > 0)
     {
         std::uint64_t rem = 0;
-        std::tie(input, rem) = div_rem(input, 58);
-        result[resultSize - 1 - i] = rem;
+        std::tie(input, rem) = divRem(input, 58);
+        result[kRESULT_SIZE - 1 - i] = rem;
         i += 1;
     }
 
diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro
index 8fbc28123f..78b78e132e 100644
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -15,62 +15,62 @@
 // Add new amendments to the top of this list.
 // Keep it sorted in reverse chronological order.
 
-XRPL_FIX    (Cleanup3_2_0,                Supported::no, VoteBehavior::DefaultNo)
-XRPL_FEATURE(MPTokensV2,                  Supported::no, VoteBehavior::DefaultNo)
-XRPL_FIX    (Security3_1_3,               Supported::no, VoteBehavior::DefaultNo)
-XRPL_FIX    (PermissionedDomainInvariant, Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (BatchInnerSigs,              Supported::no, VoteBehavior::DefaultNo)
-XRPL_FEATURE(LendingProtocol,             Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionDelegationV1_1,    Supported::no,  VoteBehavior::DefaultNo)
-XRPL_FIX    (DirectoryLimit,              Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (IncludeKeyletFields,         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(DynamicMPT,                  Supported::no,  VoteBehavior::DefaultNo)
-XRPL_FIX    (TokenEscrowV1,               Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (PriceOracleOrder,            Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (MPTDeliveredAmount,          Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMClawbackRounding,         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(TokenEscrow,                 Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (EnforceNFTokenTrustlineV2,   Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMv1_3,                     Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionedDEX,             Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(Batch,                       Supported::no,  VoteBehavior::DefaultNo)
-XRPL_FEATURE(SingleAssetVault,            Supported::yes,  VoteBehavior::DefaultNo)
-XRPL_FIX    (PayChanCancelAfter,          Supported::yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (Cleanup3_2_0,                Supported::No, VoteBehavior::DefaultNo)
+XRPL_FEATURE(MPTokensV2,                  Supported::No, VoteBehavior::DefaultNo)
+XRPL_FIX    (Security3_1_3,               Supported::No, VoteBehavior::DefaultNo)
+XRPL_FIX    (PermissionedDomainInvariant, Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (BatchInnerSigs,              Supported::No, VoteBehavior::DefaultNo)
+XRPL_FEATURE(LendingProtocol,             Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(PermissionDelegationV1_1,    Supported::No,  VoteBehavior::DefaultNo)
+XRPL_FIX    (DirectoryLimit,              Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (IncludeKeyletFields,         Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(DynamicMPT,                  Supported::No,  VoteBehavior::DefaultNo)
+XRPL_FIX    (TokenEscrowV1,               Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (PriceOracleOrder,            Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (MPTDeliveredAmount,          Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMClawbackRounding,         Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(TokenEscrow,                 Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (EnforceNFTokenTrustlineV2,   Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMv1_3,                     Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(PermissionedDEX,             Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(Batch,                       Supported::No,  VoteBehavior::DefaultNo)
+XRPL_FEATURE(SingleAssetVault,            Supported::Yes,  VoteBehavior::DefaultNo)
+XRPL_FIX    (PayChanCancelAfter,          Supported::Yes, VoteBehavior::DefaultNo)
 // Check flags in Credential transactions
-XRPL_FIX    (InvalidTxFlags,              Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (FrozenLPTokenTransfer,       Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(DeepFreeze,                  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PermissionedDomains,         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(DynamicNFT,                  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(Credentials,                 Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(AMMClawback,                 Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMv1_2,                     Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(MPTokensV1,                  Supported::yes, VoteBehavior::DefaultNo)
-// InvariantsV1_1 will be changed to Supported::yes when all the invariants expected to be included
-// under it are complete.
-XRPL_FEATURE(InvariantsV1_1,              Supported::no,  VoteBehavior::DefaultNo)
-XRPL_FIX    (NFTokenPageLinks,            Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (InnerObjTemplate2,           Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (EnforceNFTokenTrustline,     Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (ReducedOffersV2,             Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(NFTokenMintOffer,            Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMv1_1,                     Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (PreviousTxnID,               Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (XChainRewardRounding,        Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (EmptyDID,                    Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(PriceOracle,                 Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (AMMOverflowOffer,            Supported::yes, VoteBehavior::DefaultYes)
-XRPL_FIX    (InnerObjTemplate,            Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (NFTokenReserve,              Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (FillOrKill,                  Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(DID,                         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (DisallowIncomingV1,          Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(XChainBridge,                Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(AMM,                         Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(Clawback,                    Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (UniversalNumber,             Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FEATURE(XRPFees,                     Supported::yes, VoteBehavior::DefaultNo)
-XRPL_FIX    (RemoveNFTokenAutoTrustLine,  Supported::yes, VoteBehavior::DefaultYes)
+XRPL_FIX    (InvalidTxFlags,             Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (FrozenLPTokenTransfer,      Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(DeepFreeze,                 Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(PermissionedDomains,        Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(DynamicNFT,                 Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(Credentials,                Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(AMMClawback,                Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMv1_2,                    Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(MPTokensV1,                 Supported::Yes, VoteBehavior::DefaultNo)
+// InvariantsV1_1 will be changes to Supported::yes when all the
+// invariants expected to be included under it are complete.
+XRPL_FEATURE(InvariantsV1_1,             Supported::No,  VoteBehavior::DefaultNo)
+XRPL_FIX    (NFTokenPageLinks,           Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (InnerObjTemplate2,          Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (EnforceNFTokenTrustline,    Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (ReducedOffersV2,            Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(NFTokenMintOffer,           Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMv1_1,                    Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (PreviousTxnID,              Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (XChainRewardRounding,       Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (EmptyDID,                   Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(PriceOracle,                Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (AMMOverflowOffer,           Supported::Yes, VoteBehavior::DefaultYes)
+XRPL_FIX    (InnerObjTemplate,           Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (NFTokenReserve,             Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (FillOrKill,                 Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(DID,                        Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (DisallowIncomingV1,         Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(XChainBridge,               Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(AMM,                        Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(Clawback,                   Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (UniversalNumber,            Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FEATURE(XRPFees,                    Supported::Yes, VoteBehavior::DefaultNo)
+XRPL_FIX    (RemoveNFTokenAutoTrustLine, Supported::Yes, VoteBehavior::DefaultYes)
 
 // The following amendments are obsolete, but must remain supported
 // because they could potentially get enabled.
diff --git a/include/xrpl/protocol/detail/ledger_entries.macro b/include/xrpl/protocol/detail/ledger_entries.macro
index 93cef79ef7..bf641862d1 100644
--- a/include/xrpl/protocol/detail/ledger_entries.macro
+++ b/include/xrpl/protocol/detail/ledger_entries.macro
@@ -24,15 +24,15 @@
     \sa keylet::nftoffer
  */
 LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, nft_offer, ({
-    {sfOwner,                soeREQUIRED},
-    {sfNFTokenID,            soeREQUIRED},
-    {sfAmount,               soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfNFTokenOfferNode,     soeREQUIRED},
-    {sfDestination,          soeOPTIONAL},
-    {sfExpiration,           soeOPTIONAL},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfOwner,                SoeRequired},
+    {sfNFTokenID,            SoeRequired},
+    {sfAmount,               SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfNFTokenOfferNode,     SoeRequired},
+    {sfDestination,          SoeOptional},
+    {sfExpiration,           SoeOptional},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which describes a check.
@@ -40,18 +40,18 @@ LEDGER_ENTRY(ltNFTOKEN_OFFER, 0x0037, NFTokenOffer, nft_offer, ({
     \sa keylet::check
  */
 LEDGER_ENTRY(ltCHECK, 0x0043, Check, check, ({
-    {sfAccount,              soeREQUIRED},
-    {sfDestination,          soeREQUIRED},
-    {sfSendMax,              soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfDestinationNode,      soeREQUIRED},
-    {sfExpiration,           soeOPTIONAL},
-    {sfInvoiceID,            soeOPTIONAL},
-    {sfSourceTag,            soeOPTIONAL},
-    {sfDestinationTag,       soeOPTIONAL},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfAccount,              SoeRequired},
+    {sfDestination,          SoeRequired},
+    {sfSendMax,              SoeRequired},
+    {sfSequence,             SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfDestinationNode,      SoeRequired},
+    {sfExpiration,           SoeOptional},
+    {sfInvoiceID,            SoeOptional},
+    {sfSourceTag,            SoeOptional},
+    {sfDestinationTag,       SoeOptional},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** The ledger object which tracks the DID.
@@ -59,13 +59,13 @@ LEDGER_ENTRY(ltCHECK, 0x0043, Check, check, ({
    \sa keylet::did
 */
 LEDGER_ENTRY(ltDID, 0x0049, DID, did, ({
-    {sfAccount,              soeREQUIRED},
-    {sfDIDDocument,          soeOPTIONAL},
-    {sfURI,                  soeOPTIONAL},
-    {sfData,                 soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfAccount,              SoeRequired},
+    {sfDIDDocument,          SoeOptional},
+    {sfURI,                  SoeOptional},
+    {sfData,                 SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** The ledger object which tracks the current negative UNL state.
@@ -75,11 +75,11 @@ LEDGER_ENTRY(ltDID, 0x0049, DID, did, ({
     \sa keylet::negativeUNL
  */
 LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, nunl, ({
-    {sfDisabledValidators,   soeOPTIONAL},
-    {sfValidatorToDisable,   soeOPTIONAL},
-    {sfValidatorToReEnable,  soeOPTIONAL},
-    {sfPreviousTxnID,        soeOPTIONAL},
-    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
+    {sfDisabledValidators,   SoeOptional},
+    {sfValidatorToDisable,   SoeOptional},
+    {sfValidatorToReEnable,  SoeOptional},
+    {sfPreviousTxnID,        SoeOptional},
+    {sfPreviousTxnLgrSeq,    SoeOptional},
 }))
 
 /** A ledger object which contains a list of NFTs
@@ -87,27 +87,27 @@ LEDGER_ENTRY(ltNEGATIVE_UNL, 0x004e, NegativeUNL, nunl, ({
     \sa keylet::nftpage_min, keylet::nftpage_max, keylet::nftpage
  */
 LEDGER_ENTRY(ltNFTOKEN_PAGE, 0x0050, NFTokenPage, nft_page, ({
-    {sfPreviousPageMin,      soeOPTIONAL},
-    {sfNextPageMin,          soeOPTIONAL},
-    {sfNFTokens,             soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfPreviousPageMin,      SoeOptional},
+    {sfNextPageMin,          SoeOptional},
+    {sfNFTokens,             SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which contains a signer list for an account.
 
     \sa keylet::signers
  */
-// All fields are soeREQUIRED because there is always a SignerEntries.
+// All fields are SoeRequired because there is always a SignerEntries.
 // If there are no SignerEntries the node is deleted.
 LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, signer_list, ({
-    {sfOwner,                soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfSignerQuorum,         soeREQUIRED},
-    {sfSignerEntries,        soeREQUIRED},
-    {sfSignerListID,         soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfOwner,                SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfSignerQuorum,         SoeRequired},
+    {sfSignerEntries,        SoeRequired},
+    {sfSignerListID,         SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which describes a ticket.
@@ -115,11 +115,11 @@ LEDGER_ENTRY(ltSIGNER_LIST, 0x0053, SignerList, signer_list, ({
     \sa keylet::ticket
  */
 LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ticket, ({
-    {sfAccount,              soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfTicketSequence,       soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfAccount,              SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfTicketSequence,       SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which describes an account.
@@ -127,29 +127,29 @@ LEDGER_ENTRY(ltTICKET, 0x0054, Ticket, ticket, ({
     \sa keylet::account
  */
 LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
-    {sfAccount,              soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfBalance,              soeREQUIRED},
-    {sfOwnerCount,           soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfAccountTxnID,         soeOPTIONAL},
-    {sfRegularKey,           soeOPTIONAL},
-    {sfEmailHash,            soeOPTIONAL},
-    {sfWalletLocator,        soeOPTIONAL},
-    {sfWalletSize,           soeOPTIONAL},
-    {sfMessageKey,           soeOPTIONAL},
-    {sfTransferRate,         soeOPTIONAL},
-    {sfDomain,               soeOPTIONAL},
-    {sfTickSize,             soeOPTIONAL},
-    {sfTicketCount,          soeOPTIONAL},
-    {sfNFTokenMinter,        soeOPTIONAL},
-    {sfMintedNFTokens,       soeDEFAULT},
-    {sfBurnedNFTokens,       soeDEFAULT},
-    {sfFirstNFTokenSequence, soeOPTIONAL},
-    {sfAMMID,                soeOPTIONAL}, // pseudo-account designator
-    {sfVaultID,              soeOPTIONAL}, // pseudo-account designator
-    {sfLoanBrokerID,         soeOPTIONAL}, // pseudo-account designator
+    {sfAccount,              SoeRequired},
+    {sfSequence,             SoeRequired},
+    {sfBalance,              SoeRequired},
+    {sfOwnerCount,           SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfAccountTxnID,         SoeOptional},
+    {sfRegularKey,           SoeOptional},
+    {sfEmailHash,            SoeOptional},
+    {sfWalletLocator,        SoeOptional},
+    {sfWalletSize,           SoeOptional},
+    {sfMessageKey,           SoeOptional},
+    {sfTransferRate,         SoeOptional},
+    {sfDomain,               SoeOptional},
+    {sfTickSize,             SoeOptional},
+    {sfTicketCount,          SoeOptional},
+    {sfNFTokenMinter,        SoeOptional},
+    {sfMintedNFTokens,       SoeDefault},
+    {sfBurnedNFTokens,       SoeDefault},
+    {sfFirstNFTokenSequence, SoeOptional},
+    {sfAMMID,                SoeOptional}, // pseudo-account designator
+    {sfVaultID,              SoeOptional}, // pseudo-account designator
+    {sfLoanBrokerID,         SoeOptional}, // pseudo-account designator
 }))
 
 /** A ledger object which contains a list of object identifiers.
@@ -158,22 +158,22 @@ LEDGER_ENTRY(ltACCOUNT_ROOT, 0x0061, AccountRoot, account, ({
         keylet::ownerDir
  */
 LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, directory, ({
-    {sfOwner,                soeOPTIONAL},  // for owner directories
-    {sfTakerPaysCurrency,    soeOPTIONAL},  // order book directories
-    {sfTakerPaysIssuer,      soeOPTIONAL},  // order book directories
-    {sfTakerPaysMPT,         soeOPTIONAL},  // order book directories
-    {sfTakerGetsCurrency,    soeOPTIONAL},  // order book directories
-    {sfTakerGetsIssuer,      soeOPTIONAL},  // order book directories
-    {sfTakerGetsMPT,         soeOPTIONAL},  // order book directories
-    {sfExchangeRate,         soeOPTIONAL},  // order book directories
-    {sfIndexes,              soeREQUIRED},
-    {sfRootIndex,            soeREQUIRED},
-    {sfIndexNext,            soeOPTIONAL},
-    {sfIndexPrevious,        soeOPTIONAL},
-    {sfNFTokenID,            soeOPTIONAL},
-    {sfPreviousTxnID,        soeOPTIONAL},
-    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
-    {sfDomainID,             soeOPTIONAL}   // order book directories
+    {sfOwner,                SoeOptional},  // for owner directories
+    {sfTakerPaysCurrency,    SoeOptional},  // order book directories
+    {sfTakerPaysIssuer,      SoeOptional},  // order book directories
+    {sfTakerPaysMPT,         SoeOptional},  // order book directories
+    {sfTakerGetsCurrency,    SoeOptional},  // order book directories
+    {sfTakerGetsIssuer,      SoeOptional},  // order book directories
+    {sfTakerGetsMPT,         SoeOptional},  // order book directories
+    {sfExchangeRate,         SoeOptional},  // order book directories
+    {sfIndexes,              SoeRequired},
+    {sfRootIndex,            SoeRequired},
+    {sfIndexNext,            SoeOptional},
+    {sfIndexPrevious,        SoeOptional},
+    {sfNFTokenID,            SoeOptional},
+    {sfPreviousTxnID,        SoeOptional},
+    {sfPreviousTxnLgrSeq,    SoeOptional},
+    {sfDomainID,             SoeOptional}   // order book directories
 }))
 
 /** The ledger object which lists details about amendments on the network.
@@ -183,10 +183,10 @@ LEDGER_ENTRY(ltDIR_NODE, 0x0064, DirectoryNode, directory, ({
     \sa keylet::amendments
  */
 LEDGER_ENTRY(ltAMENDMENTS, 0x0066, Amendments, amendments, ({
-    {sfAmendments,           soeOPTIONAL},  // Enabled
-    {sfMajorities,           soeOPTIONAL},
-    {sfPreviousTxnID,        soeOPTIONAL},
-    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
+    {sfAmendments,           SoeOptional},  // Enabled
+    {sfMajorities,           SoeOptional},
+    {sfPreviousTxnID,        SoeOptional},
+    {sfPreviousTxnLgrSeq,    SoeOptional},
 }))
 
 /** A ledger object that contains a list of ledger hashes.
@@ -198,9 +198,9 @@ LEDGER_ENTRY(ltAMENDMENTS, 0x0066, Amendments, amendments, ({
     \sa keylet::skip
  */
 LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, hashes, ({
-    {sfFirstLedgerSequence,  soeOPTIONAL},
-    {sfLastLedgerSequence,   soeOPTIONAL},
-    {sfHashes,               soeREQUIRED},
+    {sfFirstLedgerSequence,  SoeOptional},
+    {sfLastLedgerSequence,   SoeOptional},
+    {sfHashes,               SoeRequired},
 }))
 
 /** The ledger object which lists details about sidechains.
@@ -208,16 +208,16 @@ LEDGER_ENTRY(ltLEDGER_HASHES, 0x0068, LedgerHashes, hashes, ({
     \sa keylet::bridge
 */
 LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, bridge, ({
-    {sfAccount,                  soeREQUIRED},
-    {sfSignatureReward,          soeREQUIRED},
-    {sfMinAccountCreateAmount,   soeOPTIONAL},
-    {sfXChainBridge,             soeREQUIRED},
-    {sfXChainClaimID,            soeREQUIRED},
-    {sfXChainAccountCreateCount, soeREQUIRED},
-    {sfXChainAccountClaimCount,  soeREQUIRED},
-    {sfOwnerNode,                soeREQUIRED},
-    {sfPreviousTxnID,            soeREQUIRED},
-    {sfPreviousTxnLgrSeq,        soeREQUIRED},
+    {sfAccount,                  SoeRequired},
+    {sfSignatureReward,          SoeRequired},
+    {sfMinAccountCreateAmount,   SoeOptional},
+    {sfXChainBridge,             SoeRequired},
+    {sfXChainClaimID,            SoeRequired},
+    {sfXChainAccountCreateCount, SoeRequired},
+    {sfXChainAccountClaimCount,  SoeRequired},
+    {sfOwnerNode,                SoeRequired},
+    {sfPreviousTxnID,            SoeRequired},
+    {sfPreviousTxnLgrSeq,        SoeRequired},
 }))
 
 /** A ledger object which describes an offer on the DEX.
@@ -225,18 +225,18 @@ LEDGER_ENTRY(ltBRIDGE, 0x0069, Bridge, bridge, ({
     \sa keylet::offer
  */
 LEDGER_ENTRY(ltOFFER, 0x006f, Offer, offer, ({
-    {sfAccount,              soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfTakerPays,            soeREQUIRED},
-    {sfTakerGets,            soeREQUIRED},
-    {sfBookDirectory,        soeREQUIRED},
-    {sfBookNode,             soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfExpiration,           soeOPTIONAL},
-    {sfDomainID,             soeOPTIONAL},
-    {sfAdditionalBooks,      soeOPTIONAL},
+    {sfAccount,              SoeRequired},
+    {sfSequence,             SoeRequired},
+    {sfTakerPays,            SoeRequired},
+    {sfTakerGets,            SoeRequired},
+    {sfBookDirectory,        SoeRequired},
+    {sfBookNode,             SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfExpiration,           SoeOptional},
+    {sfDomainID,             SoeOptional},
+    {sfAdditionalBooks,      SoeOptional},
 }))
 
 /** A ledger object which describes a deposit pre-authorization.
@@ -244,12 +244,12 @@ LEDGER_ENTRY(ltOFFER, 0x006f, Offer, offer, ({
     \sa keylet::depositPreauth
  */
 LEDGER_ENTRY_DUPLICATE(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, deposit_preauth, ({
-    {sfAccount,              soeREQUIRED},
-    {sfAuthorize,            soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfAuthorizeCredentials, soeOPTIONAL},
+    {sfAccount,              SoeRequired},
+    {sfAuthorize,            SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfAuthorizeCredentials, SoeOptional},
 }))
 
 /** A claim id for a cross chain transaction.
@@ -257,15 +257,15 @@ LEDGER_ENTRY_DUPLICATE(ltDEPOSIT_PREAUTH, 0x0070, DepositPreauth, deposit_preaut
     \sa keylet::xChainClaimID
 */
 LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, xchain_owned_claim_id, ({
-    {sfAccount,                 soeREQUIRED},
-    {sfXChainBridge,            soeREQUIRED},
-    {sfXChainClaimID,           soeREQUIRED},
-    {sfOtherChainSource,        soeREQUIRED},
-    {sfXChainClaimAttestations, soeREQUIRED},
-    {sfSignatureReward,         soeREQUIRED},
-    {sfOwnerNode,               soeREQUIRED},
-    {sfPreviousTxnID,           soeREQUIRED},
-    {sfPreviousTxnLgrSeq,       soeREQUIRED},
+    {sfAccount,                 SoeRequired},
+    {sfXChainBridge,            SoeRequired},
+    {sfXChainClaimID,           SoeRequired},
+    {sfOtherChainSource,        SoeRequired},
+    {sfXChainClaimAttestations, SoeRequired},
+    {sfSignatureReward,         SoeRequired},
+    {sfOwnerNode,               SoeRequired},
+    {sfPreviousTxnID,           SoeRequired},
+    {sfPreviousTxnLgrSeq,       SoeRequired},
 }))
 
 /** A ledger object which describes a bidirectional trust line.
@@ -275,17 +275,17 @@ LEDGER_ENTRY(ltXCHAIN_OWNED_CLAIM_ID, 0x0071, XChainOwnedClaimID, xchain_owned_c
     \sa keylet::line
  */
 LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
-    {sfBalance,              soeREQUIRED},
-    {sfLowLimit,             soeREQUIRED},
-    {sfHighLimit,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfLowNode,              soeOPTIONAL},
-    {sfLowQualityIn,         soeOPTIONAL},
-    {sfLowQualityOut,        soeOPTIONAL},
-    {sfHighNode,             soeOPTIONAL},
-    {sfHighQualityIn,        soeOPTIONAL},
-    {sfHighQualityOut,       soeOPTIONAL},
+    {sfBalance,              SoeRequired},
+    {sfLowLimit,             SoeRequired},
+    {sfHighLimit,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfLowNode,              SoeOptional},
+    {sfLowQualityIn,         SoeOptional},
+    {sfLowQualityOut,        SoeOptional},
+    {sfHighNode,             SoeOptional},
+    {sfHighQualityIn,        SoeOptional},
+    {sfHighQualityOut,       SoeOptional},
 }))
 
 /** The ledger object which lists the network's fee settings.
@@ -296,16 +296,16 @@ LEDGER_ENTRY(ltRIPPLE_STATE, 0x0072, RippleState, state, ({
  */
 LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     // Old version uses raw numbers
-    {sfBaseFee,                soeOPTIONAL},
-    {sfReferenceFeeUnits,      soeOPTIONAL},
-    {sfReserveBase,            soeOPTIONAL},
-    {sfReserveIncrement,       soeOPTIONAL},
+    {sfBaseFee,                SoeOptional},
+    {sfReferenceFeeUnits,      SoeOptional},
+    {sfReserveBase,            SoeOptional},
+    {sfReserveIncrement,       SoeOptional},
     // New version uses Amounts
-    {sfBaseFeeDrops,           soeOPTIONAL},
-    {sfReserveBaseDrops,       soeOPTIONAL},
-    {sfReserveIncrementDrops,  soeOPTIONAL},
-    {sfPreviousTxnID,          soeOPTIONAL},
-    {sfPreviousTxnLgrSeq,      soeOPTIONAL},
+    {sfBaseFeeDrops,           SoeOptional},
+    {sfReserveBaseDrops,       SoeOptional},
+    {sfReserveIncrementDrops,  SoeOptional},
+    {sfPreviousTxnID,          SoeOptional},
+    {sfPreviousTxnLgrSeq,      SoeOptional},
 }))
 
 /** A claim id for a cross chain create account transaction.
@@ -313,13 +313,13 @@ LEDGER_ENTRY(ltFEE_SETTINGS, 0x0073, FeeSettings, fee, ({
     \sa keylet::xChainCreateAccountClaimID
 */
 LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAccountClaimID, xchain_owned_create_account_claim_id, ({
-    {sfAccount,                         soeREQUIRED},
-    {sfXChainBridge,                    soeREQUIRED},
-    {sfXChainAccountCreateCount,        soeREQUIRED},
-    {sfXChainCreateAccountAttestations, soeREQUIRED},
-    {sfOwnerNode,                       soeREQUIRED},
-    {sfPreviousTxnID,                   soeREQUIRED},
-    {sfPreviousTxnLgrSeq,               soeREQUIRED},
+    {sfAccount,                         SoeRequired},
+    {sfXChainBridge,                    SoeRequired},
+    {sfXChainAccountCreateCount,        SoeRequired},
+    {sfXChainCreateAccountAttestations, SoeRequired},
+    {sfOwnerNode,                       SoeRequired},
+    {sfPreviousTxnID,                   SoeRequired},
+    {sfPreviousTxnLgrSeq,               SoeRequired},
 }))
 
 /** A ledger object describing a single escrow.
@@ -327,21 +327,21 @@ LEDGER_ENTRY(ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID, 0x0074, XChainOwnedCreateAc
     \sa keylet::escrow
  */
 LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
-    {sfAccount,              soeREQUIRED},
-    {sfSequence,             soeOPTIONAL},
-    {sfDestination,          soeREQUIRED},
-    {sfAmount,               soeREQUIRED},
-    {sfCondition,            soeOPTIONAL},
-    {sfCancelAfter,          soeOPTIONAL},
-    {sfFinishAfter,          soeOPTIONAL},
-    {sfSourceTag,            soeOPTIONAL},
-    {sfDestinationTag,       soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfDestinationNode,      soeOPTIONAL},
-    {sfTransferRate,         soeOPTIONAL},
-    {sfIssuerNode,           soeOPTIONAL},
+    {sfAccount,              SoeRequired},
+    {sfSequence,             SoeOptional},
+    {sfDestination,          SoeRequired},
+    {sfAmount,               SoeRequired},
+    {sfCondition,            SoeOptional},
+    {sfCancelAfter,          SoeOptional},
+    {sfFinishAfter,          SoeOptional},
+    {sfSourceTag,            SoeOptional},
+    {sfDestinationTag,       SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfDestinationNode,      SoeOptional},
+    {sfTransferRate,         SoeOptional},
+    {sfIssuerNode,           SoeOptional},
 }))
 
 /** A ledger object describing a single unidirectional XRP payment channel.
@@ -349,21 +349,21 @@ LEDGER_ENTRY(ltESCROW, 0x0075, Escrow, escrow, ({
     \sa keylet::payChan
  */
 LEDGER_ENTRY(ltPAYCHAN, 0x0078, PayChannel, payment_channel, ({
-    {sfAccount,              soeREQUIRED},
-    {sfDestination,          soeREQUIRED},
-    {sfSequence,             soeOPTIONAL},
-    {sfAmount,               soeREQUIRED},
-    {sfBalance,              soeREQUIRED},
-    {sfPublicKey,            soeREQUIRED},
-    {sfSettleDelay,          soeREQUIRED},
-    {sfExpiration,           soeOPTIONAL},
-    {sfCancelAfter,          soeOPTIONAL},
-    {sfSourceTag,            soeOPTIONAL},
-    {sfDestinationTag,       soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfDestinationNode,      soeOPTIONAL},
+    {sfAccount,              SoeRequired},
+    {sfDestination,          SoeRequired},
+    {sfSequence,             SoeOptional},
+    {sfAmount,               SoeRequired},
+    {sfBalance,              SoeRequired},
+    {sfPublicKey,            SoeRequired},
+    {sfSettleDelay,          SoeRequired},
+    {sfExpiration,           SoeOptional},
+    {sfCancelAfter,          SoeOptional},
+    {sfSourceTag,            SoeOptional},
+    {sfDestinationTag,       SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfDestinationNode,      SoeOptional},
 }))
 
 /** The ledger object which tracks the AMM.
@@ -371,125 +371,125 @@ LEDGER_ENTRY(ltPAYCHAN, 0x0078, PayChannel, payment_channel, ({
    \sa keylet::amm
 */
 LEDGER_ENTRY(ltAMM, 0x0079, AMM, amm, ({
-    {sfAccount,              soeREQUIRED},
-    {sfTradingFee,           soeDEFAULT},
-    {sfVoteSlots,            soeOPTIONAL},
-    {sfAuctionSlot,          soeOPTIONAL},
-    {sfLPTokenBalance,       soeREQUIRED},
-    {sfAsset,                soeREQUIRED},
-    {sfAsset2,               soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeOPTIONAL},
-    {sfPreviousTxnLgrSeq,    soeOPTIONAL},
+    {sfAccount,              SoeRequired},
+    {sfTradingFee,           SoeDefault},
+    {sfVoteSlots,            SoeOptional},
+    {sfAuctionSlot,          SoeOptional},
+    {sfLPTokenBalance,       SoeRequired},
+    {sfAsset,                SoeRequired},
+    {sfAsset2,               SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeOptional},
+    {sfPreviousTxnLgrSeq,    SoeOptional},
 }))
 
 /** A ledger object which tracks MPTokenIssuance
     \sa keylet::mptIssuance
  */
 LEDGER_ENTRY(ltMPTOKEN_ISSUANCE, 0x007e, MPTokenIssuance, mpt_issuance, ({
-    {sfIssuer,                   soeREQUIRED},
-    {sfSequence,                 soeREQUIRED},
-    {sfTransferFee,              soeDEFAULT},
-    {sfOwnerNode,                soeREQUIRED},
-    {sfAssetScale,               soeDEFAULT},
-    {sfMaximumAmount,            soeOPTIONAL},
-    {sfOutstandingAmount,        soeREQUIRED},
-    {sfLockedAmount,             soeOPTIONAL},
-    {sfMPTokenMetadata,          soeOPTIONAL},
-    {sfPreviousTxnID,            soeREQUIRED},
-    {sfPreviousTxnLgrSeq,        soeREQUIRED},
-    {sfDomainID,                 soeOPTIONAL},
-    {sfMutableFlags,             soeDEFAULT},
+    {sfIssuer,                   SoeRequired},
+    {sfSequence,                 SoeRequired},
+    {sfTransferFee,              SoeDefault},
+    {sfOwnerNode,                SoeRequired},
+    {sfAssetScale,               SoeDefault},
+    {sfMaximumAmount,            SoeOptional},
+    {sfOutstandingAmount,        SoeRequired},
+    {sfLockedAmount,             SoeOptional},
+    {sfMPTokenMetadata,          SoeOptional},
+    {sfPreviousTxnID,            SoeRequired},
+    {sfPreviousTxnLgrSeq,        SoeRequired},
+    {sfDomainID,                 SoeOptional},
+    {sfMutableFlags,             SoeDefault},
 }))
 
 /** A ledger object which tracks MPToken
     \sa keylet::mptoken
  */
 LEDGER_ENTRY(ltMPTOKEN, 0x007f, MPToken, mptoken, ({
-    {sfAccount,                  soeREQUIRED},
-    {sfMPTokenIssuanceID,        soeREQUIRED},
-    {sfMPTAmount,                soeDEFAULT},
-    {sfLockedAmount,             soeOPTIONAL},
-    {sfOwnerNode,                soeREQUIRED},
-    {sfPreviousTxnID,            soeREQUIRED},
-    {sfPreviousTxnLgrSeq,        soeREQUIRED},
+    {sfAccount,                  SoeRequired},
+    {sfMPTokenIssuanceID,        SoeRequired},
+    {sfMPTAmount,                SoeDefault},
+    {sfLockedAmount,             SoeOptional},
+    {sfOwnerNode,                SoeRequired},
+    {sfPreviousTxnID,            SoeRequired},
+    {sfPreviousTxnLgrSeq,        SoeRequired},
 }))
 
 /** A ledger object which tracks Oracle
     \sa keylet::oracle
  */
 LEDGER_ENTRY(ltORACLE, 0x0080, Oracle, oracle, ({
-    {sfOwner,                soeREQUIRED},
-    {sfOracleDocumentID,     soeOPTIONAL},
-    {sfProvider,             soeREQUIRED},
-    {sfPriceDataSeries,      soeREQUIRED},
-    {sfAssetClass,           soeREQUIRED},
-    {sfLastUpdateTime,       soeREQUIRED},
-    {sfURI,                  soeOPTIONAL},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfOwner,                SoeRequired},
+    {sfOracleDocumentID,     SoeOptional},
+    {sfProvider,             SoeRequired},
+    {sfPriceDataSeries,      SoeRequired},
+    {sfAssetClass,           SoeRequired},
+    {sfLastUpdateTime,       SoeRequired},
+    {sfURI,                  SoeOptional},
+    {sfOwnerNode,            SoeRequired},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which tracks Credential
     \sa keylet::credential
  */
 LEDGER_ENTRY(ltCREDENTIAL, 0x0081, Credential, credential, ({
-    {sfSubject,              soeREQUIRED},
-    {sfIssuer,               soeREQUIRED},
-    {sfCredentialType,       soeREQUIRED},
-    {sfExpiration,           soeOPTIONAL},
-    {sfURI,                  soeOPTIONAL},
-    {sfIssuerNode,           soeREQUIRED},
-    {sfSubjectNode,          soeOPTIONAL},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfSubject,              SoeRequired},
+    {sfIssuer,               SoeRequired},
+    {sfCredentialType,       SoeRequired},
+    {sfExpiration,           SoeOptional},
+    {sfURI,                  SoeOptional},
+    {sfIssuerNode,           SoeRequired},
+    {sfSubjectNode,          SoeOptional},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object which tracks PermissionedDomain
     \sa keylet::permissionedDomain
  */
 LEDGER_ENTRY(ltPERMISSIONED_DOMAIN, 0x0082, PermissionedDomain, permissioned_domain, ({
-    {sfOwner,               soeREQUIRED},
-    {sfSequence,            soeREQUIRED},
-    {sfAcceptedCredentials, soeREQUIRED},
-    {sfOwnerNode,           soeREQUIRED},
-    {sfPreviousTxnID,       soeREQUIRED},
-    {sfPreviousTxnLgrSeq,   soeREQUIRED},
+    {sfOwner,               SoeRequired},
+    {sfSequence,            SoeRequired},
+    {sfAcceptedCredentials, SoeRequired},
+    {sfOwnerNode,           SoeRequired},
+    {sfPreviousTxnID,       SoeRequired},
+    {sfPreviousTxnLgrSeq,   SoeRequired},
 }))
 
 /** A ledger object representing permissions an account has delegated to another account.
     \sa keylet::delegate
  */
 LEDGER_ENTRY(ltDELEGATE, 0x0083, Delegate, delegate, ({
-    {sfAccount,              soeREQUIRED},
-    {sfAuthorize,            soeREQUIRED},
-    {sfPermissions,          soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfDestinationNode,      soeOPTIONAL},
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
+    {sfAccount,              SoeRequired},
+    {sfAuthorize,            SoeRequired},
+    {sfPermissions,          SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfDestinationNode,      SoeOptional},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
 }))
 
 /** A ledger object representing a single asset vault.
     \sa keylet::vault
  */
 LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfOwner,                soeREQUIRED},
-    {sfAccount,              soeREQUIRED},
-    {sfData,                 soeOPTIONAL},
-    {sfAsset,                soeREQUIRED},
-    {sfAssetsTotal,          soeDEFAULT},
-    {sfAssetsAvailable,      soeDEFAULT},
-    {sfAssetsMaximum,        soeDEFAULT},
-    {sfLossUnrealized,       soeDEFAULT},
-    {sfShareMPTID,           soeREQUIRED},
-    {sfWithdrawalPolicy,     soeREQUIRED},
-    {sfScale,                soeDEFAULT},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfSequence,             SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfOwner,                SoeRequired},
+    {sfAccount,              SoeRequired},
+    {sfData,                 SoeOptional},
+    {sfAsset,                SoeRequired},
+    {sfAssetsTotal,          SoeDefault},
+    {sfAssetsAvailable,      SoeDefault},
+    {sfAssetsMaximum,        SoeDefault},
+    {sfLossUnrealized,       SoeDefault},
+    {sfShareMPTID,           SoeRequired},
+    {sfWithdrawalPolicy,     SoeRequired},
+    {sfScale,                SoeDefault},
     // no SharesTotal ever (use MPTIssuance.sfOutstandingAmount)
     // no PermissionedDomainID ever (use MPTIssuance.sfDomainID)
 }))
@@ -501,23 +501,23 @@ LEDGER_ENTRY(ltVAULT, 0x0084, Vault, vault, ({
     \sa keylet::loanbroker
  */
 LEDGER_ENTRY(ltLOAN_BROKER, 0x0088, LoanBroker, loan_broker, ({
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfSequence,             soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfVaultNode,            soeREQUIRED},
-    {sfVaultID,              soeREQUIRED},
-    {sfAccount,              soeREQUIRED},
-    {sfOwner,                soeREQUIRED},
-    {sfLoanSequence,         soeREQUIRED},
-    {sfData,                 soeDEFAULT},
-    {sfManagementFeeRate,    soeDEFAULT},
-    {sfOwnerCount,           soeDEFAULT},
-    {sfDebtTotal,            soeDEFAULT},
-    {sfDebtMaximum,          soeDEFAULT},
-    {sfCoverAvailable,       soeDEFAULT},
-    {sfCoverRateMinimum,     soeDEFAULT},
-    {sfCoverRateLiquidation, soeDEFAULT},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfSequence,             SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfVaultNode,            SoeRequired},
+    {sfVaultID,              SoeRequired},
+    {sfAccount,              SoeRequired},
+    {sfOwner,                SoeRequired},
+    {sfLoanSequence,         SoeRequired},
+    {sfData,                 SoeDefault},
+    {sfManagementFeeRate,    SoeDefault},
+    {sfOwnerCount,           SoeDefault},
+    {sfDebtTotal,            SoeDefault},
+    {sfDebtMaximum,          SoeDefault},
+    {sfCoverAvailable,       SoeDefault},
+    {sfCoverRateMinimum,     SoeDefault},
+    {sfCoverRateLiquidation, SoeDefault},
 }))
 
 /** A ledger object representing a loan between a Borrower and a Loan Broker
@@ -525,27 +525,27 @@ LEDGER_ENTRY(ltLOAN_BROKER, 0x0088, LoanBroker, loan_broker, ({
     \sa keylet::loan
  */
 LEDGER_ENTRY(ltLOAN, 0x0089, Loan, loan, ({
-    {sfPreviousTxnID,        soeREQUIRED},
-    {sfPreviousTxnLgrSeq,    soeREQUIRED},
-    {sfOwnerNode,            soeREQUIRED},
-    {sfLoanBrokerNode,       soeREQUIRED},
-    {sfLoanBrokerID,         soeREQUIRED},
-    {sfLoanSequence,         soeREQUIRED},
-    {sfBorrower,             soeREQUIRED},
-    {sfLoanOriginationFee,   soeDEFAULT},
-    {sfLoanServiceFee,       soeDEFAULT},
-    {sfLatePaymentFee,       soeDEFAULT},
-    {sfClosePaymentFee,      soeDEFAULT},
-    {sfOverpaymentFee,       soeDEFAULT},
-    {sfInterestRate,         soeDEFAULT},
-    {sfLateInterestRate,     soeDEFAULT},
-    {sfCloseInterestRate,    soeDEFAULT},
-    {sfOverpaymentInterestRate, soeDEFAULT},
-    {sfStartDate,            soeREQUIRED},
-    {sfPaymentInterval,      soeREQUIRED},
-    {sfGracePeriod,          soeDEFAULT},
-    {sfPreviousPaymentDueDate, soeDEFAULT},
-    {sfNextPaymentDueDate,   soeDEFAULT},
+    {sfPreviousTxnID,        SoeRequired},
+    {sfPreviousTxnLgrSeq,    SoeRequired},
+    {sfOwnerNode,            SoeRequired},
+    {sfLoanBrokerNode,       SoeRequired},
+    {sfLoanBrokerID,         SoeRequired},
+    {sfLoanSequence,         SoeRequired},
+    {sfBorrower,             SoeRequired},
+    {sfLoanOriginationFee,   SoeDefault},
+    {sfLoanServiceFee,       SoeDefault},
+    {sfLatePaymentFee,       SoeDefault},
+    {sfClosePaymentFee,      SoeDefault},
+    {sfOverpaymentFee,       SoeDefault},
+    {sfInterestRate,         SoeDefault},
+    {sfLateInterestRate,     SoeDefault},
+    {sfCloseInterestRate,    SoeDefault},
+    {sfOverpaymentInterestRate, SoeDefault},
+    {sfStartDate,            SoeRequired},
+    {sfPaymentInterval,      SoeRequired},
+    {sfGracePeriod,          SoeDefault},
+    {sfPreviousPaymentDueDate, SoeDefault},
+    {sfNextPaymentDueDate,   SoeDefault},
     // The loan object tracks these values:
     //
     // - PaymentRemaining: The number of payments left in the loan. When it
@@ -593,17 +593,17 @@ LEDGER_ENTRY(ltLOAN, 0x0089, Loan, loan, ({
     //
     // Note the the "True" values may differ significantly from the tracked
     // rounded values.
-    {sfPaymentRemaining,         soeDEFAULT},
-    {sfPeriodicPayment,          soeREQUIRED},
-    {sfPrincipalOutstanding,     soeDEFAULT},
-    {sfTotalValueOutstanding,    soeDEFAULT},
-    {sfManagementFeeOutstanding, soeDEFAULT},
+    {sfPaymentRemaining,         SoeDefault},
+    {sfPeriodicPayment,          SoeRequired},
+    {sfPrincipalOutstanding,     SoeDefault},
+    {sfTotalValueOutstanding,    SoeDefault},
+    {sfManagementFeeOutstanding, SoeDefault},
     // Based on the computed total value at creation, used for
     // rounding calculated values so they are all on a
     // consistent scale - that is, they all have the same
     // number of digits after the decimal point (excluding
     // trailing zeros).
-    {sfLoanScale,                soeDEFAULT},
+    {sfLoanScale,                SoeDefault},
 }))
 
 #undef EXPAND
diff --git a/include/xrpl/protocol/detail/secp256k1.h b/include/xrpl/protocol/detail/secp256k1.h
index 0ac810fd80..17dfa3ff25 100644
--- a/include/xrpl/protocol/detail/secp256k1.h
+++ b/include/xrpl/protocol/detail/secp256k1.h
@@ -8,20 +8,20 @@ template <class = void>
 secp256k1_context const*
 secp256k1Context()
 {
-    struct holder
+    struct Holder
     {
         secp256k1_context* impl;
-        holder() : impl(secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN))
+        Holder() : impl(secp256k1_context_create(SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN))
         {
         }
 
-        ~holder()
+        ~Holder()
         {
             secp256k1_context_destroy(impl);
         }
     };
-    static holder const h;
-    return h.impl;
+    static Holder const kH;
+    return kH.impl;
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/detail/sfields.macro b/include/xrpl/protocol/detail/sfields.macro
index 4f21207831..3637acc1c4 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::sMD_Never)
+TYPED_SFIELD(sfLedgerEntryType,          UINT16,     1, SField::SMdNever)
 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::sMD_DeleteFinal)
+TYPED_SFIELD(sfPreviousTxnLgrSeq,        UINT32,     5, SField::SMdDeleteFinal)
 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::sMD_BaseTen|SField::sMD_Default)
-TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::sMD_BaseTen|SField::sMD_Default)
-TYPED_SFIELD(sfMPTAmount,                UINT64,    26, SField::sMD_BaseTen|SField::sMD_Default)
+TYPED_SFIELD(sfMaximumAmount,            UINT64,    24, SField::SMdBaseTen|SField::SMdDefault)
+TYPED_SFIELD(sfOutstandingAmount,        UINT64,    25, SField::SMdBaseTen|SField::SMdDefault)
+TYPED_SFIELD(sfMPTAmount,                UINT64,    26, SField::SMdBaseTen|SField::SMdDefault)
 TYPED_SFIELD(sfIssuerNode,               UINT64,    27)
 TYPED_SFIELD(sfSubjectNode,              UINT64,    28)
-TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::sMD_BaseTen|SField::sMD_Default)
+TYPED_SFIELD(sfLockedAmount,             UINT64,    29, SField::SMdBaseTen|SField::SMdDefault)
 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::sMD_DeleteFinal)
+TYPED_SFIELD(sfPreviousTxnID,            UINT256,    5, SField::SMdDeleteFinal)
 TYPED_SFIELD(sfLedgerIndex,              UINT256,    6)
 TYPED_SFIELD(sfWalletLocator,            UINT256,    7)
-TYPED_SFIELD(sfRootIndex,                UINT256,    8, SField::sMD_Always)
+TYPED_SFIELD(sfRootIndex,                UINT256,    8, SField::SMdAlways)
 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::sMD_PseudoAccount | SField::sMD_Default)
+    SField::SMdPseudoAccount | SField::SMdDefault)
 
 // 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::sMD_PseudoAccount | SField::sMD_Default)
+    SField::SMdPseudoAccount | SField::SMdDefault)
 TYPED_SFIELD(sfParentBatchID,            UINT256,   36)
 TYPED_SFIELD(sfLoanBrokerID,             UINT256,   37,
-    SField::sMD_PseudoAccount | SField::sMD_Default)
+    SField::SMdPseudoAccount | SField::SMdDefault)
 TYPED_SFIELD(sfLoanID,                   UINT256,   38)
 
 // number (common)
 TYPED_SFIELD(sfNumber,                   NUMBER,     1)
-TYPED_SFIELD(sfAssetsAvailable,          NUMBER,     2, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfAssetsMaximum,            NUMBER,     3, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfAssetsTotal,              NUMBER,     4, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfLossUnrealized,           NUMBER,     5, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfDebtTotal,                NUMBER,     6, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfDebtMaximum,              NUMBER,     7, SField::sMD_NeedsAsset | SField::sMD_Default)
-TYPED_SFIELD(sfCoverAvailable,           NUMBER,     8, SField::sMD_NeedsAsset | SField::sMD_Default)
+TYPED_SFIELD(sfAssetsAvailable,          NUMBER,     2, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfAssetsMaximum,            NUMBER,     3, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfAssetsTotal,              NUMBER,     4, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfLossUnrealized,           NUMBER,     5, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfDebtTotal,                NUMBER,     6, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfDebtMaximum,              NUMBER,     7, SField::SMdNeedsAsset | SField::SMdDefault)
+TYPED_SFIELD(sfCoverAvailable,           NUMBER,     8, SField::SMdNeedsAsset | SField::SMdDefault)
 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::sMD_NeedsAsset | SField::sMD_Default)
+TYPED_SFIELD(sfPrincipalOutstanding,     NUMBER,     13, SField::SMdNeedsAsset | SField::SMdDefault)
 TYPED_SFIELD(sfPrincipalRequested,       NUMBER,     14)
-TYPED_SFIELD(sfTotalValueOutstanding,    NUMBER,     15, SField::sMD_NeedsAsset | SField::sMD_Default)
+TYPED_SFIELD(sfTotalValueOutstanding,    NUMBER,     15, SField::SMdNeedsAsset | SField::SMdDefault)
 TYPED_SFIELD(sfPeriodicPayment,          NUMBER,     16)
-TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::sMD_NeedsAsset | SField::sMD_Default)
+TYPED_SFIELD(sfManagementFeeOutstanding, NUMBER,     17, SField::SMdNeedsAsset | SField::SMdDefault)
 
 // 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::sMD_Default, SField::notSigning)
+TYPED_SFIELD(sfTxnSignature,             VL,         4, SField::SMdDefault, SField::kNOT_SIGNING)
 TYPED_SFIELD(sfURI,                      VL,         5)
-TYPED_SFIELD(sfSignature,                VL,         6, SField::sMD_Default, SField::notSigning)
+TYPED_SFIELD(sfSignature,                VL,         6, SField::SMdDefault, SField::kNOT_SIGNING)
 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::sMD_Default, SField::notSigning)
+TYPED_SFIELD(sfMasterSignature,          VL,        18, SField::SMdDefault, SField::kNOT_SIGNING)
 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::sMD_Never)
+TYPED_SFIELD(sfIndexes,                  VECTOR256,  1, SField::SMdNever)
 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::sMD_Default, SField::notSigning)
+UNTYPED_SFIELD(sfCounterpartySignature,  OBJECT,    37, SField::SMdDefault, SField::kNOT_SIGNING)
 
 // 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::sMD_Default, SField::notSigning)
+UNTYPED_SFIELD(sfSigners,                ARRAY,      3, SField::SMdDefault, SField::kNOT_SIGNING)
 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::sMD_Default, SField::notSigning)
+UNTYPED_SFIELD(sfBatchSigners,           ARRAY,     31, SField::SMdDefault, SField::kNOT_SIGNING)
diff --git a/include/xrpl/protocol/detail/token_errors.h b/include/xrpl/protocol/detail/token_errors.h
index a663d145b1..9d5e98e646 100644
--- a/include/xrpl/protocol/detail/token_errors.h
+++ b/include/xrpl/protocol/detail/token_errors.h
@@ -4,16 +4,16 @@
 
 namespace xrpl {
 enum class TokenCodecErrc {
-    success = 0,
-    inputTooLarge,
-    inputTooSmall,
-    badB58Character,
-    outputTooSmall,
-    mismatchedTokenType,
-    mismatchedChecksum,
-    invalidEncodingChar,
-    overflowAdd,
-    unknown,
+    Success = 0,
+    InputTooLarge,
+    InputTooSmall,
+    BadB58Character,
+    OutputTooSmall,
+    MismatchedTokenType,
+    MismatchedChecksum,
+    InvalidEncodingChar,
+    OverflowAdd,
+    Unknown,
 };
 }  // namespace xrpl
 
@@ -41,23 +41,23 @@ public:
     {
         switch (static_cast<TokenCodecErrc>(c))
         {
-            case TokenCodecErrc::success:
+            case TokenCodecErrc::Success:
                 return "conversion successful";
-            case TokenCodecErrc::inputTooLarge:
+            case TokenCodecErrc::InputTooLarge:
                 return "input too large";
-            case TokenCodecErrc::inputTooSmall:
+            case TokenCodecErrc::InputTooSmall:
                 return "input too small";
-            case TokenCodecErrc::badB58Character:
+            case TokenCodecErrc::BadB58Character:
                 return "bad base 58 character";
-            case TokenCodecErrc::outputTooSmall:
+            case TokenCodecErrc::OutputTooSmall:
                 return "output too small";
-            case TokenCodecErrc::mismatchedTokenType:
+            case TokenCodecErrc::MismatchedTokenType:
                 return "mismatched token type";
-            case TokenCodecErrc::mismatchedChecksum:
+            case TokenCodecErrc::MismatchedChecksum:
                 return "mismatched checksum";
-            case TokenCodecErrc::invalidEncodingChar:
+            case TokenCodecErrc::InvalidEncodingChar:
                 return "invalid encoding char";
-            case TokenCodecErrc::unknown:
+            case TokenCodecErrc::Unknown:
                 return "unknown";
             default:
                 return "unknown";
@@ -67,15 +67,15 @@ public:
 }  // namespace detail
 
 inline xrpl::detail::TokenCodecErrcCategory const&
-TokenCodecErrcCategory()
+tokenCodecErrcCategory()
 {
-    static xrpl::detail::TokenCodecErrcCategory const c;
-    return c;
+    static xrpl::detail::TokenCodecErrcCategory const kC;
+    return kC;
 }
 
 inline std::error_code
 make_error_code(xrpl::TokenCodecErrc e)
 {
-    return {static_cast<int>(e), TokenCodecErrcCategory()};
+    return {static_cast<int>(e), tokenCodecErrcCategory()};
 }
 }  // namespace xrpl
diff --git a/include/xrpl/protocol/detail/transactions.macro b/include/xrpl/protocol/detail/transactions.macro
index e52d28ce2a..9bac9ef7db 100644
--- a/include/xrpl/protocol/detail/transactions.macro
+++ b/include/xrpl/protocol/detail/transactions.macro
@@ -25,19 +25,19 @@
 #   include <xrpl/tx/transactors/payment/Payment.h>
 #endif
 TRANSACTION(ttPAYMENT, 0, Payment,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    createAcct | mayCreateMPT,
+    CreateAcct | MayCreateMpt,
     ({
-    {sfDestination, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfSendMax, soeOPTIONAL, soeMPTSupported},
-    {sfPaths, soeDEFAULT},
-    {sfInvoiceID, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
-    {sfDeliverMin, soeOPTIONAL, soeMPTSupported},
-    {sfCredentialIDs, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
+    {sfDestination, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfSendMax, SoeOptional, SoeMptSupported},
+    {sfPaths, SoeDefault},
+    {sfInvoiceID, SoeOptional},
+    {sfDestinationTag, SoeOptional},
+    {sfDeliverMin, SoeOptional, SoeMptSupported},
+    {sfCredentialIDs, SoeOptional},
+    {sfDomainID, SoeOptional},
 }))
 
 /** This transaction type creates an escrow object. */
@@ -45,16 +45,16 @@ TRANSACTION(ttPAYMENT, 0, Payment,
 #   include <xrpl/tx/transactors/escrow/EscrowCreate.h>
 #endif
 TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfDestination, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfCondition, soeOPTIONAL},
-    {sfCancelAfter, soeOPTIONAL},
-    {sfFinishAfter, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
+    {sfDestination, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfCondition, SoeOptional},
+    {sfCancelAfter, SoeOptional},
+    {sfFinishAfter, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))
 
 /** This transaction type completes an existing escrow. */
@@ -62,15 +62,15 @@ TRANSACTION(ttESCROW_CREATE, 1, EscrowCreate,
 #   include <xrpl/tx/transactors/escrow/EscrowFinish.h>
 #endif
 TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfOwner, soeREQUIRED},
-    {sfOfferSequence, soeREQUIRED},
-    {sfFulfillment, soeOPTIONAL},
-    {sfCondition, soeOPTIONAL},
-    {sfCredentialIDs, soeOPTIONAL},
+    {sfOwner, SoeRequired},
+    {sfOfferSequence, SoeRequired},
+    {sfFulfillment, SoeOptional},
+    {sfCondition, SoeOptional},
+    {sfCredentialIDs, SoeOptional},
 }))
 
 
@@ -79,20 +79,20 @@ TRANSACTION(ttESCROW_FINISH, 2, EscrowFinish,
 #   include <xrpl/tx/transactors/account/AccountSet.h>
 #endif
 TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfEmailHash, soeOPTIONAL},
-    {sfWalletLocator, soeOPTIONAL},
-    {sfWalletSize, soeOPTIONAL},
-    {sfMessageKey, soeOPTIONAL},
-    {sfDomain, soeOPTIONAL},
-    {sfTransferRate, soeOPTIONAL},
-    {sfSetFlag, soeOPTIONAL},
-    {sfClearFlag, soeOPTIONAL},
-    {sfTickSize, soeOPTIONAL},
-    {sfNFTokenMinter, soeOPTIONAL},
+    {sfEmailHash, SoeOptional},
+    {sfWalletLocator, SoeOptional},
+    {sfWalletSize, SoeOptional},
+    {sfMessageKey, SoeOptional},
+    {sfDomain, SoeOptional},
+    {sfTransferRate, SoeOptional},
+    {sfSetFlag, SoeOptional},
+    {sfClearFlag, SoeOptional},
+    {sfTickSize, SoeOptional},
+    {sfNFTokenMinter, SoeOptional},
 }))
 
 /** This transaction type cancels an existing escrow. */
@@ -100,12 +100,12 @@ TRANSACTION(ttACCOUNT_SET, 3, AccountSet,
 #   include <xrpl/tx/transactors/escrow/EscrowCancel.h>
 #endif
 TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfOwner, soeREQUIRED},
-    {sfOfferSequence, soeREQUIRED},
+    {sfOwner, SoeRequired},
+    {sfOfferSequence, SoeRequired},
 }))
 
 /** This transaction type sets or clears an account's "regular key". */
@@ -113,11 +113,11 @@ TRANSACTION(ttESCROW_CANCEL, 4, EscrowCancel,
 #   include <xrpl/tx/transactors/account/SetRegularKey.h>
 #endif
 TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfRegularKey, soeOPTIONAL},
+    {sfRegularKey, SoeOptional},
 }))
 
 // 6 deprecated
@@ -127,15 +127,15 @@ TRANSACTION(ttREGULAR_KEY_SET, 5, SetRegularKey,
 #   include <xrpl/tx/transactors/dex/OfferCreate.h>
 #endif
 TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    mayCreateMPT,
+    MayCreateMpt,
     ({
-    {sfTakerPays, soeREQUIRED, soeMPTSupported},
-    {sfTakerGets, soeREQUIRED, soeMPTSupported},
-    {sfExpiration, soeOPTIONAL},
-    {sfOfferSequence, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
+    {sfTakerPays, SoeRequired, SoeMptSupported},
+    {sfTakerGets, SoeRequired, SoeMptSupported},
+    {sfExpiration, SoeOptional},
+    {sfOfferSequence, SoeOptional},
+    {sfDomainID, SoeOptional},
 }))
 
 /** This transaction type cancels existing offers to trade one asset for another. */
@@ -143,11 +143,11 @@ TRANSACTION(ttOFFER_CREATE, 7, OfferCreate,
 #   include <xrpl/tx/transactors/dex/OfferCancel.h>
 #endif
 TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfOfferSequence, soeREQUIRED},
+    {sfOfferSequence, SoeRequired},
 }))
 
 // 9 deprecated
@@ -157,11 +157,11 @@ TRANSACTION(ttOFFER_CANCEL, 8, OfferCancel,
 #   include <xrpl/tx/transactors/system/TicketCreate.h>
 #endif
 TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfTicketCount, soeREQUIRED},
+    {sfTicketCount, SoeRequired},
 }))
 
 // 11 deprecated
@@ -173,12 +173,12 @@ TRANSACTION(ttTICKET_CREATE, 10, TicketCreate,
 #   include <xrpl/tx/transactors/account/SignerListSet.h>
 #endif
 TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfSignerQuorum, soeREQUIRED},
-    {sfSignerEntries, soeOPTIONAL},
+    {sfSignerQuorum, SoeRequired},
+    {sfSignerEntries, SoeOptional},
 }))
 
 /** This transaction type creates a new unidirectional XRP payment channel. */
@@ -186,16 +186,16 @@ TRANSACTION(ttSIGNER_LIST_SET, 12, SignerListSet,
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelCreate.h>
 #endif
 TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfDestination, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfSettleDelay, soeREQUIRED},
-    {sfPublicKey, soeREQUIRED},
-    {sfCancelAfter, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
+    {sfDestination, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfSettleDelay, SoeRequired},
+    {sfPublicKey, SoeRequired},
+    {sfCancelAfter, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))
 
 /** This transaction type funds an existing unidirectional XRP payment channel. */
@@ -203,13 +203,13 @@ TRANSACTION(ttPAYCHAN_CREATE, 13, PaymentChannelCreate,
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelFund.h>
 #endif
 TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfChannel, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfExpiration, soeOPTIONAL},
+    {sfChannel, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfExpiration, SoeOptional},
 }))
 
 /** This transaction type submits a claim against an existing unidirectional payment channel. */
@@ -217,16 +217,16 @@ TRANSACTION(ttPAYCHAN_FUND, 14, PaymentChannelFund,
 #   include <xrpl/tx/transactors/payment_channel/PaymentChannelClaim.h>
 #endif
 TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfChannel, soeREQUIRED},
-    {sfAmount, soeOPTIONAL},
-    {sfBalance, soeOPTIONAL},
-    {sfSignature, soeOPTIONAL},
-    {sfPublicKey, soeOPTIONAL},
-    {sfCredentialIDs, soeOPTIONAL},
+    {sfChannel, SoeRequired},
+    {sfAmount, SoeOptional},
+    {sfBalance, SoeOptional},
+    {sfSignature, SoeOptional},
+    {sfPublicKey, SoeOptional},
+    {sfCredentialIDs, SoeOptional},
 }))
 
 /** This transaction type creates a new check. */
@@ -234,15 +234,15 @@ TRANSACTION(ttPAYCHAN_CLAIM, 15, PaymentChannelClaim,
 #   include <xrpl/tx/transactors/check/CheckCreate.h>
 #endif
 TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfDestination, soeREQUIRED},
-    {sfSendMax, soeREQUIRED, soeMPTSupported},
-    {sfExpiration, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
-    {sfInvoiceID, soeOPTIONAL},
+    {sfDestination, SoeRequired},
+    {sfSendMax, SoeRequired, SoeMptSupported},
+    {sfExpiration, SoeOptional},
+    {sfDestinationTag, SoeOptional},
+    {sfInvoiceID, SoeOptional},
 }))
 
 /** This transaction type cashes an existing check. */
@@ -250,13 +250,13 @@ TRANSACTION(ttCHECK_CREATE, 16, CheckCreate,
 #   include <xrpl/tx/transactors/check/CheckCash.h>
 #endif
 TRANSACTION(ttCHECK_CASH, 17, CheckCash,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    mayCreateMPT,
+    MayCreateMpt,
     ({
-    {sfCheckID, soeREQUIRED},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
-    {sfDeliverMin, soeOPTIONAL, soeMPTSupported},
+    {sfCheckID, SoeRequired},
+    {sfAmount, SoeOptional, SoeMptSupported},
+    {sfDeliverMin, SoeOptional, SoeMptSupported},
 }))
 
 /** This transaction type cancels an existing check. */
@@ -264,11 +264,11 @@ TRANSACTION(ttCHECK_CASH, 17, CheckCash,
 #   include <xrpl/tx/transactors/check/CheckCancel.h>
 #endif
 TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfCheckID, soeREQUIRED},
+    {sfCheckID, SoeRequired},
 }))
 
 /** This transaction type grants or revokes authorization to transfer funds. */
@@ -276,14 +276,14 @@ TRANSACTION(ttCHECK_CANCEL, 18, CheckCancel,
 #   include <xrpl/tx/transactors/payment/DepositPreauth.h>
 #endif
 TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfAuthorize, soeOPTIONAL},
-    {sfUnauthorize, soeOPTIONAL},
-    {sfAuthorizeCredentials, soeOPTIONAL},
-    {sfUnauthorizeCredentials, soeOPTIONAL},
+    {sfAuthorize, SoeOptional},
+    {sfUnauthorize, SoeOptional},
+    {sfAuthorizeCredentials, SoeOptional},
+    {sfUnauthorizeCredentials, SoeOptional},
 }))
 
 /** This transaction type modifies a trustline between two accounts. */
@@ -291,13 +291,13 @@ TRANSACTION(ttDEPOSIT_PREAUTH, 19, DepositPreauth,
 #   include <xrpl/tx/transactors/token/TrustSet.h>
 #endif
 TRANSACTION(ttTRUST_SET, 20, TrustSet,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfLimitAmount, soeOPTIONAL},
-    {sfQualityIn, soeOPTIONAL},
-    {sfQualityOut, soeOPTIONAL},
+    {sfLimitAmount, SoeOptional},
+    {sfQualityIn, SoeOptional},
+    {sfQualityOut, SoeOptional},
 }))
 
 /** This transaction type deletes an existing account. */
@@ -305,13 +305,13 @@ TRANSACTION(ttTRUST_SET, 20, TrustSet,
 #   include <xrpl/tx/transactors/account/AccountDelete.h>
 #endif
 TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    mustDeleteAcct,
+    MustDeleteAcct,
     ({
-    {sfDestination, soeREQUIRED},
-    {sfDestinationTag, soeOPTIONAL},
-    {sfCredentialIDs, soeOPTIONAL},
+    {sfDestination, SoeRequired},
+    {sfDestinationTag, SoeOptional},
+    {sfCredentialIDs, SoeOptional},
 }))
 
 // 22 reserved
@@ -321,17 +321,17 @@ TRANSACTION(ttACCOUNT_DELETE, 21, AccountDelete,
 #   include <xrpl/tx/transactors/nft/NFTokenMint.h>
 #endif
 TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    changeNFTCounts,
+    ChangeNftCounts,
     ({
-    {sfNFTokenTaxon, soeREQUIRED},
-    {sfTransferFee, soeOPTIONAL},
-    {sfIssuer, soeOPTIONAL},
-    {sfURI, soeOPTIONAL},
-    {sfAmount, soeOPTIONAL},
-    {sfDestination, soeOPTIONAL},
-    {sfExpiration, soeOPTIONAL},
+    {sfNFTokenTaxon, SoeRequired},
+    {sfTransferFee, SoeOptional},
+    {sfIssuer, SoeOptional},
+    {sfURI, SoeOptional},
+    {sfAmount, SoeOptional},
+    {sfDestination, SoeOptional},
+    {sfExpiration, SoeOptional},
 }))
 
 /** This transaction burns (i.e. destroys) an existing NFT. */
@@ -339,12 +339,12 @@ TRANSACTION(ttNFTOKEN_MINT, 25, NFTokenMint,
 #   include <xrpl/tx/transactors/nft/NFTokenBurn.h>
 #endif
 TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    changeNFTCounts,
+    ChangeNftCounts,
     ({
-    {sfNFTokenID, soeREQUIRED},
-    {sfOwner, soeOPTIONAL},
+    {sfNFTokenID, SoeRequired},
+    {sfOwner, SoeOptional},
 }))
 
 /** This transaction creates a new offer to buy or sell an NFT. */
@@ -352,15 +352,15 @@ TRANSACTION(ttNFTOKEN_BURN, 26, NFTokenBurn,
 #   include <xrpl/tx/transactors/nft/NFTokenCreateOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfNFTokenID, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfDestination, soeOPTIONAL},
-    {sfOwner, soeOPTIONAL},
-    {sfExpiration, soeOPTIONAL},
+    {sfNFTokenID, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfDestination, SoeOptional},
+    {sfOwner, SoeOptional},
+    {sfExpiration, SoeOptional},
 }))
 
 /** This transaction cancels an existing offer to buy or sell an existing NFT. */
@@ -368,11 +368,11 @@ TRANSACTION(ttNFTOKEN_CREATE_OFFER, 27, NFTokenCreateOffer,
 #   include <xrpl/tx/transactors/nft/NFTokenCancelOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfNFTokenOffers, soeREQUIRED},
+    {sfNFTokenOffers, SoeRequired},
 }))
 
 /** This transaction accepts an existing offer to buy or sell an existing  NFT. */
@@ -380,13 +380,13 @@ TRANSACTION(ttNFTOKEN_CANCEL_OFFER, 28, NFTokenCancelOffer,
 #   include <xrpl/tx/transactors/nft/NFTokenAcceptOffer.h>
 #endif
 TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
-    Delegation::delegable,
+    Delegation::Delegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfNFTokenBuyOffer, soeOPTIONAL},
-    {sfNFTokenSellOffer, soeOPTIONAL},
-    {sfNFTokenBrokerFee, soeOPTIONAL},
+    {sfNFTokenBuyOffer, SoeOptional},
+    {sfNFTokenSellOffer, SoeOptional},
+    {sfNFTokenBrokerFee, SoeOptional},
 }))
 
 /** This transaction claws back issued tokens. */
@@ -394,12 +394,12 @@ TRANSACTION(ttNFTOKEN_ACCEPT_OFFER, 29, NFTokenAcceptOffer,
 #   include <xrpl/tx/transactors/token/Clawback.h>
 #endif
 TRANSACTION(ttCLAWBACK, 30, Clawback,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureClawback,
-    noPriv,
+    NoPriv,
     ({
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfHolder, soeOPTIONAL},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfHolder, SoeOptional},
 }))
 
 /** This transaction claws back tokens from an AMM pool. */
@@ -407,14 +407,14 @@ TRANSACTION(ttCLAWBACK, 30, Clawback,
 #   include <xrpl/tx/transactors/dex/AMMClawback.h>
 #endif
 TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMMClawback,
-    mayDeleteAcct | overrideFreeze | mayAuthorizeMPT,
+    MayDeleteAcct | OverrideFreeze | MayAuthorizeMpt,
     ({
-    {sfHolder, soeREQUIRED},
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
+    {sfHolder, SoeRequired},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
+    {sfAmount, SoeOptional, SoeMptSupported},
 }))
 
 /** This transaction type creates an AMM instance */
@@ -422,13 +422,13 @@ TRANSACTION(ttAMM_CLAWBACK, 31, AMMClawback,
 #   include <xrpl/tx/transactors/dex/AMMCreate.h>
 #endif
 TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    createPseudoAcct | mayCreateMPT,
+    CreatePseudoAcct | MayCreateMpt,
     ({
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfAmount2, soeREQUIRED, soeMPTSupported},
-    {sfTradingFee, soeREQUIRED},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfAmount2, SoeRequired, SoeMptSupported},
+    {sfTradingFee, SoeRequired},
 }))
 
 /** This transaction type deposits into an AMM instance */
@@ -436,17 +436,17 @@ TRANSACTION(ttAMM_CREATE, 35, AMMCreate,
 #   include <xrpl/tx/transactors/dex/AMMDeposit.h>
 #endif
 TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    noPriv,
+    NoPriv,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
-    {sfAmount2, soeOPTIONAL, soeMPTSupported},
-    {sfEPrice, soeOPTIONAL},
-    {sfLPTokenOut, soeOPTIONAL},
-    {sfTradingFee, soeOPTIONAL},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
+    {sfAmount, SoeOptional, SoeMptSupported},
+    {sfAmount2, SoeOptional, SoeMptSupported},
+    {sfEPrice, SoeOptional},
+    {sfLPTokenOut, SoeOptional},
+    {sfTradingFee, SoeOptional},
 }))
 
 /** This transaction type withdraws from an AMM instance */
@@ -454,16 +454,16 @@ TRANSACTION(ttAMM_DEPOSIT, 36, AMMDeposit,
 #   include <xrpl/tx/transactors/dex/AMMWithdraw.h>
 #endif
 TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    mayDeleteAcct | mayAuthorizeMPT,
+    MayDeleteAcct | MayAuthorizeMpt,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
-    {sfAmount2, soeOPTIONAL, soeMPTSupported},
-    {sfEPrice, soeOPTIONAL},
-    {sfLPTokenIn, soeOPTIONAL},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
+    {sfAmount, SoeOptional, SoeMptSupported},
+    {sfAmount2, SoeOptional, SoeMptSupported},
+    {sfEPrice, SoeOptional},
+    {sfLPTokenIn, SoeOptional},
 }))
 
 /** This transaction type votes for the trading fee */
@@ -471,13 +471,13 @@ TRANSACTION(ttAMM_WITHDRAW, 37, AMMWithdraw,
 #   include <xrpl/tx/transactors/dex/AMMVote.h>
 #endif
 TRANSACTION(ttAMM_VOTE, 38, AMMVote,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    noPriv,
+    NoPriv,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
-    {sfTradingFee, soeREQUIRED},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
+    {sfTradingFee, SoeRequired},
 }))
 
 /** This transaction type bids for the auction slot */
@@ -485,15 +485,15 @@ TRANSACTION(ttAMM_VOTE, 38, AMMVote,
 #   include <xrpl/tx/transactors/dex/AMMBid.h>
 #endif
 TRANSACTION(ttAMM_BID, 39, AMMBid,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    noPriv,
+    NoPriv,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
-    {sfBidMin, soeOPTIONAL},
-    {sfBidMax, soeOPTIONAL},
-    {sfAuthAccounts, soeOPTIONAL},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
+    {sfBidMin, SoeOptional},
+    {sfBidMax, SoeOptional},
+    {sfAuthAccounts, SoeOptional},
 }))
 
 /** This transaction type deletes AMM in the empty state */
@@ -501,12 +501,12 @@ TRANSACTION(ttAMM_BID, 39, AMMBid,
 #   include <xrpl/tx/transactors/dex/AMMDelete.h>
 #endif
 TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureAMM,
-    mustDeleteAcct | mayDeleteMPT,
+    MustDeleteAcct | MayDeleteMpt,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAsset2, soeREQUIRED, soeMPTSupported},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAsset2, SoeRequired, SoeMptSupported},
 }))
 
 /** This transactions creates a crosschain sequence number */
@@ -514,114 +514,114 @@ TRANSACTION(ttAMM_DELETE, 40, AMMDelete,
 #   include <xrpl/tx/transactors/bridge/XChainBridge.h>
 #endif
 TRANSACTION(ttXCHAIN_CREATE_CLAIM_ID, 41, XChainCreateClaimID,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfSignatureReward, soeREQUIRED},
-    {sfOtherChainSource, soeREQUIRED},
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
 }))
 
 /** This transactions initiates a crosschain transaction */
 TRANSACTION(ttXCHAIN_COMMIT, 42, XChainCommit,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfXChainClaimID, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfOtherChainDestination, soeOPTIONAL},
+    {sfXChainBridge, SoeRequired},
+    {sfXChainClaimID, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfOtherChainDestination, SoeOptional},
 }))
 
 /** This transaction completes a crosschain transaction */
 TRANSACTION(ttXCHAIN_CLAIM, 43, XChainClaim,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfXChainClaimID, soeREQUIRED},
-    {sfDestination, soeREQUIRED},
-    {sfDestinationTag, soeOPTIONAL},
-    {sfAmount, soeREQUIRED},
+    {sfXChainBridge, SoeRequired},
+    {sfXChainClaimID, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfDestinationTag, SoeOptional},
+    {sfAmount, SoeRequired},
 }))
 
 /** This transaction initiates a crosschain account create transaction */
 TRANSACTION(ttXCHAIN_ACCOUNT_CREATE_COMMIT, 44, XChainAccountCreateCommit,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfDestination, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfSignatureReward, soeREQUIRED},
+    {sfXChainBridge, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfSignatureReward, SoeRequired},
 }))
 
 /** This transaction adds an attestation to a claim */
 TRANSACTION(ttXCHAIN_ADD_CLAIM_ATTESTATION, 45, XChainAddClaimAttestation,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    createAcct,
+    CreateAcct,
     ({
-    {sfXChainBridge, soeREQUIRED},
+    {sfXChainBridge, SoeRequired},
 
-    {sfAttestationSignerAccount, soeREQUIRED},
-    {sfPublicKey, soeREQUIRED},
-    {sfSignature, soeREQUIRED},
-    {sfOtherChainSource, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfAttestationRewardAccount, soeREQUIRED},
-    {sfWasLockingChainSend, soeREQUIRED},
+    {sfAttestationSignerAccount, SoeRequired},
+    {sfPublicKey, SoeRequired},
+    {sfSignature, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfAttestationRewardAccount, SoeRequired},
+    {sfWasLockingChainSend, SoeRequired},
 
-    {sfXChainClaimID, soeREQUIRED},
-    {sfDestination, soeOPTIONAL},
+    {sfXChainClaimID, SoeRequired},
+    {sfDestination, SoeOptional},
 }))
 
 /** This transaction adds an attestation to an account */
 TRANSACTION(ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION, 46,
     XChainAddAccountCreateAttestation,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    createAcct,
+    CreateAcct,
     ({
-    {sfXChainBridge, soeREQUIRED},
+    {sfXChainBridge, SoeRequired},
 
-    {sfAttestationSignerAccount, soeREQUIRED},
-    {sfPublicKey, soeREQUIRED},
-    {sfSignature, soeREQUIRED},
-    {sfOtherChainSource, soeREQUIRED},
-    {sfAmount, soeREQUIRED},
-    {sfAttestationRewardAccount, soeREQUIRED},
-    {sfWasLockingChainSend, soeREQUIRED},
+    {sfAttestationSignerAccount, SoeRequired},
+    {sfPublicKey, SoeRequired},
+    {sfSignature, SoeRequired},
+    {sfOtherChainSource, SoeRequired},
+    {sfAmount, SoeRequired},
+    {sfAttestationRewardAccount, SoeRequired},
+    {sfWasLockingChainSend, SoeRequired},
 
-    {sfXChainAccountCreateCount, soeREQUIRED},
-    {sfDestination, soeREQUIRED},
-    {sfSignatureReward, soeREQUIRED},
+    {sfXChainAccountCreateCount, SoeRequired},
+    {sfDestination, SoeRequired},
+    {sfSignatureReward, SoeRequired},
 }))
 
 /** This transaction modifies a sidechain */
 TRANSACTION(ttXCHAIN_MODIFY_BRIDGE, 47, XChainModifyBridge,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfSignatureReward, soeOPTIONAL},
-    {sfMinAccountCreateAmount, soeOPTIONAL},
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeOptional},
+    {sfMinAccountCreateAmount, SoeOptional},
 }))
 
 /** This transactions creates a sidechain */
 TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureXChainBridge,
-    noPriv,
+    NoPriv,
     ({
-    {sfXChainBridge, soeREQUIRED},
-    {sfSignatureReward, soeREQUIRED},
-    {sfMinAccountCreateAmount, soeOPTIONAL},
+    {sfXChainBridge, SoeRequired},
+    {sfSignatureReward, SoeRequired},
+    {sfMinAccountCreateAmount, SoeOptional},
 }))
 
 /** This transaction type creates or updates a DID */
@@ -629,13 +629,13 @@ TRANSACTION(ttXCHAIN_CREATE_BRIDGE, 48, XChainCreateBridge,
 #   include <xrpl/tx/transactors/did/DIDSet.h>
 #endif
 TRANSACTION(ttDID_SET, 49, DIDSet,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureDID,
-    noPriv,
+    NoPriv,
     ({
-    {sfDIDDocument, soeOPTIONAL},
-    {sfURI, soeOPTIONAL},
-    {sfData, soeOPTIONAL},
+    {sfDIDDocument, SoeOptional},
+    {sfURI, SoeOptional},
+    {sfData, SoeOptional},
 }))
 
 /** This transaction type deletes a DID */
@@ -643,9 +643,9 @@ TRANSACTION(ttDID_SET, 49, DIDSet,
 #   include <xrpl/tx/transactors/did/DIDDelete.h>
 #endif
 TRANSACTION(ttDID_DELETE, 50, DIDDelete,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureDID,
-    noPriv,
+    NoPriv,
     ({}))
 
 /** This transaction type creates an Oracle instance */
@@ -653,16 +653,16 @@ TRANSACTION(ttDID_DELETE, 50, DIDDelete,
 #   include <xrpl/tx/transactors/oracle/OracleSet.h>
 #endif
 TRANSACTION(ttORACLE_SET, 51, OracleSet,
-    Delegation::delegable,
+    Delegation::Delegable,
     featurePriceOracle,
-    noPriv,
+    NoPriv,
     ({
-    {sfOracleDocumentID, soeREQUIRED},
-    {sfProvider, soeOPTIONAL},
-    {sfURI, soeOPTIONAL},
-    {sfAssetClass, soeOPTIONAL},
-    {sfLastUpdateTime, soeREQUIRED},
-    {sfPriceDataSeries, soeREQUIRED},
+    {sfOracleDocumentID, SoeRequired},
+    {sfProvider, SoeOptional},
+    {sfURI, SoeOptional},
+    {sfAssetClass, SoeOptional},
+    {sfLastUpdateTime, SoeRequired},
+    {sfPriceDataSeries, SoeRequired},
 }))
 
 /** This transaction type deletes an Oracle instance */
@@ -670,11 +670,11 @@ TRANSACTION(ttORACLE_SET, 51, OracleSet,
 #   include <xrpl/tx/transactors/oracle/OracleDelete.h>
 #endif
 TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
-    Delegation::delegable,
+    Delegation::Delegable,
     featurePriceOracle,
-    noPriv,
+    NoPriv,
     ({
-    {sfOracleDocumentID, soeREQUIRED},
+    {sfOracleDocumentID, SoeRequired},
 }))
 
 /** This transaction type fixes a problem in the ledger state */
@@ -682,12 +682,12 @@ TRANSACTION(ttORACLE_DELETE, 52, OracleDelete,
 #   include <xrpl/tx/transactors/system/LedgerStateFix.h>
 #endif
 TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
-    Delegation::delegable,
+    Delegation::Delegable,
     fixNFTokenPageLinks,
-    noPriv,
+    NoPriv,
     ({
-    {sfLedgerFixType, soeREQUIRED},
-    {sfOwner, soeOPTIONAL},
+    {sfLedgerFixType, SoeRequired},
+    {sfOwner, SoeOptional},
 }))
 
 /** This transaction type creates a MPTokensIssuance instance */
@@ -695,16 +695,16 @@ TRANSACTION(ttLEDGER_STATE_FIX, 53, LedgerStateFix,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceCreate.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureMPTokensV1,
-    createMPTIssuance,
+    CreateMptIssuance,
     ({
-    {sfAssetScale, soeOPTIONAL},
-    {sfTransferFee, soeOPTIONAL},
-    {sfMaximumAmount, soeOPTIONAL},
-    {sfMPTokenMetadata, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
-    {sfMutableFlags, soeOPTIONAL},
+    {sfAssetScale, SoeOptional},
+    {sfTransferFee, SoeOptional},
+    {sfMaximumAmount, SoeOptional},
+    {sfMPTokenMetadata, SoeOptional},
+    {sfDomainID, SoeOptional},
+    {sfMutableFlags, SoeOptional},
 }))
 
 /** This transaction type destroys a MPTokensIssuance instance */
@@ -712,11 +712,11 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_CREATE, 54, MPTokenIssuanceCreate,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceDestroy.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureMPTokensV1,
-    destroyMPTIssuance,
+    DestroyMptIssuance,
     ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
+    {sfMPTokenIssuanceID, SoeRequired},
 }))
 
 /** This transaction type sets flags on a MPTokensIssuance or MPToken instance */
@@ -724,16 +724,16 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_DESTROY, 55, MPTokenIssuanceDestroy,
 #   include <xrpl/tx/transactors/token/MPTokenIssuanceSet.h>
 #endif
 TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureMPTokensV1,
-    noPriv,
+    NoPriv,
     ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfHolder, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
-    {sfMPTokenMetadata, soeOPTIONAL},
-    {sfTransferFee, soeOPTIONAL},
-    {sfMutableFlags, soeOPTIONAL},
+    {sfMPTokenIssuanceID, SoeRequired},
+    {sfHolder, SoeOptional},
+    {sfDomainID, SoeOptional},
+    {sfMPTokenMetadata, SoeOptional},
+    {sfTransferFee, SoeOptional},
+    {sfMutableFlags, SoeOptional},
 }))
 
 /** This transaction type authorizes a MPToken instance */
@@ -741,12 +741,12 @@ TRANSACTION(ttMPTOKEN_ISSUANCE_SET, 56, MPTokenIssuanceSet,
 #   include <xrpl/tx/transactors/token/MPTokenAuthorize.h>
 #endif
 TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureMPTokensV1,
-    mustAuthorizeMPT,
+    MustAuthorizeMpt,
     ({
-    {sfMPTokenIssuanceID, soeREQUIRED},
-    {sfHolder, soeOPTIONAL},
+    {sfMPTokenIssuanceID, SoeRequired},
+    {sfHolder, SoeOptional},
 }))
 
 /** This transaction type create an Credential instance */
@@ -754,14 +754,14 @@ TRANSACTION(ttMPTOKEN_AUTHORIZE, 57, MPTokenAuthorize,
 #   include <xrpl/tx/transactors/credentials/CredentialCreate.h>
 #endif
 TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureCredentials,
-    noPriv,
+    NoPriv,
     ({
-    {sfSubject, soeREQUIRED},
-    {sfCredentialType, soeREQUIRED},
-    {sfExpiration, soeOPTIONAL},
-    {sfURI, soeOPTIONAL},
+    {sfSubject, SoeRequired},
+    {sfCredentialType, SoeRequired},
+    {sfExpiration, SoeOptional},
+    {sfURI, SoeOptional},
 }))
 
 /** This transaction type accept an Credential object */
@@ -769,12 +769,12 @@ TRANSACTION(ttCREDENTIAL_CREATE, 58, CredentialCreate,
 #   include <xrpl/tx/transactors/credentials/CredentialAccept.h>
 #endif
 TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureCredentials,
-    noPriv,
+    NoPriv,
     ({
-    {sfIssuer, soeREQUIRED},
-    {sfCredentialType, soeREQUIRED},
+    {sfIssuer, SoeRequired},
+    {sfCredentialType, SoeRequired},
 }))
 
 /** This transaction type delete an Credential object */
@@ -782,13 +782,13 @@ TRANSACTION(ttCREDENTIAL_ACCEPT, 59, CredentialAccept,
 #   include <xrpl/tx/transactors/credentials/CredentialDelete.h>
 #endif
 TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureCredentials,
-    noPriv,
+    NoPriv,
     ({
-    {sfSubject, soeOPTIONAL},
-    {sfIssuer, soeOPTIONAL},
-    {sfCredentialType, soeREQUIRED},
+    {sfSubject, SoeOptional},
+    {sfIssuer, SoeOptional},
+    {sfCredentialType, SoeRequired},
 }))
 
 /** This transaction type modify a NFToken */
@@ -796,13 +796,13 @@ TRANSACTION(ttCREDENTIAL_DELETE, 60, CredentialDelete,
 #   include <xrpl/tx/transactors/nft/NFTokenModify.h>
 #endif
 TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
-    Delegation::delegable,
+    Delegation::Delegable,
     featureDynamicNFT,
-    noPriv,
+    NoPriv,
     ({
-    {sfNFTokenID, soeREQUIRED},
-    {sfOwner, soeOPTIONAL},
-    {sfURI, soeOPTIONAL},
+    {sfNFTokenID, SoeRequired},
+    {sfOwner, SoeOptional},
+    {sfURI, SoeOptional},
 }))
 
 /** This transaction type creates or modifies a Permissioned Domain */
@@ -810,12 +810,12 @@ TRANSACTION(ttNFTOKEN_MODIFY, 61, NFTokenModify,
 #   include <xrpl/tx/transactors/permissioned_domain/PermissionedDomainSet.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
-    Delegation::delegable,
+    Delegation::Delegable,
     featurePermissionedDomains,
-    noPriv,
+    NoPriv,
     ({
-    {sfDomainID, soeOPTIONAL},
-    {sfAcceptedCredentials, soeREQUIRED},
+    {sfDomainID, SoeOptional},
+    {sfAcceptedCredentials, SoeRequired},
 }))
 
 /** This transaction type deletes a Permissioned Domain */
@@ -823,11 +823,11 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_SET, 62, PermissionedDomainSet,
 #   include <xrpl/tx/transactors/permissioned_domain/PermissionedDomainDelete.h>
 #endif
 TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
-    Delegation::delegable,
+    Delegation::Delegable,
     featurePermissionedDomains,
-    noPriv,
+    NoPriv,
     ({
-    {sfDomainID, soeREQUIRED},
+    {sfDomainID, SoeRequired},
 }))
 
 /** This transaction type delegates authorized account specified permissions */
@@ -835,12 +835,12 @@ TRANSACTION(ttPERMISSIONED_DOMAIN_DELETE, 63, PermissionedDomainDelete,
 #   include <xrpl/tx/transactors/delegate/DelegateSet.h>
 #endif
 TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featurePermissionDelegationV1_1,
-    noPriv,
+    NoPriv,
     ({
-    {sfAuthorize, soeREQUIRED},
-    {sfPermissions, soeREQUIRED},
+    {sfAuthorize, SoeRequired},
+    {sfPermissions, SoeRequired},
 }))
 
 /** This transaction creates a single asset vault. */
@@ -848,17 +848,17 @@ TRANSACTION(ttDELEGATE_SET, 64, DelegateSet,
 #   include <xrpl/tx/transactors/vault/VaultCreate.h>
 #endif
 TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    createPseudoAcct | createMPTIssuance | mustModifyVault,
+    CreatePseudoAcct | CreateMptIssuance | MustModifyVault,
     ({
-    {sfAsset, soeREQUIRED, soeMPTSupported},
-    {sfAssetsMaximum, soeOPTIONAL},
-    {sfMPTokenMetadata, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
-    {sfWithdrawalPolicy, soeOPTIONAL},
-    {sfData, soeOPTIONAL},
-    {sfScale, soeOPTIONAL},
+    {sfAsset, SoeRequired, SoeMptSupported},
+    {sfAssetsMaximum, SoeOptional},
+    {sfMPTokenMetadata, SoeOptional},
+    {sfDomainID, SoeOptional},
+    {sfWithdrawalPolicy, SoeOptional},
+    {sfData, SoeOptional},
+    {sfScale, SoeOptional},
 }))
 
 /** This transaction updates a single asset vault. */
@@ -866,14 +866,14 @@ TRANSACTION(ttVAULT_CREATE, 65, VaultCreate,
 #   include <xrpl/tx/transactors/vault/VaultSet.h>
 #endif
 TRANSACTION(ttVAULT_SET, 66, VaultSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    mustModifyVault,
+    MustModifyVault,
     ({
-    {sfVaultID, soeREQUIRED},
-    {sfAssetsMaximum, soeOPTIONAL},
-    {sfDomainID, soeOPTIONAL},
-    {sfData, soeOPTIONAL},
+    {sfVaultID, SoeRequired},
+    {sfAssetsMaximum, SoeOptional},
+    {sfDomainID, SoeOptional},
+    {sfData, SoeOptional},
 }))
 
 /** This transaction deletes a single asset vault. */
@@ -881,11 +881,11 @@ TRANSACTION(ttVAULT_SET, 66, VaultSet,
 #   include <xrpl/tx/transactors/vault/VaultDelete.h>
 #endif
 TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    mustDeleteAcct | destroyMPTIssuance | mustModifyVault,
+    MustDeleteAcct | DestroyMptIssuance | MustModifyVault,
     ({
-    {sfVaultID, soeREQUIRED},
+    {sfVaultID, SoeRequired},
 }))
 
 /** This transaction trades assets for shares with a vault. */
@@ -893,12 +893,12 @@ TRANSACTION(ttVAULT_DELETE, 67, VaultDelete,
 #   include <xrpl/tx/transactors/vault/VaultDeposit.h>
 #endif
 TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    mayAuthorizeMPT | mustModifyVault,
+    MayAuthorizeMpt | MustModifyVault,
     ({
-    {sfVaultID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
+    {sfVaultID, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
 }))
 
 /** This transaction trades shares for assets with a vault. */
@@ -906,14 +906,14 @@ TRANSACTION(ttVAULT_DEPOSIT, 68, VaultDeposit,
 #   include <xrpl/tx/transactors/vault/VaultWithdraw.h>
 #endif
 TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    mayDeleteMPT | mayAuthorizeMPT | mustModifyVault,
+    MayDeleteMpt | MayAuthorizeMpt | MustModifyVault,
     ({
-    {sfVaultID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfDestination, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
+    {sfVaultID, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfDestination, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))
 
 /** This transaction claws back tokens from a vault. */
@@ -921,13 +921,13 @@ TRANSACTION(ttVAULT_WITHDRAW, 69, VaultWithdraw,
 #   include <xrpl/tx/transactors/vault/VaultClawback.h>
 #endif
 TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureSingleAssetVault,
-    mayDeleteMPT | mustModifyVault,
+    MayDeleteMpt | MustModifyVault,
     ({
-    {sfVaultID, soeREQUIRED},
-    {sfHolder, soeREQUIRED},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
+    {sfVaultID, SoeRequired},
+    {sfHolder, SoeRequired},
+    {sfAmount, SoeOptional, SoeMptSupported},
 }))
 
 /** This transaction type batches together transactions. */
@@ -935,12 +935,12 @@ TRANSACTION(ttVAULT_CLAWBACK, 70, VaultClawback,
 #   include <xrpl/tx/transactors/system/Batch.h>
 #endif
 TRANSACTION(ttBATCH, 71, Batch,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureBatch,
-    noPriv,
+    NoPriv,
     ({
-    {sfRawTransactions, soeREQUIRED},
-    {sfBatchSigners, soeOPTIONAL},
+    {sfRawTransactions, SoeRequired},
+    {sfBatchSigners, SoeOptional},
 }))
 
 /** Reserve 72-73 for future Vault-related transactions */
@@ -950,16 +950,16 @@ TRANSACTION(ttBATCH, 71, Batch,
 #   include <xrpl/tx/transactors/lending/LoanBrokerSet.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    createPseudoAcct | mayAuthorizeMPT, ({
-    {sfVaultID, soeREQUIRED},
-    {sfLoanBrokerID, soeOPTIONAL},
-    {sfData, soeOPTIONAL},
-    {sfManagementFeeRate, soeOPTIONAL},
-    {sfDebtMaximum, soeOPTIONAL},
-    {sfCoverRateMinimum, soeOPTIONAL},
-    {sfCoverRateLiquidation, soeOPTIONAL},
+    CreatePseudoAcct | MayAuthorizeMpt, ({
+    {sfVaultID, SoeRequired},
+    {sfLoanBrokerID, SoeOptional},
+    {sfData, SoeOptional},
+    {sfManagementFeeRate, SoeOptional},
+    {sfDebtMaximum, SoeOptional},
+    {sfCoverRateMinimum, SoeOptional},
+    {sfCoverRateLiquidation, SoeOptional},
 }))
 
 /** This transaction deletes a Loan Broker */
@@ -967,10 +967,10 @@ TRANSACTION(ttLOAN_BROKER_SET, 74, LoanBrokerSet,
 #   include <xrpl/tx/transactors/lending/LoanBrokerDelete.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    mustDeleteAcct | mayAuthorizeMPT, ({
-    {sfLoanBrokerID, soeREQUIRED},
+    MustDeleteAcct | MayAuthorizeMpt, ({
+    {sfLoanBrokerID, SoeRequired},
 }))
 
 /** This transaction deposits First Loss Capital into a Loan Broker */
@@ -978,11 +978,11 @@ TRANSACTION(ttLOAN_BROKER_DELETE, 75, LoanBrokerDelete,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverDeposit.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    noPriv, ({
-    {sfLoanBrokerID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
+    NoPriv, ({
+    {sfLoanBrokerID, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
 }))
 
 /** This transaction withdraws First Loss Capital from a Loan Broker */
@@ -990,13 +990,13 @@ TRANSACTION(ttLOAN_BROKER_COVER_DEPOSIT, 76, LoanBrokerCoverDeposit,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    mayAuthorizeMPT, ({
-    {sfLoanBrokerID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
-    {sfDestination, soeOPTIONAL},
-    {sfDestinationTag, soeOPTIONAL},
+    MayAuthorizeMpt, ({
+    {sfLoanBrokerID, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
+    {sfDestination, SoeOptional},
+    {sfDestinationTag, SoeOptional},
 }))
 
 /** This transaction claws back First Loss Capital from a Loan Broker to
@@ -1005,11 +1005,11 @@ TRANSACTION(ttLOAN_BROKER_COVER_WITHDRAW, 77, LoanBrokerCoverWithdraw,
 #   include <xrpl/tx/transactors/lending/LoanBrokerCoverClawback.h>
 #endif
 TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    noPriv, ({
-    {sfLoanBrokerID, soeOPTIONAL},
-    {sfAmount, soeOPTIONAL, soeMPTSupported},
+    NoPriv, ({
+    {sfLoanBrokerID, SoeOptional},
+    {sfAmount, SoeOptional, SoeMptSupported},
 }))
 
 /** This transaction creates a Loan */
@@ -1017,26 +1017,26 @@ TRANSACTION(ttLOAN_BROKER_COVER_CLAWBACK, 78, LoanBrokerCoverClawback,
 #   include <xrpl/tx/transactors/lending/LoanSet.h>
 #endif
 TRANSACTION(ttLOAN_SET, 80, LoanSet,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    mayAuthorizeMPT | mustModifyVault, ({
-    {sfLoanBrokerID, soeREQUIRED},
-    {sfData, soeOPTIONAL},
-    {sfCounterparty, soeOPTIONAL},
-    {sfCounterpartySignature, soeOPTIONAL},
-    {sfLoanOriginationFee, soeOPTIONAL},
-    {sfLoanServiceFee, soeOPTIONAL},
-    {sfLatePaymentFee, soeOPTIONAL},
-    {sfClosePaymentFee, soeOPTIONAL},
-    {sfOverpaymentFee, soeOPTIONAL},
-    {sfInterestRate, soeOPTIONAL},
-    {sfLateInterestRate, soeOPTIONAL},
-    {sfCloseInterestRate, soeOPTIONAL},
-    {sfOverpaymentInterestRate, soeOPTIONAL},
-    {sfPrincipalRequested, soeREQUIRED},
-    {sfPaymentTotal, soeOPTIONAL},
-    {sfPaymentInterval, soeOPTIONAL},
-    {sfGracePeriod, soeOPTIONAL},
+    MayAuthorizeMpt | MustModifyVault, ({
+    {sfLoanBrokerID, SoeRequired},
+    {sfData, SoeOptional},
+    {sfCounterparty, SoeOptional},
+    {sfCounterpartySignature, SoeOptional},
+    {sfLoanOriginationFee, SoeOptional},
+    {sfLoanServiceFee, SoeOptional},
+    {sfLatePaymentFee, SoeOptional},
+    {sfClosePaymentFee, SoeOptional},
+    {sfOverpaymentFee, SoeOptional},
+    {sfInterestRate, SoeOptional},
+    {sfLateInterestRate, SoeOptional},
+    {sfCloseInterestRate, SoeOptional},
+    {sfOverpaymentInterestRate, SoeOptional},
+    {sfPrincipalRequested, SoeRequired},
+    {sfPaymentTotal, SoeOptional},
+    {sfPaymentInterval, SoeOptional},
+    {sfGracePeriod, SoeOptional},
 }))
 
 /** This transaction deletes an existing Loan */
@@ -1044,10 +1044,10 @@ TRANSACTION(ttLOAN_SET, 80, LoanSet,
 #   include <xrpl/tx/transactors/lending/LoanDelete.h>
 #endif
 TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    noPriv, ({
-    {sfLoanID, soeREQUIRED},
+    NoPriv, ({
+    {sfLoanID, SoeRequired},
 }))
 
 /** This transaction is used to change the delinquency status of an existing Loan */
@@ -1055,13 +1055,13 @@ TRANSACTION(ttLOAN_DELETE, 81, LoanDelete,
 #   include <xrpl/tx/transactors/lending/LoanManage.h>
 #endif
 TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
     // All of the LoanManage options will modify the vault, but the
     // transaction can succeed without options, essentially making it
     // a noop.
-    mayModifyVault, ({
-    {sfLoanID, soeREQUIRED},
+    MayModifyVault, ({
+    {sfLoanID, SoeRequired},
 }))
 
 /** The Borrower uses this transaction to make a Payment on the Loan. */
@@ -1069,11 +1069,11 @@ TRANSACTION(ttLOAN_MANAGE, 82, LoanManage,
 #   include <xrpl/tx/transactors/lending/LoanPay.h>
 #endif
 TRANSACTION(ttLOAN_PAY, 84, LoanPay,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     featureLendingProtocol,
-    mayAuthorizeMPT | mustModifyVault, ({
-    {sfLoanID, soeREQUIRED},
-    {sfAmount, soeREQUIRED, soeMPTSupported},
+    MayAuthorizeMpt | MustModifyVault, ({
+    {sfLoanID, SoeRequired},
+    {sfAmount, SoeRequired, SoeMptSupported},
 }))
 
 /** This system-generated transaction type is used to update the status of the various amendments.
@@ -1084,32 +1084,32 @@ TRANSACTION(ttLOAN_PAY, 84, LoanPay,
 #   include <xrpl/tx/transactors/system/Change.h>
 #endif
 TRANSACTION(ttAMENDMENT, 100, EnableAmendment,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfLedgerSequence, soeREQUIRED},
-    {sfAmendment, soeREQUIRED},
+    {sfLedgerSequence, SoeRequired},
+    {sfAmendment, SoeRequired},
 }))
 
 /** This system-generated transaction type is used to update the network's fee settings.
     For details, see: https://xrpl.org/fee-voting.html
  */
 TRANSACTION(ttFEE, 101, SetFee,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfLedgerSequence, soeOPTIONAL},
+    {sfLedgerSequence, SoeOptional},
     // Old version uses raw numbers
-    {sfBaseFee, soeOPTIONAL},
-    {sfReferenceFeeUnits, soeOPTIONAL},
-    {sfReserveBase, soeOPTIONAL},
-    {sfReserveIncrement, soeOPTIONAL},
+    {sfBaseFee, SoeOptional},
+    {sfReferenceFeeUnits, SoeOptional},
+    {sfReserveBase, SoeOptional},
+    {sfReserveIncrement, SoeOptional},
     // New version uses Amounts
-    {sfBaseFeeDrops, soeOPTIONAL},
-    {sfReserveBaseDrops, soeOPTIONAL},
-    {sfReserveIncrementDrops, soeOPTIONAL},
+    {sfBaseFeeDrops, SoeOptional},
+    {sfReserveBaseDrops, SoeOptional},
+    {sfReserveIncrementDrops, SoeOptional},
 }))
 
 /** This system-generated transaction type is used to update the network's negative UNL
@@ -1117,11 +1117,11 @@ TRANSACTION(ttFEE, 101, SetFee,
     For details, see: https://xrpl.org/negative-unl.html
  */
 TRANSACTION(ttUNL_MODIFY, 102, UNLModify,
-    Delegation::notDelegable,
+    Delegation::NotDelegable,
     uint256{},
-    noPriv,
+    NoPriv,
     ({
-    {sfUNLModifyDisabling, soeREQUIRED},
-    {sfLedgerSequence, soeREQUIRED},
-    {sfUNLModifyValidator, soeREQUIRED},
+    {sfUNLModifyDisabling, SoeRequired},
+    {sfLedgerSequence, SoeRequired},
+    {sfUNLModifyValidator, SoeRequired},
 }))
diff --git a/include/xrpl/protocol/digest.h b/include/xrpl/protocol/digest.h
index bbb38fa543..6564237771 100644
--- a/include/xrpl/protocol/digest.h
+++ b/include/xrpl/protocol/digest.h
@@ -24,14 +24,14 @@ namespace xrpl {
 
     @note This uses the OpenSSL implementation
 */
-struct openssl_ripemd160_hasher
+struct OpensslRipemd160Hasher
 {
 public:
-    static constexpr auto const endian = boost::endian::order::native;
+    static constexpr auto const kENDIAN = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 20>;
 
-    openssl_ripemd160_hasher();
+    OpensslRipemd160Hasher();
 
     void
     operator()(void const* data, std::size_t size) noexcept;
@@ -47,14 +47,14 @@ private:
 
     @note This uses the OpenSSL implementation
 */
-struct openssl_sha512_hasher
+struct OpensslSha512Hasher
 {
 public:
-    static constexpr auto const endian = boost::endian::order::native;
+    static constexpr auto const kENDIAN = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 64>;
 
-    openssl_sha512_hasher();
+    OpensslSha512Hasher();
 
     void
     operator()(void const* data, std::size_t size) noexcept;
@@ -70,14 +70,14 @@ private:
 
     @note This uses the OpenSSL implementation
 */
-struct openssl_sha256_hasher
+struct OpensslSha256Hasher
 {
 public:
-    static constexpr auto const endian = boost::endian::order::native;
+    static constexpr auto const kENDIAN = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 32>;
 
-    openssl_sha256_hasher();
+    OpensslSha256Hasher();
 
     void
     operator()(void const* data, std::size_t size) noexcept;
@@ -91,9 +91,9 @@ private:
 
 //------------------------------------------------------------------------------
 
-using ripemd160_hasher = openssl_ripemd160_hasher;
-using sha256_hasher = openssl_sha256_hasher;
-using sha512_hasher = openssl_sha512_hasher;
+using ripemd160_hasher = OpensslRipemd160Hasher;
+using sha256_hasher = OpensslSha256Hasher;
+using sha512_hasher = OpensslSha512Hasher;
 
 //------------------------------------------------------------------------------
 
@@ -112,13 +112,13 @@ using sha512_hasher = openssl_sha512_hasher;
 
     Meets the requirements of Hasher (in hash_append)
 */
-struct ripesha_hasher
+struct RipeshaHasher
 {
 private:
     sha256_hasher h_;
 
 public:
-    static constexpr auto const endian = boost::endian::order::native;
+    static constexpr auto const kENDIAN = boost::endian::order::native;
 
     using result_type = std::array<std::uint8_t, 20>;
 
@@ -148,17 +148,17 @@ namespace detail {
     SHA-512 digest of the message.
 */
 template <bool Secure>
-struct basic_sha512_half_hasher
+struct BasicSha512HalfHasher
 {
 private:
     sha512_hasher h_;
 
 public:
-    static constexpr auto const endian = boost::endian::order::big;
+    static constexpr auto const kENDIAN = boost::endian::order::big;
 
     using result_type = uint256;
 
-    ~basic_sha512_half_hasher()
+    ~BasicSha512HalfHasher()
     {
         erase(std::integral_constant<bool, Secure>{});
     }
@@ -185,16 +185,16 @@ private:
     void
     erase(std::true_type)
     {
-        secure_erase(&h_, sizeof(h_));
+        secureErase(&h_, sizeof(h_));
     }
 };
 
 }  // namespace detail
 
-using sha512_half_hasher = detail::basic_sha512_half_hasher<false>;
+using sha512_half_hasher = detail::BasicSha512HalfHasher<false>;
 
 // secure version
-using sha512_half_hasher_s = detail::basic_sha512_half_hasher<true>;
+using sha512_half_hasher_s = detail::BasicSha512HalfHasher<true>;
 
 //------------------------------------------------------------------------------
 
@@ -217,7 +217,7 @@ sha512Half(Args const&... args)
 */
 template <class... Args>
 sha512_half_hasher_s::result_type
-sha512Half_s(Args const&... args)
+sha512HalfS(Args const&... args)
 {
     sha512_half_hasher_s h;
     using beast::hash_append;
diff --git a/include/xrpl/protocol/json_get_or_throw.h b/include/xrpl/protocol/json_get_or_throw.h
index 949fb64cf2..9399f25827 100644
--- a/include/xrpl/protocol/json_get_or_throw.h
+++ b/include/xrpl/protocol/json_get_or_throw.h
@@ -10,12 +10,12 @@
 #include <exception>
 #include <optional>
 
-namespace Json {
+namespace json {
 struct JsonMissingKeyError : std::exception
 {
     char const* const key;
     mutable std::string msg;
-    JsonMissingKeyError(Json::StaticString const& k) : key{k.c_str()}
+    JsonMissingKeyError(json::StaticString const& k) : key{k.cStr()}
     {
     }
     char const*
@@ -34,8 +34,8 @@ struct JsonTypeMismatchError : std::exception
     char const* const key;
     std::string const expectedType;
     mutable std::string msg;
-    JsonTypeMismatchError(Json::StaticString const& k, std::string et)
-        : key{k.c_str()}, expectedType{std::move(et)}
+    JsonTypeMismatchError(json::StaticString const& k, std::string et)
+        : key{k.cStr()}, expectedType{std::move(et)}
     {
     }
     char const*
@@ -52,21 +52,21 @@ struct JsonTypeMismatchError : std::exception
 
 template <class T>
 T
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     static_assert(sizeof(T) == -1, "This function must be specialized");
 }
 
 template <>
 inline std::string
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
-    Json::StaticString const& key = field.getJsonName();
+    json::StaticString const& key = field.getJsonName();
     if (!v.isMember(key))
         Throw<JsonMissingKeyError>(key);
 
-    Json::Value const& inner = v[key];
+    json::Value const& inner = v[key];
     if (!inner.isString())
         Throw<JsonTypeMismatchError>(key, "string");
     return inner.asString();
@@ -75,13 +75,13 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
 // Note, this allows integer numeric fields to act as bools
 template <>
 inline bool
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
-    Json::StaticString const& key = field.getJsonName();
+    json::StaticString const& key = field.getJsonName();
     if (!v.isMember(key))
         Throw<JsonMissingKeyError>(key);
-    Json::Value const& inner = v[key];
+    json::Value const& inner = v[key];
     if (inner.isBool())
         return inner.asBool();
     if (!inner.isIntegral())
@@ -92,13 +92,13 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
 
 template <>
 inline std::uint64_t
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
-    Json::StaticString const& key = field.getJsonName();
+    json::StaticString const& key = field.getJsonName();
     if (!v.isMember(key))
         Throw<JsonMissingKeyError>(key);
-    Json::Value const& inner = v[key];
+    json::Value const& inner = v[key];
     if (inner.isUInt())
         return inner.asUInt();
     if (inner.isInt())
@@ -125,7 +125,7 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
 
 template <>
 inline xrpl::Buffer
-getOrThrow(Json::Value const& v, xrpl::SField const& field)
+getOrThrow(json::Value const& v, xrpl::SField const& field)
 {
     using namespace xrpl;
     std::string const hex = getOrThrow<std::string>(v, field);
@@ -140,7 +140,7 @@ getOrThrow(Json::Value const& v, xrpl::SField const& field)
 // This function may be used by external projects (like the witness server).
 template <class T>
 std::optional<T>
-getOptional(Json::Value const& v, xrpl::SField const& field)
+getOptional(json::Value const& v, xrpl::SField const& field)
 {
     try
     {
@@ -152,4 +152,4 @@ getOptional(Json::Value const& v, xrpl::SField const& field)
     return {};
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/include/xrpl/protocol/jss.h b/include/xrpl/protocol/jss.h
index 0e94285be9..8a2a112542 100644
--- a/include/xrpl/protocol/jss.h
+++ b/include/xrpl/protocol/jss.h
@@ -4,17 +4,18 @@
 
 namespace xrpl::jss {
 
+// NOLINTBEGIN(readability-identifier-naming)
 // JSON static strings
 
-#define JSS(x) constexpr ::Json::StaticString x(#x)
+#define JSS(x) constexpr ::json::StaticString x(#x)
 
 /* These "StaticString" field names are used instead of string literals to
-   optimize the performance of accessing properties of Json::Value objects.
+   optimize the performance of accessing properties of json::Value objects.
 
    Most strings have a trailing comment. Here is the legend:
 
-   in: Read by the given RPC handler from its `Json::Value` parameter.
-   out: Assigned by the given RPC handler in the `Json::Value` it returns.
+   in: Read by the given RPC handler from its `json::Value` parameter.
+   out: Assigned by the given RPC handler in the `json::Value` it returns.
    field: A field of at least one type of transaction.
    RPC: Common properties of RPC requests and responses.
    error: Common properties of RPC error responses.
@@ -707,4 +708,6 @@ JSS(write_load);                  // out: GetCounts
 
 #undef JSS
 
+// NOLINTEND(readability-identifier-naming)
+
 }  // namespace xrpl::jss
diff --git a/include/xrpl/protocol/nft.h b/include/xrpl/protocol/nft.h
index 6dce8d1045..ce73e244c1 100644
--- a/include/xrpl/protocol/nft.h
+++ b/include/xrpl/protocol/nft.h
@@ -15,7 +15,7 @@ namespace xrpl::nft {
 struct TaxonTag
 {
 };
-using Taxon = tagged_integer<std::uint32_t, TaxonTag>;
+using Taxon = TaggedInteger<std::uint32_t, TaxonTag>;
 
 inline Taxon
 toTaxon(std::uint32_t i)
@@ -29,11 +29,11 @@ toUInt32(Taxon t)
     return static_cast<std::uint32_t>(t);
 }
 
-constexpr std::uint16_t const flagBurnable = 0x0001;
-constexpr std::uint16_t const flagOnlyXRP = 0x0002;
-constexpr std::uint16_t const flagCreateTrustLines = 0x0004;
-constexpr std::uint16_t const flagTransferable = 0x0008;
-constexpr std::uint16_t const flagMutable = 0x0010;
+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;
 
 inline std::uint16_t
 getFlags(uint256 const& id)
diff --git a/include/xrpl/protocol/nftPageMask.h b/include/xrpl/protocol/nftPageMask.h
index 9889db5341..d679c319fa 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 pageMask(
+uint256 constexpr kPAGE_MASK(
     std::string_view("0000000000000000000000000000000000000000ffffffffffffffffffffffff"));
 
 }  // namespace xrpl::nft
diff --git a/include/xrpl/protocol/tokens.h b/include/xrpl/protocol/tokens.h
index 043db02825..125cfe8583 100644
--- a/include/xrpl/protocol/tokens.h
+++ b/include/xrpl/protocol/tokens.h
@@ -62,7 +62,7 @@ decodeBase58Token(std::string const& s, TokenType type);
 namespace detail {
 // Expose detail functions for unit tests only
 std::string
-encodeBase58(void const* message, std::size_t size, void* temp, std::size_t temp_size);
+encodeBase58(void const* message, std::size_t size, void* temp, std::size_t tempSize);
 
 std::string
 decodeBase58(std::string const& s);
@@ -75,7 +75,7 @@ namespace b58_fast {
 // particular)
 [[nodiscard]] B58Result<std::span<std::uint8_t>>
 encodeBase58Token(
-    TokenType token_type,
+    TokenType tokenType,
     std::span<std::uint8_t const> input,
     std::span<std::uint8_t> out);
 
@@ -93,10 +93,10 @@ decodeBase58Token(std::string const& s, TokenType type);
 namespace detail {
 // Expose detail functions for unit tests only
 B58Result<std::span<std::uint8_t>>
-b256_to_b58_be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out);
+b256ToB58Be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out);
 
 B58Result<std::span<std::uint8_t>>
-b58_to_b256_be(std::string_view input, std::span<std::uint8_t> out);
+b58ToB256Be(std::string_view input, std::span<std::uint8_t> out);
 }  // namespace detail
 
 }  // namespace b58_fast
diff --git a/include/xrpl/protocol_autogen/STObjectValidation.h b/include/xrpl/protocol_autogen/STObjectValidation.h
index cd0633af5d..b8ca7df3b7 100644
--- a/include/xrpl/protocol_autogen/STObjectValidation.h
+++ b/include/xrpl/protocol_autogen/STObjectValidation.h
@@ -11,12 +11,12 @@ validateSTObject(STObject const& obj, SOTemplate const& format)
 {
     for (auto const& field : format)
     {
-        if (!obj.isFieldPresent(field.sField()) && field.style() == soeREQUIRED)
+        if (!obj.isFieldPresent(field.sField()) && field.style() == SoeRequired)
         {
             return false;  // LCOV_EXCL_LINE
         }
 
-        if (field.supportMPT() == soeMPTNotSupported && obj.isFieldPresent(field.sField()))
+        if (field.supportMPT() == SoeMptNotSupported && obj.isFieldPresent(field.sField()))
         {
             if (field.sField().fieldType == STI_AMOUNT)
             {
diff --git a/include/xrpl/protocol_autogen/TransactionBuilderBase.h b/include/xrpl/protocol_autogen/TransactionBuilderBase.h
index 3abfd07a1c..14975b152e 100644
--- a/include/xrpl/protocol_autogen/TransactionBuilderBase.h
+++ b/include/xrpl/protocol_autogen/TransactionBuilderBase.h
@@ -250,10 +250,10 @@ protected:
         // Set the signing public key
         object_.setFieldVL(sfSigningPubKey, publicKey.slice());
 
-        // Build the signing data: HashPrefix::txSign + serialized object
+        // Build the signing data: HashPrefix::TxSign + serialized object
         // (without signing fields)
         Serializer s;
-        s.add32(HashPrefix::txSign);
+        s.add32(HashPrefix::TxSign);
         object_.addWithoutSigningFields(s);
 
         // Sign and set the signature
diff --git a/include/xrpl/protocol_autogen/ledger_entries/AMM.h b/include/xrpl/protocol_autogen/ledger_entries/AMM.h
index f92f15eaa8..529e3f4df7 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/AMM.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/AMM.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfTradingFee (soeDEFAULT)
+     * @brief Get sfTradingFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfVoteSlots (soeOPTIONAL)
+     * @brief Get sfVoteSlots (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -106,7 +106,7 @@ public:
     }
 
     /**
-     * @brief Get sfAuctionSlot (soeOPTIONAL)
+     * @brief Get sfAuctionSlot (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -131,7 +131,7 @@ public:
     }
 
     /**
-     * @brief Get sfLPTokenBalance (soeREQUIRED)
+     * @brief Get sfLPTokenBalance (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -142,7 +142,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -153,7 +153,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -164,7 +164,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -175,7 +175,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeOPTIONAL)
+     * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -199,7 +199,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Get sfPreviousTxnLgrSeq (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -227,7 +227,7 @@ public:
  * @brief Builder for AMM ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class AMMBuilder : public LedgerEntryBuilderBase<AMMBuilder>
@@ -268,7 +268,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -279,7 +279,7 @@ public:
     }
 
     /**
-     * @brief Set sfTradingFee (soeDEFAULT)
+     * @brief Set sfTradingFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -290,7 +290,7 @@ public:
     }
 
     /**
-     * @brief Set sfVoteSlots (soeOPTIONAL)
+     * @brief Set sfVoteSlots (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -301,7 +301,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuctionSlot (soeOPTIONAL)
+     * @brief Set sfAuctionSlot (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -312,7 +312,7 @@ public:
     }
 
     /**
-     * @brief Set sfLPTokenBalance (soeREQUIRED)
+     * @brief Set sfLPTokenBalance (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -323,7 +323,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -334,7 +334,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -345,7 +345,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -356,7 +356,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeOPTIONAL)
+     * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
@@ -367,7 +367,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Set sfPreviousTxnLgrSeq (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/AccountRoot.h b/include/xrpl/protocol_autogen/ledger_entries/AccountRoot.h
index 15cf14b21a..e20259330d 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/AccountRoot.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/AccountRoot.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfBalance (soeREQUIRED)
+     * @brief Get sfBalance (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerCount (soeREQUIRED)
+     * @brief Get sfOwnerCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfAccountTxnID (soeOPTIONAL)
+     * @brief Get sfAccountTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfRegularKey (soeOPTIONAL)
+     * @brief Get sfRegularKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -160,7 +160,7 @@ public:
     }
 
     /**
-     * @brief Get sfEmailHash (soeOPTIONAL)
+     * @brief Get sfEmailHash (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -184,7 +184,7 @@ public:
     }
 
     /**
-     * @brief Get sfWalletLocator (soeOPTIONAL)
+     * @brief Get sfWalletLocator (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -208,7 +208,7 @@ public:
     }
 
     /**
-     * @brief Get sfWalletSize (soeOPTIONAL)
+     * @brief Get sfWalletSize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -232,7 +232,7 @@ public:
     }
 
     /**
-     * @brief Get sfMessageKey (soeOPTIONAL)
+     * @brief Get sfMessageKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferRate (soeOPTIONAL)
+     * @brief Get sfTransferRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -280,7 +280,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomain (soeOPTIONAL)
+     * @brief Get sfDomain (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -304,7 +304,7 @@ public:
     }
 
     /**
-     * @brief Get sfTickSize (soeOPTIONAL)
+     * @brief Get sfTickSize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -328,7 +328,7 @@ public:
     }
 
     /**
-     * @brief Get sfTicketCount (soeOPTIONAL)
+     * @brief Get sfTicketCount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -352,7 +352,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenMinter (soeOPTIONAL)
+     * @brief Get sfNFTokenMinter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -376,7 +376,7 @@ public:
     }
 
     /**
-     * @brief Get sfMintedNFTokens (soeDEFAULT)
+     * @brief Get sfMintedNFTokens (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -400,7 +400,7 @@ public:
     }
 
     /**
-     * @brief Get sfBurnedNFTokens (soeDEFAULT)
+     * @brief Get sfBurnedNFTokens (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -424,7 +424,7 @@ public:
     }
 
     /**
-     * @brief Get sfFirstNFTokenSequence (soeOPTIONAL)
+     * @brief Get sfFirstNFTokenSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -448,7 +448,7 @@ public:
     }
 
     /**
-     * @brief Get sfAMMID (soeOPTIONAL)
+     * @brief Get sfAMMID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -472,7 +472,7 @@ public:
     }
 
     /**
-     * @brief Get sfVaultID (soeOPTIONAL)
+     * @brief Get sfVaultID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -496,7 +496,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanBrokerID (soeOPTIONAL)
+     * @brief Get sfLoanBrokerID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -524,7 +524,7 @@ public:
  * @brief Builder for AccountRoot ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class AccountRootBuilder : public LedgerEntryBuilderBase<AccountRootBuilder>
@@ -567,7 +567,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -578,7 +578,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -589,7 +589,7 @@ public:
     }
 
     /**
-     * @brief Set sfBalance (soeREQUIRED)
+     * @brief Set sfBalance (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -600,7 +600,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerCount (soeREQUIRED)
+     * @brief Set sfOwnerCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -611,7 +611,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -622,7 +622,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -633,7 +633,7 @@ public:
     }
 
     /**
-     * @brief Set sfAccountTxnID (soeOPTIONAL)
+     * @brief Set sfAccountTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -644,7 +644,7 @@ public:
     }
 
     /**
-     * @brief Set sfRegularKey (soeOPTIONAL)
+     * @brief Set sfRegularKey (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -655,7 +655,7 @@ public:
     }
 
     /**
-     * @brief Set sfEmailHash (soeOPTIONAL)
+     * @brief Set sfEmailHash (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -666,7 +666,7 @@ public:
     }
 
     /**
-     * @brief Set sfWalletLocator (soeOPTIONAL)
+     * @brief Set sfWalletLocator (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -677,7 +677,7 @@ public:
     }
 
     /**
-     * @brief Set sfWalletSize (soeOPTIONAL)
+     * @brief Set sfWalletSize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -688,7 +688,7 @@ public:
     }
 
     /**
-     * @brief Set sfMessageKey (soeOPTIONAL)
+     * @brief Set sfMessageKey (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -699,7 +699,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferRate (soeOPTIONAL)
+     * @brief Set sfTransferRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -710,7 +710,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomain (soeOPTIONAL)
+     * @brief Set sfDomain (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -721,7 +721,7 @@ public:
     }
 
     /**
-     * @brief Set sfTickSize (soeOPTIONAL)
+     * @brief Set sfTickSize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -732,7 +732,7 @@ public:
     }
 
     /**
-     * @brief Set sfTicketCount (soeOPTIONAL)
+     * @brief Set sfTicketCount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -743,7 +743,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenMinter (soeOPTIONAL)
+     * @brief Set sfNFTokenMinter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -754,7 +754,7 @@ public:
     }
 
     /**
-     * @brief Set sfMintedNFTokens (soeDEFAULT)
+     * @brief Set sfMintedNFTokens (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -765,7 +765,7 @@ public:
     }
 
     /**
-     * @brief Set sfBurnedNFTokens (soeDEFAULT)
+     * @brief Set sfBurnedNFTokens (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -776,7 +776,7 @@ public:
     }
 
     /**
-     * @brief Set sfFirstNFTokenSequence (soeOPTIONAL)
+     * @brief Set sfFirstNFTokenSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -787,7 +787,7 @@ public:
     }
 
     /**
-     * @brief Set sfAMMID (soeOPTIONAL)
+     * @brief Set sfAMMID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -798,7 +798,7 @@ public:
     }
 
     /**
-     * @brief Set sfVaultID (soeOPTIONAL)
+     * @brief Set sfVaultID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
@@ -809,7 +809,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanBrokerID (soeOPTIONAL)
+     * @brief Set sfLoanBrokerID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountRootBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Amendments.h b/include/xrpl/protocol_autogen/ledger_entries/Amendments.h
index 2b51b83747..4f1b316b99 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Amendments.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Amendments.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAmendments (soeOPTIONAL)
+     * @brief Get sfAmendments (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfMajorities (soeOPTIONAL)
+     * @brief Get sfMajorities (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -95,7 +95,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeOPTIONAL)
+     * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -119,7 +119,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Get sfPreviousTxnLgrSeq (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
  * @brief Builder for Amendments ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class AmendmentsBuilder : public LedgerEntryBuilderBase<AmendmentsBuilder>
@@ -178,7 +178,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAmendments (soeOPTIONAL)
+     * @brief Set sfAmendments (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AmendmentsBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfMajorities (soeOPTIONAL)
+     * @brief Set sfMajorities (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AmendmentsBuilder&
@@ -200,7 +200,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeOPTIONAL)
+     * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AmendmentsBuilder&
@@ -211,7 +211,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Set sfPreviousTxnLgrSeq (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AmendmentsBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Bridge.h b/include/xrpl/protocol_autogen/ledger_entries/Bridge.h
index 3926ff65fa..fd7df1977f 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Bridge.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Bridge.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Get sfMinAccountCreateAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimID (soeREQUIRED)
+     * @brief Get sfXChainClaimID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -114,7 +114,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainAccountClaimCount (soeREQUIRED)
+     * @brief Get sfXChainAccountClaimCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -158,7 +158,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -173,7 +173,7 @@ public:
  * @brief Builder for Bridge ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class BridgeBuilder : public LedgerEntryBuilderBase<BridgeBuilder>
@@ -222,7 +222,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -233,7 +233,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -244,7 +244,7 @@ public:
     }
 
     /**
-     * @brief Set sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Set sfMinAccountCreateAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -255,7 +255,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -266,7 +266,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimID (soeREQUIRED)
+     * @brief Set sfXChainClaimID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -277,7 +277,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -288,7 +288,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainAccountClaimCount (soeREQUIRED)
+     * @brief Set sfXChainAccountClaimCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -299,7 +299,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -310,7 +310,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
@@ -321,7 +321,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BridgeBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Check.h b/include/xrpl/protocol_autogen/ledger_entries/Check.h
index c071186afb..750270cad9 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Check.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Check.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfSendMax (soeREQUIRED)
+     * @brief Get sfSendMax (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationNode (soeREQUIRED)
+     * @brief Get sfDestinationNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfInvoiceID (soeOPTIONAL)
+     * @brief Get sfInvoiceID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -160,7 +160,7 @@ public:
     }
 
     /**
-     * @brief Get sfSourceTag (soeOPTIONAL)
+     * @brief Get sfSourceTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -184,7 +184,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -208,7 +208,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -219,7 +219,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -234,7 +234,7 @@ public:
  * @brief Builder for Check ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class CheckBuilder : public LedgerEntryBuilderBase<CheckBuilder>
@@ -281,7 +281,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -292,7 +292,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -303,7 +303,7 @@ public:
     }
 
     /**
-     * @brief Set sfSendMax (soeREQUIRED)
+     * @brief Set sfSendMax (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -314,7 +314,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -325,7 +325,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -336,7 +336,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationNode (soeREQUIRED)
+     * @brief Set sfDestinationNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -347,7 +347,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -358,7 +358,7 @@ public:
     }
 
     /**
-     * @brief Set sfInvoiceID (soeOPTIONAL)
+     * @brief Set sfInvoiceID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -369,7 +369,7 @@ public:
     }
 
     /**
-     * @brief Set sfSourceTag (soeOPTIONAL)
+     * @brief Set sfSourceTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -380,7 +380,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -391,7 +391,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
@@ -402,7 +402,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Credential.h b/include/xrpl/protocol_autogen/ledger_entries/Credential.h
index 4c45f80a8d..5433f00b33 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Credential.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Credential.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfSubject (soeREQUIRED)
+     * @brief Get sfSubject (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfIssuer (soeREQUIRED)
+     * @brief Get sfIssuer (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialType (soeREQUIRED)
+     * @brief Get sfCredentialType (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Get sfIssuerNode (soeREQUIRED)
+     * @brief Get sfIssuerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -138,7 +138,7 @@ public:
     }
 
     /**
-     * @brief Get sfSubjectNode (soeOPTIONAL)
+     * @brief Get sfSubjectNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -162,7 +162,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -173,7 +173,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -188,7 +188,7 @@ public:
  * @brief Builder for Credential ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class CredentialBuilder : public LedgerEntryBuilderBase<CredentialBuilder>
@@ -231,7 +231,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfSubject (soeREQUIRED)
+     * @brief Set sfSubject (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -242,7 +242,7 @@ public:
     }
 
     /**
-     * @brief Set sfIssuer (soeREQUIRED)
+     * @brief Set sfIssuer (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -253,7 +253,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialType (soeREQUIRED)
+     * @brief Set sfCredentialType (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -264,7 +264,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -275,7 +275,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -286,7 +286,7 @@ public:
     }
 
     /**
-     * @brief Set sfIssuerNode (soeREQUIRED)
+     * @brief Set sfIssuerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -297,7 +297,7 @@ public:
     }
 
     /**
-     * @brief Set sfSubjectNode (soeOPTIONAL)
+     * @brief Set sfSubjectNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
@@ -319,7 +319,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/DID.h b/include/xrpl/protocol_autogen/ledger_entries/DID.h
index fc88e988df..2f57961be4 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/DID.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/DID.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfDIDDocument (soeOPTIONAL)
+     * @brief Get sfDIDDocument (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -105,7 +105,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -129,7 +129,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -140,7 +140,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -151,7 +151,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -166,7 +166,7 @@ public:
  * @brief Builder for DID ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class DIDBuilder : public LedgerEntryBuilderBase<DIDBuilder>
@@ -205,7 +205,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -216,7 +216,7 @@ public:
     }
 
     /**
-     * @brief Set sfDIDDocument (soeOPTIONAL)
+     * @brief Set sfDIDDocument (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -227,7 +227,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -238,7 +238,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -249,7 +249,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -260,7 +260,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
@@ -271,7 +271,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DIDBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Delegate.h b/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
index e2660632cd..7458b8103a 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Delegate.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfAuthorize (soeREQUIRED)
+     * @brief Get sfAuthorize (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfPermissions (soeREQUIRED)
+     * @brief Get sfPermissions (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -80,7 +80,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -91,7 +91,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationNode (soeOPTIONAL)
+     * @brief Get sfDestinationNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -141,7 +141,7 @@ public:
  * @brief Builder for Delegate ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class DelegateBuilder : public LedgerEntryBuilderBase<DelegateBuilder>
@@ -184,7 +184,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -195,7 +195,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuthorize (soeREQUIRED)
+     * @brief Set sfAuthorize (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -206,7 +206,7 @@ public:
     }
 
     /**
-     * @brief Set sfPermissions (soeREQUIRED)
+     * @brief Set sfPermissions (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationNode (soeOPTIONAL)
+     * @brief Set sfDestinationNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
@@ -250,7 +250,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/DepositPreauth.h b/include/xrpl/protocol_autogen/ledger_entries/DepositPreauth.h
index 533caba619..42b430a665 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/DepositPreauth.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/DepositPreauth.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfAuthorize (soeOPTIONAL)
+     * @brief Get sfAuthorize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -114,7 +114,7 @@ public:
     }
 
     /**
-     * @brief Get sfAuthorizeCredentials (soeOPTIONAL)
+     * @brief Get sfAuthorizeCredentials (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -143,7 +143,7 @@ public:
  * @brief Builder for DepositPreauth ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class DepositPreauthBuilder : public LedgerEntryBuilderBase<DepositPreauthBuilder>
@@ -182,7 +182,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -193,7 +193,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuthorize (soeOPTIONAL)
+     * @brief Set sfAuthorize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -215,7 +215,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -226,7 +226,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -237,7 +237,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuthorizeCredentials (soeOPTIONAL)
+     * @brief Set sfAuthorizeCredentials (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/DirectoryNode.h b/include/xrpl/protocol_autogen/ledger_entries/DirectoryNode.h
index 4c06ac5bbb..e47cb98a26 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/DirectoryNode.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/DirectoryNode.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerPaysCurrency (soeOPTIONAL)
+     * @brief Get sfTakerPaysCurrency (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -94,7 +94,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerPaysIssuer (soeOPTIONAL)
+     * @brief Get sfTakerPaysIssuer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -118,7 +118,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerPaysMPT (soeOPTIONAL)
+     * @brief Get sfTakerPaysMPT (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -142,7 +142,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerGetsCurrency (soeOPTIONAL)
+     * @brief Get sfTakerGetsCurrency (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -166,7 +166,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerGetsIssuer (soeOPTIONAL)
+     * @brief Get sfTakerGetsIssuer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -190,7 +190,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerGetsMPT (soeOPTIONAL)
+     * @brief Get sfTakerGetsMPT (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -214,7 +214,7 @@ public:
     }
 
     /**
-     * @brief Get sfExchangeRate (soeOPTIONAL)
+     * @brief Get sfExchangeRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -238,7 +238,7 @@ public:
     }
 
     /**
-     * @brief Get sfIndexes (soeREQUIRED)
+     * @brief Get sfIndexes (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -249,7 +249,7 @@ public:
     }
 
     /**
-     * @brief Get sfRootIndex (soeREQUIRED)
+     * @brief Get sfRootIndex (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -260,7 +260,7 @@ public:
     }
 
     /**
-     * @brief Get sfIndexNext (soeOPTIONAL)
+     * @brief Get sfIndexNext (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -284,7 +284,7 @@ public:
     }
 
     /**
-     * @brief Get sfIndexPrevious (soeOPTIONAL)
+     * @brief Get sfIndexPrevious (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenID (soeOPTIONAL)
+     * @brief Get sfNFTokenID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -332,7 +332,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeOPTIONAL)
+     * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -356,7 +356,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Get sfPreviousTxnLgrSeq (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -380,7 +380,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -408,7 +408,7 @@ public:
  * @brief Builder for DirectoryNode ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class DirectoryNodeBuilder : public LedgerEntryBuilderBase<DirectoryNodeBuilder>
@@ -443,7 +443,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -454,7 +454,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerPaysCurrency (soeOPTIONAL)
+     * @brief Set sfTakerPaysCurrency (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -465,7 +465,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerPaysIssuer (soeOPTIONAL)
+     * @brief Set sfTakerPaysIssuer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -476,7 +476,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerPaysMPT (soeOPTIONAL)
+     * @brief Set sfTakerPaysMPT (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -487,7 +487,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerGetsCurrency (soeOPTIONAL)
+     * @brief Set sfTakerGetsCurrency (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -498,7 +498,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerGetsIssuer (soeOPTIONAL)
+     * @brief Set sfTakerGetsIssuer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -509,7 +509,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerGetsMPT (soeOPTIONAL)
+     * @brief Set sfTakerGetsMPT (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -520,7 +520,7 @@ public:
     }
 
     /**
-     * @brief Set sfExchangeRate (soeOPTIONAL)
+     * @brief Set sfExchangeRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -531,7 +531,7 @@ public:
     }
 
     /**
-     * @brief Set sfIndexes (soeREQUIRED)
+     * @brief Set sfIndexes (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -542,7 +542,7 @@ public:
     }
 
     /**
-     * @brief Set sfRootIndex (soeREQUIRED)
+     * @brief Set sfRootIndex (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -553,7 +553,7 @@ public:
     }
 
     /**
-     * @brief Set sfIndexNext (soeOPTIONAL)
+     * @brief Set sfIndexNext (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -564,7 +564,7 @@ public:
     }
 
     /**
-     * @brief Set sfIndexPrevious (soeOPTIONAL)
+     * @brief Set sfIndexPrevious (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -575,7 +575,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenID (soeOPTIONAL)
+     * @brief Set sfNFTokenID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -586,7 +586,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeOPTIONAL)
+     * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -597,7 +597,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Set sfPreviousTxnLgrSeq (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
@@ -608,7 +608,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DirectoryNodeBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Escrow.h b/include/xrpl/protocol_autogen/ledger_entries/Escrow.h
index fd15b2a713..ae8219a4f0 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Escrow.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Escrow.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeOPTIONAL)
+     * @brief Get sfSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfCondition (soeOPTIONAL)
+     * @brief Get sfCondition (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Get sfCancelAfter (soeOPTIONAL)
+     * @brief Get sfCancelAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -151,7 +151,7 @@ public:
     }
 
     /**
-     * @brief Get sfFinishAfter (soeOPTIONAL)
+     * @brief Get sfFinishAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -175,7 +175,7 @@ public:
     }
 
     /**
-     * @brief Get sfSourceTag (soeOPTIONAL)
+     * @brief Get sfSourceTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -199,7 +199,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -223,7 +223,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -234,7 +234,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -245,7 +245,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationNode (soeOPTIONAL)
+     * @brief Get sfDestinationNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -280,7 +280,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferRate (soeOPTIONAL)
+     * @brief Get sfTransferRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -304,7 +304,7 @@ public:
     }
 
     /**
-     * @brief Get sfIssuerNode (soeOPTIONAL)
+     * @brief Get sfIssuerNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -332,7 +332,7 @@ public:
  * @brief Builder for Escrow ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class EscrowBuilder : public LedgerEntryBuilderBase<EscrowBuilder>
@@ -375,7 +375,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -386,7 +386,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeOPTIONAL)
+     * @brief Set sfSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -397,7 +397,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -408,7 +408,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -419,7 +419,7 @@ public:
     }
 
     /**
-     * @brief Set sfCondition (soeOPTIONAL)
+     * @brief Set sfCondition (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -430,7 +430,7 @@ public:
     }
 
     /**
-     * @brief Set sfCancelAfter (soeOPTIONAL)
+     * @brief Set sfCancelAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -441,7 +441,7 @@ public:
     }
 
     /**
-     * @brief Set sfFinishAfter (soeOPTIONAL)
+     * @brief Set sfFinishAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -452,7 +452,7 @@ public:
     }
 
     /**
-     * @brief Set sfSourceTag (soeOPTIONAL)
+     * @brief Set sfSourceTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -463,7 +463,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -474,7 +474,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -485,7 +485,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -496,7 +496,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -507,7 +507,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationNode (soeOPTIONAL)
+     * @brief Set sfDestinationNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -518,7 +518,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferRate (soeOPTIONAL)
+     * @brief Set sfTransferRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
@@ -529,7 +529,7 @@ public:
     }
 
     /**
-     * @brief Set sfIssuerNode (soeOPTIONAL)
+     * @brief Set sfIssuerNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h b/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h
index e3c9ca0091..cfd7a591e8 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/FeeSettings.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfBaseFee (soeOPTIONAL)
+     * @brief Get sfBaseFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfReferenceFeeUnits (soeOPTIONAL)
+     * @brief Get sfReferenceFeeUnits (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -94,7 +94,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveBase (soeOPTIONAL)
+     * @brief Get sfReserveBase (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -118,7 +118,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveIncrement (soeOPTIONAL)
+     * @brief Get sfReserveIncrement (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -142,7 +142,7 @@ public:
     }
 
     /**
-     * @brief Get sfBaseFeeDrops (soeOPTIONAL)
+     * @brief Get sfBaseFeeDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -166,7 +166,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveBaseDrops (soeOPTIONAL)
+     * @brief Get sfReserveBaseDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -190,7 +190,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveIncrementDrops (soeOPTIONAL)
+     * @brief Get sfReserveIncrementDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -214,7 +214,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeOPTIONAL)
+     * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -238,7 +238,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Get sfPreviousTxnLgrSeq (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -266,7 +266,7 @@ public:
  * @brief Builder for FeeSettings ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class FeeSettingsBuilder : public LedgerEntryBuilderBase<FeeSettingsBuilder>
@@ -297,7 +297,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfBaseFee (soeOPTIONAL)
+     * @brief Set sfBaseFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Set sfReferenceFeeUnits (soeOPTIONAL)
+     * @brief Set sfReferenceFeeUnits (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -319,7 +319,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveBase (soeOPTIONAL)
+     * @brief Set sfReserveBase (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -330,7 +330,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveIncrement (soeOPTIONAL)
+     * @brief Set sfReserveIncrement (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -341,7 +341,7 @@ public:
     }
 
     /**
-     * @brief Set sfBaseFeeDrops (soeOPTIONAL)
+     * @brief Set sfBaseFeeDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -352,7 +352,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveBaseDrops (soeOPTIONAL)
+     * @brief Set sfReserveBaseDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -363,7 +363,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveIncrementDrops (soeOPTIONAL)
+     * @brief Set sfReserveIncrementDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -374,7 +374,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeOPTIONAL)
+     * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
@@ -385,7 +385,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Set sfPreviousTxnLgrSeq (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     FeeSettingsBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/LedgerHashes.h b/include/xrpl/protocol_autogen/ledger_entries/LedgerHashes.h
index c95ca303ba..8c082be685 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/LedgerHashes.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/LedgerHashes.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfFirstLedgerSequence (soeOPTIONAL)
+     * @brief Get sfFirstLedgerSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfLastLedgerSequence (soeOPTIONAL)
+     * @brief Get sfLastLedgerSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -94,7 +94,7 @@ public:
     }
 
     /**
-     * @brief Get sfHashes (soeREQUIRED)
+     * @brief Get sfHashes (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -109,7 +109,7 @@ public:
  * @brief Builder for LedgerHashes ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class LedgerHashesBuilder : public LedgerEntryBuilderBase<LedgerHashesBuilder>
@@ -142,7 +142,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfFirstLedgerSequence (soeOPTIONAL)
+     * @brief Set sfFirstLedgerSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LedgerHashesBuilder&
@@ -153,7 +153,7 @@ public:
     }
 
     /**
-     * @brief Set sfLastLedgerSequence (soeOPTIONAL)
+     * @brief Set sfLastLedgerSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LedgerHashesBuilder&
@@ -164,7 +164,7 @@ public:
     }
 
     /**
-     * @brief Set sfHashes (soeREQUIRED)
+     * @brief Set sfHashes (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LedgerHashesBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Loan.h b/include/xrpl/protocol_autogen/ledger_entries/Loan.h
index 73b37ea892..4408c278db 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Loan.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Loan.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanBrokerNode (soeREQUIRED)
+     * @brief Get sfLoanBrokerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanBrokerID (soeREQUIRED)
+     * @brief Get sfLoanBrokerID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanSequence (soeREQUIRED)
+     * @brief Get sfLoanSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfBorrower (soeREQUIRED)
+     * @brief Get sfBorrower (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanOriginationFee (soeDEFAULT)
+     * @brief Get sfLoanOriginationFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanServiceFee (soeDEFAULT)
+     * @brief Get sfLoanServiceFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -171,7 +171,7 @@ public:
     }
 
     /**
-     * @brief Get sfLatePaymentFee (soeDEFAULT)
+     * @brief Get sfLatePaymentFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -195,7 +195,7 @@ public:
     }
 
     /**
-     * @brief Get sfClosePaymentFee (soeDEFAULT)
+     * @brief Get sfClosePaymentFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -219,7 +219,7 @@ public:
     }
 
     /**
-     * @brief Get sfOverpaymentFee (soeDEFAULT)
+     * @brief Get sfOverpaymentFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Get sfInterestRate (soeDEFAULT)
+     * @brief Get sfInterestRate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -267,7 +267,7 @@ public:
     }
 
     /**
-     * @brief Get sfLateInterestRate (soeDEFAULT)
+     * @brief Get sfLateInterestRate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -291,7 +291,7 @@ public:
     }
 
     /**
-     * @brief Get sfCloseInterestRate (soeDEFAULT)
+     * @brief Get sfCloseInterestRate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -315,7 +315,7 @@ public:
     }
 
     /**
-     * @brief Get sfOverpaymentInterestRate (soeDEFAULT)
+     * @brief Get sfOverpaymentInterestRate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -339,7 +339,7 @@ public:
     }
 
     /**
-     * @brief Get sfStartDate (soeREQUIRED)
+     * @brief Get sfStartDate (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -350,7 +350,7 @@ public:
     }
 
     /**
-     * @brief Get sfPaymentInterval (soeREQUIRED)
+     * @brief Get sfPaymentInterval (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -361,7 +361,7 @@ public:
     }
 
     /**
-     * @brief Get sfGracePeriod (soeDEFAULT)
+     * @brief Get sfGracePeriod (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -385,7 +385,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousPaymentDueDate (soeDEFAULT)
+     * @brief Get sfPreviousPaymentDueDate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -409,7 +409,7 @@ public:
     }
 
     /**
-     * @brief Get sfNextPaymentDueDate (soeDEFAULT)
+     * @brief Get sfNextPaymentDueDate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -433,7 +433,7 @@ public:
     }
 
     /**
-     * @brief Get sfPaymentRemaining (soeDEFAULT)
+     * @brief Get sfPaymentRemaining (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -457,7 +457,7 @@ public:
     }
 
     /**
-     * @brief Get sfPeriodicPayment (soeREQUIRED)
+     * @brief Get sfPeriodicPayment (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -468,7 +468,7 @@ public:
     }
 
     /**
-     * @brief Get sfPrincipalOutstanding (soeDEFAULT)
+     * @brief Get sfPrincipalOutstanding (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -492,7 +492,7 @@ public:
     }
 
     /**
-     * @brief Get sfTotalValueOutstanding (soeDEFAULT)
+     * @brief Get sfTotalValueOutstanding (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -516,7 +516,7 @@ public:
     }
 
     /**
-     * @brief Get sfManagementFeeOutstanding (soeDEFAULT)
+     * @brief Get sfManagementFeeOutstanding (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -540,7 +540,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanScale (soeDEFAULT)
+     * @brief Get sfLoanScale (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -568,7 +568,7 @@ public:
  * @brief Builder for Loan ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class LoanBuilder : public LedgerEntryBuilderBase<LoanBuilder>
@@ -619,7 +619,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -630,7 +630,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -641,7 +641,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -652,7 +652,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanBrokerNode (soeREQUIRED)
+     * @brief Set sfLoanBrokerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -663,7 +663,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanBrokerID (soeREQUIRED)
+     * @brief Set sfLoanBrokerID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -674,7 +674,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanSequence (soeREQUIRED)
+     * @brief Set sfLoanSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -685,7 +685,7 @@ public:
     }
 
     /**
-     * @brief Set sfBorrower (soeREQUIRED)
+     * @brief Set sfBorrower (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -696,7 +696,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanOriginationFee (soeDEFAULT)
+     * @brief Set sfLoanOriginationFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -707,7 +707,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanServiceFee (soeDEFAULT)
+     * @brief Set sfLoanServiceFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -718,7 +718,7 @@ public:
     }
 
     /**
-     * @brief Set sfLatePaymentFee (soeDEFAULT)
+     * @brief Set sfLatePaymentFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -729,7 +729,7 @@ public:
     }
 
     /**
-     * @brief Set sfClosePaymentFee (soeDEFAULT)
+     * @brief Set sfClosePaymentFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -740,7 +740,7 @@ public:
     }
 
     /**
-     * @brief Set sfOverpaymentFee (soeDEFAULT)
+     * @brief Set sfOverpaymentFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -751,7 +751,7 @@ public:
     }
 
     /**
-     * @brief Set sfInterestRate (soeDEFAULT)
+     * @brief Set sfInterestRate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -762,7 +762,7 @@ public:
     }
 
     /**
-     * @brief Set sfLateInterestRate (soeDEFAULT)
+     * @brief Set sfLateInterestRate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -773,7 +773,7 @@ public:
     }
 
     /**
-     * @brief Set sfCloseInterestRate (soeDEFAULT)
+     * @brief Set sfCloseInterestRate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -784,7 +784,7 @@ public:
     }
 
     /**
-     * @brief Set sfOverpaymentInterestRate (soeDEFAULT)
+     * @brief Set sfOverpaymentInterestRate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -795,7 +795,7 @@ public:
     }
 
     /**
-     * @brief Set sfStartDate (soeREQUIRED)
+     * @brief Set sfStartDate (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -806,7 +806,7 @@ public:
     }
 
     /**
-     * @brief Set sfPaymentInterval (soeREQUIRED)
+     * @brief Set sfPaymentInterval (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -817,7 +817,7 @@ public:
     }
 
     /**
-     * @brief Set sfGracePeriod (soeDEFAULT)
+     * @brief Set sfGracePeriod (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -828,7 +828,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousPaymentDueDate (soeDEFAULT)
+     * @brief Set sfPreviousPaymentDueDate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -839,7 +839,7 @@ public:
     }
 
     /**
-     * @brief Set sfNextPaymentDueDate (soeDEFAULT)
+     * @brief Set sfNextPaymentDueDate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -850,7 +850,7 @@ public:
     }
 
     /**
-     * @brief Set sfPaymentRemaining (soeDEFAULT)
+     * @brief Set sfPaymentRemaining (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -861,7 +861,7 @@ public:
     }
 
     /**
-     * @brief Set sfPeriodicPayment (soeREQUIRED)
+     * @brief Set sfPeriodicPayment (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -872,7 +872,7 @@ public:
     }
 
     /**
-     * @brief Set sfPrincipalOutstanding (soeDEFAULT)
+     * @brief Set sfPrincipalOutstanding (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -883,7 +883,7 @@ public:
     }
 
     /**
-     * @brief Set sfTotalValueOutstanding (soeDEFAULT)
+     * @brief Set sfTotalValueOutstanding (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -894,7 +894,7 @@ public:
     }
 
     /**
-     * @brief Set sfManagementFeeOutstanding (soeDEFAULT)
+     * @brief Set sfManagementFeeOutstanding (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
@@ -905,7 +905,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanScale (soeDEFAULT)
+     * @brief Set sfLoanScale (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/LoanBroker.h b/include/xrpl/protocol_autogen/ledger_entries/LoanBroker.h
index 99083d6fce..b1c6dd8a54 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/LoanBroker.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/LoanBroker.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfVaultNode (soeREQUIRED)
+     * @brief Get sfVaultNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -134,7 +134,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanSequence (soeREQUIRED)
+     * @brief Get sfLoanSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -145,7 +145,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeDEFAULT)
+     * @brief Get sfData (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -169,7 +169,7 @@ public:
     }
 
     /**
-     * @brief Get sfManagementFeeRate (soeDEFAULT)
+     * @brief Get sfManagementFeeRate (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -193,7 +193,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerCount (soeDEFAULT)
+     * @brief Get sfOwnerCount (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Get sfDebtTotal (soeDEFAULT)
+     * @brief Get sfDebtTotal (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -241,7 +241,7 @@ public:
     }
 
     /**
-     * @brief Get sfDebtMaximum (soeDEFAULT)
+     * @brief Get sfDebtMaximum (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Get sfCoverAvailable (soeDEFAULT)
+     * @brief Get sfCoverAvailable (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -289,7 +289,7 @@ public:
     }
 
     /**
-     * @brief Get sfCoverRateMinimum (soeDEFAULT)
+     * @brief Get sfCoverRateMinimum (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -313,7 +313,7 @@ public:
     }
 
     /**
-     * @brief Get sfCoverRateLiquidation (soeDEFAULT)
+     * @brief Get sfCoverRateLiquidation (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -341,7 +341,7 @@ public:
  * @brief Builder for LoanBroker ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class LoanBrokerBuilder : public LedgerEntryBuilderBase<LoanBrokerBuilder>
@@ -390,7 +390,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -401,7 +401,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -412,7 +412,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -423,7 +423,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -434,7 +434,7 @@ public:
     }
 
     /**
-     * @brief Set sfVaultNode (soeREQUIRED)
+     * @brief Set sfVaultNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -445,7 +445,7 @@ public:
     }
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -456,7 +456,7 @@ public:
     }
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -467,7 +467,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -478,7 +478,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanSequence (soeREQUIRED)
+     * @brief Set sfLoanSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -489,7 +489,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeDEFAULT)
+     * @brief Set sfData (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -500,7 +500,7 @@ public:
     }
 
     /**
-     * @brief Set sfManagementFeeRate (soeDEFAULT)
+     * @brief Set sfManagementFeeRate (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -511,7 +511,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerCount (soeDEFAULT)
+     * @brief Set sfOwnerCount (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -522,7 +522,7 @@ public:
     }
 
     /**
-     * @brief Set sfDebtTotal (soeDEFAULT)
+     * @brief Set sfDebtTotal (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -533,7 +533,7 @@ public:
     }
 
     /**
-     * @brief Set sfDebtMaximum (soeDEFAULT)
+     * @brief Set sfDebtMaximum (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -544,7 +544,7 @@ public:
     }
 
     /**
-     * @brief Set sfCoverAvailable (soeDEFAULT)
+     * @brief Set sfCoverAvailable (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -555,7 +555,7 @@ public:
     }
 
     /**
-     * @brief Set sfCoverRateMinimum (soeDEFAULT)
+     * @brief Set sfCoverRateMinimum (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
@@ -566,7 +566,7 @@ public:
     }
 
     /**
-     * @brief Set sfCoverRateLiquidation (soeDEFAULT)
+     * @brief Set sfCoverRateLiquidation (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/MPToken.h b/include/xrpl/protocol_autogen/ledger_entries/MPToken.h
index d11a8effd3..8176b74fe9 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/MPToken.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/MPToken.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Get sfMPTokenIssuanceID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTAmount (soeDEFAULT)
+     * @brief Get sfMPTAmount (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfLockedAmount (soeOPTIONAL)
+     * @brief Get sfLockedAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -116,7 +116,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -138,7 +138,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -153,7 +153,7 @@ public:
  * @brief Builder for MPToken ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class MPTokenBuilder : public LedgerEntryBuilderBase<MPTokenBuilder>
@@ -194,7 +194,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -205,7 +205,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Set sfMPTokenIssuanceID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -216,7 +216,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTAmount (soeDEFAULT)
+     * @brief Set sfMPTAmount (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -227,7 +227,7 @@ public:
     }
 
     /**
-     * @brief Set sfLockedAmount (soeOPTIONAL)
+     * @brief Set sfLockedAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -238,7 +238,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -249,7 +249,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
@@ -260,7 +260,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h b/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h
index 23b8a05015..8377fdf1a4 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/MPTokenIssuance.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfIssuer (soeREQUIRED)
+     * @brief Get sfIssuer (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferFee (soeDEFAULT)
+     * @brief Get sfTransferFee (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetScale (soeDEFAULT)
+     * @brief Get sfAssetScale (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Get sfMaximumAmount (soeOPTIONAL)
+     * @brief Get sfMaximumAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -151,7 +151,7 @@ public:
     }
 
     /**
-     * @brief Get sfOutstandingAmount (soeREQUIRED)
+     * @brief Get sfOutstandingAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -162,7 +162,7 @@ public:
     }
 
     /**
-     * @brief Get sfLockedAmount (soeOPTIONAL)
+     * @brief Get sfLockedAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -186,7 +186,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Get sfMPTokenMetadata (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -210,7 +210,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -221,7 +221,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -232,7 +232,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Get sfMutableFlags (soeDEFAULT)
+     * @brief Get sfMutableFlags (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -284,7 +284,7 @@ public:
  * @brief Builder for MPTokenIssuance ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class MPTokenIssuanceBuilder : public LedgerEntryBuilderBase<MPTokenIssuanceBuilder>
@@ -327,7 +327,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfIssuer (soeREQUIRED)
+     * @brief Set sfIssuer (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -338,7 +338,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -349,7 +349,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferFee (soeDEFAULT)
+     * @brief Set sfTransferFee (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -360,7 +360,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -371,7 +371,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetScale (soeDEFAULT)
+     * @brief Set sfAssetScale (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -382,7 +382,7 @@ public:
     }
 
     /**
-     * @brief Set sfMaximumAmount (soeOPTIONAL)
+     * @brief Set sfMaximumAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -393,7 +393,7 @@ public:
     }
 
     /**
-     * @brief Set sfOutstandingAmount (soeREQUIRED)
+     * @brief Set sfOutstandingAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -404,7 +404,7 @@ public:
     }
 
     /**
-     * @brief Set sfLockedAmount (soeOPTIONAL)
+     * @brief Set sfLockedAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -415,7 +415,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Set sfMPTokenMetadata (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -426,7 +426,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -437,7 +437,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -448,7 +448,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
@@ -459,7 +459,7 @@ public:
     }
 
     /**
-     * @brief Set sfMutableFlags (soeDEFAULT)
+     * @brief Set sfMutableFlags (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/NFTokenOffer.h b/include/xrpl/protocol_autogen/ledger_entries/NFTokenOffer.h
index c500cde14c..c0a6ee6cbc 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/NFTokenOffer.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/NFTokenOffer.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenID (soeREQUIRED)
+     * @brief Get sfNFTokenID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenOfferNode (soeREQUIRED)
+     * @brief Get sfNFTokenOfferNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -149,7 +149,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -160,7 +160,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -175,7 +175,7 @@ public:
  * @brief Builder for NFTokenOffer ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class NFTokenOfferBuilder : public LedgerEntryBuilderBase<NFTokenOfferBuilder>
@@ -220,7 +220,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -231,7 +231,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenID (soeREQUIRED)
+     * @brief Set sfNFTokenID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -242,7 +242,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -253,7 +253,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -264,7 +264,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenOfferNode (soeREQUIRED)
+     * @brief Set sfNFTokenOfferNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -275,7 +275,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -286,7 +286,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -297,7 +297,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenOfferBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/NFTokenPage.h b/include/xrpl/protocol_autogen/ledger_entries/NFTokenPage.h
index fa8c415495..c4190f9068 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/NFTokenPage.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/NFTokenPage.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfPreviousPageMin (soeOPTIONAL)
+     * @brief Get sfPreviousPageMin (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfNextPageMin (soeOPTIONAL)
+     * @brief Get sfNextPageMin (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -94,7 +94,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokens (soeREQUIRED)
+     * @brief Get sfNFTokens (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -106,7 +106,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -117,7 +117,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -132,7 +132,7 @@ public:
  * @brief Builder for NFTokenPage ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class NFTokenPageBuilder : public LedgerEntryBuilderBase<NFTokenPageBuilder>
@@ -169,7 +169,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfPreviousPageMin (soeOPTIONAL)
+     * @brief Set sfPreviousPageMin (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenPageBuilder&
@@ -180,7 +180,7 @@ public:
     }
 
     /**
-     * @brief Set sfNextPageMin (soeOPTIONAL)
+     * @brief Set sfNextPageMin (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenPageBuilder&
@@ -191,7 +191,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokens (soeREQUIRED)
+     * @brief Set sfNFTokens (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenPageBuilder&
@@ -202,7 +202,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenPageBuilder&
@@ -213,7 +213,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenPageBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/NegativeUNL.h b/include/xrpl/protocol_autogen/ledger_entries/NegativeUNL.h
index 8ac2db5683..b09135e5f8 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/NegativeUNL.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/NegativeUNL.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfDisabledValidators (soeOPTIONAL)
+     * @brief Get sfDisabledValidators (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfValidatorToDisable (soeOPTIONAL)
+     * @brief Get sfValidatorToDisable (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -95,7 +95,7 @@ public:
     }
 
     /**
-     * @brief Get sfValidatorToReEnable (soeOPTIONAL)
+     * @brief Get sfValidatorToReEnable (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -119,7 +119,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeOPTIONAL)
+     * @brief Get sfPreviousTxnID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -143,7 +143,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Get sfPreviousTxnLgrSeq (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -171,7 +171,7 @@ public:
  * @brief Builder for NegativeUNL ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class NegativeUNLBuilder : public LedgerEntryBuilderBase<NegativeUNLBuilder>
@@ -202,7 +202,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfDisabledValidators (soeOPTIONAL)
+     * @brief Set sfDisabledValidators (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NegativeUNLBuilder&
@@ -213,7 +213,7 @@ public:
     }
 
     /**
-     * @brief Set sfValidatorToDisable (soeOPTIONAL)
+     * @brief Set sfValidatorToDisable (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NegativeUNLBuilder&
@@ -224,7 +224,7 @@ public:
     }
 
     /**
-     * @brief Set sfValidatorToReEnable (soeOPTIONAL)
+     * @brief Set sfValidatorToReEnable (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NegativeUNLBuilder&
@@ -235,7 +235,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeOPTIONAL)
+     * @brief Set sfPreviousTxnID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NegativeUNLBuilder&
@@ -246,7 +246,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeOPTIONAL)
+     * @brief Set sfPreviousTxnLgrSeq (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NegativeUNLBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Offer.h b/include/xrpl/protocol_autogen/ledger_entries/Offer.h
index cccd9183a1..a6d427cbbd 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Offer.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Offer.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerPays (soeREQUIRED)
+     * @brief Get sfTakerPays (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerGets (soeREQUIRED)
+     * @brief Get sfTakerGets (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfBookDirectory (soeREQUIRED)
+     * @brief Get sfBookDirectory (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfBookNode (soeREQUIRED)
+     * @brief Get sfBookNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -134,7 +134,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -145,7 +145,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -169,7 +169,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -193,7 +193,7 @@ public:
     }
 
     /**
-     * @brief Get sfAdditionalBooks (soeOPTIONAL)
+     * @brief Get sfAdditionalBooks (SoeOptional)
      * @note This is an untyped field (unknown).
      * @return The field value, or std::nullopt if not present.
      */
@@ -222,7 +222,7 @@ public:
  * @brief Builder for Offer ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class OfferBuilder : public LedgerEntryBuilderBase<OfferBuilder>
@@ -271,7 +271,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -282,7 +282,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -293,7 +293,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerPays (soeREQUIRED)
+     * @brief Set sfTakerPays (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -304,7 +304,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerGets (soeREQUIRED)
+     * @brief Set sfTakerGets (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -315,7 +315,7 @@ public:
     }
 
     /**
-     * @brief Set sfBookDirectory (soeREQUIRED)
+     * @brief Set sfBookDirectory (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -326,7 +326,7 @@ public:
     }
 
     /**
-     * @brief Set sfBookNode (soeREQUIRED)
+     * @brief Set sfBookNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -337,7 +337,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -348,7 +348,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -359,7 +359,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -370,7 +370,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -381,7 +381,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
@@ -392,7 +392,7 @@ public:
     }
 
     /**
-     * @brief Set sfAdditionalBooks (soeOPTIONAL)
+     * @brief Set sfAdditionalBooks (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Oracle.h b/include/xrpl/protocol_autogen/ledger_entries/Oracle.h
index 4da93773e6..31735a713c 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Oracle.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Oracle.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfOracleDocumentID (soeOPTIONAL)
+     * @brief Get sfOracleDocumentID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfProvider (soeREQUIRED)
+     * @brief Get sfProvider (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfPriceDataSeries (soeREQUIRED)
+     * @brief Get sfPriceDataSeries (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -104,7 +104,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetClass (soeREQUIRED)
+     * @brief Get sfAssetClass (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
     }
 
     /**
-     * @brief Get sfLastUpdateTime (soeREQUIRED)
+     * @brief Get sfLastUpdateTime (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -150,7 +150,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -161,7 +161,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -172,7 +172,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -187,7 +187,7 @@ public:
  * @brief Builder for Oracle ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class OracleBuilder : public LedgerEntryBuilderBase<OracleBuilder>
@@ -234,7 +234,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -245,7 +245,7 @@ public:
     }
 
     /**
-     * @brief Set sfOracleDocumentID (soeOPTIONAL)
+     * @brief Set sfOracleDocumentID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Set sfProvider (soeREQUIRED)
+     * @brief Set sfProvider (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -267,7 +267,7 @@ public:
     }
 
     /**
-     * @brief Set sfPriceDataSeries (soeREQUIRED)
+     * @brief Set sfPriceDataSeries (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -278,7 +278,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetClass (soeREQUIRED)
+     * @brief Set sfAssetClass (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -289,7 +289,7 @@ public:
     }
 
     /**
-     * @brief Set sfLastUpdateTime (soeREQUIRED)
+     * @brief Set sfLastUpdateTime (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -300,7 +300,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -311,7 +311,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -322,7 +322,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
@@ -333,7 +333,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/PayChannel.h b/include/xrpl/protocol_autogen/ledger_entries/PayChannel.h
index 50245bc0d8..097f287425 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/PayChannel.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/PayChannel.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeOPTIONAL)
+     * @brief Get sfSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfBalance (soeREQUIRED)
+     * @brief Get sfBalance (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -114,7 +114,7 @@ public:
     }
 
     /**
-     * @brief Get sfPublicKey (soeREQUIRED)
+     * @brief Get sfPublicKey (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfSettleDelay (soeREQUIRED)
+     * @brief Get sfSettleDelay (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -160,7 +160,7 @@ public:
     }
 
     /**
-     * @brief Get sfCancelAfter (soeOPTIONAL)
+     * @brief Get sfCancelAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -184,7 +184,7 @@ public:
     }
 
     /**
-     * @brief Get sfSourceTag (soeOPTIONAL)
+     * @brief Get sfSourceTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -208,7 +208,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -232,7 +232,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationNode (soeOPTIONAL)
+     * @brief Get sfDestinationNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -293,7 +293,7 @@ public:
  * @brief Builder for PayChannel ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class PayChannelBuilder : public LedgerEntryBuilderBase<PayChannelBuilder>
@@ -342,7 +342,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -353,7 +353,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -364,7 +364,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeOPTIONAL)
+     * @brief Set sfSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -375,7 +375,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -386,7 +386,7 @@ public:
     }
 
     /**
-     * @brief Set sfBalance (soeREQUIRED)
+     * @brief Set sfBalance (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -397,7 +397,7 @@ public:
     }
 
     /**
-     * @brief Set sfPublicKey (soeREQUIRED)
+     * @brief Set sfPublicKey (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -408,7 +408,7 @@ public:
     }
 
     /**
-     * @brief Set sfSettleDelay (soeREQUIRED)
+     * @brief Set sfSettleDelay (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -419,7 +419,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -430,7 +430,7 @@ public:
     }
 
     /**
-     * @brief Set sfCancelAfter (soeOPTIONAL)
+     * @brief Set sfCancelAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -441,7 +441,7 @@ public:
     }
 
     /**
-     * @brief Set sfSourceTag (soeOPTIONAL)
+     * @brief Set sfSourceTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -452,7 +452,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -463,7 +463,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -474,7 +474,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -485,7 +485,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
@@ -496,7 +496,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationNode (soeOPTIONAL)
+     * @brief Set sfDestinationNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PayChannelBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/PermissionedDomain.h b/include/xrpl/protocol_autogen/ledger_entries/PermissionedDomain.h
index 630f46517f..cc5a1649ef 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/PermissionedDomain.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/PermissionedDomain.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfAcceptedCredentials (soeREQUIRED)
+     * @brief Get sfAcceptedCredentials (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -80,7 +80,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -91,7 +91,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -102,7 +102,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -117,7 +117,7 @@ public:
  * @brief Builder for PermissionedDomain ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class PermissionedDomainBuilder : public LedgerEntryBuilderBase<PermissionedDomainBuilder>
@@ -160,7 +160,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
@@ -171,7 +171,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
@@ -182,7 +182,7 @@ public:
     }
 
     /**
-     * @brief Set sfAcceptedCredentials (soeREQUIRED)
+     * @brief Set sfAcceptedCredentials (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
@@ -193,7 +193,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
@@ -215,7 +215,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/RippleState.h b/include/xrpl/protocol_autogen/ledger_entries/RippleState.h
index 993496d38f..cb221bb2ad 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/RippleState.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/RippleState.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfBalance (soeREQUIRED)
+     * @brief Get sfBalance (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfLowLimit (soeREQUIRED)
+     * @brief Get sfLowLimit (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfHighLimit (soeREQUIRED)
+     * @brief Get sfHighLimit (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfLowNode (soeOPTIONAL)
+     * @brief Get sfLowNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfLowQualityIn (soeOPTIONAL)
+     * @brief Get sfLowQualityIn (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -149,7 +149,7 @@ public:
     }
 
     /**
-     * @brief Get sfLowQualityOut (soeOPTIONAL)
+     * @brief Get sfLowQualityOut (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -173,7 +173,7 @@ public:
     }
 
     /**
-     * @brief Get sfHighNode (soeOPTIONAL)
+     * @brief Get sfHighNode (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -197,7 +197,7 @@ public:
     }
 
     /**
-     * @brief Get sfHighQualityIn (soeOPTIONAL)
+     * @brief Get sfHighQualityIn (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -221,7 +221,7 @@ public:
     }
 
     /**
-     * @brief Get sfHighQualityOut (soeOPTIONAL)
+     * @brief Get sfHighQualityOut (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -249,7 +249,7 @@ public:
  * @brief Builder for RippleState ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class RippleStateBuilder : public LedgerEntryBuilderBase<RippleStateBuilder>
@@ -290,7 +290,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfBalance (soeREQUIRED)
+     * @brief Set sfBalance (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -301,7 +301,7 @@ public:
     }
 
     /**
-     * @brief Set sfLowLimit (soeREQUIRED)
+     * @brief Set sfLowLimit (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -312,7 +312,7 @@ public:
     }
 
     /**
-     * @brief Set sfHighLimit (soeREQUIRED)
+     * @brief Set sfHighLimit (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -323,7 +323,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -334,7 +334,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -345,7 +345,7 @@ public:
     }
 
     /**
-     * @brief Set sfLowNode (soeOPTIONAL)
+     * @brief Set sfLowNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -356,7 +356,7 @@ public:
     }
 
     /**
-     * @brief Set sfLowQualityIn (soeOPTIONAL)
+     * @brief Set sfLowQualityIn (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -367,7 +367,7 @@ public:
     }
 
     /**
-     * @brief Set sfLowQualityOut (soeOPTIONAL)
+     * @brief Set sfLowQualityOut (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -378,7 +378,7 @@ public:
     }
 
     /**
-     * @brief Set sfHighNode (soeOPTIONAL)
+     * @brief Set sfHighNode (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -389,7 +389,7 @@ public:
     }
 
     /**
-     * @brief Set sfHighQualityIn (soeOPTIONAL)
+     * @brief Set sfHighQualityIn (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
@@ -400,7 +400,7 @@ public:
     }
 
     /**
-     * @brief Set sfHighQualityOut (soeOPTIONAL)
+     * @brief Set sfHighQualityOut (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     RippleStateBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/SignerList.h b/include/xrpl/protocol_autogen/ledger_entries/SignerList.h
index 57d706bc28..dfc7eb4506 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/SignerList.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/SignerList.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignerQuorum (soeREQUIRED)
+     * @brief Get sfSignerQuorum (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignerEntries (soeREQUIRED)
+     * @brief Get sfSignerEntries (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -104,7 +104,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignerListID (soeREQUIRED)
+     * @brief Get sfSignerListID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -141,7 +141,7 @@ public:
  * @brief Builder for SignerList ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class SignerListBuilder : public LedgerEntryBuilderBase<SignerListBuilder>
@@ -184,7 +184,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -195,7 +195,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -206,7 +206,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignerQuorum (soeREQUIRED)
+     * @brief Set sfSignerQuorum (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignerEntries (soeREQUIRED)
+     * @brief Set sfSignerEntries (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignerListID (soeREQUIRED)
+     * @brief Set sfSignerListID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
@@ -250,7 +250,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Ticket.h b/include/xrpl/protocol_autogen/ledger_entries/Ticket.h
index f13e8a398f..ceadd70765 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Ticket.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Ticket.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfTicketSequence (soeREQUIRED)
+     * @brief Get sfTicketSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -105,7 +105,7 @@ public:
  * @brief Builder for Ticket ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class TicketBuilder : public LedgerEntryBuilderBase<TicketBuilder>
@@ -146,7 +146,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketBuilder&
@@ -157,7 +157,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketBuilder&
@@ -168,7 +168,7 @@ public:
     }
 
     /**
-     * @brief Set sfTicketSequence (soeREQUIRED)
+     * @brief Set sfTicketSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketBuilder&
@@ -179,7 +179,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketBuilder&
@@ -190,7 +190,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/Vault.h b/include/xrpl/protocol_autogen/ledger_entries/Vault.h
index e24e73fab3..168894d8d2 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/Vault.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/Vault.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfSequence (soeREQUIRED)
+     * @brief Get sfSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -101,7 +101,7 @@ public:
     }
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetsTotal (soeDEFAULT)
+     * @brief Get sfAssetsTotal (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -171,7 +171,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetsAvailable (soeDEFAULT)
+     * @brief Get sfAssetsAvailable (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -195,7 +195,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetsMaximum (soeDEFAULT)
+     * @brief Get sfAssetsMaximum (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -219,7 +219,7 @@ public:
     }
 
     /**
-     * @brief Get sfLossUnrealized (soeDEFAULT)
+     * @brief Get sfLossUnrealized (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Get sfShareMPTID (soeREQUIRED)
+     * @brief Get sfShareMPTID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Get sfWithdrawalPolicy (soeREQUIRED)
+     * @brief Get sfWithdrawalPolicy (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Get sfScale (soeDEFAULT)
+     * @brief Get sfScale (SoeDefault)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -293,7 +293,7 @@ public:
  * @brief Builder for Vault ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class VaultBuilder : public LedgerEntryBuilderBase<VaultBuilder>
@@ -342,7 +342,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -353,7 +353,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -364,7 +364,7 @@ public:
     }
 
     /**
-     * @brief Set sfSequence (soeREQUIRED)
+     * @brief Set sfSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -375,7 +375,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -386,7 +386,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -397,7 +397,7 @@ public:
     }
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -408,7 +408,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -419,7 +419,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -430,7 +430,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetsTotal (soeDEFAULT)
+     * @brief Set sfAssetsTotal (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -441,7 +441,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetsAvailable (soeDEFAULT)
+     * @brief Set sfAssetsAvailable (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -452,7 +452,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetsMaximum (soeDEFAULT)
+     * @brief Set sfAssetsMaximum (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -463,7 +463,7 @@ public:
     }
 
     /**
-     * @brief Set sfLossUnrealized (soeDEFAULT)
+     * @brief Set sfLossUnrealized (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -474,7 +474,7 @@ public:
     }
 
     /**
-     * @brief Set sfShareMPTID (soeREQUIRED)
+     * @brief Set sfShareMPTID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -485,7 +485,7 @@ public:
     }
 
     /**
-     * @brief Set sfWithdrawalPolicy (soeREQUIRED)
+     * @brief Set sfWithdrawalPolicy (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
@@ -496,7 +496,7 @@ public:
     }
 
     /**
-     * @brief Set sfScale (soeDEFAULT)
+     * @brief Set sfScale (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     VaultBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedClaimID.h b/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedClaimID.h
index 3309228951..4a3e9c9103 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedClaimID.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedClaimID.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimID (soeREQUIRED)
+     * @brief Get sfXChainClaimID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfOtherChainSource (soeREQUIRED)
+     * @brief Get sfOtherChainSource (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimAttestations (soeREQUIRED)
+     * @brief Get sfXChainClaimAttestations (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -102,7 +102,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -113,7 +113,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -124,7 +124,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -135,7 +135,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -150,7 +150,7 @@ public:
  * @brief Builder for XChainOwnedClaimID ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class XChainOwnedClaimIDBuilder : public LedgerEntryBuilderBase<XChainOwnedClaimIDBuilder>
@@ -199,7 +199,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -210,7 +210,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -221,7 +221,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimID (soeREQUIRED)
+     * @brief Set sfXChainClaimID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -232,7 +232,7 @@ public:
     }
 
     /**
-     * @brief Set sfOtherChainSource (soeREQUIRED)
+     * @brief Set sfOtherChainSource (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimAttestations (soeREQUIRED)
+     * @brief Set sfXChainClaimAttestations (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
@@ -287,7 +287,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedClaimIDBuilder&
diff --git a/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedCreateAccountClaimID.h b/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedCreateAccountClaimID.h
index 5415d52884..542de104ea 100644
--- a/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedCreateAccountClaimID.h
+++ b/include/xrpl/protocol_autogen/ledger_entries/XChainOwnedCreateAccountClaimID.h
@@ -46,7 +46,7 @@ public:
     // Ledger entry-specific field getters
 
     /**
-     * @brief Get sfAccount (soeREQUIRED)
+     * @brief Get sfAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -57,7 +57,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -68,7 +68,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -79,7 +79,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainCreateAccountAttestations (soeREQUIRED)
+     * @brief Get sfXChainCreateAccountAttestations (SoeRequired)
      * @note This is an untyped field (unknown).
      * @return The field value.
      */
@@ -91,7 +91,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwnerNode (soeREQUIRED)
+     * @brief Get sfOwnerNode (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -102,7 +102,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnID (soeREQUIRED)
+     * @brief Get sfPreviousTxnID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -113,7 +113,7 @@ public:
     }
 
     /**
-     * @brief Get sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Get sfPreviousTxnLgrSeq (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -128,7 +128,7 @@ public:
  * @brief Builder for XChainOwnedCreateAccountClaimID ledger entries.
  *
  * Provides a fluent interface for constructing ledger entries with method chaining.
- * Uses Json::Value internally for flexible ledger entry construction.
+ * Uses STObject internally for flexible ledger entry construction.
  * Inherits common field setters from LedgerEntryBuilderBase.
  */
 class XChainOwnedCreateAccountClaimIDBuilder : public LedgerEntryBuilderBase<XChainOwnedCreateAccountClaimIDBuilder>
@@ -173,7 +173,7 @@ public:
     /** @brief Ledger entry-specific field setters */
 
     /**
-     * @brief Set sfAccount (soeREQUIRED)
+     * @brief Set sfAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -184,7 +184,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -195,7 +195,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -206,7 +206,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainCreateAccountAttestations (soeREQUIRED)
+     * @brief Set sfXChainCreateAccountAttestations (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwnerNode (soeREQUIRED)
+     * @brief Set sfOwnerNode (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnID (soeREQUIRED)
+     * @brief Set sfPreviousTxnID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfPreviousTxnLgrSeq (soeREQUIRED)
+     * @brief Set sfPreviousTxnLgrSeq (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainOwnedCreateAccountClaimIDBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AMMBid.h b/include/xrpl/protocol_autogen/transactions/AMMBid.h
index 4e5c5d1d15..cd2792e810 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMBid.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMBid.h
@@ -19,9 +19,9 @@ class AMMBidBuilder;
  * @brief Transaction: AMMBid
  *
  * Type: ttAMM_BID (39)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMBidBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfBidMin (soeOPTIONAL)
+     * @brief Get sfBidMin (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -98,7 +98,7 @@ public:
     }
 
     /**
-     * @brief Get sfBidMax (soeOPTIONAL)
+     * @brief Get sfBidMax (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
         return this->tx_->isFieldPresent(sfBidMax);
     }
     /**
-     * @brief Get sfAuthAccounts (soeOPTIONAL)
+     * @brief Get sfAuthAccounts (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -152,7 +152,7 @@ public:
  * @brief Builder for AMMBid transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMBidBuilder : public TransactionBuilderBase<AMMBidBuilder>
@@ -193,7 +193,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -205,7 +205,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfBidMin (soeOPTIONAL)
+     * @brief Set sfBidMin (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBidBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfBidMax (soeOPTIONAL)
+     * @brief Set sfBidMax (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBidBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuthAccounts (soeOPTIONAL)
+     * @brief Set sfAuthAccounts (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMBidBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AMMClawback.h b/include/xrpl/protocol_autogen/transactions/AMMClawback.h
index 3a968f34d2..ccbd7d99e6 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMClawback.h
@@ -19,9 +19,9 @@ class AMMClawbackBuilder;
  * @brief Transaction: AMMClawback
  *
  * Type: ttAMM_CLAWBACK (31)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMMClawback
- * Privileges: mayDeleteAcct | overrideFreeze | mayAuthorizeMPT
+ * Privileges: MayDeleteAcct | OverrideFreeze | MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMClawbackBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfHolder (soeREQUIRED)
+     * @brief Get sfHolder (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -83,7 +83,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -114,7 +114,7 @@ public:
  * @brief Builder for AMMClawback transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMClawbackBuilder : public TransactionBuilderBase<AMMClawbackBuilder>
@@ -157,7 +157,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfHolder (soeREQUIRED)
+     * @brief Set sfHolder (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMClawbackBuilder&
@@ -168,7 +168,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -180,7 +180,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -192,7 +192,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/AMMCreate.h b/include/xrpl/protocol_autogen/transactions/AMMCreate.h
index ad6a253ffc..cc88428e7a 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMCreate.h
@@ -19,9 +19,9 @@ class AMMCreateBuilder;
  * @brief Transaction: AMMCreate
  *
  * Type: ttAMM_CREATE (35)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: createPseudoAcct | mayCreateMPT
+ * Privileges: CreatePseudoAcct | MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount2 (soeREQUIRED)
+     * @brief Get sfAmount2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfTradingFee (soeREQUIRED)
+     * @brief Get sfTradingFee (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -87,7 +87,7 @@ public:
  * @brief Builder for AMMCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMCreateBuilder : public TransactionBuilderBase<AMMCreateBuilder>
@@ -130,7 +130,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -142,7 +142,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount2 (soeREQUIRED)
+     * @brief Set sfAmount2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -154,7 +154,7 @@ public:
     }
 
     /**
-     * @brief Set sfTradingFee (soeREQUIRED)
+     * @brief Set sfTradingFee (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AMMDelete.h b/include/xrpl/protocol_autogen/transactions/AMMDelete.h
index 3325ee63b3..4cc0497c32 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMDelete.h
@@ -19,9 +19,9 @@ class AMMDeleteBuilder;
  * @brief Transaction: AMMDelete
  *
  * Type: ttAMM_DELETE (40)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: mustDeleteAcct | mayDeleteMPT
+ * Privileges: MustDeleteAcct | MayDeleteMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -76,7 +76,7 @@ public:
  * @brief Builder for AMMDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMDeleteBuilder : public TransactionBuilderBase<AMMDeleteBuilder>
@@ -117,7 +117,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -129,7 +129,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/AMMDeposit.h b/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
index bb9a36d218..e01332c3e2 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMDeposit.h
@@ -19,9 +19,9 @@ class AMMDepositBuilder;
  * @brief Transaction: AMMDeposit
  *
  * Type: ttAMM_DEPOSIT (36)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMDepositBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -99,7 +99,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount2 (soeOPTIONAL)
+     * @brief Get sfAmount2 (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfEPrice (soeOPTIONAL)
+     * @brief Get sfEPrice (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Get sfLPTokenOut (soeOPTIONAL)
+     * @brief Get sfLPTokenOut (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Get sfTradingFee (soeOPTIONAL)
+     * @brief Get sfTradingFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -208,7 +208,7 @@ public:
  * @brief Builder for AMMDeposit transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMDepositBuilder : public TransactionBuilderBase<AMMDepositBuilder>
@@ -249,7 +249,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -261,7 +261,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -273,7 +273,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -285,7 +285,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount2 (soeOPTIONAL)
+     * @brief Set sfAmount2 (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -297,7 +297,7 @@ public:
     }
 
     /**
-     * @brief Set sfEPrice (soeOPTIONAL)
+     * @brief Set sfEPrice (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMDepositBuilder&
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Set sfLPTokenOut (soeOPTIONAL)
+     * @brief Set sfLPTokenOut (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMDepositBuilder&
@@ -319,7 +319,7 @@ public:
     }
 
     /**
-     * @brief Set sfTradingFee (soeOPTIONAL)
+     * @brief Set sfTradingFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMDepositBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AMMVote.h b/include/xrpl/protocol_autogen/transactions/AMMVote.h
index 3baa3f6d41..b19d440c84 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMVote.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMVote.h
@@ -19,9 +19,9 @@ class AMMVoteBuilder;
  * @brief Transaction: AMMVote
  *
  * Type: ttAMM_VOTE (38)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMVoteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfTradingFee (soeREQUIRED)
+     * @brief Get sfTradingFee (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -87,7 +87,7 @@ public:
  * @brief Builder for AMMVote transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMVoteBuilder : public TransactionBuilderBase<AMMVoteBuilder>
@@ -130,7 +130,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -142,7 +142,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -154,7 +154,7 @@ public:
     }
 
     /**
-     * @brief Set sfTradingFee (soeREQUIRED)
+     * @brief Set sfTradingFee (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AMMVoteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h b/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
index 99f82b69c8..196f0faba2 100644
--- a/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/AMMWithdraw.h
@@ -19,9 +19,9 @@ class AMMWithdrawBuilder;
  * @brief Transaction: AMMWithdraw
  *
  * Type: ttAMM_WITHDRAW (37)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureAMM
- * Privileges: mayDeleteAcct | mayAuthorizeMPT
+ * Privileges: MayDeleteAcct | MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AMMWithdrawBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAsset2 (soeREQUIRED)
+     * @brief Get sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -99,7 +99,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount2 (soeOPTIONAL)
+     * @brief Get sfAmount2 (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfEPrice (soeOPTIONAL)
+     * @brief Get sfEPrice (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Get sfLPTokenIn (soeOPTIONAL)
+     * @brief Get sfLPTokenIn (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -182,7 +182,7 @@ public:
  * @brief Builder for AMMWithdraw transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AMMWithdrawBuilder : public TransactionBuilderBase<AMMWithdrawBuilder>
@@ -223,7 +223,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -235,7 +235,7 @@ public:
     }
 
     /**
-     * @brief Set sfAsset2 (soeREQUIRED)
+     * @brief Set sfAsset2 (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -247,7 +247,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -259,7 +259,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount2 (soeOPTIONAL)
+     * @brief Set sfAmount2 (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -271,7 +271,7 @@ public:
     }
 
     /**
-     * @brief Set sfEPrice (soeOPTIONAL)
+     * @brief Set sfEPrice (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMWithdrawBuilder&
@@ -282,7 +282,7 @@ public:
     }
 
     /**
-     * @brief Set sfLPTokenIn (soeOPTIONAL)
+     * @brief Set sfLPTokenIn (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AMMWithdrawBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AccountDelete.h b/include/xrpl/protocol_autogen/transactions/AccountDelete.h
index 86ae9af546..c0346d9499 100644
--- a/include/xrpl/protocol_autogen/transactions/AccountDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/AccountDelete.h
@@ -19,9 +19,9 @@ class AccountDeleteBuilder;
  * @brief Transaction: AccountDelete
  *
  * Type: ttACCOUNT_DELETE (21)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: mustDeleteAcct
+ * Privileges: MustDeleteAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AccountDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialIDs (soeOPTIONAL)
+     * @brief Get sfCredentialIDs (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
  * @brief Builder for AccountDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AccountDeleteBuilder : public TransactionBuilderBase<AccountDeleteBuilder>
@@ -154,7 +154,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     AccountDeleteBuilder&
@@ -165,7 +165,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountDeleteBuilder&
@@ -176,7 +176,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialIDs (soeOPTIONAL)
+     * @brief Set sfCredentialIDs (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/AccountSet.h b/include/xrpl/protocol_autogen/transactions/AccountSet.h
index c00142bd1e..7ddda45752 100644
--- a/include/xrpl/protocol_autogen/transactions/AccountSet.h
+++ b/include/xrpl/protocol_autogen/transactions/AccountSet.h
@@ -19,9 +19,9 @@ class AccountSetBuilder;
  * @brief Transaction: AccountSet
  *
  * Type: ttACCOUNT_SET (3)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use AccountSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfEmailHash (soeOPTIONAL)
+     * @brief Get sfEmailHash (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfWalletLocator (soeOPTIONAL)
+     * @brief Get sfWalletLocator (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfWalletSize (soeOPTIONAL)
+     * @brief Get sfWalletSize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfMessageKey (soeOPTIONAL)
+     * @brief Get sfMessageKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomain (soeOPTIONAL)
+     * @brief Get sfDomain (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferRate (soeOPTIONAL)
+     * @brief Get sfTransferRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Get sfSetFlag (soeOPTIONAL)
+     * @brief Get sfSetFlag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -230,7 +230,7 @@ public:
     }
 
     /**
-     * @brief Get sfClearFlag (soeOPTIONAL)
+     * @brief Get sfClearFlag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Get sfTickSize (soeOPTIONAL)
+     * @brief Get sfTickSize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -282,7 +282,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenMinter (soeOPTIONAL)
+     * @brief Get sfNFTokenMinter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -312,7 +312,7 @@ public:
  * @brief Builder for AccountSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class AccountSetBuilder : public TransactionBuilderBase<AccountSetBuilder>
@@ -349,7 +349,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfEmailHash (soeOPTIONAL)
+     * @brief Set sfEmailHash (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -360,7 +360,7 @@ public:
     }
 
     /**
-     * @brief Set sfWalletLocator (soeOPTIONAL)
+     * @brief Set sfWalletLocator (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -371,7 +371,7 @@ public:
     }
 
     /**
-     * @brief Set sfWalletSize (soeOPTIONAL)
+     * @brief Set sfWalletSize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -382,7 +382,7 @@ public:
     }
 
     /**
-     * @brief Set sfMessageKey (soeOPTIONAL)
+     * @brief Set sfMessageKey (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -393,7 +393,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomain (soeOPTIONAL)
+     * @brief Set sfDomain (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -404,7 +404,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferRate (soeOPTIONAL)
+     * @brief Set sfTransferRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -415,7 +415,7 @@ public:
     }
 
     /**
-     * @brief Set sfSetFlag (soeOPTIONAL)
+     * @brief Set sfSetFlag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -426,7 +426,7 @@ public:
     }
 
     /**
-     * @brief Set sfClearFlag (soeOPTIONAL)
+     * @brief Set sfClearFlag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -437,7 +437,7 @@ public:
     }
 
     /**
-     * @brief Set sfTickSize (soeOPTIONAL)
+     * @brief Set sfTickSize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
@@ -448,7 +448,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenMinter (soeOPTIONAL)
+     * @brief Set sfNFTokenMinter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     AccountSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/Batch.h b/include/xrpl/protocol_autogen/transactions/Batch.h
index 0bb638435c..55b99d0eef 100644
--- a/include/xrpl/protocol_autogen/transactions/Batch.h
+++ b/include/xrpl/protocol_autogen/transactions/Batch.h
@@ -19,9 +19,9 @@ class BatchBuilder;
  * @brief Transaction: Batch
  *
  * Type: ttBATCH (71)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureBatch
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use BatchBuilder to construct new transactions.
@@ -47,7 +47,7 @@ public:
 
     // Transaction-specific field getters
     /**
-     * @brief Get sfRawTransactions (soeREQUIRED)
+     * @brief Get sfRawTransactions (SoeRequired)
      * @note This is an untyped field.
      * @return The field value.
      */
@@ -58,7 +58,7 @@ public:
         return this->tx_->getFieldArray(sfRawTransactions);
     }
     /**
-     * @brief Get sfBatchSigners (soeOPTIONAL)
+     * @brief Get sfBatchSigners (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -87,7 +87,7 @@ public:
  * @brief Builder for Batch transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class BatchBuilder : public TransactionBuilderBase<BatchBuilder>
@@ -126,7 +126,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfRawTransactions (soeREQUIRED)
+     * @brief Set sfRawTransactions (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     BatchBuilder&
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Set sfBatchSigners (soeOPTIONAL)
+     * @brief Set sfBatchSigners (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     BatchBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCancel.h b/include/xrpl/protocol_autogen/transactions/CheckCancel.h
index 2409e7064c..4f7534278b 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCancel.h
@@ -19,9 +19,9 @@ class CheckCancelBuilder;
  * @brief Transaction: CheckCancel
  *
  * Type: ttCHECK_CANCEL (18)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCancelBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfCheckID (soeREQUIRED)
+     * @brief Get sfCheckID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for CheckCancel transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CheckCancelBuilder : public TransactionBuilderBase<CheckCancelBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfCheckID (soeREQUIRED)
+     * @brief Set sfCheckID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckCancelBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCash.h b/include/xrpl/protocol_autogen/transactions/CheckCash.h
index 34dc91c61b..a58a20c57e 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCash.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCash.h
@@ -19,9 +19,9 @@ class CheckCashBuilder;
  * @brief Transaction: CheckCash
  *
  * Type: ttCHECK_CASH (17)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: mayCreateMPT
+ * Privileges: MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCashBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfCheckID (soeREQUIRED)
+     * @brief Get sfCheckID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -86,7 +86,7 @@ public:
     }
 
     /**
-     * @brief Get sfDeliverMin (soeOPTIONAL)
+     * @brief Get sfDeliverMin (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -117,7 +117,7 @@ public:
  * @brief Builder for CheckCash transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CheckCashBuilder : public TransactionBuilderBase<CheckCashBuilder>
@@ -156,7 +156,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfCheckID (soeREQUIRED)
+     * @brief Set sfCheckID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckCashBuilder&
@@ -167,7 +167,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -179,7 +179,7 @@ public:
     }
 
     /**
-     * @brief Set sfDeliverMin (soeOPTIONAL)
+     * @brief Set sfDeliverMin (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/CheckCreate.h b/include/xrpl/protocol_autogen/transactions/CheckCreate.h
index f5e2ad23a9..17f985ac63 100644
--- a/include/xrpl/protocol_autogen/transactions/CheckCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/CheckCreate.h
@@ -19,9 +19,9 @@ class CheckCreateBuilder;
  * @brief Transaction: CheckCreate
  *
  * Type: ttCHECK_CREATE (16)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CheckCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfSendMax (soeREQUIRED)
+     * @brief Get sfSendMax (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -97,7 +97,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
     }
 
     /**
-     * @brief Get sfInvoiceID (soeOPTIONAL)
+     * @brief Get sfInvoiceID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -153,7 +153,7 @@ public:
  * @brief Builder for CheckCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CheckCreateBuilder : public TransactionBuilderBase<CheckCreateBuilder>
@@ -194,7 +194,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CheckCreateBuilder&
@@ -205,7 +205,7 @@ public:
     }
 
     /**
-     * @brief Set sfSendMax (soeREQUIRED)
+     * @brief Set sfSendMax (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckCreateBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckCreateBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfInvoiceID (soeOPTIONAL)
+     * @brief Set sfInvoiceID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CheckCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/Clawback.h b/include/xrpl/protocol_autogen/transactions/Clawback.h
index 6c34ceff11..bbf1c411f3 100644
--- a/include/xrpl/protocol_autogen/transactions/Clawback.h
+++ b/include/xrpl/protocol_autogen/transactions/Clawback.h
@@ -19,9 +19,9 @@ class ClawbackBuilder;
  * @brief Transaction: Clawback
  *
  * Type: ttCLAWBACK (30)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureClawback
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use ClawbackBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfHolder (soeOPTIONAL)
+     * @brief Get sfHolder (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -90,7 +90,7 @@ public:
  * @brief Builder for Clawback transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class ClawbackBuilder : public TransactionBuilderBase<ClawbackBuilder>
@@ -129,7 +129,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -141,7 +141,7 @@ public:
     }
 
     /**
-     * @brief Set sfHolder (soeOPTIONAL)
+     * @brief Set sfHolder (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     ClawbackBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialAccept.h b/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
index c739e4abcb..152c18ea09 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialAccept.h
@@ -19,9 +19,9 @@ class CredentialAcceptBuilder;
  * @brief Transaction: CredentialAccept
  *
  * Type: ttCREDENTIAL_ACCEPT (59)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialAcceptBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfIssuer (soeREQUIRED)
+     * @brief Get sfIssuer (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialType (soeREQUIRED)
+     * @brief Get sfCredentialType (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
  * @brief Builder for CredentialAccept transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CredentialAcceptBuilder : public TransactionBuilderBase<CredentialAcceptBuilder>
@@ -115,7 +115,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfIssuer (soeREQUIRED)
+     * @brief Set sfIssuer (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialAcceptBuilder&
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialType (soeREQUIRED)
+     * @brief Set sfCredentialType (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialAcceptBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialCreate.h b/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
index 4da5b3ff47..d7e056f590 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialCreate.h
@@ -19,9 +19,9 @@ class CredentialCreateBuilder;
  * @brief Transaction: CredentialCreate
  *
  * Type: ttCREDENTIAL_CREATE (58)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfSubject (soeREQUIRED)
+     * @brief Get sfSubject (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialType (soeREQUIRED)
+     * @brief Get sfCredentialType (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -96,7 +96,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
  * @brief Builder for CredentialCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CredentialCreateBuilder : public TransactionBuilderBase<CredentialCreateBuilder>
@@ -167,7 +167,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfSubject (soeREQUIRED)
+     * @brief Set sfSubject (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialCreateBuilder&
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialType (soeREQUIRED)
+     * @brief Set sfCredentialType (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialCreateBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialCreateBuilder&
@@ -200,7 +200,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/CredentialDelete.h b/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
index bd840ed104..512f230a26 100644
--- a/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/CredentialDelete.h
@@ -19,9 +19,9 @@ class CredentialDeleteBuilder;
  * @brief Transaction: CredentialDelete
  *
  * Type: ttCREDENTIAL_DELETE (60)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureCredentials
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use CredentialDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfSubject (soeOPTIONAL)
+     * @brief Get sfSubject (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfIssuer (soeOPTIONAL)
+     * @brief Get sfIssuer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialType (soeREQUIRED)
+     * @brief Get sfCredentialType (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
  * @brief Builder for CredentialDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class CredentialDeleteBuilder : public TransactionBuilderBase<CredentialDeleteBuilder>
@@ -154,7 +154,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfSubject (soeOPTIONAL)
+     * @brief Set sfSubject (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialDeleteBuilder&
@@ -165,7 +165,7 @@ public:
     }
 
     /**
-     * @brief Set sfIssuer (soeOPTIONAL)
+     * @brief Set sfIssuer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     CredentialDeleteBuilder&
@@ -176,7 +176,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialType (soeREQUIRED)
+     * @brief Set sfCredentialType (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     CredentialDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/DIDDelete.h b/include/xrpl/protocol_autogen/transactions/DIDDelete.h
index c4e61eb19e..5f90821bfd 100644
--- a/include/xrpl/protocol_autogen/transactions/DIDDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/DIDDelete.h
@@ -19,9 +19,9 @@ class DIDDeleteBuilder;
  * @brief Transaction: DIDDelete
  *
  * Type: ttDID_DELETE (50)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureDID
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DIDDeleteBuilder to construct new transactions.
@@ -52,7 +52,7 @@ public:
  * @brief Builder for DIDDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class DIDDeleteBuilder : public TransactionBuilderBase<DIDDeleteBuilder>
diff --git a/include/xrpl/protocol_autogen/transactions/DIDSet.h b/include/xrpl/protocol_autogen/transactions/DIDSet.h
index 33313d384c..27242cda71 100644
--- a/include/xrpl/protocol_autogen/transactions/DIDSet.h
+++ b/include/xrpl/protocol_autogen/transactions/DIDSet.h
@@ -19,9 +19,9 @@ class DIDSetBuilder;
  * @brief Transaction: DIDSet
  *
  * Type: ttDID_SET (49)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureDID
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DIDSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDIDDocument (soeOPTIONAL)
+     * @brief Get sfDIDDocument (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -130,7 +130,7 @@ public:
  * @brief Builder for DIDSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class DIDSetBuilder : public TransactionBuilderBase<DIDSetBuilder>
@@ -167,7 +167,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDIDDocument (soeOPTIONAL)
+     * @brief Set sfDIDDocument (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDSetBuilder&
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDSetBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DIDSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/DelegateSet.h b/include/xrpl/protocol_autogen/transactions/DelegateSet.h
index cac4b3abef..1f454ff4a1 100644
--- a/include/xrpl/protocol_autogen/transactions/DelegateSet.h
+++ b/include/xrpl/protocol_autogen/transactions/DelegateSet.h
@@ -19,9 +19,9 @@ class DelegateSetBuilder;
  * @brief Transaction: DelegateSet
  *
  * Type: ttDELEGATE_SET (64)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featurePermissionDelegationV1_1
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DelegateSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAuthorize (soeREQUIRED)
+     * @brief Get sfAuthorize (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -58,7 +58,7 @@ public:
         return this->tx_->at(sfAuthorize);
     }
     /**
-     * @brief Get sfPermissions (soeREQUIRED)
+     * @brief Get sfPermissions (SoeRequired)
      * @note This is an untyped field.
      * @return The field value.
      */
@@ -74,7 +74,7 @@ public:
  * @brief Builder for DelegateSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class DelegateSetBuilder : public TransactionBuilderBase<DelegateSetBuilder>
@@ -115,7 +115,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAuthorize (soeREQUIRED)
+     * @brief Set sfAuthorize (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateSetBuilder&
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Set sfPermissions (soeREQUIRED)
+     * @brief Set sfPermissions (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     DelegateSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/DepositPreauth.h b/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
index eae8b113a9..d303ffbeff 100644
--- a/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
+++ b/include/xrpl/protocol_autogen/transactions/DepositPreauth.h
@@ -19,9 +19,9 @@ class DepositPreauthBuilder;
  * @brief Transaction: DepositPreauth
  *
  * Type: ttDEPOSIT_PREAUTH (19)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use DepositPreauthBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAuthorize (soeOPTIONAL)
+     * @brief Get sfAuthorize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfUnauthorize (soeOPTIONAL)
+     * @brief Get sfUnauthorize (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -99,7 +99,7 @@ public:
         return this->tx_->isFieldPresent(sfUnauthorize);
     }
     /**
-     * @brief Get sfAuthorizeCredentials (soeOPTIONAL)
+     * @brief Get sfAuthorizeCredentials (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -123,7 +123,7 @@ public:
         return this->tx_->isFieldPresent(sfAuthorizeCredentials);
     }
     /**
-     * @brief Get sfUnauthorizeCredentials (soeOPTIONAL)
+     * @brief Get sfUnauthorizeCredentials (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -152,7 +152,7 @@ public:
  * @brief Builder for DepositPreauth transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class DepositPreauthBuilder : public TransactionBuilderBase<DepositPreauthBuilder>
@@ -189,7 +189,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAuthorize (soeOPTIONAL)
+     * @brief Set sfAuthorize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -200,7 +200,7 @@ public:
     }
 
     /**
-     * @brief Set sfUnauthorize (soeOPTIONAL)
+     * @brief Set sfUnauthorize (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -211,7 +211,7 @@ public:
     }
 
     /**
-     * @brief Set sfAuthorizeCredentials (soeOPTIONAL)
+     * @brief Set sfAuthorizeCredentials (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
@@ -222,7 +222,7 @@ public:
     }
 
     /**
-     * @brief Set sfUnauthorizeCredentials (soeOPTIONAL)
+     * @brief Set sfUnauthorizeCredentials (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     DepositPreauthBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/EnableAmendment.h b/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
index 0bf3dfd575..b397c5df87 100644
--- a/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
+++ b/include/xrpl/protocol_autogen/transactions/EnableAmendment.h
@@ -19,9 +19,9 @@ class EnableAmendmentBuilder;
  * @brief Transaction: EnableAmendment
  *
  * Type: ttAMENDMENT (100)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EnableAmendmentBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLedgerSequence (soeREQUIRED)
+     * @brief Get sfLedgerSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmendment (soeREQUIRED)
+     * @brief Get sfAmendment (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
  * @brief Builder for EnableAmendment transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class EnableAmendmentBuilder : public TransactionBuilderBase<EnableAmendmentBuilder>
@@ -115,7 +115,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLedgerSequence (soeREQUIRED)
+     * @brief Set sfLedgerSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EnableAmendmentBuilder&
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmendment (soeREQUIRED)
+     * @brief Set sfAmendment (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EnableAmendmentBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowCancel.h b/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
index a92d5b10ae..4da943c351 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowCancel.h
@@ -19,9 +19,9 @@ class EscrowCancelBuilder;
  * @brief Transaction: EscrowCancel
  *
  * Type: ttESCROW_CANCEL (4)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowCancelBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfOfferSequence (soeREQUIRED)
+     * @brief Get sfOfferSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
  * @brief Builder for EscrowCancel transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class EscrowCancelBuilder : public TransactionBuilderBase<EscrowCancelBuilder>
@@ -115,7 +115,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowCancelBuilder&
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Set sfOfferSequence (soeREQUIRED)
+     * @brief Set sfOfferSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowCancelBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowCreate.h b/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
index 32dae6cc57..35775c31ae 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowCreate.h
@@ -19,9 +19,9 @@ class EscrowCreateBuilder;
  * @brief Transaction: EscrowCreate
  *
  * Type: ttESCROW_CREATE (1)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfCondition (soeOPTIONAL)
+     * @brief Get sfCondition (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -97,7 +97,7 @@ public:
     }
 
     /**
-     * @brief Get sfCancelAfter (soeOPTIONAL)
+     * @brief Get sfCancelAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -123,7 +123,7 @@ public:
     }
 
     /**
-     * @brief Get sfFinishAfter (soeOPTIONAL)
+     * @brief Get sfFinishAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -149,7 +149,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -179,7 +179,7 @@ public:
  * @brief Builder for EscrowCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class EscrowCreateBuilder : public TransactionBuilderBase<EscrowCreateBuilder>
@@ -220,7 +220,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
@@ -231,7 +231,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfCondition (soeOPTIONAL)
+     * @brief Set sfCondition (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfCancelAfter (soeOPTIONAL)
+     * @brief Set sfCancelAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfFinishAfter (soeOPTIONAL)
+     * @brief Set sfFinishAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/EscrowFinish.h b/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
index 20e9a089fb..f6ca73d209 100644
--- a/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
+++ b/include/xrpl/protocol_autogen/transactions/EscrowFinish.h
@@ -19,9 +19,9 @@ class EscrowFinishBuilder;
  * @brief Transaction: EscrowFinish
  *
  * Type: ttESCROW_FINISH (2)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use EscrowFinishBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfOwner (soeREQUIRED)
+     * @brief Get sfOwner (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfOfferSequence (soeREQUIRED)
+     * @brief Get sfOfferSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfFulfillment (soeOPTIONAL)
+     * @brief Get sfFulfillment (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -96,7 +96,7 @@ public:
     }
 
     /**
-     * @brief Get sfCondition (soeOPTIONAL)
+     * @brief Get sfCondition (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -122,7 +122,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialIDs (soeOPTIONAL)
+     * @brief Get sfCredentialIDs (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
  * @brief Builder for EscrowFinish transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class EscrowFinishBuilder : public TransactionBuilderBase<EscrowFinishBuilder>
@@ -193,7 +193,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfOwner (soeREQUIRED)
+     * @brief Set sfOwner (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowFinishBuilder&
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Set sfOfferSequence (soeREQUIRED)
+     * @brief Set sfOfferSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     EscrowFinishBuilder&
@@ -215,7 +215,7 @@ public:
     }
 
     /**
-     * @brief Set sfFulfillment (soeOPTIONAL)
+     * @brief Set sfFulfillment (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowFinishBuilder&
@@ -226,7 +226,7 @@ public:
     }
 
     /**
-     * @brief Set sfCondition (soeOPTIONAL)
+     * @brief Set sfCondition (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowFinishBuilder&
@@ -237,7 +237,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialIDs (soeOPTIONAL)
+     * @brief Set sfCredentialIDs (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     EscrowFinishBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h b/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
index 6f60b81a04..3c58815a02 100644
--- a/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
+++ b/include/xrpl/protocol_autogen/transactions/LedgerStateFix.h
@@ -19,9 +19,9 @@ class LedgerStateFixBuilder;
  * @brief Transaction: LedgerStateFix
  *
  * Type: ttLEDGER_STATE_FIX (53)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: fixNFTokenPageLinks
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LedgerStateFixBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLedgerFixType (soeREQUIRED)
+     * @brief Get sfLedgerFixType (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -89,7 +89,7 @@ public:
  * @brief Builder for LedgerStateFix transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LedgerStateFixBuilder : public TransactionBuilderBase<LedgerStateFixBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLedgerFixType (soeREQUIRED)
+     * @brief Set sfLedgerFixType (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LedgerStateFixBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LedgerStateFixBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
index d8a9d9d52a..4842381362 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverClawback.h
@@ -19,9 +19,9 @@ class LoanBrokerCoverClawbackBuilder;
  * @brief Transaction: LoanBrokerCoverClawback
  *
  * Type: ttLOAN_BROKER_COVER_CLAWBACK (78)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverClawbackBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanBrokerID (soeOPTIONAL)
+     * @brief Get sfLoanBrokerID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -105,7 +105,7 @@ public:
  * @brief Builder for LoanBrokerCoverClawback transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanBrokerCoverClawbackBuilder : public TransactionBuilderBase<LoanBrokerCoverClawbackBuilder>
@@ -142,7 +142,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanBrokerID (soeOPTIONAL)
+     * @brief Set sfLoanBrokerID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerCoverClawbackBuilder&
@@ -153,7 +153,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
index baa567a7ac..98cebdccb2 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverDeposit.h
@@ -19,9 +19,9 @@ class LoanBrokerCoverDepositBuilder;
  * @brief Transaction: LoanBrokerCoverDeposit
  *
  * Type: ttLOAN_BROKER_COVER_DEPOSIT (76)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverDepositBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanBrokerID (soeREQUIRED)
+     * @brief Get sfLoanBrokerID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -75,7 +75,7 @@ public:
  * @brief Builder for LoanBrokerCoverDeposit transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanBrokerCoverDepositBuilder : public TransactionBuilderBase<LoanBrokerCoverDepositBuilder>
@@ -116,7 +116,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanBrokerID (soeREQUIRED)
+     * @brief Set sfLoanBrokerID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerCoverDepositBuilder&
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
index 3690b6a40a..e734c6802a 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerCoverWithdraw.h
@@ -19,9 +19,9 @@ class LoanBrokerCoverWithdrawBuilder;
  * @brief Transaction: LoanBrokerCoverWithdraw
  *
  * Type: ttLOAN_BROKER_COVER_WITHDRAW (77)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: mayAuthorizeMPT
+ * Privileges: MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerCoverWithdrawBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanBrokerID (soeREQUIRED)
+     * @brief Get sfLoanBrokerID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -97,7 +97,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
  * @brief Builder for LoanBrokerCoverWithdraw transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanBrokerCoverWithdrawBuilder : public TransactionBuilderBase<LoanBrokerCoverWithdrawBuilder>
@@ -168,7 +168,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanBrokerID (soeREQUIRED)
+     * @brief Set sfLoanBrokerID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerCoverWithdrawBuilder&
@@ -179,7 +179,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -191,7 +191,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerCoverWithdrawBuilder&
@@ -202,7 +202,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerCoverWithdrawBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
index 2c174ae500..55c0a12381 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerDelete.h
@@ -19,9 +19,9 @@ class LoanBrokerDeleteBuilder;
  * @brief Transaction: LoanBrokerDelete
  *
  * Type: ttLOAN_BROKER_DELETE (75)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: mustDeleteAcct | mayAuthorizeMPT
+ * Privileges: MustDeleteAcct | MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanBrokerID (soeREQUIRED)
+     * @brief Get sfLoanBrokerID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for LoanBrokerDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanBrokerDeleteBuilder : public TransactionBuilderBase<LoanBrokerDeleteBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanBrokerID (soeREQUIRED)
+     * @brief Set sfLoanBrokerID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h b/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
index ba6ca06266..854022242d 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanBrokerSet.h
@@ -19,9 +19,9 @@ class LoanBrokerSetBuilder;
  * @brief Transaction: LoanBrokerSet
  *
  * Type: ttLOAN_BROKER_SET (74)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: createPseudoAcct | mayAuthorizeMPT
+ * Privileges: CreatePseudoAcct | MayAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanBrokerSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanBrokerID (soeOPTIONAL)
+     * @brief Get sfLoanBrokerID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfManagementFeeRate (soeOPTIONAL)
+     * @brief Get sfManagementFeeRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Get sfDebtMaximum (soeOPTIONAL)
+     * @brief Get sfDebtMaximum (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Get sfCoverRateMinimum (soeOPTIONAL)
+     * @brief Get sfCoverRateMinimum (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Get sfCoverRateLiquidation (soeOPTIONAL)
+     * @brief Get sfCoverRateLiquidation (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -219,7 +219,7 @@ public:
  * @brief Builder for LoanBrokerSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanBrokerSetBuilder : public TransactionBuilderBase<LoanBrokerSetBuilder>
@@ -258,7 +258,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -269,7 +269,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanBrokerID (soeOPTIONAL)
+     * @brief Set sfLoanBrokerID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -280,7 +280,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -291,7 +291,7 @@ public:
     }
 
     /**
-     * @brief Set sfManagementFeeRate (soeOPTIONAL)
+     * @brief Set sfManagementFeeRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -302,7 +302,7 @@ public:
     }
 
     /**
-     * @brief Set sfDebtMaximum (soeOPTIONAL)
+     * @brief Set sfDebtMaximum (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -313,7 +313,7 @@ public:
     }
 
     /**
-     * @brief Set sfCoverRateMinimum (soeOPTIONAL)
+     * @brief Set sfCoverRateMinimum (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
@@ -324,7 +324,7 @@ public:
     }
 
     /**
-     * @brief Set sfCoverRateLiquidation (soeOPTIONAL)
+     * @brief Set sfCoverRateLiquidation (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanBrokerSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanDelete.h b/include/xrpl/protocol_autogen/transactions/LoanDelete.h
index df1b49d17e..70c9e50097 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanDelete.h
@@ -19,9 +19,9 @@ class LoanDeleteBuilder;
  * @brief Transaction: LoanDelete
  *
  * Type: ttLOAN_DELETE (81)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanID (soeREQUIRED)
+     * @brief Get sfLoanID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for LoanDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanDeleteBuilder : public TransactionBuilderBase<LoanDeleteBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanID (soeREQUIRED)
+     * @brief Set sfLoanID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanManage.h b/include/xrpl/protocol_autogen/transactions/LoanManage.h
index 3da31e4487..f11782c4e1 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanManage.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanManage.h
@@ -19,9 +19,9 @@ class LoanManageBuilder;
  * @brief Transaction: LoanManage
  *
  * Type: ttLOAN_MANAGE (82)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: mayModifyVault
+ * Privileges: MayModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanManageBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanID (soeREQUIRED)
+     * @brief Get sfLoanID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for LoanManage transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanManageBuilder : public TransactionBuilderBase<LoanManageBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanID (soeREQUIRED)
+     * @brief Set sfLoanID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanManageBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/LoanPay.h b/include/xrpl/protocol_autogen/transactions/LoanPay.h
index e0b4376e18..4012225e17 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanPay.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanPay.h
@@ -19,9 +19,9 @@ class LoanPayBuilder;
  * @brief Transaction: LoanPay
  *
  * Type: ttLOAN_PAY (84)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: mayAuthorizeMPT | mustModifyVault
+ * Privileges: MayAuthorizeMpt | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanPayBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanID (soeREQUIRED)
+     * @brief Get sfLoanID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -75,7 +75,7 @@ public:
  * @brief Builder for LoanPay transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanPayBuilder : public TransactionBuilderBase<LoanPayBuilder>
@@ -116,7 +116,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanID (soeREQUIRED)
+     * @brief Set sfLoanID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanPayBuilder&
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/LoanSet.h b/include/xrpl/protocol_autogen/transactions/LoanSet.h
index 7d6181f517..3fa3c905c2 100644
--- a/include/xrpl/protocol_autogen/transactions/LoanSet.h
+++ b/include/xrpl/protocol_autogen/transactions/LoanSet.h
@@ -19,9 +19,9 @@ class LoanSetBuilder;
  * @brief Transaction: LoanSet
  *
  * Type: ttLOAN_SET (80)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureLendingProtocol
- * Privileges: mayAuthorizeMPT | mustModifyVault
+ * Privileges: MayAuthorizeMpt | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use LoanSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLoanBrokerID (soeREQUIRED)
+     * @brief Get sfLoanBrokerID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfCounterparty (soeOPTIONAL)
+     * @brief Get sfCounterparty (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -110,7 +110,7 @@ public:
         return this->tx_->isFieldPresent(sfCounterparty);
     }
     /**
-     * @brief Get sfCounterpartySignature (soeOPTIONAL)
+     * @brief Get sfCounterpartySignature (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -135,7 +135,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanOriginationFee (soeOPTIONAL)
+     * @brief Get sfLoanOriginationFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -161,7 +161,7 @@ public:
     }
 
     /**
-     * @brief Get sfLoanServiceFee (soeOPTIONAL)
+     * @brief Get sfLoanServiceFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -187,7 +187,7 @@ public:
     }
 
     /**
-     * @brief Get sfLatePaymentFee (soeOPTIONAL)
+     * @brief Get sfLatePaymentFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -213,7 +213,7 @@ public:
     }
 
     /**
-     * @brief Get sfClosePaymentFee (soeOPTIONAL)
+     * @brief Get sfClosePaymentFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Get sfOverpaymentFee (soeOPTIONAL)
+     * @brief Get sfOverpaymentFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Get sfInterestRate (soeOPTIONAL)
+     * @brief Get sfInterestRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -291,7 +291,7 @@ public:
     }
 
     /**
-     * @brief Get sfLateInterestRate (soeOPTIONAL)
+     * @brief Get sfLateInterestRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -317,7 +317,7 @@ public:
     }
 
     /**
-     * @brief Get sfCloseInterestRate (soeOPTIONAL)
+     * @brief Get sfCloseInterestRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -343,7 +343,7 @@ public:
     }
 
     /**
-     * @brief Get sfOverpaymentInterestRate (soeOPTIONAL)
+     * @brief Get sfOverpaymentInterestRate (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -369,7 +369,7 @@ public:
     }
 
     /**
-     * @brief Get sfPrincipalRequested (soeREQUIRED)
+     * @brief Get sfPrincipalRequested (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -380,7 +380,7 @@ public:
     }
 
     /**
-     * @brief Get sfPaymentTotal (soeOPTIONAL)
+     * @brief Get sfPaymentTotal (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -406,7 +406,7 @@ public:
     }
 
     /**
-     * @brief Get sfPaymentInterval (soeOPTIONAL)
+     * @brief Get sfPaymentInterval (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -432,7 +432,7 @@ public:
     }
 
     /**
-     * @brief Get sfGracePeriod (soeOPTIONAL)
+     * @brief Get sfGracePeriod (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -462,7 +462,7 @@ public:
  * @brief Builder for LoanSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class LoanSetBuilder : public TransactionBuilderBase<LoanSetBuilder>
@@ -503,7 +503,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLoanBrokerID (soeREQUIRED)
+     * @brief Set sfLoanBrokerID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -514,7 +514,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -525,7 +525,7 @@ public:
     }
 
     /**
-     * @brief Set sfCounterparty (soeOPTIONAL)
+     * @brief Set sfCounterparty (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -536,7 +536,7 @@ public:
     }
 
     /**
-     * @brief Set sfCounterpartySignature (soeOPTIONAL)
+     * @brief Set sfCounterpartySignature (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -547,7 +547,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanOriginationFee (soeOPTIONAL)
+     * @brief Set sfLoanOriginationFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -558,7 +558,7 @@ public:
     }
 
     /**
-     * @brief Set sfLoanServiceFee (soeOPTIONAL)
+     * @brief Set sfLoanServiceFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -569,7 +569,7 @@ public:
     }
 
     /**
-     * @brief Set sfLatePaymentFee (soeOPTIONAL)
+     * @brief Set sfLatePaymentFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -580,7 +580,7 @@ public:
     }
 
     /**
-     * @brief Set sfClosePaymentFee (soeOPTIONAL)
+     * @brief Set sfClosePaymentFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -591,7 +591,7 @@ public:
     }
 
     /**
-     * @brief Set sfOverpaymentFee (soeOPTIONAL)
+     * @brief Set sfOverpaymentFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -602,7 +602,7 @@ public:
     }
 
     /**
-     * @brief Set sfInterestRate (soeOPTIONAL)
+     * @brief Set sfInterestRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -613,7 +613,7 @@ public:
     }
 
     /**
-     * @brief Set sfLateInterestRate (soeOPTIONAL)
+     * @brief Set sfLateInterestRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -624,7 +624,7 @@ public:
     }
 
     /**
-     * @brief Set sfCloseInterestRate (soeOPTIONAL)
+     * @brief Set sfCloseInterestRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -635,7 +635,7 @@ public:
     }
 
     /**
-     * @brief Set sfOverpaymentInterestRate (soeOPTIONAL)
+     * @brief Set sfOverpaymentInterestRate (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -646,7 +646,7 @@ public:
     }
 
     /**
-     * @brief Set sfPrincipalRequested (soeREQUIRED)
+     * @brief Set sfPrincipalRequested (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -657,7 +657,7 @@ public:
     }
 
     /**
-     * @brief Set sfPaymentTotal (soeOPTIONAL)
+     * @brief Set sfPaymentTotal (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -668,7 +668,7 @@ public:
     }
 
     /**
-     * @brief Set sfPaymentInterval (soeOPTIONAL)
+     * @brief Set sfPaymentInterval (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
@@ -679,7 +679,7 @@ public:
     }
 
     /**
-     * @brief Set sfGracePeriod (soeOPTIONAL)
+     * @brief Set sfGracePeriod (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     LoanSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h b/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
index a4641f5dc0..90440c41f9 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenAuthorize.h
@@ -19,9 +19,9 @@ class MPTokenAuthorizeBuilder;
  * @brief Transaction: MPTokenAuthorize
  *
  * Type: ttMPTOKEN_AUTHORIZE (57)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: mustAuthorizeMPT
+ * Privileges: MustAuthorizeMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenAuthorizeBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Get sfMPTokenIssuanceID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfHolder (soeOPTIONAL)
+     * @brief Get sfHolder (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -89,7 +89,7 @@ public:
  * @brief Builder for MPTokenAuthorize transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class MPTokenAuthorizeBuilder : public TransactionBuilderBase<MPTokenAuthorizeBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Set sfMPTokenIssuanceID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenAuthorizeBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfHolder (soeOPTIONAL)
+     * @brief Set sfHolder (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenAuthorizeBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
index 6f5c50fc4a..d723a3041c 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceCreate.h
@@ -19,9 +19,9 @@ class MPTokenIssuanceCreateBuilder;
  * @brief Transaction: MPTokenIssuanceCreate
  *
  * Type: ttMPTOKEN_ISSUANCE_CREATE (54)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: createMPTIssuance
+ * Privileges: CreateMptIssuance
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAssetScale (soeOPTIONAL)
+     * @brief Get sfAssetScale (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferFee (soeOPTIONAL)
+     * @brief Get sfTransferFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfMaximumAmount (soeOPTIONAL)
+     * @brief Get sfMaximumAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Get sfMPTokenMetadata (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Get sfMutableFlags (soeOPTIONAL)
+     * @brief Get sfMutableFlags (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -208,7 +208,7 @@ public:
  * @brief Builder for MPTokenIssuanceCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class MPTokenIssuanceCreateBuilder : public TransactionBuilderBase<MPTokenIssuanceCreateBuilder>
@@ -245,7 +245,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAssetScale (soeOPTIONAL)
+     * @brief Set sfAssetScale (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
@@ -256,7 +256,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferFee (soeOPTIONAL)
+     * @brief Set sfTransferFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
@@ -267,7 +267,7 @@ public:
     }
 
     /**
-     * @brief Set sfMaximumAmount (soeOPTIONAL)
+     * @brief Set sfMaximumAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
@@ -278,7 +278,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Set sfMPTokenMetadata (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
@@ -289,7 +289,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
@@ -300,7 +300,7 @@ public:
     }
 
     /**
-     * @brief Set sfMutableFlags (soeOPTIONAL)
+     * @brief Set sfMutableFlags (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
index 28d2e49971..19c4530792 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceDestroy.h
@@ -19,9 +19,9 @@ class MPTokenIssuanceDestroyBuilder;
  * @brief Transaction: MPTokenIssuanceDestroy
  *
  * Type: ttMPTOKEN_ISSUANCE_DESTROY (55)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: destroyMPTIssuance
+ * Privileges: DestroyMptIssuance
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceDestroyBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Get sfMPTokenIssuanceID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for MPTokenIssuanceDestroy transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class MPTokenIssuanceDestroyBuilder : public TransactionBuilderBase<MPTokenIssuanceDestroyBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Set sfMPTokenIssuanceID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceDestroyBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
index 429b252e95..a92521173b 100644
--- a/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
+++ b/include/xrpl/protocol_autogen/transactions/MPTokenIssuanceSet.h
@@ -19,9 +19,9 @@ class MPTokenIssuanceSetBuilder;
  * @brief Transaction: MPTokenIssuanceSet
  *
  * Type: ttMPTOKEN_ISSUANCE_SET (56)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureMPTokensV1
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use MPTokenIssuanceSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Get sfMPTokenIssuanceID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfHolder (soeOPTIONAL)
+     * @brief Get sfHolder (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Get sfMPTokenMetadata (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferFee (soeOPTIONAL)
+     * @brief Get sfTransferFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Get sfMutableFlags (soeOPTIONAL)
+     * @brief Get sfMutableFlags (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -193,7 +193,7 @@ public:
  * @brief Builder for MPTokenIssuanceSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class MPTokenIssuanceSetBuilder : public TransactionBuilderBase<MPTokenIssuanceSetBuilder>
@@ -232,7 +232,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfMPTokenIssuanceID (soeREQUIRED)
+     * @brief Set sfMPTokenIssuanceID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfHolder (soeOPTIONAL)
+     * @brief Set sfHolder (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Set sfMPTokenMetadata (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferFee (soeOPTIONAL)
+     * @brief Set sfTransferFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
@@ -287,7 +287,7 @@ public:
     }
 
     /**
-     * @brief Set sfMutableFlags (soeOPTIONAL)
+     * @brief Set sfMutableFlags (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     MPTokenIssuanceSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
index 53ae614ee4..7627437a52 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenAcceptOffer.h
@@ -19,9 +19,9 @@ class NFTokenAcceptOfferBuilder;
  * @brief Transaction: NFTokenAcceptOffer
  *
  * Type: ttNFTOKEN_ACCEPT_OFFER (29)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenAcceptOfferBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenBuyOffer (soeOPTIONAL)
+     * @brief Get sfNFTokenBuyOffer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenSellOffer (soeOPTIONAL)
+     * @brief Get sfNFTokenSellOffer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfNFTokenBrokerFee (soeOPTIONAL)
+     * @brief Get sfNFTokenBrokerFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -130,7 +130,7 @@ public:
  * @brief Builder for NFTokenAcceptOffer transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenAcceptOfferBuilder : public TransactionBuilderBase<NFTokenAcceptOfferBuilder>
@@ -167,7 +167,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenBuyOffer (soeOPTIONAL)
+     * @brief Set sfNFTokenBuyOffer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenAcceptOfferBuilder&
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenSellOffer (soeOPTIONAL)
+     * @brief Set sfNFTokenSellOffer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenAcceptOfferBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfNFTokenBrokerFee (soeOPTIONAL)
+     * @brief Set sfNFTokenBrokerFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenAcceptOfferBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h b/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
index 123418d00a..9f981b1ec4 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenBurn.h
@@ -19,9 +19,9 @@ class NFTokenBurnBuilder;
  * @brief Transaction: NFTokenBurn
  *
  * Type: ttNFTOKEN_BURN (26)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: changeNFTCounts
+ * Privileges: ChangeNftCounts
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenBurnBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenID (soeREQUIRED)
+     * @brief Get sfNFTokenID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -89,7 +89,7 @@ public:
  * @brief Builder for NFTokenBurn transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenBurnBuilder : public TransactionBuilderBase<NFTokenBurnBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenID (soeREQUIRED)
+     * @brief Set sfNFTokenID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenBurnBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenBurnBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
index 5fbbeca96c..2eca27fc8d 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenCancelOffer.h
@@ -19,9 +19,9 @@ class NFTokenCancelOfferBuilder;
  * @brief Transaction: NFTokenCancelOffer
  *
  * Type: ttNFTOKEN_CANCEL_OFFER (28)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenCancelOfferBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenOffers (soeREQUIRED)
+     * @brief Get sfNFTokenOffers (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for NFTokenCancelOffer transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenCancelOfferBuilder : public TransactionBuilderBase<NFTokenCancelOfferBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenOffers (soeREQUIRED)
+     * @brief Set sfNFTokenOffers (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCancelOfferBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h b/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
index e820272f83..a5c6e226d9 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenCreateOffer.h
@@ -19,9 +19,9 @@ class NFTokenCreateOfferBuilder;
  * @brief Transaction: NFTokenCreateOffer
  *
  * Type: ttNFTOKEN_CREATE_OFFER (27)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenCreateOfferBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenID (soeREQUIRED)
+     * @brief Get sfNFTokenID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -96,7 +96,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -122,7 +122,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
  * @brief Builder for NFTokenCreateOffer transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenCreateOfferBuilder : public TransactionBuilderBase<NFTokenCreateOfferBuilder>
@@ -193,7 +193,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenID (soeREQUIRED)
+     * @brief Set sfNFTokenID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCreateOfferBuilder&
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCreateOfferBuilder&
@@ -215,7 +215,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCreateOfferBuilder&
@@ -226,7 +226,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCreateOfferBuilder&
@@ -237,7 +237,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenCreateOfferBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenMint.h b/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
index 9854147570..ad68f1a18b 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenMint.h
@@ -19,9 +19,9 @@ class NFTokenMintBuilder;
  * @brief Transaction: NFTokenMint
  *
  * Type: ttNFTOKEN_MINT (25)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: changeNFTCounts
+ * Privileges: ChangeNftCounts
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenMintBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenTaxon (soeREQUIRED)
+     * @brief Get sfNFTokenTaxon (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfTransferFee (soeOPTIONAL)
+     * @brief Get sfTransferFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfIssuer (soeOPTIONAL)
+     * @brief Get sfIssuer (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -219,7 +219,7 @@ public:
  * @brief Builder for NFTokenMint transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenMintBuilder : public TransactionBuilderBase<NFTokenMintBuilder>
@@ -258,7 +258,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenTaxon (soeREQUIRED)
+     * @brief Set sfNFTokenTaxon (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -269,7 +269,7 @@ public:
     }
 
     /**
-     * @brief Set sfTransferFee (soeOPTIONAL)
+     * @brief Set sfTransferFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -280,7 +280,7 @@ public:
     }
 
     /**
-     * @brief Set sfIssuer (soeOPTIONAL)
+     * @brief Set sfIssuer (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -291,7 +291,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -302,7 +302,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -313,7 +313,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
@@ -324,7 +324,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenMintBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/NFTokenModify.h b/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
index 6f9b75532c..277146ce78 100644
--- a/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
+++ b/include/xrpl/protocol_autogen/transactions/NFTokenModify.h
@@ -19,9 +19,9 @@ class NFTokenModifyBuilder;
  * @brief Transaction: NFTokenModify
  *
  * Type: ttNFTOKEN_MODIFY (61)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureDynamicNFT
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use NFTokenModifyBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfNFTokenID (soeREQUIRED)
+     * @brief Get sfNFTokenID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfOwner (soeOPTIONAL)
+     * @brief Get sfOwner (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
  * @brief Builder for NFTokenModify transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class NFTokenModifyBuilder : public TransactionBuilderBase<NFTokenModifyBuilder>
@@ -154,7 +154,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfNFTokenID (soeREQUIRED)
+     * @brief Set sfNFTokenID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     NFTokenModifyBuilder&
@@ -165,7 +165,7 @@ public:
     }
 
     /**
-     * @brief Set sfOwner (soeOPTIONAL)
+     * @brief Set sfOwner (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenModifyBuilder&
@@ -176,7 +176,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     NFTokenModifyBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/OfferCancel.h b/include/xrpl/protocol_autogen/transactions/OfferCancel.h
index ed2c761c0e..833924f683 100644
--- a/include/xrpl/protocol_autogen/transactions/OfferCancel.h
+++ b/include/xrpl/protocol_autogen/transactions/OfferCancel.h
@@ -19,9 +19,9 @@ class OfferCancelBuilder;
  * @brief Transaction: OfferCancel
  *
  * Type: ttOFFER_CANCEL (8)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OfferCancelBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfOfferSequence (soeREQUIRED)
+     * @brief Get sfOfferSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for OfferCancel transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class OfferCancelBuilder : public TransactionBuilderBase<OfferCancelBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfOfferSequence (soeREQUIRED)
+     * @brief Set sfOfferSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OfferCancelBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/OfferCreate.h b/include/xrpl/protocol_autogen/transactions/OfferCreate.h
index 2735eb85f7..13e868643f 100644
--- a/include/xrpl/protocol_autogen/transactions/OfferCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/OfferCreate.h
@@ -19,9 +19,9 @@ class OfferCreateBuilder;
  * @brief Transaction: OfferCreate
  *
  * Type: ttOFFER_CREATE (7)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: mayCreateMPT
+ * Privileges: MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OfferCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfTakerPays (soeREQUIRED)
+     * @brief Get sfTakerPays (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfTakerGets (soeREQUIRED)
+     * @brief Get sfTakerGets (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -72,7 +72,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -98,7 +98,7 @@ public:
     }
 
     /**
-     * @brief Get sfOfferSequence (soeOPTIONAL)
+     * @brief Get sfOfferSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -124,7 +124,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -154,7 +154,7 @@ public:
  * @brief Builder for OfferCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class OfferCreateBuilder : public TransactionBuilderBase<OfferCreateBuilder>
@@ -195,7 +195,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfTakerPays (soeREQUIRED)
+     * @brief Set sfTakerPays (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -207,7 +207,7 @@ public:
     }
 
     /**
-     * @brief Set sfTakerGets (soeREQUIRED)
+     * @brief Set sfTakerGets (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -219,7 +219,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferCreateBuilder&
@@ -230,7 +230,7 @@ public:
     }
 
     /**
-     * @brief Set sfOfferSequence (soeOPTIONAL)
+     * @brief Set sfOfferSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferCreateBuilder&
@@ -241,7 +241,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OfferCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/OracleDelete.h b/include/xrpl/protocol_autogen/transactions/OracleDelete.h
index 6cafd2b6de..d6d46d1d7a 100644
--- a/include/xrpl/protocol_autogen/transactions/OracleDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/OracleDelete.h
@@ -19,9 +19,9 @@ class OracleDeleteBuilder;
  * @brief Transaction: OracleDelete
  *
  * Type: ttORACLE_DELETE (52)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featurePriceOracle
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OracleDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfOracleDocumentID (soeREQUIRED)
+     * @brief Get sfOracleDocumentID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for OracleDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class OracleDeleteBuilder : public TransactionBuilderBase<OracleDeleteBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfOracleDocumentID (soeREQUIRED)
+     * @brief Set sfOracleDocumentID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/OracleSet.h b/include/xrpl/protocol_autogen/transactions/OracleSet.h
index 8dd0d88865..1d295b4cc2 100644
--- a/include/xrpl/protocol_autogen/transactions/OracleSet.h
+++ b/include/xrpl/protocol_autogen/transactions/OracleSet.h
@@ -19,9 +19,9 @@ class OracleSetBuilder;
  * @brief Transaction: OracleSet
  *
  * Type: ttORACLE_SET (51)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featurePriceOracle
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use OracleSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfOracleDocumentID (soeREQUIRED)
+     * @brief Get sfOracleDocumentID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfProvider (soeOPTIONAL)
+     * @brief Get sfProvider (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfURI (soeOPTIONAL)
+     * @brief Get sfURI (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetClass (soeOPTIONAL)
+     * @brief Get sfAssetClass (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Get sfLastUpdateTime (soeREQUIRED)
+     * @brief Get sfLastUpdateTime (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
         return this->tx_->at(sfLastUpdateTime);
     }
     /**
-     * @brief Get sfPriceDataSeries (soeREQUIRED)
+     * @brief Get sfPriceDataSeries (SoeRequired)
      * @note This is an untyped field.
      * @return The field value.
      */
@@ -163,7 +163,7 @@ public:
  * @brief Builder for OracleSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class OracleSetBuilder : public TransactionBuilderBase<OracleSetBuilder>
@@ -206,7 +206,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfOracleDocumentID (soeREQUIRED)
+     * @brief Set sfOracleDocumentID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
@@ -217,7 +217,7 @@ public:
     }
 
     /**
-     * @brief Set sfProvider (soeOPTIONAL)
+     * @brief Set sfProvider (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
@@ -228,7 +228,7 @@ public:
     }
 
     /**
-     * @brief Set sfURI (soeOPTIONAL)
+     * @brief Set sfURI (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
@@ -239,7 +239,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetClass (soeOPTIONAL)
+     * @brief Set sfAssetClass (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
@@ -250,7 +250,7 @@ public:
     }
 
     /**
-     * @brief Set sfLastUpdateTime (soeREQUIRED)
+     * @brief Set sfLastUpdateTime (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
@@ -261,7 +261,7 @@ public:
     }
 
     /**
-     * @brief Set sfPriceDataSeries (soeREQUIRED)
+     * @brief Set sfPriceDataSeries (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     OracleSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/Payment.h b/include/xrpl/protocol_autogen/transactions/Payment.h
index edf496dc6d..b2e82cd6af 100644
--- a/include/xrpl/protocol_autogen/transactions/Payment.h
+++ b/include/xrpl/protocol_autogen/transactions/Payment.h
@@ -19,9 +19,9 @@ class PaymentBuilder;
  * @brief Transaction: Payment
  *
  * Type: ttPAYMENT (0)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: createAcct | mayCreateMPT
+ * Privileges: CreateAcct | MayCreateMpt
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfSendMax (soeOPTIONAL)
+     * @brief Get sfSendMax (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -97,7 +97,7 @@ public:
         return this->tx_->isFieldPresent(sfSendMax);
     }
     /**
-     * @brief Get sfPaths (soeDEFAULT)
+     * @brief Get sfPaths (SoeDefault)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -122,7 +122,7 @@ public:
     }
 
     /**
-     * @brief Get sfInvoiceID (soeOPTIONAL)
+     * @brief Get sfInvoiceID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -148,7 +148,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -174,7 +174,7 @@ public:
     }
 
     /**
-     * @brief Get sfDeliverMin (soeOPTIONAL)
+     * @brief Get sfDeliverMin (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -201,7 +201,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialIDs (soeOPTIONAL)
+     * @brief Get sfCredentialIDs (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -227,7 +227,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -257,7 +257,7 @@ public:
  * @brief Builder for Payment transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PaymentBuilder : public TransactionBuilderBase<PaymentBuilder>
@@ -298,7 +298,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
@@ -309,7 +309,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -321,7 +321,7 @@ public:
     }
 
     /**
-     * @brief Set sfSendMax (soeOPTIONAL)
+     * @brief Set sfSendMax (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -333,7 +333,7 @@ public:
     }
 
     /**
-     * @brief Set sfPaths (soeDEFAULT)
+     * @brief Set sfPaths (SoeDefault)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
@@ -344,7 +344,7 @@ public:
     }
 
     /**
-     * @brief Set sfInvoiceID (soeOPTIONAL)
+     * @brief Set sfInvoiceID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
@@ -355,7 +355,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
@@ -366,7 +366,7 @@ public:
     }
 
     /**
-     * @brief Set sfDeliverMin (soeOPTIONAL)
+     * @brief Set sfDeliverMin (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -378,7 +378,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialIDs (soeOPTIONAL)
+     * @brief Set sfCredentialIDs (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
@@ -389,7 +389,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
index 1e90c74aa1..1db3057366 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelClaim.h
@@ -19,9 +19,9 @@ class PaymentChannelClaimBuilder;
  * @brief Transaction: PaymentChannelClaim
  *
  * Type: ttPAYCHAN_CLAIM (15)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelClaimBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfChannel (soeREQUIRED)
+     * @brief Get sfChannel (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfBalance (soeOPTIONAL)
+     * @brief Get sfBalance (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignature (soeOPTIONAL)
+     * @brief Get sfSignature (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Get sfPublicKey (soeOPTIONAL)
+     * @brief Get sfPublicKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Get sfCredentialIDs (soeOPTIONAL)
+     * @brief Get sfCredentialIDs (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -193,7 +193,7 @@ public:
  * @brief Builder for PaymentChannelClaim transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PaymentChannelClaimBuilder : public TransactionBuilderBase<PaymentChannelClaimBuilder>
@@ -232,7 +232,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfChannel (soeREQUIRED)
+     * @brief Set sfChannel (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfBalance (soeOPTIONAL)
+     * @brief Set sfBalance (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignature (soeOPTIONAL)
+     * @brief Set sfSignature (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfPublicKey (soeOPTIONAL)
+     * @brief Set sfPublicKey (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
@@ -287,7 +287,7 @@ public:
     }
 
     /**
-     * @brief Set sfCredentialIDs (soeOPTIONAL)
+     * @brief Set sfCredentialIDs (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelClaimBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
index 4242046114..cf0cbae2aa 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelCreate.h
@@ -19,9 +19,9 @@ class PaymentChannelCreateBuilder;
  * @brief Transaction: PaymentChannelCreate
  *
  * Type: ttPAYCHAN_CREATE (13)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfSettleDelay (soeREQUIRED)
+     * @brief Get sfSettleDelay (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfPublicKey (soeREQUIRED)
+     * @brief Get sfPublicKey (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfCancelAfter (soeOPTIONAL)
+     * @brief Get sfCancelAfter (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -118,7 +118,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -148,7 +148,7 @@ public:
  * @brief Builder for PaymentChannelCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PaymentChannelCreateBuilder : public TransactionBuilderBase<PaymentChannelCreateBuilder>
@@ -193,7 +193,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
@@ -215,7 +215,7 @@ public:
     }
 
     /**
-     * @brief Set sfSettleDelay (soeREQUIRED)
+     * @brief Set sfSettleDelay (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
@@ -226,7 +226,7 @@ public:
     }
 
     /**
-     * @brief Set sfPublicKey (soeREQUIRED)
+     * @brief Set sfPublicKey (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
@@ -237,7 +237,7 @@ public:
     }
 
     /**
-     * @brief Set sfCancelAfter (soeOPTIONAL)
+     * @brief Set sfCancelAfter (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
@@ -248,7 +248,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h b/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
index 2fecf21154..3612fcbf48 100644
--- a/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
+++ b/include/xrpl/protocol_autogen/transactions/PaymentChannelFund.h
@@ -19,9 +19,9 @@ class PaymentChannelFundBuilder;
  * @brief Transaction: PaymentChannelFund
  *
  * Type: ttPAYCHAN_FUND (14)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PaymentChannelFundBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfChannel (soeREQUIRED)
+     * @brief Get sfChannel (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfExpiration (soeOPTIONAL)
+     * @brief Get sfExpiration (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
  * @brief Builder for PaymentChannelFund transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PaymentChannelFundBuilder : public TransactionBuilderBase<PaymentChannelFundBuilder>
@@ -141,7 +141,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfChannel (soeREQUIRED)
+     * @brief Set sfChannel (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelFundBuilder&
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelFundBuilder&
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Set sfExpiration (soeOPTIONAL)
+     * @brief Set sfExpiration (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PaymentChannelFundBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h b/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
index c95e0f2e18..e08ff1ed5a 100644
--- a/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/PermissionedDomainDelete.h
@@ -19,9 +19,9 @@ class PermissionedDomainDeleteBuilder;
  * @brief Transaction: PermissionedDomainDelete
  *
  * Type: ttPERMISSIONED_DOMAIN_DELETE (63)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featurePermissionedDomains
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PermissionedDomainDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDomainID (soeREQUIRED)
+     * @brief Get sfDomainID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for PermissionedDomainDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PermissionedDomainDeleteBuilder : public TransactionBuilderBase<PermissionedDomainDeleteBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDomainID (soeREQUIRED)
+     * @brief Set sfDomainID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h b/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
index 38df7f4fc7..68f1cfebb2 100644
--- a/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
+++ b/include/xrpl/protocol_autogen/transactions/PermissionedDomainSet.h
@@ -19,9 +19,9 @@ class PermissionedDomainSetBuilder;
  * @brief Transaction: PermissionedDomainSet
  *
  * Type: ttPERMISSIONED_DOMAIN_SET (62)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featurePermissionedDomains
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use PermissionedDomainSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -73,7 +73,7 @@ public:
         return this->tx_->isFieldPresent(sfDomainID);
     }
     /**
-     * @brief Get sfAcceptedCredentials (soeREQUIRED)
+     * @brief Get sfAcceptedCredentials (SoeRequired)
      * @note This is an untyped field.
      * @return The field value.
      */
@@ -89,7 +89,7 @@ public:
  * @brief Builder for PermissionedDomainSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class PermissionedDomainSetBuilder : public TransactionBuilderBase<PermissionedDomainSetBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainSetBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfAcceptedCredentials (soeREQUIRED)
+     * @brief Set sfAcceptedCredentials (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     PermissionedDomainSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/SetFee.h b/include/xrpl/protocol_autogen/transactions/SetFee.h
index 7bf73201b9..bc5fc0e603 100644
--- a/include/xrpl/protocol_autogen/transactions/SetFee.h
+++ b/include/xrpl/protocol_autogen/transactions/SetFee.h
@@ -19,9 +19,9 @@ class SetFeeBuilder;
  * @brief Transaction: SetFee
  *
  * Type: ttFEE (101)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SetFeeBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLedgerSequence (soeOPTIONAL)
+     * @brief Get sfLedgerSequence (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfBaseFee (soeOPTIONAL)
+     * @brief Get sfBaseFee (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfReferenceFeeUnits (soeOPTIONAL)
+     * @brief Get sfReferenceFeeUnits (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -126,7 +126,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveBase (soeOPTIONAL)
+     * @brief Get sfReserveBase (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveIncrement (soeOPTIONAL)
+     * @brief Get sfReserveIncrement (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Get sfBaseFeeDrops (soeOPTIONAL)
+     * @brief Get sfBaseFeeDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -204,7 +204,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveBaseDrops (soeOPTIONAL)
+     * @brief Get sfReserveBaseDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -230,7 +230,7 @@ public:
     }
 
     /**
-     * @brief Get sfReserveIncrementDrops (soeOPTIONAL)
+     * @brief Get sfReserveIncrementDrops (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -260,7 +260,7 @@ public:
  * @brief Builder for SetFee transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class SetFeeBuilder : public TransactionBuilderBase<SetFeeBuilder>
@@ -297,7 +297,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLedgerSequence (soeOPTIONAL)
+     * @brief Set sfLedgerSequence (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -308,7 +308,7 @@ public:
     }
 
     /**
-     * @brief Set sfBaseFee (soeOPTIONAL)
+     * @brief Set sfBaseFee (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -319,7 +319,7 @@ public:
     }
 
     /**
-     * @brief Set sfReferenceFeeUnits (soeOPTIONAL)
+     * @brief Set sfReferenceFeeUnits (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -330,7 +330,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveBase (soeOPTIONAL)
+     * @brief Set sfReserveBase (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -341,7 +341,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveIncrement (soeOPTIONAL)
+     * @brief Set sfReserveIncrement (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -352,7 +352,7 @@ public:
     }
 
     /**
-     * @brief Set sfBaseFeeDrops (soeOPTIONAL)
+     * @brief Set sfBaseFeeDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -363,7 +363,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveBaseDrops (soeOPTIONAL)
+     * @brief Set sfReserveBaseDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
@@ -374,7 +374,7 @@ public:
     }
 
     /**
-     * @brief Set sfReserveIncrementDrops (soeOPTIONAL)
+     * @brief Set sfReserveIncrementDrops (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetFeeBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/SetRegularKey.h b/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
index 3d70d092c5..1eca1bef25 100644
--- a/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
+++ b/include/xrpl/protocol_autogen/transactions/SetRegularKey.h
@@ -19,9 +19,9 @@ class SetRegularKeyBuilder;
  * @brief Transaction: SetRegularKey
  *
  * Type: ttREGULAR_KEY_SET (5)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SetRegularKeyBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfRegularKey (soeOPTIONAL)
+     * @brief Get sfRegularKey (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -78,7 +78,7 @@ public:
  * @brief Builder for SetRegularKey transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class SetRegularKeyBuilder : public TransactionBuilderBase<SetRegularKeyBuilder>
@@ -115,7 +115,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfRegularKey (soeOPTIONAL)
+     * @brief Set sfRegularKey (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SetRegularKeyBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/SignerListSet.h b/include/xrpl/protocol_autogen/transactions/SignerListSet.h
index ec5330a9cb..c711864e95 100644
--- a/include/xrpl/protocol_autogen/transactions/SignerListSet.h
+++ b/include/xrpl/protocol_autogen/transactions/SignerListSet.h
@@ -19,9 +19,9 @@ class SignerListSetBuilder;
  * @brief Transaction: SignerListSet
  *
  * Type: ttSIGNER_LIST_SET (12)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use SignerListSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfSignerQuorum (soeREQUIRED)
+     * @brief Get sfSignerQuorum (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -58,7 +58,7 @@ public:
         return this->tx_->at(sfSignerQuorum);
     }
     /**
-     * @brief Get sfSignerEntries (soeOPTIONAL)
+     * @brief Get sfSignerEntries (SoeOptional)
      * @note This is an untyped field.
      * @return The field value, or std::nullopt if not present.
      */
@@ -87,7 +87,7 @@ public:
  * @brief Builder for SignerListSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class SignerListSetBuilder : public TransactionBuilderBase<SignerListSetBuilder>
@@ -126,7 +126,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfSignerQuorum (soeREQUIRED)
+     * @brief Set sfSignerQuorum (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     SignerListSetBuilder&
@@ -137,7 +137,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignerEntries (soeOPTIONAL)
+     * @brief Set sfSignerEntries (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     SignerListSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/TicketCreate.h b/include/xrpl/protocol_autogen/transactions/TicketCreate.h
index 842ae93111..0b4206152e 100644
--- a/include/xrpl/protocol_autogen/transactions/TicketCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/TicketCreate.h
@@ -19,9 +19,9 @@ class TicketCreateBuilder;
  * @brief Transaction: TicketCreate
  *
  * Type: ttTICKET_CREATE (10)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use TicketCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfTicketCount (soeREQUIRED)
+     * @brief Get sfTicketCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for TicketCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class TicketCreateBuilder : public TransactionBuilderBase<TicketCreateBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfTicketCount (soeREQUIRED)
+     * @brief Set sfTicketCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     TicketCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/TrustSet.h b/include/xrpl/protocol_autogen/transactions/TrustSet.h
index 5623311b92..30d537492d 100644
--- a/include/xrpl/protocol_autogen/transactions/TrustSet.h
+++ b/include/xrpl/protocol_autogen/transactions/TrustSet.h
@@ -19,9 +19,9 @@ class TrustSetBuilder;
  * @brief Transaction: TrustSet
  *
  * Type: ttTRUST_SET (20)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use TrustSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfLimitAmount (soeOPTIONAL)
+     * @brief Get sfLimitAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -74,7 +74,7 @@ public:
     }
 
     /**
-     * @brief Get sfQualityIn (soeOPTIONAL)
+     * @brief Get sfQualityIn (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
     }
 
     /**
-     * @brief Get sfQualityOut (soeOPTIONAL)
+     * @brief Get sfQualityOut (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -130,7 +130,7 @@ public:
  * @brief Builder for TrustSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class TrustSetBuilder : public TransactionBuilderBase<TrustSetBuilder>
@@ -167,7 +167,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfLimitAmount (soeOPTIONAL)
+     * @brief Set sfLimitAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     TrustSetBuilder&
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Set sfQualityIn (soeOPTIONAL)
+     * @brief Set sfQualityIn (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     TrustSetBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfQualityOut (soeOPTIONAL)
+     * @brief Set sfQualityOut (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     TrustSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/UNLModify.h b/include/xrpl/protocol_autogen/transactions/UNLModify.h
index b5e64f19a0..a8556ca699 100644
--- a/include/xrpl/protocol_autogen/transactions/UNLModify.h
+++ b/include/xrpl/protocol_autogen/transactions/UNLModify.h
@@ -19,9 +19,9 @@ class UNLModifyBuilder;
  * @brief Transaction: UNLModify
  *
  * Type: ttUNL_MODIFY (102)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: uint256{}
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use UNLModifyBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfUNLModifyDisabling (soeREQUIRED)
+     * @brief Get sfUNLModifyDisabling (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfLedgerSequence (soeREQUIRED)
+     * @brief Get sfLedgerSequence (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfUNLModifyValidator (soeREQUIRED)
+     * @brief Get sfUNLModifyValidator (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
  * @brief Builder for UNLModify transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class UNLModifyBuilder : public TransactionBuilderBase<UNLModifyBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfUNLModifyDisabling (soeREQUIRED)
+     * @brief Set sfUNLModifyDisabling (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     UNLModifyBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfLedgerSequence (soeREQUIRED)
+     * @brief Set sfLedgerSequence (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     UNLModifyBuilder&
@@ -150,7 +150,7 @@ public:
     }
 
     /**
-     * @brief Set sfUNLModifyValidator (soeREQUIRED)
+     * @brief Set sfUNLModifyValidator (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     UNLModifyBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/VaultClawback.h b/include/xrpl/protocol_autogen/transactions/VaultClawback.h
index 82b2b32e8d..8ec1d359dc 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultClawback.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultClawback.h
@@ -19,9 +19,9 @@ class VaultClawbackBuilder;
  * @brief Transaction: VaultClawback
  *
  * Type: ttVAULT_CLAWBACK (70)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: mayDeleteMPT | mustModifyVault
+ * Privileges: MayDeleteMpt | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultClawbackBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfHolder (soeREQUIRED)
+     * @brief Get sfHolder (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeOPTIONAL)
+     * @brief Get sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value, or std::nullopt if not present.
      */
@@ -101,7 +101,7 @@ public:
  * @brief Builder for VaultClawback transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultClawbackBuilder : public TransactionBuilderBase<VaultClawbackBuilder>
@@ -142,7 +142,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultClawbackBuilder&
@@ -153,7 +153,7 @@ public:
     }
 
     /**
-     * @brief Set sfHolder (soeREQUIRED)
+     * @brief Set sfHolder (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultClawbackBuilder&
@@ -164,7 +164,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeOPTIONAL)
+     * @brief Set sfAmount (SoeOptional)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/VaultCreate.h b/include/xrpl/protocol_autogen/transactions/VaultCreate.h
index 03d4d4b88d..c8efa83cbf 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultCreate.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultCreate.h
@@ -19,9 +19,9 @@ class VaultCreateBuilder;
  * @brief Transaction: VaultCreate
  *
  * Type: ttVAULT_CREATE (65)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: createPseudoAcct | createMPTIssuance | mustModifyVault
+ * Privileges: CreatePseudoAcct | CreateMptIssuance | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultCreateBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfAsset (soeREQUIRED)
+     * @brief Get sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -60,7 +60,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetsMaximum (soeOPTIONAL)
+     * @brief Get sfAssetsMaximum (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -86,7 +86,7 @@ public:
     }
 
     /**
-     * @brief Get sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Get sfMPTokenMetadata (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -112,7 +112,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -138,7 +138,7 @@ public:
     }
 
     /**
-     * @brief Get sfWithdrawalPolicy (soeOPTIONAL)
+     * @brief Get sfWithdrawalPolicy (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -164,7 +164,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -190,7 +190,7 @@ public:
     }
 
     /**
-     * @brief Get sfScale (soeOPTIONAL)
+     * @brief Get sfScale (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -220,7 +220,7 @@ public:
  * @brief Builder for VaultCreate transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultCreateBuilder : public TransactionBuilderBase<VaultCreateBuilder>
@@ -259,7 +259,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfAsset (soeREQUIRED)
+     * @brief Set sfAsset (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -271,7 +271,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetsMaximum (soeOPTIONAL)
+     * @brief Set sfAssetsMaximum (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
@@ -282,7 +282,7 @@ public:
     }
 
     /**
-     * @brief Set sfMPTokenMetadata (soeOPTIONAL)
+     * @brief Set sfMPTokenMetadata (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
@@ -293,7 +293,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
@@ -304,7 +304,7 @@ public:
     }
 
     /**
-     * @brief Set sfWithdrawalPolicy (soeOPTIONAL)
+     * @brief Set sfWithdrawalPolicy (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
@@ -315,7 +315,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
@@ -326,7 +326,7 @@ public:
     }
 
     /**
-     * @brief Set sfScale (soeOPTIONAL)
+     * @brief Set sfScale (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultCreateBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/VaultDelete.h b/include/xrpl/protocol_autogen/transactions/VaultDelete.h
index 89a4ef2a2f..2b6e248c0a 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultDelete.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultDelete.h
@@ -19,9 +19,9 @@ class VaultDeleteBuilder;
  * @brief Transaction: VaultDelete
  *
  * Type: ttVAULT_DELETE (67)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: mustDeleteAcct | destroyMPTIssuance | mustModifyVault
+ * Privileges: MustDeleteAcct | DestroyMptIssuance | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultDeleteBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -63,7 +63,7 @@ public:
  * @brief Builder for VaultDelete transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultDeleteBuilder : public TransactionBuilderBase<VaultDeleteBuilder>
@@ -102,7 +102,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultDeleteBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/VaultDeposit.h b/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
index 4127638e57..01f707e07f 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultDeposit.h
@@ -19,9 +19,9 @@ class VaultDepositBuilder;
  * @brief Transaction: VaultDeposit
  *
  * Type: ttVAULT_DEPOSIT (68)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: mayAuthorizeMPT | mustModifyVault
+ * Privileges: MayAuthorizeMpt | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultDepositBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -75,7 +75,7 @@ public:
  * @brief Builder for VaultDeposit transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultDepositBuilder : public TransactionBuilderBase<VaultDepositBuilder>
@@ -116,7 +116,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultDepositBuilder&
@@ -127,7 +127,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
diff --git a/include/xrpl/protocol_autogen/transactions/VaultSet.h b/include/xrpl/protocol_autogen/transactions/VaultSet.h
index 372697b5f7..5bdc6a7a95 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultSet.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultSet.h
@@ -19,9 +19,9 @@ class VaultSetBuilder;
  * @brief Transaction: VaultSet
  *
  * Type: ttVAULT_SET (66)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: mustModifyVault
+ * Privileges: MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultSetBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAssetsMaximum (soeOPTIONAL)
+     * @brief Get sfAssetsMaximum (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfDomainID (soeOPTIONAL)
+     * @brief Get sfDomainID (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
     }
 
     /**
-     * @brief Get sfData (soeOPTIONAL)
+     * @brief Get sfData (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -141,7 +141,7 @@ public:
  * @brief Builder for VaultSet transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultSetBuilder : public TransactionBuilderBase<VaultSetBuilder>
@@ -180,7 +180,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultSetBuilder&
@@ -191,7 +191,7 @@ public:
     }
 
     /**
-     * @brief Set sfAssetsMaximum (soeOPTIONAL)
+     * @brief Set sfAssetsMaximum (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultSetBuilder&
@@ -202,7 +202,7 @@ public:
     }
 
     /**
-     * @brief Set sfDomainID (soeOPTIONAL)
+     * @brief Set sfDomainID (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultSetBuilder&
@@ -213,7 +213,7 @@ public:
     }
 
     /**
-     * @brief Set sfData (soeOPTIONAL)
+     * @brief Set sfData (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultSetBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h b/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
index 8b2a6a9a3c..75b5b90035 100644
--- a/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
+++ b/include/xrpl/protocol_autogen/transactions/VaultWithdraw.h
@@ -19,9 +19,9 @@ class VaultWithdrawBuilder;
  * @brief Transaction: VaultWithdraw
  *
  * Type: ttVAULT_WITHDRAW (69)
- * Delegable: Delegation::notDelegable
+ * Delegable: Delegation::NotDelegable
  * Amendment: featureSingleAssetVault
- * Privileges: mayDeleteMPT | mayAuthorizeMPT | mustModifyVault
+ * Privileges: MayDeleteMpt | MayAuthorizeMpt | MustModifyVault
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use VaultWithdrawBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfVaultID (soeREQUIRED)
+     * @brief Get sfVaultID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return The field value.
      */
@@ -71,7 +71,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -97,7 +97,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -127,7 +127,7 @@ public:
  * @brief Builder for VaultWithdraw transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class VaultWithdrawBuilder : public TransactionBuilderBase<VaultWithdrawBuilder>
@@ -168,7 +168,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfVaultID (soeREQUIRED)
+     * @brief Set sfVaultID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     VaultWithdrawBuilder&
@@ -179,7 +179,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @note This field supports MPT (Multi-Purpose Token) amounts.
      * @return Reference to this builder for method chaining.
      */
@@ -191,7 +191,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultWithdrawBuilder&
@@ -202,7 +202,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     VaultWithdrawBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h b/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
index aebfbea5d3..36d8170af1 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAccountCreateCommit.h
@@ -19,9 +19,9 @@ class XChainAccountCreateCommitBuilder;
  * @brief Transaction: XChainAccountCreateCommit
  *
  * Type: ttXCHAIN_ACCOUNT_CREATE_COMMIT (44)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAccountCreateCommitBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -96,7 +96,7 @@ public:
  * @brief Builder for XChainAccountCreateCommit transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainAccountCreateCommitBuilder : public TransactionBuilderBase<XChainAccountCreateCommitBuilder>
@@ -141,7 +141,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAccountCreateCommitBuilder&
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAccountCreateCommitBuilder&
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAccountCreateCommitBuilder&
@@ -174,7 +174,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAccountCreateCommitBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h b/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
index 08dc646470..a04eec1505 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestation.h
@@ -19,9 +19,9 @@ class XChainAddAccountCreateAttestationBuilder;
  * @brief Transaction: XChainAddAccountCreateAttestation
  *
  * Type: ttXCHAIN_ADD_ACCOUNT_CREATE_ATTESTATION (46)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: createAcct
+ * Privileges: CreateAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAddAccountCreateAttestationBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAttestationSignerAccount (soeREQUIRED)
+     * @brief Get sfAttestationSignerAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfPublicKey (soeREQUIRED)
+     * @brief Get sfPublicKey (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignature (soeREQUIRED)
+     * @brief Get sfSignature (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfOtherChainSource (soeREQUIRED)
+     * @brief Get sfOtherChainSource (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -114,7 +114,7 @@ public:
     }
 
     /**
-     * @brief Get sfAttestationRewardAccount (soeREQUIRED)
+     * @brief Get sfAttestationRewardAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfWasLockingChainSend (soeREQUIRED)
+     * @brief Get sfWasLockingChainSend (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Get sfXChainAccountCreateCount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -158,7 +158,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -173,7 +173,7 @@ public:
  * @brief Builder for XChainAddAccountCreateAttestation transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainAddAccountCreateAttestationBuilder : public TransactionBuilderBase<XChainAddAccountCreateAttestationBuilder>
@@ -232,7 +232,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfAttestationSignerAccount (soeREQUIRED)
+     * @brief Set sfAttestationSignerAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfPublicKey (soeREQUIRED)
+     * @brief Set sfPublicKey (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignature (soeREQUIRED)
+     * @brief Set sfSignature (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfOtherChainSource (soeREQUIRED)
+     * @brief Set sfOtherChainSource (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -287,7 +287,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -298,7 +298,7 @@ public:
     }
 
     /**
-     * @brief Set sfAttestationRewardAccount (soeREQUIRED)
+     * @brief Set sfAttestationRewardAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -309,7 +309,7 @@ public:
     }
 
     /**
-     * @brief Set sfWasLockingChainSend (soeREQUIRED)
+     * @brief Set sfWasLockingChainSend (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -320,7 +320,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainAccountCreateCount (soeREQUIRED)
+     * @brief Set sfXChainAccountCreateCount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -331,7 +331,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
@@ -342,7 +342,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddAccountCreateAttestationBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h b/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
index 100fc855aa..1896f11681 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainAddClaimAttestation.h
@@ -19,9 +19,9 @@ class XChainAddClaimAttestationBuilder;
  * @brief Transaction: XChainAddClaimAttestation
  *
  * Type: ttXCHAIN_ADD_CLAIM_ATTESTATION (45)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: createAcct
+ * Privileges: CreateAcct
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainAddClaimAttestationBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfAttestationSignerAccount (soeREQUIRED)
+     * @brief Get sfAttestationSignerAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfPublicKey (soeREQUIRED)
+     * @brief Get sfPublicKey (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignature (soeREQUIRED)
+     * @brief Get sfSignature (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -92,7 +92,7 @@ public:
     }
 
     /**
-     * @brief Get sfOtherChainSource (soeREQUIRED)
+     * @brief Get sfOtherChainSource (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -103,7 +103,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -114,7 +114,7 @@ public:
     }
 
     /**
-     * @brief Get sfAttestationRewardAccount (soeREQUIRED)
+     * @brief Get sfAttestationRewardAccount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -125,7 +125,7 @@ public:
     }
 
     /**
-     * @brief Get sfWasLockingChainSend (soeREQUIRED)
+     * @brief Get sfWasLockingChainSend (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -136,7 +136,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimID (soeREQUIRED)
+     * @brief Get sfXChainClaimID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -147,7 +147,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeOPTIONAL)
+     * @brief Get sfDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -177,7 +177,7 @@ public:
  * @brief Builder for XChainAddClaimAttestation transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainAddClaimAttestationBuilder : public TransactionBuilderBase<XChainAddClaimAttestationBuilder>
@@ -232,7 +232,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -243,7 +243,7 @@ public:
     }
 
     /**
-     * @brief Set sfAttestationSignerAccount (soeREQUIRED)
+     * @brief Set sfAttestationSignerAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -254,7 +254,7 @@ public:
     }
 
     /**
-     * @brief Set sfPublicKey (soeREQUIRED)
+     * @brief Set sfPublicKey (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -265,7 +265,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignature (soeREQUIRED)
+     * @brief Set sfSignature (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -276,7 +276,7 @@ public:
     }
 
     /**
-     * @brief Set sfOtherChainSource (soeREQUIRED)
+     * @brief Set sfOtherChainSource (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -287,7 +287,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -298,7 +298,7 @@ public:
     }
 
     /**
-     * @brief Set sfAttestationRewardAccount (soeREQUIRED)
+     * @brief Set sfAttestationRewardAccount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -309,7 +309,7 @@ public:
     }
 
     /**
-     * @brief Set sfWasLockingChainSend (soeREQUIRED)
+     * @brief Set sfWasLockingChainSend (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -320,7 +320,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimID (soeREQUIRED)
+     * @brief Set sfXChainClaimID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
@@ -331,7 +331,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeOPTIONAL)
+     * @brief Set sfDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainAddClaimAttestationBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainClaim.h b/include/xrpl/protocol_autogen/transactions/XChainClaim.h
index 6b1b748677..f5b680049e 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainClaim.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainClaim.h
@@ -19,9 +19,9 @@ class XChainClaimBuilder;
  * @brief Transaction: XChainClaim
  *
  * Type: ttXCHAIN_CLAIM (43)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainClaimBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimID (soeREQUIRED)
+     * @brief Get sfXChainClaimID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestination (soeREQUIRED)
+     * @brief Get sfDestination (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfDestinationTag (soeOPTIONAL)
+     * @brief Get sfDestinationTag (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -107,7 +107,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -122,7 +122,7 @@ public:
  * @brief Builder for XChainClaim transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainClaimBuilder : public TransactionBuilderBase<XChainClaimBuilder>
@@ -167,7 +167,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainClaimBuilder&
@@ -178,7 +178,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimID (soeREQUIRED)
+     * @brief Set sfXChainClaimID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainClaimBuilder&
@@ -189,7 +189,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestination (soeREQUIRED)
+     * @brief Set sfDestination (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainClaimBuilder&
@@ -200,7 +200,7 @@ public:
     }
 
     /**
-     * @brief Set sfDestinationTag (soeOPTIONAL)
+     * @brief Set sfDestinationTag (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainClaimBuilder&
@@ -211,7 +211,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainClaimBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCommit.h b/include/xrpl/protocol_autogen/transactions/XChainCommit.h
index 879c76f180..a9ce7d1d08 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCommit.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCommit.h
@@ -19,9 +19,9 @@ class XChainCommitBuilder;
  * @brief Transaction: XChainCommit
  *
  * Type: ttXCHAIN_COMMIT (42)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCommitBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfXChainClaimID (soeREQUIRED)
+     * @brief Get sfXChainClaimID (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfAmount (soeREQUIRED)
+     * @brief Get sfAmount (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -81,7 +81,7 @@ public:
     }
 
     /**
-     * @brief Get sfOtherChainDestination (soeOPTIONAL)
+     * @brief Get sfOtherChainDestination (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -111,7 +111,7 @@ public:
  * @brief Builder for XChainCommit transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainCommitBuilder : public TransactionBuilderBase<XChainCommitBuilder>
@@ -154,7 +154,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCommitBuilder&
@@ -165,7 +165,7 @@ public:
     }
 
     /**
-     * @brief Set sfXChainClaimID (soeREQUIRED)
+     * @brief Set sfXChainClaimID (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCommitBuilder&
@@ -176,7 +176,7 @@ public:
     }
 
     /**
-     * @brief Set sfAmount (soeREQUIRED)
+     * @brief Set sfAmount (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCommitBuilder&
@@ -187,7 +187,7 @@ public:
     }
 
     /**
-     * @brief Set sfOtherChainDestination (soeOPTIONAL)
+     * @brief Set sfOtherChainDestination (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainCommitBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h b/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
index 6ec22dd9fc..ae5be4108f 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCreateBridge.h
@@ -19,9 +19,9 @@ class XChainCreateBridgeBuilder;
  * @brief Transaction: XChainCreateBridge
  *
  * Type: ttXCHAIN_CREATE_BRIDGE (48)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCreateBridgeBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Get sfMinAccountCreateAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -100,7 +100,7 @@ public:
  * @brief Builder for XChainCreateBridge transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainCreateBridgeBuilder : public TransactionBuilderBase<XChainCreateBridgeBuilder>
@@ -141,7 +141,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateBridgeBuilder&
@@ -152,7 +152,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateBridgeBuilder&
@@ -163,7 +163,7 @@ public:
     }
 
     /**
-     * @brief Set sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Set sfMinAccountCreateAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateBridgeBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h b/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
index ab76ee0e77..7c1beb20c7 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainCreateClaimID.h
@@ -19,9 +19,9 @@ class XChainCreateClaimIDBuilder;
  * @brief Transaction: XChainCreateClaimID
  *
  * Type: ttXCHAIN_CREATE_CLAIM_ID (41)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainCreateClaimIDBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeREQUIRED)
+     * @brief Get sfSignatureReward (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -70,7 +70,7 @@ public:
     }
 
     /**
-     * @brief Get sfOtherChainSource (soeREQUIRED)
+     * @brief Get sfOtherChainSource (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
  * @brief Builder for XChainCreateClaimID transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainCreateClaimIDBuilder : public TransactionBuilderBase<XChainCreateClaimIDBuilder>
@@ -128,7 +128,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateClaimIDBuilder&
@@ -139,7 +139,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeREQUIRED)
+     * @brief Set sfSignatureReward (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateClaimIDBuilder&
@@ -150,7 +150,7 @@ public:
     }
 
     /**
-     * @brief Set sfOtherChainSource (soeREQUIRED)
+     * @brief Set sfOtherChainSource (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainCreateClaimIDBuilder&
diff --git a/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h b/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
index b57e0fdbdc..30558ab88c 100644
--- a/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
+++ b/include/xrpl/protocol_autogen/transactions/XChainModifyBridge.h
@@ -19,9 +19,9 @@ class XChainModifyBridgeBuilder;
  * @brief Transaction: XChainModifyBridge
  *
  * Type: ttXCHAIN_MODIFY_BRIDGE (47)
- * Delegable: Delegation::delegable
+ * Delegable: Delegation::Delegable
  * Amendment: featureXChainBridge
- * Privileges: noPriv
+ * Privileges: NoPriv
  *
  * Immutable wrapper around STTx providing type-safe field access.
  * Use XChainModifyBridgeBuilder to construct new transactions.
@@ -48,7 +48,7 @@ public:
     // Transaction-specific field getters
 
     /**
-     * @brief Get sfXChainBridge (soeREQUIRED)
+     * @brief Get sfXChainBridge (SoeRequired)
      * @return The field value.
      */
     [[nodiscard]]
@@ -59,7 +59,7 @@ public:
     }
 
     /**
-     * @brief Get sfSignatureReward (soeOPTIONAL)
+     * @brief Get sfSignatureReward (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -85,7 +85,7 @@ public:
     }
 
     /**
-     * @brief Get sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Get sfMinAccountCreateAmount (SoeOptional)
      * @return The field value, or std::nullopt if not present.
      */
     [[nodiscard]]
@@ -115,7 +115,7 @@ public:
  * @brief Builder for XChainModifyBridge transactions.
  *
  * Provides a fluent interface for constructing transactions with method chaining.
- * Uses Json::Value internally for flexible transaction construction.
+ * Uses STObject internally for flexible transaction construction.
  * Inherits common field setters from TransactionBuilderBase.
  */
 class XChainModifyBridgeBuilder : public TransactionBuilderBase<XChainModifyBridgeBuilder>
@@ -154,7 +154,7 @@ public:
     /** @brief Transaction-specific field setters */
 
     /**
-     * @brief Set sfXChainBridge (soeREQUIRED)
+     * @brief Set sfXChainBridge (SoeRequired)
      * @return Reference to this builder for method chaining.
      */
     XChainModifyBridgeBuilder&
@@ -165,7 +165,7 @@ public:
     }
 
     /**
-     * @brief Set sfSignatureReward (soeOPTIONAL)
+     * @brief Set sfSignatureReward (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainModifyBridgeBuilder&
@@ -176,7 +176,7 @@ public:
     }
 
     /**
-     * @brief Set sfMinAccountCreateAmount (soeOPTIONAL)
+     * @brief Set sfMinAccountCreateAmount (SoeOptional)
      * @return Reference to this builder for method chaining.
      */
     XChainModifyBridgeBuilder&
diff --git a/include/xrpl/rdb/DBInit.h b/include/xrpl/rdb/DBInit.h
index 56bc752343..59806b2e85 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* CommonDBPragmaJournal{"PRAGMA journal_mode=%s;"};
-inline constexpr char const* CommonDBPragmaSync{"PRAGMA synchronous=%s;"};
-inline constexpr char const* CommonDBPragmaTemp{"PRAGMA temp_store=%s;"};
+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;"};
 // 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 SQLITE_TUNING_CUTOFF = 10'000'000;
+inline constexpr std::uint32_t kSQLITE_TUNING_CUTOFF = 10'000'000;
 
 // Ledger database holds ledgers and ledger confirmations
-inline constexpr auto LgrDBName{"ledger.db"};
+inline constexpr auto kLGR_DB_NAME{"ledger.db"};
 
-inline constexpr std::array<char const*, 5> LgrDBInit{
+inline constexpr std::array<char const*, 5> kLGR_DB_INIT{
     {"BEGIN TRANSACTION;",
 
      "CREATE TABLE IF NOT EXISTS Ledgers (           \
@@ -47,9 +47,9 @@ inline constexpr std::array<char const*, 5> LgrDBInit{
 ////////////////////////////////////////////////////////////////////////////////
 
 // Transaction database holds transactions and public keys
-inline constexpr auto TxDBName{"transaction.db"};
+inline constexpr auto kTX_DB_NAME{"transaction.db"};
 
-inline constexpr std::array<char const*, 8> TxDBInit{
+inline constexpr std::array<char const*, 8> kTX_DB_INIT{
     {"BEGIN TRANSACTION;",
 
      "CREATE TABLE IF NOT EXISTS Transactions (          \
@@ -82,9 +82,9 @@ inline constexpr std::array<char const*, 8> TxDBInit{
 
 ////////////////////////////////////////////////////////////////////////////////
 
-inline constexpr auto WalletDBName{"wallet.db"};
+inline constexpr auto kWALLET_DB_NAME{"wallet.db"};
 
-inline constexpr std::array<char const*, 6> WalletDBInit{
+inline constexpr std::array<char const*, 6> kWALLET_DB_INIT{
     {"BEGIN TRANSACTION;",
 
      // A node's identity must be persisted, including
diff --git a/include/xrpl/rdb/RelationalDatabase.h b/include/xrpl/rdb/RelationalDatabase.h
index 1c28ddec0a..a38d6a997f 100644
--- a/include/xrpl/rdb/RelationalDatabase.h
+++ b/include/xrpl/rdb/RelationalDatabase.h
@@ -417,7 +417,7 @@ public:
     getTransaction(
         uint256 const& id,
         std::optional<ClosedInterval<uint32_t>> const& range,
-        error_code_i& ec) = 0;
+        ErrorCodeI& ec) = 0;
 
     /**
      * @brief getKBUsedAll Returns the amount of space used by all databases.
diff --git a/include/xrpl/resource/Charge.h b/include/xrpl/resource/Charge.h
index 582688260e..3fd8b02e83 100644
--- a/include/xrpl/resource/Charge.h
+++ b/include/xrpl/resource/Charge.h
@@ -27,7 +27,7 @@ public:
 
     /** Converts this charge into a human readable string. */
     [[nodiscard]] std::string
-    to_string() const;
+    toString() const;
 
     bool
     operator==(Charge const&) const;
@@ -39,8 +39,8 @@ public:
     operator*(value_type m) const;
 
 private:
-    value_type m_cost;
-    std::string m_label;
+    value_type cost_;
+    std::string label_;
 };
 
 std::ostream&
diff --git a/include/xrpl/resource/Consumer.h b/include/xrpl/resource/Consumer.h
index ebb214d129..14935bb3f1 100644
--- a/include/xrpl/resource/Consumer.h
+++ b/include/xrpl/resource/Consumer.h
@@ -26,7 +26,7 @@ public:
 
     /** Return a human readable string uniquely identifying this consumer. */
     [[nodiscard]] std::string
-    to_string() const;
+    toString() const;
 
     /** Returns `true` if this is a privileged endpoint. */
     [[nodiscard]] bool
@@ -71,8 +71,8 @@ public:
     setPublicKey(PublicKey const& publicKey);
 
 private:
-    Logic* m_logic;
-    Entry* m_entry;
+    Logic* logic_;
+    Entry* entry_;
 };
 
 std::ostream&
diff --git a/include/xrpl/resource/Disposition.h b/include/xrpl/resource/Disposition.h
index 59a1c3840a..6dad8db19a 100644
--- a/include/xrpl/resource/Disposition.h
+++ b/include/xrpl/resource/Disposition.h
@@ -5,15 +5,15 @@ namespace xrpl::Resource {
 /** The disposition of a consumer after applying a load charge. */
 enum class Disposition {
     /** No action required. */
-    ok
+    Ok
 
     /** Consumer should be warned that consumption is high. */
     ,
-    warn
+    Warn
 
     /** Consumer should be disconnected for excess consumption. */
     ,
-    drop
+    Drop
 };
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/Fees.h b/include/xrpl/resource/Fees.h
index 366b2d287f..dc14e3bd4d 100644
--- a/include/xrpl/resource/Fees.h
+++ b/include/xrpl/resource/Fees.h
@@ -6,27 +6,28 @@ namespace xrpl::Resource {
 
 /** Schedule of fees charged for imposing load on the server. */
 /** @{ */
-extern Charge const feeMalformedRequest;  // A request that we can immediately tell is invalid.
-extern Charge const feeRequestNoReply;    // A request that we cannot satisfy.
-extern Charge const feeInvalidSignature;  // An object whose signature we had to check that failed.
-extern Charge const feeUselessData;       // Data we have no use for.
-extern Charge const feeInvalidData;       // Data we have to verify before rejecting.
+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.
 
 // RPC loads
-extern Charge const feeMalformedRPC;     // An RPC request that we can immediately tell is invalid.
-extern Charge const feeReferenceRPC;     // A default "reference" unspecified load.
-extern Charge const feeExceptionRPC;     // RPC load that causes an exception.
-extern Charge const feeMediumBurdenRPC;  // A somewhat burdensome RPC load.
-extern Charge const feeHeavyBurdenRPC;   // A very burdensome RPC load.
+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.
 
 // Peer loads
-extern Charge const feeTrivialPeer;         // Requires no reply.
-extern Charge const feeModerateBurdenPeer;  // Requires some work.
-extern Charge const feeHeavyBurdenPeer;     // Extensive work.
+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.
 
 // Administrative
-extern Charge const feeWarning;  // The cost of receiving a warning.
-extern Charge const feeDrop;     // The cost of being dropped for excess load.
+extern Charge const kFEE_WARNING;  // The cost of receiving a warning.
+extern Charge const kFEE_DROP;     // The cost of being dropped for excess load.
 /** @} */
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/ResourceManager.h b/include/xrpl/resource/ResourceManager.h
index 96e5255272..42b2a47126 100644
--- a/include/xrpl/resource/ResourceManager.h
+++ b/include/xrpl/resource/ResourceManager.h
@@ -44,9 +44,9 @@ public:
     exportConsumers() = 0;
 
     /** Extract consumer information for reporting. */
-    virtual Json::Value
+    virtual json::Value
     getJson() = 0;
-    virtual Json::Value
+    virtual json::Value
     getJson(int threshold) = 0;
 
     /** Import packaged consumer information.
@@ -59,6 +59,6 @@ public:
 //------------------------------------------------------------------------------
 
 std::unique_ptr<Manager>
-make_Manager(beast::insight::Collector::ptr const& collector, beast::Journal journal);
+makeManager(beast::insight::Collector::ptr const& collector, beast::Journal journal);
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/detail/Entry.h b/include/xrpl/resource/detail/Entry.h
index 2cbf06d5c3..a821461e2e 100644
--- a/include/xrpl/resource/detail/Entry.h
+++ b/include/xrpl/resource/detail/Entry.h
@@ -9,7 +9,7 @@
 
 namespace xrpl::Resource {
 
-using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
 // An entry in the table
 // VFALCO DEPRECATED using boost::intrusive list
@@ -26,7 +26,7 @@ struct Entry : public beast::List<Entry>::Node
     }
 
     [[nodiscard]] std::string
-    to_string() const
+    toString() const
     {
         return getFingerprint(key->address, publicKey);
     }
@@ -39,7 +39,7 @@ struct Entry : public beast::List<Entry>::Node
     [[nodiscard]] bool
     isUnlimited() const
     {
-        return key->kind == Kind::kindUnlimited;
+        return key->kind == Kind::Unlimited;
     }
 
     // Balance including remote contributions
@@ -67,7 +67,7 @@ struct Entry : public beast::List<Entry>::Node
     int refcount;
 
     // Exponentially decaying balance of resource consumption
-    DecayingSample<decayWindowSeconds, clock_type> local_balance;
+    DecayingSample<DecayWindowSeconds, clock_type> local_balance;
 
     // Normalized balance contribution from imports
     int remote_balance;
@@ -82,7 +82,7 @@ struct Entry : public beast::List<Entry>::Node
 inline std::ostream&
 operator<<(std::ostream& os, Entry const& v)
 {
-    os << v.to_string();
+    os << v.toString();
     return os;
 }
 
diff --git a/include/xrpl/resource/detail/Key.h b/include/xrpl/resource/detail/Key.h
index c9a233b634..935d44425e 100644
--- a/include/xrpl/resource/detail/Key.h
+++ b/include/xrpl/resource/detail/Key.h
@@ -20,21 +20,21 @@ struct Key
     {
     }
 
-    struct hasher
+    struct Hasher
     {
         std::size_t
         operator()(Key const& v) const
         {
-            return m_addr_hash(v.address);
+            return addr_hash_(v.address);
         }
 
     private:
-        beast::uhash<> m_addr_hash;
+        beast::Uhash<> addr_hash_;
     };
 
-    struct key_equal
+    struct KeyEqual
     {
-        key_equal() = default;
+        KeyEqual() = default;
 
         bool
         operator()(Key const& lhs, Key const& rhs) const
diff --git a/include/xrpl/resource/detail/Kind.h b/include/xrpl/resource/detail/Kind.h
index 5cbddce6bb..ce2e0773cf 100644
--- a/include/xrpl/resource/detail/Kind.h
+++ b/include/xrpl/resource/detail/Kind.h
@@ -10,6 +10,6 @@ namespace xrpl::Resource {
  *                subjected to administrative restrictions, such as
  *                use of some RPC commands like "stop".
  */
-enum class Kind { kindInbound, kindOutbound, kindUnlimited };
+enum class Kind { Inbound, Outbound, Unlimited };
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/resource/detail/Logic.h b/include/xrpl/resource/detail/Logic.h
index 3102a1f119..3bbe08724d 100644
--- a/include/xrpl/resource/detail/Logic.h
+++ b/include/xrpl/resource/detail/Logic.h
@@ -22,24 +22,24 @@ class Logic
 private:
     using clock_type = Stopwatch;
     using Imports = hash_map<std::string, Import>;
-    using Table = hash_map<Key, Entry, Key::hasher, Key::key_equal>;
+    using Table = hash_map<Key, Entry, Key::Hasher, Key::KeyEqual>;
     using EntryIntrusiveList = beast::List<Entry>;
 
     struct Stats
     {
         Stats(beast::insight::Collector::ptr const& collector)
         {
-            warn = collector->make_meter("warn");
-            drop = collector->make_meter("drop");
+            warn = collector->makeMeter("warn");
+            drop = collector->makeMeter("drop");
         }
 
         beast::insight::Meter warn;
         beast::insight::Meter drop;
     };
 
-    Stats m_stats;
-    Stopwatch& m_clock;
-    beast::Journal m_journal;
+    Stats stats_;
+    Stopwatch& clock_;
+    beast::Journal journal_;
 
     std::recursive_mutex lock_;
 
@@ -71,7 +71,7 @@ public:
         beast::insight::Collector::ptr const& collector,
         clock_type& clock,
         beast::Journal journal)
-        : m_stats(collector), m_clock(clock), m_journal(journal)
+        : stats_(collector), clock_(clock), journal_(journal)
     {
     }
 
@@ -95,8 +95,8 @@ public:
             std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(Kind::kindInbound, address.at_port(0)),  // Key
-                std::make_tuple(m_clock.now()));                         // Entry
+                std::make_tuple(Kind::Inbound, address.atPort(0)),  // Key
+                std::make_tuple(clock_.now()));                     // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -105,13 +105,13 @@ public:
             {
                 if (!resultInserted)
                 {
-                    inactive_.erase(inactive_.iterator_to(*entry));
+                    inactive_.erase(inactive_.iteratorTo(*entry));
                 }
-                inbound_.push_back(*entry);
+                inbound_.pushBack(*entry);
             }
         }
 
-        JLOG(m_journal.debug()) << "New inbound endpoint " << *entry;
+        JLOG(journal_.debug()) << "New inbound endpoint " << *entry;
 
         return Consumer(*this, *entry);
     }
@@ -125,8 +125,8 @@ public:
             std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(Kind::kindOutbound, address),  // Key
-                std::make_tuple(m_clock.now()));               // Entry
+                std::make_tuple(Kind::Outbound, address),  // Key
+                std::make_tuple(clock_.now()));            // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -134,12 +134,12 @@ public:
             if (entry->refcount == 1)
             {
                 if (!resultInserted)
-                    inactive_.erase(inactive_.iterator_to(*entry));
-                outbound_.push_back(*entry);
+                    inactive_.erase(inactive_.iteratorTo(*entry));
+                outbound_.pushBack(*entry);
             }
         }
 
-        JLOG(m_journal.debug()) << "New outbound endpoint " << *entry;
+        JLOG(journal_.debug()) << "New outbound endpoint " << *entry;
 
         return Consumer(*this, *entry);
     }
@@ -158,8 +158,8 @@ public:
             std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = table_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(Kind::kindUnlimited, address.at_port(1)),  // Key
-                std::make_tuple(m_clock.now()));                           // Entry
+                std::make_tuple(Kind::Unlimited, address.atPort(1)),  // Key
+                std::make_tuple(clock_.now()));                       // Entry
 
             entry = &resultIt->second;
             entry->key = &resultIt->first;
@@ -167,29 +167,29 @@ public:
             if (entry->refcount == 1)
             {
                 if (!resultInserted)
-                    inactive_.erase(inactive_.iterator_to(*entry));
-                admin_.push_back(*entry);
+                    inactive_.erase(inactive_.iteratorTo(*entry));
+                admin_.pushBack(*entry);
             }
         }
 
-        JLOG(m_journal.debug()) << "New unlimited endpoint " << *entry;
+        JLOG(journal_.debug()) << "New unlimited endpoint " << *entry;
 
         return Consumer(*this, *entry);
     }
 
-    Json::Value
+    json::Value
     getJson()
     {
-        return getJson(warningThreshold);
+        return getJson(WarningThreshold);
     }
 
-    /** Returns a Json::objectValue. */
-    Json::Value
+    /** Returns a json::objectValue. */
+    json::Value
     getJson(int threshold)
     {
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock_.now());
 
-        Json::Value ret(Json::objectValue);
+        json::Value ret(json::ObjectValue);
         std::scoped_lock const _(lock_);
 
         for (auto& inboundEntry : inbound_)
@@ -197,7 +197,7 @@ public:
             int const localBalance = inboundEntry.local_balance.value(now);
             if ((localBalance + inboundEntry.remote_balance) >= threshold)
             {
-                Json::Value& entry = (ret[inboundEntry.to_string()] = Json::objectValue);
+                json::Value& entry = (ret[inboundEntry.toString()] = json::ObjectValue);
                 entry[jss::local] = localBalance;
                 entry[jss::remote] = inboundEntry.remote_balance;
                 entry[jss::type] = "inbound";
@@ -208,7 +208,7 @@ public:
             int const localBalance = outboundEntry.local_balance.value(now);
             if ((localBalance + outboundEntry.remote_balance) >= threshold)
             {
-                Json::Value& entry = (ret[outboundEntry.to_string()] = Json::objectValue);
+                json::Value& entry = (ret[outboundEntry.toString()] = json::ObjectValue);
                 entry[jss::local] = localBalance;
                 entry[jss::remote] = outboundEntry.remote_balance;
                 entry[jss::type] = "outbound";
@@ -219,7 +219,7 @@ public:
             int const localBalance = adminEntry.local_balance.value(now);
             if ((localBalance + adminEntry.remote_balance) >= threshold)
             {
-                Json::Value& entry = (ret[adminEntry.to_string()] = Json::objectValue);
+                json::Value& entry = (ret[adminEntry.toString()] = json::ObjectValue);
                 entry[jss::local] = localBalance;
                 entry[jss::remote] = adminEntry.remote_balance;
                 entry[jss::type] = "admin";
@@ -232,7 +232,7 @@ public:
     Gossip
     exportConsumers()
     {
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock_.now());
 
         Gossip gossip;
         std::scoped_lock const _(lock_);
@@ -243,7 +243,7 @@ public:
         {
             Gossip::Item item;
             item.balance = inboundEntry.local_balance.value(now);
-            if (item.balance >= minimumGossipBalance)
+            if (item.balance >= MinimumGossipBalance)
             {
                 item.address = inboundEntry.key->address;
                 gossip.items.push_back(item);
@@ -258,19 +258,19 @@ public:
     void
     importConsumers(std::string const& origin, Gossip const& gossip)
     {
-        auto const elapsed = m_clock.now();
+        auto const elapsed = clock_.now();
         {
             std::scoped_lock const _(lock_);
             auto [resultIt, resultInserted] = importTable_.emplace(
                 std::piecewise_construct,
-                std::make_tuple(origin),                                     // Key
-                std::make_tuple(m_clock.now().time_since_epoch().count()));  // Import
+                std::make_tuple(origin),                                    // Key
+                std::make_tuple(clock_.now().time_since_epoch().count()));  // Import
 
             if (resultInserted)
             {
                 // This is a new import
                 Import& next(resultIt->second);
-                next.whenExpires = elapsed + gossipExpirationSeconds;
+                next.whenExpires = elapsed + kGOSSIP_EXPIRATION_SECONDS;
                 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 + gossipExpirationSeconds;
+                next.whenExpires = elapsed + kGOSSIP_EXPIRATION_SECONDS;
                 next.items.reserve(gossip.items.size());
                 for (auto const& gossipItem : gossip.items)
                 {
@@ -319,16 +319,16 @@ public:
     {
         std::scoped_lock const _(lock_);
 
-        auto const elapsed = m_clock.now();
+        auto const elapsed = clock_.now();
 
         for (auto iter(inactive_.begin()); iter != inactive_.end();)
         {
             if (iter->whenExpires <= elapsed)
             {
-                JLOG(m_journal.debug()) << "Expired " << *iter;
-                auto table_iter = table_.find(*iter->key);
+                JLOG(journal_.debug()) << "Expired " << *iter;
+                auto tableIter = table_.find(*iter->key);
                 ++iter;
-                erase(table_iter);
+                erase(tableIter);
             }
             else
             {
@@ -342,10 +342,10 @@ public:
             Import& import(iter->second);
             if (iter->second.whenExpires <= elapsed)
             {
-                for (auto item_iter(import.items.begin()); item_iter != import.items.end();
-                     ++item_iter)
+                for (auto itemIter(import.items.begin()); itemIter != import.items.end();
+                     ++itemIter)
                 {
-                    item_iter->consumer.entry().remote_balance -= item_iter->balance;
+                    itemIter->consumer.entry().remote_balance -= itemIter->balance;
                 }
 
                 iter = importTable_.erase(iter);
@@ -363,13 +363,13 @@ public:
     static Disposition
     disposition(int balance)
     {
-        if (balance >= dropThreshold)
-            return Disposition::drop;
+        if (balance >= DropThreshold)
+            return Disposition::Drop;
 
-        if (balance >= warningThreshold)
-            return Disposition::warn;
+        if (balance >= WarningThreshold)
+            return Disposition::Warn;
 
-        return Disposition::ok;
+        return Disposition::Ok;
     }
 
     void
@@ -378,7 +378,7 @@ public:
         std::scoped_lock const _(lock_);
         Entry& entry(iter->second);
         XRPL_ASSERT(entry.refcount == 0, "xrpl::Resource::Logic::erase : entry not used");
-        inactive_.erase(inactive_.iterator_to(entry));
+        inactive_.erase(inactive_.iteratorTo(entry));
         table_.erase(iter);
     }
 
@@ -395,18 +395,18 @@ public:
         std::scoped_lock const _(lock_);
         if (--entry.refcount == 0)
         {
-            JLOG(m_journal.debug()) << "Inactive " << entry;
+            JLOG(journal_.debug()) << "Inactive " << entry;
 
             switch (entry.key->kind)
             {
-                case Kind::kindInbound:
-                    inbound_.erase(inbound_.iterator_to(entry));
+                case Kind::Inbound:
+                    inbound_.erase(inbound_.iteratorTo(entry));
                     break;
-                case Kind::kindOutbound:
-                    outbound_.erase(outbound_.iterator_to(entry));
+                case Kind::Outbound:
+                    outbound_.erase(outbound_.iteratorTo(entry));
                     break;
-                case Kind::kindUnlimited:
-                    admin_.erase(admin_.iterator_to(entry));
+                case Kind::Unlimited:
+                    admin_.erase(admin_.iteratorTo(entry));
                     break;
                 default:
                     // LCOV_EXCL_START
@@ -416,26 +416,27 @@ public:
                     break;
                     // LCOV_EXCL_STOP
             }
-            inactive_.push_back(entry);
-            entry.whenExpires = m_clock.now() + secondsUntilExpiration;
+            inactive_.pushBack(entry);
+            entry.whenExpires = clock_.now() + kSECONDS_UNTIL_EXPIRATION;
         }
     }
 
     Disposition
     charge(Entry& entry, Charge const& fee, std::string context = {})
     {
-        static constexpr Charge::value_type feeLogAsWarn = 3000;
-        static constexpr Charge::value_type feeLogAsInfo = 1000;
-        static constexpr Charge::value_type feeLogAsDebug = 100;
+        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_assert(
-            feeLogAsWarn > feeLogAsInfo && feeLogAsInfo > feeLogAsDebug && feeLogAsDebug > 10);
+            kFEE_LOG_AS_WARN > kFEE_LOG_AS_INFO && kFEE_LOG_AS_INFO > kFEE_LOG_AS_DEBUG &&
+            kFEE_LOG_AS_DEBUG > 10);
 
-        static auto getStream = [](Resource::Charge::value_type cost, beast::Journal& journal) {
-            if (cost >= feeLogAsWarn)
+        static auto kGET_STREAM = [](Resource::Charge::value_type cost, beast::Journal& journal) {
+            if (cost >= kFEE_LOG_AS_WARN)
                 return journal.warn();
-            if (cost >= feeLogAsInfo)
+            if (cost >= kFEE_LOG_AS_INFO)
                 return journal.info();
-            if (cost >= feeLogAsDebug)
+            if (cost >= kFEE_LOG_AS_DEBUG)
                 return journal.debug();
             return journal.trace();
         };
@@ -444,9 +445,10 @@ public:
             context = " (" + context + ")";
 
         std::scoped_lock const _(lock_);
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock_.now());
         int const balance(entry.add(fee.cost(), now));
-        JLOG(getStream(fee.cost(), m_journal)) << "Charging " << entry << " for " << fee << context;
+        JLOG(kGET_STREAM(fee.cost(), journal_))
+            << "Charging " << entry << " for " << fee << context;
         return disposition(balance);
     }
 
@@ -458,17 +460,17 @@ public:
 
         std::scoped_lock const _(lock_);
         bool notify(false);
-        auto const elapsed = m_clock.now();
-        if (entry.balance(m_clock.now()) >= warningThreshold && elapsed != entry.lastWarningTime)
+        auto const elapsed = clock_.now();
+        if (entry.balance(clock_.now()) >= WarningThreshold && elapsed != entry.lastWarningTime)
         {
-            charge(entry, feeWarning);
+            charge(entry, kFEE_WARNING);
             notify = true;
             entry.lastWarningTime = elapsed;
         }
         if (notify)
         {
-            JLOG(m_journal.info()) << "Load warning: " << entry;
-            ++m_stats.warn;
+            JLOG(journal_.info()) << "Load warning: " << entry;
+            ++stats_.warn;
         }
         return notify;
     }
@@ -481,18 +483,18 @@ public:
 
         std::scoped_lock const _(lock_);
         bool drop(false);
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock_.now());
         int const balance(entry.balance(now));
-        if (balance >= dropThreshold)
+        if (balance >= DropThreshold)
         {
-            JLOG(m_journal.warn()) << "Consumer entry " << entry << " dropped with balance "
-                                   << balance << " at or above drop threshold " << dropThreshold;
+            JLOG(journal_.warn()) << "Consumer entry " << entry << " dropped with balance "
+                                  << balance << " at or above drop threshold " << DropThreshold;
 
             // Adding feeDrop at this point keeps the dropped connection
             // from re-connecting for at least a little while after it is
             // dropped.
-            charge(entry, feeDrop);
-            ++m_stats.drop;
+            charge(entry, kFEE_DROP);
+            ++stats_.drop;
             drop = true;
         }
         return drop;
@@ -502,7 +504,7 @@ public:
     balance(Entry& entry)
     {
         std::scoped_lock const _(lock_);
-        return entry.balance(m_clock.now());
+        return entry.balance(clock_.now());
     }
 
     //--------------------------------------------------------------------------
@@ -518,7 +520,7 @@ public:
             beast::PropertyStream::Map item(items);
             if (entry.refcount != 0)
                 item["count"] = entry.refcount;
-            item["name"] = entry.to_string();
+            item["name"] = entry.toString();
             item["balance"] = entry.balance(now);
             if (entry.remote_balance != 0)
                 item["remote_balance"] = entry.remote_balance;
@@ -528,7 +530,7 @@ public:
     void
     onWrite(beast::PropertyStream::Map& map)
     {
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock_.now());
 
         std::scoped_lock const _(lock_);
 
diff --git a/include/xrpl/resource/detail/Tuning.h b/include/xrpl/resource/detail/Tuning.h
index d5e872d16c..3452005c35 100644
--- a/include/xrpl/resource/detail/Tuning.h
+++ b/include/xrpl/resource/detail/Tuning.h
@@ -9,26 +9,26 @@ namespace xrpl::Resource {
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Balance at which a warning is issued
-    warningThreshold = 5000
+    WarningThreshold = 5000
 
     // Balance at which the consumer is disconnected
     ,
-    dropThreshold = 25000
+    DropThreshold = 25000
 
     // The number of seconds in the exponential decay window
     // (This should be a power of two)
     ,
-    decayWindowSeconds = 32
+    DecayWindowSeconds = 32
 
     // The minimum balance required in order to include a load source in gossip
     ,
-    minimumGossipBalance = 1000
+    MinimumGossipBalance = 1000
 };
 
 // The number of seconds until an inactive table item is removed
-std::chrono::seconds constexpr secondsUntilExpiration{300};
+std::chrono::seconds constexpr kSECONDS_UNTIL_EXPIRATION{300};
 
 // Number of seconds until imported gossip expires
-std::chrono::seconds constexpr gossipExpirationSeconds{30};
+std::chrono::seconds constexpr kGOSSIP_EXPIRATION_SECONDS{30};
 
 }  // namespace xrpl::Resource
diff --git a/include/xrpl/server/InfoSub.h b/include/xrpl/server/InfoSub.h
index b6dff5983d..e93676a938 100644
--- a/include/xrpl/server/InfoSub.h
+++ b/include/xrpl/server/InfoSub.h
@@ -19,10 +19,10 @@ public:
 
     virtual ~InfoSubRequest() = default;
 
-    virtual Json::Value
+    virtual json::Value
     doClose() = 0;
-    virtual Json::Value
-    doStatus(Json::Value const&) = 0;
+    virtual json::Value
+    doStatus(json::Value const&) = 0;
 };
 
 /** Manages a client's subscription to data feeds.
@@ -72,7 +72,7 @@ public:
          * historical transactions
          * @return rpcSUCCESS if successful, otherwise an error code
          */
-        virtual error_code_i
+        virtual ErrorCodeI
         subAccountHistory(ref ispListener, AccountID const& account) = 0;
 
         /**
@@ -94,7 +94,7 @@ public:
 
         // VFALCO TODO Document the bool return value
         virtual bool
-        subLedger(ref ispListener, Json::Value& jvResult) = 0;
+        subLedger(ref ispListener, json::Value& jvResult) = 0;
         virtual bool
         unsubLedger(std::uint64_t uListener) = 0;
 
@@ -111,7 +111,7 @@ public:
         pubManifest(Manifest const&) = 0;
 
         virtual bool
-        subServer(ref ispListener, Json::Value& jvResult, bool admin) = 0;
+        subServer(ref ispListener, json::Value& jvResult, bool admin) = 0;
         virtual bool
         unsubServer(std::uint64_t uListener) = 0;
 
@@ -141,7 +141,7 @@ public:
         virtual bool
         unsubPeerStatus(std::uint64_t uListener) = 0;
         virtual void
-        pubPeerStatus(std::function<Json::Value(void)> const&) = 0;
+        pubPeerStatus(std::function<json::Value(void)> const&) = 0;
 
         virtual bool
         subConsensus(ref ispListener) = 0;
@@ -170,7 +170,7 @@ public:
     getConsumer();
 
     virtual void
-    send(Json::Value const& jvObj, bool broadcast) = 0;
+    send(json::Value const& jvObj, bool broadcast) = 0;
 
     [[nodiscard]] std::uint64_t
     getSeq() const;
@@ -207,23 +207,23 @@ public:
     getApiVersion() const noexcept;
 
 protected:
-    std::mutex mLock;
+    std::mutex lock_;
 
 private:
-    Consumer m_consumer;
-    Source& m_source;
+    Consumer consumer_;
+    Source& source_;
     hash_set<AccountID> realTimeSubscriptions_;
     hash_set<AccountID> normalSubscriptions_;
     std::shared_ptr<InfoSubRequest> request_;
-    std::uint64_t mSeq;
+    std::uint64_t seq_;
     hash_set<AccountID> accountHistorySubscriptions_;
     unsigned int apiVersion_ = 0;
 
     static int
-    assign_id()
+    assignId()
     {
-        static std::atomic<std::uint64_t> id(0);
-        return ++id;
+        static std::atomic<std::uint64_t> kID(0);
+        return ++kID;
     }
 };
 
diff --git a/include/xrpl/server/LoadFeeTrack.h b/include/xrpl/server/LoadFeeTrack.h
index e54ea4d280..5ad3972836 100644
--- a/include/xrpl/server/LoadFeeTrack.h
+++ b/include/xrpl/server/LoadFeeTrack.h
@@ -63,7 +63,7 @@ public:
     static std::uint32_t
     getLoadBase()
     {
-        return lftNormalFee;
+        return kLFT_NORMAL_FEE;
     }
 
     std::uint32_t
@@ -100,29 +100,29 @@ public:
     isLoadedLocal() const
     {
         std::scoped_lock const sl(lock_);
-        return (raiseCount_ != 0) || (localTxnLoadFee_ != lftNormalFee);
+        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLFT_NORMAL_FEE);
     }
 
     bool
     isLoadedCluster() const
     {
         std::scoped_lock const sl(lock_);
-        return (raiseCount_ != 0) || (localTxnLoadFee_ != lftNormalFee) ||
-            (clusterTxnLoadFee_ != lftNormalFee);
+        return (raiseCount_ != 0) || (localTxnLoadFee_ != kLFT_NORMAL_FEE) ||
+            (clusterTxnLoadFee_ != kLFT_NORMAL_FEE);
     }
 
 private:
-    static std::uint32_t constexpr lftNormalFee = 256;     // 256 is the minimum/normal load factor
-    static std::uint32_t constexpr lftFeeIncFraction = 4;  // increase fee by 1/4
-    static std::uint32_t constexpr lftFeeDecFraction = 4;  // decrease fee by 1/4
-    static std::uint32_t constexpr lftFeeMax = lftNormalFee * 1000000;
+    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;
 
     beast::Journal const j_;
     std::mutex mutable lock_;
 
-    std::uint32_t localTxnLoadFee_{lftNormalFee};    // Scale factor, lftNormalFee = normal fee
-    std::uint32_t remoteTxnLoadFee_{lftNormalFee};   // Scale factor, lftNormalFee = normal fee
-    std::uint32_t clusterTxnLoadFee_{lftNormalFee};  // Scale factor, lftNormalFee = normal fee
+    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 raiseCount_{0};
 };
 
diff --git a/include/xrpl/server/Manifest.h b/include/xrpl/server/Manifest.h
index e11d5dc0da..eed1c14dae 100644
--- a/include/xrpl/server/Manifest.h
+++ b/include/xrpl/server/Manifest.h
@@ -81,16 +81,16 @@ struct Manifest
     Manifest() = delete;
 
     Manifest(
-        std::string serialized_,
-        PublicKey const& masterKey_,
-        std::optional<PublicKey> const& signingKey_,
+        std::string serialized,
+        PublicKey const& masterKey,
+        std::optional<PublicKey> const& signingKey,
         std::uint32_t seq,
-        std::string domain_)
-        : serialized(std::move(serialized_))
-        , masterKey(masterKey_)
-        , signingKey(signingKey_)
+        std::string domain)
+        : serialized(std::move(serialized))
+        , masterKey(masterKey)
+        , signingKey(signingKey)
         , sequence(seq)
-        , domain(std::move(domain_))
+        , domain(std::move(domain))
     {
     }
 
@@ -194,19 +194,19 @@ loadValidatorToken(
 
 enum class ManifestDisposition {
     /// Manifest is valid
-    accepted = 0,
+    Accepted = 0,
 
     /// Sequence is too old
-    stale,
+    Stale,
 
     /// The master key is not acceptable to us
-    badMasterKey,
+    BadMasterKey,
 
     /// The ephemeral key is not acceptable to us
-    badEphemeralKey,
+    BadEphemeralKey,
 
     /// Timely, but invalid signature
-    invalid
+    Invalid
 };
 
 inline std::string
@@ -214,15 +214,15 @@ to_string(ManifestDisposition m)
 {
     switch (m)
     {
-        case ManifestDisposition::accepted:
+        case ManifestDisposition::Accepted:
             return "accepted";
-        case ManifestDisposition::stale:
+        case ManifestDisposition::Stale:
             return "stale";
-        case ManifestDisposition::badMasterKey:
+        case ManifestDisposition::BadMasterKey:
             return "badMasterKey";
-        case ManifestDisposition::badEphemeralKey:
+        case ManifestDisposition::BadEphemeralKey:
             return "badEphemeralKey";
-        case ManifestDisposition::invalid:
+        case ManifestDisposition::Invalid:
             return "invalid";
         default:
             return "unknown";
@@ -400,7 +400,7 @@ public:
     */
     template <class Function>
     void
-    for_each_manifest(Function&& f) const
+    forEachManifest(Function&& f) const
     {
         std::shared_lock const lock{mutex_};
         for (auto const& [_, manifest] : map_)
@@ -428,7 +428,7 @@ public:
     */
     template <class PreFun, class EachFun>
     void
-    for_each_manifest(PreFun&& pf, EachFun&& f) const
+    forEachManifest(PreFun&& pf, EachFun&& f) const
     {
         std::shared_lock const lock{mutex_};
         pf(map_.size());
diff --git a/include/xrpl/server/NetworkOPs.h b/include/xrpl/server/NetworkOPs.h
index c449bd283b..e2aa17566e 100644
--- a/include/xrpl/server/NetworkOPs.h
+++ b/include/xrpl/server/NetworkOPs.h
@@ -70,13 +70,13 @@ enum class OperatingMode {
 class NetworkOPs : public InfoSub::Source
 {
 public:
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
-    enum class FailHard : unsigned char { no, yes };
+    enum class FailHard : unsigned char { No, Yes };
     static FailHard
     doFailHard(bool noMeansDont)
     {
-        return noMeansDont ? FailHard::yes : FailHard::no;
+        return noMeansDont ? FailHard::Yes : FailHard::No;
     }
 
 public:
@@ -136,7 +136,7 @@ public:
     // Owner functions
     //
 
-    virtual Json::Value
+    virtual json::Value
     getOwnerInfo(std::shared_ptr<ReadView const> lpLedger, AccountID const& account) = 0;
 
     //--------------------------------------------------------------------------
@@ -151,8 +151,8 @@ public:
         AccountID const& uTakerID,
         bool const bProof,
         unsigned int iLimit,
-        Json::Value const& jvMarker,
-        Json::Value& jvResult) = 0;
+        json::Value const& jvMarker,
+        json::Value& jvResult) = 0;
 
     //--------------------------------------------------------------------------
 
@@ -207,13 +207,13 @@ public:
     virtual void
     consensusViewChange() = 0;
 
-    virtual Json::Value
+    virtual json::Value
     getConsensusInfo() = 0;
-    virtual Json::Value
+    virtual json::Value
     getServerInfo(bool human, bool admin, bool counters) = 0;
     virtual void
     clearLedgerFetch() = 0;
-    virtual Json::Value
+    virtual json::Value
     getLedgerFetchInfo() = 0;
 
     /** Accepts the current transaction tree, return the new ledger's sequence
@@ -248,7 +248,7 @@ public:
     pubValidation(std::shared_ptr<STValidation> const& val) = 0;
 
     virtual void
-    stateAccounting(Json::Value& obj) = 0;
+    stateAccounting(json::Value& obj) = 0;
 };
 
 }  // namespace xrpl
diff --git a/include/xrpl/server/Port.h b/include/xrpl/server/Port.h
index 515846b2a8..9207e0552b 100644
--- a/include/xrpl/server/Port.h
+++ b/include/xrpl/server/Port.h
@@ -16,7 +16,7 @@
 #include <string>
 
 namespace boost::asio::ssl {
-class context;
+class context;  // NOLINT(readability-identifier-naming) -- external library name
 }  // namespace boost::asio::ssl
 
 namespace xrpl {
@@ -97,6 +97,6 @@ struct ParsedPort
 };
 
 void
-parse_Port(ParsedPort& port, Section const& section, std::ostream& log);
+parsePort(ParsedPort& port, Section const& section, std::ostream& log);
 
 }  // namespace xrpl
diff --git a/include/xrpl/server/Server.h b/include/xrpl/server/Server.h
index 52340ac900..4d97fe9877 100644
--- a/include/xrpl/server/Server.h
+++ b/include/xrpl/server/Server.h
@@ -12,9 +12,9 @@ namespace xrpl {
 /** Create the HTTP server using the specified handler. */
 template <class Handler>
 std::unique_ptr<Server>
-make_Server(Handler& handler, boost::asio::io_context& io_context, beast::Journal journal)
+makeServer(Handler& handler, boost::asio::io_context& ioContext, beast::Journal journal)
 {
-    return std::make_unique<ServerImpl<Handler>>(handler, io_context, journal);
+    return std::make_unique<ServerImpl<Handler>>(handler, ioContext, journal);
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/server/Session.h b/include/xrpl/server/Session.h
index f7146c3b00..2cb991e130 100644
--- a/include/xrpl/server/Session.h
+++ b/include/xrpl/server/Session.h
@@ -75,7 +75,7 @@ public:
     write(void const* buffer, std::size_t bytes) = 0;
 
     virtual void
-    write(std::shared_ptr<Writer> const& writer, bool keep_alive) = 0;
+    write(std::shared_ptr<Writer> const& writer, bool keepAlive) = 0;
 
     /** @} */
 
diff --git a/include/xrpl/server/SimpleWriter.h b/include/xrpl/server/SimpleWriter.h
index 0c3b711187..dfb0b165e8 100644
--- a/include/xrpl/server/SimpleWriter.h
+++ b/include/xrpl/server/SimpleWriter.h
@@ -17,8 +17,8 @@ class SimpleWriter : public Writer
     boost::beast::multi_buffer sb_;
 
 public:
-    template <bool isRequest, class Body, class Fields>
-    explicit SimpleWriter(boost::beast::http::message<isRequest, Body, Fields> const& msg)
+    template <bool IsRequest, class Body, class Fields>
+    explicit SimpleWriter(boost::beast::http::message<IsRequest, Body, Fields> const& msg)
     {
         boost::beast::ostream(sb_) << msg;
     }
diff --git a/include/xrpl/server/WSSession.h b/include/xrpl/server/WSSession.h
index 01032359b3..b2fa52c859 100644
--- a/include/xrpl/server/WSSession.h
+++ b/include/xrpl/server/WSSession.h
@@ -103,7 +103,7 @@ struct WSSession
     request() const = 0;
 
     [[nodiscard]] virtual boost::asio::ip::tcp::endpoint const&
-    remote_endpoint() const = 0;
+    remoteEndpoint() const = 0;
 
     /** Send a WebSockets message. */
     virtual void
diff --git a/include/xrpl/server/Wallet.h b/include/xrpl/server/Wallet.h
index 29b28c41a1..c15014b1ef 100644
--- a/include/xrpl/server/Wallet.h
+++ b/include/xrpl/server/Wallet.h
@@ -31,14 +31,14 @@ makeTestWalletDB(DatabaseCon::Setup const& setup, std::string const& dbname, bea
  * @param session Session with the database.
  * @param dbTable Name of the database table from which the manifest will be
  *        extracted.
- * @param mCache Cache for storing the manifest.
+ * @param cache_ Cache for storing the manifest.
  * @param j Journal.
  */
 void
 getManifests(
     soci::session& session,
     std::string const& dbTable,
-    ManifestCache& mCache,
+    ManifestCache& cache,
     beast::Journal j);
 
 /**
@@ -89,7 +89,7 @@ getNodeIdentity(soci::session& session);
  * @param j Journal.
  * @return Peer reservation hash table.
  */
-std::unordered_set<PeerReservation, beast::uhash<>, KeyEqual>
+std::unordered_set<PeerReservation, beast::Uhash<>, KeyEqual>
 getPeerReservationTable(soci::session& session, beast::Journal j);
 
 /**
@@ -123,7 +123,7 @@ createFeatureVotes(soci::session& session);
 
 // For historical reasons the up-vote and down-vote integer representations
 // are unintuitive.
-enum class AmendmentVote : int { obsolete = -1, up = 0, down = 1 };
+enum class AmendmentVote : int { Obsolete = -1, Up = 0, Down = 1 };
 
 /**
  * @brief readAmendments Reads all amendments from the FeatureVotes table.
@@ -135,8 +135,8 @@ void
 readAmendments(
     soci::session& session,
     std::function<void(
-        boost::optional<std::string> amendment_hash,
-        boost::optional<std::string> amendment_name,
+        boost::optional<std::string> amendmentHash,
+        boost::optional<std::string> amendmentName,
         boost::optional<AmendmentVote> vote)> const& callback);
 
 /**
diff --git a/include/xrpl/server/detail/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h
index 31820402ab..0260cd6b84 100644
--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -30,7 +30,7 @@ namespace xrpl {
 
 /** Represents an active connection. */
 template <class Handler, class Impl>
-class BaseHTTPPeer : public io_list::work, public Session
+class BaseHTTPPeer : public IoList::Work, public Session
 {
 protected:
     using clock_type = std::chrono::system_clock;
@@ -42,16 +42,16 @@ protected:
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // Size of our read/write buffer
-        bufferSize = 4 * 1024,
+        BufferSize = 4 * 1024,
 
         // Max seconds without completing a message
-        timeoutSeconds = 30,
-        timeoutSecondsLocal = 3  // used for localhost clients
+        TimeoutSeconds = 30,
+        TimeoutSecondsLocal = 3  // used for localhost clients
     };
 
-    struct buffer
+    struct Buffer
     {
-        buffer(void const* ptr, std::size_t len) : data(new char[len]), bytes(len)
+        Buffer(void const* ptr, std::size_t len) : data(new char[len]), bytes(len)
         {
             memcpy(data.get(), ptr, len);
         }
@@ -73,8 +73,8 @@ protected:
 
     boost::asio::streambuf read_buf_;
     http_request_type message_;
-    std::vector<buffer> wq_;
-    std::vector<buffer> wq2_;
+    std::vector<Buffer> wq_;
+    std::vector<Buffer> wq2_;
     std::mutex mutex_;
     bool graceful_ = false;
     bool complete_ = false;
@@ -93,7 +93,7 @@ public:
         Handler& handler,
         boost::asio::executor const& executor,
         beast::Journal journal,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         ConstBufferSequence const& buffers);
 
     ~BaseHTTPPeer() override;
@@ -118,28 +118,28 @@ protected:
     fail(error_code ec, char const* what);
 
     void
-    start_timer();
+    startTimer();
 
     void
-    cancel_timer();
+    cancelTimer();
 
     void
-    on_timer();
+    onTimer();
 
     void
-    do_read(yield_context do_yield);
+    doRead(yield_context doYield);
 
     void
-    on_write(error_code const& ec, std::size_t bytes_transferred);
+    onWrite(error_code const& ec, std::size_t bytesTransferred);
 
     void
-    do_writer(std::shared_ptr<Writer> const& writer, bool keep_alive, yield_context do_yield);
+    doWriter(std::shared_ptr<Writer> const& writer, bool keepAlive, yield_context doYield);
 
     virtual void
-    do_request() = 0;
+    doRequest() = 0;
 
     virtual void
-    do_close() = 0;
+    doClose() = 0;
 
     // Session
 
@@ -158,7 +158,7 @@ protected:
     beast::IP::Endpoint
     remoteAddress() override
     {
-        return beast::IPAddressConversion::from_asio(remote_address_);
+        return beast::IPAddressConversion::fromAsio(remote_address_);
     }
 
     http_request_type&
@@ -171,7 +171,7 @@ protected:
     write(void const* buffer, std::size_t bytes) override;
 
     void
-    write(std::shared_ptr<Writer> const& writer, bool keep_alive) override;
+    write(std::shared_ptr<Writer> const& writer, bool keepAlive) override;
 
     std::shared_ptr<Session>
     detach() override;
@@ -192,19 +192,19 @@ BaseHTTPPeer<Handler, Impl>::BaseHTTPPeer(
     Handler& handler,
     boost::asio::executor const& executor,
     beast::Journal journal,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     ConstBufferSequence const& buffers)
     : port_(port)
     , handler_(handler)
     , work_(boost::asio::make_work_guard(executor))
     , strand_(boost::asio::make_strand(executor))
-    , remote_address_(std::move(remote_address))
+    , remote_address_(std::move(remoteAddress))
     , journal_(journal)
 {
     read_buf_.commit(
         boost::asio::buffer_copy(read_buf_.prepare(boost::asio::buffer_size(buffers)), buffers));
-    static std::atomic<int> sid;
-    nid_ = ++sid;
+    static std::atomic<int> kSID;
+    nid_ = ++kSID;
     id_ = std::string("#") + std::to_string(nid_) + " ";
     JLOG(journal_.trace()) << id_ << "accept:    " << remote_address_.address();
 }
@@ -247,18 +247,18 @@ BaseHTTPPeer<Handler, Impl>::fail(error_code ec, char const* what)
 
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::start_timer()
+BaseHTTPPeer<Handler, Impl>::startTimer()
 {
     boost::beast::get_lowest_layer(impl().stream_)
         .expires_after(
             std::chrono::seconds(
-                remote_address_.address().is_loopback() ? timeoutSecondsLocal : timeoutSeconds));
+                remote_address_.address().is_loopback() ? TimeoutSecondsLocal : TimeoutSeconds));
 }
 
 // Convenience for discarding the error code
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::cancel_timer()
+BaseHTTPPeer<Handler, Impl>::cancelTimer()
 {
     boost::beast::get_lowest_layer(impl().stream_).expires_never();
 }
@@ -266,7 +266,7 @@ BaseHTTPPeer<Handler, Impl>::cancel_timer()
 // Called when session times out
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::on_timer()
+BaseHTTPPeer<Handler, Impl>::onTimer()
 {
     auto ec = boost::system::errc::make_error_code(boost::system::errc::timed_out);
     fail(ec, "timer");
@@ -276,34 +276,34 @@ BaseHTTPPeer<Handler, Impl>::on_timer()
 
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::do_read(yield_context do_yield)
+BaseHTTPPeer<Handler, Impl>::doRead(yield_context doYield)
 {
     complete_ = false;
     error_code ec;
-    start_timer();
-    boost::beast::http::async_read(impl().stream_, read_buf_, message_, do_yield[ec]);
-    cancel_timer();
+    startTimer();
+    boost::beast::http::async_read(impl().stream_, read_buf_, message_, doYield[ec]);
+    cancelTimer();
     if (ec == boost::beast::http::error::end_of_stream)
-        return do_close();
+        return doClose();
     if (ec == boost::beast::error::timeout)
-        return on_timer();
+        return onTimer();
     if (ec)
         return fail(ec, "http::read");
-    do_request();
+    doRequest();
 }
 
 // Send everything in the write queue.
 // The write queue must not be empty upon entry.
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::on_write(error_code const& ec, std::size_t bytes_transferred)
+BaseHTTPPeer<Handler, Impl>::onWrite(error_code const& ec, std::size_t bytesTransferred)
 {
-    cancel_timer();
+    cancelTimer();
     if (ec == boost::beast::error::timeout)
-        return on_timer();
+        return onTimer();
     if (ec)
         return fail(ec, "write");
-    bytes_out_ += bytes_transferred;
+    bytes_out_ += bytesTransferred;
     {
         std::scoped_lock const lock(mutex_);
         wq2_.clear();
@@ -316,14 +316,14 @@ BaseHTTPPeer<Handler, Impl>::on_write(error_code const& ec, std::size_t bytes_tr
         v.reserve(wq2_.size());
         for (auto const& b : wq2_)
             v.emplace_back(b.data.get(), b.bytes);
-        start_timer();
+        startTimer();
         return boost::asio::async_write(
             impl().stream_,
             v,
             bind_executor(
                 strand_,
                 std::bind(
-                    &BaseHTTPPeer::on_write,
+                    &BaseHTTPPeer::onWrite,
                     impl().shared_from_this(),
                     std::placeholders::_1,
                     std::placeholders::_2)));
@@ -331,58 +331,58 @@ BaseHTTPPeer<Handler, Impl>::on_write(error_code const& ec, std::size_t bytes_tr
     if (!complete_)
         return;
     if (graceful_)
-        return do_close();
+        return doClose();
     util::spawn(
         strand_,
         std::bind(
-            &BaseHTTPPeer<Handler, Impl>::do_read,
+            &BaseHTTPPeer<Handler, Impl>::doRead,
             impl().shared_from_this(),
             std::placeholders::_1));
 }
 
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::do_writer(
+BaseHTTPPeer<Handler, Impl>::doWriter(
     std::shared_ptr<Writer> const& writer,
-    bool keep_alive,
-    yield_context do_yield)
+    bool keepAlive,
+    yield_context doYield)
 {
     std::function<void(void)> resume;
     {
         auto const p = impl().shared_from_this();
-        resume = std::function<void(void)>([this, p, writer, keep_alive]() {
+        resume = std::function<void(void)>([this, p, writer, keepAlive]() {
             util::spawn(
                 strand_,
                 std::bind(
-                    &BaseHTTPPeer<Handler, Impl>::do_writer,
+                    &BaseHTTPPeer<Handler, Impl>::doWriter,
                     p,
                     writer,
-                    keep_alive,
+                    keepAlive,
                     std::placeholders::_1));
         });
     }
 
     for (;;)
     {
-        if (!writer->prepare(bufferSize, resume))
+        if (!writer->prepare(BufferSize, resume))
             return;
         error_code ec;
-        auto const bytes_transferred = boost::asio::async_write(
-            impl().stream_, writer->data(), boost::asio::transfer_at_least(1), do_yield[ec]);
+        auto const bytesTransferred = boost::asio::async_write(
+            impl().stream_, writer->data(), boost::asio::transfer_at_least(1), doYield[ec]);
         if (ec)
             return fail(ec, "writer");
-        writer->consume(bytes_transferred);
+        writer->consume(bytesTransferred);
         if (writer->complete())
             break;
     }
 
-    if (!keep_alive)
-        return do_close();
+    if (!keepAlive)
+        return doClose();
 
     util::spawn(
         strand_,
         std::bind(
-            &BaseHTTPPeer<Handler, Impl>::do_read,
+            &BaseHTTPPeer<Handler, Impl>::doRead,
             impl().shared_from_this(),
             std::placeholders::_1));
 }
@@ -406,23 +406,23 @@ BaseHTTPPeer<Handler, Impl>::write(void const* buf, std::size_t bytes)
         {
             return post(
                 strand_,
-                std::bind(&BaseHTTPPeer::on_write, impl().shared_from_this(), error_code{}, 0));
+                std::bind(&BaseHTTPPeer::onWrite, impl().shared_from_this(), error_code{}, 0));
         }
-        return on_write(error_code{}, 0);
+        return onWrite(error_code{}, 0);
     }
 }
 
 template <class Handler, class Impl>
 void
-BaseHTTPPeer<Handler, Impl>::write(std::shared_ptr<Writer> const& writer, bool keep_alive)
+BaseHTTPPeer<Handler, Impl>::write(std::shared_ptr<Writer> const& writer, bool keepAlive)
 {
     util::spawn(
         strand_,
         std::bind(
-            &BaseHTTPPeer<Handler, Impl>::do_writer,
+            &BaseHTTPPeer<Handler, Impl>::doWriter,
             impl().shared_from_this(),
             writer,
-            keep_alive,
+            keepAlive,
             std::placeholders::_1));
 }
 
@@ -460,7 +460,7 @@ BaseHTTPPeer<Handler, Impl>::complete()
     util::spawn(
         strand_,
         std::bind(
-            &BaseHTTPPeer<Handler, Impl>::do_read,
+            &BaseHTTPPeer<Handler, Impl>::doRead,
             impl().shared_from_this(),
             std::placeholders::_1));
 }
@@ -490,7 +490,7 @@ BaseHTTPPeer<Handler, Impl>::close(bool graceful)
             if (!wq_.empty() || !wq2_.empty())
                 return;
         }
-        return do_close();
+        return doClose();
     }
 
     boost::beast::get_lowest_layer(impl().stream_).close();
diff --git a/include/xrpl/server/detail/BasePeer.h b/include/xrpl/server/detail/BasePeer.h
index 5bde6924a5..4aec164fe2 100644
--- a/include/xrpl/server/detail/BasePeer.h
+++ b/include/xrpl/server/detail/BasePeer.h
@@ -17,7 +17,7 @@ namespace xrpl {
 
 // Common part of all peers
 template <class Handler, class Impl>
-class BasePeer : public io_list::work
+class BasePeer : public IoList::Work
 {
 protected:
     using clock_type = std::chrono::system_clock;
@@ -40,7 +40,7 @@ public:
         Port const& port,
         Handler& handler,
         boost::asio::executor const& executor,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         beast::Journal journal);
 
     void
@@ -61,16 +61,16 @@ BasePeer<Handler, Impl>::BasePeer(
     Port const& port,
     Handler& handler,
     boost::asio::executor const& executor,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     beast::Journal journal)
     : port_(port)
     , handler_(handler)
-    , remote_address_(std::move(remote_address))
+    , remote_address_(std::move(remoteAddress))
     , sink_(
           journal.sink(),
           [] {
-              static std::atomic<unsigned> id{0};
-              return "##" + std::to_string(++id) + " ";
+              static std::atomic<unsigned> kID{0};
+              return "##" + std::to_string(++kID) + " ";
           }())
     , j_(sink_)
     , work_(boost::asio::make_work_guard(executor))
@@ -85,7 +85,7 @@ BasePeer<Handler, Impl>::close()
     if (!strand_.running_in_this_thread())
         return post(strand_, std::bind(&BasePeer::close, impl().shared_from_this()));
     error_code ec;
-    xrpl::get_lowest_layer(impl().ws_).socket().close(ec);
+    xrpl::getLowestLayer(impl().ws_).socket().close(ec);
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/server/detail/BaseWSPeer.h b/include/xrpl/server/detail/BaseWSPeer.h
index aaa4791059..0d592ff09f 100644
--- a/include/xrpl/server/detail/BaseWSPeer.h
+++ b/include/xrpl/server/detail/BaseWSPeer.h
@@ -59,7 +59,7 @@ public:
         Handler& handler,
         boost::asio::executor const& executor,
         waitable_timer timer,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         boost::beast::http::request<Body, Headers>&& request,
         beast::Journal journal);
 
@@ -83,7 +83,7 @@ public:
     }
 
     [[nodiscard]] boost::asio::ip::tcp::endpoint const&
-    remote_endpoint() const override
+    remoteEndpoint() const override
     {
         return this->remote_address_;
     }
@@ -108,40 +108,40 @@ protected:
     }
 
     void
-    on_ws_handshake(error_code const& ec);
+    onWsHandshake(error_code const& ec);
 
     void
-    do_write();
+    doWrite();
 
     void
-    on_write(error_code const& ec);
+    onWrite(error_code const& ec);
 
     void
-    on_write_fin(error_code const& ec);
+    onWriteFin(error_code const& ec);
 
     void
-    do_read();
+    doRead();
 
     void
-    on_read(error_code const& ec);
+    onRead(error_code const& ec);
 
     void
-    on_close(error_code const& ec);
+    onClose(error_code const& ec);
 
     void
-    start_timer();
+    startTimer();
 
     void
-    cancel_timer();
+    cancelTimer();
 
     void
-    on_ping(error_code const& ec);
+    onPing(error_code const& ec);
 
     void
-    on_ping_pong(boost::beast::websocket::frame_type kind, boost::beast::string_view payload);
+    onPingPong(boost::beast::websocket::frame_type kind, boost::beast::string_view payload);
 
     void
-    on_timer(error_code ec);
+    onTimer(error_code ec);
 
     template <class String>
     void
@@ -157,10 +157,10 @@ BaseWSPeer<Handler, Impl>::BaseWSPeer(
     Handler& handler,
     boost::asio::executor const& executor,
     waitable_timer timer,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     boost::beast::http::request<Body, Headers>&& request,
     beast::Journal journal)
-    : BasePeer<Handler, Impl>(port, handler, executor, remote_address, journal)
+    : BasePeer<Handler, Impl>(port, handler, executor, remoteAddress, journal)
     , request_(std::move(request))
     , timer_(std::move(timer))
     , payload_("12345678")  // ensures size is 8 bytes
@@ -177,9 +177,9 @@ BaseWSPeer<Handler, Impl>::run()
     // Must manage the control callback memory outside of the `control_callback`
     // function
     control_callback_ =
-        std::bind(&BaseWSPeer::on_ping_pong, this, std::placeholders::_1, std::placeholders::_2);
+        std::bind(&BaseWSPeer::onPingPong, this, std::placeholders::_1, std::placeholders::_2);
     impl().ws_.control_callback(control_callback_);
-    start_timer();
+    startTimer();
     close_on_timer_ = true;
     impl().ws_.set_option(boost::beast::websocket::stream_base::decorator([](auto& res) {
         res.set(boost::beast::http::field::server, BuildInfo::getFullVersionString());
@@ -189,7 +189,7 @@ BaseWSPeer<Handler, Impl>::run()
         bind_executor(
             strand_,
             std::bind(
-                &BaseWSPeer::on_ws_handshake, impl().shared_from_this(), std::placeholders::_1)));
+                &BaseWSPeer::onWsHandshake, impl().shared_from_this(), std::placeholders::_1)));
 }
 
 template <class Handler, class Impl>
@@ -202,7 +202,7 @@ BaseWSPeer<Handler, Impl>::send(std::shared_ptr<WSMsg> w)
         return;
     if (wq_.size() > port().ws_queue_limit)
     {
-        cr_.code = safe_cast<decltype(cr_.code)>(boost::beast::websocket::close_code::policy_error);
+        cr_.code = safeCast<decltype(cr_.code)>(boost::beast::websocket::close_code::policy_error);
         cr_.reason = "Policy error: client is too slow.";
         JLOG(this->j_.info()) << cr_.reason;
         wq_.erase(std::next(wq_.begin()), wq_.end());
@@ -211,7 +211,7 @@ BaseWSPeer<Handler, Impl>::send(std::shared_ptr<WSMsg> w)
     }
     wq_.emplace_back(std::move(w));
     if (wq_.size() == 1)
-        on_write({});
+        onWrite({});
 }
 
 template <class Handler, class Impl>
@@ -236,7 +236,7 @@ BaseWSPeer<Handler, Impl>::close(boost::beast::websocket::close_reason const& re
             reason,
             bind_executor(
                 strand_, [self = impl().shared_from_this()](boost::beast::error_code const& ec) {
-                    self->on_close(ec);
+                    self->onClose(ec);
                 }));
     }
     else
@@ -251,40 +251,40 @@ BaseWSPeer<Handler, Impl>::complete()
 {
     if (!strand_.running_in_this_thread())
         return post(strand_, std::bind(&BaseWSPeer::complete, impl().shared_from_this()));
-    do_read();
+    doRead();
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_ws_handshake(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onWsHandshake(error_code const& ec)
 {
     if (ec)
         return fail(ec, "on_ws_handshake");
     close_on_timer_ = false;
-    do_read();
+    doRead();
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::do_write()
+BaseWSPeer<Handler, Impl>::doWrite()
 {
     if (!strand_.running_in_this_thread())
-        return post(strand_, std::bind(&BaseWSPeer::do_write, impl().shared_from_this()));
-    on_write({});
+        return post(strand_, std::bind(&BaseWSPeer::doWrite, impl().shared_from_this()));
+    onWrite({});
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_write(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onWrite(error_code const& ec)
 {
     if (ec)
         return fail(ec, "write");
     auto& w = *wq_.front();
     auto const result =
-        w.prepare(65536, std::bind(&BaseWSPeer::do_write, impl().shared_from_this()));
+        w.prepare(65536, std::bind(&BaseWSPeer::doWrite, impl().shared_from_this()));
     if (boost::indeterminate(result.first))
         return;
-    start_timer();
+    startTimer();
     if (!result.first)
     {
         impl().ws_.async_write_some(
@@ -292,8 +292,7 @@ BaseWSPeer<Handler, Impl>::on_write(error_code const& ec)
             result.second,
             bind_executor(
                 strand_,
-                std::bind(
-                    &BaseWSPeer::on_write, impl().shared_from_this(), std::placeholders::_1)));
+                std::bind(&BaseWSPeer::onWrite, impl().shared_from_this(), std::placeholders::_1)));
     }
     else
     {
@@ -303,13 +302,13 @@ BaseWSPeer<Handler, Impl>::on_write(error_code const& ec)
             bind_executor(
                 strand_,
                 std::bind(
-                    &BaseWSPeer::on_write_fin, impl().shared_from_this(), std::placeholders::_1)));
+                    &BaseWSPeer::onWriteFin, impl().shared_from_this(), std::placeholders::_1)));
     }
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_write_fin(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onWriteFin(error_code const& ec)
 {
     if (ec)
         return fail(ec, "write_fin");
@@ -320,34 +319,33 @@ BaseWSPeer<Handler, Impl>::on_write_fin(error_code const& ec)
             cr_,
             bind_executor(
                 strand_,
-                std::bind(
-                    &BaseWSPeer::on_close, impl().shared_from_this(), std::placeholders::_1)));
+                std::bind(&BaseWSPeer::onClose, impl().shared_from_this(), std::placeholders::_1)));
     }
     else if (!wq_.empty())
     {
-        on_write({});
+        onWrite({});
     }
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::do_read()
+BaseWSPeer<Handler, Impl>::doRead()
 {
     if (!strand_.running_in_this_thread())
-        return post(strand_, std::bind(&BaseWSPeer::do_read, impl().shared_from_this()));
+        return post(strand_, std::bind(&BaseWSPeer::doRead, impl().shared_from_this()));
     impl().ws_.async_read(
         rb_,
         bind_executor(
             strand_,
-            std::bind(&BaseWSPeer::on_read, impl().shared_from_this(), std::placeholders::_1)));
+            std::bind(&BaseWSPeer::onRead, impl().shared_from_this(), std::placeholders::_1)));
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_read(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onRead(error_code const& ec)
 {
     if (ec == boost::beast::websocket::error::closed)
-        return on_close({});
+        return onClose({});
     if (ec)
         return fail(ec, "read");
     auto const& data = rb_.data();
@@ -360,22 +358,22 @@ BaseWSPeer<Handler, Impl>::on_read(error_code const& ec)
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_close(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onClose(error_code const& ec)
 {
-    cancel_timer();
+    cancelTimer();
 }
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::start_timer()
+BaseWSPeer<Handler, Impl>::startTimer()
 {
     // Max seconds without completing a message
-    static constexpr std::chrono::seconds timeout{30};
-    static constexpr std::chrono::seconds timeoutLocal{3};
+    static constexpr std::chrono::seconds kTIMEOUT{30};
+    static constexpr std::chrono::seconds kTIMEOUT_LOCAL{3};
 
     try
     {
-        timer_.expires_after(remote_endpoint().address().is_loopback() ? timeoutLocal : timeout);
+        timer_.expires_after(remoteEndpoint().address().is_loopback() ? kTIMEOUT_LOCAL : kTIMEOUT);
     }
     catch (boost::system::system_error const& e)
     {
@@ -385,7 +383,7 @@ BaseWSPeer<Handler, Impl>::start_timer()
     timer_.async_wait(bind_executor(
         strand_,
         std::bind(
-            &BaseWSPeer<Handler, Impl>::on_timer,
+            &BaseWSPeer<Handler, Impl>::onTimer,
             impl().shared_from_this(),
             std::placeholders::_1)));
 }
@@ -393,7 +391,7 @@ BaseWSPeer<Handler, Impl>::start_timer()
 // Convenience for discarding the error code
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::cancel_timer()
+BaseWSPeer<Handler, Impl>::cancelTimer()
 {
     try
     {
@@ -407,7 +405,7 @@ BaseWSPeer<Handler, Impl>::cancel_timer()
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_ping(error_code const& ec)
+BaseWSPeer<Handler, Impl>::onPing(error_code const& ec)
 {
     if (ec == boost::asio::error::operation_aborted)
         return;
@@ -419,7 +417,7 @@ BaseWSPeer<Handler, Impl>::on_ping(error_code const& ec)
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_ping_pong(
+BaseWSPeer<Handler, Impl>::onPingPong(
     boost::beast::websocket::frame_type kind,
     boost::beast::string_view payload)
 {
@@ -440,7 +438,7 @@ BaseWSPeer<Handler, Impl>::on_ping_pong(
 
 template <class Handler, class Impl>
 void
-BaseWSPeer<Handler, Impl>::on_timer(error_code ec)
+BaseWSPeer<Handler, Impl>::onTimer(error_code ec)
 {
     if (ec == boost::asio::error::operation_aborted)
         return;
@@ -448,17 +446,17 @@ BaseWSPeer<Handler, Impl>::on_timer(error_code ec)
     {
         if (!close_on_timer_ || !ping_active_)
         {
-            start_timer();
+            startTimer();
             close_on_timer_ = true;
             ping_active_ = true;
             // cryptographic is probably overkill..
-            beast::rngfill(payload_.begin(), payload_.size(), crypto_prng());
+            beast::rngfill(payload_.begin(), payload_.size(), cryptoPrng());
             impl().ws_.async_ping(
                 payload_,
                 bind_executor(
                     strand_,
                     std::bind(
-                        &BaseWSPeer::on_ping, impl().shared_from_this(), std::placeholders::_1)));
+                        &BaseWSPeer::onPing, impl().shared_from_this(), std::placeholders::_1)));
             JLOG(this->j_.trace()) << "sent ping";
             return;
         }
@@ -474,12 +472,12 @@ BaseWSPeer<Handler, Impl>::fail(error_code ec, String const& what)
 {
     XRPL_ASSERT(strand_.running_in_this_thread(), "xrpl::BaseWSPeer::fail : strand in this thread");
 
-    cancel_timer();
+    cancelTimer();
     if (!ec_ && ec != boost::asio::error::operation_aborted)
     {
         ec_ = ec;
         JLOG(this->j_.trace()) << what << ": " << ec.message();
-        xrpl::get_lowest_layer(impl().ws_).socket().close(ec);
+        xrpl::getLowestLayer(impl().ws_).socket().close(ec);
     }
 }
 
diff --git a/include/xrpl/server/detail/Door.h b/include/xrpl/server/detail/Door.h
index 2d95a1c5aa..811bf68a74 100644
--- a/include/xrpl/server/detail/Door.h
+++ b/include/xrpl/server/detail/Door.h
@@ -39,7 +39,7 @@ namespace xrpl {
 
 /** A listening socket. */
 template <class Handler>
-class Door : public io_list::work, public std::enable_shared_from_this<Door<Handler>>
+class Door : public IoList::Work, public std::enable_shared_from_this<Door<Handler>>
 {
 private:
     using clock_type = std::chrono::steady_clock;
@@ -53,7 +53,7 @@ private:
     using stream_type = boost::beast::tcp_stream;
 
     // Detects SSL on a socket
-    class Detector : public io_list::work, public std::enable_shared_from_this<Detector>
+    class Detector : public IoList::Work, public std::enable_shared_from_this<Detector>
     {
     private:
         Port const& port_;
@@ -71,7 +71,7 @@ private:
             Handler& handler,
             boost::asio::io_context& ioc,
             stream_type&& stream,
-            endpoint_type remote_address,
+            endpoint_type remoteAddress,
             beast::Journal j);
         void
         run();
@@ -80,7 +80,7 @@ private:
 
     private:
         void
-        do_detect(yield_context yield);
+        doDetect(yield_context yield);
     };
 
     beast::Journal const j_;
@@ -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 INITIAL_ACCEPT_DELAY{50};
-    static constexpr std::chrono::milliseconds MAX_ACCEPT_DELAY{2000};
-    std::chrono::milliseconds accept_delay_{INITIAL_ACCEPT_DELAY};
+    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};
     boost::asio::steady_timer backoff_timer_;
-    static constexpr double FREE_FD_THRESHOLD = 0.70;
+    static constexpr double kFREE_FD_THRESHOLD = 0.70;
 
     struct FDStats
     {
@@ -111,13 +111,13 @@ private:
     reOpen();
 
     std::optional<FDStats>
-    query_fd_stats() const;
+    queryFdStats() const;
 
     bool
-    should_throttle_for_fds();
+    shouldThrottleForFds();
 
 public:
-    Door(Handler& handler, boost::asio::io_context& io_context, Port const& port, beast::Journal j);
+    Door(Handler& handler, boost::asio::io_context& ioContext, Port const& port, beast::Journal j);
 
     // Work-around because we can't call shared_from_this in ctor
     void
@@ -133,7 +133,7 @@ public:
     close() override;
 
     [[nodiscard]] endpoint_type
-    get_endpoint() const
+    getEndpoint() const
     {
         return acceptor_.local_endpoint();
     }
@@ -145,10 +145,10 @@ private:
         bool ssl,
         ConstBufferSequence const& buffers,
         stream_type&& stream,
-        endpoint_type remote_address);
+        endpoint_type remoteAddress);
 
     void
-    do_accept(yield_context yield);
+    doAccept(yield_context yield);
 };
 
 template <class Handler>
@@ -157,14 +157,14 @@ Door<Handler>::Detector::Detector(
     Handler& handler,
     boost::asio::io_context& ioc,
     stream_type&& stream,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     beast::Journal j)
     : port_(port)
     , handler_(handler)
     , ioc_(ioc)
     , stream_(std::move(stream))
     , socket_(stream_.socket())
-    , remote_address_(std::move(remote_address))
+    , remote_address_(std::move(remoteAddress))
     , strand_(boost::asio::make_strand(ioc_))
     , j_(j)
 {
@@ -175,7 +175,7 @@ void
 Door<Handler>::Detector::run()
 {
     util::spawn(
-        strand_, std::bind(&Detector::do_detect, this->shared_from_this(), std::placeholders::_1));
+        strand_, std::bind(&Detector::doDetect, this->shared_from_this(), std::placeholders::_1));
 }
 
 template <class Handler>
@@ -187,12 +187,12 @@ Door<Handler>::Detector::close()
 
 template <class Handler>
 void
-Door<Handler>::Detector::do_detect(boost::asio::yield_context do_yield)
+Door<Handler>::Detector::doDetect(boost::asio::yield_context doYield)
 {
     boost::beast::multi_buffer buf(16);
     stream_.expires_after(std::chrono::seconds(15));
     boost::system::error_code ec;
-    bool const ssl = async_detect_ssl(stream_, buf, do_yield[ec]);
+    bool const ssl = async_detect_ssl(stream_, buf, doYield[ec]);
     stream_.expires_never();
     if (!ec)
     {
@@ -234,9 +234,9 @@ Door<Handler>::reOpen()
         }
     }
 
-    endpoint_type const local_address = endpoint_type(port_.ip, port_.port);
+    endpoint_type const localAddress = endpoint_type(port_.ip, port_.port);
 
-    acceptor_.open(local_address.protocol(), ec);
+    acceptor_.open(localAddress.protocol(), ec);
     if (ec)
     {
         JLOG(j_.error()) << "Open port '" << port_.name << "' failed:" << ec.message();
@@ -250,7 +250,7 @@ Door<Handler>::reOpen()
         Throw<std::exception>();
     }
 
-    acceptor_.bind(local_address, ec);
+    acceptor_.bind(localAddress, ec);
     if (ec)
     {
         JLOG(j_.error()) << "Bind port '" << port_.name << "' failed:" << ec.message();
@@ -270,16 +270,16 @@ Door<Handler>::reOpen()
 template <class Handler>
 Door<Handler>::Door(
     Handler& handler,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     Port const& port,
     beast::Journal j)
     : j_(j)
     , port_(port)
     , handler_(handler)
-    , ioc_(io_context)
-    , acceptor_(io_context)
-    , strand_(boost::asio::make_strand(io_context))
-    , backoff_timer_(io_context)
+    , ioc_(ioContext)
+    , acceptor_(ioContext)
+    , strand_(boost::asio::make_strand(ioContext))
+    , backoff_timer_(ioContext)
 {
     reOpen();
 }
@@ -290,7 +290,7 @@ Door<Handler>::run()
 {
     util::spawn(
         strand_,
-        std::bind(&Door<Handler>::do_accept, this->shared_from_this(), std::placeholders::_1));
+        std::bind(&Door<Handler>::doAccept, this->shared_from_this(), std::placeholders::_1));
 }
 
 template <class Handler>
@@ -316,41 +316,41 @@ Door<Handler>::create(
     bool ssl,
     ConstBufferSequence const& buffers,
     stream_type&& stream,
-    endpoint_type remote_address)
+    endpoint_type remoteAddress)
 {
     if (ssl)
     {
         if (auto sp = ios().template emplace<SSLHTTPPeer<Handler>>(
-                port_, handler_, ioc_, j_, remote_address, buffers, std::move(stream)))
+                port_, handler_, ioc_, j_, remoteAddress, buffers, std::move(stream)))
             sp->run();
         return;
     }
     if (auto sp = ios().template emplace<PlainHTTPPeer<Handler>>(
-            port_, handler_, ioc_, j_, remote_address, buffers, std::move(stream)))
+            port_, handler_, ioc_, j_, remoteAddress, buffers, std::move(stream)))
         sp->run();
 }
 
 template <class Handler>
 void
-Door<Handler>::do_accept(boost::asio::yield_context do_yield)
+Door<Handler>::doAccept(boost::asio::yield_context doYield)
 {
     while (acceptor_.is_open())
     {
-        if (should_throttle_for_fds())
+        if (shouldThrottleForFds())
         {
             backoff_timer_.expires_after(accept_delay_);
             boost::system::error_code tec;
-            backoff_timer_.async_wait(do_yield[tec]);
-            accept_delay_ = std::min(accept_delay_ * 2, MAX_ACCEPT_DELAY);
+            backoff_timer_.async_wait(doYield[tec]);
+            accept_delay_ = std::min(accept_delay_ * 2, kMAX_ACCEPT_DELAY);
             JLOG(j_.warn()) << "Throttling do_accept for " << accept_delay_.count() << "ms.";
             continue;
         }
 
         error_code ec;
-        endpoint_type remote_address;
+        endpoint_type remoteAddress;
         stream_type stream(ioc_);
         socket_type& socket = stream.socket();
-        acceptor_.async_accept(socket, remote_address, do_yield[ec]);
+        acceptor_.async_accept(socket, remoteAddress, doYield[ec]);
         if (ec)
         {
             if (ec == boost::asio::error::operation_aborted)
@@ -364,9 +364,9 @@ Door<Handler>::do_accept(boost::asio::yield_context do_yield)
 
                 backoff_timer_.expires_after(accept_delay_);
                 boost::system::error_code tec;
-                backoff_timer_.async_wait(do_yield[tec]);
+                backoff_timer_.async_wait(doYield[tec]);
 
-                accept_delay_ = std::min(accept_delay_ * 2, MAX_ACCEPT_DELAY);
+                accept_delay_ = std::min(accept_delay_ * 2, kMAX_ACCEPT_DELAY);
             }
             else
             {
@@ -375,24 +375,24 @@ Door<Handler>::do_accept(boost::asio::yield_context do_yield)
             continue;
         }
 
-        accept_delay_ = INITIAL_ACCEPT_DELAY;
+        accept_delay_ = kINITIAL_ACCEPT_DELAY;
 
         if (ssl_ && plain_)
         {
             if (auto sp = ios().template emplace<Detector>(
-                    port_, handler_, ioc_, std::move(stream), remote_address, j_))
+                    port_, handler_, ioc_, std::move(stream), remoteAddress, j_))
                 sp->run();
         }
         else if (ssl_ || plain_)
         {
-            create(ssl_, boost::asio::null_buffers{}, std::move(stream), remote_address);
+            create(ssl_, boost::asio::null_buffers{}, std::move(stream), remoteAddress);
         }
     }
 }
 
 template <class Handler>
 std::optional<typename Door<Handler>::FDStats>
-Door<Handler>::query_fd_stats() const
+Door<Handler>::queryFdStats() const
 {
 #if BOOST_OS_WINDOWS
     return std::nullopt;
@@ -403,11 +403,11 @@ Door<Handler>::query_fd_stats() const
         return std::nullopt;
     s.limit = static_cast<std::uint64_t>(rl.rlim_cur);
 #if BOOST_OS_LINUX
-    constexpr char const* kFdDir = "/proc/self/fd";
+    constexpr char const* kFD_DIR = "/proc/self/fd";
 #else
-    constexpr char const* kFdDir = "/dev/fd";
+    constexpr char const* kFD_DIR = "/dev/fd";
 #endif
-    if (DIR* d = ::opendir(kFdDir))
+    if (DIR* d = ::opendir(kFD_DIR))
     {
         std::uint64_t cnt = 0;
         while (::readdir(d) != nullptr)
@@ -423,19 +423,19 @@ Door<Handler>::query_fd_stats() const
 
 template <class Handler>
 bool
-Door<Handler>::should_throttle_for_fds()
+Door<Handler>::shouldThrottleForFds()
 {
 #if BOOST_OS_WINDOWS
     return false;
 #else
-    auto const stats = query_fd_stats();
+    auto const stats = queryFdStats();
     if (!stats || stats->limit == 0)
         return false;
 
     auto const& s = *stats;
     auto const free = (s.limit > s.used) ? (s.limit - s.used) : 0ull;
-    double const free_ratio = static_cast<double>(free) / static_cast<double>(s.limit);
-    return free_ratio < FREE_FD_THRESHOLD;
+    double const freeRatio = static_cast<double>(free) / static_cast<double>(s.limit);
+    return freeRatio < kFREE_FD_THRESHOLD;
 #endif
 }
 
diff --git a/include/xrpl/server/detail/JSONRPCUtil.h b/include/xrpl/server/detail/JSONRPCUtil.h
index 934085f8e6..b2e87f5332 100644
--- a/include/xrpl/server/detail/JSONRPCUtil.h
+++ b/include/xrpl/server/detail/JSONRPCUtil.h
@@ -7,6 +7,6 @@
 namespace xrpl {
 
 void
-HTTPReply(int nStatus, std::string const& strMsg, Json::Output const&, beast::Journal j);
+httpReply(int nStatus, std::string const& strMsg, json::Output const&, beast::Journal j);
 
 }  // namespace xrpl
diff --git a/include/xrpl/server/detail/LowestLayer.h b/include/xrpl/server/detail/LowestLayer.h
index b8b0d46180..d28510d1a5 100644
--- a/include/xrpl/server/detail/LowestLayer.h
+++ b/include/xrpl/server/detail/LowestLayer.h
@@ -11,7 +11,7 @@ namespace xrpl {
 // Before boost 1.70, get_lowest_layer required an explicit template parameter
 template <class T>
 decltype(auto)
-get_lowest_layer(T& t) noexcept
+getLowestLayer(T& t) noexcept
 {
 #if BOOST_VERSION >= 107000
     return boost::beast::get_lowest_layer(t);
diff --git a/include/xrpl/server/detail/PlainHTTPPeer.h b/include/xrpl/server/detail/PlainHTTPPeer.h
index ef6128560a..40f7fe2571 100644
--- a/include/xrpl/server/detail/PlainHTTPPeer.h
+++ b/include/xrpl/server/detail/PlainHTTPPeer.h
@@ -30,7 +30,7 @@ public:
         Handler& handler,
         boost::asio::io_context& ioc,
         beast::Journal journal,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         ConstBufferSequence const& buffers,
         stream_type&& stream);
 
@@ -42,10 +42,10 @@ public:
 
 private:
     void
-    do_request() override;
+    doRequest() override;
 
     void
-    do_close() override;
+    doClose() override;
 };
 
 //------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ PlainHTTPPeer<Handler>::PlainHTTPPeer(
     Handler& handler,
     boost::asio::io_context& ioc,
     beast::Journal journal,
-    endpoint_type remote_endpoint,
+    endpoint_type remoteEndpoint,
     ConstBufferSequence const& buffers,
     stream_type&& stream)
     : BaseHTTPPeer<Handler, PlainHTTPPeer>(
@@ -65,7 +65,7 @@ PlainHTTPPeer<Handler>::PlainHTTPPeer(
           handler,
           ioc.get_executor(),
           journal,
-          remote_endpoint,
+          remoteEndpoint,
           buffers)
     , stream_(std::move(stream))
     , socket_(stream_.socket())
@@ -74,7 +74,7 @@ PlainHTTPPeer<Handler>::PlainHTTPPeer(
     // otherwise Nagle's algorithm makes Env
     // tests run slower on Linux systems.
     //
-    if (remote_endpoint.address().is_loopback())
+    if (remoteEndpoint.address().is_loopback())
         socket_.set_option(boost::asio::ip::tcp::no_delay{true});
 }
 
@@ -84,7 +84,7 @@ PlainHTTPPeer<Handler>::run()
 {
     if (!this->handler_.onAccept(this->session(), this->remote_address_))
     {
-        util::spawn(this->strand_, std::bind(&PlainHTTPPeer::do_close, this->shared_from_this()));
+        util::spawn(this->strand_, std::bind(&PlainHTTPPeer::doClose, this->shared_from_this()));
         return;
     }
 
@@ -93,7 +93,7 @@ PlainHTTPPeer<Handler>::run()
 
     util::spawn(
         this->strand_,
-        std::bind(&PlainHTTPPeer::do_read, this->shared_from_this(), std::placeholders::_1));
+        std::bind(&PlainHTTPPeer::doRead, this->shared_from_this(), std::placeholders::_1));
 }
 
 template <class Handler>
@@ -112,7 +112,7 @@ PlainHTTPPeer<Handler>::websocketUpgrade()
 
 template <class Handler>
 void
-PlainHTTPPeer<Handler>::do_request()
+PlainHTTPPeer<Handler>::doRequest()
 {
     ++this->request_count_;
     auto const what =
@@ -131,7 +131,7 @@ PlainHTTPPeer<Handler>::do_request()
     }
 
     // Perform half-close when Connection: close and not SSL
-    if (!beast::rfc2616::is_keep_alive(this->message_))
+    if (!beast::rfc2616::isKeepAlive(this->message_))
         socket_.shutdown(socket_type::shutdown_receive, ec);
     if (ec)
         return this->fail(ec, "request");
@@ -141,7 +141,7 @@ PlainHTTPPeer<Handler>::do_request()
 
 template <class Handler>
 void
-PlainHTTPPeer<Handler>::do_close()
+PlainHTTPPeer<Handler>::doClose()
 {
     boost::system::error_code ec;
     socket_.shutdown(socket_type::shutdown_send, ec);
diff --git a/include/xrpl/server/detail/PlainWSPeer.h b/include/xrpl/server/detail/PlainWSPeer.h
index 9196d5ea49..593973a3ed 100644
--- a/include/xrpl/server/detail/PlainWSPeer.h
+++ b/include/xrpl/server/detail/PlainWSPeer.h
@@ -28,7 +28,7 @@ public:
     PlainWSPeer(
         Port const& port,
         Handler& handler,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         boost::beast::http::request<Body, Headers>&& request,
         socket_type&& socket,
         beast::Journal journal);
@@ -41,7 +41,7 @@ template <class Body, class Headers>
 PlainWSPeer<Handler>::PlainWSPeer(
     Port const& port,
     Handler& handler,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     boost::beast::http::request<Body, Headers>&& request,
     socket_type&& socket,
     beast::Journal journal)
@@ -50,7 +50,7 @@ PlainWSPeer<Handler>::PlainWSPeer(
           handler,
           socket.get_executor(),
           waitable_timer{socket.get_executor()},
-          remote_address,
+          remoteAddress,
           std::move(request),
           journal)
     , ws_(std::move(socket))
diff --git a/include/xrpl/server/detail/SSLHTTPPeer.h b/include/xrpl/server/detail/SSLHTTPPeer.h
index 240261fce6..2eec8ed60f 100644
--- a/include/xrpl/server/detail/SSLHTTPPeer.h
+++ b/include/xrpl/server/detail/SSLHTTPPeer.h
@@ -37,7 +37,7 @@ public:
         Handler& handler,
         boost::asio::io_context& ioc,
         beast::Journal journal,
-        endpoint_type remote_address,
+        endpoint_type remoteAddress,
         ConstBufferSequence const& buffers,
         middle_type&& stream);
 
@@ -49,16 +49,16 @@ public:
 
 private:
     void
-    do_handshake(yield_context do_yield);
+    doHandshake(yield_context doYield);
 
     void
-    do_request() override;
+    doRequest() override;
 
     void
-    do_close() override;
+    doClose() override;
 
     void
-    on_shutdown(error_code ec);
+    onShutdown(error_code ec);
 };
 
 //------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ SSLHTTPPeer<Handler>::SSLHTTPPeer(
     Handler& handler,
     boost::asio::io_context& ioc,
     beast::Journal journal,
-    endpoint_type remote_address,
+    endpoint_type remoteAddress,
     ConstBufferSequence const& buffers,
     middle_type&& stream)
     : BaseHTTPPeer<Handler, SSLHTTPPeer>(
@@ -78,7 +78,7 @@ SSLHTTPPeer<Handler>::SSLHTTPPeer(
           handler,
           ioc.get_executor(),
           journal,
-          remote_address,
+          remoteAddress,
           buffers)
     , stream_ptr_(std::make_unique<stream_type>(middle_type(std::move(stream)), *port.context))
     , stream_(*stream_ptr_)
@@ -93,14 +93,14 @@ SSLHTTPPeer<Handler>::run()
 {
     if (!this->handler_.onAccept(this->session(), this->remote_address_))
     {
-        util::spawn(this->strand_, std::bind(&SSLHTTPPeer::do_close, this->shared_from_this()));
+        util::spawn(this->strand_, std::bind(&SSLHTTPPeer::doClose, this->shared_from_this()));
         return;
     }
     if (!socket_.is_open())
         return;
     util::spawn(
         this->strand_,
-        std::bind(&SSLHTTPPeer::do_handshake, this->shared_from_this(), std::placeholders::_1));
+        std::bind(&SSLHTTPPeer::doHandshake, this->shared_from_this(), std::placeholders::_1));
 }
 
 template <class Handler>
@@ -119,16 +119,16 @@ SSLHTTPPeer<Handler>::websocketUpgrade()
 
 template <class Handler>
 void
-SSLHTTPPeer<Handler>::do_handshake(yield_context do_yield)
+SSLHTTPPeer<Handler>::doHandshake(yield_context doYield)
 {
     boost::system::error_code ec;
     stream_.set_verify_mode(boost::asio::ssl::verify_none);
-    this->start_timer();
+    this->startTimer();
     this->read_buf_.consume(
-        stream_.async_handshake(stream_type::server, this->read_buf_.data(), do_yield[ec]));
-    this->cancel_timer();
+        stream_.async_handshake(stream_type::server, this->read_buf_.data(), doYield[ec]));
+    this->cancelTimer();
     if (ec == boost::beast::error::timeout)
-        return this->on_timer();
+        return this->onTimer();
     if (ec)
         return this->fail(ec, "handshake");
     bool const http = this->port().protocol.count("peer") > 0 ||
@@ -138,7 +138,7 @@ SSLHTTPPeer<Handler>::do_handshake(yield_context do_yield)
     {
         util::spawn(
             this->strand_,
-            std::bind(&SSLHTTPPeer::do_read, this->shared_from_this(), std::placeholders::_1));
+            std::bind(&SSLHTTPPeer::doRead, this->shared_from_this(), std::placeholders::_1));
         return;
     }
     // `this` will be destroyed
@@ -146,7 +146,7 @@ SSLHTTPPeer<Handler>::do_handshake(yield_context do_yield)
 
 template <class Handler>
 void
-SSLHTTPPeer<Handler>::do_request()
+SSLHTTPPeer<Handler>::doRequest()
 {
     ++this->request_count_;
     auto const what = this->handler_.onHandoff(
@@ -161,19 +161,19 @@ SSLHTTPPeer<Handler>::do_request()
 
 template <class Handler>
 void
-SSLHTTPPeer<Handler>::do_close()
+SSLHTTPPeer<Handler>::doClose()
 {
-    this->start_timer();
+    this->startTimer();
     stream_.async_shutdown(bind_executor(
         this->strand_,
-        std::bind(&SSLHTTPPeer::on_shutdown, this->shared_from_this(), std::placeholders::_1)));
+        std::bind(&SSLHTTPPeer::onShutdown, this->shared_from_this(), std::placeholders::_1)));
 }
 
 template <class Handler>
 void
-SSLHTTPPeer<Handler>::on_shutdown(error_code ec)
+SSLHTTPPeer<Handler>::onShutdown(error_code ec)
 {
-    this->cancel_timer();
+    this->cancelTimer();
 
     if (ec == boost::asio::error::operation_aborted)
         return;
diff --git a/include/xrpl/server/detail/SSLWSPeer.h b/include/xrpl/server/detail/SSLWSPeer.h
index b80312e55f..19b77ea932 100644
--- a/include/xrpl/server/detail/SSLWSPeer.h
+++ b/include/xrpl/server/detail/SSLWSPeer.h
@@ -36,9 +36,9 @@ public:
     SSLWSPeer(
         Port const& port,
         Handler& handler,
-        endpoint_type remote_endpoint,
+        endpoint_type remoteEndpoint,
         boost::beast::http::request<Body, Headers>&& request,
-        std::unique_ptr<stream_type>&& stream_ptr,
+        std::unique_ptr<stream_type>&& streamPtr,
         beast::Journal journal);
 };
 
@@ -49,19 +49,19 @@ template <class Body, class Headers>
 SSLWSPeer<Handler>::SSLWSPeer(
     Port const& port,
     Handler& handler,
-    endpoint_type remote_endpoint,
+    endpoint_type remoteEndpoint,
     boost::beast::http::request<Body, Headers>&& request,
-    std::unique_ptr<stream_type>&& stream_ptr,
+    std::unique_ptr<stream_type>&& streamPtr,
     beast::Journal journal)
     : BaseWSPeer<Handler, SSLWSPeer>(
           port,
           handler,
-          stream_ptr->get_executor(),
-          waitable_timer{stream_ptr->get_executor()},
-          remote_endpoint,
+          streamPtr->get_executor(),
+          waitable_timer{streamPtr->get_executor()},
+          remoteEndpoint,
           std::move(request),
           journal)
-    , stream_ptr_(std::move(stream_ptr))
+    , stream_ptr_(std::move(streamPtr))
     , ws_(*stream_ptr_)
 {
 }
diff --git a/include/xrpl/server/detail/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h
index 2c3a8330e1..ce3a1c19c7 100644
--- a/include/xrpl/server/detail/ServerImpl.h
+++ b/include/xrpl/server/detail/ServerImpl.h
@@ -64,7 +64,7 @@ private:
 
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { historySize = 100 };
+    enum { HistorySize = 100 };
 
     Handler& handler_;
     beast::Journal const j_;
@@ -78,10 +78,10 @@ private:
     int high_ = 0;
     std::array<std::size_t, 64> hist_{};
 
-    io_list ios_;
+    IoList ios_;
 
 public:
-    ServerImpl(Handler& handler, boost::asio::io_context& io_context, beast::Journal journal);
+    ServerImpl(Handler& handler, boost::asio::io_context& ioContext, beast::Journal journal);
 
     ~ServerImpl() override;
 
@@ -97,14 +97,14 @@ public:
     void
     close() override;
 
-    io_list&
+    IoList&
     ios()
     {
         return ios_;
     }
 
     boost::asio::io_context&
-    get_io_context()
+    getIoContext()
     {
         return io_context_;
     }
@@ -114,17 +114,17 @@ public:
 
 private:
     static int
-    ceil_log2(unsigned long long x);
+    ceilLog2(unsigned long long x);
 };
 
 template <class Handler>
 ServerImpl<Handler>::ServerImpl(
     Handler& handler,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     beast::Journal journal)
     : handler_(handler)
     , j_(journal)
-    , io_context_(io_context)
+    , io_context_(ioContext)
     , strand_(boost::asio::make_strand(io_context_))
     , work_(std::in_place, boost::asio::make_work_guard(io_context_))
 {
@@ -156,7 +156,7 @@ ServerImpl<Handler>::ports(std::vector<Port> const& ports)
         {
             list_.push_back(sp);
 
-            auto ep = sp->get_endpoint();
+            auto ep = sp->getEndpoint();
             if (internalPort.port == 0u)
                 internalPort.port = ep.port();
             eps.emplace(port.name, std::move(ep));
diff --git a/include/xrpl/server/detail/io_list.h b/include/xrpl/server/detail/io_list.h
index 67e04d04b6..a7037b683c 100644
--- a/include/xrpl/server/detail/io_list.h
+++ b/include/xrpl/server/detail/io_list.h
@@ -12,31 +12,31 @@
 namespace xrpl {
 
 /** Manages a set of objects performing asynchronous I/O. */
-class io_list final
+class IoList final
 {
 public:
-    class work
+    class Work
     {
         template <class = void>
         void
         destroy();
 
-        friend class io_list;
-        io_list* ios_ = nullptr;
+        friend class IoList;
+        IoList* ios_ = nullptr;
 
     public:
-        virtual ~work()
+        virtual ~Work()
         {
             destroy();
         }
 
-        /** Return the io_list associated with the work.
+        /** Return the IoList associated with the work.
 
             Requirements:
-                The call to io_list::emplace to
+                The call to IoList::emplace to
                 create the work has already returned.
         */
-        io_list&
+        IoList&
         ios()
         {
             return *ios_;
@@ -55,21 +55,21 @@ private:
     std::size_t n_ = 0;
     bool closed_ = false;
     std::condition_variable cv_;
-    boost::container::flat_map<work*, std::weak_ptr<work>> map_;
+    boost::container::flat_map<Work*, std::weak_ptr<Work>> map_;
     std::function<void(void)> f_;
 
 public:
-    io_list() = default;
+    IoList() = default;
 
     /** Destroy the list.
 
         Effects:
-            Closes the io_list if it was not previously
+            Closes the IoList if it was not previously
                 closed. No finisher is invoked in this case.
 
             Blocks until all work is destroyed.
     */
-    ~io_list()
+    ~IoList()
     {
         destroy();
     }
@@ -89,7 +89,7 @@ public:
     /** Create associated work if not closed.
 
         Requirements:
-            `std::is_base_of_v<work, T> == true`
+            `std::is_base_of_v<Work, T> == true`
 
         Thread Safety:
             May be called concurrently.
@@ -101,7 +101,7 @@ public:
 
         If the call succeeds and returns a new object,
         it is guaranteed that a subsequent call to close
-        will invoke work::close on the object.
+        will invoke Work::close on the object.
 
     */
     template <class T, class... Args>
@@ -159,7 +159,7 @@ public:
 
 template <class>
 void
-io_list::work::destroy()
+IoList::Work::destroy()
 {
     if (!ios_)
         return;
@@ -179,7 +179,7 @@ io_list::work::destroy()
 
 template <class>
 void
-io_list::destroy()
+IoList::destroy()
 {
     close();
     join();
@@ -187,9 +187,9 @@ io_list::destroy()
 
 template <class T, class... Args>
 std::shared_ptr<T>
-io_list::emplace(Args&&... args)
+IoList::emplace(Args&&... args)
 {
-    static_assert(std::is_base_of_v<work, T>, "T must derive from io_list::work");
+    static_assert(std::is_base_of_v<Work, T>, "T must derive from IoList::Work");
     if (closed_)
         return nullptr;
     auto sp = std::make_shared<T>(std::forward<Args>(args)...);
@@ -199,7 +199,7 @@ io_list::emplace(Args&&... args)
     if (!closed_)
     {
         ++n_;
-        sp->work::ios_ = this;
+        sp->Work::ios_ = this;
         map_.emplace(sp.get(), sp);
     }
     else
@@ -211,7 +211,7 @@ io_list::emplace(Args&&... args)
 
 template <class Finisher>
 void
-io_list::close(Finisher&& f)
+IoList::close(Finisher&& f)
 {
     std::unique_lock<std::mutex> lock(m_);
     if (closed_)
@@ -237,7 +237,7 @@ io_list::close(Finisher&& f)
 
 template <class>
 void
-io_list::join()
+IoList::join()
 {
     std::unique_lock<std::mutex> lock(m_);
     cv_.wait(lock, [&] { return closed_ && n_ == 0; });
diff --git a/include/xrpl/shamap/FullBelowCache.h b/include/xrpl/shamap/FullBelowCache.h
index e17a640672..0812f97c7b 100644
--- a/include/xrpl/shamap/FullBelowCache.h
+++ b/include/xrpl/shamap/FullBelowCache.h
@@ -24,7 +24,7 @@ private:
 public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { defaultCacheTargetSize = 0 };
+    enum { DefaultCacheTargetSize = 0 };
 
     using key_type = uint256;
     using clock_type = typename CacheType::clock_type;
@@ -40,10 +40,10 @@ public:
         std::string const& name,
         clock_type& clock,
         beast::Journal j,
-        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::New(),
-        std::size_t target_size = defaultCacheTargetSize,
+        beast::insight::Collector::ptr const& collector = beast::insight::NullCollector::make(),
+        std::size_t targetSize = DefaultCacheTargetSize,
         std::chrono::seconds expiration = std::chrono::minutes{2})
-        : m_cache(name, target_size, expiration, clock, j, collector), m_gen(1)
+        : cache_(name, targetSize, expiration, clock, j, collector), gen_(1)
     {
     }
 
@@ -51,7 +51,7 @@ public:
     clock_type&
     clock()
     {
-        return m_cache.clock();
+        return cache_.clock();
     }
 
     /** Return the number of elements in the cache.
@@ -61,7 +61,7 @@ public:
     std::size_t
     size() const
     {
-        return m_cache.size();
+        return cache_.size();
     }
 
     /** Remove expired cache items.
@@ -71,7 +71,7 @@ public:
     void
     sweep()
     {
-        m_cache.sweep();
+        cache_.sweep();
     }
 
     /** Refresh the last access time of an item, if it exists.
@@ -81,9 +81,9 @@ public:
         @return `true` If the key exists.
     */
     bool
-    touch_if_exists(key_type const& key)
+    touchIfExists(key_type const& key)
     {
-        return m_cache.touch_if_exists(key);
+        return cache_.touchIfExists(key);
     }
 
     /** Insert a key into the cache.
@@ -96,33 +96,33 @@ public:
     void
     insert(key_type const& key)
     {
-        m_cache.insert(key);
+        cache_.insert(key);
     }
 
     /** generation determines whether cached entry is valid */
     std::uint32_t
     getGeneration(void) const
     {
-        return m_gen;
+        return gen_;
     }
 
     void
     clear()
     {
-        m_cache.clear();
-        ++m_gen;
+        cache_.clear();
+        ++gen_;
     }
 
     void
     reset()
     {
-        m_cache.clear();
-        m_gen = 1;
+        cache_.clear();
+        gen_ = 1;
     }
 
 private:
-    CacheType m_cache;
-    std::atomic<std::uint32_t> m_gen;
+    CacheType cache_;
+    std::atomic<std::uint32_t> gen_;
 };
 
 }  // namespace detail
diff --git a/include/xrpl/shamap/SHAMap.h b/include/xrpl/shamap/SHAMap.h
index 43b2734d65..ba48e1927b 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 branchFactor = SHAMapInnerNode::branchFactor;
+    static constexpr unsigned int kBRANCH_FACTOR = SHAMapInnerNode::kBRANCH_FACTOR;
 
     /** The depth of the hash map: data is only present in the leaves */
-    static constexpr unsigned int leafDepth = 64;
+    static constexpr unsigned int kLEAF_DEPTH = 64;
 
     using DeltaItem =
         std::pair<boost::intrusive_ptr<SHAMapItem const>, boost::intrusive_ptr<SHAMapItem const>>;
@@ -136,11 +136,11 @@ public:
         This is always a const iterator.
         Meets the requirements of ForwardRange.
     */
-    class const_iterator;
+    class ConstIterator;
 
-    const_iterator
+    ConstIterator
     begin() const;
-    const_iterator
+    ConstIterator
     end() const;
 
     //--------------------------------------------------------------------------
@@ -199,8 +199,8 @@ public:
 
         @note The item does not need to exist.
      */
-    const_iterator
-    upper_bound(uint256 const& id) const;
+    ConstIterator
+    upperBound(uint256 const& id) const;
 
     /** Find the object with the greatest object id smaller than the input id.
 
@@ -208,8 +208,8 @@ public:
 
         @note The item does not need to exist.
      */
-    const_iterator
-    lower_bound(uint256 const& id) const;
+    ConstIterator
+    lowerBound(uint256 const& id) const;
 
     /**  Visit every node in this SHAMap
 
@@ -390,7 +390,7 @@ private:
     lastBelow(
         intr_ptr::SharedPtr<SHAMapTreeNode> node,
         SharedPtrNodeStack& stack,
-        int branch = branchFactor) const;
+        int branch = kBRANCH_FACTOR) const;
 
     // helper function for firstBelow and lastBelow
     SHAMapLeafNode*
@@ -469,14 +469,14 @@ private:
         operator=(MissingNodes const&) = delete;
 
         // basic parameters
-        int max_;
-        SHAMapSyncFilter* filter_;
-        int const maxDefer_;
-        std::uint32_t generation_;
+        int max;
+        SHAMapSyncFilter* filter;
+        int const maxDefer;
+        std::uint32_t generation;
 
         // nodes we have discovered to be missing
-        std::vector<std::pair<SHAMapNodeID, uint256>> missingNodes_;
-        std::set<SHAMapHash> missingHashes_;
+        std::vector<std::pair<SHAMapNodeID, uint256>> missingNodes;
+        std::set<SHAMapHash> missingHashes;
 
         // nodes we are in the process of traversing
         using StackEntry = std::tuple<
@@ -491,7 +491,7 @@ private:
         // elements will not be invalidated during the course of element
         // insertion and removal. Containers that do not offer this guarantee,
         // such as std::vector, can't be used here.
-        std::stack<StackEntry, std::deque<StackEntry>> stack_;
+        std::stack<StackEntry, std::deque<StackEntry>> stack;
 
         // nodes we may have acquired from deferred reads
         using DeferredNode = std::tuple<
@@ -500,28 +500,28 @@ private:
             int,                                   // branch
             intr_ptr::SharedPtr<SHAMapTreeNode>>;  // node
 
-        int deferred_;
-        std::mutex deferLock_;
-        std::condition_variable deferCondVar_;
-        std::vector<DeferredNode> finishedReads_;
+        int deferred;
+        std::mutex deferLock;
+        std::condition_variable deferCondVar;
+        std::vector<DeferredNode> finishedReads;
 
         // nodes we need to resume after we get their children from deferred
         // reads
-        std::map<SHAMapInnerNode*, SHAMapNodeID> resumes_;
+        std::map<SHAMapInnerNode*, SHAMapNodeID> resumes;
 
         MissingNodes(int max, SHAMapSyncFilter* filter, int maxDefer, std::uint32_t generation)
-            : max_(max), filter_(filter), maxDefer_(maxDefer), generation_(generation), deferred_(0)
+            : max(max), filter(filter), maxDefer(maxDefer), generation(generation), deferred(0)
         {
-            missingNodes_.reserve(max);
-            finishedReads_.reserve(maxDefer);
+            missingNodes.reserve(max);
+            finishedReads.reserve(maxDefer);
         }
     };
 
     // getMissingNodes helper functions
     void
-    gmn_ProcessNodes(MissingNodes&, MissingNodes::StackEntry& node);
+    gmnProcessNodes(MissingNodes&, MissingNodes::StackEntry& node);
     static void
-    gmn_ProcessDeferredReads(MissingNodes&);
+    gmnProcessDeferredReads(MissingNodes&);
 
     // fetch from DB helper function
     intr_ptr::SharedPtr<SHAMapTreeNode>
@@ -579,7 +579,7 @@ SHAMap::setUnbacked()
 
 //------------------------------------------------------------------------------
 
-class SHAMap::const_iterator
+class SHAMap::ConstIterator
 {
 public:
     using iterator_category = std::forward_iterator_tag;
@@ -594,35 +594,35 @@ private:
     pointer item_ = nullptr;
 
 public:
-    const_iterator() = delete;
+    ConstIterator() = delete;
 
-    const_iterator(const_iterator const& other) = default;
-    const_iterator&
-    operator=(const_iterator const& other) = default;
+    ConstIterator(ConstIterator const& other) = default;
+    ConstIterator&
+    operator=(ConstIterator const& other) = default;
 
-    ~const_iterator() = default;
+    ~ConstIterator() = default;
 
     reference
     operator*() const;
     pointer
     operator->() const;
 
-    const_iterator&
+    ConstIterator&
     operator++();
-    const_iterator
+    ConstIterator
     operator++(int);
 
 private:
-    explicit const_iterator(SHAMap const* map);
-    const_iterator(SHAMap const* map, std::nullptr_t);
-    const_iterator(SHAMap const* map, pointer item, SharedPtrNodeStack&& stack);
+    explicit ConstIterator(SHAMap const* map);
+    ConstIterator(SHAMap const* map, std::nullptr_t);
+    ConstIterator(SHAMap const* map, pointer item, SharedPtrNodeStack&& stack);
 
     friend bool
-    operator==(const_iterator const& x, const_iterator const& y);
+    operator==(ConstIterator const& x, ConstIterator const& y);
     friend class SHAMap;
 };
 
-inline SHAMap::const_iterator::const_iterator(SHAMap const* map) : map_(map)
+inline SHAMap::ConstIterator::ConstIterator(SHAMap const* map) : map_(map)
 {
     XRPL_ASSERT(map_, "xrpl::SHAMap::const_iterator::const_iterator : non-null input");
 
@@ -630,11 +630,11 @@ inline SHAMap::const_iterator::const_iterator(SHAMap const* map) : map_(map)
         item_ = temp->peekItem().get();
 }
 
-inline SHAMap::const_iterator::const_iterator(SHAMap const* map, std::nullptr_t) : map_(map)
+inline SHAMap::ConstIterator::ConstIterator(SHAMap const* map, std::nullptr_t) : map_(map)
 {
 }
 
-inline SHAMap::const_iterator::const_iterator(
+inline SHAMap::ConstIterator::ConstIterator(
     SHAMap const* map,
     pointer item,
     SharedPtrNodeStack&& stack)
@@ -642,20 +642,20 @@ inline SHAMap::const_iterator::const_iterator(
 {
 }
 
-inline SHAMap::const_iterator::reference
-SHAMap::const_iterator::operator*() const
+inline SHAMap::ConstIterator::reference
+SHAMap::ConstIterator::operator*() const
 {
     return *item_;
 }
 
-inline SHAMap::const_iterator::pointer
-SHAMap::const_iterator::operator->() const
+inline SHAMap::ConstIterator::pointer
+SHAMap::ConstIterator::operator->() const
 {
     return item_;
 }
 
-inline SHAMap::const_iterator&
-SHAMap::const_iterator::operator++()
+inline SHAMap::ConstIterator&
+SHAMap::ConstIterator::operator++()
 {
     if (auto temp = map_->peekNextItem(item_->key(), stack_))
     {
@@ -668,8 +668,8 @@ SHAMap::const_iterator::operator++()
     return *this;
 }
 
-inline SHAMap::const_iterator
-SHAMap::const_iterator::operator++(int)
+inline SHAMap::ConstIterator
+SHAMap::ConstIterator::operator++(int)
 {
     auto tmp = *this;
     ++(*this);
@@ -677,7 +677,7 @@ SHAMap::const_iterator::operator++(int)
 }
 
 inline bool
-operator==(SHAMap::const_iterator const& x, SHAMap::const_iterator const& y)
+operator==(SHAMap::ConstIterator const& x, SHAMap::ConstIterator const& y)
 {
     XRPL_ASSERT(
         x.map_ == y.map_,
@@ -687,21 +687,21 @@ operator==(SHAMap::const_iterator const& x, SHAMap::const_iterator const& y)
 }
 
 inline bool
-operator!=(SHAMap::const_iterator const& x, SHAMap::const_iterator const& y)
+operator!=(SHAMap::ConstIterator const& x, SHAMap::ConstIterator const& y)
 {
     return !(x == y);
 }
 
-inline SHAMap::const_iterator
+inline SHAMap::ConstIterator
 SHAMap::begin() const
 {
-    return const_iterator(this);
+    return ConstIterator(this);
 }
 
-inline SHAMap::const_iterator
+inline SHAMap::ConstIterator
 SHAMap::end() const
 {
-    return const_iterator(this, nullptr);
+    return ConstIterator(this, nullptr);
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/shamap/SHAMapAccountStateLeafNode.h b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
index 2f71d10b0a..c006b2de37 100644
--- a/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
+++ b/include/xrpl/shamap/SHAMapAccountStateLeafNode.h
@@ -30,19 +30,19 @@ public:
     intr_ptr::SharedPtr<SHAMapTreeNode>
     clone(std::uint32_t cowid) const final
     {
-        return intr_ptr::make_shared<SHAMapAccountStateLeafNode>(item_, cowid, hash_);
+        return intr_ptr::makeShared<SHAMapAccountStateLeafNode>(item_, cowid, hash_);
     }
 
     SHAMapNodeType
     getType() const final
     {
-        return SHAMapNodeType::tnACCOUNT_STATE;
+        return SHAMapNodeType::TnAccountState;
     }
 
     void
     updateHash() final
     {
-        hash_ = SHAMapHash{sha512Half(HashPrefix::leafNode, item_->slice(), item_->key())};
+        hash_ = SHAMapHash{sha512Half(HashPrefix::LeafNode, item_->slice(), item_->key())};
     }
 
     void
@@ -50,13 +50,13 @@ public:
     {
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
-        s.add8(wireTypeAccountState);
+        s.add8(kWIRE_TYPE_ACCOUNT_STATE);
     }
 
     void
     serializeWithPrefix(Serializer& s) const final
     {
-        s.add32(HashPrefix::leafNode);
+        s.add32(HashPrefix::LeafNode);
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
     }
diff --git a/include/xrpl/shamap/SHAMapAddNode.h b/include/xrpl/shamap/SHAMapAddNode.h
index a560568126..87222f74d8 100644
--- a/include/xrpl/shamap/SHAMapAddNode.h
+++ b/include/xrpl/shamap/SHAMapAddNode.h
@@ -8,9 +8,9 @@ namespace xrpl {
 class SHAMapAddNode
 {
 private:
-    int mGood;
-    int mBad;
-    int mDuplicate;
+    int good_;
+    int bad_;
+    int duplicate_;
 
 public:
     SHAMapAddNode();
@@ -47,63 +47,63 @@ private:
     SHAMapAddNode(int good, int bad, int duplicate);
 };
 
-inline SHAMapAddNode::SHAMapAddNode() : mGood(0), mBad(0), mDuplicate(0)
+inline SHAMapAddNode::SHAMapAddNode() : good_(0), bad_(0), duplicate_(0)
 {
 }
 
 inline SHAMapAddNode::SHAMapAddNode(int good, int bad, int duplicate)
-    : mGood(good), mBad(bad), mDuplicate(duplicate)
+    : good_(good), bad_(bad), duplicate_(duplicate)
 {
 }
 
 inline void
 SHAMapAddNode::incInvalid()
 {
-    ++mBad;
+    ++bad_;
 }
 
 inline void
 SHAMapAddNode::incUseful()
 {
-    ++mGood;
+    ++good_;
 }
 
 inline void
 SHAMapAddNode::incDuplicate()
 {
-    ++mDuplicate;
+    ++duplicate_;
 }
 
 inline void
 SHAMapAddNode::reset()
 {
-    mGood = mBad = mDuplicate = 0;
+    good_ = bad_ = duplicate_ = 0;
 }
 
 inline int
 SHAMapAddNode::getGood() const
 {
-    return mGood;
+    return good_;
 }
 
 inline bool
 SHAMapAddNode::isInvalid() const
 {
-    return mBad > 0;
+    return bad_ > 0;
 }
 
 inline bool
 SHAMapAddNode::isUseful() const
 {
-    return mGood > 0;
+    return good_ > 0;
 }
 
 inline SHAMapAddNode&
 SHAMapAddNode::operator+=(SHAMapAddNode const& n)
 {
-    mGood += n.mGood;
-    mBad += n.mBad;
-    mDuplicate += n.mDuplicate;
+    good_ += n.good_;
+    bad_ += n.bad_;
+    duplicate_ += n.duplicate_;
 
     return *this;
 }
@@ -111,7 +111,7 @@ SHAMapAddNode::operator+=(SHAMapAddNode const& n)
 inline bool
 SHAMapAddNode::isGood() const
 {
-    return (mGood + mDuplicate) > mBad;
+    return (good_ + duplicate_) > bad_;
 }
 
 inline SHAMapAddNode
@@ -136,24 +136,24 @@ inline std::string
 SHAMapAddNode::get() const
 {
     std::string ret;
-    if (mGood > 0)
+    if (good_ > 0)
     {
         ret.append("good:");
-        ret.append(std::to_string(mGood));
+        ret.append(std::to_string(good_));
     }
-    if (mBad > 0)
+    if (bad_ > 0)
     {
         if (!ret.empty())
             ret.append(" ");
         ret.append("bad:");
-        ret.append(std::to_string(mBad));
+        ret.append(std::to_string(bad_));
     }
-    if (mDuplicate > 0)
+    if (duplicate_ > 0)
     {
         if (!ret.empty())
             ret.append(" ");
         ret.append("dupe:");
-        ret.append(std::to_string(mDuplicate));
+        ret.append(std::to_string(duplicate_));
     }
     if (ret.empty())
         ret = "no nodes processed";
diff --git a/include/xrpl/shamap/SHAMapInnerNode.h b/include/xrpl/shamap/SHAMapInnerNode.h
index f2c34cbc1a..ee2a18bf03 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 branchFactor = 16;
+    static constexpr unsigned int kBRANCH_FACTOR = 16;
 
 private:
     /** Opaque type that contains the `hashes` array (array of type
@@ -93,7 +93,7 @@ public:
     SHAMapNodeType
     getType() const override
     {
-        return SHAMapNodeType::tnINNER;
+        return SHAMapNodeType::TnInner;
     }
 
     bool
@@ -159,7 +159,7 @@ public:
     getString(SHAMapNodeID const&) const override;
 
     void
-    invariants(bool is_root = false) const override;
+    invariants(bool isRoot = false) const override;
 
     static intr_ptr::SharedPtr<SHAMapTreeNode>
     makeFullInner(Slice data, SHAMapHash const& hash, bool hashValid);
diff --git a/include/xrpl/shamap/SHAMapItem.h b/include/xrpl/shamap/SHAMapItem.h
index da70e16db3..d781dbf894 100644
--- a/include/xrpl/shamap/SHAMapItem.h
+++ b/include/xrpl/shamap/SHAMapItem.h
@@ -25,7 +25,7 @@ class SHAMapItem : public CountedObject<SHAMapItem>
 
     // This is the interface for creating new instances of this class.
     friend boost::intrusive_ptr<SHAMapItem>
-    make_shamapitem(uint256 const& tag, Slice data);
+    makeShamapitem(uint256 const& tag, Slice data);
 
 private:
     uint256 const tag_;
@@ -93,7 +93,7 @@ namespace detail {
 // The slab cutoffs and the number of megabytes per allocation are customized
 // based on the number of objects of each size we expect to need at any point
 // in time and with an eye to minimize the number of slack bytes in a block.
-inline SlabAllocatorSet<SHAMapItem> slabber({
+inline SlabAllocatorSet<SHAMapItem> gSlabber({
     {  128, megabytes(std::size_t(60)) },
     {  192, megabytes(std::size_t(46)) },
     {  272, megabytes(std::size_t(60)) },
@@ -112,7 +112,7 @@ intrusive_ptr_add_ref(SHAMapItem const* x)
     // This can only happen if someone releases the last reference to the
     // item while we were trying to increment the refcount.
     if (x->refcount_++ == 0)
-        LogicError("SHAMapItem: the reference count is 0!");
+        logicError("SHAMapItem: the reference count is 0!");
 }
 
 inline void
@@ -130,19 +130,19 @@ intrusive_ptr_release(SHAMapItem const* x)
 
         // If the slabber doesn't claim this pointer, it was allocated
         // manually, so we free it manually.
-        if (!detail::slabber.deallocate(const_cast<std::uint8_t*>(p)))
+        if (!detail::gSlabber.deallocate(const_cast<std::uint8_t*>(p)))
             delete[] p;
     }
 }
 
 inline boost::intrusive_ptr<SHAMapItem>
-make_shamapitem(uint256 const& tag, Slice data)
+makeShamapitem(uint256 const& tag, Slice data)
 {
     XRPL_ASSERT(
         data.size() <= megabytes<std::size_t>(16), "xrpl::make_shamapitem : maximum input size");
 
     // NOLINTNEXTLINE(misc-const-correctness)
-    std::uint8_t* raw = detail::slabber.allocate(data.size());
+    std::uint8_t* raw = detail::gSlabber.allocate(data.size());
 
     // If we can't grab memory from the slab allocators, we fall back to
     // the standard library and try to grab a precisely-sized memory block:
@@ -160,9 +160,9 @@ static_assert(alignof(SHAMapItem) != 40);
 static_assert(alignof(SHAMapItem) == 8 || alignof(SHAMapItem) == 4);
 
 inline boost::intrusive_ptr<SHAMapItem>
-make_shamapitem(SHAMapItem const& other)
+makeShamapitem(SHAMapItem const& other)
 {
-    return make_shamapitem(other.key(), other.slice());
+    return makeShamapitem(other.key(), other.slice());
 }
 
 }  // namespace xrpl
diff --git a/include/xrpl/shamap/SHAMapLeafNode.h b/include/xrpl/shamap/SHAMapLeafNode.h
index a63041c31c..af5ed29702 100644
--- a/include/xrpl/shamap/SHAMapLeafNode.h
+++ b/include/xrpl/shamap/SHAMapLeafNode.h
@@ -37,7 +37,7 @@ public:
     }
 
     void
-    invariants(bool is_root = false) const final;
+    invariants(bool isRoot = false) const final;
 
 public:
     boost::intrusive_ptr<SHAMapItem const> const&
diff --git a/include/xrpl/shamap/SHAMapMissingNode.h b/include/xrpl/shamap/SHAMapMissingNode.h
index f1670587eb..0bc072463e 100644
--- a/include/xrpl/shamap/SHAMapMissingNode.h
+++ b/include/xrpl/shamap/SHAMapMissingNode.h
@@ -28,7 +28,7 @@ to_string(SHAMapType t)
         case SHAMapType::FREE:
             return "Free Tree";
         default:
-            return std::to_string(safe_cast<std::underlying_type_t<SHAMapType>>(t));
+            return std::to_string(safeCast<std::underlying_type_t<SHAMapType>>(t));
     }
 }
 
diff --git a/include/xrpl/shamap/SHAMapTreeNode.h b/include/xrpl/shamap/SHAMapTreeNode.h
index 55b18a2d12..d50fc65ccb 100644
--- a/include/xrpl/shamap/SHAMapTreeNode.h
+++ b/include/xrpl/shamap/SHAMapTreeNode.h
@@ -14,17 +14,17 @@ 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 wireTypeTransaction = 0;
-static constexpr unsigned char const wireTypeAccountState = 1;
-static constexpr unsigned char const wireTypeInner = 2;
-static constexpr unsigned char const wireTypeCompressedInner = 3;
-static constexpr unsigned char const wireTypeTransactionWithMeta = 4;
+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;
 
 enum class SHAMapNodeType {
-    tnINNER = 1,
-    tnTRANSACTION_NM = 2,  // transaction, no metadata
-    tnTRANSACTION_MD = 3,  // transaction, with metadata
-    tnACCOUNT_STATE = 4
+    TnInner = 1,
+    TnTransactionNm = 2,  // transaction, no metadata
+    TnTransactionMd = 3,  // transaction, with metadata
+    TnAccountState = 4
 };
 
 class SHAMapTreeNode : public IntrusiveRefCounts
@@ -147,7 +147,7 @@ public:
     getString(SHAMapNodeID const&) const;
 
     virtual void
-    invariants(bool is_root = false) const = 0;
+    invariants(bool isRoot = false) const = 0;
 
     static intr_ptr::SharedPtr<SHAMapTreeNode>
     makeFromPrefix(Slice rawNode, SHAMapHash const& hash);
diff --git a/include/xrpl/shamap/SHAMapTxLeafNode.h b/include/xrpl/shamap/SHAMapTxLeafNode.h
index 368aa2e21b..eaac104c7e 100644
--- a/include/xrpl/shamap/SHAMapTxLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxLeafNode.h
@@ -29,32 +29,32 @@ public:
     intr_ptr::SharedPtr<SHAMapTreeNode>
     clone(std::uint32_t cowid) const final
     {
-        return intr_ptr::make_shared<SHAMapTxLeafNode>(item_, cowid, hash_);
+        return intr_ptr::makeShared<SHAMapTxLeafNode>(item_, cowid, hash_);
     }
 
     SHAMapNodeType
     getType() const final
     {
-        return SHAMapNodeType::tnTRANSACTION_NM;
+        return SHAMapNodeType::TnTransactionNm;
     }
 
     void
     updateHash() final
     {
-        hash_ = SHAMapHash{sha512Half(HashPrefix::transactionID, item_->slice())};
+        hash_ = SHAMapHash{sha512Half(HashPrefix::TransactionId, item_->slice())};
     }
 
     void
     serializeForWire(Serializer& s) const final
     {
         s.addRaw(item_->slice());
-        s.add8(wireTypeTransaction);
+        s.add8(kWIRE_TYPE_TRANSACTION);
     }
 
     void
     serializeWithPrefix(Serializer& s) const final
     {
-        s.add32(HashPrefix::transactionID);
+        s.add32(HashPrefix::TransactionId);
         s.addRaw(item_->slice());
     }
 };
diff --git a/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
index 40be482ed9..5cf5b723b0 100644
--- a/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
+++ b/include/xrpl/shamap/SHAMapTxPlusMetaLeafNode.h
@@ -30,19 +30,19 @@ public:
     intr_ptr::SharedPtr<SHAMapTreeNode>
     clone(std::uint32_t cowid) const override
     {
-        return intr_ptr::make_shared<SHAMapTxPlusMetaLeafNode>(item_, cowid, hash_);
+        return intr_ptr::makeShared<SHAMapTxPlusMetaLeafNode>(item_, cowid, hash_);
     }
 
     SHAMapNodeType
     getType() const override
     {
-        return SHAMapNodeType::tnTRANSACTION_MD;
+        return SHAMapNodeType::TnTransactionMd;
     }
 
     void
     updateHash() final
     {
-        hash_ = SHAMapHash{sha512Half(HashPrefix::txNode, item_->slice(), item_->key())};
+        hash_ = SHAMapHash{sha512Half(HashPrefix::TxNode, item_->slice(), item_->key())};
     }
 
     void
@@ -50,13 +50,13 @@ public:
     {
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
-        s.add8(wireTypeTransactionWithMeta);
+        s.add8(kWIRE_TYPE_TRANSACTION_WITH_META);
     }
 
     void
     serializeWithPrefix(Serializer& s) const final
     {
-        s.add32(HashPrefix::txNode);
+        s.add32(HashPrefix::TxNode);
         s.addRaw(item_->slice());
         s.addBitString(item_->key());
     }
diff --git a/include/xrpl/shamap/detail/TaggedPointer.h b/include/xrpl/shamap/detail/TaggedPointer.h
index 31d5f2ba65..d3c0a6542f 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 tagMask = 3;
+    static constexpr std::uintptr_t kTAG_MASK = 3;
     /** bit-and with this mask to get the pointer bits (mask out the tag) */
-    static constexpr std::uintptr_t ptrMask = ~tagMask;
+    static constexpr std::uintptr_t kPTR_MASK = ~kTAG_MASK;
 
     /** Deallocate memory and run destructors */
     void
diff --git a/include/xrpl/shamap/detail/TaggedPointer.ipp b/include/xrpl/shamap/detail/TaggedPointer.ipp
index 903108ac66..d4b5ca3365 100644
--- a/include/xrpl/shamap/detail/TaggedPointer.ipp
+++ b/include/xrpl/shamap/detail/TaggedPointer.ipp
@@ -4,6 +4,7 @@
 
 #include <boost/pool/pool_alloc.hpp>
 
+#include <algorithm>
 #include <array>
 
 namespace xrpl {
@@ -13,131 +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> boundaries{2, 4, 6, SHAMapInnerNode::branchFactor};
+constexpr std::array<std::uint8_t, 4> kBOUNDARIES{2, 4, 6, SHAMapInnerNode::kBRANCH_FACTOR};
 static_assert(
-    boundaries.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(
-    boundaries.back() == SHAMapInnerNode::branchFactor,
+    kBOUNDARIES.back() == SHAMapInnerNode::kBRANCH_FACTOR,
     "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 elementSizeBytes =
+constexpr size_t kELEMENT_SIZE_BYTES =
     (sizeof(SHAMapHash) + sizeof(intr_ptr::SharedPtr<SHAMapTreeNode>));
 
-constexpr size_t blockSizeBytes = kilobytes(512);
+constexpr size_t kBLOCK_SIZE_BYTES = kilobytes(512);
 
 template <std::size_t... I>
-constexpr std::array<size_t, boundaries.size()>
+constexpr std::array<size_t, kBOUNDARIES.size()>
 initArrayChunkSizeBytes(std::index_sequence<I...>)
 {
-    return std::array<size_t, boundaries.size()>{
-        boundaries[I] * elementSizeBytes...,
+    return std::array<size_t, kBOUNDARIES.size()>{
+        kBOUNDARIES[I] * kELEMENT_SIZE_BYTES...,
     };
 }
-constexpr auto arrayChunkSizeBytes =
-    initArrayChunkSizeBytes(std::make_index_sequence<boundaries.size()>{});
+constexpr auto kARRAY_CHUNK_SIZE_BYTES =
+    initArrayChunkSizeBytes(std::make_index_sequence<kBOUNDARIES.size()>{});
 
 template <std::size_t... I>
-constexpr std::array<size_t, boundaries.size()>
+constexpr std::array<size_t, kBOUNDARIES.size()>
 initArrayChunksPerBlock(std::index_sequence<I...>)
 {
-    return std::array<size_t, boundaries.size()>{
-        blockSizeBytes / arrayChunkSizeBytes[I]...,
+    return std::array<size_t, kBOUNDARIES.size()>{
+        kBLOCK_SIZE_BYTES / kARRAY_CHUNK_SIZE_BYTES[I]...,
     };
 }
-constexpr auto chunksPerBlock =
-    initArrayChunksPerBlock(std::make_index_sequence<boundaries.size()>{});
+constexpr auto kCHUNKS_PER_BLOCK =
+    initArrayChunksPerBlock(std::make_index_sequence<kBOUNDARIES.size()>{});
 
 [[nodiscard]] inline std::uint8_t
 numAllocatedChildren(std::uint8_t n)
 {
-    XRPL_ASSERT(n <= SHAMapInnerNode::branchFactor, "xrpl::numAllocatedChildren : valid input");
-    return *std::lower_bound(boundaries.begin(), boundaries.end(), n);
+    XRPL_ASSERT(n <= SHAMapInnerNode::kBRANCH_FACTOR, "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::branchFactor, "xrpl::boundariesIndex : valid input");
-    return std::distance(
-        boundaries.begin(), std::lower_bound(boundaries.begin(), boundaries.end(), numChildren));
+        numChildren <= SHAMapInnerNode::kBRANCH_FACTOR, "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*()>, boundaries.size()>
+std::array<std::function<void*()>, kBOUNDARIES.size()>
 initAllocateArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<void*()>, boundaries.size()>{
+    return std::array<std::function<void*()>, kBOUNDARIES.size()>{
         boost::singleton_pool<
             boost::fast_pool_allocator_tag,
-            arrayChunkSizeBytes[I],
+            kARRAY_CHUNK_SIZE_BYTES[I],
             boost::default_user_allocator_new_delete,
             std::mutex,
-            chunksPerBlock[I],
-            chunksPerBlock[I]>::malloc...,
+            kCHUNKS_PER_BLOCK[I],
+            kCHUNKS_PER_BLOCK[I]>::malloc...,
     };
 }
-std::array<std::function<void*()>, boundaries.size()> const allocateArrayFuns =
-    initAllocateArrayFuns(std::make_index_sequence<boundaries.size()>{});
+std::array<std::function<void*()>, kBOUNDARIES.size()> const kALLOCATE_ARRAY_FUNS =
+    initAllocateArrayFuns(std::make_index_sequence<kBOUNDARIES.size()>{});
 
 template <std::size_t... I>
-std::array<std::function<void(void*)>, boundaries.size()>
+std::array<std::function<void(void*)>, kBOUNDARIES.size()>
 initFreeArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<void(void*)>, boundaries.size()>{
+    return std::array<std::function<void(void*)>, kBOUNDARIES.size()>{
         static_cast<void (*)(void*)>(boost::singleton_pool<
                                      boost::fast_pool_allocator_tag,
-                                     arrayChunkSizeBytes[I],
+                                     kARRAY_CHUNK_SIZE_BYTES[I],
                                      boost::default_user_allocator_new_delete,
                                      std::mutex,
-                                     chunksPerBlock[I],
-                                     chunksPerBlock[I]>::free)...,
+                                     kCHUNKS_PER_BLOCK[I],
+                                     kCHUNKS_PER_BLOCK[I]>::free)...,
     };
 }
-std::array<std::function<void(void*)>, boundaries.size()> const freeArrayFuns =
-    initFreeArrayFuns(std::make_index_sequence<boundaries.size()>{});
+std::array<std::function<void(void*)>, kBOUNDARIES.size()> const kFREE_ARRAY_FUNS =
+    initFreeArrayFuns(std::make_index_sequence<kBOUNDARIES.size()>{});
 
 template <std::size_t... I>
-std::array<std::function<bool(void*)>, boundaries.size()>
+std::array<std::function<bool(void*)>, kBOUNDARIES.size()>
 initIsFromArrayFuns(std::index_sequence<I...>)
 {
-    return std::array<std::function<bool(void*)>, boundaries.size()>{
+    return std::array<std::function<bool(void*)>, kBOUNDARIES.size()>{
         boost::singleton_pool<
             boost::fast_pool_allocator_tag,
-            arrayChunkSizeBytes[I],
+            kARRAY_CHUNK_SIZE_BYTES[I],
             boost::default_user_allocator_new_delete,
             std::mutex,
-            chunksPerBlock[I],
-            chunksPerBlock[I]>::is_from...,
+            kCHUNKS_PER_BLOCK[I],
+            kCHUNKS_PER_BLOCK[I]>::is_from...,
     };
 }
-std::array<std::function<bool(void*)>, boundaries.size()> const isFromArrayFuns =
-    initIsFromArrayFuns(std::make_index_sequence<boundaries.size()>{});
+std::array<std::function<bool(void*)>, kBOUNDARIES.size()> const kIS_FROM_ARRAY_FUNS =
+    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, allocateArrayFuns[i]()};
+    return {i, kALLOCATE_ARRAY_FUNS[i]()};
 }
 
 // This function takes an untagged pointer
 inline void
 deallocateArrays(std::uint8_t boundaryIndex, void* p)
 {
-    XRPL_ASSERT(isFromArrayFuns[boundaryIndex](p), "xrpl::deallocateArrays : valid inputs");
-    freeArrayFuns[boundaryIndex](p);
+    XRPL_ASSERT(kIS_FROM_ARRAY_FUNS[boundaryIndex](p), "xrpl::deallocateArrays : valid inputs");
+    kFREE_ARRAY_FUNS[boundaryIndex](p);
 }
 
 // Used in `iterChildren` and elsewhere as the hash value for sparse arrays when
 // the hash isn't actually stored in the array.
-static SHAMapHash const zeroSHAMapHash;
+SHAMapHash const kZERO_SHA_MAP_HASH;
 
 }  // namespace
 
@@ -146,17 +146,17 @@ void
 TaggedPointer::iterChildren(std::uint16_t isBranch, F&& f) const
 {
     auto [numAllocated, hashes, _] = getHashesAndChildren();
-    if (numAllocated == SHAMapInnerNode::branchFactor)
+    if (numAllocated == SHAMapInnerNode::kBRANCH_FACTOR)
     {
         // dense case
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
             f(hashes[i]);
     }
     else
     {
         // sparse case
         int curHashI = 0;
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
         {
             if ((1 << i) & isBranch)
             {
@@ -164,7 +164,7 @@ TaggedPointer::iterChildren(std::uint16_t isBranch, F&& f) const
             }
             else
             {
-                f(zeroSHAMapHash);
+                f(kZERO_SHA_MAP_HASH);
             }
         }
     }
@@ -174,10 +174,10 @@ template <class F>
 void
 TaggedPointer::iterNonEmptyChildIndexes(std::uint16_t isBranch, F&& f) const
 {
-    if (capacity() == SHAMapInnerNode::branchFactor)
+    if (capacity() == SHAMapInnerNode::kBRANCH_FACTOR)
     {
         // dense case
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++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::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
         {
             if ((1 << i) & isBranch)
             {
@@ -200,9 +200,10 @@ TaggedPointer::iterNonEmptyChildIndexes(std::uint16_t isBranch, F&& f) const
 }
 
 inline void
+// NOLINTNEXTLINE(readability-make-member-function-const)
 TaggedPointer::destroyHashesAndChildren()
 {
-    if (!tp_)
+    if (tp_ == 0u)
         return;
 
     auto [numAllocated, hashes, children] = getHashesAndChildren();
@@ -246,11 +247,11 @@ inline TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t numChildren)
 {
     auto [tag, p] = allocateArrays(numChildren);
     XRPL_ASSERT(
-        tag < boundaries.size(),
+        tag < kBOUNDARIES.size(),
         "xrpl::TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t) : "
         "maximum tag");
     XRPL_ASSERT(
-        (reinterpret_cast<std::uintptr_t>(p) & ptrMask) == reinterpret_cast<std::uintptr_t>(p),
+        (reinterpret_cast<std::uintptr_t>(p) & kPTR_MASK) == reinterpret_cast<std::uintptr_t>(p),
         "xrpl::TaggedPointer::TaggedPointer(RawAllocateTag, std::uint8_t) : "
         "valid pointer");
     tp_ = reinterpret_cast<std::uintptr_t>(p) + tag;
@@ -274,11 +275,11 @@ inline TaggedPointer::TaggedPointer(
         auto [srcDstNumAllocated, srcDstHashes, srcDstChildren] = getHashesAndChildren();
         bool const srcDstIsDense = isDense();
         int srcDstIndex = 0;
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
         {
             auto const mask = (1 << i);
-            bool const inSrc = (srcBranches & mask);
-            bool const inDst = (dstBranches & mask);
+            bool const inSrc = (srcBranches & mask) != 0;
+            bool const inDst = (dstBranches & mask) != 0;
             if (inSrc && inDst)
             {
                 // keep
@@ -348,16 +349,16 @@ inline TaggedPointer::TaggedPointer(
         auto [dstNumAllocated, dstHashes, dstChildren] = dst.getHashesAndChildren();
         // Move `other` into a local var so it's not in a partially moved from
         // state after this function runs
-        TaggedPointer src(std::move(other));
+        TaggedPointer const src(std::move(other));
         auto [srcNumAllocated, srcHashes, srcChildren] = src.getHashesAndChildren();
         bool const srcIsDense = src.isDense();
         bool const dstIsDense = dst.isDense();
         int srcIndex = 0, dstIndex = 0;
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
         {
             auto const mask = (1 << i);
-            bool const inSrc = (srcBranches & mask);
-            bool const inDst = (dstBranches & mask);
+            bool const inSrc = (srcBranches & mask) != 0;
+            bool const inDst = (dstBranches & mask) != 0;
             if (inSrc && inDst)
             {
                 // keep
@@ -432,14 +433,14 @@ inline TaggedPointer::TaggedPointer(
 
     // allocate hashes and children, but do not run constructors
     TaggedPointer newHashesAndChildren{RawAllocateTag{}, toAllocate};
-    SHAMapHash *newHashes, *oldHashes;
-    intr_ptr::SharedPtr<SHAMapTreeNode>*newChildren, *oldChildren;
-    std::uint8_t newNumAllocated;
+    SHAMapHash *newHashes = nullptr, *oldHashes = nullptr;
+    intr_ptr::SharedPtr<SHAMapTreeNode>*newChildren = nullptr, *oldChildren = nullptr;
+    std::uint8_t newNumAllocated = 0;
     // structured bindings can't be captured in c++ 17; use tie instead
     std::tie(newNumAllocated, newHashes, newChildren) = newHashesAndChildren.getHashesAndChildren();
     std::tie(std::ignore, oldHashes, oldChildren) = getHashesAndChildren();
 
-    if (newNumAllocated == SHAMapInnerNode::branchFactor)
+    if (newNumAllocated == SHAMapInnerNode::kBRANCH_FACTOR)
     {
         // new arrays are dense, old arrays are sparse
         iterNonEmptyChildIndexes(isBranch, [&](auto branchNum, auto indexNum) {
@@ -448,9 +449,9 @@ inline TaggedPointer::TaggedPointer(
                 intr_ptr::SharedPtr<SHAMapTreeNode>{std::move(oldChildren[indexNum])};
         });
         // Run the constructors for the remaining elements
-        for (int i = 0; i < SHAMapInnerNode::branchFactor; ++i)
+        for (int i = 0; i < SHAMapInnerNode::kBRANCH_FACTOR; ++i)
         {
-            if ((1 << i) & isBranch)
+            if (((1 << i) & isBranch) != 0)
                 continue;
             new (&newHashes[i]) SHAMapHash{};
             new (&newChildren[i]) intr_ptr::SharedPtr<SHAMapTreeNode>{};
@@ -507,19 +508,19 @@ TaggedPointer::operator=(TaggedPointer&& other)
 [[nodiscard]] inline std::pair<std::uint8_t, void*>
 TaggedPointer::decode() const
 {
-    return {tp_ & tagMask, reinterpret_cast<void*>(tp_ & ptrMask)};
+    return {tp_ & kTAG_MASK, reinterpret_cast<void*>(tp_ & kPTR_MASK)};
 }
 
 [[nodiscard]] inline std::uint8_t
 TaggedPointer::capacity() const
 {
-    return boundaries[tp_ & tagMask];
+    return kBOUNDARIES[tp_ & kTAG_MASK];
 }
 
 [[nodiscard]] inline bool
 TaggedPointer::isDense() const
 {
-    return (tp_ & tagMask) == boundaries.size() - 1;
+    return (tp_ & kTAG_MASK) == kBOUNDARIES.size() - 1;
 }
 
 [[nodiscard]] inline std::tuple<std::uint8_t, SHAMapHash*, intr_ptr::SharedPtr<SHAMapTreeNode>*>
@@ -527,7 +528,7 @@ TaggedPointer::getHashesAndChildren() const
 {
     auto const [tag, ptr] = decode();
     auto const hashes = reinterpret_cast<SHAMapHash*>(ptr);
-    std::uint8_t numAllocated = boundaries[tag];
+    std::uint8_t const numAllocated = kBOUNDARIES[tag];
     auto const children =
         reinterpret_cast<intr_ptr::SharedPtr<SHAMapTreeNode>*>(hashes + numAllocated);
     return {numAllocated, hashes, children};
@@ -536,7 +537,7 @@ TaggedPointer::getHashesAndChildren() const
 [[nodiscard]] inline SHAMapHash*
 TaggedPointer::getHashes() const
 {
-    return reinterpret_cast<SHAMapHash*>(tp_ & ptrMask);
+    return reinterpret_cast<SHAMapHash*>(tp_ & kPTR_MASK);
 };
 
 [[nodiscard]] inline intr_ptr::SharedPtr<SHAMapTreeNode>*
diff --git a/include/xrpl/tx/ApplyContext.h b/include/xrpl/tx/ApplyContext.h
index ea936017e0..910ec6be42 100644
--- a/include/xrpl/tx/ApplyContext.h
+++ b/include/xrpl/tx/ApplyContext.h
@@ -34,7 +34,7 @@ public:
         beast::Journal journal = beast::Journal{beast::Journal::getNullSink()})
         : ApplyContext(registry, base, std::nullopt, tx, preclaimResult, baseFee, flags, journal)
     {
-        XRPL_ASSERT((flags & tapBATCH) == 0, "Batch apply flag should not be set");
+        XRPL_ASSERT((flags & TapBatch) == 0, "Batch apply flag should not be set");
     }
 
     std::reference_wrapper<ServiceRegistry> registry;
diff --git a/include/xrpl/tx/Transactor.h b/include/xrpl/tx/Transactor.h
index 918bbe5da6..cf8030b275 100644
--- a/include/xrpl/tx/Transactor.h
+++ b/include/xrpl/tx/Transactor.h
@@ -23,31 +23,31 @@ public:
     beast::Journal const j;
 
     PreflightContext(
-        ServiceRegistry& registry_,
-        STTx const& tx_,
-        uint256 parentBatchId_,
-        Rules rules_,
-        ApplyFlags flags_,
-        beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : registry(registry_)
-        , tx(tx_)
-        , rules(std::move(rules_))
-        , flags(flags_)
-        , parentBatchId(parentBatchId_)
-        , j(j_)
+        ServiceRegistry& registry,
+        STTx const& tx,
+        uint256 parentBatchId,
+        Rules rules,
+        ApplyFlags flags,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : registry(registry)
+        , tx(tx)
+        , rules(std::move(rules))
+        , flags(flags)
+        , parentBatchId(parentBatchId)
+        , j(j)
     {
-        XRPL_ASSERT((flags_ & tapBATCH) == tapBATCH, "Batch apply flag should be set");
+        XRPL_ASSERT((flags & TapBatch) == TapBatch, "Batch apply flag should be set");
     }
 
     PreflightContext(
-        ServiceRegistry& registry_,
-        STTx const& tx_,
-        Rules rules_,
-        ApplyFlags flags_,
-        beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : registry(registry_), tx(tx_), rules(std::move(rules_)), flags(flags_), j(j_)
+        ServiceRegistry& registry,
+        STTx const& tx,
+        Rules rules,
+        ApplyFlags flags,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : registry(registry), tx(tx), rules(std::move(rules)), flags(flags), j(j)
     {
-        XRPL_ASSERT((flags_ & tapBATCH) == 0, "Batch apply flag should not be set");
+        XRPL_ASSERT((flags & TapBatch) == 0, "Batch apply flag should not be set");
     }
 
     PreflightContext&
@@ -67,36 +67,36 @@ public:
     beast::Journal const j;
 
     PreclaimContext(
-        ServiceRegistry& registry_,
-        ReadView const& view_,
-        TER preflightResult_,
-        STTx const& tx_,
-        ApplyFlags flags_,
-        std::optional<uint256> parentBatchId_,
-        beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : registry(registry_)
-        , view(view_)
-        , preflightResult(preflightResult_)
-        , flags(flags_)
-        , tx(tx_)
-        , parentBatchId(parentBatchId_)
-        , j(j_)
+        ServiceRegistry& registry,
+        ReadView const& view,
+        TER preflightResult,
+        STTx const& tx,
+        ApplyFlags flags,
+        std::optional<uint256> parentBatchId,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : registry(registry)
+        , view(view)
+        , preflightResult(preflightResult)
+        , flags(flags)
+        , tx(tx)
+        , parentBatchId(parentBatchId)
+        , j(j)
     {
         XRPL_ASSERT(
-            parentBatchId.has_value() == ((flags_ & tapBATCH) == tapBATCH),
+            parentBatchId.has_value() == ((flags & TapBatch) == TapBatch),
             "Parent Batch ID should be set if batch apply flag is set");
     }
 
     PreclaimContext(
-        ServiceRegistry& registry_,
-        ReadView const& view_,
-        TER preflightResult_,
-        STTx const& tx_,
-        ApplyFlags flags_,
-        beast::Journal j_ = beast::Journal{beast::Journal::getNullSink()})
-        : PreclaimContext(registry_, view_, preflightResult_, tx_, flags_, std::nullopt, j_)
+        ServiceRegistry& registry,
+        ReadView const& view,
+        TER preflightResult,
+        STTx const& tx,
+        ApplyFlags flags,
+        beast::Journal j = beast::Journal{beast::Journal::getNullSink()})
+        : PreclaimContext(registry, view, preflightResult, tx, flags, std::nullopt, j)
     {
-        XRPL_ASSERT((flags_ & tapBATCH) == 0, "Batch apply flag should not be set");
+        XRPL_ASSERT((flags & TapBatch) == 0, "Batch apply flag should not be set");
     }
 
     PreclaimContext&
diff --git a/include/xrpl/tx/applySteps.h b/include/xrpl/tx/applySteps.h
index dc4140956c..897cf500d6 100644
--- a/include/xrpl/tx/applySteps.h
+++ b/include/xrpl/tx/applySteps.h
@@ -27,7 +27,7 @@ struct ApplyResult
 inline bool
 isTecClaimHardFail(TER ter, ApplyFlags flags)
 {
-    return isTecClaim(ter) && ((flags & tapRETRY) == 0u);
+    return isTecClaim(ter) && ((flags & TapRetry) == 0u);
 }
 
 /** Class describing the consequences to the account
@@ -41,10 +41,10 @@ public:
     /// transactions
     enum class Category {
         /// Moves currency around, creates offers, etc.
-        normal = 0,
+        Normal = 0,
         /// Affects the ability of subsequent transactions
         /// to claim a fee. Eg. `SetRegularKey`
-        blocker
+        Blocker
     };
 
 private:
@@ -160,13 +160,13 @@ public:
 
     /// Constructor
     template <class Context>
-    PreflightResult(Context const& ctx_, std::pair<NotTEC, TxConsequences> const& result)
-        : tx(ctx_.tx)
-        , parentBatchId(ctx_.parentBatchId)
-        , rules(ctx_.rules)
+    PreflightResult(Context const& ctx, std::pair<NotTEC, TxConsequences> const& result)
+        : tx(ctx.tx)
+        , parentBatchId(ctx.parentBatchId)
+        , rules(ctx.rules)
         , consequences(result.second)
-        , flags(ctx_.flags)
-        , j(ctx_.j)
+        , flags(ctx.flags)
+        , j(ctx.j)
         , ter(result.first)
     {
     }
@@ -206,13 +206,13 @@ public:
 
     /// Constructor
     template <class Context>
-    PreclaimResult(Context const& ctx_, TER ter_)
-        : view(ctx_.view)
-        , tx(ctx_.tx)
-        , parentBatchId(ctx_.parentBatchId)
-        , flags(ctx_.flags)
-        , j(ctx_.j)
-        , ter(ter_)
+    PreclaimResult(Context const& ctx, TER ter)
+        : view(ctx.view)
+        , tx(ctx.tx)
+        , parentBatchId(ctx.parentBatchId)
+        , flags(ctx.flags)
+        , j(ctx.j)
+        , ter(ter)
         , likelyToClaimFee(isTesSuccess(ter) || isTecClaimHardFail(ter, flags))
     {
     }
diff --git a/include/xrpl/tx/invariants/InvariantCheck.h b/include/xrpl/tx/invariants/InvariantCheck.h
index 028a110acd..bc9608fd56 100644
--- a/include/xrpl/tx/invariants/InvariantCheck.h
+++ b/include/xrpl/tx/invariants/InvariantCheck.h
@@ -321,8 +321,8 @@ public:
  */
 class ValidClawback
 {
-    std::uint32_t trustlinesChanged = 0;
-    std::uint32_t mptokensChanged = 0;
+    std::uint32_t trustlinesChanged_ = 0;
+    std::uint32_t mptokensChanged_ = 0;
 
 public:
     void
diff --git a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
index 44131167b6..5f76a43759 100644
--- a/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
+++ b/include/xrpl/tx/invariants/InvariantCheckPrivilege.h
@@ -28,33 +28,33 @@ so that bad code gets caught and fixed as early as possible.
 // Bitwise flags, 86 files
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Privilege {
-    noPriv = 0x0000,              // The transaction can not do any of the enumerated operations
-    createAcct = 0x0001,          // The transaction can create a new ACCOUNT_ROOT object.
-    createPseudoAcct = 0x0002,    // The transaction can create a pseudo account,
+    NoPriv = 0x0000,              // The transaction can not do any of the enumerated operations
+    CreateAcct = 0x0001,          // The transaction can create a new ACCOUNT_ROOT object.
+    CreatePseudoAcct = 0x0002,    // The transaction can create a pseudo account,
                                   // which implies createAcct
-    mustDeleteAcct = 0x0004,      // The transaction must delete an ACCOUNT_ROOT object
-    mayDeleteAcct = 0x0008,       // The transaction may delete an ACCOUNT_ROOT
+    MustDeleteAcct = 0x0004,      // The transaction must delete an ACCOUNT_ROOT object
+    MayDeleteAcct = 0x0008,       // The transaction may delete an ACCOUNT_ROOT
                                   // object, but does not have to
-    overrideFreeze = 0x0010,      // The transaction can override some freeze rules
-    changeNFTCounts = 0x0020,     // The transaction can mint or burn an NFT
-    createMPTIssuance = 0x0040,   // The transaction can create a new MPT issuance
-    destroyMPTIssuance = 0x0080,  // The transaction can destroy an MPT issuance
-    mustAuthorizeMPT = 0x0100,    // The transaction MUST create or delete an MPT
+    OverrideFreeze = 0x0010,      // The transaction can override some freeze rules
+    ChangeNftCounts = 0x0020,     // The transaction can mint or burn an NFT
+    CreateMptIssuance = 0x0040,   // The transaction can create a new MPT issuance
+    DestroyMptIssuance = 0x0080,  // The transaction can destroy an MPT issuance
+    MustAuthorizeMpt = 0x0100,    // The transaction MUST create or delete an MPT
                                   // object (except by issuer)
-    mayAuthorizeMPT = 0x0200,     // The transaction MAY create or delete an MPT
+    MayAuthorizeMpt = 0x0200,     // The transaction MAY create or delete an MPT
                                   // object (except by issuer)
-    mayDeleteMPT = 0x0400,        // The transaction MAY delete an MPT object. May not create.
-    mustModifyVault = 0x0800,     // The transaction must modify, delete or create, a vault
-    mayModifyVault = 0x1000,      // The transaction MAY modify, delete or create, a vault
-    mayCreateMPT = 0x2000,        // The transaction MAY create an MPT object, except for issuer.
+    MayDeleteMpt = 0x0400,        // The transaction MAY delete an MPT object. May not create.
+    MustModifyVault = 0x0800,     // The transaction must modify, delete or create, a vault
+    MayModifyVault = 0x1000,      // The transaction MAY modify, delete or create, a vault
+    MayCreateMpt = 0x2000,        // The transaction MAY create an MPT object, except for issuer.
 };
 
 constexpr Privilege
 operator|(Privilege lhs, Privilege rhs)
 {
-    return safe_cast<Privilege>(
-        safe_cast<std::underlying_type_t<Privilege>>(lhs) |
-        safe_cast<std::underlying_type_t<Privilege>>(rhs));
+    return safeCast<Privilege>(
+        safeCast<std::underlying_type_t<Privilege>>(lhs) |
+        safeCast<std::underlying_type_t<Privilege>>(rhs));
 }
 
 bool
diff --git a/include/xrpl/tx/invariants/NFTInvariant.h b/include/xrpl/tx/invariants/NFTInvariant.h
index 527b0e8097..fa056ecbb0 100644
--- a/include/xrpl/tx/invariants/NFTInvariant.h
+++ b/include/xrpl/tx/invariants/NFTInvariant.h
@@ -54,10 +54,10 @@ public:
  */
 class NFTokenCountTracking
 {
-    std::uint32_t beforeMintedTotal = 0;
-    std::uint32_t beforeBurnedTotal = 0;
-    std::uint32_t afterMintedTotal = 0;
-    std::uint32_t afterBurnedTotal = 0;
+    std::uint32_t beforeMintedTotal_ = 0;
+    std::uint32_t beforeBurnedTotal_ = 0;
+    std::uint32_t afterMintedTotal_ = 0;
+    std::uint32_t afterBurnedTotal_ = 0;
 
 public:
     void
diff --git a/include/xrpl/tx/invariants/PermissionedDomainInvariant.h b/include/xrpl/tx/invariants/PermissionedDomainInvariant.h
index f6c902ecb2..2475ed8f6b 100644
--- a/include/xrpl/tx/invariants/PermissionedDomainInvariant.h
+++ b/include/xrpl/tx/invariants/PermissionedDomainInvariant.h
@@ -23,10 +23,10 @@ class ValidPermissionedDomain
 {
     struct SleStatus
     {
-        std::size_t credentialsSize_{0};
-        bool isSorted_ = false;
-        bool isUnique_ = false;
-        bool isDelete_ = false;
+        std::size_t credentialsSize{0};
+        bool isSorted = false;
+        bool isUnique = false;
+        bool isDelete = false;
     };
     std::vector<SleStatus> sleStatus_;
 
diff --git a/include/xrpl/tx/invariants/VaultInvariant.h b/include/xrpl/tx/invariants/VaultInvariant.h
index b9b3bf746f..7ca67f546d 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 zero{};
+    Number static constexpr kZERO{};
 
     struct Vault final
     {
-        uint256 key = beast::zero;
+        uint256 key = beast::kZERO;
         Asset asset;
         AccountID pseudoId;
         AccountID owner;
-        uint192 shareMPTID = beast::zero;
+        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 = numZero;
+        Number delta = kNUM_ZERO;
         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 d7a62dce65..3211d0caa7 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 InitialFibSeqPct = Number(5) / 20000;
+    inline static Number const kINITIAL_FIB_SEQ_PCT = Number(5) / 20000;
     AMMContext& ammContext_;
     AccountID const ammAccountID_;
     std::uint32_t const tradingFee_;
diff --git a/include/xrpl/tx/paths/AMMOffer.h b/include/xrpl/tx/paths/AMMOffer.h
index bdffec5ab9..21c45c36a3 100644
--- a/include/xrpl/tx/paths/AMMOffer.h
+++ b/include/xrpl/tx/paths/AMMOffer.h
@@ -75,7 +75,7 @@ public:
     consume(ApplyView& view, TAmounts<TIn, TOut> const& consumed);
 
     [[nodiscard]] bool
-    fully_consumed() const
+    fullyConsumed() const
     {
         return consumed_;
     }
diff --git a/include/xrpl/tx/paths/BookTip.h b/include/xrpl/tx/paths/BookTip.h
index 2d7490d144..e06a2da86c 100644
--- a/include/xrpl/tx/paths/BookTip.h
+++ b/include/xrpl/tx/paths/BookTip.h
@@ -16,13 +16,13 @@ class BookTip
 {
 private:
     ApplyView& view_;
-    bool m_valid{false};
-    uint256 m_book;
-    uint256 m_end;
-    uint256 m_dir;
-    uint256 m_index;
-    std::shared_ptr<SLE> m_entry;
-    Quality m_quality{};
+    bool valid_{false};
+    uint256 book_;
+    uint256 end_;
+    uint256 dir_;
+    uint256 index_;
+    std::shared_ptr<SLE> entry_;
+    Quality quality_{};
 
 public:
     /** Create the iterator. */
@@ -31,25 +31,25 @@ public:
     [[nodiscard]] uint256 const&
     dir() const noexcept
     {
-        return m_dir;
+        return dir_;
     }
 
     [[nodiscard]] uint256 const&
     index() const noexcept
     {
-        return m_index;
+        return index_;
     }
 
     [[nodiscard]] Quality const&
     quality() const noexcept
     {
-        return m_quality;
+        return quality_;
     }
 
     [[nodiscard]] SLE::pointer const&
     entry() const noexcept
     {
-        return m_entry;
+        return entry_;
     }
 
     /** Erases the current offer and advance to the next offer.
diff --git a/include/xrpl/tx/paths/Offer.h b/include/xrpl/tx/paths/Offer.h
index 7e3eee0430..0a551f4c2d 100644
--- a/include/xrpl/tx/paths/Offer.h
+++ b/include/xrpl/tx/paths/Offer.h
@@ -19,13 +19,13 @@ template <StepAmount TIn, StepAmount TOut>
 class TOffer
 {
 private:
-    SLE::pointer m_entry;
-    Quality m_quality{};
-    AccountID m_account;
+    SLE::pointer entry_;
+    Quality quality_{};
+    AccountID account_;
     Asset assetIn_;
     Asset assetOut_;
 
-    TAmounts<TIn, TOut> m_amounts{};
+    TAmounts<TIn, TOut> amounts_{};
     void
     setFieldAmounts();
 
@@ -46,14 +46,14 @@ public:
     [[nodiscard]] Quality
     quality() const noexcept
     {
-        return m_quality;
+        return quality_;
     }
 
     /** Returns the account id of the offer's owner. */
     [[nodiscard]] AccountID const&
     owner() const
     {
-        return m_account;
+        return account_;
     }
 
     /** Returns the in and out amounts.
@@ -62,16 +62,16 @@ public:
     [[nodiscard]] TAmounts<TIn, TOut> const&
     amount() const
     {
-        return m_amounts;
+        return amounts_;
     }
 
     /** Returns `true` if no more funds can flow through this offer. */
     [[nodiscard]] bool
-    fully_consumed() const
+    fullyConsumed() const
     {
-        if (m_amounts.in <= beast::zero)
+        if (amounts_.in <= beast::kZERO)
             return true;
-        if (m_amounts.out <= beast::zero)
+        if (amounts_.out <= beast::kZERO)
             return true;
         return false;
     }
@@ -80,27 +80,27 @@ public:
     void
     consume(ApplyView& view, TAmounts<TIn, TOut> const& consumed)
     {
-        if (consumed.in > m_amounts.in)
+        if (consumed.in > amounts_.in)
             Throw<std::logic_error>("can't consume more than is available.");
 
-        if (consumed.out > m_amounts.out)
+        if (consumed.out > amounts_.out)
             Throw<std::logic_error>("can't produce more than is available.");
 
-        m_amounts -= consumed;
+        amounts_ -= consumed;
         setFieldAmounts();
-        view.update(m_entry);
+        view.update(entry_);
     }
 
     [[nodiscard]] std::string
     id() const
     {
-        return to_string(m_entry->key());
+        return to_string(entry_->key());
     }
 
     [[nodiscard]] std::optional<uint256>
     key() const
     {
-        return m_entry->key();
+        return entry_->key();
     }
 
     [[nodiscard]] Asset const&
@@ -122,7 +122,7 @@ public:
     isFunded() const
     {
         // Offer owner is issuer; they have unlimited funds if IOU
-        return m_account == assetOut_.getIssuer() && assetOut_.holds<Issue>();
+        return account_ == assetOut_.getIssuer() && assetOut_.holds<Issue>();
     }
 
     static std::pair<std::uint32_t, std::uint32_t>
@@ -141,13 +141,13 @@ public:
         if (!isFeatureEnabled(fixAMMv1_3))
             return true;
 
-        if (consumed.in > m_amounts.in || consumed.out > m_amounts.out)
+        if (consumed.in > amounts_.in || consumed.out > amounts_.out)
         {
             // LCOV_EXCL_START
             JLOG(j.error()) << "AMMOffer::checkInvariant failed: consumed "
                             << to_string(consumed.in) << " " << to_string(consumed.out)
-                            << " amounts " << to_string(m_amounts.in) << " "
-                            << to_string(m_amounts.out);
+                            << " amounts " << to_string(amounts_.in) << " "
+                            << to_string(amounts_.out);
 
             return false;
             // LCOV_EXCL_STOP
@@ -159,12 +159,12 @@ public:
 
 template <StepAmount TIn, StepAmount TOut>
 TOffer<TIn, TOut>::TOffer(SLE::pointer entry, Quality quality)
-    : m_entry(std::move(entry)), m_quality(quality), m_account(m_entry->getAccountID(sfAccount))
+    : entry_(std::move(entry)), quality_(quality), account_(entry_->getAccountID(sfAccount))
 {
-    auto const tp = m_entry->getFieldAmount(sfTakerPays);
-    auto const tg = m_entry->getFieldAmount(sfTakerGets);
-    m_amounts.in = toAmount<TIn>(tp);
-    m_amounts.out = toAmount<TOut>(tg);
+    auto const tp = entry_->getFieldAmount(sfTakerPays);
+    auto const tg = entry_->getFieldAmount(sfTakerGets);
+    amounts_.in = toAmount<TIn>(tp);
+    amounts_.out = toAmount<TOut>(tg);
     assetIn_ = tp.asset();
     assetOut_ = tg.asset();
 }
@@ -175,20 +175,20 @@ TOffer<TIn, TOut>::setFieldAmounts()
 {
     if constexpr (std::is_same_v<TIn, XRPAmount>)
     {
-        m_entry->setFieldAmount(sfTakerPays, toSTAmount(m_amounts.in));
+        entry_->setFieldAmount(sfTakerPays, toSTAmount(amounts_.in));
     }
     else
     {
-        m_entry->setFieldAmount(sfTakerPays, toSTAmount(m_amounts.in, assetIn_));
+        entry_->setFieldAmount(sfTakerPays, toSTAmount(amounts_.in, assetIn_));
     }
 
     if constexpr (std::is_same_v<TOut, XRPAmount>)
     {
-        m_entry->setFieldAmount(sfTakerGets, toSTAmount(m_amounts.out));
+        entry_->setFieldAmount(sfTakerGets, toSTAmount(amounts_.out));
     }
     else
     {
-        m_entry->setFieldAmount(sfTakerGets, toSTAmount(m_amounts.out, assetOut_));
+        entry_->setFieldAmount(sfTakerGets, toSTAmount(amounts_.out, assetOut_));
     }
 }
 
@@ -199,7 +199,7 @@ TOffer<TIn, TOut>::limitOut(TAmounts<TIn, TOut> const& offerAmount, TOut const&
 {
     // It turns out that the ceil_out implementation has some slop in
     // it, which ceil_out_strict removes.
-    return quality().ceil_out_strict(offerAmount, limit, roundUp);
+    return quality().ceilOutStrict(offerAmount, limit, roundUp);
 }
 
 template <StepAmount TIn, StepAmount TOut>
@@ -214,9 +214,9 @@ TOffer<TIn, TOut>::limitIn(TAmounts<TIn, TOut> const& offerAmount, TIn const& li
         // it.  ceil_in_strict removes that slop.  But removing that slop
         // affects transaction outcomes, so the change must be made using
         // an amendment.
-        return quality().ceil_in_strict(offerAmount, limit, roundUp);
+        return quality().ceilInStrict(offerAmount, limit, roundUp);
     }
-    return m_quality.ceil_in(offerAmount, limit);
+    return quality_.ceilIn(offerAmount, limit);
 }
 
 template <StepAmount TIn, StepAmount TOut>
diff --git a/include/xrpl/tx/paths/RippleCalc.h b/include/xrpl/tx/paths/RippleCalc.h
index 771467cdc7..c747787820 100644
--- a/include/xrpl/tx/paths/RippleCalc.h
+++ b/include/xrpl/tx/paths/RippleCalc.h
@@ -102,7 +102,7 @@ public:
     // unfunded offers in a deterministic order (hence the ordered container).
     //
     // Offers that were found unfunded.
-    boost::container::flat_set<uint256> permanentlyUnfundedOffers_;
+    boost::container::flat_set<uint256> permanentlyUnfundedOffers;
 };
 
 }  // namespace path
diff --git a/include/xrpl/tx/paths/detail/FlatSets.h b/include/xrpl/tx/paths/detail/FlatSets.h
index a7546cc514..c0fc8fa417 100644
--- a/include/xrpl/tx/paths/detail/FlatSets.h
+++ b/include/xrpl/tx/paths/detail/FlatSets.h
@@ -12,7 +12,7 @@ namespace xrpl {
  */
 template <class T>
 void
-SetUnion(boost::container::flat_set<T>& dst, boost::container::flat_set<T> const& src)
+setUnion(boost::container::flat_set<T>& dst, boost::container::flat_set<T> const& src)
 {
     if (src.empty())
         return;
diff --git a/include/xrpl/tx/paths/detail/FlowDebugInfo.h b/include/xrpl/tx/paths/detail/FlowDebugInfo.h
index 36c0bd7de0..ec7df86e53 100644
--- a/include/xrpl/tx/paths/detail/FlowDebugInfo.h
+++ b/include/xrpl/tx/paths/detail/FlowDebugInfo.h
@@ -23,7 +23,7 @@ struct FlowDebugInfo
     struct PassInfo
     {
         PassInfo() = delete;
-        PassInfo(bool nativeIn_, bool nativeOut_) : nativeIn(nativeIn_), nativeOut(nativeOut_)
+        PassInfo(bool nativeIn, bool nativeOut) : nativeIn(nativeIn), nativeOut(nativeOut)
         {
         }
         bool const nativeIn;
@@ -52,10 +52,10 @@ struct FlowDebugInfo
         }
 
         void
-        push_back(EitherAmount const& in_amt, EitherAmount const& out_amt, std::size_t active)
+        pushBack(EitherAmount const& inAmt, EitherAmount const& outAmt, std::size_t active)
         {
-            in.push_back(in_amt);
-            out.push_back(out_amt);
+            in.push_back(inAmt);
+            out.push_back(outAmt);
             numActive.push_back(active);
         }
 
@@ -167,7 +167,7 @@ struct FlowDebugInfo
     void
     pushPass(EitherAmount const& in, EitherAmount const& out, std::size_t activeStrands)
     {
-        passInfo.push_back(in, out, activeStrands);
+        passInfo.pushBack(in, out, activeStrands);
     }
 
     void
@@ -183,7 +183,7 @@ struct FlowDebugInfo
     }
 
     [[nodiscard]] std::string
-    to_string(bool writePassInfo) const
+    toString(bool writePassInfo) const
     {
         std::ostringstream ostr;
 
@@ -193,7 +193,7 @@ struct FlowDebugInfo
 
         if (writePassInfo)
         {
-            auto write_list = [&ostr](auto const& vals, auto&& fun, char delim = ';') {
+            auto writeList = [&ostr](auto const& vals, auto&& fun, char delim = ';') {
                 ostr << '[';
                 if (!vals.empty())
                 {
@@ -203,24 +203,24 @@ struct FlowDebugInfo
                 }
                 ostr << ']';
             };
-            auto writeXrpAmtList = [&write_list](
+            auto writeXrpAmtList = [&writeList](
                                        std::vector<EitherAmount> const& amts, char delim = ';') {
-                auto get_val = [](EitherAmount const& a) -> std::string {
+                auto getVal = [](EitherAmount const& a) -> std::string {
                     return xrpl::to_string(a.get<XRPAmount>());
                 };
-                write_list(amts, get_val, delim);
+                writeList(amts, getVal, delim);
             };
-            auto writeIouAmtList = [&write_list](
+            auto writeIouAmtList = [&writeList](
                                        std::vector<EitherAmount> const& amts, char delim = ';') {
-                auto get_val = [](EitherAmount const& a) -> std::string {
+                auto getVal = [](EitherAmount const& a) -> std::string {
                     return xrpl::to_string(a.get<IOUAmount>());
                 };
-                write_list(amts, get_val, delim);
+                writeList(amts, getVal, delim);
             };
-            auto writeIntList = [&write_list](std::vector<size_t> const& vals, char delim = ';') {
+            auto writeIntList = [&writeList](std::vector<size_t> const& vals, char delim = ';') {
                 // NOLINTNEXTLINE(bugprone-return-const-ref-from-parameter)
-                auto get_val = [](size_t const& v) -> size_t const& { return v; };
-                write_list(vals, get_val);
+                auto getVal = [](size_t const& v) -> size_t const& { return v; };
+                writeList(vals, getVal);
             };
             auto writeNestedIouAmtList =
                 [&ostr, &writeIouAmtList](std::vector<std::vector<EitherAmount>> const& amts) {
diff --git a/include/xrpl/tx/paths/detail/Steps.h b/include/xrpl/tx/paths/detail/Steps.h
index 9b37f06ca9..db9d3a6f3a 100644
--- a/include/xrpl/tx/paths/detail/Steps.h
+++ b/include/xrpl/tx/paths/detail/Steps.h
@@ -18,21 +18,21 @@ class ReadView;
 class ApplyView;
 class AMMContext;
 
-enum class DebtDirection { issues, redeems };
-enum class QualityDirection { in, out };
-enum class StrandDirection { forward, reverse };
-enum class OfferCrossing { no = 0, yes = 1, sell = 2 };
+enum class DebtDirection { Issues, Redeems };
+enum class QualityDirection { In, Out };
+enum class StrandDirection { Forward, Reverse };
+enum class OfferCrossing { No = 0, Yes = 1, Sell = 2 };
 
 inline bool
 redeems(DebtDirection dir)
 {
-    return dir == DebtDirection::redeems;
+    return dir == DebtDirection::Redeems;
 }
 
 inline bool
 issues(DebtDirection dir)
 {
-    return dir == DebtDirection::issues;
+    return dir == DebtDirection::Issues;
 }
 
 /**
@@ -460,7 +460,7 @@ public:
     [[nodiscard]] bool
     isZero(EitherAmount const& out) const override
     {
-        return get<TOut>(out) == beast::zero;
+        return get<TOut>(out) == beast::kZERO;
     }
 
     [[nodiscard]] bool
@@ -547,24 +547,24 @@ struct StrandContext
 
     /** StrandContext constructor. */
     StrandContext(
-        ReadView const& view_,
-        std::vector<std::unique_ptr<Step>> const& strand_,
+        ReadView const& view,
+        std::vector<std::unique_ptr<Step>> const& strand,
         // A strand may not include an inner node that
         // replicates the source or destination.
-        AccountID const& strandSrc_,
-        AccountID const& strandDst_,
-        Asset const& strandDeliver_,
-        std::optional<Quality> const& limitQuality_,
-        bool isLast_,
-        bool ownerPaysTransferFee_,
-        OfferCrossing offerCrossing_,
-        bool isDefaultPath_,
+        AccountID const& strandSrc,
+        AccountID const& strandDst,
+        Asset const& strandDeliver,
+        std::optional<Quality> const& limitQuality,
+        bool isLast,
+        bool ownerPaysTransferFee,
+        OfferCrossing offerCrossing,
+        bool isDefaultPath,
         std::array<boost::container::flat_set<Asset>, 2>&
-            seenDirectAssets_,                             ///< For detecting currency loops
-        boost::container::flat_set<Asset>& seenBookOuts_,  ///< For detecting book loops
-        AMMContext& ammContext_,
+            seenDirectAssets,                             ///< For detecting currency loops
+        boost::container::flat_set<Asset>& seenBookOuts,  ///< For detecting book loops
+        AMMContext& ammContext,
         std::optional<uint256> const& domainID,
-        beast::Journal j_);  ///< Journal for logging
+        beast::Journal j);  ///< Journal for logging
 };
 
 /// @cond INTERNAL
@@ -592,45 +592,45 @@ bookStepEqual(Step const& step, xrpl::Book const& book);
 }  // namespace test
 
 std::pair<TER, std::unique_ptr<Step>>
-make_DirectStepI(
+makeDirectStepI(
     StrandContext const& ctx,
     AccountID const& src,
     AccountID const& dst,
     Currency const& c);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_MPTEndpointStep(
+makeMptEndpointStep(
     StrandContext const& ctx,
     AccountID const& src,
     AccountID const& dst,
     MPTID const& a);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepII(StrandContext const& ctx, Issue const& in, Issue const& out);
+makeBookStepIi(StrandContext const& ctx, Issue const& in, Issue const& out);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepIX(StrandContext const& ctx, Issue const& in);
+makeBookStepIx(StrandContext const& ctx, Issue const& in);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepXI(StrandContext const& ctx, Issue const& out);
+makeBookStepXi(StrandContext const& ctx, Issue const& out);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_XRPEndpointStep(StrandContext const& ctx, AccountID const& acc);
+makeXrpEndpointStep(StrandContext const& ctx, AccountID const& acc);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMM(StrandContext const& ctx, MPTIssue const& in, MPTIssue const& out);
+makeBookStepMm(StrandContext const& ctx, MPTIssue const& in, MPTIssue const& out);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMX(StrandContext const& ctx, MPTIssue const& in);
+makeBookStepMx(StrandContext const& ctx, MPTIssue const& in);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepXM(StrandContext const& ctx, MPTIssue const& out);
+makeBookStepXm(StrandContext const& ctx, MPTIssue const& out);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMI(StrandContext const& ctx, MPTIssue const& in, Issue const& out);
+makeBookStepMi(StrandContext const& ctx, MPTIssue const& in, Issue const& out);
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepIM(StrandContext const& ctx, Issue const& in, MPTIssue const& out);
+makeBookStepIm(StrandContext const& ctx, Issue const& in, MPTIssue const& out);
 
 template <StepAmount InAmt, StepAmount OutAmt>
 bool
diff --git a/include/xrpl/tx/paths/detail/StrandFlow.h b/include/xrpl/tx/paths/detail/StrandFlow.h
index 03ec9cc871..f69e10e99a 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::zero;                       ///< Currency amount in
-    TOutAmt out = beast::zero;                     ///< 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
@@ -45,23 +45,23 @@ struct StrandResult
 
     StrandResult(
         Strand const& strand,
-        TInAmt const& in_,
-        TOutAmt const& out_,
-        PaymentSandbox&& sandbox_,
-        boost::container::flat_set<uint256> ofrsToRm_,
-        bool inactive_)
+        TInAmt const& in,
+        TOutAmt const& out,
+        PaymentSandbox&& sandbox,
+        boost::container::flat_set<uint256> ofrsToRemoveMember,
+        bool inactive)
         : success(true)
-        , in(in_)
-        , out(out_)
-        , sandbox(std::move(sandbox_))
-        , ofrsToRm(std::move(ofrsToRm_))
+        , in(in)
+        , out(out)
+        , sandbox(std::move(sandbox))
+        , ofrsToRm(std::move(ofrsToRemoveMember))
         , ofrsUsed(offersUsed(strand))
-        , inactive(inactive_)
+        , inactive(inactive)
     {
     }
 
-    StrandResult(Strand const& strand, boost::container::flat_set<uint256> ofrsToRm_)
-        : ofrsToRm(std::move(ofrsToRm_)), ofrsUsed(offersUsed(strand))
+    StrandResult(Strand const& strand, boost::container::flat_set<uint256> ofrsToRemoveMember)
+        : ofrsToRm(std::move(ofrsToRemoveMember)), ofrsUsed(offersUsed(strand))
     {
     }
 };
@@ -246,7 +246,8 @@ flow(
             // Re-executing the strand will change the cached values
             PaymentSandbox checkSB(&baseView);
             PaymentSandbox checkAfView(&baseView);
-            EitherAmount stepIn(*strand[0]->cachedIn());
+            EitherAmount stepIn(
+                *strand[0]->cachedIn());  // NOLINT(bugprone-unchecked-optional-access)
             for (auto i = 0; i < s; ++i)
             {
                 bool valid = false;
@@ -283,8 +284,8 @@ flow(
 template <class TInAmt, class TOutAmt>
 struct FlowResult
 {
-    TInAmt in = beast::zero;
-    TOutAmt out = beast::zero;
+    TInAmt in = beast::kZERO;
+    TOutAmt out = beast::kZERO;
     std::optional<PaymentSandbox> sandbox;
     boost::container::flat_set<uint256> removableOffers;
     TER ter = temUNKNOWN;
@@ -292,29 +293,29 @@ struct FlowResult
     FlowResult() = default;
 
     FlowResult(
-        TInAmt const& in_,
-        TOutAmt const& out_,
-        PaymentSandbox&& sandbox_,
+        TInAmt const& in,
+        TOutAmt const& out,
+        PaymentSandbox&& sandbox,
         boost::container::flat_set<uint256> ofrsToRm)
-        : in(in_)
-        , out(out_)
-        , sandbox(std::move(sandbox_))
+        : in(in)
+        , out(out)
+        , sandbox(std::move(sandbox))
         , removableOffers(std::move(ofrsToRm))
         , ter(tesSUCCESS)
     {
     }
 
-    FlowResult(TER ter_, boost::container::flat_set<uint256> ofrsToRm)
-        : removableOffers(std::move(ofrsToRm)), ter(ter_)
+    FlowResult(TER ter, boost::container::flat_set<uint256> ofrsToRm)
+        : removableOffers(std::move(ofrsToRm)), ter(ter)
     {
     }
 
     FlowResult(
-        TER ter_,
-        TInAmt const& in_,
-        TOutAmt const& out_,
+        TER ter,
+        TInAmt const& in,
+        TOutAmt const& out,
         boost::container::flat_set<uint256> ofrsToRm)
-        : in(in_), out(out_), removableOffers(std::move(ofrsToRm)), ter(ter_)
+        : in(in), out(out), removableOffers(std::move(ofrsToRm)), ter(ter)
     {
     }
 };
@@ -324,14 +325,14 @@ struct FlowResult
 inline std::optional<Quality>
 qualityUpperBound(ReadView const& v, Strand const& strand)
 {
-    Quality q{STAmount::uRateOne};
+    Quality q{STAmount::kU_RATE_ONE};
     std::optional<Quality> stepQ;
-    DebtDirection dir = DebtDirection::issues;
+    DebtDirection dir = DebtDirection::Issues;
     for (auto const& step : strand)
     {
         if (std::tie(stepQ, dir) = step->qualityUpperBound(v, dir); stepQ)
         {
-            q = composed_quality(q, *stepQ);
+            q = composedQuality(q, *stepQ);
         }
         else
         {
@@ -361,7 +362,7 @@ limitOut(
 {
     std::optional<QualityFunction> stepQualityFunc;
     std::optional<QualityFunction> qf;
-    DebtDirection dir = DebtDirection::issues;
+    DebtDirection dir = DebtDirection::Issues;
     for (auto const& step : strand)
     {
         if (std::tie(stepQualityFunc, dir) = step->getQualityFunc(v, dir); stepQualityFunc)
@@ -575,12 +576,12 @@ flow(
         Quality quality;
 
         BestStrand(
-            TInAmt const& in_,
-            TOutAmt const& out_,
-            PaymentSandbox&& sb_,
-            Strand const& strand_,
-            Quality const& quality_)
-            : in(in_), out(out_), sb(std::move(sb_)), strand(strand_), quality(quality_)
+            TInAmt const& in,
+            TOutAmt const& out,
+            PaymentSandbox&& sb,
+            Strand const& strand,
+            Quality const& quality)
+            : in(in), out(out), sb(std::move(sb)), strand(strand), quality(quality)
         {
         }
     };
@@ -594,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::zero};
+    TInAmt const sendMaxInit = sendMaxST ? toAmount<TInAmt>(*sendMaxST) : TInAmt{beast::kZERO};
     std::optional<TInAmt> const sendMax =
-        (sendMaxST && sendMaxInit >= beast::zero) ? 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};
 
@@ -618,7 +619,7 @@ flow(
     auto sum = [](auto const& col) {
         using TResult = std::decay_t<decltype(*col.begin())>;
         if (col.empty())
-            return TResult{beast::zero};
+            return TResult{beast::kZERO};
         return std::accumulate(col.begin() + 1, col.end(), *col.begin());
     };
 
@@ -626,7 +627,7 @@ flow(
     // successful
     boost::container::flat_set<uint256> ofrsToRmOnFail;
 
-    while (remainingOut > beast::zero && (!remainingIn || *remainingIn > beast::zero))
+    while (remainingOut > beast::kZERO && (!remainingIn || *remainingIn > beast::kZERO))
     {
         ++curTry;
         if (curTry >= maxTries)
@@ -665,7 +666,7 @@ flow(
             // the previous strand execution failed. It has to be reset
             // since this strand might not have AMM liquidity.
             ammContext.clear();
-            if (offerCrossing != OfferCrossing::no && limitQuality)
+            if (offerCrossing != OfferCrossing::No && limitQuality)
             {
                 auto const strandQ = qualityUpperBound(sb, *strand);
                 if (!strandQ || *strandQ < *limitQuality)
@@ -674,11 +675,11 @@ flow(
             auto f = flow<TInAmt, TOutAmt>(sb, *strand, remainingIn, limitRemainingOut, j);
 
             // rm bad offers even if the strand fails
-            SetUnion(ofrsToRm, f.ofrsToRm);
+            setUnion(ofrsToRm, f.ofrsToRm);
 
             offersConsidered += f.ofrsUsed;
 
-            if (!f.success || f.out == beast::zero)
+            if (!f.success || f.out == beast::kZERO)
                 continue;
 
             if (flowDebugInfo)
@@ -740,11 +741,10 @@ flow(
             JLOG(j.trace()) << "All strands dry.";
         }
 
-        best.reset();  // view in best must be destroyed before modifying base
-                       // view
+        best.reset();  // view in best must be destroyed before modifying base view
         if (!ofrsToRm.empty())
         {
-            SetUnion(ofrsToRmOnFail, ofrsToRm);
+            setUnion(ofrsToRmOnFail, ofrsToRm);
             for (auto const& o : ofrsToRm)
             {
                 if (auto ok = sb.peek(keylet::offer(o)))
@@ -779,35 +779,34 @@ flow(
     {
         if (actualOut > outReq)
         {
-            // Rounding in the payment engine is causing this assert to
-            // sometimes fire with "dust" amounts. This is causing issues when
-            // running debug builds of xrpld. While this issue still needs to
-            // be resolved, the assert is causing more harm than good at this
-            // point.
+            // Rounding in the payment engine is causing this assert to sometimes fire with "dust"
+            // amounts. This is causing issues when running debug builds of xrpld.
+            // While this issue still needs to be resolved, the assert is causing more harm than
+            // good at this point.
             // UNREACHABLE("xrpl::flow : rounding error");
 
             return {tefEXCEPTION, std::move(ofrsToRmOnFail)};
         }
         if (!partialPayment)
         {
-            // If we're offerCrossing a !partialPayment, then we're
-            // handling tfFillOrKill.
+            // If we're offerCrossing a !partialPayment, then we're handling tfFillOrKill.
             // Pre-fixFillOrKill amendment:
             //   That case is handled below; not here.
             // fixFillOrKill amendment:
-            //   That case is handled here if tfSell is also not set; i.e,
-            //   case 1.
-            if (offerCrossing == OfferCrossing::no ||
-                (fillOrKillEnabled && offerCrossing != OfferCrossing::sell))
+            //   That case is handled here if tfSell is also not set; i.e, case 1.
+            if (offerCrossing == OfferCrossing::No ||
+                (fillOrKillEnabled && offerCrossing != OfferCrossing::Sell))
+            {
                 return {tecPATH_PARTIAL, actualIn, actualOut, std::move(ofrsToRmOnFail)};
+            }
         }
-        else if (actualOut == beast::zero)
+        else if (actualOut == beast::kZERO)
         {
             return {tecPATH_DRY, std::move(ofrsToRmOnFail)};
         }
     }
-    if (offerCrossing != OfferCrossing::no &&
-        (!partialPayment && (!fillOrKillEnabled || offerCrossing == OfferCrossing::sell)))
+    if (offerCrossing != OfferCrossing::No &&
+        (!partialPayment && (!fillOrKillEnabled || offerCrossing == OfferCrossing::Sell)))
     {
         // If we're offer crossing and partialPayment is *not* true, then
         // we're handling a FillOrKill offer.  In this case remainingIn must
@@ -817,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::zero)
+        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 23fc55da48..1491ae09d9 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 ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 fd2106e20c..780ad846da 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 54e574939a..22a40714db 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 ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 12419076e3..16e7bf3a06 100644
--- a/include/xrpl/tx/transactors/account/SignerListSet.h
+++ b/include/xrpl/tx/transactors/account/SignerListSet.h
@@ -18,13 +18,13 @@ class SignerListSet : public Transactor
 {
 private:
     // Values determined during preCompute for use later.
-    enum class Operation { unknown, set, destroy };
-    Operation do_{Operation::unknown};
+    enum class Operation { Unknown, Set, Destroy };
+    Operation do_{Operation::Unknown};
     std::uint32_t quorum_{0};
     std::vector<SignerEntries::SignerEntry> signers_;
 
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 cd16c0b791..79755c0c2f 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 xbridgeMaxAccountCreateClaims = 128;
+constexpr size_t kXBRIDGE_MAX_ACCOUNT_CREATE_CLAIMS = 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
 
     explicit XChainCreateBridge(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -45,7 +45,7 @@ public:
 class BridgeModify : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Blocker};
 
     explicit XChainClaim(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -133,7 +133,7 @@ public:
 class XChainCommit : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Custom};
 
     static TxConsequences
     makeTxConsequences(PreflightContext const& ctx);
@@ -179,7 +179,7 @@ public:
 class XChainCreateClaimID : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 ConsequencesFactoryType ConsequencesFactory{Blocker};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Blocker};
 
     explicit XChainAddAccountCreateAttestation(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -314,7 +314,7 @@ public:
 class XChainCreateAccountCommit : public Transactor
 {
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 14abeaa978..4861a05a02 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 312c5a983e..c831cc279e 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 ff24d36e2c..494870cb1c 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 f3abc80666..0da5dd6131 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 22247feb36..d7a1a245df 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 91ea4d05ad..60de0957ca 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 eaa22532ae..ee4bfeaaef 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 e872c0d12d..979ca0250d 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 4f44da60d2..3cf6288ccf 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 f582384e12..3d13547b52 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 MaxIterations = 30;
+    constexpr static std::uint8_t kMAX_ITERATIONS = 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_ >= MaxIterations;
+        return ammIters_ >= kMAX_ITERATIONS;
     }
 
     [[nodiscard]] std::uint16_t
diff --git a/include/xrpl/tx/transactors/dex/AMMCreate.h b/include/xrpl/tx/transactors/dex/AMMCreate.h
index a3ee083b9a..485273ca17 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 a1708eec88..1fbb4ec9e8 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 87f2871d27..3847a2a529 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 f83cdcfcd2..c1fa059bd6 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 a07cfca693..cbaae78433 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 d18808d236..a8e408492e 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 09c9c0dd6f..2c5e63705a 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Custom};
 
     /** Construct a Transactor subclass that creates an offer in the ledger. */
     explicit OfferCreate(ApplyContext& ctx) : Transactor(ctx)
@@ -56,7 +56,7 @@ public:
 
 private:
     std::pair<TER, bool>
-    applyGuts(Sandbox& view, Sandbox& view_cancel);
+    applyGuts(Sandbox& view, Sandbox& viewCancel);
 
     // Determine if we are authorized to hold the asset we want to get.
     static TER
@@ -76,13 +76,13 @@ private:
         std::optional<uint256> const& domainID);
 
     static std::string
-    format_amount(STAmount const& amount);
+    formatAmount(STAmount const& amount);
 
     TER
     applyHybrid(
         Sandbox& sb,
         std::shared_ptr<STLedgerEntry> sleOffer,
-        Keylet const& offer_index,
+        Keylet const& offerIndex,
         STAmount const& saTakerPays,
         STAmount const& saTakerGets,
         std::function<void(SLE::ref, std::optional<uint256>)> const& setDir);
diff --git a/include/xrpl/tx/transactors/did/DIDDelete.h b/include/xrpl/tx/transactors/did/DIDDelete.h
index 47b4112762..2699307b39 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 2e88570065..fa07cfc295 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 253d88613f..13270b6741 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 3cbeb47fa1..4e809e3bf5 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6279b3a9af..0fc6b46311 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 9a028b6448..a774e23717 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 9b0cd9b176..f69c47afbc 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 74c35d5667..b70b0a758a 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 3de0f6fec2..ca58fc75bd 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 519ccd6ce9..6c07740f9a 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 5c6ec46d33..6f9d3ed5f0 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 98b7e38ba6..c01d25e428 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 83271cf4e7..6c2aa0ec47 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 3ede5adc4c..e926c927fb 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
 
     explicit LoanSet(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -53,16 +53,16 @@ public:
         beast::Journal const& j) override;
 
 public:
-    static std::uint32_t constexpr minPaymentTotal = 1;
-    static std::uint32_t constexpr defaultPaymentTotal = 1;
-    static_assert(defaultPaymentTotal >= minPaymentTotal);
+    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 std::uint32_t constexpr minPaymentInterval = 60;
-    static std::uint32_t constexpr defaultPaymentInterval = 60;
-    static_assert(defaultPaymentInterval >= minPaymentInterval);
+    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 std::uint32_t constexpr defaultGracePeriod = 60;
-    static_assert(defaultGracePeriod >= minPaymentInterval);
+    static std::uint32_t constexpr kDEFAULT_GRACE_PERIOD = 60;
+    static_assert(kDEFAULT_GRACE_PERIOD >= kMIN_PAYMENT_INTERVAL);
 };
 
 //------------------------------------------------------------------------------
diff --git a/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h b/include/xrpl/tx/transactors/nft/NFTokenAcceptOffer.h
index 7291db9a2e..7c77b02277 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 2830b7c22a..075bcc59ce 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 540258b8d6..f78c29dfe5 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 532aa5c120..bdb76e1c44 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6dcf8eaf12..5274e1b4b8 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 a1076a96a9..6d3bac49f5 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 5de69e980f..85ca9a2a88 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 426f46c2b4..7bedf9c837 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 f74be24c56..365ba157a5 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 3baf1fa55f..4ad870ce3f 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 MaxPathSize = 6;
+    static std::size_t const kMAX_PATH_SIZE = 6;
 
     /* The longest path we allow */
-    static std::size_t const MaxPathLength = 8;
+    static std::size_t const kMAX_PATH_LENGTH = 8;
 
 public:
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6e9a269b8d..d5e8235d31 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 cd0250713a..94a43ea165 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 befe9ac951..3f16cf1ec1 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 93879c55b2..4aaff83a7a 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 3187be08e1..820b36688c 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 1d9a66ec9a..b1af9a2f86 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
 
     explicit Batch(ApplyContext& ctx) : Transactor(ctx)
     {
@@ -47,7 +47,7 @@ public:
         ReadView const& view,
         beast::Journal const& j) override;
 
-    static constexpr auto disabledTxTypes = std::to_array<TxType>({
+    static constexpr auto kDISABLED_TX_TYPES = 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 b966ef73ec..fc68fd55c2 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 da3cb33398..72ad8196c1 100644
--- a/include/xrpl/tx/transactors/system/LedgerStateFix.h
+++ b/include/xrpl/tx/transactors/system/LedgerStateFix.h
@@ -8,10 +8,10 @@ class LedgerStateFix : public Transactor
 {
 public:
     enum class FixType : std::uint16_t {
-        nfTokenPageLink = 1,
+        NfTokenPageLink = 1,
     };
 
-    static constexpr ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 13b6e7eca5..fc1743236f 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 ConsequencesFactoryType ConsequencesFactory{Custom};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Custom};
 
-    constexpr static std::uint32_t minValidCount = 1;
+    constexpr static std::uint32_t kMIN_VALID_COUNT = 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 maxValidCount = 250;
+    constexpr static std::uint32_t kMAX_VALID_COUNT = 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 maxTicketThreshold = 250;
+    constexpr static std::uint32_t kMAX_TICKET_THRESHOLD = 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 f7b77b872c..e21f98bd7a 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 0cbc683e91..29cdda275a 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6718d28e4d..0107c11598 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 aaac508cf5..8e2a4c3dcd 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 8dc423376a..e15027ab5e 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 cf4f042515..e99d599fe4 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 9c69c88f75..4f0328aa4f 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6861c9d164..61b3e552cc 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 33a86dd050..9a75fcebac 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 5a0c63a3b1..21dc1749e2 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 6abbe80fec..59a9639126 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{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 b8604d039e..f9b7665fd6 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 ConsequencesFactoryType ConsequencesFactory{Normal};
+    static constexpr ConsequencesFactoryType kCONSEQUENCES_FACTORY{Normal};
 
     explicit VaultWithdraw(ApplyContext& ctx) : Transactor(ctx)
     {
diff --git a/src/libxrpl/basics/BasicConfig.cpp b/src/libxrpl/basics/BasicConfig.cpp
index 8fed7e5345..c1997eb713 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 re1(
+    static boost::regex const kRE1(
         "^"                        // start of line
         "(?:\\s*)"                 // whitespace (optional)
         "([a-zA-Z][_a-zA-Z0-9]*)"  // <key>
@@ -43,8 +43,8 @@ Section::append(std::vector<std::string> const& lines)
     lines_.reserve(lines_.size() + lines.size());
     for (auto line : lines)
     {
-        auto remove_comment = [](std::string& val) -> bool {
-            bool removed_trailing = false;
+        auto removeComment = [](std::string& val) -> bool {
+            bool removedTrailing = false;
             auto comment = val.find('#');
             while (comment != std::string::npos)
             {
@@ -65,24 +65,24 @@ Section::append(std::vector<std::string> const& lines)
                 {
                     // this must be a real comment. Extract the value
                     // as a substring and stop looking.
-                    val = trim_whitespace(val.substr(0, comment));
-                    removed_trailing = true;
+                    val = trimWhitespace(val.substr(0, comment));
+                    removedTrailing = true;
                     break;
                 }
 
                 comment = val.find('#', comment);
             }
-            return removed_trailing;
+            return removedTrailing;
         };
 
-        if (remove_comment(line) && !line.empty())
-            had_trailing_comments_ = true;
+        if (removeComment(line) && !line.empty())
+            hadTrailingComments_ = true;
 
         if (line.empty())
             continue;
 
         boost::smatch match;
-        if (boost::regex_match(line, match, re1))
+        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 none("");
+    static Section const kNONE("");
     auto const iter = map_.find(name);
     if (iter == map_.end())
-        return none;
+        return kNONE;
     return iter->second;
 }
 
diff --git a/src/libxrpl/basics/CountedObject.cpp b/src/libxrpl/basics/CountedObject.cpp
index 8eb6ca9dc2..1bf88687f8 100644
--- a/src/libxrpl/basics/CountedObject.cpp
+++ b/src/libxrpl/basics/CountedObject.cpp
@@ -7,12 +7,12 @@ namespace xrpl {
 CountedObjects&
 CountedObjects::getInstance() noexcept
 {
-    static CountedObjects instance;
+    static CountedObjects kINSTANCE;
 
-    return instance;
+    return kINSTANCE;
 }
 
-CountedObjects::CountedObjects() noexcept : m_count(0), m_head(nullptr)
+CountedObjects::CountedObjects() noexcept : count_(0), head_(nullptr)
 {
 }
 
@@ -23,9 +23,9 @@ CountedObjects::getCounts(int minimumThreshold) const
 
     // When other operations are concurrent, the count
     // might be temporarily less than the actual count.
-    counts.reserve(m_count.load());
+    counts.reserve(count_.load());
 
-    for (auto* ctr = m_head.load(); ctr != nullptr; ctr = ctr->getNext())
+    for (auto* ctr = head_.load(); ctr != nullptr; ctr = ctr->getNext())
     {
         if (ctr->getCount() >= minimumThreshold)
             counts.emplace_back(ctr->getName(), ctr->getCount());
diff --git a/src/libxrpl/basics/Log.cpp b/src/libxrpl/basics/Log.cpp
index eb93feaa3e..a629d865b8 100644
--- a/src/libxrpl/basics/Log.cpp
+++ b/src/libxrpl/basics/Log.cpp
@@ -42,14 +42,14 @@ Logs::Sink::writeAlways(beast::severities::Severity level, std::string const& te
 
 //------------------------------------------------------------------------------
 
-Logs::File::File() : m_stream(nullptr)
+Logs::File::File() : stream_(nullptr)
 {
 }
 
 bool
 Logs::File::isOpen() const noexcept
 {
-    return m_stream != nullptr;
+    return stream_ != nullptr;
 }
 
 bool
@@ -64,9 +64,9 @@ Logs::File::open(boost::filesystem::path const& path)
 
     if (stream->good())
     {
-        m_path = path;
+        path_ = path;
 
-        m_stream = std::move(stream);
+        stream_ = std::move(stream);
 
         wasOpened = true;
     }
@@ -79,29 +79,29 @@ Logs::File::closeAndReopen()
 {
     close();
 
-    return open(m_path);
+    return open(path_);
 }
 
 void
 Logs::File::close()
 {
-    m_stream = nullptr;
+    stream_ = nullptr;
 }
 
 void
 Logs::File::write(char const* text)
 {
-    if (m_stream != nullptr)
-        (*m_stream) << text;
+    if (stream_ != nullptr)
+        (*stream_) << text;
 }
 
 void
 Logs::File::writeln(char const* text)
 {
-    if (m_stream != nullptr)
+    if (stream_ != nullptr)
     {
-        (*m_stream) << text;
-        (*m_stream) << std::endl;
+        (*stream_) << text;
+        (*stream_) << std::endl;
     }
 }
 
@@ -153,7 +153,7 @@ Logs::threshold(beast::severities::Severity thresh)
 }
 
 std::vector<std::pair<std::string, std::string>>
-Logs::partition_severities() const
+Logs::partitionSeverities() const
 {
     std::vector<std::pair<std::string, std::string>> list;
     std::scoped_lock const lock(mutex_);
@@ -203,27 +203,27 @@ Logs::fromSeverity(beast::severities::Severity level)
     using namespace beast::severities;
     switch (level)
     {
-        case kTrace:
-            return lsTRACE;
-        case kDebug:
-            return lsDEBUG;
-        case kInfo:
-            return lsINFO;
-        case kWarning:
-            return lsWARNING;
-        case kError:
-            return lsERROR;
+        case KTrace:
+            return LSTrace;
+        case KDebug:
+            return LSDebug;
+        case KInfo:
+            return LSInfo;
+        case KWarning:
+            return LSWarning;
+        case KError:
+            return LSError;
 
         // LCOV_EXCL_START
         default:
             UNREACHABLE("xrpl::Logs::fromSeverity : invalid severity");
             [[fallthrough]];
         // LCOV_EXCL_STOP
-        case kFatal:
+        case KFatal:
             break;
     }
 
-    return lsFATAL;
+    return LSFatal;
 }
 
 beast::severities::Severity
@@ -232,26 +232,26 @@ Logs::toSeverity(LogSeverity level)
     using namespace beast::severities;
     switch (level)
     {
-        case lsTRACE:
-            return kTrace;
-        case lsDEBUG:
-            return kDebug;
-        case lsINFO:
-            return kInfo;
-        case lsWARNING:
-            return kWarning;
-        case lsERROR:
-            return kError;
+        case LSTrace:
+            return KTrace;
+        case LSDebug:
+            return KDebug;
+        case LSInfo:
+            return KInfo;
+        case LSWarning:
+            return KWarning;
+        case LSError:
+            return KError;
         // LCOV_EXCL_START
         default:
             UNREACHABLE("xrpl::Logs::toSeverity : invalid severity");
             [[fallthrough]];
         // LCOV_EXCL_STOP
-        case lsFATAL:
+        case LSFatal:
             break;
     }
 
-    return kFatal;
+    return KFatal;
 }
 
 std::string
@@ -259,21 +259,21 @@ Logs::toString(LogSeverity s)
 {
     switch (s)
     {
-        case lsTRACE:
+        case LSTrace:
             return "Trace";
-        case lsDEBUG:
+        case LSDebug:
             return "Debug";
-        case lsINFO:
+        case LSInfo:
             return "Info";
-        case lsWARNING:
+        case LSWarning:
             return "Warning";
-        case lsERROR:
+        case LSError:
             return "Error";
-        case lsFATAL:
+        case LSFatal:
             return "Fatal";
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("xrpl::Logs::toString : invalid severity");
+            UNREACHABLE("xrpl::Logs::to_string : invalid severity");
             return "Unknown";
             // LCOV_EXCL_STOP
     }
@@ -283,24 +283,24 @@ LogSeverity
 Logs::fromString(std::string const& s)
 {
     if (boost::iequals(s, "trace"))
-        return lsTRACE;
+        return LSTrace;
 
     if (boost::iequals(s, "debug"))
-        return lsDEBUG;
+        return LSDebug;
 
     if (boost::iequals(s, "info") || boost::iequals(s, "information"))
-        return lsINFO;
+        return LSInfo;
 
     if (boost::iequals(s, "warn") || boost::iequals(s, "warning") || boost::iequals(s, "warnings"))
-        return lsWARNING;
+        return LSWarning;
 
     if (boost::iequals(s, "error") || boost::iequals(s, "errors"))
-        return lsERROR;
+        return LSError;
 
     if (boost::iequals(s, "fatal") || boost::iequals(s, "fatals"))
-        return lsFATAL;
+        return LSFatal;
 
-    return lsINVALID;
+    return LSInvalid;
 }
 
 void
@@ -312,7 +312,7 @@ Logs::format(
 {
     output.reserve(message.size() + partition.size() + 100);
 
-    output = to_string(std::chrono::system_clock::now());
+    output = xrpl::to_string(std::chrono::system_clock::now());
 
     output += " ";
     if (!partition.empty())
@@ -321,19 +321,19 @@ Logs::format(
     using namespace beast::severities;
     switch (severity)
     {
-        case kTrace:
+        case KTrace:
             output += "TRC ";
             break;
-        case kDebug:
+        case KDebug:
             output += "DBG ";
             break;
-        case kInfo:
+        case KInfo:
             output += "NFO ";
             break;
-        case kWarning:
+        case KWarning:
             output += "WRN ";
             break;
-        case kError:
+        case KError:
             output += "ERR ";
             break;
         // LCOV_EXCL_START
@@ -341,7 +341,7 @@ Logs::format(
             UNREACHABLE("xrpl::Logs::format : invalid severity");
             [[fallthrough]];
         // LCOV_EXCL_STOP
-        case kFatal:
+        case KFatal:
             output += "FTL ";
             break;
     }
@@ -349,9 +349,9 @@ Logs::format(
     output += message;
 
     // Limit the maximum length of the output
-    if (output.size() > maximumMessageCharacters)
+    if (output.size() > MaximumMessageCharacters)
     {
-        output.resize(maximumMessageCharacters - 3);
+        output.resize(MaximumMessageCharacters - 3);
         output += "...";
     }
 
@@ -394,7 +394,7 @@ class DebugSink
 private:
     std::reference_wrapper<beast::Journal::Sink> sink_;
     std::unique_ptr<beast::Journal::Sink> holder_;
-    std::mutex m_;
+    std::mutex mtx_;
 
 public:
     DebugSink() : sink_(beast::Journal::getNullSink())
@@ -412,7 +412,7 @@ public:
     std::unique_ptr<beast::Journal::Sink>
     set(std::unique_ptr<beast::Journal::Sink> sink)
     {
-        std::scoped_lock const _(m_);
+        std::scoped_lock const _(mtx_);
 
         using std::swap;
         swap(holder_, sink);
@@ -432,7 +432,7 @@ public:
     beast::Journal::Sink&
     get()
     {
-        std::scoped_lock const _(m_);
+        std::scoped_lock const _(mtx_);
         return sink_.get();
     }
 };
@@ -440,8 +440,8 @@ public:
 static DebugSink&
 debugSink()
 {
-    static DebugSink _;
-    return _;
+    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 07b5b9ffc5..6fb9ab611b 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 std::size_t TRIM_PAD = 0;
+    constexpr static std::size_t kTRIM_PAD = 0;
 
     report.supported = true;
 
@@ -110,16 +110,16 @@ mallocTrim(std::string_view tag, beast::Journal journal)
         long const rssBeforeKB = detail::parseStatmRSSkB(statmBefore);
 
         struct rusage ru0{};
-        bool const have_ru0 = getRusageThread(ru0);
+        bool const haveRu0 = getRusageThread(ru0);
 
         auto const t0 = std::chrono::steady_clock::now();
 
-        report.trimResult = detail::mallocTrimWithPad(TRIM_PAD);
+        report.trimResult = detail::mallocTrimWithPad(kTRIM_PAD);
 
         auto const t1 = std::chrono::steady_clock::now();
 
         struct rusage ru1{};
-        bool const have_ru1 = getRusageThread(ru1);
+        bool const haveRu1 = getRusageThread(ru1);
 
         auto const statmAfter = readFile(statmPath);
         long const rssAfterKB = detail::parseStatmRSSkB(statmAfter);
@@ -129,7 +129,7 @@ mallocTrim(std::string_view tag, beast::Journal journal)
         report.rssAfterKB = rssAfterKB;
         report.durationUs = std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0);
 
-        if (have_ru0 && have_ru1)
+        if (haveRu0 && haveRu1)
         {
             report.minfltDelta = ru1.ru_minflt - ru0.ru_minflt;
             report.majfltDelta = ru1.ru_majflt - ru0.ru_majflt;
@@ -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=" << TRIM_PAD << " bytes"
+                              << " pad=" << kTRIM_PAD << " 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(TRIM_PAD);
+        report.trimResult = detail::mallocTrimWithPad(kTRIM_PAD);
     }
 
 #endif
diff --git a/src/libxrpl/basics/Number.cpp b/src/libxrpl/basics/Number.cpp
index ba444b77e0..08ead182bf 100644
--- a/src/libxrpl/basics/Number.cpp
+++ b/src/libxrpl/basics/Number.cpp
@@ -27,34 +27,34 @@ using int128_t = __int128_t;
 
 namespace xrpl {
 
-thread_local Number::rounding_mode Number::mode_ = Number::rounding_mode::to_nearest;
-thread_local std::reference_wrapper<MantissaRange const> Number::range_ = largeRange;
+thread_local Number::RoundingMode Number::mode = Number::RoundingMode::ToNearest;
+thread_local std::reference_wrapper<MantissaRange const> Number::kRANGE = kLARGE_RANGE;
 
-Number::rounding_mode
+Number::RoundingMode
 Number::getround()
 {
-    return mode_;
+    return mode;
 }
 
-Number::rounding_mode
-Number::setround(rounding_mode mode)
+Number::RoundingMode
+Number::setround(RoundingMode inMode)
 {
-    return std::exchange(mode_, mode);
+    return std::exchange(Number::mode, inMode);
 }
 
-MantissaRange::mantissa_scale
+MantissaRange::MantissaScale
 Number::getMantissaScale()
 {
-    return range_.get().scale;
+    return kRANGE.get().scale;
 }
 
 void
-Number::setMantissaScale(MantissaRange::mantissa_scale scale)
+Number::setMantissaScale(MantissaRange::MantissaScale scale)
 {
-    if (scale != MantissaRange::mantissa_scale::small &&
-        scale != MantissaRange::mantissa_scale::large)
-        LogicError("Unknown mantissa scale");
-    range_ = scale == MantissaRange::mantissa_scale::small ? smallRange : largeRange;
+    if (scale != MantissaRange::MantissaScale::Small &&
+        scale != MantissaRange::MantissaScale::Large)
+        logicError("Unknown mantissa scale");
+    kRANGE = scale == MantissaRange::MantissaScale::Small ? kSMALL_RANGE : kLARGE_RANGE;
 }
 
 // Guard
@@ -77,11 +77,11 @@ public:
 
     // set & test the sign bit
     void
-    set_positive() noexcept;
+    setPositive() noexcept;
     void
-    set_negative() noexcept;
+    setNegative() noexcept;
     [[nodiscard]] bool
-    is_negative() const noexcept;
+    isNegative() const noexcept;
 
     // add a digit
     template <class T>
@@ -128,19 +128,19 @@ private:
 };
 
 inline void
-Number::Guard::set_positive() noexcept
+Number::Guard::setPositive() noexcept
 {
     sbit_ = 0;
 }
 
 inline void
-Number::Guard::set_negative() noexcept
+Number::Guard::setNegative() noexcept
 {
     sbit_ = 1;
 }
 
 inline bool
-Number::Guard::is_negative() const noexcept
+Number::Guard::isNegative() const noexcept
 {
     return sbit_ == 1;
 }
@@ -177,10 +177,10 @@ Number::Guard::round() const noexcept
 {
     auto mode = Number::getround();
 
-    if (mode == rounding_mode::towards_zero)
+    if (mode == RoundingMode::TowardsZero)
         return -1;
 
-    if (mode == rounding_mode::downward)
+    if (mode == RoundingMode::Downward)
     {
         if (sbit_)
         {
@@ -190,7 +190,7 @@ Number::Guard::round() const noexcept
         return -1;
     }
 
-    if (mode == rounding_mode::upward)
+    if (mode == RoundingMode::Upward)
     {
         if (sbit_)
             return -1;
@@ -224,13 +224,13 @@ Number::Guard::bringIntoRange(
         mantissa *= 10;
         --exponent;
     }
-    if (exponent < minExponent)
+    if (exponent < kMIN_EXPONENT)
     {
-        constexpr Number zero = Number{};
+        constexpr Number kZERO = Number{};
 
-        negative = zero.negative_;
-        mantissa = zero.mantissa_;
-        exponent = zero.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 > maxRep)
+        if (mantissa > maxMantissa || mantissa > kMAX_REP)
         {
             mantissa /= 10;
             ++exponent;
         }
     }
     bringIntoRange(negative, mantissa, exponent, minMantissa);
-    if (exponent > maxExponent)
+    if (exponent > kMAX_EXPONENT)
         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 >= maxRep)
+        if (drops >= kMAX_REP)
         {
             static_assert(sizeof(internalrep) == sizeof(rep));
             // This should be impossible, because it's impossible to represent
@@ -302,7 +302,7 @@ Number::Guard::doRound(rep& drops, std::string location) const
         }
         ++drops;
     }
-    if (is_negative())
+    if (isNegative())
         drops = -drops;
 }
 
@@ -334,26 +334,26 @@ Number::externalToInternal(rep mantissa)
 constexpr Number
 Number::oneSmall()
 {
-    return Number{false, Number::smallRange.min, -Number::smallRange.log, Number::unchecked{}};
+    return Number{false, Number::kSMALL_RANGE.min, -Number::kSMALL_RANGE.log, Number::Unchecked{}};
 };
 
-constexpr Number oneSml = Number::oneSmall();
+constexpr Number kONE_SML = Number::oneSmall();
 
 constexpr Number
 Number::oneLarge()
 {
-    return Number{false, Number::largeRange.min, -Number::largeRange.log, Number::unchecked{}};
+    return Number{false, Number::kLARGE_RANGE.min, -Number::kLARGE_RANGE.log, Number::Unchecked{}};
 };
 
-constexpr Number oneLrg = Number::oneLarge();
+constexpr Number kONE_LRG = Number::oneLarge();
 
 Number
 Number::one()
 {
-    if (&range_.get() == &smallRange)
-        return oneSml;
-    XRPL_ASSERT(&range_.get() == &largeRange, "Number::one() : valid range_");
-    return oneLrg;
+    if (&kRANGE.get() == &kSMALL_RANGE)
+        return kONE_SML;
+    XRPL_ASSERT(&kRANGE.get() == &kLARGE_RANGE, "Number::one() : valid range");
+    return kONE_LRG;
 }
 
 // Use the member names in this static function for now so the diff is cleaner
@@ -362,47 +362,47 @@ template <class T>
 void
 doNormalize(
     bool& negative,
-    T& mantissa_,
-    int& exponent_,
+    T& mantissa,
+    int& exponent,
     MantissaRange::rep const& minMantissa,
     MantissaRange::rep const& maxMantissa)
 {
-    auto constexpr minExponent = Number::minExponent;
-    auto constexpr maxExponent = Number::maxExponent;
-    auto constexpr maxRep = Number::maxRep;
+    auto constexpr kMIN_EXPONENT = Number::kMIN_EXPONENT;
+    auto constexpr kMAX_EXPONENT = Number::kMAX_EXPONENT;
+    auto constexpr kMAX_REP = Number::kMAX_REP;
 
     using Guard = Number::Guard;
 
-    constexpr Number zero = Number{};
-    if (mantissa_ == 0)
+    constexpr Number kZERO = Number{};
+    if (mantissa == 0)
     {
-        mantissa_ = zero.mantissa_;
-        exponent_ = zero.exponent_;
-        negative = zero.negative_;
+        mantissa = kZERO.mantissa_;
+        exponent = kZERO.exponent_;
+        negative = kZERO.negative_;
         return;
     }
-    auto m = mantissa_;
-    while ((m < minMantissa) && (exponent_ > minExponent))
+    auto m = mantissa;
+    while ((m < minMantissa) && (exponent > kMIN_EXPONENT))
     {
         m *= 10;
-        --exponent_;
+        --exponent;
     }
     Guard g;
     if (negative)
-        g.set_negative();
+        g.setNegative();
     while (m > maxMantissa)
     {
-        if (exponent_ >= maxExponent)
+        if (exponent >= kMAX_EXPONENT)
             throw std::overflow_error("Number::normalize 1");
         g.push(m % 10);
         m /= 10;
-        ++exponent_;
+        ++exponent;
     }
-    if ((exponent_ < minExponent) || (m < minMantissa))
+    if ((exponent < kMIN_EXPONENT) || (m < minMantissa))
     {
-        mantissa_ = zero.mantissa_;
-        exponent_ = zero.exponent_;
-        negative = zero.negative_;
+        mantissa = kZERO.mantissa_;
+        exponent = kZERO.exponent_;
+        negative = kZERO.negative_;
         return;
     }
 
@@ -419,24 +419,24 @@ 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 > maxRep)
+    if (m > kMAX_REP)
     {
-        if (exponent_ >= maxExponent)
+        if (exponent >= kMAX_EXPONENT)
             throw std::overflow_error("Number::normalize 1.5");
         g.push(m % 10);
         m /= 10;
-        ++exponent_;
+        ++exponent;
     }
     // Before modification, m should be within the min/max range. After
     // 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 <= maxRep, "xrpl::doNormalize", "intermediate mantissa fits in int64");
-    mantissa_ = m;
+    XRPL_ASSERT_PARTS(m <= kMAX_REP, "xrpl::doNormalize", "intermediate mantissa fits in int64");
+    mantissa = m;
 
-    g.doRoundUp(negative, mantissa_, exponent_, minMantissa, maxMantissa, "Number::normalize 2");
+    g.doRoundUp(negative, mantissa, exponent, minMantissa, maxMantissa, "Number::normalize 2");
     XRPL_ASSERT_PARTS(
-        mantissa_ >= minMantissa && mantissa_ <= maxMantissa,
+        mantissa >= minMantissa && mantissa <= maxMantissa,
         "xrpl::doNormalize",
         "final mantissa fits in range");
 }
@@ -480,7 +480,7 @@ Number::normalize<unsigned long>(
 void
 Number::normalize()
 {
-    auto const& range = range_.get();
+    auto const& range = kRANGE.get();
     normalize(negative_, mantissa_, exponent_, range.min, range.max);
 }
 
@@ -492,13 +492,13 @@ Number::shiftExponent(int exponentDelta) const
 {
     XRPL_ASSERT_PARTS(isnormal(), "xrpl::Number::shiftExponent", "normalized");
     auto const newExponent = exponent_ + exponentDelta;
-    if (newExponent >= maxExponent)
+    if (newExponent >= kMAX_EXPONENT)
         throw std::overflow_error("Number::shiftExponent");
-    if (newExponent < minExponent)
+    if (newExponent < kMIN_EXPONENT)
     {
         return Number{};
     }
-    Number const result{negative_, mantissa_, newExponent, unchecked{}};
+    Number const result{negative_, mantissa_, newExponent, Unchecked{}};
     XRPL_ASSERT_PARTS(result.isnormal(), "xrpl::Number::shiftExponent", "result is normalized");
     return result;
 }
@@ -506,17 +506,17 @@ Number::shiftExponent(int exponentDelta) const
 Number&
 Number::operator+=(Number const& y)
 {
-    constexpr Number zero = Number{};
-    if (y == zero)
+    constexpr Number kZERO = Number{};
+    if (y == kZERO)
         return *this;
-    if (*this == zero)
+    if (*this == kZERO)
     {
         *this = y;
         return *this;
     }
     if (*this == -y)
     {
-        *this = zero;
+        *this = kZERO;
         return *this;
     }
 
@@ -539,7 +539,7 @@ Number::operator+=(Number const& y)
     if (xe < ye)
     {
         if (xn)
-            g.set_negative();
+            g.setNegative();
         do
         {
             g.push(xm % 10);
@@ -550,7 +550,7 @@ Number::operator+=(Number const& y)
     else if (xe > ye)
     {
         if (yn)
-            g.set_negative();
+            g.setNegative();
         do
         {
             g.push(ym % 10);
@@ -559,14 +559,14 @@ Number::operator+=(Number const& y)
         } while (xe > ye);
     }
 
-    auto const& range = range_.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 > maxRep)
+        if (xm > maxMantissa || xm > kMAX_REP)
         {
             g.push(xm % 10);
             xm /= 10;
@@ -586,7 +586,7 @@ Number::operator+=(Number const& y)
             xe = ye;
             xn = yn;
         }
-        while (xm < minMantissa && xm * 10 <= maxRep)
+        while (xm < minMantissa && xm * 10 <= kMAX_REP)
         {
             xm *= 10;
             xm -= g.pop();
@@ -633,10 +633,10 @@ divu10(uint128_t& u)
 Number&
 Number::operator*=(Number const& y)
 {
-    constexpr Number zero = Number{};
-    if (*this == zero)
+    constexpr Number kZERO = Number{};
+    if (*this == kZERO)
         return *this;
-    if (y == zero)
+    if (y == kZERO)
     {
         *this = y;
         return *this;
@@ -662,13 +662,13 @@ Number::operator*=(Number const& y)
     bool zn = (zs == -1);
     Guard g;
     if (zn)
-        g.set_negative();
+        g.setNegative();
 
-    auto const& range = range_.get();
+    auto const& range = kRANGE.get();
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
-    while (zm > maxMantissa || zm > maxRep)
+    while (zm > maxMantissa || zm > kMAX_REP)
     {
         // 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 zero = Number{};
-    if (y == zero)
+    constexpr Number kZERO = Number{};
+    if (y == kZERO)
         throw std::overflow_error("Number: divide by 0");
-    if (*this == zero)
+    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 = range_.get();
+    auto const& range = kRANGE.get();
     auto const& minMantissa = range.min;
     auto const& maxMantissa = range.max;
 
@@ -728,9 +728,9 @@ 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(smallRange.log == 15);
-    static_assert(largeRange.log == 18);
-    bool const small = Number::getMantissaScale() == MantissaRange::mantissa_scale::small;
+    static_assert(kSMALL_RANGE.log == 15);
+    static_assert(kLARGE_RANGE.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");
 
@@ -798,7 +798,7 @@ operator rep() const
     {
         if (negative_)
         {
-            g.set_negative();
+            g.setNegative();
             drops = -drops;
         }
         for (; offset < 0; ++offset)
@@ -808,7 +808,7 @@ operator rep() const
         }
         for (; offset > 0; --offset)
         {
-            if (drops > maxRep / 10)
+            if (drops > kMAX_REP / 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 zero = Number{};
-    if (amount == zero)
+    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::maxExponent)
+        while (mantissa != 0 && mantissa % 10 == 0 && exponent < Number::kMAX_EXPONENT)
         {
             mantissa /= 10;
             ++exponent;
@@ -865,46 +865,46 @@ to_string(Number const& amount)
 
     XRPL_ASSERT(exponent + 43 > 0, "xrpl::to_string(Number) : minimum exponent");
 
-    ptrdiff_t const pad_prefix = rangeLog + 12;
-    ptrdiff_t const pad_suffix = rangeLog + 8;
+    ptrdiff_t const padPrefix = rangeLog + 12;
+    ptrdiff_t const padSuffix = rangeLog + 8;
 
-    std::string const raw_value(std::to_string(mantissa));
+    std::string const rawValue(std::to_string(mantissa));
     std::string val;
 
-    val.reserve(raw_value.length() + pad_prefix + pad_suffix);
-    val.append(pad_prefix, '0');
-    val.append(raw_value);
-    val.append(pad_suffix, '0');
+    val.reserve(rawValue.length() + padPrefix + padSuffix);
+    val.append(padPrefix, '0');
+    val.append(rawValue);
+    val.append(padSuffix, '0');
 
-    ptrdiff_t const offset(exponent + pad_prefix + rangeLog + 1);
+    ptrdiff_t const offset(exponent + padPrefix + rangeLog + 1);
 
-    auto pre_from(val.begin());
-    auto const pre_to(val.begin() + offset);
+    auto preFrom(val.begin());
+    auto const preTo(val.begin() + offset);
 
-    auto const post_from(val.begin() + offset);
-    auto post_to(val.end());
+    auto const postFrom(val.begin() + offset);
+    auto postTo(val.end());
 
     // Crop leading zeroes. Take advantage of the fact that there's always a
     // fixed amount of leading zeroes and skip them.
-    if (std::distance(pre_from, pre_to) > pad_prefix)
-        pre_from += pad_prefix;
+    if (std::distance(preFrom, preTo) > padPrefix)
+        preFrom += padPrefix;
 
-    XRPL_ASSERT(post_to >= post_from, "xrpl::to_string(Number) : first distance check");
+    XRPL_ASSERT(postTo >= postFrom, "xrpl::to_string(Number) : first distance check");
 
-    pre_from = std::find_if(pre_from, pre_to, [](char c) { return c != '0'; });
+    preFrom = std::find_if(preFrom, preTo, [](char c) { return c != '0'; });
 
     // Crop trailing zeroes. Take advantage of the fact that there's always a
     // fixed amount of trailing zeroes and skip them.
-    if (std::distance(post_from, post_to) > pad_suffix)
-        post_to -= pad_suffix;
+    if (std::distance(postFrom, postTo) > padSuffix)
+        postTo -= padSuffix;
 
-    XRPL_ASSERT(post_to >= post_from, "xrpl::to_string(Number) : second distance check");
+    XRPL_ASSERT(postTo >= postFrom, "xrpl::to_string(Number) : second distance check");
 
-    post_to = std::find_if(
-                  std::make_reverse_iterator(post_to),
-                  std::make_reverse_iterator(post_from),
-                  [](char c) { return c != '0'; })
-                  .base();
+    postTo = std::find_if(
+                 std::make_reverse_iterator(postTo),
+                 std::make_reverse_iterator(postFrom),
+                 [](char c) { return c != '0'; })
+                 .base();
 
     std::string ret;
 
@@ -912,19 +912,19 @@ to_string(Number const& amount)
         ret.append(1, '-');
 
     // Assemble the output:
-    if (pre_from == pre_to)
+    if (preFrom == preTo)
     {
         ret.append(1, '0');
     }
     else
     {
-        ret.append(pre_from, pre_to);
+        ret.append(preFrom, preTo);
     }
 
-    if (post_to != post_from)
+    if (postTo != postFrom)
     {
         ret.append(1, '.');
-        ret.append(post_from, post_to);
+        ret.append(postFrom, postTo);
     }
 
     return ret;
@@ -959,7 +959,7 @@ power(Number const& f, unsigned n)
 Number
 root(Number f, unsigned d)
 {
-    constexpr Number zero = Number{};
+    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 zero;
+            return kZERO;
         throw std::overflow_error("Number::root infinity");
     }
-    if (f < zero && d % 2 == 0)
+    if (f < kZERO && d % 2 == 0)
         throw std::overflow_error("Number::root nan");
-    if (f == zero)
+    if (f == kZERO)
         return f;
 
     // Scale f into the range (0, 1) such that f's exponent is a multiple of d
@@ -993,14 +993,14 @@ root(Number f, unsigned d)
 
     XRPL_ASSERT_PARTS(f.isnormal(), "xrpl::root(Number, unsigned)", "f is normalized");
     bool neg = false;
-    if (f < zero)
+    if (f < kZERO)
     {
         neg = true;
         f = -f;
     }
 
     // Quadratic least squares curve fit of f^(1/d) in the range [0, 1]
-    auto const D = (((6 * di + 11) * di + 6) * di) + 1;
+    auto const D = (((6 * di + 11) * di + 6) * di) + 1;  // NOLINT(readability-identifier-naming)
     auto const a0 = 3 * di * ((2 * di - 3) * di + 1);
     auto const a1 = 24 * di * (2 * di - 1);
     auto const a2 = -30 * (di - 1) * di;
@@ -1031,14 +1031,14 @@ root(Number f, unsigned d)
 Number
 root2(Number f)
 {
-    constexpr Number zero = Number{};
+    constexpr Number kZERO = Number{};
     auto const one = Number::one();
 
     if (f == one)
         return f;
-    if (f < zero)
+    if (f < kZERO)
         throw std::overflow_error("Number::root nan");
-    if (f == zero)
+    if (f == kZERO)
         return f;
 
     // Scale f into the range (0, 1) such that f's exponent is a multiple of d
@@ -1049,7 +1049,7 @@ root2(Number f)
     XRPL_ASSERT_PARTS(f.isnormal(), "xrpl::root2(Number)", "f is normalized");
 
     // Quadratic least squares curve fit of f^(1/d) in the range [0, 1]
-    auto const D = 105;
+    auto const D = 105;  // NOLINT(readability-identifier-naming)
     auto const a0 = 18;
     auto const a1 = 144;
     auto const a2 = -60;
@@ -1078,7 +1078,7 @@ root2(Number f)
 Number
 power(Number const& f, unsigned n, unsigned d)
 {
-    constexpr Number zero = Number{};
+    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 zero;
+            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 < zero)
+    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/ResolverAsio.cpp b/src/libxrpl/basics/ResolverAsio.cpp
index 0443aa3502..4e64c280c7 100644
--- a/src/libxrpl/basics/ResolverAsio.cpp
+++ b/src/libxrpl/basics/ResolverAsio.cpp
@@ -40,7 +40,7 @@ namespace xrpl {
 template <class Derived>
 class AsyncObject
 {
-    AsyncObject() : m_pending(0)
+    AsyncObject() : pending_(0)
     {
     }
 
@@ -48,7 +48,7 @@ public:
     ~AsyncObject()
     {
         // Destroying the object with I/O pending? Not a clean exit!
-        XRPL_ASSERT(m_pending.load() == 0, "xrpl::AsyncObject::~AsyncObject : nothing pending");
+        XRPL_ASSERT(pending_.load() == 0, "xrpl::AsyncObject::~AsyncObject : nothing pending");
     }
 
     /** RAII container that maintains the count of pending I/O.
@@ -58,45 +58,45 @@ public:
     class CompletionCounter
     {
     public:
-        explicit CompletionCounter(Derived* owner) : m_owner(owner)
+        explicit CompletionCounter(Derived* owner) : owner_(owner)
         {
-            ++m_owner->m_pending;
+            ++owner_->pending_;
         }
 
-        CompletionCounter(CompletionCounter const& other) : m_owner(other.m_owner)
+        CompletionCounter(CompletionCounter const& other) : owner_(other.owner_)
         {
-            ++m_owner->m_pending;
+            ++owner_->pending_;
         }
 
         ~CompletionCounter()
         {
-            if (--m_owner->m_pending == 0)
-                m_owner->asyncHandlersComplete();
+            if (--owner_->pending_ == 0)
+                owner_->asyncHandlersComplete();
         }
 
         CompletionCounter&
         operator=(CompletionCounter const&) = delete;
 
     private:
-        Derived* m_owner;
+        Derived* owner_;
     };
 
     void
     addReference()
     {
-        ++m_pending;
+        ++pending_;
     }
 
     void
     removeReference()
     {
-        if (--m_pending == 0)
+        if (--pending_ == 0)
             (static_cast<Derived*>(this))->asyncHandlersComplete();
     }
 
 private:
     // The number of handlers pending.
-    std::atomic<int> m_pending;
+    std::atomic<int> pending_;
 
     friend Derived;
 };
@@ -106,18 +106,18 @@ class ResolverAsioImpl : public ResolverAsio, public AsyncObject<ResolverAsioImp
 public:
     using HostAndPort = std::pair<std::string, std::string>;
 
-    beast::Journal m_journal;
+    beast::Journal journal;
 
-    boost::asio::io_context& m_io_context;
-    boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
-    boost::asio::ip::tcp::resolver m_resolver;
+    boost::asio::io_context& io_context;
+    boost::asio::strand<boost::asio::io_context::executor_type> strand;
+    boost::asio::ip::tcp::resolver resolver;
 
-    std::condition_variable m_cv;
-    std::mutex m_mut;
-    bool m_asyncHandlersCompleted{true};
+    std::condition_variable cv;
+    std::mutex mut;
+    bool asyncHandlersCompleted{true};
 
-    std::atomic<bool> m_stop_called;
-    std::atomic<bool> m_stopped;
+    std::atomic<bool> stop_called;
+    std::atomic<bool> stopped;
 
     // Represents a unit of work for the resolver to do
     struct Work
@@ -126,30 +126,30 @@ public:
         HandlerType handler;
 
         template <class StringSequence>
-        Work(StringSequence const& names_, HandlerType handler_) : handler(std::move(handler_))
+        Work(StringSequence const& inNames, HandlerType handler) : handler(std::move(handler))
         {
-            names.reserve(names_.size());
+            names.reserve(inNames.size());
 
-            std::reverse_copy(names_.begin(), names_.end(), std::back_inserter(names));
+            std::reverse_copy(inNames.begin(), inNames.end(), std::back_inserter(names));
         }
     };
 
-    std::deque<Work> m_work;
+    std::deque<Work> work;
 
-    ResolverAsioImpl(boost::asio::io_context& io_context, beast::Journal journal)
-        : m_journal(journal)
-        , m_io_context(io_context)
-        , m_strand(boost::asio::make_strand(io_context))
-        , m_resolver(io_context)
-        , m_stop_called(false)
-        , m_stopped(true)
+    ResolverAsioImpl(boost::asio::io_context& ioContext, beast::Journal journal)
+        : journal(journal)
+        , io_context(ioContext)
+        , strand(boost::asio::make_strand(ioContext))
+        , resolver(ioContext)
+        , stop_called(false)
+        , stopped(true)
     {
     }
 
     ~ResolverAsioImpl() override
     {
-        XRPL_ASSERT(m_work.empty(), "xrpl::ResolverAsioImpl::~ResolverAsioImpl : no pending work");
-        XRPL_ASSERT(m_stopped, "xrpl::ResolverAsioImpl::~ResolverAsioImpl : stopped");
+        XRPL_ASSERT(work.empty(), "xrpl::ResolverAsioImpl::~ResolverAsioImpl : no pending work");
+        XRPL_ASSERT(stopped, "xrpl::ResolverAsioImpl::~ResolverAsioImpl : stopped");
     }
 
     //-------------------------------------------------------------------------
@@ -157,9 +157,9 @@ public:
     void
     asyncHandlersComplete()
     {
-        std::unique_lock<std::mutex> const lk{m_mut};
-        m_asyncHandlersCompleted = true;
-        m_cv.notify_all();
+        std::unique_lock<std::mutex> const lk{mut};
+        asyncHandlersCompleted = true;
+        cv.notify_all();
     }
 
     //--------------------------------------------------------------------------
@@ -171,80 +171,79 @@ public:
     void
     start() override
     {
-        XRPL_ASSERT(m_stopped == true, "xrpl::ResolverAsioImpl::start : stopped");
-        XRPL_ASSERT(m_stop_called == false, "xrpl::ResolverAsioImpl::start : not stopping");
+        XRPL_ASSERT(stopped == true, "xrpl::ResolverAsioImpl::start : stopped");
+        XRPL_ASSERT(stop_called == false, "xrpl::ResolverAsioImpl::start : not stopping");
 
-        if (m_stopped.exchange(false))
+        if (stopped.exchange(false))
         {
             {
-                std::scoped_lock const lk{m_mut};
-                m_asyncHandlersCompleted = false;
+                std::scoped_lock const lk{mut};
+                asyncHandlersCompleted = false;
             }
             addReference();
         }
     }
 
     void
-    stop_async() override
+    stopAsync() override
     {
-        if (!m_stop_called.exchange(true))
+        if (!stop_called.exchange(true))
         {
             boost::asio::dispatch(
-                m_io_context,
+                io_context,
                 boost::asio::bind_executor(
-                    m_strand,
-                    std::bind(&ResolverAsioImpl::do_stop, this, CompletionCounter(this))));
+                    strand, std::bind(&ResolverAsioImpl::doStop, this, CompletionCounter(this))));
 
-            JLOG(m_journal.debug()) << "Queued a stop request";
+            JLOG(journal.debug()) << "Queued a stop request";
         }
     }
 
     void
     stop() override
     {
-        stop_async();
+        stopAsync();
 
-        JLOG(m_journal.debug()) << "Waiting to stop";
-        std::unique_lock<std::mutex> lk{m_mut};
-        m_cv.wait(lk, [this] { return m_asyncHandlersCompleted; });
+        JLOG(journal.debug()) << "Waiting to stop";
+        std::unique_lock<std::mutex> lk{mut};
+        cv.wait(lk, [this] { return asyncHandlersCompleted; });
         lk.unlock();
-        JLOG(m_journal.debug()) << "Stopped";
+        JLOG(journal.debug()) << "Stopped";
     }
 
     void
     resolve(std::vector<std::string> const& names, HandlerType const& handler) override
     {
-        XRPL_ASSERT(m_stop_called == false, "xrpl::ResolverAsioImpl::resolve : not stopping");
+        XRPL_ASSERT(stop_called == false, "xrpl::ResolverAsioImpl::resolve : not stopping");
         XRPL_ASSERT(!names.empty(), "xrpl::ResolverAsioImpl::resolve : names non-empty");
 
         // TODO NIKB use rvalue references to construct and move
         //           reducing cost.
         boost::asio::dispatch(
-            m_io_context,
+            io_context,
             boost::asio::bind_executor(
-                m_strand,
+                strand,
                 std::bind(
-                    &ResolverAsioImpl::do_resolve, this, names, handler, CompletionCounter(this))));
+                    &ResolverAsioImpl::doResolve, this, names, handler, CompletionCounter(this))));
     }
 
     //-------------------------------------------------------------------------
     // Resolver
     void
-    do_stop(CompletionCounter)
+    doStop(CompletionCounter)
     {
-        XRPL_ASSERT(m_stop_called == true, "xrpl::ResolverAsioImpl::do_stop : stopping");
+        XRPL_ASSERT(stop_called == true, "xrpl::ResolverAsioImpl::do_stop : stopping");
 
-        if (!m_stopped.exchange(true))
+        if (!stopped.exchange(true))
         {
-            m_work.clear();
-            m_resolver.cancel();
+            work.clear();
+            resolver.cancel();
 
             removeReference();
         }
     }
 
     void
-    do_finish(
+    doFinish(
         std::string name,
         boost::system::error_code const& ec,
         HandlerType handler,
@@ -263,7 +262,7 @@ public:
         {
             while (iter != results.end())
             {
-                addresses.push_back(beast::IPAddressConversion::from_asio(*iter));
+                addresses.push_back(beast::IPAddressConversion::fromAsio(*iter));
                 ++iter;
             }
         }
@@ -271,9 +270,9 @@ public:
         handler(name, addresses);
 
         boost::asio::post(
-            m_io_context,
+            io_context,
             boost::asio::bind_executor(
-                m_strand, std::bind(&ResolverAsioImpl::do_work, this, CompletionCounter(this))));
+                strand, std::bind(&ResolverAsioImpl::doWork, this, CompletionCounter(this))));
     }
 
     static HostAndPort
@@ -282,7 +281,7 @@ public:
         // first attempt to parse as an endpoint (IP addr + port).
         // If that doesn't succeed, fall back to generic name + port parsing
 
-        if (auto const result = beast::IP::Endpoint::from_string_checked(str))
+        if (auto const result = beast::IP::Endpoint::fromStringChecked(str))
         {
             return make_pair(result->address().to_string(), std::to_string(result->port()));
         }
@@ -292,20 +291,20 @@ public:
         // a port separator
 
         // Attempt to find the first and last non-whitespace
-        auto const find_whitespace =
+        auto const findWhitespace =
             std::bind(&std::isspace<std::string::value_type>, std::placeholders::_1, std::locale());
 
-        auto host_first = std::ranges::find_if_not(str, find_whitespace);
+        auto hostFirst = std::ranges::find_if_not(str, findWhitespace);
 
-        auto port_last =
-            std::ranges::find_if_not(std::ranges::reverse_view(str), find_whitespace).base();
+        auto portLast =
+            std::ranges::find_if_not(std::ranges::reverse_view(str), findWhitespace).base();
 
         // This should only happen for all-whitespace strings
-        if (host_first >= port_last)
+        if (hostFirst >= portLast)
             return std::make_pair(std::string(), std::string());
 
         // Attempt to find the first and last valid port separators
-        auto const find_port_separator = [](char const c) -> bool {
+        auto const findPortSeparator = [](char const c) -> bool {
             if (std::isspace(static_cast<unsigned char>(c)))
                 return true;
 
@@ -315,51 +314,50 @@ public:
             return false;
         };
 
-        auto host_last = std::find_if(host_first, port_last, find_port_separator);
+        auto hostLast = std::find_if(hostFirst, portLast, findPortSeparator);
 
-        auto port_first = std::find_if_not(host_last, port_last, find_port_separator);
+        auto portFirst = std::find_if_not(hostLast, portLast, findPortSeparator);
 
-        return make_pair(std::string(host_first, host_last), std::string(port_first, port_last));
+        return make_pair(std::string(hostFirst, hostLast), std::string(portFirst, portLast));
     }
 
     void
-    do_work(CompletionCounter)
+    doWork(CompletionCounter)
     {
-        if (m_stop_called)
+        if (stop_called)
             return;
 
         // We don't have any work to do at this time
-        if (m_work.empty())
+        if (work.empty())
             return;
 
-        std::string const name(m_work.front().names.back());
-        HandlerType const handler(m_work.front().handler);
+        std::string const name(work.front().names.back());
+        HandlerType const handler(work.front().handler);
 
-        m_work.front().names.pop_back();
+        work.front().names.pop_back();
 
-        if (m_work.front().names.empty())
-            m_work.pop_front();
+        if (work.front().names.empty())
+            work.pop_front();
 
         auto const [host, port] = parseName(name);
 
         if (host.empty())
         {
-            JLOG(m_journal.error()) << "Unable to parse '" << name << "'";
+            JLOG(journal.error()) << "Unable to parse '" << name << "'";
 
             boost::asio::post(
-                m_io_context,
+                io_context,
                 boost::asio::bind_executor(
-                    m_strand,
-                    std::bind(&ResolverAsioImpl::do_work, this, CompletionCounter(this))));
+                    strand, std::bind(&ResolverAsioImpl::doWork, this, CompletionCounter(this))));
 
             return;
         }
 
-        m_resolver.async_resolve(
+        resolver.async_resolve(
             host,
             port,
             std::bind(
-                &ResolverAsioImpl::do_finish,
+                &ResolverAsioImpl::doFinish,
                 this,
                 name,
                 std::placeholders::_1,
@@ -369,24 +367,24 @@ public:
     }
 
     void
-    do_resolve(std::vector<std::string> const& names, HandlerType const& handler, CompletionCounter)
+    doResolve(std::vector<std::string> const& names, HandlerType const& handler, CompletionCounter)
     {
         XRPL_ASSERT(!names.empty(), "xrpl::ResolverAsioImpl::do_resolve : names non-empty");
 
-        if (!m_stop_called)
+        if (!stop_called)
         {
-            m_work.emplace_back(names, handler);
+            work.emplace_back(names, handler);
 
-            JLOG(m_journal.debug()) << "Queued new job with " << names.size() << " tasks. "
-                                    << m_work.size() << " jobs outstanding.";
+            JLOG(journal.debug()) << "Queued new job with " << names.size() << " tasks. "
+                                  << work.size() << " jobs outstanding.";
 
-            if (!m_work.empty())
+            if (!work.empty())
             {
                 boost::asio::post(
-                    m_io_context,
+                    io_context,
                     boost::asio::bind_executor(
-                        m_strand,
-                        std::bind(&ResolverAsioImpl::do_work, this, CompletionCounter(this))));
+                        strand,
+                        std::bind(&ResolverAsioImpl::doWork, this, CompletionCounter(this))));
             }
         }
     }
@@ -395,9 +393,9 @@ public:
 //-----------------------------------------------------------------------------
 
 std::unique_ptr<ResolverAsio>
-ResolverAsio::New(boost::asio::io_context& io_context, beast::Journal journal)
+ResolverAsio::make(boost::asio::io_context& ioContext, beast::Journal journal)
 {
-    return std::make_unique<ResolverAsioImpl>(io_context, journal);
+    return std::make_unique<ResolverAsioImpl>(ioContext, journal);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/libxrpl/basics/StringUtilities.cpp b/src/libxrpl/basics/StringUtilities.cpp
index 7bf4c8e743..f1f8515ae1 100644
--- a/src/libxrpl/basics/StringUtilities.cpp
+++ b/src/libxrpl/basics/StringUtilities.cpp
@@ -34,10 +34,10 @@ sqlBlobLiteral(Blob const& blob)
 }
 
 bool
-parseUrl(parsedURL& pUrl, std::string const& strUrl)
+parseUrl(ParsedUrl& pUrl, std::string const& strUrl)
 {
     // scheme://username:password@hostname:port/rest
-    static boost::regex const reUrl(
+    static boost::regex const kRE_URL(
         "(?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, reUrl))
+        if (!boost::regex_match(strUrl, smMatch, kRE_URL))
             return false;
     }
     catch (...)
@@ -74,7 +74,7 @@ parseUrl(parsedURL& pUrl, std::string const& strUrl)
     // We need to use Endpoint to parse the domain to
     // strip surrounding brackets from IPv6 addresses,
     // e.g. [::1] => ::1.
-    auto const result = beast::IP::Endpoint::from_string_checked(domain);
+    auto const result = beast::IP::Endpoint::fromStringChecked(domain);
     pUrl.domain = result ? result->address().to_string() : domain;
     std::string const port = smMatch[5];
     if (!port.empty())
@@ -94,14 +94,14 @@ parseUrl(parsedURL& pUrl, std::string const& strUrl)
 }
 
 std::string
-trim_whitespace(std::string str)
+trimWhitespace(std::string str)
 {
     boost::trim(str);
     return str;
 }
 
 std::optional<std::uint64_t>
-to_uint64(std::string const& s)
+toUint64(std::string const& s)
 {
     std::uint64_t result = 0;
     if (beast::lexicalCastChecked(result, s))
@@ -120,7 +120,7 @@ isProperlyFormedTomlDomain(std::string_view domain)
     // obviously wrong domain names but it isn't perfect. It does not
     // really support IDNs. If this turns out to be an issue, a more
     // thorough regex can be used or this check can just be removed.
-    static boost::regex const re(
+    static boost::regex const kRE(
         "^"                   // Beginning of line
         "("                   // Beginning of a segment
         "(?!-)"               //  - must not begin with '-'
@@ -133,7 +133,7 @@ isProperlyFormedTomlDomain(std::string_view domain)
         ,
         boost::regex_constants::optimize);
 
-    return boost::regex_match(domain.begin(), domain.end(), re);
+    return boost::regex_match(domain.begin(), domain.end(), kRE);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/basics/UptimeClock.cpp b/src/libxrpl/basics/UptimeClock.cpp
index 3d1664482b..5b92617098 100644
--- a/src/libxrpl/basics/UptimeClock.cpp
+++ b/src/libxrpl/basics/UptimeClock.cpp
@@ -1,3 +1,4 @@
+
 #include <xrpl/basics/UptimeClock.h>
 
 #include <atomic>
@@ -6,15 +7,15 @@
 
 namespace xrpl {
 
-std::atomic<UptimeClock::rep> UptimeClock::now_{0};  // seconds since start
-std::atomic<bool> UptimeClock::stop_{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::update_thread::~update_thread()
+UptimeClock::UpdateThread::~UpdateThread()
 {
     if (joinable())
     {
-        stop_ = true;
+        kSTOP = true;
         // This join() may take up to a 1s, but happens only
         // once at xrpld shutdown.
         join();
@@ -22,20 +23,20 @@ UptimeClock::update_thread::~update_thread()
 }
 
 // Launch the update thread
-UptimeClock::update_thread
-UptimeClock::start_clock()
+UptimeClock::UpdateThread
+UptimeClock::startClock()
 {
-    return update_thread{[] {
+    return UpdateThread{[] {
         using namespace std;
         using namespace std::chrono;
 
-        // Wake up every second and update now_
+        // Wake up every second and update kNOW
         auto next = system_clock::now() + 1s;
-        while (!stop_)
+        while (!kSTOP)
         {
             this_thread::sleep_until(next);
             next += 1s;
-            ++now_;
+            ++kNOW;
         }
     }};
 }
@@ -48,10 +49,10 @@ UptimeClock::time_point
 UptimeClock::now()
 {
     // start the update thread on first use
-    static auto const init = start_clock();
+    static auto const kINIT = startClock();
 
     // Return the number of seconds since xrpld start
-    return time_point{duration{now_}};
+    return time_point{duration{kNOW}};
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/basics/base64.cpp b/src/libxrpl/basics/base64.cpp
index f266d93194..7a649a8c3a 100644
--- a/src/libxrpl/basics/base64.cpp
+++ b/src/libxrpl/basics/base64.cpp
@@ -45,17 +45,17 @@ namespace xrpl {
 namespace base64 {
 
 inline char const*
-get_alphabet()
+getAlphabet()
 {
-    static char constexpr tab[] = {
+    static char constexpr kTAB[] = {
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"};
-    return &tab[0];
+    return &kTAB[0];
 }
 
 inline signed char const*
-get_inverse()
+getInverse()
 {
-    static signed char constexpr tab[] = {
+    static signed char constexpr 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,17 @@ get_inverse()
         -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 &tab[0];
+    return &kTAB[0];
 }
 
 /// Returns max chars needed to encode a base64 string
-std::size_t constexpr encoded_size(std::size_t n)
+std::size_t constexpr encodedSize(std::size_t n)
 {
     return 4 * ((n + 2) / 3);
 }
 
 /// Returns max bytes needed to decode a base64 string
-std::size_t constexpr decoded_size(std::size_t n)
+std::size_t constexpr decodedSize(std::size_t n)
 {
     return ((n / 4) * 3) + 2;
 }
@@ -105,7 +105,7 @@ encode(void* dest, void const* src, std::size_t len)
 {
     char* out = static_cast<char*>(dest);  // NOLINT(misc-const-correctness)
     char const* in = static_cast<char const*>(src);
-    auto const tab = base64::get_alphabet();
+    auto const tab = base64::getAlphabet();
 
     for (auto n = len / 3; n > 0; --n)
     {
@@ -160,7 +160,7 @@ decode(void* dest, char const* src, std::size_t len)
     int i = 0;
     int j = 0;
 
-    auto const inverse = base64::get_inverse();
+    auto const inverse = base64::getInverse();
 
     while (((len--) != 0u) && *in != '=')
     {
@@ -197,19 +197,19 @@ decode(void* dest, char const* src, std::size_t len)
 }  // namespace base64
 
 std::string
-base64_encode(std::uint8_t const* data, std::size_t len)
+base64Encode(std::uint8_t const* data, std::size_t len)
 {
     std::string dest;
-    dest.resize(base64::encoded_size(len));
+    dest.resize(base64::encodedSize(len));
     dest.resize(base64::encode(&dest[0], data, len));
     return dest;
 }
 
 std::string
-base64_decode(std::string_view data)
+base64Decode(std::string_view data)
 {
     std::string dest;
-    dest.resize(base64::decoded_size(data.size()));
+    dest.resize(base64::decodedSize(data.size()));
     auto const result = base64::decode(&dest[0], data.data(), data.size());
     dest.resize(result.first);
     return dest;
diff --git a/src/libxrpl/basics/contract.cpp b/src/libxrpl/basics/contract.cpp
index 32628ac3d9..a249b82353 100644
--- a/src/libxrpl/basics/contract.cpp
+++ b/src/libxrpl/basics/contract.cpp
@@ -10,13 +10,13 @@
 namespace xrpl {
 
 void
-LogThrow(std::string const& title)
+logThrow(std::string const& title)
 {
     JLOG(debugLog().warn()) << title;
 }
 
 [[noreturn]] void
-LogicError(std::string const& s) noexcept
+logicError(std::string const& s) noexcept
 {
     // LCOV_EXCL_START
     JLOG(debugLog().fatal()) << s;
diff --git a/src/libxrpl/basics/make_SSLContext.cpp b/src/libxrpl/basics/make_SSLContext.cpp
index aa04f22191..89da14333a 100644
--- a/src/libxrpl/basics/make_SSLContext.cpp
+++ b/src/libxrpl/basics/make_SSLContext.cpp
@@ -46,7 +46,7 @@ namespace openssl::detail {
       @note If you increase the number of bits you need to generate new
             default DH parameters and update defaultDH  accordingly.
  * */
-int defaultRSAKeyBits = 2048;
+int gDefaultRsaKeyBits = 2048;
 
 /** The default DH parameters.
 
@@ -60,7 +60,7 @@ int defaultRSAKeyBits = 2048;
     @note If you increase the number of bits you need to update
           defaultRSAKeyBits accordingly.
  */
-static constexpr char const defaultDH[] =
+static constexpr char const kDEFAULT_DH[] =
     "-----BEGIN DH PARAMETERS-----\n"
     "MIIBCAKCAQEApKSWfR7LKy0VoZ/SDCObCvJ5HKX2J93RJ+QN8kJwHh+uuA8G+t8Q\n"
     "MDRjL5HanlV/sKN9HXqBc7eqHmmbqYwIXKUt9MUZTLNheguddxVlc2IjdP5i9Ps8\n"
@@ -84,52 +84,52 @@ static constexpr char const defaultDH[] =
           global or per-port basis, using the `ssl_ciphers` directive in the
           config file.
  */
-std::string const defaultCipherList = "TLSv1.2:!CBC:!DSS:!PSK:!eNULL:!aNULL";
+std::string const kDEFAULT_CIPHER_LIST = "TLSv1.2:!CBC:!DSS:!PSK:!eNULL:!aNULL";
 
 static void
 initAnonymous(boost::asio::ssl::context& context)
 {
     using namespace openssl;
 
-    static auto defaultRSA = []() {
+    static auto kDEFAULT_RSA = []() {
         BIGNUM* bn = BN_new();
         BN_set_word(bn, RSA_F4);
 
         auto rsa = RSA_new();
 
         if (!rsa)
-            LogicError("RSA_new failed");
+            logicError("RSA_new failed");
 
-        if (RSA_generate_key_ex(rsa, defaultRSAKeyBits, bn, nullptr) != 1)
-            LogicError("RSA_generate_key_ex failure");
+        if (RSA_generate_key_ex(rsa, gDefaultRsaKeyBits, bn, nullptr) != 1)
+            logicError("RSA_generate_key_ex failure");
 
         BN_clear_free(bn);
 
         return rsa;
     }();
 
-    static auto defaultEphemeralPrivateKey = []() {
+    static auto kDEFAULT_EPHEMERAL_PRIVATE_KEY = []() {
         auto pkey = EVP_PKEY_new();
 
         if (!pkey)
-            LogicError("EVP_PKEY_new failed");
+            logicError("EVP_PKEY_new failed");
 
         // 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(defaultRSA) != 1)
-            LogicError("EVP_PKEY_assign_RSA: incrementing reference count failed");
+        if (RSA_up_ref(kDEFAULT_RSA) != 1)
+            logicError("EVP_PKEY_assign_RSA: incrementing reference count failed");
 
-        if (!EVP_PKEY_assign_RSA(pkey, defaultRSA))
-            LogicError("EVP_PKEY_assign_RSA failed");
+        if (!EVP_PKEY_assign_RSA(pkey, kDEFAULT_RSA))
+            logicError("EVP_PKEY_assign_RSA failed");
 
         return pkey;
     }();
 
-    static auto defaultCert = []() {
+    static auto kDEFAULT_CERT = []() {
         auto x509 = X509_new();
 
         if (x509 == nullptr)
-            LogicError("X509_new failed");
+            logicError("X509_new failed");
 
         // According to the standards (X.509 et al), the value should be one
         // less than the actually certificate version we want. Since we want
@@ -147,7 +147,7 @@ initAnonymous(boost::asio::ssl::context& context)
         buf[ret] = 0;
 
         if (ASN1_TIME_set_string_X509(X509_get_notBefore(x509), buf) != 1)
-            LogicError("Unable to set certificate validity date");
+            logicError("Unable to set certificate validity date");
 
         // And make it valid for two years
         X509_gmtime_adj(X509_get_notAfter(x509), 2 * 365 * 24 * 60 * 60);
@@ -205,61 +205,61 @@ initAnonymous(boost::asio::ssl::context& context)
         }
 
         // And a private key
-        X509_set_pubkey(x509, defaultEphemeralPrivateKey);
+        X509_set_pubkey(x509, kDEFAULT_EPHEMERAL_PRIVATE_KEY);
 
-        if (!X509_sign(x509, defaultEphemeralPrivateKey, EVP_sha256()))
-            LogicError("X509_sign failed");
+        if (!X509_sign(x509, kDEFAULT_EPHEMERAL_PRIVATE_KEY, EVP_sha256()))
+            logicError("X509_sign failed");
 
         return x509;
     }();
 
     SSL_CTX* const ctx = context.native_handle();
 
-    if (SSL_CTX_use_certificate(ctx, defaultCert) <= 0)
-        LogicError("SSL_CTX_use_certificate failed");
+    if (SSL_CTX_use_certificate(ctx, kDEFAULT_CERT) <= 0)
+        logicError("SSL_CTX_use_certificate failed");
 
-    if (SSL_CTX_use_PrivateKey(ctx, defaultEphemeralPrivateKey) <= 0)
-        LogicError("SSL_CTX_use_PrivateKey failed");
+    if (SSL_CTX_use_PrivateKey(ctx, kDEFAULT_EPHEMERAL_PRIVATE_KEY) <= 0)
+        logicError("SSL_CTX_use_PrivateKey failed");
 }
 
 static void
 initAuthenticated(
     boost::asio::ssl::context& context,
-    std::string const& key_file,
-    std::string const& cert_file,
-    std::string const& chain_file)
+    std::string const& keyFile,
+    std::string const& certFile,
+    std::string const& chainFile)
 {
-    auto fmt_error = [](boost::system::error_code ec) -> std::string {
+    auto fmtError = [](boost::system::error_code ec) -> std::string {
         return " [" + std::to_string(ec.value()) + ": " + ec.message() + "]";
     };
 
     SSL_CTX* const ssl = context.native_handle();
 
-    bool cert_set = false;
+    bool certSet = false;
 
-    if (!cert_file.empty())
+    if (!certFile.empty())
     {
         boost::system::error_code ec;
 
         // NOLINTNEXTLINE(bugprone-unused-return-value)
-        context.use_certificate_file(cert_file, boost::asio::ssl::context::pem, ec);
+        context.use_certificate_file(certFile, boost::asio::ssl::context::pem, ec);
 
         if (ec)
-            LogicError("Problem with SSL certificate file" + fmt_error(ec));
+            logicError("Problem with SSL certificate file" + fmtError(ec));
 
-        cert_set = true;
+        certSet = true;
     }
 
-    if (!chain_file.empty())
+    if (!chainFile.empty())
     {
         // VFALCO Replace fopen() with RAII
-        FILE* f = fopen(chain_file.c_str(), "r");
+        FILE* f = fopen(chainFile.c_str(), "r");
 
         if (f == nullptr)
         {
-            LogicError(
+            logicError(
                 "Problem opening SSL chain file" +
-                fmt_error(boost::system::error_code(errno, boost::system::generic_category())));
+                fmtError(boost::system::error_code(errno, boost::system::generic_category())));
         }
 
         try
@@ -271,21 +271,21 @@ initAuthenticated(
                 if (x == nullptr)
                     break;
 
-                if (!cert_set)
+                if (!certSet)
                 {
                     if (SSL_CTX_use_certificate(ssl, x) != 1)
                     {
-                        LogicError(
+                        logicError(
                             "Problem retrieving SSL certificate from chain "
                             "file.");
                     }
 
-                    cert_set = true;
+                    certSet = true;
                 }
                 else if (SSL_CTX_add_extra_chain_cert(ssl, x) != 1)
                 {
                     X509_free(x);
-                    LogicError("Problem adding SSL chain certificate.");
+                    logicError("Problem adding SSL chain certificate.");
                 }
             }
 
@@ -294,32 +294,32 @@ initAuthenticated(
         catch (std::exception const& ex)
         {
             fclose(f);
-            LogicError(
+            logicError(
                 std::string("Reading the SSL chain file generated an exception: ") + ex.what());
         }
     }
 
-    if (!key_file.empty())
+    if (!keyFile.empty())
     {
         boost::system::error_code ec;
 
         // NOLINTNEXTLINE(bugprone-unused-return-value)
-        context.use_private_key_file(key_file, boost::asio::ssl::context::pem, ec);
+        context.use_private_key_file(keyFile, boost::asio::ssl::context::pem, ec);
 
         if (ec)
         {
-            LogicError("Problem using the SSL private key file" + fmt_error(ec));
+            logicError("Problem using the SSL private key file" + fmtError(ec));
         }
     }
 
     if (SSL_CTX_check_private_key(ssl) != 1)
     {
-        LogicError("Invalid key in SSL private key file.");
+        logicError("Invalid key in SSL private key file.");
     }
 }
 
 std::shared_ptr<boost::asio::ssl::context>
-get_context(std::string cipherList)
+getContext(std::string cipherList)
 {
     auto c = std::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::sslv23);
 
@@ -330,12 +330,12 @@ get_context(std::string cipherList)
         boost::asio::ssl::context::no_compression);
 
     if (cipherList.empty())
-        cipherList = defaultCipherList;
+        cipherList = kDEFAULT_CIPHER_LIST;
 
     if (auto result = SSL_CTX_set_cipher_list(c->native_handle(), cipherList.c_str()); result != 1)
-        LogicError("SSL_CTX_set_cipher_list failed");
+        logicError("SSL_CTX_set_cipher_list failed");
 
-    c->use_tmp_dh({std::addressof(detail::defaultDH), sizeof(defaultDH)});
+    c->use_tmp_dh({std::addressof(detail::kDEFAULT_DH), sizeof(kDEFAULT_DH)});
 
     // Disable all renegotiation support in TLS v1.2. This can help prevent
     // exploitation of the bug described in CVE-2021-3499 (for details see
@@ -350,9 +350,9 @@ get_context(std::string cipherList)
 
 //------------------------------------------------------------------------------
 std::shared_ptr<boost::asio::ssl::context>
-make_SSLContext(std::string const& cipherList)
+makeSslContext(std::string const& cipherList)
 {
-    auto context = openssl::detail::get_context(cipherList);
+    auto context = openssl::detail::getContext(cipherList);
     openssl::detail::initAnonymous(*context);
     // VFALCO NOTE, It seems the WebSocket context never has
     // set_verify_mode called, for either setting of WEBSOCKET_SECURE
@@ -361,13 +361,13 @@ make_SSLContext(std::string const& cipherList)
 }
 
 std::shared_ptr<boost::asio::ssl::context>
-make_SSLContextAuthed(
+makeSslContextAuthed(
     std::string const& keyFile,
     std::string const& certFile,
     std::string const& chainFile,
     std::string const& cipherList)
 {
-    auto context = openssl::detail::get_context(cipherList);
+    auto context = openssl::detail::getContext(cipherList);
     openssl::detail::initAuthenticated(*context, keyFile, certFile, chainFile);
     return context;
 }
diff --git a/src/libxrpl/basics/mulDiv.cpp b/src/libxrpl/basics/mulDiv.cpp
index 4abdcc0f75..64d37a35c3 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::muldiv_max)
+    if (result > xrpl::kMULDIV_MAX)
         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 dc8f785974..2c8ac34b6a 100644
--- a/src/libxrpl/beast/clock/basic_seconds_clock.cpp
+++ b/src/libxrpl/beast/clock/basic_seconds_clock.cpp
@@ -13,9 +13,9 @@ namespace beast {
 namespace {
 
 // Updates the clock
-class seconds_clock_thread
+class SecondsClockThread
 {
-    using Clock = basic_seconds_clock::Clock;
+    using Clock = BasicSecondsClock::Clock;
 
     bool stop_{false};
     std::mutex mut_;
@@ -24,8 +24,8 @@ class seconds_clock_thread
     std::atomic<Clock::time_point::rep> tp_;
 
 public:
-    ~seconds_clock_thread();
-    seconds_clock_thread();
+    ~SecondsClockThread();
+    SecondsClockThread();
 
     Clock::time_point
     now();
@@ -37,7 +37,7 @@ private:
 
 static_assert(std::atomic<std::chrono::steady_clock::rep>::is_always_lock_free);
 
-seconds_clock_thread::~seconds_clock_thread()
+SecondsClockThread::~SecondsClockThread()
 {
     XRPL_ASSERT(
         thread_.joinable(), "beast::seconds_clock_thread::~seconds_clock_thread : thread joinable");
@@ -49,19 +49,19 @@ seconds_clock_thread::~seconds_clock_thread()
     thread_.join();
 }
 
-seconds_clock_thread::seconds_clock_thread() : tp_{Clock::now().time_since_epoch().count()}
+SecondsClockThread::SecondsClockThread() : tp_{Clock::now().time_since_epoch().count()}
 {
-    thread_ = std::thread(&seconds_clock_thread::run, this);
+    thread_ = std::thread(&SecondsClockThread::run, this);
 }
 
-seconds_clock_thread::Clock::time_point
-seconds_clock_thread::now()
+SecondsClockThread::Clock::time_point
+SecondsClockThread::now()
 {
     return Clock::time_point{Clock::duration{tp_.load()}};
 }
 
 void
-seconds_clock_thread::run()
+SecondsClockThread::run()
 {
     std::unique_lock lock(mut_);
     while (true)
@@ -78,11 +78,11 @@ seconds_clock_thread::run()
 
 }  // unnamed namespace
 
-basic_seconds_clock::time_point
-basic_seconds_clock::now()
+BasicSecondsClock::time_point
+BasicSecondsClock::now()
 {
-    static seconds_clock_thread clk;
-    return clk.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 fd8a4764fa..39daa286c6 100644
--- a/src/libxrpl/beast/core/CurrentThreadName.cpp
+++ b/src/libxrpl/beast/core/CurrentThreadName.cpp
@@ -80,18 +80,20 @@ inline void
 setCurrentThreadNameImpl(std::string_view name)
 {
     // truncate and set the thread name.
-    char boundedName[maxThreadNameLength + 1];
-    auto const boundedSize = name.size() < maxThreadNameLength ? name.size() : maxThreadNameLength;
+    char boundedName[kMAX_THREAD_NAME_LENGTH + 1];
+    auto const boundedSize =
+        name.size() < kMAX_THREAD_NAME_LENGTH ? name.size() : kMAX_THREAD_NAME_LENGTH;
     name.copy(boundedName, boundedSize);
     boundedName[boundedSize] = '\0';
 
     pthread_setname_np(pthread_self(), boundedName);
 
 #ifdef TRUNCATED_THREAD_NAME_LOGS
-    if (name.size() > maxThreadNameLength)
+    if (name.size() > kMAX_THREAD_NAME_LENGTH)
     {
         std::cerr << "WARNING: Thread name \"" << name << "\" (length " << name.size()
-                  << ") exceeds maximum of " << maxThreadNameLength << " characters on Linux.\n";
+                  << ") exceeds maximum of " << kMAX_THREAD_NAME_LENGTH
+                  << " characters on Linux.\n";
     }
 #endif
 }
@@ -102,19 +104,19 @@ setCurrentThreadNameImpl(std::string_view name)
 namespace beast {
 
 namespace detail {
-thread_local std::string threadName;
+thread_local std::string gThreadName;
 }  // namespace detail
 
 std::string
 getCurrentThreadName()
 {
-    return detail::threadName;
+    return detail::gThreadName;
 }
 
 void
 setCurrentThreadName(std::string_view name)
 {
-    detail::threadName = name;
+    detail::gThreadName = name;
     detail::setCurrentThreadNameImpl(name);
 }
 
diff --git a/src/libxrpl/beast/core/SemanticVersion.cpp b/src/libxrpl/beast/core/SemanticVersion.cpp
index 0cf4ac3113..a99437f8f2 100644
--- a/src/libxrpl/beast/core/SemanticVersion.cpp
+++ b/src/libxrpl/beast/core/SemanticVersion.cpp
@@ -15,7 +15,7 @@
 namespace beast {
 
 std::string
-print_identifiers(SemanticVersion::identifier_list const& list)
+printIdentifiers(SemanticVersion::identifier_list const& list)
 {
     std::string ret;
 
@@ -61,10 +61,10 @@ chopUInt(int& value, int limit, std::string& input)
     if (input.empty())
         return false;
 
-    auto left_iter = std::ranges::find_if_not(
+    auto leftIter = std::ranges::find_if_not(
         input, [](std::string::value_type c) { return std::isdigit(c, std::locale::classic()); });
 
-    std::string const item(input.begin(), left_iter);
+    std::string const item(input.begin(), leftIter);
 
     // Must not be empty
     if (item.empty())
@@ -84,14 +84,14 @@ chopUInt(int& value, int limit, std::string& input)
     if (n < 0 || n > limit)
         return false;
 
-    input.erase(input.begin(), left_iter);
+    input.erase(input.begin(), leftIter);
     value = n;
 
     return true;
 }
 
 bool
-extract_identifier(std::string& value, bool allowLeadingZeroes, std::string& input)
+extractIdentifier(std::string& value, bool allowLeadingZeroes, std::string& input)
 {
     // Must not be empty
     if (input.empty())
@@ -114,7 +114,7 @@ extract_identifier(std::string& value, bool allowLeadingZeroes, std::string& inp
 }
 
 bool
-extract_identifiers(
+extractIdentifiers(
     SemanticVersion::identifier_list& identifiers,
     bool allowLeadingZeroes,
     std::string& input)
@@ -126,7 +126,7 @@ extract_identifiers(
     {
         std::string s;
 
-        if (!extract_identifier(s, allowLeadingZeroes, input))
+        if (!extractIdentifier(s, allowLeadingZeroes, input))
             return false;
         identifiers.push_back(s);
     } while (chop(".", input));
@@ -150,19 +150,19 @@ bool
 SemanticVersion::parse(std::string_view input)
 {
     // May not have leading or trailing whitespace
-    auto left_iter = std::ranges::find_if_not(
+    auto leftIter = std::ranges::find_if_not(
         input, [](std::string::value_type c) { return std::isspace(c, std::locale::classic()); });
 
-    auto right_iter =
+    auto rightIter =
         std::ranges::find_if_not(std::ranges::reverse_view(input), [](std::string::value_type c) {
             return std::isspace(c, std::locale::classic());
         }).base();
 
     // Must not be empty!
-    if (left_iter >= right_iter)
+    if (leftIter >= rightIter)
         return false;
 
-    std::string version(left_iter, right_iter);
+    std::string version(leftIter, rightIter);
 
     // May not have leading or trailing whitespace
     if (version != input)
@@ -187,7 +187,7 @@ SemanticVersion::parse(std::string_view input)
     // May have pre-release identifier list
     if (chop("-", version))
     {
-        if (!extract_identifiers(preReleaseIdentifiers, false, version))
+        if (!extractIdentifiers(preReleaseIdentifiers, false, version))
             return false;
 
         // Must not be empty
@@ -198,7 +198,7 @@ SemanticVersion::parse(std::string_view input)
     // May have metadata identifier list
     if (chop("+", version))
     {
-        if (!extract_identifiers(metaData, true, version))
+        if (!extractIdentifiers(metaData, true, version))
             return false;
 
         // Must not be empty
@@ -220,13 +220,13 @@ SemanticVersion::print() const
     if (!preReleaseIdentifiers.empty())
     {
         s += "-";
-        s += print_identifiers(preReleaseIdentifiers);
+        s += printIdentifiers(preReleaseIdentifiers);
     }
 
     if (!metaData.empty())
     {
         s += "+";
-        s += print_identifiers(metaData);
+        s += printIdentifiers(metaData);
     }
 
     return s;
diff --git a/src/libxrpl/beast/insight/Groups.cpp b/src/libxrpl/beast/insight/Groups.cpp
index c9e9453468..6a60c75aa2 100644
--- a/src/libxrpl/beast/insight/Groups.cpp
+++ b/src/libxrpl/beast/insight/Groups.cpp
@@ -21,12 +21,12 @@ namespace detail {
 
 class GroupImp : public std::enable_shared_from_this<GroupImp>, public Group
 {
-public:
-    std::string const m_name;
-    Collector::ptr m_collector;
+    std::string const name_;
+    Collector::ptr collector_;
 
-    GroupImp(std::string name_, Collector::ptr collector)
-        : m_name(std::move(name_)), m_collector(std::move(collector))
+public:
+    GroupImp(std::string name, Collector::ptr collector)
+        : name_(std::move(name)), collector_(std::move(collector))
     {
     }
 
@@ -35,43 +35,43 @@ public:
     std::string const&
     name() const override
     {
-        return m_name;
+        return name_;
     }
 
     std::string
-    make_name(std::string const& name)
+    makeName(std::string const& name)
     {
-        return m_name + "." + name;
+        return name_ + "." + name;
     }
 
     Hook
-    make_hook(HookImpl::HandlerType const& handler) override
+    makeHook(HookImpl::HandlerType const& handler) override
     {
-        return m_collector->make_hook(handler);
+        return collector_->makeHook(handler);
     }
 
     Counter
-    make_counter(std::string const& name) override
+    makeCounter(std::string const& name) override
     {
-        return m_collector->make_counter(make_name(name));
+        return collector_->makeCounter(makeName(name));
     }
 
     Event
-    make_event(std::string const& name) override
+    makeEvent(std::string const& name) override
     {
-        return m_collector->make_event(make_name(name));
+        return collector_->makeEvent(makeName(name));
     }
 
     Gauge
-    make_gauge(std::string const& name) override
+    makeGauge(std::string const& name) override
     {
-        return m_collector->make_gauge(make_name(name));
+        return collector_->makeGauge(makeName(name));
     }
 
     Meter
-    make_meter(std::string const& name) override
+    makeMeter(std::string const& name) override
     {
-        return m_collector->make_meter(make_name(name));
+        return collector_->makeMeter(makeName(name));
     }
 
     GroupImp&
@@ -83,12 +83,12 @@ public:
 class GroupsImp : public Groups
 {
 public:
-    using Items = std::unordered_map<std::string, std::shared_ptr<Group>, uhash<>>;
+    using Items = std::unordered_map<std::string, std::shared_ptr<Group>, Uhash<>>;
 
-    Collector::ptr m_collector;
-    Items m_items;
+    Collector::ptr collector;
+    Items items;
 
-    explicit GroupsImp(Collector::ptr collector) : m_collector(std::move(collector))
+    explicit GroupsImp(Collector::ptr collector) : collector(std::move(collector))
     {
     }
 
@@ -97,10 +97,10 @@ public:
     Group::ptr const&
     get(std::string const& name) override
     {
-        std::pair<Items::iterator, bool> const result(m_items.emplace(name, Group::ptr()));
+        std::pair<Items::iterator, bool> const result(items.emplace(name, Group::ptr()));
         Group::ptr& group(result.first->second);
         if (result.second)
-            group = std::make_shared<GroupImp>(name, m_collector);
+            group = std::make_shared<GroupImp>(name, collector);
         return group;
     }
 };
@@ -112,7 +112,7 @@ public:
 Groups::~Groups() = default;
 
 std::unique_ptr<Groups>
-make_Groups(Collector::ptr const& collector)
+makeGroups(Collector::ptr const& collector)
 {
     return std::make_unique<detail::GroupsImp>(collector);
 }
diff --git a/src/libxrpl/beast/insight/NullCollector.cpp b/src/libxrpl/beast/insight/NullCollector.cpp
index f5bb44bdba..03a12ee498 100644
--- a/src/libxrpl/beast/insight/NullCollector.cpp
+++ b/src/libxrpl/beast/insight/NullCollector.cpp
@@ -108,31 +108,31 @@ public:
     ~NullCollectorImp() override = default;
 
     Hook
-    make_hook(HookImpl::HandlerType const&) override
+    makeHook(HookImpl::HandlerType const&) override
     {
         return Hook(std::make_shared<detail::NullHookImpl>());
     }
 
     Counter
-    make_counter(std::string const&) override
+    makeCounter(std::string const&) override
     {
         return Counter(std::make_shared<detail::NullCounterImpl>());
     }
 
     Event
-    make_event(std::string const&) override
+    makeEvent(std::string const&) override
     {
         return Event(std::make_shared<detail::NullEventImpl>());
     }
 
     Gauge
-    make_gauge(std::string const&) override
+    makeGauge(std::string const&) override
     {
         return Gauge(std::make_shared<detail::NullGaugeImpl>());
     }
 
     Meter
-    make_meter(std::string const&) override
+    makeMeter(std::string const&) override
     {
         return Meter(std::make_shared<detail::NullMeterImpl>());
     }
@@ -143,7 +143,7 @@ public:
 //------------------------------------------------------------------------------
 
 std::shared_ptr<Collector>
-NullCollector::New()
+NullCollector::make()
 {
     return std::make_shared<detail::NullCollectorImp>();
 }
diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp
index a83a11d7d6..90d06ddf28 100644
--- a/src/libxrpl/beast/insight/StatsDCollector.cpp
+++ b/src/libxrpl/beast/insight/StatsDCollector.cpp
@@ -53,7 +53,7 @@ class StatsDMetricBase : public List<StatsDMetricBase>::Node
 {
 public:
     virtual void
-    do_process() = 0;
+    doProcess() = 0;
     virtual ~StatsDMetricBase() = default;
     StatsDMetricBase() = default;
     StatsDMetricBase(StatsDMetricBase const&) = delete;
@@ -71,14 +71,14 @@ public:
     ~StatsDHookImpl() override;
 
     void
-    do_process() override;
+    doProcess() override;
 
     StatsDHookImpl&
     operator=(StatsDHookImpl const&) = delete;
 
 private:
-    std::shared_ptr<StatsDCollectorImp> m_impl;
-    HandlerType m_handler;
+    std::shared_ptr<StatsDCollectorImp> impl_;
+    HandlerType handler_;
 };
 
 //------------------------------------------------------------------------------
@@ -96,18 +96,18 @@ public:
     void
     flush();
     void
-    do_increment(CounterImpl::value_type amount);
+    doIncrement(CounterImpl::value_type amount);
     void
-    do_process() override;
+    doProcess() override;
 
     StatsDCounterImpl&
     operator=(StatsDCounterImpl const&) = delete;
 
 private:
-    std::shared_ptr<StatsDCollectorImp> m_impl;
-    std::string m_name;
-    CounterImpl::value_type m_value{0};
-    bool m_dirty{false};
+    std::shared_ptr<StatsDCollectorImp> impl_;
+    std::string name_;
+    CounterImpl::value_type value_{0};
+    bool dirty_{false};
 };
 
 //------------------------------------------------------------------------------
@@ -123,16 +123,16 @@ public:
     notify(EventImpl::value_type const& value) override;
 
     void
-    do_notify(EventImpl::value_type const& value);
+    doNotify(EventImpl::value_type const& value);
     void
-    do_process();
+    doProcess();
 
 private:
     StatsDEventImpl&
     operator=(StatsDEventImpl const&);
 
-    std::shared_ptr<StatsDCollectorImp> m_impl;
-    std::string m_name;
+    std::shared_ptr<StatsDCollectorImp> impl_;
+    std::string name_;
 };
 
 //------------------------------------------------------------------------------
@@ -152,21 +152,21 @@ public:
     void
     flush();
     void
-    do_set(GaugeImpl::value_type value);
+    doSet(GaugeImpl::value_type value);
     void
-    do_increment(GaugeImpl::difference_type amount);
+    doIncrement(GaugeImpl::difference_type amount);
     void
-    do_process() override;
+    doProcess() override;
 
     StatsDGaugeImpl&
     operator=(StatsDGaugeImpl const&) = delete;
 
 private:
-    std::shared_ptr<StatsDCollectorImp> m_impl;
-    std::string m_name;
-    GaugeImpl::value_type m_last_value{0};
-    GaugeImpl::value_type m_value{0};
-    bool m_dirty{false};
+    std::shared_ptr<StatsDCollectorImp> impl_;
+    std::string name_;
+    GaugeImpl::value_type last_value_{0};
+    GaugeImpl::value_type value_{0};
+    bool dirty_{false};
 };
 
 //------------------------------------------------------------------------------
@@ -184,18 +184,18 @@ public:
     void
     flush();
     void
-    do_increment(MeterImpl::value_type amount);
+    doIncrement(MeterImpl::value_type amount);
     void
-    do_process() override;
+    doProcess() override;
 
     StatsDMeterImpl&
     operator=(StatsDMeterImpl const&) = delete;
 
 private:
-    std::shared_ptr<StatsDCollectorImp> m_impl;
-    std::string m_name;
-    MeterImpl::value_type m_value{0};
-    bool m_dirty{false};
+    std::shared_ptr<StatsDCollectorImp> impl_;
+    std::string name_;
+    MeterImpl::value_type value_{0};
+    bool dirty_{false};
 };
 
 //------------------------------------------------------------------------------
@@ -207,41 +207,41 @@ private:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
-        // max_packet_size = 484
-        max_packet_size = 1472
+        // MaxPacketSize = 484
+        MaxPacketSize = 1472
     };
 
-    Journal m_journal;
-    IP::Endpoint m_address;
-    std::string m_prefix;
-    boost::asio::io_context m_io_context;
-    std::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> m_work;
-    boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
-    boost::asio::basic_waitable_timer<std::chrono::steady_clock> m_timer;
-    boost::asio::ip::udp::socket m_socket;
-    std::deque<std::string> m_data;
+    Journal journal_;
+    IP::Endpoint address_;
+    std::string prefix_;
+    boost::asio::io_context io_context_;
+    std::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> work_;
+    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::basic_waitable_timer<std::chrono::steady_clock> timer_;
+    boost::asio::ip::udp::socket socket_;
+    std::deque<std::string> data_;
     std::recursive_mutex metricsLock_;
     List<StatsDMetricBase> metrics_;
 
     // Must come last for order of init
-    std::thread m_thread;
+    std::thread thread_;
 
     static boost::asio::ip::udp::endpoint
-    to_endpoint(IP::Endpoint const& ep)
+    toEndpoint(IP::Endpoint const& ep)
     {
         return boost::asio::ip::udp::endpoint(ep.address(), ep.port());
     }
 
 public:
     StatsDCollectorImp(IP::Endpoint address, std::string prefix, Journal journal)
-        : m_journal(journal)
-        , m_address(std::move(address))
-        , m_prefix(std::move(prefix))
-        , m_work(boost::asio::make_work_guard(m_io_context))
-        , m_strand(boost::asio::make_strand(m_io_context))
-        , m_timer(m_io_context)
-        , m_socket(m_io_context)
-        , m_thread(&StatsDCollectorImp::run, this)
+        : journal_(journal)
+        , address_(std::move(address))
+        , prefix_(std::move(prefix))
+        , work_(boost::asio::make_work_guard(io_context_))
+        , strand_(boost::asio::make_strand(io_context_))
+        , timer_(io_context_)
+        , socket_(io_context_)
+        , thread_(&StatsDCollectorImp::run, this)
     {
     }
 
@@ -249,43 +249,43 @@ public:
     {
         try
         {
-            m_timer.cancel();
+            timer_.cancel();
         }
         catch (boost::system::system_error const&)  // NOLINT(bugprone-empty-catch)
         {
             // ignored
         }
 
-        m_work.reset();
-        m_thread.join();
+        work_.reset();
+        thread_.join();
     }
 
     Hook
-    make_hook(HookImpl::HandlerType const& handler) override
+    makeHook(HookImpl::HandlerType const& handler) override
     {
         return Hook(std::make_shared<detail::StatsDHookImpl>(handler, shared_from_this()));
     }
 
     Counter
-    make_counter(std::string const& name) override
+    makeCounter(std::string const& name) override
     {
         return Counter(std::make_shared<detail::StatsDCounterImpl>(name, shared_from_this()));
     }
 
     Event
-    make_event(std::string const& name) override
+    makeEvent(std::string const& name) override
     {
         return Event(std::make_shared<detail::StatsDEventImpl>(name, shared_from_this()));
     }
 
     Gauge
-    make_gauge(std::string const& name) override
+    makeGauge(std::string const& name) override
     {
         return Gauge(std::make_shared<detail::StatsDGaugeImpl>(name, shared_from_this()));
     }
 
     Meter
-    make_meter(std::string const& name) override
+    makeMeter(std::string const& name) override
     {
         return Meter(std::make_shared<detail::StatsDMeterImpl>(name, shared_from_this()));
     }
@@ -296,49 +296,49 @@ public:
     add(StatsDMetricBase& metric)
     {
         std::scoped_lock const _(metricsLock_);
-        metrics_.push_back(metric);
+        metrics_.pushBack(metric);
     }
 
     void
     remove(StatsDMetricBase& metric)
     {
         std::scoped_lock const _(metricsLock_);
-        metrics_.erase(metrics_.iterator_to(metric));
+        metrics_.erase(metrics_.iteratorTo(metric));
     }
 
     //--------------------------------------------------------------------------
 
     boost::asio::io_context&
-    get_io_context()
+    getIoContext()
     {
-        return m_io_context;
+        return io_context_;
     }
 
     std::string const&
     prefix() const
     {
-        return m_prefix;
+        return prefix_;
     }
 
     void
-    do_post_buffer(std::string const& buffer)
+    doPostBuffer(std::string const& buffer)
     {
-        m_data.emplace_back(buffer);
+        data_.emplace_back(buffer);
     }
 
     void
-    post_buffer(std::string&& buffer)
+    postBuffer(std::string&& buffer)
     {
         boost::asio::dispatch(
-            m_io_context,
+            io_context_,
             boost::asio::bind_executor(
-                m_strand, std::bind(&StatsDCollectorImp::do_post_buffer, this, std::move(buffer))));
+                strand_, std::bind(&StatsDCollectorImp::doPostBuffer, this, std::move(buffer))));
     }
 
     // The keepAlive parameter makes sure the buffers sent to
     // boost::asio::async_send do not go away until the call is finished
     void
-    on_send(
+    onSend(
         std::shared_ptr<std::deque<std::string>> /*keepAlive*/,
         boost::system::error_code ec,
         std::size_t)
@@ -348,7 +348,7 @@ public:
 
         if (ec)
         {
-            if (auto stream = m_journal.error())
+            if (auto stream = journal_.error())
                 stream << "async_send failed: " << ec.message();
             return;
         }
@@ -370,35 +370,35 @@ public:
 
     // Send what we have
     void
-    send_buffers()
+    sendBuffers()
     {
-        if (m_data.empty())
+        if (data_.empty())
             return;
 
         // Break up the array of strings into blocks
         // that each fit into one UDP packet.
         //
         std::vector<boost::asio::const_buffer> buffers;
-        buffers.reserve(m_data.size());
+        buffers.reserve(data_.size());
         std::size_t size(0);
 
-        auto keepAlive = std::make_shared<std::deque<std::string>>(std::move(m_data));
-        m_data.clear();
+        auto keepAlive = std::make_shared<std::deque<std::string>>(std::move(data_));
+        data_.clear();
 
         for (auto const& s : *keepAlive)
         {
             std::size_t const length(s.size());
             XRPL_ASSERT(
                 !s.empty(),
-                "beast::insight::detail::StatsDCollectorImp::send_buffers : "
+                "beast::insight::detail::StatsDCollectorImp::sendBuffers : "
                 "non-empty payload");
-            if (!buffers.empty() && (size + length) > max_packet_size)
+            if (!buffers.empty() && (size + length) > MaxPacketSize)
             {
                 log(buffers);
-                m_socket.async_send(
+                socket_.async_send(
                     buffers,
                     std::bind(
-                        &StatsDCollectorImp::on_send,
+                        &StatsDCollectorImp::onSend,
                         this,
                         keepAlive,
                         std::placeholders::_1,
@@ -414,10 +414,10 @@ public:
         if (!buffers.empty())
         {
             log(buffers);
-            m_socket.async_send(
+            socket_.async_send(
                 buffers,
                 std::bind(
-                    &StatsDCollectorImp::on_send,
+                    &StatsDCollectorImp::onSend,
                     this,
                     keepAlive,
                     std::placeholders::_1,
@@ -426,34 +426,34 @@ public:
     }
 
     void
-    set_timer()
+    setTimer()
     {
         using namespace std::chrono_literals;
-        m_timer.expires_after(1s);
-        m_timer.async_wait(std::bind(&StatsDCollectorImp::on_timer, this, std::placeholders::_1));
+        timer_.expires_after(1s);
+        timer_.async_wait(std::bind(&StatsDCollectorImp::onTimer, this, std::placeholders::_1));
     }
 
     void
-    on_timer(boost::system::error_code ec)
+    onTimer(boost::system::error_code ec)
     {
         if (ec == boost::asio::error::operation_aborted)
             return;
 
         if (ec)
         {
-            if (auto stream = m_journal.error())
-                stream << "on_timer failed: " << ec.message();
+            if (auto stream = journal_.error())
+                stream << "onTimer failed: " << ec.message();
             return;
         }
 
         std::scoped_lock const _(metricsLock_);
 
         for (auto& m : metrics_)
-            m.do_process();
+            m.doProcess();
 
-        send_buffers();
+        sendBuffers();
 
-        set_timer();
+        setTimer();
     }
 
     void
@@ -461,43 +461,43 @@ public:
     {
         boost::system::error_code ec;
 
-        if (m_socket.connect(to_endpoint(m_address), ec))
+        if (socket_.connect(toEndpoint(address_), ec))
         {
-            if (auto stream = m_journal.error())
+            if (auto stream = journal_.error())
                 stream << "Connect failed: " << ec.message();
             return;
         }
 
-        set_timer();
+        setTimer();
 
-        m_io_context.run();
+        io_context_.run();
 
         // NOLINTNEXTLINE(bugprone-unused-return-value)
-        m_socket.shutdown(boost::asio::ip::udp::socket::shutdown_send, ec);
+        socket_.shutdown(boost::asio::ip::udp::socket::shutdown_send, ec);
 
-        m_socket.close();
+        socket_.close();
 
-        m_io_context.poll();
+        io_context_.poll();
     }
 };
 
 //------------------------------------------------------------------------------
 
 StatsDHookImpl::StatsDHookImpl(HandlerType handler, std::shared_ptr<StatsDCollectorImp> const& impl)
-    : m_impl(impl), m_handler(std::move(handler))
+    : impl_(impl), handler_(std::move(handler))
 {
-    m_impl->add(*this);
+    impl_->add(*this);
 }
 
 StatsDHookImpl::~StatsDHookImpl()
 {
-    m_impl->remove(*this);
+    impl_->remove(*this);
 }
 
 void
-StatsDHookImpl::do_process()
+StatsDHookImpl::doProcess()
 {
-    m_handler();
+    handler_();
 }
 
 //------------------------------------------------------------------------------
@@ -505,23 +505,23 @@ StatsDHookImpl::do_process()
 StatsDCounterImpl::StatsDCounterImpl(
     std::string name,
     std::shared_ptr<StatsDCollectorImp> const& impl)
-    : m_impl(impl), m_name(std::move(name))
+    : impl_(impl), name_(std::move(name))
 {
-    m_impl->add(*this);
+    impl_->add(*this);
 }
 
 StatsDCounterImpl::~StatsDCounterImpl()
 {
-    m_impl->remove(*this);
+    impl_->remove(*this);
 }
 
 void
 StatsDCounterImpl::increment(CounterImpl::value_type amount)
 {
     boost::asio::dispatch(
-        m_impl->get_io_context(),
+        impl_->getIoContext(),
         std::bind(
-            &StatsDCounterImpl::do_increment,
+            &StatsDCounterImpl::doIncrement,
             std::static_pointer_cast<StatsDCounterImpl>(shared_from_this()),
             amount));
 }
@@ -529,26 +529,26 @@ StatsDCounterImpl::increment(CounterImpl::value_type amount)
 void
 StatsDCounterImpl::flush()
 {
-    if (m_dirty)
+    if (dirty_)
     {
-        m_dirty = false;
+        dirty_ = false;
         std::stringstream ss;
-        ss << m_impl->prefix() << "." << m_name << ":" << m_value << "|c"
+        ss << impl_->prefix() << "." << name_ << ":" << value_ << "|c"
            << "\n";
-        m_value = 0;
-        m_impl->post_buffer(ss.str());
+        value_ = 0;
+        impl_->postBuffer(ss.str());
     }
 }
 
 void
-StatsDCounterImpl::do_increment(CounterImpl::value_type amount)
+StatsDCounterImpl::doIncrement(CounterImpl::value_type amount)
 {
-    m_value += amount;
-    m_dirty = true;
+    value_ += amount;
+    dirty_ = true;
 }
 
 void
-StatsDCounterImpl::do_process()
+StatsDCounterImpl::doProcess()
 {
     flush();
 }
@@ -556,7 +556,7 @@ StatsDCounterImpl::do_process()
 //------------------------------------------------------------------------------
 
 StatsDEventImpl::StatsDEventImpl(std::string name, std::shared_ptr<StatsDCollectorImp> const& impl)
-    : m_impl(impl), m_name(std::move(name))
+    : impl_(impl), name_(std::move(name))
 {
 }
 
@@ -564,42 +564,42 @@ void
 StatsDEventImpl::notify(EventImpl::value_type const& value)
 {
     boost::asio::dispatch(
-        m_impl->get_io_context(),
+        impl_->getIoContext(),
         std::bind(
-            &StatsDEventImpl::do_notify,
+            &StatsDEventImpl::doNotify,
             std::static_pointer_cast<StatsDEventImpl>(shared_from_this()),
             value));
 }
 
 void
-StatsDEventImpl::do_notify(EventImpl::value_type const& value)
+StatsDEventImpl::doNotify(EventImpl::value_type const& value)
 {
     std::stringstream ss;
-    ss << m_impl->prefix() << "." << m_name << ":" << value.count() << "|ms"
+    ss << impl_->prefix() << "." << name_ << ":" << value.count() << "|ms"
        << "\n";
-    m_impl->post_buffer(ss.str());
+    impl_->postBuffer(ss.str());
 }
 
 //------------------------------------------------------------------------------
 
 StatsDGaugeImpl::StatsDGaugeImpl(std::string name, std::shared_ptr<StatsDCollectorImp> const& impl)
-    : m_impl(impl), m_name(std::move(name))
+    : impl_(impl), name_(std::move(name))
 {
-    m_impl->add(*this);
+    impl_->add(*this);
 }
 
 StatsDGaugeImpl::~StatsDGaugeImpl()
 {
-    m_impl->remove(*this);
+    impl_->remove(*this);
 }
 
 void
 StatsDGaugeImpl::set(GaugeImpl::value_type value)
 {
     boost::asio::dispatch(
-        m_impl->get_io_context(),
+        impl_->getIoContext(),
         std::bind(
-            &StatsDGaugeImpl::do_set,
+            &StatsDGaugeImpl::doSet,
             std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
             value));
 }
@@ -608,9 +608,9 @@ void
 StatsDGaugeImpl::increment(GaugeImpl::difference_type amount)
 {
     boost::asio::dispatch(
-        m_impl->get_io_context(),
+        impl_->getIoContext(),
         std::bind(
-            &StatsDGaugeImpl::do_increment,
+            &StatsDGaugeImpl::doIncrement,
             std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
             amount));
 }
@@ -618,38 +618,38 @@ StatsDGaugeImpl::increment(GaugeImpl::difference_type amount)
 void
 StatsDGaugeImpl::flush()
 {
-    if (m_dirty)
+    if (dirty_)
     {
-        m_dirty = false;
+        dirty_ = false;
         std::stringstream ss;
-        ss << m_impl->prefix() << "." << m_name << ":" << m_value << "|g"
+        ss << impl_->prefix() << "." << name_ << ":" << value_ << "|g"
            << "\n";
-        m_impl->post_buffer(ss.str());
+        impl_->postBuffer(ss.str());
     }
 }
 
 void
-StatsDGaugeImpl::do_set(GaugeImpl::value_type value)
+StatsDGaugeImpl::doSet(GaugeImpl::value_type value)
 {
-    m_value = value;
+    value_ = value;
 
-    if (m_value != m_last_value)
+    if (value_ != last_value_)
     {
-        m_last_value = m_value;
-        m_dirty = true;
+        last_value_ = value_;
+        dirty_ = true;
     }
 }
 
 void
-StatsDGaugeImpl::do_increment(GaugeImpl::difference_type amount)
+StatsDGaugeImpl::doIncrement(GaugeImpl::difference_type amount)
 {
-    GaugeImpl::value_type value(m_value);
+    GaugeImpl::value_type value(value_);
 
     if (amount > 0)
     {
         GaugeImpl::value_type const d(static_cast<GaugeImpl::value_type>(amount));
-        value += (d >= std::numeric_limits<GaugeImpl::value_type>::max() - m_value)
-            ? std::numeric_limits<GaugeImpl::value_type>::max() - m_value
+        value += (d >= std::numeric_limits<GaugeImpl::value_type>::max() - value_)
+            ? std::numeric_limits<GaugeImpl::value_type>::max() - value_
             : d;
     }
     else if (amount < 0)
@@ -658,11 +658,11 @@ StatsDGaugeImpl::do_increment(GaugeImpl::difference_type amount)
         value = (d >= value) ? 0 : value - d;
     }
 
-    do_set(value);
+    doSet(value);
 }
 
 void
-StatsDGaugeImpl::do_process()
+StatsDGaugeImpl::doProcess()
 {
     flush();
 }
@@ -670,23 +670,23 @@ StatsDGaugeImpl::do_process()
 //------------------------------------------------------------------------------
 
 StatsDMeterImpl::StatsDMeterImpl(std::string name, std::shared_ptr<StatsDCollectorImp> const& impl)
-    : m_impl(impl), m_name(std::move(name))
+    : impl_(impl), name_(std::move(name))
 {
-    m_impl->add(*this);
+    impl_->add(*this);
 }
 
 StatsDMeterImpl::~StatsDMeterImpl()
 {
-    m_impl->remove(*this);
+    impl_->remove(*this);
 }
 
 void
 StatsDMeterImpl::increment(MeterImpl::value_type amount)
 {
     boost::asio::dispatch(
-        m_impl->get_io_context(),
+        impl_->getIoContext(),
         std::bind(
-            &StatsDMeterImpl::do_increment,
+            &StatsDMeterImpl::doIncrement,
             std::static_pointer_cast<StatsDMeterImpl>(shared_from_this()),
             amount));
 }
@@ -694,26 +694,26 @@ StatsDMeterImpl::increment(MeterImpl::value_type amount)
 void
 StatsDMeterImpl::flush()
 {
-    if (m_dirty)
+    if (dirty_)
     {
-        m_dirty = false;
+        dirty_ = false;
         std::stringstream ss;
-        ss << m_impl->prefix() << "." << m_name << ":" << m_value << "|m"
+        ss << impl_->prefix() << "." << name_ << ":" << value_ << "|m"
            << "\n";
-        m_value = 0;
-        m_impl->post_buffer(ss.str());
+        value_ = 0;
+        impl_->postBuffer(ss.str());
     }
 }
 
 void
-StatsDMeterImpl::do_increment(MeterImpl::value_type amount)
+StatsDMeterImpl::doIncrement(MeterImpl::value_type amount)
 {
-    m_value += amount;
-    m_dirty = true;
+    value_ += amount;
+    dirty_ = true;
 }
 
 void
-StatsDMeterImpl::do_process()
+StatsDMeterImpl::doProcess()
 {
     flush();
 }
@@ -723,7 +723,7 @@ StatsDMeterImpl::do_process()
 //------------------------------------------------------------------------------
 
 std::shared_ptr<StatsDCollector>
-StatsDCollector::New(IP::Endpoint const& address, std::string const& prefix, Journal journal)
+StatsDCollector::make(IP::Endpoint const& address, std::string const& prefix, Journal journal)
 {
     return std::make_shared<detail::StatsDCollectorImp>(address, prefix, journal);
 }
diff --git a/src/libxrpl/beast/net/IPAddressConversion.cpp b/src/libxrpl/beast/net/IPAddressConversion.cpp
index 14cb4bd44d..c0a37d234e 100644
--- a/src/libxrpl/beast/net/IPAddressConversion.cpp
+++ b/src/libxrpl/beast/net/IPAddressConversion.cpp
@@ -8,25 +8,25 @@
 namespace beast::IP {
 
 Endpoint
-from_asio(boost::asio::ip::address const& address)
+fromAsio(boost::asio::ip::address const& address)
 {
     return Endpoint{address};
 }
 
 Endpoint
-from_asio(boost::asio::ip::tcp::endpoint const& endpoint)
+fromAsio(boost::asio::ip::tcp::endpoint const& endpoint)
 {
     return Endpoint{endpoint.address(), endpoint.port()};
 }
 
 boost::asio::ip::address
-to_asio_address(Endpoint const& endpoint)
+toAsioAddress(Endpoint const& endpoint)
 {
     return endpoint.address();
 }
 
 boost::asio::ip::tcp::endpoint
-to_asio_endpoint(Endpoint const& endpoint)
+toAsioEndpoint(Endpoint const& endpoint)
 {
     return boost::asio::ip::tcp::endpoint{endpoint.address(), endpoint.port()};
 }
diff --git a/src/libxrpl/beast/net/IPAddressV4.cpp b/src/libxrpl/beast/net/IPAddressV4.cpp
index f39e511c4c..48554d0ec3 100644
--- a/src/libxrpl/beast/net/IPAddressV4.cpp
+++ b/src/libxrpl/beast/net/IPAddressV4.cpp
@@ -3,7 +3,7 @@
 namespace beast::IP {
 
 bool
-is_private(AddressV4 const& addr)
+isPrivate(AddressV4 const& addr)
 {
     return ((addr.to_uint() & 0xff000000) == 0x0a000000) ||  // Prefix /8,    10.  #.#.#
         ((addr.to_uint() & 0xfff00000) == 0xac100000) ||  // Prefix /12   172. 16.#.# - 172.31.#.#
@@ -12,16 +12,16 @@ is_private(AddressV4 const& addr)
 }
 
 bool
-is_public(AddressV4 const& addr)
+isPublic(AddressV4 const& addr)
 {
-    return !is_private(addr) && !addr.is_multicast();
+    return !isPrivate(addr) && !addr.is_multicast();
 }
 
 char
-get_class(AddressV4 const& addr)
+getClass(AddressV4 const& addr)
 {
-    static char const* table = "AAAABBCD";  // cspell:disable-line
-    return table[(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/net/IPAddressV6.cpp b/src/libxrpl/beast/net/IPAddressV6.cpp
index 3dbadf9779..fad11dddc0 100644
--- a/src/libxrpl/beast/net/IPAddressV6.cpp
+++ b/src/libxrpl/beast/net/IPAddressV6.cpp
@@ -7,19 +7,19 @@
 namespace beast::IP {
 
 bool
-is_private(AddressV6 const& addr)
+isPrivate(AddressV6 const& addr)
 {
     return (
         ((addr.to_bytes()[0] & 0xfd) != 0) ||  // TODO  fc00::/8 too ?
         (addr.is_v4_mapped() &&
-         is_private(boost::asio::ip::make_address_v4(boost::asio::ip::v4_mapped, addr))));
+         isPrivate(boost::asio::ip::make_address_v4(boost::asio::ip::v4_mapped, addr))));
 }
 
 bool
-is_public(AddressV6 const& addr)
+isPublic(AddressV6 const& addr)
 {
     // TODO is this correct?
-    return !is_private(addr) && !addr.is_multicast();
+    return !isPrivate(addr) && !addr.is_multicast();
 }
 
 }  // namespace beast::IP
diff --git a/src/libxrpl/beast/net/IPEndpoint.cpp b/src/libxrpl/beast/net/IPEndpoint.cpp
index e1c7394b42..5877151187 100644
--- a/src/libxrpl/beast/net/IPEndpoint.cpp
+++ b/src/libxrpl/beast/net/IPEndpoint.cpp
@@ -16,16 +16,16 @@
 
 namespace beast::IP {
 
-Endpoint::Endpoint() : m_port(0)
+Endpoint::Endpoint() : port_(0)
 {
 }
 
-Endpoint::Endpoint(Address addr, Port port) : m_addr(std::move(addr)), m_port(port)
+Endpoint::Endpoint(Address addr, Port port) : addr_(std::move(addr)), port_(port)
 {
 }
 
 std::optional<Endpoint>
-Endpoint::from_string_checked(std::string const& s)
+Endpoint::fromStringChecked(std::string const& s)
 {
     if (s.size() <= 64)
     {
@@ -39,15 +39,15 @@ Endpoint::from_string_checked(std::string const& s)
 }
 
 Endpoint
-Endpoint::from_string(std::string const& s)
+Endpoint::fromString(std::string const& s)
 {
-    if (std::optional<Endpoint> const result = from_string_checked(s))
+    if (std::optional<Endpoint> const result = fromStringChecked(s))
         return *result;
     return Endpoint{};
 }
 
 std::string
-Endpoint::to_string() const
+Endpoint::toString() const
 {
     std::string s;
     s.reserve(
diff --git a/src/libxrpl/beast/utility/beast_Journal.cpp b/src/libxrpl/beast/utility/beast_Journal.cpp
index 0d0b5a0d1d..abe5072461 100644
--- a/src/libxrpl/beast/utility/beast_Journal.cpp
+++ b/src/libxrpl/beast/utility/beast_Journal.cpp
@@ -12,7 +12,7 @@ namespace beast {
 class NullJournalSink : public Journal::Sink
 {
 public:
-    NullJournalSink() : Sink(severities::kDisabled, false)
+    NullJournalSink() : Sink(severities::KDisabled, false)
     {
     }
 
@@ -38,7 +38,7 @@ public:
     [[nodiscard]] severities::Severity
     threshold() const override
     {
-        return severities::kDisabled;
+        return severities::KDisabled;
     }
 
     void
@@ -62,13 +62,13 @@ public:
 Journal::Sink&
 Journal::getNullSink()
 {
-    static NullJournalSink sink;
-    return sink;
+    static NullJournalSink kSINK;
+    return kSINK;
 }
 
 //------------------------------------------------------------------------------
 
-Journal::Sink::Sink(Severity thresh, bool console) : thresh_(thresh), m_console(console)
+Journal::Sink::Sink(Severity thresh, bool console) : thresh_(thresh), console_(console)
 {
 }
 
@@ -83,13 +83,13 @@ Journal::Sink::active(Severity level) const
 bool
 Journal::Sink::console() const
 {
-    return m_console;
+    return console_;
 }
 
 void
 Journal::Sink::console(bool output)
 {
-    m_console = output;
+    console_ = output;
 }
 
 severities::Severity
@@ -106,30 +106,30 @@ Journal::Sink::threshold(Severity thresh)
 
 //------------------------------------------------------------------------------
 
-Journal::ScopedStream::ScopedStream(Sink& sink, Severity level) : m_sink(sink), m_level(level)
+Journal::ScopedStream::ScopedStream(Sink& sink, Severity level) : sink_(sink), level_(level)
 {
     // Modifiers applied from all ctors
-    m_ostream << std::boolalpha << std::showbase;
+    ostream_ << std::boolalpha << std::showbase;
 }
 
 Journal::ScopedStream::ScopedStream(Stream const& stream, std::ostream& manip(std::ostream&))
     : ScopedStream(stream.sink(), stream.level())
 {
-    m_ostream << manip;
+    ostream_ << manip;
 }
 
 Journal::ScopedStream::~ScopedStream()
 {
-    std::string const& s(m_ostream.str());
+    std::string const& s(ostream_.str());
     if (!s.empty())
     {
         if (s == "\n")
         {
-            m_sink.write(m_level, "");
+            sink_.write(level_, "");
         }
         else
         {
-            m_sink.write(m_level, s);
+            sink_.write(level_, s);
         }
     }
 }
@@ -137,7 +137,7 @@ Journal::ScopedStream::~ScopedStream()
 std::ostream&
 Journal::ScopedStream::operator<<(std::ostream& manip(std::ostream&)) const
 {
-    return m_ostream << manip;
+    return ostream_ << manip;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/beast/utility/beast_PropertyStream.cpp b/src/libxrpl/beast/utility/beast_PropertyStream.cpp
index 62c192bf64..c26a6dacf8 100644
--- a/src/libxrpl/beast/utility/beast_PropertyStream.cpp
+++ b/src/libxrpl/beast/utility/beast_PropertyStream.cpp
@@ -16,14 +16,14 @@ namespace beast {
 //
 //------------------------------------------------------------------------------
 
-PropertyStream::Item::Item(Source* source) : m_source(source)
+PropertyStream::Item::Item(Source* source) : source_(source)
 {
 }
 
 PropertyStream::Source&
 PropertyStream::Item::source() const
 {
-    return *m_source;
+    return *source_;
 }
 
 PropertyStream::Source*
@@ -44,25 +44,25 @@ PropertyStream::Item::operator*() const
 //
 //------------------------------------------------------------------------------
 
-PropertyStream::Proxy::Proxy(Map const& map, std::string key) : m_map(&map), m_key(std::move(key))
+PropertyStream::Proxy::Proxy(Map const& map, std::string key) : map_(&map), key_(std::move(key))
 {
 }
 
-PropertyStream::Proxy::Proxy(Proxy const& other) : m_map(other.m_map), m_key(other.m_key)
+PropertyStream::Proxy::Proxy(Proxy const& other) : map_(other.map_), key_(other.key_)
 {
 }
 
 PropertyStream::Proxy::~Proxy()
 {
-    std::string const s(m_ostream.str());
+    std::string const s(ostream_.str());
     if (!s.empty())
-        m_map->add(m_key, s);
+        map_->add(key_, s);
 }
 
 std::ostream&
 PropertyStream::Proxy::operator<<(std::ostream& manip(std::ostream&)) const
 {
-    return m_ostream << manip;
+    return ostream_ << manip;
 }
 
 //------------------------------------------------------------------------------
@@ -71,40 +71,40 @@ PropertyStream::Proxy::operator<<(std::ostream& manip(std::ostream&)) const
 //
 //------------------------------------------------------------------------------
 
-PropertyStream::Map::Map(PropertyStream& stream) : m_stream(stream)
+PropertyStream::Map::Map(PropertyStream& stream) : stream_(stream)
 {
 }
 
-PropertyStream::Map::Map(Set& parent) : m_stream(parent.stream())
+PropertyStream::Map::Map(Set& parent) : stream_(parent.stream())
 {
-    m_stream.map_begin();
+    stream_.mapBegin();
 }
 
-PropertyStream::Map::Map(std::string const& key, Map& map) : m_stream(map.stream())
+PropertyStream::Map::Map(std::string const& key, Map& map) : stream_(map.stream())
 {
-    m_stream.map_begin(key);
+    stream_.mapBegin(key);
 }
 
-PropertyStream::Map::Map(std::string const& key, PropertyStream& stream) : m_stream(stream)
+PropertyStream::Map::Map(std::string const& key, PropertyStream& stream) : stream_(stream)
 {
-    m_stream.map_begin(key);
+    stream_.mapBegin(key);
 }
 
 PropertyStream::Map::~Map()
 {
-    m_stream.map_end();
+    stream_.mapEnd();
 }
 
 PropertyStream&
 PropertyStream::Map::stream()
 {
-    return m_stream;
+    return stream_;
 }
 
 PropertyStream const&
 PropertyStream::Map::stream() const
 {
-    return m_stream;
+    return stream_;
 }
 
 PropertyStream::Proxy
@@ -119,31 +119,31 @@ PropertyStream::Map::operator[](std::string const& key)
 //
 //------------------------------------------------------------------------------
 
-PropertyStream::Set::Set(std::string const& key, Map& map) : m_stream(map.stream())
+PropertyStream::Set::Set(std::string const& key, Map& map) : stream_(map.stream())
 {
-    m_stream.array_begin(key);
+    stream_.arrayBegin(key);
 }
 
-PropertyStream::Set::Set(std::string const& key, PropertyStream& stream) : m_stream(stream)
+PropertyStream::Set::Set(std::string const& key, PropertyStream& stream) : stream_(stream)
 {
-    m_stream.array_begin(key);
+    stream_.arrayBegin(key);
 }
 
 PropertyStream::Set::~Set()
 {
-    m_stream.array_end();
+    stream_.arrayEnd();
 }
 
 PropertyStream&
 PropertyStream::Set::stream()
 {
-    return m_stream;
+    return stream_;
 }
 
 PropertyStream const&
 PropertyStream::Set::stream() const
 {
-    return m_stream;
+    return stream_;
 }
 
 //------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ PropertyStream::Set::stream() const
 //
 //------------------------------------------------------------------------------
 
-PropertyStream::Source::Source(std::string name) : m_name(std::move(name)), item_(this)
+PropertyStream::Source::Source(std::string name) : name_(std::move(name)), item_(this)
 {
 }
 
@@ -167,7 +167,7 @@ PropertyStream::Source::~Source()
 std::string const&
 PropertyStream::Source::name() const
 {
-    return m_name;
+    return name_;
 }
 
 void
@@ -177,7 +177,7 @@ PropertyStream::Source::add(Source& source)
 
     XRPL_ASSERT(
         source.parent_ == nullptr, "beast::PropertyStream::Source::add : null source parent");
-    children_.push_back(source.item_);
+    children_.pushBack(source.item_);
     source.parent_ = this;
 }
 
@@ -188,7 +188,7 @@ PropertyStream::Source::remove(Source& child)
 
     XRPL_ASSERT(
         child.parent_ == this, "beast::PropertyStream::Source::remove : child parent match");
-    children_.erase(children_.iterator_to(child.item_));
+    children_.erase(children_.iteratorTo(child.item_));
     child.parent_ = nullptr;
 }
 
@@ -198,7 +198,7 @@ PropertyStream::Source::removeAll()
     std::scoped_lock const _(lock_);
     for (auto iter = children_.begin(); iter != children_.end();)
     {
-        std::scoped_lock const _cl((*iter)->lock_);
+        std::scoped_lock const cl((*iter)->lock_);
         remove(*(*iter));
     }
 }
@@ -206,16 +206,16 @@ PropertyStream::Source::removeAll()
 //------------------------------------------------------------------------------
 
 void
-PropertyStream::Source::write_one(PropertyStream& stream)
+PropertyStream::Source::writeOne(PropertyStream& stream)
 {
-    Map map(m_name, stream);
+    Map map(name_, stream);
     onWrite(map);
 }
 
 void
 PropertyStream::Source::write(PropertyStream& stream)
 {
-    Map map(m_name, stream);
+    Map map(name_, stream);
     onWrite(map);
 
     std::scoped_lock const _(lock_);
@@ -238,32 +238,32 @@ PropertyStream::Source::write(PropertyStream& stream, std::string const& path)
     }
     else
     {
-        result.first->write_one(stream);
+        result.first->writeOne(stream);
     }
 }
 
 std::pair<PropertyStream::Source*, bool>
 PropertyStream::Source::find(std::string path)
 {
-    bool const deep(peel_trailing_slashstar(&path));
-    bool const rooted(peel_leading_slash(&path));
+    bool const deep(peelTrailingSlashstar(&path));
+    bool const rooted(peelLeadingSlash(&path));
     Source* source(this);
     if (!path.empty())
     {
         if (!rooted)
         {
-            std::string const name(peel_name(&path));
-            source = find_one_deep(name);
+            std::string const name(peelName(&path));
+            source = findOneDeep(name);
             if (source == nullptr)
                 return std::make_pair(nullptr, deep);
         }
-        source = source->find_path(path);
+        source = source->findPath(path);
     }
     return std::make_pair(source, deep);
 }
 
 bool
-PropertyStream::Source::peel_leading_slash(std::string* path)
+PropertyStream::Source::peelLeadingSlash(std::string* path)
 {
     if (!path->empty() && path->front() == '/')
     {
@@ -274,7 +274,7 @@ PropertyStream::Source::peel_leading_slash(std::string* path)
 }
 
 bool
-PropertyStream::Source::peel_trailing_slashstar(std::string* path)
+PropertyStream::Source::peelTrailingSlashstar(std::string* path)
 {
     bool found(false);
     if (path->empty())
@@ -290,7 +290,7 @@ PropertyStream::Source::peel_trailing_slashstar(std::string* path)
 }
 
 std::string
-PropertyStream::Source::peel_name(std::string* path)
+PropertyStream::Source::peelName(std::string* path)
 {
     if (path->empty())
         return "";
@@ -314,16 +314,16 @@ PropertyStream::Source::peel_name(std::string* path)
 
 // Recursive search through the whole tree until name is found
 PropertyStream::Source*
-PropertyStream::Source::find_one_deep(std::string const& name)
+PropertyStream::Source::findOneDeep(std::string const& name)
 {
-    Source* found = find_one(name);  // NOLINT(misc-const-correctness)
+    Source* found = findOne(name);  // NOLINT TODO
     if (found != nullptr)
         return found;
 
     std::scoped_lock const _(lock_);
     for (auto& s : children_)
     {
-        found = s.source().find_one_deep(name);
+        found = s.source().findOneDeep(name);
         if (found != nullptr)
             return found;
     }
@@ -331,17 +331,17 @@ PropertyStream::Source::find_one_deep(std::string const& name)
 }
 
 PropertyStream::Source*
-PropertyStream::Source::find_path(std::string path)
+PropertyStream::Source::findPath(std::string path)
 {
     if (path.empty())
         return this;
     Source* source(this);
     do
     {
-        std::string const name(peel_name(&path));
+        std::string const name(peelName(&path));
         if (name.empty())
             break;
-        source = source->find_one(name);
+        source = source->findOne(name);
     } while (source != nullptr);
     return source;
 }
@@ -349,12 +349,12 @@ PropertyStream::Source::find_path(std::string path)
 // This function only looks at immediate children
 // If no immediate children match, then return nullptr
 PropertyStream::Source*
-PropertyStream::Source::find_one(std::string const& name)
+PropertyStream::Source::findOne(std::string const& name)
 {
     std::scoped_lock const _(lock_);
     for (auto& s : children_)
     {
-        if (s.source().m_name == name)
+        if (s.source().name_ == name)
             return &s.source();
     }
     return nullptr;
@@ -387,85 +387,85 @@ PropertyStream::add(std::string const& key, bool value)
 void
 PropertyStream::add(std::string const& key, char value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, signed char value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, unsigned char value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, short value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, unsigned short value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, int value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, unsigned int value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, long value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, unsigned long value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, long long value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, unsigned long long value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, float value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, double value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
 PropertyStream::add(std::string const& key, long double value)
 {
-    lexical_add(key, value);
+    lexicalAdd(key, value);
 }
 
 void
@@ -484,85 +484,85 @@ PropertyStream::add(bool value)
 void
 PropertyStream::add(char value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(signed char value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(unsigned char value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(short value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(unsigned short value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(int value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(unsigned int value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(long value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(unsigned long value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(long long value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(unsigned long long value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(float value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(double value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 void
 PropertyStream::add(long double value)
 {
-    lexical_add(value);
+    lexicalAdd(value);
 }
 
 }  // namespace beast
diff --git a/src/libxrpl/conditions/Condition.cpp b/src/libxrpl/conditions/Condition.cpp
index ce3b55a827..004778bc4e 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 fingerprintSize = 32;
+constexpr std::size_t kFINGERPRINT_SIZE = 32;
 
 std::unique_ptr<Condition>
 loadSimpleSha256(Type type, Slice s, std::error_code& ec)
@@ -66,19 +66,19 @@ loadSimpleSha256(Type type, Slice s, std::error_code& ec)
 
     if (!isPrimitive(p) || !isContextSpecific(p))
     {
-        ec = error::incorrect_encoding;
+        ec = Error::IncorrectEncoding;
         return {};
     }
 
     if (p.tag != 0)
     {
-        ec = error::unexpected_tag;
+        ec = Error::UnexpectedTag;
         return {};
     }
 
-    if (p.length != fingerprintSize)
+    if (p.length != kFINGERPRINT_SIZE)
     {
-        ec = error::fingerprint_size;
+        ec = Error::FingerprintSize;
         return {};
     }
 
@@ -94,13 +94,13 @@ loadSimpleSha256(Type type, Slice s, std::error_code& ec)
 
     if (!isPrimitive(p) || !isContextSpecific(p))
     {
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return {};
     }
 
     if (p.tag != 1)
     {
-        ec = error::unexpected_tag;
+        ec = Error::UnexpectedTag;
         return {};
     }
 
@@ -111,16 +111,16 @@ loadSimpleSha256(Type type, Slice s, std::error_code& ec)
 
     if (!s.empty())
     {
-        ec = error::trailing_garbage;
+        ec = Error::TrailingGarbage;
         return {};
     }
 
     switch (type)
     {
-        case Type::preimageSha256:
-            if (cost > PreimageSha256::maxPreimageLength)
+        case Type::PreimageSha256:
+            if (cost > PreimageSha256::kMAX_PREIMAGE_LENGTH)
             {
-                ec = error::preimage_too_long;
+                ec = Error::PreimageTooLong;
                 return {};
             }
             break;
@@ -149,7 +149,7 @@ Condition::deserialize(Slice s, std::error_code& ec)
     // }
     if (s.empty())
     {
-        ec = error::buffer_empty;
+        ec = Error::BufferEmpty;
         return {};
     }
 
@@ -163,19 +163,19 @@ Condition::deserialize(Slice s, std::error_code& ec)
     // types
     if (!isConstructed(p) || !isContextSpecific(p))
     {
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return {};
     }
 
     if (p.length > s.size())
     {
-        ec = error::buffer_underfull;
+        ec = Error::BufferUnderfull;
         return {};
     }
 
-    if (s.size() > maxSerializedCondition)
+    if (s.size() > kMAX_SERIALIZED_CONDITION)
     {
-        ec = error::large_size;
+        ec = Error::LargeSize;
         return {};
     }
 
@@ -184,35 +184,35 @@ Condition::deserialize(Slice s, std::error_code& ec)
     switch (p.tag)
     {
         case 0:  // PreimageSha256
-            c = detail::loadSimpleSha256(Type::preimageSha256, Slice(s.data(), p.length), ec);
+            c = detail::loadSimpleSha256(Type::PreimageSha256, Slice(s.data(), p.length), ec);
             if (!ec)
                 s += p.length;
             break;
 
         case 1:  // PrefixSha256
-            ec = error::unsupported_type;
+            ec = Error::UnsupportedType;
             return {};
 
         case 2:  // ThresholdSha256
-            ec = error::unsupported_type;
+            ec = Error::UnsupportedType;
             return {};
 
         case 3:  // RsaSha256
-            ec = error::unsupported_type;
+            ec = Error::UnsupportedType;
             return {};
 
         case 4:  // Ed25519Sha256
-            ec = error::unsupported_type;
+            ec = Error::UnsupportedType;
             return {};
 
         default:
-            ec = error::unknown_type;
+            ec = Error::UnknownType;
             return {};
     }
 
     if (!s.empty())
     {
-        ec = error::trailing_garbage;
+        ec = Error::TrailingGarbage;
         return {};
     }
 
diff --git a/src/libxrpl/conditions/Fulfillment.cpp b/src/libxrpl/conditions/Fulfillment.cpp
index d1f48bfd7c..52f89a6150 100644
--- a/src/libxrpl/conditions/Fulfillment.cpp
+++ b/src/libxrpl/conditions/Fulfillment.cpp
@@ -53,7 +53,7 @@ Fulfillment::deserialize(Slice s, std::error_code& ec)
 
     if (s.empty())
     {
-        ec = error::buffer_empty;
+        ec = Error::BufferEmpty;
         return nullptr;
     }
 
@@ -66,25 +66,25 @@ Fulfillment::deserialize(Slice s, std::error_code& ec)
     // All fulfillments are context-specific, constructed types
     if (!isConstructed(p) || !isContextSpecific(p))
     {
-        ec = error::malformed_encoding;
+        ec = Error::MalformedEncoding;
         return nullptr;
     }
 
     if (p.length > s.size())
     {
-        ec = error::buffer_underfull;
+        ec = Error::BufferUnderfull;
         return {};
     }
 
     if (p.length < s.size())
     {
-        ec = error::buffer_overfull;
+        ec = Error::BufferOverfull;
         return {};
     }
 
-    if (p.length > maxSerializedFulfillment)
+    if (p.length > kMAX_SERIALIZED_FULFILLMENT)
     {
-        ec = error::large_size;
+        ec = Error::LargeSize;
         return {};
     }
 
@@ -93,40 +93,40 @@ Fulfillment::deserialize(Slice s, std::error_code& ec)
     using TagType = decltype(p.tag);
     switch (p.tag)
     {
-        case safe_cast<TagType>(Type::preimageSha256):
+        case safeCast<TagType>(Type::PreimageSha256):
             f = PreimageSha256::deserialize(Slice(s.data(), p.length), ec);
             if (ec)
                 return {};
             s += p.length;
             break;
 
-        case safe_cast<TagType>(Type::prefixSha256):
-            ec = error::unsupported_type;
+        case safeCast<TagType>(Type::PrefixSha256):
+            ec = Error::UnsupportedType;
             return {};
             break;
 
-        case safe_cast<TagType>(Type::thresholdSha256):
-            ec = error::unsupported_type;
+        case safeCast<TagType>(Type::ThresholdSha256):
+            ec = Error::UnsupportedType;
             return {};
             break;
 
-        case safe_cast<TagType>(Type::rsaSha256):
-            ec = error::unsupported_type;
+        case safeCast<TagType>(Type::RsaSha256):
+            ec = Error::UnsupportedType;
             return {};
             break;
 
-        case safe_cast<TagType>(Type::ed25519Sha256):
-            ec = error::unsupported_type;
+        case safeCast<TagType>(Type::Ed25519Sha256):
+            ec = Error::UnsupportedType;
             return {};
 
         default:
-            ec = error::unknown_type;
+            ec = Error::UnknownType;
             return {};
     }
 
     if (!s.empty())
     {
-        ec = error::trailing_garbage;
+        ec = Error::TrailingGarbage;
         return {};
     }
 
diff --git a/src/libxrpl/conditions/error.cpp b/src/libxrpl/conditions/error.cpp
index 44fc17265a..a26a153975 100644
--- a/src/libxrpl/conditions/error.cpp
+++ b/src/libxrpl/conditions/error.cpp
@@ -9,10 +9,10 @@
 namespace xrpl::cryptoconditions {
 namespace detail {
 
-class cryptoconditions_error_category : public std::error_category
+class CryptoconditionsErrorCategory : public std::error_category
 {
 public:
-    explicit cryptoconditions_error_category() = default;
+    explicit CryptoconditionsErrorCategory() = default;
 
     [[nodiscard]] char const*
     name() const noexcept override
@@ -23,57 +23,57 @@ public:
     [[nodiscard]] std::string
     message(int ev) const override
     {
-        switch (safe_cast<error>(ev))
+        switch (safeCast<Error>(ev))
         {
-            case error::unsupported_type:
+            case Error::UnsupportedType:
                 return "Specification: Requested type not supported.";
 
-            case error::unsupported_subtype:
+            case Error::UnsupportedSubtype:
                 return "Specification: Requested subtype not supported.";
 
-            case error::unknown_type:
+            case Error::UnknownType:
                 return "Specification: Requested type not recognized.";
 
-            case error::unknown_subtype:
+            case Error::UnknownSubtype:
                 return "Specification: Requested subtypes not recognized.";
 
-            case error::fingerprint_size:
+            case Error::FingerprintSize:
                 return "Specification: Incorrect fingerprint size.";
 
-            case error::incorrect_encoding:
+            case Error::IncorrectEncoding:
                 return "Specification: Incorrect encoding.";
 
-            case error::trailing_garbage:
+            case Error::TrailingGarbage:
                 return "Bad buffer: contains trailing garbage.";
 
-            case error::buffer_empty:
+            case Error::BufferEmpty:
                 return "Bad buffer: no data.";
 
-            case error::buffer_overfull:
+            case Error::BufferOverfull:
                 return "Bad buffer: overfull.";
 
-            case error::buffer_underfull:
+            case Error::BufferUnderfull:
                 return "Bad buffer: underfull.";
 
-            case error::malformed_encoding:
+            case Error::MalformedEncoding:
                 return "Malformed DER encoding.";
 
-            case error::unexpected_tag:
+            case Error::UnexpectedTag:
                 return "Malformed DER encoding: Unexpected tag.";
 
-            case error::short_preamble:
+            case Error::ShortPreamble:
                 return "Malformed DER encoding: Short preamble.";
 
-            case error::long_tag:
+            case Error::LongTag:
                 return "Implementation limit: Overlong tag.";
 
-            case error::large_size:
+            case Error::LargeSize:
                 return "Implementation limit: Large payload.";
 
-            case error::preimage_too_long:
+            case Error::PreimageTooLong:
                 return "Implementation limit: Specified preimage is too long.";
 
-            case error::generic:
+            case Error::Generic:
             default:
                 return "generic error";
         }
@@ -99,20 +99,19 @@ public:
 };
 
 inline std::error_category const&
-get_cryptoconditions_error_category()
+getCryptoconditionsErrorCategory()
 {
-    static cryptoconditions_error_category const cat{};
-    return cat;
+    static CryptoconditionsErrorCategory const kCAT{};
+    return kCAT;
 }
 
 }  // namespace detail
 
 std::error_code
-make_error_code(error ev)
+make_error_code(Error ev)
 {
     return std::error_code{
-        safe_cast<std::underlying_type_t<error>>(ev),
-        detail::get_cryptoconditions_error_category()};
+        safeCast<std::underlying_type_t<Error>>(ev), detail::getCryptoconditionsErrorCategory()};
 }
 
 }  // namespace xrpl::cryptoconditions
diff --git a/src/libxrpl/core/HashRouter.cpp b/src/libxrpl/core/HashRouter.cpp
index ecc2aa9f14..a3265bfcfd 100644
--- a/src/libxrpl/core/HashRouter.cpp
+++ b/src/libxrpl/core/HashRouter.cpp
@@ -71,7 +71,7 @@ HashRouter::shouldProcess(
     uint256 const& key,
     PeerShortID peer,
     HashRouterFlags& flags,
-    std::chrono::seconds tx_interval)
+    std::chrono::seconds txInterval)
 {
     std::scoped_lock const lock(mutex_);
 
@@ -79,7 +79,7 @@ HashRouter::shouldProcess(
     auto& s = result.first;
     s.addPeer(peer);
     flags = s.getFlags();
-    return s.shouldProcess(suppressionMap_.clock().now(), tx_interval);
+    return s.shouldProcess(suppressionMap_.clock().now(), txInterval);
 }
 
 HashRouterFlags
diff --git a/src/libxrpl/core/detail/Job.cpp b/src/libxrpl/core/detail/Job.cpp
index 069cc7f216..a1b88864d7 100644
--- a/src/libxrpl/core/detail/Job.cpp
+++ b/src/libxrpl/core/detail/Job.cpp
@@ -11,11 +11,11 @@
 
 namespace xrpl {
 
-Job::Job() : mType(jtINVALID), mJobIndex(0)
+Job::Job() : type_(JtInvalid), jobIndex_(0)
 {
 }
 
-Job::Job(JobType type, std::uint64_t index) : mType(type), mJobIndex(index)
+Job::Job(JobType type, std::uint64_t index) : type_(type), jobIndex_(index)
 {
 }
 
@@ -25,83 +25,83 @@ Job::Job(
     std::uint64_t index,
     LoadMonitor& lm,
     std::function<void()> const& job)
-    : mType(type), mJobIndex(index), mJob(job), mName(name), m_queue_time(clock_type::now())
+    : type_(type), jobIndex_(index), job_(job), name_(name), queue_time_(clock_type::now())
 {
-    m_loadEvent = std::make_shared<LoadEvent>(std::ref(lm), name, false);
+    loadEvent_ = std::make_shared<LoadEvent>(std::ref(lm), name, false);
 }
 
 JobType
 Job::getType() const
 {
-    return mType;
+    return type_;
 }
 
 Job::clock_type::time_point const&
-Job::queue_time() const
+Job::queueTime() const
 {
-    return m_queue_time;
+    return queue_time_;
 }
 
 void
 Job::doJob()
 {
-    beast::setCurrentThreadName("j:" + mName);
-    m_loadEvent->start();
-    m_loadEvent->setName(mName);
+    beast::setCurrentThreadName("j:" + name_);
+    loadEvent_->start();
+    loadEvent_->setName(name_);
 
-    mJob();
+    job_();
 
     // Destroy the lambda, otherwise we won't include
     // its duration in the time measurement
-    mJob = nullptr;
+    job_ = nullptr;
 }
 
 bool
 Job::operator>(Job const& j) const
 {
-    if (mType < j.mType)
+    if (type_ < j.type_)
         return true;
 
-    if (mType > j.mType)
+    if (type_ > j.type_)
         return false;
 
-    return mJobIndex > j.mJobIndex;
+    return jobIndex_ > j.jobIndex_;
 }
 
 bool
 Job::operator>=(Job const& j) const
 {
-    if (mType < j.mType)
+    if (type_ < j.type_)
         return true;
 
-    if (mType > j.mType)
+    if (type_ > j.type_)
         return false;
 
-    return mJobIndex >= j.mJobIndex;
+    return jobIndex_ >= j.jobIndex_;
 }
 
 bool
 Job::operator<(Job const& j) const
 {
-    if (mType < j.mType)
+    if (type_ < j.type_)
         return false;
 
-    if (mType > j.mType)
+    if (type_ > j.type_)
         return true;
 
-    return mJobIndex < j.mJobIndex;
+    return jobIndex_ < j.jobIndex_;
 }
 
 bool
 Job::operator<=(Job const& j) const
 {
-    if (mType < j.mType)
+    if (type_ < j.type_)
         return false;
 
-    if (mType > j.mType)
+    if (type_ > j.type_)
         return true;
 
-    return mJobIndex <= j.mJobIndex;
+    return jobIndex_ <= j.jobIndex_;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/core/detail/JobQueue.cpp b/src/libxrpl/core/detail/JobQueue.cpp
index 9e6756e0c0..06a2d226e1 100644
--- a/src/libxrpl/core/detail/JobQueue.cpp
+++ b/src/libxrpl/core/detail/JobQueue.cpp
@@ -27,29 +27,29 @@ JobQueue::JobQueue(
     beast::Journal journal,
     Logs& logs,
     perf::PerfLog& perfLog)
-    : m_journal(journal)
-    , m_invalidJobData(JobTypes::instance().getInvalid(), collector, logs)
-    , m_workers(*this, &perfLog, "JobQueue", threadCount)
+    : journal_(journal)
+    , invalidJobData_(JobTypes::instance().getInvalid(), collector, logs)
+    , workers_(*this, &perfLog, "JobQueue", threadCount)
     , perfLog_(perfLog)
-    , m_collector(collector)
+    , collector_(collector)
 {
-    JLOG(m_journal.info()) << "Using " << threadCount << "  threads";
+    JLOG(journal_.info()) << "Using " << threadCount << "  threads";
 
-    hook = m_collector->make_hook(std::bind(&JobQueue::collect, this));
-    job_count = m_collector->make_gauge("job_count");
+    hook_ = collector_->makeHook(std::bind(&JobQueue::collect, this));
+    job_count_ = collector_->makeGauge("job_count");
 
     {
-        std::scoped_lock const lock(m_mutex);
+        std::scoped_lock const lock(mutex_);
 
         for (auto const& x : JobTypes::instance())
         {
             JobTypeInfo const& jt = x.second;
 
             // And create dynamic information for all jobs
-            auto const result(m_jobData.emplace(
+            auto const result(jobData_.emplace(
                 std::piecewise_construct,
                 std::forward_as_tuple(jt.type()),
-                std::forward_as_tuple(jt, m_collector, logs)));
+                std::forward_as_tuple(jt, collector_, logs)));
             XRPL_ASSERT(result.second == true, "xrpl::JobQueue::JobQueue : jobs added");
             (void)result.second;
         }
@@ -59,52 +59,52 @@ JobQueue::JobQueue(
 JobQueue::~JobQueue()
 {
     // Must unhook before destroying
-    hook = beast::insight::Hook();
+    hook_ = beast::insight::Hook();
 }
 
 void
 JobQueue::collect()
 {
-    std::scoped_lock const lock(m_mutex);
-    job_count = m_jobSet.size();
+    std::scoped_lock const lock(mutex_);
+    job_count_ = jobSet_.size();
 }
 
 bool
 JobQueue::addRefCountedJob(JobType type, std::string const& name, JobFunction const& func)
 {
-    XRPL_ASSERT(type != jtINVALID, "xrpl::JobQueue::addRefCountedJob : valid input job type");
+    XRPL_ASSERT(type != JtInvalid, "xrpl::JobQueue::addRefCountedJob : valid input job type");
 
-    auto iter(m_jobData.find(type));
+    auto iter(jobData_.find(type));
     XRPL_ASSERT(
-        iter != m_jobData.end(), "xrpl::JobQueue::addRefCountedJob : job type found in jobs");
-    if (iter == m_jobData.end())
+        iter != jobData_.end(), "xrpl::JobQueue::addRefCountedJob : job type found in jobs");
+    if (iter == jobData_.end())
         return false;
 
-    JLOG(m_journal.debug()) << __func__ << " : Adding job : " << name << " : " << type;
+    JLOG(journal_.debug()) << __func__ << " : Adding job : " << name << " : " << type;
     JobTypeData& data(iter->second);
 
     // FIXME: Workaround incorrect client shutdown ordering
     // do not add jobs to a queue with no threads
     XRPL_ASSERT(
-        (type >= jtCLIENT && type <= jtCLIENT_WEBSOCKET) || m_workers.getNumberOfThreads() > 0,
+        (type >= JtClient && type <= JtClientWebsocket) || workers_.getNumberOfThreads() > 0,
         "xrpl::JobQueue::addRefCountedJob : threads available or job "
         "requires no threads");
 
     {
-        std::scoped_lock const lock(m_mutex);
-        auto result = m_jobSet.emplace(type, name, ++m_lastJob, data.load(), func);
+        std::scoped_lock const lock(mutex_);
+        auto result = jobSet_.emplace(type, name, ++lastJob_, data.load(), func);
         auto const& job = *result.first;
 
         JobType const type(job.getType());
-        XRPL_ASSERT(type != jtINVALID, "xrpl::JobQueue::addRefCountedJob : has valid job type");
-        XRPL_ASSERT(m_jobSet.contains(job), "xrpl::JobQueue::addRefCountedJob : job found");
+        XRPL_ASSERT(type != JtInvalid, "xrpl::JobQueue::addRefCountedJob : has valid job type");
+        XRPL_ASSERT(jobSet_.contains(job), "xrpl::JobQueue::addRefCountedJob : job found");
         perfLog_.jobQueue(type);
 
         JobTypeData& data(getJobTypeData(type));
 
         if (data.waiting + data.running < getJobLimit(type))
         {
-            m_workers.addTask();
+            workers_.addTask();
         }
         else
         {
@@ -119,21 +119,21 @@ JobQueue::addRefCountedJob(JobType type, std::string const& name, JobFunction co
 int
 JobQueue::getJobCount(JobType t) const
 {
-    std::scoped_lock const lock(m_mutex);
+    std::scoped_lock const lock(mutex_);
 
-    JobDataMap::const_iterator const c = m_jobData.find(t);
+    JobDataMap::const_iterator const c = jobData_.find(t);
 
-    return (c == m_jobData.end()) ? 0 : c->second.waiting;
+    return (c == jobData_.end()) ? 0 : c->second.waiting;
 }
 
 int
 JobQueue::getJobCountTotal(JobType t) const
 {
-    std::scoped_lock const lock(m_mutex);
+    std::scoped_lock const lock(mutex_);
 
-    JobDataMap::const_iterator const c = m_jobData.find(t);
+    JobDataMap::const_iterator const c = jobData_.find(t);
 
-    return (c == m_jobData.end()) ? 0 : (c->second.waiting + c->second.running);
+    return (c == jobData_.end()) ? 0 : (c->second.waiting + c->second.running);
 }
 
 int
@@ -142,9 +142,9 @@ JobQueue::getJobCountGE(JobType t) const
     // return the number of jobs at this priority level or greater
     int ret = 0;
 
-    std::scoped_lock const lock(m_mutex);
+    std::scoped_lock const lock(mutex_);
 
-    for (auto const& x : m_jobData)
+    for (auto const& x : jobData_)
     {
         if (x.first >= t)
             ret += x.second.waiting;
@@ -156,10 +156,10 @@ JobQueue::getJobCountGE(JobType t) const
 std::unique_ptr<LoadEvent>
 JobQueue::makeLoadEvent(JobType t, std::string const& name)
 {
-    JobDataMap::iterator const iter(m_jobData.find(t));
-    XRPL_ASSERT(iter != m_jobData.end(), "xrpl::JobQueue::makeLoadEvent : valid job type input");
+    JobDataMap::iterator const iter(jobData_.find(t));
+    XRPL_ASSERT(iter != jobData_.end(), "xrpl::JobQueue::makeLoadEvent : valid job type input");
 
-    if (iter == m_jobData.end())
+    if (iter == jobData_.end())
         return {};
 
     return std::make_unique<LoadEvent>(iter->second.load(), name, true);
@@ -169,36 +169,36 @@ void
 JobQueue::addLoadEvents(JobType t, int count, std::chrono::milliseconds elapsed)
 {
     if (isStopped())
-        LogicError("JobQueue::addLoadEvents() called after JobQueue stopped");
+        logicError("JobQueue::addLoadEvents() called after JobQueue stopped");
 
-    JobDataMap::iterator const iter(m_jobData.find(t));
-    XRPL_ASSERT(iter != m_jobData.end(), "xrpl::JobQueue::addLoadEvents : valid job type input");
+    JobDataMap::iterator const iter(jobData_.find(t));
+    XRPL_ASSERT(iter != jobData_.end(), "xrpl::JobQueue::addLoadEvents : valid job type input");
     iter->second.load().addSamples(count, elapsed);
 }
 
 bool
 JobQueue::isOverloaded()
 {
-    return std::ranges::any_of(m_jobData, [](auto& entry) { return entry.second.load().isOver(); });
+    return std::ranges::any_of(jobData_, [](auto& entry) { return entry.second.load().isOver(); });
 }
 
-Json::Value
+json::Value
 JobQueue::getJson(int c)
 {
     using namespace std::chrono_literals;
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
-    ret["threads"] = m_workers.getNumberOfThreads();
+    ret["threads"] = workers_.getNumberOfThreads();
 
-    Json::Value priorities = Json::arrayValue;
+    json::Value priorities = json::ArrayValue;
 
-    std::scoped_lock const lock(m_mutex);
+    std::scoped_lock const lock(mutex_);
 
-    for (auto& x : m_jobData)
+    for (auto& x : jobData_)
     {
-        XRPL_ASSERT(x.first != jtINVALID, "xrpl::JobQueue::getJson : valid job type");
+        XRPL_ASSERT(x.first != JtInvalid, "xrpl::JobQueue::getJson : valid job type");
 
-        if (x.first == jtGENERIC)
+        if (x.first == JtGeneric)
             continue;
 
         JobTypeData& data(x.second);
@@ -210,7 +210,7 @@ JobQueue::getJson(int c)
 
         if ((stats.count != 0) || (waiting != 0) || (stats.latencyPeak != 0ms) || (running != 0))
         {
-            Json::Value& pri = priorities.append(Json::objectValue);
+            json::Value& pri = priorities.append(json::ObjectValue);
 
             pri["job_type"] = data.name();
 
@@ -242,20 +242,20 @@ JobQueue::getJson(int c)
 void
 JobQueue::rendezvous()
 {
-    std::unique_lock<std::mutex> lock(m_mutex);
-    cv_.wait(lock, [this] { return m_processCount == 0 && m_jobSet.empty(); });
+    std::unique_lock<std::mutex> lock(mutex_);
+    cv_.wait(lock, [this] { return processCount_ == 0 && jobSet_.empty(); });
 }
 
 JobTypeData&
 JobQueue::getJobTypeData(JobType type)
 {
-    JobDataMap::iterator const c(m_jobData.find(type));
-    XRPL_ASSERT(c != m_jobData.end(), "xrpl::JobQueue::getJobTypeData : valid job type input");
+    JobDataMap::iterator const c(jobData_.find(type));
+    XRPL_ASSERT(c != jobData_.end(), "xrpl::JobQueue::getJobTypeData : valid job type input");
 
-    // NIKB: This is ugly and I hate it. We must remove jtINVALID completely
+    // NIKB: This is ugly and I hate it. We must remove JtInvalid completely
     //       and use something sane.
-    if (c == m_jobData.end())
-        return m_invalidJobData;
+    if (c == jobData_.end())
+        return invalidJobData_;
 
     return c->second;
 }
@@ -265,17 +265,17 @@ JobQueue::stop()
 {
     stopping_ = true;
     using namespace std::chrono_literals;
-    jobCounter_.join("JobQueue", 1s, m_journal);
+    jobCounter_.join("JobQueue", 1s, journal_);
     {
         // After the JobCounter is joined, all jobs have finished executing
         // (i.e. returned from `Job::doJob`) and no more are being accepted,
         // but there may still be some threads between the return of
         // `Job::doJob` and the return of `JobQueue::processTask`. That is why
         // we must wait on the condition variable to make these assertions.
-        std::unique_lock<std::mutex> lock(m_mutex);
-        cv_.wait(lock, [this] { return m_processCount == 0 && m_jobSet.empty(); });
-        XRPL_ASSERT(m_processCount == 0, "xrpl::JobQueue::stop : all processes completed");
-        XRPL_ASSERT(m_jobSet.empty(), "xrpl::JobQueue::stop : all jobs completed");
+        std::unique_lock<std::mutex> lock(mutex_);
+        cv_.wait(lock, [this] { return processCount_ == 0 && jobSet_.empty(); });
+        XRPL_ASSERT(processCount_ == 0, "xrpl::JobQueue::stop : all processes completed");
+        XRPL_ASSERT(jobSet_.empty(), "xrpl::JobQueue::stop : all jobs completed");
         XRPL_ASSERT(nSuspend_ == 0, "xrpl::JobQueue::stop : no coros suspended");
         stopped_ = true;
     }
@@ -290,13 +290,13 @@ JobQueue::isStopped() const
 void
 JobQueue::getNextJob(Job& job)
 {
-    XRPL_ASSERT(!m_jobSet.empty(), "xrpl::JobQueue::getNextJob : non-empty jobs");
+    XRPL_ASSERT(!jobSet_.empty(), "xrpl::JobQueue::getNextJob : non-empty jobs");
 
     std::set<Job>::const_iterator iter;
-    for (iter = m_jobSet.begin(); iter != m_jobSet.end(); ++iter)
+    for (iter = jobSet_.begin(); iter != jobSet_.end(); ++iter)
     {
         JobType const type = iter->getType();
-        XRPL_ASSERT(type != jtINVALID, "xrpl::JobQueue::getNextJob : valid job type");
+        XRPL_ASSERT(type != JtInvalid, "xrpl::JobQueue::getNextJob : valid job type");
 
         JobTypeData& data(getJobTypeData(type));
         XRPL_ASSERT(
@@ -312,15 +312,15 @@ JobQueue::getNextJob(Job& job)
         }
     }
 
-    XRPL_ASSERT(iter != m_jobSet.end(), "xrpl::JobQueue::getNextJob : found next job");
+    XRPL_ASSERT(iter != jobSet_.end(), "xrpl::JobQueue::getNextJob : found next job");
     job = *iter;
-    m_jobSet.erase(iter);
+    jobSet_.erase(iter);
 }
 
 void
 JobQueue::finishJob(JobType type)
 {
-    XRPL_ASSERT(type != jtINVALID, "xrpl::JobQueue::finishJob : valid input job type");
+    XRPL_ASSERT(type != JtInvalid, "xrpl::JobQueue::finishJob : valid input job type");
 
     JobTypeData& data = getJobTypeData(type);
 
@@ -332,7 +332,7 @@ JobQueue::finishJob(JobType type)
             "xrpl::JobQueue::finishJob : job limit");
 
         --data.deferred;
-        m_workers.addTask();
+        workers_.addTask();
     }
 
     --data.running;
@@ -341,47 +341,47 @@ JobQueue::finishJob(JobType type)
 void
 JobQueue::processTask(int instance)
 {
-    JobType type = jtINVALID;
+    JobType type = JtInvalid;
 
     {
         using namespace std::chrono;
-        Job::clock_type::time_point const start_time(Job::clock_type::now());
+        Job::clock_type::time_point const startTime(Job::clock_type::now());
         {
             Job job;
             {
-                std::scoped_lock const lock(m_mutex);
+                std::scoped_lock const lock(mutex_);
                 getNextJob(job);
-                ++m_processCount;
+                ++processCount_;
             }
             type = job.getType();
             JobTypeData const& data(getJobTypeData(type));
-            JLOG(m_journal.trace()) << "Doing " << data.name() << "job";
+            JLOG(journal_.trace()) << "Doing " << data.name() << "job";
 
             // The amount of time that the job was in the queue
-            auto const q_time = ceil<microseconds>(start_time - job.queue_time());
-            perfLog_.jobStart(type, q_time, start_time, instance);
+            auto const qTime = ceil<microseconds>(startTime - job.queueTime());
+            perfLog_.jobStart(type, qTime, startTime, instance);
 
             job.doJob();
 
             // The amount of time it took to execute the job
-            auto const x_time = ceil<microseconds>(Job::clock_type::now() - start_time);
+            auto const xTime = ceil<microseconds>(Job::clock_type::now() - startTime);
 
-            if (x_time >= 10ms || q_time >= 10ms)
+            if (xTime >= 10ms || qTime >= 10ms)
             {
-                getJobTypeData(type).dequeue.notify(q_time);
-                getJobTypeData(type).execute.notify(x_time);
+                getJobTypeData(type).dequeue.notify(qTime);
+                getJobTypeData(type).execute.notify(xTime);
             }
-            perfLog_.jobFinish(type, x_time, instance);
+            perfLog_.jobFinish(type, xTime, instance);
         }
     }
 
     {
-        std::scoped_lock const lock(m_mutex);
+        std::scoped_lock const lock(mutex_);
         // Job should be destroyed before stopping
         // otherwise destructors with side effects can access
         // parent objects that are already destroyed.
         finishJob(type);
-        if (--m_processCount == 0 && m_jobSet.empty())
+        if (--processCount_ == 0 && jobSet_.empty())
             cv_.notify_all();
     }
 
@@ -393,7 +393,7 @@ int
 JobQueue::getJobLimit(JobType type)
 {
     JobTypeInfo const& j(JobTypes::instance().get(type));
-    XRPL_ASSERT(j.type() != jtINVALID, "xrpl::JobQueue::getJobLimit : valid job type");
+    XRPL_ASSERT(j.type() != JtInvalid, "xrpl::JobQueue::getJobLimit : valid job type");
 
     return j.limit();
 }
diff --git a/src/libxrpl/core/detail/LoadMonitor.cpp b/src/libxrpl/core/detail/LoadMonitor.cpp
index aea535fb81..95e0e7d3b9 100644
--- a/src/libxrpl/core/detail/LoadMonitor.cpp
+++ b/src/libxrpl/core/detail/LoadMonitor.cpp
@@ -28,11 +28,11 @@ LoadMonitor::Stats::Stats() : latencyAvg(0), latencyPeak(0)
 //------------------------------------------------------------------------------
 
 LoadMonitor::LoadMonitor(beast::Journal j)
-    : mLatencyMSAvg(0)
-    , mLatencyMSPeak(0)
-    , mTargetLatencyAvg(0)
-    , mTargetLatencyPk(0)
-    , mLastUpdate(UptimeClock::now())
+    : latencyMSAvg_(0)
+    , latencyMSPeak_(0)
+    , targetLatencyAvg_(0)
+    , targetLatencyPk_(0)
+    , lastUpdate_(UptimeClock::now())
     , j_(j)
 {
 }
@@ -48,18 +48,18 @@ LoadMonitor::update()
 {
     using namespace std::chrono_literals;
     auto now = UptimeClock::now();
-    if (now == mLastUpdate)  // current
+    if (now == lastUpdate_)  // current
         return;
 
     // VFALCO TODO Why 8?
-    if ((now < mLastUpdate) || (now > (mLastUpdate + 8s)))
+    if ((now < lastUpdate_) || (now > (lastUpdate_ + 8s)))
     {
         // way out of date
-        mCounts = 0;
-        mLatencyEvents = 0;
-        mLatencyMSAvg = 0ms;
-        mLatencyMSPeak = 0ms;
-        mLastUpdate = now;
+        counts_ = 0;
+        latencyEvents_ = 0;
+        latencyMSAvg_ = 0ms;
+        latencyMSPeak_ = 0ms;
+        lastUpdate_ = now;
         return;
     }
 
@@ -73,12 +73,12 @@ LoadMonitor::update()
     */
     do
     {
-        mLastUpdate += 1s;
-        mCounts -= ((mCounts + 3) / 4);
-        mLatencyEvents -= ((mLatencyEvents + 3) / 4);
-        mLatencyMSAvg -= (mLatencyMSAvg / 4);
-        mLatencyMSPeak -= (mLatencyMSPeak / 4);
-    } while (mLastUpdate < now);
+        lastUpdate_ += 1s;
+        counts_ -= ((counts_ + 3) / 4);
+        latencyEvents_ -= ((latencyEvents_ + 3) / 4);
+        latencyMSAvg_ -= (latencyMSAvg_ / 4);
+        latencyMSPeak_ -= (latencyMSPeak_ / 4);
+    } while (lastUpdate_ < now);
 }
 
 void
@@ -111,30 +111,30 @@ LoadMonitor::addSamples(int count, std::chrono::milliseconds latency)
     std::scoped_lock const sl(mutex_);
 
     update();
-    mCounts += count;
-    mLatencyEvents += count;
-    mLatencyMSAvg += latency;
-    mLatencyMSPeak += latency;
+    counts_ += count;
+    latencyEvents_ += count;
+    latencyMSAvg_ += latency;
+    latencyMSPeak_ += latency;
 
-    auto const latencyPeak = mLatencyEvents * latency * 4 / count;
+    auto const latencyPeak = latencyEvents_ * latency * 4 / count;
 
-    if (mLatencyMSPeak < latencyPeak)
-        mLatencyMSPeak = latencyPeak;
+    if (latencyMSPeak_ < latencyPeak)
+        latencyMSPeak_ = latencyPeak;
 }
 
 void
 LoadMonitor::setTargetLatency(std::chrono::milliseconds avg, std::chrono::milliseconds pk)
 {
-    mTargetLatencyAvg = avg;
-    mTargetLatencyPk = pk;
+    targetLatencyAvg_ = avg;
+    targetLatencyPk_ = pk;
 }
 
 bool
 LoadMonitor::isOverTarget(std::chrono::milliseconds avg, std::chrono::milliseconds peak)
 {
     using namespace std::chrono_literals;
-    return (mTargetLatencyPk > 0ms && (peak > mTargetLatencyPk)) ||
-        (mTargetLatencyAvg > 0ms && (avg > mTargetLatencyAvg));
+    return (targetLatencyPk_ > 0ms && (peak > targetLatencyPk_)) ||
+        (targetLatencyAvg_ > 0ms && (avg > targetLatencyAvg_));
 }
 
 bool
@@ -144,11 +144,11 @@ LoadMonitor::isOver()
 
     update();
 
-    if (mLatencyEvents == 0)
+    if (latencyEvents_ == 0)
         return false;
 
     return isOverTarget(
-        mLatencyMSAvg / (mLatencyEvents * 4), mLatencyMSPeak / (mLatencyEvents * 4));
+        latencyMSAvg_ / (latencyEvents_ * 4), latencyMSPeak_ / (latencyEvents_ * 4));
 }
 
 LoadMonitor::Stats
@@ -161,17 +161,17 @@ LoadMonitor::getStats()
 
     update();
 
-    stats.count = mCounts / 4;
+    stats.count = counts_ / 4;
 
-    if (mLatencyEvents == 0)
+    if (latencyEvents_ == 0)
     {
         stats.latencyAvg = 0ms;
         stats.latencyPeak = 0ms;
     }
     else
     {
-        stats.latencyAvg = mLatencyMSAvg / (mLatencyEvents * 4);
-        stats.latencyPeak = mLatencyMSPeak / (mLatencyEvents * 4);
+        stats.latencyAvg = latencyMSAvg_ / (latencyEvents_ * 4);
+        stats.latencyPeak = latencyMSPeak_ / (latencyEvents_ * 4);
     }
 
     stats.isOverloaded = isOverTarget(stats.latencyAvg, stats.latencyPeak);
diff --git a/src/libxrpl/core/detail/Workers.cpp b/src/libxrpl/core/detail/Workers.cpp
index a6f8885a86..991c51b77a 100644
--- a/src/libxrpl/core/detail/Workers.cpp
+++ b/src/libxrpl/core/detail/Workers.cpp
@@ -15,13 +15,13 @@ Workers::Workers(
     perf::PerfLog* perfLog,
     std::string threadNames,
     int numberOfThreads)
-    : m_callback(callback)
+    : callback_(callback)
     , perfLog_(perfLog)
-    , m_threadNames(std::move(threadNames))
-    , m_semaphore(0)
-    , m_activeCount(0)
-    , m_pauseCount(0)
-    , m_runningTaskCount(0)
+    , threadNames_(std::move(threadNames))
+    , semaphore_(0)
+    , activeCount_(0)
+    , pauseCount_(0)
+    , runningTaskCount_(0)
 {
     setNumberOfThreads(numberOfThreads);
 }
@@ -30,13 +30,13 @@ Workers::~Workers()
 {
     stop();
 
-    deleteWorkers(m_everyone);
+    deleteWorkers(everyone_);
 }
 
 int
 Workers::getNumberOfThreads() const noexcept
 {
-    return m_numberOfThreads;
+    return numberOfThreads_;
 }
 
 // VFALCO NOTE if this function is called quickly to reduce then
@@ -46,22 +46,22 @@ Workers::getNumberOfThreads() const noexcept
 void
 Workers::setNumberOfThreads(int numberOfThreads)
 {
-    static int instance{0};
-    if (m_numberOfThreads == numberOfThreads)
+    static int kINSTANCE{0};
+    if (numberOfThreads_ == numberOfThreads)
         return;
 
     if (perfLog_ != nullptr)
         perfLog_->resizeJobs(numberOfThreads);
 
-    if (numberOfThreads > m_numberOfThreads)
+    if (numberOfThreads > numberOfThreads_)
     {
         // Increasing the number of working threads
-        int const amount = numberOfThreads - m_numberOfThreads;
+        int const amount = numberOfThreads - numberOfThreads_;
 
         for (int i = 0; i < amount; ++i)
         {
             // See if we can reuse a paused worker
-            Worker* worker = m_paused.pop_front();
+            Worker* worker = paused_.popFront();
 
             if (worker != nullptr)
             {
@@ -72,26 +72,26 @@ Workers::setNumberOfThreads(int numberOfThreads)
             }
             else
             {
-                worker = new Worker(*this, m_threadNames, instance++);
-                m_everyone.push_front(worker);
+                worker = new Worker(*this, threadNames_, kINSTANCE++);
+                everyone_.pushFront(worker);
             }
         }
     }
     else
     {
         // Decreasing the number of working threads
-        int const amount = m_numberOfThreads - numberOfThreads;
+        int const amount = numberOfThreads_ - numberOfThreads;
 
         for (int i = 0; i < amount; ++i)
         {
-            ++m_pauseCount;
+            ++pauseCount_;
 
             // Pausing a thread counts as one "internal task"
-            m_semaphore.notify();
+            semaphore_.notify();
         }
     }
 
-    m_numberOfThreads = numberOfThreads;
+    numberOfThreads_ = numberOfThreads;
 }
 
 void
@@ -100,24 +100,24 @@ Workers::stop()
     setNumberOfThreads(0);
 
     // Wait until all workers have paused AND no tasks are actively running.
-    // Both conditions are needed because m_allPaused (mutex-protected) and
-    // m_runningTaskCount (atomic) are not synchronized under the same lock,
-    // so m_allPaused can momentarily be true while a task is still finishing.
-    std::unique_lock<std::mutex> lk{m_mut};
-    m_cv.wait(lk, [this] { return m_allPaused && numberOfCurrentlyRunningTasks() == 0; });
+    // Both conditions are needed because allPaused_ (mutex-protected) and
+    // runningTaskCount_ (atomic) are not synchronized under the same lock,
+    // so allPaused_ can momentarily be true while a task is still finishing.
+    std::unique_lock<std::mutex> lk{mut_};
+    cv_.wait(lk, [this] { return allPaused_ && numberOfCurrentlyRunningTasks() == 0; });
     lk.unlock();
 }
 
 void
 Workers::addTask()
 {
-    m_semaphore.notify();
+    semaphore_.notify();
 }
 
 int
 Workers::numberOfCurrentlyRunningTasks() const noexcept
 {
-    return m_runningTaskCount.load();
+    return runningTaskCount_.load();
 }
 
 void
@@ -125,7 +125,7 @@ Workers::deleteWorkers(beast::LockFreeStack<Worker>& stack)
 {
     for (;;)
     {
-        Worker const* const worker = stack.pop_front();
+        Worker const* const worker = stack.popFront();
 
         if (worker != nullptr)
         {
@@ -142,7 +142,7 @@ Workers::deleteWorkers(beast::LockFreeStack<Worker>& stack)
 //------------------------------------------------------------------------------
 
 Workers::Worker::Worker(Workers& workers, std::string threadName, int const instance)
-    : m_workers{workers}, threadName_{std::move(threadName)}, instance_{instance}
+    : workers_{workers}, threadName_{std::move(threadName)}, instance_{instance}
 
 {
     thread_ = std::thread{&Workers::Worker::run, this};
@@ -177,10 +177,10 @@ Workers::Worker::run()
         // Increment the count of active workers, and if
         // we are the first one then reset the "all paused" event
         //
-        if (++m_workers.m_activeCount == 1)
+        if (++workers_.activeCount_ == 1)
         {
-            std::scoped_lock const lk{m_workers.m_mut};
-            m_workers.m_allPaused = false;
+            std::scoped_lock const lk{workers_.mut_};
+            workers_.allPaused_ = false;
         }
 
         for (;;)
@@ -190,17 +190,17 @@ Workers::Worker::run()
 
             // Acquire a task or "internal task."
             //
-            m_workers.m_semaphore.wait();
+            workers_.semaphore_.wait();
 
             // See if there's a pause request. This
             // counts as an "internal task."
             //
-            int pauseCount = m_workers.m_pauseCount.load();
+            int pauseCount = workers_.pauseCount_.load();
 
             if (pauseCount > 0)
             {
                 // Try to decrement
-                pauseCount = --m_workers.m_pauseCount;
+                pauseCount = --workers_.pauseCount_;
 
                 if (pauseCount >= 0)
                 {
@@ -209,25 +209,25 @@ Workers::Worker::run()
                 }
 
                 // Undo our decrement
-                ++m_workers.m_pauseCount;
+                ++workers_.pauseCount_;
             }
 
             // We couldn't pause so we must have gotten
             // unblocked in order to process a task.
             //
-            ++m_workers.m_runningTaskCount;
-            m_workers.m_callback.processTask(instance_);
+            ++workers_.runningTaskCount_;
+            workers_.callback_.processTask(instance_);
 
             // When the running task count drops to zero, wake stop() which
-            // may be waiting for both m_allPaused and zero running tasks.
-            // Locking m_mut before notify_all() prevents a lost wakeup:
+            // may be waiting for both allPaused_ and zero running tasks.
+            // Locking mut_ before notify_all() prevents a lost wakeup:
             // it serializes against the predicate check inside stop()'s
-            // cv.wait(), ensuring the notification is not missed between
+            // cv_.wait(), ensuring the notification is not missed between
             // the predicate evaluation and the actual sleep.
-            if (--m_workers.m_runningTaskCount == 0)
+            if (--workers_.runningTaskCount_ == 0)
             {
-                std::scoped_lock const lk{m_workers.m_mut};
-                m_workers.m_cv.notify_all();
+                std::scoped_lock const lk{workers_.mut_};
+                workers_.cv_.notify_all();
             }
         }
 
@@ -235,16 +235,16 @@ Workers::Worker::run()
         // guarantee that it will eventually block on its
         // event object.
         //
-        m_workers.m_paused.push_front(this);
+        workers_.paused_.pushFront(this);
 
         // Decrement the count of active workers, and if we
         // are the last one then signal the "all paused" event.
         //
-        if (--m_workers.m_activeCount == 0)
+        if (--workers_.activeCount_ == 0)
         {
-            std::scoped_lock const lk{m_workers.m_mut};
-            m_workers.m_allPaused = true;
-            m_workers.m_cv.notify_all();
+            std::scoped_lock const lk{workers_.mut_};
+            workers_.allPaused_ = true;
+            workers_.cv_.notify_all();
         }
 
         // Set inactive thread name.
diff --git a/src/libxrpl/crypto/RFC1751.cpp b/src/libxrpl/crypto/RFC1751.cpp
index 8ea4e7007c..30f2c3a5b8 100644
--- a/src/libxrpl/crypto/RFC1751.cpp
+++ b/src/libxrpl/crypto/RFC1751.cpp
@@ -21,7 +21,7 @@ namespace xrpl {
 // RFC 1751 code converted to C++/Boost.
 //
 
-char const* RFC1751::s_dictionary[2048] = {
+char const* RFC1751::dictionary[2048] = {
     "A",    "ABE",  "ACE",  "ACT",  "AD",   "ADA",  "ADD",  "AGO",  "AID",  "AIM",  "AIR",  "ALL",
     "ALP",  "AM",   "AMY",  "AN",   "ANA",  "AND",  "ANN",  "ANT",  "ANY",  "APE",  "APS",  "APT",
     "ARC",  "ARE",  "ARK",  "ARM",  "ART",  "AS",   "ASH",  "ASK",  "AT",   "ATE",  "AUG",  "AUK",
@@ -237,10 +237,10 @@ RFC1751::btoe(std::string& strHuman, std::string const& strData)
 
     caBuffer[8] = char(p) << 6;
 
-    strHuman = std::string() + s_dictionary[extract(caBuffer, 0, 11)] + " " +
-        s_dictionary[extract(caBuffer, 11, 11)] + " " + s_dictionary[extract(caBuffer, 22, 11)] +
-        " " + s_dictionary[extract(caBuffer, 33, 11)] + " " +
-        s_dictionary[extract(caBuffer, 44, 11)] + " " + s_dictionary[extract(caBuffer, 55, 11)];
+    strHuman = std::string() + dictionary[extract(caBuffer, 0, 11)] + " " +
+        dictionary[extract(caBuffer, 11, 11)] + " " + dictionary[extract(caBuffer, 22, 11)] + " " +
+        dictionary[extract(caBuffer, 33, 11)] + " " + dictionary[extract(caBuffer, 44, 11)] + " " +
+        dictionary[extract(caBuffer, 55, 11)];
 }
 
 void
@@ -314,7 +314,7 @@ RFC1751::wsrch(std::string const& strWord, int iMin, int iMax)
     {
         // Have a range to search.
         int const iMid = iMin + ((iMax - iMin) / 2);
-        int const iDir = strWord.compare(s_dictionary[iMid]);
+        int const iDir = strWord.compare(dictionary[iMid]);
 
         if (iDir == 0)
         {
@@ -447,7 +447,7 @@ RFC1751::getWordFromBlob(void const* blob, size_t bytes)
     hash ^= (hash >> 11);
     hash += (hash << 15);
 
-    return s_dictionary[hash % (sizeof(s_dictionary) / sizeof(s_dictionary[0]))];
+    return dictionary[hash % (sizeof(dictionary) / sizeof(dictionary[0]))];
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/crypto/csprng.cpp b/src/libxrpl/crypto/csprng.cpp
index 7aef9b2831..897432fcf1 100644
--- a/src/libxrpl/crypto/csprng.cpp
+++ b/src/libxrpl/crypto/csprng.cpp
@@ -13,14 +13,14 @@
 
 namespace xrpl {
 
-csprng_engine::csprng_engine()
+CsprngEngine::CsprngEngine()
 {
     // This is not strictly necessary
     if (RAND_poll() != 1)
         Throw<std::runtime_error>("CSPRNG: Initial polling failed");
 }
 
-csprng_engine::~csprng_engine()
+CsprngEngine::~CsprngEngine()
 {
     // This cleanup function is not needed in newer versions of OpenSSL
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L)
@@ -29,7 +29,7 @@ csprng_engine::~csprng_engine()
 }
 
 void
-csprng_engine::mix_entropy(void* buffer, std::size_t count)
+CsprngEngine::mixEntropy(void* buffer, std::size_t count)
 {
     std::array<std::random_device::result_type, 128> entropy{};
 
@@ -54,7 +54,7 @@ csprng_engine::mix_entropy(void* buffer, std::size_t count)
 }
 
 void
-csprng_engine::operator()(void* ptr, std::size_t count)
+CsprngEngine::operator()(void* ptr, std::size_t count)
 {
     // RAND_bytes is thread-safe on OpenSSL 1.1.0 and later when compiled
     // with thread support, so we don't need to grab a mutex.
@@ -69,19 +69,19 @@ csprng_engine::operator()(void* ptr, std::size_t count)
         Throw<std::runtime_error>("CSPRNG: Insufficient entropy");
 }
 
-csprng_engine::result_type
-csprng_engine::operator()()
+CsprngEngine::result_type
+CsprngEngine::operator()()
 {
     result_type ret = 0;
     (*this)(&ret, sizeof(result_type));
     return ret;
 }
 
-csprng_engine&
-crypto_prng()
+CsprngEngine&
+cryptoPrng()
 {
-    static csprng_engine engine;
-    return engine;
+    static CsprngEngine kENGINE;
+    return kENGINE;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/crypto/secure_erase.cpp b/src/libxrpl/crypto/secure_erase.cpp
index 5b65b342ec..2b24da7548 100644
--- a/src/libxrpl/crypto/secure_erase.cpp
+++ b/src/libxrpl/crypto/secure_erase.cpp
@@ -7,7 +7,7 @@
 namespace xrpl {
 
 void
-secure_erase(void* dest, std::size_t bytes)
+secureErase(void* dest, std::size_t bytes)
 {
     OPENSSL_cleanse(dest, bytes);
 }
diff --git a/src/libxrpl/json/JsonPropertyStream.cpp b/src/libxrpl/json/JsonPropertyStream.cpp
index ab94223956..b6a151d702 100644
--- a/src/libxrpl/json/JsonPropertyStream.cpp
+++ b/src/libxrpl/json/JsonPropertyStream.cpp
@@ -6,160 +6,160 @@
 
 namespace xrpl {
 
-JsonPropertyStream::JsonPropertyStream() : m_top(Json::objectValue)
+JsonPropertyStream::JsonPropertyStream() : topValue(json::ObjectValue)
 {
-    m_stack.reserve(64);
-    m_stack.push_back(&m_top);
+    stack.reserve(64);
+    stack.push_back(&topValue);
 }
 
-Json::Value const&
+json::Value const&
 JsonPropertyStream::top() const
 {
-    return m_top;
+    return topValue;
 }
 
 void
-JsonPropertyStream::map_begin()
+JsonPropertyStream::mapBegin()
 {
     // top is array
-    Json::Value& top(*m_stack.back());
-    Json::Value& map(top.append(Json::objectValue));
-    m_stack.push_back(&map);
+    json::Value& top(*stack.back());
+    json::Value& map(top.append(json::ObjectValue));
+    stack.push_back(&map);
 }
 
 void
-JsonPropertyStream::map_begin(std::string const& key)
+JsonPropertyStream::mapBegin(std::string const& key)
 {
     // top is a map
-    Json::Value& top(*m_stack.back());
-    Json::Value& map(top[key] = Json::objectValue);
-    m_stack.push_back(&map);
+    json::Value& top(*stack.back());
+    json::Value& map(top[key] = json::ObjectValue);
+    stack.push_back(&map);
 }
 
 void
-JsonPropertyStream::map_end()
+JsonPropertyStream::mapEnd()
 {
-    m_stack.pop_back();
+    stack.pop_back();
 }
 
 void
 JsonPropertyStream::add(std::string const& key, short v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, unsigned short v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, int v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, unsigned int v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, long v)
 {
-    (*m_stack.back())[key] = int(v);
+    (*stack.back())[key] = int(v);
 }
 
 void
 JsonPropertyStream::add(std::string const& key, float v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, double v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
 JsonPropertyStream::add(std::string const& key, std::string const& v)
 {
-    (*m_stack.back())[key] = v;
+    (*stack.back())[key] = v;
 }
 
 void
-JsonPropertyStream::array_begin()
+JsonPropertyStream::arrayBegin()
 {
     // top is array
-    Json::Value& top(*m_stack.back());
-    Json::Value& vec(top.append(Json::arrayValue));
-    m_stack.push_back(&vec);
+    json::Value& top(*stack.back());
+    json::Value& vec(top.append(json::ArrayValue));
+    stack.push_back(&vec);
 }
 
 void
-JsonPropertyStream::array_begin(std::string const& key)
+JsonPropertyStream::arrayBegin(std::string const& key)
 {
     // top is a map
-    Json::Value& top(*m_stack.back());
-    Json::Value& vec(top[key] = Json::arrayValue);
-    m_stack.push_back(&vec);
+    json::Value& top(*stack.back());
+    json::Value& vec(top[key] = json::ArrayValue);
+    stack.push_back(&vec);
 }
 
 void
-JsonPropertyStream::array_end()
+JsonPropertyStream::arrayEnd()
 {
-    m_stack.pop_back();
+    stack.pop_back();
 }
 
 void
 JsonPropertyStream::add(short v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(unsigned short v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(int v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(unsigned int v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(long v)
 {
-    m_stack.back()->append(int(v));
+    stack.back()->append(int(v));
 }
 
 void
 JsonPropertyStream::add(float v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(double v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 void
 JsonPropertyStream::add(std::string const& v)
 {
-    m_stack.back()->append(v);
+    stack.back()->append(v);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/json/Output.cpp b/src/libxrpl/json/Output.cpp
index 31d74db7e0..14b6617b2f 100644
--- a/src/libxrpl/json/Output.cpp
+++ b/src/libxrpl/json/Output.cpp
@@ -5,47 +5,47 @@
 
 #include <string>
 
-namespace Json {
+namespace json {
 
 namespace {
 
 void
-outputJson(Json::Value const& value, Writer& writer)
+outputJson(json::Value const& value, Writer& writer)
 {
     switch (value.type())
     {
-        case Json::nullValue: {
+        case json::NullValue: {
             writer.output(nullptr);
             break;
         }
 
-        case Json::intValue: {
+        case json::IntValue: {
             writer.output(value.asInt());
             break;
         }
 
-        case Json::uintValue: {
+        case json::UintValue: {
             writer.output(value.asUInt());
             break;
         }
 
-        case Json::realValue: {
+        case json::RealValue: {
             writer.output(value.asDouble());
             break;
         }
 
-        case Json::stringValue: {
+        case json::StringValue: {
             writer.output(value.asString());
             break;
         }
 
-        case Json::booleanValue: {
+        case json::BooleanValue: {
             writer.output(value.asBool());
             break;
         }
 
-        case Json::arrayValue: {
-            writer.startRoot(Writer::CollectionType::array);
+        case json::ArrayValue: {
+            writer.startRoot(Writer::CollectionType::Array);
             for (auto const& i : value)
             {
                 writer.rawAppend();
@@ -55,8 +55,8 @@ outputJson(Json::Value const& value, Writer& writer)
             break;
         }
 
-        case Json::objectValue: {
-            writer.startRoot(Writer::CollectionType::object);
+        case json::ObjectValue: {
+            writer.startRoot(Writer::CollectionType::Object);
             auto members = value.getMemberNames();
             for (auto const& tag : members)
             {
@@ -72,14 +72,14 @@ outputJson(Json::Value const& value, Writer& writer)
 }  // namespace
 
 void
-outputJson(Json::Value const& value, Output const& out)
+outputJson(json::Value const& value, Output const& out)
 {
     Writer writer(out);
     outputJson(value, writer);
 }
 
 std::string
-jsonAsString(Json::Value const& value)
+jsonAsString(json::Value const& value)
 {
     std::string s;
     Writer writer(stringOutput(s));
@@ -87,4 +87,4 @@ jsonAsString(Json::Value const& value)
     return s;
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/Writer.cpp b/src/libxrpl/json/Writer.cpp
index 188f0749f0..518573ded4 100644
--- a/src/libxrpl/json/Writer.cpp
+++ b/src/libxrpl/json/Writer.cpp
@@ -12,11 +12,11 @@
 #include <utility>
 #include <vector>
 
-namespace Json {
+namespace json {
 
 namespace {
 
-std::map<char, char const*> jsonSpecialCharacterEscape = {
+std::map<char, char const*> gJsonSpecialCharacterEscape = {
     {'"', "\\\""},
     {'\\', "\\\\"},
     {'/', "\\/"},
@@ -26,18 +26,18 @@ std::map<char, char const*> jsonSpecialCharacterEscape = {
     {'\r', "\\r"},
     {'\t', "\\t"}};
 
-size_t const jsonEscapeLength = 2;
+size_t const kJSON_ESCAPE_LENGTH = 2;
 
 // All other JSON punctuation.
-char const closeBrace = '}';
-char const closeBracket = ']';
-char const colon = ':';
-char const comma = ',';
-char const openBrace = '{';
-char const openBracket = '[';
-char const quote = '"';
+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 = '"';
 
-auto const integralFloatsBecomeInts = false;
+auto const kINTEGRAL_FLOATS_BECOME_INTS = false;
 
 size_t
 lengthWithoutTrailingZeros(std::string const& s)
@@ -52,7 +52,7 @@ lengthWithoutTrailingZeros(std::string const& s)
     if (hasDecimals)
         return lastNonZero + 1;
 
-    if (integralFloatsBecomeInts || lastNonZero + 2 > s.size())
+    if (kINTEGRAL_FLOATS_BECOME_INTS || lastNonZero + 2 > s.size())
         return lastNonZero;
 
     return lastNonZero + 2;
@@ -81,7 +81,7 @@ public:
     void
     start(CollectionType ct)
     {
-        char const ch = (ct == CollectionType::array) ? openBracket : openBrace;
+        char const ch = (ct == CollectionType::Array) ? kOPEN_BRACKET : kOPEN_BRACE;
         output({&ch, 1});
         stack_.emplace(Collection{.type = ct});
     }
@@ -99,24 +99,24 @@ public:
         markStarted();
         std::size_t position = 0, writtenUntil = 0;
 
-        output_({&quote, 1});
+        output_({&kQUOTE, 1});
         auto data = bytes.data();
         for (; position < bytes.size(); ++position)
         {
-            auto i = jsonSpecialCharacterEscape.find(data[position]);
-            if (i != jsonSpecialCharacterEscape.end())
+            auto i = gJsonSpecialCharacterEscape.find(data[position]);
+            if (i != gJsonSpecialCharacterEscape.end())
             {
                 if (writtenUntil < position)
                 {
                     output_({data + writtenUntil, position - writtenUntil});
                 }
-                output_({i->second, jsonEscapeLength});
+                output_({i->second, kJSON_ESCAPE_LENGTH});
                 writtenUntil = position + 1;
             };
         }
         if (writtenUntil < position)
             output_({data + writtenUntil, position - writtenUntil});
-        output_({&quote, 1});
+        output_({&kQUOTE, 1});
     }
 
     void
@@ -136,7 +136,7 @@ public:
         {
             check(
                 false,
-                "Not an " + ((type == CollectionType::array ? "array: " : "object: ") + message));
+                "Not an " + ((type == CollectionType::Array ? "array: " : "object: ") + message));
         }
         if (stack_.top().isFirst)
         {
@@ -144,7 +144,7 @@ public:
         }
         else
         {
-            output_({&comma, 1});
+            output_({&kCOMMA, 1});
         }
     }
 
@@ -159,7 +159,7 @@ public:
 #endif
 
         stringOutput(tag);
-        output_({&colon, 1});
+        output_({&kCOLON, 1});
     }
 
     [[nodiscard]] bool
@@ -173,8 +173,8 @@ public:
     {
         check(!empty(), "Empty stack in finish()");
 
-        auto isArray = stack_.top().type == CollectionType::array;
-        auto ch = isArray ? closeBracket : closeBrace;
+        auto isArray = stack_.top().type == CollectionType::Array;
+        auto ch = isArray ? kCLOSE_BRACKET : kCLOSE_BRACE;
         output_({&ch, 1});
         stack_.pop();
     }
@@ -200,7 +200,7 @@ private:
     struct Collection
     {
         /** What type of collection are we in? */
-        Writer::CollectionType type = Writer::CollectionType::array;
+        Writer::CollectionType type = Writer::CollectionType::Array;
 
         /** Is this the first entry in a collection?
          *  If false, we have to emit a , before we write the next entry. */
@@ -255,7 +255,7 @@ Writer::output(std::string const& s)
 }
 
 void
-Writer::output(Json::Value const& value)
+Writer::output(json::Value const& value)
 {
     impl_->markStarted();
     outputJson(value, impl_->getOutput());
@@ -303,7 +303,7 @@ Writer::finishAll()
 void
 Writer::rawAppend()
 {
-    impl_->nextCollectionEntry(CollectionType::array, "append");
+    impl_->nextCollectionEntry(CollectionType::Array, "append");
 }
 
 void
@@ -311,7 +311,7 @@ Writer::rawSet(std::string const& tag)
 {
     check(!tag.empty(), "Tag can't be empty");
 
-    impl_->nextCollectionEntry(CollectionType::object, "set");
+    impl_->nextCollectionEntry(CollectionType::Object, "set");
     impl_->writeObjectTag(tag);
 }
 
@@ -324,14 +324,14 @@ Writer::startRoot(CollectionType type)
 void
 Writer::startAppend(CollectionType type)
 {
-    impl_->nextCollectionEntry(CollectionType::array, "startAppend");
+    impl_->nextCollectionEntry(CollectionType::Array, "startAppend");
     impl_->start(type);
 }
 
 void
 Writer::startSet(CollectionType type, std::string const& key)
 {
-    impl_->nextCollectionEntry(CollectionType::object, "startSet");
+    impl_->nextCollectionEntry(CollectionType::Object, "startSet");
     impl_->writeObjectTag(key);
     impl_->start(type);
 }
@@ -343,4 +343,4 @@ Writer::finish()
         impl_->finish();
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/json_reader.cpp b/src/libxrpl/json/json_reader.cpp
index 1bb157afc3..6574789e7b 100644
--- a/src/libxrpl/json/json_reader.cpp
+++ b/src/libxrpl/json/json_reader.cpp
@@ -12,7 +12,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace Json {
+namespace json {
 // Implementation of class Reader
 // ////////////////////////////////
 
@@ -102,9 +102,9 @@ Reader::parse(char const* beginDoc, char const* endDoc, Value& root)
     {
         // Set error location to start of doc, ideally should be first token
         // found in doc
-        token.type_ = tokenError;
-        token.start_ = beginDoc;
-        token.end_ = endDoc;
+        token.type = TokenError;
+        token.start = beginDoc;
+        token.end = endDoc;
         addError("A valid JSON document must be either an array or an object value.", token);
         return false;
     }
@@ -117,41 +117,41 @@ Reader::readValue(unsigned depth)
 {
     Token token{};
     skipCommentTokens(token);
-    if (depth > nest_limit)
+    if (depth > kNEST_LIMIT)
         return addError("Syntax error: maximum nesting depth exceeded", token);
     bool successful = true;
 
-    switch (token.type_)
+    switch (token.type)
     {
-        case tokenObjectBegin:
+        case TokenObjectBegin:
             successful = readObject(token, depth);
             break;
 
-        case tokenArrayBegin:
+        case TokenArrayBegin:
             successful = readArray(token, depth);
             break;
 
-        case tokenInteger:
+        case TokenInteger:
             successful = decodeNumber(token);
             break;
 
-        case tokenDouble:
+        case TokenDouble:
             successful = decodeDouble(token);
             break;
 
-        case tokenString:
+        case TokenString:
             successful = decodeString(token);
             break;
 
-        case tokenTrue:
+        case TokenTrue:
             currentValue() = true;
             break;
 
-        case tokenFalse:
+        case TokenFalse:
             currentValue() = false;
             break;
 
-        case tokenNull:
+        case TokenNull:
             currentValue() = Value();
             break;
 
@@ -168,7 +168,7 @@ Reader::skipCommentTokens(Token& token)
     do
     {
         readToken(token);
-    } while (token.type_ == tokenComment);
+    } while (token.type == TokenComment);
 }
 
 bool
@@ -176,7 +176,7 @@ Reader::expectToken(TokenType type, Token& token, char const* message)
 {
     readToken(token);
 
-    if (token.type_ != type)
+    if (token.type != type)
         return addError(message, token);
 
     return true;
@@ -186,35 +186,35 @@ bool
 Reader::readToken(Token& token)
 {
     skipSpaces();
-    token.start_ = current_;
+    token.start = current_;
     Char const c = getNextChar();
     bool ok = true;
 
     switch (c)
     {
         case '{':
-            token.type_ = tokenObjectBegin;
+            token.type = TokenObjectBegin;
             break;
 
         case '}':
-            token.type_ = tokenObjectEnd;
+            token.type = TokenObjectEnd;
             break;
 
         case '[':
-            token.type_ = tokenArrayBegin;
+            token.type = TokenArrayBegin;
             break;
 
         case ']':
-            token.type_ = tokenArrayEnd;
+            token.type = TokenArrayEnd;
             break;
 
         case '"':
-            token.type_ = tokenString;
+            token.type = TokenString;
             ok = readString();
             break;
 
         case '/':
-            token.type_ = tokenComment;
+            token.type = TokenComment;
             ok = readComment();
             break;
 
@@ -229,34 +229,34 @@ Reader::readToken(Token& token)
         case '8':
         case '9':
         case '-':
-            token.type_ = readNumber();
+            token.type = readNumber();
             break;
 
         case 't':
-            token.type_ = tokenTrue;
+            token.type = TokenTrue;
             ok = match("rue", 3);
             break;
 
         case 'f':
-            token.type_ = tokenFalse;
+            token.type = TokenFalse;
             ok = match("alse", 4);  // cspell:disable-line
             break;
 
         case 'n':
-            token.type_ = tokenNull;
+            token.type = TokenNull;
             ok = match("ull", 3);
             break;
 
         case ',':
-            token.type_ = tokenArraySeparator;
+            token.type = TokenArraySeparator;
             break;
 
         case ':':
-            token.type_ = tokenMemberSeparator;
+            token.type = TokenMemberSeparator;
             break;
 
         case 0:
-            token.type_ = tokenEndOfStream;
+            token.type = TokenEndOfStream;
             break;
 
         default:
@@ -265,9 +265,9 @@ Reader::readToken(Token& token)
     }
 
     if (!ok)
-        token.type_ = tokenError;
+        token.type = TokenError;
 
-    token.end_ = current_;
+    token.end = current_;
     return true;
 }
 
@@ -352,9 +352,9 @@ Reader::readCppStyleComment()
 Reader::TokenType
 Reader::readNumber()
 {
-    static char const extended_tokens[] = {'.', 'e', 'E', '+', '-'};
+    static char const kEXTENDED_TOKENS[] = {'.', 'e', 'E', '+', '-'};
 
-    TokenType type = tokenInteger;
+    TokenType type = TokenInteger;
 
     if (current_ != end_)
     {
@@ -365,12 +365,12 @@ Reader::readNumber()
         {
             if (std::isdigit(static_cast<unsigned char>(*current_)) == 0)
             {
-                auto ret = std::ranges::find(extended_tokens, *current_);
+                auto ret = std::ranges::find(kEXTENDED_TOKENS, *current_);
 
-                if (ret == std::end(extended_tokens))
+                if (ret == std::end(kEXTENDED_TOKENS))
                     break;
 
-                type = tokenDouble;
+                type = TokenDouble;
             }
 
             ++current_;
@@ -407,35 +407,35 @@ Reader::readObject(Token& tokenStart, unsigned depth)
 {
     Token tokenName{};
     std::string name;
-    currentValue() = Value(objectValue);
+    currentValue() = Value(ObjectValue);
 
     while (readToken(tokenName))
     {
         bool initialTokenOk = true;
 
-        while (tokenName.type_ == tokenComment && initialTokenOk)
+        while (tokenName.type == TokenComment && initialTokenOk)
             initialTokenOk = readToken(tokenName);
 
         if (!initialTokenOk)
             break;
 
-        if (tokenName.type_ == tokenObjectEnd && name.empty())  // empty object
+        if (tokenName.type == TokenObjectEnd && name.empty())  // empty object
             return true;
 
-        if (tokenName.type_ != tokenString)
+        if (tokenName.type != TokenString)
             break;
 
         name = "";
 
         if (!decodeString(tokenName, name))
-            return recoverFromError(tokenObjectEnd);
+            return recoverFromError(TokenObjectEnd);
 
         Token colon{};
 
-        if (!readToken(colon) || colon.type_ != tokenMemberSeparator)
+        if (!readToken(colon) || colon.type != TokenMemberSeparator)
         {
             return addErrorAndRecover(
-                "Missing ':' after object member name", colon, tokenObjectEnd);
+                "Missing ':' after object member name", colon, TokenObjectEnd);
         }
 
         // Reject duplicate names
@@ -448,34 +448,34 @@ Reader::readObject(Token& tokenStart, unsigned depth)
         nodes_.pop();
 
         if (!ok)  // error already set
-            return recoverFromError(tokenObjectEnd);
+            return recoverFromError(TokenObjectEnd);
 
         Token comma{};
 
         if (!readToken(comma) ||
-            (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator &&
-             comma.type_ != tokenComment))
+            (comma.type != TokenObjectEnd && comma.type != TokenArraySeparator &&
+             comma.type != TokenComment))
         {
             return addErrorAndRecover(
-                "Missing ',' or '}' in object declaration", comma, tokenObjectEnd);
+                "Missing ',' or '}' in object declaration", comma, TokenObjectEnd);
         }
 
         bool finalizeTokenOk = true;
 
-        while (comma.type_ == tokenComment && finalizeTokenOk)
+        while (comma.type == TokenComment && finalizeTokenOk)
             finalizeTokenOk = readToken(comma);
 
-        if (comma.type_ == tokenObjectEnd)
+        if (comma.type == TokenObjectEnd)
             return true;
     }
 
-    return addErrorAndRecover("Missing '}' or object member name", tokenName, tokenObjectEnd);
+    return addErrorAndRecover("Missing '}' or object member name", tokenName, TokenObjectEnd);
 }
 
 bool
 Reader::readArray(Token& tokenStart, unsigned depth)
 {
-    currentValue() = Value(arrayValue);
+    currentValue() = Value(ArrayValue);
     skipSpaces();
 
     if (*current_ == ']')  // empty array
@@ -495,27 +495,27 @@ Reader::readArray(Token& tokenStart, unsigned depth)
         nodes_.pop();
 
         if (!ok)  // error already set
-            return recoverFromError(tokenArrayEnd);
+            return recoverFromError(TokenArrayEnd);
 
         Token token{};
         // Accept Comment after last item in the array.
         ok = readToken(token);
 
-        while (token.type_ == tokenComment && ok)
+        while (token.type == TokenComment && ok)
         {
             ok = readToken(token);
         }
 
         bool const badTokenType =
-            (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
+            (token.type != TokenArraySeparator && token.type != TokenArrayEnd);
 
         if (!ok || badTokenType)
         {
             return addErrorAndRecover(
-                "Missing ',' or ']' in array declaration", token, tokenArrayEnd);
+                "Missing ',' or ']' in array declaration", token, TokenArrayEnd);
         }
 
-        if (token.type_ == tokenArrayEnd)
+        if (token.type == TokenArrayEnd)
             break;
     }
 
@@ -525,16 +525,16 @@ Reader::readArray(Token& tokenStart, unsigned depth)
 bool
 Reader::decodeNumber(Token& token)
 {
-    Location current = token.start_;
+    Location current = token.start;
     bool const isNegative = *current == '-';
 
     if (isNegative)
         ++current;
 
-    if (current == token.end_)
+    if (current == token.end)
     {
         return addError(
-            "'" + std::string(token.start_, token.end_) + "' is not a valid number.", token);
+            "'" + std::string(token.start, token.end) + "' is not a valid number.", token);
     }
 
     // The existing Json integers are 32-bit so using a 64-bit value here avoids
@@ -542,37 +542,37 @@ Reader::decodeNumber(Token& token)
     std::int64_t value = 0;
 
     static_assert(
-        sizeof(value) > sizeof(Value::maxUInt),
+        sizeof(value) > sizeof(Value::kMAX_U_INT),
         "The JSON integer overflow logic will need to be reworked.");
 
-    while (current < token.end_ && (value <= Value::maxUInt))
+    while (current < token.end && (value <= Value::kMAX_U_INT))
     {
         Char const c = *current++;
 
         if (c < '0' || c > '9')
         {
             return addError(
-                "'" + std::string(token.start_, token.end_) + "' is not a number.", token);
+                "'" + std::string(token.start, token.end) + "' is not a number.", token);
         }
 
         value = (value * 10) + (c - '0');
     }
 
     // More tokens left -> input is larger than largest possible return value
-    if (current != token.end_)
+    if (current != token.end)
     {
         return addError(
-            "'" + std::string(token.start_, token.end_) + "' exceeds the allowable range.", token);
+            "'" + std::string(token.start, token.end) + "' exceeds the allowable range.", token);
     }
 
     if (isNegative)
     {
         value = -value;
 
-        if (value < Value::minInt || value > Value::maxInt)
+        if (value < Value::kMIN_INT || value > Value::kMAX_INT)
         {
             return addError(
-                "'" + std::string(token.start_, token.end_) + "' exceeds the allowable range.",
+                "'" + std::string(token.start, token.end) + "' exceeds the allowable range.",
                 token);
         }
 
@@ -580,15 +580,15 @@ Reader::decodeNumber(Token& token)
     }
     else
     {
-        if (value > Value::maxUInt)
+        if (value > Value::kMAX_U_INT)
         {
             return addError(
-                "'" + std::string(token.start_, token.end_) + "' exceeds the allowable range.",
+                "'" + std::string(token.start, token.end) + "' exceeds the allowable range.",
                 token);
         }
 
         // If it's representable as a signed integer, construct it as one.
-        if (value <= Value::maxInt)
+        if (value <= Value::kMAX_INT)
         {
             currentValue() = static_cast<Value::Int>(value);
         }
@@ -607,7 +607,7 @@ Reader::decodeDouble(Token& token)
     double value = 0;
     int const bufferSize = 32;
     int count = 0;
-    int const length = int(token.end_ - token.start_);
+    int const length = int(token.end - token.start);
     // Sanity check to avoid buffer overflow exploits.
     if (length < 0)
     {
@@ -622,17 +622,17 @@ Reader::decodeDouble(Token& token)
     if (length <= bufferSize)
     {
         Char buffer[bufferSize + 1];
-        memcpy(buffer, token.start_, length);
+        memcpy(buffer, token.start, length);
         buffer[length] = 0;
         count = sscanf(buffer, format, &value);
     }
     else
     {
-        std::string const buffer(token.start_, token.end_);
+        std::string const buffer(token.start, token.end);
         count = sscanf(buffer.c_str(), format, &value);
     }
     if (count != 1)
-        return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token);
+        return addError("'" + std::string(token.start, token.end) + "' is not a number.", token);
     currentValue() = value;
     return true;
 }
@@ -652,9 +652,9 @@ Reader::decodeString(Token& token)
 bool
 Reader::decodeString(Token& token, std::string& decoded)
 {
-    decoded.reserve(token.end_ - token.start_ - 2);
-    Location current = token.start_ + 1;  // skip '"'
-    Location end = token.end_ - 1;        // do not include '"'
+    decoded.reserve(token.end - token.start - 2);
+    Location current = token.start + 1;  // skip '"'
+    Location end = token.end - 1;        // do not include '"'
 
     while (current != end)
     {
@@ -816,9 +816,9 @@ bool
 Reader::addError(std::string const& message, Token& token, Location extra)
 {
     ErrorInfo info;
-    info.token_ = token;
-    info.message_ = message;
-    info.extra_ = extra;
+    info.token = token;
+    info.message = message;
+    info.extra = extra;
     errors_.push_back(info);
     return false;
 }
@@ -834,7 +834,7 @@ Reader::recoverFromError(TokenType skipUntilToken)
         if (!readToken(skip))
             errors_.resize(errorCount);  // discard errors caused by recovery
 
-        if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
+        if (skip.type == skipUntilToken || skip.type == TokenEndOfStream)
             break;
     }
 
@@ -911,11 +911,11 @@ Reader::getFormattedErrorMessages() const
     for (Errors::const_iterator itError = errors_.begin(); itError != errors_.end(); ++itError)
     {
         ErrorInfo const& error = *itError;
-        formattedMessage += "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
-        formattedMessage += "  " + error.message_ + "\n";
+        formattedMessage += "* " + getLocationLineAndColumn(error.token.start) + "\n";
+        formattedMessage += "  " + error.message + "\n";
 
-        if (error.extra_ != nullptr)
-            formattedMessage += "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
+        if (error.extra != nullptr)
+            formattedMessage += "See " + getLocationLineAndColumn(error.extra) + " for detail.\n";
     }
 
     return formattedMessage;
@@ -924,14 +924,14 @@ Reader::getFormattedErrorMessages() const
 std::istream&
 operator>>(std::istream& sin, Value& root)
 {
-    Json::Reader reader;
+    json::Reader reader;
     bool const ok = reader.parse(sin, root);
 
-    // XRPL_ASSERT(ok, "Json::operator>>() : parse succeeded");
+    // XRPL_ASSERT(ok, "json::operator>>() : parse succeeded");
     if (!ok)
         xrpl::Throw<std::runtime_error>(reader.getFormattedErrorMessages());
 
     return sin;
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/json_value.cpp b/src/libxrpl/json/json_value.cpp
index 61e0a0c7ee..e7dc4b067b 100644
--- a/src/libxrpl/json/json_value.cpp
+++ b/src/libxrpl/json/json_value.cpp
@@ -15,9 +15,9 @@
 #include <string>
 #include <utility>
 
-namespace Json {
+namespace json {
 
-Value const Value::null;
+Value const Value::kNULL;
 
 class DefaultValueAllocator : public ValueAllocator
 {
@@ -37,13 +37,13 @@ public:
     }
 
     char*
-    duplicateStringValue(char const* value, unsigned int length = unknown) override
+    duplicateStringValue(char const* value, unsigned int length = Unknown) override
     {
         //@todo investigate this old optimization
         // if ( !value  ||  value[0] == 0 )
         //   return 0;
 
-        if (length == unknown)
+        if (length == Unknown)
             length = (value != nullptr) ? (unsigned int)strlen(value) : 0;
 
         char* newString = static_cast<char*>(malloc(length + 1));
@@ -64,9 +64,8 @@ public:
 static ValueAllocator*&
 valueAllocator()
 {
-    // NOLINTNEXTLINE(misc-const-correctness)
-    static ValueAllocator* valueAllocator = new DefaultValueAllocator;
-    return valueAllocator;
+    static ValueAllocator* kVALUE_ALLOCATOR = new DefaultValueAllocator;  // NOLINT TODO
+    return kVALUE_ALLOCATOR;
 }
 
 static struct DummyValueAllocatorInitializer
@@ -76,7 +75,7 @@ static struct DummyValueAllocatorInitializer
         valueAllocator();  // ensure valueAllocator() statics are initialized
                            // before main().
     }
-} dummyValueAllocatorInitializer;
+} gDummyValueAllocatorInitializer;
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -94,26 +93,26 @@ Value::CZString::CZString(int index) : cstr_(0), index_(index)
 }
 
 Value::CZString::CZString(char const* cstr, DuplicationPolicy allocate)
-    : cstr_(allocate == duplicate ? valueAllocator()->makeMemberName(cstr) : cstr), index_(allocate)
+    : cstr_(allocate == Duplicate ? valueAllocator()->makeMemberName(cstr) : cstr), index_(allocate)
 {
 }
 
 Value::CZString::CZString(CZString const& other)
     : cstr_(
-          other.index_ != noDuplication && other.cstr_ != 0
+          other.index_ != NoDuplication && other.cstr_ != 0
               ? valueAllocator()->makeMemberName(other.cstr_)
               : other.cstr_)
     , index_([&]() -> int {
         if (!other.cstr_)
             return other.index_;
-        return other.index_ == noDuplication ? noDuplication : duplicate;
+        return other.index_ == NoDuplication ? NoDuplication : Duplicate;
     }())
 {
 }
 
 Value::CZString::~CZString()
 {
-    if ((cstr_ != nullptr) && index_ == duplicate)
+    if ((cstr_ != nullptr) && index_ == Duplicate)
         valueAllocator()->releaseMemberName(const_cast<char*>(cstr_));
 }
 
@@ -142,7 +141,7 @@ Value::CZString::index() const
 }
 
 char const*
-Value::CZString::c_str() const
+Value::CZString::cStr() const
 {
     return cstr_;
 }
@@ -150,7 +149,7 @@ Value::CZString::c_str() const
 bool
 Value::CZString::isStaticString() const
 {
-    return index_ == noDuplication;
+    return index_ == NoDuplication;
 }
 
 // //////////////////////////////////////////////////////////////////
@@ -169,113 +168,113 @@ Value::Value(ValueType type) : type_(type)
 {
     switch (type)
     {
-        case nullValue:
+        case NullValue:
             break;
 
-        case intValue:
-        case uintValue:
-            value_.int_ = 0;
+        case IntValue:
+        case UintValue:
+            value_.intVal = 0;
             break;
 
-        case realValue:
-            value_.real_ = 0.0;
+        case RealValue:
+            value_.realVal = 0.0;
             break;
 
-        case stringValue:
-            value_.string_ = 0;
+        case StringValue:
+            value_.stringVal = 0;
             break;
 
-        case arrayValue:
-        case objectValue:
-            value_.map_ = new ObjectValues();
+        case ArrayValue:
+        case ObjectValue:
+            value_.mapVal = new ObjectValues();
             break;
 
-        case booleanValue:
-            value_.bool_ = false;
+        case BooleanValue:
+            value_.boolVal = false;
             break;
 
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::Value(ValueType) : invalid type");
+            UNREACHABLE("json::Value::Value(ValueType) : invalid type");
             // LCOV_EXCL_STOP
     }
 }
 
-Value::Value(Int value) : type_(intValue)
+Value::Value(Int value) : type_(IntValue)
 {
-    value_.int_ = value;
+    value_.intVal = value;
 }
 
-Value::Value(UInt value) : type_(uintValue)
+Value::Value(UInt value) : type_(UintValue)
 {
-    value_.uint_ = value;
+    value_.uintVal = value;
 }
 
-Value::Value(double value) : type_(realValue)
+Value::Value(double value) : type_(RealValue)
 {
-    value_.real_ = value;
+    value_.realVal = value;
 }
 
-Value::Value(char const* value) : type_(stringValue), allocated_(true)
+Value::Value(char const* value) : type_(StringValue), allocated_(true)
 {
-    value_.string_ = valueAllocator()->duplicateStringValue(value);
+    value_.stringVal = valueAllocator()->duplicateStringValue(value);
 }
 
-Value::Value(xrpl::Number const& value) : type_(stringValue), allocated_(true)
+Value::Value(xrpl::Number const& value) : type_(StringValue), allocated_(true)
 {
     auto const tmp = to_string(value);
-    value_.string_ = valueAllocator()->duplicateStringValue(tmp.c_str(), tmp.length());
+    value_.stringVal = valueAllocator()->duplicateStringValue(tmp.c_str(), tmp.length());
 }
 
-Value::Value(std::string const& value) : type_(stringValue), allocated_(true)
+Value::Value(std::string const& value) : type_(StringValue), allocated_(true)
 {
-    value_.string_ =
+    value_.stringVal =
         valueAllocator()->duplicateStringValue(value.c_str(), (unsigned int)value.length());
 }
 
-Value::Value(StaticString const& value) : type_(stringValue)
+Value::Value(StaticString const& value) : type_(StringValue)
 {
-    value_.string_ = const_cast<char*>(value.c_str());
+    value_.stringVal = const_cast<char*>(value.cStr());
 }
 
-Value::Value(bool value) : type_(booleanValue)
+Value::Value(bool value) : type_(BooleanValue)
 {
-    value_.bool_ = value;
+    value_.boolVal = value;
 }
 
 Value::Value(Value const& other) : type_(other.type_)
 {
     switch (type_)
     {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
+        case NullValue:
+        case IntValue:
+        case UintValue:
+        case RealValue:
+        case BooleanValue:
             value_ = other.value_;
             break;
 
-        case stringValue:
-            if (other.value_.string_ != nullptr)
+        case StringValue:
+            if (other.value_.stringVal != nullptr)
             {
-                value_.string_ = valueAllocator()->duplicateStringValue(other.value_.string_);
+                value_.stringVal = valueAllocator()->duplicateStringValue(other.value_.stringVal);
                 allocated_ = true;
             }
             else
             {
-                value_.string_ = 0;
+                value_.stringVal = 0;
             }
 
             break;
 
-        case arrayValue:
-        case objectValue:
-            value_.map_ = new ObjectValues(*other.value_.map_);
+        case ArrayValue:
+        case ObjectValue:
+            value_.mapVal = new ObjectValues(*other.value_.mapVal);
             break;
 
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::Value(Value const&) : invalid type");
+            UNREACHABLE("json::Value::Value(Value const&) : invalid type");
             // LCOV_EXCL_STOP
     }
 }
@@ -284,28 +283,28 @@ Value::~Value()
 {
     switch (type_)
     {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
+        case NullValue:
+        case IntValue:
+        case UintValue:
+        case RealValue:
+        case BooleanValue:
             break;
 
-        case stringValue:
+        case StringValue:
             if (allocated_)
-                valueAllocator()->releaseStringValue(value_.string_);
+                valueAllocator()->releaseStringValue(value_.stringVal);
 
             break;
 
-        case arrayValue:
-        case objectValue:
-            if (value_.map_ != nullptr)
-                delete value_.map_;
+        case ArrayValue:
+        case ObjectValue:
+            if (value_.mapVal != nullptr)
+                delete value_.mapVal;
             break;
 
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::~Value : invalid type");
+            UNREACHABLE("json::Value::~Value : invalid type");
             // LCOV_EXCL_STOP
     }
 }
@@ -321,7 +320,7 @@ Value::operator=(Value const& other)
 Value::Value(Value&& other) noexcept
     : value_(other.value_), type_(other.type_), allocated_(other.allocated_)
 {
-    other.type_ = nullValue;
+    other.type_ = NullValue;
     other.allocated_ = 0;
 }
 
@@ -371,50 +370,50 @@ operator<(Value const& x, Value const& y)
 {
     if (auto signum = x.type_ - y.type_)
     {
-        if (x.type_ == intValue && y.type_ == uintValue)
+        if (x.type_ == IntValue && y.type_ == UintValue)
         {
-            signum = integerCmp(x.value_.int_, y.value_.uint_);
+            signum = integerCmp(x.value_.intVal, y.value_.uintVal);
         }
-        else if (x.type_ == uintValue && y.type_ == intValue)
+        else if (x.type_ == UintValue && y.type_ == IntValue)
         {
-            signum = -integerCmp(y.value_.int_, x.value_.uint_);
+            signum = -integerCmp(y.value_.intVal, x.value_.uintVal);
         }
         return signum < 0;
     }
 
     switch (x.type_)
     {
-        case nullValue:
+        case NullValue:
             return false;
 
-        case intValue:
-            return x.value_.int_ < y.value_.int_;
+        case IntValue:
+            return x.value_.intVal < y.value_.intVal;
 
-        case uintValue:
-            return x.value_.uint_ < y.value_.uint_;
+        case UintValue:
+            return x.value_.uintVal < y.value_.uintVal;
 
-        case realValue:
-            return x.value_.real_ < y.value_.real_;
+        case RealValue:
+            return x.value_.realVal < y.value_.realVal;
 
-        case booleanValue:
-            return static_cast<int>(x.value_.bool_) < static_cast<int>(y.value_.bool_);
+        case BooleanValue:
+            return static_cast<int>(x.value_.boolVal) < static_cast<int>(y.value_.boolVal);
 
-        case stringValue:
-            return (x.value_.string_ == 0 && (y.value_.string_ != nullptr)) ||
-                ((y.value_.string_ != nullptr) && (x.value_.string_ != nullptr) &&
-                 strcmp(x.value_.string_, y.value_.string_) < 0);
+        case StringValue:
+            return (x.value_.stringVal == 0 && (y.value_.stringVal != nullptr)) ||
+                ((y.value_.stringVal != nullptr) && (x.value_.stringVal != nullptr) &&
+                 strcmp(x.value_.stringVal, y.value_.stringVal) < 0);
 
-        case arrayValue:
-        case objectValue: {
-            if (int const signum = int(x.value_.map_->size()) - y.value_.map_->size())
+        case ArrayValue:
+        case ObjectValue: {
+            if (int const signum = int(x.value_.mapVal->size()) - y.value_.mapVal->size())
                 return signum < 0;
 
-            return *x.value_.map_ < *y.value_.map_;
+            return *x.value_.mapVal < *y.value_.mapVal;
         }
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::operator<(Value, Value) : invalid type");
+            UNREACHABLE("json::operator<(Value, Value) : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -426,43 +425,43 @@ operator==(Value const& x, Value const& y)
 {
     if (x.type_ != y.type_)
     {
-        if (x.type_ == intValue && y.type_ == uintValue)
-            return integerCmp(x.value_.int_, y.value_.uint_) == 0;
-        if (x.type_ == uintValue && y.type_ == intValue)
-            return integerCmp(y.value_.int_, x.value_.uint_) == 0;
+        if (x.type_ == IntValue && y.type_ == UintValue)
+            return integerCmp(x.value_.intVal, y.value_.uintVal) == 0;
+        if (x.type_ == UintValue && y.type_ == IntValue)
+            return integerCmp(y.value_.intVal, x.value_.uintVal) == 0;
         return false;
     }
 
     switch (x.type_)
     {
-        case nullValue:
+        case NullValue:
             return true;
 
-        case intValue:
-            return x.value_.int_ == y.value_.int_;
+        case IntValue:
+            return x.value_.intVal == y.value_.intVal;
 
-        case uintValue:
-            return x.value_.uint_ == y.value_.uint_;
+        case UintValue:
+            return x.value_.uintVal == y.value_.uintVal;
 
-        case realValue:
-            return x.value_.real_ == y.value_.real_;
+        case RealValue:
+            return x.value_.realVal == y.value_.realVal;
 
-        case booleanValue:
-            return x.value_.bool_ == y.value_.bool_;
+        case BooleanValue:
+            return x.value_.boolVal == y.value_.boolVal;
 
-        case stringValue:
-            return x.value_.string_ == y.value_.string_ ||
-                ((y.value_.string_ != nullptr) && (x.value_.string_ != nullptr) &&
-                 (strcmp(x.value_.string_, y.value_.string_) == 0));
+        case StringValue:
+            return x.value_.stringVal == y.value_.stringVal ||
+                ((y.value_.stringVal != nullptr) && (x.value_.stringVal != nullptr) &&
+                 (strcmp(x.value_.stringVal, y.value_.stringVal) == 0));
 
-        case arrayValue:
-        case objectValue:
-            return x.value_.map_->size() == y.value_.map_->size() &&
-                *x.value_.map_ == *y.value_.map_;
+        case ArrayValue:
+        case ObjectValue:
+            return x.value_.mapVal->size() == y.value_.mapVal->size() &&
+                *x.value_.mapVal == *y.value_.mapVal;
 
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::operator==(Value, Value) : invalid type");
+            UNREACHABLE("json::operator==(Value, Value) : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -472,8 +471,8 @@ operator==(Value const& x, Value const& y)
 char const*
 Value::asCString() const
 {
-    XRPL_ASSERT(type_ == stringValue, "Json::Value::asCString : valid type");
-    return value_.string_;
+    XRPL_ASSERT(type_ == StringValue, "json::Value::asCString : valid type");
+    return value_.stringVal;
 }
 
 std::string
@@ -481,31 +480,31 @@ Value::asString() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return "";
 
-        case stringValue:
-            return (value_.string_ != nullptr) ? value_.string_ : "";
+        case StringValue:
+            return (value_.stringVal != nullptr) ? value_.stringVal : "";
 
-        case booleanValue:
-            return value_.bool_ ? "true" : "false";
+        case BooleanValue:
+            return value_.boolVal ? "true" : "false";
 
-        case intValue:
-            return std::to_string(value_.int_);
+        case IntValue:
+            return std::to_string(value_.intVal);
 
-        case uintValue:
-            return std::to_string(value_.uint_);
+        case UintValue:
+            return std::to_string(value_.uintVal);
 
-        case realValue:
-            return std::to_string(value_.real_);
+        case RealValue:
+            return std::to_string(value_.realVal);
 
-        case arrayValue:
-        case objectValue:
+        case ArrayValue:
+        case ObjectValue:
             JSON_ASSERT_MESSAGE(false, "Type is not convertible to string");
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asString : invalid type");
+            UNREACHABLE("json::Value::asString : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -517,38 +516,38 @@ Value::asInt() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return 0;
 
-        case intValue:
-            return value_.int_;
+        case IntValue:
+            return value_.intVal;
 
-        case uintValue:
+        case UintValue:
             JSON_ASSERT_MESSAGE(
-                value_.uint_ < (unsigned)maxInt, "integer out of signed integer range");
-            return value_.uint_;
+                value_.uintVal < (unsigned)kMAX_INT, "integer out of signed integer range");
+            return value_.uintVal;
 
-        case realValue:
+        case RealValue:
             JSON_ASSERT_MESSAGE(
-                (value_.real_ >= minInt && value_.real_ <= maxInt),
+                (value_.realVal >= kMIN_INT && value_.realVal <= kMAX_INT),
                 "Real out of signed integer range");
-            return Int(value_.real_);
+            return Int(value_.realVal);
 
-        case booleanValue:
-            return value_.bool_ ? 1 : 0;
+        case BooleanValue:
+            return value_.boolVal ? 1 : 0;
 
-        case stringValue: {
-            char const* const str{(value_.string_ != nullptr) ? value_.string_ : ""};
+        case StringValue: {
+            char const* const str{(value_.stringVal != nullptr) ? value_.stringVal : ""};
             return beast::lexicalCastThrow<int>(str);
         }
 
-        case arrayValue:
-        case objectValue:
+        case ArrayValue:
+        case ObjectValue:
             JSON_ASSERT_MESSAGE(false, "Type is not convertible to int");
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asInt : invalid type");
+            UNREACHABLE("json::Value::asInt : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -560,53 +559,54 @@ Value::asAbsUInt() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return 0;
 
-        case intValue: {
+        case IntValue: {
             // Doing this conversion through int64 avoids overflow error for
-            // value_.int_ = -1 * 2^31 i.e. numeric_limits<int>::min().
-            if (value_.int_ < 0)
-                return static_cast<std::int64_t>(value_.int_) * -1;
-            return value_.int_;
+            // value_.intVal = -1 * 2^31 i.e. numeric_limits<int>::min().
+            if (value_.intVal < 0)
+                return static_cast<std::int64_t>(value_.intVal) * -1;
+            return value_.intVal;
         }
 
-        case uintValue:
-            return value_.uint_;
+        case UintValue:
+            return value_.uintVal;
 
-        case realValue: {
-            if (value_.real_ < 0)
+        case RealValue: {
+            if (value_.realVal < 0)
             {
                 JSON_ASSERT_MESSAGE(
-                    -1 * value_.real_ <= maxUInt, "Real out of unsigned integer range");
-                return UInt(-1 * value_.real_);
+                    -1 * value_.realVal <= kMAX_U_INT, "Real out of unsigned integer range");
+                return UInt(-1 * value_.realVal);
             }
-            JSON_ASSERT_MESSAGE(value_.real_ <= maxUInt, "Real out of unsigned integer range");
-            return UInt(value_.real_);
+            JSON_ASSERT_MESSAGE(value_.realVal <= kMAX_U_INT, "Real out of unsigned integer range");
+            return UInt(value_.realVal);
         }
 
-        case booleanValue:
-            return value_.bool_ ? 1 : 0;
+        case BooleanValue:
+            return value_.boolVal ? 1 : 0;
 
-        case stringValue: {
-            char const* const str{(value_.string_ != nullptr) ? value_.string_ : ""};
+        case StringValue: {
+            char const* const str{(value_.stringVal != nullptr) ? value_.stringVal : ""};
             auto const temp = beast::lexicalCastThrow<std::int64_t>(str);
             if (temp < 0)
             {
-                JSON_ASSERT_MESSAGE(-1 * temp <= maxUInt, "String out of unsigned integer range");
+                JSON_ASSERT_MESSAGE(
+                    -1 * temp <= kMAX_U_INT, "String out of unsigned integer range");
                 return -1 * temp;
             }
-            JSON_ASSERT_MESSAGE(temp <= maxUInt, "String out of unsigned integer range");
+            JSON_ASSERT_MESSAGE(temp <= kMAX_U_INT, "String out of unsigned integer range");
             return temp;
         }
 
-        case arrayValue:
-        case objectValue:
+        case ArrayValue:
+        case ObjectValue:
             JSON_ASSERT_MESSAGE(false, "Type is not convertible to int");
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asAbsInt : invalid type");
+            UNREACHABLE("json::Value::asAbsInt : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -618,38 +618,38 @@ Value::asUInt() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return 0;
 
-        case intValue:
+        case IntValue:
             JSON_ASSERT_MESSAGE(
-                value_.int_ >= 0, "Negative integer can not be converted to unsigned integer");
-            return value_.int_;
+                value_.intVal >= 0, "Negative integer can not be converted to unsigned integer");
+            return value_.intVal;
 
-        case uintValue:
-            return value_.uint_;
+        case UintValue:
+            return value_.uintVal;
 
-        case realValue:
+        case RealValue:
             JSON_ASSERT_MESSAGE(
-                (value_.real_ >= 0 && value_.real_ <= maxUInt),
+                (value_.realVal >= 0 && value_.realVal <= kMAX_U_INT),
                 "Real out of unsigned integer range");
-            return UInt(value_.real_);
+            return UInt(value_.realVal);
 
-        case booleanValue:
-            return value_.bool_ ? 1 : 0;
+        case BooleanValue:
+            return value_.boolVal ? 1 : 0;
 
-        case stringValue: {
-            char const* const str{(value_.string_ != nullptr) ? value_.string_ : ""};
+        case StringValue: {
+            char const* const str{(value_.stringVal != nullptr) ? value_.stringVal : ""};
             return beast::lexicalCastThrow<unsigned int>(str);
         }
 
-        case arrayValue:
-        case objectValue:
+        case ArrayValue:
+        case ObjectValue:
             JSON_ASSERT_MESSAGE(false, "Type is not convertible to uint");
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asUInt : invalid type");
+            UNREACHABLE("json::Value::asUInt : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -661,29 +661,29 @@ Value::asDouble() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return 0.0;
 
-        case intValue:
-            return value_.int_;
+        case IntValue:
+            return value_.intVal;
 
-        case uintValue:
-            return value_.uint_;
+        case UintValue:
+            return value_.uintVal;
 
-        case realValue:
-            return value_.real_;
+        case RealValue:
+            return value_.realVal;
 
-        case booleanValue:
-            return value_.bool_ ? 1.0 : 0.0;
+        case BooleanValue:
+            return value_.boolVal ? 1.0 : 0.0;
 
-        case stringValue:
-        case arrayValue:
-        case objectValue:
+        case StringValue:
+        case ArrayValue:
+        case ObjectValue:
             JSON_ASSERT_MESSAGE(false, "Type is not convertible to double");
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asDouble : invalid type");
+            UNREACHABLE("json::Value::asDouble : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -695,29 +695,29 @@ Value::asBool() const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return false;
 
-        case intValue:
-        case uintValue:
-            return value_.int_ != 0;
+        case IntValue:
+        case UintValue:
+            return value_.intVal != 0;
 
-        case realValue:
-            return value_.real_ != 0.0;
+        case RealValue:
+            return value_.realVal != 0.0;
 
-        case booleanValue:
-            return value_.bool_;
+        case BooleanValue:
+            return value_.boolVal;
 
-        case stringValue:
-            return (value_.string_ != nullptr) && value_.string_[0] != 0;
+        case StringValue:
+            return (value_.stringVal != nullptr) && value_.stringVal[0] != 0;
 
-        case arrayValue:
-        case objectValue:
-            return !value_.map_->empty();
+        case ArrayValue:
+        case ObjectValue:
+            return !value_.mapVal->empty();
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::asBool : invalid type");
+            UNREACHABLE("json::Value::asBool : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -729,45 +729,45 @@ Value::isConvertibleTo(ValueType other) const
 {
     switch (type_)
     {
-        case nullValue:
+        case NullValue:
             return true;
 
-        case intValue:
-            return (other == nullValue && value_.int_ == 0) || other == intValue ||
-                (other == uintValue && value_.int_ >= 0) || other == realValue ||
-                other == stringValue || other == booleanValue;
+        case IntValue:
+            return (other == NullValue && value_.intVal == 0) || other == IntValue ||
+                (other == UintValue && value_.intVal >= 0) || other == RealValue ||
+                other == StringValue || other == BooleanValue;
 
-        case uintValue:
-            return (other == nullValue && value_.uint_ == 0) ||
-                (other == intValue && value_.uint_ <= (unsigned)maxInt) || other == uintValue ||
-                other == realValue || other == stringValue || other == booleanValue;
+        case UintValue:
+            return (other == NullValue && value_.uintVal == 0) ||
+                (other == IntValue && value_.uintVal <= (unsigned)kMAX_INT) || other == UintValue ||
+                other == RealValue || other == StringValue || other == BooleanValue;
 
-        case realValue:
-            return (other == nullValue && value_.real_ == 0.0) ||
-                (other == intValue && value_.real_ >= minInt && value_.real_ <= maxInt) ||
-                (other == uintValue && value_.real_ >= 0 && value_.real_ <= maxUInt &&
-                 std::fabs(round(value_.real_) - value_.real_) <
+        case RealValue:
+            return (other == NullValue && value_.realVal == 0.0) ||
+                (other == IntValue && value_.realVal >= kMIN_INT && value_.realVal <= kMAX_INT) ||
+                (other == UintValue && value_.realVal >= 0 && value_.realVal <= kMAX_U_INT &&
+                 std::fabs(round(value_.realVal) - value_.realVal) <
                      std::numeric_limits<double>::epsilon()) ||
-                other == realValue || other == stringValue || other == booleanValue;
+                other == RealValue || other == StringValue || other == BooleanValue;
 
-        case booleanValue:
-            return (other == nullValue && !value_.bool_) || other == intValue ||
-                other == uintValue || other == realValue || other == stringValue ||
-                other == booleanValue;
+        case BooleanValue:
+            return (other == NullValue && !value_.boolVal) || other == IntValue ||
+                other == UintValue || other == RealValue || other == StringValue ||
+                other == BooleanValue;
 
-        case stringValue:
-            return other == stringValue ||
-                (other == nullValue && ((value_.string_ == nullptr) || value_.string_[0] == 0));
+        case StringValue:
+            return other == StringValue ||
+                (other == NullValue && ((value_.stringVal == nullptr) || value_.stringVal[0] == 0));
 
-        case arrayValue:
-            return other == arrayValue || (other == nullValue && value_.map_->empty());
+        case ArrayValue:
+            return other == ArrayValue || (other == NullValue && value_.mapVal->empty());
 
-        case objectValue:
-            return other == objectValue || (other == nullValue && value_.map_->empty());
+        case ObjectValue:
+            return other == ObjectValue || (other == NullValue && value_.mapVal->empty());
 
         // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::isConvertible : invalid type");
+            UNREACHABLE("json::Value::isConvertible : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -780,30 +780,30 @@ Value::size() const
 {
     switch (type_)
     {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
-        case stringValue:
+        case NullValue:
+        case IntValue:
+        case UintValue:
+        case RealValue:
+        case BooleanValue:
+        case StringValue:
             return 0;
 
-        case arrayValue:  // size of the array is highest index + 1
-            if (!value_.map_->empty())
+        case ArrayValue:  // size of the array is highest index + 1
+            if (!value_.mapVal->empty())
             {
-                ObjectValues::const_iterator itLast = value_.map_->end();
+                ObjectValues::const_iterator itLast = value_.mapVal->end();
                 --itLast;
                 return (*itLast).first.index() + 1;
             }
 
             return 0;
 
-        case objectValue:
-            return Int(value_.map_->size());
+        case ObjectValue:
+            return Int(value_.mapVal->size());
 
             // LCOV_EXCL_START
         default:
-            UNREACHABLE("Json::Value::size : invalid type");
+            UNREACHABLE("json::Value::size : invalid type");
             // LCOV_EXCL_STOP
     }
 
@@ -829,14 +829,14 @@ void
 Value::clear()
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == arrayValue || type_ == objectValue,
-        "Json::Value::clear : valid type");
+        type_ == NullValue || type_ == ArrayValue || type_ == ObjectValue,
+        "json::Value::clear : valid type");
 
     switch (type_)
     {
-        case arrayValue:
-        case objectValue:
-            value_.map_->clear();
+        case ArrayValue:
+        case ObjectValue:
+            value_.mapVal->clear();
             break;
 
         default:
@@ -848,19 +848,19 @@ Value&
 Value::operator[](UInt index)
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == arrayValue, "Json::Value::operator[](UInt) : valid type");
+        type_ == NullValue || type_ == ArrayValue, "json::Value::operator[](UInt) : valid type");
 
-    if (type_ == nullValue)
-        *this = Value(arrayValue);
+    if (type_ == NullValue)
+        *this = Value(ArrayValue);
 
     CZString const key(index);
-    ObjectValues::iterator it = value_.map_->lower_bound(key);
+    ObjectValues::iterator it = value_.mapVal->lower_bound(key);
 
-    if (it != value_.map_->end() && (*it).first == key)
+    if (it != value_.mapVal->end() && (*it).first == key)
         return (*it).second;
 
-    ObjectValues::value_type const defaultValue(key, null);
-    it = value_.map_->insert(it, defaultValue);
+    ObjectValues::value_type const defaultValue(key, kNULL);
+    it = value_.mapVal->insert(it, defaultValue);
     return (*it).second;
 }
 
@@ -868,17 +868,17 @@ Value const&
 Value::operator[](UInt index) const
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == arrayValue,
-        "Json::Value::operator[](UInt) const : valid type");
+        type_ == NullValue || type_ == ArrayValue,
+        "json::Value::operator[](UInt) const : valid type");
 
-    if (type_ == nullValue)
-        return null;
+    if (type_ == NullValue)
+        return kNULL;
 
     CZString const key(index);
-    ObjectValues::const_iterator const it = value_.map_->find(key);
+    ObjectValues::const_iterator const it = value_.mapVal->find(key);
 
-    if (it == value_.map_->end())
-        return null;
+    if (it == value_.mapVal->end())
+        return kNULL;
 
     return (*it).second;
 }
@@ -893,19 +893,19 @@ Value&
 Value::resolveReference(char const* key, bool isStatic)
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == objectValue, "Json::Value::resolveReference : valid type");
+        type_ == NullValue || type_ == ObjectValue, "json::Value::resolveReference : valid type");
 
-    if (type_ == nullValue)
-        *this = Value(objectValue);
+    if (type_ == NullValue)
+        *this = Value(ObjectValue);
 
-    CZString const actualKey(key, isStatic ? CZString::noDuplication : CZString::duplicateOnCopy);
-    ObjectValues::iterator it = value_.map_->lower_bound(actualKey);
+    CZString const actualKey(key, isStatic ? CZString::NoDuplication : CZString::DuplicateOnCopy);
+    ObjectValues::iterator it = value_.mapVal->lower_bound(actualKey);
 
-    if (it != value_.map_->end() && (*it).first == actualKey)
+    if (it != value_.mapVal->end() && (*it).first == actualKey)
         return (*it).second;
 
-    ObjectValues::value_type const defaultValue(actualKey, null);
-    it = value_.map_->insert(it, defaultValue);
+    ObjectValues::value_type const defaultValue(actualKey, kNULL);
+    it = value_.mapVal->insert(it, defaultValue);
     Value& value = (*it).second;
     return value;
 }
@@ -914,7 +914,7 @@ Value
 Value::get(UInt index, Value const& defaultValue) const
 {
     Value const* value = &((*this)[index]);
-    return value == &null ? defaultValue : *value;
+    return value == &kNULL ? defaultValue : *value;
 }
 
 bool
@@ -927,17 +927,17 @@ Value const&
 Value::operator[](char const* key) const
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == objectValue,
-        "Json::Value::operator[](const char*) const : valid type");
+        type_ == NullValue || type_ == ObjectValue,
+        "json::Value::operator[](const char*) const : valid type");
 
-    if (type_ == nullValue)
-        return null;
+    if (type_ == NullValue)
+        return kNULL;
 
-    CZString const actualKey(key, CZString::noDuplication);
-    ObjectValues::const_iterator const it = value_.map_->find(actualKey);
+    CZString const actualKey(key, CZString::NoDuplication);
+    ObjectValues::const_iterator const it = value_.mapVal->find(actualKey);
 
-    if (it == value_.map_->end())
-        return null;
+    if (it == value_.mapVal->end())
+        return kNULL;
 
     return (*it).second;
 }
@@ -963,7 +963,7 @@ Value::operator[](StaticString const& key)
 Value const&
 Value::operator[](StaticString const& key) const
 {
-    return (*this)[key.c_str()];
+    return (*this)[key.cStr()];
 }
 
 Value&
@@ -982,7 +982,7 @@ Value
 Value::get(char const* key, Value const& defaultValue) const
 {
     Value const* value = &((*this)[key]);
-    return value == &null ? defaultValue : *value;
+    return value == &kNULL ? defaultValue : *value;
 }
 
 Value
@@ -995,19 +995,19 @@ Value
 Value::removeMember(char const* key)
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == objectValue, "Json::Value::removeMember : valid type");
+        type_ == NullValue || type_ == ObjectValue, "json::Value::removeMember : valid type");
 
-    if (type_ == nullValue)
-        return null;
+    if (type_ == NullValue)
+        return kNULL;
 
-    CZString const actualKey(key, CZString::noDuplication);
-    ObjectValues::iterator const it = value_.map_->find(actualKey);
+    CZString const actualKey(key, CZString::NoDuplication);
+    ObjectValues::iterator const it = value_.mapVal->find(actualKey);
 
-    if (it == value_.map_->end())
-        return null;
+    if (it == value_.mapVal->end())
+        return kNULL;
 
     Value old(it->second);
-    value_.map_->erase(it);
+    value_.mapVal->erase(it);
     return old;
 }
 
@@ -1020,11 +1020,11 @@ Value::removeMember(std::string const& key)
 bool
 Value::isMember(char const* key) const
 {
-    if (type_ != objectValue)
+    if (type_ != ObjectValue)
         return false;
 
     Value const* value = &((*this)[key]);
-    return value != &null;
+    return value != &kNULL;
 }
 
 bool
@@ -1036,25 +1036,25 @@ Value::isMember(std::string const& key) const
 bool
 Value::isMember(StaticString const& key) const
 {
-    return isMember(key.c_str());
+    return isMember(key.cStr());
 }
 
 Value::Members
 Value::getMemberNames() const
 {
     XRPL_ASSERT(
-        type_ == nullValue || type_ == objectValue, "Json::Value::getMemberNames : valid type");
+        type_ == NullValue || type_ == ObjectValue, "json::Value::getMemberNames : valid type");
 
-    if (type_ == nullValue)
+    if (type_ == NullValue)
         return Value::Members();
 
     Members members;
-    members.reserve(value_.map_->size());
-    ObjectValues::const_iterator it = value_.map_->begin();
-    ObjectValues::const_iterator const itEnd = value_.map_->end();
+    members.reserve(value_.mapVal->size());
+    ObjectValues::const_iterator it = value_.mapVal->begin();
+    ObjectValues::const_iterator const itEnd = value_.mapVal->end();
 
     for (; it != itEnd; ++it)
-        members.emplace_back((*it).first.c_str());
+        members.emplace_back((*it).first.cStr());
 
     return members;
 }
@@ -1062,37 +1062,37 @@ Value::getMemberNames() const
 bool
 Value::isNull() const
 {
-    return type_ == nullValue;
+    return type_ == NullValue;
 }
 
 bool
 Value::isBool() const
 {
-    return type_ == booleanValue;
+    return type_ == BooleanValue;
 }
 
 bool
 Value::isInt() const
 {
-    return type_ == intValue;
+    return type_ == IntValue;
 }
 
 bool
 Value::isUInt() const
 {
-    return type_ == uintValue;
+    return type_ == UintValue;
 }
 
 bool
 Value::isIntegral() const
 {
-    return type_ == intValue || type_ == uintValue || type_ == booleanValue;
+    return type_ == IntValue || type_ == UintValue || type_ == BooleanValue;
 }
 
 bool
 Value::isDouble() const
 {
-    return type_ == realValue;
+    return type_ == RealValue;
 }
 
 bool
@@ -1104,31 +1104,31 @@ Value::isNumeric() const
 bool
 Value::isString() const
 {
-    return type_ == stringValue;
+    return type_ == StringValue;
 }
 
 bool
 Value::isArray() const
 {
-    return type_ == arrayValue;
+    return type_ == ArrayValue;
 }
 
 bool
 Value::isArrayOrNull() const
 {
-    return type_ == nullValue || type_ == arrayValue;
+    return type_ == NullValue || type_ == ArrayValue;
 }
 
 bool
 Value::isObject() const
 {
-    return type_ == objectValue;
+    return type_ == ObjectValue;
 }
 
 bool
 Value::isObjectOrNull() const
 {
-    return type_ == nullValue || type_ == objectValue;
+    return type_ == NullValue || type_ == ObjectValue;
 }
 
 std::string
@@ -1143,10 +1143,10 @@ Value::begin() const
 {
     switch (type_)
     {
-        case arrayValue:
-        case objectValue:
-            if (value_.map_ != nullptr)
-                return const_iterator(value_.map_->begin());
+        case ArrayValue:
+        case ObjectValue:
+            if (value_.mapVal != nullptr)
+                return const_iterator(value_.mapVal->begin());
 
             break;
         default:
@@ -1161,10 +1161,10 @@ Value::end() const
 {
     switch (type_)
     {
-        case arrayValue:
-        case objectValue:
-            if (value_.map_ != nullptr)
-                return const_iterator(value_.map_->end());
+        case ArrayValue:
+        case ObjectValue:
+            if (value_.mapVal != nullptr)
+                return const_iterator(value_.mapVal->end());
 
             break;
         default:
@@ -1179,10 +1179,10 @@ Value::begin()
 {
     switch (type_)
     {
-        case arrayValue:
-        case objectValue:
-            if (value_.map_ != nullptr)
-                return iterator(value_.map_->begin());
+        case ArrayValue:
+        case ObjectValue:
+            if (value_.mapVal != nullptr)
+                return iterator(value_.mapVal->begin());
             break;
         default:
             break;
@@ -1196,10 +1196,10 @@ Value::end()
 {
     switch (type_)
     {
-        case arrayValue:
-        case objectValue:
-            if (value_.map_ != nullptr)
-                return iterator(value_.map_->end());
+        case ArrayValue:
+        case ObjectValue:
+            if (value_.mapVal != nullptr)
+                return iterator(value_.mapVal->end());
             break;
         default:
             break;
@@ -1208,4 +1208,4 @@ Value::end()
     return iterator();
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/json_valueiterator.cpp b/src/libxrpl/json/json_valueiterator.cpp
index 595835d9c0..5a3a5ffcdb 100644
--- a/src/libxrpl/json/json_valueiterator.cpp
+++ b/src/libxrpl/json/json_valueiterator.cpp
@@ -3,7 +3,7 @@
 #include <xrpl/json/json_forwards.h>
 #include <xrpl/json/json_value.h>
 
-namespace Json {
+namespace json {
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -89,12 +89,12 @@ ValueIteratorBase::key() const
 {
     Value::CZString const czString = (*current_).first;
 
-    if (czString.c_str() != nullptr)
+    if (czString.cStr() != nullptr)
     {
         if (czString.isStaticString())
-            return Value(StaticString(czString.c_str()));
+            return Value(StaticString(czString.cStr()));
 
-        return Value(czString.c_str());
+        return Value(czString.cStr());
     }
 
     return Value(czString.index());
@@ -105,7 +105,7 @@ ValueIteratorBase::index() const
 {
     Value::CZString const czString = (*current_).first;
 
-    if (czString.c_str() == nullptr)
+    if (czString.cStr() == nullptr)
         return czString.index();
 
     return Value::UInt(-1);
@@ -114,7 +114,7 @@ ValueIteratorBase::index() const
 char const*
 ValueIteratorBase::memberName() const
 {
-    char const* name = (*current_).first.c_str();
+    char const* name = (*current_).first.cStr();
     return (name != nullptr) ? name : "";
 }
 
@@ -164,4 +164,4 @@ ValueIterator::operator=(SelfType const& other)
     return *this;
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/json_writer.cpp b/src/libxrpl/json/json_writer.cpp
index 7846ed6ce1..6c138e1fb1 100644
--- a/src/libxrpl/json/json_writer.cpp
+++ b/src/libxrpl/json/json_writer.cpp
@@ -13,7 +13,7 @@
 #include <string>
 #include <utility>
 
-namespace Json {
+namespace json {
 
 static bool
 isControlCharacter(char ch)
@@ -59,7 +59,7 @@ valueToString(Int value)
     if (isNegative)
         *--current = '-';
 
-    XRPL_ASSERT(current >= buffer, "Json::valueToString(Int) : buffer check");
+    XRPL_ASSERT(current >= buffer, "json::valueToString(Int) : buffer check");
     return current;
 }
 
@@ -69,7 +69,7 @@ valueToString(UInt value)
     char buffer[32];
     char* current = buffer + sizeof(buffer);  // NOLINT(misc-const-correctness)
     uintToString(value, current);
-    XRPL_ASSERT(current >= buffer, "Json::valueToString(UInt) : buffer check");
+    XRPL_ASSERT(current >= buffer, "json::valueToString(UInt) : buffer check");
     return current;
 }
 
@@ -188,31 +188,31 @@ FastWriter::writeValue(Value const& value)
 {
     switch (value.type())
     {
-        case nullValue:
+        case NullValue:
             document_ += "null";
             break;
 
-        case intValue:
+        case IntValue:
             document_ += valueToString(value.asInt());
             break;
 
-        case uintValue:
+        case UintValue:
             document_ += valueToString(value.asUInt());
             break;
 
-        case realValue:
+        case RealValue:
             document_ += valueToString(value.asDouble());
             break;
 
-        case stringValue:
+        case StringValue:
             document_ += valueToQuotedString(value.asCString());
             break;
 
-        case booleanValue:
+        case BooleanValue:
             document_ += valueToString(value.asBool());
             break;
 
-        case arrayValue: {
+        case ArrayValue: {
             document_ += "[";
             int const size = value.size();
 
@@ -228,7 +228,7 @@ FastWriter::writeValue(Value const& value)
         }
         break;
 
-        case objectValue: {
+        case ObjectValue: {
             Value::Members members(value.getMemberNames());
             document_ += "{";
 
@@ -271,35 +271,35 @@ StyledWriter::writeValue(Value const& value)
 {
     switch (value.type())
     {
-        case nullValue:
+        case NullValue:
             pushValue("null");
             break;
 
-        case intValue:
+        case IntValue:
             pushValue(valueToString(value.asInt()));
             break;
 
-        case uintValue:
+        case UintValue:
             pushValue(valueToString(value.asUInt()));
             break;
 
-        case realValue:
+        case RealValue:
             pushValue(valueToString(value.asDouble()));
             break;
 
-        case stringValue:
+        case StringValue:
             pushValue(valueToQuotedString(value.asCString()));
             break;
 
-        case booleanValue:
+        case BooleanValue:
             pushValue(valueToString(value.asBool()));
             break;
 
-        case arrayValue:
+        case ArrayValue:
             writeArrayValue(value);
             break;
 
-        case objectValue: {
+        case ObjectValue: {
             Value::Members members(value.getMemberNames());
 
             if (members.empty())
@@ -381,7 +381,7 @@ StyledWriter::writeArrayValue(Value const& value)
         {
             XRPL_ASSERT(
                 childValues_.size() == size,
-                "Json::StyledWriter::writeArrayValue : child size match");
+                "json::StyledWriter::writeArrayValue : child size match");
             document_ += "[ ";
 
             for (unsigned index = 0; index < size; ++index)
@@ -478,7 +478,7 @@ StyledWriter::unindent()
 {
     XRPL_ASSERT(
         int(indentString_.size()) >= indentSize_,
-        "Json::StyledWriter::unindent : maximum indent size");
+        "json::StyledWriter::unindent : maximum indent size");
     indentString_.resize(indentString_.size() - indentSize_);
 }
 
@@ -506,35 +506,35 @@ StyledStreamWriter::writeValue(Value const& value)
 {
     switch (value.type())
     {
-        case nullValue:
+        case NullValue:
             pushValue("null");
             break;
 
-        case intValue:
+        case IntValue:
             pushValue(valueToString(value.asInt()));
             break;
 
-        case uintValue:
+        case UintValue:
             pushValue(valueToString(value.asUInt()));
             break;
 
-        case realValue:
+        case RealValue:
             pushValue(valueToString(value.asDouble()));
             break;
 
-        case stringValue:
+        case StringValue:
             pushValue(valueToQuotedString(value.asCString()));
             break;
 
-        case booleanValue:
+        case BooleanValue:
             pushValue(valueToString(value.asBool()));
             break;
 
-        case arrayValue:
+        case ArrayValue:
             writeArrayValue(value);
             break;
 
-        case objectValue: {
+        case ObjectValue: {
             Value::Members members(value.getMemberNames());
 
             if (members.empty())
@@ -616,7 +616,7 @@ StyledStreamWriter::writeArrayValue(Value const& value)
         {
             XRPL_ASSERT(
                 childValues_.size() == size,
-                "Json::StyledStreamWriter::writeArrayValue : child size match");
+                "json::StyledStreamWriter::writeArrayValue : child size match");
             *document_ << "[ ";
 
             for (unsigned index = 0; index < size; ++index)
@@ -714,16 +714,16 @@ StyledStreamWriter::unindent()
 {
     XRPL_ASSERT(
         indentString_.size() >= indentation_.size(),
-        "Json::StyledStreamWriter::unindent : maximum indent size");
+        "json::StyledStreamWriter::unindent : maximum indent size");
     indentString_.resize(indentString_.size() - indentation_.size());
 }
 
 std::ostream&
 operator<<(std::ostream& sout, Value const& root)
 {
-    Json::StyledStreamWriter writer;
+    json::StyledStreamWriter writer;
     writer.write(sout, root);
     return sout;
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/json/to_string.cpp b/src/libxrpl/json/to_string.cpp
index 1d1a609366..b51c8f1eb6 100644
--- a/src/libxrpl/json/to_string.cpp
+++ b/src/libxrpl/json/to_string.cpp
@@ -4,7 +4,7 @@
 
 #include <string>
 
-namespace Json {
+namespace json {
 
 std::string
 to_string(Value const& value)
@@ -18,4 +18,4 @@ pretty(Value const& value)
     return StyledWriter().write(value);
 }
 
-}  // namespace Json
+}  // namespace json
diff --git a/src/libxrpl/ledger/AcceptedLedgerTx.cpp b/src/libxrpl/ledger/AcceptedLedgerTx.cpp
index 21baa24323..304c99ffcb 100644
--- a/src/libxrpl/ledger/AcceptedLedgerTx.cpp
+++ b/src/libxrpl/ledger/AcceptedLedgerTx.cpp
@@ -25,35 +25,35 @@ AcceptedLedgerTx::AcceptedLedgerTx(
     std::shared_ptr<ReadView const> const& ledger,
     std::shared_ptr<STTx const> const& txn,
     std::shared_ptr<STObject const> const& met)
-    : mTxn(txn)
-    , mMeta(txn->getTransactionID(), ledger->seq(), *met)
-    , mAffected(mMeta.getAffectedAccounts())
+    : txn_(txn)
+    , meta_(txn->getTransactionID(), ledger->seq(), *met)
+    , affected_(meta_.getAffectedAccounts())
 {
     XRPL_ASSERT(!ledger->open(), "xrpl::AcceptedLedgerTx::AcceptedLedgerTx : valid ledger state");
 
     Serializer s;
     met->add(s);
-    mRawMeta = std::move(s.modData());
+    rawMeta_ = std::move(s.modData());
 
-    mJson = Json::objectValue;
-    mJson[jss::transaction] = mTxn->getJson(JsonOptions::none);
+    json_ = json::ObjectValue;
+    json_[jss::transaction] = txn_->getJson(JsonOptions::KNone);
 
-    mJson[jss::meta] = mMeta.getJson(JsonOptions::none);
-    mJson[jss::raw_meta] = strHex(mRawMeta);
+    json_[jss::meta] = meta_.getJson(JsonOptions::KNone);
+    json_[jss::raw_meta] = strHex(rawMeta_);
 
-    mJson[jss::result] = transHuman(mMeta.getResultTER());
+    json_[jss::result] = transHuman(meta_.getResultTER());
 
-    if (!mAffected.empty())
+    if (!affected_.empty())
     {
-        Json::Value& affected = (mJson[jss::affected] = Json::arrayValue);
-        for (auto const& account : mAffected)
+        json::Value& affected = (json_[jss::affected] = json::ArrayValue);
+        for (auto const& account : affected_)
             affected.append(toBase58(account));
     }
 
-    if (mTxn->getTxnType() == ttOFFER_CREATE)
+    if (txn_->getTxnType() == ttOFFER_CREATE)
     {
-        auto const& account = mTxn->getAccountID(sfAccount);
-        auto const amount = mTxn->getFieldAmount(sfTakerGets);
+        auto const& account = txn_->getAccountID(sfAccount);
+        auto const amount = txn_->getFieldAmount(sfTakerGets);
 
         // If the offer create is not self funded then add the owner balance
         if (account != amount.getIssuer())
@@ -62,10 +62,10 @@ AcceptedLedgerTx::AcceptedLedgerTx(
                 *ledger,
                 account,
                 amount,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 beast::Journal{beast::Journal::getNullSink()});
-            mJson[jss::transaction][jss::owner_funds] = ownerFunds.getText();
+            json_[jss::transaction][jss::owner_funds] = ownerFunds.getText();
         }
     }
 }
@@ -73,8 +73,8 @@ AcceptedLedgerTx::AcceptedLedgerTx(
 std::string
 AcceptedLedgerTx::getEscMeta() const
 {
-    XRPL_ASSERT(!mRawMeta.empty(), "xrpl::AcceptedLedgerTx::getEscMeta : metadata is set");
-    return sqlBlobLiteral(mRawMeta);
+    XRPL_ASSERT(!rawMeta_.empty(), "xrpl::AcceptedLedgerTx::getEscMeta : metadata is set");
+    return sqlBlobLiteral(rawMeta_);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/ledger/ApplyStateTable.cpp b/src/libxrpl/ledger/ApplyStateTable.cpp
index d7cbcb06e8..f49b1d0122 100644
--- a/src/libxrpl/ledger/ApplyStateTable.cpp
+++ b/src/libxrpl/ledger/ApplyStateTable.cpp
@@ -43,15 +43,15 @@ ApplyStateTable::apply(RawView& to) const
         auto const& sle = item.second.second;
         switch (item.second.first)
         {
-            case Action::cache:
+            case Action::Cache:
                 break;
-            case Action::erase:
+            case Action::Erase:
                 to.rawErase(sle);
                 break;
-            case Action::insert:
+            case Action::Insert:
                 to.rawInsert(sle);
                 break;
-            case Action::modify:
+            case Action::Modify:
                 to.rawReplace(sle);
                 break;
         };
@@ -66,9 +66,9 @@ ApplyStateTable::size() const
     {
         switch (item.second.first)
         {
-            case Action::erase:
-            case Action::insert:
-            case Action::modify:
+            case Action::Erase:
+            case Action::Insert:
+            case Action::Modify:
                 ++ret;
             default:
                 break;
@@ -90,15 +90,15 @@ ApplyStateTable::visit(
     {
         switch (item.second.first)
         {
-            case Action::erase:
+            case Action::Erase:
                 func(item.first, true, to.read(keylet::unchecked(item.first)), item.second.second);
                 break;
 
-            case Action::insert:
+            case Action::Insert:
                 func(item.first, false, nullptr, item.second.second);
                 break;
 
-            case Action::modify:
+            case Action::Modify:
                 func(item.first, false, to.read(keylet::unchecked(item.first)), item.second.second);
                 break;
 
@@ -137,15 +137,15 @@ ApplyStateTable::apply(
             switch (item.second.first)
             {
                 default:
-                case Action::cache:
+                case Action::Cache:
                     continue;
-                case Action::erase:
+                case Action::Erase:
                     type = &sfDeletedNode;
                     break;
-                case Action::insert:
+                case Action::Insert:
                     type = &sfCreatedNode;
                     break;
-                case Action::modify:
+                case Action::Modify:
                     type = &sfModifiedNode;
                     break;
             }
@@ -169,24 +169,24 @@ ApplyStateTable::apply(
                 {
                     // go through the original node for
                     // modified  fields saved on modification
-                    if (obj.getFName().shouldMeta(SField::sMD_ChangeOrig) &&
+                    if (obj.getFName().shouldMeta(SField::SMdChangeOrig) &&
                         !curNode->hasMatchingEntry(obj))
-                        prevs.emplace_back(obj);
+                        prevs.emplaceBack(obj);
                 }
 
                 if (!prevs.empty())
-                    meta.getAffectedNode(item.first).emplace_back(std::move(prevs));
+                    meta.getAffectedNode(item.first).emplaceBack(std::move(prevs));
 
                 STObject finals(sfFinalFields);
                 for (auto const& obj : *curNode)
                 {
                     // go through the final node for final fields
-                    if (obj.getFName().shouldMeta(SField::sMD_Always | SField::sMD_DeleteFinal))
-                        finals.emplace_back(obj);
+                    if (obj.getFName().shouldMeta(SField::SMdAlways | SField::SMdDeleteFinal))
+                        finals.emplaceBack(obj);
                 }
 
                 if (!finals.empty())
-                    meta.getAffectedNode(item.first).emplace_back(std::move(finals));
+                    meta.getAffectedNode(item.first).emplaceBack(std::move(finals));
             }
             else if (type == &sfModifiedNode)
             {
@@ -205,24 +205,24 @@ ApplyStateTable::apply(
                 for (auto const& obj : *origNode)
                 {
                     // search the original node for values saved on modify
-                    if (obj.getFName().shouldMeta(SField::sMD_ChangeOrig) &&
+                    if (obj.getFName().shouldMeta(SField::SMdChangeOrig) &&
                         !curNode->hasMatchingEntry(obj))
-                        prevs.emplace_back(obj);
+                        prevs.emplaceBack(obj);
                 }
 
                 if (!prevs.empty())
-                    meta.getAffectedNode(item.first).emplace_back(std::move(prevs));
+                    meta.getAffectedNode(item.first).emplaceBack(std::move(prevs));
 
                 STObject finals(sfFinalFields);
                 for (auto const& obj : *curNode)
                 {
                     // search the final node for values saved always
-                    if (obj.getFName().shouldMeta(SField::sMD_Always | SField::sMD_ChangeNew))
-                        finals.emplace_back(obj);
+                    if (obj.getFName().shouldMeta(SField::SMdAlways | SField::SMdChangeNew))
+                        finals.emplaceBack(obj);
                 }
 
                 if (!finals.empty())
-                    meta.getAffectedNode(item.first).emplace_back(std::move(finals));
+                    meta.getAffectedNode(item.first).emplaceBack(std::move(finals));
             }
             else if (type == &sfCreatedNode)  // if created, thread to owner(s)
             {
@@ -240,12 +240,12 @@ ApplyStateTable::apply(
                 {
                     // save non-default values
                     if (!obj.isDefault() &&
-                        obj.getFName().shouldMeta(SField::sMD_Create | SField::sMD_Always))
-                        news.emplace_back(obj);
+                        obj.getFName().shouldMeta(SField::SMdCreate | SField::SMdAlways))
+                        news.emplaceBack(obj);
                 }
 
                 if (!news.empty())
-                    meta.getAffectedNode(item.first).emplace_back(std::move(news));
+                    meta.getAffectedNode(item.first).emplaceBack(std::move(news));
             }
             else
             {
@@ -269,7 +269,7 @@ ApplyStateTable::apply(
 
         // VFALCO For diagnostics do we want to show
         //        metadata even when the base view is open?
-        JLOG(j.trace()) << "metadata " << meta.getJson(JsonOptions::none);
+        JLOG(j.trace()) << "metadata " << meta.getJson(JsonOptions::KNone);
 
         metadata = meta;
     }
@@ -294,11 +294,11 @@ ApplyStateTable::exists(ReadView const& base, Keylet const& k) const
     auto const& sle = item.second;
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             return false;
-        case Action::cache:
-        case Action::insert:
-        case Action::modify:
+        case Action::Cache:
+        case Action::Insert:
+        case Action::Modify:
             break;
     }
     return k.check(*sle);
@@ -320,11 +320,11 @@ ApplyStateTable::succ(
         if (!next)
             break;
         iter = items_.find(*next);
-    } while (iter != items_.end() && iter->second.first == Action::erase);
+    } while (iter != items_.end() && iter->second.first == Action::Erase);
     // Find non-deleted successor in our list
     for (iter = items_.upper_bound(key); iter != items_.end(); ++iter)
     {
-        if (iter->second.first != Action::erase)
+        if (iter->second.first != Action::Erase)
         {
             // Found both, return the lower key
             if (!next || next > iter->first)
@@ -349,11 +349,11 @@ ApplyStateTable::read(ReadView const& base, Keylet const& k) const
     auto const& sle = item.second;
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             return nullptr;
-        case Action::cache:
-        case Action::insert:
-        case Action::modify:
+        case Action::Cache:
+        case Action::Insert:
+        case Action::Modify:
             break;
     };
     if (!k.check(*sle))
@@ -376,18 +376,18 @@ ApplyStateTable::peek(ReadView const& base, Keylet const& k)
             iter,
             piecewise_construct,
             forward_as_tuple(sle->key()),
-            forward_as_tuple(Action::cache, make_shared<SLE>(*sle)));
+            forward_as_tuple(Action::Cache, make_shared<SLE>(*sle)));
         return iter->second.second;
     }
     auto const& item = iter->second;
     auto const& sle = item.second;
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             return nullptr;
-        case Action::cache:
-        case Action::insert:
-        case Action::modify:
+        case Action::Cache:
+        case Action::Insert:
+        case Action::Modify:
             break;
     };
     if (!k.check(*sle))
@@ -406,15 +406,15 @@ ApplyStateTable::erase(ReadView const& base, std::shared_ptr<SLE> const& sle)
         Throw<std::logic_error>("ApplyStateTable::erase: unknown SLE");
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("ApplyStateTable::erase: double erase");
             break;
-        case Action::insert:
+        case Action::Insert:
             items_.erase(iter);
             break;
-        case Action::cache:
-        case Action::modify:
-            item.first = Action::erase;
+        case Action::Cache:
+        case Action::Modify:
+            item.first = Action::Erase;
             break;
     }
 }
@@ -424,21 +424,21 @@ ApplyStateTable::rawErase(ReadView const& base, std::shared_ptr<SLE> const& sle)
 {
     using namespace std;
     auto const result = items_.emplace(
-        piecewise_construct, forward_as_tuple(sle->key()), forward_as_tuple(Action::erase, sle));
+        piecewise_construct, forward_as_tuple(sle->key()), forward_as_tuple(Action::Erase, sle));
     if (result.second)
         return;
     auto& item = result.first->second;
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("ApplyStateTable::rawErase: double erase");
             break;
-        case Action::insert:
+        case Action::Insert:
             items_.erase(result.first);
             break;
-        case Action::cache:
-        case Action::modify:
-            item.first = Action::erase;
+        case Action::Cache:
+        case Action::Modify:
+            item.first = Action::Erase;
             item.second = sle;
             break;
     }
@@ -455,22 +455,22 @@ ApplyStateTable::insert(ReadView const& base, std::shared_ptr<SLE> const& sle)
             iter,
             piecewise_construct,
             forward_as_tuple(sle->key()),
-            forward_as_tuple(Action::insert, sle));
+            forward_as_tuple(Action::Insert, sle));
         return;
     }
     auto& item = iter->second;
     switch (item.first)
     {
-        case Action::cache:
+        case Action::Cache:
             Throw<std::logic_error>("ApplyStateTable::insert: already cached");
-        case Action::insert:
+        case Action::Insert:
             Throw<std::logic_error>("ApplyStateTable::insert: already inserted");
-        case Action::modify:
+        case Action::Modify:
             Throw<std::logic_error>("ApplyStateTable::insert: already modified");
-        case Action::erase:
+        case Action::Erase:
             break;
     }
-    item.first = Action::modify;
+    item.first = Action::Modify;
     item.second = sle;
 }
 
@@ -485,19 +485,19 @@ ApplyStateTable::replace(ReadView const& base, std::shared_ptr<SLE> const& sle)
             iter,
             piecewise_construct,
             forward_as_tuple(sle->key()),
-            forward_as_tuple(Action::modify, sle));
+            forward_as_tuple(Action::Modify, sle));
         return;
     }
     auto& item = iter->second;
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("ApplyStateTable::replace: already erased");
-        case Action::cache:
-            item.first = Action::modify;
+        case Action::Cache:
+            item.first = Action::Modify;
             break;
-        case Action::insert:
-        case Action::modify:
+        case Action::Insert:
+        case Action::Modify:
             break;
     }
     item.second = sle;
@@ -514,14 +514,14 @@ ApplyStateTable::update(ReadView const& base, std::shared_ptr<SLE> const& sle)
         Throw<std::logic_error>("ApplyStateTable::update: unknown SLE");
     switch (item.first)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("ApplyStateTable::update: erased");
             break;
-        case Action::cache:
-            item.first = Action::modify;
+        case Action::Cache:
+            item.first = Action::Modify;
             break;
-        case Action::insert:
-        case Action::modify:
+        case Action::Insert:
+        case Action::Modify:
             break;
     };
 }
@@ -584,7 +584,7 @@ ApplyStateTable::getForMod(ReadView const& base, key_type const& key, Mods& mods
         if (iter != items_.end())
         {
             auto const& item = iter->second;
-            if (item.first == Action::erase)
+            if (item.first == Action::Erase)
             {
                 // The Destination of an Escrow or a PayChannel may have been
                 // deleted.  In that case the account we're threading to will
@@ -592,7 +592,7 @@ ApplyStateTable::getForMod(ReadView const& base, key_type const& key, Mods& mods
                 JLOG(j.warn()) << "Trying to thread to deleted node";
                 return nullptr;
             }
-            if (item.first != Action::cache)
+            if (item.first != Action::Cache)
                 return item.second;
 
             // If it's only cached, then the node is being modified only by
diff --git a/src/libxrpl/ledger/ApplyView.cpp b/src/libxrpl/ledger/ApplyView.cpp
index a3b138dc63..3343748a75 100644
--- a/src/libxrpl/ledger/ApplyView.cpp
+++ b/src/libxrpl/ledger/ApplyView.cpp
@@ -38,7 +38,7 @@ createRoot(
     describe(newRoot);
 
     STVector256 v;
-    v.push_back(key);
+    v.pushBack(key);
     newRoot->setFieldV256(sfIndexes, v);
 
     view.insert(newRoot);
@@ -80,7 +80,7 @@ insertKey(
         if (std::ranges::find(indexes, key) != indexes.end())
             Throw<std::logic_error>("dirInsert: double insertion");  // LCOV_EXCL_LINE
 
-        indexes.push_back(key);
+        indexes.pushBack(key);
     }
     else
     {
@@ -125,7 +125,7 @@ insertPage(
     // Check whether we're out of pages.
     if (page == 0)
         return std::nullopt;
-    if (!view.rules().enabled(fixDirectoryLimit) && page >= dirNodeMaxPages)  // Old pages limit
+    if (!view.rules().enabled(fixDirectoryLimit) && page >= kDIR_NODE_MAX_PAGES)  // Old pages limit
         return std::nullopt;
 
     // We are about to create a new node; we'll link it to
@@ -138,7 +138,7 @@ insertPage(
 
     // Insert the new key:
     STVector256 indexes;
-    indexes.push_back(key);
+    indexes.pushBack(key);
 
     node = std::make_shared<SLE>(keylet::page(directory, page));
     node->setFieldH256(sfRootIndex, directory.key);
@@ -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() < dirNodeMaxEntries)
+    if (indexes.size() < kDIR_NODE_MAX_ENTRIES)
     {
         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 rootPage = 0;
+    std::uint64_t constexpr kROOT_PAGE = 0;
     auto prevPage = node->getFieldU64(sfIndexPrevious);
     auto nextPage = node->getFieldU64(sfIndexNext);
 
-    if (nextPage == rootPage && prevPage != rootPage)
+    if (nextPage == kROOT_PAGE && prevPage != kROOT_PAGE)
         Throw<std::logic_error>("Directory chain: fwd link broken");  // LCOV_EXCL_LINE
 
-    if (prevPage == rootPage && nextPage != rootPage)
+    if (prevPage == kROOT_PAGE && nextPage != kROOT_PAGE)
         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 != rootPage)
+    // 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)
     {
         auto last = peek(keylet::page(directory, nextPage));
 
@@ -230,21 +230,23 @@ ApplyView::emptyDirDelete(Keylet const& directory)
         if (!last->getFieldV256(sfIndexes).empty())
             return false;
 
-        // Update the first page's linked list and mark it as updated.
-        node->setFieldU64(sfIndexNext, rootPage);
-        node->setFieldU64(sfIndexPrevious, rootPage);
+        // Update the first page's linked list and
+        // mark it as updated.
+        node->setFieldU64(sfIndexNext, kROOT_PAGE);
+        node->setFieldU64(sfIndexPrevious, kROOT_PAGE);
         update(node);
 
         // And erase the empty last page:
         erase(last);
 
-        // Make sure our local values reflect the updated information:
-        nextPage = rootPage;
-        prevPage = rootPage;
+        // Make sure our local values reflect the
+        // updated information:
+        nextPage = kROOT_PAGE;
+        prevPage = kROOT_PAGE;
     }
 
     // If there are no other pages, erase the root:
-    if (nextPage == rootPage && prevPage == rootPage)
+    if (nextPage == kROOT_PAGE && prevPage == kROOT_PAGE)
         erase(node);
 
     return true;
@@ -258,7 +260,7 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
     if (!node)
         return false;
 
-    std::uint64_t constexpr rootPage = 0;
+    std::uint64_t constexpr kROOT_PAGE = 0;
 
     {
         auto entries = node->getFieldV256(sfIndexes);
@@ -283,10 +285,11 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
     auto prevPage = node->getFieldU64(sfIndexPrevious);
     auto nextPage = node->getFieldU64(sfIndexNext);
 
-    // The first page is the directory's root node and is treated specially: it
-    // can never be deleted even if it is empty, unless we plan on removing the
-    // entire directory.
-    if (page == rootPage)
+    // The first page is the directory's root node and is
+    // 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 (nextPage == page && prevPage != page)
             Throw<std::logic_error>("Directory chain: fwd link broken");  // LCOV_EXCL_LINE
@@ -355,32 +358,32 @@ ApplyView::dirRemove(Keylet const& directory, std::uint64_t page, uint256 const&
     // The page is no longer linked. Delete it.
     erase(node);
 
-    // Check whether the next page is the last page and, if so, whether it's
-    // empty. If it is, delete it.
-    if (nextPage != rootPage && next->getFieldU64(sfIndexNext) == rootPage &&
+    // 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 &&
         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, rootPage);
+        prev->setFieldU64(sfIndexNext, kROOT_PAGE);
         update(prev);
 
         // And the root points to the last page:
-        auto root = peek(keylet::page(directory, rootPage));
+        auto root = peek(keylet::page(directory, kROOT_PAGE));
         if (!root)
             Throw<std::logic_error>("Directory chain: root link broken.");  // LCOV_EXCL_LINE
 
         root->setFieldU64(sfIndexPrevious, prevPage);
         update(root);
 
-        nextPage = rootPage;
+        nextPage = kROOT_PAGE;
     }
 
-    // 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 == rootPage && prevPage == rootPage)
+    // 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 (prev->getFieldV256(sfIndexes).empty())
             erase(prev);
diff --git a/src/libxrpl/ledger/ApplyViewBase.cpp b/src/libxrpl/ledger/ApplyViewBase.cpp
index d617279a80..e5a8e11b4c 100644
--- a/src/libxrpl/ledger/ApplyViewBase.cpp
+++ b/src/libxrpl/ledger/ApplyViewBase.cpp
@@ -65,31 +65,31 @@ ApplyViewBase::read(Keylet const& k) const
 }
 
 auto
-ApplyViewBase::slesBegin() const -> std::unique_ptr<sles_type::iter_base>
+ApplyViewBase::slesBegin() const -> std::unique_ptr<SlesType::iter_base>
 {
     return base_->slesBegin();
 }
 
 auto
-ApplyViewBase::slesEnd() const -> std::unique_ptr<sles_type::iter_base>
+ApplyViewBase::slesEnd() const -> std::unique_ptr<SlesType::iter_base>
 {
     return base_->slesEnd();
 }
 
 auto
-ApplyViewBase::slesUpperBound(uint256 const& key) const -> std::unique_ptr<sles_type::iter_base>
+ApplyViewBase::slesUpperBound(uint256 const& key) const -> std::unique_ptr<SlesType::iter_base>
 {
     return base_->slesUpperBound(key);
 }
 
 auto
-ApplyViewBase::txsBegin() const -> std::unique_ptr<txs_type::iter_base>
+ApplyViewBase::txsBegin() const -> std::unique_ptr<TxsType::iter_base>
 {
     return base_->txsBegin();
 }
 
 auto
-ApplyViewBase::txsEnd() const -> std::unique_ptr<txs_type::iter_base>
+ApplyViewBase::txsEnd() const -> std::unique_ptr<TxsType::iter_base>
 {
     return base_->txsEnd();
 }
diff --git a/src/libxrpl/ledger/BookDirs.cpp b/src/libxrpl/ledger/BookDirs.cpp
index cbe93a159b..fbe876669e 100644
--- a/src/libxrpl/ledger/BookDirs.cpp
+++ b/src/libxrpl/ledger/BookDirs.cpp
@@ -1,6 +1,5 @@
 #include <xrpl/ledger/BookDirs.h>
 
-#include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/ledger/ReadView.h>
@@ -16,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::zero))
+    , key_(view_->succ(root_, next_quality_).value_or(beast::kZERO))
 {
-    XRPL_ASSERT(root_ != beast::zero, "xrpl::BookDirs::BookDirs : nonzero root");
-    if (key_ != beast::zero)
+    XRPL_ASSERT(root_ != beast::kZERO, "xrpl::BookDirs::BookDirs : nonzero root");
+    if (key_ != beast::kZERO)
     {
         if (!cdirFirst(*view_, key_, sle_, entry_, index_))
         {
@@ -34,7 +33,7 @@ auto
 BookDirs::begin() const -> BookDirs::const_iterator
 {
     auto it = BookDirs::const_iterator(*view_, root_, key_);
-    if (key_ != beast::zero)
+    if (key_ != beast::kZERO)
     {
         it.next_quality_ = next_quality_;
         it.sle_ = sle_;
@@ -50,8 +49,6 @@ BookDirs::end() const -> BookDirs::const_iterator
     return BookDirs::const_iterator(*view_, root_, key_);
 }
 
-beast::Journal BookDirs::const_iterator::j_ = beast::Journal{beast::Journal::getNullSink()};
-
 bool
 BookDirs::const_iterator::operator==(BookDirs::const_iterator const& other) const
 {
@@ -68,7 +65,8 @@ BookDirs::const_iterator::operator==(BookDirs::const_iterator const& other) cons
 BookDirs::const_iterator::reference
 BookDirs::const_iterator::operator*() const
 {
-    XRPL_ASSERT(index_ != beast::zero, "xrpl::BookDirs::const_iterator::operator* : nonzero index");
+    XRPL_ASSERT(
+        index_ != beast::kZERO, "xrpl::BookDirs::const_iterator::operator* : nonzero index");
     if (!cache_)
         cache_ = view_->read(keylet::offer(index_));
     return *cache_;
@@ -77,19 +75,19 @@ BookDirs::const_iterator::operator*() const
 BookDirs::const_iterator&
 BookDirs::const_iterator::operator++()
 {
-    using beast::zero;
+    using beast::kZERO;
 
-    XRPL_ASSERT(index_ != zero, "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(zero);
+            cur_key_ = view_->succ(++cur_key_, next_quality_).value_or(kZERO);
 
-        if (index_ != 0 || cur_key_ == zero)
+        if (index_ != 0 || cur_key_ == kZERO)
         {
             cur_key_ = key_;
             entry_ = 0;
-            index_ = zero;
+            index_ = kZERO;
         }
         else if (!cdirFirst(*view_, cur_key_, sle_, entry_, index_))
         {
@@ -107,7 +105,7 @@ BookDirs::const_iterator
 BookDirs::const_iterator::operator++(int)
 {
     XRPL_ASSERT(
-        index_ != beast::zero, "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/BookListeners.cpp b/src/libxrpl/ledger/BookListeners.cpp
index d922dc3a67..d78da4c73e 100644
--- a/src/libxrpl/ledger/BookListeners.cpp
+++ b/src/libxrpl/ledger/BookListeners.cpp
@@ -13,24 +13,24 @@ namespace xrpl {
 void
 BookListeners::addSubscriber(InfoSub::ref sub)
 {
-    std::scoped_lock const sl(mLock);
-    mListeners[sub->getSeq()] = sub;
+    std::scoped_lock const sl(lock_);
+    listeners_[sub->getSeq()] = sub;
 }
 
 void
 BookListeners::removeSubscriber(std::uint64_t seq)
 {
-    std::scoped_lock const sl(mLock);
-    mListeners.erase(seq);
+    std::scoped_lock const sl(lock_);
+    listeners_.erase(seq);
 }
 
 void
 BookListeners::publish(MultiApiJson const& jvObj, hash_set<std::uint64_t>& havePublished)
 {
-    std::scoped_lock const sl(mLock);
-    auto it = mListeners.cbegin();
+    std::scoped_lock const sl(lock_);
+    auto it = listeners_.cbegin();
 
-    while (it != mListeners.cend())
+    while (it != listeners_.cend())
     {
         InfoSub::pointer p = it->second.lock();
 
@@ -41,13 +41,13 @@ BookListeners::publish(MultiApiJson const& jvObj, hash_set<std::uint64_t>& haveP
             {
                 jvObj.visit(
                     p->getApiVersion(),  //
-                    [&](Json::Value const& jv) { p->send(jv, true); });
+                    [&](json::Value const& jv) { p->send(jv, true); });
             }
             ++it;
         }
         else
         {
-            it = mListeners.erase(it);
+            it = listeners_.erase(it);
         }
     }
 }
diff --git a/src/libxrpl/ledger/CachedView.cpp b/src/libxrpl/ledger/CachedView.cpp
index bb7ff97153..2dc28d67e0 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 hits{"CachedView::hit"};
-    static CountedObjects::Counter hitsexpired{"CachedView::hitExpired"};
-    static CountedObjects::Counter misses{"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)
     {
-        hitsexpired.increment();
+        kHITSEXPIRED.increment();
     }
     else if (cacheHit)
     {
-        hits.increment();
+        kHITS.increment();
     }
     else
     {
-        misses.increment();
+        kMISSES.increment();
     }
 
     if (!cacheHit)
diff --git a/src/libxrpl/ledger/CanonicalTXSet.cpp b/src/libxrpl/ledger/CanonicalTXSet.cpp
index be5006d33b..bfa3d811e6 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::zero;
+    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::zero);
+    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 bf5eaf02fd..a633257b27 100644
--- a/src/libxrpl/ledger/Dir.cpp
+++ b/src/libxrpl/ledger/Dir.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl {
 
-using const_iterator = Dir::const_iterator;
+using const_iterator = Dir::ConstIterator;
 
 Dir::Dir(ReadView const& view, Keylet const& key)
     : view_(&view), root_(key), sle_(view_->read(root_))
@@ -23,9 +23,9 @@ Dir::Dir(ReadView const& view, Keylet const& key)
 }
 
 auto
-Dir::begin() const -> const_iterator
+Dir::begin() const -> ConstIterator
 {
-    auto it = const_iterator(*view_, root_, root_);
+    auto it = ConstIterator(*view_, root_, root_);
     if (sle_ != nullptr)
     {
         it.sle_ = sle_;
@@ -41,13 +41,13 @@ Dir::begin() const -> const_iterator
 }
 
 auto
-Dir::end() const -> const_iterator
+Dir::end() const -> ConstIterator
 {
-    return const_iterator(*view_, root_, root_);
+    return ConstIterator(*view_, root_, root_);
 }
 
 bool
-const_iterator::operator==(const_iterator const& other) const
+const_iterator::operator==(ConstIterator const& other) const
 {
     if (view_ == nullptr || other.view_ == nullptr)
         return false;
@@ -61,7 +61,7 @@ const_iterator::operator==(const_iterator const& other) const
 const_iterator::reference
 const_iterator::operator*() const
 {
-    XRPL_ASSERT(index_ != beast::zero, "xrpl::const_iterator::operator* : nonzero index");
+    XRPL_ASSERT(index_ != beast::kZERO, "xrpl::const_iterator::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::zero, "xrpl::const_iterator::operator++ : nonzero index");
+    XRPL_ASSERT(index_ != beast::kZERO, "xrpl::const_iterator::operator++ : nonzero index");
     if (++it_ != std::end(*indexes_))
     {
         index_ = *it_;
@@ -78,26 +78,26 @@ const_iterator::operator++()
         return *this;
     }
 
-    return next_page();
+    return nextPage();
 }
 
 const_iterator
 const_iterator::operator++(int)
 {
-    XRPL_ASSERT(index_ != beast::zero, "xrpl::const_iterator::operator++(int) : nonzero index");
-    const_iterator tmp(*this);
+    XRPL_ASSERT(index_ != beast::kZERO, "xrpl::const_iterator::operator++(int) : nonzero index");
+    ConstIterator tmp(*this);
     ++(*this);
     return tmp;
 }
 
 const_iterator&
-const_iterator::next_page()
+const_iterator::nextPage()
 {
     auto const next = sle_->getFieldU64(sfIndexNext);
     if (next == 0)
     {
         page_.key = root_.key;
-        index_ = beast::zero;
+        index_ = beast::kZERO;
     }
     else
     {
@@ -107,7 +107,7 @@ const_iterator::next_page()
         indexes_ = &sle_->getFieldV256(sfIndexes);
         if (indexes_->empty())
         {
-            index_ = beast::zero;
+            index_ = beast::kZERO;
         }
         else
         {
@@ -120,7 +120,7 @@ const_iterator::next_page()
 }
 
 std::size_t
-const_iterator::page_size()
+const_iterator::pageSize()
 {
     return indexes_->size();
 }
diff --git a/src/libxrpl/ledger/Ledger.cpp b/src/libxrpl/ledger/Ledger.cpp
index 6630d4f9bf..9857b49b65 100644
--- a/src/libxrpl/ledger/Ledger.cpp
+++ b/src/libxrpl/ledger/Ledger.cpp
@@ -46,36 +46,36 @@
 
 namespace xrpl {
 
-create_genesis_t const create_genesis{};
+CreateGenesisT const kCREATE_GENESIS{};
 
 //------------------------------------------------------------------------------
 
-class Ledger::sles_iter_impl : public sles_type::iter_base
+class Ledger::SlesIterImpl : public SlesType::iter_base
 {
 private:
-    SHAMap::const_iterator iter_;
+    SHAMap::ConstIterator iter_;
 
 public:
-    sles_iter_impl() = delete;
-    sles_iter_impl&
-    operator=(sles_iter_impl const&) = delete;
+    SlesIterImpl() = delete;
+    SlesIterImpl&
+    operator=(SlesIterImpl const&) = delete;
 
-    sles_iter_impl(sles_iter_impl const&) = default;
+    SlesIterImpl(SlesIterImpl const&) = default;
 
-    sles_iter_impl(SHAMap::const_iterator iter) : iter_(iter)
+    SlesIterImpl(SHAMap::ConstIterator iter) : iter_(iter)
     {
     }
 
     [[nodiscard]] std::unique_ptr<base_type>
     copy() const override
     {
-        return std::make_unique<sles_iter_impl>(*this);
+        return std::make_unique<SlesIterImpl>(*this);
     }
 
     [[nodiscard]] bool
     equal(base_type const& impl) const override
     {
-        if (auto const p = dynamic_cast<sles_iter_impl const*>(&impl))
+        if (auto const p = dynamic_cast<SlesIterImpl const*>(&impl))
             return iter_ == p->iter_;
         return false;
     }
@@ -86,7 +86,7 @@ public:
         ++iter_;
     }
 
-    [[nodiscard]] sles_type::value_type
+    [[nodiscard]] SlesType::value_type
     dereference() const override
     {
         SerialIter sit(iter_->slice());
@@ -96,33 +96,33 @@ public:
 
 //------------------------------------------------------------------------------
 
-class Ledger::txs_iter_impl : public txs_type::iter_base
+class Ledger::TxsIterImpl : public TxsType::iter_base
 {
 private:
     bool metadata_;
-    SHAMap::const_iterator iter_;
+    SHAMap::ConstIterator iter_;
 
 public:
-    txs_iter_impl() = delete;
-    txs_iter_impl&
-    operator=(txs_iter_impl const&) = delete;
+    TxsIterImpl() = delete;
+    TxsIterImpl&
+    operator=(TxsIterImpl const&) = delete;
 
-    txs_iter_impl(txs_iter_impl const&) = default;
+    TxsIterImpl(TxsIterImpl const&) = default;
 
-    txs_iter_impl(bool metadata, SHAMap::const_iterator iter) : metadata_(metadata), iter_(iter)
+    TxsIterImpl(bool metadata, SHAMap::ConstIterator iter) : metadata_(metadata), iter_(iter)
     {
     }
 
     [[nodiscard]] std::unique_ptr<base_type>
     copy() const override
     {
-        return std::make_unique<txs_iter_impl>(*this);
+        return std::make_unique<TxsIterImpl>(*this);
     }
 
     [[nodiscard]] bool
     equal(base_type const& impl) const override
     {
-        if (auto const p = dynamic_cast<txs_iter_impl const*>(&impl))
+        if (auto const p = dynamic_cast<TxsIterImpl const*>(&impl))
             return iter_ == p->iter_;
         return false;
     }
@@ -133,7 +133,7 @@ public:
         ++iter_;
     }
 
-    [[nodiscard]] txs_type::value_type
+    [[nodiscard]] TxsType::value_type
     dereference() const override
     {
         auto const& item = *iter_;
@@ -146,12 +146,12 @@ public:
 //------------------------------------------------------------------------------
 
 Ledger::Ledger(
-    create_genesis_t,
+    CreateGenesisT,
     Rules rules,
     Fees const& fees,
     std::vector<uint256> const& amendments,
     Family& family)
-    : mImmutable(false)
+    : immutable_(false)
     , txMap_(SHAMapType::TRANSACTION, family)
     , stateMap_(SHAMapType::STATE, family)
     , fees_(fees)
@@ -159,15 +159,15 @@ Ledger::Ledger(
     , j_(beast::Journal(beast::Journal::getNullSink()))
 {
     header_.seq = 1;
-    header_.drops = INITIAL_XRP;
-    header_.closeTimeResolution = ledgerGenesisTimeResolution;
+    header_.drops = kINITIAL_XRP;
+    header_.closeTimeResolution = kLEDGER_GENESIS_TIME_RESOLUTION;
 
-    static auto const id =
-        calcAccountID(generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase")).first);
+    static auto const kID =
+        calcAccountID(generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
     {
-        auto const sle = std::make_shared<SLE>(keylet::account(id));
+        auto const sle = std::make_shared<SLE>(keylet::account(kID));
         sle->setFieldU32(sfSequence, 1);
-        sle->setAccountID(sfAccount, id);
+        sle->setAccountID(sfAccount, kID);
         sle->setFieldAmount(sfBalance, header_.drops);
         rawInsert(sle);
     }
@@ -196,12 +196,12 @@ Ledger::Ledger(
                 sle->at(sfReserveBase) = *f;
             if (auto const f = fees.increment.dropsAs<std::uint32_t>())
                 sle->at(sfReserveIncrement) = *f;
-            sle->at(sfReferenceFeeUnits) = FEE_UNITS_DEPRECATED;
+            sle->at(sfReferenceFeeUnits) = kFEE_UNITS_DEPRECATED;
         }
         rawInsert(sle);
     }
 
-    stateMap_.flushDirty(NodeObjectType::hotACCOUNT_NODE);
+    stateMap_.flushDirty(NodeObjectType::AccountNode);
     setImmutable();
 }
 
@@ -213,7 +213,7 @@ Ledger::Ledger(
     Fees const& fees,
     Family& family,
     beast::Journal j)
-    : mImmutable(true)
+    : immutable_(true)
     , txMap_(SHAMapType::TRANSACTION, info.txHash, family)
     , stateMap_(SHAMapType::STATE, info.accountHash, family)
     , fees_(fees)
@@ -252,7 +252,7 @@ Ledger::Ledger(
 
 // Create a new ledger that follows this one
 Ledger::Ledger(Ledger const& prevLedger, NetClock::time_point closeTime)
-    : mImmutable(false)
+    : immutable_(false)
     , txMap_(SHAMapType::TRANSACTION, prevLedger.txMap_.family())
     , stateMap_(prevLedger.stateMap_, true)
     , fees_(prevLedger.fees_)
@@ -279,7 +279,7 @@ Ledger::Ledger(Ledger const& prevLedger, NetClock::time_point closeTime)
 }
 
 Ledger::Ledger(LedgerHeader const& info, Rules rules, Family& family)
-    : mImmutable(true)
+    : immutable_(true)
     , txMap_(SHAMapType::TRANSACTION, info.txHash, family)
     , stateMap_(SHAMapType::STATE, info.accountHash, family)
     , rules_(std::move(rules))
@@ -295,7 +295,7 @@ Ledger::Ledger(
     Rules rules,
     Fees const& fees,
     Family& family)
-    : mImmutable(false)
+    : immutable_(false)
     , txMap_(SHAMapType::TRANSACTION, family)
     , stateMap_(SHAMapType::STATE, family)
     , fees_(fees)
@@ -304,7 +304,7 @@ Ledger::Ledger(
 {
     header_.seq = ledgerSeq;
     header_.closeTime = closeTime;
-    header_.closeTimeResolution = ledgerDefaultTimeResolution;
+    header_.closeTimeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
     setup();
 }
 
@@ -313,16 +313,16 @@ Ledger::setImmutable(bool rehash)
 {
     // Force update, since this is the only
     // place the hash transitions to valid
-    if (!mImmutable && rehash)
+    if (!immutable_ && rehash)
     {
-        header_.txHash = txMap_.getHash().as_uint256();
-        header_.accountHash = stateMap_.getHash().as_uint256();
+        header_.txHash = txMap_.getHash().asUint256();
+        header_.accountHash = stateMap_.getHash().asUint256();
     }
 
     if (rehash)
         header_.hash = calculateLedgerHash(header_);
 
-    mImmutable = true;
+    immutable_ = true;
     txMap_.setImmutable();
     stateMap_.setImmutable();
     setup();
@@ -339,7 +339,7 @@ Ledger::setAccepted(
 
     header_.closeTime = closeTime;
     header_.closeTimeResolution = closeResolution;
-    header_.closeFlags = correctCloseTime ? 0 : sLCF_NoConsensusTime;
+    header_.closeFlags = correctCloseTime ? 0 : kS_LCF_NO_CONSENSUS_TIME;
     setImmutable();
 }
 
@@ -347,8 +347,7 @@ bool
 Ledger::addSLE(SLE const& sle)
 {
     auto const s = sle.getSerializer();
-    return stateMap_.addItem(
-        SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(sle.key(), s.slice()));
+    return stateMap_.addItem(SHAMapNodeType::TnAccountState, makeShamapitem(sle.key(), s.slice()));
 }
 
 //------------------------------------------------------------------------------
@@ -394,7 +393,7 @@ Ledger::exists(uint256 const& key) const
 std::optional<uint256>
 Ledger::succ(uint256 const& key, std::optional<uint256> const& last) const
 {
-    auto item = stateMap_.upper_bound(key);
+    auto item = stateMap_.upperBound(key);
     if (item == stateMap_.end())
         return std::nullopt;
     if (last && item->key() >= last)
@@ -405,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::zero)
+    if (k.key == beast::kZERO)
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::Ledger::read : zero key");
@@ -424,33 +423,33 @@ Ledger::read(Keylet const& k) const
 //------------------------------------------------------------------------------
 
 auto
-Ledger::slesBegin() const -> std::unique_ptr<sles_type::iter_base>
+Ledger::slesBegin() const -> std::unique_ptr<SlesType::iter_base>
 {
-    return std::make_unique<sles_iter_impl>(stateMap_.begin());
+    return std::make_unique<SlesIterImpl>(stateMap_.begin());
 }
 
 auto
-Ledger::slesEnd() const -> std::unique_ptr<sles_type::iter_base>
+Ledger::slesEnd() const -> std::unique_ptr<SlesType::iter_base>
 {
-    return std::make_unique<sles_iter_impl>(stateMap_.end());
+    return std::make_unique<SlesIterImpl>(stateMap_.end());
 }
 
 auto
-Ledger::slesUpperBound(uint256 const& key) const -> std::unique_ptr<sles_type::iter_base>
+Ledger::slesUpperBound(uint256 const& key) const -> std::unique_ptr<SlesType::iter_base>
 {
-    return std::make_unique<sles_iter_impl>(stateMap_.upper_bound(key));
+    return std::make_unique<SlesIterImpl>(stateMap_.upperBound(key));
 }
 
 auto
-Ledger::txsBegin() const -> std::unique_ptr<txs_type::iter_base>
+Ledger::txsBegin() const -> std::unique_ptr<TxsType::iter_base>
 {
-    return std::make_unique<txs_iter_impl>(!open(), txMap_.begin());
+    return std::make_unique<TxsIterImpl>(!open(), txMap_.begin());
 }
 
 auto
-Ledger::txsEnd() const -> std::unique_ptr<txs_type::iter_base>
+Ledger::txsEnd() const -> std::unique_ptr<TxsType::iter_base>
 {
-    return std::make_unique<txs_iter_impl>(!open(), txMap_.end());
+    return std::make_unique<TxsIterImpl>(!open(), txMap_.end());
 }
 
 bool
@@ -481,7 +480,7 @@ Ledger::digest(key_type const& key) const -> std::optional<digest_type>
     //        from the NodeStore needlessly.
     if (!stateMap_.peekItem(key, digest))
         return std::nullopt;
-    return digest.as_uint256();
+    return digest.asUint256();
 }
 
 //------------------------------------------------------------------------------
@@ -490,14 +489,14 @@ void
 Ledger::rawErase(std::shared_ptr<SLE> const& sle)
 {
     if (!stateMap_.delItem(sle->key()))
-        LogicError("Ledger::rawErase: key not found");
+        logicError("Ledger::rawErase: key not found");
 }
 
 void
 Ledger::rawErase(uint256 const& key)
 {
     if (!stateMap_.delItem(key))
-        LogicError("Ledger::rawErase: key not found");
+        logicError("Ledger::rawErase: key not found");
 }
 
 void
@@ -506,8 +505,10 @@ Ledger::rawInsert(std::shared_ptr<SLE> const& sle)
     Serializer ss;
     sle->add(ss);
     if (!stateMap_.addGiveItem(
-            SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(sle->key(), ss.slice())))
-        LogicError("Ledger::rawInsert: key already exists");
+            SHAMapNodeType::TnAccountState, makeShamapitem(sle->key(), ss.slice())))
+    {
+        logicError("Ledger::rawInsert: key already exists");
+    }
 }
 
 void
@@ -516,8 +517,10 @@ Ledger::rawReplace(std::shared_ptr<SLE> const& sle)
     Serializer ss;
     sle->add(ss);
     if (!stateMap_.updateGiveItem(
-            SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(sle->key(), ss.slice())))
-        LogicError("Ledger::rawReplace: key not found");
+            SHAMapNodeType::TnAccountState, makeShamapitem(sle->key(), ss.slice())))
+    {
+        logicError("Ledger::rawReplace: key not found");
+    }
 }
 
 void
@@ -532,8 +535,8 @@ Ledger::rawTxInsert(
     Serializer s(txn->getDataLength() + metaData->getDataLength() + 16);
     s.addVL(txn->peekData());
     s.addVL(metaData->peekData());
-    if (!txMap_.addGiveItem(SHAMapNodeType::tnTRANSACTION_MD, make_shamapitem(key, s.slice())))
-        LogicError("duplicate_tx: " + to_string(key));
+    if (!txMap_.addGiveItem(SHAMapNodeType::TnTransactionMd, makeShamapitem(key, s.slice())))
+        logicError("duplicate_tx: " + to_string(key));
 }
 
 bool
@@ -552,7 +555,7 @@ Ledger::setup()
     catch (std::exception const& ex)
     {
         JLOG(j_.error()) << "Exception in " << __func__ << ": " << ex.what();
-        Rethrow();
+        rethrow();
     }
 
     try
@@ -614,7 +617,7 @@ Ledger::setup()
     catch (std::exception const& ex)
     {
         JLOG(j_.error()) << "Exception in " << __func__ << ": " << ex.what();
-        Rethrow();
+        rethrow();
     }
 
     return ret;
@@ -707,13 +710,13 @@ Ledger::updateNegativeUNL()
             if (hasToReEnable && v.isFieldPresent(sfPublicKey) &&
                 v.getFieldVL(sfPublicKey) == sle->getFieldVL(sfValidatorToReEnable))
                 continue;
-            newNUnl.push_back(v);
+            newNUnl.pushBack(v);
         }
     }
 
     if (hasToDisable)
     {
-        newNUnl.push_back(STObject::makeInnerObject(sfDisabledValidator));
+        newNUnl.pushBack(STObject::makeInnerObject(sfDisabledValidator));
         newNUnl.back().setFieldVL(sfPublicKey, sle->getFieldVL(sfValidatorToDisable));
         newNUnl.back().setFieldU32(sfFirstLedgerSequence, seq());
     }
@@ -792,9 +795,9 @@ Ledger::isSensible() const
         return false;
     if (header_.accountHash.isZero())
         return false;
-    if (header_.accountHash != stateMap_.getHash().as_uint256())
+    if (header_.accountHash != stateMap_.getHash().asUint256())
         return false;
-    if (header_.txHash != txMap_.getHash().as_uint256())
+    if (header_.txHash != txMap_.getHash().asUint256())
         return false;
     return true;
 }
diff --git a/src/libxrpl/ledger/OpenView.cpp b/src/libxrpl/ledger/OpenView.cpp
index 28da1aedcb..afe826d78d 100644
--- a/src/libxrpl/ledger/OpenView.cpp
+++ b/src/libxrpl/ledger/OpenView.cpp
@@ -24,14 +24,14 @@
 
 namespace xrpl {
 
-class OpenView::txs_iter_impl : public txs_type::iter_base
+class OpenView::TxsIterImpl : public TxsType::iter_base
 {
 private:
     bool metadata_;
     txs_map::const_iterator iter_;
 
 public:
-    explicit txs_iter_impl(bool metadata, txs_map::const_iterator iter)
+    explicit TxsIterImpl(bool metadata, txs_map::const_iterator iter)
         : metadata_(metadata), iter_(iter)
     {
     }
@@ -39,13 +39,13 @@ public:
     [[nodiscard]] std::unique_ptr<base_type>
     copy() const override
     {
-        return std::make_unique<txs_iter_impl>(metadata_, iter_);
+        return std::make_unique<TxsIterImpl>(metadata_, iter_);
     }
 
     [[nodiscard]] bool
     equal(base_type const& impl) const override
     {
-        if (auto const p = dynamic_cast<txs_iter_impl const*>(&impl))
+        if (auto const p = dynamic_cast<TxsIterImpl const*>(&impl))
             return iter_ == p->iter_;
         return false;
     }
@@ -79,7 +79,7 @@ OpenView::OpenView(OpenView const& rhs)
     : ReadView(rhs)
     , TxsRawView(rhs)
     , monotonic_resource_{std::make_unique<boost::container::pmr::monotonic_buffer_resource>(
-          initialBufferSize)}
+          kINITIAL_BUFFER_SIZE)}
     , txs_{rhs.txs_, monotonic_resource_.get()}
     , rules_{rhs.rules_}
     , header_{rhs.header_}
@@ -88,13 +88,9 @@ OpenView::OpenView(OpenView const& rhs)
     , hold_{rhs.hold_}
     , open_{rhs.open_} {};
 
-OpenView::OpenView(
-    open_ledger_t,
-    ReadView const* base,
-    Rules rules,
-    std::shared_ptr<void const> hold)
+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>(initialBufferSize)}
+          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kINITIAL_BUFFER_SIZE)}
     , txs_{monotonic_resource_.get()}
     , rules_(std::move(rules))
     , header_(base->header())
@@ -110,7 +106,7 @@ OpenView::OpenView(
 
 OpenView::OpenView(ReadView const* base, std::shared_ptr<void const> hold)
     : monotonic_resource_{
-          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(initialBufferSize)}
+          std::make_unique<boost::container::pmr::monotonic_buffer_resource>(kINITIAL_BUFFER_SIZE)}
     , txs_{monotonic_resource_.get()}
     , rules_(base->rules())
     , header_(base->header())
@@ -174,33 +170,33 @@ OpenView::read(Keylet const& k) const
 }
 
 auto
-OpenView::slesBegin() const -> std::unique_ptr<sles_type::iter_base>
+OpenView::slesBegin() const -> std::unique_ptr<SlesType::iter_base>
 {
     return items_.slesBegin(*base_);
 }
 
 auto
-OpenView::slesEnd() const -> std::unique_ptr<sles_type::iter_base>
+OpenView::slesEnd() const -> std::unique_ptr<SlesType::iter_base>
 {
     return items_.slesEnd(*base_);
 }
 
 auto
-OpenView::slesUpperBound(uint256 const& key) const -> std::unique_ptr<sles_type::iter_base>
+OpenView::slesUpperBound(uint256 const& key) const -> std::unique_ptr<SlesType::iter_base>
 {
     return items_.slesUpperBound(*base_, key);
 }
 
 auto
-OpenView::txsBegin() const -> std::unique_ptr<txs_type::iter_base>
+OpenView::txsBegin() const -> std::unique_ptr<TxsType::iter_base>
 {
-    return std::make_unique<txs_iter_impl>(!open(), txs_.cbegin());
+    return std::make_unique<TxsIterImpl>(!open(), txs_.cbegin());
 }
 
 auto
-OpenView::txsEnd() const -> std::unique_ptr<txs_type::iter_base>
+OpenView::txsEnd() const -> std::unique_ptr<TxsType::iter_base>
 {
-    return std::make_unique<txs_iter_impl>(!open(), txs_.cend());
+    return std::make_unique<TxsIterImpl>(!open(), txs_.cend());
 }
 
 bool
diff --git a/src/libxrpl/ledger/PaymentSandbox.cpp b/src/libxrpl/ledger/PaymentSandbox.cpp
index ef6e4be8ad..a730b247ba 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::zero)
+    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/RawStateTable.cpp b/src/libxrpl/ledger/RawStateTable.cpp
index f267d2f691..69e2f5c0fe 100644
--- a/src/libxrpl/ledger/RawStateTable.cpp
+++ b/src/libxrpl/ledger/RawStateTable.cpp
@@ -17,24 +17,24 @@
 
 namespace xrpl::detail {
 
-class RawStateTable::sles_iter_impl : public ReadView::sles_type::iter_base
+class RawStateTable::SlesIterImpl : public ReadView::SlesType::iter_base
 {
 private:
     std::shared_ptr<SLE const> sle0_;
-    ReadView::sles_type::iterator iter0_;
-    ReadView::sles_type::iterator end0_;
+    ReadView::SlesType::Iterator iter0_;
+    ReadView::SlesType::Iterator end0_;
     std::shared_ptr<SLE const> sle1_;
     items_t::const_iterator iter1_;
     items_t::const_iterator end1_;
 
 public:
-    sles_iter_impl(sles_iter_impl const&) = default;
+    SlesIterImpl(SlesIterImpl const&) = default;
 
-    sles_iter_impl(
+    SlesIterImpl(
         items_t::const_iterator iter1,
         items_t::const_iterator end1,
-        ReadView::sles_type::iterator iter0,
-        ReadView::sles_type::iterator end0)
+        ReadView::SlesType::Iterator iter0,
+        ReadView::SlesType::Iterator end0)
         : iter0_(std::move(iter0)), end0_(std::move(end0)), iter1_(iter1), end1_(end1)
     {
         if (iter0_ != end0_)
@@ -49,13 +49,13 @@ public:
     std::unique_ptr<base_type>
     copy() const override
     {
-        return std::make_unique<sles_iter_impl>(*this);
+        return std::make_unique<SlesIterImpl>(*this);
     }
 
     bool
     equal(base_type const& impl) const override
     {
-        if (auto const p = dynamic_cast<sles_iter_impl const*>(&impl))
+        if (auto const p = dynamic_cast<SlesIterImpl const*>(&impl))
         {
             XRPL_ASSERT(
                 end1_ == p->end1_ && end0_ == p->end0_,
@@ -151,7 +151,7 @@ private:
     void
     skip()
     {
-        while (iter1_ != end1_ && iter1_->second.action == Action::erase &&
+        while (iter1_ != end1_ && iter1_->second.action == Action::Erase &&
                sle0_->key() == sle1_->key())
         {
             inc1();
@@ -175,13 +175,13 @@ RawStateTable::apply(RawView& to) const
         auto const& item = elem.second;
         switch (item.action)
         {
-            case Action::erase:
+            case Action::Erase:
                 to.rawErase(item.sle);
                 break;
-            case Action::insert:
+            case Action::Insert:
                 to.rawInsert(item.sle);
                 break;
-            case Action::replace:
+            case Action::Replace:
                 to.rawReplace(item.sle);
                 break;
         }
@@ -196,7 +196,7 @@ RawStateTable::exists(ReadView const& base, Keylet const& k) const
     if (iter == items_.end())
         return base.exists(k);
     auto const& item = iter->second;
-    if (item.action == Action::erase)
+    if (item.action == Action::Erase)
         return false;
     if (!k.check(*item.sle))
         return false;
@@ -221,11 +221,11 @@ RawStateTable::succ(ReadView const& base, key_type const& key, std::optional<key
         if (!next)
             break;
         iter = items_.find(*next);
-    } while (iter != items_.end() && iter->second.action == Action::erase);
+    } while (iter != items_.end() && iter->second.action == Action::Erase);
     // Find non-deleted successor in our list
     for (iter = items_.upper_bound(key); iter != items_.end(); ++iter)
     {
-        if (iter->second.action != Action::erase)
+        if (iter->second.action != Action::Erase)
         {
             // Found both, return the lower key
             if (!next || next > iter->first)
@@ -247,20 +247,20 @@ RawStateTable::erase(std::shared_ptr<SLE> const& sle)
     auto const result = items_.emplace(
         std::piecewise_construct,
         std::forward_as_tuple(sle->key()),
-        std::forward_as_tuple(Action::erase, sle));
+        std::forward_as_tuple(Action::Erase, sle));
     if (result.second)
         return;
     auto& item = result.first->second;
     switch (item.action)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("RawStateTable::erase: already erased");
             break;
-        case Action::insert:
+        case Action::Insert:
             items_.erase(result.first);
             break;
-        case Action::replace:
-            item.action = Action::erase;
+        case Action::Replace:
+            item.action = Action::Erase;
             item.sle = sle;
             break;
     }
@@ -272,20 +272,20 @@ RawStateTable::insert(std::shared_ptr<SLE> const& sle)
     auto const result = items_.emplace(
         std::piecewise_construct,
         std::forward_as_tuple(sle->key()),
-        std::forward_as_tuple(Action::insert, sle));
+        std::forward_as_tuple(Action::Insert, sle));
     if (result.second)
         return;
     auto& item = result.first->second;
     switch (item.action)
     {
-        case Action::erase:
-            item.action = Action::replace;
+        case Action::Erase:
+            item.action = Action::Replace;
             item.sle = sle;
             break;
-        case Action::insert:
+        case Action::Insert:
             Throw<std::logic_error>("RawStateTable::insert: already inserted");
             break;
-        case Action::replace:
+        case Action::Replace:
             Throw<std::logic_error>("RawStateTable::insert: already exists");
             break;
     }
@@ -297,17 +297,17 @@ RawStateTable::replace(std::shared_ptr<SLE> const& sle)
     auto const result = items_.emplace(
         std::piecewise_construct,
         std::forward_as_tuple(sle->key()),
-        std::forward_as_tuple(Action::replace, sle));
+        std::forward_as_tuple(Action::Replace, sle));
     if (result.second)
         return;
     auto& item = result.first->second;
     switch (item.action)
     {
-        case Action::erase:
+        case Action::Erase:
             Throw<std::logic_error>("RawStateTable::replace: was erased");
             break;
-        case Action::insert:
-        case Action::replace:
+        case Action::Insert:
+        case Action::Replace:
             item.sle = sle;
             break;
     }
@@ -320,7 +320,7 @@ RawStateTable::read(ReadView const& base, Keylet const& k) const
     if (iter == items_.end())
         return base.read(k);
     auto const& item = iter->second;
-    if (item.action == Action::erase)
+    if (item.action == Action::Erase)
         return nullptr;
     // Convert to SLE const
     std::shared_ptr<SLE const> sle = item.sle;
@@ -335,25 +335,25 @@ RawStateTable::destroyXRP(XRPAmount const& fee)
     dropsDestroyed_ += fee;
 }
 
-std::unique_ptr<ReadView::sles_type::iter_base>
+std::unique_ptr<ReadView::SlesType::iter_base>
 RawStateTable::slesBegin(ReadView const& base) const
 {
-    return std::make_unique<sles_iter_impl>(
+    return std::make_unique<SlesIterImpl>(
         items_.begin(), items_.end(), base.sles.begin(), base.sles.end());
 }
 
-std::unique_ptr<ReadView::sles_type::iter_base>
+std::unique_ptr<ReadView::SlesType::iter_base>
 RawStateTable::slesEnd(ReadView const& base) const
 {
-    return std::make_unique<sles_iter_impl>(
+    return std::make_unique<SlesIterImpl>(
         items_.end(), items_.end(), base.sles.end(), base.sles.end());
 }
 
-std::unique_ptr<ReadView::sles_type::iter_base>
+std::unique_ptr<ReadView::SlesType::iter_base>
 RawStateTable::slesUpperBound(ReadView const& base, uint256 const& key) const
 {
-    return std::make_unique<sles_iter_impl>(
-        items_.upper_bound(key), items_.end(), base.sles.upper_bound(key), base.sles.end());
+    return std::make_unique<SlesIterImpl>(
+        items_.upper_bound(key), items_.end(), base.sles.upperBound(key), base.sles.end());
 }
 
 }  // namespace xrpl::detail
diff --git a/src/libxrpl/ledger/ReadView.cpp b/src/libxrpl/ledger/ReadView.cpp
index 991dd95251..1877edb383 100644
--- a/src/libxrpl/ledger/ReadView.cpp
+++ b/src/libxrpl/ledger/ReadView.cpp
@@ -13,48 +13,48 @@
 
 namespace xrpl {
 
-ReadView::sles_type::sles_type(ReadView const& view) : ReadViewFwdRange(view)
+ReadView::SlesType::SlesType(ReadView const& view) : ReadViewFwdRange(view)
 {
 }
 
 auto
-ReadView::sles_type::begin() const -> iterator
+ReadView::SlesType::begin() const -> Iterator
 {
-    return iterator(view_, view_->slesBegin());
+    return Iterator(view_, view_->slesBegin());
 }
 
 auto
-ReadView::sles_type::end() const -> iterator
+ReadView::SlesType::end() const -> Iterator
 {
-    return iterator(view_, view_->slesEnd());
+    return Iterator(view_, view_->slesEnd());
 }
 
 auto
-ReadView::sles_type::upper_bound(key_type const& key) const -> iterator
+ReadView::SlesType::upperBound(key_type const& key) const -> Iterator
 {
-    return iterator(view_, view_->slesUpperBound(key));
+    return Iterator(view_, view_->slesUpperBound(key));
 }
 
-ReadView::txs_type::txs_type(ReadView const& view) : ReadViewFwdRange(view)
+ReadView::TxsType::TxsType(ReadView const& view) : ReadViewFwdRange(view)
 {
 }
 
 bool
-ReadView::txs_type::empty() const
+ReadView::TxsType::empty() const
 {
     return begin() == end();
 }
 
 auto
-ReadView::txs_type::begin() const -> iterator
+ReadView::TxsType::begin() const -> Iterator
 {
-    return iterator(view_, view_->txsBegin());
+    return Iterator(view_, view_->txsBegin());
 }
 
 auto
-ReadView::txs_type::end() const -> iterator
+ReadView::TxsType::end() const -> Iterator
 {
-    return iterator(view_, view_->txsEnd());
+    return Iterator(view_, view_->txsEnd());
 }
 
 Rules
@@ -66,7 +66,7 @@ makeRulesGivenLedger(DigestAwareReadView const& ledger, Rules const& current)
 Rules
 makeRulesGivenLedger(
     DigestAwareReadView const& ledger,
-    std::unordered_set<uint256, beast::uhash<>> const& presets)
+    std::unordered_set<uint256, beast::Uhash<>> const& presets)
 {
     Keylet const k = keylet::amendments();
     std::optional const digest = ledger.digest(k.key);
diff --git a/src/libxrpl/ledger/View.cpp b/src/libxrpl/ledger/View.cpp
index 55735ec0e6..9fb03a230c 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 >= maxAssetCheckDepth)
+    if (depth >= kMAX_ASSET_CHECK_DEPTH)
         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::zero)
+            if (owed <= beast::kZERO)
             {
                 auto const limit = creditLimit(view, to, issuer, currency);
                 if (-owed >= limit || amount > (limit + owed))
@@ -437,8 +437,8 @@ doWithdraw(
             view,
             sourceAcct,
             amount.asset(),
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             j) < amount)
     {
         // LCOV_EXCL_START
@@ -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::zero};
+    uint256 dirEntry{beast::kZERO};
     std::uint32_t deleted = 0;
 
     if (view.exists(ownerDirKeylet) &&
@@ -487,7 +487,7 @@ cleanupOnAccountDelete(
             }
 
             LedgerEntryType const nodeType{
-                safe_cast<LedgerEntryType>(sleItem->getFieldU16(sfLedgerEntryType))};
+                safeCast<LedgerEntryType>(sleItem->getFieldU16(sfLedgerEntryType))};
 
             // Deleter handles the details of specific account-owned object
             // deletion
diff --git a/src/libxrpl/ledger/helpers/AMMHelpers.cpp b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
index cc91dcaaf4..4cef02e056 100644
--- a/src/libxrpl/ledger/helpers/AMMHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/AMMHelpers.cpp
@@ -47,7 +47,7 @@ ammLPTokens(STAmount const& asset1, STAmount const& asset2, Asset const& lptIssu
 {
     // AMM invariant: sqrt(asset1 * asset2) >= LPTokensBalance
     auto const rounding =
-        isFeatureEnabled(fixAMMv1_3) ? Number::rounding_mode::downward : Number::getround();
+        isFeatureEnabled(fixAMMv1_3) ? Number::RoundingMode::Downward : Number::getround();
     NumberRoundModeGuard const g(rounding);
     auto const tokens = root2(asset1 * asset2);
     return toSTAmount(lptIssue, tokens);
@@ -78,7 +78,7 @@ lpTokensOut(
 
     // minimize tokens out
     auto const frac = (r - c) / (1 + c);
-    return multiply(lptAMMBalance, frac, Number::rounding_mode::downward);
+    return multiply(lptAMMBalance, frac, Number::RoundingMode::Downward);
 }
 
 /* Equation 4 solves equation 3 for b:
@@ -114,7 +114,7 @@ ammAssetIn(
 
     // maximize deposit
     auto const frac = solveQuadraticEq(a, b, c);
-    return multiply(asset1Balance, frac, Number::rounding_mode::upward);
+    return multiply(asset1Balance, frac, Number::RoundingMode::Upward);
 }
 
 /* Equation 7:
@@ -139,7 +139,7 @@ lpTokensIn(
 
     // maximize tokens in
     auto const frac = (c - root2(c * c - 4 * fr)) / 2;
-    return multiply(lptAMMBalance, frac, Number::rounding_mode::upward);
+    return multiply(lptAMMBalance, frac, Number::RoundingMode::Upward);
 }
 
 /* Equation 8 solves equation 7 for b:
@@ -169,7 +169,7 @@ ammAssetOut(
 
     // minimize withdraw
     auto const frac = (t1 * t1 - t1 * (2 - f)) / (t1 * f - 1);
-    return multiply(assetBalance, frac, Number::rounding_mode::downward);
+    return multiply(assetBalance, frac, Number::RoundingMode::Downward);
 }
 
 Number
@@ -183,7 +183,7 @@ adjustLPTokens(STAmount const& lptAMMBalance, STAmount const& lpTokens, IsDeposi
 {
     // Force rounding downward to ensure adjusted tokens are less or equal
     // to requested tokens.
-    saveNumberRoundMode const rm(Number::setround(Number::rounding_mode::downward));
+    SaveNumberRoundMode const rm(Number::setround(Number::RoundingMode::Downward));
     if (isDeposit == IsDeposit::Yes)
         return (lptAMMBalance + lpTokens) - lptAMMBalance;
     return (lpTokens - lptAMMBalance) + lptAMMBalance;
@@ -205,7 +205,7 @@ adjustAmountsByLPTokens(
 
     auto const lpTokensActual = adjustLPTokens(lptAMMBalance, lpTokens, isDeposit);
 
-    if (lpTokensActual == beast::zero)
+    if (lpTokensActual == beast::kZERO)
     {
         auto const amount2Opt = amount2 ? std::make_optional(STAmount{}) : std::nullopt;
         return std::make_tuple(STAmount{}, amount2Opt, lpTokensActual);
@@ -290,7 +290,7 @@ solveQuadraticEqSmallest(Number const& a, Number const& b, Number const& c)
 }
 
 STAmount
-multiply(STAmount const& amount, Number const& frac, Number::rounding_mode rm)
+multiply(STAmount const& amount, Number const& frac, Number::RoundingMode rm)
 {
     NumberRoundModeGuard const g(rm);
     auto const t = amount * frac;
@@ -571,7 +571,7 @@ getTradingFee(ReadView const& view, SLE const& ammSle, AccountID const& account)
         "xrpl::getTradingFee : auction present");
     if (ammSle.isFieldPresent(sfAuctionSlot))
     {
-        auto const& auctionSlot = safe_downcast<STObject const&>(ammSle.peekAtField(sfAuctionSlot));
+        auto const& auctionSlot = safeDowncast<STObject const&>(ammSle.peekAtField(sfAuctionSlot));
         // Not expired
         if (auto const expiration = auctionSlot[~sfExpiration];
             duration_cast<seconds>(view.header().parentCloseTime.time_since_epoch()).count() <
@@ -644,7 +644,7 @@ deleteAMMTrustLines(
             if (nodeType == ltRIPPLE_STATE)
             {
                 // Trustlines must have zero balance
-                if (sleItem->getFieldAmount(sfBalance) != beast::zero)
+                if (sleItem->getFieldAmount(sfBalance) != beast::kZERO)
                 {
                     // LCOV_EXCL_START
                     JLOG(j.error()) << "deleteAMMObjects: deleting trustline with "
@@ -681,7 +681,7 @@ deleteAMMMPTokens(Sandbox& sb, AccountID const& ammAccountID, beast::Journal j)
             {
                 // MPT must have zero balance
                 if (sleItem->getFieldU64(sfMPTAmount) != 0 ||
-                    (*sleItem)[~sfLockedAmount].value_or(0) != 0)
+                    (*sleItem)[~sfLockedAmount].valueOr(0) != 0)
                 {
                     // LCOV_EXCL_START
                     JLOG(j.error()) << "deleteAMMObjects: deleting MPT 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, maxDeletableAMMTrustLines, j);
+    if (auto const ter = deleteAMMTrustLines(sb, ammAccountID, kMAX_DELETABLE_AMM_TRUST_LINES, j);
         !isTesSuccess(ter))
         return ter;
 
@@ -779,9 +779,9 @@ initializeFeeAuctionVote(
     STObject voteEntry = STObject::makeInnerObject(sfVoteEntry);
     if (tfee != 0)
         voteEntry.setFieldU16(sfTradingFee, tfee);
-    voteEntry.setFieldU32(sfVoteWeight, VOTE_WEIGHT_SCALE_FACTOR);
+    voteEntry.setFieldU32(sfVoteWeight, kVOTE_WEIGHT_SCALE_FACTOR);
     voteEntry.setAccountID(sfAccount, account);
-    voteSlots.push_back(voteEntry);
+    voteSlots.pushBack(voteEntry);
     ammSle->setFieldArray(sfVoteSlots, voteSlots);
     // AMM creator gets the auction slot for free.
     // AuctionSlot is created on AMMCreate and updated on AMMDeposit
@@ -797,7 +797,7 @@ initializeFeeAuctionVote(
     auto const expiration = std::chrono::duration_cast<std::chrono::seconds>(
                                 view.header().parentCloseTime.time_since_epoch())
                                 .count() +
-        TOTAL_TIME_SLOT_SECS;
+        kTOTAL_TIME_SLOT_SECS;
     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 / AUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
+    if (auto const dfee = tfee / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
     {
         auctionSlot.setFieldU16(sfDiscountedFee, dfee);
     }
diff --git a/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp b/src/libxrpl/ledger/helpers/AccountRootHelpers.cpp
index 0663fde1f4..052c93739c 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::zero;
+        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 parityRate;
+    return kPARITY_RATE;
 }
 
 void
@@ -146,17 +146,17 @@ AccountID
 pseudoAccountAddress(ReadView const& view, uint256 const& pseudoOwnerKey)
 {
     // This number must not be changed without an amendment
-    constexpr std::uint16_t maxAccountAttempts = 256;
-    for (std::uint16_t i = 0; i < maxAccountAttempts; ++i)
+    constexpr std::uint16_t kMAX_ACCOUNT_ATTEMPTS = 256;
+    for (std::uint16_t i = 0; i < kMAX_ACCOUNT_ATTEMPTS; ++i)
     {
-        ripesha_hasher rsh;
+        RipeshaHasher rsh;
         auto const hash = sha512Half(i, view.header().parentHash, pseudoOwnerKey);
         rsh(hash.data(), hash.size());
-        AccountID const ret{static_cast<ripesha_hasher::result_type>(rsh)};
+        AccountID const ret{static_cast<RipeshaHasher::result_type>(rsh)};
         if (!view.read(keylet::account(ret)))
             return ret;
     }
-    return beast::zero;
+    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 pseudoFields = []() {
+    static std::vector<SField const*> const kPSEUDO_FIELDS = []() {
         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::sMD_PseudoAccount))
+            if (field.sField().shouldMeta(SField::SMdPseudoAccount))
                 pseudoFields.emplace_back(&field.sField());
         }
         return pseudoFields;
     }();
-    return pseudoFields;
+    return kPSEUDO_FIELDS;
 }
 
 [[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::zero)
+    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 18cb44b461..22122216bc 100644
--- a/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/CredentialHelpers.cpp
@@ -126,7 +126,7 @@ checkFields(STTx const& tx, beast::Journal j)
         return tesSUCCESS;
 
     auto const& credentials = tx.getFieldV256(sfCredentialIDs);
-    if (credentials.empty() || (credentials.size() > maxCredentialsArraySize))
+    if (credentials.empty() || (credentials.size() > kMAX_CREDENTIALS_ARRAY_SIZE))
     {
         JLOG(j.trace()) << "Malformed transaction: Credentials array size is invalid: "
                         << credentials.size();
@@ -283,7 +283,7 @@ checkArray(STArray const& credentials, unsigned maxSize, beast::Journal j)
         }
 
         auto const ct = credential[sfCredentialType];
-        if (ct.empty() || (ct.size() > maxCredentialTypeLength))
+        if (ct.empty() || (ct.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
         {
             JLOG(j.trace()) << "Malformed transaction: "
                                "Invalid credentialType size: "
@@ -321,7 +321,7 @@ verifyValidDomain(ApplyView& view, AccountID const& account, uint256 domainID, b
         auto const type = h.getFieldVL(sfCredentialType);
         auto const keyletCredential = keylet::credential(account, issuer, makeSlice(type));
         if (view.exists(keyletCredential))
-            credentials.push_back(keyletCredential.key);
+            credentials.pushBack(keyletCredential.key);
     }
 
     bool const foundExpired = credentials::removeExpired(view, credentials, j);
diff --git a/src/libxrpl/ledger/helpers/LendingHelpers.cpp b/src/libxrpl/ledger/helpers/LendingHelpers.cpp
index a263791e39..28b0c8976d 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::zero,
+        other.principalPaid >= beast::kZERO,
         "xrpl::LoanPaymentParts::operator+= : other principal "
         "non-negative");
     XRPL_ASSERT(
-        other.interestPaid >= beast::zero,
+        other.interestPaid >= beast::kZERO,
         "xrpl::LoanPaymentParts::operator+= : other interest paid "
         "non-negative");
     XRPL_ASSERT(
-        other.feePaid >= beast::zero,
+        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) / secondsInYear;
+    return tenthBipsOfValue(Number(paymentInterval), interestRate) / kSECONDS_IN_YEAR;
 }
 
 /* Checks if a value is already rounded to the specified scale.
@@ -93,8 +93,8 @@ loanPeriodicRate(TenthBips32 interestRate, std::uint32_t paymentInterval)
 bool
 isRounded(Asset const& asset, Number const& value, std::int32_t scale)
 {
-    return roundToAsset(asset, value, scale, Number::rounding_mode::downward) ==
-        roundToAsset(asset, value, scale, Number::rounding_mode::upward);
+    return roundToAsset(asset, value, scale, Number::RoundingMode::Downward) ==
+        roundToAsset(asset, value, scale, Number::RoundingMode::Upward);
 }
 
 namespace detail {
@@ -102,12 +102,12 @@ namespace detail {
 void
 LoanStateDeltas::nonNegative()
 {
-    if (principal < beast::zero)
-        principal = numZero;
-    if (interest < beast::zero)
-        interest = numZero;
-    if (managementFee < beast::zero)
-        managementFee = numZero;
+    if (principal < beast::kZERO)
+        principal = kNUM_ZERO;
+    if (interest < beast::kZERO)
+        interest = kNUM_ZERO;
+    if (managementFee < beast::kZERO)
+        managementFee = kNUM_ZERO;
 }
 
 /* Computes (1 + periodicRate)^paymentsRemaining for amortization calculations.
@@ -129,10 +129,10 @@ Number
 computePaymentFactor(Number const& periodicRate, std::uint32_t paymentsRemaining)
 {
     if (paymentsRemaining == 0)
-        return numZero;
+        return kNUM_ZERO;
 
     // For zero interest, payment factor is simply 1/paymentsRemaining
-    if (periodicRate == beast::zero)
+    if (periodicRate == beast::kZERO)
         return Number{1} / paymentsRemaining;
 
     Number const raisedRate = computeRaisedRate(periodicRate, paymentsRemaining);
@@ -155,7 +155,7 @@ loanPeriodicPayment(
         return 0;
 
     // Interest-free loans: equal principal payments
-    if (periodicRate == beast::zero)
+    if (periodicRate == beast::kZERO)
         return principalOutstanding / paymentsRemaining;
 
     return principalOutstanding * computePaymentFactor(periodicRate, paymentsRemaining);
@@ -173,7 +173,7 @@ loanPrincipalFromPeriodicPayment(
     std::uint32_t paymentsRemaining)
 {
     if (paymentsRemaining == 0)
-        return numZero;
+        return kNUM_ZERO;
 
     if (periodicRate == 0)
         return periodicPayment * paymentsRemaining;
@@ -210,11 +210,11 @@ loanLatePaymentInterest(
     NetClock::time_point parentCloseTime,
     std::uint32_t nextPaymentDueDate)
 {
-    if (principalOutstanding == beast::zero)
-        return numZero;
+    if (principalOutstanding == beast::kZERO)
+        return kNUM_ZERO;
 
     if (lateInterestRate == TenthBips32{0})
-        return numZero;
+        return kNUM_ZERO;
 
     auto const now = parentCloseTime.time_since_epoch().count();
 
@@ -245,11 +245,11 @@ loanAccruedInterest(
     std::uint32_t prevPaymentDate,
     std::uint32_t paymentInterval)
 {
-    if (periodicRate == beast::zero)
-        return numZero;
+    if (periodicRate == beast::kZERO)
+        return kNUM_ZERO;
 
     if (paymentInterval == 0)
-        return numZero;
+        return kNUM_ZERO;
 
     auto const lastPaymentDate = std::max(prevPaymentDate, startDate);
     auto const now = parentCloseTime.time_since_epoch().count();
@@ -257,7 +257,7 @@ loanAccruedInterest(
     // If the loan has been paid ahead, then "lastPaymentDate" is in the future,
     // and no interest has accrued.
     if (now <= lastPaymentDate)
-        return numZero;
+        return kNUM_ZERO;
 
     // Equation (4) from XLS-66 spec, Section A-2 Equation Glossary
     auto const secondsSinceLastPayment = now - lastPaymentDate;
@@ -291,7 +291,7 @@ doPayment(
 {
     XRPL_ASSERT_PARTS(nextDueDateProxy, "xrpl::detail::doPayment", "Next due date proxy set");
 
-    if (payment.specialCase == PaymentSpecialCase::final)
+    if (payment.specialCase == PaymentSpecialCase::Final)
     {
         XRPL_ASSERT_PARTS(
             principalOutstandingProxy == payment.trackedPrincipalDelta,
@@ -326,7 +326,7 @@ doPayment(
     else
     {
         // For regular payments (not overpayments), advance the payment schedule
-        if (payment.specialCase != PaymentSpecialCase::extra)
+        if (payment.specialCase != PaymentSpecialCase::Extra)
         {
             paymentRemainingProxy -= 1;
 
@@ -366,7 +366,7 @@ doPayment(
     XRPL_ASSERT_PARTS(
         // Use an explicit cast because the template parameter can be
         // ValueProxy<Number> or Number
-        static_cast<Number>(managementFeeOutstandingProxy) >= beast::zero,
+        static_cast<Number>(managementFeeOutstandingProxy) >= beast::kZERO,
         "xrpl::detail::doPayment",
         "fee outstanding stays valid");
 
@@ -462,20 +462,20 @@ tryOverpayment(
             asset,
             newTheoreticalState.principalOutstanding,
             loanScale,
-            Number::rounding_mode::upward),
-        numZero,
+            Number::RoundingMode::Upward),
+        kNUM_ZERO,
         roundedOldState.principalOutstanding);
     auto const totalValueOutstanding = std::clamp(
         roundToAsset(
             asset,
             principalOutstanding + newTheoreticalState.interestOutstanding(),
             loanScale,
-            Number::rounding_mode::upward),
-        numZero,
+            Number::RoundingMode::Upward),
+        kNUM_ZERO,
         roundedOldState.valueOutstanding);
     auto const managementFeeOutstanding = std::clamp(
         roundToAsset(asset, newTheoreticalState.managementFeeDue, loanScale),
-        numZero,
+        kNUM_ZERO,
         roundedOldState.managementFeeDue);
 
     auto const roundedNewState =
@@ -497,7 +497,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::zero,
+            roundedNewState.interestOutstanding() != beast::kZERO,
             paymentRemaining,
             newLoanProperties,
             j))
@@ -731,7 +731,7 @@ computeLatePayment(
 
     XRPL_ASSERT(roundedLateInterest >= 0, "xrpl::detail::computeLatePayment : valid late interest");
     XRPL_ASSERT_PARTS(
-        periodic.specialCase != PaymentSpecialCase::extra,
+        periodic.specialCase != PaymentSpecialCase::Extra,
         "xrpl::detail::computeLatePayment",
         "no extra parts to this payment");
 
@@ -841,7 +841,7 @@ computeFullPayment(
     // management fee (to broker), applying proper rounding.
     auto const [roundedFullInterest, roundedFullManagementFee] = [&]() {
         auto const interest =
-            roundToAsset(asset, fullPaymentInterest, loanScale, Number::rounding_mode::downward);
+            roundToAsset(asset, fullPaymentInterest, loanScale, Number::RoundingMode::Downward);
         return computeInterestAndFeeParts(asset, interest, managementFeeRate, loanScale);
     }();
 
@@ -857,7 +857,7 @@ computeFullPayment(
             // All outstanding management fees are paid. This zeroes out the
             // tracked fee balance.
             .trackedManagementFeeDelta = managementFeeOutstanding,
-            .specialCase = PaymentSpecialCase::final,
+            .specialCase = PaymentSpecialCase::Final,
         },
 
         // Untracked management fee includes:
@@ -960,7 +960,7 @@ computePaymentComponents(
             .trackedValueDelta = totalValueOutstanding,
             .trackedPrincipalDelta = principalOutstanding,
             .trackedManagementFeeDelta = managementFeeOutstanding,
-            .specialCase = PaymentSpecialCase::final};
+            .specialCase = PaymentSpecialCase::Final};
     }
 
     // Calculate what the loan state SHOULD be after this payment (the target).
@@ -1006,7 +1006,7 @@ computePaymentComponents(
     // periodic payment after principal is paid
     deltas.interest = std::min(
         {deltas.interest,
-         std::max(numZero, roundedPeriodicPayment - deltas.principal),
+         std::max(kNUM_ZERO, roundedPeriodicPayment - deltas.principal),
          currentLedgerState.interestDue});
 
     XRPL_ASSERT_PARTS(
@@ -1026,14 +1026,16 @@ 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::zero)
+        if (excess > beast::kZERO)
         {
             auto part = std::min(component, excess);
             component -= part;
             excess -= part;
         }
         XRPL_ASSERT_PARTS(
-            excess >= beast::zero, "xrpl::detail::computePaymentComponents", "excess non-negative");
+            excess >= beast::kZERO,
+            "xrpl::detail::computePaymentComponents",
+            "excess non-negative");
     };
     // Helper to reduce deltas when they collectively exceed a limit.
     // Order matters: we prefer to reduce interest first (most flexible),
@@ -1049,7 +1051,7 @@ computePaymentComponents(
     // happen due to earlier caps, but handle it defensively.
     Number totalOverpayment = deltas.total() - currentLedgerState.valueOutstanding;
 
-    if (totalOverpayment > beast::zero)
+    if (totalOverpayment > beast::kZERO)
     {
         // LCOV_EXCL_START
         UNREACHABLE(
@@ -1067,7 +1069,7 @@ computePaymentComponents(
         "xrpl::detail::computePaymentComponents",
         "shortage is rounded");
 
-    if (shortage < beast::zero)
+    if (shortage < beast::kZERO)
     {
         // Deltas exceed payment amount - reduce them proportionally
         Number excess = -shortage;
@@ -1079,7 +1081,9 @@ 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::zero, "xrpl::detail::computePaymentComponents", "no shortage or excess");
+        shortage >= beast::kZERO,
+        "xrpl::detail::computePaymentComponents",
+        "no shortage or excess");
 
     // Final validation that all components are valid
     XRPL_ASSERT_PARTS(
@@ -1088,33 +1092,33 @@ computePaymentComponents(
         "total value adds up");
 
     XRPL_ASSERT_PARTS(
-        deltas.principal >= beast::zero &&
+        deltas.principal >= beast::kZERO &&
             deltas.principal <= currentLedgerState.principalOutstanding,
         "xrpl::detail::computePaymentComponents",
         "valid principal result");
     XRPL_ASSERT_PARTS(
-        deltas.interest >= beast::zero && deltas.interest <= currentLedgerState.interestDue,
+        deltas.interest >= beast::kZERO && deltas.interest <= currentLedgerState.interestDue,
         "xrpl::detail::computePaymentComponents",
         "valid interest result");
     XRPL_ASSERT_PARTS(
-        deltas.managementFee >= beast::zero &&
+        deltas.managementFee >= beast::kZERO &&
             deltas.managementFee <= currentLedgerState.managementFeeDue,
         "xrpl::detail::computePaymentComponents",
         "valid fee result");
 
     XRPL_ASSERT_PARTS(
-        deltas.principal + deltas.interest + deltas.managementFee > beast::zero,
+        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(), numZero, currentLedgerState.valueOutstanding),
+            std::clamp(deltas.total(), kNUM_ZERO, currentLedgerState.valueOutstanding),
         .trackedPrincipalDelta =
-            std::clamp(deltas.principal, numZero, currentLedgerState.principalOutstanding),
+            std::clamp(deltas.principal, kNUM_ZERO, currentLedgerState.principalOutstanding),
         .trackedManagementFeeDelta =
-            std::clamp(deltas.managementFee, numZero, currentLedgerState.managementFeeDue),
+            std::clamp(deltas.managementFee, kNUM_ZERO, currentLedgerState.managementFeeDue),
     };
 }
 
@@ -1175,7 +1179,7 @@ computeOverpaymentComponents(
             .trackedPrincipalDelta = overpayment - roundedOverpaymentInterest -
                 roundedOverpaymentManagementFee - overpaymentFee,
             .trackedManagementFeeDelta = roundedOverpaymentManagementFee,
-            .specialCase = detail::PaymentSpecialCase::extra},
+            .specialCase = detail::PaymentSpecialCase::Extra},
         // Untracked management fee is the fixed overpayment fee
         overpaymentFee,
         // Untracked interest is the penalty interest charged for  overpaying.
@@ -1280,7 +1284,7 @@ checkLoanGuards(
     // avoids dividing by 0.
     auto const roundedPayment =
         roundPeriodicPayment(vaultAsset, properties.periodicPayment, properties.loanScale);
-    if (roundedPayment == beast::zero)
+    if (roundedPayment == beast::kZERO)
     {
         JLOG(j.warn()) << "Loan Periodic payment (" << properties.periodicPayment
                        << ") rounds to 0. ";
@@ -1291,7 +1295,7 @@ checkLoanGuards(
     // loan can't be amortized in the specified number of payments, raise an
     // error
     {
-        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
 
         if (std::int64_t const computedPayments{
                 properties.loanState.valueOutstanding / roundedPayment};
@@ -1338,7 +1342,7 @@ computeFullPaymentInterest(
         "interest");
 
     // Equation (28) from XLS-66 spec, Section A-2 Equation Glossary
-    auto const prepaymentPenalty = closeInterestRate == beast::zero
+    auto const prepaymentPenalty = closeInterestRate == beast::kZERO
         ? Number{}
         : tenthBipsOfValue(theoreticalPrincipalOutstanding, closeInterestRate);
 
@@ -1471,7 +1475,7 @@ computeManagementFee(
     std::int32_t scale)
 {
     return roundToAsset(
-        asset, tenthBipsOfValue(value, managementFeeRate), scale, Number::rounding_mode::downward);
+        asset, tenthBipsOfValue(value, managementFeeRate), scale, Number::RoundingMode::Downward);
 }
 
 /*
@@ -1526,7 +1530,7 @@ computeLoanProperties(
     auto const [totalValueOutstanding, loanScale] = [&]() {
         // only round up if there should be interest
         NumberRoundModeGuard const mg(
-            periodicRate == 0 ? Number::rounding_mode::to_nearest : Number::rounding_mode::upward);
+            periodicRate == 0 ? Number::RoundingMode::ToNearest : Number::RoundingMode::Upward);
         // Use STAmount's internal rounding instead of roundToAsset, because
         // we're going to use this result to determine the scale for all the
         // other rounding.
@@ -1555,7 +1559,7 @@ computeLoanProperties(
     // validate that the principal fits in it, so to allow this function to
     // succeed, round it here, and let the caller do the validation.
     auto const roundedPrincipalOutstanding =
-        roundToAsset(asset, principalOutstanding, loanScale, Number::rounding_mode::to_nearest);
+        roundToAsset(asset, principalOutstanding, loanScale, Number::RoundingMode::ToNearest);
 
     // Equation (31) from XLS-66 spec, Section A-2 Equation Glossary
     auto const totalInterestOutstanding = totalValueOutstanding - roundedPrincipalOutstanding;
@@ -1654,7 +1658,7 @@ loanMakePayment(
 
     // -------------------------------------------------------------
     // A late payment not flagged as late overrides all other options.
-    if (paymentType != LoanPaymentType::late && hasExpired(view, nextDueDateProxy))
+    if (paymentType != LoanPaymentType::Late && hasExpired(view, nextDueDateProxy))
     {
         // If the payment is late, and the late flag was not set, it's not
         // valid
@@ -1669,7 +1673,7 @@ loanMakePayment(
 
     // -------------------------------------------------------------
     // full payment handling
-    if (paymentType == LoanPaymentType::full)
+    if (paymentType == LoanPaymentType::Full)
     {
         TenthBips32 const closeInterestRate{loan->at(sfCloseInterestRate)};
         Number const closePaymentFee = roundToAsset(asset, loan->at(sfClosePaymentFee), loanScale);
@@ -1746,7 +1750,7 @@ loanMakePayment(
 
     // -------------------------------------------------------------
     // late payment handling
-    if (paymentType == LoanPaymentType::late)
+    if (paymentType == LoanPaymentType::Late)
     {
         TenthBips32 const lateInterestRate{loan->at(sfLateInterestRate)};
         Number const latePaymentFee = loan->at(sfLatePaymentFee);
@@ -1795,7 +1799,7 @@ loanMakePayment(
     // regular periodic payment handling
 
     XRPL_ASSERT_PARTS(
-        paymentType == LoanPaymentType::regular || paymentType == LoanPaymentType::overpayment,
+        paymentType == LoanPaymentType::Regular || paymentType == LoanPaymentType::Overpayment,
         "xrpl::loanMakePayment",
         "regular payment type");
 
@@ -1805,7 +1809,7 @@ loanMakePayment(
     std::size_t numPayments = 0;
 
     while ((amount >= (totalPaid + periodic.totalDue)) && paymentRemainingProxy > 0 &&
-           numPayments < loanMaximumPaymentsPerTransaction)
+           numPayments < kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION)
     {
         // Try to make more payments
         XRPL_ASSERT_PARTS(
@@ -1826,13 +1830,13 @@ loanMakePayment(
         ++numPayments;
 
         XRPL_ASSERT_PARTS(
-            (periodic.specialCase == detail::PaymentSpecialCase::final) ==
+            (periodic.specialCase == detail::PaymentSpecialCase::Final) ==
                 (paymentRemainingProxy == 0),
             "xrpl::loanMakePayment",
             "final payment is the final payment");
 
         // Don't compute the next payment if this was the last payment
-        if (periodic.specialCase == detail::PaymentSpecialCase::final)
+        if (periodic.specialCase == detail::PaymentSpecialCase::Final)
             break;
 
         periodic = detail::ExtendedPaymentComponents{
@@ -1864,9 +1868,9 @@ loanMakePayment(
 
     // -------------------------------------------------------------
     // overpayment handling
-    if (paymentType == LoanPaymentType::overpayment && loan->isFlag(lsfLoanOverpayment) &&
+    if (paymentType == LoanPaymentType::Overpayment && loan->isFlag(lsfLoanOverpayment) &&
         paymentRemainingProxy > 0 && totalPaid < amount &&
-        numPayments < loanMaximumPaymentsPerTransaction)
+        numPayments < kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION)
     {
         TenthBips32 const overpaymentInterestRate{loan->at(sfOverpaymentInterestRate)};
         TenthBips32 const overpaymentFeeRate{loan->at(sfOverpaymentFee)};
@@ -1890,7 +1894,7 @@ loanMakePayment(
         if (overpaymentComponents.trackedPrincipalDelta > 0)
         {
             XRPL_ASSERT_PARTS(
-                overpaymentComponents.untrackedInterest >= beast::zero,
+                overpaymentComponents.untrackedInterest >= beast::kZERO,
                 "xrpl::loanMakePayment",
                 "overpayment penalty did not reduce value of loan");
             // Can't just use `periodicPayment` here, because it might
@@ -1926,17 +1930,17 @@ loanMakePayment(
     // intermediate steps were rounded.
     XRPL_ASSERT(
         isRounded(asset, totalParts.principalPaid, loanScale) &&
-            totalParts.principalPaid >= beast::zero,
+            totalParts.principalPaid >= beast::kZERO,
         "xrpl::loanMakePayment : total principal paid is valid");
     XRPL_ASSERT(
         isRounded(asset, totalParts.interestPaid, loanScale) &&
-            totalParts.interestPaid >= beast::zero,
+            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::zero,
+        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 c3987ddb03..75fe61b34b 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 <= maxTransferFee, "xrpl::transferRate : fee is too large");
+        XRPL_ASSERT(fee <= kMAX_TRANSFER_FEE, "xrpl::transferRate : fee is too large");
         return Rate{1'000'000'000u + (10'000 * fee)};
     }
 
-    return parityRate;
+    return kPARITY_RATE;
 }
 
 [[nodiscard]] TER
@@ -170,7 +170,7 @@ authorizeMPToken(
             auto const sleMpt = view.peek(mptokenKey);
             if (!sleMpt || (*sleMpt)[sfMPTAmount] != 0 ||
                 (view.rules().enabled(fixSecurity3_1_3) &&
-                 (*sleMpt)[~sfLockedAmount].value_or(0) != 0))
+                 (*sleMpt)[~sfLockedAmount].valueOr(0) != 0))
                 return tecINTERNAL;  // LCOV_EXCL_LINE
 
             if (!view.dirRemove(
@@ -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::zero)
+            (uOwnerCount < 2) ? XRPAmount(beast::kZERO)
                               : view.fees().accountReserve(uOwnerCount + 1));
 
         if (priorBalance < reserveCreate)
@@ -284,7 +284,7 @@ removeEmptyHolding(
     // accounting out of balance, so fail. Since this should be impossible
     // anyway, I'm not going to put any effort into it.
     if (mptoken->at(sfMPTAmount) != 0 ||
-        (view.rules().enabled(fixSecurity3_1_3) && (*mptoken)[~sfLockedAmount].value_or(0) != 0))
+        (view.rules().enabled(fixSecurity3_1_3) && (*mptoken)[~sfLockedAmount].valueOr(0) != 0))
         return tecHAS_OBLIGATIONS;
 
     return authorizeMPToken(
@@ -320,7 +320,7 @@ requireAuth(
 
     if (featureSAVEnabled)
     {
-        if (depth >= maxAssetCheckDepth)
+        if (depth >= kMAX_ASSET_CHECK_DEPTH)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
         // requireAuth is recursive if the issuer is a vault pseudo-account
@@ -567,7 +567,7 @@ lockEscrowMPT(ApplyView& view, AccountID const& sender, STAmount const& amount,
         (*sle)[sfMPTAmount] = amt - pay;
 
         // Overflow check for addition
-        uint64_t const locked = (*sle)[~sfLockedAmount].value_or(0);
+        uint64_t const locked = (*sle)[~sfLockedAmount].valueOr(0);
 
         if (!canAdd(STAmount(mptIssue, locked), STAmount(mptIssue, pay)))
         {  // LCOV_EXCL_START
@@ -591,7 +591,7 @@ lockEscrowMPT(ApplyView& view, AccountID const& sender, STAmount const& amount,
     // 1. Increase the Issuance EscrowedAmount
     // 2. DO NOT change the Issuance OutstandingAmount
     {
-        uint64_t const issuanceEscrowed = (*sleIssuance)[~sfLockedAmount].value_or(0);
+        uint64_t const issuanceEscrowed = (*sleIssuance)[~sfLockedAmount].valueOr(0);
         auto const pay = amount.mpt().value();
 
         // Overflow check for addition
@@ -839,7 +839,7 @@ checkCreateMPT(
 std::int64_t
 maxMPTAmount(SLE const& sleIssuance)
 {
-    return sleIssuance[~sfMaximumAmount].value_or(maxMPTokenAmount);
+    return sleIssuance[~sfMaximumAmount].value_or(kMAX_MP_TOKEN_AMOUNT);
 }
 
 std::int64_t
diff --git a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
index f57294a855..eb69ec93d0 100644
--- a/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/NFTokenHelpers.cpp
@@ -24,6 +24,7 @@
 #include <xrpl/protocol/SeqProxy.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFlags.h>
+#include <xrpl/protocol/UintTypes.h>
 #include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/nft.h>
 #include <xrpl/protocol/nftPageMask.h>
@@ -43,8 +44,8 @@ namespace xrpl::nft {
 static std::shared_ptr<SLE const>
 locatePage(ReadView const& view, AccountID const& owner, uint256 const& id)
 {
-    auto const first = keylet::nftpage(keylet::nftpage_min(owner), id);
-    auto const last = keylet::nftpage_max(owner);
+    auto const first = keylet::nftpage(keylet::nftpageMin(owner), id);
+    auto const last = keylet::nftpageMax(owner);
 
     // This NFT can only be found in the first page with a key that's strictly
     // greater than `first`, so look for that, up until the maximum possible
@@ -56,8 +57,8 @@ locatePage(ReadView const& view, AccountID const& owner, uint256 const& id)
 static std::shared_ptr<SLE>
 locatePage(ApplyView& view, AccountID const& owner, uint256 const& id)
 {
-    auto const first = keylet::nftpage(keylet::nftpage_min(owner), id);
-    auto const last = keylet::nftpage_max(owner);
+    auto const first = keylet::nftpage(keylet::nftpageMin(owner), id);
+    auto const last = keylet::nftpageMax(owner);
 
     // This NFT can only be found in the first page with a key that's strictly
     // greater than `first`, so look for that, up until the maximum possible
@@ -73,9 +74,9 @@ getPageForToken(
     uint256 const& id,
     std::function<void(ApplyView&, AccountID const&)> const& createCallback)
 {
-    auto const base = keylet::nftpage_min(owner);
+    auto const base = keylet::nftpageMin(owner);
     auto const first = keylet::nftpage(base, id);
-    auto const last = keylet::nftpage_max(owner);
+    auto const last = keylet::nftpageMax(owner);
 
     // This NFT can only be found in the first page with a key that's strictly
     // greater than `first`, so look for that, up until the maximum possible
@@ -97,7 +98,7 @@ getPageForToken(
     STArray narr = cp->getFieldArray(sfNFTokens);
 
     // The right page still has space: we're good.
-    if (narr.size() != dirMaxTokensPerPage)
+    if (narr.size() != kDIR_MAX_TOKENS_PER_PAGE)
         return cp;
 
     // We need to split the page in two: the first half of the items in this
@@ -114,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[(dirMaxTokensPerPage / 2) - 1].getFieldH256(sfNFTokenID) & nft::pageMask;
+            narr[(kDIR_MAX_TOKENS_PER_PAGE / 2) - 1].getFieldH256(sfNFTokenID) & nft::kPAGE_MASK;
 
         // 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() + (dirMaxTokensPerPage / 2), narr.end(), [&cmp](STObject const& obj) {
-                return (obj.getFieldH256(sfNFTokenID) & nft::pageMask) == cmp;
+            narr.begin() + (kDIR_MAX_TOKENS_PER_PAGE / 2), narr.end(), [&cmp](STObject const& obj) {
+                return (obj.getFieldH256(sfNFTokenID) & nft::kPAGE_MASK) == cmp;
             });
 
         // If we get all the way from the middle to the end with only
@@ -129,7 +130,7 @@ getPageForToken(
         if (splitIter == narr.end())
         {
             splitIter = std::ranges::find_if(narr, [&cmp](STObject const& obj) {
-                return (obj.getFieldH256(sfNFTokenID) & nft::pageMask) == cmp;
+                return (obj.getFieldH256(sfNFTokenID) & nft::kPAGE_MASK) == cmp;
             });
         }
 
@@ -142,7 +143,7 @@ getPageForToken(
         // equivalent tokens.  This requires special handling.
         if (splitIter == narr.begin())
         {
-            auto const relation{(id & nft::pageMask) <=> cmp};
+            auto const relation{(id & nft::kPAGE_MASK) <=> cmp};
             if (relation == 0)
             {
                 // If the passed in id belongs exactly on this (full) page
@@ -177,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() == dirMaxTokensPerPage
-        ? narr[dirMaxTokensPerPage - 1].getFieldH256(sfNFTokenID).next()
+    uint256 const tokenIDForNewPage = narr.size() == kDIR_MAX_TOKENS_PER_PAGE
+        ? narr[kDIR_MAX_TOKENS_PER_PAGE - 1].getFieldH256(sfNFTokenID).next()
         : carr[0].getFieldH256(sfNFTokenID);
 
     auto np = std::make_shared<SLE>(keylet::nftpage(base, tokenIDForNewPage));
@@ -216,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::pageMask) <=> (b & nft::pageMask)}; lowBitsCmp != 0)
+    if (auto const lowBitsCmp{(a & nft::kPAGE_MASK) <=> (b & nft::kPAGE_MASK)}; lowBitsCmp != 0)
         return lowBitsCmp < 0;
 
     return a < b;
@@ -280,7 +281,7 @@ insertToken(ApplyView& view, AccountID owner, STObject&& nft)
 
     {
         auto arr = page->getFieldArray(sfNFTokens);
-        arr.push_back(std::move(nft));
+        arr.pushBack(std::move(nft));
 
         arr.sort([](STObject const& o1, STObject const& o2) {
             return compareTokens(o1.getFieldH256(sfNFTokenID), o2.getFieldH256(sfNFTokenID));
@@ -313,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() > dirMaxTokensPerPage)
+    if (p1arr.size() + p2arr.size() > kDIR_MAX_TOKENS_PER_PAGE)
         return false;
 
     STArray x(p1arr.size() + p2arr.size());
@@ -444,7 +445,7 @@ removeToken(
         //  3. Fix up the owner count.
         //  4. Erase the previous page.
         if (view.rules().enabled(fixNFTokenPageLinks) &&
-            ((curr->key() & nft::pageMask) == pageMask))
+            ((curr->key() & nft::kPAGE_MASK) == kPAGE_MASK))
         {
             // Copy all relevant information from prev to curr.
             curr->peekFieldArray(sfNFTokens) = prev->peekFieldArray(sfNFTokens);
@@ -635,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::nft_sells(nftokenID)
-                                                         : keylet::nft_buys(nftokenID),
+            (((*offer)[sfFlags] & lsfSellNFToken) != 0u) ? keylet::nftSells(nftokenID)
+                                                         : keylet::nftBuys(nftokenID),
             (*offer)[sfNFTokenOfferNode],
             offer->key(),
             false))
@@ -654,11 +655,11 @@ repairNFTokenDirectoryLinks(ApplyView& view, AccountID const& owner)
 {
     bool didRepair = false;
 
-    auto const last = keylet::nftpage_max(owner);
+    auto const last = keylet::nftpageMax(owner);
 
     std::shared_ptr<SLE> page = view.peek(Keylet(
         ltNFTOKEN_PAGE,
-        view.succ(keylet::nftpage_min(owner).key, last.key.next()).value_or(last.key)));
+        view.succ(keylet::nftpageMin(owner).key, last.key.next()).value_or(last.key)));
 
     if (!page)
         return didRepair;
@@ -787,7 +788,7 @@ tokenOfferCreatePreflight(
 
     if (!isXRP(amount))
     {
-        if ((nftFlags & nft::flagOnlyXRP) != 0)
+        if ((nftFlags & nft::kFLAG_ONLY_XRP) != 0)
             return temBAD_AMOUNT;
 
         if (!amount)
@@ -832,7 +833,7 @@ tokenOfferCreatePreclaim(
     std::optional<AccountID> const& owner,
     std::uint32_t txFlags)
 {
-    if (((nftFlags & nft::flagCreateTrustLines) == 0) && !amount.native() && (xferFee != 0u))
+    if (((nftFlags & nft::kFLAG_CREATE_TRUST_LINES) == 0) && !amount.native() && (xferFee != 0u))
     {
         if (!view.exists(keylet::account(nftIssuer)))
             return tecNO_ISSUER;
@@ -854,7 +855,7 @@ tokenOfferCreatePreclaim(
             return tecFROZEN;
     }
 
-    if (nftIssuer != acctID && ((nftFlags & nft::flagTransferable) == 0))
+    if (nftIssuer != acctID && ((nftFlags & nft::kFLAG_TRANSFERABLE) == 0))
     {
         auto const root = view.read(keylet::account(nftIssuer));
         XRPL_ASSERT(root, "xrpl::nft::tokenOfferCreatePreclaim : non-null account");
@@ -873,7 +874,7 @@ tokenOfferCreatePreclaim(
     {
         // We allow an IOU issuer to make a buy offer
         // using their own currency.
-        if (accountFunds(view, acctID, amount, FreezeHandling::fhZERO_IF_FROZEN, j).signum() <= 0)
+        if (accountFunds(view, acctID, amount, FreezeHandling::ZeroIfFrozen, j).signum() <= 0)
             return tecUNFUNDED_OFFER;
     }
 
@@ -953,7 +954,7 @@ tokenOfferCreateApply(
         // Token offers are also added to the token's buy or sell offer
         // directory
         auto const offerNode = view.dirInsert(
-            isSellOffer ? keylet::nft_sells(nftokenID) : keylet::nft_buys(nftokenID),
+            isSellOffer ? keylet::nftSells(nftokenID) : keylet::nftBuys(nftokenID),
             offerID,
             [&nftokenID, isSellOffer](std::shared_ptr<SLE> const& sle) {
                 (*sle)[sfFlags] = isSellOffer ? lsfNFTokenSellOffers : lsfNFTokenBuyOffers;
diff --git a/src/libxrpl/ledger/helpers/OfferHelpers.cpp b/src/libxrpl/ledger/helpers/OfferHelpers.cpp
index d57066cfe2..03a1170aad 100644
--- a/src/libxrpl/ledger/helpers/OfferHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/OfferHelpers.cpp
@@ -6,6 +6,7 @@
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/helpers/AccountRootHelpers.h>
 #include <xrpl/protocol/Indexes.h>
+#include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STArray.h>  // IWYU pragma: keep
 #include <xrpl/protocol/STLedgerEntry.h>
diff --git a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
index f5a5c01060..58f44534cf 100644
--- a/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/RippleStateHelpers.cpp
@@ -348,9 +348,9 @@ updateTrustLine(
         return false;
 
     // YYY Could skip this if rippling in reverse.
-    if (before > beast::zero
+    if (before > beast::kZERO
         // Sender balance was positive.
-        && after <= beast::zero
+        && after <= beast::kZERO
         // Sender is zero or negative.
         && ((flags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u)
         // Sender reserve is set.
@@ -405,28 +405,28 @@ issueIOU(
 
     if (auto state = view.peek(index))
     {
-        STAmount final_balance = state->getFieldAmount(sfBalance);
+        STAmount finalBalance = state->getFieldAmount(sfBalance);
 
         if (bSenderHigh)
-            final_balance.negate();  // Put balance in sender terms.
+            finalBalance.negate();  // Put balance in sender terms.
 
-        STAmount const start_balance = final_balance;
+        STAmount const startBalance = finalBalance;
 
-        final_balance -= amount;
+        finalBalance -= amount;
 
-        auto const must_delete = updateTrustLine(
-            view, state, bSenderHigh, issue.account, start_balance, final_balance, j);
+        auto const mustDelete =
+            updateTrustLine(view, state, bSenderHigh, issue.account, startBalance, finalBalance, j);
 
-        view.creditHookIOU(issue.account, account, amount, start_balance);
+        view.creditHookIOU(issue.account, account, amount, startBalance);
 
         if (bSenderHigh)
-            final_balance.negate();
+            finalBalance.negate();
 
         // Adjust the balance on the trust line if necessary. We do this even
         // if we are going to delete the line to reflect the correct balance
         // at the time of deletion.
-        state->setFieldAmount(sfBalance, final_balance);
-        if (must_delete)
+        state->setFieldAmount(sfBalance, finalBalance);
+        if (mustDelete)
         {
             return trustDelete(
                 view,
@@ -445,9 +445,9 @@ issueIOU(
     // this is unnecessarily inefficient as copying which could be avoided
     // is now required. Consider available options.
     STAmount const limit(Issue{issue.currency, account});
-    STAmount final_balance = amount;
+    STAmount finalBalance = amount;
 
-    final_balance.get<Issue>().account = noAccount();
+    finalBalance.get<Issue>().account = noAccount();
 
     auto const receiverAccount = view.peek(keylet::account(account));
     if (!receiverAccount)
@@ -466,7 +466,7 @@ issueIOU(
         noRipple,
         false,
         false,
-        final_balance,
+        finalBalance,
         limit,
         0,
         0,
@@ -497,29 +497,29 @@ redeemIOU(
 
     if (auto state = view.peek(keylet::line(account, issue.account, issue.currency)))
     {
-        STAmount final_balance = state->getFieldAmount(sfBalance);
+        STAmount finalBalance = state->getFieldAmount(sfBalance);
 
         if (bSenderHigh)
-            final_balance.negate();  // Put balance in sender terms.
+            finalBalance.negate();  // Put balance in sender terms.
 
-        STAmount const start_balance = final_balance;
+        STAmount const startBalance = finalBalance;
 
-        final_balance -= amount;
+        finalBalance -= amount;
 
-        auto const must_delete =
-            updateTrustLine(view, state, bSenderHigh, account, start_balance, final_balance, j);
+        auto const mustDelete =
+            updateTrustLine(view, state, bSenderHigh, account, startBalance, finalBalance, j);
 
-        view.creditHookIOU(account, issue.account, amount, start_balance);
+        view.creditHookIOU(account, issue.account, amount, startBalance);
 
         if (bSenderHigh)
-            final_balance.negate();
+            finalBalance.negate();
 
         // Adjust the balance on the trust line if necessary. We do this even
         // if we are going to delete the line to reflect the correct balance
         // at the time of deletion.
-        state->setFieldAmount(sfBalance, final_balance);
+        state->setFieldAmount(sfBalance, finalBalance);
 
-        if (must_delete)
+        if (mustDelete)
         {
             return trustDelete(
                 view,
@@ -698,7 +698,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::zero)
+    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 15b3dc0953..000f459ef6 100644
--- a/src/libxrpl/ledger/helpers/TokenHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/TokenHelpers.cpp
@@ -165,7 +165,7 @@ getLineIfUsable(
         return nullptr;
     }
 
-    if (zeroIfFrozen == FreezeHandling::fhZERO_IF_FROZEN)
+    if (zeroIfFrozen == FreezeHandling::ZeroIfFrozen)
     {
         if (isFrozen(view, account, currency, issuer) ||
             isDeepFrozen(view, account, currency, issuer))
@@ -252,12 +252,12 @@ accountHolds(
         return {xrpLiquid(view, account, 0, j)};
     }
 
-    bool const returnSpendable = (includeFullBalance == SpendableHandling::shFULL_BALANCE);
+    bool const returnSpendable = (includeFullBalance == SpendableHandling::FullBalance);
     if (returnSpendable && account == issuer)
     {
         // If the account is the issuer, then their limit is effectively
         // infinite
-        return STAmount{Issue{currency, issuer}, STAmount::cMaxValue, STAmount::cMaxOffset};
+        return STAmount{Issue{currency, issuer}, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET};
     }
 
     // IOU: Return balance on trust line modulo freeze
@@ -290,7 +290,7 @@ accountHolds(
     beast::Journal j,
     SpendableHandling includeFullBalance)
 {
-    bool const returnSpendable = (includeFullBalance == SpendableHandling::shFULL_BALANCE);
+    bool const returnSpendable = (includeFullBalance == SpendableHandling::FullBalance);
     STAmount amount{mptIssue};
     auto const& issuer = mptIssue.getIssuer();
     bool const mptokensV2 = view.rules().enabled(featureMPTokensV2);
@@ -317,7 +317,7 @@ accountHolds(
     {
         amount.clear(mptIssue);
     }
-    else if (zeroIfFrozen == FreezeHandling::fhZERO_IF_FROZEN && isFrozen(view, account, mptIssue))
+    else if (zeroIfFrozen == FreezeHandling::ZeroIfFrozen && isFrozen(view, account, mptIssue))
     {
         amount.clear(mptIssue);
     }
@@ -327,14 +327,14 @@ accountHolds(
 
         // Only if auth check is needed, as it needs to do an additional read
         // operation. Note featureSingleAssetVault will affect error codes.
-        if (zeroIfUnauthorized == AuthHandling::ahZERO_IF_UNAUTHORIZED &&
+        if (zeroIfUnauthorized == AuthHandling::ZeroIfUnauthorized &&
             view.rules().enabled(featureSingleAssetVault))
         {
             if (auto const err = requireAuth(view, mptIssue, account, AuthType::StrongAuth);
                 !isTesSuccess(err))
                 amount.clear(mptIssue);
         }
-        else if (zeroIfUnauthorized == AuthHandling::ahZERO_IF_UNAUTHORIZED)
+        else if (zeroIfUnauthorized == AuthHandling::ZeroIfUnauthorized)
         {
             auto const sleIssuance = view.read(keylet::mptIssuance(mptIssue.getMptID()));
 
@@ -407,7 +407,7 @@ accountFunds(
                 freezeHandling,
                 authHandling,
                 j,
-                SpendableHandling::shFULL_BALANCE);
+                SpendableHandling::FullBalance);
         });
 }
 
@@ -493,8 +493,8 @@ TER
 requireAuth(ReadView const& view, Asset const& asset, AccountID const& account, AuthType authType)
 {
     return std::visit(
-        [&]<ValidIssueType TIss>(TIss const& issue_) {
-            return requireAuth(view, issue_, account, authType);
+        [&]<ValidIssueType TIss>(TIss const& issue) {
+            return requireAuth(view, issue, account, authType);
         },
         asset.value());
 }
@@ -574,9 +574,9 @@ directSendNoFeeIOU(
 
         // FIXME This NEEDS to be cleaned up and simplified. It's impossible
         //       for anyone to understand.
-        if (saBefore > beast::zero
+        if (saBefore > beast::kZERO
             // Sender balance was positive.
-            && saBalance <= beast::zero
+            && saBalance <= beast::kZERO
             // Sender is zero or negative.
             && ((uFlags & (!bSenderHigh ? lsfLowReserve : lsfHighReserve)) != 0u)
             // Sender reserve is set.
@@ -795,7 +795,7 @@ accountSendIOU(
 {
     if (view.rules().enabled(fixAMMv1_1))
     {
-        if (saAmount < beast::zero || saAmount.holds<MPTIssue>())
+        if (saAmount < beast::kZERO || saAmount.holds<MPTIssue>())
         {
             return tecINTERNAL;  // LCOV_EXCL_LINE
         }
@@ -804,7 +804,7 @@ accountSendIOU(
     {
         // LCOV_EXCL_START
         XRPL_ASSERT(
-            saAmount >= beast::zero && !saAmount.holds<MPTIssue>(),
+            saAmount >= beast::kZERO && !saAmount.holds<MPTIssue>(),
             "xrpl::accountSendIOU : minimum amount and not MPT");
         // LCOV_EXCL_STOP
     }
@@ -833,24 +833,23 @@ accountSendIOU(
     TER terResult(tesSUCCESS);
 
     SLE::pointer const sender =
-        uSenderID != beast::zero ? view.peek(keylet::account(uSenderID)) : SLE::pointer();
+        uSenderID != beast::kZERO ? view.peek(keylet::account(uSenderID)) : SLE::pointer();
     SLE::pointer const receiver =
-        uReceiverID != beast::zero ? view.peek(keylet::account(uReceiverID)) : SLE::pointer();
+        uReceiverID != beast::kZERO ? view.peek(keylet::account(uReceiverID)) : SLE::pointer();
 
     if (auto stream = j.trace())
     {
-        std::string sender_bal("-");
-        std::string receiver_bal("-");
+        std::string senderBal("-");
+        std::string receiverBal("-");
 
         if (sender)
-            sender_bal = sender->getFieldAmount(sfBalance).getFullText();
+            senderBal = sender->getFieldAmount(sfBalance).getFullText();
 
         if (receiver)
-            receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
+            receiverBal = receiver->getFieldAmount(sfBalance).getFullText();
 
-        stream << "accountSendIOU> " << to_string(uSenderID) << " (" << sender_bal << ") -> "
-               << to_string(uReceiverID) << " (" << receiver_bal
-               << ") : " << saAmount.getFullText();
+        stream << "accountSendIOU> " << to_string(uSenderID) << " (" << senderBal << ") -> "
+               << to_string(uReceiverID) << " (" << receiverBal << ") : " << saAmount.getFullText();
     }
 
     if (sender)
@@ -886,18 +885,17 @@ accountSendIOU(
 
     if (auto stream = j.trace())
     {
-        std::string sender_bal("-");
-        std::string receiver_bal("-");
+        std::string senderBal("-");
+        std::string receiverBal("-");
 
         if (sender)
-            sender_bal = sender->getFieldAmount(sfBalance).getFullText();
+            senderBal = sender->getFieldAmount(sfBalance).getFullText();
 
         if (receiver)
-            receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
+            receiverBal = receiver->getFieldAmount(sfBalance).getFullText();
 
-        stream << "accountSendIOU< " << to_string(uSenderID) << " (" << sender_bal << ") -> "
-               << to_string(uReceiverID) << " (" << receiver_bal
-               << ") : " << saAmount.getFullText();
+        stream << "accountSendIOU< " << to_string(uSenderID) << " (" << senderBal << ") -> "
+               << to_string(uReceiverID) << " (" << receiverBal << ") : " << saAmount.getFullText();
     }
 
     return terResult;
@@ -931,16 +929,16 @@ accountSendMultiIOU(
      */
 
     SLE::pointer const sender =
-        senderID != beast::zero ? view.peek(keylet::account(senderID)) : SLE::pointer();
+        senderID != beast::kZERO ? view.peek(keylet::account(senderID)) : SLE::pointer();
 
     if (auto stream = j.trace())
     {
-        std::string sender_bal("-");
+        std::string senderBal("-");
 
         if (sender)
-            sender_bal = sender->getFieldAmount(sfBalance).getFullText();
+            senderBal = sender->getFieldAmount(sfBalance).getFullText();
 
-        stream << "accountSendMultiIOU> " << to_string(senderID) << " (" << sender_bal << ") -> "
+        stream << "accountSendMultiIOU> " << to_string(senderID) << " (" << senderBal << ") -> "
                << receivers.size() << " receivers.";
     }
 
@@ -951,7 +949,7 @@ accountSendMultiIOU(
         auto const& receiverID = r.first;
         STAmount const amount{issue, r.second};
 
-        if (amount < beast::zero)
+        if (amount < beast::kZERO)
         {
             return tecINTERNAL;  // LCOV_EXCL_LINE
         }
@@ -963,17 +961,17 @@ accountSendMultiIOU(
             continue;
 
         SLE::pointer const receiver =
-            receiverID != beast::zero ? view.peek(keylet::account(receiverID)) : SLE::pointer();
+            receiverID != beast::kZERO ? view.peek(keylet::account(receiverID)) : SLE::pointer();
 
         if (auto stream = j.trace())
         {
-            std::string receiver_bal("-");
+            std::string receiverBal("-");
 
             if (receiver)
-                receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
+                receiverBal = receiver->getFieldAmount(sfBalance).getFullText();
 
             stream << "accountSendMultiIOU> " << to_string(senderID) << " -> "
-                   << to_string(receiverID) << " (" << receiver_bal
+                   << to_string(receiverID) << " (" << receiverBal
                    << ") : " << amount.getFullText();
         }
 
@@ -992,13 +990,13 @@ accountSendMultiIOU(
 
         if (auto stream = j.trace())
         {
-            std::string receiver_bal("-");
+            std::string receiverBal("-");
 
             if (receiver)
-                receiver_bal = receiver->getFieldAmount(sfBalance).getFullText();
+                receiverBal = receiver->getFieldAmount(sfBalance).getFullText();
 
             stream << "accountSendMultiIOU< " << to_string(senderID) << " -> "
-                   << to_string(receiverID) << " (" << receiver_bal
+                   << to_string(receiverID) << " (" << receiverBal
                    << ") : " << amount.getFullText();
         }
     }
@@ -1019,12 +1017,12 @@ accountSendMultiIOU(
 
     if (auto stream = j.trace())
     {
-        std::string sender_bal("-");
+        std::string senderBal("-");
 
         if (sender)
-            sender_bal = sender->getFieldAmount(sfBalance).getFullText();
+            senderBal = sender->getFieldAmount(sfBalance).getFullText();
 
-        stream << "accountSendMultiIOU< " << to_string(senderID) << " (" << sender_bal << ") -> "
+        stream << "accountSendMultiIOU< " << to_string(senderID) << " (" << senderBal << ") -> "
                << receivers.size() << " receivers.";
     }
     return tesSUCCESS;
@@ -1193,7 +1191,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(maxMPTokenAmount);
+    std::uint64_t const maximumAmount = sle->at(~sfMaximumAmount).value_or(kMAX_MP_TOKEN_AMOUNT);
     std::uint64_t const outstandingAmount = sle->getFieldU64(sfOutstandingAmount);
 
     // actual accumulates the total cost to the sender (includes transfer
@@ -1207,7 +1205,7 @@ directSendNoLimitMultiMPT(
     {
         STAmount const amount{mptIssue, amt};
 
-        if (amount < beast::zero)
+        if (amount < beast::kZERO)
             return tecINTERNAL;  // LCOV_EXCL_LINE
 
         if (!amount || senderID == receiverID)
@@ -1218,7 +1216,7 @@ directSendNoLimitMultiMPT(
             if (senderID == issuer)
             {
                 XRPL_ASSERT_PARTS(
-                    takeFromSender == beast::zero,
+                    takeFromSender == beast::kZERO,
                     "xrpl::directSendNoLimitMultiMPT",
                     "sender == issuer, takeFromSender == zero");
 
@@ -1300,7 +1298,7 @@ accountSendMPT(
     AllowMPTOverflow allowOverflow)
 {
     XRPL_ASSERT(
-        saAmount >= beast::zero && 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 +1400,8 @@ transferXRP(
     STAmount const& amount,
     beast::Journal j)
 {
-    XRPL_ASSERT(from != beast::zero, "xrpl::transferXRP : nonzero from account");
-    XRPL_ASSERT(to != beast::zero, "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/ledger/helpers/VaultHelpers.cpp b/src/libxrpl/ledger/helpers/VaultHelpers.cpp
index 99500b36bf..8832e0078f 100644
--- a/src/libxrpl/ledger/helpers/VaultHelpers.cpp
+++ b/src/libxrpl/ledger/helpers/VaultHelpers.cpp
@@ -86,7 +86,7 @@ assetsToSharesWithdraw(
         return shares;
     Number const shareTotal = issuance->at(sfOutstandingAmount);
     Number result = (shareTotal * assets) / assetTotal;
-    if (truncate == TruncateShares::yes)
+    if (truncate == TruncateShares::Yes)
         result = result.truncate();
     shares = result;
     return shares;
diff --git a/src/libxrpl/net/HTTPClient.cpp b/src/libxrpl/net/HTTPClient.cpp
index 028da37fa7..afdb264916 100644
--- a/src/libxrpl/net/HTTPClient.cpp
+++ b/src/libxrpl/net/HTTPClient.cpp
@@ -33,7 +33,7 @@
 
 namespace xrpl {
 
-static std::optional<HTTPClientSSLContext> httpClientSSLContext;
+static std::optional<HTTPClientSSLContext> gHttpClientSslContext;
 
 void
 HTTPClient::initializeSSLContext(
@@ -42,13 +42,13 @@ HTTPClient::initializeSSLContext(
     bool sslVerify,
     beast::Journal j)
 {
-    httpClientSSLContext.emplace(sslVerifyDir, sslVerifyFile, sslVerify, j);
+    gHttpClientSslContext.emplace(sslVerifyDir, sslVerifyFile, sslVerify, j);
 }
 
 void
 HTTPClient::cleanupSSLContext()
 {
-    httpClientSSLContext.reset();
+    gHttpClientSslContext.reset();
 }
 
 //------------------------------------------------------------------------------
@@ -61,18 +61,18 @@ class HTTPClientImp : public std::enable_shared_from_this<HTTPClientImp>, public
 {
 public:
     HTTPClientImp(
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         unsigned short const port,
         std::size_t maxResponseSize,
         beast::Journal& j)
-        : mSocket(
-              io_context,
-              httpClientSSLContext->context())  // NOLINT(bugprone-unchecked-optional-access)
-        , mResolver(io_context)
-        , mHeader(maxClientHeaderBytes)
-        , mPort(port)
+        : socket_(
+              ioContext,
+              gHttpClientSslContext->context())  // NOLINT(bugprone-unchecked-optional-access)
+        , resolver_(ioContext)
+        , header_(kMAX_CLIENT_HEADER_BYTES)
+        , port_(port)
         , maxResponseSize_(maxResponseSize)
-        , mDeadline(io_context)
+        , deadline_(ioContext)
         , j_(j)
     {
     }
@@ -107,11 +107,11 @@ public:
             int iStatus,
             std::string const& strData)> complete)
     {
-        mSSL = bSSL;
-        mDeqSites = deqSites;
-        mBuild = build;
-        mComplete = complete;
-        mTimeout = timeout;
+        ssl_ = bSSL;
+        deqSites_ = deqSites;
+        build_ = build;
+        complete_ = complete;
+        timeout_ = timeout;
 
         httpsNext();
     }
@@ -128,8 +128,8 @@ public:
             int iStatus,
             std::string const& strData)> complete)
     {
-        mComplete = complete;
-        mTimeout = timeout;
+        complete_ = complete;
+        timeout_ = timeout;
 
         request(
             bSSL,
@@ -149,36 +149,36 @@ public:
     void
     httpsNext()
     {
-        JLOG(j_.trace()) << "Fetch: " << mDeqSites[0];
+        JLOG(j_.trace()) << "Fetch: " << deqSites_[0];
 
         auto query = std::make_shared<Query>(
-            mDeqSites[0],
-            std::to_string(mPort),
+            deqSites_[0],
+            std::to_string(port_),
             boost::asio::ip::resolver_query_base::numeric_service);
-        mQuery = query;
+        query_ = query;
 
         try
         {
-            mDeadline.expires_after(mTimeout);
+            deadline_.expires_after(timeout_);
         }
         catch (boost::system::system_error const& e)
         {
-            mShutdown = e.code();
+            shutdown_ = e.code();
 
-            JLOG(j_.trace()) << "expires_after: " << mShutdown.message();
-            mDeadline.async_wait(
+            JLOG(j_.trace()) << "expires_after: " << shutdown_.message();
+            deadline_.async_wait(
                 std::bind(
                     &HTTPClientImp::handleDeadline, shared_from_this(), std::placeholders::_1));
         }
 
-        if (!mShutdown)
+        if (!shutdown_)
         {
-            JLOG(j_.trace()) << "Resolving: " << mDeqSites[0];
+            JLOG(j_.trace()) << "Resolving: " << deqSites_[0];
 
-            mResolver.async_resolve(
-                mQuery->host,
-                mQuery->port,
-                mQuery->flags,
+            resolver_.async_resolve(
+                query_->host,
+                query_->port,
+                query_->flags,
                 std::bind(
                     &HTTPClientImp::handleResolve,
                     shared_from_this(),
@@ -186,8 +186,8 @@ public:
                     std::placeholders::_2));
         }
 
-        if (mShutdown)
-            invokeComplete(mShutdown);
+        if (shutdown_)
+            invokeComplete(shutdown_);
     }
 
     void
@@ -202,7 +202,7 @@ public:
         }
         else if (ecResult)
         {
-            JLOG(j_.trace()) << "Deadline error: " << mDeqSites[0] << ": " << ecResult.message();
+            JLOG(j_.trace()) << "Deadline error: " << deqSites_[0] << ": " << ecResult.message();
 
             // Can't do anything sound.
             std::abort();
@@ -213,14 +213,14 @@ public:
 
             // Mark us as shutting down.
             // XXX Use our own error code.
-            mShutdown = boost::system::error_code{
+            shutdown_ = boost::system::error_code{
                 boost::system::errc::bad_address, boost::system::system_category()};
 
             // Cancel any resolving.
-            mResolver.cancel();
+            resolver_.cancel();
 
             // Stop the transaction.
-            mSocket.async_shutdown(
+            socket_.asyncShutdown(
                 std::bind(
                     &HTTPClientImp::handleShutdown, shared_from_this(), std::placeholders::_1));
         }
@@ -231,7 +231,7 @@ public:
     {
         if (ecResult)
         {
-            JLOG(j_.trace()) << "Shutdown error: " << mDeqSites[0] << ": " << ecResult.message();
+            JLOG(j_.trace()) << "Shutdown error: " << deqSites_[0] << ": " << ecResult.message();
         }
     }
 
@@ -240,27 +240,27 @@ public:
         boost::system::error_code const& ecResult,
         boost::asio::ip::tcp::resolver::results_type result)
     {
-        if (!mShutdown)
+        if (!shutdown_)
         {
-            mShutdown = ecResult
+            shutdown_ = ecResult
                 ? ecResult
-                // httpClientSSLContext always initialized before use
+                // gHttpClientSslContext always initialized before use
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                : httpClientSSLContext->preConnectVerify(mSocket.SSLSocket(), mDeqSites[0]);
+                : gHttpClientSslContext->preConnectVerify(socket_.sslSocket(), deqSites_[0]);
         }
 
-        if (mShutdown)
+        if (shutdown_)
         {
-            JLOG(j_.trace()) << "Resolve error: " << mDeqSites[0] << ": " << mShutdown.message();
+            JLOG(j_.trace()) << "Resolve error: " << deqSites_[0] << ": " << shutdown_.message();
 
-            invokeComplete(mShutdown);
+            invokeComplete(shutdown_);
         }
         else
         {
             JLOG(j_.trace()) << "Resolve complete.";
 
             boost::asio::async_connect(
-                mSocket.lowest_layer(),
+                socket_.lowestLayer(),
                 result,
                 std::bind(
                     &HTTPClientImp::handleConnect, shared_from_this(), std::placeholders::_1));
@@ -270,36 +270,36 @@ public:
     void
     handleConnect(boost::system::error_code const& ecResult)
     {
-        if (!mShutdown)
-            mShutdown = ecResult;
+        if (!shutdown_)
+            shutdown_ = ecResult;
 
-        if (mShutdown)
+        if (shutdown_)
         {
-            JLOG(j_.trace()) << "Connect error: " << mShutdown.message();
+            JLOG(j_.trace()) << "Connect error: " << shutdown_.message();
         }
 
-        if (!mShutdown)
+        if (!shutdown_)
         {
             JLOG(j_.trace()) << "Connected.";
 
-            // httpClientSSLContext always initialized before use
+            // gHttpClientSslContext always initialized before use
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            mShutdown = httpClientSSLContext->postConnectVerify(mSocket.SSLSocket(), mDeqSites[0]);
+            shutdown_ = gHttpClientSslContext->postConnectVerify(socket_.sslSocket(), deqSites_[0]);
 
-            if (mShutdown)
+            if (shutdown_)
             {
-                JLOG(j_.trace()) << "postConnectVerify: " << mDeqSites[0] << ": "
-                                 << mShutdown.message();
+                JLOG(j_.trace()) << "postConnectVerify: " << deqSites_[0] << ": "
+                                 << shutdown_.message();
             }
         }
 
-        if (mShutdown)
+        if (shutdown_)
         {
-            invokeComplete(mShutdown);
+            invokeComplete(shutdown_);
         }
-        else if (mSSL)
+        else if (ssl_)
         {
-            mSocket.async_handshake(
+            socket_.asyncHandshake(
                 AutoSocket::ssl_socket::client,
                 std::bind(
                     &HTTPClientImp::handleRequest, shared_from_this(), std::placeholders::_1));
@@ -313,23 +313,23 @@ public:
     void
     handleRequest(boost::system::error_code const& ecResult)
     {
-        if (!mShutdown)
-            mShutdown = ecResult;
+        if (!shutdown_)
+            shutdown_ = ecResult;
 
-        if (mShutdown)
+        if (shutdown_)
         {
-            JLOG(j_.trace()) << "Handshake error:" << mShutdown.message();
+            JLOG(j_.trace()) << "Handshake error:" << shutdown_.message();
 
-            invokeComplete(mShutdown);
+            invokeComplete(shutdown_);
         }
         else
         {
             JLOG(j_.trace()) << "Session started.";
 
-            mBuild(mRequest, mDeqSites[0]);
+            build_(request_, deqSites_[0]);
 
-            mSocket.async_write(
-                mRequest,
+            socket_.asyncWrite(
+                request_,
                 std::bind(
                     &HTTPClientImp::handleWrite,
                     shared_from_this(),
@@ -339,23 +339,23 @@ public:
     }
 
     void
-    handleWrite(boost::system::error_code const& ecResult, std::size_t bytes_transferred)
+    handleWrite(boost::system::error_code const& ecResult, std::size_t bytesTransferred)
     {
-        if (!mShutdown)
-            mShutdown = ecResult;
+        if (!shutdown_)
+            shutdown_ = ecResult;
 
-        if (mShutdown)
+        if (shutdown_)
         {
-            JLOG(j_.trace()) << "Write error: " << mShutdown.message();
+            JLOG(j_.trace()) << "Write error: " << shutdown_.message();
 
-            invokeComplete(mShutdown);
+            invokeComplete(shutdown_);
         }
         else
         {
             JLOG(j_.trace()) << "Wrote.";
 
-            mSocket.async_read_until(
-                mHeader,
+            socket_.asyncReadUntil(
+                header_,
                 "\r\n\r\n",
                 std::bind(
                     &HTTPClientImp::handleHeader,
@@ -366,20 +366,20 @@ public:
     }
 
     void
-    handleHeader(boost::system::error_code const& ecResult, std::size_t bytes_transferred)
+    handleHeader(boost::system::error_code const& ecResult, std::size_t bytesTransferred)
     {
         std::string strHeader{
-            {std::istreambuf_iterator<char>(&mHeader)}, std::istreambuf_iterator<char>()};
+            {std::istreambuf_iterator<char>(&header_)}, std::istreambuf_iterator<char>()};
         JLOG(j_.trace()) << "Header: \"" << strHeader << "\"";
 
-        static boost::regex const reStatus{"\\`HTTP/1\\S+ (\\d{3}) .*\\'"};  // HTTP/1.1 200 OK
-        static boost::regex const reSize{
+        static boost::regex const kRE_STATUS{"\\`HTTP/1\\S+ (\\d{3}) .*\\'"};  // HTTP/1.1 200 OK
+        static boost::regex const kRE_SIZE{
             "\\`.*\\r\\nContent-Length:\\s+([0-9]+).*\\'", boost::regex::icase};
-        static boost::regex const reBody{"\\`.*\\r\\n\\r\\n(.*)\\'"};
+        static boost::regex const kRE_BODY{"\\`.*\\r\\n\\r\\n(.*)\\'"};
 
         boost::smatch smMatch;
         // Match status code.
-        if (!boost::regex_match(strHeader, smMatch, reStatus))
+        if (!boost::regex_match(strHeader, smMatch, kRE_STATUS))
         {
             // XXX Use our own error code.
             JLOG(j_.trace()) << "No status code";
@@ -389,13 +389,13 @@ public:
             return;
         }
 
-        mStatus = beast::lexicalCastThrow<int>(std::string(smMatch[1]));
+        status_ = beast::lexicalCastThrow<int>(std::string(smMatch[1]));
 
-        if (boost::regex_match(strHeader, smMatch, reBody))  // we got some body
-            mBody = smMatch[1];
+        if (boost::regex_match(strHeader, smMatch, kRE_BODY))  // we got some body
+            body_ = smMatch[1];
 
         std::size_t const responseSize = [&] {
-            if (boost::regex_match(strHeader, smMatch, reSize))
+            if (boost::regex_match(strHeader, smMatch, kRE_SIZE))
                 return beast::lexicalCast<std::size_t>(std::string(smMatch[1]), maxResponseSize_);
             return maxResponseSize_;
         }();
@@ -412,17 +412,17 @@ public:
         if (responseSize == 0)
         {
             // no body wanted or available
-            invokeComplete(ecResult, mStatus);
+            invokeComplete(ecResult, status_);
         }
-        else if (mBody.size() >= responseSize)
+        else if (body_.size() >= responseSize)
         {
             // we got the whole thing
-            invokeComplete(ecResult, mStatus, mBody);
+            invokeComplete(ecResult, status_, body_);
         }
         else
         {
-            mSocket.async_read(
-                mResponse.prepare(responseSize - mBody.size()),
+            socket_.asyncRead(
+                response_.prepare(responseSize - body_.size()),
                 boost::asio::transfer_all(),
                 std::bind(
                     &HTTPClientImp::handleData,
@@ -433,29 +433,29 @@ public:
     }
 
     void
-    handleData(boost::system::error_code const& ecResult, std::size_t bytes_transferred)
+    handleData(boost::system::error_code const& ecResult, std::size_t bytesTransferred)
     {
-        if (!mShutdown)
-            mShutdown = ecResult;
+        if (!shutdown_)
+            shutdown_ = ecResult;
 
-        if (mShutdown && mShutdown != boost::asio::error::eof)
+        if (shutdown_ && shutdown_ != boost::asio::error::eof)
         {
-            JLOG(j_.trace()) << "Read error: " << mShutdown.message();
+            JLOG(j_.trace()) << "Read error: " << shutdown_.message();
 
-            invokeComplete(mShutdown);
+            invokeComplete(shutdown_);
         }
         else
         {
-            if (mShutdown)
+            if (shutdown_)
             {
                 JLOG(j_.trace()) << "Complete.";
             }
             else
             {
-                mResponse.commit(bytes_transferred);
+                response_.commit(bytesTransferred);
                 std::string const strBody{
-                    {std::istreambuf_iterator<char>(&mResponse)}, std::istreambuf_iterator<char>()};
-                invokeComplete(ecResult, mStatus, mBody + strBody);
+                    {std::istreambuf_iterator<char>(&response_)}, std::istreambuf_iterator<char>()};
+                invokeComplete(ecResult, status_, body_ + strBody);
             }
         }
     }
@@ -470,7 +470,7 @@ public:
         boost::system::error_code ecCancel;
         try
         {
-            mDeadline.cancel();
+            deadline_.cancel();
         }
         catch (boost::system::system_error const& e)
         {
@@ -478,24 +478,24 @@ public:
             ecCancel = e.code();
         }
 
-        JLOG(j_.debug()) << "invokeComplete: Deadline popping: " << mDeqSites.size();
+        JLOG(j_.debug()) << "invokeComplete: Deadline popping: " << deqSites_.size();
 
-        if (!mDeqSites.empty())
+        if (!deqSites_.empty())
         {
-            mDeqSites.pop_front();
+            deqSites_.pop_front();
         }
 
         bool bAgain = true;
 
-        if (mDeqSites.empty() || !ecResult)
+        if (deqSites_.empty() || !ecResult)
         {
             // ecResult: !0 = had an error, last entry
             //    iStatus: result, if no error
             //  strData: data, if no error
-            bAgain = mComplete && mComplete(ecResult ? ecResult : ecCancel, iStatus, strData);
+            bAgain = complete_ && complete_(ecResult ? ecResult : ecCancel, iStatus, strData);
         }
 
-        if (!mDeqSites.empty() && bAgain)
+        if (!deqSites_.empty() && bAgain)
         {
             httpsNext();
         }
@@ -504,9 +504,9 @@ public:
 private:
     using pointer = std::shared_ptr<HTTPClient>;
 
-    bool mSSL{};
-    AutoSocket mSocket;
-    boost::asio::ip::tcp::resolver mResolver;
+    bool ssl_{};
+    AutoSocket socket_;
+    boost::asio::ip::tcp::resolver resolver_;
 
     struct Query
     {
@@ -514,27 +514,27 @@ private:
         std::string port;
         boost::asio::ip::resolver_query_base::flags flags;
     };
-    std::shared_ptr<Query> mQuery;
+    std::shared_ptr<Query> query_;
 
-    boost::asio::streambuf mRequest;
-    boost::asio::streambuf mHeader;
-    boost::asio::streambuf mResponse;
-    std::string mBody;
-    unsigned short const mPort;
+    boost::asio::streambuf request_;
+    boost::asio::streambuf header_;
+    boost::asio::streambuf response_;
+    std::string body_;
+    unsigned short const port_;
     std::size_t const maxResponseSize_;
-    int mStatus{};
-    std::function<void(boost::asio::streambuf& sb, std::string const& strHost)> mBuild;
+    int status_{};
+    std::function<void(boost::asio::streambuf& sb, std::string const& strHost)> build_;
     std::function<
         bool(boost::system::error_code const& ecResult, int iStatus, std::string const& strData)>
-        mComplete;
+        complete_;
 
-    boost::asio::basic_waitable_timer<std::chrono::steady_clock> mDeadline;
+    boost::asio::basic_waitable_timer<std::chrono::steady_clock> deadline_;
 
     // If not success, we are shutting down.
-    boost::system::error_code mShutdown;
+    boost::system::error_code shutdown_;
 
-    std::deque<std::string> mDeqSites;
-    std::chrono::seconds mTimeout{};
+    std::deque<std::string> deqSites_;
+    std::chrono::seconds timeout_{};
     beast::Journal j_;
 };
 
@@ -543,7 +543,7 @@ private:
 void
 HTTPClient::get(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     std::deque<std::string> deqSites,
     unsigned short const port,
     std::string const& strPath,
@@ -554,14 +554,14 @@ HTTPClient::get(
         complete,
     beast::Journal& j)
 {
-    auto client = std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+    auto client = std::make_shared<HTTPClientImp>(ioContext, port, responseMax, j);
     client->get(bSSL, deqSites, strPath, timeout, complete);
 }
 
 void
 HTTPClient::get(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     std::string strSite,
     unsigned short const port,
     std::string const& strPath,
@@ -574,14 +574,14 @@ HTTPClient::get(
 {
     std::deque<std::string> const deqSites(1, strSite);
 
-    auto client = std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+    auto client = std::make_shared<HTTPClientImp>(ioContext, port, responseMax, j);
     client->get(bSSL, deqSites, strPath, timeout, complete);
 }
 
 void
 HTTPClient::request(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     std::string strSite,
     unsigned short const port,
     std::function<void(boost::asio::streambuf& sb, std::string const& strHost)> setRequest,
@@ -594,7 +594,7 @@ HTTPClient::request(
 {
     std::deque<std::string> const deqSites(1, strSite);
 
-    auto client = std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+    auto client = std::make_shared<HTTPClientImp>(ioContext, port, responseMax, j);
     client->request(bSSL, deqSites, setRequest, timeout, complete);
 }
 
diff --git a/src/libxrpl/nodestore/BatchWriter.cpp b/src/libxrpl/nodestore/BatchWriter.cpp
index b05c80ff00..28184bf174 100644
--- a/src/libxrpl/nodestore/BatchWriter.cpp
+++ b/src/libxrpl/nodestore/BatchWriter.cpp
@@ -14,9 +14,9 @@
 namespace xrpl::NodeStore {
 
 BatchWriter::BatchWriter(Callback& callback, Scheduler& scheduler)
-    : m_callback(callback), m_scheduler(scheduler)
+    : callback_(callback), scheduler_(scheduler)
 {
-    mWriteSet.reserve(batchWritePreallocationSize);
+    writeSet_.reserve(BatchWritePreallocationSize);
 }
 
 BatchWriter::~BatchWriter()
@@ -27,29 +27,29 @@ BatchWriter::~BatchWriter()
 void
 BatchWriter::store(std::shared_ptr<NodeObject> const& object)
 {
-    std::unique_lock<decltype(mWriteMutex)> sl(mWriteMutex);
+    std::unique_lock<decltype(writeMutex_)> sl(writeMutex_);
 
     // If the batch has reached its limit, we wait
     // until the batch writer is finished
-    while (mWriteSet.size() >= batchWriteLimitSize)
-        mWriteCondition.wait(sl);
+    while (writeSet_.size() >= BatchWriteLimitSize)
+        writeCondition_.wait(sl);
 
-    mWriteSet.push_back(object);
+    writeSet_.push_back(object);
 
-    if (!mWritePending)
+    if (!writePending_)
     {
-        mWritePending = true;
+        writePending_ = true;
 
-        m_scheduler.scheduleTask(*this);
+        scheduler_.scheduleTask(*this);
     }
 }
 
 int
 BatchWriter::getWriteLoad()
 {
-    std::scoped_lock const sl(mWriteMutex);
+    std::scoped_lock const sl(writeMutex_);
 
-    return std::max(mWriteLoad, static_cast<int>(mWriteSet.size()));
+    return std::max(writeLoad_, static_cast<int>(writeSet_.size()));
 }
 
 void
@@ -65,20 +65,20 @@ BatchWriter::writeBatch()
     {
         std::vector<std::shared_ptr<NodeObject>> set;
 
-        set.reserve(batchWritePreallocationSize);
+        set.reserve(BatchWritePreallocationSize);
 
         {
-            std::scoped_lock const sl(mWriteMutex);
+            std::scoped_lock const sl(writeMutex_);
 
-            mWriteSet.swap(set);
+            writeSet_.swap(set);
             XRPL_ASSERT(
-                mWriteSet.empty(), "xrpl::NodeStore::BatchWriter::writeBatch : writes not set");
-            mWriteLoad = set.size();
+                writeSet_.empty(), "xrpl::NodeStore::BatchWriter::writeBatch : writes not set");
+            writeLoad_ = set.size();
 
             if (set.empty())
             {
-                mWritePending = false;
-                mWriteCondition.notify_all();
+                writePending_ = false;
+                writeCondition_.notify_all();
 
                 // VFALCO NOTE Fix this function to not return from the middle
                 return;
@@ -89,22 +89,22 @@ BatchWriter::writeBatch()
         report.writeCount = set.size();
         auto const before = std::chrono::steady_clock::now();
 
-        m_callback.writeBatch(set);
+        callback_.writeBatch(set);
 
         report.elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
             std::chrono::steady_clock::now() - before);
 
-        m_scheduler.onBatchWrite(report);
+        scheduler_.onBatchWrite(report);
     }
 }
 
 void
 BatchWriter::waitForWriting()
 {
-    std::unique_lock<decltype(mWriteMutex)> sl(mWriteMutex);
+    std::unique_lock<decltype(writeMutex_)> sl(writeMutex_);
 
-    while (mWritePending)
-        mWriteCondition.wait(sl);
+    while (writePending_)
+        writeCondition_.wait(sl);
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/nodestore/Database.cpp b/src/libxrpl/nodestore/Database.cpp
index fa69cba517..84941d98aa 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", XRP_LEDGER_EARLIEST_SEQ))
+    , earliestLedgerSeq_(get<std::uint32_t>(config, "earliest_seq", kXRP_LEDGER_EARLIEST_SEQ))
     , requestBundle_(get<int>(config, "rq_bundle", 4))
     , readThreads_(std::max(1, readThreads))
 {
@@ -95,7 +95,7 @@ Database::Database(
                         auto const& data = it->second;
                         auto const seqn = data[0].first;
 
-                        auto obj = fetchNodeObject(hash, seqn, FetchType::async);
+                        auto obj = fetchNodeObject(hash, seqn, FetchType::Async);
 
                         // This could be further optimized: if there are
                         // multiple requests for sequence numbers mapping to
@@ -107,7 +107,7 @@ Database::Database(
                             req.second(
                                 (seqn == req.first) || isSameDB(req.first, seqn)
                                     ? obj
-                                    : fetchNodeObject(hash, req.first, FetchType::async));
+                                    : fetchNodeObject(hash, req.first, FetchType::Async));
                         }
                     }
 
@@ -192,7 +192,7 @@ void
 Database::importInternal(Backend& dstBackend, Database& srcDB)
 {
     Batch batch;
-    batch.reserve(batchWritePreallocationSize);
+    batch.reserve(BatchWritePreallocationSize);
     auto storeBatch = [&, fname = __func__]() {
         try
         {
@@ -211,13 +211,13 @@ Database::importInternal(Backend& dstBackend, Database& srcDB)
         batch.clear();
     };
 
-    srcDB.for_each([&](std::shared_ptr<NodeObject> nodeObject) {
+    srcDB.forEach([&](std::shared_ptr<NodeObject> nodeObject) {
         XRPL_ASSERT(nodeObject, "xrpl::NodeStore::Database::importInternal : non-null node");
         if (!nodeObject)  // This should never happen
             return;
 
         batch.emplace_back(std::move(nodeObject));
-        if (batch.size() >= batchWritePreallocationSize)
+        if (batch.size() >= BatchWritePreallocationSize)
             storeBatch();
     });
 
@@ -254,13 +254,13 @@ Database::fetchNodeObject(
 }
 
 void
-Database::getCountsJson(Json::Value& obj)
+Database::getCountsJson(json::Value& obj)
 {
     XRPL_ASSERT(obj.isObject(), "xrpl::NodeStore::Database::getCountsJson : valid input type");
 
     {
         std::unique_lock<std::mutex> const lock(readLock_);
-        obj["read_queue"] = static_cast<Json::UInt>(read_.size());
+        obj["read_queue"] = static_cast<json::UInt>(read_.size());
     }
 
     obj["read_threads_total"] = readThreads_.load();
diff --git a/src/libxrpl/nodestore/DatabaseNodeImp.cpp b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
index 1bb5f32308..ef84862de6 100644
--- a/src/libxrpl/nodestore/DatabaseNodeImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseNodeImp.cpp
@@ -48,7 +48,7 @@ DatabaseNodeImp::fetchNodeObject(
     bool duplicate)
 {
     std::shared_ptr<NodeObject> nodeObject = nullptr;
-    Status status = Status::ok;
+    Status status = Status::Ok;
 
     try
     {
@@ -58,15 +58,15 @@ DatabaseNodeImp::fetchNodeObject(
     {
         JLOG(j_.fatal()) << "fetchNodeObject " << hash
                          << ": Exception fetching from backend: " << e.what();
-        Rethrow();
+        rethrow();
     }
 
     switch (status)
     {
-        case Status::ok:
-        case Status::notFound:
+        case Status::Ok:
+        case Status::NotFound:
             break;
-        case Status::dataCorrupt:
+        case Status::DataCorrupt:
             JLOG(j_.fatal()) << "fetchNodeObject " << hash << ": nodestore data is corrupted";
             break;
         default:
diff --git a/src/libxrpl/nodestore/DatabaseRotatingImp.cpp b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
index de34af7773..24b0e2de2e 100644
--- a/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
+++ b/src/libxrpl/nodestore/DatabaseRotatingImp.cpp
@@ -121,7 +121,7 @@ DatabaseRotatingImp::fetchNodeObject(
     bool duplicate)
 {
     auto fetch = [&](std::shared_ptr<Backend> const& backend) {
-        Status status = Status::ok;
+        Status status = Status::Ok;
         std::shared_ptr<NodeObject> nodeObject;
         try
         {
@@ -130,15 +130,15 @@ DatabaseRotatingImp::fetchNodeObject(
         catch (std::exception const& e)
         {
             JLOG(j_.fatal()) << "Exception, " << e.what();
-            Rethrow();
+            rethrow();
         }
 
         switch (status)
         {
-            case Status::ok:
-            case Status::notFound:
+            case Status::Ok:
+            case Status::NotFound:
                 break;
-            case Status::dataCorrupt:
+            case Status::DataCorrupt:
                 JLOG(j_.fatal()) << "Corrupt NodeObject #" << hash;
                 break;
             default:
@@ -184,7 +184,7 @@ DatabaseRotatingImp::fetchNodeObject(
 }
 
 void
-DatabaseRotatingImp::for_each(std::function<void(std::shared_ptr<NodeObject>)> f)
+DatabaseRotatingImp::forEach(std::function<void(std::shared_ptr<NodeObject>)> f)
 {
     auto [writable, archive] = [&] {
         std::scoped_lock const lock(mutex_);
@@ -192,10 +192,10 @@ DatabaseRotatingImp::for_each(std::function<void(std::shared_ptr<NodeObject>)> f
     }();
 
     // Iterate the writable backend
-    writable->for_each(f);
+    writable->forEach(f);
 
     // Iterate the archive backend
-    archive->for_each(f);
+    archive->forEach(f);
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/nodestore/DecodedBlob.cpp b/src/libxrpl/nodestore/DecodedBlob.cpp
index 437aef24da..fb7569bd8c 100644
--- a/src/libxrpl/nodestore/DecodedBlob.cpp
+++ b/src/libxrpl/nodestore/DecodedBlob.cpp
@@ -23,34 +23,34 @@ DecodedBlob::DecodedBlob(void const* key, void const* value, int valueBytes)
         9...end                     The body of the object data
     */
 
-    m_success = false;
-    m_key = key;
-    m_objectType = NodeObjectType::hotUNKNOWN;
-    m_objectData = nullptr;
-    m_dataBytes = std::max(0, valueBytes - 9);
+    success_ = false;
+    key_ = key;
+    objectType_ = NodeObjectType::Unknown;
+    objectData_ = nullptr;
+    dataBytes_ = std::max(0, valueBytes - 9);
 
     // VFALCO NOTE What about bytes 4 through 7 inclusive?
 
     if (valueBytes > 8)
     {
         unsigned char const* byte = static_cast<unsigned char const*>(value);
-        m_objectType = safe_cast<NodeObjectType>(byte[8]);
+        objectType_ = safeCast<NodeObjectType>(byte[8]);
     }
 
     if (valueBytes > 9)
     {
-        m_objectData = static_cast<unsigned char const*>(value) + 9;
+        objectData_ = static_cast<unsigned char const*>(value) + 9;
 
-        switch (m_objectType)
+        switch (objectType_)
         {
             default:
                 break;
 
-            case NodeObjectType::hotUNKNOWN:
-            case NodeObjectType::hotLEDGER:
-            case NodeObjectType::hotACCOUNT_NODE:
-            case NodeObjectType::hotTRANSACTION_NODE:
-                m_success = true;
+            case NodeObjectType::Unknown:
+            case NodeObjectType::Ledger:
+            case NodeObjectType::AccountNode:
+            case NodeObjectType::TransactionNode:
+                success_ = true;
                 break;
         }
     }
@@ -59,15 +59,15 @@ DecodedBlob::DecodedBlob(void const* key, void const* value, int valueBytes)
 std::shared_ptr<NodeObject>
 DecodedBlob::createObject()
 {
-    XRPL_ASSERT(m_success, "xrpl::NodeStore::DecodedBlob::createObject : valid object type");
+    XRPL_ASSERT(success_, "xrpl::NodeStore::DecodedBlob::createObject : valid object type");
 
     std::shared_ptr<NodeObject> object;
 
-    if (m_success)
+    if (success_)
     {
-        Blob data(m_objectData, m_objectData + m_dataBytes);
+        Blob data(objectData_, objectData_ + dataBytes_);
 
-        object = NodeObject::createObject(m_objectType, std::move(data), uint256::fromVoid(m_key));
+        object = NodeObject::createObject(objectType_, std::move(data), uint256::fromVoid(key_));
     }
 
     return object;
diff --git a/src/libxrpl/nodestore/ManagerImp.cpp b/src/libxrpl/nodestore/ManagerImp.cpp
index 1420bf3997..0cfda7d86a 100644
--- a/src/libxrpl/nodestore/ManagerImp.cpp
+++ b/src/libxrpl/nodestore/ManagerImp.cpp
@@ -26,12 +26,12 @@ namespace xrpl::NodeStore {
 ManagerImp&
 ManagerImp::instance()
 {
-    static ManagerImp _;
-    return _;
+    static ManagerImp k_;
+    return k_;
 }
 
 void
-ManagerImp::missing_backend()
+ManagerImp::missingBackend()
 {
     Throw<std::runtime_error>(
         "Your xrpld.cfg is missing a [node_db] entry, "
@@ -60,7 +60,7 @@ ManagerImp::ManagerImp()
 }
 
 std::unique_ptr<Backend>
-ManagerImp::make_Backend(
+ManagerImp::makeBackend(
     Section const& parameters,
     std::size_t burstSize,
     Scheduler& scheduler,
@@ -68,26 +68,27 @@ ManagerImp::make_Backend(
 {
     std::string const type{get(parameters, "type")};
     if (type.empty())
-        missing_backend();
+        missingBackend();
 
     auto factory{find(type)};
     if (factory == nullptr)
     {
-        missing_backend();
+        missingBackend();
     }
 
-    return factory->createInstance(NodeObject::keyBytes, parameters, burstSize, scheduler, journal);
+    return factory->createInstance(
+        NodeObject::kKEY_BYTES, parameters, burstSize, scheduler, journal);
 }
 
 std::unique_ptr<Database>
-ManagerImp::make_Database(
+ManagerImp::makeDatabase(
     std::size_t burstSize,
     Scheduler& scheduler,
     int readThreads,
     Section const& config,
     beast::Journal journal)
 {
-    auto backend{make_Backend(config, burstSize, scheduler, journal)};
+    auto backend{makeBackend(config, burstSize, scheduler, journal)};
     backend->open();
     return std::make_unique<DatabaseNodeImp>(
         scheduler, readThreads, std::move(backend), config, journal);
diff --git a/src/libxrpl/nodestore/NodeObject.cpp b/src/libxrpl/nodestore/NodeObject.cpp
index b19d5d625a..99432eb495 100644
--- a/src/libxrpl/nodestore/NodeObject.cpp
+++ b/src/libxrpl/nodestore/NodeObject.cpp
@@ -11,7 +11,7 @@ namespace xrpl {
 //------------------------------------------------------------------------------
 
 NodeObject::NodeObject(NodeObjectType type, Blob&& data, uint256 const& hash, PrivateAccess)
-    : mType(type), mHash(hash), mData(std::move(data))
+    : type_(type), hash_(hash), data_(std::move(data))
 {
 }
 
@@ -24,19 +24,19 @@ NodeObject::createObject(NodeObjectType type, Blob&& data, uint256 const& hash)
 NodeObjectType
 NodeObject::getType() const
 {
-    return mType;
+    return type_;
 }
 
 uint256 const&
 NodeObject::getHash() const
 {
-    return mHash;
+    return hash_;
 }
 
 Blob const&
 NodeObject::getData() const
 {
-    return mData;
+    return data_;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/nodestore/backend/MemoryFactory.cpp b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
index ef07ebe957..13c82696cb 100644
--- a/src/libxrpl/nodestore/backend/MemoryFactory.cpp
+++ b/src/libxrpl/nodestore/backend/MemoryFactory.cpp
@@ -69,13 +69,13 @@ public:
     }
 };
 
-MemoryFactory* memoryFactory = nullptr;
+MemoryFactory* gMemoryFactory = nullptr;
 
 void
 registerMemoryFactory(Manager& manager)
 {
-    static MemoryFactory instance{manager};
-    memoryFactory = &instance;
+    static MemoryFactory kINSTANCE{manager};
+    gMemoryFactory = &kINSTANCE;
 }
 
 //------------------------------------------------------------------------------
@@ -112,7 +112,7 @@ public:
     void
     open(bool) override
     {
-        db_ = &memoryFactory->open(name_);
+        db_ = &gMemoryFactory->open(name_);
     }
 
     bool
@@ -140,10 +140,10 @@ public:
         if (iter == db_->table.end())
         {
             pObject->reset();
-            return Status::notFound;
+            return Status::NotFound;
         }
         *pObject = iter->second;
-        return Status::ok;
+        return Status::Ok;
     }
 
     std::pair<std::vector<std::shared_ptr<NodeObject>>, Status>
@@ -155,7 +155,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != Status::ok)
+            if (status != Status::Ok)
             {
                 results.push_back({});
             }
@@ -165,7 +165,7 @@ public:
             }
         }
 
-        return {results, Status::ok};
+        return {results, Status::Ok};
     }
 
     void
@@ -189,9 +189,9 @@ public:
     }
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override
     {
-        XRPL_ASSERT(db_, "xrpl::NodeStore::MemoryBackend::for_each : non-null database");
+        XRPL_ASSERT(db_, "xrpl::NodeStore::MemoryBackend::forEach : non-null database");
         for (auto const& e : db_->table)
             f(e.second);
     }
diff --git a/src/libxrpl/nodestore/backend/NuDBFactory.cpp b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
index 18fe3c572e..db9dbcbec1 100644
--- a/src/libxrpl/nodestore/backend/NuDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NuDBFactory.cpp
@@ -53,16 +53,16 @@ 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 appnum = 1;
+    static constexpr std::uint64_t kAPPNUM = 1;
 
-    beast::Journal const j_;
-    size_t const keyBytes_;
-    std::size_t const burstSize_;
-    std::string const name_;
-    std::size_t const blockSize_;
-    nudb::store db_;
-    std::atomic<bool> deletePath_;
-    Scheduler& scheduler_;
+    beast::Journal const j;
+    size_t const keyBytes;
+    std::size_t const burstSize;
+    std::string const name;
+    std::size_t const blockSize;
+    nudb::store db;
+    std::atomic<bool> deletePath;
+    Scheduler& scheduler;
 
     NuDBBackend(
         size_t keyBytes,
@@ -70,15 +70,15 @@ public:
         std::size_t burstSize,
         Scheduler& scheduler,
         beast::Journal journal)
-        : j_(journal)
-        , keyBytes_(keyBytes)
-        , burstSize_(burstSize)
-        , name_(get(keyValues, "path"))
-        , blockSize_(parseBlockSize(name_, keyValues, journal))
-        , deletePath_(false)
-        , scheduler_(scheduler)
+        : j(journal)
+        , keyBytes(keyBytes)
+        , burstSize(burstSize)
+        , name(get(keyValues, "path"))
+        , blockSize(parseBlockSize(name, keyValues, journal))
+        , deletePath(false)
+        , scheduler(scheduler)
     {
-        if (name_.empty())
+        if (name.empty())
             Throw<std::runtime_error>("nodestore: Missing path in NuDB backend");
     }
 
@@ -89,16 +89,16 @@ public:
         Scheduler& scheduler,
         nudb::context& context,
         beast::Journal journal)
-        : j_(journal)
-        , keyBytes_(keyBytes)
-        , burstSize_(burstSize)
-        , name_(get(keyValues, "path"))
-        , blockSize_(parseBlockSize(name_, keyValues, journal))
-        , db_(context)
-        , deletePath_(false)
-        , scheduler_(scheduler)
+        : j(journal)
+        , keyBytes(keyBytes)
+        , burstSize(burstSize)
+        , name(get(keyValues, "path"))
+        , blockSize(parseBlockSize(name, keyValues, journal))
+        , db(context)
+        , deletePath(false)
+        , scheduler(scheduler)
     {
-        if (name_.empty())
+        if (name.empty())
             Throw<std::runtime_error>("nodestore: Missing path in NuDB backend");
     }
 
@@ -119,30 +119,30 @@ public:
     std::string
     getName() override
     {
-        return name_;
+        return name;
     }
 
     [[nodiscard]] std::optional<std::size_t>
     getBlockSize() const override
     {
-        return blockSize_;
+        return blockSize;
     }
 
     void
     open(bool createIfMissing, uint64_t appType, uint64_t uid, uint64_t salt) override
     {
         using namespace boost::filesystem;
-        if (db_.is_open())
+        if (db.is_open())
         {
             // LCOV_EXCL_START
             UNREACHABLE(
                 "xrpl::NodeStore::NuDBBackend::open : database is already "
                 "open");
-            JLOG(j_.error()) << "database is already open";
+            JLOG(j.error()) << "database is already open";
             return;
             // LCOV_EXCL_STOP
         }
-        auto const folder = path(name_);
+        auto const folder = path(name);
         auto const dp = (folder / "nudb.dat").string();
         auto const kp = (folder / "nudb.key").string();
         auto const lp = (folder / "nudb.log").string();
@@ -151,54 +151,54 @@ public:
         {
             create_directories(folder);
             nudb::create<nudb::xxhasher>(
-                dp, kp, lp, appType, uid, salt, keyBytes_, blockSize_, 0.50, ec);
+                dp, kp, lp, appType, uid, salt, keyBytes, blockSize, 0.50, ec);
             if (ec == nudb::errc::file_exists)
                 ec = {};
             if (ec)
                 Throw<nudb::system_error>(ec);
         }
-        db_.open(dp, kp, lp, ec);
+        db.open(dp, kp, lp, ec);
         if (ec)
             Throw<nudb::system_error>(ec);
 
-        if (db_.appnum() != appnum)
+        if (db.appnum() != kAPPNUM)
             Throw<std::runtime_error>("nodestore: unknown appnum");
-        db_.set_burst(burstSize_);
+        db.set_burst(burstSize);
     }
 
     bool
     isOpen() override
     {
-        return db_.is_open();
+        return db.is_open();
     }
 
     void
     open(bool createIfMissing) override
     {
-        open(createIfMissing, appnum, nudb::make_uid(), nudb::make_salt());
+        open(createIfMissing, kAPPNUM, nudb::make_uid(), nudb::make_salt());
     }
 
     void
     close() override
     {
-        if (db_.is_open())
+        if (db.is_open())
         {
             nudb::error_code ec;
-            db_.close(ec);
+            db.close(ec);
             if (ec)
             {
                 // Log to make sure the nature of the error gets to the user.
-                JLOG(j_.fatal()) << "NuBD close() failed: " << ec.message();
+                JLOG(j.fatal()) << "NuBD close() failed: " << ec.message();
                 Throw<nudb::system_error>(ec);
             }
 
-            if (deletePath_)
+            if (deletePath)
             {
-                boost::filesystem::remove_all(name_, ec);
+                boost::filesystem::remove_all(name, ec);
                 if (ec)
                 {
-                    JLOG(j_.fatal())
-                        << "Filesystem remove_all of " << name_ << " failed with: " << ec.message();
+                    JLOG(j.fatal())
+                        << "Filesystem remove_all of " << name << " failed with: " << ec.message();
                 }
             }
         }
@@ -207,26 +207,26 @@ public:
     Status
     fetch(uint256 const& hash, std::shared_ptr<NodeObject>* pno) override
     {
-        Status status = Status::ok;
+        Status status = Status::Ok;
         pno->reset();
         nudb::error_code ec;
-        db_.fetch(
+        db.fetch(
             hash.data(),
             [&hash, pno, &status](void const* data, std::size_t size) {
                 nudb::detail::buffer bf;
-                auto const result = nodeobject_decompress(data, size, bf);
+                auto const result = nodeobjectDecompress(data, size, bf);
                 DecodedBlob decoded(hash.data(), result.first, result.second);
                 if (!decoded.wasOk())
                 {
-                    status = Status::dataCorrupt;
+                    status = Status::DataCorrupt;
                     return;
                 }
                 *pno = decoded.createObject();
-                status = Status::ok;
+                status = Status::Ok;
             },
             ec);
         if (ec == nudb::error::key_not_found)
-            return Status::notFound;
+            return Status::NotFound;
         if (ec)
             Throw<nudb::system_error>(ec);
         return status;
@@ -241,7 +241,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != Status::ok)
+            if (status != Status::Ok)
             {
                 results.push_back({});
             }
@@ -251,17 +251,17 @@ public:
             }
         }
 
-        return {results, Status::ok};
+        return {results, Status::Ok};
     }
 
     void
-    do_insert(std::shared_ptr<NodeObject> const& no)
+    doInsert(std::shared_ptr<NodeObject> const& no)
     {
         EncodedBlob const e(no);
         nudb::error_code ec;
         nudb::detail::buffer bf;
-        auto const result = nodeobject_compress(e.getData(), e.getSize(), bf);
-        db_.insert(e.getKey(), result.first, result.second, ec);
+        auto const result = nodeobjectCompress(e.getData(), e.getSize(), bf);
+        db.insert(e.getKey(), result.first, result.second, ec);
         if (ec && ec != nudb::error::key_exists)
             Throw<nudb::system_error>(ec);
     }
@@ -272,10 +272,10 @@ public:
         BatchWriteReport report{};
         report.writeCount = 1;
         auto const start = std::chrono::steady_clock::now();
-        do_insert(no);
+        doInsert(no);
         report.elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
             std::chrono::steady_clock::now() - start);
-        scheduler_.onBatchWrite(report);
+        scheduler.onBatchWrite(report);
     }
 
     void
@@ -285,10 +285,10 @@ public:
         report.writeCount = batch.size();
         auto const start = std::chrono::steady_clock::now();
         for (auto const& e : batch)
-            do_insert(e);
+            doInsert(e);
         report.elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
             std::chrono::steady_clock::now() - start);
-        scheduler_.onBatchWrite(report);
+        scheduler.onBatchWrite(report);
     }
 
     void
@@ -297,25 +297,25 @@ public:
     }
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override
     {
-        auto const dp = db_.dat_path();
-        auto const kp = db_.key_path();
-        auto const lp = db_.log_path();
+        auto const dp = db.dat_path();
+        auto const kp = db.key_path();
+        auto const lp = db.log_path();
         // auto const appnum = db_.appnum();
         nudb::error_code ec;
-        db_.close(ec);
+        db.close(ec);
         if (ec)
             Throw<nudb::system_error>(ec);
         nudb::visit(
             dp,
             [&](void const* key,
-                std::size_t key_bytes,
+                std::size_t keyBytes,
                 void const* data,
                 std::size_t size,
                 nudb::error_code&) {
                 nudb::detail::buffer bf;
-                auto const result = nodeobject_decompress(data, size, bf);
+                auto const result = nodeobjectDecompress(data, size, bf);
                 DecodedBlob decoded(key, result.first, result.second);
                 if (!decoded.wasOk())
                 {
@@ -328,7 +328,7 @@ public:
             ec);
         if (ec)
             Throw<nudb::system_error>(ec);
-        db_.open(dp, kp, lp, ec);
+        db.open(dp, kp, lp, ec);
         if (ec)
             Throw<nudb::system_error>(ec);
     }
@@ -342,24 +342,24 @@ public:
     void
     setDeletePath() override
     {
-        deletePath_ = true;
+        deletePath = true;
     }
 
     void
     verify() override
     {
-        auto const dp = db_.dat_path();
-        auto const kp = db_.key_path();
-        auto const lp = db_.log_path();
+        auto const dp = db.dat_path();
+        auto const kp = db.key_path();
+        auto const lp = db.log_path();
         nudb::error_code ec;
-        db_.close(ec);
+        db.close(ec);
         if (ec)
             Throw<nudb::system_error>(ec);
         nudb::verify_info vi;
         nudb::verify<nudb::xxhasher>(vi, dp, kp, 0, nudb::no_progress{}, ec);
         if (ec)
             Throw<nudb::system_error>(ec);
-        db_.open(dp, kp, lp, ec);
+        db.open(dp, kp, lp, ec);
         if (ec)
             Throw<nudb::system_error>(ec);
     }
@@ -382,7 +382,7 @@ private:
         std::size_t const blockSize = defaultSize;
         std::string blockSizeStr;
 
-        if (!get_if_exists(keyValues, "nudb_block_size", blockSizeStr))
+        if (!getIfExists(keyValues, "nudb_block_size", blockSizeStr))
         {
             return blockSize;  // Early return with default
         }
@@ -460,7 +460,7 @@ public:
 void
 registerNuDBFactory(Manager& manager)
 {
-    static NuDBFactory const instance{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 917ee3d8d0..38f35e91ff 100644
--- a/src/libxrpl/nodestore/backend/NullFactory.cpp
+++ b/src/libxrpl/nodestore/backend/NullFactory.cpp
@@ -49,7 +49,7 @@ public:
     Status
     fetch(uint256 const&, std::shared_ptr<NodeObject>*) override
     {
-        return Status::notFound;
+        return Status::NotFound;
     }
 
     std::pair<std::vector<std::shared_ptr<NodeObject>>, Status>
@@ -74,7 +74,7 @@ public:
     }
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override
     {
     }
 
@@ -128,7 +128,7 @@ public:
 void
 registerNullFactory(Manager& manager)
 {
-    static NullFactory const instance{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 be2506ec6f..7f5ac6b14e 100644
--- a/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
+++ b/src/libxrpl/nodestore/backend/RocksDBFactory.cpp
@@ -57,7 +57,7 @@ public:
 
     struct ThreadParams
     {
-        ThreadParams(void (*f_)(void*), void* a_) : f(f_), a(a_)
+        ThreadParams(void (*f)(void*), void* a) : f(f), a(a)
         {
         }
 
@@ -66,7 +66,7 @@ public:
     };
 
     static void
-    thread_entry(void* ptr)
+    threadEntry(void* ptr)
     {
         ThreadParams const* const p(reinterpret_cast<ThreadParams*>(ptr));
         auto const f = p->f;
@@ -74,8 +74,8 @@ public:
         void* a(p->a);
         delete p;
 
-        static std::atomic<std::size_t> n;
-        std::size_t const id(++n);
+        static std::atomic<std::size_t> kN;
+        std::size_t const id(++kN);
         beast::setCurrentThreadName("rocksdb #" + std::to_string(id));
 
         f(a);
@@ -85,7 +85,7 @@ public:
     StartThread(void (*f)(void*), void* a) override
     {
         ThreadParams* const p(new ThreadParams(f, a));
-        EnvWrapper::StartThread(&RocksDBEnv::thread_entry, p);
+        EnvWrapper::StartThread(&RocksDBEnv::threadEntry, p);
     }
 };
 
@@ -94,16 +94,16 @@ public:
 class RocksDBBackend : public Backend, public BatchWriter::Callback
 {
 private:
-    std::atomic<bool> m_deletePath;
+    std::atomic<bool> deletePath_;
 
 public:
-    beast::Journal m_journal;
-    size_t const m_keyBytes;
-    BatchWriter m_batch;
-    std::string m_name;
-    std::unique_ptr<rocksdb::DB> m_db;
-    int fdRequired_ = 2048;
-    rocksdb::Options m_options;
+    beast::Journal journal;
+    size_t const keyBytes;
+    BatchWriter batch;
+    std::string name;
+    std::unique_ptr<rocksdb::DB> db;
+    int fdMinRequired = 2048;
+    rocksdb::Options options;
 
     RocksDBBackend(
         int keyBytes,
@@ -111,90 +111,89 @@ public:
         Scheduler& scheduler,
         beast::Journal journal,
         RocksDBEnv* env)
-        : m_deletePath(false), m_journal(journal), m_keyBytes(keyBytes), m_batch(*this, scheduler)
+        : deletePath_(false), journal(journal), keyBytes(keyBytes), batch(*this, scheduler)
     {
-        if (!get_if_exists(keyValues, "path", m_name))
+        if (!getIfExists(keyValues, "path", name))
             Throw<std::runtime_error>("Missing path in RocksDBFactory backend");
 
-        rocksdb::BlockBasedTableOptions table_options;
-        m_options.env = env;
+        rocksdb::BlockBasedTableOptions tableOptions;
+        options.env = env;
 
-        bool const hard_set = keyValues.exists("hard_set") && get<bool>(keyValues, "hard_set");
+        bool const hardSet = keyValues.exists("hard_set") && get<bool>(keyValues, "hard_set");
 
         if (keyValues.exists("cache_mb"))
         {
             auto size = get<int>(keyValues, "cache_mb");
 
-            if (!hard_set && size == 256)
+            if (!hardSet && size == 256)
                 size = 1024;
 
-            table_options.block_cache = rocksdb::NewLRUCache(megabytes(size));
+            tableOptions.block_cache = rocksdb::NewLRUCache(megabytes(size));
         }
 
         if (auto const v = get<int>(keyValues, "filter_bits"))
         {
-            bool const filter_blocks =
+            bool const filterBlocks =
                 !keyValues.exists("filter_full") || (get<int>(keyValues, "filter_full") == 0);
-            table_options.filter_policy.reset(rocksdb::NewBloomFilterPolicy(v, filter_blocks));
+            tableOptions.filter_policy.reset(rocksdb::NewBloomFilterPolicy(v, filterBlocks));
         }
 
-        if (get_if_exists(keyValues, "open_files", m_options.max_open_files))
+        if (getIfExists(keyValues, "open_files", options.max_open_files))
         {
-            if (!hard_set && m_options.max_open_files == 2000)
-                m_options.max_open_files = 8000;
+            if (!hardSet && options.max_open_files == 2000)
+                options.max_open_files = 8000;
 
-            fdRequired_ = m_options.max_open_files + 128;
+            fdMinRequired = options.max_open_files + 128;
         }
 
         if (keyValues.exists("file_size_mb"))
         {
-            auto file_size_mb = get<int>(keyValues, "file_size_mb");
+            auto fileSizeMb = get<int>(keyValues, "file_size_mb");
 
-            if (!hard_set && file_size_mb == 8)
-                file_size_mb = 256;
+            if (!hardSet && fileSizeMb == 8)
+                fileSizeMb = 256;
 
-            m_options.target_file_size_base = megabytes(file_size_mb);
-            m_options.max_bytes_for_level_base = 5 * m_options.target_file_size_base;
-            m_options.write_buffer_size = 2 * m_options.target_file_size_base;
+            options.target_file_size_base = megabytes(fileSizeMb);
+            options.max_bytes_for_level_base = 5 * options.target_file_size_base;
+            options.write_buffer_size = 2 * options.target_file_size_base;
         }
 
-        get_if_exists(keyValues, "file_size_mult", m_options.target_file_size_multiplier);
+        getIfExists(keyValues, "file_size_mult", options.target_file_size_multiplier);
 
         if (keyValues.exists("bg_threads"))
         {
-            m_options.env->SetBackgroundThreads(
-                get<int>(keyValues, "bg_threads"), rocksdb::Env::LOW);
+            options.env->SetBackgroundThreads(get<int>(keyValues, "bg_threads"), rocksdb::Env::LOW);
         }
 
         if (keyValues.exists("high_threads"))
         {
             auto const highThreads = get<int>(keyValues, "high_threads");
-            m_options.env->SetBackgroundThreads(highThreads, rocksdb::Env::HIGH);
+            options.env->SetBackgroundThreads(highThreads, rocksdb::Env::HIGH);
 
             // If we have high-priority threads, presumably we want to
             // use them for background flushes
             if (highThreads > 0)
-                m_options.max_background_flushes = highThreads;
+                options.max_background_flushes = highThreads;
         }
 
-        m_options.compression = rocksdb::kSnappyCompression;
+        options.compression = rocksdb::kSnappyCompression;
 
-        get_if_exists(keyValues, "block_size", table_options.block_size);
+        getIfExists(keyValues, "block_size", tableOptions.block_size);
 
         if (keyValues.exists("universal_compaction") &&
             (get<int>(keyValues, "universal_compaction") != 0))
         {
-            m_options.compaction_style = rocksdb::kCompactionStyleUniversal;
-            m_options.min_write_buffer_number_to_merge = 2;
-            m_options.max_write_buffer_number = 6;
-            m_options.write_buffer_size = 6 * m_options.target_file_size_base;
+            options.compaction_style = rocksdb::kCompactionStyleUniversal;
+            options.min_write_buffer_number_to_merge = 2;
+            options.max_write_buffer_number = 6;
+            options.write_buffer_size = 6 * options.target_file_size_base;
         }
 
         if (keyValues.exists("bbt_options"))
         {
-            rocksdb::ConfigOptions const config_options;
+            rocksdb::ConfigOptions const configOptions;
             auto const s = rocksdb::GetBlockBasedTableOptionsFromString(
-                config_options, table_options, get(keyValues, "bbt_options"), &table_options);
+                configOptions, tableOptions, get(keyValues, "bbt_options"), &tableOptions);
             if (!s.ok())
             {
                 Throw<std::runtime_error>(
@@ -202,12 +201,12 @@ public:
             }
         }
 
-        m_options.table_factory.reset(NewBlockBasedTableFactory(table_options));
+        options.table_factory.reset(NewBlockBasedTableFactory(tableOptions));
 
         if (keyValues.exists("options"))
         {
             auto const s =
-                rocksdb::GetOptionsFromString(m_options, get(keyValues, "options"), &m_options);
+                rocksdb::GetOptionsFromString(options, get(keyValues, "options"), &options);
             if (!s.ok())
             {
                 Throw<std::runtime_error>(
@@ -216,10 +215,10 @@ public:
         }
 
         std::string s1, s2;
-        rocksdb::GetStringFromDBOptions(&s1, m_options, "; ");
-        rocksdb::GetStringFromColumnFamilyOptions(&s2, m_options, "; ");
-        JLOG(m_journal.debug()) << "RocksDB DBOptions: " << s1;
-        JLOG(m_journal.debug()) << "RocksDB CFOptions: " << s2;
+        rocksdb::GetStringFromDBOptions(&s1, options, "; ");
+        rocksdb::GetStringFromColumnFamilyOptions(&s2, options, "; ");
+        JLOG(journal.debug()) << "RocksDB DBOptions: " << s1;
+        JLOG(journal.debug()) << "RocksDB CFOptions: " << s2;
     }
 
     ~RocksDBBackend() override
@@ -230,42 +229,42 @@ public:
     void
     open(bool createIfMissing) override
     {
-        if (m_db)
+        if (db)
         {
             // LCOV_EXCL_START
             UNREACHABLE(
                 "xrpl::NodeStore::RocksDBBackend::open : database is already "
                 "open");
-            JLOG(m_journal.error()) << "database is already open";
+            JLOG(journal.error()) << "database is already open";
             return;
             // LCOV_EXCL_STOP
         }
-        rocksdb::DB* db = nullptr;
-        m_options.create_if_missing = createIfMissing;
-        rocksdb::Status const status = rocksdb::DB::Open(m_options, m_name, &db);
-        if (!status.ok() || (db == nullptr))
+        rocksdb::DB* localDb = nullptr;
+        options.create_if_missing = createIfMissing;
+        rocksdb::Status const status = rocksdb::DB::Open(options, name, &localDb);
+        if (!status.ok() || (localDb == nullptr))
         {
             Throw<std::runtime_error>(
                 std::string("Unable to open/create RocksDB: ") + status.ToString());
         }
-        m_db.reset(db);
+        db.reset(localDb);
     }
 
     bool
     isOpen() override
     {
-        return static_cast<bool>(m_db);
+        return static_cast<bool>(db);
     }
 
     void
     close() override
     {
-        if (m_db)
+        if (db)
         {
-            m_db.reset();
-            if (m_deletePath)
+            db.reset();
+            if (deletePath_)
             {
-                boost::filesystem::path const dir = m_name;
+                boost::filesystem::path const dir = name;
                 boost::filesystem::remove_all(dir);
             }
         }
@@ -274,7 +273,7 @@ public:
     std::string
     getName() override
     {
-        return m_name;
+        return name;
     }
 
     //--------------------------------------------------------------------------
@@ -282,17 +281,17 @@ public:
     Status
     fetch(uint256 const& hash, std::shared_ptr<NodeObject>* pObject) override
     {
-        XRPL_ASSERT(m_db, "xrpl::NodeStore::RocksDBBackend::fetch : non-null database");
+        XRPL_ASSERT(db, "xrpl::NodeStore::RocksDBBackend::fetch : non-null database");
         pObject->reset();
 
-        Status status(Status::ok);
+        Status status = Status::Ok;
 
         rocksdb::ReadOptions const options;
-        rocksdb::Slice const slice(std::bit_cast<char const*>(hash.data()), m_keyBytes);
+        rocksdb::Slice const slice(std::bit_cast<char const*>(hash.data()), keyBytes);
 
         std::string string;
 
-        rocksdb::Status const getStatus = m_db->Get(options, slice, &string);
+        rocksdb::Status const getStatus = db->Get(options, slice, &string);
 
         if (getStatus.ok())
         {
@@ -306,25 +305,25 @@ public:
             {
                 // Decoding failed, probably corrupted!
                 //
-                status = Status::dataCorrupt;
+                status = Status::DataCorrupt;
             }
         }
         else
         {
             if (getStatus.IsCorruption())
             {
-                status = Status::dataCorrupt;
+                status = Status::DataCorrupt;
             }
             else if (getStatus.IsNotFound())
             {
-                status = Status::notFound;
+                status = Status::NotFound;
             }
             else
             {
                 status = static_cast<Status>(
-                    static_cast<int>(Status::customCode) + unsafe_cast<int>(getStatus.code()));
+                    static_cast<int>(Status::CustomCode) + unsafeCast<int>(getStatus.code()));
 
-                JLOG(m_journal.error()) << getStatus.ToString();
+                JLOG(journal.error()) << getStatus.ToString();
             }
         }
 
@@ -340,7 +339,7 @@ public:
         {
             std::shared_ptr<NodeObject> nObj;
             Status const status = fetch(h, &nObj);
-            if (status != Status::ok)
+            if (status != Status::Ok)
             {
                 results.push_back({});
             }
@@ -350,20 +349,20 @@ public:
             }
         }
 
-        return {results, Status::ok};
+        return {results, Status::Ok};
     }
 
     void
     store(std::shared_ptr<NodeObject> const& object) override
     {
-        m_batch.store(object);
+        batch.store(object);
     }
 
     void
     storeBatch(Batch const& batch) override
     {
         XRPL_ASSERT(
-            m_db,
+            db,
             "xrpl::NodeStore::RocksDBBackend::storeBatch : non-null "
             "database");
         rocksdb::WriteBatch wb;
@@ -373,13 +372,13 @@ public:
             EncodedBlob const encoded(e);
 
             wb.Put(
-                rocksdb::Slice(std::bit_cast<char const*>(encoded.getKey()), m_keyBytes),
+                rocksdb::Slice(std::bit_cast<char const*>(encoded.getKey()), keyBytes),
                 rocksdb::Slice(std::bit_cast<char const*>(encoded.getData()), encoded.getSize()));
         }
 
         rocksdb::WriteOptions const options;
 
-        auto ret = m_db->Write(options, &wb);
+        auto ret = db->Write(options, &wb);
 
         if (!ret.ok())
             Throw<std::runtime_error>("storeBatch failed: " + ret.ToString());
@@ -391,16 +390,16 @@ public:
     }
 
     void
-    for_each(std::function<void(std::shared_ptr<NodeObject>)> f) override
+    forEach(std::function<void(std::shared_ptr<NodeObject>)> f) override
     {
-        XRPL_ASSERT(m_db, "xrpl::NodeStore::RocksDBBackend::for_each : non-null database");
+        XRPL_ASSERT(db, "xrpl::NodeStore::RocksDBBackend::forEach : non-null database");
         rocksdb::ReadOptions const options;
 
-        std::unique_ptr<rocksdb::Iterator> it(m_db->NewIterator(options));
+        std::unique_ptr<rocksdb::Iterator> it(db->NewIterator(options));
 
         for (it->SeekToFirst(); it->Valid(); it->Next())
         {
-            if (it->key().size() == m_keyBytes)
+            if (it->key().size() == keyBytes)
             {
                 DecodedBlob decoded(it->key().data(), it->value().data(), it->value().size());
 
@@ -411,14 +410,14 @@ public:
                 else
                 {
                     // Uh oh, corrupted data!
-                    JLOG(m_journal.fatal()) << "Corrupt NodeObject #" << it->key().ToString(true);
+                    JLOG(journal.fatal()) << "Corrupt NodeObject #" << it->key().ToString(true);
                 }
             }
             else
             {
                 // VFALCO NOTE What does it mean to find an
                 //             incorrectly sized key? Corruption?
-                JLOG(m_journal.fatal()) << "Bad key size = " << it->key().size();
+                JLOG(journal.fatal()) << "Bad key size = " << it->key().size();
             }
         }
     }
@@ -426,13 +425,13 @@ public:
     int
     getWriteLoad() override
     {
-        return m_batch.getWriteLoad();
+        return batch.getWriteLoad();
     }
 
     void
     setDeletePath() override
     {
-        m_deletePath = true;
+        deletePath_ = true;
     }
 
     //--------------------------------------------------------------------------
@@ -447,7 +446,7 @@ public:
     [[nodiscard]] int
     fdRequired() const override
     {
-        return fdRequired_;
+        return fdMinRequired;
     }
 };
 
@@ -459,7 +458,7 @@ private:
     Manager& manager_;
 
 public:
-    RocksDBEnv m_env;
+    RocksDBEnv env;
 
     RocksDBFactory(Manager& manager) : manager_(manager)
     {
@@ -480,14 +479,14 @@ public:
         Scheduler& scheduler,
         beast::Journal journal) override
     {
-        return std::make_unique<RocksDBBackend>(keyBytes, keyValues, scheduler, journal, &m_env);
+        return std::make_unique<RocksDBBackend>(keyBytes, keyValues, scheduler, journal, &env);
     }
 };
 
 void
 registerRocksDBFactory(Manager& manager)
 {
-    static RocksDBFactory const instance{manager};
+    static RocksDBFactory const kINSTANCE{manager};
 }
 
 }  // namespace xrpl::NodeStore
diff --git a/src/libxrpl/protocol/AMMCore.cpp b/src/libxrpl/protocol/AMMCore.cpp
index 41303e6a22..b4c44f0f36 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 AMMCurrencyCode = 0x03;
+    std::int32_t constexpr kAMM_CURRENCY_CODE = 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() = AMMCurrencyCode;
+    *currency.begin() = kAMM_CURRENCY_CODE;
     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::zero)
+            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::zero || (!validZero && amount == beast::zero))
+    if (amount < beast::kZERO || (!validZero && amount == beast::kZERO))
         return temBAD_AMOUNT;
     return tesSUCCESS;
 }
@@ -113,13 +113,13 @@ ammAuctionTimeSlot(std::uint64_t current, STObject const& auctionSlot)
     // but check just to be safe
     auto const expiration = auctionSlot[sfExpiration];
     XRPL_ASSERT(
-        expiration >= TOTAL_TIME_SLOT_SECS, "xrpl::ammAuctionTimeSlot : minimum expiration");
-    if (expiration >= TOTAL_TIME_SLOT_SECS)
+        expiration >= kTOTAL_TIME_SLOT_SECS, "xrpl::ammAuctionTimeSlot : minimum expiration");
+    if (expiration >= kTOTAL_TIME_SLOT_SECS)
     {
-        if (auto const start = expiration - TOTAL_TIME_SLOT_SECS; current >= start)
+        if (auto const start = expiration - kTOTAL_TIME_SLOT_SECS; current >= start)
         {
-            if (auto const diff = current - start; diff < TOTAL_TIME_SLOT_SECS)
-                return diff / AUCTION_SLOT_INTERVAL_DURATION;
+            if (auto const diff = current - start; diff < kTOTAL_TIME_SLOT_SECS)
+                return diff / kAUCTION_SLOT_INTERVAL_DURATION;
         }
     }
     return std::nullopt;
diff --git a/src/libxrpl/protocol/AccountID.cpp b/src/libxrpl/protocol/AccountID.cpp
index ffebde2c1a..6639835b41 100644
--- a/src/libxrpl/protocol/AccountID.cpp
+++ b/src/libxrpl/protocol/AccountID.cpp
@@ -35,7 +35,7 @@ private:
     std::vector<CachedAccountID> cache_;
 
     // We use a hash function designed to resist algorithmic complexity attacks
-    hardened_hash<> hasher_;
+    HardenedHash<> hasher_;
 
     // 64 spinlocks, packed into a single 64-bit value
     std::atomic<std::uint64_t> locks_ = 0;
@@ -53,7 +53,7 @@ public:
     {
         auto const index = hasher_(id) % cache_.size();
 
-        packed_spinlock sl(locks_, index % 64);
+        PackedSpinlock sl(locks_, index % 64);
 
         {
             std::scoped_lock const lock(sl);
@@ -80,20 +80,20 @@ public:
 
 }  // namespace detail
 
-static std::unique_ptr<detail::AccountIdCache> accountIdCache;
+static std::unique_ptr<detail::AccountIdCache> gAccountIdCache;
 
 void
 initAccountIdCache(std::size_t count)
 {
-    if (!accountIdCache && count != 0)
-        accountIdCache = std::make_unique<detail::AccountIdCache>(count);
+    if (!gAccountIdCache && count != 0)
+        gAccountIdCache = std::make_unique<detail::AccountIdCache>(count);
 }
 
 std::string
 toBase58(AccountID const& v)
 {
-    if (accountIdCache)
-        return accountIdCache->toBase58(v);
+    if (gAccountIdCache)
+        return gAccountIdCache->toBase58(v);
 
     return encodeBase58Token(TokenType::AccountID, v.data(), v.size());
 }
@@ -103,7 +103,7 @@ std::optional<AccountID>
 parseBase58(std::string const& s)
 {
     auto const result = decodeBase58Token(s, TokenType::AccountID);
-    if (result.size() != AccountID::bytes)
+    if (result.size() != AccountID::kBYTES)
         return std::nullopt;
     return AccountID{result};
 }
@@ -146,29 +146,29 @@ parseBase58(std::string const& s)
 AccountID
 calcAccountID(PublicKey const& pk)
 {
-    static_assert(AccountID::bytes == sizeof(ripesha_hasher::result_type));
+    static_assert(AccountID::kBYTES == sizeof(RipeshaHasher::result_type));
 
-    ripesha_hasher rsh;
+    RipeshaHasher rsh;
     rsh(pk.data(), pk.size());
-    return AccountID{static_cast<ripesha_hasher::result_type>(rsh)};
+    return AccountID{static_cast<RipeshaHasher::result_type>(rsh)};
 }
 
 AccountID const&
 xrpAccount()
 {
-    static AccountID const account(beast::zero);
-    return account;
+    static AccountID const kACCOUNT(beast::kZERO);
+    return kACCOUNT;
 }
 
 AccountID const&
 noAccount()
 {
-    static AccountID const account(1);
-    return account;
+    static AccountID const kACCOUNT(1);
+    return kACCOUNT;
 }
 
 bool
-to_issuer(AccountID& issuer, std::string const& s)
+toIssuer(AccountID& issuer, std::string const& s)
 {
     if (issuer.parseHex(s))
         return true;
diff --git a/src/libxrpl/protocol/Asset.cpp b/src/libxrpl/protocol/Asset.cpp
index 3d163c5c6a..57843ea6bf 100644
--- a/src/libxrpl/protocol/Asset.cpp
+++ b/src/libxrpl/protocol/Asset.cpp
@@ -30,7 +30,7 @@ Asset::getText() const
 }
 
 void
-Asset::setJson(Json::Value& jv) const
+Asset::setJson(json::Value& jv) const
 {
     std::visit([&](auto&& issue) { issue.setJson(jv); }, issue_);
 }
@@ -48,7 +48,7 @@ to_string(Asset const& asset)
 }
 
 bool
-validJSONAsset(Json::Value const& jv)
+validJSONAsset(json::Value const& jv)
 {
     if (jv.isMember(jss::mpt_issuance_id))
         return !(jv.isMember(jss::currency) || jv.isMember(jss::issuer));
@@ -56,7 +56,7 @@ validJSONAsset(Json::Value const& jv)
 }
 
 Asset
-assetFromJson(Json::Value const& v)
+assetFromJson(json::Value const& v)
 {
     if (!v.isMember(jss::currency) && !v.isMember(jss::mpt_issuance_id))
         Throw<std::runtime_error>("assetFromJson must contain currency or mpt_issuance_id");
diff --git a/src/libxrpl/protocol/BuildInfo.cpp b/src/libxrpl/protocol/BuildInfo.cpp
index c732e95a87..7ea934fe3a 100644
--- a/src/libxrpl/protocol/BuildInfo.cpp
+++ b/src/libxrpl/protocol/BuildInfo.cpp
@@ -22,6 +22,7 @@ namespace {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
+// NOLINTNEXTLINE(readability-identifier-naming)
 char const* const versionString = "3.2.0-b0"
     // clang-format on
     ;
@@ -66,31 +67,31 @@ buildVersionString()
 std::string const&
 getVersionString()
 {
-    static std::string const value = [] {
+    static std::string const kVALUE = [] {
         std::string const s = buildVersionString();
 
         beast::SemanticVersion v;
         if (!v.parse(s) || v.print() != s)
-            LogicError(s + ": Bad server version string");
+            logicError(s + ": Bad server version string");
         return s;
     }();
-    return value;
+    return kVALUE;
 }
 
 std::string const&
 getFullVersionString()
 {
-    static std::string const value = systemName() + "-" + getVersionString();
-    return value;
+    static std::string const kVALUE = systemName() + "-" + getVersionString();
+    return kVALUE;
 }
 
-static constexpr std::uint64_t implementationVersionIdentifier = 0x183B'0000'0000'0000LLU;
-static constexpr std::uint64_t implementationVersionIdentifierMask = 0xFFFF'0000'0000'0000LLU;
+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;
 
 std::uint64_t
 encodeSoftwareVersion(std::string_view versionStr)
 {
-    std::uint64_t c = implementationVersionIdentifier;
+    std::uint64_t c = kIMPLEMENTATION_VERSION_IDENTIFIER;
 
     beast::SemanticVersion v;
 
@@ -154,14 +155,15 @@ encodeSoftwareVersion(std::string_view versionStr)
 std::uint64_t
 getEncodedVersion()
 {
-    static std::uint64_t const cookie = {encodeSoftwareVersion(getVersionString())};
-    return cookie;
+    static std::uint64_t const kCOOKIE = {encodeSoftwareVersion(getVersionString())};
+    return kCOOKIE;
 }
 
 bool
 isXrpldVersion(std::uint64_t version)
 {
-    return (version & implementationVersionIdentifierMask) == implementationVersionIdentifier;
+    return (version & kIMPLEMENTATION_VERSION_IDENTIFIER_MASK) ==
+        kIMPLEMENTATION_VERSION_IDENTIFIER;
 }
 
 bool
diff --git a/src/libxrpl/protocol/ErrorCodes.cpp b/src/libxrpl/protocol/ErrorCodes.cpp
index 4e928deb75..a51bb9b56d 100644
--- a/src/libxrpl/protocol/ErrorCodes.cpp
+++ b/src/libxrpl/protocol/ErrorCodes.cpp
@@ -30,78 +30,78 @@ namespace detail {
 // status code.
 
 // clang-format off
-constexpr static ErrorInfo unorderedErrorInfos[]{
-    {rpcACT_MALFORMED,          "actMalformed",         "Account malformed."},
-    {rpcACT_NOT_FOUND,          "actNotFound",          "Account not found."},
-    {rpcALREADY_MULTISIG,       "alreadyMultisig",      "Already multisigned."},
-    {rpcALREADY_SINGLE_SIG,     "alreadySingleSig",     "Already single-signed."},
-    {rpcAMENDMENT_BLOCKED,      "amendmentBlocked",     "Amendment blocked, need upgrade.", 503},
-    {rpcEXPIRED_VALIDATOR_LIST, "unlBlocked",           "Validator list expired.", 503},
-    {rpcATX_DEPRECATED,         "deprecated",           "Use the new API or specify a ledger range.", 400},
-    {rpcBAD_KEY_TYPE,           "badKeyType",           "Bad key type.", 400},
-    {rpcBAD_FEATURE,            "badFeature",           "Feature unknown or invalid.", 500},
-    {rpcBAD_ISSUER,             "badIssuer",            "Issuer account malformed.", 400},
-    {rpcBAD_MARKET,             "badMarket",            "No such market.", 404},
-    {rpcBAD_SECRET,             "badSecret",            "Secret does not match account.", 403},
-    {rpcBAD_SEED,               "badSeed",              "Disallowed seed.", 403},
-    {rpcBAD_SYNTAX,             "badSyntax",            "Syntax error.", 400},
-    {rpcCHANNEL_MALFORMED,      "channelMalformed",     "Payment channel is malformed.", 400},
-    {rpcCHANNEL_AMT_MALFORMED,  "channelAmtMalformed",  "Payment channel amount is malformed.", 400},
-    {rpcCOMMAND_MISSING,        "commandMissing",       "Missing command entry.", 400},
-    {rpcDB_DESERIALIZATION,     "dbDeserialization",    "Database deserialization error.", 502},
-    {rpcDST_ACT_MALFORMED,      "dstActMalformed",      "Destination account is malformed.", 400},
-    {rpcDST_ACT_MISSING,        "dstActMissing",        "Destination account not provided.", 400},
-    {rpcDST_ACT_NOT_FOUND,      "dstActNotFound",       "Destination account not found.", 404},
-    {rpcDST_AMT_MALFORMED,      "dstAmtMalformed",      "Destination amount/currency/issuer is malformed.", 400},
-    {rpcDST_AMT_MISSING,        "dstAmtMissing",        "Destination amount/currency/issuer is missing.", 400},
-    {rpcDST_ISR_MALFORMED,      "dstIsrMalformed",      "Destination issuer is malformed.", 400},
-    {rpcEXCESSIVE_LGR_RANGE,    "excessiveLgrRange",    "Ledger range exceeds 1000.", 400},
-    {rpcFORBIDDEN,              "forbidden",            "Bad credentials.", 403},
-    {rpcHIGH_FEE,               "highFee",              "Current transaction fee exceeds your limit.", 402},
-    {rpcINTERNAL,               "internal",             "Internal error.", 500},
-    {rpcINVALID_LGR_RANGE,      "invalidLgrRange",      "Ledger range is invalid.", 400},
-    {rpcINVALID_PARAMS,         "invalidParams",        "Invalid parameters.", 400},
-    {rpcINVALID_HOTWALLET,      "invalidHotWallet",     "Invalid hotwallet.", 400},
-    {rpcISSUE_MALFORMED,        "issueMalformed",       "Issue is malformed.", 400},
-    {rpcJSON_RPC,               "json_rpc",             "JSON-RPC transport error.", 500},
-    {rpcLGR_IDXS_INVALID,       "lgrIdxsInvalid",       "Ledger indexes invalid.", 400},
-    {rpcLGR_IDX_MALFORMED,      "lgrIdxMalformed",      "Ledger index malformed.", 400},
-    {rpcLGR_NOT_FOUND,          "lgrNotFound",          "Ledger not found.", 404},
-    {rpcLGR_NOT_VALIDATED,      "lgrNotValidated",      "Ledger not validated.", 202},
-    {rpcMASTER_DISABLED,        "masterDisabled",       "Master key is disabled.", 403},
-    {rpcNOT_ENABLED,            "notEnabled",           "Not enabled in configuration.", 501},
-    {rpcNOT_IMPL,               "notImpl",              "Not implemented.", 501},
-    {rpcNOT_READY,              "notReady",             "Not ready to handle this request.", 503},
-    {rpcNOT_SUPPORTED,          "notSupported",         "Operation not supported.", 501},
-    {rpcNO_CLOSED,              "noClosed",             "Closed ledger is unavailable.", 503},
-    {rpcNO_CURRENT,             "noCurrent",            "Current ledger is unavailable.", 503},
-    {rpcNOT_SYNCED,             "notSynced",            "Not synced to the network.", 503},
-    {rpcNO_EVENTS,              "noEvents",             "Current transport does not support events.", 405},
-    {rpcNO_NETWORK,             "noNetwork",            "Not synced to the network.", 503},
-    {rpcWRONG_NETWORK,          "wrongNetwork",         "Wrong network.", 503},
-    {rpcNO_PERMISSION,          "noPermission",         "You don't have permission for this command.", 401},
-    {rpcNO_PF_REQUEST,          "noPathRequest",        "No pathfinding request in progress.", 404},
-    {rpcOBJECT_NOT_FOUND,       "objectNotFound",       "The requested object was not found.", 404},
-    {rpcPUBLIC_MALFORMED,       "publicMalformed",      "Public key is malformed.", 400},
-    {rpcSENDMAX_MALFORMED,      "sendMaxMalformed",     "SendMax amount malformed.", 400},
-    {rpcSIGNING_MALFORMED,      "signingMalformed",     "Signing of transaction is malformed.", 400},
-    {rpcSLOW_DOWN,              "slowDown",             "You are placing too much load on the server.", 429},
-    {rpcSRC_ACT_MALFORMED,      "srcActMalformed",      "Source account is malformed.", 400},
-    {rpcSRC_ACT_MISSING,        "srcActMissing",        "Source account not provided.", 400},
-    {rpcSRC_ACT_NOT_FOUND,      "srcActNotFound",       "Source account not found.", 404},
-    {rpcDELEGATE_ACT_NOT_FOUND, "delegateActNotFound",  "Delegate account not found.", 404},
-    {rpcSRC_CUR_MALFORMED,      "srcCurMalformed",      "Source currency is malformed.", 400},
-    {rpcSRC_ISR_MALFORMED,      "srcIsrMalformed",      "Source issuer is malformed.", 400},
-    {rpcSTREAM_MALFORMED,       "malformedStream",      "Stream malformed.", 400},
-    {rpcTOO_BUSY,               "tooBusy",              "The server is too busy to help you now.", 503},
-    {rpcTXN_NOT_FOUND,          "txnNotFound",          "Transaction not found.", 404},
-    {rpcUNKNOWN_COMMAND,        "unknownCmd",           "Unknown method.", 405},
-    {rpcORACLE_MALFORMED,       "oracleMalformed",      "Oracle request is malformed.", 400},
-    {rpcBAD_CREDENTIALS,        "badCredentials",       "Credentials do not exist, are not accepted, or have expired.", 400},
-    {rpcTX_SIGNED,              "transactionSigned",    "Transaction should not be signed.", 400},
-    {rpcDOMAIN_MALFORMED,       "domainMalformed",      "Domain is malformed.", 400},
-    {rpcENTRY_NOT_FOUND,        "entryNotFound",        "Entry not found.", 400},
-    {rpcUNEXPECTED_LEDGER_TYPE, "unexpectedLedgerType", "Unexpected ledger type.", 400},
+constexpr static ErrorInfo kUNORDERED_ERROR_INFOS[]{
+    {RpcActMalformed,          "actMalformed",         "Account malformed."},
+    {RpcActNotFound,          "actNotFound",          "Account not found."},
+    {RpcAlreadyMultisig,       "alreadyMultisig",      "Already multisigned."},
+    {RpcAlreadySingleSig,     "alreadySingleSig",     "Already single-signed."},
+    {RpcAmendmentBlocked,      "amendmentBlocked",     "Amendment blocked, need upgrade.", 503},
+    {RpcExpiredValidatorList, "unlBlocked",           "Validator list expired.", 503},
+    {RpcAtxDeprecated,         "deprecated",           "Use the new API or specify a ledger range.", 400},
+    {RpcBadKeyType,           "badKeyType",           "Bad key type.", 400},
+    {RpcBadFeature,            "badFeature",           "Feature unknown or invalid.", 500},
+    {RpcBadIssuer,             "badIssuer",            "Issuer account malformed.", 400},
+    {RpcBadMarket,             "badMarket",            "No such market.", 404},
+    {RpcBadSecret,             "badSecret",            "Secret does not match account.", 403},
+    {RpcBadSeed,               "badSeed",              "Disallowed seed.", 403},
+    {RpcBadSyntax,             "badSyntax",            "Syntax error.", 400},
+    {RpcChannelMalformed,      "channelMalformed",     "Payment channel is malformed.", 400},
+    {RpcChannelAmtMalformed,  "channelAmtMalformed",  "Payment channel amount is malformed.", 400},
+    {RpcCommandMissing,        "commandMissing",       "Missing command entry.", 400},
+    {RpcDbDeserialization,     "dbDeserialization",    "Database deserialization error.", 502},
+    {RpcDstActMalformed,      "dstActMalformed",      "Destination account is malformed.", 400},
+    {RpcDstActMissing,        "dstActMissing",        "Destination account not provided.", 400},
+    {RpcDstActNotFound,      "dstActNotFound",       "Destination account not found.", 404},
+    {RpcDstAmtMalformed,      "dstAmtMalformed",      "Destination amount/currency/issuer is malformed.", 400},
+    {RpcDstAmtMissing,        "dstAmtMissing",        "Destination amount/currency/issuer is missing.", 400},
+    {RpcDstIsrMalformed,      "dstIsrMalformed",      "Destination issuer is malformed.", 400},
+    {RpcExcessiveLgrRange,    "excessiveLgrRange",    "Ledger range exceeds 1000.", 400},
+    {RpcForbidden,              "forbidden",            "Bad credentials.", 403},
+    {RpcHighFee,               "highFee",              "Current transaction fee exceeds your limit.", 402},
+    {RpcInternal,               "internal",             "Internal error.", 500},
+    {RpcInvalidLgrRange,      "invalidLgrRange",      "Ledger range is invalid.", 400},
+    {RpcInvalidParams,         "invalidParams",        "Invalid parameters.", 400},
+    {RpcInvalidHotwallet,      "invalidHotWallet",     "Invalid hotwallet.", 400},
+    {RpcIssueMalformed,        "issueMalformed",       "Issue is malformed.", 400},
+    {RpcJsonRpc,               "json_rpc",             "JSON-RPC transport error.", 500},
+    {RpcLgrIdxsInvalid,       "lgrIdxsInvalid",       "Ledger indexes invalid.", 400},
+    {RpcLgrIdxMalformed,      "lgrIdxMalformed",      "Ledger index malformed.", 400},
+    {RpcLgrNotFound,          "lgrNotFound",          "Ledger not found.", 404},
+    {RpcLgrNotValidated,      "lgrNotValidated",      "Ledger not validated.", 202},
+    {RpcMasterDisabled,        "masterDisabled",       "Master key is disabled.", 403},
+    {RpcNotEnabled,            "notEnabled",           "Not enabled in configuration.", 501},
+    {RpcNotImpl,               "notImpl",              "Not implemented.", 501},
+    {RpcNotReady,              "notReady",             "Not ready to handle this request.", 503},
+    {RpcNotSupported,          "notSupported",         "Operation not supported.", 501},
+    {RpcNoClosed,              "noClosed",             "Closed ledger is unavailable.", 503},
+    {RpcNoCurrent,             "noCurrent",            "Current ledger is unavailable.", 503},
+    {RpcNotSynced,             "notSynced",            "Not synced to the network.", 503},
+    {RpcNoEvents,              "noEvents",             "Current transport does not support events.", 405},
+    {RpcNoNetwork,             "noNetwork",            "Not synced to the network.", 503},
+    {RpcWrongNetwork,          "wrongNetwork",         "Wrong network.", 503},
+    {RpcNoPermission,          "noPermission",         "You don't have permission for this command.", 401},
+    {RpcNoPfRequest,          "noPathRequest",        "No pathfinding request in progress.", 404},
+    {RpcObjectNotFound,       "objectNotFound",       "The requested object was not found.", 404},
+    {RpcPublicMalformed,       "publicMalformed",      "Public key is malformed.", 400},
+    {RpcSendmaxMalformed,      "sendMaxMalformed",     "SendMax amount malformed.", 400},
+    {RpcSigningMalformed,      "signingMalformed",     "Signing of transaction is malformed.", 400},
+    {RpcSlowDown,              "slowDown",             "You are placing too much load on the server.", 429},
+    {RpcSrcActMalformed,      "srcActMalformed",      "Source account is malformed.", 400},
+    {RpcSrcActMissing,        "srcActMissing",        "Source account not provided.", 400},
+    {RpcSrcActNotFound,      "srcActNotFound",       "Source account not found.", 404},
+    {RpcDelegateActNotFound, "delegateActNotFound",  "Delegate account not found.", 404},
+    {RpcSrcCurMalformed,      "srcCurMalformed",      "Source currency is malformed.", 400},
+    {RpcSrcIsrMalformed,      "srcIsrMalformed",      "Source issuer is malformed.", 400},
+    {RpcStreamMalformed,       "malformedStream",      "Stream malformed.", 400},
+    {RpcTooBusy,               "tooBusy",              "The server is too busy to help you now.", 503},
+    {RpcTxnNotFound,          "txnNotFound",          "Transaction not found.", 404},
+    {RpcUnknownCommand,        "unknownCmd",           "Unknown method.", 405},
+    {RpcOracleMalformed,       "oracleMalformed",      "Oracle request is malformed.", 400},
+    {RpcBadCredentials,        "badCredentials",       "Credentials do not exist, are not accepted, or have expired.", 400},
+    {RpcTxSigned,              "transactionSigned",    "Transaction should not be signed.", 400},
+    {RpcDomainMalformed,       "domainMalformed",      "Domain is malformed.", 400},
+    {RpcEntryNotFound,        "entryNotFound",        "Entry not found.", 400},
+    {RpcUnexpectedLedgerType, "unexpectedLedgerType", "Unexpected ledger type.", 400},
 };
 // clang-format on
 
@@ -115,14 +115,14 @@ sortErrorInfos(ErrorInfo const (&unordered)[N]) -> std::array<ErrorInfo, M>
 
     for (ErrorInfo const& info : unordered)
     {
-        if (info.code <= rpcSUCCESS || info.code > rpcLAST)
+        if (info.code <= RpcSuccess || info.code > RpcLast)
             throw(std::out_of_range("Invalid error_code_i"));
 
         // The first valid code follows rpcSUCCESS immediately.
-        static_assert(rpcSUCCESS == 0, "Unexpected error_code_i layout.");
+        static_assert(RpcSuccess == 0, "Unexpected error_code_i layout.");
         int const index{info.code - 1};
 
-        if (ret[index].code != rpcUNKNOWN)
+        if (ret[index].code != RpcUnknown)
             throw(std::invalid_argument("Duplicate error_code_i in list"));
 
         ret[index] = info;
@@ -134,18 +134,18 @@ sortErrorInfos(ErrorInfo const (&unordered)[N]) -> std::array<ErrorInfo, M>
     // It's okay for there to be missing entries; they will contain the code
     // rpcUNKNOWN.  But other than that all entries should match their index.
     int codeCount{0};
-    int expect{rpcBAD_SYNTAX - 1};
+    int expect{RpcBadSyntax - 1};
     for (ErrorInfo const& info : ret)
     {
         ++expect;
-        if (info.code == rpcUNKNOWN)
+        if (info.code == RpcUnknown)
             continue;
 
         if (info.code != expect)
             throw(std::invalid_argument("Empty error_code_i in list"));
         ++codeCount;
     }
-    if (expect != rpcLAST)
+    if (expect != RpcLast)
         throw(std::invalid_argument("Insufficient list entries"));
     if (codeCount != N)
         throw(std::invalid_argument("Bad handling of unorderedErrorInfos"));
@@ -153,74 +153,74 @@ sortErrorInfos(ErrorInfo const (&unordered)[N]) -> std::array<ErrorInfo, M>
     return ret;
 }
 
-constexpr auto sortedErrorInfos{sortErrorInfos<rpcLAST>(unorderedErrorInfos)};
+constexpr auto kSORTED_ERROR_INFOS{sortErrorInfos<RpcLast>(kUNORDERED_ERROR_INFOS)};
 
-constexpr ErrorInfo unknownError;
+constexpr ErrorInfo kUNKNOWN_ERROR;
 
 }  // namespace detail
 
 //------------------------------------------------------------------------------
 
 void
-inject_error(error_code_i code, Json::Value& json)
+injectError(ErrorCodeI code, json::Value& json)
 {
-    ErrorInfo const& info(get_error_info(code));
+    ErrorInfo const& info(getErrorInfo(code));
     json[jss::error] = info.token;
     json[jss::error_code] = info.code;
     json[jss::error_message] = info.message;
 }
 
 void
-inject_error(error_code_i code, std::string const& message, Json::Value& json)
+injectError(ErrorCodeI code, std::string const& message, json::Value& json)
 {
-    ErrorInfo const& info(get_error_info(code));
+    ErrorInfo const& info(getErrorInfo(code));
     json[jss::error] = info.token;
     json[jss::error_code] = info.code;
     json[jss::error_message] = message;
 }
 
 ErrorInfo const&
-get_error_info(error_code_i code)
+getErrorInfo(ErrorCodeI code)
 {
-    if (code <= rpcSUCCESS || code > rpcLAST)
-        return detail::unknownError;
-    return detail::sortedErrorInfos[code - 1];
+    if (code <= RpcSuccess || code > RpcLast)
+        return detail::kUNKNOWN_ERROR;
+    return detail::kSORTED_ERROR_INFOS[code - 1];
 }
 
-Json::Value
-make_error(error_code_i code)
+json::Value
+makeError(ErrorCodeI code)
 {
-    Json::Value json;
-    inject_error(code, json);
+    json::Value json;
+    injectError(code, json);
     return json;
 }
 
-Json::Value
-make_error(error_code_i code, std::string const& message)
+json::Value
+makeError(ErrorCodeI code, std::string const& message)
 {
-    Json::Value json;
-    inject_error(code, message, json);
+    json::Value json;
+    injectError(code, message, json);
     return json;
 }
 
 bool
-contains_error(Json::Value const& json)
+containsError(json::Value const& json)
 {
     return json.isObject() && json.isMember(jss::error);
 }
 
 int
-error_code_http_status(error_code_i code)
+errorCodeHttpStatus(ErrorCodeI code)
 {
-    return get_error_info(code).http_status;
+    return getErrorInfo(code).http_status;
 }
 
 }  // namespace RPC
 
 std::string
-rpcErrorString(Json::Value const& jv)
+rpcErrorString(json::Value const& jv)
 {
-    XRPL_ASSERT(RPC::contains_error(jv), "xrpl::RPC::rpcErrorString : input contains an error");
+    XRPL_ASSERT(RPC::containsError(jv), "xrpl::RPC::rpcErrorString : input contains an error");
     return jv[jss::error].asString() + jv[jss::error_message].asString();
 }
 
diff --git a/src/libxrpl/protocol/Feature.cpp b/src/libxrpl/protocol/Feature.cpp
index 1686d0e52a..3862b52e27 100644
--- a/src/libxrpl/protocol/Feature.cpp
+++ b/src/libxrpl/protocol/Feature.cpp
@@ -23,6 +23,7 @@
 namespace xrpl {
 
 inline std::size_t
+// NOLINTNEXTLINE(readability-identifier-naming)
 hash_value(xrpl::uint256 const& feature)
 {
     std::size_t seed = 0;
@@ -34,7 +35,7 @@ hash_value(xrpl::uint256 const& feature)
 
 namespace {
 
-enum class Supported : bool { no = false, yes };
+enum class Supported : bool { No = false, Yes };
 
 // *NOTE*
 //
@@ -71,45 +72,45 @@ class FeatureCollections
         uint256 feature;
 
         Feature() = delete;
-        explicit Feature(std::string name_, uint256 const& feature_)
-            : name(std::move(name_)), feature(feature_)
+        explicit Feature(std::string name, uint256 const& feature)
+            : name(std::move(name)), feature(feature)
         {
         }
 
         // These structs are used by the `features` multi_index_container to
         // provide access to the features collection by size_t index, string
         // name, and uint256 feature identifier
-        struct byIndex
+        struct ByIndex
         {
         };
-        struct byName
+        struct ByName
         {
         };
-        struct byFeature
+        struct ByFeature
         {
         };
     };
 
     // Intermediate types to help with readability
-    template <class tag, typename Type, Type Feature::* PtrToMember>
+    template <class Tag, typename Type, Type Feature::* PtrToMember>
     using feature_hashed_unique = boost::multi_index::hashed_unique<
-        boost::multi_index::tag<tag>,
+        boost::multi_index::tag<Tag>,
         boost::multi_index::member<Feature, Type, PtrToMember>>;
 
     // Intermediate types to help with readability
     using feature_indexing = boost::multi_index::indexed_by<
-        boost::multi_index::random_access<boost::multi_index::tag<Feature::byIndex>>,
-        feature_hashed_unique<Feature::byFeature, uint256, &Feature::feature>,
-        feature_hashed_unique<Feature::byName, std::string, &Feature::name>>;
+        boost::multi_index::random_access<boost::multi_index::tag<Feature::ByIndex>>,
+        feature_hashed_unique<Feature::ByFeature, uint256, &Feature::feature>,
+        feature_hashed_unique<Feature::ByName, std::string, &Feature::name>>;
 
     // This multi_index_container provides access to the features collection by
     // name, index, and uint256 feature identifier
-    boost::multi_index::multi_index_container<Feature, feature_indexing> features;
-    std::map<std::string, AmendmentSupport> all;
-    std::map<std::string, VoteBehavior> supported;
-    std::size_t upVotes = 0;
-    std::size_t downVotes = 0;
-    mutable std::atomic<bool> readOnly = false;
+    boost::multi_index::multi_index_container<Feature, feature_indexing> features_;
+    std::map<std::string, AmendmentSupport> all_;
+    std::map<std::string, VoteBehavior> supported_;
+    std::size_t upVotes_ = 0;
+    std::size_t downVotes_ = 0;
+    mutable std::atomic<bool> readOnly_ = false;
 
     // These helper functions provide access to the features collection by name,
     // index, and uint256 feature identifier, so the details of
@@ -117,31 +118,31 @@ class FeatureCollections
     Feature const&
     getByIndex(size_t i) const
     {
-        if (i >= features.size())
-            LogicError("Invalid FeatureBitset index");
-        auto const& sequence = features.get<Feature::byIndex>();
+        if (i >= features_.size())
+            logicError("Invalid FeatureBitset index");
+        auto const& sequence = features_.get<Feature::ByIndex>();
         return sequence[i];
     }
     size_t
     getIndex(Feature const& feature) const
     {
-        auto const& sequence = features.get<Feature::byIndex>();
-        auto const it_to = sequence.iterator_to(feature);
-        return it_to - sequence.begin();
+        auto const& sequence = features_.get<Feature::ByIndex>();
+        auto const itTo = sequence.iterator_to(feature);
+        return itTo - sequence.begin();
     }
     Feature const*
     getByFeature(uint256 const& feature) const
     {
-        auto const& feature_index = features.get<Feature::byFeature>();
-        auto const feature_it = feature_index.find(feature);
-        return feature_it == feature_index.end() ? nullptr : &*feature_it;
+        auto const& featureIndex = features_.get<Feature::ByFeature>();
+        auto const featureIt = featureIndex.find(feature);
+        return featureIt == featureIndex.end() ? nullptr : &*featureIt;
     }
     Feature const*
     getByName(std::string const& name) const
     {
-        auto const& name_index = features.get<Feature::byName>();
-        auto const name_it = name_index.find(name);
-        return name_it == name_index.end() ? nullptr : &*name_it;
+        auto const& nameIndex = features_.get<Feature::ByName>();
+        auto const nameIt = nameIndex.find(name);
+        return nameIt == nameIndex.end() ? nullptr : &*nameIt;
     }
 
 public:
@@ -170,7 +171,7 @@ public:
     std::map<std::string, AmendmentSupport> const&
     allAmendments() const
     {
-        return all;
+        return all_;
     }
 
     /** Amendments that this server supports.
@@ -179,21 +180,21 @@ public:
     std::map<std::string, VoteBehavior> const&
     supportedAmendments() const
     {
-        return supported;
+        return supported_;
     }
 
     /** Amendments that this server WON'T vote for by default. */
     std::size_t
     numDownVotedAmendments() const
     {
-        return downVotes;
+        return downVotes_;
     }
 
     /** Amendments that this server WILL vote for by default. */
     std::size_t
     numUpVotedAmendments() const
     {
-        return upVotes;
+        return upVotes_;
     }
 };
 
@@ -201,14 +202,14 @@ public:
 
 FeatureCollections::FeatureCollections()
 {
-    features.reserve(xrpl::detail::numFeatures);
+    features_.reserve(xrpl::detail::kNUM_FEATURES);
 }
 
 std::optional<uint256>
 FeatureCollections::getRegisteredFeature(std::string const& name) const
 {
     XRPL_ASSERT(
-        readOnly.load(), "xrpl::FeatureCollections::getRegisteredFeature : startup completed");
+        readOnly_.load(), "xrpl::FeatureCollections::getRegisteredFeature : startup completed");
     Feature const* feature = getByName(name);
     if (feature != nullptr)
         return feature->feature;
@@ -219,61 +220,62 @@ void
 check(bool condition, char const* logicErrorMessage)
 {
     if (!condition)
-        LogicError(logicErrorMessage);
+        logicError(logicErrorMessage);
 }
 
 uint256
 FeatureCollections::registerFeature(std::string const& name, Supported support, VoteBehavior vote)
 {
-    check(!readOnly, "Attempting to register a feature after startup.");
+    check(!readOnly_, "Attempting to register a feature after startup.");
     check(
-        support == Supported::yes || vote == VoteBehavior::DefaultNo,
+        support == Supported::Yes || vote == VoteBehavior::DefaultNo,
         "Invalid feature parameters. Must be supported to be up-voted.");
     Feature const* i = getByName(name);
     if (i == nullptr)
     {
-        check(features.size() < detail::numFeatures, "More features defined than allocated.");
+        check(features_.size() < detail::kNUM_FEATURES, "More features defined than allocated.");
 
         auto const f = sha512Half(Slice(name.data(), name.size()));
 
-        features.emplace_back(name, f);
+        features_.emplace_back(name, f);
 
         auto const getAmendmentSupport = [=]() {
             if (vote == VoteBehavior::Obsolete)
                 return AmendmentSupport::Retired;
-            return support == Supported::yes ? AmendmentSupport::Supported
+            return support == Supported::Yes ? AmendmentSupport::Supported
                                              : AmendmentSupport::Unsupported;
         };
-        all.emplace(name, getAmendmentSupport());
+        all_.emplace(name, getAmendmentSupport());
 
-        if (support == Supported::yes)
+        if (support == Supported::Yes)
         {
-            supported.emplace(name, vote);
+            supported_.emplace(name, vote);
 
             if (vote == VoteBehavior::DefaultYes)
             {
-                ++upVotes;
+                ++upVotes_;
             }
             else
             {
-                ++downVotes;
+                ++downVotes_;
             }
         }
-        check(upVotes + downVotes == supported.size(), "Feature counting logic broke");
-        check(supported.size() <= features.size(), "More supported features than defined features");
-        check(features.size() == all.size(), "The 'all' features list is populated incorrectly");
+        check(upVotes_ + downVotes_ == supported_.size(), "Feature counting logic broke");
+        check(
+            supported_.size() <= features_.size(), "More supported features than defined features");
+        check(features_.size() == all_.size(), "The 'all' features list is populated incorrectly");
         return f;
     }
 
     // Each feature should only be registered once
-    LogicError("Duplicate feature registration");
+    logicError("Duplicate feature registration");
 }
 
 /** Tell FeatureCollections when registration is complete. */
 bool
 FeatureCollections::registrationIsDone()
 {
-    readOnly = true;
+    readOnly_ = true;
     return true;
 }
 
@@ -281,11 +283,11 @@ size_t
 FeatureCollections::featureToBitsetIndex(uint256 const& f) const
 {
     XRPL_ASSERT(
-        readOnly.load(), "xrpl::FeatureCollections::featureToBitsetIndex : startup completed");
+        readOnly_.load(), "xrpl::FeatureCollections::featureToBitsetIndex : startup completed");
 
     Feature const* feature = getByFeature(f);
     if (feature == nullptr)
-        LogicError("Invalid Feature ID");
+        logicError("Invalid Feature ID");
 
     return getIndex(*feature);
 }
@@ -294,7 +296,7 @@ uint256 const&
 FeatureCollections::bitsetIndexToFeature(size_t i) const
 {
     XRPL_ASSERT(
-        readOnly.load(), "xrpl::FeatureCollections::bitsetIndexToFeature : startup completed");
+        readOnly_.load(), "xrpl::FeatureCollections::bitsetIndexToFeature : startup completed");
     Feature const& feature = getByIndex(i);
     return feature.feature;
 }
@@ -302,12 +304,12 @@ FeatureCollections::bitsetIndexToFeature(size_t i) const
 std::string
 FeatureCollections::featureToName(uint256 const& f) const
 {
-    XRPL_ASSERT(readOnly.load(), "xrpl::FeatureCollections::featureToName : startup completed");
+    XRPL_ASSERT(readOnly_.load(), "xrpl::FeatureCollections::featureToName : startup completed");
     Feature const* feature = getByFeature(f);
     return (feature != nullptr) ? feature->name : to_string(f);
 }
 
-FeatureCollections featureCollections;
+FeatureCollections gFeatureCollections;
 
 }  // namespace
 
@@ -315,7 +317,7 @@ FeatureCollections featureCollections;
 std::map<std::string, AmendmentSupport> const&
 allAmendments()
 {
-    return featureCollections.allAmendments();
+    return gFeatureCollections.allAmendments();
 }
 
 /** Amendments that this server supports.
@@ -324,21 +326,21 @@ allAmendments()
 std::map<std::string, VoteBehavior> const&
 detail::supportedAmendments()
 {
-    return featureCollections.supportedAmendments();
+    return gFeatureCollections.supportedAmendments();
 }
 
 /** Amendments that this server won't vote for by default. */
 std::size_t
 detail::numDownVotedAmendments()
 {
-    return featureCollections.numDownVotedAmendments();
+    return gFeatureCollections.numDownVotedAmendments();
 }
 
 /** Amendments that this server will vote for by default. */
 std::size_t
 detail::numUpVotedAmendments()
 {
-    return featureCollections.numUpVotedAmendments();
+    return gFeatureCollections.numUpVotedAmendments();
 }
 
 //------------------------------------------------------------------------------
@@ -346,13 +348,13 @@ detail::numUpVotedAmendments()
 std::optional<uint256>
 getRegisteredFeature(std::string const& name)
 {
-    return featureCollections.getRegisteredFeature(name);
+    return gFeatureCollections.getRegisteredFeature(name);
 }
 
 uint256
 registerFeature(std::string const& name, Supported support, VoteBehavior vote)
 {
-    return featureCollections.registerFeature(name, support, vote);
+    return gFeatureCollections.registerFeature(name, support, vote);
 }
 
 // Retired features are in the ledger and have no code controlled by the
@@ -360,32 +362,32 @@ registerFeature(std::string const& name, Supported support, VoteBehavior vote)
 uint256
 retireFeature(std::string const& name)
 {
-    return registerFeature(name, Supported::yes, VoteBehavior::Obsolete);
+    return registerFeature(name, Supported::Yes, VoteBehavior::Obsolete);
 }
 
 /** Tell FeatureCollections when registration is complete. */
 bool
 registrationIsDone()
 {
-    return featureCollections.registrationIsDone();
+    return gFeatureCollections.registrationIsDone();
 }
 
 size_t
 featureToBitsetIndex(uint256 const& f)
 {
-    return featureCollections.featureToBitsetIndex(f);
+    return gFeatureCollections.featureToBitsetIndex(f);
 }
 
 uint256
 bitsetIndexToFeature(size_t i)
 {
-    return featureCollections.bitsetIndexToFeature(i);
+    return gFeatureCollections.bitsetIndexToFeature(i);
 }
 
 std::string
 featureToName(uint256 const& f)
 {
-    return featureCollections.featureToName(f);
+    return gFeatureCollections.featureToName(f);
 }
 
 // All known amendments must be registered either here or below with the
@@ -443,8 +445,7 @@ enforceValidFeatureName(auto fn) -> char const*
 // All of the features should now be registered, since variables in a cpp file
 // are initialized from top to bottom.
 //
-// Use initialization of one final static variable to set
-// featureCollections::readOnly.
-[[maybe_unused]] static bool const readOnlySet = featureCollections.registrationIsDone();
+// Use initialization of one final static variable to set featureCollections::readOnly_.
+[[maybe_unused]] static bool const kREAD_ONLY_SET = gFeatureCollections.registrationIsDone();
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/IOUAmount.cpp b/src/libxrpl/protocol/IOUAmount.cpp
index 69b763dbab..e4326d611e 100644
--- a/src/libxrpl/protocol/IOUAmount.cpp
+++ b/src/libxrpl/protocol/IOUAmount.cpp
@@ -23,8 +23,8 @@ namespace {
 LocalValue<bool>&
 getStaticSTNumberSwitchover()
 {
-    static LocalValue<bool> r{true};
-    return r;
+    static LocalValue<bool> kR{true};
+    return kR;
 }
 }  // namespace
 
@@ -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 minMantissa = STAmount::cMinValue;
-static std::int64_t constexpr maxMantissa = STAmount::cMaxValue;
+static std::int64_t constexpr kMIN_MANTISSA = STAmount::kMIN_VALUE;
+static std::int64_t constexpr kMAX_MANTISSA = STAmount::kMAX_VALUE;
 /* The range for the exponent when normalized */
-static int constexpr minExponent = STAmount::cMinOffset;
-static int constexpr maxExponent = STAmount::cMaxOffset;
+static int constexpr kMIN_EXPONENT = STAmount::kMIN_OFFSET;
+static int constexpr kMAX_EXPONENT = STAmount::kMAX_OFFSET;
 
 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(minMantissa, maxMantissa);
+        number.normalizeToRange(kMIN_MANTISSA, kMAX_MANTISSA);
     return result;
 }
 
 IOUAmount
 IOUAmount::minPositiveAmount()
 {
-    return IOUAmount(minMantissa, minExponent);
+    return IOUAmount(kMIN_MANTISSA, kMIN_EXPONENT);
 }
 
 void
@@ -71,7 +71,7 @@ IOUAmount::normalize()
 {
     if (mantissa_ == 0)
     {
-        *this = beast::zero;
+        *this = beast::kZERO;
         return;
     }
 
@@ -79,10 +79,10 @@ IOUAmount::normalize()
     {
         Number const v{mantissa_, exponent_};
         *this = fromNumber(v);
-        if (exponent_ > maxExponent)
+        if (exponent_ > kMAX_EXPONENT)
             Throw<std::overflow_error>("value overflow");
-        if (exponent_ < minExponent)
-            *this = beast::zero;
+        if (exponent_ < kMIN_EXPONENT)
+            *this = beast::kZERO;
         return;
     }
 
@@ -91,28 +91,28 @@ IOUAmount::normalize()
     if (negative)
         mantissa_ = -mantissa_;
 
-    while ((mantissa_ < minMantissa) && (exponent_ > minExponent))
+    while ((mantissa_ < kMIN_MANTISSA) && (exponent_ > kMIN_EXPONENT))
     {
         mantissa_ *= 10;
         --exponent_;
     }
 
-    while (mantissa_ > maxMantissa)
+    while (mantissa_ > kMAX_MANTISSA)
     {
-        if (exponent_ >= maxExponent)
+        if (exponent_ >= kMAX_EXPONENT)
             Throw<std::overflow_error>("IOUAmount::normalize");
 
         mantissa_ /= 10;
         ++exponent_;
     }
 
-    if ((exponent_ < minExponent) || (mantissa_ < minMantissa))
+    if ((exponent_ < kMIN_EXPONENT) || (mantissa_ < kMIN_MANTISSA))
     {
-        *this = beast::zero;
+        *this = beast::kZERO;
         return;
     }
 
-    if (exponent_ > maxExponent)
+    if (exponent_ > kMAX_EXPONENT)
         Throw<std::overflow_error>("value overflow");
 
     if (negative)
@@ -121,19 +121,19 @@ IOUAmount::normalize()
 
 IOUAmount::IOUAmount(Number const& other) : IOUAmount(fromNumber(other))
 {
-    if (exponent_ > maxExponent)
+    if (exponent_ > kMAX_EXPONENT)
         Throw<std::overflow_error>("value overflow");
-    if (exponent_ < minExponent)
-        *this = beast::zero;
+    if (exponent_ < kMIN_EXPONENT)
+        *this = beast::kZERO;
 }
 
 IOUAmount&
 IOUAmount::operator+=(IOUAmount const& other)
 {
-    if (other == beast::zero)
+    if (other == beast::kZERO)
         return *this;
 
-    if (*this == beast::zero)
+    if (*this == beast::kZERO)
     {
         *this = other;
         return *this;
@@ -165,7 +165,7 @@ IOUAmount::operator+=(IOUAmount const& other)
 
     if (mantissa_ >= -10 && mantissa_ <= 10)
     {
-        *this = beast::zero;
+        *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 powerTable = [] {
+    static auto const kPOWER_TABLE = [] {
         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 log10Floor = [](uint128_t const& v) {
+    static auto kLOG10_FLOOR = [](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(powerTable, v);
-        int index = std::distance(powerTable.begin(), l);
+        auto const l = std::ranges::lower_bound(kPOWER_TABLE, v);
+        int index = std::distance(kPOWER_TABLE.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 log10Ceil = [](uint128_t const& v) {
+    static auto kLOG10_CEIL = [](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(powerTable, v);
-        return int(std::distance(powerTable.begin(), l));
+        auto const l = std::ranges::lower_bound(kPOWER_TABLE, v);
+        return int(std::distance(kPOWER_TABLE.begin(), l));
     };
 
-    static auto const fl64 = log10Floor(std::numeric_limits<std::int64_t>::max());
+    static auto const kFL64 = kLOG10_FLOOR(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 = fl64 - log10Ceil(low);
+        auto const roomToGrow = kFL64 - kLOG10_CEIL(low);
         if (roomToGrow > 0)
         {
             exponent -= roomToGrow;
-            low *= powerTable[roomToGrow];
-            rem *= powerTable[roomToGrow];
+            low *= kPOWER_TABLE[roomToGrow];
+            rem *= kPOWER_TABLE[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 = log10Ceil(low) - fl64;
+    auto const mustShrink = kLOG10_CEIL(low) - kFL64;
     if (mustShrink > 0)
     {
         uint128_t const sav(low);
         exponent += mustShrink;
-        low /= powerTable[mustShrink];
+        low /= kPOWER_TABLE[mustShrink];
         if (!hasRem)
-            hasRem = bool(sav - low * powerTable[mustShrink]);
+            hasRem = bool(sav - low * kPOWER_TABLE[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(-minMantissa, minExponent);
+                return IOUAmount(-kMIN_MANTISSA, kMIN_EXPONENT);
             }
             // 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 4bbf2d6f1f..b37428a6bf 100644
--- a/src/libxrpl/protocol/Indexes.cpp
+++ b/src/libxrpl/protocol/Indexes.cpp
@@ -50,53 +50,52 @@ namespace xrpl {
           and marked as [[deprecated]] to prevent accidental reuse.
 */
 enum class LedgerNameSpace : std::uint16_t {
-    ACCOUNT = 'a',
-    DIR_NODE = 'd',
-    TRUST_LINE = 'r',
-    OFFER = 'o',
-    OWNER_DIR = 'O',
-    BOOK_DIR = 'B',
-    SKIP_LIST = 's',
-    ESCROW = 'u',
-    AMENDMENTS = 'f',
-    FEE_SETTINGS = 'e',
-    TICKET = 'T',
-    SIGNER_LIST = 'S',
-    XRP_PAYMENT_CHANNEL = 'x',
-    CHECK = 'C',
-    DEPOSIT_PREAUTH = 'p',
-    DEPOSIT_PREAUTH_CREDENTIALS = 'P',
-    NEGATIVE_UNL = 'N',
-    NFTOKEN_OFFER = 'q',
-    NFTOKEN_BUY_OFFERS = 'h',
-    NFTOKEN_SELL_OFFERS = 'i',
-    AMM = 'A',
-    BRIDGE = 'H',
-    XCHAIN_CLAIM_ID = 'Q',
-    XCHAIN_CREATE_ACCOUNT_CLAIM_ID = 'K',
-    DID = 'I',
-    ORACLE = 'R',
-    MPTOKEN_ISSUANCE = '~',
-    MPTOKEN = 't',
-    CREDENTIAL = 'D',
-    PERMISSIONED_DOMAIN = 'm',
-    DELEGATE = 'E',
-    VAULT = 'V',
-    LOAN_BROKER = 'l',  // lower-case L
-    LOAN = 'L',
+    Account = 'a',
+    DirNode = 'd',
+    TrustLine = 'r',
+    Offer = 'o',
+    OwnerDir = 'O',
+    BookDir = 'B',
+    SkipList = 's',
+    Escrow = 'u',
+    Amendments = 'f',
+    FeeSettings = 'e',
+    Ticket = 'T',
+    SignerList = 'S',
+    XRPPaymentChannel = 'x',
+    Check = 'C',
+    DepositPreauth = 'p',
+    DepositPreauthCredentials = 'P',
+    NegativeUnl = 'N',
+    NftokenOffer = 'q',
+    NftokenBuyOffers = 'h',
+    NftokenSellOffers = 'i',
+    Amm = 'A',
+    Bridge = 'H',
+    XchainClaimId = 'Q',
+    XchainCreateAccountClaimId = 'K',
+    Did = 'I',
+    Oracle = 'R',
+    MPTokenIssuance = '~',
+    MPToken = 't',
+    Credential = 'D',
+    PermissionedDomain = 'm',
+    Delegate = 'E',
+    Vault = 'V',
+    LoanBroker = 'l',  // lower-case L
+    Loan = 'L',
 
-    // No longer used or supported. Left here to reserve the space
-    // to avoid accidental reuse.
-    CONTRACT [[deprecated]] = 'c',
-    GENERATOR [[deprecated]] = 'g',
-    NICKNAME [[deprecated]] = 'n',
+    // No longer used or supported. Left here to reserve the space to avoid accidental reuse.
+    Contract [[deprecated]] = 'c',
+    Generator [[deprecated]] = 'g',
+    Nickname [[deprecated]] = 'n',
 };
 
 template <class... Args>
 static uint256
 indexHash(LedgerNameSpace space, Args const&... args)
 {
-    return sha512Half(safe_cast<std::uint16_t>(space), args...);
+    return sha512Half(safeCast<std::uint16_t>(space), args...);
 }
 
 uint256
@@ -115,21 +114,21 @@ getBookBase(Book const& book)
             if constexpr (std::is_same_v<TIn, Issue> && std::is_same_v<TOut, Issue>)
             {
                 return getIndexHash(
-                    LedgerNameSpace::BOOK_DIR, in.currency, out.currency, in.account, out.account);
+                    LedgerNameSpace::BookDir, in.currency, out.currency, in.account, out.account);
             }
             else if constexpr (std::is_same_v<TIn, Issue> && std::is_same_v<TOut, MPTIssue>)
             {
                 return getIndexHash(
-                    LedgerNameSpace::BOOK_DIR, in.currency, out.getMptID(), in.account);
+                    LedgerNameSpace::BookDir, in.currency, out.getMptID(), in.account);
             }
             else if constexpr (std::is_same_v<TIn, MPTIssue> && std::is_same_v<TOut, Issue>)
             {
                 return getIndexHash(
-                    LedgerNameSpace::BOOK_DIR, in.getMptID(), out.currency, out.account);
+                    LedgerNameSpace::BookDir, in.getMptID(), out.currency, out.account);
             }
             else
             {
-                return getIndexHash(LedgerNameSpace::BOOK_DIR, in.getMptID(), out.getMptID());
+                return getIndexHash(LedgerNameSpace::BookDir, in.getMptID(), out.getMptID());
             }
         },
         book.in.value(),
@@ -144,9 +143,9 @@ getBookBase(Book const& book)
 uint256
 getQualityNext(uint256 const& uBase)
 {
-    static constexpr uint256 nextQuality(
+    static constexpr uint256 kNEXT_QUALITY(
         "0000000000000000000000000000000000000000000000010000000000000000");
-    return uBase + nextQuality;
+    return uBase + kNEXT_QUALITY;
 }
 
 std::uint64_t
@@ -159,7 +158,7 @@ getQuality(uint256 const& uBase)
 uint256
 getTicketIndex(AccountID const& account, std::uint32_t ticketSeq)
 {
-    return indexHash(LedgerNameSpace::TICKET, account, ticketSeq);
+    return indexHash(LedgerNameSpace::Ticket, account, ticketSeq);
 }
 
 uint256
@@ -186,7 +185,7 @@ namespace keylet {
 Keylet
 account(AccountID const& id) noexcept
 {
-    return Keylet{ltACCOUNT_ROOT, indexHash(LedgerNameSpace::ACCOUNT, id)};
+    return Keylet{ltACCOUNT_ROOT, indexHash(LedgerNameSpace::Account, id)};
 }
 
 Keylet
@@ -198,8 +197,8 @@ child(uint256 const& key) noexcept
 Keylet const&
 skip() noexcept
 {
-    static Keylet const ret{ltLEDGER_HASHES, indexHash(LedgerNameSpace::SKIP_LIST)};
-    return ret;
+    static Keylet const kRET{ltLEDGER_HASHES, indexHash(LedgerNameSpace::SkipList)};
+    return kRET;
 }
 
 Keylet
@@ -208,32 +207,32 @@ skip(LedgerIndex ledger) noexcept
     return {
         ltLEDGER_HASHES,
         indexHash(
-            LedgerNameSpace::SKIP_LIST, std::uint32_t(static_cast<std::uint32_t>(ledger) >> 16))};
+            LedgerNameSpace::SkipList, std::uint32_t(static_cast<std::uint32_t>(ledger) >> 16))};
 }
 
 Keylet const&
 amendments() noexcept
 {
-    static Keylet const ret{ltAMENDMENTS, indexHash(LedgerNameSpace::AMENDMENTS)};
-    return ret;
+    static Keylet const kRET{ltAMENDMENTS, indexHash(LedgerNameSpace::Amendments)};
+    return kRET;
 }
 
 Keylet const&
 fees() noexcept
 {
-    static Keylet const ret{ltFEE_SETTINGS, indexHash(LedgerNameSpace::FEE_SETTINGS)};
-    return ret;
+    static Keylet const kRET{ltFEE_SETTINGS, indexHash(LedgerNameSpace::FeeSettings)};
+    return kRET;
 }
 
 Keylet const&
 negativeUNL() noexcept
 {
-    static Keylet const ret{ltNEGATIVE_UNL, indexHash(LedgerNameSpace::NEGATIVE_UNL)};
-    return ret;
+    static Keylet const kRET{ltNEGATIVE_UNL, indexHash(LedgerNameSpace::NegativeUnl)};
+    return kRET;
 }
 
 Keylet
-book_t::operator()(Book const& b) const
+BookT::operator()(Book const& b) const
 {
     return {ltDIR_NODE, getBookBase(b)};
 }
@@ -258,13 +257,13 @@ line(AccountID const& id0, AccountID const& id1, Currency const& currency) noexc
 
     return {
         ltRIPPLE_STATE,
-        indexHash(LedgerNameSpace::TRUST_LINE, accounts.first, accounts.second, currency)};
+        indexHash(LedgerNameSpace::TrustLine, accounts.first, accounts.second, currency)};
 }
 
 Keylet
 offer(AccountID const& id, std::uint32_t seq) noexcept
 {
-    return {ltOFFER, indexHash(LedgerNameSpace::OFFER, id, seq)};
+    return {ltOFFER, indexHash(LedgerNameSpace::Offer, id, seq)};
 }
 
 Keylet
@@ -286,20 +285,20 @@ quality(Keylet const& k, std::uint64_t q) noexcept
 }
 
 Keylet
-next_t::operator()(Keylet const& k) const
+NextT::operator()(Keylet const& k) const
 {
     XRPL_ASSERT(k.type == ltDIR_NODE, "xrpl::keylet::next_t::operator() : valid input type");
     return {ltDIR_NODE, getQualityNext(k.key)};
 }
 
 Keylet
-ticket_t::operator()(AccountID const& id, std::uint32_t ticketSeq) const
+TicketT::operator()(AccountID const& id, std::uint32_t ticketSeq) const
 {
     return {ltTICKET, getTicketIndex(id, ticketSeq)};
 }
 
 Keylet
-ticket_t::operator()(AccountID const& id, SeqProxy ticketSeq) const
+TicketT::operator()(AccountID const& id, SeqProxy ticketSeq) const
 {
     return {ltTICKET, getTicketIndex(id, ticketSeq)};
 }
@@ -310,7 +309,7 @@ ticket_t::operator()(AccountID const& id, SeqProxy ticketSeq) const
 static Keylet
 signers(AccountID const& account, std::uint32_t page) noexcept
 {
-    return {ltSIGNER_LIST, indexHash(LedgerNameSpace::SIGNER_LIST, account, page)};
+    return {ltSIGNER_LIST, indexHash(LedgerNameSpace::SignerList, account, page)};
 }
 
 Keylet
@@ -322,13 +321,13 @@ signers(AccountID const& account) noexcept
 Keylet
 check(AccountID const& id, std::uint32_t seq) noexcept
 {
-    return {ltCHECK, indexHash(LedgerNameSpace::CHECK, id, seq)};
+    return {ltCHECK, indexHash(LedgerNameSpace::Check, id, seq)};
 }
 
 Keylet
 depositPreauth(AccountID const& owner, AccountID const& preauthorized) noexcept
 {
-    return {ltDEPOSIT_PREAUTH, indexHash(LedgerNameSpace::DEPOSIT_PREAUTH, owner, preauthorized)};
+    return {ltDEPOSIT_PREAUTH, indexHash(LedgerNameSpace::DepositPreauth, owner, preauthorized)};
 }
 
 // Credentials should be sorted here, use credentials::makeSorted
@@ -343,7 +342,7 @@ depositPreauth(
         hashes.emplace_back(sha512Half(o.first, o.second));
 
     return {
-        ltDEPOSIT_PREAUTH, indexHash(LedgerNameSpace::DEPOSIT_PREAUTH_CREDENTIALS, owner, hashes)};
+        ltDEPOSIT_PREAUTH, indexHash(LedgerNameSpace::DepositPreauthCredentials, owner, hashes)};
 }
 
 //------------------------------------------------------------------------------
@@ -357,7 +356,7 @@ unchecked(uint256 const& key) noexcept
 Keylet
 ownerDir(AccountID const& id) noexcept
 {
-    return {ltDIR_NODE, indexHash(LedgerNameSpace::OWNER_DIR, id)};
+    return {ltDIR_NODE, indexHash(LedgerNameSpace::OwnerDir, id)};
 }
 
 Keylet
@@ -366,23 +365,23 @@ page(uint256 const& key, std::uint64_t index) noexcept
     if (index == 0)
         return {ltDIR_NODE, key};
 
-    return {ltDIR_NODE, indexHash(LedgerNameSpace::DIR_NODE, key, index)};
+    return {ltDIR_NODE, indexHash(LedgerNameSpace::DirNode, key, index)};
 }
 
 Keylet
 escrow(AccountID const& src, std::uint32_t seq) noexcept
 {
-    return {ltESCROW, indexHash(LedgerNameSpace::ESCROW, src, seq)};
+    return {ltESCROW, indexHash(LedgerNameSpace::Escrow, src, seq)};
 }
 
 Keylet
 payChan(AccountID const& src, AccountID const& dst, std::uint32_t seq) noexcept
 {
-    return {ltPAYCHAN, indexHash(LedgerNameSpace::XRP_PAYMENT_CHANNEL, src, dst, seq)};
+    return {ltPAYCHAN, indexHash(LedgerNameSpace::XRPPaymentChannel, src, dst, seq)};
 }
 
 Keylet
-nftpage_min(AccountID const& owner)
+nftpageMin(AccountID const& owner)
 {
     std::array<std::uint8_t, 32> buf{};
     std::memcpy(buf.data(), owner.data(), owner.size());
@@ -390,9 +389,9 @@ nftpage_min(AccountID const& owner)
 }
 
 Keylet
-nftpage_max(AccountID const& owner)
+nftpageMax(AccountID const& owner)
 {
-    uint256 id = nft::pageMask;
+    uint256 id = nft::kPAGE_MASK;
     std::memcpy(id.data(), owner.data(), owner.size());
     return {ltNFTOKEN_PAGE, id};
 }
@@ -401,25 +400,25 @@ 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::pageMask) + (token & nft::pageMask)};
+    return {ltNFTOKEN_PAGE, (k.key & ~nft::kPAGE_MASK) + (token & nft::kPAGE_MASK)};
 }
 
 Keylet
 nftoffer(AccountID const& owner, std::uint32_t seq)
 {
-    return {ltNFTOKEN_OFFER, indexHash(LedgerNameSpace::NFTOKEN_OFFER, owner, seq)};
+    return {ltNFTOKEN_OFFER, indexHash(LedgerNameSpace::NftokenOffer, owner, seq)};
 }
 
 Keylet
-nft_buys(uint256 const& id) noexcept
+nftBuys(uint256 const& id) noexcept
 {
-    return {ltDIR_NODE, indexHash(LedgerNameSpace::NFTOKEN_BUY_OFFERS, id)};
+    return {ltDIR_NODE, indexHash(LedgerNameSpace::NftokenBuyOffers, id)};
 }
 
 Keylet
-nft_sells(uint256 const& id) noexcept
+nftSells(uint256 const& id) noexcept
 {
-    return {ltDIR_NODE, indexHash(LedgerNameSpace::NFTOKEN_SELL_OFFERS, id)};
+    return {ltDIR_NODE, indexHash(LedgerNameSpace::NftokenSellOffers, id)};
 }
 
 Keylet
@@ -431,7 +430,7 @@ amm(Asset const& asset1, Asset const& asset2) noexcept
             if constexpr (std::is_same_v<TIss1, Issue> && std::is_same_v<TIss2, Issue>)
             {
                 return amm(indexHash(
-                    LedgerNameSpace::AMM,
+                    LedgerNameSpace::Amm,
                     issue1.account,
                     issue1.currency,
                     issue2.account,
@@ -440,16 +439,16 @@ amm(Asset const& asset1, Asset const& asset2) noexcept
             else if constexpr (std::is_same_v<TIss1, Issue> && std::is_same_v<TIss2, MPTIssue>)
             {
                 return amm(indexHash(
-                    LedgerNameSpace::AMM, issue1.account, issue1.currency, issue2.getMptID()));
+                    LedgerNameSpace::Amm, issue1.account, issue1.currency, issue2.getMptID()));
             }
             else if constexpr (std::is_same_v<TIss1, MPTIssue> && std::is_same_v<TIss2, Issue>)
             {
                 return amm(indexHash(
-                    LedgerNameSpace::AMM, issue1.getMptID(), issue2.account, issue2.currency));
+                    LedgerNameSpace::Amm, issue1.getMptID(), issue2.account, issue2.currency));
             }
             else if constexpr (std::is_same_v<TIss1, MPTIssue> && std::is_same_v<TIss2, MPTIssue>)
             {
-                return amm(indexHash(LedgerNameSpace::AMM, issue1.getMptID(), issue2.getMptID()));
+                return amm(indexHash(LedgerNameSpace::Amm, issue1.getMptID(), issue2.getMptID()));
             }
         },
         minA.value(),
@@ -465,7 +464,7 @@ amm(uint256 const& id) noexcept
 Keylet
 delegate(AccountID const& account, AccountID const& authorizedAccount) noexcept
 {
-    return {ltDELEGATE, indexHash(LedgerNameSpace::DELEGATE, account, authorizedAccount)};
+    return {ltDELEGATE, indexHash(LedgerNameSpace::Delegate, account, authorizedAccount)};
 }
 
 Keylet
@@ -475,7 +474,7 @@ bridge(STXChainBridge const& bridge, STXChainBridge::ChainType chainType)
     // there can only be one bridge per lockingChainCurrency. On the issuing
     // chain there can only be one bridge per issuingChainCurrency.
     auto const& issue = bridge.issue(chainType);
-    return {ltBRIDGE, indexHash(LedgerNameSpace::BRIDGE, bridge.door(chainType), issue.currency)};
+    return {ltBRIDGE, indexHash(LedgerNameSpace::Bridge, bridge.door(chainType), issue.currency)};
 }
 
 Keylet
@@ -484,7 +483,7 @@ xChainClaimID(STXChainBridge const& bridge, std::uint64_t seq)
     return {
         ltXCHAIN_OWNED_CLAIM_ID,
         indexHash(
-            LedgerNameSpace::XCHAIN_CLAIM_ID,
+            LedgerNameSpace::XchainClaimId,
             bridge.lockingChainDoor(),
             bridge.lockingChainIssue(),
             bridge.issuingChainDoor(),
@@ -498,7 +497,7 @@ xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t seq)
     return {
         ltXCHAIN_OWNED_CREATE_ACCOUNT_CLAIM_ID,
         indexHash(
-            LedgerNameSpace::XCHAIN_CREATE_ACCOUNT_CLAIM_ID,
+            LedgerNameSpace::XchainCreateAccountClaimId,
             bridge.lockingChainDoor(),
             bridge.lockingChainIssue(),
             bridge.issuingChainDoor(),
@@ -509,13 +508,13 @@ xChainCreateAccountClaimID(STXChainBridge const& bridge, std::uint64_t seq)
 Keylet
 did(AccountID const& account) noexcept
 {
-    return {ltDID, indexHash(LedgerNameSpace::DID, account)};
+    return {ltDID, indexHash(LedgerNameSpace::Did, account)};
 }
 
 Keylet
 oracle(AccountID const& account, std::uint32_t const& documentID) noexcept
 {
-    return {ltORACLE, indexHash(LedgerNameSpace::ORACLE, account, documentID)};
+    return {ltORACLE, indexHash(LedgerNameSpace::Oracle, account, documentID)};
 }
 
 Keylet
@@ -527,7 +526,7 @@ mptIssuance(std::uint32_t seq, AccountID const& issuer) noexcept
 Keylet
 mptIssuance(MPTID const& issuanceID) noexcept
 {
-    return {ltMPTOKEN_ISSUANCE, indexHash(LedgerNameSpace::MPTOKEN_ISSUANCE, issuanceID)};
+    return {ltMPTOKEN_ISSUANCE, indexHash(LedgerNameSpace::MPTokenIssuance, issuanceID)};
 }
 
 Keylet
@@ -539,37 +538,37 @@ mptoken(MPTID const& issuanceID, AccountID const& holder) noexcept
 Keylet
 mptoken(uint256 const& issuanceKey, AccountID const& holder) noexcept
 {
-    return {ltMPTOKEN, indexHash(LedgerNameSpace::MPTOKEN, issuanceKey, holder)};
+    return {ltMPTOKEN, indexHash(LedgerNameSpace::MPToken, issuanceKey, holder)};
 }
 
 Keylet
 credential(AccountID const& subject, AccountID const& issuer, Slice const& credType) noexcept
 {
-    return {ltCREDENTIAL, indexHash(LedgerNameSpace::CREDENTIAL, subject, issuer, credType)};
+    return {ltCREDENTIAL, indexHash(LedgerNameSpace::Credential, subject, issuer, credType)};
 }
 
 Keylet
 vault(AccountID const& owner, std::uint32_t seq) noexcept
 {
-    return vault(indexHash(LedgerNameSpace::VAULT, owner, seq));
+    return vault(indexHash(LedgerNameSpace::Vault, owner, seq));
 }
 
 Keylet
 loanbroker(AccountID const& owner, std::uint32_t seq) noexcept
 {
-    return loanbroker(indexHash(LedgerNameSpace::LOAN_BROKER, owner, seq));
+    return loanbroker(indexHash(LedgerNameSpace::LoanBroker, owner, seq));
 }
 
 Keylet
 loan(uint256 const& loanBrokerID, std::uint32_t loanSeq) noexcept
 {
-    return loan(indexHash(LedgerNameSpace::LOAN, loanBrokerID, loanSeq));
+    return loan(indexHash(LedgerNameSpace::Loan, loanBrokerID, loanSeq));
 }
 
 Keylet
 permissionedDomain(AccountID const& account, std::uint32_t seq) noexcept
 {
-    return {ltPERMISSIONED_DOMAIN, indexHash(LedgerNameSpace::PERMISSIONED_DOMAIN, account, seq)};
+    return {ltPERMISSIONED_DOMAIN, indexHash(LedgerNameSpace::PermissionedDomain, account, seq)};
 }
 
 Keylet
diff --git a/src/libxrpl/protocol/InnerObjectFormats.cpp b/src/libxrpl/protocol/InnerObjectFormats.cpp
index f4a88ec171..5c691159d7 100644
--- a/src/libxrpl/protocol/InnerObjectFormats.cpp
+++ b/src/libxrpl/protocol/InnerObjectFormats.cpp
@@ -13,160 +13,160 @@ InnerObjectFormats::InnerObjectFormats()
     add(sfSignerEntry.jsonName,
         sfSignerEntry.getCode(),
         {
-            {sfAccount, soeREQUIRED},
-            {sfSignerWeight, soeREQUIRED},
-            {sfWalletLocator, soeOPTIONAL},
+            {sfAccount, SoeRequired},
+            {sfSignerWeight, SoeRequired},
+            {sfWalletLocator, SoeOptional},
         });
 
     add(sfSigner.jsonName,
         sfSigner.getCode(),
         {
-            {sfAccount, soeREQUIRED},
-            {sfSigningPubKey, soeREQUIRED},
-            {sfTxnSignature, soeREQUIRED},
+            {sfAccount, SoeRequired},
+            {sfSigningPubKey, SoeRequired},
+            {sfTxnSignature, SoeRequired},
         });
 
     add(sfMajority.jsonName,
         sfMajority.getCode(),
         {
-            {sfAmendment, soeREQUIRED},
-            {sfCloseTime, soeREQUIRED},
+            {sfAmendment, SoeRequired},
+            {sfCloseTime, SoeRequired},
         });
 
     add(sfDisabledValidator.jsonName,
         sfDisabledValidator.getCode(),
         {
-            {sfPublicKey, soeREQUIRED},
-            {sfFirstLedgerSequence, soeREQUIRED},
+            {sfPublicKey, SoeRequired},
+            {sfFirstLedgerSequence, SoeRequired},
         });
 
     add(sfNFToken.jsonName,
         sfNFToken.getCode(),
         {
-            {sfNFTokenID, soeREQUIRED},
-            {sfURI, soeOPTIONAL},
+            {sfNFTokenID, SoeRequired},
+            {sfURI, SoeOptional},
         });
 
     add(sfVoteEntry.jsonName,
         sfVoteEntry.getCode(),
         {
-            {sfAccount, soeREQUIRED},
-            {sfTradingFee, soeDEFAULT},
-            {sfVoteWeight, soeREQUIRED},
+            {sfAccount, SoeRequired},
+            {sfTradingFee, SoeDefault},
+            {sfVoteWeight, SoeRequired},
         });
 
     add(sfAuctionSlot.jsonName,
         sfAuctionSlot.getCode(),
-        {{sfAccount, soeREQUIRED},
-         {sfExpiration, soeREQUIRED},
-         {sfDiscountedFee, soeDEFAULT},
-         {sfPrice, soeREQUIRED},
-         {sfAuthAccounts, soeOPTIONAL}});
+        {{sfAccount, SoeRequired},
+         {sfExpiration, SoeRequired},
+         {sfDiscountedFee, SoeDefault},
+         {sfPrice, SoeRequired},
+         {sfAuthAccounts, SoeOptional}});
 
     add(sfXChainClaimAttestationCollectionElement.jsonName,
         sfXChainClaimAttestationCollectionElement.getCode(),
         {
-            {sfAttestationSignerAccount, soeREQUIRED},
-            {sfPublicKey, soeREQUIRED},
-            {sfSignature, soeREQUIRED},
-            {sfAmount, soeREQUIRED},
-            {sfAccount, soeREQUIRED},
-            {sfAttestationRewardAccount, soeREQUIRED},
-            {sfWasLockingChainSend, soeREQUIRED},
-            {sfXChainClaimID, soeREQUIRED},
-            {sfDestination, soeOPTIONAL},
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfSignature, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAccount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfXChainClaimID, SoeRequired},
+            {sfDestination, SoeOptional},
         });
 
     add(sfXChainCreateAccountAttestationCollectionElement.jsonName,
         sfXChainCreateAccountAttestationCollectionElement.getCode(),
         {
-            {sfAttestationSignerAccount, soeREQUIRED},
-            {sfPublicKey, soeREQUIRED},
-            {sfSignature, soeREQUIRED},
-            {sfAmount, soeREQUIRED},
-            {sfAccount, soeREQUIRED},
-            {sfAttestationRewardAccount, soeREQUIRED},
-            {sfWasLockingChainSend, soeREQUIRED},
-            {sfXChainAccountCreateCount, soeREQUIRED},
-            {sfDestination, soeREQUIRED},
-            {sfSignatureReward, soeREQUIRED},
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfSignature, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAccount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfXChainAccountCreateCount, SoeRequired},
+            {sfDestination, SoeRequired},
+            {sfSignatureReward, SoeRequired},
         });
 
     add(sfXChainClaimProofSig.jsonName,
         sfXChainClaimProofSig.getCode(),
         {
-            {sfAttestationSignerAccount, soeREQUIRED},
-            {sfPublicKey, soeREQUIRED},
-            {sfAmount, soeREQUIRED},
-            {sfAttestationRewardAccount, soeREQUIRED},
-            {sfWasLockingChainSend, soeREQUIRED},
-            {sfDestination, soeOPTIONAL},
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfDestination, SoeOptional},
         });
 
     add(sfXChainCreateAccountProofSig.jsonName,
         sfXChainCreateAccountProofSig.getCode(),
         {
-            {sfAttestationSignerAccount, soeREQUIRED},
-            {sfPublicKey, soeREQUIRED},
-            {sfAmount, soeREQUIRED},
-            {sfSignatureReward, soeREQUIRED},
-            {sfAttestationRewardAccount, soeREQUIRED},
-            {sfWasLockingChainSend, soeREQUIRED},
-            {sfDestination, soeREQUIRED},
+            {sfAttestationSignerAccount, SoeRequired},
+            {sfPublicKey, SoeRequired},
+            {sfAmount, SoeRequired},
+            {sfSignatureReward, SoeRequired},
+            {sfAttestationRewardAccount, SoeRequired},
+            {sfWasLockingChainSend, SoeRequired},
+            {sfDestination, SoeRequired},
         });
 
     add(sfAuthAccount.jsonName,
         sfAuthAccount.getCode(),
         {
-            {sfAccount, soeREQUIRED},
+            {sfAccount, SoeRequired},
         });
 
     add(sfPriceData.jsonName,
         sfPriceData.getCode(),
         {
-            {sfBaseAsset, soeREQUIRED},
-            {sfQuoteAsset, soeREQUIRED},
-            {sfAssetPrice, soeOPTIONAL},
-            {sfScale, soeDEFAULT},
+            {sfBaseAsset, SoeRequired},
+            {sfQuoteAsset, SoeRequired},
+            {sfAssetPrice, SoeOptional},
+            {sfScale, SoeDefault},
         });
 
     add(sfCredential.jsonName,
         sfCredential.getCode(),
         {
-            {sfIssuer, soeREQUIRED},
-            {sfCredentialType, soeREQUIRED},
+            {sfIssuer, SoeRequired},
+            {sfCredentialType, SoeRequired},
         });
 
-    add(sfPermission.jsonName.c_str(), sfPermission.getCode(), {{sfPermissionValue, soeREQUIRED}});
+    add(sfPermission.jsonName.cStr(), sfPermission.getCode(), {{sfPermissionValue, SoeRequired}});
 
-    add(sfBatchSigner.jsonName.c_str(),
+    add(sfBatchSigner.jsonName.cStr(),
         sfBatchSigner.getCode(),
-        {{sfAccount, soeREQUIRED},
-         {sfSigningPubKey, soeOPTIONAL},
-         {sfTxnSignature, soeOPTIONAL},
-         {sfSigners, soeOPTIONAL}});
+        {{sfAccount, SoeRequired},
+         {sfSigningPubKey, SoeOptional},
+         {sfTxnSignature, SoeOptional},
+         {sfSigners, SoeOptional}});
 
     add(sfBook.jsonName,
         sfBook.getCode(),
         {
-            {sfBookDirectory, soeREQUIRED},
-            {sfBookNode, soeREQUIRED},
+            {sfBookDirectory, SoeRequired},
+            {sfBookNode, SoeRequired},
         });
 
     add(sfCounterpartySignature.jsonName,
         sfCounterpartySignature.getCode(),
         {
-            {sfSigningPubKey, soeOPTIONAL},
-            {sfTxnSignature, soeOPTIONAL},
-            {sfSigners, soeOPTIONAL},
+            {sfSigningPubKey, SoeOptional},
+            {sfTxnSignature, SoeOptional},
+            {sfSigners, SoeOptional},
         });
 }
 
 InnerObjectFormats const&
 InnerObjectFormats::getInstance()
 {
-    static InnerObjectFormats const instance;
-    return instance;
+    static InnerObjectFormats const kINSTANCE;
+    return kINSTANCE;
 }
 
 SOTemplate const*
diff --git a/src/libxrpl/protocol/Issue.cpp b/src/libxrpl/protocol/Issue.cpp
index d5896bbd57..33ad3a0835 100644
--- a/src/libxrpl/protocol/Issue.cpp
+++ b/src/libxrpl/protocol/Issue.cpp
@@ -43,7 +43,7 @@ Issue::getText() const
 }
 
 void
-Issue::setJson(Json::Value& jv) const
+Issue::setJson(json::Value& jv) const
 {
     jv[jss::currency] = to_string(currency);
     if (!isXRP(currency))
@@ -77,16 +77,16 @@ to_string(Issue const& ac)
     return to_string(ac.account) + "/" + to_string(ac.currency);
 }
 
-Json::Value
-to_json(Issue const& is)
+json::Value
+toJson(Issue const& is)
 {
-    Json::Value jv;
+    json::Value jv;
     is.setJson(jv);
     return jv;
 }
 
 Issue
-issueFromJson(Json::Value const& v)
+issueFromJson(json::Value const& v)
 {
     if (!v.isObject())
     {
@@ -99,38 +99,38 @@ issueFromJson(Json::Value const& v)
         Throw<std::runtime_error>("issueFromJson, Issue should not have mpt_issuance_id");
     }
 
-    Json::Value const curStr = v[jss::currency];
-    Json::Value const issStr = v[jss::issuer];
+    json::Value const curStr = v[jss::currency];
+    json::Value const issStr = v[jss::issuer];
 
     if (!curStr.isString())
     {
-        Throw<Json::error>("issueFromJson currency must be a string Json value");
+        Throw<json::Error>("issueFromJson currency must be a string Json value");
     }
 
-    auto const currency = to_currency(curStr.asString());
+    auto const currency = toCurrency(curStr.asString());
     if (currency == badCurrency() || currency == noCurrency())
     {
-        Throw<Json::error>("issueFromJson currency must be a valid currency");
+        Throw<json::Error>("issueFromJson currency must be a valid currency");
     }
 
     if (isXRP(currency))
     {
         if (!issStr.isNull())
         {
-            Throw<Json::error>("Issue, XRP should not have issuer");
+            Throw<json::Error>("Issue, XRP should not have issuer");
         }
         return xrpIssue();
     }
 
     if (!issStr.isString())
     {
-        Throw<Json::error>("issueFromJson issuer must be a string Json value");
+        Throw<json::Error>("issueFromJson issuer must be a string Json value");
     }
     auto const issuer = parseBase58<AccountID>(issStr.asString());
 
     if (!issuer)
     {
-        Throw<Json::error>("issueFromJson issuer must be a valid account");
+        Throw<json::Error>("issueFromJson issuer must be a valid account");
     }
 
     return Issue{currency, *issuer};
diff --git a/src/libxrpl/protocol/LedgerFormats.cpp b/src/libxrpl/protocol/LedgerFormats.cpp
index 7826435e51..99c636fbdc 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 commonFields = std::vector<SOElement>{
-        {sfLedgerIndex, soeOPTIONAL},
-        {sfLedgerEntryType, soeREQUIRED},
-        {sfFlags, soeREQUIRED},
+    static auto const kCOMMON_FIELDS = std::vector<SOElement>{
+        {sfLedgerIndex, SoeOptional},
+        {sfLedgerEntryType, SoeRequired},
+        {sfFlags, SoeRequired},
     };
-    return commonFields;
+    return kCOMMON_FIELDS;
 }
 
 LedgerFormats::LedgerFormats()
@@ -41,8 +41,8 @@ LedgerFormats::LedgerFormats()
 LedgerFormats const&
 LedgerFormats::getInstance()
 {
-    static LedgerFormats const instance;
-    return instance;
+    static LedgerFormats const kINSTANCE;
+    return kINSTANCE;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/LedgerHeader.cpp b/src/libxrpl/protocol/LedgerHeader.cpp
index f6a99be28a..9ddd6e180d 100644
--- a/src/libxrpl/protocol/LedgerHeader.cpp
+++ b/src/libxrpl/protocol/LedgerHeader.cpp
@@ -61,7 +61,7 @@ calculateLedgerHash(LedgerHeader const& info)
 {
     // VFALCO This has to match addRaw in View.h.
     return sha512Half(
-        HashPrefix::ledgerMaster,
+        HashPrefix::LedgerMaster,
         std::uint32_t(info.seq),
         std::uint64_t(info.drops.drops()),
         info.parentHash,
diff --git a/src/libxrpl/protocol/MPTIssue.cpp b/src/libxrpl/protocol/MPTIssue.cpp
index dac2f4e5fe..e9ec852d1d 100644
--- a/src/libxrpl/protocol/MPTIssue.cpp
+++ b/src/libxrpl/protocol/MPTIssue.cpp
@@ -44,15 +44,15 @@ MPTIssue::getText() const
 }
 
 void
-MPTIssue::setJson(Json::Value& jv) const
+MPTIssue::setJson(json::Value& jv) const
 {
     jv[jss::mpt_issuance_id] = to_string(mptID_);
 }
 
-Json::Value
-to_json(MPTIssue const& mptIssue)
+json::Value
+toJson(MPTIssue const& mptIssue)
 {
-    Json::Value jv;
+    json::Value jv;
     mptIssue.setJson(jv);
     return jv;
 }
@@ -64,7 +64,7 @@ to_string(MPTIssue const& mptIssue)
 }
 
 MPTIssue
-mptIssueFromJson(Json::Value const& v)
+mptIssueFromJson(json::Value const& v)
 {
     if (!v.isObject())
     {
@@ -78,17 +78,17 @@ mptIssueFromJson(Json::Value const& v)
         Throw<std::runtime_error>("mptIssueFromJson, MPTIssue should not have currency or issuer");
     }
 
-    Json::Value const& idStr = v[jss::mpt_issuance_id];
+    json::Value const& idStr = v[jss::mpt_issuance_id];
 
     if (!idStr.isString())
     {
-        Throw<Json::error>("mptIssueFromJson MPTID must be a string Json value");
+        Throw<json::Error>("mptIssueFromJson MPTID must be a string Json value");
     }
 
     MPTID id;
     if (!id.parseHex(idStr.asString()))
     {
-        Throw<Json::error>("mptIssueFromJson MPTID is invalid");
+        Throw<json::Error>("mptIssueFromJson MPTID is invalid");
     }
 
     return MPTIssue{id};
diff --git a/src/libxrpl/protocol/NFTSyntheticSerializer.cpp b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
index 9982f05b0f..4f0a2d5071 100644
--- a/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
+++ b/src/libxrpl/protocol/NFTSyntheticSerializer.cpp
@@ -13,7 +13,7 @@ namespace xrpl::RPC {
 
 void
 insertNFTSyntheticInJson(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta)
 {
diff --git a/src/libxrpl/protocol/NFTokenID.cpp b/src/libxrpl/protocol/NFTokenID.cpp
index fc32a7b4e8..b7822caf01 100644
--- a/src/libxrpl/protocol/NFTokenID.cpp
+++ b/src/libxrpl/protocol/NFTokenID.cpp
@@ -134,7 +134,7 @@ getNFTokenIDFromDeletedOffer(TxMeta const& transactionMeta)
 
 void
 insertNFTokenID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta)
 {
@@ -159,7 +159,7 @@ insertNFTokenID(
     {
         std::vector<uint256> const result = getNFTokenIDFromDeletedOffer(transactionMeta);
 
-        response[jss::nftoken_ids] = Json::Value(Json::arrayValue);
+        response[jss::nftoken_ids] = json::Value(json::ArrayValue);
         for (auto const& nftID : result)
             response[jss::nftoken_ids].append(to_string(nftID));
     }
diff --git a/src/libxrpl/protocol/NFTokenOfferID.cpp b/src/libxrpl/protocol/NFTokenOfferID.cpp
index c1d426eef0..ee39222bfa 100644
--- a/src/libxrpl/protocol/NFTokenOfferID.cpp
+++ b/src/libxrpl/protocol/NFTokenOfferID.cpp
@@ -52,7 +52,7 @@ getOfferIDFromCreatedOffer(TxMeta const& transactionMeta)
 
 void
 insertNFTokenOfferID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta)
 {
diff --git a/src/libxrpl/protocol/Permissions.cpp b/src/libxrpl/protocol/Permissions.cpp
index 21efe7a8cf..4222c63fea 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 instance;
-    return instance;
+    static Permission const kINSTANCE;
+    return kINSTANCE;
 }
 
 std::optional<std::string>
@@ -182,7 +182,7 @@ Permission::isDelegable(std::uint32_t const& permissionValue, Rules const& rules
     if (txFeaturesIt->second != uint256{} && !rules.enabled(txFeaturesIt->second))
         return false;
 
-    if (it->second == Delegation::notDelegable)
+    if (it->second == Delegation::NotDelegable)
         return false;
 
     return true;
diff --git a/src/libxrpl/protocol/Protocol.cpp b/src/libxrpl/protocol/Protocol.cpp
index 6f86f49fc6..14230e78bd 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 % FLAG_LEDGER_INTERVAL == 0;
+    return seq % kFLAG_LEDGER_INTERVAL == 0;
 }
 
 bool
 isFlagLedger(LedgerIndex seq)
 {
-    return seq % FLAG_LEDGER_INTERVAL == 0;
+    return seq % kFLAG_LEDGER_INTERVAL == 0;
 }
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp
index 54430ed5d5..ad88e60fe7 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 hex[] = "0123456789ABCDEF";
-        s += hex[((slice[i] & 0xf0) >> 4)];
-        s += hex[((slice[i] & 0x0f) >> 0)];
+        constexpr char kHEX[] = "0123456789ABCDEF";
+        s += kHEX[((slice[i] & 0xf0) >> 4)];
+        s += kHEX[((slice[i] & 0x0f) >> 0)];
     }
     return s;
 }
@@ -117,7 +117,8 @@ ecdsaCanonicality(Slice const& sig)
         boost::multiprecision::unchecked,
         void>>;
 
-    static uint264 const G("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141");
+    static uint264 const kG(
+        "0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141");  // NOLINT(readability-identifier-naming)
 
     // The format of a signature should be:
     // <30> <len> [ <02> <lenR> <R> ] [ <02> <lenS> <S> ]
@@ -131,20 +132,20 @@ ecdsaCanonicality(Slice const& sig)
     if (!r || !s || !p.empty())
         return std::nullopt;
 
-    uint264 const R(sliceToHex(*r));
-    if (R >= G)
+    uint264 const rNum(sliceToHex(*r));
+    if (rNum >= kG)
         return std::nullopt;
 
-    uint264 const S(sliceToHex(*s));
-    if (S >= G)
+    uint264 const sNum(sliceToHex(*s));
+    if (sNum >= kG)
         return std::nullopt;
 
     // (R,S) and (R,G-S) are canonical,
     // but is fully canonical when S <= G-S
-    auto const Sp = G - S;
-    if (S > Sp)
-        return ECDSACanonicality::canonical;
-    return ECDSACanonicality::fullyCanonical;
+    auto const Sp = kG - sNum;  // NOLINT(readability-identifier-naming)
+    if (sNum > Sp)
+        return ECDSACanonicality::Canonical;
+    return ECDSACanonicality::FullyCanonical;
 }
 
 static bool
@@ -153,6 +154,7 @@ ed25519Canonical(Slice const& sig)
     if (sig.size() != 64)
         return false;
     // Big-endian Order, the Ed25519 subgroup order
+    // NOLINTNEXTLINE(readability-identifier-naming)
     std::uint8_t const Order[] = {
         0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xDE, 0xF9, 0xDE, 0xA2, 0xF7,
@@ -161,7 +163,7 @@ ed25519Canonical(Slice const& sig)
     // Take the second half of signature
     // and byte-reverse it to big-endian.
     auto const le = sig.data() + 32;
-    std::uint8_t S[32];
+    std::uint8_t S[32];  // NOLINT(readability-identifier-naming)
     std::reverse_copy(le, le + 32, S);
     // Must be less than Order
     return std::lexicographical_compare(S, S + 32, Order, Order + 32);
@@ -171,21 +173,21 @@ ed25519Canonical(Slice const& sig)
 
 PublicKey::PublicKey(Slice const& slice)
 {
-    if (slice.size() < size_)
+    if (slice.size() < kSIZE)
     {
-        LogicError(
+        logicError(
             "PublicKey::PublicKey - Input slice cannot be an undersized "
             "buffer");
     }
 
     if (!publicKeyType(slice))
-        LogicError("PublicKey::PublicKey invalid type");
-    std::memcpy(buf_, slice.data(), size_);
+        logicError("PublicKey::PublicKey invalid type");
+    std::memcpy(buf_, slice.data(), kSIZE);
 }
 
 PublicKey::PublicKey(PublicKey const& other)
 {
-    std::memcpy(buf_, other.buf_, size_);
+    std::memcpy(buf_, other.buf_, kSIZE);
 }
 
 PublicKey&
@@ -193,7 +195,7 @@ PublicKey::operator=(PublicKey const& other)
 {
     if (this != &other)
     {
-        std::memcpy(buf_, other.buf_, size_);
+        std::memcpy(buf_, other.buf_, kSIZE);
     }
 
     return *this;
@@ -207,10 +209,10 @@ publicKeyType(Slice const& slice)
     if (slice.size() == 33)
     {
         if (slice[0] == 0xED)
-            return KeyType::ed25519;
+            return KeyType::Ed25519;
 
         if (slice[0] == 0x02 || slice[0] == 0x03)
-            return KeyType::secp256k1;
+            return KeyType::Secp256k1;
     }
 
     return std::nullopt;
@@ -223,45 +225,45 @@ verifyDigest(
     Slice const& sig,
     bool mustBeFullyCanonical) noexcept
 {
-    if (publicKeyType(publicKey) != KeyType::secp256k1)
-        LogicError("sign: secp256k1 required for digest signing");
+    if (publicKeyType(publicKey) != KeyType::Secp256k1)
+        logicError("sign: secp256k1 required for digest signing");
     auto const canonicality = ecdsaCanonicality(sig);
     if (!canonicality)
         return false;
-    if (mustBeFullyCanonical && (*canonicality != ECDSACanonicality::fullyCanonical))
+    if (mustBeFullyCanonical && (*canonicality != ECDSACanonicality::FullyCanonical))
         return false;
 
-    secp256k1_pubkey pubkey_imp;
+    secp256k1_pubkey pubkeyImp;
     if (secp256k1_ec_pubkey_parse(
             secp256k1Context(),
-            &pubkey_imp,
+            &pubkeyImp,
             reinterpret_cast<unsigned char const*>(publicKey.data()),
             publicKey.size()) != 1)
         return false;
 
-    secp256k1_ecdsa_signature sig_imp;
+    secp256k1_ecdsa_signature sigImp;
     if (secp256k1_ecdsa_signature_parse_der(
             secp256k1Context(),
-            &sig_imp,
+            &sigImp,
             reinterpret_cast<unsigned char const*>(sig.data()),
             sig.size()) != 1)
         return false;
-    if (*canonicality != ECDSACanonicality::fullyCanonical)
+    if (*canonicality != ECDSACanonicality::FullyCanonical)
     {
-        secp256k1_ecdsa_signature sig_norm;
-        if (secp256k1_ecdsa_signature_normalize(secp256k1Context(), &sig_norm, &sig_imp) != 1)
+        secp256k1_ecdsa_signature sigNorm;
+        if (secp256k1_ecdsa_signature_normalize(secp256k1Context(), &sigNorm, &sigImp) != 1)
             return false;
         return secp256k1_ecdsa_verify(
                    secp256k1Context(),
-                   &sig_norm,
+                   &sigNorm,
                    reinterpret_cast<unsigned char const*>(digest.data()),
-                   &pubkey_imp) == 1;
+                   &pubkeyImp) == 1;
     }
     return secp256k1_ecdsa_verify(
                secp256k1Context(),
-               &sig_imp,
+               &sigImp,
                reinterpret_cast<unsigned char const*>(digest.data()),
-               &pubkey_imp) == 1;
+               &pubkeyImp) == 1;
 }
 
 bool
@@ -269,11 +271,11 @@ verify(PublicKey const& publicKey, Slice const& m, Slice const& sig) noexcept
 {
     if (auto const type = publicKeyType(publicKey))
     {
-        if (*type == KeyType::secp256k1)
+        if (*type == KeyType::Secp256k1)
         {
             return verifyDigest(publicKey, sha512Half(m), sig);
         }
-        if (*type == KeyType::ed25519)
+        if (*type == KeyType::Ed25519)
         {
             if (!ed25519Canonical(sig))
                 return false;
@@ -291,11 +293,11 @@ verify(PublicKey const& publicKey, Slice const& m, Slice const& sig) noexcept
 NodeID
 calcNodeID(PublicKey const& pk)
 {
-    static_assert(NodeID::bytes == sizeof(ripesha_hasher::result_type));
+    static_assert(NodeID::kBYTES == sizeof(RipeshaHasher::result_type));
 
-    ripesha_hasher h;
+    RipeshaHasher h;
     h(pk.data(), pk.size());
-    return NodeID{static_cast<ripesha_hasher::result_type>(h)};
+    return NodeID{static_cast<RipeshaHasher::result_type>(h)};
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/Quality.cpp b/src/libxrpl/protocol/Quality.cpp
index 5f38f2219b..d3997cf2db 100644
--- a/src/libxrpl/protocol/Quality.cpp
+++ b/src/libxrpl/protocol/Quality.cpp
@@ -1,26 +1,28 @@
 #include <xrpl/protocol/Quality.h>
 
+#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/STAmount.h>
 
 #include <cstdint>
+#include <limits>
 
 namespace xrpl {
 
-Quality::Quality(std::uint64_t value) : m_value(value)
+Quality::Quality(std::uint64_t value) : value_(value)
 {
 }
 
-Quality::Quality(Amounts const& amount) : m_value(getRate(amount.out, amount.in))
+Quality::Quality(Amounts const& amount) : value_(getRate(amount.out, amount.in))
 {
 }
 
 Quality&
 Quality::operator++()
 {
-    XRPL_ASSERT(m_value > 0, "xrpl::Quality::operator++() : minimum value");
-    --m_value;
+    XRPL_ASSERT(value_ > 0, "xrpl::Quality::operator++() : minimum value");
+    --value_;
     return *this;
 }
 
@@ -36,9 +38,9 @@ Quality&
 Quality::operator--()
 {
     XRPL_ASSERT(
-        m_value < std::numeric_limits<value_type>::max(),
+        value_ < std::numeric_limits<value_type>::max(),
         "xrpl::Quality::operator--() : maximum value");
-    ++m_value;
+    ++value_;
     return *this;
 }
 
@@ -52,7 +54,7 @@ Quality::operator--(int)
 
 template <STAmount (*DivRoundFunc)(STAmount const&, STAmount const&, Asset const&, bool)>
 static Amounts
-ceil_in_impl(Amounts const& amount, STAmount const& limit, bool roundUp, Quality const& quality)
+ceilInImpl(Amounts const& amount, STAmount const& limit, bool roundUp, Quality const& quality)
 {
     if (amount.in > limit)
     {
@@ -68,20 +70,20 @@ ceil_in_impl(Amounts const& amount, STAmount const& limit, bool roundUp, Quality
 }
 
 Amounts
-Quality::ceil_in(Amounts const& amount, STAmount const& limit) const
+Quality::ceilIn(Amounts const& amount, STAmount const& limit) const
 {
-    return ceil_in_impl<divRound>(amount, limit, /* roundUp */ true, *this);
+    return ceilInImpl<divRound>(amount, limit, /* roundUp */ true, *this);
 }
 
 Amounts
-Quality::ceil_in_strict(Amounts const& amount, STAmount const& limit, bool roundUp) const
+Quality::ceilInStrict(Amounts const& amount, STAmount const& limit, bool roundUp) const
 {
-    return ceil_in_impl<divRoundStrict>(amount, limit, roundUp, *this);
+    return ceilInImpl<divRoundStrict>(amount, limit, roundUp, *this);
 }
 
 template <STAmount (*MulRoundFunc)(STAmount const&, STAmount const&, Asset const&, bool)>
 static Amounts
-ceil_out_impl(Amounts const& amount, STAmount const& limit, bool roundUp, Quality const& quality)
+ceilOutImpl(Amounts const& amount, STAmount const& limit, bool roundUp, Quality const& quality)
 {
     if (amount.out > limit)
     {
@@ -97,43 +99,42 @@ ceil_out_impl(Amounts const& amount, STAmount const& limit, bool roundUp, Qualit
 }
 
 Amounts
-Quality::ceil_out(Amounts const& amount, STAmount const& limit) const
+Quality::ceilOut(Amounts const& amount, STAmount const& limit) const
 {
-    return ceil_out_impl<mulRound>(amount, limit, /* roundUp */ true, *this);
+    return ceilOutImpl<mulRound>(amount, limit, /* roundUp */ true, *this);
 }
 
 Amounts
-Quality::ceil_out_strict(Amounts const& amount, STAmount const& limit, bool roundUp) const
+Quality::ceilOutStrict(Amounts const& amount, STAmount const& limit, bool roundUp) const
 {
-    return ceil_out_impl<mulRoundStrict>(amount, limit, roundUp, *this);
+    return ceilOutImpl<mulRoundStrict>(amount, limit, roundUp, *this);
 }
 
 Quality
-composed_quality(Quality const& lhs, Quality const& rhs)
+composedQuality(Quality const& lhs, Quality const& rhs)
 {
-    STAmount const lhs_rate(lhs.rate());
-    XRPL_ASSERT(lhs_rate != beast::zero, "xrpl::composed_quality : nonzero left input");
+    STAmount const lhsRate(lhs.rate());
+    XRPL_ASSERT(lhsRate != beast::kZERO, "xrpl::composed_quality : nonzero left input");
 
-    STAmount const rhs_rate(rhs.rate());
-    XRPL_ASSERT(rhs_rate != beast::zero, "xrpl::composed_quality : nonzero right input");
+    STAmount const rhsRate(rhs.rate());
+    XRPL_ASSERT(rhsRate != beast::kZERO, "xrpl::composed_quality : nonzero right input");
 
-    STAmount const rate(mulRound(lhs_rate, rhs_rate, lhs_rate.asset(), true));
+    STAmount const rate(mulRound(lhsRate, rhsRate, lhsRate.asset(), true));
 
-    std::uint64_t const stored_exponent(rate.exponent() + 100);
-    std::uint64_t const stored_mantissa(rate.mantissa());
+    std::uint64_t const storedExponent(rate.exponent() + 100);
+    std::uint64_t const storedMantissa(rate.mantissa());
 
     XRPL_ASSERT(
-        (stored_exponent > 0) && (stored_exponent <= 255),
-        "xrpl::composed_quality : valid exponent");
+        (storedExponent > 0) && (storedExponent <= 255), "xrpl::composed_quality : valid exponent");
 
-    return Quality((stored_exponent << (64 - 8)) | stored_mantissa);
+    return Quality((storedExponent << (64 - 8)) | storedMantissa);
 }
 
 Quality
 Quality::round(int digits) const
 {
     // Modulus for mantissa
-    static std::uint64_t const mod[17] = {
+    static std::uint64_t const kMOD[17] = {
         /* 0 */ 10000000000000000,
         /* 1 */ 1000000000000000,
         /* 2 */ 100000000000000,
@@ -153,10 +154,10 @@ Quality::round(int digits) const
         /* 16 */ 1,
     };
 
-    auto exponent = m_value >> (64 - 8);
-    auto mantissa = m_value & 0x00ffffffffffffffULL;
-    mantissa += mod[digits] - 1;
-    mantissa -= (mantissa % mod[digits]);
+    auto exponent = value_ >> (64 - 8);
+    auto mantissa = value_ & 0x00ffffffffffffffULL;
+    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 b460eb212f..2e9eb5745a 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::zero)
+    if (quality.rate() <= beast::kZERO)
         Throw<std::runtime_error>("QualityFunction quality rate is 0.");
     b_ = 1 / quality.rate();
 }
@@ -30,9 +30,9 @@ QualityFunction::combine(QualityFunction const& qf)
 std::optional<Number>
 QualityFunction::outFromAvgQ(Quality const& quality)
 {
-    if (m_ != 0 && quality.rate() != beast::zero)
+    if (m_ != 0 && quality.rate() != beast::kZERO)
     {
-        saveNumberRoundMode const rm(Number::setround(Number::rounding_mode::upward));
+        SaveNumberRoundMode const rm(Number::setround(Number::RoundingMode::Upward));
         auto const out = (1 / quality.rate() - b_) / m_;
         if (out <= 0)
             return std::nullopt;
diff --git a/src/libxrpl/protocol/RPCErr.cpp b/src/libxrpl/protocol/RPCErr.cpp
index 99836f5e0f..66aef1470c 100644
--- a/src/libxrpl/protocol/RPCErr.cpp
+++ b/src/libxrpl/protocol/RPCErr.cpp
@@ -9,17 +9,17 @@ namespace xrpl {
 struct RPCErr;
 
 // VFALCO NOTE Deprecated function
-Json::Value
-rpcError(error_code_i iError)
+json::Value
+rpcError(ErrorCodeI iError)
 {
-    Json::Value jvResult(Json::objectValue);
-    RPC::inject_error(iError, jvResult);
+    json::Value jvResult(json::ObjectValue);
+    RPC::injectError(iError, jvResult);
     return jvResult;
 }
 
 // VFALCO NOTE Deprecated function
 bool
-isRpcError(Json::Value jvResult)
+isRpcError(json::Value jvResult)
 {
     return jvResult.isObject() && jvResult.isMember(jss::error);
 }
diff --git a/src/libxrpl/protocol/Rate2.cpp b/src/libxrpl/protocol/Rate2.cpp
index 490474fdb1..27b17068e3 100644
--- a/src/libxrpl/protocol/Rate2.cpp
+++ b/src/libxrpl/protocol/Rate2.cpp
@@ -9,12 +9,12 @@
 
 namespace xrpl {
 
-Rate const parityRate(QUALITY_ONE);
+Rate const kPARITY_RATE(QUALITY_ONE);
 
 namespace detail {
 
 STAmount
-as_amount(Rate const& rate)
+asAmount(Rate const& rate)
 {
     return {noIssue(), rate.value, -9, false};
 }
@@ -35,10 +35,10 @@ multiply(STAmount const& amount, Rate const& rate)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiply : nonzero rate input");
 
-    if (rate == parityRate)
+    if (rate == kPARITY_RATE)
         return amount;
 
-    return multiply(amount, detail::as_amount(rate), amount.asset());
+    return multiply(amount, detail::asAmount(rate), amount.asset());
 }
 
 STAmount
@@ -46,10 +46,10 @@ multiplyRound(STAmount const& amount, Rate const& rate, bool roundUp)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiplyRound : nonzero rate input");
 
-    if (rate == parityRate)
+    if (rate == kPARITY_RATE)
         return amount;
 
-    return mulRound(amount, detail::as_amount(rate), amount.asset(), roundUp);
+    return mulRound(amount, detail::asAmount(rate), amount.asset(), roundUp);
 }
 
 STAmount
@@ -57,12 +57,12 @@ multiplyRound(STAmount const& amount, Rate const& rate, Asset const& asset, bool
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::multiplyRound(Issue) : nonzero rate input");
 
-    if (rate == parityRate)
+    if (rate == kPARITY_RATE)
     {
         return amount;
     }
 
-    return mulRound(amount, detail::as_amount(rate), asset, roundUp);
+    return mulRound(amount, detail::asAmount(rate), asset, roundUp);
 }
 
 STAmount
@@ -70,10 +70,10 @@ divide(STAmount const& amount, Rate const& rate)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::divide : nonzero rate input");
 
-    if (rate == parityRate)
+    if (rate == kPARITY_RATE)
         return amount;
 
-    return divide(amount, detail::as_amount(rate), amount.asset());
+    return divide(amount, detail::asAmount(rate), amount.asset());
 }
 
 STAmount
@@ -81,10 +81,10 @@ divideRound(STAmount const& amount, Rate const& rate, bool roundUp)
 {
     XRPL_ASSERT(rate.value, "xrpl::nft::divideRound : nonzero rate input");
 
-    if (rate == parityRate)
+    if (rate == kPARITY_RATE)
         return amount;
 
-    return divRound(amount, detail::as_amount(rate), amount.asset(), roundUp);
+    return divRound(amount, detail::asAmount(rate), amount.asset(), roundUp);
 }
 
 STAmount
@@ -92,10 +92,10 @@ 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 == parityRate)
+    if (rate == kPARITY_RATE)
         return amount;
 
-    return divRound(amount, detail::as_amount(rate), asset, roundUp);
+    return divRound(amount, detail::asAmount(rate), asset, roundUp);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/Rules.cpp b/src/libxrpl/protocol/Rules.cpp
index cf261a631b..2c971749b6 100644
--- a/src/libxrpl/protocol/Rules.cpp
+++ b/src/libxrpl/protocol/Rules.cpp
@@ -21,8 +21,8 @@ namespace {
 LocalValue<std::optional<Rules>>&
 getCurrentTransactionRulesRef()
 {
-    static LocalValue<std::optional<Rules>> r;
-    return r;
+    static LocalValue<std::optional<Rules>> kR;
+    return kR;
 }
 }  // namespace
 
@@ -41,8 +41,8 @@ setCurrentTransactionRules(std::optional<Rules> r)
     bool const enableLargeNumbers =
         !r || (r->enabled(featureSingleAssetVault) || r->enabled(featureLendingProtocol));
     Number::setMantissaScale(
-        enableLargeNumbers ? MantissaRange::mantissa_scale::large
-                           : MantissaRange::mantissa_scale::small);
+        enableLargeNumbers ? MantissaRange::MantissaScale::Large
+                           : MantissaRange::MantissaScale::Small);
 
     *getCurrentTransactionRulesRef() = std::move(r);
 }
@@ -50,17 +50,17 @@ setCurrentTransactionRules(std::optional<Rules> r)
 class Rules::Impl
 {
 private:
-    std::unordered_set<uint256, hardened_hash<>> set_;
+    std::unordered_set<uint256, HardenedHash<>> set_;
     std::optional<uint256> digest_;
-    std::unordered_set<uint256, beast::uhash<>> const& presets_;
+    std::unordered_set<uint256, beast::Uhash<>> const& presets_;
 
 public:
-    explicit Impl(std::unordered_set<uint256, beast::uhash<>> const& presets) : presets_(presets)
+    explicit Impl(std::unordered_set<uint256, beast::Uhash<>> const& presets) : presets_(presets)
     {
     }
 
     Impl(
-        std::unordered_set<uint256, beast::uhash<>> const& presets,
+        std::unordered_set<uint256, beast::Uhash<>> const& presets,
         std::optional<uint256> const& digest,
         STVector256 const& amendments)
         : digest_(digest), presets_(presets)
@@ -69,7 +69,7 @@ public:
         set_.insert(amendments.begin(), amendments.end());
     }
 
-    [[nodiscard]] std::unordered_set<uint256, beast::uhash<>> const&
+    [[nodiscard]] std::unordered_set<uint256, beast::Uhash<>> const&
     presets() const
     {
         return presets_;
@@ -98,20 +98,20 @@ public:
     }
 };
 
-Rules::Rules(std::unordered_set<uint256, beast::uhash<>> const& presets)
+Rules::Rules(std::unordered_set<uint256, beast::Uhash<>> const& presets)
     : impl_(std::make_shared<Impl>(presets))
 {
 }
 
 Rules::Rules(
-    std::unordered_set<uint256, beast::uhash<>> const& presets,
+    std::unordered_set<uint256, beast::Uhash<>> const& presets,
     std::optional<uint256> const& digest,
     STVector256 const& amendments)
     : impl_(std::make_shared<Impl>(presets, digest, amendments))
 {
 }
 
-std::unordered_set<uint256, beast::uhash<>> const&
+std::unordered_set<uint256, beast::Uhash<>> const&
 Rules::presets() const
 {
     return impl_->presets();
diff --git a/src/libxrpl/protocol/SField.cpp b/src/libxrpl/protocol/SField.cpp
index fd6d39bbb0..4193bb3e27 100644
--- a/src/libxrpl/protocol/SField.cpp
+++ b/src/libxrpl/protocol/SField.cpp
@@ -8,22 +8,22 @@
 namespace xrpl {
 
 // Storage for static const members.
-SField::IsSigning const SField::notSigning;
+SField::IsSigning const SField::kNOT_SIGNING;
 int SField::num = 0;
 std::unordered_map<int, SField const*> SField::knownCodeToField;
 std::unordered_map<std::string, SField const*> SField::knownNameToField;
 
 // Give only this translation unit permission to construct SFields
-struct SField::private_access_tag_t
+struct SField::PrivateAccessTagT
 {
-    explicit private_access_tag_t() = default;
+    explicit PrivateAccessTagT() = default;
 };
 
-static SField::private_access_tag_t access;
+static SField::PrivateAccessTagT access;
 
 template <class T>
 template <class... Args>
-TypedField<T>::TypedField(private_access_tag_t pat, Args&&... args)
+TypedField<T>::TypedField(PrivateAccessTagT pat, Args&&... args)
     : SField(pat, std::forward<Args>(args)...)
 {
 }
@@ -53,12 +53,12 @@ TypedField<T>::TypedField(private_access_tag_t pat, Args&&... args)
         ##__VA_ARGS__);
 
 // SFields which, for historical reasons, do not follow naming conventions.
-SField const sfInvalid(access, -1, "");
-SField const sfGeneric(access, 0, "Generic");
+SField const kSF_INVALID(access, -1, "");
+SField const kSF_GENERIC(access, 0, "Generic");
 // The following two fields aren't used anywhere, but they break tests/have
 // downstream effects.
-SField const sfHash(access, STI_UINT256, 257, "hash");
-SField const sfIndex(access, STI_UINT256, 258, "index");
+SField const kSF_HASH(access, STI_UINT256, 257, "hash");
+SField const kSF_INDEX(access, STI_UINT256, 258, "index");
 
 #include <xrpl/protocol/detail/sfields.macro>
 
@@ -68,13 +68,13 @@ SField const sfIndex(access, STI_UINT256, 258, "index");
 #pragma pop_macro("UNTYPED_SFIELD")
 
 SField::SField(
-    private_access_tag_t,
+    PrivateAccessTagT,
     SerializedTypeID tid,
     int fv,
     char const* fn,
     int meta,
     IsSigning signing)
-    : fieldCode(field_code(tid, fv))
+    : fieldCodeMem(fieldCode(tid, fv))
     , fieldType(tid)
     , fieldValue(fv)
     , fieldName(fn)
@@ -84,30 +84,31 @@ SField::SField(
     , jsonName(fieldName.c_str())
 {
     XRPL_ASSERT(
-        !knownCodeToField.contains(fieldCode),
+        !knownCodeToField.contains(fieldCodeMem),
         "xrpl::SField::SField(tid,fv,fn,meta,signing) : fieldCode is unique");
     XRPL_ASSERT(
         !knownNameToField.contains(fieldName),
         "xrpl::SField::SField(tid,fv,fn,meta,signing) : fieldName is unique");
-    knownCodeToField[fieldCode] = this;
+    knownCodeToField[fieldCodeMem] = this;
     knownNameToField[fieldName] = this;
 }
 
-SField::SField(private_access_tag_t, int fc, char const* fn)
-    : fieldCode(fc)
+SField::SField(PrivateAccessTagT, int fc, char const* fn)
+    : fieldCodeMem(fc)
     , fieldType(STI_UNKNOWN)
     , fieldValue(0)
     , fieldName(fn)
-    , fieldMeta(sMD_Never)
+    , fieldMeta(SMdNever)
     , fieldNum(++num)
-    , signingField(IsSigning::yes)
+    , signingField(IsSigning::Yes)
     , jsonName(fieldName.c_str())
 {
     XRPL_ASSERT(
-        !knownCodeToField.contains(fieldCode), "xrpl::SField::SField(fc,fn) : fieldCode is unique");
+        !knownCodeToField.contains(fieldCodeMem),
+        "xrpl::SField::SField(fc,fn) : fieldCode is unique");
     XRPL_ASSERT(
         !knownNameToField.contains(fieldName), "xrpl::SField::SField(fc,fn) : fieldName is unique");
-    knownCodeToField[fieldCode] = this;
+    knownCodeToField[fieldCodeMem] = this;
     knownNameToField[fieldName] = this;
 }
 
@@ -120,20 +121,20 @@ SField::getField(int code)
     {
         return *(it->second);
     }
-    return sfInvalid;
+    return kSF_INVALID;
 }
 
 int
 SField::compare(SField const& f1, SField const& f2)
 {
     // -1 = f1 comes before f2, 0 = illegal combination, 1 = f1 comes after f2
-    if ((f1.fieldCode <= 0) || (f2.fieldCode <= 0))
+    if ((f1.fieldCodeMem <= 0) || (f2.fieldCodeMem <= 0))
         return 0;
 
-    if (f1.fieldCode < f2.fieldCode)
+    if (f1.fieldCodeMem < f2.fieldCodeMem)
         return -1;
 
-    if (f2.fieldCode < f1.fieldCode)
+    if (f2.fieldCodeMem < f1.fieldCodeMem)
         return 1;
 
     return 0;
@@ -148,7 +149,7 @@ SField::getField(std::string const& fieldName)
     {
         return *(it->second);
     }
-    return sfInvalid;
+    return kSF_INVALID;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STAccount.cpp b/src/libxrpl/protocol/STAccount.cpp
index 4266b55c98..f561c9f930 100644
--- a/src/libxrpl/protocol/STAccount.cpp
+++ b/src/libxrpl/protocol/STAccount.cpp
@@ -17,11 +17,11 @@
 
 namespace xrpl {
 
-STAccount::STAccount() : value_(beast::zero), default_(true)
+STAccount::STAccount() : value_(beast::kZERO), default_(true)
 {
 }
 
-STAccount::STAccount(SField const& n) : STBase(n), value_(beast::zero), 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::bytes)
+    if (v.size() != uint160::kBYTES)
         Throw<std::runtime_error>("Invalid STAccount size");
 
     default_ = false;
-    memcpy(value_.begin(), v.data(), uint160::bytes);
+    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::bytes;
+    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 654bcf1be4..25857d387e 100644
--- a/src/libxrpl/protocol/STAmount.cpp
+++ b/src/libxrpl/protocol/STAmount.cpp
@@ -47,9 +47,9 @@
 
 namespace xrpl {
 
-static std::uint64_t const tenTo14 = 100000000000000ull;
-static std::uint64_t const tenTo14m1 = tenTo14 - 1;
-static std::uint64_t const tenTo17 = tenTo14 * 1000;
+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::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 (is_issue_v<TIss1> && is_issue_v<TIss2>)
+            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
             {
                 return v1.native() == v2.native() && issue1.currency == issue2.currency;
             }
-            else if constexpr (is_mptissue_v<TIss1> && is_mptissue_v<TIss2>)
+            else if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
             {
                 return issue1 == issue2;
             }
@@ -105,32 +105,32 @@ areComparable(STAmount const& v1, STAmount const& v2)
         v2.asset().value());
 }
 
-static_assert(INITIAL_XRP.drops() == STAmount::cMaxNativeN);
+static_assert(kINITIAL_XRP.drops() == STAmount::kMAX_NATIVE_N);
 
 STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
 {
     std::uint64_t value = sit.get64();
 
     // native or MPT
-    if ((value & cIssuedCurrency) == 0)
+    if ((value & kISSUED_CURRENCY) == 0)
     {
-        if ((value & cMPToken) != 0)
+        if ((value & kMP_TOKEN) != 0)
         {
             // is MPT
-            mOffset = 0;
-            mIsNegative = (value & cPositive) == 0;
-            mValue = (value << 8) | sit.get8();
-            mAsset = sit.get192();
+            offset_ = 0;
+            isNegative_ = (value & kPOSITIVE) == 0;
+            value_ = (value << 8) | sit.get8();
+            asset_ = sit.get192();
             return;
         }
         // else is XRP
-        mAsset = xrpIssue();
+        asset_ = xrpIssue();
         // positive
-        if ((value & cPositive) != 0)
+        if ((value & kPOSITIVE) != 0)
         {
-            mValue = value & cValueMask;
-            mOffset = 0;
-            mIsNegative = false;
+            value_ = value & kVALUE_MASK;
+            offset_ = 0;
+            isNegative_ = false;
             return;
         }
 
@@ -138,9 +138,9 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
         if (value == 0)
             Throw<std::runtime_error>("negative zero is not canonical");
 
-        mValue = value & cValueMask;
-        mOffset = 0;
-        mIsNegative = true;
+        value_ = value & kVALUE_MASK;
+        offset_ = 0;
+        isNegative_ = true;
         return;
     }
 
@@ -165,15 +165,16 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
         bool const isNegative = (offset & 256) == 0;
         offset = (offset & 255) - 97;  // center the range
 
-        if (value < cMinValue || value > cMaxValue || offset < cMinOffset || offset > cMaxOffset)
+        if (value < kMIN_VALUE || value > kMAX_VALUE || offset < kMIN_OFFSET ||
+            offset > kMAX_OFFSET)
         {
             Throw<std::runtime_error>("invalid currency value");
         }
 
-        mAsset = issue;
-        mValue = value;
-        mOffset = offset;
-        mIsNegative = isNegative;
+        asset_ = issue;
+        value_ = value;
+        offset_ = offset;
+        isNegative_ = isNegative;
         canonicalize();
         return;
     }
@@ -181,37 +182,37 @@ STAmount::STAmount(SerialIter& sit, SField const& name) : STBase(name)
     if (offset != 512)
         Throw<std::runtime_error>("invalid currency value");
 
-    mAsset = issue;
-    mValue = 0;
-    mOffset = 0;
-    mIsNegative = false;
+    asset_ = issue;
+    value_ = 0;
+    offset_ = 0;
+    isNegative_ = false;
     canonicalize();
 }
 
 STAmount::STAmount(SField const& name, std::int64_t mantissa)
-    : STBase(name), mAsset(xrpIssue()), mOffset(0)
+    : STBase(name), asset_(xrpIssue()), offset_(0)
 {
     set(mantissa);
 }
 
 STAmount::STAmount(SField const& name, std::uint64_t mantissa, bool negative)
-    : STBase(name), mAsset(xrpIssue()), mValue(mantissa), mOffset(0), mIsNegative(negative)
+    : STBase(name), asset_(xrpIssue()), value_(mantissa), offset_(0), isNegative_(negative)
 {
     XRPL_ASSERT(
-        mValue <= std::numeric_limits<std::int64_t>::max(),
+        value_ <= std::numeric_limits<std::int64_t>::max(),
         "xrpl::STAmount::STAmount(SField, std::uint64_t, bool) : maximum "
         "mantissa input");
 }
 
 STAmount::STAmount(SField const& name, STAmount const& from)
     : STBase(name)
-    , mAsset(from.mAsset)
-    , mValue(from.mValue)
-    , mOffset(from.mOffset)
-    , mIsNegative(from.mIsNegative)
+    , asset_(from.asset_)
+    , value_(from.value_)
+    , offset_(from.offset_)
+    , isNegative_(from.isNegative_)
 {
     XRPL_ASSERT(
-        mValue <= std::numeric_limits<std::int64_t>::max(),
+        value_ <= std::numeric_limits<std::int64_t>::max(),
         "xrpl::STAmount::STAmount(SField, STAmount) : maximum input");
     canonicalize();
 }
@@ -219,24 +220,24 @@ STAmount::STAmount(SField const& name, STAmount const& from)
 //------------------------------------------------------------------------------
 
 STAmount::STAmount(std::uint64_t mantissa, bool negative)
-    : mAsset(xrpIssue()), mValue(mantissa), mOffset(0), mIsNegative(mantissa != 0 && negative)
+    : asset_(xrpIssue()), value_(mantissa), offset_(0), isNegative_(mantissa != 0 && negative)
 {
     XRPL_ASSERT(
-        mValue <= std::numeric_limits<std::int64_t>::max(),
+        value_ <= std::numeric_limits<std::int64_t>::max(),
         "xrpl::STAmount::STAmount(std::uint64_t, bool) : maximum mantissa "
         "input");
 }
 
 STAmount::STAmount(XRPAmount const& amount)
-    : mAsset(xrpIssue()), mOffset(0), mIsNegative(amount < beast::zero)
+    : asset_(xrpIssue()), offset_(0), isNegative_(amount < beast::kZERO)
 {
-    if (mIsNegative)
+    if (isNegative_)
     {
-        mValue = unsafe_cast<std::uint64_t>(-amount.drops());
+        value_ = unsafeCast<std::uint64_t>(-amount.drops());
     }
     else
     {
-        mValue = unsafe_cast<std::uint64_t>(amount.drops());
+        value_ = unsafeCast<std::uint64_t>(amount.drops());
     }
 
     canonicalize();
@@ -271,10 +272,10 @@ STAmount::xrp() const
     if (!native())
         Throw<std::logic_error>("Cannot return non-native STAmount as XRPAmount");
 
-    auto drops = static_cast<XRPAmount::value_type>(mValue);
-    XRPL_ASSERT(mOffset == 0, "xrpl::STAmount::xrp : amount is canonical");
+    auto drops = static_cast<XRPAmount::value_type>(value_);
+    XRPL_ASSERT(offset_ == 0, "xrpl::STAmount::xrp : amount is canonical");
 
-    if (mIsNegative)
+    if (isNegative_)
         drops = -drops;
 
     return XRPAmount{drops};
@@ -286,10 +287,10 @@ STAmount::iou() const
     if (integral())
         Throw<std::logic_error>("Cannot return non-IOU STAmount as IOUAmount");
 
-    auto mantissa = static_cast<std::int64_t>(mValue);
-    auto exponent = mOffset;
+    auto mantissa = static_cast<std::int64_t>(value_);
+    auto exponent = offset_;
 
-    if (mIsNegative)
+    if (isNegative_)
         mantissa = -mantissa;
 
     return {mantissa, exponent};
@@ -301,10 +302,10 @@ STAmount::mpt() const
     if (!holds<MPTIssue>())
         Throw<std::logic_error>("Cannot return STAmount as MPTAmount");
 
-    auto value = static_cast<MPTAmount::value_type>(mValue);
-    XRPL_ASSERT(mOffset == 0, "xrpl::STAmount::mpt : amount is canonical");
+    auto value = static_cast<MPTAmount::value_type>(value_);
+    XRPL_ASSERT(offset_ == 0, "xrpl::STAmount::mpt : amount is canonical");
 
-    if (mIsNegative)
+    if (isNegative_)
         value = -value;
 
     return MPTAmount{value};
@@ -314,15 +315,15 @@ STAmount&
 STAmount::operator=(IOUAmount const& iou)
 {
     XRPL_ASSERT(integral() == false, "xrpl::STAmount::operator=(IOUAmount) : is not integral");
-    mOffset = iou.exponent();
-    mIsNegative = iou < beast::zero;
-    if (mIsNegative)
+    offset_ = iou.exponent();
+    isNegative_ = iou < beast::kZERO;
+    if (isNegative_)
     {
-        mValue = static_cast<std::uint64_t>(-iou.mantissa());
+        value_ = static_cast<std::uint64_t>(-iou.mantissa());
     }
     else
     {
-        mValue = static_cast<std::uint64_t>(iou.mantissa());
+        value_ = static_cast<std::uint64_t>(iou.mantissa());
     }
     return *this;
 }
@@ -333,14 +334,14 @@ STAmount::operator=(Number const& number)
     if (!getCurrentTransactionRules() || isFeatureEnabled(featureSingleAssetVault) ||
         isFeatureEnabled(featureLendingProtocol))
     {
-        *this = fromNumber(mAsset, number);
+        *this = fromNumber(asset_, number);
     }
     else
     {
         auto const originalMantissa = number.mantissa();
-        mIsNegative = originalMantissa < 0;
-        mValue = mIsNegative ? -originalMantissa : originalMantissa;
-        mOffset = number.exponent();
+        isNegative_ = originalMantissa < 0;
+        value_ = isNegative_ ? -originalMantissa : originalMantissa;
+        offset_ = number.exponent();
     }
     canonicalize();
     return *this;
@@ -372,10 +373,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::zero)
+    if (v2 == beast::kZERO)
         return v1;
 
-    if (v1 == beast::zero)
+    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()};
@@ -384,7 +385,7 @@ operator+(STAmount const& v1, STAmount const& v2)
     if (v1.native())
         return {v1.getFName(), getSNValue(v1) + getSNValue(v2)};
     if (v1.holds<MPTIssue>())
-        return {v1.mAsset, v1.mpt().value() + v2.mpt().value()};
+        return {v1.asset_, v1.mpt().value() + v2.mpt().value()};
 
     if (getSTNumberSwitchover())
     {
@@ -437,12 +438,12 @@ operator-(STAmount const& v1, STAmount const& v2)
 
 //------------------------------------------------------------------------------
 
-std::uint64_t const STAmount::uRateOne = getRate(STAmount(1), STAmount(1));
+std::uint64_t const STAmount::kU_RATE_ONE = getRate(STAmount(1), STAmount(1));
 
 void
 STAmount::setIssue(Asset const& asset)
 {
-    mAsset = asset;
+    asset_ = asset;
 }
 
 // Convert an offer into an index amount so they sort by rate.
@@ -457,13 +458,13 @@ STAmount::setIssue(Asset const& asset)
 std::uint64_t
 getRate(STAmount const& offerOut, STAmount const& offerIn)
 {
-    if (offerOut == beast::zero)
+    if (offerOut == beast::kZERO)
         return 0;
 
     try
     {
         STAmount const r = divide(offerIn, offerOut, noIssue());
-        if (r == beast::zero)  // offer is too good
+        if (r == beast::kZERO)  // offer is too good
             return 0;
         XRPL_ASSERT(
             (r.exponent() >= -100) && (r.exponent() <= 155),
@@ -504,45 +505,45 @@ canAdd(STAmount const& a, STAmount const& b)
         return false;
 
     // special case: adding anything to zero is always fine
-    if (a == beast::zero || b == beast::zero)
+    if (a == beast::kZERO || b == beast::kZERO)
         return true;
 
     // XRP case (overflow & underflow check)
     if (isXRP(a) && isXRP(b))
     {
-        XRPAmount const A = a.xrp();
-        XRPAmount const B = b.xrp();
+        XRPAmount const aVal = a.xrp();
+        XRPAmount const bVal = b.xrp();
 
         return !(
-            (B > XRPAmount{0} &&
-             A > XRPAmount{std::numeric_limits<XRPAmount::value_type>::max()} - B) ||
-            (B < XRPAmount{0} &&
-             A < XRPAmount{std::numeric_limits<XRPAmount::value_type>::min()} - B));
+            (bVal > XRPAmount{0} &&
+             aVal > XRPAmount{std::numeric_limits<XRPAmount::value_type>::max()} - bVal) ||
+            (bVal < XRPAmount{0} &&
+             aVal < XRPAmount{std::numeric_limits<XRPAmount::value_type>::min()} - bVal));
     }
 
     // IOU case (precision check)
     auto const ret = std::visit(
         [&]<ValidIssueType TIss1, ValidIssueType TIss2>(
             TIss1 const&, TIss2 const&) -> std::optional<bool> {
-            if constexpr (is_issue_v<TIss1> && is_issue_v<TIss2>)
+            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
             {
-                static STAmount const one{IOUAmount{1, 0}, noIssue()};
-                static STAmount const maxLoss{IOUAmount{1, -4}, noIssue()};
-                STAmount const lhs = divide((a - b) + b, a, noIssue()) - one;
-                STAmount const rhs = divide((b - a) + a, b, noIssue()) - one;
-                return ((rhs.negative() ? -rhs : rhs) + (lhs.negative() ? -lhs : lhs)) <= maxLoss;
+                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;
             }
 
             // MPT (overflow & underflow check)
-            if constexpr (is_mptissue_v<TIss1> && is_mptissue_v<TIss2>)
+            if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
             {
-                MPTAmount const A = a.mpt();
-                MPTAmount const B = b.mpt();
+                MPTAmount const aVal = a.mpt();
+                MPTAmount const bVal = b.mpt();
                 return !(
-                    (B > MPTAmount{0} &&
-                     A > MPTAmount{std::numeric_limits<MPTAmount::value_type>::max()} - B) ||
-                    (B < MPTAmount{0} &&
-                     A < MPTAmount{std::numeric_limits<MPTAmount::value_type>::min()} - B));
+                    (bVal > MPTAmount{0} &&
+                     aVal > MPTAmount{std::numeric_limits<MPTAmount::value_type>::max()} - bVal) ||
+                    (bVal < MPTAmount{0} &&
+                     aVal < MPTAmount{std::numeric_limits<MPTAmount::value_type>::min()} - bVal));
             }
             return std::nullopt;
         },
@@ -581,21 +582,21 @@ canSubtract(STAmount const& a, STAmount const& b)
         return false;
 
     // Special case: subtracting zero is always fine
-    if (b == beast::zero)
+    if (b == beast::kZERO)
         return true;
 
     // XRP case (underflow & overflow check)
     if (isXRP(a) && isXRP(b))
     {
-        XRPAmount const A = a.xrp();
-        XRPAmount const B = b.xrp();
+        XRPAmount const aVal = a.xrp();
+        XRPAmount const bVal = b.xrp();
         // Check for underflow
-        if (B > XRPAmount{0} && A < B)
+        if (bVal > XRPAmount{0} && aVal < bVal)
             return false;
 
         // Check for overflow
-        if (B < XRPAmount{0} &&
-            A > XRPAmount{std::numeric_limits<XRPAmount::value_type>::max()} + B)
+        if (bVal < XRPAmount{0} &&
+            aVal > XRPAmount{std::numeric_limits<XRPAmount::value_type>::max()} + bVal)
             return false;
 
         return true;
@@ -605,24 +606,24 @@ 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 (is_issue_v<TIss1> && is_issue_v<TIss2>)
+            if constexpr (kIS_ISSUE_V<TIss1> && kIS_ISSUE_V<TIss2>)
             {
                 return true;
             }
 
             // MPT case (underflow & overflow check)
-            if constexpr (is_mptissue_v<TIss1> && is_mptissue_v<TIss2>)
+            if constexpr (kIS_MPTISSUE_V<TIss1> && kIS_MPTISSUE_V<TIss2>)
             {
-                MPTAmount const A = a.mpt();
-                MPTAmount const B = b.mpt();
+                MPTAmount const aVal = a.mpt();
+                MPTAmount const bVal = b.mpt();
 
                 // Underflow check
-                if (B > MPTAmount{0} && A < B)
+                if (bVal > MPTAmount{0} && aVal < bVal)
                     return false;
 
                 // Overflow check
-                if (B < MPTAmount{0} &&
-                    A > MPTAmount{std::numeric_limits<MPTAmount::value_type>::max()} + B)
+                if (bVal < MPTAmount{0} &&
+                    aVal > MPTAmount{std::numeric_limits<MPTAmount::value_type>::max()} + bVal)
                     return false;
                 return true;
             }
@@ -639,16 +640,16 @@ canSubtract(STAmount const& a, STAmount const& b)
 }
 
 void
-STAmount::setJson(Json::Value& elem) const
+STAmount::setJson(json::Value& elem) const
 {
-    elem = Json::objectValue;
+    elem = json::ObjectValue;
 
     if (!native())
     {
         // It is an error for currency or issuer not to be specified for valid
         // json.
         elem[jss::value] = getText();
-        mAsset.setJson(elem);
+        asset_.setJson(elem);
     }
     else
     {
@@ -674,7 +675,7 @@ STAmount::getFullText() const
     std::string ret;
 
     ret.reserve(64);
-    ret = getText() + "/" + mAsset.getText();
+    ret = getText() + "/" + asset_.getText();
     return ret;
 }
 
@@ -682,94 +683,94 @@ std::string
 STAmount::getText() const
 {
     // keep full internal accuracy, but make more human friendly if possible
-    if (*this == beast::zero)
+    if (*this == beast::kZERO)
         return "0";
 
-    std::string const raw_value(std::to_string(mValue));
+    std::string const rawValue(std::to_string(value_));
     std::string ret;
 
-    if (mIsNegative)
+    if (isNegative_)
         ret.append(1, '-');
 
-    bool const scientific((mOffset != 0) && ((mOffset < -25) || (mOffset > -5)));
+    bool const scientific((offset_ != 0) && ((offset_ < -25) || (offset_ > -5)));
 
-    if (native() || mAsset.holds<MPTIssue>() || scientific)
+    if (native() || asset_.holds<MPTIssue>() || scientific)
     {
-        ret.append(raw_value);
+        ret.append(rawValue);
 
         if (scientific)
         {
             ret.append(1, 'e');
-            ret.append(std::to_string(mOffset));
+            ret.append(std::to_string(offset_));
         }
 
         return ret;
     }
 
-    XRPL_ASSERT(mOffset + 43 > 0, "xrpl::STAmount::getText : minimum offset");
+    XRPL_ASSERT(offset_ + 43 > 0, "xrpl::STAmount::getText : minimum offset");
 
-    size_t const pad_prefix = 27;
-    size_t const pad_suffix = 23;
+    size_t const padPrefix = 27;
+    size_t const padSuffix = 23;
 
     std::string val;
-    val.reserve(raw_value.length() + pad_prefix + pad_suffix);
-    val.append(pad_prefix, '0');
-    val.append(raw_value);
-    val.append(pad_suffix, '0');
+    val.reserve(rawValue.length() + padPrefix + padSuffix);
+    val.append(padPrefix, '0');
+    val.append(rawValue);
+    val.append(padSuffix, '0');
 
-    size_t const offset(mOffset + 43);
+    size_t const offset(offset_ + 43);
 
-    auto pre_from(val.begin());
-    auto const pre_to(val.begin() + offset);
+    auto preFrom(val.begin());
+    auto const preTo(val.begin() + offset);
 
-    auto const post_from(val.begin() + offset);
-    auto post_to(val.end());
+    auto const postFrom(val.begin() + offset);
+    auto postTo(val.end());
 
     // Crop leading zeroes. Take advantage of the fact that there's always a
     // fixed amount of leading zeroes and skip them.
-    if (std::distance(pre_from, pre_to) > pad_prefix)
-        pre_from += pad_prefix;
+    if (std::distance(preFrom, preTo) > padPrefix)
+        preFrom += padPrefix;
 
-    XRPL_ASSERT(post_to >= post_from, "xrpl::STAmount::getText : first distance check");
+    XRPL_ASSERT(postTo >= postFrom, "xrpl::STAmount::getText : first distance check");
 
-    pre_from = std::find_if(pre_from, pre_to, [](char c) { return c != '0'; });
+    preFrom = std::find_if(preFrom, preTo, [](char c) { return c != '0'; });
 
     // Crop trailing zeroes. Take advantage of the fact that there's always a
     // fixed amount of trailing zeroes and skip them.
-    if (std::distance(post_from, post_to) > pad_suffix)
-        post_to -= pad_suffix;
+    if (std::distance(postFrom, postTo) > padSuffix)
+        postTo -= padSuffix;
 
-    XRPL_ASSERT(post_to >= post_from, "xrpl::STAmount::getText : second distance check");
+    XRPL_ASSERT(postTo >= postFrom, "xrpl::STAmount::getText : second distance check");
 
-    post_to = std::find_if(
-                  std::make_reverse_iterator(post_to),
-                  std::make_reverse_iterator(post_from),
-                  [](char c) { return c != '0'; })
-                  .base();
+    postTo = std::find_if(
+                 std::make_reverse_iterator(postTo),
+                 std::make_reverse_iterator(postFrom),
+                 [](char c) { return c != '0'; })
+                 .base();
 
     // Assemble the output:
-    if (pre_from == pre_to)
+    if (preFrom == preTo)
     {
         ret.append(1, '0');
     }
     else
     {
-        ret.append(pre_from, pre_to);
+        ret.append(preFrom, preTo);
     }
 
-    if (post_to != post_from)
+    if (postTo != postFrom)
     {
         ret.append(1, '.');
-        ret.append(post_from, post_to);
+        ret.append(postFrom, postTo);
     }
 
     return ret;
 }
 
-Json::Value
+json::Value
 STAmount::getJson(JsonOptions) const
 {
-    Json::Value elem;
+    json::Value elem;
     setJson(elem);
     return elem;
 }
@@ -777,44 +778,44 @@ STAmount::getJson(JsonOptions) const
 void
 STAmount::add(Serializer& s) const
 {
-    mAsset.visit(
+    asset_.visit(
         [&](MPTIssue const& issue) {
-            auto u8 = static_cast<unsigned char>(cMPToken >> 56);
-            if (!mIsNegative)
-                u8 |= static_cast<unsigned char>(cPositive >> 56);
+            auto u8 = static_cast<unsigned char>(kMP_TOKEN >> 56);
+            if (!isNegative_)
+                u8 |= static_cast<unsigned char>(kPOSITIVE >> 56);
             s.add8(u8);
-            s.add64(mValue);
+            s.add64(value_);
             s.addBitString(issue.getMptID());
         },
         [&](Issue const& issue) {
             if (native())
             {
-                XRPL_ASSERT(mOffset == 0, "xrpl::STAmount::add : zero offset");
+                XRPL_ASSERT(offset_ == 0, "xrpl::STAmount::add : zero offset");
 
-                if (!mIsNegative)
+                if (!isNegative_)
                 {
-                    s.add64(mValue | cPositive);
+                    s.add64(value_ | kPOSITIVE);
                 }
                 else
                 {
-                    s.add64(mValue);
+                    s.add64(value_);
                 }
             }
             else
             {
-                if (*this == beast::zero)
+                if (*this == beast::kZERO)
                 {
-                    s.add64(cIssuedCurrency);
+                    s.add64(kISSUED_CURRENCY);
                 }
-                else if (mIsNegative)  // 512 = not native
+                else if (isNegative_)  // 512 = not native
                 {
-                    s.add64(mValue | (static_cast<std::uint64_t>(mOffset + 512 + 97) << (64 - 10)));
+                    s.add64(value_ | (static_cast<std::uint64_t>(offset_ + 512 + 97) << (64 - 10)));
                 }
                 else  // 256 = positive
                 {
                     s.add64(
-                        mValue |
-                        (static_cast<std::uint64_t>(mOffset + 512 + 256 + 97) << (64 - 10)));
+                        value_ |
+                        (static_cast<std::uint64_t>(offset_ + 512 + 256 + 97) << (64 - 10)));
                 }
                 s.addBitString(issue.currency);
                 s.addBitString(issue.account);
@@ -832,27 +833,27 @@ STAmount::isEquivalent(STBase const& t) const
 bool
 STAmount::isDefault() const
 {
-    return (mValue == 0) && native();
+    return (value_ == 0) && native();
 }
 
 //------------------------------------------------------------------------------
 
-// amount = mValue * [10 ^ mOffset]
+// amount = value_ * [10 ^ offset_]
 // Representation range is 10^80 - 10^(-80).
 //
 // On the wire:
 // - high bit is 0 for XRP, 1 for issued currency
 // - next bit is 1 for positive, 0 for negative (except 0 issued currency, which
 //      is a special case of 0x8000000000000000
-// - for issued currencies, the next 8 bits are (mOffset+97).
+// - for issued currencies, the next 8 bits are (offset_+97).
 //   The +97 is so that this value is always positive.
 // - The remaining bits are significant digits (mantissa)
 //   That's 54 bits for issued currency and 62 bits for native
 //   (but XRP only needs 57 bits for the max value of 10^17 drops)
 //
-// mValue is zero if the amount is zero, otherwise it's within the range
+// value_ is zero if the amount is zero, otherwise it's within the range
 //    10^15 to (10^16 - 1) inclusive.
-// mOffset is in the range -96 to +80.
+// offset_ is in the range -96 to +80.
 void
 STAmount::canonicalize()
 {
@@ -860,34 +861,34 @@ STAmount::canonicalize()
     {
         // native and MPT currency amounts should always have an offset of zero
         // log(2^64,10) ~ 19.2
-        if (mValue == 0 || mOffset <= -20)
+        if (value_ == 0 || offset_ <= -20)
         {
-            mValue = 0;
-            mOffset = 0;
-            mIsNegative = false;
+            value_ = 0;
+            offset_ = 0;
+            isNegative_ = false;
             return;
         }
 
         // log(cMaxNativeN, 10) == 17
-        if (native() && mOffset > 17)
+        if (native() && offset_ > 17)
             Throw<std::runtime_error>("Native currency amount out of range");
         // log(maxMPTokenAmount, 10) ~ 18.96
-        if (mAsset.holds<MPTIssue>() && mOffset > 18)
+        if (asset_.holds<MPTIssue>() && offset_ > 18)
             Throw<std::runtime_error>("MPT amount out of range");
 
         if (getSTNumberSwitchover())
         {
-            Number const num(mIsNegative, mValue, mOffset, Number::unchecked{});
+            Number const num(isNegative_, value_, offset_, Number::Unchecked{});
             auto set = [&](auto const& val) {
                 auto const value = val.value();
-                mIsNegative = value < 0;
-                mValue = mIsNegative ? -value : value;
+                isNegative_ = value < 0;
+                value_ = isNegative_ ? -value : value;
             };
             if (native())
             {
                 set(XRPAmount{num});
             }
-            else if (mAsset.holds<MPTIssue>())
+            else if (asset_.holds<MPTIssue>())
             {
                 set(MPTAmount{num});
             }
@@ -895,39 +896,39 @@ STAmount::canonicalize()
             {
                 Throw<std::runtime_error>("Unknown integral asset type");
             }
-            mOffset = 0;
+            offset_ = 0;
         }
         else
         {
-            while (mOffset < 0)
+            while (offset_ < 0)
             {
-                mValue /= 10;
-                ++mOffset;
+                value_ /= 10;
+                ++offset_;
             }
 
-            while (mOffset > 0)
+            while (offset_ > 0)
             {
                 // N.B. do not move the overflow check to after the
                 // multiplication
-                if (native() && mValue > cMaxNativeN)
+                if (native() && value_ > kMAX_NATIVE_N)
                 {
                     Throw<std::runtime_error>("Native currency amount out of range");
                 }
-                else if (!native() && mValue > maxMPTokenAmount)
+                else if (!native() && value_ > kMAX_MP_TOKEN_AMOUNT)
                 {
                     Throw<std::runtime_error>("MPT amount out of range");
                 }
 
-                mValue *= 10;
-                --mOffset;
+                value_ *= 10;
+                --offset_;
             }
         }
 
-        if (native() && mValue > cMaxNativeN)
+        if (native() && value_ > kMAX_NATIVE_N)
         {
             Throw<std::runtime_error>("Native currency amount out of range");
         }
-        else if (!native() && mValue > maxMPTokenAmount)
+        else if (!native() && value_ > kMAX_MP_TOKEN_AMOUNT)
         {
             Throw<std::runtime_error>("MPT amount out of range");
         }
@@ -941,47 +942,47 @@ STAmount::canonicalize()
         return;
     }
 
-    if (mValue == 0)
+    if (value_ == 0)
     {
-        mOffset = -100;
-        mIsNegative = false;
+        offset_ = -100;
+        isNegative_ = false;
         return;
     }
 
-    while ((mValue < cMinValue) && (mOffset > cMinOffset))
+    while ((value_ < kMIN_VALUE) && (offset_ > kMIN_OFFSET))
     {
-        mValue *= 10;
-        --mOffset;
+        value_ *= 10;
+        --offset_;
     }
 
-    while (mValue > cMaxValue)
+    while (value_ > kMAX_VALUE)
     {
-        if (mOffset >= cMaxOffset)
+        if (offset_ >= kMAX_OFFSET)
             Throw<std::runtime_error>("value overflow");
 
-        mValue /= 10;
-        ++mOffset;
+        value_ /= 10;
+        ++offset_;
     }
 
-    if ((mOffset < cMinOffset) || (mValue < cMinValue))
+    if ((offset_ < kMIN_OFFSET) || (value_ < kMIN_VALUE))
     {
-        mValue = 0;
-        mIsNegative = false;
-        mOffset = -100;
+        value_ = 0;
+        isNegative_ = false;
+        offset_ = -100;
         return;
     }
 
-    if (mOffset > cMaxOffset)
+    if (offset_ > kMAX_OFFSET)
         Throw<std::runtime_error>("value overflow");
 
     XRPL_ASSERT(
-        (mValue == 0) || ((mValue >= cMinValue) && (mValue <= cMaxValue)),
+        (value_ == 0) || ((value_ >= kMIN_VALUE) && (value_ <= kMAX_VALUE)),
         "xrpl::STAmount::canonicalize : value inside range");
     XRPL_ASSERT(
-        (mValue == 0) || ((mOffset >= cMinOffset) && (mOffset <= cMaxOffset)),
+        (value_ == 0) || ((offset_ >= kMIN_OFFSET) && (offset_ <= kMAX_OFFSET)),
         "xrpl::STAmount::canonicalize : offset inside range");
     XRPL_ASSERT(
-        (mValue != 0) || (mOffset != -100), "xrpl::STAmount::canonicalize : value or offset set");
+        (value_ != 0) || (offset_ != -100), "xrpl::STAmount::canonicalize : value or offset set");
 }
 
 void
@@ -989,13 +990,13 @@ STAmount::set(std::int64_t v)
 {
     if (v < 0)
     {
-        mIsNegative = true;
-        mValue = static_cast<std::uint64_t>(-v);
+        isNegative_ = true;
+        value_ = static_cast<std::uint64_t>(-v);
     }
     else
     {
-        mIsNegative = false;
-        mValue = static_cast<std::uint64_t>(v);
+        isNegative_ = false;
+        value_ = static_cast<std::uint64_t>(v);
     }
 }
 
@@ -1023,13 +1024,13 @@ amountFromString(Asset const& asset, std::string const& amount)
 }
 
 STAmount
-amountFromJson(SField const& name, Json::Value const& v)
+amountFromJson(SField const& name, json::Value const& v)
 {
     Asset asset;
 
-    Json::Value value;
-    Json::Value currencyOrMPTID;
-    Json::Value issuer;
+    json::Value value;
+    json::Value currencyOrMPTID;
+    json::Value issuer;
     bool isMPT = false;
 
     if (v.isNull())
@@ -1055,9 +1056,9 @@ amountFromJson(SField const& name, Json::Value const& v)
     }
     else if (v.isArray())
     {
-        value = v.get(Json::UInt(0), 0);
-        currencyOrMPTID = v.get(Json::UInt(1), Json::nullValue);
-        issuer = v.get(Json::UInt(2), Json::nullValue);
+        value = v.get(json::UInt(0), 0);
+        currencyOrMPTID = v.get(json::UInt(1), json::NullValue);
+        issuer = v.get(json::UInt(2), json::NullValue);
     }
     else if (v.isString())
     {
@@ -1103,9 +1104,9 @@ amountFromJson(SField const& name, Json::Value const& v)
         else
         {
             Issue issue;
-            if (!to_currency(issue.currency, currencyOrMPTID.asString()))
+            if (!toCurrency(issue.currency, currencyOrMPTID.asString()))
                 Throw<std::runtime_error>("invalid currency");
-            if (!issuer.isString() || !to_issuer(issue.account, issuer.asString()))
+            if (!issuer.isString() || !toIssuer(issue.account, issuer.asString()))
                 Throw<std::runtime_error>("invalid issuer");
             if (issue.native())
                 Throw<std::runtime_error>("invalid issuer");
@@ -1147,11 +1148,11 @@ amountFromJson(SField const& name, Json::Value const& v)
 }
 
 bool
-amountFromJsonNoThrow(STAmount& result, Json::Value const& jvSource)
+amountFromJsonNoThrow(STAmount& result, json::Value const& jvSource)
 {
     try
     {
-        result = amountFromJson(sfGeneric, jvSource);
+        result = amountFromJson(kSF_GENERIC, jvSource);
         return true;
     }
     catch (std::exception const& e)
@@ -1219,7 +1220,7 @@ operator-(STAmount const& value)
         value.mantissa(),
         value.exponent(),
         !value.negative(),
-        STAmount::unchecked{});
+        STAmount::Unchecked{});
 }
 
 //------------------------------------------------------------------------------
@@ -1249,7 +1250,7 @@ muldiv(std::uint64_t multiplier, std::uint64_t multiplicand, std::uint64_t divis
 }
 
 static std::uint64_t
-muldiv_round(
+muldivRound(
     std::uint64_t multiplier,
     std::uint64_t multiplicand,
     std::uint64_t divisor,
@@ -1274,10 +1275,10 @@ muldiv_round(
 STAmount
 divide(STAmount const& num, STAmount const& den, Asset const& asset)
 {
-    if (den == beast::zero)
+    if (den == beast::kZERO)
         Throw<std::runtime_error>("division by zero");
 
-    if (num == beast::zero)
+    if (num == beast::kZERO)
         return {asset};
 
     std::uint64_t numVal = num.mantissa();
@@ -1287,7 +1288,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
 
     if (num.integral())
     {
-        while (numVal < STAmount::cMinValue)
+        while (numVal < STAmount::kMIN_VALUE)
         {
             // Need to bring into range
             numVal *= 10;
@@ -1297,7 +1298,7 @@ divide(STAmount const& num, STAmount const& den, Asset const& asset)
 
     if (den.integral())
     {
-        while (denVal < STAmount::cMinValue)
+        while (denVal < STAmount::kMIN_VALUE)
         {
             denVal *= 10;
             --denOffset;
@@ -1311,7 +1312,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, tenTo17, denVal) + 5,
+        muldiv(numVal, kTEN_TO17, denVal) + 5,
         numOffset - denOffset - 17,
         num.negative() != den.negative());
 }
@@ -1319,7 +1320,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::zero || v2 == beast::zero)
+    if (v1 == beast::kZERO || v2 == beast::kZERO)
         return STAmount(asset);
 
     if (v1.native() && v2.native() && asset.native())
@@ -1362,7 +1363,7 @@ multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
 
     if (v1.integral())
     {
-        while (value1 < STAmount::cMinValue)
+        while (value1 < STAmount::kMIN_VALUE)
         {
             value1 *= 10;
             --offset1;
@@ -1371,7 +1372,7 @@ multiply(STAmount const& v1, STAmount const& v2, Asset const& asset)
 
     if (v2.integral())
     {
-        while (value2 < STAmount::cMinValue)
+        while (value2 < STAmount::kMIN_VALUE)
         {
             value2 *= 10;
             --offset2;
@@ -1384,7 +1385,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, tenTo14) + 7,
+        muldiv(value1, value2, kTEN_TO14) + 7,
         offset1 + offset2 + 14,
         v1.negative() != v2.negative());
 }
@@ -1430,9 +1431,9 @@ canonicalizeRound(bool integral, std::uint64_t& value, int& offset, bool)
             ++offset;
         }
     }
-    else if (value > STAmount::cMaxValue)
+    else if (value > STAmount::kMAX_VALUE)
     {
-        while (value > (10 * STAmount::cMaxValue))
+        while (value > (10 * STAmount::kMAX_VALUE))
         {
             value /= 10;
             ++offset;
@@ -1472,9 +1473,9 @@ canonicalizeRoundStrict(bool integral, std::uint64_t& value, int& offset, bool r
             ++offset;
         }
     }
-    else if (value > STAmount::cMaxValue)
+    else if (value > STAmount::kMAX_VALUE)
     {
-        while (value > (10 * STAmount::cMaxValue))
+        while (value > (10 * STAmount::kMAX_VALUE))
         {
             value /= 10;
             ++offset;
@@ -1486,14 +1487,14 @@ canonicalizeRoundStrict(bool integral, std::uint64_t& value, int& offset, bool r
 }
 
 STAmount
-roundToScale(STAmount const& value, std::int32_t scale, Number::rounding_mode rounding)
+roundToScale(STAmount const& value, std::int32_t scale, Number::RoundingMode rounding)
 {
     // Nothing to do for integral types.
     if (value.integral())
         return value;
 
     // Nothing to do for zero.
-    if (value == beast::zero)
+    if (value == beast::kZERO)
         return value;
 
     // If the value's exponent is greater than or equal to the scale, then
@@ -1502,7 +1503,7 @@ roundToScale(STAmount const& value, std::int32_t scale, Number::rounding_mode ro
     if (value.exponent() >= scale)
         return value;
 
-    STAmount const referenceValue{value.asset(), STAmount::cMinValue, scale, value.negative()};
+    STAmount const referenceValue{value.asset(), STAmount::kMIN_VALUE, scale, value.negative()};
 
     NumberRoundModeGuard const mg(rounding);
     // With an IOU, the the result of addition will be truncated to the
@@ -1519,7 +1520,7 @@ namespace {
 class DontAffectNumberRoundMode
 {
 public:
-    explicit DontAffectNumberRoundMode(Number::rounding_mode mode) noexcept
+    explicit DontAffectNumberRoundMode(Number::RoundingMode mode) noexcept
     {
     }
 
@@ -1539,7 +1540,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::zero || v2 == beast::zero)
+    if (v1 == beast::kZERO || v2 == beast::kZERO)
         return {asset};
 
     if (v1.native() && v2.native() && asset.native())
@@ -1575,7 +1576,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
 
     if (v1.integral())
     {
-        while (value1 < STAmount::cMinValue)
+        while (value1 < STAmount::kMIN_VALUE)
         {
             value1 *= 10;
             --offset1;
@@ -1584,7 +1585,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
 
     if (v2.integral())
     {
-        while (value2 < STAmount::cMinValue)
+        while (value2 < STAmount::kMIN_VALUE)
         {
             value2 *= 10;
             --offset2;
@@ -1602,7 +1603,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 =
-        muldiv_round(value1, value2, tenTo14, (resultNegative != roundUp) ? tenTo14m1 : 0);
+        muldivRound(value1, value2, kTEN_TO14, (resultNegative != roundUp) ? kTEN_TO14M1 : 0);
 
     int offset = offset1 + offset2 + 14;
     if (resultNegative != roundUp)
@@ -1612,7 +1613,7 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
     STAmount result = [&]() {
         // If appropriate, tell Number to round down.  This gives the desired
         // result from STAmount::canonicalize.
-        MightSaveRound const savedRound(Number::rounding_mode::towards_zero);
+        MightSaveRound const savedRound(Number::RoundingMode::TowardsZero);
         return STAmount(asset, amount, offset, resultNegative);
     }();
 
@@ -1627,8 +1628,8 @@ mulRoundImpl(STAmount const& v1, STAmount const& v2, Asset const& asset, bool ro
         else
         {
             // return the smallest value above zero
-            amount = STAmount::cMinValue;
-            offset = STAmount::cMinOffset;
+            amount = STAmount::kMIN_VALUE;
+            offset = STAmount::kMIN_OFFSET;
         }
         return STAmount(asset, amount, offset, resultNegative);
     }
@@ -1653,10 +1654,10 @@ template <typename MightSaveRound>
 static STAmount
 divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool roundUp)
 {
-    if (den == beast::zero)
+    if (den == beast::kZERO)
         Throw<std::runtime_error>("division by zero");
 
-    if (num == beast::zero)
+    if (num == beast::kZERO)
         return {asset};
 
     std::uint64_t numVal = num.mantissa(), denVal = den.mantissa();
@@ -1664,7 +1665,7 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
 
     if (num.integral())
     {
-        while (numVal < STAmount::cMinValue)
+        while (numVal < STAmount::kMIN_VALUE)
         {
             numVal *= 10;
             --numOffset;
@@ -1673,7 +1674,7 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
 
     if (den.integral())
     {
-        while (denVal < STAmount::cMinValue)
+        while (denVal < STAmount::kMIN_VALUE)
         {
             denVal *= 10;
             --denOffset;
@@ -1691,7 +1692,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 =
-        muldiv_round(numVal, tenTo17, denVal, (resultNegative != roundUp) ? denVal - 1 : 0);
+        muldivRound(numVal, kTEN_TO17, denVal, (resultNegative != roundUp) ? denVal - 1 : 0);
 
     int offset = numOffset - denOffset - 17;
 
@@ -1702,8 +1703,8 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
         // If appropriate, tell Number the rounding mode we are using.
         // Note that "roundUp == true" actually means "round away from zero".
         // Otherwise, round toward zero.
-        using enum Number::rounding_mode;
-        MightSaveRound const savedRound(roundUp ^ resultNegative ? upward : downward);
+        using enum Number::RoundingMode;
+        MightSaveRound const savedRound(roundUp ^ resultNegative ? Upward : Downward);
         return STAmount(asset, amount, offset, resultNegative);
     }();
 
@@ -1718,8 +1719,8 @@ divRoundImpl(STAmount const& num, STAmount const& den, Asset const& asset, bool
         else
         {
             // return the smallest value above zero
-            amount = STAmount::cMinValue;
-            offset = STAmount::cMinOffset;
+            amount = STAmount::kMIN_VALUE;
+            offset = STAmount::kMIN_OFFSET;
         }
         return STAmount(asset, amount, offset, resultNegative);
     }
diff --git a/src/libxrpl/protocol/STArray.cpp b/src/libxrpl/protocol/STArray.cpp
index 8e841c1fbb..537cb36630 100644
--- a/src/libxrpl/protocol/STArray.cpp
+++ b/src/libxrpl/protocol/STArray.cpp
@@ -127,15 +127,15 @@ STArray::getText() const
     return r;
 }
 
-Json::Value
+json::Value
 STArray::getJson(JsonOptions p) const
 {
-    Json::Value v = Json::arrayValue;
+    json::Value v = json::ArrayValue;
     for (auto const& object : v_)
     {
         if (object.getSType() != STI_NOTPRESENT)
         {
-            Json::Value& inner = v.append(Json::objectValue);
+            json::Value& inner = v.append(json::ObjectValue);
             inner[object.getFName().getJsonName()] = object.getJson(p);
         }
     }
diff --git a/src/libxrpl/protocol/STBase.cpp b/src/libxrpl/protocol/STBase.cpp
index b3558e1b08..ec6131482f 100644
--- a/src/libxrpl/protocol/STBase.cpp
+++ b/src/libxrpl/protocol/STBase.cpp
@@ -12,13 +12,13 @@
 
 namespace xrpl {
 
-STBase::STBase() : fName(&sfGeneric)
+STBase::STBase() : fName_(&kSF_GENERIC)
 {
 }
 
-STBase::STBase(SField const& n) : fName(&n)
+STBase::STBase(SField const& n) : fName_(&n)
 {
-    XRPL_ASSERT(fName, "xrpl::STBase::STBase : field is set");
+    XRPL_ASSERT(fName_, "xrpl::STBase::STBase : field is set");
 }
 
 STBase&
@@ -27,8 +27,8 @@ STBase::operator=(STBase const& t)
     if (this == &t)
         return *this;
 
-    if (!fName->isUseful())
-        fName = t.fName;
+    if (!fName_->isUseful())
+        fName_ = t.fName_;
     return *this;
 }
 
@@ -69,9 +69,9 @@ STBase::getFullText() const
 
     if (getSType() != STI_NOTPRESENT)
     {
-        if (fName->hasName())
+        if (fName_->hasName())
         {
-            ret = fName->fieldName;
+            ret = fName_->fieldName;
             ret += " = ";
         }
 
@@ -87,7 +87,7 @@ STBase::getText() const
     return std::string();
 }
 
-Json::Value
+json::Value
 STBase::getJson(JsonOptions /*options*/) const
 {
     return getText();
@@ -118,21 +118,21 @@ STBase::isDefault() const
 void
 STBase::setFName(SField const& n)
 {
-    fName = &n;
-    XRPL_ASSERT(fName, "xrpl::STBase::setFName : field is set");
+    fName_ = &n;
+    XRPL_ASSERT(fName_, "xrpl::STBase::setFName : field is set");
 }
 
 SField const&
 STBase::getFName() const
 {
-    return *fName;
+    return *fName_;
 }
 
 void
 STBase::addFieldID(Serializer& s) const
 {
-    XRPL_ASSERT(fName->isBinary(), "xrpl::STBase::addFieldID : field is binary");
-    s.addFieldID(fName->fieldType, fName->fieldValue);
+    XRPL_ASSERT(fName_->isBinary(), "xrpl::STBase::addFieldID : field is binary");
+    s.addFieldID(fName_->fieldType, fName_->fieldValue);
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/libxrpl/protocol/STCurrency.cpp b/src/libxrpl/protocol/STCurrency.cpp
index dc47624402..9b761864d9 100644
--- a/src/libxrpl/protocol/STCurrency.cpp
+++ b/src/libxrpl/protocol/STCurrency.cpp
@@ -41,7 +41,7 @@ STCurrency::getText() const
     return to_string(currency_);
 }
 
-Json::Value
+json::Value
 STCurrency::getJson(JsonOptions) const
 {
     return to_string(currency_);
@@ -85,14 +85,14 @@ STCurrency::move(std::size_t n, void* buf)
 }
 
 STCurrency
-currencyFromJson(SField const& name, Json::Value const& v)
+currencyFromJson(SField const& name, json::Value const& v)
 {
     if (!v.isString())
     {
         Throw<std::runtime_error>("currencyFromJson currency must be a string Json value");
     }
 
-    auto const currency = to_currency(v.asString());
+    auto const currency = toCurrency(v.asString());
     if (currency == badCurrency() || currency == noCurrency())
     {
         Throw<std::runtime_error>("currencyFromJson currency must be a valid currency");
diff --git a/src/libxrpl/protocol/STInteger.cpp b/src/libxrpl/protocol/STInteger.cpp
index 0530a784d9..d17dd49fe5 100644
--- a/src/libxrpl/protocol/STInteger.cpp
+++ b/src/libxrpl/protocol/STInteger.cpp
@@ -16,6 +16,7 @@
 #include <cstdint>
 #include <iterator>
 #include <string>
+#include <system_error>
 
 namespace xrpl {
 
@@ -52,7 +53,7 @@ STUInt8::getText() const
 }
 
 template <>
-Json::Value
+json::Value
 STUInt8::getJson(JsonOptions) const
 {
     if (getFName() == sfTransactionResult)
@@ -91,7 +92,7 @@ STUInt16::getText() const
 {
     if (getFName() == sfLedgerEntryType)
     {
-        auto item = LedgerFormats::getInstance().findByType(safe_cast<LedgerEntryType>(value_));
+        auto item = LedgerFormats::getInstance().findByType(safeCast<LedgerEntryType>(value_));
 
         if (item != nullptr)
             return item->getName();
@@ -99,7 +100,7 @@ STUInt16::getText() const
 
     if (getFName() == sfTransactionType)
     {
-        auto item = TxFormats::getInstance().findByType(safe_cast<TxType>(value_));
+        auto item = TxFormats::getInstance().findByType(safeCast<TxType>(value_));
 
         if (item != nullptr)
             return item->getName();
@@ -109,12 +110,12 @@ STUInt16::getText() const
 }
 
 template <>
-Json::Value
+json::Value
 STUInt16::getJson(JsonOptions) const
 {
     if (getFName() == sfLedgerEntryType)
     {
-        auto item = LedgerFormats::getInstance().findByType(safe_cast<LedgerEntryType>(value_));
+        auto item = LedgerFormats::getInstance().findByType(safeCast<LedgerEntryType>(value_));
 
         if (item != nullptr)
             return item->getName();
@@ -122,7 +123,7 @@ STUInt16::getJson(JsonOptions) const
 
     if (getFName() == sfTransactionType)
     {
-        auto item = TxFormats::getInstance().findByType(safe_cast<TxType>(value_));
+        auto item = TxFormats::getInstance().findByType(safeCast<TxType>(value_));
 
         if (item != nullptr)
             return item->getName();
@@ -160,7 +161,7 @@ STUInt32::getText() const
 }
 
 template <>
-Json::Value
+json::Value
 STUInt32::getJson(JsonOptions) const
 {
     if (getFName() == sfPermissionValue)
@@ -196,7 +197,7 @@ STUInt64::getText() const
 }
 
 template <>
-Json::Value
+json::Value
 STUInt64::getJson(JsonOptions) const
 {
     auto convertToString = [](uint64_t const value, int const base) {
@@ -208,7 +209,7 @@ STUInt64::getJson(JsonOptions) const
         return str;
     };
 
-    if (auto const& fName = getFName(); fName.shouldMeta(SField::sMD_BaseTen))
+    if (auto const& fName = getFName(); fName.shouldMeta(SField::SMdBaseTen))
     {
         return convertToString(value_, 10);  // Convert to base 10
     }
@@ -239,7 +240,7 @@ STInt32::getText() const
 }
 
 template <>
-Json::Value
+json::Value
 STInt32::getJson(JsonOptions) const
 {
     return value_;
diff --git a/src/libxrpl/protocol/STIssue.cpp b/src/libxrpl/protocol/STIssue.cpp
index 10f0ff4c32..c0019c334f 100644
--- a/src/libxrpl/protocol/STIssue.cpp
+++ b/src/libxrpl/protocol/STIssue.cpp
@@ -78,10 +78,10 @@ STIssue::getText() const
     return asset_.getText();
 }
 
-Json::Value
+json::Value
 STIssue::getJson(JsonOptions) const
 {
-    Json::Value jv;
+    json::Value jv;
     asset_.setJson(jv);
     return jv;
 }
@@ -132,7 +132,7 @@ STIssue::move(std::size_t n, void* buf)
 }
 
 STIssue
-issueFromJson(SField const& name, Json::Value const& v)
+issueFromJson(SField const& name, json::Value const& v)
 {
     return STIssue{name, assetFromJson(v)};
 }
diff --git a/src/libxrpl/protocol/STLedgerEntry.cpp b/src/libxrpl/protocol/STLedgerEntry.cpp
index 1f4d9acfd4..8bec23d319 100644
--- a/src/libxrpl/protocol/STLedgerEntry.cpp
+++ b/src/libxrpl/protocol/STLedgerEntry.cpp
@@ -38,7 +38,7 @@ STLedgerEntry::STLedgerEntry(Keylet const& k) : STObject(sfLedgerEntry), key_(k.
     {
         Throw<std::runtime_error>(
             "Attempt to create a SLE of unknown type " +
-            std::to_string(safe_cast<std::uint16_t>(k.type)));
+            std::to_string(safeCast<std::uint16_t>(k.type)));
     }
 
     set(format->getSOTemplate());
@@ -63,7 +63,7 @@ void
 STLedgerEntry::setSLEType()
 {
     auto format = LedgerFormats::getInstance().findByType(
-        safe_cast<LedgerEntryType>(getFieldU16(sfLedgerEntryType)));
+        safeCast<LedgerEntryType>(getFieldU16(sfLedgerEntryType)));
 
     if (format == nullptr)
         Throw<std::runtime_error>("invalid ledger entry type");
@@ -114,10 +114,10 @@ STLedgerEntry::getText() const
     return str(boost::format("{ %s, %s }") % to_string(key_) % STObject::getText());
 }
 
-Json::Value
+json::Value
 STLedgerEntry::getJson(JsonOptions options) const
 {
-    Json::Value ret(STObject::getJson(options));
+    json::Value ret(STObject::getJson(options));
 
     ret[jss::index] = to_string(key_);
 
@@ -133,12 +133,13 @@ STLedgerEntry::getJson(JsonOptions options) const
 bool
 STLedgerEntry::isThreadedType(Rules const& rules) const
 {
-    static constexpr std::array<LedgerEntryType, 5> newPreviousTxnIDTypes = {
+    static constexpr std::array<LedgerEntryType, 5> kNEW_PREVIOUS_TXN_ID_TYPES = {
         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(newPreviousTxnIDTypes.cbegin(), newPreviousTxnIDTypes.cend(), type_) != 0);
+        (std::count(
+             kNEW_PREVIOUS_TXN_ID_TYPES.cbegin(), kNEW_PREVIOUS_TXN_ID_TYPES.cend(), type_) != 0);
     return !excludePrevTxnID && getFieldIndex(sfPreviousTxnID) != -1;
 }
 
diff --git a/src/libxrpl/protocol/STNumber.cpp b/src/libxrpl/protocol/STNumber.cpp
index d506751f86..f6481a4d5d 100644
--- a/src/libxrpl/protocol/STNumber.cpp
+++ b/src/libxrpl/protocol/STNumber.cpp
@@ -5,6 +5,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/Asset.h>
+#include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/STBase.h>
@@ -57,7 +58,7 @@ STNumber::associateAsset(Asset const& a)
     STTakesAsset::associateAsset(a);
 
     XRPL_ASSERT_PARTS(
-        getFName().shouldMeta(SField::sMD_NeedsAsset),
+        getFName().shouldMeta(SField::SMdNeedsAsset),
         "STNumber::associateAsset",
         "field needs asset");
 
@@ -75,7 +76,7 @@ STNumber::add(Serializer& s) const
     auto const exponent = value.exponent();
 
     SField const& field = getFName();
-    if (field.shouldMeta(SField::sMD_NeedsAsset))
+    if (field.shouldMeta(SField::SMdNeedsAsset))
     {
         // asset is defined in the STTakesAsset base class
         if (asset_)
@@ -95,7 +96,7 @@ STNumber::add(Serializer& s) const
             // Json. Regardless, the only time we should be serializing an
             // STNumber is when the scale is large.
             XRPL_ASSERT_PARTS(
-                Number::getMantissaScale() == MantissaRange::mantissa_scale::large,
+                Number::getMantissaScale() == MantissaRange::MantissaScale::Large,
                 "xrpl::STNumber::add",
                 "STNumber only used with large mantissa scale");
 #endif
@@ -159,7 +160,7 @@ operator<<(std::ostream& out, STNumber const& rhs)
 NumberParts
 partsFromString(std::string const& number)
 {
-    static boost::regex const reNumber(
+    static boost::regex const kRE_NUMBER(
         "^"                       // the beginning of the string
         "([-+]?)"                 // (optional) + or - character
         "(0|[1-9][0-9]*)"         // a number (no leading zeroes, unless 0)
@@ -170,7 +171,7 @@ partsFromString(std::string const& number)
 
     boost::smatch match;
 
-    if (!boost::regex_match(number, match, reNumber))
+    if (!boost::regex_match(number, match, kRE_NUMBER))
         Throw<std::runtime_error>("'" + number + "' is not a number");
 
     // Match fields:
@@ -217,7 +218,7 @@ partsFromString(std::string const& number)
 }
 
 STNumber
-numberFromJson(SField const& field, Json::Value const& value)
+numberFromJson(SField const& field, json::Value const& value)
 {
     NumberParts parts;
 
@@ -257,7 +258,7 @@ numberFromJson(SField const& field, Json::Value const& value)
     }
 
     return STNumber{
-        field, Number{parts.negative, parts.mantissa, parts.exponent, Number::normalized{}}};
+        field, Number{parts.negative, parts.mantissa, parts.exponent, Number::Normalized{}}};
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STObject.cpp b/src/libxrpl/protocol/STObject.cpp
index 9f032a0962..6bce2f0ab2 100644
--- a/src/libxrpl/protocol/STObject.cpp
+++ b/src/libxrpl/protocol/STObject.cpp
@@ -43,7 +43,7 @@
 namespace xrpl {
 
 STObject::STObject(STObject&& other)
-    : STBase(other.getFName()), v_(std::move(other.v_)), mType(other.mType)
+    : STBase(other.getFName()), v_(std::move(other.v_)), type_(other.type_)
 {
 }
 
@@ -119,14 +119,14 @@ STObject::isDefault() const
 void
 STObject::add(Serializer& s) const
 {
-    add(s, WhichFields::withAllFields);  // just inner elements
+    add(s, WhichFields::WithAllFields);  // just inner elements
 }
 
 STObject&
 STObject::operator=(STObject&& other)
 {
     setFName(other.getFName());
-    mType = other.mType;
+    type_ = other.type_;
     v_ = std::move(other.v_);
     return *this;
 }
@@ -136,17 +136,17 @@ STObject::set(SOTemplate const& type)
 {
     v_.clear();
     v_.reserve(type.size());
-    mType = &type;
+    type_ = &type;
 
     for (auto const& elem : type)
     {
-        if (elem.style() != soeREQUIRED)
+        if (elem.style() != SoeRequired)
         {
-            v_.emplace_back(detail::nonPresentObject, elem.sField());
+            v_.emplace_back(detail::gNonPresentObject, elem.sField());
         }
         else
         {
-            v_.emplace_back(detail::defaultObject, elem.sField());
+            v_.emplace_back(detail::gDefaultObject, elem.sField());
         }
     }
 }
@@ -162,7 +162,7 @@ STObject::applyTemplate(SOTemplate const& type)
         Throw<FieldErr>(text);
     };
 
-    mType = &type;
+    type_ = &type;
     decltype(v_) v;
     v.reserve(type.size());
     for (auto const& e : type)
@@ -171,7 +171,7 @@ STObject::applyTemplate(SOTemplate const& type)
             v_, [&](detail::STVar const& b) { return b.get().getFName() == e.sField(); });
         if (iter != v_.end())
         {
-            if ((e.style() == soeDEFAULT) && iter->get().isDefault())
+            if ((e.style() == SoeDefault) && iter->get().isDefault())
             {
                 throwFieldErr(e.sField().fieldName, "may not be explicitly set to default.");
             }
@@ -180,11 +180,11 @@ STObject::applyTemplate(SOTemplate const& type)
         }
         else
         {
-            if (e.style() == soeREQUIRED)
+            if (e.style() == SoeRequired)
             {
                 throwFieldErr(e.sField().fieldName, "is required but missing.");
             }
-            v.emplace_back(detail::nonPresentObject, e.sField());
+            v.emplace_back(detail::gNonPresentObject, e.sField());
         }
     }
     for (auto const& e : v_)
@@ -258,7 +258,7 @@ STObject::set(SerialIter& sit, int depth)
 
     // We want to ensure that the deserialized object does not contain any
     // duplicate fields. This is a key invariant:
-    auto const sf = getSortedFields(*this, WhichFields::withAllFields);
+    auto const sf = getSortedFields(*this, WhichFields::WithAllFields);
 
     auto const dup = std::ranges::adjacent_find(sf, [](STBase const* lhs, STBase const* rhs) {
         return lhs->getFName() == rhs->getFName();
@@ -345,7 +345,7 @@ STObject::isEquivalent(STBase const& t) const
     if (v == nullptr)
         return false;
 
-    if (mType != nullptr && v->mType == mType)
+    if (type_ != nullptr && v->type_ == type_)
     {
         return std::ranges::equal(
             begin(), end(), v->begin(), v->end(), [](STBase const& st1, STBase const& st2) {
@@ -353,8 +353,8 @@ STObject::isEquivalent(STBase const& t) const
             });
     }
 
-    auto const sf1 = getSortedFields(*this, WhichFields::withAllFields);
-    auto const sf2 = getSortedFields(*v, WhichFields::withAllFields);
+    auto const sf1 = getSortedFields(*this, WhichFields::WithAllFields);
+    auto const sf2 = getSortedFields(*v, WhichFields::WithAllFields);
 
     return std::ranges::equal(sf1, sf2, [](STBase const* st1, STBase const* st2) {
         return (st1->getSType() == st2->getSType()) && st1->isEquivalent(*st2);
@@ -366,7 +366,7 @@ STObject::getHash(HashPrefix prefix) const
 {
     Serializer s;
     s.add32(prefix);
-    add(s, WhichFields::withAllFields);
+    add(s, WhichFields::WithAllFields);
     return s.getSHA512Half();
 }
 
@@ -375,15 +375,15 @@ STObject::getSigningHash(HashPrefix prefix) const
 {
     Serializer s;
     s.add32(prefix);
-    add(s, WhichFields::omitSigningFields);
+    add(s, WhichFields::OmitSigningFields);
     return s.getSHA512Half();
 }
 
 int
 STObject::getFieldIndex(SField const& field) const
 {
-    if (mType != nullptr)
-        return mType->getIndex(field);
+    if (type_ != nullptr)
+        return type_->getIndex(field);
 
     int i = 0;
     for (auto const& elem : v_)
@@ -442,7 +442,7 @@ STObject::getPField(SField const& field, bool createOkay)
     if (index == -1)
     {
         if (createOkay && isFree())
-            return getPIndex(emplace_back(detail::defaultObject, field));
+            return getPIndex(emplaceBack(detail::gDefaultObject, field));
 
         return nullptr;
     }
@@ -524,7 +524,7 @@ STObject::makeFieldPresent(SField const& field)
         if (!isFree())
             throwFieldNotFound(field);
 
-        return getPIndex(emplace_back(detail::nonPresentObject, field));
+        return getPIndex(emplaceBack(detail::gNonPresentObject, field));
     }
 
     STBase* f = getPIndex(index);  // NOLINT(misc-const-correctness)
@@ -532,7 +532,7 @@ STObject::makeFieldPresent(SField const& field)
     if (f->getSType() != STI_NOTPRESENT)
         return f;
 
-    v_[index] = detail::STVar(detail::defaultObject, f->getFName());
+    v_[index] = detail::STVar(detail::gDefaultObject, f->getFName());
     return getPIndex(index);
 }
 
@@ -548,7 +548,7 @@ STObject::makeFieldAbsent(SField const& field)
 
     if (f.getSType() == STI_NOTPRESENT)
         return;
-    v_[index] = detail::STVar(detail::nonPresentObject, f.getFName());
+    v_[index] = detail::STVar(detail::gNonPresentObject, f.getFName());
 }
 
 bool
@@ -572,7 +572,7 @@ STObject::delField(int index)
 SOEStyle
 STObject::getStyle(SField const& field) const
 {
-    return (mType != nullptr) ? mType->style(field) : soeINVALID;
+    return (type_ != nullptr) ? type_->style(field) : SoeInvalid;
 }
 
 unsigned char
@@ -646,22 +646,22 @@ STObject::getFieldVL(SField const& field) const
 STAmount const&
 STObject::getFieldAmount(SField const& field) const
 {
-    static STAmount const empty{};
-    return getFieldByConstRef<STAmount>(field, empty);
+    static STAmount const kEMPTY{};
+    return getFieldByConstRef<STAmount>(field, kEMPTY);
 }
 
 STPathSet const&
 STObject::getFieldPathSet(SField const& field) const
 {
-    static STPathSet const empty{};
-    return getFieldByConstRef<STPathSet>(field, empty);
+    static STPathSet const kEMPTY{};
+    return getFieldByConstRef<STPathSet>(field, kEMPTY);
 }
 
 STVector256 const&
 STObject::getFieldV256(SField const& field) const
 {
-    static STVector256 const empty{};
-    return getFieldByConstRef<STVector256>(field, empty);
+    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 empty{};
-    return getFieldByConstRef<STArray>(field, empty);
+    static STArray const kEMPTY{};
+    return getFieldByConstRef<STArray>(field, kEMPTY);
 }
 
 STCurrency const&
 STObject::getFieldCurrency(SField const& field) const
 {
-    static STCurrency const empty{};
-    return getFieldByConstRef<STCurrency>(field, empty);
+    static STCurrency const kEMPTY{};
+    return getFieldByConstRef<STCurrency>(field, kEMPTY);
 }
 
 STNumber const&
 STObject::getFieldNumber(SField const& field) const
 {
-    static STNumber const empty{};
-    return getFieldByConstRef<STNumber>(field, empty);
+    static STNumber const kEMPTY{};
+    return getFieldByConstRef<STNumber>(field, kEMPTY);
 }
 
 void
@@ -831,10 +831,10 @@ STObject::setFieldObject(SField const& field, STObject const& v)
     setFieldUsingAssignment(field, v);
 }
 
-Json::Value
+json::Value
 STObject::getJson(JsonOptions options) const
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     for (auto const& elem : v_)
     {
@@ -927,7 +927,7 @@ STObject::getSortedFields(STObject const& objToSort, WhichFields whichFields)
 
     // Sort the fields by fieldCode.
     std::ranges::sort(sf, [](STBase const* lhs, STBase const* rhs) {
-        return lhs->getFName().fieldCode < rhs->getFName().fieldCode;
+        return lhs->getFName().fieldCodeMem < rhs->getFName().fieldCodeMem;
     });
 
     return sf;
diff --git a/src/libxrpl/protocol/STParsedJSON.cpp b/src/libxrpl/protocol/STParsedJSON.cpp
index 01a52c88ec..f6ebde4e52 100644
--- a/src/libxrpl/protocol/STParsedJSON.cpp
+++ b/src/libxrpl/protocol/STParsedJSON.cpp
@@ -51,7 +51,7 @@ namespace xrpl {
 namespace STParsedJSONDetail {
 template <typename U, typename S>
 constexpr std::enable_if_t<std::is_unsigned_v<U> && std::is_signed_v<S>, U>
-to_unsigned(S value)
+toUnsigned(S value)
 {
     if (value < 0 || std::numeric_limits<U>::max() < value)
         Throw<std::runtime_error>("Value out of range");
@@ -60,7 +60,7 @@ to_unsigned(S value)
 
 template <typename U1, typename U2>
 constexpr std::enable_if_t<std::is_unsigned_v<U1> && std::is_unsigned_v<U2>, U1>
-to_unsigned(U2 value)
+toUnsigned(U2 value)
 {
     if (std::numeric_limits<U1>::max() < value)
         Throw<std::runtime_error>("Value out of range");
@@ -69,7 +69,7 @@ to_unsigned(U2 value)
 
 // LCOV_EXCL_START
 static inline std::string
-make_name(std::string const& object, std::string const& field)
+makeName(std::string const& object, std::string const& field)
 {
     if (field.empty())
         return object;
@@ -77,102 +77,100 @@ make_name(std::string const& object, std::string const& field)
     return object + "." + field;
 }
 
-static inline Json::Value
-not_an_object(std::string const& object, std::string const& field)
+static inline json::Value
+notAnObject(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' is not a JSON object.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' is not a JSON object.");
 }
 
-static inline Json::Value
-not_an_object(std::string const& object)
+static inline json::Value
+notAnObject(std::string const& object)
 {
-    return not_an_object(object, "");
+    return notAnObject(object, "");
 }
 
-static inline Json::Value
-not_an_array(std::string const& object)
+static inline json::Value
+notAnArray(std::string const& object)
 {
-    return RPC::make_error(rpcINVALID_PARAMS, "Field '" + object + "' is not a JSON array.");
+    return RPC::makeError(RpcInvalidParams, "Field '" + object + "' is not a JSON array.");
 }
 
-static inline Json::Value
-unknown_field(std::string const& object, std::string const& field)
+static inline json::Value
+unknownField(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' is unknown.");
+    return RPC::makeError(RpcInvalidParams, "Field '" + makeName(object, field) + "' is unknown.");
 }
 
-static inline Json::Value
-out_of_range(std::string const& object, std::string const& field)
+static inline json::Value
+outOfRange(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' is out of range.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' is out of range.");
 }
 
-static inline Json::Value
-bad_type(std::string const& object, std::string const& field)
+static inline json::Value
+badType(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' has bad type.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' has bad type.");
 }
 
-static inline Json::Value
-invalid_data(std::string const& object, std::string const& field)
+static inline json::Value
+invalidData(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' has invalid data.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' has invalid data.");
 }
 
-static inline Json::Value
-invalid_data(std::string const& object)
+static inline json::Value
+invalidData(std::string const& object)
 {
-    return invalid_data(object, "");
+    return invalidData(object, "");
 }
 
-static inline Json::Value
-array_expected(std::string const& object, std::string const& field)
+static inline json::Value
+arrayExpected(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' must be a JSON array.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' must be a JSON array.");
 }
 
-static inline Json::Value
-string_expected(std::string const& object, std::string const& field)
+static inline json::Value
+stringExpected(std::string const& object, std::string const& field)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + make_name(object, field) + "' must be a string.");
+    return RPC::makeError(
+        RpcInvalidParams, "Field '" + makeName(object, field) + "' must be a string.");
 }
 
-static inline Json::Value
-too_deep(std::string const& object)
+static inline json::Value
+tooDeep(std::string const& object)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS, "Field '" + object + "' exceeds nesting depth limit.");
+    return RPC::makeError(RpcInvalidParams, "Field '" + object + "' exceeds nesting depth limit.");
 }
 
-static inline Json::Value
-singleton_expected(std::string const& object, unsigned int index)
+static inline json::Value
+singletonExpected(std::string const& object, unsigned int index)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS,
+    return RPC::makeError(
+        RpcInvalidParams,
         "Field '" + object + "[" + std::to_string(index) +
             "]' must be an object with a single key/object value.");
 }
 
-static inline Json::Value
-template_mismatch(SField const& sField)
+static inline json::Value
+templateMismatch(SField const& sField)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS,
+    return RPC::makeError(
+        RpcInvalidParams,
         "Object '" + sField.getName() + "' contents did not meet requirements for that type.");
 }
 
-static inline Json::Value
-non_object_in_array(std::string const& item, Json::UInt index)
+static inline json::Value
+nonObjectInArray(std::string const& item, json::UInt index)
 {
-    return RPC::make_error(
-        rpcINVALID_PARAMS,
+    return RPC::makeError(
+        RpcInvalidParams,
         "Item '" + item + "' at index " + std::to_string(index) +
             " is not an object.  Arrays may only contain objects.");
 }
@@ -182,11 +180,11 @@ template <class STResult, class Integer>
 static std::optional<detail::STVar>
 parseUnsigned(
     SField const& field,
-    std::string const& json_name,
+    std::string const& jsonName,
     std::string const& fieldName,
     SField const* name,
-    Json::Value const& value,
-    Json::Value& error)
+    json::Value const& value,
+    json::Value& error)
 {
     std::optional<detail::STVar> ret;
 
@@ -194,30 +192,30 @@ parseUnsigned(
     {
         if (value.isString())
         {
-            ret = detail::make_stvar<STResult>(
+            ret = detail::makeStvar<STResult>(
                 field,
-                safe_cast<typename STResult::value_type>(
+                safeCast<typename STResult::value_type>(
                     beast::lexicalCastThrow<Integer>(value.asString())));
         }
         else if (value.isInt())
         {
-            ret = detail::make_stvar<STResult>(
-                field, to_unsigned<typename STResult::value_type>(value.asInt()));
+            ret = detail::makeStvar<STResult>(
+                field, toUnsigned<typename STResult::value_type>(value.asInt()));
         }
         else if (value.isUInt())
         {
-            ret = detail::make_stvar<STResult>(
-                field, to_unsigned<typename STResult::value_type>(value.asUInt()));
+            ret = detail::makeStvar<STResult>(
+                field, toUnsigned<typename STResult::value_type>(value.asUInt()));
         }
         else
         {
-            error = bad_type(json_name, fieldName);
+            error = badType(jsonName, fieldName);
             return ret;
         }
     }
     catch (std::exception const&)
     {
-        error = invalid_data(json_name, fieldName);
+        error = invalidData(jsonName, fieldName);
         return ret;
     }
 
@@ -228,11 +226,11 @@ template <class STResult, class Integer = std::uint16_t>
 static std::optional<detail::STVar>
 parseUint16(
     SField const& field,
-    std::string const& json_name,
+    std::string const& jsonName,
     std::string const& fieldName,
     SField const* name,
-    Json::Value const& value,
-    Json::Value& error)
+    json::Value const& value,
+    json::Value& error)
 {
     std::optional<detail::STVar> ret;
 
@@ -246,40 +244,39 @@ parseUint16(
             {
                 if (field == sfTransactionType)
                 {
-                    ret = detail::make_stvar<STResult>(
+                    ret = detail::makeStvar<STResult>(
                         field,
-                        safe_cast<typename STResult::value_type>(static_cast<Integer>(
+                        safeCast<typename STResult::value_type>(static_cast<Integer>(
                             TxFormats::getInstance().findTypeByName(strValue))));
 
-                    if (*name == sfGeneric)
+                    if (*name == kSF_GENERIC)
                         name = &sfTransaction;
                 }
                 else if (field == sfLedgerEntryType)
                 {
-                    ret = detail::make_stvar<STResult>(
+                    ret = detail::makeStvar<STResult>(
                         field,
-                        safe_cast<typename STResult::value_type>(static_cast<Integer>(
+                        safeCast<typename STResult::value_type>(static_cast<Integer>(
                             LedgerFormats::getInstance().findTypeByName(strValue))));
 
-                    if (*name == sfGeneric)
+                    if (*name == kSF_GENERIC)
                         name = &sfLedgerEntry;
                 }
                 else
                 {
-                    error = invalid_data(json_name, fieldName);
+                    error = invalidData(jsonName, fieldName);
                     return ret;
                 }
             }
         }
         if (!ret)
         {
-            return parseUnsigned<STResult, Integer>(
-                field, json_name, fieldName, name, value, error);
+            return parseUnsigned<STResult, Integer>(field, jsonName, fieldName, name, value, error);
         }
     }
     catch (std::exception const&)
     {
-        error = invalid_data(json_name, fieldName);
+        error = invalidData(jsonName, fieldName);
         return ret;
     }
 
@@ -290,11 +287,11 @@ template <class STResult, class Integer = std::uint32_t>
 static std::optional<detail::STVar>
 parseUint32(
     SField const& field,
-    std::string const& json_name,
+    std::string const& jsonName,
     std::string const& fieldName,
     SField const* name,
-    Json::Value const& value,
-    Json::Value& error)
+    json::Value const& value,
+    json::Value& error)
 {
     std::optional<detail::STVar> ret;
 
@@ -309,32 +306,31 @@ parseUint32(
                     Permission::getInstance().getGranularValue(strValue);
                 if (granularPermission)
                 {
-                    ret = detail::make_stvar<STResult>(field, *granularPermission);
+                    ret = detail::makeStvar<STResult>(field, *granularPermission);
                 }
                 else
                 {
                     auto const& txType = TxFormats::getInstance().findTypeByName(strValue);
-                    ret = detail::make_stvar<STResult>(
+                    ret = detail::makeStvar<STResult>(
                         field, Permission::getInstance().txToPermissionType(txType));
                 }
             }
             else
             {
-                ret = detail::make_stvar<STResult>(
+                ret = detail::makeStvar<STResult>(
                     field,
-                    safe_cast<typename STResult::value_type>(
+                    safeCast<typename STResult::value_type>(
                         beast::lexicalCastThrow<Integer>(value.asString())));
             }
         }
         if (!ret)
         {
-            return parseUnsigned<STResult, Integer>(
-                field, json_name, fieldName, name, value, error);
+            return parseUnsigned<STResult, Integer>(field, jsonName, fieldName, name, value, error);
         }
     }
     catch (std::exception const&)
     {
-        error = invalid_data(json_name, fieldName);
+        error = invalidData(jsonName, fieldName);
         return ret;
     }
 
@@ -345,21 +341,21 @@ parseUint32(
 // recurse.  Everything represented here is a leaf-type.
 static std::optional<detail::STVar>
 parseLeaf(
-    std::string const& json_name,
+    std::string const& jsonName,
     std::string const& fieldName,
     SField const* name,
-    Json::Value const& value,
-    Json::Value& error)
+    json::Value const& value,
+    json::Value& error)
 {
     std::optional<detail::STVar> ret;
 
     auto const& field = SField::getField(fieldName);
 
     // checked in parseObject
-    if (field == sfInvalid)
+    if (field == kSF_INVALID)
     {
         // LCOV_EXCL_START
-        error = unknown_field(json_name, fieldName);
+        error = unknownField(jsonName, fieldName);
         return ret;
         // LCOV_EXCL_STOP
     }
@@ -369,8 +365,8 @@ parseLeaf(
         case STI_UINT8:
             try
             {
-                constexpr auto minValue = std::numeric_limits<std::uint8_t>::min();
-                constexpr auto maxValue = std::numeric_limits<std::uint8_t>::max();
+                constexpr auto kMIN_VALUE = std::numeric_limits<std::uint8_t>::min();
+                constexpr auto kMAX_VALUE = std::numeric_limits<std::uint8_t>::max();
                 if (value.isString())
                 {
                     std::string const strValue = value.asString();
@@ -381,71 +377,71 @@ parseLeaf(
                         {
                             auto ter = transCode(strValue);
 
-                            if (!ter || TERtoInt(*ter) < minValue || TERtoInt(*ter) > maxValue)
+                            if (!ter || TERtoInt(*ter) < kMIN_VALUE || TERtoInt(*ter) > kMAX_VALUE)
                             {
-                                error = out_of_range(json_name, fieldName);
+                                error = outOfRange(jsonName, fieldName);
                                 return ret;
                             }
 
-                            ret = detail::make_stvar<STUInt8>(
+                            ret = detail::makeStvar<STUInt8>(
                                 field, static_cast<std::uint8_t>(TERtoInt(*ter)));
                         }
                         else
                         {
-                            error = bad_type(json_name, fieldName);
+                            error = badType(jsonName, fieldName);
                             return ret;
                         }
                     }
                     else
                     {
-                        ret = detail::make_stvar<STUInt8>(
+                        ret = detail::makeStvar<STUInt8>(
                             field, beast::lexicalCastThrow<std::uint8_t>(strValue));
                     }
                 }
                 else if (value.isInt())
                 {
-                    if (value.asInt() < minValue || value.asInt() > maxValue)
+                    if (value.asInt() < kMIN_VALUE || value.asInt() > kMAX_VALUE)
                     {
-                        error = out_of_range(json_name, fieldName);
+                        error = outOfRange(jsonName, fieldName);
                         return ret;
                     }
 
-                    ret = detail::make_stvar<STUInt8>(
-                        field, static_cast<std::uint8_t>(value.asInt()));
+                    ret =
+                        detail::makeStvar<STUInt8>(field, static_cast<std::uint8_t>(value.asInt()));
                 }
                 else if (value.isUInt())
                 {
-                    if (value.asUInt() > maxValue)
+                    if (value.asUInt() > kMAX_VALUE)
                     {
-                        error = out_of_range(json_name, fieldName);
+                        error = outOfRange(jsonName, fieldName);
                         return ret;
                     }
 
-                    ret = detail::make_stvar<STUInt8>(
+                    ret = detail::makeStvar<STUInt8>(
                         field, static_cast<std::uint8_t>(value.asUInt()));
                 }
                 else
                 {
-                    error = bad_type(json_name, fieldName);
+                    error = badType(jsonName, fieldName);
                     return ret;
                 }
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
             break;
 
         case STI_UINT16:
-            ret = parseUint16<STUInt16>(field, json_name, fieldName, name, value, error);
+            ret = parseUint16<STUInt16>(field, jsonName, fieldName, name, value, error);
             if (!ret)
                 return ret;
 
             break;
 
         case STI_UINT32:
-            ret = parseUint32<STUInt32>(field, json_name, fieldName, name, value, error);
+            ret = parseUint32<STUInt32>(field, jsonName, fieldName, name, value, error);
             if (!ret)
                 return ret;
 
@@ -460,7 +456,7 @@ parseLeaf(
 
                     std::uint64_t val = 0;
 
-                    bool const useBase10 = field.shouldMeta(SField::sMD_BaseTen);
+                    bool const useBase10 = field.shouldMeta(SField::SMdBaseTen);
 
                     // if the field is amount, serialize as base 10
                     auto [p, ec] = std::from_chars(
@@ -469,27 +465,27 @@ parseLeaf(
                     if (ec != std::errc() || (p != str.data() + str.size()))
                         Throw<std::invalid_argument>("invalid data");
 
-                    ret = detail::make_stvar<STUInt64>(field, val);
+                    ret = detail::makeStvar<STUInt64>(field, val);
                 }
                 else if (value.isInt())
                 {
-                    ret = detail::make_stvar<STUInt64>(
-                        field, to_unsigned<std::uint64_t>(value.asInt()));
+                    ret = detail::makeStvar<STUInt64>(
+                        field, toUnsigned<std::uint64_t>(value.asInt()));
                 }
                 else if (value.isUInt())
                 {
-                    ret = detail::make_stvar<STUInt64>(
-                        field, safe_cast<std::uint64_t>(value.asUInt()));
+                    ret =
+                        detail::makeStvar<STUInt64>(field, safeCast<std::uint64_t>(value.asUInt()));
                 }
                 else
                 {
-                    error = bad_type(json_name, fieldName);
+                    error = badType(jsonName, fieldName);
                     return ret;
                 }
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -498,7 +494,7 @@ parseLeaf(
         case STI_UINT128: {
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -508,21 +504,21 @@ parseLeaf(
             {
                 if (!s.empty())
                 {
-                    error = invalid_data(json_name, fieldName);
+                    error = invalidData(jsonName, fieldName);
                     return ret;
                 }
 
                 num.zero();
             }
 
-            ret = detail::make_stvar<STUInt128>(field, num);
+            ret = detail::makeStvar<STUInt128>(field, num);
             break;
         }
 
         case STI_UINT160: {
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -532,21 +528,21 @@ parseLeaf(
             {
                 if (!s.empty())
                 {
-                    error = invalid_data(json_name, fieldName);
+                    error = invalidData(jsonName, fieldName);
                     return ret;
                 }
 
                 num.zero();
             }
 
-            ret = detail::make_stvar<STUInt160>(field, num);
+            ret = detail::makeStvar<STUInt160>(field, num);
             break;
         }
 
         case STI_UINT192: {
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -556,21 +552,21 @@ parseLeaf(
             {
                 if (!s.empty())
                 {
-                    error = invalid_data(json_name, fieldName);
+                    error = invalidData(jsonName, fieldName);
                     return ret;
                 }
 
                 num.zero();
             }
 
-            ret = detail::make_stvar<STUInt192>(field, num);
+            ret = detail::makeStvar<STUInt192>(field, num);
             break;
         }
 
         case STI_UINT256: {
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -580,14 +576,14 @@ parseLeaf(
             {
                 if (!s.empty())
                 {
-                    error = invalid_data(json_name, fieldName);
+                    error = invalidData(jsonName, fieldName);
                     return ret;
                 }
 
                 num.zero();
             }
 
-            ret = detail::make_stvar<STUInt256>(field, num);
+            ret = detail::makeStvar<STUInt256>(field, num);
             break;
         }
 
@@ -596,7 +592,7 @@ parseLeaf(
             {
                 if (value.isString())
                 {
-                    ret = detail::make_stvar<STInt32>(
+                    ret = detail::makeStvar<STInt32>(
                         field, beast::lexicalCastThrow<std::int32_t>(value.asString()));
                 }
                 else if (value.isInt())
@@ -605,7 +601,7 @@ parseLeaf(
                     // library ever supports larger ints
                     // In such case, we will need additional bounds checks here
                     static_assert(std::is_same_v<decltype(value.asInt()), std::int32_t>);
-                    ret = detail::make_stvar<STInt32>(field, value.asInt());
+                    ret = detail::makeStvar<STInt32>(field, value.asInt());
                 }
                 else if (value.isUInt())
                 {
@@ -613,20 +609,20 @@ parseLeaf(
                     if (uintValue >
                         static_cast<std::uint32_t>(std::numeric_limits<std::int32_t>::max()))
                     {
-                        error = out_of_range(json_name, fieldName);
+                        error = outOfRange(jsonName, fieldName);
                         return ret;
                     }
-                    ret = detail::make_stvar<STInt32>(field, static_cast<std::int32_t>(uintValue));
+                    ret = detail::makeStvar<STInt32>(field, static_cast<std::int32_t>(uintValue));
                 }
                 else
                 {
-                    error = bad_type(json_name, fieldName);
+                    error = badType(jsonName, fieldName);
                     return ret;
                 }
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -635,7 +631,7 @@ parseLeaf(
         case STI_VL:
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -643,7 +639,7 @@ parseLeaf(
             {
                 if (auto vBlob = strUnHex(value.asString()))
                 {
-                    ret = detail::make_stvar<STBlob>(field, vBlob->data(), vBlob->size());
+                    ret = detail::makeStvar<STBlob>(field, vBlob->data(), vBlob->size());
                 }
                 else
                 {
@@ -652,7 +648,7 @@ parseLeaf(
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -661,11 +657,11 @@ parseLeaf(
         case STI_AMOUNT:
             try
             {
-                ret = detail::make_stvar<STAmount>(amountFromJson(field, value));
+                ret = detail::makeStvar<STAmount>(amountFromJson(field, value));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -674,11 +670,11 @@ parseLeaf(
         case STI_NUMBER:
             try
             {
-                ret = detail::make_stvar<STNumber>(numberFromJson(field, value));
+                ret = detail::makeStvar<STNumber>(numberFromJson(field, value));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -687,25 +683,25 @@ parseLeaf(
         case STI_VECTOR256:
             if (!value.isArrayOrNull())
             {
-                error = array_expected(json_name, fieldName);
+                error = arrayExpected(jsonName, fieldName);
                 return ret;
             }
 
             try
             {
                 STVector256 tail(field);
-                for (Json::UInt i = 0; value.isValidIndex(i); ++i)
+                for (json::UInt i = 0; value.isValidIndex(i); ++i)
                 {
                     uint256 s;
                     if (!s.parseHex(value[i].asString()))
                         Throw<std::invalid_argument>("invalid data");
-                    tail.push_back(s);
+                    tail.pushBack(s);
                 }
-                ret = detail::make_stvar<STVector256>(std::move(tail));
+                ret = detail::makeStvar<STVector256>(std::move(tail));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -714,7 +710,7 @@ parseLeaf(
         case STI_PATHSET:
             if (!value.isArrayOrNull())
             {
-                error = array_expected(json_name, fieldName);
+                error = arrayExpected(jsonName, fieldName);
                 return ret;
             }
 
@@ -722,7 +718,7 @@ parseLeaf(
             {
                 STPathSet tail(field);
 
-                for (Json::UInt i = 0; value.isValidIndex(i); ++i)
+                for (json::UInt i = 0; value.isValidIndex(i); ++i)
                 {
                     STPath p;
 
@@ -730,45 +726,45 @@ parseLeaf(
                     {
                         std::stringstream ss;
                         ss << fieldName << "[" << i << "]";
-                        error = array_expected(json_name, ss.str());
+                        error = arrayExpected(jsonName, ss.str());
                         return ret;
                     }
 
-                    for (Json::UInt j = 0; value[i].isValidIndex(j); ++j)
+                    for (json::UInt j = 0; value[i].isValidIndex(j); ++j)
                     {
                         std::stringstream ss;
                         ss << fieldName << "[" << i << "][" << j << "]";
-                        std::string const element_name(json_name + "." + ss.str());
+                        std::string const elementName(jsonName + "." + ss.str());
 
                         // each element in this path has some combination of
                         // account, asset, or issuer
 
-                        Json::Value pathEl = value[i][j];
+                        json::Value pathEl = value[i][j];
 
                         if (!pathEl.isObject())
                         {
-                            error = not_an_object(element_name);
+                            error = notAnObject(elementName);
                             return ret;
                         }
 
                         if (pathEl.isMember(jss::currency) && pathEl.isMember(jss::mpt_issuance_id))
                         {
-                            error = RPC::make_error(rpcINVALID_PARAMS, "Invalid Asset.");
+                            error = RPC::makeError(RpcInvalidParams, "Invalid Asset.");
                             return ret;
                         }
 
                         bool const isMPT = pathEl.isMember(jss::mpt_issuance_id);
                         auto const assetName = isMPT ? jss::mpt_issuance_id : jss::currency;
-                        Json::Value const& account = pathEl[jss::account];
-                        Json::Value const& asset = pathEl[assetName];
-                        Json::Value const& issuer = pathEl[jss::issuer];
+                        json::Value const& account = pathEl[jss::account];
+                        json::Value const& asset = pathEl[assetName];
+                        json::Value const& issuer = pathEl[jss::issuer];
                         bool hasAsset = false;
                         AccountID uAccount, uIssuer;
                         PathAsset uAsset;
 
                         if (!account && !asset && !issuer)
                         {
-                            error = invalid_data(element_name);
+                            error = invalidData(elementName);
                             return ret;
                         }
 
@@ -777,7 +773,7 @@ parseLeaf(
                             // human account id
                             if (!account.isString())
                             {
-                                error = string_expected(element_name, jss::account.c_str());
+                                error = stringExpected(elementName, jss::account.cStr());
                                 return ret;
                             }
 
@@ -788,7 +784,7 @@ parseLeaf(
                                 auto const a = parseBase58<AccountID>(account.asString());
                                 if (!a)
                                 {
-                                    error = invalid_data(element_name, jss::account.c_str());
+                                    error = invalidData(elementName, jss::account.cStr());
                                     return ret;
                                 }
                                 uAccount = *a;
@@ -800,7 +796,7 @@ parseLeaf(
                             // human asset
                             if (!asset.isString())
                             {
-                                error = string_expected(element_name, assetName.c_str());
+                                error = stringExpected(elementName, assetName.cStr());
                                 return ret;
                             }
 
@@ -811,12 +807,12 @@ parseLeaf(
                                 MPTID u;
                                 if (!u.parseHex(asset.asString()))
                                 {
-                                    error = invalid_data(element_name, assetName.c_str());
+                                    error = invalidData(elementName, assetName.cStr());
                                     return ret;
                                 }
-                                if (getMPTIssuer(u) == beast::zero)
+                                if (getMPTIssuer(u) == beast::kZERO)
                                 {
-                                    error = invalid_data(element_name, jss::account.c_str());
+                                    error = invalidData(elementName, jss::account.cStr());
                                     return ret;
                                 }
                                 uAsset = u;
@@ -826,9 +822,9 @@ parseLeaf(
                                 Currency currency;
                                 if (!currency.parseHex(asset.asString()))
                                 {
-                                    if (!to_currency(currency, asset.asString()))
+                                    if (!toCurrency(currency, asset.asString()))
                                     {
-                                        error = invalid_data(element_name, assetName.c_str());
+                                        error = invalidData(elementName, assetName.cStr());
                                         return ret;
                                     }
                                 }
@@ -841,7 +837,7 @@ parseLeaf(
                             // human account id
                             if (!issuer.isString())
                             {
-                                error = string_expected(element_name, jss::issuer.c_str());
+                                error = stringExpected(elementName, jss::issuer.cStr());
                                 return ret;
                             }
 
@@ -850,7 +846,7 @@ parseLeaf(
                                 auto const a = parseBase58<AccountID>(issuer.asString());
                                 if (!a)
                                 {
-                                    error = invalid_data(element_name, jss::issuer.c_str());
+                                    error = invalidData(elementName, jss::issuer.cStr());
                                     return ret;
                                 }
                                 uIssuer = *a;
@@ -858,21 +854,21 @@ parseLeaf(
 
                             if (isMPT && uIssuer != getMPTIssuer(uAsset.get<MPTID>()))
                             {
-                                error = invalid_data(element_name, jss::issuer.c_str());
+                                error = invalidData(elementName, jss::issuer.cStr());
                                 return ret;
                             }
                         }
 
-                        p.emplace_back(uAccount, uAsset, uIssuer, hasAsset);
+                        p.emplaceBack(uAccount, uAsset, uIssuer, hasAsset);
                     }
 
-                    tail.push_back(p);
+                    tail.pushBack(p);
                 }
-                ret = detail::make_stvar<STPathSet>(std::move(tail));
+                ret = detail::makeStvar<STPathSet>(std::move(tail));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
 
@@ -881,7 +877,7 @@ parseLeaf(
         case STI_ACCOUNT: {
             if (!value.isString())
             {
-                error = bad_type(json_name, fieldName);
+                error = badType(jsonName, fieldName);
                 return ret;
             }
 
@@ -890,17 +886,17 @@ parseLeaf(
             try
             {
                 if (AccountID account; account.parseHex(strValue))
-                    return detail::make_stvar<STAccount>(field, account);
+                    return detail::makeStvar<STAccount>(field, account);
 
                 if (auto result = parseBase58<AccountID>(strValue))
-                    return detail::make_stvar<STAccount>(field, *result);
+                    return detail::makeStvar<STAccount>(field, *result);
 
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
         }
@@ -909,11 +905,11 @@ parseLeaf(
         case STI_ISSUE:
             try
             {
-                ret = detail::make_stvar<STIssue>(issueFromJson(field, value));
+                ret = detail::makeStvar<STIssue>(issueFromJson(field, value));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
             break;
@@ -921,11 +917,11 @@ parseLeaf(
         case STI_XCHAIN_BRIDGE:
             try
             {
-                ret = detail::make_stvar<STXChainBridge>(STXChainBridge(field, value));
+                ret = detail::makeStvar<STXChainBridge>(STXChainBridge(field, value));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
             break;
@@ -933,51 +929,51 @@ parseLeaf(
         case STI_CURRENCY:
             try
             {
-                ret = detail::make_stvar<STCurrency>(currencyFromJson(field, value));
+                ret = detail::makeStvar<STCurrency>(currencyFromJson(field, value));
             }
             catch (std::exception const&)
             {
-                error = invalid_data(json_name, fieldName);
+                error = invalidData(jsonName, fieldName);
                 return ret;
             }
             break;
 
         default:
-            error = bad_type(json_name, fieldName);
+            error = badType(jsonName, fieldName);
             return ret;
     }
 
     return ret;
 }
 
-static int const maxDepth = 64;
+static int const kMAX_DEPTH = 64;
 
 // Forward declaration since parseObject() and parseArray() call each other.
 static std::optional<detail::STVar>
 parseArray(
-    std::string const& json_name,
-    Json::Value const& json,
+    std::string const& jsonName,
+    json::Value const& json,
     SField const& inName,
     int depth,
-    Json::Value& error);
+    json::Value& error);
 
 static std::optional<STObject>
 parseObject(
-    std::string const& json_name,
-    Json::Value const& json,
+    std::string const& jsonName,
+    json::Value const& json,
     SField const& inName,
     int depth,
-    Json::Value& error)
+    json::Value& error)
 {
     if (!json.isObjectOrNull())
     {
-        error = not_an_object(json_name);
+        error = notAnObject(jsonName);
         return std::nullopt;
     }
 
-    if (depth > maxDepth)
+    if (depth > kMAX_DEPTH)
     {
-        error = too_deep(json_name);
+        error = tooDeep(jsonName);
         return std::nullopt;
     }
 
@@ -987,13 +983,13 @@ parseObject(
 
         for (auto const& fieldName : json.getMemberNames())
         {
-            Json::Value const& value = json[fieldName];
+            json::Value const& value = json[fieldName];
 
             auto const& field = SField::getField(fieldName);
 
-            if (field == sfInvalid)
+            if (field == kSF_INVALID)
             {
-                error = unknown_field(json_name, fieldName);
+                error = unknownField(jsonName, fieldName);
                 return std::nullopt;
             }
 
@@ -1006,21 +1002,21 @@ parseObject(
                 case STI_VALIDATION:
                     if (!value.isObject())
                     {
-                        error = not_an_object(json_name, fieldName);
+                        error = notAnObject(jsonName, fieldName);
                         return std::nullopt;
                     }
 
                     try
                     {
-                        auto ret = parseObject(
-                            json_name + "." + fieldName, value, field, depth + 1, error);
+                        auto ret =
+                            parseObject(jsonName + "." + fieldName, value, field, depth + 1, error);
                         if (!ret)
                             return std::nullopt;
-                        data.emplace_back(std::move(*ret));
+                        data.emplaceBack(std::move(*ret));
                     }
                     catch (std::exception const&)
                     {
-                        error = invalid_data(json_name, fieldName);
+                        error = invalidData(jsonName, fieldName);
                         return std::nullopt;
                     }
 
@@ -1031,14 +1027,14 @@ parseObject(
                     try
                     {
                         auto array =
-                            parseArray(json_name + "." + fieldName, value, field, depth + 1, error);
+                            parseArray(jsonName + "." + fieldName, value, field, depth + 1, error);
                         if (!array.has_value())
                             return std::nullopt;
-                        data.emplace_back(std::move(*array));
+                        data.emplaceBack(std::move(*array));
                     }
                     catch (std::exception const&)
                     {
-                        error = invalid_data(json_name, fieldName);
+                        error = invalidData(jsonName, fieldName);
                         return std::nullopt;
                     }
 
@@ -1046,12 +1042,12 @@ parseObject(
 
                 // Everything else (types that don't recurse).
                 default: {
-                    auto leaf = parseLeaf(json_name, fieldName, &inName, value, error);
+                    auto leaf = parseLeaf(jsonName, fieldName, &inName, value, error);
 
                     if (!leaf)
                         return std::nullopt;
 
-                    data.emplace_back(std::move(*leaf));
+                    data.emplaceBack(std::move(*leaf));
                 }
 
                 break;
@@ -1065,33 +1061,33 @@ parseObject(
     }
     catch (STObject::FieldErr const& e)
     {
-        std::cerr << "template_mismatch: " << e.what() << "\n";
-        error = template_mismatch(inName);
+        std::cerr << "templateMismatch: " << e.what() << "\n";
+        error = templateMismatch(inName);
     }
     catch (std::exception const&)
     {
-        error = invalid_data(json_name);
+        error = invalidData(jsonName);
     }
     return std::nullopt;
 }
 
 static std::optional<detail::STVar>
 parseArray(
-    std::string const& json_name,
-    Json::Value const& json,
+    std::string const& jsonName,
+    json::Value const& json,
     SField const& inName,
     int depth,
-    Json::Value& error)
+    json::Value& error)
 {
     if (!json.isArrayOrNull())
     {
-        error = not_an_array(json_name);
+        error = notAnArray(jsonName);
         return std::nullopt;
     }
 
-    if (depth > maxDepth)
+    if (depth > kMAX_DEPTH)
     {
-        error = too_deep(json_name);
+        error = tooDeep(jsonName);
         return std::nullopt;
     }
 
@@ -1099,7 +1095,7 @@ parseArray(
     {
         STArray tail(inName);
 
-        for (Json::UInt i = 0; json.isValidIndex(i); ++i)
+        for (json::UInt i = 0; json.isValidIndex(i); ++i)
         {
             bool const isObjectOrNull(json[i].isObjectOrNull());
             bool const singleKey(isObjectOrNull ? json[i].size() == 1 : true);
@@ -1107,7 +1103,7 @@ parseArray(
             if (!isObjectOrNull || !singleKey)
             {
                 // null values are !singleKey
-                error = singleton_expected(json_name, i);
+                error = singletonExpected(jsonName, i);
                 return std::nullopt;
             }
 
@@ -1118,16 +1114,16 @@ parseArray(
             ;
             auto const& nameField(SField::getField(memberName));
 
-            if (nameField == sfInvalid)
+            if (nameField == kSF_INVALID)
             {
-                error = unknown_field(json_name, memberName);
+                error = unknownField(jsonName, memberName);
                 return std::nullopt;
             }
 
-            Json::Value const objectFields(json[i][memberName]);
+            json::Value const objectFields(json[i][memberName]);
 
             std::stringstream ss;
-            ss << json_name << "." << "[" << i << "]." << memberName;
+            ss << jsonName << "." << "[" << i << "]." << memberName;
 
             auto ret = parseObject(ss.str(), objectFields, nameField, depth + 1, error);
             if (!ret)
@@ -1140,18 +1136,18 @@ parseArray(
             if (ret->getFName().fieldType != STI_OBJECT)
             {
                 ss << "Field type: " << ret->getFName().fieldType << " ";
-                error = non_object_in_array(ss.str(), i);
+                error = nonObjectInArray(ss.str(), i);
                 return std::nullopt;
             }
 
-            tail.push_back(std::move(*ret));
+            tail.pushBack(std::move(*ret));
         }
 
-        return detail::make_stvar<STArray>(std::move(tail));
+        return detail::makeStvar<STArray>(std::move(tail));
     }
     catch (std::exception const&)
     {
-        error = invalid_data(json_name);
+        error = invalidData(jsonName);
         return std::nullopt;
     }
 }
@@ -1160,10 +1156,10 @@ parseArray(
 
 //------------------------------------------------------------------------------
 
-STParsedJSONObject::STParsedJSONObject(std::string const& name, Json::Value const& json)
+STParsedJSONObject::STParsedJSONObject(std::string const& name, json::Value const& json)
 {
     using namespace STParsedJSONDetail;
-    object = parseObject(name, json, sfGeneric, 0, error);
+    object = parseObject(name, json, kSF_GENERIC, 0, error);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STPathSet.cpp b/src/libxrpl/protocol/STPathSet.cpp
index 04c8d3c8da..8c4b139792 100644
--- a/src/libxrpl/protocol/STPathSet.cpp
+++ b/src/libxrpl/protocol/STPathSet.cpp
@@ -21,33 +21,33 @@
 namespace xrpl {
 
 std::size_t
-STPathElement::get_hash(STPathElement const& element)
+STPathElement::getHash(STPathElement const& element)
 {
-    std::size_t hash_account = 2654435761;
-    std::size_t hash_currency = 2654435761;
-    std::size_t hash_issuer = 2654435761;
+    std::size_t hashAccount = 2654435761;
+    std::size_t hashCurrency = 2654435761;
+    std::size_t hashIssuer = 2654435761;
 
     // NIKB NOTE: This doesn't have to be a secure hash as speed is more
     //            important. We don't even really need to fully hash the whole
     //            base_uint here, as a few bytes would do for our use.
 
     for (auto const x : element.getAccountID())
-        hash_account += (hash_account * 257) ^ x;
+        hashAccount += (hashAccount * 257) ^ x;
 
-    // Check pathAsset type instead of element's mType
-    // In some cases mType might be account but the asset
+    // Check pathAsset type instead of element's type_
+    // In some cases type_ might be account but the asset
     // is still set to either MPT or currency (see Pathfinder::addLink())
     element.getPathAsset().visit(
-        [&](MPTID const& mpt) { hash_currency += beast::uhash<>{}(mpt); },
+        [&](MPTID const& mpt) { hashCurrency += beast::Uhash<>{}(mpt); },
         [&](Currency const& currency) {
             for (auto const x : currency)
-                hash_currency += (hash_currency * 509) ^ x;
+                hashCurrency += (hashCurrency * 509) ^ x;
         });
 
     for (auto const x : element.getIssuerID())
-        hash_issuer += (hash_issuer * 911) ^ x;
+        hashIssuer += (hashIssuer * 911) ^ x;
 
-    return (hash_account ^ hash_currency ^ hash_issuer);
+    return (hashAccount ^ hashCurrency ^ hashIssuer);
 }
 
 STPathSet::STPathSet(SerialIter& sit, SField const& name) : STBase(name)
@@ -57,7 +57,7 @@ STPathSet::STPathSet(SerialIter& sit, SField const& name) : STBase(name)
     {
         int const iType = sit.get8();
 
-        if (iType == STPathElement::typeNone || iType == STPathElement::typeBoundary)
+        if (iType == STPathElement::TypeNone || iType == STPathElement::TypeBoundary)
         {
             if (path.empty())
             {
@@ -65,23 +65,23 @@ STPathSet::STPathSet(SerialIter& sit, SField const& name) : STBase(name)
                 Throw<std::runtime_error>("empty path");
             }
 
-            push_back(path);
+            pushBack(path);
             path.clear();
 
-            if (iType == STPathElement::typeNone)
+            if (iType == STPathElement::TypeNone)
                 return;
         }
-        else if ((iType & ~STPathElement::typeAll) != 0)
+        else if ((iType & ~STPathElement::TypeAll) != 0)
         {
             JLOG(debugLog().error()) << "Bad path element " << iType << " in pathset";
             Throw<std::runtime_error>("bad path element");
         }
         else
         {
-            auto const hasAccount = (iType & STPathElement::typeAccount) != 0u;
-            auto const hasCurrency = (iType & STPathElement::typeCurrency) != 0u;
-            auto const hasIssuer = (iType & STPathElement::typeIssuer) != 0u;
-            auto const hasMPT = (iType & STPathElement::typeMPT) != 0u;
+            auto const hasAccount = (iType & STPathElement::TypeAccount) != 0u;
+            auto const hasCurrency = (iType & STPathElement::TypeCurrency) != 0u;
+            auto const hasIssuer = (iType & STPathElement::TypeIssuer) != 0u;
+            auto const hasMPT = (iType & STPathElement::TypeMpt) != 0u;
 
             AccountID account;
             PathAsset asset;
@@ -121,18 +121,18 @@ STPathSet::move(std::size_t n, void* buf)
 bool
 STPathSet::assembleAdd(STPath const& base, STPathElement const& tail)
 {  // assemble base+tail and add it to the set if it's not a duplicate
-    value.push_back(base);
+    value_.push_back(base);
 
-    std::vector<STPath>::reverse_iterator it = value.rbegin();
+    std::vector<STPath>::reverse_iterator it = value_.rbegin();
 
     STPath& newPath = *it;
-    newPath.push_back(tail);
+    newPath.pushBack(tail);
 
-    while (++it != value.rend())
+    while (++it != value_.rend())
     {
         if (*it == newPath)
         {
-            value.pop_back();
+            value_.pop_back();
             return false;
         }
     }
@@ -143,19 +143,19 @@ bool
 STPathSet::isEquivalent(STBase const& t) const
 {
     STPathSet const* v = dynamic_cast<STPathSet const*>(&t);
-    return (v != nullptr) && (value == v->value);
+    return (v != nullptr) && (value_ == v->value_);
 }
 
 bool
 STPathSet::isDefault() const
 {
-    return value.empty();
+    return value_.empty();
 }
 
 bool
 STPath::hasSeen(AccountID const& account, PathAsset const& asset, AccountID const& issuer) const
 {
-    for (auto& p : mPath)
+    for (auto& p : path_)
     {
         if (p.getAccountID() == account && p.getPathAsset() == asset && p.getIssuerID() == issuer)
             return true;
@@ -164,32 +164,32 @@ STPath::hasSeen(AccountID const& account, PathAsset const& asset, AccountID cons
     return false;
 }
 
-Json::Value
+json::Value
 STPath::getJson(JsonOptions) const
 {
-    Json::Value ret(Json::arrayValue);
+    json::Value ret(json::ArrayValue);
 
-    for (auto const& it : mPath)
+    for (auto const& it : path_)
     {
-        Json::Value elem(Json::objectValue);
+        json::Value elem(json::ObjectValue);
         auto const iType = it.getNodeType();
 
         elem[jss::type] = iType;
 
-        if ((iType & STPathElement::typeAccount) != 0u)
+        if ((iType & STPathElement::TypeAccount) != 0u)
             elem[jss::account] = to_string(it.getAccountID());
 
         XRPL_ASSERT(
-            ((iType & STPathElement::typeCurrency) == 0u) ||
-                ((iType & STPathElement::typeMPT) == 0u),
+            ((iType & STPathElement::TypeCurrency) == 0u) ||
+                ((iType & STPathElement::TypeMpt) == 0u),
             "xrpl::STPath::getJson : not type Currency and MPT");
-        if ((iType & STPathElement::typeCurrency) != 0u)
+        if ((iType & STPathElement::TypeCurrency) != 0u)
             elem[jss::currency] = to_string(it.getCurrency());
 
-        if ((iType & STPathElement::typeMPT) != 0u)
+        if ((iType & STPathElement::TypeMpt) != 0u)
             elem[jss::mpt_issuance_id] = to_string(it.getMPTID());
 
-        if ((iType & STPathElement::typeIssuer) != 0u)
+        if ((iType & STPathElement::TypeIssuer) != 0u)
             elem[jss::issuer] = to_string(it.getIssuerID());
 
         ret.append(elem);
@@ -198,11 +198,11 @@ STPath::getJson(JsonOptions) const
     return ret;
 }
 
-Json::Value
+json::Value
 STPathSet::getJson(JsonOptions options) const
 {
-    Json::Value ret(Json::arrayValue);
-    for (auto const& it : value)
+    json::Value ret(json::ArrayValue);
+    for (auto const& it : value_)
         ret.append(it.getJson(options));
 
     return ret;
@@ -221,10 +221,10 @@ STPathSet::add(Serializer& s) const
     XRPL_ASSERT(getFName().fieldType == STI_PATHSET, "xrpl::STPathSet::add : valid field type");
     bool first = true;
 
-    for (auto const& spPath : value)
+    for (auto const& spPath : value_)
     {
         if (!first)
-            s.add8(STPathElement::typeBoundary);
+            s.add8(STPathElement::TypeBoundary);
 
         for (auto const& speElement : spPath)
         {
@@ -232,23 +232,23 @@ STPathSet::add(Serializer& s) const
 
             s.add8(iType);
 
-            if ((iType & STPathElement::typeAccount) != 0u)
+            if ((iType & STPathElement::TypeAccount) != 0u)
                 s.addBitString(speElement.getAccountID());
 
-            if ((iType & STPathElement::typeMPT) != 0u)
+            if ((iType & STPathElement::TypeMpt) != 0u)
                 s.addBitString(speElement.getMPTID());
 
-            if ((iType & STPathElement::typeCurrency) != 0u)
+            if ((iType & STPathElement::TypeCurrency) != 0u)
                 s.addBitString(speElement.getCurrency());
 
-            if ((iType & STPathElement::typeIssuer) != 0u)
+            if ((iType & STPathElement::TypeIssuer) != 0u)
                 s.addBitString(speElement.getIssuerID());
         }
 
         first = false;
     }
 
-    s.add8(STPathElement::typeNone);
+    s.add8(STPathElement::TypeNone);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/STTakesAsset.cpp b/src/libxrpl/protocol/STTakesAsset.cpp
index 1d37c65fc1..de7de002b0 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::sMD_NeedsAsset))
+        if (field.shouldMeta(SField::SMdNeedsAsset))
         {
             auto const type = entry.getSType();
             // If the field is not set or present, skip it.
@@ -29,10 +29,10 @@ associateAsset(SLE& sle, Asset const& asset)
             auto& ta = entry.downcast<STTakesAsset>();
             auto const style = sle.getStyle(ta.getFName());
             XRPL_ASSERT_PARTS(
-                style != soeINVALID, "xrpl::associateAsset", "valid template element style");
+                style != SoeInvalid, "xrpl::associateAsset", "valid template element style");
 
             XRPL_ASSERT_PARTS(
-                style != soeDEFAULT || !ta.isDefault(),
+                style != SoeDefault || !ta.isDefault(),
                 "xrpl::associateAsset",
                 "non-default value");
             ta.associateAsset(asset);
@@ -41,7 +41,7 @@ associateAsset(SLE& sle, Asset const& asset)
             // value, but it won't know anything about how the value relates to
             // the SLE. If the template element is soeDEFAULT, and the value
             // changed to the default value, remove the field.
-            if (style == soeDEFAULT && ta.isDefault())
+            if (style == SoeDefault && ta.isDefault())
                 sle.makeFieldAbsent(field);
         }
     }
diff --git a/src/libxrpl/protocol/STTx.cpp b/src/libxrpl/protocol/STTx.cpp
index 0dd567e6cc..d335988ac3 100644
--- a/src/libxrpl/protocol/STTx.cpp
+++ b/src/libxrpl/protocol/STTx.cpp
@@ -61,7 +61,7 @@ getTxFormat(TxType type)
     {
         Throw<std::runtime_error>(
             "Invalid transaction type " +
-            std::to_string(safe_cast<std::underlying_type_t<TxType>>(type)));
+            std::to_string(safeCast<std::underlying_type_t<TxType>>(type)));
     }
 
     return format;
@@ -69,25 +69,25 @@ getTxFormat(TxType type)
 
 STTx::STTx(STObject&& object) : STObject(std::move(object))
 {
-    tx_type_ = safe_cast<TxType>(getFieldU16(sfTransactionType));
+    tx_type_ = safeCast<TxType>(getFieldU16(sfTransactionType));
     applyTemplate(getTxFormat(tx_type_)->getSOTemplate());  //  may throw
-    tid_ = getHash(HashPrefix::transactionID);
+    tid_ = getHash(HashPrefix::TransactionId);
 }
 
 STTx::STTx(SerialIter& sit) : STObject(sfTransaction)
 {
     int const length = sit.getBytesLeft();
 
-    if ((length < txMinSizeBytes) || (length > txMaxSizeBytes))
+    if ((length < kTX_MIN_SIZE_BYTES) || (length > kTX_MAX_SIZE_BYTES))
         Throw<std::runtime_error>("Transaction length invalid");
 
     if (set(sit))
         Throw<std::runtime_error>("Transaction contains an object terminator");
 
-    tx_type_ = safe_cast<TxType>(getFieldU16(sfTransactionType));
+    tx_type_ = safeCast<TxType>(getFieldU16(sfTransactionType));
 
     applyTemplate(getTxFormat(tx_type_)->getSOTemplate());  // May throw
-    tid_ = getHash(HashPrefix::transactionID);
+    tid_ = getHash(HashPrefix::TransactionId);
 }
 
 STTx::STTx(TxType type, std::function<void(STObject&)> assembler) : STObject(sfTransaction)
@@ -99,12 +99,12 @@ STTx::STTx(TxType type, std::function<void(STObject&)> assembler) : STObject(sfT
 
     assembler(*this);
 
-    tx_type_ = safe_cast<TxType>(getFieldU16(sfTransactionType));
+    tx_type_ = safeCast<TxType>(getFieldU16(sfTransactionType));
 
     if (tx_type_ != type)
-        LogicError("Transaction type was mutated during assembly");
+        logicError("Transaction type was mutated during assembly");
 
-    tid_ = getHash(HashPrefix::transactionID);
+    tid_ = getHash(HashPrefix::TransactionId);
 }
 
 STBase*
@@ -165,7 +165,7 @@ static Blob
 getSigningData(STTx const& that)
 {
     Serializer s;
-    s.add32(HashPrefix::txSign);
+    s.add32(HashPrefix::TxSign);
     that.addWithoutSigningFields(s);
     return s.getData();
 }
@@ -173,7 +173,7 @@ getSigningData(STTx const& that)
 uint256
 STTx::getSigningHash() const
 {
-    return STObject::getSigningHash(HashPrefix::txSign);
+    return STObject::getSigningHash(HashPrefix::TxSign);
 }
 
 Blob
@@ -203,7 +203,7 @@ STTx::getSeqProxy() const
         return SeqProxy::sequence(seq);
     }
 
-    return SeqProxy{SeqProxy::Type::ticket, *ticketSeq};
+    return SeqProxy{SeqProxy::Type::Ticket, *ticketSeq};
 }
 
 std::uint32_t
@@ -245,7 +245,7 @@ STTx::sign(
     {
         setFieldVL(sfTxnSignature, sig);
     }
-    tid_ = getHash(HashPrefix::transactionID);
+    tid_ = getHash(HashPrefix::TransactionId);
 }
 
 Expected<void, std::string>
@@ -312,38 +312,38 @@ STTx::checkBatchSign(Rules const& rules) const
     return Unexpected("Internal batch signature check failure.");
 }
 
-Json::Value
+json::Value
 STTx::getJson(JsonOptions options) const
 {
-    Json::Value ret = STObject::getJson(JsonOptions::none);
-    if (!(options & JsonOptions::disable_API_prior_V2))
+    json::Value ret = STObject::getJson(JsonOptions::KNone);
+    if (!(options & JsonOptions::KDisableApiPriorV2))
         ret[jss::hash] = to_string(getTransactionID());
     return ret;
 }
 
-Json::Value
+json::Value
 STTx::getJson(JsonOptions options, bool binary) const
 {
-    bool const V1 = !(options & JsonOptions::disable_API_prior_V2);
+    bool const v1 = !(options & JsonOptions::KDisableApiPriorV2);
 
     if (binary)
     {
         Serializer const s = STObject::getSerializer();
         std::string const dataBin = strHex(s.peekData());
 
-        if (V1)
+        if (v1)
         {
-            Json::Value ret(Json::objectValue);
+            json::Value ret(json::ObjectValue);
             ret[jss::tx] = dataBin;
             ret[jss::hash] = to_string(getTransactionID());
             return ret;
         }
 
-        return Json::Value{dataBin};
+        return json::Value{dataBin};
     }
 
-    Json::Value ret = STObject::getJson(JsonOptions::none);
-    if (V1)
+    json::Value ret = STObject::getJson(JsonOptions::KNone);
+    if (v1)
         ret[jss::hash] = to_string(getTransactionID());
 
     return ret;
@@ -352,13 +352,13 @@ STTx::getJson(JsonOptions options, bool binary) const
 std::string const&
 STTx::getMetaSQLInsertReplaceHeader()
 {
-    static std::string const sql =
+    static std::string const kSQL =
         "INSERT OR REPLACE INTO Transactions "
         "(TransID, TransType, FromAcct, FromSeq, LedgerSeq, Status, RawTxn, "
         "TxnMeta)"
         " VALUES ";
 
-    return sql;
+    return kSQL;
 }
 
 std::string
@@ -366,7 +366,7 @@ STTx::getMetaSQL(std::uint32_t inLedger, std::string const& escapedMetaData) con
 {
     Serializer s;
     add(s);
-    return getMetaSQL(s, inLedger, TxnSql::txnSqlValidated, escapedMetaData);
+    return getMetaSQL(s, inLedger, TxnSql::Validated, escapedMetaData);
 }
 
 // VFALCO This could be a free function elsewhere
@@ -377,16 +377,16 @@ STTx::getMetaSQL(
     TxnSql status,
     std::string const& escapedMetaData) const
 {
-    static boost::format const bfTrans("('%s', '%s', '%s', '%d', '%d', '%c', %s, %s)");
+    static boost::format const kBF_TRANS("('%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(bfTrans) % to_string(getTransactionID()) % format->getName() %
+        boost::format(kBF_TRANS) % to_string(getTransactionID()) % format->getName() %
         toBase58(getAccountID(sfAccount)) % getFieldU32(sfSequence) % inLedger %
-        safe_cast<char>(status) % rTxn % escapedMetaData);
+        safeCast<char>(status) % rTxn % escapedMetaData);
 }
 
 static Expected<void, std::string>
@@ -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::minMultiSigners || signers.size() > STTx::maxMultiSigners)
+    if (signers.size() < STTx::kMIN_MULTI_SIGNERS || signers.size() > STTx::kMAX_MULTI_SIGNERS)
         return Unexpected("Invalid Signers array size.");
 
     // Signers must be in sorted order by AccountID.
-    AccountID lastAccountID(beast::zero);
+    AccountID lastAccountID(beast::kZERO);
 
     for (auto const& signer : signers)
     {
@@ -582,7 +582,7 @@ STTx::getBatchTransactionIDs() const
     if (batchTxnIds_.empty())
     {
         for (STObject const& rb : getFieldArray(sfRawTransactions))
-            batchTxnIds_.push_back(rb.getHash(HashPrefix::transactionID));
+            batchTxnIds_.push_back(rb.getHash(HashPrefix::TransactionId));
     }
 
     XRPL_ASSERT(
@@ -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 allowedSymbols = []() {
+            static constexpr std::array<char, 256> const kALLOWED_SYMBOLS = []() {
                 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 (allowedSymbols[c] == 0)
+                if (kALLOWED_SYMBOLS[c] == 0)
                 {
                     reason =
                         "The MemoType and MemoFormat fields may only "
@@ -703,19 +703,19 @@ invalidMPTAmountInTx(STObject const& tx)
     auto const txType = tx[~sfTransactionType];
     if (!txType)
         return false;
-    if (auto const* item = TxFormats::getInstance().findByType(safe_cast<TxType>(*txType)))
+    if (auto const* item = TxFormats::getInstance().findByType(safeCast<TxType>(*txType)))
     {
         for (auto const& e : item->getSOTemplate())
         {
-            if (tx.isFieldPresent(e.sField()) && e.supportMPT() != soeMPTNone)
+            if (tx.isFieldPresent(e.sField()) && e.supportMPT() != SoeMptNone)
             {
                 if (auto const& field = tx.peekAtField(e.sField());
                     (field.getSType() == STI_AMOUNT &&
-                     safe_downcast<STAmount const&>(field).holds<MPTIssue>()) ||
+                     safeDowncast<STAmount const&>(field).holds<MPTIssue>()) ||
                     (field.getSType() == STI_ISSUE &&
-                     safe_downcast<STIssue const&>(field).holds<MPTIssue>()))
+                     safeDowncast<STIssue const&>(field).holds<MPTIssue>()))
                 {
-                    if (e.supportMPT() != soeMPTSupported)
+                    if (e.supportMPT() != SoeMptSupported)
                         return true;
                 }
             }
@@ -731,14 +731,14 @@ isRawTransactionOkay(STObject const& st, std::string& reason)
         return true;
 
     if (st.isFieldPresent(sfBatchSigners) &&
-        st.getFieldArray(sfBatchSigners).size() > maxBatchTxCount)
+        st.getFieldArray(sfBatchSigners).size() > kMAX_BATCH_TX_COUNT)
     {
         reason = "Batch Signers array exceeds max entries.";
         return false;
     }
 
     auto const& rawTxns = st.getFieldArray(sfRawTransactions);
-    if (rawTxns.size() > maxBatchTxCount)
+    if (rawTxns.size() > kMAX_BATCH_TX_COUNT)
     {
         reason = "Raw Transactions array exceeds max entries.";
         return false;
@@ -747,7 +747,7 @@ isRawTransactionOkay(STObject const& st, std::string& reason)
     {
         try
         {
-            TxType const tt = safe_cast<TxType>(raw.getFieldU16(sfTransactionType));
+            TxType const tt = safeCast<TxType>(raw.getFieldU16(sfTransactionType));
             if (tt == ttBATCH)
             {
                 reason = "Raw Transactions may not contain batch transactions.";
@@ -812,7 +812,7 @@ isPseudoTx(STObject const& tx)
     if (!t)
         return false;
 
-    auto const tt = safe_cast<TxType>(*t);
+    auto const tt = safeCast<TxType>(*t);
 
     return tt == ttAMENDMENT || tt == ttFEE || tt == ttUNL_MODIFY;
 }
diff --git a/src/libxrpl/protocol/STValidation.cpp b/src/libxrpl/protocol/STValidation.cpp
index 14349d3f85..dd4b8a0fee 100644
--- a/src/libxrpl/protocol/STValidation.cpp
+++ b/src/libxrpl/protocol/STValidation.cpp
@@ -6,6 +6,7 @@
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/KeyType.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/SOTemplate.h>
@@ -37,37 +38,37 @@ 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 format{
-        {sfFlags,                 soeREQUIRED},
-        {sfLedgerHash,            soeREQUIRED},
-        {sfLedgerSequence,        soeREQUIRED},
-        {sfCloseTime,             soeOPTIONAL},
-        {sfLoadFee,               soeOPTIONAL},
-        {sfAmendments,            soeOPTIONAL},
-        {sfBaseFee,               soeOPTIONAL},
-        {sfReserveBase,           soeOPTIONAL},
-        {sfReserveIncrement,      soeOPTIONAL},
-        {sfSigningTime,           soeREQUIRED},
-        {sfSigningPubKey,         soeREQUIRED},
-        {sfSignature,             soeREQUIRED},
-        {sfConsensusHash,         soeOPTIONAL},
-        {sfCookie,                soeDEFAULT},
-        {sfValidatedHash,         soeOPTIONAL},
-        {sfServerVersion,         soeOPTIONAL},
+    static SOTemplate const kFORMAT{
+        {sfFlags,               SoeRequired},
+        {sfLedgerHash,          SoeRequired},
+        {sfLedgerSequence,      SoeRequired},
+        {sfCloseTime,           SoeOptional},
+        {sfLoadFee,             SoeOptional},
+        {sfAmendments,          SoeOptional},
+        {sfBaseFee,             SoeOptional},
+        {sfReserveBase,         SoeOptional},
+        {sfReserveIncrement,    SoeOptional},
+        {sfSigningTime,         SoeRequired},
+        {sfSigningPubKey,       SoeRequired},
+        {sfSignature,           SoeRequired},
+        {sfConsensusHash,       SoeOptional},
+        {sfCookie,              SoeDefault},
+        {sfValidatedHash,       SoeOptional},
+        {sfServerVersion,       SoeOptional},
         // featureXRPFees
-        {sfBaseFeeDrops,          soeOPTIONAL},
-        {sfReserveBaseDrops,      soeOPTIONAL},
-        {sfReserveIncrementDrops, soeOPTIONAL},
+        {sfBaseFeeDrops,          SoeOptional},
+        {sfReserveBaseDrops,      SoeOptional},
+        {sfReserveIncrementDrops, SoeOptional},
     };
     // clang-format on
 
-    return format;
+    return kFORMAT;
 };
 
 uint256
 STValidation::getSigningHash() const
 {
-    return STObject::getSigningHash(HashPrefix::validation);
+    return STObject::getSigningHash(HashPrefix::Validation);
 }
 
 uint256
@@ -100,14 +101,14 @@ STValidation::isValid() const noexcept
     if (!valid_)
     {
         XRPL_ASSERT(
-            publicKeyType(getSignerPublic()) == KeyType::secp256k1,
+            publicKeyType(getSignerPublic()) == KeyType::Secp256k1,
             "xrpl::STValidation::isValid : valid key type");
 
         valid_ = verifyDigest(
             getSignerPublic(),
             getSigningHash(),
             makeSlice(getFieldVL(sfSignature)),
-            (getFlags() & vfFullyCanonicalSig) != 0u);
+            (getFlags() & kVF_FULLY_CANONICAL_SIG) != 0u);
     }
 
     return valid_.value();
@@ -116,7 +117,7 @@ STValidation::isValid() const noexcept
 bool
 STValidation::isFull() const noexcept
 {
-    return (getFlags() & vfFullValidation) != 0;
+    return (getFlags() & kVF_FULL_VALIDATION) != 0;
 }
 
 Blob
diff --git a/src/libxrpl/protocol/STVar.cpp b/src/libxrpl/protocol/STVar.cpp
index 652328f613..8e45d3c75b 100644
--- a/src/libxrpl/protocol/STVar.cpp
+++ b/src/libxrpl/protocol/STVar.cpp
@@ -25,8 +25,8 @@
 
 namespace xrpl::detail {
 
-defaultObject_t defaultObject;
-nonPresentObject_t nonPresentObject;
+DefaultObjectT gDefaultObject;
+NonPresentObjectT gNonPresentObject;
 
 //------------------------------------------------------------------------------
 
@@ -38,19 +38,19 @@ STVar::~STVar()
 STVar::STVar(STVar const& other)
 {
     if (other.p_ != nullptr)
-        p_ = other.p_->copy(max_size, &d_);
+        p_ = other.p_->copy(kMAX_SIZE, &d_);
 }
 
 STVar::STVar(STVar&& other)
 {
-    if (other.on_heap())
+    if (other.onHeap())
     {
         p_ = other.p_;
         other.p_ = nullptr;
     }
     else
     {
-        p_ = other.p_->move(max_size, &d_);
+        p_ = other.p_->move(kMAX_SIZE, &d_);
     }
 }
 
@@ -62,7 +62,7 @@ STVar::operator=(STVar const& rhs)
         destroy();
         if (rhs.p_ != nullptr)
         {
-            p_ = rhs.p_->copy(max_size, &d_);
+            p_ = rhs.p_->copy(kMAX_SIZE, &d_);
         }
         else
         {
@@ -79,25 +79,25 @@ STVar::operator=(STVar&& rhs)
     if (&rhs != this)
     {
         destroy();
-        if (rhs.on_heap())
+        if (rhs.onHeap())
         {
             p_ = rhs.p_;
             rhs.p_ = nullptr;
         }
         else
         {
-            p_ = rhs.p_->move(max_size, &d_);
+            p_ = rhs.p_->move(kMAX_SIZE, &d_);
         }
     }
 
     return *this;
 }
 
-STVar::STVar(defaultObject_t, SField const& name) : STVar(name.fieldType, name)
+STVar::STVar(DefaultObjectT, SField const& name) : STVar(name.fieldType, name)
 {
 }
 
-STVar::STVar(nonPresentObject_t, SField const& name) : STVar(STI_NOTPRESENT, name)
+STVar::STVar(NonPresentObjectT, SField const& name) : STVar(STI_NOTPRESENT, name)
 {
 }
 
@@ -119,7 +119,7 @@ STVar::STVar(SerializedTypeID id, SField const& name)
 void
 STVar::destroy()
 {
-    if (on_heap())
+    if (onHeap())
     {
         delete p_;
     }
@@ -149,8 +149,9 @@ STVar::constructST(SerializedTypeID id, int depth, Args&&... args)
         }
         else
         {
-            constexpr bool alwaysFalse = !std::is_same_v<std::tuple<Args...>, std::tuple<Args...>>;
-            static_assert(alwaysFalse, "Invalid STVar constructor arguments");
+            constexpr bool kALWAYS_FALSE =
+                !std::is_same_v<std::tuple<Args...>, std::tuple<Args...>>;
+            static_assert(kALWAYS_FALSE, "Invalid STVar constructor arguments");
         }
     };
 
diff --git a/src/libxrpl/protocol/STVector256.cpp b/src/libxrpl/protocol/STVector256.cpp
index 038f88c226..d720067508 100644
--- a/src/libxrpl/protocol/STVector256.cpp
+++ b/src/libxrpl/protocol/STVector256.cpp
@@ -27,10 +27,10 @@ STVector256::STVector256(SerialIter& sit, SField const& name) : STBase(name)
 
     auto const cnt = slice.size() / uint256::size();
 
-    mValue.reserve(cnt);
+    value_.reserve(cnt);
 
     for (std::size_t i = 0; i != cnt; ++i)
-        mValue.emplace_back(slice.substr(i * uint256::size(), uint256::size()));
+        value_.emplace_back(slice.substr(i * uint256::size(), uint256::size()));
 }
 
 STBase*
@@ -54,7 +54,7 @@ STVector256::getSType() const
 bool
 STVector256::isDefault() const
 {
-    return mValue.empty();
+    return value_.empty();
 }
 
 void
@@ -62,22 +62,22 @@ STVector256::add(Serializer& s) const
 {
     XRPL_ASSERT(getFName().isBinary(), "xrpl::STVector256::add : field is binary");
     XRPL_ASSERT(getFName().fieldType == STI_VECTOR256, "xrpl::STVector256::add : valid field type");
-    s.addVL(mValue.begin(), mValue.end(), mValue.size() * (256 / 8));
+    s.addVL(value_.begin(), value_.end(), value_.size() * (256 / 8));
 }
 
 bool
 STVector256::isEquivalent(STBase const& t) const
 {
     STVector256 const* v = dynamic_cast<STVector256 const*>(&t);
-    return (v != nullptr) && (mValue == v->mValue);
+    return (v != nullptr) && (value_ == v->value_);
 }
 
-Json::Value
+json::Value
 STVector256::getJson(JsonOptions) const
 {
-    Json::Value ret(Json::arrayValue);
+    json::Value ret(json::ArrayValue);
 
-    for (auto const& vEntry : mValue)
+    for (auto const& vEntry : value_)
         ret.append(to_string(vEntry));
 
     return ret;
diff --git a/src/libxrpl/protocol/STXChainBridge.cpp b/src/libxrpl/protocol/STXChainBridge.cpp
index a29bf3b6f9..35f47f891e 100644
--- a/src/libxrpl/protocol/STXChainBridge.cpp
+++ b/src/libxrpl/protocol/STXChainBridge.cpp
@@ -51,11 +51,11 @@ STXChainBridge::STXChainBridge(STObject const& o)
 {
 }
 
-STXChainBridge::STXChainBridge(Json::Value const& v) : STXChainBridge{sfXChainBridge, v}
+STXChainBridge::STXChainBridge(json::Value const& v) : STXChainBridge{sfXChainBridge, v}
 {
 }
 
-STXChainBridge::STXChainBridge(SField const& name, Json::Value const& v) : STBase{name}
+STXChainBridge::STXChainBridge(SField const& name, json::Value const& v) : STBase{name}
 {
     if (!v.isObject())
     {
@@ -63,12 +63,12 @@ STXChainBridge::STXChainBridge(SField const& name, Json::Value const& v) : STBas
             "STXChainBridge can only be specified with a 'object' Json value");
     }
 
-    auto checkExtra = [](Json::Value const& v) {
-        static auto const bridgeJson = xrpl::STXChainBridge().getJson(xrpl::JsonOptions::none);
+    auto checkExtra = [](json::Value const& v) {
+        static auto const kBRIDGE_JSON = xrpl::STXChainBridge().getJson(xrpl::JsonOptions::KNone);
         for (auto it = v.begin(); it != v.end(); ++it)
         {
             std::string const name = it.memberName();
-            if (!bridgeJson.isMember(name))
+            if (!kBRIDGE_JSON.isMember(name))
             {
                 Throw<std::runtime_error>("STXChainBridge extra field detected: " + name);
             }
@@ -77,10 +77,10 @@ STXChainBridge::STXChainBridge(SField const& name, Json::Value const& v) : STBas
     };
     checkExtra(v);
 
-    Json::Value const& lockingChainDoorStr = v[jss::LockingChainDoor];
-    Json::Value const& lockingChainIssue = v[jss::LockingChainIssue];
-    Json::Value const& issuingChainDoorStr = v[jss::IssuingChainDoor];
-    Json::Value const& issuingChainIssue = v[jss::IssuingChainIssue];
+    json::Value const& lockingChainDoorStr = v[jss::LockingChainDoor];
+    json::Value const& lockingChainIssue = v[jss::LockingChainIssue];
+    json::Value const& issuingChainDoorStr = v[jss::IssuingChainDoor];
+    json::Value const& issuingChainIssue = v[jss::IssuingChainIssue];
 
     if (!lockingChainDoorStr.isString())
     {
@@ -126,10 +126,10 @@ STXChainBridge::add(Serializer& s) const
     issuingChainIssue_.add(s);
 }
 
-Json::Value
+json::Value
 STXChainBridge::getJson(JsonOptions jo) const
 {
-    Json::Value v;
+    json::Value v;
     v[jss::LockingChainDoor] = lockingChainDoor_.getJson(jo);
     v[jss::LockingChainIssue] = lockingChainIssue_.getJson(jo);
     v[jss::IssuingChainDoor] = issuingChainDoor_.getJson(jo);
diff --git a/src/libxrpl/protocol/SecretKey.cpp b/src/libxrpl/protocol/SecretKey.cpp
index 19ec3267ae..d5fe54867a 100644
--- a/src/libxrpl/protocol/SecretKey.cpp
+++ b/src/libxrpl/protocol/SecretKey.cpp
@@ -32,7 +32,7 @@ namespace xrpl {
 
 SecretKey::~SecretKey()
 {
-    secure_erase(buf_, sizeof(buf_));
+    secureErase(buf_, sizeof(buf_));
 }
 
 SecretKey::SecretKey(std::array<std::uint8_t, 32> const& key)
@@ -43,12 +43,12 @@ SecretKey::SecretKey(std::array<std::uint8_t, 32> const& key)
 SecretKey::SecretKey(Slice const& slice)
 {
     if (slice.size() != sizeof(buf_))
-        LogicError("SecretKey::SecretKey: invalid size");
+        logicError("SecretKey::SecretKey: invalid size");
     std::memcpy(buf_, slice.data(), sizeof(buf_));
 }
 
 std::string
-SecretKey::to_string() const
+SecretKey::toString() const
 {
     return strHex(*this);
 }
@@ -56,7 +56,7 @@ SecretKey::to_string() const
 namespace detail {
 
 void
-copy_uint32(std::uint8_t* out, std::uint32_t v)
+copyUint32(std::uint8_t* out, std::uint32_t v)
 {
     *out++ = v >> 24;
     *out++ = (v >> 16) & 0xff;
@@ -84,13 +84,13 @@ deriveDeterministicRootKey(Seed const& seed)
     // more iterations loop a few times.
     for (std::uint32_t seq = 0; seq != 128; ++seq)
     {
-        copy_uint32(buf.data() + 16, seq);
+        copyUint32(buf.data() + 16, seq);
 
         auto const ret = sha512Half(buf);
 
         if (secp256k1_ec_seckey_verify(secp256k1Context(), ret.data()) == 1)
         {
-            secure_erase(buf.data(), buf.size());
+            secureErase(buf.data(), buf.size());
             return ret;
         }
     }
@@ -137,19 +137,19 @@ private:
 
         std::array<std::uint8_t, 41> buf{};
         std::ranges::copy(generator_, buf.begin());
-        copy_uint32(buf.data() + 33, seq);
+        copyUint32(buf.data() + 33, seq);
 
         // The odds that this loop executes more than once are negligible
         // but we impose a maximum limit just in case.
         for (std::uint32_t subseq = 0; subseq != 128; ++subseq)
         {
-            copy_uint32(buf.data() + 37, subseq);
+            copyUint32(buf.data() + 37, subseq);
 
-            auto const ret = sha512Half_s(buf);
+            auto const ret = sha512HalfS(buf);
 
             if (secp256k1_ec_seckey_verify(secp256k1Context(), ret.data()) == 1)
             {
-                secure_erase(buf.data(), buf.size());
+                secureErase(buf.data(), buf.size());
                 return ret;
             }
         }
@@ -162,19 +162,19 @@ public:
     {
         secp256k1_pubkey pubkey;
         if (secp256k1_ec_pubkey_create(secp256k1Context(), &pubkey, root_.data()) != 1)
-            LogicError("derivePublicKey: secp256k1_ec_pubkey_create failed");
+            logicError("derivePublicKey: secp256k1_ec_pubkey_create failed");
 
         auto len = generator_.size();
 
         if (secp256k1_ec_pubkey_serialize(
                 secp256k1Context(), generator_.data(), &len, &pubkey, SECP256K1_EC_COMPRESSED) != 1)
-            LogicError("derivePublicKey: secp256k1_ec_pubkey_serialize failed");
+            logicError("derivePublicKey: secp256k1_ec_pubkey_serialize failed");
     }
 
     ~Generator()
     {
-        secure_erase(root_.data(), root_.size());
-        secure_erase(generator_.data(), generator_.size());
+        secureErase(root_.data(), root_.size());
+        secureErase(generator_.data(), generator_.size());
     }
 
     /** Generate the nth key pair. */
@@ -188,14 +188,14 @@ public:
             if (secp256k1_ec_seckey_tweak_add(secp256k1Context(), rpk.data(), tweak.data()) == 1)
             {
                 SecretKey const sk{Slice{rpk.data(), rpk.size()}};
-                secure_erase(rpk.data(), rpk.size());
+                secureErase(rpk.data(), rpk.size());
                 return sk;
             }
 
-            LogicError("Unable to add a tweak!");
+            logicError("Unable to add a tweak!");
         }();
 
-        return {derivePublicKey(KeyType::secp256k1, gsk), gsk};
+        return {derivePublicKey(KeyType::Secp256k1, gsk), gsk};
     }
 };
 
@@ -204,24 +204,24 @@ public:
 Buffer
 signDigest(PublicKey const& pk, SecretKey const& sk, uint256 const& digest)
 {
-    if (publicKeyType(pk.slice()) != KeyType::secp256k1)
-        LogicError("sign: secp256k1 required for digest signing");
+    if (publicKeyType(pk.slice()) != KeyType::Secp256k1)
+        logicError("sign: secp256k1 required for digest signing");
 
     BOOST_ASSERT(sk.size() == 32);
-    secp256k1_ecdsa_signature sig_imp;
+    secp256k1_ecdsa_signature sigImp;
     if (secp256k1_ecdsa_sign(
             secp256k1Context(),
-            &sig_imp,
+            &sigImp,
             reinterpret_cast<unsigned char const*>(digest.data()),
             reinterpret_cast<unsigned char const*>(sk.data()),
             secp256k1_nonce_function_rfc6979,
             nullptr) != 1)
-        LogicError("sign: secp256k1_ecdsa_sign failed");
+        logicError("sign: secp256k1_ecdsa_sign failed");
 
     unsigned char sig[72];
     size_t len = sizeof(sig);
-    if (secp256k1_ecdsa_signature_serialize_der(secp256k1Context(), sig, &len, &sig_imp) != 1)
-        LogicError("sign: secp256k1_ecdsa_signature_serialize_der failed");
+    if (secp256k1_ecdsa_signature_serialize_der(secp256k1Context(), sig, &len, &sigImp) != 1)
+        logicError("sign: secp256k1_ecdsa_signature_serialize_der failed");
 
     return Buffer{sig, len};
 }
@@ -231,39 +231,39 @@ sign(PublicKey const& pk, SecretKey const& sk, Slice const& m)
 {
     auto const type = publicKeyType(pk.slice());
     if (!type)
-        LogicError("sign: invalid type");
+        logicError("sign: invalid type");
     switch (*type)
     {
-        case KeyType::ed25519: {
+        case KeyType::Ed25519: {
             Buffer b(64);
             ed25519_sign(m.data(), m.size(), sk.data(), pk.data() + 1, b.data());
             return b;
         }
-        case KeyType::secp256k1: {
+        case KeyType::Secp256k1: {
             sha512_half_hasher h;
             h(m.data(), m.size());
             auto const digest = sha512_half_hasher::result_type(h);
 
-            secp256k1_ecdsa_signature sig_imp;
+            secp256k1_ecdsa_signature sigImp;
             if (secp256k1_ecdsa_sign(
                     secp256k1Context(),
-                    &sig_imp,
+                    &sigImp,
                     reinterpret_cast<unsigned char const*>(digest.data()),
                     reinterpret_cast<unsigned char const*>(sk.data()),
                     secp256k1_nonce_function_rfc6979,
                     nullptr) != 1)
-                LogicError("sign: secp256k1_ecdsa_sign failed");
+                logicError("sign: secp256k1_ecdsa_sign failed");
 
             unsigned char sig[72];
             size_t len = sizeof(sig);
-            if (secp256k1_ecdsa_signature_serialize_der(secp256k1Context(), sig, &len, &sig_imp) !=
+            if (secp256k1_ecdsa_signature_serialize_der(secp256k1Context(), sig, &len, &sigImp) !=
                 1)
-                LogicError("sign: secp256k1_ecdsa_signature_serialize_der failed");
+                logicError("sign: secp256k1_ecdsa_signature_serialize_der failed");
 
             return Buffer{sig, len};
         }
         default:
-            LogicError("sign: invalid type");
+            logicError("sign: invalid type");
     }
 }
 
@@ -271,32 +271,32 @@ SecretKey
 randomSecretKey()
 {
     std::uint8_t buf[32];
-    beast::rngfill(buf, sizeof(buf), crypto_prng());
+    beast::rngfill(buf, sizeof(buf), cryptoPrng());
     SecretKey const sk(Slice{buf, sizeof(buf)});
-    secure_erase(buf, sizeof(buf));
+    secureErase(buf, sizeof(buf));
     return sk;
 }
 
 SecretKey
 generateSecretKey(KeyType type, Seed const& seed)
 {
-    if (type == KeyType::ed25519)
+    if (type == KeyType::Ed25519)
     {
-        auto key = sha512Half_s(Slice(seed.data(), seed.size()));
+        auto key = sha512HalfS(Slice(seed.data(), seed.size()));
         SecretKey const sk{Slice{key.data(), key.size()}};
-        secure_erase(key.data(), key.size());
+        secureErase(key.data(), key.size());
         return sk;
     }
 
-    if (type == KeyType::secp256k1)
+    if (type == KeyType::Secp256k1)
     {
         auto key = detail::deriveDeterministicRootKey(seed);
         SecretKey const sk{Slice{key.data(), key.size()}};
-        secure_erase(key.data(), key.size());
+        secureErase(key.data(), key.size());
         return sk;
     }
 
-    LogicError("generateSecretKey: unknown key type");
+    logicError("generateSecretKey: unknown key type");
 }
 
 PublicKey
@@ -304,30 +304,30 @@ derivePublicKey(KeyType type, SecretKey const& sk)
 {
     switch (type)
     {
-        case KeyType::secp256k1: {
-            secp256k1_pubkey pubkey_imp;
+        case KeyType::Secp256k1: {
+            secp256k1_pubkey pubkeyImp;
             if (secp256k1_ec_pubkey_create(
                     secp256k1Context(),
-                    &pubkey_imp,
+                    &pubkeyImp,
                     reinterpret_cast<unsigned char const*>(sk.data())) != 1)
-                LogicError("derivePublicKey: secp256k1_ec_pubkey_create failed");
+                logicError("derivePublicKey: secp256k1_ec_pubkey_create failed");
 
             unsigned char pubkey[33];
             std::size_t len = sizeof(pubkey);
             if (secp256k1_ec_pubkey_serialize(
-                    secp256k1Context(), pubkey, &len, &pubkey_imp, SECP256K1_EC_COMPRESSED) != 1)
-                LogicError("derivePublicKey: secp256k1_ec_pubkey_serialize failed");
+                    secp256k1Context(), pubkey, &len, &pubkeyImp, SECP256K1_EC_COMPRESSED) != 1)
+                logicError("derivePublicKey: secp256k1_ec_pubkey_serialize failed");
 
             return PublicKey{Slice{pubkey, len}};
         }
-        case KeyType::ed25519: {
+        case KeyType::Ed25519: {
             unsigned char buf[33];
             buf[0] = 0xED;
             ed25519_publickey(sk.data(), &buf[1]);
             return PublicKey(Slice{buf, sizeof(buf)});
         }
         default:
-            LogicError("derivePublicKey: bad key type");
+            logicError("derivePublicKey: bad key type");
     };
 }
 
@@ -336,12 +336,12 @@ generateKeyPair(KeyType type, Seed const& seed)
 {
     switch (type)
     {
-        case KeyType::secp256k1: {
+        case KeyType::Secp256k1: {
             detail::Generator const g(seed);
             return g(0);
         }
         default:
-        case KeyType::ed25519: {
+        case KeyType::Ed25519: {
             auto const sk = generateSecretKey(type, seed);
             return {derivePublicKey(type, sk), sk};
         }
diff --git a/src/libxrpl/protocol/Seed.cpp b/src/libxrpl/protocol/Seed.cpp
index 0fe525a613..f15d4dcff0 100644
--- a/src/libxrpl/protocol/Seed.cpp
+++ b/src/libxrpl/protocol/Seed.cpp
@@ -25,20 +25,20 @@ namespace xrpl {
 
 Seed::~Seed()
 {
-    secure_erase(buf_.data(), buf_.size());
+    secureErase(buf_.data(), buf_.size());
 }
 
 Seed::Seed(Slice const& slice)
 {
     if (slice.size() != buf_.size())
-        LogicError("Seed::Seed: invalid size");
+        logicError("Seed::Seed: invalid size");
     std::memcpy(buf_.data(), slice.data(), buf_.size());
 }
 
 Seed::Seed(uint128 const& seed)
 {
     if (seed.size() != buf_.size())
-        LogicError("Seed::Seed: invalid size");
+        logicError("Seed::Seed: invalid size");
     std::memcpy(buf_.data(), seed.data(), buf_.size());
 }
 
@@ -48,9 +48,9 @@ Seed
 randomSeed()
 {
     std::array<std::uint8_t, 16> buffer{};
-    beast::rngfill(buffer.data(), buffer.size(), crypto_prng());
+    beast::rngfill(buffer.data(), buffer.size(), cryptoPrng());
     Seed const seed(makeSlice(buffer));
-    secure_erase(buffer.data(), buffer.size());
+    secureErase(buffer.data(), buffer.size());
     return seed;
 }
 
diff --git a/src/libxrpl/protocol/Serializer.cpp b/src/libxrpl/protocol/Serializer.cpp
index 576e3f3e5f..d500919df9 100644
--- a/src/libxrpl/protocol/Serializer.cpp
+++ b/src/libxrpl/protocol/Serializer.cpp
@@ -24,9 +24,9 @@ namespace xrpl {
 int
 Serializer::add16(std::uint16_t i)
 {
-    int const ret = mData.size();
-    mData.push_back(static_cast<unsigned char>(i >> 8));
-    mData.push_back(static_cast<unsigned char>(i & 0xff));
+    int const ret = data_.size();
+    data_.push_back(static_cast<unsigned char>(i >> 8));
+    data_.push_back(static_cast<unsigned char>(i & 0xff));
     return ret;
 }
 
@@ -37,7 +37,7 @@ Serializer::add32(HashPrefix p)
     // integral parts of the protocol and unlikely to ever change.
     static_assert(std::is_same_v<std::uint32_t, std::underlying_type_t<decltype(p)>>);
 
-    return add32(safe_cast<std::uint32_t>(p));
+    return add32(safeCast<std::uint32_t>(p));
 }
 
 template <>
@@ -74,39 +74,39 @@ Serializer::addInteger(std::int32_t i)
 int
 Serializer::addRaw(Blob const& vector)
 {
-    int const ret = mData.size();
-    mData.insert(mData.end(), vector.begin(), vector.end());
+    int const ret = data_.size();
+    data_.insert(data_.end(), vector.begin(), vector.end());
     return ret;
 }
 
 int
 Serializer::addRaw(Slice slice)
 {
-    int const ret = mData.size();
-    mData.insert(mData.end(), slice.begin(), slice.end());
+    int const ret = data_.size();
+    data_.insert(data_.end(), slice.begin(), slice.end());
     return ret;
 }
 
 int
 Serializer::addRaw(Serializer const& s)
 {
-    int const ret = mData.size();
-    mData.insert(mData.end(), s.begin(), s.end());
+    int const ret = data_.size();
+    data_.insert(data_.end(), s.begin(), s.end());
     return ret;
 }
 
 int
 Serializer::addRaw(void const* ptr, int len)
 {
-    int const ret = mData.size();
-    mData.insert(mData.end(), (char const*)ptr, ((char const*)ptr) + len);
+    int const ret = data_.size();
+    data_.insert(data_.end(), (char const*)ptr, ((char const*)ptr) + len);
     return ret;
 }
 
 int
 Serializer::addFieldID(int type, int name)
 {
-    int const ret = mData.size();
+    int const ret = data_.size();
     XRPL_ASSERT(
         (type > 0) && (type < 256) && (name > 0) && (name < 256),
         "xrpl::Serializer::addFieldID : inputs inside range");
@@ -114,28 +114,29 @@ Serializer::addFieldID(int type, int name)
     if (type < 16)
     {
         if (name < 16)
-        {  // common type, common name
-            mData.push_back(static_cast<unsigned char>((type << 4) | name));
+        {
+            // common type, common name
+            data_.push_back(static_cast<unsigned char>((type << 4) | name));
         }
         else
         {
             // common type, uncommon name
-            mData.push_back(static_cast<unsigned char>(type << 4));
-            mData.push_back(static_cast<unsigned char>(name));
+            data_.push_back(static_cast<unsigned char>(type << 4));
+            data_.push_back(static_cast<unsigned char>(name));
         }
     }
     else if (name < 16)
     {
         // uncommon type, common name
-        mData.push_back(static_cast<unsigned char>(name));
-        mData.push_back(static_cast<unsigned char>(type));
+        data_.push_back(static_cast<unsigned char>(name));
+        data_.push_back(static_cast<unsigned char>(type));
     }
     else
     {
         // uncommon type, uncommon name
-        mData.push_back(static_cast<unsigned char>(0));
-        mData.push_back(static_cast<unsigned char>(type));
-        mData.push_back(static_cast<unsigned char>(name));
+        data_.push_back(static_cast<unsigned char>(0));
+        data_.push_back(static_cast<unsigned char>(type));
+        data_.push_back(static_cast<unsigned char>(name));
     }
 
     return ret;
@@ -144,35 +145,35 @@ Serializer::addFieldID(int type, int name)
 int
 Serializer::add8(unsigned char byte)
 {
-    int const ret = mData.size();
-    mData.push_back(byte);
+    int const ret = data_.size();
+    data_.push_back(byte);
     return ret;
 }
 
 bool
 Serializer::get8(int& byte, int offset) const
 {
-    if (offset >= mData.size())
+    if (offset >= data_.size())
         return false;
 
-    byte = mData[offset];
+    byte = data_[offset];
     return true;
 }
 
 bool
 Serializer::chop(int bytes)
 {
-    if (bytes > mData.size())
+    if (bytes > data_.size())
         return false;
 
-    mData.resize(mData.size() - bytes);
+    data_.resize(data_.size() - bytes);
     return true;
 }
 
 uint256
 Serializer::getSHA512Half() const
 {
-    return sha512Half(makeSlice(mData));
+    return sha512Half(makeSlice(data_));
 }
 
 int
@@ -181,7 +182,7 @@ Serializer::addVL(Blob const& vector)
     int const ret = addEncoded(vector.size());
     addRaw(vector);
     XRPL_ASSERT(
-        mData.size() == (ret + vector.size() + encodeLengthLength(vector.size())),
+        data_.size() == (ret + vector.size() + encodeLengthLength(vector.size())),
         "xrpl::Serializer::addVL : size matches expected");
     return ret;
 }
diff --git a/src/libxrpl/protocol/Sign.cpp b/src/libxrpl/protocol/Sign.cpp
index bee034d60e..9e7ef7f999 100644
--- a/src/libxrpl/protocol/Sign.cpp
+++ b/src/libxrpl/protocol/Sign.cpp
@@ -81,7 +81,7 @@ Serializer
 startMultiSigningData(STObject const& obj)
 {
     Serializer s;
-    s.add32(HashPrefix::txMultiSign);
+    s.add32(HashPrefix::TxMultiSign);
     obj.addWithoutSigningFields(s);
     return s;
 }
diff --git a/src/libxrpl/protocol/TER.cpp b/src/libxrpl/protocol/TER.cpp
index 1e3f64cc22..3654547dd2 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 results
+            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 results;
+    return kRESULTS;
 }
 
 bool
@@ -262,7 +262,7 @@ transHuman(TER code)
 std::optional<TER>
 transCode(std::string const& token)
 {
-    static auto const results = [] {
+    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 = results.find(token);
+    auto const r = kRESULTS.find(token);
 
-    if (r == results.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 a2a7c5facf..083889622c 100644
--- a/src/libxrpl/protocol/TxFormats.cpp
+++ b/src/libxrpl/protocol/TxFormats.cpp
@@ -12,26 +12,26 @@ namespace xrpl {
 std::vector<SOElement> const&
 TxFormats::getCommonFields()
 {
-    static auto const commonFields = std::vector<SOElement>{
-        {sfTransactionType, soeREQUIRED},
-        {sfFlags, soeOPTIONAL},
-        {sfSourceTag, soeOPTIONAL},
-        {sfAccount, soeREQUIRED},
-        {sfSequence, soeREQUIRED},
-        {sfPreviousTxnID, soeOPTIONAL},  // emulate027
-        {sfLastLedgerSequence, soeOPTIONAL},
-        {sfAccountTxnID, soeOPTIONAL},
-        {sfFee, soeREQUIRED},
-        {sfOperationLimit, soeOPTIONAL},
-        {sfMemos, soeOPTIONAL},
-        {sfSigningPubKey, soeREQUIRED},
-        {sfTicketSequence, soeOPTIONAL},
-        {sfTxnSignature, soeOPTIONAL},
-        {sfSigners, soeOPTIONAL},  // submit_multisigned
-        {sfNetworkID, soeOPTIONAL},
-        {sfDelegate, soeOPTIONAL},
+    static auto const kCOMMON_FIELDS = std::vector<SOElement>{
+        {sfTransactionType, SoeRequired},
+        {sfFlags, SoeOptional},
+        {sfSourceTag, SoeOptional},
+        {sfAccount, SoeRequired},
+        {sfSequence, SoeRequired},
+        {sfPreviousTxnID, SoeOptional},  // emulate027
+        {sfLastLedgerSequence, SoeOptional},
+        {sfAccountTxnID, SoeOptional},
+        {sfFee, SoeRequired},
+        {sfOperationLimit, SoeOptional},
+        {sfMemos, SoeOptional},
+        {sfSigningPubKey, SoeRequired},
+        {sfTicketSequence, SoeOptional},
+        {sfTxnSignature, SoeOptional},
+        {sfSigners, SoeOptional},  // submit_multisigned
+        {sfNetworkID, SoeOptional},
+        {sfDelegate, SoeOptional},
     };
-    return commonFields;
+    return kCOMMON_FIELDS;
 }
 
 TxFormats::TxFormats()
@@ -56,8 +56,8 @@ TxFormats::TxFormats()
 TxFormats const&
 TxFormats::getInstance()
 {
-    static TxFormats const instance;
-    return instance;
+    static TxFormats const kINSTANCE;
+    return kINSTANCE;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/TxMeta.cpp b/src/libxrpl/protocol/TxMeta.cpp
index 08069ca83d..0373706e84 100644
--- a/src/libxrpl/protocol/TxMeta.cpp
+++ b/src/libxrpl/protocol/TxMeta.cpp
@@ -73,7 +73,7 @@ TxMeta::setAffectedNode(uint256 const& node, SField const& type, std::uint16_t n
         }
     }
 
-    nodes_.push_back(STObject(type));
+    nodes_.pushBack(STObject(type));
     STObject& obj = nodes_.back();
 
     XRPL_ASSERT(obj.getFName() == type, "xrpl::TxMeta::setAffectedNode : field type match");
@@ -154,7 +154,7 @@ TxMeta::getAffectedNode(SLE::ref node, SField const& type)
         if (n.getFieldH256(sfLedgerIndex) == index)
             return n;
     }
-    nodes_.push_back(STObject(type));
+    nodes_.pushBack(STObject(type));
     STObject& obj = nodes_.back();
 
     XRPL_ASSERT(
@@ -187,7 +187,7 @@ TxMeta::getAsObject() const
     XRPL_ASSERT(result_ != 255, "xrpl::TxMeta::getAsObject : result_ is set");
     metaData.setFieldU8(sfTransactionResult, result_);
     metaData.setFieldU32(sfTransactionIndex, index_);
-    metaData.emplace_back(nodes_);
+    metaData.emplaceBack(nodes_);
     if (deliveredAmount_.has_value())
         metaData.setFieldAmount(sfDeliveredAmount, *deliveredAmount_);
 
diff --git a/src/libxrpl/protocol/UintTypes.cpp b/src/libxrpl/protocol/UintTypes.cpp
index 4206ec8cf5..adef5e2c14 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 isoCharSet =
+constexpr std::string_view kISO_CHAR_SET =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "0123456789"
     "<>(){}[]|?!@#$%^&*";
 
 // The location (in bytes) of the 3 digit currency inside a 160-bit value
-constexpr std::size_t isoCodeOffset = 12;
+constexpr std::size_t kISO_CODE_OFFSET = 12;
 
 // The length of an ISO-4217 like code
-constexpr std::size_t isoCodeLength = 3;
+constexpr std::size_t kISO_CODE_LENGTH = 3;
 
 }  // namespace detail
 
 std::string
 to_string(Currency const& currency)
 {
-    if (currency == beast::zero)
+    if (currency == beast::kZERO)
         return systemCurrencyCode();
 
     if (currency == noCurrency())
         return "1";
 
-    static constexpr Currency sIsoBits("FFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF");
+    static constexpr Currency kS_ISO_BITS("FFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFF");
 
-    if ((currency & sIsoBits).isZero())
+    if ((currency & kS_ISO_BITS).isZero())
     {
         std::string const iso(
-            currency.data() + detail::isoCodeOffset,
-            currency.data() + detail::isoCodeOffset + detail::isoCodeLength);
+            currency.data() + detail::kISO_CODE_OFFSET,
+            currency.data() + detail::kISO_CODE_OFFSET + detail::kISO_CODE_LENGTH);
 
         // Specifying the system currency code using ISO-style representation
         // is not allowed.
         if ((iso != systemCurrencyCode()) &&
-            (iso.find_first_not_of(detail::isoCharSet) == std::string::npos))
+            (iso.find_first_not_of(detail::kISO_CHAR_SET) == std::string::npos))
         {
             return iso;
         }
@@ -62,23 +62,23 @@ to_string(Currency const& currency)
 }
 
 bool
-to_currency(Currency& currency, std::string const& code)
+toCurrency(Currency& currency, std::string const& code)
 {
     if (code.empty() || (code.compare(systemCurrencyCode()) == 0))
     {
-        currency = beast::zero;
+        currency = beast::kZERO;
         return true;
     }
 
     // Handle ISO-4217-like 3-digit character codes.
-    if (code.size() == detail::isoCodeLength)
+    if (code.size() == detail::kISO_CODE_LENGTH)
     {
-        if (code.find_first_not_of(detail::isoCharSet) != std::string::npos)
+        if (code.find_first_not_of(detail::kISO_CHAR_SET) != std::string::npos)
             return false;
 
-        currency = beast::zero;
+        currency = beast::kZERO;
 
-        std::ranges::copy(code, currency.begin() + detail::isoCodeOffset);
+        std::ranges::copy(code, currency.begin() + detail::kISO_CODE_OFFSET);
 
         return true;
     }
@@ -87,10 +87,10 @@ to_currency(Currency& currency, std::string const& code)
 }
 
 Currency
-to_currency(std::string const& code)
+toCurrency(std::string const& code)
 {
     Currency currency;
-    if (!to_currency(currency, code))
+    if (!toCurrency(currency, code))
         currency = noCurrency();
     return currency;
 }
@@ -98,22 +98,22 @@ to_currency(std::string const& code)
 Currency const&
 xrpCurrency()
 {
-    static Currency const currency(beast::zero);
-    return currency;
+    static Currency const kCURRENCY(beast::kZERO);
+    return kCURRENCY;
 }
 
 Currency const&
 noCurrency()
 {
-    static Currency const currency(1);
-    return currency;
+    static Currency const kCURRENCY(1);
+    return kCURRENCY;
 }
 
 Currency const&
 badCurrency()
 {
-    static Currency const currency(0x5852500000000000);
-    return currency;
+    static Currency const kCURRENCY(0x5852500000000000);
+    return kCURRENCY;
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/protocol/XChainAttestations.cpp b/src/libxrpl/protocol/XChainAttestations.cpp
index 8d3e62b31e..f89ad6a52c 100644
--- a/src/libxrpl/protocol/XChainAttestations.cpp
+++ b/src/libxrpl/protocol/XChainAttestations.cpp
@@ -27,20 +27,20 @@ namespace xrpl {
 namespace Attestations {
 
 AttestationBase::AttestationBase(
-    AccountID attestationSignerAccount_,
-    PublicKey const& publicKey_,
-    Buffer signature_,
-    AccountID const& sendingAccount_,
-    STAmount sendingAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_)
-    : attestationSignerAccount{attestationSignerAccount_}
-    , publicKey{publicKey_}
-    , signature{std::move(signature_)}
-    , sendingAccount{sendingAccount_}
-    , sendingAmount{std::move(sendingAmount_)}
-    , rewardAccount{rewardAccount_}
-    , wasLockingChainSend{wasLockingChainSend_}
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    Buffer signature,
+    AccountID const& sendingAccount,
+    STAmount sendingAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend)
+    : attestationSignerAccount{attestationSignerAccount}
+    , publicKey{publicKey}
+    , signature{std::move(signature)}
+    , sendingAccount{sendingAccount}
+    , sendingAmount{std::move(sendingAmount)}
+    , rewardAccount{rewardAccount}
+    , wasLockingChainSend{wasLockingChainSend}
 {
 }
 
@@ -90,14 +90,14 @@ AttestationBase::AttestationBase(STObject const& o)
 {
 }
 
-AttestationBase::AttestationBase(Json::Value const& v)
-    : attestationSignerAccount{Json::getOrThrow<AccountID>(v, sfAttestationSignerAccount)}
-    , publicKey{Json::getOrThrow<PublicKey>(v, sfPublicKey)}
-    , signature{Json::getOrThrow<Buffer>(v, sfSignature)}
-    , sendingAccount{Json::getOrThrow<AccountID>(v, sfAccount)}
-    , sendingAmount{Json::getOrThrow<STAmount>(v, sfAmount)}
-    , rewardAccount{Json::getOrThrow<AccountID>(v, sfAttestationRewardAccount)}
-    , wasLockingChainSend{Json::getOrThrow<bool>(v, sfWasLockingChainSend)}
+AttestationBase::AttestationBase(json::Value const& v)
+    : attestationSignerAccount{json::getOrThrow<AccountID>(v, sfAttestationSignerAccount)}
+    , publicKey{json::getOrThrow<PublicKey>(v, sfPublicKey)}
+    , signature{json::getOrThrow<Buffer>(v, sfSignature)}
+    , sendingAccount{json::getOrThrow<AccountID>(v, sfAccount)}
+    , sendingAmount{json::getOrThrow<STAmount>(v, sfAmount)}
+    , rewardAccount{json::getOrThrow<AccountID>(v, sfAttestationRewardAccount)}
+    , wasLockingChainSend{json::getOrThrow<bool>(v, sfWasLockingChainSend)}
 {
 }
 
@@ -114,52 +114,52 @@ AttestationBase::addHelper(STObject& o) const
 }
 
 AttestationClaim::AttestationClaim(
-    AccountID attestationSignerAccount_,
-    PublicKey const& publicKey_,
-    Buffer signature_,
-    AccountID const& sendingAccount_,
-    STAmount const& sendingAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::uint64_t claimID_,
-    std::optional<AccountID> const& dst_)
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    Buffer signature,
+    AccountID const& sendingAccount,
+    STAmount const& sendingAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::uint64_t claimId,
+    std::optional<AccountID> const& dst)
     : AttestationBase(
-          attestationSignerAccount_,
-          publicKey_,
-          std::move(signature_),
-          sendingAccount_,
-          sendingAmount_,
-          rewardAccount_,
-          wasLockingChainSend_)
-    , claimID{claimID_}
-    , dst{dst_}
+          attestationSignerAccount,
+          publicKey,
+          std::move(signature),
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend)
+    , claimID{claimId}
+    , dst{dst}
 {
 }
 
 AttestationClaim::AttestationClaim(
     STXChainBridge const& bridge,
-    AccountID attestationSignerAccount_,
-    PublicKey const& publicKey_,
-    SecretKey const& secretKey_,
-    AccountID const& sendingAccount_,
-    STAmount const& sendingAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::uint64_t claimID_,
-    std::optional<AccountID> const& dst_)
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    SecretKey const& secretKey,
+    AccountID const& sendingAccount,
+    STAmount const& sendingAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::uint64_t claimId,
+    std::optional<AccountID> const& dst)
     : AttestationClaim{
-          attestationSignerAccount_,
-          publicKey_,
+          attestationSignerAccount,
+          publicKey,
           Buffer{},
-          sendingAccount_,
-          sendingAmount_,
-          rewardAccount_,
-          wasLockingChainSend_,
-          claimID_,
-          dst_}
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend,
+          claimId,
+          dst}
 {
     auto const toSign = message(bridge);
-    signature = sign(publicKey_, secretKey_, makeSlice(toSign));
+    signature = sign(publicKey, secretKey, makeSlice(toSign));
 }
 
 AttestationClaim::AttestationClaim(STObject const& o)
@@ -167,11 +167,11 @@ AttestationClaim::AttestationClaim(STObject const& o)
 {
 }
 
-AttestationClaim::AttestationClaim(Json::Value const& v)
-    : AttestationBase{v}, claimID{Json::getOrThrow<std::uint64_t>(v, sfXChainClaimID)}
+AttestationClaim::AttestationClaim(json::Value const& v)
+    : AttestationBase{v}, claimID{json::getOrThrow<std::uint64_t>(v, sfXChainClaimID)}
 {
     if (v.isMember(sfDestination.getJsonName()))
-        dst = Json::getOrThrow<AccountID>(v, sfDestination);
+        dst = json::getOrThrow<AccountID>(v, sfDestination);
 }
 
 STObject
@@ -195,7 +195,7 @@ AttestationClaim::message(
     std::uint64_t claimID,
     std::optional<AccountID> const& dst)
 {
-    STObject o{sfGeneric};
+    STObject o{kSF_GENERIC};
     // Serialize in SField order to make python serializers easier to write
     o[sfXChainClaimID] = claimID;
     o[sfAmount] = sendingAmount;
@@ -247,65 +247,65 @@ AttestationCreateAccount::AttestationCreateAccount(STObject const& o)
 {
 }
 
-AttestationCreateAccount::AttestationCreateAccount(Json::Value const& v)
+AttestationCreateAccount::AttestationCreateAccount(json::Value const& v)
     : AttestationBase{v}
-    , createCount{Json::getOrThrow<std::uint64_t>(v, sfXChainAccountCreateCount)}
-    , toCreate{Json::getOrThrow<AccountID>(v, sfDestination)}
-    , rewardAmount{Json::getOrThrow<STAmount>(v, sfSignatureReward)}
+    , createCount{json::getOrThrow<std::uint64_t>(v, sfXChainAccountCreateCount)}
+    , toCreate{json::getOrThrow<AccountID>(v, sfDestination)}
+    , rewardAmount{json::getOrThrow<STAmount>(v, sfSignatureReward)}
 {
 }
 
 AttestationCreateAccount::AttestationCreateAccount(
-    AccountID attestationSignerAccount_,
-    PublicKey const& publicKey_,
-    Buffer signature_,
-    AccountID const& sendingAccount_,
-    STAmount const& sendingAmount_,
-    STAmount rewardAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::uint64_t createCount_,
-    AccountID const& toCreate_)
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    Buffer signature,
+    AccountID const& sendingAccount,
+    STAmount const& sendingAmount,
+    STAmount rewardAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::uint64_t createCount,
+    AccountID const& toCreate)
     : AttestationBase(
-          attestationSignerAccount_,
-          publicKey_,
-          std::move(signature_),
-          sendingAccount_,
-          sendingAmount_,
-          rewardAccount_,
-          wasLockingChainSend_)
-    , createCount{createCount_}
-    , toCreate{toCreate_}
-    , rewardAmount{std::move(rewardAmount_)}
+          attestationSignerAccount,
+          publicKey,
+          std::move(signature),
+          sendingAccount,
+          sendingAmount,
+          rewardAccount,
+          wasLockingChainSend)
+    , createCount{createCount}
+    , toCreate{toCreate}
+    , rewardAmount{std::move(rewardAmount)}
 {
 }
 
 AttestationCreateAccount::AttestationCreateAccount(
     STXChainBridge const& bridge,
-    AccountID attestationSignerAccount_,
-    PublicKey const& publicKey_,
-    SecretKey const& secretKey_,
-    AccountID const& sendingAccount_,
-    STAmount const& sendingAmount_,
-    STAmount const& rewardAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::uint64_t createCount_,
-    AccountID const& toCreate_)
+    AccountID attestationSignerAccount,
+    PublicKey const& publicKey,
+    SecretKey const& secretKey,
+    AccountID const& sendingAccount,
+    STAmount const& sendingAmount,
+    STAmount const& rewardAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::uint64_t createCount,
+    AccountID const& toCreate)
     : AttestationCreateAccount{
-          attestationSignerAccount_,
-          publicKey_,
+          attestationSignerAccount,
+          publicKey,
           Buffer{},
-          sendingAccount_,
-          sendingAmount_,
-          rewardAmount_,
-          rewardAccount_,
-          wasLockingChainSend_,
-          createCount_,
-          toCreate_}
+          sendingAccount,
+          sendingAmount,
+          rewardAmount,
+          rewardAccount,
+          wasLockingChainSend,
+          createCount,
+          toCreate}
 {
     auto const toSign = message(bridge);
-    signature = sign(publicKey_, secretKey_, makeSlice(toSign));
+    signature = sign(publicKey, secretKey, makeSlice(toSign));
 }
 
 STObject
@@ -332,7 +332,7 @@ AttestationCreateAccount::message(
     std::uint64_t createCount,
     AccountID const& dst)
 {
-    STObject o{sfGeneric};
+    STObject o{kSF_GENERIC};
     // Serialize in SField order to make python serializers easier to write
     o[sfXChainAccountCreateCount] = createCount;
     o[sfAmount] = sendingAmount;
@@ -387,39 +387,39 @@ operator==(AttestationCreateAccount const& lhs, AttestationCreateAccount const&
 
 }  // namespace Attestations
 
-SField const& XChainClaimAttestation::ArrayFieldName{sfXChainClaimAttestations};
-SField const& XChainCreateAccountAttestation::ArrayFieldName{sfXChainCreateAccountAttestations};
+SField const& XChainClaimAttestation::arrayFieldName{sfXChainClaimAttestations};
+SField const& XChainCreateAccountAttestation::arrayFieldName{sfXChainCreateAccountAttestations};
 
 XChainClaimAttestation::XChainClaimAttestation(
-    AccountID const& keyAccount_,
-    PublicKey const& publicKey_,
-    STAmount const& amount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::optional<AccountID> const& dst_)
-    : keyAccount(keyAccount_)
-    , publicKey(publicKey_)
-    , amount(sfAmount, amount_)
-    , rewardAccount(rewardAccount_)
-    , wasLockingChainSend(wasLockingChainSend_)
-    , dst(dst_)
+    AccountID const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    std::optional<AccountID> const& dst)
+    : keyAccount(keyAccount)
+    , publicKey(publicKey)
+    , amount(sfAmount, amount)
+    , rewardAccount(rewardAccount)
+    , wasLockingChainSend(wasLockingChainSend)
+    , dst(dst)
 {
 }
 
 XChainClaimAttestation::XChainClaimAttestation(
-    STAccount const& keyAccount_,
-    PublicKey const& publicKey_,
-    STAmount const& amount_,
-    STAccount const& rewardAccount_,
-    bool wasLockingChainSend_,
-    std::optional<STAccount> const& dst_)
+    STAccount const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    STAccount const& rewardAccount,
+    bool wasLockingChainSend,
+    std::optional<STAccount> const& dst)
     : XChainClaimAttestation{
-          keyAccount_.value(),
-          publicKey_,
-          amount_,
-          rewardAccount_.value(),
-          wasLockingChainSend_,
-          dst_ ? std::optional<AccountID>{dst_->value()} : std::nullopt}
+          keyAccount.value(),
+          publicKey,
+          amount,
+          rewardAccount.value(),
+          wasLockingChainSend,
+          dst ? std::optional<AccountID>{dst->value()} : std::nullopt}
 {
 }
 
@@ -432,17 +432,17 @@ XChainClaimAttestation::XChainClaimAttestation(STObject const& o)
           o[sfWasLockingChainSend] != 0,
           o[~sfDestination]} {};
 
-XChainClaimAttestation::XChainClaimAttestation(Json::Value const& v)
+XChainClaimAttestation::XChainClaimAttestation(json::Value const& v)
     : XChainClaimAttestation{
-          Json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
-          Json::getOrThrow<PublicKey>(v, sfPublicKey),
-          Json::getOrThrow<STAmount>(v, sfAmount),
-          Json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
-          Json::getOrThrow<bool>(v, sfWasLockingChainSend),
+          json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
+          json::getOrThrow<PublicKey>(v, sfPublicKey),
+          json::getOrThrow<STAmount>(v, sfAmount),
+          json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
+          json::getOrThrow<bool>(v, sfWasLockingChainSend),
           std::nullopt}
 {
     if (v.isMember(sfDestination.getJsonName()))
-        dst = Json::getOrThrow<AccountID>(v, sfDestination);
+        dst = json::getOrThrow<AccountID>(v, sfDestination);
 };
 
 XChainClaimAttestation::XChainClaimAttestation(
@@ -500,29 +500,29 @@ AttestationMatch
 XChainClaimAttestation::match(XChainClaimAttestation::MatchFields const& rhs) const
 {
     if (std::tie(amount, wasLockingChainSend) != std::tie(rhs.amount, rhs.wasLockingChainSend))
-        return AttestationMatch::nonDstMismatch;
+        return AttestationMatch::NonDstMismatch;
     if (dst != rhs.dst)
-        return AttestationMatch::matchExceptDst;
-    return AttestationMatch::match;
+        return AttestationMatch::MatchExceptDst;
+    return AttestationMatch::Match;
 }
 
 //------------------------------------------------------------------------------
 
 XChainCreateAccountAttestation::XChainCreateAccountAttestation(
-    AccountID const& keyAccount_,
-    PublicKey const& publicKey_,
-    STAmount const& amount_,
-    STAmount const& rewardAmount_,
-    AccountID const& rewardAccount_,
-    bool wasLockingChainSend_,
-    AccountID const& dst_)
-    : keyAccount(keyAccount_)
-    , publicKey(publicKey_)
-    , amount(sfAmount, amount_)
-    , rewardAmount(sfSignatureReward, rewardAmount_)
-    , rewardAccount(rewardAccount_)
-    , wasLockingChainSend(wasLockingChainSend_)
-    , dst(dst_)
+    AccountID const& keyAccount,
+    PublicKey const& publicKey,
+    STAmount const& amount,
+    STAmount const& rewardAmount,
+    AccountID const& rewardAccount,
+    bool wasLockingChainSend,
+    AccountID const& dst)
+    : keyAccount(keyAccount)
+    , publicKey(publicKey)
+    , amount(sfAmount, amount)
+    , rewardAmount(sfSignatureReward, rewardAmount)
+    , rewardAccount(rewardAccount)
+    , wasLockingChainSend(wasLockingChainSend)
+    , dst(dst)
 {
 }
 
@@ -536,15 +536,15 @@ XChainCreateAccountAttestation::XChainCreateAccountAttestation(STObject const& o
           o[sfWasLockingChainSend] != 0,
           o[sfDestination]} {};
 
-XChainCreateAccountAttestation ::XChainCreateAccountAttestation(Json::Value const& v)
+XChainCreateAccountAttestation ::XChainCreateAccountAttestation(json::Value const& v)
     : XChainCreateAccountAttestation{
-          Json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
-          Json::getOrThrow<PublicKey>(v, sfPublicKey),
-          Json::getOrThrow<STAmount>(v, sfAmount),
-          Json::getOrThrow<STAmount>(v, sfSignatureReward),
-          Json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
-          Json::getOrThrow<bool>(v, sfWasLockingChainSend),
-          Json::getOrThrow<AccountID>(v, sfDestination)}
+          json::getOrThrow<AccountID>(v, sfAttestationSignerAccount),
+          json::getOrThrow<PublicKey>(v, sfPublicKey),
+          json::getOrThrow<STAmount>(v, sfAmount),
+          json::getOrThrow<STAmount>(v, sfSignatureReward),
+          json::getOrThrow<AccountID>(v, sfAttestationRewardAccount),
+          json::getOrThrow<bool>(v, sfWasLockingChainSend),
+          json::getOrThrow<AccountID>(v, sfDestination)}
 {
 }
 
@@ -591,10 +591,10 @@ XChainCreateAccountAttestation::match(XChainCreateAccountAttestation::MatchField
 {
     if (std::tie(amount, rewardAmount, wasLockingChainSend) !=
         std::tie(rhs.amount, rhs.rewardAmount, rhs.wasLockingChainSend))
-        return AttestationMatch::nonDstMismatch;
+        return AttestationMatch::NonDstMismatch;
     if (dst != rhs.dst)
-        return AttestationMatch::matchExceptDst;
-    return AttestationMatch::match;
+        return AttestationMatch::MatchExceptDst;
+    return AttestationMatch::Match;
 }
 
 bool
@@ -656,7 +656,7 @@ XChainAttestationsBase<TAttestation>::end()
 }
 
 template <class TAttestation>
-XChainAttestationsBase<TAttestation>::XChainAttestationsBase(Json::Value const& v)
+XChainAttestationsBase<TAttestation>::XChainAttestationsBase(json::Value const& v)
 {
     if (!v.isObject())
     {
@@ -668,7 +668,7 @@ XChainAttestationsBase<TAttestation>::XChainAttestationsBase(Json::Value const&
     attestations_ = [&] {
         auto const jAtts = v[jss::attestations];
 
-        if (jAtts.size() > maxAttestations)
+        if (jAtts.size() > kMAX_ATTESTATIONS)
             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() > maxAttestations)
+    if (arr.size() > kMAX_ATTESTATIONS)
         Throw<std::runtime_error>("XChainAttestationsBase exceeded max number of attestations");
 
     attestations_.reserve(arr.size());
@@ -694,9 +694,9 @@ template <class TAttestation>
 STArray
 XChainAttestationsBase<TAttestation>::toSTArray() const
 {
-    STArray r{TAttestation::ArrayFieldName, attestations_.size()};
+    STArray r{TAttestation::arrayFieldName, attestations_.size()};
     for (auto const& e : attestations_)
-        r.emplace_back(e.toSTObject());
+        r.emplaceBack(e.toSTObject());
     return r;
 }
 
diff --git a/src/libxrpl/protocol/digest.cpp b/src/libxrpl/protocol/digest.cpp
index 0e03882c3c..2e1b2b25cf 100644
--- a/src/libxrpl/protocol/digest.cpp
+++ b/src/libxrpl/protocol/digest.cpp
@@ -7,21 +7,21 @@
 
 namespace xrpl {
 
-openssl_ripemd160_hasher::openssl_ripemd160_hasher()
+OpensslRipemd160Hasher::OpensslRipemd160Hasher()
 {
-    static_assert(sizeof(decltype(openssl_ripemd160_hasher::ctx_)) == sizeof(RIPEMD160_CTX), "");
+    static_assert(sizeof(decltype(OpensslRipemd160Hasher::ctx_)) == sizeof(RIPEMD160_CTX), "");
     auto const ctx = reinterpret_cast<RIPEMD160_CTX*>(ctx_);
     RIPEMD160_Init(ctx);
 }
 
 void
-openssl_ripemd160_hasher::operator()(void const* data, std::size_t size) noexcept
+OpensslRipemd160Hasher::operator()(void const* data, std::size_t size) noexcept
 {
     auto const ctx = reinterpret_cast<RIPEMD160_CTX*>(ctx_);
     RIPEMD160_Update(ctx, data, size);
 }
 
-openssl_ripemd160_hasher::
+OpensslRipemd160Hasher::
 operator result_type() noexcept
 {
     auto const ctx = reinterpret_cast<RIPEMD160_CTX*>(ctx_);
@@ -32,21 +32,21 @@ operator result_type() noexcept
 
 //------------------------------------------------------------------------------
 
-openssl_sha512_hasher::openssl_sha512_hasher()
+OpensslSha512Hasher::OpensslSha512Hasher()
 {
-    static_assert(sizeof(decltype(openssl_sha512_hasher::ctx_)) == sizeof(SHA512_CTX), "");
+    static_assert(sizeof(decltype(OpensslSha512Hasher::ctx_)) == sizeof(SHA512_CTX), "");
     auto const ctx = reinterpret_cast<SHA512_CTX*>(ctx_);
     SHA512_Init(ctx);
 }
 
 void
-openssl_sha512_hasher::operator()(void const* data, std::size_t size) noexcept
+OpensslSha512Hasher::operator()(void const* data, std::size_t size) noexcept
 {
     auto const ctx = reinterpret_cast<SHA512_CTX*>(ctx_);
     SHA512_Update(ctx, data, size);
 }
 
-openssl_sha512_hasher::
+OpensslSha512Hasher::
 operator result_type() noexcept
 {
     auto const ctx = reinterpret_cast<SHA512_CTX*>(ctx_);
@@ -57,21 +57,21 @@ operator result_type() noexcept
 
 //------------------------------------------------------------------------------
 
-openssl_sha256_hasher::openssl_sha256_hasher()
+OpensslSha256Hasher::OpensslSha256Hasher()
 {
-    static_assert(sizeof(decltype(openssl_sha256_hasher::ctx_)) == sizeof(SHA256_CTX), "");
+    static_assert(sizeof(decltype(OpensslSha256Hasher::ctx_)) == sizeof(SHA256_CTX), "");
     auto const ctx = reinterpret_cast<SHA256_CTX*>(ctx_);
     SHA256_Init(ctx);
 }
 
 void
-openssl_sha256_hasher::operator()(void const* data, std::size_t size) noexcept
+OpensslSha256Hasher::operator()(void const* data, std::size_t size) noexcept
 {
     auto const ctx = reinterpret_cast<SHA256_CTX*>(ctx_);
     SHA256_Update(ctx, data, size);
 }
 
-openssl_sha256_hasher::
+OpensslSha256Hasher::
 operator result_type() noexcept
 {
     auto const ctx = reinterpret_cast<SHA256_CTX*>(ctx_);
diff --git a/src/libxrpl/protocol/tokens.cpp b/src/libxrpl/protocol/tokens.cpp
index 3cb0e3f3dd..91063d3fa6 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* alphabetForward =
+static constexpr char const* kALPHABET_FORWARD =
     "rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz";
 
-static constexpr std::array<int, 256> const alphabetReverse = []() {
+static constexpr std::array<int, 256> const kALPHABET_REVERSE = []() {
     std::array<int, 256> map{};
     for (auto& m : map)
         m = -1;
-    for (int i = 0, j = 0; alphabetForward[i] != 0; ++i)
-        map[static_cast<unsigned char>(alphabetForward[i])] = j++;
+    for (int i = 0, j = 0; kALPHABET_FORWARD[i] != 0; ++i)
+        map[static_cast<unsigned char>(kALPHABET_FORWARD[i])] = j++;
     return map;
 }();
 
@@ -199,7 +199,7 @@ namespace b58_ref {
 namespace detail {
 
 std::string
-encodeBase58(void const* message, std::size_t size, void* temp, std::size_t temp_size)
+encodeBase58(void const* message, std::size_t size, void* temp, std::size_t tempSize)
 {
     auto pbegin = reinterpret_cast<unsigned char const*>(message);
     auto const pend = pbegin + size;
@@ -213,7 +213,7 @@ encodeBase58(void const* message, std::size_t size, void* temp, std::size_t temp
     }
 
     auto const b58begin = reinterpret_cast<unsigned char*>(temp);
-    auto const b58end = b58begin + temp_size;
+    auto const b58end = b58begin + tempSize;
 
     std::fill(b58begin, b58end, 0);
 
@@ -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, alphabetForward[0]);
+    str.assign(zeroes, kALPHABET_FORWARD[0]);
     while (iter != b58end)
-        str += alphabetForward[*(iter++)];
+        str += kALPHABET_FORWARD[*(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 && alphabetReverse[*psz] == 0)
+    while (remain > 0 && kALPHABET_REVERSE[*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 = alphabetReverse[*psz];
+        auto carry = kALPHABET_REVERSE[*psz];
         if (carry == -1)
             return {};
         // Apply "b256 = b256 * 58 + carry".
@@ -308,7 +308,7 @@ encodeBase58Token(TokenType type, void const* token, std::size_t size)
 
     // Lay the data out as
     //      <type><token><checksum>
-    buf[0] = safe_cast<std::underlying_type_t<TokenType>>(type);
+    buf[0] = safeCast<std::underlying_type_t<TokenType>>(type);
     if (size != 0u)
         std::memcpy(buf.data() + 1, token, size);
     checksum(buf.data() + 1 + size, buf.data(), 1 + size);
@@ -326,7 +326,7 @@ decodeBase58Token(std::string const& s, TokenType type)
         return {};
 
     // The type must match.
-    if (type != safe_cast<TokenType>(static_cast<std::uint8_t>(ret[0])))
+    if (type != safeCast<TokenType>(static_cast<std::uint8_t>(ret[0])))
         return {};
 
     // And the checksum must as well.
@@ -347,16 +347,16 @@ namespace b58_fast {
 namespace detail {
 // Note: both the input and output will be BIG ENDIAN
 B58Result<std::span<std::uint8_t>>
-b256_to_b58_be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out)
+b256ToB58Be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out)
 {
     // Max valid input is 38 bytes:
     // (33 bytes for nodepublic + 1 byte token + 4 bytes checksum)
     if (input.size() > 38)
     {
-        return Unexpected(TokenCodecErrc::inputTooLarge);
+        return Unexpected(TokenCodecErrc::InputTooLarge);
     };
 
-    auto count_leading_zeros = [](std::span<std::uint8_t const> const& col) -> std::size_t {
+    auto countLeadingZeros = [](std::span<std::uint8_t const> const& col) -> std::size_t {
         std::size_t count = 0;
         for (auto const& c : col)
         {
@@ -369,106 +369,106 @@ b256_to_b58_be(std::span<std::uint8_t const> input, std::span<std::uint8_t> out)
         return count;
     };
 
-    auto const input_zeros = count_leading_zeros(input);
-    input = input.subspan(input_zeros);
+    auto const inputZeros = countLeadingZeros(input);
+    input = input.subspan(inputZeros);
 
     // Allocate enough base 2^64 coeff for encoding 38 bytes
     // log(2^(38*8),2^64)) ~= 4.75. So 5 coeff are enough
-    std::array<std::uint64_t, 5> base_2_64_coeff_buf{};
-    std::span<std::uint64_t> const base_2_64_coeff = [&]() -> std::span<std::uint64_t> {
+    std::array<std::uint64_t, 5> base264CoeffBuf{};
+    std::span<std::uint64_t> const base264Coeff = [&]() -> std::span<std::uint64_t> {
         // convert input from big endian to native u64, lowest coeff first
-        std::size_t num_coeff = 0;
-        for (int i = 0; i < base_2_64_coeff_buf.size(); ++i)
+        std::size_t numCoeff = 0;
+        for (int i = 0; i < base264CoeffBuf.size(); ++i)
         {
             if (i * 8 >= input.size())
             {
                 break;
             }
-            auto const src_i_end = input.size() - (i * 8);
-            if (src_i_end >= 8)
+            auto const srcIEnd = input.size() - (i * 8);
+            if (srcIEnd >= 8)
             {
-                std::memcpy(&base_2_64_coeff_buf[num_coeff], &input[src_i_end - 8], 8);
-                boost::endian::big_to_native_inplace(base_2_64_coeff_buf[num_coeff]);
+                std::memcpy(&base264CoeffBuf[numCoeff], &input[srcIEnd - 8], 8);
+                boost::endian::big_to_native_inplace(base264CoeffBuf[numCoeff]);
             }
             else
             {
                 std::uint64_t be = 0;
-                for (int bi = 0; bi < src_i_end; ++bi)
+                for (int bi = 0; bi < srcIEnd; ++bi)
                 {
                     be <<= 8;
                     be |= input[bi];
                 }
-                base_2_64_coeff_buf[num_coeff] = be;
+                base264CoeffBuf[numCoeff] = be;
             };
-            num_coeff += 1;
+            numCoeff += 1;
         }
-        return std::span(base_2_64_coeff_buf.data(), num_coeff);
+        return std::span(base264CoeffBuf.data(), numCoeff);
     }();
 
     // Allocate enough base 58^10 coeff for encoding 38 bytes
     // log(2^(38*8),58^10)) ~= 5.18. So 6 coeff are enough
-    std::array<std::uint64_t, 6> base_58_10_coeff{};
-    constexpr std::uint64_t B_58_10 = 430804206899405824;  // 58^10;
-    std::size_t num_58_10_coeffs = 0;
-    std::size_t cur_2_64_end = base_2_64_coeff.size();
+    std::array<std::uint64_t, 6> base5810Coeff{};
+    constexpr std::uint64_t kB5810 = 430804206899405824;  // 58^10;
+    std::size_t num5810Coeffs = 0;
+    std::size_t cur264End = base264Coeff.size();
     // compute the base 58^10 coeffs
-    while (cur_2_64_end > 0)
+    while (cur264End > 0)
     {
-        base_58_10_coeff[num_58_10_coeffs] = xrpl::b58_fast::detail::inplace_bigint_div_rem(
-            base_2_64_coeff.subspan(0, cur_2_64_end), B_58_10);
-        num_58_10_coeffs += 1;
-        if (base_2_64_coeff[cur_2_64_end - 1] == 0)
+        base5810Coeff[num5810Coeffs] =
+            xrpl::b58_fast::detail::inplaceBigintDivRem(base264Coeff.subspan(0, cur264End), kB5810);
+        num5810Coeffs += 1;
+        if (base264Coeff[cur264End - 1] == 0)
         {
-            cur_2_64_end -= 1;
+            cur264End -= 1;
         }
     }
 
     // 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() + input_zeros, ::xrpl::alphabetForward[0]);
+    std::fill(out.begin(), out.begin() + inputZeros, ::xrpl::kALPHABET_FORWARD[0]);
 
     // iterate through the base 58^10 coeff
     // convert to base 58 big endian then
     // convert to alphabet big endian
-    bool skip_zeros = true;
-    auto out_index = input_zeros;
-    for (int i = num_58_10_coeffs - 1; i >= 0; --i)
+    bool skipZeros = true;
+    auto outIndex = inputZeros;
+    for (int i = num5810Coeffs - 1; i >= 0; --i)
     {
-        if (skip_zeros && base_58_10_coeff[i] == 0)
+        if (skipZeros && base5810Coeff[i] == 0)
         {
             continue;
         }
-        static constexpr std::uint64_t B_58_10 = 430804206899405824;  // 58^10;
-        if (base_58_10_coeff[i] >= B_58_10)
+        static constexpr std::uint64_t kB5810 = 430804206899405824;  // 58^10;
+        if (base5810Coeff[i] >= kB5810)
         {
-            return Unexpected(TokenCodecErrc::inputTooLarge);
+            return Unexpected(TokenCodecErrc::InputTooLarge);
         }
-        std::array<std::uint8_t, 10> const b58_be =
-            xrpl::b58_fast::detail::b58_10_to_b58_be(base_58_10_coeff[i]);
-        std::size_t to_skip = 0;
-        std::span<std::uint8_t const> const b58_be_s{b58_be.data(), b58_be.size()};
-        if (skip_zeros)
+        std::array<std::uint8_t, 10> const b58Be =
+            xrpl::b58_fast::detail::b5810ToB58Be(base5810Coeff[i]);
+        std::size_t toSkip = 0;
+        std::span<std::uint8_t const> const b58BeS{b58Be.data(), b58Be.size()};
+        if (skipZeros)
         {
-            to_skip = count_leading_zeros(b58_be_s);
-            skip_zeros = false;
-            if (out.size() < ((i + 1) * 10) - to_skip)
+            toSkip = countLeadingZeros(b58BeS);
+            skipZeros = false;
+            if (out.size() < ((i + 1) * 10) - toSkip)
             {
-                return Unexpected(TokenCodecErrc::outputTooSmall);
+                return Unexpected(TokenCodecErrc::OutputTooSmall);
             }
         }
-        for (auto b58_coeff : b58_be_s.subspan(to_skip))
+        for (auto b58Coeff : b58BeS.subspan(toSkip))
         {
-            out[out_index] = ::xrpl::alphabetForward[b58_coeff];
-            out_index += 1;
+            out[outIndex] = ::xrpl::kALPHABET_FORWARD[b58Coeff];
+            outIndex += 1;
         }
     }
 
-    return out.subspan(0, out_index);
+    return out.subspan(0, outIndex);
 }
 
 // Note the input is BIG ENDIAN (some fn in this module use little endian)
 B58Result<std::span<std::uint8_t>>
-b58_to_b256_be(std::string_view input, std::span<std::uint8_t> out)
+b58ToB256Be(std::string_view input, std::span<std::uint8_t> out)
 {
     // Convert from b58 to b 58^10
 
@@ -476,18 +476,18 @@ b58_to_b256_be(std::string_view input, std::span<std::uint8_t> out)
     // log(2^(38*8),58) ~= 51.9
     if (input.size() > 52)
     {
-        return Unexpected(TokenCodecErrc::inputTooLarge);
+        return Unexpected(TokenCodecErrc::InputTooLarge);
     };
     if (out.size() < 8)
     {
-        return Unexpected(TokenCodecErrc::outputTooSmall);
+        return Unexpected(TokenCodecErrc::OutputTooSmall);
     }
 
-    auto count_leading_zeros = [&](auto const& col) -> std::size_t {
+    auto countLeadingZeros = [&](auto const& col) -> std::size_t {
         std::size_t count = 0;
         for (auto const& c : col)
         {
-            if (c != ::xrpl::alphabetForward[0])
+            if (c != ::xrpl::kALPHABET_FORWARD[0])
             {
                 return count;
             }
@@ -496,139 +496,139 @@ b58_to_b256_be(std::string_view input, std::span<std::uint8_t> out)
         return count;
     };
 
-    auto const input_zeros = count_leading_zeros(input);
+    auto const inputZeros = countLeadingZeros(input);
 
     // Allocate enough base 58^10 coeff for encoding 38 bytes
     // (33 bytes for nodepublic + 1 byte token + 4 bytes checksum)
     // log(2^(38*8),58^10)) ~= 5.18. So 6 coeff are enough
-    std::array<std::uint64_t, 6> b_58_10_coeff{};
-    auto [num_full_coeffs, partial_coeff_len] = xrpl::b58_fast::detail::div_rem(input.size(), 10);
-    auto const num_partial_coeffs = (partial_coeff_len != 0u) ? 1 : 0;
-    auto const num_b_58_10_coeffs = num_full_coeffs + num_partial_coeffs;
+    std::array<std::uint64_t, 6> b5810Coeff{};
+    auto [num_full_coeffs, partial_coeff_len] = xrpl::b58_fast::detail::divRem(input.size(), 10);
+    auto const numPartialCoeffs = (partial_coeff_len != 0u) ? 1 : 0;
+    auto const numB5810Coeffs = num_full_coeffs + numPartialCoeffs;
     XRPL_ASSERT(
-        num_b_58_10_coeffs <= b_58_10_coeff.size(),
+        numB5810Coeffs <= b5810Coeff.size(),
         "xrpl::b58_fast::detail::b58_to_b256_be : maximum coeff");
     for (unsigned char const c : input.substr(0, partial_coeff_len))
     {
-        auto cur_val = ::xrpl::alphabetReverse[c];
-        if (cur_val < 0)
+        auto curVal = ::xrpl::kALPHABET_REVERSE[c];
+        if (curVal < 0)
         {
-            return Unexpected(TokenCodecErrc::invalidEncodingChar);
+            return Unexpected(TokenCodecErrc::InvalidEncodingChar);
         }
-        b_58_10_coeff[0] *= 58;
-        b_58_10_coeff[0] += cur_val;
+        b5810Coeff[0] *= 58;
+        b5810Coeff[0] += curVal;
     }
     for (int i = 0; i < 10; ++i)
     {
         for (int j = 0; j < num_full_coeffs; ++j)
         {
             unsigned char const c = input[partial_coeff_len + (j * 10) + i];
-            auto cur_val = ::xrpl::alphabetReverse[c];
-            if (cur_val < 0)
+            auto curVal = ::xrpl::kALPHABET_REVERSE[c];
+            if (curVal < 0)
             {
-                return Unexpected(TokenCodecErrc::invalidEncodingChar);
+                return Unexpected(TokenCodecErrc::InvalidEncodingChar);
             }
-            b_58_10_coeff[num_partial_coeffs + j] *= 58;
-            b_58_10_coeff[num_partial_coeffs + j] += cur_val;
+            b5810Coeff[numPartialCoeffs + j] *= 58;
+            b5810Coeff[numPartialCoeffs + j] += curVal;
         }
     }
 
-    constexpr std::uint64_t B_58_10 = 430804206899405824;  // 58^10;
+    constexpr std::uint64_t kB5810 = 430804206899405824;  // 58^10;
 
     // log(2^(38*8),2^64) ~= 4.75)
     std::array<std::uint64_t, 5> result{};
-    result[0] = b_58_10_coeff[0];
-    std::size_t cur_result_size = 1;
-    for (int i = 1; i < num_b_58_10_coeffs; ++i)
+    result[0] = b5810Coeff[0];
+    std::size_t curResultSize = 1;
+    for (int i = 1; i < numB5810Coeffs; ++i)
     {
-        std::uint64_t const c = b_58_10_coeff[i];
+        std::uint64_t const c = b5810Coeff[i];
 
         {
-            auto code = xrpl::b58_fast::detail::inplace_bigint_mul(
-                std::span(&result[0], cur_result_size + 1), B_58_10);
-            if (code != TokenCodecErrc::success)
+            auto code = xrpl::b58_fast::detail::inplaceBigintMul(
+                std::span(&result[0], curResultSize + 1), kB5810);
+            if (code != TokenCodecErrc::Success)
             {
                 return Unexpected(code);
             }
         }
         {
-            auto code = xrpl::b58_fast::detail::inplace_bigint_add(
-                std::span(&result[0], cur_result_size + 1), c);
-            if (code != TokenCodecErrc::success)
+            auto code = xrpl::b58_fast::detail::inplaceBigintAdd(
+                std::span(&result[0], curResultSize + 1), c);
+            if (code != TokenCodecErrc::Success)
             {
                 return Unexpected(code);
             }
         }
-        if (result[cur_result_size] != 0)
+        if (result[curResultSize] != 0)
         {
-            cur_result_size += 1;
+            curResultSize += 1;
         }
     }
-    std::fill(out.begin(), out.begin() + input_zeros, 0);
-    auto cur_out_i = input_zeros;
+    std::fill(out.begin(), out.begin() + inputZeros, 0);
+    auto curOutI = inputZeros;
     // Don't write leading zeros to the output for the most significant
     // coeff
     {
-        std::uint64_t const c = result[cur_result_size - 1];
-        auto skip_zero = true;
+        std::uint64_t const c = result[curResultSize - 1];
+        auto skipZero = true;
         // start and end of output range
         for (int i = 0; i < 8; ++i)
         {
             std::uint8_t const b = (c >> (8 * (7 - i))) & 0xff;
-            if (skip_zero)
+            if (skipZero)
             {
                 if (b == 0)
                 {
                     continue;
                 }
-                skip_zero = false;
+                skipZero = false;
             }
-            out[cur_out_i] = b;
-            cur_out_i += 1;
+            out[curOutI] = b;
+            curOutI += 1;
         }
     }
-    if ((cur_out_i + (8 * (cur_result_size - 1))) > out.size())
+    if ((curOutI + (8 * (curResultSize - 1))) > out.size())
     {
-        return Unexpected(TokenCodecErrc::outputTooSmall);
+        return Unexpected(TokenCodecErrc::OutputTooSmall);
     }
 
-    for (int i = cur_result_size - 2; i >= 0; --i)
+    for (int i = curResultSize - 2; i >= 0; --i)
     {
         auto c = result[i];
         boost::endian::native_to_big_inplace(c);
-        memcpy(&out[cur_out_i], &c, 8);
-        cur_out_i += 8;
+        memcpy(&out[curOutI], &c, 8);
+        curOutI += 8;
     }
 
-    return out.subspan(0, cur_out_i);
+    return out.subspan(0, curOutI);
 }
 }  // namespace detail
 
 B58Result<std::span<std::uint8_t>>
 encodeBase58Token(
-    TokenType token_type,
+    TokenType tokenType,
     std::span<std::uint8_t const> input,
     std::span<std::uint8_t> out)
 {
-    constexpr std::size_t tmpBufSize = 128;
-    std::array<std::uint8_t, tmpBufSize> buf{};
-    if (input.size() > tmpBufSize - 5)
+    constexpr std::size_t kTMP_BUF_SIZE = 128;
+    std::array<std::uint8_t, kTMP_BUF_SIZE> buf{};
+    if (input.size() > kTMP_BUF_SIZE - 5)
     {
-        return Unexpected(TokenCodecErrc::inputTooLarge);
+        return Unexpected(TokenCodecErrc::InputTooLarge);
     }
     if (input.empty())
     {
-        return Unexpected(TokenCodecErrc::inputTooSmall);
+        return Unexpected(TokenCodecErrc::InputTooSmall);
     }
     // <type (1 byte)><token (input len)><checksum (4 bytes)>
-    buf[0] = static_cast<std::uint8_t>(token_type);
+    buf[0] = static_cast<std::uint8_t>(tokenType);
     // buf[1..=input.len()] = input;
     memcpy(&buf[1], input.data(), input.size());
-    size_t const checksum_i = input.size() + 1;
+    size_t const checksumI = input.size() + 1;
     // buf[checksum_i..checksum_i + 4] = checksum
-    checksum(buf.data() + checksum_i, buf.data(), checksum_i);
+    checksum(buf.data() + checksumI, buf.data(), checksumI);
     std::span<std::uint8_t const> const b58Span(buf.data(), input.size() + 5);
-    return detail::b256_to_b58_be(b58Span, out);
+    return detail::b256ToB58Be(b58Span, out);
 }
 // Convert from base 58 to base 256, largest coefficients first
 // The input is encoded in XRPL format, with the token in the first
@@ -639,7 +639,7 @@ B58Result<std::span<std::uint8_t>>
 decodeBase58Token(TokenType type, std::string_view s, std::span<std::uint8_t> outBuf)
 {
     std::array<std::uint8_t, 64> tmpBuf{};
-    auto const decodeResult = detail::b58_to_b256_be(s, std::span(tmpBuf.data(), tmpBuf.size()));
+    auto const decodeResult = detail::b58ToB256Be(s, std::span(tmpBuf.data(), tmpBuf.size()));
 
     if (!decodeResult)
         return decodeResult;
@@ -648,23 +648,23 @@ decodeBase58Token(TokenType type, std::string_view s, std::span<std::uint8_t> ou
 
     // Reject zero length tokens
     if (ret.size() < 6)
-        return Unexpected(TokenCodecErrc::inputTooSmall);
+        return Unexpected(TokenCodecErrc::InputTooSmall);
 
     // The type must match.
     if (type != static_cast<TokenType>(static_cast<std::uint8_t>(ret[0])))
-        return Unexpected(TokenCodecErrc::mismatchedTokenType);
+        return Unexpected(TokenCodecErrc::MismatchedTokenType);
 
     // And the checksum must as well.
     std::array<std::uint8_t, 4> guard{};
     checksum(guard.data(), ret.data(), ret.size() - guard.size());
     if (!std::equal(guard.rbegin(), guard.rend(), ret.rbegin()))
     {
-        return Unexpected(TokenCodecErrc::mismatchedChecksum);
+        return Unexpected(TokenCodecErrc::MismatchedChecksum);
     }
 
     std::size_t const outSize = ret.size() - 1 - guard.size();
     if (outBuf.size() < outSize)
-        return Unexpected(TokenCodecErrc::outputTooSmall);
+        return Unexpected(TokenCodecErrc::OutputTooSmall);
     // Skip the leading type byte and the trailing checksum.
     std::copy(ret.begin() + 1, ret.begin() + outSize + 1, outBuf.begin());
     return outBuf.subspan(0, outSize);
diff --git a/src/libxrpl/rdb/DatabaseCon.cpp b/src/libxrpl/rdb/DatabaseCon.cpp
index cc7692de78..ac27a080c5 100644
--- a/src/libxrpl/rdb/DatabaseCon.cpp
+++ b/src/libxrpl/rdb/DatabaseCon.cpp
@@ -58,19 +58,19 @@ public:
     }
 };
 
-CheckpointersCollection checkpointers;
+CheckpointersCollection gCheckpointers;
 
 std::shared_ptr<Checkpointer>
 checkpointerFromId(std::uintptr_t id)
 {
-    return checkpointers.fromId(id);
+    return gCheckpointers.fromId(id);
 }
 
 DatabaseCon::~DatabaseCon()
 {
     if (checkpointer_)
     {
-        checkpointers.erase(checkpointer_->id());
+        gCheckpointers.erase(checkpointer_->id());
 
         std::weak_ptr<Checkpointer> const wk(checkpointer_);
         checkpointer_.reset();
@@ -94,7 +94,7 @@ DatabaseCon::setupCheckpointing(JobQueue* q, ServiceRegistry& registry)
 {
     if (q == nullptr)
         Throw<std::logic_error>("No JobQueue");
-    checkpointer_ = checkpointers.create(session_, *q, registry);
+    checkpointer_ = gCheckpointers.create(session_, *q, registry);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/rdb/SociDB.cpp b/src/libxrpl/rdb/SociDB.cpp
index 1d69f1c984..541933b3b0 100644
--- a/src/libxrpl/rdb/SociDB.cpp
+++ b/src/libxrpl/rdb/SociDB.cpp
@@ -32,7 +32,7 @@
 
 namespace xrpl {
 
-static auto checkpointPageCount = 1000;
+static auto gCheckpointPageCount = 1000;
 
 namespace detail {
 
@@ -246,7 +246,7 @@ public:
 
         // If the Job is not added to the JobQueue then we're not running_.
         if (!jobQueue_.addJob(
-                jtWAL,
+                JtWal,
                 "WAL",
                 // If the owning DatabaseCon is destroyed, no need to checkpoint
                 // or keep the checkpointer alive so use a weak_ptr to this.
@@ -305,7 +305,7 @@ protected:
     static int
     sqliteWALHook(void* cpId, sqlite_api::sqlite3* conn, char const* dbName, int walSize)
     {
-        if (walSize >= checkpointPageCount)
+        if (walSize >= gCheckpointPageCount)
         {
             if (auto checkpointer = checkpointerFromId(reinterpret_cast<std::uintptr_t>(cpId)))
             {
diff --git a/src/libxrpl/resource/Charge.cpp b/src/libxrpl/resource/Charge.cpp
index 8626115c4c..e174c13522 100644
--- a/src/libxrpl/resource/Charge.cpp
+++ b/src/libxrpl/resource/Charge.cpp
@@ -8,53 +8,53 @@
 
 namespace xrpl::Resource {
 
-Charge::Charge(value_type cost, std::string label) : m_cost(cost), m_label(std::move(label))
+Charge::Charge(value_type cost, std::string label) : cost_(cost), label_(std::move(label))
 {
 }
 
 std::string const&
 Charge::label() const
 {
-    return m_label;
+    return label_;
 }
 
 Charge::value_type
 Charge::cost() const
 {
-    return m_cost;
+    return cost_;
 }
 
 std::string
-Charge::to_string() const
+Charge::toString() const
 {
     std::stringstream ss;
-    ss << m_label << " ($" << m_cost << ")";
+    ss << label_ << " ($" << cost_ << ")";
     return ss.str();
 }
 
 std::ostream&
 operator<<(std::ostream& os, Charge const& v)
 {
-    os << v.to_string();
+    os << v.toString();
     return os;
 }
 
 bool
 Charge::operator==(Charge const& c) const
 {
-    return c.m_cost == m_cost;
+    return c.cost_ == cost_;
 }
 
 std::strong_ordering
 Charge::operator<=>(Charge const& c) const
 {
-    return m_cost <=> c.m_cost;
+    return cost_ <=> c.cost_;
 }
 
 Charge
 Charge::operator*(value_type m) const
 {
-    return Charge(m_cost * m, m_label);
+    return Charge(cost_ * m, label_);
 }
 
 }  // namespace xrpl::Resource
diff --git a/src/libxrpl/resource/Consumer.cpp b/src/libxrpl/resource/Consumer.cpp
index c57344bd8f..58d5775a31 100644
--- a/src/libxrpl/resource/Consumer.cpp
+++ b/src/libxrpl/resource/Consumer.cpp
@@ -14,27 +14,27 @@
 
 namespace xrpl::Resource {
 
-Consumer::Consumer(Logic& logic, Entry& entry) : m_logic(&logic), m_entry(&entry)
+Consumer::Consumer(Logic& logic, Entry& entry) : logic_(&logic), entry_(&entry)
 {
 }
 
-Consumer::Consumer() : m_logic(nullptr), m_entry(nullptr)
+Consumer::Consumer() : logic_(nullptr), entry_(nullptr)
 {
 }
 
-Consumer::Consumer(Consumer const& other) : m_logic(other.m_logic), m_entry(nullptr)
+Consumer::Consumer(Consumer const& other) : logic_(other.logic_), entry_(nullptr)
 {
-    if ((m_logic != nullptr) && (other.m_entry != nullptr))
+    if ((logic_ != nullptr) && (other.entry_ != nullptr))
     {
-        m_entry = other.m_entry;
-        m_logic->acquire(*m_entry);
+        entry_ = other.entry_;
+        logic_->acquire(*entry_);
     }
 }
 
 Consumer::~Consumer()
 {
-    if ((m_logic != nullptr) && (m_entry != nullptr))
-        m_logic->release(*m_entry);
+    if ((logic_ != nullptr) && (entry_ != nullptr))
+        logic_->release(*entry_);
 }
 
 Consumer&
@@ -44,33 +44,33 @@ Consumer::operator=(Consumer const& other)
         return *this;
 
     // remove old ref
-    if ((m_logic != nullptr) && (m_entry != nullptr))
-        m_logic->release(*m_entry);
+    if ((logic_ != nullptr) && (entry_ != nullptr))
+        logic_->release(*entry_);
 
-    m_logic = other.m_logic;
-    m_entry = other.m_entry;
+    logic_ = other.logic_;
+    entry_ = other.entry_;
 
     // add new ref
-    if ((m_logic != nullptr) && (m_entry != nullptr))
-        m_logic->acquire(*m_entry);
+    if ((logic_ != nullptr) && (entry_ != nullptr))
+        logic_->acquire(*entry_);
 
     return *this;
 }
 
 std::string
-Consumer::to_string() const
+Consumer::toString() const
 {
-    if (m_logic == nullptr)
+    if (logic_ == nullptr)
         return "(none)";
 
-    return m_entry->to_string();
+    return entry_->toString();
 }
 
 bool
 Consumer::isUnlimited() const
 {
-    if (m_entry != nullptr)
-        return m_entry->isUnlimited();
+    if (entry_ != nullptr)
+        return entry_->isUnlimited();
 
     return false;
 }
@@ -78,9 +78,9 @@ Consumer::isUnlimited() const
 Disposition
 Consumer::disposition() const
 {
-    Disposition d = Disposition::ok;
-    if ((m_logic != nullptr) && (m_entry != nullptr))
-        d = m_logic->charge(*m_entry, Charge(0));
+    Disposition d = Disposition::Ok;
+    if ((logic_ != nullptr) && (entry_ != nullptr))
+        d = logic_->charge(*entry_, Charge(0));
 
     return d;
 }
@@ -88,10 +88,10 @@ Consumer::disposition() const
 Disposition
 Consumer::charge(Charge const& what, std::string const& context)
 {
-    Disposition d = Disposition::ok;
+    Disposition d = Disposition::Ok;
 
-    if ((m_logic != nullptr) && (m_entry != nullptr) && !m_entry->isUnlimited())
-        d = m_logic->charge(*m_entry, what, context);
+    if ((logic_ != nullptr) && (entry_ != nullptr) && !entry_->isUnlimited())
+        d = logic_->charge(*entry_, what, context);
 
     return d;
 }
@@ -99,18 +99,18 @@ Consumer::charge(Charge const& what, std::string const& context)
 bool
 Consumer::warn()
 {
-    XRPL_ASSERT(m_entry, "xrpl::Resource::Consumer::warn : non-null entry");
-    return m_logic->warn(*m_entry);
+    XRPL_ASSERT(entry_, "xrpl::Resource::Consumer::warn : non-null entry");
+    return logic_->warn(*entry_);
 }
 
 bool
 Consumer::disconnect(beast::Journal const& j)
 {
-    XRPL_ASSERT(m_entry, "xrpl::Resource::Consumer::disconnect : non-null entry");
-    bool const d = m_logic->disconnect(*m_entry);
+    XRPL_ASSERT(entry_, "xrpl::Resource::Consumer::disconnect : non-null entry");
+    bool const d = logic_->disconnect(*entry_);
     if (d)
     {
-        JLOG(j.debug()) << "disconnecting " << m_entry->to_string();
+        JLOG(j.debug()) << "disconnecting " << entry_->toString();
     }
     return d;
 }
@@ -118,27 +118,27 @@ Consumer::disconnect(beast::Journal const& j)
 int
 Consumer::balance()
 {
-    XRPL_ASSERT(m_entry, "xrpl::Resource::Consumer::balance : non-null entry");
-    return m_logic->balance(*m_entry);
+    XRPL_ASSERT(entry_, "xrpl::Resource::Consumer::balance : non-null entry");
+    return logic_->balance(*entry_);
 }
 
 Entry&
 Consumer::entry()
 {
-    XRPL_ASSERT(m_entry, "xrpl::Resource::Consumer::entry : non-null entry");
-    return *m_entry;
+    XRPL_ASSERT(entry_, "xrpl::Resource::Consumer::entry : non-null entry");
+    return *entry_;
 }
 
 void
 Consumer::setPublicKey(PublicKey const& publicKey)
 {
-    m_entry->publicKey = publicKey;
+    entry_->publicKey = publicKey;
 }
 
 std::ostream&
 operator<<(std::ostream& os, Consumer const& v)
 {
-    os << v.to_string();
+    os << v.toString();
     return os;
 }
 
diff --git a/src/libxrpl/resource/Fees.cpp b/src/libxrpl/resource/Fees.cpp
index e9f47b3e7d..8c9b72987f 100644
--- a/src/libxrpl/resource/Fees.cpp
+++ b/src/libxrpl/resource/Fees.cpp
@@ -4,24 +4,24 @@
 
 namespace xrpl::Resource {
 
-Charge const feeMalformedRequest(200, "malformed request");
-Charge const feeRequestNoReply(10, "unsatisfiable request");
-Charge const feeInvalidSignature(2000, "invalid signature");
-Charge const feeUselessData(150, "useless data");
-Charge const feeInvalidData(400, "invalid data");
+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 feeMalformedRPC(100, "malformed RPC");
-Charge const feeReferenceRPC(20, "reference RPC");
-Charge const feeExceptionRPC(100, "exceptioned RPC");
-Charge const feeMediumBurdenRPC(400, "medium RPC");
-Charge const feeHeavyBurdenRPC(3000, "heavy RPC");
+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 feeTrivialPeer(1, "trivial peer request");
-Charge const feeModerateBurdenPeer(250, "moderate peer request");
-Charge const feeHeavyBurdenPeer(2000, "heavy peer request");
+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 feeWarning(4000, "received warning");
-Charge const feeDrop(6000, "dropped");
+Charge const kFEE_WARNING(4000, "received warning");
+Charge const kFEE_DROP(6000, "dropped");
 
 // See also Resource::Logic::charge for log level cutoff values
 
diff --git a/src/libxrpl/resource/ResourceManager.cpp b/src/libxrpl/resource/ResourceManager.cpp
index e3f0ae8583..e3b4d9cc5c 100644
--- a/src/libxrpl/resource/ResourceManager.cpp
+++ b/src/libxrpl/resource/ResourceManager.cpp
@@ -77,11 +77,11 @@ public:
         if (ec)
         {
             journal_.warn() << "forwarded for (" << forwardedFor << ") from proxy "
-                            << address.to_string()
+                            << address.toString()
                             << " doesn't convert to IP endpoint: " << ec.message();
             return newInboundEndpoint(address);
         }
-        return newInboundEndpoint(beast::IPAddressConversion::from_asio(proxiedIp));
+        return newInboundEndpoint(beast::IPAddressConversion::fromAsio(proxiedIp));
     }
 
     Consumer
@@ -110,13 +110,13 @@ public:
 
     //--------------------------------------------------------------------------
 
-    Json::Value
+    json::Value
     getJson() override
     {
         return logic_.getJson();
     }
 
-    Json::Value
+    json::Value
     getJson(int threshold) override
     {
         return logic_.getJson(threshold);
@@ -159,7 +159,7 @@ Manager::~Manager() = default;
 //------------------------------------------------------------------------------
 
 std::unique_ptr<Manager>
-make_Manager(beast::insight::Collector::ptr const& collector, beast::Journal journal)
+makeManager(beast::insight::Collector::ptr const& collector, beast::Journal journal)
 {
     return std::make_unique<ManagerImp>(collector, journal);
 }
diff --git a/src/libxrpl/server/InfoSub.cpp b/src/libxrpl/server/InfoSub.cpp
index c426d44646..87b48296a1 100644
--- a/src/libxrpl/server/InfoSub.cpp
+++ b/src/libxrpl/server/InfoSub.cpp
@@ -21,48 +21,48 @@ namespace xrpl {
 // code assumes this node is synced (and will continue to do so until
 // there's a functional network.
 
-InfoSub::InfoSub(Source& source) : m_source(source), mSeq(assign_id())
+InfoSub::InfoSub(Source& source) : source_(source), seq_(assignId())
 {
 }
 
 InfoSub::InfoSub(Source& source, Consumer consumer)
-    : m_consumer(consumer), m_source(source), mSeq(assign_id())
+    : consumer_(consumer), source_(source), seq_(assignId())
 {
 }
 
 InfoSub::~InfoSub()
 {
-    m_source.unsubTransactions(mSeq);
-    m_source.unsubRTTransactions(mSeq);
-    m_source.unsubLedger(mSeq);
-    m_source.unsubManifests(mSeq);
-    m_source.unsubServer(mSeq);
-    m_source.unsubValidations(mSeq);
-    m_source.unsubPeerStatus(mSeq);
-    m_source.unsubConsensus(mSeq);
+    source_.unsubTransactions(seq_);
+    source_.unsubRTTransactions(seq_);
+    source_.unsubLedger(seq_);
+    source_.unsubManifests(seq_);
+    source_.unsubServer(seq_);
+    source_.unsubValidations(seq_);
+    source_.unsubPeerStatus(seq_);
+    source_.unsubConsensus(seq_);
 
     // Use the internal unsubscribe so that it won't call
     // back to us and modify its own parameter
     if (!realTimeSubscriptions_.empty())
-        m_source.unsubAccountInternal(mSeq, realTimeSubscriptions_, true);
+        source_.unsubAccountInternal(seq_, realTimeSubscriptions_, true);
 
     if (!normalSubscriptions_.empty())
-        m_source.unsubAccountInternal(mSeq, normalSubscriptions_, false);
+        source_.unsubAccountInternal(seq_, normalSubscriptions_, false);
 
     for (auto const& account : accountHistorySubscriptions_)
-        m_source.unsubAccountHistoryInternal(mSeq, account, false);
+        source_.unsubAccountHistoryInternal(seq_, account, false);
 }
 
 Resource::Consumer&
 InfoSub::getConsumer()
 {
-    return m_consumer;
+    return consumer_;
 }
 
 std::uint64_t
 InfoSub::getSeq() const
 {
-    return mSeq;
+    return seq_;
 }
 
 void
@@ -73,7 +73,7 @@ InfoSub::onSendEmpty()
 void
 InfoSub::insertSubAccountInfo(AccountID const& account, bool rt)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     if (rt)
     {
@@ -88,7 +88,7 @@ InfoSub::insertSubAccountInfo(AccountID const& account, bool rt)
 void
 InfoSub::deleteSubAccountInfo(AccountID const& account, bool rt)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     if (rt)
     {
@@ -103,14 +103,14 @@ InfoSub::deleteSubAccountInfo(AccountID const& account, bool rt)
 bool
 InfoSub::insertSubAccountHistory(AccountID const& account)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
     return accountHistorySubscriptions_.insert(account).second;
 }
 
 void
 InfoSub::deleteSubAccountHistory(AccountID const& account)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
     accountHistorySubscriptions_.erase(account);
 }
 
diff --git a/src/libxrpl/server/JSONRPCUtil.cpp b/src/libxrpl/server/JSONRPCUtil.cpp
index 280aeeeebc..f38ff280ac 100644
--- a/src/libxrpl/server/JSONRPCUtil.cpp
+++ b/src/libxrpl/server/JSONRPCUtil.cpp
@@ -20,18 +20,18 @@ getHTTPHeaderTimestamp()
     char buffer[96];
     time_t now = 0;
     time(&now);
-    struct tm now_gmt{};
+    struct tm nowGmt{};
 #ifndef _MSC_VER
-    gmtime_r(&now, &now_gmt);
+    gmtime_r(&now, &nowGmt);
 #else
-    gmtime_s(&now_gmt, &now);
+    gmtime_s(&nowGmt, &now);
 #endif
-    strftime(buffer, sizeof(buffer), "Date: %a, %d %b %Y %H:%M:%S +0000\r\n", &now_gmt);
+    strftime(buffer, sizeof(buffer), "Date: %a, %d %b %Y %H:%M:%S +0000\r\n", &nowGmt);
     return std::string(buffer);
 }
 
 void
-HTTPReply(int nStatus, std::string const& content, Json::Output const& output, beast::Journal j)
+httpReply(int nStatus, std::string const& content, json::Output const& output, beast::Journal j)
 {
     JLOG(j.trace()) << "HTTP Reply " << nStatus << " " << content;
 
diff --git a/src/libxrpl/server/LoadFeeTrack.cpp b/src/libxrpl/server/LoadFeeTrack.cpp
index 2fa7e1beba..085e846145 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_ / lftFeeIncFraction);
+    localTxnLoadFee_ += (localTxnLoadFee_ / kLFT_FEE_INC_FRACTION);
 
-    localTxnLoadFee_ = std::min(localTxnLoadFee_, lftFeeMax);
+    localTxnLoadFee_ = std::min(localTxnLoadFee_, kLFT_FEE_MAX);
 
     if (origFee == localTxnLoadFee_)
         return false;
@@ -46,9 +46,9 @@ LoadFeeTrack::lowerLocalFee()
     raiseCount_ = 0;
 
     // Reduce slowly
-    localTxnLoadFee_ -= (localTxnLoadFee_ / lftFeeDecFraction);
+    localTxnLoadFee_ -= (localTxnLoadFee_ / kLFT_FEE_DEC_FRACTION);
 
-    localTxnLoadFee_ = std::max(localTxnLoadFee_, lftNormalFee);
+    localTxnLoadFee_ = std::max(localTxnLoadFee_, kLFT_NORMAL_FEE);
 
     if (origFee == localTxnLoadFee_)
         return false;
@@ -78,7 +78,7 @@ scaleFeeLoad(XRPAmount fee, LoadFeeTrack const& feeTrack, Fees const& fees, bool
     // fee = fee * feeFactor / (lftNormalFee);
     // without overflow, and as accurately as possible
 
-    auto const result = mulDiv(fee, feeFactor, safe_cast<std::uint64_t>(feeTrack.getLoadBase()));
+    auto const result = mulDiv(fee, feeFactor, safeCast<std::uint64_t>(feeTrack.getLoadBase()));
     if (!result)
         Throw<std::overflow_error>("scaleFeeLoad");
     return *result;
diff --git a/src/libxrpl/server/Manifest.cpp b/src/libxrpl/server/Manifest.cpp
index 0108b78782..fd38d02d6b 100644
--- a/src/libxrpl/server/Manifest.cpp
+++ b/src/libxrpl/server/Manifest.cpp
@@ -62,37 +62,37 @@ deserializeManifest(Slice s, beast::Journal journal)
     if (s.empty())
         return std::nullopt;
 
-    static SOTemplate const manifestFormat{
+    static SOTemplate const kMANIFEST_FORMAT{
         // A manifest must include:
         // - the master public key
-        {sfPublicKey, soeREQUIRED},
+        {sfPublicKey, SoeRequired},
 
         // - a signature with that public key
-        {sfMasterSignature, soeREQUIRED},
+        {sfMasterSignature, SoeRequired},
 
         // - a sequence number
-        {sfSequence, soeREQUIRED},
+        {sfSequence, SoeRequired},
 
         // It may, optionally, contain:
         // - a version number which defaults to 0
-        {sfVersion, soeDEFAULT},
+        {sfVersion, SoeDefault},
 
         // - a domain name
-        {sfDomain, soeOPTIONAL},
+        {sfDomain, SoeOptional},
 
         // - an ephemeral signing key that can be changed as necessary
-        {sfSigningPubKey, soeOPTIONAL},
+        {sfSigningPubKey, SoeOptional},
 
         // - a signature using the ephemeral signing key, if it is present
-        {sfSignature, soeOPTIONAL},
+        {sfSignature, SoeOptional},
     };
 
     try
     {
         SerialIter sit{s};
-        STObject st{sit, sfGeneric};
+        STObject st{sit, kSF_GENERIC};
 
-        st.applyTemplate(manifestFormat);
+        st.applyTemplate(kMANIFEST_FORMAT);
 
         // 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(sfGeneric);
+    STObject st(kSF_GENERIC);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
 
@@ -204,19 +204,19 @@ Manifest::verify() const
 
     // Signing key and signature are not required for
     // master key revocations
-    if (!revoked() && !xrpl::verify(st, HashPrefix::manifest, *signingKey))
+    if (!revoked() && !xrpl::verify(st, HashPrefix::Manifest, *signingKey))
         return false;
 
-    return xrpl::verify(st, HashPrefix::manifest, masterKey, sfMasterSignature);
+    return xrpl::verify(st, HashPrefix::Manifest, masterKey, sfMasterSignature);
 }
 
 uint256
 Manifest::hash() const
 {
-    STObject st(sfGeneric);
+    STObject st(kSF_GENERIC);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
-    return st.getHash(HashPrefix::manifest);
+    return st.getHash(HashPrefix::Manifest);
 }
 
 bool
@@ -240,7 +240,7 @@ Manifest::revoked(std::uint32_t sequence)
 std::optional<Blob>
 Manifest::getSignature() const
 {
-    STObject st(sfGeneric);
+    STObject st(kSF_GENERIC);
     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(sfGeneric);
+    STObject st(kSF_GENERIC);
     SerialIter sit(serialized.data(), serialized.size());
     st.set(sit);
     return st.getFieldVL(sfMasterSignature);
@@ -274,15 +274,15 @@ loadValidatorToken(std::vector<std::string> const& blob, beast::Journal journal)
         for (auto const& line : blob)
             tokenStr += boost::algorithm::trim_copy(line);
 
-        tokenStr = base64_decode(tokenStr);
+        tokenStr = base64Decode(tokenStr);
 
-        Json::Reader r;
-        Json::Value token;
+        json::Reader r;
+        json::Value token;
 
         if (r.parse(tokenStr, token))
         {
-            auto const m = token.get("manifest", Json::Value{});
-            auto const k = token.get("validation_secret_key", Json::Value{});
+            auto const m = token.get("manifest", json::Value{});
+            auto const k = token.get("validation_secret_key", json::Value{});
 
             if (m.isString() && k.isString())
             {
@@ -398,14 +398,14 @@ ManifestCache::applyManifest(Manifest m)
             // doesn't have the latest data.
             if (auto stream = j_.debug())
                 logMftAct(stream, "Stale", m.masterKey, m.sequence, iter->second.sequence);
-            return ManifestDisposition::stale;
+            return ManifestDisposition::Stale;
         }
 
         if (checkSignature && !m.verify())
         {
             if (auto stream = j_.warn())
                 logMftAct(stream, "Invalid", m.masterKey, m.sequence);
-            return ManifestDisposition::invalid;
+            return ManifestDisposition::Invalid;
         }
 
         // If the master key associated with a manifest is or might be
@@ -427,7 +427,7 @@ ManifestCache::applyManifest(Manifest m)
             JLOG(j_.warn()) << to_string(m) << ": Master key already used as ephemeral key for "
                             << toBase58(TokenType::NodePublic, x->second);
 
-            return ManifestDisposition::badMasterKey;
+            return ManifestDisposition::BadMasterKey;
         }
 
         if (!revoked)
@@ -438,7 +438,7 @@ ManifestCache::applyManifest(Manifest m)
                                 << ": is not revoked and the manifest has no "
                                    "signing key. Hence, the manifest is "
                                    "invalid";
-                return ManifestDisposition::invalid;
+                return ManifestDisposition::Invalid;
             }
 
             // Sanity check: the ephemeral key of this manifest should not be
@@ -450,7 +450,7 @@ ManifestCache::applyManifest(Manifest m)
                                 << ": Ephemeral key already used as ephemeral key for "
                                 << toBase58(TokenType::NodePublic, x->second);
 
-                return ManifestDisposition::badEphemeralKey;
+                return ManifestDisposition::BadEphemeralKey;
             }
 
             if (auto const x = map_.find(*m.signingKey); x != map_.end())
@@ -458,7 +458,7 @@ ManifestCache::applyManifest(Manifest m)
                 JLOG(j_.warn()) << to_string(m) << ": Ephemeral key used as master key for "
                                 << to_string(x->second);
 
-                return ManifestDisposition::badEphemeralKey;
+                return ManifestDisposition::BadEphemeralKey;
             }
         }
 
@@ -506,7 +506,7 @@ ManifestCache::applyManifest(Manifest m)
         // Something has changed. Keep track of it.
         seq_++;
 
-        return ManifestDisposition::accepted;
+        return ManifestDisposition::Accepted;
     }
 
     // An ephemeral key was revoked and superseded by a new key. This is
@@ -530,7 +530,7 @@ ManifestCache::applyManifest(Manifest m)
     // Something has changed. Keep track of it.
     seq_++;
 
-    return ManifestDisposition::accepted;
+    return ManifestDisposition::Accepted;
 }
 
 void
@@ -551,7 +551,7 @@ ManifestCache::load(
 
     if (!configManifest.empty())
     {
-        auto mo = deserializeManifest(base64_decode(configManifest));
+        auto mo = deserializeManifest(base64Decode(configManifest));
         if (!mo)
         {
             JLOG(j_.error()) << "Malformed validator_token in config";
@@ -563,7 +563,7 @@ ManifestCache::load(
             JLOG(j_.warn()) << "Configured manifest revokes public key";
         }
 
-        if (applyManifest(std::move(*mo)) == ManifestDisposition::invalid)
+        if (applyManifest(std::move(*mo)) == ManifestDisposition::Invalid)
         {
             JLOG(j_.error()) << "Manifest in config was rejected";
             return false;
@@ -583,9 +583,9 @@ ManifestCache::load(
         for (auto const& line : configRevocation)
             revocationStr += boost::algorithm::trim_copy(line);
 
-        auto mo = deserializeManifest(base64_decode(revocationStr));
+        auto mo = deserializeManifest(base64Decode(revocationStr));
 
-        if (!mo || !mo->revoked() || applyManifest(std::move(*mo)) == ManifestDisposition::invalid)
+        if (!mo || !mo->revoked() || applyManifest(std::move(*mo)) == ManifestDisposition::Invalid)
         {
             JLOG(j_.error()) << "Invalid validator key revocation in config";
             return false;
diff --git a/src/libxrpl/server/Port.cpp b/src/libxrpl/server/Port.cpp
index 99466446d6..228b65df43 100644
--- a/src/libxrpl/server/Port.cpp
+++ b/src/libxrpl/server/Port.cpp
@@ -61,7 +61,7 @@ operator<<(std::ostream& os, Port const& p)
 
     if (!p.secure_gateway_nets_v4.empty() || !p.secure_gateway_nets_v6.empty())
     {
-        os << "secure_gateway nets:";
+        os << "secureGateway nets:";
         for (auto const& net : p.secure_gateway_nets_v4)
         {
             os << net.to_string();
@@ -106,10 +106,10 @@ populate(
         {
             // First, check to see if 0.0.0.0 or ipv6 equivalent was configured,
             // which means all IP addresses.
-            auto const addr = beast::IP::Endpoint::from_string_checked(ip);
+            auto const addr = beast::IP::Endpoint::fromStringChecked(ip);
             if (addr)
             {
-                if (is_unspecified(*addr))
+                if (isUnspecified(*addr))
                 {
                     nets4.push_back(boost::asio::ip::make_network_v4("0.0.0.0/0"));
                     nets6.push_back(boost::asio::ip::make_network_v6("::/0"));
@@ -121,8 +121,8 @@ populate(
                 // be unset). We need this to be a subnet, so append
                 // the number of network bits to make a subnet of 1,
                 // depending on type.
-                v4 = addr->is_v4();
-                std::string addressString = addr->to_string();
+                v4 = addr->isV4();
+                std::string addressString = addr->toString();
                 if (v4)
                 {
                     addressString += "/32";
@@ -191,7 +191,7 @@ populate(
 }
 
 void
-parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
+parsePort(ParsedPort& port, Section const& section, std::ostream& log)
 {
     port.name = section.name();
     {
@@ -206,7 +206,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
             {
                 log << "Invalid value '" << *optResult << "' for key 'ip' in [" << section.name()
                     << "]";
-                Rethrow();
+                rethrow();
             }
         }
     }
@@ -227,7 +227,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
             {
                 log << "Invalid value '" << *optResult << "' for key "
                     << "'port' in [" << section.name() << "]";
-                Rethrow();
+                rethrow();
             }
         }
     }
@@ -236,7 +236,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
         auto const optResult = section.get("protocol");
         if (optResult)
         {
-            for (auto const& s : beast::rfc2616::split_commas(optResult->begin(), optResult->end()))
+            for (auto const& s : beast::rfc2616::splitCommas(optResult->begin(), optResult->end()))
                 port.protocol.insert(s);
         }
     }
@@ -248,13 +248,13 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
         {
             try
             {
-                port.limit = safe_cast<int>(beast::lexicalCastThrow<std::uint16_t>(lim));
+                port.limit = safeCast<int>(beast::lexicalCastThrow<std::uint16_t>(lim));
             }
             catch (std::exception const&)
             {
                 log << "Invalid value '" << lim << "' for key "
                     << "'limit' in [" << section.name() << "]";
-                Rethrow();
+                rethrow();
             }
         }
     }
@@ -275,7 +275,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
             {
                 log << "Invalid value '" << *optResult << "' for key "
                     << "'send_queue_limit' in [" << section.name() << "]";
-                Rethrow();
+                rethrow();
             }
         }
         else
@@ -287,7 +287,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
 
     populate(section, "admin", log, port.admin_nets_v4, port.admin_nets_v6);
     populate(
-        section, "secure_gateway", log, port.secure_gateway_nets_v4, port.secure_gateway_nets_v6);
+        section, "secureGateway", log, port.secure_gateway_nets_v4, port.secure_gateway_nets_v6);
 
     set(port.user, "user", section);
     set(port.password, "password", section);
@@ -298,15 +298,15 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
     set(port.ssl_chain, "ssl_chain", section);
     set(port.ssl_ciphers, "ssl_ciphers", section);
 
-    port.pmd_options.server_enable = section.value_or("permessage_deflate", true);
-    port.pmd_options.client_max_window_bits = section.value_or("client_max_window_bits", 15);
-    port.pmd_options.server_max_window_bits = section.value_or("server_max_window_bits", 15);
+    port.pmd_options.server_enable = section.valueOr("permessage_deflate", true);
+    port.pmd_options.client_max_window_bits = section.valueOr("client_max_window_bits", 15);
+    port.pmd_options.server_max_window_bits = section.valueOr("server_max_window_bits", 15);
     port.pmd_options.client_no_context_takeover =
-        section.value_or("client_no_context_takeover", false);
+        section.valueOr("client_no_context_takeover", false);
     port.pmd_options.server_no_context_takeover =
-        section.value_or("server_no_context_takeover", false);
-    port.pmd_options.compLevel = section.value_or("compress_level", 8);
-    port.pmd_options.memLevel = section.value_or("memory_level", 4);
+        section.valueOr("server_no_context_takeover", false);
+    port.pmd_options.compLevel = section.valueOr("compress_level", 8);
+    port.pmd_options.memLevel = section.valueOr("memory_level", 4);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/server/Vacuum.cpp b/src/libxrpl/server/Vacuum.cpp
index d0e430ead9..140ef04def 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 / TxDBName;
+    boost::filesystem::path const dbPath = setup.dataDir / kTX_DB_NAME;
 
     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, TxDBName, setup.txPragma, TxDBInit, j);
+    auto txnDB = std::make_unique<DatabaseCon>(setup, kTX_DB_NAME, setup.txPragma, kTX_DB_INIT, 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(CommonDBPragmaTemp) % "file";
+    session << boost::format(kCOMMON_DB_PRAGMA_TEMP) % "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 7906867654..ee579c7b9f 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, WalletDBName, std::array<std::string, 0>(), WalletDBInit, j);
+        setup, kWALLET_DB_NAME, std::array<std::string, 0>(), kWALLET_DB_INIT, j);
 }
 
 std::unique_ptr<DatabaseCon>
@@ -48,14 +48,14 @@ 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>(), WalletDBInit, j);
+        setup, dbname.data(), std::array<std::string, 0>(), kWALLET_DB_INIT, j);
 }
 
 void
 getManifests(
     soci::session& session,
     std::string const& dbTable,
-    ManifestCache& mCache,
+    ManifestCache& cache,
     beast::Journal j)
 {
     // Load manifests stored in database
@@ -75,7 +75,7 @@ getManifests(
                 continue;
             }
 
-            mCache.applyManifest(std::move(*mo));
+            cache.applyManifest(std::move(*mo));
         }
         else
         {
@@ -151,13 +151,13 @@ getNodeIdentity(soci::session& session)
             auto const pk = parseBase58<PublicKey>(TokenType::NodePublic, pubKO.value_or(""));
 
             // Only use if the public and secret keys are a pair
-            if (sk && pk && (*pk == derivePublicKey(KeyType::secp256k1, *sk)))
+            if (sk && pk && (*pk == derivePublicKey(KeyType::Secp256k1, *sk)))
                 return {*pk, *sk};
         }
     }
 
     // If a valid identity wasn't found, we randomly generate a new one:
-    auto [newpublicKey, newsecretKey] = randomKeyPair(KeyType::secp256k1);
+    auto [newpublicKey, newsecretKey] = randomKeyPair(KeyType::Secp256k1);
 
     session << str(
         boost::format(
@@ -169,10 +169,10 @@ getNodeIdentity(soci::session& session)
     return {newpublicKey, newsecretKey};
 }
 
-std::unordered_set<PeerReservation, beast::uhash<>, KeyEqual>
+std::unordered_set<PeerReservation, beast::Uhash<>, KeyEqual>
 getPeerReservationTable(soci::session& session, beast::Journal j)
 {
-    std::unordered_set<PeerReservation, beast::uhash<>, KeyEqual> table;
+    std::unordered_set<PeerReservation, beast::Uhash<>, KeyEqual> table;
     // These values must be boost::optionals (not std) because SOCI expects
     // boost::optionals.
     boost::optional<std::string> valPubKey, valDesc;
@@ -253,13 +253,13 @@ void
 readAmendments(
     soci::session& session,
     std::function<void(
-        boost::optional<std::string> amendment_hash,
-        boost::optional<std::string> amendment_name,
+        boost::optional<std::string> amendmentHash,
+        boost::optional<std::string> amendmentName,
         boost::optional<AmendmentVote> vote)> const& callback)
 {
     // lambda that converts the internally stored int to an AmendmentVote.
     auto intToVote = [](boost::optional<int> const& dbVote) -> boost::optional<AmendmentVote> {
-        return safe_cast<AmendmentVote>(dbVote.value_or(1));
+        return safeCast<AmendmentVote>(dbVote.value_or(1));
     };
 
     soci::transaction const tr(session);
@@ -269,18 +269,18 @@ readAmendments(
         "(  PARTITION BY AmendmentHash ORDER BY ROWID DESC ) "
         "as rnk FROM FeatureVotes ) WHERE rnk = 1";
     // SOCI requires boost::optional (not std::optional) as parameters.
-    boost::optional<std::string> amendment_hash;
-    boost::optional<std::string> amendment_name;
-    boost::optional<int> vote_to_veto;
+    boost::optional<std::string> amendmentHash;
+    boost::optional<std::string> amendmentName;
+    boost::optional<int> voteToVeto;
     soci::statement st =
         (session.prepare << sql,
-         soci::into(amendment_hash),
-         soci::into(amendment_name),
-         soci::into(vote_to_veto));
+         soci::into(amendmentHash),
+         soci::into(amendmentName),
+         soci::into(voteToVeto));
     st.execute();
     while (st.fetch())
     {
-        callback(amendment_hash, amendment_name, intToVote(vote_to_veto));
+        callback(amendmentHash, amendmentName, intToVote(voteToVeto));
     }
 }
 
@@ -297,7 +297,7 @@ voteAmendment(
         "('";
     sql += to_string(amendment);
     sql += "', '" + name;
-    sql += "', '" + std::to_string(safe_cast<int>(vote)) + "');";
+    sql += "', '" + std::to_string(safeCast<int>(vote)) + "');";
     session << sql;
     tr.commit();
 }
diff --git a/src/libxrpl/shamap/SHAMap.cpp b/src/libxrpl/shamap/SHAMap.cpp
index 837724babe..795c097118 100644
--- a/src/libxrpl/shamap/SHAMap.cpp
+++ b/src/libxrpl/shamap/SHAMap.cpp
@@ -43,16 +43,16 @@ namespace xrpl {
 [[nodiscard]] intr_ptr::SharedPtr<SHAMapLeafNode>
 makeTypedLeaf(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const> item, std::uint32_t owner)
 {
-    if (type == SHAMapNodeType::tnTRANSACTION_NM)
-        return intr_ptr::make_shared<SHAMapTxLeafNode>(std::move(item), owner);
+    if (type == SHAMapNodeType::TnTransactionNm)
+        return intr_ptr::makeShared<SHAMapTxLeafNode>(std::move(item), owner);
 
-    if (type == SHAMapNodeType::tnTRANSACTION_MD)
-        return intr_ptr::make_shared<SHAMapTxPlusMetaLeafNode>(std::move(item), owner);
+    if (type == SHAMapNodeType::TnTransactionMd)
+        return intr_ptr::makeShared<SHAMapTxPlusMetaLeafNode>(std::move(item), owner);
 
-    if (type == SHAMapNodeType::tnACCOUNT_STATE)
-        return intr_ptr::make_shared<SHAMapAccountStateLeafNode>(std::move(item), owner);
+    if (type == SHAMapNodeType::TnAccountState)
+        return intr_ptr::makeShared<SHAMapAccountStateLeafNode>(std::move(item), owner);
 
-    LogicError(
+    logicError(
         "Attempt to create leaf node of unknown type " +
         std::to_string(static_cast<std::underlying_type_t<SHAMapNodeType>>(type)));
 }
@@ -60,7 +60,7 @@ makeTypedLeaf(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const> item,
 SHAMap::SHAMap(SHAMapType t, Family& f)
     : f_(f), journal_(f.journal()), state_(SHAMapState::Modifying), type_(t)
 {
-    root_ = intr_ptr::make_shared<SHAMapInnerNode>(cowid_);
+    root_ = intr_ptr::makeShared<SHAMapInnerNode>(cowid_);
 }
 
 // The `hash` parameter is unused. It is part of the interface so it's clear
@@ -70,7 +70,7 @@ SHAMap::SHAMap(SHAMapType t, Family& f)
 SHAMap::SHAMap(SHAMapType t, uint256 const& hash, Family& f)
     : f_(f), journal_(f.journal()), state_(SHAMapState::Synching), type_(t)
 {
-    root_ = intr_ptr::make_shared<SHAMapInnerNode>(cowid_);
+    root_ = intr_ptr::makeShared<SHAMapInnerNode>(cowid_);
 }
 
 SHAMap::SHAMap(SHAMap const& other, bool isMutable)
@@ -114,7 +114,7 @@ SHAMap::dirtyUp(
 
     while (!stack.empty())
     {
-        auto node = intr_ptr::dynamic_pointer_cast<SHAMapInnerNode>(stack.top().first);
+        auto node = intr_ptr::dynamicPointerCast<SHAMapInnerNode>(stack.top().first);
         SHAMapNodeID const nodeID = stack.top().second;
         stack.pop();
         XRPL_ASSERT(node, "xrpl::SHAMap::dirtyUp : non-null node");
@@ -142,7 +142,7 @@ SHAMap::walkTowardsKey(uint256 const& id, SharedPtrNodeStack* stack) const
         if (stack != nullptr)
             stack->emplace(inNode, nodeID);
 
-        auto const inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(inNode);
+        auto const inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(inNode);
         auto const branch = selectBranch(nodeID, id);
         if (inner->isEmptyBranch(branch))
             return nullptr;
@@ -153,7 +153,7 @@ SHAMap::walkTowardsKey(uint256 const& id, SharedPtrNodeStack* stack) const
 
     if (stack != nullptr)
         stack->emplace(inNode, nodeID);
-    return safe_downcast<SHAMapLeafNode*>(inNode.get());
+    return safeDowncast<SHAMapLeafNode*>(inNode.get());
 }
 
 SHAMapLeafNode*
@@ -169,7 +169,7 @@ intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMap::fetchNodeFromDB(SHAMapHash const& hash) const
 {
     XRPL_ASSERT(backed_, "xrpl::SHAMap::fetchNodeFromDB : is backed");
-    auto obj = f_.db().fetchNodeObject(hash.as_uint256(), ledgerSeq_);
+    auto obj = f_.db().fetchNodeObject(hash.asUint256(), ledgerSeq_);
     return finishFetch(hash, obj);
 }
 
@@ -185,7 +185,7 @@ SHAMap::finishFetch(SHAMapHash const& hash, std::shared_ptr<NodeObject> const& o
             if (full_)
             {
                 full_ = false;
-                f_.missingNodeAcquireBySeq(ledgerSeq_, hash.as_uint256());
+                f_.missingNodeAcquireBySeq(ledgerSeq_, hash.asUint256());
             }
             return {};
         }
@@ -352,7 +352,7 @@ SHAMap::descend(
 {
     XRPL_ASSERT(parent->isInner(), "xrpl::SHAMap::descend : valid parent input");
     XRPL_ASSERT(
-        (branch >= 0) && (branch < branchFactor), "xrpl::SHAMap::descend : valid branch input");
+        (branch >= 0) && (branch < kBRANCH_FACTOR), "xrpl::SHAMap::descend : valid branch input");
     XRPL_ASSERT(
         !parent->isEmptyBranch(branch), "xrpl::SHAMap::descend : parent branch is non-empty");
 
@@ -398,7 +398,7 @@ SHAMap::descendAsync(
         if (!ptr && backed_)
         {
             f_.db().asyncFetch(
-                hash.as_uint256(),
+                hash.asUint256(),
                 ledgerSeq_,
                 [this, hash, cb{std::move(callback)}](std::shared_ptr<NodeObject> const& object) {
                     auto node = finishFetch(hash, object);
@@ -425,7 +425,7 @@ SHAMap::unshareNode(intr_ptr::SharedPtr<Node> node, SHAMapNodeID const& nodeID)
     {
         // have a CoW
         XRPL_ASSERT(state_ != SHAMapState::Immutable, "xrpl::SHAMap::unshareNode : not immutable");
-        node = intr_ptr::static_pointer_cast<Node>(node->clone(cowid_));
+        node = intr_ptr::staticPointerCast<Node>(node->clone(cowid_));
         if (nodeID.isRoot())
             root_ = node;
     }
@@ -442,11 +442,11 @@ SHAMap::belowHelper(
     auto& [init, cmp, incr] = loopParams;
     if (node->isLeaf())
     {
-        auto n = intr_ptr::static_pointer_cast<SHAMapLeafNode>(node);
-        stack.push({node, {leafDepth, n->peekItem()->key()}});
+        auto n = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
+        stack.push({node, {kLEAF_DEPTH, n->peekItem()->key()}});
         return n.get();
     }
-    auto inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
+    auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
     if (stack.empty())
     {
         stack.emplace(inner, SHAMapNodeID{});
@@ -463,11 +463,11 @@ SHAMap::belowHelper(
             XRPL_ASSERT(!stack.empty(), "xrpl::SHAMap::belowHelper : non-empty stack");
             if (node->isLeaf())
             {
-                auto n = intr_ptr::static_pointer_cast<SHAMapLeafNode>(node);
-                stack.push({n, {leafDepth, n->peekItem()->key()}});
+                auto n = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
+                stack.push({n, {kLEAF_DEPTH, n->peekItem()->key()}});
                 return n.get();
             }
-            inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
+            inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
             stack.emplace(inner, stack.top().second.getChildNodeID(branch));
             i = init;  // descend and reset loop
         }
@@ -482,7 +482,7 @@ SHAMapLeafNode*
 SHAMap::lastBelow(intr_ptr::SharedPtr<SHAMapTreeNode> node, SharedPtrNodeStack& stack, int branch)
     const
 {
-    auto init = branchFactor - 1;
+    auto init = kBRANCH_FACTOR - 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 <= branchFactor; };
+    auto cmp = [](int i) { return i <= kBRANCH_FACTOR; };
     auto incr = [](int& i) { ++i; };
 
     return belowHelper(node, stack, branch, {init, cmp, incr});
 }
-static boost::intrusive_ptr<SHAMapItem const> const no_item;
+static boost::intrusive_ptr<SHAMapItem const> const kNO_ITEM;
 
 boost::intrusive_ptr<SHAMapItem const> const&
 SHAMap::onlyBelow(SHAMapTreeNode* node) const
@@ -508,13 +508,13 @@ SHAMap::onlyBelow(SHAMapTreeNode* node) const
     while (!node->isLeaf())
     {
         SHAMapTreeNode* nextNode = nullptr;
-        auto inner = safe_downcast<SHAMapInnerNode*>(node);
-        for (int i = 0; i < branchFactor; ++i)
+        auto inner = safeDowncast<SHAMapInnerNode*>(node);
+        for (int i = 0; i < kBRANCH_FACTOR; ++i)
         {
             if (!inner->isEmptyBranch(i))
             {
                 if (nextNode != nullptr)
-                    return no_item;
+                    return kNO_ITEM;
 
                 nextNode = descendThrow(inner, i);
             }
@@ -524,7 +524,7 @@ SHAMap::onlyBelow(SHAMapTreeNode* node) const
         {
             // LCOV_EXCL_START
             UNREACHABLE("xrpl::SHAMap::onlyBelow : no next node");
-            return no_item;
+            return kNO_ITEM;
             // LCOV_EXCL_STOP
         }
 
@@ -533,7 +533,7 @@ SHAMap::onlyBelow(SHAMapTreeNode* node) const
 
     // An inner node must have at least one leaf
     // below it, unless it's the root_
-    auto const leaf = safe_downcast<SHAMapLeafNode const*>(node);
+    auto const leaf = safeDowncast<SHAMapLeafNode const*>(node);
     XRPL_ASSERT(
         leaf->peekItem() || (leaf == root_.get()), "xrpl::SHAMap::onlyBelow : valid inner node");
     return leaf->peekItem();
@@ -563,8 +563,8 @@ 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::static_pointer_cast<SHAMapInnerNode>(node);
-        for (auto i = selectBranch(nodeID, id) + 1; i < branchFactor; ++i)
+        auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
+        for (auto i = selectBranch(nodeID, id) + 1; i < kBRANCH_FACTOR; ++i)
         {
             if (!inner->isEmptyBranch(i))
             {
@@ -588,7 +588,7 @@ SHAMap::peekItem(uint256 const& id) const
     SHAMapLeafNode const* leaf = findKey(id);
 
     if (leaf == nullptr)
-        return no_item;
+        return kNO_ITEM;
 
     return leaf->peekItem();
 }
@@ -599,14 +599,14 @@ SHAMap::peekItem(uint256 const& id, SHAMapHash& hash) const
     SHAMapLeafNode const* leaf = findKey(id);
 
     if (leaf == nullptr)
-        return no_item;
+        return kNO_ITEM;
 
     hash = leaf->getHash();
     return leaf->peekItem();
 }
 
-SHAMap::const_iterator
-SHAMap::upper_bound(uint256 const& id) const
+SHAMap::ConstIterator
+SHAMap::upperBound(uint256 const& id) const
 {
     SharedPtrNodeStack stack;
     walkTowardsKey(id, &stack);
@@ -615,14 +615,14 @@ SHAMap::upper_bound(uint256 const& id) const
         auto [node, nodeID] = stack.top();
         if (node->isLeaf())
         {
-            auto leaf = safe_downcast<SHAMapLeafNode*>(node.get());
+            auto leaf = safeDowncast<SHAMapLeafNode*>(node.get());
             if (leaf->peekItem()->key() > id)
-                return const_iterator(this, leaf->peekItem().get(), std::move(stack));
+                return ConstIterator(this, leaf->peekItem().get(), std::move(stack));
         }
         else
         {
-            auto inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
-            for (auto branch = selectBranch(nodeID, id) + 1; branch < branchFactor; ++branch)
+            auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
+            for (auto branch = selectBranch(nodeID, id) + 1; branch < kBRANCH_FACTOR; ++branch)
             {
                 if (!inner->isEmptyBranch(branch))
                 {
@@ -630,7 +630,7 @@ SHAMap::upper_bound(uint256 const& id) const
                     auto leaf = firstBelow(node, stack, branch);
                     if (leaf == nullptr)
                         Throw<SHAMapMissingNode>(type_, id);
-                    return const_iterator(this, leaf->peekItem().get(), std::move(stack));
+                    return ConstIterator(this, leaf->peekItem().get(), std::move(stack));
                 }
             }
         }
@@ -638,8 +638,8 @@ SHAMap::upper_bound(uint256 const& id) const
     }
     return end();
 }
-SHAMap::const_iterator
-SHAMap::lower_bound(uint256 const& id) const
+SHAMap::ConstIterator
+SHAMap::lowerBound(uint256 const& id) const
 {
     SharedPtrNodeStack stack;
     walkTowardsKey(id, &stack);
@@ -648,13 +648,13 @@ SHAMap::lower_bound(uint256 const& id) const
         auto [node, nodeID] = stack.top();
         if (node->isLeaf())
         {
-            auto leaf = safe_downcast<SHAMapLeafNode*>(node.get());
+            auto leaf = safeDowncast<SHAMapLeafNode*>(node.get());
             if (leaf->peekItem()->key() < id)
-                return const_iterator(this, leaf->peekItem().get(), std::move(stack));
+                return ConstIterator(this, leaf->peekItem().get(), std::move(stack));
         }
         else
         {
-            auto inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
+            auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
             for (int branch = selectBranch(nodeID, id) - 1; branch >= 0; --branch)
             {
                 if (!inner->isEmptyBranch(branch))
@@ -663,7 +663,7 @@ SHAMap::lower_bound(uint256 const& id) const
                     auto leaf = lastBelow(node, stack, branch);
                     if (leaf == nullptr)
                         Throw<SHAMapMissingNode>(type_, id);
-                    return const_iterator(this, leaf->peekItem().get(), std::move(stack));
+                    return ConstIterator(this, leaf->peekItem().get(), std::move(stack));
                 }
             }
         }
@@ -691,7 +691,7 @@ SHAMap::delItem(uint256 const& id)
     if (stack.empty())
         Throw<SHAMapMissingNode>(type_, id);
 
-    auto leaf = intr_ptr::dynamic_pointer_cast<SHAMapLeafNode>(stack.top().first);
+    auto leaf = intr_ptr::dynamicPointerCast<SHAMapLeafNode>(stack.top().first);
     stack.pop();
 
     if (!leaf || (leaf->peekItem()->key() != id))
@@ -706,7 +706,7 @@ SHAMap::delItem(uint256 const& id)
 
     while (!stack.empty())
     {
-        auto node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(stack.top().first);
+        auto node = intr_ptr::staticPointerCast<SHAMapInnerNode>(stack.top().first);
         SHAMapNodeID const nodeID = stack.top().second;
         stack.pop();
 
@@ -737,7 +737,7 @@ SHAMap::delItem(uint256 const& id)
 
                 if (item)
                 {
-                    for (int i = 0; i < branchFactor; ++i)
+                    for (int i = 0; i < kBRANCH_FACTOR; ++i)
                     {
                         if (!node->isEmptyBranch(i))
                         {
@@ -768,7 +768,7 @@ bool
 SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const> item)
 {
     XRPL_ASSERT(state_ != SHAMapState::Immutable, "xrpl::SHAMap::addGiveItem : not immutable");
-    XRPL_ASSERT(type != SHAMapNodeType::tnINNER, "xrpl::SHAMap::addGiveItem : valid type input");
+    XRPL_ASSERT(type != SHAMapNodeType::TnInner, "xrpl::SHAMap::addGiveItem : valid type input");
 
     // add the specified item, does not update
     uint256 const tag = item->key();
@@ -784,7 +784,7 @@ SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const>
 
     if (node->isLeaf())
     {
-        auto leaf = intr_ptr::static_pointer_cast<SHAMapLeafNode>(node);
+        auto leaf = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
         if (leaf->peekItem()->key() == tag)
             return false;
     }
@@ -792,7 +792,7 @@ SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const>
     if (node->isInner())
     {
         // easy case, we end on an inner node
-        auto inner = intr_ptr::static_pointer_cast<SHAMapInnerNode>(node);
+        auto inner = intr_ptr::staticPointerCast<SHAMapInnerNode>(node);
         int const branch = selectBranch(nodeID, tag);
         XRPL_ASSERT(
             inner->isEmptyBranch(branch), "xrpl::SHAMap::addGiveItem : inner branch is empty");
@@ -802,12 +802,12 @@ SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const>
     {
         // this is a leaf node that has to be made an inner node holding two
         // items
-        auto leaf = intr_ptr::static_pointer_cast<SHAMapLeafNode>(node);
+        auto leaf = intr_ptr::staticPointerCast<SHAMapLeafNode>(node);
         auto otherItem = leaf->peekItem();
         XRPL_ASSERT(
             otherItem && (tag != otherItem->key()), "xrpl::SHAMap::addGiveItem : non-null item");
 
-        node = intr_ptr::make_shared<SHAMapInnerNode>(node->cowid());
+        node = intr_ptr::makeShared<SHAMapInnerNode>(node->cowid());
 
         unsigned int b1 = 0, b2 = 0;
 
@@ -818,13 +818,13 @@ SHAMap::addGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem const>
             // we need a new inner node, since both go on same branch at this
             // level
             nodeID = nodeID.getChildNodeID(b1);
-            node = intr_ptr::make_shared<SHAMapInnerNode>(cowid_);
+            node = intr_ptr::makeShared<SHAMapInnerNode>(cowid_);
         }
 
         // we can add the two leaf nodes here
         XRPL_ASSERT(node->isInner(), "xrpl::SHAMap::addGiveItem : node is inner");
 
-        auto inner = safe_downcast<SHAMapInnerNode*>(node.get());
+        auto inner = safeDowncast<SHAMapInnerNode*>(node.get());
         inner->setChild(b1, makeTypedLeaf(type, std::move(item), cowid_));
         inner->setChild(b2, makeTypedLeaf(type, std::move(otherItem), cowid_));
     }
@@ -865,7 +865,7 @@ SHAMap::updateGiveItem(SHAMapNodeType type, boost::intrusive_ptr<SHAMapItem cons
     if (stack.empty())
         Throw<SHAMapMissingNode>(type_, tag);
 
-    auto node = intr_ptr::dynamic_pointer_cast<SHAMapLeafNode>(stack.top().first);
+    auto node = intr_ptr::dynamicPointerCast<SHAMapLeafNode>(stack.top().first);
     auto nodeID = stack.top().second;
     stack.pop();
 
@@ -947,7 +947,7 @@ SHAMap::writeNode(NodeObjectType t, intr_ptr::SharedPtr<SHAMapTreeNode> node) co
 
     Serializer s;
     node->serializeWithPrefix(s);
-    f_.db().store(t, std::move(s.modData()), node->getHash().as_uint256(), ledgerSeq_);
+    f_.db().store(t, std::move(s.modData()), node->getHash().asUint256(), ledgerSeq_);
     return node;
 }
 
@@ -966,7 +966,7 @@ SHAMap::preFlushNode(intr_ptr::SharedPtr<Node> node) const
     {
         // Node is not uniquely ours, so unshare it before
         // possibly modifying it
-        node = intr_ptr::static_pointer_cast<Node>(node->clone(cowid_));
+        node = intr_ptr::staticPointerCast<Node>(node->clone(cowid_));
     }
     return node;
 }
@@ -975,7 +975,7 @@ int
 SHAMap::unshare()
 {
     // Don't share nodes with parent map
-    return walkSubTree(false, NodeObjectType::hotUNKNOWN);
+    return walkSubTree(false, NodeObjectType::Unknown);
 }
 
 int
@@ -1007,11 +1007,11 @@ SHAMap::walkSubTree(bool doWrite, NodeObjectType t)
         return 1;
     }
 
-    auto node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(root_);
+    auto node = intr_ptr::staticPointerCast<SHAMapInnerNode>(root_);
 
     if (node->isEmpty())
     {  // replace empty root with a new empty root
-        root_ = intr_ptr::make_shared<SHAMapInnerNode>(0);
+        root_ = intr_ptr::makeShared<SHAMapInnerNode>(0);
         return 1;
     }
 
@@ -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 < branchFactor)
+        while (pos < kBRANCH_FACTOR)
         {
             if (node->isEmptyBranch(pos))
             {
@@ -1051,7 +1051,7 @@ SHAMap::walkSubTree(bool doWrite, NodeObjectType t)
                         // save our place and work on this node
 
                         stack.emplace(std::move(node), branch);
-                        node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(child);
+                        node = intr_ptr::staticPointerCast<SHAMapInnerNode>(child);
                         pos = 0;
                     }
                     else
@@ -1082,7 +1082,7 @@ SHAMap::walkSubTree(bool doWrite, NodeObjectType t)
         node->unshare();
 
         if (doWrite)
-            node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(writeNode(t, std::move(node)));
+            node = intr_ptr::staticPointerCast<SHAMapInnerNode>(writeNode(t, std::move(node)));
 
         ++flushed;
 
@@ -1130,8 +1130,8 @@ SHAMap::dump(bool hash) const
 
         if (node->isInner())
         {
-            auto inner = safe_downcast<SHAMapInnerNode*>(node);
-            for (int i = 0; i < branchFactor; ++i)
+            auto inner = safeDowncast<SHAMapInnerNode*>(node);
+            for (int i = 0; i < kBRANCH_FACTOR; ++i)
             {
                 if (!inner->isEmptyBranch(i))
                 {
@@ -1158,7 +1158,7 @@ SHAMap::dump(bool hash) const
 intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMap::cacheLookup(SHAMapHash const& hash) const
 {
-    auto ret = f_.getTreeNodeCache()->fetch(hash.as_uint256());
+    auto ret = f_.getTreeNodeCache()->fetch(hash.asUint256());
     XRPL_ASSERT(!ret || !ret->cowid(), "xrpl::SHAMap::cacheLookup : not found or zero cowid");
     return ret;
 }
@@ -1170,7 +1170,7 @@ SHAMap::canonicalize(SHAMapHash const& hash, intr_ptr::SharedPtr<SHAMapTreeNode>
     XRPL_ASSERT(node->cowid() == 0, "xrpl::SHAMap::canonicalize : valid node input");
     XRPL_ASSERT(node->getHash() == hash, "xrpl::SHAMap::canonicalize : node hash do match");
 
-    f_.getTreeNodeCache()->canonicalize_replace_client(hash.as_uint256(), node);
+    f_.getTreeNodeCache()->canonicalizeReplaceClient(hash.asUint256(), node);
 }
 
 void
diff --git a/src/libxrpl/shamap/SHAMapDelta.cpp b/src/libxrpl/shamap/SHAMapDelta.cpp
index e80f28d25f..b1aeac18e8 100644
--- a/src/libxrpl/shamap/SHAMapDelta.cpp
+++ b/src/libxrpl/shamap/SHAMapDelta.cpp
@@ -53,7 +53,7 @@ SHAMap::walkBranch(
         if (node->isInner())
         {
             // This is an inner node, add all non-empty branches
-            auto inner = safe_downcast<SHAMapInnerNode*>(node);
+            auto inner = safeDowncast<SHAMapInnerNode*>(node);
             for (int i = 0; i < 16; ++i)
             {
                 if (!inner->isEmptyBranch(i))
@@ -63,7 +63,7 @@ SHAMap::walkBranch(
         else
         {
             // This is a leaf node, process its item
-            auto item = safe_downcast<SHAMapLeafNode*>(node)->peekItem();
+            auto item = safeDowncast<SHAMapLeafNode*>(node)->peekItem();
 
             if (emptyBranch || (item->key() != otherMapItem->key()))
             {
@@ -160,8 +160,8 @@ SHAMap::compare(SHAMap const& otherMap, Delta& differences, int maxCount) const
         if (ourNode->isLeaf() && otherNode->isLeaf())
         {
             // two leaves
-            auto ours = safe_downcast<SHAMapLeafNode*>(ourNode);
-            auto other = safe_downcast<SHAMapLeafNode*>(otherNode);
+            auto ours = safeDowncast<SHAMapLeafNode*>(ourNode);
+            auto other = safeDowncast<SHAMapLeafNode*>(otherNode);
             if (ours->peekItem()->key() == other->peekItem()->key())
             {
                 if (ours->peekItem()->slice() != other->peekItem()->slice())
@@ -189,22 +189,22 @@ SHAMap::compare(SHAMap const& otherMap, Delta& differences, int maxCount) const
         }
         else if (ourNode->isInner() && otherNode->isLeaf())
         {
-            auto ours = safe_downcast<SHAMapInnerNode*>(ourNode);
-            auto other = safe_downcast<SHAMapLeafNode*>(otherNode);
+            auto ours = safeDowncast<SHAMapInnerNode*>(ourNode);
+            auto other = safeDowncast<SHAMapLeafNode*>(otherNode);
             if (!walkBranch(ours, other->peekItem(), true, differences, maxCount))
                 return false;
         }
         else if (ourNode->isLeaf() && otherNode->isInner())
         {
-            auto ours = safe_downcast<SHAMapLeafNode*>(ourNode);
-            auto other = safe_downcast<SHAMapInnerNode*>(otherNode);
+            auto ours = safeDowncast<SHAMapLeafNode*>(ourNode);
+            auto other = safeDowncast<SHAMapInnerNode*>(otherNode);
             if (!otherMap.walkBranch(other, ours->peekItem(), false, differences, maxCount))
                 return false;
         }
         else if (ourNode->isInner() && otherNode->isInner())
         {
-            auto ours = safe_downcast<SHAMapInnerNode*>(ourNode);
-            auto other = safe_downcast<SHAMapInnerNode*>(otherNode);
+            auto ours = safeDowncast<SHAMapInnerNode*>(ourNode);
+            auto other = safeDowncast<SHAMapInnerNode*>(otherNode);
             for (int i = 0; i < 16; ++i)
             {
                 if (ours->getChildHash(i) != other->getChildHash(i))
@@ -250,7 +250,7 @@ SHAMap::walkMap(std::vector<SHAMapMissingNode>& missingNodes, int maxMissing) co
     using StackEntry = intr_ptr::SharedPtr<SHAMapInnerNode>;
     std::stack<StackEntry, std::vector<StackEntry>> nodeStack;
 
-    nodeStack.push(intr_ptr::static_pointer_cast<SHAMapInnerNode>(root_));
+    nodeStack.push(intr_ptr::staticPointerCast<SHAMapInnerNode>(root_));
 
     while (!nodeStack.empty())
     {
@@ -266,7 +266,7 @@ SHAMap::walkMap(std::vector<SHAMapMissingNode>& missingNodes, int maxMissing) co
                 if (nextNode)
                 {
                     if (nextNode->isInner())
-                        nodeStack.push(intr_ptr::static_pointer_cast<SHAMapInnerNode>(nextNode));
+                        nodeStack.push(intr_ptr::staticPointerCast<SHAMapInnerNode>(nextNode));
                 }
                 else
                 {
@@ -288,7 +288,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
     using StackEntry = intr_ptr::SharedPtr<SHAMapInnerNode>;
     std::array<intr_ptr::SharedPtr<SHAMapTreeNode>, 16> topChildren;
     {
-        auto const& innerRoot = intr_ptr::static_pointer_cast<SHAMapInnerNode>(root_);
+        auto const& innerRoot = intr_ptr::staticPointerCast<SHAMapInnerNode>(root_);
         for (int i = 0; i < 16; ++i)
         {
             if (!innerRoot->isEmptyBranch(i))
@@ -312,7 +312,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
         if (!child || !child->isInner())
             continue;
 
-        nodeStacks[rootChildIndex].push(intr_ptr::static_pointer_cast<SHAMapInnerNode>(child));
+        nodeStacks[rootChildIndex].push(intr_ptr::staticPointerCast<SHAMapInnerNode>(child));
 
         JLOG(journal_.debug()) << "starting worker " << rootChildIndex;
         workers.emplace_back(
@@ -339,7 +339,7 @@ SHAMap::walkMapParallel(std::vector<SHAMapMissingNode>& missingNodes, int maxMis
                                 if (nextNode->isInner())
                                 {
                                     nodeStack.push(
-                                        intr_ptr::static_pointer_cast<SHAMapInnerNode>(nextNode));
+                                        intr_ptr::staticPointerCast<SHAMapInnerNode>(nextNode));
                                 }
                             }
                             else
diff --git a/src/libxrpl/shamap/SHAMapInnerNode.cpp b/src/libxrpl/shamap/SHAMapInnerNode.cpp
index 38300beadb..a0adc10a61 100644
--- a/src/libxrpl/shamap/SHAMapInnerNode.cpp
+++ b/src/libxrpl/shamap/SHAMapInnerNode.cpp
@@ -74,7 +74,7 @@ SHAMapInnerNode::clone(std::uint32_t cowid) const
 {
     auto const branchCount = getBranchCount();
     auto const thisIsSparse = !hashesAndChildren_.isDense();
-    auto p = intr_ptr::make_shared<SHAMapInnerNode>(cowid, branchCount);
+    auto p = intr_ptr::makeShared<SHAMapInnerNode>(cowid, branchCount);
     p->hash_ = hash_;
     p->isBranch_ = isBranch_;
     p->fullBelowGen_ = fullBelowGen_;
@@ -98,7 +98,7 @@ SHAMapInnerNode::clone(std::uint32_t cowid) const
             [&](auto branchNum, auto indexNum) { cloneHashes[branchNum] = thisHashes[indexNum]; });
     }
 
-    spinlock sl(lock_);
+    Spinlock sl(lock_);
     std::scoped_lock const lock(sl);
 
     if (thisIsSparse)
@@ -122,18 +122,18 @@ 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() != branchFactor * uint256::bytes)
+    if (data.size() != kBRANCH_FACTOR * uint256::kBYTES)
         Throw<std::runtime_error>("Invalid FI node");
 
-    auto ret = intr_ptr::make_shared<SHAMapInnerNode>(0, branchFactor);
+    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBRANCH_FACTOR);
 
     SerialIter si(data);
 
     auto hashes = ret->hashesAndChildren_.getHashes();
 
-    for (int i = 0; i < branchFactor; ++i)
+    for (int i = 0; i < kBRANCH_FACTOR; ++i)
     {
-        hashes[i].as_uint256() = si.getBitString<256>();
+        hashes[i].asUint256() = si.getBitString<256>();
 
         if (hashes[i].isNonZero())
             ret->isBranch_ |= (1 << i);
@@ -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 chunkSize = uint256::bytes + 1;
+    constexpr std::size_t kCHUNK_SIZE = uint256::kBYTES + 1;
 
-    if (auto const s = data.size(); (s % chunkSize != 0) || (s > chunkSize * branchFactor))
+    if (auto const s = data.size(); (s % kCHUNK_SIZE != 0) || (s > kCHUNK_SIZE * kBRANCH_FACTOR))
         Throw<std::runtime_error>("Invalid CI node");
 
     SerialIter si(data);
 
-    auto ret = intr_ptr::make_shared<SHAMapInnerNode>(0, branchFactor);
+    auto ret = intr_ptr::makeShared<SHAMapInnerNode>(0, kBRANCH_FACTOR);
 
     auto hashes = ret->hashesAndChildren_.getHashes();
 
@@ -174,10 +174,10 @@ SHAMapInnerNode::makeCompressedInner(Slice data)
         auto const hash = si.getBitString<256>();
         auto const pos = si.get8();
 
-        if (pos >= branchFactor)
+        if (pos >= kBRANCH_FACTOR)
             Throw<std::runtime_error>("invalid CI node");
 
-        hashes[pos].as_uint256() = hash;
+        hashes[pos].asUint256() = hash;
 
         if (hashes[pos].isNonZero())
             ret->isBranch_ |= (1 << pos);
@@ -196,7 +196,7 @@ SHAMapInnerNode::updateHash()
     {
         sha512_half_hasher h;
         using beast::hash_append;
-        hash_append(h, HashPrefix::innerNode);
+        hash_append(h, HashPrefix::InnerNode);
         iterChildren([&](SHAMapHash const& hh) { hash_append(h, hh); });
         nh = static_cast<typename sha512_half_hasher::result_type>(h);
     }
@@ -228,15 +228,15 @@ SHAMapInnerNode::serializeForWire(Serializer& s) const
         // compressed node
         auto hashes = hashesAndChildren_.getHashes();
         iterNonEmptyChildIndexes([&](auto branchNum, auto indexNum) {
-            s.addBitString(hashes[indexNum].as_uint256());
+            s.addBitString(hashes[indexNum].asUint256());
             s.add8(branchNum);
         });
-        s.add8(wireTypeCompressedInner);
+        s.add8(kWIRE_TYPE_COMPRESSED_INNER);
     }
     else
     {
-        iterChildren([&](SHAMapHash const& hh) { s.addBitString(hh.as_uint256()); });
-        s.add8(wireTypeInner);
+        iterChildren([&](SHAMapHash const& hh) { s.addBitString(hh.asUint256()); });
+        s.add8(kWIRE_TYPE_INNER);
     }
 }
 
@@ -245,8 +245,8 @@ SHAMapInnerNode::serializeWithPrefix(Serializer& s) const
 {
     XRPL_ASSERT(!isEmpty(), "xrpl::SHAMapInnerNode::serializeWithPrefix : is non-empty");
 
-    s.add32(HashPrefix::innerNode);
-    iterChildren([&](SHAMapHash const& hh) { s.addBitString(hh.as_uint256()); });
+    s.add32(HashPrefix::InnerNode);
+    iterChildren([&](SHAMapHash const& hh) { s.addBitString(hh.asUint256()); });
 }
 
 std::string
@@ -268,7 +268,7 @@ void
 SHAMapInnerNode::setChild(int m, intr_ptr::SharedPtr<SHAMapTreeNode> child)
 {
     XRPL_ASSERT(
-        (m >= 0) && (m < branchFactor), "xrpl::SHAMapInnerNode::setChild : valid branch input");
+        (m >= 0) && (m < kBRANCH_FACTOR), "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 < branchFactor), "xrpl::SHAMapInnerNode::shareChild : valid branch input");
+        (m >= 0) && (m < kBRANCH_FACTOR), "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 < branchFactor,
+        branch >= 0 && branch < kBRANCH_FACTOR,
         "xrpl::SHAMapInnerNode::getChildPointer : valid branch input");
     XRPL_ASSERT(
         !isEmptyBranch(branch), "xrpl::SHAMapInnerNode::getChildPointer : non-empty branch input");
@@ -332,7 +332,7 @@ SHAMapInnerNode::getChildPointer(int branch)
     auto const index =
         *getChildIndex(branch);  // NOLINT(bugprone-unchecked-optional-access) assert above
 
-    packed_spinlock sl(lock_, index);
+    PackedSpinlock sl(lock_, index);
     std::scoped_lock const lock(sl);
     return hashesAndChildren_.getChildren()[index].get();
 }
@@ -341,14 +341,14 @@ intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapInnerNode::getChild(int branch)
 {
     XRPL_ASSERT(
-        branch >= 0 && branch < branchFactor,
+        branch >= 0 && branch < kBRANCH_FACTOR,
         "xrpl::SHAMapInnerNode::getChild : valid branch input");
     XRPL_ASSERT(!isEmptyBranch(branch), "xrpl::SHAMapInnerNode::getChild : non-empty branch input");
 
     auto const index =
         *getChildIndex(branch);  // NOLINT(bugprone-unchecked-optional-access) assert above
 
-    packed_spinlock sl(lock_, index);
+    PackedSpinlock sl(lock_, index);
     std::scoped_lock const lock(sl);
     return hashesAndChildren_.getChildren()[index];
 }
@@ -357,18 +357,19 @@ SHAMapHash const&
 SHAMapInnerNode::getChildHash(int m) const
 {
     XRPL_ASSERT(
-        (m >= 0) && (m < branchFactor), "xrpl::SHAMapInnerNode::getChildHash : valid branch input");
+        (m >= 0) && (m < kBRANCH_FACTOR),
+        "xrpl::SHAMapInnerNode::getChildHash : valid branch input");
     if (auto const i = getChildIndex(m))
         return hashesAndChildren_.getHashes()[*i];
 
-    return zeroSHAMapHash;
+    return kZERO_SHA_MAP_HASH;
 }
 
 intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapInnerNode::canonicalizeChild(int branch, intr_ptr::SharedPtr<SHAMapTreeNode> node)
 {
     XRPL_ASSERT(
-        branch >= 0 && branch < branchFactor,
+        branch >= 0 && branch < kBRANCH_FACTOR,
         "xrpl::SHAMapInnerNode::canonicalizeChild : valid branch input");
     XRPL_ASSERT(node != nullptr, "xrpl::SHAMapInnerNode::canonicalizeChild : valid node input");
     XRPL_ASSERT(
@@ -382,7 +383,7 @@ SHAMapInnerNode::canonicalizeChild(int branch, intr_ptr::SharedPtr<SHAMapTreeNod
         "xrpl::SHAMapInnerNode::canonicalizeChild : node and branch inputs "
         "hash do match");
 
-    packed_spinlock sl(lock_, childIndex);
+    PackedSpinlock sl(lock_, childIndex);
     std::scoped_lock const lock(sl);
 
     if (children[childIndex])
@@ -399,12 +400,12 @@ SHAMapInnerNode::canonicalizeChild(int branch, intr_ptr::SharedPtr<SHAMapTreeNod
 }
 
 void
-SHAMapInnerNode::invariants(bool is_root) const
+SHAMapInnerNode::invariants(bool isRoot) const
 {
     [[maybe_unused]] unsigned count = 0;
     auto [numAllocated, hashes, children] = hashesAndChildren_.getHashesAndChildren();
 
-    if (numAllocated != branchFactor)
+    if (numAllocated != kBRANCH_FACTOR)
     {
         auto const branchCount = getBranchCount();
         for (int i = 0; i < branchCount; ++i)
@@ -419,7 +420,7 @@ SHAMapInnerNode::invariants(bool is_root) const
     }
     else
     {
-        for (int i = 0; i < branchFactor; ++i)
+        for (int i = 0; i < kBRANCH_FACTOR; ++i)
         {
             if (hashes[i].isNonZero())
             {
@@ -441,7 +442,7 @@ SHAMapInnerNode::invariants(bool is_root) const
         }
     }
 
-    if (!is_root)
+    if (!isRoot)
     {
         XRPL_ASSERT(hash_.isNonZero(), "xrpl::SHAMapInnerNode::invariants : nonzero hash");
         XRPL_ASSERT(count >= 1, "xrpl::SHAMapInnerNode::invariants : minimum count");
diff --git a/src/libxrpl/shamap/SHAMapLeafNode.cpp b/src/libxrpl/shamap/SHAMapLeafNode.cpp
index 58646503aa..ce41a64e56 100644
--- a/src/libxrpl/shamap/SHAMapLeafNode.cpp
+++ b/src/libxrpl/shamap/SHAMapLeafNode.cpp
@@ -63,15 +63,15 @@ SHAMapLeafNode::getString(SHAMapNodeID const& id) const
 
     auto const type = getType();
 
-    if (type == SHAMapNodeType::tnTRANSACTION_NM)
+    if (type == SHAMapNodeType::TnTransactionNm)
     {
         ret += ",txn\n";
     }
-    else if (type == SHAMapNodeType::tnTRANSACTION_MD)
+    else if (type == SHAMapNodeType::TnTransactionMd)
     {
         ret += ",txn+md\n";
     }
-    else if (type == SHAMapNodeType::tnACCOUNT_STATE)
+    else if (type == SHAMapNodeType::TnAccountState)
     {
         ret += ",as\n";
     }
diff --git a/src/libxrpl/shamap/SHAMapNodeID.cpp b/src/libxrpl/shamap/SHAMapNodeID.cpp
index 6116a997b6..f7caf8ae02 100644
--- a/src/libxrpl/shamap/SHAMapNodeID.cpp
+++ b/src/libxrpl/shamap/SHAMapNodeID.cpp
@@ -18,35 +18,35 @@ depthMask(unsigned int depth)
 {
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { mask_size = 65 };
+    enum { MaskSize = 65 };
 
-    struct masks_t
+    struct MasksT
     {
-        uint256 entry[mask_size];
+        uint256 entry[MaskSize];
 
-        masks_t()
+        MasksT()
         {
             uint256 selector;
-            for (int i = 0; i < mask_size - 1; i += 2)
+            for (int i = 0; i < MaskSize - 1; i += 2)
             {
                 entry[i] = selector;
                 *(selector.begin() + (i / 2)) = 0xF0;
                 entry[i + 1] = selector;
                 *(selector.begin() + (i / 2)) = 0xFF;
             }
-            entry[mask_size - 1] = selector;
+            entry[MaskSize - 1] = selector;
         }
     };
 
-    static masks_t const masks;
-    return masks.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::leafDepth, "xrpl::SHAMapNodeID::SHAMapNodeID : maximum depth input");
+        depth <= SHAMap::kLEAF_DEPTH, "xrpl::SHAMapNodeID::SHAMapNodeID : maximum depth input");
     XRPL_ASSERT(
         id_ == (id_ & depthMask(depth)),
         "xrpl::SHAMapNodeID::SHAMapNodeID : hash and depth inputs do match");
@@ -65,7 +65,7 @@ SHAMapNodeID
 SHAMapNodeID::getChildNodeID(unsigned int m) const
 {
     XRPL_ASSERT(
-        m < SHAMap::branchFactor, "xrpl::SHAMapNodeID::getChildNodeID : valid branch input");
+        m < SHAMap::kBRANCH_FACTOR, "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
@@ -76,9 +76,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::leafDepth, "xrpl::SHAMapNodeID::getChildNodeID : maximum leaf depth");
+        depth_ <= SHAMap::kLEAF_DEPTH, "xrpl::SHAMapNodeID::getChildNodeID : maximum leaf depth");
 
-    if (depth_ >= SHAMap::leafDepth)
+    if (depth_ >= SHAMap::kLEAF_DEPTH)
         Throw<std::logic_error>("Request for child node ID of " + to_string(*this));
 
     if (id_ != (id_ & depthMask(depth_)))
@@ -97,7 +97,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::leafDepth)
+        if (depth <= SHAMap::kLEAF_DEPTH)
         {
             auto const id = uint256::fromVoid(data);
 
@@ -124,7 +124,7 @@ selectBranch(SHAMapNodeID const& id, uint256 const& hash)
         branch >>= 4;
     }
 
-    XRPL_ASSERT(branch < SHAMap::branchFactor, "xrpl::selectBranch : maximum result");
+    XRPL_ASSERT(branch < SHAMap::kBRANCH_FACTOR, "xrpl::selectBranch : maximum result");
     return branch;
 }
 
diff --git a/src/libxrpl/shamap/SHAMapSync.cpp b/src/libxrpl/shamap/SHAMapSync.cpp
index e7f3447642..348928f863 100644
--- a/src/libxrpl/shamap/SHAMapSync.cpp
+++ b/src/libxrpl/shamap/SHAMapSync.cpp
@@ -38,7 +38,7 @@ SHAMap::visitLeaves(
 {
     visitNodes([&leafFunction](SHAMapTreeNode& node) {
         if (!node.isInner())
-            leafFunction(safe_downcast<SHAMapLeafNode&>(node).peekItem());
+            leafFunction(safeDowncast<SHAMapLeafNode&>(node).peekItem());
         return true;
     });
 }
@@ -57,7 +57,7 @@ SHAMap::visitNodes(std::function<bool(SHAMapTreeNode&)> const& function) const
     using StackEntry = std::pair<int, intr_ptr::SharedPtr<SHAMapInnerNode>>;
     std::stack<StackEntry, std::vector<StackEntry>> stack;
 
-    auto node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(root_);
+    auto node = intr_ptr::staticPointerCast<SHAMapInnerNode>(root_);
     int pos = 0;
 
     while (true)
@@ -87,7 +87,7 @@ SHAMap::visitNodes(std::function<bool(SHAMapTreeNode&)> const& function) const
                     }
 
                     // descend to the child's first position
-                    node = intr_ptr::static_pointer_cast<SHAMapInnerNode>(child);
+                    node = intr_ptr::staticPointerCast<SHAMapInnerNode>(child);
                     pos = 0;
                 }
             }
@@ -123,7 +123,7 @@ SHAMap::visitDifferences(
 
     if (root_->isLeaf())
     {
-        auto leaf = intr_ptr::static_pointer_cast<SHAMapLeafNode>(root_);
+        auto leaf = intr_ptr::staticPointerCast<SHAMapLeafNode>(root_);
         if ((have == nullptr) || !have->hasLeafNode(leaf->peekItem()->key(), leaf->getHash()))
             function(*root_);
         return;
@@ -132,7 +132,7 @@ SHAMap::visitDifferences(
     using StackEntry = std::pair<SHAMapInnerNode*, SHAMapNodeID>;
     std::stack<StackEntry, std::vector<StackEntry>> stack;
 
-    stack.emplace(safe_downcast<SHAMapInnerNode*>(root_.get()), SHAMapNodeID{});
+    stack.emplace(safeDowncast<SHAMapInnerNode*>(root_.get()), SHAMapNodeID{});
 
     while (!stack.empty())
     {
@@ -155,12 +155,12 @@ SHAMap::visitDifferences(
                 if (next->isInner())
                 {
                     if ((have == nullptr) || !have->hasInnerNode(childID, childHash))
-                        stack.emplace(safe_downcast<SHAMapInnerNode*>(next), childID);
+                        stack.emplace(safeDowncast<SHAMapInnerNode*>(next), childID);
                 }
                 else if (
                     (have == nullptr) ||
                     !have->hasLeafNode(
-                        safe_downcast<SHAMapLeafNode*>(next)->peekItem()->key(), childHash))
+                        safeDowncast<SHAMapLeafNode*>(next)->peekItem()->key(), childHash))
                 {
                     if (!function(*next))
                         return;
@@ -175,7 +175,7 @@ SHAMap::visitDifferences(
 // children, descending the SHAMap until we complete the
 // processing of a node.
 void
-SHAMap::gmn_ProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& se)
+SHAMap::gmnProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& se)
 {
     SHAMapInnerNode*& node = std::get<0>(se);
     SHAMapNodeID& nodeID = std::get<1>(se);
@@ -191,53 +191,51 @@ SHAMap::gmn_ProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& se)
 
         auto const& childHash = node->getChildHash(branch);
 
-        if (mn.missingHashes_.contains(childHash))
+        if (mn.missingHashes.contains(childHash))
         {
             // we already know this child node is missing
             fullBelow = false;
         }
-        else if (!backed_ || !f_.getFullBelowCache()->touch_if_exists(childHash.as_uint256()))
+        else if (!backed_ || !f_.getFullBelowCache()->touchIfExists(childHash.asUint256()))
         {
             bool pending = false;
             auto d = descendAsync(
                 node,
                 branch,
-                mn.filter_,
+                mn.filter,
                 pending,
                 [node, nodeID, branch, &mn](
                     intr_ptr::SharedPtr<SHAMapTreeNode> found, SHAMapHash const&) {
                     // a read completed asynchronously
-                    std::unique_lock<std::mutex> const lock{mn.deferLock_};
-                    mn.finishedReads_.emplace_back(node, nodeID, branch, std::move(found));
-                    mn.deferCondVar_.notify_one();
+                    std::unique_lock<std::mutex> const lock{mn.deferLock};
+                    mn.finishedReads.emplace_back(node, nodeID, branch, std::move(found));
+                    mn.deferCondVar.notify_one();
                 });
 
             if (pending)
             {
                 fullBelow = false;
-                ++mn.deferred_;
+                ++mn.deferred;
             }
             else if (d == nullptr)
             {
                 // node is not in database
 
                 fullBelow = false;  // for now, not known full below
-                mn.missingHashes_.insert(childHash);
-                mn.missingNodes_.emplace_back(
-                    nodeID.getChildNodeID(branch), childHash.as_uint256());
+                mn.missingHashes.insert(childHash);
+                mn.missingNodes.emplace_back(nodeID.getChildNodeID(branch), childHash.asUint256());
 
-                if (--mn.max_ <= 0)
+                if (--mn.max <= 0)
                     return;
             }
-            else if (
-                d->isInner() && !safe_downcast<SHAMapInnerNode*>(d)->isFullBelow(mn.generation_))
+            else if (d->isInner() && !safeDowncast<SHAMapInnerNode*>(d)->isFullBelow(mn.generation))
             {
-                mn.stack_.push(se);
+                mn.stack.push(se);
 
                 // Switch to processing the child node
-                node = safe_downcast<SHAMapInnerNode*>(d);
+                node = safeDowncast<SHAMapInnerNode*>(d);
                 nodeID = nodeID.getChildNodeID(branch);
-                firstChild = rand_int(255);
+                firstChild = randInt(255);
                 currentChild = 0;
                 fullBelow = true;
             }
@@ -249,10 +247,10 @@ SHAMap::gmn_ProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& se)
 
     if (fullBelow)
     {  // No partial node encountered below this node
-        node->setFullBelowGen(mn.generation_);
+        node->setFullBelowGen(mn.generation);
         if (backed_)
         {
-            f_.getFullBelowCache()->insert(node->getHash().as_uint256());
+            f_.getFullBelowCache()->insert(node->getHash().asUint256());
         }
     }
 
@@ -262,20 +260,20 @@ SHAMap::gmn_ProcessNodes(MissingNodes& mn, MissingNodes::StackEntry& se)
 // Wait for deferred reads to finish and
 // process their results
 void
-SHAMap::gmn_ProcessDeferredReads(MissingNodes& mn)
+SHAMap::gmnProcessDeferredReads(MissingNodes& mn)
 {
     // Process all deferred reads
     int complete = 0;
-    while (complete != mn.deferred_)
+    while (complete != mn.deferred)
     {
         std::tuple<SHAMapInnerNode*, SHAMapNodeID, int, intr_ptr::SharedPtr<SHAMapTreeNode>>
             deferredNode;
         {
-            std::unique_lock<std::mutex> lock{mn.deferLock_};
+            std::unique_lock<std::mutex> lock{mn.deferLock};
 
-            while (mn.finishedReads_.size() <= complete)
-                mn.deferCondVar_.wait(lock);
-            deferredNode = std::move(mn.finishedReads_[complete++]);
+            while (mn.finishedReads.size() <= complete)
+                mn.deferCondVar.wait(lock);
+            deferredNode = std::move(mn.finishedReads[complete++]);
         }
 
         auto parent = std::get<0>(deferredNode);
@@ -290,18 +288,18 @@ SHAMap::gmn_ProcessDeferredReads(MissingNodes& mn)
 
             // When we finish this stack, we need to restart
             // with the parent of this node
-            mn.resumes_[parent] = parentID;
+            mn.resumes[parent] = parentID;
         }
-        else if ((mn.max_ > 0) && (mn.missingHashes_.insert(nodeHash).second))
+        else if ((mn.max > 0) && (mn.missingHashes.insert(nodeHash).second))
         {
-            mn.missingNodes_.emplace_back(parentID.getChildNodeID(branch), nodeHash.as_uint256());
-            --mn.max_;
+            mn.missingNodes.emplace_back(parentID.getChildNodeID(branch), nodeHash.asUint256());
+            --mn.max;
         }
     }
 
-    mn.finishedReads_.clear();
-    mn.finishedReads_.reserve(mn.maxDefer_);
-    mn.deferred_ = 0;
+    mn.finishedReads.clear();
+    mn.finishedReads.reserve(mn.maxDefer);
+    mn.deferred = 0;
 }
 
 /** Get a list of node IDs and hashes for nodes that are part of this SHAMap
@@ -321,10 +319,10 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
         f_.getFullBelowCache()->getGeneration());
 
     if (!root_->isInner() ||
-        intr_ptr::static_pointer_cast<SHAMapInnerNode>(root_)->isFullBelow(mn.generation_))
+        intr_ptr::staticPointerCast<SHAMapInnerNode>(root_)->isFullBelow(mn.generation))
     {
         clearSynching();
-        return std::move(mn.missingNodes_);
+        return std::move(mn.missingNodes);
     }
 
     // Start at the root.
@@ -334,7 +332,7 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
     // that the two threads will produce different request sets (which is
     // more efficient than sending identical requests).
     MissingNodes::StackEntry pos{
-        safe_downcast<SHAMapInnerNode*>(root_.get()), SHAMapNodeID(), rand_int(255), 0, true};
+        safeDowncast<SHAMapInnerNode*>(root_.get()), SHAMapNodeID(), randInt(255), 0, true};
     auto& node = std::get<0>(pos);
     auto& nextChild = std::get<3>(pos);
     auto& fullBelow = std::get<4>(pos);
@@ -342,20 +340,20 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
     // Traverse the map without blocking
     do
     {
-        while ((node != nullptr) && (mn.deferred_ <= mn.maxDefer_))
+        while ((node != nullptr) && (mn.deferred <= mn.maxDefer))
         {
-            gmn_ProcessNodes(mn, pos);
+            gmnProcessNodes(mn, pos);
 
-            if (mn.max_ <= 0)
+            if (mn.max <= 0)
                 break;
 
-            if ((node == nullptr) && !mn.stack_.empty())
+            if ((node == nullptr) && !mn.stack.empty())
             {
                 // Pick up where we left off with this node's parent
                 bool const was = fullBelow;  // was full below
 
-                pos = mn.stack_.top();
-                mn.stack_.pop();
+                pos = mn.stack.top();
+                mn.stack.pop();
                 if (nextChild == 0)
                 {
                     // This is a node we are processing for the first time
@@ -372,32 +370,32 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
 
         // We have either emptied the stack or
         // posted as many deferred reads as we can
-        if (mn.deferred_ != 0)
-            gmn_ProcessDeferredReads(mn);
+        if (mn.deferred != 0)
+            gmnProcessDeferredReads(mn);
 
-        if (mn.max_ <= 0)
-            return std::move(mn.missingNodes_);
+        if (mn.max <= 0)
+            return std::move(mn.missingNodes);
 
         if (node == nullptr)
         {  // We weren't in the middle of processing a node
 
-            if (mn.stack_.empty() && !mn.resumes_.empty())
+            if (mn.stack.empty() && !mn.resumes.empty())
             {
                 // Recheck nodes we could not finish before
-                for (auto const& [innerNode, nodeId] : mn.resumes_)
+                for (auto const& [innerNode, nodeId] : mn.resumes)
                 {
-                    if (!innerNode->isFullBelow(mn.generation_))
-                        mn.stack_.emplace(innerNode, nodeId, rand_int(255), 0, true);
+                    if (!innerNode->isFullBelow(mn.generation))
+                        mn.stack.emplace(innerNode, nodeId, randInt(255), 0, true);
                 }
 
-                mn.resumes_.clear();
+                mn.resumes.clear();
             }
 
-            if (!mn.stack_.empty())
+            if (!mn.stack.empty())
             {
                 // Resume at the top of the stack
-                pos = mn.stack_.top();
-                mn.stack_.pop();
+                pos = mn.stack.top();
+                mn.stack.pop();
                 XRPL_ASSERT(node, "xrpl::SHAMap::getMissingNodes : second non-null node");
             }
         }
@@ -408,10 +406,10 @@ SHAMap::getMissingNodes(int max, SHAMapSyncFilter* filter)
 
     } while (node != nullptr);
 
-    if (mn.missingNodes_.empty())
+    if (mn.missingNodes.empty())
         clearSynching();
 
-    return std::move(mn.missingNodes_);
+    return std::move(mn.missingNodes);
 }
 
 bool
@@ -430,7 +428,7 @@ SHAMap::getNodeFat(
     while ((node != nullptr) && node->isInner() && (nodeID.getDepth() < wanted.getDepth()))
     {
         int const branch = selectBranch(nodeID, wanted.getNodeID());
-        auto inner = safe_downcast<SHAMapInnerNode*>(node);
+        auto inner = safeDowncast<SHAMapInnerNode*>(node);
         if (inner->isEmptyBranch(branch))
             return false;
         node = descendThrow(inner, branch);
@@ -444,7 +442,7 @@ SHAMap::getNodeFat(
         return false;
     }
 
-    if (node->isInner() && safe_downcast<SHAMapInnerNode*>(node)->isEmpty())
+    if (node->isInner() && safeDowncast<SHAMapInnerNode*>(node)->isEmpty())
     {
         JLOG(journal_.warn()) << "peer requests empty node";
         return false;
@@ -469,7 +467,7 @@ SHAMap::getNodeFat(
         {
             // We descend inner nodes with only a single child
             // without decrementing the depth
-            auto inner = safe_downcast<SHAMapInnerNode*>(node);
+            auto inner = safeDowncast<SHAMapInnerNode*>(node);
             int const bc = inner->getBranchCount();
 
             if ((depth > 0) || (bc == 1))
@@ -561,12 +559,12 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
     auto currNode = root_.get();
 
     while (currNode->isInner() &&
-           !safe_downcast<SHAMapInnerNode*>(currNode)->isFullBelow(generation) &&
+           !safeDowncast<SHAMapInnerNode*>(currNode)->isFullBelow(generation) &&
            (currNodeID.getDepth() < node.getDepth()))
     {
         int const branch = selectBranch(currNodeID, node.getNodeID());
         XRPL_ASSERT(branch >= 0, "xrpl::SHAMap::addKnownNode : valid branch");
-        auto inner = safe_downcast<SHAMapInnerNode*>(currNode);
+        auto inner = safeDowncast<SHAMapInnerNode*>(currNode);
         if (inner->isEmptyBranch(branch))
         {
             JLOG(journal_.warn()) << "Add known node for empty branch" << node;
@@ -574,7 +572,7 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
         }
 
         auto childHash = inner->getChildHash(branch);
-        if (f_.getFullBelowCache()->touch_if_exists(childHash.as_uint256()))
+        if (f_.getFullBelowCache()->touchIfExists(childHash.asUint256()))
         {
             return SHAMapAddNode::duplicate();
         }
@@ -601,7 +599,7 @@ SHAMap::addKnownNode(SHAMapNodeID const& node, Slice const& rawNode, SHAMapSyncF
         if (newNode->isLeaf())
         {
             auto const& actualKey =
-                safe_downcast<SHAMapLeafNode const*>(newNode.get())->peekItem()->key();
+                safeDowncast<SHAMapLeafNode const*>(newNode.get())->peekItem()->key();
 
             // Validate that this leaf belongs at the target position
             auto const expectedNodeID = SHAMapNodeID::createID(node.getDepth(), actualKey);
@@ -617,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() > leafDepth) ||
-            (newNode->isInner() && currNodeID.getDepth() == leafDepth))
+        if ((currNodeID.getDepth() > kLEAF_DEPTH) ||
+            (newNode->isInner() && currNodeID.getDepth() == kLEAF_DEPTH))
         {
             // Map is provably invalid
             state_ = SHAMapState::Invalid;
@@ -683,8 +681,8 @@ SHAMap::deepCompare(SHAMap& other) const
         {
             if (!otherNode->isLeaf())
                 return false;
-            auto& nodePeek = safe_downcast<SHAMapLeafNode*>(node)->peekItem();
-            auto& otherNodePeek = safe_downcast<SHAMapLeafNode*>(otherNode)->peekItem();
+            auto& nodePeek = safeDowncast<SHAMapLeafNode*>(node)->peekItem();
+            auto& otherNodePeek = safeDowncast<SHAMapLeafNode*>(otherNode)->peekItem();
             if (nodePeek->key() != otherNodePeek->key())
                 return false;
             if (nodePeek->slice() != otherNodePeek->slice())
@@ -694,22 +692,22 @@ SHAMap::deepCompare(SHAMap& other) const
         {
             if (!otherNode->isInner())
                 return false;
-            auto node_inner = safe_downcast<SHAMapInnerNode*>(node);
-            auto other_inner = safe_downcast<SHAMapInnerNode*>(otherNode);
+            auto nodeInner = safeDowncast<SHAMapInnerNode*>(node);
+            auto otherInner = safeDowncast<SHAMapInnerNode*>(otherNode);
             for (int i = 0; i < 16; ++i)
             {
-                if (node_inner->isEmptyBranch(i))
+                if (nodeInner->isEmptyBranch(i))
                 {
-                    if (!other_inner->isEmptyBranch(i))
+                    if (!otherInner->isEmptyBranch(i))
                         return false;
                 }
                 else
                 {
-                    if (other_inner->isEmptyBranch(i))
+                    if (otherInner->isEmptyBranch(i))
                         return false;
 
-                    auto next = descend(node_inner, i);
-                    auto otherNext = other.descend(other_inner, i);
+                    auto next = descend(nodeInner, i);
+                    auto otherNext = other.descend(otherInner, i);
                     if ((next == nullptr) || (otherNext == nullptr))
                     {
                         JLOG(journal_.warn()) << "unable to fetch inner node";
@@ -735,7 +733,7 @@ SHAMap::hasInnerNode(SHAMapNodeID const& targetNodeID, SHAMapHash const& targetN
     while (node->isInner() && (nodeID.getDepth() < targetNodeID.getDepth()))
     {
         int const branch = selectBranch(nodeID, targetNodeID.getNodeID());
-        auto inner = safe_downcast<SHAMapInnerNode*>(node);
+        auto inner = safeDowncast<SHAMapInnerNode*>(node);
         if (inner->isEmptyBranch(branch))
             return false;
 
@@ -760,7 +758,7 @@ SHAMap::hasLeafNode(uint256 const& tag, SHAMapHash const& targetNodeHash) const
     do
     {
         int const branch = selectBranch(nodeID, tag);
-        auto inner = safe_downcast<SHAMapInnerNode*>(node);
+        auto inner = safeDowncast<SHAMapInnerNode*>(node);
         if (inner->isEmptyBranch(branch))
             return false;  // Dead end, node must not be here
 
@@ -788,7 +786,7 @@ SHAMap::getProofPath(uint256 const& key) const
     }
 
     if (auto const& node = stack.top().first; !node || node->isInner() ||
-        intr_ptr::static_pointer_cast<SHAMapLeafNode>(node)->peekItem()->key() != key)
+        intr_ptr::staticPointerCast<SHAMapLeafNode>(node)->peekItem()->key() != key)
     {
         JLOG(journal_.debug()) << "no path to " << key;
         return {};
@@ -831,7 +829,7 @@ SHAMap::verifyProofPath(uint256 const& rootHash, uint256 const& key, std::vector
             if (node->isInner())
             {
                 auto nodeId = SHAMapNodeID::createID(depth, key);
-                hash = safe_downcast<SHAMapInnerNode*>(node.get())
+                hash = safeDowncast<SHAMapInnerNode*>(node.get())
                            ->getChildHash(selectBranch(nodeId, key));
             }
             else
diff --git a/src/libxrpl/shamap/SHAMapTreeNode.cpp b/src/libxrpl/shamap/SHAMapTreeNode.cpp
index 6fc7bd81e4..ac405f3286 100644
--- a/src/libxrpl/shamap/SHAMapTreeNode.cpp
+++ b/src/libxrpl/shamap/SHAMapTreeNode.cpp
@@ -28,12 +28,12 @@ namespace xrpl {
 intr_ptr::SharedPtr<SHAMapTreeNode>
 SHAMapTreeNode::makeTransaction(Slice data, SHAMapHash const& hash, bool hashValid)
 {
-    auto item = make_shamapitem(sha512Half(HashPrefix::transactionID, data), data);
+    auto item = makeShamapitem(sha512Half(HashPrefix::TransactionId, data), data);
 
     if (hashValid)
-        return intr_ptr::make_shared<SHAMapTxLeafNode>(std::move(item), 0, hash);
+        return intr_ptr::makeShared<SHAMapTxLeafNode>(std::move(item), 0, hash);
 
-    return intr_ptr::make_shared<SHAMapTxLeafNode>(std::move(item), 0);
+    return intr_ptr::makeShared<SHAMapTxLeafNode>(std::move(item), 0);
 }
 
 intr_ptr::SharedPtr<SHAMapTreeNode>
@@ -43,21 +43,21 @@ SHAMapTreeNode::makeTransactionWithMeta(Slice data, SHAMapHash const& hash, bool
 
     uint256 tag;
 
-    if (s.size() < tag.bytes)
+    if (s.size() < tag.kBYTES)
         Throw<std::runtime_error>("Short TXN+MD node");
 
     // FIXME: improve this interface so that the above check isn't needed
-    if (!s.getBitString(tag, s.size() - tag.bytes))
+    if (!s.getBitString(tag, s.size() - tag.kBYTES))
         Throw<std::out_of_range>("Short TXN+MD node (" + std::to_string(s.size()) + ")");
 
-    s.chop(tag.bytes);
+    s.chop(tag.kBYTES);
 
-    auto item = make_shamapitem(tag, s.slice());
+    auto item = makeShamapitem(tag, s.slice());
 
     if (hashValid)
-        return intr_ptr::make_shared<SHAMapTxPlusMetaLeafNode>(std::move(item), 0, hash);
+        return intr_ptr::makeShared<SHAMapTxPlusMetaLeafNode>(std::move(item), 0, hash);
 
-    return intr_ptr::make_shared<SHAMapTxPlusMetaLeafNode>(std::move(item), 0);
+    return intr_ptr::makeShared<SHAMapTxPlusMetaLeafNode>(std::move(item), 0);
 }
 
 intr_ptr::SharedPtr<SHAMapTreeNode>
@@ -67,24 +67,24 @@ SHAMapTreeNode::makeAccountState(Slice data, SHAMapHash const& hash, bool hashVa
 
     uint256 tag;
 
-    if (s.size() < tag.bytes)
+    if (s.size() < tag.kBYTES)
         Throw<std::runtime_error>("short AS node");
 
     // FIXME: improve this interface so that the above check isn't needed
-    if (!s.getBitString(tag, s.size() - tag.bytes))
+    if (!s.getBitString(tag, s.size() - tag.kBYTES))
         Throw<std::out_of_range>("Short AS node (" + std::to_string(s.size()) + ")");
 
-    s.chop(tag.bytes);
+    s.chop(tag.kBYTES);
 
     if (tag.isZero())
         Throw<std::runtime_error>("Invalid AS node");
 
-    auto item = make_shamapitem(tag, s.slice());
+    auto item = makeShamapitem(tag, s.slice());
 
     if (hashValid)
-        return intr_ptr::make_shared<SHAMapAccountStateLeafNode>(std::move(item), 0, hash);
+        return intr_ptr::makeShared<SHAMapAccountStateLeafNode>(std::move(item), 0, hash);
 
-    return intr_ptr::make_shared<SHAMapAccountStateLeafNode>(std::move(item), 0);
+    return intr_ptr::makeShared<SHAMapAccountStateLeafNode>(std::move(item), 0);
 }
 
 intr_ptr::SharedPtr<SHAMapTreeNode>
@@ -95,24 +95,24 @@ SHAMapTreeNode::makeFromWire(Slice rawNode)
 
     auto const type = rawNode[rawNode.size() - 1];
 
-    rawNode.remove_suffix(1);
+    rawNode.removeSuffix(1);
 
     bool const hashValid = false;
     SHAMapHash const hash;
 
-    if (type == wireTypeTransaction)
+    if (type == kWIRE_TYPE_TRANSACTION)
         return makeTransaction(rawNode, hash, hashValid);
 
-    if (type == wireTypeAccountState)
+    if (type == kWIRE_TYPE_ACCOUNT_STATE)
         return makeAccountState(rawNode, hash, hashValid);
 
-    if (type == wireTypeInner)
+    if (type == kWIRE_TYPE_INNER)
         return SHAMapInnerNode::makeFullInner(rawNode, hash, hashValid);
 
-    if (type == wireTypeCompressedInner)
+    if (type == kWIRE_TYPE_COMPRESSED_INNER)
         return SHAMapInnerNode::makeCompressedInner(rawNode);
 
-    if (type == wireTypeTransactionWithMeta)
+    if (type == kWIRE_TYPE_TRANSACTION_WITH_META)
         return makeTransactionWithMeta(rawNode, hash, hashValid);
 
     Throw<std::runtime_error>("wire: Unknown type (" + std::to_string(type) + ")");
@@ -126,30 +126,29 @@ SHAMapTreeNode::makeFromPrefix(Slice rawNode, SHAMapHash const& hash)
 
     // FIXME: Use SerialIter::get32?
     // Extract the prefix
-    auto const type = safe_cast<HashPrefix>(
-        (safe_cast<std::uint32_t>(rawNode[0]) << 24) +
-        (safe_cast<std::uint32_t>(rawNode[1]) << 16) + (safe_cast<std::uint32_t>(rawNode[2]) << 8) +
-        (safe_cast<std::uint32_t>(rawNode[3])));
+    auto const type = safeCast<HashPrefix>(
+        (safeCast<std::uint32_t>(rawNode[0]) << 24) + (safeCast<std::uint32_t>(rawNode[1]) << 16) +
+        (safeCast<std::uint32_t>(rawNode[2]) << 8) + (safeCast<std::uint32_t>(rawNode[3])));
 
-    rawNode.remove_prefix(4);
+    rawNode.removePrefix(4);
 
     bool const hashValid = true;
 
-    if (type == HashPrefix::transactionID)
+    if (type == HashPrefix::TransactionId)
         return makeTransaction(rawNode, hash, hashValid);
 
-    if (type == HashPrefix::leafNode)
+    if (type == HashPrefix::LeafNode)
         return makeAccountState(rawNode, hash, hashValid);
 
-    if (type == HashPrefix::innerNode)
+    if (type == HashPrefix::InnerNode)
         return SHAMapInnerNode::makeFullInner(rawNode, hash, hashValid);
 
-    if (type == HashPrefix::txNode)
+    if (type == HashPrefix::TxNode)
         return makeTransactionWithMeta(rawNode, hash, hashValid);
 
     Throw<std::runtime_error>(
         "prefix: unknown type (" +
-        std::to_string(safe_cast<std::underlying_type_t<HashPrefix>>(type)) + ")");
+        std::to_string(safeCast<std::underlying_type_t<HashPrefix>>(type)) + ")");
 }
 
 std::string
diff --git a/src/libxrpl/tx/ApplyContext.cpp b/src/libxrpl/tx/ApplyContext.cpp
index 43facecb24..94d35cf5d9 100644
--- a/src/libxrpl/tx/ApplyContext.cpp
+++ b/src/libxrpl/tx/ApplyContext.cpp
@@ -26,25 +26,25 @@
 namespace xrpl {
 
 ApplyContext::ApplyContext(
-    ServiceRegistry& registry_,
+    ServiceRegistry& registry,
     OpenView& base,
     std::optional<uint256 const> const& parentBatchId,
-    STTx const& tx_,
-    TER preclaimResult_,
-    XRPAmount baseFee_,
+    STTx const& tx,
+    TER preclaimResult,
+    XRPAmount baseFee,
     ApplyFlags flags,
-    beast::Journal journal_)
-    : registry(registry_)
-    , tx(tx_)
-    , preclaimResult(preclaimResult_)
-    , baseFee(baseFee_)
-    , journal(journal_)
+    beast::Journal journal)
+    : registry(registry)
+    , tx(tx)
+    , preclaimResult(preclaimResult)
+    , baseFee(baseFee)
+    , journal(journal)
     , base_(base)
     , flags_(flags)
     , parentBatchId_(parentBatchId)
 {
     XRPL_ASSERT(
-        parentBatchId.has_value() == ((flags_ & tapBATCH) == tapBATCH),
+        parentBatchId.has_value() == ((flags_ & TapBatch) == TapBatch),
         "Parent Batch ID should be set if batch apply flag is set");
     view_.emplace(&base_, flags_);
 }
@@ -59,7 +59,7 @@ std::optional<TxMeta>
 ApplyContext::apply(TER ter)
 {
     // NOLINTNEXTLINE(bugprone-unchecked-optional-access) view_ emplaced in constructor
-    return view_->apply(base_, tx, ter, parentBatchId_, (flags_ & tapDRY_RUN) != 0u, journal);
+    return view_->apply(base_, tx, ter, parentBatchId_, (flags_ & TapDryRun) != 0u, journal);
 }
 
 std::size_t
@@ -124,7 +124,7 @@ ApplyContext::checkInvariantsHelper(
         if (!std::all_of(finalizers.cbegin(), finalizers.cend(), [](auto const& b) { return b; }))
         {
             JLOG(journal.fatal()) << "Transaction has failed one or more global invariants: "
-                                  << to_string(tx.getJson(JsonOptions::none));
+                                  << to_string(tx.getJson(JsonOptions::KNone));
 
             return failInvariantCheck(result);
         }
@@ -133,7 +133,7 @@ ApplyContext::checkInvariantsHelper(
     {
         JLOG(journal.fatal()) << "Transaction caused an exception in a global invariant"
                               << ", ex: " << ex.what()
-                              << ", tx: " << to_string(tx.getJson(JsonOptions::none));
+                              << ", tx: " << to_string(tx.getJson(JsonOptions::KNone));
 
         return failInvariantCheck(result);
     }
diff --git a/src/libxrpl/tx/SignerEntries.cpp b/src/libxrpl/tx/SignerEntries.cpp
index a1883024d9..d425c86ca6 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::maxMultiSigners);
+    accountVec.reserve(STTx::kMAX_MULTI_SIGNERS);
 
     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 9791ee4c9b..79dec33c66 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::zero)
+    if (txID == beast::kZERO)
     {
         JLOG(ctx.j.warn()) << "applyTransaction: transaction id may not be zero";
         return temINVALID;
@@ -126,7 +126,7 @@ preflightCheckSigningKey(STObject const& sigObject, beast::Journal j)
 std::optional<NotTEC>
 preflightCheckSimulateKeys(ApplyFlags flags, STObject const& sigObject, beast::Journal j)
 {
-    if ((flags & tapDRY_RUN) != 0u)  // simulation
+    if ((flags & TapDryRun) != 0u)  // simulation
     {
         std::optional<Slice> const signature = sigObject[~sfTxnSignature];
         if (signature && !signature->empty())
@@ -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::zero)
+    if (id == beast::kZERO)
     {
         JLOG(ctx.j.warn()) << "preflight1: bad account id";
         return temBAD_SRC_ACCOUNT;
@@ -260,7 +260,7 @@ Transactor::preflight2(PreflightContext const& ctx)
 
 Transactor::Transactor(ApplyContext& ctx)
     : ctx_(ctx)
-    , sink_(ctx.journal, to_short_string(ctx.tx.getTransactionID()) + " ")
+    , sink_(ctx.journal, toShortString(ctx.tx.getTransactionID()) + " ")
     , j_(sink_)
     , account_(ctx.tx.getAccountID(sfAccount))
 {
@@ -348,7 +348,7 @@ Transactor::minimumFee(
     Fees const& fees,
     ApplyFlags flags)
 {
-    return scaleFeeLoad(baseFee, registry.getFeeTrack(), fees, (flags & tapUNLIMITED) != 0u);
+    return scaleFeeLoad(baseFee, registry.getFeeTrack(), fees, (flags & TapUnlimited) != 0u);
 }
 
 TER
@@ -359,16 +359,16 @@ Transactor::checkFee(PreclaimContext const& ctx, XRPAmount baseFee)
 
     auto const feePaid = ctx.tx[sfFee].xrp();
 
-    if ((ctx.flags & tapBATCH) != 0u)
+    if ((ctx.flags & TapBatch) != 0u)
     {
-        if (feePaid == beast::zero)
+        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::zero)
+    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::zero)
+    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::zero) && !ctx.view.open())
+        if ((balance > beast::kZERO) && !ctx.view.open())
         {
             // Closed ledger, non-zero balance, less than fee
             return tecINSUFF_FEE;
@@ -452,10 +452,10 @@ Transactor::checkSeqProxy(ReadView const& view, STTx const& tx, beast::Journal j
         return terNO_ACCOUNT;
     }
 
-    SeqProxy const t_seqProx = tx.getSeqProxy();
-    SeqProxy const a_seq = SeqProxy::sequence((*sle)[sfSequence]);
+    SeqProxy const tSeqProx = tx.getSeqProxy();
+    SeqProxy const aSeq = SeqProxy::sequence((*sle)[sfSequence]);
 
-    if (t_seqProx.isSeq())
+    if (tSeqProx.isSeq())
     {
         if (tx.isFieldPresent(sfTicketSequence))
         {
@@ -463,39 +463,39 @@ Transactor::checkSeqProxy(ReadView const& view, STTx const& tx, beast::Journal j
                                "and a non-zero Sequence number";
             return temSEQ_AND_TICKET;
         }
-        if (t_seqProx != a_seq)
+        if (tSeqProx != aSeq)
         {
-            if (a_seq < t_seqProx)
+            if (aSeq < tSeqProx)
             {
                 JLOG(j.trace()) << "applyTransaction: has future sequence number "
-                                << "a_seq=" << a_seq << " t_seq=" << t_seqProx;
+                                << "a_seq=" << aSeq << " t_seq=" << tSeqProx;
                 return terPRE_SEQ;
             }
             // It's an already-used sequence number.
             JLOG(j.trace()) << "applyTransaction: has past sequence number "
-                            << "a_seq=" << a_seq << " t_seq=" << t_seqProx;
+                            << "a_seq=" << aSeq << " t_seq=" << tSeqProx;
             return tefPAST_SEQ;
         }
     }
-    else if (t_seqProx.isTicket())
+    else if (tSeqProx.isTicket())
     {
         // Bypass the type comparison. Apples and oranges.
-        if (a_seq.value() <= t_seqProx.value())
+        if (aSeq.value() <= tSeqProx.value())
         {
             // If the Ticket number is greater than or equal to the
             // account sequence there's the possibility that the
             // transaction to create the Ticket has not hit the ledger
             // yet.  Allow a retry.
             JLOG(j.trace()) << "applyTransaction: has future ticket id "
-                            << "a_seq=" << a_seq << " t_seq=" << t_seqProx;
+                            << "a_seq=" << aSeq << " t_seq=" << tSeqProx;
             return terPRE_TICKET;
         }
 
         // Transaction can never succeed if the Ticket is not in the ledger.
-        if (!view.exists(keylet::ticket(id, t_seqProx)))
+        if (!view.exists(keylet::kTICKET(id, tSeqProx)))
         {
             JLOG(j.trace()) << "applyTransaction: ticket already used or never created "
-                            << "a_seq=" << a_seq << " t_seq=" << t_seqProx;
+                            << "a_seq=" << aSeq << " t_seq=" << tSeqProx;
             return tefNO_TICKET;
         }
     }
@@ -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::ticket(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::zero, "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::zero,
+        sle != nullptr || account_ == beast::kZERO,
         "xrpl::Transactor::apply : non-null SLE or zero account");
 
     if (sle)
@@ -690,7 +690,7 @@ Transactor::checkSign(
         return tesSUCCESS;
     }
 
-    if (((flags & tapDRY_RUN) != 0u) && pkSigner.empty() && !sigObject.isFieldPresent(sfSigners))
+    if (((flags & TapDryRun) != 0u) && pkSigner.empty() && !sigObject.isFieldPresent(sfSigners))
     {
         // simulate: skip signature validation when neither SigningPubKey nor
         // Signers are provided
@@ -881,7 +881,7 @@ Transactor::checkMultiSign(
         }
 
         XRPL_ASSERT(
-            (flags & tapDRY_RUN) || !spk.empty(),
+            (flags & TapDryRun) || !spk.empty(),
             "xrpl::Transactor::checkMultiSign : non-empty signer or "
             "simulation");
         AccountID const signingAcctIDFromPubKey =
@@ -979,7 +979,7 @@ removeUnfundedOffers(ApplyView& view, std::vector<uint256> const& offers, beast:
         {
             // offer is unfunded
             offerDelete(view, sleOffer, viewJ);
-            if (++removed == unfundedOfferRemoveLimit)
+            if (++removed == kUNFUNDED_OFFER_REMOVE_LIMIT)
                 return;
         }
     }
@@ -998,7 +998,7 @@ removeExpiredNFTokenOffers(
         if (auto const offer = view.peek(keylet::nftoffer(index)))
         {
             nft::deleteTokenOffer(view, offer);
-            if (++removed == expiredOfferRemoveLimit)
+            if (++removed == kEXPIRED_OFFER_REMOVE_LIMIT)
                 return;
         }
     }
@@ -1020,7 +1020,7 @@ removeDeletedTrustLines(
     std::vector<uint256> const& trustLines,
     beast::Journal viewJ)
 {
-    if (trustLines.size() > maxDeletableAMMTrustLines)
+    if (trustLines.size() > kMAX_DELETABLE_AMM_TRUST_LINES)
     {
         JLOG(viewJ.error()) << "removeDeletedTrustLines: deleted trustlines exceed max "
                             << trustLines.size();
@@ -1072,17 +1072,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::zero};
+        return {tefINTERNAL, beast::kZERO};
 
     auto const payerSle = view().peek(keylet::account(ctx_.tx.getFeePayer()));
     if (!payerSle)
-        return {tefINTERNAL, beast::zero};  // 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::zero && (!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
@@ -1135,7 +1135,7 @@ Transactor::checkTransactionInvariants(TER result, XRPAmount fee)
         {
             JLOG(ctx_.journal.fatal()) <<                                             //
                 "Transaction has failed one or more transaction invariants, tx: " <<  //
-                to_string(ctx_.tx.getJson(JsonOptions::none));
+                to_string(ctx_.tx.getJson(JsonOptions::KNone));
             return tecINVARIANT_FAILED;
         }
     }
@@ -1145,7 +1145,7 @@ Transactor::checkTransactionInvariants(TER result, XRPAmount fee)
             "Exception while checking transaction invariants: " <<  //
             ex.what() <<                                            //
             ", tx: " <<                                             //
-            to_string(ctx_.tx.getJson(JsonOptions::none));
+            to_string(ctx_.tx.getJson(JsonOptions::KNone));
 
         return tecINVARIANT_FAILED;
     }
@@ -1198,8 +1198,8 @@ Transactor::operator()()
         {
             // LCOV_EXCL_START
             JLOG(j_.fatal()) << "Transaction serdes mismatch";
-            JLOG(j_.fatal()) << ctx_.tx.getJson(JsonOptions::none);
-            JLOG(j_.fatal()) << s2.getJson(JsonOptions::none);
+            JLOG(j_.fatal()) << ctx_.tx.getJson(JsonOptions::KNone);
+            JLOG(j_.fatal()) << s2.getJson(JsonOptions::KNone);
             UNREACHABLE("xrpl::Transactor::operator() : transaction serdes mismatch");
             // LCOV_EXCL_STOP
         }
@@ -1226,10 +1226,10 @@ Transactor::operator()()
     bool applied = isTesSuccess(result);
     auto fee = ctx_.tx.getFieldAmount(sfFee).xrp();
 
-    if (ctx_.size() > oversizeMetaDataCap)
+    if (ctx_.size() > kOVERSIZE_META_DATA_CAP)
         result = tecOVERSIZE;
 
-    if (isTecClaim(result) && ((view().flags() & tapFAIL_HARD) != 0u))
+    if (isTecClaim(result) && ((view().flags() & TapFailHard) != 0u))
     {
         // If the tapFAIL_HARD flag is set, a tec result
         // must not do anything
@@ -1381,21 +1381,21 @@ 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::zero)
+        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::zero)
+        if (!view().open() && fee != beast::kZERO)
             ctx_.destroyXRP(fee);
 
         // Once we call apply, we will no longer be able to look at view()
         metadata = ctx_.apply(result);
     }
 
-    if ((ctx_.flags() & tapDRY_RUN) != 0u)
+    if ((ctx_.flags() & TapDryRun) != 0u)
     {
         applied = false;
     }
diff --git a/src/libxrpl/tx/apply.cpp b/src/libxrpl/tx/apply.cpp
index 65c9649035..228d15778f 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 SF_SIGBAD = HashRouterFlags::PRIVATE1;     // Signature is bad
-constexpr HashRouterFlags SF_SIGGOOD = HashRouterFlags::PRIVATE2;    // Signature is good
-constexpr HashRouterFlags SF_LOCALBAD = HashRouterFlags::PRIVATE3;   // Local checks failed
-constexpr HashRouterFlags SF_LOCALGOOD = HashRouterFlags::PRIVATE4;  // Local checks passed
+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
 
 //------------------------------------------------------------------------------
 
@@ -57,41 +57,41 @@ checkValidity(HashRouter& router, STTx const& tx, Rules const& rules)
             std::string reason;
             if (!passesLocalChecks(tx, reason))
             {
-                router.setFlags(id, SF_LOCALBAD);
+                router.setFlags(id, kSF_LOCALBAD);
                 return {Validity::SigGoodOnly, reason};
             }
 
-            router.setFlags(id, SF_SIGGOOD);
+            router.setFlags(id, kSF_SIGGOOD);
             return {Validity::Valid, ""};
         }
     }
 
-    if (any(flags & SF_SIGBAD))
+    if (any(flags & kSF_SIGBAD))
     {
         // Signature is known bad
         return {Validity::SigBad, "Transaction has bad signature."};
     }
 
-    if (!any(flags & SF_SIGGOOD))
+    if (!any(flags & kSF_SIGGOOD))
     {
         auto const sigVerify = tx.checkSign(rules);
         if (!sigVerify)
         {
-            router.setFlags(id, SF_SIGBAD);
+            router.setFlags(id, kSF_SIGBAD);
             return {Validity::SigBad, sigVerify.error()};
         }
-        router.setFlags(id, SF_SIGGOOD);
+        router.setFlags(id, kSF_SIGGOOD);
     }
 
     // Signature is now known good
-    if (any(flags & SF_LOCALBAD))
+    if (any(flags & kSF_LOCALBAD))
     {
         // ...but the local checks
         // are known bad.
         return {Validity::SigGoodOnly, "Local checks failed."};
     }
 
-    if (any(flags & SF_LOCALGOOD))
+    if (any(flags & kSF_LOCALGOOD))
     {
         // ...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, SF_LOCALBAD);
+        router.setFlags(id, kSF_LOCALBAD);
         return {Validity::SigGoodOnly, reason};
     }
-    router.setFlags(id, SF_LOCALGOOD);
+    router.setFlags(id, kSF_LOCALGOOD);
     return {Validity::Valid, ""};
 }
 
@@ -116,10 +116,10 @@ forceValidity(HashRouter& router, uint256 const& txid, Validity validity)
     switch (validity)
     {
         case Validity::Valid:
-            flags |= SF_LOCALGOOD;
+            flags |= kSF_LOCALGOOD;
             [[fallthrough]];
         case Validity::SigGoodOnly:
-            flags |= SF_SIGGOOD;
+            flags |= kSF_SIGGOOD;
             [[fallthrough]];
         case Validity::SigBad:
             // would be silly to call directly
@@ -173,9 +173,9 @@ applyBatchTransactions(
     auto const mode = batchTxn.getFlags();
 
     auto applyOneTransaction = [&registry, &j, &parentBatchId, &batchView](STTx const& tx) {
-        OpenView perTxBatchView(batch_view, batchView);
+        OpenView perTxBatchView(kBATCH_VIEW, batchView);
 
-        auto const ret = apply(registry, perTxBatchView, parentBatchId, tx, tapBATCH, j);
+        auto const ret = apply(registry, perTxBatchView, parentBatchId, tx, TapBatch, j);
         XRPL_ASSERT(
             ret.applied == (isTesSuccess(ret.ter) || isTecClaim(ret.ter)),
             "Inner transaction should not be applied");
@@ -231,7 +231,7 @@ applyTransaction(
 {
     // Returns false if the transaction has need not be retried.
     if (retryAssured)
-        flags = flags | tapRETRY;
+        flags = flags | TapRetry;
 
     JLOG(j.debug()) << "TXN " << txn.getTransactionID() << (retryAssured ? "/retry" : "/final");
 
@@ -247,7 +247,7 @@ applyTransaction(
             // its inner transactions as necessary.
             if (isTesSuccess(result.ter) && txn.getTxnType() == ttBATCH)
             {
-                OpenView wholeBatchView(batch_view, view);
+                OpenView wholeBatchView(kBATCH_VIEW, 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 a0667719c1..7833341808 100644
--- a/src/libxrpl/tx/applySteps.cpp
+++ b/src/libxrpl/tx/applySteps.cpp
@@ -56,7 +56,7 @@ struct UnknownTxnType : std::exception
 // throw an "UnknownTxnType" exception on error
 template <class F>
 auto
-with_txn_type(Rules const& rules, TxType txnType, F&& f)
+withTxnType(Rules const& rules, TxType txnType, F&& f)
 {
     // These global updates really should have been for every Transaction
     // step: preflight, preclaim, calculateBaseFee, and doApply. Unfortunately,
@@ -84,7 +84,7 @@ with_txn_type(Rules const& rules, TxType txnType, F&& f)
     else
     {
         // Without those features enabled, always use the old number rules.
-        mantissaScaleGuard.emplace(MantissaRange::mantissa_scale::small);
+        mantissaScaleGuard.emplace(MantissaRange::MantissaScale::Small);
     }
 
     switch (txnType)
@@ -106,7 +106,7 @@ with_txn_type(Rules const& rules, TxType txnType, F&& f)
 }
 }  // namespace
 
-// Templates so preflight does the right thing with T::ConsequencesFactory.
+// Templates so preflight does the right thing with T::kCONSEQUENCES_FACTORY.
 //
 // 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,40 +117,40 @@ with_txn_type(Rules const& rules, TxType txnType, F&& f)
 //
 
 template <class T>
-    requires(T::ConsequencesFactory == Transactor::Normal)
+    requires(T::kCONSEQUENCES_FACTORY == Transactor::Normal)
 TxConsequences
-consequences_helper(PreflightContext const& ctx)
+consequencesHelper(PreflightContext const& ctx)
 {
     return TxConsequences(ctx.tx);
 };
 
 // For Transactor::Blocker
 template <class T>
-    requires(T::ConsequencesFactory == Transactor::Blocker)
+    requires(T::kCONSEQUENCES_FACTORY == Transactor::Blocker)
 TxConsequences
-consequences_helper(PreflightContext const& ctx)
+consequencesHelper(PreflightContext const& ctx)
 {
-    return TxConsequences(ctx.tx, TxConsequences::Category::blocker);
+    return TxConsequences(ctx.tx, TxConsequences::Category::Blocker);
 };
 
 // For Transactor::Custom
 template <class T>
-    requires(T::ConsequencesFactory == Transactor::Custom)
+    requires(T::kCONSEQUENCES_FACTORY == Transactor::Custom)
 TxConsequences
-consequences_helper(PreflightContext const& ctx)
+consequencesHelper(PreflightContext const& ctx)
 {
     return T::makeTxConsequences(ctx);
 };
 
 static std::pair<NotTEC, TxConsequences>
-invoke_preflight(PreflightContext const& ctx)
+invokePreflight(PreflightContext const& ctx)
 {
     try
     {
-        return with_txn_type(ctx.rules, ctx.tx.getTxnType(), [&]<typename T>() {
+        return withTxnType(ctx.rules, ctx.tx.getTxnType(), [&]<typename T>() {
             auto const tec = Transactor::invokePreflight<T>(ctx);
             return std::make_pair(
-                tec, isTesSuccess(tec) ? consequences_helper<T>(ctx) : TxConsequences{tec});
+                tec, isTesSuccess(tec) ? consequencesHelper<T>(ctx) : TxConsequences{tec});
         });
     }
     catch (UnknownTxnType const& e)
@@ -165,13 +165,13 @@ invoke_preflight(PreflightContext const& ctx)
 }
 
 static TER
-invoke_preclaim(PreclaimContext const& ctx)
+invokePreclaim(PreclaimContext const& ctx)
 {
     try
     {
         // use name hiding to accomplish compile-time polymorphism of static
         // class functions for Transactor and derived classes.
-        return with_txn_type(ctx.view.rules(), ctx.tx.getTxnType(), [&]<typename T>() -> TER {
+        return withTxnType(ctx.view.rules(), ctx.tx.getTxnType(), [&]<typename T>() -> TER {
             // preclaim functionality is divided into two sections:
             // 1. Up to and including the signature check: returns NotTEC.
             //    All transaction checks before and including checkSign
@@ -186,7 +186,7 @@ invoke_preclaim(PreclaimContext const& ctx)
             // a flagged a failure.
             auto const id = ctx.tx.getAccountID(sfAccount);
 
-            if (id != beast::zero)
+            if (id != beast::kZERO)
             {
                 if (NotTEC const preSigResult = [&]() -> NotTEC {
                         if (NotTEC const result = T::checkSeqProxy(ctx.view, ctx.tx, ctx.j))
@@ -240,11 +240,11 @@ invoke_preclaim(PreclaimContext const& ctx)
  * logs an error and returns an XRPAmount of zero.
  */
 static XRPAmount
-invoke_calculateBaseFee(ReadView const& view, STTx const& tx)
+invokeCalculateBaseFee(ReadView const& view, STTx const& tx)
 {
     try
     {
-        return with_txn_type(view.rules(), tx.getTxnType(), [&]<typename T>() {
+        return withTxnType(view.rules(), tx.getTxnType(), [&]<typename T>() {
             return T::calculateBaseFee(view, tx);
         });
     }
@@ -259,8 +259,8 @@ invoke_calculateBaseFee(ReadView const& view, STTx const& tx)
 
 TxConsequences::TxConsequences(NotTEC pfResult)
     : isBlocker_(false)
-    , fee_(beast::zero)
-    , potentialSpend_(beast::zero)
+    , 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::zero)
-    , potentialSpend_(beast::zero)
+    , fee_(tx[sfFee].native() && !tx[sfFee].negative() ? tx[sfFee].xrp() : beast::kZERO)
+    , potentialSpend_(beast::kZERO)
     , seqProx_(tx.getSeqProxy())
     , sequencesConsumed_(tx.getSeqProxy().isSeq() ? 1 : 0)
 {
@@ -279,7 +279,7 @@ TxConsequences::TxConsequences(STTx const& tx)
 
 TxConsequences::TxConsequences(STTx const& tx, Category category) : TxConsequences(tx)
 {
-    isBlocker_ = (category == Category::blocker);
+    isBlocker_ = (category == TxConsequences::Category::Blocker);
 }
 
 TxConsequences::TxConsequences(STTx const& tx, XRPAmount potentialSpend) : TxConsequences(tx)
@@ -293,11 +293,11 @@ TxConsequences::TxConsequences(STTx const& tx, std::uint32_t sequencesConsumed)
 }
 
 static ApplyResult
-invoke_apply(ApplyContext& ctx)
+invokeApply(ApplyContext& ctx)
 {
     try
     {
-        return with_txn_type(ctx.view().rules(), ctx.tx.getTxnType(), [&]<typename T>() {
+        return withTxnType(ctx.view().rules(), ctx.tx.getTxnType(), [&]<typename T>() {
             T p(ctx);
             return p();
         });
@@ -319,7 +319,7 @@ invoke_apply(ApplyContext& ctx)
 std::unique_ptr<Transactor>
 makeTransactor(ApplyContext& ctx)
 {
-    return with_txn_type(
+    return withTxnType(
         ctx.view().rules(), ctx.tx.getTxnType(), [&]<typename T>() -> std::unique_ptr<Transactor> {
             return std::make_unique<T>(ctx);
         });
@@ -336,7 +336,7 @@ preflight(
     PreflightContext const pfCtx(registry, tx, rules, flags, j);
     try
     {
-        return {pfCtx, invoke_preflight(pfCtx)};
+        return {pfCtx, invokePreflight(pfCtx)};
     }
     catch (std::exception const& e)
     {
@@ -357,7 +357,7 @@ preflight(
     PreflightContext const pfCtx(registry, tx, parentBatchId, rules, flags, j);
     try
     {
-        return {pfCtx, invoke_preflight(pfCtx)};
+        return {pfCtx, invokePreflight(pfCtx)};
     }
     catch (std::exception const& e)
     {
@@ -417,7 +417,7 @@ preclaim(PreflightResult const& preflightResult, ServiceRegistry& registry, Open
     {
         if (!isTesSuccess(ctx->preflightResult))
             return {*ctx, ctx->preflightResult};
-        return {*ctx, invoke_preclaim(*ctx)};
+        return {*ctx, invokePreclaim(*ctx)};
     }
     catch (std::exception const& e)
     {
@@ -429,7 +429,7 @@ preclaim(PreflightResult const& preflightResult, ServiceRegistry& registry, Open
 XRPAmount
 calculateBaseFee(ReadView const& view, STTx const& tx)
 {
-    return invoke_calculateBaseFee(view, tx);
+    return invokeCalculateBaseFee(view, tx);
 }
 
 XRPAmount
@@ -460,7 +460,7 @@ doApply(PreclaimResult const& preclaimResult, ServiceRegistry& registry, OpenVie
             calculateBaseFee(view, preclaimResult.tx),
             preclaimResult.flags,
             preclaimResult.j);
-        return invoke_apply(ctx);
+        return invokeApply(ctx);
     }
     catch (std::exception const& e)
     {
diff --git a/src/libxrpl/tx/invariants/AMMInvariant.cpp b/src/libxrpl/tx/invariants/AMMInvariant.cpp
index af60f3fc55..6469799eb6 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::zero && amount2 > beast::zero && lptAMMBalance > beast::zero;
+        amount > beast::kZERO && amount2 > beast::kZERO && lptAMMBalance > beast::kZERO;
     if (zeroAllowed == ValidAMM::ZeroAllowed::Yes)
     {
         return positive ||
-            (amount == beast::zero && amount2 == beast::zero && lptAMMBalance == beast::zero);
+            (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::zero))
+        (*lptAMMBalanceAfter_ > *lptAMMBalanceBefore_ || *lptAMMBalanceAfter_ <= beast::kZERO))
     {
         // LCOV_EXCL_START
         JLOG(j.error()) << "AMMBid invariant failed: " << *lptAMMBalanceBefore_ << " "
@@ -146,8 +146,8 @@ ValidAMM::finalizeCreate(
             *ammAccount_,
             tx[sfAmount].asset(),
             tx[sfAmount2].asset(),
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             j);
         // Create invariant:
         // sqrt(amount * amount2) == LPTokens
@@ -214,8 +214,8 @@ ValidAMM::generalInvariant(
         *ammAccount_,
         tx[sfAsset],
         tx[sfAsset2],
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         j);
     // Deposit and Withdrawal invariant:
     // sqrt(amount * amount2) >= LPTokens
@@ -227,16 +227,16 @@ ValidAMM::generalInvariant(
     bool const strongInvariantCheck = poolProductMean >= *lptAMMBalanceAfter_;
     // Allow for a small relative error if strongInvariantCheck fails
     auto weakInvariantCheck = [&]() {
-        return *lptAMMBalanceAfter_ != beast::zero &&
+        return *lptAMMBalanceAfter_ != beast::kZERO &&
             withinRelativeDistance(poolProductMean, Number{*lptAMMBalanceAfter_}, Number{1, -11});
     };
     if (!nonNegativeBalances || (!strongInvariantCheck && !weakInvariantCheck()))
     {
         JLOG(j.error()) << "AMM " << tx.getTxnType()
-                        << " invariant failed: " << tx.getHash(HashPrefix::transactionID) << " "
+                        << " invariant failed: " << tx.getHash(HashPrefix::TransactionId) << " "
                         << ammPoolChanged_ << " " << amount << " " << amount2 << " "
                         << poolProductMean << " " << lptAMMBalanceAfter_->getText() << " "
-                        << ((*lptAMMBalanceAfter_ == beast::zero)
+                        << ((*lptAMMBalanceAfter_ == beast::kZERO)
                                 ? Number{1}
                                 : ((*lptAMMBalanceAfter_ - poolProductMean) / poolProductMean));
         return false;
diff --git a/src/libxrpl/tx/invariants/FreezeInvariant.cpp b/src/libxrpl/tx/invariants/FreezeInvariant.cpp
index bf9ef81396..eaaeb7fc6f 100644
--- a/src/libxrpl/tx/invariants/FreezeInvariant.cpp
+++ b/src/libxrpl/tx/invariants/FreezeInvariant.cpp
@@ -272,7 +272,7 @@ TransfersNotFrozen::validateFrozenState(
     }
 
     // AMMClawbacks are allowed to override some freeze rules
-    if ((!isAMMLine || globalFreeze) && hasPrivilege(tx, overrideFreeze))
+    if ((!isAMMLine || globalFreeze) && hasPrivilege(tx, OverrideFreeze))
     {
         JLOG(j.debug()) << "Invariant check allowing funds to be moved "
                         << (change.balanceChangeSign > 0 ? "to" : "from")
diff --git a/src/libxrpl/tx/invariants/InvariantCheck.cpp b/src/libxrpl/tx/invariants/InvariantCheck.cpp
index 2f12c7ce1e..4f25a91bdf 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 >= INITIAL_XRP)
+    if (fee >= kINITIAL_XRP)
     {
         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 > INITIAL_XRP)
+        if (drops > kINITIAL_XRP)
             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::zero)
+        if (pays < beast::kZERO)
             return true;
 
-        if (gets < beast::zero)
+        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() >= INITIAL_XRP)
+            if (amount.xrp() >= kINITIAL_XRP)
                 return true;
         }
         else
@@ -306,7 +306,7 @@ NoZeroEscrow::visitEntry(
             return amount.asset().visit(
                 [&](Issue const& issue) {
                     // IOU case
-                    if (amount <= beast::zero)
+                    if (amount <= beast::kZERO)
                         return true;
 
                     if (badCurrency() == issue.currency)
@@ -318,10 +318,10 @@ NoZeroEscrow::visitEntry(
                 // MPT case
                 ,
                 [&](MPTIssue const&) {
-                    if (amount <= beast::zero)
+                    if (amount <= beast::kZERO)
                         return true;
 
-                    if (amount.mpt() > MPTAmount{maxMPTokenAmount})
+                    if (amount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT})
                         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 > maxMPTokenAmount || amount < 0)
+        if (amount > kMAX_MP_TOKEN_AMOUNT || amount < 0)
             bad_ |= true;
     };
 
@@ -414,7 +414,7 @@ AccountRootsNotDeleted::finalize(
     // transaction when the total AMM LP Tokens balance goes to 0.
     // A successful AccountDelete or AMMDelete MUST delete exactly
     // one account root.
-    if (hasPrivilege(tx, mustDeleteAcct) && isTesSuccess(result))
+    if (hasPrivilege(tx, MustDeleteAcct) && isTesSuccess(result))
     {
         if (accountsDeleted_ == 1)
             return true;
@@ -433,7 +433,7 @@ AccountRootsNotDeleted::finalize(
     // A successful AMMWithdraw/AMMClawback MAY delete one account root
     // when the total AMM LP Tokens balance goes to 0. Not every AMM withdraw
     // deletes the AMM account, accountsDeleted_ is set if it is deleted.
-    if (hasPrivilege(tx, mayDeleteAcct) && isTesSuccess(result) && accountsDeleted_ == 1)
+    if (hasPrivilege(tx, MayDeleteAcct) && isTesSuccess(result) && accountsDeleted_ == 1)
         return true;
 
     if (accountsDeleted_ == 0)
@@ -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::zero)
+        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] : directAccountKeylets)
+        for (auto const& [keyletfunc, _1, _2] : kDIRECT_ACCOUNT_KEYLETS)
         {
             // TODO: use '_' for both unused variables above once we are in C++26
             if (objectExists(std::invoke(keyletfunc, accountID)) && enforce)
@@ -537,8 +537,8 @@ AccountRootsDeletedClean::finalize(
             // checked above as entries in directAccountKeylets. This uses
             // view.succ() to check for any NFT pages in between the two
             // endpoints.
-            Keylet const first = keylet::nftpage_min(accountID);
-            Keylet const last = keylet::nftpage_max(accountID);
+            Keylet const first = keylet::nftpageMin(accountID);
+            Keylet const last = keylet::nftpageMax(accountID);
 
             std::optional<uint256> key = view.succ(first.key, last.key.next());
 
@@ -746,14 +746,14 @@ ValidNewAccountRoot::finalize(
     }
 
     // From this point on we know exactly one account was created.
-    if (hasPrivilege(tx, createAcct | createPseudoAcct) && isTesSuccess(result))
+    if (hasPrivilege(tx, CreateAcct | CreatePseudoAcct) && isTesSuccess(result))
     {
         bool const pseudoAccount =
             (pseudoAccount_ &&
              (view.rules().enabled(featureSingleAssetVault) ||
               view.rules().enabled(featureLendingProtocol)));
 
-        if (pseudoAccount && !hasPrivilege(tx, createPseudoAcct))
+        if (pseudoAccount && !hasPrivilege(tx, CreatePseudoAcct))
         {
             JLOG(j.fatal()) << "Invariant failed: pseudo-account created by a "
                                "wrong transaction type";
@@ -796,10 +796,10 @@ ValidClawback::visitEntry(
     std::shared_ptr<SLE const> const&)
 {
     if (before && before->getType() == ltRIPPLE_STATE)
-        trustlinesChanged++;
+        trustlinesChanged_++;
 
     if (before && before->getType() == ltMPTOKEN)
-        mptokensChanged++;
+        mptokensChanged_++;
 }
 
 bool
@@ -815,20 +815,20 @@ ValidClawback::finalize(
 
     if (isTesSuccess(result))
     {
-        if (trustlinesChanged > 1)
+        if (trustlinesChanged_ > 1)
         {
             JLOG(j.fatal()) << "Invariant failed: more than one trustline changed.";
             return false;
         }
 
-        if (mptokensChanged > 1)
+        if (mptokensChanged_ > 1)
         {
             JLOG(j.fatal()) << "Invariant failed: more than one mptokens changed.";
             return false;
         }
 
         bool const mptV2Enabled = view.rules().enabled(featureMPTokensV2);
-        if (trustlinesChanged == 1 || (mptV2Enabled && mptokensChanged == 1))
+        if (trustlinesChanged_ == 1 || (mptV2Enabled && mptokensChanged_ == 1))
         {
             AccountID const issuer = tx.getAccountID(sfAccount);
             STAmount const& amount = tx.getFieldAmount(sfAmount);
@@ -836,15 +836,15 @@ ValidClawback::finalize(
             STAmount const holderBalance = amount.asset().visit(
                 [&](Issue const& issue) {
                     return accountHolds(
-                        view, holder, issue.currency, issuer, FreezeHandling::fhIGNORE_FREEZE, j);
+                        view, holder, issue.currency, issuer, FreezeHandling::IgnoreFreeze, j);
                 },
                 [&](MPTIssue const& issue) {
                     return accountHolds(
                         view,
                         issuer,
                         issue,
-                        FreezeHandling::fhIGNORE_FREEZE,
-                        AuthHandling::ahIGNORE_AUTH,
+                        FreezeHandling::IgnoreFreeze,
+                        AuthHandling::IgnoreAuth,
                         j);
                 });
 
@@ -857,14 +857,14 @@ ValidClawback::finalize(
     }
     else
     {
-        if (trustlinesChanged != 0)
+        if (trustlinesChanged_ != 0)
         {
             JLOG(j.fatal()) << "Invariant failed: some trustlines were changed "
                                "despite failure of the transaction.";
             return false;
         }
 
-        if (mptokensChanged != 0)
+        if (mptokensChanged_ != 0)
         {
             JLOG(j.fatal()) << "Invariant failed: some mptokens were changed "
                                "despite failure of the transaction.";
@@ -991,7 +991,9 @@ NoModifiedUnmodifiableFields::finalize(
     ReadView const& view,
     beast::Journal const& j)
 {
-    static auto const fieldChanged = [](auto const& before, auto const& after, auto const& field) {
+    static auto const kFIELD_CHANGED = [](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));
@@ -1012,17 +1014,17 @@ NoModifiedUnmodifiableFields::finalize(
                  * potential issues even when the amendment is disabled.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = fieldChanged(before, after, sfLedgerEntryType) ||
-                    fieldChanged(before, after, sfLedgerIndex) ||
-                    fieldChanged(before, after, sfSequence) ||
-                    fieldChanged(before, after, sfOwnerNode) ||
-                    fieldChanged(before, after, sfVaultNode) ||
-                    fieldChanged(before, after, sfVaultID) ||
-                    fieldChanged(before, after, sfAccount) ||
-                    fieldChanged(before, after, sfOwner) ||
-                    fieldChanged(before, after, sfManagementFeeRate) ||
-                    fieldChanged(before, after, sfCoverRateMinimum) ||
-                    fieldChanged(before, after, sfCoverRateLiquidation);
+                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);
                 break;
             case ltLOAN:
                 /*
@@ -1031,26 +1033,26 @@ NoModifiedUnmodifiableFields::finalize(
                  * potential issues even when the amendment is disabled.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = fieldChanged(before, after, sfLedgerEntryType) ||
-                    fieldChanged(before, after, sfLedgerIndex) ||
-                    fieldChanged(before, after, sfSequence) ||
-                    fieldChanged(before, after, sfOwnerNode) ||
-                    fieldChanged(before, after, sfLoanBrokerNode) ||
-                    fieldChanged(before, after, sfLoanBrokerID) ||
-                    fieldChanged(before, after, sfBorrower) ||
-                    fieldChanged(before, after, sfLoanOriginationFee) ||
-                    fieldChanged(before, after, sfLoanServiceFee) ||
-                    fieldChanged(before, after, sfLatePaymentFee) ||
-                    fieldChanged(before, after, sfClosePaymentFee) ||
-                    fieldChanged(before, after, sfOverpaymentFee) ||
-                    fieldChanged(before, after, sfInterestRate) ||
-                    fieldChanged(before, after, sfLateInterestRate) ||
-                    fieldChanged(before, after, sfCloseInterestRate) ||
-                    fieldChanged(before, after, sfOverpaymentInterestRate) ||
-                    fieldChanged(before, after, sfStartDate) ||
-                    fieldChanged(before, after, sfPaymentInterval) ||
-                    fieldChanged(before, after, sfGracePeriod) ||
-                    fieldChanged(before, after, sfLoanScale);
+                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);
                 break;
             default:
                 /*
@@ -1063,8 +1065,8 @@ NoModifiedUnmodifiableFields::finalize(
                  * was added.
                  */
                 enforce = view.rules().enabled(featureLendingProtocol);
-                bad = fieldChanged(before, after, sfLedgerEntryType) ||
-                    fieldChanged(before, after, sfLedgerIndex);
+                bad = kFIELD_CHANGED(before, after, sfLedgerEntryType) ||
+                    kFIELD_CHANGED(before, after, sfLedgerIndex);
         }
         XRPL_ASSERT(
             !bad || enforce,
diff --git a/src/libxrpl/tx/invariants/LoanBrokerInvariant.cpp b/src/libxrpl/tx/invariants/LoanBrokerInvariant.cpp
index b72f821f50..b98d769393 100644
--- a/src/libxrpl/tx/invariants/LoanBrokerInvariant.cpp
+++ b/src/libxrpl/tx/invariants/LoanBrokerInvariant.cpp
@@ -187,8 +187,8 @@ ValidLoanBroker::finalize(
             view,
             after->at(sfAccount),
             vaultAsset,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             j);
         if (after->at(sfCoverAvailable) < pseudoBalance)
         {
diff --git a/src/libxrpl/tx/invariants/LoanInvariant.cpp b/src/libxrpl/tx/invariants/LoanInvariant.cpp
index 7aea36296e..e3dff3dde9 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::zero ||
-             after->at(sfPrincipalOutstanding) != beast::zero ||
-             after->at(sfManagementFeeOutstanding) != beast::zero))
+            (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::zero &&
-            after->at(sfPrincipalOutstanding) == beast::zero &&
-            after->at(sfManagementFeeOutstanding) == beast::zero)
+            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 97db4aa385..9b8838f145 100644
--- a/src/libxrpl/tx/invariants/MPTInvariant.cpp
+++ b/src/libxrpl/tx/invariants/MPTInvariant.cpp
@@ -62,7 +62,7 @@ bool
 ValidMPTIssuance::finalize(
     STTx const& tx,
     TER const result,
-    XRPAmount const _fee,
+    XRPAmount const fee,
     ReadView const& view,
     beast::Journal const& j) const
 {
@@ -85,7 +85,7 @@ ValidMPTIssuance::finalize(
         }
 
         auto const txnType = tx.getTxnType();
-        if (hasPrivilege(tx, createMPTIssuance))
+        if (hasPrivilege(tx, CreateMptIssuance))
         {
             if (mptIssuancesCreated_ == 0)
             {
@@ -106,7 +106,7 @@ ValidMPTIssuance::finalize(
             return mptIssuancesCreated_ == 1 && mptIssuancesDeleted_ == 0;
         }
 
-        if (hasPrivilege(tx, destroyMPTIssuance))
+        if (hasPrivilege(tx, DestroyMptIssuance))
         {
             if (mptIssuancesDeleted_ == 0)
             {
@@ -133,7 +133,7 @@ ValidMPTIssuance::finalize(
         // non-amendment-gated side effects.
         bool const enforceEscrowFinish = (txnType == ttESCROW_FINISH) &&
             (rules.enabled(featureSingleAssetVault) || lendingProtocolEnabled);
-        if (hasPrivilege(tx, mustAuthorizeMPT | mayAuthorizeMPT) || enforceEscrowFinish)
+        if (hasPrivilege(tx, MustAuthorizeMpt | MayAuthorizeMpt) || enforceEscrowFinish)
         {
             bool const submittedByIssuer = tx.isFieldPresent(sfHolder);
 
@@ -149,7 +149,7 @@ ValidMPTIssuance::finalize(
                                    "succeeded but deleted issuances";
                 return false;
             }
-            if (mptV2Enabled && hasPrivilege(tx, mayAuthorizeMPT) &&
+            if (mptV2Enabled && hasPrivilege(tx, MayAuthorizeMpt) &&
                 (txnType == ttAMM_WITHDRAW || txnType == ttAMM_CLAWBACK))
             {
                 if (submittedByIssuer && txnType == ttAMM_WITHDRAW && mptokensCreated_ > 0)
@@ -184,7 +184,7 @@ ValidMPTIssuance::finalize(
                 return false;
             }
             else if (
-                !submittedByIssuer && hasPrivilege(tx, mustAuthorizeMPT) &&
+                !submittedByIssuer && hasPrivilege(tx, MustAuthorizeMpt) &&
                 (mptokensCreated_ + mptokensDeleted_ != 1))
             {
                 // if the holder submitted this tx, then a mptoken must be
@@ -197,7 +197,7 @@ ValidMPTIssuance::finalize(
             return true;
         }
 
-        if (hasPrivilege(tx, mayCreateMPT))
+        if (hasPrivilege(tx, MayCreateMpt))
         {
             bool const submittedByIssuer = tx.isFieldPresent(sfHolder);
 
@@ -252,7 +252,7 @@ ValidMPTIssuance::finalize(
             return true;
         }
 
-        if (hasPrivilege(tx, mayDeleteMPT) &&
+        if (hasPrivilege(tx, MayDeleteMpt) &&
             ((txnType == ttAMM_DELETE && mptokensDeleted_ <= 2) || mptokensDeleted_ == 1) &&
             mptokensCreated_ == 0 && mptIssuancesCreated_ == 0 && mptIssuancesDeleted_ == 0)
             return true;
@@ -299,7 +299,7 @@ ValidMPTPayment::visitEntry(
         if (type == ltMPTOKEN_ISSUANCE)
         {
             auto const outstanding = sle[sfOutstandingAmount];
-            if (outstanding > maxMPTokenAmount)
+            if (outstanding > kMAX_MP_TOKEN_AMOUNT)
             {
                 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 > maxMPTokenAmount || lockedAmt > maxMPTokenAmount ||
-                lockedAmt > (maxMPTokenAmount - mptAmt))
+            if (mptAmt > kMAX_MP_TOKEN_AMOUNT || lockedAmt > kMAX_MP_TOKEN_AMOUNT ||
+                lockedAmt > (kMAX_MP_TOKEN_AMOUNT - mptAmt))
             {
                 overflow_ = true;
                 return false;
@@ -361,20 +361,21 @@ ValidMPTPayment::finalize(
             return !enforce;
         }
 
-        auto const signedMax = static_cast<std::int64_t>(maxMPTokenAmount);
+        auto const signedMax = static_cast<std::int64_t>(kMAX_MP_TOKEN_AMOUNT);
         for (auto const& [id, data] : data_)
         {
             (void)id;
-            constexpr auto iBefore = static_cast<std::size_t>(Order::Before);
-            constexpr auto iAfter = static_cast<std::size_t>(Order::After);
+            constexpr auto kI_BEFORE = static_cast<std::size_t>(Order::Before);
+            constexpr auto kI_AFTER = static_cast<std::size_t>(Order::After);
             bool const addOverflows =
-                (data.mptAmount > 0 && data.outstanding[iBefore] > (signedMax - data.mptAmount)) ||
-                (data.mptAmount < 0 && data.outstanding[iBefore] < (-signedMax - data.mptAmount));
+                (data.mptAmount > 0 &&
+                 data.outstanding[kI_BEFORE] > (signedMax - data.mptAmount)) ||
+                (data.mptAmount < 0 && data.outstanding[kI_BEFORE] < (-signedMax - data.mptAmount));
             if (addOverflows ||
-                data.outstanding[iAfter] != (data.outstanding[iBefore] + data.mptAmount))
+                data.outstanding[kI_AFTER] != (data.outstanding[kI_BEFORE] + data.mptAmount))
             {
                 JLOG(j.fatal()) << "Invariant failed: invalid OutstandingAmount balance "
-                                << data.outstanding[iBefore] << " " << data.outstanding[iAfter]
+                                << data.outstanding[kI_BEFORE] << " " << data.outstanding[kI_AFTER]
                                 << " " << data.mptAmount;
                 return !enforce;
             }
diff --git a/src/libxrpl/tx/invariants/NFTInvariant.cpp b/src/libxrpl/tx/invariants/NFTInvariant.cpp
index 90511b6d04..da415d2ad8 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& pageBits = nft::pageMask;
-    static constexpr uint256 const accountBits = ~pageBits;
+    static constexpr uint256 const& kPAGE_BITS = nft::kPAGE_MASK;
+    static constexpr uint256 const kACCOUNT_BITS = ~kPAGE_BITS;
 
     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() & accountBits;
-        uint256 const hiLimit = sle->key() & pageBits;
+        uint256 const account = sle->key() & kACCOUNT_BITS;
+        uint256 const hiLimit = sle->key() & kPAGE_BITS;
         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 & accountBits))
+            if (account != (*prev & kACCOUNT_BITS))
                 badLink_ = true;
 
-            if (hiLimit <= (*prev & pageBits))
+            if (hiLimit <= (*prev & kPAGE_BITS))
                 badLink_ = true;
         }
 
         if (auto const next = (*sle)[~sfNextPageMin])
         {
-            if (account != (*next & accountBits))
+            if (account != (*next & kACCOUNT_BITS))
                 badLink_ = true;
 
-            if (hiLimit >= (*next & pageBits))
+            if (hiLimit >= (*next & kPAGE_BITS))
                 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 > dirMaxTokensPerPage)
+                (!isDelete && nftokenCount == 0) || nftokenCount > kDIR_MAX_TOKENS_PER_PAGE)
                 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 & pageBits : uint256(beast::zero);
+            uint256 const loLimit = prev ? *prev & kPAGE_BITS : 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 & pageBits;
+                if (uint256 const tokenPageBits = tokenID & kPAGE_BITS;
                     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::pageMask) == nft::pageMask &&
+        if (isDelete && (before->key() & nft::kPAGE_MASK) == nft::kPAGE_MASK &&
             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::pageMask) != nft::pageMask &&
+        if ((before->key() & nft::kPAGE_MASK) != nft::kPAGE_MASK &&
             before->isFieldPresent(sfNextPageMin) && !after->isFieldPresent(sfNextPageMin))
         {
             deletedLink_ = true;
@@ -194,14 +194,14 @@ NFTokenCountTracking::visitEntry(
 {
     if (before && before->getType() == ltACCOUNT_ROOT)
     {
-        beforeMintedTotal += (*before)[~sfMintedNFTokens].value_or(0);
-        beforeBurnedTotal += (*before)[~sfBurnedNFTokens].value_or(0);
+        beforeMintedTotal_ += (*before)[~sfMintedNFTokens].value_or(0);
+        beforeBurnedTotal_ += (*before)[~sfBurnedNFTokens].value_or(0);
     }
 
     if (after && after->getType() == ltACCOUNT_ROOT)
     {
-        afterMintedTotal += (*after)[~sfMintedNFTokens].value_or(0);
-        afterBurnedTotal += (*after)[~sfBurnedNFTokens].value_or(0);
+        afterMintedTotal_ += (*after)[~sfMintedNFTokens].value_or(0);
+        afterBurnedTotal_ += (*after)[~sfBurnedNFTokens].value_or(0);
     }
 }
 
@@ -213,16 +213,16 @@ NFTokenCountTracking::finalize(
     ReadView const& view,
     beast::Journal const& j) const
 {
-    if (!hasPrivilege(tx, changeNFTCounts))
+    if (!hasPrivilege(tx, ChangeNftCounts))
     {
-        if (beforeMintedTotal != afterMintedTotal)
+        if (beforeMintedTotal_ != afterMintedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: the number of minted tokens "
                                "changed without a mint transaction!";
             return false;
         }
 
-        if (beforeBurnedTotal != afterBurnedTotal)
+        if (beforeBurnedTotal_ != afterBurnedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: the number of burned tokens "
                                "changed without a burn transaction!";
@@ -234,21 +234,21 @@ NFTokenCountTracking::finalize(
 
     if (tx.getTxnType() == ttNFTOKEN_MINT)
     {
-        if (isTesSuccess(result) && beforeMintedTotal >= afterMintedTotal)
+        if (isTesSuccess(result) && beforeMintedTotal_ >= afterMintedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: successful minting didn't increase "
                                "the number of minted tokens.";
             return false;
         }
 
-        if (!isTesSuccess(result) && beforeMintedTotal != afterMintedTotal)
+        if (!isTesSuccess(result) && beforeMintedTotal_ != afterMintedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: failed minting changed the "
                                "number of minted tokens.";
             return false;
         }
 
-        if (beforeBurnedTotal != afterBurnedTotal)
+        if (beforeBurnedTotal_ != afterBurnedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: minting changed the number of "
                                "burned tokens.";
@@ -260,7 +260,7 @@ NFTokenCountTracking::finalize(
     {
         if (isTesSuccess(result))
         {
-            if (beforeBurnedTotal >= afterBurnedTotal)
+            if (beforeBurnedTotal_ >= afterBurnedTotal_)
             {
                 JLOG(j.fatal()) << "Invariant failed: successful burning didn't increase "
                                    "the number of burned tokens.";
@@ -268,14 +268,14 @@ NFTokenCountTracking::finalize(
             }
         }
 
-        if (!isTesSuccess(result) && beforeBurnedTotal != afterBurnedTotal)
+        if (!isTesSuccess(result) && beforeBurnedTotal_ != afterBurnedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: failed burning changed the "
                                "number of burned tokens.";
             return false;
         }
 
-        if (beforeMintedTotal != afterMintedTotal)
+        if (beforeMintedTotal_ != afterMintedTotal_)
         {
             JLOG(j.fatal()) << "Invariant failed: burning changed the number of "
                                "minted tokens.";
diff --git a/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp b/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
index 3c6f67a8d6..784a2503ca 100644
--- a/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
+++ b/src/libxrpl/tx/invariants/PermissionedDomainInvariant.cpp
@@ -36,21 +36,21 @@ ValidPermissionedDomain::visitEntry(
         auto const sorted = credentials::makeSorted(credentials);
 
         SleStatus ss{
-            .credentialsSize_ = credentials.size(),
-            .isSorted_ = false,
-            .isUnique_ = !sorted.empty(),
-            .isDelete_ = isDel};
+            .credentialsSize = credentials.size(),
+            .isSorted = false,
+            .isUnique = !sorted.empty(),
+            .isDelete = isDel};
 
         // If array have duplicates then all the other checks are invalid
-        if (ss.isUnique_)
+        if (ss.isUnique)
         {
             unsigned i = 0;
             for (auto const& cred : sorted)
             {
                 auto const& credTx = credentials[i++];
-                ss.isSorted_ =
+                ss.isSorted =
                     (cred.first == credTx[sfIssuer]) && (cred.second == credTx[sfCredentialType]);
-                if (!ss.isSorted_)
+                if (!ss.isSorted)
                     break;
             }
         }
@@ -70,29 +70,29 @@ ValidPermissionedDomain::finalize(
     beast::Journal const& j)
 {
     auto check = [](SleStatus const& sleStatus, beast::Journal const& j) {
-        if (!sleStatus.credentialsSize_)
+        if (!sleStatus.credentialsSize)
         {
             JLOG(j.fatal()) << "Invariant failed: permissioned domain with "
                                "no rules.";
             return false;
         }
 
-        if (sleStatus.credentialsSize_ > maxPermissionedDomainCredentialsArraySize)
+        if (sleStatus.credentialsSize > kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE)
         {
             JLOG(j.fatal()) << "Invariant failed: permissioned domain bad "
                                "credentials size "
-                            << sleStatus.credentialsSize_;
+                            << sleStatus.credentialsSize;
             return false;
         }
 
-        if (!sleStatus.isUnique_)
+        if (!sleStatus.isUnique)
         {
             JLOG(j.fatal()) << "Invariant failed: permissioned domain credentials "
                                "aren't unique";
             return false;
         }
 
-        if (!sleStatus.isSorted_)
+        if (!sleStatus.isSorted)
         {
             JLOG(j.fatal()) << "Invariant failed: permissioned domain credentials "
                                "aren't sorted";
@@ -129,7 +129,7 @@ ValidPermissionedDomain::finalize(
                 }
 
                 auto const& sleStatus = sleStatus_[0];
-                if (sleStatus.isDelete_)
+                if (sleStatus.isDelete)
                 {
                     JLOG(j.fatal()) << "Invariant failed: domain object "
                                        "deleted by PermissionedDomainSet";
@@ -145,7 +145,7 @@ ValidPermissionedDomain::finalize(
                     return false;
                 }
 
-                if (!sleStatus_[0].isDelete_)
+                if (!sleStatus_[0].isDelete)
                 {
                     JLOG(j.fatal()) << "Invariant failed: domain object "
                                        "modified, but not deleted by "
diff --git a/src/libxrpl/tx/invariants/VaultInvariant.cpp b/src/libxrpl/tx/invariants/VaultInvariant.cpp
index c0d082e14e..0dad8c18a0 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(maxMPTokenAmount);
+    self.sharesMaximum = from[~sfMaximumAmount].value_or(kMAX_MP_TOKEN_AMOUNT);
     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 = numZero, .scale = std::nullopt};
+    DeltaInfo balanceDelta{.delta = kNUM_ZERO, .scale = std::nullopt};
 
     std::int8_t sign = 0;
     if (before)
@@ -201,7 +201,7 @@ ValidVault::finalize(
 
     if (afterVault_.empty() && beforeVault_.empty())
     {
-        if (hasPrivilege(tx, mustModifyVault))
+        if (hasPrivilege(tx, MustModifyVault))
         {
             JLOG(j.fatal()) <<  //
                 "Invariant failed: vault operation succeeded without modifying "
@@ -212,7 +212,7 @@ ValidVault::finalize(
 
         return true;  // Not a vault operation
     }
-    if (!(hasPrivilege(tx, mustModifyVault) || hasPrivilege(tx, mayModifyVault)))
+    if (!(hasPrivilege(tx, MustModifyVault) || hasPrivilege(tx, MayModifyVault)))
     {
         JLOG(j.fatal()) <<  //
             "Invariant failed: vault updated by a wrong transaction type";
@@ -279,13 +279,13 @@ ValidVault::finalize(
                                "shares outstanding";
             result = false;
         }
-        if (beforeVault.assetsTotal != zero)
+        if (beforeVault.assetsTotal != kZERO)
         {
             JLOG(j.fatal()) << "Invariant failed: deleted vault must have no "
                                "assets outstanding";
             result = false;
         }
-        if (beforeVault.assetsAvailable != zero)
+        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 != zero)
+        if (afterVault.assetsTotal != kZERO)
         {
             JLOG(j.fatal()) << "Invariant failed: updated zero sized "
                                "vault must have no assets outstanding";
             result = false;
         }
-        if (afterVault.assetsAvailable != zero)
+        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 < zero)
+    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 < zero)
+    if (afterVault.assetsTotal < kZERO)
     {
         JLOG(j.fatal()) << "Invariant failed: assets outstanding must be positive";
         result = false;
     }
 
-    if (afterVault.assetsMaximum < zero)
+    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 == zero)
+        if (ret->delta == kZERO)
             return std::nullopt;
 
         return ret;
@@ -519,8 +519,8 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (afterVault.assetsAvailable != zero || afterVault.assetsTotal != zero ||
-                    afterVault.lossUnrealized != zero || 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 > zero &&
+                if (afterVault.assetsMaximum > kZERO &&
                     afterVault.assetsTotal > afterVault.assetsMaximum)
                 {
                     JLOG(j.fatal()) <<  //
@@ -652,7 +652,7 @@ ValidVault::finalize(
                     result = false;
                 }
 
-                if (vaultDeltaAssets <= zero)
+                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 >= zero)
+                    if (accountDeltaAssets >= kZERO)
                     {
                         JLOG(j.fatal()) <<  //
                             "Invariant failed: deposit must decrease depositor "
@@ -702,7 +702,7 @@ ValidVault::finalize(
                     }
                 }
 
-                if (afterVault.assetsMaximum > zero &&
+                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 <= zero)
+                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 == zero)
+                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 >= zero)
+                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 <= zero)
+                    if (roundedDestinationDelta <= kZERO)
                     {
                         JLOG(j.fatal()) <<  //
                             "Invariant failed: withdrawal must increase "
@@ -870,7 +870,7 @@ ValidVault::finalize(
                     return false;
                 }
 
-                if (accountDeltaShares->delta >= zero)
+                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 == zero)
+                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 >= zero)
+                    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 >= zero)
+                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 == zero)
+                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::cMaxOffset);
+    return max->scale.value_or(STAmount::kMAX_OFFSET);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/tx/paths/AMMLiquidity.cpp b/src/libxrpl/tx/paths/AMMLiquidity.cpp
index 0a4cfadb69..87eb29f104 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::zero || amountOut < beast::zero)
+    if (amountIn < beast::kZERO || amountOut < beast::kZERO)
         Throw<std::runtime_error>("AMMLiquidity: invalid balances");
 
     return TAmounts{get<TIn>(amountIn), get<TOut>(amountOut)};
@@ -68,17 +68,19 @@ AMMLiquidity<TIn, TOut>::generateFibSeqOffer(TAmounts<TIn, TOut> const& balances
 
     cur.in = toAmount<TIn>(
         getAsset(balances.in),
-        InitialFibSeqPct * initialBalances_.in,
-        Number::rounding_mode::upward);
+        kINITIAL_FIB_SEQ_PCT * initialBalances_.in,
+        Number::RoundingMode::Upward);
     cur.out = swapAssetIn(initialBalances_, cur.in, tradingFee_);
 
     if (ammContext_.curIters() == 0)
         return cur;
 
-    constexpr std::uint32_t fib[AMMContext::MaxIterations] = {
-        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};
+    // clang-format off
+    constexpr std::uint32_t kFIB[AMMContext::kMAX_ITERATIONS] = {
+        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};
+    // clang-format on
 
     XRPL_ASSERT(
         !ammContext_.maxItersReached(),
@@ -86,8 +88,8 @@ AMMLiquidity<TIn, TOut>::generateFibSeqOffer(TAmounts<TIn, TOut> const& balances
 
     cur.out = toAmount<TOut>(
         getAsset(balances.out),
-        cur.out * fib[ammContext_.curIters() - 1],
-        Number::rounding_mode::downward);
+        cur.out * kFIB[ammContext_.curIters() - 1],
+        Number::RoundingMode::Downward);
     // swapAssetOut() returns negative in this case
     if (cur.out >= balances.out)
         Throw<std::overflow_error>("AMMLiquidity: generateFibSeqOffer exceeds the balance");
@@ -104,19 +106,19 @@ maxAmount()
 {
     if constexpr (std::is_same_v<T, XRPAmount>)
     {
-        return XRPAmount(STAmount::cMaxNative);
+        return XRPAmount(STAmount::kMAX_NATIVE);
     }
     else if constexpr (std::is_same_v<T, IOUAmount>)
     {
-        return IOUAmount(STAmount::cMaxValue / 2, STAmount::cMaxOffset);
+        return IOUAmount(STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET);
     }
     else if constexpr (std::is_same_v<T, STAmount>)
     {
-        return STAmount(STAmount::cMaxValue / 2, STAmount::cMaxOffset);
+        return STAmount(STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET);
     }
     else if constexpr (std::is_same_v<T, MPTAmount>)
     {
-        return MPTAmount(maxMPTokenAmount);
+        return MPTAmount(kMAX_MP_TOKEN_AMOUNT);
     }
 }
 
@@ -125,7 +127,7 @@ T
 maxOut(T const& out, Asset const& asset)
 {
     Number const res = out * Number{99, -2};
-    return toAmount<T>(asset, res, Number::rounding_mode::downward);
+    return toAmount<T>(asset, res, Number::RoundingMode::Downward);
 }
 }  // namespace
 
@@ -161,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::zero || balances.out == beast::zero)
+    if (balances.in == beast::kZERO || balances.out == beast::kZERO)
     {
         JLOG(j_.debug()) << "AMMLiquidity::getOffer, frozen accounts";
         return std::nullopt;
@@ -237,7 +239,7 @@ AMMLiquidity<TIn, TOut>::getOffer(ReadView const& view, std::optional<Quality> c
 
     if (offer)
     {
-        if (offer->amount().in > beast::zero && offer->amount().out > beast::zero)
+        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/AMMOffer.cpp b/src/libxrpl/tx/paths/AMMOffer.cpp
index 0a41411492..3a7bd8f1df 100644
--- a/src/libxrpl/tx/paths/AMMOffer.cpp
+++ b/src/libxrpl/tx/paths/AMMOffer.cpp
@@ -94,7 +94,7 @@ AMMOffer<TIn, TOut>::limitOut(
     {
         // It turns out that the ceil_out implementation has some slop in
         // it, which ceil_out_strict removes.
-        return quality().ceil_out_strict(offerAmount, limit, roundUp);
+        return quality().ceilOutStrict(offerAmount, limit, roundUp);
     }
     // Change the offer size according to the conservation function. The offer
     // quality is increased in this case, but it doesn't matter since there is
@@ -112,9 +112,9 @@ AMMOffer<TIn, TOut>::limitIn(TAmounts<TIn, TOut> const& offerAmount, TIn const&
     {
         if (auto const& rules = getCurrentTransactionRules();
             rules && rules->enabled(fixReducedOffersV2))
-            return quality().ceil_in_strict(offerAmount, limit, roundUp);
+            return quality().ceilInStrict(offerAmount, limit, roundUp);
 
-        return quality().ceil_in(offerAmount, limit);
+        return quality().ceilIn(offerAmount, limit);
     }
     return {limit, swapAssetIn(balances_, limit, ammLiquidity_.tradingFee())};
 }
diff --git a/src/libxrpl/tx/paths/BookStep.cpp b/src/libxrpl/tx/paths/BookStep.cpp
index 480a702dc9..113155e530 100644
--- a/src/libxrpl/tx/paths/BookStep.cpp
+++ b/src/libxrpl/tx/paths/BookStep.cpp
@@ -55,9 +55,9 @@ template <class TIn, class TOut, class TDerived>
 class BookStep : public StepImp<TIn, TOut, BookStep<TIn, TOut, TDerived>>
 {
 protected:
-    enum class OfferType { AMM, CLOB };
+    enum class OfferType { Amm, Clob };
 
-    static constexpr uint32_t MaxOffersToConsume{1000};
+    static constexpr uint32_t kMAX_OFFERS_TO_CONSUME{1000};
     Book book_;
     AccountID strandSrc_;
     AccountID strandDst_;
@@ -86,7 +86,7 @@ protected:
         TIn in;
         TOut out;
 
-        Cache(TIn const& in_, TOut const& out_) : in(in_), out(out_)
+        Cache(TIn const& in, TOut const& out) : in(in), out(out)
         {
         }
     };
@@ -104,7 +104,7 @@ private:
         , strandDeliver_(ctx.strandDeliver)
     {
         if (auto const ammSle = ctx.view.read(keylet::amm(in, out));
-            ammSle && ammSle->getFieldAmount(sfLPTokenBalance) != beast::zero)
+            ammSle && ammSle->getFieldAmount(sfLPTokenBalance) != beast::kZERO)
         {
             ammLiquidity_.emplace(
                 ctx.view,
@@ -143,7 +143,7 @@ public:
     [[nodiscard]] DebtDirection
     debtDirection(ReadView const& sb, StrandDirection dir) const override
     {
-        return ownerPaysTransferFee_ ? DebtDirection::issues : DebtDirection::redeems;
+        return ownerPaysTransferFee_ ? DebtDirection::Issues : DebtDirection::Redeems;
     }
 
     [[nodiscard]] std::optional<Book>
@@ -350,15 +350,15 @@ 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_) : parityRate;
+            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kPARITY_RATE;
         // 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_)
-            : parityRate;
+            : kPARITY_RATE;
 
         Quality const q1{getRate(STAmount(trOut.value), STAmount(trIn.value))};
-        return composed_quality(q1, ofrQ);
+        return composedQuality(q1, ofrQ);
     }
 
     [[nodiscard]] std::string
@@ -530,19 +530,19 @@ public:
         {
             return ofrQ;
         }
-        if (offerType == OfferType::CLOB ||
+        if (offerType == OfferType::Clob ||
             (this->ammLiquidity_ && this->ammLiquidity_->multiPath()))
         {
             return ofrQ;
         }
 
         auto const trIn =
-            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : parityRate;
+            redeems(prevStepDir) ? this->rate(v, this->book_.in, this->strandDst_) : kPARITY_RATE;
         // AMM doesn't pay the transfer fee on the out amount
-        auto const trOut = parityRate;
+        auto const trOut = kPARITY_RATE;
 
         Quality const q1{getRate(STAmount(trOut.value), STAmount(trIn.value))};
-        return composed_quality(q1, ofrQ);
+        return composedQuality(q1, ofrQ);
     }
 
     [[nodiscard]] std::string
@@ -571,13 +571,13 @@ template <class TIn, class TOut, class TDerived>
 std::pair<std::optional<Quality>, DebtDirection>
 BookStep<TIn, TOut, TDerived>::qualityUpperBound(ReadView const& v, DebtDirection prevStepDir) const
 {
-    auto const dir = this->debtDirection(v, StrandDirection::forward);
+    auto const dir = this->debtDirection(v, StrandDirection::Forward);
 
     std::optional<std::pair<Quality, OfferType>> const res = tipOfferQuality(v);
     if (!res)
         return {std::nullopt, dir};
 
-    auto const waiveFee = (std::get<OfferType>(*res) == OfferType::AMM) ? WaiveTransferFee::Yes
+    auto const waiveFee = (std::get<OfferType>(*res) == OfferType::Amm) ? WaiveTransferFee::Yes
                                                                         : WaiveTransferFee::No;
 
     Quality const q = static_cast<TDerived const*>(this)->adjustQualityWithFees(
@@ -589,7 +589,7 @@ template <class TIn, class TOut, class TDerived>
 std::pair<std::optional<QualityFunction>, DebtDirection>
 BookStep<TIn, TOut, TDerived>::getQualityFunc(ReadView const& v, DebtDirection prevStepDir) const
 {
-    auto const dir = this->debtDirection(v, StrandDirection::forward);
+    auto const dir = this->debtDirection(v, StrandDirection::Forward);
 
     std::optional<QualityFunction> const res = tipOfferQualityF(v);
     if (!res)
@@ -598,10 +598,10 @@ BookStep<TIn, TOut, TDerived>::getQualityFunc(ReadView const& v, DebtDirection p
     // AMM
     if (!res->isConst())
     {
-        auto static const qOne = Quality{STAmount::uRateOne};
+        auto static const kQ_ONE = Quality{STAmount::kU_RATE_ONE};
         auto const q = static_cast<TDerived const*>(this)->adjustQualityWithFees(
-            v, qOne, prevStepDir, WaiveTransferFee::Yes, OfferType::AMM, v.rules());
-        if (q == qOne)
+            v, kQ_ONE, prevStepDir, WaiveTransferFee::Yes, OfferType::Amm, v.rules());
+        if (q == kQ_ONE)
             return {res, dir};
         QualityFunction qf{q, QualityFunction::CLOBLikeTag{}};
         qf.combine(*res);
@@ -615,7 +615,7 @@ BookStep<TIn, TOut, TDerived>::getQualityFunc(ReadView const& v, DebtDirection p
                             // always has quality set
         prevStepDir,
         WaiveTransferFee::No,
-        OfferType::CLOB,
+        OfferType::Clob,
         v.rules());
     return {QualityFunction{q, QualityFunction::CLOBLikeTag{}}, dir};
 }
@@ -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(MaxOffersToConsume, j_);
+    typename FlowOfferStream<TIn, TOut>::StepCounter counter(kMAX_OFFERS_TO_CONSUME, j_);
 
     FlowOfferStream<TIn, TOut> offers(sb, afView, book_, sb.parentCloseTime(), counter, j_);
 
@@ -802,8 +802,8 @@ BookStep<TIn, TOut, TDerived>::forEachOffer(
                 sb,
                 issuer,
                 assetIn,  // STAmount{0}, but the default is not used
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 j_));
             if (stpAmt.in > available)
             {
@@ -915,7 +915,7 @@ std::optional<std::variant<Quality, AMMOffer<TIn, TOut>>>
 BookStep<TIn, TOut, TDerived>::tip(ReadView const& view) const
 {
     // This can be simplified (and sped up) if directories are never empty.
-    Sandbox sb(&view, tapNONE);
+    Sandbox sb(&view, TapNone);
     BookTip bt(sb, book_);
     auto const lobQuality = bt.step(j_) ? std::optional<Quality>(bt.quality()) : std::nullopt;
     // Multi-path offer generates an offer with the quality
@@ -960,10 +960,10 @@ BookStep<TIn, TOut, TDerived>::tipOfferQuality(ReadView const& view) const
     }
     if (auto const q = std::get_if<Quality>(&(*res)))
     {
-        return std::make_pair(*q, OfferType::CLOB);
+        return std::make_pair(*q, OfferType::Clob);
     }
 
-    return std::make_pair(std::get<AMMOffer<TIn, TOut>>(*res).quality(), OfferType::AMM);
+    return std::make_pair(std::get<AMMOffer<TIn, TOut>>(*res).quality(), OfferType::Amm);
 }
 
 template <class TIn, class TOut, class TDerived>
@@ -989,7 +989,7 @@ sum(TCollection const& col)
 {
     using TResult = std::decay_t<decltype(*col.begin())>;
     if (col.empty())
-        return TResult{beast::zero};
+        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::zero, beast::zero);
+    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::zero)
+        if (remainingOut <= beast::kZERO)
             return false;
 
         if (stpAmt.out <= remainingOut)
@@ -1048,7 +1048,7 @@ BookStep<TIn, TOut, TDerived>::revImp(
             transferRateIn,
             transferRateOut,
             remainingOut);
-        remainingOut = beast::zero;
+        remainingOut = beast::kZERO;
         savedIns.insert(stpAdjAmt.in);
         savedOuts.insert(remainingOut);
         result.in = sum(savedIns);
@@ -1060,23 +1060,23 @@ BookStep<TIn, TOut, TDerived>::revImp(
         // will still be funded after consuming remainingOut but that is
         // not always the case.  If the mantissas of two IOU amounts differ
         // by less than ten, then subtracting them leaves a zero.
-        return offer.fully_consumed();
+        return offer.fullyConsumed();
     };
 
     {
         auto const prevStepDebtDir = [&] {
             if (prevStep_)
-                return prevStep_->debtDirection(sb, StrandDirection::reverse);
-            return DebtDirection::issues;
+                return prevStep_->debtDirection(sb, StrandDirection::Reverse);
+            return DebtDirection::Issues;
         }();
         auto const r = forEachOffer(sb, afView, prevStepDebtDir, eachOffer);
         boost::container::flat_set<uint256> const toRm = std::move(std::get<0>(r));
         std::uint32_t const offersConsumed = std::get<1>(r);
         offersUsed_ = offersConsumed;
-        SetUnion(ofrsToRm, toRm);
+        setUnion(ofrsToRm, toRm);
 
         // Too many iterations, mark this strand as inactive
-        if (offersConsumed >= MaxOffersToConsume)
+        if (offersConsumed >= kMAX_OFFERS_TO_CONSUME)
         {
             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::zero, beast::zero);
-            return {beast::zero, beast::zero};
+            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::zero, beast::zero);
+    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::zero)
+        if (remainingIn <= beast::kZERO)
             return false;
 
         bool processMore = true;
@@ -1222,23 +1222,23 @@ BookStep<TIn, TOut, TDerived>::fwdImp(
         // subtracting them leaves a result of zero. This can cause the check
         // for (stpAmt.in > remainingIn) to incorrectly think an offer will be
         // funded after subtracting remainingIn.
-        return processMore || offer.fully_consumed();
+        return processMore || offer.fullyConsumed();
     };
 
     {
         auto const prevStepDebtDir = [&] {
             if (prevStep_)
-                return prevStep_->debtDirection(sb, StrandDirection::forward);
-            return DebtDirection::issues;
+                return prevStep_->debtDirection(sb, StrandDirection::Forward);
+            return DebtDirection::Issues;
         }();
         auto const r = forEachOffer(sb, afView, prevStepDebtDir, eachOffer);
         boost::container::flat_set<uint256> const toRm = std::move(std::get<0>(r));
         std::uint32_t const offersConsumed = std::get<1>(r);
         offersUsed_ = offersConsumed;
-        SetUnion(ofrsToRm, toRm);
+        setUnion(ofrsToRm, toRm);
 
         // Too many iterations, mark this strand as inactive (dry)
-        if (offersConsumed >= MaxOffersToConsume)
+        if (offersConsumed >= kMAX_OFFERS_TO_CONSUME)
         {
             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::zero, beast::zero);
-            return {beast::zero, beast::zero};
+            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::zero))};
+        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::zero))};
+        return {false, EitherAmount(TOut(beast::kZERO))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
@@ -1387,7 +1387,7 @@ BookStep<TIn, TOut, TDerived>::rate(
 {
     auto const& issuer = asset.getIssuer();
     if (isXRP(issuer) || issuer == dstAccount)
-        return parityRate;
+        return kPARITY_RATE;
     return asset.visit(
         [&](Issue const&) { return transferRate(view, issuer); },
         [&](MPTIssue const& issue) { return transferRate(view, issue.getMptID()); });
@@ -1488,11 +1488,11 @@ bookStepEqual(Step const& step, xrpl::Book const& book)
 
 template <class TIn, class TOut>
 static std::pair<TER, std::unique_ptr<Step>>
-make_BookStepHelper(StrandContext const& ctx, Asset const& in, Asset const& out)
+makeBookStepHelper(StrandContext const& ctx, Asset const& in, Asset const& out)
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != OfferCrossing::no)
+    if (ctx.offerCrossing != OfferCrossing::No)
     {
         auto offerCrossingStep = std::make_unique<BookOfferCrossingStep<TIn, TOut>>(ctx, in, out);
         ter = offerCrossingStep->check(ctx);
@@ -1511,52 +1511,52 @@ make_BookStepHelper(StrandContext const& ctx, Asset const& in, Asset const& out)
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepII(StrandContext const& ctx, Issue const& in, Issue const& out)
+makeBookStepIi(StrandContext const& ctx, Issue const& in, Issue const& out)
 {
-    return make_BookStepHelper<IOUAmount, IOUAmount>(ctx, in, out);
+    return makeBookStepHelper<IOUAmount, IOUAmount>(ctx, in, out);
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepIX(StrandContext const& ctx, Issue const& in)
+makeBookStepIx(StrandContext const& ctx, Issue const& in)
 {
-    return make_BookStepHelper<IOUAmount, XRPAmount>(ctx, in, xrpIssue());
+    return makeBookStepHelper<IOUAmount, XRPAmount>(ctx, in, xrpIssue());
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepXI(StrandContext const& ctx, Issue const& out)
+makeBookStepXi(StrandContext const& ctx, Issue const& out)
 {
-    return make_BookStepHelper<XRPAmount, IOUAmount>(ctx, xrpIssue(), out);
+    return makeBookStepHelper<XRPAmount, IOUAmount>(ctx, xrpIssue(), out);
 }
 
 // MPT's
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMM(StrandContext const& ctx, MPTIssue const& in, MPTIssue const& out)
+makeBookStepMm(StrandContext const& ctx, MPTIssue const& in, MPTIssue const& out)
 {
-    return make_BookStepHelper<MPTAmount, MPTAmount>(ctx, in, out);
+    return makeBookStepHelper<MPTAmount, MPTAmount>(ctx, in, out);
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMI(StrandContext const& ctx, MPTIssue const& in, Issue const& out)
+makeBookStepMi(StrandContext const& ctx, MPTIssue const& in, Issue const& out)
 {
-    return make_BookStepHelper<MPTAmount, IOUAmount>(ctx, in, out);
+    return makeBookStepHelper<MPTAmount, IOUAmount>(ctx, in, out);
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepIM(StrandContext const& ctx, Issue const& in, MPTIssue const& out)
+makeBookStepIm(StrandContext const& ctx, Issue const& in, MPTIssue const& out)
 {
-    return make_BookStepHelper<IOUAmount, MPTAmount>(ctx, in, out);
+    return makeBookStepHelper<IOUAmount, MPTAmount>(ctx, in, out);
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepMX(StrandContext const& ctx, MPTIssue const& in)
+makeBookStepMx(StrandContext const& ctx, MPTIssue const& in)
 {
-    return make_BookStepHelper<MPTAmount, XRPAmount>(ctx, in, xrpIssue());
+    return makeBookStepHelper<MPTAmount, XRPAmount>(ctx, in, xrpIssue());
 }
 
 std::pair<TER, std::unique_ptr<Step>>
-make_BookStepXM(StrandContext const& ctx, MPTIssue const& out)
+makeBookStepXm(StrandContext const& ctx, MPTIssue const& out)
 {
-    return make_BookStepHelper<XRPAmount, MPTAmount>(ctx, xrpIssue(), out);
+    return makeBookStepHelper<XRPAmount, MPTAmount>(ctx, xrpIssue(), out);
 }
 
 }  // namespace xrpl
diff --git a/src/libxrpl/tx/paths/BookTip.cpp b/src/libxrpl/tx/paths/BookTip.cpp
index 7c6dd85ee3..5be512aa84 100644
--- a/src/libxrpl/tx/paths/BookTip.cpp
+++ b/src/libxrpl/tx/paths/BookTip.cpp
@@ -13,19 +13,19 @@
 namespace xrpl {
 
 BookTip::BookTip(ApplyView& view, Book const& book)
-    : view_(view), m_book(getBookBase(book)), m_end(getQualityNext(m_book))
+    : view_(view), book_(getBookBase(book)), end_(getQualityNext(book_))
 {
 }
 
 bool
 BookTip::step(beast::Journal j)
 {
-    if (m_valid)
+    if (valid_)
     {
-        if (m_entry)
+        if (entry_)
         {
-            offerDelete(view_, m_entry, j);
-            m_entry = nullptr;
+            offerDelete(view_, entry_, j);
+            entry_ = nullptr;
         }
     }
 
@@ -34,33 +34,33 @@ BookTip::step(beast::Journal j)
         // See if there's an entry at or worse than current quality. Notice
         // that the quality is encoded only in the index of the first page
         // of a directory.
-        auto const first_page = view_.succ(m_book, m_end);
+        auto const firstPage = view_.succ(book_, end_);
 
-        if (!first_page)
+        if (!firstPage)
             return false;
 
         unsigned int di = 0;
         std::shared_ptr<SLE> dir;
 
-        if (dirFirst(view_, *first_page, dir, di, m_index))
+        if (dirFirst(view_, *firstPage, dir, di, index_))
         {
-            m_dir = dir->key();
-            m_entry = view_.peek(keylet::offer(m_index));
-            m_quality = Quality(getQuality(*first_page));
-            m_valid = true;
+            dir_ = dir->key();
+            entry_ = view_.peek(keylet::offer(index_));
+            quality_ = Quality(getQuality(*firstPage));
+            valid_ = true;
 
             // Next query should start before this directory
-            m_book = *first_page;
+            book_ = *firstPage;
 
             // The quality immediately before the next quality
-            --m_book;
+            --book_;
 
             break;
         }
 
         // There should never be an empty directory but just in case,
         // we handle that case by advancing to the next directory.
-        m_book = *first_page;
+        book_ = *firstPage;
     }
 
     return true;
diff --git a/src/libxrpl/tx/paths/DirectStep.cpp b/src/libxrpl/tx/paths/DirectStep.cpp
index c2ad818b73..7373f8a341 100644
--- a/src/libxrpl/tx/paths/DirectStep.cpp
+++ b/src/libxrpl/tx/paths/DirectStep.cpp
@@ -55,11 +55,11 @@ protected:
         DebtDirection srcDebtDir;
 
         Cache(
-            IOUAmount const& in_,
-            IOUAmount const& srcToDst_,
-            IOUAmount const& out_,
-            DebtDirection srcDebtDir_)
-            : in(in_), srcToDst(srcToDst_), out(out_), srcDebtDir(srcDebtDir_)
+            IOUAmount const& in,
+            IOUAmount const& srcToDst,
+            IOUAmount const& out,
+            DebtDirection srcDebtDir)
+            : in(in), srcToDst(srcToDst), out(out), srcDebtDir(srcDebtDir)
         {
         }
     };
@@ -350,7 +350,7 @@ DirectIPaymentStep::quality(ReadView const& sb, QualityDirection qDir) const
         return QUALITY_ONE;
 
     auto const& field = [&, this]() -> SF_UINT32 const& {
-        if (qDir == QualityDirection::in)
+        if (qDir == QualityDirection::In)
         {
             // compute dst quality in
             if (this->dst_ < this->src_)
@@ -409,7 +409,7 @@ DirectIOfferCrossingStep::maxFlow(ReadView const& sb, IOUAmount const& desired)
     // "dstQIn" is always QUALITY_ONE for offer crossing.
 
     if (isLast_)
-        return {desired, DebtDirection::issues};
+        return {desired, DebtDirection::Issues};
 
     return maxPaymentFlow(sb);
 }
@@ -430,7 +430,7 @@ 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::zero)
+            (((*sleLine)[sfFlags] & authField) == 0u) && (*sleLine)[sfBalance] == beast::kZERO)
         {
             JLOG(j_.debug()) << "DirectStepI: can't receive IOUs from issuer without auth."
                              << " src: " << src_;
@@ -451,7 +451,7 @@ DirectIPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SLE> c
 
     {
         auto const owed = creditBalance(ctx.view, dst_, src_, currency_);
-        if (owed <= beast::zero)
+        if (owed <= beast::kZERO)
         {
             auto const limit = creditLimit(ctx.view, dst_, src_, currency_);
             if (-owed >= limit)
@@ -480,25 +480,24 @@ std::pair<IOUAmount, DebtDirection>
 DirectStepI<TDerived>::maxPaymentFlow(ReadView const& sb) const
 {
     auto const srcOwed = toAmount<IOUAmount>(
-        accountHolds(sb, src_, currency_, dst_, FreezeHandling::fhIGNORE_FREEZE, j_));
+        accountHolds(sb, src_, currency_, dst_, FreezeHandling::IgnoreFreeze, j_));
 
     if (srcOwed.signum() > 0)
-        return {srcOwed, DebtDirection::redeems};
+        return {srcOwed, DebtDirection::Redeems};
 
     // srcOwed is negative or zero
-    return {creditLimit2(sb, dst_, src_, currency_) + srcOwed, DebtDirection::issues};
+    return {creditLimit2(sb, dst_, src_, currency_) + srcOwed, DebtDirection::Issues};
 }
 
 template <class TDerived>
 DebtDirection
 DirectStepI<TDerived>::debtDirection(ReadView const& sb, StrandDirection dir) const
 {
-    if (dir == StrandDirection::forward && cache_)
+    if (dir == StrandDirection::Forward && cache_)
         return cache_->srcDebtDir;
 
-    auto const srcOwed =
-        accountHolds(sb, src_, currency_, dst_, FreezeHandling::fhIGNORE_FREEZE, j_);
-    return srcOwed.signum() > 0 ? DebtDirection::redeems : DebtDirection::issues;
+    auto const srcOwed = accountHolds(sb, src_, currency_, dst_, FreezeHandling::IgnoreFreeze, j_);
+    return srcOwed.signum() > 0 ? DebtDirection::Redeems : DebtDirection::Issues;
 }
 
 template <class TDerived>
@@ -513,7 +512,7 @@ DirectStepI<TDerived>::revImp(
 
     auto const [maxSrcToDst, srcDebtDir] = static_cast<TDerived const*>(this)->maxFlow(sb, out);
 
-    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::reverse);
+    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::Reverse);
     XRPL_ASSERT(
         static_cast<TDerived const*>(this)->verifyDstQualityIn(dstQIn),
         "xrpl::DirectStepI : valid destination quality");
@@ -529,8 +528,8 @@ DirectStepI<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "DirectStepI::rev: dry";
         cache_.emplace(
-            IOUAmount(beast::zero), IOUAmount(beast::zero), IOUAmount(beast::zero), srcDebtDir);
-        return {beast::zero, beast::zero};
+            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);
@@ -629,7 +628,7 @@ DirectStepI<TDerived>::fwdImp(
     auto const [maxSrcToDst, srcDebtDir] =
         static_cast<TDerived const*>(this)->maxFlow(sb, cache_->srcToDst);
 
-    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::forward);
+    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::Forward);
 
     Issue const srcToDstIss(currency_, redeems(srcDebtDir) ? dst_ : src_);
 
@@ -642,8 +641,8 @@ DirectStepI<TDerived>::fwdImp(
     {
         JLOG(j_.trace()) << "DirectStepI::fwd: dry";
         cache_.emplace(
-            IOUAmount(beast::zero), IOUAmount(beast::zero), IOUAmount(beast::zero), srcDebtDir);
-        return {beast::zero, beast::zero};
+            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);
@@ -691,7 +690,7 @@ DirectStepI<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, EitherAmo
     if (!cache_)
     {
         JLOG(j_.trace()) << "Expected valid cache in validFwd";
-        return {false, EitherAmount(IOUAmount(beast::zero))};
+        return {false, EitherAmount(IOUAmount(beast::kZERO))};
     }
 
     auto const savCache = *cache_;
@@ -709,7 +708,7 @@ DirectStepI<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, EitherAmo
     }
     catch (FlowException const&)
     {
-        return {false, EitherAmount(IOUAmount(beast::zero))};
+        return {false, EitherAmount(IOUAmount(beast::kZERO))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
@@ -744,7 +743,7 @@ DirectStepI<TDerived>::qualitiesSrcRedeems(ReadView const& sb) const
         return {QUALITY_ONE, QUALITY_ONE};
 
     auto const prevStepQIn = prevStep_->lineQualityIn(sb);
-    auto srcQOut = static_cast<TDerived const*>(this)->quality(sb, QualityDirection::out);
+    auto srcQOut = static_cast<TDerived const*>(this)->quality(sb, QualityDirection::Out);
 
     if (prevStepQIn > srcQOut)
         srcQOut = prevStepQIn;
@@ -766,7 +765,7 @@ DirectStepI<TDerived>::qualitiesSrcIssues(ReadView const& sb, DebtDirection prev
 
     std::uint32_t const srcQOut =
         redeems(prevStepDebtDirection) ? transferRate(sb, src_).value : QUALITY_ONE;
-    auto dstQIn = static_cast<TDerived const*>(this)->quality(sb, QualityDirection::in);
+    auto dstQIn = static_cast<TDerived const*>(this)->quality(sb, QualityDirection::In);
 
     if (isLast_ && dstQIn > QUALITY_ONE)
         dstQIn = QUALITY_ONE;
@@ -789,7 +788,7 @@ DirectStepI<TDerived>::qualities(
     auto const prevStepDebtDirection = [&] {
         if (prevStep_)
             return prevStep_->debtDirection(sb, strandDir);
-        return DebtDirection::issues;
+        return DebtDirection::Issues;
     }();
     return qualitiesSrcIssues(sb, prevStepDebtDirection);
 }
@@ -799,14 +798,14 @@ std::uint32_t
 DirectStepI<TDerived>::lineQualityIn(ReadView const& v) const
 {
     // dst quality in
-    return static_cast<TDerived const*>(this)->quality(v, QualityDirection::in);
+    return static_cast<TDerived const*>(this)->quality(v, QualityDirection::In);
 }
 
 template <class TDerived>
 std::pair<std::optional<Quality>, DebtDirection>
 DirectStepI<TDerived>::qualityUpperBound(ReadView const& v, DebtDirection prevStepDir) const
 {
-    auto const dir = this->debtDirection(v, StrandDirection::forward);
+    auto const dir = this->debtDirection(v, StrandDirection::Forward);
 
     auto const [srcQOut, dstQIn] =
         redeems(dir) ? qualitiesSrcRedeems(v) : qualitiesSrcIssues(v, prevStepDir);
@@ -923,7 +922,7 @@ directStepEqual(
 //------------------------------------------------------------------------------
 
 std::pair<TER, std::unique_ptr<Step>>
-make_DirectStepI(
+makeDirectStepI(
     StrandContext const& ctx,
     AccountID const& src,
     AccountID const& dst,
@@ -931,7 +930,7 @@ make_DirectStepI(
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != OfferCrossing::no)
+    if (ctx.offerCrossing != OfferCrossing::No)
     {
         auto offerCrossingStep = std::make_unique<DirectIOfferCrossingStep>(ctx, src, dst, c);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/paths/Flow.cpp b/src/libxrpl/tx/paths/Flow.cpp
index 32ca39ec22..39a9e83e69 100644
--- a/src/libxrpl/tx/paths/Flow.cpp
+++ b/src/libxrpl/tx/paths/Flow.cpp
@@ -125,7 +125,7 @@ flow(
     // represented by different types, use templates to tell `flow` about the
     // amount types.
     return std::visit(
-        [&, &strands_ = strands]<typename TIn, typename TOut>(TIn const&, TOut const&) {
+        [&, &strands = strands]<typename TIn, typename TOut>(TIn const&, TOut const&) {
             using TIn_ = typename TIn::amount_type;
             using TOut_ = typename TOut::amount_type;
             return finishFlow(
@@ -134,7 +134,7 @@ flow(
                 dstAsset,
                 flow<TIn_, TOut_>(
                     sb,
-                    strands_,
+                    strands,
                     get<TOut_>(deliver),
                     partialPayment,
                     offerCrossing,
diff --git a/src/libxrpl/tx/paths/MPTEndpointStep.cpp b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
index 3dbc4e30cf..25c9062e47 100644
--- a/src/libxrpl/tx/paths/MPTEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/MPTEndpointStep.cpp
@@ -56,11 +56,11 @@ protected:
         DebtDirection srcDebtDir;
 
         Cache(
-            MPTAmount const& in_,
-            MPTAmount const& srcToDst_,
-            MPTAmount const& out_,
-            DebtDirection srcDebtDir_)
-            : in(in_), srcToDst(srcToDst_), out(out_), srcDebtDir(srcDebtDir_)
+            MPTAmount const& in,
+            MPTAmount const& srcToDst,
+            MPTAmount const& out,
+            DebtDirection srcDebtDir)
+            : in(in), srcToDst(srcToDst), out(out), srcDebtDir(srcDebtDir)
         {
         }
     };
@@ -383,14 +383,9 @@ MPTEndpointPaymentStep::check(StrandContext const& ctx, std::shared_ptr<const SL
     if (prevStep_ == nullptr)
     {
         auto const owed = accountFunds(
-            ctx.view,
-            src_,
-            mptIssue_,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            j_);
+            ctx.view, src_, mptIssue_, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
         // Already at MaximumAmount
-        if (owed <= beast::zero)
+        if (owed <= beast::kZERO)
             return tecPATH_DRY;
     }
 
@@ -430,11 +425,11 @@ std::pair<MPTAmount, DebtDirection>
 MPTEndpointStep<TDerived>::maxPaymentFlow(ReadView const& sb) const
 {
     auto const maxFlow = accountFunds(
-        sb, src_, mptIssue_, FreezeHandling::fhIGNORE_FREEZE, AuthHandling::ahIGNORE_AUTH, j_);
+        sb, src_, mptIssue_, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
 
     // From a holder to an issuer
     if (src_ != mptIssue_.getIssuer())
-        return {toAmount<MPTAmount>(maxFlow), DebtDirection::redeems};
+        return {toAmount<MPTAmount>(maxFlow), DebtDirection::Redeems};
 
     // From an issuer to a holder
     if (auto const sle = sb.read(keylet::mptIssuance(mptIssue_)))
@@ -442,7 +437,7 @@ MPTEndpointStep<TDerived>::maxPaymentFlow(ReadView const& sb) const
         // If issuer is the source account, and it is direct payment then
         // MPTEndpointStep is the only step. Provide available maxFlow.
         if (prevStep_ == nullptr)
-            return {toAmount<MPTAmount>(maxFlow), DebtDirection::issues};
+            return {toAmount<MPTAmount>(maxFlow), DebtDirection::Issues};
 
         // MPTEndpointStep is the last step. It's always issuing in
         // this case. Can't infer at this point what the maxFlow is, because
@@ -450,20 +445,20 @@ MPTEndpointStep<TDerived>::maxPaymentFlow(ReadView const& sb) const
         // to temporarily overflow. Let the previous step figure out how
         // to limit the flow.
         std::int64_t const maxAmount = maxMPTAmount(*sle);
-        return {MPTAmount{maxAmount}, DebtDirection::issues};
+        return {MPTAmount{maxAmount}, DebtDirection::Issues};
     }
 
-    return {MPTAmount{0}, DebtDirection::issues};
+    return {MPTAmount{0}, DebtDirection::Issues};
 }
 
 template <class TDerived>
 DebtDirection
 MPTEndpointStep<TDerived>::debtDirection(ReadView const& sb, StrandDirection dir) const
 {
-    if (dir == StrandDirection::forward && cache_)
+    if (dir == StrandDirection::Forward && cache_)
         return cache_->srcDebtDir;
 
-    return (src_ == mptIssue_.getIssuer()) ? DebtDirection::issues : DebtDirection::redeems;
+    return (src_ == mptIssue_.getIssuer()) ? DebtDirection::Issues : DebtDirection::Redeems;
 }
 
 template <class TDerived>
@@ -478,7 +473,7 @@ MPTEndpointStep<TDerived>::revImp(
 
     auto const [maxSrcToDst, srcDebtDir] = static_cast<TDerived const*>(this)->maxPaymentFlow(sb);
 
-    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::reverse);
+    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::Reverse);
     (void)dstQIn;
 
     MPTIssue const srcToDstIss(mptIssue_);
@@ -492,12 +487,12 @@ MPTEndpointStep<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::rev: dry";
         resetCache(srcDebtDir);
-        return {beast::zero, beast::zero};
+        return {beast::kZERO, beast::kZERO};
     }
 
     if (auto const err = static_cast<TDerived*>(this)->checkCreateMPT(sb, srcDebtDir);
         !isTesSuccess(err))
-        return {beast::zero, beast::zero};
+        return {beast::kZERO, beast::kZERO};
 
     // Don't have to factor in dstQIn since it is always QUALITY_ONE
     MPTAmount const srcToDst = out;
@@ -517,7 +512,7 @@ MPTEndpointStep<TDerived>::revImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::rev: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::zero, beast::zero};
+            return {beast::kZERO, beast::kZERO};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::rev: Non-limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -542,7 +537,7 @@ MPTEndpointStep<TDerived>::revImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::rev: error " << ter;
         resetCache(srcDebtDir);
-        return {beast::zero, beast::zero};
+        return {beast::kZERO, beast::kZERO};
     }
     JLOG(j_.trace()) << "MPTEndpointStep::rev: Limiting"
                      << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -609,7 +604,7 @@ MPTEndpointStep<TDerived>::fwdImp(
 
     auto const [maxSrcToDst, srcDebtDir] = static_cast<TDerived const*>(this)->maxPaymentFlow(sb);
 
-    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::forward);
+    auto const [srcQOut, dstQIn] = qualities(sb, srcDebtDir, StrandDirection::Forward);
     (void)dstQIn;
 
     MPTIssue const srcToDstIss(mptIssue_);
@@ -623,12 +618,12 @@ MPTEndpointStep<TDerived>::fwdImp(
     {
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: dry";
         resetCache(srcDebtDir);
-        return {beast::zero, beast::zero};
+        return {beast::kZERO, beast::kZERO};
     }
 
     if (auto const err = static_cast<TDerived*>(this)->checkCreateMPT(sb, srcDebtDir);
         !isTesSuccess(err))
-        return {beast::zero, beast::zero};
+        return {beast::kZERO, beast::kZERO};
 
     MPTAmount const srcToDst = mulRatio(in, QUALITY_ONE, srcQOut, /*roundUp*/ false);
 
@@ -648,7 +643,7 @@ MPTEndpointStep<TDerived>::fwdImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::fwd: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::zero, beast::zero};
+            return {beast::kZERO, beast::kZERO};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: Non-limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(in)
@@ -672,7 +667,7 @@ MPTEndpointStep<TDerived>::fwdImp(
         {
             JLOG(j_.trace()) << "MPTEndpointStep::fwd: error " << ter;
             resetCache(srcDebtDir);
-            return {beast::zero, beast::zero};
+            return {beast::kZERO, beast::kZERO};
         }
         JLOG(j_.trace()) << "MPTEndpointStep::fwd: Limiting"
                          << " srcRedeems: " << redeems(srcDebtDir) << " in: " << to_string(actualIn)
@@ -689,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::zero))};
+        return {false, EitherAmount(MPTAmount(beast::kZERO))};
     }
 
     auto const savCache = *cache_;
@@ -706,7 +701,7 @@ MPTEndpointStep<TDerived>::validFwd(PaymentSandbox& sb, ApplyView& afView, Eithe
     }
     catch (FlowException const&)
     {
-        return {false, EitherAmount(MPTAmount(beast::zero))};
+        return {false, EitherAmount(MPTAmount(beast::kZERO))};
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) fwdImp sets cache_ on success
@@ -785,7 +780,7 @@ MPTEndpointStep<TDerived>::qualities(
     auto const prevStepDebtDirection = [&] {
         if (prevStep_ != nullptr)
             return prevStep_->debtDirection(sb, strandDir);
-        return DebtDirection::issues;
+        return DebtDirection::Issues;
     }();
     return qualitiesSrcIssues(sb, prevStepDebtDirection);
 }
@@ -802,7 +797,7 @@ template <class TDerived>
 std::pair<std::optional<Quality>, DebtDirection>
 MPTEndpointStep<TDerived>::qualityUpperBound(ReadView const& v, DebtDirection prevStepDir) const
 {
-    auto const dir = this->debtDirection(v, StrandDirection::forward);
+    auto const dir = this->debtDirection(v, StrandDirection::Forward);
 
     auto const [srcQOut, dstQIn] =
         redeems(dir) ? qualitiesSrcRedeems(v) : qualitiesSrcIssues(v, prevStepDir);
@@ -898,13 +893,13 @@ template <class TDerived>
 void
 MPTEndpointStep<TDerived>::resetCache(xrpl::DebtDirection dir)
 {
-    cache_.emplace(MPTAmount(beast::zero), MPTAmount(beast::zero), MPTAmount(beast::zero), dir);
+    cache_.emplace(MPTAmount(beast::kZERO), MPTAmount(beast::kZERO), MPTAmount(beast::kZERO), dir);
 }
 
 //------------------------------------------------------------------------------
 
 std::pair<TER, std::unique_ptr<Step>>
-make_MPTEndpointStep(
+makeMptEndpointStep(
     StrandContext const& ctx,
     AccountID const& src,
     AccountID const& dst,
@@ -912,7 +907,7 @@ make_MPTEndpointStep(
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != OfferCrossing::no)
+    if (ctx.offerCrossing != OfferCrossing::No)
     {
         auto offerCrossingStep = std::make_unique<MPTEndpointOfferCrossingStep>(ctx, src, dst, mpt);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/paths/OfferStream.cpp b/src/libxrpl/tx/paths/OfferStream.cpp
index 67f9a294b7..b5ac45503a 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 inIsXRP = std::is_same_v<TTakerPays, XRPAmount>;
-    constexpr bool const outIsXRP = std::is_same_v<TTakerGets, XRPAmount>;
+    constexpr bool const kIN_IS_XRP = std::is_same_v<TTakerPays, XRPAmount>;
+    constexpr bool const kOUT_IS_XRP = std::is_same_v<TTakerGets, XRPAmount>;
 
-    if constexpr (outIsXRP)
+    if constexpr (kOUT_IS_XRP)
     {
         // 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 (!inIsXRP && !outIsXRP)
+    if constexpr (!kIN_IS_XRP && !kOUT_IS_XRP)
     {
         if (Number(ofrAmts.in) >= Number(ofrAmts.out))
             return false;
@@ -171,7 +171,7 @@ TOfferStreamBase<TIn, TOut>::shouldRmSmallIncreasedQOffer() const
             //
             // It turns out we can prevent order book blocking by rounding down
             // the ceil_out() result.
-            return offer_.quality().ceil_out_strict(ofrAmts, ownerFunds, /* roundUp */ false);
+            return offer_.quality().ceilOutStrict(ofrAmts, ownerFunds, /* roundUp */ false);
         }
         return ofrAmts;
     }();
@@ -266,26 +266,26 @@ TOfferStreamBase<TIn, TOut>::step()
             offer_.owner(),
             amount.out,
             offer_.assetOut(),
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             j_);
 
         // Check for unfunded offer
-        if (*ownerFunds_ <= beast::zero)
+        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
             // offer is "found unfunded" versus "became unfunded"
-            auto const original_funds = accountFundsHelper(
+            auto const originalFunds = accountFundsHelper(
                 cancelView_,
                 offer_.owner(),
                 amount.out,
                 offer_.assetOut(),
-                FreezeHandling::fhZERO_IF_FROZEN,
-                AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::ZeroIfFrozen,
+                AuthHandling::ZeroIfUnauthorized,
                 j_);
 
-            if (original_funds == *ownerFunds_)
+            if (originalFunds == *ownerFunds_)
             {
                 permRmOffer(entry->key());
                 JLOG(j_.trace()) << "Removing unfunded offer " << entry->key();
@@ -301,16 +301,16 @@ TOfferStreamBase<TIn, TOut>::step()
 
         if (shouldRmSmallIncreasedQOffer<TIn, TOut>())
         {
-            auto const original_funds = accountFundsHelper(
+            auto const originalFunds = accountFundsHelper(
                 cancelView_,
                 offer_.owner(),
                 amount.out,
                 offer_.assetOut(),
-                FreezeHandling::fhZERO_IF_FROZEN,
-                AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::ZeroIfFrozen,
+                AuthHandling::ZeroIfUnauthorized,
                 j_);
 
-            if (original_funds == *ownerFunds_)
+            if (originalFunds == *ownerFunds_)
             {
                 permRmOffer(entry->key());
                 JLOG(j_.trace()) << "Removing tiny offer due to reduced quality " << entry->key();
diff --git a/src/libxrpl/tx/paths/PaySteps.cpp b/src/libxrpl/tx/paths/PaySteps.cpp
index d3fe366616..68bd501d87 100644
--- a/src/libxrpl/tx/paths/PaySteps.cpp
+++ b/src/libxrpl/tx/paths/PaySteps.cpp
@@ -57,7 +57,7 @@ checkNear(IOUAmount const& expected, IOUAmount const& actual)
 static bool
 isXRPAccount(STPathElement const& pe)
 {
-    if (pe.getNodeType() != STPathElement::typeAccount)
+    if (pe.getNodeType() != STPathElement::TypeAccount)
         return false;
     return isXRP(pe.getAccountID());
 };
@@ -72,13 +72,13 @@ toStep(
     auto& j = ctx.j;
 
     if (ctx.isFirst && e1->isAccount() &&
-        ((e1->getNodeType() & STPathElement::typeCurrency) != 0u) && e1->getPathAsset().isXRP())
+        ((e1->getNodeType() & STPathElement::TypeCurrency) != 0u) && e1->getPathAsset().isXRP())
     {
-        return make_XRPEndpointStep(ctx, e1->getAccountID());
+        return makeXrpEndpointStep(ctx, e1->getAccountID());
     }
 
     if (ctx.isLast && isXRPAccount(*e1) && e2->isAccount())
-        return make_XRPEndpointStep(ctx, e2->getAccountID());
+        return makeXrpEndpointStep(ctx, e2->getAccountID());
 
     // MPTEndpointStep is created in following cases:
     // 1 Direct payment between an issuer and a holder
@@ -99,12 +99,11 @@ toStep(
     {
         return curAsset.visit(
             [&](MPTIssue const& issue) {
-                return make_MPTEndpointStep(
+                return makeMptEndpointStep(
                     ctx, e1->getAccountID(), e2->getAccountID(), issue.getMptID());
             },
             [&](Issue const& issue) {
-                return make_DirectStepI(
-                    ctx, e1->getAccountID(), e2->getAccountID(), issue.currency);
+                return makeDirectStepI(ctx, e1->getAccountID(), e2->getAccountID(), issue.currency);
             });
     }
 
@@ -119,12 +118,12 @@ toStep(
     }
 
     XRPL_ASSERT(
-        (e2->getNodeType() & STPathElement::typeAsset) ||
-            (e2->getNodeType() & STPathElement::typeIssuer),
+        (e2->getNodeType() & STPathElement::TypeAsset) ||
+            (e2->getNodeType() & STPathElement::TypeIssuer),
         "xrpl::toStep : currency or issuer");
     PathAsset const outAsset =
-        ((e2->getNodeType() & STPathElement::typeAsset) != 0u) ? e2->getPathAsset() : curAsset;
-    auto const outIssuer = ((e2->getNodeType() & STPathElement::typeIssuer) != 0u)
+        ((e2->getNodeType() & STPathElement::TypeAsset) != 0u) ? e2->getPathAsset() : curAsset;
+    auto const outIssuer = ((e2->getNodeType() & STPathElement::TypeIssuer) != 0u)
         ? e2->getIssuerID()
         : curAsset.getIssuer();
 
@@ -139,30 +138,30 @@ toStep(
     if (outAsset.isXRP())
     {
         return curAsset.visit(
-            [&](MPTIssue const& issue) { return make_BookStepMX(ctx, issue); },
-            [&](Issue const& issue) { return make_BookStepIX(ctx, issue); });
+            [&](MPTIssue const& issue) { return makeBookStepMx(ctx, issue); },
+            [&](Issue const& issue) { return makeBookStepIx(ctx, issue); });
     }
 
     if (isXRP(curAsset))
     {
         return outAsset.visit(
-            [&](MPTID const& mpt) { return make_BookStepXM(ctx, mpt); },
-            [&](Currency const& currency) { return make_BookStepXI(ctx, {currency, outIssuer}); });
+            [&](MPTID const& mpt) { return makeBookStepXm(ctx, mpt); },
+            [&](Currency const& currency) { return makeBookStepXi(ctx, {currency, outIssuer}); });
     }
 
     return curAsset.visit(
         [&](MPTIssue const& issue) {
             return outAsset.visit(
                 [&](Currency const& currency) {
-                    return make_BookStepMI(ctx, issue, {currency, outIssuer});
+                    return makeBookStepMi(ctx, issue, {currency, outIssuer});
                 },
-                [&](MPTID const& mpt) { return make_BookStepMM(ctx, issue, mpt); });
+                [&](MPTID const& mpt) { return makeBookStepMm(ctx, issue, mpt); });
         },
         [&](Issue const& issue) {
             return outAsset.visit(
-                [&](MPTID const& mpt) { return make_BookStepIM(ctx, issue, mpt); },
+                [&](MPTID const& mpt) { return makeBookStepIm(ctx, issue, mpt); },
                 [&](Currency const& currency) {
-                    return make_BookStepII(ctx, issue, {currency, outIssuer});
+                    return makeBookStepIi(ctx, issue, {currency, outIssuer});
                 });
         });
 }
@@ -190,9 +189,9 @@ toStrand(
         (dst == noAccount()) || (deliver.getIssuer() == noAccount()))
         return {temBAD_PATH, Strand{}};
 
-    if ((deliver.holds<MPTIssue>() && deliver.getIssuer() == beast::zero) ||
+    if ((deliver.holds<MPTIssue>() && deliver.getIssuer() == beast::kZERO) ||
         (sendMaxAsset && sendMaxAsset->holds<MPTIssue>() &&
-         sendMaxAsset->getIssuer() == beast::zero))
+         sendMaxAsset->getIssuer() == beast::kZERO))
         return {temBAD_PATH, Strand{}};
 
     for (std::size_t i = 0; i < path.size(); ++i)
@@ -200,14 +199,14 @@ toStrand(
         auto const& pe = path[i];
         auto const t = pe.getNodeType();
 
-        if (((t & ~STPathElement::typeAll) != 0u) || (t == 0u))
+        if (((t & ~STPathElement::TypeAll) != 0u) || (t == 0u))
             return {temBAD_PATH, Strand{}};
 
-        bool const hasAccount = (t & STPathElement::typeAccount) != 0u;
-        bool const hasIssuer = (t & STPathElement::typeIssuer) != 0u;
-        bool const hasCurrency = (t & STPathElement::typeCurrency) != 0u;
-        bool const hasMPT = (t & STPathElement::typeMPT) != 0u;
-        bool const hasAsset = (t & STPathElement::typeAsset) != 0u;
+        bool const hasAccount = (t & STPathElement::TypeAccount) != 0u;
+        bool const hasIssuer = (t & STPathElement::TypeIssuer) != 0u;
+        bool const hasCurrency = (t & STPathElement::TypeCurrency) != 0u;
+        bool const hasMPT = (t & STPathElement::TypeMpt) != 0u;
+        bool const hasAsset = (t & STPathElement::TypeAsset) != 0u;
 
         if (hasAccount && (hasIssuer || hasCurrency))
             return {temBAD_PATH, Strand{}};
@@ -252,7 +251,7 @@ toStrand(
 
     // Currency or MPT
     auto hasAsset = [](STPathElement const pe) {
-        return pe.getNodeType() & STPathElement::typeAsset;
+        return pe.getNodeType() & STPathElement::TypeAsset;
     };
 
     std::vector<STPathElement> normPath;
@@ -264,10 +263,10 @@ toStrand(
         // transaction, as defined by the transaction's Account field. The Asset
         // is either SendMax or Deliver.
         auto const t = [&]() {
-            auto const t = STPathElement::typeAccount | STPathElement::typeIssuer;
+            auto const t = STPathElement::TypeAccount | STPathElement::TypeIssuer;
             return curAsset.visit(
-                [&](MPTIssue const&) { return t | STPathElement::typeMPT; },
-                [&](Issue const&) { return t | STPathElement::typeCurrency; });
+                [&](MPTIssue const&) { return t | STPathElement::TypeMpt; },
+                [&](Issue const&) { return t | STPathElement::TypeCurrency; });
         }();
         // If MPT then the issuer is the actual issuer, it is never the source
         // account.
@@ -294,7 +293,7 @@ toStrand(
             STPathElement const& lastAsset =
                 *std::ranges::find_if(std::ranges::reverse_view(normPath), hasAsset);
             if (lastAsset.getPathAsset() != deliver ||
-                (offerCrossing != OfferCrossing::no &&
+                (offerCrossing != OfferCrossing::No &&
                  lastAsset.getIssuerID() != deliver.getIssuer()))
             {
                 normPath.emplace_back(std::nullopt, deliver, deliver.getIssuer());
@@ -409,16 +408,15 @@ toStrand(
         }
 
         using ImpliedStepRet = std::pair<TER, std::unique_ptr<Step>>;
-        auto getImpliedStep = [&](AccountID const& src_,
-                                  AccountID const& dst_,
-                                  Asset const& asset_) -> ImpliedStepRet {
-            return asset_.visit(
+        auto getImpliedStep =
+            [&](AccountID const& src, AccountID const& dst, Asset const& asset) -> ImpliedStepRet {
+            return asset.visit(
                 [&](MPTIssue const&) -> ImpliedStepRet {
                     JLOG(j.error()) << "MPT is invalid with rippling";
                     return {temBAD_PATH, nullptr};
                 },
                 [&](Issue const& issue) -> ImpliedStepRet {
-                    return make_DirectStepI(ctx(), src_, dst_, issue.currency);
+                    return makeDirectStepI(ctx(), src, dst, issue.currency);
                 });
         };
 
@@ -437,7 +435,7 @@ toStrand(
                     return {msr.first, Strand{}};
                 result.push_back(std::move(msr.second));
                 impliedPE.emplace(
-                    STPathElement::typeAccount, curAsset.getIssuer(), xrpCurrency(), xrpAccount());
+                    STPathElement::TypeAccount, curAsset.getIssuer(), xrpCurrency(), xrpAccount());
                 cur = &*impliedPE;
             }
         }
@@ -452,7 +450,7 @@ toStrand(
                     return {msr.first, Strand{}};
                 result.push_back(std::move(msr.second));
                 impliedPE.emplace(
-                    STPathElement::typeAccount, curAsset.getIssuer(), xrpCurrency(), xrpAccount());
+                    STPathElement::TypeAccount, curAsset.getIssuer(), xrpCurrency(), xrpAccount());
                 cur = &*impliedPE;
             }
         }
@@ -469,7 +467,7 @@ toStrand(
                         return {temBAD_PATH, Strand{}};
 
                     // Last step. insert xrp endpoint step
-                    auto msr = make_XRPEndpointStep(ctx(), next->getAccountID());
+                    auto msr = makeXrpEndpointStep(ctx(), next->getAccountID());
                     if (!isTesSuccess(msr.first))
                         return {msr.first, Strand{}};
                     result.push_back(std::move(msr.second));
@@ -664,7 +662,7 @@ toStrands(
         {
             lastFailTer = ter;
             JLOG(j.trace()) << "failed to add path: ter: " << ter
-                            << "path: " << p.getJson(JsonOptions::none);
+                            << "path: " << p.getJson(JsonOptions::KNone);
             if (isTemMalformed(ter))
                 return {ter, std::vector<Strand>{}};
         }
@@ -686,40 +684,40 @@ toStrands(
 }
 
 StrandContext::StrandContext(
-    ReadView const& view_,
-    std::vector<std::unique_ptr<Step>> const& strand_,
+    ReadView const& view,
+    std::vector<std::unique_ptr<Step>> const& strand,
     // A strand may not include an inner node that
     // replicates the source or destination.
-    AccountID const& strandSrc_,
-    AccountID const& strandDst_,
-    Asset const& strandDeliver_,
-    std::optional<Quality> const& limitQuality_,
-    bool isLast_,
-    bool ownerPaysTransferFee_,
-    OfferCrossing offerCrossing_,
-    bool isDefaultPath_,
-    std::array<boost::container::flat_set<Asset>, 2>& seenDirectAssets_,
-    boost::container::flat_set<Asset>& seenBookOuts_,
-    AMMContext& ammContext_,
-    std::optional<uint256> const& domainID_,
-    beast::Journal j_)
-    : view(view_)
-    , strandSrc(strandSrc_)
-    , strandDst(strandDst_)
-    , strandDeliver(strandDeliver_)
-    , limitQuality(limitQuality_)
-    , isFirst(strand_.empty())
-    , isLast(isLast_)
-    , ownerPaysTransferFee(ownerPaysTransferFee_)
-    , offerCrossing(offerCrossing_)
-    , isDefaultPath(isDefaultPath_)
-    , strandSize(strand_.size())
-    , prevStep(!strand_.empty() ? strand_.back().get() : nullptr)
-    , seenDirectAssets(seenDirectAssets_)
-    , seenBookOuts(seenBookOuts_)
-    , ammContext(ammContext_)
-    , domainID(domainID_)
-    , j(j_)
+    AccountID const& strandSrc,
+    AccountID const& strandDst,
+    Asset const& strandDeliver,
+    std::optional<Quality> const& limitQuality,
+    bool isLast,
+    bool ownerPaysTransferFee,
+    OfferCrossing offerCrossing,
+    bool isDefaultPath,
+    std::array<boost::container::flat_set<Asset>, 2>& seenDirectAssets,
+    boost::container::flat_set<Asset>& seenBookOuts,
+    AMMContext& ammContext,
+    std::optional<uint256> const& domainId,
+    beast::Journal j)
+    : view(view)
+    , strandSrc(strandSrc)
+    , strandDst(strandDst)
+    , strandDeliver(strandDeliver)
+    , limitQuality(limitQuality)
+    , isFirst(strand.empty())
+    , isLast(isLast)
+    , ownerPaysTransferFee(ownerPaysTransferFee)
+    , offerCrossing(offerCrossing)
+    , isDefaultPath(isDefaultPath)
+    , strandSize(strand.size())
+    , prevStep(!strand.empty() ? strand.back().get() : nullptr)
+    , seenDirectAssets(seenDirectAssets)
+    , seenBookOuts(seenBookOuts)
+    , ammContext(ammContext)
+    , domainID(domainId)
+    , j(j)
 {
 }
 
diff --git a/src/libxrpl/tx/paths/RippleCalc.cpp b/src/libxrpl/tx/paths/RippleCalc.cpp
index 773a9bac3d..06e386344d 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::zero)
+            if (pInputs && pInputs->limitQuality && saMaxAmountReq > beast::kZERO)
                 return Quality{Amounts(saMaxAmountReq, saDstAmountReq)};
             return std::nullopt;
         }();
 
         auto const sendMax = [&]() -> std::optional<STAmount> {
-            if (saMaxAmountReq >= beast::zero ||
+            if (saMaxAmountReq >= beast::kZERO ||
                 !equalTokens(saMaxAmountReq.asset(), saDstAmountReq.asset()) ||
                 saMaxAmountReq.getIssuer() != uSrcAccountID)
             {
@@ -85,7 +85,7 @@ RippleCalc::rippleCalculate(
                 defaultPaths,
                 partialPayment,
                 false,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 limitQuality,
                 sendMax,
                 domainID,
diff --git a/src/libxrpl/tx/paths/XRPEndpointStep.cpp b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
index 2310f72f34..244e1cffea 100644
--- a/src/libxrpl/tx/paths/XRPEndpointStep.cpp
+++ b/src/libxrpl/tx/paths/XRPEndpointStep.cpp
@@ -88,7 +88,7 @@ public:
     [[nodiscard]] DebtDirection
     debtDirection(ReadView const& sb, StrandDirection dir) const override
     {
-        return DebtDirection::issues;
+        return DebtDirection::Issues;
     }
 
     [[nodiscard]] std::pair<std::optional<Quality>, DebtDirection>
@@ -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::uRateOne}, this->debtDirection(v, StrandDirection::forward)};
+    return {Quality{STAmount::kU_RATE_ONE}, 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::zero}, XRPAmount{beast::zero}};
+        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::zero}, XRPAmount{beast::zero}};
+        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::zero))};
+        return {false, EitherAmount(XRPAmount(beast::kZERO))};
     }
 
     XRPL_ASSERT(in.holds<XRPAmount>(), "xrpl::XRPEndpointStep::validFwd : input is XRP");
@@ -392,11 +392,11 @@ xrpEndpointStepEqual(Step const& step, AccountID const& acc)
 //------------------------------------------------------------------------------
 
 std::pair<TER, std::unique_ptr<Step>>
-make_XRPEndpointStep(StrandContext const& ctx, AccountID const& acc)
+makeXrpEndpointStep(StrandContext const& ctx, AccountID const& acc)
 {
     TER ter = tefINTERNAL;
     std::unique_ptr<Step> r;
-    if (ctx.offerCrossing != OfferCrossing::no)
+    if (ctx.offerCrossing != OfferCrossing::No)
     {
         auto offerCrossingStep = std::make_unique<XRPEndpointOfferCrossingStep>(ctx, acc);
         ter = offerCrossingStep->check(ctx);
diff --git a/src/libxrpl/tx/transactors/account/AccountDelete.cpp b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
index b687ed0bd7..f9d1913dff 100644
--- a/src/libxrpl/tx/transactors/account/AccountDelete.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountDelete.cpp
@@ -261,8 +261,8 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
         return tecHAS_OBLIGATIONS;
 
     // If the account owns any NFTs it cannot be deleted.
-    Keylet const first = keylet::nftpage_min(account);
-    Keylet const last = keylet::nftpage_max(account);
+    Keylet const first = keylet::nftpageMin(account);
+    Keylet const last = keylet::nftpageMax(account);
 
     auto const cp = ctx.view.read(
         Keylet(ltNFTOKEN_PAGE, ctx.view.succ(first.key, last.key.next()).value_or(last.key)));
@@ -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 seqDelta{255};
-    if ((*sleAccount)[sfSequence] + seqDelta > ctx.view.seq())
+    constexpr std::uint32_t kSEQ_DELTA{255};
+    if ((*sleAccount)[sfSequence] + kSEQ_DELTA > 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) + seqDelta >
+            (*sleAccount)[~sfMintedNFTokens].value_or(0) + kSEQ_DELTA >
         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::zero};
+    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.
@@ -326,14 +326,14 @@ AccountDelete::preclaim(PreclaimContext const& ctx)
             // LCOV_EXCL_STOP
         }
 
-        LedgerEntryType const nodeType{safe_cast<LedgerEntryType>((*sleItem)[sfLedgerEntryType])};
+        LedgerEntryType const nodeType{safeCast<LedgerEntryType>((*sleItem)[sfLedgerEntryType])};
 
         if (nonObligationDeleter(nodeType) == nullptr)
             return tecHAS_OBLIGATIONS;
 
         // We found a deletable directory entry.  Count it.  If we find too
         // many deletable directory entries then bail out.
-        if (++deletableDirEntryCount > maxDeletableDirEntries)
+        if (++deletableDirEntryCount > kMAX_DELETABLE_DIR_ENTRIES)
             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 e8555ecc04..da24640bfa 100644
--- a/src/libxrpl/tx/transactors/account/AccountSet.cpp
+++ b/src/libxrpl/tx/transactors/account/AccountSet.cpp
@@ -39,19 +39,19 @@ AccountSet::makeTxConsequences(PreflightContext const& ctx)
     auto getTxConsequencesCategory = [](STTx const& tx) {
         if (std::uint32_t const uTxFlags = tx.getFlags();
             uTxFlags & (tfRequireAuth | tfOptionalAuth))
-            return TxConsequences::Category::blocker;
+            return TxConsequences::Category::Blocker;
 
         if (auto const uSetFlag = tx[~sfSetFlag]; uSetFlag &&
             (*uSetFlag == asfRequireAuth || *uSetFlag == asfDisableMaster ||
              *uSetFlag == asfAccountTxnID))
-            return TxConsequences::Category::blocker;
+            return TxConsequences::Category::Blocker;
 
         if (auto const uClearFlag = tx[~sfClearFlag]; uClearFlag &&
             (*uClearFlag == asfRequireAuth || *uClearFlag == asfDisableMaster ||
              *uClearFlag == asfAccountTxnID))
-            return TxConsequences::Category::blocker;
+            return TxConsequences::Category::Blocker;
 
-        return TxConsequences::Category::normal;
+        return TxConsequences::Category::Normal;
     };
 
     return TxConsequences{ctx.tx, getTxConsequencesCategory(ctx.tx)};
@@ -143,7 +143,7 @@ AccountSet::preflight(PreflightContext const& ctx)
     {
         auto uTickSize = tx[sfTickSize];
         if ((uTickSize != 0u) &&
-            ((uTickSize < Quality::minTickSize) || (uTickSize > Quality::maxTickSize)))
+            ((uTickSize < Quality::kMIN_TICK_SIZE) || (uTickSize > Quality::kMAX_TICK_SIZE)))
         {
             JLOG(j.trace()) << "Malformed transaction: Bad tick size.";
             return temBAD_TICK_SIZE;
@@ -159,7 +159,7 @@ AccountSet::preflight(PreflightContext const& ctx)
         }
     }
 
-    if (auto const domain = tx[~sfDomain]; domain && domain->size() > maxDomainLength)
+    if (auto const domain = tx[~sfDomain]; domain && domain->size() > kMAX_DOMAIN_LENGTH)
     {
         JLOG(j.trace()) << "domain too long";
         return telBAD_DOMAIN;
@@ -250,7 +250,7 @@ AccountSet::preclaim(PreclaimContext const& ctx)
         if (!dirIsEmpty(ctx.view, keylet::ownerDir(id)))
         {
             JLOG(ctx.j.trace()) << "Retry: Owner directory not empty.";
-            return ((ctx.flags & tapRETRY) != 0u) ? TER{terOWNERS} : TER{tecOWNERS};
+            return ((ctx.flags & TapRetry) != 0u) ? TER{terOWNERS} : TER{tecOWNERS};
         }
     }
 
@@ -574,7 +574,7 @@ AccountSet::doApply()
     if (tx.isFieldPresent(sfTickSize))
     {
         auto uTickSize = tx[sfTickSize];
-        if ((uTickSize == 0) || (uTickSize == Quality::maxTickSize))
+        if ((uTickSize == 0) || (uTickSize == Quality::kMAX_TICK_SIZE))
         {
             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 ee4cf583f4..3060abe6df 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 DEFAULT_SIGNER_LIST_ID = 0;
+static std::uint32_t const kDEFAULT_SIGNER_LIST_ID = 0;
 
 std::tuple<NotTEC, std::uint32_t, std::vector<SignerEntries::SignerEntry>, SignerListSet::Operation>
 SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journal j)
@@ -46,7 +46,7 @@ SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journ
     // the list.  A zero quorum means we're destroying the list.
     auto const quorum = tx[sfSignerQuorum];
     std::vector<SignerEntries::SignerEntry> sign;
-    Operation op = Operation::unknown;
+    Operation op = Operation::Unknown;
 
     bool const hasSignerEntries(tx.isFieldPresent(sfSignerEntries));
     if ((quorum != 0u) && hasSignerEntries)
@@ -60,11 +60,11 @@ SignerListSet::determineOperation(STTx const& tx, ApplyFlags flags, beast::Journ
 
         // Save deserialized list for later.
         sign = std::move(*signers);
-        op = Operation::set;
+        op = Operation::Set;
     }
     else if ((quorum == 0) && !hasSignerEntries)
     {
-        op = Operation::destroy;
+        op = Operation::Destroy;
     }
 
     return std::make_tuple(tesSUCCESS, quorum, sign, op);
@@ -85,14 +85,14 @@ SignerListSet::preflight(PreflightContext const& ctx)
     if (!isTesSuccess(std::get<0>(result)))
         return std::get<0>(result);
 
-    if (std::get<3>(result) == Operation::unknown)
+    if (std::get<3>(result) == Operation::Unknown)
     {
         // Neither a set nor a destroy.  Malformed.
         JLOG(ctx.j.trace()) << "Malformed transaction: Invalid signer set list format.";
         return temMALFORMED;
     }
 
-    if (std::get<3>(result) == Operation::set)
+    if (std::get<3>(result) == Operation::Set)
     {
         // Validate our settings.
         auto const account = ctx.tx.getAccountID(sfAccount);
@@ -113,10 +113,10 @@ SignerListSet::doApply()
     // Perform the operation preCompute() decided on.
     switch (do_)
     {
-        case Operation::set:
+        case Operation::Set:
             return replaceSignerList();
 
-        case Operation::destroy:
+        case Operation::Destroy:
             return destroySignerList();
 
         default:
@@ -137,7 +137,7 @@ SignerListSet::preCompute()
         isTesSuccess(std::get<0>(result)),
         "xrpl::SignerListSet::preCompute : result is tesSUCCESS");
     XRPL_ASSERT(
-        std::get<3>(result) != Operation::unknown,
+        std::get<3>(result) != Operation::Unknown,
         "xrpl::SignerListSet::preCompute : result is known operation");
 
     quorum_ = std::get<1>(result);
@@ -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::minMultiSigners,
+        entryCount >= STTx::kMIN_MULTI_SIGNERS,
         "xrpl::signerCountBasedOwnerCountDelta : minimum signers");
     XRPL_ASSERT(
-        entryCount <= STTx::maxMultiSigners,
+        entryCount <= STTx::kMAX_MULTI_SIGNERS,
         "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::minMultiSigners || signerCount > STTx::maxMultiSigners)
+        if (signerCount < STTx::kMIN_MULTI_SIGNERS || signerCount > STTx::kMAX_MULTI_SIGNERS)
         {
             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 addedOwnerCount = 1;
+    constexpr int kADDED_OWNER_COUNT = 1;
     std::uint32_t const flags{lsfOneOwnerCount};
 
-    XRPAmount const newReserve{view().fees().accountReserve(oldOwnerCount + addedOwnerCount)};
+    XRPAmount const newReserve{view().fees().accountReserve(oldOwnerCount + kADDED_OWNER_COUNT)};
 
     // 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, addedOwnerCount, viewJ);
+    adjustOwnerCount(view(), sle, kADDED_OWNER_COUNT, 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, DEFAULT_SIGNER_LIST_ID);
+    ledgerEntry->setFieldU32(sfSignerListID, kDEFAULT_SIGNER_LIST_ID);
     if (flags != 0u)  // Only set flags if they are non-default (default is zero).
         ledgerEntry->setFieldU32(sfFlags, flags);
 
@@ -389,7 +389,7 @@ SignerListSet::writeSignersToSLE(SLE::pointer const& ledgerEntry, std::uint32_t
     STArray toLedger(signers_.size());
     for (auto const& entry : signers_)
     {
-        toLedger.push_back(STObject::makeInnerObject(sfSignerEntry));
+        toLedger.pushBack(STObject::makeInnerObject(sfSignerEntry));
         STObject& obj = toLedger.back();
         obj.reserve(2);
         obj[sfAccount] = entry.account;
diff --git a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
index 461c4ee207..09e5a7284a 100644
--- a/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
+++ b/src/libxrpl/tx/transactors/bridge/XChainBridge.cpp
@@ -184,7 +184,7 @@ checkAttestationPublicKey(
 // must attest to this destination, if it is `ignore` then the `dst` of the
 // attestations are not checked (as for a `claim` transaction)
 
-enum class CheckDst { check, ignore };
+enum class CheckDst { Check, Ignore };
 template <class TAttestation>
 Expected<std::vector<AccountID>, TER>
 claimHelper(
@@ -199,7 +199,7 @@ claimHelper(
     // Remove attestations that are not valid signers. They may be no longer
     // part of the signers list, or their master key may have been disabled,
     // or their regular key may have changed
-    attestations.erase_if([&](auto const& a) {
+    attestations.eraseIf([&](auto const& a) {
         return checkAttestationPublicKey(view, signersList, a.keyAccount, a.publicKey, j) !=
             tesSUCCESS;
     });
@@ -215,7 +215,7 @@ claimHelper(
         // attestation transaction. The dst does not need to match if the
         // claimHelper is being run using an explicit claim transaction.
         using enum AttestationMatch;
-        if (matchR == nonDstMismatch || (checkDst == CheckDst::check && matchR != match))
+        if (matchR == NonDstMismatch || (checkDst == CheckDst::Check && matchR != Match))
             continue;
         auto i = signersList.find(a.keyAccount);
         if (i == signersList.end())
@@ -314,7 +314,7 @@ onNewAttestations(
         }
         else
         {
-            attestations.emplace_back(*att);
+            attestations.emplaceBack(*att);
             changed = true;
         }
     }
@@ -323,7 +323,7 @@ onNewAttestations(
         attestations,
         view,
         typename TAttestation::MatchFields{*attBegin},
-        CheckDst::check,
+        CheckDst::Check,
         quorum,
         signersList,
         j);
@@ -349,19 +349,19 @@ onClaim(
 {
     XChainClaimAttestation::MatchFields const toMatch{
         sendingAmount, wasLockingChainSend, std::nullopt};
-    return claimHelper(attestations, view, toMatch, CheckDst::ignore, quorum, signersList, j);
+    return claimHelper(attestations, view, toMatch, CheckDst::Ignore, quorum, signersList, j);
 }
 
-enum class CanCreateDstPolicy { no, yes };
+enum class CanCreateDstPolicy { No, Yes };
 
-enum class DepositAuthPolicy { normal, dstCanBypass };
+enum class DepositAuthPolicy { Normal, DstCanBypass };
 
 // Allow the fee to dip into the reserve. To support this, information about the
 // submitting account needs to be fed to the transfer helper.
 struct TransferHelperSubmittingAccountInfo
 {
     AccountID account;
-    STAmount preFeeBalance_;
+    STAmount preFeeBalance;
     STAmount postFeeBalance;
 };
 
@@ -415,7 +415,7 @@ transferHelper(
         // transaction, that's the dst account sending funds to itself. It
         // can bypass deposit auth.
         bool const canBypassDepositAuth =
-            dst == claimOwner && depositAuthPolicy == DepositAuthPolicy::dstCanBypass;
+            dst == claimOwner && depositAuthPolicy == DepositAuthPolicy::DstCanBypass;
 
         if (!canBypassDepositAuth && ((sleDst->getFlags() & lsfDepositAuth) != 0u) &&
             !psb.exists(keylet::depositPreauth(dst, src)))
@@ -423,7 +423,7 @@ transferHelper(
             return tecNO_PERMISSION;
         }
     }
-    else if (!amt.native() || canCreate == CanCreateDstPolicy::no)
+    else if (!amt.native() || canCreate == CanCreateDstPolicy::No)
     {
         return tecNO_DST;
     }
@@ -447,7 +447,7 @@ transferHelper(
                 if (!submittingAccountInfo || submittingAccountInfo->account != src ||
                     submittingAccountInfo->postFeeBalance != curBal)
                     return curBal;
-                return submittingAccountInfo->preFeeBalance_;
+                return submittingAccountInfo->preFeeBalance;
             }();
 
             if (availableBalance < amt + reserve)
@@ -459,7 +459,7 @@ transferHelper(
         auto sleDst = psb.peek(dstK);
         if (!sleDst)
         {
-            if (canCreate == CanCreateDstPolicy::no)
+            if (canCreate == CanCreateDstPolicy::No)
             {
                 // Already checked, but OK to check again
                 return tecNO_DST;
@@ -495,7 +495,7 @@ transferHelper(
         /*default path*/ true,
         /*partial payment*/ false,
         /*owner pays transfer fee*/ true,
-        /*offer crossing*/ OfferCrossing::no,
+        /*offer crossing*/ OfferCrossing::No,
         /*limit quality*/ std::nullopt,
         /*sendmax*/ std::nullopt,
         /*domain id*/ std::nullopt,
@@ -513,9 +513,9 @@ transferHelper(
 */
 enum class OnTransferFail {
     /** Remove the claim even if the transfer fails */
-    removeClaim,
+    RemoveClaim,
     /**  Keep the claim if the transfer fails */
-    keepClaim
+    KeepClaim
 };
 
 struct FinalizeClaimHelperResult
@@ -638,12 +638,12 @@ finalizeClaimHelper(
             dstTag,
             claimOwner,
             thisChainAmount,
-            CanCreateDstPolicy::yes,
+            CanCreateDstPolicy::Yes,
             depositAuthPolicy,
             std::nullopt,
             j);
 
-        if (!isTesSuccess(*result.mainFundsTer) && onTransferFail == OnTransferFail::keepClaim)
+        if (!isTesSuccess(*result.mainFundsTer) && onTransferFail == OnTransferFail::KeepClaim)
         {
             return result;
         }
@@ -657,10 +657,10 @@ finalizeClaimHelper(
             // if the transfer failed, distribute the pool for "OnTransferFail"
             // cases (the attesters did their job)
             STAmount const share = [&] {
-                auto const round_mode = innerSb.rules().enabled(fixXChainRewardRounding)
-                    ? Number::rounding_mode::downward
+                auto const roundMode = innerSb.rules().enabled(fixXChainRewardRounding)
+                    ? Number::RoundingMode::Downward
                     : Number::getround();
-                saveNumberRoundMode const _{Number::setround(round_mode)};
+                SaveNumberRoundMode const _{Number::setround(roundMode)};
 
                 STAmount const den{rewardAccounts.size()};
                 return divide(rewardPool, den, rewardPool.asset());
@@ -676,8 +676,8 @@ finalizeClaimHelper(
                     // claim owner is not relevant to distributing rewards
                     /*claimOwner*/ std::nullopt,
                     share,
-                    CanCreateDstPolicy::no,
-                    DepositAuthPolicy::normal,
+                    CanCreateDstPolicy::No,
+                    DepositAuthPolicy::Normal,
                     std::nullopt,
                     j);
 
@@ -698,7 +698,7 @@ finalizeClaimHelper(
         }();
 
         if (!isTesSuccess(*result.rewardTer) &&
-            (onTransferFail == OnTransferFail::keepClaim || *result.rewardTer == tecINTERNAL))
+            (onTransferFail == OnTransferFail::KeepClaim || *result.rewardTer == tecINTERNAL))
         {
             return result;
         }
@@ -793,9 +793,9 @@ readOrpeekBridge(F&& getter, STXChainBridge const& bridgeSpec)
         }
         return nullptr;
     };
-    if (auto r = tryGet(STXChainBridge::ChainType::locking))
+    if (auto r = tryGet(STXChainBridge::ChainType::Locking))
         return r;
-    return tryGet(STXChainBridge::ChainType::issuing);
+    return tryGet(STXChainBridge::ChainType::Issuing);
 }
 
 std::shared_ptr<SLE>
@@ -927,8 +927,8 @@ applyClaimAttestations(
             *rewardAccounts,
             srcChain,
             claimIDKeylet,
-            OnTransferFail::keepClaim,
-            DepositAuthPolicy::normal,
+            OnTransferFail::KeepClaim,
+            DepositAuthPolicy::Normal,
             j);
 
         auto const rTer = r.ter();
@@ -981,7 +981,7 @@ applyCreateAccountAttestations(
     {
         return tecXCHAIN_ACCOUNT_CREATE_PAST;
     }
-    if (attBegin->createCount >= claimCount + xbridgeMaxAccountCreateClaims)
+    if (attBegin->createCount >= claimCount + kXBRIDGE_MAX_ACCOUNT_CREATE_CLAIMS)
     {
         // Limit the number of claims on the account
         return tecXCHAIN_ACCOUNT_CREATE_TOO_MANY;
@@ -1099,8 +1099,8 @@ applyCreateAccountAttestations(
             *rewardAccounts,
             srcChain,
             claimIDKeylet,
-            OnTransferFail::removeClaim,
-            DepositAuthPolicy::normal,
+            OnTransferFail::RemoveClaim,
+            DepositAuthPolicy::Normal,
             j);
 
         auto const rTer = r.ter();
@@ -1237,7 +1237,7 @@ attestationDoApply(ApplyContext& ctx)
 
     struct ScopeResult
     {
-        STXChainBridge::ChainType srcChain = STXChainBridge::ChainType::locking;
+        STXChainBridge::ChainType srcChain = STXChainBridge::ChainType::Locking;
         std::unordered_map<AccountID, std::uint32_t> signersList;
         std::uint32_t quorum{};
         AccountID thisDoor;
@@ -1257,15 +1257,15 @@ attestationDoApply(ApplyContext& ctx)
         Keylet const bridgeK{ltBRIDGE, sleBridge->key()};
         AccountID const thisDoor = (*sleBridge)[sfAccount];
 
-        STXChainBridge::ChainType dstChain = STXChainBridge::ChainType::locking;
+        STXChainBridge::ChainType dstChain = STXChainBridge::ChainType::Locking;
         {
             if (thisDoor == bridgeSpec.lockingChainDoor())
             {
-                dstChain = STXChainBridge::ChainType::locking;
+                dstChain = STXChainBridge::ChainType::Locking;
             }
             else if (thisDoor == bridgeSpec.issuingChainDoor())
             {
-                dstChain = STXChainBridge::ChainType::issuing;
+                dstChain = STXChainBridge::ChainType::Issuing;
             }
             else
             {
@@ -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 rootAccount = calcAccountID(
-            generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase")).first);
-        if (bridgeSpec.issuingChainDoor() != rootAccount)
+        static auto const kROOT_ACCOUNT = calcAccountID(
+            generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
+        if (bridgeSpec.issuingChainDoor() != kROOT_ACCOUNT)
         {
             return temXCHAIN_BRIDGE_BAD_ISSUES;
         }
@@ -1409,8 +1409,8 @@ XChainCreateBridge::preclaim(PreclaimContext const& ctx)
             return ctx.view.exists(keylet::bridge(bridgeSpec, ct));
         };
 
-        if (hasBridge(STXChainBridge::ChainType::issuing) ||
-            hasBridge(STXChainBridge::ChainType::locking))
+        if (hasBridge(STXChainBridge::ChainType::Issuing) ||
+            hasBridge(STXChainBridge::ChainType::Locking))
         {
             return tecDUPLICATE;
         }
@@ -1736,15 +1736,15 @@ XChainClaim::doApply()
 
         AccountID const thisDoor = (*sleBridge)[sfAccount];
 
-        STXChainBridge::ChainType dstChain = STXChainBridge::ChainType::locking;
+        STXChainBridge::ChainType dstChain = STXChainBridge::ChainType::Locking;
         {
             if (thisDoor == bridgeSpec.lockingChainDoor())
             {
-                dstChain = STXChainBridge::ChainType::locking;
+                dstChain = STXChainBridge::ChainType::Locking;
             }
             else if (thisDoor == bridgeSpec.issuingChainDoor())
             {
-                dstChain = STXChainBridge::ChainType::issuing;
+                dstChain = STXChainBridge::ChainType::Issuing;
             }
             else
             {
@@ -1771,7 +1771,7 @@ XChainClaim::doApply()
             curAtts,
             psb,
             sendingAmount,
-            /*wasLockingChainSend*/ srcChain == STXChainBridge::ChainType::locking,
+            /*wasLockingChainSend*/ srcChain == STXChainBridge::ChainType::Locking,
             quorum,
             signersList,
             ctx_.journal);
@@ -1806,8 +1806,8 @@ XChainClaim::doApply()
         rewardAccounts,
         srcChain,
         claimIDKeylet,
-        OnTransferFail::keepClaim,
-        DepositAuthPolicy::dstCanBypass,
+        OnTransferFail::KeepClaim,
+        DepositAuthPolicy::DstCanBypass,
         ctx_.journal);
     if (!r.isTesSuccess())
         return r.ter();
@@ -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::zero};
+        return XRPAmount{beast::kZERO};
     }();
 
     return TxConsequences{ctx.tx, maxSpend};
@@ -1921,7 +1921,7 @@ XChainCommit::doApply()
     // Support dipping into reserves to pay the fee
     TransferHelperSubmittingAccountInfo submittingAccountInfo{
         .account = account_,
-        .preFeeBalance_ = preFeeBalance_,
+        .preFeeBalance = preFeeBalance_,
         .postFeeBalance = (*sleAccount)[sfBalance]};
 
     auto const thTer = transferHelper(
@@ -1931,8 +1931,8 @@ XChainCommit::doApply()
         /*dstTag*/ std::nullopt,
         /*claimOwner*/ std::nullopt,
         amount,
-        CanCreateDstPolicy::no,
-        DepositAuthPolicy::normal,
+        CanCreateDstPolicy::No,
+        DepositAuthPolicy::Normal,
         submittingAccountInfo,
         ctx_.journal);
 
@@ -2149,15 +2149,15 @@ XChainCreateAccountCommit::preclaim(PreclaimContext const& ctx)
         return tecXCHAIN_SELF_COMMIT;
     }
 
-    STXChainBridge::ChainType srcChain = STXChainBridge::ChainType::locking;
+    STXChainBridge::ChainType srcChain = STXChainBridge::ChainType::Locking;
     {
         if (thisDoor == bridgeSpec.lockingChainDoor())
         {
-            srcChain = STXChainBridge::ChainType::locking;
+            srcChain = STXChainBridge::ChainType::Locking;
         }
         else if (thisDoor == bridgeSpec.issuingChainDoor())
         {
-            srcChain = STXChainBridge::ChainType::issuing;
+            srcChain = STXChainBridge::ChainType::Issuing;
         }
         else
         {
@@ -2197,7 +2197,7 @@ XChainCreateAccountCommit::doApply()
 
     // Support dipping into reserves to pay the fee
     TransferHelperSubmittingAccountInfo submittingAccountInfo{
-        .account = account_, .preFeeBalance_ = preFeeBalance_, .postFeeBalance = (*sle)[sfBalance]};
+        .account = account_, .preFeeBalance = preFeeBalance_, .postFeeBalance = (*sle)[sfBalance]};
     STAmount const toTransfer = amount + reward;
     auto const thTer = transferHelper(
         psb,
@@ -2206,8 +2206,8 @@ XChainCreateAccountCommit::doApply()
         /*dstTag*/ std::nullopt,
         /*claimOwner*/ std::nullopt,
         toTransfer,
-        CanCreateDstPolicy::yes,
-        DepositAuthPolicy::normal,
+        CanCreateDstPolicy::Yes,
+        DepositAuthPolicy::Normal,
         submittingAccountInfo,
         ctx_.journal);
 
diff --git a/src/libxrpl/tx/transactors/check/CheckCash.cpp b/src/libxrpl/tx/transactors/check/CheckCash.cpp
index 31bca0aa32..34288425a5 100644
--- a/src/libxrpl/tx/transactors/check/CheckCash.cpp
+++ b/src/libxrpl/tx/transactors/check/CheckCash.cpp
@@ -164,8 +164,8 @@ CheckCash::preclaim(PreclaimContext const& ctx)
                 ctx.view,
                 sleCheck->at(sfAccount),
                 value,
-                FreezeHandling::fhZERO_IF_FROZEN,
-                AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::ZeroIfFrozen,
+                AuthHandling::ZeroIfUnauthorized,
                 ctx.j)};
 
             // Note that src will have one reserve's worth of additional XRP
@@ -213,13 +213,13 @@ CheckCash::preclaim(PreclaimContext const& ctx)
                         // determined by a lexicographical "greater than"
                         // comparison employing strict weak ordering.
                         // Determine which entry we need to access.
-                        bool const canonical_gt(dstId > issuerId);
+                        bool const canonicalGt(dstId > issuerId);
 
-                        bool const is_authorized(
+                        bool const isAuthorized(
                             (sleTrustLine->at(sfFlags) &
-                             (canonical_gt ? lsfLowAuth : lsfHighAuth)) != 0u);
+                             (canonicalGt ? lsfLowAuth : lsfHighAuth)) != 0u);
 
-                        if (!is_authorized)
+                        if (!isAuthorized)
                         {
                             JLOG(ctx.j.warn()) << "Can't receive IOUs from "
                                                   "issuer without auth.";
@@ -372,10 +372,12 @@ CheckCash::doApply()
                 return optDeliverMin->asset().visit(
                     [&](Issue const&) {
                         return STAmount(
-                            optDeliverMin->asset(), STAmount::cMaxValue / 2, STAmount::cMaxOffset);
+                            optDeliverMin->asset(),
+                            STAmount::kMAX_VALUE / 2,
+                            STAmount::kMAX_OFFSET);
                     },
                     [&](MPTIssue const&) {
-                        return STAmount(optDeliverMin->asset(), maxMPTokenAmount / 2);
+                        return STAmount(optDeliverMin->asset(), kMAX_MP_TOKEN_AMOUNT / 2);
                     });
             };
             STAmount const flowDeliver{
@@ -474,7 +476,7 @@ CheckCash::doApply()
                     // Set the trust line limit to the highest possible
                     // value while flow runs.
                     STAmount const bigAmount(
-                        trustLineIssue, STAmount::cMaxValue, STAmount::cMaxOffset);
+                        trustLineIssue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
                     sleTrustLine->at(tweakedLimit) = bigAmount;
 
                     return std::nullopt;
@@ -505,7 +507,7 @@ CheckCash::doApply()
                 return *err;
             // Make sure the tweaked limits are restored when we leave
             // scope.
-            scope_exit const fixup([&psb, &trustLineKey, destLow, &savedLimit]() {
+            ScopeExit const fixup([&psb, &trustLineKey, destLow, &savedLimit]() {
                 if (trustLineKey)
                 {
                     SF_AMOUNT const& tweakedLimit = destLow ? sfLowLimit : sfHighLimit;
@@ -524,7 +526,7 @@ CheckCash::doApply()
                 true,                              // default path
                 static_cast<bool>(optDeliverMin),  // partial payment
                 true,                              // owner pays transfer fee
-                OfferCrossing::no,
+                OfferCrossing::No,
                 std::nullopt,
                 sleCheck->getFieldAmount(sfSendMax),
                 std::nullopt,  // check does not support domain
diff --git a/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp b/src/libxrpl/tx/transactors/credentials/CredentialAccept.cpp
index 4f1bd80f26..0dd21d3bd5 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() > maxCredentialTypeLength))
+    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
     {
         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 402bddcfdd..e54c48287f 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() > maxCredentialURILength)))
+    if (uri && (uri->empty() || (uri->size() > kMAX_CREDENTIAL_URI_LENGTH)))
     {
         JLOG(j.trace()) << "Malformed transaction: invalid size of URI.";
         return temMALFORMED;
     }
 
     auto const credType = tx[sfCredentialType];
-    if (credType.empty() || (credType.size() > maxCredentialTypeLength))
+    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
     {
         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 acff3c6aa0..42880bfdf8 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() > maxCredentialTypeLength))
+    if (credType.empty() || (credType.size() > kMAX_CREDENTIAL_TYPE_LENGTH))
     {
         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 c211231902..baf208a305 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() > permissionMaxSize)
+    if (permissions.size() > kPERMISSION_MAX_SIZE)
         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 69fd6a651b..d4783c783b 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() > AUCTION_SLOT_MAX_AUTH_ACCOUNTS)
+        if (authAccounts.size() > kAUCTION_SLOT_MAX_AUTH_ACCOUNTS)
         {
             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::zero)
+    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::zero)
+    if (lpTokens == beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "AMM Bid: account is not LP.";
         return tecAMM_INVALID_TOKENS;
@@ -177,15 +177,15 @@ AMMBid::preclaim(PreclaimContext const& ctx)
 }
 
 static std::pair<TER, bool>
-applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Journal j_)
+applyBid(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journal j)
 {
     using namespace std::chrono;
-    auto const ammSle = sb.peek(keylet::amm(ctx_.tx[sfAsset], ctx_.tx[sfAsset2]));
+    auto const ammSle = sb.peek(keylet::amm(ctx.tx[sfAsset], ctx.tx[sfAsset2]));
     if (!ammSle)
         return {tecINTERNAL, false};
     STAmount const lptAMMBalance = (*ammSle)[sfLPTokenBalance];
-    auto const lpTokens = ammLPHolds(sb, *ammSle, account_, ctx_.journal);
-    auto const& rules = ctx_.view().rules();
+    auto const lpTokens = ammLPHolds(sb, *ammSle, account, ctx.journal);
+    auto const& rules = ctx.view().rules();
     if (!rules.enabled(fixInnerObjTemplate))
     {
         if (!ammSle->isFieldPresent(sfAuctionSlot))
@@ -199,14 +199,14 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
     }
     auto& auctionSlot = ammSle->peekFieldObject(sfAuctionSlot);
     auto const current =
-        duration_cast<seconds>(ctx_.view().header().parentCloseTime.time_since_epoch()).count();
+        duration_cast<seconds>(ctx.view().header().parentCloseTime.time_since_epoch()).count();
     // Auction slot discounted fee
-    auto const discountedFee = (*ammSle)[sfTradingFee] / AUCTION_SLOT_DISCOUNTED_FEE_FRACTION;
+    auto const discountedFee = (*ammSle)[sfTradingFee] / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION;
     auto const tradingFee = getFee((*ammSle)[sfTradingFee]);
     // Min price
-    auto const minSlotPrice = lptAMMBalance * tradingFee / AUCTION_SLOT_MIN_FEE_FRACTION;
+    auto const minSlotPrice = lptAMMBalance * tradingFee / kAUCTION_SLOT_MIN_FEE_FRACTION;
 
-    std::uint32_t constexpr tailingSlot = AUCTION_SLOT_TIME_INTERVALS - 1;
+    std::uint32_t constexpr kTAILING_SLOT = kAUCTION_SLOT_TIME_INTERVALS - 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::Jour
     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 < tailingSlot && sb.read(keylet::account(account));
+        return timeSlot && *timeSlot < kTAILING_SLOT && 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 + TOTAL_TIME_SLOT_SECS);
+        auctionSlot.setAccountID(sfAccount, account);
+        auctionSlot.setFieldU32(sfExpiration, current + kTOTAL_TIME_SLOT_SECS);
         if (fee != 0)
         {
             auctionSlot.setFieldU16(sfDiscountedFee, fee);
@@ -231,9 +231,9 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
             auctionSlot.makeFieldAbsent(sfDiscountedFee);
         }
         auctionSlot.setFieldAmount(sfPrice, toSTAmount(lpTokens.asset(), minPrice));
-        if (ctx_.tx.isFieldPresent(sfAuthAccounts))
+        if (ctx.tx.isFieldPresent(sfAuthAccounts))
         {
-            auctionSlot.setFieldArray(sfAuthAccounts, ctx_.tx.getFieldArray(sfAuthAccounts));
+            auctionSlot.setFieldArray(sfAuthAccounts, ctx.tx.getFieldArray(sfAuthAccounts));
         }
         else
         {
@@ -246,15 +246,15 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
         {
             // This error case should never occur.
             // LCOV_EXCL_START
-            JLOG(ctx_.journal.fatal())
+            JLOG(ctx.journal.fatal())
                 << "AMM Bid: LP Token burn exceeds AMM balance " << burn << " " << lptAMMBalance;
             return tecINTERNAL;
             // LCOV_EXCL_STOP
         }
-        auto res = redeemIOU(sb, account_, saBurn, lpTokens.get<Issue>(), ctx_.journal);
+        auto res = redeemIOU(sb, account, saBurn, lpTokens.get<Issue>(), ctx.journal);
         if (!isTesSuccess(res))
         {
-            JLOG(ctx_.journal.debug()) << "AMM Bid: failed to redeem.";
+            JLOG(ctx.journal.debug()) << "AMM Bid: failed to redeem.";
             return res;
         }
         ammSle->setFieldAmount(sfLPTokenBalance, lptAMMBalance - saBurn);
@@ -264,8 +264,8 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
 
     TER res = tesSUCCESS;
 
-    auto const bidMin = ctx_.tx[~sfBidMin];
-    auto const bidMax = ctx_.tx[~sfBidMax];
+    auto const bidMin = ctx.tx[~sfBidMin];
+    auto const bidMax = ctx.tx[~sfBidMax];
 
     auto getPayPrice = [&](Number const& computedPrice) -> Expected<Number, TER> {
         auto const payPrice = [&]() -> std::optional<Number> {
@@ -274,8 +274,8 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
             {
                 if (computedPrice <= *bidMax)
                     return std::max(computedPrice, Number(*bidMin));
-                JLOG(ctx_.journal.debug()) << "AMM Bid: not in range " << computedPrice << " "
-                                           << *bidMin << " " << *bidMax;
+                JLOG(ctx.journal.debug()) << "AMM Bid: not in range " << computedPrice << " "
+                                          << *bidMin << " " << *bidMax;
                 return std::nullopt;
             }
             // Bidder pays max(bidPrice, computedPrice)
@@ -287,7 +287,7 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
             {
                 if (computedPrice <= *bidMax)
                     return computedPrice;
-                JLOG(ctx_.journal.debug())
+                JLOG(ctx.journal.debug())
                     << "AMM Bid: not in range " << computedPrice << " " << *bidMax;
                 return std::nullopt;
             }
@@ -322,15 +322,15 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
         STAmount const pricePurchased = auctionSlot[sfPrice];
         XRPL_ASSERT(timeSlot, "xrpl::applyBid : timeSlot is set");
         // NOLINTBEGIN(bugprone-unchecked-optional-access)
-        auto const fractionUsed = (Number(*timeSlot) + 1) / AUCTION_SLOT_TIME_INTERVALS;
+        auto const fractionUsed = (Number(*timeSlot) + 1) / kAUCTION_SLOT_TIME_INTERVALS;
         auto const fractionRemaining = Number(1) - fractionUsed;
         auto const computedPrice = [&]() -> Number {
-            auto const p1_05 = Number(105, -2);
+            auto const p105 = Number(105, -2);
             // First interval slot price
             if (*timeSlot == 0)
-                return pricePurchased * p1_05 + minSlotPrice;
+                return pricePurchased * p105 + minSlotPrice;
             // Other intervals slot price
-            return pricePurchased * p1_05 * (1 - power(fractionUsed, 60)) + minSlotPrice;
+            return pricePurchased * p105 * (1 - power(fractionUsed, 60)) + minSlotPrice;
         }();
         // NOLINTEND(bugprone-unchecked-optional-access)
 
@@ -345,19 +345,15 @@ applyBid(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jour
         if (refund > *payPrice)
         {
             // This error case should never occur.
-            JLOG(ctx_.journal.fatal())
+            JLOG(ctx.journal.fatal())
                 << "AMM Bid: refund exceeds payPrice " << refund << " " << *payPrice;
             return {tecINTERNAL, false};
         }
         res = accountSend(
-            sb,
-            account_,
-            auctionSlot[sfAccount],
-            toSTAmount(lpTokens.asset(), refund),
-            ctx_.journal);
+            sb, account, auctionSlot[sfAccount], toSTAmount(lpTokens.asset(), refund), ctx.journal);
         if (!isTesSuccess(res))
         {
-            JLOG(ctx_.journal.debug()) << "AMM Bid: failed to refund.";
+            JLOG(ctx.journal.debug()) << "AMM Bid: failed to refund.";
             return {res, false};
         }
 
diff --git a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
index 20ec184670..112d290e72 100644
--- a/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
+++ b/src/libxrpl/tx/transactors/dex/AMMClawback.cpp
@@ -94,7 +94,7 @@ AMMClawback::preflight(PreflightContext const& ctx)
         return temBAD_AMOUNT;
     }
 
-    if (clawAmount && *clawAmount <= beast::zero)
+    if (clawAmount && *clawAmount <= beast::kZERO)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -191,7 +191,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::zero)
+        if (lpTokenBalance == beast::kZERO)
             return tecAMM_BALANCE;
 
         if (auto const res = verifyAndAdjustLPTokenBalance(sb, lpTokenBalance, ammSle, holder);
@@ -204,8 +204,8 @@ AMMClawback::applyGuts(Sandbox& sb)
         *ammSle,
         asset,
         asset2,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         ctx_.journal);
 
     if (!expected)
@@ -220,7 +220,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::zero)
+    if (holdLPtokens == beast::kZERO)
         return tecAMM_BALANCE;
 
     if (!clawAmount)
@@ -239,8 +239,8 @@ AMMClawback::applyGuts(Sandbox& sb)
                 holdLPtokens,
                 holdLPtokens,
                 0,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 WithdrawAll::Yes,
                 preFeeBalance_,
                 ctx_.journal);
@@ -327,8 +327,8 @@ AMMClawback::equalWithdrawMatchingOneAmount(
             holdLPtokens,
             holdLPtokens,
             0,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             WithdrawAll::Yes,
             preFeeBalance_,
             ctx_.journal);
@@ -340,7 +340,7 @@ AMMClawback::equalWithdrawMatchingOneAmount(
         auto tokensAdj = getRoundedLPTokens(rules, lptAMMBalance, frac, IsDeposit::No);
 
         // LCOV_EXCL_START
-        if (tokensAdj == beast::zero)
+        if (tokensAdj == beast::kZERO)
             return {tecAMM_INVALID_TOKENS, STAmount{}, STAmount{}, std::nullopt};
         // LCOV_EXCL_STOP
 
@@ -360,8 +360,8 @@ AMMClawback::equalWithdrawMatchingOneAmount(
             lptAMMBalance,
             tokensAdj,
             0,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             WithdrawAll::No,
             preFeeBalance_,
             ctx_.journal);
@@ -380,8 +380,8 @@ AMMClawback::equalWithdrawMatchingOneAmount(
         lptAMMBalance,
         toSTAmount(lptAMMBalance.asset(), lptAMMBalance * frac),
         0,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         WithdrawAll::No,
         preFeeBalance_,
         ctx_.journal);
diff --git a/src/libxrpl/tx/transactors/dex/AMMCreate.cpp b/src/libxrpl/tx/transactors/dex/AMMCreate.cpp
index 47363531d4..c90ea0a6ab 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] > TRADING_FEE_THRESHOLD)
+    if (ctx.tx[sfTradingFee] > kTRADING_FEE_THRESHOLD)
     {
         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::zero)
+    if (xrpBalance <= beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "AMM Instance: insufficient reserves";
         return tecINSUF_RESERVE_LINE;
@@ -159,8 +159,8 @@ AMMCreate::preclaim(PreclaimContext const& ctx)
                    ctx.view,
                    accountID,
                    amount,
-                   FreezeHandling::fhZERO_IF_FROZEN,
-                   AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                   FreezeHandling::ZeroIfFrozen,
+                   AuthHandling::ZeroIfUnauthorized,
                    ctx.j) < amount;
     };
 
@@ -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::zero)
+            accountId == beast::kZERO)
             return terADDRESS_COLLISION;
     }
 
@@ -236,10 +236,10 @@ AMMCreate::preclaim(PreclaimContext const& ctx)
 }
 
 static std::pair<TER, bool>
-applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Journal j_)
+applyCreate(ApplyContext& ctx, Sandbox& sb, AccountID const& account, beast::Journal j)
 {
-    auto const amount = ctx_.tx[sfAmount];
-    auto const amount2 = ctx_.tx[sfAmount2];
+    auto const amount = ctx.tx[sfAmount];
+    auto const amount2 = ctx.tx[sfAmount2];
 
     auto const ammKeylet = keylet::amm(amount.asset(), amount2.asset());
 
@@ -248,17 +248,17 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
     // AMM account already exists (should not happen)
     if (!maybeAccount)
     {
-        JLOG(j_.error()) << "AMM Instance: failed to create pseudo account.";
+        JLOG(j.error()) << "AMM Instance: failed to create pseudo account.";
         return {maybeAccount.error(), false};
     }
-    auto& account = *maybeAccount;
-    auto const accountId = (*account)[sfAccount];
+    auto& acc = *maybeAccount;
+    auto const accountId = (*acc)[sfAccount];
 
     // LP Token already exists. (should not happen)
     auto const lptIss = ammLPTIssue(amount.asset(), amount2.asset(), accountId);
     if (sb.read(keylet::line(accountId, lptIss)))
     {
-        JLOG(j_.error()) << "AMM Instance: LP Token already exists.";
+        JLOG(j.error()) << "AMM Instance: LP Token already exists.";
         return {tecDUPLICATE, false};
     }
 
@@ -279,21 +279,21 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
     ammSle->setFieldIssue(sfAsset, STIssue{sfAsset, asset1});
     ammSle->setFieldIssue(sfAsset2, STIssue{sfAsset2, asset2});
     // AMM creator gets the auction slot and the voting slot.
-    initializeFeeAuctionVote(ctx_.view(), ammSle, account_, lptIss, ctx_.tx[sfTradingFee]);
+    initializeFeeAuctionVote(ctx.view(), ammSle, account, lptIss, ctx.tx[sfTradingFee]);
 
     // Add owner directory to link the root account and AMM object.
     if (auto ter = dirLink(sb, accountId, ammSle); ter)
     {
-        JLOG(j_.debug()) << "AMM Instance: failed to insert owner dir";
+        JLOG(j.debug()) << "AMM Instance: failed to insert owner dir";
         return {ter, false};
     }
     sb.insert(ammSle);
 
     // Send LPT to LP.
-    auto res = accountSend(sb, accountId, account_, lpTokens, ctx_.journal);
+    auto res = accountSend(sb, accountId, account, lpTokens, ctx.journal);
     if (!isTesSuccess(res))
     {
-        JLOG(j_.debug()) << "AMM Instance: failed to send LPT " << lpTokens;
+        JLOG(j.debug()) << "AMM Instance: failed to send LPT " << lpTokens;
         return {res, false};
     }
 
@@ -306,7 +306,7 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
                 auto const& mptID = mptIssue.getMptID();
                 std::uint32_t flags = lsfMPTAMM;
                 if (auto const err =
-                        requireAuth(ctx_.view(), mptIssue, accountId, AuthType::WeakAuth);
+                        requireAuth(ctx.view(), mptIssue, accountId, AuthType::WeakAuth);
                     !isTesSuccess(err))
                 {
                     if (err == tecNO_AUTH)
@@ -324,12 +324,12 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
                 // Don't adjust AMM owner count.
                 // It's irrelevant for pseudo-account like AMM.
                 return accountSend(
-                    sb, account_, accountId, amount, ctx_.journal, WaiveTransferFee::Yes);
+                    sb, account, accountId, amount, ctx.journal, WaiveTransferFee::Yes);
             },
             // Set AMM flag on AMM trustline
             [&](Issue const& issue) -> TER {
                 if (auto const res = accountSend(
-                        sb, account_, accountId, amount, ctx_.journal, WaiveTransferFee::Yes))
+                        sb, account, accountId, amount, ctx.journal, WaiveTransferFee::Yes))
                     return res;
                 // Set AMM flag on AMM trustline
                 if (!isXRP(amount))
@@ -352,7 +352,7 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
     res = sendAndInitTrustOrMPT(amount);
     if (!isTesSuccess(res))
     {
-        JLOG(j_.debug()) << "AMM Instance: failed to send " << amount;
+        JLOG(j.debug()) << "AMM Instance: failed to send " << amount;
         return {res, false};
     }
 
@@ -360,17 +360,17 @@ applyCreate(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::J
     res = sendAndInitTrustOrMPT(amount2);
     if (!isTesSuccess(res))
     {
-        JLOG(j_.debug()) << "AMM Instance: failed to send " << amount2;
+        JLOG(j.debug()) << "AMM Instance: failed to send " << amount2;
         return {res, false};
     }
 
-    JLOG(j_.debug()) << "AMM Instance: success " << accountId << " " << ammKeylet.key << " "
-                     << lpTokens << " " << amount << " " << amount2;
+    JLOG(j.debug()) << "AMM Instance: success " << accountId << " " << ammKeylet.key << " "
+                    << 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::book(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);
+            ctx.registry.get().getOrderBookDB().addOrderBook(book);
     };
     addOrderBook(amount.asset(), amount2.asset(), getRate(amount2, amount));
     addOrderBook(amount2.asset(), amount.asset(), getRate(amount, amount2));
diff --git a/src/libxrpl/tx/transactors/dex/AMMDelete.cpp b/src/libxrpl/tx/transactors/dex/AMMDelete.cpp
index 6d2c7b07c3..0ca7fd7c34 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::zero)
+    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 344e3535da..d2995c309f 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::zero)
+    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 > TRADING_FEE_THRESHOLD)
+    if (tradingFee > kTRADING_FEE_THRESHOLD)
     {
         JLOG(ctx.j.debug()) << "AMM Deposit: invalid trading fee.";
         return temBAD_FEE;
@@ -192,17 +192,17 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
         *ammSle,
         std::nullopt,
         std::nullopt,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         ctx.j);
     if (!expected)
         return expected.error();  // LCOV_EXCL_LINE
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
     if ((ctx.tx.getFlags() & tfTwoAssetIfEmpty) != 0u)
     {
-        if (lptAMMBalance != beast::zero)
+        if (lptAMMBalance != beast::kZERO)
             return tecAMM_NOT_EMPTY;
-        if (amountBalance != beast::zero || amount2Balance != beast::zero)
+        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::zero)
+        if (lptAMMBalance == beast::kZERO)
             return tecAMM_EMPTY;
-        if (amountBalance <= beast::zero || amount2Balance <= beast::zero ||
-            lptAMMBalance < beast::zero)
+        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.";
@@ -246,8 +246,8 @@ AMMDeposit::preclaim(PreclaimContext const& ctx)
                    ctx.view,
                    accountID,
                    deposit,
-                   FreezeHandling::fhIGNORE_FREEZE,
-                   AuthHandling::ahIGNORE_AUTH,
+                   FreezeHandling::IgnoreFreeze,
+                   AuthHandling::IgnoreAuth,
                    ctx.j) >= deposit
             ? TER(tesSUCCESS)
             : tecUNFUNDED_AMM;
@@ -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::zero)
+    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::zero)
+        if (xrpBalance <= beast::kZERO)
         {
             JLOG(ctx.j.debug()) << "AMM Instance: insufficient reserves";
             return tecINSUF_RESERVE_LINE;
@@ -395,13 +395,13 @@ AMMDeposit::applyGuts(Sandbox& sb)
         *ammSle,
         amount ? amount->asset() : std::optional<Asset>{},
         amount2 ? amount2->asset() : std::optional<Asset>{},
-        FreezeHandling::fhZERO_IF_FROZEN,
-        AuthHandling::ahZERO_IF_UNAUTHORIZED,
+        FreezeHandling::ZeroIfFrozen,
+        AuthHandling::ZeroIfUnauthorized,
         ctx_.journal);
     if (!expected)
         return {expected.error(), false};  // LCOV_EXCL_LINE
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
-    auto const tfee = (lptAMMBalance == beast::zero)
+    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::zero,
+            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::zero)
+        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::zero)
+        if (depositAmount <= beast::kZERO)
             return temBAD_AMOUNT;
         if (isXRP(depositAmount))
         {
@@ -528,8 +528,8 @@ AMMDeposit::deposit(
                 view,
                 account_,
                 depositAmount,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 ctx_.journal) >= depositAmount)
         {
             return tesSUCCESS;
@@ -547,7 +547,7 @@ AMMDeposit::deposit(
             tfee,
             IsDeposit::Yes);
 
-    if (lpTokensDepositActual <= beast::zero)
+    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::zero)
+        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::zero)
+    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::zero)
+    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::zero)
+    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::zero)
+    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::zero)
+    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::zero)
+    if (amount != beast::kZERO)
     {
         auto const tokens = adjustLPTokensOut(
             view.rules(), lptAMMBalance, lpTokensOut(amountBalance, amount, lptAMMBalance, tfee));
-        if (tokens <= beast::zero)
+        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::zero)
+        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::zero)
+    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::zero)
+    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 e411a3a53a..4ab3653792 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] > TRADING_FEE_THRESHOLD)
+    if (ctx.tx[sfTradingFee] > kTRADING_FEE_THRESHOLD)
     {
         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::zero)
+    if (ammSle->getFieldAmount(sfLPTokenBalance) == beast::kZERO)
     {
         return tecAMM_EMPTY;
     }
     if (auto const lpTokensNew = ammLPHolds(ctx.view, *ammSle, ctx.tx[sfAccount], ctx.j);
-        lpTokensNew == beast::zero)
+        lpTokensNew == beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "AMM Vote: account is not LP.";
         return tecAMM_INVALID_TOKENS;
@@ -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& account, beast::Journal j)
 {
-    auto const feeNew = ctx_.tx[sfTradingFee];
-    auto ammSle = sb.peek(keylet::amm(ctx_.tx[sfAsset], ctx_.tx[sfAsset2]));
+    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, account, ctx.journal);
     std::optional<STAmount> minTokens;
     std::size_t minPos{0};
     AccountID minAccount{0};
@@ -104,17 +104,17 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
     // has the vote entry.
     for (auto const& entry : ammSle->getFieldArray(sfVoteSlots))
     {
-        auto const account = entry[sfAccount];
-        auto lpTokens = ammLPHolds(sb, *ammSle, account, ctx_.journal);
-        if (lpTokens == beast::zero)
+        auto const entryAccount = entry[sfAccount];
+        auto lpTokens = ammLPHolds(sb, *ammSle, entryAccount, ctx.journal);
+        if (lpTokens == beast::kZERO)
         {
-            JLOG(j_.debug()) << "AMMVote::applyVote, account " << account << " is not LP";
+            JLOG(j.debug()) << "AMMVote::applyVote, account " << entryAccount << " is not LP";
             continue;
         }
         auto feeVal = entry[sfTradingFee];
         STObject newEntry = STObject::makeInnerObject(sfVoteEntry);
         // The account already has the vote entry.
-        if (account == account_)
+        if (entryAccount == account)
         {
             lpTokens = lpTokensNew;
             feeVal = feeNew;
@@ -123,26 +123,27 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
         // Keep running numerator/denominator to calculate the updated fee.
         num += feeVal * lpTokens;
         den += lpTokens;
-        newEntry.setAccountID(sfAccount, account);
+        newEntry.setAccountID(sfAccount, entryAccount);
         if (feeVal != 0)
             newEntry.setFieldU16(sfTradingFee, feeVal);
         newEntry.setFieldU32(
             sfVoteWeight,
-            static_cast<std::int64_t>(Number(lpTokens) * VOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
+            static_cast<std::int64_t>(
+                Number(lpTokens) * kVOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
 
         // Find an entry with the least tokens/fee. Make the order deterministic
         // if the tokens/fees are equal.
         if (!minTokens ||
             (lpTokens < *minTokens ||
              (lpTokens == *minTokens &&
-              (feeVal < minFee || (feeVal == minFee && account < minAccount)))))
+              (feeVal < minFee || (feeVal == minFee && entryAccount < minAccount)))))
         {
             minTokens = lpTokens;
             minPos = updatedVoteSlots.size();
-            minAccount = account;
+            minAccount = entryAccount;
             minFee = feeVal;
         }
-        updatedVoteSlots.push_back(std::move(newEntry));
+        updatedVoteSlots.pushBack(std::move(newEntry));
     }
 
     // The account doesn't have the vote entry.
@@ -155,8 +156,8 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
             newEntry.setFieldU32(
                 sfVoteWeight,
                 static_cast<std::int64_t>(
-                    Number(lpTokensNew) * VOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
-            newEntry.setAccountID(sfAccount, account_);
+                    Number(lpTokensNew) * kVOTE_WEIGHT_SCALE_FACTOR / lptAMMBalance));
+            newEntry.setAccountID(sfAccount, account);
             num += feeNew * lpTokensNew;
             den += lpTokensNew;
             if (minPos)
@@ -165,12 +166,12 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
             }
             else
             {
-                updatedVoteSlots.push_back(std::move(newEntry));
+                updatedVoteSlots.pushBack(std::move(newEntry));
             }
         };
         // Add new entry if the number of the vote entries
         // is less than Max.
-        if (updatedVoteSlots.size() < VOTE_MAX_SLOTS)
+        if (updatedVoteSlots.size() < kVOTE_MAX_SLOTS)
         {
             update();
             // Add the entry if the account has more tokens than
@@ -182,7 +183,7 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
         {
             auto const entry = updatedVoteSlots.begin() + minPos;
             // Remove the least token vote entry.
-            num -= Number((*entry)[~sfTradingFee].value_or(0)) * *minTokens;
+            num -= Number((*entry)[~sfTradingFee].valueOr(0)) * *minTokens;
             den -= *minTokens;
             update(minPos);
         }
@@ -191,13 +192,13 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
         // Update anyway to refresh the slots.
         else
         {
-            JLOG(j_.debug()) << "AMMVote::applyVote, insufficient tokens to "
-                                "override other votes";
+            JLOG(j.debug()) << "AMMVote::applyVote, insufficient tokens to "
+                               "override other votes";
         }
     }
 
     XRPL_ASSERT(
-        !ctx_.view().rules().enabled(fixInnerObjTemplate) || ammSle->isFieldPresent(sfAuctionSlot),
+        !ctx.view().rules().enabled(fixInnerObjTemplate) || ammSle->isFieldPresent(sfAuctionSlot),
         "xrpl::applyVote : has auction slot");
 
     // Update the vote entries and the trading/discounted fee.
@@ -208,7 +209,7 @@ applyVote(ApplyContext& ctx_, Sandbox& sb, AccountID const& account_, beast::Jou
         if (ammSle->isFieldPresent(sfAuctionSlot))
         {
             auto& auctionSlot = ammSle->peekFieldObject(sfAuctionSlot);
-            if (auto const discountedFee = fee / AUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
+            if (auto const discountedFee = fee / kAUCTION_SLOT_DISCOUNTED_FEE_FRACTION)
             {
                 auctionSlot.setFieldU16(sfDiscountedFee, discountedFee);
             }
diff --git a/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp b/src/libxrpl/tx/transactors/dex/AMMWithdraw.cpp
index 6ab78f9cb9..bae9d098a3 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::zero)
+    if (lpTokens && *lpTokens <= beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "AMM Withdraw: invalid tokens.";
         return temBAD_AMM_TOKENS;
@@ -205,16 +205,16 @@ AMMWithdraw::preclaim(PreclaimContext const& ctx)
         *ammSle,
         amount ? amount->asset() : std::optional<Asset>{},
         amount2 ? amount2->asset() : std::optional<Asset>{},
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         ctx.j);
     if (!expected)
         return expected.error();
     auto const [amountBalance, amount2Balance, lptAMMBalance] = *expected;
-    if (lptAMMBalance == beast::zero)
+    if (lptAMMBalance == beast::kZERO)
         return tecAMM_EMPTY;
-    if (amountBalance <= beast::zero || amount2Balance <= beast::zero ||
-        lptAMMBalance < beast::zero)
+    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::zero)
+    if (lpTokens <= beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "AMM Withdraw: tokens balance is zero.";
         return tecAMM_BALANCE;
@@ -340,8 +340,8 @@ AMMWithdraw::applyGuts(Sandbox& sb)
         *ammSle,
         amount ? amount->asset() : std::optional<Asset>{},
         amount2 ? amount2->asset() : std::optional<Asset>{},
-        FreezeHandling::fhZERO_IF_FROZEN,
-        AuthHandling::ahZERO_IF_UNAUTHORIZED,
+        FreezeHandling::ZeroIfFrozen,
+        AuthHandling::ZeroIfUnauthorized,
         ctx_.journal);
     if (!expected)
         return {expected.error(), false};
@@ -465,8 +465,8 @@ AMMWithdraw::withdraw(
         lpTokensAMMBalance,
         lpTokensWithdraw,
         tfee,
-        FreezeHandling::fhZERO_IF_FROZEN,
-        AuthHandling::ahZERO_IF_UNAUTHORIZED,
+        FreezeHandling::ZeroIfFrozen,
+        AuthHandling::ZeroIfUnauthorized,
         isWithdrawAll(ctx_.tx),
         preFeeBalance_,
         j_);
@@ -517,7 +517,7 @@ AMMWithdraw::withdraw(
         return std::make_tuple(amountWithdraw, amount2Withdraw, lpTokensWithdraw);
     }();
 
-    if (lpTokensWithdrawActual <= beast::zero || 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::zero;
+        bool const newBalanceZero = (curBalance - amountWithdrawActual) == beast::kZERO;
         bool const newBalance2Zero =
-            (curBalance2 - amount2WithdrawActual.value_or(curBalance2.asset())) == beast::zero;
-        bool const newLPTokensZero = (lpTokensAMMBalance - lpTokensWithdrawActual) == beast::zero;
+            (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 = [&]() {
@@ -600,13 +600,13 @@ AMMWithdraw::withdraw(
     }
 
     // Check the reserve in case a trustline or MPT has to be created
-    bool const enabledFixAMMv1_2 = view.rules().enabled(fixAMMv1_2);
+    bool const enabledFixAmMv12 = view.rules().enabled(fixAMMv1_2);
     // If seated after a call to sufficientReserve() then MPToken must be
     // authorized
     std::optional<Keylet> mptokenKey;
     auto sufficientReserve = [&](Asset const& asset) -> TER {
         mptokenKey = std::nullopt;
-        if (!enabledFixAMMv1_2 || isXRP(asset))
+        if (!enabledFixAmMv12 || isXRP(asset))
             return tesSUCCESS;
         bool const isIssue = asset.holds<Issue>();
         bool const assetNotExists = [&] {
@@ -629,11 +629,11 @@ AMMWithdraw::withdraw(
 
             // See also TrustSet::doApply() and MPTokenAuthorize::authorize()
             XRPAmount const reserve(
-                (ownerCount < 2) ? XRPAmount(beast::zero)
+                (ownerCount < 2) ? XRPAmount(beast::kZERO)
                                  : view.fees().accountReserve(ownerCount + 1));
 
-            auto const balance_ = isIssue ? std::max(priorBalance, balance.xrp()) : priorBalance;
-            if (balance_ < reserve)
+            auto const balanceAdj = isIssue ? std::max(priorBalance, balance.xrp()) : priorBalance;
+            if (balanceAdj < reserve)
                 return tecINSUFFICIENT_RESERVE;
 
             // Update owner count.
@@ -756,8 +756,8 @@ AMMWithdraw::equalWithdrawTokens(
         lpTokens,
         lpTokensWithdraw,
         tfee,
-        FreezeHandling::fhZERO_IF_FROZEN,
-        AuthHandling::ahZERO_IF_UNAUTHORIZED,
+        FreezeHandling::ZeroIfFrozen,
+        AuthHandling::ZeroIfUnauthorized,
         isWithdrawAll(ctx_.tx),
         preFeeBalance_,
         ctx_.journal);
@@ -775,7 +775,7 @@ AMMWithdraw::deleteAMMAccountIfEmpty(
 {
     TER ter;
     bool updateBalance = true;
-    if (lpTokenBalance == beast::zero)
+    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::zero)
+        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::zero || amount2Withdraw == beast::zero)
+        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::zero)
+    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::zero)
+    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::zero)
+    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::zero)
+    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::zero)
+    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::zero || 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::zero)
+    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::zero || 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 1ce48145f3..b69ed766c5 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::zero;
+        return amount.native() ? amount.xrp() : beast::kZERO;
     };
 
     return TxConsequences{ctx.tx, calculateMaxXRPSpend(ctx.tx)};
@@ -130,7 +130,7 @@ OfferCreate::preflight(PreflightContext const& ctx)
         JLOG(j.debug()) << "Malformed offer: redundant (XRP for XRP)";
         return temBAD_OFFER;
     }
-    if (saTakerPays <= beast::zero || saTakerGets <= beast::zero)
+    if (saTakerPays <= beast::kZERO || saTakerGets <= beast::kZERO)
     {
         JLOG(j.debug()) << "Malformed offer: bad amount";
         return temBAD_OFFER;
@@ -196,9 +196,9 @@ OfferCreate::preclaim(PreclaimContext const& ctx)
             ctx.view,
             id,
             saTakerGets,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
-            viewJ) <= beast::zero)
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
+            viewJ) <= beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "delay: Offers must be at least partially funded.";
         return tecUNFUNDED_OFFER;
@@ -262,7 +262,7 @@ OfferCreate::checkAcceptAsset(
         JLOG(j.debug()) << "delay: can't receive IOUs from non-existent issuer: "
                         << to_string(asset.getIssuer());
 
-        return ((flags & tapRETRY) != 0u) ? TER{terNO_ACCOUNT} : TER{tecNO_ISSUER};
+        return ((flags & TapRetry) != 0u) ? TER{terNO_ACCOUNT} : TER{tecNO_ISSUER};
     }
 
     // An account cannot create a trustline to itself, so no line can exist
@@ -280,24 +280,24 @@ OfferCreate::checkAcceptAsset(
 
                 if (!trustLine)
                 {
-                    return ((flags & tapRETRY) != 0u) ? TER{terNO_LINE} : TER{tecNO_LINE};
+                    return ((flags & TapRetry) != 0u) ? TER{terNO_LINE} : TER{tecNO_LINE};
                 }
 
                 // Entries have a canonical representation, determined by a
                 // lexicographical "greater than" comparison employing
                 // strict weak ordering. Determine which entry we need to
                 // access.
-                bool const canonical_gt(id > issuer);
+                bool const canonicalGt(id > issuer);
 
-                bool const is_authorized(
-                    ((*trustLine)[sfFlags] & (canonical_gt ? lsfLowAuth : lsfHighAuth)) != 0u);
+                bool const isAuthorized(
+                    ((*trustLine)[sfFlags] & (canonicalGt ? lsfLowAuth : lsfHighAuth)) != 0u);
 
-                if (!is_authorized)
+                if (!isAuthorized)
                 {
                     JLOG(j.debug()) << "delay: can't receive IOUs from "
                                        "issuer without auth.";
 
-                    return ((flags & tapRETRY) != 0u) ? TER{terNO_AUTH} : TER{tecNO_AUTH};
+                    return ((flags & TapRetry) != 0u) ? TER{terNO_AUTH} : TER{tecNO_AUTH};
                 }
             }
 
@@ -346,13 +346,13 @@ OfferCreate::flowCross(
             psb,
             account_,
             takerAmount.in,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             j_);
         // Allow unfunded MPT issuer
         auto const disallowUnfunded =
             !inStartBalance.holds<MPTIssue>() || inStartBalance.getIssuer() != account_;
-        if (disallowUnfunded && inStartBalance <= beast::zero)
+        if (disallowUnfunded && inStartBalance <= beast::kZERO)
         {
             // The account balance can't cover even part of the offer.
             JLOG(j_.debug()) << "Not crossing: taker is unfunded.";
@@ -396,16 +396,16 @@ OfferCreate::flowCross(
         if (!takerAmount.in.native() && !takerAmount.out.native())
         {
             STPath path;
-            path.emplace_back(std::nullopt, xrpCurrency(), std::nullopt);
-            paths.emplace_back(std::move(path));
+            path.emplaceBack(std::nullopt, xrpCurrency(), std::nullopt);
+            paths.emplaceBack(std::move(path));
         }
         // Special handling for the tfSell flag.
         STAmount deliver = takerAmount.out;
         auto const& deliverAsset = deliver.asset();
-        OfferCrossing offerCrossing = OfferCrossing::yes;
+        OfferCrossing offerCrossing = OfferCrossing::Yes;
         if ((txFlags & tfSell) != 0u)
         {
-            offerCrossing = OfferCrossing::sell;
+            offerCrossing = OfferCrossing::Sell;
             // We are selling, so we will accept *more* than the offer
             // specified.  Since we don't know how much they might offer,
             // we allow delivery of the largest possible amount.
@@ -413,7 +413,7 @@ OfferCreate::flowCross(
                 [&](Issue const& issue) {
                     if (issue.native())
                     {
-                        deliver = STAmount{STAmount::cMaxNative};
+                        deliver = STAmount{STAmount::kMAX_NATIVE};
                     }
                     // We can't use the maximum possible currency here because
                     // there might be a gateway transfer rate to account for.
@@ -422,10 +422,12 @@ OfferCreate::flowCross(
                     else
                     {
                         deliver =
-                            STAmount{deliverAsset, STAmount::cMaxValue / 2, STAmount::cMaxOffset};
+                            STAmount{deliverAsset, STAmount::kMAX_VALUE / 2, STAmount::kMAX_OFFSET};
                     }
                 },
-                [&](MPTIssue const&) { deliver = STAmount{deliverAsset, maxMPTokenAmount / 2}; });
+                [&](MPTIssue const&) {
+                    deliver = STAmount{deliverAsset, kMAX_MP_TOKEN_AMOUNT / 2};
+                });
         }
 
         // Call the payment engine's flow() to do the actual work.
@@ -461,11 +463,11 @@ OfferCreate::flowCross(
                 psb,
                 account_,
                 takerAmount.in,
-                FreezeHandling::fhZERO_IF_FROZEN,
-                AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                FreezeHandling::ZeroIfFrozen,
+                AuthHandling::ZeroIfUnauthorized,
                 j_);
 
-            if (disallowUnfunded && takerInBalance <= beast::zero)
+            if (disallowUnfunded && takerInBalance <= beast::kZERO)
             {
                 // If offer crossing exhausted the account's funds don't
                 // create the offer.
@@ -496,8 +498,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 zero.
-                    if (afterCross.in < beast::zero)
+                    // 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?
@@ -514,9 +516,9 @@ OfferCreate::flowCross(
                     // Quality.
                     afterCross.out -= result.actualAmountOut;
                     XRPL_ASSERT(
-                        afterCross.out >= beast::zero,
+                        afterCross.out >= beast::kZERO,
                         "xrpl::OfferCreate::flowCross : minimum offer");
-                    if (afterCross.out < beast::zero)
+                    if (afterCross.out < beast::kZERO)
                         afterCross.out.clear();
                     afterCross.in = mulRound(afterCross.out, rate, takerAmount.in.asset(), true);
                 }
@@ -534,7 +536,7 @@ OfferCreate::flowCross(
 }
 
 std::string
-OfferCreate::format_amount(STAmount const& amount)
+OfferCreate::formatAmount(STAmount const& amount)
 {
     std::string txt = amount.getText();
     txt += "/";
@@ -562,7 +564,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::book(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) {
@@ -581,7 +583,7 @@ OfferCreate::applyHybrid(
     auto bookInfo = STObject::makeInnerObject(sfBook);
     bookInfo.setFieldH256(sfBookDirectory, dir.key);
     bookInfo.setFieldU64(sfBookNode, *bookNode);
-    bookArr.push_back(std::move(bookInfo));
+    bookArr.pushBack(std::move(bookInfo));
 
     if (!bookExists)
         ctx_.registry.get().getOrderBookDB().addOrderBook(book);
@@ -593,7 +595,7 @@ OfferCreate::applyHybrid(
 std::pair<TER, bool>
 OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
 {
-    using beast::zero;
+    using beast::kZERO;
 
     std::uint32_t const uTxFlags = ctx_.tx.getFlags();
 
@@ -654,7 +656,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         auto const& uPaysIssuerID = saTakerPays.getIssuer();
         auto const& uGetsIssuerID = saTakerGets.getIssuer();
 
-        std::uint8_t uTickSize = Quality::maxTickSize;
+        std::uint8_t uTickSize = Quality::kMAX_TICK_SIZE;
         // Not XRP or MPT
         if (!saTakerPays.integral())
         {
@@ -669,7 +671,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
             if (sle && sle->isFieldPresent(sfTickSize))
                 uTickSize = std::min(uTickSize, (*sle)[sfTickSize]);
         }
-        if (uTickSize < Quality::maxTickSize)
+        if (uTickSize < Quality::kMAX_TICK_SIZE)
         {
             auto const rate = Quality{saTakerGets, saTakerPays}.round(uTickSize).rate();
 
@@ -705,18 +707,18 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         if (auto stream = j_.trace())
         {
             stream << "   mode: " << (bPassive ? "passive " : "") << (bSell ? "sell" : "buy");
-            stream << "     in: " << format_amount(takerAmount.in);
-            stream << "    out: " << format_amount(takerAmount.out);
+            stream << "     in: " << formatAmount(takerAmount.in);
+            stream << "    out: " << formatAmount(takerAmount.out);
         }
 
         // The amount of the offer that is unfilled after crossing has been
         // performed. It may be equal to the original amount (didn't cross),
         // empty (fully crossed), or something in-between.
-        Amounts place_offer;
+        Amounts placeOffer;
         PaymentSandbox psbFlow{&sb};
         PaymentSandbox psbCancelFlow{&sbCancel};
 
-        std::tie(result, place_offer) = flowCross(psbFlow, psbCancelFlow, takerAmount, domainID);
+        std::tie(result, placeOffer) = flowCross(psbFlow, psbCancelFlow, takerAmount, domainID);
         psbFlow.apply(sb);
         psbCancelFlow.apply(sbCancel);
 
@@ -730,8 +732,8 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         if (auto stream = j_.trace())
         {
             stream << "Cross result: " << transToken(result);
-            stream << "     in: " << format_amount(place_offer.in);
-            stream << "    out: " << format_amount(place_offer.out);
+            stream << "     in: " << formatAmount(placeOffer.in);
+            stream << "    out: " << formatAmount(placeOffer.out);
         }
 
         if (result == tecFAILED_PROCESSING && sb.open())
@@ -744,26 +746,26 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         }
 
         XRPL_ASSERT(
-            saTakerGets.asset() == place_offer.in.asset(),
+            saTakerGets.asset() == placeOffer.in.asset(),
             "xrpl::OfferCreate::applyGuts : taker gets issue match");
         XRPL_ASSERT(
-            saTakerPays.asset() == place_offer.out.asset(),
+            saTakerPays.asset() == placeOffer.out.asset(),
             "xrpl::OfferCreate::applyGuts : taker pays issue match");
 
-        if (takerAmount != place_offer)
+        if (takerAmount != placeOffer)
             crossed = true;
 
         // The offer that we need to place after offer crossing should
         // never be negative. If it is, something went very very wrong.
-        if (place_offer.in < zero || place_offer.out < zero)
+        if (placeOffer.in < kZERO || placeOffer.out < kZERO)
         {
             JLOG(j_.fatal()) << "Cross left offer negative!"
-                             << "     in: " << format_amount(place_offer.in)
-                             << "    out: " << format_amount(place_offer.out);
+                             << "     in: " << formatAmount(placeOffer.in)
+                             << "    out: " << formatAmount(placeOffer.out);
             return {tefINTERNAL, true};
         }
 
-        if (place_offer.in == zero || place_offer.out == zero)
+        if (placeOffer.in == kZERO || placeOffer.out == kZERO)
         {
             JLOG(j_.debug()) << "Offer fully crossed!";
             return {result, true};
@@ -772,12 +774,12 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         // We now need to adjust the offer to reflect the amount left after
         // crossing. We reverse in and out here, since during crossing we
         // were the taker.
-        saTakerPays = place_offer.out;
-        saTakerGets = place_offer.in;
+        saTakerPays = placeOffer.out;
+        saTakerGets = placeOffer.in;
     }
 
     XRPL_ASSERT(
-        saTakerPays > zero && saTakerGets > zero,
+        saTakerPays > beast::kZERO && saTakerGets > beast::kZERO,
         "xrpl::OfferCreate::applyGuts : taker pays and gets positive");
 
     if (!isTesSuccess(result))
@@ -842,11 +844,11 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     }
 
     // We need to place the remainder of the offer into its order book.
-    auto const offer_index = keylet::offer(account_, offerSequence);
+    auto const offerIndex = keylet::offer(account_, offerSequence);
 
     // Add offer to owner's directory.
     auto const ownerNode =
-        sb.dirInsert(keylet::ownerDir(account_), offer_index, describeOwnerDir(account_));
+        sb.dirInsert(keylet::ownerDir(account_), offerIndex, describeOwnerDir(account_));
 
     if (!ownerNode)
     {
@@ -876,7 +878,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::book(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) {
@@ -897,7 +899,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
             sle->setFieldH256(sfDomainID, *maybeDomain);
     };
 
-    auto const bookNode = sb.dirAppend(dir, offer_index, [&](SLE::ref sle) {
+    auto const bookNode = sb.dirAppend(dir, offerIndex, [&](SLE::ref sle) {
         // sets domainID on book directory if it's a domain offer
         setBookDir(sle, domainID);
     });
@@ -910,7 +912,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
         // LCOV_EXCL_STOP
     }
 
-    auto sleOffer = std::make_shared<SLE>(offer_index);
+    auto sleOffer = std::make_shared<SLE>(offerIndex);
     sleOffer->setAccountID(sfAccount, account_);
     sleOffer->setFieldU32(sfSequence, offerSequence);
     sleOffer->setFieldH256(sfBookDirectory, dir.key);
@@ -931,7 +933,7 @@ OfferCreate::applyGuts(Sandbox& sb, Sandbox& sbCancel)
     if (bHybrid)
     {
         auto const res =
-            applyHybrid(sb, sleOffer, offer_index, saTakerPays, saTakerGets, setBookDir);
+            applyHybrid(sb, sleOffer, offerIndex, saTakerPays, saTakerGets, setBookDir);
         if (!isTesSuccess(res))
             return {res, true};  // LCOV_EXCL_LINE
     }
diff --git a/src/libxrpl/tx/transactors/did/DIDSet.cpp b/src/libxrpl/tx/transactors/did/DIDSet.cpp
index 3aa9966570..69bb9dd839 100644
--- a/src/libxrpl/tx/transactors/did/DIDSet.cpp
+++ b/src/libxrpl/tx/transactors/did/DIDSet.cpp
@@ -55,8 +55,9 @@ DIDSet::preflight(PreflightContext const& ctx)
         return false;
     };
 
-    if (isTooLong(sfURI, maxDIDURILength) || isTooLong(sfDIDDocument, maxDIDDocumentLength) ||
-        isTooLong(sfData, maxDIDDataLength))
+    if (isTooLong(sfURI, kMAX_DIDURI_LENGTH) ||
+        isTooLong(sfDIDDocument, kMAX_DID_DOCUMENT_LENGTH) ||
+        isTooLong(sfData, kMAX_DID_DATA_LENGTH))
         return temMALFORMED;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCancel.cpp
index edc07fa0f7..9a48123201 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(),
-                        parityRate,
+                        kPARITY_RATE,
                         slep,
                         preFeeBalance_,
                         amount,
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp b/src/libxrpl/tx/transactors/escrow/EscrowCreate.cpp
index c112d3b349..d5bbe17325 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::zero};
+    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::zero)
+    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{maxMPTokenAmount} || amount <= beast::zero)
+    if (amount.native() || amount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT} || amount <= beast::kZERO)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -130,7 +130,7 @@ EscrowCreate::preflight(PreflightContext const& ctx)
     }
     else
     {
-        if (amount <= beast::zero)
+        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::zero && 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::zero && 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
@@ -229,10 +229,10 @@ escrowCreatePreclaimHelper<Issue>(
         return tecFROZEN;
 
     STAmount const spendableAmount = accountHolds(
-        ctx.view, account, issue.currency, issuer, FreezeHandling::fhIGNORE_FREEZE, ctx.j);
+        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::zero)
+    if (spendableAmount <= beast::kZERO)
         return tecINSUFFICIENT_FUNDS;
 
     // If the spendable amount is less than the amount, return
@@ -308,12 +308,12 @@ escrowCreatePreclaimHelper<MPTIssue>(
         ctx.view,
         account,
         amount.get<MPTIssue>(),
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         ctx.j);
 
     // If the balance is less than or equal to 0, return tecINSUFFICIENT_FUNDS
-    if (spendableAmount <= beast::zero)
+    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 != parityRate)
+        if (xferRate != kPARITY_RATE)
             (*slep)[sfTransferRate] = xferRate.value;
     }
 
diff --git a/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp b/src/libxrpl/tx/transactors/escrow/EscrowFinish.cpp
index c8697fbaa8..116466a1a3 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 SF_CF_INVALID = HashRouterFlags::PRIVATE5;
-constexpr HashRouterFlags SF_CF_VALID = HashRouterFlags::PRIVATE6;
+constexpr HashRouterFlags kSF_CF_INVALID = HashRouterFlags::PRIVATE5;
+constexpr HashRouterFlags kSF_CF_VALID = 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 & (SF_CF_INVALID | SF_CF_VALID)))
+        if (!any(flags & (kSF_CF_INVALID | kSF_CF_VALID)))
         {
             if (checkCondition(*fb, *cb))
             {
-                router.setFlags(id, SF_CF_VALID);
+                router.setFlags(id, kSF_CF_VALID);
             }
             else
             {
-                router.setFlags(id, SF_CF_INVALID);
+                router.setFlags(id, kSF_CF_INVALID);
             }
         }
     }
@@ -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 & (SF_CF_INVALID | SF_CF_VALID)))
+        if (cb && !any(flags & (kSF_CF_INVALID | kSF_CF_VALID)))
         {
             // LCOV_EXCL_START
             auto const fb = ctx_.tx[~sfFulfillment];
@@ -271,11 +271,11 @@ EscrowFinish::doApply()
 
             if (checkCondition(*fb, *cb))
             {
-                flags = SF_CF_VALID;
+                flags = kSF_CF_VALID;
             }
             else
             {
-                flags = SF_CF_INVALID;
+                flags = kSF_CF_INVALID;
             }
 
             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 & SF_CF_INVALID))
+        if (any(flags & kSF_CF_INVALID))
             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))
-            : parityRate;
+            : kPARITY_RATE;
         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 6dc57479e6..14bc5f7a51 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::zero)
+    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::zero)
+        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::zero)
+            if (holder == account || holder == beast::kZERO)
                 return temINVALID;
         }
     }
@@ -164,20 +164,20 @@ determineClawAmount(
 {
     auto const maxClawAmount = [&]() {
         // Always round the minimum required up
-        NumberRoundModeGuard const mg1(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg1(Number::RoundingMode::Upward);
         auto const minRequiredCover =
             tenthBipsOfValue(sleBroker[sfDebtTotal], TenthBips32(sleBroker[sfCoverRateMinimum]));
         // The subtraction probably won't round, but round down if it does.
-        NumberRoundModeGuard const mg2(Number::rounding_mode::downward);
+        NumberRoundModeGuard const mg2(Number::RoundingMode::Downward);
         return sleBroker[sfCoverAvailable] - minRequiredCover;
     }();
-    if (maxClawAmount <= beast::zero)
+    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::zero)
+    if (!amount || *amount == beast::kZERO)
         return STAmount{vaultAsset, maxClawAmount};
     Number const magnitude{*amount};
     if (magnitude > maxClawAmount)
@@ -298,8 +298,8 @@ LoanBrokerCoverClawback::preclaim(PreclaimContext const& ctx)
             ctx.view,
             brokerPseudoAccountID,
             vaultAsset,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             ctx.j) < clawAmount)
         return tecINTERNAL;  // tecINSUFFICIENT_FUNDS; LCOV_EXCL_LINE
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverDeposit.cpp
index 9b43269ec3..a8fa91b648 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::zero)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
         return temINVALID;
 
     auto const dstAmount = ctx.tx[sfAmount];
-    if (dstAmount <= beast::zero)
+    if (dstAmount <= beast::kZERO)
         return temBAD_AMOUNT;
 
     if (!isLegalNet(dstAmount))
@@ -91,10 +91,10 @@ LoanBrokerCoverDeposit::preclaim(PreclaimContext const& ctx)
             ctx.view,
             account,
             vaultAsset,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             ctx.j,
-            SpendableHandling::shFULL_BALANCE) < amount)
+            SpendableHandling::FullBalance) < amount)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerCoverWithdraw.cpp
index 06f2e518ab..ca4136be0a 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::zero)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
         return temINVALID;
 
     auto const dstAmount = ctx.tx[sfAmount];
-    if (dstAmount <= beast::zero)
+    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::zero)
+        if (*destination == beast::kZERO)
         {
             return temMALFORMED;
         }
@@ -133,7 +133,7 @@ LoanBrokerCoverWithdraw::preclaim(PreclaimContext const& ctx)
     auto const minimumCover = [&]() {
         // Always round the minimum required up.
         // Applies to `tenthBipsOfValue` as well as `roundToAsset`.
-        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
         return roundToAsset(
             vaultAsset,
             tenthBipsOfValue(currentDebtTotal, TenthBips32(sleBroker->at(sfCoverRateMinimum))),
@@ -148,8 +148,8 @@ LoanBrokerCoverWithdraw::preclaim(PreclaimContext const& ctx)
             ctx.view,
             pseudoAccountID,
             vaultAsset,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             ctx.j) < amount)
         return tecINSUFFICIENT_FUNDS;
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanBrokerDelete.cpp
index 8343b6e931..0d6d6e6cd6 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::zero)
+    if (ctx.tx[sfLoanBrokerID] == beast::kZERO)
         return temINVALID;
 
     return tesSUCCESS;
@@ -75,16 +75,16 @@ LoanBrokerDelete::preclaim(PreclaimContext const& ctx)
 
     Asset const asset = vault->at(sfAsset);
 
-    if (auto const debtTotal = sleBroker->at(sfDebtTotal); debtTotal != beast::zero)
+    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.
         auto const scale = getAssetsTotalScale(vault);
 
         auto const rounded =
-            roundToAsset(asset, debtTotal, scale, Number::rounding_mode::towards_zero);
+            roundToAsset(asset, debtTotal, scale, Number::RoundingMode::TowardsZero);
 
-        if (rounded != beast::zero)
+        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::zero)
+    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 561890abbf..bf00a344a7 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], maxDataPayloadLength))
+        data && !data->empty() && !validDataLength(tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
         return temINVALID;
-    if (!validNumericRange(tx[~sfManagementFeeRate], maxManagementFeeRate))
+    if (!validNumericRange(tx[~sfManagementFeeRate], kMAX_MANAGEMENT_FEE_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCoverRateMinimum], maxCoverRate))
+    if (!validNumericRange(tx[~sfCoverRateMinimum], kMAX_COVER_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCoverRateLiquidation], maxCoverRate))
+    if (!validNumericRange(tx[~sfCoverRateLiquidation], kMAX_COVER_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfDebtMaximum], Number(maxMPTokenAmount), Number(0)))
+    if (!validNumericRange(tx[~sfDebtMaximum], Number(kMAX_MP_TOKEN_AMOUNT), 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::zero)
+        if (tx[sfLoanBrokerID] == beast::kZERO)
             return temINVALID;
     }
 
     if (auto const vaultID = tx.at(~sfVaultID))
     {
-        if (*vaultID == beast::zero)
+        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 valueFields{~sfDebtMaximum};
+    static std::vector<OptionaledField<STNumber>> const kVALUE_FIELDS{~sfDebtMaximum};
 
-    return valueFields;
+    return kVALUE_FIELDS;
 }
 
 TER
diff --git a/src/libxrpl/tx/transactors/lending/LoanDelete.cpp b/src/libxrpl/tx/transactors/lending/LoanDelete.cpp
index 875af3a03b..ff33bfb9fb 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::zero)
+    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::zero)
+        if (*debtTotalProxy != beast::kZERO)
         {
             XRPL_ASSERT_PARTS(
                 roundToAsset(
                     vaultSle->at(sfAsset),
                     debtTotalProxy,
                     getAssetsTotalScale(vaultSle),
-                    Number::rounding_mode::towards_zero) == beast::zero,
+                    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 de3de6ca25..d1cd5de505 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::zero)
+    if (ctx.tx[sfLoanID] == beast::kZERO)
         return temINVALID;
 
     // Flags are mutually exclusive
@@ -167,7 +167,7 @@ LoanManage::defaultLoan(
     TenthBips32 const coverRateLiquidation{brokerSle->at(sfCoverRateLiquidation)};
     auto const defaultCovered = [&]() {
         // Always round the minimum required up.
-        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
         auto const minimumCover = tenthBipsOfValue(brokerDebtTotalProxy.value(), coverRateMinimum);
         // Round the liquidation amount up, too
         auto const covered = roundToAsset(
@@ -207,7 +207,7 @@ LoanManage::defaultLoan(
         }
 
         auto const vaultDefaultRounded = roundToAsset(
-            vaultAsset, vaultDefaultAmount, vaultScale, Number::rounding_mode::downward);
+            vaultAsset, vaultDefaultAmount, vaultScale, Number::RoundingMode::Downward);
         vaultTotalProxy -= vaultDefaultRounded;
         // Increase the Asset Available of the Vault by liquidated First-Loss
         // Capital and any unclaimed funds amount:
@@ -418,7 +418,7 @@ LoanManage::doApply()
             return impairLoan(view, loanSle, vaultSle, vaultAsset, j_);
         if (tx.isFlag(tfLoanUnimpair))
             return unimpairLoan(view, loanSle, vaultSle, vaultAsset, j_);
-        // Noop, as described above.
+        // NoOp, as described above.
         return tesSUCCESS;
     }();
 
diff --git a/src/libxrpl/tx/transactors/lending/LoanPay.cpp b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
index f24fdc19b3..b8d73bfd65 100644
--- a/src/libxrpl/tx/transactors/lending/LoanPay.cpp
+++ b/src/libxrpl/tx/transactors/lending/LoanPay.cpp
@@ -48,10 +48,10 @@ LoanPay::getFlagsMask(PreflightContext const& ctx)
 NotTEC
 LoanPay::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfLoanID] == beast::zero)
+    if (ctx.tx[sfLoanID] == beast::kZERO)
         return temINVALID;
 
-    if (ctx.tx[sfAmount] <= beast::zero)
+    if (ctx.tx[sfAmount] <= beast::kZERO)
         return temBAD_AMOUNT;
 
     // The loan payment flags are all mutually exclusive. If more than one is
@@ -96,7 +96,7 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
         return normalCost;
     }
 
-    if (loanSle->at(sfPaymentRemaining) <= loanPaymentsPerFeeIncrement)
+    if (loanSle->at(sfPaymentRemaining) <= kLOAN_PAYMENTS_PER_FEE_INCREMENT)
     {
         // If there are fewer than loanPaymentsPerFeeIncrement payments left to
         // pay, we can skip the computations.
@@ -139,16 +139,16 @@ LoanPay::calculateBaseFee(ReadView const& view, STTx const& tx)
     // If making an overpayment, count it as a full payment because it will do
     // about the same amount of work, if not more.
     NumberRoundModeGuard const mg(
-        tx.isFlag(tfLoanOverpayment) ? Number::rounding_mode::upward
-                                     : Number::rounding_mode::downward);
+        tx.isFlag(tfLoanOverpayment) ? Number::RoundingMode::Upward
+                                     : Number::RoundingMode::Downward);
     // Estimate how many payments will be made
     Number const numPaymentEstimate = static_cast<std::int64_t>(amount / regularPayment);
 
     // Charge one base fee per paymentsPerFeeIncrement payments, rounding up.
-    Number::setround(Number::rounding_mode::upward);
+    Number::setround(Number::RoundingMode::Upward);
     auto const feeIncrements = std::max(
         std::int64_t(1),
-        static_cast<std::int64_t>(numPaymentEstimate / loanPaymentsPerFeeIncrement));
+        static_cast<std::int64_t>(numPaymentEstimate / kLOAN_PAYMENTS_PER_FEE_INCREMENT));
 
     return feeIncrements * normalCost;
 }
@@ -242,10 +242,10 @@ LoanPay::preclaim(PreclaimContext const& ctx)
             ctx.view,
             account,
             asset,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             ctx.j,
-            SpendableHandling::shFULL_BALANCE);
+            SpendableHandling::FullBalance);
         balance < amount)
     {
         JLOG(ctx.j.warn()) << "Payment amount too large. Amount: " << to_string(amount.getJson())
@@ -300,7 +300,7 @@ LoanPay::doApply()
         // Round the minimum required cover up to be conservative. This ensures
         // CoverAvailable never drops below the theoretical minimum, protecting
         // the broker's solvency.
-        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
         return coverAvailableProxy >=
             roundToAsset(
                    asset, tenthBipsOfValue(debtTotalProxy.value(), coverRateMinimum), loanScale) &&
@@ -340,12 +340,12 @@ LoanPay::doApply()
     LoanPaymentType const paymentType = [&tx]() {
         // preflight already checked that at most one flag is set.
         if (tx.isFlag(tfLoanLatePayment))
-            return LoanPaymentType::late;
+            return LoanPaymentType::Late;
         if (tx.isFlag(tfLoanFullPayment))
-            return LoanPaymentType::full;
+            return LoanPaymentType::Full;
         if (tx.isFlag(tfLoanOverpayment))
-            return LoanPaymentType::overpayment;
-        return LoanPaymentType::regular;
+            return LoanPaymentType::Overpayment;
+        return LoanPaymentType::Regular;
     }();
 
     Expected<LoanPaymentParts, TER> const paymentParts =
@@ -406,7 +406,7 @@ LoanPay::doApply()
 
     auto const totalPaidToVaultRaw = paymentParts->principalPaid + paymentParts->interestPaid;
     auto const totalPaidToVaultRounded =
-        roundToAsset(asset, totalPaidToVaultRaw, vaultScale, Number::rounding_mode::downward);
+        roundToAsset(asset, totalPaidToVaultRaw, vaultScale, Number::RoundingMode::Downward);
     XRPL_ASSERT_PARTS(
         !asset.integral() || totalPaidToVaultRaw == totalPaidToVaultRounded,
         "xrpl::LoanPay::doApply",
@@ -449,8 +449,8 @@ LoanPay::doApply()
             view,
             vaultPseudoAccount,
             asset,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             j_);
 
         XRPL_ASSERT_PARTS(
@@ -513,39 +513,38 @@ LoanPay::doApply()
         view,
         account_,
         asset,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         j_,
-        SpendableHandling::shFULL_BALANCE);
+        SpendableHandling::FullBalance);
     auto const vaultBalanceBefore = account_ == vaultPseudoAccount
         ? STAmount{asset, 0}
         : accountHolds(
               view,
               vaultPseudoAccount,
               asset,
-              FreezeHandling::fhIGNORE_FREEZE,
-              AuthHandling::ahIGNORE_AUTH,
+              FreezeHandling::IgnoreFreeze,
+              AuthHandling::IgnoreAuth,
               j_,
-              SpendableHandling::shFULL_BALANCE);
-    auto const brokerBalanceBefore = account_ == brokerPayee
-        ? STAmount{asset, 0}
-        : accountHolds(
-              view,
-              brokerPayee,
-              asset,
-              FreezeHandling::fhIGNORE_FREEZE,
-              AuthHandling::ahIGNORE_AUTH,
-              j_,
-              SpendableHandling::shFULL_BALANCE);
+              SpendableHandling::FullBalance);
+    auto const brokerBalanceBefore = account_ == brokerPayee ? STAmount{asset, 0}
+                                                             : accountHolds(
+                                                                   view,
+                                                                   brokerPayee,
+                                                                   asset,
+                                                                   FreezeHandling::IgnoreFreeze,
+                                                                   AuthHandling::IgnoreAuth,
+                                                                   j_,
+                                                                   SpendableHandling::FullBalance);
 #endif
 
-    if (totalPaidToVaultRounded != beast::zero)
+    if (totalPaidToVaultRounded != beast::kZERO)
     {
         if (auto const ter = requireAuth(view, asset, vaultPseudoAccount, AuthType::StrongAuth))
             return ter;
     }
 
-    if (totalPaidToBroker != beast::zero)
+    if (totalPaidToBroker != beast::kZERO)
     {
         if (brokerPayee == account_)
         {
@@ -578,8 +577,8 @@ LoanPay::doApply()
         view,
         vaultPseudoAccount,
         asset,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         j_);
     XRPL_ASSERT_PARTS(
         assetsAvailableAfter == pseudoAccountBalanceAfter,
@@ -590,30 +589,29 @@ LoanPay::doApply()
         view,
         account_,
         asset,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         j_,
-        SpendableHandling::shFULL_BALANCE);
+        SpendableHandling::FullBalance);
     auto const vaultBalanceAfter = account_ == vaultPseudoAccount
         ? STAmount{asset, 0}
         : accountHolds(
               view,
               vaultPseudoAccount,
               asset,
-              FreezeHandling::fhIGNORE_FREEZE,
-              AuthHandling::ahIGNORE_AUTH,
+              FreezeHandling::IgnoreFreeze,
+              AuthHandling::IgnoreAuth,
               j_,
-              SpendableHandling::shFULL_BALANCE);
-    auto const brokerBalanceAfter = account_ == brokerPayee
-        ? STAmount{asset, 0}
-        : accountHolds(
-              view,
-              brokerPayee,
-              asset,
-              FreezeHandling::fhIGNORE_FREEZE,
-              AuthHandling::ahIGNORE_AUTH,
-              j_,
-              SpendableHandling::shFULL_BALANCE);
+              SpendableHandling::FullBalance);
+    auto const brokerBalanceAfter = account_ == brokerPayee ? STAmount{asset, 0}
+                                                            : accountHolds(
+                                                                  view,
+                                                                  brokerPayee,
+                                                                  asset,
+                                                                  FreezeHandling::IgnoreFreeze,
+                                                                  AuthHandling::IgnoreAuth,
+                                                                  j_,
+                                                                  SpendableHandling::FullBalance);
 
     XRPL_ASSERT_PARTS(
         accountBalanceBefore + vaultBalanceBefore + brokerBalanceBefore ==
@@ -621,13 +619,13 @@ LoanPay::doApply()
         "xrpl::LoanPay::doApply",
         "funds are conserved (with rounding)");
     XRPL_ASSERT_PARTS(
-        accountBalanceAfter >= beast::zero, "xrpl::LoanPay::doApply", "positive account balance");
+        accountBalanceAfter >= beast::kZERO, "xrpl::LoanPay::doApply", "positive account balance");
     XRPL_ASSERT_PARTS(
         accountBalanceAfter < accountBalanceBefore || account_ == asset.getIssuer(),
         "xrpl::LoanPay::doApply",
         "account balance decreased");
     XRPL_ASSERT_PARTS(
-        vaultBalanceAfter >= beast::zero && brokerBalanceAfter >= beast::zero,
+        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 757ec0ec66..9503eeef03 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], maxDataPayloadLength))
+        data && !data->empty() && !validDataLength(tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
         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], maxInterestRate))
+    if (!validNumericRange(tx[~sfInterestRate], kMAX_INTEREST_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfOverpaymentFee], maxOverpaymentFee))
+    if (!validNumericRange(tx[~sfOverpaymentFee], kMAX_OVERPAYMENT_FEE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfLateInterestRate], maxLateInterestRate))
+    if (!validNumericRange(tx[~sfLateInterestRate], kMAX_LATE_INTEREST_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfCloseInterestRate], maxCloseInterestRate))
+    if (!validNumericRange(tx[~sfCloseInterestRate], kMAX_CLOSE_INTEREST_RATE))
         return temINVALID;
-    if (!validNumericRange(tx[~sfOverpaymentInterestRate], maxOverpaymentInterestRate))
+    if (!validNumericRange(tx[~sfOverpaymentInterestRate], kMAX_OVERPAYMENT_INTEREST_RATE))
         return temINVALID;
 
     if (auto const paymentTotal = tx[~sfPaymentTotal]; paymentTotal && *paymentTotal <= 0)
         return temINVALID;
 
     auto const paymentInterval = tx[~sfPaymentInterval];
-    if (!validNumericMinimum(paymentInterval, LoanSet::minPaymentInterval))
+    if (!validNumericMinimum(paymentInterval, LoanSet::kMIN_PAYMENT_INTERVAL))
         return temINVALID;  // Grace period is between min default value and payment interval
     if (auto const gracePeriod = tx[~sfGracePeriod]; !validNumericRange(
             gracePeriod,
-            paymentInterval.value_or(LoanSet::defaultPaymentInterval),
-            defaultGracePeriod))
+            paymentInterval.value_or(LoanSet::kDEFAULT_PAYMENT_INTERVAL),
+            kDEFAULT_GRACE_PERIOD))
     {
         return temINVALID;
     }
@@ -131,7 +131,7 @@ LoanSet::preflight(PreflightContext const& ctx)
             return *ret;
     }
 
-    if (auto const brokerID = ctx.tx[~sfLoanBrokerID]; brokerID && *brokerID == beast::zero)
+    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 valueFields{
+    static std::vector<OptionaledField<STNumber>> const kVALUE_FIELDS{
         ~sfPrincipalRequested,
         ~sfLoanOriginationFee,
         ~sfLoanServiceFee,
@@ -204,7 +204,7 @@ LoanSet::getValueFields()
         // Overpayment fee is really a rate. Don't check it here.
     };
 
-    return valueFields;
+    return kVALUE_FIELDS;
 }
 
 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 maxTime = std::numeric_limits<timeType>::max();
-        static_assert(maxTime == 4'294'967'295);
+        timeType constexpr kMAX_TIME = std::numeric_limits<timeType>::max();
+        static_assert(kMAX_TIME == 4'294'967'295);
 
-        auto const timeAvailable = maxTime - getStartDate(ctx.view);
+        auto const timeAvailable = kMAX_TIME - getStartDate(ctx.view);
 
-        auto const interval = ctx.tx.at(~sfPaymentInterval).value_or(defaultPaymentInterval);
-        auto const total = ctx.tx.at(~sfPaymentTotal).value_or(defaultPaymentTotal);
-        auto const grace = ctx.tx.at(~sfGracePeriod).value_or(defaultGracePeriod);
+        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);
 
         // 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(defaultPaymentInterval);
-    auto const paymentTotal = tx[~sfPaymentTotal].value_or(defaultPaymentTotal);
+    auto const paymentInterval = tx[~sfPaymentInterval].value_or(kDEFAULT_PAYMENT_INTERVAL);
+    auto const paymentTotal = tx[~sfPaymentTotal].value_or(kDEFAULT_PAYMENT_TOTAL);
 
     auto const properties = computeLoanProperties(
         vaultAsset,
@@ -459,7 +459,7 @@ LoanSet::doApply()
     if (auto const ret = checkLoanGuards(
             vaultAsset,
             principalRequested,
-            interestRate != beast::zero,
+            interestRate != beast::kZERO,
             paymentTotal,
             properties,
             j_))
@@ -495,7 +495,7 @@ LoanSet::doApply()
         // Round the minimum required cover up to be conservative. This ensures
         // CoverAvailable never drops below the theoretical minimum, protecting
         // the broker's solvency.
-        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
         if (brokerSle->at(sfCoverAvailable) < tenthBipsOfValue(newDebtTotal, coverRateMinimum))
         {
             JLOG(j_.warn()) << "Insufficient first-loss capital to cover the loan.";
@@ -536,7 +536,7 @@ LoanSet::doApply()
 
     // 2. Transfer originationFee, if any, from vault pseudo-account to
     // LoanBroker owner.
-    if (originationFee != beast::zero)
+    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.
@@ -600,7 +600,7 @@ LoanSet::doApply()
     setLoanField(~sfLateInterestRate);
     setLoanField(~sfCloseInterestRate);
     setLoanField(~sfOverpaymentInterestRate);
-    setLoanField(~sfGracePeriod, defaultGracePeriod);
+    setLoanField(~sfGracePeriod, kDEFAULT_GRACE_PERIOD);
     // 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 099b174778..06bd1301cb 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::zero)
+        if (*bf <= beast::kZERO)
             return temMALFORMED;
     }
 
@@ -186,8 +186,8 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
         // own currency
         auto const needed = bo->at(sfAmount);
 
-        if (accountFunds(
-                ctx.view, (*bo)[sfOwner], needed, FreezeHandling::fhZERO_IF_FROZEN, ctx.j) < needed)
+        if (accountFunds(ctx.view, (*bo)[sfOwner], needed, FreezeHandling::ZeroIfFrozen, ctx.j) <
+            needed)
             return tecINSUFFICIENT_FUNDS;
 
         // Check that the account accepting the buy offer (he's selling the NFT)
@@ -256,7 +256,7 @@ NFTokenAcceptOffer::preclaim(PreclaimContext const& ctx)
             // cover what the buyer will pay, which doesn't make sense, causes
             // an unnecessary tec, and is also resolved with this amendment.
             if (accountFunds(
-                    ctx.view, ctx.tx[sfAccount], needed, FreezeHandling::fhZERO_IF_FROZEN, ctx.j) <
+                    ctx.view, ctx.tx[sfAccount], needed, FreezeHandling::ZeroIfFrozen, ctx.j) <
                 needed)
                 return tecINSUFFICIENT_FUNDS;
         }
@@ -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::flagCreateTrustLines) == 0 &&
+            (nft::getFlags(tokenID) & nft::kFLAG_CREATE_TRUST_LINES) == 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::zero)
+    if (amount < beast::kZERO)
         return tecINTERNAL;  // LCOV_EXCL_LINE
 
     auto const result = accountSend(view(), from, to, amount, j_);
@@ -345,9 +345,9 @@ NFTokenAcceptOffer::pay(AccountID const& from, AccountID const& to, STAmount con
     // just confirm that the end state is OK.
     if (!isTesSuccess(result))
         return result;
-    if (accountFunds(view(), from, amount, FreezeHandling::fhZERO_IF_FROZEN, j_).signum() < 0)
+    if (accountFunds(view(), from, amount, FreezeHandling::ZeroIfFrozen, j_).signum() < 0)
         return tecINSUFFICIENT_FUNDS;
-    if (accountFunds(view(), to, amount, FreezeHandling::fhZERO_IF_FROZEN, j_).signum() < 0)
+    if (accountFunds(view(), to, amount, FreezeHandling::ZeroIfFrozen, j_).signum() < 0)
         return tecINSUFFICIENT_FUNDS;
     return tesSUCCESS;
 }
@@ -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::zero)
+    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::zero && 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::zero)
+        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::zero && 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::zero)
+        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 a0d10ca07d..fb57b14c15 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::flagBurnable) == 0)
+        if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFLAG_BURNABLE) == 0)
             return tecNO_PERMISSION;
 
         if (auto const issuer = nft::getIssuer(ctx.tx[sfNFTokenID]); issuer != account)
@@ -72,7 +72,7 @@ NFTokenBurn::doApply()
 
     if (auto issuer = view().peek(keylet::account(nft::getIssuer(ctx_.tx[sfNFTokenID]))))
     {
-        (*issuer)[~sfBurnedNFTokens] = (*issuer)[~sfBurnedNFTokens].value_or(0) + 1;
+        (*issuer)[~sfBurnedNFTokens] = (*issuer)[~sfBurnedNFTokens].valueOr(0) + 1;
         view().update(issuer);
     }
 
@@ -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::nft_sells(ctx_.tx[sfNFTokenID]), maxDeletableTokenOfferEntries);
+        view(), keylet::nftSells(ctx_.tx[sfNFTokenID]), kMAX_DELETABLE_TOKEN_OFFER_ENTRIES);
 
-    if (maxDeletableTokenOfferEntries > deletedSellOffers)
+    if (kMAX_DELETABLE_TOKEN_OFFER_ENTRIES > deletedSellOffers)
     {
         nft::removeTokenOffersWithLimit(
             view(),
-            keylet::nft_buys(ctx_.tx[sfNFTokenID]),
-            maxDeletableTokenOfferEntries - deletedSellOffers);
+            keylet::nftBuys(ctx_.tx[sfNFTokenID]),
+            kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - deletedSellOffers);
     }
 
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp b/src/libxrpl/tx/transactors/nft/NFTokenCancelOffer.cpp
index 9d25a7335f..e76d7677aa 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() > maxTokenOfferCancelCount))
+        ids.empty() || (ids.size() > kMAX_TOKEN_OFFER_CANCEL_COUNT))
         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 6043d918c2..c7cb37ad94 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 > maxTransferFee)
+        if (f > kMAX_TRANSFER_FEE)
             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() > maxTokenURILength)
+        if (uri->empty() || uri->length() > kMAX_TOKEN_URI_LENGTH)
             return temMALFORMED;
     }
 
@@ -256,7 +256,7 @@ NFTokenMint::doApply()
                                                                                      : acctSeq - 1;
         }
 
-        std::uint32_t const mintedNftCnt = (*root)[~sfMintedNFTokens].value_or(0u);
+        std::uint32_t const mintedNftCnt = (*root)[~sfMintedNFTokens].valueOr(0u);
 
         (*root)[sfMintedNFTokens] = mintedNftCnt + 1u;
         if ((*root)[sfMintedNFTokens] == 0u)
diff --git a/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp b/src/libxrpl/tx/transactors/nft/NFTokenModify.cpp
index 392d928f02..b56ee9b061 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() > maxTokenURILength)
+        if (uri->empty() || uri->length() > kMAX_TOKEN_URI_LENGTH)
             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::flagMutable) == 0)
+    if ((nft::getFlags(ctx.tx[sfNFTokenID]) & nft::kFLAG_MUTABLE) == 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 4304427646..7c2a817ed1 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() > maxOracleDataSeries)
+    if (dataSeries.size() > kMAX_ORACLE_DATA_SERIES)
         return temARRAY_TOO_LARGE;
 
     auto isInvalidLength = [&](auto const& sField, std::size_t length) {
@@ -51,8 +51,9 @@ OracleSet::preflight(PreflightContext const& ctx)
             (ctx.tx[sField].length() == 0 || ctx.tx[sField].length() > length);
     };
 
-    if (isInvalidLength(sfProvider, maxOracleProvider) || isInvalidLength(sfURI, maxOracleURI) ||
-        isInvalidLength(sfAssetClass, maxOracleSymbolClass))
+    if (isInvalidLength(sfProvider, kMAX_ORACLE_PROVIDER) ||
+        isInvalidLength(sfURI, kMAX_ORACLE_URI) ||
+        isInvalidLength(sfAssetClass, kMAX_ORACLE_SYMBOL_CLASS))
         return temMALFORMED;
 
     return tesSUCCESS;
@@ -71,13 +72,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 < epoch_offset.count())
+    if (lastUpdateTime < kEPOCH_OFFSET.count())
         return tecINVALID_UPDATE_TIME;
-    std::size_t const lastUpdateTimeEpoch = lastUpdateTime - epoch_offset.count();
-    if (closeTime < maxLastUpdateTimeDelta)
+    std::size_t const lastUpdateTimeEpoch = lastUpdateTime - kEPOCH_OFFSET.count();
+    if (closeTime < kMAX_LAST_UPDATE_TIME_DELTA)
         return tecINTERNAL;  // LCOV_EXCL_LINE
-    if (lastUpdateTimeEpoch < (closeTime - maxLastUpdateTimeDelta) ||
-        lastUpdateTimeEpoch > (closeTime + maxLastUpdateTimeDelta))
+    if (lastUpdateTimeEpoch < (closeTime - kMAX_LAST_UPDATE_TIME_DELTA) ||
+        lastUpdateTimeEpoch > (closeTime + kMAX_LAST_UPDATE_TIME_DELTA))
         return tecINVALID_UPDATE_TIME;
 
     auto const sle =
@@ -95,7 +96,7 @@ OracleSet::preclaim(PreclaimContext const& ctx)
         auto const key = tokenPairKey(entry);
         if (pairs.contains(key) || pairsDel.contains(key))
             return temMALFORMED;
-        if (entry[~sfScale] > maxPriceScale)
+        if (entry[~sfScale] > kMAX_PRICE_SCALE)
             return temMALFORMED;
         if (entry.isFieldPresent(sfAssetPrice))
         {
@@ -165,7 +166,7 @@ OracleSet::preclaim(PreclaimContext const& ctx)
 
     if (pairs.empty())
         return tecARRAY_EMPTY;
-    if (pairs.size() > maxOracleDataSeries)
+    if (pairs.size() > kMAX_ORACLE_DATA_SERIES)
         return tecARRAY_TOO_LARGE;
 
     auto const reserve =
@@ -255,7 +256,7 @@ OracleSet::doApply()
         }
         STArray updatedSeries;
         for (auto const& iter : pairs)
-            updatedSeries.push_back(iter.second);
+            updatedSeries.pushBack(iter.second);
         sle->setFieldArray(sfPriceDataSeries, updatedSeries);
         if (ctx_.tx.isFieldPresent(sfURI))
             sle->setFieldVL(sfURI, ctx_.tx[sfURI]);
@@ -303,7 +304,7 @@ OracleSet::doApply()
                 pairs.emplace(key, std::move(priceData));
             }
             for (auto const& iter : pairs)
-                series.push_back(iter.second);
+                series.pushBack(iter.second);
         }
 
         sle->setFieldArray(sfPriceDataSeries, series);
diff --git a/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp b/src/libxrpl/tx/transactors/payment/DepositPreauth.cpp
index f770b443f7..e4a060ea31 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),
-                maxCredentialsArraySize,
+                kMAX_CREDENTIALS_ARRAY_SIZE,
                 ctx.j);
             !isTesSuccess(err))
             return err;
@@ -226,7 +226,7 @@ DepositPreauth::doApply()
             auto cred = STObject::makeInnerObject(sfCredential);
             cred.setAccountID(sfIssuer, p.first);
             cred.setFieldVL(sfCredentialType, p.second);
-            sortedLE.push_back(std::move(cred));
+            sortedLE.pushBack(std::move(cred));
         }
 
         Keylet const preauthKey = keylet::depositPreauth(account_, sortedTX);
diff --git a/src/libxrpl/tx/transactors/payment/Payment.cpp b/src/libxrpl/tx/transactors/payment/Payment.cpp
index 8ea79e0840..d283874296 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::zero;
+        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::zero);
+                dstAmount < beast::kZERO);
         });
 }
 
@@ -100,11 +100,11 @@ Payment::getFlagsMask(PreflightContext const& ctx)
 
     STAmount const dstAmount(tx.getFieldAmount(sfAmount));
     bool const isDstMPT = dstAmount.holds<MPTIssue>();
-    bool const MPTokensV2 = ctx.rules.enabled(featureMPTokensV2);
+    bool const mpTokensV2 = ctx.rules.enabled(featureMPTokensV2);
 
-    constexpr std::uint32_t tfMPTPaymentMaskV1 = ~(tfUniversal | tfPartialPayment);
+    constexpr std::uint32_t kTF_MPT_PAYMENT_MASK_V1 = ~(tfUniversal | tfPartialPayment);
     std::uint32_t const paymentMask =
-        (isDstMPT && !MPTokensV2) ? tfMPTPaymentMaskV1 : tfPaymentMask;
+        (isDstMPT && !mpTokensV2) ? kTF_MPT_PAYMENT_MASK_V1 : tfPaymentMask;
 
     return paymentMask;
 }
@@ -117,14 +117,14 @@ Payment::preflight(PreflightContext const& ctx)
 
     STAmount const dstAmount(tx.getFieldAmount(sfAmount));
     bool const isDstMPT = dstAmount.holds<MPTIssue>();
-    bool const MPTokensV2 = ctx.rules.enabled(featureMPTokensV2);
+    bool const mpTokensV2 = ctx.rules.enabled(featureMPTokensV2);
 
     if (!ctx.rules.enabled(featureMPTokensV1) && isDstMPT)
         return temDISABLED;
 
     std::uint32_t const txFlags = tx.getFlags();
 
-    if (!MPTokensV2 && isDstMPT && ctx.tx.isFieldPresent(sfPaths))
+    if (!mpTokensV2 && isDstMPT && ctx.tx.isFieldPresent(sfPaths))
         return temMALFORMED;
 
     bool const partialPaymentAllowed = (txFlags & tfPartialPayment) != 0u;
@@ -138,7 +138,7 @@ Payment::preflight(PreflightContext const& ctx)
     auto const account = tx.getAccountID(sfAccount);
     STAmount const maxSourceAmount = getMaxSourceAmount(account, dstAmount, tx[~sfSendMax]);
 
-    if (!MPTokensV2 &&
+    if (!mpTokensV2 &&
         ((isDstMPT && dstAmount.asset() != maxSourceAmount.asset()) ||
          (!isDstMPT && maxSourceAmount.holds<MPTIssue>())))
     {
@@ -164,13 +164,13 @@ Payment::preflight(PreflightContext const& ctx)
                         << "Payment destination account not specified.";
         return temDST_NEEDED;
     }
-    if (hasMax && maxSourceAmount <= beast::zero)
+    if (hasMax && maxSourceAmount <= beast::kZERO)
     {
         JLOG(j.trace()) << "Malformed transaction: bad max amount: "
                         << maxSourceAmount.getFullText();
         return temBAD_AMOUNT;
     }
-    if (dstAmount <= beast::zero)
+    if (dstAmount <= beast::kZERO)
     {
         JLOG(j.trace()) << "Malformed transaction: bad dst amount: " << dstAmount.getFullText();
         return temBAD_AMOUNT;
@@ -201,7 +201,7 @@ Payment::preflight(PreflightContext const& ctx)
                         << "SendMax specified for XRP to XRP.";
         return temBAD_SEND_XRP_MAX;
     }
-    if ((xrpDirect || (!MPTokensV2 && isDstMPT)) && hasPaths)
+    if ((xrpDirect || (!mpTokensV2 && isDstMPT)) && hasPaths)
     {
         // XRP is sent without paths.
         JLOG(j.trace()) << "Malformed transaction: "
@@ -215,14 +215,14 @@ Payment::preflight(PreflightContext const& ctx)
                         << "Partial payment specified for XRP to XRP.";
         return temBAD_SEND_XRP_PARTIAL;
     }
-    if ((xrpDirect || (!MPTokensV2 && isDstMPT)) && limitQuality)
+    if ((xrpDirect || (!mpTokensV2 && isDstMPT)) && limitQuality)
     {
         // Consistent but redundant transaction.
         JLOG(j.trace()) << "Malformed transaction: "
                         << "Limit quality specified for XRP to XRP or MPT to MPT.";
         return temBAD_SEND_XRP_LIMIT;
     }
-    if ((xrpDirect || (!MPTokensV2 && isDstMPT)) && !defaultPathsAllowed)
+    if ((xrpDirect || (!mpTokensV2 && isDstMPT)) && !defaultPathsAllowed)
     {
         // Consistent but redundant transaction.
         JLOG(j.trace()) << "Malformed transaction: "
@@ -236,14 +236,14 @@ Payment::preflight(PreflightContext const& ctx)
         {
             JLOG(j.trace()) << "Malformed transaction: Partial payment not "
                                "specified for "
-                            << jss::DeliverMin.c_str() << ".";
+                            << jss::DeliverMin.cStr() << ".";
             return temBAD_AMOUNT;
         }
 
         auto const dMin = *deliverMin;
-        if (!isLegalNet(dMin) || dMin <= beast::zero)
+        if (!isLegalNet(dMin) || dMin <= beast::kZERO)
         {
-            JLOG(j.trace()) << "Malformed transaction: Invalid " << jss::DeliverMin.c_str()
+            JLOG(j.trace()) << "Malformed transaction: Invalid " << jss::DeliverMin.cStr()
                             << " amount. " << dMin.getFullText();
             return temBAD_AMOUNT;
         }
@@ -251,13 +251,13 @@ Payment::preflight(PreflightContext const& ctx)
         {
             JLOG(j.trace()) << "Malformed transaction: Dst issue differs "
                                "from "
-                            << jss::DeliverMin.c_str() << ". " << dMin.getFullText();
+                            << jss::DeliverMin.cStr() << ". " << dMin.getFullText();
             return temBAD_AMOUNT;
         }
         if (dMin > dstAmount)
         {
             JLOG(j.trace()) << "Malformed transaction: Dst amount less than "
-                            << jss::DeliverMin.c_str() << ". " << dMin.getFullText();
+                            << jss::DeliverMin.cStr() << ". " << dMin.getFullText();
             return temBAD_AMOUNT;
         }
     }
@@ -376,8 +376,8 @@ Payment::preclaim(PreclaimContext const& ctx)
     {
         STPathSet const& paths = ctx.tx.getFieldPathSet(sfPaths);
 
-        if (paths.size() > MaxPathSize || std::ranges::any_of(paths, [](STPath const& path) {
-                return path.size() > MaxPathLength;
+        if (paths.size() > kMAX_PATH_SIZE || std::ranges::any_of(paths, [](STPath const& path) {
+                return path.size() > kMAX_PATH_LENGTH;
             }))
         {
             return telBAD_PATH_COUNT;
@@ -431,7 +431,7 @@ Payment::doApply()
         sleDst = std::make_shared<SLE>(k);
         sleDst->setAccountID(sfAccount, dstAccountID);
         sleDst->setFieldU32(sfSequence, view().seq());
-        sleDst->setFieldAmount(sfBalance, XRPAmount(beast::zero));
+        sleDst->setFieldAmount(sfBalance, XRPAmount(beast::kZERO));
 
         view().insert(sleDst);
     }
@@ -443,10 +443,10 @@ Payment::doApply()
         view().update(sleDst);
     }
 
-    bool const MPTokensV2 = view().rules().enabled(featureMPTokensV2);
+    bool const mpTokensV2 = view().rules().enabled(featureMPTokensV2);
 
     // Direct MPT payment is handled by payment engine if MPTokensV2 is enabled
-    bool const ripple = (hasPaths || sendMax || !dstAmount.native()) && (!isDstMPT || MPTokensV2);
+    bool const ripple = (hasPaths || sendMax || !dstAmount.native()) && (!isDstMPT || mpTokensV2);
 
     if (ripple)
     {
diff --git a/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp b/src/libxrpl/tx/transactors/payment_channel/PaymentChannelClaim.cpp
index 256d1e87ca..ec2d4dd70d 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::zero))
+    if (bal && (!isXRP(*bal) || *bal <= beast::kZERO))
         return temBAD_AMOUNT;
 
     auto const amt = ctx.tx[~sfAmount];
-    if (amt && (!isXRP(*amt) || *amt <= beast::zero))
+    if (amt && (!isXRP(*amt) || *amt <= beast::kZERO))
         return temBAD_AMOUNT;
 
     if (bal && amt && *bal > *amt)
@@ -167,7 +167,7 @@ PaymentChannelClaim::doApply()
         (*slep)[sfBalance] = ctx_.tx[sfBalance];
         XRPAmount const reqDelta = reqBalance - chanBalance;
         XRPL_ASSERT(
-            reqDelta >= beast::zero, "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 4ced2d10bc..c86590aa98 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::zero))
+    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 4e588eda1e..4d2590c382 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::zero))
+    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 87794b8dc2..befae454b7 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::zero)
+    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 e7853b529b..92f260db4e 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),
-            maxPermissionedDomainCredentialsArraySize,
+            kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE,
             ctx.j);
         !isTesSuccess(err))
         return err;
 
     auto const domain = ctx.tx.at(~sfDomainID);
-    if (domain && *domain == beast::zero)
+    if (domain && *domain == beast::kZERO)
         return temMALFORMED;
 
     return tesSUCCESS;
@@ -89,7 +89,7 @@ PermissionedDomainSet::doApply()
         auto cred = STObject::makeInnerObject(sfCredential);
         cred.setAccountID(sfIssuer, p.first);
         cred.setFieldVL(sfCredentialType, p.second);
-        sortedLE.push_back(std::move(cred));
+        sortedLE.pushBack(std::move(cred));
     }
 
     if (ctx_.tx.isFieldPresent(sfDomainID))
diff --git a/src/libxrpl/tx/transactors/system/Batch.cpp b/src/libxrpl/tx/transactors/system/Batch.cpp
index 1218f0d59f..f9ae9dc912 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{INITIAL_XRP};
+        return XRPAmount{kINITIAL_XRP};
     }
     // 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() > maxBatchTxCount)
+        if (txns.size() > kMAX_BATCH_TX_COUNT)
         {
             JLOG(debugLog().error()) << "BatchTrace: Raw Transactions array exceeds max entries.";
-            return XRPAmount{INITIAL_XRP};
+            return XRPAmount{kINITIAL_XRP};
         }
         // 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{INITIAL_XRP};
+                return XRPAmount{kINITIAL_XRP};
             }
             // 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{INITIAL_XRP};
+                return XRPAmount{kINITIAL_XRP};
             }
             // 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() > maxBatchTxCount)
+        if (signers.size() > kMAX_BATCH_TX_COUNT)
         {
             JLOG(debugLog().error()) << "BatchTrace: Batch Signers array exceeds max entries.";
-            return XRPAmount{INITIAL_XRP};
+            return XRPAmount{kINITIAL_XRP};
         }
         // 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{INITIAL_XRP};
+        return XRPAmount{kINITIAL_XRP};
     }
     // 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{INITIAL_XRP};
+        return XRPAmount{kINITIAL_XRP};
     }
     if (txnFees + signerFees > maxAmount - batchBase)
     {
         JLOG(debugLog().error()) << "BatchTrace: XRPAmount overflow in total fee calculation.";
-        return XRPAmount{INITIAL_XRP};
+        return XRPAmount{kINITIAL_XRP};
     }
     // LCOV_EXCL_STOP
 
@@ -221,7 +221,7 @@ Batch::preflight(PreflightContext const& ctx)
         return temARRAY_EMPTY;
     }
 
-    if (rawTxns.size() > maxBatchTxCount)
+    if (rawTxns.size() > kMAX_BATCH_TX_COUNT)
     {
         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(
-                disabledTxTypes, [txType](auto const& disabled) { return txType == disabled; }))
+                kDISABLED_TX_TYPES, [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::zero)
+        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. "
@@ -321,7 +321,7 @@ Batch::preflight(PreflightContext const& ctx)
 
         auto const innerAccount = stx.getAccountID(sfAccount);
         if (auto const preflightResult =
-                xrpl::preflight(ctx.registry, ctx.rules, parentBatchId, stx, tapBATCH, ctx.j);
+                xrpl::preflight(ctx.registry, ctx.rules, parentBatchId, stx, TapBatch, ctx.j);
             !isTesSuccess(preflightResult.ter))
         {
             JLOG(ctx.j.debug()) << "BatchTrace[" << parentBatchId << "]: "
@@ -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() > maxBatchTxCount)
+        if (signers.size() > kMAX_BATCH_TX_COUNT)
         {
             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 60dbb06a17..5f51f935f3 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::zero)
+    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::zero)
+    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::zero, "xrpl::Change::preCompute : zero account");
+    XRPL_ASSERT(account_ == beast::kZERO, "xrpl::Change::preCompute : zero account");
 }
 
 TER
@@ -202,7 +202,7 @@ Change::applyAmendment()
             else
             {
                 // pass through
-                newMajorities.push_back(majority);
+                newMajorities.pushBack(majority);
             }
         }
     }
@@ -213,7 +213,7 @@ Change::applyAmendment()
     if (gotMajority)
     {
         // This amendment now has a majority
-        newMajorities.push_back(STObject::makeInnerObject(sfMajority));
+        newMajorities.pushBack(STObject::makeInnerObject(sfMajority));
         auto& entry = newMajorities.back();
         entry[sfAmendment] = amendment;
         entry[sfCloseTime] = view().parentCloseTime().time_since_epoch().count();
@@ -226,7 +226,7 @@ Change::applyAmendment()
     else if (!lostMajority)
     {
         // No flags, enable amendment
-        amendments.push_back(amendment);
+        amendments.pushBack(amendment);
         amendmentObject->setFieldV256(sfAmendments, amendments);
 
         ctx_.registry.get().getAmendmentTable().enable(amendment);
diff --git a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
index 07ec677288..2bc71f8c86 100644
--- a/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
+++ b/src/libxrpl/tx/transactors/system/LedgerStateFix.cpp
@@ -21,7 +21,7 @@ LedgerStateFix::preflight(PreflightContext const& ctx)
 {
     switch (static_cast<FixType>(ctx.tx[sfLedgerFixType]))
     {
-        case FixType::nfTokenPageLink:
+        case FixType::NfTokenPageLink:
             if (!ctx.tx.isFieldPresent(sfOwner))
                 return temINVALID;
             break;
@@ -44,7 +44,7 @@ LedgerStateFix::calculateBaseFee(ReadView const& view, STTx const& tx)
 TER
 LedgerStateFix::preclaim(PreclaimContext const& ctx)
 {
-    if (static_cast<FixType>(ctx.tx[sfLedgerFixType]) == FixType::nfTokenPageLink)
+    if (static_cast<FixType>(ctx.tx[sfLedgerFixType]) == FixType::NfTokenPageLink)
     {
         AccountID const owner{ctx.tx[sfOwner]};
         if (!ctx.view.read(keylet::account(owner)))
@@ -60,7 +60,7 @@ LedgerStateFix::preclaim(PreclaimContext const& ctx)
 TER
 LedgerStateFix::doApply()
 {
-    if (static_cast<FixType>(ctx_.tx[sfLedgerFixType]) == FixType::nfTokenPageLink)
+    if (static_cast<FixType>(ctx_.tx[sfLedgerFixType]) == FixType::NfTokenPageLink)
     {
         if (!nft::repairNFTokenDirectoryLinks(view(), ctx_.tx[sfOwner]))
             return tecFAILED_PROCESSING;
diff --git a/src/libxrpl/tx/transactors/system/TicketCreate.cpp b/src/libxrpl/tx/transactors/system/TicketCreate.cpp
index fd6b947c5e..75095772dd 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 < minValidCount || count > maxValidCount)
+        count < kMIN_VALID_COUNT || count > kMAX_VALID_COUNT)
         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 > maxTicketThreshold)
+    if (curTicketCount + addedTickets - consumedTickets > kMAX_TICKET_THRESHOLD)
         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::ticket(account_, curTicketSeq);
+        Keylet const ticketKeylet = keylet::kTICKET(account_, curTicketSeq);
         SLE::pointer const sleTicket = std::make_shared<SLE>(ticketKeylet);
 
         sleTicket->setAccountID(sfAccount, account_);
@@ -120,7 +120,7 @@ TicketCreate::doApply()
     }
 
     // Update the record of the number of Tickets this account owns.
-    std::uint32_t const oldTicketCount = (*(sleAccountRoot))[~sfTicketCount].value_or(0u);
+    std::uint32_t const oldTicketCount = (*(sleAccountRoot))[~sfTicketCount].valueOr(0u);
 
     sleAccountRoot->setFieldU32(sfTicketCount, oldTicketCount + ticketCount);
 
diff --git a/src/libxrpl/tx/transactors/token/Clawback.cpp b/src/libxrpl/tx/transactors/token/Clawback.cpp
index ff20bd82c3..8c99ce9b08 100644
--- a/src/libxrpl/tx/transactors/token/Clawback.cpp
+++ b/src/libxrpl/tx/transactors/token/Clawback.cpp
@@ -46,7 +46,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::zero)
+    if (issuer == holder || isXRP(clawAmount) || clawAmount <= beast::kZERO)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -69,7 +69,7 @@ preflightHelper<MPTIssue>(PreflightContext const& ctx)
     if (ctx.tx[sfAccount] == *mptHolder)
         return temMALFORMED;
 
-    if (clawAmount.mpt() > MPTAmount{maxMPTokenAmount} || clawAmount <= beast::zero)
+    if (clawAmount.mpt() > MPTAmount{kMAX_MP_TOKEN_AMOUNT} || clawAmount <= beast::kZERO)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -121,11 +121,11 @@ preclaimHelper<Issue>(
     STAmount const balance = (*sleRippleState)[sfBalance];
 
     // If balance is positive, issuer must have higher address than holder
-    if (balance > beast::zero && 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::zero && issuer > holder)
+    if (balance < beast::kZERO && issuer > holder)
         return tecNO_PERMISSION;
 
     // At this point, we know that issuer and holder accounts
@@ -142,8 +142,8 @@ preclaimHelper<Issue>(
             holder,
             clawAmount.get<Issue>().currency,
             issuer,
-            FreezeHandling::fhIGNORE_FREEZE,
-            ctx.j) <= beast::zero)
+            FreezeHandling::IgnoreFreeze,
+            ctx.j) <= beast::kZERO)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -176,9 +176,9 @@ preclaimHelper<MPTIssue>(
             ctx.view,
             holder,
             clawAmount.get<MPTIssue>(),
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            ctx.j) <= beast::zero)
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
+            ctx.j) <= beast::kZERO)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -237,7 +237,7 @@ applyHelper<Issue>(ApplyContext& ctx)
         holder,
         clawAmount.get<Issue>().currency,
         clawAmount.getIssuer(),
-        FreezeHandling::fhIGNORE_FREEZE,
+        FreezeHandling::IgnoreFreeze,
         ctx.journal);
 
     return directSendNoFee(
@@ -257,8 +257,8 @@ applyHelper<MPTIssue>(ApplyContext& ctx)
         ctx.view(),
         holder,
         clawAmount.get<MPTIssue>(),
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         ctx.journal);
 
     return directSendNoFee(
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceCreate.cpp
index 42fc037431..64652a80b0 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 > maxTransferFee)
+        if (fee > kMAX_TRANSFER_FEE)
             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::zero)
+        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() > maxMPTokenMetadataLength)
+        if (metadata->empty() || metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
             return temMALFORMED;
     }
 
@@ -88,7 +88,7 @@ MPTokenIssuanceCreate::preflight(PreflightContext const& ctx)
         if (maxAmt == 0)
             return temMALFORMED;
 
-        if (maxAmt > maxMPTokenAmount)
+        if (maxAmt > kMAX_MP_TOKEN_AMOUNT)
             return temMALFORMED;
     }
     return tesSUCCESS;
diff --git a/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp b/src/libxrpl/tx/transactors/token/MPTokenIssuanceSet.cpp
index 540dd6ef0c..fb0ff06ac2 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> mptMutabilityFlags = {
+static constexpr std::array<MPTMutabilityFlags, 6> kMPT_MUTABILITY_FLAGS = {
     {{.setFlag = tmfMPTSetCanLock,
       .clearFlag = tmfMPTClearCanLock,
       .canMutateFlag = lsmfMPTCanMutateCanLock},
@@ -114,10 +114,10 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
         if (isMutate && ((txFlags & tfUniversalMask) != 0u))
             return temMALFORMED;
 
-        if (transferFee && *transferFee > maxTransferFee)
+        if (transferFee && *transferFee > kMAX_TRANSFER_FEE)
             return temBAD_TRANSFER_FEE;
 
-        if (metadata && metadata->length() > maxMPTokenMetadataLength)
+        if (metadata && metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
             return temMALFORMED;
 
         if (mutableFlags)
@@ -126,7 +126,7 @@ MPTokenIssuanceSet::preflight(PreflightContext const& ctx)
                 return temINVALID_FLAG;
 
             // Can not set and clear the same flag
-            if (std::ranges::any_of(mptMutabilityFlags, [mutableFlags](auto const& f) {
+            if (std::ranges::any_of(kMPT_MUTABILITY_FLAGS, [mutableFlags](auto const& f) {
                     return (*mutableFlags & f.setFlag) && (*mutableFlags & f.clearFlag);
                 }))
                 return temINVALID_FLAG;
@@ -218,7 +218,7 @@ MPTokenIssuanceSet::preclaim(PreclaimContext const& ctx)
         if (not sleMptIssuance->isFlag(lsfMPTRequireAuth))
             return tecNO_PERMISSION;
 
-        if (*domain != beast::zero)
+        if (*domain != beast::kZERO)
         {
             auto const sleDomain = ctx.view.read(keylet::permissionedDomain(*domain));
             if (!sleDomain)
@@ -236,10 +236,11 @@ MPTokenIssuanceSet::preclaim(PreclaimContext const& ctx)
 
     if (auto const mutableFlags = ctx.tx[~sfMutableFlags])
     {
-        if (std::ranges::any_of(mptMutabilityFlags, [mutableFlags, &isMutableFlag](auto const& f) {
-                return !isMutableFlag(f.canMutateFlag) &&
-                    ((*mutableFlags & (f.setFlag | f.clearFlag)));
-            }))
+        if (std::ranges::any_of(
+                kMPT_MUTABILITY_FLAGS, [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
@@ -303,7 +304,7 @@ MPTokenIssuanceSet::doApply()
 
     if (auto const mutableFlags = ctx_.tx[~sfMutableFlags].value_or(0))
     {
-        for (auto const& f : mptMutabilityFlags)
+        for (auto const& f : kMPT_MUTABILITY_FLAGS)
         {
             if ((mutableFlags & f.setFlag) != 0u)
             {
@@ -361,7 +362,7 @@ MPTokenIssuanceSet::doApply()
             sle->getType() == ltMPTOKEN_ISSUANCE,
             "MPTokenIssuanceSet::doApply : modifying MPTokenIssuance");
 
-        if (*domainID != beast::zero)
+        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 1610b2e5b9..27252aef46 100644
--- a/src/libxrpl/tx/transactors/token/TrustSet.cpp
+++ b/src/libxrpl/tx/transactors/token/TrustSet.cpp
@@ -108,7 +108,7 @@ TrustSet::preflight(PreflightContext const& ctx)
         return temBAD_CURRENCY;
     }
 
-    if (saLimitAmount < beast::zero)
+    if (saLimitAmount < beast::kZERO)
     {
         JLOG(j.trace()) << "Malformed transaction: Negative credit limit.";
         return temBAD_LIMIT;
@@ -258,7 +258,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::zero)
+                if (lpTokens == beast::kZERO)
                 {
                     return tecAMM_EMPTY;
                 }
@@ -369,7 +369,8 @@ TrustSet::doApply()
     // could use the extra XRP for their own purposes.
 
     XRPAmount const reserveCreate(
-        (uOwnerCount < 2) ? XRPAmount(beast::zero) : view().fees().accountReserve(uOwnerCount + 1));
+        (uOwnerCount < 2) ? XRPAmount(beast::kZERO)
+                          : view().fees().accountReserve(uOwnerCount + 1));
 
     std::uint32_t const uQualityIn(bQualityIn ? ctx_.tx.getFieldU32(sfQualityIn) : 0);
     std::uint32_t uQualityOut(bQualityOut ? ctx_.tx.getFieldU32(sfQualityOut) : 0);
@@ -505,7 +506,7 @@ TrustSet::doApply()
 
         if (bSetNoRipple && !bClearNoRipple)
         {
-            if ((bHigh ? saHighBalance : saLowBalance) >= beast::zero)
+            if ((bHigh ? saHighBalance : saLowBalance) >= beast::kZERO)
             {
                 uFlagsOut |= (bHigh ? lsfHighNoRipple : lsfLowNoRipple);
             }
@@ -542,12 +543,12 @@ TrustSet::doApply()
 
         bool const bLowReserveSet = (uLowQualityIn != 0u) || (uLowQualityOut != 0u) ||
             ((uFlagsOut & lsfLowNoRipple) == 0) != bLowDefRipple ||
-            ((uFlagsOut & lsfLowFreeze) != 0u) || saLowLimit || saLowBalance > beast::zero;
+            ((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::zero;
+            ((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 da22b82578..8743227e5c 100644
--- a/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
+++ b/src/libxrpl/tx/transactors/vault/VaultClawback.cpp
@@ -36,7 +36,7 @@ namespace xrpl {
 NotTEC
 VaultClawback::preflight(PreflightContext const& ctx)
 {
-    if (ctx.tx[sfVaultID] == beast::zero)
+    if (ctx.tx[sfVaultID] == beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "VaultClawback: zero/empty vault ID.";
         return temMALFORMED;
@@ -46,7 +46,7 @@ VaultClawback::preflight(PreflightContext const& ctx)
     if (amount)
     {
         // Note, zero amount is valid, it means "all". It is also the default.
-        if (*amount < beast::zero)
+        if (*amount < beast::kZERO)
         {
             return temBAD_AMOUNT;
         }
@@ -134,14 +134,14 @@ VaultClawback::preclaim(PreclaimContext const& ctx)
         }
 
         // If amount is non-zero, the VaultOwner must burn all shares
-        if (amount != beast::zero)
+        if (amount != beast::kZERO)
         {
             Number const& sharesHeld = accountHolds(
                 ctx.view,
                 holder,
                 share,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 ctx.j);
 
             // The VaultOwner must burn all shares
@@ -247,15 +247,10 @@ 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(fixSecurity3_1_3) && clawbackAmount == beast::zero)
+    if (!ctx_.view().rules().enabled(fixSecurity3_1_3) && clawbackAmount == beast::kZERO)
     {
         auto const sharesDestroyed = accountHolds(
-            view(),
-            holder,
-            share,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            j_);
+            view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
         auto const maybeAssets = sharesToAssetsWithdraw(vault, sleShareIssuance, sharesDestroyed);
         if (!maybeAssets)
             return Unexpected(tecINTERNAL);  // LCOV_EXCL_LINE
@@ -268,15 +263,10 @@ VaultClawback::assetsToClawback(
 
     try
     {
-        if (clawbackAmount == beast::zero)
+        if (clawbackAmount == beast::kZERO)
         {
             sharesDestroyed = accountHolds(
-                view(),
-                holder,
-                share,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
-                j_);
+                view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
             auto const maybeAssets =
                 sharesToAssetsWithdraw(vault, sleShareIssuance, sharesDestroyed);
             if (!maybeAssets)
@@ -307,7 +297,7 @@ VaultClawback::assetsToClawback(
             // AssetsAvailable
             {
                 auto const maybeShares = assetsToSharesWithdraw(
-                    vault, sleShareIssuance, assetsRecovered, TruncateShares::yes);
+                    vault, sleShareIssuance, assetsRecovered, TruncateShares::Yes);
                 if (!maybeShares)
                     return Unexpected(tecINTERNAL);  // LCOV_EXCL_LINE
                 sharesDestroyed = *maybeShares;
@@ -381,12 +371,7 @@ VaultClawback::doApply()
     if (account_ == vault->at(sfOwner) && amount.asset() == share)
     {
         sharesDestroyed = accountHolds(
-            view(),
-            holder,
-            share,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            j_);
+            view(), holder, share, FreezeHandling::IgnoreFreeze, AuthHandling::IgnoreAuth, j_);
     }
     else  // The Issuer is clawbacking vault assets
     {
@@ -400,7 +385,7 @@ VaultClawback::doApply()
         sharesDestroyed = clawbackParts->second;
     }
 
-    if (sharesDestroyed == beast::zero)
+    if (sharesDestroyed == beast::kZERO)
         return tecPRECISION_LOSS;
 
     assetsTotal -= assetsRecovered;
@@ -441,7 +426,7 @@ VaultClawback::doApply()
         // else quietly ignore, holder balance is not zero
     }
 
-    if (assetsRecovered > beast::zero)
+    if (assetsRecovered > beast::kZERO)
     {
         // Transfer assets from vault to issuer.
         if (auto const ter = accountSend(
@@ -454,9 +439,9 @@ VaultClawback::doApply()
                 view(),
                 vaultAccount,
                 assetsRecovered.asset(),
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
-                j_) < beast::zero)
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
+                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 cc28abfe65..0346503ae7 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], maxDataPayloadLength))
+    if (!validDataLength(ctx.tx[~sfData], kMAX_DATA_PAYLOAD_LENGTH))
         return temMALFORMED;
 
     if (auto const withdrawalPolicy = ctx.tx[~sfWithdrawalPolicy])
     {
         // Enforce valid withdrawal policy
-        if (*withdrawalPolicy != vaultStrategyFirstComeFirstServe)
+        if (*withdrawalPolicy != kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE)
             return temMALFORMED;
     }
 
     if (auto const domain = ctx.tx[~sfDomainID])
     {
-        if (*domain == beast::zero)
+        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::zero)
+        if (*assetMax < beast::kZERO)
             return temMALFORMED;
     }
 
     if (auto const metadata = ctx.tx[~sfMPTokenMetadata])
     {
-        if (metadata->empty() || metadata->length() > maxMPTokenMetadataLength)
+        if (metadata->empty() || metadata->length() > kMAX_MP_TOKEN_METADATA_LENGTH)
             return temMALFORMED;
     }
 
@@ -92,7 +92,7 @@ VaultCreate::preflight(PreflightContext const& ctx)
         if (vaultAsset.holds<MPTIssue>() || vaultAsset.native())
             return temMALFORMED;
 
-        if (scale > vaultMaximumIOUScale)
+        if (scale > kVAULT_MAXIMUM_IOU_SCALE)
             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::zero)
+        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(vaultDefaultIOUScale);
+        : ctx_.tx[~sfScale].value_or(kVAULT_DEFAULT_IOU_SCALE);
 
     auto txFlags = tx.getFlags();
     std::uint32_t mptFlags = 0;
@@ -223,7 +223,7 @@ VaultCreate::doApply()
     }
     else
     {
-        vault->at(sfWithdrawalPolicy) = vaultStrategyFirstComeFirstServe;
+        vault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
     }
     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 e4542d524f..58b0fdee82 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::zero)
+    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 fbb8908ddb..501ba58ca5 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::zero)
+    if (ctx.tx[sfVaultID] == beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "VaultDeposit: zero/empty vault ID.";
         return temMALFORMED;
     }
 
-    if (ctx.tx[sfAmount] <= beast::zero)
+    if (ctx.tx[sfAmount] <= beast::kZERO)
         return temBAD_AMOUNT;
 
     return tesSUCCESS;
@@ -125,10 +125,10 @@ VaultDeposit::preclaim(PreclaimContext const& ctx)
             ctx.view,
             account,
             vaultAsset,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+            FreezeHandling::ZeroIfFrozen,
+            AuthHandling::ZeroIfUnauthorized,
             ctx.j,
-            SpendableHandling::shFULL_BALANCE) < assets)
+            SpendableHandling::FullBalance) < assets)
         return tecINSUFFICIENT_FUNDS;
 
     return tesSUCCESS;
@@ -204,7 +204,7 @@ VaultDeposit::doApply()
                 return tecINTERNAL;  // LCOV_EXCL_LINE
             sharesCreated = *maybeShares;
         }
-        if (sharesCreated == beast::zero)
+        if (sharesCreated == beast::kZERO)
             return tecPRECISION_LOSS;
 
         auto const maybeAssets = sharesToAssetsDeposit(vault, sleIssuance, sharesCreated);
@@ -257,9 +257,9 @@ VaultDeposit::doApply()
             view(),
             account_,
             assetsDeposited.asset(),
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
-            j_) < beast::zero)
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
+            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 a5b0b20699..92dbb198f3 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::zero)
+    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() > maxDataPayloadLength)
+        if (data->empty() || data->length() > kMAX_DATA_PAYLOAD_LENGTH)
         {
             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::zero)
+        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::zero)
+        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::zero)
+        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 3e608733b6..6932dc21f2 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::zero)
+    if (ctx.tx[sfVaultID] == beast::kZERO)
     {
         JLOG(ctx.j.debug()) << "VaultWithdraw: zero/empty vault ID.";
         return temMALFORMED;
     }
 
-    if (ctx.tx[sfAmount] <= beast::zero)
+    if (ctx.tx[sfAmount] <= beast::kZERO)
         return temBAD_AMOUNT;
 
     if (auto const destination = ctx.tx[~sfDestination])
     {
-        if (*destination == beast::zero)
+        if (*destination == beast::kZERO)
         {
             return temMALFORMED;
         }
@@ -72,7 +72,7 @@ VaultWithdraw::preclaim(PreclaimContext const& ctx)
     }
 
     // Enforce valid withdrawal policy
-    if (vault->at(sfWithdrawalPolicy) != vaultStrategyFirstComeFirstServe)
+    if (vault->at(sfWithdrawalPolicy) != kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE)
     {
         // LCOV_EXCL_START
         JLOG(ctx.j.error()) << "VaultWithdraw: invalid withdrawal policy.";
@@ -187,7 +187,7 @@ VaultWithdraw::doApply()
                 sharesRedeemed = *maybeShares;
             }
 
-            if (sharesRedeemed == beast::zero)
+            if (sharesRedeemed == beast::kZERO)
                 return tecPRECISION_LOSS;
             auto const maybeAssets = sharesToAssetsWithdraw(vault, sleIssuance, sharesRedeemed);
             if (!maybeAssets)
@@ -222,12 +222,8 @@ VaultWithdraw::doApply()
     }
 
     if (accountHolds(
-            view(),
-            account_,
-            share,
-            FreezeHandling::fhZERO_IF_FROZEN,
-            AuthHandling::ahIGNORE_AUTH,
-            j_) < sharesRedeemed)
+            view(), account_, share, FreezeHandling::ZeroIfFrozen, AuthHandling::IgnoreAuth, j_) <
+        sharesRedeemed)
     {
         JLOG(j_.debug()) << "VaultWithdraw: account doesn't hold enough shares";
         return tecINSUFFICIENT_FUNDS;
diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp
index 6c32c6118d..3c4a62bfd3 100644
--- a/src/test/app/AMMCalc_test.cpp
+++ b/src/test/app/AMMCalc_test.cpp
@@ -41,13 +41,13 @@ namespace xrpl::test {
  *      find out AMM offer, which changes AMM's SP quality to
  *      the Offer's quality.
  */
-class AMMCalc_test : public beast::unit_test::suite
+class AMMCalc_test : public beast::unit_test::Suite
 {
     using token_iter = boost::sregex_token_iterator;
     using steps = std::vector<std::pair<Amounts, bool>>;
     using transfer_rates = std::map<std::string, std::uint32_t>;
     using swapargs = std::tuple<steps, STAmount, transfer_rates, std::uint32_t>;
-    jtx::Account const gw{jtx::Account("gw")};
+    jtx::Account const gw_{jtx::Account("gw")};
     token_iter const end_;
 
     std::optional<STAmount>
@@ -74,7 +74,7 @@ class AMMCalc_test : public beast::unit_test::suite
             {
                 return XRPAmount{std::stoll(match[2])};
             }
-            return amountFromString(gw[match[1]].asset(), match[2]);
+            return amountFromString(gw_[match[1]].asset(), match[2]);
         }
         return std::nullopt;
     }
@@ -187,7 +187,8 @@ class AMMCalc_test : public beast::unit_test::suite
     static std::string
     toString(STAmount const& a)
     {
-        return (boost::format("%s/%s") % a.getText() % to_string(a.get<Issue>().currency)).str();
+        return (boost::format("%s/%s") % a.getText() % ::xrpl::to_string(a.get<Issue>().currency))
+            .str();
     }
 
     static STAmount
@@ -213,7 +214,7 @@ class AMMCalc_test : public beast::unit_test::suite
         int limitingStep = vp.size();
         STAmount limitStepOut{};
         auto transferRate = [&](STAmount const& amt) {
-            auto const currency = to_string(amt.get<Issue>().currency);
+            auto const currency = ::xrpl::to_string(amt.get<Issue>().currency);
             return rates.contains(currency) ? rates.at(currency) : QUALITY_ONE;
         };
         // swap out reverse
@@ -229,7 +230,7 @@ class AMMCalc_test : public beast::unit_test::suite
             }
             else if (sout <= amts.out)
             {
-                sin = Quality{amts}.ceil_out(amts, sout).in;
+                sin = Quality{amts}.ceilOut(amts, sout).in;
             }
             // limiting step
             else
@@ -255,7 +256,7 @@ class AMMCalc_test : public beast::unit_test::suite
             // assume there is no limiting step in fwd
             else
             {
-                sout = Quality{amts}.ceil_in(amts, sin).out;
+                sout = Quality{amts}.ceilIn(amts, sin).out;
             }
             sin = sout;
             resultOut = sout;
@@ -276,7 +277,7 @@ class AMMCalc_test : public beast::unit_test::suite
         int limitingStep = 0;
         STAmount limitStepIn{};
         auto transferRate = [&](STAmount const& amt) {
-            auto const currency = to_string(amt.get<Issue>().currency);
+            auto const currency = ::xrpl::to_string(amt.get<Issue>().currency);
             return rates.contains(currency) ? rates.at(currency) : QUALITY_ONE;
         };
         // Swap in forward
@@ -292,7 +293,7 @@ class AMMCalc_test : public beast::unit_test::suite
             }
             else if (sin <= amts.in)
             {
-                sout = Quality{amts}.ceil_in(amts, sin).out;
+                sout = Quality{amts}.ceilIn(amts, sin).out;
             }
             // limiting step, requested in is greater than the offer
             // pay exactly amts.in, which gets amts.out
@@ -318,7 +319,7 @@ class AMMCalc_test : public beast::unit_test::suite
             // assume there is no limiting step
             else
             {
-                sin = Quality{amts}.ceil_out(amts, sout).in;
+                sin = Quality{amts}.ceilOut(amts, sout).in;
             }
             resultIn = sin;
         }
@@ -396,8 +397,9 @@ class AMMCalc_test : public beast::unit_test::suite
                 if (auto const pool = getAmounts(++p); pool)
                 {
                     Account const amm("amm");
-                    auto const LPT = amm["LPT"];
-                    std::cout << to_string(ammLPTokens(pool->first.in, pool->first.out, LPT).iou())
+                    auto const lpt = amm["LPT"];
+                    std::cout << ::xrpl::to_string(
+                                     ammLPTokens(pool->first.in, pool->first.out, lpt).iou())
                               << std::endl;
                     return true;
                 }
diff --git a/src/test/app/AMMClawbackMPT_test.cpp b/src/test/app/AMMClawbackMPT_test.cpp
index 393c0b062c..6f0fff0282 100644
--- a/src/test/app/AMMClawbackMPT_test.cpp
+++ b/src/test/app/AMMClawbackMPT_test.cpp
@@ -27,7 +27,7 @@
 #include <optional>
 
 namespace xrpl::test {
-class AMMClawbackMPT_test : public beast::unit_test::suite
+class AMMClawbackMPT_test : public beast::unit_test::Suite
 {
     void
     testInvalidRequest(FeatureBitset features)
@@ -47,62 +47,62 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            auto const USD = gw["USD"];
-            env.trust(USD(10000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(10000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM amm(env, gw, BTC(100), USD(100));
+            AMM amm(env, gw, btc(100), usd(100));
 
             // holder does not exist
-            env(amm::ammClawback(gw, Account("unknown"), USD, BTC, std::nullopt),
-                ter(terNO_ACCOUNT));
+            env(amm::ammClawback(gw, Account("unknown"), usd, btc, std::nullopt),
+                Ter(terNO_ACCOUNT));
 
             // can not clawback from self.
-            env(amm::ammClawback(gw, gw, USD, BTC, std::nullopt), ter(temMALFORMED));
+            env(amm::ammClawback(gw, gw, usd, btc, std::nullopt), Ter(temMALFORMED));
 
             // provided Asset does not match issuer gw
             {
                 env(amm::ammClawback(
-                        gw, alice, Issue{gw["USD"].currency, alice.id()}, BTC, std::nullopt),
-                    ter(temMALFORMED));
-                env(amm::ammClawback(gw, alice, MPTIssue{makeMptID(1, alice)}, USD, std::nullopt),
-                    ter(temMALFORMED));
+                        gw, alice, Issue{gw["USD"].currency, alice.id()}, btc, std::nullopt),
+                    Ter(temMALFORMED));
+                env(amm::ammClawback(gw, alice, MPTIssue{makeMptID(1, alice)}, usd, std::nullopt),
+                    Ter(temMALFORMED));
             }
 
             // Amount does not match asset
             {
                 env(amm::ammClawback(
-                        gw, alice, USD, BTC, STAmount{Issue{gw["USD"].currency, alice.id()}, 1}),
-                    ter(temBAD_AMOUNT));
+                        gw, alice, usd, btc, STAmount{Issue{gw["USD"].currency, alice.id()}, 1}),
+                    Ter(temBAD_AMOUNT));
                 env(amm::ammClawback(
-                        gw, alice, BTC, USD, STAmount{MPTIssue{makeMptID(1, alice)}, 10}),
-                    ter(temBAD_AMOUNT));
+                        gw, alice, btc, usd, STAmount{MPTIssue{makeMptID(1, alice)}, 10}),
+                    Ter(temBAD_AMOUNT));
             }
 
             // Amount is not greater than 0
             {
-                env(amm::ammClawback(gw, alice, BTC, USD, BTC(-1)), ter(temBAD_AMOUNT));
-                env(amm::ammClawback(gw, alice, BTC, USD, BTC(0)), ter(temBAD_AMOUNT));
+                env(amm::ammClawback(gw, alice, btc, usd, btc(-1)), Ter(temBAD_AMOUNT));
+                env(amm::ammClawback(gw, alice, btc, usd, btc(0)), Ter(temBAD_AMOUNT));
             }
 
             // clawback from account not holding lptoken
-            env(amm::ammClawback(gw, bob, BTC, USD, BTC(1000)), ter(tecAMM_BALANCE));
+            env(amm::ammClawback(gw, bob, btc, usd, btc(1000)), Ter(tecAMM_BALANCE));
 
             // can not perform regular claw from amm pool
             {
-                Issue const usd(USD.currency, amm.ammAccount());
-                auto amount = amountFromString(usd, "10");
+                Issue const ammUsd(usd.currency, amm.ammAccount());
+                auto amount = amountFromString(ammUsd, "10");
                 auto const err =
                     feature[featureSingleAssetVault] ? tecPSEUDO_ACCOUNT : tecAMM_ACCOUNT;
-                env(claw(gw, amount), ter(err));
+                env(claw(gw, amount), Ter(err));
             }
 
             // AMM does not exist
@@ -111,7 +111,7 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
                 amm.withdrawAll(gw);
                 BEAST_EXPECT(!amm.ammExists());
                 env.close();
-                env(amm::ammClawback(gw, alice, USD, BTC, std::nullopt), ter(terNO_AMM));
+                env(amm::ammClawback(gw, alice, usd, btc, std::nullopt), Ter(terNO_AMM));
             }
         }
 
@@ -126,21 +126,21 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC =
+            MPT const btc =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 40'000});
 
-            auto const USD = gw["USD"];
-            env.trust(USD(10000), alice);
-            env(pay(gw, alice, USD(10000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(10000), alice);
+            env(pay(gw, alice, usd(10000)));
             env.close();
 
-            AMM amm(env, gw, BTC(100), USD(100));
+            AMM amm(env, gw, btc(100), usd(100));
             env.close();
             amm.deposit(alice, 1'000);
             env.close();
 
             // can not clawback when tfMPTCanClawback is not enabled
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), ter(tecNO_PERMISSION));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Ter(tecNO_PERMISSION));
         }
 
         // can not claw with tfClawTwoAssets if the assets are not issued by the
@@ -156,20 +156,20 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(10000), alice);
-            env(pay(gw, alice, USD(10000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(10000), alice);
+            env(pay(gw, alice, usd(10000)));
             env.close();
 
             // todo: check tfMPTCanTransfer in xrpl.org
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM const amm(env, alice, BTC(100), USD(100));
+            AMM const amm(env, alice, btc(100), usd(100));
             env.close();
 
             {
@@ -177,9 +177,9 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
                 // tfClawTwoAssets, but the issuer only issues USD in the pool.
                 // The issuer is not allowed to set tfClawTwoAssets flag if he
                 // did not issue both assets in the pool.
-                env(amm::ammClawback(gw, alice, USD, BTC, std::nullopt),
-                    txflags(tfClawTwoAssets),
-                    ter(temINVALID_FLAG));
+                env(amm::ammClawback(gw, alice, usd, btc, std::nullopt),
+                    Txflags(tfClawTwoAssets),
+                    Ter(temINVALID_FLAG));
             }
         }
 
@@ -192,19 +192,19 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env.fund(XRP(10000), gw, alice);
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM const amm(env, alice, BTC(100), XRP(100));
+            AMM const amm(env, alice, btc(100), XRP(100));
             env.close();
 
             // If asfAllowTrustLineClawback is not set, the issuer can
             // still claw MPT because the MPT's tfMPTCanClawback is set.
-            env(amm::ammClawback(gw, alice, BTC, XRP, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, XRP, std::nullopt));
         }
     }
 
@@ -220,27 +220,27 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
 
-        MPT const BTC = MPTTester(
+        MPT const btc = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {alice},
              .pay = 10'000,
-             .flags = tfMPTCanClawback | MPTDEXFlags});
+             .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-        AMM const amm(env, alice, XRP(1'000), BTC(1'000));
+        AMM const amm(env, alice, XRP(1'000), btc(1'000));
 
         // disable featureAMMClawback
         env.disableFeature(featureAMMClawback);
-        env(amm::ammClawback(gw, alice, BTC, XRP, std::nullopt), ter(temDISABLED));
+        env(amm::ammClawback(gw, alice, btc, XRP, std::nullopt), Ter(temDISABLED));
 
         // enable featureAMMClawback and disable featureMPTokensV2
         env.enableFeature(featureAMMClawback);
         env.disableFeature(featureMPTokensV2);
-        env(amm::ammClawback(gw, alice, BTC, XRP, BTC(100)), ter(temDISABLED));
+        env(amm::ammClawback(gw, alice, btc, XRP, btc(100)), Ter(temDISABLED));
 
         // enable featureMPTokensV2
         env.enableFeature(featureMPTokensV2);
-        env(amm::ammClawback(gw, alice, BTC, XRP, BTC(200)));
+        env(amm::ammClawback(gw, alice, btc, XRP, btc(200)));
     }
 
     void
@@ -262,59 +262,59 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(50000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(50000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM const amm(env, alice, BTC(1000000000), USD(2000));
+            AMM const amm(env, alice, btc(1000000000), usd(2000));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'000000), USD(2000), IOUAmount{1414'213'562373095, -9}));
+                btc(1'000'000000), usd(2000), IOUAmount{1414'213'562373095, -9}));
 
             // can not set tfClawTwoAssets because the assets are not issued by
             // the same issuer.
-            env(amm::ammClawback(gw2, alice, BTC, USD, BTC(1000)),
-                txflags(tfClawTwoAssets),
-                ter(temINVALID_FLAG));
+            env(amm::ammClawback(gw2, alice, btc, usd, btc(1000)),
+                Txflags(tfClawTwoAssets),
+                Ter(temINVALID_FLAG));
 
-            auto aliceUSD = env.balance(alice, USD);
-            auto aliceBTC = env.balance(alice, BTC);
+            auto aliceUSD = env.balance(alice, usd);
+            auto aliceBTC = env.balance(alice, btc);
             // gw clawback 1000 USD from alice
-            env(amm::ammClawback(gw, alice, USD, BTC, USD(1000)));
+            env(amm::ammClawback(gw, alice, usd, btc, usd(1000)));
             env.close();
 
             BEAST_EXPECT(
-                amm.expectBalances(BTC(500'000000), USD(1000), IOUAmount{707'106'7811865475, -10}));
+                amm.expectBalances(btc(500'000000), usd(1000), IOUAmount{707'106'7811865475, -10}));
             // USD is clawed back,
-            env.require(balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceUSD));
             // a proportional amount of BTC is returned to alice
-            env.require(balance(alice, aliceBTC + BTC(500'000000)));
-            aliceBTC = env.balance(alice, BTC);
+            env.require(Balance(alice, aliceBTC + btc(500'000000)));
+            aliceBTC = env.balance(alice, btc);
 
             // gw2 clawback 250'000000 BTC from alice
-            env(amm::ammClawback(gw2, alice, BTC, USD, BTC(250'000000)));
+            env(amm::ammClawback(gw2, alice, btc, usd, btc(250'000000)));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(250'000000), USD(500), IOUAmount{353'553'3905932737, -10}));
-            env.require(balance(alice, aliceUSD + USD(500)));
-            env.require(balance(alice, aliceBTC));
-            aliceUSD = env.balance(alice, USD);
+                amm.expectBalances(btc(250'000000), usd(500), IOUAmount{353'553'3905932737, -10}));
+            env.require(Balance(alice, aliceUSD + usd(500)));
+            env.require(Balance(alice, aliceBTC));
+            aliceUSD = env.balance(alice, usd);
 
             // gw2 clawback 500'000000 BTC which exceeds the balance,
             // this will clawback all and the amm will be deleted.
-            env(amm::ammClawback(gw2, alice, BTC, USD, BTC(500'000000)));
+            env(amm::ammClawback(gw2, alice, btc, usd, btc(500'000000)));
             env.close();
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceUSD + USD(500)));
-            env.require(balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(500)));
+            env.require(Balance(alice, aliceBTC));
         }
 
         // AMMClawback from MPT/XRP pool
@@ -329,87 +329,87 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(1000000000), XRP(2000));
+            AMM amm(env, alice, btc(1000000000), XRP(2000));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'000000), XRP(2000), IOUAmount{1'414'213'562'373095, -6}));
+                btc(1'000'000000), XRP(2000), IOUAmount{1'414'213'562'373095, -6}));
 
-            amm.deposit(bob, BTC(2'000'000000), XRP(4000));
+            amm.deposit(bob, btc(2'000'000000), XRP(4000));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(3'000'000000), XRP(6000), IOUAmount{4'242'640'687'119285, -6}));
+                btc(3'000'000000), XRP(6000), IOUAmount{4'242'640'687'119285, -6}));
 
             auto aliceXRP = env.balance(alice, XRP);
-            auto aliceBTC = env.balance(alice, BTC);
+            auto aliceBTC = env.balance(alice, btc);
             auto bobXRP = env.balance(bob, XRP);
-            auto bobBTC = env.balance(bob, BTC);
+            auto bobBTC = env.balance(bob, btc);
 
             // can not claw XRP
-            env(amm::ammClawback(gw, alice, XRP, BTC, XRP(1000)), ter(temMALFORMED));
+            env(amm::ammClawback(gw, alice, XRP, btc, XRP(1000)), Ter(temMALFORMED));
             // can not set tfClawTwoAssets
-            env(amm::ammClawback(gw, alice, BTC, XRP, BTC(1000)),
-                txflags(tfClawTwoAssets),
-                ter(temINVALID_FLAG));
+            env(amm::ammClawback(gw, alice, btc, XRP, btc(1000)),
+                Txflags(tfClawTwoAssets),
+                Ter(temINVALID_FLAG));
 
             // gw clawback 500 BTC from alice
-            env(amm::ammClawback(gw, alice, BTC, XRP, BTC(500)));
+            env(amm::ammClawback(gw, alice, btc, XRP, btc(500)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(2'999'999501),
+                btc(2'999'999501),
                 STAmount{XRP, UINT64_C(5'999'999001)},
                 IOUAmount{4'242'639'980'012504, -6}));
-            env.require(balance(alice, aliceXRP + drops(999)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(bob, bobXRP));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(alice, aliceXRP + drops(999)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(bob, bobXRP));
+            env.require(Balance(bob, bobBTC));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'414'212'855'266314, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{2'828'427'124'74619, -5}));
             aliceXRP = env.balance(alice, XRP);
 
             // gw clawback 1000'000000 BTC from bob
-            env(amm::ammClawback(gw, bob, BTC, XRP, BTC(1'000'000000)));
+            env(amm::ammClawback(gw, bob, btc, XRP, btc(1'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'999'999501),
+                btc(1'999'999501),
                 STAmount{XRP, UINT64_C(3'999'999002)},
                 IOUAmount{2828426418'110813, -6}));
-            env.require(balance(alice, aliceXRP));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(bob, bobXRP + XRPAmount(1999999999)));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(alice, aliceXRP));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(bob, bobXRP + XRPAmount(1999999999)));
+            env.require(Balance(bob, bobBTC));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'414'212'855'266314, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{1'414'213'562'844499, -6}));
             bobXRP = env.balance(bob, XRP);
 
             // gw clawback 1000'000000 BTC from alice, which exceeds her balance
             // will clawback all her balance
-            env(amm::ammClawback(gw, alice, BTC, XRP, BTC(1'000'000000)));
+            env(amm::ammClawback(gw, alice, btc, XRP, btc(1'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'000001), XRPAmount(2'000'000002), IOUAmount{1'414'213'562'844499, -6}));
-            env.require(balance(alice, aliceXRP + STAmount{XRP, UINT64_C(1'999'999000)}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(bob, bobXRP));
-            env.require(balance(bob, bobBTC));
+                btc(1'000'000001), XRPAmount(2'000'000002), IOUAmount{1'414'213'562'844499, -6}));
+            env.require(Balance(alice, aliceXRP + STAmount{XRP, UINT64_C(1'999'999000)}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(bob, bobXRP));
+            env.require(Balance(bob, bobBTC));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{1'414'213'562'844499, -6}));
             aliceXRP = env.balance(alice, XRP);
 
             // gw clawback from bob, which exceeds his balance
-            env(amm::ammClawback(gw, bob, BTC, XRP, BTC(2'000'000000)));
+            env(amm::ammClawback(gw, bob, btc, XRP, btc(2'000'000000)));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceXRP));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(bob, bobXRP + XRPAmount(2000000002)));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(alice, aliceXRP));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(bob, bobXRP + XRPAmount(2000000002)));
+            env.require(Balance(bob, bobBTC));
         }
 
         // AMMClawback from MPT/MPT pool, different issuers
@@ -426,80 +426,80 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(2'000'000000), ETH(3'000'000000));
+            AMM amm(env, alice, btc(2'000'000000), eth(3'000'000000));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(2'000'000000), ETH(3'000'000000), IOUAmount{2'449'489'742'783178, -6}));
+                btc(2'000'000000), eth(3'000'000000), IOUAmount{2'449'489'742'783178, -6}));
 
-            amm.deposit(bob, BTC(4'000'000000), ETH(6'000'000000));
+            amm.deposit(bob, btc(4'000'000000), eth(6'000'000000));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(6'000'000000), ETH(9'000'000000), IOUAmount{7'348'469'228'349534, -6}));
+                btc(6'000'000000), eth(9'000'000000), IOUAmount{7'348'469'228'349534, -6}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceETH = env.balance(alice, ETH);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobETH = env.balance(bob, ETH);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceETH = env.balance(alice, eth);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobETH = env.balance(bob, eth);
 
             // gw clawback BTC from alice
-            env(amm::ammClawback(gw, alice, BTC, ETH, BTC(1'000'000000)));
+            env(amm::ammClawback(gw, alice, btc, eth, btc(1'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(5'000'000000), ETH(7'500'000000), IOUAmount{6'123'724'356'957944, -6}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH + ETH(1'500'000000)));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+                btc(5'000'000000), eth(7'500'000000), IOUAmount{6'123'724'356'957944, -6}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH + eth(1'500'000000)));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'224'744'871'391588, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{4'898'979'485'566356, -6}));
-            aliceETH = env.balance(alice, ETH);
+            aliceETH = env.balance(alice, eth);
 
             // gw2 clawback ETH from bob
-            env(amm::ammClawback(gw2, bob, ETH, BTC, ETH(3'000'000000)));
+            env(amm::ammClawback(gw2, bob, eth, btc, eth(3'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(3'000'000000), ETH(4'500'000000), IOUAmount{3'674'234'614'174766, -6}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC + BTC(2'000'000000)));
-            env.require(balance(bob, bobETH));
+                btc(3'000'000000), eth(4'500'000000), IOUAmount{3'674'234'614'174766, -6}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC + btc(2'000'000000)));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'224'744'871'391588, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{2'449'489'742'783178, -6}));
-            bobBTC = env.balance(bob, BTC);
+            bobBTC = env.balance(bob, btc);
 
             // gw2 clawback ETH from alice, which exceeds her balance
-            env(amm::ammClawback(gw2, alice, ETH, BTC, ETH(4'000'000000)));
+            env(amm::ammClawback(gw2, alice, eth, btc, eth(4'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(2'000'000001), ETH(3'000'000001), IOUAmount{2'449'489'742'783178, -6}));
-            env.require(balance(alice, aliceBTC + BTC(999'999999)));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
-            aliceBTC = env.balance(alice, BTC);
+                btc(2'000'000001), eth(3'000'000001), IOUAmount{2'449'489'742'783178, -6}));
+            env.require(Balance(alice, aliceBTC + btc(999'999999)));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
+            aliceBTC = env.balance(alice, btc);
 
             // gw clawback BTC from bob, which exceeds his balance
-            env(amm::ammClawback(gw, bob, BTC, ETH, BTC(3'000'000000)));
+            env(amm::ammClawback(gw, bob, btc, eth, btc(3'000'000000)));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH + ETH(3'000'000001)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH + eth(3'000'000001)));
         }
     }
 
@@ -523,53 +523,53 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(50000)));
-            env.trust(USD(200000), bob);
-            env(pay(gw, bob, USD(60000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(50000)));
+            env.trust(usd(200000), bob);
+            env(pay(gw, bob, usd(60000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(2000000000), USD(2000));
+            AMM amm(env, alice, btc(2000000000), usd(2000));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(BTC(2'000'000000), USD(2000), IOUAmount(2000000)));
+            BEAST_EXPECT(amm.expectBalances(btc(2'000'000000), usd(2000), IOUAmount(2000000)));
 
             // gw clawback all BTC from alice
-            amm.deposit(bob, BTC(1'000'000000), USD(2000));
+            amm.deposit(bob, btc(1'000'000000), usd(2000));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(BTC(3'000'000000), USD(3000), IOUAmount(3000000)));
+            BEAST_EXPECT(amm.expectBalances(btc(3'000'000000), usd(3000), IOUAmount(3000000)));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceUSD = env.balance(alice, USD);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobUSD = env.balance(bob, USD);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceUSD = env.balance(alice, usd);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobUSD = env.balance(bob, usd);
 
             // gw2 clawback all BTC from alice
-            env(amm::ammClawback(gw2, alice, BTC, USD, std::nullopt));
+            env(amm::ammClawback(gw2, alice, btc, usd, std::nullopt));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(BTC(1'000'000000), USD(1000), IOUAmount(1000000)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(2000)));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobUSD));
-            aliceUSD = env.balance(alice, USD);
+            BEAST_EXPECT(amm.expectBalances(btc(1'000'000000), usd(1000), IOUAmount(1000000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(2000)));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobUSD));
+            aliceUSD = env.balance(alice, usd);
 
             // gw clawback all USD from bob
-            env(amm::ammClawback(gw, bob, USD, BTC, std::nullopt));
+            env(amm::ammClawback(gw, bob, usd, btc, std::nullopt));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(bob, bobBTC + BTC(1'000'000000)));
-            env.require(balance(bob, bobUSD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(bob, bobBTC + btc(1'000'000000)));
+            env.require(Balance(bob, bobUSD));
         }
 
         // AMMClawback all from MPT/XRP pool
@@ -584,47 +584,47 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(5000), XRP(10'000));
+            AMM amm(env, alice, btc(5000), XRP(10'000));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(5'000), XRP(10'000), IOUAmount{7'071'067'811865475, -9}));
+                amm.expectBalances(btc(5'000), XRP(10'000), IOUAmount{7'071'067'811865475, -9}));
 
-            amm.deposit(bob, BTC(10'000), XRP(20'000));
+            amm.deposit(bob, btc(10'000), XRP(20'000));
             BEAST_EXPECT(
-                amm.expectBalances(BTC(15'000), XRP(30'000), IOUAmount{21'213'203'43559642, -8}));
+                amm.expectBalances(btc(15'000), XRP(30'000), IOUAmount{21'213'203'43559642, -8}));
 
             auto aliceXRP = env.balance(alice, XRP);
-            auto aliceBTC = env.balance(alice, BTC);
+            auto aliceBTC = env.balance(alice, btc);
             auto bobXRP = env.balance(bob, XRP);
-            auto bobBTC = env.balance(bob, BTC);
+            auto bobBTC = env.balance(bob, btc);
 
             // gw clawback all BTC from alice
-            env(amm::ammClawback(gw, alice, BTC, XRP, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, XRP, std::nullopt));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(10'000), XRP(20'000), IOUAmount{14'142'135'62373094, -8}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceXRP + XRP(10'000)));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobXRP));
+                amm.expectBalances(btc(10'000), XRP(20'000), IOUAmount{14'142'135'62373094, -8}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceXRP + XRP(10'000)));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobXRP));
             aliceXRP = env.balance(alice, XRP);
 
             // gw clawback all BTC from bob
-            env(amm::ammClawback(gw, bob, BTC, XRP, std::nullopt));
+            env(amm::ammClawback(gw, bob, btc, XRP, std::nullopt));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceXRP));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobXRP + XRP(20'000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceXRP));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobXRP + XRP(20'000)));
         }
 
         // AMMClawback all from MPT/MPT pool, different issuers
@@ -641,54 +641,54 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(20'000), ETH(50'000));
+            AMM amm(env, alice, btc(20'000), eth(50'000));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(20'000), ETH(50'000), IOUAmount{31'622'77660168379, -11}));
+                amm.expectBalances(btc(20'000), eth(50'000), IOUAmount{31'622'77660168379, -11}));
 
-            amm.deposit(bob, BTC(40'000), ETH(100'000));
+            amm.deposit(bob, btc(40'000), eth(100'000));
             BEAST_EXPECT(
-                amm.expectBalances(BTC(60'000), ETH(150'000), IOUAmount{94'868'32980505137, -11}));
+                amm.expectBalances(btc(60'000), eth(150'000), IOUAmount{94'868'32980505137, -11}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceETH = env.balance(alice, ETH);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobETH = env.balance(bob, ETH);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceETH = env.balance(alice, eth);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobETH = env.balance(bob, eth);
 
             // gw clawback all BTC from bob
-            env(amm::ammClawback(gw, bob, BTC, ETH, std::nullopt));
+            env(amm::ammClawback(gw, bob, btc, eth, std::nullopt));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(20'000), ETH(50'000), IOUAmount{31'622'77660168379, -11}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH + ETH(100'000)));
-            bobETH = env.balance(bob, ETH);
+                amm.expectBalances(btc(20'000), eth(50'000), IOUAmount{31'622'77660168379, -11}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH + eth(100'000)));
+            bobETH = env.balance(bob, eth);
 
             // gw2 clawback all ETH from alice
-            env(amm::ammClawback(gw2, alice, ETH, BTC, std::nullopt));
+            env(amm::ammClawback(gw2, alice, eth, btc, std::nullopt));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC + BTC(20'000)));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+            env.require(Balance(alice, aliceBTC + btc(20'000)));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
         }
     }
 
@@ -710,88 +710,88 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(50000)));
-            env.trust(USD(100000), bob);
-            env(pay(gw, bob, USD(40000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(50000)));
+            env.trust(usd(100000), bob);
+            env(pay(gw, bob, usd(40000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(1'000'000000), USD(2000));
+            AMM amm(env, alice, btc(1'000'000000), usd(2000));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'000000), USD(2000), IOUAmount{1414'213'562373095, -9}));
+                btc(1'000'000000), usd(2000), IOUAmount{1414'213'562373095, -9}));
 
-            amm.deposit(bob, BTC(500'000000), USD(1000));
+            amm.deposit(bob, btc(500'000000), usd(1000));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'500'000000),
-                STAmount{USD, UINT64_C(2'999'999999999999), -12},
+                btc(1'500'000000),
+                STAmount{usd, UINT64_C(2'999'999999999999), -12},
                 IOUAmount{2'121'320'343559642, -9}));
 
-            auto aliceUSD = env.balance(alice, USD);
-            auto aliceBTC = env.balance(alice, BTC);
-            auto bobUSD = env.balance(bob, USD);
-            auto bobBTC = env.balance(bob, BTC);
+            auto aliceUSD = env.balance(alice, usd);
+            auto aliceBTC = env.balance(alice, btc);
+            auto bobUSD = env.balance(bob, usd);
+            auto bobBTC = env.balance(bob, btc);
 
             // gw clawback 500 USD from alice.
-            env(amm::ammClawback(gw, alice, USD, BTC, USD(500)));
+            env(amm::ammClawback(gw, alice, usd, btc, usd(500)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1250'000001), USD(2500), IOUAmount{1'767'766'952966369, -9}));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(alice, aliceBTC + BTC(249'999999)));
-            env.require(balance(bob, bobUSD));
-            env.require(balance(bob, bobBTC));
-            aliceBTC = env.balance(alice, BTC);
+                btc(1250'000001), usd(2500), IOUAmount{1'767'766'952966369, -9}));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC + btc(249'999999)));
+            env.require(Balance(bob, bobUSD));
+            env.require(Balance(bob, bobBTC));
+            aliceBTC = env.balance(alice, btc);
             // gw clawback 250'000000 BTC and 500 USD from bob
             // with tfClawTwoAssets
-            env(amm::ammClawback(gw, bob, BTC, USD, BTC(250'000000)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, bob, btc, usd, btc(250'000000)), Txflags(tfClawTwoAssets));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'000002),
-                STAmount{USD, UINT64_C(2000'0000004), -7},
+                btc(1'000'000002),
+                STAmount{usd, UINT64_C(2000'0000004), -7},
                 IOUAmount{1'414'213'562655938, -9}));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(bob, bobUSD));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(bob, bobUSD));
+            env.require(Balance(bob, bobBTC));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'060'660'171779822, -9}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{353'553'390876116, -9}));
 
             // gw clawback USD from alice exceeding her balance
-            env(amm::ammClawback(gw, alice, USD, BTC, USD(5'000)));
+            env(amm::ammClawback(gw, alice, usd, btc, usd(5'000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(250'000001),
-                STAmount{USD, UINT64_C(500'0000004), -7},
+                btc(250'000001),
+                STAmount{usd, UINT64_C(500'0000004), -7},
                 IOUAmount{353'553'390876116, -9}));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(alice, aliceBTC + BTC(750'000001)));
-            env.require(balance(bob, bobUSD));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC + btc(750'000001)));
+            env.require(Balance(bob, bobUSD));
+            env.require(Balance(bob, bobBTC));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{353'553'390876116, -9}));
-            aliceBTC = env.balance(alice, BTC);
+            aliceBTC = env.balance(alice, btc);
 
             // gw clawback BTC from bob which exceeds his balance with
             // tfClawTwoAssets
-            env(amm::ammClawback(gw, bob, BTC, USD, BTC(300'000000)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, bob, btc, usd, btc(300'000000)), Txflags(tfClawTwoAssets));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC));
             // USD is also clawed back from bob because of tfClawTwoAssets,
             // bob's USD balance will not change
-            env.require(balance(bob, bobUSD));
-            env.require(balance(bob, bobBTC));
+            env.require(Balance(bob, bobUSD));
+            env.require(Balance(bob, bobBTC));
         }
 
         // AMMClawback from MPT/MPT issued by the same issuer
@@ -806,81 +806,81 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(2'000'000000), ETH(3'000'000000));
+            AMM amm(env, alice, btc(2'000'000000), eth(3'000'000000));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(2'000'000000), ETH(3'000'000000), IOUAmount{2'449'489'742'783178, -6}));
+                btc(2'000'000000), eth(3'000'000000), IOUAmount{2'449'489'742'783178, -6}));
 
-            amm.deposit(bob, BTC(4'000'000000), ETH(6'000'000000));
+            amm.deposit(bob, btc(4'000'000000), eth(6'000'000000));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(6'000'000000), ETH(9'000'000000), IOUAmount{7'348'469'228'349534, -6}));
+                btc(6'000'000000), eth(9'000'000000), IOUAmount{7'348'469'228'349534, -6}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceETH = env.balance(alice, ETH);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobETH = env.balance(bob, ETH);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceETH = env.balance(alice, eth);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobETH = env.balance(bob, eth);
 
             // gw clawback BTC from alice
-            env(amm::ammClawback(gw, alice, BTC, ETH, BTC(1'000'000000)));
+            env(amm::ammClawback(gw, alice, btc, eth, btc(1'000'000000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(5'000'000000), ETH(7'500'000000), IOUAmount{6'123'724'356'957944, -6}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH + ETH(1'500'000000)));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+                btc(5'000'000000), eth(7'500'000000), IOUAmount{6'123'724'356'957944, -6}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH + eth(1'500'000000)));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'224'744'871'391588, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{4'898'979'485'566356, -6}));
-            aliceETH = env.balance(alice, ETH);
+            aliceETH = env.balance(alice, eth);
 
             // gw clawback ETH and BTC from bob with tfClawTwoAssets
-            env(amm::ammClawback(gw, bob, ETH, BTC, ETH(3'000'000000)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, bob, eth, btc, eth(3'000'000000)), Txflags(tfClawTwoAssets));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(3'000'000000), ETH(4'500'000000), IOUAmount{3'674'234'614'174766, -6}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+                btc(3'000'000000), eth(4'500'000000), IOUAmount{3'674'234'614'174766, -6}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1'224'744'871'391588, -6}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{2'449'489'742'783178, -6}));
 
             // gw clawback BTC from alice, which exceeds her balance with
             // tfClawTwoAssets
-            env(amm::ammClawback(gw, alice, BTC, ETH, BTC(3'000'000000)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, alice, btc, eth, btc(3'000'000000)), Txflags(tfClawTwoAssets));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                BTC(2'000'000001), ETH(3'000'000001), IOUAmount{2'449'489'742'783178, -6}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+                btc(2'000'000001), eth(3'000'000001), IOUAmount{2'449'489'742'783178, -6}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{2'449'489'742'783178, -6}));
 
             // gw clawback ETH from bob, which is the same as his balance
-            env(amm::ammClawback(gw, bob, ETH, BTC, ETH(3'000'000001)));
+            env(amm::ammClawback(gw, bob, eth, btc, eth(3'000'000001)));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC + BTC(2'000'000001)));
-            env.require(balance(bob, bobETH));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC + btc(2'000'000001)));
+            env.require(Balance(bob, bobETH));
         }
     }
 
@@ -902,54 +902,54 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(50000)));
-            env.trust(USD(200000), bob);
-            env(pay(gw, bob, USD(60000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(50000)));
+            env.trust(usd(200000), bob);
+            env(pay(gw, bob, usd(60000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(2'000'000000), USD(8'000));
+            AMM amm(env, alice, btc(2'000'000000), usd(8'000));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(BTC(2'000'000000), USD(8'000), IOUAmount(4'000'000)));
+            BEAST_EXPECT(amm.expectBalances(btc(2'000'000000), usd(8'000), IOUAmount(4'000'000)));
 
-            amm.deposit(bob, BTC(1'000'000000), USD(4'000));
+            amm.deposit(bob, btc(1'000'000000), usd(4'000));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(BTC(3'000'000000), USD(12'000), IOUAmount(6'000'000)));
+            BEAST_EXPECT(amm.expectBalances(btc(3'000'000000), usd(12'000), IOUAmount(6'000'000)));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceUSD = env.balance(alice, USD);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobUSD = env.balance(bob, USD);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceUSD = env.balance(alice, usd);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobUSD = env.balance(bob, usd);
 
             // gw clawback all BTC and USD from alice
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Txflags(tfClawTwoAssets));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(BTC(1'000'000000), USD(4'000), IOUAmount(2'000'000)));
+            BEAST_EXPECT(amm.expectBalances(btc(1'000'000000), usd(4'000), IOUAmount(2'000'000)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(2'000'000)));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobUSD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobUSD));
 
             // gw clawback all USD from bob
-            env(amm::ammClawback(gw, bob, USD, BTC, std::nullopt));
+            env(amm::ammClawback(gw, bob, usd, btc, std::nullopt));
             env.close();
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(bob, bobBTC + BTC(1'000'000000)));
-            env.require(balance(bob, bobUSD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(bob, bobBTC + btc(1'000'000000)));
+            env.require(Balance(bob, bobUSD));
         }
 
         // AMMClawback all from MPT/MPT issued by the same issuer
@@ -964,57 +964,57 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(20'000), ETH(10'000));
+            AMM amm(env, alice, btc(20'000), eth(10'000));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(20'000), ETH(10'000), IOUAmount{14'142'13562373095, -11}));
+                amm.expectBalances(btc(20'000), eth(10'000), IOUAmount{14'142'13562373095, -11}));
 
-            amm.deposit(bob, BTC(40'000), ETH(20'000));
+            amm.deposit(bob, btc(40'000), eth(20'000));
             BEAST_EXPECT(
-                amm.expectBalances(BTC(60'000), ETH(30'000), IOUAmount{42'426'40687119285, -11}));
+                amm.expectBalances(btc(60'000), eth(30'000), IOUAmount{42'426'40687119285, -11}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceETH = env.balance(alice, ETH);
-            auto bobBTC = env.balance(bob, BTC);
-            auto bobETH = env.balance(bob, ETH);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceETH = env.balance(alice, eth);
+            auto bobBTC = env.balance(bob, btc);
+            auto bobETH = env.balance(bob, eth);
 
             // gw clawback all ETH from bob
-            env(amm::ammClawback(gw, bob, ETH, BTC, std::nullopt));
+            env(amm::ammClawback(gw, bob, eth, btc, std::nullopt));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(20'000), ETH(10'000), IOUAmount{14'142'13562373095, -11}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC + BTC(40'000)));
-            env.require(balance(bob, bobETH));
+                amm.expectBalances(btc(20'000), eth(10'000), IOUAmount{14'142'13562373095, -11}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC + btc(40'000)));
+            env.require(Balance(bob, bobETH));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{14'142'13562373095, -11}));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(0)));
-            bobBTC = env.balance(bob, BTC);
+            bobBTC = env.balance(bob, btc);
 
             // gw clawback all ETH and BTC from alice with tfClawTwoAssets
-            env(amm::ammClawback(gw, alice, ETH, BTC, std::nullopt), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, alice, eth, btc, std::nullopt), Txflags(tfClawTwoAssets));
             env.close();
 
             // amm is empty and deleted
             BEAST_EXPECT(!amm.ammExists());
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(bob, bobBTC));
-            env.require(balance(bob, bobETH));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(bob, bobBTC));
+            env.require(Balance(bob, bobETH));
         }
     }
 
@@ -1037,83 +1037,83 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), gw2);
-            env(pay(gw, gw2, USD(5000)));
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(5000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), gw2);
+            env(pay(gw, gw2, usd(5000)));
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(5000)));
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice, gw},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, gw, USD(1000), BTC(2000));
+            AMM amm(env, gw, usd(1000), btc(2000));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(USD(1000), BTC(2000), IOUAmount{1414'213562373095, -12}));
+                amm.expectBalances(usd(1000), btc(2000), IOUAmount{1414'213562373095, -12}));
 
-            amm.deposit(gw2, USD(2000), BTC(4000));
+            amm.deposit(gw2, usd(2000), btc(4000));
             BEAST_EXPECT(
-                amm.expectBalances(USD(3000), BTC(6000), IOUAmount{4242'640687119285, -12}));
+                amm.expectBalances(usd(3000), btc(6000), IOUAmount{4242'640687119285, -12}));
 
-            amm.deposit(alice, USD(3000), BTC(6000));
+            amm.deposit(alice, usd(3000), btc(6000));
             BEAST_EXPECT(
-                amm.expectBalances(USD(6000), BTC(12000), IOUAmount{8485'281374238570, -12}));
+                amm.expectBalances(usd(6000), btc(12000), IOUAmount{8485'281374238570, -12}));
 
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{1414'213562373095, -12}));
             BEAST_EXPECT(amm.expectLPTokens(gw2, IOUAmount{2828'427124746190, -12}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242'640687119285, -12}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceUSD = env.balance(alice, USD);
-            auto gwBTC = env.balance(gw, BTC);
-            auto gw2USD = env.balance(gw2, USD);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceUSD = env.balance(alice, usd);
+            auto gwBTC = env.balance(gw, btc);
+            auto gw2USD = env.balance(gw2, usd);
 
             // gw claws back 1000 USD from gw2.
-            env(amm::ammClawback(gw, gw2, USD, BTC, USD(1000)));
+            env(amm::ammClawback(gw, gw2, usd, btc, usd(1000)));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(USD(5000), BTC(10000), IOUAmount{7071'067811865474, -12}));
+                amm.expectBalances(usd(5000), btc(10000), IOUAmount{7071'067811865474, -12}));
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{1414'213562373095, -12}));
             BEAST_EXPECT(amm.expectLPTokens(gw2, IOUAmount{1414'213562373094, -12}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242'640687119285, -12}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(gw, gwBTC));
-            env.require(balance(gw2, gw2USD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(gw, gwBTC));
+            env.require(Balance(gw2, gw2USD));
 
             // gw2 claws back 1000 BTC from gw.
-            env(amm::ammClawback(gw2, gw, BTC, USD, BTC(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, gw, btc, usd, btc(1000)), Ter(tesSUCCESS));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(USD(4500), BTC(9001), IOUAmount{6363'961030678927, -12}));
+                amm.expectBalances(usd(4500), btc(9001), IOUAmount{6363'961030678927, -12}));
 
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{707'1067811865480, -13}));
             BEAST_EXPECT(amm.expectLPTokens(gw2, IOUAmount{1414'213562373094, -12}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242'640687119285, -12}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
-            env.require(balance(gw, gwBTC));
-            env.require(balance(gw2, gw2USD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
+            env.require(Balance(gw, gwBTC));
+            env.require(Balance(gw2, gw2USD));
 
             // gw2 claws back 4000 BTC from alice
-            env(amm::ammClawback(gw2, alice, BTC, USD, BTC(4000)));
+            env(amm::ammClawback(gw2, alice, btc, usd, btc(4000)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
-                STAmount{USD, UINT64_C(2500'222197533607), -12},
-                BTC(5001),
+                STAmount{usd, UINT64_C(2500'222197533607), -12},
+                btc(5001),
                 IOUAmount{3535'84814069829, -11}));
 
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{707'1067811865480, -13}));
             BEAST_EXPECT(amm.expectLPTokens(gw2, IOUAmount{1414'213562373094, -12}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1414'527797138648, -12}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + STAmount{USD, UINT64_C(1999'777802466393), -12}));
-            env.require(balance(gw, gwBTC));
-            env.require(balance(gw2, gw2USD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + STAmount{usd, UINT64_C(1999'777802466393), -12}));
+            env.require(Balance(gw, gwBTC));
+            env.require(Balance(gw2, gw2USD));
         }
 
         // AMMClawback from MPT/MPT issued by each other
@@ -1129,67 +1129,67 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {gw2, alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {gw, alice},
                  .pay = 30'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, gw, BTC(10'000), ETH(50'000));
+            AMM amm(env, gw, btc(10'000), eth(50'000));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(10'000), ETH(50'000), IOUAmount{22'360'67977499789, -11}));
+                amm.expectBalances(btc(10'000), eth(50'000), IOUAmount{22'360'67977499789, -11}));
 
-            amm.deposit(gw2, BTC(20'000), ETH(100'000));
+            amm.deposit(gw2, btc(20'000), eth(100'000));
             BEAST_EXPECT(
-                amm.expectBalances(BTC(30'000), ETH(150'000), IOUAmount{67'082'03932499367, -11}));
+                amm.expectBalances(btc(30'000), eth(150'000), IOUAmount{67'082'03932499367, -11}));
 
-            amm.deposit(alice, BTC(40'000), ETH(200'000));
+            amm.deposit(alice, btc(40'000), eth(200'000));
             BEAST_EXPECT(
-                amm.expectBalances(BTC(70'000), ETH(350'000), IOUAmount{156'524'7584249852, -10}));
+                amm.expectBalances(btc(70'000), eth(350'000), IOUAmount{156'524'7584249852, -10}));
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto aliceETH = env.balance(alice, ETH);
-            auto gw2BTC = env.balance(gw2, BTC);
-            auto gwETH = env.balance(gw, ETH);
+            auto aliceBTC = env.balance(alice, btc);
+            auto aliceETH = env.balance(alice, eth);
+            auto gw2BTC = env.balance(gw2, btc);
+            auto gwETH = env.balance(gw, eth);
 
             // gw claws back 1000 BTC from gw2.
-            env(amm::ammClawback(gw, gw2, BTC, ETH, BTC(1000)));
+            env(amm::ammClawback(gw, gw2, btc, eth, btc(1000)));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(69'001), ETH(345'001), IOUAmount{154'288'6904474855, -10}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(gw, gwETH));
-            env.require(balance(gw2, gw2BTC));
+                amm.expectBalances(btc(69'001), eth(345'001), IOUAmount{154'288'6904474855, -10}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(gw, gwETH));
+            env.require(Balance(gw2, gw2BTC));
 
             // gw2 claws back all ETH from gw
-            env(amm::ammClawback(gw2, gw, ETH, BTC, std::nullopt));
+            env(amm::ammClawback(gw2, gw, eth, btc, std::nullopt));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(59'001), ETH(295'001), IOUAmount{131'928'0106724876, -10}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH));
-            env.require(balance(gw, gwETH));
-            env.require(balance(gw2, gw2BTC));
+                amm.expectBalances(btc(59'001), eth(295'001), IOUAmount{131'928'0106724876, -10}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH));
+            env.require(Balance(gw, gwETH));
+            env.require(Balance(gw2, gw2BTC));
 
             // gw claws back all BTC from alice
-            env(amm::ammClawback(gw, alice, BTC, ETH, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, eth, std::nullopt));
             env.close();
             BEAST_EXPECT(
-                amm.expectBalances(BTC(19'001), ETH(95'001), IOUAmount{42'485'29157249607, -11}));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceETH + ETH(200'000)));
-            env.require(balance(gw, gwETH));
-            env.require(balance(gw2, gw2BTC));
+                amm.expectBalances(btc(19'001), eth(95'001), IOUAmount{42'485'29157249607, -11}));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceETH + eth(200'000)));
+            env.require(Balance(gw, gwETH));
+            env.require(Balance(gw2, gw2BTC));
         }
     }
 
@@ -1208,65 +1208,65 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
 
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            auto const USD = gw["USD"];
-            env.trust(USD(1'000'000), alice);
-            env(pay(gw, alice, USD(500'000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1'000'000), alice);
+            env(pay(gw, alice, usd(500'000)));
 
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 30'000,
-                 .flags = tfMPTCanClawback | tfMPTCanLock | MPTDEXFlags});
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(10'000), BTC(10'000), IOUAmount(10'000)));
+                 .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
+            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();
 
-            auto aliceBTC = env.balance(alice, MPT(BTC));
-            auto aliceUSD = env.balance(alice, USD);
+            auto aliceBTC = env.balance(alice, MPT(btc));
+            auto aliceUSD = env.balance(alice, usd);
 
             // globally locked and claw back 1000 BTC.
             // this should be successful
-            BTC.set({.flags = tfMPTLock});
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(1'000)));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(9'000), BTC(9'000), IOUAmount(9'000)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(1'000)));
-            aliceUSD = env.balance(alice, USD);
+            btc.set({.flags = tfMPTLock});
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(1'000)));
+            BEAST_EXPECT(ammAlice.expectBalances(usd(9'000), btc(9'000), IOUAmount(9'000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(1'000)));
+            aliceUSD = env.balance(alice, usd);
 
             // unlock and claw back 2000 BTC
-            BTC.set({.flags = tfMPTUnlock});
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(2'000)));
+            btc.set({.flags = tfMPTUnlock});
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(2'000)));
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(USD, UINT64_C(7'000'000000000001), -12), BTC(7'001), IOUAmount(7'000)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(2'000)));
-            aliceUSD = env.balance(alice, USD);
+                STAmount(usd, UINT64_C(7'000'000000000001), -12), btc(7'001), IOUAmount(7'000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(2'000)));
+            aliceUSD = env.balance(alice, usd);
 
             // globally freeze trustline and claw back 1000 USD.
             // this should be successful
             env(trust(gw, alice["USD"](0), tfSetFreeze));
             env.close();
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(1'000)));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(1'000)));
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(USD, UINT64_C(6000'000000000002), -12),
-                BTC(6'001),
+                STAmount(usd, UINT64_C(6000'000000000002), -12),
+                btc(6'001),
                 IOUAmount(6'000'000000000001, -12)));
-            env.require(balance(alice, aliceBTC + BTC(1'000)));
-            env.require(balance(alice, aliceUSD));
-            aliceBTC = env.balance(alice, MPT(BTC));
+            env.require(Balance(alice, aliceBTC + btc(1'000)));
+            env.require(Balance(alice, aliceUSD));
+            aliceBTC = env.balance(alice, MPT(btc));
 
             // globally unfreeze trustline and claw back 2000 USD
             // and 2000 BTC with tfClawTwoAssets
             env(fset(gw, asfGlobalFreeze));
             env.close();
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(2'000)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(2'000)), Txflags(tfClawTwoAssets));
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(USD, UINT64_C(4'000'000000000002), -12),
-                BTC(4'001),
+                STAmount(usd, UINT64_C(4'000'000000000002), -12),
+                btc(4'001),
                 IOUAmount(4'000'000000000001, -12)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
         }
 
         // test AMMClawback when MPT individually locked or IOU individually
@@ -1279,59 +1279,59 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
 
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            auto const USD = gw["USD"];
-            env.trust(USD(1'000'000), alice);
-            env(pay(gw, alice, USD(500'000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1'000'000), alice);
+            env(pay(gw, alice, usd(500'000)));
 
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 30'000,
-                 .flags = tfMPTCanClawback | tfMPTCanLock | MPTDEXFlags});
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(10'000), BTC(10'000), IOUAmount(10'000)));
+                 .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
+            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();
 
-            auto aliceBTC = env.balance(alice, MPT(BTC));
-            auto aliceUSD = env.balance(alice, USD);
+            auto aliceBTC = env.balance(alice, MPT(btc));
+            auto aliceUSD = env.balance(alice, usd);
 
             // individually locked and claw back 2000 BTC from alice
-            BTC.set({.holder = alice, .flags = tfMPTLock});
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(2'000)));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(8'000), BTC(8'000), IOUAmount(8'000)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(2'000)));
-            aliceUSD = env.balance(alice, USD);
+            btc.set({.holder = alice, .flags = tfMPTLock});
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(2'000)));
+            BEAST_EXPECT(ammAlice.expectBalances(usd(8'000), btc(8'000), IOUAmount(8'000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(2'000)));
+            aliceUSD = env.balance(alice, usd);
 
             // individually freeze trustline and claw back 1000 USD from alice
             env(trust(gw, alice["USD"](0), tfSetFreeze));
             env.close();
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(1'000)));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(7'000), BTC(7'000), IOUAmount(7'000)));
-            env.require(balance(alice, aliceBTC + BTC(1'000)));
-            env.require(balance(alice, aliceUSD));
-            aliceBTC = env.balance(alice, MPT(BTC));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(1'000)));
+            BEAST_EXPECT(ammAlice.expectBalances(usd(7'000), btc(7'000), IOUAmount(7'000)));
+            env.require(Balance(alice, aliceBTC + btc(1'000)));
+            env.require(Balance(alice, aliceUSD));
+            aliceBTC = env.balance(alice, MPT(btc));
 
             // unlock MPT and claw back 3000 BTC from alice
-            BTC.set({.holder = alice, .flags = tfMPTUnlock});
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(3'000)));
+            btc.set({.holder = alice, .flags = tfMPTUnlock});
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(3'000)));
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount{USD, UINT64_C(4000'000000000001), -12}, BTC(4'001), IOUAmount(4'000)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(3'000)));
-            aliceUSD = env.balance(alice, USD);
+                STAmount{usd, UINT64_C(4000'000000000001), -12}, btc(4'001), IOUAmount(4'000)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(3'000)));
+            aliceUSD = env.balance(alice, usd);
 
             // unlock trustline and claw back 1000 USD from alice
             env(trust(gw, alice["USD"](0), tfClearFreeze));
             env.close();
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(1'000)));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(1'000)));
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(USD, UINT64_C(3'000'000000000002), -12),
-                BTC(3'001),
+                STAmount(usd, UINT64_C(3'000'000000000002), -12),
+                btc(3'001),
                 IOUAmount(3000'000000000001, -12)));
-            env.require(balance(alice, aliceBTC + BTC(1'000)));
-            env.require(balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceBTC + btc(1'000)));
+            env.require(Balance(alice, aliceUSD));
         }
     }
 
@@ -1349,31 +1349,31 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env.fund(XRP(1000000000), gw, alice);
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
             // gw creates AMM pool of BTC/XRP.
-            AMM amm(env, gw, XRP(100), BTC(400), ter(tesSUCCESS));
+            AMM amm(env, gw, XRP(100), btc(400), Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(XRP(100), BTC(400), IOUAmount(200000)));
-            amm.deposit(alice, BTC(400));
+            BEAST_EXPECT(amm.expectBalances(XRP(100), btc(400), IOUAmount(200000)));
+            amm.deposit(alice, btc(400));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(XRP(100), BTC(800), IOUAmount{282842'712474619, -9}));
+            BEAST_EXPECT(amm.expectBalances(XRP(100), btc(800), IOUAmount{282842'712474619, -9}));
 
-            auto aliceBTC = env.balance(alice, MPT(BTC));
+            auto aliceBTC = env.balance(alice, MPT(btc));
             auto aliceXRP = env.balance(alice, XRP);
 
             // gw clawback 100 BTC from alice
-            env(amm::ammClawback(gw, alice, MPT(BTC), XRP, BTC(100)));
+            env(amm::ammClawback(gw, alice, MPT(btc), XRP, btc(100)));
             BEAST_EXPECT(amm.expectBalances(
-                XRPAmount(87500001), BTC(701), IOUAmount{247'487'3734152917, -10}));
+                XRPAmount(87500001), btc(701), IOUAmount{247'487'3734152917, -10}));
 
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceXRP + XRPAmount(12'499999)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceXRP + XRPAmount(12'499999)));
         }
 
         // MPT/IOU
@@ -1387,50 +1387,50 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 1000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(1000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
             // gw creates AMM pool of BTC/USD.
-            AMM amm(env, gw, USD(100), BTC(400), ter(tesSUCCESS));
+            AMM amm(env, gw, usd(100), btc(400), Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(100), BTC(400), IOUAmount(200)));
-            amm.deposit(alice, BTC(400));
+            BEAST_EXPECT(amm.expectBalances(usd(100), btc(400), IOUAmount(200)));
+            amm.deposit(alice, btc(400));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(100), BTC(800), IOUAmount{282'842712474619, -12}));
+            BEAST_EXPECT(amm.expectBalances(usd(100), btc(800), IOUAmount{282'842712474619, -12}));
 
-            auto aliceBTC = env.balance(alice, MPT(BTC));
-            auto aliceUSD = env.balance(alice, USD);
+            auto aliceBTC = env.balance(alice, MPT(btc));
+            auto aliceUSD = env.balance(alice, usd);
 
             // gw clawback 100 BTC from alice
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(100)));
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(100)));
             BEAST_EXPECT(amm.expectBalances(
-                STAmount{USD, UINT64_C(87'50000000000003), -14},
-                BTC(701),
+                STAmount{usd, UINT64_C(87'50000000000003), -14},
+                btc(701),
                 IOUAmount{247'4873734152917, -13}));
 
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(12.5)));
-            aliceUSD = env.balance(alice, USD);
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(12.5)));
+            aliceUSD = env.balance(alice, usd);
 
             // gw clawback 30 USD from alice with tfClawTwoAssets, which exceeds
             // her balance
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(30)), txflags(tfClawTwoAssets));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(30)), Txflags(tfClawTwoAssets));
             BEAST_EXPECT(amm.expectBalances(
-                STAmount{USD, UINT64_C(70'71067811865476), -14}, BTC(567), IOUAmount(200)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
+                STAmount{usd, UINT64_C(70'71067811865476), -14}, btc(567), IOUAmount(200)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount(200)));
         }
@@ -1443,45 +1443,45 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env.fund(XRP(1000000000), gw, alice);
             env.close();
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
             // gw creates AMM pool of BTC/USD.
-            AMM amm(env, gw, USD(100), BTC(400), ter(tesSUCCESS));
+            AMM amm(env, gw, usd(100), btc(400), Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(100), BTC(400), IOUAmount(200)));
-            amm.deposit(alice, BTC(400));
+            BEAST_EXPECT(amm.expectBalances(usd(100), btc(400), IOUAmount(200)));
+            amm.deposit(alice, btc(400));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(100), BTC(800), IOUAmount{282'842712474619, -12}));
+            BEAST_EXPECT(amm.expectBalances(usd(100), btc(800), IOUAmount{282'842712474619, -12}));
 
-            auto aliceBTC = env.balance(alice, MPT(BTC));
-            auto aliceUSD = env.balance(alice, USD);
+            auto aliceBTC = env.balance(alice, MPT(btc));
+            auto aliceUSD = env.balance(alice, usd);
 
             // gw clawback 100 BTC from alice
-            env(amm::ammClawback(gw, alice, MPT(BTC), USD, BTC(100)));
-            BEAST_EXPECT(amm.expectBalances(USD(88), BTC(701), IOUAmount{247'4873734152917, -13}));
+            env(amm::ammClawback(gw, alice, MPT(btc), usd, btc(100)));
+            BEAST_EXPECT(amm.expectBalances(usd(88), btc(701), IOUAmount{247'4873734152917, -13}));
 
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD + USD(12)));
-            aliceUSD = env.balance(alice, USD);
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD + usd(12)));
+            aliceUSD = env.balance(alice, usd);
 
             // gw clawback 30 USD from alice with tfClawTwoAssets, which exceeds
             // her balance
-            env(amm::ammClawback(gw, alice, USD, MPT(BTC), USD(30)), txflags(tfClawTwoAssets));
-            BEAST_EXPECT(amm.expectBalances(USD(72), BTC(567), IOUAmount(200)));
-            env.require(balance(alice, aliceBTC));
-            env.require(balance(alice, aliceUSD));
+            env(amm::ammClawback(gw, alice, usd, MPT(btc), usd(30)), Txflags(tfClawTwoAssets));
+            BEAST_EXPECT(amm.expectBalances(usd(72), btc(567), IOUAmount(200)));
+            env.require(Balance(alice, aliceBTC));
+            env.require(Balance(alice, aliceUSD));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount(200)));
         }
@@ -1505,21 +1505,21 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(50000)));
-            env.trust(USD(100000), bob);
-            env(pay(gw, bob, USD(40000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(50000)));
+            env.trust(usd(100000), bob);
+            env(pay(gw, bob, usd(40000)));
             env.close();
 
-            MPT const EUR = MPTTester(
+            MPT const eur = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, USD(2), EUR(1));
+            AMM amm(env, alice, usd(2), eur(1));
             amm.deposit(alice, IOUAmount{1'576123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000});
             amm.withdraw(alice, IOUAmount{1'576123487565916, -15});
@@ -1544,26 +1544,26 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
 
             if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt));
                 BEAST_EXPECT(!amm.ammExists());
             }
             else if (
                 features[fixAMMv1_3] &&
                 (features[featureSingleAssetVault] || features[featureLendingProtocol]))
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt));
                 // Without the Rounding feature and with new Number a dust pool
                 // amount remains
                 BEAST_EXPECT(amm.ammExists());
             }
             else if (!features[featureSingleAssetVault] && !features[featureLendingProtocol])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), ter(tecINTERNAL));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Ter(tecINTERNAL));
                 BEAST_EXPECT(amm.ammExists());
             }
             else
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), ter(tecAMM_BALANCE));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Ter(tecAMM_BALANCE));
                 BEAST_EXPECT(amm.ammExists());
             }
         }
@@ -1575,21 +1575,21 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env.fund(XRP(100000), gw, alice, bob);
             env.close();
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            MPT const EUR = MPTTester(
+            MPT const eur = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .pay = 40'000'000000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, USD(2), EUR(1));
+            AMM amm(env, alice, usd(2), eur(1));
             amm.deposit(alice, IOUAmount{1'576123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000});
             amm.withdraw(alice, IOUAmount{1'576123487565916, -15});
@@ -1614,7 +1614,7 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
 
             if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt));
                 BEAST_EXPECT(!amm.ammExists());
             }
             else if (
@@ -1623,17 +1623,17 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             {
                 // Without the Rounding feature and with new Number a dust pool
                 // amount remains
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt));
                 BEAST_EXPECT(amm.ammExists());
             }
             else if (!features[featureSingleAssetVault] && !features[featureLendingProtocol])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), ter(tecINTERNAL));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Ter(tecINTERNAL));
                 BEAST_EXPECT(amm.ammExists());
             }
             else if (features[featureMPTokensV2])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), ter(tecAMM_BALANCE));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Ter(tecAMM_BALANCE));
                 BEAST_EXPECT(amm.ammExists());
             }
         }
@@ -1656,27 +1656,27 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(1000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
-            MPT const BTC =
+            MPT const btc =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 40'000});
 
-            AMM const amm(env, alice, USD(200), BTC(100));
+            AMM const amm(env, alice, usd(200), btc(100));
             // Asset BTC is not clawable without tfMPTCanClawback.
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), ter(tecNO_PERMISSION));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Ter(tecNO_PERMISSION));
 
             // Although USD is clawable with asfAllowTrustLineClawback.
             // When tfClawTwoAssets is set, we will claw Asser2 as well.
             // But Asset2 is not clawable. tfMPTCanClawback was not set for BTC.
-            env(amm::ammClawback(gw, alice, USD, BTC, std::nullopt),
-                txflags(tfClawTwoAssets),
-                ter(tecNO_PERMISSION));
+            env(amm::ammClawback(gw, alice, usd, btc, std::nullopt),
+                Txflags(tfClawTwoAssets),
+                Ter(tecNO_PERMISSION));
 
             // Can only claw the other asset
-            env(amm::ammClawback(gw, alice, USD, BTC, std::nullopt));
+            env(amm::ammClawback(gw, alice, usd, btc, std::nullopt));
         }
 
         // IOU/MPT, IOU not clawable
@@ -1687,32 +1687,32 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env.fund(XRP(100000), gw, alice);
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(1000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
             // Asset USD is not clawable without asfAllowTrustLineClawback.
-            AMM const amm(env, alice, USD(200), BTC(100));
-            env(amm::ammClawback(gw, alice, USD, BTC, std::nullopt), ter(tecNO_PERMISSION));
+            AMM const amm(env, alice, usd(200), btc(100));
+            env(amm::ammClawback(gw, alice, usd, btc, std::nullopt), Ter(tecNO_PERMISSION));
 
             // Although BTC is clawable with tfMPTCanClawback.
             // When tfClawTwoAssets is set, we will claw Asset2 as well.
             // But Asset2 is not clawable. asfAllowTrustLineClawback was not set
             // by the issuer.
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt),
-                txflags(tfClawTwoAssets),
-                ter(tecNO_PERMISSION));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt),
+                Txflags(tfClawTwoAssets),
+                Ter(tecNO_PERMISSION));
 
             // Can only claw the other asset
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt));
         }
 
         // IOU/MPT both clawable
@@ -1727,23 +1727,23 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(1000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw2,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            AMM const amm(env, alice, USD(200), BTC(100));
+            AMM const amm(env, alice, usd(200), btc(100));
 
             // the account trying to claw MPT is not its issuer
             // will return temMALFORMED in preflight.
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), ter(temMALFORMED));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Ter(temMALFORMED));
         }
 
         // only issuer can claw. IOU/MPT mix
@@ -1753,25 +1753,25 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
                 Account const gw("gateway"), alice("alice"), bob("bob");
                 env.fund(XRP(30'000), alice, bob, gw);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
                      .issuer = bob,
                      .holders = {alice},
                      .limit = 1'000'000});
-                env(pay(gw, alice, USD(50000)));
-                env(pay(bob, alice, BTC(50000)));
+                env(pay(gw, alice, usd(50000)));
+                env(pay(bob, alice, btc(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10100));
+                auto ammAlice = AMM(env, alice, usd(10000), btc(10100));
                 // BTC's issuer is bob, alice can not clawback
-                env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), ter(temMALFORMED));
+                env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Ter(temMALFORMED));
             };
             testHelper2TokensMix(test);
         }
@@ -1783,29 +1783,29 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
                 Account const gw("gateway"), alice("alice"), bob("bob");
                 env.fund(XRP(30'000), alice, bob, gw);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
                      .issuer = bob,
                      .holders = {alice},
                      .limit = 1'000'000});
-                env(pay(gw, alice, USD(50000)));
-                env(pay(bob, alice, BTC(50000)));
+                env(pay(gw, alice, usd(50000)));
+                env(pay(bob, alice, btc(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10100));
+                auto ammAlice = AMM(env, alice, usd(10000), btc(10100));
                 // BTC's issuer is bob. But with tfClawTwoAssets, we will claw
                 // both. It will fail because the other asset USD's issuer is
                 // gw.
-                env(amm::ammClawback(bob, alice, BTC, USD, std::nullopt),
-                    txflags(tfClawTwoAssets),
-                    ter(temINVALID_FLAG));
+                env(amm::ammClawback(bob, alice, btc, usd, std::nullopt),
+                    Txflags(tfClawTwoAssets),
+                    Ter(temINVALID_FLAG));
             };
             testHelper2TokensMix(test);
         }
@@ -1814,7 +1814,7 @@ class AMMClawbackMPT_test : public beast::unit_test::suite
     void
     run() override
     {
-        FeatureBitset const all{jtx::testable_amendments() | fixAMMClawbackRounding};
+        FeatureBitset const all{jtx::testableAmendments() | fixAMMClawbackRounding};
 
         testInvalidRequest(all);
         testFeatureDisabled(all);
diff --git a/src/test/app/AMMClawback_test.cpp b/src/test/app/AMMClawback_test.cpp
index bf08b57bf3..9683e8ac17 100644
--- a/src/test/app/AMMClawback_test.cpp
+++ b/src/test/app/AMMClawback_test.cpp
@@ -25,7 +25,7 @@
 #include <utility>
 
 namespace xrpl::test {
-class AMMClawback_test : public beast::unit_test::suite
+class AMMClawback_test : public beast::unit_test::Suite
 {
     void
     testInvalidRequest(FeatureBitset features)
@@ -44,17 +44,17 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
-            auto const USD = gw["USD"];
-            env.trust(USD(10000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(10000), alice);
+            env(pay(gw, alice, usd(100)));
 
-            AMM const amm(env, alice, XRP(100), USD(100));
+            AMM const amm(env, alice, XRP(100), usd(100));
             env.close();
 
-            env(amm::ammClawback(gw, Account("unknown"), USD, XRP, std::nullopt),
-                ter(terNO_ACCOUNT));
+            env(amm::ammClawback(gw, Account("unknown"), usd, XRP, std::nullopt),
+                Ter(terNO_ACCOUNT));
         }
 
         // Test if asset pair provided does not exist. This should
@@ -69,24 +69,24 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(10000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(10000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
             // Withdraw all the tokens from the AMMAccount.
             // The AMMAccount will be auto deleted.
-            AMM amm(env, gw, XRP(100), USD(100));
+            AMM amm(env, gw, XRP(100), usd(100));
             amm.withdrawAll(gw);
             BEAST_EXPECT(!amm.ammExists());
             env.close();
 
             // The AMM account does not exist at all now.
             // It should return terNO_AMM error.
-            env(amm::ammClawback(gw, alice, USD, gw["EUR"], std::nullopt), ter(terNO_AMM));
+            env(amm::ammClawback(gw, alice, usd, gw["EUR"], std::nullopt), Ter(terNO_AMM));
         }
 
         // Test if the issuer field and holder field is the same. This should
@@ -101,21 +101,21 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // Issuer can not clawback from himself.
-            env(amm::ammClawback(gw, gw, USD, XRP, std::nullopt), ter(temMALFORMED));
+            env(amm::ammClawback(gw, gw, usd, XRP, std::nullopt), Ter(temMALFORMED));
 
             // Holder can not clawback from himself.
-            env(amm::ammClawback(alice, alice, USD, XRP, std::nullopt), ter(temMALFORMED));
+            env(amm::ammClawback(alice, alice, usd, XRP, std::nullopt), Ter(temMALFORMED));
         }
 
         // Test if the Asset field matches the Account field.
@@ -129,21 +129,21 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // The Asset's issuer field is alice, while the Account field is gw.
             // This should return temMALFORMED because they do not match.
             env(amm::ammClawback(
                     gw, alice, Issue{gw["USD"].currency, alice.id()}, XRP, std::nullopt),
-                ter(temMALFORMED));
+                Ter(temMALFORMED));
         }
 
         // Test if the Amount field matches the Asset field.
@@ -157,22 +157,22 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // The Asset's issuer subfield is gw account and Amount's issuer
             // subfield is alice account. Return temBAD_AMOUNT because
             // they do not match.
             env(amm::ammClawback(
-                    gw, alice, USD, XRP, STAmount{Issue{gw["USD"].currency, alice.id()}, 1}),
-                ter(temBAD_AMOUNT));
+                    gw, alice, usd, XRP, STAmount{Issue{gw["USD"].currency, alice.id()}, 1}),
+                Ter(temBAD_AMOUNT));
         }
 
         // Test if the Amount is invalid, which is less than zero.
@@ -186,25 +186,25 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // Return temBAD_AMOUNT if the Amount value is less than 0.
             env(amm::ammClawback(
-                    gw, alice, USD, XRP, STAmount{Issue{gw["USD"].currency, gw.id()}, -1}),
-                ter(temBAD_AMOUNT));
+                    gw, alice, usd, XRP, STAmount{Issue{gw["USD"].currency, gw.id()}, -1}),
+                Ter(temBAD_AMOUNT));
 
             // Return temBAD_AMOUNT if the Amount value is 0.
             env(amm::ammClawback(
-                    gw, alice, USD, XRP, STAmount{Issue{gw["USD"].currency, gw.id()}, 0}),
-                ter(temBAD_AMOUNT));
+                    gw, alice, usd, XRP, STAmount{Issue{gw["USD"].currency, gw.id()}, 0}),
+                Ter(temBAD_AMOUNT));
         }
 
         // Test if the issuer did not set asfAllowTrustLineClawback, AMMClawback
@@ -217,19 +217,19 @@ class AMMClawback_test : public beast::unit_test::suite
             env.close();
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
-            env.require(balance(alice, USD(100)));
-            env.require(balance(gw, alice["USD"](-100)));
+            env.require(Balance(alice, usd(100)));
+            env.require(Balance(gw, alice["USD"](-100)));
 
             // gw creates AMM pool of XRP/USD.
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // If asfAllowTrustLineClawback is not set, the issuer is not
             // allowed to send the AMMClawback transaction.
-            env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt), ter(tecNO_PERMISSION));
+            env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt), Ter(tecNO_PERMISSION));
         }
 
         // Test invalid flag.
@@ -243,20 +243,20 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // Return temINVALID_FLAG when providing invalid flag.
-            env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt),
-                txflags(tfTwoAssetIfEmpty),
-                ter(temINVALID_FLAG));
+            env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt),
+                Txflags(tfTwoAssetIfEmpty),
+                Ter(temINVALID_FLAG));
         }
 
         // Test if tfClawTwoAssets is set when the two assets in the AMM pool
@@ -271,24 +271,24 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 100 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(100)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(100)));
             env.close();
 
             // gw creates AMM pool of XRP/USD.
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
+            AMM const amm(env, gw, XRP(100), usd(100), Ter(tesSUCCESS));
 
             // Return temINVALID_FLAG because the issuer set tfClawTwoAssets,
             // but the issuer only issues USD in the pool. The issuer is not
             // allowed to set tfClawTwoAssets flag if he did not issue both
             // assets in the pool.
-            env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt),
-                txflags(tfClawTwoAssets),
-                ter(temINVALID_FLAG));
+            env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt),
+                Txflags(tfClawTwoAssets),
+                Ter(temINVALID_FLAG));
         }
 
         // Test clawing back XRP is being prohibited.
@@ -302,20 +302,20 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
 
             // Alice creates AMM pool of XRP/USD.
-            AMM const amm(env, alice, XRP(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, XRP(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
             // Clawback XRP is prohibited.
-            env(amm::ammClawback(gw, alice, XRP, USD, std::nullopt), ter(temMALFORMED));
+            env(amm::ammClawback(gw, alice, XRP, usd, std::nullopt), Ter(temMALFORMED));
         }
     }
 
@@ -335,18 +335,18 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
 
             // When featureAMMClawback is not enabled, AMMClawback is disabled.
             // Because when featureAMMClawback is disabled, we can not create
             // amm account, call amm::ammClawback directly for testing purpose.
-            env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt), ter(temDISABLED));
+            env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt), Ter(temDISABLED));
         }
     }
 
@@ -369,68 +369,68 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
-            env.require(balance(gw, alice["USD"](-3000)));
-            env.require(balance(alice, USD(3000)));
+            env.require(Balance(gw, alice["USD"](-3000)));
+            env.require(Balance(alice, usd(3000)));
 
             // gw2 issues 3000 EUR to Alice.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(3000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(3000)));
             env.close();
-            env.require(balance(gw2, alice["EUR"](-3000)));
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(gw2, alice["EUR"](-3000)));
+            env.require(Balance(alice, eur(3000)));
 
             // Alice creates AMM pool of EUR/USD.
-            AMM const amm(env, alice, EUR(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, eur(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
             BEAST_EXPECT(
-                amm.expectBalances(USD(2000), EUR(1000), IOUAmount{1414213562373095, -12}));
+                amm.expectBalances(usd(2000), eur(1000), IOUAmount{1414213562373095, -12}));
 
             // gw clawback 1000 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice's initial balance for USD is 3000 USD. Alice deposited 2000
             // USD into the pool, then she has 1000 USD. And 1000 USD was clawed
             // back from the AMM pool, so she still has 1000 USD.
-            env.require(balance(gw, alice["USD"](-1000)));
-            env.require(balance(alice, USD(1000)));
+            env.require(Balance(gw, alice["USD"](-1000)));
+            env.require(Balance(alice, usd(1000)));
 
             // Alice's initial balance for EUR is 3000 EUR. Alice deposited 1000
             // EUR into the pool, 500 EUR was withdrawn proportionally. So she
             // has 2500 EUR now.
-            env.require(balance(gw2, alice["EUR"](-2500)));
-            env.require(balance(alice, EUR(2500)));
+            env.require(Balance(gw2, alice["EUR"](-2500)));
+            env.require(Balance(alice, eur(2500)));
 
             // 1000 USD and 500 EUR was withdrawn from the AMM pool, so the
             // current balance is 1000 USD and 500 EUR.
-            BEAST_EXPECT(amm.expectBalances(USD(1000), EUR(500), IOUAmount{7071067811865475, -13}));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), eur(500), IOUAmount{7071067811865475, -13}));
 
             // Alice has half of its initial lptokens Left.
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{7071067811865475, -13}));
 
             // gw clawback another 1000 USD from the AMM pool. The AMM pool will
             // be empty and get deleted.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice should still has 1000 USD because gw clawed back from the
             // AMM pool.
-            env.require(balance(gw, alice["USD"](-1000)));
-            env.require(balance(alice, USD(1000)));
+            env.require(Balance(gw, alice["USD"](-1000)));
+            env.require(Balance(alice, usd(1000)));
 
             // Alice should has 3000 EUR now because another 500 EUR was
             // withdrawn.
-            env.require(balance(gw2, alice["EUR"](-3000)));
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(gw2, alice["EUR"](-3000)));
+            env.require(Balance(alice, eur(3000)));
 
             // amm is automatically deleted.
             BEAST_EXPECT(!amm.ammExists());
@@ -448,33 +448,33 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
-            env.require(balance(gw, alice["USD"](-3000)));
-            env.require(balance(alice, USD(3000)));
+            env.require(Balance(gw, alice["USD"](-3000)));
+            env.require(Balance(alice, usd(3000)));
 
             // Alice creates AMM pool of XRP/USD.
-            AMM const amm(env, alice, XRP(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, XRP(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(USD(2000), XRP(1000), IOUAmount{1414213562373095, -9}));
+            BEAST_EXPECT(amm.expectBalances(usd(2000), XRP(1000), IOUAmount{1414213562373095, -9}));
 
             auto aliceXrpBalance = env.balance(alice, XRP);
 
             // gw clawback 1000 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, XRP, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, XRP, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice's initial balance for USD is 3000 USD. Alice deposited 2000
             // USD into the pool, then she has 1000 USD. And 1000 USD was clawed
             // back from the AMM pool, so she still has 1000 USD.
-            env.require(balance(gw, alice["USD"](-1000)));
-            env.require(balance(alice, USD(1000)));
+            env.require(Balance(gw, alice["USD"](-1000)));
+            env.require(Balance(alice, usd(1000)));
 
             // Alice will get 500 XRP back.
             BEAST_EXPECT(expectLedgerEntryRoot(env, alice, aliceXrpBalance + XRP(500)));
@@ -482,20 +482,20 @@ class AMMClawback_test : public beast::unit_test::suite
 
             // 1000 USD and 500 XRP was withdrawn from the AMM pool, so the
             // current balance is 1000 USD and 500 XRP.
-            BEAST_EXPECT(amm.expectBalances(USD(1000), XRP(500), IOUAmount{7071067811865475, -10}));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), XRP(500), IOUAmount{7071067811865475, -10}));
 
             // Alice has half of its initial lptokens Left.
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{7071067811865475, -10}));
 
             // gw clawback another 1000 USD from the AMM pool. The AMM pool will
             // be empty and get deleted.
-            env(amm::ammClawback(gw, alice, USD, XRP, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, XRP, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice should still has 1000 USD because gw clawed back from the
             // AMM pool.
-            env.require(balance(gw, alice["USD"](-1000)));
-            env.require(balance(alice, USD(1000)));
+            env.require(Balance(gw, alice["USD"](-1000)));
+            env.require(Balance(alice, usd(1000)));
 
             // Alice will get another 500 XRP back.
             BEAST_EXPECT(expectLedgerEntryRoot(env, alice, aliceXrpBalance + XRP(500)));
@@ -528,62 +528,62 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 6000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(6000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(6000)));
             env.close();
-            env.require(balance(alice, USD(6000)));
+            env.require(Balance(alice, usd(6000)));
 
             // gw2 issues 6000 EUR to Alice.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(6000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(6000)));
             env.close();
-            env.require(balance(alice, EUR(6000)));
+            env.require(Balance(alice, eur(6000)));
 
             // Alice creates AMM pool of EUR/USD
-            AMM const amm(env, alice, EUR(5000), USD(4000), ter(tesSUCCESS));
+            AMM const amm(env, alice, eur(5000), usd(4000), Ter(tesSUCCESS));
             env.close();
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(4000), EUR(5000), IOUAmount{4472135954999580, -12}));
+                    amm.expectBalances(usd(4000), eur(5000), IOUAmount{4472135954999580, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(4000), EUR(5000), IOUAmount{4472135954999579, -12}));
+                    amm.expectBalances(usd(4000), eur(5000), IOUAmount{4472135954999579, -12}));
             }
 
             // gw clawback 1000 USD from the AMM pool
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice's initial balance for USD is 6000 USD. Alice deposited 4000
             // USD into the pool, then she has 2000 USD. And 1000 USD was clawed
             // back from the AMM pool, so she still has 2000 USD.
-            env.require(balance(alice, USD(2000)));
+            env.require(Balance(alice, usd(2000)));
 
             // Alice's initial balance for EUR is 6000 EUR. Alice deposited 5000
             // EUR into the pool, 1250 EUR was withdrawn proportionally. So she
             // has 2500 EUR now.
-            env.require(balance(alice, EUR(2250)));
+            env.require(Balance(alice, eur(2250)));
 
             // 1000 USD and 1250 EUR was withdrawn from the AMM pool, so the
             // current balance is 3000 USD and 3750 EUR.
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(3000), EUR(3750), IOUAmount{3354101966249685, -12}));
+                    amm.expectBalances(usd(3000), eur(3750), IOUAmount{3354101966249685, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(3000), EUR(3750), IOUAmount{3354101966249684, -12}));
+                    amm.expectBalances(usd(3000), eur(3750), IOUAmount{3354101966249684, -12}));
             }
 
             // Alice has 3/4 of its initial lptokens Left.
@@ -597,87 +597,87 @@ class AMMClawback_test : public beast::unit_test::suite
             }
 
             // gw clawback another 500 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(500)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(500)), Ter(tesSUCCESS));
             env.close();
 
             // Alice should still has 2000 USD because gw clawed back from the
             // AMM pool.
-            env.require(balance(alice, USD(2000)));
+            env.require(Balance(alice, usd(2000)));
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(2500000000000001), -12},
-                    STAmount{EUR, UINT64_C(3125000000000001), -12},
+                    STAmount{usd, UINT64_C(2500000000000001), -12},
+                    STAmount{eur, UINT64_C(3125000000000001), -12},
                     IOUAmount{2795084971874738, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(2500), EUR(3125), IOUAmount{2795084971874737, -12}));
+                    amm.expectBalances(usd(2500), eur(3125), IOUAmount{2795084971874737, -12}));
             }
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    env.balance(alice, EUR) == STAmount(EUR, UINT64_C(2874999999999999), -12));
+                    env.balance(alice, eur) == STAmount(eur, UINT64_C(2874999999999999), -12));
             }
             else
             {
-                BEAST_EXPECT(env.balance(alice, EUR) == EUR(2875));
+                BEAST_EXPECT(env.balance(alice, eur) == eur(2875));
             }
 
             // gw clawback small amount, 1 USD.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1)), Ter(tesSUCCESS));
             env.close();
 
             // Another 1 USD / 1.25 EUR was withdrawn.
-            env.require(balance(alice, USD(2000)));
+            env.require(Balance(alice, usd(2000)));
 
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(2499000000000002), -12},
-                    STAmount{EUR, UINT64_C(3123750000000002), -12},
+                    STAmount{usd, UINT64_C(2499000000000002), -12},
+                    STAmount{eur, UINT64_C(3123750000000002), -12},
                     IOUAmount{2793966937885989, -12}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(2499), EUR(3123.75), IOUAmount{2793966937885987, -12}));
+                    amm.expectBalances(usd(2499), eur(3123.75), IOUAmount{2793966937885987, -12}));
             }
             else if (features[fixAMMClawbackRounding] && features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(2499000000000001), -12},
-                    STAmount{EUR, UINT64_C(3123750000000001), -12},
+                    STAmount{usd, UINT64_C(2499000000000001), -12},
+                    STAmount{eur, UINT64_C(3123750000000001), -12},
                     IOUAmount{2793966937885988, -12}));
             }
 
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    env.balance(alice, EUR) == STAmount(EUR, UINT64_C(2876'249999999998), -12));
+                    env.balance(alice, eur) == STAmount(eur, UINT64_C(2876'249999999998), -12));
             }
             else if (!features[fixAMMClawbackRounding])
             {
-                BEAST_EXPECT(env.balance(alice, EUR) == EUR(2876.25));
+                BEAST_EXPECT(env.balance(alice, eur) == eur(2876.25));
             }
             else if (features[fixAMMClawbackRounding] && features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    env.balance(alice, EUR) == STAmount(EUR, UINT64_C(2876'249999999999), -12));
+                    env.balance(alice, eur) == STAmount(eur, UINT64_C(2876'249999999999), -12));
             }
 
             // gw clawback 4000 USD, exceeding the current balance. We
             // will clawback all.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(4000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(4000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(2000)));
+            env.require(Balance(alice, usd(2000)));
 
             // All alice's EUR in the pool goes back to alice.
-            BEAST_EXPECT(env.balance(alice, EUR) == STAmount(EUR, UINT64_C(6000000000000000), -12));
+            BEAST_EXPECT(env.balance(alice, eur) == STAmount(eur, UINT64_C(6000000000000000), -12));
 
             // amm is automatically deleted.
             BEAST_EXPECT(!amm.ammExists());
@@ -700,73 +700,73 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw2 sets asfAllowTrustLineClawback.
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw2, asfAllowTrustLineClawback));
+            env.require(Flags(gw2, asfAllowTrustLineClawback));
 
             // gw issues 6000 USD to Alice and 5000 USD to Bob.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(6000)));
-            env.trust(USD(100000), bob);
-            env(pay(gw, bob, USD(5000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(6000)));
+            env.trust(usd(100000), bob);
+            env(pay(gw, bob, usd(5000)));
             env.close();
 
             // gw2 issues 5000 EUR to Alice and 4000 EUR to Bob.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(5000)));
-            env.trust(EUR(100000), bob);
-            env(pay(gw2, bob, EUR(4000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(5000)));
+            env.trust(eur(100000), bob);
+            env(pay(gw2, bob, eur(4000)));
             env.close();
 
             // gw creates AMM pool of XRP/USD, alice and bob deposit XRP/USD.
-            AMM amm(env, gw, XRP(2000), USD(1000), ter(tesSUCCESS));
-            BEAST_EXPECT(amm.expectBalances(USD(1000), XRP(2000), IOUAmount{1414213562373095, -9}));
-            amm.deposit(alice, USD(1000), XRP(2000));
-            BEAST_EXPECT(amm.expectBalances(USD(2000), XRP(4000), IOUAmount{2828427124746190, -9}));
-            amm.deposit(bob, USD(1000), XRP(2000));
-            BEAST_EXPECT(amm.expectBalances(USD(3000), XRP(6000), IOUAmount{4242640687119285, -9}));
+            AMM amm(env, gw, XRP(2000), usd(1000), Ter(tesSUCCESS));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), XRP(2000), IOUAmount{1414213562373095, -9}));
+            amm.deposit(alice, usd(1000), XRP(2000));
+            BEAST_EXPECT(amm.expectBalances(usd(2000), XRP(4000), IOUAmount{2828427124746190, -9}));
+            amm.deposit(bob, usd(1000), XRP(2000));
+            BEAST_EXPECT(amm.expectBalances(usd(3000), XRP(6000), IOUAmount{4242640687119285, -9}));
             env.close();
 
             // gw2 creates AMM pool of XRP/EUR, alice and bob deposit XRP/EUR.
-            AMM amm2(env, gw2, XRP(3000), EUR(1000), ter(tesSUCCESS));
+            AMM amm2(env, gw2, XRP(3000), eur(1000), Ter(tesSUCCESS));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(1000), XRP(3000), IOUAmount{1732050807568878, -9}));
+                    amm2.expectBalances(eur(1000), XRP(3000), IOUAmount{1732050807568878, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(1000), XRP(3000), IOUAmount{1732050807568877, -9}));
+                    amm2.expectBalances(eur(1000), XRP(3000), IOUAmount{1732050807568877, -9}));
             }
 
-            amm2.deposit(alice, EUR(1000), XRP(3000));
+            amm2.deposit(alice, eur(1000), XRP(3000));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2000), XRP(6000), IOUAmount{3464101615137756, -9}));
+                    amm2.expectBalances(eur(2000), XRP(6000), IOUAmount{3464101615137756, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2000), XRP(6000), IOUAmount{3464101615137754, -9}));
+                    amm2.expectBalances(eur(2000), XRP(6000), IOUAmount{3464101615137754, -9}));
             }
 
-            amm2.deposit(bob, EUR(1000), XRP(3000));
+            amm2.deposit(bob, eur(1000), XRP(3000));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(3000), XRP(9000), IOUAmount{5196152422706634, -9}));
+                    amm2.expectBalances(eur(3000), XRP(9000), IOUAmount{5196152422706634, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(3000), XRP(9000), IOUAmount{5196152422706631, -9}));
+                    amm2.expectBalances(eur(3000), XRP(9000), IOUAmount{5196152422706631, -9}));
             }
             env.close();
 
@@ -774,16 +774,16 @@ class AMMClawback_test : public beast::unit_test::suite
             auto bobXrpBalance = env.balance(bob, XRP);
 
             // gw clawback 500 USD from alice in amm
-            env(amm::ammClawback(gw, alice, USD, XRP, USD(500)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, XRP, usd(500)), Ter(tesSUCCESS));
             env.close();
 
             // Alice's initial balance for USD is 6000 USD. Alice deposited 1000
             // USD into the pool, then she has 5000 USD. And 500 USD was clawed
             // back from the AMM pool, so she still has 5000 USD.
-            env.require(balance(alice, USD(5000)));
+            env.require(Balance(alice, usd(5000)));
 
             // Bob's balance is not changed.
-            env.require(balance(bob, USD(4000)));
+            env.require(Balance(bob, usd(4000)));
 
             // Alice gets 1000 XRP back.
             if (features[fixAMMClawbackRounding] && features[fixAMMv1_3])
@@ -800,17 +800,17 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(2500), XRP(5000), IOUAmount{3535533905932738, -9}));
+                    amm.expectBalances(usd(2500), XRP(5000), IOUAmount{3535533905932738, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(2500), XRP(5000), IOUAmount{3535533905932737, -9}));
+                    amm.expectBalances(usd(2500), XRP(5000), IOUAmount{3535533905932737, -9}));
             }
             else if (features[fixAMMClawbackRounding] && features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    USD(2500), XRPAmount(5000000001), IOUAmount{3'535'533'905932738, -9}));
+                    usd(2500), XRPAmount(5000000001), IOUAmount{3'535'533'905932738, -9}));
             }
 
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
@@ -829,11 +829,11 @@ class AMMClawback_test : public beast::unit_test::suite
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount{1414213562373095, -9}));
 
             // gw clawback 10 USD from bob in amm.
-            env(amm::ammClawback(gw, bob, USD, XRP, USD(10)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, bob, usd, XRP, usd(10)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(5000)));
-            env.require(balance(bob, USD(4000)));
+            env.require(Balance(alice, usd(5000)));
+            env.require(Balance(bob, usd(4000)));
 
             // Bob gets 20 XRP back.
             BEAST_EXPECT(expectLedgerEntryRoot(env, bob, bobXrpBalance + XRP(20)));
@@ -842,19 +842,19 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(2490000000000001), -12},
+                    STAmount{usd, UINT64_C(2490000000000001), -12},
                     XRP(4980),
                     IOUAmount{3521391770309008, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(2'490), XRP(4980), IOUAmount{3521391770309006, -9}));
+                    amm.expectBalances(usd(2'490), XRP(4980), IOUAmount{3521391770309006, -9}));
             }
             else if (features[fixAMMClawbackRounding] && features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(2490000000000001), -12},
+                    STAmount{usd, UINT64_C(2490000000000001), -12},
                     XRPAmount(4980000001),
                     IOUAmount{3521391'770309008, -9}));
             }
@@ -886,11 +886,11 @@ class AMMClawback_test : public beast::unit_test::suite
             }
 
             // gw2 clawback 200 EUR from amm2.
-            env(amm::ammClawback(gw2, alice, EUR, XRP, EUR(200)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, alice, eur, XRP, eur(200)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, EUR(4000)));
-            env.require(balance(bob, EUR(3000)));
+            env.require(Balance(alice, eur(4000)));
+            env.require(Balance(bob, eur(3000)));
 
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
@@ -910,17 +910,17 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2800), XRP(8400), IOUAmount{4849742261192859, -9}));
+                    amm2.expectBalances(eur(2800), XRP(8400), IOUAmount{4849742261192859, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2800), XRP(8400), IOUAmount{4849742261192856, -9}));
+                    amm2.expectBalances(eur(2800), XRP(8400), IOUAmount{4849742261192856, -9}));
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm2.expectBalances(
-                    EUR(2800), XRPAmount(8400000001), IOUAmount{4849742261192856, -9}));
+                    eur(2800), XRPAmount(8400000001), IOUAmount{4849742261192856, -9}));
             }
 
             if (!features[fixAMMv1_3])
@@ -943,11 +943,11 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw claw back 1000 USD from alice in amm, which exceeds alice's
             // balance. This will clawback all the remaining LP tokens of alice
             // (corresponding 500 USD / 1000 XRP).
-            env(amm::ammClawback(gw, alice, USD, XRP, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, XRP, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(5000)));
-            env.require(balance(bob, USD(4000)));
+            env.require(Balance(alice, usd(5000)));
+            env.require(Balance(bob, usd(4000)));
 
             // Alice gets 1000 XRP back.
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
@@ -982,19 +982,19 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(1990000000000001), -12},
+                    STAmount{usd, UINT64_C(1990000000000001), -12},
                     XRP(3980),
                     IOUAmount{2814284989122460, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    USD(1'990), XRPAmount{3'980'000'001}, IOUAmount{2814284989122459, -9}));
+                    usd(1'990), XRPAmount{3'980'000'001}, IOUAmount{2814284989122459, -9}));
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(1990000000000001), -12},
+                    STAmount{usd, UINT64_C(1990000000000001), -12},
                     XRPAmount{3'980'000'001},
                     IOUAmount{2814284989122460, -9}));
             }
@@ -1002,11 +1002,11 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw clawback 1000 USD from bob in amm, which also exceeds bob's
             // balance in amm. All bob's lptoken in amm will be consumed, which
             // corresponds to 990 USD / 1980 XRP
-            env(amm::ammClawback(gw, bob, USD, XRP, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, bob, usd, XRP, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(5000)));
-            env.require(balance(bob, USD(4000)));
+            env.require(Balance(alice, usd(5000)));
+            env.require(Balance(bob, usd(4000)));
 
             BEAST_EXPECT(expectLedgerEntryRoot(env, alice, aliceXrpBalance));
 
@@ -1020,11 +1020,11 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw2 claw back 1000 EUR from alice in amm2, which exceeds alice's
             // balance. All alice's lptokens will be consumed, which corresponds
             // to 800EUR / 2400 XRP.
-            env(amm::ammClawback(gw2, alice, EUR, XRP, EUR(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, alice, eur, XRP, eur(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, EUR(4000)));
-            env.require(balance(bob, EUR(3000)));
+            env.require(Balance(alice, eur(4000)));
+            env.require(Balance(bob, eur(3000)));
 
             // Alice gets another 2400 XRP back, bob's XRP balance remains the
             // same.
@@ -1039,27 +1039,27 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2000), XRP(6000), IOUAmount{3464101615137756, -9}));
+                    amm2.expectBalances(eur(2000), XRP(6000), IOUAmount{3464101615137756, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(2000), XRP(6000), IOUAmount{3464101615137754, -9}));
+                    amm2.expectBalances(eur(2000), XRP(6000), IOUAmount{3464101615137754, -9}));
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm2.expectBalances(
-                    EUR(2000), XRPAmount(6000000001), IOUAmount{3464101615137754, -9}));
+                    eur(2000), XRPAmount(6000000001), IOUAmount{3464101615137754, -9}));
             }
 
             // gw2 claw back 2000 EUR from bob in amm2, which exceeds bob's
             // balance. All bob's lptokens will be consumed, which corresponds
             // to 1000EUR / 3000 XRP.
-            env(amm::ammClawback(gw2, bob, EUR, XRP, EUR(2000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, bob, eur, XRP, eur(2000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, EUR(4000)));
-            env.require(balance(bob, EUR(3000)));
+            env.require(Balance(alice, eur(4000)));
+            env.require(Balance(bob, eur(3000)));
 
             // Bob gets another 3000 XRP back. Alice's XRP balance remains the
             // same.
@@ -1075,17 +1075,17 @@ class AMMClawback_test : public beast::unit_test::suite
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(1000), XRP(3000), IOUAmount{1732050807568878, -9}));
+                    amm2.expectBalances(eur(1000), XRP(3000), IOUAmount{1732050807568878, -9}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(
-                    amm2.expectBalances(EUR(1000), XRP(3000), IOUAmount{1732050807568877, -9}));
+                    amm2.expectBalances(eur(1000), XRP(3000), IOUAmount{1732050807568877, -9}));
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm2.expectBalances(
-                    EUR(1000), XRPAmount(3000000001), IOUAmount{1732050807568877, -9}));
+                    eur(1000), XRPAmount(3000000001), IOUAmount{1732050807568877, -9}));
             }
         }
     }
@@ -1111,70 +1111,70 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw2 sets asfAllowTrustLineClawback.
             env(fset(gw2, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw2, asfAllowTrustLineClawback));
+            env.require(Flags(gw2, asfAllowTrustLineClawback));
 
             // gw issues 6000 USD to Alice, 5000 USD to Bob, and 4000 USD
             // to Carol.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(6000)));
-            env.trust(USD(100000), bob);
-            env(pay(gw, bob, USD(5000)));
-            env.trust(USD(100000), carol);
-            env(pay(gw, carol, USD(4000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(6000)));
+            env.trust(usd(100000), bob);
+            env(pay(gw, bob, usd(5000)));
+            env.trust(usd(100000), carol);
+            env(pay(gw, carol, usd(4000)));
             env.close();
 
             // gw2 issues 6000 EUR to Alice and 5000 EUR to Bob and 4000
             // EUR to Carol.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(6000)));
-            env.trust(EUR(100000), bob);
-            env(pay(gw2, bob, EUR(5000)));
-            env.trust(EUR(100000), carol);
-            env(pay(gw2, carol, EUR(4000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(6000)));
+            env.trust(eur(100000), bob);
+            env(pay(gw2, bob, eur(5000)));
+            env.trust(eur(100000), carol);
+            env(pay(gw2, carol, eur(4000)));
             env.close();
 
             // Alice creates AMM pool of EUR/USD
-            AMM amm(env, alice, EUR(5000), USD(4000), ter(tesSUCCESS));
+            AMM amm(env, alice, eur(5000), usd(4000), Ter(tesSUCCESS));
             env.close();
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(4000), EUR(5000), IOUAmount{4472135954999580, -12}));
+                    amm.expectBalances(usd(4000), eur(5000), IOUAmount{4472135954999580, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(4000), EUR(5000), IOUAmount{4472135954999579, -12}));
+                    amm.expectBalances(usd(4000), eur(5000), IOUAmount{4472135954999579, -12}));
             }
-            amm.deposit(bob, USD(2000), EUR(2500));
+            amm.deposit(bob, usd(2000), eur(2500));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(6000), EUR(7500), IOUAmount{6708203932499370, -12}));
+                    amm.expectBalances(usd(6000), eur(7500), IOUAmount{6708203932499370, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(6000), EUR(7500), IOUAmount{6708203932499368, -12}));
+                    amm.expectBalances(usd(6000), eur(7500), IOUAmount{6708203932499368, -12}));
             }
-            amm.deposit(carol, USD(1000), EUR(1250));
+            amm.deposit(carol, usd(1000), eur(1250));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(7000), EUR(8750), IOUAmount{7826237921249265, -12}));
+                    amm.expectBalances(usd(7000), eur(8750), IOUAmount{7826237921249265, -12}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(7000), EUR(8750), IOUAmount{7826237921249262, -12}));
+                    amm.expectBalances(usd(7000), eur(8750), IOUAmount{7826237921249262, -12}));
             }
 
             if (!features[fixAMMv1_3])
@@ -1202,29 +1202,29 @@ class AMMClawback_test : public beast::unit_test::suite
                 BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount{1118033988749894, -12}));
             }
 
-            env.require(balance(alice, USD(2000)));
-            env.require(balance(alice, EUR(1000)));
-            env.require(balance(bob, USD(3000)));
-            env.require(balance(bob, EUR(2500)));
-            env.require(balance(carol, USD(3000)));
-            env.require(balance(carol, EUR(2750)));
+            env.require(Balance(alice, usd(2000)));
+            env.require(Balance(alice, eur(1000)));
+            env.require(Balance(bob, usd(3000)));
+            env.require(Balance(bob, eur(2500)));
+            env.require(Balance(carol, usd(3000)));
+            env.require(Balance(carol, eur(2750)));
 
             // gw clawback all the bob's USD in amm. (2000 USD / 2500 EUR)
-            env(amm::ammClawback(gw, bob, USD, EUR, std::nullopt), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, bob, usd, eur, std::nullopt), Ter(tesSUCCESS));
             env.close();
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(4999999999999999), -12},
-                    STAmount{EUR, UINT64_C(6249999999999999), -12},
+                    STAmount{usd, UINT64_C(4999999999999999), -12},
+                    STAmount{eur, UINT64_C(6249999999999999), -12},
                     IOUAmount{5590169943749475, -12}));
             }
             else
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(5000000000000001), -12},
-                    STAmount{EUR, UINT64_C(6250000000000001), -12},
+                    STAmount{usd, UINT64_C(5000000000000001), -12},
+                    STAmount{eur, UINT64_C(6250000000000001), -12},
                     IOUAmount{5590169943749473, -12}));
             }
 
@@ -1247,38 +1247,38 @@ class AMMClawback_test : public beast::unit_test::suite
             }
 
             // Bob will get 2500 EUR back.
-            env.require(balance(alice, USD(2000)));
-            env.require(balance(alice, EUR(1000)));
-            BEAST_EXPECT(env.balance(bob, USD) == STAmount(USD, UINT64_C(3000000000000000), -12));
+            env.require(Balance(alice, usd(2000)));
+            env.require(Balance(alice, eur(1000)));
+            BEAST_EXPECT(env.balance(bob, usd) == STAmount(usd, UINT64_C(3000000000000000), -12));
 
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    env.balance(bob, EUR) == STAmount(EUR, UINT64_C(5000000000000001), -12));
+                    env.balance(bob, eur) == STAmount(eur, UINT64_C(5000000000000001), -12));
             }
             else
             {
                 BEAST_EXPECT(
-                    env.balance(bob, EUR) == STAmount(EUR, UINT64_C(4999999999999999), -12));
+                    env.balance(bob, eur) == STAmount(eur, UINT64_C(4999999999999999), -12));
             }
-            env.require(balance(carol, USD(3000)));
-            env.require(balance(carol, EUR(2750)));
+            env.require(Balance(carol, usd(3000)));
+            env.require(Balance(carol, eur(2750)));
 
             // gw2 clawback all carol's EUR in amm. (1000 USD / 1250 EUR)
-            env(amm::ammClawback(gw2, carol, EUR, USD, std::nullopt), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, carol, eur, usd, std::nullopt), Ter(tesSUCCESS));
             env.close();
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(3999999999999999), -12},
-                    STAmount{EUR, UINT64_C(4999999999999999), -12},
+                    STAmount{usd, UINT64_C(3999999999999999), -12},
+                    STAmount{eur, UINT64_C(4999999999999999), -12},
                     IOUAmount{4472135954999580, -12}));
             }
             else
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount{USD, UINT64_C(4000000000000001), -12},
-                    STAmount{EUR, UINT64_C(5000000000000002), -12},
+                    STAmount{usd, UINT64_C(4000000000000001), -12},
+                    STAmount{eur, UINT64_C(5000000000000002), -12},
                     IOUAmount{4472135954999579, -12}));
             }
 
@@ -1294,11 +1294,11 @@ class AMMClawback_test : public beast::unit_test::suite
             BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(0)));
 
             // gw2 clawback all alice's EUR in amm. (4000 USD / 5000 EUR)
-            env(amm::ammClawback(gw2, alice, EUR, USD, std::nullopt), ter(tesSUCCESS));
+            env(amm::ammClawback(gw2, alice, eur, usd, std::nullopt), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(carol, EUR(2750)));
-            env.require(balance(carol, USD(4000)));
+            env.require(Balance(carol, eur(2750)));
+            env.require(Balance(carol, usd(4000)));
             BEAST_EXPECT(!amm.ammExists());
         }
 
@@ -1315,49 +1315,49 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 600000 USD to Alice and 500000 USD to Bob.
-            auto const USD = gw["USD"];
-            env.trust(USD(1000000), alice);
-            env(pay(gw, alice, USD(600000)));
-            env.trust(USD(1000000), bob);
-            env(pay(gw, bob, USD(500000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(1000000), alice);
+            env(pay(gw, alice, usd(600000)));
+            env.trust(usd(1000000), bob);
+            env(pay(gw, bob, usd(500000)));
             env.close();
 
             // gw creates AMM pool of XRP/USD, alice and bob deposit XRP/USD.
-            AMM amm(env, gw, XRP(2000), USD(10000), ter(tesSUCCESS));
+            AMM amm(env, gw, XRP(2000), usd(10000), Ter(tesSUCCESS));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(10000), XRP(2000), IOUAmount{4472135954999580, -9}));
+                    amm.expectBalances(usd(10000), XRP(2000), IOUAmount{4472135954999580, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(10000), XRP(2000), IOUAmount{4472135954999579, -9}));
+                    amm.expectBalances(usd(10000), XRP(2000), IOUAmount{4472135954999579, -9}));
             }
-            amm.deposit(alice, USD(1000), XRP(200));
+            amm.deposit(alice, usd(1000), XRP(200));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(11000), XRP(2200), IOUAmount{4919349550499538, -9}));
+                    amm.expectBalances(usd(11000), XRP(2200), IOUAmount{4919349550499538, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(11000), XRP(2200), IOUAmount{4919349550499536, -9}));
+                    amm.expectBalances(usd(11000), XRP(2200), IOUAmount{4919349550499536, -9}));
             }
-            amm.deposit(bob, USD(2000), XRP(400));
+            amm.deposit(bob, usd(2000), XRP(400));
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(13000), XRP(2600), IOUAmount{5813776741499453, -9}));
+                    amm.expectBalances(usd(13000), XRP(2600), IOUAmount{5813776741499453, -9}));
             }
             else
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(13000), XRP(2600), IOUAmount{5813776741499451, -9}));
+                    amm.expectBalances(usd(13000), XRP(2600), IOUAmount{5813776741499451, -9}));
             }
             env.close();
 
@@ -1365,17 +1365,17 @@ class AMMClawback_test : public beast::unit_test::suite
             auto bobXrpBalance = env.balance(bob, XRP);
 
             // gw clawback all alice's USD in amm. (1000 USD / 200 XRP)
-            env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt), Ter(tesSUCCESS));
             env.close();
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(12000), XRP(2400), IOUAmount{5366563145999495, -9}));
+                    amm.expectBalances(usd(12000), XRP(2400), IOUAmount{5366563145999495, -9}));
             }
             else
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    USD(12000), XRPAmount(2400000001), IOUAmount{5366563145999494, -9}));
+                    usd(12000), XRPAmount(2400000001), IOUAmount{5366563145999494, -9}));
             }
             if (!features[fixAMMv1_3])
             {
@@ -1389,17 +1389,17 @@ class AMMClawback_test : public beast::unit_test::suite
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
 
             // gw clawback all bob's USD in amm. (2000 USD / 400 XRP)
-            env(amm::ammClawback(gw, bob, USD, XRP, std::nullopt), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, bob, usd, XRP, std::nullopt), Ter(tesSUCCESS));
             env.close();
             if (!features[fixAMMv1_3])
             {
                 BEAST_EXPECT(
-                    amm.expectBalances(USD(10000), XRP(2000), IOUAmount{4472135954999580, -9}));
+                    amm.expectBalances(usd(10000), XRP(2000), IOUAmount{4472135954999580, -9}));
             }
             else
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    USD(10000), XRPAmount(2000000001), IOUAmount{4472135954999579, -9}));
+                    usd(10000), XRPAmount(2000000001), IOUAmount{4472135954999579, -9}));
             }
             BEAST_EXPECT(expectLedgerEntryRoot(env, bob, bobXrpBalance + XRP(400)));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
@@ -1428,117 +1428,117 @@ class AMMClawback_test : public beast::unit_test::suite
         // gw sets asfAllowTrustLineClawback.
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw, asfAllowTrustLineClawback));
+        env.require(Flags(gw, asfAllowTrustLineClawback));
 
-        auto const USD = gw["USD"];
-        env.trust(USD(100000), alice);
-        env(pay(gw, alice, USD(10000)));
-        env.trust(USD(100000), bob);
-        env(pay(gw, bob, USD(9000)));
-        env.trust(USD(100000), carol);
-        env(pay(gw, carol, USD(8000)));
+        auto const usd = gw["USD"];
+        env.trust(usd(100000), alice);
+        env(pay(gw, alice, usd(10000)));
+        env.trust(usd(100000), bob);
+        env(pay(gw, bob, usd(9000)));
+        env.trust(usd(100000), carol);
+        env(pay(gw, carol, usd(8000)));
         env.close();
 
-        auto const EUR = gw["EUR"];
-        env.trust(EUR(100000), alice);
-        env(pay(gw, alice, EUR(10000)));
-        env.trust(EUR(100000), bob);
-        env(pay(gw, bob, EUR(9000)));
-        env.trust(EUR(100000), carol);
-        env(pay(gw, carol, EUR(8000)));
+        auto const eur = gw["EUR"];
+        env.trust(eur(100000), alice);
+        env(pay(gw, alice, eur(10000)));
+        env.trust(eur(100000), bob);
+        env(pay(gw, bob, eur(9000)));
+        env.trust(eur(100000), carol);
+        env(pay(gw, carol, eur(8000)));
         env.close();
 
-        AMM amm(env, alice, EUR(2000), USD(8000), ter(tesSUCCESS));
+        AMM amm(env, alice, eur(2000), usd(8000), Ter(tesSUCCESS));
         env.close();
 
-        BEAST_EXPECT(amm.expectBalances(USD(8000), EUR(2000), IOUAmount(4000)));
-        amm.deposit(bob, USD(4000), EUR(1000));
-        BEAST_EXPECT(amm.expectBalances(USD(12000), EUR(3000), IOUAmount(6000)));
+        BEAST_EXPECT(amm.expectBalances(usd(8000), eur(2000), IOUAmount(4000)));
+        amm.deposit(bob, usd(4000), eur(1000));
+        BEAST_EXPECT(amm.expectBalances(usd(12000), eur(3000), IOUAmount(6000)));
         if (!features[fixAMMv1_3])
         {
-            amm.deposit(carol, USD(2000), EUR(500));
+            amm.deposit(carol, usd(2000), eur(500));
         }
         else
         {
-            amm.deposit(carol, USD(2000.25), EUR(500));
+            amm.deposit(carol, usd(2000.25), eur(500));
         }
-        BEAST_EXPECT(amm.expectBalances(USD(14000), EUR(3500), IOUAmount(7000)));
+        BEAST_EXPECT(amm.expectBalances(usd(14000), eur(3500), IOUAmount(7000)));
         // gw clawback 1000 USD from carol.
-        env(amm::ammClawback(gw, carol, USD, EUR, USD(1000)), ter(tesSUCCESS));
+        env(amm::ammClawback(gw, carol, usd, eur, usd(1000)), Ter(tesSUCCESS));
         env.close();
-        BEAST_EXPECT(amm.expectBalances(USD(13000), EUR(3250), IOUAmount(6500)));
+        BEAST_EXPECT(amm.expectBalances(usd(13000), eur(3250), IOUAmount(6500)));
 
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(4000)));
         BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(2000)));
         BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-        BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
-        BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+        BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
+        BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
         if (!features[fixAMMv1_3])
         {
-            BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
         }
         else
         {
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
         }
         // 250 EUR goes back to carol.
-        BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+        BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
 
         // gw clawback 1000 USD from bob with tfClawTwoAssets flag.
         // then the corresponding EUR will also be clawed back
         // by gw.
-        env(amm::ammClawback(gw, bob, USD, EUR, USD(1000)),
-            txflags(tfClawTwoAssets),
-            ter(tesSUCCESS));
+        env(amm::ammClawback(gw, bob, usd, eur, usd(1000)),
+            Txflags(tfClawTwoAssets),
+            Ter(tesSUCCESS));
         env.close();
-        BEAST_EXPECT(amm.expectBalances(USD(12000), EUR(3000), IOUAmount(6000)));
+        BEAST_EXPECT(amm.expectBalances(usd(12000), eur(3000), IOUAmount(6000)));
 
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(4000)));
         BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(1500)));
         BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-        BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+        BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
         // 250 EUR did not go back to bob because tfClawTwoAssets is set.
-        BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+        BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
         if (!features[fixAMMv1_3])
         {
-            BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
         }
         else
         {
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
         }
-        BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+        BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
 
         // gw clawback all USD from alice and set tfClawTwoAssets.
-        env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt),
-            txflags(tfClawTwoAssets),
-            ter(tesSUCCESS));
+        env(amm::ammClawback(gw, alice, usd, eur, std::nullopt),
+            Txflags(tfClawTwoAssets),
+            Ter(tesSUCCESS));
         env.close();
-        BEAST_EXPECT(amm.expectBalances(USD(4000), EUR(1000), IOUAmount(2000)));
+        BEAST_EXPECT(amm.expectBalances(usd(4000), eur(1000), IOUAmount(2000)));
 
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
         BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(1500)));
         BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-        BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
-        BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+        BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
+        BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
         if (!features[fixAMMv1_3])
         {
-            BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
         }
         else
         {
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
         }
-        BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+        BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
     }
 
     void
@@ -1562,12 +1562,12 @@ class AMMClawback_test : public beast::unit_test::suite
         // gw sets asfAllowTrustLineClawback.
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw, asfAllowTrustLineClawback));
+        env.require(Flags(gw, asfAllowTrustLineClawback));
 
         // gw2 sets asfAllowTrustLineClawback.
         env(fset(gw2, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw2, asfAllowTrustLineClawback));
+        env.require(Flags(gw2, asfAllowTrustLineClawback));
 
         env.trust(gw["USD"](100000), alice);
         env(pay(gw, alice, gw["USD"](8000)));
@@ -1580,7 +1580,7 @@ class AMMClawback_test : public beast::unit_test::suite
         env(pay(gw2, bob, gw2["USD"](5000)));
         env.close();
 
-        AMM amm(env, alice, gw["USD"](1000), gw2["USD"](1500), ter(tesSUCCESS));
+        AMM amm(env, alice, gw["USD"](1000), gw2["USD"](1500), Ter(tesSUCCESS));
         env.close();
 
         BEAST_EXPECT(amm.expectBalances(
@@ -1596,7 +1596,7 @@ class AMMClawback_test : public beast::unit_test::suite
                 gw2["USD"],
                 gw["USD"],
                 STAmount{Issue{gw2["USD"].currency, gw2.id()}, 500}),
-            ter(temMALFORMED));
+            Ter(temMALFORMED));
 
         // gw2 clawback 500 gw2[USD] from alice.
         env(amm::ammClawback(
@@ -1605,7 +1605,7 @@ class AMMClawback_test : public beast::unit_test::suite
                 gw2["USD"],
                 gw["USD"],
                 STAmount{Issue{gw2["USD"].currency, gw2.id()}, 500}),
-            ter(tesSUCCESS));
+            Ter(tesSUCCESS));
         env.close();
         BEAST_EXPECT(amm.expectBalances(
             STAmount{gw["USD"], UINT64_C(2666666666666667), -12},
@@ -1621,7 +1621,7 @@ class AMMClawback_test : public beast::unit_test::suite
         BEAST_EXPECT(env.balance(bob, gw2["USD"]) == gw2["USD"](2000));
 
         // gw clawback all gw["USD"] from bob.
-        env(amm::ammClawback(gw, bob, gw["USD"], gw2["USD"], std::nullopt), ter(tesSUCCESS));
+        env(amm::ammClawback(gw, bob, gw["USD"], gw2["USD"], std::nullopt), Ter(tesSUCCESS));
         env.close();
         BEAST_EXPECT(amm.expectBalances(
             STAmount{gw["USD"], UINT64_C(6666666666666670), -13},
@@ -1656,52 +1656,52 @@ class AMMClawback_test : public beast::unit_test::suite
         // gw sets asfAllowTrustLineClawback.
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw, asfAllowTrustLineClawback));
+        env.require(Flags(gw, asfAllowTrustLineClawback));
 
         // gw2 sets asfAllowTrustLineClawback.
         env(fset(gw2, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw2, asfAllowTrustLineClawback));
+        env.require(Flags(gw2, asfAllowTrustLineClawback));
 
-        auto const USD = gw["USD"];
-        env.trust(USD(100000), gw2);
-        env(pay(gw, gw2, USD(5000)));
-        env.trust(USD(100000), alice);
-        env(pay(gw, alice, USD(5000)));
+        auto const usd = gw["USD"];
+        env.trust(usd(100000), gw2);
+        env(pay(gw, gw2, usd(5000)));
+        env.trust(usd(100000), alice);
+        env(pay(gw, alice, usd(5000)));
 
-        auto const EUR = gw2["EUR"];
-        env.trust(EUR(100000), gw);
-        env(pay(gw2, gw, EUR(6000)));
-        env.trust(EUR(100000), alice);
-        env(pay(gw2, alice, EUR(6000)));
+        auto const eur = gw2["EUR"];
+        env.trust(eur(100000), gw);
+        env(pay(gw2, gw, eur(6000)));
+        env.trust(eur(100000), alice);
+        env(pay(gw2, alice, eur(6000)));
         env.close();
 
-        AMM amm(env, gw, USD(1000), EUR(2000), ter(tesSUCCESS));
+        AMM amm(env, gw, usd(1000), eur(2000), Ter(tesSUCCESS));
         env.close();
-        BEAST_EXPECT(amm.expectBalances(USD(1000), EUR(2000), IOUAmount{1414213562373095, -12}));
+        BEAST_EXPECT(amm.expectBalances(usd(1000), eur(2000), IOUAmount{1414213562373095, -12}));
 
-        amm.deposit(gw2, USD(2000), EUR(4000));
-        BEAST_EXPECT(amm.expectBalances(USD(3000), EUR(6000), IOUAmount{4242640687119285, -12}));
+        amm.deposit(gw2, usd(2000), eur(4000));
+        BEAST_EXPECT(amm.expectBalances(usd(3000), eur(6000), IOUAmount{4242640687119285, -12}));
 
-        amm.deposit(alice, USD(3000), EUR(6000));
-        BEAST_EXPECT(amm.expectBalances(USD(6000), EUR(12000), IOUAmount{8485281374238570, -12}));
+        amm.deposit(alice, usd(3000), eur(6000));
+        BEAST_EXPECT(amm.expectBalances(usd(6000), eur(12000), IOUAmount{8485281374238570, -12}));
 
         BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{1414213562373095, -12}));
         BEAST_EXPECT(amm.expectLPTokens(gw2, IOUAmount{2828427124746190, -12}));
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242640687119285, -12}));
 
         // gw claws back 1000 USD from gw2.
-        env(amm::ammClawback(gw, gw2, USD, EUR, USD(1000)), ter(tesSUCCESS));
+        env(amm::ammClawback(gw, gw2, usd, eur, usd(1000)), Ter(tesSUCCESS));
         env.close();
         if (!features[fixAMMv1_3] || !features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(
-                amm.expectBalances(USD(5000), EUR(10000), IOUAmount{7071067811865475, -12}));
+                amm.expectBalances(usd(5000), eur(10000), IOUAmount{7071067811865475, -12}));
         }
         else
         {
             BEAST_EXPECT(
-                amm.expectBalances(USD(5000), EUR(10000), IOUAmount{7071067811865474, -12}));
+                amm.expectBalances(usd(5000), eur(10000), IOUAmount{7071067811865474, -12}));
         }
 
         BEAST_EXPECT(amm.expectLPTokens(gw, IOUAmount{1414213562373095, -12}));
@@ -1715,31 +1715,31 @@ class AMMClawback_test : public beast::unit_test::suite
         }
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242640687119285, -12}));
 
-        BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
-        BEAST_EXPECT(env.balance(gw, EUR) == EUR(4000));
-        BEAST_EXPECT(env.balance(gw2, USD) == USD(3000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(0));
+        BEAST_EXPECT(env.balance(gw, eur) == eur(4000));
+        BEAST_EXPECT(env.balance(gw2, usd) == usd(3000));
 
         // gw2 claws back 1000 EUR from gw.
-        env(amm::ammClawback(gw2, gw, EUR, USD, EUR(1000)), ter(tesSUCCESS));
+        env(amm::ammClawback(gw2, gw, eur, usd, eur(1000)), Ter(tesSUCCESS));
         env.close();
         if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(amm.expectBalances(
-                USD(4500),
-                STAmount(EUR, UINT64_C(9000000000000001), -12),
+                usd(4500),
+                STAmount(eur, UINT64_C(9000000000000001), -12),
                 IOUAmount{6363961030678928, -12}));
         }
         else if (!features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(
-                amm.expectBalances(USD(4500), EUR(9000), IOUAmount{6363961030678928, -12}));
+                amm.expectBalances(usd(4500), eur(9000), IOUAmount{6363961030678928, -12}));
         }
         else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(amm.expectBalances(
-                USD(4500),
-                STAmount(EUR, UINT64_C(9000000000000001), -12),
+                usd(4500),
+                STAmount(eur, UINT64_C(9000000000000001), -12),
                 IOUAmount{6363961030678927, -12}));
         }
 
@@ -1767,31 +1767,31 @@ class AMMClawback_test : public beast::unit_test::suite
 
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{4242640687119285, -12}));
 
-        BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
-        BEAST_EXPECT(env.balance(gw, EUR) == EUR(4000));
-        BEAST_EXPECT(env.balance(gw2, USD) == USD(3000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(0));
+        BEAST_EXPECT(env.balance(gw, eur) == eur(4000));
+        BEAST_EXPECT(env.balance(gw2, usd) == usd(3000));
 
         // gw2 claws back 4000 EUR from alice.
-        env(amm::ammClawback(gw2, alice, EUR, USD, EUR(4000)), ter(tesSUCCESS));
+        env(amm::ammClawback(gw2, alice, eur, usd, eur(4000)), Ter(tesSUCCESS));
         env.close();
         if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(amm.expectBalances(
-                USD(2500),
-                STAmount(EUR, UINT64_C(5000000000000001), -12),
+                usd(2500),
+                STAmount(eur, UINT64_C(5000000000000001), -12),
                 IOUAmount{3535533905932738, -12}));
         }
         else if (!features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(
-                amm.expectBalances(USD(2500), EUR(5000), IOUAmount{3535533905932738, -12}));
+                amm.expectBalances(usd(2500), eur(5000), IOUAmount{3535533905932738, -12}));
         }
         else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
         {
             BEAST_EXPECT(amm.expectBalances(
-                USD(2500),
-                STAmount(EUR, UINT64_C(5000000000000001), -12),
+                usd(2500),
+                STAmount(eur, UINT64_C(5000000000000001), -12),
                 IOUAmount{3535533905932737, -12}));
         }
 
@@ -1818,10 +1818,10 @@ class AMMClawback_test : public beast::unit_test::suite
         }
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{1414213562373095, -12}));
 
-        BEAST_EXPECT(env.balance(alice, USD) == USD(4000));
-        BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
-        BEAST_EXPECT(env.balance(gw, EUR) == EUR(4000));
-        BEAST_EXPECT(env.balance(gw2, USD) == USD(3000));
+        BEAST_EXPECT(env.balance(alice, usd) == usd(4000));
+        BEAST_EXPECT(env.balance(alice, eur) == eur(0));
+        BEAST_EXPECT(env.balance(gw, eur) == eur(4000));
+        BEAST_EXPECT(env.balance(gw2, usd) == usd(3000));
     }
 
     void
@@ -1841,18 +1841,18 @@ class AMMClawback_test : public beast::unit_test::suite
         // gw sets asfAllowTrustLineClawback.
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw, asfAllowTrustLineClawback));
+        env.require(Flags(gw, asfAllowTrustLineClawback));
 
-        auto const USD = gw["USD"];
-        env.trust(USD(100000), alice);
-        env(pay(gw, alice, USD(5000)));
+        auto const usd = gw["USD"];
+        env.trust(usd(100000), alice);
+        env(pay(gw, alice, usd(5000)));
 
-        AMM const amm(env, gw, USD(1000), XRP(2000), ter(tesSUCCESS));
+        AMM const amm(env, gw, usd(1000), XRP(2000), Ter(tesSUCCESS));
         env.close();
 
         // Alice did not deposit in the amm pool. So AMMClawback from Alice
         // will fail.
-        env(amm::ammClawback(gw, alice, USD, XRP, USD(1000)), ter(tecAMM_BALANCE));
+        env(amm::ammClawback(gw, alice, usd, XRP, usd(1000)), Ter(tecAMM_BALANCE));
     }
 
     void
@@ -1873,53 +1873,53 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
-            env.require(balance(alice, USD(3000)));
+            env.require(Balance(alice, usd(3000)));
 
             // gw2 issues 3000 EUR to Alice.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(3000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(3000)));
             env.close();
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(alice, eur(3000)));
 
             // Alice creates AMM pool of EUR/USD.
-            AMM const amm(env, alice, EUR(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, eur(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
             BEAST_EXPECT(
-                amm.expectBalances(USD(2000), EUR(1000), IOUAmount{1414213562373095, -12}));
+                amm.expectBalances(usd(2000), eur(1000), IOUAmount{1414213562373095, -12}));
 
             // freeze trustline
             env(trust(gw, alice["USD"](0), tfSetFreeze));
             env.close();
 
             // gw clawback 1000 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(1000)));
-            env.require(balance(alice, EUR(2500)));
-            BEAST_EXPECT(amm.expectBalances(USD(1000), EUR(500), IOUAmount{7071067811865475, -13}));
+            env.require(Balance(alice, usd(1000)));
+            env.require(Balance(alice, eur(2500)));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), eur(500), IOUAmount{7071067811865475, -13}));
 
             // Alice has half of its initial lptokens Left.
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{7071067811865475, -13}));
 
             // gw clawback another 1000 USD from the AMM pool. The AMM pool will
             // be empty and get deleted.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
             // Alice should still has 1000 USD because gw clawed back from the
             // AMM pool.
-            env.require(balance(alice, USD(1000)));
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(alice, usd(1000)));
+            env.require(Balance(alice, eur(3000)));
 
             // amm is automatically deleted.
             BEAST_EXPECT(!amm.ammExists());
@@ -1937,28 +1937,28 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
-            env.require(balance(alice, USD(3000)));
+            env.require(Balance(alice, usd(3000)));
 
             // gw2 issues 3000 EUR to Alice.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(3000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(3000)));
             env.close();
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(alice, eur(3000)));
 
             // Alice creates AMM pool of EUR/USD.
-            AMM const amm(env, alice, EUR(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, eur(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
             BEAST_EXPECT(
-                amm.expectBalances(USD(2000), EUR(1000), IOUAmount{1414213562373095, -12}));
+                amm.expectBalances(usd(2000), eur(1000), IOUAmount{1414213562373095, -12}));
 
             // freeze trustlines
             env(trust(gw, alice["USD"](0), tfSetFreeze));
@@ -1966,12 +1966,12 @@ class AMMClawback_test : public beast::unit_test::suite
             env.close();
 
             // gw clawback 1000 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(1000)));
-            env.require(balance(alice, EUR(2500)));
-            BEAST_EXPECT(amm.expectBalances(USD(1000), EUR(500), IOUAmount{7071067811865475, -13}));
+            env.require(Balance(alice, usd(1000)));
+            env.require(Balance(alice, eur(2500)));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), eur(500), IOUAmount{7071067811865475, -13}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{7071067811865475, -13}));
         }
 
@@ -1987,40 +1987,40 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
             // gw issues 3000 USD to Alice.
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(3000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(3000)));
             env.close();
-            env.require(balance(alice, USD(3000)));
+            env.require(Balance(alice, usd(3000)));
 
             // gw2 issues 3000 EUR to Alice.
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(3000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(3000)));
             env.close();
-            env.require(balance(alice, EUR(3000)));
+            env.require(Balance(alice, eur(3000)));
 
             // Alice creates AMM pool of EUR/USD.
-            AMM const amm(env, alice, EUR(1000), USD(2000), ter(tesSUCCESS));
+            AMM const amm(env, alice, eur(1000), usd(2000), Ter(tesSUCCESS));
             env.close();
 
             BEAST_EXPECT(
-                amm.expectBalances(USD(2000), EUR(1000), IOUAmount{1414213562373095, -12}));
+                amm.expectBalances(usd(2000), eur(1000), IOUAmount{1414213562373095, -12}));
 
             // global freeze
             env(fset(gw, asfGlobalFreeze));
             env.close();
 
             // gw clawback 1000 USD from the AMM pool.
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
 
-            env.require(balance(alice, USD(1000)));
-            env.require(balance(alice, EUR(2500)));
-            BEAST_EXPECT(amm.expectBalances(USD(1000), EUR(500), IOUAmount{7071067811865475, -13}));
+            env.require(Balance(alice, usd(1000)));
+            env.require(Balance(alice, eur(2500)));
+            BEAST_EXPECT(amm.expectBalances(usd(1000), eur(500), IOUAmount{7071067811865475, -13}));
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{7071067811865475, -13}));
         }
 
@@ -2038,122 +2038,122 @@ class AMMClawback_test : public beast::unit_test::suite
             // gw sets asfAllowTrustLineClawback.
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(gw, asfAllowTrustLineClawback));
+            env.require(Flags(gw, asfAllowTrustLineClawback));
 
-            auto const USD = gw["USD"];
-            env.trust(USD(100000), alice);
-            env(pay(gw, alice, USD(10000)));
-            env.trust(USD(100000), bob);
-            env(pay(gw, bob, USD(9000)));
-            env.trust(USD(100000), carol);
-            env(pay(gw, carol, USD(8000)));
+            auto const usd = gw["USD"];
+            env.trust(usd(100000), alice);
+            env(pay(gw, alice, usd(10000)));
+            env.trust(usd(100000), bob);
+            env(pay(gw, bob, usd(9000)));
+            env.trust(usd(100000), carol);
+            env(pay(gw, carol, usd(8000)));
             env.close();
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw, alice, EUR(10000)));
-            env.trust(EUR(100000), bob);
-            env(pay(gw, bob, EUR(9000)));
-            env.trust(EUR(100000), carol);
-            env(pay(gw, carol, EUR(8000)));
+            auto const eur = gw["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw, alice, eur(10000)));
+            env.trust(eur(100000), bob);
+            env(pay(gw, bob, eur(9000)));
+            env.trust(eur(100000), carol);
+            env(pay(gw, carol, eur(8000)));
             env.close();
 
-            AMM amm(env, alice, EUR(2000), USD(8000), ter(tesSUCCESS));
+            AMM amm(env, alice, eur(2000), usd(8000), Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(USD(8000), EUR(2000), IOUAmount(4000)));
-            amm.deposit(bob, USD(4000), EUR(1000));
-            BEAST_EXPECT(amm.expectBalances(USD(12000), EUR(3000), IOUAmount(6000)));
+            BEAST_EXPECT(amm.expectBalances(usd(8000), eur(2000), IOUAmount(4000)));
+            amm.deposit(bob, usd(4000), eur(1000));
+            BEAST_EXPECT(amm.expectBalances(usd(12000), eur(3000), IOUAmount(6000)));
             if (!features[fixAMMv1_3])
             {
-                amm.deposit(carol, USD(2000), EUR(500));
+                amm.deposit(carol, usd(2000), eur(500));
             }
             else
             {
-                amm.deposit(carol, USD(2000.25), EUR(500));
+                amm.deposit(carol, usd(2000.25), eur(500));
             }
-            BEAST_EXPECT(amm.expectBalances(USD(14000), EUR(3500), IOUAmount(7000)));
+            BEAST_EXPECT(amm.expectBalances(usd(14000), eur(3500), IOUAmount(7000)));
 
             // global freeze
             env(fset(gw, asfGlobalFreeze));
             env.close();
 
             // gw clawback 1000 USD from carol.
-            env(amm::ammClawback(gw, carol, USD, EUR, USD(1000)), ter(tesSUCCESS));
+            env(amm::ammClawback(gw, carol, usd, eur, usd(1000)), Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(13000), EUR(3250), IOUAmount(6500)));
+            BEAST_EXPECT(amm.expectBalances(usd(13000), eur(3250), IOUAmount(6500)));
 
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(4000)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(2000)));
             BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
             if (!features[fixAMMv1_3])
             {
-                BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
             }
             else
             {
                 BEAST_EXPECT(
-                    env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                    env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
             }
             // 250 EUR goes back to carol.
-            BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+            BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
 
             // gw clawback 1000 USD from bob with tfClawTwoAssets flag.
             // then the corresponding EUR will also be clawed back
             // by gw.
-            env(amm::ammClawback(gw, bob, USD, EUR, USD(1000)),
-                txflags(tfClawTwoAssets),
-                ter(tesSUCCESS));
+            env(amm::ammClawback(gw, bob, usd, eur, usd(1000)),
+                Txflags(tfClawTwoAssets),
+                Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(12000), EUR(3000), IOUAmount(6000)));
+            BEAST_EXPECT(amm.expectBalances(usd(12000), eur(3000), IOUAmount(6000)));
 
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(4000)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(1500)));
             BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
             // 250 EUR did not go back to bob because tfClawTwoAssets is set.
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
             if (!features[fixAMMv1_3])
             {
-                BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
             }
             else
             {
                 BEAST_EXPECT(
-                    env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                    env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
             }
-            BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+            BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
 
             // gw clawback all USD from alice and set tfClawTwoAssets.
-            env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt),
-                txflags(tfClawTwoAssets),
-                ter(tesSUCCESS));
+            env(amm::ammClawback(gw, alice, usd, eur, std::nullopt),
+                Txflags(tfClawTwoAssets),
+                Ter(tesSUCCESS));
             env.close();
-            BEAST_EXPECT(amm.expectBalances(USD(4000), EUR(1000), IOUAmount(2000)));
+            BEAST_EXPECT(amm.expectBalances(usd(4000), eur(1000), IOUAmount(2000)));
 
             BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
             BEAST_EXPECT(amm.expectLPTokens(bob, IOUAmount(1500)));
             BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount(500)));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(2000));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(8000));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(5000));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(8000));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(2000));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(8000));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(5000));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(8000));
             if (!features[fixAMMv1_3])
             {
-                BEAST_EXPECT(env.balance(carol, USD) == USD(6000));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(6000));
             }
             else
             {
                 BEAST_EXPECT(
-                    env.balance(carol, USD) == STAmount(USD, UINT64_C(5999'999999999999), -12));
+                    env.balance(carol, usd) == STAmount(usd, UINT64_C(5999'999999999999), -12));
             }
-            BEAST_EXPECT(env.balance(carol, EUR) == EUR(7750));
+            BEAST_EXPECT(env.balance(carol, eur) == eur(7750));
         }
     }
 
@@ -2175,40 +2175,40 @@ class AMMClawback_test : public beast::unit_test::suite
         // gw sets asfAllowTrustLineClawback.
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(gw, asfAllowTrustLineClawback));
+        env.require(Flags(gw, asfAllowTrustLineClawback));
 
         // gw issues 1000 USD to Alice.
-        auto const USD = gw["USD"];
-        env.trust(USD(100000), alice);
-        env(pay(gw, alice, USD(1000)));
+        auto const usd = gw["USD"];
+        env.trust(usd(100000), alice);
+        env(pay(gw, alice, usd(1000)));
         env.close();
-        env.require(balance(alice, USD(1000)));
+        env.require(Balance(alice, usd(1000)));
 
         // gw creates AMM pool of XRP/USD.
-        AMM amm(env, gw, XRP(100), USD(400), ter(tesSUCCESS));
+        AMM amm(env, gw, XRP(100), usd(400), Ter(tesSUCCESS));
         env.close();
 
-        BEAST_EXPECT(amm.expectBalances(USD(400), XRP(100), IOUAmount(200000)));
+        BEAST_EXPECT(amm.expectBalances(usd(400), XRP(100), IOUAmount(200000)));
 
-        amm.deposit(alice, USD(400));
+        amm.deposit(alice, usd(400));
         env.close();
 
-        BEAST_EXPECT(amm.expectBalances(USD(800), XRP(100), IOUAmount{2828427124746190, -10}));
+        BEAST_EXPECT(amm.expectBalances(usd(800), XRP(100), IOUAmount{2828427124746190, -10}));
 
         auto aliceXrpBalance = env.balance(alice, XRP);
 
-        env(amm::ammClawback(gw, alice, USD, XRP, USD(400)), ter(tesSUCCESS));
+        env(amm::ammClawback(gw, alice, usd, XRP, usd(400)), Ter(tesSUCCESS));
         env.close();
 
         if (!features[fixAMMv1_3])
         {
             BEAST_EXPECT(amm.expectBalances(
-                STAmount(USD, UINT64_C(5656854249492380), -13), XRP(70.710678), IOUAmount(200000)));
+                STAmount(usd, UINT64_C(5656854249492380), -13), XRP(70.710678), IOUAmount(200000)));
         }
         else
         {
             BEAST_EXPECT(amm.expectBalances(
-                STAmount(USD, UINT64_C(565'685424949238), -12), XRP(70.710679), IOUAmount(200000)));
+                STAmount(usd, UINT64_C(565'685424949238), -12), XRP(70.710679), IOUAmount(200000)));
         }
         BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount(0)));
         if (!features[fixAMMv1_3])
@@ -2237,14 +2237,14 @@ class AMMClawback_test : public beast::unit_test::suite
                 env(fset(gw, asfAllowTrustLineClawback));
                 env.close();
 
-                auto const USD = gw["USD"];
-                env.trust(USD(100000), alice);
-                env(pay(gw, alice, USD(50000)));
-                env.trust(USD(100000), bob);
-                env(pay(gw, bob, USD(40000)));
+                auto const usd = gw["USD"];
+                env.trust(usd(100000), alice);
+                env(pay(gw, alice, usd(50000)));
+                env.trust(usd(100000), bob);
+                env(pay(gw, bob, usd(40000)));
                 env.close();
 
-                return USD;
+                return usd;
             };
 
         auto getLPTokenBalances = [&](auto& env,
@@ -2262,9 +2262,9 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
-            AMM amm(env, alice, XRP(2), USD(1));
+            AMM amm(env, alice, XRP(2), usd(1));
             amm.deposit(alice, IOUAmount{1'876123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000'000});
             amm.withdraw(alice, IOUAmount{1'876123487565916, -15});
@@ -2278,15 +2278,15 @@ class AMMClawback_test : public beast::unit_test::suite
 
             if (!features[fixAMMClawbackRounding] || !features[fixAMMv1_3])
             {
-                env(amm::ammClawback(gw, alice, USD, XRP, USD(1)), ter(tecAMM_BALANCE));
+                env(amm::ammClawback(gw, alice, usd, XRP, usd(1)), Ter(tecAMM_BALANCE));
                 BEAST_EXPECT(amm.ammExists());
             }
             else
             {
                 auto const lpBalance = IOUAmount{989, -12};
-                env(amm::ammClawback(gw, alice, USD, XRP, USD(1)));
+                env(amm::ammClawback(gw, alice, usd, XRP, usd(1)));
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(7000000000000000), -28), XRPAmount(1), lpBalance));
+                    STAmount(usd, UINT64_C(7000000000000000), -28), XRPAmount(1), lpBalance));
                 BEAST_EXPECT(amm.expectLPTokens(alice, lpBalance));
             }
         }
@@ -2295,9 +2295,9 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
-            AMM amm(env, alice, XRP(2), USD(1));
+            AMM amm(env, alice, XRP(2), usd(1));
             amm.deposit(alice, IOUAmount{1'876123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000'000});
             amm.withdrawAll(bob);
@@ -2308,19 +2308,19 @@ class AMMClawback_test : public beast::unit_test::suite
             auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), alice);
             BEAST_EXPECT(res && res.value());
 
-            env(amm::ammClawback(gw, alice, USD, XRP, USD(0.5)));
+            env(amm::ammClawback(gw, alice, usd, XRP, usd(0.5)));
 
             if (!features[fixAMMv1_3] && !features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(5013266196406), -13),
+                    STAmount(usd, UINT64_C(5013266196406), -13),
                     XRPAmount(1002653),
                     IOUAmount{708'9829046744236, -13}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(5013266196407), -13),
+                    STAmount(usd, UINT64_C(5013266196407), -13),
                     XRPAmount(1002654),
                     IOUAmount{708'9829046744941, -13}));
             }
@@ -2328,7 +2328,7 @@ class AMMClawback_test : public beast::unit_test::suite
             {
                 auto const lpBalance = IOUAmount{708'9829046743238, -13};
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(5013266196406999), -16), XRPAmount(1002655), lpBalance));
+                    STAmount(usd, UINT64_C(5013266196406999), -16), XRPAmount(1002655), lpBalance));
                 BEAST_EXPECT(amm.expectLPTokens(alice, lpBalance));
             }
         }
@@ -2337,9 +2337,9 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
-            AMM amm(env, alice, XRP(2), USD(1));
+            AMM amm(env, alice, XRP(2), usd(1));
             amm.deposit(alice, IOUAmount{1'876123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000'000});
             amm.withdraw(alice, IOUAmount{1'876123487565916, -15});
@@ -2353,19 +2353,19 @@ class AMMClawback_test : public beast::unit_test::suite
 
             if (!features[fixAMMClawbackRounding] && !features[fixAMMv1_3])
             {
-                env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt), ter(tecAMM_BALANCE));
+                env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt), Ter(tecAMM_BALANCE));
             }
             else if (!features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt));
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(2410000000000000), -28),
+                    STAmount(usd, UINT64_C(2410000000000000), -28),
                     XRPAmount(1),
                     IOUAmount{34, -11}));
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, XRP, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, XRP, std::nullopt));
                 BEAST_EXPECT(!amm.ammExists());
             }
         }
@@ -2374,19 +2374,19 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
             Account const gw2{"gateway2"};
             env.fund(XRP(100000), gw2);
             env.close();
-            auto const EUR = gw2["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw2, alice, EUR(50000)));
-            env.trust(EUR(100000), bob);
-            env(pay(gw2, bob, EUR(50000)));
+            auto const eur = gw2["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw2, alice, eur(50000)));
+            env.trust(eur(100000), bob);
+            env(pay(gw2, bob, eur(50000)));
             env.close();
 
-            AMM amm(env, alice, USD(2), EUR(1));
+            AMM amm(env, alice, usd(2), eur(1));
             amm.deposit(alice, IOUAmount{1'576123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000});
             amm.withdraw(alice, IOUAmount{1'576123487565916, -15});
@@ -2400,12 +2400,12 @@ class AMMClawback_test : public beast::unit_test::suite
 
             if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt));
                 BEAST_EXPECT(!amm.ammExists());
             }
             else
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), ter(tecINTERNAL));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Ter(tecINTERNAL));
                 BEAST_EXPECT(amm.ammExists());
             }
         }
@@ -2414,16 +2414,16 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(100000), alice);
-            env(pay(gw, alice, EUR(50000)));
-            env.trust(EUR(100000), bob);
-            env(pay(gw, bob, EUR(50000)));
+            auto const eur = gw["EUR"];
+            env.trust(eur(100000), alice);
+            env(pay(gw, alice, eur(50000)));
+            env.trust(eur(100000), bob);
+            env(pay(gw, bob, eur(50000)));
             env.close();
 
-            AMM amm(env, alice, USD(1), EUR(2));
+            AMM amm(env, alice, usd(1), eur(2));
             amm.deposit(alice, IOUAmount{1'076123487565916, -15});
             amm.deposit(bob, IOUAmount{1'000});
             amm.withdraw(alice, IOUAmount{1'076123487565916, -15});
@@ -2437,14 +2437,14 @@ class AMMClawback_test : public beast::unit_test::suite
 
             if (features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt), txflags(tfClawTwoAssets));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt), Txflags(tfClawTwoAssets));
                 BEAST_EXPECT(!amm.ammExists());
             }
             else
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, std::nullopt),
-                    txflags(tfClawTwoAssets),
-                    ter(tecINTERNAL));
+                env(amm::ammClawback(gw, alice, usd, eur, std::nullopt),
+                    Txflags(tfClawTwoAssets),
+                    Ter(tecINTERNAL));
                 BEAST_EXPECT(amm.ammExists());
             }
         }
@@ -2453,16 +2453,16 @@ class AMMClawback_test : public beast::unit_test::suite
         {
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
             Account const gw{"gateway"}, alice{"alice"}, bob{"bob"};
-            auto const USD = setupAccounts(env, gw, alice, bob);
+            auto const usd = setupAccounts(env, gw, alice, bob);
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(1000000000), alice);
-            env(pay(gw, alice, EUR(500000000)));
-            env.trust(EUR(1000000000), bob);
-            env(pay(gw, bob, EUR(500000000)));
+            auto const eur = gw["EUR"];
+            env.trust(eur(1000000000), alice);
+            env(pay(gw, alice, eur(500000000)));
+            env.trust(eur(1000000000), bob);
+            env(pay(gw, bob, eur(500000000)));
             env.close();
 
-            AMM amm(env, alice, USD(1), EUR(2000000));
+            AMM amm(env, alice, usd(1), eur(2000000));
             amm.deposit(alice, IOUAmount{1'076123487565916, -12});
             amm.deposit(bob, IOUAmount{10000});
             amm.withdraw(alice, IOUAmount{1'076123487565916, -12});
@@ -2477,25 +2477,25 @@ class AMMClawback_test : public beast::unit_test::suite
 
             if (!features[fixAMMClawbackRounding] && !features[fixAMMv1_3])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, USD(1)));
+                env(amm::ammClawback(gw, alice, usd, eur, usd(1)));
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(4), -15),
-                    STAmount(EUR, UINT64_C(8), -9),
+                    STAmount(usd, UINT64_C(4), -15),
+                    STAmount(eur, UINT64_C(8), -9),
                     IOUAmount{6, -12}));
             }
             else if (!features[fixAMMClawbackRounding])
             {
                 // sqrt(amount * amount2) >= LPTokens and exceeds the allowed
                 // tolerance
-                env(amm::ammClawback(gw, alice, USD, EUR, USD(1)), ter(tecINVARIANT_FAILED));
+                env(amm::ammClawback(gw, alice, usd, eur, usd(1)), Ter(tecINVARIANT_FAILED));
                 BEAST_EXPECT(amm.ammExists());
             }
             else if (features[fixAMMv1_3] && features[fixAMMClawbackRounding])
             {
-                env(amm::ammClawback(gw, alice, USD, EUR, USD(1)), txflags(tfClawTwoAssets));
+                env(amm::ammClawback(gw, alice, usd, eur, usd(1)), Txflags(tfClawTwoAssets));
                 auto const lpBalance = IOUAmount{5, -12};
                 BEAST_EXPECT(amm.expectBalances(
-                    STAmount(USD, UINT64_C(4), -15), STAmount(EUR, UINT64_C(8), -9), lpBalance));
+                    STAmount(usd, UINT64_C(4), -15), STAmount(eur, UINT64_C(8), -9), lpBalance));
                 BEAST_EXPECT(amm.expectLPTokens(alice, lpBalance));
             }
         }
@@ -2507,7 +2507,7 @@ class AMMClawback_test : public beast::unit_test::suite
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
         FeatureBitset const all =
-            jtx::testable_amendments() - featureSingleAssetVault - featureLendingProtocol;
+            jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol;
 
         testInvalidRequest(all);
         testInvalidRequest(all - featureMPTokensV2);
diff --git a/src/test/app/AMMExtendedMPT_test.cpp b/src/test/app/AMMExtendedMPT_test.cpp
index 44ced2edc2..6de39b73ec 100644
--- a/src/test/app/AMMExtendedMPT_test.cpp
+++ b/src/test/app/AMMExtendedMPT_test.cpp
@@ -78,48 +78,48 @@ private:
         using namespace jtx;
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob, carol}, XRP(10'000));
+        fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-        MPTTester const ETH(
+        MPTTester const eth(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .pay = 200'000'000'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .pay = 2'000'000'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
         // Must be two offers at the same quality
         // "taker gets" must be XRP
         // (Different amounts so I can distinguish the offers)
-        env(offer(carol, BTC(49'000'000'000'000), XRP(49)));
-        env(offer(carol, BTC(51'000'000'000'000), XRP(51)));
+        env(offer(carol_, btc(49'000'000'000'000), XRP(49)));
+        env(offer(carol_, btc(51'000'000'000'000), XRP(51)));
 
         // Offers for the poor quality path
         // Must be two offers at the same quality
-        env(offer(carol, XRP(50), ETH(50'000'000'000'000)));
-        env(offer(carol, XRP(50), ETH(50'000'000'000'000)));
+        env(offer(carol_, XRP(50), eth(50'000'000'000'000)));
+        env(offer(carol_, XRP(50), eth(50'000'000'000'000)));
 
         // Good quality path
-        AMM const ammCarol(env, carol, BTC(1'000'000'000'000'000), ETH(100'100'000'000'000'000));
+        AMM const ammCarol(env, carol_, btc(1'000'000'000'000'000), eth(100'100'000'000'000'000));
 
-        PathSet const paths(Path(XRP, MPT(ETH)), Path(MPT(ETH)));
+        PathSet const paths(TestPath(XRP, MPT(eth)), TestPath(MPT(eth)));
 
-        env(pay(alice, bob, ETH(100'000'000'000'000)),
-            json(paths.json()),
-            sendmax(BTC(1'000'000'000'000'000)),
-            txflags(tfPartialPayment));
+        env(pay(alice_, bob_, eth(100'000'000'000'000)),
+            Json(paths.json()),
+            Sendmax(btc(1'000'000'000'000'000)),
+            Txflags(tfPartialPayment));
 
         BEAST_EXPECT(ammCarol.expectBalances(
-            BTC(1'001'000'000'374'816), ETH(100'000'000'000'000'000), ammCarol.tokens()));
+            btc(1'001'000'000'374'816), eth(100'000'000'000'000'000), ammCarol.tokens()));
 
-        env.require(balance(bob, ETH(200'100'000'000'000'000)));
-        BEAST_EXPECT(isOffer(env, carol, BTC(49'000'000'000'000), XRP(49)));
+        env.require(Balance(bob_, eth(200'100'000'000'000'000)));
+        BEAST_EXPECT(isOffer(env, carol_, btc(49'000'000'000'000), XRP(49)));
     }
 
     void
@@ -135,29 +135,29 @@ private:
         // that are discovered along the way.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const& BTC = MPT(ammAlice[1]);
+                auto const& btc = MPT(ammAlice[1]);
                 auto const baseFee = env.current()->fees().base;
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolXRP = env.balance(carol, XRP);
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolXRP = env.balance(carol_, XRP);
                 // Order that can't be filled
-                env(offer(carol, BTC(100), XRP(100)), txflags(tfFillOrKill), ter(tecKILLED));
+                env(offer(carol_, btc(100), XRP(100)), Txflags(tfFillOrKill), Ter(tecKILLED));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), BTC(10'000), ammAlice.tokens()));
+                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), btc(10'000), ammAlice.tokens()));
                 // fee = AMM
-                env.require(balance(carol, carolXRP - baseFee));
-                env.require(balance(carol, carolBTC));
+                env.require(Balance(carol_, carolXRP - baseFee));
+                env.require(Balance(carol_, carolBTC));
 
-                BEAST_EXPECT(expectOffers(env, carol, 0));
-                carolXRP = env.balance(carol, XRP);
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
+                carolXRP = env.balance(carol_, XRP);
 
                 // Order that can be filled
-                env(offer(carol, XRP(100), BTC(100)), txflags(tfFillOrKill), ter(tesSUCCESS));
-                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'100), ammAlice.tokens()));
-                env.require(balance(carol, carolXRP + XRP(100) - baseFee));
-                env.require(balance(carol, carolBTC - BTC(100)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                env(offer(carol_, XRP(100), btc(100)), Txflags(tfFillOrKill), Ter(tesSUCCESS));
+                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'100), ammAlice.tokens()));
+                env.require(Balance(carol_, carolXRP + XRP(100) - baseFee));
+                env.require(Balance(carol_, carolBTC - btc(100)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
-            {{XRP(10'100), AMMMPT(10'000)}},
+            {{XRP(10'100), gAmmmpt(10'000)}},
             0,
             std::nullopt,
             {features});
@@ -166,23 +166,23 @@ private:
         // and add nothing on the books.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const& BTC = MPT(ammAlice[1]);
+                auto const& btc = MPT(ammAlice[1]);
                 auto const baseFee = env.current()->fees().base;
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolXRP = env.balance(carol, XRP);
-                env(offer(carol, XRP(200), BTC(200)),
-                    txflags(tfImmediateOrCancel),
-                    ter(tesSUCCESS));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolXRP = env.balance(carol_, XRP);
+                env(offer(carol_, XRP(200), btc(200)),
+                    Txflags(tfImmediateOrCancel),
+                    Ter(tesSUCCESS));
 
                 // AMM generates a synthetic offer of 100BTC/100XRP
                 // to match the CLOB offer quality.
-                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'100), ammAlice.tokens()));
+                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'100), ammAlice.tokens()));
                 // +AMM - offer * fee
-                env.require(balance(carol, carolXRP + XRP(100) - baseFee));
-                env.require(balance(carol, carolBTC - BTC(100)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                env.require(Balance(carol_, carolXRP + XRP(100) - baseFee));
+                env.require(Balance(carol_, carolBTC - btc(100)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
-            {{XRP(10'100), AMMMPT(10'000)}},
+            {{XRP(10'100), gAmmmpt(10'000)}},
             0,
             std::nullopt,
             {features});
@@ -192,13 +192,13 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 // Carol creates a passive offer that could cross AMM.
                 // Carol's offer should stay in the ledger.
-                auto const& BTC = MPT(ammAlice[1]);
-                env(offer(carol, XRP(100), BTC(100), tfPassive));
+                auto const& btc = MPT(ammAlice[1]);
+                env(offer(carol_, XRP(100), btc(100), tfPassive));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), BTC(10'000), ammAlice.tokens()));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{{XRP(100), BTC(100)}}}));
+                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), btc(10'000), ammAlice.tokens()));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{{XRP(100), btc(100)}}}));
             },
-            {{XRP(10'100), AMMMPT(10'000)}},
+            {{XRP(10'100), gAmmmpt(10'000)}},
             0,
             std::nullopt,
             {features});
@@ -206,19 +206,19 @@ private:
         // tfPassive -- cross only offers of better quality.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const& BTC = MPT(ammAlice[1]);
-                env(offer(alice, BTC(110), XRP(100)));
+                auto const& btc = MPT(ammAlice[1]);
+                env(offer(alice_, btc(110), XRP(100)));
                 env.close();
 
                 // Carol creates a passive offer. That offer should cross
                 // AMM and leave Alice's offer untouched.
-                env(offer(carol, XRP(100), BTC(100), tfPassive));
+                env(offer(carol_, XRP(100), btc(100), tfPassive));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'900), BTC(9083), ammAlice.tokens()));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
-                BEAST_EXPECT(expectOffers(env, alice, 1));
+                BEAST_EXPECT(ammAlice.expectBalances(XRP(10'900), btc(9083), ammAlice.tokens()));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
+                BEAST_EXPECT(expectOffers(env, alice_, 1));
             },
-            {{XRP(11'000), AMMMPT(9'000)}},
+            {{XRP(11'000), gAmmmpt(9'000)}},
             0,
             std::nullopt,
             {features});
@@ -233,30 +233,30 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {bob, alice}, XRP(300'000));
+        fund(env, gw_, {bob_, alice_}, XRP(300'000));
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
+             .issuer = gw_,
+             .holders = {alice_, bob_},
              .pay = 100'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        AMM const ammAlice(env, alice, XRP(150'000), BTC(50'000'000));
+        AMM const ammAlice(env, alice_, XRP(150'000), btc(50'000'000));
 
         // Existing offer pays better than this wants.
         // Partially consume existing offer.
         // Pay 1'000'000 BTC, get 3061224490 Drops.
         auto const xrpTransferred = XRPAmount{3'061'224'490};
-        env(offer(bob, BTC(1'000'000), XRP(4'000)));
+        env(offer(bob_, btc(1'000'000), XRP(4'000)));
 
         BEAST_EXPECT(ammAlice.expectBalances(
-            XRP(150'000) + xrpTransferred, BTC(49'000'000), IOUAmount{273'861'278752583, -5}));
+            XRP(150'000) + xrpTransferred, btc(49'000'000), IOUAmount{273'861'278752583, -5}));
 
-        env.require(balance(bob, BTC(101'000'000)));
+        env.require(Balance(bob_, btc(101'000'000)));
         BEAST_EXPECT(
-            expectLedgerEntryRoot(env, bob, XRP(300'000) - xrpTransferred - 2 * txfee(env, 1)));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
+            expectLedgerEntryRoot(env, bob_, XRP(300'000) - xrpTransferred - 2 * txFee(env, 1)));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
     }
 
     void
@@ -268,20 +268,20 @@ private:
 
         Env env{*this, features};
 
-        env.fund(XRP(200'000), gw, alice, bob);
+        env.fund(XRP(200'000), gw_, alice_, bob_);
         env.close();
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
-        env(pay(gw, alice, BTC(500'000'000)));
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, alice_, btc(500'000'000)));
 
-        AMM const ammAlice(env, alice, XRP(150'000), BTC(51'000'000));
-        env(offer(bob, BTC(1'000'000), XRP(3'000)));
+        AMM const ammAlice(env, alice_, XRP(150'000), btc(51'000'000));
+        env(offer(bob_, btc(1'000'000), XRP(3'000)));
 
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(153'000), BTC(50'000'000), ammAlice.tokens()));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(153'000), btc(50'000'000), ammAlice.tokens()));
 
-        env.require(balance(bob, BTC(1'000'000)));
-        env.require(balance(bob, XRP(200'000) - XRP(3'000) - env.current()->fees().base * 2));
+        env.require(Balance(bob_, btc(1'000'000)));
+        env.require(Balance(bob_, XRP(200'000) - XRP(3'000) - env.current()->fees().base * 2));
     }
 
     void
@@ -293,25 +293,25 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob}, XRP(10'000));
-        env.require(owners(bob, 0));
+        fund(env, gw_, {alice_, bob_}, XRP(10'000));
+        env.require(Owners(bob_, 0));
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
-        env(pay(gw, bob, BTC(1'000'000'000)));
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, bob_, btc(1'000'000'000)));
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice_, 1), Owners(bob_, 1));
 
-        env(pay(gw, alice, BTC(100'000'000)));
-        AMM const ammBob(env, bob, BTC(200'000'000), XRP(1'500));
+        env(pay(gw_, alice_, btc(100'000'000)));
+        AMM const ammBob(env, bob_, btc(200'000'000), XRP(1'500));
 
-        env(pay(alice, alice, XRP(500)), sendmax(BTC(100'000'000)));
+        env(pay(alice_, alice_, XRP(500)), Sendmax(btc(100'000'000)));
 
-        BEAST_EXPECT(ammBob.expectBalances(BTC(300'000'000), XRP(1'000), ammBob.tokens()));
-        env.require(balance(alice, BTC(0)));
+        BEAST_EXPECT(ammBob.expectBalances(btc(300'000'000), XRP(1'000), ammBob.tokens()));
+        env.require(Balance(alice_, btc(0)));
 
-        auto jrr = ledgerEntryRoot(env, alice);
-        env.require(balance(alice, XRP(10'000) + XRP(500) - env.current()->fees().base * 2));
+        auto jrr = ledgerEntryRoot(env, alice_);
+        env.require(Balance(alice_, XRP(10'000) + XRP(500) - env.current()->fees().base * 2));
     }
 
     void
@@ -322,37 +322,37 @@ private:
         using namespace jtx;
 
         Env env{*this, features};
-        env.fund(XRP(30'000), gw, bob);
-        env.fund(XRP(40'000), alice);
+        env.fund(XRP(30'000), gw_, bob_);
+        env.fund(XRP(40'000), alice_);
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
+             .issuer = gw_,
+             .holders = {alice_, bob_},
              .pay = 30'000'000'000,
-             .flags = MPTDEXFlags});
-        env(pay(gw, alice, BTC(10'000'000'000)));
+             .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, alice_, btc(10'000'000'000)));
 
-        AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000'000'000));
+        AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000));
         env.close();
 
         // Alice converts BTC to XRP which should fail
         // due to PartialPayment.
-        env(pay(alice, alice, XRP(100)), sendmax(BTC(100'000'000)), ter(tecPATH_PARTIAL));
+        env(pay(alice_, alice_, XRP(100)), Sendmax(btc(100'000'000)), Ter(tecPATH_PARTIAL));
 
         // Alice converts BTC to XRP, should succeed because
         // we permit partial payment
-        env(pay(alice, alice, XRP(100)), sendmax(BTC(100'000'000)), txflags(tfPartialPayment));
+        env(pay(alice_, alice_, XRP(100)), Sendmax(btc(100'000'000)), Txflags(tfPartialPayment));
         env.close();
         BEAST_EXPECT(ammAlice.expectBalances(
-            XRPAmount{9'900'990'100}, BTC(10'100'000'000), ammAlice.tokens()));
+            XRPAmount{9'900'990'100}, btc(10'100'000'000), ammAlice.tokens()));
         // initial 40,000'000'000 - 10,000'000'000AMM - 100'000'000pay
-        env.require(balance(alice, BTC(29'900'000'000)));
+        env.require(Balance(alice_, btc(29'900'000'000)));
         // initial 40,000 - 10,0000AMM + 99.009900pay - fee*3
         BEAST_EXPECT(expectLedgerEntryRoot(
             env,
-            alice,
-            XRP(40'000) - XRP(10'000) + XRPAmount{99'009'900} - ammCrtFee(env) - txfee(env, 3)));
+            alice_,
+            XRP(40'000) - XRP(10'000) + XRPAmount{99'009'900} - ammCrtFee(env) - txFee(env, 3)));
     }
 
     void
@@ -363,20 +363,20 @@ private:
         using namespace jtx;
 
         Env env{*this, features};
-        env.fund(XRP(30'000), gw);
-        env.fund(XRP(40'000), alice);
-        env.fund(XRP(1'000), bob);
+        env.fund(XRP(30'000), gw_);
+        env.fund(XRP(40'000), alice_);
+        env.fund(XRP(1'000), bob_);
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
-        env(pay(gw, alice, BTC(10'100'000'000)));
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, alice_, btc(10'100'000'000)));
 
-        AMM const ammAlice(env, alice, XRP(10'000), BTC(10'100'000'000));
+        AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000));
         env.close();
 
-        env(pay(alice, bob, BTC(100'000'000)), sendmax(XRP(100)));
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), BTC(10'000'000'000), ammAlice.tokens()));
-        env.require(balance(bob, BTC(100'000'000)));
+        env(pay(alice_, bob_, btc(100'000'000)), Sendmax(XRP(100)));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), btc(10'000'000'000), ammAlice.tokens()));
+        env.require(Balance(bob_, btc(100'000'000)));
     }
 
     void
@@ -387,20 +387,20 @@ private:
         using namespace jtx;
 
         Env env{*this, features};
-        env.fund(XRP(30'000), gw);
-        env.fund(XRP(40'100), alice);
-        env.fund(XRP(1'000), bob);
+        env.fund(XRP(30'000), gw_);
+        env.fund(XRP(40'100), alice_);
+        env.fund(XRP(1'000), bob_);
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
-        env(pay(gw, alice, BTC(40'000'000'000)));
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, alice_, btc(40'000'000'000)));
 
-        AMM const ammAlice(env, alice, XRP(10'100), BTC(10'000'000'000));
+        AMM const ammAlice(env, alice_, XRP(10'100), btc(10'000'000'000));
         env.close();
 
-        env(pay(alice, bob, XRP(100)), sendmax(BTC(100'000'000)));
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'100'000'000), ammAlice.tokens()));
-        BEAST_EXPECT(expectLedgerEntryRoot(env, bob, XRP(1'000) + XRP(100) - txfee(env, 1)));
+        env(pay(alice_, bob_, XRP(100)), Sendmax(btc(100'000'000)));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'100'000'000), ammAlice.tokens()));
+        BEAST_EXPECT(expectLedgerEntryRoot(env, bob_, XRP(1'000) + XRP(100) - txFee(env, 1)));
     }
 
     void
@@ -413,40 +413,40 @@ private:
         auto test = [&](auto&& issue1, auto&& issue2) {
             Env env(*this);
             auto const dan = Account{"dan"};
-            env.fund(XRP(60'000), alice, bob, carol, gw, dan);
+            env.fund(XRP(60'000), alice_, bob_, carol_, gw_, dan);
             env.close();
-            auto const ETH = issue1(
+            auto const eth = issue1(
                 {.env = env,
                  .token = "ETH",
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan},
                  .limit = 10'000'000'000'000'000});
-            auto const BTC = issue2(
+            auto const btc = issue2(
                 {.env = env,
                  .token = "BTC",
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan},
                  .limit = 10'000'000'000'000'000});
-            env(pay(gw, alice, BTC(500'000'000'000'000)));
-            env(pay(gw, carol, BTC(6'000'000'000'000'000)));
-            env(pay(gw, dan, ETH(400'000'000'000'000)));
+            env(pay(gw_, alice_, btc(500'000'000'000'000)));
+            env(pay(gw_, carol_, btc(6'000'000'000'000'000)));
+            env(pay(gw_, dan, eth(400'000'000'000'000)));
             env.close();
             env.close();
-            AMM const ammCarol(env, carol, BTC(5'000'000'000'000'000), XRP(50'000));
+            AMM const ammCarol(env, carol_, btc(5'000'000'000'000'000), XRP(50'000));
 
-            env(offer(dan, XRP(500), ETH(50'000'000'000'000)));
+            env(offer(dan, XRP(500), eth(50'000'000'000'000)));
             env.close();
 
-            Json::Value jtp{Json::arrayValue};
+            json::Value jtp{json::ArrayValue};
             jtp[0u][0u][jss::currency] = "XRP";
-            env(pay(alice, bob, ETH(30'000'000'000'000)),
-                json(jss::Paths, jtp),
-                sendmax(BTC(333'000'000'000'000)));
+            env(pay(alice_, bob_, eth(30'000'000'000'000)),
+                Json(jss::Paths, jtp),
+                Sendmax(btc(333'000'000'000'000)));
             env.close();
             BEAST_EXPECT(ammCarol.expectBalances(
-                XRP(49'700), BTC(5'030'181'086'519'115), ammCarol.tokens()));
-            BEAST_EXPECT(expectOffers(env, dan, 1, {{Amounts{XRP(200), ETH(20'000'000'000'000)}}}));
-            env.require(balance(bob, ETH(30'000'000'000'000)));
+                XRP(49'700), btc(5'030'181'086'519'115), ammCarol.tokens()));
+            BEAST_EXPECT(expectOffers(env, dan, 1, {{Amounts{XRP(200), eth(20'000'000'000'000)}}}));
+            env.require(Balance(bob_, eth(30'000'000'000'000)));
         };
         testHelper2TokensMix(test);
     }
@@ -462,33 +462,34 @@ private:
 
         // Provide micro amounts to compensate for fees to make results round
         // nice.
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(2) + env.current()->fees().base * 3;
 
-        env.fund(starting_xrp, gw, alice);
-        env.fund(XRP(2'000), bob);
+        env.fund(startingXrp, gw_, alice_);
+        env.fund(XRP(2'000), bob_);
         env.close();
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
 
         // Created only to increase one reserve count for alice
-        MPTTester const ETH({.env = env, .issuer = gw, .holders = {alice}, .flags = MPTDEXFlags});
+        MPTTester const eth(
+            {.env = env, .issuer = gw_, .holders = {alice_}, .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, bob, BTC(1'200'000'000'000'000)));
+        env(pay(gw_, bob_, btc(1'200'000'000'000'000)));
 
-        AMM const ammBob(env, bob, XRP(1'000), BTC(1'200'000'000'000'000));
+        AMM const ammBob(env, bob_, XRP(1'000), btc(1'200'000'000'000'000));
         // Alice has 400 - (2 reserve of 50 = 300 reserve) = 100 available.
         // Ask for more than available to prove reserve works.
-        env(offer(alice, BTC(200'000'000'000'000), XRP(200)));
+        env(offer(alice_, btc(200'000'000'000'000), XRP(200)));
 
         // The pool gets only 100XRP for ~109.09e12BTC, even though
         // it can exchange more.
         BEAST_EXPECT(
-            ammBob.expectBalances(XRP(1'100), BTC(1'090'909'090'909'091), ammBob.tokens()));
+            ammBob.expectBalances(XRP(1'100), btc(1'090'909'090'909'091), ammBob.tokens()));
 
-        env.require(balance(alice, BTC(109'090'909'090'909)));
-        env.require(balance(alice, XRP(300)));
+        env.require(Balance(alice_, btc(109'090'909'090'909)));
+        env.require(Balance(alice_, XRP(300)));
     }
 
     void
@@ -500,26 +501,26 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob}, XRP(200'000));
+        fund(env, gw_, {alice_, bob_}, XRP(200'000));
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
+             .issuer = gw_,
+             .holders = {alice_, bob_},
              .transferFee = 500,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, bob, BTC(1'000'000'000'000)));
-        env(pay(gw, alice, BTC(200'000'000'000'000)));
+        env(pay(gw_, bob_, btc(1'000'000'000'000)));
+        env(pay(gw_, alice_, btc(200'000'000'000'000)));
 
-        AMM const ammAlice(env, alice, BTC(150'000'000'000'000), XRP(150'100));
-        env(offer(bob, XRP(100), BTC(100'000'000'000)));
+        AMM const ammAlice(env, alice_, btc(150'000'000'000'000), XRP(150'100));
+        env(offer(bob_, XRP(100), btc(100'000'000'000)));
 
         BEAST_EXPECT(
-            ammAlice.expectBalances(BTC(150'100'000'000'000), XRP(150'000), ammAlice.tokens()));
+            ammAlice.expectBalances(btc(150'100'000'000'000), XRP(150'000), ammAlice.tokens()));
 
         // Bob pays 0.005 transfer fee.
-        env.require(balance(bob, BTC(899'500'000'000)));
+        env.require(Balance(bob_, btc(899'500'000'000)));
     }
 
     void
@@ -530,25 +531,26 @@ private:
         using namespace jtx;
 
         Env env{*this, features};
-        env.fund(XRP(30'000), gw, bob, carol);
-        env.fund(XRP(39'900), alice);
+        env.fund(XRP(30'000), gw_, bob_, carol_);
+        env.fund(XRP(39'900), alice_);
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .pay = 30'000,
-             .flags = MPTDEXFlags});
-        env(pay(gw, alice, BTC(10'100)));
+             .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, alice_, btc(10'100)));
 
-        AMM const ammAlice(env, alice, XRP(9'900), BTC(10'100));
+        AMM const ammAlice(env, alice_, XRP(9'900), btc(10'100));
 
-        env(offer(carol, BTC(100), XRP(100)), json(jss::Flags, tfSell));
+        env(offer(carol_, btc(100), XRP(100)), Json(jss::Flags, tfSell));
         env.close();
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(9'999), ammAlice.tokens()));
-        BEAST_EXPECT(expectOffers(env, carol, 0));
-        env.require(balance(carol, BTC(30'101)));
-        BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRP(30'000) - XRP(100) - 2 * txfee(env, 1)));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(9'999), ammAlice.tokens()));
+        BEAST_EXPECT(expectOffers(env, carol_, 0));
+        env.require(Balance(carol_, btc(30'101)));
+        BEAST_EXPECT(
+            expectLedgerEntryRoot(env, carol_, XRP(30'000) - XRP(100) - 2 * txFee(env, 1)));
     }
 
     void
@@ -560,27 +562,27 @@ private:
 
         Env env{*this, features};
 
-        auto const starting_xrp = XRP(100) + reserve(env, 1) + env.current()->fees().base * 2;
+        auto const startingXrp = XRP(100) + reserve(env, 1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice);
-        env.fund(XRP(2'000), bob);
+        env.fund(startingXrp, gw_, alice_);
+        env.fund(XRP(2'000), bob_);
         env.close();
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
-        env(pay(gw, bob, BTC(2'200'000'000)));
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
+        env(pay(gw_, bob_, btc(2'200'000'000)));
 
-        AMM const ammBob(env, bob, XRP(1'000), BTC(2'200'000'000));
+        AMM const ammBob(env, bob_, XRP(1'000), btc(2'200'000'000));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
         // Taker pays 100'000'000 BTC for 100 XRP.
         // Selling XRP.
         // Will sell all 100 XRP and get more BTC than asked for.
-        env(offer(alice, BTC(100'000'000), XRP(200)), json(jss::Flags, tfSell));
-        BEAST_EXPECT(ammBob.expectBalances(XRP(1'100), BTC(2'000'000'000), ammBob.tokens()));
-        env.require(balance(alice, BTC(200'000'000)));
-        BEAST_EXPECT(expectLedgerEntryRoot(env, alice, XRP(250)));
-        BEAST_EXPECT(expectOffers(env, alice, 0));
+        env(offer(alice_, btc(100'000'000), XRP(200)), Json(jss::Flags, tfSell));
+        BEAST_EXPECT(ammBob.expectBalances(XRP(1'100), btc(2'000'000'000), ammBob.tokens()));
+        env.require(Balance(alice_, btc(200'000'000)));
+        BEAST_EXPECT(expectLedgerEntryRoot(env, alice_, XRP(250)));
+        BEAST_EXPECT(expectOffers(env, alice_, 0));
     }
 
     void
@@ -592,43 +594,43 @@ private:
 
         Env env{*this, features};
 
-        auto const starting_xrp = XRP(100.1) + reserve(env, 1) + env.current()->fees().base * 2;
-        env.fund(starting_xrp, gw, alice, bob);
+        auto const startingXrp = XRP(100.1) + reserve(env, 1) + env.current()->fees().base * 2;
+        env.fund(startingXrp, gw_, alice_, bob_);
 
-        MPTTester const XTS(
+        MPTTester const xts(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
+             .issuer = gw_,
+             .holders = {alice_, bob_},
              .pay = 1'000'000'000'000'000,
-             .flags = MPTDEXFlags});
-        MPTTester const XXX(
+             .flags = kMPT_DEX_FLAGS});
+        MPTTester const xxx(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
+             .issuer = gw_,
+             .holders = {alice_, bob_},
              .pay = 1'000'000'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        AMM const ammAlice(env, alice, XTS(1'000'000'000'000'000), XXX(1'000'000'000'000'000));
+        AMM const ammAlice(env, alice_, xts(1'000'000'000'000'000), xxx(1'000'000'000'000'000));
 
-        Json::Value payment;
+        json::Value payment;
         payment[jss::secret] = toBase58(generateSeed("bob"));
-        payment[jss::id] = env.seq(bob);
+        payment[jss::id] = env.seq(bob_);
         payment[jss::build_path] = true;
-        payment[jss::tx_json] = pay(bob, bob, XXX(10'000'000'000'000));
+        payment[jss::tx_json] = pay(bob_, bob_, xxx(10'000'000'000'000));
         payment[jss::tx_json][jss::Sequence] =
-            env.current()->read(keylet::account(bob.id()))->getFieldU32(sfSequence);
+            env.current()->read(keylet::account(bob_.id()))->getFieldU32(sfSequence);
         payment[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
         payment[jss::tx_json][jss::SendMax] =
-            XTS(15'000'000'000'000).value().getJson(JsonOptions::none);
+            xts(15'000'000'000'000).value().getJson(JsonOptions::KNone);
         payment[jss::tx_json][jss::Flags] = tfPartialPayment;
         auto const jrr = env.rpc("json", "submit", to_string(payment));
         BEAST_EXPECT(jrr[jss::result][jss::status] == "success");
         BEAST_EXPECT(jrr[jss::result][jss::engine_result] == "tesSUCCESS");
 
         BEAST_EXPECT(ammAlice.expectBalances(
-            XTS(1'010'101'010'101'011), XXX(990'000'000'000'000), ammAlice.tokens()));
-        env.require(balance(bob, XTS(989'898'989'898'989)));
-        env.require(balance(bob, XXX(1'010'000'000'000'000)));
+            xts(1'010'101'010'101'011), xxx(990'000'000'000'000), ammAlice.tokens()));
+        env.require(Balance(bob_, xts(989'898'989'898'989)));
+        env.require(Balance(bob_, xxx(1'010'000'000'000'000)));
     }
 
     void
@@ -640,20 +642,20 @@ private:
 
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -661,38 +663,38 @@ private:
             //   o carol has ETH but wants BTC.
             // Note that carol's offer must come last.  If carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'100'000'000));
-            AMM const ammBob(env, bob, ETH(10'000'000'000), XRP(10'100));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000));
+            AMM const ammBob(env, bob_, eth(10'000'000'000), XRP(10'100));
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, BTC(100'000'000), ETH(100'000'000)));
+            env(offer(carol_, btc(100'000'000), eth(100'000'000)));
             env.close();
 
             BEAST_EXPECT(
-                ammAlice.expectBalances(XRP(10'100), BTC(10'000'000'000), ammAlice.tokens()));
-            BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), ETH(10'100'000'000), ammBob.tokens()));
-            env.require(balance(carol, BTC(15'100'000'000)));
-            env.require(balance(carol, ETH(14'900'000'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+                ammAlice.expectBalances(XRP(10'100), btc(10'000'000'000), ammAlice.tokens()));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), eth(10'100'000'000), ammBob.tokens()));
+            env.require(Balance(carol_, btc(15'100'000'000)));
+            env.require(Balance(carol_, eth(14'900'000'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -701,39 +703,39 @@ private:
             // Note that carol's offer must come last.  If carol's offer is
             // placed before AMM and bob's offer are created, then autobridging
             // will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'100'000'000));
-            env(offer(bob, ETH(100'000'000), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000'000));
+            env(offer(bob_, eth(100'000'000), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, BTC(100'000'000), ETH(100'000'000)));
+            env(offer(carol_, btc(100'000'000), eth(100'000'000)));
             env.close();
 
             BEAST_EXPECT(
-                ammAlice.expectBalances(XRP(10'100), BTC(10'000'000'000), ammAlice.tokens()));
-            env.require(balance(carol, BTC(15'100'000'000)));
-            env.require(balance(carol, ETH(14'900'000'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+                ammAlice.expectBalances(XRP(10'100), btc(10'000'000'000), ammAlice.tokens()));
+            env.require(Balance(carol_, btc(15'100'000'000)));
+            env.require(Balance(carol_, eth(14'900'000'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 15'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             // The scenario:
             //   o BTC/XRP offer is created.
@@ -742,20 +744,20 @@ private:
             // Note that carol's offer must come last.  If carol's offer is
             // placed before AMM and alice's offer are created, then
             // autobridging will not occur.
-            env(offer(alice, XRP(100), BTC(100'000'000)));
+            env(offer(alice_, XRP(100), btc(100'000'000)));
             env.close();
-            AMM const ammBob(env, bob, ETH(10'000'000'000), XRP(10'100));
+            AMM const ammBob(env, bob_, eth(10'000'000'000), XRP(10'100));
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, BTC(100'000'000), ETH(100'000'000)));
+            env(offer(carol_, btc(100'000'000), eth(100'000'000)));
             env.close();
 
-            BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), ETH(10'100'000'000), ammBob.tokens()));
-            env.require(balance(carol, BTC(15'100'000'000)));
-            env.require(balance(carol, ETH(14'900'000'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), eth(10'100'000'000), ammBob.tokens()));
+            env.require(Balance(carol_, btc(15'100'000'000)));
+            env.require(Balance(carol_, eth(14'900'000'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
     }
 
@@ -770,62 +772,62 @@ private:
 
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 20'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammBob(env, bob, XRP(20'000), BTC(200'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            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));
+            env(offer(alice_, btc(2'100'000), XRP(210), tfSell | tfFillOrKill), Ter(tecKILLED));
 
-            BEAST_EXPECT(ammBob.expectBalances(XRP(20'000), BTC(200'000'000), ammBob.tokens()));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(20'000), btc(200'000'000), ammBob.tokens()));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammBob(env, bob, XRP(20'000), BTC(200'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            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.
-            env(offer(alice, BTC(2'000'000'000'000), XRP(220), tfSell | tfFillOrKill));
+            env(offer(alice_, btc(2'000'000'000'000), XRP(220), tfSell | tfFillOrKill));
             env.close();
             BEAST_EXPECT(
-                ammBob.expectBalances(XRP(20'220), BTC(197'823'936'696'341), ammBob.tokens()));
-            env.require(balance(alice, BTC(1'002'176'063'303'659)));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+                ammBob.expectBalances(XRP(20'220), btc(197'823'936'696'341), ammBob.tokens()));
+            env.require(Balance(alice_, btc(1'002'176'063'303'659)));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that crosses and
             // returns more than was asked for (because of the tfSell flag).
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammBob(env, bob, XRP(20'000), BTC(200'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            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));
+            env(offer(alice_, btc(10'000'000'000'000), XRP(1'500), tfSell | tfFillOrKill));
             env.close();
 
             BEAST_EXPECT(
-                ammBob.expectBalances(XRP(21'500), BTC(186'046'511'627'907), ammBob.tokens()));
-            env.require(balance(alice, BTC(1'013'953'488'372'093)));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+                ammBob.expectBalances(XRP(21'500), btc(186'046'511'627'907), ammBob.tokens()));
+            env.require(Balance(alice_, btc(1'013'953'488'372'093)));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that doesn't cross.
@@ -834,20 +836,20 @@ private:
             // all of the offer is consumed because AMM generated offer,
             // which matches alice's offer quality is ~ 10XRP/0.01996e3BTC.
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 10'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammBob(env, bob, XRP(5000), BTC(10'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM const ammBob(env, bob_, XRP(5000), btc(10'000'000));
 
-            env(offer(alice, BTC(1'000'000), XRP(501), tfSell | tfFillOrKill), ter(tecKILLED));
+            env(offer(alice_, btc(1'000'000), XRP(501), tfSell | tfFillOrKill), Ter(tecKILLED));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
     }
 
@@ -861,75 +863,75 @@ private:
         // AMM XRP/BTC. Alice places BTC/XRP offer.
         {
             Env env(*this, features);
-            env.fund(XRP(30'000), gw, bob, carol);
-            env.fund(XRP(40'000), alice);
+            env.fund(XRP(30'000), gw_, bob_, carol_);
+            env.fund(XRP(40'000), alice_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000,
-                 .flags = MPTDEXFlags});
-            env(pay(gw, alice, BTC(10'100'000)));
+                 .flags = kMPT_DEX_FLAGS});
+            env(pay(gw_, alice_, btc(10'100'000)));
 
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'100'000));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000));
             env.close();
 
-            env(offer(carol, BTC(100'000), XRP(100)));
+            env(offer(carol_, btc(100'000), XRP(100)));
             env.close();
 
             // AMM doesn't pay the transfer fee
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), BTC(10'000'000), ammAlice.tokens()));
-            env.require(balance(carol, BTC(30'100'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), btc(10'000'000), ammAlice.tokens()));
+            env.require(Balance(carol_, btc(30'100'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         {
             Env env(*this, features);
-            env.fund(XRP(30'000), gw, bob, carol);
-            env.fund(XRP(40'100), alice);
+            env.fund(XRP(30'000), gw_, bob_, carol_);
+            env.fund(XRP(40'100), alice_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000,
-                 .flags = MPTDEXFlags});
-            env(pay(gw, alice, BTC(10'000'000)));
+                 .flags = kMPT_DEX_FLAGS});
+            env(pay(gw_, alice_, btc(10'000'000)));
 
-            AMM const ammAlice(env, alice, XRP(10'100), BTC(10'000'000));
+            AMM const ammAlice(env, alice_, XRP(10'100), btc(10'000'000));
             env.close();
 
-            env(offer(carol, XRP(100), BTC(100'000)));
+            env(offer(carol_, XRP(100), btc(100'000)));
             env.close();
 
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'100'000), ammAlice.tokens()));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'100'000), ammAlice.tokens()));
             // Carol pays 25% transfer fee
-            env.require(balance(carol, BTC(29'875'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            env.require(Balance(carol_, btc(29'875'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         {
             // Bridged crossing.
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -937,44 +939,44 @@ private:
             //   o carol has ETH but wants BTC.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'100'000));
-            env(offer(bob, ETH(100'000), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'100'000));
+            env(offer(bob_, eth(100'000), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Bob's offer.
-            env(offer(carol, BTC(100'000), ETH(100'000)));
+            env(offer(carol_, btc(100'000), eth(100'000)));
             env.close();
 
             // AMM doesn't pay the transfer fee
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), BTC(10'000'000), ammAlice.tokens()));
-            env.require(balance(carol, BTC(15'100'000)));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), btc(10'000'000), ammAlice.tokens()));
+            env.require(Balance(carol_, btc(15'100'000)));
             // Carol pays 25% transfer fee.
-            env.require(balance(carol, ETH(14'875'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            env.require(Balance(carol_, eth(14'875'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         {
             // Bridged crossing. The transfer fee is paid on the step not
             // involving AMM as src/dst.
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 15'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             // The scenario:
             //   o BTC/XRP AMM is created.
@@ -982,25 +984,25 @@ private:
             //   o carol has ETH but wants BTC.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'050'000));
-            env(offer(bob, ETH(100'000), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'050'000));
+            env(offer(bob_, eth(100'000), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // partially consumes Bob's offer.
-            env(offer(carol, BTC(50'000), ETH(50'000)));
+            env(offer(carol_, btc(50'000), eth(50'000)));
             env.close();
             // This test verifies that the amount removed from an offer
             // accounts for the transfer fee that is removed from the
             // account but not from the remaining offer.
 
             // AMM doesn't pay the transfer fee
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'050), BTC(10'000'000), ammAlice.tokens()));
-            env.require(balance(carol, BTC(15'050'000)));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(10'050), btc(10'000'000), ammAlice.tokens()));
+            env.require(Balance(carol_, btc(15'050'000)));
             // Carol pays 25% transfer fee.
-            env.require(balance(carol, ETH(14'937'500)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 1, {{Amounts{ETH(50'000), XRP(50)}}}));
+            env.require(Balance(carol_, eth(14'937'500)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 1, {{Amounts{eth(50'000), XRP(50)}}}));
         }
     }
 
@@ -1016,19 +1018,20 @@ private:
 
         auto const f = env.current()->fees().base;
 
-        env.fund(XRP(30'000) + f, alice, bob);
+        env.fund(XRP(30'000) + f, alice_, bob_);
         env.close();
 
-        MPTTester const BTC({.env = env, .issuer = bob, .holders = {alice}, .flags = MPTDEXFlags});
+        MPTTester const btc(
+            {.env = env, .issuer = bob_, .holders = {alice_}, .flags = kMPT_DEX_FLAGS});
 
-        AMM const ammBob(env, bob, XRP(10'000), BTC(10'100));
+        AMM const ammBob(env, bob_, XRP(10'000), btc(10'100));
 
-        env(offer(alice, BTC(100), XRP(100)));
+        env(offer(alice_, btc(100), XRP(100)));
         env.close();
 
-        BEAST_EXPECT(ammBob.expectBalances(XRP(10'100), BTC(10'000), ammBob.tokens()));
-        BEAST_EXPECT(expectOffers(env, alice, 0));
-        env.require(balance(alice, BTC(100)));
+        BEAST_EXPECT(ammBob.expectBalances(XRP(10'100), btc(10'000), ammBob.tokens()));
+        BEAST_EXPECT(expectOffers(env, alice_, 0));
+        env.require(Balance(alice_, btc(100)));
     }
 
     void
@@ -1054,36 +1057,36 @@ private:
         env.fund(reserve(env, 4) + (fee * 5), ann, bob, cam);
         env.close();
 
-        MPTTester const A_BUX(
-            {.env = env, .issuer = ann, .holders = {bob, cam, carol}, .flags = MPTDEXFlags});
+        MPTTester const aBux(
+            {.env = env, .issuer = ann, .holders = {bob, cam, carol}, .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const B_BUX(
-            {.env = env, .issuer = bob, .holders = {ann, cam, carol}, .flags = MPTDEXFlags});
+        MPTTester const bBux(
+            {.env = env, .issuer = bob, .holders = {ann, cam, carol}, .flags = kMPT_DEX_FLAGS});
 
-        env(pay(ann, cam, A_BUX(350'000'000'000'000)));
-        env(pay(bob, cam, B_BUX(350'000'000'000'000)));
-        env(pay(bob, carol, B_BUX(4'000'000'000'000'000)));
-        env(pay(ann, carol, A_BUX(4'000'000'000'000'000)));
+        env(pay(ann, cam, aBux(350'000'000'000'000)));
+        env(pay(bob, cam, bBux(350'000'000'000'000)));
+        env(pay(bob, carol, bBux(4'000'000'000'000'000)));
+        env(pay(ann, carol, aBux(4'000'000'000'000'000)));
 
-        AMM const ammCarol(env, carol, A_BUX(3'000'000'000'000'000), B_BUX(3'300'000'000'000'000));
+        AMM const ammCarol(env, carol, aBux(3'000'000'000'000'000), bBux(3'300'000'000'000'000));
 
         // cam puts an offer on the books that her upcoming offer could cross.
         // But this offer should be deleted, not crossed, by her upcoming
         // offer.
-        env(offer(cam, A_BUX(290'000'000'000'000), B_BUX(300'000'000'000'000), tfPassive));
+        env(offer(cam, aBux(290'000'000'000'000), bBux(300'000'000'000'000), tfPassive));
         env.close();
-        env.require(balance(cam, A_BUX(350'000'000'000'000)));
-        env.require(balance(cam, B_BUX(350'000'000'000'000)));
+        env.require(Balance(cam, aBux(350'000'000'000'000)));
+        env.require(Balance(cam, bBux(350'000'000'000'000)));
         env.require(offers(cam, 1));
 
         // This offer caused the assert.
-        env(offer(cam, B_BUX(300'000'000'000'000), A_BUX(300'000'000'000'000)));
+        env(offer(cam, bBux(300'000'000'000'000), aBux(300'000'000'000'000)));
 
         // AMM is consumed up to the first cam Offer quality
         BEAST_EXPECT(ammCarol.expectBalances(
-            A_BUX(3'093'541'659'651'604), B_BUX(3'200'215'509'984'418), ammCarol.tokens()));
+            aBux(3'093'541'659'651'604), bBux(3'200'215'509'984'418), ammCarol.tokens()));
         BEAST_EXPECT(expectOffers(
-            env, cam, 1, {{Amounts{B_BUX(200'215'509'984'418), A_BUX(200'215'509'984'419)}}}));
+            env, cam, 1, {{Amounts{bBux(200'215'509'984'418), aBux(200'215'509'984'419)}}}));
     }
 
     void
@@ -1094,36 +1097,36 @@ private:
         using namespace jtx;
 
         Env env{*this, features};
-        env.fund(XRP(400'000), gw, alice, bob);
+        env.fund(XRP(400'000), gw_, alice_, bob_);
 
-        MPTTester BTC(
+        MPTTester btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
-             .flags = tfMPTRequireAuth | MPTDEXFlags});
+             .issuer = gw_,
+             .holders = {alice_, bob_},
+             .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
 
         // Authorize bob and alice
-        BTC.authorize({.holder = alice});
-        BTC.authorize({.holder = bob});
+        btc.authorize({.holder = alice_});
+        btc.authorize({.holder = bob_});
 
-        env(pay(gw, alice, BTC(1'000)));
+        env(pay(gw_, alice_, btc(1'000)));
         env.close();
 
         // Alice is able to create AMM since the GW has authorized her
-        AMM const ammAlice(env, alice, BTC(1'000), XRP(1'050));
+        AMM const ammAlice(env, alice_, btc(1'000), XRP(1'050));
 
-        env(pay(gw, bob, BTC(50)));
+        env(pay(gw_, bob_, btc(50)));
         env.close();
 
-        env.require(balance(bob, BTC(50)));
+        env.require(Balance(bob_, btc(50)));
 
         // Bob's offer should cross Alice's AMM
-        env(offer(bob, XRP(50), BTC(50)));
+        env(offer(bob_, XRP(50), btc(50)));
         env.close();
 
-        BEAST_EXPECT(ammAlice.expectBalances(BTC(1'050), XRP(1'000), ammAlice.tokens()));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
-        env.require(balance(bob, BTC(0)));
+        BEAST_EXPECT(ammAlice.expectBalances(btc(1'050), XRP(1'000), ammAlice.tokens()));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
+        env.require(Balance(bob_, btc(0)));
     }
 
     void
@@ -1135,55 +1138,55 @@ private:
 
         Env env{*this, features};
 
-        env.fund(XRP(400'000), gw, alice, bob);
+        env.fund(XRP(400'000), gw_, alice_, bob_);
         env.close();
 
-        MPTTester BTC(
+        MPTTester btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob},
-             .flags = tfMPTRequireAuth | MPTDEXFlags});
+             .issuer = gw_,
+             .holders = {alice_, bob_},
+             .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
 
         // Alice doesn't have the funds
         {
-            AMM const ammAlice(env, alice, BTC(1'000), XRP(1'000), ter(tecNO_AUTH));
+            AMM const ammAlice(env, alice_, btc(1'000), XRP(1'000), Ter(tecNO_AUTH));
         }
 
-        BTC.authorize({.holder = bob});
-        env(pay(gw, bob, BTC(50)));
+        btc.authorize({.holder = bob_});
+        env(pay(gw_, bob_, btc(50)));
         env.close();
-        env.require(balance(bob, BTC(50)));
+        env.require(Balance(bob_, btc(50)));
 
         // Alice should not be able to create AMM without authorization.
         {
-            AMM const ammAlice(env, alice, BTC(1'000), XRP(1'000), ter(tecNO_AUTH));
+            AMM const ammAlice(env, alice_, btc(1'000), XRP(1'000), Ter(tecNO_AUTH));
         }
 
         // Finally, authorize alice. Now alice's AMM create should succeed.
-        BTC.authorize({.holder = alice});
-        env(pay(gw, alice, BTC(1'000)));
+        btc.authorize({.holder = alice_});
+        env(pay(gw_, alice_, btc(1'000)));
         env.close();
 
-        AMM const ammAlice(env, alice, BTC(1'000), XRP(1'050));
+        AMM const ammAlice(env, alice_, btc(1'000), XRP(1'050));
 
         // Authorize AMM.
         // BTC.authorize({.account = ammAlice.ammAccount()});
         // env.close();
 
         // Now bob creates his offer again, which crosses with alice's AMM.
-        env(offer(bob, XRP(50), BTC(50)));
+        env(offer(bob_, XRP(50), btc(50)));
         env.close();
 
-        BEAST_EXPECT(ammAlice.expectBalances(BTC(1'050), XRP(1'000), ammAlice.tokens()));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
-        env.require(balance(bob, BTC(0)));
+        BEAST_EXPECT(ammAlice.expectBalances(btc(1'050), XRP(1'000), ammAlice.tokens()));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
+        env.require(Balance(bob_, btc(0)));
     }
 
     void
     testOffers()
     {
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testRmFundedOffer(all);
         testFillModes(all);
         testOfferCrossWithXRP(all);
@@ -1208,81 +1211,81 @@ private:
     }
 
     void
-    path_find_consume_all()
+    pathFindConsumeAll()
     {
         testcase("path find consume all");
         using namespace jtx;
 
         Env env = pathTestEnv();
-        env.fund(XRP(100'000'260), alice);
-        env.fund(XRP(30'000), gw, bob, carol);
+        env.fund(XRP(100'000'260), alice_);
+        env.fund(XRP(30'000), gw_, bob_, carol_);
 
-        MPTTester const ETH(
+        MPTTester const eth(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .pay = 100'000'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        AMM const ammCarol(env, carol, XRP(100), ETH(100'000'000'000'000));
+        AMM const ammCarol(env, carol_, XRP(100), eth(100'000'000'000'000));
 
         STPathSet st;
         STAmount sa;
         STAmount da;
-        std::tie(st, sa, da) =
-            find_paths(env, alice, bob, bob["AUD"](-1), std::optional<STAmount>(XRP(100'000'000)));
+        std::tie(st, sa, da) = findPaths(
+            env, alice_, bob_, bob_["AUD"](-1), std::optional<STAmount>(XRP(100'000'000)));
         BEAST_EXPECT(st.empty());
         std::tie(st, sa, da) =
-            find_paths(env, alice, bob, ETH(-1), std::optional<STAmount>(XRP(100'000'000)));
+            findPaths(env, alice_, bob_, eth(-1), std::optional<STAmount>(XRP(100'000'000)));
         // Alice sends all requested 100,000,000XRP
         BEAST_EXPECT(sa == XRP(100'000'000));
         // Bob gets ~99.99e12ETH. This is the amount Bob
         // can get out of AMM for 100,000,000XRP.
-        BEAST_EXPECT(equal(da, ETH(99'999'900'000'100)));
+        BEAST_EXPECT(equal(da, eth(99'999'900'000'100)));
     }
 
     // carol holds ETH, sells ETH for XRP
     // bob will hold ETH
     // alice pays bob ETH using XRP
     void
-    via_offers_via_gateway()
+    viaOffersViaGateway()
     {
         testcase("via gateway");
         using namespace jtx;
 
         Env env = pathTestEnv();
-        env.fund(XRP(10'000), alice, bob, carol, gw);
+        env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
         env.close();
 
-        MPTTester const ETH(
+        MPTTester const eth(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .transferFee = 10'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice, bob, carol},
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
              .transferFee = 10'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, carol, ETH(51)));
+        env(pay(gw_, carol_, eth(51)));
         env.close();
-        AMM const ammCarol(env, carol, XRP(40), ETH(51));
-        env(pay(alice, bob, ETH(10)), sendmax(XRP(100)), paths(XRP));
+        AMM const ammCarol(env, carol_, XRP(40), eth(51));
+        env(pay(alice_, bob_, eth(10)), Sendmax(XRP(100)), Paths(XRP));
         env.close();
         // AMM offer is 51.282052XRP/11ETH, 11ETH/1.1 = 10ETH to bob
-        BEAST_EXPECT(ammCarol.expectBalances(XRP(51), ETH(40), ammCarol.tokens()));
-        env.require(balance(bob, ETH(10)));
+        BEAST_EXPECT(ammCarol.expectBalances(XRP(51), eth(40), ammCarol.tokens()));
+        env.require(Balance(bob_, eth(10)));
 
-        auto const result = find_paths(env, alice, bob, BTC(25));
+        auto const result = findPaths(env, alice_, bob_, btc(25));
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    receive_max()
+    receiveMax()
     {
         testcase("Receive max");
         using namespace jtx;
@@ -1290,44 +1293,44 @@ private:
         {
             // XRP -> MPT receive max
             Env env = pathTestEnv();
-            env.fund(XRP(30'000), alice, bob, charlie, gw);
+            env.fund(XRP(30'000), alice_, bob_, charlie, gw_);
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, charlie},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, charlie},
                  .pay = 11'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammCharlie(env, charlie, XRP(10), ETH(11'000'000'000'000));
-            auto [st, sa, da] = find_paths(env, alice, bob, ETH(-1), XRP(1).value());
+            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());
             BEAST_EXPECT(sa == XRP(1));
-            BEAST_EXPECT(equal(da, ETH(1'000'000'000'000)));
+            BEAST_EXPECT(equal(da, eth(1'000'000'000'000)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
                 auto const& pathElem = st[0][0];
                 BEAST_EXPECT(
-                    pathElem.isOffer() && pathElem.getIssuerID() == gw.id() &&
-                    pathElem.getMPTID() == ETH.issuanceID());
+                    pathElem.isOffer() && pathElem.getIssuerID() == gw_.id() &&
+                    pathElem.getMPTID() == eth.issuanceID());
             }
         }
         {
             // MPT -> XRP receive max
             Env env = pathTestEnv();
-            env.fund(XRP(30'000), alice, bob, charlie, gw);
+            env.fund(XRP(30'000), alice_, bob_, charlie, gw_);
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, charlie},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, charlie},
                  .pay = 11'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammCharlie(env, charlie, XRP(11), ETH(10'000'000'000'000));
+            AMM const ammCharlie(env, charlie, XRP(11), eth(10'000'000'000'000));
             env.close();
             auto [st, sa, da] =
-                find_paths(env, alice, bob, drops(-1), ETH(1'000'000'000'000).value());
-            BEAST_EXPECT(sa == ETH(1'000'000'000'000));
+                findPaths(env, alice_, bob_, drops(-1), eth(1'000'000'000'000).value());
+            BEAST_EXPECT(sa == eth(1'000'000'000'000));
             BEAST_EXPECT(equal(da, XRP(1)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
@@ -1340,172 +1343,165 @@ private:
     }
 
     void
-    path_find_01()
+    pathFind01()
     {
         testcase("Path Find: XRP -> XRP and XRP -> MPT");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account A1{"A1"};
-        Account A2{"A2"};
-        Account A3{"A3"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account G3{"G3"};
-        Account M1{"M1"};
+        Account a1{"A1"};
+        Account a2{"A2"};
+        Account a3{"A3"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account g3{"G3"};
+        Account m1{"M1"};
 
-        env.fund(XRP(100'000), A1);
-        env.fund(XRP(10'000), A2);
-        env.fund(XRP(1'000), A3, G1, G2, G3);
-        env.fund(XRP(20'000), M1);
+        env.fund(XRP(100'000), a1);
+        env.fund(XRP(10'000), a2);
+        env.fund(XRP(1'000), a3, g1, g2, g3);
+        env.fund(XRP(20'000), m1);
         env.close();
 
-        MPTTester const XYZ_G1(
-            {.env = env, .issuer = G1, .holders = {A1, M1, A2}, .flags = MPTDEXFlags});
+        MPTTester const xyzG1(
+            {.env = env, .issuer = g1, .holders = {a1, m1, a2}, .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const XYZ_G2(
-            {.env = env, .issuer = G2, .holders = {A2, M1, A1}, .flags = MPTDEXFlags});
+        MPTTester const xyzG2(
+            {.env = env, .issuer = g2, .holders = {a2, m1, a1}, .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const ABC_G3(
-            {.env = env, .issuer = G3, .holders = {A1, A2, M1, A3}, .flags = MPTDEXFlags});
+        MPTTester const abcG3(
+            {.env = env, .issuer = g3, .holders = {a1, a2, m1, a3}, .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const ABC_A2(
-            {.env = env, .issuer = A2, .holders = {G3, A1}, .flags = MPTDEXFlags});
+        MPTTester const abcA2(
+            {.env = env, .issuer = a2, .holders = {g3, a1}, .flags = kMPT_DEX_FLAGS});
 
-        env(pay(G1, A1, XYZ_G1(3'500'000'000)));
-        env(pay(G3, A1, ABC_G3(1'200'000'000)));
-        env(pay(G1, M1, XYZ_G1(25'000'000'000)));
-        env(pay(G2, M1, XYZ_G2(25'000'000'000)));
-        env(pay(G3, M1, ABC_G3(25'000'000'000)));
-        env(pay(A2, G3, ABC_A2(101'000'000)));
+        env(pay(g1, a1, xyzG1(3'500'000'000)));
+        env(pay(g3, a1, abcG3(1'200'000'000)));
+        env(pay(g1, m1, xyzG1(25'000'000'000)));
+        env(pay(g2, m1, xyzG2(25'000'000'000)));
+        env(pay(g3, m1, abcG3(25'000'000'000)));
+        env(pay(a2, g3, abcA2(101'000'000)));
         env.close();
 
-        AMM const ammM1_XYZ_G1_XYZ_G2(env, M1, XYZ_G1(1'000'000'000), XYZ_G2(1'000'000'000));
-        AMM const ammM1_XRP_ABC_G3(env, M1, XRP(10'000), ABC_G3(1'000'000'000));
-        AMM const ammG3_ABC_G3_ABC_A2(env, G3, ABC_G3(100'000'000), ABC_A2(101'000'000));
+        AMM const ammM1XyzG1XyzG2(env, m1, xyzG1(1'000'000'000), xyzG2(1'000'000'000));
+        AMM const ammM1XrpAbcG3(env, m1, XRP(10'000), abcG3(1'000'000'000));
+        AMM const ammG3AbcG3AbcA2(env, g3, abcG3(100'000'000), abcA2(101'000'000));
         env.close();
 
         STPathSet st;
         STAmount sa, da;
 
         {
-            auto const& send_amt = XRP(10);
-            std::tie(st, sa, da) = find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = XRP(10);
+            std::tie(st, sa, da) = findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
             // no path should exist for this since dest account
             // does not exist.
-            auto const& send_amt = XRP(200);
+            auto const& sendAmt = XRP(200);
             std::tie(st, sa, da) =
-                find_paths(env, A1, Account{"A0"}, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, Account{"A0"}, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
-            auto const& send_amt = ABC_G3(10'000'000);
-            std::tie(st, sa, da) = find_paths(env, A2, G3, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = abcG3(10'000'000);
+            std::tie(st, sa, da) = findPaths(env, a2, g3, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRPAmount{101'010'102}));
-            BEAST_EXPECT(same(st, stpath(IPE(MPT(ABC_G3)))));
+            BEAST_EXPECT(same(st, stpath(ipe(MPT(abcG3)))));
         }
 
         {
-            auto const& send_amt = ABC_A2(1'000'000);
-            std::tie(st, sa, da) = find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = abcA2(1'000'000);
+            std::tie(st, sa, da) = findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRPAmount{10'010'011}));
-            BEAST_EXPECT(same(st, stpath(IPE(MPT(ABC_G3)), IPE(MPT(ABC_A2)))));
+            BEAST_EXPECT(same(st, stpath(ipe(MPT(abcG3)), ipe(MPT(abcA2)))));
         }
     }
 
     void
-    path_find_02()
+    pathFind02()
     {
         testcase("Path Find: non-XRP -> XRP");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account A1{"A1"};
-        Account A2{"A2"};
-        Account const G3{"G3"};
-        Account M1{"M1"};
+        Account a1{"A1"};
+        Account a2{"A2"};
+        Account const g3{"G3"};
+        Account m1{"M1"};
 
-        env.fund(XRP(1'000), A1, A2, G3);
-        env.fund(XRP(11'000), M1);
+        env.fund(XRP(1'000), a1, a2, g3);
+        env.fund(XRP(11'000), m1);
         env.close();
 
-        MPTTester const ETH(
+        MPTTester const eth(
             {.env = env,
-             .issuer = G3,
-             .holders = {A1, A2, M1},
+             .issuer = g3,
+             .holders = {a1, a2, m1},
              .pay = 1'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
-        AMM const ammM1(env, M1, ETH(1'000'000'000), XRP(10'010));
+        AMM const ammM1(env, m1, eth(1'000'000'000), XRP(10'010));
 
         STPathSet st;
         STAmount sa, da;
 
-        auto const& send_amt = XRP(10);
+        auto const& sendAmt = XRP(10);
 
         std::tie(st, sa, da) =
-            find_paths_by_element(env, A1, A2, send_amt, std::nullopt, IPE(MPT(ETH)));
-        BEAST_EXPECT(equal(da, send_amt));
-        BEAST_EXPECT(equal(sa, ETH(1'000'000)));
-        BEAST_EXPECT(same(st, stpath(IPE(xrpIssue()))));
+            findPathsByElement(env, a1, a2, sendAmt, std::nullopt, ipe(MPT(eth)));
+        BEAST_EXPECT(equal(da, sendAmt));
+        BEAST_EXPECT(equal(sa, eth(1'000'000)));
+        BEAST_EXPECT(same(st, stpath(ipe(xrpIssue()))));
     }
 
     void
-    path_find_06()
+    pathFind06()
     {
         testcase("Path Find: non-XRP -> non-XRP, same issuanceID");
         using namespace jtx;
         {
             Env env = pathTestEnv();
-            Account A1{"A1"};
-            Account A2{"A2"};
-            Account const A3{"A3"};
-            Account const G1{"G1"};
-            Account const G2{"G2"};
-            Account M1{"M1"};
+            Account a1{"A1"};
+            Account a2{"A2"};
+            Account const a3{"A3"};
+            Account const g1{"G1"};
+            Account const g2{"G2"};
+            Account m1{"M1"};
 
-            env.fund(XRP(11'000), M1);
-            env.fund(XRP(1'000), A1, A2, A3, G1, G2);
+            env.fund(XRP(11'000), m1);
+            env.fund(XRP(1'000), a1, a2, a3, g1, g2);
             env.close();
 
-            MPTTester const HKD_G1(
+            MPTTester const hkdG1(
                 {.env = env,
-                 .issuer = G1,
-                 .holders = {A1, M1},
+                 .issuer = g1,
+                 .holders = {a1, m1},
                  .pay = 5'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const HKD_G2(
+            MPTTester const hkdG2(
                 {.env = env,
-                 .issuer = G2,
-                 .holders = {A2, M1},
+                 .issuer = g2,
+                 .holders = {a2, m1},
                  .pay = 5'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammM1(env, M1, HKD_G1(1'000'000'000), HKD_G2(1'010'000'000));
+            AMM const ammM1(env, m1, hkdG1(1'000'000'000), hkdG2(1'010'000'000));
 
-            auto const& send_amt = HKD_G2(10'000'000);
+            auto const& sendAmt = hkdG2(10'000'000);
             STPathSet st;
             STAmount sa, da;
-            std::tie(st, sa, da) = jtx::find_paths(
-                env,
-                G1,
-                A2,
-                send_amt,
-                std::nullopt,
-                HKD_G1.issuanceID(),
-                std::nullopt,
-                std::nullopt);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, HKD_G1(10'000'000)));
-            BEAST_EXPECT(same(st, stpath(IPE(MPT(HKD_G2)))));
+            std::tie(st, sa, da) = jtx::findPaths(
+                env, g1, a2, sendAmt, std::nullopt, hkdG1.issuanceID(), std::nullopt, std::nullopt);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, hkdG1(10'000'000)));
+            BEAST_EXPECT(same(st, stpath(ipe(MPT(hkdG2)))));
         }
     }
 
@@ -1517,22 +1513,28 @@ private:
         using namespace jtx;
 
         Env env(*this, features);
-        env.memoize(bob);
+        env.memoize(bob_);
 
-        env.fund(XRP(10'000), alice, gw);
-        fund(env, gw, {carol}, XRP(10'000), {}, Fund::Acct);
-        auto const AMMXRPPool = env.current()->fees().increment * 2;
-        env.fund(reserve(env, 5) + ammCrtFee(env) + AMMXRPPool, bob);
+        env.fund(XRP(10'000), alice_, gw_);
+        fund(env, gw_, {carol_}, XRP(10'000), {}, Fund::Acct);
+        auto const ammxrpPool = env.current()->fees().increment * 2;
+        env.fund(reserve(env, 5) + ammCrtFee(env) + ammxrpPool, bob_);
         env.close();
 
-        MPTTester const ETH(
-            {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+        MPTTester const eth(
+            {.env = env,
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
+             .flags = kMPT_DEX_FLAGS});
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+        MPTTester const btc(
+            {.env = env,
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
+             .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, alice, ETH(50'000)));
-        env(pay(gw, bob, BTC(150'000)));
+        env(pay(gw_, alice_, eth(50'000)));
+        env(pay(gw_, bob_, btc(150'000)));
 
         // Bob has _just_ slightly less than 50 xrp available
         // If his owner count changes, he will have more liquidity.
@@ -1541,16 +1543,16 @@ private:
         // recursive calls to the ETH/XRP offer. The second call will return
         // tecPATH_DRY, but the entire path should not be marked as dry.
         // This is the second error case to test (when flowV1 is used).
-        env(offer(bob, ETH(50'000), XRP(50)));
-        AMM const ammBob(env, bob, AMMXRPPool, BTC(150'000));
+        env(offer(bob_, eth(50'000), XRP(50)));
+        AMM const ammBob(env, bob_, ammxrpPool, btc(150'000));
 
-        env(pay(alice, carol, BTC(1'000'000'000)),
-            path(~XRP, ~MPT(BTC)),
-            sendmax(ETH(500'000)),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(alice_, carol_, btc(1'000'000'000)),
+            Path(~XRP, ~MPT(btc)),
+            Sendmax(eth(500'000)),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
-        auto const carolBTC = env.balance(carol, MPT(BTC));
-        BEAST_EXPECT(carolBTC > BTC(0) && carolBTC < BTC(50'000));
+        auto const carolBTC = env.balance(carol_, MPT(btc));
+        BEAST_EXPECT(carolBTC > btc(0) && carolBTC < btc(50'000));
     }
 
     void
@@ -1564,36 +1566,36 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 100'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 100'000'000});
-                env(pay(gw, alice, BTC(500000)));
-                env(pay(gw, bob, BTC(500000)));
-                env(pay(gw, carol, BTC(500000)));
-                env(pay(gw, alice, ETH(500000)));
-                env(pay(gw, bob, ETH(500000)));
-                env(pay(gw, carol, ETH(500000)));
+                env(pay(gw_, alice_, btc(500000)));
+                env(pay(gw_, bob_, btc(500000)));
+                env(pay(gw_, carol_, btc(500000)));
+                env(pay(gw_, alice_, eth(500000)));
+                env(pay(gw_, bob_, eth(500000)));
+                env(pay(gw_, carol_, eth(500000)));
                 env.close();
-                AMM const ammBob(env, bob, BTC(100'000), ETH(150'000));
+                AMM const ammBob(env, bob_, btc(100'000), eth(150'000));
 
-                env(pay(alice, carol, ETH(50'000)), path(~ETH), sendmax(BTC(50'000)));
+                env(pay(alice_, carol_, eth(50'000)), Path(~eth), Sendmax(btc(50'000)));
 
-                env.require(balance(alice, BTC(450'000)));
-                env.require(balance(bob, BTC(400'000)));
-                env.require(balance(bob, ETH(350'000)));
-                env.require(balance(carol, ETH(550'000)));
-                BEAST_EXPECT(ammBob.expectBalances(BTC(150'000), ETH(100'000), ammBob.tokens()));
+                env.require(Balance(alice_, btc(450'000)));
+                env.require(Balance(bob_, btc(400'000)));
+                env.require(Balance(bob_, eth(350'000)));
+                env.require(Balance(carol_, eth(550'000)));
+                BEAST_EXPECT(ammBob.expectBalances(btc(150'000), eth(100'000), ammBob.tokens()));
             };
             testHelper2TokensMix(test);
         }
@@ -1601,136 +1603,136 @@ private:
         {
             // simple MPT/XRP XRP/MPT offer
             Env env(*this, features);
-            env.fund(XRP(10'000), gw, alice, bob, carol);
+            env.fund(XRP(10'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 150'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBobBTC_XRP(env, bob, BTC(100'000), XRP(150));
-            AMM const ammBobXRP_ETH(env, bob, XRP(100), ETH(150'000));
+            AMM const ammBobBtcXrp(env, bob_, btc(100'000), XRP(150));
+            AMM const ammBobXrpEth(env, bob_, XRP(100), eth(150'000));
 
-            env(pay(alice, carol, ETH(50'000)), path(~XRP, ~MPT(ETH)), sendmax(BTC(50'000)));
+            env(pay(alice_, carol_, eth(50'000)), Path(~XRP, ~MPT(eth)), Sendmax(btc(50'000)));
 
-            env.require(balance(alice, BTC(50'000)));
-            env.require(balance(bob, BTC(0)));
-            env.require(balance(bob, ETH(0)));
-            env.require(balance(carol, ETH(200'000)));
+            env.require(Balance(alice_, btc(50'000)));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Balance(bob_, eth(0)));
+            env.require(Balance(carol_, eth(200'000)));
             BEAST_EXPECT(
-                ammBobBTC_XRP.expectBalances(BTC(150'000), XRP(100), ammBobBTC_XRP.tokens()));
+                ammBobBtcXrp.expectBalances(btc(150'000), XRP(100), ammBobBtcXrp.tokens()));
             BEAST_EXPECT(
-                ammBobXRP_ETH.expectBalances(XRP(150), ETH(100'000), ammBobXRP_ETH.tokens()));
+                ammBobXrpEth.expectBalances(XRP(150), eth(100'000), ammBobXrpEth.tokens()));
         }
         {
             // simple XRP -> MPT through offer and sendmax
             Env env(*this, features);
             XRPAmount const baseFee{env.current()->fees().base};
-            env.fund(XRP(10'000), gw, alice, bob, carol);
+            env.fund(XRP(10'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 150'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBob(env, bob, XRP(100), ETH(150'000));
+            AMM const ammBob(env, bob_, XRP(100), eth(150'000));
 
-            env(pay(alice, carol, ETH(50'000)), path(~MPT(ETH)), sendmax(XRP(50)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, alice, XRP(10'000) - XRP(50) - 2 * baseFee));
-            BEAST_EXPECT(
-                expectLedgerEntryRoot(env, bob, XRP(10'000) - XRP(100) - ammCrtFee(env) - baseFee));
-            env.require(balance(bob, ETH(0)));
-            env.require(balance(carol, ETH(200'000)));
-            BEAST_EXPECT(ammBob.expectBalances(XRP(150), ETH(100'000), ammBob.tokens()));
+            env(pay(alice_, carol_, eth(50'000)), Path(~MPT(eth)), Sendmax(XRP(50)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, alice_, XRP(10'000) - XRP(50) - 2 * baseFee));
+            BEAST_EXPECT(expectLedgerEntryRoot(
+                env, bob_, XRP(10'000) - XRP(100) - ammCrtFee(env) - baseFee));
+            env.require(Balance(bob_, eth(0)));
+            env.require(Balance(carol_, eth(200'000)));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(150), eth(100'000), ammBob.tokens()));
         }
         {
             // simple MPT -> XRP through offer and sendmax
             Env env(*this, features);
             XRPAmount const baseFee{env.current()->fees().base};
-            env.fund(XRP(10'000), gw, alice, bob, carol);
+            env.fund(XRP(10'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBob(env, bob, ETH(100'000), XRP(150));
+            AMM const ammBob(env, bob_, eth(100'000), XRP(150));
 
-            env(pay(alice, carol, XRP(50)), path(~XRP), sendmax(ETH(50'000)));
+            env(pay(alice_, carol_, XRP(50)), Path(~XRP), Sendmax(eth(50'000)));
 
-            env.require(balance(alice, ETH(50'000)));
-            BEAST_EXPECT(
-                expectLedgerEntryRoot(env, bob, XRP(10'000) - XRP(150) - ammCrtFee(env) - baseFee));
-            env.require(balance(bob, ETH(0)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRP(10'000 + 50) - baseFee));
-            BEAST_EXPECT(ammBob.expectBalances(ETH(150'000), XRP(100), ammBob.tokens()));
+            env.require(Balance(alice_, eth(50'000)));
+            BEAST_EXPECT(expectLedgerEntryRoot(
+                env, bob_, XRP(10'000) - XRP(150) - ammCrtFee(env) - baseFee));
+            env.require(Balance(bob_, eth(0)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, carol_, XRP(10'000 + 50) - baseFee));
+            BEAST_EXPECT(ammBob.expectBalances(eth(150'000), XRP(100), ammBob.tokens()));
         }
 
         // test unfunded offers are removed when payment succeeds
         {
             auto test = [&](auto&& issue1, auto&& issue2, auto&& issue3) {
                 Env env(*this, features);
-                env.fund(XRP(10'000), alice, bob, carol, gw);
+                env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const BTC = issue1(
+                auto const btc = issue1(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1000'000000});
-                auto const ETH = issue2(
+                auto const eth = issue2(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1000'000000});
-                auto const GBP = issue3(
+                auto const gbp = issue3(
                     {.env = env,
                      .token = "GBP",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1000'000000});
 
-                env(pay(gw, alice, BTC(60'000)));
-                env(pay(gw, bob, ETH(200'000)));
-                env(pay(gw, bob, GBP(150'000)));
-                env(offer(bob, BTC(50'000), ETH(50'000)));
-                env(offer(bob, BTC(40'000), GBP(50'000)));
+                env(pay(gw_, alice_, btc(60'000)));
+                env(pay(gw_, bob_, eth(200'000)));
+                env(pay(gw_, bob_, gbp(150'000)));
+                env(offer(bob_, btc(50'000), eth(50'000)));
+                env(offer(bob_, btc(40'000), gbp(50'000)));
                 env.close();
-                AMM const ammBob(env, bob, GBP(100'000), ETH(150'000));
+                AMM const ammBob(env, bob_, gbp(100'000), eth(150'000));
 
                 // unfund offer
-                env(pay(bob, gw, GBP(50'000)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(50'000), ETH(50'000)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(40'000), GBP(50'000)));
-                env(pay(alice, carol, ETH(50'000)),
-                    path(~ETH),
-                    path(~GBP, ~ETH),
-                    sendmax(BTC(60'000)));
-                env.require(balance(alice, BTC(10'000)));
-                env.require(balance(bob, BTC(50'000)));
-                env.require(balance(bob, ETH(0)));
-                env.require(balance(bob, GBP(0)));
-                env.require(balance(carol, ETH(50'000)));
+                env(pay(bob_, gw_, gbp(50'000)));
+                BEAST_EXPECT(isOffer(env, bob_, btc(50'000), eth(50'000)));
+                BEAST_EXPECT(isOffer(env, bob_, btc(40'000), gbp(50'000)));
+                env(pay(alice_, carol_, eth(50'000)),
+                    Path(~eth),
+                    Path(~gbp, ~eth),
+                    Sendmax(btc(60'000)));
+                env.require(Balance(alice_, btc(10'000)));
+                env.require(Balance(bob_, btc(50'000)));
+                env.require(Balance(bob_, eth(0)));
+                env.require(Balance(bob_, gbp(0)));
+                env.require(Balance(carol_, eth(50'000)));
                 // used in the payment
-                BEAST_EXPECT(!isOffer(env, bob, BTC(50'000), ETH(50'000)));
+                BEAST_EXPECT(!isOffer(env, bob_, btc(50'000), eth(50'000)));
                 // found unfunded
-                BEAST_EXPECT(!isOffer(env, bob, BTC(40'000), GBP(50'000)));
+                BEAST_EXPECT(!isOffer(env, bob_, btc(40'000), gbp(50'000)));
                 // unchanged
-                BEAST_EXPECT(ammBob.expectBalances(GBP(100'000), ETH(150'000), ammBob.tokens()));
+                BEAST_EXPECT(ammBob.expectBalances(gbp(100'000), eth(150'000), ammBob.tokens()));
             };
             testHelper3TokensMix(test);
         }
@@ -1747,74 +1749,83 @@ private:
             // that removes unfunded offers when the payment succeeds.
             Env env(*this, features);
 
-            env.fund(XRP(10'000), bob, carol, gw);
+            env.fund(XRP(10'000), bob_, carol_, gw_);
             env.close();
             // Sets rippling on, this is different from
             // the original test
-            fund(env, gw, {alice}, XRP(10'000), {}, Fund::Acct);
+            fund(env, gw_, {alice_}, XRP(10'000), {}, Fund::Acct);
 
-            MPTTester BTC(
-                {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+            MPTTester btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester ETH(
-                {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+            MPTTester eth(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester GBP(
-                {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+            MPTTester gbp(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, alice, BTC(60'000'000)));
-            env(pay(gw, bob, BTC(100'000'000)));
-            env(pay(gw, bob, ETH(100'000'000)));
-            env(pay(gw, bob, GBP(50'000'000)));
-            env(pay(gw, carol, GBP(1'000'000)));
+            env(pay(gw_, alice_, btc(60'000'000)));
+            env(pay(gw_, bob_, btc(100'000'000)));
+            env(pay(gw_, bob_, eth(100'000'000)));
+            env(pay(gw_, bob_, gbp(50'000'000)));
+            env(pay(gw_, carol_, gbp(1'000'000)));
             env.close();
 
             // This is multiplath, which generates limited # of offers
-            AMM const ammBobBTC_ETH(env, bob, BTC(50'000'000), ETH(50'000'000));
-            env(offer(bob, BTC(60'000'000), GBP(50'000'000)));
-            env(offer(carol, BTC(1'000'000'000), GBP(1'000'000)));
-            env(offer(bob, GBP(50'000'000), ETH(50'000'000)));
+            AMM const ammBobBtcEth(env, bob_, btc(50'000'000), eth(50'000'000));
+            env(offer(bob_, btc(60'000'000), gbp(50'000'000)));
+            env(offer(carol_, btc(1'000'000'000), gbp(1'000'000)));
+            env(offer(bob_, gbp(50'000'000), eth(50'000'000)));
 
             // unfund offer
-            env(pay(bob, gw, GBP(50'000'000)));
-            BEAST_EXPECT(ammBobBTC_ETH.expectBalances(
-                BTC(50'000'000), ETH(50'000'000), ammBobBTC_ETH.tokens()));
-            BEAST_EXPECT(isOffer(env, bob, BTC(60'000'000), GBP(50'000'000)));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1'000'000'000), GBP(1'000'000)));
-            BEAST_EXPECT(isOffer(env, bob, GBP(50'000'000), ETH(50'000'000)));
+            env(pay(bob_, gw_, gbp(50'000'000)));
+            BEAST_EXPECT(ammBobBtcEth.expectBalances(
+                btc(50'000'000), eth(50'000'000), ammBobBtcEth.tokens()));
+            BEAST_EXPECT(isOffer(env, bob_, btc(60'000'000), gbp(50'000'000)));
+            BEAST_EXPECT(isOffer(env, carol_, btc(1'000'000'000), gbp(1'000'000)));
+            BEAST_EXPECT(isOffer(env, bob_, gbp(50'000'000), eth(50'000'000)));
 
             auto flowJournal = env.app().getLogs().journal("Flow");
             auto const flowResult = [&] {
-                STAmount const deliver(ETH(51'000'000));
-                STAmount smax(BTC(61'000'000));
-                PaymentSandbox sb(env.current().get(), tapNONE);
+                STAmount const deliver(eth(51'000'000));
+                STAmount smax(btc(61'000'000));
+                PaymentSandbox sb(env.current().get(), TapNone);
                 STPathSet paths;
-                auto IPE = [](MPTTester const& iss) {
+                auto ipe = [](MPTTester const& iss) {
                     return STPathElement(
-                        STPathElement::typeMPT | STPathElement::typeIssuer,
+                        STPathElement::TypeMpt | STPathElement::TypeIssuer,
                         xrpAccount(),
                         PathAsset{iss.issuanceID()},
                         iss.issuer());
                 };
                 {
                     // BTC -> ETH
-                    STPath const p1({IPE(ETH)});
-                    paths.push_back(p1);
+                    STPath const p1({ipe(eth)});
+                    paths.pushBack(p1);
                     // BTC -> GBP -> ETH
-                    STPath const p2({IPE(GBP), IPE(ETH)});
-                    paths.push_back(p2);
+                    STPath const p2({ipe(gbp), ipe(eth)});
+                    paths.pushBack(p2);
                 }
 
                 return flow(
                     sb,
                     deliver,
-                    alice,
-                    carol,
+                    alice_,
+                    carol_,
                     paths,
                     false,
                     false,
                     true,
-                    OfferCrossing::no,
+                    OfferCrossing::No,
                     std::nullopt,
                     smax,
                     std::nullopt,
@@ -1825,7 +1836,7 @@ private:
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
                 if (flowResult.removableOffers.empty())
                     return false;
-                Sandbox sb(&view, tapNONE);
+                Sandbox sb(&view, TapNone);
                 for (auto const& o : flowResult.removableOffers)
                 {
                     if (auto ok = sb.peek(keylet::offer(o)))
@@ -1838,11 +1849,11 @@ private:
             });
 
             // used in payment, but since payment failed should be untouched
-            BEAST_EXPECT(ammBobBTC_ETH.expectBalances(
-                BTC(50'000'000), ETH(50'000'000), ammBobBTC_ETH.tokens()));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1'000'000'000), GBP(1'000'000)));
+            BEAST_EXPECT(ammBobBtcEth.expectBalances(
+                btc(50'000'000), eth(50'000'000), ammBobBtcEth.tokens()));
+            BEAST_EXPECT(isOffer(env, carol_, btc(1'000'000'000), gbp(1'000'000)));
             // found unfunded
-            BEAST_EXPECT(!isOffer(env, bob, BTC(60'000'000), GBP(50'000'000)));
+            BEAST_EXPECT(!isOffer(env, bob_, btc(60'000'000), gbp(50'000'000)));
         }
         {
             // Do not produce more in the forward pass than the reverse pass
@@ -1855,36 +1866,36 @@ private:
 
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 10'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 10'000'000});
 
-                env(pay(gw, alice, ETH(1'000'000)));
-                env(pay(gw, bob, BTC(1'000'000)));
-                env(pay(gw, bob, ETH(1'000'000)));
+                env(pay(gw_, alice_, eth(1'000'000)));
+                env(pay(gw_, bob_, btc(1'000'000)));
+                env(pay(gw_, bob_, eth(1'000'000)));
                 env.close();
 
-                AMM const ammBob(env, bob, ETH(8'000), XRPAmount{21});
-                env(offer(bob, drops(1), BTC(1'000'000)), txflags(tfPassive));
+                AMM const ammBob(env, bob_, eth(8'000), XRPAmount{21});
+                env(offer(bob_, drops(1), btc(1'000'000)), Txflags(tfPassive));
 
-                env(pay(alice, carol, BTC(1'000)),
-                    path(~XRP, ~BTC),
-                    sendmax(ETH(400)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(alice_, carol_, btc(1'000)),
+                    Path(~XRP, ~btc),
+                    Sendmax(eth(400)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
 
-                env.require(balance(carol, BTC(1'000)));
-                BEAST_EXPECT(ammBob.expectBalances(ETH(8400), XRPAmount{20}, ammBob.tokens()));
+                env.require(Balance(carol_, btc(1'000)));
+                BEAST_EXPECT(ammBob.expectBalances(eth(8400), XRPAmount{20}, ammBob.tokens()));
             };
             testHelper2TokensMix(test);
         }
@@ -1899,280 +1910,280 @@ private:
         {
             // payment via AMM
             Env env(*this, features);
-            env.fund(XRP(1'000), gw, alice, bob, carol);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const amm(env, bob, GBP(1'000'000'000'000'000), BTC(1'000'000'000'000'000));
+            AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'000'000'000'000'000));
 
-            env(pay(alice, carol, BTC(100'000'000'000'000)),
-                path(~MPT(BTC)),
-                sendmax(GBP(150'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, btc(100'000'000'000'000)),
+                Path(~MPT(btc)),
+                Sendmax(gbp(150'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
             // alice buys 107.1428e12BTC with 120e12GBP and pays 25% tr fee on
             // 120e12GBP 1,000e12 - 120e12*1.25 = 850e12GBP
-            env.require(balance(alice, GBP(850'000'000'000'000)));
+            env.require(Balance(alice_, gbp(850'000'000'000'000)));
 
             BEAST_EXPECT(amm.expectBalances(
-                GBP(1'120'000'000'000'000), BTC(892'857'142'857'143), amm.tokens()));
+                gbp(1'120'000'000'000'000), btc(892'857'142'857'143), amm.tokens()));
 
             // 25% of 85.7142e12BTC is paid in tr fee
             // 85.7142e12*1.25 = 107.1428e12BTC
-            env.require(balance(carol, BTC(1'085'714'285'714'285)));
+            env.require(Balance(carol_, btc(1'085'714'285'714'285)));
         }
         {
             // Payment via offer and AMM
             Env env(*this, features);
             Account const ed("ed");
 
-            env.fund(XRP(1'000), gw, alice, bob, carol, ed);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_, ed);
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(ed, GBP(1'000'000'000'000'000), ETH(1'000'000'000'000'000)),
-                txflags(tfPassive));
+            env(offer(ed, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000)),
+                Txflags(tfPassive));
             env.close();
 
-            AMM const amm(env, bob, ETH(1'000'000'000'000'000), BTC(1'000'000'000'000'000));
+            AMM const amm(env, bob_, eth(1'000'000'000'000'000), btc(1'000'000'000'000'000));
 
-            env(pay(alice, carol, BTC(100'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(150'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, btc(100'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(150'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
             // alice buys 120e12ETH with 120e12GBP via the offer
             // and pays 25% tr fee on 120e12GBP
             // 1,000e12 - 120e12*1.25 = 850e12GBP
-            env.require(balance(alice, GBP(850'000'000'000'000)));
+            env.require(Balance(alice_, gbp(850'000'000'000'000)));
             // consumed offer is 120e12GBP/120e12ETH
             // ed doesn't pay tr fee
-            env.require(balance(ed, ETH(880'000'000'000'000)));
-            env.require(balance(ed, GBP(1'120'000'000'000'000)));
+            env.require(Balance(ed, eth(880'000'000'000'000)));
+            env.require(Balance(ed, gbp(1'120'000'000'000'000)));
             BEAST_EXPECT(expectOffers(
-                env, ed, 1, {Amounts{GBP(880'000'000'000'000), ETH(880'000'000'000'000)}}));
+                env, ed, 1, {Amounts{gbp(880'000'000'000'000), eth(880'000'000'000'000)}}));
             // 25% on 96e12ETH is paid in tr fee 96e12*1.25 = 120e12ETH
             // 96e12ETH is swapped in for 87.5912e12BTC
             BEAST_EXPECT(amm.expectBalances(
-                ETH(1'096'000'000'000'000), BTC(912'408'759'124'088), amm.tokens()));
+                eth(1'096'000'000'000'000), btc(912'408'759'124'088), amm.tokens()));
             // 25% on 70.0729e12BTC is paid in tr fee 70.0729e12*1.25
             // = 87.5912e12BTC
-            env.require(balance(carol, BTC(1'070'072'992'700'729)));
+            env.require(Balance(carol_, btc(1'070'072'992'700'729)));
         }
         {
             // Payment via AMM, AMM
             Env env(*this, features);
             Account const ed("ed");
 
-            env.fund(XRP(1'000), gw, alice, bob, carol, ed);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_, ed);
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            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));
+            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));
 
-            env(pay(alice, carol, BTC(100'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(150'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, btc(100'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(150'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
-            env.require(balance(alice, GBP(850'000'000'000'000)));
+            env.require(Balance(alice_, gbp(850'000'000'000'000)));
 
             // alice buys 107.1428e12ETH with 120e12GBP and pays 25% tr fee on
             // 120e12GBP 1,000e12 - 120e12*1.25 = 850e12GBP 120e12GBP is swapped
             // in for 107.1428e12ETH
             BEAST_EXPECT(amm1.expectBalances(
-                GBP(1'120'000'000'000'000), ETH(892'857'142'857'143), amm1.tokens()));
+                gbp(1'120'000'000'000'000), eth(892'857'142'857'143), amm1.tokens()));
             // 25% on 85.7142e12ETH is paid in tr fee 85.7142e12*1.25 =
             // 107.1428e12ETH 85.7142e12ETH is swapped in for 78.9473e12BTC
             BEAST_EXPECT(amm2.expectBalances(
-                ETH(1'085'714'285'714'285), BTC(921'052'631'578'948), amm2.tokens()));
+                eth(1'085'714'285'714'285), btc(921'052'631'578'948), amm2.tokens()));
 
             // 25% on 63.1578e12BTC is paid in tr fee 63.1578e12*1.25
             // = 78.9473e12BTC
-            env.require(balance(carol, BTC(1'063'157'894'736'841)));
+            env.require(Balance(carol_, btc(1'063'157'894'736'841)));
         }
         {
             // AMM offer crossing
             Env env(*this, features);
 
-            env.fund(XRP(1'000), gw, alice, bob);
+            env.fund(XRP(1'000), gw_, alice_, bob_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .transferFee = 25'000,
                  .pay = 1'100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .transferFee = 25'000,
                  .pay = 1'100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const amm(env, bob, BTC(1'000'000), ETH(1'100'000));
-            env(offer(alice, ETH(100'000), BTC(100'000)));
+            AMM const amm(env, bob_, btc(1'000'000), eth(1'100'000));
+            env(offer(alice_, eth(100'000), btc(100'000)));
             env.close();
 
             // 100e3BTC is swapped in for 100e3ETH
-            BEAST_EXPECT(amm.expectBalances(BTC(1'100'000), ETH(1'000'000), amm.tokens()));
+            BEAST_EXPECT(amm.expectBalances(btc(1'100'000), eth(1'000'000), amm.tokens()));
             // alice pays 25% tr fee on 100e3BTC 1100e3-100e3*1.25 = 975e3BTC
-            env.require(balance(alice, BTC(975'000)));
-            env.require(balance(alice, ETH(1'200'000)));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+            env.require(Balance(alice_, btc(975'000)));
+            env.require(Balance(alice_, eth(1'200'000)));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
         {
             // Payment via AMM with limit quality
             Env env(*this, features);
 
-            env.fund(XRP(1'000), gw, alice, bob, carol);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const amm(env, bob, GBP(1'000'000'000'000'000), BTC(1'000'000'000'000'000));
+            AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'000'000'000'000'000));
 
             // requested quality limit is 100e12BTC/178.58e12GBP = 0.55997
             // trade quality is 100e12BTC/178.5714 = 0.55999e12
-            env(pay(alice, carol, BTC(100'000'000'000'000)),
-                path(~MPT(BTC)),
-                sendmax(GBP(178'580'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, btc(100'000'000'000'000)),
+                Path(~MPT(btc)),
+                Sendmax(gbp(178'580'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // alice buys 125e12BTC with 142.8571e12GBP and pays 25% tr fee
             // on 142.8571e12GBP
             // 1,000e12 - 142.8571e12*1.25 = 821.4285e12GBP
-            env.require(balance(alice, GBP(821'428'571'428'571)));
+            env.require(Balance(alice_, gbp(821'428'571'428'571)));
             // 142.8571e12GBP is swapped in for 125e12BTC
             BEAST_EXPECT(amm.expectBalances(
-                GBP(1'142'857'142'857'143), BTC(875'000'000'000'000), amm.tokens()));
+                gbp(1'142'857'142'857'143), btc(875'000'000'000'000), amm.tokens()));
             // 25% on 100e12BTC is paid in tr fee
             // 100e12*1.25 = 125e12BTC
-            env.require(balance(carol, BTC(1'100'000'000'000'000)));
+            env.require(Balance(carol_, btc(1'100'000'000'000'000)));
         }
         {
             // Payment via AMM with limit quality, deliver less
             // than requested
             Env env(*this, features);
 
-            env.fund(XRP(1'000), gw, alice, bob, carol);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'200'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'200'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const amm(env, bob, GBP(1'000'000'000'000'000), BTC(1'200'000'000'000'000));
+            AMM const amm(env, bob_, gbp(1'000'000'000'000'000), btc(1'200'000'000'000'000));
 
             // requested quality limit is 90e12BTC/120e12GBP = 0.75
             // trade quality is 22.5e12BTC/30e12GBP = 0.75
-            env(pay(alice, carol, BTC(90'000'000'000'000)),
-                path(~MPT(BTC)),
-                sendmax(GBP(120'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, btc(90'000'000'000'000)),
+                Path(~MPT(btc)),
+                Sendmax(gbp(120'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // alice buys 28.125e12BTC with 24e12GBP and pays 25% tr fee
             // on 24e12GBP
             // 1,200e12 - 24e12*1.25 =~ 1,170e12GBP
-            env.require(balance(alice, GBP(1'170'000'000'000'000)));
+            env.require(Balance(alice_, gbp(1'170'000'000'000'000)));
             // 24e12GBP is swapped in for 28.125e12BTC
             BEAST_EXPECT(amm.expectBalances(
-                GBP(1'024'000'000'000'000), BTC(1'171'875'000'000'000), amm.tokens()));
+                gbp(1'024'000'000'000'000), btc(1'171'875'000'000'000), amm.tokens()));
 
             // 25% on 22.5e12BTC is paid in tr fee
             // 22.5*1.25 = 28.125e12BTC
-            env.require(balance(carol, BTC(1'222'500'000'000'000)));
+            env.require(Balance(carol_, btc(1'222'500'000'000'000)));
         }
         {
             // Payment via offer and AMM with limit quality, deliver less
@@ -2180,65 +2191,65 @@ private:
             Env env(*this, features);
             Account const ed("ed");
 
-            env.fund(XRP(1'000), gw, alice, bob, carol, ed);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_, ed);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(ed, GBP(1'000'000'000'000'000), ETH(1'000'000'000'000'000)),
-                txflags(tfPassive));
+            env(offer(ed, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000)),
+                Txflags(tfPassive));
             env.close();
 
-            AMM const amm(env, bob, ETH(1'000'000'000'000'000), BTC(1'400'000'000'000'000));
+            AMM const amm(env, bob_, eth(1'000'000'000'000'000), btc(1'400'000'000'000'000));
 
             // requested quality limit is 95e12BTC/140e12GBP = 0.6785
             // trade quality is 59.7321e12BTC/88.0262e12GBP = 0.6785
-            env(pay(alice, carol, BTC(95'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(140'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, btc(95'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(140'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // alice buys 70.4210e12ETH with 70.4210e12GBP via the offer
             // and pays 25% tr fee on 70.4210e12GBP
             // 1,400e12 - 70.4210e12*1.25 = 1400e12 - 88.0262e12 =
             // 1311.9736e12GBP
-            env.require(balance(alice, GBP(1'311'973'684'210'525)));
+            env.require(Balance(alice_, gbp(1'311'973'684'210'525)));
             // ed doesn't pay tr fee, the balances reflect consumed offer
             // 70.4210e12GBP/70.4210e12ETH
-            env.require(balance(ed, ETH(1'329'578'947'368'420)));
-            env.require(balance(ed, GBP(1'470'421'052'631'580)));
+            env.require(Balance(ed, eth(1'329'578'947'368'420)));
+            env.require(Balance(ed, gbp(1'470'421'052'631'580)));
             BEAST_EXPECT(expectOffers(
-                env, ed, 1, {Amounts{GBP(929'578'947'368'420), ETH(929'578'947'368'420)}}));
+                env, ed, 1, {Amounts{gbp(929'578'947'368'420), eth(929'578'947'368'420)}}));
             // 25% on 56.3368e12ETH is paid in tr fee 56.3368e12*1.25
             // = 70.4210e12ETH 56.3368e12ETH is swapped in for 74.6651e12BTC
             BEAST_EXPECT(amm.expectBalances(
-                ETH(1'056'336'842'105'264), BTC(1'325'334'821'428'571), amm.tokens()));
+                eth(1'056'336'842'105'264), btc(1'325'334'821'428'571), amm.tokens()));
 
             // 25% on 59.7321e12BTC is paid in tr fee 59.7321e12*1.25
             // = 74.6651e12BTC
-            env.require(balance(carol, BTC(1'459'732'142'857'143)));
+            env.require(Balance(carol_, btc(1'459'732'142'857'143)));
         }
         {
             // Payment via AMM and offer with limit quality, deliver less
@@ -2246,66 +2257,66 @@ private:
             Env env(*this, features);
             Account const ed("ed");
 
-            env.fund(XRP(1'000), gw, alice, bob, carol, ed);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_, ed);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const amm(env, bob, GBP(1'000'000'000'000'000), ETH(1'000'000'000'000'000));
+            AMM const amm(env, bob_, gbp(1'000'000'000'000'000), eth(1'000'000'000'000'000));
 
-            env(offer(ed, ETH(1'000'000'000'000'000), BTC(1'400'000'000'000'000)),
-                txflags(tfPassive));
+            env(offer(ed, eth(1'000'000'000'000'000), btc(1'400'000'000'000'000)),
+                Txflags(tfPassive));
             env.close();
 
             // requested quality limit is 95e12BTC/140e12GBP = 0.6785
             // trade quality is 47.7857e12BTC/70.4210e12GBP = 0.6785
-            env(pay(alice, carol, BTC(95'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(140'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, btc(95'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(140'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // alice buys 53.3322e12ETH with 56.3368e12GBP via the amm
             // and pays 25% tr fee on 56.3368e12GBP
             // 1,400e12 - 56.3368e12*1.25 = 1400e12 - 70.4210e12 =
             // 1329.5789e12GBP
-            env.require(balance(alice, GBP(1'329'578'947'368'420)));
+            env.require(Balance(alice_, gbp(1'329'578'947'368'420)));
             //// 25% on 56.3368e12ETH is paid in tr fee 56.3368e12*1.25
             ///= 70.4210e12ETH
             // 56.3368e12GBP is swapped in for 53.3322e12ETH
             BEAST_EXPECT(amm.expectBalances(
-                GBP(1'056'336'842'105'264), ETH(946'667'729'591'836), amm.tokens()));
+                gbp(1'056'336'842'105'264), eth(946'667'729'591'836), amm.tokens()));
 
             // 25% on 42.6658e12ETH is paid in tr fee 42.6658e12*1.25
             // = 53.3322e12ETH 42.6658e12ETH/59.7321e12BTC
-            env.require(balance(ed, BTC(1'340'267'857'142'857)));
-            env.require(balance(ed, ETH(1'442'665'816'326'531)));
+            env.require(Balance(ed, btc(1'340'267'857'142'857)));
+            env.require(Balance(ed, eth(1'442'665'816'326'531)));
             BEAST_EXPECT(expectOffers(
-                env, ed, 1, {Amounts{ETH(957'334'183'673'469), BTC(1'340'267'857'142'857)}}));
+                env, ed, 1, {Amounts{eth(957'334'183'673'469), btc(1'340'267'857'142'857)}}));
             // 25% on 47.7857e12BTC is paid in tr fee 47.7857e12*1.25
             // = 59.7321e12BTC
-            env.require(balance(carol, BTC(1'447'785714285714)));
+            env.require(Balance(carol_, btc(1'447'785714285714)));
         }
         {
             // Payment via AMM, AMM  with limit quality, deliver less
@@ -2313,113 +2324,113 @@ private:
             Env env(*this, features);
             Account const ed("ed");
 
-            env.fund(XRP(1'000), gw, alice, bob, carol, ed);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_, ed);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            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));
+            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));
 
             // requested quality limit is 90e12BTC/145e12GBP = 0.6206
             // trade quality is 66.7432e12BTC/107.5308e12GBP = 0.6206
-            env(pay(alice, carol, BTC(90'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(145'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, btc(90'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(145'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // alice buys 53.3322e12ETH with 107.5308e12GBP
             // 25% on 86.0246e12GBP is paid in tr fee
             // 1,400e12 - 86.0246e12*1.25 = 1400e12 - 107.5308e12 =
             // 1229.4691e12GBP
-            env.require(balance(alice, GBP(1'292'469'135'802'465)));
+            env.require(Balance(alice_, gbp(1'292'469'135'802'465)));
             // 86.0246e12GBP is swapped in for 79.2106e12ETH
             BEAST_EXPECT(amm1.expectBalances(
-                GBP(1'086'024'691'358'028), ETH(920'789'377'955'618), amm1.tokens()));
+                gbp(1'086'024'691'358'028), eth(920'789'377'955'618), amm1.tokens()));
             // 25% on 63.3684e12ETH is paid in tr fee 63.3684e12*1.25
             // = 79.2106e12ETH 63.3684e12ETH is swapped in for 83.4291e12BTC
             BEAST_EXPECT(amm2.expectBalances(
-                ETH(1'063'368'497'635'505), BTC(1'316'570'881'226'053), amm2.tokens()));
+                eth(1'063'368'497'635'505), btc(1'316'570'881'226'053), amm2.tokens()));
 
             // 25% on 66.7432e12BTC is paid in tr fee 66.7432e12*1.25
             // = 83.4291e12BTC
-            env.require(balance(carol, BTC(1'466'743'295'019'157)));
+            env.require(Balance(carol_, btc(1'466'743'295'019'157)));
         }
         {
             // Payment by the issuer via AMM, AMM  with limit quality,
             // deliver less than requested
             Env env(*this, features);
 
-            env.fund(XRP(1'000), gw, alice, bob, carol);
+            env.fund(XRP(1'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const GBP(
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 1'400'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            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));
+            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));
 
             // requested quality limit is 90e12BTC/120e12GBP = 0.75
             // trade quality is 81.1111e12BTC/108.1481e12GBP = 0.75
-            env(pay(gw, carol, BTC(90'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(GBP(120'000'000'000'000)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(gw_, carol_, btc(90'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(gbp(120'000'000'000'000)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             // 108.1481e12GBP is swapped in for 97.5935e12ETH
             BEAST_EXPECT(amm1.expectBalances(
-                GBP(1'108'148'148'148'150), ETH(902'406'417'112'298), amm1.tokens()));
+                gbp(1'108'148'148'148'150), eth(902'406'417'112'298), amm1.tokens()));
             // 25% on 78.0748e12ETH is paid in tr fee 78.0748e12*1.25
             // = 97.5935e12ETH 78.0748e12ETH is swapped in for 101.3888e12BTC
             BEAST_EXPECT(amm2.expectBalances(
-                ETH(1'078'074'866'310'161), BTC(1'298'611'111'111'111), amm2.tokens()));
+                eth(1'078'074'866'310'161), btc(1'298'611'111'111'111), amm2.tokens()));
 
             // 25% on 81.1111e12BTC is paid in tr fee 81.1111e12*1.25 =
             // 101.3888e12BTC
-            env.require(balance(carol, BTC(1'481'111'111'111'111)));
+            env.require(Balance(carol_, btc(1'481'111'111'111'111)));
         }
     }
 
@@ -2435,26 +2446,26 @@ private:
 
         {
             Env env(*this);
-            env.fund(XRP(10'000), gw, alice, bob, carol);
+            env.fund(XRP(10'000), gw_, alice_, bob_, carol_);
 
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 2'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBob(env, bob, XRP(1'000), ETH(1'050'000));
-            env(offer(bob, XRP(100), ETH(50'000)));
+            AMM const ammBob(env, bob_, XRP(1'000), eth(1'050'000));
+            env(offer(bob_, XRP(100), eth(50'000)));
 
-            env(pay(alice, carol, ETH(100'000)),
-                path(~MPT(ETH)),
-                sendmax(XRP(100)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, eth(100'000)),
+                Path(~MPT(eth)),
+                Sendmax(XRP(100)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
 
-            BEAST_EXPECT(ammBob.expectBalances(XRP(1'050), ETH(1'000'000), ammBob.tokens()));
-            env.require(balance(carol, ETH(2'050'000)));
-            BEAST_EXPECT(expectOffers(env, bob, 1, {{{XRP(100), ETH(50'000)}}}));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(1'050), eth(1'000'000), ammBob.tokens()));
+            env.require(Balance(carol_, eth(2'050'000)));
+            BEAST_EXPECT(expectOffers(env, bob_, 1, {{{XRP(100), eth(50'000)}}}));
         }
     }
 
@@ -2469,34 +2480,34 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, gw);
+                env.fund(XRP(30'000), alice_, bob_, gw_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
 
-                env(pay(gw, alice, BTC(200'000)));
-                env(pay(gw, bob, BTC(200'000)));
-                env(pay(gw, alice, ETH(200'000)));
-                env(pay(gw, bob, ETH(200'000)));
+                env(pay(gw_, alice_, btc(200'000)));
+                env(pay(gw_, bob_, btc(200'000)));
+                env(pay(gw_, alice_, eth(200'000)));
+                env(pay(gw_, bob_, eth(200'000)));
                 env.close();
 
-                AMM const ammAliceXRP_BTC(env, alice, XRP(100), BTC(101'000));
-                AMM const ammAliceXRP_ETH(env, alice, XRP(100), ETH(101'000));
-                env(pay(alice, bob, ETH(1'000)),
-                    path(~BTC, ~XRP, ~ETH),
-                    sendmax(XRP(1)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                AMM const ammAliceXrpBtc(env, alice_, XRP(100), btc(101'000));
+                AMM const ammAliceXrpEth(env, alice_, XRP(100), eth(101'000));
+                env(pay(alice_, bob_, eth(1'000)),
+                    Path(~btc, ~XRP, ~eth),
+                    Sendmax(XRP(1)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper2TokensMix(test);
         }
@@ -2505,35 +2516,35 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, gw);
+                env.fund(XRP(30'000), alice_, bob_, gw_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
 
-                env(pay(gw, alice, BTC(200'000)));
-                env(pay(gw, bob, BTC(200'000)));
-                env(pay(gw, alice, ETH(200'000)));
-                env(pay(gw, bob, ETH(200'000)));
+                env(pay(gw_, alice_, btc(200'000)));
+                env(pay(gw_, bob_, btc(200'000)));
+                env(pay(gw_, alice_, eth(200'000)));
+                env(pay(gw_, bob_, eth(200'000)));
                 env.close();
 
-                AMM const ammAliceXRP_BTC(env, alice, XRP(100), BTC(100'000));
-                AMM const ammAliceXRP_ETH(env, alice, XRP(100), ETH(100'000));
+                AMM const ammAliceXrpBtc(env, alice_, XRP(100), btc(100'000));
+                AMM const ammAliceXrpEth(env, alice_, XRP(100), eth(100'000));
                 // ETH -> //XRP -> //BTC ->XRP
-                env(pay(alice, bob, XRP(1)),
-                    path(~XRP, ~BTC, ~XRP),
-                    sendmax(ETH(1'000)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice_, bob_, XRP(1)),
+                    Path(~XRP, ~btc, ~XRP),
+                    Sendmax(eth(1'000)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper2TokensMix(test);
         }
@@ -2543,44 +2554,44 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2, auto&& issue3) {
                 Env env(*this);
-                env.fund(XRP(10'000), gw, alice, bob);
+                env.fund(XRP(10'000), gw_, alice_, bob_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
-                auto const JPY = issue2(
+                auto const jpy = issue2(
                     {.env = env,
                      .token = "JPY",
-                     .issuer = gw,
-                     .holders = {alice, bob},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_},
                      .limit = 2000'000});
 
-                env(pay(gw, alice, BTC(200'000)));
-                env(pay(gw, bob, BTC(200'000)));
-                env(pay(gw, alice, ETH(200'000)));
-                env(pay(gw, bob, ETH(200'000)));
-                env(pay(gw, alice, JPY(200'000)));
-                env(pay(gw, bob, JPY(200'000)));
+                env(pay(gw_, alice_, btc(200'000)));
+                env(pay(gw_, bob_, btc(200'000)));
+                env(pay(gw_, alice_, eth(200'000)));
+                env(pay(gw_, bob_, eth(200'000)));
+                env(pay(gw_, alice_, jpy(200'000)));
+                env(pay(gw_, bob_, jpy(200'000)));
                 env.close();
 
-                AMM const ammAliceXRP_BTC(env, alice, XRP(100), BTC(100'000));
-                AMM const ammAliceXRP_ETH(env, alice, XRP(100), ETH(100'000));
-                AMM const ammAliceXRP_JPY(env, alice, XRP(100), JPY(100'000));
+                AMM const ammAliceXrpBtc(env, alice_, XRP(100), btc(100'000));
+                AMM const ammAliceXrpEth(env, alice_, XRP(100), eth(100'000));
+                AMM const ammAliceXrpJpy(env, alice_, XRP(100), jpy(100'000));
 
-                env(pay(alice, bob, JPY(1'000)),
-                    path(~XRP, ~ETH, ~XRP, ~JPY),
-                    sendmax(BTC(1'000)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice_, bob_, jpy(1'000)),
+                    Path(~XRP, ~eth, ~XRP, ~jpy),
+                    Sendmax(btc(1'000)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper3TokensMix(test);
         }
@@ -2597,39 +2608,39 @@ private:
             auto const dan = Account("dan");
             auto const ed = Account("ed");
 
-            env.fund(XRP(100'000'000), gw, alice, bob, carol, dan, ed);
+            env.fund(XRP(100'000'000), gw_, alice_, bob_, carol_, dan, ed);
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {bob, dan, ed}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, ed, BTC(11'000'000'000'000)));
-            env(pay(gw, bob, BTC(1'000'000'000'000)));
-            env(pay(gw, dan, BTC(1'000'000'000'000)));
+            env(pay(gw_, ed, btc(11'000'000'000'000)));
+            env(pay(gw_, bob_, btc(1'000'000'000'000)));
+            env(pay(gw_, dan, btc(1'000'000'000'000)));
 
-            n_offers(env, 2'000, bob, XRP(1), BTC(1'000'000'000'000));
-            n_offers(env, 1, dan, XRP(1), BTC(1'000'000'000'000));
-            AMM const ammEd(env, ed, XRP(9), BTC(11'000'000'000'000));
+            nOffers(env, 2'000, bob_, XRP(1), btc(1'000'000'000'000));
+            nOffers(env, 1, dan, XRP(1), btc(1'000'000'000'000));
+            AMM const ammEd(env, ed, XRP(9), btc(11'000'000'000'000));
 
             // Alice offers to buy 1000 XRP for 1000e12 BTC. She takes Bob's
             // first offer, removes 999 more as unfunded, then hits the step
             // limit.
-            env(offer(alice, BTC(1'000'000'000'000'000), XRP(1'000)));
-            env.require(balance(alice, BTC(2'050'125'257'867)));
-            env.require(owners(alice, 2));
-            env.require(balance(bob, BTC(0)));
-            env.require(owners(bob, 1'001));
-            env.require(balance(dan, BTC(1'000'000'000'000)));
-            env.require(owners(dan, 2));
+            env(offer(alice_, btc(1'000'000'000'000'000), XRP(1'000)));
+            env.require(Balance(alice_, btc(2'050'125'257'867)));
+            env.require(Owners(alice_, 2));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Owners(bob_, 1'001));
+            env.require(Balance(dan, btc(1'000'000'000'000)));
+            env.require(Owners(dan, 2));
 
             // 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)(none)));
-            env.require(owners(carol, 1));
-            env.require(balance(bob, BTC(0)));
-            env.require(owners(bob, 1));
-            env.require(balance(dan, BTC(1'000'000'000'000)));
-            env.require(owners(dan, 2));
+            env(offer(carol_, btc(1'000'000'000'000'000), XRP(1'000)));
+            env.require(Balance(carol_, MPT(btc)(kNONE)));
+            env.require(Owners(carol_, 1));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Owners(bob_, 1));
+            env.require(Balance(dan, btc(1'000'000'000'000)));
+            env.require(Owners(dan, 2));
         }
 
         // MPT/IOU, similar to the case above
@@ -2638,35 +2649,35 @@ private:
             auto const dan = Account("dan");
             auto const ed = Account("ed");
 
-            env.fund(XRP(100'000), gw, alice, bob, carol, dan, ed);
+            env.fund(XRP(100'000), gw_, alice_, bob_, carol_, dan, ed);
             env.close();
 
-            MPTTester const USD(
+            MPTTester const usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .pay = 10000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
             env.trust(BTC(11'000'000'000'000), ed);
-            env(pay(gw, ed, BTC(11'000'000'000'000)));
-            env.trust(BTC(1'000'000'000'000), bob);
-            env(pay(gw, bob, BTC(1'000'000'000'000)));
+            env(pay(gw_, ed, BTC(11'000'000'000'000)));
+            env.trust(BTC(1'000'000'000'000), bob_);
+            env(pay(gw_, bob_, BTC(1'000'000'000'000)));
             env.trust(BTC(1'000'000'000'000), dan);
-            env(pay(gw, dan, BTC(1'000'000'000'000)));
+            env(pay(gw_, dan, BTC(1'000'000'000'000)));
             env.close();
 
-            n_offers(env, 2'000, bob, USD(1000000), BTC(1'000'000'000'000));
-            n_offers(env, 1, dan, USD(1000000), BTC(1'000'000'000'000));
-            AMM const ammEd(env, ed, USD(9000000), BTC(11'000'000'000'000));
-            env(offer(alice, BTC(1'000'000'000'000'000), USD(1'000000000)));
+            nOffers(env, 2'000, bob_, usd(1000000), BTC(1'000'000'000'000));
+            nOffers(env, 1, dan, usd(1000000), BTC(1'000'000'000'000));
+            AMM const ammEd(env, ed, usd(9000000), BTC(11'000'000'000'000));
+            env(offer(alice_, BTC(1'000'000'000'000'000), usd(1'000000000)));
 
-            env.require(balance(alice, STAmount{BTC, UINT64_C(2050125257867'587), -3}));
-            env.require(owners(alice, 3));
-            env.require(balance(bob, BTC(0)));
-            env.require(owners(bob, 1'002));
-            env.require(balance(dan, BTC(1000000000000)));
-            env.require(owners(dan, 3));
+            env.require(Balance(alice_, STAmount{BTC, UINT64_C(2050125257867'587), -3}));
+            env.require(Owners(alice_, 3));
+            env.require(Balance(bob_, BTC(0)));
+            env.require(Owners(bob_, 1'002));
+            env.require(Balance(dan, BTC(1000000000000)));
+            env.require(Owners(dan, 3));
         }
 
         // IOU/MPT, similar to the case above
@@ -2675,40 +2686,40 @@ private:
             auto const dan = Account("dan");
             auto const ed = Account("ed");
 
-            env.fund(XRP(100'000), gw, alice, bob, carol, dan, ed);
+            env.fund(XRP(100'000), gw_, alice_, bob_, carol_, dan, ed);
             env.close();
 
-            env.trust(USD(10000'000'000), alice);
-            env(pay(gw, alice, USD(10000'000'000)));
-            env.trust(USD(10000'000'000), bob);
-            env(pay(gw, bob, USD(10000'000'000)));
-            env.trust(USD(10000'000'000), carol);
-            env(pay(gw, carol, USD(10000'000'000)));
+            env.trust(USD(10000'000'000), alice_);
+            env(pay(gw_, alice_, USD(10000'000'000)));
+            env.trust(USD(10000'000'000), bob_);
+            env(pay(gw_, bob_, USD(10000'000'000)));
+            env.trust(USD(10000'000'000), carol_);
+            env(pay(gw_, carol_, USD(10000'000'000)));
             env.trust(USD(10000'000'000), dan);
-            env(pay(gw, dan, USD(10000'000'000)));
+            env(pay(gw_, dan, USD(10000'000'000)));
             env.trust(USD(10000'000'000), ed);
-            env(pay(gw, ed, USD(10000'000'000)));
+            env(pay(gw_, ed, USD(10000'000'000)));
             env.close();
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {bob, dan, ed}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, ed, BTC(11'000'000'000'000)));
-            env(pay(gw, bob, BTC(1'000'000'000'000)));
-            env(pay(gw, dan, BTC(1'000'000'000'000)));
+            env(pay(gw_, ed, btc(11'000'000'000'000)));
+            env(pay(gw_, bob_, btc(1'000'000'000'000)));
+            env(pay(gw_, dan, btc(1'000'000'000'000)));
             env.close();
 
-            n_offers(env, 2'000, bob, USD(1000000), BTC(1'000'000'000'000));
-            n_offers(env, 1, dan, USD(1000000), BTC(1'000'000'000'000));
-            AMM const ammEd(env, ed, USD(9000000), BTC(11'000'000'000'000));
-            env(offer(alice, BTC(1'000'000'000'000'000), USD(1'000000000)));
+            nOffers(env, 2'000, bob_, USD(1000000), btc(1'000'000'000'000));
+            nOffers(env, 1, dan, USD(1000000), btc(1'000'000'000'000));
+            AMM const ammEd(env, ed, USD(9000000), btc(11'000'000'000'000));
+            env(offer(alice_, btc(1'000'000'000'000'000), USD(1'000000000)));
 
-            env.require(balance(alice, BTC(2050125628933)));
-            env.require(owners(alice, 3));
-            env.require(balance(bob, BTC(0)));
-            env.require(owners(bob, 1'002));
-            env.require(balance(dan, BTC(1000000000000)));
-            env.require(owners(dan, 3));
+            env.require(Balance(alice_, btc(2050125628933)));
+            env.require(Owners(alice_, 3));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Owners(bob_, 1'002));
+            env.require(Balance(dan, btc(1000000000000)));
+            env.require(Owners(dan, 3));
         }
 
         // MPT/MPT, similar to the case above
@@ -2717,39 +2728,39 @@ private:
             auto const dan = Account("dan");
             auto const ed = Account("ed");
 
-            env.fund(XRP(100'000), gw, alice, bob, carol, dan, ed);
+            env.fund(XRP(100'000), gw_, alice_, bob_, carol_, dan, ed);
             env.close();
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {bob, dan, ed}, .flags = MPTDEXFlags});
-            MPTTester const USD(
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {bob_, dan, ed}, .flags = kMPT_DEX_FLAGS});
+            MPTTester const usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .pay = 10000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, ed, BTC(11'000'000'000'000)));
-            env(pay(gw, bob, BTC(1'000'000'000'000)));
-            env(pay(gw, dan, BTC(1'000'000'000'000)));
+            env(pay(gw_, ed, btc(11'000'000'000'000)));
+            env(pay(gw_, bob_, btc(1'000'000'000'000)));
+            env(pay(gw_, dan, btc(1'000'000'000'000)));
             env.close();
 
-            n_offers(env, 2'000, bob, USD(1000000), BTC(1'000'000'000'000));
-            n_offers(env, 1, dan, USD(1000000), BTC(1'000'000'000'000));
-            AMM const ammEd(env, ed, USD(9000000), BTC(11'000'000'000'000));
-            env(offer(alice, BTC(1'000'000'000'000'000), USD(1'000000000)));
+            nOffers(env, 2'000, bob_, usd(1000000), btc(1'000'000'000'000));
+            nOffers(env, 1, dan, usd(1000000), btc(1'000'000'000'000));
+            AMM const ammEd(env, ed, usd(9000000), btc(11'000'000'000'000));
+            env(offer(alice_, btc(1'000'000'000'000'000), usd(1'000000000)));
 
-            env.require(balance(alice, BTC(2050125257867)));
-            env.require(owners(alice, 3));
-            env.require(balance(bob, BTC(0)));
-            env.require(owners(bob, 1'002));
-            env.require(balance(dan, BTC(1000000000000)));
-            env.require(owners(dan, 3));
+            env.require(Balance(alice_, btc(2050125257867)));
+            env.require(Owners(alice_, 3));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Owners(bob_, 1'002));
+            env.require(Balance(dan, btc(1000000000000)));
+            env.require(Owners(dan, 3));
         }
     }
 
     void
-    test_convert_all_of_an_asset(FeatureBitset features)
+    testConvertAllOfAnAsset(FeatureBitset features)
     {
         testcase("Convert all of an asset using DeliverMin");
 
@@ -2757,157 +2768,160 @@ private:
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(pay(alice, bob, BTC(10'000)), deliver_min(BTC(10'000)), ter(temBAD_AMOUNT));
-            env(pay(alice, bob, BTC(10'000)),
-                deliver_min(BTC(-5'000)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(alice, bob, BTC(10'000)),
-                deliver_min(XRP(5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(alice, bob, BTC(10'000)),
-                deliver_min(BTC(5'000)),
-                txflags(tfPartialPayment),
-                ter(tecPATH_DRY));
-            env(pay(alice, bob, BTC(10'000)),
-                deliver_min(BTC(15'000)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(gw, carol, BTC(50'000)));
-            AMM const ammCarol(env, carol, XRP(10), BTC(15'000));
-            env(pay(alice, bob, BTC(10'000)),
-                paths(XRP),
-                deliver_min(BTC(7'000)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(5)),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, bob_, btc(10'000)), DeliverMin(btc(10'000)), Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, btc(10'000)),
+                DeliverMin(btc(-5'000)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, btc(10'000)),
+                DeliverMin(XRP(5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, btc(10'000)),
+                DeliverMin(btc(5'000)),
+                Txflags(tfPartialPayment),
+                Ter(tecPATH_DRY));
+            env(pay(alice_, bob_, btc(10'000)),
+                DeliverMin(btc(15'000)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(gw_, carol_, btc(50'000)));
+            AMM const ammCarol(env, carol_, XRP(10), btc(15'000));
+            env(pay(alice_, bob_, btc(10'000)),
+                Paths(XRP),
+                DeliverMin(btc(7'000)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(5)),
+                Ter(tecPATH_PARTIAL));
             env.require(
-                balance(alice, drops(10'000'000'000 - (3 * env.current()->fees().base.drops()))));
-            env.require(balance(bob, drops(10'000'000'000 - env.current()->fees().base.drops())));
+                Balance(alice_, drops(10'000'000'000 - (3 * env.current()->fees().base.drops()))));
+            env.require(Balance(bob_, drops(10'000'000'000 - env.current()->fees().base.drops())));
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_}, XRP(10'000));
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice, bob}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {alice_, bob_}, .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, bob, BTC(1'100'000)));
-            AMM const ammBob(env, bob, XRP(1'000), BTC(1'100'000));
-            env(pay(alice, alice, BTC(10'000'000)),
-                paths(XRP),
-                deliver_min(BTC(100'000)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(100)));
-            env.require(balance(alice, BTC(100'000)));
+            env(pay(gw_, bob_, btc(1'100'000)));
+            AMM const ammBob(env, bob_, XRP(1'000), btc(1'100'000));
+            env(pay(alice_, alice_, btc(10'000'000)),
+                Paths(XRP),
+                DeliverMin(btc(100'000)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(100)));
+            env.require(Balance(alice_, btc(100'000)));
         }
 
         // IOU/MPT mix, similar to the above case
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 3000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, USD(10'000)));
-                env(pay(gw, bob, USD(10'000)));
-                env(pay(gw, bob, BTC(1'200)));
+                env(pay(gw_, alice_, usd(10'000)));
+                env(pay(gw_, bob_, usd(10'000)));
+                env(pay(gw_, bob_, btc(1'200)));
                 env.close();
 
-                AMM const ammBob(env, bob, USD(1'000), BTC(1'100));
-                env(pay(alice, alice, BTC(10'000)),
-                    paths(USD),
-                    deliver_min(BTC(100)),
-                    txflags(tfPartialPayment),
-                    sendmax(USD(100)));
-                env.require(balance(alice, BTC(100)));
+                AMM const ammBob(env, bob_, usd(1'000), btc(1'100));
+                env(pay(alice_, alice_, btc(10'000)),
+                    Paths(usd),
+                    DeliverMin(btc(100)),
+                    Txflags(tfPartialPayment),
+                    Sendmax(usd(100)));
+                env.require(Balance(alice_, btc(100)));
             };
             testHelper2TokensMix(test);
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {bob, carol}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {bob_, carol_}, .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, bob, BTC(1'200'000)));
-            AMM const ammBob(env, bob, XRP(5'500), BTC(1'200'000));
-            env(pay(alice, carol, BTC(10'000'000)),
-                paths(XRP),
-                deliver_min(BTC(200'000)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1'000)),
-                ter(tecPATH_PARTIAL));
-            env(pay(alice, carol, BTC(10'000'000)),
-                paths(XRP),
-                deliver_min(BTC(200'000)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1'100)));
-            BEAST_EXPECT(ammBob.expectBalances(XRP(6'600), BTC(1'000'000), ammBob.tokens()));
-            env.require(balance(carol, BTC(200'000)));
+            env(pay(gw_, bob_, btc(1'200'000)));
+            AMM const ammBob(env, bob_, XRP(5'500), btc(1'200'000));
+            env(pay(alice_, carol_, btc(10'000'000)),
+                Paths(XRP),
+                DeliverMin(btc(200'000)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1'000)),
+                Ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, btc(10'000'000)),
+                Paths(XRP),
+                DeliverMin(btc(200'000)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1'100)));
+            BEAST_EXPECT(ammBob.expectBalances(XRP(6'600), btc(1'000'000), ammBob.tokens()));
+            env.require(Balance(carol_, btc(200'000)));
         }
 
         // IOU/MPT mix, similar to the above case
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 3000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, USD(100'000)));
-                env(pay(gw, bob, USD(100'000)));
-                env(pay(gw, carol, USD(100'000)));
+                env(pay(gw_, alice_, usd(100'000)));
+                env(pay(gw_, bob_, usd(100'000)));
+                env(pay(gw_, carol_, usd(100'000)));
 
-                env(pay(gw, bob, BTC(1'200)));
+                env(pay(gw_, bob_, btc(1'200)));
                 env.close();
 
-                AMM const ammBob(env, bob, USD(5'500), BTC(1'200));
-                env(pay(alice, carol, BTC(10'000)),
-                    paths(USD),
-                    deliver_min(BTC(200)),
-                    txflags(tfPartialPayment),
-                    sendmax(USD(1'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, BTC(10'000)),
-                    paths(USD),
-                    deliver_min(BTC(200)),
-                    txflags(tfPartialPayment),
-                    sendmax(USD(1'100)));
-                BEAST_EXPECT(ammBob.expectBalances(USD(6'600), BTC(1'000), ammBob.tokens()));
-                env.require(balance(carol, BTC(200)));
+                AMM const ammBob(env, bob_, usd(5'500), btc(1'200));
+                env(pay(alice_, carol_, btc(10'000)),
+                    Paths(usd),
+                    DeliverMin(btc(200)),
+                    Txflags(tfPartialPayment),
+                    Sendmax(usd(1'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, btc(10'000)),
+                    Paths(usd),
+                    DeliverMin(btc(200)),
+                    Txflags(tfPartialPayment),
+                    Sendmax(usd(1'100)));
+                BEAST_EXPECT(ammBob.expectBalances(usd(6'600), btc(1'000), ammBob.tokens()));
+                env.require(Balance(carol_, btc(200)));
             };
             testHelper2TokensMix(test);
         }
@@ -2915,26 +2929,29 @@ private:
         {
             auto const dan = Account("dan");
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol, dan}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_, dan}, XRP(10'000));
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {bob, carol, dan}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {bob_, carol_, dan},
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, bob, BTC(100'000'000)));
-            env(pay(gw, dan, BTC(1'100'000'000)));
-            env(offer(bob, XRP(100), BTC(100'000'000)));
-            env(offer(bob, XRP(1'000), BTC(100'000'000)));
-            AMM const ammDan(env, dan, XRP(1'000), BTC(1'100'000'000));
+            env(pay(gw_, bob_, btc(100'000'000)));
+            env(pay(gw_, dan, btc(1'100'000'000)));
+            env(offer(bob_, XRP(100), btc(100'000'000)));
+            env(offer(bob_, XRP(1'000), btc(100'000'000)));
+            AMM const ammDan(env, dan, XRP(1'000), btc(1'100'000'000));
 
-            env(pay(alice, carol, BTC(10'000'000'000)),
-                paths(XRP),
-                deliver_min(BTC(200'000'000)),
-                txflags(tfPartialPayment),
-                sendmax(XRPAmount(200'000'001)));
-            env.require(balance(bob, BTC(0)));
-            env.require(balance(carol, BTC(200'000'000)));
+            env(pay(alice_, carol_, btc(10'000'000'000)),
+                Paths(XRP),
+                DeliverMin(btc(200'000'000)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRPAmount(200'000'001)));
+            env.require(Balance(bob_, btc(0)));
+            env.require(Balance(carol_, btc(200'000'000)));
             BEAST_EXPECT(
-                ammDan.expectBalances(XRPAmount{1'100'000'001}, BTC(1000'000000), ammDan.tokens()));
+                ammDan.expectBalances(XRPAmount{1'100'000'001}, btc(1000'000000), ammDan.tokens()));
         }
     }
 
@@ -2947,29 +2964,29 @@ private:
         Account const becky{"becky"};
 
         Env env(*this, features);
-        fund(env, gw, {alice, becky}, XRP(5'000));
+        fund(env, gw_, {alice_, becky}, XRP(5'000));
 
-        MPTTester const BTC(
-            {.env = env, .issuer = gw, .holders = {alice, becky}, .flags = MPTDEXFlags});
+        MPTTester const btc(
+            {.env = env, .issuer = gw_, .holders = {alice_, becky}, .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, alice, BTC(500'000)));
+        env(pay(gw_, alice_, btc(500'000)));
         env.close();
 
-        AMM const ammAlice(env, alice, XRP(100), BTC(140'000));
+        AMM const ammAlice(env, alice_, XRP(100), btc(140'000));
 
         // becky pays herself BTC (10'000) by consuming part of alice's offer.
         // Make sure the payment works if PaymentAuth is not involved.
-        env(pay(becky, becky, BTC(10'000)), path(~MPT(BTC)), sendmax(XRP(10)));
+        env(pay(becky, becky, btc(10'000)), Path(~MPT(btc)), Sendmax(XRP(10)));
         env.close();
         BEAST_EXPECT(
-            ammAlice.expectBalances(XRPAmount(107'692'308), BTC(130'000), ammAlice.tokens()));
+            ammAlice.expectBalances(XRPAmount(107'692'308), btc(130'000), ammAlice.tokens()));
 
         // becky decides to require authorization for deposits.
         env(fset(becky, asfDepositAuth));
         env.close();
 
         // becky pays herself again.
-        env(pay(becky, becky, BTC(10'000)), path(~MPT(BTC)), sendmax(XRP(10)), ter(tesSUCCESS));
+        env(pay(becky, becky, btc(10'000)), Path(~MPT(btc)), Sendmax(XRP(10)), Ter(tesSUCCESS));
 
         env.close();
     }
@@ -2985,42 +3002,45 @@ private:
 
         Env env(*this);
 
-        fund(env, gw, {alice, bob, carol}, XRP(10'000));
+        fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-        MPTTester BTC(
-            {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+        MPTTester btc(
+            {.env = env,
+             .issuer = gw_,
+             .holders = {alice_, bob_, carol_},
+             .flags = kMPT_DEX_FLAGS});
 
-        env(pay(gw, alice, BTC(150'000)));
-        env(pay(gw, carol, BTC(150'000)));
-        AMM const ammCarol(env, carol, BTC(100'000), XRPAmount(101));
+        env(pay(gw_, alice_, btc(150'000)));
+        env(pay(gw_, carol_, btc(150'000)));
+        AMM const ammCarol(env, carol_, btc(100'000), XRPAmount(101));
 
-        env(pay(alice, bob, BTC(50'000)));
+        env(pay(alice_, bob_, btc(50'000)));
         env.close();
 
         // bob sets the lsfDepositAuth flag.
-        env(fset(bob, asfDepositAuth), require(flags(bob, asfDepositAuth)));
+        env(fset(bob_, asfDepositAuth), Require(Flags(bob_, asfDepositAuth)));
         env.close();
 
         // None of the following payments should succeed.
-        auto failedMptPayments = [this, &env, &BTC]() {
-            env.require(flags(bob, asfDepositAuth));
+        auto failedMptPayments = [this, &env, &btc]() {
+            env.require(Flags(bob_, asfDepositAuth));
 
             // Capture bob's balances before hand to confirm they don't
             // change.
-            PrettyAmount const bobXrpBalance{env.balance(bob, XRP)};
-            PrettyAmount const bobBTCBalance{env.balance(bob, MPT(BTC))};
+            PrettyAmount const bobXrpBalance{env.balance(bob_, XRP)};
+            PrettyAmount const bobBTCBalance{env.balance(bob_, MPT(btc))};
 
-            env(pay(alice, bob, BTC(50'000)), ter(tecNO_PERMISSION));
+            env(pay(alice_, bob_, btc(50'000)), Ter(tecNO_PERMISSION));
             env.close();
 
             // Note that even though alice is paying bob in XRP, the payment
             // is still not allowed since the payment passes through an
             // offer.
-            env(pay(alice, bob, drops(1)), sendmax(BTC(1'000)), ter(tecNO_PERMISSION));
+            env(pay(alice_, bob_, drops(1)), Sendmax(btc(1'000)), Ter(tecNO_PERMISSION));
             env.close();
 
-            BEAST_EXPECT(bobXrpBalance == env.balance(bob, XRP));
-            BEAST_EXPECT(bobBTCBalance == env.balance(bob, MPT(BTC)));
+            BEAST_EXPECT(bobXrpBalance == env.balance(bob_, XRP));
+            BEAST_EXPECT(bobBTCBalance == env.balance(bob_, MPT(btc)));
         };
 
         //  Test when bob has an XRP balance > base reserve.
@@ -3028,41 +3048,41 @@ private:
 
         // Set bob's XRP balance == base reserve.  Also demonstrate that
         // bob can make payments while his lsfDepositAuth flag is set.
-        env(pay(bob, alice, BTC(25'000)));
+        env(pay(bob_, alice_, btc(25'000)));
         env.close();
 
         {
-            STAmount const bobPaysXRP{env.balance(bob, XRP) - reserve(env, 1)};
+            STAmount const bobPaysXRP{env.balance(bob_, XRP) - reserve(env, 1)};
             XRPAmount const bobPaysFee{reserve(env, 1) - reserve(env, 0)};
-            env(pay(bob, alice, bobPaysXRP), fee(bobPaysFee));
+            env(pay(bob_, alice_, bobPaysXRP), Fee(bobPaysFee));
             env.close();
         }
 
         // Test when bob's XRP balance == base reserve.
-        BEAST_EXPECT(env.balance(bob, XRP) == reserve(env, 0));
-        BEAST_EXPECT(env.balance(bob, MPT(BTC)) == BTC(25'000));
+        BEAST_EXPECT(env.balance(bob_, XRP) == reserve(env, 0));
+        BEAST_EXPECT(env.balance(bob_, MPT(btc)) == btc(25'000));
         failedMptPayments();
 
         // Test when bob has an XRP balance == 0.
-        env(noop(bob), fee(reserve(env, 0)));
+        env(noop(bob_), Fee(reserve(env, 0)));
         env.close();
 
-        BEAST_EXPECT(env.balance(bob, XRP) == XRP(0));
+        BEAST_EXPECT(env.balance(bob_, XRP) == XRP(0));
         failedMptPayments();
 
         // Give bob enough XRP for the fee to clear the lsfDepositAuth flag.
-        env(pay(alice, bob, drops(env.current()->fees().base)));
+        env(pay(alice_, bob_, drops(env.current()->fees().base)));
 
         // bob clears the lsfDepositAuth and the next payment succeeds.
-        env(fclear(bob, asfDepositAuth));
+        env(fclear(bob_, asfDepositAuth));
         env.close();
 
-        env(pay(alice, bob, BTC(50'000)));
+        env(pay(alice_, bob_, btc(50'000)));
         env.close();
 
-        env(pay(alice, bob, drops(1)), sendmax(BTC(1'000)));
+        env(pay(alice_, bob_, drops(1)), Sendmax(btc(1'000)));
         env.close();
-        BEAST_EXPECT(ammCarol.expectBalances(BTC(101'000), XRPAmount(100), ammCarol.tokens()));
+        BEAST_EXPECT(ammCarol.expectBalances(btc(101'000), XRPAmount(100), ammCarol.tokens()));
     }
 
     void
@@ -3073,66 +3093,66 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
+        Account const g1{"G1"};
         Account const alice{"alice"};
         Account const bob{"bob"};
 
-        env.fund(XRP(1'000), G1, alice, bob);
+        env.fund(XRP(1'000), g1, alice, bob);
 
-        MPTTester BTC(
+        MPTTester btc(
             {.env = env,
-             .issuer = G1,
+             .issuer = g1,
              .holders = {alice, bob},
-             .flags = tfMPTCanLock | MPTDEXFlags});
+             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-        env(pay(G1, bob, BTC(10)));
-        env(pay(G1, alice, BTC(205)));
+        env(pay(g1, bob, btc(10)));
+        env(pay(g1, alice, btc(205)));
         env.close();
 
-        AMM const ammAlice(env, alice, XRP(500), BTC(105));
+        AMM const ammAlice(env, alice, XRP(500), btc(105));
 
-        env.require(balance(bob, BTC(10)));
-        env.require(balance(alice, BTC(100)));
+        env.require(Balance(bob, btc(10)));
+        env.require(Balance(alice, btc(100)));
 
         // Account with MPT unlocked (proving operations normally work)
         // can make Payment
-        env(pay(alice, bob, BTC(1)));
+        env(pay(alice, bob, btc(1)));
 
         // can receive Payment
-        env(pay(bob, alice, BTC(1)));
+        env(pay(bob, alice, btc(1)));
         env.close();
 
         // Lock MPT for bob
-        BTC.set({.holder = bob, .flags = tfMPTLock});
+        btc.set({.holder = bob, .flags = tfMPTLock});
 
         {
             // different from IOU. The offer is created but not crossed.
-            env(offer(bob, BTC(5), XRP(25)));
+            env(offer(bob, btc(5), XRP(25)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, bob, 1, {{{BTC(5), XRP(25)}}}));
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(500), BTC(105), ammAlice.tokens()));
+            BEAST_EXPECT(expectOffers(env, bob, 1, {{{btc(5), XRP(25)}}}));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(500), btc(105), ammAlice.tokens()));
         }
 
         {
             // can not sell assets
-            env(offer(bob, XRP(1), BTC(5)), ter(tecUNFUNDED_OFFER));
+            env(offer(bob, XRP(1), btc(5)), Ter(tecUNFUNDED_OFFER));
 
             // different from IOU
             // can not receive Payment when locked
-            env(pay(alice, bob, BTC(1)), ter(tecPATH_DRY));
+            env(pay(alice, bob, btc(1)), Ter(tecPATH_DRY));
 
             // can not make Payment when locked
-            env(pay(bob, alice, BTC(1)), ter(tecPATH_DRY));
+            env(pay(bob, alice, btc(1)), Ter(tecPATH_DRY));
 
-            env.require(balance(bob, BTC(10)));
+            env.require(Balance(bob, btc(10)));
         }
 
         {
             // Unlock
-            BTC.set({.holder = bob, .flags = tfMPTUnlock});
-            env(offer(bob, XRP(1), BTC(5)));
-            env(pay(bob, alice, BTC(1)));
-            env(pay(alice, bob, BTC(1)));
+            btc.set({.holder = bob, .flags = tfMPTUnlock});
+            env(offer(bob, XRP(1), btc(5)));
+            env(pay(bob, alice, btc(1)));
+            env(pay(alice, bob, btc(1)));
             env.close();
         }
     }
@@ -3145,49 +3165,49 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account A1{"A1"};
-        Account A2{"A2"};
-        Account A3{"A3"};
-        Account A4{"A4"};
+        Account const g1{"G1"};
+        Account a1{"A1"};
+        Account a2{"A2"};
+        Account a3{"A3"};
+        Account a4{"A4"};
 
-        env.fund(XRP(12'000), G1);
-        env.fund(XRP(1'000), A1);
-        env.fund(XRP(20'000), A2, A3, A4);
+        env.fund(XRP(12'000), g1);
+        env.fund(XRP(1'000), a1);
+        env.fund(XRP(20'000), a2, a3, a4);
 
-        MPTTester const ETH(
+        MPTTester const eth(
             {.env = env,
-             .issuer = G1,
-             .holders = {A1, A2, A3, A4},
-             .flags = tfMPTCanLock | MPTDEXFlags});
+             .issuer = g1,
+             .holders = {a1, a2, a3, a4},
+             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-        MPTTester BTC(
+        MPTTester btc(
             {.env = env,
-             .issuer = G1,
-             .holders = {A1, A2, A3, A4},
-             .flags = tfMPTCanLock | MPTDEXFlags});
+             .issuer = g1,
+             .holders = {a1, a2, a3, a4},
+             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-        env(pay(G1, A1, ETH(1'000)));
-        env(pay(G1, A2, ETH(100)));
-        env(pay(G1, A3, BTC(100)));
-        env(pay(G1, A4, BTC(100)));
+        env(pay(g1, a1, eth(1'000)));
+        env(pay(g1, a2, eth(100)));
+        env(pay(g1, a3, btc(100)));
+        env(pay(g1, a4, btc(100)));
         env.close();
 
-        AMM const ammG1(env, G1, XRP(10'000), ETH(100));
-        env(offer(A1, XRP(10'000), ETH(100)), txflags(tfPassive));
-        env(offer(A2, ETH(100), XRP(10'000)), txflags(tfPassive));
+        AMM const ammG1(env, g1, XRP(10'000), eth(100));
+        env(offer(a1, XRP(10'000), eth(100)), Txflags(tfPassive));
+        env(offer(a2, eth(100), XRP(10'000)), Txflags(tfPassive));
         env.close();
 
         {
             // Account without Global Lock (proving operations normally
             // work)
             // visible offers where taker_pays is unlocked issuer
-            auto offers = getAccountOffers(env, A2)[jss::offers];
+            auto offers = getAccountOffers(env, a2)[jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
 
             // visible offers where taker_gets is unlocked issuer
-            offers = getAccountOffers(env, A1)[jss::offers];
+            offers = getAccountOffers(env, a1)[jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
         }
@@ -3195,39 +3215,39 @@ private:
         {
             // Offers/Payments
             // assets can be bought on the market
-            AMM ammA3(env, A3, BTC(1), XRP(1));
+            AMM ammA3(env, a3, btc(1), XRP(1));
 
             // assets can be sold on the market
             // AMM is bidirectional
-            env(pay(G1, A2, ETH(1)));
-            env(pay(A2, G1, ETH(1)));
-            env(pay(A2, A1, ETH(1)));
-            env(pay(A1, A2, ETH(1)));
+            env(pay(g1, a2, eth(1)));
+            env(pay(a2, g1, eth(1)));
+            env(pay(a2, a1, eth(1)));
+            env(pay(a1, a2, eth(1)));
             ammA3.withdrawAll(std::nullopt);
         }
 
         {
             // Account with Global Lock
             //  set Global Lock first
-            BTC.set({.flags = tfMPTLock});
+            btc.set({.flags = tfMPTLock});
 
             // assets can't be bought on the market
-            AMM const ammA3(env, A3, BTC(1), XRP(1), ter(tecFROZEN));
+            AMM const ammA3(env, a3, btc(1), XRP(1), Ter(tecFROZEN));
 
             // direct issues can be sent
-            env(pay(G1, A2, BTC(1)));
-            env(pay(A2, G1, BTC(1)));
+            env(pay(g1, a2, btc(1)));
+            env(pay(a2, g1, btc(1)));
             // locked
-            env(pay(A2, A1, BTC(1)), ter(tecPATH_DRY));
-            env(pay(A1, A2, BTC(1)), ter(tecPATH_DRY));
+            env(pay(a2, a1, btc(1)), Ter(tecPATH_DRY));
+            env(pay(a1, a2, btc(1)), Ter(tecPATH_DRY));
         }
 
         {
-            auto offers = getAccountOffers(env, A2)[jss::offers];
+            auto offers = getAccountOffers(env, a2)[jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
 
-            offers = getAccountOffers(env, A1)[jss::offers];
+            offers = getAccountOffers(env, a1)[jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
         }
@@ -3241,63 +3261,63 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account A2{"A2"};
-        Account A3{"A3"};
-        Account A4{"A4"};
+        Account const g1{"G1"};
+        Account a2{"A2"};
+        Account a3{"A3"};
+        Account a4{"A4"};
 
-        env.fund(XRP(2'000), G1, A3, A4);
-        env.fund(XRP(2'000), A2);
+        env.fund(XRP(2'000), g1, a3, a4);
+        env.fund(XRP(2'000), a2);
         env.close();
 
-        MPTTester BTC(
+        MPTTester btc(
             {.env = env,
-             .issuer = G1,
-             .holders = {A2, A3, A4},
-             .flags = tfMPTCanLock | MPTDEXFlags});
+             .issuer = g1,
+             .holders = {a2, a3, a4},
+             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-        env(pay(G1, A3, BTC(2'000)));
-        env(pay(G1, A4, BTC(2'001)));
+        env(pay(g1, a3, btc(2'000)));
+        env(pay(g1, a4, btc(2'001)));
         env.close();
 
-        AMM const ammA3(env, A3, XRP(1'000), BTC(1'001));
+        AMM const ammA3(env, a3, XRP(1'000), btc(1'001));
 
         // removal after successful payment
         //    test: make a payment with partially consuming offer
-        env(pay(A2, G1, BTC(1)), paths(MPT(BTC)), sendmax(XRP(1)));
+        env(pay(a2, g1, btc(1)), Paths(MPT(btc)), Sendmax(XRP(1)));
         env.close();
 
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'001), BTC(1'000), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'001), btc(1'000), ammA3.tokens()));
 
         //    test: someone else creates an offer providing liquidity
-        env(offer(A4, XRP(999), BTC(999)));
+        env(offer(a4, XRP(999), btc(999)));
         env.close();
         // The offer consumes AMM offer
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), BTC(1'001), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), btc(1'001), ammA3.tokens()));
 
         //    test: AMM is Locked
-        BTC.set({.holder = ammA3.ammAccount(), .flags = tfMPTLock});
+        btc.set({.holder = ammA3.ammAccount(), .flags = tfMPTLock});
         auto const info = ammA3.ammRpcInfo();
         BEAST_EXPECT(info[jss::amm][jss::asset2_frozen].asBool());
         env.close();
 
         //    test: Can make a payment via the new offer
-        env(pay(A2, G1, BTC(1)), paths(MPT(BTC)), sendmax(XRP(1)));
+        env(pay(a2, g1, btc(1)), Paths(MPT(btc)), Sendmax(XRP(1)));
         env.close();
         // AMM is not consumed
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), BTC(1'001), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), btc(1'001), ammA3.tokens()));
 
         // removal buy successful OfferCreate
         //    test: lock the new offer
-        BTC.set({.holder = A4, .flags = tfMPTUnlock});
+        btc.set({.holder = a4, .flags = tfMPTUnlock});
         env.close();
 
         //    test: can no longer create a crossing offer
-        env(offer(A2, BTC(999), XRP(999)));
+        env(offer(a2, btc(999), XRP(999)));
         env.close();
 
         //    test: offer was removed by offer_create
-        auto offers = getAccountOffers(env, A4)[jss::offers];
+        auto offers = getAccountOffers(env, a4)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 0u)))
             return;
     }
@@ -3309,52 +3329,52 @@ private:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const bogie{"bogie", KeyType::secp256k1};
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const zelda{"zelda", KeyType::secp256k1};
-        fund(env, gw, {alice, becky, zelda}, XRP(20'000));
+        Account const bogie{"bogie", KeyType::Secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const zelda{"zelda", KeyType::Secp256k1};
+        fund(env, gw_, {alice, becky, zelda}, XRP(20'000));
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
+             .issuer = gw_,
              .holders = {alice, becky, zelda},
              .pay = 20'000'000'000,
-             .flags = MPTDEXFlags});
+             .flags = kMPT_DEX_FLAGS});
 
         // alice uses a regular key with the master disabled.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // Attach signers to alice.
-        env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), sig(alie));
+        env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), Sig(alie));
         env.close();
-        int constexpr signerListOwners{2};
-        env.require(owners(alice, signerListOwners + 0));
+        int constexpr kSIGNER_LIST_OWNERS{2};
+        env.require(Owners(alice, kSIGNER_LIST_OWNERS + 0));
 
-        msig const ms{becky, bogie};
+        Msig const ms{becky, bogie};
 
         // Multisign all AMM transactions
         AMM ammAlice(
             env,
             alice,
             XRP(10'000),
-            BTC(10'000),
+            btc(10'000),
             false,
             0,
             ammCrtFee(env).drops(),
             std::nullopt,
             std::nullopt,
             ms,
-            ter(tesSUCCESS));
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'000), ammAlice.tokens()));
+            Ter(tesSUCCESS));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'000), ammAlice.tokens()));
 
         ammAlice.deposit(alice, 1'000'000);
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(11'000), BTC(11'000), IOUAmount{11'000'000, 0}));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(11'000), btc(11'000), IOUAmount{11'000'000, 0}));
 
         ammAlice.withdraw(alice, 1'000'000);
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'000), ammAlice.tokens()));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'000), ammAlice.tokens()));
 
         ammAlice.vote({}, 1'000);
         BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
@@ -3362,7 +3382,7 @@ private:
         env(ammAlice.bid({.account = alice, .bidMin = 100}), ms).close();
         BEAST_EXPECT(ammAlice.expectAuctionSlot(100, 0, IOUAmount{4'000}));
         // 4000 tokens burnt
-        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), BTC(10'000), IOUAmount{9'996'000, 0}));
+        BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), btc(10'000), IOUAmount{9'996'000, 0}));
     }
 
     void
@@ -3376,36 +3396,36 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const ETH = issue1(
+                auto const eth = issue1(
                     {.env = env,
                      .token = "ETH",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, ETH(50000)));
-                env(pay(gw, bob, ETH(50000)));
-                env(pay(gw, carol, ETH(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, eth(50000)));
+                env(pay(gw_, bob_, eth(50000)));
+                env(pay(gw_, carol_, eth(50000)));
                 env.close();
-                AMM const bobXRP_BTC(env, bob, XRP(1'000), BTC(1'000));
-                AMM const bobBTC_ETH(env, bob, BTC(1'000), ETH(1'000));
+                AMM const bobXrpBtc(env, bob_, XRP(1'000), btc(1'000));
+                AMM const bobBtcEth(env, bob_, btc(1'000), eth(1'000));
 
                 // payment path: XRP -> XRP/BTC -> BTC/ETH -> ETH/BTC
-                env(pay(alice, carol, BTC(100)),
-                    path(~BTC, ~ETH, ~BTC),
-                    sendmax(XRP(200)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice_, carol_, btc(100)),
+                    Path(~btc, ~eth, ~btc),
+                    Sendmax(XRP(200)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper2TokensMix(test);
         }
@@ -3419,85 +3439,85 @@ private:
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_}, XRP(10'000));
 
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
-                 .issuer = bob,
-                 .holders = {alice, gw},
+                 .issuer = bob_,
+                 .holders = {alice_, gw_},
                  .pay = 100'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            MPTTester ETH(
+            MPTTester eth(
                 {.env = env,
-                 .issuer = bob,
-                 .holders = {alice, gw},
+                 .issuer = bob_,
+                 .holders = {alice_, gw_},
                  .pay = 100'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammXRP_BTC(env, bob, XRP(100), BTC(100'000));
-            env(offer(gw, XRP(100), BTC(100'000)), txflags(tfPassive));
+            AMM const ammXrpBtc(env, bob_, XRP(100), btc(100'000));
+            env(offer(gw_, XRP(100), btc(100'000)), Txflags(tfPassive));
 
-            AMM const ammBTC_ETH(env, bob, BTC(100'000), ETH(100'000));
-            env(offer(gw, BTC(100'000), ETH(100'000)), txflags(tfPassive));
+            AMM const ammBtcEth(env, bob_, btc(100'000), eth(100'000));
+            env(offer(gw_, btc(100'000), eth(100'000)), Txflags(tfPassive));
 
-            Path const p = [&] {
-                Path result;
-                result.push_back(allPathElements(gw, MPT(BTC)));
-                result.push_back(cpe(ETH.issuanceID()));
+            TestPath const p = [&] {
+                TestPath result;
+                result.pushBack(allPathElements(gw_, MPT(btc)));
+                result.pushBack(cpe(eth.issuanceID()));
                 return result;
             }();
 
             PathSet const paths(p);
 
-            env(pay(alice, alice, ETH(1'000)),
-                json(paths.json()),
-                sendmax(XRP(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(alice_, alice_, eth(1'000)),
+                Json(paths.json()),
+                Sendmax(XRP(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(temBAD_PATH));
         }
 
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBob(env, bob, XRP(100), BTC(100));
+            AMM const ammBob(env, bob_, XRP(100), btc(100));
 
             // payment path: XRP -> XRP/BTC -> BTC/XRP
-            env(pay(alice, carol, XRP(100)),
-                path(~MPT(BTC), ~XRP),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_PATHS));
+            env(pay(alice_, carol_, XRP(100)),
+                Path(~MPT(btc), ~XRP),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_PATHS));
         }
 
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 100'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM const ammBob(env, bob, XRP(100), BTC(100));
+            AMM const ammBob(env, bob_, XRP(100), btc(100));
 
             // payment path: XRP -> XRP/BTC -> BTC/XRP
-            env(pay(alice, carol, XRP(100)),
-                path(~MPT(BTC), ~XRP),
-                sendmax(XRP(200)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_MAX));
+            env(pay(alice_, carol_, XRP(100)),
+                Path(~MPT(btc), ~XRP),
+                Sendmax(XRP(200)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_MAX));
         }
     }
 
@@ -3510,54 +3530,57 @@ private:
         {
             Env env(*this, features);
 
-            env.fund(XRP(10'000), alice, bob, carol, gw);
+            env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
 
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .flags = MPTDEXFlags});
+            MPTTester const btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(pay(gw, bob, BTC(100'000'000)));
-            env(pay(gw, alice, BTC(100'000'000)));
+            env(pay(gw_, bob_, btc(100'000'000)));
+            env(pay(gw_, alice_, btc(100'000'000)));
             env.close();
 
-            AMM const ammBob(env, bob, XRP(100), BTC(100'000'000));
+            AMM const ammBob(env, bob_, XRP(100), btc(100'000'000));
 
             // payment path: BTC -> BTC/XRP -> XRP/BTC
-            env(pay(alice, carol, BTC(100'000'000)),
-                sendmax(BTC(100'000'000)),
-                path(~XRP, ~MPT(BTC)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice_, carol_, btc(100'000'000)),
+                Sendmax(btc(100'000'000)),
+                Path(~XRP, ~MPT(btc)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
 
         {
             auto test = [&](auto&& issue1, auto&& issue2, auto&& issue3) {
                 Env env(*this, features);
 
-                env.fund(XRP(10'000), alice, bob, carol, gw);
+                env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const BTC = issue1(
-                    {.env = env, .token = "BTC", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const ETH = issue2(
-                    {.env = env, .token = "ETH", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const CNY = issue3(
-                    {.env = env, .token = "CNY", .issuer = gw, .holders = {alice, bob, carol}});
+                auto const btc = issue1(
+                    {.env = env, .token = "BTC", .issuer = gw_, .holders = {alice_, bob_, carol_}});
+                auto const eth = issue2(
+                    {.env = env, .token = "ETH", .issuer = gw_, .holders = {alice_, bob_, carol_}});
+                auto const cny = issue3(
+                    {.env = env, .token = "CNY", .issuer = gw_, .holders = {alice_, bob_, carol_}});
 
-                env(pay(gw, bob, BTC(200)));
-                env(pay(gw, bob, ETH(200)));
-                env(pay(gw, bob, CNY(100)));
+                env(pay(gw_, bob_, btc(200)));
+                env(pay(gw_, bob_, eth(200)));
+                env(pay(gw_, bob_, cny(100)));
                 env.close();
 
-                AMM const ammBobXRP_BTC(env, bob, XRP(100), BTC(100));
-                AMM const ammBobBTC_ETH(env, bob, BTC(100), ETH(100));
-                AMM const ammBobETH_CNY(env, bob, ETH(100), CNY(100));
+                AMM const ammBobXrpBtc(env, bob_, XRP(100), btc(100));
+                AMM const ammBobBtcEth(env, bob_, btc(100), eth(100));
+                AMM const ammBobEthCny(env, bob_, eth(100), cny(100));
 
                 // payment path: XRP->XRP/BTC->BTC/ETH->BTC/CNY
-                env(pay(alice, carol, CNY(100)),
-                    sendmax(XRP(100)),
-                    path(~BTC, ~ETH, ~BTC, ~CNY),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice_, carol_, cny(100)),
+                    Sendmax(XRP(100)),
+                    Path(~btc, ~eth, ~btc, ~cny),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper3TokensMix(test);
         }
@@ -3566,19 +3589,19 @@ private:
     void
     testPaths()
     {
-        path_find_consume_all();
-        via_offers_via_gateway();
-        receive_max();
-        path_find_01();
-        path_find_02();
-        path_find_06();
+        pathFindConsumeAll();
+        viaOffersViaGateway();
+        receiveMax();
+        pathFind01();
+        pathFind02();
+        pathFind06();
     }
 
     void
     testFlow()
     {
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         testFalseDry(all);
         testBookStep(all);
@@ -3591,7 +3614,7 @@ private:
     testCrossingLimits()
     {
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testStepLimit(all);
     }
 
@@ -3599,14 +3622,14 @@ private:
     testDeliverMin()
     {
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
-        test_convert_all_of_an_asset(all);
+        FeatureBitset const all{testableAmendments()};
+        testConvertAllOfAnAsset(all);
     }
 
     void
     testDepositAuth()
     {
-        auto const supported{jtx::testable_amendments()};
+        auto const supported{jtx::testableAmendments()};
         testPayment(supported);
         testPayMPT();
     }
@@ -3615,7 +3638,7 @@ private:
     testLock()
     {
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testIndividualLock(sa);
         testGlobalLock(sa);
         testOffersWhenLocked(sa);
@@ -3625,7 +3648,7 @@ private:
     testMultisign()
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
 
         testTxMultisign(all);
     }
@@ -3634,7 +3657,7 @@ private:
     testPayStrand()
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
 
         testToStrand(all);
         testRIPD1373(all);
diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp
index 9eb7eb1620..8132c012ad 100644
--- a/src/test/app/AMMExtended_test.cpp
+++ b/src/test/app/AMMExtended_test.cpp
@@ -68,7 +68,7 @@ namespace xrpl::test {
 struct AMMExtended_test : public jtx::AMMTest
 {
     // Use small Number mantissas for the life of this test.
-    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::mantissa_scale::small};
+    NumberMantissaScaleGuard const sg{xrpl::MantissaRange::MantissaScale::Small};
 
 private:
     void
@@ -89,28 +89,28 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob, carol}, XRP(10'000), {USD(200'000), BTC(2'000)});
+        fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {USD(200'000), BTC(2'000)});
 
         // Must be two offers at the same quality
         // "taker gets" must be XRP
         // (Different amounts so I can distinguish the offers)
-        env(offer(carol, BTC(49), XRP(49)));
-        env(offer(carol, BTC(51), XRP(51)));
+        env(offer(carol_, BTC(49), XRP(49)));
+        env(offer(carol_, BTC(51), XRP(51)));
 
         // Offers for the poor quality path
         // Must be two offers at the same quality
-        env(offer(carol, XRP(50), USD(50)));
-        env(offer(carol, XRP(50), USD(50)));
+        env(offer(carol_, XRP(50), USD(50)));
+        env(offer(carol_, XRP(50), USD(50)));
 
         // Good quality path
-        AMM const ammCarol(env, carol, BTC(1'000), USD(100'100));
+        AMM const ammCarol(env, carol_, BTC(1'000), USD(100'100));
 
-        PathSet const paths(Path(XRP, USD), Path(USD));
+        PathSet const paths(TestPath(XRP, USD), TestPath(USD));
 
-        env(pay(alice, bob, USD(100)),
-            json(paths.json()),
-            sendmax(BTC(1'000)),
-            txflags(tfPartialPayment));
+        env(pay(alice_, bob_, USD(100)),
+            Json(paths.json()),
+            Sendmax(BTC(1'000)),
+            Txflags(tfPartialPayment));
 
         if (!features[fixAMMv1_1])
         {
@@ -123,8 +123,8 @@ private:
                 STAmount{BTC, UINT64_C(1'001'000000374815), -12}, USD(100'000), ammCarol.tokens()));
         }
 
-        env.require(balance(bob, USD(200'100)));
-        BEAST_EXPECT(isOffer(env, carol, BTC(49), XRP(49)));
+        env.require(Balance(bob_, USD(200'100)));
+        BEAST_EXPECT(isOffer(env, carol_, BTC(49), XRP(49)));
     }
 
     void
@@ -140,29 +140,29 @@ private:
             Account const dan("dan");
             Account const gw1("gw1");
             Account const gw2("gw2");
-            auto const USD1 = gw1["USD"];
-            auto const USD2 = gw2["USD"];
+            auto const usD1 = gw1["USD"];
+            auto const usD2 = gw2["USD"];
 
-            env.fund(XRP(20'000), alice, noripple(bob), carol, dan, gw1, gw2);
+            env.fund(XRP(20'000), alice_, noripple(bob_), carol_, dan, gw1, gw2);
             env.close();
-            env.trust(USD1(20'000), alice, carol, dan);
-            env(trust(bob, USD1(1'000), tfSetNoRipple));
-            env.trust(USD2(1'000), alice, carol, dan);
-            env(trust(bob, USD2(1'000), tfSetNoRipple));
+            env.trust(usD1(20'000), alice_, carol_, dan);
+            env(trust(bob_, usD1(1'000), tfSetNoRipple));
+            env.trust(usD2(1'000), alice_, carol_, dan);
+            env(trust(bob_, usD2(1'000), tfSetNoRipple));
             env.close();
 
-            env(pay(gw1, dan, USD1(10'000)));
-            env(pay(gw1, bob, USD1(50)));
-            env(pay(gw2, bob, USD2(50)));
+            env(pay(gw1, dan, usD1(10'000)));
+            env(pay(gw1, bob_, usD1(50)));
+            env(pay(gw2, bob_, usD2(50)));
             env.close();
 
-            AMM const ammDan(env, dan, XRP(10'000), USD1(10'000));
+            AMM const ammDan(env, dan, XRP(10'000), usD1(10'000));
 
-            env(pay(alice, carol, USD2(50)),
-                path(~USD1, bob),
-                sendmax(XRP(50)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, usD2(50)),
+                Path(~usD1, bob_),
+                Sendmax(XRP(50)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_DRY));
         }
 
         {
@@ -172,33 +172,33 @@ private:
             Account const dan("dan");
             Account const gw1("gw1");
             Account const gw2("gw2");
-            auto const USD1 = gw1["USD"];
-            auto const USD2 = gw2["USD"];
+            auto const usD1 = gw1["USD"];
+            auto const usD2 = gw2["USD"];
 
-            env.fund(XRP(20'000), alice, bob, carol, gw1, gw2);
+            env.fund(XRP(20'000), alice_, bob_, carol_, gw1, gw2);
             env.fund(XRP(20'000), dan);
             env.close();
-            env.trust(USD1(20'000), alice, bob, carol, dan);
-            env.trust(USD2(1'000), alice, bob, carol, dan);
+            env.trust(usD1(20'000), alice_, bob_, carol_, dan);
+            env.trust(usD2(1'000), alice_, bob_, carol_, dan);
             env.close();
 
-            env(pay(gw1, dan, USD1(10'050)));
-            env(pay(gw1, bob, USD1(50)));
-            env(pay(gw2, bob, USD2(50)));
+            env(pay(gw1, dan, usD1(10'050)));
+            env(pay(gw1, bob_, usD1(50)));
+            env(pay(gw2, bob_, usD2(50)));
             env.close();
 
-            AMM const ammDan(env, dan, XRP(10'000), USD1(10'050));
+            AMM const ammDan(env, dan, XRP(10'000), usD1(10'050));
 
-            env(pay(alice, carol, USD2(50)),
-                path(~USD1, bob),
-                sendmax(XRP(50)),
-                txflags(tfNoRippleDirect));
-            BEAST_EXPECT(ammDan.expectBalances(XRP(10'050), USD1(10'000), ammDan.tokens()));
+            env(pay(alice_, carol_, usD2(50)),
+                Path(~usD1, bob_),
+                Sendmax(XRP(50)),
+                Txflags(tfNoRippleDirect));
+            BEAST_EXPECT(ammDan.expectBalances(XRP(10'050), usD1(10'000), ammDan.tokens()));
 
-            BEAST_EXPECT(expectLedgerEntryRoot(env, alice, XRP(20'000) - XRP(50) - txfee(env, 1)));
-            BEAST_EXPECT(expectHolding(env, bob, USD1(100)));
-            BEAST_EXPECT(expectHolding(env, bob, USD2(0)));
-            BEAST_EXPECT(expectHolding(env, carol, USD2(50)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, alice_, XRP(20'000) - XRP(50) - txFee(env, 1)));
+            BEAST_EXPECT(expectHolding(env, bob_, usD1(100)));
+            BEAST_EXPECT(expectHolding(env, bob_, usD2(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, usD2(50)));
         }
     }
 
@@ -217,21 +217,21 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 // Order that can't be filled
                 TER const killedCode{TER{tecKILLED}};
-                env(offer(carol, USD(100), XRP(100)), txflags(tfFillOrKill), ter(killedCode));
+                env(offer(carol_, USD(100), XRP(100)), Txflags(tfFillOrKill), Ter(killedCode));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                 // fee = AMM
-                BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRP(30'000) - (txfee(env, 1))));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                BEAST_EXPECT(expectLedgerEntryRoot(env, carol_, XRP(30'000) - (txFee(env, 1))));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
 
                 // Order that can be filled
-                env(offer(carol, XRP(100), USD(100)), txflags(tfFillOrKill), ter(tesSUCCESS));
+                env(offer(carol_, XRP(100), USD(100)), Txflags(tfFillOrKill), Ter(tesSUCCESS));
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'100), ammAlice.tokens()));
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, carol, XRP(30'000) + XRP(100) - txfee(env, 2)));
-                BEAST_EXPECT(expectHolding(env, carol, USD(29'900)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                    expectLedgerEntryRoot(env, carol_, XRP(30'000) + XRP(100) - txFee(env, 2)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(29'900)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
             {{XRP(10'100), USD(10'000)}},
             0,
@@ -242,19 +242,19 @@ private:
         // and add nothing on the books.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(offer(carol, XRP(200), USD(200)),
-                    txflags(tfImmediateOrCancel),
-                    ter(tesSUCCESS));
+                env(offer(carol_, XRP(200), USD(200)),
+                    Txflags(tfImmediateOrCancel),
+                    Ter(tesSUCCESS));
 
                 // AMM generates a synthetic offer of 100USD/100XRP
                 // to match the CLOB offer quality.
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'100), ammAlice.tokens()));
                 // +AMM - offer * fee
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, carol, XRP(30'000) + XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, carol_, XRP(30'000) + XRP(100) - txFee(env, 1)));
                 // AMM
-                BEAST_EXPECT(expectHolding(env, carol, USD(29'900)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(29'900)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
             {{XRP(10'100), USD(10'000)}},
             0,
@@ -266,11 +266,11 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 // Carol creates a passive offer that could cross AMM.
                 // Carol's offer should stay in the ledger.
-                env(offer(carol, XRP(100), USD(100), tfPassive));
+                env(offer(carol_, XRP(100), USD(100), tfPassive));
                 env.close();
                 BEAST_EXPECT(
                     ammAlice.expectBalances(XRP(10'100), STAmount{USD, 10'000}, ammAlice.tokens()));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{{XRP(100), STAmount{USD, 100}}}}));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{{XRP(100), STAmount{USD, 100}}}}));
             },
             {{XRP(10'100), USD(10'000)}},
             0,
@@ -280,19 +280,19 @@ private:
         // tfPassive -- cross only offers of better quality.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(offer(alice, USD(110), XRP(100)));
+                env(offer(alice_, USD(110), XRP(100)));
                 env.close();
 
                 // Carol creates a passive offer.  That offer should cross
                 // AMM and leave Alice's offer untouched.
-                env(offer(carol, XRP(100), USD(100), tfPassive));
+                env(offer(carol_, XRP(100), USD(100), tfPassive));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'900),
                     STAmount{USD, UINT64_C(9'082'56880733945), -11},
                     ammAlice.tokens()));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
-                BEAST_EXPECT(expectOffers(env, alice, 1));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
+                BEAST_EXPECT(expectOffers(env, alice_, 1));
             },
             {{XRP(11'000), USD(9'000)}},
             0,
@@ -309,23 +309,23 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {bob, alice}, XRP(300'000), {USD(100)}, Fund::All);
+        fund(env, gw_, {bob_, alice_}, XRP(300'000), {USD(100)}, Fund::All);
 
-        AMM const ammAlice(env, alice, XRP(150'000), USD(50));
+        AMM const ammAlice(env, alice_, XRP(150'000), USD(50));
 
         // Existing offer pays better than this wants.
         // Partially consume existing offer.
         // Pay 1 USD, get 3061224490 Drops.
         auto const xrpTransferred = XRPAmount{3'061'224'490};
-        env(offer(bob, USD(1), XRP(4'000)));
+        env(offer(bob_, USD(1), XRP(4'000)));
 
         BEAST_EXPECT(ammAlice.expectBalances(
             XRP(150'000) + xrpTransferred, USD(49), IOUAmount{273'861'278752583, -8}));
 
-        BEAST_EXPECT(expectHolding(env, bob, STAmount{USD, 101}));
+        BEAST_EXPECT(expectHolding(env, bob_, STAmount{USD, 101}));
         BEAST_EXPECT(
-            expectLedgerEntryRoot(env, bob, XRP(300'000) - xrpTransferred - txfee(env, 1)));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
+            expectLedgerEntryRoot(env, bob_, XRP(300'000) - xrpTransferred - txFee(env, 1)));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
     }
 
     void
@@ -337,21 +337,21 @@ private:
 
         Env env{*this, features};
 
-        env.fund(XRP(200'000), gw, alice, bob);
+        env.fund(XRP(200'000), gw_, alice_, bob_);
         env.close();
 
-        env(trust(alice, USD(1'000)));
+        env(trust(alice_, USD(1'000)));
 
-        env(pay(gw, alice, alice["USD"](500)));
+        env(pay(gw_, alice_, alice_["USD"](500)));
 
-        AMM const ammAlice(env, alice, XRP(150'000), USD(51));
-        env(offer(bob, USD(1), XRP(3'000)));
+        AMM const ammAlice(env, alice_, XRP(150'000), USD(51));
+        env(offer(bob_, USD(1), XRP(3'000)));
 
         BEAST_EXPECT(ammAlice.expectBalances(XRP(153'000), USD(50), ammAlice.tokens()));
 
-        auto jrr = ledgerEntryState(env, bob, gw, "USD");
+        auto jrr = ledgerEntryState(env, bob_, gw_, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-1");
-        jrr = ledgerEntryRoot(env, bob);
+        jrr = ledgerEntryRoot(env, bob_);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string((XRP(200'000) - XRP(3'000) - env.current()->fees().base * 1).xrp()));
@@ -366,24 +366,24 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob}, XRP(10'000));
-        env.require(owners(bob, 0));
+        fund(env, gw_, {alice_, bob_}, XRP(10'000));
+        env.require(Owners(bob_, 0));
 
-        env(trust(alice, USD(100)));
-        env(trust(bob, USD(1'000)));
-        env(pay(gw, bob, USD(1'000)));
+        env(trust(alice_, USD(100)));
+        env(trust(bob_, USD(1'000)));
+        env(pay(gw_, bob_, USD(1'000)));
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice_, 1), Owners(bob_, 1));
 
-        env(pay(gw, alice, alice["USD"](100)));
-        AMM const ammBob(env, bob, USD(200), XRP(1'500));
+        env(pay(gw_, alice_, alice_["USD"](100)));
+        AMM const ammBob(env, bob_, USD(200), XRP(1'500));
 
-        env(pay(alice, alice, XRP(500)), sendmax(USD(100)));
+        env(pay(alice_, alice_, XRP(500)), Sendmax(USD(100)));
 
         BEAST_EXPECT(ammBob.expectBalances(USD(300), XRP(1'000), ammBob.tokens()));
-        BEAST_EXPECT(expectHolding(env, alice, USD(0)));
+        BEAST_EXPECT(expectHolding(env, alice_, USD(0)));
 
-        auto jrr = ledgerEntryRoot(env, alice);
+        auto jrr = ledgerEntryRoot(env, alice_);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string((XRP(10'000) + XRP(500) - env.current()->fees().base * 2).xrp()));
@@ -400,22 +400,22 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 // Alice converts USD to XRP which should fail
                 // due to PartialPayment.
-                env(pay(alice, alice, XRP(100)), sendmax(USD(100)), ter(tecPATH_PARTIAL));
+                env(pay(alice_, alice_, XRP(100)), Sendmax(USD(100)), Ter(tecPATH_PARTIAL));
 
                 // Alice converts USD to XRP, should succeed because
                 // we permit partial payment
-                env(pay(alice, alice, XRP(100)), sendmax(USD(100)), txflags(tfPartialPayment));
+                env(pay(alice_, alice_, XRP(100)), Sendmax(USD(100)), Txflags(tfPartialPayment));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount{9'900'990'100}, USD(10'100), ammAlice.tokens()));
                 // initial 30,000 - 10,000AMM - 100pay
-                BEAST_EXPECT(expectHolding(env, alice, USD(19'900)));
+                BEAST_EXPECT(expectHolding(env, alice_, USD(19'900)));
                 // initial 30,000 - 10,0000AMM + 99.009900pay - fee*3
                 BEAST_EXPECT(expectLedgerEntryRoot(
                     env,
-                    alice,
+                    alice_,
                     XRP(30'000) - XRP(10'000) + XRPAmount{99'009'900} - ammCrtFee(env) -
-                        txfee(env, 2)));
+                        txFee(env, 2)));
             },
             {{XRP(10'000), USD(10'000)}},
             0,
@@ -432,13 +432,13 @@ private:
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
+                env.fund(XRP(1'000), bob_);
                 env.close();
-                env(trust(bob, USD(100)));
+                env(trust(bob_, USD(100)));
                 env.close();
-                env(pay(alice, bob, USD(100)), sendmax(XRP(100)));
+                env(pay(alice_, bob_, USD(100)), Sendmax(XRP(100)));
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-                BEAST_EXPECT(expectHolding(env, bob, USD(100)));
+                BEAST_EXPECT(expectHolding(env, bob_, USD(100)));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -455,14 +455,14 @@ private:
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
+                env.fund(XRP(1'000), bob_);
                 env.close();
-                env(trust(bob, USD(100)));
+                env(trust(bob_, USD(100)));
                 env.close();
-                env(pay(alice, bob, XRP(100)), sendmax(USD(100)));
+                env(pay(alice_, bob_, XRP(100)), Sendmax(USD(100)));
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'100), ammAlice.tokens()));
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(1'000) + XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(1'000) + XRP(100) - txFee(env, 1)));
             },
             {{XRP(10'100), USD(10'000)}},
             0,
@@ -482,38 +482,38 @@ private:
         auto const gw1 = Account{"gateway_1"};
         auto const gw2 = Account{"gateway_2"};
         auto const dan = Account{"dan"};
-        auto const USD1 = gw1["USD"];
-        auto const EUR1 = gw2["EUR"];
+        auto const usD1 = gw1["USD"];
+        auto const euR1 = gw2["EUR"];
 
-        fund(env, gw1, {gw2, alice, bob, carol, dan}, XRP(60'000));
-        env(trust(alice, USD1(1'000)));
+        fund(env, gw1, {gw2, alice_, bob_, carol_, dan}, XRP(60'000));
+        env(trust(alice_, usD1(1'000)));
         env.close();
-        env(trust(bob, EUR1(1'000)));
+        env(trust(bob_, euR1(1'000)));
         env.close();
-        env(trust(carol, USD1(10'000)));
+        env(trust(carol_, usD1(10'000)));
         env.close();
-        env(trust(dan, EUR1(1'000)));
+        env(trust(dan, euR1(1'000)));
         env.close();
 
-        env(pay(gw1, alice, alice["USD"](500)));
+        env(pay(gw1, alice_, alice_["USD"](500)));
         env.close();
-        env(pay(gw1, carol, carol["USD"](6'000)));
+        env(pay(gw1, carol_, carol_["USD"](6'000)));
         env(pay(gw2, dan, dan["EUR"](400)));
         env.close();
 
-        AMM const ammCarol(env, carol, USD1(5'000), XRP(50'000));
+        AMM const ammCarol(env, carol_, usD1(5'000), XRP(50'000));
 
-        env(offer(dan, XRP(500), EUR1(50)));
+        env(offer(dan, XRP(500), euR1(50)));
         env.close();
 
-        Json::Value jtp{Json::arrayValue};
+        json::Value jtp{json::ArrayValue};
         jtp[0u][0u][jss::currency] = "XRP";
-        env(pay(alice, bob, EUR1(30)), json(jss::Paths, jtp), sendmax(USD1(333)));
+        env(pay(alice_, bob_, euR1(30)), Json(jss::Paths, jtp), Sendmax(usD1(333)));
         env.close();
         BEAST_EXPECT(ammCarol.expectBalances(
-            XRP(49'700), STAmount{USD1, UINT64_C(5'030'181086519115), -12}, ammCarol.tokens()));
+            XRP(49'700), STAmount{usD1, UINT64_C(5'030'181086519115), -12}, ammCarol.tokens()));
         BEAST_EXPECT(expectOffers(env, dan, 1, {{Amounts{XRP(200), EUR(20)}}}));
-        BEAST_EXPECT(expectHolding(env, bob, STAmount{EUR1, 30}));
+        BEAST_EXPECT(expectHolding(env, bob_, STAmount{euR1, 30}));
     }
 
     void
@@ -528,46 +528,46 @@ private:
         auto const gw1 = Account{"gateway_1"};
         auto const gw2 = Account{"gateway_2"};
         auto const gw3 = Account{"gateway_3"};
-        auto const alice = Account{"alice"};
-        auto const bob = Account{"bob"};
-        auto const USD1 = gw1["USD"];
-        auto const USD2 = gw2["USD"];
-        auto const USD3 = gw3["USD"];
+        auto const localAlice = Account{"alice"};
+        auto const localBob = Account{"bob"};
+        auto const usD1 = gw1["USD"];
+        auto const usD2 = gw2["USD"];
+        auto const usD3 = gw3["USD"];
 
         // Provide micro amounts to compensate for fees to make results round
         // nice.
         // reserve: Alice has 3 entries in the ledger, via trust lines
         // fees:
-        //  1 for each trust limit == 3 (alice < mtgox/amazon/bitstamp) +
+        //  1 for each trust limit == 3 (alice_ < mtgox/amazon/bitstamp) +
         //  1 for payment          == 4
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(3) + env.current()->fees().base * 4;
 
-        env.fund(starting_xrp, gw1, gw2, gw3, alice);
-        env.fund(XRP(2'000), bob);
+        env.fund(startingXrp, gw1, gw2, gw3, localAlice);
+        env.fund(XRP(2'000), localBob);
         env.close();
 
-        env(trust(alice, USD1(1'000)));
-        env(trust(alice, USD2(1'000)));
-        env(trust(alice, USD3(1'000)));
-        env(trust(bob, USD1(1'200)));
-        env(trust(bob, USD2(1'100)));
+        env(trust(localAlice, usD1(1'000)));
+        env(trust(localAlice, usD2(1'000)));
+        env(trust(localAlice, usD3(1'000)));
+        env(trust(localBob, usD1(1'200)));
+        env(trust(localBob, usD2(1'100)));
 
-        env(pay(gw1, bob, bob["USD"](1'200)));
+        env(pay(gw1, localBob, localBob["USD"](1'200)));
 
-        AMM const ammBob(env, bob, XRP(1'000), USD1(1'200));
+        AMM const ammBob(env, localBob, XRP(1'000), usD1(1'200));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
-        env(offer(alice, USD1(200), XRP(200)));
+        env(offer(localAlice, usD1(200), XRP(200)));
 
         // The pool gets only 100XRP for ~109.09USD, even though
         // it can exchange more.
         BEAST_EXPECT(ammBob.expectBalances(
-            XRP(1'100), STAmount{USD1, UINT64_C(1'090'909090909091), -12}, ammBob.tokens()));
+            XRP(1'100), STAmount{usD1, UINT64_C(1'090'909090909091), -12}, ammBob.tokens()));
 
-        auto jrr = ledgerEntryState(env, alice, gw1, "USD");
+        auto jrr = ledgerEntryState(env, localAlice, gw1, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "109.090909090909");
-        jrr = ledgerEntryRoot(env, alice);
+        jrr = ledgerEntryRoot(env, localAlice);
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName] == XRP(350).value().getText());
     }
 
@@ -580,22 +580,22 @@ private:
 
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob}, XRP(200'000));
+        fund(env, gw_, {alice_, bob_}, XRP(200'000));
 
-        env(rate(gw, 1.005));
+        env(rate(gw_, 1.005));
 
-        env(trust(alice, USD(1'000)));
-        env(trust(bob, USD(1'000)));
+        env(trust(alice_, USD(1'000)));
+        env(trust(bob_, USD(1'000)));
 
-        env(pay(gw, bob, USD(1)));
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw_, bob_, USD(1)));
+        env(pay(gw_, alice_, USD(200)));
 
-        AMM const ammAlice(env, alice, USD(150), XRP(150'100));
-        env(offer(bob, XRP(100), USD(0.1)));
+        AMM const ammAlice(env, alice_, USD(150), XRP(150'100));
+        env(offer(bob_, XRP(100), USD(0.1)));
 
         BEAST_EXPECT(ammAlice.expectBalances(USD(150.1), XRP(150'000), ammAlice.tokens()));
 
-        auto const jrr = ledgerEntryState(env, bob, gw, "USD");
+        auto const jrr = ledgerEntryState(env, bob_, gw_, "USD");
         // Bob pays 0.005 transfer fee. Note 10**-10 round-off.
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-0.8995000001");
     }
@@ -609,13 +609,13 @@ private:
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(offer(carol, USD(100), XRP(100)), json(jss::Flags, tfSell));
+                env(offer(carol_, USD(100), XRP(100)), Json(jss::Flags, tfSell));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(9'999), ammAlice.tokens()));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'101)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'101)));
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, carol, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, carol_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
             {{XRP(9'900), USD(10'100)}},
             0,
@@ -632,28 +632,28 @@ private:
 
         Env env{*this, features};
 
-        auto const starting_xrp = XRP(100) + reserve(env, 1) + env.current()->fees().base * 2;
+        auto const startingXrp = XRP(100) + reserve(env, 1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice);
-        env.fund(XRP(2'000), bob);
+        env.fund(startingXrp, gw_, alice_);
+        env.fund(XRP(2'000), bob_);
         env.close();
 
-        env(trust(alice, USD(150)));
-        env(trust(bob, USD(4'000)));
+        env(trust(alice_, USD(150)));
+        env(trust(bob_, USD(4'000)));
 
-        env(pay(gw, bob, bob["USD"](2'200)));
+        env(pay(gw_, bob_, bob_["USD"](2'200)));
 
-        AMM const ammBob(env, bob, XRP(1'000), USD(2'200));
+        AMM const ammBob(env, bob_, XRP(1'000), USD(2'200));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
         // Taker pays 100 USD for 100 XRP.
         // Selling XRP.
         // Will sell all 100 XRP and get more USD than asked for.
-        env(offer(alice, USD(100), XRP(200)), json(jss::Flags, tfSell));
+        env(offer(alice_, USD(100), XRP(200)), Json(jss::Flags, tfSell));
         BEAST_EXPECT(ammBob.expectBalances(XRP(1'100), USD(2'000), ammBob.tokens()));
-        BEAST_EXPECT(expectHolding(env, alice, USD(200)));
-        BEAST_EXPECT(expectLedgerEntryRoot(env, alice, XRP(250)));
-        BEAST_EXPECT(expectOffers(env, alice, 0));
+        BEAST_EXPECT(expectHolding(env, alice_, USD(200)));
+        BEAST_EXPECT(expectLedgerEntryRoot(env, alice_, XRP(250)));
+        BEAST_EXPECT(expectOffers(env, alice_, 0));
     }
 
     void
@@ -665,23 +665,23 @@ private:
 
         Env env{*this, features};
 
-        auto const XTS = gw["XTS"];
-        auto const XXX = gw["XXX"];
+        auto const xts = gw_["XTS"];
+        auto const xxx = gw_["XXX"];
 
-        auto const starting_xrp = XRP(100.1) + reserve(env, 1) + env.current()->fees().base * 2;
-        fund(env, gw, {alice, bob}, starting_xrp, {XTS(100), XXX(100)}, Fund::All);
+        auto const startingXrp = XRP(100.1) + reserve(env, 1) + env.current()->fees().base * 2;
+        fund(env, gw_, {alice_, bob_}, startingXrp, {xts(100), xxx(100)}, Fund::All);
 
-        AMM const ammAlice(env, alice, XTS(100), XXX(100));
+        AMM const ammAlice(env, alice_, xts(100), xxx(100));
 
-        Json::Value payment;
+        json::Value payment;
         payment[jss::secret] = toBase58(generateSeed("bob"));
-        payment[jss::id] = env.seq(bob);
+        payment[jss::id] = env.seq(bob_);
         payment[jss::build_path] = true;
-        payment[jss::tx_json] = pay(bob, bob, bob["XXX"](1));
+        payment[jss::tx_json] = pay(bob_, bob_, bob_["XXX"](1));
         payment[jss::tx_json][jss::Sequence] =
-            env.current()->read(keylet::account(bob.id()))->getFieldU32(sfSequence);
+            env.current()->read(keylet::account(bob_.id()))->getFieldU32(sfSequence);
         payment[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
-        payment[jss::tx_json][jss::SendMax] = bob["XTS"](1.5).value().getJson(JsonOptions::none);
+        payment[jss::tx_json][jss::SendMax] = bob_["XTS"](1.5).value().getJson(JsonOptions::KNone);
         payment[jss::tx_json][jss::Flags] = tfPartialPayment;
         auto const jrr = env.rpc("json", "submit", to_string(payment));
         BEAST_EXPECT(jrr[jss::result][jss::status] == "success");
@@ -689,16 +689,16 @@ private:
         if (!features[fixAMMv1_1])
         {
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(XTS, UINT64_C(101'010101010101), -12), XXX(99), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, bob, STAmount{XTS, UINT64_C(98'989898989899), -12}));
+                STAmount(xts, UINT64_C(101'010101010101), -12), xxx(99), ammAlice.tokens()));
+            BEAST_EXPECT(expectHolding(env, bob_, STAmount{xts, UINT64_C(98'989898989899), -12}));
         }
         else
         {
             BEAST_EXPECT(ammAlice.expectBalances(
-                STAmount(XTS, UINT64_C(101'0101010101011), -13), XXX(99), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, bob, STAmount{XTS, UINT64_C(98'9898989898989), -13}));
+                STAmount(xts, UINT64_C(101'0101010101011), -13), xxx(99), ammAlice.tokens()));
+            BEAST_EXPECT(expectHolding(env, bob_, STAmount{xts, UINT64_C(98'9898989898989), -13}));
         }
-        BEAST_EXPECT(expectHolding(env, bob, XXX(101)));
+        BEAST_EXPECT(expectHolding(env, bob_, xxx(101)));
     }
 
     void
@@ -711,83 +711,83 @@ private:
         {
             Env env{*this, features};
 
-            fund(env, gw, {alice, bob, carol}, {USD(15'000), EUR(15'000)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, carol_}, {USD(15'000), EUR(15'000)}, Fund::All);
 
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP AMM is created.
-            //   o carol has EUR but wants USD.
-            // Note that carol's offer must come last.  If carol's offer is
+            //   o carol_ has EUR but wants USD.
+            // Note that carol_'s offer must come last.  If carol_'s offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            AMM const ammBob(env, bob, EUR(10'000), XRP(10'100));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            AMM const ammBob(env, bob_, EUR(10'000), XRP(10'100));
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
             BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), EUR(10'100), ammBob.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(15'100)));
-            BEAST_EXPECT(expectHolding(env, carol, EUR(14'900)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(15'100)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(14'900)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         {
             Env env{*this, features};
 
-            fund(env, gw, {alice, bob, carol}, {USD(15'000), EUR(15'000)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, carol_}, {USD(15'000), EUR(15'000)}, Fund::All);
 
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP offer is created.
-            //   o carol has EUR but wants USD.
-            // Note that carol's offer must come last.  If carol's offer is
-            // placed before AMM and bob's offer are created, then autobridging
+            //   o carol_ has EUR but wants USD.
+            // Note that carol_'s offer must come last.  If carol_'s offer is
+            // placed before AMM and bob_'s offer are created, then autobridging
             // will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            env(offer(bob, EUR(100), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            env(offer(bob_, EUR(100), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(15'100)));
-            BEAST_EXPECT(expectHolding(env, carol, EUR(14'900)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(15'100)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(14'900)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         {
             Env env{*this, features};
 
-            fund(env, gw, {alice, bob, carol}, {USD(15'000), EUR(15'000)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, carol_}, {USD(15'000), EUR(15'000)}, Fund::All);
 
             // The scenario:
             //   o USD/XRP offer is created.
             //   o EUR/XRP AMM is created.
-            //   o carol has EUR but wants USD.
-            // Note that carol's offer must come last.  If carol's offer is
-            // placed before AMM and alice's offer are created, then
+            //   o carol_ has EUR but wants USD.
+            // Note that carol_'s offer must come last.  If carol_'s offer is
+            // placed before AMM and alice_'s offer are created, then
             // autobridging will not occur.
-            env(offer(alice, XRP(100), USD(100)));
+            env(offer(alice_, XRP(100), USD(100)));
             env.close();
-            AMM const ammBob(env, bob, EUR(10'000), XRP(10'100));
+            AMM const ammBob(env, bob_, EUR(10'000), XRP(10'100));
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Carol's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             BEAST_EXPECT(ammBob.expectBalances(XRP(10'000), EUR(10'100), ammBob.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(15'100)));
-            BEAST_EXPECT(expectHolding(env, carol, EUR(14'900)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(15'100)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(14'900)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
     }
 
@@ -805,58 +805,58 @@ private:
 
         {
             Env env{*this, features};
-            fund(env, gw, {alice, bob}, {USD(20'000)}, Fund::All);
-            AMM const ammBob(env, bob, XRP(20'000), USD(200));
-            // alice submits a tfSell | tfFillOrKill offer that does not cross.
-            env(offer(alice, USD(2.1), XRP(210), tfSell | tfFillOrKill), ter(killedCode));
+            fund(env, gw_, {alice_, bob_}, {USD(20'000)}, Fund::All);
+            AMM const ammBob(env, bob_, XRP(20'000), USD(200));
+            // alice_ submits a tfSell | tfFillOrKill offer that does not cross.
+            env(offer(alice_, USD(2.1), XRP(210), tfSell | tfFillOrKill), Ter(killedCode));
 
             BEAST_EXPECT(ammBob.expectBalances(XRP(20'000), USD(200), ammBob.tokens()));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
         {
             Env env{*this, features};
-            fund(env, gw, {alice, bob}, {USD(1'000)}, Fund::All);
-            AMM const ammBob(env, bob, XRP(20'000), USD(200));
-            // alice submits a tfSell | tfFillOrKill offer that crosses.
+            fund(env, gw_, {alice_, bob_}, {USD(1'000)}, Fund::All);
+            AMM const ammBob(env, bob_, XRP(20'000), USD(200));
+            // alice_ submits a tfSell | tfFillOrKill offer that crosses.
             // Even though tfSell is present it doesn't matter this time.
-            env(offer(alice, USD(2), XRP(220), tfSell | tfFillOrKill));
+            env(offer(alice_, USD(2), XRP(220), tfSell | tfFillOrKill));
             env.close();
             BEAST_EXPECT(ammBob.expectBalances(
                 XRP(20'220), STAmount{USD, UINT64_C(197'8239366963403), -13}, ammBob.tokens()));
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount{USD, UINT64_C(1'002'17606330366), -11}));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+                expectHolding(env, alice_, STAmount{USD, UINT64_C(1'002'17606330366), -11}));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
         {
-            // alice submits a tfSell | tfFillOrKill offer that crosses and
+            // alice_ submits a tfSell | tfFillOrKill offer that crosses and
             // returns more than was asked for (because of the tfSell flag).
             Env env{*this, features};
-            fund(env, gw, {alice, bob}, {USD(1'000)}, Fund::All);
-            AMM const ammBob(env, bob, XRP(20'000), USD(200));
+            fund(env, gw_, {alice_, bob_}, {USD(1'000)}, Fund::All);
+            AMM const ammBob(env, bob_, XRP(20'000), USD(200));
 
-            env(offer(alice, USD(10), XRP(1'500), tfSell | tfFillOrKill));
+            env(offer(alice_, USD(10), XRP(1'500), tfSell | tfFillOrKill));
             env.close();
 
             BEAST_EXPECT(ammBob.expectBalances(
                 XRP(21'500), STAmount{USD, UINT64_C(186'046511627907), -12}, ammBob.tokens()));
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount{USD, UINT64_C(1'013'953488372093), -12}));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+                expectHolding(env, alice_, STAmount{USD, UINT64_C(1'013'953488372093), -12}));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
         {
-            // alice submits a tfSell | tfFillOrKill offer that doesn't cross.
+            // alice_ submits a tfSell | tfFillOrKill offer that doesn't cross.
             // This would have succeeded with a regular tfSell, but the
             // fillOrKill prevents the transaction from crossing since not
             // all of the offer is consumed because AMM generated offer,
-            // which matches alice's offer quality is ~ 10XRP/0.01996USD.
+            // which matches alice_'s offer quality is ~ 10XRP/0.01996USD.
             Env env{*this, features};
-            fund(env, gw, {alice, bob}, {USD(10'000)}, Fund::All);
-            AMM const ammBob(env, bob, XRP(5000), USD(10));
+            fund(env, gw_, {alice_, bob_}, {USD(10'000)}, Fund::All);
+            AMM const ammBob(env, bob_, XRP(5000), USD(10));
 
-            env(offer(alice, USD(1), XRP(501), tfSell | tfFillOrKill), ter(tecKILLED));
+            env(offer(alice_, USD(1), XRP(501), tfSell | tfFillOrKill), Ter(tecKILLED));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
     }
 
@@ -870,16 +870,16 @@ private:
         // AMM XRP/USD. Alice places USD/XRP offer.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(rate(gw, 1.25));
+                env(rate(gw_, 1.25));
                 env.close();
 
-                env(offer(carol, USD(100), XRP(100)));
+                env(offer(carol_, USD(100), XRP(100)));
                 env.close();
 
                 // AMM doesn't pay the transfer fee
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -890,16 +890,16 @@ private:
         // in return for USD.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(rate(gw, 1.25));
+                env(rate(gw_, 1.25));
                 env.close();
 
-                env(offer(carol, XRP(100), USD(100)));
+                env(offer(carol_, XRP(100), USD(100)));
                 env.close();
 
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'100), ammAlice.tokens()));
                 // Carol pays 25% transfer fee
-                BEAST_EXPECT(expectHolding(env, carol, USD(29'875)));
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(29'875)));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             },
             {{XRP(10'100), USD(10'000)}},
             0,
@@ -909,53 +909,53 @@ private:
         {
             // Bridged crossing.
             Env env{*this, features};
-            fund(env, gw, {alice, bob, carol}, {USD(15'000), EUR(15'000)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_, carol_}, {USD(15'000), EUR(15'000)}, Fund::All);
+            env(rate(gw_, 1.25));
 
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP Offer is created.
-            //   o carol has EUR but wants USD.
+            //   o carol_ has EUR but wants USD.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            env(offer(bob, EUR(100), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            env(offer(bob_, EUR(100), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Bob's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             // AMM doesn't pay the transfer fee
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(15'100)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(15'100)));
             // Carol pays 25% transfer fee.
-            BEAST_EXPECT(expectHolding(env, carol, EUR(14'875)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(14'875)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         {
             // Bridged crossing. The transfer fee is paid on the step not
             // involving AMM as src/dst.
             Env env{*this, features};
-            fund(env, gw, {alice, bob, carol}, {USD(15'000), EUR(15'000)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_, carol_}, {USD(15'000), EUR(15'000)}, Fund::All);
+            env(rate(gw_, 1.25));
 
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP Offer is created.
-            //   o carol has EUR but wants USD.
+            //   o carol_ has EUR but wants USD.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'050));
-            env(offer(bob, EUR(100), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'050));
+            env(offer(bob_, EUR(100), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // partially consumes Bob's offer.
-            env(offer(carol, USD(50), EUR(50)));
+            env(offer(carol_, USD(50), EUR(50)));
             env.close();
             // This test verifies that the amount removed from an offer
             // accounts for the transfer fee that is removed from the
@@ -963,11 +963,11 @@ private:
 
             // AMM doesn't pay the transfer fee
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'050), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(15'050)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(15'050)));
             // Carol pays 25% transfer fee.
-            BEAST_EXPECT(expectHolding(env, carol, EUR(14'937.5)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 1, {{Amounts{EUR(50), XRP(50)}}}));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(14'937.5)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 1, {{Amounts{EUR(50), XRP(50)}}}));
         }
 
         {
@@ -975,42 +975,42 @@ private:
             // Bridged crossing. The transfer fee is paid on the step not
             // involving AMM as src/dst.
             Env env{*this, features};
-            fund(env, gw, {alice, carol, bob}, XRP(30'000));
-            env(rate(gw, 1.25));
-            env(trust(alice, USD(15'000)));
-            env(trust(bob, EUR(15'000)));
-            env(trust(carol, EUR(15'000)), qualityInPercent(80));
-            env(trust(bob, USD(15'000)));
-            env(trust(carol, USD(15'000)));
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(30'000));
+            env(rate(gw_, 1.25));
+            env(trust(alice_, USD(15'000)));
+            env(trust(bob_, EUR(15'000)));
+            env(trust(carol_, EUR(15'000)), QualityInPercent(80));
+            env(trust(bob_, USD(15'000)));
+            env(trust(carol_, USD(15'000)));
             env.close();
 
-            env(pay(gw, alice, USD(11'000)));
-            env(pay(gw, carol, EUR(1'000)), sendmax(EUR(10'000)));
+            env(pay(gw_, alice_, USD(11'000)));
+            env(pay(gw_, carol_, EUR(1'000)), Sendmax(EUR(10'000)));
             env.close();
             // 1000 / 0.8
-            BEAST_EXPECT(expectHolding(env, carol, EUR(1'250)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(1'250)));
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP Offer is created.
-            //   o carol has EUR but wants USD.
+            //   o carol_ has EUR but wants USD.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            env(offer(bob, EUR(100), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            env(offer(bob_, EUR(100), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Bob's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             // AMM doesn't pay the transfer fee
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(100)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(100)));
             // Carol pays 25% transfer fee: 1250 - 100(offer) - 25(transfer fee)
-            BEAST_EXPECT(expectHolding(env, carol, EUR(1'125)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(1'125)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         {
@@ -1018,41 +1018,41 @@ private:
             // Bridged crossing. The transfer fee is paid on the step not
             // involving AMM as src/dst.
             Env env{*this, features};
-            fund(env, gw, {alice, carol, bob}, XRP(30'000));
-            env(rate(gw, 1.25));
-            env(trust(alice, USD(15'000)));
-            env(trust(bob, EUR(15'000)));
-            env(trust(carol, EUR(15'000)), qualityOutPercent(120));
-            env(trust(bob, USD(15'000)));
-            env(trust(carol, USD(15'000)));
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(30'000));
+            env(rate(gw_, 1.25));
+            env(trust(alice_, USD(15'000)));
+            env(trust(bob_, EUR(15'000)));
+            env(trust(carol_, EUR(15'000)), QualityOutPercent(120));
+            env(trust(bob_, USD(15'000)));
+            env(trust(carol_, USD(15'000)));
             env.close();
 
-            env(pay(gw, alice, USD(11'000)));
-            env(pay(gw, carol, EUR(1'000)), sendmax(EUR(10'000)));
+            env(pay(gw_, alice_, USD(11'000)));
+            env(pay(gw_, carol_, EUR(1'000)), Sendmax(EUR(10'000)));
             env.close();
-            BEAST_EXPECT(expectHolding(env, carol, EUR(1'000)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(1'000)));
             // The scenario:
             //   o USD/XRP AMM is created.
             //   o EUR/XRP Offer is created.
-            //   o carol has EUR but wants USD.
+            //   o carol_ has EUR but wants USD.
             // Note that Carol's offer must come last.  If Carol's offer is
             // placed before AMM is created, then autobridging will not occur.
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            env(offer(bob, EUR(100), XRP(100)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            env(offer(bob_, EUR(100), XRP(100)));
             env.close();
 
             // Carol makes an offer that consumes AMM liquidity and
             // fully consumes Bob's offer.
-            env(offer(carol, USD(100), EUR(100)));
+            env(offer(carol_, USD(100), EUR(100)));
             env.close();
 
             // AMM pay doesn't transfer fee
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(100)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(100)));
             // Carol pays 25% transfer fee: 1000 - 100(offer) - 25(transfer fee)
-            BEAST_EXPECT(expectHolding(env, carol, EUR(875)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(875)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
     }
 
@@ -1066,19 +1066,19 @@ private:
 
         Env env{*this, features};
 
-        auto const USD_bob = bob["USD"];
+        auto const usdBob = bob_["USD"];
         auto const f = env.current()->fees().base;
 
-        env.fund(XRP(30'000) + f, alice, bob);
+        env.fund(XRP(30'000) + f, alice_, bob_);
         env.close();
-        AMM const ammBob(env, bob, XRP(10'000), USD_bob(10'100));
+        AMM const ammBob(env, bob_, XRP(10'000), usdBob(10'100));
 
-        env(offer(alice, USD_bob(100), XRP(100)));
+        env(offer(alice_, usdBob(100), XRP(100)));
         env.close();
 
-        BEAST_EXPECT(ammBob.expectBalances(XRP(10'100), USD_bob(10'000), ammBob.tokens()));
-        BEAST_EXPECT(expectOffers(env, alice, 0));
-        BEAST_EXPECT(expectHolding(env, alice, USD_bob(100)));
+        BEAST_EXPECT(ammBob.expectBalances(XRP(10'100), usdBob(10'000), ammBob.tokens()));
+        BEAST_EXPECT(expectOffers(env, alice_, 0));
+        BEAST_EXPECT(expectHolding(env, alice_, usdBob(100)));
     }
 
     void
@@ -1098,52 +1098,52 @@ private:
         {
             // A trust line's QualityOut should not affect offer crossing.
             auto const ann = Account("ann");
-            auto const A_BUX = ann["BUX"];
-            auto const bob = Account("bob");
+            auto const aBux = ann["BUX"];
+            auto const localBob = Account("bob");
             auto const cam = Account("cam");
             auto const dan = Account("dan");
-            auto const D_BUX = dan["BUX"];
+            auto const dBux = dan["BUX"];
 
             // Verify trust line QualityOut affects payments.
-            env.fund(reserve(env, 4) + (fee * 4), ann, bob, cam, dan);
+            env.fund(reserve(env, 4) + (fee * 4), ann, localBob, cam, dan);
             env.close();
 
-            env(trust(bob, A_BUX(400)));
-            env(trust(bob, D_BUX(200)), qualityOutPercent(120));
-            env(trust(cam, D_BUX(100)));
+            env(trust(localBob, aBux(400)));
+            env(trust(localBob, dBux(200)), QualityOutPercent(120));
+            env(trust(cam, dBux(100)));
             env.close();
-            env(pay(dan, bob, D_BUX(100)));
+            env(pay(dan, localBob, dBux(100)));
             env.close();
-            BEAST_EXPECT(expectHolding(env, bob, D_BUX(100)));
+            BEAST_EXPECT(expectHolding(env, localBob, dBux(100)));
 
-            env(pay(ann, cam, D_BUX(60)), path(bob, dan), sendmax(A_BUX(200)));
+            env(pay(ann, cam, dBux(60)), Path(localBob, dan), Sendmax(aBux(200)));
             env.close();
 
-            BEAST_EXPECT(expectHolding(env, ann, A_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, ann, D_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, bob, A_BUX(72)));
-            BEAST_EXPECT(expectHolding(env, bob, D_BUX(40)));
-            BEAST_EXPECT(expectHolding(env, cam, A_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, cam, D_BUX(60)));
-            BEAST_EXPECT(expectHolding(env, dan, A_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, dan, D_BUX(none)));
+            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, dBux(60)));
+            BEAST_EXPECT(expectHolding(env, dan, aBux(kNONE)));
+            BEAST_EXPECT(expectHolding(env, dan, dBux(kNONE)));
 
-            AMM const ammBob(env, bob, A_BUX(30), D_BUX(30));
+            AMM const ammBob(env, localBob, aBux(30), dBux(30));
 
-            env(trust(ann, D_BUX(100)));
+            env(trust(ann, dBux(100)));
             env.close();
 
             // This payment caused the assert.
-            env(pay(ann, ann, D_BUX(30)), path(A_BUX, D_BUX), sendmax(A_BUX(30)), ter(temBAD_PATH));
+            env(pay(ann, ann, dBux(30)), Path(aBux, dBux), Sendmax(aBux(30)), Ter(temBAD_PATH));
             env.close();
 
-            BEAST_EXPECT(ammBob.expectBalances(A_BUX(30), D_BUX(30), ammBob.tokens()));
-            BEAST_EXPECT(expectHolding(env, ann, A_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, ann, D_BUX(0)));
-            BEAST_EXPECT(expectHolding(env, cam, A_BUX(none)));
-            BEAST_EXPECT(expectHolding(env, cam, D_BUX(60)));
-            BEAST_EXPECT(expectHolding(env, dan, A_BUX(0)));
-            BEAST_EXPECT(expectHolding(env, dan, D_BUX(none)));
+            BEAST_EXPECT(ammBob.expectBalances(aBux(30), dBux(30), ammBob.tokens()));
+            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, dBux(60)));
+            BEAST_EXPECT(expectHolding(env, dan, aBux(0)));
+            BEAST_EXPECT(expectHolding(env, dan, dBux(kNONE)));
         }
     }
 
@@ -1161,72 +1161,72 @@ private:
         Env env{*this, features};
 
         auto const ann = Account("ann");
-        auto const bob = Account("bob");
+        auto const localBob = Account("bob");
         auto const cam = Account("cam");
         auto const carol = Account("carol");
-        auto const A_BUX = ann["BUX"];
-        auto const B_BUX = bob["BUX"];
+        auto const aBux = ann["BUX"];
+        auto const bBux = localBob["BUX"];
 
         auto const fee = env.current()->fees().base;
         env.fund(XRP(1'000), carol);
-        env.fund(reserve(env, 4) + (fee * 5), ann, bob, cam);
+        env.fund(reserve(env, 4) + (fee * 5), ann, localBob, cam);
         env.close();
 
-        env(trust(ann, B_BUX(40)));
-        env(trust(cam, A_BUX(40)));
-        env(trust(bob, A_BUX(30)));
-        env(trust(cam, B_BUX(40)));
-        env(trust(carol, B_BUX(400)));
-        env(trust(carol, A_BUX(400)));
+        env(trust(ann, bBux(40)));
+        env(trust(cam, aBux(40)));
+        env(trust(localBob, aBux(30)));
+        env(trust(cam, bBux(40)));
+        env(trust(carol, bBux(400)));
+        env(trust(carol, aBux(400)));
         env.close();
 
-        env(pay(ann, cam, A_BUX(35)));
-        env(pay(bob, cam, B_BUX(35)));
-        env(pay(bob, carol, B_BUX(400)));
-        env(pay(ann, carol, A_BUX(400)));
+        env(pay(ann, cam, aBux(35)));
+        env(pay(localBob, cam, bBux(35)));
+        env(pay(localBob, carol, bBux(400)));
+        env(pay(ann, carol, aBux(400)));
 
-        AMM const ammCarol(env, carol, A_BUX(300), B_BUX(330));
+        AMM const ammCarol(env, carol, aBux(300), bBux(330));
 
         // cam puts an offer on the books that her upcoming offer could cross.
         // But this offer should be deleted, not crossed, by her upcoming
         // offer.
-        env(offer(cam, A_BUX(29), B_BUX(30), tfPassive));
+        env(offer(cam, aBux(29), bBux(30), tfPassive));
         env.close();
-        env.require(balance(cam, A_BUX(35)));
-        env.require(balance(cam, B_BUX(35)));
+        env.require(Balance(cam, aBux(35)));
+        env.require(Balance(cam, bBux(35)));
         env.require(offers(cam, 1));
 
         // This offer caused the assert.
-        env(offer(cam, B_BUX(30), A_BUX(30)));
+        env(offer(cam, bBux(30), aBux(30)));
 
         // AMM is consumed up to the first cam Offer quality
         if (!features[fixAMMv1_1])
         {
             BEAST_EXPECT(ammCarol.expectBalances(
-                STAmount{A_BUX, UINT64_C(309'3541659651605), -13},
-                STAmount{B_BUX, UINT64_C(320'0215509984417), -13},
+                STAmount{aBux, UINT64_C(309'3541659651605), -13},
+                STAmount{bBux, UINT64_C(320'0215509984417), -13},
                 ammCarol.tokens()));
             BEAST_EXPECT(expectOffers(
                 env,
                 cam,
                 1,
                 {{Amounts{
-                    STAmount{B_BUX, UINT64_C(20'0215509984417), -13},
-                    STAmount{A_BUX, UINT64_C(20'0215509984417), -13}}}}));
+                    STAmount{bBux, UINT64_C(20'0215509984417), -13},
+                    STAmount{aBux, UINT64_C(20'0215509984417), -13}}}}));
         }
         else
         {
             BEAST_EXPECT(ammCarol.expectBalances(
-                STAmount{A_BUX, UINT64_C(309'3541659651604), -13},
-                STAmount{B_BUX, UINT64_C(320'0215509984419), -13},
+                STAmount{aBux, UINT64_C(309'3541659651604), -13},
+                STAmount{bBux, UINT64_C(320'0215509984419), -13},
                 ammCarol.tokens()));
             BEAST_EXPECT(expectOffers(
                 env,
                 cam,
                 1,
                 {{Amounts{
-                    STAmount{B_BUX, UINT64_C(20'0215509984419), -13},
-                    STAmount{A_BUX, UINT64_C(20'0215509984419), -13}}}}));
+                    STAmount{bBux, UINT64_C(20'0215509984419), -13},
+                    STAmount{aBux, UINT64_C(20'0215509984419), -13}}}}));
         }
     }
 
@@ -1239,43 +1239,43 @@ private:
 
         Env env{*this, features};
 
-        auto const aliceUSD = alice["USD"];
-        auto const bobUSD = bob["USD"];
+        auto const aliceUSD = alice_["USD"];
+        auto const bobUSD = bob_["USD"];
 
-        env.fund(XRP(400'000), gw, alice, bob);
+        env.fund(XRP(400'000), gw_, alice_, bob_);
         env.close();
 
         // GW requires authorization for holders of its IOUs
-        env(fset(gw, asfRequireAuth));
+        env(fset(gw_, asfRequireAuth));
         env.close();
 
-        // Properly set trust and have gw authorize bob and alice
-        env(trust(gw, bobUSD(100)), txflags(tfSetfAuth));
-        env(trust(bob, USD(100)));
-        env(trust(gw, aliceUSD(100)), txflags(tfSetfAuth));
-        env(trust(alice, USD(2'000)));
-        env(pay(gw, alice, USD(1'000)));
+        // Properly set trust and have gw_ authorize bob_ and alice_
+        env(trust(gw_, bobUSD(100)), Txflags(tfSetfAuth));
+        env(trust(bob_, USD(100)));
+        env(trust(gw_, aliceUSD(100)), Txflags(tfSetfAuth));
+        env(trust(alice_, USD(2'000)));
+        env(pay(gw_, alice_, USD(1'000)));
         env.close();
         // Alice is able to create AMM since the GW has authorized her
-        AMM const ammAlice(env, alice, USD(1'000), XRP(1'050));
+        AMM const ammAlice(env, alice_, USD(1'000), XRP(1'050));
 
         // Set up authorized trust line for AMM.
-        env(trust(gw, STAmount{Issue{USD.currency, ammAlice.ammAccount()}, 10}),
-            txflags(tfSetfAuth));
+        env(trust(gw_, STAmount{Issue{USD.currency, ammAlice.ammAccount()}, 10}),
+            Txflags(tfSetfAuth));
         env.close();
 
-        env(pay(gw, bob, USD(50)));
+        env(pay(gw_, bob_, USD(50)));
         env.close();
 
-        BEAST_EXPECT(expectHolding(env, bob, USD(50)));
+        BEAST_EXPECT(expectHolding(env, bob_, USD(50)));
 
         // Bob's offer should cross Alice's AMM
-        env(offer(bob, XRP(50), USD(50)));
+        env(offer(bob_, XRP(50), USD(50)));
         env.close();
 
         BEAST_EXPECT(ammAlice.expectBalances(USD(1'050), XRP(1'000), ammAlice.tokens()));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
-        BEAST_EXPECT(expectHolding(env, bob, USD(0)));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
+        BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
     }
 
     void
@@ -1287,61 +1287,61 @@ private:
 
         Env env{*this, features};
 
-        env.fund(XRP(400'000), gw, alice, bob);
+        env.fund(XRP(400'000), gw_, alice_, bob_);
         env.close();
 
         // Alice doesn't have the funds
         {
-            AMM const ammAlice(env, alice, USD(1'000), XRP(1'000), ter(tecUNFUNDED_AMM));
+            AMM const ammAlice(env, alice_, USD(1'000), XRP(1'000), Ter(tecUNFUNDED_AMM));
         }
 
-        env(fset(gw, asfRequireAuth));
+        env(fset(gw_, asfRequireAuth));
         env.close();
 
-        env(trust(gw, bob["USD"](50)), txflags(tfSetfAuth));
+        env(trust(gw_, bob_["USD"](50)), Txflags(tfSetfAuth));
         env.close();
-        env(trust(bob, USD(50)));
+        env(trust(bob_, USD(50)));
         env.close();
 
-        env(pay(gw, bob, USD(50)));
+        env(pay(gw_, bob_, USD(50)));
         env.close();
-        BEAST_EXPECT(expectHolding(env, bob, USD(50)));
+        BEAST_EXPECT(expectHolding(env, bob_, USD(50)));
 
         // Alice should not be able to create AMM without authorization.
         {
-            AMM const ammAlice(env, alice, USD(1'000), XRP(1'000), ter(tecNO_LINE));
+            AMM const ammAlice(env, alice_, USD(1'000), XRP(1'000), Ter(tecNO_LINE));
         }
 
         // Set up a trust line for Alice, but don't authorize it. Alice
-        // should still not be able to create AMM for USD/gw.
-        env(trust(gw, alice["USD"](2'000)));
+        // should still not be able to create AMM for USD/gw_.
+        env(trust(gw_, alice_["USD"](2'000)));
         env.close();
 
         {
-            AMM const ammAlice(env, alice, USD(1'000), XRP(1'000), ter(tecNO_AUTH));
+            AMM const ammAlice(env, alice_, USD(1'000), XRP(1'000), Ter(tecNO_AUTH));
         }
 
         // Finally, set up an authorized trust line for Alice. Now Alice's
         // AMM create should succeed.
-        env(trust(gw, alice["USD"](100)), txflags(tfSetfAuth));
-        env(trust(alice, USD(2'000)));
-        env(pay(gw, alice, USD(1'000)));
+        env(trust(gw_, alice_["USD"](100)), Txflags(tfSetfAuth));
+        env(trust(alice_, USD(2'000)));
+        env(pay(gw_, alice_, USD(1'000)));
         env.close();
 
-        AMM const ammAlice(env, alice, USD(1'000), XRP(1'050));
+        AMM const ammAlice(env, alice_, USD(1'000), XRP(1'050));
 
         // Set up authorized trust line for AMM.
-        env(trust(gw, STAmount{Issue{USD.currency, ammAlice.ammAccount()}, 10}),
-            txflags(tfSetfAuth));
+        env(trust(gw_, STAmount{Issue{USD.currency, ammAlice.ammAccount()}, 10}),
+            Txflags(tfSetfAuth));
         env.close();
 
-        // Now bob creates his offer again, which crosses with  alice's AMM.
-        env(offer(bob, XRP(50), USD(50)));
+        // Now bob_ creates his offer again, which crosses with  alice_'s AMM.
+        env(offer(bob_, XRP(50), USD(50)));
         env.close();
 
         BEAST_EXPECT(ammAlice.expectBalances(USD(1'050), XRP(1'000), ammAlice.tokens()));
-        BEAST_EXPECT(expectOffers(env, bob, 0));
-        BEAST_EXPECT(expectHolding(env, bob, USD(0)));
+        BEAST_EXPECT(expectOffers(env, bob_, 0));
+        BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
     }
 
     void
@@ -1351,7 +1351,7 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
         FeatureBitset const all{
-            testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+            testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
 
         testRmFundedOffer(all);
         testRmFundedOffer(all - fixAMMv1_1 - fixAMMv1_3);
@@ -1382,62 +1382,62 @@ private:
     }
 
     void
-    path_find_consume_all()
+    pathFindConsumeAll()
     {
         testcase("path find consume all");
         using namespace jtx;
 
         Env env = pathTestEnv();
-        env.fund(XRP(100'000'250), alice);
-        fund(env, gw, {carol, bob}, {USD(100)}, Fund::All);
-        fund(env, gw, {alice}, {USD(100)}, Fund::TokenOnly);
-        AMM const ammCarol(env, carol, XRP(100), USD(100));
+        env.fund(XRP(100'000'250), alice_);
+        fund(env, gw_, {carol_, bob_}, {USD(100)}, Fund::All);
+        fund(env, gw_, {alice_}, {USD(100)}, Fund::TokenOnly);
+        AMM const ammCarol(env, carol_, XRP(100), USD(100));
 
         STPathSet st;
         STAmount sa;
         STAmount da;
-        std::tie(st, sa, da) =
-            find_paths(env, alice, bob, bob["AUD"](-1), std::optional<STAmount>(XRP(100'000'000)));
+        std::tie(st, sa, da) = findPaths(
+            env, alice_, bob_, bob_["AUD"](-1), std::optional<STAmount>(XRP(100'000'000)));
         BEAST_EXPECT(st.empty());
-        std::tie(st, sa, da) =
-            find_paths(env, alice, bob, bob["USD"](-1), std::optional<STAmount>(XRP(100'000'000)));
+        std::tie(st, sa, da) = findPaths(
+            env, alice_, bob_, bob_["USD"](-1), std::optional<STAmount>(XRP(100'000'000)));
         // Alice sends all requested 100,000,000XRP
         BEAST_EXPECT(sa == XRP(100'000'000));
         // Bob gets ~99.99USD. This is the amount Bob
         // can get out of AMM for 100,000,000XRP.
-        BEAST_EXPECT(equal(da, STAmount{bob["USD"], UINT64_C(99'9999000001), -10}));
+        BEAST_EXPECT(equal(da, STAmount{bob_["USD"], UINT64_C(99'9999000001), -10}));
     }
 
-    // carol holds gateway AUD, sells gateway AUD for XRP
-    // bob will hold gateway AUD
-    // alice pays bob gateway AUD using XRP
+    // carol_ holds gateway AUD, sells gateway AUD for XRP
+    // bob_ will hold gateway AUD
+    // alice_ pays bob_ gateway AUD using XRP
     void
-    via_offers_via_gateway()
+    viaOffersViaGateway()
     {
         testcase("via gateway");
         using namespace jtx;
 
         Env env = pathTestEnv();
-        auto const AUD = gw["AUD"];
-        env.fund(XRP(10'000), alice, bob, carol, gw);
+        auto const aud = gw_["AUD"];
+        env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
         env.close();
-        env(rate(gw, 1.1));
-        env.trust(AUD(2'000), bob, carol);
-        env(pay(gw, carol, AUD(51)));
+        env(rate(gw_, 1.1));
+        env.trust(aud(2'000), bob_, carol_);
+        env(pay(gw_, carol_, aud(51)));
         env.close();
-        AMM const ammCarol(env, carol, XRP(40), AUD(51));
-        env(pay(alice, bob, AUD(10)), sendmax(XRP(100)), paths(XRP));
+        AMM const ammCarol(env, carol_, XRP(40), aud(51));
+        env(pay(alice_, bob_, aud(10)), Sendmax(XRP(100)), Paths(XRP));
         env.close();
-        // AMM offer is 51.282052XRP/11AUD, 11AUD/1.1 = 10AUD to bob
-        BEAST_EXPECT(ammCarol.expectBalances(XRP(51), AUD(40), ammCarol.tokens()));
-        BEAST_EXPECT(expectHolding(env, bob, AUD(10)));
+        // AMM offer is 51.282052XRP/11AUD, 11AUD/1.1 = 10AUD to bob_
+        BEAST_EXPECT(ammCarol.expectBalances(XRP(51), aud(40), ammCarol.tokens()));
+        BEAST_EXPECT(expectHolding(env, bob_, aud(10)));
 
-        auto const result = find_paths(env, alice, bob, Account(bob)["USD"](25));
+        auto const result = findPaths(env, alice_, bob_, Account(bob_)["USD"](25));
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    receive_max()
+    receiveMax()
     {
         testcase("Receive max");
         using namespace jtx;
@@ -1445,26 +1445,26 @@ private:
         {
             // XRP -> IOU receive max
             Env env = pathTestEnv();
-            fund(env, gw, {alice, bob, charlie}, {USD(11)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, charlie}, {USD(11)}, Fund::All);
             AMM const ammCharlie(env, charlie, XRP(10), USD(11));
-            auto [st, sa, da] = find_paths(env, alice, bob, USD(-1), XRP(1).value());
+            auto [st, sa, da] = findPaths(env, alice_, bob_, USD(-1), XRP(1).value());
             BEAST_EXPECT(sa == XRP(1));
             BEAST_EXPECT(equal(da, USD(1)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
                 auto const& pathElem = st[0][0];
                 BEAST_EXPECT(
-                    pathElem.isOffer() && pathElem.getIssuerID() == gw.id() &&
+                    pathElem.isOffer() && pathElem.getIssuerID() == gw_.id() &&
                     pathElem.getCurrency() == USD.currency);
             }
         }
         {
             // IOU -> XRP receive max
             Env env = pathTestEnv();
-            fund(env, gw, {alice, bob, charlie}, {USD(11)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, charlie}, {USD(11)}, Fund::All);
             AMM const ammCharlie(env, charlie, XRP(11), USD(10));
             env.close();
-            auto [st, sa, da] = find_paths(env, alice, bob, drops(-1), USD(1).value());
+            auto [st, sa, da] = findPaths(env, alice_, bob_, drops(-1), USD(1).value());
             BEAST_EXPECT(sa == USD(1));
             BEAST_EXPECT(equal(da, XRP(1)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
@@ -1478,169 +1478,169 @@ private:
     }
 
     void
-    path_find_01()
+    pathFind01()
     {
         testcase("Path Find: XRP -> XRP and XRP -> IOU");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const G3{"G3"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const g3{"G3"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(100'000), A1);
-        env.fund(XRP(10'000), A2);
-        env.fund(XRP(1'000), A3, G1, G2, G3);
-        env.fund(XRP(20'000), M1);
+        env.fund(XRP(100'000), a1);
+        env.fund(XRP(10'000), a2);
+        env.fund(XRP(1'000), a3, g1, g2, g3);
+        env.fund(XRP(20'000), m1);
         env.close();
 
-        env.trust(G1["XYZ"](5'000), A1);
-        env.trust(G3["ABC"](5'000), A1);
-        env.trust(G2["XYZ"](5'000), A2);
-        env.trust(G3["ABC"](5'000), A2);
-        env.trust(A2["ABC"](1'000), A3);
-        env.trust(G1["XYZ"](100'000), M1);
-        env.trust(G2["XYZ"](100'000), M1);
-        env.trust(G3["ABC"](100'000), M1);
+        env.trust(g1["XYZ"](5'000), a1);
+        env.trust(g3["ABC"](5'000), a1);
+        env.trust(g2["XYZ"](5'000), a2);
+        env.trust(g3["ABC"](5'000), a2);
+        env.trust(a2["ABC"](1'000), a3);
+        env.trust(g1["XYZ"](100'000), m1);
+        env.trust(g2["XYZ"](100'000), m1);
+        env.trust(g3["ABC"](100'000), m1);
         env.close();
 
-        env(pay(G1, A1, G1["XYZ"](3'500)));
-        env(pay(G3, A1, G3["ABC"](1'200)));
-        env(pay(G1, M1, G1["XYZ"](25'000)));
-        env(pay(G2, M1, G2["XYZ"](25'000)));
-        env(pay(G3, M1, G3["ABC"](25'000)));
+        env(pay(g1, a1, g1["XYZ"](3'500)));
+        env(pay(g3, a1, g3["ABC"](1'200)));
+        env(pay(g1, m1, g1["XYZ"](25'000)));
+        env(pay(g2, m1, g2["XYZ"](25'000)));
+        env(pay(g3, m1, g3["ABC"](25'000)));
         env.close();
 
-        AMM const ammM1_G1_G2(env, M1, G1["XYZ"](1'000), G2["XYZ"](1'000));
-        AMM const ammM1_XRP_G3(env, M1, XRP(10'000), G3["ABC"](1'000));
+        AMM const ammM1G1G2(env, m1, g1["XYZ"](1'000), g2["XYZ"](1'000));
+        AMM const ammM1XrpG3(env, m1, XRP(10'000), g3["ABC"](1'000));
 
         STPathSet st;
         STAmount sa, da;
 
         {
-            auto const& send_amt = XRP(10);
-            std::tie(st, sa, da) = find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = XRP(10);
+            std::tie(st, sa, da) = findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
             // no path should exist for this since dest account
             // does not exist.
-            auto const& send_amt = XRP(200);
+            auto const& sendAmt = XRP(200);
             std::tie(st, sa, da) =
-                find_paths(env, A1, Account{"A0"}, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, Account{"A0"}, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
-            auto const& send_amt = G3["ABC"](10);
-            std::tie(st, sa, da) = find_paths(env, A2, G3, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = g3["ABC"](10);
+            std::tie(st, sa, da) = findPaths(env, a2, g3, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRPAmount{101'010'102}));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]))));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]))));
         }
 
         {
-            auto const& send_amt = A2["ABC"](1);
-            std::tie(st, sa, da) = find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = a2["ABC"](1);
+            std::tie(st, sa, da) = findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRPAmount{10'010'011}));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]), G3)));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]), g3)));
         }
 
         {
-            auto const& send_amt = A3["ABC"](1);
-            std::tie(st, sa, da) = find_paths(env, A1, A3, send_amt, std::nullopt, xrpCurrency());
-            BEAST_EXPECT(equal(da, send_amt));
+            auto const& sendAmt = a3["ABC"](1);
+            std::tie(st, sa, da) = findPaths(env, a1, a3, sendAmt, std::nullopt, xrpCurrency());
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRPAmount{10'010'011}));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]), G3, A2)));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]), g3, a2)));
         }
     }
 
     void
-    path_find_02()
+    pathFind02()
     {
         testcase("Path Find: non-XRP -> XRP");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const G3{"G3"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const g3{"G3"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(1'000), A1, A2, G3);
-        env.fund(XRP(11'000), M1);
+        env.fund(XRP(1'000), a1, a2, g3);
+        env.fund(XRP(11'000), m1);
         env.close();
 
-        env.trust(G3["ABC"](1'000), A1, A2);
-        env.trust(G3["ABC"](100'000), M1);
+        env.trust(g3["ABC"](1'000), a1, a2);
+        env.trust(g3["ABC"](100'000), m1);
         env.close();
 
-        env(pay(G3, A1, G3["ABC"](1'000)));
-        env(pay(G3, A2, G3["ABC"](1'000)));
-        env(pay(G3, M1, G3["ABC"](1'200)));
+        env(pay(g3, a1, g3["ABC"](1'000)));
+        env(pay(g3, a2, g3["ABC"](1'000)));
+        env(pay(g3, m1, g3["ABC"](1'200)));
         env.close();
 
-        AMM const ammM1(env, M1, G3["ABC"](1'000), XRP(10'010));
+        AMM const ammM1(env, m1, g3["ABC"](1'000), XRP(10'010));
 
         STPathSet st;
         STAmount sa, da;
 
-        auto const& send_amt = XRP(10);
-        std::tie(st, sa, da) = find_paths(env, A1, A2, send_amt, std::nullopt, A2["ABC"].currency);
-        BEAST_EXPECT(equal(da, send_amt));
-        BEAST_EXPECT(equal(sa, A1["ABC"](1)));
-        BEAST_EXPECT(same(st, stpath(G3, IPE(xrpIssue()))));
+        auto const& sendAmt = XRP(10);
+        std::tie(st, sa, da) = findPaths(env, a1, a2, sendAmt, std::nullopt, a2["ABC"].currency);
+        BEAST_EXPECT(equal(da, sendAmt));
+        BEAST_EXPECT(equal(sa, a1["ABC"](1)));
+        BEAST_EXPECT(same(st, stpath(g3, ipe(xrpIssue()))));
     }
 
     void
-    path_find_05()
+    pathFind05()
     {
         testcase("Path Find: non-XRP -> non-XRP, same currency");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const G3{"G3"};
-        Account const G4{"G4"};
-        Account const M1{"M1"};
-        Account const M2{"M2"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const g3{"G3"};
+        Account const g4{"G4"};
+        Account const m1{"M1"};
+        Account const m2{"M2"};
 
-        env.fund(XRP(1'000), A1, A2, A3, G1, G2, G3, G4);
-        env.fund(XRP(10'000), A4);
-        env.fund(XRP(21'000), M1, M2);
+        env.fund(XRP(1'000), a1, a2, a3, g1, g2, g3, g4);
+        env.fund(XRP(10'000), a4);
+        env.fund(XRP(21'000), m1, m2);
         env.close();
 
-        env.trust(G1["HKD"](2'000), A1);
-        env.trust(G2["HKD"](2'000), A2);
-        env.trust(G1["HKD"](2'000), A3);
-        env.trust(G1["HKD"](100'000), M1);
-        env.trust(G2["HKD"](100'000), M1);
-        env.trust(G1["HKD"](100'000), M2);
-        env.trust(G2["HKD"](100'000), M2);
+        env.trust(g1["HKD"](2'000), a1);
+        env.trust(g2["HKD"](2'000), a2);
+        env.trust(g1["HKD"](2'000), a3);
+        env.trust(g1["HKD"](100'000), m1);
+        env.trust(g2["HKD"](100'000), m1);
+        env.trust(g1["HKD"](100'000), m2);
+        env.trust(g2["HKD"](100'000), m2);
         env.close();
 
-        env(pay(G1, A1, G1["HKD"](1'000)));
-        env(pay(G2, A2, G2["HKD"](1'000)));
-        env(pay(G1, A3, G1["HKD"](1'000)));
-        env(pay(G1, M1, G1["HKD"](1'200)));
-        env(pay(G2, M1, G2["HKD"](5'000)));
-        env(pay(G1, M2, G1["HKD"](1'200)));
-        env(pay(G2, M2, G2["HKD"](5'000)));
+        env(pay(g1, a1, g1["HKD"](1'000)));
+        env(pay(g2, a2, g2["HKD"](1'000)));
+        env(pay(g1, a3, g1["HKD"](1'000)));
+        env(pay(g1, m1, g1["HKD"](1'200)));
+        env(pay(g2, m1, g2["HKD"](5'000)));
+        env(pay(g1, m2, g1["HKD"](1'200)));
+        env(pay(g2, m2, g2["HKD"](5'000)));
         env.close();
 
-        AMM const ammM1(env, M1, G1["HKD"](1'010), G2["HKD"](1'000));
-        AMM const ammM2XRP_G2(env, M2, XRP(10'000), G2["HKD"](1'010));
-        AMM const ammM2G1_XRP(env, M2, G1["HKD"](1'010), XRP(10'000));
+        AMM const ammM1(env, m1, g1["HKD"](1'010), g2["HKD"](1'000));
+        AMM const ammM2XrpG2(env, m2, XRP(10'000), g2["HKD"](1'010));
+        AMM const ammM2G1Xrp(env, m2, g1["HKD"](1'010), XRP(10'000));
 
         STPathSet st;
         STAmount sa, da;
@@ -1648,127 +1648,127 @@ private:
         {
             // A) Borrow or repay --
             //  Source -> Destination (repay source issuer)
-            auto const& send_amt = G1["HKD"](10);
+            auto const& sendAmt = g1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G1, send_amt, std::nullopt, G1["HKD"].currency);
+                findPaths(env, a1, g1, sendAmt, std::nullopt, g1["HKD"].currency);
             BEAST_EXPECT(st.empty());
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
         }
 
         {
             // A2) Borrow or repay --
             //  Source -> Destination (repay destination issuer)
-            auto const& send_amt = A1["HKD"](10);
+            auto const& sendAmt = a1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G1, send_amt, std::nullopt, G1["HKD"].currency);
+                findPaths(env, a1, g1, sendAmt, std::nullopt, g1["HKD"].currency);
             BEAST_EXPECT(st.empty());
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
         }
 
         {
             // B) Common gateway --
             //  Source -> AC -> Destination
-            auto const& send_amt = A3["HKD"](10);
+            auto const& sendAmt = a3["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A3, send_amt, std::nullopt, G1["HKD"].currency);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(G1)));
+                findPaths(env, a1, a3, sendAmt, std::nullopt, g1["HKD"].currency);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(g1)));
         }
 
         {
             // C) Gateway to gateway --
             //  Source -> OB -> Destination
-            auto const& send_amt = G2["HKD"](10);
+            auto const& sendAmt = g2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, G1, G2, send_amt, std::nullopt, G1["HKD"].currency);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, G1["HKD"](10)));
+                findPaths(env, g1, g2, sendAmt, std::nullopt, g1["HKD"].currency);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, g1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(IPE(G2["HKD"])),
-                stpath(M1),
-                stpath(M2),
-                stpath(IPE(xrpIssue()), IPE(G2["HKD"]))));
+                stpath(ipe(g2["HKD"])),
+                stpath(m1),
+                stpath(m2),
+                stpath(ipe(xrpIssue()), ipe(g2["HKD"]))));
         }
 
         {
             // D) User to unlinked gateway via order book --
             //  Source -> AC -> OB -> Destination
-            auto const& send_amt = G2["HKD"](10);
+            auto const& sendAmt = g2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G2, send_amt, std::nullopt, G1["HKD"].currency);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                findPaths(env, a1, g2, sendAmt, std::nullopt, g1["HKD"].currency);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(G1, M1),
-                stpath(G1, M2),
-                stpath(G1, IPE(G2["HKD"])),
-                stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]))));
+                stpath(g1, m1),
+                stpath(g1, m2),
+                stpath(g1, ipe(g2["HKD"])),
+                stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]))));
         }
 
         {
             // I4) XRP bridge" --
             //  Source -> AC -> OB to XRP -> OB from XRP -> AC ->
             //  Destination
-            auto const& send_amt = A2["HKD"](10);
+            auto const& sendAmt = a2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, G1["HKD"].currency);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, g1["HKD"].currency);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(G1, M1, G2),
-                stpath(G1, M2, G2),
-                stpath(G1, IPE(G2["HKD"]), G2),
-                stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]), G2)));
+                stpath(g1, m1, g2),
+                stpath(g1, m2, g2),
+                stpath(g1, ipe(g2["HKD"]), g2),
+                stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]), g2)));
         }
     }
 
     void
-    path_find_06()
+    pathFind06()
     {
         testcase("Path Find: non-XRP -> non-XRP, same currency");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(11'000), M1);
-        env.fund(XRP(1'000), A1, A2, A3, G1, G2);
+        env.fund(XRP(11'000), m1);
+        env.fund(XRP(1'000), a1, a2, a3, g1, g2);
         env.close();
 
-        env.trust(G1["HKD"](2'000), A1);
-        env.trust(G2["HKD"](2'000), A2);
-        env.trust(A2["HKD"](2'000), A3);
-        env.trust(G1["HKD"](100'000), M1);
-        env.trust(G2["HKD"](100'000), M1);
+        env.trust(g1["HKD"](2'000), a1);
+        env.trust(g2["HKD"](2'000), a2);
+        env.trust(a2["HKD"](2'000), a3);
+        env.trust(g1["HKD"](100'000), m1);
+        env.trust(g2["HKD"](100'000), m1);
         env.close();
 
-        env(pay(G1, A1, G1["HKD"](1'000)));
-        env(pay(G2, A2, G2["HKD"](1'000)));
-        env(pay(G1, M1, G1["HKD"](5'000)));
-        env(pay(G2, M1, G2["HKD"](5'000)));
+        env(pay(g1, a1, g1["HKD"](1'000)));
+        env(pay(g2, a2, g2["HKD"](1'000)));
+        env(pay(g1, m1, g1["HKD"](5'000)));
+        env(pay(g2, m1, g2["HKD"](5'000)));
         env.close();
 
-        AMM const ammM1(env, M1, G1["HKD"](1'010), G2["HKD"](1'000));
+        AMM const ammM1(env, m1, g1["HKD"](1'010), g2["HKD"](1'000));
 
         // E) Gateway to user
         //  Source -> OB -> AC -> Destination
-        auto const& send_amt = A2["HKD"](10);
+        auto const& sendAmt = a2["HKD"](10);
         STPathSet st;
         STAmount sa, da;
-        std::tie(st, sa, da) = find_paths(env, G1, A2, send_amt, std::nullopt, G1["HKD"].currency);
-        BEAST_EXPECT(equal(da, send_amt));
-        BEAST_EXPECT(equal(sa, G1["HKD"](10)));
-        BEAST_EXPECT(same(st, stpath(M1, G2), stpath(IPE(G2["HKD"]), G2)));
+        std::tie(st, sa, da) = findPaths(env, g1, a2, sendAmt, std::nullopt, g1["HKD"].currency);
+        BEAST_EXPECT(equal(da, sendAmt));
+        BEAST_EXPECT(equal(sa, g1["HKD"](10)));
+        BEAST_EXPECT(same(st, stpath(m1, g2), stpath(ipe(g2["HKD"]), g2)));
     }
 
     void
@@ -1780,18 +1780,18 @@ private:
 
         Env env(*this, features);
 
-        env.fund(XRP(10'000), alice, gw);
-        // This removes no ripple for carol,
+        env.fund(XRP(10'000), alice_, gw_);
+        // This removes no ripple for carol_,
         // different from the original test
-        fund(env, gw, {carol}, XRP(10'000), {}, Fund::Acct);
+        fund(env, gw_, {carol_}, XRP(10'000), {}, Fund::Acct);
         auto const ammXrpPool = env.current()->fees().increment * 2;
-        env.fund(reserve(env, 5) + ammCrtFee(env) + ammXrpPool, bob);
+        env.fund(reserve(env, 5) + ammCrtFee(env) + ammXrpPool, bob_);
         env.close();
-        env.trust(USD(1'000), alice, bob, carol);
-        env.trust(EUR(1'000), alice, bob, carol);
+        env.trust(USD(1'000), alice_, bob_, carol_);
+        env.trust(EUR(1'000), alice_, bob_, carol_);
 
-        env(pay(gw, alice, EUR(50)));
-        env(pay(gw, bob, USD(150)));
+        env(pay(gw_, alice_, EUR(50)));
+        env(pay(gw_, bob_, USD(150)));
 
         // Bob has _just_ slightly less than 50 xrp available
         // If his owner count changes, he will have more liquidity.
@@ -1800,15 +1800,15 @@ private:
         // recursive calls to the EUR/XRP offer. The second call will return
         // tecPATH_DRY, but the entire path should not be marked as dry.
         // This is the second error case to test (when flowV1 is used).
-        env(offer(bob, EUR(50), XRP(50)));
-        AMM const ammBob(env, bob, ammXrpPool, USD(150));
+        env(offer(bob_, EUR(50), XRP(50)));
+        AMM const ammBob(env, bob_, ammXrpPool, USD(150));
 
-        env(pay(alice, carol, USD(1'000'000)),
-            path(~XRP, ~USD),
-            sendmax(EUR(500)),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(alice_, carol_, USD(1'000'000)),
+            Path(~XRP, ~USD),
+            Sendmax(EUR(500)),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
-        auto const carolUSD = env.balance(carol, USD).value();
+        auto const carolUSD = env.balance(carol_, USD).value();
         BEAST_EXPECT(carolUSD > USD(0) && carolUSD < USD(50));
     }
 
@@ -1823,183 +1823,183 @@ private:
             // simple IOU/IOU offer
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000), {BTC(100), USD(150)}, Fund::All);
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {BTC(100), USD(150)}, Fund::All);
 
-            AMM const ammBob(env, bob, BTC(100), USD(150));
+            AMM const ammBob(env, bob_, BTC(100), USD(150));
 
-            env(pay(alice, carol, USD(50)), path(~USD), sendmax(BTC(50)));
+            env(pay(alice_, carol_, USD(50)), Path(~USD), Sendmax(BTC(50)));
 
-            BEAST_EXPECT(expectHolding(env, alice, BTC(50)));
-            BEAST_EXPECT(expectHolding(env, bob, BTC(0)));
-            BEAST_EXPECT(expectHolding(env, bob, USD(0)));
-            BEAST_EXPECT(expectHolding(env, carol, USD(200)));
+            BEAST_EXPECT(expectHolding(env, alice_, BTC(50)));
+            BEAST_EXPECT(expectHolding(env, bob_, BTC(0)));
+            BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(200)));
             BEAST_EXPECT(ammBob.expectBalances(BTC(150), USD(100), ammBob.tokens()));
         }
         {
             // simple IOU/XRP XRP/IOU offer
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol, bob}, XRP(10'000), {BTC(100), USD(150)}, Fund::All);
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(10'000), {BTC(100), USD(150)}, Fund::All);
 
-            AMM const ammBobBTC_XRP(env, bob, BTC(100), XRP(150));
-            AMM const ammBobXRP_USD(env, bob, XRP(100), USD(150));
+            AMM const ammBobBtcXrp(env, bob_, BTC(100), XRP(150));
+            AMM const ammBobXrpUsd(env, bob_, XRP(100), USD(150));
 
-            env(pay(alice, carol, USD(50)), path(~XRP, ~USD), sendmax(BTC(50)));
+            env(pay(alice_, carol_, USD(50)), Path(~XRP, ~USD), Sendmax(BTC(50)));
 
-            BEAST_EXPECT(expectHolding(env, alice, BTC(50)));
-            BEAST_EXPECT(expectHolding(env, bob, BTC(0)));
-            BEAST_EXPECT(expectHolding(env, bob, USD(0)));
-            BEAST_EXPECT(expectHolding(env, carol, USD(200)));
-            BEAST_EXPECT(ammBobBTC_XRP.expectBalances(BTC(150), XRP(100), ammBobBTC_XRP.tokens()));
-            BEAST_EXPECT(ammBobXRP_USD.expectBalances(XRP(150), USD(100), ammBobXRP_USD.tokens()));
+            BEAST_EXPECT(expectHolding(env, alice_, BTC(50)));
+            BEAST_EXPECT(expectHolding(env, bob_, BTC(0)));
+            BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(200)));
+            BEAST_EXPECT(ammBobBtcXrp.expectBalances(BTC(150), XRP(100), ammBobBtcXrp.tokens()));
+            BEAST_EXPECT(ammBobXrpUsd.expectBalances(XRP(150), USD(100), ammBobXrpUsd.tokens()));
         }
         {
             // simple XRP -> USD through offer and sendmax
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol, bob}, XRP(10'000), {USD(150)}, Fund::All);
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(10'000), {USD(150)}, Fund::All);
 
-            AMM const ammBob(env, bob, XRP(100), USD(150));
+            AMM const ammBob(env, bob_, XRP(100), USD(150));
 
-            env(pay(alice, carol, USD(50)), path(~USD), sendmax(XRP(50)));
+            env(pay(alice_, carol_, USD(50)), Path(~USD), Sendmax(XRP(50)));
 
-            BEAST_EXPECT(expectLedgerEntryRoot(env, alice, xrpMinusFee(env, 10'000 - 50)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, bob, XRP(10'000) - XRP(100) - ammCrtFee(env)));
-            BEAST_EXPECT(expectHolding(env, bob, USD(0)));
-            BEAST_EXPECT(expectHolding(env, carol, USD(200)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, alice_, xrpMinusFee(env, 10'000 - 50)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, bob_, XRP(10'000) - XRP(100) - ammCrtFee(env)));
+            BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(200)));
             BEAST_EXPECT(ammBob.expectBalances(XRP(150), USD(100), ammBob.tokens()));
         }
         {
             // simple USD -> XRP through offer and sendmax
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol, bob}, XRP(10'000), {USD(100)}, Fund::All);
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(10'000), {USD(100)}, Fund::All);
 
-            AMM const ammBob(env, bob, USD(100), XRP(150));
+            AMM const ammBob(env, bob_, USD(100), XRP(150));
 
-            env(pay(alice, carol, XRP(50)), path(~XRP), sendmax(USD(50)));
+            env(pay(alice_, carol_, XRP(50)), Path(~XRP), Sendmax(USD(50)));
 
-            BEAST_EXPECT(expectHolding(env, alice, USD(50)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, bob, XRP(10'000) - XRP(150) - ammCrtFee(env)));
-            BEAST_EXPECT(expectHolding(env, bob, USD(0)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRP(10'000 + 50)));
+            BEAST_EXPECT(expectHolding(env, alice_, USD(50)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, bob_, XRP(10'000) - XRP(150) - ammCrtFee(env)));
+            BEAST_EXPECT(expectHolding(env, bob_, USD(0)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, carol_, XRP(10'000 + 50)));
             BEAST_EXPECT(ammBob.expectBalances(USD(150), XRP(100), ammBob.tokens()));
         }
         {
             // test unfunded offers are removed when payment succeeds
             Env env(*this, features);
 
-            env.fund(XRP(10'000), alice, carol, gw);
-            env.fund(XRP(10'000), bob);
+            env.fund(XRP(10'000), alice_, carol_, gw_);
+            env.fund(XRP(10'000), bob_);
             env.close();
-            env.trust(USD(1'000), alice, bob, carol);
-            env.trust(BTC(1'000), alice, bob, carol);
-            env.trust(EUR(1'000), alice, bob, carol);
+            env.trust(USD(1'000), alice_, bob_, carol_);
+            env.trust(BTC(1'000), alice_, bob_, carol_);
+            env.trust(EUR(1'000), alice_, bob_, carol_);
             env.close();
 
-            env(pay(gw, alice, BTC(60)));
-            env(pay(gw, bob, USD(200)));
-            env(pay(gw, bob, EUR(150)));
+            env(pay(gw_, alice_, BTC(60)));
+            env(pay(gw_, bob_, USD(200)));
+            env(pay(gw_, bob_, EUR(150)));
             env.close();
 
-            env(offer(bob, BTC(50), USD(50)));
-            env(offer(bob, BTC(40), EUR(50)));
+            env(offer(bob_, BTC(50), USD(50)));
+            env(offer(bob_, BTC(40), EUR(50)));
             env.close();
-            AMM const ammBob(env, bob, EUR(100), USD(150));
+            AMM const ammBob(env, bob_, EUR(100), USD(150));
 
             // unfund offer
-            env(pay(bob, gw, EUR(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(40), EUR(50)));
+            env(pay(bob_, gw_, EUR(50)));
+            BEAST_EXPECT(isOffer(env, bob_, BTC(50), USD(50)));
+            BEAST_EXPECT(isOffer(env, bob_, BTC(40), EUR(50)));
 
-            env(pay(alice, carol, USD(50)), path(~USD), path(~EUR, ~USD), sendmax(BTC(60)));
+            env(pay(alice_, carol_, USD(50)), Path(~USD), Path(~EUR, ~USD), Sendmax(BTC(60)));
 
-            env.require(balance(alice, BTC(10)));
-            env.require(balance(bob, BTC(50)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(bob, EUR(0)));
-            env.require(balance(carol, USD(50)));
+            env.require(Balance(alice_, BTC(10)));
+            env.require(Balance(bob_, BTC(50)));
+            env.require(Balance(bob_, USD(0)));
+            env.require(Balance(bob_, EUR(0)));
+            env.require(Balance(carol_, USD(50)));
             // used in the payment
-            BEAST_EXPECT(!isOffer(env, bob, BTC(50), USD(50)));
+            BEAST_EXPECT(!isOffer(env, bob_, BTC(50), USD(50)));
             // found unfunded
-            BEAST_EXPECT(!isOffer(env, bob, BTC(40), EUR(50)));
+            BEAST_EXPECT(!isOffer(env, bob_, BTC(40), EUR(50)));
             // unchanged
             BEAST_EXPECT(ammBob.expectBalances(EUR(100), USD(150), ammBob.tokens()));
         }
         {
             // test unfunded offers are removed when the payment fails.
-            // bob makes two offers: a funded 50 USD for 50 BTC and an
-            // unfunded 50 EUR for 60 BTC. alice pays carol 61 USD with 61
-            // BTC. alice only has 60 BTC, so the payment will fail. The
-            // payment uses two paths: one through bob's funded offer and
+            // bob_ makes two offers: a funded 50 USD for 50 BTC and an
+            // unfunded 50 EUR for 60 BTC. alice_ pays carol_ 61 USD with 61
+            // BTC. alice_ only has 60 BTC, so the payment will fail. The
+            // payment uses two paths: one through bob_'s funded offer and
             // one through his unfunded offer. When the payment fails `flow`
             // should return the unfunded offer. This test is intentionally
             // similar to the one that removes unfunded offers when the
             // payment succeeds.
             Env env(*this, features);
 
-            env.fund(XRP(10'000), bob, carol, gw);
+            env.fund(XRP(10'000), bob_, carol_, gw_);
             env.close();
             // Sets rippling on, this is different from
             // the original test
-            fund(env, gw, {alice}, XRP(10'000), {}, Fund::Acct);
-            env.trust(USD(1'000), alice, bob, carol);
-            env.trust(BTC(1'000), alice, bob, carol);
-            env.trust(EUR(1'000), alice, bob, carol);
+            fund(env, gw_, {alice_}, XRP(10'000), {}, Fund::Acct);
+            env.trust(USD(1'000), alice_, bob_, carol_);
+            env.trust(BTC(1'000), alice_, bob_, carol_);
+            env.trust(EUR(1'000), alice_, bob_, carol_);
             env.close();
 
-            env(pay(gw, alice, BTC(60)));
-            env(pay(gw, bob, BTC(100)));
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, bob, EUR(50)));
-            env(pay(gw, carol, EUR(1)));
+            env(pay(gw_, alice_, BTC(60)));
+            env(pay(gw_, bob_, BTC(100)));
+            env(pay(gw_, bob_, USD(100)));
+            env(pay(gw_, bob_, EUR(50)));
+            env(pay(gw_, carol_, EUR(1)));
             env.close();
 
             // This is multiplath, which generates limited # of offers
-            AMM const ammBobBTC_USD(env, bob, BTC(50), USD(50));
-            env(offer(bob, BTC(60), EUR(50)));
-            env(offer(carol, BTC(1'000), EUR(1)));
-            env(offer(bob, EUR(50), USD(50)));
+            AMM const ammBobBtcUsd(env, bob_, BTC(50), USD(50));
+            env(offer(bob_, BTC(60), EUR(50)));
+            env(offer(carol_, BTC(1'000), EUR(1)));
+            env(offer(bob_, EUR(50), USD(50)));
 
             // unfund offer
-            env(pay(bob, gw, EUR(50)));
-            BEAST_EXPECT(ammBobBTC_USD.expectBalances(BTC(50), USD(50), ammBobBTC_USD.tokens()));
-            BEAST_EXPECT(isOffer(env, bob, BTC(60), EUR(50)));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1'000), EUR(1)));
-            BEAST_EXPECT(isOffer(env, bob, EUR(50), USD(50)));
+            env(pay(bob_, gw_, EUR(50)));
+            BEAST_EXPECT(ammBobBtcUsd.expectBalances(BTC(50), USD(50), ammBobBtcUsd.tokens()));
+            BEAST_EXPECT(isOffer(env, bob_, BTC(60), EUR(50)));
+            BEAST_EXPECT(isOffer(env, carol_, BTC(1'000), EUR(1)));
+            BEAST_EXPECT(isOffer(env, bob_, EUR(50), USD(50)));
 
             auto flowJournal = env.app().getJournal("Flow");
             auto const flowResult = [&] {
                 STAmount const deliver(USD(51));
                 STAmount smax(BTC(61));
-                PaymentSandbox sb(env.current().get(), tapNONE);
+                PaymentSandbox sb(env.current().get(), TapNone);
                 STPathSet paths;
-                auto IPE = [](Issue const& iss) {
+                auto ipe = [](Issue const& iss) {
                     return STPathElement(
-                        STPathElement::typeCurrency | STPathElement::typeIssuer,
+                        STPathElement::TypeCurrency | STPathElement::TypeIssuer,
                         xrpAccount(),
                         iss.currency,
                         iss.account);
                 };
                 {
                     // BTC -> USD
-                    STPath const p1({IPE(USD)});
-                    paths.push_back(p1);
+                    STPath const p1({ipe(USD)});
+                    paths.pushBack(p1);
                     // BTC -> EUR -> USD
-                    STPath const p2({IPE(EUR), IPE(USD)});
-                    paths.push_back(p2);
+                    STPath const p2({ipe(EUR), ipe(USD)});
+                    paths.pushBack(p2);
                 }
 
                 return flow(
                     sb,
                     deliver,
-                    alice,
-                    carol,
+                    alice_,
+                    carol_,
                     paths,
                     false,
                     false,
                     true,
-                    OfferCrossing::no,
+                    OfferCrossing::No,
                     std::nullopt,
                     smax,
                     std::nullopt,
@@ -2010,7 +2010,7 @@ private:
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
                 if (flowResult.removableOffers.empty())
                     return false;
-                Sandbox sb(&view, tapNONE);
+                Sandbox sb(&view, TapNone);
                 for (auto const& o : flowResult.removableOffers)
                 {
                     if (auto ok = sb.peek(keylet::offer(o)))
@@ -2021,10 +2021,10 @@ private:
             });
 
             // used in payment, but since payment failed should be untouched
-            BEAST_EXPECT(ammBobBTC_USD.expectBalances(BTC(50), USD(50), ammBobBTC_USD.tokens()));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1'000), EUR(1)));
+            BEAST_EXPECT(ammBobBtcUsd.expectBalances(BTC(50), USD(50), ammBobBtcUsd.tokens()));
+            BEAST_EXPECT(isOffer(env, carol_, BTC(1'000), EUR(1)));
             // found unfunded
-            BEAST_EXPECT(!isOffer(env, bob, BTC(60), EUR(50)));
+            BEAST_EXPECT(!isOffer(env, bob_, BTC(60), EUR(50)));
         }
         {
             // Do not produce more in the forward pass than the reverse pass
@@ -2036,28 +2036,28 @@ private:
             // 1 EUR, as expected.
 
             Env env(*this, features);
-            env.fund(XRP(10'000), bob, carol, gw);
+            env.fund(XRP(10'000), bob_, carol_, gw_);
             env.close();
-            fund(env, gw, {alice}, XRP(10'000), {}, Fund::Acct);
-            env.trust(USD(1'000), alice, bob, carol);
-            env.trust(EUR(1'000), alice, bob, carol);
+            fund(env, gw_, {alice_}, XRP(10'000), {}, Fund::Acct);
+            env.trust(USD(1'000), alice_, bob_, carol_);
+            env.trust(EUR(1'000), alice_, bob_, carol_);
             env.close();
 
-            env(pay(gw, alice, USD(1'000)));
-            env(pay(gw, bob, EUR(1'000)));
-            env(pay(gw, bob, USD(1'000)));
+            env(pay(gw_, alice_, USD(1'000)));
+            env(pay(gw_, bob_, EUR(1'000)));
+            env(pay(gw_, bob_, USD(1'000)));
             env.close();
 
-            // env(offer(bob, USD(1), drops(2)), txflags(tfPassive));
-            AMM const ammBob(env, bob, USD(8), XRPAmount{21});
-            env(offer(bob, drops(1), EUR(1'000)), txflags(tfPassive));
+            // env(offer(bob_, USD(1), drops(2)), txflags(tfPassive));
+            AMM const ammBob(env, bob_, USD(8), XRPAmount{21});
+            env(offer(bob_, drops(1), EUR(1'000)), Txflags(tfPassive));
 
-            env(pay(alice, carol, EUR(1)),
-                path(~XRP, ~EUR),
-                sendmax(USD(0.4)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, EUR(1)),
+                Path(~XRP, ~EUR),
+                Sendmax(USD(0.4)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
 
-            BEAST_EXPECT(expectHolding(env, carol, EUR(1)));
+            BEAST_EXPECT(expectHolding(env, carol_, EUR(1)));
             BEAST_EXPECT(ammBob.expectBalances(USD(8.4), XRPAmount{20}, ammBob.tokens()));
         }
     }
@@ -2072,21 +2072,21 @@ private:
             // payment via AMM
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(1'000), {USD(1'000), GBP(1'000)});
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(1'000), {USD(1'000), GBP(1'000)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm(env, bob, GBP(1'000), USD(1'000));
+            AMM const amm(env, bob_, GBP(1'000), USD(1'000));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(GBP(150)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, USD(100)),
+                Path(~USD),
+                Sendmax(GBP(150)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
-            // alice buys 107.1428USD with 120GBP and pays 25% tr fee on 120GBP
+            // alice_ buys 107.1428USD with 120GBP and pays 25% tr fee on 120GBP
             // 1,000 - 120*1.25 = 850GBP
-            BEAST_EXPECT(expectHolding(env, alice, GBP(850)));
+            BEAST_EXPECT(expectHolding(env, alice_, GBP(850)));
             if (!features[fixAMMv1_1])
             {
                 // 120GBP is swapped in for 107.1428USD
@@ -2101,7 +2101,7 @@ private:
             // 25% of 85.7142USD is paid in tr fee
             // 85.7142*1.25 = 107.1428USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'085'714285714286), -12)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'085'714285714286), -12)));
         }
 
         {
@@ -2110,25 +2110,29 @@ private:
             Account const ed("ed");
 
             fund(
-                env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(1'000), EUR(1'000), GBP(1'000)});
-            env(rate(gw, 1.25));
+                env,
+                gw_,
+                {alice_, bob_, carol_, ed},
+                XRP(1'000),
+                {USD(1'000), EUR(1'000), GBP(1'000)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            env(offer(ed, GBP(1'000), EUR(1'000)), txflags(tfPassive));
+            env(offer(ed, GBP(1'000), EUR(1'000)), Txflags(tfPassive));
             env.close();
 
-            AMM const amm(env, bob, EUR(1'000), USD(1'000));
+            AMM const amm(env, bob_, EUR(1'000), USD(1'000));
 
-            env(pay(alice, carol, USD(100)),
-                path(~EUR, ~USD),
-                sendmax(GBP(150)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, USD(100)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(150)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
-            // alice buys 120EUR with 120GBP via the offer
+            // alice_ buys 120EUR with 120GBP via the offer
             // and pays 25% tr fee on 120GBP
             // 1,000 - 120*1.25 = 850GBP
-            BEAST_EXPECT(expectHolding(env, alice, GBP(850)));
+            BEAST_EXPECT(expectHolding(env, alice_, GBP(850)));
             // consumed offer is 120GBP/120EUR
             // ed doesn't pay tr fee
             BEAST_EXPECT(expectHolding(env, ed, EUR(880), GBP(1'120)));
@@ -2139,7 +2143,7 @@ private:
                 EUR(1'096), STAmount{USD, UINT64_C(912'4087591240876), -13}, amm.tokens()));
             // 25% on 70.0729USD is paid in tr fee 70.0729*1.25 = 87.5912USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'070'07299270073), -11)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'070'07299270073), -11)));
         }
         {
             // Payment via AMM, AMM
@@ -2147,23 +2151,27 @@ private:
             Account const ed("ed");
 
             fund(
-                env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(1'000), EUR(1'000), GBP(1'000)});
-            env(rate(gw, 1.25));
+                env,
+                gw_,
+                {alice_, bob_, carol_, ed},
+                XRP(1'000),
+                {USD(1'000), EUR(1'000), GBP(1'000)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm1(env, bob, GBP(1'000), EUR(1'000));
+            AMM const amm1(env, bob_, GBP(1'000), EUR(1'000));
             AMM const amm2(env, ed, EUR(1'000), USD(1'000));
 
-            env(pay(alice, carol, USD(100)),
-                path(~EUR, ~USD),
-                sendmax(GBP(150)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice_, carol_, USD(100)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(150)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
             env.close();
 
-            BEAST_EXPECT(expectHolding(env, alice, GBP(850)));
+            BEAST_EXPECT(expectHolding(env, alice_, GBP(850)));
             if (!features[fixAMMv1_1])
             {
-                // alice buys 107.1428EUR with 120GBP and pays 25% tr fee on
+                // alice_ buys 107.1428EUR with 120GBP and pays 25% tr fee on
                 // 120GBP 1,000 - 120*1.25 = 850GBP 120GBP is swapped in for
                 // 107.1428EUR
                 BEAST_EXPECT(amm1.expectBalances(
@@ -2177,7 +2185,7 @@ private:
             }
             else
             {
-                // alice buys 107.1428EUR with 120GBP and pays 25% tr fee on
+                // alice_ buys 107.1428EUR with 120GBP and pays 25% tr fee on
                 // 120GBP 1,000 - 120*1.25 = 850GBP 120GBP is swapped in for
                 // 107.1428EUR
                 BEAST_EXPECT(amm1.expectBalances(
@@ -2191,92 +2199,92 @@ private:
             }
             // 25% on 63.1578USD is paid in tr fee 63.1578*1.25 = 78.9473USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'063'157894736842), -12)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'063'157894736842), -12)));
         }
         {
             // AMM offer crossing
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob}, XRP(1'000), {USD(1'100), EUR(1'100)});
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_}, XRP(1'000), {USD(1'100), EUR(1'100)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm(env, bob, USD(1'000), EUR(1'100));
-            env(offer(alice, EUR(100), USD(100)));
+            AMM const amm(env, bob_, USD(1'000), EUR(1'100));
+            env(offer(alice_, EUR(100), USD(100)));
             env.close();
 
             // 100USD is swapped in for 100EUR
             BEAST_EXPECT(amm.expectBalances(USD(1'100), EUR(1'000), amm.tokens()));
-            // alice pays 25% tr fee on 100USD 1100-100*1.25 = 975USD
-            BEAST_EXPECT(expectHolding(env, alice, USD(975), EUR(1'200)));
-            BEAST_EXPECT(expectOffers(env, alice, 0));
+            // alice_ pays 25% tr fee on 100USD 1100-100*1.25 = 975USD
+            BEAST_EXPECT(expectHolding(env, alice_, USD(975), EUR(1'200)));
+            BEAST_EXPECT(expectOffers(env, alice_, 0));
         }
 
         {
             // Payment via AMM with limit quality
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(1'000), {USD(1'000), GBP(1'000)});
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(1'000), {USD(1'000), GBP(1'000)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm(env, bob, GBP(1'000), USD(1'000));
+            AMM const amm(env, bob_, GBP(1'000), USD(1'000));
 
             // requested quality limit is 100USD/178.58GBP = 0.55997
             // trade quality is 100USD/178.5714 = 0.55999
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(GBP(178.58)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(100)),
+                Path(~USD),
+                Sendmax(GBP(178.58)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
-            // alice buys 125USD with 142.8571GBP and pays 25% tr fee
+            // alice_ buys 125USD with 142.8571GBP and pays 25% tr fee
             // on 142.8571GBP
             // 1,000 - 142.8571*1.25 = 821.4285GBP
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount(GBP, UINT64_C(821'4285714285712), -13)));
+                expectHolding(env, alice_, STAmount(GBP, UINT64_C(821'4285714285712), -13)));
             // 142.8571GBP is swapped in for 125USD
             BEAST_EXPECT(amm.expectBalances(
                 STAmount{GBP, UINT64_C(1'142'857142857143), -12}, USD(875), amm.tokens()));
             // 25% on 100USD is paid in tr fee
             // 100*1.25 = 125USD
-            BEAST_EXPECT(expectHolding(env, carol, USD(1'100)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(1'100)));
         }
         {
             // Payment via AMM with limit quality, deliver less
             // than requested
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(1'000), {USD(1'200), GBP(1'200)});
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(1'000), {USD(1'200), GBP(1'200)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm(env, bob, GBP(1'000), USD(1'200));
+            AMM const amm(env, bob_, GBP(1'000), USD(1'200));
 
             // requested quality limit is 90USD/120GBP = 0.75
             // trade quality is 22.5USD/30GBP = 0.75
-            env(pay(alice, carol, USD(90)),
-                path(~USD),
-                sendmax(GBP(120)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(90)),
+                Path(~USD),
+                Sendmax(GBP(120)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             if (!features[fixAMMv1_1])
             {
-                // alice buys 28.125USD with 24GBP and pays 25% tr fee
+                // alice_ buys 28.125USD with 24GBP and pays 25% tr fee
                 // on 24GBP
                 // 1,200 - 24*1.25 = 1,170GBP
-                BEAST_EXPECT(expectHolding(env, alice, GBP(1'170)));
+                BEAST_EXPECT(expectHolding(env, alice_, GBP(1'170)));
                 // 24GBP is swapped in for 28.125USD
                 BEAST_EXPECT(amm.expectBalances(GBP(1'024), USD(1'171.875), amm.tokens()));
             }
             else
             {
-                // alice buys 28.125USD with 24GBP and pays 25% tr fee
+                // alice_ buys 28.125USD with 24GBP and pays 25% tr fee
                 // on 24GBP
                 // 1,200 - 24*1.25 =~ 1,170GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'169'999999999999), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'169'999999999999), -12}));
                 // 24GBP is swapped in for 28.125USD
                 BEAST_EXPECT(amm.expectBalances(
                     STAmount{GBP, UINT64_C(1'024'000000000001), -12},
@@ -2285,7 +2293,7 @@ private:
             }
             // 25% on 22.5USD is paid in tr fee
             // 22.5*1.25 = 28.125USD
-            BEAST_EXPECT(expectHolding(env, carol, USD(1'222.5)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(1'222.5)));
         }
         {
             // Payment via offer and AMM with limit quality, deliver less
@@ -2294,30 +2302,34 @@ private:
             Account const ed("ed");
 
             fund(
-                env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(1'400), EUR(1'400), GBP(1'400)});
-            env(rate(gw, 1.25));
+                env,
+                gw_,
+                {alice_, bob_, carol_, ed},
+                XRP(1'000),
+                {USD(1'400), EUR(1'400), GBP(1'400)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            env(offer(ed, GBP(1'000), EUR(1'000)), txflags(tfPassive));
+            env(offer(ed, GBP(1'000), EUR(1'000)), Txflags(tfPassive));
             env.close();
 
-            AMM const amm(env, bob, EUR(1'000), USD(1'400));
+            AMM const amm(env, bob_, EUR(1'000), USD(1'400));
 
             // requested quality limit is 95USD/140GBP = 0.6785
             // trade quality is 59.7321USD/88.0262GBP = 0.6785
-            env(pay(alice, carol, USD(95)),
-                path(~EUR, ~USD),
-                sendmax(GBP(140)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(95)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(140)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             if (!features[fixAMMv1_1])
             {
-                // alice buys 70.4210EUR with 70.4210GBP via the offer
+                // alice_ buys 70.4210EUR with 70.4210GBP via the offer
                 // and pays 25% tr fee on 70.4210GBP
                 // 1,400 - 70.4210*1.25 = 1400 - 88.0262 = 1311.9736GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'311'973684210527), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'311'973684210527), -12}));
                 // ed doesn't pay tr fee, the balances reflect consumed offer
                 // 70.4210GBP/70.4210EUR
                 BEAST_EXPECT(expectHolding(
@@ -2341,11 +2353,11 @@ private:
             }
             else
             {
-                // alice buys 70.4210EUR with 70.4210GBP via the offer
+                // alice_ buys 70.4210EUR with 70.4210GBP via the offer
                 // and pays 25% tr fee on 70.4210GBP
                 // 1,400 - 70.4210*1.25 = 1400 - 88.0262 = 1311.9736GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'311'973684210525), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'311'973684210525), -12}));
                 // ed doesn't pay tr fee, the balances reflect consumed offer
                 // 70.4210GBP/70.4210EUR
                 BEAST_EXPECT(expectHolding(
@@ -2369,7 +2381,7 @@ private:
             }
             // 25% on 59.7321USD is paid in tr fee 59.7321*1.25 = 74.6651USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'459'732142857143), -12)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'459'732142857143), -12)));
         }
         {
             // Payment via AMM and offer with limit quality, deliver less
@@ -2378,30 +2390,34 @@ private:
             Account const ed("ed");
 
             fund(
-                env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(1'400), EUR(1'400), GBP(1'400)});
-            env(rate(gw, 1.25));
+                env,
+                gw_,
+                {alice_, bob_, carol_, ed},
+                XRP(1'000),
+                {USD(1'400), EUR(1'400), GBP(1'400)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm(env, bob, GBP(1'000), EUR(1'000));
+            AMM const amm(env, bob_, GBP(1'000), EUR(1'000));
 
-            env(offer(ed, EUR(1'000), USD(1'400)), txflags(tfPassive));
+            env(offer(ed, EUR(1'000), USD(1'400)), Txflags(tfPassive));
             env.close();
 
             // requested quality limit is 95USD/140GBP = 0.6785
             // trade quality is 47.7857USD/70.4210GBP = 0.6785
-            env(pay(alice, carol, USD(95)),
-                path(~EUR, ~USD),
-                sendmax(GBP(140)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(95)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(140)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             if (!features[fixAMMv1_1])
             {
-                // alice buys 53.3322EUR with 56.3368GBP via the amm
+                // alice_ buys 53.3322EUR with 56.3368GBP via the amm
                 // and pays 25% tr fee on 56.3368GBP
                 // 1,400 - 56.3368*1.25 = 1400 - 70.4210 = 1329.5789GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'329'578947368421), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'329'578947368421), -12}));
                 //// 25% on 56.3368EUR is paid in tr fee 56.3368*1.25
                 ///= 70.4210EUR
                 // 56.3368GBP is swapped in for 53.3322EUR
@@ -2412,11 +2428,11 @@ private:
             }
             else
             {
-                // alice buys 53.3322EUR with 56.3368GBP via the amm
+                // alice_ buys 53.3322EUR with 56.3368GBP via the amm
                 // and pays 25% tr fee on 56.3368GBP
                 // 1,400 - 56.3368*1.25 = 1400 - 70.4210 = 1329.5789GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'329'57894736842), -11}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'329'57894736842), -11}));
                 //// 25% on 56.3368EUR is paid in tr fee 56.3368*1.25
                 ///= 70.4210EUR
                 // 56.3368GBP is swapped in for 53.3322EUR
@@ -2441,7 +2457,7 @@ private:
                     STAmount{USD, UINT64_C(1'340'267857142857), -12}}}));
             // 25% on 47.7857USD is paid in tr fee 47.7857*1.25 = 59.7321USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'447'785714285714), -12)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'447'785714285714), -12)));
         }
         {
             // Payment via AMM, AMM  with limit quality, deliver less
@@ -2450,28 +2466,32 @@ private:
             Account const ed("ed");
 
             fund(
-                env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(1'400), EUR(1'400), GBP(1'400)});
-            env(rate(gw, 1.25));
+                env,
+                gw_,
+                {alice_, bob_, carol_, ed},
+                XRP(1'000),
+                {USD(1'400), EUR(1'400), GBP(1'400)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm1(env, bob, GBP(1'000), EUR(1'000));
+            AMM const amm1(env, bob_, GBP(1'000), EUR(1'000));
             AMM const amm2(env, ed, EUR(1'000), USD(1'400));
 
             // requested quality limit is 90USD/145GBP = 0.6206
             // trade quality is 66.7432USD/107.5308GBP = 0.6206
-            env(pay(alice, carol, USD(90)),
-                path(~EUR, ~USD),
-                sendmax(GBP(145)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(90)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(145)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             if (!features[fixAMMv1_1])
             {
-                // alice buys 53.3322EUR with 107.5308GBP
+                // alice_ buys 53.3322EUR with 107.5308GBP
                 // 25% on 86.0246GBP is paid in tr fee
                 // 1,400 - 86.0246*1.25 = 1400 - 107.5308 = 1229.4691GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'292'469135802469), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'292'469135802469), -12}));
                 // 86.0246GBP is swapped in for 79.2106EUR
                 BEAST_EXPECT(amm1.expectBalances(
                     STAmount{GBP, UINT64_C(1'086'024691358025), -12},
@@ -2486,11 +2506,11 @@ private:
             }
             else
             {
-                // alice buys 53.3322EUR with 107.5308GBP
+                // alice_ buys 53.3322EUR with 107.5308GBP
                 // 25% on 86.0246GBP is paid in tr fee
                 // 1,400 - 86.0246*1.25 = 1400 - 107.5308 = 1229.4691GBP
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{GBP, UINT64_C(1'292'469135802466), -12}));
+                    expectHolding(env, alice_, STAmount{GBP, UINT64_C(1'292'469135802466), -12}));
                 // 86.0246GBP is swapped in for 79.2106EUR
                 BEAST_EXPECT(amm1.expectBalances(
                     STAmount{GBP, UINT64_C(1'086'024691358027), -12},
@@ -2505,26 +2525,27 @@ private:
             }
             // 25% on 66.7432USD is paid in tr fee 66.7432*1.25 = 83.4291USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount(USD, UINT64_C(1'466'743295019157), -12)));
+                expectHolding(env, carol_, STAmount(USD, UINT64_C(1'466'743295019157), -12)));
         }
         {
             // Payment by the issuer via AMM, AMM  with limit quality,
             // deliver less than requested
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(1'000), {USD(1'400), EUR(1'400), GBP(1'400)});
-            env(rate(gw, 1.25));
+            fund(
+                env, gw_, {alice_, bob_, carol_}, XRP(1'000), {USD(1'400), EUR(1'400), GBP(1'400)});
+            env(rate(gw_, 1.25));
             env.close();
 
-            AMM const amm1(env, alice, GBP(1'000), EUR(1'000));
-            AMM const amm2(env, bob, EUR(1'000), USD(1'400));
+            AMM const amm1(env, alice_, GBP(1'000), EUR(1'000));
+            AMM const amm2(env, bob_, EUR(1'000), USD(1'400));
 
             // requested quality limit is 90USD/120GBP = 0.75
             // trade quality is 81.1111USD/108.1481GBP = 0.75
-            env(pay(gw, carol, USD(90)),
-                path(~EUR, ~USD),
-                sendmax(GBP(120)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(gw_, carol_, USD(90)),
+                Path(~EUR, ~USD),
+                Sendmax(GBP(120)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
 
             if (!features[fixAMMv1_1])
@@ -2557,7 +2578,7 @@ private:
             }
             // 25% on 81.1111USD is paid in tr fee 81.1111*1.25 = 101.3888USD
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount{USD, UINT64_C(1'481'111111111111), -12}));
+                expectHolding(env, carol_, STAmount{USD, UINT64_C(1'481'111111111111), -12}));
         }
     }
 
@@ -2574,19 +2595,19 @@ private:
         {
             Env env(*this);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000), {USD(2'000)});
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {USD(2'000)});
 
-            AMM const ammBob(env, bob, XRP(1'000), USD(1'050));
-            env(offer(bob, XRP(100), USD(50)));
+            AMM const ammBob(env, bob_, XRP(1'000), USD(1'050));
+            env(offer(bob_, XRP(100), USD(50)));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(XRP(100)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice_, carol_, USD(100)),
+                Path(~USD),
+                Sendmax(XRP(100)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
 
             BEAST_EXPECT(ammBob.expectBalances(XRP(1'050), USD(1'000), ammBob.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(2'050)));
-            BEAST_EXPECT(expectOffers(env, bob, 1, {{{XRP(100), USD(50)}}}));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(2'050)));
+            BEAST_EXPECT(expectOffers(env, bob_, 1, {{{XRP(100), USD(50)}}}));
         }
     }
 
@@ -2598,56 +2619,56 @@ private:
         using namespace jtx;
         {
             // Payment path starting with XRP
-            Env env(*this, testable_amendments());
-            // Note, if alice doesn't have default ripple, then pay
+            Env env(*this, testableAmendments());
+            // Note, if alice_ doesn't have default ripple, then pay
             // fails with tecPATH_DRY.
-            fund(env, gw, {alice, bob}, XRP(10'000), {USD(200), EUR(200)}, Fund::All);
+            fund(env, gw_, {alice_, bob_}, XRP(10'000), {USD(200), EUR(200)}, Fund::All);
 
-            AMM const ammAliceXRP_USD(env, alice, XRP(100), USD(101));
-            AMM const ammAliceXRP_EUR(env, alice, XRP(100), EUR(101));
+            AMM const ammAliceXrpUsd(env, alice_, XRP(100), USD(101));
+            AMM const ammAliceXrpEur(env, alice_, XRP(100), EUR(101));
             env.close();
 
             TER const expectedTer = TER{temBAD_PATH_LOOP};
-            env(pay(alice, bob, EUR(1)),
-                path(~USD, ~XRP, ~EUR),
-                sendmax(XRP(1)),
-                txflags(tfNoRippleDirect),
-                ter(expectedTer));
+            env(pay(alice_, bob_, EUR(1)),
+                Path(~USD, ~XRP, ~EUR),
+                Sendmax(XRP(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(expectedTer));
         }
         {
             // Payment path ending with XRP
             Env env(*this);
-            // Note, if alice doesn't have default ripple, then pay fails
+            // Note, if alice_ doesn't have default ripple, then pay fails
             // with tecPATH_DRY.
-            fund(env, gw, {alice, bob}, XRP(10'000), {USD(200), EUR(200)}, Fund::All);
+            fund(env, gw_, {alice_, bob_}, XRP(10'000), {USD(200), EUR(200)}, Fund::All);
 
-            AMM const ammAliceXRP_USD(env, alice, XRP(100), USD(100));
-            AMM const ammAliceXRP_EUR(env, alice, XRP(100), EUR(100));
+            AMM const ammAliceXrpUsd(env, alice_, XRP(100), USD(100));
+            AMM const ammAliceXrpEur(env, alice_, XRP(100), EUR(100));
             // EUR -> //XRP -> //USD ->XRP
-            env(pay(alice, bob, XRP(1)),
-                path(~XRP, ~USD, ~XRP),
-                sendmax(EUR(1)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice_, bob_, XRP(1)),
+                Path(~XRP, ~USD, ~XRP),
+                Sendmax(EUR(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
         {
             // Payment where loop is formed in the middle of the path, not
             // on an endpoint
-            auto const JPY = gw["JPY"];
+            auto const jpy = gw_["JPY"];
             Env env(*this);
-            // Note, if alice doesn't have default ripple, then pay fails
+            // Note, if alice_ doesn't have default ripple, then pay fails
             // with tecPATH_DRY.
-            fund(env, gw, {alice, bob}, XRP(10'000), {USD(200), EUR(200), JPY(200)}, Fund::All);
+            fund(env, gw_, {alice_, bob_}, XRP(10'000), {USD(200), EUR(200), jpy(200)}, Fund::All);
 
-            AMM const ammAliceXRP_USD(env, alice, XRP(100), USD(100));
-            AMM const ammAliceXRP_EUR(env, alice, XRP(100), EUR(100));
-            AMM const ammAliceXRP_JPY(env, alice, XRP(100), JPY(100));
+            AMM const ammAliceXrpUsd(env, alice_, XRP(100), USD(100));
+            AMM const ammAliceXrpEur(env, alice_, XRP(100), EUR(100));
+            AMM const ammAliceXrpJpy(env, alice_, XRP(100), jpy(100));
 
-            env(pay(alice, bob, JPY(1)),
-                path(~XRP, ~EUR, ~XRP, ~JPY),
-                sendmax(USD(1)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice_, bob_, jpy(1)),
+                Path(~XRP, ~EUR, ~XRP, ~jpy),
+                Sendmax(USD(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
     }
 
@@ -2661,47 +2682,47 @@ private:
         auto const dan = Account("dan");
         auto const ed = Account("ed");
 
-        fund(env, gw, {ed}, XRP(100'000'000), {USD(11)});
-        env.fund(XRP(100'000'000), alice, bob, carol, dan);
+        fund(env, gw_, {ed}, XRP(100'000'000), {USD(11)});
+        env.fund(XRP(100'000'000), alice_, bob_, carol_, dan);
         env.close();
-        env.trust(USD(1), bob);
-        env(pay(gw, bob, USD(1)));
+        env.trust(USD(1), bob_);
+        env(pay(gw_, bob_, USD(1)));
         env.trust(USD(1), dan);
-        env(pay(gw, dan, USD(1)));
-        n_offers(env, 2'000, bob, XRP(1), USD(1));
-        n_offers(env, 1, dan, XRP(1), USD(1));
+        env(pay(gw_, dan, USD(1)));
+        nOffers(env, 2'000, bob_, XRP(1), USD(1));
+        nOffers(env, 1, dan, XRP(1), USD(1));
         AMM const ammEd(env, ed, XRP(9), USD(11));
 
         // Alice offers to buy 1000 XRP for 1000 USD. She takes Bob's first
         // offer, removes 999 more as unfunded, then hits the step limit.
-        env(offer(alice, USD(1'000), XRP(1'000)));
+        env(offer(alice_, USD(1'000), XRP(1'000)));
         if (!features[fixAMMv1_1])
         {
-            env.require(balance(alice, STAmount{USD, UINT64_C(2'050126257867561), -15}));
+            env.require(Balance(alice_, STAmount{USD, UINT64_C(2'050126257867561), -15}));
         }
         else
         {
-            env.require(balance(alice, STAmount{USD, UINT64_C(2'050125257867587), -15}));
+            env.require(Balance(alice_, STAmount{USD, UINT64_C(2'050125257867587), -15}));
         }
-        env.require(owners(alice, 2));
-        env.require(balance(bob, USD(0)));
-        env.require(owners(bob, 1'001));
-        env.require(balance(dan, USD(1)));
-        env.require(owners(dan, 2));
+        env.require(Owners(alice_, 2));
+        env.require(Balance(bob_, USD(0)));
+        env.require(Owners(bob_, 1'001));
+        env.require(Balance(dan, USD(1)));
+        env.require(Owners(dan, 2));
 
         // 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(none)));
-        env.require(owners(carol, 1));
-        env.require(balance(bob, USD(0)));
-        env.require(owners(bob, 1));
-        env.require(balance(dan, USD(1)));
-        env.require(owners(dan, 2));
+        env(offer(carol_, USD(1'000), XRP(1'000)));
+        env.require(Balance(carol_, USD(kNONE)));
+        env.require(Owners(carol_, 1));
+        env.require(Balance(bob_, USD(0)));
+        env.require(Owners(bob_, 1));
+        env.require(Balance(dan, USD(1)));
+        env.require(Owners(dan, 2));
     }
 
     void
-    test_convert_all_of_an_asset(FeatureBitset features)
+    testConvertAllOfAnAsset(FeatureBitset features)
     {
         testcase("Convert all of an asset using DeliverMin");
 
@@ -2709,103 +2730,104 @@ private:
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
-            env.trust(USD(100), alice, bob, carol);
-            env(pay(alice, bob, USD(10)), deliver_min(USD(10)), ter(temBAD_AMOUNT));
-            env(pay(alice, bob, USD(10)),
-                deliver_min(USD(-5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(alice, bob, USD(10)),
-                deliver_min(XRP(5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(alice, bob, USD(10)),
-                deliver_min(Account(carol)["USD"](5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(alice, bob, USD(10)),
-                deliver_min(USD(15)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(gw, carol, USD(50)));
-            AMM const ammCarol(env, carol, XRP(10), USD(15));
-            env(pay(alice, bob, USD(10)),
-                paths(XRP),
-                deliver_min(USD(7)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(5)),
-                ter(tecPATH_PARTIAL));
-            env.require(balance(alice, drops(10'000'000'000 - env.current()->fees().base.drops())));
-            env.require(balance(bob, XRP(10'000)));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
+            env.trust(USD(100), alice_, bob_, carol_);
+            env(pay(alice_, bob_, USD(10)), DeliverMin(USD(10)), Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, USD(10)),
+                DeliverMin(USD(-5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, USD(10)),
+                DeliverMin(XRP(5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, USD(10)),
+                DeliverMin(Account(carol_)["USD"](5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(alice_, bob_, USD(10)),
+                DeliverMin(USD(15)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(gw_, carol_, USD(50)));
+            AMM const ammCarol(env, carol_, XRP(10), USD(15));
+            env(pay(alice_, bob_, USD(10)),
+                Paths(XRP),
+                DeliverMin(USD(7)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(5)),
+                Ter(tecPATH_PARTIAL));
+            env.require(
+                Balance(alice_, drops(10'000'000'000 - env.current()->fees().base.drops())));
+            env.require(Balance(bob_, XRP(10'000)));
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob}, XRP(10'000));
-            env.trust(USD(1'100), alice, bob);
-            env(pay(gw, bob, USD(1'100)));
-            AMM const ammBob(env, bob, XRP(1'000), USD(1'100));
-            env(pay(alice, alice, USD(10'000)),
-                paths(XRP),
-                deliver_min(USD(100)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(100)));
-            env.require(balance(alice, USD(100)));
+            fund(env, gw_, {alice_, bob_}, XRP(10'000));
+            env.trust(USD(1'100), alice_, bob_);
+            env(pay(gw_, bob_, USD(1'100)));
+            AMM const ammBob(env, bob_, XRP(1'000), USD(1'100));
+            env(pay(alice_, alice_, USD(10'000)),
+                Paths(XRP),
+                DeliverMin(USD(100)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(100)));
+            env.require(Balance(alice_, USD(100)));
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol}, XRP(10'000));
-            env.trust(USD(1'200), bob, carol);
-            env(pay(gw, bob, USD(1'200)));
-            AMM const ammBob(env, bob, XRP(5'500), USD(1'200));
-            env(pay(alice, carol, USD(10'000)),
-                paths(XRP),
-                deliver_min(USD(200)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1'000)),
-                ter(tecPATH_PARTIAL));
-            env(pay(alice, carol, USD(10'000)),
-                paths(XRP),
-                deliver_min(USD(200)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1'100)));
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
+            env.trust(USD(1'200), bob_, carol_);
+            env(pay(gw_, bob_, USD(1'200)));
+            AMM const ammBob(env, bob_, XRP(5'500), USD(1'200));
+            env(pay(alice_, carol_, USD(10'000)),
+                Paths(XRP),
+                DeliverMin(USD(200)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1'000)),
+                Ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, USD(10'000)),
+                Paths(XRP),
+                DeliverMin(USD(200)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1'100)));
             BEAST_EXPECT(ammBob.expectBalances(XRP(6'600), USD(1'000), ammBob.tokens()));
-            env.require(balance(carol, USD(200)));
+            env.require(Balance(carol_, USD(200)));
         }
 
         {
             auto const dan = Account("dan");
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol, dan}, XRP(10'000));
+            fund(env, gw_, {alice_, bob_, carol_, dan}, XRP(10'000));
             env.close();
-            env.trust(USD(1'100), bob, carol, dan);
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, dan, USD(1'100)));
-            env(offer(bob, XRP(100), USD(100)));
-            env(offer(bob, XRP(1'000), USD(100)));
+            env.trust(USD(1'100), bob_, carol_, dan);
+            env(pay(gw_, bob_, USD(100)));
+            env(pay(gw_, dan, USD(1'100)));
+            env(offer(bob_, XRP(100), USD(100)));
+            env(offer(bob_, XRP(1'000), USD(100)));
             AMM const ammDan(env, dan, XRP(1'000), USD(1'100));
             if (!features[fixAMMv1_1])
             {
-                env(pay(alice, carol, USD(10'000)),
-                    paths(XRP),
-                    deliver_min(USD(200)),
-                    txflags(tfPartialPayment),
-                    sendmax(XRP(200)));
-                env.require(balance(bob, USD(0)));
-                env.require(balance(carol, USD(200)));
+                env(pay(alice_, carol_, USD(10'000)),
+                    Paths(XRP),
+                    DeliverMin(USD(200)),
+                    Txflags(tfPartialPayment),
+                    Sendmax(XRP(200)));
+                env.require(Balance(bob_, USD(0)));
+                env.require(Balance(carol_, USD(200)));
                 BEAST_EXPECT(ammDan.expectBalances(XRP(1'100), USD(1'000), ammDan.tokens()));
             }
             else
             {
-                env(pay(alice, carol, USD(10'000)),
-                    paths(XRP),
-                    deliver_min(USD(200)),
-                    txflags(tfPartialPayment),
-                    sendmax(XRPAmount(200'000'001)));
-                env.require(balance(bob, USD(0)));
-                env.require(balance(carol, STAmount{USD, UINT64_C(200'00000090909), -11}));
+                env(pay(alice_, carol_, USD(10'000)),
+                    Paths(XRP),
+                    DeliverMin(USD(200)),
+                    Txflags(tfPartialPayment),
+                    Sendmax(XRPAmount(200'000'001)));
+                env.require(Balance(bob_, USD(0)));
+                env.require(Balance(carol_, STAmount{USD, UINT64_C(200'00000090909), -11}));
                 BEAST_EXPECT(ammDan.expectBalances(
                     XRPAmount{1'100'000'001},
                     STAmount{USD, UINT64_C(999'99999909091), -11},
@@ -2826,21 +2848,21 @@ private:
         // account with the DepositAuth flag set could not make a payment
         // to itself.  That bug was fixed in the DepositPreauth amendment.
         Env env(*this, features);
-        fund(env, gw, {alice, becky}, XRP(5'000));
+        fund(env, gw_, {alice_, becky}, XRP(5'000));
         env.close();
 
-        env.trust(USD(1'000), alice);
+        env.trust(USD(1'000), alice_);
         env.trust(USD(1'000), becky);
         env.close();
 
-        env(pay(gw, alice, USD(500)));
+        env(pay(gw_, alice_, USD(500)));
         env.close();
 
-        AMM const ammAlice(env, alice, XRP(100), USD(140));
+        AMM const ammAlice(env, alice_, XRP(100), USD(140));
 
-        // becky pays herself USD (10) by consuming part of alice's offer.
+        // becky pays herself USD (10) by consuming part of alice_'s offer.
         // Make sure the payment works if PaymentAuth is not involved.
-        env(pay(becky, becky, USD(10)), path(~USD), sendmax(XRP(10)));
+        env(pay(becky, becky, USD(10)), Path(~USD), Sendmax(XRP(10)));
         env.close();
         BEAST_EXPECT(ammAlice.expectBalances(XRPAmount(107'692'308), USD(130), ammAlice.tokens()));
 
@@ -2849,7 +2871,7 @@ private:
         env.close();
 
         // becky pays herself again.
-        env(pay(becky, becky, USD(10)), path(~USD), sendmax(XRP(10)), ter(tesSUCCESS));
+        env(pay(becky, becky, USD(10)), Path(~USD), Sendmax(XRP(10)), Ter(tesSUCCESS));
 
         env.close();
     }
@@ -2865,82 +2887,82 @@ private:
 
         Env env(*this);
 
-        fund(env, gw, {alice, bob, carol}, XRP(10'000));
-        env.trust(USD(1'000), alice, bob, carol);
+        fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000));
+        env.trust(USD(1'000), alice_, bob_, carol_);
         env.close();
 
-        env(pay(gw, alice, USD(150)));
-        env(pay(gw, carol, USD(150)));
-        AMM const ammCarol(env, carol, USD(100), XRPAmount(101));
+        env(pay(gw_, alice_, USD(150)));
+        env(pay(gw_, carol_, USD(150)));
+        AMM const ammCarol(env, carol_, USD(100), XRPAmount(101));
 
-        // Make sure bob's trust line is all set up so he can receive USD.
-        env(pay(alice, bob, USD(50)));
+        // Make sure bob_'s trust line is all set up so he can receive USD.
+        env(pay(alice_, bob_, USD(50)));
         env.close();
 
-        // bob sets the lsfDepositAuth flag.
-        env(fset(bob, asfDepositAuth), require(flags(bob, asfDepositAuth)));
+        // bob_ sets the lsfDepositAuth flag.
+        env(fset(bob_, asfDepositAuth), Require(Flags(bob_, asfDepositAuth)));
         env.close();
 
         // None of the following payments should succeed.
         auto failedIouPayments = [this, &env]() {
-            env.require(flags(bob, asfDepositAuth));
+            env.require(Flags(bob_, asfDepositAuth));
 
-            // Capture bob's balances before hand to confirm they don't
+            // Capture bob_'s balances before hand to confirm they don't
             // change.
-            PrettyAmount const bobXrpBalance{env.balance(bob, XRP)};
-            PrettyAmount const bobUsdBalance{env.balance(bob, USD)};
+            PrettyAmount const bobXrpBalance{env.balance(bob_, XRP)};
+            PrettyAmount const bobUsdBalance{env.balance(bob_, USD)};
 
-            env(pay(alice, bob, USD(50)), ter(tecNO_PERMISSION));
+            env(pay(alice_, bob_, USD(50)), Ter(tecNO_PERMISSION));
             env.close();
 
-            // Note that even though alice is paying bob in XRP, the payment
+            // Note that even though alice_ is paying bob_ in XRP, the payment
             // is still not allowed since the payment passes through an
             // offer.
-            env(pay(alice, bob, drops(1)), sendmax(USD(1)), ter(tecNO_PERMISSION));
+            env(pay(alice_, bob_, drops(1)), Sendmax(USD(1)), Ter(tecNO_PERMISSION));
             env.close();
 
-            BEAST_EXPECT(bobXrpBalance == env.balance(bob, XRP));
-            BEAST_EXPECT(bobUsdBalance == env.balance(bob, USD));
+            BEAST_EXPECT(bobXrpBalance == env.balance(bob_, XRP));
+            BEAST_EXPECT(bobUsdBalance == env.balance(bob_, USD));
         };
 
-        //  Test when bob has an XRP balance > base reserve.
+        //  Test when bob_ has an XRP balance > base reserve.
         failedIouPayments();
 
-        // Set bob's XRP balance == base reserve.  Also demonstrate that
-        // bob can make payments while his lsfDepositAuth flag is set.
-        env(pay(bob, alice, USD(25)));
+        // Set bob_'s XRP balance == base reserve.  Also demonstrate that
+        // bob_ can make payments while his lsfDepositAuth flag is set.
+        env(pay(bob_, alice_, USD(25)));
         env.close();
 
         {
-            STAmount const bobPaysXRP{env.balance(bob, XRP) - reserve(env, 1)};
+            STAmount const bobPaysXRP{env.balance(bob_, XRP) - reserve(env, 1)};
             XRPAmount const bobPaysFee{reserve(env, 1) - reserve(env, 0)};
-            env(pay(bob, alice, bobPaysXRP), fee(bobPaysFee));
+            env(pay(bob_, alice_, bobPaysXRP), Fee(bobPaysFee));
             env.close();
         }
 
-        // Test when bob's XRP balance == base reserve.
-        BEAST_EXPECT(env.balance(bob, XRP) == reserve(env, 0));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(25));
+        // Test when bob_'s XRP balance == base reserve.
+        BEAST_EXPECT(env.balance(bob_, XRP) == reserve(env, 0));
+        BEAST_EXPECT(env.balance(bob_, USD) == USD(25));
         failedIouPayments();
 
-        // Test when bob has an XRP balance == 0.
-        env(noop(bob), fee(reserve(env, 0)));
+        // Test when bob_ has an XRP balance == 0.
+        env(noop(bob_), Fee(reserve(env, 0)));
         env.close();
 
-        BEAST_EXPECT(env.balance(bob, XRP) == XRP(0));
+        BEAST_EXPECT(env.balance(bob_, XRP) == XRP(0));
         failedIouPayments();
 
-        // Give bob enough XRP for the fee to clear the lsfDepositAuth flag.
-        env(pay(alice, bob, drops(env.current()->fees().base)));
+        // Give bob_ enough XRP for the fee to clear the lsfDepositAuth flag.
+        env(pay(alice_, bob_, drops(env.current()->fees().base)));
 
-        // bob clears the lsfDepositAuth and the next payment succeeds.
-        env(fclear(bob, asfDepositAuth));
+        // bob_ clears the lsfDepositAuth and the next payment succeeds.
+        env(fclear(bob_, asfDepositAuth));
         env.close();
 
-        env(pay(alice, bob, USD(50)));
+        env(pay(alice_, bob_, USD(50)));
         env.close();
 
-        env(pay(alice, bob, drops(1)), sendmax(USD(1)));
+        env(pay(alice_, bob_, drops(1)), Sendmax(USD(1)));
         env.close();
         BEAST_EXPECT(ammCarol.expectBalances(USD(101), XRPAmount(100), ammCarol.tokens()));
     }
@@ -2953,37 +2975,37 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
+        Account const g1{"G1"};
         Account const alice{"alice"};
         Account const bob{"bob"};
 
-        env.fund(XRP(1'000), G1, alice, bob);
+        env.fund(XRP(1'000), g1, alice, bob);
         env.close();
 
-        env.trust(G1["USD"](100), bob);
-        env.trust(G1["USD"](205), alice);
+        env.trust(g1["USD"](100), bob);
+        env.trust(g1["USD"](205), alice);
         env.close();
 
-        env(pay(G1, bob, G1["USD"](10)));
-        env(pay(G1, alice, G1["USD"](205)));
+        env(pay(g1, bob, g1["USD"](10)));
+        env(pay(g1, alice, g1["USD"](205)));
         env.close();
 
-        AMM const ammAlice(env, alice, XRP(500), G1["USD"](105));
+        AMM const ammAlice(env, alice, XRP(500), g1["USD"](105));
 
         {
             auto lines = getAccountLines(env, bob);
             if (!BEAST_EXPECT(checkArraySize(lines[jss::lines], 1u)))
                 return;
-            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == G1.human());
+            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == g1.human());
             BEAST_EXPECT(lines[jss::lines][0u][jss::limit] == "100");
             BEAST_EXPECT(lines[jss::lines][0u][jss::balance] == "10");
         }
 
         {
-            auto lines = getAccountLines(env, alice, G1["USD"]);
+            auto lines = getAccountLines(env, alice, g1["USD"]);
             if (!BEAST_EXPECT(checkArraySize(lines[jss::lines], 1u)))
                 return;
-            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == G1.human());
+            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == g1.human());
             BEAST_EXPECT(lines[jss::lines][0u][jss::limit] == "205");
             // 105 transferred to AMM
             BEAST_EXPECT(lines[jss::lines][0u][jss::balance] == "100");
@@ -2991,41 +3013,41 @@ private:
 
         // Account with line unfrozen (proving operations normally work)
         //   test: can make Payment on that line
-        env(pay(alice, bob, G1["USD"](1)));
+        env(pay(alice, bob, g1["USD"](1)));
 
         //   test: can receive Payment on that line
-        env(pay(bob, alice, G1["USD"](1)));
+        env(pay(bob, alice, g1["USD"](1)));
         env.close();
 
         // Is created via a TrustSet with SetFreeze flag
         //   test: sets LowFreeze | HighFreeze flags
-        env(trust(G1, bob["USD"](0), tfSetFreeze));
+        env(trust(g1, bob["USD"](0), tfSetFreeze));
         env.close();
 
         {
             // Account with line frozen by issuer
             //    test: can buy more assets on that line
-            env(offer(bob, G1["USD"](5), XRP(25)));
+            env(offer(bob, g1["USD"](5), XRP(25)));
             env.close();
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(525), G1["USD"](100), ammAlice.tokens()));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(525), g1["USD"](100), ammAlice.tokens()));
         }
 
         {
             //    test: can not sell assets from that line
-            env(offer(bob, XRP(1), G1["USD"](5)), ter(tecUNFUNDED_OFFER));
+            env(offer(bob, XRP(1), g1["USD"](5)), Ter(tecUNFUNDED_OFFER));
 
             //    test: can receive Payment on that line
-            env(pay(alice, bob, G1["USD"](1)));
+            env(pay(alice, bob, g1["USD"](1)));
 
             //    test: can not make Payment from that line
-            env(pay(bob, alice, G1["USD"](1)), ter(tecPATH_DRY));
+            env(pay(bob, alice, g1["USD"](1)), Ter(tecPATH_DRY));
         }
 
         {
             // check G1 account lines
             //    test: shows freeze
-            auto lines = getAccountLines(env, G1);
-            Json::Value bobLine;
+            auto lines = getAccountLines(env, g1);
+            json::Value bobLine;
             for (auto const& it : lines[jss::lines])
             {
                 if (it[jss::account] == bob.human())
@@ -3043,10 +3065,10 @@ private:
         {
             //    test: shows freeze peer
             auto lines = getAccountLines(env, bob);
-            Json::Value g1Line;
+            json::Value g1Line;
             for (auto const& it : lines[jss::lines])
             {
-                if (it[jss::account] == G1.human())
+                if (it[jss::account] == g1.human())
                 {
                     g1Line = it;
                     break;
@@ -3061,13 +3083,13 @@ private:
         {
             // Is cleared via a TrustSet with ClearFreeze flag
             //    test: sets LowFreeze | HighFreeze flags
-            env(trust(G1, bob["USD"](0), tfClearFreeze));
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            env(trust(g1, bob["USD"](0), tfClearFreeze));
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             if (!BEAST_EXPECT(checkArraySize(affected, 2u)))
                 return;
             auto ff = affected[1u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
             BEAST_EXPECT(
-                ff[sfLowLimit.fieldName] == G1["USD"](0).value().getJson(JsonOptions::none));
+                ff[sfLowLimit.fieldName] == g1["USD"](0).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfLowFreeze));
             BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfHighFreeze));
             env.close();
@@ -3082,32 +3104,32 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
 
-        env.fund(XRP(12'000), G1);
-        env.fund(XRP(1'000), A1);
-        env.fund(XRP(20'000), A2, A3, A4);
+        env.fund(XRP(12'000), g1);
+        env.fund(XRP(1'000), a1);
+        env.fund(XRP(20'000), a2, a3, a4);
         env.close();
 
-        env.trust(G1["USD"](1'200), A1);
-        env.trust(G1["USD"](200), A2);
-        env.trust(G1["BTC"](100), A3);
-        env.trust(G1["BTC"](100), A4);
+        env.trust(g1["USD"](1'200), a1);
+        env.trust(g1["USD"](200), a2);
+        env.trust(g1["BTC"](100), a3);
+        env.trust(g1["BTC"](100), a4);
         env.close();
 
-        env(pay(G1, A1, G1["USD"](1'000)));
-        env(pay(G1, A2, G1["USD"](100)));
-        env(pay(G1, A3, G1["BTC"](100)));
-        env(pay(G1, A4, G1["BTC"](100)));
+        env(pay(g1, a1, g1["USD"](1'000)));
+        env(pay(g1, a2, g1["USD"](100)));
+        env(pay(g1, a3, g1["BTC"](100)));
+        env(pay(g1, a4, g1["BTC"](100)));
         env.close();
 
-        AMM const ammG1(env, G1, XRP(10'000), G1["USD"](100));
-        env(offer(A1, XRP(10'000), G1["USD"](100)), txflags(tfPassive));
-        env(offer(A2, G1["USD"](100), XRP(10'000)), txflags(tfPassive));
+        AMM const ammG1(env, g1, XRP(10'000), g1["USD"](100));
+        env(offer(a1, XRP(10'000), g1["USD"](100)), Txflags(tfPassive));
+        env(offer(a2, g1["USD"](100), XRP(10'000)), Txflags(tfPassive));
         env.close();
 
         {
@@ -3115,7 +3137,7 @@ private:
             // work)
             //    test: visible offers where taker_pays is unfrozen issuer
             auto offers = env.rpc(
-                "book_offers", std::string("USD/") + G1.human(), "XRP")[jss::result][jss::offers];
+                "book_offers", std::string("USD/") + g1.human(), "XRP")[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
             std::set<std::string> accounts;
@@ -3123,11 +3145,11 @@ private:
             {
                 accounts.insert(offer[jss::Account].asString());
             }
-            BEAST_EXPECT(accounts.find(A2.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(a2.human()) != std::end(accounts));
 
             //    test: visible offers where taker_gets is unfrozen issuer
             offers = env.rpc(
-                "book_offers", "XRP", std::string("USD/") + G1.human())[jss::result][jss::offers];
+                "book_offers", "XRP", std::string("USD/") + g1.human())[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
             accounts.clear();
@@ -3135,29 +3157,29 @@ private:
             {
                 accounts.insert(offer[jss::Account].asString());
             }
-            BEAST_EXPECT(accounts.find(A1.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(a1.human()) != std::end(accounts));
         }
 
         {
             // Offers/Payments
             //    test: assets can be bought on the market
             // env(offer(A3, G1["BTC"](1), XRP(1)));
-            AMM ammA3(env, A3, G1["BTC"](1), XRP(1));
+            AMM ammA3(env, a3, g1["BTC"](1), XRP(1));
 
             //    test: assets can be sold on the market
             // AMM is bidirectional
 
             //    test: direct issues can be sent
-            env(pay(G1, A2, G1["USD"](1)));
+            env(pay(g1, a2, g1["USD"](1)));
 
             //    test: direct redemptions can be sent
-            env(pay(A2, G1, G1["USD"](1)));
+            env(pay(a2, g1, g1["USD"](1)));
 
             //    test: via rippling can be sent
-            env(pay(A2, A1, G1["USD"](1)));
+            env(pay(a2, a1, g1["USD"](1)));
 
             //    test: via rippling can be sent back
-            env(pay(A1, A2, G1["USD"](1)));
+            env(pay(a1, a2, g1["USD"](1)));
             ammA3.withdrawAll(std::nullopt);
         }
 
@@ -3165,13 +3187,13 @@ private:
             // Account with GlobalFreeze
             //  set GlobalFreeze first
             //    test: SetFlag GlobalFreeze will toggle back to freeze
-            env.require(nflags(G1, asfGlobalFreeze));
-            env(fset(G1, asfGlobalFreeze));
-            env.require(flags(G1, asfGlobalFreeze));
-            env.require(nflags(G1, asfNoFreeze));
+            env.require(Nflags(g1, asfGlobalFreeze));
+            env(fset(g1, asfGlobalFreeze));
+            env.require(Flags(g1, asfGlobalFreeze));
+            env.require(Nflags(g1, asfNoFreeze));
 
             //    test: assets can't be bought on the market
-            AMM const ammA3(env, A3, G1["BTC"](1), XRP(1), ter(tecFROZEN));
+            AMM const ammA3(env, a3, g1["BTC"](1), XRP(1), Ter(tecFROZEN));
 
             //    test: assets can't be sold on the market
             // AMM is bidirectional
@@ -3181,12 +3203,12 @@ private:
             //    test: book_offers shows offers
             //    (should these actually be filtered?)
             auto offers = env.rpc(
-                "book_offers", "XRP", std::string("USD/") + G1.human())[jss::result][jss::offers];
+                "book_offers", "XRP", std::string("USD/") + g1.human())[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
 
             offers = env.rpc(
-                "book_offers", std::string("USD/") + G1.human(), "XRP")[jss::result][jss::offers];
+                "book_offers", std::string("USD/") + g1.human(), "XRP")[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
                 return;
         }
@@ -3194,13 +3216,13 @@ private:
         {
             // Payments
             //    test: direct issues can be sent
-            env(pay(G1, A2, G1["USD"](1)));
+            env(pay(g1, a2, g1["USD"](1)));
 
             //    test: direct redemptions can be sent
-            env(pay(A2, G1, G1["USD"](1)));
+            env(pay(a2, g1, g1["USD"](1)));
 
             //    test: via rippling cant be sent
-            env(pay(A2, A1, G1["USD"](1)), ter(tecPATH_DRY));
+            env(pay(a2, a1, g1["USD"](1)), Ter(tecPATH_DRY));
         }
     }
 
@@ -3212,63 +3234,63 @@ private:
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
+        Account const g1{"G1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
 
-        env.fund(XRP(2'000), G1, A3, A4);
-        env.fund(XRP(2'000), A2);
+        env.fund(XRP(2'000), g1, a3, a4);
+        env.fund(XRP(2'000), a2);
         env.close();
 
-        env.trust(G1["USD"](1'000), A2);
-        env.trust(G1["USD"](2'000), A3);
-        env.trust(G1["USD"](2'001), A4);
+        env.trust(g1["USD"](1'000), a2);
+        env.trust(g1["USD"](2'000), a3);
+        env.trust(g1["USD"](2'001), a4);
         env.close();
 
-        env(pay(G1, A3, G1["USD"](2'000)));
-        env(pay(G1, A4, G1["USD"](2'001)));
+        env(pay(g1, a3, g1["USD"](2'000)));
+        env(pay(g1, a4, g1["USD"](2'001)));
         env.close();
 
-        AMM const ammA3(env, A3, XRP(1'000), G1["USD"](1'001));
+        AMM const ammA3(env, a3, XRP(1'000), g1["USD"](1'001));
 
         // removal after successful payment
         //    test: make a payment with partially consuming offer
-        env(pay(A2, G1, G1["USD"](1)), paths(G1["USD"]), sendmax(XRP(1)));
+        env(pay(a2, g1, g1["USD"](1)), Paths(g1["USD"]), Sendmax(XRP(1)));
         env.close();
 
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'001), G1["USD"](1'000), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'001), g1["USD"](1'000), ammA3.tokens()));
 
         //    test: someone else creates an offer providing liquidity
-        env(offer(A4, XRP(999), G1["USD"](999)));
+        env(offer(a4, XRP(999), g1["USD"](999)));
         env.close();
         // The offer consumes AMM offer
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), G1["USD"](1'001), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), g1["USD"](1'001), ammA3.tokens()));
 
         //    test: AMM line is frozen
-        auto const a3am = STAmount{Issue{to_currency("USD"), ammA3.ammAccount()}, 0};
-        env(trust(G1, a3am, tfSetFreeze));
+        auto const a3am = STAmount{Issue{toCurrency("USD"), ammA3.ammAccount()}, 0};
+        env(trust(g1, a3am, tfSetFreeze));
         auto const info = ammA3.ammRpcInfo();
         BEAST_EXPECT(info[jss::amm][jss::asset2_frozen].asBool());
         env.close();
 
         //    test: Can make a payment via the new offer
-        env(pay(A2, G1, G1["USD"](1)), paths(G1["USD"]), sendmax(XRP(1)));
+        env(pay(a2, g1, g1["USD"](1)), Paths(g1["USD"]), Sendmax(XRP(1)));
         env.close();
         // AMM is not consumed
-        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), G1["USD"](1'001), ammA3.tokens()));
+        BEAST_EXPECT(ammA3.expectBalances(XRP(1'000), g1["USD"](1'001), ammA3.tokens()));
 
         // removal buy successful OfferCreate
         //    test: freeze the new offer
-        env(trust(G1, A4["USD"](0), tfSetFreeze));
+        env(trust(g1, a4["USD"](0), tfSetFreeze));
         env.close();
 
         //    test: can no longer create a crossing offer
-        env(offer(A2, G1["USD"](999), XRP(999)));
+        env(offer(a2, g1["USD"](999), XRP(999)));
         env.close();
 
         //    test: offer was removed by offer_create
-        auto offers = getAccountOffers(env, A4)[jss::offers];
+        auto offers = getAccountOffers(env, a4)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 0u)))
             return;
     }
@@ -3280,23 +3302,23 @@ private:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const bogie{"bogie", KeyType::secp256k1};
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const zelda{"zelda", KeyType::secp256k1};
-        fund(env, gw, {alice, becky, zelda}, XRP(20'000), {USD(20'000)});
+        Account const bogie{"bogie", KeyType::Secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const zelda{"zelda", KeyType::Secp256k1};
+        fund(env, gw_, {alice, becky, zelda}, XRP(20'000), {USD(20'000)});
 
-        // alice uses a regular key with the master disabled.
-        Account const alie{"alie", KeyType::secp256k1};
+        // alice_ uses a regular key with the master disabled.
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
-        // Attach signers to alice.
-        env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), sig(alie));
+        // Attach signers to alice_.
+        env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), Sig(alie));
         env.close();
-        env.require(owners(alice, 2));
+        env.require(Owners(alice, 2));
 
-        msig const ms{becky, bogie};
+        Msig const ms{becky, bogie};
 
         // Multisign all AMM transactions
         AMM ammAlice(
@@ -3310,7 +3332,7 @@ private:
             std::nullopt,
             std::nullopt,
             ms,
-            ter(tesSUCCESS));
+            Ter(tesSUCCESS));
         BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'000), ammAlice.tokens()));
 
         ammAlice.deposit(alice, 1'000'000);
@@ -3339,17 +3361,17 @@ private:
 
         Env env(*this, features);
 
-        fund(env, gw, {alice, bob, carol}, XRP(10'000), {USD(2'000), EUR(1'000)});
+        fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {USD(2'000), EUR(1'000)});
 
-        AMM const bobXRP_USD(env, bob, XRP(1'000), USD(1'000));
-        AMM const bobUSD_EUR(env, bob, USD(1'000), EUR(1'000));
+        AMM const bobXrpUsd(env, bob_, XRP(1'000), USD(1'000));
+        AMM const bobUsdEur(env, bob_, USD(1'000), EUR(1'000));
 
         // payment path: XRP -> XRP/USD -> USD/EUR -> EUR/USD
-        env(pay(alice, carol, USD(100)),
-            path(~USD, ~EUR, ~USD),
-            sendmax(XRP(200)),
-            txflags(tfNoRippleDirect),
-            ter(temBAD_PATH_LOOP));
+        env(pay(alice_, carol_, USD(100)),
+            Path(~USD, ~EUR, ~USD),
+            Sendmax(XRP(200)),
+            Txflags(tfNoRippleDirect),
+            Ter(temBAD_PATH_LOOP));
     }
 
     void
@@ -3360,63 +3382,63 @@ private:
 
         {
             Env env(*this, features);
-            auto const BobUSD = bob["USD"];
-            auto const BobEUR = bob["EUR"];
-            fund(env, gw, {alice, bob}, XRP(10'000));
-            env.trust(USD(1'000), alice, bob);
-            env.trust(EUR(1'000), alice, bob);
+            auto const bobUsd = bob_["USD"];
+            auto const bobEur = bob_["EUR"];
+            fund(env, gw_, {alice_, bob_}, XRP(10'000));
+            env.trust(USD(1'000), alice_, bob_);
+            env.trust(EUR(1'000), alice_, bob_);
             env.close();
-            fund(env, bob, {alice, gw}, {BobUSD(100), BobEUR(100)}, Fund::TokenOnly);
+            fund(env, bob_, {alice_, gw_}, {bobUsd(100), bobEur(100)}, Fund::TokenOnly);
 
-            AMM const ammBobXRP_USD(env, bob, XRP(100), BobUSD(100));
-            env(offer(gw, XRP(100), USD(100)), txflags(tfPassive));
+            AMM const ammBobXrpUsd(env, bob_, XRP(100), bobUsd(100));
+            env(offer(gw_, XRP(100), USD(100)), Txflags(tfPassive));
 
-            AMM const ammBobUSD_EUR(env, bob, BobUSD(100), BobEUR(100));
-            env(offer(gw, USD(100), EUR(100)), txflags(tfPassive));
+            AMM const ammBobUsdEur(env, bob_, bobUsd(100), bobEur(100));
+            env(offer(gw_, USD(100), EUR(100)), Txflags(tfPassive));
 
-            Path const p = [&] {
-                Path result;
-                result.push_back(allPathElements(gw, BobUSD));
-                result.push_back(cpe(EUR.currency));
+            TestPath const p = [&] {
+                TestPath result;
+                result.pushBack(allPathElements(gw_, bobUsd));
+                result.pushBack(cpe(EUR.currency));
                 return result;
             }();
 
             PathSet const paths(p);
 
-            env(pay(alice, alice, EUR(1)),
-                json(paths.json()),
-                sendmax(XRP(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(alice_, alice_, EUR(1)),
+                Json(paths.json()),
+                Sendmax(XRP(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(temBAD_PATH));
         }
 
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000), {USD(100)});
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {USD(100)});
 
-            AMM const ammBob(env, bob, XRP(100), USD(100));
+            AMM const ammBob(env, bob_, XRP(100), USD(100));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
-            env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_PATHS));
+            env(pay(alice_, carol_, XRP(100)),
+                Path(~USD, ~XRP),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_PATHS));
         }
 
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, bob, carol}, XRP(10'000), {USD(100)});
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(10'000), {USD(100)});
 
-            AMM const ammBob(env, bob, XRP(100), USD(100));
+            AMM const ammBob(env, bob_, XRP(100), USD(100));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
-            env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                sendmax(XRP(200)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_MAX));
+            env(pay(alice_, carol_, XRP(100)),
+                Path(~USD, ~XRP),
+                Sendmax(XRP(200)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_MAX));
         }
     }
 
@@ -3426,65 +3448,65 @@ private:
         testcase("test loop");
         using namespace jtx;
 
-        auto const CNY = gw["CNY"];
+        auto const cny = gw_["CNY"];
 
         {
             Env env(*this, features);
 
-            env.fund(XRP(10'000), alice, bob, carol, gw);
+            env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
             env.close();
-            env.trust(USD(10'000), alice, bob, carol);
+            env.trust(USD(10'000), alice_, bob_, carol_);
             env.close();
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw_, bob_, USD(100)));
+            env(pay(gw_, alice_, USD(100)));
             env.close();
 
-            AMM const ammBob(env, bob, XRP(100), USD(100));
+            AMM const ammBob(env, bob_, XRP(100), USD(100));
 
             // payment path: USD -> USD/XRP -> XRP/USD
-            env(pay(alice, carol, USD(100)),
-                sendmax(USD(100)),
-                path(~XRP, ~USD),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice_, carol_, USD(100)),
+                Sendmax(USD(100)),
+                Path(~XRP, ~USD),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
 
         {
             Env env(*this, features);
 
-            env.fund(XRP(10'000), alice, bob, carol, gw);
+            env.fund(XRP(10'000), alice_, bob_, carol_, gw_);
             env.close();
-            env.trust(USD(10'000), alice, bob, carol);
-            env.trust(EUR(10'000), alice, bob, carol);
-            env.trust(CNY(10'000), alice, bob, carol);
+            env.trust(USD(10'000), alice_, bob_, carol_);
+            env.trust(EUR(10'000), alice_, bob_, carol_);
+            env.trust(cny(10'000), alice_, bob_, carol_);
 
-            env(pay(gw, bob, USD(200)));
-            env(pay(gw, bob, EUR(200)));
-            env(pay(gw, bob, CNY(100)));
+            env(pay(gw_, bob_, USD(200)));
+            env(pay(gw_, bob_, EUR(200)));
+            env(pay(gw_, bob_, cny(100)));
 
-            AMM const ammBobXRP_USD(env, bob, XRP(100), USD(100));
-            AMM const ammBobUSD_EUR(env, bob, USD(100), EUR(100));
-            AMM const ammBobEUR_CNY(env, bob, EUR(100), CNY(100));
+            AMM const ammBobXrpUsd(env, bob_, XRP(100), USD(100));
+            AMM const ammBobUsdEur(env, bob_, USD(100), EUR(100));
+            AMM const ammBobEurCny(env, bob_, EUR(100), cny(100));
 
             // payment path: XRP->XRP/USD->USD/EUR->USD/CNY
-            env(pay(alice, carol, CNY(100)),
-                sendmax(XRP(100)),
-                path(~USD, ~EUR, ~USD, ~CNY),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice_, carol_, cny(100)),
+                Sendmax(XRP(100)),
+                Path(~USD, ~EUR, ~USD, ~cny),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
     }
 
     void
     testPaths()
     {
-        path_find_consume_all();
-        via_offers_via_gateway();
-        receive_max();
-        path_find_01();
-        path_find_02();
-        path_find_05();
-        path_find_06();
+        pathFindConsumeAll();
+        viaOffersViaGateway();
+        receiveMax();
+        pathFind01();
+        pathFind02();
+        pathFind05();
+        pathFind06();
     }
 
     void
@@ -3494,7 +3516,7 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas in the transaction engine
         FeatureBitset const all{
-            testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+            testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
 
         testFalseDry(all);
         testBookStep(all);
@@ -3511,7 +3533,7 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas in the transaction engine
         FeatureBitset const all{
-            testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+            testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
         testStepLimit(all);
         testStepLimit(all - fixAMMv1_1 - fixAMMv1_3);
     }
@@ -3523,9 +3545,9 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas in the transaction engine
         FeatureBitset const all{
-            testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
-        test_convert_all_of_an_asset(all);
-        test_convert_all_of_an_asset(all - fixAMMv1_1 - fixAMMv1_3);
+            testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
+        testConvertAllOfAnAsset(all);
+        testConvertAllOfAnAsset(all - fixAMMv1_1 - fixAMMv1_3);
     }
 
     void
@@ -3534,7 +3556,7 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas in the transaction engine
         FeatureBitset const all{
-            jtx::testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+            jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
         testPayment(all);
         testPayIOU();
     }
@@ -3546,7 +3568,7 @@ private:
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas in the transaction engine
         FeatureBitset const sa{
-            testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+            testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
         testRippleState(sa);
         testGlobalFreeze(sa);
         testOffersWhenFrozen(sa);
@@ -3555,13 +3577,13 @@ private:
     void
     testMultisign()
     {
-        testTxMultisign(jtx::testable_amendments());
+        testTxMultisign(jtx::testableAmendments());
     }
 
     void
     testPayStrand()
     {
-        auto const all = jtx::testable_amendments();
+        auto const all = jtx::testableAmendments();
 
         testToStrand(all);
         testRIPD1373(all);
diff --git a/src/test/app/AMMMPT_test.cpp b/src/test/app/AMMMPT_test.cpp
index f453d6cf75..4318a19503 100644
--- a/src/test/app/AMMMPT_test.cpp
+++ b/src/test/app/AMMMPT_test.cpp
@@ -75,7 +75,7 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'000), IOUAmount{10'000'000}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // IOU to MPT
         testAMM(
@@ -83,7 +83,7 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(20'000), MPT(ammAlice[1])(20'000), IOUAmount{20'000}));
             },
-            {{USD(20'000), AMMMPT(20'000)}});
+            {{USD(20'000), gAmmmpt(20'000)}});
 
         // MPT to MPT
         testAMM(
@@ -91,62 +91,62 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(20'000), MPT(ammAlice[1])(20'000), IOUAmount{20'000}));
             },
-            {{AMMMPT(20'000), AMMMPT(20'000)}});
+            {{gAmmmpt(20'000), gAmmmpt(20'000)}});
 
         // IOU to MPT + transfer fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
+            env(rate(gw_, 1.25));
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .transferFee = 1'500,
                  .pay = 30'000});
             // no transfer fee on create
-            AMM const ammAlice(env, alice, USD(20'000), BTC(20'000));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(20'000), IOUAmount{20'000, 0}));
-            BEAST_EXPECT(expectHolding(env, alice, USD(0)));
+            AMM const ammAlice(env, alice_, USD(20'000), btc(20'000));
+            BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), btc(20'000), IOUAmount{20'000, 0}));
+            BEAST_EXPECT(expectHolding(env, alice_, USD(0)));
             // alice initially had 30'000
-            BEAST_EXPECT(expectMPT(env, alice, BTC(10'000)));
+            BEAST_EXPECT(expectMPT(env, alice_, btc(10'000)));
         }
 
         // Require authorization is set, account is authorized
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(fset(gw, asfRequireAuth));
-            env(trust(alice, gw["USD"](30'000), 0));
-            env(trust(gw, alice["USD"](0), tfSetfAuth));
-            env(pay(gw, alice, USD(10'000)));
+            env(fset(gw_, asfRequireAuth));
+            env(trust(alice_, gw_["USD"](30'000), 0));
+            env(trust(gw_, alice_["USD"](0), tfSetfAuth));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000));
+            AMM const ammAlice(env, alice_, USD(10'000), btc(10'000));
         }
 
         // Cleared global freeze
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
-            MPTTester USD(
+            env.fund(XRP(30'000), gw_, alice_);
+            MPTTester usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            USD.set({.flags = tfMPTLock});
-            AMM const ammAliceFail(env, alice, XRP(10'000), USD(10'000), ter(tecFROZEN));
-            USD.set({.flags = tfMPTUnlock});
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000));
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            usd.set({.flags = tfMPTLock});
+            AMM const ammAliceFail(env, alice_, XRP(10'000), usd(10'000), Ter(tecFROZEN));
+            usd.set({.flags = tfMPTUnlock});
+            AMM const ammAlice(env, alice_, XRP(10'000), usd(10'000));
         }
     }
 
@@ -160,89 +160,89 @@ private:
         // Can't have both tokens the same MPT
         {
             Env env{*this};
-            env.fund(XRP(30'000), alice, gw);
+            env.fund(XRP(30'000), alice_, gw_);
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .transferFee = 1'500,
                  .pay = 40'000});
-            AMM const ammAlice(env, alice, BTC(20'000), BTC(10'000), ter(temBAD_AMM_TOKENS));
+            AMM const ammAlice(env, alice_, btc(20'000), btc(10'000), Ter(temBAD_AMM_TOKENS));
         }
 
         // MPTCanTrade is not set and AMM creator is not the issuer of MPT
         {
             Env env{*this};
-            env.fund(XRP(30'000), alice, gw);
+            env.fund(XRP(30'000), alice_, gw_);
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 40'000,
                  .flags = tfMPTCanLock});
-            AMM const ammAlice(env, alice, BTC(20'000), XRP(10'000), ter(tecNO_PERMISSION));
+            AMM const ammAlice(env, alice_, btc(20'000), XRP(10'000), Ter(tecNO_PERMISSION));
         }
 
         // MPTokenIssuance doesn't exist
         {
             Env env{*this};
-            env.fund(XRP(30'000), alice, gw);
+            env.fund(XRP(30'000), alice_, gw_);
             env.close();
             AMM const ammAlice(
-                env, alice, MPT(gw, 1'000)(20'000), XRP(10'000), ter(tecOBJECT_NOT_FOUND));
+                env, alice_, MPT(gw_, 1'000)(20'000), XRP(10'000), Ter(tecOBJECT_NOT_FOUND));
         }
 
         // MPToken doesn't exist and amm creator is not the issuer
         {
             Env env{*this};
-            env.fund(XRP(30'000), alice, gw);
+            env.fund(XRP(30'000), alice_, gw_);
             env.close();
-            MPT const BTC = MPTTester({
+            MPT const btc = MPTTester({
                 .env = env,
-                .issuer = gw,
+                .issuer = gw_,
             });
-            AMM const ammAlice(env, alice, BTC(20'000), XRP(10'000), ter(tecNO_AUTH));
+            AMM const ammAlice(env, alice_, btc(20'000), XRP(10'000), Ter(tecNO_AUTH));
         }
 
         // Can't have zero or negative amounts
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
+            env(rate(gw_, 1.25));
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .transferFee = 1'500,
                  .pay = 30'000});
 
-            AMM const ammAlice(env, alice, XRP(0), BTC(10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice(env, alice_, XRP(0), btc(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice.ammExists());
-            AMM const ammAlice1(env, alice, XRP(10'000), BTC(0), ter(temBAD_AMOUNT));
+            AMM const ammAlice1(env, alice_, XRP(10'000), btc(0), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice1.ammExists());
-            AMM const ammAlice2(env, alice, USD(0), BTC(10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice2(env, alice_, USD(0), btc(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice2.ammExists());
-            AMM const ammAlice3(env, alice, USD(10'000), BTC(0), ter(temBAD_AMOUNT));
+            AMM const ammAlice3(env, alice_, USD(10'000), btc(0), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice3.ammExists());
-            AMM const ammAlice4(env, alice, XRP(-10'0000), BTC(10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice4(env, alice_, XRP(-10'0000), btc(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice4.ammExists());
-            AMM const ammAlice5(env, alice, XRP(10'000), BTC(-10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice5(env, alice_, XRP(10'000), btc(-10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice5.ammExists());
-            AMM const ammAlice6(env, alice, USD(-10'000), BTC(10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice6(env, alice_, USD(-10'000), btc(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice6.ammExists());
-            AMM const ammAlice7(env, alice, USD(10'000), BTC(-10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice7(env, alice_, USD(10'000), btc(-10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice7.ammExists());
         }
 
         // Bad MPT
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
 
-            AMM const ammAlice(env, alice, XRP(10'000), MPT(badMPT())(100), ter(temBAD_MPT));
+            AMM const ammAlice(env, alice_, XRP(10'000), MPT(badMPT())(100), Ter(temBAD_MPT));
 
             BEAST_EXPECT(!ammAlice.ammExists());
         }
@@ -250,39 +250,39 @@ private:
         // Insufficient MPT balance
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .transferFee = 1'500,
                  .pay = 30'000});
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(40'000), ter(tecUNFUNDED_AMM));
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(40'000), Ter(tecUNFUNDED_AMM));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Invalid trading fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .transferFee = 1'500,
                  .pay = 30'000});
             AMM const ammAlice(
                 env,
-                alice,
+                alice_,
                 USD(10'000),
-                BTC(10'000),
+                btc(10'000),
                 false,
                 65'001,
                 10,
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_FEE));
+                Ter(temBAD_FEE));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
@@ -290,106 +290,106 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Account bob1("bob1");
-                env.fund(XRP(30'000), bob);
+                env.fund(XRP(30'000), bob_);
                 env.close();
-                AMM const ammBob(env, bob, XRP(1'000), MPT(ammAlice[1])(1'000), ter(tecDUPLICATE));
+                AMM const ammBob(env, bob_, XRP(1'000), MPT(ammAlice[1])(1'000), Ter(tecDUPLICATE));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // AMM already exists IOU/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(30'000), bob);
+                env.fund(XRP(30'000), bob_);
                 env.close();
-                env.trust(USD(10000), bob);
-                env(pay(gw, bob, USD(100)));
+                env.trust(USD(10000), bob_);
+                env(pay(gw_, bob_, USD(100)));
 
-                AMM const ammBob(env, bob, USD(1'000), MPT(ammAlice[1])(1'000), ter(tecDUPLICATE));
+                AMM const ammBob(env, bob_, USD(1'000), MPT(ammAlice[1])(1'000), Ter(tecDUPLICATE));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // AMM already exists MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 AMM const ammCarol(
                     env,
-                    carol,
+                    carol_,
                     MPT(ammAlice[0])(1'000),
                     MPT(ammAlice[1])(2'000),
-                    ter(tecDUPLICATE));
+                    Ter(tecDUPLICATE));
             },
-            {{AMMMPT(20'000), AMMMPT(10'000)}});
+            {{gAmmmpt(20'000), gAmmmpt(10'000)}});
 
         // MPTRequireAuth flag is set and AMM creator is not authorized
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(fset(gw, asfRequireAuth));
-            env(trust(alice, gw["USD"](30'000), 0));
-            env(trust(gw, alice["USD"](0), tfSetfAuth));
+            env(fset(gw_, asfRequireAuth));
+            env(trust(alice_, gw_["USD"](30'000), 0));
+            env(trust(gw_, alice_["USD"](0), tfSetfAuth));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
-            MPT const BTC = MPTTester(
-                {.env = env, .issuer = gw, .holders = {alice}, .flags = tfMPTRequireAuth});
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000), ter(tecNO_AUTH));
+            MPT const btc = MPTTester(
+                {.env = env, .issuer = gw_, .holders = {alice_}, .flags = tfMPTRequireAuth});
+            AMM const ammAlice(env, alice_, USD(10'000), btc(10'000), Ter(tecNO_AUTH));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // MPTLocked flag is set
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
-            MPTTester BTC(
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            BTC.set({.flags = tfMPTLock});
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000), ter(tecFROZEN));
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            btc.set({.flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, USD(10'000), btc(10'000), Ter(tecFROZEN));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // MPT individually locked
         {
             Env env{*this};
-            fund(env, gw, {alice, bob}, {USD(20'000)}, Fund::All);
-            MPTTester BTC(
+            fund(env, gw_, {alice_, bob_}, {USD(20'000)}, Fund::All);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            BTC.set({.holder = alice, .flags = tfMPTLock});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            btc.set({.holder = alice_, .flags = tfMPTLock});
 
             // alice's token is locked
-            AMM const ammAlice(env, alice, USD(10'000), BTC(10'000), ter(tecFROZEN));
+            AMM const ammAlice(env, alice_, USD(10'000), btc(10'000), Ter(tecFROZEN));
             BEAST_EXPECT(!ammAlice.ammExists());
 
             // bob can create
-            AMM const ammBob(env, bob, USD(10'000), BTC(10'000));
+            AMM const ammBob(env, bob_, USD(10'000), btc(10'000));
             BEAST_EXPECT(ammBob.ammExists());
         }
 
         // OutstandingAmount > MaximumAmount
         {
             Env env{*this};
-            env.fund(XRP(1'000), gw, alice);
+            env.fund(XRP(1'000), gw_, alice_);
 
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 100});
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = {alice_}, .maxAmt = 100});
 
             // OutstandingAmount is 0, issuer issues 10 over MaximumAmount
-            AMM const amm(env, gw, XRP(100), BTC(110), ter(tecUNFUNDED_AMM));
+            AMM const amm(env, gw_, XRP(100), btc(110), Ter(tecUNFUNDED_AMM));
 
-            env(pay(gw, alice, BTC(100)));
+            env(pay(gw_, alice_, btc(100)));
 
             // OutstandingAmount is 100, issuer issues 100 over MaximumAmount
-            AMM const amm1(env, gw, XRP(100), BTC(100), ter(tecUNFUNDED_AMM));
+            AMM const amm1(env, gw_, XRP(100), btc(100), Ter(tecUNFUNDED_AMM));
             // This is fine - alice transfers 100 to AMM. OutstandingAmount
             // is 100.
-            AMM const ammAlice(env, alice, XRP(100), BTC(100));
+            AMM const ammAlice(env, alice_, XRP(100), btc(100));
         }
     }
 
@@ -403,40 +403,42 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // LPTokenOut can not be zero
-                ammAlice.deposit(alice, 0, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                ammAlice.deposit(alice_, 0, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // LPTokenOut can not be negative
                 ammAlice.deposit(
-                    alice, IOUAmount{-1}, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                    alice_, IOUAmount{-1}, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // LPTokenOut can not be MPT
                 {
-                    Json::Value jv = Json::objectValue;
-                    jv[jss::Account] = alice.human();
+                    json::Value jv = json::ObjectValue;
+                    jv[jss::Account] = alice_.human();
                     jv[jss::TransactionType] = jss::AMMDeposit;
-                    jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::none);
-                    jv[jss::Asset2] = STIssue(sfAsset, MPT(ammAlice[1])).getJson(JsonOptions::none);
-                    jv[jss::LPTokenOut] = MPT(ammAlice[1])(100).value().getJson(JsonOptions::none);
+                    jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::KNone);
+                    jv[jss::Asset2] =
+                        STIssue(sfAsset, MPT(ammAlice[1])).getJson(JsonOptions::KNone);
+                    jv[jss::LPTokenOut] = MPT(ammAlice[1])(100).value().getJson(JsonOptions::KNone);
                     jv[jss::Flags] = tfLPToken;
-                    env(jv, ter(telENV_RPC_FAILED));
+                    env(jv, Ter(telENV_RPC_FAILED));
                 }
 
                 // Provided LPTokenOut does not match AMM pool's LPToken
                 // asset
                 {
-                    Json::Value jv = Json::objectValue;
-                    jv[jss::Account] = alice.human();
+                    json::Value jv = json::ObjectValue;
+                    jv[jss::Account] = alice_.human();
                     jv[jss::TransactionType] = jss::AMMDeposit;
-                    jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::none);
-                    jv[jss::Asset2] = STIssue(sfAsset, MPT(ammAlice[1])).getJson(JsonOptions::none);
-                    jv[jss::LPTokenOut] = USD(100).value().getJson(JsonOptions::none);
+                    jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::KNone);
+                    jv[jss::Asset2] =
+                        STIssue(sfAsset, MPT(ammAlice[1])).getJson(JsonOptions::KNone);
+                    jv[jss::LPTokenOut] = USD(100).value().getJson(JsonOptions::KNone);
                     jv[jss::Flags] = tfLPToken;
-                    env(jv, ter(temBAD_AMM_TOKENS));
+                    env(jv, Ter(temBAD_AMM_TOKENS));
                 }
 
                 // Invalid trading fee
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     std::nullopt,
                     XRP(200),
                     MPT(ammAlice[1])(200),
@@ -445,14 +447,14 @@ private:
                     std::nullopt,
                     std::nullopt,
                     10'000,
-                    ter(temBAD_FEE));
+                    Ter(temBAD_FEE));
 
                 // Invalid tokens
                 {
                     auto const mpt1 = MPTIssue{MPTID(0xabc)};
                     auto const mpt2 = MPTIssue{MPTID(0xdef)};
                     ammAlice.deposit(
-                        alice,
+                        alice_,
                         1'000,
                         std::nullopt,
                         std::nullopt,
@@ -461,78 +463,78 @@ private:
                         {{mpt1, mpt2}},
                         std::nullopt,
                         std::nullopt,
-                        ter(terNO_AMM));
+                        Ter(terNO_AMM));
                 }
 
                 // invalid MPT
                 ammAlice.deposit(
-                    alice, badMPT(), std::nullopt, std::nullopt, std::nullopt, ter(temBAD_MPT));
+                    alice_, badMPT(), std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_MPT));
                 ammAlice.deposit(
-                    alice, XRP(100), badMPT(), std::nullopt, std::nullopt, ter(temBAD_MPT));
+                    alice_, XRP(100), badMPT(), std::nullopt, std::nullopt, Ter(temBAD_MPT));
 
                 // MPTokenIssuance object doesn't exist
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     XRP(100),
-                    MPT(gw, 1'000)(100),
+                    MPT(gw_, 1'000)(100),
                     std::nullopt,
                     tfTwoAsset,
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
 
                 // MPToken object doesn't exist
-                env.fund(XRP(1'000), bob);
+                env.fund(XRP(1'000), bob_);
                 ammAlice.deposit(
-                    bob,
+                    bob_,
                     XRP(100),
                     MPT(ammAlice[1])(200),
                     std::nullopt,
                     tfTwoAsset,
-                    ter(tecNO_AUTH));
+                    Ter(tecNO_AUTH));
 
-                MPTTester const BTC(
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
-                     .flags = tfMPTCanLock | MPTDEXFlags,
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                      .authHolder = true});
 
                 // Depositing mismatched token, invalid Asset1In.issue
                 ammAlice.deposit(
-                    alice,
-                    BTC(100),
+                    alice_,
+                    btc(100),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
 
                 // Depositing mismatched token, invalid Asset2In.issue
                 ammAlice.deposit(
-                    alice, XRP(100), BTC(100), std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                    alice_, XRP(100), btc(100), std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // Assets can not be the same
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(100),
                     MPT(ammAlice[1])(200),
                     std::nullopt,
                     tfTwoAsset,
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
 
                 // Invalid amount value
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(0),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(-1'000),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
 
                 // Invalid Account
                 {
@@ -546,28 +548,28 @@ private:
                         std::nullopt,
                         std::nullopt,
                         std::nullopt,
-                        seq(1),
+                        Seq(1),
                         std::nullopt,
-                        ter(terNO_ACCOUNT));
+                        Ter(terNO_ACCOUNT));
                 }
 
                 // Invalid AMM
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    {{MPT(BTC), MPT(ammAlice[1])}},
+                    {{MPT(btc), MPT(ammAlice[1])}},
                     std::nullopt,
                     std::nullopt,
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
 
                 // Single deposit: 100000 tokens worth of MPT
                 // Amount to deposit exceeds Max
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     100'000,
                     MPT(ammAlice[1])(200),
                     std::nullopt,
@@ -576,12 +578,12 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
 
                 // Single deposit: 100000 tokens worth of XRP
                 // Amount to deposit exceeds Max
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     100'000,
                     XRP(200),
                     std::nullopt,
@@ -590,54 +592,54 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
 
                 // Deposit amount is invalid
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(0),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1},
                     std::nullopt,
-                    ter(tecUNFUNDED_AMM));
+                    Ter(tecUNFUNDED_AMM));
                 // Calculated amount is 0
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(0),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 2'000, -6},
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
 
                 // Tiny deposit
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     IOUAmount{1, -10},
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
 
                 // Deposit non-empty AMM
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     XRP(100),
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     tfTwoAssetIfEmpty,
-                    ter(tecAMM_NOT_EMPTY));
+                    Ter(tecAMM_NOT_EMPTY));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Tiny deposit
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const enabledV1_3 = env.current()->rules().enabled(fixAMMv1_3);
-                auto const err = !enabledV1_3 ? ter(temBAD_AMOUNT) : ter(tesSUCCESS);
+                auto const enabledV13 = env.current()->rules().enabled(fixAMMv1_3);
+                auto const err = !enabledV13 ? Ter(temBAD_AMOUNT) : Ter(tesSUCCESS);
                 // Pre-amendment XRP deposit side is rounded to 0
                 // and deposit fails.
-                ammAlice.deposit(carol, IOUAmount{1, -1}, std::nullopt, std::nullopt, err);
+                ammAlice.deposit(carol_, IOUAmount{1, -1}, std::nullopt, std::nullopt, err);
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             0,
             std::nullopt,
             {features, features - fixAMMv1_3});
@@ -645,212 +647,215 @@ private:
         // Invalid AMM
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdrawAll(alice);
-                ammAlice.deposit(alice, 10'000, std::nullopt, std::nullopt, ter(terNO_AMM));
+                ammAlice.withdrawAll(alice_);
+                ammAlice.deposit(alice_, 10'000, std::nullopt, std::nullopt, Ter(terNO_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit MPT with eprice
         // the calculated amount to deposit is negative.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1},
                     tfLimitLPToken,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
 
                 // although we should use lptoken unit for eprice,
                 // we don't check the currency any more, we just use
                 // the value
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{USD, 1, -1},
                     tfLimitLPToken,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Globally locked MPT
         {
             Env env{*this};
-            fund(env, gw, {alice, carol}, {USD(20'000)}, Fund::All);
-            MPTTester BTC(
+            fund(env, gw_, {alice_, carol_}, {USD(20'000)}, Fund::All);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, USD(10'000), BTC(10'000));
-            BTC.set({.flags = tfMPTLock});
+            AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
+            btc.set({.flags = tfMPTLock});
 
             ammAlice.deposit(
-                carol, BTC(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             ammAlice.deposit(
-                carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
-            ammAlice.deposit(carol, USD(100), BTC(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(
+                carol_, USD(100), btc(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
         }
 
         // Individually lock MPT or freeze IOU (AMM) with IOU/MPT AMM
         {
             Env env{*this, features};
-            fund(env, gw, {alice, carol}, {USD(20'000)}, Fund::All);
-            MPTTester BTC(
+            fund(env, gw_, {alice_, carol_}, {USD(20'000)}, Fund::All);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, USD(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
 
             // Carol's mpt is locked
-            BTC.set({.holder = carol, .flags = tfMPTLock});
+            btc.set({.holder = carol_, .flags = tfMPTLock});
 
             // Carol can not deposit locked mpt
             ammAlice.deposit(
-                carol, BTC(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             if (!features[featureAMMClawback])
             {
                 ammAlice.deposit(
-                    carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecLOCKED));
+                    carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecLOCKED));
             }
             else
             {
                 // Carol can not deposit non-forzen token either
                 ammAlice.deposit(
-                    carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                    carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
             }
 
             // Alice can deposit because she's not individually locked
-            ammAlice.deposit(alice, BTC(100), std::nullopt, std::nullopt, std::nullopt);
-            ammAlice.deposit(alice, 1'000, std::nullopt, std::nullopt);
-            ammAlice.deposit(alice, USD(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(alice_, btc(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(alice_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(alice_, USD(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Unlock
-            BTC.set({.holder = carol, .flags = tfMPTUnlock});
+            btc.set({.holder = carol_, .flags = tfMPTUnlock});
             // Carol can deposit after unlock
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt);
 
             // Individually frozen AMM
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
+                gw_, STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
             env.close();
 
             // Can deposit non-frozen token
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Cannot deposit frozen token
-            ammAlice.deposit(carol, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
             ammAlice.deposit(
-                carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // unfreeze IOU
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfClearFreeze));
+                gw_,
+                STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0},
+                tfClearFreeze));
             env.close();
             // Can deposit
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt);
 
             // Individually lock AMM
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
 
             // Can deposit non-frozen token
-            ammAlice.deposit(carol, USD(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, USD(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Can not deposit locked token
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
             ammAlice.deposit(
-                carol, BTC(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unlock AMM MPT
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
             // can deposit
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt);
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
         }
 
         // Individually lock MPT (AMM) account with MPT/MPT AMM
         {
             Env env{*this};
-            env.fund(XRP(10'000), gw, alice, carol);
+            env.fund(XRP(10'000), gw_, alice_, carol_);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            MPTTester USD(
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            MPTTester usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, USD(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, usd(10'000), btc(10'000));
 
             // Carol's BTC is locked
-            BTC.set({.holder = carol, .flags = tfMPTLock});
+            btc.set({.holder = carol_, .flags = tfMPTLock});
             ammAlice.deposit(
-                carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, usd(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             ammAlice.deposit(
-                carol, BTC(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unlock carol's BTC
-            BTC.set({.holder = carol, .flags = tfMPTUnlock});
+            btc.set({.holder = carol_, .flags = tfMPTUnlock});
 
             // Can deposit
-            ammAlice.deposit(carol, USD(100), std::nullopt, std::nullopt, std::nullopt);
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, usd(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Individually lock MPT BTC (AMM) account
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
 
             // Can deposit non-locked token USD
-            ammAlice.deposit(carol, USD(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, usd(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Can not deposit locked token BTC
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
             ammAlice.deposit(
-                carol, BTC(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, btc(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unlock AMM MPT BTC
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
             // Can deposit BTC
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt);
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Individually Lock MPT USD (AMM) account
-            USD.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
+            usd.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
 
             // Can deposit non-locked token BTC
-            ammAlice.deposit(carol, BTC(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, btc(100), std::nullopt, std::nullopt, std::nullopt);
 
             // Can not deposit locked token USD
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
             ammAlice.deposit(
-                carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                carol_, usd(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unlock AMM MPT USD
-            USD.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
+            usd.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
             // Can deposit USD
-            ammAlice.deposit(carol, 1'000, std::nullopt, std::nullopt);
-            ammAlice.deposit(carol, USD(100), std::nullopt, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.deposit(carol_, usd(100), std::nullopt, std::nullopt, std::nullopt);
         }
 
         // Deposit unauthorized token
@@ -860,15 +865,15 @@ private:
             env.fund(XRP(30'000), alice, carol, gw);
             env.close();
 
-            MPTTester BTC(env, gw, {.holders = {alice, carol}, .fund = false});
-            BTC.create(
+            MPTTester btc(env, gw, {.holders = {alice, carol}, .fund = false});
+            btc.create(
                 {.maxAmt = 1'000'000,
                  .authorize = {{alice}},
                  .pay = {{{alice}, 10'000}},
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
 
-            AMM amm(env, alice, XRP(10'000), BTC(10'000));
+            AMM amm(env, alice, XRP(10'000), btc(10'000));
             env.close();
 
             if (!features[featureAMMClawback])
@@ -878,7 +883,7 @@ private:
             else
             {
                 amm.deposit(
-                    carol, XRP(10), std::nullopt, std::nullopt, std::nullopt, ter(tecNO_AUTH));
+                    carol, XRP(10), std::nullopt, std::nullopt, std::nullopt, Ter(tecNO_AUTH));
             }
         }
 
@@ -889,75 +894,75 @@ private:
             env.fund(XRP(30'000), alice, carol, gw);
             env.close();
 
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 1'000,
                  .flags = tfMPTCanTrade});
 
-            AMM amm(env, gw, XRP(10'000), BTC(10'000));
+            AMM amm(env, gw, XRP(10'000), btc(10'000));
 
-            amm.deposit({.account = alice, .asset1In = BTC(10), .err = ter(tecNO_PERMISSION)});
+            amm.deposit({.account = alice, .asset1In = btc(10), .err = Ter(tecNO_PERMISSION)});
         }
 
         // Insufficient XRP balance
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
+                env.fund(XRP(1'000), bob_);
                 env.close();
-                ammAlice.deposit(bob, XRP(10));
+                ammAlice.deposit(bob_, XRP(10));
                 ammAlice.deposit(
-                    bob,
+                    bob_,
                     XRP(1'000),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecUNFUNDED_AMM));
+                    Ter(tecUNFUNDED_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Insufficient MPT balance
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(450'000),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecUNFUNDED_AMM));
+                    Ter(tecUNFUNDED_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Insufficient IOU balance
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, {USD(1'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, {USD(1'000)}, Fund::Acct);
                 ammAlice.deposit(
-                    bob,
+                    bob_,
                     USD(1'001),
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecUNFUNDED_AMM));
+                    Ter(tecUNFUNDED_AMM));
             },
-            {{USD(1000), AMMMPT(1000)}});
+            {{USD(1000), gAmmmpt(1000)}});
 
         // Insufficient MPT balance by tokens
         {
             Env env{*this};
-            env.fund(XRP(30'000), alice, bob, gw);
+            env.fund(XRP(30'000), alice_, bob_, gw_);
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .transferFee = 1'500,
                  .pay = 1000});
-            AMM ammAlice(env, alice, XRP(20'000), BTC(1000));
+            AMM ammAlice(env, alice_, XRP(20'000), btc(1000));
             ammAlice.deposit(
-                bob,
+                bob_,
                 10'000'000,
                 std::nullopt,
                 std::nullopt,
@@ -966,52 +971,52 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecUNFUNDED_AMM));
+                Ter(tecUNFUNDED_AMM));
         }
 
         // Insufficient reserve, XRP/MPT
         {
             Env env(*this);
-            auto const starting_xrp = reserve(env, 4) + env.current()->fees().base * 4;
-            env.fund(XRP(10'000), gw);
-            env.fund(XRP(10'000), alice);
-            env.fund(starting_xrp, carol);
+            auto const startingXrp = reserve(env, 4) + env.current()->fees().base * 4;
+            env.fund(XRP(10'000), gw_);
+            env.fund(XRP(10'000), alice_);
+            env.fund(startingXrp, carol_);
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 1'500,
                  .pay = 40'000});
 
-            env(offer(carol, XRP(100), BTC(101)));
-            AMM ammAlice(env, alice, XRP(1000), BTC(1000));
+            env(offer(carol_, XRP(100), btc(101)));
+            AMM ammAlice(env, alice_, XRP(1000), btc(1000));
             ammAlice.deposit(
-                carol,
+                carol_,
                 XRP(100),
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecINSUF_RESERVE_LINE));
+                Ter(tecINSUF_RESERVE_LINE));
 
-            env(offer(carol, XRP(100), BTC(102)));
+            env(offer(carol_, XRP(100), btc(102)));
             ammAlice.deposit(
-                carol,
-                BTC(100),
+                carol_,
+                btc(100),
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecINSUF_RESERVE_LINE));
+                Ter(tecINSUF_RESERVE_LINE));
         }
 
         // Invalid min
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // min tokens can't be <= zero
-                ammAlice.deposit(carol, 0, XRP(100), tfSingleAsset, ter(temBAD_AMM_TOKENS));
-                ammAlice.deposit(carol, -1, XRP(100), tfSingleAsset, ter(temBAD_AMM_TOKENS));
+                ammAlice.deposit(carol_, 0, XRP(100), tfSingleAsset, Ter(temBAD_AMM_TOKENS));
+                ammAlice.deposit(carol_, -1, XRP(100), tfSingleAsset, Ter(temBAD_AMM_TOKENS));
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     0,
                     XRP(100),
                     MPT(ammAlice[1])(100),
@@ -1020,11 +1025,11 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
 
                 // min amounts can't be <= zero
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000,
                     XRP(0),
                     MPT(ammAlice[1])(100),
@@ -1033,9 +1038,9 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000,
                     XRP(100),
                     MPT(ammAlice[1])(-1),
@@ -1044,9 +1049,9 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000,
                     XRP(100),
                     badMPT(),
@@ -1055,16 +1060,16 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(temBAD_MPT));
+                    Ter(temBAD_MPT));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Min deposit
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Equal deposit by tokens
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000'000,
                     XRP(1'000),
                     MPT(ammAlice[1])(1'001),
@@ -1073,9 +1078,9 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000'000,
                     XRP(1'001),
                     MPT(ammAlice[1])(1'000),
@@ -1084,10 +1089,10 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
                 // Equal deposit by asset
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     100'001,
                     XRP(100),
                     MPT(ammAlice[1])(100),
@@ -1096,10 +1101,10 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
                 // Single deposit by asset
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488'090,
                     XRP(1'000),
                     std::nullopt,
@@ -1108,30 +1113,30 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
             },
-            {{XRP(1000), AMMMPT(1000)}});
+            {{XRP(1000), gAmmmpt(1000)}});
 
         // OutstandingAmount > MaximumAmount
         {
             Env env{*this};
-            env.fund(XRP(1'000), gw, alice);
+            env.fund(XRP(1'000), gw_, alice_);
 
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 100});
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = {alice_}, .maxAmt = 100});
 
-            AMM amm(env, gw, XRP(100), BTC(90));
+            AMM amm(env, gw_, XRP(100), btc(90));
             // OutstandingAmount is 90, issuer issues 1 over MaximumAmount
             amm.deposit(
-                DepositArg{.account = gw, .asset1In = BTC(11), .err = ter(tecUNFUNDED_AMM)});
+                DepositArg{.account = gw_, .asset1In = btc(11), .err = Ter(tecUNFUNDED_AMM)});
 
-            env(pay(gw, alice, BTC(10)));
+            env(pay(gw_, alice_, btc(10)));
 
             // OutstandingAmount is 100, issuer issues 10 over MaximumAmount
             amm.deposit(
-                DepositArg{.account = gw, .asset1In = BTC(10), .err = ter(tecUNFUNDED_AMM)});
+                DepositArg{.account = gw_, .asset1In = btc(10), .err = Ter(tecUNFUNDED_AMM)});
             // This is fine - alice transfers 10 to AMM. OutstandingAmount
             // is 100.
-            amm.deposit(DepositArg{.account = alice, .asset1In = BTC(10)});
+            amm.deposit(DepositArg{.account = alice_, .asset1In = btc(10)});
         }
     }
 
@@ -1146,25 +1151,25 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
 
                 // carol deposited 1000 XRP and pays the transaction fee
-                env.require(balance(carol, carolXRP - XRP(1000) - drops(baseFee)));
+                env.require(Balance(carol_, carolXRP - XRP(1000) - drops(baseFee)));
                 // carol deposited 1000 MPT
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(1000)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(1000)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // single deposit MPT with eprice
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1},
@@ -1174,47 +1179,47 @@ private:
                 // we don't check the currency any more, we just use
                 // the value
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{USD, 1, -1},
                     tfLimitLPToken);
             },
-            {{USD(10'000'000), AMMMPT(10'000)}});
+            {{USD(10'000'000), gAmmmpt(10'000)}});
 
         // Equal deposit: 1000000 tokens. IOU/MPT combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
 
-                ammAlice.deposit(carol, 1'000);
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(11'000), USD(11'000), IOUAmount(11'000)));
+                ammAlice.deposit(carol_, 1'000);
+                BEAST_EXPECT(ammAlice.expectBalances(btc(11'000), usd(11'000), IOUAmount(11'000)));
 
-                env.require(balance(carol, carolBTC - BTC(1000)));
-                env.require(balance(carol, carolUSD - USD(1000)));
+                env.require(Balance(carol_, carolBTC - btc(1000)));
+                env.require(Balance(carol_, carolUSD - usd(1000)));
             };
             testHelper2TokensMix(test);
         }
@@ -1223,51 +1228,51 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, MPT(ammAlice[1])(100), XRP(100));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(100), XRP(100));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'100), MPT(ammAlice[1])(10'100), IOUAmount{10'100'000, 0}));
 
-                env.require(balance(carol, carolXRP - XRP(100) - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(100)));
+                env.require(Balance(carol_, carolXRP - XRP(100) - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(100)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Deposit MPT/IOU combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
-                ammAlice.deposit(carol, BTC(100), USD(100));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
+                ammAlice.deposit(carol_, btc(100), usd(100));
 
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(10'100), USD(10'100), IOUAmount(10'100)));
+                BEAST_EXPECT(ammAlice.expectBalances(btc(10'100), usd(10'100), IOUAmount(10'100)));
 
-                env.require(balance(carol, carolBTC - BTC(100)));
-                env.require(balance(carol, carolUSD - USD(100)));
+                env.require(Balance(carol_, carolBTC - btc(100)));
+                env.require(Balance(carol_, carolUSD - usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -1277,50 +1282,50 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, MPT(ammAlice[1])(200), XRP(100));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(200), XRP(100));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'100), MPT(ammAlice[1])(10'100), IOUAmount{10'100'000, 0}));
 
-                env.require(balance(carol, carolXRP - XRP(100) - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(100)));
+                env.require(Balance(carol_, carolXRP - XRP(100) - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(100)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal limit deposit. MPT/IOU combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
-                ammAlice.deposit(carol, BTC(200), USD(100));
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(10'100), USD(10'100), IOUAmount(10'100)));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
+                ammAlice.deposit(carol_, btc(200), usd(100));
+                BEAST_EXPECT(ammAlice.expectBalances(btc(10'100), usd(10'100), IOUAmount(10'100)));
 
-                env.require(balance(carol, carolBTC - BTC(100)));
-                env.require(balance(carol, carolUSD - USD(100)));
+                env.require(Balance(carol_, carolBTC - btc(100)));
+                env.require(Balance(carol_, carolUSD - usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -1329,156 +1334,156 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1000));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(11'000), IOUAmount{10'488'088'48170151, -8}));
 
-                env.require(balance(carol, carolXRP - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(1000)));
+                env.require(Balance(carol_, carolXRP - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(1000)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         //  Single deposit: 1000 XRP into MPT/XRP
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, XRP(1000));
+                ammAlice.deposit(carol_, XRP(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(10'000), IOUAmount{10'488'088'48170151, -8}));
 
-                env.require(balance(carol, carolXRP - XRP(1000) - drops(baseFee)));
-                env.require(balance(carol, carolMPT));
+                env.require(Balance(carol_, carolXRP - XRP(1000) - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit: 1000 MPT0 into MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT0 = env.balance(carol, MPT(ammAlice[0]));
-                auto carolMPT1 = env.balance(carol, MPT(ammAlice[1]));
+                auto carolMPT0 = env.balance(carol_, MPT(ammAlice[0]));
+                auto carolMPT1 = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, MPT(ammAlice[0])(1000));
+                ammAlice.deposit(carol_, MPT(ammAlice[0])(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(11'000),
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{10'488'08848170151, -11}));
 
-                env.require(balance(carol, carolMPT0 - MPT(ammAlice[0])(1000)));
-                env.require(balance(carol, carolMPT1));
+                env.require(Balance(carol_, carolMPT0 - MPT(ammAlice[0])(1000)));
+                env.require(Balance(carol_, carolMPT1));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
         // Single deposit: 1000 MPT into MPT/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[0]));
-                auto carolUSD = env.balance(carol, USD);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[0]));
+                auto carolUSD = env.balance(carol_, USD);
 
-                ammAlice.deposit(carol, MPT(ammAlice[0])(1000));
+                ammAlice.deposit(carol_, MPT(ammAlice[0])(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(11'000), USD(10'000), IOUAmount{10'488'08848170151, -11}));
 
-                env.require(balance(carol, carolMPT - MPT(ammAlice[0])(1000)));
-                env.require(balance(carol, carolUSD));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[0])(1000)));
+                env.require(Balance(carol_, carolUSD));
             },
-            {{AMMMPT(10'000), USD(10'000)}});
+            {{gAmmmpt(10'000), USD(10'000)}});
 
         // Single deposit: 1000 IOU into MPT/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[0]));
-                auto carolUSD = env.balance(carol, USD);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[0]));
+                auto carolUSD = env.balance(carol_, USD);
 
-                ammAlice.deposit(carol, USD(1000));
+                ammAlice.deposit(carol_, USD(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000),
                     STAmount{USD, UINT64_C(10999'99999999999), -11},
                     IOUAmount{10'488'08848170151, -11}));
 
-                env.require(balance(carol, carolMPT));
+                env.require(Balance(carol_, carolMPT));
                 env.require(
-                    balance(carol, carolUSD - STAmount{USD, UINT64_C(999'99999999999), -11}));
+                    Balance(carol_, carolUSD - STAmount{USD, UINT64_C(999'99999999999), -11}));
             },
-            {{AMMMPT(10'000), USD(10'000)}});
+            {{gAmmmpt(10'000), USD(10'000)}});
 
         // Single deposit: 100000 tokens worth of MPT into XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, 100'000, MPT(ammAlice[1])(205));
+                ammAlice.deposit(carol_, 100'000, MPT(ammAlice[1])(205));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'201), IOUAmount{10'100'000, 0}));
 
-                env.require(balance(carol, carolXRP - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(201)));
+                env.require(Balance(carol_, carolXRP - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(201)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit: 100000 tokens worth of XRP into XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
-                ammAlice.deposit(carol, 100'000, XRP(205));
+                ammAlice.deposit(carol_, 100'000, XRP(205));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'201), MPT(ammAlice[1])(10'000), IOUAmount{10'100'000, 0}));
 
-                env.require(balance(carol, carolXRP - XRP(201) - drops(baseFee)));
-                env.require(balance(carol, carolMPT));
+                env.require(Balance(carol_, carolXRP - XRP(201) - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit: 100 tokens worth of MPT/IOU into pool of MPT/IOU
         // combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
 
-                ammAlice.deposit(carol, 100, USD(205));
+                ammAlice.deposit(carol_, 100, usd(205));
                 auto deltaUSD = [&]() {
-                    if constexpr (std::is_same_v<MPT, std::decay_t<decltype(USD)>>)
-                        return USD(202);
-                    return USD(201);
+                    if constexpr (std::is_same_v<MPT, std::decay_t<decltype(usd)>>)
+                        return usd(202);
+                    return usd(201);
                 }();
                 BEAST_EXPECT(ammAlice.expectBalances(
-                    BTC(10'000), USD(10'000) + deltaUSD, IOUAmount{10'100, 0}));
+                    btc(10'000), usd(10'000) + deltaUSD, IOUAmount{10'100, 0}));
 
-                env.require(balance(carol, carolBTC));
-                env.require(balance(carol, carolUSD - deltaUSD));
+                env.require(Balance(carol_, carolBTC));
+                env.require(Balance(carol_, carolUSD - deltaUSD));
             };
             testHelper2TokensMix(test);
         }
@@ -1489,7 +1494,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1});
@@ -1497,18 +1502,18 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10100), IOUAmount{10'049'875'62112089, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit with EP not exceeding specified:
         // 100 MPT with EP not to exceed 0.002004 (AssetIn/TokensOut)
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 2004, -6});
@@ -1516,21 +1521,21 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'081), IOUAmount{10'039'920'31840891, -8}));
 
-                env.require(balance(carol, carolXRP - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(81)));
+                env.require(Balance(carol_, carolXRP - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(81)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit with EP not exceeding specified:
         // 0 MPT with EP not to exceed 0.002004 (AssetIn/TokensOut)
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(0),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 2004, -6});
@@ -1538,10 +1543,10 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'081), IOUAmount{10'039'920'31840891, -8}));
 
-                env.require(balance(carol, carolXRP - drops(baseFee)));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(81)));
+                env.require(Balance(carol_, carolXRP - drops(baseFee)));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(81)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit with EP not exceeding specified:
         // 100 MPT with EP not to exceed 0.1 (AssetIn/TokensOut)
@@ -1549,7 +1554,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1});
@@ -1559,21 +1564,21 @@ private:
                     MPT(ammAlice[1])(10100),
                     IOUAmount{10'049'875'62112089, -8}));
             },
-            {{USD(10'000'000'000), AMMMPT(10'000)}});
+            {{USD(10'000'000'000), gAmmmpt(10'000)}});
 
         // Single deposit with EP not exceeding specified:
         // 100 IOU with EP not to exceed 0.1 (AssetIn/TokensOut)
         // for IOU/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, USD(100), std::nullopt, STAmount{USD, 1, -1});
+                ammAlice.deposit(carol_, USD(100), std::nullopt, STAmount{USD, 1, -1});
 
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[1])(10'000'000'000),
                     USD(10100),
                     IOUAmount{10'049'875'62112089, -8}));
             },
-            {{USD(10'000), AMMMPT(10'000'000'000)}});
+            {{USD(10'000), gAmmmpt(10'000'000'000)}});
 
         // Single deposit with EP not exceeding specified:
         // 100 IOU with EP not to exceed 0.1 (AssetIn/TokensOut)
@@ -1581,7 +1586,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[0])(100),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1});
@@ -1591,198 +1596,198 @@ private:
                     MPT(ammAlice[0])(10100),
                     IOUAmount{10'049'875'62112089, -8}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000'000'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000'000'000)}});
 
         // MPT/MPT with transfer fee
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
+            env.fund(XRP(30'000), gw_, alice_, carol_);
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 400'000});
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 400'000});
 
-            AMM ammAlice(env, alice, USD(200'000), BTC(5));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(200'000), BTC(5), IOUAmount{1000, 0}));
+            AMM ammAlice(env, alice_, usd(200'000), btc(5));
+            BEAST_EXPECT(ammAlice.expectBalances(usd(200'000), btc(5), IOUAmount{1000, 0}));
 
-            ammAlice.deposit(carol, 100, std::nullopt, std::nullopt);
-            BEAST_EXPECT(ammAlice.expectBalances(USD(220'000), BTC(6), IOUAmount{1100, 0}));
+            ammAlice.deposit(carol_, 100, std::nullopt, std::nullopt);
+            BEAST_EXPECT(ammAlice.expectBalances(usd(220'000), btc(6), IOUAmount{1100, 0}));
         }
 
         // IOU/MPT with transfer fee
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
             env.close();
 
-            env(rate(gw, 1.25));
+            env(rate(gw_, 1.25));
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 400'000});
 
-            auto const USD = gw["USD"];
-            env.trust(USD(1000000), alice);
-            env(pay(gw, alice, USD(1000000)));
-            env.trust(USD(1000000), bob);
-            env(pay(gw, bob, USD(1000000)));
-            env.trust(USD(1000000), carol);
-            env(pay(gw, carol, USD(1000000)));
+            auto const usd = gw_["USD"];
+            env.trust(usd(1000000), alice_);
+            env(pay(gw_, alice_, usd(1000000)));
+            env.trust(usd(1000000), bob_);
+            env(pay(gw_, bob_, usd(1000000)));
+            env.trust(usd(1000000), carol_);
+            env(pay(gw_, carol_, usd(1000000)));
             env.close();
 
             // IOU/MPT
-            AMM ammAlice(env, alice, USD(200'000), BTC(5));
-            BEAST_EXPECT(ammAlice.expectBalances(USD(200'000), BTC(5), IOUAmount{1000, 0}));
-            ammAlice.deposit(carol, 100, std::nullopt, std::nullopt);
-            BEAST_EXPECT(ammAlice.expectBalances(USD(220'000), BTC(6), IOUAmount{1100, 0}));
+            AMM ammAlice(env, alice_, usd(200'000), btc(5));
+            BEAST_EXPECT(ammAlice.expectBalances(usd(200'000), btc(5), IOUAmount{1000, 0}));
+            ammAlice.deposit(carol_, 100, std::nullopt, std::nullopt);
+            BEAST_EXPECT(ammAlice.expectBalances(usd(220'000), btc(6), IOUAmount{1100, 0}));
 
-            MPT const ETH = MPTTester(
+            MPT const eth = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 400'000});
 
             // MPT/IOU
-            AMM ammBob(env, bob, ETH(20'000), USD(0.5));
-            BEAST_EXPECT(ammBob.expectBalances(ETH(20'000), USD(0.5), IOUAmount{100, 0}));
-            ammBob.deposit(carol, 10);
-            BEAST_EXPECT(ammBob.expectBalances(ETH(22'000), USD(0.55), IOUAmount{110, 0}));
+            AMM ammBob(env, bob_, eth(20'000), usd(0.5));
+            BEAST_EXPECT(ammBob.expectBalances(eth(20'000), usd(0.5), IOUAmount{100, 0}));
+            ammBob.deposit(carol_, 10);
+            BEAST_EXPECT(ammBob.expectBalances(eth(22'000), usd(0.55), IOUAmount{110, 0}));
         }
 
         // Tiny deposits for IOU/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // tiny amount causes MPT to deposit rounded to 0
-                ammAlice.deposit(carol, IOUAmount{1, -3}, std::nullopt, std::nullopt);
+                ammAlice.deposit(carol_, IOUAmount{1, -3}, std::nullopt, std::nullopt);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(10'000'001), -3},
                     MPT(ammAlice[1])(10'001),
                     IOUAmount{10'000'001, -3}));
 
-                ammAlice.deposit(carol, IOUAmount{1});
+                ammAlice.deposit(carol_, IOUAmount{1});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(10'001'001), -3},
                     MPT(ammAlice[1])(10'003),
                     IOUAmount{10'001'001, -3}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, STAmount{USD, 1, -10});
+                ammAlice.deposit(carol_, STAmount{USD, 1, -10});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(10'000'00000000008), -11},
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{1'000'000'000000004, -11}));
 
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(10'000'00000000008), -11},
                     MPT(ammAlice[1])(10'001),
                     IOUAmount{10'000'49998750066, -11}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Tiny deposits for XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, XRPAmount{1});
+                ammAlice.deposit(carol_, XRPAmount{1});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount{10'000'000'001},
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{1'000'000'000049999, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'001), IOUAmount{10'000'499'98750062, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Tiny deposits for MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1));
 
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000),
                     MPT(ammAlice[1])(10'001),
                     IOUAmount{1'000'049'998750062, -11}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
         // MPT Issuer create/deposit
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw);
+            env.fund(XRP(30'000), gw_);
             env.close();
 
-            MPT const BTC = MPTTester({.env = env, .issuer = gw, .holders = {}});
+            MPT const btc = MPTTester({.env = env, .issuer = gw_, .holders = {}});
 
-            AMM ammGw(env, gw, XRP(10'000), BTC(10'000'000'000));
+            AMM ammGw(env, gw_, XRP(10'000), btc(10'000'000'000));
             BEAST_EXPECT(
-                ammGw.expectBalances(XRP(10'000), BTC(10'000'000'000), IOUAmount{10'000'000'000}));
+                ammGw.expectBalances(XRP(10'000), btc(10'000'000'000), IOUAmount{10'000'000'000}));
 
-            ammGw.deposit(gw, 1'000'000);
+            ammGw.deposit(gw_, 1'000'000);
             BEAST_EXPECT(
-                ammGw.expectBalances(XRP(10'001), BTC(10'001000000), IOUAmount{10'001000000}));
+                ammGw.expectBalances(XRP(10'001), btc(10'001000000), IOUAmount{10'001000000}));
 
-            ammGw.deposit(gw, BTC(1'000000000));
+            ammGw.deposit(gw_, btc(1'000000000));
             BEAST_EXPECT(ammGw.expectBalances(
-                XRP(10'001), BTC(11'001000000), IOUAmount{1048'908'961731188, -5}));
+                XRP(10'001), btc(11'001000000), IOUAmount{1048'908'961731188, -5}));
         }
 
         // Issuer deposit in MPT/MPT pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(gw, 1'000'000);
+                ammAlice.deposit(gw_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(1'010'000),
                     MPT(ammAlice[1])(1'010'000),
                     IOUAmount{1'010'000}));
 
-                ammAlice.deposit(gw, MPT(ammAlice[0])(1000));
+                ammAlice.deposit(gw_, MPT(ammAlice[0])(1000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(1'010'999),
                     MPT(ammAlice[1])(1'010'000),
                     IOUAmount{1'010'499'376546071, -9}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
         // Issuer deposit in MPT/XRP pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(gw, 1'000'000);
+                ammAlice.deposit(gw_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000}));
-                ammAlice.deposit(gw, MPT(ammAlice[1])(1'000));
+                ammAlice.deposit(gw_, MPT(ammAlice[1])(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(12'000), IOUAmount{11'489'125'29307605, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit by tokens MPT/XRP
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000'000,
                     XRP(1'000),
                     MPT(ammAlice[1])(1'000),
@@ -1793,49 +1798,49 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit by tokens MPT/IOU combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
 
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000,
-                    USD(1'000),
-                    BTC(1'000),
+                    usd(1'000),
+                    btc(1'000),
                     std::nullopt,
                     tfLPToken,
                     std::nullopt,
                     std::nullopt);
-                BEAST_EXPECT(ammAlice.expectBalances(USD(11'000), BTC(11'000), IOUAmount{11'000}));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(11'000), btc(11'000), IOUAmount{11'000}));
 
-                env.require(balance(carol, carolBTC - BTC(1000)));
-                env.require(balance(carol, carolUSD - USD(1000)));
+                env.require(Balance(carol_, carolBTC - btc(1000)));
+                env.require(Balance(carol_, carolUSD - usd(1000)));
             };
             testHelper2TokensMix(test);
         }
@@ -1844,7 +1849,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000'000,
                     XRP(1'000),
                     MPT(ammAlice[1])(1'000),
@@ -1855,49 +1860,49 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit by asset IOU/MPT combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
 
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     1'000,
-                    USD(1'000),
-                    BTC(1'000),
+                    usd(1'000),
+                    btc(1'000),
                     std::nullopt,
                     tfTwoAsset,
                     std::nullopt,
                     std::nullopt);
                 BEAST_EXPECT(
-                    ammAlice.expectBalances(USD(11'000), BTC(11'000), IOUAmount{11'000, 0}));
+                    ammAlice.expectBalances(usd(11'000), btc(11'000), IOUAmount{11'000, 0}));
 
-                env.require(balance(carol, carolBTC - BTC(1000)));
-                env.require(balance(carol, carolUSD - USD(1000)));
+                env.require(Balance(carol_, carolBTC - btc(1000)));
+                env.require(Balance(carol_, carolUSD - usd(1000)));
             };
             testHelper2TokensMix(test);
         }
@@ -1906,7 +1911,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488'088,
                     XRP(1'000),
                     std::nullopt,
@@ -1917,13 +1922,13 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(10'000), IOUAmount{10'488'088'48170151, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit MPT by asset MPT/XRP
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488'088,
                     MPT(ammAlice[1])(1'000),
                     std::nullopt,
@@ -1934,13 +1939,13 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(11'000), IOUAmount{10'488'088'48170151, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit IOU by asset MPT/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488,
                     USD(1'000),
                     std::nullopt,
@@ -1953,13 +1958,13 @@ private:
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{10'488'08848170151, -11}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit MPT by asset MPT/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488,
                     MPT(ammAlice[1])(1'000),
                     std::nullopt,
@@ -1970,13 +1975,13 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(10'000), MPT(ammAlice[1])(11'000), IOUAmount{10'488'088'48170151, -11}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit MPT by asset MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     488,
                     MPT(ammAlice[1])(1'000),
                     std::nullopt,
@@ -1989,7 +1994,7 @@ private:
                     MPT(ammAlice[1])(11'000),
                     IOUAmount{10'488'088'48170151, -11}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
     }
 
     void
@@ -1998,100 +2003,100 @@ private:
         testcase("Invalid AMMWithdraw");
 
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .asset1Out = XRP(100),
-                    .err = ter(tecAMM_BALANCE),
+                    .err = Ter(tecAMM_BALANCE),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(99), AMMMPT(99)}});
+            {{XRP(99), gAmmmpt(99)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .asset1Out = MPT(ammAlice[1])(100),
-                    .err = ter(tecAMM_BALANCE),
+                    .err = Ter(tecAMM_BALANCE),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(99), AMMMPT(99)}});
+            {{XRP(99), gAmmmpt(99)}});
 
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
             env.close();
             // alice is authorized to hold gw MPT, bob is not authorized
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             WithdrawArg const args{
-                .account = bob,
-                .asset1Out = BTC(100),
-                .err = ter(tecNO_AUTH),
+                .account = bob_,
+                .asset1Out = btc(100),
+                .err = Ter(tecNO_AUTH),
             };
             ammAlice.withdraw(args);
         }
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                MPTTester const BTC(
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | MPTDEXFlags});
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
                 // Invalid tokens
-                ammAlice.withdraw(alice, 0, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                ammAlice.withdraw(alice_, 0, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
                 ammAlice.withdraw(
-                    alice, IOUAmount{-1}, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                    alice_, IOUAmount{-1}, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // Mismatched token, invalid Asset1Out issue
                 ammAlice.withdraw(
-                    alice, BTC(100), std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                    alice_, btc(100), std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
                 ammAlice.withdraw(
-                    alice, MPT(badMPT())(100), std::nullopt, std::nullopt, ter(temBAD_MPT));
+                    alice_, MPT(badMPT())(100), std::nullopt, std::nullopt, Ter(temBAD_MPT));
 
                 // Mismatched token, invalid Asset2Out issue
-                ammAlice.withdraw(alice, XRP(100), BTC(100), std::nullopt, ter(temBAD_AMM_TOKENS));
+                ammAlice.withdraw(alice_, XRP(100), btc(100), std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // Mismatched token, Asset1Out.issue == Asset2Out.issue
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(100),
                     MPT(ammAlice[1])(100),
                     std::nullopt,
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
 
                 // Invalid amount value
                 ammAlice.withdraw(
-                    alice, MPT(ammAlice[1])(0), std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
+                    alice_, MPT(ammAlice[1])(0), std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
                 ammAlice.withdraw(
-                    alice, MPT(ammAlice[1])(-100), std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
+                    alice_, MPT(ammAlice[1])(-100), std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
                 ammAlice.withdraw(
-                    alice, MPT(ammAlice[1])(10), std::nullopt, IOUAmount{-1}, ter(temBAD_AMOUNT));
+                    alice_, MPT(ammAlice[1])(10), std::nullopt, IOUAmount{-1}, Ter(temBAD_AMOUNT));
 
                 // Invalid amount/token value, withdraw all tokens from one side
                 // of the pool.
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     MPT(ammAlice[1])(10'000),
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_BALANCE));
+                    Ter(tecAMM_BALANCE));
                 ammAlice.withdraw(
-                    alice, XRP(10'000), std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
+                    alice_, XRP(10'000), std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     std::nullopt,
                     MPT(ammAlice[1])(0),
                     std::nullopt,
@@ -2099,15 +2104,15 @@ private:
                     tfOneAssetWithdrawAll,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_BALANCE));
+                    Ter(tecAMM_BALANCE));
 
                 // Bad MPT
                 ammAlice.withdraw(
-                    alice, XRP(100), MPT(badMPT())(100), std::nullopt, ter(temBAD_MPT));
+                    alice_, XRP(100), MPT(badMPT())(100), std::nullopt, Ter(temBAD_MPT));
 
                 // Specified MPToken doesn't match the pool assets
                 ammAlice.withdraw(
-                    alice, XRP(100), MPT(noMPT())(100), std::nullopt, ter(temBAD_AMM_TOKENS));
+                    alice_, XRP(100), MPT(noMPT())(100), std::nullopt, Ter(temBAD_AMM_TOKENS));
 
                 // Invalid Account
                 Account bad("bad");
@@ -2120,12 +2125,12 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    seq(1),
-                    ter(terNO_ACCOUNT));
+                    Seq(1),
+                    Ter(terNO_ACCOUNT));
 
                 // Invalid AMM
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
@@ -2133,12 +2138,12 @@ private:
                     std::nullopt,
                     {{MPT(ammAlice[1]), GBP}},
                     std::nullopt,
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
 
                 // Carol is not a Liquidity Provider
-                ammAlice.withdraw(carol, 10'000, std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
+                ammAlice.withdraw(carol_, 10'000, std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
@@ -2149,16 +2154,16 @@ private:
                 // while leaving a tiny amount in USD pool.
                 // Post-fixAMMv1_3:
                 // Most of the pool is withdrawn with remaining tiny amounts
-                auto err = env.enabled(fixAMMv1_3) ? ter(tesSUCCESS) : ter(tecAMM_BALANCE);
+                auto err = env.enabled(fixAMMv1_3) ? Ter(tesSUCCESS) : Ter(tecAMM_BALANCE);
                 ammAlice.withdraw(
-                    alice, IOUAmount{9'999'999'9999, -4}, std::nullopt, std::nullopt, err);
+                    alice_, IOUAmount{9'999'999'9999, -4}, std::nullopt, std::nullopt, err);
                 if (env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
                         MPT(ammAlice[0])(1), STAmount{USD, 1, -7}, IOUAmount{1, -4}));
                 }
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}},
+            {{gAmmmpt(10'000'000'000), USD(10'000)}},
             0,
             std::nullopt,
             {all, all - fixAMMv1_3});
@@ -2169,16 +2174,16 @@ private:
                 // Pre-fixAMMv1_3: results in full withdraw of MPT pool only,
                 // returning tecAMM_BALANCE. Post-fixAMMv1_3: most of the pool
                 // is withdrawn with remaining tiny amounts
-                auto err = env.enabled(fixAMMv1_3) ? ter(tesSUCCESS) : ter(tecAMM_BALANCE);
+                auto err = env.enabled(fixAMMv1_3) ? Ter(tesSUCCESS) : Ter(tecAMM_BALANCE);
                 ammAlice.withdraw(
-                    alice, IOUAmount{9'999'999'999999999, -9}, std::nullopt, std::nullopt, err);
+                    alice_, IOUAmount{9'999'999'999999999, -9}, std::nullopt, std::nullopt, err);
                 if (env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
                         MPT(ammAlice[0])(1), STAmount{USD, 1, -11}, IOUAmount{1, -8}));
                 }
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}},
+            {{gAmmmpt(10'000'000'000), USD(10'000)}},
             0,
             std::nullopt,
             {all, all - fixAMMv1_3});
@@ -2186,204 +2191,206 @@ private:
         // Invalid AMM
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdrawAll(alice);
-                ammAlice.withdraw(alice, 10'000, std::nullopt, std::nullopt, ter(terNO_AMM));
+                ammAlice.withdrawAll(alice_);
+                ammAlice.withdraw(alice_, 10'000, std::nullopt, std::nullopt, Ter(terNO_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // MPTokenIssuance object doesn't exist
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            MPT const BTC =
-                MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 30'000});
+            MPT const btc =
+                MPTTester({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 30'000});
 
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
             ammAlice.withdraw(
                 WithdrawArg{
-                    .account = alice,
-                    .asset1Out = MPT(gw, 1'000)(10),
-                    .assets = {{XRP, MPT(gw, 1'000)}},
-                    .err = ter(terNO_AMM)});
+                    .account = alice_,
+                    .asset1Out = MPT(gw_, 1'000)(10),
+                    .assets = {{XRP, MPT(gw_, 1'000)}},
+                    .err = Ter(terNO_AMM)});
         }
 
         // MPTRequireAuth flag is set and the account is not authorized
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            auto BTCM = MPTTester(
+            auto btcm = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
-            MPT const BTC = BTCM;
+            MPT const btc = btcm;
 
-            AMM amm(env, alice, XRP(10'000), BTC(10'000));
+            AMM amm(env, alice_, XRP(10'000), btc(10'000));
 
-            BTCM.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
+            btcm.authorize({.account = gw_, .holder = alice_, .flags = tfMPTUnauthorize});
 
             amm.withdraw(
                 WithdrawArg{
-                    .account = alice,
-                    .asset1Out = BTC(100),
-                    .assets = {{XRP, BTC}},
-                    .err = ter(tecNO_AUTH)});
+                    .account = alice_,
+                    .asset1Out = btc(100),
+                    .assets = {{XRP, btc}},
+                    .err = Ter(tecNO_AUTH)});
         }
 
         // MPTCanTransfer is not set and the account is not the issuer of MPT
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            auto BTCM = MPTTester(
+            auto btcm = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
                  .flags = tfMPTCanTrade,
                  .authHolder = true});
-            MPT const BTC = BTCM;
+            MPT const btc = btcm;
 
-            AMM amm(env, gw, XRP(10'000), BTC(10'000));
+            AMM amm(env, gw_, XRP(10'000), btc(10'000));
 
             amm.withdraw(
                 WithdrawArg{
-                    .account = alice,
-                    .asset1Out = BTC(100),
-                    .assets = {{XRP, BTC}},
-                    .err = ter(tecNO_PERMISSION)});
+                    .account = alice_,
+                    .asset1Out = btc(100),
+                    .assets = {{XRP, btc}},
+                    .err = Ter(tecNO_PERMISSION)});
         }
 
         // Globally locked MPT
         // MPTLocked flag is set and the account is not the issuer of MPT
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .authHolder = true});
 
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
-            BTC.set({.flags = tfMPTLock});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
+            btc.set({.flags = tfMPTLock});
 
             ammAlice.withdraw(
-                alice, MPT(ammAlice[1])(100), std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                alice_, MPT(ammAlice[1])(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // can single withdraw the other asset
-            ammAlice.withdraw({.account = alice, .asset1Out = XRP(100)});
+            ammAlice.withdraw({.account = alice_, .asset1Out = XRP(100)});
         }
 
         // Individually frozen (AMM) account with MPT/MPT AMM
         {
             Env env{*this};
-            env.fund(XRP(10'000), gw, alice);
+            env.fund(XRP(10'000), gw_, alice_);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            MPTTester const USD(
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            MPTTester const usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, USD(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, usd(10'000), btc(10'000));
 
             // Alice's BTC is locked
-            BTC.set({.holder = alice, .flags = tfMPTLock});
-            ammAlice.withdraw(alice, 1000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            btc.set({.holder = alice_, .flags = tfMPTLock});
+            ammAlice.withdraw(alice_, 1000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // can withdraw the other asset
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, usd(100), std::nullopt, std::nullopt);
 
             // Unlock and then alice can withdraw
-            BTC.set({.holder = alice, .flags = tfMPTUnlock});
-            ammAlice.withdraw(alice, 1000, std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
+            btc.set({.holder = alice_, .flags = tfMPTUnlock});
+            ammAlice.withdraw(alice_, 1000, std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, usd(100), std::nullopt, std::nullopt);
         }
 
         // Individually lock MPT or freeze IOU (AMM)
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000)}, Fund::All);
-            MPTTester BTC(
+            fund(env, gw_, {alice_}, {USD(20'000)}, Fund::All);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, USD(10'000), BTC(10'000));
+            AMM ammAlice(env, alice_, USD(10'000), btc(10'000));
 
             // Alice's BTC is locked
-            BTC.set({.holder = alice, .flags = tfMPTLock});
+            btc.set({.holder = alice_, .flags = tfMPTLock});
 
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
             // can still single withdraw the unlocked other asset
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt);
 
             // Unlock alice's BTC
-            BTC.set({.holder = alice, .flags = tfMPTUnlock});
+            btc.set({.holder = alice_, .flags = tfMPTUnlock});
 
             // Now alice can withdraw
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt);
 
             // Individually lock MPT BTC (AMM) account
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
 
             // Can withdraw non-frozen token USD
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt);
 
             // Can not withdraw locked token BTC
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unlock AMM MPT
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTUnlock});
             // Can withdraw
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt);
 
             // Individually frozen AMM
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
+                gw_, STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
             env.close();
 
             // Can withdraw non-locked token BTC
-            ammAlice.withdraw(alice, BTC(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, btc(100), std::nullopt, std::nullopt);
 
             // Can not withdraw frozen token USD
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
 
             // Unfreeze
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfClearFreeze));
+                gw_,
+                STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0},
+                tfClearFreeze));
             env.close();
 
             // Can withdraw
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt);
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt);
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt);
         }
 
         // Carol withdraws more than she owns
@@ -2391,28 +2398,28 @@ private:
             [&](AMM& ammAlice, Env&) {
                 // Single deposit of 100000 worth of tokens
                 // which is 10% of the pool. Carol is LP now.
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
 
                 ammAlice.withdraw(
-                    carol, 2'000'000, std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                    carol_, 2'000'000, std::nullopt, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Withdraw with EPrice limit. Fails to withdraw, calculated tokens
         // to withdraw are 0.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 auto const err =
-                    env.enabled(fixAMMv1_3) ? ter(tecAMM_INVALID_TOKENS) : ter(tecAMM_FAILED);
+                    env.enabled(fixAMMv1_3) ? Ter(tecAMM_INVALID_TOKENS) : Ter(tecAMM_FAILED);
                 ammAlice.withdraw(
-                    carol, MPT(ammAlice[1])(100), std::nullopt, IOUAmount{500, 0}, err);
+                    carol_, MPT(ammAlice[1])(100), std::nullopt, IOUAmount{500, 0}, err);
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             0,
             std::nullopt,
             {all, all - fixAMMv1_3});
@@ -2421,106 +2428,106 @@ private:
         // to withdraw are greater than the LP shares.
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(100),
                     std::nullopt,
                     IOUAmount{600, 0},
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Withdraw with EPrice limit. Fails to withdraw, amount1
         // to withdraw is less than 1700 MPT.
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(1'700),
                     std::nullopt,
                     IOUAmount{520, 0},
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Deposit/Withdraw the same amount with the trading fee
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(1'000),
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             1'000);
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, XRP(1'000));
+                ammAlice.deposit(carol_, XRP(1'000));
                 ammAlice.withdraw(
-                    carol, XRP(1'000), std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                    carol_, XRP(1'000), std::nullopt, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             1'000);
 
         // Deposit/Withdraw the same amount fails due to the tokens adjustment
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, STAmount{USD, 1, -6});
+                ammAlice.deposit(carol_, STAmount{USD, 1, -6});
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     STAmount{USD, 1, -6},
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
 
         // Withdraw close to one side of the pool. Account's LP tokens
         // are rounded to all LP tokens.
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     STAmount{MPT(ammAlice[1]), UINT64_C(9'999'999999999999), -12},
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_BALANCE));
+                    Ter(tecAMM_BALANCE));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Tiny withdraw
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // XRP amount to withdraw is 0
                 ammAlice.withdraw(
-                    alice, IOUAmount{1, -5}, std::nullopt, std::nullopt, ter(tecAMM_FAILED));
+                    alice_, IOUAmount{1, -5}, std::nullopt, std::nullopt, Ter(tecAMM_FAILED));
                 // Calculated tokens to withdraw are 0
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     std::nullopt,
                     STAmount{USD, 1, -11},
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
-                ammAlice.deposit(carol, STAmount{USD, 1, -10});
+                    Ter(tecAMM_INVALID_TOKENS));
+                ammAlice.deposit(carol_, STAmount{USD, 1, -10});
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     std::nullopt,
                     STAmount{USD, 1, -9},
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
                 ammAlice.withdraw(
-                    carol,
+                    carol_,
                     std::nullopt,
                     MPT(ammAlice[0])(1),
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
     }
 
     void
@@ -2536,66 +2543,66 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 // XRP/MPT
                 XRPAmount const baseFee{env.current()->fees().base};
-                auto carolXRP = env.balance(carol, XRP);
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
+                auto carolXRP = env.balance(carol_, XRP);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
 
                 // Single deposit of 1'000'000 worth of tokens,
                 // which is 10% of the pool. Carol is LP now.
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{11'000'000, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
-                env.require(balance(carol, carolMPT - MPT(ammAlice[1])(1'000)));
-                env.require(balance(carol, carolXRP - XRP(1'000) - drops(baseFee)));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
+                env.require(Balance(carol_, carolMPT - MPT(ammAlice[1])(1'000)));
+                env.require(Balance(carol_, carolXRP - XRP(1'000) - drops(baseFee)));
 
                 // Carol withdraws all tokens
-                ammAlice.withdraw(carol, 1'000'000);
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
-                env.require(balance(carol, carolMPT));
-                env.require(balance(carol, carolXRP - drops(2 * baseFee)));
+                ammAlice.withdraw(carol_, 1'000'000);
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
+                env.require(Balance(carol_, carolMPT));
+                env.require(Balance(carol_, carolXRP - drops(2 * baseFee)));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal withdrawal by tokens 1000000, 10%
         // of the current pool, XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // XRP/MPT
-                ammAlice.withdraw(alice, 1'000'000);
+                ammAlice.withdraw(alice_, 1'000'000);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(9'000), MPT(ammAlice[1])(9'000), IOUAmount{9'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal withdrawal by tokens, 10% of the current pool, IOU/MPT
         // combination
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, gw);
+                env.fund(XRP(30'000), alice_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
                 env.close();
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto aliceBTC = env.balance(alice, BTC);
-                auto aliceUSD = env.balance(alice, USD);
-                ammAlice.withdraw(alice, 1'000);
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(9'000), USD(9'000), IOUAmount(9'000)));
-                env.require(balance(alice, aliceBTC + BTC(1000)));
-                env.require(balance(alice, aliceUSD + USD(1000)));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto aliceBTC = env.balance(alice_, btc);
+                auto aliceUSD = env.balance(alice_, usd);
+                ammAlice.withdraw(alice_, 1'000);
+                BEAST_EXPECT(ammAlice.expectBalances(btc(9'000), usd(9'000), IOUAmount(9'000)));
+                env.require(Balance(alice_, aliceBTC + btc(1000)));
+                env.require(Balance(alice_, aliceUSD + usd(1000)));
             };
             testHelper2TokensMix(test);
         }
@@ -2608,51 +2615,51 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // XRP/MPT
-                ammAlice.withdraw(alice, XRP(200), MPT(ammAlice[1])(100));
+                ammAlice.withdraw(alice_, XRP(200), MPT(ammAlice[1])(100));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(9'900), MPT(ammAlice[1])(9'900), IOUAmount{9'900'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal withdrawal with a limit. XRP100/MPT200 truncated to
         // XRP100/MPT100
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // XRP/MPT
-                ammAlice.withdraw(alice, XRP(100), MPT(ammAlice[1])(200));
+                ammAlice.withdraw(alice_, XRP(100), MPT(ammAlice[1])(200));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(9'900), MPT(ammAlice[1])(9'900), IOUAmount{9'900'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal withdrawal with a limit. IOU/MPT combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, gw);
+                env.fund(XRP(30'000), alice_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
                 env.close();
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto aliceBTC = env.balance(alice, BTC);
-                auto aliceUSD = env.balance(alice, USD);
-                ammAlice.withdraw(alice, BTC(200), USD(100));
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(9'900), USD(9'900), IOUAmount(9'900)));
-                env.require(balance(alice, aliceBTC + BTC(100)));
-                env.require(balance(alice, aliceUSD + USD(100)));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto aliceBTC = env.balance(alice_, btc);
+                auto aliceUSD = env.balance(alice_, usd);
+                ammAlice.withdraw(alice_, btc(200), usd(100));
+                BEAST_EXPECT(ammAlice.expectBalances(btc(9'900), usd(9'900), IOUAmount(9'900)));
+                env.require(Balance(alice_, aliceBTC + btc(100)));
+                env.require(Balance(alice_, aliceUSD + usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -2661,96 +2668,96 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // single withdraw XRP from XRP/MPT
-                ammAlice.withdraw(alice, XRP(1'000));
+                ammAlice.withdraw(alice_, XRP(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount(9000'000001),
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{9'486'832'98050514, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // single withdraw MPT from XRP/MPT
-                ammAlice.withdraw(alice, MPT(ammAlice[1])(1'000));
+                ammAlice.withdraw(alice_, MPT(ammAlice[1])(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10000), MPT(ammAlice[1])(9001), IOUAmount{9'486'832'98050514, -8}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // single withdraw IOU from IOU/MPT
-                ammAlice.withdraw(alice, USD(1'000));
+                ammAlice.withdraw(alice_, USD(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(9000'000000000004), -12},
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{9486'83298050514, -11}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // single withdraw MPT from IOU/MPT
-                ammAlice.withdraw(alice, MPT(ammAlice[1])(1'000));
+                ammAlice.withdraw(alice_, MPT(ammAlice[1])(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(10'000), MPT(ammAlice[1])(9001), IOUAmount{9486'83298050514, -11}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // single withdraw MPT from MPT/MPT
-                ammAlice.withdraw(alice, MPT(ammAlice[0])(1'000));
+                ammAlice.withdraw(alice_, MPT(ammAlice[0])(1'000));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(9001),
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{9486'83298050514, -11}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
         // Single withdrawal MPT by tokens 10000. XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, 10'000, MPT(ammAlice[1])(0));
+                ammAlice.withdraw(alice_, 10'000, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(9981), IOUAmount{9'990'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single withdrawal XRP by tokens 10000. XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, 10'000, XRP(0));
+                ammAlice.withdraw(alice_, 10'000, XRP(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount(9980010000), MPT(ammAlice[1])(10'000), IOUAmount{9'990'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single withdrawal by tokens 10000. MPT/IOU combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, gw);
+                env.fund(XRP(30'000), alice_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice},
+                     .issuer = gw_,
+                     .holders = {alice_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
                 env.close();
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto aliceBTC = env.balance(alice, BTC);
-                auto aliceUSD = env.balance(alice, USD);
-                ammAlice.withdraw(alice, 1000, BTC(0));
-                BEAST_EXPECT(ammAlice.expectBalances(USD(10'000), BTC(8100), IOUAmount{9000, 0}));
-                env.require(balance(alice, aliceBTC + BTC(1900)));
-                env.require(balance(alice, aliceUSD));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto aliceBTC = env.balance(alice_, btc);
+                auto aliceUSD = env.balance(alice_, usd);
+                ammAlice.withdraw(alice_, 1000, btc(0));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(10'000), btc(8100), IOUAmount{9000, 0}));
+                env.require(Balance(alice_, aliceBTC + btc(1900)));
+                env.require(Balance(alice_, aliceUSD));
             };
             testHelper2TokensMix(test);
         }
@@ -2758,198 +2765,198 @@ private:
         // Withdraw all tokens.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(trust(carol, STAmount{ammAlice.lptIssue(), 10'000}));
+                env(trust(carol_, STAmount{ammAlice.lptIssue(), 10'000}));
                 // Can SetTrust only for AMM LP tokens
-                env(trust(carol, STAmount{Issue{EUR.currency, ammAlice.ammAccount()}, 10'000}),
-                    ter(tecNO_PERMISSION));
+                env(trust(carol_, STAmount{Issue{EUR.currency, ammAlice.ammAccount()}, 10'000}),
+                    Ter(tecNO_PERMISSION));
                 env.close();
-                ammAlice.withdrawAll(alice);
+                ammAlice.withdrawAll(alice_);
                 BEAST_EXPECT(!ammAlice.ammExists());
 
                 BEAST_EXPECT(!env.le(keylet::ownerDir(ammAlice.ammAccount())));
 
                 // Can create AMM for the XRP/MPT pair
-                AMM const ammCarol(env, carol, XRP(10'000), MPT(ammAlice[1])(10'000));
+                AMM const ammCarol(env, carol_, XRP(10'000), MPT(ammAlice[1])(10'000));
                 BEAST_EXPECT(ammCarol.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'000), IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in MPT from XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'001), IOUAmount{10'000'000, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in XRP from XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, XRP(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, XRP(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount(9'090'909'091), MPT(ammAlice[1])(11000), IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in MPT from USD/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // USD/MPT
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(10'000), MPT(ammAlice[1])(10'001), IOUAmount{10'000, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000USD, withdraw all tokens in USD from USD/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // USD/MPT
-                ammAlice.deposit(carol, USD(1'000));
-                ammAlice.withdrawAll(carol, USD(0));
+                ammAlice.deposit(carol_, USD(1'000));
+                ammAlice.withdrawAll(carol_, USD(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(10'000), MPT(ammAlice[1])(10'000), IOUAmount{10'000, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in MPT from MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // MPT/MPT
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000), MPT(ammAlice[1])(10'001), IOUAmount{10'000, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10001), IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000MPT, withdraw all tokens in USD
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                ammAlice.withdrawAll(carol, USD(0));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdrawAll(carol_, USD(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(9'090'9090909091), -10},
                     MPT(ammAlice[1])(11000),
                     IOUAmount{10'000, 0}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit 1000USD, withdraw all tokens in MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, USD(1'000));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, USD(1'000));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(10'999'99999999999), -11},
                     MPT(ammAlice[1])(9091),
                     IOUAmount{10'000, 0}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
 
         // Single deposit/withdraw by the same account
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                auto lpTokens = ammAlice.deposit(carol, USD(1'000));
-                ammAlice.withdraw(carol, lpTokens, USD(0));
-                lpTokens = ammAlice.deposit(carol, STAmount(USD, 1, -6));
-                ammAlice.withdraw(carol, lpTokens, USD(0));
-                lpTokens = ammAlice.deposit(carol, MPT(ammAlice[0])(1));
-                ammAlice.withdraw(carol, lpTokens, MPT(ammAlice[0])(0));
+                auto lpTokens = ammAlice.deposit(carol_, USD(1'000));
+                ammAlice.withdraw(carol_, lpTokens, USD(0));
+                lpTokens = ammAlice.deposit(carol_, STAmount(USD, 1, -6));
+                ammAlice.withdraw(carol_, lpTokens, USD(0));
+                lpTokens = ammAlice.deposit(carol_, MPT(ammAlice[0])(1));
+                ammAlice.withdraw(carol_, lpTokens, MPT(ammAlice[0])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000'000'001), USD(10'000), ammAlice.tokens()));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                auto const& BTC = MPT(ammAlice[1]);
-                auto lpTokens = ammAlice.deposit(carol, BTC(1'000));
-                ammAlice.withdraw(carol, lpTokens, BTC(0));
-                lpTokens = ammAlice.deposit(carol, BTC(1));
-                ammAlice.withdraw(carol, lpTokens, BTC(0));
-                lpTokens = ammAlice.deposit(carol, BTC(1));
-                ammAlice.withdraw(carol, lpTokens, BTC(0));
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(10'003), XRP(10'000), ammAlice.tokens()));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                auto const& btc = MPT(ammAlice[1]);
+                auto lpTokens = ammAlice.deposit(carol_, btc(1'000));
+                ammAlice.withdraw(carol_, lpTokens, btc(0));
+                lpTokens = ammAlice.deposit(carol_, btc(1));
+                ammAlice.withdraw(carol_, lpTokens, btc(0));
+                lpTokens = ammAlice.deposit(carol_, btc(1));
+                ammAlice.withdraw(carol_, lpTokens, btc(0));
+                BEAST_EXPECT(ammAlice.expectBalances(btc(10'003), XRP(10'000), ammAlice.tokens()));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Single deposit by different accounts and then withdraw
         // in reverse.
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                auto const carolTokens = ammAlice.deposit(carol, MPT(ammAlice[1])(1'000));
-                auto const aliceTokens = ammAlice.deposit(alice, MPT(ammAlice[1])(1'000));
-                ammAlice.withdraw(alice, aliceTokens, MPT(ammAlice[1])(0));
-                ammAlice.withdraw(carol, carolTokens, MPT(ammAlice[1])(0));
+                auto const carolTokens = ammAlice.deposit(carol_, MPT(ammAlice[1])(1'000));
+                auto const aliceTokens = ammAlice.deposit(alice_, MPT(ammAlice[1])(1'000));
+                ammAlice.withdraw(alice_, aliceTokens, MPT(ammAlice[1])(0));
+                ammAlice.withdraw(carol_, carolTokens, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'001), ammAlice.tokens()));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(alice, ammAlice.tokens()));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(alice_, ammAlice.tokens()));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit 10%, withdraw all tokens. XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000'000);
-                ammAlice.withdrawAll(carol);
+                ammAlice.deposit(carol_, 1'000'000);
+                ammAlice.withdrawAll(carol_);
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'000), IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         // Equal deposit 10%, withdraw all tokens. IOU/MPT combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, carol, gw);
+                env.fund(XRP(30'000), alice_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .limit = 1'000'000});
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto carolUSD = env.balance(carol, USD);
-                ammAlice.deposit(carol, 1'000);
-                ammAlice.withdrawAll(carol);
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto carolUSD = env.balance(carol_, usd);
+                ammAlice.deposit(carol_, 1'000);
+                ammAlice.withdrawAll(carol_);
                 BEAST_EXPECT(
-                    ammAlice.expectBalances(USD(10'000), BTC(10'000), IOUAmount{10'000, 0}));
-                env.require(balance(carol, carolBTC));
-                env.require(balance(carol, carolUSD));
+                    ammAlice.expectBalances(usd(10'000), btc(10'000), IOUAmount{10'000, 0}));
+                env.require(Balance(carol_, carolBTC));
+                env.require(Balance(carol_, carolUSD));
             };
             testHelper2TokensMix(test);
         }
@@ -2957,54 +2964,54 @@ private:
         // Equal deposit 10%, withdraw all tokens in MPT from XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000'000);
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, 1'000'000);
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000),
                     STAmount{MPT(ammAlice[1]), UINT64_C(9'090'909090909092), -12},
                     IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit 10%, withdraw all tokens in XRP from XRP/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000'000);
-                ammAlice.withdrawAll(carol, XRP(0));
+                ammAlice.deposit(carol_, 1'000'000);
+                ammAlice.withdrawAll(carol_, XRP(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount(9'090'909'091), MPT(ammAlice[1])(11'000), IOUAmount{10'000'000, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Equal deposit 10%, withdraw all tokens in USD from USD/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000);
-                ammAlice.withdrawAll(carol, USD(0));
+                ammAlice.deposit(carol_, 1'000);
+                ammAlice.withdrawAll(carol_, USD(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     STAmount{USD, UINT64_C(9'090'909090909092), -12},
                     MPT(ammAlice[1])(11'000),
                     IOUAmount{10'000}));
             },
-            {{USD(10'000), AMMMPT(10'000)}});
+            {{USD(10'000), gAmmmpt(10'000)}});
         // Equal deposit 10%, withdraw all tokens in MPT from MPT/MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, 1'000);
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.deposit(carol_, 1'000);
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(11'000), MPT(ammAlice[1])(9'091), IOUAmount{10'000}));
             },
-            {{AMMMPT(10'000), AMMMPT(10'000)}});
+            {{gAmmmpt(10'000), gAmmmpt(10'000)}});
 
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
 
         // Withdraw with EPrice limit.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000'000'000);
+                ammAlice.deposit(carol_, 1'000'000'000'000);
                 ammAlice.withdraw(
-                    carol, MPT(ammAlice[1])(100'000000), std::nullopt, IOUAmount{520, 0});
+                    carol_, MPT(ammAlice[1])(100'000000), std::nullopt, IOUAmount{520, 0});
                 if (!env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(
@@ -3012,7 +3019,7 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781065),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
                 else if (env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
@@ -3021,7 +3028,7 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781065),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
                 else if (env.enabled(fixAMMv1_3))
                 {
@@ -3030,12 +3037,12 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781066),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
-                ammAlice.withdrawAll(carol);
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                ammAlice.withdrawAll(carol_);
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
-            {{XRP(10'000'000'000), AMMMPT(10'000'000'000)}},
+            {{XRP(10'000'000'000), gAmmmpt(10'000'000'000)}},
             0,
             std::nullopt,
             {all, all - fixAMMv1_3, all - fixAMMv1_1 - fixAMMv1_3});
@@ -3043,8 +3050,8 @@ private:
         // Withdraw with EPrice limit. AssetOut is 0.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000'000'000);
-                ammAlice.withdraw(carol, MPT(ammAlice[1])(0), std::nullopt, IOUAmount{520, 0});
+                ammAlice.deposit(carol_, 1'000'000'000'000);
+                ammAlice.withdraw(carol_, MPT(ammAlice[1])(0), std::nullopt, IOUAmount{520, 0});
                 if (!env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(
@@ -3052,7 +3059,7 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781065),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
                 else if (env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
@@ -3061,7 +3068,7 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781065),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
                 else if (env.enabled(fixAMMv1_3))
                 {
@@ -3070,12 +3077,12 @@ private:
                             XRP(11'000'000000),
                             MPT(ammAlice[1])(9372781066),
                             IOUAmount{10'153'846'15384616, -2}) &&
-                        ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -2}));
+                        ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -2}));
                 }
-                ammAlice.withdrawAll(carol);
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                ammAlice.withdrawAll(carol_);
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
-            {{XRP(10'000'000'000), AMMMPT(10'000'000'000)}},
+            {{XRP(10'000'000'000), gAmmmpt(10'000'000'000)}},
             0,
             std::nullopt,
             {all, all - fixAMMv1_3, all - fixAMMv1_1 - fixAMMv1_3});
@@ -3084,47 +3091,47 @@ private:
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000,
                      .transferFee = 25'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000,
                      .transferFee = 25'000});
-                env(pay(gw, alice, BTC(10000)));
-                env(pay(gw, bob, BTC(10000)));
-                env(pay(gw, carol, BTC(10000)));
-                env(pay(gw, alice, USD(10000)));
-                env(pay(gw, bob, USD(10000)));
-                env(pay(gw, carol, USD(10000)));
+                env(pay(gw_, alice_, btc(10000)));
+                env(pay(gw_, bob_, btc(10000)));
+                env(pay(gw_, carol_, btc(10000)));
+                env(pay(gw_, alice_, usd(10000)));
+                env(pay(gw_, bob_, usd(10000)));
+                env(pay(gw_, carol_, usd(10000)));
                 env.close();
                 // no transfer fee on create
-                AMM ammAlice(env, alice, BTC(2'000), USD(5));
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(2'000), USD(5), IOUAmount{100, 0}));
-                env.require(balance(alice, BTC(8000)));
-                env.require(balance(alice, USD(9995)));
+                AMM ammAlice(env, alice_, btc(2'000), usd(5));
+                BEAST_EXPECT(ammAlice.expectBalances(btc(2'000), usd(5), IOUAmount{100, 0}));
+                env.require(Balance(alice_, btc(8000)));
+                env.require(Balance(alice_, usd(9995)));
 
                 // no transfer fee on deposit
-                ammAlice.deposit(carol, 100);
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(4000), USD(10), IOUAmount{200, 0}));
-                env.require(balance(carol, BTC(8000)));
-                env.require(balance(carol, USD(9995)));
+                ammAlice.deposit(carol_, 100);
+                BEAST_EXPECT(ammAlice.expectBalances(btc(4000), usd(10), IOUAmount{200, 0}));
+                env.require(Balance(carol_, btc(8000)));
+                env.require(Balance(carol_, usd(9995)));
 
                 // no transfer fee on withdraw
-                ammAlice.withdraw(carol, 100);
-                BEAST_EXPECT(ammAlice.expectBalances(BTC(2'000), USD(5), IOUAmount{100, 0}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0, 0}));
-                env.require(balance(carol, BTC(10000)));
-                env.require(balance(carol, USD(10000)));
+                ammAlice.withdraw(carol_, 100);
+                BEAST_EXPECT(ammAlice.expectBalances(btc(2'000), usd(5), IOUAmount{100, 0}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0, 0}));
+                env.require(Balance(carol_, btc(10000)));
+                env.require(Balance(carol_, usd(10000)));
             };
             testHelper2TokensMix(test);
         }
@@ -3133,106 +3140,106 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // By tokens
-                ammAlice.withdraw(alice, IOUAmount{1, -3});
+                ammAlice.withdraw(alice_, IOUAmount{1, -3});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(9'999'999'999),
                     STAmount{USD, UINT64_C(9'999'999999), -6},
                     IOUAmount{9'999'999'999, -3}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // Single withdraw MPT from MPT/IOU
-                ammAlice.withdraw(alice, std::nullopt, MPT(ammAlice[0])(1));
+                ammAlice.withdraw(alice_, std::nullopt, MPT(ammAlice[0])(1));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10000'000000), USD(10'000), IOUAmount{9'999'999'9995, -4}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // Single withdraw IOU from MPT/IOU
-                ammAlice.withdraw(alice, std::nullopt, STAmount{USD, 1, -10});
+                ammAlice.withdraw(alice_, std::nullopt, STAmount{USD, 1, -10});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000'000'000),
                     STAmount{USD, UINT64_C(9'999'9999999999), -10},
                     IOUAmount{9'999'999'99999995, -8}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
                 // Single withdraw XRP from MPT/XRP
-                ammAlice.withdraw(alice, std::nullopt, XRPAmount(1));
+                ammAlice.withdraw(alice_, std::nullopt, XRPAmount(1));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[1])(10'000), XRP(10'000), IOUAmount{9999999'9995, -4}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Withdraw close to entire pool
         // Equal by tokens
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, IOUAmount{9'999'999'999, -3});
+                ammAlice.withdraw(alice_, IOUAmount{9'999'999'999, -3});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(1), STAmount{USD, 1, -6}, IOUAmount{1, -3}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         // USD by tokens
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, IOUAmount{9'999'999}, USD(0));
+                ammAlice.withdraw(alice_, IOUAmount{9'999'999}, USD(0));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000'000'000), STAmount{USD, 1, -10}, IOUAmount{1}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         // MPT by tokens
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, IOUAmount{9'999'900}, MPT(ammAlice[0])(0));
+                ammAlice.withdraw(alice_, IOUAmount{9'999'900}, MPT(ammAlice[0])(0));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(MPT(ammAlice[0])(1), USD(10'000), IOUAmount{100}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         // XRP by tokens
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, IOUAmount{9'999'900}, XRP(0));
+                ammAlice.withdraw(alice_, IOUAmount{9'999'900}, XRP(0));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(MPT(ammAlice[1])(10000), XRPAmount(1), IOUAmount{100}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         // USD
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, STAmount{USD, UINT64_C(9'999'99999999999), -11});
+                ammAlice.withdraw(alice_, STAmount{USD, UINT64_C(9'999'99999999999), -11});
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000'000'000),
                     STAmount{USD, 1, -11},
                     IOUAmount{316227765, -9}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         // XRP
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, XRPAmount{9'999'999'999});
+                ammAlice.withdraw(alice_, XRPAmount{9'999'999'999});
                 BEAST_EXPECT(
                     ammAlice.expectBalances(MPT(ammAlice[1])(10000), XRPAmount(1), IOUAmount{100}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         // MPT
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, MPT(ammAlice[0])(9'999'999'999));
+                ammAlice.withdraw(alice_, MPT(ammAlice[0])(9'999'999'999));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(MPT(ammAlice[0])(1), USD(10'000), IOUAmount{100}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.withdraw(alice, MPT(ammAlice[1])(9'999));
+                ammAlice.withdraw(alice_, MPT(ammAlice[1])(9'999));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(MPT(ammAlice[1])(1), XRP(10'000), IOUAmount{100000}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
     }
 
     void
@@ -3246,52 +3253,52 @@ private:
                 // Invalid Account
                 Account bad("bad");
                 env.memoize(bad);
-                ammAlice.vote(bad, 1'000, std::nullopt, seq(1), std::nullopt, ter(terNO_ACCOUNT));
+                ammAlice.vote(bad, 1'000, std::nullopt, Seq(1), std::nullopt, Ter(terNO_ACCOUNT));
 
                 // Invalid AMM
                 ammAlice.vote(
-                    alice,
+                    alice_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
                     {{MPT(ammAlice[1]), GBP}},
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
 
                 // Account is not LP
                 ammAlice.vote(
-                    carol,
+                    carol_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
 
                 // Invalid asset pair
                 ammAlice.vote(
-                    alice,
+                    alice_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
                     {{MPT(ammAlice[1]), MPT(ammAlice[1])}},
-                    ter(temBAD_AMM_TOKENS));
+                    Ter(temBAD_AMM_TOKENS));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Invalid AMM
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdrawAll(alice);
+                ammAlice.withdrawAll(alice_);
                 ammAlice.vote(
-                    alice, 1'000, std::nullopt, std::nullopt, std::nullopt, ter(terNO_AMM));
+                    alice_, 1'000, std::nullopt, std::nullopt, std::nullopt, Ter(terNO_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // MPTokenInstance object doesn't exist
         {
             Env env(*this);
-            env.fund(XRP(1'000), alice);
-            env(AMM::voteJv({.account = alice, .tfee = 1'000, .assets = {{XRP, MPT(alice, 0)}}}),
-                ter(terNO_AMM));
+            env.fund(XRP(1'000), alice_);
+            env(AMM::voteJv({.account = alice_, .tfee = 1'000, .assets = {{XRP, MPT(alice_, 0)}}}),
+                Ter(terNO_AMM));
         }
     }
 
@@ -3310,7 +3317,7 @@ private:
                 // Discounted fee is 1/10 of trading fee.
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(100, 0, IOUAmount{0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         auto vote = [&](AMM& ammAlice,
                         Env& env,
@@ -3328,8 +3335,8 @@ private:
             // Eight votes fill all voting slots, set fee 0.175%.
             // New vote, same account, sets fee 0.225%
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
-            std::vector<Account> holders = {alice};
+            env.fund(XRP(30'000), gw_, alice_);
+            std::vector<Account> holders = {alice_};
             for (int i = 0; i <= 7; ++i)
             {
                 Account const a(std::to_string(i));
@@ -3338,8 +3345,8 @@ private:
             }
             env.close();
             // create MPT and pay 30'000 to all the accounts
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = holders, .pay = 30'000});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = holders, .pay = 30'000});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             for (int i = 0; i < 7; ++i)
                 vote(ammAlice, env, i);
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
@@ -3352,8 +3359,8 @@ private:
             // Eight votes fill all voting slots, set fee 0.175%.
             // New vote, new account, higher vote weight, set higher fee 0.244%
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
-            std::vector<Account> holders = {alice};
+            env.fund(XRP(30'000), gw_, alice_);
+            std::vector<Account> holders = {alice_};
             for (int i = 0; i < 8; ++i)
             {
                 Account const a(std::to_string(i));
@@ -3361,8 +3368,8 @@ private:
                 env.fund(XRP(30'000), a);
             }
             env.close();
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = holders, .pay = 30'000});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = holders, .pay = 30'000});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             for (int i = 0; i < 7; ++i)
                 vote(ammAlice, env, i);
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
@@ -3374,8 +3381,8 @@ private:
             // Eight votes fill all voting slots, set fee 0.219%.
             // New vote, new account, higher vote weight, set smaller fee 0.206%
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
-            std::vector<Account> holders = {alice};
+            env.fund(XRP(30'000), gw_, alice_);
+            std::vector<Account> holders = {alice_};
             for (int i = 0; i < 8; ++i)
             {
                 Account const a(std::to_string(i));
@@ -3383,8 +3390,8 @@ private:
                 env.fund(XRP(30'000), a);
             }
             env.close();
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = holders, .pay = 30'000});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = holders, .pay = 30'000});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             for (int i = 7; i > 0; --i)
                 vote(ammAlice, env, i);
             BEAST_EXPECT(ammAlice.expectTradingFee(219));
@@ -3397,8 +3404,8 @@ private:
             // tokens. An account sets a new fee and the previous slots are
             // deleted.
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice, carol);
-            std::vector<Account> holders = {alice, carol};
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            std::vector<Account> holders = {alice_, carol_};
             for (int i = 0; i < 7; ++i)
             {
                 Account const a(std::to_string(i));
@@ -3406,16 +3413,16 @@ private:
                 env.fund(XRP(30'000), a);
             }
             env.close();
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = holders, .pay = 30'000});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = holders, .pay = 30'000});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             std::vector<Account> accounts;
             for (int i = 0; i < 7; ++i)
                 vote(ammAlice, env, i, 10'000'000, &accounts);
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
             for (int i = 0; i < 7; ++i)
                 ammAlice.withdrawAll(accounts[i]);
-            ammAlice.deposit(carol, 10'000'000);
-            ammAlice.vote(carol, 1'000);
+            ammAlice.deposit(carol_, 10'000'000);
+            ammAlice.vote(carol_, 1'000);
             // The initial LP set the fee to 1000. Carol gets 50% voting
             // power, and the new fee is 500.
             BEAST_EXPECT(ammAlice.expectTradingFee(500));
@@ -3425,8 +3432,8 @@ private:
             // some tokens. The new vote doesn't get the voting power but the
             // slots are refreshed and the fee is updated.
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice, carol);
-            std::vector<Account> holders = {alice, carol};
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            std::vector<Account> holders = {alice_, carol_};
             for (int i = 0; i < 7; ++i)
             {
                 Account const a(std::to_string(i));
@@ -3434,20 +3441,20 @@ private:
                 env.fund(XRP(30'000), a);
             }
             env.close();
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = holders, .pay = 30'000});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+            MPTTester const btc({.env = env, .issuer = gw_, .holders = holders, .pay = 30'000});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
             std::vector<Account> accounts;
             for (int i = 0; i < 7; ++i)
                 vote(ammAlice, env, i, 10'000'000, &accounts);
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
             for (int i = 0; i < 7; ++i)
                 ammAlice.withdraw(accounts[i], 9'000'000);
-            ammAlice.deposit(carol, 1'000);
+            ammAlice.deposit(carol_, 1'000);
             // The vote is not added to the slots
-            ammAlice.vote(carol, 1'000);
+            ammAlice.vote(carol_, 1'000);
             auto const info = ammAlice.ammRpcInfo()[jss::amm][jss::vote_slots];
             for (auto i = 0; i < info.size(); ++i)
-                BEAST_EXPECT(info[i][jss::account] != carol.human());
+                BEAST_EXPECT(info[i][jss::account] != carol_.human());
             // But the slots are refreshed and the fee is changed
             BEAST_EXPECT(ammAlice.expectTradingFee(82));
         }
@@ -3463,10 +3470,14 @@ private:
         // burn all the LPTokens through a AMMBid transaction
         {
             Env env(*this);
-            env.fund(XRP(2'000), gw, alice);
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice}, .pay = 2'000, .flags = MPTDEXFlags});
-            AMM amm(env, gw, XRP(1'000), BTC(1'000), false, 1'000);
+            env.fund(XRP(2'000), gw_, alice_);
+            MPTTester const btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_},
+                 .pay = 2'000,
+                 .flags = kMPT_DEX_FLAGS});
+            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
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{0}));
@@ -3475,19 +3486,23 @@ private:
             // this transaction fails because AMMBid transaction can not burn
             // all the outstanding LPTokens
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = 1'000'000,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         }
 
         // burn all the LPTokens through a AMMBid transaction
         {
             Env env(*this);
-            env.fund(XRP(2'000), gw, alice);
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice}, .pay = 2'000, .flags = MPTDEXFlags});
-            AMM amm(env, gw, XRP(1'000), BTC(1'000), false, 1'000);
+            env.fund(XRP(2'000), gw_, alice_);
+            MPTTester const btc(
+                {.env = env,
+                 .issuer = gw_,
+                 .holders = {alice_},
+                 .pay = 2'000,
+                 .flags = kMPT_DEX_FLAGS});
+            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
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{0}));
@@ -3496,41 +3511,41 @@ private:
             // this transaction succeeds because the bid price is less than
             // the total outstanding LPToken balance
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = STAmount{amm.lptIssue(), UINT64_C(999'999)},
                 }),
-                ter(tesSUCCESS))
+                Ter(tesSUCCESS))
                 .close();
 
             // gw must own the auction slot
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{999'999}));
 
             // 999'999 tokens are burned, only 1 LPToken is owned by gw
-            BEAST_EXPECT(amm.expectBalances(XRP(1'000), BTC(1'000), IOUAmount{1}));
+            BEAST_EXPECT(amm.expectBalances(XRP(1'000), btc(1'000), IOUAmount{1}));
 
             // gw owns only 1 LPToken in its balance
-            BEAST_EXPECT(Number{amm.getLPTokensBalance(gw)} == 1);
+            BEAST_EXPECT(Number{amm.getLPTokensBalance(gw_)} == 1);
 
             // gw attempts to burn the last of its LPTokens in an AMMBid
             // transaction. This transaction fails because it would burn all
             // the remaining LPTokens
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = 1,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         }
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 // Invlaid Min/Max combination
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMin = 200,
                         .bidMax = 100,
                     }),
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
 
                 // Invalid Account
                 Account bad("bad");
@@ -3539,8 +3554,8 @@ private:
                         .account = bad,
                         .bidMax = 100,
                     }),
-                    seq(1),
-                    ter(terNO_ACCOUNT));
+                    Seq(1),
+                    Ter(terNO_ACCOUNT));
 
                 // Account is not LP
                 Account const dan("dan");
@@ -3549,102 +3564,102 @@ private:
                         .account = dan,
                         .bidMin = 100,
                     }),
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
                 env(ammAlice.bid({
                         .account = dan,
                     }),
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
 
                 // Auth account is invalid.
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMin = 100,
-                        .authAccounts = {bob},
+                        .authAccounts = {bob_},
                     }),
-                    ter(terNO_ACCOUNT));
+                    Ter(terNO_ACCOUNT));
 
                 // Invalid Assets
                 env(ammAlice.bid({
-                        .account = alice,
+                        .account = alice_,
                         .bidMax = 100,
                         .assets = {{MPT(ammAlice[1]), GBP}},
                     }),
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Invalid AMM
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdrawAll(alice);
+                ammAlice.withdrawAll(alice_);
                 env(ammAlice.bid({
-                        .account = alice,
+                        .account = alice_,
                         .bidMax = 100,
                     }),
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Bid price exceeds LP owned tokens
         {
             Env env(*this);
-            fund(env, gw, {alice, bob, carol}, XRP(1'000), {USD(30'000)}, Fund::All);
-            MPTTester const BTC(
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(1'000), {USD(30'000)}, Fund::All);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_, bob_},
                  .pay = 30'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            AMM ammAlice(env, alice, BTC(10'000'000'000), USD(10'000));
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.deposit(bob, 10);
+            AMM ammAlice(env, alice_, btc(10'000'000'000), USD(10'000));
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.deposit(bob_, 10);
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 1'000'001,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMax = 1'000'001,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             env(ammAlice.bid({
-                .account = carol,
+                .account = carol_,
                 .bidMin = 1'000,
             }));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{1'000}));
             // Slot purchase price is more than 1000 but bob only has 10 tokens
             env(ammAlice.bid({
-                    .account = bob,
+                    .account = bob_,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         }
 
         // Bid all tokens, still own the slot
         {
             Env env(*this);
-            env.fund(XRP(1'000), gw, alice, bob);
-            MPTTester const BTC(
+            env.fund(XRP(1'000), gw_, alice_, bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 1'000,
-                 .flags = MPTDEXFlags});
-            AMM amm(env, gw, XRP(10), BTC(1'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM amm(env, gw_, XRP(10), btc(1'000));
             auto const lpIssue = amm.lptIssue();
-            env.trust(STAmount{lpIssue, 100}, alice);
-            env.trust(STAmount{lpIssue, 50}, bob);
-            env(pay(gw, alice, STAmount{lpIssue, 100}));
-            env(pay(gw, bob, STAmount{lpIssue, 50}));
-            env(amm.bid({.account = alice, .bidMin = 100}));
+            env.trust(STAmount{lpIssue, 100}, alice_);
+            env.trust(STAmount{lpIssue, 50}, bob_);
+            env(pay(gw_, alice_, STAmount{lpIssue, 100}));
+            env(pay(gw_, bob_, STAmount{lpIssue, 50}));
+            env(amm.bid({.account = alice_, .bidMin = 100}));
             // Alice doesn't have any more tokens, but
             // she still owns the slot.
             env(amm.bid({
-                    .account = bob,
+                    .account = bob_,
                     .bidMax = 50,
                 }),
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
         }
     }
 
@@ -3660,119 +3675,120 @@ private:
         // Bid 110 tokens. Pay bidMin.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
-                env(ammAlice.bid({.account = carol, .bidMin = 110}));
+                ammAlice.deposit(carol_, 1'000'000);
+                env(ammAlice.bid({.account = carol_, .bidMin = 110}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
                 // 110 tokens are burned.
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{10'999'890, 0}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Bid with min/max when the pay price is less than min.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 // Bid exactly 110. Pay 110 because the pay price is < 110.
-                env(ammAlice.bid({.account = carol, .bidMin = 110, .bidMax = 110}));
+                env(ammAlice.bid({.account = carol_, .bidMin = 110, .bidMax = 110}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{10'999'890}));
                 // Bid exactly 180-200. Pay 180 because the pay price is < 180.
-                env(ammAlice.bid({.account = alice, .bidMin = 180, .bidMax = 200}));
+                env(ammAlice.bid({.account = alice_, .bidMin = 180, .bidMax = 200}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{180}));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(11'000), MPT(ammAlice[1])(11'000), IOUAmount{10'999'814'5, -1}));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Start bid at bidMin 110.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol, bob);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_, bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_, bob_},
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             // Bid, pay bidMin.
-            env(ammAlice.bid({.account = carol, .bidMin = 110}));
+            env(ammAlice.bid({.account = carol_, .bidMin = 110}));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
 
-            ammAlice.deposit(bob, 1'000'000);
+            ammAlice.deposit(bob_, 1'000'000);
             // Bid, pay the computed price.
-            env(ammAlice.bid({.account = bob}));
+            env(ammAlice.bid({.account = bob_}));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount(1155, -1)));
 
             // Bid bidMax fails because the computed price is higher.
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMax = 120,
                 }),
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
             // Bid MaxSlotPrice succeeds - pay computed price
-            env(ammAlice.bid({.account = carol, .bidMax = 600}));
+            env(ammAlice.bid({.account = carol_, .bidMax = 600}));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{121'275, -3}));
 
             // Bid Min/MaxSlotPrice fails because the computed price is not
             // in range
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 10,
                     .bidMax = 100,
                 }),
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
             // Bid Min/MaxSlotPrice succeeds - pay computed price
-            env(ammAlice.bid({.account = carol, .bidMin = 100, .bidMax = 600}));
+            env(ammAlice.bid({.account = carol_, .bidMin = 100, .bidMax = 600}));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{127'33875, -5}));
         }
 
         // Slot states.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol, bob);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_, bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_, bob_},
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.deposit(bob, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.deposit(bob_, 1'000'000);
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRPAmount(12'000'000001), BTC(12'001), IOUAmount{12'000'000, 0}));
+                XRPAmount(12'000'000001), btc(12'001), IOUAmount{12'000'000, 0}));
 
             // Initial state. Pay bidMin.
-            env(ammAlice.bid({.account = carol, .bidMin = 110})).close();
+            env(ammAlice.bid({.account = carol_, .bidMin = 110})).close();
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
 
             // 1st Interval after close, price for 0th interval.
-            env(ammAlice.bid({.account = bob}));
-            env.close(seconds(AUCTION_SLOT_INTERVAL_DURATION + 1));
+            env(ammAlice.bid({.account = bob_}));
+            env.close(seconds(kAUCTION_SLOT_INTERVAL_DURATION + 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 * AUCTION_SLOT_INTERVAL_DURATION) + 1));
+            env(ammAlice.bid({.account = carol_}));
+            env.close(seconds((10 * kAUCTION_SLOT_INTERVAL_DURATION) + 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((AUCTION_SLOT_TIME_INTERVALS * AUCTION_SLOT_INTERVAL_DURATION) + 1));
+            env(ammAlice.bid({.account = bob_}));
+            env.close(
+                seconds((kAUCTION_SLOT_TIME_INTERVALS * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{127'33875, -5}));
 
             // 0 Interval.
-            env(ammAlice.bid({.account = carol, .bidMin = 110})).close();
+            env(ammAlice.bid({.account = carol_, .bidMin = 110})).close();
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{110}));
             // ~321.09 tokens burnt on bidding fees.
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRPAmount(12'000'000001), BTC(12'001), IOUAmount{11'999'678'91000001, -8}));
+                XRPAmount(12'000'000001), btc(12'001), IOUAmount{11'999'678'91000001, -8}));
         }
 
         // Pool's fee 1%. Bid bidMin.
@@ -3783,48 +3799,49 @@ private:
             Env env(*this);
             Account const dan("dan");
             Account const ed("ed");
-            env.fund(XRP(2'000), gw, alice, bob, carol, dan, ed);
-            MPTTester const BTC(
+            env.fund(XRP(2'000), gw_, alice_, bob_, carol_, dan, ed);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .pay = 30'000'000'000});
-            fund(env, gw, {alice, carol}, {USD(30'000)}, Fund::TokenOnly);
-            fund(env, gw, {bob, dan, ed}, {USD(20'000)}, Fund::TokenOnly);
+            fund(env, gw_, {alice_, carol_}, {USD(30'000)}, Fund::TokenOnly);
+            fund(env, gw_, {bob_, dan, ed}, {USD(20'000)}, Fund::TokenOnly);
 
-            AMM ammAlice(env, alice, BTC(10'000'000'000), USD(10'000), CreateArg{.tfee = 1'000});
-            ammAlice.deposit(bob, 1'000'000);
+            AMM ammAlice(env, alice_, btc(10'000'000'000), USD(10'000), CreateArg{.tfee = 1'000});
+            ammAlice.deposit(bob_, 1'000'000);
             ammAlice.deposit(ed, 1'000'000);
-            ammAlice.deposit(carol, 500'000);
+            ammAlice.deposit(carol_, 500'000);
             ammAlice.deposit(dan, 500'000);
             auto ammTokens = ammAlice.getLPTokensBalance();
             env(ammAlice.bid({
-                .account = carol,
+                .account = carol_,
                 .bidMin = 120,
-                .authAccounts = {bob, ed},
+                .authAccounts = {bob_, ed},
             }));
             auto const slotPrice = IOUAmount{5'200};
             ammTokens -= slotPrice;
             BEAST_EXPECT(ammAlice.expectAuctionSlot(100, 0, slotPrice));
-            BEAST_EXPECT(ammAlice.expectBalances(BTC(13'000'000'003), USD(13'000), ammTokens));
+            BEAST_EXPECT(ammAlice.expectBalances(btc(13'000'000'003), USD(13'000), ammTokens));
             // Discounted trade
             for (int i = 0; i < 10; ++i)
             {
-                auto tokens = ammAlice.deposit(carol, USD(100));
-                ammAlice.withdraw(carol, tokens, USD(0));
-                tokens = ammAlice.deposit(bob, USD(100));
-                ammAlice.withdraw(bob, tokens, USD(0));
+                auto tokens = ammAlice.deposit(carol_, USD(100));
+                ammAlice.withdraw(carol_, tokens, USD(0));
+                tokens = ammAlice.deposit(bob_, USD(100));
+                ammAlice.withdraw(bob_, tokens, USD(0));
                 tokens = ammAlice.deposit(ed, USD(100));
                 ammAlice.withdraw(ed, tokens, USD(0));
             }
             // carol, bob, and ed pay ~0.99USD in fees.
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(29'499'00572620545), -11));
-            BEAST_EXPECT(env.balance(bob, USD) == STAmount(USD, UINT64_C(18'999'00572616195), -11));
+                env.balance(carol_, USD) == STAmount(USD, UINT64_C(29'499'00572620545), -11));
+            BEAST_EXPECT(
+                env.balance(bob_, USD) == STAmount(USD, UINT64_C(18'999'00572616195), -11));
             BEAST_EXPECT(env.balance(ed, USD) == STAmount(USD, UINT64_C(18'999'00572611841), -11));
             // USD pool is slightly higher because of the fees.
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'000'000'003), STAmount(USD, UINT64_C(13'002'98282151419), -11), ammTokens));
+                btc(13'000'000'003), STAmount(USD, UINT64_C(13'002'98282151419), -11), ammTokens));
 
             ammTokens = ammAlice.getLPTokensBalance();
             // Trade with the fee
@@ -3840,67 +3857,67 @@ private:
             BEAST_EXPECT(env.balance(dan, USD) == STAmount(USD, UINT64_C(19'490'05672274398), -11));
             // USD pool gains more in dan's fees.
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'000'000'003), STAmount{USD, UINT64_C(13'012'92609877021), -11}, ammTokens));
+                btc(13'000'000'003), STAmount{USD, UINT64_C(13'012'92609877021), -11}, ammTokens));
             // Discounted fee payment
-            ammAlice.deposit(carol, USD(100));
+            ammAlice.deposit(carol_, USD(100));
             ammTokens = ammAlice.getLPTokensBalance();
             BEAST_EXPECT(ammAlice.expectBalances(
                 MPT(ammAlice[0])(13'000'000'003),
                 STAmount{USD, UINT64_C(13'112'92609877019), -11},
                 ammTokens));
-            env(pay(carol, bob, USD(100)), path(~USD), sendmax(BTC(110'000'000)));
+            env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(btc(110'000'000)));
             env.close();
             // carol pays 100000 drops in fees
             // 99900668MPT swapped in for 100USD
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'100'000'671), STAmount{USD, UINT64_C(13'012'92609877019), -11}, ammTokens));
+                btc(13'100'000'671), STAmount{USD, UINT64_C(13'012'92609877019), -11}, ammTokens));
 
             // Payment with the trading fee
-            env(pay(alice, carol, BTC(100'000'000)), path(~MPT(ammAlice[0])), sendmax(USD(110)));
+            env(pay(alice_, carol_, btc(100'000'000)), Path(~MPT(ammAlice[0])), Sendmax(USD(110)));
             env.close();
             // alice pays ~1.011USD in fees, which is ~10 times more
             // than carol's fee
             // 100.099431529USD swapped in for 100MPT
 
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'000'000'671), STAmount{USD, UINT64_C(13'114'03663044931), -11}, ammTokens));
+                btc(13'000'000'671), STAmount{USD, UINT64_C(13'114'03663044931), -11}, ammTokens));
 
             // Auction slot expired, no discounted fee
-            env.close(seconds(TOTAL_TIME_SLOT_SECS + 1));
+            env.close(seconds(kTOTAL_TIME_SLOT_SECS + 1));
             // clock is parent's based
             env.close();
 
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(29'399'00572620547), -11));
+                env.balance(carol_, USD) == STAmount(USD, UINT64_C(29'399'00572620547), -11));
             ammTokens = ammAlice.getLPTokensBalance();
             for (int i = 0; i < 10; ++i)
             {
-                auto const tokens = ammAlice.deposit(carol, USD(100));
-                ammAlice.withdraw(carol, tokens, USD(0));
+                auto const tokens = ammAlice.deposit(carol_, USD(100));
+                ammAlice.withdraw(carol_, tokens, USD(0));
             }
             // carol pays ~9.94USD in fees, which is ~10 times more in
             // trading fees vs discounted fee.
 
             BEAST_EXPECT(
-                env.balance(carol, USD) == STAmount(USD, UINT64_C(29'389'06197177122), -11));
+                env.balance(carol_, USD) == STAmount(USD, UINT64_C(29'389'06197177122), -11));
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'000'000'671), STAmount{USD, UINT64_C(13'123'98038488356), -11}, ammTokens));
+                btc(13'000'000'671), STAmount{USD, UINT64_C(13'123'98038488356), -11}, ammTokens));
 
-            env(pay(carol, bob, USD(100)), path(~USD), sendmax(BTC(110'000'000)));
+            env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(btc(110'000'000)));
             env.close();
             // carol pays ~1.008MPT in trading fee, which is
             // ~10 times more than the discounted fee.
             // 99.815876MPT is swapped in for 100USD
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(13'100'824'793), STAmount{USD, UINT64_C(13'023'98038488356), -11}, ammTokens));
+                btc(13'100'824'793), STAmount{USD, UINT64_C(13'023'98038488356), -11}, ammTokens));
         }
 
         // Bid tiny amount
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Bid a tiny amount
-                auto const tiny = Number{STAmount::cMinValue, STAmount::cMinOffset};
-                env(ammAlice.bid({.account = alice, .bidMin = IOUAmount{tiny}}));
+                auto const tiny = Number{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET};
+                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.
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny}));
@@ -3909,8 +3926,8 @@ private:
                     MPT(ammAlice[0])(10'000'000'000), USD(10'000), ammAlice.tokens()));
                 // Bid the tiny amount
                 env(ammAlice.bid({
-                    .account = alice,
-                    .bidMin = IOUAmount{STAmount::cMinValue, STAmount::cMinOffset},
+                    .account = alice_,
+                    .bidMin = IOUAmount{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET},
                 }));
                 // Pay slightly higher price
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny * Number{105, -2}}));
@@ -3919,63 +3936,63 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(
                     MPT(ammAlice[0])(10'000'000'000), USD(10'000), ammAlice.tokens()));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
 
         // Reset auth account
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = IOUAmount{100},
-                    .authAccounts = {carol},
+                    .authAccounts = {carol_},
                 }));
-                BEAST_EXPECT(ammAlice.expectAuctionSlot({carol}));
-                env(ammAlice.bid({.account = alice, .bidMin = IOUAmount{100}}));
+                BEAST_EXPECT(ammAlice.expectAuctionSlot({carol_}));
+                env(ammAlice.bid({.account = alice_, .bidMin = IOUAmount{100}}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot({}));
                 Account bob("bob");
                 Account dan("dan");
                 fund(env, {bob, dan}, XRP(1'000));
                 env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = IOUAmount{100},
                     .authAccounts = {bob, dan},
                 }));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot({bob, dan}));
             },
-            {{AMMMPT(10'000'000'000), USD(10'000)}});
+            {{gAmmmpt(10'000'000'000), USD(10'000)}});
 
         // Bid all tokens, still own the slot and trade at a discount
         {
             Env env(*this);
-            env.fund(XRP(2'000), gw, alice, bob);
-            MPTTester const BTC(
+            env.fund(XRP(2'000), gw_, alice_, bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 2'000'000'000,
-                 .flags = MPTDEXFlags});
-            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);
+                 .flags = kMPT_DEX_FLAGS});
+            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();
-            env.trust(STAmount{lpIssue, 500}, alice);
-            env.trust(STAmount{lpIssue, 50}, bob);
-            env(pay(gw, alice, STAmount{lpIssue, 500}));
-            env(pay(gw, bob, STAmount{lpIssue, 50}));
+            env.trust(STAmount{lpIssue, 500}, alice_);
+            env.trust(STAmount{lpIssue, 50}, bob_);
+            env(pay(gw_, alice_, STAmount{lpIssue, 500}));
+            env(pay(gw_, bob_, STAmount{lpIssue, 50}));
             // Alice doesn't have anymore lp tokens
-            env(amm.bid({.account = alice, .bidMin = 500}));
+            env(amm.bid({.account = alice_, .bidMin = 500}));
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{500}));
-            BEAST_EXPECT(expectHolding(env, alice, STAmount{lpIssue, 0}));
+            BEAST_EXPECT(expectHolding(env, alice_, STAmount{lpIssue, 0}));
             // But trades with the discounted fee since she still owns the slot.
             // Alice pays ~10011 MPT in fees
-            env(pay(alice, bob, USD(10)), path(~USD), sendmax(BTC(11'000'000)));
+            env(pay(alice_, bob_, USD(10)), Path(~USD), Sendmax(btc(11'000'000)));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'010'010'011), USD(1'000), IOUAmount{1'004'487'562112089, -9}));
+                btc(1'010'010'011), USD(1'000), IOUAmount{1'004'487'562112089, -9}));
 
             // Bob pays the full fee ~0.1USD
-            env(pay(bob, alice, BTC(10'000'000)), path(~MPT(BTC)), sendmax(USD(11)));
+            env(pay(bob_, alice_, btc(10'000'000)), Path(~MPT(btc)), Sendmax(USD(11)));
 
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000'010'011),
+                btc(1'000'010'011),
                 STAmount{USD, UINT64_C(1'010'10090898081), -11},
                 IOUAmount{1'004'487'562112089, -9}));
         }
@@ -3983,33 +4000,33 @@ private:
         // preflight tests
         {
             Env env(*this, features);
-            env.fund(XRP(2'000), gw, alice, bob);
-            MPTTester const BTC(
+            env.fund(XRP(2'000), gw_, alice_, bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_},
                  .pay = 2'000,
-                 .flags = MPTDEXFlags});
-            AMM amm(env, gw, XRP(1'000), BTC(1'010), false, 1'000);
-            Json::Value const tx = amm.bid({.account = alice, .bidMin = 500});
+                 .flags = kMPT_DEX_FLAGS});
+            AMM amm(env, gw_, XRP(1'000), btc(1'010), false, 1'000);
+            json::Value const tx = amm.bid({.account = alice_, .bidMin = 500});
 
             {
-                auto jtx = env.jt(tx, seq(1), fee(10));
+                auto jtx = env.jt(tx, Seq(1), Fee(10));
                 env.app().config().features.erase(featureMPTokensV2);
                 PreflightContext const pfctx(
-                    env.app(), *jtx.stx, env.current()->rules(), tapNONE, env.journal);
+                    env.app(), *jtx.stx, env.current()->rules(), TapNone, env.journal);
                 auto pf = AMMBid::checkExtraFeatures(pfctx);
                 BEAST_EXPECT(pf == false);
                 env.app().config().features.insert(featureMPTokensV2);
             }
 
             {
-                auto jtx = env.jt(tx, seq(1), fee(10));
+                auto jtx = env.jt(tx, Seq(1), Fee(10));
                 jtx.jv["Asset2"]["currency"] = "XRP";
                 jtx.jv["Asset2"].removeMember("mpt_issuance_id");
                 jtx.stx = env.ust(jtx);
                 PreflightContext const pfctx(
-                    env.app(), *jtx.stx, env.current()->rules(), tapNONE, env.journal);
+                    env.app(), *jtx.stx, env.current()->rules(), TapNone, env.journal);
                 auto pf = AMMBid::preflight(pfctx);
                 BEAST_EXPECT(pf == temBAD_AMM_TOKENS);
             }
@@ -4023,15 +4040,15 @@ private:
         using namespace jtx;
 
         Env env(*this);
-        env.fund(XRP(2'000), gw, alice);
-        MPT const BTC = MPTTester(
-            {.env = env, .issuer = gw, .holders = {alice}, .transferFee = 1'500, .pay = 40'000});
+        env.fund(XRP(2'000), gw_, alice_);
+        MPT const btc = MPTTester(
+            {.env = env, .issuer = gw_, .holders = {alice_}, .transferFee = 1'500, .pay = 40'000});
 
         // alice creates AMM
-        AMM const amm(env, alice, XRP(1'000), BTC(1'000));
+        AMM const amm(env, alice_, XRP(1'000), btc(1'000));
 
         // gw owns MPTIssuance, not allowed to set asfAllowTrustLineClawback
-        env(fset(gw, asfAllowTrustLineClawback), ter(tecOWNERS));
+        env(fset(gw_, asfAllowTrustLineClawback), Ter(tecOWNERS));
     }
 
     void
@@ -4041,27 +4058,27 @@ private:
         using namespace jtx;
 
         Env env(*this, features);
-        env.fund(XRP(1'000), gw);
-        env(fset(gw, asfAllowTrustLineClawback));
-        fund(env, gw, {alice}, XRP(1'000), {USD(1'000)}, Fund::Acct);
+        env.fund(XRP(1'000), gw_);
+        env(fset(gw_, asfAllowTrustLineClawback));
+        fund(env, gw_, {alice_}, XRP(1'000), {USD(1'000)}, Fund::Acct);
 
-        MPTTester const BTC(
+        MPTTester const btc(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice},
+             .issuer = gw_,
+             .holders = {alice_},
              .pay = 30'000,
-             .flags = tfMPTCanLock | MPTDEXFlags});
+             .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
         // to clawback from AMM account, must use AMMClawback instead of
         // Clawback
         auto const err = features[featureSingleAssetVault] ? tecPSEUDO_ACCOUNT : tecAMM_ACCOUNT;
-        AMM const amm(env, gw, XRP(100), BTC(100));
+        AMM const amm(env, gw_, XRP(100), btc(100));
         auto amount = amountFromString(amm.lptIssue(), "10");
-        env(claw(gw, amount), ter(err));
+        env(claw(gw_, amount), Ter(err));
 
-        AMM const amm1(env, alice, USD(100), BTC(200));
+        AMM const amm1(env, alice_, USD(100), btc(200));
         auto amount1 = amountFromString(amm1.lptIssue(), "10");
-        env(claw(gw, amount1), ter(err));
+        env(claw(gw_, amount1), Ter(err));
     }
 
     void
@@ -4075,259 +4092,259 @@ private:
 
         // Can't pay into AMM account.
         // Can't pay out since there is no keys
-        for (auto const& acct : {gw, alice})
+        for (auto const& acct : {gw_, alice_})
         {
             {
                 Env env(*this);
-                fund(env, gw, {alice, carol}, XRP(1'000));
-                MPTTester const BTC(
+                fund(env, gw_, {alice_, carol_}, XRP(1'000));
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .pay = 100,
-                     .flags = MPTDEXFlags});
+                     .flags = kMPT_DEX_FLAGS});
                 // XRP balance is below reserve
-                AMM const ammAlice(env, acct, XRP(10), BTC(10));
+                AMM const ammAlice(env, acct, XRP(10), btc(10));
                 // Pay below reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(10)), Ter(tecNO_PERMISSION));
                 // Pay above reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(300)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(300)), Ter(tecNO_PERMISSION));
                 // Pay MPT
-                env(pay(carol, ammAlice.ammAccount(), BTC(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), btc(10)), Ter(tecNO_PERMISSION));
             }
 
             {
                 Env env(*this);
-                fund(env, gw, {alice, carol}, XRP(10'000'000));
-                MPTTester const BTC(
+                fund(env, gw_, {alice_, carol_}, XRP(10'000'000));
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .pay = 20'000,
-                     .flags = MPTDEXFlags});
+                     .flags = kMPT_DEX_FLAGS});
                 // XRP balance is above reserve
-                AMM const ammAlice(env, acct, XRP(1'000'000), BTC(10'000));
+                AMM const ammAlice(env, acct, XRP(1'000'000), btc(10'000));
                 // Pay below reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(10)), Ter(tecNO_PERMISSION));
                 // Pay above reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(1'000'000)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(1'000'000)), Ter(tecNO_PERMISSION));
                 // Pay MPT
-                env(pay(carol, ammAlice.ammAccount(), BTC(1'000)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), btc(1'000)), Ter(tecNO_PERMISSION));
             }
         }
 
         // Can't pay into AMM with escrow.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(escrow::create(carol, ammAlice.ammAccount(), MPT(ammAlice[1])(1)),
-                    escrow::condition(escrow::cb1),
-                    escrow::finish_time(env.now() + 1s),
-                    escrow::cancel_time(env.now() + 2s),
-                    fee(1'500),
-                    ter(tecNO_PERMISSION));
+                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),
+                    Fee(1'500),
+                    Ter(tecNO_PERMISSION));
 
-                env(escrow::create(carol, ammAlice.ammAccount(), XRP(1)),
-                    escrow::condition(escrow::cb1),
-                    escrow::finish_time(env.now() + 1s),
-                    escrow::cancel_time(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),
+                    Fee(1'500),
+                    Ter(tecNO_PERMISSION));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Can't pay into AMM with paychan.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const pk = carol.pk();
+                auto const pk = carol_.pk();
                 auto const settleDelay = 10s;
                 NetClock::time_point const cancelAfter =
                     env.current()->header().parentCloseTime + 20s;
                 env(create(
-                        carol,
+                        carol_,
                         ammAlice.ammAccount(),
                         MPT(ammAlice[1])(1'000),
                         settleDelay,
                         pk,
                         cancelAfter),
-                    ter(telENV_RPC_FAILED));
+                    Ter(telENV_RPC_FAILED));
 
-                env(create(carol, ammAlice.ammAccount(), XRP(1'000), settleDelay, pk, cancelAfter),
-                    ter(tecNO_PERMISSION));
+                env(create(carol_, ammAlice.ammAccount(), XRP(1'000), settleDelay, pk, cancelAfter),
+                    Ter(tecNO_PERMISSION));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Can't pay into AMM with checks.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 env(check::create(env.master.id(), ammAlice.ammAccount(), XRP(100)),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
 
                 env(check::create(env.master.id(), ammAlice.ammAccount(), MPT(ammAlice[1])(100)),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         // Pay amounts close to one side of the pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const& BTC = MPT(ammAlice[1]);
+                auto const& btc = MPT(ammAlice[1]);
                 // Can't consume whole pool
-                env(pay(alice, carol, USD(100)),
-                    path(~USD),
-                    sendmax(BTC(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, BTC(100'000'000)),
-                    path(~BTC),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(btc(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, btc(100'000'000)),
+                    Path(~btc),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
                 // Overflow
-                env(pay(alice, carol, STAmount{USD, UINT64_C(99'999999999), -9}),
-                    path(~USD),
-                    sendmax(BTC(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, STAmount{USD, UINT64_C(999'99999999), -8}),
-                    path(~USD),
-                    sendmax(BTC(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, BTC(99'999'999)),
-                    path(~BTC),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{USD, UINT64_C(99'999999999), -9}),
+                    Path(~USD),
+                    Sendmax(btc(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{USD, UINT64_C(999'99999999), -8}),
+                    Path(~USD),
+                    Sendmax(btc(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, btc(99'999'999)),
+                    Path(~btc),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
                 // Sender doesn't have enough funds
-                env(pay(alice, carol, USD(99.99)),
-                    path(~USD),
-                    sendmax(BTC(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, BTC(99'990'000)),
-                    path(~BTC),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, USD(99.99)),
+                    Path(~USD),
+                    Sendmax(btc(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, btc(99'990'000)),
+                    Path(~btc),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
             },
-            {{USD(100), AMMMPT(100'000'000)}});
+            {{USD(100), gAmmmpt(100'000'000)}});
 
         // Globally locked MPT.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
-            BTC.set({.flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
+            btc.set({.flags = tfMPTLock});
 
-            env(pay(alice, carol, BTC(1)),
-                path(~static_cast<MPT>(BTC)),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(XRP(10)),
-                ter(tecPATH_DRY));
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(BTC(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, btc(1)),
+                Path(~static_cast<MPT>(btc)),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(XRP(10)),
+                Ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(btc(10)),
+                Ter(tecPATH_DRY));
         }
 
         // Individually locked MPT destination account.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
-            BTC.set({.holder = carol, .flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
+            btc.set({.holder = carol_, .flags = tfMPTLock});
 
-            env(pay(alice, carol, BTC(1)),
-                path(~static_cast<MPT>(BTC)),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(XRP(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, btc(1)),
+                Path(~static_cast<MPT>(btc)),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(XRP(10)),
+                Ter(tecPATH_DRY));
         }
 
         // Individually locked MPT source account
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
-            BTC.set({.holder = alice, .flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
+            btc.set({.holder = alice_, .flags = tfMPTLock});
 
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(BTC(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(btc(10)),
+                Ter(tecPATH_DRY));
         }
 
         // lock on both sides
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            MPTTester ETH(
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            MPTTester eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM const ammAlice(env, alice, ETH(10'000), BTC(10'000));
-            BTC.set({.holder = carol, .flags = tfMPTLock});
-            BTC.set({.holder = alice, .flags = tfMPTLock});
-            ETH.set({.holder = carol, .flags = tfMPTLock});
-            ETH.set({.holder = alice, .flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, eth(10'000), btc(10'000));
+            btc.set({.holder = carol_, .flags = tfMPTLock});
+            btc.set({.holder = alice_, .flags = tfMPTLock});
+            eth.set({.holder = carol_, .flags = tfMPTLock});
+            eth.set({.holder = alice_, .flags = tfMPTLock});
 
-            env(pay(alice, carol, ETH(1)),
-                path(~MPT(ETH)),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(BTC(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, eth(1)),
+                Path(~MPT(eth)),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(btc(10)),
+                Ter(tecPATH_DRY));
 
-            env(pay(alice, carol, BTC(1)),
-                path(~MPT(BTC)),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(ETH(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, btc(1)),
+                Path(~MPT(btc)),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(eth(10)),
+                Ter(tecPATH_DRY));
         }
 
         // Individually locked AMM MPT
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
-            BTC.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
+            btc.set({.holder = ammAlice.ammAccount(), .flags = tfMPTLock});
 
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(BTC(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(btc(10)),
+                Ter(tecPATH_DRY));
         }
     }
 
@@ -4341,64 +4358,64 @@ private:
         // Force one path with tfNoRippleDirect.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
-                env.fund(XRP(30'000), bob);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
+                env.fund(XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, MPT(ammAlice[1])(100)),
-                    path(~MPT(ammAlice[1])),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)),
+                    Path(~MPT(ammAlice[1])),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'100), MPT(ammAlice[1])(10'000), ammAlice.tokens()));
                 // Initial balance + 100
-                env.require(balance(carol, carolMPT + MPT(ammAlice[1])(100)));
+                env.require(Balance(carol_, carolMPT + MPT(ammAlice[1])(100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
-            {{XRP(10'000), AMMMPT(10'100)}});
+            {{XRP(10'000), gAmmmpt(10'100)}});
 
         // Payment 100IOU/MPT for 100IOU/MPT. Test IOU/MPT mix.
         // Force one path with tfNoRippleDirect.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10100));
-                auto carolBTC = env.balance(carol, BTC);
-                auto bobUSD = env.balance(bob, USD);
-                env(pay(bob, carol, BTC(100)),
-                    path(~BTC),
-                    sendmax(USD(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10100));
+                auto carolBTC = env.balance(carol_, btc);
+                auto bobUSD = env.balance(bob_, usd);
+                env(pay(bob_, carol_, btc(100)),
+                    Path(~btc),
+                    Sendmax(usd(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(USD(10'100), BTC(10'000), ammAlice.tokens()));
-                env.require(balance(carol, carolBTC + BTC(100)));
-                env.require(balance(bob, bobUSD - USD(100)));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(10'100), btc(10'000), ammAlice.tokens()));
+                env.require(Balance(carol_, carolBTC + btc(100)));
+                env.require(Balance(bob_, bobUSD - usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -4406,58 +4423,58 @@ private:
         // Payment 100MPT for 100XRP, use default path.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
-                env.fund(XRP(30'000), bob);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
+                env.fund(XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, MPT(ammAlice[1])(100)), sendmax(XRP(100)));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)), Sendmax(XRP(100)));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'100), MPT(ammAlice[1])(10'000), ammAlice.tokens()));
                 // Initial balance + 100
-                env.require(balance(carol, carolMPT + MPT(ammAlice[1])(100)));
+                env.require(Balance(carol_, carolMPT + MPT(ammAlice[1])(100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
-            {{XRP(10'000), AMMMPT(10'100)}});
+            {{XRP(10'000), gAmmmpt(10'100)}});
 
         // Payment 100IOU/MPT for 100IOU/MPT using default path.
         // Test IOU/MPT mix.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10100));
-                auto carolBTC = env.balance(carol, BTC);
-                auto bobUSD = env.balance(bob, USD);
-                env(pay(bob, carol, BTC(100)), sendmax(USD(100)));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10100));
+                auto carolBTC = env.balance(carol_, btc);
+                auto bobUSD = env.balance(bob_, usd);
+                env(pay(bob_, carol_, btc(100)), Sendmax(usd(100)));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(USD(10'100), BTC(10'000), ammAlice.tokens()));
-                env.require(balance(carol, carolBTC + BTC(100)));
-                env.require(balance(bob, bobUSD - USD(100)));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(10'100), btc(10'000), ammAlice.tokens()));
+                env.require(Balance(carol_, carolBTC + btc(100)));
+                env.require(Balance(bob_, bobUSD - usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -4466,59 +4483,59 @@ private:
         // both default path and path, activeStrands has one path.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
-                env.fund(XRP(30'000), bob);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
+                env.fund(XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, MPT(ammAlice[1])(100)),
-                    path(~MPT(ammAlice[1])),
-                    sendmax(XRP(100)));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)),
+                    Path(~MPT(ammAlice[1])),
+                    Sendmax(XRP(100)));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'100), MPT(ammAlice[1])(10'000), ammAlice.tokens()));
                 // Initial balance + 100
-                env.require(balance(carol, carolMPT + MPT(ammAlice[1])(100)));
+                env.require(Balance(carol_, carolMPT + MPT(ammAlice[1])(100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
-            {{XRP(10'000), AMMMPT(10'100)}});
+            {{XRP(10'000), gAmmmpt(10'100)}});
 
         // Test MPT/IOU combination for the case above.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10100));
-                auto carolBTC = env.balance(carol, BTC);
-                auto bobUSD = env.balance(bob, USD);
-                env(pay(bob, carol, BTC(100)), path(~BTC), sendmax(USD(100)));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10100));
+                auto carolBTC = env.balance(carol_, btc);
+                auto bobUSD = env.balance(bob_, usd);
+                env(pay(bob_, carol_, btc(100)), Path(~btc), Sendmax(usd(100)));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(USD(10'100), BTC(10'000), ammAlice.tokens()));
-                env.require(balance(carol, carolBTC + BTC(100)));
-                env.require(balance(bob, bobUSD - USD(100)));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(10'100), btc(10'000), ammAlice.tokens()));
+                env.require(Balance(carol_, carolBTC + btc(100)));
+                env.require(Balance(bob_, bobUSD - usd(100)));
             };
             testHelper2TokensMix(test);
         }
@@ -4526,81 +4543,81 @@ private:
         // Payment with limitQuality set.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto carolMPT = env.balance(carol, MPT(ammAlice[1]));
-                env.fund(jtx::XRP(30'000), bob);
+                auto carolMPT = env.balance(carol_, MPT(ammAlice[1]));
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
                 // Pays 10MPT for 10XRP. A larger payment of ~99.11MPT/100XRP
                 // would have been sent has it not been for limitQuality.
-                env(pay(bob, carol, MPT(ammAlice[1])(100)),
-                    path(~MPT(ammAlice[1])),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)),
+                    Path(~MPT(ammAlice[1])),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'010), MPT(ammAlice[1])(10'000), ammAlice.tokens()));
                 // Initial balance + 10(limited by limitQuality)
-                env.require(balance(carol, carolMPT + MPT(ammAlice[1])(10)));
+                env.require(Balance(carol_, carolMPT + MPT(ammAlice[1])(10)));
                 // Initial balance 30,000 - 10(limited by limitQuality) - 10(tx
                 // fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(10) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(10) - txFee(env, 1)));
 
                 // Fails because of limitQuality. Would have sent
                 // ~98.91MPT/110XRP has it not been for limitQuality.
-                env(pay(bob, carol, MPT(ammAlice[1])(100)),
-                    path(~MPT(ammAlice[1])),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
-                    ter(tecPATH_DRY));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)),
+                    Path(~MPT(ammAlice[1])),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
+                    Ter(tecPATH_DRY));
                 env.close();
             },
-            {{XRP(10'000), AMMMPT(10'010)}});
+            {{XRP(10'000), gAmmmpt(10'010)}});
 
         // Payment with limitQuality set. MPT/IOU combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10010));
-                auto carolBTC = env.balance(carol, BTC);
-                auto bobUSD = env.balance(bob, USD);
-                env(pay(bob, carol, BTC(100)),
-                    path(~BTC),
-                    sendmax(USD(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10010));
+                auto carolBTC = env.balance(carol_, btc);
+                auto bobUSD = env.balance(bob_, usd);
+                env(pay(bob_, carol_, btc(100)),
+                    Path(~btc),
+                    Sendmax(usd(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
                 env.close();
-                BEAST_EXPECT(ammAlice.expectBalances(USD(10'010), BTC(10'000), ammAlice.tokens()));
-                env.require(balance(carol, carolBTC + BTC(10)));
-                env.require(balance(bob, bobUSD - USD(10)));
+                BEAST_EXPECT(ammAlice.expectBalances(usd(10'010), btc(10'000), ammAlice.tokens()));
+                env.require(Balance(carol_, carolBTC + btc(10)));
+                env.require(Balance(bob_, bobUSD - usd(10)));
 
-                env(pay(bob, carol, BTC(100)),
-                    path(~BTC),
-                    sendmax(USD(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
-                    ter(tecPATH_DRY));
+                env(pay(bob_, carol_, btc(100)),
+                    Path(~btc),
+                    Sendmax(usd(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
+                    Ter(tecPATH_DRY));
                 env.close();
             };
             testHelper2TokensMix(test);
@@ -4609,76 +4626,76 @@ private:
         // Payment with limitQuality and transfer fee set.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
             env.close();
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 10'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            auto ammAlice = AMM(env, alice, XRP(10'000), BTC(10'010'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            auto ammAlice = AMM(env, alice_, XRP(10'000), btc(10'010'000'000'000'000));
             env.close();
-            auto carolMPT = env.balance(carol, MPT(BTC));
+            auto carolMPT = env.balance(carol_, MPT(btc));
             // Pays 10'000'000'000'000MPT for 10XRP. A larger payment of
             // ~99'110'000'000'000MPT/100XRP would have been sent has it not
             // been for limitQuality and the transfer fee.
-            env(pay(bob, carol, BTC(100'000'000'000'000)),
-                path(~MPT(BTC)),
-                sendmax(XRP(110)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(bob_, carol_, btc(100'000'000'000'000)),
+                Path(~MPT(btc)),
+                Sendmax(XRP(110)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
             env.close();
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRP(10'010), BTC(10'000'000'000'000'000), ammAlice.tokens()));
+                XRP(10'010), btc(10'000'000'000'000'000), ammAlice.tokens()));
             // 10'000'000'000'000MPT - 10% transfer fee
-            env.require(balance(carol, carolMPT + BTC(9'090'909'090'909)));
-            BEAST_EXPECT(expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(10) - txfee(env, 1)));
+            env.require(Balance(carol_, carolMPT + btc(9'090'909'090'909)));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(10) - txFee(env, 1)));
         }
 
         // Payment with limitQuality and transfer fee set. MPT/IOU combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1({
+                auto const usd = issue1({
                     .env = env,
                     .token = "USD",
-                    .issuer = gw,
-                    .holders = {alice, bob, carol},
+                    .issuer = gw_,
+                    .holders = {alice_, bob_, carol_},
                     .limit = 1'000'000
                     //.transferFee = 10'000
                 });
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 300'000'000'000'000'000,
                      .transferFee = 10'000});
 
-                env(pay(gw, alice, BTC(30'000'000'000'000'000)));
-                env(pay(gw, bob, BTC(30'000'000'000'000'000)));
-                env(pay(gw, carol, BTC(30'000'000'000'000'000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(30'000'000'000'000'000)));
+                env(pay(gw_, bob_, btc(30'000'000'000'000'000)));
+                env(pay(gw_, carol_, btc(30'000'000'000'000'000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10'000), BTC(10'010'000'000'000'000));
-                auto carolBTC = env.balance(carol, BTC);
-                auto bobUSD = env.balance(bob, USD);
-                env(pay(bob, carol, BTC(100'000'000'000'000)),
-                    path(~BTC),
-                    sendmax(USD(110)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+                auto ammAlice = AMM(env, alice_, usd(10'000), btc(10'010'000'000'000'000));
+                auto carolBTC = env.balance(carol_, btc);
+                auto bobUSD = env.balance(bob_, usd);
+                env(pay(bob_, carol_, btc(100'000'000'000'000)),
+                    Path(~btc),
+                    Sendmax(usd(110)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
-                    USD(10'010), BTC(10'000'000'000'000'000), ammAlice.tokens()));
-                env.require(balance(carol, carolBTC + BTC(9'090'909'090'909)));
-                env.require(balance(bob, bobUSD - USD(10)));
+                    usd(10'010), btc(10'000'000'000'000'000), ammAlice.tokens()));
+                env.require(Balance(carol_, carolBTC + btc(9'090'909'090'909)));
+                env.require(Balance(bob_, bobUSD - usd(10)));
             };
             testHelper2TokensMix(test);
         }
@@ -4686,49 +4703,49 @@ private:
         // Fail when partial payment is not set.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, MPT(ammAlice[1])(100)),
-                    path(~MPT(ammAlice[1])),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect),
-                    ter(tecPATH_PARTIAL));
+                env(pay(bob_, carol_, MPT(ammAlice[1])(100)),
+                    Path(~MPT(ammAlice[1])),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(tecPATH_PARTIAL));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
         // Fail when partial payment is not set. MPT/IOU combination.
         {
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
-                env.fund(XRP(30'000), alice, bob, carol, gw);
+                env.fund(XRP(30'000), alice_, bob_, carol_, gw_);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
-                     .issuer = gw,
-                     .holders = {alice, bob, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, bob_, carol_},
                      .limit = 1'000'000});
 
-                env(pay(gw, alice, BTC(50000)));
-                env(pay(gw, bob, BTC(50000)));
-                env(pay(gw, carol, BTC(50000)));
-                env(pay(gw, alice, USD(50000)));
-                env(pay(gw, bob, USD(50000)));
-                env(pay(gw, carol, USD(50000)));
+                env(pay(gw_, alice_, btc(50000)));
+                env(pay(gw_, bob_, btc(50000)));
+                env(pay(gw_, carol_, btc(50000)));
+                env(pay(gw_, alice_, usd(50000)));
+                env(pay(gw_, bob_, usd(50000)));
+                env(pay(gw_, carol_, usd(50000)));
                 env.close();
 
-                auto ammAlice = AMM(env, alice, USD(10000), BTC(10000));
-                env(pay(bob, carol, BTC(100)),
-                    path(~BTC),
-                    sendmax(USD(100)),
-                    txflags(tfNoRippleDirect),
-                    ter(tecPATH_PARTIAL));
+                auto ammAlice = AMM(env, alice_, usd(10000), btc(10000));
+                env(pay(bob_, carol_, btc(100)),
+                    Path(~btc),
+                    Sendmax(usd(100)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(tecPATH_PARTIAL));
             };
             testHelper2TokensMix(test);
         }
@@ -4739,48 +4756,48 @@ private:
         // is taken from the offer.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            env.fund(XRP(1'000), bob);
+                 .flags = kMPT_DEX_FLAGS});
+            env.fund(XRP(1'000), bob_);
             env.close();
-            auto ammETH_XRP = AMM(env, alice, XRP(10'000), ETH(1'000'000'000'000'000'000));
-            auto ammBTC_ETH =
-                AMM(env, alice, ETH(1'000'000'000'000'000'000), BTC(1'000'000'000'000'000'000));
-            env(offer(alice, XRP(101), BTC(10'000'000'000'000'000)), txflags(tfPassive));
+            auto ammEthXrp = AMM(env, alice_, XRP(10'000), eth(1'000'000'000'000'000'000));
+            auto ammBtcEth =
+                AMM(env, alice_, eth(1'000'000'000'000'000'000), btc(1'000'000'000'000'000'000));
+            env(offer(alice_, XRP(101), btc(10'000'000'000'000'000)), Txflags(tfPassive));
             env.close();
-            env(pay(bob, carol, BTC(10'000'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(XRP(102)),
-                txflags(tfPartialPayment));
+            env(pay(bob_, carol_, btc(10'000'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(XRP(102)),
+                Txflags(tfPartialPayment));
             env.close();
-            BEAST_EXPECT(ammETH_XRP.expectBalances(
-                XRPAmount(10'030'082'730), ETH(9'970'00749812546872), ammETH_XRP.tokens()));
+            BEAST_EXPECT(ammEthXrp.expectBalances(
+                XRPAmount(10'030'082'730), eth(9'970'00749812546872), ammEthXrp.tokens()));
 
-            BEAST_EXPECT(ammBTC_ETH.expectBalances(
-                BTC(9'970'09727766213961), ETH(10'029'99250187453128), ammBTC_ETH.tokens()));
+            BEAST_EXPECT(ammBtcEth.expectBalances(
+                btc(9'970'09727766213961), eth(10'029'99250187453128), ammBtcEth.tokens()));
 
-            Amounts const expectedAmounts = Amounts{XRPAmount(30'201'749), BTC(29'90272233786039)};
+            Amounts const expectedAmounts = Amounts{XRPAmount(30'201'749), btc(29'90272233786039)};
 
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{expectedAmounts}}));
+            BEAST_EXPECT(expectOffers(env, alice_, 1, {{expectedAmounts}}));
 
             // Initial (30,000 + 100)e14
-            env.require(balance(carol, BTC(3'010'000'000'000'000'000)));
+            env.require(Balance(carol_, btc(3'010'000'000'000'000'000)));
             // Initial 1,000 - 30082730(AMM pool) - 70798251(offer) - 10(tx fee)
             BEAST_EXPECT(expectLedgerEntryRoot(
                 env,
-                bob,
-                XRP(1'000) - XRPAmount{30'082'730} - XRPAmount{70'798'251} - txfee(env, 1)));
+                bob_,
+                XRP(1'000) - XRPAmount{30'082'730} - XRPAmount{70'798'251} - txFee(env, 1)));
         }
 
         // Default path (with AMM) has a better quality than a
@@ -4789,82 +4806,82 @@ private:
         // path ~49XRP/49e14BTC. The rest is taken from the offer.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 1'000'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            auto ammAlice = AMM(env, alice, XRP(10'000), BTC(1'000'000'000'000'000'000));
-            env.fund(XRP(1'000), bob);
+                 .flags = kMPT_DEX_FLAGS});
+            auto ammAlice = AMM(env, alice_, XRP(10'000), btc(1'000'000'000'000'000'000));
+            env.fund(XRP(1'000), bob_);
             env.close();
-            env(offer(alice, XRP(101), ETH(10'000'000'000'000'000)), txflags(tfPassive));
+            env(offer(alice_, XRP(101), eth(10'000'000'000'000'000)), Txflags(tfPassive));
             env.close();
-            env(offer(alice, ETH(10'000'000'000'000'000), BTC(10'000'000'000'000'000)),
-                txflags(tfPassive));
+            env(offer(alice_, eth(10'000'000'000'000'000), btc(10'000'000'000'000'000)),
+                Txflags(tfPassive));
             env.close();
-            env(pay(bob, carol, BTC(10'000'000'000'000'000)),
-                path(~MPT(ETH), ~MPT(BTC)),
-                sendmax(XRP(102)),
-                txflags(tfPartialPayment));
+            env(pay(bob_, carol_, btc(10'000'000'000'000'000)),
+                Path(~MPT(eth), ~MPT(btc)),
+                Sendmax(XRP(102)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRPAmount(10'050'238'637), BTC(9'950'01249687578120), ammAlice.tokens()));
+                XRPAmount(10'050'238'637), btc(9'950'01249687578120), ammAlice.tokens()));
             BEAST_EXPECT(expectOffers(
                 env,
-                alice,
+                alice_,
                 2,
-                {{Amounts{XRPAmount(50'487'378), ETH(49'98750312421880)},
-                  Amounts{ETH(49'98750312421880), BTC(49'98750312421880)}}}));
+                {{Amounts{XRPAmount(50'487'378), eth(49'98750312421880)},
+                  Amounts{eth(49'98750312421880), btc(49'98750312421880)}}}));
             // Initial (30,000 + 100)e14
-            env.require(balance(carol, BTC(30'100'00000000000000)));
+            env.require(Balance(carol_, btc(30'100'00000000000000)));
             // Initial 1,000 - 50238637(AMM pool) - 50512622(offer) - 10(tx
             // fee)
             BEAST_EXPECT(expectLedgerEntryRoot(
                 env,
-                bob,
-                XRP(1'000) - XRPAmount{50'238'637} - XRPAmount{50'512'622} - txfee(env, 1)));
+                bob_,
+                XRP(1'000) - XRPAmount{50'238'637} - XRPAmount{50'512'622} - txFee(env, 1)));
         }
 
         // Default path with AMM and Order Book offer. AMM is consumed first,
         // remaining amount is consumed by the offer.
         {
             Env env(*this);
-            fund(env, gw, {alice, bob, carol}, XRP(30'000));
-            MPTTester const BTC(
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(30'000));
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            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));
+                 .flags = kMPT_DEX_FLAGS});
+            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();
-            env(pay(alice, carol, MPT(ammAlice[1])(200'000'000'000'000)),
-                sendmax(XRP(200)),
-                txflags(tfPartialPayment));
+            env(pay(alice_, carol_, MPT(ammAlice[1])(200'000'000'000'000)),
+                Sendmax(XRP(200)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'100), MPT(ammAlice[1])(10'000'000000000001), ammAlice.tokens()));
-            env.require(balance(carol, MPT(ammAlice[1])(30'199'999999999999)));
+            env.require(Balance(carol_, MPT(ammAlice[1])(30'199'999999999999)));
 
             // Initial 30,000 - 10000(AMM pool LP) - 100(AMMoffer) -
             // - 100(offer) - 10(tx fee) - 10(tx fee of MPTTester init as
             // holder) - one reserve
             BEAST_EXPECT(expectLedgerEntryRoot(
                 env,
-                alice,
+                alice_,
                 XRP(30'000) - XRP(10'000) - XRP(100) - XRP(100) - ammCrtFee(env) -
-                    2 * txfee(env, 1)));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+                    2 * txFee(env, 1)));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         // Default path with AMM and Order Book offer.
@@ -4872,165 +4889,165 @@ private:
         // Remaining amount is consumed by AMM.
         {
             Env env(*this);
-            fund(env, gw, {alice, bob, carol}, XRP(20'000));
-            MPTTester const BTC(
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(20'000));
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 2'000,
-                 .flags = MPTDEXFlags});
-            env(offer(bob, XRP(50), BTC(150)), txflags(tfPassive));
+                 .flags = kMPT_DEX_FLAGS});
+            env(offer(bob_, XRP(50), btc(150)), Txflags(tfPassive));
             env.close();
-            AMM const ammAlice(env, alice, XRP(1'000), BTC(1'050));
-            env(pay(alice, carol, BTC(200)), sendmax(XRP(200)), txflags(tfPartialPayment));
-            BEAST_EXPECT(ammAlice.expectBalances(XRP(1'050), BTC(1'000), ammAlice.tokens()));
-            env.require(balance(carol, BTC(2'200)));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            AMM const ammAlice(env, alice_, XRP(1'000), btc(1'050));
+            env(pay(alice_, carol_, btc(200)), Sendmax(XRP(200)), Txflags(tfPartialPayment));
+            BEAST_EXPECT(ammAlice.expectBalances(XRP(1'050), btc(1'000), ammAlice.tokens()));
+            env.require(Balance(carol_, btc(2'200)));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         // Offer crossing XRP/MPT
         {
             Env env(*this);
-            fund(env, gw, {alice, bob, carol}, XRP(30'000));
-            MPTTester const BTC(
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(30'000));
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            AMM ammAlice(env, alice, XRP(10'000), BTC(10'100));
-            env(offer(bob, MPT(ammAlice[1])(100), XRP(100)));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM ammAlice(env, alice_, XRP(10'000), btc(10'100));
+            env(offer(bob_, MPT(ammAlice[1])(100), XRP(100)));
             env.close();
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'100), MPT(ammAlice[1])(10'000), ammAlice.tokens()));
             // Initial 30,000 + 100
-            env.require(balance(bob, MPT(ammAlice[1])(30'100)));
+            env.require(Balance(bob_, MPT(ammAlice[1])(30'100)));
             // Initial 30,000 - 100(offer) - 10(tx fee) - 1(tx fee for MPTTester
             // holder)
             BEAST_EXPECT(
-                expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - 2 * txfee(env, 1)));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+                expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - 2 * txFee(env, 1)));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         // Offer crossing MPT/MPT and transfer rate
         // Single path AMM offer
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammAlice(env, alice, BTC(1'000'000'000'000'000), ETH(1'100'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            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
             // limitQuality value and limitOut() function in StrandFlow
             // doesn't require an adjustment to out value.
-            env(offer(carol, ETH(100'000'000'000'000), BTC(100'000'000'000'000)));
+            env(offer(carol_, eth(100'000'000'000'000), btc(100'000'000'000'000)));
             env.close();
             // No transfer fee
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(1'100'000'000'000'000), ETH(1'000'000'000'000'000), ammAlice.tokens()));
+                btc(1'100'000'000'000'000), eth(1'000'000'000'000'000), ammAlice.tokens()));
             // Initial 30,000'000'000'000'000 - 100'000'000'000'000(offer)-25 %
             // transfer fee
-            env.require(balance(carol, BTC(29'875'000'000'000'000)));
+            env.require(Balance(carol_, btc(29'875'000'000'000'000)));
             // Initial 30,000'000'000'000'000 + 100'000'000'000'000(offer)
-            env.require(balance(carol, ETH(30'100'000'000'000'000)));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            env.require(Balance(carol_, eth(30'100'000'000'000'000)));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Single-path AMM offer
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, bob, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 100,
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            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)));
+                 .flags = kMPT_DEX_FLAGS});
+            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();
 
             BEAST_EXPECT(
-                amm.expectBalances(XRPAmount(909'090'909), BTC(550'000000055001), amm.tokens()));
+                amm.expectBalances(XRPAmount(909'090'909), btc(550'000000055001), amm.tokens()));
             // Offer ~91XRP/49.99e12BTC
             BEAST_EXPECT(expectOffers(
-                env, carol, 1, {{Amounts{XRPAmount{9'090'909}, BTC(4'999999950000)}}}));
+                env, carol_, 1, {{Amounts{XRPAmount{9'090'909}, btc(4'999999950000)}}}));
             // Carol pays 0.1% fee on 50'000000055000BTC = 50'000000055BTC
-            env.require(balance(carol, BTC(29'949'949'999'944'943)));
+            env.require(Balance(carol_, btc(29'949'949'999'944'943)));
         }
 
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .transferFee = 100,
                  .pay = 3'000'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            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)));
+                 .flags = kMPT_DEX_FLAGS});
+            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();
 
-            BEAST_EXPECT(amm.expectBalances(XRP(990), BTC(505'05050505050506), amm.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(amm.expectBalances(XRP(990), btc(505'05050505050506), amm.tokens()));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Multi-path AMM offer
         {
             Env env(*this);
             Account const ed("ed");
-            env.fund(XRP(30'000), gw, alice, bob, carol, ed);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_, ed);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 20'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = 25'000,
                  .pay = 20'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
             AMM const ammAlice(
-                env, alice, BTC(10'000'000'000'000'000), ETH(11'000'000'000'000'000));
+                env, alice_, btc(10'000'000'000'000'000), eth(11'000'000'000'000'000));
 
-            env(offer(bob, BTC(100'000'000'000'000), XRP(10)), txflags(tfPassive));
-            env(offer(ed, XRP(10), ETH(100'000'000'000'000)), txflags(tfPassive));
+            env(offer(bob_, btc(100'000'000'000'000), XRP(10)), Txflags(tfPassive));
+            env(offer(ed, XRP(10), eth(100'000'000'000'000)), Txflags(tfPassive));
             env.close();
-            env(offer(carol, ETH(1'000'000'000'000'000), BTC(1'000'000'000'000'000)));
+            env(offer(carol_, eth(1'000'000'000'000'000), btc(1'000'000'000'000'000)));
             env.close();
 
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(1'060'6848287928033), ETH(1'037'0658372213574), ammAlice.tokens()));
+                btc(1'060'6848287928033), eth(1'037'0658372213574), ammAlice.tokens()));
             // Consumed offer ~72.93e13ETH/72.93e13BTC
             BEAST_EXPECT(expectOffers(
-                env, carol, 1, {Amounts{ETH(27'0658372213574), BTC(27'0658372213575)}}));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+                env, carol_, 1, {Amounts{eth(27'0658372213574), btc(27'0658372213575)}}));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
             BEAST_EXPECT(expectOffers(env, ed, 0));
 
-            env.require(balance(carol, BTC(19'116'439'640'089'955)));
-            env.require(balance(carol, ETH(20'729'341'627'786'426)));
-            env.require(balance(bob, BTC(20'100'000'000'000'000)));
-            env.require(balance(ed, ETH(19'875'000'000'000'000)));
+            env.require(Balance(carol_, btc(19'116'439'640'089'955)));
+            env.require(Balance(carol_, eth(20'729'341'627'786'426)));
+            env.require(Balance(bob_, btc(20'100'000'000'000'000)));
+            env.require(Balance(ed, eth(19'875'000'000'000'000)));
         }
 
         // Payment and transfer fee
@@ -5042,32 +5059,32 @@ private:
         // 100EUR/1.25 = 80EUR paid to carol
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, bob, carol);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammAlice(env, alice, BTC(1'000), ETH(1'100));
-            env(rate(gw, 1.25));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, btc(1'000), eth(1'100));
+            env(rate(gw_, 1.25));
             env.close();
-            env(pay(bob, carol, ETH(100)),
-                path(~MPT(ETH)),
-                sendmax(BTC(125)),
-                txflags(tfPartialPayment));
+            env(pay(bob_, carol_, eth(100)),
+                Path(~MPT(eth)),
+                Sendmax(btc(125)),
+                Txflags(tfPartialPayment));
             env.close();
-            BEAST_EXPECT(ammAlice.expectBalances(BTC(1'100), ETH(1'000), ammAlice.tokens()));
-            env.require(balance(bob, BTC(29'875)));
-            env.require(balance(carol, ETH(30'080)));
+            BEAST_EXPECT(ammAlice.expectBalances(btc(1'100), eth(1'000), ammAlice.tokens()));
+            env.require(Balance(bob_, btc(29'875)));
+            env.require(Balance(carol_, eth(30'080)));
         }
 
         // Payment and transfer fee, multiple steps
@@ -5085,139 +5102,139 @@ private:
             Env env(*this);
             Account const dan("dan");
             Account const ed("ed");
-            env.fund(XRP(30'000), gw, alice, bob, carol, dan, ed);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_, dan, ed);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const CAN(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const can(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 2'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const GBP(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const gbp(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, dan, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, dan, ed},
                  .transferFee = 25'000,
                  .pay = 3'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammAlice(env, alice, GBP(1'000'000), ETH(10'125));
-            env(pay(gw, bob, CAN(1'953'125)));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, gbp(1'000'000), eth(10'125));
+            env(pay(gw_, bob_, can(1'953'125)));
             env.close();
-            env(offer(dan, CAN(2'000'000), GBP(20'000)));
-            env(offer(ed, ETH(200), BTC(200)));
+            env(offer(dan, can(2'000'000), gbp(20'000)));
+            env(offer(ed, eth(200), btc(200)));
             env.close();
-            env(pay(bob, carol, BTC(100)),
-                path(~MPT(GBP), ~MPT(ETH), ~MPT(BTC)),
-                sendmax(CAN(1'953'125)),
-                txflags(tfPartialPayment));
+            env(pay(bob_, carol_, btc(100)),
+                Path(~MPT(gbp), ~MPT(eth), ~MPT(btc)),
+                Sendmax(can(1'953'125)),
+                Txflags(tfPartialPayment));
             env.close();
-            env.require(balance(bob, CAN(2'000'000)));
-            env.require(balance(dan, CAN(3'562'500)));
-            env.require(balance(dan, GBP(2'984'375)));
+            env.require(Balance(bob_, can(2'000'000)));
+            env.require(Balance(dan, can(3'562'500)));
+            env.require(Balance(dan, gbp(2'984'375)));
 
-            BEAST_EXPECT(ammAlice.expectBalances(GBP(1'012'500), ETH(10'000), ammAlice.tokens()));
-            env.require(balance(ed, ETH(30'100)));
-            env.require(balance(ed, BTC(29'900)));
-            env.require(balance(carol, BTC(30'080)));
+            BEAST_EXPECT(ammAlice.expectBalances(gbp(1'012'500), eth(10'000), ammAlice.tokens()));
+            env.require(Balance(ed, eth(30'100)));
+            env.require(Balance(ed, btc(29'900)));
+            env.require(Balance(carol_, btc(30'080)));
         }
 
         // Pay amounts close to one side of the pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const& BTC = MPT(ammAlice[1]);
-                env(pay(alice, carol, BTC(9999)),
-                    path(~BTC),
-                    sendmax(XRP(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, BTC(10'000)),
-                    path(~BTC),
-                    sendmax(XRP(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, XRP(100)),
-                    path(~XRP),
-                    sendmax(BTC(100)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, STAmount{xrpIssue(), 99'999'900}),
-                    path(~XRP),
-                    sendmax(BTC(100)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
+                auto const& btc = MPT(ammAlice[1]);
+                env(pay(alice_, carol_, btc(9999)),
+                    Path(~btc),
+                    Sendmax(XRP(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, btc(10'000)),
+                    Path(~btc),
+                    Sendmax(XRP(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, XRP(100)),
+                    Path(~XRP),
+                    Sendmax(btc(100)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, STAmount{xrpIssue(), 99'999'900}),
+                    Path(~XRP),
+                    Sendmax(btc(100)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
             },
-            {{XRP(100), AMMMPT(10'000)}});
+            {{XRP(100), gAmmmpt(10'000)}});
 
         // Multiple paths/steps
         {
             Env env(*this);
-            env.fund(XRP(100'000), gw, alice);
-            env.fund(XRP(1'000), bob, carol);
-            MPTTester const BTC(
+            env.fund(XRP(100'000), gw_, alice_);
+            env.fund(XRP(1'000), bob_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const USD(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const EUR(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eur(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 500'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const xrp_eur(env, alice, XRP(10'100), EUR(100'000'000'000'000'000));
-            AMM const eur_btc(
-                env, alice, EUR(100'000'000'000'000'000), BTC(102'000'000'000'000'000));
-            AMM const btc_usd(
-                env, alice, BTC(101'000'000'000'000'000), USD(100'000'000'000'000'000));
-            AMM const xrp_usd(env, alice, XRP(10'150), USD(102'000'000'000'000'000));
-            AMM const xrp_eth(env, alice, XRP(10'000), ETH(101'000'000'000'000'000));
-            AMM const eth_eur(
-                env, alice, ETH(109'000'000'000'000'000), EUR(110'000'000'000'000'000));
-            AMM const eur_usd(
-                env, alice, EUR(101'000'000'000'000'000), USD(100'000'000'000'000'000));
-            env(pay(bob, carol, USD(1'000'000'000'000'000)),
-                path(~MPT(EUR), ~MPT(BTC), ~MPT(USD)),
-                path(~MPT(USD)),
-                path(~MPT(ETH), ~MPT(EUR), ~MPT(USD)),
-                sendmax(XRP(200)));
+                 .flags = kMPT_DEX_FLAGS});
+            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));
+            AMM const btcUsd(
+                env, alice_, btc(101'000'000'000'000'000), usd(100'000'000'000'000'000));
+            AMM const xrpUsd(env, alice_, XRP(10'150), usd(102'000'000'000'000'000));
+            AMM const xrpEth(env, alice_, XRP(10'000), eth(101'000'000'000'000'000));
+            AMM const ethEur(
+                env, alice_, eth(109'000'000'000'000'000), eur(110'000'000'000'000'000));
+            AMM const eurUsd(
+                env, alice_, eur(101'000'000'000'000'000), usd(100'000'000'000'000'000));
+            env(pay(bob_, carol_, usd(1'000'000'000'000'000)),
+                Path(~MPT(eur), ~MPT(btc), ~MPT(usd)),
+                Path(~MPT(usd)),
+                Path(~MPT(eth), ~MPT(eur), ~MPT(usd)),
+                Sendmax(XRP(200)));
 
-            BEAST_EXPECT(xrp_eth.expectBalances(
-                XRPAmount(10'026'208'900), ETH(10'073'6577924447994), xrp_eth.tokens()));
-            BEAST_EXPECT(eth_eur.expectBalances(
-                ETH(10'926'3422075552006), EUR(10'973'5423207873690), eth_eur.tokens()));
-            BEAST_EXPECT(eur_usd.expectBalances(
-                EUR(10'126'4576792126310), USD(9'973'9315171207179), eur_usd.tokens()));
+            BEAST_EXPECT(xrpEth.expectBalances(
+                XRPAmount(10'026'208'900), eth(10'073'6577924447994), xrpEth.tokens()));
+            BEAST_EXPECT(ethEur.expectBalances(
+                eth(10'926'3422075552006), eur(10'973'5423207873690), ethEur.tokens()));
+            BEAST_EXPECT(eurUsd.expectBalances(
+                eur(10'126'4576792126310), usd(9'973'9315171207179), eurUsd.tokens()));
             // XRP-USD path
             // This path provides ~73.9e12USD/74.1XRP
-            BEAST_EXPECT(xrp_usd.expectBalances(
-                XRPAmount(10'224'106'246), USD(10'126'0684828792821), xrp_usd.tokens()));
+            BEAST_EXPECT(xrpUsd.expectBalances(
+                XRPAmount(10'224'106'246), usd(10'126'0684828792821), xrpUsd.tokens()));
 
             // XRP-EUR-BTC-USD
             // This path doesn't provide any liquidity due to how
@@ -5226,205 +5243,205 @@ private:
             // XRP-EUR-BTC-USD 11.6e12USD/11.64XRP,
             // XRP-USD 60.7e12USD/60.8XRP,
             // XRP-ETH-EUR-USD 27.6e12USD/27.6XRP
-            BEAST_EXPECT(xrp_eur.expectBalances(
-                XRP(10'100), EUR(100'000'000'000'000'000), xrp_eur.tokens()));
-            BEAST_EXPECT(eur_btc.expectBalances(
-                EUR(100'000'000'000'000'000), BTC(102'000'000'000'000'000), eur_btc.tokens()));
-            BEAST_EXPECT(btc_usd.expectBalances(
-                BTC(101'000'000'000'000'000), USD(100'000'000'000'000'000), btc_usd.tokens()));
-            env.require(balance(carol, USD(501'000'000'000'000'000)));
+            BEAST_EXPECT(
+                xrpEur.expectBalances(XRP(10'100), eur(100'000'000'000'000'000), xrpEur.tokens()));
+            BEAST_EXPECT(eurBtc.expectBalances(
+                eur(100'000'000'000'000'000), btc(102'000'000'000'000'000), eurBtc.tokens()));
+            BEAST_EXPECT(btcUsd.expectBalances(
+                btc(101'000'000'000'000'000), usd(100'000'000'000'000'000), btcUsd.tokens()));
+            env.require(Balance(carol_, usd(501'000'000'000'000'000)));
         }
 
         // Dependent AMM
         {
             Env env(*this);
-            env.fund(XRP(40'000), gw, alice);
-            env.fund(XRP(1'000), bob, carol);
-            MPTTester const BTC(
+            env.fund(XRP(40'000), gw_, alice_);
+            env.fund(XRP(1'000), bob_, carol_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const USD(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const EUR(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eur(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 50'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const xrp_eur(env, alice, XRP(10'100), EUR(10'000'000'000'000'000));
-            AMM const eur_btc(env, alice, EUR(10'000'000'000'000'000), BTC(10'200'000'000'000'000));
-            AMM const btc_usd(env, alice, BTC(10'100'000'000'000'000), USD(10'000'000'000'000'000));
-            AMM const xrp_eth(env, alice, XRP(10'000), ETH(10'100'000'000'000'000));
-            AMM const eth_eur(env, alice, ETH(10'900'000'000'000'000), EUR(11'000'000'000'000'000));
-            env(pay(bob, carol, USD(100'000'000'000'000)),
-                path(~MPT(EUR), ~MPT(BTC), ~MPT(USD)),
-                path(~MPT(ETH), ~MPT(EUR), ~MPT(BTC), ~MPT(USD)),
-                sendmax(XRP(200)));
+                 .flags = kMPT_DEX_FLAGS});
+            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));
+            AMM const xrpEth(env, alice_, XRP(10'000), eth(10'100'000'000'000'000));
+            AMM const ethEur(env, alice_, eth(10'900'000'000'000'000), eur(11'000'000'000'000'000));
+            env(pay(bob_, carol_, usd(100'000'000'000'000)),
+                Path(~MPT(eur), ~MPT(btc), ~MPT(usd)),
+                Path(~MPT(eth), ~MPT(eur), ~MPT(btc), ~MPT(usd)),
+                Sendmax(XRP(200)));
 
-            BEAST_EXPECT(xrp_eur.expectBalances(
-                XRPAmount(10'118'738'472), EUR(9'981'544436337981), xrp_eur.tokens()));
-            BEAST_EXPECT(eur_btc.expectBalances(
-                EUR(10'101'160967851758), BTC(10'097'914269680647), eur_btc.tokens()));
-            BEAST_EXPECT(btc_usd.expectBalances(
-                BTC(10'202'085730319353), USD(9'900'000'000'000'000), btc_usd.tokens()));
-            BEAST_EXPECT(xrp_eth.expectBalances(
-                XRPAmount(10'082'446'397), ETH(10'017'410727780081), xrp_eth.tokens()));
-            BEAST_EXPECT(eth_eur.expectBalances(
-                ETH(10'982'589272219919), EUR(10'917'294595810261), eth_eur.tokens()));
-            env.require(balance(carol, USD(50'100'000'000'000'000)));
+            BEAST_EXPECT(xrpEur.expectBalances(
+                XRPAmount(10'118'738'472), eur(9'981'544436337981), xrpEur.tokens()));
+            BEAST_EXPECT(eurBtc.expectBalances(
+                eur(10'101'160967851758), btc(10'097'914269680647), eurBtc.tokens()));
+            BEAST_EXPECT(btcUsd.expectBalances(
+                btc(10'202'085730319353), usd(9'900'000'000'000'000), btcUsd.tokens()));
+            BEAST_EXPECT(xrpEth.expectBalances(
+                XRPAmount(10'082'446'397), eth(10'017'410727780081), xrpEth.tokens()));
+            BEAST_EXPECT(ethEur.expectBalances(
+                eth(10'982'589272219919), eur(10'917'294595810261), ethEur.tokens()));
+            env.require(Balance(carol_, usd(50'100'000'000'000'000)));
         }
 
         // AMM offers limit
         // Consuming 30 CLOB offers, results in hitting 30 AMM offers limit.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            env.fund(XRP(1'000), bob);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            env.fund(XRP(1'000), bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 400'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000'000'000));
 
             for (int i = 0; i < 30; ++i)
-                env(offer(alice, ETH(1'000'000'000'000 + (10'000'000'000 * i)), XRP(1)));
+                env(offer(alice_, eth(1'000'000'000'000 + (10'000'000'000 * i)), XRP(1)));
             // This is worse quality offer than 30 offers above.
             // It will not be consumed because of AMM offers limit.
-            env(offer(alice, ETH(140'000'000'000'000), XRP(100)));
-            env(pay(bob, carol, BTC(100'000'000'000'000)),
-                path(~XRP, ~MPT(BTC)),
-                sendmax(ETH(400'000'000'000'000)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(offer(alice_, eth(140'000'000'000'000), XRP(100)));
+            env(pay(bob_, carol_, btc(100'000'000'000'000)),
+                Path(~XRP, ~MPT(btc)),
+                Sendmax(eth(400'000'000'000'000)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
 
             BEAST_EXPECT(
-                ammAlice.expectBalances(XRP(10'030), BTC(9'970'089730807592), ammAlice.tokens()));
+                ammAlice.expectBalances(XRP(10'030), btc(9'970'089730807592), ammAlice.tokens()));
 
-            env.require(balance(carol, BTC(30'029'910269192408)));
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{{ETH(140'000'000'000'000), XRP(100)}}}));
+            env.require(Balance(carol_, btc(30'029'910269192408)));
+            BEAST_EXPECT(expectOffers(env, alice_, 1, {{{eth(140'000'000'000'000), XRP(100)}}}));
         }
 
         // This payment is fulfilled
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            env.fund(XRP(1'000), bob);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            env.fund(XRP(1'000), bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester const ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester const eth(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 400'000'000'000'000,
-                 .flags = MPTDEXFlags});
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000'000'000'000'000));
+                 .flags = kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000'000'000'000'000));
 
             for (int i = 0; i < 29; ++i)
-                env(offer(alice, ETH(1'000'000'000'000 + (10'000'000'000 * i)), XRP(1)));
+                env(offer(alice_, eth(1'000'000'000'000 + (10'000'000'000 * i)), XRP(1)));
             // This is worse quality offer than 30 offers above.
             // It will not be consumed because of AMM offers limit.
-            env(offer(alice, ETH(140'000'000'000'000), XRP(100)));
-            env(pay(bob, carol, BTC(100'000'000'000'000)),
-                path(~XRP, ~MPT(BTC)),
-                sendmax(ETH(400'000'000'000'000)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(offer(alice_, eth(140'000'000'000'000), XRP(100)));
+            env(pay(bob_, carol_, btc(100'000'000'000'000)),
+                Path(~XRP, ~MPT(btc)),
+                Sendmax(eth(400'000'000'000'000)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRPAmount{10'101'010'102}, BTC(9'900'000'000'000'000), ammAlice.tokens()));
+                XRPAmount{10'101'010'102}, btc(9'900'000'000'000'000), ammAlice.tokens()));
 
-            env.require(balance(carol, BTC(30'100'000'000'000'000)));
+            env.require(Balance(carol_, btc(30'100'000'000'000'000)));
             BEAST_EXPECT(
-                expectOffers(env, alice, 1, {{{ETH(39'185857200000), XRPAmount{27'989'898}}}}));
+                expectOffers(env, alice_, 1, {{{eth(39'185857200000), XRPAmount{27'989'898}}}}));
         }
 
         // Offer crossing with AMM and another offer.
         // AMM has a better quality and is consumed first.
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            env.fund(XRP(1'000), bob);
-            MPTTester const BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            env.fund(XRP(1'000), bob_);
+            MPTTester const btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000'000'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            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));
-            env(offer(carol, BTC(100'000'000'000'000), XRP(100)));
+            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));
+            env(offer(carol_, btc(100'000'000'000'000), XRP(100)));
 
             BEAST_EXPECT(ammAlice.expectBalances(
-                XRPAmount{10'049'825'372}, BTC(10'049'925870493027), ammAlice.tokens()));
+                XRPAmount{10'049'825'372}, btc(10'049'925870493027), ammAlice.tokens()));
             BEAST_EXPECT(
-                expectOffers(env, bob, 1, {{{XRPAmount{50'074'628}, BTC(50'075129506973)}}}));
+                expectOffers(env, bob_, 1, {{{XRPAmount{50'074'628}, btc(50'075129506973)}}}));
 
-            env.require(balance(carol, BTC(30'100'000'000'000'000)));
+            env.require(Balance(carol_, btc(30'100'000'000'000'000)));
         }
 
         // Individually locked MPT destination account
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
-            BTC.set({.holder = carol, .flags = tfMPTLock});
+            btc.set({.holder = carol_, .flags = tfMPTLock});
 
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                sendmax(BTC(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(tesSUCCESS));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Sendmax(btc(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(tesSUCCESS));
         }
 
         // Individually locked MPT source account
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw, alice, carol);
-            MPTTester BTC(
+            env.fund(XRP(30'000), gw_, alice_, carol_);
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            AMM const ammAlice(env, alice, XRP(10'000), BTC(10'000));
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            AMM const ammAlice(env, alice_, XRP(10'000), btc(10'000));
 
-            BTC.set({.holder = alice, .flags = tfMPTLock});
+            btc.set({.holder = alice_, .flags = tfMPTLock});
 
-            env(pay(alice, carol, BTC(1)),
-                path(~MPT(BTC)),
-                sendmax(XRP(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(tesSUCCESS));
+            env(pay(alice_, carol_, btc(1)),
+                Path(~MPT(btc)),
+                Sendmax(XRP(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(tesSUCCESS));
         }
     }
 
@@ -5445,68 +5462,69 @@ private:
                     STAmount{token1, 5'000'000},
                     0);
                 // Carol places an order to buy LPTokens
-                env(offer(carol, STAmount{token1, 5'000'000}, priceXRP));
+                env(offer(carol_, STAmount{token1, 5'000'000}, priceXRP));
                 // Alice places an order to sell LPTokens
-                env(offer(alice, priceXRP, STAmount{token1, 5'000'000}));
+                env(offer(alice_, priceXRP, STAmount{token1, 5'000'000}));
                 // Pool's LPTokens balance doesn't change
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRP(10'000), MPT(ammAlice[1])(10'000), IOUAmount{10'000'000}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{5'000'000}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(alice, IOUAmount{5'000'000}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{5'000'000}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(alice_, IOUAmount{5'000'000}));
                 // Carol votes
-                ammAlice.vote(carol, 1'000);
+                ammAlice.vote(carol_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(500));
-                ammAlice.vote(carol, 0);
+                ammAlice.vote(carol_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
                 // Carol bids
                 auto const baseFee = env.current()->fees().base;
-                auto const carolXRP = env.balance(carol);
-                env(ammAlice.bid({.account = carol, .bidMin = 100}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{4'999'900}));
+                auto const carolXRP = env.balance(carol_);
+                env(ammAlice.bid({.account = carol_, .bidMin = 100}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{4'999'900}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{100}));
-                BEAST_EXPECT(env.balance(carol) == (carolXRP - baseFee));
+                BEAST_EXPECT(env.balance(carol_) == (carolXRP - baseFee));
                 priceXRP = ammAssetOut(
                     STAmount{XRPAmount{10'000'000'000}},
                     STAmount{token1, 9'999'900},
                     STAmount{token1, 4'999'900},
                     0);
                 // Carol withdraws
-                ammAlice.withdrawAll(carol, XRP(0));
-                BEAST_EXPECT(env.balance(carol) == (carolXRP - baseFee * 2 + priceXRP));
+                ammAlice.withdrawAll(carol_, XRP(0));
+                BEAST_EXPECT(env.balance(carol_) == (carolXRP - baseFee * 2 + priceXRP));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount{10'000'000'000} - priceXRP,
                     MPT(ammAlice[1])(10'000),
                     IOUAmount{5'000'000}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(alice, IOUAmount{5'000'000}));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(alice_, IOUAmount{5'000'000}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
-            {{XRP(10000), AMMMPT(10000)}});
+            {{XRP(10000), gAmmmpt(10000)}});
 
         // Offer crossing with two AMM LPTokens.
         // token1 comes from MPT/XRP pool.
         // token2 comes from XRP/IOU pool.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
-                fund(env, gw, {alice, carol}, {EUR(10'000)}, Fund::TokenOnly);
-                AMM ammAlice1(env, alice, XRP(10'000), EUR(10'000));
-                ammAlice1.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
+                fund(env, gw_, {alice_, carol_}, {EUR(10'000)}, Fund::TokenOnly);
+                AMM ammAlice1(env, alice_, XRP(10'000), EUR(10'000));
+                ammAlice1.deposit(carol_, 1'000'000);
                 auto const token1 = ammAlice.lptIssue();
                 auto const token2 = ammAlice1.lptIssue();
-                env(offer(alice, STAmount{token1, 100}, STAmount{token2, 100}), txflags(tfPassive));
+                env(offer(alice_, STAmount{token1, 100}, STAmount{token2, 100}),
+                    Txflags(tfPassive));
                 env.close();
-                BEAST_EXPECT(expectOffers(env, alice, 1));
-                env(offer(carol, STAmount{token2, 100}, STAmount{token1, 100}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1));
+                env(offer(carol_, STAmount{token2, 100}, STAmount{token1, 100}));
                 env.close();
                 BEAST_EXPECT(
-                    expectHolding(env, alice, STAmount{token1, 10'000'100}) &&
-                    expectHolding(env, alice, STAmount{token2, 9'999'900}));
+                    expectHolding(env, alice_, STAmount{token1, 10'000'100}) &&
+                    expectHolding(env, alice_, STAmount{token2, 9'999'900}));
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{token2, 1'000'100}) &&
-                    expectHolding(env, carol, STAmount{token1, 999'900}));
-                BEAST_EXPECT(expectOffers(env, alice, 0) && expectOffers(env, carol, 0));
+                    expectHolding(env, carol_, STAmount{token2, 1'000'100}) &&
+                    expectHolding(env, carol_, STAmount{token1, 999'900}));
+                BEAST_EXPECT(expectOffers(env, alice_, 0) && expectOffers(env, carol_, 0));
             },
-            {{XRP(10000), AMMMPT(10000)}});
+            {{XRP(10000), gAmmmpt(10000)}});
 
         // LPs pay LPTokens directly. Must trust set because the trust line
         // is checked for the limit, which is 0 in the AMM auto-created
@@ -5514,32 +5532,32 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 auto const token1 = ammAlice.lptIssue();
-                env.trust(STAmount{token1, 2'000'000}, carol);
+                env.trust(STAmount{token1, 2'000'000}, carol_);
                 env.close();
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 BEAST_EXPECT(
-                    ammAlice.expectLPTokens(alice, IOUAmount{10'000'000, 0}) &&
-                    ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
+                    ammAlice.expectLPTokens(alice_, IOUAmount{10'000'000, 0}) &&
+                    ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
                 // Pool balance doesn't change, only tokens moved from
                 // one line to another.
-                env(pay(alice, carol, STAmount{token1, 100}));
+                env(pay(alice_, carol_, STAmount{token1, 100}));
                 env.close();
                 BEAST_EXPECT(
                     // Alice initial token1 10,000,000 - 100
-                    ammAlice.expectLPTokens(alice, IOUAmount{9'999'900, 0}) &&
+                    ammAlice.expectLPTokens(alice_, IOUAmount{9'999'900, 0}) &&
                     // Carol initial token1 1,000,000 + 100
-                    ammAlice.expectLPTokens(carol, IOUAmount{1'000'100, 0}));
+                    ammAlice.expectLPTokens(carol_, IOUAmount{1'000'100, 0}));
 
-                env.trust(STAmount{token1, 20'000'000}, alice);
+                env.trust(STAmount{token1, 20'000'000}, alice_);
                 env.close();
-                env(pay(carol, alice, STAmount{token1, 100}));
+                env(pay(carol_, alice_, STAmount{token1, 100}));
                 env.close();
                 // Back to the original balance
                 BEAST_EXPECT(
-                    ammAlice.expectLPTokens(alice, IOUAmount{10'000'000, 0}) &&
-                    ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
+                    ammAlice.expectLPTokens(alice_, IOUAmount{10'000'000, 0}) &&
+                    ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
             },
-            {{XRP(10000), AMMMPT(10000)}});
+            {{XRP(10000), gAmmmpt(10000)}});
     }
 
     void
@@ -5547,27 +5565,27 @@ private:
     {
         testcase("Amendment");
         using namespace jtx;
-        FeatureBitset const feature{testable_amendments() - featureMPTokensV2};
+        FeatureBitset const feature{testableAmendments() - featureMPTokensV2};
         Env env{*this, feature};
 
-        env.fund(XRP(30'000), gw, alice);
+        env.fund(XRP(30'000), gw_, alice_);
         env.close();
-        MPT const BTC = MPTTester(
+        MPT const btc = MPTTester(
             {.env = env,
-             .issuer = gw,
-             .holders = {alice},
+             .issuer = gw_,
+             .holders = {alice_},
              .pay = 10'000,
              .flags = tfMPTCanClawback | tfMPTCanTransfer});
 
-        AMM amm(env, alice, XRP(1'000), BTC(1'000), ter(temDISABLED));
+        AMM amm(env, alice_, XRP(1'000), btc(1'000), Ter(temDISABLED));
 
-        env(amm.bid({.bidMax = 1000}), ter(temMALFORMED));
-        env(amm.bid({}), ter(temDISABLED));
-        amm.vote(VoteArg{.tfee = 100, .err = ter(temDISABLED)});
-        amm.withdraw(WithdrawArg{.tokens = 100, .err = ter(temMALFORMED)});
-        amm.withdraw(WithdrawArg{.err = ter(temDISABLED)});
-        amm.deposit(DepositArg{.asset1In = USD(100), .err = ter(temDISABLED)});
-        amm.ammDelete(alice, ter(temDISABLED));
+        env(amm.bid({.bidMax = 1000}), Ter(temMALFORMED));
+        env(amm.bid({}), Ter(temDISABLED));
+        amm.vote(VoteArg{.tfee = 100, .err = Ter(temDISABLED)});
+        amm.withdraw(WithdrawArg{.tokens = 100, .err = Ter(temMALFORMED)});
+        amm.withdraw(WithdrawArg{.err = Ter(temDISABLED)});
+        amm.deposit(DepositArg{.asset1In = USD(100), .err = Ter(temDISABLED)});
+        amm.ammDelete(alice_, Ter(temDISABLED));
     }
 
     void
@@ -5576,27 +5594,27 @@ private:
         testcase("AMMAndCLOB, offer quality change");
         using namespace jtx;
         auto const gw = Account("gw");
-        auto const LP1 = Account("LP1");
-        auto const LP2 = Account("LP2");
+        auto const lP1 = Account("LP1");
+        auto const lP2 = Account("LP2");
 
         auto prep = [&](auto const& offerCb, auto const& expectCb) {
             Env env(*this, features);
             env.fund(XRP(30'000'000'000), gw);
-            env.fund(XRP(10'000), LP1);
-            env.fund(XRP(10'000), LP2);
-            MPTTester const TST(
-                {.env = env, .issuer = gw, .holders = {LP1, LP2}, .flags = MPTDEXFlags});
+            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(offer(gw, XRP(11'500'000'000), TST(1'000'000'000'000'000)));
+            env(offer(gw, XRP(11'500'000'000), tst(1'000'000'000'000'000)));
 
-            env(offer(LP1, TST(25'000'000), XRPAmount(287'500'000)));
+            env(offer(lP1, tst(25'000'000), XRPAmount(287'500'000)));
 
             // Either AMM or CLOB offer
-            offerCb(env, TST);
+            offerCb(env, tst);
 
-            env(offer(LP2, TST(25'000'000), XRPAmount(287'500'000)));
+            env(offer(lP2, tst(25'000'000), XRPAmount(287'500'000)));
 
-            expectCb(env, TST);
+            expectCb(env, tst);
         };
 
         // If we replace AMM with an equivalent CLOB offer, which AMM generates
@@ -5606,21 +5624,21 @@ private:
         std::string lp2TakerPays;
         // Execute with AMM first
         prep(
-            [&](Env& env, MPTTester TST) { AMM const amm(env, LP1, TST(25'000'000), XRP(250)); },
-            [&](Env& env, MPTTester TST) {
-                lp2TSTBalance = env.balance(LP2, MPT(TST));
-                auto const offer = getAccountOffers(env, LP2)["offers"][0u];
+            [&](Env& env, MPTTester tst) { AMM const amm(env, lP1, tst(25'000'000), XRP(250)); },
+            [&](Env& env, MPTTester tst) {
+                lp2TSTBalance = env.balance(lP2, MPT(tst));
+                auto const offer = getAccountOffers(env, lP2)["offers"][0u];
                 lp2TakerGets = offer["taker_gets"].asString();
                 lp2TakerPays = offer["taker_pays"]["value"].asString();
             });
         // Execute with CLOB offer
         prep(
-            [&](Env& env, MPTTester TST) {
-                env(offer(LP1, XRPAmount{18'095'131}, TST(1'687'379)), txflags(tfPassive));
+            [&](Env& env, MPTTester tst) {
+                env(offer(lP1, XRPAmount{18'095'131}, tst(1'687'379)), Txflags(tfPassive));
             },
-            [&](Env& env, MPTTester TST) {
-                BEAST_EXPECT(lp2TSTBalance == env.balance(LP2, MPT(TST)));
-                auto const offer = getAccountOffers(env, LP2)["offers"][0u];
+            [&](Env& env, MPTTester tst) {
+                BEAST_EXPECT(lp2TSTBalance == env.balance(lP2, MPT(tst)));
+                auto const offer = getAccountOffers(env, lP2)["offers"][0u];
                 BEAST_EXPECT(lp2TakerGets == offer["taker_gets"].asString());
                 BEAST_EXPECT(lp2TakerPays == offer["taker_pays"]["value"].asString());
             });
@@ -5636,36 +5654,36 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // No fee
-                ammAlice.deposit(carol, MPT(ammAlice[1])(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
-                env.require(balance(carol, MPT(ammAlice[1])(30'000)));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000}));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
+                env.require(Balance(carol_, MPT(ammAlice[1])(30'000)));
                 // Set fee to 1%
-                ammAlice.vote(alice, 1'000);
+                ammAlice.vote(alice_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
 
                 // Carol gets fewer LPToken ~994, because of the single deposit
                 // fee
-                ammAlice.deposit(carol, MPT(ammAlice[1])(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{994'981155689671, -12}));
-                env.require(balance(carol, MPT(ammAlice[1])(27'000)));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{994'981155689671, -12}));
+                env.require(Balance(carol_, MPT(ammAlice[1])(27'000)));
 
                 // Set fee to 0
-                ammAlice.vote(alice, 0);
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.vote(alice_, 0);
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
 
                 // Carol gets back less than the original deposit
                 if (!features[fixAMMv1_3])
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(29'995)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(29'995)));
                 }
                 else
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(29'994)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(29'994)));
                 }
             },
-            {{USD(1000), AMMMPT(1000)}},
+            {{USD(1000), gAmmmpt(1000)}},
             0,
             std::nullopt,
             {features});
@@ -5675,17 +5693,17 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
-                auto const balance = env.balance(carol, MPT(ammAlice[1]));
+                auto const balance = env.balance(carol_, MPT(ammAlice[1]));
                 auto const tokensFee = ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(1000),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 1, -1});
-                auto const deposit = balance - env.balance(carol, MPT(ammAlice[1]));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
-                ammAlice.vote(alice, 0);
+                auto const deposit = balance - env.balance(carol_, MPT(ammAlice[1]));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.deposit(carol, deposit);
+                auto const tokensNoFee = ammAlice.deposit(carol_, deposit);
                 BEAST_EXPECT(tokensFee == IOUAmount(485636'0611129, -7));
                 if (!features[fixAMMv1_3])
                 {
@@ -5696,7 +5714,7 @@ private:
                     BEAST_EXPECT(tokensNoFee == IOUAmount(487612'21584827, -8));
                 }
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             1'000,
             std::nullopt,
             {features});
@@ -5706,17 +5724,17 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
-                auto const balance = env.balance(carol, MPT(ammAlice[1]));
+                auto const balance = env.balance(carol_, MPT(ammAlice[1]));
                 auto const tokensFee = ammAlice.deposit(
-                    carol,
+                    carol_,
                     MPT(ammAlice[1])(200),
                     std::nullopt,
                     STAmount{ammAlice.lptIssue(), 2020, -6});
-                auto const deposit = balance - env.balance(carol, MPT(ammAlice[1]));
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
-                ammAlice.vote(alice, 0);
+                auto const deposit = balance - env.balance(carol_, MPT(ammAlice[1]));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.deposit(carol, deposit);
+                auto const tokensNoFee = ammAlice.deposit(carol_, deposit);
                 if (!features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(tokensFee == IOUAmount(98'019'80198019, -8));
@@ -5728,7 +5746,7 @@ private:
                     BEAST_EXPECT(tokensNoFee == IOUAmount(98000'10293049, -8));
                 }
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             1'000,
             std::nullopt,
             {features});
@@ -5737,24 +5755,24 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // No fee
-                ammAlice.deposit(carol, MPT(ammAlice[1])(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
-                env.require(balance(carol, MPT(ammAlice[1])(27'000)));
+                ammAlice.deposit(carol_, MPT(ammAlice[1])(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000}));
+                env.require(Balance(carol_, MPT(ammAlice[1])(27'000)));
                 // Set fee to 1%
-                ammAlice.vote(alice, 1'000);
+                ammAlice.vote(alice_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
                 // Single withdrawal. Carol gets ~5USD less than deposited.
-                ammAlice.withdrawAll(carol, MPT(ammAlice[1])(0));
+                ammAlice.withdrawAll(carol_, MPT(ammAlice[1])(0));
                 if (!features[fixAMMv1_3])
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(29'995)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(29'995)));
                 }
                 else
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(29'994)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(29'994)));
                 }
             },
-            {{USD(1000), AMMMPT(1000)}},
+            {{USD(1000), gAmmmpt(1000)}},
             0,
             std::nullopt,
             {features});
@@ -5762,31 +5780,31 @@ private:
         // Withdraw with EPrice limit, 1% fee.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 auto const tokensFee = ammAlice.withdraw(
-                    carol, MPT(ammAlice[1])(100), std::nullopt, IOUAmount{520, 0});
-                env.require(balance(carol, MPT(ammAlice[1])(30443)));
+                    carol_, MPT(ammAlice[1])(100), std::nullopt, IOUAmount{520, 0});
+                env.require(Balance(carol_, MPT(ammAlice[1])(30443)));
 
                 // Set to original pool size
                 auto const deposit =
-                    env.balance(carol, MPT(ammAlice[1])) - MPT(ammAlice[1])(29'000);
-                ammAlice.deposit(carol, deposit);
+                    env.balance(carol_, MPT(ammAlice[1])) - MPT(ammAlice[1])(29'000);
+                ammAlice.deposit(carol_, deposit);
                 // fee 0%
-                ammAlice.vote(alice, 0);
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.withdraw(carol, deposit);
+                auto const tokensNoFee = ammAlice.withdraw(carol_, deposit);
                 if (!features[fixAMMv1_3])
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(30443)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(30443)));
                 }
                 else
                 {
-                    env.require(balance(carol, MPT(ammAlice[1])(30442)));
+                    env.require(Balance(carol_, MPT(ammAlice[1])(30442)));
                 }
                 BEAST_EXPECT(tokensNoFee == IOUAmount(746'327'46496649, -8));
                 BEAST_EXPECT(tokensFee == IOUAmount(750'588'23529411, -8));
             },
-            {{XRP(10'000), AMMMPT(10'000)}},
+            {{XRP(10'000), gAmmmpt(10'000)}},
             1'000,
             std::nullopt,
             {features});
@@ -5794,83 +5812,86 @@ private:
         // Payment, 1% fee
         {
             Env env{*this, features};
-            env.fund(XRP(30'000), gw, alice, bob, carol);
+            env.fund(XRP(30'000), gw_, alice_, bob_, carol_);
             env.close();
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_},
                  .pay = 30'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            auto const USD = gw["USD"];
-            env.trust(USD(30'000), alice);
-            env(pay(gw, alice, USD(30'000)));
-            env.trust(USD(30'000), bob);
-            env(pay(gw, bob, USD(1'000)));
-            env.trust(USD(30'000), carol);
-            env(pay(gw, carol, USD(30'000)));
+            auto const usd = gw_["USD"];
+            env.trust(usd(30'000), alice_);
+            env(pay(gw_, alice_, usd(30'000)));
+            env.trust(usd(30'000), bob_);
+            env(pay(gw_, bob_, usd(1'000)));
+            env.trust(usd(30'000), carol_);
+            env(pay(gw_, carol_, usd(30'000)));
             env.close();
 
-            AMM amm(env, alice, BTC(1000), USD(1010));
+            AMM amm(env, alice_, btc(1000), usd(1010));
 
-            env.require(balance(alice, BTC(29'000)));
-            env.require(balance(alice, USD(28'990)));
-            env.require(balance(carol, BTC(30'000)));
+            env.require(Balance(alice_, btc(29'000)));
+            env.require(Balance(alice_, usd(28'990)));
+            env.require(Balance(carol_, btc(30'000)));
 
             // Carol pays to Alice with no fee
-            env(pay(carol, alice, USD(10)),
-                path(~USD),
-                sendmax(BTC(10)),
-                txflags(tfNoRippleDirect));
+            env(pay(carol_, alice_, usd(10)),
+                Path(~usd),
+                Sendmax(btc(10)),
+                Txflags(tfNoRippleDirect));
             env.close();
 
             // Alice has 10USD more and Carol has 10BTC less
-            env.require(balance(alice, BTC(29'000)));
-            env.require(balance(alice, USD(29'000)));
-            env.require(balance(carol, BTC(29'990)));
+            env.require(Balance(alice_, btc(29'000)));
+            env.require(Balance(alice_, usd(29'000)));
+            env.require(Balance(carol_, btc(29'990)));
 
             // Set fee to 1%
-            amm.vote(alice, 1'000);
+            amm.vote(alice_, 1'000);
             BEAST_EXPECT(amm.expectTradingFee(1'000));
             // Bob pays to Carol with 1% fee
-            env(pay(bob, carol, BTC(10)), path(~BTC), sendmax(USD(15)), txflags(tfNoRippleDirect));
+            env(pay(bob_, carol_, btc(10)),
+                Path(~btc),
+                Sendmax(usd(15)),
+                Txflags(tfNoRippleDirect));
             env.close();
             // Bob sends 10.1~USD to pay 10BTC
-            env.require(balance(bob, STAmount{USD, UINT64_C(989'8989898989899), -13}));
+            env.require(Balance(bob_, STAmount{usd, UINT64_C(989'8989898989899), -13}));
             // Carol got 10BTC
-            env.require(balance(carol, BTC(30'000)));
+            env.require(Balance(carol_, btc(30'000)));
             BEAST_EXPECT(amm.expectBalances(
-                BTC(1'000), STAmount{USD, UINT64_C(1'010'10101010101), -11}, amm.tokens()));
+                btc(1'000), STAmount{usd, UINT64_C(1'010'10101010101), -11}, amm.tokens()));
         }
 
         // Offer crossing, 0.05% fee MPT/XRP
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const BTC = MPT(ammAlice[1]);
-                auto const carolXRP = env.balance(carol);
+                auto const btc = MPT(ammAlice[1]);
+                auto const carolXRP = env.balance(carol_);
                 auto const baseFee = env.current()->fees().base;
-                env(offer(carol, BTC(10), XRP(10)));
+                env(offer(carol_, btc(10), XRP(10)));
                 env.close();
-                env.require(balance(carol, BTC(30'010)));
-                env.require(balance(carol, carolXRP - baseFee - XRP(10)));
+                env.require(Balance(carol_, btc(30'010)));
+                env.require(Balance(carol_, carolXRP - baseFee - XRP(10)));
 
                 // Change pool composition back
-                env(offer(carol, XRP(10), BTC(10)));
+                env(offer(carol_, XRP(10), btc(10)));
                 env.close();
-                env.require(balance(carol, BTC(30'000)));
-                env.require(balance(carol, carolXRP - baseFee * 2));
+                env.require(Balance(carol_, btc(30'000)));
+                env.require(Balance(carol_, carolXRP - baseFee * 2));
 
                 // set fee to 0.05%
-                ammAlice.vote(alice, 50);
+                ammAlice.vote(alice_, 50);
                 BEAST_EXPECT(ammAlice.expectTradingFee(50));
-                env(offer(carol, BTC(10), XRP(10)));
+                env(offer(carol_, btc(10), XRP(10)));
                 env.close();
-                env.require(balance(carol, BTC(30'009)));
-                env.require(balance(carol, carolXRP - baseFee * 3 - XRPAmount(8'995'507)));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{BTC(1), XRP(1)}}}));
+                env.require(Balance(carol_, btc(30'009)));
+                env.require(Balance(carol_, carolXRP - baseFee * 3 - XRPAmount(8'995'507)));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{btc(1), XRP(1)}}}));
             },
-            {{XRP(1000), AMMMPT(1010)}},
+            {{XRP(1000), gAmmmpt(1010)}},
             0,
             std::nullopt,
             {features});
@@ -5878,32 +5899,32 @@ private:
         // Offer crossing, 0.5% fee MPT/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const BTC = MPT(ammAlice[1]);
-                env(offer(carol, BTC(10'000'000), USD(10)));
+                auto const btc = MPT(ammAlice[1]);
+                env(offer(carol_, btc(10'000'000), USD(10)));
                 env.close();
-                env.require(balance(carol, BTC(1'020'001'000)));
-                env.require(balance(carol, USD(29'990)));
+                env.require(Balance(carol_, btc(1'020'001'000)));
+                env.require(Balance(carol_, USD(29'990)));
 
                 // Change pool composition back
-                env(offer(carol, USD(10), BTC(10'000'000)));
+                env(offer(carol_, USD(10), btc(10'000'000)));
                 env.close();
-                env.require(balance(carol, BTC(1'010'001'000)));
-                env.require(balance(carol, USD(30'000)));
+                env.require(Balance(carol_, btc(1'010'001'000)));
+                env.require(Balance(carol_, USD(30'000)));
 
                 // set fee to 0.5%
-                ammAlice.vote(alice, 500);
+                ammAlice.vote(alice_, 500);
                 BEAST_EXPECT(ammAlice.expectTradingFee(500));
-                env(offer(carol, BTC(10'000'000), USD(10)));
+                env(offer(carol_, btc(10'000'000), USD(10)));
                 env.close();
-                env.require(balance(carol, BTC(1'014'975'874)));
-                env.require(balance(carol, STAmount{USD, UINT64_C(29'995'02512600184), -11}));
+                env.require(Balance(carol_, btc(1'014'975'874)));
+                env.require(Balance(carol_, STAmount{USD, UINT64_C(29'995'02512600184), -11}));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    carol,
+                    carol_,
                     1,
-                    {{Amounts{BTC(5'025126), STAmount{USD, UINT64_C(5'025126), -6}}}}));
+                    {{Amounts{btc(5'025126), STAmount{USD, UINT64_C(5'025126), -6}}}}));
             },
-            {{USD(1000), AMMMPT(1010000000)}},
+            {{USD(1000), gAmmmpt(1010000000)}},
             0,
             std::nullopt,
             {features});
@@ -5915,28 +5936,28 @@ private:
         {
             Env env{*this, features};
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(30'000), {USD(2'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(30'000), {USD(2'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(carol, BTC(5'000000), USD(5)));
-            AMM const ammAlice(env, alice, USD(1'005), BTC(1'000'000000));
-            env(pay(bob, ed, USD(10)),
-                path(~USD),
-                sendmax(BTC(15'000000)),
-                txflags(tfNoRippleDirect));
+            env(offer(carol_, btc(5'000000), USD(5)));
+            AMM const ammAlice(env, alice_, USD(1'005), btc(1'000'000000));
+            env(pay(bob_, ed, USD(10)),
+                Path(~USD),
+                Sendmax(btc(15'000000)),
+                Txflags(tfNoRippleDirect));
 
-            env.require(balance(ed, USD(2'010)));
-            env.require(balance(bob, BTC(29'989'999999)));
+            env.require(Balance(ed, USD(2'010)));
+            env.require(Balance(bob_, btc(29'989'999999)));
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(1'005'000001),
+                btc(1'005'000001),
                 STAmount{USD, UINT64_C(999'9999999999999), -13},
                 ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. Same as above but with 0.25%
@@ -5944,25 +5965,25 @@ private:
         {
             Env env{*this, features};
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(30'000), {USD(2'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(30'000), {USD(2'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(carol, BTC(5'000000), USD(5)));
+            env(offer(carol_, btc(5'000000), USD(5)));
             // Set 0.25% fee
-            AMM const ammAlice(env, alice, USD(1'005), BTC(1'000'000000), false, 250);
-            env(pay(bob, ed, USD(10)),
-                path(~USD),
-                sendmax(BTC(15'000000)),
-                txflags(tfNoRippleDirect));
-            env.require(balance(ed, USD(2'010)));
-            env.require(balance(bob, BTC(29'989'987453)));
-            BEAST_EXPECT(ammAlice.expectBalances(BTC(1'005'012547), USD(1'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            AMM const ammAlice(env, alice_, USD(1'005), btc(1'000'000000), false, 250);
+            env(pay(bob_, ed, USD(10)),
+                Path(~USD),
+                Sendmax(btc(15'000000)),
+                Txflags(tfNoRippleDirect));
+            env.require(Balance(ed, USD(2'010)));
+            env.require(Balance(bob_, btc(29'989'987453)));
+            BEAST_EXPECT(ammAlice.expectBalances(btc(1'005'012547), USD(1'000), ammAlice.tokens()));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. AMM has a better
@@ -5971,25 +5992,25 @@ private:
         {
             Env env{*this, features};
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(30'000), {USD(2'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(30'000), {USD(2'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(carol, BTC(10'000000), USD(10)));
+            env(offer(carol_, btc(10'000000), USD(10)));
             // Set 1% fee
-            AMM const ammAlice(env, alice, USD(1'005), BTC(1'000'000000), false, 1'000);
-            env(pay(bob, ed, USD(10)),
-                path(~USD),
-                sendmax(BTC(15'000000)),
-                txflags(tfNoRippleDirect));
-            env.require(balance(ed, USD(2'010)));
-            env.require(balance(bob, BTC(29'990'000000)));
-            BEAST_EXPECT(ammAlice.expectBalances(BTC(1'000'000000), USD(1'005), ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            AMM const ammAlice(env, alice_, USD(1'005), btc(1'000'000000), false, 1'000);
+            env(pay(bob_, ed, USD(10)),
+                Path(~USD),
+                Sendmax(btc(15'000000)),
+                Txflags(tfNoRippleDirect));
+            env.require(Balance(ed, USD(2'010)));
+            env.require(Balance(bob_, btc(29'990'000000)));
+            BEAST_EXPECT(ammAlice.expectBalances(btc(1'000'000000), USD(1'005), ammAlice.tokens()));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. AMM has a better
@@ -5999,25 +6020,25 @@ private:
         {
             Env env{*this, features};
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(30'000), {USD(2'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(30'000), {USD(2'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .pay = 30'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(carol, BTC(9'000000), USD(9)));
+            env(offer(carol_, btc(9'000000), USD(9)));
             // Set 1% fee
-            AMM const ammAlice(env, alice, USD(1'005), BTC(1'000'000000), false, 1'000);
-            env(pay(bob, ed, USD(10)),
-                path(~USD),
-                sendmax(BTC(15'000000)),
-                txflags(tfNoRippleDirect));
-            env.require(balance(ed, USD(2'010)));
-            env.require(balance(bob, BTC(29'989'993923)));
-            BEAST_EXPECT(ammAlice.expectBalances(BTC(1'001'006077), USD(1'004), ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            AMM const ammAlice(env, alice_, USD(1'005), btc(1'000'000000), false, 1'000);
+            env(pay(bob_, ed, USD(10)),
+                Path(~USD),
+                Sendmax(btc(15'000000)),
+                Txflags(tfNoRippleDirect));
+            env.require(Balance(ed, USD(2'010)));
+            env.require(Balance(bob_, btc(29'989'993923)));
+            BEAST_EXPECT(ammAlice.expectBalances(btc(1'001'006077), USD(1'004), ammAlice.tokens()));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
     }
 
@@ -6046,76 +6067,76 @@ private:
             env.fund(XRP(100000), gw, alice, bob, carol, ed, paul, dan, chris, simon, ben, natalie);
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = holders,
                  .pay = 40'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             for (auto const& holder : holders)
             {
-                env.trust(USD(1'500'000), holder);
-                env(pay(gw, holder, USD(1'500'000)));
+                env.trust(usd(1'500'000), holder);
+                env(pay(gw, holder, usd(1'500'000)));
             }
             env.close();
 
-            auto aliceUSD = env.balance(alice, USD);
-            auto bobUSD = env.balance(bob, USD);
-            auto carolUSD = env.balance(carol, USD);
-            auto edUSD = env.balance(ed, USD);
-            auto paulUSD = env.balance(paul, USD);
-            auto danUSD = env.balance(dan, USD);
-            auto chrisUSD = env.balance(chris, USD);
-            auto simonUSD = env.balance(simon, USD);
-            auto benUSD = env.balance(ben, USD);
-            auto natalieUSD = env.balance(natalie, USD);
+            auto aliceUSD = env.balance(alice, usd);
+            auto bobUSD = env.balance(bob, usd);
+            auto carolUSD = env.balance(carol, usd);
+            auto edUSD = env.balance(ed, usd);
+            auto paulUSD = env.balance(paul, usd);
+            auto danUSD = env.balance(dan, usd);
+            auto chrisUSD = env.balance(chris, usd);
+            auto simonUSD = env.balance(simon, usd);
+            auto benUSD = env.balance(ben, usd);
+            auto natalieUSD = env.balance(natalie, usd);
 
-            AMM ammAlice(env, alice, BTC(10'000'000000), USD(10000));
+            AMM ammAlice(env, alice, btc(10'000'000000), usd(10000));
             BEAST_EXPECT(
-                ammAlice.expectBalances(BTC(10'000'000000), USD(10'000), IOUAmount{10'000'000}));
+                ammAlice.expectBalances(btc(10'000'000000), usd(10'000), IOUAmount{10'000'000}));
 
             for (int i = 0; i < 10; ++i)
             {
-                ammAlice.deposit(ben, STAmount{USD, 1, -10});
-                ammAlice.withdrawAll(ben, USD(0));
-                ammAlice.deposit(simon, USD(0.1));
-                ammAlice.withdrawAll(simon, USD(0));
-                ammAlice.deposit(chris, USD(1));
-                ammAlice.withdrawAll(chris, USD(0));
-                ammAlice.deposit(dan, USD(10));
-                ammAlice.withdrawAll(dan, USD(0));
-                ammAlice.deposit(bob, USD(100));
-                ammAlice.withdrawAll(bob, USD(0));
-                ammAlice.deposit(carol, USD(1'000));
-                ammAlice.withdrawAll(carol, USD(0));
-                ammAlice.deposit(ed, USD(10'000));
-                ammAlice.withdrawAll(ed, USD(0));
-                ammAlice.deposit(paul, USD(100'000));
-                ammAlice.withdrawAll(paul, USD(0));
-                ammAlice.deposit(natalie, USD(1'000'000));
-                ammAlice.withdrawAll(natalie, USD(0));
+                ammAlice.deposit(ben, STAmount{usd, 1, -10});
+                ammAlice.withdrawAll(ben, usd(0));
+                ammAlice.deposit(simon, usd(0.1));
+                ammAlice.withdrawAll(simon, usd(0));
+                ammAlice.deposit(chris, usd(1));
+                ammAlice.withdrawAll(chris, usd(0));
+                ammAlice.deposit(dan, usd(10));
+                ammAlice.withdrawAll(dan, usd(0));
+                ammAlice.deposit(bob, usd(100));
+                ammAlice.withdrawAll(bob, usd(0));
+                ammAlice.deposit(carol, usd(1'000));
+                ammAlice.withdrawAll(carol, usd(0));
+                ammAlice.deposit(ed, usd(10'000));
+                ammAlice.withdrawAll(ed, usd(0));
+                ammAlice.deposit(paul, usd(100'000));
+                ammAlice.withdrawAll(paul, usd(0));
+                ammAlice.deposit(natalie, usd(1'000'000));
+                ammAlice.withdrawAll(natalie, usd(0));
             }
 
             BEAST_EXPECT(ammAlice.expectBalances(
-                BTC(10'000'000000),
-                STAmount{USD, UINT64_C(10000'0000000001), -10},
+                btc(10'000'000000),
+                STAmount{usd, UINT64_C(10000'0000000001), -10},
                 IOUAmount{10'000'000}));
 
-            env.require(balance(bob, bobUSD));
-            env.require(balance(carol, carolUSD));
-            env.require(balance(ed, edUSD));
-            env.require(balance(paul, paulUSD));
-            env.require(balance(dan, danUSD));
-            env.require(balance(chris, chrisUSD));
-            env.require(balance(simon, simonUSD));
-            env.require(balance(ben, benUSD));
-            env.require(balance(natalie, natalieUSD));
+            env.require(Balance(bob, bobUSD));
+            env.require(Balance(carol, carolUSD));
+            env.require(Balance(ed, edUSD));
+            env.require(Balance(paul, paulUSD));
+            env.require(Balance(dan, danUSD));
+            env.require(Balance(chris, chrisUSD));
+            env.require(Balance(simon, simonUSD));
+            env.require(Balance(ben, benUSD));
+            env.require(Balance(natalie, natalieUSD));
 
             ammAlice.withdrawAll(alice);
             BEAST_EXPECT(!ammAlice.ammExists());
-            env.require(balance(alice, aliceUSD));
+            env.require(Balance(alice, aliceUSD));
         }
 
         // Same as above but deposit/withdraw MPT from USD/MPT pool
@@ -6137,74 +6158,74 @@ private:
             env.fund(XRP(100000), gw, alice, bob, carol, ed, paul, dan, chris, simon, ben, natalie);
             env.close();
 
-            MPT const BTC = MPTTester(
+            MPT const btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = holders,
                  .pay = 40'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             for (auto const& holder : holders)
             {
-                env.trust(USD(1'500'000), holder);
-                env(pay(gw, holder, USD(1'500'000)));
+                env.trust(usd(1'500'000), holder);
+                env(pay(gw, holder, usd(1'500'000)));
             }
             env.close();
 
-            auto aliceBTC = env.balance(alice, BTC);
-            auto bobBTC = env.balance(bob, BTC);
-            auto carolBTC = env.balance(carol, BTC);
-            auto edBTC = env.balance(ed, BTC);
-            auto paulBTC = env.balance(paul, BTC);
-            auto danBTC = env.balance(dan, BTC);
-            auto chrisBTC = env.balance(chris, BTC);
-            auto simonBTC = env.balance(simon, BTC);
-            auto benBTC = env.balance(ben, BTC);
-            auto natalieBTC = env.balance(natalie, BTC);
+            auto aliceBTC = env.balance(alice, btc);
+            auto bobBTC = env.balance(bob, btc);
+            auto carolBTC = env.balance(carol, btc);
+            auto edBTC = env.balance(ed, btc);
+            auto paulBTC = env.balance(paul, btc);
+            auto danBTC = env.balance(dan, btc);
+            auto chrisBTC = env.balance(chris, btc);
+            auto simonBTC = env.balance(simon, btc);
+            auto benBTC = env.balance(ben, btc);
+            auto natalieBTC = env.balance(natalie, btc);
 
-            AMM ammAlice(env, alice, BTC(10'000'000000), USD(10000));
+            AMM ammAlice(env, alice, btc(10'000'000000), usd(10000));
             BEAST_EXPECT(
-                ammAlice.expectBalances(BTC(10'000'000000), USD(10'000), IOUAmount{10'000'000}));
+                ammAlice.expectBalances(btc(10'000'000000), usd(10'000), IOUAmount{10'000'000}));
 
             for (int i = 0; i < 10; ++i)
             {
-                ammAlice.deposit(ben, BTC(1));
-                ammAlice.withdrawAll(ben, BTC(0));
-                ammAlice.deposit(simon, BTC(1'000));
-                ammAlice.withdrawAll(simon, BTC(0));
-                ammAlice.deposit(chris, BTC(1));
-                ammAlice.withdrawAll(chris, BTC(0));
-                ammAlice.deposit(dan, BTC(10));
-                ammAlice.withdrawAll(dan, BTC(0));
-                ammAlice.deposit(bob, BTC(100));
-                ammAlice.withdrawAll(bob, BTC(0));
-                ammAlice.deposit(carol, BTC(1'000));
-                ammAlice.withdrawAll(carol, BTC(0));
-                ammAlice.deposit(ed, BTC(10'000));
-                ammAlice.withdrawAll(ed, BTC(0));
-                ammAlice.deposit(paul, BTC(100'000));
-                ammAlice.withdrawAll(paul, BTC(0));
-                ammAlice.deposit(natalie, BTC(1'000'000));
-                ammAlice.withdrawAll(natalie, BTC(0));
+                ammAlice.deposit(ben, btc(1));
+                ammAlice.withdrawAll(ben, btc(0));
+                ammAlice.deposit(simon, btc(1'000));
+                ammAlice.withdrawAll(simon, btc(0));
+                ammAlice.deposit(chris, btc(1));
+                ammAlice.withdrawAll(chris, btc(0));
+                ammAlice.deposit(dan, btc(10));
+                ammAlice.withdrawAll(dan, btc(0));
+                ammAlice.deposit(bob, btc(100));
+                ammAlice.withdrawAll(bob, btc(0));
+                ammAlice.deposit(carol, btc(1'000));
+                ammAlice.withdrawAll(carol, btc(0));
+                ammAlice.deposit(ed, btc(10'000));
+                ammAlice.withdrawAll(ed, btc(0));
+                ammAlice.deposit(paul, btc(100'000));
+                ammAlice.withdrawAll(paul, btc(0));
+                ammAlice.deposit(natalie, btc(1'000'000));
+                ammAlice.withdrawAll(natalie, btc(0));
             }
 
             BEAST_EXPECT(
-                ammAlice.expectBalances(BTC(10'000'000090), USD(10'000), IOUAmount{10'000'000}));
+                ammAlice.expectBalances(btc(10'000'000090), usd(10'000), IOUAmount{10'000'000}));
 
-            env.require(balance(bob, bobBTC - BTC(10)));
-            env.require(balance(carol, carolBTC - BTC(10)));
-            env.require(balance(ed, edBTC - BTC(10)));
-            env.require(balance(paul, paulBTC - BTC(10)));
-            env.require(balance(dan, danBTC - BTC(10)));
-            env.require(balance(chris, chrisBTC - BTC(10)));
-            env.require(balance(simon, simonBTC - BTC(10)));
-            env.require(balance(ben, benBTC - BTC(10)));
-            env.require(balance(natalie, natalieBTC - BTC(10)));
+            env.require(Balance(bob, bobBTC - btc(10)));
+            env.require(Balance(carol, carolBTC - btc(10)));
+            env.require(Balance(ed, edBTC - btc(10)));
+            env.require(Balance(paul, paulBTC - btc(10)));
+            env.require(Balance(dan, danBTC - btc(10)));
+            env.require(Balance(chris, chrisBTC - btc(10)));
+            env.require(Balance(simon, simonBTC - btc(10)));
+            env.require(Balance(ben, benBTC - btc(10)));
+            env.require(Balance(natalie, natalieBTC - btc(10)));
 
             ammAlice.withdrawAll(alice);
             BEAST_EXPECT(!ammAlice.ammExists());
-            env.require(balance(alice, aliceBTC + BTC(90)));
+            env.require(Balance(alice, aliceBTC + btc(90)));
         }
     }
 
@@ -6233,9 +6254,9 @@ private:
                     fail();
                 }
 
-                amm.deposit(carol, 1'000);
+                amm.deposit(carol_, 1'000);
 
-                auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+                auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
                 try
                 {
                     bool found = false;
@@ -6260,7 +6281,7 @@ private:
                     fail();
                 }
             },
-            {{XRP(1000), AMMMPT(1000'000)}});
+            {{XRP(1000), gAmmmpt(1000'000)}});
     }
 
     void
@@ -6283,41 +6304,41 @@ private:
         };
 
         auto prep = [&](Env& env, uint16_t gwTransferFee, uint16_t gw1TransferFee) -> MPTList {
-            env.fund(XRP(2'000), gw, gw1, alice, bob, carol, ed);
-            MPTTester USD(
+            env.fund(XRP(2'000), gw_, gw1, alice_, bob_, carol_, ed);
+            MPTTester usd(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, bob, carol, ed},
+                 .issuer = gw_,
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gwTransferFee,
                  .pay = 2'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester ETH(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw1,
-                 .holders = {alice, bob, carol, ed},
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gw1TransferFee,
                  .pay = 2'000'000'000,
-                 .flags = MPTDEXFlags});
-            MPTTester CAN(
+                 .flags = kMPT_DEX_FLAGS});
+            MPTTester can(
                 {.env = env,
                  .issuer = gw1,
-                 .holders = {alice, bob, carol, ed},
+                 .holders = {alice_, bob_, carol_, ed},
                  .transferFee = gw1TransferFee,
                  .pay = 2'000'000'000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
             env.close();
 
             return MPTList{
-                .USD = std::move(USD),
-                .ETH = std::move(ETH),
-                .CAN = std::move(CAN),
+                .USD = std::move(usd),
+                .ETH = std::move(eth),
+                .CAN = std::move(can),
             };
         };
 
-        std::uint32_t constexpr lowRate = 10'000;
-        std::uint32_t constexpr highRate = 50'000;
+        std::uint32_t constexpr kLOW_RATE = 10'000;
+        std::uint32_t constexpr kHIGH_RATE = 50'000;
         for (auto const& rates :
-             {std::make_pair(lowRate, highRate), std::make_pair(highRate, lowRate)})
+             {std::make_pair(kLOW_RATE, kHIGH_RATE), std::make_pair(kHIGH_RATE, kLOW_RATE)})
         {
             // Offer Selection
 
@@ -6335,21 +6356,21 @@ private:
                 {
                     Env env(*this, features);
                     auto mpts = prep(env, rates.first, rates.second);
-                    auto USD = mpts.USD;
-                    auto ETH = mpts.ETH;
-                    auto CAN = mpts.CAN;
+                    auto usd = mpts.USD;
+                    auto eth = mpts.ETH;
+                    auto can = mpts.CAN;
                     std::optional<AMM> amm;
 
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400'000'000), USD(400'000'000)), txflags(tfPassive));
+                        env(offer(ed, eth(400'000'000), usd(400'000'000)), Txflags(tfPassive));
                         env.close();
                     }
                     if (i > 0)
-                        amm.emplace(env, ed, USD(1'000'000'000), ETH(1'000'000'000));
-                    env(pay(carol, bob, USD(100'000'000)),
-                        path(~MPT(USD)),
-                        sendmax(ETH(500'000'000)));
+                        amm.emplace(env, ed, usd(1'000'000'000), eth(1'000'000'000));
+                    env(pay(carol_, bob_, usd(100'000'000)),
+                        Path(~MPT(usd)),
+                        Sendmax(eth(500'000'000)));
                     env.close();
                     // CLOB and AMM, AMM is not selected
                     if (i == 2)
@@ -6357,14 +6378,14 @@ private:
                         // NOLINTBEGIN(bugprone-unchecked-optional-access) i==2 implies amm is
                         // emplaced (i>0)
                         BEAST_EXPECT(amm->expectBalances(
-                            USD(1'000'000'000), ETH(1'000'000'000), amm->tokens()));
+                            usd(1'000'000'000), eth(1'000'000'000), amm->tokens()));
                         // NOLINTEND(bugprone-unchecked-optional-access)
                     }
-                    env.require(balance(bob, USD(2'100'000'000)));
+                    env.require(Balance(bob_, usd(2'100'000'000)));
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000'000'000) - env.balance(carol, MPT(ETH)),
-                            env.balance(bob, MPT(USD)) - USD(2'000'000'000)});
+                            eth(2'000'000'000) - env.balance(carol_, MPT(eth)),
+                            env.balance(bob_, MPT(usd)) - usd(2'000'000'000)});
                 }
                 // CLOB is better quality than AMM
                 BEAST_EXPECT(q[0] > q[1]);
@@ -6380,37 +6401,37 @@ private:
             {
                 Env env(*this, features);
                 auto mpts = prep(env, rates.first, rates.second);
-                auto USD = mpts.USD;
-                auto ETH = mpts.ETH;
-                auto CAN = mpts.CAN;
+                auto usd = mpts.USD;
+                auto eth = mpts.ETH;
+                auto can = mpts.CAN;
                 std::optional<AMM> amm;
                 if (i == 0 || i == 2)
                 {
-                    env(offer(ed, ETH(400'000'000), USD(400'000'000)), txflags(tfPassive));
+                    env(offer(ed, eth(400'000'000), usd(400'000'000)), Txflags(tfPassive));
                     env.close();
                 }
                 if (i > 0)
-                    amm.emplace(env, ed, USD(1'000'000'000), ETH(1'000'000'000));
-                env(offer(alice, USD(400'000'000), ETH(400'000'000)));
+                    amm.emplace(env, ed, usd(1'000'000'000), eth(1'000'000'000));
+                env(offer(alice_, usd(400'000'000), eth(400'000'000)));
                 env.close();
                 // AMM is not selected
                 if (i > 0)
                 {
                     // NOLINTBEGIN(bugprone-unchecked-optional-access) emplaced when i > 0
                     BEAST_EXPECT(
-                        amm->expectBalances(USD(1'000'000'000), ETH(1'000'000'000), amm->tokens()));
+                        amm->expectBalances(usd(1'000'000'000), eth(1'000'000'000), amm->tokens()));
                     // NOLINTEND(bugprone-unchecked-optional-access)
                 }
                 if (i == 0 || i == 2)
                 {
                     // Fully crosses
-                    BEAST_EXPECT(expectOffers(env, alice, 0));
+                    BEAST_EXPECT(expectOffers(env, alice_, 0));
                 }
                 // Fails to cross because AMM is not selected
                 else
                 {
-                    BEAST_EXPECT(
-                        expectOffers(env, alice, 1, {Amounts{USD(400'000'000), ETH(400'000'000)}}));
+                    BEAST_EXPECT(expectOffers(
+                        env, alice_, 1, {Amounts{usd(400'000'000), eth(400'000'000)}}));
                 }
                 BEAST_EXPECT(expectOffers(env, ed, 0));
             }
@@ -6425,41 +6446,41 @@ private:
                 {
                     Env env(*this, features);
                     auto mpts = prep(env, rates.first, rates.second);
-                    auto USD = mpts.USD;
-                    auto ETH = mpts.ETH;
-                    auto CAN = mpts.CAN;
+                    auto usd = mpts.USD;
+                    auto eth = mpts.ETH;
+                    auto can = mpts.CAN;
                     std::optional<AMM> amm;
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400'000'000), USD(330'000'000)), txflags(tfPassive));
+                        env(offer(ed, eth(400'000'000), usd(330'000'000)), Txflags(tfPassive));
                         env.close();
                     }
                     if (i > 0)
-                        amm.emplace(env, ed, USD(1'000'000'000), ETH(1'000'000'000));
-                    env(pay(carol, bob, USD(100'000'000)),
-                        path(~MPT(USD)),
-                        sendmax(ETH(500'000'000)));
+                        amm.emplace(env, ed, usd(1'000'000'000), eth(1'000'000'000));
+                    env(pay(carol_, bob_, usd(100'000'000)),
+                        Path(~MPT(usd)),
+                        Sendmax(eth(500'000'000)));
                     env.close();
                     // AMM and CLOB are selected
                     if (i > 0)
                     {
                         // NOLINTBEGIN(bugprone-unchecked-optional-access) emplaced when i > 0
                         BEAST_EXPECT(!amm->expectBalances(
-                            USD(1'000'000'000), ETH(1'000'000'000), amm->tokens()));
+                            usd(1'000'000'000), eth(1'000'000'000), amm->tokens()));
                         // NOLINTEND(bugprone-unchecked-optional-access)
                     }
 
                     if (i == 2)
                     {
-                        if (rates.first == lowRate)
+                        if (rates.first == kLOW_RATE)
                         {
                             BEAST_EXPECT(expectOffers(
                                 env,
                                 ed,
                                 1,
                                 {{Amounts{
-                                    ETH(377'824'111),
-                                    USD(311'704'892),
+                                    eth(377'824'111),
+                                    usd(311'704'892),
                                 }}}));
                         }
                         else
@@ -6469,16 +6490,16 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    ETH(329'339'263),
-                                    USD(271'704'892),
+                                    eth(329'339'263),
+                                    usd(271'704'892),
                                 }}}));
                         }
                     }
-                    env.require(balance(bob, USD(2'100'000'000)));
+                    env.require(Balance(bob_, usd(2'100'000'000)));
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000'000'000) - env.balance(carol, MPT(ETH)),
-                            env.balance(bob, MPT(USD)) - USD(2'000'000'000)});
+                            eth(2'000'000'000) - env.balance(carol_, MPT(eth)),
+                            env.balance(bob_, MPT(usd)) - usd(2'000'000'000)});
                 }
                 // AMM is better quality
                 BEAST_EXPECT(q[1] > q[0]);
@@ -6491,32 +6512,32 @@ private:
             {
                 Env env(*this, features);
                 auto mpts = prep(env, rates.first, rates.second);
-                auto USD = mpts.USD;
-                auto ETH = mpts.ETH;
-                auto CAN = mpts.CAN;
+                auto usd = mpts.USD;
+                auto eth = mpts.ETH;
+                auto can = mpts.CAN;
                 std::optional<AMM> amm;
                 if (i == 0 || i == 2)
                 {
-                    env(offer(ed, ETH(400'000'000), USD(325'000'002)), txflags(tfPassive));
+                    env(offer(ed, eth(400'000'000), usd(325'000'002)), Txflags(tfPassive));
                     env.close();
                 }
                 if (i > 0)
-                    amm.emplace(env, ed, USD(1'000'000'000), ETH(1'000'000'000));
-                env(offer(alice, USD(325'000'000), ETH(400'000'000)));
+                    amm.emplace(env, ed, usd(1'000'000'000), eth(1'000'000'000));
+                env(offer(alice_, usd(325'000'000), eth(400'000'000)));
                 env.close();
                 // AMM is selected in both cases
                 if (i > 0)
                 {
                     // NOLINTBEGIN(bugprone-unchecked-optional-access) emplaced when i > 0
                     BEAST_EXPECT(!amm->expectBalances(
-                        USD(1'000'000'000), ETH(1'000'000'000), amm->tokens()));
+                        usd(1'000'000'000), eth(1'000'000'000), amm->tokens()));
                     // NOLINTEND(bugprone-unchecked-optional-access)
                 }
                 // Partially crosses, AMM is selected, CLOB fails
                 // limitQuality
                 if (i == 2)
                 {
-                    if (rates.first == lowRate)
+                    if (rates.first == kLOW_RATE)
                     {
                         // Ed offer is partially crossed.
                         // The updated rounding makes limitQuality
@@ -6526,10 +6547,10 @@ private:
                             ed,
                             1,
                             {{Amounts{
-                                ETH(121'368'836),
-                                USD(98'612'180),
+                                eth(121'368'836),
+                                usd(98'612'180),
                             }}}));
-                        BEAST_EXPECT(expectOffers(env, alice, 0));
+                        BEAST_EXPECT(expectOffers(env, alice_, 0));
                     }
                     else
                     {
@@ -6539,10 +6560,10 @@ private:
                             ed,
                             1,
                             {{Amounts{
-                                ETH(121'368'836),
-                                USD(98'612'180),
+                                eth(121'368'836),
+                                usd(98'612'180),
                             }}}));
-                        BEAST_EXPECT(expectOffers(env, alice, 0));
+                        BEAST_EXPECT(expectOffers(env, alice_, 0));
                     }
                 }
             }
@@ -6569,61 +6590,61 @@ private:
                 {
                     Env env(*this, features);
                     auto mpts = prep(env, rates.first, rates.second);
-                    auto USD = mpts.USD;
-                    auto ETH = mpts.ETH;
-                    auto CAN = mpts.CAN;
+                    auto usd = mpts.USD;
+                    auto eth = mpts.ETH;
+                    auto can = mpts.CAN;
                     std::optional<AMM> amm;
 
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400'000'000), CAN(375'000'000)), txflags(tfPassive));
-                        env(offer(ed, CAN(375'000'000), USD(338'000'000))), txflags(tfPassive);
+                        env(offer(ed, eth(400'000'000), can(375'000'000)), Txflags(tfPassive));
+                        env(offer(ed, can(375'000'000), usd(338'000'000))), Txflags(tfPassive);
                     }
 
                     if (i > 0)
-                        amm.emplace(env, ed, ETH(1'000'000'000), USD(1'000'000'000));
+                        amm.emplace(env, ed, eth(1'000'000'000), usd(1'000'000'000));
 
-                    env(pay(carol, bob, USD(100'000'000)),
-                        path(~MPT(USD)),
-                        path(~MPT(CAN), ~MPT(USD)),
-                        sendmax(ETH(600'000'000)));
+                    env(pay(carol_, bob_, usd(100'000'000)),
+                        Path(~MPT(usd)),
+                        Path(~MPT(can), ~MPT(usd)),
+                        Sendmax(eth(600'000'000)));
                     env.close();
 
-                    env.require(balance(bob, USD(2'100'000'000)));
+                    env.require(Balance(bob_, usd(2'100'000'000)));
 
                     if (i == 2)
                     {
                         // NOLINTBEGIN(bugprone-unchecked-optional-access) i==2 implies amm is
                         // emplaced (i>0)
-                        if (rates.first == lowRate)
+                        if (rates.first == kLOW_RATE)
                         {
                             // Liquidity is consumed from AMM strand only
                             BEAST_EXPECT(amm->expectBalances(
-                                ETH(1'124'584'936), USD(889'999'993), amm->tokens()));
+                                eth(1'124'584'936), usd(889'999'993), amm->tokens()));
                         }
                         else
                         {
                             BEAST_EXPECT(amm->expectBalances(
-                                ETH(1'103'723'909), USD(906'023'688), amm->tokens()));
+                                eth(1'103'723'909), usd(906'023'688), amm->tokens()));
                             BEAST_EXPECT(expectOffers(
                                 env,
                                 ed,
                                 2,
                                 {{Amounts{
-                                      ETH(327'069'745),
-                                      CAN(306'627'886),
+                                      eth(327'069'745),
+                                      can(306'627'886),
                                   },
                                   Amounts{
-                                      CAN(312'843'533),
-                                      USD(281'976'305),
+                                      can(312'843'533),
+                                      usd(281'976'305),
                                   }}}));
                         }
                         // NOLINTEND(bugprone-unchecked-optional-access)
                     }
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000'000'000) - env.balance(carol, MPT(ETH)),
-                            env.balance(bob, MPT(USD)) - USD(2'000'000'000)});
+                            eth(2'000'000'000) - env.balance(carol_, MPT(eth)),
+                            env.balance(bob_, MPT(usd)) - usd(2'000'000'000)});
                 }
                 BEAST_EXPECT(q[1] > q[0]);
                 BEAST_EXPECT(q[2] > q[0] && q[2] < q[1]);
@@ -6641,78 +6662,78 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .flags = tfSingleAsset,
-                    .err = ter(temMALFORMED),
+                    .err = Ter(temMALFORMED),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .flags = tfOneAssetLPToken,
-                    .err = ter(temMALFORMED),
+                    .err = Ter(temMALFORMED),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .flags = tfLimitLPToken,
-                    .err = ter(temMALFORMED),
+                    .err = Ter(temMALFORMED),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .asset1Out = MPT(ammAlice[1])(100),
                     .asset2Out = MPT(ammAlice[1])(100),
-                    .err = ter(temBAD_AMM_TOKENS),
+                    .err = Ter(temBAD_AMM_TOKENS),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                MPTTester const BTC(
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | MPTDEXFlags});
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
                 WithdrawArg const args{
                     .asset1Out = XRP(100),
-                    .asset2Out = BTC(100),
-                    .err = ter(temBAD_AMM_TOKENS),
+                    .asset2Out = btc(100),
+                    .err = Ter(temBAD_AMM_TOKENS),
                 };
                 ammAlice.withdraw(args);
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::AMMWithdraw;
                 jv[jss::Flags] = tfLimitLPToken;
-                jv[jss::Account] = alice.human();
+                jv[jss::Account] = alice_.human();
                 ammAlice.setTokens(jv);
                 XRP(100).value().setJson(jv[jss::Amount]);
-                MPTTester const BTC(
+                MPTTester const btc(
                     {.env = env,
-                     .issuer = gw,
-                     .holders = {alice, carol},
+                     .issuer = gw_,
+                     .holders = {alice_, carol_},
                      .pay = 2'000,
-                     .flags = tfMPTCanLock | MPTDEXFlags});
-                BTC(100).value().setJson(jv[jss::EPrice]);
-                env(jv, ter(telENV_RPC_FAILED));
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                btc(100).value().setJson(jv[jss::EPrice]);
+                env(jv, Ter(telENV_RPC_FAILED));
             },
-            {{XRP(10'000), AMMMPT(10'000)}});
+            {{XRP(10'000), gAmmmpt(10'000)}});
     }
 
     void
@@ -6727,33 +6748,33 @@ private:
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol}, XRP(1'000'000), {USD(1'000'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, carol_}, XRP(1'000'000), {USD(1'000'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 40'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(alice, BTC(1), USD(0.01)));
+            env(offer(alice_, btc(1), USD(0.01)));
             env.close();
-            AMM const amm(env, gw, BTC(200'000), USD(100'000));
-            env(offer(carol, USD(0.49), BTC(1)));
+            AMM const amm(env, gw_, btc(200'000), USD(100'000));
+            env(offer(carol_, USD(0.49), btc(1)));
             env.close();
 
             if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
             {
-                BEAST_EXPECT(amm.expectBalances(BTC(200'000), USD(100'000), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{BTC(1), USD(0.01)}}}));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{USD(0.49), BTC(1)}}}));
+                BEAST_EXPECT(amm.expectBalances(btc(200'000), USD(100'000), amm.tokens()));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{btc(1), USD(0.01)}}}));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{USD(0.49), btc(1)}}}));
             }
 
             if (features[fixAMMv1_1] && features[fixAMMv1_3])
             {
-                BEAST_EXPECT(amm.expectBalances(BTC(200'001), USD(99'999.51), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{BTC(1), USD(0.01)}}}));
+                BEAST_EXPECT(amm.expectBalances(btc(200'001), USD(99'999.51), amm.tokens()));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{btc(1), USD(0.01)}}}));
                 // Carol's offer crosses AMM
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             }
         }
 
@@ -6761,33 +6782,33 @@ private:
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol}, XRP(1'000'000), {USD(1'000'000)});
-            MPT const BTC = MPTTester(
+            fund(env, gw_, {alice_, carol_}, XRP(1'000'000), {USD(1'000'000)});
+            MPT const btc = MPTTester(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice, carol},
+                 .issuer = gw_,
+                 .holders = {alice_, carol_},
                  .pay = 40'000'000000,
-                 .flags = MPTDEXFlags});
+                 .flags = kMPT_DEX_FLAGS});
 
-            env(offer(alice, BTC(1), XRP(0.01)));
+            env(offer(alice_, btc(1), XRP(0.01)));
             env.close();
-            AMM const amm(env, gw, BTC(200'000), XRP(100'000));
-            env(offer(carol, XRP(0.49), BTC(1)));
+            AMM const amm(env, gw_, btc(200'000), XRP(100'000));
+            env(offer(carol_, XRP(0.49), btc(1)));
             env.close();
 
             if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
             {
-                BEAST_EXPECT(amm.expectBalances(BTC(200'000), XRP(100'000), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{BTC(1), XRP(0.01)}}}));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{XRP(0.49), BTC(1)}}}));
+                BEAST_EXPECT(amm.expectBalances(btc(200'000), XRP(100'000), amm.tokens()));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{btc(1), XRP(0.01)}}}));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{XRP(0.49), btc(1)}}}));
             }
 
             if (features[fixAMMv1_1] && features[fixAMMv1_3])
             {
-                BEAST_EXPECT(amm.expectBalances(BTC(200'001), XRP(99'999.51), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{BTC(1), XRP(0.01)}}}));
+                BEAST_EXPECT(amm.expectBalances(btc(200'001), XRP(99'999.51), amm.tokens()));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{btc(1), XRP(0.01)}}}));
                 // Carol's offer crosses AMM
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             }
         }
     }
@@ -6805,21 +6826,21 @@ private:
         env(fset(gw, asfAllowTrustLineClawback));
         env.close();
 
-        auto const USD = gw["USD"];
-        env.trust(USD(100000), alice);
-        env(pay(gw, alice, USD(50000)));
-        env.trust(USD(100000), bob);
-        env(pay(gw, bob, USD(40000)));
+        auto const usd = gw["USD"];
+        env.trust(usd(100000), alice);
+        env(pay(gw, alice, usd(50000)));
+        env.trust(usd(100000), bob);
+        env(pay(gw, bob, usd(40000)));
         env.close();
 
-        MPT const BTC = MPTTester(
+        MPT const btc = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {alice, bob},
              .pay = 40'000'000000,
-             .flags = tfMPTCanClawback | tfMPTCanLock | MPTDEXFlags});
+             .flags = tfMPTCanClawback | tfMPTCanLock | kMPT_DEX_FLAGS});
 
-        AMM amm(env, alice, BTC(2), USD(1));
+        AMM amm(env, alice, btc(2), usd(1));
         amm.deposit(alice, IOUAmount{1'876123487565916, -15});
         amm.deposit(bob, IOUAmount{1'000});
         amm.withdraw(alice, IOUAmount{1'876123487565916, -15});
@@ -6848,28 +6869,28 @@ private:
         // This lambda function is used to create trustline, MPT.
         // and create an AMM account.
         // And also test the callback function.
-        auto testAMMDeposit = [&](Env& env, std::function<void(AMM & amm, MPTTester & BTC)> cb) {
-            env.fund(XRP(1'000), gw, alice);
+        auto testAMMDeposit = [&](Env& env, std::function<void(AMM & amm, MPTTester & btc)> cb) {
+            env.fund(XRP(1'000), gw_, alice_);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
-                 .issuer = gw,
-                 .holders = {alice},
+                 .issuer = gw_,
+                 .holders = {alice_},
                  .pay = 30'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            AMM amm(env, alice, BTC(100), XRP(100));
+            AMM amm(env, alice_, btc(100), XRP(100));
             env.close();
-            BTC.set({.holder = alice, .flags = tfMPTLock});
-            cb(amm, BTC);
+            btc.set({.holder = alice_, .flags = tfMPTLock});
+            cb(amm, btc);
         };
 
         // Deposit two assets, one of which is frozen,
         // then we should get tecFROZEN error.
         {
             Env env(*this);
-            testAMMDeposit(env, [&](AMM& amm, MPTTester& BTC) {
-                amm.deposit(alice, BTC(100), XRP(100), std::nullopt, tfTwoAsset, ter(tecFROZEN));
+            testAMMDeposit(env, [&](AMM& amm, MPTTester& btc) {
+                amm.deposit(alice_, btc(100), XRP(100), std::nullopt, tfTwoAsset, Ter(tecFROZEN));
             });
         }
 
@@ -6877,9 +6898,9 @@ private:
         // then we should get tecFROZEN error.
         {
             Env env(*this);
-            testAMMDeposit(env, [&](AMM& amm, MPTTester& BTC) {
+            testAMMDeposit(env, [&](AMM& amm, MPTTester& btc) {
                 amm.deposit(
-                    alice, BTC(100), std::nullopt, std::nullopt, tfSingleAsset, ter(tecFROZEN));
+                    alice_, btc(100), std::nullopt, std::nullopt, tfSingleAsset, Ter(tecFROZEN));
             });
         }
 
@@ -6888,9 +6909,9 @@ private:
         // when feature AMMClawback is enabled.
         {
             Env env(*this);
-            testAMMDeposit(env, [&](AMM& amm, MPTTester& BTC) {
+            testAMMDeposit(env, [&](AMM& amm, MPTTester& btc) {
                 amm.deposit(
-                    alice, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, ter(tecFROZEN));
+                    alice_, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, Ter(tecFROZEN));
             });
         }
     }
@@ -6901,7 +6922,7 @@ private:
         testcase("Auto Delete");
 
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         {
             Env env(
@@ -6911,11 +6932,11 @@ private:
                     return cfg;
                 }),
                 all);
-            env.fund(XRP(1'000), gw, alice);
-            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 < maxDeletableAMMTrustLines + 10; ++i)
+            env.fund(XRP(1'000), gw_, alice_);
+            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)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -6924,35 +6945,35 @@ private:
             }
             // The trustlines are partially deleted,
             // AMM is set to an empty state.
-            amm.withdrawAll(gw);
+            amm.withdrawAll(gw_);
             BEAST_EXPECT(amm.ammExists());
 
             // Bid,Vote,Deposit,Withdraw,SetTrust failing with
             // tecAMM_EMPTY. Deposit succeeds with tfTwoAssetIfEmpty option.
             env(amm.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = 1000,
                 }),
-                ter(tecAMM_EMPTY));
-            amm.vote({.account = alice, .tfee = 100, .err = ter(tecAMM_EMPTY)});
-            amm.withdraw({.account = alice, .tokens = 100, .err = ter(tecAMM_EMPTY)});
-            amm.deposit({.account = alice, .asset1In = USD(100), .err = ter(tecAMM_EMPTY)});
-            env(trust(alice, STAmount{amm.lptIssue(), 10'000}), ter(tecAMM_EMPTY));
+                Ter(tecAMM_EMPTY));
+            amm.vote({.account = alice_, .tfee = 100, .err = Ter(tecAMM_EMPTY)});
+            amm.withdraw({.account = alice_, .tokens = 100, .err = Ter(tecAMM_EMPTY)});
+            amm.deposit({.account = alice_, .asset1In = usd(100), .err = Ter(tecAMM_EMPTY)});
+            env(trust(alice_, STAmount{amm.lptIssue(), 10'000}), Ter(tecAMM_EMPTY));
 
             // Can deposit with tfTwoAssetIfEmpty option
             amm.deposit(
-                {.account = alice,
-                 .asset1In = USD(1'000),
-                 .asset2In = BTC(1'000),
+                {.account = alice_,
+                 .asset1In = usd(1'000),
+                 .asset2In = btc(1'000),
                  .flags = tfTwoAssetIfEmpty,
                  .tfee = 1'000});
-            BEAST_EXPECT(amm.expectBalances(USD(1'000), BTC(1'000), IOUAmount{1'000}));
+            BEAST_EXPECT(amm.expectBalances(usd(1'000), btc(1'000), IOUAmount{1'000}));
             BEAST_EXPECT(amm.expectTradingFee(1'000));
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{0}));
 
             // Withdrawing all tokens deletes AMM since the number
             // of remaining trustlines is less than max
-            amm.withdrawAll(alice);
+            amm.withdrawAll(alice_);
             BEAST_EXPECT(!amm.ammExists());
             BEAST_EXPECT(!env.le(keylet::ownerDir(amm.ammAccount())));
         }
@@ -6965,11 +6986,11 @@ private:
                     return cfg;
                 }),
                 all);
-            env.fund(XRP(1'000), gw, alice);
-            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 < (maxDeletableAMMTrustLines * 2) + 10; ++i)
+            env.fund(XRP(1'000), gw_, alice_);
+            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)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -6977,19 +6998,19 @@ private:
                 env.close();
             }
             // The trustlines are partially deleted.
-            amm.withdrawAll(gw);
+            amm.withdrawAll(gw_);
             BEAST_EXPECT(amm.ammExists());
 
             // AMMDelete has to be called twice to delete AMM.
-            amm.ammDelete(alice, ter(tecINCOMPLETE));
+            amm.ammDelete(alice_, Ter(tecINCOMPLETE));
             BEAST_EXPECT(amm.ammExists());
             // Deletes remaining trustlines and deletes AMM.
-            amm.ammDelete(alice);
+            amm.ammDelete(alice_);
             BEAST_EXPECT(!amm.ammExists());
             BEAST_EXPECT(!env.le(keylet::ownerDir(amm.ammAccount())));
 
             // Try redundant delete
-            amm.ammDelete(alice, ter(terNO_AMM));
+            amm.ammDelete(alice_, Ter(terNO_AMM));
         }
 
         {
@@ -7000,17 +7021,17 @@ private:
                     return cfg;
                 }),
                 all);
-            env.fund(XRP(1'000), gw, alice, carol);
-            MPTTester const USD(
-                {.env = env, .issuer = gw, .holders = {alice, carol}, .pay = 20'000});
-            MPTTester const BTC(
-                {.env = env, .issuer = gw, .holders = {alice, carol}, .pay = 20'000});
-            AMM amm(env, gw, USD(10'000), BTC(10'000));
-            amm.deposit({.account = alice, .tokens = 1'000});
-            amm.deposit({.account = carol, .tokens = 1'000});
-            amm.withdrawAll(alice);
-            amm.withdrawAll(carol);
-            amm.withdrawAll(gw);
+            env.fund(XRP(1'000), gw_, alice_, carol_);
+            MPTTester const usd(
+                {.env = env, .issuer = gw_, .holders = {alice_, carol_}, .pay = 20'000});
+            MPTTester const btc(
+                {.env = env, .issuer = gw_, .holders = {alice_, carol_}, .pay = 20'000});
+            AMM amm(env, gw_, usd(10'000), btc(10'000));
+            amm.deposit({.account = alice_, .tokens = 1'000});
+            amm.deposit({.account = carol_, .tokens = 1'000});
+            amm.withdrawAll(alice_);
+            amm.withdrawAll(carol_);
+            amm.withdrawAll(gw_);
             BEAST_EXPECT(!amm.ammExists());
         }
 
@@ -7025,15 +7046,15 @@ private:
                 }),
                 all);
 
-            env.fund(XRP(1'000), gw, alice);
-            MPT const USD =
-                MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 20'000});
-            MPT const BTC =
-                MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 20'000});
+            env.fund(XRP(1'000), gw_, alice_);
+            MPT const usd =
+                MPTTester({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
+            MPT const btc =
+                MPTTester({.env = env, .issuer = gw_, .holders = {alice_}, .pay = 20'000});
 
             // MPT/MPT pool with MANY trustlines
-            AMM amm(env, gw, USD(10'000), BTC(10'000));
-            for (auto i = 0; i < (maxDeletableAMMTrustLines * 2) + 10; ++i)
+            AMM amm(env, gw_, usd(10'000), btc(10'000));
+            for (auto i = 0; i < (kMAX_DELETABLE_AMM_TRUST_LINES * 2) + 10; ++i)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -7041,16 +7062,16 @@ private:
                 env.close();
             }
 
-            amm.withdrawAll(gw);
+            amm.withdrawAll(gw_);
             // AMM is in empty state, but can't be auto-deleted because of the LPTokens trustlines.
-            BEAST_EXPECT(amm.expectBalances(USD(0), BTC(0), IOUAmount(0)));
+            BEAST_EXPECT(amm.expectBalances(usd(0), btc(0), IOUAmount(0)));
             BEAST_EXPECT(amm.ammExists());
 
             // Critical: MPT/MPT pool + tecINCOMPLETE
-            amm.ammDelete(alice, ter(tecINCOMPLETE));
+            amm.ammDelete(alice_, Ter(tecINCOMPLETE));
             BEAST_EXPECT(amm.ammExists());
 
-            amm.ammDelete(alice);
+            amm.ammDelete(alice_);
             BEAST_EXPECT(!amm.ammExists());
         }
     }
@@ -7058,7 +7079,7 @@ private:
     void
     run() override
     {
-        FeatureBitset const all{jtx::testable_amendments()};
+        FeatureBitset const all{jtx::testableAmendments()};
         testInstanceCreate();
         testInvalidInstance();
         testInvalidDeposit(all);
diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp
index b25705becc..8e2c0255ef 100644
--- a/src/test/app/AMM_test.cpp
+++ b/src/test/app/AMM_test.cpp
@@ -73,15 +73,15 @@ namespace xrpl::test {
 struct AMM_test : public jtx::AMMTest
 {
     // Use small Number mantissas for the life of this test.
-    NumberMantissaScaleGuard const sg_{xrpl::MantissaRange::mantissa_scale::small};
+    NumberMantissaScaleGuard const sg{xrpl::MantissaRange::MantissaScale::Small};
 
 private:
     static FeatureBitset
-    testable_amendments()
+    testableAmendments()
     {
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
-        return jtx::testable_amendments() - featureSingleAssetVault - featureLendingProtocol;
+        return jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol;
     }
 
     void
@@ -101,7 +101,7 @@ private:
             {},
             0,
             {},
-            {testable_amendments()});
+            {testableAmendments()});
 #endif
 
         // XRP to IOU, without featureSingleAssetVault
@@ -113,7 +113,7 @@ private:
             {},
             0,
             {},
-            {testable_amendments() - featureSingleAssetVault});
+            {testableAmendments() - featureSingleAssetVault});
 
         // IOU to IOU
         testAMM(
@@ -125,45 +125,45 @@ private:
         // IOU to IOU + transfer fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000), BTC(0.5)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_}, {USD(20'000), BTC(0.5)}, Fund::All);
+            env(rate(gw_, 1.25));
             env.close();
             // no transfer fee on create
-            AMM const ammAlice(env, alice, USD(20'000), BTC(0.5));
+            AMM const ammAlice(env, alice_, USD(20'000), BTC(0.5));
             BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(0.5), IOUAmount{100, 0}));
-            BEAST_EXPECT(expectHolding(env, alice, USD(0)));
-            BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
+            BEAST_EXPECT(expectHolding(env, alice_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, alice_, BTC(0)));
         }
 
         // Require authorization is set, account is authorized
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(fset(gw, asfRequireAuth));
-            env(trust(alice, gw["USD"](30'000), 0));
-            env(trust(gw, alice["USD"](0), tfSetfAuth));
+            env(fset(gw_, asfRequireAuth));
+            env(trust(alice_, gw_["USD"](30'000), 0));
+            env(trust(gw_, alice_["USD"](0), tfSetfAuth));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'000));
         }
 
         // Cleared global freeze
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env.trust(USD(30'000), alice);
+            env.trust(USD(30'000), alice_);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
-            env(fset(gw, asfGlobalFreeze));
+            env(fset(gw_, asfGlobalFreeze));
             env.close();
-            AMM const ammAliceFail(env, alice, XRP(10'000), USD(10'000), ter(tecFROZEN));
-            env(fclear(gw, asfGlobalFreeze));
+            AMM const ammAliceFail(env, alice_, XRP(10'000), USD(10'000), Ter(tecFROZEN));
+            env(fclear(gw_, asfGlobalFreeze));
             env.close();
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'000));
         }
 
         // Trading fee
@@ -194,64 +194,64 @@ private:
         // Can't have both XRP tokens
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, XRP(10'000), XRP(10'000), ter(temBAD_AMM_TOKENS));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, XRP(10'000), XRP(10'000), Ter(temBAD_AMM_TOKENS));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Can't have both tokens the same IOU
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, USD(10'000), USD(10'000), ter(temBAD_AMM_TOKENS));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, USD(10'000), USD(10'000), Ter(temBAD_AMM_TOKENS));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Can't have zero or negative amounts
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, XRP(0), USD(10'000), ter(temBAD_AMOUNT));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, XRP(0), USD(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice.ammExists());
-            AMM const ammAlice1(env, alice, XRP(10'000), USD(0), ter(temBAD_AMOUNT));
+            AMM const ammAlice1(env, alice_, XRP(10'000), USD(0), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice1.ammExists());
-            AMM const ammAlice2(env, alice, XRP(10'000), USD(-10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice2(env, alice_, XRP(10'000), USD(-10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice2.ammExists());
-            AMM const ammAlice3(env, alice, XRP(-10'000), USD(10'000), ter(temBAD_AMOUNT));
+            AMM const ammAlice3(env, alice_, XRP(-10'000), USD(10'000), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(!ammAlice3.ammExists());
         }
 
         // Bad currency
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, XRP(10'000), BAD(10'000), ter(temBAD_CURRENCY));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, XRP(10'000), BAD(10'000), Ter(temBAD_CURRENCY));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Insufficient IOU balance
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, XRP(10'000), USD(40'000), ter(tecUNFUNDED_AMM));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(40'000), Ter(tecUNFUNDED_AMM));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Insufficient XRP balance
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
-            AMM const ammAlice(env, alice, XRP(40'000), USD(10'000), ter(tecUNFUNDED_AMM));
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
+            AMM const ammAlice(env, alice_, XRP(40'000), USD(10'000), Ter(tecUNFUNDED_AMM));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Invalid trading fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
             AMM const ammAlice(
                 env,
-                alice,
+                alice_,
                 XRP(10'000),
                 USD(10'000),
                 false,
@@ -260,22 +260,22 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_FEE));
+                Ter(temBAD_FEE));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // AMM already exists
         testAMM([&](AMM& ammAlice, Env& env) {
-            AMM const ammCarol(env, carol, XRP(10'000), USD(10'000), ter(tecDUPLICATE));
+            AMM const ammCarol(env, carol_, XRP(10'000), USD(10'000), Ter(tecDUPLICATE));
         });
 
         // Invalid flags
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(30'000)}, Fund::All);
+            fund(env, gw_, {alice_}, {USD(30'000)}, Fund::All);
             AMM const ammAlice(
                 env,
-                alice,
+                alice_,
                 XRP(10'000),
                 USD(10'000),
                 false,
@@ -284,7 +284,7 @@ private:
                 tfWithdrawAll,
                 std::nullopt,
                 std::nullopt,
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
@@ -302,37 +302,37 @@ private:
                 0,
                 10,
                 std::nullopt,
-                seq(1),
+                Seq(1),
                 std::nullopt,
-                ter(terNO_ACCOUNT));
+                Ter(terNO_ACCOUNT));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Require authorization is set
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(fset(gw, asfRequireAuth));
+            env(fset(gw_, asfRequireAuth));
             env.close();
-            env(trust(gw, alice["USD"](30'000)));
+            env(trust(gw_, alice_["USD"](30'000)));
             env.close();
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000), ter(tecNO_AUTH));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'000), Ter(tecNO_AUTH));
             BEAST_EXPECT(!ammAlice.ammExists());
         }
 
         // Globally frozen
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(fset(gw, asfGlobalFreeze));
+            env(fset(gw_, asfGlobalFreeze));
             env.close();
-            env(trust(gw, alice["USD"](30'000)));
+            env(trust(gw_, alice_["USD"](30'000)));
             env.close();
-            for (auto const& account : {alice, gw})
+            for (auto const& account : {alice_, gw_})
             {
-                AMM const amm(env, account, XRP(10'000), USD(10'000), ter(tecFROZEN));
+                AMM const amm(env, account, XRP(10'000), USD(10'000), Ter(tecFROZEN));
                 BEAST_EXPECT(!amm.ammExists());
             }
         }
@@ -340,57 +340,57 @@ private:
         // Individually frozen
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(trust(gw, alice["USD"](30'000)));
+            env(trust(gw_, alice_["USD"](30'000)));
             env.close();
-            env(trust(gw, alice["USD"](0), tfSetFreeze));
+            env(trust(gw_, alice_["USD"](0), tfSetFreeze));
             env.close();
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000), ter(tecFROZEN));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'000), Ter(tecFROZEN));
             BEAST_EXPECT(!ammAlice.ammExists());
             // issuer can create
-            AMM const amm(env, gw, XRP(10'000), USD(10'000));
+            AMM const amm(env, gw_, XRP(10'000), USD(10'000));
         }
 
         // Insufficient reserve, XRP/IOU
         {
             Env env(*this);
-            auto const starting_xrp = XRP(1'000) + reserve(env, 3) + env.current()->fees().base * 4;
-            env.fund(starting_xrp, gw);
-            env.fund(starting_xrp, alice);
-            env.trust(USD(2'000), alice);
+            auto const startingXrp = XRP(1'000) + reserve(env, 3) + env.current()->fees().base * 4;
+            env.fund(startingXrp, gw_);
+            env.fund(startingXrp, alice_);
+            env.trust(USD(2'000), alice_);
             env.close();
-            env(pay(gw, alice, USD(2'000)));
+            env(pay(gw_, alice_, USD(2'000)));
             env.close();
-            env(offer(alice, XRP(101), USD(100)));
-            env(offer(alice, XRP(102), USD(100)));
-            AMM const ammAlice(env, alice, XRP(1'000), USD(1'000), ter(tecUNFUNDED_AMM));
+            env(offer(alice_, XRP(101), USD(100)));
+            env(offer(alice_, XRP(102), USD(100)));
+            AMM const ammAlice(env, alice_, XRP(1'000), USD(1'000), Ter(tecUNFUNDED_AMM));
         }
 
         // Insufficient reserve, IOU/IOU
         {
             Env env(*this);
-            auto const starting_xrp = reserve(env, 4) + env.current()->fees().base * 5;
-            env.fund(starting_xrp, gw);
-            env.fund(starting_xrp, alice);
-            env.trust(USD(2'000), alice);
-            env.trust(EUR(2'000), alice);
+            auto const startingXrp = reserve(env, 4) + env.current()->fees().base * 5;
+            env.fund(startingXrp, gw_);
+            env.fund(startingXrp, alice_);
+            env.trust(USD(2'000), alice_);
+            env.trust(EUR(2'000), alice_);
             env.close();
-            env(pay(gw, alice, USD(2'000)));
-            env(pay(gw, alice, EUR(2'000)));
+            env(pay(gw_, alice_, USD(2'000)));
+            env(pay(gw_, alice_, EUR(2'000)));
             env.close();
-            env(offer(alice, EUR(101), USD(100)));
-            env(offer(alice, EUR(102), USD(100)));
-            AMM const ammAlice(env, alice, EUR(1'000), USD(1'000), ter(tecINSUF_RESERVE_LINE));
+            env(offer(alice_, EUR(101), USD(100)));
+            env(offer(alice_, EUR(102), USD(100)));
+            AMM const ammAlice(env, alice_, EUR(1'000), USD(1'000), Ter(tecINSUF_RESERVE_LINE));
         }
 
         // Insufficient fee
         {
             Env env(*this);
-            fund(env, gw, {alice}, XRP(2'000), {USD(2'000), EUR(2'000)});
+            fund(env, gw_, {alice_}, XRP(2'000), {USD(2'000), EUR(2'000)});
             AMM const ammAlice(
                 env,
-                alice,
+                alice_,
                 EUR(1'000),
                 USD(1'000),
                 false,
@@ -399,62 +399,62 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(telINSUF_FEE_P));
+                Ter(telINSUF_FEE_P));
         }
 
         // AMM with LPTokens
 
         // AMM with one LPToken from another AMM.
         testAMM([&](AMM& ammAlice, Env& env) {
-            fund(env, gw, {alice}, {EUR(10'000)}, Fund::TokenOnly);
+            fund(env, gw_, {alice_}, {EUR(10'000)}, Fund::TokenOnly);
             AMM const ammAMMToken(
                 env,
-                alice,
+                alice_,
                 EUR(10'000),
                 STAmount{ammAlice.lptIssue(), 1'000'000},
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             AMM const ammAMMToken1(
                 env,
-                alice,
+                alice_,
                 STAmount{ammAlice.lptIssue(), 1'000'000},
                 EUR(10'000),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         });
 
         // AMM with two LPTokens from other AMMs.
         testAMM([&](AMM& ammAlice, Env& env) {
-            fund(env, gw, {alice}, {EUR(10'000)}, Fund::TokenOnly);
-            AMM const ammAlice1(env, alice, XRP(10'000), EUR(10'000));
+            fund(env, gw_, {alice_}, {EUR(10'000)}, Fund::TokenOnly);
+            AMM const ammAlice1(env, alice_, XRP(10'000), EUR(10'000));
             auto const token1 = ammAlice.lptIssue();
             auto const token2 = ammAlice1.lptIssue();
             AMM const ammAMMTokens(
                 env,
-                alice,
+                alice_,
                 STAmount{token1, 1'000'000},
                 STAmount{token2, 1'000'000},
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         });
 
         // Issuer has DefaultRipple disabled
         {
             Env env(*this);
-            env.fund(XRP(30'000), gw);
-            env(fclear(gw, asfDefaultRipple));
-            AMM const ammGw(env, gw, XRP(10'000), USD(10'000), ter(terNO_RIPPLE));
-            env.fund(XRP(30'000), alice);
-            env.trust(USD(30'000), alice);
-            env(pay(gw, alice, USD(30'000)));
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'000), ter(terNO_RIPPLE));
+            env.fund(XRP(30'000), gw_);
+            env(fclear(gw_, asfDefaultRipple));
+            AMM const ammGw(env, gw_, XRP(10'000), USD(10'000), Ter(terNO_RIPPLE));
+            env.fund(XRP(30'000), alice_);
+            env.trust(USD(30'000), alice_);
+            env(pay(gw_, alice_, USD(30'000)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'000), Ter(terNO_RIPPLE));
             Account const gw1("gw1");
             env.fund(XRP(30'000), gw1);
             env(fclear(gw1, asfDefaultRipple));
             env.trust(USD(30'000), gw1);
-            env(pay(gw, gw1, USD(30'000)));
-            auto const USD1 = gw1["USD"];
-            AMM const ammGwGw1(env, gw, USD(10'000), USD1(10'000), ter(terNO_RIPPLE));
-            env.trust(USD1(30'000), alice);
-            env(pay(gw1, alice, USD1(30'000)));
-            AMM const ammAlice1(env, alice, USD(10'000), USD1(10'000), ter(terNO_RIPPLE));
+            env(pay(gw_, gw1, USD(30'000)));
+            auto const usD1 = gw1["USD"];
+            AMM const ammGwGw1(env, gw_, USD(10'000), usD1(10'000), Ter(terNO_RIPPLE));
+            env.trust(usD1(30'000), alice_);
+            env(pay(gw1, alice_, usD1(30'000)));
+            AMM const ammAlice1(env, alice_, USD(10'000), usD1(10'000), Ter(terNO_RIPPLE));
         }
     }
 
@@ -467,7 +467,7 @@ private:
 
         testAMM([&](AMM& ammAlice, Env& env) {
             // Invalid flags
-            ammAlice.deposit(alice, 1'000'000, std::nullopt, tfWithdrawAll, ter(temINVALID_FLAG));
+            ammAlice.deposit(alice_, 1'000'000, std::nullopt, tfWithdrawAll, Ter(temINVALID_FLAG));
 
             // Invalid options
             std::vector<std::tuple<
@@ -538,7 +538,7 @@ private:
             for (auto const& it : invalidOptions)
             {
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     std::get<1>(it),
                     std::get<2>(it),
                     std::get<3>(it),
@@ -547,39 +547,39 @@ private:
                     std::nullopt,
                     std::nullopt,
                     std::get<5>(it),
-                    ter(temMALFORMED));
+                    Ter(temMALFORMED));
             }
 
             {
                 // bad preflight1
-                Json::Value jv = Json::objectValue;
-                jv[jss::Account] = alice.human();
+                json::Value jv = json::ObjectValue;
+                jv[jss::Account] = alice_.human();
                 jv[jss::TransactionType] = jss::AMMDeposit;
-                jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::none);
-                jv[jss::Asset2] = STIssue(sfAsset, USD).getJson(JsonOptions::none);
+                jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::KNone);
+                jv[jss::Asset2] = STIssue(sfAsset, USD).getJson(JsonOptions::KNone);
                 jv[jss::Fee] = "-1";
-                env(jv, ter(temBAD_FEE));
+                env(jv, Ter(temBAD_FEE));
             }
 
             // Invalid tokens
-            ammAlice.deposit(alice, 0, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+            ammAlice.deposit(alice_, 0, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
             ammAlice.deposit(
-                alice, IOUAmount{-1}, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                alice_, IOUAmount{-1}, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             {
-                Json::Value jv = Json::objectValue;
-                jv[jss::Account] = alice.human();
+                json::Value jv = json::ObjectValue;
+                jv[jss::Account] = alice_.human();
                 jv[jss::TransactionType] = jss::AMMDeposit;
-                jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::none);
-                jv[jss::Asset2] = STIssue(sfAsset, USD).getJson(JsonOptions::none);
-                jv[jss::LPTokenOut] = USD(100).value().getJson(JsonOptions::none);
+                jv[jss::Asset] = STIssue(sfAsset, XRP).getJson(JsonOptions::KNone);
+                jv[jss::Asset2] = STIssue(sfAsset, USD).getJson(JsonOptions::KNone);
+                jv[jss::LPTokenOut] = USD(100).value().getJson(JsonOptions::KNone);
                 jv[jss::Flags] = tfLPToken;
-                env(jv, ter(temBAD_AMM_TOKENS));
+                env(jv, Ter(temBAD_AMM_TOKENS));
             }
 
             // Invalid trading fee
             ammAlice.deposit(
-                carol,
+                carol_,
                 std::nullopt,
                 XRP(200),
                 USD(200),
@@ -588,14 +588,14 @@ private:
                 std::nullopt,
                 std::nullopt,
                 10'000,
-                ter(temBAD_FEE));
+                Ter(temBAD_FEE));
 
             // Invalid tokens - bogus currency
             {
-                auto const iss1 = Issue{Currency(0xabc), gw.id()};
-                auto const iss2 = Issue{Currency(0xdef), gw.id()};
+                auto const iss1 = Issue{Currency(0xabc), gw_.id()};
+                auto const iss2 = Issue{Currency(0xdef), gw_.id()};
                 ammAlice.deposit(
-                    alice,
+                    alice_,
                     1'000,
                     std::nullopt,
                     std::nullopt,
@@ -604,32 +604,32 @@ private:
                     {{iss1, iss2}},
                     std::nullopt,
                     std::nullopt,
-                    ter(terNO_AMM));
+                    Ter(terNO_AMM));
             }
 
             // Depositing mismatched token, invalid Asset1In.issue
             ammAlice.deposit(
-                alice, GBP(100), std::nullopt, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                alice_, GBP(100), std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Depositing mismatched token, invalid Asset2In.issue
             ammAlice.deposit(
-                alice, USD(100), GBP(100), std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                alice_, USD(100), GBP(100), std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Depositing mismatched token, Asset1In.issue == Asset2In.issue
             ammAlice.deposit(
-                alice, USD(100), USD(100), std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                alice_, USD(100), USD(100), std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Invalid amount value
             ammAlice.deposit(
-                alice, USD(0), std::nullopt, std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
+                alice_, USD(0), std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
             ammAlice.deposit(
-                alice, USD(-1'000), std::nullopt, std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
+                alice_, USD(-1'000), std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
             ammAlice.deposit(
-                alice, USD(10), std::nullopt, USD(-1), std::nullopt, ter(temBAD_AMOUNT));
+                alice_, USD(10), std::nullopt, USD(-1), std::nullopt, Ter(temBAD_AMOUNT));
 
             // Bad currency
             ammAlice.deposit(
-                alice, BAD(100), std::nullopt, std::nullopt, std::nullopt, ter(temBAD_CURRENCY));
+                alice_, BAD(100), std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_CURRENCY));
 
             // Invalid Account
             Account const bad("bad");
@@ -642,13 +642,13 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                seq(1),
+                Seq(1),
                 std::nullopt,
-                ter(terNO_ACCOUNT));
+                Ter(terNO_ACCOUNT));
 
             // Invalid AMM
             ammAlice.deposit(
-                alice,
+                alice_,
                 1'000,
                 std::nullopt,
                 std::nullopt,
@@ -657,12 +657,12 @@ private:
                 {{USD, GBP}},
                 std::nullopt,
                 std::nullopt,
-                ter(terNO_AMM));
+                Ter(terNO_AMM));
 
             // Single deposit: 100000 tokens worth of USD
             // Amount to deposit exceeds Max
             ammAlice.deposit(
-                carol,
+                carol_,
                 100'000,
                 USD(200),
                 std::nullopt,
@@ -671,12 +671,12 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
 
             // Single deposit: 100000 tokens worth of XRP
             // Amount to deposit exceeds Max
             ammAlice.deposit(
-                carol,
+                carol_,
                 100'000,
                 XRP(200),
                 std::nullopt,
@@ -685,50 +685,50 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
 
             // Deposit amount is invalid
             // Calculated amount to deposit is 98,000,000
             ammAlice.deposit(
-                alice,
+                alice_,
                 USD(0),
                 std::nullopt,
                 STAmount{USD, 1, -1},
                 std::nullopt,
-                ter(tecUNFUNDED_AMM));
+                Ter(tecUNFUNDED_AMM));
             // Calculated amount is 0
             ammAlice.deposit(
-                alice,
+                alice_,
                 USD(0),
                 std::nullopt,
                 STAmount{USD, 2'000, -6},
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
 
             // Deposit non-empty AMM
             ammAlice.deposit(
-                carol, XRP(100), USD(100), std::nullopt, tfTwoAssetIfEmpty, ter(tecAMM_NOT_EMPTY));
+                carol_, XRP(100), USD(100), std::nullopt, tfTwoAssetIfEmpty, Ter(tecAMM_NOT_EMPTY));
         });
 
         // Tiny deposit
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const enabledV1_3 = env.current()->rules().enabled(fixAMMv1_3);
-                auto const err = !enabledV1_3 ? ter(temBAD_AMOUNT) : ter(tesSUCCESS);
+                auto const enabledV13 = env.current()->rules().enabled(fixAMMv1_3);
+                auto const err = !enabledV13 ? Ter(temBAD_AMOUNT) : Ter(tesSUCCESS);
                 // Pre-amendment XRP deposit side is rounded to 0
                 // and deposit fails.
                 // Post-amendment XRP deposit side is rounded to 1
                 // and deposit succeeds.
-                ammAlice.deposit(carol, IOUAmount{1, -4}, std::nullopt, std::nullopt, err);
+                ammAlice.deposit(carol_, IOUAmount{1, -4}, std::nullopt, std::nullopt, err);
                 // Pre/post-amendment LPTokens is rounded to 0 and deposit
                 // fails with tecAMM_INVALID_TOKENS.
                 ammAlice.deposit(
-                    carol,
+                    carol_,
                     STAmount{USD, 1, -12},
                     std::nullopt,
                     std::nullopt,
                     std::nullopt,
-                    ter(tecAMM_INVALID_TOKENS));
+                    Ter(tecAMM_INVALID_TOKENS));
             },
             std::nullopt,
             0,
@@ -737,20 +737,20 @@ private:
 
         // Invalid AMM
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.withdrawAll(alice);
-            ammAlice.deposit(alice, 10'000, std::nullopt, std::nullopt, ter(terNO_AMM));
+            ammAlice.withdrawAll(alice_);
+            ammAlice.deposit(alice_, 10'000, std::nullopt, std::nullopt, Ter(terNO_AMM));
         });
 
         // Globally frozen asset
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(fset(gw, asfGlobalFreeze));
+                env(fset(gw_, asfGlobalFreeze));
                 if (!features[featureAMMClawback])
                 {
                     // If the issuer set global freeze, the holder still can
                     // deposit the other non-frozen token when AMMClawback is
                     // not enabled.
-                    ammAlice.deposit(carol, XRP(100));
+                    ammAlice.deposit(carol_, XRP(100));
                 }
                 else
                 {
@@ -758,9 +758,9 @@ private:
                     // deposit the other non-frozen token when AMMClawback is
                     // enabled.
                     ammAlice.deposit(
-                        carol, XRP(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                        carol_, XRP(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 }
-                for (auto const& account : {carol, gw})
+                for (auto const& account : {carol_, gw_})
                 {
                     ammAlice.deposit(
                         account,
@@ -768,11 +768,11 @@ private:
                         std::nullopt,
                         std::nullopt,
                         std::nullopt,
-                        ter(tecFROZEN));
+                        Ter(tecFROZEN));
                     ammAlice.deposit(
-                        account, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                        account, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
                     ammAlice.deposit(
-                        account, XRP(100), USD(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+                        account, XRP(100), USD(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
                 }
             },
             std::nullopt,
@@ -783,37 +783,37 @@ private:
         // Individually frozen (AMM) account
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(trust(gw, carol["USD"](0), tfSetFreeze));
+                env(trust(gw_, carol_["USD"](0), tfSetFreeze));
                 env.close();
                 if (!features[featureAMMClawback])
                 {
                     // Can deposit non-frozen token if AMMClawback is not
                     // enabled
-                    ammAlice.deposit(carol, XRP(100));
+                    ammAlice.deposit(carol_, XRP(100));
                 }
                 else
                 {
                     // Cannot deposit non-frozen token if the other token is
                     // frozen when AMMClawback is enabled
                     ammAlice.deposit(
-                        carol, XRP(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                        carol_, XRP(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 }
 
-                ammAlice.deposit(carol, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 ammAlice.deposit(
-                    carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
-                env(trust(gw, carol["USD"](0), tfClearFreeze));
+                    carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
+                env(trust(gw_, carol_["USD"](0), tfClearFreeze));
                 // Individually frozen AMM
                 env(trust(
-                    gw,
-                    STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0},
+                    gw_,
+                    STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0},
                     tfSetFreeze));
                 env.close();
                 // Can deposit non-frozen token
-                ammAlice.deposit(carol, XRP(100));
-                ammAlice.deposit(carol, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                ammAlice.deposit(carol_, XRP(100));
+                ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 ammAlice.deposit(
-                    carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
+                    carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
             },
             std::nullopt,
             0,
@@ -823,82 +823,82 @@ private:
         // Individually frozen (AMM) account with IOU/IOU AMM
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(trust(gw, carol["USD"](0), tfSetFreeze));
-                env(trust(gw, carol["BTC"](0), tfSetFreeze));
+                env(trust(gw_, carol_["USD"](0), tfSetFreeze));
+                env(trust(gw_, carol_["BTC"](0), tfSetFreeze));
                 env.close();
-                ammAlice.deposit(carol, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 ammAlice.deposit(
-                    carol, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecFROZEN));
-                env(trust(gw, carol["USD"](0), tfClearFreeze));
+                    carol_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecFROZEN));
+                env(trust(gw_, carol_["USD"](0), tfClearFreeze));
                 // Individually frozen AMM
                 env(trust(
-                    gw,
-                    STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0},
+                    gw_,
+                    STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0},
                     tfSetFreeze));
                 env.close();
                 // Cannot deposit non-frozen token
-                ammAlice.deposit(carol, 1'000'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                ammAlice.deposit(carol_, 1'000'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
                 ammAlice.deposit(
-                    carol, USD(100), BTC(0.01), std::nullopt, std::nullopt, ter(tecFROZEN));
+                    carol_, USD(100), BTC(0.01), std::nullopt, std::nullopt, Ter(tecFROZEN));
             },
             {{USD(20'000), BTC(0.5)}});
 
         // Deposit unauthorized token.
         {
             Env env(*this, features);
-            env.fund(XRP(1000), gw, alice, bob);
-            env(fset(gw, asfRequireAuth));
+            env.fund(XRP(1000), gw_, alice_, bob_);
+            env(fset(gw_, asfRequireAuth));
             env.close();
-            env(trust(gw, alice["USD"](100)), txflags(tfSetfAuth));
-            env(trust(alice, gw["USD"](20)));
+            env(trust(gw_, alice_["USD"](100)), Txflags(tfSetfAuth));
+            env(trust(alice_, gw_["USD"](20)));
             env.close();
-            env(pay(gw, alice, gw["USD"](10)));
+            env(pay(gw_, alice_, gw_["USD"](10)));
             env.close();
-            env(trust(gw, bob["USD"](100)));
+            env(trust(gw_, bob_["USD"](100)));
             env.close();
 
-            AMM amm(env, alice, XRP(10), gw["USD"](10), ter(tesSUCCESS));
+            AMM amm(env, alice_, XRP(10), gw_["USD"](10), Ter(tesSUCCESS));
             env.close();
 
             if (features[featureAMMClawback])
             {
-                // if featureAMMClawback is enabled, bob can not deposit XRP
+                // if featureAMMClawback is enabled, bob_ can not deposit XRP
                 // because he's not authorized to hold the paired token
-                // gw["USD"].
+                // gw_["USD"].
                 amm.deposit(
-                    bob, XRP(10), std::nullopt, std::nullopt, std::nullopt, ter(tecNO_AUTH));
+                    bob_, XRP(10), std::nullopt, std::nullopt, std::nullopt, Ter(tecNO_AUTH));
             }
             else
             {
                 amm.deposit(
-                    bob, XRP(10), std::nullopt, std::nullopt, std::nullopt, ter(tesSUCCESS));
+                    bob_, XRP(10), std::nullopt, std::nullopt, std::nullopt, Ter(tesSUCCESS));
             }
         }
 
         // Insufficient XRP balance
         testAMM([&](AMM& ammAlice, Env& env) {
-            env.fund(XRP(1'000), bob);
+            env.fund(XRP(1'000), bob_);
             env.close();
             // Adds LPT trustline
-            ammAlice.deposit(bob, XRP(10));
+            ammAlice.deposit(bob_, XRP(10));
             ammAlice.deposit(
-                bob, XRP(1'000), std::nullopt, std::nullopt, std::nullopt, ter(tecUNFUNDED_AMM));
+                bob_, XRP(1'000), std::nullopt, std::nullopt, std::nullopt, Ter(tecUNFUNDED_AMM));
         });
 
         // Insufficient USD balance
         testAMM([&](AMM& ammAlice, Env& env) {
-            fund(env, gw, {bob}, {USD(1'000)}, Fund::Acct);
+            fund(env, gw_, {bob_}, {USD(1'000)}, Fund::Acct);
             env.close();
             ammAlice.deposit(
-                bob, USD(1'001), std::nullopt, std::nullopt, std::nullopt, ter(tecUNFUNDED_AMM));
+                bob_, USD(1'001), std::nullopt, std::nullopt, std::nullopt, Ter(tecUNFUNDED_AMM));
         });
 
         // Insufficient USD balance by tokens
         testAMM([&](AMM& ammAlice, Env& env) {
-            fund(env, gw, {bob}, {USD(1'000)}, Fund::Acct);
+            fund(env, gw_, {bob_}, {USD(1'000)}, Fund::Acct);
             env.close();
             ammAlice.deposit(
-                bob,
+                bob_,
                 10'000'000,
                 std::nullopt,
                 std::nullopt,
@@ -907,18 +907,18 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecUNFUNDED_AMM));
+                Ter(tecUNFUNDED_AMM));
         });
 
         // Insufficient XRP balance by tokens
         testAMM([&](AMM& ammAlice, Env& env) {
-            env.fund(XRP(1'000), bob);
-            env.trust(USD(100'000), bob);
+            env.fund(XRP(1'000), bob_);
+            env.trust(USD(100'000), bob_);
             env.close();
-            env(pay(gw, bob, USD(90'000)));
+            env(pay(gw_, bob_, USD(90'000)));
             env.close();
             ammAlice.deposit(
-                bob,
+                bob_,
                 10'000'000,
                 std::nullopt,
                 std::nullopt,
@@ -927,79 +927,79 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecUNFUNDED_AMM));
+                Ter(tecUNFUNDED_AMM));
         });
 
         // Insufficient reserve, XRP/IOU
         {
             Env env(*this);
-            auto const starting_xrp = reserve(env, 4) + env.current()->fees().base * 4;
-            env.fund(XRP(10'000), gw);
-            env.fund(XRP(10'000), alice);
-            env.fund(starting_xrp, carol);
-            env.trust(USD(2'000), alice);
-            env.trust(USD(2'000), carol);
+            auto const startingXrp = reserve(env, 4) + env.current()->fees().base * 4;
+            env.fund(XRP(10'000), gw_);
+            env.fund(XRP(10'000), alice_);
+            env.fund(startingXrp, carol_);
+            env.trust(USD(2'000), alice_);
+            env.trust(USD(2'000), carol_);
             env.close();
-            env(pay(gw, alice, USD(2'000)));
-            env(pay(gw, carol, USD(2'000)));
+            env(pay(gw_, alice_, USD(2'000)));
+            env(pay(gw_, carol_, USD(2'000)));
             env.close();
-            env(offer(carol, XRP(100), USD(101)));
-            env(offer(carol, XRP(100), USD(102)));
-            AMM ammAlice(env, alice, XRP(1'000), USD(1'000));
+            env(offer(carol_, XRP(100), USD(101)));
+            env(offer(carol_, XRP(100), USD(102)));
+            AMM ammAlice(env, alice_, XRP(1'000), USD(1'000));
             ammAlice.deposit(
-                carol,
+                carol_,
                 XRP(100),
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecINSUF_RESERVE_LINE));
+                Ter(tecINSUF_RESERVE_LINE));
 
-            env(offer(carol, XRP(100), USD(103)));
+            env(offer(carol_, XRP(100), USD(103)));
             ammAlice.deposit(
-                carol,
+                carol_,
                 USD(100),
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecINSUF_RESERVE_LINE));
+                Ter(tecINSUF_RESERVE_LINE));
         }
 
         // Insufficient reserve, IOU/IOU
         {
             Env env(*this);
-            auto const starting_xrp = reserve(env, 4) + env.current()->fees().base * 4;
-            env.fund(XRP(10'000), gw);
-            env.fund(XRP(10'000), alice);
-            env.fund(starting_xrp, carol);
-            env.trust(USD(2'000), alice);
-            env.trust(EUR(2'000), alice);
-            env.trust(USD(2'000), carol);
-            env.trust(EUR(2'000), carol);
+            auto const startingXrp = reserve(env, 4) + env.current()->fees().base * 4;
+            env.fund(XRP(10'000), gw_);
+            env.fund(XRP(10'000), alice_);
+            env.fund(startingXrp, carol_);
+            env.trust(USD(2'000), alice_);
+            env.trust(EUR(2'000), alice_);
+            env.trust(USD(2'000), carol_);
+            env.trust(EUR(2'000), carol_);
             env.close();
-            env(pay(gw, alice, USD(2'000)));
-            env(pay(gw, alice, EUR(2'000)));
-            env(pay(gw, carol, USD(2'000)));
-            env(pay(gw, carol, EUR(2'000)));
+            env(pay(gw_, alice_, USD(2'000)));
+            env(pay(gw_, alice_, EUR(2'000)));
+            env(pay(gw_, carol_, USD(2'000)));
+            env(pay(gw_, carol_, EUR(2'000)));
             env.close();
-            env(offer(carol, XRP(100), USD(101)));
-            env(offer(carol, XRP(100), USD(102)));
-            AMM ammAlice(env, alice, XRP(1'000), USD(1'000));
+            env(offer(carol_, XRP(100), USD(101)));
+            env(offer(carol_, XRP(100), USD(102)));
+            AMM ammAlice(env, alice_, XRP(1'000), USD(1'000));
             ammAlice.deposit(
-                carol,
+                carol_,
                 XRP(100),
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecINSUF_RESERVE_LINE));
+                Ter(tecINSUF_RESERVE_LINE));
         }
 
         // Invalid min
         testAMM([&](AMM& ammAlice, Env& env) {
             // min tokens can't be <= zero
-            ammAlice.deposit(carol, 0, XRP(100), tfSingleAsset, ter(temBAD_AMM_TOKENS));
-            ammAlice.deposit(carol, -1, XRP(100), tfSingleAsset, ter(temBAD_AMM_TOKENS));
+            ammAlice.deposit(carol_, 0, XRP(100), tfSingleAsset, Ter(temBAD_AMM_TOKENS));
+            ammAlice.deposit(carol_, -1, XRP(100), tfSingleAsset, Ter(temBAD_AMM_TOKENS));
             ammAlice.deposit(
-                carol,
+                carol_,
                 0,
                 XRP(100),
                 USD(100),
@@ -1008,10 +1008,10 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_AMM_TOKENS));
+                Ter(temBAD_AMM_TOKENS));
             // min amounts can't be <= zero
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000,
                 XRP(0),
                 USD(100),
@@ -1020,9 +1020,9 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_AMOUNT));
+                Ter(temBAD_AMOUNT));
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000,
                 XRP(100),
                 USD(-1),
@@ -1031,10 +1031,10 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_AMOUNT));
+                Ter(temBAD_AMOUNT));
             // min amount bad currency
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000,
                 XRP(100),
                 BAD(100),
@@ -1043,10 +1043,10 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_CURRENCY));
+                Ter(temBAD_CURRENCY));
             // min amount bad token pair
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000,
                 XRP(100),
                 XRP(100),
@@ -1055,9 +1055,9 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_AMM_TOKENS));
+                Ter(temBAD_AMM_TOKENS));
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000,
                 XRP(100),
                 GBP(100),
@@ -1066,14 +1066,14 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(temBAD_AMM_TOKENS));
+                Ter(temBAD_AMM_TOKENS));
         });
 
         // Min deposit
         testAMM([&](AMM& ammAlice, Env& env) {
             // Equal deposit by tokens
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000'000,
                 XRP(1'000),
                 USD(1'001),
@@ -1082,9 +1082,9 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000'000,
                 XRP(1'001),
                 USD(1'000),
@@ -1093,10 +1093,10 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
             // Equal deposit by asset
             ammAlice.deposit(
-                carol,
+                carol_,
                 100'001,
                 XRP(100),
                 USD(100),
@@ -1105,10 +1105,10 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
             // Single deposit by asset
             ammAlice.deposit(
-                carol,
+                carol_,
                 488'090,
                 XRP(1'000),
                 std::nullopt,
@@ -1117,12 +1117,12 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
         });
 
         // Equal deposit, tokens rounded to 0
         testAMM([&](AMM& amm, Env& env) {
-            amm.deposit(DepositArg{.tokens = IOUAmount{1, -12}, .err = ter(tecAMM_INVALID_TOKENS)});
+            amm.deposit(DepositArg{.tokens = IOUAmount{1, -12}, .err = Ter(tecAMM_INVALID_TOKENS)});
         });
 
         // Equal deposit limit, tokens rounded to 0
@@ -1132,7 +1132,7 @@ private:
                     DepositArg{
                         .asset1In = STAmount{USD, 1, -15},
                         .asset2In = XRPAmount{1},
-                        .err = ter(tecAMM_INVALID_TOKENS)});
+                        .err = Ter(tecAMM_INVALID_TOKENS)});
             },
             {.pool = {{USD(1'000'000), XRP(1'000'000)}}, .features = {features - fixAMMv1_3}});
         testAMM([&](AMM& amm, Env& env) {
@@ -1140,13 +1140,13 @@ private:
                 DepositArg{
                     .asset1In = STAmount{USD, 1, -15},
                     .asset2In = XRPAmount{1},
-                    .err = ter(tecAMM_INVALID_TOKENS)});
+                    .err = Ter(tecAMM_INVALID_TOKENS)});
         });
 
         // Single deposit by asset, tokens rounded to 0
         testAMM([&](AMM& amm, Env& env) {
             amm.deposit(
-                DepositArg{.asset1In = STAmount{USD, 1, -15}, .err = ter(tecAMM_INVALID_TOKENS)});
+                DepositArg{.asset1In = STAmount{USD, 1, -15}, .err = Ter(tecAMM_INVALID_TOKENS)});
         });
 
         // Single deposit by tokens, tokens rounded to 0
@@ -1155,7 +1155,7 @@ private:
                 DepositArg{
                     .tokens = IOUAmount{1, -10},
                     .asset1In = STAmount{USD, 1, -15},
-                    .err = ter(tecAMM_INVALID_TOKENS)});
+                    .err = Ter(tecAMM_INVALID_TOKENS)});
         });
 
         // Single deposit with EPrice, tokens rounded to 0
@@ -1164,7 +1164,7 @@ private:
                 DepositArg{
                     .asset1In = STAmount{USD, 1, -15},
                     .maxEP = STAmount{USD, 1, -1},
-                    .err = ter(tecAMM_INVALID_TOKENS)});
+                    .err = Ter(tecAMM_INVALID_TOKENS)});
         });
     }
 
@@ -1173,19 +1173,19 @@ private:
     {
         testcase("Deposit");
 
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         using namespace jtx;
 
         // Equal deposit: 1000000 tokens, 10% of the current pool
         testAMM([&](AMM& ammAlice, Env& env) {
             auto const baseFee = env.current()->fees().base;
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000, 0}));
             // 30,000 less deposited 1,000
-            BEAST_EXPECT(expectHolding(env, carol, USD(29'000)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(29'000)));
             // 30,000 less deposited 1,000 and 10 drops tx fee
-            BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRPAmount{29'000'000'000 - baseFee}));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, carol_, XRPAmount{29'000'000'000 - baseFee}));
         });
 
         // equal asset deposit: unit test to exercise the rounding-down of
@@ -1199,8 +1199,8 @@ private:
                 IOUAmount const initLPToken = ammAlice.getLPTokensBalance();
                 IOUAmount const newLPTokens{deltaLPTokens};
 
-                // carol performs a two-asset deposit
-                ammAlice.deposit(DepositArg{.account = carol, .tokens = newLPTokens});
+                // carol_ performs a two-asset deposit
+                ammAlice.deposit(DepositArg{.account = carol_, .tokens = newLPTokens});
 
                 IOUAmount const finalLPToken = ammAlice.getLPTokensBalance();
 
@@ -1232,10 +1232,10 @@ private:
                     IOUAmount{1, 7} + newLPTokens));
 
                 // 30,000 less deposited depositUSD
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'000) - depositUSD));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'000) - depositUSD));
                 // 30,000 less deposited depositXRP and 10 drops tx fee
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, carol, XRP(30'000) - depositXRP - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, carol_, XRP(30'000) - depositXRP - txFee(env, 1)));
             });
         }
 
@@ -1245,7 +1245,7 @@ private:
         // to the pool composition not to exceed 100USD. Fail if exceeded.
         // Deposit 100USD/100XRP
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(100), XRP(100));
+            ammAlice.deposit(carol_, USD(100), XRP(100));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'100), USD(10'100), IOUAmount{10'100'000, 0}));
         });
@@ -1253,20 +1253,20 @@ private:
         // Equal limit deposit.
         // Try to deposit 200USD/100XRP. Is truncated to 100USD/100XRP.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(200), XRP(100));
+            ammAlice.deposit(carol_, USD(200), XRP(100));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'100), USD(10'100), IOUAmount{10'100'000, 0}));
         });
         // Try to deposit 100USD/200XRP. Is truncated to 100USD/100XRP.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(100), XRP(200));
+            ammAlice.deposit(carol_, USD(100), XRP(200));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'100), USD(10'100), IOUAmount{10'100'000, 0}));
         });
 
         // Single deposit: 1000 USD
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(1'000));
+            ammAlice.deposit(carol_, USD(1'000));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000),
                 STAmount{USD, UINT64_C(10'999'99999999999), -11},
@@ -1275,21 +1275,21 @@ private:
 
         // Single deposit: 1000 XRP
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, XRP(1'000));
+            ammAlice.deposit(carol_, XRP(1'000));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(11'000), USD(10'000), IOUAmount{10'488'088'48170151, -8}));
         });
 
         // Single deposit: 100000 tokens worth of USD
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 100000, USD(205));
+            ammAlice.deposit(carol_, 100000, USD(205));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'000), USD(10'201), IOUAmount{10'100'000, 0}));
         });
 
         // Single deposit: 100000 tokens worth of XRP
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.deposit(carol, 100'000, XRP(205));
+            ammAlice.deposit(carol_, 100'000, XRP(205));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'201), USD(10'000), IOUAmount{10'100'000, 0}));
         });
@@ -1297,7 +1297,7 @@ private:
         // Single deposit with EP not exceeding specified:
         // 100USD with EP not to exceed 0.1 (AssetIn/TokensOut)
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(1'000), std::nullopt, STAmount{USD, 1, -1});
+            ammAlice.deposit(carol_, USD(1'000), std::nullopt, STAmount{USD, 1, -1});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000),
                 STAmount{USD, UINT64_C(10'999'99999999999), -11},
@@ -1307,7 +1307,7 @@ private:
         // Single deposit with EP not exceeding specified:
         // 100USD with EP not to exceed 0.002004 (AssetIn/TokensOut)
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(100), std::nullopt, STAmount{USD, 2004, -6});
+            ammAlice.deposit(carol_, USD(100), std::nullopt, STAmount{USD, 2004, -6});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000), STAmount{USD, 10'080'16, -2}, IOUAmount{10'040'000, 0}));
         });
@@ -1315,7 +1315,7 @@ private:
         // Single deposit with EP not exceeding specified:
         // 0USD with EP not to exceed 0.002004 (AssetIn/TokensOut)
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(0), std::nullopt, STAmount{USD, 2004, -6});
+            ammAlice.deposit(carol_, USD(0), std::nullopt, STAmount{USD, 2004, -6});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000), STAmount{USD, 10'080'16, -2}, IOUAmount{10'040'000, 0}));
         });
@@ -1323,55 +1323,55 @@ private:
         // IOU to IOU + transfer fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000), BTC(0.5)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_}, {USD(20'000), BTC(0.5)}, Fund::All);
+            env(rate(gw_, 1.25));
             env.close();
-            AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
+            AMM ammAlice(env, alice_, USD(20'000), BTC(0.5));
             BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(0.5), IOUAmount{100, 0}));
-            BEAST_EXPECT(expectHolding(env, alice, USD(0)));
-            BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
-            fund(env, gw, {carol}, {USD(2'000), BTC(0.05)}, Fund::Acct);
+            BEAST_EXPECT(expectHolding(env, alice_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, alice_, BTC(0)));
+            fund(env, gw_, {carol_}, {USD(2'000), BTC(0.05)}, Fund::Acct);
             // no transfer fee on deposit
-            ammAlice.deposit(carol, 10);
+            ammAlice.deposit(carol_, 10);
             BEAST_EXPECT(ammAlice.expectBalances(USD(22'000), BTC(0.55), IOUAmount{110, 0}));
-            BEAST_EXPECT(expectHolding(env, carol, USD(0)));
-            BEAST_EXPECT(expectHolding(env, carol, BTC(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, BTC(0)));
         }
 
         // Tiny deposits
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, IOUAmount{1, -3});
+            ammAlice.deposit(carol_, IOUAmount{1, -3});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount{10'000'000'001},
                 STAmount{USD, UINT64_C(10'000'000001), -6},
                 IOUAmount{10'000'000'001, -3}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1, -3}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1, -3}));
         });
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, XRPAmount{1});
+            ammAlice.deposit(carol_, XRPAmount{1});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount{10'000'000'001}, USD(10'000), IOUAmount{1'000'000'000049999, -8}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{49999, -8}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{49999, -8}));
         });
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, STAmount{USD, 1, -10});
+            ammAlice.deposit(carol_, STAmount{USD, 1, -10});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000),
                 STAmount{USD, UINT64_C(10'000'00000000008), -11},
                 IOUAmount{10'000'000'00000004, -8}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{4, -8}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{4, -8}));
         });
 
         // Issuer create/deposit
         for (auto const& feat : {all, all - fixAMMv1_3})
         {
             Env env(*this, feat);
-            env.fund(XRP(30000), gw);
-            AMM ammGw(env, gw, XRP(10'000), USD(10'000));
+            env.fund(XRP(30000), gw_);
+            AMM ammGw(env, gw_, XRP(10'000), USD(10'000));
             BEAST_EXPECT(ammGw.expectBalances(XRP(10'000), USD(10'000), ammGw.tokens()));
-            ammGw.deposit(gw, 1'000'000);
+            ammGw.deposit(gw_, 1'000'000);
             BEAST_EXPECT(ammGw.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000}));
-            ammGw.deposit(gw, USD(1'000));
+            ammGw.deposit(gw_, USD(1'000));
             BEAST_EXPECT(ammGw.expectBalances(
                 XRP(11'000),
                 STAmount{USD, UINT64_C(11'999'99999999998), -11},
@@ -1380,9 +1380,9 @@ private:
 
         // Issuer deposit
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.deposit(gw, 1'000'000);
+            ammAlice.deposit(gw_, 1'000'000);
             BEAST_EXPECT(ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000}));
-            ammAlice.deposit(gw, USD(1'000));
+            ammAlice.deposit(gw_, USD(1'000));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(11'000),
                 STAmount{USD, UINT64_C(11'999'99999999998), -11},
@@ -1393,7 +1393,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             // Equal deposit by tokens
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000'000,
                 XRP(1'000),
                 USD(1'000),
@@ -1407,7 +1407,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             // Equal deposit by asset
             ammAlice.deposit(
-                carol,
+                carol_,
                 1'000'000,
                 XRP(1'000),
                 USD(1'000),
@@ -1421,7 +1421,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             // Single deposit by asset
             ammAlice.deposit(
-                carol,
+                carol_,
                 488'088,
                 XRP(1'000),
                 std::nullopt,
@@ -1435,7 +1435,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             // Single deposit by asset
             ammAlice.deposit(
-                carol,
+                carol_,
                 488'088,
                 USD(1'000),
                 std::nullopt,
@@ -1455,14 +1455,14 @@ private:
     {
         testcase("Invalid Withdraw");
 
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         using namespace jtx;
 
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .asset1Out = XRP(100),
-                    .err = ter(tecAMM_BALANCE),
+                    .err = Ter(tecAMM_BALANCE),
                 };
                 ammAlice.withdraw(args);
             },
@@ -1472,7 +1472,7 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 WithdrawArg const args{
                     .asset1Out = USD(100),
-                    .err = ter(tecAMM_BALANCE),
+                    .err = Ter(tecAMM_BALANCE),
                 };
                 ammAlice.withdraw(args);
             },
@@ -1480,23 +1480,23 @@ private:
 
         {
             Env env{*this};
-            env.fund(XRP(30'000), gw, alice, bob);
+            env.fund(XRP(30'000), gw_, alice_, bob_);
             env.close();
-            env(fset(gw, asfRequireAuth));
+            env(fset(gw_, asfRequireAuth));
             env.close();
-            env(trust(alice, gw["USD"](30'000), 0));
-            env(trust(gw, alice["USD"](0), tfSetfAuth));
+            env(trust(alice_, gw_["USD"](30'000), 0));
+            env(trust(gw_, alice_["USD"](0), tfSetfAuth));
             // Bob trusts Gateway to owe him USD...
-            env(trust(bob, gw["USD"](30'000), 0));
+            env(trust(bob_, gw_["USD"](30'000), 0));
             // ...but Gateway does not authorize Bob to hold its USD.
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
-            AMM ammAlice(env, alice, XRP(10'000), USD(10'000));
+            AMM ammAlice(env, alice_, XRP(10'000), USD(10'000));
             WithdrawArg const args{
-                .account = bob,
+                .account = bob_,
                 .asset1Out = USD(100),
-                .err = ter(tecNO_AUTH),
+                .err = Ter(tecNO_AUTH),
             };
             ammAlice.withdraw(args);
         }
@@ -1504,7 +1504,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             // Invalid flags
             ammAlice.withdraw(
-                alice,
+                alice_,
                 1'000'000,
                 std::nullopt,
                 std::nullopt,
@@ -1512,9 +1512,9 @@ private:
                 tfBurnable,
                 std::nullopt,
                 std::nullopt,
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
             ammAlice.withdraw(
-                alice,
+                alice_,
                 1'000'000,
                 std::nullopt,
                 std::nullopt,
@@ -1522,7 +1522,7 @@ private:
                 tfTwoAssetIfEmpty,
                 std::nullopt,
                 std::nullopt,
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
 
             // Invalid options
             std::vector<std::tuple<
@@ -1586,7 +1586,7 @@ private:
             for (auto const& it : invalidOptions)
             {
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     std::get<0>(it),
                     std::get<1>(it),
                     std::get<2>(it),
@@ -1594,34 +1594,34 @@ private:
                     std::get<4>(it),
                     std::nullopt,
                     std::nullopt,
-                    ter(std::get<5>(it)));
+                    Ter(std::get<5>(it)));
             }
 
             // Invalid tokens
-            ammAlice.withdraw(alice, 0, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+            ammAlice.withdraw(alice_, 0, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
             ammAlice.withdraw(
-                alice, IOUAmount{-1}, std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+                alice_, IOUAmount{-1}, std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Mismatched token, invalid Asset1Out issue
-            ammAlice.withdraw(alice, GBP(100), std::nullopt, std::nullopt, ter(temBAD_AMM_TOKENS));
+            ammAlice.withdraw(alice_, GBP(100), std::nullopt, std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Mismatched token, invalid Asset2Out issue
-            ammAlice.withdraw(alice, USD(100), GBP(100), std::nullopt, ter(temBAD_AMM_TOKENS));
+            ammAlice.withdraw(alice_, USD(100), GBP(100), std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Mismatched token, Asset1Out.issue == Asset2Out.issue
-            ammAlice.withdraw(alice, USD(100), USD(100), std::nullopt, ter(temBAD_AMM_TOKENS));
+            ammAlice.withdraw(alice_, USD(100), USD(100), std::nullopt, Ter(temBAD_AMM_TOKENS));
 
             // Invalid amount value
-            ammAlice.withdraw(alice, USD(0), std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
-            ammAlice.withdraw(alice, USD(-100), std::nullopt, std::nullopt, ter(temBAD_AMOUNT));
-            ammAlice.withdraw(alice, USD(10), std::nullopt, IOUAmount{-1}, ter(temBAD_AMOUNT));
+            ammAlice.withdraw(alice_, USD(0), std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
+            ammAlice.withdraw(alice_, USD(-100), std::nullopt, std::nullopt, Ter(temBAD_AMOUNT));
+            ammAlice.withdraw(alice_, USD(10), std::nullopt, IOUAmount{-1}, Ter(temBAD_AMOUNT));
 
             // Invalid amount/token value, withdraw all tokens from one side
             // of the pool.
-            ammAlice.withdraw(alice, USD(10'000), std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
-            ammAlice.withdraw(alice, XRP(10'000), std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
+            ammAlice.withdraw(alice_, USD(10'000), std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
+            ammAlice.withdraw(alice_, XRP(10'000), std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
             ammAlice.withdraw(
-                alice,
+                alice_,
                 std::nullopt,
                 USD(0),
                 std::nullopt,
@@ -1629,10 +1629,10 @@ private:
                 tfOneAssetWithdrawAll,
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_BALANCE));
+                Ter(tecAMM_BALANCE));
 
             // Bad currency
-            ammAlice.withdraw(alice, BAD(100), std::nullopt, std::nullopt, ter(temBAD_CURRENCY));
+            ammAlice.withdraw(alice_, BAD(100), std::nullopt, std::nullopt, Ter(temBAD_CURRENCY));
 
             // Invalid Account
             Account const bad("bad");
@@ -1645,12 +1645,12 @@ private:
                 std::nullopt,
                 std::nullopt,
                 std::nullopt,
-                seq(1),
-                ter(terNO_ACCOUNT));
+                Seq(1),
+                Ter(terNO_ACCOUNT));
 
             // Invalid AMM
             ammAlice.withdraw(
-                alice,
+                alice_,
                 1'000,
                 std::nullopt,
                 std::nullopt,
@@ -1658,27 +1658,27 @@ private:
                 std::nullopt,
                 {{USD, GBP}},
                 std::nullopt,
-                ter(terNO_AMM));
+                Ter(terNO_AMM));
 
             // Carol is not a Liquidity Provider
-            ammAlice.withdraw(carol, 10'000, std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
+            ammAlice.withdraw(carol_, 10'000, std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
 
             // Withdrawing from one side.
             // XRP by tokens
             ammAlice.withdraw(
-                alice, IOUAmount(9'999'999'9999, -4), XRP(0), std::nullopt, ter(tecAMM_BALANCE));
+                alice_, IOUAmount(9'999'999'9999, -4), XRP(0), std::nullopt, Ter(tecAMM_BALANCE));
             // USD by tokens
             ammAlice.withdraw(
-                alice, IOUAmount(9'999'999'9, -1), USD(0), std::nullopt, ter(tecAMM_BALANCE));
+                alice_, IOUAmount(9'999'999'9, -1), USD(0), std::nullopt, Ter(tecAMM_BALANCE));
             // XRP
-            ammAlice.withdraw(alice, XRP(10'000), std::nullopt, std::nullopt, ter(tecAMM_BALANCE));
+            ammAlice.withdraw(alice_, XRP(10'000), std::nullopt, std::nullopt, Ter(tecAMM_BALANCE));
             // USD
             ammAlice.withdraw(
-                alice,
+                alice_,
                 STAmount{USD, UINT64_C(9'999'9999999999999), -13},
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_BALANCE));
+                Ter(tecAMM_BALANCE));
         });
 
         testAMM(
@@ -1690,9 +1690,9 @@ private:
                 // while leaving a tiny amount in USD pool.
                 // Post-amendment:
                 // Most of the pool is withdrawn with remaining tiny amounts
-                auto err = env.enabled(fixAMMv1_3) ? ter(tesSUCCESS) : ter(tecAMM_BALANCE);
+                auto err = env.enabled(fixAMMv1_3) ? Ter(tesSUCCESS) : Ter(tecAMM_BALANCE);
                 ammAlice.withdraw(
-                    alice, IOUAmount{9'999'999'9999, -4}, std::nullopt, std::nullopt, err);
+                    alice_, IOUAmount{9'999'999'9999, -4}, std::nullopt, std::nullopt, err);
                 if (env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -1712,9 +1712,9 @@ private:
                 // Equal withdraw but due to XRP precision limit,
                 // this results in full withdraw of XRP pool only,
                 // while leaving a tiny amount in USD pool.
-                auto err = env.enabled(fixAMMv1_3) ? ter(tesSUCCESS) : ter(tecAMM_BALANCE);
+                auto err = env.enabled(fixAMMv1_3) ? Ter(tesSUCCESS) : Ter(tecAMM_BALANCE);
                 ammAlice.withdraw(
-                    alice, IOUAmount{9'999'999'999999999, -9}, std::nullopt, std::nullopt, err);
+                    alice_, IOUAmount{9'999'999'999999999, -9}, std::nullopt, std::nullopt, err);
                 if (env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -1728,52 +1728,52 @@ private:
 
         // Invalid AMM
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.withdrawAll(alice);
-            ammAlice.withdraw(alice, 10'000, std::nullopt, std::nullopt, ter(terNO_AMM));
+            ammAlice.withdrawAll(alice_);
+            ammAlice.withdraw(alice_, 10'000, std::nullopt, std::nullopt, Ter(terNO_AMM));
         });
 
         // Globally frozen asset
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.deposit({.account = gw, .asset1In = USD(1'000), .asset2In = XRP(1'000)});
-            env(fset(gw, asfGlobalFreeze));
+            ammAlice.deposit({.account = gw_, .asset1In = USD(1'000), .asset2In = XRP(1'000)});
+            env(fset(gw_, asfGlobalFreeze));
             env.close();
             // Can withdraw non-frozen token
-            for (auto const& account : {alice, gw})
+            for (auto const& account : {alice_, gw_})
             {
                 ammAlice.withdraw(account, XRP(100));
-                ammAlice.withdraw(account, USD(100), std::nullopt, std::nullopt, ter(tecFROZEN));
-                ammAlice.withdraw(account, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
+                ammAlice.withdraw(account, USD(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
+                ammAlice.withdraw(account, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
             }
         });
 
         // Individually frozen (AMM) account
         testAMM([&](AMM& ammAlice, Env& env) {
-            env(trust(gw, alice["USD"](0), tfSetFreeze));
+            env(trust(gw_, alice_["USD"](0), tfSetFreeze));
             env.close();
             // Can withdraw non-frozen token
-            ammAlice.withdraw(alice, XRP(100));
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt, ter(tecFROZEN));
-            env(trust(gw, alice["USD"](0), tfClearFreeze));
+            ammAlice.withdraw(alice_, XRP(100));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
+            env(trust(gw_, alice_["USD"](0), tfClearFreeze));
             // Individually frozen AMM
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
+                gw_, STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
             // Can withdraw non-frozen token
-            ammAlice.withdraw(alice, XRP(100));
-            ammAlice.withdraw(alice, 1'000, std::nullopt, std::nullopt, ter(tecFROZEN));
-            ammAlice.withdraw(alice, USD(100), std::nullopt, std::nullopt, ter(tecFROZEN));
+            ammAlice.withdraw(alice_, XRP(100));
+            ammAlice.withdraw(alice_, 1'000, std::nullopt, std::nullopt, Ter(tecFROZEN));
+            ammAlice.withdraw(alice_, USD(100), std::nullopt, std::nullopt, Ter(tecFROZEN));
         });
 
         // Carol withdraws more than she owns
         testAMM([&](AMM& ammAlice, Env&) {
             // Single deposit of 100000 worth of tokens,
             // which is 10% of the pool. Carol is LP now.
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000, 0}));
 
             ammAlice.withdraw(
-                carol, 2'000'000, std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                carol_, 2'000'000, std::nullopt, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000, 0}));
         });
@@ -1782,10 +1782,10 @@ private:
         // to withdraw are 0.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 auto const err =
-                    env.enabled(fixAMMv1_3) ? ter(tecAMM_INVALID_TOKENS) : ter(tecAMM_FAILED);
-                ammAlice.withdraw(carol, USD(100), std::nullopt, IOUAmount{500, 0}, err);
+                    env.enabled(fixAMMv1_3) ? Ter(tecAMM_INVALID_TOKENS) : Ter(tecAMM_FAILED);
+                ammAlice.withdraw(carol_, USD(100), std::nullopt, IOUAmount{500, 0}, err);
             },
             std::nullopt,
             0,
@@ -1795,46 +1795,46 @@ private:
         // Withdraw with EPrice limit. Fails to withdraw, calculated tokens
         // to withdraw are greater than the LP shares.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             ammAlice.withdraw(
-                carol, USD(100), std::nullopt, IOUAmount{600, 0}, ter(tecAMM_INVALID_TOKENS));
+                carol_, USD(100), std::nullopt, IOUAmount{600, 0}, Ter(tecAMM_INVALID_TOKENS));
         });
 
         // Withdraw with EPrice limit. Fails to withdraw, amount1
         // to withdraw is less than 1700USD.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             ammAlice.withdraw(
-                carol, USD(1'700), std::nullopt, IOUAmount{520, 0}, ter(tecAMM_FAILED));
+                carol_, USD(1'700), std::nullopt, IOUAmount{520, 0}, Ter(tecAMM_FAILED));
         });
 
         // Deposit/Withdraw the same amount with the trading fee
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, USD(1'000));
+                ammAlice.deposit(carol_, USD(1'000));
                 ammAlice.withdraw(
-                    carol, USD(1'000), std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                    carol_, USD(1'000), std::nullopt, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
             },
             std::nullopt,
             1'000);
         testAMM(
             [&](AMM& ammAlice, Env&) {
-                ammAlice.deposit(carol, XRP(1'000));
+                ammAlice.deposit(carol_, XRP(1'000));
                 ammAlice.withdraw(
-                    carol, XRP(1'000), std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                    carol_, XRP(1'000), std::nullopt, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
             },
             std::nullopt,
             1'000);
 
         // Deposit/Withdraw the same amount fails due to the tokens adjustment
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, STAmount{USD, 1, -6});
+            ammAlice.deposit(carol_, STAmount{USD, 1, -6});
             ammAlice.withdraw(
-                carol,
+                carol_,
                 STAmount{USD, 1, -6},
                 std::nullopt,
                 std::nullopt,
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         });
 
         // Withdraw close to one side of the pool. Account's LP tokens
@@ -1842,9 +1842,9 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 auto const err =
-                    env.enabled(fixAMMv1_3) ? ter(tecINVARIANT_FAILED) : ter(tecAMM_BALANCE);
+                    env.enabled(fixAMMv1_3) ? Ter(tecINVARIANT_FAILED) : Ter(tecAMM_BALANCE);
                 ammAlice.withdraw(
-                    alice,
+                    alice_,
                     STAmount{USD, UINT64_C(9'999'999999999999), -12},
                     std::nullopt,
                     std::nullopt,
@@ -1856,35 +1856,35 @@ private:
         testAMM([&](AMM& ammAlice, Env&) {
             // XRP amount to withdraw is 0
             ammAlice.withdraw(
-                alice, IOUAmount{1, -5}, std::nullopt, std::nullopt, ter(tecAMM_FAILED));
+                alice_, IOUAmount{1, -5}, std::nullopt, std::nullopt, Ter(tecAMM_FAILED));
             // Calculated tokens to withdraw are 0
             ammAlice.withdraw(
-                alice,
+                alice_,
                 std::nullopt,
                 STAmount{USD, 1, -11},
                 std::nullopt,
-                ter(tecAMM_INVALID_TOKENS));
-            ammAlice.deposit(carol, STAmount{USD, 1, -10});
+                Ter(tecAMM_INVALID_TOKENS));
+            ammAlice.deposit(carol_, STAmount{USD, 1, -10});
             ammAlice.withdraw(
-                carol,
+                carol_,
                 std::nullopt,
                 STAmount{USD, 1, -9},
                 std::nullopt,
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             ammAlice.withdraw(
-                carol, std::nullopt, XRPAmount{1}, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                carol_, std::nullopt, XRPAmount{1}, std::nullopt, Ter(tecAMM_INVALID_TOKENS));
             ammAlice.withdraw(
-                WithdrawArg{.tokens = IOUAmount{1, -10}, .err = ter(tecAMM_INVALID_TOKENS)});
+                WithdrawArg{.tokens = IOUAmount{1, -10}, .err = Ter(tecAMM_INVALID_TOKENS)});
             ammAlice.withdraw(
                 WithdrawArg{
                     .asset1Out = STAmount{USD, 1, -15},
                     .asset2Out = XRPAmount{1},
-                    .err = ter(tecAMM_INVALID_TOKENS)});
+                    .err = Ter(tecAMM_INVALID_TOKENS)});
             ammAlice.withdraw(
                 WithdrawArg{
                     .tokens = IOUAmount{1, -10},
                     .asset1Out = STAmount{USD, 1, -15},
-                    .err = ter(tecAMM_INVALID_TOKENS)});
+                    .err = Ter(tecAMM_INVALID_TOKENS)});
         });
     }
 
@@ -1893,7 +1893,7 @@ private:
     {
         testcase("Withdraw");
 
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         using namespace jtx;
 
         // Equal withdrawal by Carol: 1000000 of tokens, 10% of the current
@@ -1902,27 +1902,27 @@ private:
             auto const baseFee = env.current()->fees().base.drops();
             // Single deposit of 100000 worth of tokens,
             // which is 10% of the pool. Carol is LP now.
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{11'000'000, 0}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
             // 30,000 less deposited 1,000
-            BEAST_EXPECT(expectHolding(env, carol, USD(29'000)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(29'000)));
             // 30,000 less deposited 1,000 and 10 drops tx fee
-            BEAST_EXPECT(expectLedgerEntryRoot(env, carol, XRPAmount{29'000'000'000 - baseFee}));
+            BEAST_EXPECT(expectLedgerEntryRoot(env, carol_, XRPAmount{29'000'000'000 - baseFee}));
 
             // Carol withdraws all tokens
-            ammAlice.withdraw(carol, 1'000'000);
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
-            BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+            ammAlice.withdraw(carol_, 1'000'000);
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
             BEAST_EXPECT(
-                expectLedgerEntryRoot(env, carol, XRPAmount{30'000'000'000 - (2 * baseFee)}));
+                expectLedgerEntryRoot(env, carol_, XRPAmount{30'000'000'000 - (2 * baseFee)}));
         });
 
         // Equal withdrawal by tokens 1000000, 10%
         // of the current pool
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, 1'000'000);
+            ammAlice.withdraw(alice_, 1'000'000);
             BEAST_EXPECT(ammAlice.expectBalances(XRP(9'000), USD(9'000), IOUAmount{9'000'000, 0}));
         });
 
@@ -1932,20 +1932,20 @@ private:
         // and proportionally withdraw XRP. It's the latter
         // in this case - XRP100/USD100.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, XRP(200), USD(100));
+            ammAlice.withdraw(alice_, XRP(200), USD(100));
             BEAST_EXPECT(ammAlice.expectBalances(XRP(9'900), USD(9'900), IOUAmount{9'900'000, 0}));
         });
 
         // Equal withdrawal with a limit. XRP100/USD100.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, XRP(100), USD(200));
+            ammAlice.withdraw(alice_, XRP(100), USD(200));
             BEAST_EXPECT(ammAlice.expectBalances(XRP(9'900), USD(9'900), IOUAmount{9'900'000, 0}));
         });
 
         // Single withdrawal by amount XRP1000
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdraw(alice, XRP(1'000));
+                ammAlice.withdraw(alice_, XRP(1'000));
                 if (!env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -1964,42 +1964,42 @@ private:
 
         // Single withdrawal by tokens 10000.
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, 10'000, USD(0));
+            ammAlice.withdraw(alice_, 10'000, USD(0));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'000), USD(9980.01), IOUAmount{9'990'000, 0}));
         });
 
         // Withdraw all tokens.
         testAMM([&](AMM& ammAlice, Env& env) {
-            env(trust(carol, STAmount{ammAlice.lptIssue(), 10'000}));
+            env(trust(carol_, STAmount{ammAlice.lptIssue(), 10'000}));
             // Can TrustSet only for AMM LP tokens
-            env(trust(carol, STAmount{Issue{EUR.currency, ammAlice.ammAccount()}, 10'000}),
-                ter(tecNO_PERMISSION));
+            env(trust(carol_, STAmount{Issue{EUR.currency, ammAlice.ammAccount()}, 10'000}),
+                Ter(tecNO_PERMISSION));
             env.close();
-            ammAlice.withdrawAll(alice);
+            ammAlice.withdrawAll(alice_);
             BEAST_EXPECT(!ammAlice.ammExists());
 
             BEAST_EXPECT(!env.le(keylet::ownerDir(ammAlice.ammAccount())));
 
             // Can create AMM for the XRP/USD pair
-            AMM const ammCarol(env, carol, XRP(10'000), USD(10'000));
+            AMM const ammCarol(env, carol_, XRP(10'000), USD(10'000));
             BEAST_EXPECT(
                 ammCarol.expectBalances(XRP(10'000), USD(10'000), IOUAmount{10'000'000, 0}));
         });
 
         // Single deposit 1000USD, withdraw all tokens in USD
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.deposit(carol, USD(1'000));
-            ammAlice.withdrawAll(carol, USD(0));
+            ammAlice.deposit(carol_, USD(1'000));
+            ammAlice.withdrawAll(carol_, USD(0));
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'000), USD(10'000), IOUAmount{10'000'000, 0}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount(beast::Zero())));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount(beast::Zero())));
         });
 
         // Single deposit 1000USD, withdraw all tokens in XRP
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, USD(1'000));
-            ammAlice.withdrawAll(carol, XRP(0));
+            ammAlice.deposit(carol_, USD(1'000));
+            ammAlice.withdrawAll(carol_, XRP(0));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount(9'090'909'091),
                 STAmount{USD, UINT64_C(10'999'99999999999), -11},
@@ -2012,12 +2012,12 @@ private:
                 // Since a smaller amount might be deposited due to
                 // the lp tokens adjustment, withdrawing by tokens
                 // is generally preferred to withdrawing by amount.
-                auto lpTokens = ammAlice.deposit(carol, USD(1'000));
-                ammAlice.withdraw(carol, lpTokens, USD(0));
-                lpTokens = ammAlice.deposit(carol, STAmount(USD, 1, -6));
-                ammAlice.withdraw(carol, lpTokens, USD(0));
-                lpTokens = ammAlice.deposit(carol, XRPAmount(1));
-                ammAlice.withdraw(carol, lpTokens, XRPAmount(0));
+                auto lpTokens = ammAlice.deposit(carol_, USD(1'000));
+                ammAlice.withdraw(carol_, lpTokens, USD(0));
+                lpTokens = ammAlice.deposit(carol_, STAmount(USD, 1, -6));
+                ammAlice.withdraw(carol_, lpTokens, USD(0));
+                lpTokens = ammAlice.deposit(carol_, XRPAmount(1));
+                ammAlice.withdraw(carol_, lpTokens, XRPAmount(0));
                 if (!env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(
@@ -2028,7 +2028,7 @@ private:
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount(10'000'000'001), USD(10'000), ammAlice.tokens()));
                 }
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
             std::nullopt,
             0,
@@ -2038,27 +2038,27 @@ private:
         // Single deposit by different accounts and then withdraw
         // in reverse.
         testAMM([&](AMM& ammAlice, Env&) {
-            auto const carolTokens = ammAlice.deposit(carol, USD(1'000));
-            auto const aliceTokens = ammAlice.deposit(alice, USD(1'000));
-            ammAlice.withdraw(alice, aliceTokens, USD(0));
-            ammAlice.withdraw(carol, carolTokens, USD(0));
+            auto const carolTokens = ammAlice.deposit(carol_, USD(1'000));
+            auto const aliceTokens = ammAlice.deposit(alice_, USD(1'000));
+            ammAlice.withdraw(alice_, aliceTokens, USD(0));
+            ammAlice.withdraw(carol_, carolTokens, USD(0));
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'000), ammAlice.tokens()));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(alice, ammAlice.tokens()));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(alice_, ammAlice.tokens()));
         });
 
         // Equal deposit 10%, withdraw all tokens
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.withdrawAll(carol);
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.withdrawAll(carol_);
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRP(10'000), USD(10'000), IOUAmount{10'000'000, 0}));
         });
 
         // Equal deposit 10%, withdraw all tokens in USD
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.withdrawAll(carol, USD(0));
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.withdrawAll(carol_, USD(0));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(11'000),
                 STAmount{USD, UINT64_C(9'090'909090909092), -12},
@@ -2067,8 +2067,8 @@ private:
 
         // Equal deposit 10%, withdraw all tokens in XRP
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.withdrawAll(carol, XRP(0));
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.withdrawAll(carol_, XRP(0));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount(9'090'909'091), USD(11'000), IOUAmount{10'000'000, 0}));
         });
@@ -2076,9 +2076,9 @@ private:
         // Withdraw with EPrice limit.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
-                ammAlice.withdraw(carol, USD(100), std::nullopt, IOUAmount{520, 0});
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -8}));
+                ammAlice.deposit(carol_, 1'000'000);
+                ammAlice.withdraw(carol_, USD(100), std::nullopt, IOUAmount{520, 0});
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -8}));
                 if (!env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -2100,17 +2100,17 @@ private:
                         STAmount{USD, UINT64_C(9'372'78106508877), -11},
                         IOUAmount{10'153'846'15384616, -8}));
                 }
-                ammAlice.withdrawAll(carol);
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+                ammAlice.withdrawAll(carol_);
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
             },
             {.features = {all, all - fixAMMv1_3, all - fixAMMv1_1 - fixAMMv1_3}, .noLog = true});
 
         // Withdraw with EPrice limit. AssetOut is 0.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
-                ammAlice.withdraw(carol, USD(0), std::nullopt, IOUAmount{520, 0});
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{153'846'15384616, -8}));
+                ammAlice.deposit(carol_, 1'000'000);
+                ammAlice.withdraw(carol_, USD(0), std::nullopt, IOUAmount{520, 0});
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{153'846'15384616, -8}));
                 if (!env.enabled(fixAMMv1_1) && !env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -2141,32 +2141,32 @@ private:
         // IOU to IOU + transfer fee
         {
             Env env{*this};
-            fund(env, gw, {alice}, {USD(20'000), BTC(0.5)}, Fund::All);
-            env(rate(gw, 1.25));
+            fund(env, gw_, {alice_}, {USD(20'000), BTC(0.5)}, Fund::All);
+            env(rate(gw_, 1.25));
             env.close();
             // no transfer fee on create
-            AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
+            AMM ammAlice(env, alice_, USD(20'000), BTC(0.5));
             BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(0.5), IOUAmount{100, 0}));
-            BEAST_EXPECT(expectHolding(env, alice, USD(0)));
-            BEAST_EXPECT(expectHolding(env, alice, BTC(0)));
-            fund(env, gw, {carol}, {USD(2'000), BTC(0.05)}, Fund::Acct);
+            BEAST_EXPECT(expectHolding(env, alice_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, alice_, BTC(0)));
+            fund(env, gw_, {carol_}, {USD(2'000), BTC(0.05)}, Fund::Acct);
             // no transfer fee on deposit
-            ammAlice.deposit(carol, 10);
+            ammAlice.deposit(carol_, 10);
             BEAST_EXPECT(ammAlice.expectBalances(USD(22'000), BTC(0.55), IOUAmount{110, 0}));
-            BEAST_EXPECT(expectHolding(env, carol, USD(0)));
-            BEAST_EXPECT(expectHolding(env, carol, BTC(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(0)));
+            BEAST_EXPECT(expectHolding(env, carol_, BTC(0)));
             // no transfer fee on withdraw
-            ammAlice.withdraw(carol, 10);
+            ammAlice.withdraw(carol_, 10);
             BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(0.5), IOUAmount{100, 0}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0, 0}));
-            BEAST_EXPECT(expectHolding(env, carol, USD(2'000)));
-            BEAST_EXPECT(expectHolding(env, carol, BTC(0.05)));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0, 0}));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(2'000)));
+            BEAST_EXPECT(expectHolding(env, carol_, BTC(0.05)));
         }
 
         // Tiny withdraw
         testAMM([&](AMM& ammAlice, Env&) {
             // By tokens
-            ammAlice.withdraw(alice, IOUAmount{1, -3});
+            ammAlice.withdraw(alice_, IOUAmount{1, -3});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount{9'999'999'999},
                 STAmount{USD, UINT64_C(9'999'999999), -6},
@@ -2175,7 +2175,7 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Single XRP pool
-                ammAlice.withdraw(alice, std::nullopt, XRPAmount{1});
+                ammAlice.withdraw(alice_, std::nullopt, XRPAmount{1});
                 if (!env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -2193,7 +2193,7 @@ private:
             {all, all - fixAMMv1_3});
         testAMM([&](AMM& ammAlice, Env&) {
             // Single USD pool
-            ammAlice.withdraw(alice, std::nullopt, STAmount{USD, 1, -10});
+            ammAlice.withdraw(alice_, std::nullopt, STAmount{USD, 1, -10});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10'000),
                 STAmount{USD, UINT64_C(9'999'9999999999), -10},
@@ -2203,29 +2203,29 @@ private:
         // Withdraw close to entire pool
         // Equal by tokens
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, IOUAmount{9'999'999'999, -3});
+            ammAlice.withdraw(alice_, IOUAmount{9'999'999'999, -3});
             BEAST_EXPECT(
                 ammAlice.expectBalances(XRPAmount{1}, STAmount{USD, 1, -6}, IOUAmount{1, -3}));
         });
         // USD by tokens
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, IOUAmount{9'999'999}, USD(0));
+            ammAlice.withdraw(alice_, IOUAmount{9'999'999}, USD(0));
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), STAmount{USD, 1, -10}, IOUAmount{1}));
         });
         // XRP by tokens
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, IOUAmount{9'999'900}, XRP(0));
+            ammAlice.withdraw(alice_, IOUAmount{9'999'900}, XRP(0));
             BEAST_EXPECT(ammAlice.expectBalances(XRPAmount{1}, USD(10'000), IOUAmount{100}));
         });
         // USD
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, STAmount{USD, UINT64_C(9'999'99999999999), -11});
+            ammAlice.withdraw(alice_, STAmount{USD, UINT64_C(9'999'99999999999), -11});
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRP(10000), STAmount{USD, 1, -11}, IOUAmount{316227765, -9}));
         });
         // XRP
         testAMM([&](AMM& ammAlice, Env&) {
-            ammAlice.withdraw(alice, XRPAmount{9'999'999'999});
+            ammAlice.withdraw(alice_, XRPAmount{9'999'999'999});
             BEAST_EXPECT(ammAlice.expectBalances(XRPAmount{1}, USD(10'000), IOUAmount{100}));
         });
     }
@@ -2244,30 +2244,35 @@ private:
                 tfWithdrawAll,
                 std::nullopt,
                 std::nullopt,
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
 
             // Invalid fee.
             ammAlice.vote(
-                std::nullopt, 1'001, std::nullopt, std::nullopt, std::nullopt, ter(temBAD_FEE));
+                std::nullopt, 1'001, std::nullopt, std::nullopt, std::nullopt, Ter(temBAD_FEE));
             BEAST_EXPECT(ammAlice.expectTradingFee(0));
 
             // Invalid Account
             Account const bad("bad");
             env.memoize(bad);
-            ammAlice.vote(bad, 1'000, std::nullopt, seq(1), std::nullopt, ter(terNO_ACCOUNT));
+            ammAlice.vote(bad, 1'000, std::nullopt, Seq(1), std::nullopt, Ter(terNO_ACCOUNT));
 
             // Invalid AMM
-            ammAlice.vote(alice, 1'000, std::nullopt, std::nullopt, {{USD, GBP}}, ter(terNO_AMM));
+            ammAlice.vote(alice_, 1'000, std::nullopt, std::nullopt, {{USD, GBP}}, Ter(terNO_AMM));
 
             // Account is not LP
             ammAlice.vote(
-                carol, 1'000, std::nullopt, std::nullopt, std::nullopt, ter(tecAMM_INVALID_TOKENS));
+                carol_,
+                1'000,
+                std::nullopt,
+                std::nullopt,
+                std::nullopt,
+                Ter(tecAMM_INVALID_TOKENS));
         });
 
         // Invalid AMM
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.withdrawAll(alice);
-            ammAlice.vote(alice, 1'000, std::nullopt, std::nullopt, std::nullopt, ter(terNO_AMM));
+            ammAlice.withdrawAll(alice_);
+            ammAlice.vote(alice_, 1'000, std::nullopt, std::nullopt, std::nullopt, Ter(terNO_AMM));
         });
     }
 
@@ -2275,7 +2280,7 @@ private:
     testFeeVote()
     {
         testcase("Fee Vote");
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         using namespace jtx;
 
         // One vote sets fee to 1%.
@@ -2300,7 +2305,7 @@ private:
             // deposit to succeed
             if (env.enabled(fixAMMv1_3))
                 ++fundUSD;
-            fund(env, gw, {a}, {USD(fundUSD)}, Fund::Acct);
+            fund(env, gw_, {a}, {USD(fundUSD)}, Fund::Acct);
             ammAlice.deposit(a, tokens);
             ammAlice.vote(a, 50 * (i + 1));
             if (accounts)
@@ -2360,8 +2365,8 @@ private:
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
             for (int i = 0; i < 7; ++i)
                 ammAlice.withdrawAll(accounts[i]);
-            ammAlice.deposit(carol, 10'000'000);
-            ammAlice.vote(carol, 1'000);
+            ammAlice.deposit(carol_, 10'000'000);
+            ammAlice.vote(carol_, 1'000);
             // The initial LP set the fee to 1000. Carol gets 50% voting
             // power, and the new fee is 500.
             BEAST_EXPECT(ammAlice.expectTradingFee(500));
@@ -2377,12 +2382,12 @@ private:
             BEAST_EXPECT(ammAlice.expectTradingFee(175));
             for (int i = 0; i < 7; ++i)
                 ammAlice.withdraw(accounts[i], 9'000'000);
-            ammAlice.deposit(carol, 1'000);
+            ammAlice.deposit(carol_, 1'000);
             // The vote is not added to the slots
-            ammAlice.vote(carol, 1'000);
+            ammAlice.vote(carol_, 1'000);
             auto const info = ammAlice.ammRpcInfo()[jss::amm][jss::vote_slots];
             for (std::uint32_t i = 0; i < info.size(); ++i)
-                BEAST_EXPECT(info[i][jss::account] != carol.human());
+                BEAST_EXPECT(info[i][jss::account] != carol_.human());
             // But the slots are refreshed and the fee is changed
             BEAST_EXPECT(ammAlice.expectTradingFee(82));
         });
@@ -2398,92 +2403,92 @@ private:
         // burn all the LPTokens through a AMMBid transaction
         {
             Env env(*this);
-            fund(env, gw, {alice}, XRP(2'000), {USD(2'000)});
-            AMM amm(env, gw, XRP(1'000), USD(1'000), false, 1'000);
+            fund(env, gw_, {alice_}, XRP(2'000), {USD(2'000)});
+            AMM amm(env, gw_, XRP(1'000), USD(1'000), false, 1'000);
 
-            // auction slot is owned by the creator of the AMM i.e. gw
+            // auction slot is owned by the creator of the AMM i.e. gw_
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{0}));
 
-            // gw attempts to burn all her LPTokens through a bid transaction
+            // gw_ attempts to burn all her LPTokens through a bid transaction
             // this transaction fails because AMMBid transaction can not burn
             // all the outstanding LPTokens
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = 1'000'000,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         }
 
         // burn all the LPTokens through a AMMBid transaction
         {
             Env env(*this);
-            fund(env, gw, {alice}, XRP(2'000), {USD(2'000)});
-            AMM amm(env, gw, XRP(1'000), USD(1'000), false, 1'000);
+            fund(env, gw_, {alice_}, XRP(2'000), {USD(2'000)});
+            AMM amm(env, gw_, XRP(1'000), USD(1'000), false, 1'000);
 
-            // auction slot is owned by the creator of the AMM i.e. gw
+            // auction slot is owned by the creator of the AMM i.e. gw_
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{0}));
 
-            // gw burns all but one of its LPTokens through a bid transaction
+            // gw_ burns all but one of its LPTokens through a bid transaction
             // this transaction succeeds because the bid price is less than
             // the total outstanding LPToken balance
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = STAmount{amm.lptIssue(), UINT64_C(999'999)},
                 }),
-                ter(tesSUCCESS))
+                Ter(tesSUCCESS))
                 .close();
 
-            // gw must own the auction slot
+            // gw_ must own the auction slot
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{999'999}));
 
-            // 999'999 tokens are burned, only 1 LPToken is owned by gw
+            // 999'999 tokens are burned, only 1 LPToken is owned by gw_
             BEAST_EXPECT(amm.expectBalances(XRP(1'000), USD(1'000), IOUAmount{1}));
 
-            // gw owns only 1 LPToken in its balance
-            BEAST_EXPECT(Number{amm.getLPTokensBalance(gw)} == 1);
+            // gw_ owns only 1 LPToken in its balance
+            BEAST_EXPECT(Number{amm.getLPTokensBalance(gw_)} == 1);
 
-            // gw attempts to burn the last of its LPTokens in an AMMBid
+            // gw_ attempts to burn the last of its LPTokens in an AMMBid
             // transaction. This transaction fails because it would burn all
             // the remaining LPTokens
             env(amm.bid({
-                    .account = gw,
+                    .account = gw_,
                     .bidMin = 1,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         }
 
         testAMM([&](AMM& ammAlice, Env& env) {
             // Invalid flags
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 0,
                     .flags = tfWithdrawAll,
                 }),
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
 
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             // Invalid Bid price <= 0
             for (auto bid : {0, -100})
             {
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMin = bid,
                     }),
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMax = bid,
                     }),
-                    ter(temBAD_AMOUNT));
+                    Ter(temBAD_AMOUNT));
             }
 
             // Invalid Min/Max combination
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 200,
                     .bidMax = 100,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
 
             // Invalid Account
             Account const bad("bad");
@@ -2492,8 +2497,8 @@ private:
                     .account = bad,
                     .bidMax = 100,
                 }),
-                seq(1),
-                ter(terNO_ACCOUNT));
+                Seq(1),
+                Ter(terNO_ACCOUNT));
 
             // Account is not LP
             Account const dan("dan");
@@ -2502,49 +2507,49 @@ private:
                     .account = dan,
                     .bidMin = 100,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             env(ammAlice.bid({
                     .account = dan,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
 
             // Auth account is invalid.
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 100,
-                    .authAccounts = {bob},
+                    .authAccounts = {bob_},
                 }),
-                ter(terNO_ACCOUNT));
+                Ter(terNO_ACCOUNT));
 
             // Invalid Assets
             env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMax = 100,
                     .assets = {{USD, GBP}},
                 }),
-                ter(terNO_AMM));
+                Ter(terNO_AMM));
 
             // Invalid Min/Max issue
             env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMax = STAmount{USD, 100},
                 }),
-                ter(temBAD_AMM_TOKENS));
+                Ter(temBAD_AMM_TOKENS));
             env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = STAmount{USD, 100},
                 }),
-                ter(temBAD_AMM_TOKENS));
+                Ter(temBAD_AMM_TOKENS));
         });
 
         // Invalid AMM
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.withdrawAll(alice);
+            ammAlice.withdrawAll(alice_);
             env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMax = 100,
                 }),
-                ter(terNO_AMM));
+                Ter(terNO_AMM));
         });
 
         // More than four Auth accounts.
@@ -2553,62 +2558,62 @@ private:
             Account const bill("bill");
             Account const scott("scott");
             Account const james("james");
-            env.fund(XRP(1'000), bob, ed, bill, scott, james);
+            env.fund(XRP(1'000), bob_, ed, bill, scott, james);
             env.close();
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 100,
-                    .authAccounts = {bob, ed, bill, scott, james},
+                    .authAccounts = {bob_, ed, bill, scott, james},
                 }),
-                ter(temMALFORMED));
+                Ter(temMALFORMED));
         });
 
         // Bid price exceeds LP owned tokens
         testAMM([&](AMM& ammAlice, Env& env) {
-            fund(env, gw, {bob}, XRP(1'000), {USD(100)}, Fund::Acct);
-            ammAlice.deposit(carol, 1'000'000);
-            ammAlice.deposit(bob, 10);
+            fund(env, gw_, {bob_}, XRP(1'000), {USD(100)}, Fund::Acct);
+            ammAlice.deposit(carol_, 1'000'000);
+            ammAlice.deposit(bob_, 10);
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 1'000'001,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMax = 1'000'001,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
             env(ammAlice.bid({
-                .account = carol,
+                .account = carol_,
                 .bidMin = 1'000,
             }));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{1'000}));
-            // Slot purchase price is more than 1000 but bob only has 10 tokens
+            // Slot purchase price is more than 1000 but bob_ only has 10 tokens
             env(ammAlice.bid({
-                    .account = bob,
+                    .account = bob_,
                 }),
-                ter(tecAMM_INVALID_TOKENS));
+                Ter(tecAMM_INVALID_TOKENS));
         });
 
         // Bid all tokens, still own the slot
         {
             Env env(*this);
-            fund(env, gw, {alice, bob}, XRP(1'000), {USD(1'000)});
-            AMM amm(env, gw, XRP(10), USD(1'000));
+            fund(env, gw_, {alice_, bob_}, XRP(1'000), {USD(1'000)});
+            AMM amm(env, gw_, XRP(10), USD(1'000));
             auto const lpIssue = amm.lptIssue();
-            env.trust(STAmount{lpIssue, 100}, alice);
-            env.trust(STAmount{lpIssue, 50}, bob);
-            env(pay(gw, alice, STAmount{lpIssue, 100}));
-            env(pay(gw, bob, STAmount{lpIssue, 50}));
-            env(amm.bid({.account = alice, .bidMin = 100}));
+            env.trust(STAmount{lpIssue, 100}, alice_);
+            env.trust(STAmount{lpIssue, 50}, bob_);
+            env(pay(gw_, alice_, STAmount{lpIssue, 100}));
+            env(pay(gw_, bob_, STAmount{lpIssue, 50}));
+            env(amm.bid({.account = alice_, .bidMin = 100}));
             // Alice doesn't have any more tokens, but
             // she still owns the slot.
             env(amm.bid({
-                    .account = bob,
+                    .account = bob_,
                     .bidMax = 50,
                 }),
-                ter(tecAMM_FAILED));
+                Ter(tecAMM_FAILED));
         }
     }
 
@@ -2628,8 +2633,8 @@ private:
         // Bid 110 tokens. Pay bidMin.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
-                env(ammAlice.bid({.account = carol, .bidMin = 110}));
+                ammAlice.deposit(carol_, 1'000'000);
+                env(ammAlice.bid({.account = carol_, .bidMin = 110}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
                 // 110 tokens are burned.
                 BEAST_EXPECT(
@@ -2643,14 +2648,14 @@ private:
         // Bid with min/max when the pay price is less than min.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 // Bid exactly 110. Pay 110 because the pay price is < 110.
-                env(ammAlice.bid({.account = carol, .bidMin = 110, .bidMax = 110}));
+                env(ammAlice.bid({.account = carol_, .bidMin = 110, .bidMax = 110}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{10'999'890}));
                 // Bid exactly 180-200. Pay 180 because the pay price is < 180.
-                env(ammAlice.bid({.account = alice, .bidMin = 180, .bidMax = 200}));
+                env(ammAlice.bid({.account = alice_, .bidMin = 180, .bidMax = 200}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{180}));
                 BEAST_EXPECT(
                     ammAlice.expectBalances(XRP(11'000), USD(11'000), IOUAmount{10'999'814'5, -1}));
@@ -2663,37 +2668,37 @@ private:
         // Start bid at bidMin 110.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 // Bid, pay bidMin.
-                env(ammAlice.bid({.account = carol, .bidMin = 110}));
+                env(ammAlice.bid({.account = carol_, .bidMin = 110}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
 
-                fund(env, gw, {bob}, {USD(10'000)}, Fund::Acct);
-                ammAlice.deposit(bob, 1'000'000);
+                fund(env, gw_, {bob_}, {USD(10'000)}, Fund::Acct);
+                ammAlice.deposit(bob_, 1'000'000);
                 // Bid, pay the computed price.
-                env(ammAlice.bid({.account = bob}));
+                env(ammAlice.bid({.account = bob_}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount(1155, -1)));
 
                 // Bid bidMax fails because the computed price is higher.
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMax = 120,
                     }),
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
                 // Bid MaxSlotPrice succeeds - pay computed price
-                env(ammAlice.bid({.account = carol, .bidMax = 600}));
+                env(ammAlice.bid({.account = carol_, .bidMax = 600}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{121'275, -3}));
 
                 // Bid Min/MaxSlotPrice fails because the computed price is not
                 // in range
                 env(ammAlice.bid({
-                        .account = carol,
+                        .account = carol_,
                         .bidMin = 10,
                         .bidMax = 100,
                     }),
-                    ter(tecAMM_FAILED));
+                    Ter(tecAMM_FAILED));
                 // Bid Min/MaxSlotPrice succeeds - pay computed price
-                env(ammAlice.bid({.account = carol, .bidMin = 100, .bidMax = 600}));
+                env(ammAlice.bid({.account = carol_, .bidMin = 100, .bidMax = 600}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{127'33875, -5}));
             },
             std::nullopt,
@@ -2704,10 +2709,10 @@ private:
         // Slot states.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
 
-                fund(env, gw, {bob}, {USD(10'000)}, Fund::Acct);
-                ammAlice.deposit(bob, 1'000'000);
+                fund(env, gw_, {bob_}, {USD(10'000)}, Fund::Acct);
+                ammAlice.deposit(bob_, 1'000'000);
                 if (!features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(ammAlice.expectBalances(
@@ -2720,27 +2725,27 @@ private:
                 }
 
                 // Initial state. Pay bidMin.
-                env(ammAlice.bid({.account = carol, .bidMin = 110})).close();
+                env(ammAlice.bid({.account = carol_, .bidMin = 110})).close();
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{110}));
 
                 // 1st Interval after close, price for 0th interval.
-                env(ammAlice.bid({.account = bob}));
-                env.close(seconds(AUCTION_SLOT_INTERVAL_DURATION + 1));
+                env(ammAlice.bid({.account = bob_}));
+                env.close(seconds(kAUCTION_SLOT_INTERVAL_DURATION + 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 * AUCTION_SLOT_INTERVAL_DURATION) + 1));
+                env(ammAlice.bid({.account = carol_}));
+                env.close(seconds((10 * kAUCTION_SLOT_INTERVAL_DURATION) + 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(ammAlice.bid({.account = bob_}));
                 env.close(
-                    seconds((AUCTION_SLOT_TIME_INTERVALS * AUCTION_SLOT_INTERVAL_DURATION) + 1));
+                    seconds((kAUCTION_SLOT_TIME_INTERVALS * kAUCTION_SLOT_INTERVAL_DURATION) + 1));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{127'33875, -5}));
 
                 // 0 Interval.
-                env(ammAlice.bid({.account = carol, .bidMin = 110})).close();
+                env(ammAlice.bid({.account = carol_, .bidMin = 110})).close();
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, std::nullopt, IOUAmount{110}));
                 // ~321.09 tokens burnt on bidding fees.
                 if (!features[fixAMMv1_3])
@@ -2767,16 +2772,16 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 Account const dan("dan");
                 Account const ed("ed");
-                fund(env, gw, {bob, dan, ed}, {USD(20'000)}, Fund::Acct);
-                ammAlice.deposit(bob, 1'000'000);
+                fund(env, gw_, {bob_, dan, ed}, {USD(20'000)}, Fund::Acct);
+                ammAlice.deposit(bob_, 1'000'000);
                 ammAlice.deposit(ed, 1'000'000);
-                ammAlice.deposit(carol, 500'000);
+                ammAlice.deposit(carol_, 500'000);
                 ammAlice.deposit(dan, 500'000);
                 auto ammTokens = ammAlice.getLPTokensBalance();
                 env(ammAlice.bid({
-                    .account = carol,
+                    .account = carol_,
                     .bidMin = 120,
-                    .authAccounts = {bob, ed},
+                    .authAccounts = {bob_, ed},
                 }));
                 auto const slotPrice = IOUAmount{5'200};
                 ammTokens -= slotPrice;
@@ -2793,21 +2798,21 @@ private:
                 // Discounted trade
                 for (int i = 0; i < 10; ++i)
                 {
-                    auto tokens = ammAlice.deposit(carol, USD(100));
-                    ammAlice.withdraw(carol, tokens, USD(0));
-                    tokens = ammAlice.deposit(bob, USD(100));
-                    ammAlice.withdraw(bob, tokens, USD(0));
+                    auto tokens = ammAlice.deposit(carol_, USD(100));
+                    ammAlice.withdraw(carol_, tokens, USD(0));
+                    tokens = ammAlice.deposit(bob_, USD(100));
+                    ammAlice.withdraw(bob_, tokens, USD(0));
                     tokens = ammAlice.deposit(ed, USD(100));
                     ammAlice.withdraw(ed, tokens, USD(0));
                 }
-                // carol, bob, and ed pay ~0.99USD in fees.
+                // carol_, bob_, and ed pay ~0.99USD in fees.
                 if (!features[fixAMMv1_1])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'499'00572620545), -11));
                     BEAST_EXPECT(
-                        env.balance(bob, USD) == STAmount(USD, UINT64_C(18'999'00572616195), -11));
+                        env.balance(bob_, USD) == STAmount(USD, UINT64_C(18'999'00572616195), -11));
                     BEAST_EXPECT(
                         env.balance(ed, USD) == STAmount(USD, UINT64_C(18'999'00572611841), -11));
                     // USD pool is slightly higher because of the fees.
@@ -2817,10 +2822,10 @@ private:
                 else
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'499'00572620544), -11));
                     BEAST_EXPECT(
-                        env.balance(bob, USD) == STAmount(USD, UINT64_C(18'999'00572616194), -11));
+                        env.balance(bob_, USD) == STAmount(USD, UINT64_C(18'999'00572616194), -11));
                     BEAST_EXPECT(
                         env.balance(ed, USD) == STAmount(USD, UINT64_C(18'999'0057261184), -10));
                     // USD pool is slightly higher because of the fees.
@@ -2847,7 +2852,7 @@ private:
                     ammAlice.withdraw(dan, tokens, USD(0));
                 }
                 // dan pays ~9.94USD, which is ~10 times more in fees than
-                // carol, bob, ed. the discounted fee is 10 times less
+                // carol_, bob_, ed. the discounted fee is 10 times less
                 // than the trading fee.
                 if (!features[fixAMMv1_1])
                 {
@@ -2857,13 +2862,13 @@ private:
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRP(13'000), STAmount{USD, UINT64_C(13'012'92609877019), -11}, ammTokens));
                     // Discounted fee payment
-                    ammAlice.deposit(carol, USD(100));
+                    ammAlice.deposit(carol_, USD(100));
                     ammTokens = ammAlice.getLPTokensBalance();
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRP(13'000), STAmount{USD, UINT64_C(13'112'92609877019), -11}, ammTokens));
-                    env(pay(carol, bob, USD(100)), path(~USD), sendmax(XRP(110)));
+                    env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(XRP(110)));
                     env.close();
-                    // carol pays 100000 drops in fees
+                    // carol_ pays 100000 drops in fees
                     // 99900668XRP swapped in for 100USD
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount{13'100'000'668},
@@ -2900,7 +2905,7 @@ private:
                             ammTokens));
                     }
                     // Discounted fee payment
-                    ammAlice.deposit(carol, USD(100));
+                    ammAlice.deposit(carol_, USD(100));
                     ammTokens = ammAlice.getLPTokensBalance();
                     if (!features[fixAMMv1_3])
                     {
@@ -2916,9 +2921,9 @@ private:
                             STAmount{USD, UINT64_C(13'112'92609877024), -11},
                             ammTokens));
                     }
-                    env(pay(carol, bob, USD(100)), path(~USD), sendmax(XRP(110)));
+                    env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(XRP(110)));
                     env.close();
-                    // carol pays 100000 drops in fees
+                    // carol_ pays 100000 drops in fees
                     // 99900668XRP swapped in for 100USD
                     if (!features[fixAMMv1_3])
                     {
@@ -2936,10 +2941,10 @@ private:
                     }
                 }
                 // Payment with the trading fee
-                env(pay(alice, carol, XRP(100)), path(~XRP), sendmax(USD(110)));
+                env(pay(alice_, carol_, XRP(100)), Path(~XRP), Sendmax(USD(110)));
                 env.close();
-                // alice pays ~1.011USD in fees, which is ~10 times more
-                // than carol's fee
+                // alice_ pays ~1.011USD in fees, which is ~10 times more
+                // than carol_'s fee
                 // 100.099431529USD swapped in for 100XRP
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
@@ -2963,33 +2968,33 @@ private:
                         ammTokens));
                 }
                 // Auction slot expired, no discounted fee
-                env.close(seconds(TOTAL_TIME_SLOT_SECS + 1));
+                env.close(seconds(kTOTAL_TIME_SLOT_SECS + 1));
                 // clock is parent's based
                 env.close();
                 if (!features[fixAMMv1_1])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'399'00572620545), -11));
                 }
                 else if (!features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'399'00572620544), -11));
                 }
                 ammTokens = ammAlice.getLPTokensBalance();
                 for (int i = 0; i < 10; ++i)
                 {
-                    auto const tokens = ammAlice.deposit(carol, USD(100));
-                    ammAlice.withdraw(carol, tokens, USD(0));
+                    auto const tokens = ammAlice.deposit(carol_, USD(100));
+                    ammAlice.withdraw(carol_, tokens, USD(0));
                 }
-                // carol pays ~9.94USD in fees, which is ~10 times more in
+                // carol_ pays ~9.94USD in fees, which is ~10 times more in
                 // trading fees vs discounted fee.
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'389'06197177128), -11));
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount{13'000'000'668},
@@ -2999,7 +3004,7 @@ private:
                 else if (features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'389'06197177124), -11));
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount{13'000'000'668},
@@ -3009,16 +3014,16 @@ private:
                 else
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'389'06197177129), -11));
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount{13'000'000'671},
                         STAmount{USD, UINT64_C(13'123'98038488352), -11},
                         ammTokens));
                 }
-                env(pay(carol, bob, USD(100)), path(~USD), sendmax(XRP(110)));
+                env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(XRP(110)));
                 env.close();
-                // carol pays ~1.008XRP in trading fee, which is
+                // carol_ pays ~1.008XRP in trading fee, which is
                 // ~10 times more than the discounted fee.
                 // 99.815876XRP is swapped in for 100USD
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
@@ -3052,8 +3057,8 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Bid a tiny amount
-                auto const tiny = Number{STAmount::cMinValue, STAmount::cMinOffset};
-                env(ammAlice.bid({.account = alice, .bidMin = IOUAmount{tiny}}));
+                auto const tiny = Number{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET};
+                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.
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny}));
@@ -3061,8 +3066,8 @@ private:
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'000), ammAlice.tokens()));
                 // Bid the tiny amount
                 env(ammAlice.bid({
-                    .account = alice,
-                    .bidMin = IOUAmount{STAmount::cMinValue, STAmount::cMinOffset},
+                    .account = alice_,
+                    .bidMin = IOUAmount{STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET},
                 }));
                 // Pay slightly higher price
                 BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{tiny * Number{105, -2}}));
@@ -3079,18 +3084,18 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = IOUAmount{100},
-                    .authAccounts = {carol},
+                    .authAccounts = {carol_},
                 }));
-                BEAST_EXPECT(ammAlice.expectAuctionSlot({carol}));
-                env(ammAlice.bid({.account = alice, .bidMin = IOUAmount{100}}));
+                BEAST_EXPECT(ammAlice.expectAuctionSlot({carol_}));
+                env(ammAlice.bid({.account = alice_, .bidMin = IOUAmount{100}}));
                 BEAST_EXPECT(ammAlice.expectAuctionSlot({}));
                 Account const bob("bob");
                 Account const dan("dan");
                 fund(env, {bob, dan}, XRP(1'000));
                 env(ammAlice.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = IOUAmount{100},
                     .authAccounts = {bob, dan},
                 }));
@@ -3104,24 +3109,24 @@ private:
         // Bid all tokens, still own the slot and trade at a discount
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob}, XRP(2'000), {USD(2'000)});
-            AMM amm(env, gw, XRP(1'000), USD(1'010), false, 1'000);
+            fund(env, gw_, {alice_, bob_}, XRP(2'000), {USD(2'000)});
+            AMM amm(env, gw_, XRP(1'000), USD(1'010), false, 1'000);
             auto const lpIssue = amm.lptIssue();
-            env.trust(STAmount{lpIssue, 500}, alice);
-            env.trust(STAmount{lpIssue, 50}, bob);
-            env(pay(gw, alice, STAmount{lpIssue, 500}));
-            env(pay(gw, bob, STAmount{lpIssue, 50}));
+            env.trust(STAmount{lpIssue, 500}, alice_);
+            env.trust(STAmount{lpIssue, 50}, bob_);
+            env(pay(gw_, alice_, STAmount{lpIssue, 500}));
+            env(pay(gw_, bob_, STAmount{lpIssue, 50}));
             // Alice doesn't have anymore lp tokens
-            env(amm.bid({.account = alice, .bidMin = 500}));
+            env(amm.bid({.account = alice_, .bidMin = 500}));
             BEAST_EXPECT(amm.expectAuctionSlot(100, 0, IOUAmount{500}));
-            BEAST_EXPECT(expectHolding(env, alice, STAmount{lpIssue, 0}));
+            BEAST_EXPECT(expectHolding(env, alice_, STAmount{lpIssue, 0}));
             // But trades with the discounted fee since she still owns the slot.
             // Alice pays 10011 drops in fees
-            env(pay(alice, bob, USD(10)), path(~USD), sendmax(XRP(11)));
+            env(pay(alice_, bob_, USD(10)), Path(~USD), Sendmax(XRP(11)));
             BEAST_EXPECT(amm.expectBalances(
                 XRPAmount{1'010'010'011}, USD(1'000), IOUAmount{1'004'487'562112089, -9}));
             // Bob pays the full fee ~0.1USD
-            env(pay(bob, alice, XRP(10)), path(~XRP), sendmax(USD(11)));
+            env(pay(bob_, alice_, XRP(10)), Path(~XRP), Sendmax(USD(11)));
             if (!features[fixAMMv1_1])
             {
                 BEAST_EXPECT(amm.expectBalances(
@@ -3143,37 +3148,37 @@ private:
             Env env(*this, features);
             auto const baseFee = env.current()->fees().base;
 
-            fund(env, gw, {alice, bob}, XRP(2'000), {USD(2'000)});
-            AMM amm(env, gw, XRP(1'000), USD(1'010), false, 1'000);
-            Json::Value const tx = amm.bid({.account = alice, .bidMin = 500});
+            fund(env, gw_, {alice_, bob_}, XRP(2'000), {USD(2'000)});
+            AMM amm(env, gw_, XRP(1'000), USD(1'010), false, 1'000);
+            json::Value const tx = amm.bid({.account = alice_, .bidMin = 500});
 
             {
-                auto jtx = env.jt(tx, seq(1), fee(baseFee));
+                auto jtx = env.jt(tx, Seq(1), Fee(baseFee));
                 env.app().config().features.erase(featureAMM);
                 PreflightContext const pfCtx(
-                    env.app(), *jtx.stx, env.current()->rules(), tapNONE, env.journal);
+                    env.app(), *jtx.stx, env.current()->rules(), TapNone, env.journal);
                 auto pf = Transactor::invokePreflight<AMMBid>(pfCtx);
                 BEAST_EXPECT(pf == temDISABLED);
                 env.app().config().features.insert(featureAMM);
             }
 
             {
-                auto jtx = env.jt(tx, seq(1), fee(baseFee));
+                auto jtx = env.jt(tx, Seq(1), Fee(baseFee));
                 jtx.jv["TxnSignature"] = "deadbeef";
                 jtx.stx = env.ust(jtx);
                 PreflightContext const pfCtx(
-                    env.app(), *jtx.stx, env.current()->rules(), tapNONE, env.journal);
+                    env.app(), *jtx.stx, env.current()->rules(), TapNone, env.journal);
                 auto pf = Transactor::invokePreflight<AMMBid>(pfCtx);
                 BEAST_EXPECT(!isTesSuccess(pf));
             }
 
             {
-                auto jtx = env.jt(tx, seq(1), fee(baseFee));
+                auto jtx = env.jt(tx, Seq(1), Fee(baseFee));
                 jtx.jv["Asset2"]["currency"] = "XRP";
                 jtx.jv["Asset2"].removeMember("issuer");
                 jtx.stx = env.ust(jtx);
                 PreflightContext const pfCtx(
-                    env.app(), *jtx.stx, env.current()->rules(), tapNONE, env.journal);
+                    env.app(), *jtx.stx, env.current()->rules(), TapNone, env.journal);
                 auto pf = Transactor::invokePreflight<AMMBid>(pfCtx);
                 BEAST_EXPECT(pf == temBAD_AMM_TOKENS);
             }
@@ -3190,139 +3195,139 @@ private:
 
         // Can't pay into AMM account.
         // Can't pay out since there is no keys
-        for (auto const& acct : {gw, alice})
+        for (auto const& acct : {gw_, alice_})
         {
             {
                 Env env(*this);
-                fund(env, gw, {alice, carol}, XRP(1'000), {USD(100)});
+                fund(env, gw_, {alice_, carol_}, XRP(1'000), {USD(100)});
                 // XRP balance is below reserve
                 AMM const ammAlice(env, acct, XRP(10), USD(10));
                 // Pay below reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(10)), Ter(tecNO_PERMISSION));
                 // Pay above reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(300)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(300)), Ter(tecNO_PERMISSION));
                 // Pay IOU
-                env(pay(carol, ammAlice.ammAccount(), USD(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), USD(10)), Ter(tecNO_PERMISSION));
             }
             {
                 Env env(*this);
-                fund(env, gw, {alice, carol}, XRP(10'000'000), {USD(10'000)});
+                fund(env, gw_, {alice_, carol_}, XRP(10'000'000), {USD(10'000)});
                 // XRP balance is above reserve
                 AMM const ammAlice(env, acct, XRP(1'000'000), USD(100));
                 // Pay below reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(10)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(10)), Ter(tecNO_PERMISSION));
                 // Pay above reserve
-                env(pay(carol, ammAlice.ammAccount(), XRP(1'000'000)), ter(tecNO_PERMISSION));
+                env(pay(carol_, ammAlice.ammAccount(), XRP(1'000'000)), Ter(tecNO_PERMISSION));
             }
         }
 
         // Can't pay into AMM with escrow.
         testAMM([&](AMM& ammAlice, Env& env) {
             auto const baseFee = env.current()->fees().base;
-            env(escrow::create(carol, ammAlice.ammAccount(), XRP(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
-                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),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
         });
 
         // Can't pay into AMM with paychan.
         testAMM([&](AMM& ammAlice, Env& env) {
-            auto const pk = carol.pk();
+            auto const pk = carol_.pk();
             auto const settleDelay = 100s;
             NetClock::time_point const cancelAfter = env.current()->header().parentCloseTime + 200s;
             env(paychan::create(
-                    carol, ammAlice.ammAccount(), XRP(1'000), settleDelay, pk, cancelAfter),
-                ter(tecNO_PERMISSION));
+                    carol_, ammAlice.ammAccount(), XRP(1'000), settleDelay, pk, cancelAfter),
+                Ter(tecNO_PERMISSION));
         });
 
         // Can't pay into AMM with checks.
         testAMM([&](AMM& ammAlice, Env& env) {
             env(check::create(env.master.id(), ammAlice.ammAccount(), XRP(100)),
-                ter(tecNO_PERMISSION));
+                Ter(tecNO_PERMISSION));
         });
 
         // Pay amounts close to one side of the pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // Can't consume whole pool
-                env(pay(alice, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, XRP(100)),
-                    path(~XRP),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, XRP(100)),
+                    Path(~XRP),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
                 // Overflow
-                env(pay(alice, carol, STAmount{USD, UINT64_C(99'999999999), -9}),
-                    path(~USD),
-                    sendmax(XRP(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, STAmount{USD, UINT64_C(999'99999999), -8}),
-                    path(~USD),
-                    sendmax(XRP(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, STAmount{xrpIssue(), 99'999'999}),
-                    path(~XRP),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{USD, UINT64_C(99'999999999), -9}),
+                    Path(~USD),
+                    Sendmax(XRP(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{USD, UINT64_C(999'99999999), -8}),
+                    Path(~USD),
+                    Sendmax(XRP(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{xrpIssue(), 99'999'999}),
+                    Path(~XRP),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
                 // Sender doesn't have enough funds
-                env(pay(alice, carol, USD(99.99)),
-                    path(~USD),
-                    sendmax(XRP(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
-                env(pay(alice, carol, STAmount{xrpIssue(), 99'990'000}),
-                    path(~XRP),
-                    sendmax(USD(1'000'000'000)),
-                    ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, USD(99.99)),
+                    Path(~USD),
+                    Sendmax(XRP(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
+                env(pay(alice_, carol_, STAmount{xrpIssue(), 99'990'000}),
+                    Path(~XRP),
+                    Sendmax(USD(1'000'000'000)),
+                    Ter(tecPATH_PARTIAL));
             },
             {{XRP(100), USD(100)}});
 
         // Globally frozen
         testAMM([&](AMM& ammAlice, Env& env) {
-            env(fset(gw, asfGlobalFreeze));
+            env(fset(gw_, asfGlobalFreeze));
             env.close();
-            env(pay(alice, carol, USD(1)),
-                path(~USD),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(XRP(10)),
-                ter(tecPATH_DRY));
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(USD(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, USD(1)),
+                Path(~USD),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(XRP(10)),
+                Ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(USD(10)),
+                Ter(tecPATH_DRY));
         });
 
         // Individually frozen AMM
         testAMM([&](AMM& ammAlice, Env& env) {
             env(trust(
-                gw, STAmount{Issue{gw["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
+                gw_, STAmount{Issue{gw_["USD"].currency, ammAlice.ammAccount()}, 0}, tfSetFreeze));
             env.close();
-            env(pay(alice, carol, USD(1)),
-                path(~USD),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(XRP(10)),
-                ter(tecPATH_DRY));
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                sendmax(USD(10)),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, USD(1)),
+                Path(~USD),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(XRP(10)),
+                Ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Sendmax(USD(10)),
+                Ter(tecPATH_DRY));
         });
 
         // Individually frozen accounts
         testAMM([&](AMM& ammAlice, Env& env) {
-            env(trust(gw, carol["USD"](0), tfSetFreeze));
-            env(trust(gw, alice["USD"](0), tfSetFreeze));
+            env(trust(gw_, carol_["USD"](0), tfSetFreeze));
+            env(trust(gw_, alice_["USD"](0), tfSetFreeze));
             env.close();
-            env(pay(alice, carol, XRP(1)),
-                path(~XRP),
-                sendmax(USD(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(tecPATH_DRY));
+            env(pay(alice_, carol_, XRP(1)),
+                Path(~XRP),
+                Sendmax(USD(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(tecPATH_DRY));
         });
     }
 
@@ -3341,19 +3346,19 @@ private:
         // Force one path with tfNoRippleDirect.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                 // Initial balance 30,000 + 100
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -3363,16 +3368,16 @@ private:
         // Payment 100USD for 100XRP, use default path.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, USD(100)), sendmax(XRP(100)));
+                env(pay(bob_, carol_, USD(100)), Sendmax(XRP(100)));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                 // Initial balance 30,000 + 100
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -3383,16 +3388,16 @@ private:
         // both default path and path, activeStrands has one path.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, USD(100)), path(~USD), sendmax(XRP(100)));
+                env(pay(bob_, carol_, USD(100)), Path(~USD), Sendmax(XRP(100)));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                 // Initial balance 30,000 + 100
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
                 // Initial balance 30,000 - 100(sendmax) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -3402,30 +3407,30 @@ private:
         // Payment with limitQuality set.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
                 // Pays 10USD for 10XRP. A larger payment of ~99.11USD/100XRP
                 // would have been sent has it not been for limitQuality.
-                env(pay(bob, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'010), USD(10'000), ammAlice.tokens()));
                 // Initial balance 30,000 + 10(limited by limitQuality)
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'010)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'010)));
                 // Initial balance 30,000 - 10(limited by limitQuality) - 10(tx
                 // fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(10) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(10) - txFee(env, 1)));
 
                 // Fails because of limitQuality. Would have sent
                 // ~98.91USD/110XRP has it not been for limitQuality.
-                env(pay(bob, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
-                    ter(tecPATH_DRY));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality),
+                    Ter(tecPATH_DRY));
                 env.close();
             },
             {{XRP(10'000), USD(10'010)}},
@@ -3436,24 +3441,24 @@ private:
         // Payment with limitQuality and transfer fee set.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(rate(gw, 1.1));
+                env(rate(gw_, 1.1));
                 env.close();
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
                 // Pays 10USD for 10XRP. A larger payment of ~99.11USD/100XRP
                 // would have been sent has it not been for limitQuality and
                 // the transfer fee.
-                env(pay(bob, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(110)),
-                    txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(110)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'010), USD(10'000), ammAlice.tokens()));
                 // 10USD - 10% transfer fee
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{USD, UINT64_C(30'009'09090909091), -11}));
+                    expectHolding(env, carol_, STAmount{USD, UINT64_C(30'009'09090909091), -11}));
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(10) - txfee(env, 1)));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(10) - txFee(env, 1)));
             },
             {{XRP(10'000), USD(10'010)}},
             0,
@@ -3463,13 +3468,13 @@ private:
         // Fail when partial payment is not set.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(jtx::XRP(30'000), bob);
+                env.fund(jtx::XRP(30'000), bob_);
                 env.close();
-                env(pay(bob, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(100)),
-                    txflags(tfNoRippleDirect),
-                    ter(tecPATH_PARTIAL));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(100)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(tecPATH_PARTIAL));
             },
             {{XRP(10'000), USD(10'000)}},
             0,
@@ -3482,29 +3487,29 @@ private:
         // is taken from the offer.
         {
             Env env(*this, features);
-            fund(env, gw, {alice, carol}, {USD(30'000), EUR(30'000)}, Fund::All);
+            fund(env, gw_, {alice_, carol_}, {USD(30'000), EUR(30'000)}, Fund::All);
             env.close();
-            env.fund(XRP(1'000), bob);
+            env.fund(XRP(1'000), bob_);
             env.close();
-            auto ammEUR_XRP = AMM(env, alice, XRP(10'000), EUR(10'000));
-            auto ammUSD_EUR = AMM(env, alice, EUR(10'000), USD(10'000));
-            env(offer(alice, XRP(101), USD(100)), txflags(tfPassive));
+            auto ammEurXrp = AMM(env, alice_, XRP(10'000), EUR(10'000));
+            auto ammUsdEur = AMM(env, alice_, EUR(10'000), USD(10'000));
+            env(offer(alice_, XRP(101), USD(100)), Txflags(tfPassive));
             env.close();
-            env(pay(bob, carol, USD(100)),
-                path(~EUR, ~USD),
-                sendmax(XRP(102)),
-                txflags(tfPartialPayment));
+            env(pay(bob_, carol_, USD(100)),
+                Path(~EUR, ~USD),
+                Sendmax(XRP(102)),
+                Txflags(tfPartialPayment));
             env.close();
-            BEAST_EXPECT(ammEUR_XRP.expectBalances(
+            BEAST_EXPECT(ammEurXrp.expectBalances(
                 XRPAmount(10'030'082'730),
                 STAmount(EUR, UINT64_C(9'970'007498125468), -12),
-                ammEUR_XRP.tokens()));
+                ammEurXrp.tokens()));
             if (!features[fixAMMv1_1])
             {
-                BEAST_EXPECT(ammUSD_EUR.expectBalances(
+                BEAST_EXPECT(ammUsdEur.expectBalances(
                     STAmount(USD, UINT64_C(9'970'097277662122), -12),
                     STAmount(EUR, UINT64_C(10'029'99250187452), -11),
-                    ammUSD_EUR.tokens()));
+                    ammUsdEur.tokens()));
 
                 // fixReducedOffersV2 changes the expected results slightly.
                 Amounts const expectedAmounts = env.closed()->rules().enabled(fixReducedOffersV2)
@@ -3512,14 +3517,14 @@ private:
                     : Amounts{
                           XRPAmount(30'201'749), STAmount(USD, UINT64_C(29'90272233787818), -14)};
 
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{expectedAmounts}}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{expectedAmounts}}));
             }
             else
             {
-                BEAST_EXPECT(ammUSD_EUR.expectBalances(
+                BEAST_EXPECT(ammUsdEur.expectBalances(
                     STAmount(USD, UINT64_C(9'970'097277662172), -12),
                     STAmount(EUR, UINT64_C(10'029'99250187452), -11),
-                    ammUSD_EUR.tokens()));
+                    ammUsdEur.tokens()));
 
                 // fixReducedOffersV2 changes the expected results slightly.
                 Amounts const expectedAmounts = env.closed()->rules().enabled(fixReducedOffersV2)
@@ -3527,15 +3532,15 @@ private:
                     : Amounts{
                           XRPAmount(30'201'749), STAmount(USD, UINT64_C(29'90272233782840), -14)};
 
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{expectedAmounts}}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{expectedAmounts}}));
             }
             // Initial 30,000 + 100
-            BEAST_EXPECT(expectHolding(env, carol, STAmount{USD, 30'100}));
+            BEAST_EXPECT(expectHolding(env, carol_, STAmount{USD, 30'100}));
             // Initial 1,000 - 30082730(AMM pool) - 70798251(offer) - 10(tx fee)
             BEAST_EXPECT(expectLedgerEntryRoot(
                 env,
-                bob,
-                XRP(1'000) - XRPAmount{30'082'730} - XRPAmount{70'798'251} - txfee(env, 1)));
+                bob_,
+                XRP(1'000) - XRPAmount{30'082'730} - XRPAmount{70'798'251} - txFee(env, 1)));
         }
 
         // Default path (with AMM) has a better quality than a non-default path.
@@ -3543,19 +3548,19 @@ private:
         // path ~49XRP/49USD. The rest is taken from the offer.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
+                env.fund(XRP(1'000), bob_);
                 env.close();
-                env.trust(EUR(2'000), alice);
+                env.trust(EUR(2'000), alice_);
                 env.close();
-                env(pay(gw, alice, EUR(1'000)));
-                env(offer(alice, XRP(101), EUR(100)), txflags(tfPassive));
+                env(pay(gw_, alice_, EUR(1'000)));
+                env(offer(alice_, XRP(101), EUR(100)), Txflags(tfPassive));
                 env.close();
-                env(offer(alice, EUR(100), USD(100)), txflags(tfPassive));
+                env(offer(alice_, EUR(100), USD(100)), Txflags(tfPassive));
                 env.close();
-                env(pay(bob, carol, USD(100)),
-                    path(~EUR, ~USD),
-                    sendmax(XRP(102)),
-                    txflags(tfPartialPayment));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~EUR, ~USD),
+                    Sendmax(XRP(102)),
+                    Txflags(tfPartialPayment));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount(10'050'238'637),
@@ -3563,7 +3568,7 @@ private:
                     ammAlice.tokens()));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    alice,
+                    alice_,
                     2,
                     {{Amounts{XRPAmount(50'487'378), STAmount(EUR, UINT64_C(49'98750312422), -11)},
                       Amounts{
@@ -3571,13 +3576,13 @@ private:
                           STAmount(USD, UINT64_C(49'98750312422), -11)}}}));
                 // Initial 30,000 + 99.99999999999
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{USD, UINT64_C(30'099'99999999999), -11}));
+                    expectHolding(env, carol_, STAmount{USD, UINT64_C(30'099'99999999999), -11}));
                 // Initial 1,000 - 50238637(AMM pool) - 50512622(offer) - 10(tx
                 // fee)
                 BEAST_EXPECT(expectLedgerEntryRoot(
                     env,
-                    bob,
-                    XRP(1'000) - XRPAmount{50'238'637} - XRPAmount{50'512'622} - txfee(env, 1)));
+                    bob_,
+                    XRP(1'000) - XRPAmount{50'238'637} - XRPAmount{50'512'622} - txFee(env, 1)));
             },
             std::nullopt,
             0,
@@ -3588,18 +3593,18 @@ private:
         // remaining amount is consumed by the offer.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, {USD(100)}, Fund::Acct);
+                fund(env, gw_, {bob_}, {USD(100)}, Fund::Acct);
                 env.close();
-                env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
+                env(offer(bob_, XRP(100), USD(100)), Txflags(tfPassive));
                 env.close();
-                env(pay(alice, carol, USD(200)), sendmax(XRP(200)), txflags(tfPartialPayment));
+                env(pay(alice_, carol_, USD(200)), Sendmax(XRP(200)), Txflags(tfPartialPayment));
                 env.close();
                 if (!features[fixAMMv1_1])
                 {
                     BEAST_EXPECT(
                         ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                     // Initial 30,000 + 200
-                    BEAST_EXPECT(expectHolding(env, carol, USD(30'200)));
+                    BEAST_EXPECT(expectHolding(env, carol_, USD(30'200)));
                 }
                 else
                 {
@@ -3608,16 +3613,16 @@ private:
                         STAmount(USD, UINT64_C(10'000'00000000001), -11),
                         ammAlice.tokens()));
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount(USD, UINT64_C(30'199'99999999999), -11)));
+                        env, carol_, STAmount(USD, UINT64_C(30'199'99999999999), -11)));
                 }
                 // Initial 30,000 - 10000(AMM pool LP) - 100(AMM offer) -
                 // - 100(offer) - 10(tx fee) - one reserve
                 BEAST_EXPECT(expectLedgerEntryRoot(
                     env,
-                    alice,
+                    alice_,
                     XRP(30'000) - XRP(10'000) - XRP(100) - XRP(100) - ammCrtFee(env) -
-                        txfee(env, 1)));
-                BEAST_EXPECT(expectOffers(env, bob, 0));
+                        txFee(env, 1)));
+                BEAST_EXPECT(expectOffers(env, bob_, 0));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -3629,32 +3634,32 @@ private:
         // Remaining amount is consumed by AMM.
         {
             Env env(*this, features);
-            fund(env, gw, {alice, bob, carol}, XRP(20'000), {USD(2'000)});
+            fund(env, gw_, {alice_, bob_, carol_}, XRP(20'000), {USD(2'000)});
             env.close();
-            env(offer(bob, XRP(50), USD(150)), txflags(tfPassive));
+            env(offer(bob_, XRP(50), USD(150)), Txflags(tfPassive));
             env.close();
-            AMM const ammAlice(env, alice, XRP(1'000), USD(1'050));
-            env(pay(alice, carol, USD(200)), sendmax(XRP(200)), txflags(tfPartialPayment));
+            AMM const ammAlice(env, alice_, XRP(1'000), USD(1'050));
+            env(pay(alice_, carol_, USD(200)), Sendmax(XRP(200)), Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(ammAlice.expectBalances(XRP(1'050), USD(1'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectHolding(env, carol, USD(2'200)));
-            BEAST_EXPECT(expectOffers(env, bob, 0));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(2'200)));
+            BEAST_EXPECT(expectOffers(env, bob_, 0));
         }
 
         // Offer crossing XRP/IOU
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, {USD(1'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, {USD(1'000)}, Fund::Acct);
                 env.close();
-                env(offer(bob, USD(100), XRP(100)));
+                env(offer(bob_, USD(100), XRP(100)));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(XRP(10'100), USD(10'000), ammAlice.tokens()));
                 // Initial 1,000 + 100
-                BEAST_EXPECT(expectHolding(env, bob, USD(1'100)));
+                BEAST_EXPECT(expectHolding(env, bob_, USD(1'100)));
                 // Initial 30,000 - 100(offer) - 10(tx fee)
                 BEAST_EXPECT(
-                    expectLedgerEntryRoot(env, bob, XRP(30'000) - XRP(100) - txfee(env, 1)));
-                BEAST_EXPECT(expectOffers(env, bob, 0));
+                    expectLedgerEntryRoot(env, bob_, XRP(30'000) - XRP(100) - txFee(env, 1)));
+                BEAST_EXPECT(expectOffers(env, bob_, 0));
             },
             {{XRP(10'000), USD(10'100)}},
             0,
@@ -3665,21 +3670,21 @@ private:
         // Single path AMM offer
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(rate(gw, 1.25));
+                env(rate(gw_, 1.25));
                 env.close();
                 // This offer succeeds to cross pre- and post-amendment
                 // because the strand's out amount is small enough to match
                 // limitQuality value and limitOut() function in StrandFlow
                 // doesn't require an adjustment to out value.
-                env(offer(carol, EUR(100), GBP(100)));
+                env(offer(carol_, EUR(100), GBP(100)));
                 env.close();
                 // No transfer fee
                 BEAST_EXPECT(ammAlice.expectBalances(GBP(1'100), EUR(1'000), ammAlice.tokens()));
                 // Initial 30,000 - 100(offer) - 25% transfer fee
-                BEAST_EXPECT(expectHolding(env, carol, GBP(29'875)));
+                BEAST_EXPECT(expectHolding(env, carol_, GBP(29'875)));
                 // Initial 30,000 + 100(offer)
-                BEAST_EXPECT(expectHolding(env, carol, EUR(30'100)));
-                BEAST_EXPECT(expectOffers(env, bob, 0));
+                BEAST_EXPECT(expectHolding(env, carol_, EUR(30'100)));
+                BEAST_EXPECT(expectOffers(env, bob_, 0));
             },
             {{GBP(1'000), EUR(1'100)}},
             0,
@@ -3688,9 +3693,9 @@ private:
         // Single-path AMM offer
         testAMM(
             [&](AMM& amm, Env& env) {
-                env(rate(gw, 1.001));
+                env(rate(gw_, 1.001));
                 env.close();
-                env(offer(carol, XRP(100), USD(55)));
+                env(offer(carol_, XRP(100), USD(55)));
                 env.close();
                 if (!features[fixAMMv1_1])
                 {
@@ -3702,7 +3707,7 @@ private:
                     // with lower quality. Consequently, the offer fails
                     // to cross.
                     BEAST_EXPECT(amm.expectBalances(XRP(1'000), USD(500), amm.tokens()));
-                    BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{XRP(100), USD(55)}}}));
+                    BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{XRP(100), USD(55)}}}));
                 }
                 else
                 {
@@ -3720,12 +3725,12 @@ private:
                     // Offer ~91XRP/49.99USD
                     BEAST_EXPECT(expectOffers(
                         env,
-                        carol,
+                        carol_,
                         1,
                         {{Amounts{XRPAmount{9'090'909}, STAmount{USD, 4'99999995, -8}}}}));
                     // Carol pays 0.1% fee on ~50USD =~ 0.05USD
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(29'949'94999999494), -11));
                 }
             },
@@ -3735,21 +3740,21 @@ private:
             {features});
         testAMM(
             [&](AMM& amm, Env& env) {
-                env(rate(gw, 1.001));
+                env(rate(gw_, 1.001));
                 env.close();
-                env(offer(carol, XRP(10), USD(5.5)));
+                env(offer(carol_, XRP(10), USD(5.5)));
                 env.close();
                 if (!features[fixAMMv1_1])
                 {
                     BEAST_EXPECT(amm.expectBalances(
                         XRP(990), STAmount{USD, UINT64_C(505'050505050505), -12}, amm.tokens()));
-                    BEAST_EXPECT(expectOffers(env, carol, 0));
+                    BEAST_EXPECT(expectOffers(env, carol_, 0));
                 }
                 else
                 {
                     BEAST_EXPECT(amm.expectBalances(
                         XRP(990), STAmount{USD, UINT64_C(505'0505050505051), -13}, amm.tokens()));
-                    BEAST_EXPECT(expectOffers(env, carol, 0));
+                    BEAST_EXPECT(expectOffers(env, carol_, 0));
                 }
             },
             {{XRP(1'000), USD(500)}},
@@ -3760,8 +3765,8 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 Account const ed("ed");
-                fund(env, gw, {bob, ed}, XRP(30'000), {GBP(2'000), EUR(2'000)}, Fund::Acct);
-                env(rate(gw, 1.25));
+                fund(env, gw_, {bob_, ed}, XRP(30'000), {GBP(2'000), EUR(2'000)}, Fund::Acct);
+                env(rate(gw_, 1.25));
                 env.close();
                 // The auto-bridge is worse quality than AMM, is not consumed
                 // first and initially forces multi-path AMM offer generation.
@@ -3769,10 +3774,10 @@ private:
                 // is less than the auto-bridge offers quality. Auto-bridge
                 // offers are consumed afterward. Then the behavior is
                 // different pre-amendment and post-amendment.
-                env(offer(bob, GBP(10), XRP(10)), txflags(tfPassive));
-                env(offer(ed, XRP(10), EUR(10)), txflags(tfPassive));
+                env(offer(bob_, GBP(10), XRP(10)), Txflags(tfPassive));
+                env(offer(ed, XRP(10), EUR(10)), Txflags(tfPassive));
                 env.close();
-                env(offer(carol, EUR(100), GBP(100)));
+                env(offer(carol_, EUR(100), GBP(100)));
                 env.close();
                 if (!features[fixAMMv1_1])
                 {
@@ -3789,24 +3794,24 @@ private:
                     // Consumed offer ~49.32EUR/49.32GBP
                     BEAST_EXPECT(expectOffers(
                         env,
-                        carol,
+                        carol_,
                         1,
                         {Amounts{
                             STAmount{EUR, UINT64_C(50'684828792831), -12},
                             STAmount{GBP, UINT64_C(50'684828792831), -12}}}));
-                    BEAST_EXPECT(expectOffers(env, bob, 0));
+                    BEAST_EXPECT(expectOffers(env, bob_, 0));
                     BEAST_EXPECT(expectOffers(env, ed, 0));
 
                     // Initial 30,000 - ~47.06(offers = 37.06(AMM) + 10(LOB))
                     // * 1.25
                     //     = 58.825 = ~29941.17
-                    // carol bought ~72.93EUR at the cost of ~70.68GBP
+                    // carol_ bought ~72.93EUR at the cost of ~70.68GBP
                     // the offer is partially consumed
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{GBP, UINT64_C(29'941'16770347333), -11}));
+                        env, carol_, STAmount{GBP, UINT64_C(29'941'16770347333), -11}));
                     // Initial 30,000 + ~49.3(offers = 39.3(AMM) + 10(LOB))
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{EUR, UINT64_C(30'049'31517120716), -11}));
+                        env, carol_, STAmount{EUR, UINT64_C(30'049'31517120716), -11}));
                 }
                 else
                 {
@@ -3824,27 +3829,27 @@ private:
                     // Consumed offer ~72.93EUR/72.93GBP
                     BEAST_EXPECT(expectOffers(
                         env,
-                        carol,
+                        carol_,
                         1,
                         {Amounts{
                             STAmount{EUR, UINT64_C(27'06583722134028), -14},
                             STAmount{GBP, UINT64_C(27'06583722134028), -14}}}));
-                    BEAST_EXPECT(expectOffers(env, bob, 0));
+                    BEAST_EXPECT(expectOffers(env, bob_, 0));
                     BEAST_EXPECT(expectOffers(env, ed, 0));
 
                     // Initial 30,000 - ~70.68(offers = 60.68(AMM) + 10(LOB))
                     // * 1.25
                     //     = 88.35 = ~29911.64
-                    // carol bought ~72.93EUR at the cost of ~70.68GBP
+                    // carol_ bought ~72.93EUR at the cost of ~70.68GBP
                     // the offer is partially consumed
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{GBP, UINT64_C(29'911'64396400896), -11}));
+                        env, carol_, STAmount{GBP, UINT64_C(29'911'64396400896), -11}));
                     // Initial 30,000 + ~72.93(offers = 62.93(AMM) + 10(LOB))
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{EUR, UINT64_C(30'072'93416277865), -11}));
+                        env, carol_, STAmount{EUR, UINT64_C(30'072'93416277865), -11}));
                 }
                 // Initial 2000 + 10 = 2010
-                BEAST_EXPECT(expectHolding(env, bob, GBP(2'010)));
+                BEAST_EXPECT(expectHolding(env, bob_, GBP(2'010)));
                 // Initial 2000 - 10 * 1.25 = 1987.5
                 BEAST_EXPECT(expectHolding(env, ed, EUR(1'987.5)));
             },
@@ -3857,22 +3862,22 @@ private:
         // Scenario:
         // Bob sends 125GBP to pay 80EUR to Carol
         // Payment execution:
-        // bob's 125GBP/1.25 = 100GBP
+        // bob_'s 125GBP/1.25 = 100GBP
         // 100GBP/100EUR AMM offer
-        // 100EUR/1.25 = 80EUR paid to carol
+        // 100EUR/1.25 = 80EUR paid to carol_
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, {GBP(200), EUR(200)}, Fund::Acct);
-                env(rate(gw, 1.25));
+                fund(env, gw_, {bob_}, {GBP(200), EUR(200)}, Fund::Acct);
+                env(rate(gw_, 1.25));
                 env.close();
-                env(pay(bob, carol, EUR(100)),
-                    path(~EUR),
-                    sendmax(GBP(125)),
-                    txflags(tfPartialPayment));
+                env(pay(bob_, carol_, EUR(100)),
+                    Path(~EUR),
+                    Sendmax(GBP(125)),
+                    Txflags(tfPartialPayment));
                 env.close();
                 BEAST_EXPECT(ammAlice.expectBalances(GBP(1'100), EUR(1'000), ammAlice.tokens()));
-                BEAST_EXPECT(expectHolding(env, bob, GBP(75)));
-                BEAST_EXPECT(expectHolding(env, carol, EUR(30'080)));
+                BEAST_EXPECT(expectHolding(env, bob_, GBP(75)));
+                BEAST_EXPECT(expectHolding(env, carol_, EUR(30'080)));
             },
             {{GBP(1'000), EUR(1'100)}},
             0,
@@ -3886,34 +3891,34 @@ private:
         // Ed's offer 200EUR/200USD
         // Bob sends 195.3125CAN to pay 100USD to Carol
         // Payment execution:
-        // bob's 195.3125CAN/1.25 = 156.25CAN -> dan's offer
+        // bob_'s 195.3125CAN/1.25 = 156.25CAN -> dan's offer
         // 156.25CAN/156.25GBP 156.25GBP/1.25 = 125GBP -> AMM's offer
         // 125GBP/125EUR 125EUR/1.25 = 100EUR -> ed's offer
-        // 100EUR/100USD 100USD/1.25 = 80USD paid to carol
+        // 100EUR/100USD 100USD/1.25 = 80USD paid to carol_
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 Account const dan("dan");
                 Account const ed("ed");
-                auto const CAN = gw["CAN"];
-                fund(env, gw, {dan}, {CAN(200), GBP(200)}, Fund::Acct);
-                fund(env, gw, {ed}, {EUR(200), USD(200)}, Fund::Acct);
-                fund(env, gw, {bob}, {CAN(195.3125)}, Fund::Acct);
-                env(trust(carol, USD(100)));
-                env(rate(gw, 1.25));
+                auto const can = gw_["CAN"];
+                fund(env, gw_, {dan}, {can(200), GBP(200)}, Fund::Acct);
+                fund(env, gw_, {ed}, {EUR(200), USD(200)}, Fund::Acct);
+                fund(env, gw_, {bob_}, {can(195.3125)}, Fund::Acct);
+                env(trust(carol_, USD(100)));
+                env(rate(gw_, 1.25));
                 env.close();
-                env(offer(dan, CAN(200), GBP(200)));
+                env(offer(dan, can(200), GBP(200)));
                 env(offer(ed, EUR(200), USD(200)));
                 env.close();
-                env(pay(bob, carol, USD(100)),
-                    path(~GBP, ~EUR, ~USD),
-                    sendmax(CAN(195.3125)),
-                    txflags(tfPartialPayment));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~GBP, ~EUR, ~USD),
+                    Sendmax(can(195.3125)),
+                    Txflags(tfPartialPayment));
                 env.close();
-                BEAST_EXPECT(expectHolding(env, bob, CAN(0)));
-                BEAST_EXPECT(expectHolding(env, dan, CAN(356.25), GBP(43.75)));
+                BEAST_EXPECT(expectHolding(env, bob_, can(0)));
+                BEAST_EXPECT(expectHolding(env, dan, can(356.25), GBP(43.75)));
                 BEAST_EXPECT(ammAlice.expectBalances(GBP(10'125), EUR(10'000), ammAlice.tokens()));
                 BEAST_EXPECT(expectHolding(env, ed, EUR(300), USD(100)));
-                BEAST_EXPECT(expectHolding(env, carol, USD(80)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(80)));
             },
             {{GBP(10'000), EUR(10'125)}},
             0,
@@ -3923,26 +3928,26 @@ private:
         // Pay amounts close to one side of the pool
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(pay(alice, carol, USD(99.99)),
-                    path(~USD),
-                    sendmax(XRP(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, USD(100)),
-                    path(~USD),
-                    sendmax(XRP(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, XRP(100)),
-                    path(~XRP),
-                    sendmax(USD(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
-                env(pay(alice, carol, STAmount{xrpIssue(), 99'999'900}),
-                    path(~XRP),
-                    sendmax(USD(1)),
-                    txflags(tfPartialPayment),
-                    ter(tesSUCCESS));
+                env(pay(alice_, carol_, USD(99.99)),
+                    Path(~USD),
+                    Sendmax(XRP(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, USD(100)),
+                    Path(~USD),
+                    Sendmax(XRP(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, XRP(100)),
+                    Path(~XRP),
+                    Sendmax(USD(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
+                env(pay(alice_, carol_, STAmount{xrpIssue(), 99'999'900}),
+                    Path(~XRP),
+                    Sendmax(USD(1)),
+                    Txflags(tfPartialPayment),
+                    Ter(tesSUCCESS));
             },
             {{XRP(100), USD(100)}},
             0,
@@ -3952,69 +3957,69 @@ private:
         // Multiple paths/steps
         {
             Env env(*this, features);
-            auto const ETH = gw["ETH"];
+            auto const eth = gw_["ETH"];
             fund(
                 env,
-                gw,
-                {alice},
+                gw_,
+                {alice_},
                 XRP(100'000),
-                {EUR(50'000), BTC(50'000), ETH(50'000), USD(50'000)});
-            fund(env, gw, {carol, bob}, XRP(1'000), {USD(200)}, Fund::Acct);
-            AMM const xrp_eur(env, alice, XRP(10'100), EUR(10'000));
-            AMM const eur_btc(env, alice, EUR(10'000), BTC(10'200));
-            AMM const btc_usd(env, alice, BTC(10'100), USD(10'000));
-            AMM const xrp_usd(env, alice, XRP(10'150), USD(10'200));
-            AMM const xrp_eth(env, alice, XRP(10'000), ETH(10'100));
-            AMM const eth_eur(env, alice, ETH(10'900), EUR(11'000));
-            AMM const eur_usd(env, alice, EUR(10'100), USD(10'000));
-            env(pay(bob, carol, USD(100)),
-                path(~EUR, ~BTC, ~USD),
-                path(~USD),
-                path(~ETH, ~EUR, ~USD),
-                sendmax(XRP(200)));
+                {EUR(50'000), BTC(50'000), eth(50'000), USD(50'000)});
+            fund(env, gw_, {carol_, bob_}, XRP(1'000), {USD(200)}, Fund::Acct);
+            AMM const xrpEur(env, alice_, XRP(10'100), EUR(10'000));
+            AMM const eurBtc(env, alice_, EUR(10'000), BTC(10'200));
+            AMM const btcUsd(env, alice_, BTC(10'100), USD(10'000));
+            AMM const xrpUsd(env, alice_, XRP(10'150), USD(10'200));
+            AMM const xrpEth(env, alice_, XRP(10'000), eth(10'100));
+            AMM const ethEur(env, alice_, eth(10'900), EUR(11'000));
+            AMM const eurUsd(env, alice_, EUR(10'100), USD(10'000));
+            env(pay(bob_, carol_, USD(100)),
+                Path(~EUR, ~BTC, ~USD),
+                Path(~USD),
+                Path(~eth, ~EUR, ~USD),
+                Sendmax(XRP(200)));
             if (!features[fixAMMv1_1])
             {
                 // XRP-ETH-EUR-USD
                 // This path provides ~26.06USD/26.2XRP
-                BEAST_EXPECT(xrp_eth.expectBalances(
+                BEAST_EXPECT(xrpEth.expectBalances(
                     XRPAmount(10'026'208'900),
-                    STAmount{ETH, UINT64_C(10'073'65779244494), -11},
-                    xrp_eth.tokens()));
-                BEAST_EXPECT(eth_eur.expectBalances(
-                    STAmount{ETH, UINT64_C(10'926'34220755506), -11},
+                    STAmount{eth, UINT64_C(10'073'65779244494), -11},
+                    xrpEth.tokens()));
+                BEAST_EXPECT(ethEur.expectBalances(
+                    STAmount{eth, UINT64_C(10'926'34220755506), -11},
                     STAmount{EUR, UINT64_C(10'973'54232078752), -11},
-                    eth_eur.tokens()));
-                BEAST_EXPECT(eur_usd.expectBalances(
+                    ethEur.tokens()));
+                BEAST_EXPECT(eurUsd.expectBalances(
                     STAmount{EUR, UINT64_C(10'126'45767921248), -11},
                     STAmount{USD, UINT64_C(9'973'93151712086), -11},
-                    eur_usd.tokens()));
+                    eurUsd.tokens()));
                 // XRP-USD path
                 // This path provides ~73.9USD/74.1XRP
-                BEAST_EXPECT(xrp_usd.expectBalances(
+                BEAST_EXPECT(xrpUsd.expectBalances(
                     XRPAmount(10'224'106'246),
                     STAmount{USD, UINT64_C(10'126'06848287914), -11},
-                    xrp_usd.tokens()));
+                    xrpUsd.tokens()));
             }
             else
             {
-                BEAST_EXPECT(xrp_eth.expectBalances(
+                BEAST_EXPECT(xrpEth.expectBalances(
                     XRPAmount(10'026'208'900),
-                    STAmount{ETH, UINT64_C(10'073'65779244461), -11},
-                    xrp_eth.tokens()));
-                BEAST_EXPECT(eth_eur.expectBalances(
-                    STAmount{ETH, UINT64_C(10'926'34220755539), -11},
+                    STAmount{eth, UINT64_C(10'073'65779244461), -11},
+                    xrpEth.tokens()));
+                BEAST_EXPECT(ethEur.expectBalances(
+                    STAmount{eth, UINT64_C(10'926'34220755539), -11},
                     STAmount{EUR, UINT64_C(10'973'5423207872), -10},
-                    eth_eur.tokens()));
-                BEAST_EXPECT(eur_usd.expectBalances(
+                    ethEur.tokens()));
+                BEAST_EXPECT(eurUsd.expectBalances(
                     STAmount{EUR, UINT64_C(10'126'4576792128), -10},
                     STAmount{USD, UINT64_C(9'973'93151712057), -11},
-                    eur_usd.tokens()));
+                    eurUsd.tokens()));
                 // XRP-USD path
                 // This path provides ~73.9USD/74.1XRP
-                BEAST_EXPECT(xrp_usd.expectBalances(
+                BEAST_EXPECT(xrpUsd.expectBalances(
                     XRPAmount(10'224'106'246),
                     STAmount{USD, UINT64_C(10'126'06848287943), -11},
-                    xrp_usd.tokens()));
+                    xrpUsd.tokens()));
             }
 
             // XRP-EUR-BTC-USD
@@ -4023,100 +4028,96 @@ private:
             // shows a different distribution:
             // XRP-EUR-BTC-USD 11.6USD/11.64XRP, XRP-USD 60.7USD/60.8XRP,
             // XRP-ETH-EUR-USD 27.6USD/27.6XRP
-            BEAST_EXPECT(xrp_eur.expectBalances(XRP(10'100), EUR(10'000), xrp_eur.tokens()));
-            BEAST_EXPECT(eur_btc.expectBalances(EUR(10'000), BTC(10'200), eur_btc.tokens()));
-            BEAST_EXPECT(btc_usd.expectBalances(BTC(10'100), USD(10'000), btc_usd.tokens()));
+            BEAST_EXPECT(xrpEur.expectBalances(XRP(10'100), EUR(10'000), xrpEur.tokens()));
+            BEAST_EXPECT(eurBtc.expectBalances(EUR(10'000), BTC(10'200), eurBtc.tokens()));
+            BEAST_EXPECT(btcUsd.expectBalances(BTC(10'100), USD(10'000), btcUsd.tokens()));
 
-            BEAST_EXPECT(expectHolding(env, carol, USD(300)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(300)));
         }
 
         // Dependent AMM
         {
             Env env(*this, features);
-            auto const ETH = gw["ETH"];
+            auto const eth = gw_["ETH"];
             fund(
                 env,
-                gw,
-                {alice},
+                gw_,
+                {alice_},
                 XRP(40'000),
-                {EUR(50'000), BTC(50'000), ETH(50'000), USD(50'000)});
-            fund(env, gw, {carol, bob}, XRP(1000), {USD(200)}, Fund::Acct);
-            AMM const xrp_eur(env, alice, XRP(10'100), EUR(10'000));
-            AMM const eur_btc(env, alice, EUR(10'000), BTC(10'200));
-            AMM const btc_usd(env, alice, BTC(10'100), USD(10'000));
-            AMM const xrp_eth(env, alice, XRP(10'000), ETH(10'100));
-            AMM const eth_eur(env, alice, ETH(10'900), EUR(11'000));
-            env(pay(bob, carol, USD(100)),
-                path(~EUR, ~BTC, ~USD),
-                path(~ETH, ~EUR, ~BTC, ~USD),
-                sendmax(XRP(200)));
+                {EUR(50'000), BTC(50'000), eth(50'000), USD(50'000)});
+            fund(env, gw_, {carol_, bob_}, XRP(1000), {USD(200)}, Fund::Acct);
+            AMM const xrpEur(env, alice_, XRP(10'100), EUR(10'000));
+            AMM const eurBtc(env, alice_, EUR(10'000), BTC(10'200));
+            AMM const btcUsd(env, alice_, BTC(10'100), USD(10'000));
+            AMM const xrpEth(env, alice_, XRP(10'000), eth(10'100));
+            AMM const ethEur(env, alice_, eth(10'900), EUR(11'000));
+            env(pay(bob_, carol_, USD(100)),
+                Path(~EUR, ~BTC, ~USD),
+                Path(~eth, ~EUR, ~BTC, ~USD),
+                Sendmax(XRP(200)));
             if (!features[fixAMMv1_1])
             {
                 // XRP-EUR-BTC-USD path provides ~17.8USD/~18.7XRP
                 // XRP-ETH-EUR-BTC-USD path provides ~82.2USD/82.4XRP
-                BEAST_EXPECT(xrp_eur.expectBalances(
+                BEAST_EXPECT(xrpEur.expectBalances(
                     XRPAmount(10'118'738'472),
                     STAmount{EUR, UINT64_C(9'981'544436337968), -12},
-                    xrp_eur.tokens()));
-                BEAST_EXPECT(eur_btc.expectBalances(
+                    xrpEur.tokens()));
+                BEAST_EXPECT(eurBtc.expectBalances(
                     STAmount{EUR, UINT64_C(10'101'16096785173), -11},
                     STAmount{BTC, UINT64_C(10'097'91426968066), -11},
-                    eur_btc.tokens()));
-                BEAST_EXPECT(btc_usd.expectBalances(
-                    STAmount{BTC, UINT64_C(10'202'08573031934), -11},
-                    USD(9'900),
-                    btc_usd.tokens()));
-                BEAST_EXPECT(xrp_eth.expectBalances(
+                    eurBtc.tokens()));
+                BEAST_EXPECT(btcUsd.expectBalances(
+                    STAmount{BTC, UINT64_C(10'202'08573031934), -11}, USD(9'900), btcUsd.tokens()));
+                BEAST_EXPECT(xrpEth.expectBalances(
                     XRPAmount(10'082'446'397),
-                    STAmount{ETH, UINT64_C(10'017'41072778012), -11},
-                    xrp_eth.tokens()));
-                BEAST_EXPECT(eth_eur.expectBalances(
-                    STAmount{ETH, UINT64_C(10'982'58927221988), -11},
+                    STAmount{eth, UINT64_C(10'017'41072778012), -11},
+                    xrpEth.tokens()));
+                BEAST_EXPECT(ethEur.expectBalances(
+                    STAmount{eth, UINT64_C(10'982'58927221988), -11},
                     STAmount{EUR, UINT64_C(10'917'2945958103), -10},
-                    eth_eur.tokens()));
+                    ethEur.tokens()));
             }
             else
             {
-                BEAST_EXPECT(xrp_eur.expectBalances(
+                BEAST_EXPECT(xrpEur.expectBalances(
                     XRPAmount(10'118'738'472),
                     STAmount{EUR, UINT64_C(9'981'544436337923), -12},
-                    xrp_eur.tokens()));
-                BEAST_EXPECT(eur_btc.expectBalances(
+                    xrpEur.tokens()));
+                BEAST_EXPECT(eurBtc.expectBalances(
                     STAmount{EUR, UINT64_C(10'101'16096785188), -11},
                     STAmount{BTC, UINT64_C(10'097'91426968059), -11},
-                    eur_btc.tokens()));
-                BEAST_EXPECT(btc_usd.expectBalances(
-                    STAmount{BTC, UINT64_C(10'202'08573031941), -11},
-                    USD(9'900),
-                    btc_usd.tokens()));
-                BEAST_EXPECT(xrp_eth.expectBalances(
+                    eurBtc.tokens()));
+                BEAST_EXPECT(btcUsd.expectBalances(
+                    STAmount{BTC, UINT64_C(10'202'08573031941), -11}, USD(9'900), btcUsd.tokens()));
+                BEAST_EXPECT(xrpEth.expectBalances(
                     XRPAmount(10'082'446'397),
-                    STAmount{ETH, UINT64_C(10'017'41072777996), -11},
-                    xrp_eth.tokens()));
-                BEAST_EXPECT(eth_eur.expectBalances(
-                    STAmount{ETH, UINT64_C(10'982'58927222004), -11},
+                    STAmount{eth, UINT64_C(10'017'41072777996), -11},
+                    xrpEth.tokens()));
+                BEAST_EXPECT(ethEur.expectBalances(
+                    STAmount{eth, UINT64_C(10'982'58927222004), -11},
                     STAmount{EUR, UINT64_C(10'917'2945958102), -10},
-                    eth_eur.tokens()));
+                    ethEur.tokens()));
             }
-            BEAST_EXPECT(expectHolding(env, carol, USD(300)));
+            BEAST_EXPECT(expectHolding(env, carol_, USD(300)));
         }
 
         // AMM offers limit
         // Consuming 30 CLOB offers, results in hitting 30 AMM offers limit.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
-                fund(env, gw, {bob}, {EUR(400)}, Fund::TokenOnly);
-                env(trust(alice, EUR(200)));
+                env.fund(XRP(1'000), bob_);
+                fund(env, gw_, {bob_}, {EUR(400)}, Fund::TokenOnly);
+                env(trust(alice_, EUR(200)));
                 for (int i = 0; i < 30; ++i)
-                    env(offer(alice, EUR(1.0 + (0.01 * i)), XRP(1)));
+                    env(offer(alice_, EUR(1.0 + (0.01 * i)), XRP(1)));
                 // This is worse quality offer than 30 offers above.
                 // It will not be consumed because of AMM offers limit.
-                env(offer(alice, EUR(140), XRP(100)));
-                env(pay(bob, carol, USD(100)),
-                    path(~XRP, ~USD),
-                    sendmax(EUR(400)),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                env(offer(alice_, EUR(140), XRP(100)));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~XRP, ~USD),
+                    Sendmax(EUR(400)),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
                 if (!features[fixAMMv1_1])
                 {
                     // Carol gets ~29.91USD because of the AMM offers limit
@@ -4125,7 +4126,7 @@ private:
                         STAmount{USD, UINT64_C(9'970'089730807577), -12},
                         ammAlice.tokens()));
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{USD, UINT64_C(30'029'91026919241), -11}));
+                        env, carol_, STAmount{USD, UINT64_C(30'029'91026919241), -11}));
                 }
                 else
                 {
@@ -4134,9 +4135,9 @@ private:
                         STAmount{USD, UINT64_C(9'970'089730807827), -12},
                         ammAlice.tokens()));
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{USD, UINT64_C(30'029'91026919217), -11}));
+                        env, carol_, STAmount{USD, UINT64_C(30'029'91026919217), -11}));
                 }
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{{EUR(140), XRP(100)}}}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{{EUR(140), XRP(100)}}}));
             },
             std::nullopt,
             0,
@@ -4145,33 +4146,33 @@ private:
         // This payment is fulfilled
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env.fund(XRP(1'000), bob);
-                fund(env, gw, {bob}, {EUR(400)}, Fund::TokenOnly);
-                env(trust(alice, EUR(200)));
+                env.fund(XRP(1'000), bob_);
+                fund(env, gw_, {bob_}, {EUR(400)}, Fund::TokenOnly);
+                env(trust(alice_, EUR(200)));
                 for (int i = 0; i < 29; ++i)
-                    env(offer(alice, EUR(1.0 + (0.01 * i)), XRP(1)));
+                    env(offer(alice_, EUR(1.0 + (0.01 * i)), XRP(1)));
                 // This is worse quality offer than 30 offers above.
                 // It will not be consumed because of AMM offers limit.
-                env(offer(alice, EUR(140), XRP(100)));
-                env(pay(bob, carol, USD(100)),
-                    path(~XRP, ~USD),
-                    sendmax(EUR(400)),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                env(offer(alice_, EUR(140), XRP(100)));
+                env(pay(bob_, carol_, USD(100)),
+                    Path(~XRP, ~USD),
+                    Sendmax(EUR(400)),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     XRPAmount{10'101'010'102}, USD(9'900), ammAlice.tokens()));
                 if (!features[fixAMMv1_1])
                 {
                     // Carol gets ~100USD
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{USD, UINT64_C(30'099'99999999999), -11}));
+                        env, carol_, STAmount{USD, UINT64_C(30'099'99999999999), -11}));
                 }
                 else
                 {
-                    BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
+                    BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
                 }
                 BEAST_EXPECT(expectOffers(
                     env,
-                    alice,
+                    alice_,
                     1,
                     {{{STAmount{EUR, UINT64_C(39'1858572), -7}, XRPAmount{27'989'898}}}}));
             },
@@ -4184,10 +4185,10 @@ private:
         // quality and is consumed first.
         {
             Env env(*this, features);
-            fund(env, gw, {alice, carol, bob}, XRP(30'000), {USD(30'000)});
-            env(offer(bob, XRP(100), USD(100.001)));
-            AMM const ammAlice(env, alice, XRP(10'000), USD(10'100));
-            env(offer(carol, USD(100), XRP(100)));
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(30'000), {USD(30'000)});
+            env(offer(bob_, XRP(100), USD(100.001)));
+            AMM const ammAlice(env, alice_, XRP(10'000), USD(10'100));
+            env(offer(carol_, USD(100), XRP(100)));
             if (!features[fixAMMv1_1])
             {
                 BEAST_EXPECT(ammAlice.expectBalances(
@@ -4196,7 +4197,7 @@ private:
                     ammAlice.tokens()));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    bob,
+                    bob_,
                     1,
                     {{{XRPAmount{50'074'629}, STAmount{USD, UINT64_C(50'07513050698), -11}}}}));
             }
@@ -4208,24 +4209,24 @@ private:
                     ammAlice.tokens()));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    bob,
+                    bob_,
                     1,
                     {{{XRPAmount{50'074'628}, STAmount{USD, UINT64_C(50'07512950697), -11}}}}));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'100)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'100)));
             }
         }
 
         // Individually frozen account
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                env(trust(gw, carol["USD"](0), tfSetFreeze));
-                env(trust(gw, alice["USD"](0), tfSetFreeze));
+                env(trust(gw_, carol_["USD"](0), tfSetFreeze));
+                env(trust(gw_, alice_["USD"](0), tfSetFreeze));
                 env.close();
-                env(pay(alice, carol, USD(1)),
-                    path(~USD),
-                    sendmax(XRP(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment),
-                    ter(tesSUCCESS));
+                env(pay(alice_, carol_, USD(1)),
+                    Path(~USD),
+                    Sendmax(XRP(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment),
+                    Ter(tesSUCCESS));
             },
             std::nullopt,
             0,
@@ -4249,58 +4250,60 @@ private:
                 STAmount{token1, 5'000'000},
                 0);
             // Carol places an order to buy LPTokens
-            env(offer(carol, STAmount{token1, 5'000'000}, priceXRP));
+            env(offer(carol_, STAmount{token1, 5'000'000}, priceXRP));
             // Alice places an order to sell LPTokens
-            env(offer(alice, priceXRP, STAmount{token1, 5'000'000}));
+            env(offer(alice_, priceXRP, STAmount{token1, 5'000'000}));
             // Pool's LPTokens balance doesn't change
             BEAST_EXPECT(ammAlice.expectBalances(XRP(10'000), USD(10'000), IOUAmount{10'000'000}));
             // Carol is Liquidity Provider
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{5'000'000}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(alice, IOUAmount{5'000'000}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{5'000'000}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(alice_, IOUAmount{5'000'000}));
             // Carol votes
-            ammAlice.vote(carol, 1'000);
+            ammAlice.vote(carol_, 1'000);
             BEAST_EXPECT(ammAlice.expectTradingFee(500));
-            ammAlice.vote(carol, 0);
+            ammAlice.vote(carol_, 0);
             BEAST_EXPECT(ammAlice.expectTradingFee(0));
             // Carol bids
-            env(ammAlice.bid({.account = carol, .bidMin = 100}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{4'999'900}));
+            env(ammAlice.bid({.account = carol_, .bidMin = 100}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{4'999'900}));
             BEAST_EXPECT(ammAlice.expectAuctionSlot(0, 0, IOUAmount{100}));
-            BEAST_EXPECT(accountBalance(env, carol) == std::to_string(22500000000 - (4 * baseFee)));
+            BEAST_EXPECT(
+                accountBalance(env, carol_) == std::to_string(22500000000 - (4 * baseFee)));
             priceXRP = ammAssetOut(
                 STAmount{XRPAmount{10'000'000'000}},
                 STAmount{token1, 9'999'900},
                 STAmount{token1, 4'999'900},
                 0);
             // Carol withdraws
-            ammAlice.withdrawAll(carol, XRP(0));
-            BEAST_EXPECT(accountBalance(env, carol) == std::to_string(29999949999 - (5 * baseFee)));
+            ammAlice.withdrawAll(carol_, XRP(0));
+            BEAST_EXPECT(
+                accountBalance(env, carol_) == std::to_string(29999949999 - (5 * baseFee)));
             BEAST_EXPECT(ammAlice.expectBalances(
                 XRPAmount{10'000'000'000} - priceXRP, USD(10'000), IOUAmount{5'000'000}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(alice, IOUAmount{5'000'000}));
-            BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(alice_, IOUAmount{5'000'000}));
+            BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
         });
 
         // Offer crossing with two AMM LPTokens.
         testAMM([&](AMM& ammAlice, Env& env) {
-            ammAlice.deposit(carol, 1'000'000);
-            fund(env, gw, {alice, carol}, {EUR(10'000)}, Fund::TokenOnly);
-            AMM ammAlice1(env, alice, XRP(10'000), EUR(10'000));
-            ammAlice1.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
+            fund(env, gw_, {alice_, carol_}, {EUR(10'000)}, Fund::TokenOnly);
+            AMM ammAlice1(env, alice_, XRP(10'000), EUR(10'000));
+            ammAlice1.deposit(carol_, 1'000'000);
             auto const token1 = ammAlice.lptIssue();
             auto const token2 = ammAlice1.lptIssue();
-            env(offer(alice, STAmount{token1, 100}, STAmount{token2, 100}), txflags(tfPassive));
+            env(offer(alice_, STAmount{token1, 100}, STAmount{token2, 100}), Txflags(tfPassive));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1));
-            env(offer(carol, STAmount{token2, 100}, STAmount{token1, 100}));
+            BEAST_EXPECT(expectOffers(env, alice_, 1));
+            env(offer(carol_, STAmount{token2, 100}, STAmount{token1, 100}));
             env.close();
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount{token1, 10'000'100}) &&
-                expectHolding(env, alice, STAmount{token2, 9'999'900}));
+                expectHolding(env, alice_, STAmount{token1, 10'000'100}) &&
+                expectHolding(env, alice_, STAmount{token2, 9'999'900}));
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount{token2, 1'000'100}) &&
-                expectHolding(env, carol, STAmount{token1, 999'900}));
-            BEAST_EXPECT(expectOffers(env, alice, 0) && expectOffers(env, carol, 0));
+                expectHolding(env, carol_, STAmount{token2, 1'000'100}) &&
+                expectHolding(env, carol_, STAmount{token1, 999'900}));
+            BEAST_EXPECT(expectOffers(env, alice_, 0) && expectOffers(env, carol_, 0));
         });
 
         // LPs pay LPTokens directly. Must trust set because the trust line
@@ -4308,30 +4311,30 @@ private:
         // trust line.
         testAMM([&](AMM& ammAlice, Env& env) {
             auto const token1 = ammAlice.lptIssue();
-            env.trust(STAmount{token1, 2'000'000}, carol);
+            env.trust(STAmount{token1, 2'000'000}, carol_);
             env.close();
-            ammAlice.deposit(carol, 1'000'000);
+            ammAlice.deposit(carol_, 1'000'000);
             BEAST_EXPECT(
-                ammAlice.expectLPTokens(alice, IOUAmount{10'000'000, 0}) &&
-                ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
+                ammAlice.expectLPTokens(alice_, IOUAmount{10'000'000, 0}) &&
+                ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
             // Pool balance doesn't change, only tokens moved from
             // one line to another.
-            env(pay(alice, carol, STAmount{token1, 100}));
+            env(pay(alice_, carol_, STAmount{token1, 100}));
             env.close();
             BEAST_EXPECT(
                 // Alice initial token1 10,000,000 - 100
-                ammAlice.expectLPTokens(alice, IOUAmount{9'999'900, 0}) &&
+                ammAlice.expectLPTokens(alice_, IOUAmount{9'999'900, 0}) &&
                 // Carol initial token1 1,000,000 + 100
-                ammAlice.expectLPTokens(carol, IOUAmount{1'000'100, 0}));
+                ammAlice.expectLPTokens(carol_, IOUAmount{1'000'100, 0}));
 
-            env.trust(STAmount{token1, 20'000'000}, alice);
+            env.trust(STAmount{token1, 20'000'000}, alice_);
             env.close();
-            env(pay(carol, alice, STAmount{token1, 100}));
+            env(pay(carol_, alice_, STAmount{token1, 100}));
             env.close();
             // Back to the original balance
             BEAST_EXPECT(
-                ammAlice.expectLPTokens(alice, IOUAmount{10'000'000, 0}) &&
-                ammAlice.expectLPTokens(carol, IOUAmount{1'000'000, 0}));
+                ammAlice.expectLPTokens(alice_, IOUAmount{10'000'000, 0}) &&
+                ammAlice.expectLPTokens(carol_, IOUAmount{1'000'000, 0}));
         });
     }
 
@@ -4339,7 +4342,7 @@ private:
     testAmendment()
     {
         testcase("Amendment");
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         FeatureBitset const noAMM{all - featureAMM};
         FeatureBitset const noNumber{all - fixUniversalNumber};
         FeatureBitset const noAMMAndNumber{all - featureAMM - fixUniversalNumber};
@@ -4348,16 +4351,16 @@ private:
         for (auto const& feature : {noAMM, noNumber, noAMMAndNumber})
         {
             Env env{*this, feature};
-            fund(env, gw, {alice}, {USD(1'000)}, Fund::All);
-            AMM amm(env, alice, XRP(1'000), USD(1'000), ter(temDISABLED));
+            fund(env, gw_, {alice_}, {USD(1'000)}, Fund::All);
+            AMM amm(env, alice_, XRP(1'000), USD(1'000), Ter(temDISABLED));
 
-            env(amm.bid({.bidMax = 1000}), ter(temMALFORMED));
-            env(amm.bid({}), ter(temDISABLED));
-            amm.vote(VoteArg{.tfee = 100, .err = ter(temDISABLED)});
-            amm.withdraw(WithdrawArg{.tokens = 100, .err = ter(temMALFORMED)});
-            amm.withdraw(WithdrawArg{.err = ter(temDISABLED)});
-            amm.deposit(DepositArg{.asset1In = USD(100), .err = ter(temDISABLED)});
-            amm.ammDelete(alice, ter(temDISABLED));
+            env(amm.bid({.bidMax = 1000}), Ter(temMALFORMED));
+            env(amm.bid({}), Ter(temDISABLED));
+            amm.vote(VoteArg{.tfee = 100, .err = Ter(temDISABLED)});
+            amm.withdraw(WithdrawArg{.tokens = 100, .err = Ter(temMALFORMED)});
+            amm.withdraw(WithdrawArg{.err = Ter(temDISABLED)});
+            amm.deposit(DepositArg{.asset1In = USD(100), .err = Ter(temDISABLED)});
+            amm.ammDelete(alice_, Ter(temDISABLED));
         }
     }
 
@@ -4395,35 +4398,35 @@ private:
         //   for 0 limit.
         {
             Env env(*this);
-            auto const A = Account("A");
-            auto const B = Account("B");
-            auto const TSTA = A["TST"];
-            auto const TSTB = B["TST"];
-            auto const C = Account("C");
-            auto const D = Account("D");
+            auto const a = Account("A");
+            auto const b = Account("B");
+            auto const tsta = a["TST"];
+            auto const tstb = b["TST"];
+            auto const c = Account("C");
+            auto const d = Account("D");
 
-            env.fund(XRP(10'000), A);
-            env.fund(XRP(10'000), B);
-            env.fund(XRP(10'000), C);
-            env.fund(XRP(10'000), D);
+            env.fund(XRP(10'000), a);
+            env.fund(XRP(10'000), b);
+            env.fund(XRP(10'000), c);
+            env.fund(XRP(10'000), d);
 
-            env.trust(TSTA(10'000), C);
-            env.trust(TSTB(10'000), C);
-            env(pay(A, C, TSTA(10'000)));
-            env(pay(B, C, TSTB(10'000)));
-            AMM const amm(env, C, TSTA(5'000), TSTB(5'000));
-            auto const ammIss = Issue(TSTA.currency, amm.ammAccount());
+            env.trust(tsta(10'000), c);
+            env.trust(tstb(10'000), c);
+            env(pay(a, c, tsta(10'000)));
+            env(pay(b, c, tstb(10'000)));
+            AMM const amm(env, c, tsta(5'000), tstb(5'000));
+            auto const ammIss = Issue(tsta.currency, amm.ammAccount());
 
             // Can TrustSet only for AMM LP tokens
-            env(trust(D, STAmount{ammIss, 10'000}), ter(tecNO_PERMISSION));
+            env(trust(d, STAmount{ammIss, 10'000}), Ter(tecNO_PERMISSION));
             env.close();
 
             // The payment would fail because of above, but check just in case
-            env(pay(C, D, STAmount{ammIss, 10}),
-                sendmax(TSTA(100)),
-                path(amm.ammAccount()),
-                txflags(tfPartialPayment | tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(c, d, STAmount{ammIss, 10}),
+                Sendmax(tsta(100)),
+                Path(amm.ammAccount()),
+                Txflags(tfPartialPayment | tfNoRippleDirect),
+                Ter(tecPATH_DRY));
         }
     }
 
@@ -4433,23 +4436,23 @@ private:
         testcase("AMMAndCLOB, offer quality change");
         using namespace jtx;
         auto const gw = Account("gw");
-        auto const TST = gw["TST"];
-        auto const LP1 = Account("LP1");
-        auto const LP2 = Account("LP2");
+        auto const tst = gw["TST"];
+        auto const lP1 = Account("LP1");
+        auto const lP2 = Account("LP2");
 
         auto prep = [&](auto const& offerCb, auto const& expectCb) {
             Env env(*this, features);
             env.fund(XRP(30'000'000'000), gw);
-            env(offer(gw, XRP(11'500'000'000), TST(1'000'000'000)));
+            env(offer(gw, XRP(11'500'000'000), tst(1'000'000'000)));
 
-            env.fund(XRP(10'000), LP1);
-            env.fund(XRP(10'000), LP2);
-            env(offer(LP1, TST(25), XRPAmount(287'500'000)));
+            env.fund(XRP(10'000), lP1);
+            env.fund(XRP(10'000), lP2);
+            env(offer(lP1, tst(25), XRPAmount(287'500'000)));
 
             // Either AMM or CLOB offer
             offerCb(env);
 
-            env(offer(LP2, TST(25), XRPAmount(287'500'000)));
+            env(offer(lP2, tst(25), XRPAmount(287'500'000)));
 
             expectCb(env);
         };
@@ -4461,10 +4464,10 @@ private:
         std::string lp2TakerPays;
         // Execute with AMM first
         prep(
-            [&](Env& env) { AMM const amm(env, LP1, TST(25), XRP(250)); },
+            [&](Env& env) { AMM const amm(env, lP1, tst(25), XRP(250)); },
             [&](Env& env) {
-                lp2TSTBalance = getAccountLines(env, LP2, TST)["lines"][0u]["balance"].asString();
-                auto const offer = getAccountOffers(env, LP2)["offers"][0u];
+                lp2TSTBalance = getAccountLines(env, lP2, tst)["lines"][0u]["balance"].asString();
+                auto const offer = getAccountOffers(env, lP2)["offers"][0u];
                 lp2TakerGets = offer["taker_gets"].asString();
                 lp2TakerPays = offer["taker_pays"]["value"].asString();
             });
@@ -4474,25 +4477,25 @@ private:
                 if (!features[fixAMMv1_1])
                 {
                     env(offer(
-                            LP1,
+                            lP1,
                             XRPAmount{18'095'133},
-                            STAmount{TST, UINT64_C(1'68737984885388), -14}),
-                        txflags(tfPassive));
+                            STAmount{tst, UINT64_C(1'68737984885388), -14}),
+                        Txflags(tfPassive));
                 }
                 else
                 {
                     env(offer(
-                            LP1,
+                            lP1,
                             XRPAmount{18'095'132},
-                            STAmount{TST, UINT64_C(1'68737976189735), -14}),
-                        txflags(tfPassive));
+                            STAmount{tst, UINT64_C(1'68737976189735), -14}),
+                        Txflags(tfPassive));
                 }
             },
             [&](Env& env) {
                 BEAST_EXPECT(
                     lp2TSTBalance ==
-                    getAccountLines(env, LP2, TST)["lines"][0u]["balance"].asString());
-                auto const offer = getAccountOffers(env, LP2)["offers"][0u];
+                    getAccountLines(env, lP2, tst)["lines"][0u]["balance"].asString());
+                auto const offer = getAccountOffers(env, lP2)["offers"][0u];
                 BEAST_EXPECT(lp2TakerGets == offer["taker_gets"].asString());
                 BEAST_EXPECT(lp2TakerPays == offer["taker_pays"]["value"].asString());
             });
@@ -4508,25 +4511,25 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // No fee
-                ammAlice.deposit(carol, USD(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
-                ammAlice.withdrawAll(carol, USD(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{0}));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                ammAlice.deposit(carol_, USD(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000}));
+                ammAlice.withdrawAll(carol_, USD(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{0}));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
                 // Set fee to 1%
-                ammAlice.vote(alice, 1'000);
+                ammAlice.vote(alice_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
                 // Carol gets fewer LPToken ~994, because of the single deposit
                 // fee
-                ammAlice.deposit(carol, USD(3'000));
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{994'981155689671, -12}));
-                BEAST_EXPECT(expectHolding(env, carol, USD(27'000)));
+                ammAlice.deposit(carol_, USD(3'000));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{994'981155689671, -12}));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(27'000)));
                 // Set fee to 0
-                ammAlice.vote(alice, 0);
-                ammAlice.withdrawAll(carol, USD(0));
+                ammAlice.vote(alice_, 0);
+                ammAlice.withdrawAll(carol_, USD(0));
                 // Carol gets back less than the original deposit
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{USD, UINT64_C(29'994'96220068281), -11}));
+                    expectHolding(env, carol_, STAmount{USD, UINT64_C(29'994'96220068281), -11}));
             },
             {{USD(1'000), EUR(1'000)}},
             0,
@@ -4537,15 +4540,15 @@ private:
         // 100USD with EP not to exceed 0.1 (AssetIn/TokensOut). 1% fee.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const balance = env.balance(carol, USD);
+                auto const balance = env.balance(carol_, USD);
                 auto tokensFee =
-                    ammAlice.deposit(carol, USD(1'000), std::nullopt, STAmount{USD, 1, -1});
-                auto const deposit = balance - env.balance(carol, USD);
-                ammAlice.withdrawAll(carol, USD(0));
-                ammAlice.vote(alice, 0);
+                    ammAlice.deposit(carol_, USD(1'000), std::nullopt, STAmount{USD, 1, -1});
+                auto const deposit = balance - env.balance(carol_, USD);
+                ammAlice.withdrawAll(carol_, USD(0));
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.deposit(carol, deposit);
-                // carol pays ~2008 LPTokens in fees or ~0.5% of the no-fee
+                auto const tokensNoFee = ammAlice.deposit(carol_, deposit);
+                // carol_ pays ~2008 LPTokens in fees or ~0.5% of the no-fee
                 // LPTokens
                 BEAST_EXPECT(tokensFee == IOUAmount(485'636'0611129, -7));
                 BEAST_EXPECT(tokensNoFee == IOUAmount(487'644'85901109, -8));
@@ -4559,15 +4562,15 @@ private:
         // 200USD with EP not to exceed 0.002020 (AssetIn/TokensOut). 1% fee
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                auto const balance = env.balance(carol, USD);
+                auto const balance = env.balance(carol_, USD);
                 auto const tokensFee =
-                    ammAlice.deposit(carol, USD(200), std::nullopt, STAmount{USD, 2020, -6});
-                auto const deposit = balance - env.balance(carol, USD);
-                ammAlice.withdrawAll(carol, USD(0));
-                ammAlice.vote(alice, 0);
+                    ammAlice.deposit(carol_, USD(200), std::nullopt, STAmount{USD, 2020, -6});
+                auto const deposit = balance - env.balance(carol_, USD);
+                ammAlice.withdrawAll(carol_, USD(0));
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.deposit(carol, deposit);
-                // carol pays ~475 LPTokens in fees or ~0.5% of the no-fee
+                auto const tokensNoFee = ammAlice.deposit(carol_, deposit);
+                // carol_ pays ~475 LPTokens in fees or ~0.5% of the no-fee
                 // LPTokens
                 BEAST_EXPECT(tokensFee == IOUAmount(98'000'00000002, -8));
                 BEAST_EXPECT(tokensNoFee == IOUAmount(98'475'81871545, -8));
@@ -4581,17 +4584,17 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // No fee
-                ammAlice.deposit(carol, USD(3'000));
+                ammAlice.deposit(carol_, USD(3'000));
 
-                BEAST_EXPECT(ammAlice.expectLPTokens(carol, IOUAmount{1'000}));
-                BEAST_EXPECT(expectHolding(env, carol, USD(27'000)));
+                BEAST_EXPECT(ammAlice.expectLPTokens(carol_, IOUAmount{1'000}));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(27'000)));
                 // Set fee to 1%
-                ammAlice.vote(alice, 1'000);
+                ammAlice.vote(alice_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
                 // Single withdrawal. Carol gets ~5USD less than deposited.
-                ammAlice.withdrawAll(carol, USD(0));
+                ammAlice.withdrawAll(carol_, USD(0));
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{USD, UINT64_C(29'994'97487437186), -11}));
+                    expectHolding(env, carol_, STAmount{USD, UINT64_C(29'994'97487437186), -11}));
             },
             {{USD(1'000), EUR(1'000)}},
             0,
@@ -4601,10 +4604,10 @@ private:
         // Withdraw with EPrice limit, 1% fee.
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.deposit(carol, 1'000'000);
+                ammAlice.deposit(carol_, 1'000'000);
                 auto const tokensFee =
-                    ammAlice.withdraw(carol, USD(100), std::nullopt, IOUAmount{520, 0});
-                // carol withdraws ~1,443.44USD
+                    ammAlice.withdraw(carol_, USD(100), std::nullopt, IOUAmount{520, 0});
+                // carol_ withdraws ~1,443.44USD
                 auto const balanceAfterWithdraw = [&]() {
                     if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                     {
@@ -4617,33 +4620,33 @@ private:
 
                     return STAmount(USD, UINT64_C(30'443'43891402713), -11);
                 }();
-                BEAST_EXPECT(env.balance(carol, USD) == balanceAfterWithdraw);
+                BEAST_EXPECT(env.balance(carol_, USD) == balanceAfterWithdraw);
                 // Set to original pool size
                 auto const deposit = balanceAfterWithdraw - USD(29'000);
-                ammAlice.deposit(carol, deposit);
+                ammAlice.deposit(carol_, deposit);
                 // fee 0%
-                ammAlice.vote(alice, 0);
+                ammAlice.vote(alice_, 0);
                 BEAST_EXPECT(ammAlice.expectTradingFee(0));
-                auto const tokensNoFee = ammAlice.withdraw(carol, deposit);
+                auto const tokensNoFee = ammAlice.withdraw(carol_, deposit);
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(30'443'43891402717), -11));
                 }
                 else if (features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(30'443'43891402716), -11));
                 }
                 else
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, USD) ==
+                        env.balance(carol_, USD) ==
                         STAmount(USD, UINT64_C(30'443'43891402713), -11));
                 }
-                // carol pays ~4008 LPTokens in fees or ~0.5% of the no-fee
+                // carol_ pays ~4008 LPTokens in fees or ~0.5% of the no-fee
                 // LPTokens
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
@@ -4667,36 +4670,36 @@ private:
         // Payment, 1% fee
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, XRP(1'000), {USD(1'000), EUR(1'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, XRP(1'000), {USD(1'000), EUR(1'000)}, Fund::Acct);
                 // Alice contributed 1010EUR and 1000USD to the pool
-                BEAST_EXPECT(expectHolding(env, alice, EUR(28'990)));
-                BEAST_EXPECT(expectHolding(env, alice, USD(29'000)));
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                BEAST_EXPECT(expectHolding(env, alice_, EUR(28'990)));
+                BEAST_EXPECT(expectHolding(env, alice_, USD(29'000)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
                 // Carol pays to Alice with no fee
-                env(pay(carol, alice, EUR(10)),
-                    path(~EUR),
-                    sendmax(USD(10)),
-                    txflags(tfNoRippleDirect));
+                env(pay(carol_, alice_, EUR(10)),
+                    Path(~EUR),
+                    Sendmax(USD(10)),
+                    Txflags(tfNoRippleDirect));
                 env.close();
                 // Alice has 10EUR more and Carol has 10USD less
-                BEAST_EXPECT(expectHolding(env, alice, EUR(29'000)));
-                BEAST_EXPECT(expectHolding(env, alice, USD(29'000)));
-                BEAST_EXPECT(expectHolding(env, carol, USD(29'990)));
+                BEAST_EXPECT(expectHolding(env, alice_, EUR(29'000)));
+                BEAST_EXPECT(expectHolding(env, alice_, USD(29'000)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(29'990)));
 
                 // Set fee to 1%
-                ammAlice.vote(alice, 1'000);
+                ammAlice.vote(alice_, 1'000);
                 BEAST_EXPECT(ammAlice.expectTradingFee(1'000));
                 // Bob pays to Carol with 1% fee
-                env(pay(bob, carol, USD(10)),
-                    path(~USD),
-                    sendmax(EUR(15)),
-                    txflags(tfNoRippleDirect));
+                env(pay(bob_, carol_, USD(10)),
+                    Path(~USD),
+                    Sendmax(EUR(15)),
+                    Txflags(tfNoRippleDirect));
                 env.close();
                 // Bob sends 10.1~EUR to pay 10USD
                 BEAST_EXPECT(
-                    expectHolding(env, bob, STAmount{EUR, UINT64_C(989'8989898989899), -13}));
+                    expectHolding(env, bob_, STAmount{EUR, UINT64_C(989'8989898989899), -13}));
                 // Carol got 10USD
-                BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(1'000),
                     STAmount{EUR, UINT64_C(1'010'10101010101), -11},
@@ -4711,27 +4714,27 @@ private:
         testAMM(
             [&](AMM& ammAlice, Env& env) {
                 // No fee
-                env(offer(carol, EUR(10), USD(10)));
+                env(offer(carol_, EUR(10), USD(10)));
                 env.close();
-                BEAST_EXPECT(expectHolding(env, carol, USD(29'990)));
-                BEAST_EXPECT(expectHolding(env, carol, EUR(30'010)));
+                BEAST_EXPECT(expectHolding(env, carol_, USD(29'990)));
+                BEAST_EXPECT(expectHolding(env, carol_, EUR(30'010)));
                 // Change pool composition back
-                env(offer(carol, USD(10), EUR(10)));
+                env(offer(carol_, USD(10), EUR(10)));
                 env.close();
                 // Set fee to 0.5%
-                ammAlice.vote(alice, 500);
+                ammAlice.vote(alice_, 500);
                 BEAST_EXPECT(ammAlice.expectTradingFee(500));
-                env(offer(carol, EUR(10), USD(10)));
+                env(offer(carol_, EUR(10), USD(10)));
                 env.close();
                 // Alice gets fewer ~4.97EUR for ~5.02USD, the difference goes
                 // to the pool
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{USD, UINT64_C(29'995'02512562814), -11}));
+                    expectHolding(env, carol_, STAmount{USD, UINT64_C(29'995'02512562814), -11}));
                 BEAST_EXPECT(
-                    expectHolding(env, carol, STAmount{EUR, UINT64_C(30'004'97487437186), -11}));
+                    expectHolding(env, carol_, STAmount{EUR, UINT64_C(30'004'97487437186), -11}));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    carol,
+                    carol_,
                     1,
                     {{Amounts{
                         STAmount{EUR, UINT64_C(5'025125628140703), -15},
@@ -4763,26 +4766,26 @@ private:
         {
             Env env(*this, features);
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
-            env(offer(carol, EUR(5), USD(5)));
-            AMM const ammAlice(env, alice, USD(1'005), EUR(1'000));
-            env(pay(bob, ed, USD(10)), path(~USD), sendmax(EUR(15)), txflags(tfNoRippleDirect));
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
+            env(offer(carol_, EUR(5), USD(5)));
+            AMM const ammAlice(env, alice_, USD(1'005), EUR(1'000));
+            env(pay(bob_, ed, USD(10)), Path(~USD), Sendmax(EUR(15)), Txflags(tfNoRippleDirect));
             BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
             if (!features[fixAMMv1_1])
             {
-                BEAST_EXPECT(expectHolding(env, bob, EUR(1'990)));
+                BEAST_EXPECT(expectHolding(env, bob_, EUR(1'990)));
                 BEAST_EXPECT(ammAlice.expectBalances(USD(1'000), EUR(1'005), ammAlice.tokens()));
             }
             else
             {
                 BEAST_EXPECT(
-                    expectHolding(env, bob, STAmount(EUR, UINT64_C(1989'999999999999), -12)));
+                    expectHolding(env, bob_, STAmount(EUR, UINT64_C(1989'999999999999), -12)));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(1'000),
                     STAmount(EUR, UINT64_C(1005'000000000001), -12),
                     ammAlice.tokens()));
             }
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. Same as above but with 0.25%
@@ -4790,16 +4793,16 @@ private:
         {
             Env env(*this, features);
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
-            env(offer(carol, EUR(5), USD(5)));
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
+            env(offer(carol_, EUR(5), USD(5)));
             // Set 0.25% fee
-            AMM const ammAlice(env, alice, USD(1'005), EUR(1'000), false, 250);
-            env(pay(bob, ed, USD(10)), path(~USD), sendmax(EUR(15)), txflags(tfNoRippleDirect));
+            AMM const ammAlice(env, alice_, USD(1'005), EUR(1'000), false, 250);
+            env(pay(bob_, ed, USD(10)), Path(~USD), Sendmax(EUR(15)), Txflags(tfNoRippleDirect));
             BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
             if (!features[fixAMMv1_1])
             {
                 BEAST_EXPECT(
-                    expectHolding(env, bob, STAmount{EUR, UINT64_C(1'989'987453007618), -12}));
+                    expectHolding(env, bob_, STAmount{EUR, UINT64_C(1'989'987453007618), -12}));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(1'000),
                     STAmount{EUR, UINT64_C(1'005'012546992382), -12},
@@ -4808,13 +4811,13 @@ private:
             else
             {
                 BEAST_EXPECT(
-                    expectHolding(env, bob, STAmount{EUR, UINT64_C(1'989'987453007628), -12}));
+                    expectHolding(env, bob_, STAmount{EUR, UINT64_C(1'989'987453007628), -12}));
                 BEAST_EXPECT(ammAlice.expectBalances(
                     USD(1'000),
                     STAmount{EUR, UINT64_C(1'005'012546992372), -12},
                     ammAlice.tokens()));
             }
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. AMM has a better
@@ -4823,15 +4826,15 @@ private:
         {
             Env env(*this, features);
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
-            env(offer(carol, EUR(10), USD(10)));
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
+            env(offer(carol_, EUR(10), USD(10)));
             // Set 1% fee
-            AMM const ammAlice(env, alice, USD(1'005), EUR(1'000), false, 1'000);
-            env(pay(bob, ed, USD(10)), path(~USD), sendmax(EUR(15)), txflags(tfNoRippleDirect));
+            AMM const ammAlice(env, alice_, USD(1'005), EUR(1'000), false, 1'000);
+            env(pay(bob_, ed, USD(10)), Path(~USD), Sendmax(EUR(15)), Txflags(tfNoRippleDirect));
             BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
-            BEAST_EXPECT(expectHolding(env, bob, EUR(1'990)));
+            BEAST_EXPECT(expectHolding(env, bob_, EUR(1'990)));
             BEAST_EXPECT(ammAlice.expectBalances(USD(1'005), EUR(1'000), ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // Payment with AMM and CLOB offer. AMM has a better
@@ -4841,16 +4844,17 @@ private:
         {
             Env env(*this, features);
             Account const ed("ed");
-            fund(env, gw, {alice, bob, carol, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
-            env(offer(carol, EUR(9), USD(9)));
+            fund(env, gw_, {alice_, bob_, carol_, ed}, XRP(1'000), {USD(2'000), EUR(2'000)});
+            env(offer(carol_, EUR(9), USD(9)));
             // Set 1% fee
-            AMM const ammAlice(env, alice, USD(1'005), EUR(1'000), false, 1'000);
-            env(pay(bob, ed, USD(10)), path(~USD), sendmax(EUR(15)), txflags(tfNoRippleDirect));
+            AMM const ammAlice(env, alice_, USD(1'005), EUR(1'000), false, 1'000);
+            env(pay(bob_, ed, USD(10)), Path(~USD), Sendmax(EUR(15)), Txflags(tfNoRippleDirect));
             BEAST_EXPECT(expectHolding(env, ed, USD(2'010)));
-            BEAST_EXPECT(expectHolding(env, bob, STAmount{EUR, UINT64_C(1'989'993923296712), -12}));
+            BEAST_EXPECT(
+                expectHolding(env, bob_, STAmount{EUR, UINT64_C(1'989'993923296712), -12}));
             BEAST_EXPECT(ammAlice.expectBalances(
                 USD(1'004), STAmount{EUR, UINT64_C(1'001'006076703288), -12}, ammAlice.tokens()));
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
     }
 
@@ -4874,7 +4878,7 @@ private:
                 Account const natalie("natalie");
                 fund(
                     env,
-                    gw,
+                    gw_,
                     {bob, ed, paul, dan, chris, simon, ben, natalie},
                     {USD(1'500'000)},
                     Fund::Acct);
@@ -4890,8 +4894,8 @@ private:
                     ammAlice.withdrawAll(dan, USD(0));
                     ammAlice.deposit(bob, USD(100));
                     ammAlice.withdrawAll(bob, USD(0));
-                    ammAlice.deposit(carol, USD(1'000));
-                    ammAlice.withdrawAll(carol, USD(0));
+                    ammAlice.deposit(carol_, USD(1'000));
+                    ammAlice.withdrawAll(carol_, USD(0));
                     ammAlice.deposit(ed, USD(10'000));
                     ammAlice.withdrawAll(ed, USD(0));
                     ammAlice.deposit(paul, USD(100'000));
@@ -4928,15 +4932,15 @@ private:
                 if (!features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(expectHolding(
-                        env, carol, STAmount{USD, UINT64_C(30'000'00000000001), -11}));
+                        env, carol_, STAmount{USD, UINT64_C(30'000'00000000001), -11}));
                 }
                 else if (features[fixAMMv1_1] && !features[fixAMMv1_3])
                 {
-                    BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                    BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
                 }
                 else
                 {
-                    BEAST_EXPECT(expectHolding(env, carol, USD(30'000)));
+                    BEAST_EXPECT(expectHolding(env, carol_, USD(30'000)));
                 }
                 BEAST_EXPECT(expectHolding(env, ed, USD(1'500'000)));
                 BEAST_EXPECT(expectHolding(env, paul, USD(1'500'000)));
@@ -4954,26 +4958,26 @@ private:
                 {
                     BEAST_EXPECT(expectHolding(env, natalie, USD(1'500'000)));
                 }
-                ammAlice.withdrawAll(alice);
+                ammAlice.withdrawAll(alice_);
                 BEAST_EXPECT(!ammAlice.ammExists());
                 if (!features[fixAMMv1_1])
                 {
-                    BEAST_EXPECT(
-                        expectHolding(env, alice, STAmount{USD, UINT64_C(30'000'0000000013), -10}));
+                    BEAST_EXPECT(expectHolding(
+                        env, alice_, STAmount{USD, UINT64_C(30'000'0000000013), -10}));
                 }
                 else if (features[fixAMMv1_3])
                 {
-                    BEAST_EXPECT(
-                        expectHolding(env, alice, STAmount{USD, UINT64_C(30'000'0000000003), -10}));
+                    BEAST_EXPECT(expectHolding(
+                        env, alice_, STAmount{USD, UINT64_C(30'000'0000000003), -10}));
                 }
                 else
                 {
-                    BEAST_EXPECT(expectHolding(env, alice, USD(30'000)));
+                    BEAST_EXPECT(expectHolding(env, alice_, USD(30'000)));
                 }
-                // alice XRP balance is 30,000 initial - 50 AMMCreate fee -
+                // alice_ XRP balance is 30,000 initial - 50 AMMCreate fee -
                 // 10drops fee
                 BEAST_EXPECT(
-                    accountBalance(env, alice) ==
+                    accountBalance(env, alice_) ==
                     std::to_string(29950000000 - env.current()->fees().base.drops()));
             },
             std::nullopt,
@@ -4994,7 +4998,7 @@ private:
                 Account const natalie("natalie");
                 fund(
                     env,
-                    gw,
+                    gw_,
                     {bob, ed, paul, dan, chris, simon, ben, natalie},
                     XRP(2'000'000),
                     {},
@@ -5011,8 +5015,8 @@ private:
                     ammAlice.withdrawAll(dan, XRP(0));
                     ammAlice.deposit(bob, XRP(100));
                     ammAlice.withdrawAll(bob, XRP(0));
-                    ammAlice.deposit(carol, XRP(1'000));
-                    ammAlice.withdrawAll(carol, XRP(0));
+                    ammAlice.deposit(carol_, XRP(1'000));
+                    ammAlice.withdrawAll(carol_, XRP(0));
                     ammAlice.deposit(ed, XRP(10'000));
                     ammAlice.withdrawAll(ed, XRP(0));
                     ammAlice.deposit(paul, XRP(100'000));
@@ -5026,10 +5030,10 @@ private:
                     // No round off with XRP in this test
                     BEAST_EXPECT(
                         ammAlice.expectBalances(XRP(10'000), USD(10'000), IOUAmount{10'000'000}));
-                    ammAlice.withdrawAll(alice);
+                    ammAlice.withdrawAll(alice_);
                     BEAST_EXPECT(!ammAlice.ammExists());
                     // 20,000 initial - (deposit+withdraw) * 10
-                    auto const xrpBalance = (XRP(2'000'000) - txfee(env, 20)).getText();
+                    auto const xrpBalance = (XRP(2'000'000) - txFee(env, 20)).getText();
                     BEAST_EXPECT(accountBalance(env, ben) == xrpBalance);
                     BEAST_EXPECT(accountBalance(env, simon) == xrpBalance);
                     BEAST_EXPECT(accountBalance(env, chris) == xrpBalance);
@@ -5037,14 +5041,14 @@ private:
 
                     // 30,000 initial - (deposit+withdraw) * 10
                     BEAST_EXPECT(
-                        accountBalance(env, carol) ==
+                        accountBalance(env, carol_) ==
                         std::to_string(30'000'000'000 - (20 * baseFee)));
                     BEAST_EXPECT(accountBalance(env, ed) == xrpBalance);
                     BEAST_EXPECT(accountBalance(env, paul) == xrpBalance);
                     BEAST_EXPECT(accountBalance(env, natalie) == xrpBalance);
                     // 30,000 initial - 50 AMMCreate fee - 10drops withdraw fee
                     BEAST_EXPECT(
-                        accountBalance(env, alice) == std::to_string(29'950'000'000 - baseFee));
+                        accountBalance(env, alice_) == std::to_string(29'950'000'000 - baseFee));
                 }
                 else
                 {
@@ -5052,22 +5056,22 @@ private:
                     // AMM invariant
                     BEAST_EXPECT(ammAlice.expectBalances(
                         XRPAmount(10'000'000'080), USD(10'000), IOUAmount{10'000'000}));
-                    ammAlice.withdrawAll(alice);
+                    ammAlice.withdrawAll(alice_);
                     BEAST_EXPECT(!ammAlice.ammExists());
-                    auto const xrpBalance = XRP(2'000'000) - txfee(env, 20) - drops(10);
+                    auto const xrpBalance = XRP(2'000'000) - txFee(env, 20) - drops(10);
                     auto const xrpBalanceText = xrpBalance.getText();
                     BEAST_EXPECT(accountBalance(env, ben) == xrpBalanceText);
                     BEAST_EXPECT(accountBalance(env, simon) == xrpBalanceText);
                     BEAST_EXPECT(accountBalance(env, chris) == xrpBalanceText);
                     BEAST_EXPECT(accountBalance(env, dan) == xrpBalanceText);
                     BEAST_EXPECT(
-                        accountBalance(env, carol) ==
+                        accountBalance(env, carol_) ==
                         std::to_string(30'000'000'000 - (20 * baseFee) - 10));
                     BEAST_EXPECT(accountBalance(env, ed) == (xrpBalance + drops(2)).getText());
                     BEAST_EXPECT(accountBalance(env, paul) == (xrpBalance + drops(3)).getText());
                     BEAST_EXPECT(accountBalance(env, natalie) == (xrpBalance + drops(5)).getText());
                     BEAST_EXPECT(
-                        accountBalance(env, alice) ==
+                        accountBalance(env, alice_) ==
                         std::to_string(29'950'000'000 - baseFee + 80));
                 }
             },
@@ -5083,7 +5087,7 @@ private:
         testcase("Auto Delete");
 
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         {
             Env env(
@@ -5093,9 +5097,9 @@ private:
                     return cfg;
                 }),
                 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 < maxDeletableAMMTrustLines + 10; ++i)
+            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)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -5104,26 +5108,26 @@ private:
             }
             // The trustlines are partially deleted,
             // AMM is set to an empty state.
-            amm.withdrawAll(gw);
+            amm.withdrawAll(gw_);
             BEAST_EXPECT(amm.ammExists());
 
             // Bid,Vote,Deposit,Withdraw,TrustSet failing with
             // tecAMM_EMPTY. Deposit succeeds with tfTwoAssetIfEmpty option.
             env(amm.bid({
-                    .account = alice,
+                    .account = alice_,
                     .bidMin = 1000,
                 }),
-                ter(tecAMM_EMPTY));
+                Ter(tecAMM_EMPTY));
             amm.vote(
-                std::nullopt, 100, std::nullopt, std::nullopt, std::nullopt, ter(tecAMM_EMPTY));
-            amm.withdraw(alice, 100, std::nullopt, std::nullopt, ter(tecAMM_EMPTY));
+                std::nullopt, 100, std::nullopt, std::nullopt, std::nullopt, Ter(tecAMM_EMPTY));
+            amm.withdraw(alice_, 100, std::nullopt, std::nullopt, Ter(tecAMM_EMPTY));
             amm.deposit(
-                alice, USD(100), std::nullopt, std::nullopt, std::nullopt, ter(tecAMM_EMPTY));
-            env(trust(alice, STAmount{amm.lptIssue(), 10'000}), ter(tecAMM_EMPTY));
+                alice_, USD(100), std::nullopt, std::nullopt, std::nullopt, Ter(tecAMM_EMPTY));
+            env(trust(alice_, STAmount{amm.lptIssue(), 10'000}), Ter(tecAMM_EMPTY));
 
             // Can deposit with tfTwoAssetIfEmpty option
             amm.deposit(
-                alice,
+                alice_,
                 std::nullopt,
                 XRP(10'000),
                 USD(10'000),
@@ -5138,7 +5142,7 @@ private:
 
             // Withdrawing all tokens deletes AMM since the number
             // of remaining trustlines is less than max
-            amm.withdrawAll(alice);
+            amm.withdrawAll(alice_);
             BEAST_EXPECT(!amm.ammExists());
             BEAST_EXPECT(!env.le(keylet::ownerDir(amm.ammAccount())));
         }
@@ -5151,9 +5155,9 @@ private:
                     return cfg;
                 }),
                 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 < (maxDeletableAMMTrustLines * 2) + 10; ++i)
+            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)
             {
                 Account const a{std::to_string(i)};
                 env.fund(XRP(1'000), a);
@@ -5161,19 +5165,19 @@ private:
                 env.close();
             }
             // The trustlines are partially deleted.
-            amm.withdrawAll(gw);
+            amm.withdrawAll(gw_);
             BEAST_EXPECT(amm.ammExists());
 
             // AMMDelete has to be called twice to delete AMM.
-            amm.ammDelete(alice, ter(tecINCOMPLETE));
+            amm.ammDelete(alice_, Ter(tecINCOMPLETE));
             BEAST_EXPECT(amm.ammExists());
             // Deletes remaining trustlines and deletes AMM.
-            amm.ammDelete(alice);
+            amm.ammDelete(alice_);
             BEAST_EXPECT(!amm.ammExists());
             BEAST_EXPECT(!env.le(keylet::ownerDir(amm.ammAccount())));
 
             // Try redundant delete
-            amm.ammDelete(alice, ter(terNO_AMM));
+            amm.ammDelete(alice_, Ter(terNO_AMM));
         }
     }
 
@@ -5183,10 +5187,10 @@ private:
         testcase("Clawback");
         using namespace jtx;
         Env env(*this);
-        env.fund(XRP(2'000), gw);
-        env.fund(XRP(2'000), alice);
-        AMM const amm(env, gw, XRP(1'000), USD(1'000));
-        env(fset(gw, asfAllowTrustLineClawback), ter(tecOWNERS));
+        env.fund(XRP(2'000), gw_);
+        env.fund(XRP(2'000), alice_);
+        AMM const amm(env, gw_, XRP(1'000), USD(1'000));
+        env(fset(gw_, asfAllowTrustLineClawback), Ter(tecOWNERS));
     }
 
     void
@@ -5210,8 +5214,8 @@ private:
             {
                 fail();
             }
-            amm.deposit(carol, 1'000);
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            amm.deposit(carol_, 1'000);
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             try
             {
                 bool found = false;
@@ -5244,18 +5248,18 @@ private:
         using namespace jtx;
         Account const ed("ed");
         Account const gw1("gw1");
-        auto const ETH = gw1["ETH"];
-        auto const CAN = gw1["CAN"];
+        auto const eth = gw1["ETH"];
+        auto const can = gw1["CAN"];
 
         // These tests are expected to fail if the OwnerPaysFee feature
         // is ever supported. Updates will need to be made to AMM handling
         // in the payment engine, and these tests will need to be updated.
 
         auto prep = [&](Env& env, auto gwRate, auto gw1Rate) {
-            fund(env, gw, {alice, carol, bob, ed}, XRP(2'000), {USD(2'000)});
+            fund(env, gw_, {alice_, carol_, bob_, ed}, XRP(2'000), {USD(2'000)});
             env.fund(XRP(2'000), gw1);
-            fund(env, gw1, {alice, carol, bob, ed}, {ETH(2'000), CAN(2'000)}, Fund::TokenOnly);
-            env(rate(gw, gwRate));
+            fund(env, gw1, {alice_, carol_, bob_, ed}, {eth(2'000), can(2'000)}, Fund::TokenOnly);
+            env(rate(gw_, gwRate));
             env(rate(gw1, gw1Rate));
             env.close();
         };
@@ -5281,23 +5285,23 @@ private:
                     std::optional<AMM> amm;
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400), USD(400)), txflags(tfPassive));
+                        env(offer(ed, eth(400), USD(400)), Txflags(tfPassive));
                         env.close();
                     }
                     if (i > 0)
-                        amm.emplace(env, ed, USD(1'000), ETH(1'000));
-                    env(pay(carol, bob, USD(100)), path(~USD), sendmax(ETH(500)));
+                        amm.emplace(env, ed, USD(1'000), eth(1'000));
+                    env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(eth(500)));
                     env.close();
                     // CLOB and AMM, AMM is not selected
                     if (i == 2)
                     {
-                        BEAST_EXPECT(amm->expectBalances(USD(1'000), ETH(1'000), amm->tokens()));
+                        BEAST_EXPECT(amm->expectBalances(USD(1'000), eth(1'000), amm->tokens()));
                     }
-                    BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
+                    BEAST_EXPECT(expectHolding(env, bob_, USD(2'100)));
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000) - env.balance(carol, ETH),
-                            env.balance(bob, USD) - USD(2'000)});
+                            eth(2'000) - env.balance(carol_, eth),
+                            env.balance(bob_, USD) - USD(2'000)});
                 }
                 // CLOB is better quality than AMM
                 BEAST_EXPECT(q[0] > q[1]);
@@ -5316,27 +5320,27 @@ private:
                 std::optional<AMM> amm;
                 if (i == 0 || i == 2)
                 {
-                    env(offer(ed, ETH(400), USD(400)), txflags(tfPassive));
+                    env(offer(ed, eth(400), USD(400)), Txflags(tfPassive));
                     env.close();
                 }
                 if (i > 0)
-                    amm.emplace(env, ed, USD(1'000), ETH(1'000));
-                env(offer(alice, USD(400), ETH(400)));
+                    amm.emplace(env, ed, USD(1'000), eth(1'000));
+                env(offer(alice_, USD(400), eth(400)));
                 env.close();
                 // AMM is not selected
                 if (i > 0)
                 {
-                    BEAST_EXPECT(amm->expectBalances(USD(1'000), ETH(1'000), amm->tokens()));
+                    BEAST_EXPECT(amm->expectBalances(USD(1'000), eth(1'000), amm->tokens()));
                 }
                 if (i == 0 || i == 2)
                 {
                     // Fully crosses
-                    BEAST_EXPECT(expectOffers(env, alice, 0));
+                    BEAST_EXPECT(expectOffers(env, alice_, 0));
                 }
                 // Fails to cross because AMM is not selected
                 else
                 {
-                    BEAST_EXPECT(expectOffers(env, alice, 1, {Amounts{USD(400), ETH(400)}}));
+                    BEAST_EXPECT(expectOffers(env, alice_, 1, {Amounts{USD(400), eth(400)}}));
                 }
                 BEAST_EXPECT(expectOffers(env, ed, 0));
             }
@@ -5354,17 +5358,17 @@ private:
                     std::optional<AMM> amm;
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400), USD(300)), txflags(tfPassive));
+                        env(offer(ed, eth(400), USD(300)), Txflags(tfPassive));
                         env.close();
                     }
                     if (i > 0)
-                        amm.emplace(env, ed, USD(1'000), ETH(1'000));
-                    env(pay(carol, bob, USD(100)), path(~USD), sendmax(ETH(500)));
+                        amm.emplace(env, ed, USD(1'000), eth(1'000));
+                    env(pay(carol_, bob_, USD(100)), Path(~USD), Sendmax(eth(500)));
                     env.close();
                     // AMM and CLOB are selected
                     if (i > 0)
                     {
-                        BEAST_EXPECT(!amm->expectBalances(USD(1'000), ETH(1'000), amm->tokens()));
+                        BEAST_EXPECT(!amm->expectBalances(USD(1'000), eth(1'000), amm->tokens()));
                     }
                     if (i == 2 && !features[fixAMMv1_1])
                     {
@@ -5377,7 +5381,7 @@ private:
                                     ed,
                                     1,
                                     {{Amounts{
-                                        STAmount{ETH, UINT64_C(378'6327949540823), -13},
+                                        STAmount{eth, UINT64_C(378'6327949540823), -13},
                                         STAmount{USD, UINT64_C(283'9745962155617), -13}}}}));
                             }
                             else
@@ -5387,7 +5391,7 @@ private:
                                     ed,
                                     1,
                                     {{Amounts{
-                                        STAmount{ETH, UINT64_C(378'6327949540813), -13},
+                                        STAmount{eth, UINT64_C(378'6327949540813), -13},
                                         STAmount{USD, UINT64_C(283'974596215561), -12}}}}));
                             }
                         }
@@ -5400,7 +5404,7 @@ private:
                                     ed,
                                     1,
                                     {{Amounts{
-                                        STAmount{ETH, UINT64_C(325'299461620749), -12},
+                                        STAmount{eth, UINT64_C(325'299461620749), -12},
                                         STAmount{USD, UINT64_C(243'9745962155617), -13}}}}));
                             }
                             else
@@ -5410,7 +5414,7 @@ private:
                                     ed,
                                     1,
                                     {{Amounts{
-                                        STAmount{ETH, UINT64_C(325'299461620748), -12},
+                                        STAmount{eth, UINT64_C(325'299461620748), -12},
                                         STAmount{USD, UINT64_C(243'974596215561), -12}}}}));
                             }
                         }
@@ -5424,7 +5428,7 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    STAmount{ETH, UINT64_C(378'6327949540812), -13},
+                                    STAmount{eth, UINT64_C(378'6327949540812), -13},
                                     STAmount{USD, UINT64_C(283'9745962155609), -13}}}}));
                         }
                         else
@@ -5434,15 +5438,15 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    STAmount{ETH, UINT64_C(325'2994616207479), -13},
+                                    STAmount{eth, UINT64_C(325'2994616207479), -13},
                                     STAmount{USD, UINT64_C(243'9745962155609), -13}}}}));
                         }
                     }
-                    BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
+                    BEAST_EXPECT(expectHolding(env, bob_, USD(2'100)));
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000) - env.balance(carol, ETH),
-                            env.balance(bob, USD) - USD(2'000)});
+                            eth(2'000) - env.balance(carol_, eth),
+                            env.balance(bob_, USD) - USD(2'000)});
                 }
                 // AMM is better quality
                 BEAST_EXPECT(q[1] > q[0]);
@@ -5458,17 +5462,17 @@ private:
                 std::optional<AMM> amm;
                 if (i == 0 || i == 2)
                 {
-                    env(offer(ed, ETH(400), USD(250)), txflags(tfPassive));
+                    env(offer(ed, eth(400), USD(250)), Txflags(tfPassive));
                     env.close();
                 }
                 if (i > 0)
-                    amm.emplace(env, ed, USD(1'000), ETH(1'000));
-                env(offer(alice, USD(250), ETH(400)));
+                    amm.emplace(env, ed, USD(1'000), eth(1'000));
+                env(offer(alice_, USD(250), eth(400)));
                 env.close();
                 // AMM is selected in both cases
                 if (i > 0)
                 {
-                    BEAST_EXPECT(!amm->expectBalances(USD(1'000), ETH(1'000), amm->tokens()));
+                    BEAST_EXPECT(!amm->expectBalances(USD(1'000), eth(1'000), amm->tokens()));
                 }
                 // Partially crosses, AMM is selected, CLOB fails
                 // limitQuality
@@ -5478,14 +5482,14 @@ private:
                     {
                         if (!features[fixAMMv1_1])
                         {
-                            BEAST_EXPECT(expectOffers(env, ed, 1, {{Amounts{ETH(400), USD(250)}}}));
+                            BEAST_EXPECT(expectOffers(env, ed, 1, {{Amounts{eth(400), USD(250)}}}));
                             BEAST_EXPECT(expectOffers(
                                 env,
-                                alice,
+                                alice_,
                                 1,
                                 {{Amounts{
                                     STAmount{USD, UINT64_C(40'5694150420947), -13},
-                                    STAmount{ETH, UINT64_C(64'91106406735152), -14},
+                                    STAmount{eth, UINT64_C(64'91106406735152), -14},
                                 }}}));
                         }
                         else
@@ -5498,10 +5502,10 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    STAmount{ETH, UINT64_C(335'0889359326475), -13},
+                                    STAmount{eth, UINT64_C(335'0889359326475), -13},
                                     STAmount{USD, UINT64_C(209'4305849579047), -13},
                                 }}}));
-                            BEAST_EXPECT(expectOffers(env, alice, 0));
+                            BEAST_EXPECT(expectOffers(env, alice_, 0));
                         }
                     }
                     else
@@ -5514,10 +5518,10 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    STAmount{ETH, UINT64_C(335'0889359326485), -13},
+                                    STAmount{eth, UINT64_C(335'0889359326485), -13},
                                     STAmount{USD, UINT64_C(209'4305849579053), -13},
                                 }}}));
-                            BEAST_EXPECT(expectOffers(env, alice, 0));
+                            BEAST_EXPECT(expectOffers(env, alice_, 0));
                         }
                         else
                         {
@@ -5527,10 +5531,10 @@ private:
                                 ed,
                                 1,
                                 {{Amounts{
-                                    STAmount{ETH, UINT64_C(335'0889359326475), -13},
+                                    STAmount{eth, UINT64_C(335'0889359326475), -13},
                                     STAmount{USD, UINT64_C(209'4305849579047), -13},
                                 }}}));
-                            BEAST_EXPECT(expectOffers(env, alice, 0));
+                            BEAST_EXPECT(expectOffers(env, alice_, 0));
                         }
                     }
                 }
@@ -5562,18 +5566,21 @@ private:
 
                     if (i == 0 || i == 2)
                     {
-                        env(offer(ed, ETH(400), CAN(400)), txflags(tfPassive));
-                        env(offer(ed, CAN(400), USD(400))), txflags(tfPassive);
+                        env(offer(ed, eth(400), can(400)), Txflags(tfPassive));
+                        env(offer(ed, can(400), USD(400))), Txflags(tfPassive);
                         env.close();
                     }
 
                     if (i > 0)
-                        amm.emplace(env, ed, ETH(1'000), USD(1'000));
+                        amm.emplace(env, ed, eth(1'000), USD(1'000));
 
-                    env(pay(carol, bob, USD(100)), path(~USD), path(~CAN, ~USD), sendmax(ETH(600)));
+                    env(pay(carol_, bob_, USD(100)),
+                        Path(~USD),
+                        Path(~can, ~USD),
+                        Sendmax(eth(600)));
                     env.close();
 
-                    BEAST_EXPECT(expectHolding(env, bob, USD(2'100)));
+                    BEAST_EXPECT(expectHolding(env, bob_, USD(2'100)));
 
                     if (i == 2 && !features[fixAMMv1_1])
                     {
@@ -5581,14 +5588,14 @@ private:
                         {
                             // Liquidity is consumed from AMM strand only
                             BEAST_EXPECT(amm->expectBalances(
-                                STAmount{ETH, UINT64_C(1'176'66038955758), -11},
+                                STAmount{eth, UINT64_C(1'176'66038955758), -11},
                                 USD(850),
                                 amm->tokens()));
                         }
                         else
                         {
                             BEAST_EXPECT(amm->expectBalances(
-                                STAmount{ETH, UINT64_C(1'179'540094339627), -12},
+                                STAmount{eth, UINT64_C(1'179'540094339627), -12},
                                 STAmount{USD, UINT64_C(847'7880529867501), -13},
                                 amm->tokens()));
                             BEAST_EXPECT(expectOffers(
@@ -5596,11 +5603,11 @@ private:
                                 ed,
                                 2,
                                 {{Amounts{
-                                      STAmount{ETH, UINT64_C(343'3179205198749), -13},
-                                      STAmount{CAN, UINT64_C(343'3179205198749), -13},
+                                      STAmount{eth, UINT64_C(343'3179205198749), -13},
+                                      STAmount{can, UINT64_C(343'3179205198749), -13},
                                   },
                                   Amounts{
-                                      STAmount{CAN, UINT64_C(362'2119470132499), -13},
+                                      STAmount{can, UINT64_C(362'2119470132499), -13},
                                       STAmount{USD, UINT64_C(362'2119470132499), -13},
                                   }}}));
                         }
@@ -5611,14 +5618,14 @@ private:
                         {
                             // Liquidity is consumed from AMM strand only
                             BEAST_EXPECT(amm->expectBalances(
-                                STAmount{ETH, UINT64_C(1'176'660389557593), -12},
+                                STAmount{eth, UINT64_C(1'176'660389557593), -12},
                                 USD(850),
                                 amm->tokens()));
                         }
                         else
                         {
                             BEAST_EXPECT(amm->expectBalances(
-                                STAmount{ETH, UINT64_C(1'179'54009433964), -11},
+                                STAmount{eth, UINT64_C(1'179'54009433964), -11},
                                 STAmount{USD, UINT64_C(847'7880529867501), -13},
                                 amm->tokens()));
                             BEAST_EXPECT(expectOffers(
@@ -5626,19 +5633,19 @@ private:
                                 ed,
                                 2,
                                 {{Amounts{
-                                      STAmount{ETH, UINT64_C(343'3179205198749), -13},
-                                      STAmount{CAN, UINT64_C(343'3179205198749), -13},
+                                      STAmount{eth, UINT64_C(343'3179205198749), -13},
+                                      STAmount{can, UINT64_C(343'3179205198749), -13},
                                   },
                                   Amounts{
-                                      STAmount{CAN, UINT64_C(362'2119470132499), -13},
+                                      STAmount{can, UINT64_C(362'2119470132499), -13},
                                       STAmount{USD, UINT64_C(362'2119470132499), -13},
                                   }}}));
                         }
                     }
                     q[i] = Quality(
                         Amounts{
-                            ETH(2'000) - env.balance(carol, ETH),
-                            env.balance(bob, USD) - USD(2'000)});
+                            eth(2'000) - env.balance(carol_, eth),
+                            env.balance(bob_, USD) - USD(2'000)});
                 }
                 BEAST_EXPECT(q[1] > q[0]);
                 BEAST_EXPECT(q[2] > q[0] && q[2] < q[1]);
@@ -5651,7 +5658,7 @@ private:
     {
         testcase("Fix Default Inner Object");
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         auto test = [&](FeatureBitset features,
                         TER const& err1,
@@ -5662,18 +5669,18 @@ private:
                         bool closeLedger,
                         std::optional<std::uint16_t> extra = std::nullopt) {
             Env env(*this, features);
-            fund(env, gw, {alice}, XRP(1'000), {USD(10)});
-            AMM amm(env, gw, XRP(10), USD(10), {.tfee = tfee, .close = closeLedger});
-            amm.deposit(alice, USD(10), XRP(10));
-            amm.vote(VoteArg{.account = alice, .tfee = tfee, .err = ter(err1)});
-            amm.withdraw(WithdrawArg{.account = gw, .asset1Out = USD(1), .err = ter(err2)});
+            fund(env, gw_, {alice_}, XRP(1'000), {USD(10)});
+            AMM amm(env, gw_, XRP(10), USD(10), {.tfee = tfee, .close = closeLedger});
+            amm.deposit(alice_, USD(10), XRP(10));
+            amm.vote(VoteArg{.account = alice_, .tfee = tfee, .err = Ter(err1)});
+            amm.withdraw(WithdrawArg{.account = gw_, .asset1Out = USD(1), .err = Ter(err2)});
             // with the amendment disabled and ledger not closed,
             // second vote succeeds if the first vote sets the trading fee
             // to non-zero; if the first vote sets the trading fee to >0 &&
             // <9 then the second withdraw succeeds if the second vote sets
             // the trading fee so that the discounted fee is non-zero
-            amm.vote(VoteArg{.account = alice, .tfee = 20, .err = ter(err3)});
-            amm.withdraw(WithdrawArg{.account = gw, .asset1Out = USD(2), .err = ter(err4)});
+            amm.vote(VoteArg{.account = alice_, .tfee = 20, .err = Ter(err3)});
+            amm.withdraw(WithdrawArg{.account = gw_, .asset1Out = USD(2), .err = Ter(err4)});
         };
 
         // ledger is closed after each transaction, vote/withdraw don't fail
@@ -5732,8 +5739,8 @@ private:
             Succeed                      // Both succeed
         };
         using enum Status;
-        auto const xrpIouAmounts10_100 = TAmounts{XRPAmount{10}, IOUAmount{100}};
-        auto const iouXrpAmounts10_100 = TAmounts{IOUAmount{10}, XRPAmount{100}};
+        auto const xrpIouAmounts10100 = TAmounts{XRPAmount{10}, IOUAmount{100}};
+        auto const iouXrpAmounts10100 = TAmounts{IOUAmount{10}, XRPAmount{100}};
         // clang-format off
         std::vector<std::tuple<std::string, std::string, Quality, std::uint16_t, Status>> const tests = {
             //Pool In              ,  Pool Out,             Quality                     , Fee,  Status
@@ -5771,8 +5778,8 @@ private:
             {"0.009059512633902926", "7994028",             Quality{5477511954775533172}, 1000, Fail},
             {"1",                    "1.0",                 Quality{0},                    100, Fail},
             {"1.0",                  "1",                   Quality{0},                    100, Fail},
-            {"10",                   "10.0",                Quality{xrpIouAmounts10_100},  100, Fail},
-            {"10.0",                 "10",                  Quality{iouXrpAmounts10_100},  100, Fail},
+            {"10",                   "10.0",                Quality{xrpIouAmounts10100},  100, Fail},
+            {"10.0",                 "10",                  Quality{iouXrpAmounts10100},  100, Fail},
             {"69864389131",          "287631.4543025075",   Quality{6487623473313516078},  451, Succeed},
             {"4328342973",           "12453825.99247381",   Quality{6272522264364865181},  997, Succeed},
             {"32347017",             "7003.93031579449",    Quality{6347261126087916670}, 1000, Succeed},
@@ -5802,7 +5809,7 @@ private:
         Env const env(*this, features, std::make_unique<CaptureLogs>(&logs));
         auto rules = env.current()->rules();
         CurrentTransactionRulesGuard const rg(rules);
-        NumberMantissaScaleGuard const sg(MantissaRange::mantissa_scale::small);
+        NumberMantissaScaleGuard const sg(MantissaRange::MantissaScale::Small);
 
         for (auto const& t : tests)
         {
@@ -5923,7 +5930,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             WithdrawArg const args{
                 .flags = tfSingleAsset,
-                .err = ter(temMALFORMED),
+                .err = Ter(temMALFORMED),
             };
             ammAlice.withdraw(args);
         });
@@ -5931,7 +5938,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             WithdrawArg const args{
                 .flags = tfOneAssetLPToken,
-                .err = ter(temMALFORMED),
+                .err = Ter(temMALFORMED),
             };
             ammAlice.withdraw(args);
         });
@@ -5939,7 +5946,7 @@ private:
         testAMM([&](AMM& ammAlice, Env& env) {
             WithdrawArg const args{
                 .flags = tfLimitLPToken,
-                .err = ter(temMALFORMED),
+                .err = Ter(temMALFORMED),
             };
             ammAlice.withdraw(args);
         });
@@ -5948,7 +5955,7 @@ private:
             WithdrawArg const args{
                 .asset1Out = XRP(100),
                 .asset2Out = XRP(100),
-                .err = ter(temBAD_AMM_TOKENS),
+                .err = Ter(temBAD_AMM_TOKENS),
             };
             ammAlice.withdraw(args);
         });
@@ -5957,20 +5964,20 @@ private:
             WithdrawArg const args{
                 .asset1Out = XRP(100),
                 .asset2Out = BAD(100),
-                .err = ter(temBAD_CURRENCY),
+                .err = Ter(temBAD_CURRENCY),
             };
             ammAlice.withdraw(args);
         });
 
         testAMM([&](AMM& ammAlice, Env& env) {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::AMMWithdraw;
             jv[jss::Flags] = tfLimitLPToken;
-            jv[jss::Account] = alice.human();
+            jv[jss::Account] = alice_.human();
             ammAlice.setTokens(jv);
             XRP(100).value().setJson(jv[jss::Amount]);
             USD(100).value().setJson(jv[jss::EPrice]);
-            env(jv, ter(temBAD_AMM_TOKENS));
+            env(jv, Ter(temBAD_AMM_TOKENS));
         });
     }
 
@@ -5996,7 +6003,7 @@ private:
             char const* testCase;
             double const poolUsdBIT;
             double const poolUsdGH;
-            sendmax const sendMaxUsdBIT;
+            Sendmax const sendMaxUsdBIT;
             STAmount const sendUsdGH;
             STAmount const failUsdGH;
             STAmount const failUsdGHr;
@@ -6243,10 +6250,10 @@ private:
                 env.close();
 
                 env(pay(trader, trader, input.sendUsdGH),
-                    path(~usdGH),
-                    path(~btcGH, ~usdGH),
-                    sendmax(input.sendMaxUsdBIT),
-                    txflags(tfPartialPayment));
+                    Path(~usdGH),
+                    Path(~btcGH, ~usdGH),
+                    Sendmax(input.sendMaxUsdBIT),
+                    Txflags(tfPartialPayment));
                 env.close();
 
                 auto const failUsdGH = features[fixAMMv1_1] ? input.failUsdGHr : input.failUsdGH;
@@ -6308,12 +6315,12 @@ private:
                 auto [xrpBegin, iouBegin, lptBegin] = amm.balances(XRP, USD);
 
                 // Set Bob's starting conditions.
-                env.fund(xrpBob, bob);
-                env.trust(USD(1'000'000), bob);
-                env(pay(gw, bob, iouBob));
+                env.fund(xrpBob, bob_);
+                env.trust(USD(1'000'000), bob_);
+                env(pay(gw_, bob_, iouBob));
                 env.close();
 
-                env(offer(bob, XRP(6300), USD(100'000)));
+                env(offer(bob_, XRP(6300), USD(100'000)));
                 env.close();
 
                 // Assert that AMM is unchanged.
@@ -6322,7 +6329,7 @@ private:
             {{xrpPool, iouPool}},
             889,
             std::nullopt,
-            {testable_amendments() | fixAMMv1_1});
+            {testableAmendments() | fixAMMv1_1});
     }
 
     void
@@ -6337,32 +6344,32 @@ private:
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol}, XRP(1'000'000), {USD(1'000'000)});
+            fund(env, gw_, {alice_, carol_}, XRP(1'000'000), {USD(1'000'000)});
             // This offer blocks AMM offer in pre-amendment
-            env(offer(alice, XRP(1), USD(0.01)));
+            env(offer(alice_, XRP(1), USD(0.01)));
             env.close();
 
-            AMM const amm(env, gw, XRP(200'000), USD(100'000));
+            AMM const amm(env, gw_, XRP(200'000), USD(100'000));
 
             // The offer doesn't cross AMM in pre-amendment code
             // It crosses AMM in post-amendment code
-            env(offer(carol, USD(0.49), XRP(1)));
+            env(offer(carol_, USD(0.49), XRP(1)));
             env.close();
 
             if (!features[fixAMMv1_1])
             {
                 BEAST_EXPECT(amm.expectBalances(XRP(200'000), USD(100'000), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(1), USD(0.01)}}}));
-                // Carol's offer is blocked by alice's offer
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{USD(0.49), XRP(1)}}}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{XRP(1), USD(0.01)}}}));
+                // Carol's offer is blocked by alice_'s offer
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{USD(0.49), XRP(1)}}}));
             }
             else
             {
                 BEAST_EXPECT(
                     amm.expectBalances(XRPAmount(200'000'980'005), USD(99'999.51), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(1), USD(0.01)}}}));
+                BEAST_EXPECT(expectOffers(env, alice_, 1, {{Amounts{XRP(1), USD(0.01)}}}));
                 // Carol's offer crosses AMM
-                BEAST_EXPECT(expectOffers(env, carol, 0));
+                BEAST_EXPECT(expectOffers(env, carol_, 0));
             }
         }
 
@@ -6371,40 +6378,40 @@ private:
         {
             Env env(*this, features);
 
-            fund(env, gw, {alice, carol}, XRP(1'000'000), {USD(1'000'000)});
+            fund(env, gw_, {alice_, carol_}, XRP(1'000'000), {USD(1'000'000)});
             // There is no blocking offer
-            // env(offer(alice, XRP(1), USD(0.01)));
+            // env(offer(alice_, XRP(1), USD(0.01)));
 
-            AMM const amm(env, gw, XRP(200'000), USD(100'000));
+            AMM const amm(env, gw_, XRP(200'000), USD(100'000));
 
             // The offer crosses AMM
-            env(offer(carol, USD(0.49), XRP(1)));
+            env(offer(carol_, USD(0.49), XRP(1)));
             env.close();
 
             // The same result as with the blocking offer
             BEAST_EXPECT(
                 amm.expectBalances(XRPAmount(200'000'980'005), USD(99'999.51), amm.tokens()));
             // Carol's offer crosses AMM
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
         // XRP/USD crosses AMM
         {
             Env env(*this, features);
-            fund(env, gw, {alice, carol, bob}, XRP(10'000), {USD(1'000)});
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(10'000), {USD(1'000)});
 
             // This offer blocks AMM offer in pre-amendment
             // It crosses AMM in post-amendment code
-            env(offer(bob, USD(1), XRPAmount(500)));
+            env(offer(bob_, USD(1), XRPAmount(500)));
             env.close();
-            AMM const amm(env, alice, XRP(1'000), USD(500));
-            env(offer(carol, XRP(100), USD(55)));
+            AMM const amm(env, alice_, XRP(1'000), USD(500));
+            env(offer(carol_, XRP(100), USD(55)));
             env.close();
             if (!features[fixAMMv1_1])
             {
                 BEAST_EXPECT(amm.expectBalances(XRP(1'000), USD(500), amm.tokens()));
-                BEAST_EXPECT(expectOffers(env, bob, 1, {{Amounts{USD(1), XRPAmount(500)}}}));
-                BEAST_EXPECT(expectOffers(env, carol, 1, {{Amounts{XRP(100), USD(55)}}}));
+                BEAST_EXPECT(expectOffers(env, bob_, 1, {{Amounts{USD(1), XRPAmount(500)}}}));
+                BEAST_EXPECT(expectOffers(env, carol_, 1, {{Amounts{XRP(100), USD(55)}}}));
             }
             else
             {
@@ -6414,10 +6421,10 @@ private:
                     amm.tokens()));
                 BEAST_EXPECT(expectOffers(
                     env,
-                    carol,
+                    carol_,
                     1,
                     {{Amounts{XRPAmount{9'090'909}, STAmount{USD, 4'99999995, -8}}}}));
-                BEAST_EXPECT(expectOffers(env, bob, 1, {{Amounts{USD(1), XRPAmount(500)}}}));
+                BEAST_EXPECT(expectOffers(env, bob_, 1, {{Amounts{USD(1), XRPAmount(500)}}}));
             }
         }
 
@@ -6425,15 +6432,15 @@ private:
         // pre- and post-amendment.
         {
             Env env(*this, features);
-            fund(env, gw, {alice, carol, bob}, XRP(10'000), {USD(1'000)});
+            fund(env, gw_, {alice_, carol_, bob_}, XRP(10'000), {USD(1'000)});
 
-            AMM const amm(env, alice, XRP(1'000), USD(500));
-            env(offer(carol, XRP(100), USD(55)));
+            AMM const amm(env, alice_, XRP(1'000), USD(500));
+            env(offer(carol_, XRP(100), USD(55)));
             env.close();
             BEAST_EXPECT(amm.expectBalances(
                 XRPAmount(909'090'909), STAmount{USD, UINT64_C(550'000000055), -9}, amm.tokens()));
             BEAST_EXPECT(expectOffers(
-                env, carol, 1, {{Amounts{XRPAmount{9'090'909}, STAmount{USD, 4'99999995, -8}}}}));
+                env, carol_, 1, {{Amounts{XRPAmount{9'090'909}, STAmount{USD, 4'99999995, -8}}}}));
         }
     }
 
@@ -6447,54 +6454,54 @@ private:
         {
             std::string logs;
             Env env(*this, features, std::make_unique<CaptureLogs>(&logs));
-            fund(env, gw, {alice, carol}, XRP(1'000'000'000), {USD(1'000'000'000)});
-            AMM amm(env, gw, XRP(2), USD(1));
-            amm.deposit(alice, IOUAmount{1'876123487565916, -15});
-            amm.deposit(carol, IOUAmount{1'000'000});
-            amm.withdrawAll(alice);
-            BEAST_EXPECT(amm.expectLPTokens(alice, IOUAmount{0}));
-            amm.withdrawAll(carol);
-            BEAST_EXPECT(amm.expectLPTokens(carol, IOUAmount{0}));
+            fund(env, gw_, {alice_, carol_}, XRP(1'000'000'000), {USD(1'000'000'000)});
+            AMM amm(env, gw_, XRP(2), USD(1));
+            amm.deposit(alice_, IOUAmount{1'876123487565916, -15});
+            amm.deposit(carol_, IOUAmount{1'000'000});
+            amm.withdrawAll(alice_);
+            BEAST_EXPECT(amm.expectLPTokens(alice_, IOUAmount{0}));
+            amm.withdrawAll(carol_);
+            BEAST_EXPECT(amm.expectLPTokens(carol_, IOUAmount{0}));
             auto const lpToken =
-                getAccountLines(env, gw, amm.lptIssue())[jss::lines][0u][jss::balance];
+                getAccountLines(env, gw_, amm.lptIssue())[jss::lines][0u][jss::balance];
             auto const lpTokenBalance = amm.ammRpcInfo()[jss::amm][jss::lp_token][jss::value];
             BEAST_EXPECT(lpToken == "1414.213562373095" && lpTokenBalance == "1414.213562373");
             if (!features[fixAMMv1_1])
             {
-                amm.withdrawAll(gw, std::nullopt, ter(tecAMM_BALANCE));
+                amm.withdrawAll(gw_, std::nullopt, Ter(tecAMM_BALANCE));
                 BEAST_EXPECT(amm.ammExists());
             }
             else
             {
-                amm.withdrawAll(gw);
+                amm.withdrawAll(gw_);
                 BEAST_EXPECT(!amm.ammExists());
             }
         }
 
         // Last Liquidity Provider is the issuer of two tokens, or not
         // the issuer
-        for (auto const& lp : {gw, bob})
+        for (auto const& lp : {gw_, bob_})
         {
             Env env(*this, features);
-            auto const ABC = gw["ABC"];
+            auto const abc = gw_["ABC"];
             fund(
                 env,
-                gw,
-                {alice, carol, bob},
+                gw_,
+                {alice_, carol_, bob_},
                 XRP(1'000),
-                {USD(1'000'000'000), ABC(1'000'000'000'000)});
-            AMM amm(env, lp, ABC(2'000'000), USD(1));
-            amm.deposit(alice, IOUAmount{1'876123487565916, -15});
-            amm.deposit(carol, IOUAmount{1'000'000});
-            amm.withdrawAll(alice);
-            amm.withdrawAll(carol);
+                {USD(1'000'000'000), abc(1'000'000'000'000)});
+            AMM amm(env, lp, abc(2'000'000), USD(1));
+            amm.deposit(alice_, IOUAmount{1'876123487565916, -15});
+            amm.deposit(carol_, IOUAmount{1'000'000});
+            amm.withdrawAll(alice_);
+            amm.withdrawAll(carol_);
             auto const lpToken =
                 getAccountLines(env, lp, amm.lptIssue())[jss::lines][0u][jss::balance];
             auto const lpTokenBalance = amm.ammRpcInfo()[jss::amm][jss::lp_token][jss::value];
             BEAST_EXPECT(lpToken == "1414.213562373095" && lpTokenBalance == "1414.213562373");
             if (!features[fixAMMv1_1])
             {
-                amm.withdrawAll(lp, std::nullopt, ter(tecAMM_BALANCE));
+                amm.withdrawAll(lp, std::nullopt, Ter(tecAMM_BALANCE));
                 BEAST_EXPECT(amm.ammExists());
             }
             else
@@ -6508,35 +6515,35 @@ private:
         // XRP/IOU
         {
             Env env(*this, features);
-            fund(env, gw, {alice}, XRP(1'000), {USD(1'000)});
-            AMM amm(env, gw, XRP(10), USD(10));
-            amm.deposit(alice, 1'000);
-            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw);
+            fund(env, gw_, {alice_}, XRP(1'000), {USD(1'000)});
+            AMM amm(env, gw_, XRP(10), USD(10));
+            amm.deposit(alice_, 1'000);
+            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw_);
             BEAST_EXPECT(res && !res.value());
-            res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), alice);
+            res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), alice_);
             BEAST_EXPECT(res && !res.value());
         }
         // IOU/IOU, issuer of both IOU
         {
             Env env(*this, features);
-            fund(env, gw, {alice}, XRP(1'000), {USD(1'000), EUR(1'000)});
-            AMM amm(env, gw, EUR(10), USD(10));
-            amm.deposit(alice, 1'000);
-            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw);
+            fund(env, gw_, {alice_}, XRP(1'000), {USD(1'000), EUR(1'000)});
+            AMM amm(env, gw_, EUR(10), USD(10));
+            amm.deposit(alice_, 1'000);
+            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw_);
             BEAST_EXPECT(res && !res.value());
-            res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), alice);
+            res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), alice_);
             BEAST_EXPECT(res && !res.value());
         }
         // IOU/IOU, issuer of one IOU
         {
             Env env(*this, features);
             Account const gw1("gw1");
-            auto const YAN = gw1["YAN"];
-            fund(env, gw, {gw1}, XRP(1'000), {USD(1'000)});
-            fund(env, gw1, {gw}, XRP(1'000), {YAN(1'000)}, Fund::TokenOnly);
-            AMM amm(env, gw1, YAN(10), USD(10));
-            amm.deposit(gw, 1'000);
-            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw);
+            auto const yan = gw1["YAN"];
+            fund(env, gw_, {gw1}, XRP(1'000), {USD(1'000)});
+            fund(env, gw1, {gw_}, XRP(1'000), {yan(1'000)}, Fund::TokenOnly);
+            AMM amm(env, gw1, yan(10), USD(10));
+            amm.deposit(gw_, 1'000);
+            auto res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw_);
             BEAST_EXPECT(res && !res.value());
             res = isOnlyLiquidityProvider(*env.current(), amm.lptIssue(), gw1);
             BEAST_EXPECT(res && !res.value());
@@ -6551,21 +6558,21 @@ private:
 
         // Issuer has clawback enabled
         Env env(*this, features);
-        env.fund(XRP(1'000), gw);
-        env(fset(gw, asfAllowTrustLineClawback));
-        fund(env, gw, {alice}, XRP(1'000), {USD(1'000)}, Fund::Acct);
+        env.fund(XRP(1'000), gw_);
+        env(fset(gw_, asfAllowTrustLineClawback));
+        fund(env, gw_, {alice_}, XRP(1'000), {USD(1'000)}, Fund::Acct);
         env.close();
 
         // If featureAMMClawback is not enabled, AMMCreate is not allowed for
         // clawback-enabled issuer
         if (!features[featureAMMClawback])
         {
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tecNO_PERMISSION));
-            AMM const amm1(env, alice, USD(100), XRP(100), ter(tecNO_PERMISSION));
-            env(fclear(gw, asfAllowTrustLineClawback));
+            AMM const amm(env, gw_, XRP(100), USD(100), Ter(tecNO_PERMISSION));
+            AMM const amm1(env, alice_, USD(100), XRP(100), Ter(tecNO_PERMISSION));
+            env(fclear(gw_, asfAllowTrustLineClawback));
             env.close();
             // Can't be cleared
-            AMM const amm2(env, gw, XRP(100), USD(100), ter(tecNO_PERMISSION));
+            AMM const amm2(env, gw_, XRP(100), USD(100), Ter(tecNO_PERMISSION));
         }
         // If featureAMMClawback is enabled, AMMCreate is allowed for
         // clawback-enabled issuer. Clawback from the AMM Account is not
@@ -6574,8 +6581,8 @@ private:
         // AMMClawback transaction to claw back from AMM Account.
         else
         {
-            AMM const amm(env, gw, XRP(100), USD(100), ter(tesSUCCESS));
-            AMM const amm1(env, alice, USD(100), XRP(200), ter(tecDUPLICATE));
+            AMM const amm(env, gw_, XRP(100), USD(100), Ter(tesSUCCESS));
+            AMM const amm1(env, alice_, USD(100), XRP(200), Ter(tecDUPLICATE));
 
             // Construct the amount being clawed back using AMM account.
             // By doing this, we make the clawback transaction's Amount field's
@@ -6586,10 +6593,10 @@ private:
             // `issuer` subfield represents the account being clawed back, which
             // is confusing.
             auto const error =
-                features[featureSingleAssetVault] ? ter{tecPSEUDO_ACCOUNT} : ter{tecAMM_ACCOUNT};
+                features[featureSingleAssetVault] ? Ter{tecPSEUDO_ACCOUNT} : Ter{tecAMM_ACCOUNT};
             Issue const usd(USD.issue().currency, amm.ammAccount());
             auto amount = amountFromString(usd, "10");
-            env(claw(gw, amount), error);
+            env(claw(gw_, amount), error);
         }
     }
 
@@ -6600,14 +6607,14 @@ private:
         using namespace jtx;
 
         // This lambda function is used to create trustlines
-        // between gw and alice, and create an AMM account.
+        // between gw_ and alice_, and create an AMM account.
         // And also test the callback function.
         auto testAMMDeposit = [&](Env& env, std::function<void(AMM & amm)> cb) {
-            env.fund(XRP(1'000), gw);
-            fund(env, gw, {alice}, XRP(1'000), {USD(1'000)}, Fund::Acct);
+            env.fund(XRP(1'000), gw_);
+            fund(env, gw_, {alice_}, XRP(1'000), {USD(1'000)}, Fund::Acct);
             env.close();
-            AMM amm(env, alice, XRP(100), USD(100), ter(tesSUCCESS));
-            env(trust(gw, alice["USD"](0), tfSetFreeze));
+            AMM amm(env, alice_, XRP(100), USD(100), Ter(tesSUCCESS));
+            env(trust(gw_, alice_["USD"](0), tfSetFreeze));
             cb(amm);
         };
 
@@ -6616,7 +6623,7 @@ private:
         {
             Env env(*this, features);
             testAMMDeposit(env, [&](AMM& amm) {
-                amm.deposit(alice, USD(100), XRP(100), std::nullopt, tfTwoAsset, ter(tecFROZEN));
+                amm.deposit(alice_, USD(100), XRP(100), std::nullopt, tfTwoAsset, Ter(tecFROZEN));
             });
         }
 
@@ -6626,7 +6633,7 @@ private:
             Env env(*this, features);
             testAMMDeposit(env, [&](AMM& amm) {
                 amm.deposit(
-                    alice, USD(100), std::nullopt, std::nullopt, tfSingleAsset, ter(tecFROZEN));
+                    alice_, USD(100), std::nullopt, std::nullopt, tfSingleAsset, Ter(tecFROZEN));
             });
         }
 
@@ -6638,7 +6645,7 @@ private:
             Env env(*this, features);
             testAMMDeposit(env, [&](AMM& amm) {
                 amm.deposit(
-                    alice, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, ter(tecFROZEN));
+                    alice_, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, Ter(tecFROZEN));
             });
         }
         else
@@ -6649,7 +6656,7 @@ private:
             Env env(*this, features);
             testAMMDeposit(env, [&](AMM& amm) {
                 amm.deposit(
-                    alice, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, ter(tesSUCCESS));
+                    alice_, XRP(100), std::nullopt, std::nullopt, tfSingleAsset, Ter(tesSUCCESS));
             });
         }
     }
@@ -6660,39 +6667,39 @@ private:
         testcase("Fix Reserve Check On Withdrawal");
         using namespace jtx;
 
-        auto const err = features[fixAMMv1_2] ? ter(tecINSUFFICIENT_RESERVE) : ter(tesSUCCESS);
+        auto const err = features[fixAMMv1_2] ? Ter(tecINSUFFICIENT_RESERVE) : Ter(tesSUCCESS);
 
         auto test = [&](auto&& cb) {
             Env env(*this, features);
-            auto const starting_xrp = reserve(env, 2) + env.current()->fees().base * 5;
-            env.fund(starting_xrp, gw);
-            env.fund(starting_xrp, alice);
-            env.trust(USD(2'000), alice);
+            auto const startingXrp = reserve(env, 2) + env.current()->fees().base * 5;
+            env.fund(startingXrp, gw_);
+            env.fund(startingXrp, alice_);
+            env.trust(USD(2'000), alice_);
             env.close();
-            env(pay(gw, alice, USD(2'000)));
+            env(pay(gw_, alice_, USD(2'000)));
             env.close();
-            AMM amm(env, gw, EUR(1'000), USD(1'000));
-            amm.deposit(alice, USD(1));
+            AMM amm(env, gw_, EUR(1'000), USD(1'000));
+            amm.deposit(alice_, USD(1));
             cb(amm);
         };
 
         // Equal withdraw
-        test([&](AMM& amm) { amm.withdrawAll(alice, std::nullopt, err); });
+        test([&](AMM& amm) { amm.withdrawAll(alice_, std::nullopt, err); });
 
         // Equal withdraw with a limit
         test([&](AMM& amm) {
             amm.withdraw(
                 WithdrawArg{
-                    .account = alice, .asset1Out = EUR(0.1), .asset2Out = USD(0.1), .err = err});
+                    .account = alice_, .asset1Out = EUR(0.1), .asset2Out = USD(0.1), .err = err});
             amm.withdraw(
                 WithdrawArg{
-                    .account = alice, .asset1Out = USD(0.1), .asset2Out = EUR(0.1), .err = err});
+                    .account = alice_, .asset1Out = USD(0.1), .asset2Out = EUR(0.1), .err = err});
         });
 
         // Single withdraw
         test([&](AMM& amm) {
-            amm.withdraw(WithdrawArg{.account = alice, .asset1Out = EUR(0.1), .err = err});
-            amm.withdraw(WithdrawArg{.account = alice, .asset1Out = USD(0.1)});
+            amm.withdraw(WithdrawArg{.account = alice_, .asset1Out = EUR(0.1), .err = err});
+            amm.withdraw(WithdrawArg{.account = alice_, .asset1Out = USD(0.1)});
         });
     }
 
@@ -6705,10 +6712,10 @@ private:
             testcase("Fail pseudo-account allocation " + suffix);
             std::string logs;
             Env env{*this, features, std::make_unique<CaptureLogs>(&logs)};
-            env.fund(XRP(30'000), gw, alice);
+            env.fund(XRP(30'000), gw_, alice_);
             env.close();
-            env(trust(alice, gw["USD"](30'000), 0));
-            env(pay(gw, alice, USD(10'000)));
+            env(trust(alice_, gw_["USD"](30'000), 0));
+            env(pay(gw_, alice_, USD(10'000)));
             env.close();
 
             STAmount const amount = XRP(10'000);
@@ -6719,21 +6726,21 @@ private:
                 AccountID const accountId = xrpl::pseudoAccountAddress(*env.current(), keylet.key);
 
                 env(pay(env.master.id(), accountId, XRP(1000)),
-                    seq(autofill),
-                    fee(autofill),
-                    sig(autofill));
+                    Seq(kAUTOFILL),
+                    Fee(kAUTOFILL),
+                    Sig(kAUTOFILL));
             }
 
             AMM const ammAlice(
                 env,
-                alice,
+                alice_,
                 amount,
                 amount2,
-                features[featureSingleAssetVault] ? ter{terADDRESS_COLLISION} : ter{tecDUPLICATE});
+                features[featureSingleAssetVault] ? Ter{terADDRESS_COLLISION} : Ter{tecDUPLICATE});
         };
 
-        testCase("tecDUPLICATE", testable_amendments() - featureSingleAssetVault);
-        testCase("terADDRESS_COLLISION", testable_amendments());
+        testCase("tecDUPLICATE", testableAmendments() - featureSingleAssetVault);
+        testCase("terADDRESS_COLLISION", testableAmendments());
     }
 
     void
@@ -6742,39 +6749,39 @@ private:
         testcase("Deposit and Withdraw Rounding V2");
         using namespace jtx;
 
-        auto const XPM = gw["XPM"];
+        auto const xpm = gw_["XPM"];
         STAmount xrpBalance{XRPAmount(692'614'492'126)};
-        STAmount xpmBalance{XPM, UINT64_C(18'610'359'80246901), -8};
-        STAmount amount{XPM, UINT64_C(6'566'496939465400), -12};
+        STAmount xpmBalance{xpm, UINT64_C(18'610'359'80246901), -8};
+        STAmount amount{xpm, UINT64_C(6'566'496939465400), -12};
         std::uint16_t const tfee = 941;
 
-        auto test = [&](auto&& cb, std::uint16_t tfee_) {
+        auto test = [&](auto&& cb, std::uint16_t tfee) {
             Env env(*this, features);
-            env.fund(XRP(1'000'000), gw);
-            env.fund(XRP(1'000), alice);
-            env(trust(alice, XPM(7'000)));
-            env(pay(gw, alice, amount));
+            env.fund(XRP(1'000'000), gw_);
+            env.fund(XRP(1'000), alice_);
+            env(trust(alice_, xpm(7'000)));
+            env(pay(gw_, alice_, amount));
 
-            AMM amm(env, gw, xrpBalance, xpmBalance, CreateArg{.tfee = tfee_});
+            AMM amm(env, gw_, xrpBalance, xpmBalance, CreateArg{.tfee = tfee});
             // AMM LPToken balance required to replicate single deposit failure
             STAmount const lptAMMBalance{amm.lptIssue(), UINT64_C(3'234'987'266'485968), -6};
             auto const burn = IOUAmount{amm.getLPTokensBalance() - lptAMMBalance};
             // burn tokens to get to the required AMM state
-            env(amm.bid(BidArg{.account = gw, .bidMin = burn, .bidMax = burn}));
+            env(amm.bid(BidArg{.account = gw_, .bidMin = burn, .bidMax = burn}));
             cb(amm, env);
         };
         test(
             [&](AMM& amm, Env& env) {
-                auto const err = env.enabled(fixAMMv1_3) ? ter(tesSUCCESS) : ter(tecUNFUNDED_AMM);
-                amm.deposit(DepositArg{.account = alice, .asset1In = amount, .err = err});
+                auto const err = env.enabled(fixAMMv1_3) ? Ter(tesSUCCESS) : Ter(tecUNFUNDED_AMM);
+                amm.deposit(DepositArg{.account = alice_, .asset1In = amount, .err = err});
             },
             tfee);
         test(
             [&](AMM& amm, Env& env) {
-                auto const [amount, amount2, lptAMM] = amm.balances(XRP, XPM);
-                auto const withdraw = STAmount{XPM, 1, -5};
-                amm.withdraw(WithdrawArg{.asset1Out = STAmount{XPM, 1, -5}});
-                auto const [amount_, amount2_, lptAMM_] = amm.balances(XRP, XPM);
+                auto const [amount, amount2, lptAMM] = amm.balances(XRP, xpm);
+                auto const withdraw = STAmount{xpm, 1, -5};
+                amm.withdraw(WithdrawArg{.asset1Out = STAmount{xpm, 1, -5}});
+                auto const [amount_, amount2_, lptAMM_] = amm.balances(XRP, xpm);
                 if (!env.enabled(fixAMMv1_3))
                 {
                     BEAST_EXPECT((amount2 - amount2_) > withdraw);
@@ -6792,9 +6799,9 @@ private:
     {
         auto const [amount, amount2, lptBalance] = amm.balances(GBP, EUR);
 
-        NumberMantissaScaleGuard const sg(MantissaRange::mantissa_scale::small);
+        NumberMantissaScaleGuard const sg(MantissaRange::MantissaScale::Small);
         NumberRoundModeGuard const g(
-            env.enabled(fixAMMv1_3) ? Number::rounding_mode::upward : Number::getround());
+            env.enabled(fixAMMv1_3) ? Number::RoundingMode::Upward : Number::getround());
         auto const res = root2(amount * amount2);
 
         if (shouldFail)
@@ -6824,10 +6831,16 @@ private:
         {
             testAMM(
                 [&](AMM& ammAlice, Env& env) {
-                    fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                    fund(
+                        env,
+                        gw_,
+                        {bob_},
+                        XRP(10'000'000),
+                        {GBP(100'000), EUR(100'000)},
+                        Fund::Acct);
                     env.close();
 
-                    ammAlice.deposit(DepositArg{.account = bob, .asset1In = deposit});
+                    ammAlice.deposit(DepositArg{.account = bob_, .asset1In = deposit});
                     invariant(
                         ammAlice,
                         env,
@@ -6843,14 +6856,14 @@ private:
         // Two-asset proportional deposit (1:1 pool ratio)
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
                 env.close();
 
                 STAmount const depositEuro{EUR, UINT64_C(10'1234567890123456), -16};
                 STAmount const depositGBP{GBP, UINT64_C(10'1234567890123456), -16};
 
                 ammAlice.deposit(
-                    DepositArg{.account = bob, .asset1In = depositEuro, .asset2In = depositGBP});
+                    DepositArg{.account = bob_, .asset1In = depositEuro, .asset2In = depositGBP});
                 invariant(ammAlice, env, "dep2", false);
             },
             {{GBP(30'000), EUR(30'000)}},
@@ -6863,7 +6876,13 @@ private:
         {
             testAMM(
                 [&](AMM& ammAlice, Env& env) {
-                    fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                    fund(
+                        env,
+                        gw_,
+                        {bob_},
+                        XRP(10'000'000),
+                        {GBP(100'000), EUR(100'000)},
+                        Fund::Acct);
                     env.close();
 
                     STAmount const depositEuro{EUR, 1, exponent};
@@ -6871,7 +6890,7 @@ private:
 
                     ammAlice.deposit(
                         DepositArg{
-                            .account = bob, .asset1In = depositEuro, .asset2In = depositGBP});
+                            .account = bob_, .asset1In = depositEuro, .asset2In = depositGBP});
                     invariant(ammAlice, env, "dep3", exponent != -3 && !env.enabled(fixAMMv1_3));
                 },
                 {{GBP(10'000), EUR(30'000)}},
@@ -6883,11 +6902,11 @@ private:
         // tfLPToken deposit
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
                 env.close();
 
                 ammAlice.deposit(
-                    DepositArg{.account = bob, .tokens = IOUAmount{10'1234567890123456, -16}});
+                    DepositArg{.account = bob_, .tokens = IOUAmount{10'1234567890123456, -16}});
                 invariant(ammAlice, env, "dep4", false);
             },
             {{GBP(7'000), EUR(30'000)}},
@@ -6910,8 +6929,8 @@ private:
                 [&](AMM& ammAlice, Env& env) {
                     fund(
                         env,
-                        gw,
-                        {bob},
+                        gw_,
+                        {bob_},
                         XRP(10'000'000),
                         {GBP(100'000), EUR(1'000'000)},
                         Fund::Acct);
@@ -6919,7 +6938,7 @@ private:
 
                     ammAlice.deposit(
                         DepositArg{
-                            .account = bob, .tokens = tokens, .asset1In = STAmount{EUR, 1, 6}});
+                            .account = bob_, .tokens = tokens, .asset1In = STAmount{EUR, 1, 6}});
                     invariant(ammAlice, env, "dep5", false);
                 },
                 {{GBP(7'000), EUR(30'000)}},
@@ -6932,10 +6951,10 @@ private:
         // 1'000 GBP with EP not to exceed 5 (GBP/TokensOut)
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
                 env.close();
 
-                ammAlice.deposit(bob, GBP(1'000), std::nullopt, STAmount{GBP, 5});
+                ammAlice.deposit(bob_, GBP(1'000), std::nullopt, STAmount{GBP, 5});
                 invariant(ammAlice, env, "dep6", false);
             },
             {{GBP(30'000), EUR(30'000)}},
@@ -6954,7 +6973,7 @@ private:
         // tfLPToken mode
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdraw(alice, 1'000);
+                ammAlice.withdraw(alice_, 1'000);
                 invariant(ammAlice, env, "with1", false);
             },
             {{GBP(7'000), EUR(30'000)}},
@@ -6965,7 +6984,7 @@ private:
         // tfWithdrawAll mode
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                ammAlice.withdraw(WithdrawArg{.account = alice, .flags = tfWithdrawAll});
+                ammAlice.withdraw(WithdrawArg{.account = alice_, .flags = tfWithdrawAll});
                 invariant(ammAlice, env, "with2", false);
             },
             {{GBP(7'000), EUR(30'000)}},
@@ -6978,7 +6997,7 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.withdraw(
                     WithdrawArg{
-                        .account = alice,
+                        .account = alice_,
                         .asset1Out = STAmount{GBP, 3'500},
                         .asset2Out = STAmount{EUR, 15'000},
                         .flags = tfTwoAsset});
@@ -6998,7 +7017,7 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.withdraw(
                     WithdrawArg{
-                        .account = alice,
+                        .account = alice_,
                         .asset1Out = STAmount{GBP, 1'234},
                         .flags = tfSingleAsset});
                 invariant(ammAlice, env, "with4", false);
@@ -7011,14 +7030,14 @@ private:
         // tfOneAssetWithdrawAll mode
         testAMM(
             [&](AMM& ammAlice, Env& env) {
-                fund(env, gw, {bob}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
+                fund(env, gw_, {bob_}, XRP(10'000'000), {GBP(100'000), EUR(100'000)}, Fund::Acct);
                 env.close();
 
-                ammAlice.deposit(DepositArg{.account = bob, .asset1In = STAmount{GBP, 3'456}});
+                ammAlice.deposit(DepositArg{.account = bob_, .asset1In = STAmount{GBP, 3'456}});
 
                 ammAlice.withdraw(
                     WithdrawArg{
-                        .account = bob,
+                        .account = bob_,
                         .asset1Out = STAmount{GBP, 1'000},
                         .flags = tfOneAssetWithdrawAll});
                 invariant(ammAlice, env, "with5", false);
@@ -7033,7 +7052,7 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.withdraw(
                     WithdrawArg{
-                        .account = alice,
+                        .account = alice_,
                         .tokens = 1'000,
                         .asset1Out = STAmount{GBP, 100},
                         .flags = tfOneAssetLPToken});
@@ -7049,7 +7068,7 @@ private:
             [&](AMM& ammAlice, Env& env) {
                 ammAlice.withdraw(
                     WithdrawArg{
-                        .account = alice,
+                        .account = alice_,
                         .asset1Out = STAmount{GBP, 100},
                         .maxEP = IOUAmount{2},
                         .flags = tfLimitLPToken});
@@ -7064,7 +7083,7 @@ private:
     void
     run() override
     {
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testInvalidInstance();
         testInstanceCreate();
         testInvalidDeposit(all);
diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp
index c2ecb91a84..a30691b175 100644
--- a/src/test/app/AccountDelete_test.cpp
+++ b/src/test/app/AccountDelete_test.cpp
@@ -46,7 +46,7 @@
 
 namespace xrpl::test {
 
-class AccountDelete_test : public beast::unit_test::suite
+class AccountDelete_test : public beast::unit_test::Suite
 {
 private:
     // Helper function that verifies the expected DeliveredAmount is present.
@@ -57,13 +57,13 @@ private:
     verifyDeliveredAmount(jtx::Env& env, STAmount const& amount)
     {
         // Get the hash for the most recent transaction.
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
         // Verify DeliveredAmount and delivered_amount metadata are correct.
         // We can't use env.meta() here, because meta() doesn't include
         // delivered_amount.
         env.close();
-        Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         // Expect there to be a DeliveredAmount field.
         if (!BEAST_EXPECT(meta.isMember(sfDeliveredAmount.jsonName)))
@@ -71,13 +71,13 @@ private:
 
         // DeliveredAmount and delivered_amount should both be present and
         // equal amount.
-        Json::Value const jsonExpect{amount.getJson(JsonOptions::none)};
+        json::Value const jsonExpect{amount.getJson(JsonOptions::KNone)};
         BEAST_EXPECT(meta[sfDeliveredAmount.jsonName] == jsonExpect);
         BEAST_EXPECT(meta[jss::delivered_amount] == jsonExpect);
     }
 
     // Helper function to create a payment channel.
-    static Json::Value
+    static json::Value
     payChanCreate(
         jtx::Account const& account,
         jtx::Account const& to,
@@ -86,11 +86,11 @@ private:
         NetClock::time_point const& cancelAfter,
         PublicKey const& pk)
     {
-        Json::Value jv;
+        json::Value jv;
         jv[jss::TransactionType] = jss::PaymentChannelCreate;
         jv[jss::Account] = account.human();
         jv[jss::Destination] = to.human();
-        jv[jss::Amount] = amount.getJson(JsonOptions::none);
+        jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
         jv[sfSettleDelay.jsonName] = settleDelay.count();
         jv[sfCancelAfter.jsonName] = cancelAfter.time_since_epoch().count() + 2;
         jv[sfPublicKey.jsonName] = strHex(pk.slice());
@@ -115,24 +115,24 @@ public:
         env.close();
 
         // Alice can't delete her account and then give herself the XRP.
-        env(acctdelete(alice, alice), ter(temDST_IS_SRC));
+        env(acctdelete(alice, alice), Ter(temDST_IS_SRC));
 
         // alice can't delete her account with a negative fee.
-        env(acctdelete(alice, becky), fee(drops(-1)), ter(temBAD_FEE));
+        env(acctdelete(alice, becky), Fee(drops(-1)), Ter(temBAD_FEE));
 
         // Invalid flags.
-        env(acctdelete(alice, becky), txflags(tfImmediateOrCancel), ter(temINVALID_FLAG));
+        env(acctdelete(alice, becky), Txflags(tfImmediateOrCancel), Ter(temINVALID_FLAG));
 
         // Account deletion has a high fee.  Make sure the fee requirement
         // behaves as we expect.
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, becky), ter(telINSUF_FEE_P));
+        env(acctdelete(alice, becky), Ter(telINSUF_FEE_P));
 
         // Try a fee one drop less than the required amount.
-        env(acctdelete(alice, becky), fee(acctDelFee - drops(1)), ter(telINSUF_FEE_P));
+        env(acctdelete(alice, becky), Fee(acctDelFee - drops(1)), Ter(telINSUF_FEE_P));
 
         // alice's account is created too recently to be deleted.
-        env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+        env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
 
         // Give becky a trustline.  She is no longer deletable.
         env(trust(becky, gw["USD"](1000)));
@@ -150,13 +150,13 @@ public:
 
         // Deleting should fail with TOO_SOON, which is a relatively
         // cheap check compared to validating the contents of her directory.
-        env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+        env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
 
         // Close enough ledgers to almost be able to delete alice's account.
         incLgrSeqForAccDel(env, alice, 1);
 
         // alice's account is still created too recently to be deleted.
-        env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+        env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
 
         // The most recent delete attempt advanced alice's sequence.  So
         // close two ledgers and her account should be deletable.
@@ -171,7 +171,7 @@ public:
             BEAST_EXPECT(env.closed()->exists(keylet::account(alice.id())));
             BEAST_EXPECT(!env.closed()->exists(keylet::ownerDir(alice.id())));
 
-            env(acctdelete(alice, becky), fee(acctDelFee));
+            env(acctdelete(alice, becky), Fee(acctDelFee));
             verifyDeliveredAmount(env, aliceOldBalance - acctDelFee);
             env.close();
 
@@ -184,20 +184,20 @@ public:
         }
 
         // Attempt to delete becky's account but get stopped by the trust line.
-        env(acctdelete(becky, carol), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(becky, carol), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Verify that becky's account is still there by giving her a regular
         // key.  This has the side effect of setting the lsfPasswordSpent bit
         // on her account root.
         Account const beck("beck");
-        env(regkey(becky, beck), fee(drops(0)));
+        env(regkey(becky, beck), Fee(drops(0)));
         env.close();
 
         // Show that the lsfPasswordSpent bit is set by attempting to change
         // becky's regular key for free again.  That fails.
         Account const reb("reb");
-        env(regkey(becky, reb), sig(becky), fee(drops(0)), ter(telINSUF_FEE_P));
+        env(regkey(becky, reb), Sig(becky), Fee(drops(0)), Ter(telINSUF_FEE_P));
 
         // Close enough ledgers that becky's failing regkey transaction is
         // no longer retried.
@@ -214,12 +214,12 @@ 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::ticket(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
             // that multisigning for the delete does not increase carol's fee.
-            env(acctdelete(carol, becky), fee(acctDelFee), msig(alice));
+            env(acctdelete(carol, becky), Fee(acctDelFee), Msig(alice));
             verifyDeliveredAmount(env, carolOldBalance - acctDelFee);
             env.close();
 
@@ -228,7 +228,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::ticket(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.
@@ -236,7 +236,7 @@ public:
 
             // Since becky received an influx of XRP, her lsfPasswordSpent bit
             // is cleared and she can change her regular key for free again.
-            env(regkey(becky, reb), sig(becky), fee(drops(0)));
+            env(regkey(becky, reb), Sig(becky), Fee(drops(0)));
         }
     }
 
@@ -277,7 +277,7 @@ public:
         // Delete alice's account.
         auto const acctDelFee{drops(env.current()->fees().increment)};
         auto const aliceBalance{env.balance(alice)};
-        env(acctdelete(alice, gw), fee(acctDelFee));
+        env(acctdelete(alice, gw), Fee(acctDelFee));
         verifyDeliveredAmount(env, aliceBalance - acctDelFee);
         env.close();
 
@@ -294,7 +294,7 @@ public:
         testcase("Owned types");
 
         // We want to test PayChannels with the backlink.
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const alice("alice");
         Account const becky("becky");
         Account const gw("gw");
@@ -327,8 +327,8 @@ public:
         env.close();
 
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
-        env(acctdelete(becky, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(becky, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Cancel the check, but add an escrow.  Again, with the escrow
@@ -340,14 +340,14 @@ public:
         using namespace std::chrono_literals;
         std::uint32_t const escrowSeq{env.seq(alice)};
         env(escrow::create(alice, becky, XRP(333)),
-            escrow::finish_time(env.now() + 3s),
-            escrow::cancel_time(env.now() + 4s));
+            escrow::kFINISH_TIME(env.now() + 3s),
+            escrow::kCANCEL_TIME(env.now() + 4s));
         env.close();
 
         // alice and becky should be unable to delete their accounts because
         // of the escrow.
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
-        env(acctdelete(becky, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(becky, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Now cancel the escrow, but create a payment channel between
@@ -358,24 +358,24 @@ public:
         {
             Account const gw1("gw1");
             Account const carol("carol");
-            auto const USD = gw1["USD"];
+            auto const usd = gw1["USD"];
             env.fund(XRP(100000), carol, gw1);
             env(fset(gw1, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10000), carol);
+            env.trust(usd(10000), carol);
             env.close();
-            env(pay(gw1, carol, USD(100)));
+            env(pay(gw1, carol, usd(100)));
             env.close();
 
             std::uint32_t const escrowSeq{env.seq(carol)};
-            env(escrow::create(carol, becky, USD(1)),
-                escrow::finish_time(env.now() + 3s),
-                escrow::cancel_time(env.now() + 4s));
+            env(escrow::create(carol, becky, usd(1)),
+                escrow::kFINISH_TIME(env.now() + 3s),
+                escrow::kCANCEL_TIME(env.now() + 4s));
             env.close();
 
             incLgrSeqForAccDel(env, gw1);
 
-            env(acctdelete(gw1, becky), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+            env(acctdelete(gw1, becky), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
             env.close();
 
             env(escrow::cancel(becky, carol, escrowSeq));
@@ -393,8 +393,8 @@ public:
         // With the PayChannel in place becky and alice should not be
         // able to delete her account
         auto const beckyBalance{env.balance(becky)};
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
-        env(acctdelete(becky, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(becky, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Alice cancels her PayChannel, which will leave her with only offers
@@ -403,7 +403,7 @@ public:
         // Lambda to close a PayChannel.
         auto payChanClose =
             [](jtx::Account const& account, Keylet const& payChanKeylet, PublicKey const& pk) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::PaymentChannelClaim;
                 jv[jss::Flags] = tfClose;
                 jv[jss::Account] = account.human();
@@ -422,7 +422,7 @@ public:
         env.close();
 
         // alice can't delete her account because of the PayChannel.
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // alice closes the PayChannel which should (finally) allow her to
@@ -432,7 +432,7 @@ public:
 
         // Now alice can successfully delete her account.
         auto const aliceBalance{env.balance(alice)};
-        env(acctdelete(alice, gw), fee(acctDelFee));
+        env(acctdelete(alice, gw), Fee(acctDelFee));
         verifyDeliveredAmount(env, aliceBalance - acctDelFee);
         env.close();
     }
@@ -460,8 +460,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 offerCount{1001};
-        for (int i{0}; i < offerCount; ++i)
+        constexpr int kOFFER_COUNT{1001};
+        for (int i{0}; i < kOFFER_COUNT; ++i)
         {
             env(offer(alice, gw[currency](1), XRP(1)));
             env.close();
@@ -497,11 +497,11 @@ public:
             BEAST_EXPECT(closed->exists(aliceOwnerDirKey));
 
             // alice's directory nodes.
-            for (std::uint32_t i{0}; i < ((offerCount / 32) + 1); ++i)
+            for (std::uint32_t i{0}; i < ((kOFFER_COUNT / 32) + 1); ++i)
                 BEAST_EXPECT(closed->exists(keylet::page(aliceOwnerDirKey, i)));
 
             // alice's offers.
-            for (std::uint32_t i{0}; i < offerCount; ++i)
+            for (std::uint32_t i{0}; i < kOFFER_COUNT; ++i)
                 BEAST_EXPECT(closed->exists(keylet::offer(alice.id(), offerSeq0 + i)));
         }
 
@@ -509,17 +509,17 @@ public:
         // offers in her directory.
         auto const acctDelFee{drops(env.current()->fees().increment)};
 
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tefTOO_BIG));
+        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, offerCount));
-        env(offer_cancel(alice, offerSeq0));
+        env.require(offers(alice, kOFFER_COUNT));
+        env(offerCancel(alice, offerSeq0));
         env.close();
-        env.require(offers(alice, offerCount - 1));
+        env.require(offers(alice, kOFFER_COUNT - 1));
 
         // alice successfully deletes her account.
         auto const alicePreDelBal{env.balance(alice)};
-        env(acctdelete(alice, gw), fee(acctDelFee));
+        env(acctdelete(alice, gw), Fee(acctDelFee));
         verifyDeliveredAmount(env, alicePreDelBal - acctDelFee);
         env.close();
 
@@ -531,11 +531,11 @@ public:
             BEAST_EXPECT(!closed->exists(aliceOwnerDirKey));
 
             // alice's former directory nodes.
-            for (std::uint32_t i{0}; i < ((offerCount / 32) + 1); ++i)
+            for (std::uint32_t i{0}; i < ((kOFFER_COUNT / 32) + 1); ++i)
                 BEAST_EXPECT(!closed->exists(keylet::page(aliceOwnerDirKey, i)));
 
             // alice's former offers.
-            for (std::uint32_t i{0}; i < offerCount; ++i)
+            for (std::uint32_t i{0}; i < kOFFER_COUNT; ++i)
                 BEAST_EXPECT(!closed->exists(keylet::offer(alice.id(), offerSeq0 + i)));
         }
     }
@@ -552,20 +552,20 @@ public:
         Env env{*this};
         Account const alice{"alice"};
         Account const gw{"gw"};
-        auto const BUX{gw["BUX"]};
+        auto const bux{gw["BUX"]};
 
         env.fund(XRP(10000), alice, gw);
         env.close();
 
         // alice creates an offer that, if crossed, will implicitly create
         // a trust line.
-        env(offer(alice, BUX(30), XRP(30)));
+        env(offer(alice, bux(30), XRP(30)));
         env.close();
 
         // gw crosses alice's offer.  alice should end up with BUX(30).
-        env(offer(gw, XRP(30), BUX(30)));
+        env(offer(gw, XRP(30), bux(30)));
         env.close();
-        env.require(balance(alice, BUX(30)));
+        env.require(Balance(alice, bux(30)));
 
         // Close enough ledgers to be able to delete alice's account.
         incLgrSeqForAccDel(env, alice);
@@ -573,10 +573,10 @@ public:
         // alice and gw can't delete their accounts because of the implicitly
         // created trust line.
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, gw), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, gw), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
-        env(acctdelete(gw, alice), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(gw, alice), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
         {
             std::shared_ptr<ReadView const> const closed{env.closed()};
@@ -605,7 +605,7 @@ public:
 
         // Burn a chunk of alice's funds so she only has 1 XRP remaining in
         // her account.
-        env(noop(alice), fee(env.balance(alice) - XRP(1)));
+        env(noop(alice), Fee(env.balance(alice) - XRP(1)));
         env.close();
 
         auto const acctDelFee{drops(env.current()->fees().increment)};
@@ -616,7 +616,7 @@ public:
         //
         // The balance of env.master should not change.
         auto const masterBalance{env.balance(env.master)};
-        env(acctdelete(alice, env.master), fee(acctDelFee), ter(terINSUF_FEE_B));
+        env(acctdelete(alice, env.master), Fee(acctDelFee), Ter(terINSUF_FEE_B));
         env.close();
         {
             std::shared_ptr<ReadView const> const closed{env.closed()};
@@ -627,7 +627,7 @@ public:
         // alice again attempts to delete her account.  This time she specifies
         // her current balance in XRP.  Again the transaction fails.
         BEAST_EXPECT(env.balance(alice) == XRP(1));
-        env(acctdelete(alice, env.master), fee(XRP(1)), ter(telINSUF_FEE_P));
+        env(acctdelete(alice, env.master), Fee(XRP(1)), Ter(telINSUF_FEE_P));
         env.close();
         {
             std::shared_ptr<ReadView const> const closed{env.closed()};
@@ -654,14 +654,14 @@ public:
         std::uint32_t const ticketSeq{env.seq(bob) + 1};
         env(ticket::create(bob, 250));
         env.close();
-        env.require(owners(bob, 250));
+        env.require(Owners(bob, 250));
 
         {
             std::shared_ptr<ReadView const> const closed{env.closed()};
             BEAST_EXPECT(closed->exists(keylet::account(bob.id())));
             for (std::uint32_t i = 0; i < 250; ++i)
             {
-                BEAST_EXPECT(closed->exists(keylet::ticket(bob.id(), ticketSeq + i)));
+                BEAST_EXPECT(closed->exists(keylet::kTICKET(bob.id(), ticketSeq + i)));
             }
         }
 
@@ -672,7 +672,7 @@ public:
         // of his tickets should be removed from the ledger.
         auto const acctDelFee{drops(env.current()->fees().increment)};
         auto const bobOldBalance{env.balance(bob)};
-        env(acctdelete(bob, alice), ticket::use(ticketSeq), fee(acctDelFee));
+        env(acctdelete(bob, alice), ticket::Use(ticketSeq), Fee(acctDelFee));
         verifyDeliveredAmount(env, bobOldBalance - acctDelFee);
         env.close();
         {
@@ -680,7 +680,7 @@ public:
             BEAST_EXPECT(!closed->exists(keylet::account(bob.id())));
             for (std::uint32_t i = 0; i < 250; ++i)
             {
-                BEAST_EXPECT(!closed->exists(keylet::ticket(bob.id(), ticketSeq + i)));
+                BEAST_EXPECT(!closed->exists(keylet::kTICKET(bob.id(), ticketSeq + i)));
             }
         }
     }
@@ -716,17 +716,17 @@ public:
         // becky attempts to delete her account using daria as the destination.
         // Since daria is not in the ledger the delete attempt fails.
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(becky, daria), fee(acctDelFee), ter(tecNO_DST));
+        env(acctdelete(becky, daria), Fee(acctDelFee), Ter(tecNO_DST));
         env.close();
 
         // becky attempts to delete her account, but carol requires a
         // destination tag which becky has omitted.
-        env(acctdelete(becky, carol), fee(acctDelFee), ter(tecDST_TAG_NEEDED));
+        env(acctdelete(becky, carol), Fee(acctDelFee), Ter(tecDST_TAG_NEEDED));
         env.close();
 
         // becky attempts to delete her account, but alice won't take her XRP,
         // so the delete is blocked.
-        env(acctdelete(becky, alice), fee(acctDelFee), ter(tecNO_PERMISSION));
+        env(acctdelete(becky, alice), Fee(acctDelFee), Ter(tecNO_PERMISSION));
         env.close();
 
         // alice preauthorizes deposits from becky.  Now becky can delete her
@@ -735,7 +735,7 @@ public:
         env.close();
 
         auto const beckyOldBalance{env.balance(becky)};
-        env(acctdelete(becky, alice), fee(acctDelFee));
+        env(acctdelete(becky, alice), Fee(acctDelFee));
         verifyDeliveredAmount(env, beckyOldBalance - acctDelFee);
         env.close();
     }
@@ -774,9 +774,9 @@ public:
 
             // becky use credentials but they aren't accepted
             env(acctdelete(becky, alice),
-                credentials::ids({credIdx}),
-                fee(acctDelFee),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Fee(acctDelFee),
+                Ter(tecBAD_CREDENTIALS));
             env.close();
 
             {
@@ -789,9 +789,9 @@ public:
 
             // Fail, credentials still not accepted
             env(acctdelete(becky, alice),
-                credentials::ids({credIdx}),
-                fee(acctDelFee),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Fee(acctDelFee),
+                Ter(tecBAD_CREDENTIALS));
             env.close();
 
             // becky accept the credentials
@@ -800,15 +800,15 @@ public:
 
             // Fail, credentials doesn’t belong to carol
             env(acctdelete(carol, alice),
-                credentials::ids({credIdx}),
-                fee(acctDelFee),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Fee(acctDelFee),
+                Ter(tecBAD_CREDENTIALS));
 
             // Fail, no depositPreauth for provided credentials
             env(acctdelete(becky, alice),
-                credentials::ids({credIdx}),
-                fee(acctDelFee),
-                ter(tecNO_PERMISSION));
+                credentials::Ids({credIdx}),
+                Fee(acctDelFee),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             // alice create DepositPreauth Object
@@ -817,21 +817,21 @@ public:
 
             // becky attempts to delete her account, but alice won't take her
             // XRP, so the delete is blocked.
-            env(acctdelete(becky, alice), fee(acctDelFee), ter(tecNO_PERMISSION));
+            env(acctdelete(becky, alice), Fee(acctDelFee), Ter(tecNO_PERMISSION));
 
             // becky use empty credentials and can't delete account
-            env(acctdelete(becky, alice), fee(acctDelFee), credentials::ids({}), ter(temMALFORMED));
+            env(acctdelete(becky, alice), Fee(acctDelFee), credentials::Ids({}), Ter(temMALFORMED));
 
             // becky use bad credentials and can't delete account
             env(acctdelete(becky, alice),
-                credentials::ids({"48004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6E"
+                credentials::Ids({"48004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6E"
                                   "A288BE4"}),
-                fee(acctDelFee),
-                ter(tecBAD_CREDENTIALS));
+                Fee(acctDelFee),
+                Ter(tecBAD_CREDENTIALS));
             env.close();
 
             // becky use credentials and can delete account
-            env(acctdelete(becky, alice), credentials::ids({credIdx}), fee(acctDelFee));
+            env(acctdelete(becky, alice), credentials::Ids({credIdx}), Fee(acctDelFee));
             env.close();
 
             {
@@ -855,7 +855,7 @@ public:
 
                 // daria use valid credentials, which aren't required and can
                 // delete her account
-                env(acctdelete(daria, carol), credentials::ids({credDaria}), fee(acctDelFee));
+                env(acctdelete(daria, carol), credentials::Ids({credDaria}), Fee(acctDelFee));
                 env.close();
 
                 // check that credential object deleted too
@@ -894,7 +894,7 @@ public:
 
                 // eaton use valid credentials, but he already authorized
                 // through "Authorized" field.
-                env(acctdelete(eaton, fred), credentials::ids({credEaton}), fee(acctDelFee));
+                env(acctdelete(eaton, fred), credentials::Ids({credEaton}), Fee(acctDelFee));
                 env.close();
 
                 // check that credential object deleted too
@@ -929,9 +929,9 @@ public:
                 // credentials are expired
                 // john use credentials but can't delete account
                 env(acctdelete(john, alice),
-                    credentials::ids({credIdx}),
-                    fee(acctDelFee),
-                    ter(tecEXPIRED));
+                    credentials::Ids({credIdx}),
+                    Fee(acctDelFee),
+                    Ter(tecEXPIRED));
                 env.close();
 
                 {
@@ -953,7 +953,7 @@ public:
             Account const becky{"becky"};
             Account const carol{"carol"};
 
-            Env env{*this, testable_amendments() - featureCredentials};
+            Env env{*this, testableAmendments() - featureCredentials};
             env.fund(XRP(100000), alice, becky, carol);
             env.close();
 
@@ -977,9 +977,9 @@ public:
             env.close();
 
             env(acctdelete(becky, alice),
-                credentials::ids({credIdx}),
-                fee(acctDelFee),
-                ter(temDISABLED));
+                credentials::Ids({credIdx}),
+                Fee(acctDelFee),
+                Ter(temDISABLED));
             env.close();
         }
     }
@@ -1016,7 +1016,7 @@ public:
             incLgrSeqForAccDel(env, carol);
 
             auto const acctDelFee{drops(env.current()->fees().increment)};
-            env(acctdelete(carol, alice), fee(acctDelFee));
+            env(acctdelete(carol, alice), Fee(acctDelFee));
             env.close();
 
             {  // check that credential object deleted too
@@ -1058,7 +1058,7 @@ public:
             incLgrSeqForAccDel(env, becky);
 
             auto const acctDelFee{drops(env.current()->fees().increment)};
-            env(acctdelete(becky, alice), fee(acctDelFee));
+            env(acctdelete(becky, alice), Fee(acctDelFee));
             env.close();
 
             {  // check that credential object deleted too
diff --git a/src/test/app/AccountSet_test.cpp b/src/test/app/AccountSet_test.cpp
index 15012abe36..c30553dad9 100644
--- a/src/test/app/AccountSet_test.cpp
+++ b/src/test/app/AccountSet_test.cpp
@@ -51,7 +51,7 @@
 
 namespace xrpl {
 
-class AccountSet_test : public beast::unit_test::suite
+class AccountSet_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -76,18 +76,18 @@ public:
         using namespace test::jtx;
         Account const alice("alice");
 
-        Env env(*this, testable_amendments());
+        Env env(*this, testableAmendments());
         env.fund(XRP(10000), noripple(alice));
 
         // Give alice a regular key so she can legally set and clear
         // her asfDisableMaster flag.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
         env.close();
 
         auto testFlags = [this, &alice, &alie, &env](
                              std::initializer_list<std::uint32_t> goodFlags) {
-            std::uint32_t const orig_flags = (*env.le(alice))[sfFlags];
+            std::uint32_t const origFlags = (*env.le(alice))[sfFlags];
             for (std::uint32_t flag{1u}; flag < std::numeric_limits<std::uint32_t>::digits; ++flag)
             {
                 if (flag == asfNoFreeze)
@@ -128,26 +128,26 @@ public:
                 if (std::ranges::find(goodFlags, flag) != goodFlags.end())
                 {
                     // Good flag
-                    env.require(nflags(alice, flag));
-                    env(fset(alice, flag), sig(alice));
+                    env.require(Nflags(alice, flag));
+                    env(fset(alice, flag), Sig(alice));
                     env.close();
-                    env.require(flags(alice, flag));
-                    env(fclear(alice, flag), sig(alie));
+                    env.require(Flags(alice, flag));
+                    env(fclear(alice, flag), Sig(alie));
                     env.close();
-                    env.require(nflags(alice, flag));
-                    std::uint32_t const now_flags = (*env.le(alice))[sfFlags];
-                    BEAST_EXPECT(now_flags == orig_flags);
+                    env.require(Nflags(alice, flag));
+                    std::uint32_t const nowFlags = (*env.le(alice))[sfFlags];
+                    BEAST_EXPECT(nowFlags == origFlags);
                 }
                 else
                 {
                     // Bad flag
-                    BEAST_EXPECT((*env.le(alice))[sfFlags] == orig_flags);
-                    env(fset(alice, flag), sig(alice));
+                    BEAST_EXPECT((*env.le(alice))[sfFlags] == origFlags);
+                    env(fset(alice, flag), Sig(alice));
                     env.close();
-                    BEAST_EXPECT((*env.le(alice))[sfFlags] == orig_flags);
-                    env(fclear(alice, flag), sig(alie));
+                    BEAST_EXPECT((*env.le(alice))[sfFlags] == origFlags);
+                    env(fclear(alice, flag), Sig(alie));
                     env.close();
-                    BEAST_EXPECT((*env.le(alice))[sfFlags] == orig_flags);
+                    BEAST_EXPECT((*env.le(alice))[sfFlags] == origFlags);
                 }
             }
         };
@@ -171,17 +171,17 @@ public:
         Account const alice("alice");
         env.fund(XRP(10000), noripple(alice));
 
-        std::uint32_t const orig_flags = (*env.le(alice))[sfFlags];
+        std::uint32_t const origFlags = (*env.le(alice))[sfFlags];
 
         // asfAccountTxnID is special and not actually set as a flag,
         // so we check the field presence instead
         BEAST_EXPECT(!env.le(alice)->isFieldPresent(sfAccountTxnID));
-        env(fset(alice, asfAccountTxnID), sig(alice));
+        env(fset(alice, asfAccountTxnID), Sig(alice));
         BEAST_EXPECT(env.le(alice)->isFieldPresent(sfAccountTxnID));
         env(fclear(alice, asfAccountTxnID));
         BEAST_EXPECT(!env.le(alice)->isFieldPresent(sfAccountTxnID));
-        std::uint32_t const now_flags = (*env.le(alice))[sfFlags];
-        BEAST_EXPECT(now_flags == orig_flags);
+        std::uint32_t const nowFlags = (*env.le(alice))[sfFlags];
+        BEAST_EXPECT(nowFlags == origFlags);
     }
 
     void
@@ -196,13 +196,13 @@ public:
         env.memoize("eric");
         env(regkey(alice, "eric"));
 
-        env.require(nflags(alice, asfNoFreeze));
-        env(fset(alice, asfNoFreeze), sig("eric"), ter(tecNEED_MASTER_KEY));
-        env(fset(alice, asfNoFreeze), sig(alice));
-        env.require(flags(alice, asfNoFreeze));
-        env(fclear(alice, asfNoFreeze), sig(alice));
+        env.require(Nflags(alice, asfNoFreeze));
+        env(fset(alice, asfNoFreeze), Sig("eric"), Ter(tecNEED_MASTER_KEY));
+        env(fset(alice, asfNoFreeze), Sig(alice));
+        env.require(Flags(alice, asfNoFreeze));
+        env(fclear(alice, asfNoFreeze), Sig(alice));
         // verify flag is still set (clear does not clear in this case)
-        env.require(flags(alice, asfNoFreeze));
+        env.require(Flags(alice, asfNoFreeze));
     }
 
     void
@@ -249,7 +249,7 @@ public:
             }
             else
             {
-                env(jt, ter(telBAD_DOMAIN));
+                env(jt, Ter(telBAD_DOMAIN));
             }
         }
     }
@@ -265,7 +265,7 @@ public:
         env.fund(XRP(10000), alice);
         auto jt = noop(alice);
 
-        auto const rkp = randomKeyPair(KeyType::ed25519);
+        auto const rkp = randomKeyPair(KeyType::Ed25519);
         jt[sfMessageKey.fieldName] = strHex(rkp.first.slice());
         env(jt);
         BEAST_EXPECT(strHex((*env.le(alice))[sfMessageKey]) == strHex(rkp.first.slice()));
@@ -276,7 +276,7 @@ public:
 
         using namespace std::string_literals;
         jt[sfMessageKey.fieldName] = strHex("NOT_REALLY_A_PUBKEY"s);
-        env(jt, ter(telBAD_PUBLIC_KEY));
+        env(jt, Ter(telBAD_PUBLIC_KEY));
     }
 
     void
@@ -325,7 +325,7 @@ public:
     void
     testTransferRate()
     {
-        struct test_results
+        struct TestResults
         {
             double set;
             TER code;
@@ -336,7 +336,7 @@ public:
 
         using namespace test::jtx;
         auto doTests =
-            [this](FeatureBitset const& features, std::initializer_list<test_results> testData) {
+            [this](FeatureBitset const& features, std::initializer_list<TestResults> testData) {
                 Env env(*this, features);
 
                 Account const alice("alice");
@@ -344,7 +344,7 @@ public:
 
                 for (auto const& r : testData)
                 {
-                    env(rate(alice, r.set), ter(r.code));
+                    env(rate(alice, r.set), Ter(r.code));
                     env.close();
 
                     // If the field is not present expect the default value
@@ -360,7 +360,7 @@ public:
             };
 
         doTests(
-            testable_amendments(),
+            testableAmendments(),
             {{.set = 1.0, .code = tesSUCCESS, .get = 1.0},
              {.set = 1.1, .code = tesSUCCESS, .get = 1.1},
              {.set = 2.0, .code = tesSUCCESS, .get = 2.0},
@@ -380,7 +380,7 @@ public:
         Account const alice("alice");
         Account const bob("bob");
         Account const gw("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Test gateway with a variety of allowed transfer rates
         for (double transferRate = 1.0; transferRate <= 2.0; transferRate += 0.03125)
@@ -388,22 +388,22 @@ public:
             Env env(*this);
             env.fund(XRP(10000), gw, alice, bob);
             env.close();
-            env.trust(USD(10), alice, bob);
+            env.trust(usd(10), alice, bob);
             env.close();
             env(rate(gw, transferRate));
             env.close();
 
-            auto const amount = USD(1);
+            auto const amount = usd(1);
             Rate const rate(transferRate * QUALITY_ONE);
             auto const amountWithRate = toAmount<STAmount>(multiply(amount.value(), rate));
 
-            env(pay(gw, alice, USD(10)));
+            env(pay(gw, alice, usd(10)));
             env.close();
-            env(pay(alice, bob, USD(1)), sendmax(USD(10)));
+            env(pay(alice, bob, usd(1)), Sendmax(usd(10)));
             env.close();
 
-            env.require(balance(alice, USD(10) - amountWithRate));
-            env.require(balance(bob, USD(1)));
+            env.require(Balance(alice, usd(10) - amountWithRate));
+            env.require(Balance(bob, usd(1)));
         }
 
         // Since fix1201 was enabled on Nov 14 2017 a rate in excess of
@@ -419,7 +419,7 @@ public:
             Env env(*this);
             env.fund(XRP(10000), gw, alice, bob);
             env.close();
-            env.trust(USD(10), alice, bob);
+            env.trust(usd(10), alice, bob);
             env.close();
 
             // We'd like to use transferRate here, but the transactor
@@ -459,15 +459,15 @@ public:
                 return true;
             });
 
-            auto const amount = USD(1);
+            auto const amount = usd(1);
             auto const amountWithRate =
                 toAmount<STAmount>(multiply(amount.value(), Rate(transferRate * QUALITY_ONE)));
 
-            env(pay(gw, alice, USD(10)));
-            env(pay(alice, bob, amount), sendmax(USD(10)));
+            env(pay(gw, alice, usd(10)));
+            env(pay(alice, bob, amount), Sendmax(usd(10)));
 
-            env.require(balance(alice, USD(10) - amountWithRate));
-            env.require(balance(bob, amount));
+            env.require(Balance(alice, usd(10) - amountWithRate));
+            env.require(Balance(bob, amount));
         }
     }
 
@@ -483,33 +483,33 @@ public:
 
         auto jt = fset(alice, asfDisallowXRP);
         jt[jss::ClearFlag] = asfDisallowXRP;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfRequireAuth);
         jt[jss::ClearFlag] = asfRequireAuth;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfRequireDest);
         jt[jss::ClearFlag] = asfRequireDest;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfDisallowXRP);
         jt[sfFlags.fieldName] = tfAllowXRP;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfRequireAuth);
         jt[sfFlags.fieldName] = tfOptionalAuth;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfRequireDest);
         jt[sfFlags.fieldName] = tfOptionalDestTag;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
         jt = fset(alice, asfRequireDest);
         jt[sfFlags.fieldName] = tfAccountSetMask;
-        env(jt, ter(temINVALID_FLAG));
+        env(jt, Ter(temINVALID_FLAG));
 
-        env(fset(alice, asfDisableMaster), sig(alice), ter(tecNO_ALTERNATIVE_KEY));
+        env(fset(alice, asfDisableMaster), Sig(alice), Ter(tecNO_ALTERNATIVE_KEY));
     }
 
     void
@@ -533,10 +533,10 @@ public:
         env.close();
         BEAST_EXPECT(!dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
-        env(fset(alice, asfRequireAuth), ter(tecOWNERS));
+        env(fset(alice, asfRequireAuth), Ter(tecOWNERS));
 
         // Remove the signer list.  After that asfRequireAuth should succeed.
-        env(signers(alice, test::jtx::none));
+        env(signers(alice, test::jtx::kNONE));
         env.close();
         BEAST_EXPECT(dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
@@ -556,23 +556,23 @@ public:
         std::uint32_t const ticketSeq{env.seq(alice) + 1};
         env(ticket::create(alice, 1));
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
 
         // Try using a ticket that alice doesn't have.
-        env(noop(alice), ticket::use(ticketSeq + 1), ter(terPRE_TICKET));
+        env(noop(alice), ticket::Use(ticketSeq + 1), Ter(terPRE_TICKET));
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
 
         // Actually use alice's ticket.  Note that if a transaction consumes
         // a ticket then the account's sequence number does not advance.
         std::uint32_t const aliceSeq{env.seq(alice)};
-        env(noop(alice), ticket::use(ticketSeq));
+        env(noop(alice), ticket::Use(ticketSeq));
         env.close();
-        env.require(owners(alice, 0), tickets(alice, 0));
+        env.require(Owners(alice, 0), tickets(alice, 0));
         BEAST_EXPECT(aliceSeq == env.seq(alice));
 
         // Try re-using a ticket that alice already used.
-        env(noop(alice), ticket::use(ticketSeq), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(ticketSeq), Ter(tefNO_TICKET));
         env.close();
     }
 
@@ -587,14 +587,14 @@ public:
         env.fund(XRP(10000), alice);
         env.close();
 
-        auto jtx = env.jt(noop("alice"), ter(temBAD_SIGNATURE));
+        auto jtx = env.jt(noop("alice"), Ter(temBAD_SIGNATURE));
         if (!BEAST_EXPECT(jtx.stx))
             return;
         auto stx = std::make_shared<STTx>(*jtx.stx);
         stx->at(sfSigningPubKey) = makeSlice(std::string("badkey"));
 
         env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-            auto const result = xrpl::apply(env.app(), view, *stx, tapNONE, j);
+            auto const result = xrpl::apply(env.app(), view, *stx, TapNone, j);
             BEAST_EXPECT(result.ter == temBAD_SIGNATURE);
             BEAST_EXPECT(!result.applied);
             return result.applied;
diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp
index b5b419f9b1..6697be44e0 100644
--- a/src/test/app/AccountTxPaging_test.cpp
+++ b/src/test/app/AccountTxPaging_test.cpp
@@ -12,10 +12,10 @@
 
 namespace xrpl {
 
-class AccountTxPaging_test : public beast::unit_test::suite
+class AccountTxPaging_test : public beast::unit_test::Suite
 {
     static bool
-    checkTransaction(Json::Value const& tx, int sequence, int ledger)
+    checkTransaction(json::Value const& tx, int sequence, int ledger)
     {
         return (
             tx[jss::tx][jss::Sequence].asInt() == sequence &&
@@ -26,16 +26,16 @@ class AccountTxPaging_test : public beast::unit_test::suite
     next(
         test::jtx::Env& env,
         test::jtx::Account const& account,
-        int ledger_min,
-        int ledger_max,
+        int ledgerMin,
+        int ledgerMax,
         int limit,
         bool forward,
-        Json::Value const& marker = Json::nullValue)
+        json::Value const& marker = json::NullValue)
     {
-        Json::Value jvc;
+        json::Value jvc;
         jvc[jss::account] = account.human();
-        jvc[jss::ledger_index_min] = ledger_min;
-        jvc[jss::ledger_index_max] = ledger_max;
+        jvc[jss::ledger_index_min] = ledgerMin;
+        jvc[jss::ledger_index_max] = ledgerMax;
         jvc[jss::forward] = forward;
         jvc[jss::limit] = limit;
         if (marker)
@@ -51,25 +51,25 @@ class AccountTxPaging_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         Env env(*this);
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
 
-        env.fund(XRP(10000), A1, A2, A3);
+        env.fund(XRP(10000), a1, a2, a3);
         env.close();
 
-        env.trust(A3["USD"](1000), A1);
-        env.trust(A2["USD"](1000), A1);
-        env.trust(A3["USD"](1000), A2);
+        env.trust(a3["USD"](1000), a1);
+        env.trust(a2["USD"](1000), a1);
+        env.trust(a3["USD"](1000), a2);
         env.close();
 
         for (auto i = 0; i < 5; ++i)
         {
-            env(pay(A2, A1, A2["USD"](2)));
-            env(pay(A3, A1, A3["USD"](2)));
-            env(offer(A1, XRP(11), A1["USD"](1)));
-            env(offer(A2, XRP(10), A2["USD"](1)));
-            env(offer(A3, XRP(9), A3["USD"](1)));
+            env(pay(a2, a1, a2["USD"](2)));
+            env(pay(a3, a1, a3["USD"](2)));
+            env(offer(a1, XRP(11), a1["USD"](1)));
+            env(offer(a2, XRP(10), a2["USD"](1)));
+            env(offer(a3, XRP(9), a3["USD"](1)));
             env.close();
         }
 
@@ -94,7 +94,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
         // page through the results in several ways.
         {
             // limit = 2, 3 batches giving the first 6 txs
-            auto jrr = next(env, A3, 2, 5, 2, true);
+            auto jrr = next(env, a3, 2, 5, 2, true);
             auto txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -103,7 +103,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 2, 5, 2, true, jrr[jss::marker]);
+            jrr = next(env, a3, 2, 5, 2, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -112,7 +112,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 2, 5, 2, true, jrr[jss::marker]);
+            jrr = next(env, a3, 2, 5, 2, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -123,7 +123,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
 
         {
             // limit 1, 3 requests giving the first 3 txs
-            auto jrr = next(env, A3, 3, 9, 1, true);
+            auto jrr = next(env, a3, 3, 9, 1, true);
             auto txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 1))
                 return;
@@ -131,7 +131,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 1, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 1, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 1))
                 return;
@@ -139,7 +139,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 1, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 1, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 1))
                 return;
@@ -148,7 +148,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
                 return;
 
             // continue with limit 3, to end of all txs
-            jrr = next(env, A3, 3, 9, 3, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -158,7 +158,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -168,7 +168,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -178,7 +178,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, true, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, true, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -189,7 +189,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
 
         {
             // limit 2, descending, 2 batches giving last 4 txs
-            auto jrr = next(env, A3, 3, 9, 2, false);
+            auto jrr = next(env, a3, 3, 9, 2, false);
             auto txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -198,7 +198,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 2, false, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 2, false, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 2))
                 return;
@@ -208,7 +208,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
                 return;
 
             // continue with limit 3 until all txs have been seen
-            jrr = next(env, A3, 3, 9, 3, false, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, false, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -218,7 +218,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, false, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, false, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -228,7 +228,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, false, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, false, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 3))
                 return;
@@ -238,7 +238,7 @@ class AccountTxPaging_test : public beast::unit_test::suite
             if (!BEAST_EXPECT(jrr[jss::marker]))
                 return;
 
-            jrr = next(env, A3, 3, 9, 3, false, jrr[jss::marker]);
+            jrr = next(env, a3, 3, 9, 3, false, jrr[jss::marker]);
             txs = jrr[jss::transactions];
             if (!BEAST_EXPECT(txs.isArray() && txs.size() == 1))
                 return;
diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp
index 7edaef3821..5d4ca6f745 100644
--- a/src/test/app/AmendmentTable_test.cpp
+++ b/src/test/app/AmendmentTable_test.cpp
@@ -41,7 +41,7 @@
 
 namespace xrpl {
 
-class AmendmentTable_test final : public beast::unit_test::suite
+class AmendmentTable_test final : public beast::unit_test::Suite
 {
 private:
     static uint256
@@ -137,12 +137,12 @@ private:
 
     template <class Arg, class... Args>
     static void
-    combine_arg(std::vector<Arg>& dest, std::vector<Arg> const& src, Args const&... args)
+    combineArg(std::vector<Arg>& dest, std::vector<Arg> const& src, Args const&... args)
     {
         assert(dest.capacity() >= dest.size() + src.size());
         std::copy(src.begin(), src.end(), std::back_inserter(dest));
         if constexpr (sizeof...(args) > 0)
-            combine_arg(dest, args...);
+            combineArg(dest, args...);
     }
 
     template <class Arg, class... Args>
@@ -156,7 +156,7 @@ private:
     {
         left.reserve(totalsize(left, right, args...));
 
-        combine_arg(left, right, args...);
+        combineArg(left, right, args...);
 
         return left;
     }
@@ -191,7 +191,7 @@ public:
         Section const& enabled,
         Section const& vetoed)
     {
-        return make_AmendmentTable(app, majorityTime, supported, enabled, vetoed, journal_);
+        return makeAmendmentTable(app, majorityTime, supported, enabled, vetoed, journal_);
     }
 
     std::unique_ptr<AmendmentTable>
@@ -208,7 +208,7 @@ public:
     std::unique_ptr<AmendmentTable>
     makeTable(test::jtx::Env& env, std::chrono::seconds majorityTime)
     {
-        static std::vector<AmendmentTable::FeatureInfo> const supported = 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, supported, makeSection(enabled_), makeSection(vetoed_));
+            env.app(), majorityTime, kSUPPORTED, makeSection(enabled_), makeSection(vetoed_));
     }
 
     void
@@ -275,7 +275,7 @@ public:
         // Verify that unsupportedID is not in table.
         uint256 const unsupportedID = amendmentId(unsupported_[0]);
         {
-            Json::Value const unsupp =
+            json::Value const unsupp =
                 table->getJson(unsupportedID, true)[to_string(unsupportedID)];
             BEAST_EXPECT(unsupp.size() == 0);
         }
@@ -283,7 +283,7 @@ public:
         // After vetoing unsupportedID verify that it is in table.
         table->veto(unsupportedID);
         {
-            Json::Value const unsupp =
+            json::Value const unsupp =
                 table->getJson(unsupportedID, true)[to_string(unsupportedID)];
             BEAST_EXPECT(unsupp[jss::vetoed].asBool());
         }
@@ -471,7 +471,7 @@ public:
         trustedValidators.reserve(num);
         for (int i = 0; i < num; ++i)
         {
-            auto const& back = ret.emplace_back(randomKeyPair(KeyType::secp256k1));
+            auto const& back = ret.emplace_back(randomKeyPair(KeyType::Secp256k1));
             trustedValidators.insert(back.first);
         }
         table->trustChanged(trustedValidators);
@@ -608,14 +608,14 @@ public:
 
         uint256 const unsupportedID = amendmentId(unsupported_[0]);
         {
-            Json::Value const unsupp =
+            json::Value const unsupp =
                 table->getJson(unsupportedID, false)[to_string(unsupportedID)];
             BEAST_EXPECT(unsupp.size() == 0);
         }
 
         table->veto(unsupportedID);
         {
-            Json::Value const unsupp =
+            json::Value const unsupp =
                 table->getJson(unsupportedID, false)[to_string(unsupportedID)];
             BEAST_EXPECT(!unsupp[jss::vetoed].asBool());
         }
@@ -968,7 +968,7 @@ public:
         }
 
         // Add one new validator to the UNL.
-        validators.emplace_back(randomKeyPair(KeyType::secp256k1));
+        validators.emplace_back(randomKeyPair(KeyType::Secp256k1));
 
         // A lambda that updates the AmendmentTable with the latest
         // trusted validators.
@@ -1165,9 +1165,9 @@ public:
         testcase("hasUnsupportedEnabled");
 
         using namespace std::chrono_literals;
-        weeks constexpr w(1);
+        weeks constexpr kW(1);
         test::jtx::Env env{*this, makeConfig()};
-        auto table = makeTable(env, w);
+        auto table = makeTable(env, kW);
         BEAST_EXPECT(!table->hasUnsupportedEnabled());
         BEAST_EXPECT(!table->firstUnsupportedExpected());
         BEAST_EXPECT(table->needValidatedLedger(1));
@@ -1190,7 +1190,7 @@ public:
         BEAST_EXPECT(table->hasUnsupportedEnabled());
         BEAST_EXPECT(
             table->firstUnsupportedExpected() &&
-            *table->firstUnsupportedExpected() == NetClock::time_point{t} + w);
+            *table->firstUnsupportedExpected() == NetClock::time_point{t} + kW);
 
         // Make sure the table knows when it needs an update.
         BEAST_EXPECT(!table->needValidatedLedger(256));
@@ -1212,7 +1212,7 @@ public:
     void
     run() override
     {
-        FeatureBitset const all{test::jtx::testable_amendments()};
+        FeatureBitset const all{test::jtx::testableAmendments()};
 
         testConstruct();
         testGet();
diff --git a/src/test/app/Batch_test.cpp b/src/test/app/Batch_test.cpp
index 56d398f8f2..8010b1e120 100644
--- a/src/test/app/Batch_test.cpp
+++ b/src/test/app/Batch_test.cpp
@@ -74,7 +74,7 @@
 
 namespace xrpl::test {
 
-class Batch_test : public beast::unit_test::suite
+class Batch_test : public beast::unit_test::Suite
 {
     struct TestLedgerData
     {
@@ -91,8 +91,8 @@ class Batch_test : public beast::unit_test::suite
         std::string txHash;
     };
 
-    static Json::Value
-    getTxByIndex(Json::Value const& jrr, int const index)
+    static json::Value
+    getTxByIndex(json::Value const& jrr, int const index)
     {
         for (auto const& txn : jrr[jss::result][jss::ledger][jss::transactions])
         {
@@ -102,10 +102,10 @@ class Batch_test : public beast::unit_test::suite
         return {};
     }
 
-    static Json::Value
+    static json::Value
     getLastLedger(jtx::Env& env)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::ledger_index] = env.closed()->seq();
         params[jss::transactions] = true;
         params[jss::expand] = true;
@@ -115,7 +115,7 @@ class Batch_test : public beast::unit_test::suite
     void
     validateInnerTxn(jtx::Env& env, std::string const& batchID, TestLedgerData const& ledgerResult)
     {
-        Json::Value const jrr = env.rpc("tx", ledgerResult.txHash)[jss::result];
+        json::Value const jrr = env.rpc("tx", ledgerResult.txHash)[jss::result];
         BEAST_EXPECT(jrr[sfTransactionType.jsonName] == ledgerResult.txType);
         BEAST_EXPECT(jrr[jss::meta][sfTransactionResult.jsonName] == ledgerResult.result);
         BEAST_EXPECT(jrr[jss::meta][sfParentBatchID.jsonName] == batchID);
@@ -132,7 +132,7 @@ class Batch_test : public beast::unit_test::suite
             auto const txn = getTxByIndex(jrr, ledgerResult.index);
             BEAST_EXPECT(txn[jss::hash].asString() == ledgerResult.txHash);
             BEAST_EXPECT(txn.isMember(jss::metaData));
-            Json::Value const meta = txn[jss::metaData];
+            json::Value const meta = txn[jss::metaData];
             BEAST_EXPECT(txn[sfTransactionType.jsonName] == ledgerResult.txType);
             BEAST_EXPECT(meta[sfTransactionResult.jsonName] == ledgerResult.result);
             if (ledgerResult.batchID)
@@ -145,7 +145,7 @@ class Batch_test : public beast::unit_test::suite
     submitBatch(jtx::Env& env, TER const& result, Args&&... args)
     {
         auto batchTxn = env.jt(std::forward<Args>(args)...);
-        env(batchTxn, jtx::ter(result));
+        env(batchTxn, jtx::Ter(result));
 
         auto const ids = batchTxn.stx->getBatchTransactionIDs();
         std::vector<std::string> txIDs;
@@ -219,10 +219,10 @@ class Batch_test : public beast::unit_test::suite
             {
                 auto const seq = env.seq(alice);
                 auto const batchFee = batch::calcBatchFee(env, 0, 2);
-                auto const txResult = withBatch ? ter(tesSUCCESS) : ter(temDISABLED);
+                auto const txResult = withBatch ? Ter(tesSUCCESS) : Ter(temDISABLED);
                 env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                    batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                    batch::inner(pay(alice, bob, XRP(1)), seq + 2),
+                    batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                    batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
                     txResult);
                 env.close();
             }
@@ -232,8 +232,8 @@ class Batch_test : public beast::unit_test::suite
             // temINVALID_FLAG. If the feature is enabled, the transaction fails
             // early in checkValidity()
             {
-                auto const txResult = withBatch ? ter(telENV_RPC_FAILED) : ter(temINVALID_FLAG);
-                env(pay(alice, bob, XRP(1)), txflags(tfInnerBatchTxn), txResult);
+                auto const txResult = withBatch ? Ter(telENV_RPC_FAILED) : Ter(temINVALID_FLAG);
+                env(pay(alice, bob, XRP(1)), Txflags(tfInnerBatchTxn), txResult);
                 env.close();
             }
 
@@ -262,7 +262,7 @@ class Batch_test : public beast::unit_test::suite
 
         // temBAD_FEE: preflight1
         {
-            env(batch::outer(alice, env.seq(alice), XRP(-1), tfAllOrNothing), ter(temBAD_FEE));
+            env(batch::outer(alice, env.seq(alice), XRP(-1), tfAllOrNothing), Ter(temBAD_FEE));
             env.close();
         }
 
@@ -271,7 +271,7 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 0);
-            env(batch::outer(alice, seq, batchFee, tfInnerBatchTxn), ter(telENV_RPC_FAILED));
+            env(batch::outer(alice, seq, batchFee, tfInnerBatchTxn), Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -279,7 +279,7 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 0);
-            env(batch::outer(alice, seq, batchFee, tfDisallowXRP), ter(temINVALID_FLAG));
+            env(batch::outer(alice, seq, batchFee, tfDisallowXRP), Ter(temINVALID_FLAG));
             env.close();
         }
 
@@ -288,8 +288,8 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 0);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                txflags(tfAllOrNothing | tfOnlyOne),
-                ter(temINVALID_FLAG));
+                Txflags(tfAllOrNothing | tfOnlyOne),
+                Ter(temINVALID_FLAG));
             env.close();
         }
 
@@ -297,7 +297,7 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 0);
-            env(batch::outer(alice, seq, batchFee, tfAllOrNothing), ter(temARRAY_EMPTY));
+            env(batch::outer(alice, seq, batchFee, tfAllOrNothing), Ter(temARRAY_EMPTY));
             env.close();
         }
 
@@ -306,8 +306,8 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 0);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                ter(temARRAY_EMPTY));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                Ter(temARRAY_EMPTY));
             env.close();
         }
 
@@ -317,16 +317,16 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 9);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 4),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 5),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 6),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 7),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 8),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 9),
-                ter(telENV_RPC_FAILED));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 4),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 5),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 6),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 7),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 8),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 9),
+                Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -336,10 +336,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto jt = env.jtnofill(
                 batch::outer(alice, env.seq(alice), batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1));
 
-            env(jt.jv, batch::sig(bob), ter(temREDUNDANT));
+            env(jt.jv, batch::Sig(bob), Ter(temREDUNDANT));
             env.close();
         }
 
@@ -349,9 +349,9 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                ter(telENV_RPC_FAILED));
+                batch::Inner(batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -360,14 +360,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1[jss::Flags] = 0;
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(temINVALID_FLAG));
+            env(jt.jv, batch::Sig(bob), Ter(temINVALID_FLAG));
             env.close();
         }
 
@@ -377,9 +377,9 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             auto jt = env.jt(pay(alice, bob, XRP(1)));
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(jt.jv, seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                ter(temBAD_SIGNATURE));
+                batch::Inner(jt.jv, seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                Ter(temBAD_SIGNATURE));
             env.close();
         }
 
@@ -388,16 +388,16 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             auto tx1 = pay(alice, bob, XRP(1));
-            tx1[sfSigners.jsonName] = Json::arrayValue;
-            tx1[sfSigners.jsonName][0U][sfSigner.jsonName] = Json::objectValue;
+            tx1[sfSigners.jsonName] = json::ArrayValue;
+            tx1[sfSigners.jsonName][0U][sfSigner.jsonName] = json::ObjectValue;
             tx1[sfSigners.jsonName][0U][sfSigner.jsonName][sfAccount.jsonName] = alice.human();
             tx1[sfSigners.jsonName][0U][sfSigner.jsonName][sfSigningPubKey.jsonName] =
                 strHex(alice.pk());
             tx1[sfSigners.jsonName][0U][sfSigner.jsonName][sfTxnSignature.jsonName] = "DEADBEEF";
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(tx1, seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                ter(temBAD_SIGNER));
+                batch::Inner(tx1, seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                Ter(temBAD_SIGNER));
             env.close();
         }
 
@@ -406,14 +406,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(1)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(1)), seq + 1);
             tx1[jss::SigningPubKey] = strHex(alice.pk());
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2));
 
-            env(jt.jv, ter(temBAD_REGKEY));
+            env(jt.jv, Ter(temBAD_REGKEY));
             env.close();
         }
 
@@ -422,10 +422,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // amount can't be negative
-                batch::inner(pay(alice, bob, XRP(-1)), seq + 2),
-                ter(temINVALID_INNER_BATCH));
+                batch::Inner(pay(alice, bob, XRP(-1)), seq + 2),
+                Ter(temINVALID_INNER_BATCH));
             env.close();
         }
 
@@ -433,12 +433,12 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(1)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(1)), seq + 1);
             tx1[jss::Fee] = to_string(env.current()->fees().base);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                ter(temBAD_FEE));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                Ter(temBAD_FEE));
             env.close();
         }
 
@@ -446,12 +446,12 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(1)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(1)), seq + 1);
             tx1[jss::Fee] = "-1";
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                ter(temBAD_FEE));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                Ter(temBAD_FEE));
             env.close();
         }
 
@@ -459,21 +459,21 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(1)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(1)), seq + 1);
             tx1[jss::Fee] = "1.5";
-            env.set_parse_failure_expected(true);
+            env.setParseFailureExpected(true);
             try
             {
                 env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
                     tx1,
-                    batch::inner(pay(alice, bob, XRP(2)), seq + 2));
+                    batch::Inner(pay(alice, bob, XRP(2)), seq + 2));
                 fail("Expected parse_error for fractional fee");
             }
-            catch (jtx::parse_error const&)
+            catch (jtx::ParseError const&)
             {
                 BEAST_EXPECT(true);
             }
-            env.set_parse_failure_expected(false);
+            env.setParseFailureExpected(false);
         }
 
         // temSEQ_AND_TICKET: Batch: inner txn cannot have both Sequence
@@ -481,12 +481,12 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(1)), 0, 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(1)), 0, 1);
             tx1[jss::Sequence] = seq + 1;
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                ter(temSEQ_AND_TICKET));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                Ter(temSEQ_AND_TICKET));
             env.close();
         }
 
@@ -496,9 +496,9 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                ter(temSEQ_AND_TICKET));
+                batch::Inner(pay(alice, bob, XRP(1)), 0),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                Ter(temSEQ_AND_TICKET));
             env.close();
         }
 
@@ -507,9 +507,9 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 1),
-                ter(temREDUNDANT));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 1),
+                Ter(temREDUNDANT));
             env.close();
         }
 
@@ -518,9 +518,9 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), 0, seq + 1),
-                ter(temREDUNDANT));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), 0, seq + 1),
+                Ter(temREDUNDANT));
             env.close();
         }
 
@@ -529,9 +529,9 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 1),
-                ter(temREDUNDANT));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 1),
+                Ter(temREDUNDANT));
             env.close();
         }
 
@@ -542,10 +542,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 9, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), seq + 2),
-                batch::sig(bob, carol, alice, bob, carol, alice, bob, carol, alice, alice),
-                ter(telENV_RPC_FAILED));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(5)), seq + 2),
+                batch::Sig(bob, carol, alice, bob, carol, alice, bob, carol, alice, alice),
+                Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -554,10 +554,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 2, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::sig(alice, bob),
-                ter(temBAD_SIGNER));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Sig(alice, bob),
+                Ter(temBAD_SIGNER));
             env.close();
         }
 
@@ -566,10 +566,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 2, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::sig(bob, bob),
-                ter(temREDUNDANT));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Sig(bob, bob),
+                Ter(temREDUNDANT));
             env.close();
         }
 
@@ -579,10 +579,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), seq + 2),
-                batch::sig(bob),
-                ter(temBAD_SIGNER));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(5)), seq + 2),
+                batch::Sig(bob),
+                Ter(temBAD_SIGNER));
             env.close();
         }
 
@@ -591,10 +591,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::sig(carol),
-                ter(temBAD_SIGNER));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Sig(carol),
+                Ter(temBAD_SIGNER));
             env.close();
         }
 
@@ -605,8 +605,8 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto jt = env.jtnofill(
                 batch::outer(alice, env.seq(alice), batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), bobSeq));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), bobSeq));
 
             Serializer msg;
             serializeBatch(msg, tfAllOrNothing, jt.stx->getBatchTransactionIDs());
@@ -618,7 +618,7 @@ class Batch_test : public beast::unit_test::suite
             jt.jv[sfBatchSigners.jsonName][0u][sfBatchSigner.jsonName][sfTxnSignature.jsonName] =
                 strHex(Slice{sig.data(), sig.size()});
 
-            env(jt.jv, ter(temBAD_SIGNATURE));
+            env(jt.jv, Ter(temBAD_SIGNATURE));
             env.close();
         }
 
@@ -627,11 +627,11 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 2, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::inner(pay(carol, alice, XRP(5)), env.seq(carol)),
-                batch::sig(bob),
-                ter(temBAD_SIGNER));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Inner(pay(carol, alice, XRP(5)), env.seq(carol)),
+                batch::Sig(bob),
+                Ter(temBAD_SIGNER));
             env.close();
         }
     }
@@ -669,10 +669,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(20)), seq + 2),
-                sig(bob),
-                ter(tefBAD_AUTH));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(20)), seq + 2),
+                Sig(bob),
+                Ter(tefBAD_AUTH));
             env.close();
         }
 
@@ -684,10 +684,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {dave, carol}),
-                ter(tefNOT_MULTI_SIGNING));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {dave, carol}),
+                Ter(tefNOT_MULTI_SIGNING));
             env.close();
         }
 
@@ -702,10 +702,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, frank}),
-                ter(tefBAD_SIGNATURE));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, frank}),
+                Ter(tefBAD_SIGNATURE));
             env.close();
         }
 
@@ -714,24 +714,24 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, Account("dave", KeyType::ed25519)}),
-                ter(tefBAD_SIGNATURE));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, Account("dave", KeyType::Ed25519)}),
+                Ter(tefBAD_SIGNATURE));
             env.close();
         }
 
         // tefMASTER_DISABLED: Master key disabled
         {
             env(regkey(elsa, frank));
-            env(fset(elsa, asfDisableMaster), sig(elsa));
+            env(fset(elsa, asfDisableMaster), Sig(elsa));
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, elsa}),
-                ter(tefMASTER_DISABLED));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, elsa}),
+                Ter(tefMASTER_DISABLED));
             env.close();
         }
 
@@ -740,10 +740,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, phantom}),
-                ter(tefBAD_SIGNATURE));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, phantom}),
+                Ter(tefBAD_SIGNATURE));
             env.close();
         }
 
@@ -751,12 +751,12 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
-            Account const davo{"davo", KeyType::ed25519};
+            Account const davo{"davo", KeyType::Ed25519};
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, Reg{dave, davo}}),
-                ter(tefBAD_SIGNATURE));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, Reg{dave, davo}}),
+                Ter(tefBAD_SIGNATURE));
             env.close();
         }
 
@@ -765,12 +765,12 @@ class Batch_test : public beast::unit_test::suite
             env(regkey(dave, frank));
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
-            Account const davo{"davo", KeyType::ed25519};
+            Account const davo{"davo", KeyType::Ed25519};
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, Reg{dave, davo}}),
-                ter(tefBAD_SIGNATURE));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, Reg{dave, davo}}),
+                Ter(tefBAD_SIGNATURE));
             env.close();
         }
 
@@ -779,10 +779,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 2, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol}),
-                ter(tefBAD_QUORUM));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol}),
+                Ter(tefBAD_QUORUM));
             env.close();
         }
 
@@ -791,10 +791,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 3, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, dave}),
-                ter(tesSUCCESS));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, dave}),
+                Ter(tesSUCCESS));
             env.close();
         }
 
@@ -803,11 +803,11 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 4, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), env.seq(bob)),
-                batch::msig(bob, {carol, dave}),
-                msig(bob, carol),
-                ter(tesSUCCESS));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), env.seq(bob)),
+                batch::Msig(bob, {carol, dave}),
+                Msig(bob, carol),
+                Ter(tesSUCCESS));
             env.close();
         }
 
@@ -820,10 +820,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, phantom, XRP(1000)), seq + 1),
-                batch::inner(noop(phantom), ledSeq),
-                batch::sig(Reg{phantom, carol}),
-                ter(tefBAD_AUTH));
+                batch::Inner(pay(alice, phantom, XRP(1000)), seq + 1),
+                batch::Inner(noop(phantom), ledSeq),
+                batch::Sig(Reg{phantom, carol}),
+                Ter(tefBAD_AUTH));
             env.close();
         }
 
@@ -833,10 +833,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1000)), seq + 1),
-                batch::inner(noop(bob), ledSeq),
-                batch::sig(Reg{bob, carol}),
-                ter(tefBAD_AUTH));
+                batch::Inner(pay(alice, bob, XRP(1000)), seq + 1),
+                batch::Inner(noop(bob), ledSeq),
+                batch::Sig(Reg{bob, carol}),
+                Ter(tefBAD_AUTH));
             env.close();
         }
 
@@ -846,10 +846,10 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(2)), env.seq(bob)),
-                batch::sig(Reg{bob, carol}),
-                ter(tesSUCCESS));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(2)), env.seq(bob)),
+                batch::Sig(Reg{bob, carol}),
+                Ter(tesSUCCESS));
             env.close();
         }
 
@@ -858,24 +858,24 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(2)), env.seq(bob)),
-                batch::sig(bob),
-                ter(tesSUCCESS));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(2)), env.seq(bob)),
+                batch::Sig(bob),
+                Ter(tesSUCCESS));
             env.close();
         }
 
         // tefMASTER_DISABLED: Signed With Master Key Disabled
         {
             env(regkey(bob, carol));
-            env(fset(bob, asfDisableMaster), sig(bob));
+            env(fset(bob, asfDisableMaster), Sig(bob));
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(2)), env.seq(bob)),
-                batch::sig(bob),
-                ter(tefMASTER_DISABLED));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(2)), env.seq(bob)),
+                batch::Sig(bob),
+                Ter(tefMASTER_DISABLED));
             env.close();
         }
     }
@@ -899,14 +899,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1.removeMember(jss::TransactionType);
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(telENV_RPC_FAILED));
+            env(jt.jv, batch::Sig(bob), Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -914,14 +914,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1.removeMember(jss::Account);
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(telENV_RPC_FAILED));
+            env(jt.jv, batch::Sig(bob), Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -929,14 +929,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1.removeMember(jss::Sequence);
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(telENV_RPC_FAILED));
+            env(jt.jv, batch::Sig(bob), Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -944,14 +944,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1.removeMember(jss::Fee);
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(telENV_RPC_FAILED));
+            env(jt.jv, batch::Sig(bob), Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -959,14 +959,14 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const seq = env.seq(alice);
-            auto tx1 = batch::inner(pay(alice, bob, XRP(10)), seq + 1);
+            auto tx1 = batch::Inner(pay(alice, bob, XRP(10)), seq + 1);
             tx1.removeMember(jss::SigningPubKey);
             auto jt = env.jtnofill(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx1,
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2));
 
-            env(jt.jv, batch::sig(bob), ter(telENV_RPC_FAILED));
+            env(jt.jv, batch::Sig(bob), Ter(telENV_RPC_FAILED));
             env.close();
         }
     }
@@ -984,35 +984,35 @@ class Batch_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
-        env.trust(USD(1000), alice, bob);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, bob, USD(100)));
+        env.trust(usd(1000), alice, bob);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
 
-        env(noop(bob), ter(tesSUCCESS));
+        env(noop(bob), Ter(tesSUCCESS));
         env.close();
 
         // Invalid: Alice Sequence is a past sequence
         {
             auto const preAliceSeq = env.seq(alice);
             auto const preAlice = env.balance(alice);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
             auto const preBobSeq = env.seq(bob);
             auto const preBob = env.balance(bob);
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, preAliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), preAliceSeq - 10),
-                batch::inner(pay(bob, alice, XRP(5)), preBobSeq),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(10)), preAliceSeq - 10),
+                batch::Inner(pay(bob, alice, XRP(5)), preBobSeq),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -1032,29 +1032,29 @@ class Batch_test : public beast::unit_test::suite
             // Alice pays fee & Bob should not be affected.
             BEAST_EXPECT(env.seq(alice) == preAliceSeq + 1);
             BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
             BEAST_EXPECT(env.seq(bob) == preBobSeq);
             BEAST_EXPECT(env.balance(bob) == preBob);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
 
         // Invalid: Alice Sequence is a future sequence
         {
             auto const preAliceSeq = env.seq(alice);
             auto const preAlice = env.balance(alice);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
             auto const preBobSeq = env.seq(bob);
             auto const preBob = env.balance(bob);
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, preAliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), preAliceSeq + 10),
-                batch::inner(pay(bob, alice, XRP(5)), preBobSeq),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(10)), preAliceSeq + 10),
+                batch::Inner(pay(bob, alice, XRP(5)), preBobSeq),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -1074,29 +1074,29 @@ class Batch_test : public beast::unit_test::suite
             // Alice pays fee & Bob should not be affected.
             BEAST_EXPECT(env.seq(alice) == preAliceSeq + 1);
             BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
             BEAST_EXPECT(env.seq(bob) == preBobSeq);
             BEAST_EXPECT(env.balance(bob) == preBob);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
 
         // Invalid: Bob Sequence is a past sequence
         {
             auto const preAliceSeq = env.seq(alice);
             auto const preAlice = env.balance(alice);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
             auto const preBobSeq = env.seq(bob);
             auto const preBob = env.balance(bob);
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, preAliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), preAliceSeq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), preBobSeq - 10),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(10)), preAliceSeq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), preBobSeq - 10),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -1116,29 +1116,29 @@ class Batch_test : public beast::unit_test::suite
             // Alice pays fee & Bob should not be affected.
             BEAST_EXPECT(env.seq(alice) == preAliceSeq + 1);
             BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
             BEAST_EXPECT(env.seq(bob) == preBobSeq);
             BEAST_EXPECT(env.balance(bob) == preBob);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
 
         // Invalid: Bob Sequence is a future sequence
         {
             auto const preAliceSeq = env.seq(alice);
             auto const preAlice = env.balance(alice);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
             auto const preBobSeq = env.seq(bob);
             auto const preBob = env.balance(bob);
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, preAliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), preAliceSeq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), preBobSeq + 10),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(10)), preAliceSeq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), preBobSeq + 10),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -1158,29 +1158,29 @@ class Batch_test : public beast::unit_test::suite
             // Alice pays fee & Bob should not be affected.
             BEAST_EXPECT(env.seq(alice) == preAliceSeq + 1);
             BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
             BEAST_EXPECT(env.seq(bob) == preBobSeq);
             BEAST_EXPECT(env.balance(bob) == preBob);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
 
         // Invalid: Outer and Inner Sequence are the same
         {
             auto const preAliceSeq = env.seq(alice);
             auto const preAlice = env.balance(alice);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
             auto const preBobSeq = env.seq(bob);
             auto const preBob = env.balance(bob);
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, preAliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), preAliceSeq),
-                batch::inner(pay(bob, alice, XRP(5)), preBobSeq),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(10)), preAliceSeq),
+                batch::Inner(pay(bob, alice, XRP(5)), preBobSeq),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -1200,10 +1200,10 @@ class Batch_test : public beast::unit_test::suite
             // Alice pays fee & Bob should not be affected.
             BEAST_EXPECT(env.seq(alice) == preAliceSeq + 1);
             BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
             BEAST_EXPECT(env.seq(bob) == preBobSeq);
             BEAST_EXPECT(env.balance(bob) == preBob);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
     }
 
@@ -1224,16 +1224,16 @@ class Batch_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob);
             env.close();
 
-            env(noop(bob), ter(tesSUCCESS));
+            env(noop(bob), Ter(tesSUCCESS));
             env.close();
 
             // Bad Fee: Should be batch::calcBatchFee(env, 0, 2)
             auto const batchFee = batch::calcBatchFee(env, 0, 1);
             auto const aliceSeq = env.seq(alice);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(15)), aliceSeq + 2),
-                ter(telINSUF_FEE_P));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(15)), aliceSeq + 2),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
 
@@ -1247,7 +1247,7 @@ class Batch_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
 
-            env(noop(bob), ter(tesSUCCESS));
+            env(noop(bob), Ter(tesSUCCESS));
             env.close();
 
             env(signers(alice, 2, {{bob, 1}, {carol, 1}}));
@@ -1257,10 +1257,10 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             auto const aliceSeq = env.seq(alice);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(15)), aliceSeq + 2),
-                msig(bob, carol),
-                ter(telINSUF_FEE_P));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(15)), aliceSeq + 2),
+                Msig(bob, carol),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
 
@@ -1274,7 +1274,7 @@ class Batch_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
 
-            env(noop(bob), ter(tesSUCCESS));
+            env(noop(bob), Ter(tesSUCCESS));
             env.close();
 
             env(signers(alice, 2, {{bob, 1}, {carol, 1}}));
@@ -1285,11 +1285,11 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto const bobSeq = env.seq(bob);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                batch::sig(bob),
-                msig(bob, carol),
-                ter(telINSUF_FEE_P));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                batch::Sig(bob),
+                Msig(bob, carol),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
 
@@ -1303,7 +1303,7 @@ class Batch_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
 
-            env(noop(bob), ter(tesSUCCESS));
+            env(noop(bob), Ter(tesSUCCESS));
             env.close();
 
             env(signers(alice, 2, {{bob, 1}, {carol, 1}}));
@@ -1317,11 +1317,11 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto const bobSeq = env.seq(bob);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                batch::msig(bob, {alice, carol}),
-                msig(bob, carol),
-                ter(telINSUF_FEE_P));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                batch::Msig(bob, {alice, carol}),
+                Msig(bob, carol),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
 
@@ -1334,7 +1334,7 @@ class Batch_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob);
             env.close();
 
-            env(noop(bob), ter(tesSUCCESS));
+            env(noop(bob), Ter(tesSUCCESS));
             env.close();
 
             // Bad Fee: Should be batch::calcBatchFee(env, 1, 2)
@@ -1342,10 +1342,10 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto const bobSeq = env.seq(bob);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                batch::sig(bob),
-                ter(telINSUF_FEE_P));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                batch::Sig(bob),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
 
@@ -1356,15 +1356,15 @@ class Batch_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
             auto const ammCreate = [&alice](STAmount const& amount, STAmount const& amount2) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = alice.human();
-                jv[jss::Amount] = amount.getJson(JsonOptions::none);
-                jv[jss::Amount2] = amount2.getJson(JsonOptions::none);
+                jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
+                jv[jss::Amount2] = amount2.getJson(JsonOptions::KNone);
                 jv[jss::TradingFee] = 0;
                 jv[jss::TransactionType] = jss::AMMCreate;
                 return jv;
@@ -1373,9 +1373,9 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             auto const seq = env.seq(alice);
             env(batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(ammCreate(XRP(10), USD(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 2),
-                ter(telINSUF_FEE_P));
+                batch::Inner(ammCreate(XRP(10), usd(10)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 2),
+                Ter(telINSUF_FEE_P));
             env.close();
         }
     }
@@ -1400,16 +1400,16 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 0, 9);
             auto const aliceSeq = env.seq(alice);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                ter(telENV_RPC_FAILED));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -1426,18 +1426,18 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto jt = env.jtnofill(
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq));
 
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                auto const result = xrpl::apply(env.app(), view, *jt.stx, tapNONE, j);
+                auto const result = xrpl::apply(env.app(), view, *jt.stx, TapNone, j);
                 BEAST_EXPECT(!result.applied && result.ter == temARRAY_TOO_LARGE);
                 return result.applied;
             });
@@ -1455,10 +1455,10 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 9, 2);
             env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), aliceSeq + 2),
-                batch::sig(bob, bob, bob, bob, bob, bob, bob, bob, bob, bob),
-                ter(telENV_RPC_FAILED));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(5)), aliceSeq + 2),
+                batch::Sig(bob, bob, bob, bob, bob, bob, bob, bob, bob, bob),
+                Ter(telENV_RPC_FAILED));
             env.close();
         }
 
@@ -1475,12 +1475,12 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto jt = env.jtnofill(
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), aliceSeq + 2),
-                batch::sig(bob, bob, bob, bob, bob, bob, bob, bob, bob, bob));
+                batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(5)), aliceSeq + 2),
+                batch::Sig(bob, bob, bob, bob, bob, bob, bob, bob, bob, bob));
 
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                auto const result = xrpl::apply(env.app(), view, *jt.stx, tapNONE, j);
+                auto const result = xrpl::apply(env.app(), view, *jt.stx, TapNone, j);
                 BEAST_EXPECT(!result.applied && result.ter == temARRAY_TOO_LARGE);
                 return result.applied;
             });
@@ -1500,7 +1500,7 @@ class Batch_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
 
@@ -1515,8 +1515,8 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1546,9 +1546,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1575,9 +1575,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // tefNO_AUTH_REQUIRED: trustline auth is not required
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), seq + 2));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1604,9 +1604,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // terPRE_TICKET: ticket does not exist
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), 0, seq + 2));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), 0, seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1638,7 +1638,7 @@ class Batch_test : public beast::unit_test::suite
         auto const carol = Account("carol");
         auto const dave = Account("dave");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, bob, carol, dave, gw);
         env.close();
 
@@ -1654,11 +1654,11 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 1),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 2),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 3));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1689,9 +1689,9 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1720,10 +1720,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1752,9 +1752,9 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
                 // tefNO_AUTH_REQUIRED: trustline auth is not required
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1783,9 +1783,9 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
                 // terPRE_TICKET: ticket does not exist
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), 0, seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), 0, seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1814,15 +1814,15 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfOnlyOne),
-                batch::inner(
+                batch::Inner(
                     offer(alice, alice["USD"](100), XRP(100), tfImmediateOrCancel), seq + 1),
-                batch::inner(
+                batch::Inner(
                     offer(alice, alice["USD"](100), XRP(100), tfImmediateOrCancel), seq + 2),
-                batch::inner(
+                batch::Inner(
                     offer(alice, alice["USD"](100), XRP(100), tfImmediateOrCancel), seq + 3),
-                batch::inner(pay(alice, bob, XRP(100)), seq + 4),
-                batch::inner(pay(alice, carol, XRP(100)), seq + 5),
-                batch::inner(pay(alice, dave, XRP(100)), seq + 6));
+                batch::Inner(pay(alice, bob, XRP(100)), seq + 4),
+                batch::Inner(pay(alice, carol, XRP(100)), seq + 5),
+                batch::Inner(pay(alice, dave, XRP(100)), seq + 6));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1855,7 +1855,7 @@ class Batch_test : public beast::unit_test::suite
         auto const carol = Account("carol");
         auto const dave = Account("dave");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, bob, carol, dave, gw);
         env.close();
 
@@ -1871,10 +1871,10 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1902,10 +1902,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(4)), seq + 4));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(4)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1936,11 +1936,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -1970,11 +1970,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // tefNO_AUTH_REQUIRED: trustline auth is not required
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2003,11 +2003,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // terPRE_TICKET: ticket does not exist
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), 0, seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), 0, seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2036,11 +2036,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfUntilFailure),
-                batch::inner(pay(alice, bob, XRP(100)), seq + 1),
-                batch::inner(pay(alice, carol, XRP(100)), seq + 2),
-                batch::inner(
+                batch::Inner(pay(alice, bob, XRP(100)), seq + 1),
+                batch::Inner(pay(alice, carol, XRP(100)), seq + 2),
+                batch::Inner(
                     offer(alice, alice["USD"](100), XRP(100), tfImmediateOrCancel), seq + 3),
-                batch::inner(pay(alice, dave, XRP(100)), seq + 4));
+                batch::Inner(pay(alice, dave, XRP(100)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2071,7 +2071,7 @@ class Batch_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
 
@@ -2086,12 +2086,12 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 2),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2122,11 +2122,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // tecUNFUNDED_PAYMENT: alice does not have enough XRP
-                batch::inner(pay(alice, bob, XRP(9999)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 4));
+                batch::Inner(pay(alice, bob, XRP(9999)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 4));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2157,11 +2157,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // tefNO_AUTH_REQUIRED: trustline auth is not required
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 3));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2191,11 +2191,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
                 // terPRE_TICKET: ticket does not exist
-                batch::inner(trust(alice, USD(1000), tfSetfAuth), 0, seq + 3),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 3));
+                batch::Inner(trust(alice, usd(1000), tfSetfAuth), 0, seq + 3),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2225,9 +2225,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(100)), seq + 1),
-                batch::inner(pay(alice, carol, XRP(100)), seq + 2),
-                batch::inner(
+                batch::Inner(pay(alice, bob, XRP(100)), seq + 1),
+                batch::Inner(pay(alice, carol, XRP(100)), seq + 2),
+                batch::Inner(
                     offer(alice, alice["USD"](100), XRP(100), tfImmediateOrCancel), seq + 3));
             env.close();
 
@@ -2312,7 +2312,7 @@ class Batch_test : public beast::unit_test::suite
         // - has no `Signers` field
         // + has `tfInnerBatchTxn` flag
         {
-            auto txn = batch::inner(pay(alice, bob, XRP(1)), env.seq(alice));
+            auto txn = batch::Inner(pay(alice, bob, XRP(1)), env.seq(alice));
             txn[sfTxnSignature] = "DEADBEEF";
             STParsedJSONObject parsed("test", txn.getTxn());
             Serializer s;
@@ -2326,7 +2326,7 @@ class Batch_test : public beast::unit_test::suite
         // - has no `Signers` field
         // + has `tfInnerBatchTxn` flag
         {
-            auto txn = batch::inner(pay(alice, bob, XRP(1)), env.seq(alice));
+            auto txn = batch::Inner(pay(alice, bob, XRP(1)), env.seq(alice));
             txn[sfSigningPubKey] = strHex(alice.pk());
             STParsedJSONObject parsed("test", txn.getTxn());
             Serializer s;
@@ -2345,8 +2345,8 @@ class Batch_test : public beast::unit_test::suite
         // + has `Signers` field
         // + has `tfInnerBatchTxn` flag
         {
-            auto txn = batch::inner(pay(alice, bob, XRP(1)), env.seq(alice));
-            txn[sfSigners] = Json::arrayValue;
+            auto txn = batch::Inner(pay(alice, bob, XRP(1)), env.seq(alice));
+            txn[sfSigners] = json::ArrayValue;
             STParsedJSONObject parsed("test", txn.getTxn());
             Serializer s;
             parsed.object->add(s);  // NOLINT(bugprone-unchecked-optional-access)
@@ -2360,7 +2360,7 @@ class Batch_test : public beast::unit_test::suite
 
         {
             // Fully signed inner batch transaction
-            auto const txn = batch::inner(pay(alice, bob, XRP(1)), env.seq(alice));
+            auto const txn = batch::Inner(pay(alice, bob, XRP(1)), env.seq(alice));
             auto const jt = env.jt(txn.getTxn());
 
             STParsedJSONObject parsed("test", jt.jv);
@@ -2376,7 +2376,7 @@ class Batch_test : public beast::unit_test::suite
         // - has no `Signers` field
         // + has `tfInnerBatchTxn` flag
         {
-            auto txn = batch::inner(pay(alice, bob, XRP(1)), env.seq(alice));
+            auto txn = batch::Inner(pay(alice, bob, XRP(1)), env.seq(alice));
             STParsedJSONObject parsed("test", txn.getTxn());
             Serializer s;
             parsed.object->add(s);  // NOLINT(bugprone-unchecked-optional-access)
@@ -2401,7 +2401,7 @@ class Batch_test : public beast::unit_test::suite
                 obj.setFieldU32(sfLedgerSequence, seq);
                 obj.setFieldU32(sfFlags, tfInnerBatchTxn);
             });
-            auto txn = batch::inner(amendTx.getJson(JsonOptions::none), env.seq(alice));
+            auto txn = batch::Inner(amendTx.getJson(JsonOptions::KNone), env.seq(alice));
             STParsedJSONObject parsed("test", txn.getTxn());
             Serializer s;
             parsed.object->add(s);  // NOLINT(bugprone-unchecked-optional-access)
@@ -2448,9 +2448,9 @@ class Batch_test : public beast::unit_test::suite
             env,
             tesSUCCESS,
             batch::outer(alice, seq, batchFee, tfAllOrNothing),
-            batch::inner(pay(alice, bob, XRP(1000)), seq + 1),
-            batch::inner(fset(bob, asfAllowTrustLineClawback), ledSeq),
-            batch::sig(bob));
+            batch::Inner(pay(alice, bob, XRP(1000)), seq + 1),
+            batch::Inner(fset(bob, asfAllowTrustLineClawback), ledSeq),
+            batch::Sig(bob));
         env.close();
 
         std::vector<TestLedgerData> const testCases = {
@@ -2491,7 +2491,7 @@ class Batch_test : public beast::unit_test::suite
 
         auto const seq = env.seq(alice);
         auto const batchFee = batch::calcBatchFee(env, 0, 2);
-        auto tx1 = batch::inner(noop(alice), seq + 1);
+        auto tx1 = batch::Inner(noop(alice), seq + 1);
         std::string domain = "example.com";
         tx1[sfDomain] = strHex(domain);
         auto const [txIDs, batchID] = submitBatch(
@@ -2499,7 +2499,7 @@ class Batch_test : public beast::unit_test::suite
             tesSUCCESS,
             batch::outer(alice, seq, batchFee, tfAllOrNothing),
             tx1,
-            batch::inner(pay(alice, bob, XRP(1)), seq + 2));
+            batch::Inner(pay(alice, bob, XRP(1)), seq + 2));
         env.close();
 
         std::vector<TestLedgerData> const testCases = {
@@ -2551,10 +2551,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(acctdelete(alice, bob), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(acctdelete(alice, bob), seq + 2),
                 // terNO_ACCOUNT: alice does not exist
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2594,10 +2594,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfIndependent),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
                 // tecHAS_OBLIGATIONS: alice has obligations
-                batch::inner(acctdelete(alice, bob), seq + 2),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(acctdelete(alice, bob), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2635,10 +2635,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(acctdelete(alice, bob), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(acctdelete(alice, bob), seq + 2),
                 // terNO_ACCOUNT: alice does not exist
-                batch::inner(pay(alice, bob, XRP(2)), seq + 3));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 3));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2658,7 +2658,7 @@ class Batch_test : public beast::unit_test::suite
         testcase("loan");
 
         bool const lendingBatchEnabled = !std::ranges::any_of(
-            Batch::disabledTxTypes,
+            Batch::kDISABLED_TX_TYPES,
             [](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),
-                managementFeeRate(TenthBips16(100)),
-                debtMaximum(debtMaximumValue),
-                coverRateMinimum(TenthBips32(percentageToTenthBips(10))),
-                coverRateLiquidation(TenthBips32(percentageToTenthBips(25))));
+                kMANAGEMENT_FEE_RATE(TenthBips16(100)),
+                kDEBT_MAXIMUM(debtMaximumValue),
+                kCOVER_RATE_MINIMUM(TenthBips32(percentageToTenthBips(10))),
+                kCOVER_RATE_LIQUIDATION(TenthBips32(percentageToTenthBips(25))));
 
             env(coverDeposit(lender, brokerKeylet.key, coverDepositValue));
 
@@ -2722,16 +2722,16 @@ class Batch_test : public beast::unit_test::suite
                     env,
                     lendingBatchEnabled ? temBAD_SIGNATURE : temINVALID_INNER_BATCH,
                     batch::outer(lender, lenderSeq, batchFee, tfAllOrNothing),
-                    batch::inner(
+                    batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Not allowed to include the counterparty signature
-                            sig(sfCounterpartySignature, borrower),
-                            sig(none),
-                            fee(none),
-                            seq(none)),
+                            Sig(sfCounterpartySignature, borrower),
+                            Sig(kNONE),
+                            Fee(kNONE),
+                            Seq(kNONE)),
                         lenderSeq + 1),
-                    batch::inner(
+                    batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
                         lenderSeq + 2));
             }
@@ -2740,15 +2740,15 @@ class Batch_test : public beast::unit_test::suite
                     env,
                     temINVALID_INNER_BATCH,
                     batch::outer(lender, lenderSeq, batchFee, tfAllOrNothing),
-                    batch::inner(
+                    batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Counterparty must be set
-                            sig(none),
-                            fee(none),
-                            seq(none)),
+                            Sig(kNONE),
+                            Fee(kNONE),
+                            Seq(kNONE)),
                         lenderSeq + 1),
-                    batch::inner(
+                    batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
                         lenderSeq + 2));
             }
@@ -2757,16 +2757,16 @@ class Batch_test : public beast::unit_test::suite
                     env,
                     lendingBatchEnabled ? temBAD_SIGNER : temINVALID_INNER_BATCH,
                     batch::outer(lender, lenderSeq, batchFee, tfAllOrNothing),
-                    batch::inner(
+                    batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
                             // Counterparty must sign the outer transaction
-                            counterparty(borrower.id()),
-                            sig(none),
-                            fee(none),
-                            seq(none)),
+                            kCOUNTERPARTY(borrower.id()),
+                            Sig(kNONE),
+                            Fee(kNONE),
+                            Seq(kNONE)),
                         lenderSeq + 1),
-                    batch::inner(
+                    batch::Inner(
                         pay(lender, loanKeylet.key, STAmount{asset, asset(500).value()}),
                         lenderSeq + 2));
             }
@@ -2779,15 +2779,15 @@ class Batch_test : public beast::unit_test::suite
                     env,
                     lendingBatchEnabled ? TER(tesSUCCESS) : TER(temINVALID_INNER_BATCH),
                     batch::outer(lender, lenderSeq, batchFee, tfAllOrNothing),
-                    batch::inner(
+                    batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
-                            counterparty(borrower.id()),
-                            sig(none),
-                            fee(none),
-                            seq(none)),
+                            kCOUNTERPARTY(borrower.id()),
+                            Sig(kNONE),
+                            Fee(kNONE),
+                            Seq(kNONE)),
                         lenderSeq + 1),
-                    batch::inner(
+                    batch::Inner(
                         pay(
                             // However, this inner transaction will fail,
                             // because the lender is not allowed to draw the
@@ -2796,7 +2796,7 @@ class Batch_test : public beast::unit_test::suite
                             loanKeylet.key,
                             STAmount{asset, asset(500).value()}),
                         lenderSeq + 2),
-                    batch::sig(borrower));
+                    batch::Sig(borrower));
             }
             env.close();
             BEAST_EXPECT(env.le(brokerKeylet));
@@ -2811,16 +2811,16 @@ class Batch_test : public beast::unit_test::suite
                     env,
                     lendingBatchEnabled ? TER(tesSUCCESS) : TER(temINVALID_INNER_BATCH),
                     batch::outer(lender, lenderSeq, batchFee, tfAllOrNothing),
-                    batch::inner(
+                    batch::Inner(
                         env.json(
                             set(lender, brokerKeylet.key, asset(1000).value()),
-                            counterparty(borrower.id()),
-                            sig(none),
-                            fee(none),
-                            seq(none)),
+                            kCOUNTERPARTY(borrower.id()),
+                            Sig(kNONE),
+                            Fee(kNONE),
+                            Seq(kNONE)),
                         lenderSeq + 1),
-                    batch::inner(manage(lender, loanKeylet.key, tfLoanImpair), lenderSeq + 2),
-                    batch::sig(borrower));
+                    batch::Inner(manage(lender, loanKeylet.key, tfLoanImpair), lenderSeq + 2),
+                    batch::Sig(borrower));
             }
             env.close();
             BEAST_EXPECT(env.le(brokerKeylet));
@@ -2845,14 +2845,14 @@ class Batch_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
 
-        env.trust(USD(1000), alice, bob);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, bob, USD(100)));
+        env.trust(usd(1000), alice, bob);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
 
         // success
@@ -2861,8 +2861,8 @@ class Batch_test : public beast::unit_test::suite
             auto const bobSeq = env.seq(bob);
             auto const preAlice = env.balance(alice);
             auto const preBob = env.balance(bob);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             uint256 const chkID{getCheckIndex(bob, env.seq(bob))};
@@ -2870,9 +2870,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(check::create(bob, alice, USD(10)), bobSeq),
-                batch::inner(check::cash(alice, chkID, USD(10)), aliceSeq + 1),
-                batch::sig(bob));
+                batch::Inner(check::create(bob, alice, usd(10)), bobSeq),
+                batch::Inner(check::cash(alice, chkID, usd(10)), aliceSeq + 1),
+                batch::Sig(bob));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2893,8 +2893,8 @@ class Batch_test : public beast::unit_test::suite
             BEAST_EXPECT(env.balance(bob) == preBob);
 
             // Alice pays USD & Bob receives USD
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD + USD(10));
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD - USD(10));
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD + usd(10));
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD - usd(10));
         }
 
         // failure
@@ -2906,8 +2906,8 @@ class Batch_test : public beast::unit_test::suite
             auto const bobSeq = env.seq(bob);
             auto const preAlice = env.balance(alice);
             auto const preBob = env.balance(bob);
-            auto const preAliceUSD = env.balance(alice, USD.issue());
-            auto const preBobUSD = env.balance(bob, USD.issue());
+            auto const preAliceUSD = env.balance(alice, usd.issue());
+            auto const preBobUSD = env.balance(bob, usd.issue());
 
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
             uint256 const chkID{getCheckIndex(bob, env.seq(bob))};
@@ -2916,9 +2916,9 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfIndependent),
                 // tecDST_TAG_NEEDED - alice has enabled asfRequireDest
-                batch::inner(check::create(bob, alice, USD(10)), bobSeq),
-                batch::inner(check::cash(alice, chkID, USD(10)), aliceSeq + 1),
-                batch::sig(bob));
+                batch::Inner(check::create(bob, alice, usd(10)), bobSeq),
+                batch::Inner(check::cash(alice, chkID, usd(10)), aliceSeq + 1),
+                batch::Sig(bob));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -2939,8 +2939,8 @@ class Batch_test : public beast::unit_test::suite
             BEAST_EXPECT(env.balance(bob) == preBob);
 
             // Alice pays USD & Bob receives USD
-            BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD);
-            BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD);
+            BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD);
+            BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD);
         }
     }
 
@@ -2957,22 +2957,22 @@ class Batch_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
 
-        env.trust(USD(1000), alice, bob);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, bob, USD(100)));
+        env.trust(usd(1000), alice, bob);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
 
         auto const aliceSeq = env.seq(alice);
         auto const bobSeq = env.seq(bob);
         auto const preAlice = env.balance(alice);
         auto const preBob = env.balance(bob);
-        auto const preAliceUSD = env.balance(alice, USD.issue());
-        auto const preBobUSD = env.balance(bob, USD.issue());
+        auto const preAliceUSD = env.balance(alice, usd.issue());
+        auto const preBobUSD = env.balance(bob, usd.issue());
 
         auto const batchFee = batch::calcBatchFee(env, 1, 3);
         uint256 const chkID{getCheckIndex(bob, bobSeq + 1)};
@@ -2980,10 +2980,10 @@ class Batch_test : public beast::unit_test::suite
             env,
             tesSUCCESS,
             batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-            batch::inner(ticket::create(bob, 10), bobSeq),
-            batch::inner(check::create(bob, alice, USD(10)), 0, bobSeq + 1),
-            batch::inner(check::cash(alice, chkID, USD(10)), aliceSeq + 1),
-            batch::sig(bob));
+            batch::Inner(ticket::create(bob, 10), bobSeq),
+            batch::Inner(check::create(bob, alice, usd(10)), 0, bobSeq + 1),
+            batch::Inner(check::cash(alice, chkID, usd(10)), aliceSeq + 1),
+            batch::Sig(bob));
         env.close();
 
         std::vector<TestLedgerData> const testCases = {
@@ -2998,8 +2998,8 @@ class Batch_test : public beast::unit_test::suite
         BEAST_EXPECT(env.seq(bob) == bobSeq + 10 + 1);
         BEAST_EXPECT(env.balance(alice) == preAlice - batchFee);
         BEAST_EXPECT(env.balance(bob) == preBob);
-        BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD + USD(10));
-        BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD - USD(10));
+        BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD + usd(10));
+        BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD - usd(10));
     }
 
     void
@@ -3016,14 +3016,14 @@ class Batch_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
 
-        env.trust(USD(1000), alice, bob);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, bob, USD(100)));
+        env.trust(usd(1000), alice, bob);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
 
         auto const aliceSeq = env.seq(alice);
@@ -3032,8 +3032,8 @@ class Batch_test : public beast::unit_test::suite
         auto const preAlice = env.balance(alice);
         auto const preBob = env.balance(bob);
         auto const preCarol = env.balance(carol);
-        auto const preAliceUSD = env.balance(alice, USD.issue());
-        auto const preBobUSD = env.balance(bob, USD.issue());
+        auto const preAliceUSD = env.balance(alice, usd.issue());
+        auto const preBobUSD = env.balance(bob, usd.issue());
 
         auto const batchFee = batch::calcBatchFee(env, 2, 2);
         uint256 const chkID{getCheckIndex(bob, env.seq(bob))};
@@ -3041,9 +3041,9 @@ class Batch_test : public beast::unit_test::suite
             env,
             tesSUCCESS,
             batch::outer(carol, carolSeq, batchFee, tfAllOrNothing),
-            batch::inner(check::create(bob, alice, USD(10)), bobSeq),
-            batch::inner(check::cash(alice, chkID, USD(10)), aliceSeq),
-            batch::sig(alice, bob));
+            batch::Inner(check::create(bob, alice, usd(10)), bobSeq),
+            batch::Inner(check::cash(alice, chkID, usd(10)), aliceSeq),
+            batch::Sig(alice, bob));
         env.close();
 
         std::vector<TestLedgerData> const testCases = {
@@ -3059,8 +3059,8 @@ class Batch_test : public beast::unit_test::suite
         BEAST_EXPECT(env.balance(alice) == preAlice);
         BEAST_EXPECT(env.balance(bob) == preBob);
         BEAST_EXPECT(env.balance(carol) == preCarol - batchFee);
-        BEAST_EXPECT(env.balance(alice, USD.issue()) == preAliceUSD + USD(10));
-        BEAST_EXPECT(env.balance(bob, USD.issue()) == preBobUSD - USD(10));
+        BEAST_EXPECT(env.balance(alice, usd.issue()) == preAliceUSD + usd(10));
+        BEAST_EXPECT(env.balance(bob, usd.issue()) == preBobUSD - usd(10));
     }
 
     void
@@ -3093,9 +3093,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq + 0),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq + 0),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
+                ticket::Use(aliceTicketSeq));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -3142,8 +3142,8 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq),
-                batch::inner(pay(alice, bob, XRP(2)), 0, aliceTicketSeq + 1));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq),
+                batch::Inner(pay(alice, bob, XRP(2)), 0, aliceTicketSeq + 1));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -3190,9 +3190,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq),
+                ticket::Use(aliceTicketSeq));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -3240,9 +3240,9 @@ class Batch_test : public beast::unit_test::suite
             auto const carolSeq = env.seq(carol);
 
             // AccountSet Txn
-            auto const noopTxn = env.jt(noop(alice), seq(aliceSeq + 2));
+            auto const noopTxn = env.jt(noop(alice), Seq(aliceSeq + 2));
             auto const noopTxnID = to_string(noopTxn.stx->getTransactionID());
-            env(noopTxn, ter(terPRE_SEQ));
+            env(noopTxn, Ter(terPRE_SEQ));
 
             // Batch Txn
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
@@ -3250,9 +3250,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(carol, carolSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
-                batch::sig(alice));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
+                batch::Sig(alice));
             env.close();
 
             {
@@ -3286,8 +3286,8 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
 
             // AccountSet Txn
-            auto const noopTxn = env.jt(noop(alice), seq(aliceSeq + 1));
-            env(noopTxn, ter(terPRE_SEQ));
+            auto const noopTxn = env.jt(noop(alice), Seq(aliceSeq + 1));
+            env(noopTxn, Ter(terPRE_SEQ));
 
             // Batch Txn
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
@@ -3295,8 +3295,8 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 2));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 2));
             env.close();
 
             {
@@ -3331,11 +3331,11 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 2));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 2));
 
-            auto const noopTxn = env.jt(noop(alice), seq(aliceSeq + 1));
-            env(noopTxn, ter(tesSUCCESS));
+            auto const noopTxn = env.jt(noop(alice), Seq(aliceSeq + 1));
+            env(noopTxn, Ter(tesSUCCESS));
             env.close();
 
             {
@@ -3370,14 +3370,14 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 terPRE_SEQ,
                 batch::outer(carol, carolSeq + 1, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
-                batch::sig(alice));
+                batch::Inner(pay(alice, bob, XRP(1)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
+                batch::Sig(alice));
 
             // AccountSet Txn
-            auto const noopTxn = env.jt(noop(carol), seq(carolSeq));
+            auto const noopTxn = env.jt(noop(carol), Seq(carolSeq));
             auto const noopTxnID = to_string(noopTxn.stx->getTransactionID());
-            env(noopTxn, ter(tesSUCCESS));
+            env(noopTxn, Ter(tesSUCCESS));
             env.close();
 
             {
@@ -3426,8 +3426,8 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
 
             // AccountSet Txn
-            auto const noopTxn = env.jt(noop(alice), ticket::use(aliceTicketSeq + 1));
-            env(noopTxn, ter(tesSUCCESS));
+            auto const noopTxn = env.jt(noop(alice), ticket::Use(aliceTicketSeq + 1));
+            env(noopTxn, Ter(tesSUCCESS));
 
             // Batch Txn
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
@@ -3435,9 +3435,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq),
+                ticket::Use(aliceTicketSeq));
             env.close();
 
             {
@@ -3478,12 +3478,12 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq),
+                ticket::Use(aliceTicketSeq));
 
             // AccountSet Txn
-            auto const noopTxn = env.jt(noop(alice), ticket::use(aliceTicketSeq + 1));
+            auto const noopTxn = env.jt(noop(alice), ticket::Use(aliceTicketSeq + 1));
             env(noopTxn);
 
             env.close();
@@ -3537,7 +3537,7 @@ class Batch_test : public beast::unit_test::suite
             uint256 const chkID{getCheckIndex(alice, aliceSeq)};
             auto const objTxn = env.jt(check::cash(bob, chkID, XRP(10)));
             auto const objTxnID = to_string(objTxn.stx->getTransactionID());
-            env(objTxn, ter(tecNO_ENTRY));
+            env(objTxn, Ter(tecNO_ENTRY));
 
             // Batch Txn
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
@@ -3545,9 +3545,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(check::create(alice, bob, XRP(10)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(check::create(alice, bob, XRP(10)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                ticket::Use(aliceTicketSeq));
 
             env.close();
             {
@@ -3585,7 +3585,7 @@ class Batch_test : public beast::unit_test::suite
             uint256 const chkID{getCheckIndex(alice, aliceSeq)};
             auto const objTxn = env.jt(check::create(alice, bob, XRP(10)));
             auto const objTxnID = to_string(objTxn.stx->getTransactionID());
-            env(objTxn, ter(tesSUCCESS));
+            env(objTxn, Ter(tesSUCCESS));
 
             // Batch Txn
             auto const batchFee = batch::calcBatchFee(env, 1, 2);
@@ -3593,10 +3593,10 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(check::cash(bob, chkID, XRP(10)), bobSeq),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                ticket::use(aliceTicketSeq),
-                batch::sig(bob));
+                batch::Inner(check::cash(bob, chkID, XRP(10)), bobSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                ticket::Use(aliceTicketSeq),
+                batch::Sig(bob));
 
             env.close();
             {
@@ -3634,14 +3634,14 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, 0, batchFee, tfAllOrNothing),
-                batch::inner(check::create(alice, bob, XRP(10)), aliceSeq),
-                batch::inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
-                ticket::use(aliceTicketSeq));
+                batch::Inner(check::create(alice, bob, XRP(10)), aliceSeq),
+                batch::Inner(pay(alice, bob, XRP(1)), 0, aliceTicketSeq + 1),
+                ticket::Use(aliceTicketSeq));
 
             // CheckCash Txn
             auto const objTxn = env.jt(check::cash(bob, chkID, XRP(10)));
             auto const objTxnID = to_string(objTxn.stx->getTransactionID());
-            env(objTxn, ter(tecNO_ENTRY));
+            env(objTxn, Ter(tecNO_ENTRY));
 
             env.close();
             {
@@ -3683,7 +3683,7 @@ class Batch_test : public beast::unit_test::suite
         BEAST_EXPECT(!passesLocalChecks(stx, reason));
         BEAST_EXPECT(reason == "Cannot submit pseudo transactions.");
         env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-            auto const result = xrpl::apply(env.app(), view, stx, tapNONE, j);
+            auto const result = xrpl::apply(env.app(), view, stx, TapNone, j);
             BEAST_EXPECT(!result.applied && result.ter == temINVALID_FLAG);
             return result.applied;
         });
@@ -3712,7 +3712,7 @@ class Batch_test : public beast::unit_test::suite
         env.fund(XRP(10000), alice, bob);
         env.close();
 
-        env(noop(bob), ter(tesSUCCESS));
+        env(noop(bob), Ter(tesSUCCESS));
         env.close();
 
         auto const aliceSeq = env.seq(alice);
@@ -3721,9 +3721,9 @@ class Batch_test : public beast::unit_test::suite
         auto const bobSeq = env.seq(bob);
 
         // Alice Pays Bob (Open Ledger)
-        auto const payTxn1 = env.jt(pay(alice, bob, XRP(10)), seq(aliceSeq));
+        auto const payTxn1 = env.jt(pay(alice, bob, XRP(10)), Seq(aliceSeq));
         auto const payTxn1ID = to_string(payTxn1.stx->getTransactionID());
-        env(payTxn1, ter(tesSUCCESS));
+        env(payTxn1, Ter(tesSUCCESS));
 
         // Alice & Bob Atomic Batch
         auto const batchFee = batch::calcBatchFee(env, 1, 2);
@@ -3731,14 +3731,14 @@ class Batch_test : public beast::unit_test::suite
             env,
             tesSUCCESS,
             batch::outer(alice, aliceSeq + 1, batchFee, tfAllOrNothing),
-            batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 2),
-            batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-            batch::sig(bob));
+            batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 2),
+            batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+            batch::Sig(bob));
 
         // Bob pays Alice (Open Ledger)
-        auto const payTxn2 = env.jt(pay(bob, alice, XRP(5)), seq(bobSeq + 1));
+        auto const payTxn2 = env.jt(pay(bob, alice, XRP(5)), Seq(bobSeq + 1));
         auto const payTxn2ID = to_string(payTxn2.stx->getTransactionID());
-        env(payTxn2, ter(terPRE_SEQ));
+        env(payTxn2, Ter(terPRE_SEQ));
         env.close();
 
         std::vector<TestLedgerData> const testCases = {
@@ -3784,7 +3784,7 @@ class Batch_test : public beast::unit_test::suite
                 makeSmallQueueConfig({{"minimum_txn_in_ledger_standalone", "2"}}),
                 features,
                 nullptr,
-                beast::severities::kError};
+                beast::severities::KError};
 
             auto alice = Account("alice");
             auto bob = Account("bob");
@@ -3802,7 +3802,7 @@ class Batch_test : public beast::unit_test::suite
             env(noop(alice));
             checkMetrics(*this, env, 0, std::nullopt, 3, 2);
 
-            env(noop(carol), ter(terQUEUED));
+            env(noop(carol), Ter(terQUEUED));
             checkMetrics(*this, env, 1, std::nullopt, 3, 2);
 
             auto const aliceSeq = env.seq(alice);
@@ -3812,10 +3812,10 @@ class Batch_test : public beast::unit_test::suite
             // Queue Batch
             {
                 env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                    batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                    batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                    batch::sig(bob),
-                    ter(terQUEUED));
+                    batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                    batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                    batch::Sig(bob),
+                    Ter(terQUEUED));
             }
 
             checkMetrics(*this, env, 2, std::nullopt, 3, 2);
@@ -3823,10 +3823,10 @@ class Batch_test : public beast::unit_test::suite
             // Replace Queued Batch
             {
                 env(batch::outer(alice, aliceSeq, openLedgerFee(env, batchFee), tfAllOrNothing),
-                    batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                    batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                    batch::sig(bob),
-                    ter(tesSUCCESS));
+                    batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                    batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                    batch::Sig(bob),
+                    Ter(tesSUCCESS));
                 env.close();
             }
 
@@ -3840,7 +3840,7 @@ class Batch_test : public beast::unit_test::suite
                 makeSmallQueueConfig({{"minimum_txn_in_ledger_standalone", "2"}}),
                 features,
                 nullptr,
-                beast::severities::kError};
+                beast::severities::KError};
 
             auto alice = Account("alice");
             auto bob = Account("bob");
@@ -3864,15 +3864,15 @@ class Batch_test : public beast::unit_test::suite
             // Batch Successful
             {
                 env(batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
-                    batch::inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
-                    batch::inner(pay(bob, alice, XRP(5)), bobSeq),
-                    batch::sig(bob),
-                    ter(tesSUCCESS));
+                    batch::Inner(pay(alice, bob, XRP(10)), aliceSeq + 1),
+                    batch::Inner(pay(bob, alice, XRP(5)), bobSeq),
+                    batch::Sig(bob),
+                    Ter(tesSUCCESS));
             }
 
             checkMetrics(*this, env, 0, std::nullopt, 3, 2);
 
-            env(noop(carol), ter(terQUEUED));
+            env(noop(carol), Ter(terQUEUED));
             checkMetrics(*this, env, 1, std::nullopt, 3, 2);
         }
     }
@@ -3885,7 +3885,7 @@ class Batch_test : public beast::unit_test::suite
         using namespace test::jtx;
         using namespace std::literals;
 
-        Env env(*this, envconfig(), features, nullptr, beast::severities::kDisabled);
+        Env env(*this, envconfig(), features, nullptr, beast::severities::KDisabled);
 
         auto alice = Account("alice");
         auto bob = Account("bob");
@@ -3893,7 +3893,7 @@ class Batch_test : public beast::unit_test::suite
         env.close();
 
         auto submitTx = [&](std::uint32_t flags) -> uint256 {
-            auto jt = env.jt(pay(alice, bob, XRP(1)), txflags(flags));
+            auto jt = env.jt(pay(alice, bob, XRP(1)), Txflags(flags));
             Serializer s;
             jt.stx->add(s);
             env.app().getOPs().submitTransaction(jt.stx);
@@ -3901,13 +3901,13 @@ class Batch_test : public beast::unit_test::suite
         };
 
         auto processTxn = [&](std::uint32_t flags) -> uint256 {
-            auto jt = env.jt(pay(alice, bob, XRP(1)), txflags(flags));
+            auto jt = env.jt(pay(alice, bob, XRP(1)), Txflags(flags));
             Serializer s;
             jt.stx->add(s);
             std::string reason;
             auto transaction = std::make_shared<Transaction>(jt.stx, reason, env.app());
             env.app().getOPs().processTransaction(
-                transaction, false, true, NetworkOPs::FailHard::yes);
+                transaction, false, true, NetworkOPs::FailHard::Yes);
             return transaction->getID();
         };
 
@@ -3941,7 +3941,7 @@ class Batch_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
 
@@ -3954,14 +3954,14 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             auto const seq = env.seq(alice);
 
-            auto tx = batch::inner(pay(alice, bob, XRP(1)), seq + 1);
+            auto tx = batch::Inner(pay(alice, bob, XRP(1)), seq + 1);
             tx[jss::Delegate] = bob.human();
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx,
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -3987,7 +3987,7 @@ class Batch_test : public beast::unit_test::suite
             auto const bob = Account("bob");
             auto const carol = Account("carol");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
 
@@ -4002,15 +4002,15 @@ class Batch_test : public beast::unit_test::suite
             auto const aliceSeq = env.seq(alice);
             auto const bobSeq = env.seq(bob);
 
-            auto tx = batch::inner(pay(bob, alice, XRP(1)), bobSeq);
+            auto tx = batch::Inner(pay(bob, alice, XRP(1)), bobSeq);
             tx[jss::Delegate] = carol.human();
             auto const [txIDs, batchID] = submitBatch(
                 env,
                 tesSUCCESS,
                 batch::outer(alice, aliceSeq, batchFee, tfAllOrNothing),
                 tx,
-                batch::inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
-                batch::sig(bob));
+                batch::Inner(pay(alice, bob, XRP(2)), aliceSeq + 1),
+                batch::Sig(bob));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -4038,7 +4038,7 @@ class Batch_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
 
@@ -4051,7 +4051,7 @@ class Batch_test : public beast::unit_test::suite
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
             auto const seq = env.seq(alice);
 
-            auto tx = batch::inner(noop(alice), seq + 1);
+            auto tx = batch::Inner(noop(alice), seq + 1);
             std::string const domain = "example.com";
             tx[sfDomain.jsonName] = strHex(domain);
             tx[jss::Delegate] = bob.human();
@@ -4060,7 +4060,7 @@ class Batch_test : public beast::unit_test::suite
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
                 tx,
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -4101,7 +4101,7 @@ class Batch_test : public beast::unit_test::suite
             auto const seq = env.seq(alice);
             auto const batchFee = batch::calcBatchFee(env, 0, 2);
 
-            Json::Value jv1;
+            json::Value jv1;
             jv1[sfTransactionType] = jss::MPTokenIssuanceSet;
             jv1[sfAccount] = alice.human();
             jv1[sfDelegate] = bob.human();
@@ -4109,7 +4109,7 @@ class Batch_test : public beast::unit_test::suite
             jv1[sfMPTokenIssuanceID] = to_string(mptID);
             jv1[sfFlags] = tfMPTLock;
 
-            Json::Value jv2;
+            json::Value jv2;
             jv2[sfTransactionType] = jss::MPTokenIssuanceSet;
             jv2[sfAccount] = alice.human();
             jv2[sfDelegate] = bob.human();
@@ -4121,8 +4121,8 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(jv1, seq + 1),
-                batch::inner(jv2, seq + 2));
+                batch::Inner(jv1, seq + 1),
+                batch::Inner(jv2, seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -4162,8 +4162,8 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(gw, seq, batchFee, tfAllOrNothing),
-                batch::inner(jv1, seq + 1),
-                batch::inner(jv2, seq + 2));
+                batch::Inner(jv1, seq + 1),
+                batch::Inner(jv2, seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -4201,9 +4201,9 @@ class Batch_test : public beast::unit_test::suite
                 env,
                 tesSUCCESS,
                 batch::outer(gw, seq, batchFee, tfIndependent),
-                batch::inner(jv1, seq + 1),
+                batch::Inner(jv1, seq + 1),
                 // terNO_DELEGATE_PERMISSION: not authorized to clear freeze
-                batch::inner(jv2, seq + 2));
+                batch::Inner(jv2, seq + 2));
             env.close();
 
             std::vector<TestLedgerData> const testCases = {
@@ -4258,7 +4258,7 @@ class Batch_test : public beast::unit_test::suite
             auto const baseFee = env.current()->fees().base;
             auto const aliceSeq = env.seq(alice);
             env(fset(bob, asfRequireDest));
-            auto jtx = env.jt(pay(alice, bob, XRP(1)), seq(aliceSeq));
+            auto jtx = env.jt(pay(alice, bob, XRP(1)), Seq(aliceSeq));
 
             Serializer s;
             jtx.stx->add(s);
@@ -4278,7 +4278,7 @@ class Batch_test : public beast::unit_test::suite
         {
             auto const baseFee = env.current()->fees().base;
             auto const aliceSeq = env.seq(alice);
-            auto jtx = env.jt(pay(alice, bob, XRP(1)), seq(aliceSeq + 1));
+            auto jtx = env.jt(pay(alice, bob, XRP(1)), Seq(aliceSeq + 1));
 
             Serializer s;
             jtx.stx->add(s);
@@ -4318,10 +4318,10 @@ class Batch_test : public beast::unit_test::suite
             XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
             auto jtx = env.jt(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(batch::outer(alice, seq, batchFee, tfAllOrNothing), seq),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2));
+                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(INITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
         }
 
         // bad: Raw Transactions array exceeds max entries.
@@ -4331,18 +4331,18 @@ class Batch_test : public beast::unit_test::suite
 
             auto jtx = env.jt(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 4),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 5),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 6),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 7),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 8),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 9));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 4),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 5),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 6),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 7),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 8),
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 9));
 
             XRPAmount const txBaseFee = getBaseFee(jtx);
-            BEAST_EXPECT(txBaseFee == XRPAmount(INITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
         }
 
         // bad: Signers array exceeds max entries.
@@ -4352,11 +4352,11 @@ class Batch_test : public beast::unit_test::suite
 
             auto jtx = env.jt(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(5)), seq + 2),
-                batch::sig(bob, carol, alice, bob, carol, alice, bob, carol, alice, alice));
+                batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+                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(INITIAL_XRP));
+            BEAST_EXPECT(txBaseFee == XRPAmount(kINITIAL_XRP));
         }
 
         // good:
@@ -4365,8 +4365,8 @@ class Batch_test : public beast::unit_test::suite
             XRPAmount const batchFee = batch::calcBatchFee(env, 0, 2);
             auto jtx = env.jt(
                 batch::outer(alice, seq, batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(bob, alice, XRP(2)), seq + 2));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(bob, alice, XRP(2)), seq + 2));
             XRPAmount const txBaseFee = getBaseFee(jtx);
             BEAST_EXPECT(txBaseFee == batchFee);
         }
@@ -4413,7 +4413,7 @@ public:
     {
         using namespace test::jtx;
 
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeats(sa - fixBatchInnerSigs);
         testWithFeats(sa);
     }
diff --git a/src/test/app/CheckMPT_test.cpp b/src/test/app/CheckMPT_test.cpp
index fb9d413e6e..418b7a4a71 100644
--- a/src/test/app/CheckMPT_test.cpp
+++ b/src/test/app/CheckMPT_test.cpp
@@ -51,7 +51,7 @@
 
 namespace xrpl {
 
-class CheckMPT_test : public beast::unit_test::suite
+class CheckMPT_test : public beast::unit_test::Suite
 {
     // Helper function that returns the Checks on an account.
     static std::vector<std::shared_ptr<SLE const>>
@@ -73,11 +73,11 @@ class CheckMPT_test : public beast::unit_test::suite
     verifyDeliveredAmount(test::jtx::Env& env, STAmount const& amount)
     {
         // Get the hash for the most recent transaction.
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
         // Verify DeliveredAmount and delivered_amount metadata are correct.
         env.close();
-        Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         // Expect there to be a DeliveredAmount field.
         if (!BEAST_EXPECT(meta.isMember(sfDeliveredAmount.jsonName)))
@@ -85,8 +85,8 @@ class CheckMPT_test : public beast::unit_test::suite
 
         // DeliveredAmount and delivered_amount should both be present and
         // equal amount.
-        BEAST_EXPECT(meta[sfDeliveredAmount.jsonName] == amount.getJson(JsonOptions::none));
-        BEAST_EXPECT(meta[jss::delivered_amount] == amount.getJson(JsonOptions::none));
+        BEAST_EXPECT(meta[sfDeliveredAmount.jsonName] == amount.getJson(JsonOptions::KNone));
+        BEAST_EXPECT(meta[jss::delivered_amount] == amount.getJson(JsonOptions::KNone));
     }
 
     void
@@ -106,12 +106,12 @@ class CheckMPT_test : public beast::unit_test::suite
         STAmount const startBalance{XRP(1'000).value()};
         env.fund(startBalance, gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = MPTTester({.env = env, .issuer = gw});
 
         // Note that no MPToken has been set up for alice, but alice can
         // still write a check for USD.  You don't have to have the funds
         // necessary to cover a check in order to write a check.
-        auto writeTwoChecks = [&env, &USD, this](Account const& from, Account const& to) {
+        auto writeTwoChecks = [&env, &usd, this](Account const& from, Account const& to) {
             std::uint32_t const fromOwnerCount{ownerCount(env, from)};
             std::uint32_t const toOwnerCount{ownerCount(env, to)};
 
@@ -121,14 +121,14 @@ class CheckMPT_test : public beast::unit_test::suite
             env(check::create(from, to, XRP(2000)));
             env.close();
 
-            env(check::create(from, to, USD(50)));
+            env(check::create(from, to, usd(50)));
             env.close();
 
             BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount + 2);
             BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount + 2);
 
-            env.require(owners(from, fromOwnerCount + 2));
-            env.require(owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
+            env.require(Owners(from, fromOwnerCount + 2));
+            env.require(Owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
         };
         //  from     to
         writeTwoChecks(alice, bob);
@@ -142,44 +142,44 @@ class CheckMPT_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         std::size_t const aliceCount{checksOnAccount(env, alice).size()};
         std::size_t const bobCount{checksOnAccount(env, bob).size()};
-        env(check::create(alice, bob, USD(50)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now() + 1s));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), source_tag(2));
+        env(check::create(alice, bob, usd(50)), SourceTag(2));
         env.close();
-        env(check::create(alice, bob, USD(50)), dest_tag(3));
+        env(check::create(alice, bob, usd(50)), DestTag(3));
         env.close();
-        env(check::create(alice, bob, USD(50)), invoice_id(uint256{4}));
+        env(check::create(alice, bob, usd(50)), InvoiceId(uint256{4}));
         env.close();
-        env(check::create(alice, bob, USD(50)),
-            expiration(env.now() + 1s),
-            source_tag(12),
-            dest_tag(13),
-            invoice_id(uint256{4}));
+        env(check::create(alice, bob, usd(50)),
+            Expiration(env.now() + 1s),
+            SourceTag(12),
+            DestTag(13),
+            InvoiceId(uint256{4}));
         env.close();
 
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 5);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 5);
 
         // Use a regular key and also multisign to create a check.
-        Account const alie{"alie", KeyType::ed25519};
+        Account const alie{"alie", KeyType::Ed25519};
         env(regkey(alice, alie));
         env.close();
 
-        Account const bogie{"bogie", KeyType::secp256k1};
-        Account const demon{"demon", KeyType::ed25519};
-        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), sig(alie));
+        Account const bogie{"bogie", KeyType::Secp256k1};
+        Account const demon{"demon", KeyType::Ed25519};
+        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), Sig(alie));
         env.close();
 
         // alice uses her regular key to create a check.
-        env(check::create(alice, bob, USD(50)), sig(alie));
+        env(check::create(alice, bob, usd(50)), Sig(alie));
         env.close();
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 6);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 6);
 
         // alice uses multisigning to create a check.
         XRPAmount const baseFeeDrops{env.current()->fees().base};
-        env(check::create(alice, bob, USD(50)), msig(bogie, demon), fee(3 * baseFeeDrops));
+        env(check::create(alice, bob, usd(50)), Msig(bogie, demon), Fee(3 * baseFeeDrops));
         env.close();
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 7);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 7);
@@ -201,13 +201,13 @@ class CheckMPT_test : public beast::unit_test::suite
         STAmount const startBalance{XRP(1'000).value()};
         env.fund(startBalance, gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = MPTTester({.env = env, .issuer = gw});
 
         /*
          * Attempt to create two checks from `from` to `to` and
          * require they both result in error/success code `expected`
          */
-        auto writeTwoChecksDI = [&env, &USD, this](
+        auto writeTwoChecksDI = [&env, &usd, this](
                                     Account const& from, Account const& to, TER expected) {
             std::uint32_t const fromOwnerCount{ownerCount(env, from)};
             std::uint32_t const toOwnerCount{ownerCount(env, to)};
@@ -215,10 +215,10 @@ class CheckMPT_test : public beast::unit_test::suite
             std::size_t const fromCkCount{checksOnAccount(env, from).size()};
             std::size_t const toCkCount{checksOnAccount(env, to).size()};
 
-            env(check::create(from, to, XRP(2000)), ter(expected));
+            env(check::create(from, to, XRP(2000)), Ter(expected));
             env.close();
 
-            env(check::create(from, to, USD(50)), ter(expected));
+            env(check::create(from, to, usd(50)), Ter(expected));
             env.close();
 
             if (expected == tesSUCCESS)
@@ -226,16 +226,16 @@ class CheckMPT_test : public beast::unit_test::suite
                 BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount + 2);
                 BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount + 2);
 
-                env.require(owners(from, fromOwnerCount + 2));
-                env.require(owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
+                env.require(Owners(from, fromOwnerCount + 2));
+                env.require(Owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
                 return;
             }
 
             BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount);
             BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount);
 
-            env.require(owners(from, fromOwnerCount));
-            env.require(owners(to, to == from ? fromOwnerCount : toOwnerCount));
+            env.require(Owners(from, fromOwnerCount));
+            env.require(Owners(to, to == from ? fromOwnerCount : toOwnerCount));
         };
 
         // enable the DisallowIncoming flag on both bob and alice
@@ -282,64 +282,64 @@ 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 = MPTDEXFlags | tfMPTCanLock});
-        MPT const USD = USDM;
+        auto usdm = MPTTester({.env = env, .issuer = gw1, .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
+        MPT const usd = usdm;
 
         // Bad fee.
-        env(check::create(alice, bob, USD(50)), fee(drops(-10)), ter(temBAD_FEE));
+        env(check::create(alice, bob, usd(50)), Fee(drops(-10)), Ter(temBAD_FEE));
         env.close();
 
         // Bad flags.
-        env(check::create(alice, bob, USD(50)), txflags(tfImmediateOrCancel), ter(temINVALID_FLAG));
+        env(check::create(alice, bob, usd(50)), Txflags(tfImmediateOrCancel), Ter(temINVALID_FLAG));
         env.close();
 
         // Check to self.
-        env(check::create(alice, alice, XRP(10)), ter(temREDUNDANT));
+        env(check::create(alice, alice, XRP(10)), Ter(temREDUNDANT));
         env.close();
 
         // Bad amount.
-        env(check::create(alice, bob, drops(-1)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, drops(-1)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, drops(0)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, drops(0)), Ter(temBAD_AMOUNT));
         env.close();
 
         env(check::create(alice, bob, drops(1)));
         env.close();
 
-        env(check::create(alice, bob, USD(-1)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, usd(-1)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, USD(0)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, usd(0)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
         {
-            MPT const BAD(makeMptID(0, xrpAccount()));
-            env(check::create(alice, bob, BAD(2)), ter(temBAD_CURRENCY));
+            MPT const bad(makeMptID(0, xrpAccount()));
+            env(check::create(alice, bob, bad(2)), Ter(temBAD_CURRENCY));
             env.close();
         }
 
         // Bad expiration.
-        env(check::create(alice, bob, USD(50)),
-            expiration(NetClock::time_point{}),
-            ter(temBAD_EXPIRATION));
+        env(check::create(alice, bob, usd(50)),
+            Expiration(NetClock::time_point{}),
+            Ter(temBAD_EXPIRATION));
         env.close();
 
         // Destination does not exist.
         Account const bogie{"bogie"};
-        env(check::create(alice, bogie, USD(50)), ter(tecNO_DST));
+        env(check::create(alice, bogie, usd(50)), Ter(tecNO_DST));
         env.close();
 
         // Require destination tag.
         env(fset(bob, asfRequireDest));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), ter(tecDST_TAG_NEEDED));
+        env(check::create(alice, bob, usd(50)), Ter(tecDST_TAG_NEEDED));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), dest_tag(11));
+        env(check::create(alice, bob, usd(50)), DestTag(11));
         env.close();
 
         env(fclear(bob, asfRequireDest));
@@ -347,78 +347,79 @@ class CheckMPT_test : public beast::unit_test::suite
         {
             // Globally frozen asset.
             env.close();
-            auto USFM = MPTTester({.env = env, .issuer = gwF, .flags = MPTDEXFlags | tfMPTCanLock});
-            MPT const USF = USFM;
-            USFM.set({.flags = tfMPTLock});
+            auto usfm =
+                MPTTester({.env = env, .issuer = gwF, .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
+            MPT const usf = usfm;
+            usfm.set({.flags = tfMPTLock});
 
-            env(check::create(alice, bob, USF(50)), ter(tecLOCKED));
+            env(check::create(alice, bob, usf(50)), Ter(tecLOCKED));
             env.close();
 
-            USFM.set({.flags = tfMPTUnlock});
+            usfm.set({.flags = tfMPTUnlock});
 
-            env(check::create(alice, bob, USF(50)));
+            env(check::create(alice, bob, usf(50)));
             env.close();
         }
         {
             // Frozen MPT.  Check creation should be similar to payment
             // behavior in the face of locked MPT.
-            USDM.authorizeHolders({alice, bob});
-            env(pay(gw1, alice, USD(25)));
-            env(pay(gw1, bob, USD(25)));
+            usdm.authorizeHolders({alice, bob});
+            env(pay(gw1, alice, usd(25)));
+            env(pay(gw1, bob, usd(25)));
             env.close();
 
-            USDM.set({.holder = alice, .flags = tfMPTLock});
+            usdm.set({.holder = alice, .flags = tfMPTLock});
             // Setting MPT locked prevents alice from
             // creating a check for USD ore receiving a check. This is different
             // from IOU where alice can receive checks from bob or gw.
             env.close();
-            env(check::create(alice, bob, USD(50)), ter(tecLOCKED));
+            env(check::create(alice, bob, usd(50)), Ter(tecLOCKED));
             env.close();
             // Note that IOU returns tecPATH_DRY in this case.
             // IOU's internal error is terNO_LINE, which is
             // considered ter re-triable and changed to tecPATH_DRY.
-            env(pay(alice, bob, USD(1)), ter(tecPATH_DRY));
+            env(pay(alice, bob, usd(1)), Ter(tecPATH_DRY));
             env.close();
-            env(check::create(bob, alice, USD(50)), ter(tecLOCKED));
+            env(check::create(bob, alice, usd(50)), Ter(tecLOCKED));
             env.close();
-            env(pay(bob, alice, USD(1)), ter(tecPATH_DRY));
+            env(pay(bob, alice, usd(1)), Ter(tecPATH_DRY));
             env.close();
-            env(check::create(gw1, alice, USD(50)), ter(tecLOCKED));
+            env(check::create(gw1, alice, usd(50)), Ter(tecLOCKED));
             env.close();
-            env(pay(gw1, alice, USD(1)));
+            env(pay(gw1, alice, usd(1)));
             env.close();
 
             // Clear that lock.  Now check creation works.
-            USDM.set({.holder = alice, .flags = tfMPTUnlock});
-            env(check::create(alice, bob, USD(50)));
+            usdm.set({.holder = alice, .flags = tfMPTUnlock});
+            env(check::create(alice, bob, usd(50)));
             env.close();
-            env(check::create(bob, alice, USD(50)));
+            env(check::create(bob, alice, usd(50)));
             env.close();
-            env(check::create(gw1, alice, USD(50)));
+            env(check::create(gw1, alice, usd(50)));
             env.close();
         }
 
         // Expired expiration.
-        env(check::create(alice, bob, USD(50)), expiration(env.now()), ter(tecEXPIRED));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now()), Ter(tecEXPIRED));
         env.close();
 
         using namespace std::chrono_literals;
-        env(check::create(alice, bob, USD(50)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now() + 1s));
         env.close();
 
         // Insufficient reserve.
         Account const cheri{"cheri"};
         env.fund(env.current()->fees().accountReserve(1) - drops(1), cheri);
 
-        env(check::create(cheri, bob, USD(50)),
-            fee(drops(env.current()->fees().base)),
-            ter(tecINSUFFICIENT_RESERVE));
+        env(check::create(cheri, bob, usd(50)),
+            Fee(drops(env.current()->fees().base)),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
 
         env(pay(bob, cheri, drops(env.current()->fees().base + 1)));
         env.close();
 
-        env(check::create(cheri, bob, USD(50)));
+        env(check::create(cheri, bob, usd(50)));
         env.close();
     }
 
@@ -439,64 +440,64 @@ class CheckMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, bob);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 105});
 
             // alice writes the check before she gets the funds.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(100)));
+            env(check::create(alice, bob, usd(100)));
             env.close();
 
             // bob attempts to cash the check.  Should fail.
-            env(check::cash(bob, chkId1, USD(100)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(100)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // alice gets almost enough funds.  bob tries and fails again.
-            env(pay(gw, alice, USD(95)));
+            env(pay(gw, alice, usd(95)));
             env.close();
-            env(check::cash(bob, chkId1, USD(100)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(100)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // alice gets the last of the necessary funds.
-            env(pay(gw, alice, USD(5)));
+            env(pay(gw, alice, usd(5)));
             env.close();
 
             // bob for more than the check's SendMax.
             env.close();
-            env(check::cash(bob, chkId1, USD(105)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(105)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob asks for exactly the check amount and the check clears.
             // MPT is authorized automatically
-            env(check::cash(bob, chkId1, USD(100)));
+            env(check::cash(bob, chkId1, usd(100)));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(100)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob tries to cash the same check again, which fails.
-            env(check::cash(bob, chkId1, USD(100)), ter(tecNO_ENTRY));
+            env(check::cash(bob, chkId1, usd(100)), Ter(tecNO_ENTRY));
             env.close();
 
             // bob pays alice USD(70) so he can try another case.
-            env(pay(bob, alice, USD(70)));
+            env(pay(bob, alice, usd(70)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(70)));
+            env(check::create(alice, bob, usd(70)));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
 
             // bob cashes the check for less than the face amount.  That works,
             // consumes the check, and bob receives as much as he asked for.
-            env(check::cash(bob, chkId2, USD(50)));
+            env(check::cash(bob, chkId2, usd(50)));
             env.close();
-            env.require(balance(alice, USD(20)));
-            env.require(balance(bob, USD(80)));
+            env.require(Balance(alice, usd(20)));
+            env.require(Balance(bob, usd(80)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -505,19 +506,19 @@ class CheckMPT_test : public beast::unit_test::suite
             // alice writes two checks for USD(20), although she only has
             // USD(20).
             uint256 const chkId3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(20)));
+            env(check::create(alice, bob, usd(20)));
             env.close();
             uint256 const chkId4{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(20)));
+            env(check::create(alice, bob, usd(20)));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 2);
 
             // bob cashes the second check for the face amount.
-            env(check::cash(bob, chkId4, USD(20)));
+            env(check::cash(bob, chkId4, usd(20)));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(100)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -525,10 +526,10 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // bob is not allowed to cash the last check for USD(0), he must
             // use check::cancel instead.
-            env(check::cash(bob, chkId3, USD(0)), ter(temBAD_AMOUNT));
+            env(check::cash(bob, chkId3, usd(0)), Ter(temBAD_AMOUNT));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(100)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -542,29 +543,29 @@ class CheckMPT_test : public beast::unit_test::suite
                 // neither a payment to bob or caching can exceed that limit.
 
                 // Payment of 200 USD fails.
-                env(pay(gw, bob, USD(200)), ter(tecPATH_PARTIAL));
+                env(pay(gw, bob, usd(200)), Ter(tecPATH_PARTIAL));
                 env.close();
 
                 uint256 const chkId20{getCheckIndex(gw, env.seq(gw))};
-                env(check::create(gw, bob, USD(200)));
+                env(check::create(gw, bob, usd(200)));
                 env.close();
 
                 // Cashing a check for 200 USD fails.
-                env(check::cash(bob, chkId20, USD(200)), ter(tecPATH_PARTIAL));
+                env(check::cash(bob, chkId20, usd(200)), Ter(tecPATH_PARTIAL));
                 env.close();
-                env.require(balance(bob, USD(100)));
+                env.require(Balance(bob, usd(100)));
 
                 // Clean up this most recent experiment so the rest of the
                 // tests work.
-                env(pay(bob, gw, USD(100)));
+                env(pay(bob, gw, usd(100)));
                 env(check::cancel(bob, chkId20));
             }
 
             // ... so bob cancels alice's remaining check.
             env(check::cancel(bob, chkId3));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(0)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(0)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -576,66 +577,66 @@ class CheckMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, bob);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 20});
 
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // alice creates several checks ahead of time.
             uint256 const chkId9{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(9)));
+            env(check::create(alice, bob, usd(9)));
             env.close();
             uint256 const chkId8{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(8)));
+            env(check::create(alice, bob, usd(8)));
             env.close();
             uint256 const chkId7{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(7)));
+            env(check::create(alice, bob, usd(7)));
             env.close();
             uint256 const chkId6{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(6)));
+            env(check::create(alice, bob, usd(6)));
             env.close();
 
             // bob attempts to cash a check for the amount on the check.
             // Should fail, since alice doesn't have the funds.
-            env(check::cash(bob, chkId9, check::DeliverMin(USD(9))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId9, check::DeliverMin(usd(9))), Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob sets a DeliverMin of 7 and gets all that alice has.
-            env(check::cash(bob, chkId9, check::DeliverMin(USD(7))));
-            verifyDeliveredAmount(env, USD(8));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId9, check::DeliverMin(usd(7))));
+            verifyDeliveredAmount(env, usd(8));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 3);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 3);
             BEAST_EXPECT(ownerCount(env, alice) == 4);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob pays alice USD(7) so he can use another check.
-            env(pay(bob, alice, USD(7)));
+            env(pay(bob, alice, usd(7)));
             env.close();
 
             // Using DeliverMin for the SendMax value of the check (and no
             // transfer fees) should work just like setting Amount.
-            env(check::cash(bob, chkId7, check::DeliverMin(USD(7))));
-            verifyDeliveredAmount(env, USD(7));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId7, check::DeliverMin(usd(7))));
+            verifyDeliveredAmount(env, usd(7));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 2);
             BEAST_EXPECT(ownerCount(env, alice) == 3);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob pays alice USD(8) so he can use the last two checks.
-            env(pay(bob, alice, USD(8)));
+            env(pay(bob, alice, usd(8)));
             env.close();
 
             // alice has USD(8). If bob uses the check for USD(6) and uses a
             // DeliverMin of 4, he should get the SendMax value of the check.
-            env(check::cash(bob, chkId6, check::DeliverMin(USD(4))));
-            verifyDeliveredAmount(env, USD(6));
-            env.require(balance(alice, USD(2)));
-            env.require(balance(bob, USD(6)));
+            env(check::cash(bob, chkId6, check::DeliverMin(usd(4))));
+            verifyDeliveredAmount(env, usd(6));
+            env.require(Balance(alice, usd(2)));
+            env.require(Balance(bob, usd(6)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -643,10 +644,10 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // bob cashes the last remaining check setting a DeliverMin.
             // of exactly alice's remaining USD.
-            env(check::cash(bob, chkId8, check::DeliverMin(USD(2))));
-            verifyDeliveredAmount(env, USD(2));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId8, check::DeliverMin(usd(2))));
+            verifyDeliveredAmount(env, usd(2));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -657,44 +658,44 @@ class CheckMPT_test : public beast::unit_test::suite
             Env env(*this, features);
 
             env.fund(XRP(1000), gw, alice, bob);
-            auto USDM = MPTTester(
+            auto usdm = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
-                 .flags = MPTDEXFlags | tfMPTRequireAuth,
+                 .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
                  .maxAmt = 20});
-            MPT const USD = USDM;
-            USDM.authorize({.holder = alice});
+            MPT const usd = usdm;
+            usdm.authorize({.holder = alice});
             env.close();
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // alice writes a check to bob for USD.  bob can't cash it
             // because he is not authorized to hold gw["USD"].
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(7)));
+            env(check::create(alice, bob, usd(7)));
             env.close();
 
-            env(check::cash(bob, chkId, USD(7)), ter(tecNO_AUTH));
+            env(check::cash(bob, chkId, usd(7)), Ter(tecNO_AUTH));
             env.close();
 
             // Now give bob MPT for USD.  bob still can't cash the
             // check because he is not authorized.
-            USDM.authorize({.account = bob});
+            usdm.authorize({.account = bob});
             env.close();
 
-            env(check::cash(bob, chkId, USD(7)), ter(tecNO_AUTH));
+            env(check::cash(bob, chkId, usd(7)), Ter(tecNO_AUTH));
             env.close();
 
             // bob gets authorization to hold USD.
-            USDM.authorize({.holder = bob});
+            usdm.authorize({.holder = bob});
             env.close();
 
-            env(check::cash(bob, chkId, check::DeliverMin(USD(4))));
-            STAmount const bobGot = USD(7);
+            env(check::cash(bob, chkId, check::DeliverMin(usd(4))));
+            STAmount const bobGot = usd(7);
             verifyDeliveredAmount(env, bobGot);
-            env.require(balance(alice, USD(8) - bobGot));
-            env.require(balance(bob, bobGot));
+            env.require(Balance(alice, usd(8) - bobGot));
+            env.require(Balance(bob, bobGot));
 
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
@@ -707,39 +708,39 @@ class CheckMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, bob);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 20});
 
             // alice creates her checks ahead of time.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(1)));
+            env(check::create(alice, bob, usd(1)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(2)));
+            env(check::create(alice, bob, usd(2)));
             env.close();
 
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // Give bob a regular key and signers
-            Account const bobby{"bobby", KeyType::secp256k1};
+            Account const bobby{"bobby", KeyType::Secp256k1};
             env(regkey(bob, bobby));
             env.close();
 
-            Account const bogie{"bogie", KeyType::secp256k1};
-            Account const demon{"demon", KeyType::ed25519};
-            env(signers(bob, 2, {{bogie, 1}, {demon, 1}}), sig(bobby));
+            Account const bogie{"bogie", KeyType::Secp256k1};
+            Account const demon{"demon", KeyType::Ed25519};
+            env(signers(bob, 2, {{bogie, 1}, {demon, 1}}), Sig(bobby));
             env.close();
 
             int const signersCount = 1;
             BEAST_EXPECT(ownerCount(env, bob) == signersCount + 1);
 
             // bob uses his regular key to cash a check.
-            env(check::cash(bob, chkId1, (USD(1))), sig(bobby));
+            env(check::cash(bob, chkId1, (usd(1))), Sig(bobby));
             env.close();
-            env.require(balance(alice, USD(7)));
-            env.require(balance(bob, USD(1)));
+            env.require(Balance(alice, usd(7)));
+            env.require(Balance(bob, usd(1)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -747,10 +748,10 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // bob uses multisigning to cash a check.
             XRPAmount const baseFeeDrops{env.current()->fees().base};
-            env(check::cash(bob, chkId2, (USD(2))), msig(bogie, demon), fee(3 * baseFeeDrops));
+            env(check::cash(bob, chkId2, (usd(2))), Msig(bogie, demon), Fee(3 * baseFeeDrops));
             env.close();
-            env.require(balance(alice, USD(5)));
-            env.require(balance(bob, USD(3)));
+            env.require(Balance(alice, usd(5)));
+            env.require(Balance(bob, usd(3)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -775,7 +776,7 @@ class CheckMPT_test : public beast::unit_test::suite
         env.fund(XRP(1'000), gw, alice, bob);
 
         // Set gw's transfer rate and see the consequences when cashing a check.
-        MPT const USD = MPTTester(
+        MPT const usd = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {alice, bob},
@@ -783,36 +784,36 @@ class CheckMPT_test : public beast::unit_test::suite
              .maxAmt = 1'000});
 
         env.close();
-        env(pay(gw, alice, USD(1'000)));
+        env(pay(gw, alice, usd(1'000)));
         env.close();
 
         // alice writes a check with a SendMax of USD(125).  The most bob
         // can get is USD(100) because of the transfer rate.
         uint256 const chkId125{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(125)));
+        env(check::create(alice, bob, usd(125)));
         env.close();
 
         // alice writes another check that won't get cashed until the transfer
         // rate changes so we can see the rate applies when the check is
         // cashed, not when it is created.
 #if 0
-        uint256 const chkId120{getCheckIndex(alice, env.seq(alice))};
+        uint256 const chkId120{getCheckIndex(alice, env.Seq(alice))};
         env(check::create(alice, bob, USD(120)));
         env.close();
 #endif
 
         // bob attempts to cash the check for face value.  Should fail.
-        env(check::cash(bob, chkId125, USD(125)), ter(tecPATH_PARTIAL));
+        env(check::cash(bob, chkId125, usd(125)), Ter(tecPATH_PARTIAL));
         env.close();
-        env(check::cash(bob, chkId125, check::DeliverMin(USD(101))), ter(tecPATH_PARTIAL));
+        env(check::cash(bob, chkId125, check::DeliverMin(usd(101))), Ter(tecPATH_PARTIAL));
         env.close();
 
         // bob decides that he'll accept anything USD(75) or up.
         // He gets USD(100).
-        env(check::cash(bob, chkId125, check::DeliverMin(USD(75))));
-        verifyDeliveredAmount(env, USD(100));
-        env.require(balance(alice, USD(1'000 - 125)));
-        env.require(balance(bob, USD(0 + 100)));
+        env(check::cash(bob, chkId125, check::DeliverMin(usd(75))));
+        verifyDeliveredAmount(env, usd(100));
+        env.require(Balance(alice, usd(1'000 - 125)));
+        env.require(Balance(bob, usd(0 + 100)));
         BEAST_EXPECT(checksOnAccount(env, alice).empty());
         BEAST_EXPECT(checksOnAccount(env, bob).empty());
 
@@ -825,8 +826,8 @@ class CheckMPT_test : public beast::unit_test::suite
         // rate applies to the actual value transferred.
         env(check::cash(bob, chkId120, USD(50)));
         env.close();
-        env.require(balance(alice, USD(1000 - 125 - 60)));
-        env.require(balance(bob, USD(0 + 100 + 50)));
+        env.Require(Balance(alice, USD(1000 - 125 - 60)));
+        env.Require(Balance(bob, USD(0 + 100 + 50)));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 0);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == 0);
 #endif
@@ -850,29 +851,29 @@ class CheckMPT_test : public beast::unit_test::suite
 
         env.fund(XRP(1000), gw, alice, bob, zoe);
 
-        auto USDM = MPTTester(
+        auto usdm = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {alice},
-             .flags = MPTDEXFlags | tfMPTCanLock,
+             .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
              .maxAmt = maxAmt});
-        MPT const USD = USDM;
+        MPT const usd = usdm;
 
-        env(pay(gw, alice, USD(20)));
+        env(pay(gw, alice, usd(20)));
         env.close();
 
-        USDM.authorize({.account = bob});
+        usdm.authorize({.account = bob});
 
         // bob tries to cash a non-existent check from alice.
         {
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::cash(bob, chkId, USD(20)), ter(tecNO_ENTRY));
+            env(check::cash(bob, chkId, usd(20)), Ter(tecNO_ENTRY));
             env.close();
         }
 
         // alice creates her checks ahead of time.
         uint256 const chkIdU{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(20)));
+        env(check::create(alice, bob, usd(20)));
         env.close();
 
         uint256 const chkIdX{getCheckIndex(alice, env.seq(alice))};
@@ -881,54 +882,54 @@ class CheckMPT_test : public beast::unit_test::suite
 
         using namespace std::chrono_literals;
         uint256 const chkIdExp{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, XRP(10)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 1s));
         env.close();
 
         uint256 const chkIdFroz1{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
 
         uint256 const chkIdFroz2{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(2)));
+        env(check::create(alice, bob, usd(2)));
         env.close();
 
         uint256 const chkIdFroz3{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(3)));
+        env(check::create(alice, bob, usd(3)));
         env.close();
 
         uint256 const chkIdNoDest1{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
 
         uint256 const chkIdHasDest2{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(2)), dest_tag(7));
+        env(check::create(alice, bob, usd(2)), DestTag(7));
         env.close();
 
         // Same set of failing cases for both MPT and XRP check cashing.
         auto failingCases = [&env, &gw, &alice, &bob](
                                 uint256 const& chkId, STAmount const& amount) {
             // Bad fee.
-            env(check::cash(bob, chkId, amount), fee(drops(-10)), ter(temBAD_FEE));
+            env(check::cash(bob, chkId, amount), Fee(drops(-10)), Ter(temBAD_FEE));
             env.close();
 
             // Bad flags.
             env(check::cash(bob, chkId, amount),
-                txflags(tfImmediateOrCancel),
-                ter(temINVALID_FLAG));
+                Txflags(tfImmediateOrCancel),
+                Ter(temINVALID_FLAG));
             env.close();
 
             // Missing both Amount and DeliverMin.
             {
-                Json::Value tx{check::cash(bob, chkId, amount)};
+                json::Value tx{check::cash(bob, chkId, amount)};
                 tx.removeMember(sfAmount.jsonName);
-                env(tx, ter(temMALFORMED));
+                env(tx, Ter(temMALFORMED));
                 env.close();
             }
             // Both Amount and DeliverMin present.
             {
-                Json::Value tx{check::cash(bob, chkId, amount)};
-                tx[sfDeliverMin.jsonName] = amount.getJson(JsonOptions::none);
-                env(tx, ter(temMALFORMED));
+                json::Value tx{check::cash(bob, chkId, amount)};
+                tx[sfDeliverMin.jsonName] = amount.getJson(JsonOptions::KNone);
+                env(tx, Ter(temMALFORMED));
                 env.close();
             }
 
@@ -936,9 +937,9 @@ class CheckMPT_test : public beast::unit_test::suite
             {
                 STAmount neg{amount};
                 neg.negate();
-                env(check::cash(bob, chkId, neg), ter(temBAD_AMOUNT));
+                env(check::cash(bob, chkId, neg), Ter(temBAD_AMOUNT));
                 env.close();
-                env(check::cash(bob, chkId, amount.zeroed()), ter(temBAD_AMOUNT));
+                env(check::cash(bob, chkId, amount.zeroed()), Ter(temBAD_AMOUNT));
                 env.close();
             }
 
@@ -948,21 +949,21 @@ class CheckMPT_test : public beast::unit_test::suite
                 Issue const badIssue{badCurrency(), amount.getIssuer()};
                 STAmount badAmount{amount};
                 badAmount.setIssue(Issue{badCurrency(), amount.getIssuer()});
-                env(check::cash(bob, chkId, badAmount), ter(temBAD_CURRENCY));
+                env(check::cash(bob, chkId, badAmount), Ter(temBAD_CURRENCY));
                 env.close();
             }
 
             // Not destination cashing check.
-            env(check::cash(alice, chkId, amount), ter(tecNO_PERMISSION));
+            env(check::cash(alice, chkId, amount), Ter(tecNO_PERMISSION));
             env.close();
-            env(check::cash(gw, chkId, amount), ter(tecNO_PERMISSION));
+            env(check::cash(gw, chkId, amount), Ter(tecNO_PERMISSION));
             env.close();
 
             // Currency mismatch.
             {
-                MPT const EUR = MPTTester({.env = env, .issuer = gw});
-                STAmount const badAmount{EUR, amount};
-                env(check::cash(bob, chkId, badAmount), ter(temMALFORMED));
+                MPT const eur = MPTTester({.env = env, .issuer = gw});
+                STAmount const badAmount{eur, amount};
+                env(check::cash(bob, chkId, badAmount), Ter(temMALFORMED));
                 env.close();
             }
 
@@ -970,25 +971,25 @@ class CheckMPT_test : public beast::unit_test::suite
             // Every MPT is unique. There is no USD MPT with different issuers.
 
             // Amount bigger than SendMax.
-            env(check::cash(bob, chkId, amount + amount), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, amount + amount), Ter(tecPATH_PARTIAL));
             env.close();
 
             // DeliverMin bigger than SendMax.
-            env(check::cash(bob, chkId, check::DeliverMin(amount + amount)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, check::DeliverMin(amount + amount)), Ter(tecPATH_PARTIAL));
             env.close();
         };
 
         failingCases(chkIdX, XRP(10));
-        failingCases(chkIdU, USD(20));
+        failingCases(chkIdU, usd(20));
 
         // Verify that those two checks really were cashable.
-        env(check::cash(bob, chkIdU, USD(20)));
+        env(check::cash(bob, chkIdU, usd(20)));
         env.close();
         env(check::cash(bob, chkIdX, check::DeliverMin(XRP(10))));
         verifyDeliveredAmount(env, XRP(10));
 
         // Try to cash an expired check.
-        env(check::cash(bob, chkIdExp, XRP(10)), ter(tecEXPIRED));
+        env(check::cash(bob, chkIdExp, XRP(10)), Ter(tecEXPIRED));
         env.close();
 
         // Cancel the expired check.  Anyone can cancel an expired check.
@@ -997,103 +998,103 @@ class CheckMPT_test : public beast::unit_test::suite
 
         // Can we cash a check with frozen MPT?
         {
-            env(pay(bob, alice, USD(20)));
+            env(pay(bob, alice, usd(20)));
             env.close();
-            env.require(balance(alice, USD(20)));
-            env.require(balance(bob, USD(0)));
+            env.require(Balance(alice, usd(20)));
+            env.require(Balance(bob, usd(0)));
 
             // Global freeze
-            USDM.set({.flags = tfMPTLock});
+            usdm.set({.flags = tfMPTLock});
 
             // MPTLocked flag is set and the account is not the issuer of MPT
-            env(check::cash(bob, chkIdFroz1, USD(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz1, usd(1)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(check::cash(bob, chkIdFroz1, check::DeliverMin(USD(1))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz1, check::DeliverMin(usd(1))), Ter(tecPATH_PARTIAL));
             env.close();
 
-            USDM.set({.flags = tfMPTUnlock});
+            usdm.set({.flags = tfMPTUnlock});
 
             // No longer frozen.  Success.
-            env(check::cash(bob, chkIdFroz1, USD(1)));
+            env(check::cash(bob, chkIdFroz1, usd(1)));
             env.close();
-            env.require(balance(alice, USD(19)));
-            env.require(balance(bob, USD(1)));
+            env.require(Balance(alice, usd(19)));
+            env.require(Balance(bob, usd(1)));
 
             // Freeze individual MPT.
-            USDM.set({.holder = alice, .flags = tfMPTLock});
-            env(check::cash(bob, chkIdFroz2, USD(2)), ter(tecPATH_PARTIAL));
+            usdm.set({.holder = alice, .flags = tfMPTLock});
+            env(check::cash(bob, chkIdFroz2, usd(2)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(check::cash(bob, chkIdFroz2, check::DeliverMin(USD(1))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz2, check::DeliverMin(usd(1))), Ter(tecPATH_PARTIAL));
             env.close();
 
             // Clear that freeze.  Now check cashing works.
-            USDM.set({.holder = alice, .flags = tfMPTUnlock});
-            env(check::cash(bob, chkIdFroz2, USD(2)));
+            usdm.set({.holder = alice, .flags = tfMPTUnlock});
+            env(check::cash(bob, chkIdFroz2, usd(2)));
             env.close();
-            env.require(balance(alice, USD(17)));
-            env.require(balance(bob, USD(3)));
+            env.require(Balance(alice, usd(17)));
+            env.require(Balance(bob, usd(3)));
 
             // Freeze bob's MPT.  bob can't cash the check.
-            USDM.set({.holder = bob, .flags = tfMPTLock});
-            env(check::cash(bob, chkIdFroz3, USD(3)), ter(tecLOCKED));
+            usdm.set({.holder = bob, .flags = tfMPTLock});
+            env(check::cash(bob, chkIdFroz3, usd(3)), Ter(tecLOCKED));
             env.close();
-            env(check::cash(bob, chkIdFroz3, check::DeliverMin(USD(1))), ter(tecLOCKED));
+            env(check::cash(bob, chkIdFroz3, check::DeliverMin(usd(1))), Ter(tecLOCKED));
             env.close();
 
             // Clear that freeze.  Now check cashing works again.
-            USDM.set({.holder = bob, .flags = tfMPTUnlock});
+            usdm.set({.holder = bob, .flags = tfMPTUnlock});
             env.close();
-            env(check::cash(bob, chkIdFroz3, check::DeliverMin(USD(1))));
-            verifyDeliveredAmount(env, USD(3));
-            env.require(balance(alice, USD(14)));
-            env.require(balance(bob, USD(6)));
+            env(check::cash(bob, chkIdFroz3, check::DeliverMin(usd(1))));
+            verifyDeliveredAmount(env, usd(3));
+            env.require(Balance(alice, usd(14)));
+            env.require(Balance(bob, usd(6)));
         }
         {
             // Set the RequireDest flag on bob's account (after the check
             // was created) then cash a check without a destination tag.
             env(fset(bob, asfRequireDest));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, USD(1)), ter(tecDST_TAG_NEEDED));
+            env(check::cash(bob, chkIdNoDest1, usd(1)), Ter(tecDST_TAG_NEEDED));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, check::DeliverMin(USD(1))), ter(tecDST_TAG_NEEDED));
+            env(check::cash(bob, chkIdNoDest1, check::DeliverMin(usd(1))), Ter(tecDST_TAG_NEEDED));
             env.close();
 
             // bob can cash a check with a destination tag.
-            env(check::cash(bob, chkIdHasDest2, USD(2)));
+            env(check::cash(bob, chkIdHasDest2, usd(2)));
             env.close();
 
-            env.require(balance(alice, USD(12)));
-            env.require(balance(bob, USD(8)));
+            env.require(Balance(alice, usd(12)));
+            env.require(Balance(bob, usd(8)));
 
             // Clear the RequireDest flag on bob's account so he can
             // cash the check with no DestinationTag.
             env(fclear(bob, asfRequireDest));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, USD(1)));
+            env(check::cash(bob, chkIdNoDest1, usd(1)));
             env.close();
-            env.require(balance(alice, USD(11)));
-            env.require(balance(bob, USD(9)));
+            env.require(Balance(alice, usd(11)));
+            env.require(Balance(bob, usd(9)));
         }
 
         // OutstandingAmount exceeds MaximumAmount
         {
             // Already at maximum
-            BEAST_EXPECT(env.balance(gw, USDM) == USDM(-maxAmt));
+            BEAST_EXPECT(env.balance(gw, usdm) == usdm(-maxAmt));
 
             uint256 const chkId{getCheckIndex(gw, env.seq(gw))};
-            env(check::create(gw, bob, USDM(10)));
+            env(check::create(gw, bob, usdm(10)));
             env.close();
 
             // Exceeds MaximumAmount (20 + 10) = 30 > 20
-            env(check::cash(bob, chkId, USDM(10)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, usdm(10)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // Redeem some tokens (20 - 9) = 11
-            env(pay(alice, gw, USDM(9)));
+            env(pay(alice, gw, usdm(9)));
             env.close();
 
             // Still exceeds MaximumAmount (11 + 10) = 21 > 20
-            env(check::cash(bob, chkId, USDM(10)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, usdm(10)), Ter(tecPATH_PARTIAL));
             env.close();
         }
     }
@@ -1116,12 +1117,12 @@ class CheckMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, bob, zoe);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw});
+            MPT const usd = MPTTester({.env = env, .issuer = gw});
 
             // alice creates her checks ahead of time.
             // Three ordinary checks with no expiration.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
@@ -1129,39 +1130,39 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             uint256 const chkId3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             // Three checks that expire in 10 minutes.
             using namespace std::chrono_literals;
             uint256 const chkIdNotExp1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 600s));
             env.close();
 
             uint256 const chkIdNotExp2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 600s));
             env.close();
 
             uint256 const chkIdNotExp3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 600s));
             env.close();
 
             // Three checks that expire in one second.
             uint256 const chkIdExp1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 1s));
             env.close();
 
             uint256 const chkIdExp2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 1s));
             env.close();
 
             uint256 const chkIdExp3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 1s));
             env.close();
 
             // Two checks to cancel using a regular key and using multisigning.
             uint256 const chkIdReg{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             uint256 const chkIdMSig{getCheckIndex(alice, env.seq(alice))};
@@ -1181,7 +1182,7 @@ class CheckMPT_test : public beast::unit_test::suite
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 9);
             BEAST_EXPECT(ownerCount(env, alice) == 9);
 
-            env(check::cancel(zoe, chkId3), ter(tecNO_PERMISSION));
+            env(check::cancel(zoe, chkId3), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 9);
             BEAST_EXPECT(ownerCount(env, alice) == 9);
@@ -1197,7 +1198,7 @@ class CheckMPT_test : public beast::unit_test::suite
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 7);
             BEAST_EXPECT(ownerCount(env, alice) == 7);
 
-            env(check::cancel(zoe, chkIdNotExp3), ter(tecNO_PERMISSION));
+            env(check::cancel(zoe, chkIdNotExp3), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 7);
             BEAST_EXPECT(ownerCount(env, alice) == 7);
@@ -1219,32 +1220,32 @@ class CheckMPT_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, alice) == 4);
 
             // Use a regular key and also multisign to cancel checks.
-            Account const alie{"alie", KeyType::ed25519};
+            Account const alie{"alie", KeyType::Ed25519};
             env(regkey(alice, alie));
             env.close();
 
-            Account const bogie{"bogie", KeyType::secp256k1};
-            Account const demon{"demon", KeyType::ed25519};
-            env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), sig(alie));
+            Account const bogie{"bogie", KeyType::Secp256k1};
+            Account const demon{"demon", KeyType::Ed25519};
+            env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), Sig(alie));
             env.close();
 
             int const signersCount{1};
 
             // alice uses her regular key to cancel a check.
-            env(check::cancel(alice, chkIdReg), sig(alie));
+            env(check::cancel(alice, chkIdReg), Sig(alie));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 3);
             BEAST_EXPECT(ownerCount(env, alice) == signersCount + 3);
 
             // alice uses multisigning to cancel a check.
             XRPAmount const baseFeeDrops{env.current()->fees().base};
-            env(check::cancel(alice, chkIdMSig), msig(bogie, demon), fee(3 * baseFeeDrops));
+            env(check::cancel(alice, chkIdMSig), Msig(bogie, demon), Fee(3 * baseFeeDrops));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(ownerCount(env, alice) == signersCount + 2);
 
             // Creator and destination cancel the remaining unexpired checks.
-            env(check::cancel(alice, chkId3), sig(alice));
+            env(check::cancel(alice, chkId3), Sig(alice));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == signersCount + 1);
@@ -1271,7 +1272,7 @@ class CheckMPT_test : public beast::unit_test::suite
         env.fund(XRP(1'000), gw, alice, bob);
         env.close();
 
-        MPT const USD =
+        MPT const usd =
             MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 1'000});
 
         // alice and bob grab enough tickets for all the following
@@ -1287,8 +1288,8 @@ class CheckMPT_test : public beast::unit_test::suite
 
         env.close();
         // MPT + 10 tickets
-        env.require(owners(alice, 11));
-        env.require(owners(bob, 11));
+        env.require(Owners(alice, 11));
+        env.require(Owners(bob, 11));
 
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1296,62 +1297,62 @@ class CheckMPT_test : public beast::unit_test::suite
         env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
-        env(pay(gw, alice, USD(900)));
+        env(pay(gw, alice, usd(900)));
         env.close();
 
         // alice creates four checks; two XRP, two MPT.  Bob will cash
         // one of each and cancel one of each.
         uint256 const chkIdXrp1{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, XRP(200)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, XRP(200)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdXrp2{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, XRP(300)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, XRP(300)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdUsd1{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, USD(200)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, usd(200)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdUsd2{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, USD(300)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, usd(300)), ticket::Use(aliceTicketSeq++));
 
         env.close();
         // Alice used four tickets but created four checks.
-        env.require(owners(alice, 11));
+        env.require(Owners(alice, 11));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 4);
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
-        env.require(owners(bob, 11));
+        env.require(Owners(bob, 11));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
         // Bob cancels two of alice's checks.
-        env(check::cancel(bob, chkIdXrp1), ticket::use(bobTicketSeq++));
-        env(check::cancel(bob, chkIdUsd2), ticket::use(bobTicketSeq++));
+        env(check::cancel(bob, chkIdXrp1), ticket::Use(bobTicketSeq++));
+        env(check::cancel(bob, chkIdUsd2), ticket::Use(bobTicketSeq++));
         env.close();
 
-        env.require(owners(alice, 9));
+        env.require(Owners(alice, 9));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
-        env.require(owners(bob, 9));
+        env.require(Owners(bob, 9));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
         // Bob cashes alice's two remaining checks.
-        env(check::cash(bob, chkIdXrp2, XRP(300)), ticket::use(bobTicketSeq++));
-        env(check::cash(bob, chkIdUsd1, USD(200)), ticket::use(bobTicketSeq++));
+        env(check::cash(bob, chkIdXrp2, XRP(300)), ticket::Use(bobTicketSeq++));
+        env(check::cash(bob, chkIdUsd1, usd(200)), ticket::Use(bobTicketSeq++));
         env.close();
 
         auto const baseFee = env.current()->fees().base;
-        env.require(owners(alice, 7));
+        env.require(Owners(alice, 7));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).empty());
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
-        env.require(balance(alice, USD(700)));
-        env.require(balance(alice, XRP(700) - 6 * baseFee));
-        env.require(owners(bob, 7));
+        env.require(Balance(alice, usd(700)));
+        env.require(Balance(alice, XRP(700) - 6 * baseFee));
+        env.require(Owners(bob, 7));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
-        env.require(balance(bob, USD(200)));
-        env.require(balance(bob, XRP(1'300) - 6 * baseFee));
+        env.require(Balance(bob, usd(200)));
+        env.require(Balance(bob, XRP(1'300) - 6 * baseFee));
     }
 
     void
@@ -1369,7 +1370,7 @@ class CheckMPT_test : public beast::unit_test::suite
         struct AccountOwns
         {
             using iterator = hash_map<std::string, MPTTester>::iterator;
-            beast::unit_test::suite& suite;
+            beast::unit_test::Suite& suite;
             Env& env;
             Account const acct;
             std::size_t owners{0};
@@ -1378,16 +1379,12 @@ class CheckMPT_test : public beast::unit_test::suite
             bool const requireAuth;
 
             AccountOwns(
-                beast::unit_test::suite& s,
+                beast::unit_test::Suite& s,
                 Env& e,
                 Account a,
-                bool isIssuer_,
-                bool requireAuth_ = false)
-                : suite(s)
-                , env(e)
-                , acct(std::move(a))
-                , isIssuer(isIssuer_)
-                , requireAuth(requireAuth_)
+                bool isIssuer,
+                bool requireAuth = false)
+                : suite(s), env(e), acct(std::move(a)), isIssuer(isIssuer), requireAuth(requireAuth)
             {
             }
 
@@ -1424,7 +1421,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 = MPTDEXFlags | tfMPTCanLock;
+                auto flags = kMPT_DEX_FLAGS | tfMPTCanLock;
                 if (requireAuth)
                     flags |= tfMPTRequireAuth;
                 auto [it, _] =
@@ -1513,7 +1510,7 @@ class CheckMPT_test : public beast::unit_test::suite
             env.fund(XRP(5'000), noripple(gw1));
             env.close();
 
-            MPT const CK8 = gw1["CK8"];
+            MPT const cK8 = gw1["CK8"];
             gw1.verifyOwners(__LINE__);
 
             Account const yui{"yui"};
@@ -1525,10 +1522,10 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, yui, CK8(99)));
+            env(check::create(gw1, yui, cK8(99)));
             env.close();
 
-            env(check::cash(yui, chkId, CK8(99)), ter(tecINSUFFICIENT_RESERVE));
+            env(check::cash(yui, chkId, cK8(99)), Ter(tecINSUFFICIENT_RESERVE));
             env.close();
             alice.verifyOwners(__LINE__);
 
@@ -1536,8 +1533,8 @@ class CheckMPT_test : public beast::unit_test::suite
             // the check succeeds and creates the trust line.
             env(pay(env.master, yui, XRP(51)));
             env.close();
-            env(check::cash(yui, chkId, CK8(99)));
-            verifyDeliveredAmount(env, CK8(99));
+            env(check::cash(yui, chkId, cK8(99)));
+            verifyDeliveredAmount(env, cK8(99));
             env.close();
             BEAST_EXPECT(ownerCount(env, yui) == 1);
 
@@ -1563,11 +1560,11 @@ class CheckMPT_test : public beast::unit_test::suite
             BEAST_EXPECT((*env.le(bob))[sfFlags] == 0);
 
             // Use offers to automatically create MPT
-            MPT const OF1 = gw1["OF1"];
-            env(offer(gw1, XRP(98), OF1(98)));
+            MPT const oF1 = gw1["OF1"];
+            env(offer(gw1, XRP(98), oF1(98)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF1.issuanceID, alice)) == nullptr);
-            env(offer(alice, OF1(98), XRP(98)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF1.issuanceID, alice)) == nullptr);
+            env(offer(alice, oF1(98), XRP(98)));
             ++alice.owners;
             env.close();
 
@@ -1580,14 +1577,14 @@ class CheckMPT_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK1 = gw1["CK1"];
+            MPT const cK1 = gw1["CK1"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK1(98)));
+            env(check::create(gw1, alice, cK1(98)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK1.issuanceID, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK1(98)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK1.issuanceID, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK1(98)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK1(98));
+            verifyDeliveredAmount(env, cK1(98));
             env.close();
 
             // gw1's check should be consumed.
@@ -1607,17 +1604,17 @@ class CheckMPT_test : public beast::unit_test::suite
             // Use offers to automatically create MPT.
             // Transfer of assets using offers does not require rippling.
             // So bob's offer is successfully crossed which creates MPT.
-            MPT const OF1 = gw1["OF1"];
-            env(offer(alice, XRP(97), OF1(97)));
+            MPT const oF1 = gw1["OF1"];
+            env(offer(alice, XRP(97), oF1(97)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF1, bob)) == nullptr);
-            env(offer(bob, OF1(97), XRP(97)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF1, bob)) == nullptr);
+            env(offer(bob, oF1(97), XRP(97)));
             ++bob.owners;
             env.close();
 
             // Both offers should be consumed.
-            env.require(balance(alice, OF1(1)));
-            env.require(balance(bob, OF1(97)));
+            env.require(Balance(alice, oF1(1)));
+            env.require(Balance(bob, oF1(97)));
 
             // bob now has an owner count of 1 due to new MPT.
             gw1.verifyOwners(__LINE__);
@@ -1630,16 +1627,16 @@ class CheckMPT_test : public beast::unit_test::suite
             // requires rippling through the currency's issuer, rippling doesn't
             // impact MPT. Even though gw1 does not have rippling enabled, the
             // check cash succeeds for MPT and MPT is created.
-            MPT const CK1 = gw1["CK1"];
+            MPT const cK1 = gw1["CK1"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK1(97)));
+            env(check::create(alice, bob, cK1(97)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK1, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK1(97)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK1, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK1(97)));
             ++bob.owners;
             env.close();
 
-            BEAST_EXPECT(env.le(keylet::mptoken(OF1, bob)) != nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(oF1, bob)) != nullptr);
 
             gw1.verifyOwners(__LINE__);
             alice.verifyOwners(__LINE__);
@@ -1654,11 +1651,11 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create the trust line.
-            MPT const OF2 = gw1["OF2"];
-            env(offer(gw1, XRP(96), OF2(96)));
+            MPT const oF2 = gw1["OF2"];
+            env(offer(gw1, XRP(96), oF2(96)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF2, alice)) == nullptr);
-            env(offer(alice, OF2(96), XRP(96)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF2, alice)) == nullptr);
+            env(offer(alice, oF2(96), XRP(96)));
             ++alice.owners;
             env.close();
 
@@ -1670,14 +1667,14 @@ class CheckMPT_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK2 = gw1["CK2"];
+            MPT const cK2 = gw1["CK2"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK2(96)));
+            env(check::create(gw1, alice, cK2(96)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK2, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK2(96)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK2, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK2(96)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK2(96));
+            verifyDeliveredAmount(env, cK2(96));
             env.close();
 
             // gw1's check should be consumed.
@@ -1695,12 +1692,12 @@ class CheckMPT_test : public beast::unit_test::suite
             // non-issuer to non-issuer should work.
 
             // Use offers to automatically create MPT.
-            MPT const OF2 = gw1["OF2"];
-            env(offer(alice, XRP(95), OF2(95)));
+            MPT const oF2 = gw1["OF2"];
+            env(offer(alice, XRP(95), oF2(95)));
             env.close();
             // alice already has OF2 MPT
-            BEAST_EXPECT(env.le(keylet::mptoken(OF2, alice)) != nullptr);
-            env(offer(bob, OF2(95), XRP(95)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF2, alice)) != nullptr);
+            env(offer(bob, oF2(95), XRP(95)));
             ++bob.owners;
             env.close();
 
@@ -1710,14 +1707,14 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK2 = gw1["CK2"];
+            MPT const cK2 = gw1["CK2"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK2(95)));
+            env(check::create(alice, bob, cK2(95)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK2, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK2(95)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK2, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK2(95)));
             ++bob.owners;
-            verifyDeliveredAmount(env, CK2(95));
+            verifyDeliveredAmount(env, cK2(95));
             env.close();
 
             // bob's owner count should increase due to the new MPT.
@@ -1740,11 +1737,11 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create MPT.
-            MPT const OF3 = gw1["OF3"];
-            env(offer(gw1, XRP(94), OF3(94)));
+            MPT const oF3 = gw1["OF3"];
+            env(offer(gw1, XRP(94), oF3(94)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF3, alice)) == nullptr);
-            env(offer(alice, OF3(94), XRP(94)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF3, alice)) == nullptr);
+            env(offer(alice, oF3(94), XRP(94)));
             ++alice.owners;
             env.close();
 
@@ -1757,14 +1754,14 @@ class CheckMPT_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK3 = gw1["CK3"];
+            MPT const cK3 = gw1["CK3"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK3(94)));
+            env(check::create(gw1, alice, cK3(94)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK3, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK3(94)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK3, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK3(94)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK3(94));
+            verifyDeliveredAmount(env, cK3(94));
             env.close();
 
             // gw1's check should be consumed.
@@ -1782,11 +1779,11 @@ class CheckMPT_test : public beast::unit_test::suite
             // automatic MPT creation.
 
             // Use offers to automatically create MPT.
-            MPT const OF3 = gw1["OF3"];
-            env(offer(alice, XRP(93), OF3(93)));
+            MPT const oF3 = gw1["OF3"];
+            env(offer(alice, XRP(93), oF3(93)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF3, alice)) != nullptr);
-            env(offer(bob, OF3(93), XRP(93)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF3, alice)) != nullptr);
+            env(offer(bob, oF3(93), XRP(93)));
             ++bob.owners;
             env.close();
 
@@ -1796,14 +1793,14 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK3 = gw1["CK3"];
+            MPT const cK3 = gw1["CK3"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK3(93)));
+            env(check::create(alice, bob, cK3(93)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK3, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK3(93)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK3, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK3(93)));
             ++bob.owners;
-            verifyDeliveredAmount(env, CK3(93));
+            verifyDeliveredAmount(env, cK3(93));
             env.close();
 
             // bob's owner count should increase due to the new MPT.
@@ -1820,11 +1817,11 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create MPT.
-            MPT const OF4 = gw1["OF4"];
-            env(offer(gw1, XRP(92), OF4(92)));
+            MPT const oF4 = gw1["OF4"];
+            env(offer(gw1, XRP(92), oF4(92)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, alice)) == nullptr);
-            env(offer(alice, OF4(92), XRP(92)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, alice)) == nullptr);
+            env(offer(alice, oF4(92), XRP(92)));
             ++alice.owners;
             env.close();
 
@@ -1834,13 +1831,13 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK4 = gw1["CK4"];
+            MPT const cK4 = gw1["CK4"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, bob, CK4(92)));
+            env(check::create(gw1, bob, cK4(92)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK4(92)));
-            verifyDeliveredAmount(env, CK4(92));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK4(92)));
+            verifyDeliveredAmount(env, cK4(92));
             ++bob.owners;
             env.close();
 
@@ -1850,8 +1847,8 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // clean up
-            gw1.cleanup(OF4, alice);
-            gw1.cleanup(CK4, bob);
+            gw1.cleanup(oF4, alice);
+            gw1.cleanup(cK4, bob);
         }
 
         //-------------- lsfMPTLock, check written by issuer --------------
@@ -1860,12 +1857,12 @@ class CheckMPT_test : public beast::unit_test::suite
             // MPT from being created.
 
             // Use offers to automatically create MPT.
-            MPT const OF4 = gw1["OF4"];
-            gw1.set(OF4, tfMPTLock);
-            env(offer(gw1, XRP(92), OF4(92)), ter(tecFROZEN));
+            MPT const oF4 = gw1["OF4"];
+            gw1.set(oF4, tfMPTLock);
+            env(offer(gw1, XRP(92), oF4(92)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, alice)) == nullptr);
-            env(offer(alice, OF4(92), XRP(92)), ter(tecFROZEN));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, alice)) == nullptr);
+            env(offer(alice, oF4(92), XRP(92)), Ter(tecFROZEN));
             env.close();
 
             // No one's owner count should have changed.
@@ -1874,13 +1871,13 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK4 = gw1["CK4"];
-            gw1.set(CK4, tfMPTLock);
+            MPT const cK4 = gw1["CK4"];
+            gw1.set(cK4, tfMPTLock);
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK4(92)), ter(tecLOCKED));
+            env(check::create(gw1, alice, cK4(92)), Ter(tecLOCKED));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK4(92)), ter(tecNO_ENTRY));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK4(92)), Ter(tecNO_ENTRY));
             env.close();
 
             // No one's owner count should have changed.
@@ -1890,12 +1887,12 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // Because gw1 has set tfMPTLock, neither MPT
             // is created.
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, alice)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, alice)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, alice)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, alice)) == nullptr);
 
             // clear global freeze
-            gw1.set(OF4, tfMPTUnlock);
-            gw1.set(CK4, tfMPTUnlock);
+            gw1.set(oF4, tfMPTUnlock);
+            gw1.set(cK4, tfMPTUnlock);
         }
 
         //------------ lsfGlobalFreeze, check written by non-issuer ------------
@@ -1904,13 +1901,13 @@ class CheckMPT_test : public beast::unit_test::suite
             // automatic MPT creation between non-issuers.
 
             // Use offers to automatically create MPT.
-            MPT const OF4 = gw1["OF4"];
-            gw1.authorize(OF4, alice);
-            gw1.pay(gw1, alice, OF4(91));
-            env(offer(alice, XRP(91), OF4(91)));
+            MPT const oF4 = gw1["OF4"];
+            gw1.authorize(oF4, alice);
+            gw1.pay(gw1, alice, oF4(91));
+            env(offer(alice, XRP(91), oF4(91)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, alice)) != nullptr);
-            env(offer(bob, OF4(91), XRP(91)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, alice)) != nullptr);
+            env(offer(bob, oF4(91), XRP(91)));
             ++bob.owners;
             env.close();
 
@@ -1921,14 +1918,14 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK4 = gw1["CK4"];
+            MPT const cK4 = gw1["CK4"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK4(91)));
+            env(check::create(alice, bob, cK4(91)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, bob)) == nullptr);
-            gw1.authorize(CK4, alice);
-            gw1.pay(gw1, alice, CK4(91));
-            env(check::cash(bob, chkId, CK4(91)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, bob)) == nullptr);
+            gw1.authorize(cK4, alice);
+            gw1.pay(gw1, alice, cK4(91));
+            env(check::cash(bob, chkId, cK4(91)));
             ++bob.owners;
             env.close();
 
@@ -1939,10 +1936,10 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // cleanup
-            gw1.cleanup(OF4, alice);
-            gw1.cleanup(CK4, alice);
-            gw1.cleanup(OF4, bob);
-            gw1.cleanup(CK4, bob);
+            gw1.cleanup(oF4, alice);
+            gw1.cleanup(cK4, alice);
+            gw1.cleanup(oF4, bob);
+            gw1.cleanup(cK4, bob);
         }
 
         //------------ lsfMPTLock, check written by non-issuer ------------
@@ -1951,12 +1948,12 @@ class CheckMPT_test : public beast::unit_test::suite
             // no automatic MPT creation between non-issuers.
 
             // Use offers to automatically create MPT.
-            MPT const OF4 = gw1["OF4"];
-            gw1.set(OF4, tfMPTLock);
-            env(offer(alice, XRP(91), OF4(91)), ter(tecFROZEN));
+            MPT const oF4 = gw1["OF4"];
+            gw1.set(oF4, tfMPTLock);
+            env(offer(alice, XRP(91), oF4(91)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, alice)) == nullptr);
-            env(offer(bob, OF4(91), XRP(91)), ter(tecFROZEN));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, alice)) == nullptr);
+            env(offer(bob, oF4(91), XRP(91)), Ter(tecFROZEN));
             env.close();
 
             // No one's owner count should have changed.
@@ -1965,13 +1962,13 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK4 = gw1["CK4"];
-            gw1.set(CK4, tfMPTLock);
+            MPT const cK4 = gw1["CK4"];
+            gw1.set(cK4, tfMPTLock);
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK4(91)), ter(tecLOCKED));
+            env(check::create(alice, bob, cK4(91)), Ter(tecLOCKED));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK4(91)), ter(tecNO_ENTRY));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK4(91)), Ter(tecNO_ENTRY));
             env.close();
 
             // No one's owner count should have changed.
@@ -1981,11 +1978,11 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // Because gw1 has set lsfGlobalFreeze, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::mptoken(OF4, bob)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::mptoken(CK4, bob)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(oF4, bob)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(cK4, bob)) == nullptr);
 
-            gw1.set(OF4, tfMPTUnlock);
-            gw1.set(CK4, tfMPTUnlock);
+            gw1.set(oF4, tfMPTUnlock);
+            gw1.set(cK4, tfMPTUnlock);
         }
 
         //-------------- lsfRequireAuth, check written by issuer ---------------
@@ -2004,11 +2001,11 @@ class CheckMPT_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create MPT.
-            MPT const OF5 = gw2["OF5"];
-            env(offer(gw2, XRP(92), OF5(92)));
+            MPT const oF5 = gw2["OF5"];
+            env(offer(gw2, XRP(92), oF5(92)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF5, alice)) == nullptr);
-            env(offer(alice, OF5(92), XRP(92)));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF5, alice)) == nullptr);
+            env(offer(alice, oF5(92), XRP(92)));
             ++alice.owners;
             env.close();
 
@@ -2018,13 +2015,13 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create MPT.
-            MPT const CK5 = gw2["CK5"];
+            MPT const cK5 = gw2["CK5"];
             uint256 const chkId{getCheckIndex(gw2, env.seq(gw2))};
-            env(check::create(gw2, alice, CK5(92)));
+            env(check::create(gw2, alice, cK5(92)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK5(92)));
-            verifyDeliveredAmount(env, CK5(92));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK5(92)));
+            verifyDeliveredAmount(env, cK5(92));
             ++alice.owners;
             env.close();
 
@@ -2034,8 +2031,8 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // cleanup
-            gw2.cleanup(OF5, alice);
-            gw2.cleanup(CK5, alice);
+            gw2.cleanup(oF5, alice);
+            gw2.cleanup(cK5, alice);
         }
 
         // Fund new gw to test since gw2 has MPTokenIssuance already created.
@@ -2045,13 +2042,13 @@ class CheckMPT_test : public beast::unit_test::suite
             env.fund(XRP(5'000), gw3);
             env.close();
             // Use offers to automatically create the trust line.
-            MPT const OF5 = gw3["OF5"];
+            MPT const oF5 = gw3["OF5"];
             std::uint32_t const gw3OfferSeq = {env.seq(gw3)};
-            env(offer(gw3, XRP(92), OF5(92)));
+            env(offer(gw3, XRP(92), oF5(92)));
             ++gw3.owners;
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(OF5, alice)) == nullptr);
-            env(offer(alice, OF5(92), XRP(92)), ter(tecNO_AUTH));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF5, alice)) == nullptr);
+            env(offer(alice, oF5(92), XRP(92)), Ter(tecNO_AUTH));
             env.close();
 
             // gw3 should still own the offer, but no one else's owner
@@ -2061,19 +2058,19 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Since we don't need it anymore, remove gw3's offer.
-            env(offer_cancel(gw3, gw3OfferSeq));
+            env(offerCancel(gw3, gw3OfferSeq));
             --gw3.owners;
             env.close();
             gw3.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK5 = gw3["CK5"];
+            MPT const cK5 = gw3["CK5"];
             uint256 const chkId{getCheckIndex(gw3, env.seq(gw3))};
-            env(check::create(gw3, alice, CK5(92)));
+            env(check::create(gw3, alice, cK5(92)));
             ++gw3.owners;
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, alice)) == nullptr);
-            env(check::cash(alice, chkId, CK5(92)), ter(tecNO_AUTH));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, alice)) == nullptr);
+            env(check::cash(alice, chkId, cK5(92)), Ter(tecNO_AUTH));
             env.close();
 
             // gw3 should still own the check, but no one else's owner
@@ -2084,8 +2081,8 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // Because gw3 has set lsfRequireAuth, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::mptoken(OF5, alice)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, alice)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(oF5, alice)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, alice)) == nullptr);
 
             // Since we don't need it anymore, remove gw3's check.
             env(check::cancel(gw3, chkId));
@@ -2100,12 +2097,12 @@ class CheckMPT_test : public beast::unit_test::suite
             // automatic MPT creation between non-issuers.
 
             // Use offers to automatically create MPT.
-            MPT const OF5 = gw2["OF5"];
-            gw2.authorize(OF5, alice);
-            gw2.pay(gw2, alice, OF5(91));
-            env(offer(alice, XRP(91), OF5(91)));
+            MPT const oF5 = gw2["OF5"];
+            gw2.authorize(oF5, alice);
+            gw2.pay(gw2, alice, oF5(91));
+            env(offer(alice, XRP(91), oF5(91)));
             env.close();
-            env(offer(bob, OF5(91), XRP(91)));
+            env(offer(bob, oF5(91), XRP(91)));
             ++bob.owners;
             env.close();
 
@@ -2115,14 +2112,14 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK5 = gw2["CK5"];
-            gw2.authorize(CK5, alice);
-            gw2.pay(gw2, alice, CK5(91));
+            MPT const cK5 = gw2["CK5"];
+            gw2.authorize(cK5, alice);
+            gw2.pay(gw2, alice, cK5(91));
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK5(91)));
+            env(check::create(alice, bob, cK5(91)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK5(91)));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK5(91)));
             ++bob.owners;
             env.close();
 
@@ -2139,11 +2136,11 @@ class CheckMPT_test : public beast::unit_test::suite
             // no automatic MPT creation between non-issuers.
 
             // Use offers to automatically create the trust line.
-            MPT const OF5 = gw3["OF5"];
-            env(offer(alice, XRP(91), OF5(91)), ter(tecUNFUNDED_OFFER));
+            MPT const oF5 = gw3["OF5"];
+            env(offer(alice, XRP(91), oF5(91)), Ter(tecUNFUNDED_OFFER));
             env.close();
-            env(offer(bob, OF5(91), XRP(91)), ter(tecNO_AUTH));
-            BEAST_EXPECT(env.le(keylet::mptoken(OF5, bob)) == nullptr);
+            env(offer(bob, oF5(91), XRP(91)), Ter(tecNO_AUTH));
+            BEAST_EXPECT(env.le(keylet::mptoken(oF5, bob)) == nullptr);
             env.close();
 
             gw3.verifyOwners(__LINE__);
@@ -2151,12 +2148,12 @@ class CheckMPT_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            MPT const CK5 = gw3["CK5"];
+            MPT const cK5 = gw3["CK5"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK5(91)));
+            env(check::create(alice, bob, cK5(91)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, bob)) == nullptr);
-            env(check::cash(bob, chkId, CK5(91)), ter(tecPATH_PARTIAL));
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, bob)) == nullptr);
+            env(check::cash(bob, chkId, cK5(91)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // Delete alice's check since it is no longer needed.
@@ -2170,8 +2167,8 @@ class CheckMPT_test : public beast::unit_test::suite
 
             // Because gw3 has set lsfRequireAuth, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::mptoken(OF5, bob)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::mptoken(CK5, bob)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(oF5, bob)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::mptoken(cK5, bob)) == nullptr);
         }
     }
 
@@ -2193,7 +2190,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeats(sa);
 
         testMPTCreation(sa);
diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp
index f2c7ab3a38..ad44ff5729 100644
--- a/src/test/app/Check_test.cpp
+++ b/src/test/app/Check_test.cpp
@@ -49,7 +49,7 @@
 
 namespace xrpl {
 
-class Check_test : public beast::unit_test::suite
+class Check_test : public beast::unit_test::Suite
 {
     static uint256
     getCheckIndex(AccountID const& account, std::uint32_t uSequence)
@@ -77,11 +77,11 @@ class Check_test : public beast::unit_test::suite
     verifyDeliveredAmount(test::jtx::Env& env, STAmount const& amount)
     {
         // Get the hash for the most recent transaction.
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
         // Verify DeliveredAmount and delivered_amount metadata are correct.
         env.close();
-        Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         // Expect there to be a DeliveredAmount field.
         if (!BEAST_EXPECT(meta.isMember(sfDeliveredAmount.jsonName)))
@@ -89,8 +89,8 @@ class Check_test : public beast::unit_test::suite
 
         // DeliveredAmount and delivered_amount should both be present and
         // equal amount.
-        BEAST_EXPECT(meta[sfDeliveredAmount.jsonName] == amount.getJson(JsonOptions::none));
-        BEAST_EXPECT(meta[jss::delivered_amount] == amount.getJson(JsonOptions::none));
+        BEAST_EXPECT(meta[sfDeliveredAmount.jsonName] == amount.getJson(JsonOptions::KNone));
+        BEAST_EXPECT(meta[jss::delivered_amount] == amount.getJson(JsonOptions::KNone));
     }
 
     void
@@ -135,7 +135,7 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gateway"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env{*this, features};
 
@@ -146,7 +146,7 @@ class Check_test : public beast::unit_test::suite
         // Note that no trust line has been set up for alice, but alice can
         // still write a check for USD.  You don't have to have the funds
         // necessary to cover a check in order to write a check.
-        auto writeTwoChecks = [&env, &USD, this](Account const& from, Account const& to) {
+        auto writeTwoChecks = [&env, &usd, this](Account const& from, Account const& to) {
             std::uint32_t const fromOwnerCount{ownerCount(env, from)};
             std::uint32_t const toOwnerCount{ownerCount(env, to)};
 
@@ -156,14 +156,14 @@ class Check_test : public beast::unit_test::suite
             env(check::create(from, to, XRP(2000)));
             env.close();
 
-            env(check::create(from, to, USD(50)));
+            env(check::create(from, to, usd(50)));
             env.close();
 
             BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount + 2);
             BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount + 2);
 
-            env.require(owners(from, fromOwnerCount + 2));
-            env.require(owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
+            env.require(Owners(from, fromOwnerCount + 2));
+            env.require(Owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
         };
         //  from     to
         writeTwoChecks(alice, bob);
@@ -177,44 +177,44 @@ class Check_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         std::size_t const aliceCount{checksOnAccount(env, alice).size()};
         std::size_t const bobCount{checksOnAccount(env, bob).size()};
-        env(check::create(alice, bob, USD(50)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now() + 1s));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), source_tag(2));
+        env(check::create(alice, bob, usd(50)), SourceTag(2));
         env.close();
-        env(check::create(alice, bob, USD(50)), dest_tag(3));
+        env(check::create(alice, bob, usd(50)), DestTag(3));
         env.close();
-        env(check::create(alice, bob, USD(50)), invoice_id(uint256{4}));
+        env(check::create(alice, bob, usd(50)), InvoiceId(uint256{4}));
         env.close();
-        env(check::create(alice, bob, USD(50)),
-            expiration(env.now() + 1s),
-            source_tag(12),
-            dest_tag(13),
-            invoice_id(uint256{4}));
+        env(check::create(alice, bob, usd(50)),
+            Expiration(env.now() + 1s),
+            SourceTag(12),
+            DestTag(13),
+            InvoiceId(uint256{4}));
         env.close();
 
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 5);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 5);
 
         // Use a regular key and also multisign to create a check.
-        Account const alie{"alie", KeyType::ed25519};
+        Account const alie{"alie", KeyType::Ed25519};
         env(regkey(alice, alie));
         env.close();
 
-        Account const bogie{"bogie", KeyType::secp256k1};
-        Account const demon{"demon", KeyType::ed25519};
-        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), sig(alie));
+        Account const bogie{"bogie", KeyType::Secp256k1};
+        Account const demon{"demon", KeyType::Ed25519};
+        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), Sig(alie));
         env.close();
 
         // alice uses her regular key to create a check.
-        env(check::create(alice, bob, USD(50)), sig(alie));
+        env(check::create(alice, bob, usd(50)), Sig(alie));
         env.close();
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 6);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 6);
 
         // alice uses multisigning to create a check.
         XRPAmount const baseFeeDrops{env.current()->fees().base};
-        env(check::create(alice, bob, USD(50)), msig(bogie, demon), fee(3 * baseFeeDrops));
+        env(check::create(alice, bob, usd(50)), Msig(bogie, demon), Fee(3 * baseFeeDrops));
         env.close();
         BEAST_EXPECT(checksOnAccount(env, alice).size() == aliceCount + 7);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == bobCount + 7);
@@ -230,7 +230,7 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gateway"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env{*this, features};
 
@@ -242,7 +242,7 @@ class Check_test : public beast::unit_test::suite
          * Attempt to create two checks from `from` to `to` and
          * require they both result in error/success code `expected`
          */
-        auto writeTwoChecksDI = [&env, &USD, this](
+        auto writeTwoChecksDI = [&env, &usd, this](
                                     Account const& from, Account const& to, TER expected) {
             std::uint32_t const fromOwnerCount{ownerCount(env, from)};
             std::uint32_t const toOwnerCount{ownerCount(env, to)};
@@ -250,10 +250,10 @@ class Check_test : public beast::unit_test::suite
             std::size_t const fromCkCount{checksOnAccount(env, from).size()};
             std::size_t const toCkCount{checksOnAccount(env, to).size()};
 
-            env(check::create(from, to, XRP(2000)), ter(expected));
+            env(check::create(from, to, XRP(2000)), Ter(expected));
             env.close();
 
-            env(check::create(from, to, USD(50)), ter(expected));
+            env(check::create(from, to, usd(50)), Ter(expected));
             env.close();
 
             if (isTesSuccess(expected))
@@ -261,16 +261,16 @@ class Check_test : public beast::unit_test::suite
                 BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount + 2);
                 BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount + 2);
 
-                env.require(owners(from, fromOwnerCount + 2));
-                env.require(owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
+                env.require(Owners(from, fromOwnerCount + 2));
+                env.require(Owners(to, to == from ? fromOwnerCount + 2 : toOwnerCount));
                 return;
             }
 
             BEAST_EXPECT(checksOnAccount(env, from).size() == fromCkCount);
             BEAST_EXPECT(checksOnAccount(env, to).size() == toCkCount);
 
-            env.require(owners(from, fromOwnerCount));
-            env.require(owners(to, to == from ? fromOwnerCount : toOwnerCount));
+            env.require(Owners(from, fromOwnerCount));
+            env.require(Owners(to, to == from ? fromOwnerCount : toOwnerCount));
         };
 
         // enable the DisallowIncoming flag on both bob and alice
@@ -311,7 +311,7 @@ class Check_test : public beast::unit_test::suite
         Account const gwF{"gatewayFrozen"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw1["USD"]};
+        IOU const usd{gw1["USD"]};
 
         Env env{*this, features};
 
@@ -320,93 +320,93 @@ class Check_test : public beast::unit_test::suite
         env.close();
 
         // Bad fee.
-        env(check::create(alice, bob, USD(50)), fee(drops(-10)), ter(temBAD_FEE));
+        env(check::create(alice, bob, usd(50)), Fee(drops(-10)), Ter(temBAD_FEE));
         env.close();
 
         // Bad flags.
-        env(check::create(alice, bob, USD(50)), txflags(tfImmediateOrCancel), ter(temINVALID_FLAG));
+        env(check::create(alice, bob, usd(50)), Txflags(tfImmediateOrCancel), Ter(temINVALID_FLAG));
         env.close();
 
         // Check to self.
-        env(check::create(alice, alice, XRP(10)), ter(temREDUNDANT));
+        env(check::create(alice, alice, XRP(10)), Ter(temREDUNDANT));
         env.close();
 
         // Bad amount.
-        env(check::create(alice, bob, drops(-1)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, drops(-1)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, drops(0)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, drops(0)), Ter(temBAD_AMOUNT));
         env.close();
 
         env(check::create(alice, bob, drops(1)));
         env.close();
 
-        env(check::create(alice, bob, USD(-1)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, usd(-1)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, USD(0)), ter(temBAD_AMOUNT));
+        env(check::create(alice, bob, usd(0)), Ter(temBAD_AMOUNT));
         env.close();
 
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
         {
-            IOU const BAD{gw1, badCurrency()};
-            env(check::create(alice, bob, BAD(2)), ter(temBAD_CURRENCY));
+            IOU const bad{gw1, badCurrency()};
+            env(check::create(alice, bob, bad(2)), Ter(temBAD_CURRENCY));
             env.close();
         }
 
         // Bad expiration.
-        env(check::create(alice, bob, USD(50)),
-            expiration(NetClock::time_point{}),
-            ter(temBAD_EXPIRATION));
+        env(check::create(alice, bob, usd(50)),
+            Expiration(NetClock::time_point{}),
+            Ter(temBAD_EXPIRATION));
         env.close();
 
         // Destination does not exist.
         Account const bogie{"bogie"};
-        env(check::create(alice, bogie, USD(50)), ter(tecNO_DST));
+        env(check::create(alice, bogie, usd(50)), Ter(tecNO_DST));
         env.close();
 
         // Require destination tag.
         env(fset(bob, asfRequireDest));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), ter(tecDST_TAG_NEEDED));
+        env(check::create(alice, bob, usd(50)), Ter(tecDST_TAG_NEEDED));
         env.close();
 
-        env(check::create(alice, bob, USD(50)), dest_tag(11));
+        env(check::create(alice, bob, usd(50)), DestTag(11));
         env.close();
 
         env(fclear(bob, asfRequireDest));
         env.close();
         {
             // Globally frozen asset.
-            IOU const USF{gwF["USF"]};
+            IOU const usf{gwF["USF"]};
             env(fset(gwF, asfGlobalFreeze));
             env.close();
 
-            env(check::create(alice, bob, USF(50)), ter(tecFROZEN));
+            env(check::create(alice, bob, usf(50)), Ter(tecFROZEN));
             env.close();
 
-            env(check::create(gwF, bob, USF(50)), ter(tecFROZEN));
+            env(check::create(gwF, bob, usf(50)), Ter(tecFROZEN));
             env.close();
 
             env(fclear(gwF, asfGlobalFreeze));
             env.close();
 
-            env(check::create(alice, bob, USF(50)));
+            env(check::create(alice, bob, usf(50)));
             env.close();
 
-            env(check::create(gwF, bob, USF(50)));
+            env(check::create(gwF, bob, usf(50)));
             env.close();
         }
         {
             // Frozen trust line.  Check creation should be similar to payment
             // behavior in the face of frozen trust lines.
-            env.trust(USD(1000), alice);
-            env.trust(USD(1000), bob);
+            env.trust(usd(1000), alice);
+            env.trust(usd(1000), bob);
             env.close();
-            env(pay(gw1, alice, USD(25)));
-            env(pay(gw1, bob, USD(25)));
+            env(pay(gw1, alice, usd(25)));
+            env(pay(gw1, bob, usd(25)));
             env.close();
 
             // Setting trustline freeze in one direction prevents alice from
@@ -414,58 +414,58 @@ class Check_test : public beast::unit_test::suite
             // to create a check for USD to alice.
             env(trust(gw1, alice["USD"](0), tfSetFreeze));
             env.close();
-            env(check::create(alice, bob, USD(50)), ter(tecFROZEN));
+            env(check::create(alice, bob, usd(50)), Ter(tecFROZEN));
             env.close();
-            env(pay(alice, bob, USD(1)), ter(tecPATH_DRY));
+            env(pay(alice, bob, usd(1)), Ter(tecPATH_DRY));
             env.close();
-            env(check::create(bob, alice, USD(50)));
+            env(check::create(bob, alice, usd(50)));
             env.close();
-            env(pay(bob, alice, USD(1)));
+            env(pay(bob, alice, usd(1)));
             env.close();
-            env(check::create(gw1, alice, USD(50)));
+            env(check::create(gw1, alice, usd(50)));
             env.close();
-            env(pay(gw1, alice, USD(1)));
+            env(pay(gw1, alice, usd(1)));
             env.close();
 
             // Clear that freeze.  Now check creation works.
             env(trust(gw1, alice["USD"](0), tfClearFreeze));
             env.close();
-            env(check::create(alice, bob, USD(50)));
+            env(check::create(alice, bob, usd(50)));
             env.close();
-            env(check::create(bob, alice, USD(50)));
+            env(check::create(bob, alice, usd(50)));
             env.close();
-            env(check::create(gw1, alice, USD(50)));
+            env(check::create(gw1, alice, usd(50)));
             env.close();
 
             // Freezing in the other direction does not effect alice's USD
             // check creation, but prevents bob and gw1 from writing a check
             // for USD to alice.
-            env(trust(alice, USD(0), tfSetFreeze));
+            env(trust(alice, usd(0), tfSetFreeze));
             env.close();
-            env(check::create(alice, bob, USD(50)));
+            env(check::create(alice, bob, usd(50)));
             env.close();
-            env(pay(alice, bob, USD(1)));
+            env(pay(alice, bob, usd(1)));
             env.close();
-            env(check::create(bob, alice, USD(50)), ter(tecFROZEN));
+            env(check::create(bob, alice, usd(50)), Ter(tecFROZEN));
             env.close();
-            env(pay(bob, alice, USD(1)), ter(tecPATH_DRY));
+            env(pay(bob, alice, usd(1)), Ter(tecPATH_DRY));
             env.close();
-            env(check::create(gw1, alice, USD(50)), ter(tecFROZEN));
+            env(check::create(gw1, alice, usd(50)), Ter(tecFROZEN));
             env.close();
-            env(pay(gw1, alice, USD(1)), ter(tecPATH_DRY));
+            env(pay(gw1, alice, usd(1)), Ter(tecPATH_DRY));
             env.close();
 
             // Clear that freeze.
-            env(trust(alice, USD(0), tfClearFreeze));
+            env(trust(alice, usd(0), tfClearFreeze));
             env.close();
         }
 
         // Expired expiration.
-        env(check::create(alice, bob, USD(50)), expiration(env.now()), ter(tecEXPIRED));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now()), Ter(tecEXPIRED));
         env.close();
 
         using namespace std::chrono_literals;
-        env(check::create(alice, bob, USD(50)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, usd(50)), Expiration(env.now() + 1s));
         env.close();
 
         // Insufficient reserve.
@@ -473,15 +473,15 @@ class Check_test : public beast::unit_test::suite
         env.fund(env.current()->fees().accountReserve(1) - drops(1), cheri);
         env.close();
 
-        env(check::create(cheri, bob, USD(50)),
-            fee(drops(env.current()->fees().base)),
-            ter(tecINSUFFICIENT_RESERVE));
+        env(check::create(cheri, bob, usd(50)),
+            Fee(drops(env.current()->fees().base)),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
 
         env(pay(bob, cheri, drops(env.current()->fees().base + 1)));
         env.close();
 
-        env(check::create(cheri, bob, USD(50)));
+        env(check::create(cheri, bob, usd(50)));
         env.close();
     }
 
@@ -507,8 +507,8 @@ class Check_test : public beast::unit_test::suite
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
             env(check::create(alice, bob, XRP(10)));
             env.close();
-            env.require(balance(alice, startBalance - drops(baseFeeDrops)));
-            env.require(balance(bob, startBalance));
+            env.require(Balance(alice, startBalance - drops(baseFeeDrops)));
+            env.require(Balance(bob, startBalance));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -516,8 +516,8 @@ class Check_test : public beast::unit_test::suite
 
             env(check::cash(bob, chkId, XRP(10)));
             env.close();
-            env.require(balance(alice, startBalance - XRP(10) - drops(baseFeeDrops)));
-            env.require(balance(bob, startBalance + XRP(10) - drops(baseFeeDrops)));
+            env.require(Balance(alice, startBalance - XRP(10) - drops(baseFeeDrops)));
+            env.require(Balance(bob, startBalance + XRP(10) - drops(baseFeeDrops)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 0);
@@ -527,8 +527,8 @@ class Check_test : public beast::unit_test::suite
             env(pay(env.master, alice, XRP(10) + drops(baseFeeDrops)));
             env(pay(bob, env.master, XRP(10) - drops(baseFeeDrops * 2)));
             env.close();
-            env.require(balance(alice, startBalance));
-            env.require(balance(bob, startBalance));
+            env.require(Balance(alice, startBalance));
+            env.require(Balance(bob, startBalance));
         }
         {
             // Write a check that chews into alice's reserve.
@@ -539,10 +539,10 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             // bob tries to cash for more than the check amount.
-            env(check::cash(bob, chkId, checkAmount + drops(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, checkAmount + drops(1)), Ter(tecPATH_PARTIAL));
             env.close();
             env(check::cash(bob, chkId, check::DeliverMin(checkAmount + drops(1))),
-                ter(tecPATH_PARTIAL));
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob cashes exactly the check amount.  This is successful
@@ -550,8 +550,8 @@ class Check_test : public beast::unit_test::suite
             // check is consumed.
             env(check::cash(bob, chkId, check::DeliverMin(checkAmount)));
             verifyDeliveredAmount(env, drops(checkAmount.mantissa()));
-            env.require(balance(alice, reserve));
-            env.require(balance(bob, startBalance + checkAmount - drops(baseFeeDrops * 3)));
+            env.require(Balance(alice, reserve));
+            env.require(Balance(bob, startBalance + checkAmount - drops(baseFeeDrops * 3)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 0);
@@ -561,8 +561,8 @@ class Check_test : public beast::unit_test::suite
             env(pay(env.master, alice, checkAmount + drops(baseFeeDrops)));
             env(pay(bob, env.master, checkAmount - drops(baseFeeDrops * 4)));
             env.close();
-            env.require(balance(alice, startBalance));
-            env.require(balance(bob, startBalance));
+            env.require(Balance(alice, startBalance));
+            env.require(Balance(bob, startBalance));
         }
         {
             // Write a check that goes one drop past what alice can pay.
@@ -574,14 +574,14 @@ class Check_test : public beast::unit_test::suite
 
             // bob tries to cash for exactly the check amount.  Fails because
             // alice is one drop shy of funding the check.
-            env(check::cash(bob, chkId, checkAmount), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, checkAmount), Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob decides to get what he can from the bounced check.
             env(check::cash(bob, chkId, check::DeliverMin(drops(1))));
             verifyDeliveredAmount(env, drops(checkAmount.mantissa() - 1));
-            env.require(balance(alice, reserve));
-            env.require(balance(bob, startBalance + checkAmount - drops(baseFeeDrops * 2 + 1)));
+            env.require(Balance(alice, reserve));
+            env.require(Balance(bob, startBalance + checkAmount - drops(baseFeeDrops * 2 + 1)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 0);
@@ -591,8 +591,8 @@ class Check_test : public beast::unit_test::suite
             env(pay(env.master, alice, checkAmount + drops(baseFeeDrops - 1)));
             env(pay(bob, env.master, checkAmount - drops(baseFeeDrops * 3 + 1)));
             env.close();
-            env.require(balance(alice, startBalance));
-            env.require(balance(bob, startBalance));
+            env.require(Balance(alice, startBalance));
+            env.require(Balance(bob, startBalance));
         }
     }
 
@@ -607,7 +607,7 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gateway"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
         {
             // Simple IOU check cashed with Amount (with failures).
             Env env{*this, features};
@@ -617,67 +617,68 @@ class Check_test : public beast::unit_test::suite
 
             // alice writes the check before she gets the funds.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             // bob attempts to cash the check.  Should fail.
-            env(check::cash(bob, chkId1, USD(10)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(10)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // alice gets almost enough funds.  bob tries and fails again.
-            env(trust(alice, USD(20)));
+            env(trust(alice, usd(20)));
             env.close();
-            env(pay(gw, alice, USD(9.5)));
+            env(pay(gw, alice, usd(9.5)));
             env.close();
-            env(check::cash(bob, chkId1, USD(10)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(10)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // alice gets the last of the necessary funds.  bob tries again
             // and fails because he hasn't got a trust line for USD.
-            env(pay(gw, alice, USD(0.5)));
+            env(pay(gw, alice, usd(0.5)));
             env.close();
 
             // bob sets up the trust line, but not at a high enough limit.
-            env(trust(bob, USD(9.5)));
+            env(trust(bob, usd(9.5)));
             env.close();
 
             // bob sets the trust line limit high enough but asks for more
             // than the check's SendMax.
-            env(trust(bob, USD(10.5)));
+            env(trust(bob, usd(10.5)));
             env.close();
-            env(check::cash(bob, chkId1, USD(10.5)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId1, usd(10.5)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob asks for exactly the check amount and the check clears.
-            env(check::cash(bob, chkId1, USD(10)));
+            env(check::cash(bob, chkId1, usd(10)));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(10)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(10)));
+
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob tries to cash the same check again, which fails.
-            env(check::cash(bob, chkId1, USD(10)), ter(tecNO_ENTRY));
+            env(check::cash(bob, chkId1, usd(10)), Ter(tecNO_ENTRY));
             env.close();
 
             // bob pays alice USD(7) so he can try another case.
-            env(pay(bob, alice, USD(7)));
+            env(pay(bob, alice, usd(7)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(7)));
+            env(check::create(alice, bob, usd(7)));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
 
             // bob cashes the check for less than the face amount.  That works,
             // consumes the check, and bob receives as much as he asked for.
-            env(check::cash(bob, chkId2, USD(5)));
+            env(check::cash(bob, chkId2, usd(5)));
             env.close();
-            env.require(balance(alice, USD(2)));
-            env.require(balance(bob, USD(8)));
+            env.require(Balance(alice, usd(2)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -685,19 +686,19 @@ class Check_test : public beast::unit_test::suite
 
             // alice writes two checks for USD(2), although she only has USD(2).
             uint256 const chkId3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(2)));
+            env(check::create(alice, bob, usd(2)));
             env.close();
             uint256 const chkId4{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(2)));
+            env(check::create(alice, bob, usd(2)));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 2);
 
             // bob cashes the second check for the face amount.
-            env(check::cash(bob, chkId4, USD(2)));
+            env(check::cash(bob, chkId4, usd(2)));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(10)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(10)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -705,10 +706,10 @@ class Check_test : public beast::unit_test::suite
 
             // bob is not allowed to cash the last check for USD(0), he must
             // use check::cancel instead.
-            env(check::cash(bob, chkId3, USD(0)), ter(temBAD_AMOUNT));
+            env(check::cash(bob, chkId3, usd(0)), Ter(temBAD_AMOUNT));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(10)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(10)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -724,27 +725,27 @@ class Check_test : public beast::unit_test::suite
             // a check can.
 
             // Payment of 20 USD fails.
-            env(pay(gw, bob, USD(20)), ter(tecPATH_PARTIAL));
+            env(pay(gw, bob, usd(20)), Ter(tecPATH_PARTIAL));
             env.close();
 
             uint256 const chkId20{getCheckIndex(gw, env.seq(gw))};
-            env(check::create(gw, bob, USD(20)));
+            env(check::create(gw, bob, usd(20)));
             env.close();
 
             // However cashing a check for 20 USD succeeds.
-            env(check::cash(bob, chkId20, USD(20)));
+            env(check::cash(bob, chkId20, usd(20)));
             env.close();
-            env.require(balance(bob, USD(30)));
+            env.require(Balance(bob, usd(30)));
 
             // Clean up this most recent experiment so the rest of the
             // tests work.
-            env(pay(bob, gw, USD(20)));
+            env(pay(bob, gw, usd(20)));
 
             // ... so bob cancels alice's remaining check.
             env(check::cancel(bob, chkId3));
             env.close();
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(10)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(10)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -757,66 +758,66 @@ class Check_test : public beast::unit_test::suite
             env.fund(XRP(1000), gw, alice, bob);
             env.close();
 
-            env(trust(alice, USD(20)));
-            env(trust(bob, USD(20)));
+            env(trust(alice, usd(20)));
+            env(trust(bob, usd(20)));
             env.close();
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // alice creates several checks ahead of time.
             uint256 const chkId9{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(9)));
+            env(check::create(alice, bob, usd(9)));
             env.close();
             uint256 const chkId8{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(8)));
+            env(check::create(alice, bob, usd(8)));
             env.close();
             uint256 const chkId7{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(7)));
+            env(check::create(alice, bob, usd(7)));
             env.close();
             uint256 const chkId6{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(6)));
+            env(check::create(alice, bob, usd(6)));
             env.close();
 
             // bob attempts to cash a check for the amount on the check.
             // Should fail, since alice doesn't have the funds.
-            env(check::cash(bob, chkId9, check::DeliverMin(USD(9))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId9, check::DeliverMin(usd(9))), Ter(tecPATH_PARTIAL));
             env.close();
 
             // bob sets a DeliverMin of 7 and gets all that alice has.
-            env(check::cash(bob, chkId9, check::DeliverMin(USD(7))));
-            verifyDeliveredAmount(env, USD(8));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId9, check::DeliverMin(usd(7))));
+            verifyDeliveredAmount(env, usd(8));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 3);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 3);
             BEAST_EXPECT(ownerCount(env, alice) == 4);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob pays alice USD(7) so he can use another check.
-            env(pay(bob, alice, USD(7)));
+            env(pay(bob, alice, usd(7)));
             env.close();
 
             // Using DeliverMin for the SendMax value of the check (and no
             // transfer fees) should work just like setting Amount.
-            env(check::cash(bob, chkId7, check::DeliverMin(USD(7))));
-            verifyDeliveredAmount(env, USD(7));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId7, check::DeliverMin(usd(7))));
+            verifyDeliveredAmount(env, usd(7));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 2);
             BEAST_EXPECT(ownerCount(env, alice) == 3);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // bob pays alice USD(8) so he can use the last two checks.
-            env(pay(bob, alice, USD(8)));
+            env(pay(bob, alice, usd(8)));
             env.close();
 
             // alice has USD(8). If bob uses the check for USD(6) and uses a
             // DeliverMin of 4, he should get the SendMax value of the check.
-            env(check::cash(bob, chkId6, check::DeliverMin(USD(4))));
-            verifyDeliveredAmount(env, USD(6));
-            env.require(balance(alice, USD(2)));
-            env.require(balance(bob, USD(6)));
+            env(check::cash(bob, chkId6, check::DeliverMin(usd(4))));
+            verifyDeliveredAmount(env, usd(6));
+            env.require(Balance(alice, usd(2)));
+            env.require(Balance(bob, usd(6)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -824,10 +825,10 @@ class Check_test : public beast::unit_test::suite
 
             // bob cashes the last remaining check setting a DeliverMin.
             // of exactly alice's remaining USD.
-            env(check::cash(bob, chkId8, check::DeliverMin(USD(2))));
-            verifyDeliveredAmount(env, USD(2));
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, USD(8)));
+            env(check::cash(bob, chkId8, check::DeliverMin(usd(2))));
+            verifyDeliveredAmount(env, usd(2));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, usd(8)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -840,31 +841,31 @@ class Check_test : public beast::unit_test::suite
             env.fund(XRP(1000), gw, alice, bob);
             env(fset(gw, asfRequireAuth));
             env.close();
-            env(trust(gw, alice["USD"](100)), txflags(tfSetfAuth));
-            env(trust(alice, USD(20)));
+            env(trust(gw, alice["USD"](100)), Txflags(tfSetfAuth));
+            env(trust(alice, usd(20)));
             env.close();
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // alice writes a check to bob for USD.  bob can't cash it
             // because he is not authorized to hold gw["USD"].
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(7)));
+            env(check::create(alice, bob, usd(7)));
             env.close();
 
-            env(check::cash(bob, chkId, USD(7)), ter(tecNO_AUTH));
+            env(check::cash(bob, chkId, usd(7)), Ter(tecNO_AUTH));
             env.close();
 
             // Now give bob a trustline for USD.  bob still can't cash the
             // check because he is not authorized.
-            env(trust(bob, USD(5)));
+            env(trust(bob, usd(5)));
             env.close();
 
-            env(check::cash(bob, chkId, USD(7)), ter(tecNO_AUTH));
+            env(check::cash(bob, chkId, usd(7)), Ter(tecNO_AUTH));
             env.close();
 
             // bob gets authorization to hold gw["USD"].
-            env(trust(gw, bob["USD"](1)), txflags(tfSetfAuth));
+            env(trust(gw, bob["USD"](1)), Txflags(tfSetfAuth));
             env.close();
 
             // Two possible outcomes here depending on whether cashing a
@@ -874,11 +875,11 @@ class Check_test : public beast::unit_test::suite
             //     his trust limit.
             //  o If it can build a trust line, then the check is allowed to
             //    exceed the trust limit and bob gets the full transfer.
-            env(check::cash(bob, chkId, check::DeliverMin(USD(4))));
-            STAmount const bobGot = USD(7);
+            env(check::cash(bob, chkId, check::DeliverMin(usd(4))));
+            STAmount const bobGot = usd(7);
             verifyDeliveredAmount(env, bobGot);
-            env.require(balance(alice, USD(8) - bobGot));
-            env.require(balance(bob, bobGot));
+            env.require(Balance(alice, usd(8) - bobGot));
+            env.require(Balance(bob, bobGot));
 
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
@@ -894,36 +895,36 @@ class Check_test : public beast::unit_test::suite
 
             // alice creates her checks ahead of time.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(1)));
+            env(check::create(alice, bob, usd(1)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(2)));
+            env(check::create(alice, bob, usd(2)));
             env.close();
 
-            env(trust(alice, USD(20)));
-            env(trust(bob, USD(20)));
+            env(trust(alice, usd(20)));
+            env(trust(bob, usd(20)));
             env.close();
-            env(pay(gw, alice, USD(8)));
+            env(pay(gw, alice, usd(8)));
             env.close();
 
             // Give bob a regular key and signers
-            Account const bobby{"bobby", KeyType::secp256k1};
+            Account const bobby{"bobby", KeyType::Secp256k1};
             env(regkey(bob, bobby));
             env.close();
 
-            Account const bogie{"bogie", KeyType::secp256k1};
-            Account const demon{"demon", KeyType::ed25519};
-            env(signers(bob, 2, {{bogie, 1}, {demon, 1}}), sig(bobby));
+            Account const bogie{"bogie", KeyType::Secp256k1};
+            Account const demon{"demon", KeyType::Ed25519};
+            env(signers(bob, 2, {{bogie, 1}, {demon, 1}}), Sig(bobby));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, bob) == 2);
 
             // bob uses his regular key to cash a check.
-            env(check::cash(bob, chkId1, (USD(1))), sig(bobby));
+            env(check::cash(bob, chkId1, (usd(1))), Sig(bobby));
             env.close();
-            env.require(balance(alice, USD(7)));
-            env.require(balance(bob, USD(1)));
+            env.require(Balance(alice, usd(7)));
+            env.require(Balance(bob, usd(1)));
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -931,10 +932,10 @@ class Check_test : public beast::unit_test::suite
 
             // bob uses multisigning to cash a check.
             XRPAmount const baseFeeDrops{env.current()->fees().base};
-            env(check::cash(bob, chkId2, (USD(2))), msig(bogie, demon), fee(3 * baseFeeDrops));
+            env(check::cash(bob, chkId2, (usd(2))), Msig(bogie, demon), Fee(3 * baseFeeDrops));
             env.close();
-            env.require(balance(alice, USD(5)));
-            env.require(balance(bob, USD(3)));
+            env.require(Balance(alice, usd(5)));
+            env.require(Balance(bob, usd(3)));
             BEAST_EXPECT(checksOnAccount(env, alice).empty());
             BEAST_EXPECT(checksOnAccount(env, bob).empty());
             BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -953,17 +954,17 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gateway"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env{*this, features};
 
         env.fund(XRP(1000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, usd(1000)));
         env.close();
-        env(pay(gw, alice, USD(1000)));
+        env(pay(gw, alice, usd(1000)));
         env.close();
 
         // Set gw's transfer rate and see the consequences when cashing a check.
@@ -973,28 +974,28 @@ class Check_test : public beast::unit_test::suite
         // alice writes a check with a SendMax of USD(125).  The most bob
         // can get is USD(100) because of the transfer rate.
         uint256 const chkId125{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(125)));
+        env(check::create(alice, bob, usd(125)));
         env.close();
 
         // alice writes another check that won't get cashed until the transfer
         // rate changes so we can see the rate applies when the check is
         // cashed, not when it is created.
         uint256 const chkId120{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(120)));
+        env(check::create(alice, bob, usd(120)));
         env.close();
 
         // bob attempts to cash the check for face value.  Should fail.
-        env(check::cash(bob, chkId125, USD(125)), ter(tecPATH_PARTIAL));
+        env(check::cash(bob, chkId125, usd(125)), Ter(tecPATH_PARTIAL));
         env.close();
-        env(check::cash(bob, chkId125, check::DeliverMin(USD(101))), ter(tecPATH_PARTIAL));
+        env(check::cash(bob, chkId125, check::DeliverMin(usd(101))), Ter(tecPATH_PARTIAL));
         env.close();
 
         // bob decides that he'll accept anything USD(75) or up.
         // He gets USD(100).
-        env(check::cash(bob, chkId125, check::DeliverMin(USD(75))));
-        verifyDeliveredAmount(env, USD(100));
-        env.require(balance(alice, USD(1000 - 125)));
-        env.require(balance(bob, USD(0 + 100)));
+        env(check::cash(bob, chkId125, check::DeliverMin(usd(75))));
+        verifyDeliveredAmount(env, usd(100));
+        env.require(Balance(alice, usd(1000 - 125)));
+        env.require(Balance(bob, usd(0 + 100)));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
         BEAST_EXPECT(checksOnAccount(env, bob).size() == 1);
 
@@ -1004,10 +1005,10 @@ class Check_test : public beast::unit_test::suite
 
         // bob cashes the second check for less than the face value.  The new
         // rate applies to the actual value transferred.
-        env(check::cash(bob, chkId120, USD(50)));
+        env(check::cash(bob, chkId120, usd(50)));
         env.close();
-        env.require(balance(alice, USD(1000 - 125 - 60)));
-        env.require(balance(bob, USD(0 + 100 + 50)));
+        env.require(Balance(alice, usd(1000 - 125 - 60)));
+        env.require(Balance(bob, usd(0 + 100 + 50)));
         BEAST_EXPECT(checksOnAccount(env, alice).empty());
         BEAST_EXPECT(checksOnAccount(env, bob).empty());
     }
@@ -1023,17 +1024,17 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gateway"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env{*this, features};
 
         env.fund(XRP(1000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, usd(1000)));
         env.close();
-        env(pay(gw, alice, USD(1000)));
+        env(pay(gw, alice, usd(1000)));
         env.close();
 
         //
@@ -1041,29 +1042,29 @@ class Check_test : public beast::unit_test::suite
         //
 
         // Provide lambdas that return a qualityInPercent and qualityOutPercent.
-        auto qIn = [](double percent) { return qualityInPercent(percent); };
-        auto qOut = [](double percent) { return qualityOutPercent(percent); };
+        auto qIn = [](double percent) { return QualityInPercent(percent); };
+        auto qOut = [](double percent) { return QualityOutPercent(percent); };
 
         // There are two test lambdas: one for a Payment and one for a Check.
         // This shows whether a Payment and a Check behave the same.
-        auto testNonIssuerQPay = [&env, &alice, &bob, &USD](
+        auto testNonIssuerQPay = [&env, &alice, &bob, &usd](
                                      Account const& truster,
                                      IOU const& iou,
                                      auto const& inOrOut,
                                      double pct,
                                      double amount) {
             // Capture bob's and alice's balances so we can test at the end.
-            STAmount const aliceStart{env.balance(alice, USD).value()};
-            STAmount const bobStart{env.balance(bob, USD).value()};
+            STAmount const aliceStart{env.balance(alice, usd).value()};
+            STAmount const bobStart{env.balance(bob, usd).value()};
 
             // Set the modified quality.
             env(trust(truster, iou(1000)), inOrOut(pct));
             env.close();
 
-            env(pay(alice, bob, USD(amount)), sendmax(USD(10)));
+            env(pay(alice, bob, usd(amount)), Sendmax(usd(10)));
             env.close();
-            env.require(balance(alice, aliceStart - USD(10)));
-            env.require(balance(bob, bobStart + USD(10)));
+            env.require(Balance(alice, aliceStart - usd(10)));
+            env.require(Balance(bob, bobStart + usd(10)));
 
             // Return the quality to the unmodified state so it doesn't
             // interfere with upcoming tests.
@@ -1071,28 +1072,28 @@ class Check_test : public beast::unit_test::suite
             env.close();
         };
 
-        auto testNonIssuerQCheck = [&env, &alice, &bob, &USD](
+        auto testNonIssuerQCheck = [&env, &alice, &bob, &usd](
                                        Account const& truster,
                                        IOU const& iou,
                                        auto const& inOrOut,
                                        double pct,
                                        double amount) {
             // Capture bob's and alice's balances so we can test at the end.
-            STAmount const aliceStart{env.balance(alice, USD).value()};
-            STAmount const bobStart{env.balance(bob, USD).value()};
+            STAmount const aliceStart{env.balance(alice, usd).value()};
+            STAmount const bobStart{env.balance(bob, usd).value()};
 
             // Set the modified quality.
             env(trust(truster, iou(1000)), inOrOut(pct));
             env.close();
 
             uint256 const chkId = getCheckIndex(alice, env.seq(alice));
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
-            env(check::cash(bob, chkId, USD(amount)));
+            env(check::cash(bob, chkId, usd(amount)));
             env.close();
-            env.require(balance(alice, aliceStart - USD(10)));
-            env.require(balance(bob, bobStart + USD(10)));
+            env.require(Balance(alice, aliceStart - usd(10)));
+            env.require(Balance(bob, bobStart + usd(10)));
 
             // Return the quality to the unmodified state so it doesn't
             // interfere with upcoming tests.
@@ -1131,7 +1132,7 @@ class Check_test : public beast::unit_test::suite
         //
 
         // There are two test lambdas for the same reason as before.
-        auto testIssuerQPay = [&env, &gw, &alice, &USD](
+        auto testIssuerQPay = [&env, &gw, &alice, &usd](
                                   Account const& truster,
                                   IOU const& iou,
                                   auto const& inOrOut,
@@ -1142,21 +1143,21 @@ class Check_test : public beast::unit_test::suite
                                   double max2) {
             // Capture alice's balance so we can test at the end.  It doesn't
             // make any sense to look at the balance of a gateway.
-            STAmount const aliceStart{env.balance(alice, USD).value()};
+            STAmount const aliceStart{env.balance(alice, usd).value()};
 
             // Set the modified quality.
             env(trust(truster, iou(1000)), inOrOut(pct));
             env.close();
 
             // alice pays gw.
-            env(pay(alice, gw, USD(amt1)), sendmax(USD(max1)));
+            env(pay(alice, gw, usd(amt1)), Sendmax(usd(max1)));
             env.close();
-            env.require(balance(alice, aliceStart - USD(10)));
+            env.require(Balance(alice, aliceStart - usd(10)));
 
             // gw pays alice.
-            env(pay(gw, alice, USD(amt2)), sendmax(USD(max2)));
+            env(pay(gw, alice, usd(amt2)), Sendmax(usd(max2)));
             env.close();
-            env.require(balance(alice, aliceStart));
+            env.require(Balance(alice, aliceStart));
 
             // Return the quality to the unmodified state so it doesn't
             // interfere with upcoming tests.
@@ -1164,7 +1165,7 @@ class Check_test : public beast::unit_test::suite
             env.close();
         };
 
-        auto testIssuerQCheck = [&env, &gw, &alice, &USD](
+        auto testIssuerQCheck = [&env, &gw, &alice, &usd](
                                     Account const& truster,
                                     IOU const& iou,
                                     auto const& inOrOut,
@@ -1175,7 +1176,7 @@ class Check_test : public beast::unit_test::suite
                                     double max2) {
             // Capture alice's balance so we can test at the end.  It doesn't
             // make any sense to look at the balance of the issuer.
-            STAmount const aliceStart{env.balance(alice, USD).value()};
+            STAmount const aliceStart{env.balance(alice, usd).value()};
 
             // Set the modified quality.
             env(trust(truster, iou(1000)), inOrOut(pct));
@@ -1183,21 +1184,21 @@ class Check_test : public beast::unit_test::suite
 
             // alice writes check to gw.  gw cashes.
             uint256 const chkAliceId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, gw, USD(max1)));
+            env(check::create(alice, gw, usd(max1)));
             env.close();
 
-            env(check::cash(gw, chkAliceId, USD(amt1)));
+            env(check::cash(gw, chkAliceId, usd(amt1)));
             env.close();
-            env.require(balance(alice, aliceStart - USD(10)));
+            env.require(Balance(alice, aliceStart - usd(10)));
 
             // gw writes check to alice.  alice cashes.
             uint256 const chkGwId{getCheckIndex(gw, env.seq(gw))};
-            env(check::create(gw, alice, USD(max2)));
+            env(check::create(gw, alice, usd(max2)));
             env.close();
 
-            env(check::cash(alice, chkGwId, USD(amt2)));
+            env(check::cash(alice, chkGwId, usd(amt2)));
             env.close();
-            env.require(balance(alice, aliceStart));
+            env.require(Balance(alice, aliceStart));
 
             // Return the quality to the unmodified state so it doesn't
             // interfere with upcoming tests.
@@ -1232,7 +1233,7 @@ class Check_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const bob{"bob"};
         Account const zoe{"zoe"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env(*this, features);
 
@@ -1240,25 +1241,25 @@ class Check_test : public beast::unit_test::suite
         env.close();
 
         // Now set up alice's trustline.
-        env(trust(alice, USD(20)));
+        env(trust(alice, usd(20)));
         env.close();
-        env(pay(gw, alice, USD(20)));
+        env(pay(gw, alice, usd(20)));
         env.close();
 
         // Now set up bob's trustline.
-        env(trust(bob, USD(20)));
+        env(trust(bob, usd(20)));
         env.close();
 
         // bob tries to cash a non-existent check from alice.
         {
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::cash(bob, chkId, USD(20)), ter(tecNO_ENTRY));
+            env(check::cash(bob, chkId, usd(20)), Ter(tecNO_ENTRY));
             env.close();
         }
 
         // alice creates her checks ahead of time.
         uint256 const chkIdU{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(20)));
+        env(check::create(alice, bob, usd(20)));
         env.close();
 
         uint256 const chkIdX{getCheckIndex(alice, env.seq(alice))};
@@ -1267,66 +1268,66 @@ class Check_test : public beast::unit_test::suite
 
         using namespace std::chrono_literals;
         uint256 const chkIdExp{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, XRP(10)), expiration(env.now() + 1s));
+        env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 1s));
         env.close();
 
         uint256 const chkIdFroz1{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
 
         uint256 const chkIdFroz2{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(2)));
+        env(check::create(alice, bob, usd(2)));
         env.close();
 
         uint256 const chkIdFroz3{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(3)));
+        env(check::create(alice, bob, usd(3)));
         env.close();
 
         uint256 const chkIdFroz4{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(4)));
+        env(check::create(alice, bob, usd(4)));
         env.close();
 
         uint256 const chkIdFroz4ToIssuer{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, gw, USD(4)));
+        env(check::create(alice, gw, usd(4)));
         env.close();
 
         uint256 const chkIdFroz4Issuer{getCheckIndex(gw, env.seq(gw))};
-        env(check::create(gw, alice, USD(4)));
+        env(check::create(gw, alice, usd(4)));
         env.close();
 
         uint256 const chkIdNoDest1{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(1)));
+        env(check::create(alice, bob, usd(1)));
         env.close();
 
         uint256 const chkIdHasDest2{getCheckIndex(alice, env.seq(alice))};
-        env(check::create(alice, bob, USD(2)), dest_tag(7));
+        env(check::create(alice, bob, usd(2)), DestTag(7));
         env.close();
 
         // Same set of failing cases for both IOU and XRP check cashing.
         auto failingCases = [&env, &gw, &alice, &bob](
                                 uint256 const& chkId, STAmount const& amount) {
             // Bad fee.
-            env(check::cash(bob, chkId, amount), fee(drops(-10)), ter(temBAD_FEE));
+            env(check::cash(bob, chkId, amount), Fee(drops(-10)), Ter(temBAD_FEE));
             env.close();
 
             // Bad flags.
             env(check::cash(bob, chkId, amount),
-                txflags(tfImmediateOrCancel),
-                ter(temINVALID_FLAG));
+                Txflags(tfImmediateOrCancel),
+                Ter(temINVALID_FLAG));
             env.close();
 
             // Missing both Amount and DeliverMin.
             {
-                Json::Value tx{check::cash(bob, chkId, amount)};
+                json::Value tx{check::cash(bob, chkId, amount)};
                 tx.removeMember(sfAmount.jsonName);
-                env(tx, ter(temMALFORMED));
+                env(tx, Ter(temMALFORMED));
                 env.close();
             }
             // Both Amount and DeliverMin present.
             {
-                Json::Value tx{check::cash(bob, chkId, amount)};
-                tx[sfDeliverMin.jsonName] = amount.getJson(JsonOptions::none);
-                env(tx, ter(temMALFORMED));
+                json::Value tx{check::cash(bob, chkId, amount)};
+                tx[sfDeliverMin.jsonName] = amount.getJson(JsonOptions::KNone);
+                env(tx, Ter(temMALFORMED));
                 env.close();
             }
 
@@ -1334,9 +1335,9 @@ class Check_test : public beast::unit_test::suite
             {
                 STAmount neg{amount};
                 neg.negate();
-                env(check::cash(bob, chkId, neg), ter(temBAD_AMOUNT));
+                env(check::cash(bob, chkId, neg), Ter(temBAD_AMOUNT));
                 env.close();
-                env(check::cash(bob, chkId, amount.zeroed()), ter(temBAD_AMOUNT));
+                env(check::cash(bob, chkId, amount.zeroed()), Ter(temBAD_AMOUNT));
                 env.close();
             }
 
@@ -1346,14 +1347,14 @@ class Check_test : public beast::unit_test::suite
                 Issue const badIssue{badCurrency(), amount.getIssuer()};
                 STAmount badAmount{amount};
                 badAmount.setIssue(Issue{badCurrency(), amount.getIssuer()});
-                env(check::cash(bob, chkId, badAmount), ter(temBAD_CURRENCY));
+                env(check::cash(bob, chkId, badAmount), Ter(temBAD_CURRENCY));
                 env.close();
             }
 
             // Not destination cashing check.
-            env(check::cash(alice, chkId, amount), ter(tecNO_PERMISSION));
+            env(check::cash(alice, chkId, amount), Ter(tecNO_PERMISSION));
             env.close();
-            env(check::cash(gw, chkId, amount), ter(tecNO_PERMISSION));
+            env(check::cash(gw, chkId, amount), Ter(tecNO_PERMISSION));
             env.close();
 
             // Currency mismatch.
@@ -1361,7 +1362,7 @@ class Check_test : public beast::unit_test::suite
                 IOU const wrongCurrency{gw["EUR"]};
                 STAmount badAmount{amount};
                 badAmount.setIssue(wrongCurrency);
-                env(check::cash(bob, chkId, badAmount), ter(temMALFORMED));
+                env(check::cash(bob, chkId, badAmount), Ter(temMALFORMED));
                 env.close();
             }
 
@@ -1370,30 +1371,30 @@ class Check_test : public beast::unit_test::suite
                 IOU const wrongIssuer{alice["USD"]};
                 STAmount badAmount{amount};
                 badAmount.setIssue(wrongIssuer);
-                env(check::cash(bob, chkId, badAmount), ter(temMALFORMED));
+                env(check::cash(bob, chkId, badAmount), Ter(temMALFORMED));
                 env.close();
             }
 
             // Amount bigger than SendMax.
-            env(check::cash(bob, chkId, amount + amount), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, amount + amount), Ter(tecPATH_PARTIAL));
             env.close();
 
             // DeliverMin bigger than SendMax.
-            env(check::cash(bob, chkId, check::DeliverMin(amount + amount)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkId, check::DeliverMin(amount + amount)), Ter(tecPATH_PARTIAL));
             env.close();
         };
 
         failingCases(chkIdX, XRP(10));
-        failingCases(chkIdU, USD(20));
+        failingCases(chkIdU, usd(20));
 
         // Verify that those two checks really were cashable.
-        env(check::cash(bob, chkIdU, USD(20)));
+        env(check::cash(bob, chkIdU, usd(20)));
         env.close();
         env(check::cash(bob, chkIdX, check::DeliverMin(XRP(10))));
         verifyDeliveredAmount(env, XRP(10));
 
         // Try to cash an expired check.
-        env(check::cash(bob, chkIdExp, XRP(10)), ter(tecEXPIRED));
+        env(check::cash(bob, chkIdExp, XRP(10)), Ter(tecEXPIRED));
         env.close();
 
         // Cancel the expired check.  Anyone can cancel an expired check.
@@ -1402,117 +1403,117 @@ class Check_test : public beast::unit_test::suite
 
         // Can we cash a check with frozen currency?
         {
-            env(pay(bob, alice, USD(20)));
+            env(pay(bob, alice, usd(20)));
             env.close();
-            env.require(balance(alice, USD(20)));
-            env.require(balance(bob, USD(0)));
+            env.require(Balance(alice, usd(20)));
+            env.require(Balance(bob, usd(0)));
 
             // Global freeze
             env(fset(gw, asfGlobalFreeze));
             env.close();
 
-            env(check::cash(bob, chkIdFroz1, USD(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz1, usd(1)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(check::cash(bob, chkIdFroz1, check::DeliverMin(USD(0.5))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz1, check::DeliverMin(usd(0.5))), Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(check::cash(gw, chkIdFroz4ToIssuer, USD(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(gw, chkIdFroz4ToIssuer, usd(1)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(check::cash(gw, chkIdFroz4ToIssuer, check::DeliverMin(USD(0.5))),
-                ter(tecPATH_PARTIAL));
+            env(check::cash(gw, chkIdFroz4ToIssuer, check::DeliverMin(usd(0.5))),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(check::cash(alice, chkIdFroz4Issuer, USD(1)), ter(tecFROZEN));
+            env(check::cash(alice, chkIdFroz4Issuer, usd(1)), Ter(tecFROZEN));
             env.close();
-            env(check::cash(alice, chkIdFroz4Issuer, check::DeliverMin(USD(0.5))), ter(tecFROZEN));
+            env(check::cash(alice, chkIdFroz4Issuer, check::DeliverMin(usd(0.5))), Ter(tecFROZEN));
             env.close();
 
             env(fclear(gw, asfGlobalFreeze));
             env.close();
 
             // No longer frozen.  Success.
-            env(check::cash(bob, chkIdFroz1, USD(1)));
+            env(check::cash(bob, chkIdFroz1, usd(1)));
             env.close();
-            env.require(balance(alice, USD(19)));
-            env.require(balance(bob, USD(1)));
+            env.require(Balance(alice, usd(19)));
+            env.require(Balance(bob, usd(1)));
 
-            env(check::cash(gw, chkIdFroz4ToIssuer, USD(1)));
+            env(check::cash(gw, chkIdFroz4ToIssuer, usd(1)));
             env.close();
 
             // Freeze individual trustlines.
             env(trust(gw, alice["USD"](0), tfSetFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz2, USD(2)), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz2, usd(2)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(check::cash(bob, chkIdFroz2, check::DeliverMin(USD(1))), ter(tecPATH_PARTIAL));
+            env(check::cash(bob, chkIdFroz2, check::DeliverMin(usd(1))), Ter(tecPATH_PARTIAL));
             env.close();
 
             // Clear that freeze.  Now check cashing works.
             env(trust(gw, alice["USD"](0), tfClearFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz2, USD(2)));
+            env(check::cash(bob, chkIdFroz2, usd(2)));
             env.close();
-            env.require(balance(alice, USD(16)));
-            env.require(balance(bob, USD(3)));
+            env.require(Balance(alice, usd(16)));
+            env.require(Balance(bob, usd(3)));
 
             // Freeze bob's trustline.  bob can't cash the check.
             env(trust(gw, bob["USD"](0), tfSetFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz3, USD(3)), ter(tecFROZEN));
+            env(check::cash(bob, chkIdFroz3, usd(3)), Ter(tecFROZEN));
             env.close();
-            env(check::cash(bob, chkIdFroz3, check::DeliverMin(USD(1))), ter(tecFROZEN));
+            env(check::cash(bob, chkIdFroz3, check::DeliverMin(usd(1))), Ter(tecFROZEN));
             env.close();
 
             // Clear that freeze.  Now check cashing works again.
             env(trust(gw, bob["USD"](0), tfClearFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz3, check::DeliverMin(USD(1))));
-            verifyDeliveredAmount(env, USD(3));
-            env.require(balance(alice, USD(13)));
-            env.require(balance(bob, USD(6)));
+            env(check::cash(bob, chkIdFroz3, check::DeliverMin(usd(1))));
+            verifyDeliveredAmount(env, usd(3));
+            env.require(Balance(alice, usd(13)));
+            env.require(Balance(bob, usd(6)));
 
             // Set bob's freeze bit in the other direction.  Check
             // cashing fails.
-            env(trust(bob, USD(20), tfSetFreeze));
+            env(trust(bob, usd(20), tfSetFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz4, USD(4)), ter(terNO_LINE));
+            env(check::cash(bob, chkIdFroz4, usd(4)), Ter(terNO_LINE));
             env.close();
-            env(check::cash(bob, chkIdFroz4, check::DeliverMin(USD(1))), ter(terNO_LINE));
+            env(check::cash(bob, chkIdFroz4, check::DeliverMin(usd(1))), Ter(terNO_LINE));
             env.close();
 
             // Clear bob's freeze bit and the check should be cashable.
-            env(trust(bob, USD(20), tfClearFreeze));
+            env(trust(bob, usd(20), tfClearFreeze));
             env.close();
-            env(check::cash(bob, chkIdFroz4, USD(4)));
+            env(check::cash(bob, chkIdFroz4, usd(4)));
             env.close();
-            env.require(balance(alice, USD(9)));
-            env.require(balance(bob, USD(10)));
+            env.require(Balance(alice, usd(9)));
+            env.require(Balance(bob, usd(10)));
         }
         {
             // Set the RequireDest flag on bob's account (after the check
             // was created) then cash a check without a destination tag.
             env(fset(bob, asfRequireDest));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, USD(1)), ter(tecDST_TAG_NEEDED));
+            env(check::cash(bob, chkIdNoDest1, usd(1)), Ter(tecDST_TAG_NEEDED));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, check::DeliverMin(USD(0.5))),
-                ter(tecDST_TAG_NEEDED));
+            env(check::cash(bob, chkIdNoDest1, check::DeliverMin(usd(0.5))),
+                Ter(tecDST_TAG_NEEDED));
             env.close();
 
             // bob can cash a check with a destination tag.
-            env(check::cash(bob, chkIdHasDest2, USD(2)));
+            env(check::cash(bob, chkIdHasDest2, usd(2)));
             env.close();
-            env.require(balance(alice, USD(7)));
-            env.require(balance(bob, USD(12)));
+            env.require(Balance(alice, usd(7)));
+            env.require(Balance(bob, usd(12)));
 
             // Clear the RequireDest flag on bob's account so he can
             // cash the check with no DestinationTag.
             env(fclear(bob, asfRequireDest));
             env.close();
-            env(check::cash(bob, chkIdNoDest1, USD(1)));
+            env(check::cash(bob, chkIdNoDest1, usd(1)));
             env.close();
-            env.require(balance(alice, USD(6)));
-            env.require(balance(bob, USD(13)));
+            env.require(Balance(alice, usd(6)));
+            env.require(Balance(bob, usd(13)));
         }
     }
 
@@ -1528,7 +1529,7 @@ class Check_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const bob{"bob"};
         Account const zoe{"zoe"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         {
             Env env{*this, features};
@@ -1539,7 +1540,7 @@ class Check_test : public beast::unit_test::suite
             // alice creates her checks ahead of time.
             // Three ordinary checks with no expiration.
             uint256 const chkId1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             uint256 const chkId2{getCheckIndex(alice, env.seq(alice))};
@@ -1547,39 +1548,39 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             uint256 const chkId3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             // Three checks that expire in 10 minutes.
             using namespace std::chrono_literals;
             uint256 const chkIdNotExp1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 600s));
             env.close();
 
             uint256 const chkIdNotExp2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 600s));
             env.close();
 
             uint256 const chkIdNotExp3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 600s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 600s));
             env.close();
 
             // Three checks that expire in one second.
             uint256 const chkIdExp1{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 1s));
             env.close();
 
             uint256 const chkIdExp2{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, XRP(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, XRP(10)), Expiration(env.now() + 1s));
             env.close();
 
             uint256 const chkIdExp3{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)), expiration(env.now() + 1s));
+            env(check::create(alice, bob, usd(10)), Expiration(env.now() + 1s));
             env.close();
 
             // Two checks to cancel using a regular key and using multisigning.
             uint256 const chkIdReg{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, USD(10)));
+            env(check::create(alice, bob, usd(10)));
             env.close();
 
             uint256 const chkIdMSig{getCheckIndex(alice, env.seq(alice))};
@@ -1599,7 +1600,7 @@ class Check_test : public beast::unit_test::suite
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 9);
             BEAST_EXPECT(ownerCount(env, alice) == 9);
 
-            env(check::cancel(zoe, chkId3), ter(tecNO_PERMISSION));
+            env(check::cancel(zoe, chkId3), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 9);
             BEAST_EXPECT(ownerCount(env, alice) == 9);
@@ -1615,7 +1616,7 @@ class Check_test : public beast::unit_test::suite
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 7);
             BEAST_EXPECT(ownerCount(env, alice) == 7);
 
-            env(check::cancel(zoe, chkIdNotExp3), ter(tecNO_PERMISSION));
+            env(check::cancel(zoe, chkIdNotExp3), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 7);
             BEAST_EXPECT(ownerCount(env, alice) == 7);
@@ -1637,30 +1638,30 @@ class Check_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, alice) == 4);
 
             // Use a regular key and also multisign to cancel checks.
-            Account const alie{"alie", KeyType::ed25519};
+            Account const alie{"alie", KeyType::Ed25519};
             env(regkey(alice, alie));
             env.close();
 
-            Account const bogie{"bogie", KeyType::secp256k1};
-            Account const demon{"demon", KeyType::ed25519};
-            env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), sig(alie));
+            Account const bogie{"bogie", KeyType::Secp256k1};
+            Account const demon{"demon", KeyType::Ed25519};
+            env(signers(alice, 2, {{bogie, 1}, {demon, 1}}), Sig(alie));
             env.close();
 
             // alice uses her regular key to cancel a check.
-            env(check::cancel(alice, chkIdReg), sig(alie));
+            env(check::cancel(alice, chkIdReg), Sig(alie));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 3);
             BEAST_EXPECT(ownerCount(env, alice) == 4);
 
             // alice uses multisigning to cancel a check.
             XRPAmount const baseFeeDrops{env.current()->fees().base};
-            env(check::cancel(alice, chkIdMSig), msig(bogie, demon), fee(3 * baseFeeDrops));
+            env(check::cancel(alice, chkIdMSig), Msig(bogie, demon), Fee(3 * baseFeeDrops));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
             BEAST_EXPECT(ownerCount(env, alice) == 3);
 
             // Creator and destination cancel the remaining unexpired checks.
-            env(check::cancel(alice, chkId3), sig(alice));
+            env(check::cancel(alice, chkId3), Sig(alice));
             env.close();
             BEAST_EXPECT(checksOnAccount(env, alice).size() == 1);
             BEAST_EXPECT(ownerCount(env, alice) == 2);
@@ -1690,18 +1691,18 @@ class Check_test : public beast::unit_test::suite
 
         // Bad fee.
         env(check::cancel(bob, getCheckIndex(alice, env.seq(alice))),
-            fee(drops(-10)),
-            ter(temBAD_FEE));
+            Fee(drops(-10)),
+            Ter(temBAD_FEE));
         env.close();
 
         // Bad flags.
         env(check::cancel(bob, getCheckIndex(alice, env.seq(alice))),
-            txflags(tfImmediateOrCancel),
-            ter(temINVALID_FLAG));
+            Txflags(tfImmediateOrCancel),
+            Ter(temINVALID_FLAG));
         env.close();
 
         // Non-existent check.
-        env(check::cancel(bob, getCheckIndex(alice, env.seq(alice))), ter(tecNO_ENTRY));
+        env(check::cancel(bob, getCheckIndex(alice, env.seq(alice))), Ter(tecNO_ENTRY));
         env.close();
     }
 
@@ -1726,10 +1727,10 @@ class Check_test : public beast::unit_test::suite
         env(check::cash(bob, chkId, check::DeliverMin(XRP(100))));
 
         // Get the hash for the most recent transaction.
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
         env.close();
-        Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         // DeliveredAmount and delivered_amount are present.
         BEAST_EXPECT(meta.isMember(sfDeliveredAmount.jsonName));
@@ -1746,7 +1747,7 @@ class Check_test : public beast::unit_test::suite
         Account const gw{"gw"};
         Account const alice{"alice"};
         Account const bob{"bob"};
-        IOU const USD{gw["USD"]};
+        IOU const usd{gw["USD"]};
 
         Env env{*this, features};
         env.fund(XRP(1000), gw, alice, bob);
@@ -1764,15 +1765,15 @@ class Check_test : public beast::unit_test::suite
         std::uint32_t const bobSeq{env.seq(bob)};
 
         env.close();
-        env.require(owners(alice, 10));
-        env.require(owners(bob, 10));
+        env.require(Owners(alice, 10));
+        env.require(Owners(bob, 10));
 
         // alice gets enough USD to write a few checks.
-        env(trust(alice, USD(1000)), ticket::use(aliceTicketSeq++));
-        env(trust(bob, USD(1000)), ticket::use(bobTicketSeq++));
+        env(trust(alice, usd(1000)), ticket::Use(aliceTicketSeq++));
+        env(trust(bob, usd(1000)), ticket::Use(bobTicketSeq++));
         env.close();
-        env.require(owners(alice, 10));
-        env.require(owners(bob, 10));
+        env.require(Owners(alice, 10));
+        env.require(Owners(bob, 10));
 
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1780,60 +1781,60 @@ class Check_test : public beast::unit_test::suite
         env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
-        env(pay(gw, alice, USD(900)));
+        env(pay(gw, alice, usd(900)));
         env.close();
 
         // alice creates four checks; two XRP, two IOU.  Bob will cash
         // one of each and cancel one of each.
         uint256 const chkIdXrp1{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, XRP(200)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, XRP(200)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdXrp2{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, XRP(300)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, XRP(300)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdUsd1{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, USD(200)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, usd(200)), ticket::Use(aliceTicketSeq++));
 
         uint256 const chkIdUsd2{getCheckIndex(alice, aliceTicketSeq)};
-        env(check::create(alice, bob, USD(300)), ticket::use(aliceTicketSeq++));
+        env(check::create(alice, bob, usd(300)), ticket::Use(aliceTicketSeq++));
 
         env.close();
         // Alice used four tickets but created four checks.
-        env.require(owners(alice, 10));
+        env.require(Owners(alice, 10));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 4);
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
-        env.require(owners(bob, 10));
+        env.require(Owners(bob, 10));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
         // Bob cancels two of alice's checks.
-        env(check::cancel(bob, chkIdXrp1), ticket::use(bobTicketSeq++));
-        env(check::cancel(bob, chkIdUsd2), ticket::use(bobTicketSeq++));
+        env(check::cancel(bob, chkIdXrp1), ticket::Use(bobTicketSeq++));
+        env(check::cancel(bob, chkIdUsd2), ticket::Use(bobTicketSeq++));
         env.close();
 
-        env.require(owners(alice, 8));
+        env.require(Owners(alice, 8));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).size() == 2);
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
-        env.require(owners(bob, 8));
+        env.require(Owners(bob, 8));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
 
         // Bob cashes alice's two remaining checks.
-        env(check::cash(bob, chkIdXrp2, XRP(300)), ticket::use(bobTicketSeq++));
-        env(check::cash(bob, chkIdUsd1, USD(200)), ticket::use(bobTicketSeq++));
+        env(check::cash(bob, chkIdXrp2, XRP(300)), ticket::Use(bobTicketSeq++));
+        env(check::cash(bob, chkIdUsd1, usd(200)), ticket::Use(bobTicketSeq++));
         env.close();
 
-        env.require(owners(alice, 6));
+        env.require(Owners(alice, 6));
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(checksOnAccount(env, alice).empty());
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
-        env.require(balance(alice, USD(700)));
+        env.require(Balance(alice, usd(700)));
 
-        env.require(owners(bob, 6));
+        env.require(Owners(bob, 6));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
-        env.require(balance(bob, USD(200)));
+        env.require(Balance(bob, usd(200)));
     }
 
     void
@@ -1851,7 +1852,7 @@ class Check_test : public beast::unit_test::suite
         // An account that independently tracks its owner count.
         struct AccountOwns
         {
-            beast::unit_test::suite& suite;
+            beast::unit_test::Suite& suite;
             Env const& env;
             Account const acct;
             std::size_t owners;
@@ -1899,7 +1900,7 @@ class Check_test : public beast::unit_test::suite
             env.fund(XRP(5000), noripple(gw1));
             env.close();
 
-            IOU const CK8 = gw1["CK8"];
+            IOU const cK8 = gw1["CK8"];
             gw1.verifyOwners(__LINE__);
 
             Account const yui{"yui"};
@@ -1911,10 +1912,10 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, yui, CK8(99)));
+            env(check::create(gw1, yui, cK8(99)));
             env.close();
 
-            env(check::cash(yui, chkId, CK8(99)), ter(tecNO_LINE_INSUF_RESERVE));
+            env(check::cash(yui, chkId, cK8(99)), Ter(tecNO_LINE_INSUF_RESERVE));
             env.close();
             alice.verifyOwners(__LINE__);
 
@@ -1922,8 +1923,8 @@ class Check_test : public beast::unit_test::suite
             // the check succeeds and creates the trust line.
             env(pay(env.master, yui, XRP(51)));
             env.close();
-            env(check::cash(yui, chkId, CK8(99)));
-            verifyDeliveredAmount(env, CK8(99));
+            env(check::cash(yui, chkId, cK8(99)));
+            verifyDeliveredAmount(env, cK8(99));
             env.close();
             BEAST_EXPECT(ownerCount(env, yui) == 1);
 
@@ -2018,11 +2019,11 @@ class Check_test : public beast::unit_test::suite
             BEAST_EXPECT((*env.le(bob))[sfFlags] == 0);
 
             // Use offers to automatically create the trust line.
-            IOU const OF1 = gw1["OF1"];
-            env(offer(gw1, XRP(98), OF1(98)));
+            IOU const oF1 = gw1["OF1"];
+            env(offer(gw1, XRP(98), oF1(98)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, OF1.currency)) == nullptr);
-            env(offer(alice, OF1(98), XRP(98)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, oF1.currency)) == nullptr);
+            env(offer(alice, oF1(98), XRP(98)));
             ++alice.owners;
             env.close();
 
@@ -2035,14 +2036,14 @@ class Check_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK1 = gw1["CK1"];
+            IOU const cK1 = gw1["CK1"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK1(98)));
+            env(check::create(gw1, alice, cK1(98)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, CK1.currency)) == nullptr);
-            env(check::cash(alice, chkId, CK1(98)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, cK1.currency)) == nullptr);
+            env(check::cash(alice, chkId, cK1(98)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK1(98));
+            verifyDeliveredAmount(env, cK1(98));
             env.close();
 
             // gw1's check should be consumed.
@@ -2053,7 +2054,7 @@ class Check_test : public beast::unit_test::suite
             // alice's automatically created trust line bumps her owner count.
             alice.verifyOwners(__LINE__);
 
-            cmpTrustLines(gw1, alice, OF1, CK1);
+            cmpTrustLines(gw1, alice, oF1, cK1);
         }
         //--------- No account root flags, check written by non-issuer ---------
         {
@@ -2065,17 +2066,17 @@ class Check_test : public beast::unit_test::suite
             // So bob's offer is successfully crossed which creates the
             // trust line.
             AccountOwns const gw1{.suite = *this, .env = env, .acct = "gw1", .owners = 0};
-            IOU const OF1 = gw1["OF1"];
-            env(offer(alice, XRP(97), OF1(97)));
+            IOU const oF1 = gw1["OF1"];
+            env(offer(alice, XRP(97), oF1(97)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, OF1.currency)) == nullptr);
-            env(offer(bob, OF1(97), XRP(97)));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, oF1.currency)) == nullptr);
+            env(offer(bob, oF1(97), XRP(97)));
             ++bob.owners;
             env.close();
 
             // Both offers should be consumed.
-            env.require(balance(alice, OF1(1)));
-            env.require(balance(bob, OF1(97)));
+            env.require(Balance(alice, oF1(1)));
+            env.require(Balance(bob, oF1(97)));
 
             // bob now has an owner count of 1 due to the new trust line.
             gw1.verifyOwners(__LINE__);
@@ -2088,16 +2089,16 @@ class Check_test : public beast::unit_test::suite
             // rippling through the currency's issuer.  Since gw1 does not
             // have rippling enabled the check cash fails and bob does not
             // have a trust line created.
-            IOU const CK1 = gw1["CK1"];
+            IOU const cK1 = gw1["CK1"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK1(97)));
+            env(check::create(alice, bob, cK1(97)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, CK1.currency)) == nullptr);
-            env(check::cash(bob, chkId, CK1(97)), ter(terNO_RIPPLE));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, cK1.currency)) == nullptr);
+            env(check::cash(bob, chkId, cK1(97)), Ter(terNO_RIPPLE));
             env.close();
 
-            BEAST_EXPECT(env.le(keylet::line(gw1, bob, OF1.currency)) != nullptr);
-            BEAST_EXPECT(env.le(keylet::line(gw1, bob, CK1.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, bob, oF1.currency)) != nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, bob, cK1.currency)) == nullptr);
 
             // Delete alice's check since it is no longer needed.
             env(check::cancel(alice, chkId));
@@ -2118,11 +2119,11 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create the trust line.
-            IOU const OF2 = gw1["OF2"];
-            env(offer(gw1, XRP(96), OF2(96)));
+            IOU const oF2 = gw1["OF2"];
+            env(offer(gw1, XRP(96), oF2(96)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, OF2.currency)) == nullptr);
-            env(offer(alice, OF2(96), XRP(96)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, oF2.currency)) == nullptr);
+            env(offer(alice, oF2(96), XRP(96)));
             ++alice.owners;
             env.close();
 
@@ -2135,14 +2136,14 @@ class Check_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK2 = gw1["CK2"];
+            IOU const cK2 = gw1["CK2"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK2(96)));
+            env(check::create(gw1, alice, cK2(96)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, CK2.currency)) == nullptr);
-            env(check::cash(alice, chkId, CK2(96)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, cK2.currency)) == nullptr);
+            env(check::cash(alice, chkId, cK2(96)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK2(96));
+            verifyDeliveredAmount(env, cK2(96));
             env.close();
 
             // gw1's check should be consumed.
@@ -2153,7 +2154,7 @@ class Check_test : public beast::unit_test::suite
             // alice's automatically created trust line bumps her owner count.
             alice.verifyOwners(__LINE__);
 
-            cmpTrustLines(gw1, alice, OF2, CK2);
+            cmpTrustLines(gw1, alice, oF2, cK2);
         }
         //----------- lsfDefaultRipple, check written by non-issuer ------------
         {
@@ -2162,11 +2163,11 @@ class Check_test : public beast::unit_test::suite
 
             // Use offers to automatically create the trust line.
             AccountOwns const gw1{.suite = *this, .env = env, .acct = "gw1", .owners = 0};
-            IOU const OF2 = gw1["OF2"];
-            env(offer(alice, XRP(95), OF2(95)));
+            IOU const oF2 = gw1["OF2"];
+            env(offer(alice, XRP(95), oF2(95)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, OF2.currency)) == nullptr);
-            env(offer(bob, OF2(95), XRP(95)));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, oF2.currency)) == nullptr);
+            env(offer(bob, oF2(95), XRP(95)));
             ++bob.owners;
             env.close();
 
@@ -2176,14 +2177,14 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK2 = gw1["CK2"];
+            IOU const cK2 = gw1["CK2"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK2(95)));
+            env(check::create(alice, bob, cK2(95)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, CK2.currency)) == nullptr);
-            env(check::cash(bob, chkId, CK2(95)));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, cK2.currency)) == nullptr);
+            env(check::cash(bob, chkId, cK2(95)));
             ++bob.owners;
-            verifyDeliveredAmount(env, CK2(95));
+            verifyDeliveredAmount(env, cK2(95));
             env.close();
 
             // bob's owner count should increase due to the new trust line.
@@ -2191,7 +2192,7 @@ class Check_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
             bob.verifyOwners(__LINE__);
 
-            cmpTrustLines(alice, bob, OF2, CK2);
+            cmpTrustLines(alice, bob, oF2, cK2);
         }
 
         //-------------- lsfDepositAuth, check written by issuer ---------------
@@ -2209,11 +2210,11 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create the trust line.
-            IOU const OF3 = gw1["OF3"];
-            env(offer(gw1, XRP(94), OF3(94)));
+            IOU const oF3 = gw1["OF3"];
+            env(offer(gw1, XRP(94), oF3(94)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, OF3.currency)) == nullptr);
-            env(offer(alice, OF3(94), XRP(94)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, oF3.currency)) == nullptr);
+            env(offer(alice, oF3(94), XRP(94)));
             ++alice.owners;
             env.close();
 
@@ -2226,14 +2227,14 @@ class Check_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK3 = gw1["CK3"];
+            IOU const cK3 = gw1["CK3"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK3(94)));
+            env(check::create(gw1, alice, cK3(94)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, CK3.currency)) == nullptr);
-            env(check::cash(alice, chkId, CK3(94)));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, cK3.currency)) == nullptr);
+            env(check::cash(alice, chkId, cK3(94)));
             ++alice.owners;
-            verifyDeliveredAmount(env, CK3(94));
+            verifyDeliveredAmount(env, cK3(94));
             env.close();
 
             // gw1's check should be consumed.
@@ -2244,7 +2245,7 @@ class Check_test : public beast::unit_test::suite
             // alice's automatically created trust line bumps her owner count.
             alice.verifyOwners(__LINE__);
 
-            cmpTrustLines(gw1, alice, OF3, CK3);
+            cmpTrustLines(gw1, alice, oF3, cK3);
         }
         //------------ lsfDepositAuth, check written by non-issuer -------------
         {
@@ -2253,11 +2254,11 @@ class Check_test : public beast::unit_test::suite
 
             // Use offers to automatically create the trust line.
             AccountOwns const gw1{.suite = *this, .env = env, .acct = "gw1", .owners = 0};
-            IOU const OF3 = gw1["OF3"];
-            env(offer(alice, XRP(93), OF3(93)));
+            IOU const oF3 = gw1["OF3"];
+            env(offer(alice, XRP(93), oF3(93)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, OF3.currency)) == nullptr);
-            env(offer(bob, OF3(93), XRP(93)));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, oF3.currency)) == nullptr);
+            env(offer(bob, oF3(93), XRP(93)));
             ++bob.owners;
             env.close();
 
@@ -2267,14 +2268,14 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK3 = gw1["CK3"];
+            IOU const cK3 = gw1["CK3"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK3(93)));
+            env(check::create(alice, bob, cK3(93)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, CK3.currency)) == nullptr);
-            env(check::cash(bob, chkId, CK3(93)));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, cK3.currency)) == nullptr);
+            env(check::cash(bob, chkId, cK3(93)));
             ++bob.owners;
-            verifyDeliveredAmount(env, CK3(93));
+            verifyDeliveredAmount(env, cK3(93));
             env.close();
 
             // bob's owner count should increase due to the new trust line.
@@ -2282,7 +2283,7 @@ class Check_test : public beast::unit_test::suite
             alice.verifyOwners(__LINE__);
             bob.verifyOwners(__LINE__);
 
-            cmpTrustLines(alice, bob, OF3, CK3);
+            cmpTrustLines(alice, bob, oF3, cK3);
         }
 
         //-------------- lsfGlobalFreeze, check written by issuer --------------
@@ -2294,11 +2295,11 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create the trust line.
-            IOU const OF4 = gw1["OF4"];
-            env(offer(gw1, XRP(92), OF4(92)), ter(tecFROZEN));
+            IOU const oF4 = gw1["OF4"];
+            env(offer(gw1, XRP(92), oF4(92)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, OF4.currency)) == nullptr);
-            env(offer(alice, OF4(92), XRP(92)), ter(tecFROZEN));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, oF4.currency)) == nullptr);
+            env(offer(alice, oF4(92), XRP(92)), Ter(tecFROZEN));
             env.close();
 
             // No one's owner count should have changed.
@@ -2307,12 +2308,12 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK4 = gw1["CK4"];
+            IOU const cK4 = gw1["CK4"];
             uint256 const chkId{getCheckIndex(gw1, env.seq(gw1))};
-            env(check::create(gw1, alice, CK4(92)), ter(tecFROZEN));
+            env(check::create(gw1, alice, cK4(92)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, CK4.currency)) == nullptr);
-            env(check::cash(alice, chkId, CK4(92)), ter(tecNO_ENTRY));
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, cK4.currency)) == nullptr);
+            env(check::cash(alice, chkId, cK4(92)), Ter(tecNO_ENTRY));
             env.close();
 
             // No one's owner count should have changed.
@@ -2322,8 +2323,8 @@ class Check_test : public beast::unit_test::suite
 
             // Because gw1 has set lsfGlobalFreeze, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, OF4.currency)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::line(gw1, alice, CK4.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, oF4.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, alice, cK4.currency)) == nullptr);
         }
         //------------ lsfGlobalFreeze, check written by non-issuer ------------
         {
@@ -2332,11 +2333,11 @@ class Check_test : public beast::unit_test::suite
 
             // Use offers to automatically create the trust line.
             AccountOwns const gw1{.suite = *this, .env = env, .acct = "gw1", .owners = 0};
-            IOU const OF4 = gw1["OF4"];
-            env(offer(alice, XRP(91), OF4(91)), ter(tecFROZEN));
+            IOU const oF4 = gw1["OF4"];
+            env(offer(alice, XRP(91), oF4(91)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, OF4.currency)) == nullptr);
-            env(offer(bob, OF4(91), XRP(91)), ter(tecFROZEN));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, oF4.currency)) == nullptr);
+            env(offer(bob, oF4(91), XRP(91)), Ter(tecFROZEN));
             env.close();
 
             // No one's owner count should have changed.
@@ -2345,12 +2346,12 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK4 = gw1["CK4"];
+            IOU const cK4 = gw1["CK4"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK4(91)), ter(tecFROZEN));
+            env(check::create(alice, bob, cK4(91)), Ter(tecFROZEN));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, CK4.currency)) == nullptr);
-            env(check::cash(bob, chkId, CK4(91)), ter(tecNO_ENTRY));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, cK4.currency)) == nullptr);
+            env(check::cash(bob, chkId, cK4(91)), Ter(tecNO_ENTRY));
             env.close();
 
             // No one's owner count should have changed.
@@ -2360,8 +2361,8 @@ class Check_test : public beast::unit_test::suite
 
             // Because gw1 has set lsfGlobalFreeze, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::line(gw1, bob, OF4.currency)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::line(gw1, bob, CK4.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, bob, oF4.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw1, bob, cK4.currency)) == nullptr);
         }
 
         //-------------- lsfRequireAuth, check written by issuer ---------------
@@ -2380,13 +2381,13 @@ class Check_test : public beast::unit_test::suite
             env.close();
 
             // Use offers to automatically create the trust line.
-            IOU const OF5 = gw2["OF5"];
+            IOU const oF5 = gw2["OF5"];
             std::uint32_t const gw2OfferSeq = {env.seq(gw2)};
-            env(offer(gw2, XRP(92), OF5(92)));
+            env(offer(gw2, XRP(92), oF5(92)));
             ++gw2.owners;
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw2, alice, OF5.currency)) == nullptr);
-            env(offer(alice, OF5(92), XRP(92)), ter(tecNO_LINE));
+            BEAST_EXPECT(env.le(keylet::line(gw2, alice, oF5.currency)) == nullptr);
+            env(offer(alice, oF5(92), XRP(92)), Ter(tecNO_LINE));
             env.close();
 
             // gw2 should still own the offer, but no one else's owner
@@ -2396,19 +2397,19 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Since we don't need it any more, remove gw2's offer.
-            env(offer_cancel(gw2, gw2OfferSeq));
+            env(offerCancel(gw2, gw2OfferSeq));
             --gw2.owners;
             env.close();
             gw2.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK5 = gw2["CK5"];
+            IOU const cK5 = gw2["CK5"];
             uint256 const chkId{getCheckIndex(gw2, env.seq(gw2))};
-            env(check::create(gw2, alice, CK5(92)));
+            env(check::create(gw2, alice, cK5(92)));
             ++gw2.owners;
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(gw2, alice, CK5.currency)) == nullptr);
-            env(check::cash(alice, chkId, CK5(92)), ter(tecNO_AUTH));
+            BEAST_EXPECT(env.le(keylet::line(gw2, alice, cK5.currency)) == nullptr);
+            env(check::cash(alice, chkId, cK5(92)), Ter(tecNO_AUTH));
             env.close();
 
             // gw2 should still own the check, but no one else's owner
@@ -2419,8 +2420,8 @@ class Check_test : public beast::unit_test::suite
 
             // Because gw2 has set lsfRequireAuth, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::line(gw2, alice, OF5.currency)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::line(gw2, alice, CK5.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw2, alice, oF5.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw2, alice, cK5.currency)) == nullptr);
 
             // Since we don't need it any more, remove gw2's check.
             env(check::cancel(gw2, chkId));
@@ -2435,11 +2436,11 @@ class Check_test : public beast::unit_test::suite
 
             // Use offers to automatically create the trust line.
             AccountOwns const gw2{.suite = *this, .env = env, .acct = "gw2", .owners = 0};
-            IOU const OF5 = gw2["OF5"];
-            env(offer(alice, XRP(91), OF5(91)), ter(tecUNFUNDED_OFFER));
+            IOU const oF5 = gw2["OF5"];
+            env(offer(alice, XRP(91), oF5(91)), Ter(tecUNFUNDED_OFFER));
             env.close();
-            env(offer(bob, OF5(91), XRP(91)), ter(tecNO_LINE));
-            BEAST_EXPECT(env.le(keylet::line(gw2, bob, OF5.currency)) == nullptr);
+            env(offer(bob, oF5(91), XRP(91)), Ter(tecNO_LINE));
+            BEAST_EXPECT(env.le(keylet::line(gw2, bob, oF5.currency)) == nullptr);
             env.close();
 
             gw2.verifyOwners(__LINE__);
@@ -2447,12 +2448,12 @@ class Check_test : public beast::unit_test::suite
             bob.verifyOwners(__LINE__);
 
             // Use check cashing to automatically create the trust line.
-            IOU const CK5 = gw2["CK5"];
+            IOU const cK5 = gw2["CK5"];
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, bob, CK5(91)));
+            env(check::create(alice, bob, cK5(91)));
             env.close();
-            BEAST_EXPECT(env.le(keylet::line(alice, bob, CK5.currency)) == nullptr);
-            env(check::cash(bob, chkId, CK5(91)), ter(tecPATH_PARTIAL));
+            BEAST_EXPECT(env.le(keylet::line(alice, bob, cK5.currency)) == nullptr);
+            env(check::cash(bob, chkId, cK5(91)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // Delete alice's check since it is no longer needed.
@@ -2466,8 +2467,8 @@ class Check_test : public beast::unit_test::suite
 
             // Because gw2 has set lsfRequireAuth, neither trust line
             // is created.
-            BEAST_EXPECT(env.le(keylet::line(gw2, bob, OF5.currency)) == nullptr);
-            BEAST_EXPECT(env.le(keylet::line(gw2, bob, CK5.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw2, bob, oF5.currency)) == nullptr);
+            BEAST_EXPECT(env.le(keylet::line(gw2, bob, cK5.currency)) == nullptr);
         }
     }
 
@@ -2494,7 +2495,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeats(sa);
         testTrustLineCreation(sa);
     }
diff --git a/src/test/app/Clawback_test.cpp b/src/test/app/Clawback_test.cpp
index 8efcece295..5d0ecf022d 100644
--- a/src/test/app/Clawback_test.cpp
+++ b/src/test/app/Clawback_test.cpp
@@ -26,11 +26,11 @@
 
 namespace xrpl {
 
-class Clawback_test : public beast::unit_test::suite
+class Clawback_test : public beast::unit_test::Suite
 {
     template <class T>
     static std::string
-    to_string(T const& t)
+    toString(T const& t)
     {
         return boost::lexical_cast<std::string>(t);
     }
@@ -81,16 +81,16 @@ class Clawback_test : public beast::unit_test::suite
             // set asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // clear asfAllowTrustLineClawback does nothing
             env(fclear(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // asfNoFreeze cannot be set when asfAllowTrustLineClawback is set
-            env.require(nflags(alice, asfNoFreeze));
-            env(fset(alice, asfNoFreeze), ter(tecNO_PERMISSION));
+            env.require(Nflags(alice, asfNoFreeze));
+            env(fset(alice, asfNoFreeze), Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -103,20 +103,20 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice);
             env.close();
 
-            env.require(nflags(alice, asfNoFreeze));
+            env.require(Nflags(alice, asfNoFreeze));
 
             // set asfNoFreeze
             env(fset(alice, asfNoFreeze));
             env.close();
 
             // NoFreeze is set
-            env.require(flags(alice, asfNoFreeze));
+            env.require(Flags(alice, asfNoFreeze));
 
             // asfAllowTrustLineClawback cannot be set if asfNoFreeze is set
-            env(fset(alice, asfAllowTrustLineClawback), ter(tecNO_PERMISSION));
+            env(fset(alice, asfAllowTrustLineClawback), Ter(tecNO_PERMISSION));
             env.close();
 
-            env.require(nflags(alice, asfAllowTrustLineClawback));
+            env.require(Nflags(alice, asfAllowTrustLineClawback));
         }
 
         // Test that asfAllowTrustLineClawback is not allowed when owner dir is
@@ -130,25 +130,25 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob);
             env.close();
 
-            auto const USD = alice["USD"];
-            env.require(nflags(alice, asfAllowTrustLineClawback));
+            auto const usd = alice["USD"];
+            env.require(Nflags(alice, asfAllowTrustLineClawback));
 
             // alice issues 10 USD to bob
-            env.trust(USD(1000), bob);
-            env(pay(alice, bob, USD(10)));
+            env.trust(usd(1000), bob);
+            env(pay(alice, bob, usd(10)));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
 
             // alice fails to enable clawback because she has trustline with bob
-            env(fset(alice, asfAllowTrustLineClawback), ter(tecOWNERS));
+            env(fset(alice, asfAllowTrustLineClawback), Ter(tecOWNERS));
             env.close();
 
             // bob sets trustline to default limit and pays alice back to delete
             // the trustline
-            env(trust(bob, USD(0), 0));
-            env(pay(bob, alice, USD(10)));
+            env(trust(bob, usd(0), 0));
+            env(pay(bob, alice, usd(10)));
 
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, bob) == 0);
@@ -156,7 +156,7 @@ class Clawback_test : public beast::unit_test::suite
             // alice now is able to set asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, bob) == 0);
@@ -172,14 +172,14 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice);
             env.close();
 
-            env.require(nflags(alice, asfAllowTrustLineClawback));
+            env.require(Nflags(alice, asfAllowTrustLineClawback));
 
             // alice attempts to set asfAllowTrustLineClawback flag while
             // amendment is disabled. no error is returned, but the flag remains
             // to be unset.
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(nflags(alice, asfAllowTrustLineClawback));
+            env.require(Nflags(alice, asfAllowTrustLineClawback));
 
             // now enable clawback amendment
             env.enableFeature(featureClawback);
@@ -188,7 +188,7 @@ class Clawback_test : public beast::unit_test::suite
             // asfAllowTrustLineClawback can be set
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
         }
     }
 
@@ -210,20 +210,20 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob);
             env.close();
 
-            env.require(nflags(alice, asfAllowTrustLineClawback));
+            env.require(Nflags(alice, asfAllowTrustLineClawback));
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
 
             // alice issues 10 USD to bob
-            env.trust(USD(1000), bob);
-            env(pay(alice, bob, USD(10)));
+            env.trust(usd(1000), bob);
+            env(pay(alice, bob, usd(10)));
             env.close();
 
-            env.require(balance(bob, alice["USD"](10)));
-            env.require(balance(alice, bob["USD"](-10)));
+            env.require(Balance(bob, alice["USD"](10)));
+            env.require(Balance(alice, bob["USD"](-10)));
 
             // clawback fails because amendment is disabled
-            env(claw(alice, bob["USD"](5)), ter(temDISABLED));
+            env(claw(alice, bob["USD"](5)), Ter(temDISABLED));
             env.close();
 
             // now enable clawback amendment
@@ -231,11 +231,11 @@ class Clawback_test : public beast::unit_test::suite
             env.close();
 
             // clawback fails because asfAllowTrustLineClawback has not been set
-            env(claw(alice, bob["USD"](5)), ter(tecNO_PERMISSION));
+            env(claw(alice, bob["USD"](5)), Ter(tecNO_PERMISSION));
             env.close();
 
-            env.require(balance(bob, alice["USD"](10)));
-            env.require(balance(alice, bob["USD"](-10)));
+            env.require(Balance(bob, alice["USD"](10)));
+            env.require(Balance(alice, bob["USD"](-10)));
         }
 
         // Test that Clawback tx fails for the following:
@@ -258,55 +258,55 @@ class Clawback_test : public beast::unit_test::suite
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
 
             // alice issues 10 USD to bob
-            env.trust(USD(1000), bob);
-            env(pay(alice, bob, USD(10)));
+            env.trust(usd(1000), bob);
+            env(pay(alice, bob, usd(10)));
             env.close();
 
-            env.require(balance(bob, alice["USD"](10)));
-            env.require(balance(alice, bob["USD"](-10)));
+            env.require(Balance(bob, alice["USD"](10)));
+            env.require(Balance(alice, bob["USD"](-10)));
 
             // fails due to invalid flag
-            env(claw(alice, bob["USD"](5)), txflags(0x00008000), ter(temINVALID_FLAG));
+            env(claw(alice, bob["USD"](5)), Txflags(0x00008000), Ter(temINVALID_FLAG));
             env.close();
 
             // fails due to negative amount
-            env(claw(alice, bob["USD"](-5)), ter(temBAD_AMOUNT));
+            env(claw(alice, bob["USD"](-5)), Ter(temBAD_AMOUNT));
             env.close();
 
             // fails due to zero amount
-            env(claw(alice, bob["USD"](0)), ter(temBAD_AMOUNT));
+            env(claw(alice, bob["USD"](0)), Ter(temBAD_AMOUNT));
             env.close();
 
             // fails because amount is in XRP
-            env(claw(alice, XRP(10)), ter(temBAD_AMOUNT));
+            env(claw(alice, XRP(10)), Ter(temBAD_AMOUNT));
             env.close();
 
             // fails when `issuer` field in `amount` is not token holder
             // NOTE: we are using the `issuer` field for the token holder
-            env(claw(alice, alice["USD"](5)), ter(temBAD_AMOUNT));
+            env(claw(alice, alice["USD"](5)), Ter(temBAD_AMOUNT));
             env.close();
 
             // bob pays alice back, trustline has a balance of 0
-            env(pay(bob, alice, USD(10)));
+            env(pay(bob, alice, usd(10)));
             env.close();
 
             // bob still owns the trustline that has 0 balance
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, bob) == 1);
-            env.require(balance(bob, alice["USD"](0)));
-            env.require(balance(alice, bob["USD"](0)));
+            env.require(Balance(bob, alice["USD"](0)));
+            env.require(Balance(alice, bob["USD"](0)));
 
             // clawback fails because because balance is 0
-            env(claw(alice, bob["USD"](5)), ter(tecINSUFFICIENT_FUNDS));
+            env(claw(alice, bob["USD"](5)), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
             // set the limit to default, which should delete the trustline
-            env(trust(bob, USD(0), 0));
+            env(trust(bob, usd(0), 0));
             env.close();
 
             // bob no longer owns the trustline
@@ -314,7 +314,7 @@ class Clawback_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, bob) == 0);
 
             // clawback fails because trustline does not exist
-            env(claw(alice, bob["USD"](5)), ter(tecNO_LINE));
+            env(claw(alice, bob["USD"](5)), Ter(tecNO_LINE));
             env.close();
         }
     }
@@ -341,10 +341,10 @@ class Clawback_test : public beast::unit_test::suite
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // bob, the token holder, does not exist
-            env(claw(alice, bob["USD"](5)), ter(terNO_ACCOUNT));
+            env(claw(alice, bob["USD"](5)), Ter(terNO_ACCOUNT));
             env.close();
         }
 
@@ -360,29 +360,29 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob, cindy);
             env.close();
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
 
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // cindy sets asfAllowTrustLineClawback
             env(fset(cindy, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(cindy, asfAllowTrustLineClawback));
+            env.require(Flags(cindy, asfAllowTrustLineClawback));
 
             // alice issues 1000 USD to bob
-            env.trust(USD(1000), bob);
-            env(pay(alice, bob, USD(1000)));
+            env.trust(usd(1000), bob);
+            env(pay(alice, bob, usd(1000)));
             env.close();
 
-            env.require(balance(bob, alice["USD"](1000)));
-            env.require(balance(alice, bob["USD"](-1000)));
+            env.require(Balance(bob, alice["USD"](1000)));
+            env.require(Balance(alice, bob["USD"](-1000)));
 
             // cindy tries to claw from bob, and fails because trustline does
             // not exist
-            env(claw(cindy, bob["USD"](200)), ter(tecNO_LINE));
+            env(claw(cindy, bob["USD"](200)), Ter(tecNO_LINE));
             env.close();
         }
 
@@ -402,18 +402,18 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob);
             env.close();
 
-            auto const USD = alice["USD"];
-            auto const CAD = bob["CAD"];
+            auto const usd = alice["USD"];
+            auto const cad = bob["CAD"];
 
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // bob sets asfAllowTrustLineClawback
             env(fset(bob, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(bob, asfAllowTrustLineClawback));
+            env.require(Flags(bob, asfAllowTrustLineClawback));
 
             // alice issues 10 USD to bob.
             // bob then attempts to submit a clawback tx to claw USD from alice.
@@ -422,16 +422,16 @@ class Clawback_test : public beast::unit_test::suite
             {
                 // bob creates a trustline with alice, and alice sends 10 USD to
                 // bob
-                env.trust(USD(1000), bob);
-                env(pay(alice, bob, USD(10)));
+                env.trust(usd(1000), bob);
+                env(pay(alice, bob, usd(10)));
                 env.close();
 
-                env.require(balance(bob, alice["USD"](10)));
-                env.require(balance(alice, bob["USD"](-10)));
+                env.require(Balance(bob, alice["USD"](10)));
+                env.require(Balance(alice, bob["USD"](-10)));
 
                 // bob cannot claw back USD from alice because he's not the
                 // issuer
-                env(claw(bob, alice["USD"](5)), ter(tecNO_PERMISSION));
+                env(claw(bob, alice["USD"](5)), Ter(tecNO_PERMISSION));
                 env.close();
             }
 
@@ -442,16 +442,16 @@ class Clawback_test : public beast::unit_test::suite
             {
                 // alice creates a trustline with bob, and bob sends 10 CAD to
                 // alice
-                env.trust(CAD(1000), alice);
-                env(pay(bob, alice, CAD(10)));
+                env.trust(cad(1000), alice);
+                env(pay(bob, alice, cad(10)));
                 env.close();
 
-                env.require(balance(bob, alice["CAD"](-10)));
-                env.require(balance(alice, bob["CAD"](10)));
+                env.require(Balance(bob, alice["CAD"](-10)));
+                env.require(Balance(alice, bob["CAD"](10)));
 
                 // alice cannot claw back CAD from bob because she's not the
                 // issuer
-                env(claw(alice, bob["CAD"](5)), ter(tecNO_PERMISSION));
+                env(claw(alice, bob["CAD"](5)), Ter(tecNO_PERMISSION));
                 env.close();
             }
         }
@@ -472,36 +472,36 @@ class Clawback_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice, bob);
         env.close();
 
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // alice issues 1000 USD to bob
-        env.trust(USD(1000), bob);
-        env(pay(alice, bob, USD(1000)));
+        env.trust(usd(1000), bob);
+        env(pay(alice, bob, usd(1000)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](1000)));
-        env.require(balance(alice, bob["USD"](-1000)));
+        env.require(Balance(bob, alice["USD"](1000)));
+        env.require(Balance(alice, bob["USD"](-1000)));
 
         // alice claws back 200 USD from bob
         env(claw(alice, bob["USD"](200)));
         env.close();
 
         // bob should have 800 USD left
-        env.require(balance(bob, alice["USD"](800)));
-        env.require(balance(alice, bob["USD"](-800)));
+        env.require(Balance(bob, alice["USD"](800)));
+        env.require(Balance(alice, bob["USD"](-800)));
 
         // alice claws back 800 USD from bob again
         env(claw(alice, bob["USD"](800)));
         env.close();
 
         // trustline has a balance of 0
-        env.require(balance(bob, alice["USD"](0)));
-        env.require(balance(alice, bob["USD"](0)));
+        env.require(Balance(bob, alice["USD"](0)));
+        env.require(Balance(alice, bob["USD"](0)));
     }
 
     void
@@ -527,12 +527,12 @@ class Clawback_test : public beast::unit_test::suite
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // bob sets asfAllowTrustLineClawback
             env(fset(bob, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(bob, asfAllowTrustLineClawback));
+            env.require(Flags(bob, asfAllowTrustLineClawback));
 
             // alice sends 1000 USD to cindy
             env.trust(alice["USD"](1000), cindy);
@@ -549,24 +549,24 @@ class Clawback_test : public beast::unit_test::suite
             env.close();
 
             // cindy has 800 USD left in alice's trustline after clawed by alice
-            env.require(balance(cindy, alice["USD"](800)));
-            env.require(balance(alice, cindy["USD"](-800)));
+            env.require(Balance(cindy, alice["USD"](800)));
+            env.require(Balance(alice, cindy["USD"](-800)));
 
             // cindy still has 1000 USD in bob's trustline
-            env.require(balance(cindy, bob["USD"](1000)));
-            env.require(balance(bob, cindy["USD"](-1000)));
+            env.require(Balance(cindy, bob["USD"](1000)));
+            env.require(Balance(bob, cindy["USD"](-1000)));
 
             // bob claws back 600 USD from cindy
             env(claw(bob, cindy["USD"](600)));
             env.close();
 
             // cindy has 400 USD left in bob's trustline after clawed by bob
-            env.require(balance(cindy, bob["USD"](400)));
-            env.require(balance(bob, cindy["USD"](-400)));
+            env.require(Balance(cindy, bob["USD"](400)));
+            env.require(Balance(bob, cindy["USD"](-400)));
 
             // cindy still has 800 USD in alice's trustline
-            env.require(balance(cindy, alice["USD"](800)));
-            env.require(balance(alice, cindy["USD"](-800)));
+            env.require(Balance(cindy, alice["USD"](800)));
+            env.require(Balance(alice, cindy["USD"](-800)));
         }
 
         // alice issues USD to both bob and cindy.
@@ -582,52 +582,52 @@ class Clawback_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob, cindy);
             env.close();
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
 
             // alice sets asfAllowTrustLineClawback
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // alice sends 600 USD to bob
-            env.trust(USD(1000), bob);
-            env(pay(alice, bob, USD(600)));
+            env.trust(usd(1000), bob);
+            env(pay(alice, bob, usd(600)));
             env.close();
 
-            env.require(balance(alice, bob["USD"](-600)));
-            env.require(balance(bob, alice["USD"](600)));
+            env.require(Balance(alice, bob["USD"](-600)));
+            env.require(Balance(bob, alice["USD"](600)));
 
             // alice sends 1000 USD to cindy
-            env.trust(USD(1000), cindy);
-            env(pay(alice, cindy, USD(1000)));
+            env.trust(usd(1000), cindy);
+            env(pay(alice, cindy, usd(1000)));
             env.close();
 
-            env.require(balance(alice, cindy["USD"](-1000)));
-            env.require(balance(cindy, alice["USD"](1000)));
+            env.require(Balance(alice, cindy["USD"](-1000)));
+            env.require(Balance(cindy, alice["USD"](1000)));
 
             // alice claws back 500 USD from bob
             env(claw(alice, bob["USD"](500)));
             env.close();
 
             // bob's balance is reduced
-            env.require(balance(alice, bob["USD"](-100)));
-            env.require(balance(bob, alice["USD"](100)));
+            env.require(Balance(alice, bob["USD"](-100)));
+            env.require(Balance(bob, alice["USD"](100)));
 
             // cindy's balance is unchanged
-            env.require(balance(alice, cindy["USD"](-1000)));
-            env.require(balance(cindy, alice["USD"](1000)));
+            env.require(Balance(alice, cindy["USD"](-1000)));
+            env.require(Balance(cindy, alice["USD"](1000)));
 
             // alice claws back 300 USD from cindy
             env(claw(alice, cindy["USD"](300)));
             env.close();
 
             // bob's balance is unchanged
-            env.require(balance(alice, bob["USD"](-100)));
-            env.require(balance(bob, alice["USD"](100)));
+            env.require(Balance(alice, bob["USD"](-100)));
+            env.require(Balance(bob, alice["USD"](100)));
 
             // cindy's balance is reduced
-            env.require(balance(alice, cindy["USD"](-700)));
-            env.require(balance(cindy, alice["USD"](700)));
+            env.require(Balance(alice, cindy["USD"](-700)));
+            env.require(Balance(cindy, alice["USD"](700)));
         }
     }
 
@@ -654,12 +654,12 @@ class Clawback_test : public beast::unit_test::suite
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // bob sets asfAllowTrustLineClawback
         env(fset(bob, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(bob, asfAllowTrustLineClawback));
+        env.require(Flags(bob, asfAllowTrustLineClawback));
 
         // alice issues 1000 USD to bob
         env.trust(alice["USD"](1000), bob);
@@ -670,8 +670,8 @@ class Clawback_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, bob) == 1);
 
         // bob is the holder, and alice is the issuer
-        env.require(balance(bob, alice["USD"](1000)));
-        env.require(balance(alice, bob["USD"](-1000)));
+        env.require(Balance(bob, alice["USD"](1000)));
+        env.require(Balance(alice, bob["USD"](-1000)));
 
         // bob issues 1500 USD to alice
         env.trust(bob["USD"](1500), alice);
@@ -683,15 +683,15 @@ class Clawback_test : public beast::unit_test::suite
 
         // bob has negative 500 USD because bob issued 500 USD more than alice
         // bob can now been seen as the issuer, while alice is the holder
-        env.require(balance(bob, alice["USD"](-500)));
-        env.require(balance(alice, bob["USD"](500)));
+        env.require(Balance(bob, alice["USD"](-500)));
+        env.require(Balance(alice, bob["USD"](500)));
 
         // At this point, both alice and bob are the issuers of USD
         // and can send USD to each other through one trustline
 
         // alice fails to clawback. Even though she is also an issuer,
         // the trustline balance is positive from her perspective
-        env(claw(alice, bob["USD"](200)), ter(tecNO_PERMISSION));
+        env(claw(alice, bob["USD"](200)), Ter(tecNO_PERMISSION));
         env.close();
 
         // bob is able to successfully clawback from alice because
@@ -699,8 +699,8 @@ class Clawback_test : public beast::unit_test::suite
         env(claw(bob, alice["USD"](200)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](-300)));
-        env.require(balance(alice, bob["USD"](300)));
+        env.require(Balance(bob, alice["USD"](-300)));
+        env.require(Balance(alice, bob["USD"](300)));
 
         // alice pays bob 1000 USD
         env(pay(alice, bob, alice["USD"](1000)));
@@ -708,19 +708,19 @@ class Clawback_test : public beast::unit_test::suite
 
         // bob's balance becomes positive from his perspective because
         // alice issued more USD than the balance
-        env.require(balance(bob, alice["USD"](700)));
-        env.require(balance(alice, bob["USD"](-700)));
+        env.require(Balance(bob, alice["USD"](700)));
+        env.require(Balance(alice, bob["USD"](-700)));
 
         // bob is now the holder and fails to clawback
-        env(claw(bob, alice["USD"](200)), ter(tecNO_PERMISSION));
+        env(claw(bob, alice["USD"](200)), Ter(tecNO_PERMISSION));
         env.close();
 
         // alice successfully claws back
         env(claw(alice, bob["USD"](200)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](500)));
-        env.require(balance(alice, bob["USD"](-500)));
+        env.require(Balance(bob, alice["USD"](500)));
+        env.require(Balance(alice, bob["USD"](-500)));
     }
 
     void
@@ -738,26 +738,26 @@ class Clawback_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice, bob);
         env.close();
 
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // alice issues 1000 USD to bob
-        env.trust(USD(1000), bob);
-        env(pay(alice, bob, USD(1000)));
+        env.trust(usd(1000), bob);
+        env(pay(alice, bob, usd(1000)));
         env.close();
 
         BEAST_EXPECT(ownerCount(env, alice) == 0);
         BEAST_EXPECT(ownerCount(env, bob) == 1);
 
-        env.require(balance(bob, alice["USD"](1000)));
-        env.require(balance(alice, bob["USD"](-1000)));
+        env.require(Balance(bob, alice["USD"](1000)));
+        env.require(Balance(alice, bob["USD"](-1000)));
 
         // set limit to default,
-        env(trust(bob, USD(0), 0));
+        env(trust(bob, usd(0), 0));
         env.close();
 
         BEAST_EXPECT(ownerCount(env, alice) == 0);
@@ -788,20 +788,20 @@ class Clawback_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice, bob);
         env.close();
 
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // alice issues 1000 USD to bob
-        env.trust(USD(1000), bob);
-        env(pay(alice, bob, USD(1000)));
+        env.trust(usd(1000), bob);
+        env(pay(alice, bob, usd(1000)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](1000)));
-        env.require(balance(alice, bob["USD"](-1000)));
+        env.require(Balance(bob, alice["USD"](1000)));
+        env.require(Balance(alice, bob["USD"](-1000)));
 
         // freeze trustline
         env(trust(alice, bob["USD"](0), tfSetFreeze));
@@ -812,11 +812,11 @@ class Clawback_test : public beast::unit_test::suite
         env.close();
 
         // bob should have 800 USD left
-        env.require(balance(bob, alice["USD"](800)));
-        env.require(balance(alice, bob["USD"](-800)));
+        env.require(Balance(bob, alice["USD"](800)));
+        env.require(Balance(alice, bob["USD"](-800)));
 
         // trustline remains frozen
-        BEAST_EXPECT(getLineFreezeFlag(env, alice, bob, USD.currency));
+        BEAST_EXPECT(getLineFreezeFlag(env, alice, bob, usd.currency));
     }
 
     void
@@ -834,20 +834,20 @@ class Clawback_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice, bob);
         env.close();
 
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // alice issues 1000 USD to bob
-        env.trust(USD(1000), bob);
-        env(pay(alice, bob, USD(1000)));
+        env.trust(usd(1000), bob);
+        env(pay(alice, bob, usd(1000)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](1000)));
-        env.require(balance(alice, bob["USD"](-1000)));
+        env.require(Balance(bob, alice["USD"](1000)));
+        env.require(Balance(alice, bob["USD"](-1000)));
 
         // alice tries to claw back 2000 USD
         env(claw(alice, bob["USD"](2000)));
@@ -855,8 +855,8 @@ class Clawback_test : public beast::unit_test::suite
 
         // check alice and bob's balance.
         // alice was only able to claw back 1000 USD at maximum
-        env.require(balance(bob, alice["USD"](0)));
-        env.require(balance(alice, bob["USD"](0)));
+        env.require(Balance(bob, alice["USD"](0)));
+        env.require(Balance(alice, bob["USD"](0)));
 
         // bob still owns the trustline because trustline is not in default
         // state
@@ -864,7 +864,7 @@ class Clawback_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, bob) == 1);
 
         // set limit to default,
-        env(trust(bob, USD(0), 0));
+        env(trust(bob, usd(0), 0));
         env.close();
 
         // verify that bob's trustline was deleted
@@ -886,20 +886,20 @@ class Clawback_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice, bob);
         env.close();
 
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         // alice sets asfAllowTrustLineClawback
         env(fset(alice, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(alice, asfAllowTrustLineClawback));
+        env.require(Flags(alice, asfAllowTrustLineClawback));
 
         // alice issues 100 USD to bob
-        env.trust(USD(1000), bob);
-        env(pay(alice, bob, USD(100)));
+        env.trust(usd(1000), bob);
+        env(pay(alice, bob, usd(100)));
         env.close();
 
-        env.require(balance(bob, alice["USD"](100)));
-        env.require(balance(alice, bob["USD"](-100)));
+        env.require(Balance(bob, alice["USD"](100)));
+        env.require(Balance(alice, bob["USD"](-100)));
 
         // alice creates 10 tickets
         std::uint32_t ticketCnt = 10;
@@ -913,7 +913,7 @@ class Clawback_test : public beast::unit_test::suite
         while (ticketCnt > 0)
         {
             // alice claws back 5 USD using a ticket
-            env(claw(alice, bob["USD"](5)), ticket::use(aliceTicketSeq++));
+            env(claw(alice, bob["USD"](5)), ticket::Use(aliceTicketSeq++));
             env.close();
 
             ticketCnt--;
@@ -922,8 +922,8 @@ class Clawback_test : public beast::unit_test::suite
         }
 
         // alice clawed back 50 USD total, trustline has 50 USD remaining
-        env.require(balance(bob, alice["USD"](50)));
-        env.require(balance(alice, bob["USD"](-50)));
+        env.require(Balance(bob, alice["USD"](50)));
+        env.require(Balance(alice, bob["USD"](-50)));
 
         // Verify that the account sequence numbers did not advance.
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -949,7 +949,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         testWithFeats(all - featureMPTokensV1);
         testWithFeats(all);
diff --git a/src/test/app/Credentials_test.cpp b/src/test/app/Credentials_test.cpp
index 3c9a658aca..fa180d0603 100644
--- a/src/test/app/Credentials_test.cpp
+++ b/src/test/app/Credentials_test.cpp
@@ -34,7 +34,7 @@
 
 namespace xrpl::test {
 
-struct Credentials_test : public beast::unit_test::suite
+struct Credentials_test : public beast::unit_test::Suite
 {
     void
     testSuccessful(FeatureBitset features)
@@ -59,7 +59,7 @@ struct Credentials_test : public beast::unit_test::suite
             env.close();
 
             // Test Create credentials
-            env(credentials::create(subject, issuer, credType), credentials::uri(uri));
+            env(credentials::create(subject, issuer, credType), credentials::Uri(uri));
             env.close();
             {
                 auto const sleCred = env.le(credKey);
@@ -127,7 +127,7 @@ struct Credentials_test : public beast::unit_test::suite
 
             auto const credKey = credentials::keylet(issuer, issuer, credType);
 
-            env(credentials::create(issuer, issuer, credType), credentials::uri(uri));
+            env(credentials::create(issuer, issuer, credType), credentials::Uri(uri));
             env.close();
             {
                 auto const sleCred = env.le(credKey);
@@ -202,7 +202,7 @@ struct Credentials_test : public beast::unit_test::suite
                 for (int i = 0; i < delta; ++i)
                     env.close();
                 auto const acctDelFee{drops(env.current()->fees().increment)};
-                env(acctdelete(issuer, other), fee(acctDelFee));
+                env(acctdelete(issuer, other), Fee(acctDelFee));
                 env.close();
             }
 
@@ -239,7 +239,7 @@ struct Credentials_test : public beast::unit_test::suite
                 for (int i = 0; i < delta; ++i)
                     env.close();
                 auto const acctDelFee{drops(env.current()->fees().increment)};
-                env(acctdelete(issuer, other), fee(acctDelFee));
+                env(acctdelete(issuer, other), Fee(acctDelFee));
                 env.close();
             }
 
@@ -274,7 +274,7 @@ struct Credentials_test : public beast::unit_test::suite
                 for (int i = 0; i < delta; ++i)
                     env.close();
                 auto const acctDelFee{drops(env.current()->fees().increment)};
-                env(acctdelete(subject, other), fee(acctDelFee));
+                env(acctdelete(subject, other), Fee(acctDelFee));
                 env.close();
             }
 
@@ -311,7 +311,7 @@ struct Credentials_test : public beast::unit_test::suite
                 for (int i = 0; i < delta; ++i)
                     env.close();
                 auto const acctDelFee{drops(env.current()->fees().increment)};
-                env(acctdelete(subject, other), fee(acctDelFee));
+                env(acctdelete(subject, other), Fee(acctDelFee));
                 env.close();
             }
 
@@ -430,43 +430,43 @@ struct Credentials_test : public beast::unit_test::suite
                 testcase("Credentials fail, no subject param.");
                 auto jv = credentials::create(subject, issuer, credType);
                 jv.removeMember(jss::Subject);
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 auto jv = credentials::create(subject, issuer, credType);
                 jv[jss::Subject] = to_string(xrpAccount());
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 testcase("Credentials fail, no credentialType param.");
                 auto jv = credentials::create(subject, issuer, credType);
                 jv.removeMember(sfCredentialType.jsonName);
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 testcase("Credentials fail, empty credentialType param.");
                 auto jv = credentials::create(subject, issuer, "");
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 testcase(
                     "Credentials fail, credentialType length > "
                     "maxCredentialTypeLength.");
-                constexpr std::string_view longCredType =
+                constexpr std::string_view kLONG_CRED_TYPE =
                     "abcdefghijklmnopqrstuvwxyz01234567890qwertyuiop[]"
                     "asdfghjkl;'zxcvbnm8237tr28weufwldebvfv8734t07p";
-                static_assert(longCredType.size() > maxCredentialTypeLength);
-                auto jv = credentials::create(subject, issuer, longCredType);
-                env(jv, ter(temMALFORMED));
+                static_assert(kLONG_CRED_TYPE.size() > kMAX_CREDENTIAL_TYPE_LENGTH);
+                auto jv = credentials::create(subject, issuer, kLONG_CRED_TYPE);
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 testcase("Credentials fail, URI length > 256.");
-                constexpr std::string_view longURI =
+                constexpr std::string_view kLONG_URI =
                     "abcdefghijklmnopqrstuvwxyz01234567890qwertyuiop[]"
                     "asdfghjkl;'zxcvbnm8237tr28weufwldebvfv8734t07p   "
                     "9hfup;wDJFBVSD8f72  "
@@ -475,17 +475,17 @@ struct Credentials_test : public beast::unit_test::suite
                     "vujhgWQIE7F6WEUYFGWUKEYFVQW87FGWOEFWEFUYWVEF8723GFWEFB"
                     "WULE"
                     "fv28o37gfwEFB3872TFO8GSDSDVD";
-                static_assert(longURI.size() > maxCredentialURILength);
+                static_assert(kLONG_URI.size() > kMAX_CREDENTIAL_URI_LENGTH);
                 env(credentials::create(subject, issuer, credType),
-                    credentials::uri(longURI),
-                    ter(temMALFORMED));
+                    credentials::Uri(kLONG_URI),
+                    Ter(temMALFORMED));
             }
 
             {
                 testcase("Credentials fail, URI empty.");
                 env(credentials::create(subject, issuer, credType),
-                    credentials::uri(""),
-                    ter(temMALFORMED));
+                    credentials::Uri(""),
+                    Ter(temMALFORMED));
             }
 
             {
@@ -495,7 +495,7 @@ struct Credentials_test : public beast::unit_test::suite
                 uint32_t const t =
                     env.current()->header().parentCloseTime.time_since_epoch().count() - 1;
                 jv[sfExpiration.jsonName] = t;
-                env(jv, ter(tecEXPIRED));
+                env(jv, Ter(tecEXPIRED));
             }
 
             {
@@ -503,7 +503,7 @@ struct Credentials_test : public beast::unit_test::suite
 
                 auto jv = credentials::create(subject, issuer, credType);
                 jv[jss::Fee] = -1;
-                env(jv, ter(temBAD_FEE));
+                env(jv, Ter(temBAD_FEE));
             }
 
             {
@@ -511,7 +511,7 @@ struct Credentials_test : public beast::unit_test::suite
                 auto const jv = credentials::create(subject, issuer, credType);
                 env(jv);
                 env.close();
-                env(jv, ter(tecDUPLICATE));
+                env(jv, Ter(tecDUPLICATE));
                 env.close();
 
                 // check credential still present
@@ -544,9 +544,9 @@ struct Credentials_test : public beast::unit_test::suite
 
                 // NOLINTNEXTLINE(readability-suspicious-call-argument)
                 auto const jv = credentials::create(issuer, subject, credType);
-                env(jv, ter(tecDIR_FULL));
+                env(jv, Ter(tecDIR_FULL));
                 // Free one directory entry by using a ticket
-                env(noop(issuer), ticket::use(issuerSeq + 40));
+                env(noop(issuer), ticket::Use(issuerSeq + 40));
 
                 // Fill subject directory
                 env(ticket::create(subject, 63));
@@ -556,7 +556,7 @@ struct Credentials_test : public beast::unit_test::suite
                     keylet::ownerDir(subject.id()),
                     directory::adjustOwnerNode);
                 BEAST_EXPECT(res2);
-                env(jv, ter(tecDIR_FULL));
+                env(jv, Ter(tecDIR_FULL));
 
                 // End test
                 env.close();
@@ -573,7 +573,7 @@ struct Credentials_test : public beast::unit_test::suite
             {
                 testcase("Credentials fail, subject doesn't exist.");
                 auto const jv = credentials::create(subject, issuer, credType);
-                env(jv, ter(tecNO_TARGET));
+                env(jv, Ter(tecNO_TARGET));
             }
         }
 
@@ -588,7 +588,7 @@ struct Credentials_test : public beast::unit_test::suite
             testcase("Credentials fail, not enough reserve.");
             {
                 auto const jv = credentials::create(subject, issuer, credType);
-                env(jv, ter(tecINSUFFICIENT_RESERVE));
+                env(jv, Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
             }
         }
@@ -611,7 +611,7 @@ struct Credentials_test : public beast::unit_test::suite
 
             {
                 testcase("CredentialsAccept fail, Credential doesn't exist.");
-                env(credentials::accept(subject, issuer, credType), ter(tecNO_ENTRY));
+                env(credentials::accept(subject, issuer, credType), Ter(tecNO_ENTRY));
                 env.close();
             }
 
@@ -619,14 +619,14 @@ struct Credentials_test : public beast::unit_test::suite
                 testcase("CredentialsAccept fail, invalid Issuer account.");
                 auto jv = credentials::accept(subject, issuer, credType);
                 jv[jss::Issuer] = to_string(xrpAccount());
-                env(jv, ter(temINVALID_ACCOUNT_ID));
+                env(jv, Ter(temINVALID_ACCOUNT_ID));
                 env.close();
             }
 
             {
                 testcase("CredentialsAccept fail, invalid credentialType param.");
                 auto jv = credentials::accept(subject, issuer, "");
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
         }
 
@@ -642,7 +642,7 @@ struct Credentials_test : public beast::unit_test::suite
                 env(credentials::create(subject, issuer, credType));
                 env.close();
 
-                env(credentials::accept(subject, issuer, credType), ter(tecINSUFFICIENT_RESERVE));
+                env(credentials::accept(subject, issuer, credType), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // check credential still present
@@ -674,12 +674,12 @@ struct Credentials_test : public beast::unit_test::suite
                 testcase("CredentialsAccept fail, invalid fee.");
                 auto jv = credentials::accept(subject, issuer, credType);
                 jv[jss::Fee] = -1;
-                env(jv, ter(temBAD_FEE));
+                env(jv, Ter(temBAD_FEE));
 
                 testcase("CredentialsAccept fail, lsfAccepted already set.");
                 env(credentials::accept(subject, issuer, credType));
                 env.close();
-                env(credentials::accept(subject, issuer, credType), ter(tecDUPLICATE));
+                env(credentials::accept(subject, issuer, credType), Ter(tecDUPLICATE));
                 env.close();
 
                 // check credential still present
@@ -708,7 +708,7 @@ struct Credentials_test : public beast::unit_test::suite
                 env.close();
 
                 // credentials are expired now
-                env(credentials::accept(subject, issuer, credType2), ter(tecEXPIRED));
+                env(credentials::accept(subject, issuer, credType2), Ter(tecEXPIRED));
                 env.close();
 
                 // check that expired credentials were deleted
@@ -741,11 +741,11 @@ struct Credentials_test : public beast::unit_test::suite
                 for (int i = 0; i < delta; ++i)
                     env.close();
                 auto const acctDelFee{drops(env.current()->fees().increment)};
-                env(acctdelete(issuer, other), fee(acctDelFee));
+                env(acctdelete(issuer, other), Fee(acctDelFee));
 
                 // can't accept - no issuer account
                 jv = credentials::accept(subject, issuer, credType);
-                env(jv, ter(tecNO_ISSUER));
+                env(jv, Ter(tecNO_ISSUER));
                 env.close();
 
                 // check that expired credentials were deleted
@@ -777,7 +777,7 @@ struct Credentials_test : public beast::unit_test::suite
 
             {
                 testcase("CredentialsDelete fail, no Credentials.");
-                env(credentials::deleteCred(subject, subject, issuer, credType), ter(tecNO_ENTRY));
+                env(credentials::deleteCred(subject, subject, issuer, credType), Ter(tecNO_ENTRY));
                 env.close();
             }
 
@@ -785,7 +785,7 @@ struct Credentials_test : public beast::unit_test::suite
                 testcase("CredentialsDelete fail, invalid Subject account.");
                 auto jv = credentials::deleteCred(subject, subject, issuer, credType);
                 jv[jss::Subject] = to_string(xrpAccount());
-                env(jv, ter(temINVALID_ACCOUNT_ID));
+                env(jv, Ter(temINVALID_ACCOUNT_ID));
                 env.close();
             }
 
@@ -793,14 +793,14 @@ struct Credentials_test : public beast::unit_test::suite
                 testcase("CredentialsDelete fail, invalid Issuer account.");
                 auto jv = credentials::deleteCred(subject, subject, issuer, credType);
                 jv[jss::Issuer] = to_string(xrpAccount());
-                env(jv, ter(temINVALID_ACCOUNT_ID));
+                env(jv, Ter(temINVALID_ACCOUNT_ID));
                 env.close();
             }
 
             {
                 testcase("CredentialsDelete fail, invalid credentialType param.");
                 auto jv = credentials::deleteCred(subject, subject, issuer, "");
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
@@ -811,7 +811,7 @@ struct Credentials_test : public beast::unit_test::suite
 
                 // Other account can't delete credentials without expiration
                 env(credentials::deleteCred(other, subject, issuer, credType2),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
 
                 // check credential still present
@@ -841,7 +841,7 @@ struct Credentials_test : public beast::unit_test::suite
 
                 // Other account can't delete credentials that not expired
                 env(credentials::deleteCred(other, subject, issuer, credType),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
 
                 // check credential still present
@@ -864,7 +864,7 @@ struct Credentials_test : public beast::unit_test::suite
                 auto jv = credentials::deleteCred(subject, subject, issuer, credType);
                 jv.removeMember(jss::Subject);
                 jv.removeMember(jss::Issuer);
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
                 env.close();
             }
 
@@ -873,14 +873,14 @@ struct Credentials_test : public beast::unit_test::suite
 
                 auto jv = credentials::deleteCred(subject, subject, issuer, credType);
                 jv[jss::Fee] = -1;
-                env(jv, ter(temBAD_FEE));
+                env(jv, Ter(temBAD_FEE));
                 env.close();
             }
 
             {
                 testcase("deleteSLE fail, bad SLE.");
                 auto view =
-                    std::make_shared<ApplyViewImpl>(env.current().get(), ApplyFlags::tapNONE);
+                    std::make_shared<ApplyViewImpl>(env.current().get(), ApplyFlags::TapNone);
                 auto ter = xrpl::credentials::deleteSLE(*view, {}, env.journal);
                 BEAST_EXPECT(ter == tecNO_ENTRY);
             }
@@ -905,9 +905,9 @@ struct Credentials_test : public beast::unit_test::suite
 
             {
                 testcase("Credentials fail, Feature is not enabled.");
-                env(credentials::create(subject, issuer, credType), ter(temDISABLED));
-                env(credentials::accept(subject, issuer, credType), ter(temDISABLED));
-                env(credentials::deleteCred(subject, subject, issuer, credType), ter(temDISABLED));
+                env(credentials::create(subject, issuer, credType), Ter(temDISABLED));
+                env(credentials::accept(subject, issuer, credType), Ter(temDISABLED));
+                env(credentials::deleteCred(subject, subject, issuer, credType), Ter(temDISABLED));
             }
         }
     }
@@ -938,7 +938,7 @@ struct Credentials_test : public beast::unit_test::suite
 
             std::string txHash0, txHash1;
             {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = subject.human();
                 auto const jv = env.rpc("json", "account_tx", to_string(params))[jss::result];
 
@@ -952,7 +952,7 @@ struct Credentials_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = issuer.human();
                 auto const jv = env.rpc("json", "account_tx", to_string(params))[jss::result];
 
@@ -969,7 +969,7 @@ struct Credentials_test : public beast::unit_test::suite
             testcase("account_objects");
             std::string objectIdx;
             {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = subject.human();
                 auto jv = env.rpc("json", "account_objects", to_string(params))[jss::result];
 
@@ -981,7 +981,7 @@ struct Credentials_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = issuer.human();
                 auto jv = env.rpc("json", "account_objects", to_string(params))[jss::result];
 
@@ -1014,15 +1014,15 @@ struct Credentials_test : public beast::unit_test::suite
             env.close();
 
             {
-                ter const expected(enabled ? TER(temINVALID_FLAG) : TER(tesSUCCESS));
+                Ter const expected(enabled ? TER(temINVALID_FLAG) : TER(tesSUCCESS));
                 env(credentials::create(subject, issuer, credType),
-                    txflags(tfTransferable),
+                    Txflags(tfTransferable),
                     expected);
                 env(credentials::accept(subject, issuer, credType),
-                    txflags(tfSellNFToken),
+                    Txflags(tfSellNFToken),
                     expected);
                 env(credentials::deleteCred(subject, subject, issuer, credType),
-                    txflags(tfPassive),
+                    Txflags(tfPassive),
                     expected);
             }
         }
@@ -1032,7 +1032,7 @@ struct Credentials_test : public beast::unit_test::suite
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testSuccessful(all);
         testCredentialsDelete(all);
         testCreateFailed(all);
diff --git a/src/test/app/CrossingLimitsMPT_test.cpp b/src/test/app/CrossingLimitsMPT_test.cpp
index 8efacaae21..e9a9861a3a 100644
--- a/src/test/app/CrossingLimitsMPT_test.cpp
+++ b/src/test/app/CrossingLimitsMPT_test.cpp
@@ -18,7 +18,7 @@
 
 namespace xrpl::test {
 
-class CrossingLimitsMPT_test : public beast::unit_test::suite
+class CrossingLimitsMPT_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -32,32 +32,32 @@ public:
         auto const gw = Account("gateway");
 
         env.fund(XRP(100'000'000), gw, "alice", "bob", "carol", "dan");
-        MPT const USD =
+        MPT const usd =
             MPTTester({.env = env, .issuer = gw, .holders = {"bob", "dan"}, .maxAmt = 2});
-        env(pay(gw, "bob", USD(1)));
-        env(pay(gw, "dan", USD(1)));
-        n_offers(env, 2'000, "bob", XRP(1), USD(1));
-        n_offers(env, 1, "dan", XRP(1), USD(1));
+        env(pay(gw, "bob", usd(1)));
+        env(pay(gw, "dan", usd(1)));
+        nOffers(env, 2'000, "bob", XRP(1), usd(1));
+        nOffers(env, 1, "dan", XRP(1), usd(1));
 
         // Alice offers to buy 1000 XRP for 1000 USD. She takes Bob's first
         // offer, removes 999 more as unfunded, then hits the step limit.
-        env(offer("alice", USD(1'000), XRP(1'000)));
-        env.require(balance("alice", USD(1)));
-        env.require(owners("alice", 2));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1'001));
-        env.require(balance("dan", USD(1)));
-        env.require(owners("dan", 2));
+        env(offer("alice", usd(1'000), XRP(1'000)));
+        env.require(Balance("alice", usd(1)));
+        env.require(Owners("alice", 2));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1'001));
+        env.require(Balance("dan", usd(1)));
+        env.require(Owners("dan", 2));
 
         // 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(none)));
-        env.require(owners("carol", 1));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1));
-        env.require(balance("dan", USD(1)));
-        env.require(owners("dan", 2));
+        env(offer("carol", usd(1'000), XRP(1'000)));
+        env.require(Balance("carol", usd(kNONE)));
+        env.require(Owners("carol", 1));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1));
+        env.require(Balance("dan", usd(1)));
+        env.require(Owners("dan", 2));
     }
 
     void
@@ -74,27 +74,27 @@ public:
 
         env.fund(XRP(100'000'000), gw, "alice", "bob", "carol");
         int const bobsOfferCount = maxConsumed + 150;
-        MPT const USD =
+        MPT const usd =
             MPTTester({.env = env, .issuer = gw, .holders = {"bob"}, .maxAmt = bobsOfferCount});
-        env(pay(gw, "bob", USD(bobsOfferCount)));
+        env(pay(gw, "bob", usd(bobsOfferCount)));
         env.close();
-        n_offers(env, bobsOfferCount, "bob", XRP(1), USD(1));
+        nOffers(env, bobsOfferCount, "bob", XRP(1), usd(1));
 
         // Alice offers to buy Bob's offers. However, she hits the offer
         // crossing limit, so she can't buy them all at once.
-        env(offer("alice", USD(bobsOfferCount), XRP(bobsOfferCount)));
+        env(offer("alice", usd(bobsOfferCount), XRP(bobsOfferCount)));
         env.close();
-        env.require(balance("alice", USD(maxConsumed)));
-        env.require(balance("bob", USD(150)));
-        env.require(owners("bob", 150 + 1));
+        env.require(Balance("alice", usd(maxConsumed)));
+        env.require(Balance("bob", usd(150)));
+        env.require(Owners("bob", 150 + 1));
 
         // Carol offers to buy 1000 XRP for 1000 USD. She takes Bob's
         // remaining 150 offers without hitting a limit.
-        env(offer("carol", USD(1'000), XRP(1'000)));
+        env(offer("carol", usd(1'000), XRP(1'000)));
         env.close();
-        env.require(balance("carol", USD(150)));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1));
+        env.require(Balance("carol", usd(150)));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1));
     }
 
     void
@@ -112,47 +112,47 @@ public:
         int const maxConsumed = 1'000;
         int const evitaOfferCount{maxConsumed + 49};
 
-        MPT const USD = MPTTester(
+        MPT const usd = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {"bob", "alice", "carol", "evita"},
              .maxAmt = 2'000 + evitaOfferCount + 1});
 
-        env(pay(gw, "alice", USD(1000)));
-        env(pay(gw, "carol", USD(1)));
-        env(pay(gw, "evita", USD(evitaOfferCount + 1)));
+        env(pay(gw, "alice", usd(1000)));
+        env(pay(gw, "carol", usd(1)));
+        env(pay(gw, "evita", usd(evitaOfferCount + 1)));
 
         // Give carol an extra 150 (unfunded) offers when we're using Taker
         // to accommodate that difference.
         int const carolOfferCount{700};
-        n_offers(env, 400, "alice", XRP(1), USD(1));
-        n_offers(env, carolOfferCount, "carol", XRP(1), USD(1));
-        n_offers(env, evitaOfferCount, "evita", XRP(1), USD(1));
+        nOffers(env, 400, "alice", XRP(1), usd(1));
+        nOffers(env, carolOfferCount, "carol", XRP(1), usd(1));
+        nOffers(env, evitaOfferCount, "evita", XRP(1), usd(1));
 
         // Bob offers to buy 1000 XRP for 1000 USD. He takes all 400 USD from
         // Alice's offers, 1 USD from Carol's and then removes 599 of Carol's
         // offers as unfunded, before hitting the step limit.
-        env(offer("bob", USD(1000), XRP(1000)));
-        env.require(balance("bob", USD(401)));
-        env.require(balance("alice", USD(600)));
-        env.require(owners("alice", 1));
-        env.require(balance("carol", USD(0)));
-        env.require(owners("carol", carolOfferCount - 599));
-        env.require(balance("evita", USD(evitaOfferCount + 1)));
-        env.require(owners("evita", evitaOfferCount + 1));
+        env(offer("bob", usd(1000), XRP(1000)));
+        env.require(Balance("bob", usd(401)));
+        env.require(Balance("alice", usd(600)));
+        env.require(Owners("alice", 1));
+        env.require(Balance("carol", usd(0)));
+        env.require(Owners("carol", carolOfferCount - 599));
+        env.require(Balance("evita", usd(evitaOfferCount + 1)));
+        env.require(Owners("evita", evitaOfferCount + 1));
 
         // Dan offers to buy maxConsumed + 50 XRP USD. He removes all of
         // Carol's remaining offers as unfunded, then takes
         // (maxConsumed - 100) USD from Evita's, hitting the crossing limit.
-        env(offer("dan", USD(maxConsumed + 50), XRP(maxConsumed + 50)));
-        env.require(balance("dan", USD(maxConsumed - 100)));
-        env.require(owners("dan", 2));
-        env.require(balance("alice", USD(600)));
-        env.require(owners("alice", 1));
-        env.require(balance("carol", USD(0)));
-        env.require(owners("carol", 1));
-        env.require(balance("evita", USD(150)));
-        env.require(owners("evita", 150));
+        env(offer("dan", usd(maxConsumed + 50), XRP(maxConsumed + 50)));
+        env.require(Balance("dan", usd(maxConsumed - 100)));
+        env.require(Owners("dan", 2));
+        env.require(Balance("alice", usd(600)));
+        env.require(Owners("alice", 1));
+        env.require(Balance("carol", usd(0)));
+        env.require(Owners("carol", 1));
+        env.require(Balance("evita", usd(150)));
+        env.require(Owners("evita", 150));
     }
 
     void
@@ -193,31 +193,31 @@ public:
 
                 env.fund(XRP(100'000'000), gw, alice, bob, carol);
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol},
-                     .limit = maxMPTokenAmount});
-                auto const EUR = issue2(
+                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {bob},
-                     .limit = maxMPTokenAmount});
+                     .limit = kMAX_MP_TOKEN_AMOUNT});
 
-                env(pay(gw, alice, USD(4'000)));
-                env(pay(gw, carol, USD(3)));
+                env(pay(gw, alice, usd(4'000)));
+                env(pay(gw, carol, usd(3)));
 
                 // Notice the strand with the 800 unfunded offers has the
                 // initial best quality
-                n_offers(env, 2'000, alice, EUR(2), XRP(1));
-                n_offers(env, 100, alice, XRP(1), USD(4));
-                n_offers(env, 801, carol, XRP(1),
-                         USD(3));  // only one offer is funded
-                n_offers(env, 1'000, alice, XRP(1), USD(3));
+                nOffers(env, 2'000, alice, eur(2), XRP(1));
+                nOffers(env, 100, alice, XRP(1), usd(4));
+                nOffers(env, 801, carol, XRP(1),
+                        usd(3));  // only one offer is funded
+                nOffers(env, 1'000, alice, XRP(1), usd(3));
 
-                n_offers(env, 1, alice, EUR(500), USD(500));
+                nOffers(env, 1, alice, eur(500), usd(500));
 
                 // Bob offers to buy 2000 USD for 2000 EUR; He starts with 2000
                 // EUR
@@ -258,21 +258,21 @@ public:
                 //           Alice spent 1497 USD (100*4 + 199*3 + 500)
                 //           Alice has 2503 remaining (4000 - 1497)
                 //           Alice received 1100 EUR (200 + 400 + 500)
-                env(pay(gw, bob, EUR(2'000)));
+                env(pay(gw, bob, eur(2'000)));
                 env.close();
-                env(offer(bob, USD(4'000), EUR(4'000)));
+                env(offer(bob, usd(4'000), eur(4'000)));
                 env.close();
 
-                env.require(balance(bob, USD(1'500)));
-                env.require(balance(bob, EUR(900)));
+                env.require(Balance(bob, usd(1'500)));
+                env.require(Balance(bob, eur(900)));
                 env.require(offers(bob, 1));
-                env.require(owners(bob, 3));
+                env.require(Owners(bob, 3));
 
-                env.require(balance(alice, USD(2'503)));
-                env.require(balance(alice, EUR(1'100)));
+                env.require(Balance(alice, usd(2'503)));
+                env.require(Balance(alice, eur(1'100)));
                 auto const numAOffers = 2'000 + 100 + 1'000 + 1 - (2 * 100 + 2 * 199 + 1 + 1);
                 env.require(offers(alice, numAOffers));
-                env.require(owners(alice, numAOffers + 2));
+                env.require(Owners(alice, numAOffers + 2));
 
                 env.require(offers(carol, 0));
             };
@@ -284,32 +284,32 @@ public:
 
                 env.fund(XRP(100'000'000), gw, alice, bob, carol);
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol},
-                     .limit = maxMPTokenAmount});
-                auto const EUR = issue2(
+                     .limit = kMAX_MP_TOKEN_AMOUNT});
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {bob},
-                     .limit = maxMPTokenAmount});
+                     .limit = kMAX_MP_TOKEN_AMOUNT});
 
-                env(pay(gw, alice, USD(4'000)));
-                env(pay(gw, carol, USD(3)));
+                env(pay(gw, alice, usd(4'000)));
+                env(pay(gw, carol, usd(3)));
 
                 // Notice the strand with the 800 unfunded offers does not have
                 // the initial best quality
-                n_offers(env, 1, alice, EUR(1), USD(10));
-                n_offers(env, 2'000, alice, EUR(2), XRP(1));
-                n_offers(env, 100, alice, XRP(1), USD(4));
-                n_offers(env, 801, carol, XRP(1),
-                         USD(3));  // only one offer is funded
-                n_offers(env, 1'000, alice, XRP(1), USD(3));
+                nOffers(env, 1, alice, eur(1), usd(10));
+                nOffers(env, 2'000, alice, eur(2), XRP(1));
+                nOffers(env, 100, alice, XRP(1), usd(4));
+                nOffers(env, 801, carol, XRP(1),
+                        usd(3));  // only one offer is funded
+                nOffers(env, 1'000, alice, XRP(1), usd(3));
 
-                n_offers(env, 1, alice, EUR(499), USD(499));
+                nOffers(env, 1, alice, eur(499), usd(499));
 
                 // Bob offers to buy 2000 USD for 2000 EUR; He starts with 2000
                 // EUR
@@ -345,22 +345,22 @@ public:
                 //           She started with 4000 so has 2494 USD remaining.
                 //           Alice received 200 + 400 + 500 = 1100 EUR
                 env.close();
-                env(pay(gw, bob, EUR(2'000)));
+                env(pay(gw, bob, eur(2'000)));
                 env.close();
-                env(offer(bob, USD(4'000), EUR(4'000)));
+                env(offer(bob, usd(4'000), eur(4'000)));
                 env.close();
 
-                env.require(balance(bob, USD(1'509)));
-                env.require(balance(bob, EUR(900)));
+                env.require(Balance(bob, usd(1'509)));
+                env.require(Balance(bob, eur(900)));
                 env.require(offers(bob, 1));
-                env.require(owners(bob, 3));
+                env.require(Owners(bob, 3));
 
-                env.require(balance(alice, USD(2'494)));
-                env.require(balance(alice, EUR(1'100)));
+                env.require(Balance(alice, usd(2'494)));
+                env.require(Balance(alice, eur(1'100)));
                 auto const numAOffers =
                     1 + 2'000 + 100 + 1'000 + 1 - (1 + 2 * 100 + 2 * 199 + 1 + 1);
                 env.require(offers(alice, numAOffers));
-                env.require(owners(alice, numAOffers + 2));
+                env.require(Owners(alice, numAOffers + 2));
 
                 env.require(offers(carol, 0));
             };
@@ -383,9 +383,9 @@ public:
 
         env.fund(XRP(100'000'000), gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, alice, USD(8'000)));
+        env(pay(gw, alice, usd(8'000)));
         env.close();
 
         // The new flow cross handles consuming excessive offers differently
@@ -407,28 +407,28 @@ public:
         // second set will consume 998, which is not over the limit and the
         // payment stops. So 2*998, or 1996 is the expected value when
         // `FlowSortStrands` is enabled.
-        n_offers(env, 998, alice, XRP(1.00), USD(1));
-        n_offers(env, 998, alice, XRP(0.99), USD(1));
-        n_offers(env, 998, alice, XRP(0.98), USD(1));
-        n_offers(env, 998, alice, XRP(0.97), USD(1));
-        n_offers(env, 998, alice, XRP(0.96), USD(1));
-        n_offers(env, 998, alice, XRP(0.95), USD(1));
+        nOffers(env, 998, alice, XRP(1.00), usd(1));
+        nOffers(env, 998, alice, XRP(0.99), usd(1));
+        nOffers(env, 998, alice, XRP(0.98), usd(1));
+        nOffers(env, 998, alice, XRP(0.97), usd(1));
+        nOffers(env, 998, alice, XRP(0.96), usd(1));
+        nOffers(env, 998, alice, XRP(0.95), usd(1));
 
         auto const expectedTER = tesSUCCESS;
 
-        env(offer(bob, USD(8'000), XRP(8'000)), ter(expectedTER));
+        env(offer(bob, usd(8'000), XRP(8'000)), Ter(expectedTER));
         env.close();
 
-        auto const expectedUSD = USD(1'996);
+        auto const expectedUSD = usd(1'996);
 
-        env.require(balance(bob, expectedUSD));
+        env.require(Balance(bob, expectedUSD));
     }
 
     void
     run() override
     {
         using namespace jtx;
-        auto const features = testable_amendments();
+        auto const features = testableAmendments();
         testStepLimit(features);
         testCrossingLimit(features);
         testStepAndCrossingLimit(features);
diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp
index 0cbe57a464..331afddad1 100644
--- a/src/test/app/CrossingLimits_test.cpp
+++ b/src/test/app/CrossingLimits_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl::test {
 
-class CrossingLimits_test : public beast::unit_test::suite
+class CrossingLimits_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -28,35 +28,35 @@ public:
         Env env(*this, features);
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(100000000), gw, "alice", "bob", "carol", "dan");
-        env.trust(USD(1), "bob");
-        env(pay(gw, "bob", USD(1)));
-        env.trust(USD(1), "dan");
-        env(pay(gw, "dan", USD(1)));
-        n_offers(env, 2000, "bob", XRP(1), USD(1));
-        n_offers(env, 1, "dan", XRP(1), USD(1));
+        env.trust(usd(1), "bob");
+        env(pay(gw, "bob", usd(1)));
+        env.trust(usd(1), "dan");
+        env(pay(gw, "dan", usd(1)));
+        nOffers(env, 2000, "bob", XRP(1), usd(1));
+        nOffers(env, 1, "dan", XRP(1), usd(1));
 
         // Alice offers to buy 1000 XRP for 1000 USD. She takes Bob's first
         // offer, removes 999 more as unfunded, then hits the step limit.
-        env(offer("alice", USD(1000), XRP(1000)));
-        env.require(balance("alice", USD(1)));
-        env.require(owners("alice", 2));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1001));
-        env.require(balance("dan", USD(1)));
-        env.require(owners("dan", 2));
+        env(offer("alice", usd(1000), XRP(1000)));
+        env.require(Balance("alice", usd(1)));
+        env.require(Owners("alice", 2));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1001));
+        env.require(Balance("dan", usd(1)));
+        env.require(Owners("dan", 2));
 
         // 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(none)));
-        env.require(owners("carol", 1));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1));
-        env.require(balance("dan", USD(1)));
-        env.require(owners("dan", 2));
+        env(offer("carol", usd(1000), XRP(1000)));
+        env.require(Balance("carol", usd(kNONE)));
+        env.require(Owners("carol", 1));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1));
+        env.require(Balance("dan", usd(1)));
+        env.require(Owners("dan", 2));
     }
 
     void
@@ -68,33 +68,33 @@ public:
         Env env(*this, features);
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // The payment engine allows 1000 offers to cross.
         int const maxConsumed = 1000;
 
         env.fund(XRP(100000000), gw, "alice", "bob", "carol");
         int const bobOfferCount = maxConsumed + 150;
-        env.trust(USD(bobOfferCount), "bob");
-        env(pay(gw, "bob", USD(bobOfferCount)));
+        env.trust(usd(bobOfferCount), "bob");
+        env(pay(gw, "bob", usd(bobOfferCount)));
         env.close();
-        n_offers(env, bobOfferCount, "bob", XRP(1), USD(1));
+        nOffers(env, bobOfferCount, "bob", XRP(1), usd(1));
 
         // Alice offers to buy Bob's offers. However she hits the offer
         // crossing limit, so she can't buy them all at once.
-        env(offer("alice", USD(bobOfferCount), XRP(bobOfferCount)));
+        env(offer("alice", usd(bobOfferCount), XRP(bobOfferCount)));
         env.close();
-        env.require(balance("alice", USD(maxConsumed)));
-        env.require(balance("bob", USD(150)));
-        env.require(owners("bob", 150 + 1));
+        env.require(Balance("alice", usd(maxConsumed)));
+        env.require(Balance("bob", usd(150)));
+        env.require(Owners("bob", 150 + 1));
 
         // Carol offers to buy 1000 XRP for 1000 USD. She takes Bob's
         // remaining 150 offers without hitting a limit.
-        env(offer("carol", USD(1000), XRP(1000)));
+        env(offer("carol", usd(1000), XRP(1000)));
         env.close();
-        env.require(balance("carol", USD(150)));
-        env.require(balance("bob", USD(0)));
-        env.require(owners("bob", 1));
+        env.require(Balance("carol", usd(150)));
+        env.require(Balance("bob", usd(0)));
+        env.require(Owners("bob", 1));
     }
 
     void
@@ -106,7 +106,7 @@ public:
         Env env(*this, features);
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(100000000), gw, "alice", "bob", "carol", "dan", "evita");
 
@@ -114,43 +114,43 @@ public:
         int const maxConsumed = 1000;
 
         int const evitaOfferCount{maxConsumed + 49};
-        env.trust(USD(1000), "alice");
-        env(pay(gw, "alice", USD(1000)));
-        env.trust(USD(1000), "carol");
-        env(pay(gw, "carol", USD(1)));
-        env.trust(USD(evitaOfferCount + 1), "evita");
-        env(pay(gw, "evita", USD(evitaOfferCount + 1)));
+        env.trust(usd(1000), "alice");
+        env(pay(gw, "alice", usd(1000)));
+        env.trust(usd(1000), "carol");
+        env(pay(gw, "carol", usd(1)));
+        env.trust(usd(evitaOfferCount + 1), "evita");
+        env(pay(gw, "evita", usd(evitaOfferCount + 1)));
 
         // The payment engine has a limit of 1000 funded or unfunded offers.
         int const carolsOfferCount{700};
-        n_offers(env, 400, "alice", XRP(1), USD(1));
-        n_offers(env, carolsOfferCount, "carol", XRP(1), USD(1));
-        n_offers(env, evitaOfferCount, "evita", XRP(1), USD(1));
+        nOffers(env, 400, "alice", XRP(1), usd(1));
+        nOffers(env, carolsOfferCount, "carol", XRP(1), usd(1));
+        nOffers(env, evitaOfferCount, "evita", XRP(1), usd(1));
 
         // Bob offers to buy 1000 XRP for 1000 USD. He takes all 400 USD from
         // Alice's offers, 1 USD from Carol's and then removes 599 of Carol's
         // offers as unfunded, before hitting the step limit.
-        env(offer("bob", USD(1000), XRP(1000)));
-        env.require(balance("bob", USD(401)));
-        env.require(balance("alice", USD(600)));
-        env.require(owners("alice", 1));
-        env.require(balance("carol", USD(0)));
-        env.require(owners("carol", carolsOfferCount - 599));
-        env.require(balance("evita", USD(evitaOfferCount + 1)));
-        env.require(owners("evita", evitaOfferCount + 1));
+        env(offer("bob", usd(1000), XRP(1000)));
+        env.require(Balance("bob", usd(401)));
+        env.require(Balance("alice", usd(600)));
+        env.require(Owners("alice", 1));
+        env.require(Balance("carol", usd(0)));
+        env.require(Owners("carol", carolsOfferCount - 599));
+        env.require(Balance("evita", usd(evitaOfferCount + 1)));
+        env.require(Owners("evita", evitaOfferCount + 1));
 
         // Dan offers to buy maxConsumed + 50 XRP USD. He removes all of
         // Carol's remaining offers as unfunded, then takes
         // (maxConsumed - 100) USD from Evita's, hitting the crossing limit.
-        env(offer("dan", USD(maxConsumed + 50), XRP(maxConsumed + 50)));
-        env.require(balance("dan", USD(maxConsumed - 100)));
-        env.require(owners("dan", 2));
-        env.require(balance("alice", USD(600)));
-        env.require(owners("alice", 1));
-        env.require(balance("carol", USD(0)));
-        env.require(owners("carol", 1));
-        env.require(balance("evita", USD(150)));
-        env.require(owners("evita", 150));
+        env(offer("dan", usd(maxConsumed + 50), XRP(maxConsumed + 50)));
+        env.require(Balance("dan", usd(maxConsumed - 100)));
+        env.require(Owners("dan", 2));
+        env.require(Balance("alice", usd(600)));
+        env.require(Owners("alice", 1));
+        env.require(Balance("carol", usd(0)));
+        env.require(Owners("carol", 1));
+        env.require(Balance("evita", usd(150)));
+        env.require(Owners("evita", 150));
     }
 
     void
@@ -173,8 +173,8 @@ public:
         auto const bob = Account("bob");
         auto const carol = Account("carol");
 
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         // There are two almost identical tests. There is a strand with a large
         // number of unfunded offers that will cause the strand to be marked dry
@@ -192,19 +192,19 @@ public:
 
             env.fund(XRP(100000000), gw, alice, bob, carol);
 
-            env.trust(USD(4000), alice);
-            env(pay(gw, alice, USD(4000)));
-            env.trust(USD(1000), carol);
-            env(pay(gw, carol, USD(3)));
+            env.trust(usd(4000), alice);
+            env(pay(gw, alice, usd(4000)));
+            env.trust(usd(1000), carol);
+            env(pay(gw, carol, usd(3)));
 
             // Notice the strand with the 800 unfunded offers has the initial
             // best quality
-            n_offers(env, 2000, alice, EUR(2), XRP(1));
-            n_offers(env, 100, alice, XRP(1), USD(4));
-            n_offers(env, 801, carol, XRP(1), USD(3));  // only one offer is funded
-            n_offers(env, 1000, alice, XRP(1), USD(3));
+            nOffers(env, 2000, alice, eur(2), XRP(1));
+            nOffers(env, 100, alice, XRP(1), usd(4));
+            nOffers(env, 801, carol, XRP(1), usd(3));  // only one offer is funded
+            nOffers(env, 1000, alice, XRP(1), usd(3));
 
-            n_offers(env, 1, alice, EUR(500), USD(500));
+            nOffers(env, 1, alice, eur(500), usd(500));
 
             // Bob offers to buy 2000 USD for 2000 EUR; He starts with 2000 EUR
             //  1. The best quality is the autobridged offers that take 2 EUR
@@ -244,23 +244,23 @@ public:
             //           Alice spent 1497 USD (100*4 + 199*3 + 500)
             //           Alice has 2503 remaining (4000 - 1497)
             //           Alice received 1100 EUR (200 + 400 + 500)
-            env.trust(EUR(10000), bob);
+            env.trust(eur(10000), bob);
             env.close();
-            env(pay(gw, bob, EUR(2000)));
+            env(pay(gw, bob, eur(2000)));
             env.close();
-            env(offer(bob, USD(4000), EUR(4000)));
+            env(offer(bob, usd(4000), eur(4000)));
             env.close();
 
-            env.require(balance(bob, USD(1500)));
-            env.require(balance(bob, EUR(900)));
+            env.require(Balance(bob, usd(1500)));
+            env.require(Balance(bob, eur(900)));
             env.require(offers(bob, 1));
-            env.require(owners(bob, 3));
+            env.require(Owners(bob, 3));
 
-            env.require(balance(alice, USD(2503)));
-            env.require(balance(alice, EUR(1100)));
+            env.require(Balance(alice, usd(2503)));
+            env.require(Balance(alice, eur(1100)));
             auto const numAOffers = 2000 + 100 + 1000 + 1 - (2 * 100 + 2 * 199 + 1 + 1);
             env.require(offers(alice, numAOffers));
-            env.require(owners(alice, numAOffers + 2));
+            env.require(Owners(alice, numAOffers + 2));
 
             env.require(offers(carol, 0));
         }
@@ -269,20 +269,20 @@ public:
 
             env.fund(XRP(100000000), gw, alice, bob, carol);
 
-            env.trust(USD(4000), alice);
-            env(pay(gw, alice, USD(4000)));
-            env.trust(USD(1000), carol);
-            env(pay(gw, carol, USD(3)));
+            env.trust(usd(4000), alice);
+            env(pay(gw, alice, usd(4000)));
+            env.trust(usd(1000), carol);
+            env(pay(gw, carol, usd(3)));
 
             // Notice the strand with the 800 unfunded offers does not have the
             // initial best quality
-            n_offers(env, 1, alice, EUR(1), USD(10));
-            n_offers(env, 2000, alice, EUR(2), XRP(1));
-            n_offers(env, 100, alice, XRP(1), USD(4));
-            n_offers(env, 801, carol, XRP(1), USD(3));  // only one offer is funded
-            n_offers(env, 1000, alice, XRP(1), USD(3));
+            nOffers(env, 1, alice, eur(1), usd(10));
+            nOffers(env, 2000, alice, eur(2), XRP(1));
+            nOffers(env, 100, alice, XRP(1), usd(4));
+            nOffers(env, 801, carol, XRP(1), usd(3));  // only one offer is funded
+            nOffers(env, 1000, alice, XRP(1), usd(3));
 
-            n_offers(env, 1, alice, EUR(499), USD(499));
+            nOffers(env, 1, alice, eur(499), usd(499));
 
             // Bob offers to buy 2000 USD for 2000 EUR; He starts with 2000 EUR
             //  1. The best quality is the offer that takes 1 EUR and gives 10
@@ -315,23 +315,23 @@ public:
             //           Alice spent 10 + 100*4 + 199*3 + 499 = 1506 USD. She
             //           started with 4000 so has 2494 USD remaining. Alice
             //           received 200 + 400 + 500 = 1100 EUR
-            env.trust(EUR(10000), bob);
+            env.trust(eur(10000), bob);
             env.close();
-            env(pay(gw, bob, EUR(2000)));
+            env(pay(gw, bob, eur(2000)));
             env.close();
-            env(offer(bob, USD(4000), EUR(4000)));
+            env(offer(bob, usd(4000), eur(4000)));
             env.close();
 
-            env.require(balance(bob, USD(1509)));
-            env.require(balance(bob, EUR(900)));
+            env.require(Balance(bob, usd(1509)));
+            env.require(Balance(bob, eur(900)));
             env.require(offers(bob, 1));
-            env.require(owners(bob, 3));
+            env.require(Owners(bob, 3));
 
-            env.require(balance(alice, USD(2494)));
-            env.require(balance(alice, EUR(1100)));
+            env.require(Balance(alice, usd(2494)));
+            env.require(Balance(alice, eur(1100)));
             auto const numAOffers = 1 + 2000 + 100 + 1000 + 1 - (1 + 2 * 100 + 2 * 199 + 1 + 1);
             env.require(offers(alice, numAOffers));
-            env.require(owners(alice, numAOffers + 2));
+            env.require(Owners(alice, numAOffers + 2));
 
             env.require(offers(carol, 0));
         }
@@ -348,17 +348,17 @@ public:
         auto const alice = Account("alice");
         auto const bob = Account("bob");
 
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env(*this, features);
 
         env.fund(XRP(100000000), gw, alice, bob);
 
-        env.trust(USD(8000), alice);
-        env.trust(USD(8000), bob);
+        env.trust(usd(8000), alice);
+        env.trust(usd(8000), bob);
         env.close();
 
-        env(pay(gw, alice, USD(8000)));
+        env(pay(gw, alice, usd(8000)));
         env.close();
 
         // The new flow cross handles consuming excessive offers differently
@@ -376,17 +376,17 @@ public:
         // offers consumes 998 offers, the second set will consume 998, which is
         // not over the limit and the payment stops. So 2*998, or 1996 is the
         // expected value.
-        n_offers(env, 998, alice, XRP(1.00), USD(1));
-        n_offers(env, 998, alice, XRP(0.99), USD(1));
-        n_offers(env, 998, alice, XRP(0.98), USD(1));
-        n_offers(env, 998, alice, XRP(0.97), USD(1));
-        n_offers(env, 998, alice, XRP(0.96), USD(1));
-        n_offers(env, 998, alice, XRP(0.95), USD(1));
+        nOffers(env, 998, alice, XRP(1.00), usd(1));
+        nOffers(env, 998, alice, XRP(0.99), usd(1));
+        nOffers(env, 998, alice, XRP(0.98), usd(1));
+        nOffers(env, 998, alice, XRP(0.97), usd(1));
+        nOffers(env, 998, alice, XRP(0.96), usd(1));
+        nOffers(env, 998, alice, XRP(0.95), usd(1));
 
-        env(offer(bob, USD(8000), XRP(8000)), ter(tesSUCCESS));
+        env(offer(bob, usd(8000), XRP(8000)), Ter(tesSUCCESS));
         env.close();
 
-        env.require(balance(bob, USD(1996)));
+        env.require(Balance(bob, usd(1996)));
     }
 
     void
@@ -400,7 +400,7 @@ public:
             testOfferOverflow(features);
         };
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testAll(sa);
         testAll(sa - featurePermissionedDEX);
     }
diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp
index bd3ea59971..496dfed059 100644
--- a/src/test/app/DID_test.cpp
+++ b/src/test/app/DID_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::test {
 
-struct DID_test : public beast::unit_test::suite
+struct DID_test : public beast::unit_test::Suite
 {
     void
     testEnabled(FeatureBitset features)
@@ -33,11 +33,11 @@ struct DID_test : public beast::unit_test::suite
         env.close();
 
         BEAST_EXPECT(ownerCount(env, alice) == 0);
-        env(did::setValid(alice), ter(temDISABLED));
+        env(did::setValid(alice), Ter(temDISABLED));
         env.close();
 
         BEAST_EXPECT(ownerCount(env, alice) == 0);
-        env(did::del(alice), ter(temDISABLED));
+        env(did::del(alice), Ter(temDISABLED));
         env.close();
     }
 
@@ -63,7 +63,7 @@ struct DID_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // alice does not have enough XRP to cover the reserve for a DID
-        env(did::setValid(alice), ter(tecINSUFFICIENT_RESERVE));
+        env(did::setValid(alice), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
@@ -73,7 +73,7 @@ struct DID_test : public beast::unit_test::suite
         env.close();
 
         // alice still does not have enough XRP for the reserve of a DID.
-        env(did::setValid(alice), ter(tecINSUFFICIENT_RESERVE));
+        env(did::setValid(alice), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
@@ -110,40 +110,40 @@ struct DID_test : public beast::unit_test::suite
 
         // invalid flags
         BEAST_EXPECT(ownerCount(env, alice) == 0);
-        env(did::setValid(alice), txflags(0x00010000), ter(temINVALID_FLAG));
+        env(did::setValid(alice), Txflags(0x00010000), Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // no fields
-        env(did::set(alice), ter(temEMPTY_DID));
+        env(did::set(alice), Ter(temEMPTY_DID));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // all empty fields
-        env(did::set(alice), did::uri(""), did::document(""), did::data(""), ter(temEMPTY_DID));
+        env(did::set(alice), did::Uri(""), did::Document(""), did::Data(""), Ter(temEMPTY_DID));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // uri is too long
         std::string const longString(257, 'a');
-        env(did::set(alice), did::uri(longString), ter(temMALFORMED));
+        env(did::set(alice), did::Uri(longString), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // document is too long
-        env(did::set(alice), did::document(longString), ter(temMALFORMED));
+        env(did::set(alice), did::Document(longString), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // attestation is too long
-        env(did::set(alice), did::document("data"), did::data(longString), ter(temMALFORMED));
+        env(did::set(alice), did::Document("data"), did::Data(longString), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         // some empty fields, some optional fields
         // pre-fix amendment
         auto const fixEnabled = env.current()->rules().enabled(fixEmptyDID);
-        env(did::set(alice), did::uri(""), fixEnabled ? ter(tecEMPTY_DID) : ter(tesSUCCESS));
+        env(did::set(alice), did::Uri(""), fixEnabled ? Ter(tecEMPTY_DID) : Ter(tesSUCCESS));
         env.close();
         auto const expectedOwnerReserve = fixEnabled ? 0 : 1;
         BEAST_EXPECT(ownerCount(env, alice) == expectedOwnerReserve);
@@ -169,7 +169,7 @@ struct DID_test : public beast::unit_test::suite
 
         // invalid flags
         BEAST_EXPECT(ownerCount(env, alice) == 0);
-        env(did::del(alice), txflags(0x00010000), ter(temINVALID_FLAG));
+        env(did::del(alice), Txflags(0x00010000), Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
@@ -177,7 +177,7 @@ struct DID_test : public beast::unit_test::suite
         // doApply
 
         // DID doesn't exist
-        env(did::del(alice), ter(tecNO_ENTRY));
+        env(did::del(alice), Ter(tecNO_ENTRY));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 0);
     }
@@ -205,31 +205,31 @@ struct DID_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, charlie) == 0);
 
         // only URI
-        env(did::set(alice), did::uri("uri"));
+        env(did::set(alice), did::Uri("uri"));
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // only DIDDocument
-        env(did::set(bob), did::document("data"));
+        env(did::set(bob), did::Document("data"));
         BEAST_EXPECT(ownerCount(env, bob) == 1);
 
         // only Data
-        env(did::set(charlie), did::data("data"));
+        env(did::set(charlie), did::Data("data"));
         BEAST_EXPECT(ownerCount(env, charlie) == 1);
 
         // URI + Data
-        env(did::set(dave), did::uri("uri"), did::data("attest"));
+        env(did::set(dave), did::Uri("uri"), did::Data("attest"));
         BEAST_EXPECT(ownerCount(env, dave) == 1);
 
         // URI + DIDDocument
-        env(did::set(edna), did::uri("uri"), did::document("data"));
+        env(did::set(edna), did::Uri("uri"), did::Document("data"));
         BEAST_EXPECT(ownerCount(env, edna) == 1);
 
         // DIDDocument + Data
-        env(did::set(francis), did::document("data"), did::data("attest"));
+        env(did::set(francis), did::Document("data"), did::Data("attest"));
         BEAST_EXPECT(ownerCount(env, francis) == 1);
 
         // URI + DIDDocument + Data
-        env(did::set(george), did::uri("uri"), did::document("data"), did::data("attest"));
+        env(did::set(george), did::Uri("uri"), did::Document("data"), did::Data("attest"));
         BEAST_EXPECT(ownerCount(env, george) == 1);
     }
 
@@ -251,7 +251,7 @@ struct DID_test : public beast::unit_test::suite
         // Create DID
         std::string const initialURI = "uri";
         {
-            env(did::set(alice), did::uri(initialURI));
+            env(did::set(alice), did::Uri(initialURI));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(sleDID);
@@ -262,7 +262,7 @@ struct DID_test : public beast::unit_test::suite
 
         // Try to delete URI, fails because no elements are set
         {
-            env(did::set(alice), did::uri(""), ter(tecEMPTY_DID));
+            env(did::set(alice), did::Uri(""), Ter(tecEMPTY_DID));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(checkVL((*sleDID)[sfURI], initialURI));
@@ -273,7 +273,7 @@ struct DID_test : public beast::unit_test::suite
         // Set DIDDocument
         std::string const initialDocument = "data";
         {
-            env(did::set(alice), did::document(initialDocument));
+            env(did::set(alice), did::Document(initialDocument));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(checkVL((*sleDID)[sfURI], initialURI));
@@ -284,7 +284,7 @@ struct DID_test : public beast::unit_test::suite
         // Set Data
         std::string const initialData = "attest";
         {
-            env(did::set(alice), did::data(initialData));
+            env(did::set(alice), did::Data(initialData));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(checkVL((*sleDID)[sfURI], initialURI));
@@ -294,7 +294,7 @@ struct DID_test : public beast::unit_test::suite
 
         // Remove URI
         {
-            env(did::set(alice), did::uri(""));
+            env(did::set(alice), did::Uri(""));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(!sleDID->isFieldPresent(sfURI));
@@ -304,7 +304,7 @@ struct DID_test : public beast::unit_test::suite
 
         // Remove Data
         {
-            env(did::set(alice), did::data(""));
+            env(did::set(alice), did::Data(""));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(!sleDID->isFieldPresent(sfURI));
@@ -315,7 +315,7 @@ struct DID_test : public beast::unit_test::suite
         // Remove Data + set URI
         std::string const secondURI = "uri2";
         {
-            env(did::set(alice), did::uri(secondURI), did::document(""));
+            env(did::set(alice), did::Uri(secondURI), did::Document(""));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(checkVL((*sleDID)[sfURI], secondURI));
@@ -326,7 +326,7 @@ struct DID_test : public beast::unit_test::suite
         // Remove URI + set DIDDocument
         std::string const secondDocument = "data2";
         {
-            env(did::set(alice), did::uri(""), did::document(secondDocument));
+            env(did::set(alice), did::Uri(""), did::Document(secondDocument));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(!sleDID->isFieldPresent(sfURI));
@@ -337,7 +337,7 @@ struct DID_test : public beast::unit_test::suite
         // Remove DIDDocument + set Data
         std::string const secondData = "randomData";
         {
-            env(did::set(alice), did::document(""), did::data(secondData));
+            env(did::set(alice), did::Document(""), did::Data(secondData));
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             auto const sleDID = env.le(keylet::did(alice.id()));
             BEAST_EXPECT(!sleDID->isFieldPresent(sfURI));
@@ -358,7 +358,7 @@ struct DID_test : public beast::unit_test::suite
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         FeatureBitset const emptyDID{fixEmptyDID};
         testEnabled(all);
         testAccountReserve(all);
diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp
index 3997da60db..c7e65fd995 100644
--- a/src/test/app/DNS_test.cpp
+++ b/src/test/app/DNS_test.cpp
@@ -18,13 +18,13 @@
 
 namespace xrpl::test {
 
-class DNS_test : public beast::unit_test::suite
+class DNS_test : public beast::unit_test::Suite
 {
     using endpoint_type = boost::asio::ip::tcp::endpoint;
     using error_code = boost::system::error_code;
     std::weak_ptr<xrpl::detail::Work> work_;
     endpoint_type lastEndpoint_;
-    parsedURL pUrl_;
+    ParsedUrl pUrl_;
     std::string port_;
     jtx::Env env_;
     std::map<std::string, int> resolved_;
diff --git a/src/test/app/Delegate_test.cpp b/src/test/app/Delegate_test.cpp
index fdcbbc7a1d..6ec4c250f6 100644
--- a/src/test/app/Delegate_test.cpp
+++ b/src/test/app/Delegate_test.cpp
@@ -53,7 +53,7 @@
 #include <vector>
 
 namespace xrpl::test {
-class Delegate_test : public beast::unit_test::suite
+class Delegate_test : public beast::unit_test::Suite
 {
     void
     testFeatureDisabled(FeatureBitset features)
@@ -68,14 +68,14 @@ class Delegate_test : public beast::unit_test::suite
         env.fund(XRP(1000000), gw, alice, bob);
         env.close();
 
-        auto res = features[featurePermissionDelegationV1_1] ? ter(tesSUCCESS) : ter(temDISABLED);
+        auto res = features[featurePermissionDelegationV1_1] ? Ter(tesSUCCESS) : Ter(temDISABLED);
 
         // can not set Delegate when feature disabled
         env(delegate::set(gw, alice, {"Payment"}), res);
         env.close();
 
         // can not send delegating transaction when feature disabled
-        env(pay(gw, bob, XRP(100)), delegate::as(alice), res);
+        env(pay(gw, bob, XRP(100)), delegate::As(alice), res);
     }
 
     void
@@ -92,7 +92,7 @@ class Delegate_test : public beast::unit_test::suite
 
         // delegating an empty permission list when the delegate ledger object
         // does not exist is not allowed
-        env(delegate::set(gw, alice, {}), ter(tecNO_ENTRY));
+        env(delegate::set(gw, alice, {}), Ter(tecNO_ENTRY));
         env.close();
 
         auto const permissions = std::vector<std::string>{
@@ -102,7 +102,7 @@ class Delegate_test : public beast::unit_test::suite
 
         // this lambda function is used to compare the json value of ledger
         // entry response with the given vector of permissions.
-        auto comparePermissions = [&](Json::Value const& jle,
+        auto comparePermissions = [&](json::Value const& jle,
                                       std::vector<std::string> const& permissions,
                                       Account const& account,
                                       Account const& authorize) {
@@ -181,29 +181,29 @@ class Delegate_test : public beast::unit_test::suite
                      "TrustSet",
                      "NFTokenMint",
                      "NFTokenBurn"}),
-                ter(temARRAY_TOO_LARGE));
+                Ter(temARRAY_TOO_LARGE));
         }
 
         // alice can not authorize herself
         {
-            env(delegate::set(alice, alice, {"Payment"}), ter(temMALFORMED));
+            env(delegate::set(alice, alice, {"Payment"}), Ter(temMALFORMED));
         }
 
         // bad fee
         {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::DelegateSet;
             jv[jss::Account] = gw.human();
             jv[sfAuthorize.jsonName] = alice.human();
-            Json::Value permissionsJson(Json::arrayValue);
-            Json::Value permissionValue;
+            json::Value permissionsJson(json::ArrayValue);
+            json::Value permissionValue;
             permissionValue[sfPermissionValue.jsonName] = "Payment";
-            Json::Value permissionObj;
+            json::Value permissionObj;
             permissionObj[sfPermission.jsonName] = permissionValue;
             permissionsJson.append(permissionObj);
             jv[sfPermissions.jsonName] = permissionsJson;
             jv[sfFee.jsonName] = -1;
-            env(jv, ter(temBAD_FEE));
+            env(jv, Ter(temBAD_FEE));
         }
 
         // when provided permissions contains duplicate values, should return
@@ -218,25 +218,25 @@ class Delegate_test : public beast::unit_test::suite
                      "TrustlineAuthorize",
                      "CheckCreate",
                      "TrustlineAuthorize"}),
-                ter(temMALFORMED));
+                Ter(temMALFORMED));
         }
 
         // when authorizing account which does not exist, should return
         // tecNO_TARGET
         {
-            env(delegate::set(gw, Account("unknown"), {"Payment"}), ter(tecNO_TARGET));
+            env(delegate::set(gw, Account("unknown"), {"Payment"}), Ter(tecNO_TARGET));
         }
 
         // non-delegable transaction
         {
-            env(delegate::set(gw, alice, {"SetRegularKey"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"AccountSet"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"SignerListSet"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"DelegateSet"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"EnableAmendment"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"UNLModify"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"SetFee"}), ter(temMALFORMED));
-            env(delegate::set(gw, alice, {"Batch"}), ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"SetRegularKey"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"AccountSet"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"SignerListSet"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"DelegateSet"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"EnableAmendment"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"UNLModify"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"SetFee"}), Ter(temMALFORMED));
+            env(delegate::set(gw, alice, {"Batch"}), Ter(temMALFORMED));
         }
     }
 
@@ -258,7 +258,7 @@ class Delegate_test : public beast::unit_test::suite
             env.close();
 
             // alice does not have enough reserve to create Delegate
-            env(delegate::set(alice, bob, {"Payment"}), ter(tecINSUFFICIENT_RESERVE));
+            env(delegate::set(alice, bob, {"Payment"}), Ter(tecINSUFFICIENT_RESERVE));
         }
 
         // reserve recovered after deleting delegation object
@@ -279,7 +279,7 @@ class Delegate_test : public beast::unit_test::suite
             env.close();
 
             // alice does not have enough reserve to create another delegation object
-            env(delegate::set(alice, carol, {"Payment"}), ter(tecINSUFFICIENT_RESERVE));
+            env(delegate::set(alice, carol, {"Payment"}), Ter(tecINSUFFICIENT_RESERVE));
             env.close();
 
             // deleting delegation object recovers 1 reserve
@@ -306,10 +306,10 @@ class Delegate_test : public beast::unit_test::suite
 
             // bob set DID on behalf of alice, but alice does not have enough
             // reserve
-            env(did::set(alice), did::uri("uri"), delegate::as(bob), ter(tecINSUFFICIENT_RESERVE));
+            env(did::set(alice), did::Uri("uri"), delegate::As(bob), Ter(tecINSUFFICIENT_RESERVE));
 
             // bob can set DID for himself because he has enough reserve
-            env(did::set(bob), did::uri("uri"));
+            env(did::set(bob), did::Uri("uri"));
             env.close();
         }
     }
@@ -339,7 +339,7 @@ class Delegate_test : public beast::unit_test::suite
             auto const bobBalance = env.balance(bob);
             auto const carolBalance = env.balance(carol);
 
-            env(pay(alice, carol, XRP(100)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(pay(alice, carol, XRP(100)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -359,7 +359,7 @@ class Delegate_test : public beast::unit_test::suite
 
             auto const sendAmt = XRP(100);
             auto const feeAmt = XRP(10);
-            env(pay(alice, carol, sendAmt), fee(feeAmt), delegate::as(bob));
+            env(pay(alice, carol, sendAmt), Fee(feeAmt), delegate::As(bob));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance - sendAmt);
             BEAST_EXPECT(env.balance(bob) == bobBalance - feeAmt);
@@ -378,9 +378,9 @@ class Delegate_test : public beast::unit_test::suite
             auto const carolBalance = env.balance(carol);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(2000)),
-                delegate::as(bob),
-                ter(terINSUF_FEE_B));
+                Fee(XRP(2000)),
+                delegate::As(bob),
+                Ter(terINSUF_FEE_B));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -413,7 +413,7 @@ class Delegate_test : public beast::unit_test::suite
                 env(delegate::set(alice, bob, {"Payment"}));
                 env.close();
 
-                env.require(balance(alice, paymentAmount + reserve));
+                env.require(Balance(alice, paymentAmount + reserve));
 
                 return std::make_tuple(alice, bob, carol, paymentAmount, highFee, reserve);
             };
@@ -431,7 +431,7 @@ class Delegate_test : public beast::unit_test::suite
                 auto const bobBalance = env.balance(bob);
                 auto const carolBalance = env.balance(carol);
 
-                env(pay(alice, carol, paymentAmount), fee(highFee), ter(tecUNFUNDED_PAYMENT));
+                env(pay(alice, carol, paymentAmount), Fee(highFee), Ter(tecUNFUNDED_PAYMENT));
 
                 // tec consumes the fee from Alice; carol and bob are unaffected.
                 BEAST_EXPECT(env.balance(alice) == aliceBalance - highFee);
@@ -449,12 +449,12 @@ class Delegate_test : public beast::unit_test::suite
                 auto const bobPrePay = env.balance(bob, XRP);
                 auto const carolPrePay = env.balance(carol, XRP);
 
-                env(pay(alice, carol, paymentAmount), delegate::as(bob), fee(highFee));
+                env(pay(alice, carol, paymentAmount), delegate::As(bob), Fee(highFee));
                 env.close();
 
-                env.require(balance(alice, alicePrePay - paymentAmount));
-                env.require(balance(bob, bobPrePay - highFee));
-                env.require(balance(carol, carolPrePay + paymentAmount));
+                env.require(Balance(alice, alicePrePay - paymentAmount));
+                env.require(Balance(bob, bobPrePay - highFee));
+                env.require(Balance(carol, carolPrePay + paymentAmount));
             }
         }
 
@@ -481,15 +481,15 @@ class Delegate_test : public beast::unit_test::suite
 
             // After paying for this transaction, bob's balance will
             // dip below the base reserve
-            env(pay(alice, carol, XRP(1)), delegate::as(bob));
+            env(pay(alice, carol, XRP(1)), delegate::As(bob));
             env.close();
 
             // Bob's balance is now less than the base reserve.
             BEAST_EXPECT(env.balance(bob, XRP) < baseReserve);
-            env.require(balance(bob, bobPreTx - drops(baseFee)));
+            env.require(Balance(bob, bobPreTx - drops(baseFee)));
 
             // Alice's balance only decreased by the 1.0 XRP she sent.
-            env.require(balance(alice, alicePreTx - XRP(1)));
+            env.require(Balance(alice, alicePreTx - XRP(1)));
         }
 
         // The delegated account has enough balance for the fee, but delegator
@@ -519,11 +519,11 @@ class Delegate_test : public beast::unit_test::suite
             auto const carolPrePay = env.balance(carol, XRP);
 
             // Bob pays the fee, but Alice has insufficient balance to send XRP(10).
-            env(pay(alice, carol, XRP(10)), delegate::as(bob), ter(tecUNFUNDED_PAYMENT));
+            env(pay(alice, carol, XRP(10)), delegate::As(bob), Ter(tecUNFUNDED_PAYMENT));
 
-            env.require(balance(alice, alicePrePay));
-            env.require(balance(bob, bobPrePay - drops(baseFee)));
-            env.require(balance(carol, carolPrePay));
+            env.require(Balance(alice, alicePrePay));
+            env.require(Balance(bob, bobPrePay - drops(baseFee)));
+            env.require(Balance(carol, carolPrePay));
         }
     }
 
@@ -552,28 +552,28 @@ class Delegate_test : public beast::unit_test::suite
 
         for (auto i = 0; i < 20; ++i)
         {
-            // bob is the delegated account, his sequence won't increment
-            env(pay(alice, carol, XRP(10)), fee(XRP(10)), delegate::as(bob));
+            // 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 increment
-            env(pay(bob, carol, XRP(10)), fee(XRP(10)));
+            // 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 increment
-            env(pay(bob, carol, XRP(10)), fee(XRP(10)), delegate::as(alice));
+            // 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 increment
-            env(pay(alice, carol, XRP(10)), fee(XRP(10)));
+            // 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);
             aliceSeq = env.seq(alice);
@@ -622,7 +622,7 @@ class Delegate_test : public beast::unit_test::suite
             // alice deletes account, this will remove the Delegate object from
             // both alice's and bob's owner directories
             auto const deleteFee = drops(env.current()->fees().increment);
-            env(acctdelete(alice, carol), fee(deleteFee));
+            env(acctdelete(alice, carol), Fee(deleteFee));
             env.close();
 
             BEAST_EXPECT(!env.closed()->exists(keylet::account(alice.id())));
@@ -677,7 +677,7 @@ class Delegate_test : public beast::unit_test::suite
             // bob's owner directories so alice's delegation does not survive
             // a potential account resurrection.
             auto const deleteFee = drops(env.current()->fees().increment);
-            env(acctdelete(bob, carol), fee(deleteFee));
+            env(acctdelete(bob, carol), Fee(deleteFee));
             env.close();
 
             BEAST_EXPECT(!env.closed()->exists(keylet::account(bob.id())));
@@ -694,7 +694,7 @@ class Delegate_test : public beast::unit_test::suite
             BEAST_EXPECT(sleAlice2->getFieldU32(sfOwnerCount) == 0);
 
             auto const aliceDeleteFee = drops(env.current()->fees().increment);
-            env(acctdelete(alice, carol), fee(aliceDeleteFee));
+            env(acctdelete(alice, carol), Fee(aliceDeleteFee));
             env.close();
 
             BEAST_EXPECT(!env.closed()->exists(keylet::account(alice.id())));
@@ -740,7 +740,7 @@ class Delegate_test : public beast::unit_test::suite
             auto const daveBalance = env.balance(dave);
 
             auto const deleteFee = drops(env.current()->fees().increment);
-            env(acctdelete(bob, dave), fee(deleteFee));
+            env(acctdelete(bob, dave), Fee(deleteFee));
             env.close();
 
             // bob's account and directory are gone
@@ -785,44 +785,44 @@ class Delegate_test : public beast::unit_test::suite
         auto carolBalance = env.balance(carol, XRP);
 
         // can not send transaction on one's own behalf
-        env(pay(alice, bob, XRP(50)), delegate::as(alice), ter(temBAD_SIGNER));
-        env.require(balance(alice, aliceBalance));
+        env(pay(alice, bob, XRP(50)), delegate::As(alice), Ter(temBAD_SIGNER));
+        env.require(Balance(alice, aliceBalance));
 
         env(delegate::set(alice, bob, {"Payment"}));
         env.close();
-        env.require(balance(alice, aliceBalance - drops(baseFee)));
+        env.require(Balance(alice, aliceBalance - drops(baseFee)));
         aliceBalance = env.balance(alice, XRP);
 
         // bob pays 50 XRP to carol on behalf of alice
-        env(pay(alice, carol, XRP(50)), delegate::as(bob));
+        env(pay(alice, carol, XRP(50)), delegate::As(bob));
         env.close();
-        env.require(balance(alice, aliceBalance - XRP(50)));
-        env.require(balance(carol, carolBalance + XRP(50)));
+        env.require(Balance(alice, aliceBalance - XRP(50)));
+        env.require(Balance(carol, carolBalance + XRP(50)));
         // bob pays the fee
-        env.require(balance(bob, bobBalance - drops(baseFee)));
+        env.require(Balance(bob, bobBalance - drops(baseFee)));
         aliceBalance = env.balance(alice, XRP);
         bobBalance = env.balance(bob, XRP);
         carolBalance = env.balance(carol, XRP);
 
         // bob pays 50 XRP to bob self on behalf of alice
-        env(pay(alice, bob, XRP(50)), delegate::as(bob));
+        env(pay(alice, bob, XRP(50)), delegate::As(bob));
         env.close();
-        env.require(balance(alice, aliceBalance - XRP(50)));
-        env.require(balance(bob, bobBalance + XRP(50) - drops(baseFee)));
+        env.require(Balance(alice, aliceBalance - XRP(50)));
+        env.require(Balance(bob, bobBalance + XRP(50) - drops(baseFee)));
         aliceBalance = env.balance(alice, XRP);
         bobBalance = env.balance(bob, XRP);
 
         // bob pay 50 XRP to alice herself on behalf of alice
-        env(pay(alice, alice, XRP(50)), delegate::as(bob), ter(temREDUNDANT));
+        env(pay(alice, alice, XRP(50)), delegate::As(bob), Ter(temREDUNDANT));
         env.close();
 
         // bob does not have permission to create check
-        env(check::create(alice, bob, XRP(10)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+        env(check::create(alice, bob, XRP(10)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
         // carol does not have permission to create check
         env(check::create(alice, bob, XRP(10)),
-            delegate::as(carol),
-            ter(terNO_DELEGATE_PERMISSION));
+            delegate::As(carol),
+            Ter(terNO_DELEGATE_PERMISSION));
     }
 
     void
@@ -838,14 +838,14 @@ class Delegate_test : public beast::unit_test::suite
             Account const bob{"bob"};
             Account const gw{"gateway"};
             Account const gw2{"gateway2"};
-            auto const USD = gw["USD"];
-            auto const EUR = gw2["EUR"];
+            auto const usd = gw["USD"];
+            auto const eur = gw2["EUR"];
 
             env.fund(XRP(10000), alice);
             env.fund(XRP(20000), bob);
             env.fund(XRP(40000), gw, gw2);
-            env.trust(USD(200), alice);
-            env.trust(EUR(400), gw);
+            env.trust(usd(200), alice);
+            env.trust(eur(400), gw);
             env.close();
 
             XRPAmount const baseFee{env.current()->fees().base};
@@ -855,85 +855,85 @@ class Delegate_test : public beast::unit_test::suite
             auto gw2Balance = env.balance(gw2, XRP);
 
             // delegate ledger object is not created yet
-            env(pay(gw, alice, USD(50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
-            env.require(balance(bob, bobBalance));
+            env(pay(gw, alice, usd(50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
+            env.require(Balance(bob, bobBalance));
 
             // gw gives bob burn permission
             env(delegate::set(gw, bob, {"PaymentBurn"}));
             env.close();
-            env.require(balance(gw, gwBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance - drops(baseFee)));
             gwBalance = env.balance(gw, XRP);
 
             // bob sends a payment transaction on behalf of gw
-            env(pay(gw, alice, USD(50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(pay(gw, alice, usd(50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env.close();
-            env.require(balance(bob, bobBalance));
+            env.require(Balance(bob, bobBalance));
 
             // gw gives bob mint permission, alice gives bob burn permission
             env(delegate::set(gw, bob, {"PaymentMint"}));
             env(delegate::set(alice, bob, {"PaymentBurn"}));
             env.close();
-            env.require(balance(alice, aliceBalance - drops(baseFee)));
-            env.require(balance(gw, gwBalance - drops(baseFee)));
+            env.require(Balance(alice, aliceBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance - drops(baseFee)));
             aliceBalance = env.balance(alice, XRP);
             gwBalance = env.balance(gw, XRP);
 
             // can not send XRP
-            env(pay(gw, alice, XRP(50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(pay(gw, alice, XRP(50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env.close();
-            env.require(balance(bob, bobBalance));
+            env.require(Balance(bob, bobBalance));
 
             // mint 50 USD
-            env(pay(gw, alice, USD(50)), delegate::as(bob));
+            env(pay(gw, alice, usd(50)), delegate::As(bob));
             env.close();
-            env.require(balance(bob, bobBalance - drops(baseFee)));
-            env.require(balance(gw, gwBalance));
-            env.require(balance(gw, alice["USD"](-50)));
-            env.require(balance(alice, USD(50)));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(0));
+            env.require(Balance(bob, bobBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance));
+            env.require(Balance(gw, alice["USD"](-50)));
+            env.require(Balance(alice, usd(50)));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(0));
             bobBalance = env.balance(bob, XRP);
 
             // burn 30 USD
-            env(pay(alice, gw, USD(30)), delegate::as(bob));
+            env(pay(alice, gw, usd(30)), delegate::As(bob));
             env.close();
-            env.require(balance(bob, bobBalance - drops(baseFee)));
-            env.require(balance(gw, gwBalance));
-            env.require(balance(gw, alice["USD"](-20)));
-            env.require(balance(alice, USD(20)));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(0));
+            env.require(Balance(bob, bobBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance));
+            env.require(Balance(gw, alice["USD"](-20)));
+            env.require(Balance(alice, usd(20)));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(0));
             bobBalance = env.balance(bob, XRP);
 
             // bob has both mint and burn permissions
             env(delegate::set(gw, bob, {"PaymentMint", "PaymentBurn"}));
             env.close();
-            env.require(balance(gw, gwBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance - drops(baseFee)));
             gwBalance = env.balance(gw, XRP);
 
             // mint 100 USD for gw
-            env(pay(gw, alice, USD(100)), delegate::as(bob));
+            env(pay(gw, alice, usd(100)), delegate::As(bob));
             env.close();
-            env.require(balance(gw, alice["USD"](-120)));
-            env.require(balance(alice, USD(120)));
-            env.require(balance(bob, bobBalance - drops(baseFee)));
+            env.require(Balance(gw, alice["USD"](-120)));
+            env.require(Balance(alice, usd(120)));
+            env.require(Balance(bob, bobBalance - drops(baseFee)));
             bobBalance = env.balance(bob, XRP);
 
             // gw2 pays gw 200 EUR
-            env(pay(gw2, gw, EUR(200)));
+            env(pay(gw2, gw, eur(200)));
             env.close();
-            env.require(balance(gw2, gw2Balance - drops(baseFee)));
+            env.require(Balance(gw2, gw2Balance - drops(baseFee)));
             gw2Balance = env.balance(gw2, XRP);
-            env.require(balance(gw2, gw["EUR"](-200)));
-            env.require(balance(gw, EUR(200)));
+            env.require(Balance(gw2, gw["EUR"](-200)));
+            env.require(Balance(gw, eur(200)));
 
             // burn 100 EUR for gw
-            env(pay(gw, gw2, EUR(100)), delegate::as(bob));
+            env(pay(gw, gw2, eur(100)), delegate::As(bob));
             env.close();
-            env.require(balance(gw2, gw["EUR"](-100)));
-            env.require(balance(gw, EUR(100)));
-            env.require(balance(bob, bobBalance - drops(baseFee)));
-            env.require(balance(gw, gwBalance));
-            env.require(balance(gw2, gw2Balance));
-            env.require(balance(alice, aliceBalance));
+            env.require(Balance(gw2, gw["EUR"](-100)));
+            env.require(Balance(gw, eur(100)));
+            env.require(Balance(bob, bobBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance));
+            env.require(Balance(gw2, gw2Balance));
+            env.require(Balance(alice, aliceBalance));
         }
 
         // test PaymentMint won't affect Payment transaction level delegation.
@@ -942,12 +942,12 @@ class Delegate_test : public beast::unit_test::suite
             Account const alice{"alice"};
             Account const bob{"bob"};
             Account const gw{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(10000), alice);
             env.fund(XRP(20000), bob);
             env.fund(XRP(40000), gw);
-            env.trust(USD(200), alice);
+            env.trust(usd(200), alice);
             env.close();
 
             XRPAmount const baseFee{env.current()->fees().base};
@@ -959,30 +959,30 @@ class Delegate_test : public beast::unit_test::suite
             // gw gives bob PaymentBurn permission
             env(delegate::set(gw, bob, {"PaymentBurn"}));
             env.close();
-            env.require(balance(gw, gwBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance - drops(baseFee)));
             gwBalance = env.balance(gw, XRP);
 
             // bob can not mint on behalf of gw because he only has burn
             // permission
-            env(pay(gw, alice, USD(50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(pay(gw, alice, usd(50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env.close();
-            env.require(balance(bob, bobBalance));
+            env.require(Balance(bob, bobBalance));
 
             // gw gives bob Payment permission as well
             env(delegate::set(gw, bob, {"PaymentBurn", "Payment"}));
             env.close();
-            env.require(balance(gw, gwBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance - drops(baseFee)));
             gwBalance = env.balance(gw, XRP);
 
             // bob now can mint on behalf of gw
-            env(pay(gw, alice, USD(50)), delegate::as(bob));
+            env(pay(gw, alice, usd(50)), delegate::As(bob));
             env.close();
-            env.require(balance(bob, bobBalance - drops(baseFee)));
-            env.require(balance(gw, gwBalance));
-            env.require(balance(alice, aliceBalance));
-            env.require(balance(gw, alice["USD"](-50)));
-            env.require(balance(alice, USD(50)));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(0));
+            env.require(Balance(bob, bobBalance - drops(baseFee)));
+            env.require(Balance(gw, gwBalance));
+            env.require(Balance(alice, aliceBalance));
+            env.require(Balance(gw, alice["USD"](-50)));
+            env.require(Balance(alice, usd(50)));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(0));
         }
 
         // disallow cross currency payment with only PaymentBurn/PaymentMint
@@ -993,71 +993,71 @@ class Delegate_test : public beast::unit_test::suite
             Account const bob{"bob"};
             Account const gw{"gateway"};
             Account const carol{"carol"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(50000), alice);
-            env.trust(USD(50000), bob);
-            env.trust(USD(50000), carol);
-            env(pay(gw, alice, USD(10000)));
-            env(pay(gw, bob, USD(10000)));
-            env(pay(gw, carol, USD(10000)));
+            env.trust(usd(50000), alice);
+            env.trust(usd(50000), bob);
+            env.trust(usd(50000), carol);
+            env(pay(gw, alice, usd(10000)));
+            env(pay(gw, bob, usd(10000)));
+            env(pay(gw, carol, usd(10000)));
             env.close();
 
             // PaymentMint
             {
-                env(offer(carol, XRP(100), USD(501)));
+                env(offer(carol, XRP(100), usd(501)));
                 BEAST_EXPECT(expectOffers(env, carol, 1));
                 env(delegate::set(gw, bob, {"PaymentMint"}));
                 env.close();
 
                 // bob can not send cross currency payment on behalf of the gw,
                 // even with PaymentMint permission and gw being the issuer.
-                env(pay(gw, alice, USD(5000)),
-                    sendmax(XRP(1001)),
-                    txflags(tfPartialPayment),
-                    delegate::as(bob),
-                    ter(terNO_DELEGATE_PERMISSION));
+                env(pay(gw, alice, usd(5000)),
+                    Sendmax(XRP(1001)),
+                    Txflags(tfPartialPayment),
+                    delegate::As(bob),
+                    Ter(terNO_DELEGATE_PERMISSION));
                 BEAST_EXPECT(expectOffers(env, carol, 1));
 
-                env(pay(gw, alice, USD(5000)),
-                    path(~XRP),
-                    txflags(tfPartialPayment),
-                    delegate::as(bob),
-                    ter(terNO_DELEGATE_PERMISSION));
+                env(pay(gw, alice, usd(5000)),
+                    Path(~XRP),
+                    Txflags(tfPartialPayment),
+                    delegate::As(bob),
+                    Ter(terNO_DELEGATE_PERMISSION));
                 BEAST_EXPECT(expectOffers(env, carol, 1));
 
                 // succeed with direct payment
-                env(pay(gw, alice, USD(100)), delegate::as(bob));
+                env(pay(gw, alice, usd(100)), delegate::As(bob));
                 env.close();
             }
 
             // PaymentBurn
             {
-                env(offer(bob, XRP(100), USD(501)));
+                env(offer(bob, XRP(100), usd(501)));
                 BEAST_EXPECT(expectOffers(env, bob, 1));
                 env(delegate::set(alice, bob, {"PaymentBurn"}));
                 env.close();
 
                 // bob can not send cross currency payment on behalf of alice,
                 // even with PaymentBurn permission and gw being the issuer.
-                env(pay(alice, gw, USD(5000)),
-                    sendmax(XRP(1001)),
-                    txflags(tfPartialPayment),
-                    delegate::as(bob),
-                    ter(terNO_DELEGATE_PERMISSION));
+                env(pay(alice, gw, usd(5000)),
+                    Sendmax(XRP(1001)),
+                    Txflags(tfPartialPayment),
+                    delegate::As(bob),
+                    Ter(terNO_DELEGATE_PERMISSION));
                 BEAST_EXPECT(expectOffers(env, bob, 1));
 
-                env(pay(alice, gw, USD(5000)),
-                    path(~XRP),
-                    txflags(tfPartialPayment),
-                    delegate::as(bob),
-                    ter(terNO_DELEGATE_PERMISSION));
+                env(pay(alice, gw, usd(5000)),
+                    Path(~XRP),
+                    Txflags(tfPartialPayment),
+                    delegate::As(bob),
+                    Ter(terNO_DELEGATE_PERMISSION));
                 BEAST_EXPECT(expectOffers(env, bob, 1));
 
                 // succeed with direct payment
-                env(pay(alice, gw, USD(100)), delegate::as(bob));
+                env(pay(alice, gw, usd(100)), delegate::As(bob));
                 env.close();
             }
         }
@@ -1076,7 +1076,7 @@ class Delegate_test : public beast::unit_test::suite
             mpt.authorize({.account = alice});
             mpt.authorize({.account = bob});
 
-            auto const MPT = mpt["MPT"];
+            auto const MPT = mpt["MPT"];  // NOLINT(readability-identifier-naming)
             env(pay(gw, alice, MPT(500)));
             env(pay(gw, bob, MPT(500)));
             env.close();
@@ -1088,7 +1088,7 @@ class Delegate_test : public beast::unit_test::suite
                 env(delegate::set(gw, bob, {"PaymentMint"}));
                 env.close();
 
-                env(pay(gw, alice, MPT(50)), delegate::as(bob));
+                env(pay(gw, alice, MPT(50)), delegate::As(bob));
                 BEAST_EXPECT(env.balance(alice, MPT) == aliceMPT + MPT(50));
                 BEAST_EXPECT(env.balance(bob, MPT) == bobMPT);
                 aliceMPT = env.balance(alice, MPT);
@@ -1099,7 +1099,7 @@ class Delegate_test : public beast::unit_test::suite
                 env(delegate::set(alice, bob, {"PaymentBurn"}));
                 env.close();
 
-                env(pay(alice, gw, MPT(50)), delegate::as(bob));
+                env(pay(alice, gw, MPT(50)), delegate::As(bob));
                 BEAST_EXPECT(env.balance(alice, MPT) == aliceMPT - MPT(50));
                 BEAST_EXPECT(env.balance(bob, MPT) == bobMPT);
                 aliceMPT = env.balance(alice, MPT);
@@ -1109,11 +1109,11 @@ class Delegate_test : public beast::unit_test::suite
             {
                 env(delegate::set(alice, bob, {"PaymentBurn", "PaymentMint", "Payment"}));
                 env.close();
-                env(pay(alice, gw, MPT(50)), delegate::as(bob));
+                env(pay(alice, gw, MPT(50)), delegate::As(bob));
                 BEAST_EXPECT(env.balance(alice, MPT) == aliceMPT - MPT(50));
                 BEAST_EXPECT(env.balance(bob, MPT) == bobMPT);
                 aliceMPT = env.balance(alice, MPT);
-                env(pay(alice, bob, MPT(100)), delegate::as(bob));
+                env(pay(alice, bob, MPT(100)), delegate::As(bob));
                 BEAST_EXPECT(env.balance(alice, MPT) == aliceMPT - MPT(100));
                 BEAST_EXPECT(env.balance(bob, MPT) == bobMPT + MPT(100));
             }
@@ -1140,7 +1140,7 @@ class Delegate_test : public beast::unit_test::suite
             env.close();
             // bob can not create trustline on behalf of alice because he only
             // has unfreeze permission
-            env(trust(alice, gw["USD"](50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(trust(alice, gw["USD"](50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env.close();
 
             // alice creates trustline by herself
@@ -1153,89 +1153,89 @@ class Delegate_test : public beast::unit_test::suite
 
             // unsupported flags
             env(trust(alice, gw["USD"](50), tfSetNoRipple),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env(trust(alice, gw["USD"](50), tfClearNoRipple),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env(trust(gw, gw["USD"](0), alice, tfSetDeepFreeze),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env(trust(gw, gw["USD"](0), alice, tfClearDeepFreeze),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
 
             // supported flags with wrong permission
             env(trust(gw, gw["USD"](0), alice, tfSetfAuth),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env(trust(gw, gw["USD"](0), alice, tfSetFreeze),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
 
             env(delegate::set(gw, bob, {"TrustlineAuthorize"}));
             env.close();
             env(trust(gw, gw["USD"](0), alice, tfClearFreeze),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             // although trustline authorize is granted, bob can not change the
             // limit number
             env(trust(gw, gw["USD"](50), alice, tfSetfAuth),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
 
             // supported flags with correct permission
-            env(trust(gw, gw["USD"](0), alice, tfSetfAuth), delegate::as(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetfAuth), delegate::As(bob));
             env.close();
             env(delegate::set(gw, bob, {"TrustlineAuthorize", "TrustlineFreeze"}));
             env.close();
-            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::as(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::As(bob));
             env.close();
             env(delegate::set(gw, bob, {"TrustlineAuthorize", "TrustlineUnfreeze"}));
             env.close();
-            env(trust(gw, gw["USD"](0), alice, tfClearFreeze), delegate::as(bob));
+            env(trust(gw, gw["USD"](0), alice, tfClearFreeze), delegate::As(bob));
             env.close();
             // but bob can not freeze trustline because he no longer has freeze
             // permission
             env(trust(gw, gw["USD"](0), alice, tfSetFreeze),
-                delegate::as(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
 
             // cannot update LimitAmount with granular permission, both high and
             // low account
-            env(trust(alice, gw["USD"](100)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
-            env(trust(gw, alice["USD"](100)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(trust(alice, gw["USD"](100)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
+            env(trust(gw, alice["USD"](100)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // can not set QualityIn or QualityOut
             auto tx = trust(alice, gw["USD"](50));
             tx["QualityIn"] = "1000";
-            env(tx, delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(tx, delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             auto tx2 = trust(alice, gw["USD"](50));
             tx2["QualityOut"] = "1000";
-            env(tx2, delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(tx2, delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             auto tx3 = trust(gw, alice["USD"](50));
             tx3["QualityIn"] = "1000";
-            env(tx3, delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(tx3, delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             auto tx4 = trust(gw, alice["USD"](50));
             tx4["QualityOut"] = "1000";
-            env(tx4, delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(tx4, delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // granting TrustSet can make it work
             env(delegate::set(gw, bob, {"TrustSet"}));
             env.close();
             auto tx5 = trust(gw, alice["USD"](50));
             tx5["QualityOut"] = "1000";
-            env(tx5, delegate::as(bob));
+            env(tx5, delegate::As(bob));
             auto tx6 = trust(alice, gw["USD"](50));
             tx6["QualityOut"] = "1000";
-            env(tx6, delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(tx6, delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env(delegate::set(alice, bob, {"TrustSet"}));
             env.close();
-            env(tx6, delegate::as(bob));
+            env(tx6, delegate::As(bob));
         }
 
         // test mix of transaction level delegation and granular delegation
@@ -1249,11 +1249,11 @@ class Delegate_test : public beast::unit_test::suite
             env.close();
 
             // bob does not have permission
-            env(trust(alice, gw["USD"](50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(trust(alice, gw["USD"](50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env(delegate::set(alice, bob, {"TrustlineUnfreeze", "NFTokenCreateOffer"}));
             env.close();
             // bob still does not have permission
-            env(trust(alice, gw["USD"](50)), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(trust(alice, gw["USD"](50)), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // add TrustSet permission and some unrelated permission
             env(delegate::set(
@@ -1261,7 +1261,7 @@ class Delegate_test : public beast::unit_test::suite
                 bob,
                 {"TrustlineUnfreeze", "NFTokenCreateOffer", "TrustSet", "AccountTransferRateSet"}));
             env.close();
-            env(trust(alice, gw["USD"](50)), delegate::as(bob));
+            env(trust(alice, gw["USD"](50)), delegate::As(bob));
             env.close();
 
             env(delegate::set(
@@ -1272,15 +1272,15 @@ class Delegate_test : public beast::unit_test::suite
 
             // since bob has TrustSet permission, he does not need
             // TrustlineFreeze granular permission to freeze the trustline
-            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::as(bob));
-            env(trust(gw, gw["USD"](0), alice, tfClearFreeze), delegate::as(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::As(bob));
+            env(trust(gw, gw["USD"](0), alice, tfClearFreeze), delegate::As(bob));
             // bob can perform all the operations regarding TrustSet
-            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::as(bob));
-            env(trust(gw, gw["USD"](0), alice, tfSetDeepFreeze), delegate::as(bob));
-            env(trust(gw, gw["USD"](0), alice, tfClearDeepFreeze), delegate::as(bob));
-            env(trust(gw, gw["USD"](0), alice, tfSetfAuth), delegate::as(bob));
-            env(trust(alice, gw["USD"](50), tfSetNoRipple), delegate::as(bob));
-            env(trust(alice, gw["USD"](50), tfClearNoRipple), delegate::as(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetFreeze), delegate::As(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetDeepFreeze), delegate::As(bob));
+            env(trust(gw, gw["USD"](0), alice, tfClearDeepFreeze), delegate::As(bob));
+            env(trust(gw, gw["USD"](0), alice, tfSetfAuth), delegate::As(bob));
+            env(trust(alice, gw["USD"](50), tfSetNoRipple), delegate::As(bob));
+            env(trust(alice, gw["USD"](50), tfClearNoRipple), delegate::As(bob));
         }
 
         // tfFullyCanonicalSig won't block delegated transaction
@@ -1298,7 +1298,7 @@ class Delegate_test : public beast::unit_test::suite
             env(delegate::set(gw, bob, {"TrustlineAuthorize"}));
             env.close();
             env(trust(gw, gw["USD"](0), alice, tfSetfAuth | tfFullyCanonicalSig),
-                delegate::as(bob));
+                delegate::As(bob));
         }
     }
 
@@ -1334,7 +1334,7 @@ class Delegate_test : public beast::unit_test::suite
             // correct permission for domain set
             env(delegate::set(alice, bob, {"TrustlineUnfreeze", "AccountEmailHashSet"}));
             env.close();
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             // alice give granular permission of AccountDomainSet to bob
             env(delegate::set(alice, bob, {"AccountDomainSet"}));
@@ -1353,7 +1353,7 @@ class Delegate_test : public beast::unit_test::suite
             std::string const failDomain = "fail_domain_update";
             jt[sfFlags] = tfRequireAuth;
             jt[sfDomain] = strHex(failDomain);
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
             // reset flag number
             jt[sfFlags] = 0;
 
@@ -1362,7 +1362,7 @@ class Delegate_test : public beast::unit_test::suite
             jt[sfDomain] = strHex(domain);
             std::string const mh("5F31A79367DC3137FADA860C05742EE6");
             jt[sfEmailHash] = mh;
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             // alice give granular permission of AccountEmailHashSet to bob
             env(delegate::set(alice, bob, {"AccountDomainSet", "AccountEmailHashSet"}));
@@ -1372,9 +1372,9 @@ class Delegate_test : public beast::unit_test::suite
             BEAST_EXPECT((*env.le(alice))[sfDomain] == makeSlice(domain));
 
             // bob does not have permission to set message key for alice
-            auto const rkp = randomKeyPair(KeyType::ed25519);
+            auto const rkp = randomKeyPair(KeyType::Ed25519);
             jt[sfMessageKey] = strHex(rkp.first.slice());
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             // alice give granular permission of AccountMessageKeySet to bob
             env(delegate::set(
@@ -1389,7 +1389,7 @@ class Delegate_test : public beast::unit_test::suite
             BEAST_EXPECT(!env.le(alice)->isFieldPresent(sfMessageKey));
 
             // bob does not have permission to set transfer rate for alice
-            env(rate(alice, 2.0), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(rate(alice, 2.0), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // alice give granular permission of AccountTransferRateSet to bob
             env(delegate::set(
@@ -1402,12 +1402,12 @@ class Delegate_test : public beast::unit_test::suite
             env.close();
             auto jtRate = rate(alice, 2.0);
             jtRate[sfDelegate] = bob.human();
-            env(jtRate, delegate::as(bob));
+            env(jtRate, delegate::As(bob));
             BEAST_EXPECT((*env.le(alice))[sfTransferRate] == 2000000000);
 
             // bob does not have permission to set ticksize for alice
             jt[sfTickSize] = 8;
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             // alice give granular permission of AccountTickSizeSet to bob
             env(delegate::set(
@@ -1423,22 +1423,22 @@ class Delegate_test : public beast::unit_test::suite
             BEAST_EXPECT((*env.le(alice))[sfTickSize] == 8);
 
             // can not set asfRequireAuth flag for alice
-            env(fset(alice, asfRequireAuth), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fset(alice, asfRequireAuth), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // reset Delegate will delete the Delegate
             // object
             env(delegate::set(alice, bob, {}));
             // bib still does not have permission to set asfRequireAuth for
             // alice
-            env(fset(alice, asfRequireAuth), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fset(alice, asfRequireAuth), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             // alice can set for herself
             env(fset(alice, asfRequireAuth));
-            env.require(flags(alice, asfRequireAuth));
+            env.require(Flags(alice, asfRequireAuth));
             env.close();
 
             // can not update tick size because bob no longer has permission
             jt[sfTickSize] = 7;
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             env(delegate::set(
                 alice, bob, {"AccountDomainSet", "AccountEmailHashSet", "AccountMessageKeySet"}));
@@ -1452,7 +1452,7 @@ class Delegate_test : public beast::unit_test::suite
             jv2[sfDomain] = strHex(domain);
             jv2[sfDelegate] = bob.human();
             jv2[sfWalletLocator] = locator;
-            env(jv2, ter(terNO_DELEGATE_PERMISSION));
+            env(jv2, Ter(terNO_DELEGATE_PERMISSION));
         }
 
         // can not set AccountSet flags on behalf of other account
@@ -1465,13 +1465,13 @@ class Delegate_test : public beast::unit_test::suite
 
             auto testSetClearFlag = [&](std::uint32_t flag) {
                 // bob can not set flag on behalf of alice
-                env(fset(alice, flag), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+                env(fset(alice, flag), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
                 // alice set by herself
                 env(fset(alice, flag));
                 env.close();
-                env.require(flags(alice, flag));
+                env.require(Flags(alice, flag));
                 // bob can not clear on behalf of alice
-                env(fclear(alice, flag), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+                env(fclear(alice, flag), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             };
 
             // testSetClearFlag(asfNoFreeze);
@@ -1494,17 +1494,17 @@ class Delegate_test : public beast::unit_test::suite
             testSetClearFlag(asfGlobalFreeze);
 
             // bob can not set asfAccountTxnID on behalf of alice
-            env(fset(alice, asfAccountTxnID), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fset(alice, asfAccountTxnID), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env(fset(alice, asfAccountTxnID));
             env.close();
             BEAST_EXPECT(env.le(alice)->isFieldPresent(sfAccountTxnID));
-            env(fclear(alice, asfAccountTxnID), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fclear(alice, asfAccountTxnID), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // bob can not set asfAuthorizedNFTokenMinter on behalf of alice
-            Json::Value jt = fset(alice, asfAuthorizedNFTokenMinter);
+            json::Value jt = fset(alice, asfAuthorizedNFTokenMinter);
             jt[sfDelegate] = bob.human();
             jt[sfNFTokenMinter] = bob.human();
-            env(jt, ter(terNO_DELEGATE_PERMISSION));
+            env(jt, Ter(terNO_DELEGATE_PERMISSION));
 
             // bob gives alice some permissions
             env(delegate::set(
@@ -1514,21 +1514,21 @@ class Delegate_test : public beast::unit_test::suite
             // since we can not set asfNoFreeze if asfAllowTrustLineClawback is
             // set, which can not be clear either. Test alice set asfNoFreeze on
             // behalf of bob.
-            env(fset(alice, asfNoFreeze), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fset(alice, asfNoFreeze), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
             env(fset(bob, asfNoFreeze));
             env.close();
-            env.require(flags(bob, asfNoFreeze));
+            env.require(Flags(bob, asfNoFreeze));
             // alice can not clear on behalf of bob
-            env(fclear(alice, asfNoFreeze), delegate::as(bob), ter(terNO_DELEGATE_PERMISSION));
+            env(fclear(alice, asfNoFreeze), delegate::As(bob), Ter(terNO_DELEGATE_PERMISSION));
 
             // bob can not set asfDisableMaster on behalf of alice
-            Account const bobKey{"bobKey", KeyType::secp256k1};
+            Account const bobKey{"bobKey", KeyType::Secp256k1};
             env(regkey(bob, bobKey));
             env.close();
             env(fset(alice, asfDisableMaster),
-                delegate::as(bob),
-                sig(bob),
-                ter(terNO_DELEGATE_PERMISSION));
+                delegate::As(bob),
+                Sig(bob),
+                Ter(terNO_DELEGATE_PERMISSION));
         }
 
         // tfFullyCanonicalSig won't block delegated transaction
@@ -1693,7 +1693,7 @@ class Delegate_test : public beast::unit_test::suite
         auto bobBalance = env.balance(bob);
         auto carolBalance = env.balance(carol);
 
-        env(pay(alice, carol, XRP(100)), fee(XRP(10)), delegate::as(bob), sig(bob));
+        env(pay(alice, carol, XRP(100)), Fee(XRP(10)), delegate::As(bob), Sig(bob));
         env.close();
         BEAST_EXPECT(env.balance(alice) == aliceBalance - XRP(100));
         BEAST_EXPECT(env.balance(bob) == bobBalance - XRP(10));
@@ -1722,10 +1722,10 @@ class Delegate_test : public beast::unit_test::suite
             auto carolBalance = env.balance(carol);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(10)),
-                delegate::as(bob),
-                sig(alice),
-                ter(tefBAD_AUTH));
+                Fee(XRP(10)),
+                delegate::As(bob),
+                Sig(alice),
+                Ter(tefBAD_AUTH));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -1748,20 +1748,20 @@ class Delegate_test : public beast::unit_test::suite
             auto carolBalance = env.balance(carol);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(10)),
-                delegate::as(bob),
-                sig(carol),
-                ter(terNO_DELEGATE_PERMISSION));
+                Fee(XRP(10)),
+                delegate::As(bob),
+                Sig(carol),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
             BEAST_EXPECT(env.balance(carol) == carolBalance);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(10)),
-                delegate::as(bob),
-                sig(alice),
-                ter(terNO_DELEGATE_PERMISSION));
+                Fee(XRP(10)),
+                delegate::As(bob),
+                Sig(alice),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -1781,20 +1781,20 @@ class Delegate_test : public beast::unit_test::suite
             auto carolBalance = env.balance(carol);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(10)),
-                delegate::as(bob),
-                sig(alice),
-                ter(terNO_DELEGATE_PERMISSION));
+                Fee(XRP(10)),
+                delegate::As(bob),
+                Sig(alice),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
             BEAST_EXPECT(env.balance(carol) == carolBalance);
 
             env(pay(alice, carol, XRP(100)),
-                fee(XRP(10)),
-                delegate::as(bob),
-                sig(carol),
-                ter(terNO_DELEGATE_PERMISSION));
+                Fee(XRP(10)),
+                delegate::As(bob),
+                Sig(carol),
+                Ter(terNO_DELEGATE_PERMISSION));
             env.close();
             BEAST_EXPECT(env.balance(alice) == aliceBalance);
             BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -1829,7 +1829,7 @@ class Delegate_test : public beast::unit_test::suite
         auto dariaBalance = env.balance(daria);
         auto edwardBalance = env.balance(edward);
 
-        env(pay(alice, carol, XRP(100)), fee(XRP(10)), delegate::as(bob), msig(daria, edward));
+        env(pay(alice, carol, XRP(100)), Fee(XRP(10)), delegate::As(bob), Msig(daria, edward));
         env.close();
         BEAST_EXPECT(env.balance(alice) == aliceBalance - XRP(100));
         BEAST_EXPECT(env.balance(bob) == bobBalance - XRP(10));
@@ -1867,10 +1867,10 @@ class Delegate_test : public beast::unit_test::suite
         auto edwardBalance = env.balance(edward);
 
         env(pay(alice, carol, XRP(100)),
-            fee(XRP(10)),
-            delegate::as(bob),
-            msig(daria, edward),
-            ter(tefBAD_QUORUM));
+            Fee(XRP(10)),
+            delegate::As(bob),
+            Msig(daria, edward),
+            Ter(tefBAD_QUORUM));
         env.close();
         BEAST_EXPECT(env.balance(alice) == aliceBalance);
         BEAST_EXPECT(env.balance(bob) == bobBalance);
@@ -1892,16 +1892,16 @@ class Delegate_test : public beast::unit_test::suite
         env.fund(XRP(100000), alice, bob);
         env.close();
 
-        auto buildRequest = [&](auto value) -> Json::Value {
-            Json::Value jv;
+        auto buildRequest = [&](auto value) -> json::Value {
+            json::Value jv;
             jv[jss::TransactionType] = jss::DelegateSet;
             jv[jss::Account] = alice.human();
             jv[sfAuthorize.jsonName] = bob.human();
 
-            Json::Value permissionsJson(Json::arrayValue);
-            Json::Value permissionValue;
+            json::Value permissionsJson(json::ArrayValue);
+            json::Value permissionValue;
             permissionValue[sfPermissionValue.jsonName] = value;
-            Json::Value permissionObj;
+            json::Value permissionObj;
             permissionObj[sfPermission.jsonName] = permissionValue;
             permissionsJson.append(permissionObj);
             jv[sfPermissions.jsonName] = permissionsJson;
@@ -1914,7 +1914,7 @@ class Delegate_test : public beast::unit_test::suite
         for (auto value : {0, 100000, 54321})
         {
             auto jv = buildRequest(value);
-            env(jv, ter(temMALFORMED));
+            env(jv, Ter(temMALFORMED));
         }
     }
 
@@ -1973,7 +1973,7 @@ class Delegate_test : public beast::unit_test::suite
                 env.fund(XRP(100000), alice, bob);
                 env.close();
 
-                env(delegate::set(alice, bob, {tx}), ter(temMALFORMED));
+                env(delegate::set(alice, bob, {tx}), Ter(temMALFORMED));
             };
 
             for (auto const& tx : txRequiredFeatures)
@@ -2010,7 +2010,7 @@ class Delegate_test : public beast::unit_test::suite
 #undef TRANSACTION
 
 #define TRANSACTION(tag, value, name, txDelegable, ...) \
-    if (txDelegable == xrpl::delegable)                 \
+    if (txDelegable == xrpl::Delegable)                 \
     {                                                   \
         delegableCount++;                               \
     }
@@ -2067,7 +2067,7 @@ class Delegate_test : public beast::unit_test::suite
     void
     run() override
     {
-        FeatureBitset const all = jtx::testable_amendments();
+        FeatureBitset const all = jtx::testableAmendments();
 
         testFeatureDisabled(all - featurePermissionDelegationV1_1);
         testFeatureDisabled(all);
diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp
index 4b3b6d34ad..eae0893b10 100644
--- a/src/test/app/DeliverMin_test.cpp
+++ b/src/test/app/DeliverMin_test.cpp
@@ -18,113 +18,113 @@
 
 namespace xrpl::test {
 
-class DeliverMin_test : public beast::unit_test::suite
+class DeliverMin_test : public beast::unit_test::Suite
 {
 public:
     void
-    test_convert_all_of_an_asset(FeatureBitset features)
+    testConvertAllOfAnAsset(FeatureBitset features)
     {
         testcase("Convert all of an asset using DeliverMin");
 
         using namespace jtx;
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), "alice", "bob", "carol", gw);
             env.close();
-            env.trust(USD(100), "alice", "bob", "carol");
+            env.trust(usd(100), "alice", "bob", "carol");
             env.close();
-            env(pay("alice", "bob", USD(10)), deliver_min(USD(10)), ter(temBAD_AMOUNT));
-            env(pay("alice", "bob", USD(10)),
-                deliver_min(USD(-5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay("alice", "bob", USD(10)),
-                deliver_min(XRP(5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay("alice", "bob", USD(10)),
-                deliver_min(Account("carol")["USD"](5)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay("alice", "bob", USD(10)),
-                deliver_min(USD(15)),
-                txflags(tfPartialPayment),
-                ter(temBAD_AMOUNT));
-            env(pay(gw, "carol", USD(50)));
-            env(offer("carol", XRP(5), USD(5)));
-            env(pay("alice", "bob", USD(10)),
-                paths(XRP),
-                deliver_min(USD(7)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(5)),
-                ter(tecPATH_PARTIAL));
-            env.require(balance("alice", XRP(10000) - drops(env.current()->fees().base)));
-            env.require(balance("bob", XRP(10000)));
+            env(pay("alice", "bob", usd(10)), DeliverMin(usd(10)), Ter(temBAD_AMOUNT));
+            env(pay("alice", "bob", usd(10)),
+                DeliverMin(usd(-5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay("alice", "bob", usd(10)),
+                DeliverMin(XRP(5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay("alice", "bob", usd(10)),
+                DeliverMin(Account("carol")["USD"](5)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay("alice", "bob", usd(10)),
+                DeliverMin(usd(15)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_AMOUNT));
+            env(pay(gw, "carol", usd(50)));
+            env(offer("carol", XRP(5), usd(5)));
+            env(pay("alice", "bob", usd(10)),
+                Paths(XRP),
+                DeliverMin(usd(7)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(5)),
+                Ter(tecPATH_PARTIAL));
+            env.require(Balance("alice", XRP(10000) - drops(env.current()->fees().base)));
+            env.require(Balance("bob", XRP(10000)));
         }
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), "alice", "bob", gw);
             env.close();
-            env.trust(USD(1000), "alice", "bob");
+            env.trust(usd(1000), "alice", "bob");
             env.close();
-            env(pay(gw, "bob", USD(100)));
-            env(offer("bob", XRP(100), USD(100)));
-            env(pay("alice", "alice", USD(10000)),
-                paths(XRP),
-                deliver_min(USD(100)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(100)));
-            env.require(balance("alice", USD(100)));
+            env(pay(gw, "bob", usd(100)));
+            env(offer("bob", XRP(100), usd(100)));
+            env(pay("alice", "alice", usd(10000)),
+                Paths(XRP),
+                DeliverMin(usd(100)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(100)));
+            env.require(Balance("alice", usd(100)));
         }
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), "alice", "bob", "carol", gw);
             env.close();
-            env.trust(USD(1000), "bob", "carol");
+            env.trust(usd(1000), "bob", "carol");
             env.close();
-            env(pay(gw, "bob", USD(200)));
-            env(offer("bob", XRP(100), USD(100)));
-            env(offer("bob", XRP(1000), USD(100)));
-            env(offer("bob", XRP(10000), USD(100)));
-            env(pay("alice", "carol", USD(10000)),
-                paths(XRP),
-                deliver_min(USD(200)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1000)),
-                ter(tecPATH_PARTIAL));
-            env(pay("alice", "carol", USD(10000)),
-                paths(XRP),
-                deliver_min(USD(200)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(1100)));
-            env.require(balance("bob", USD(0)));
-            env.require(balance("carol", USD(200)));
+            env(pay(gw, "bob", usd(200)));
+            env(offer("bob", XRP(100), usd(100)));
+            env(offer("bob", XRP(1000), usd(100)));
+            env(offer("bob", XRP(10000), usd(100)));
+            env(pay("alice", "carol", usd(10000)),
+                Paths(XRP),
+                DeliverMin(usd(200)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1000)),
+                Ter(tecPATH_PARTIAL));
+            env(pay("alice", "carol", usd(10000)),
+                Paths(XRP),
+                DeliverMin(usd(200)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(1100)));
+            env.require(Balance("bob", usd(0)));
+            env.require(Balance("carol", usd(200)));
         }
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), "alice", "bob", "carol", "dan", gw);
             env.close();
-            env.trust(USD(1000), "bob", "carol", "dan");
+            env.trust(usd(1000), "bob", "carol", "dan");
             env.close();
-            env(pay(gw, "bob", USD(100)));
-            env(pay(gw, "dan", USD(100)));
-            env(offer("bob", XRP(100), USD(100)));
-            env(offer("bob", XRP(1000), USD(100)));
-            env(offer("dan", XRP(100), USD(100)));
-            env(pay("alice", "carol", USD(10000)),
-                paths(XRP),
-                deliver_min(USD(200)),
-                txflags(tfPartialPayment),
-                sendmax(XRP(200)));
-            env.require(balance("bob", USD(0)));
-            env.require(balance("carol", USD(200)));
-            env.require(balance("dan", USD(0)));
+            env(pay(gw, "bob", usd(100)));
+            env(pay(gw, "dan", usd(100)));
+            env(offer("bob", XRP(100), usd(100)));
+            env(offer("bob", XRP(1000), usd(100)));
+            env(offer("dan", XRP(100), usd(100)));
+            env(pay("alice", "carol", usd(10000)),
+                Paths(XRP),
+                DeliverMin(usd(200)),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(200)));
+            env.require(Balance("bob", usd(0)));
+            env.require(Balance("carol", usd(200)));
+            env.require(Balance("dan", usd(0)));
         }
     }
 
@@ -132,9 +132,9 @@ public:
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
-        test_convert_all_of_an_asset(sa - featurePermissionedDEX);
-        test_convert_all_of_an_asset(sa);
+        auto const sa = testableAmendments();
+        testConvertAllOfAnAsset(sa - featurePermissionedDEX);
+        testConvertAllOfAnAsset(sa);
     }
 };
 
diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp
index c9773cba8b..e0b48d8572 100644
--- a/src/test/app/DepositAuth_test.cpp
+++ b/src/test/app/DepositAuth_test.cpp
@@ -61,7 +61,7 @@ hasDepositAuth(jtx::Env const& env, jtx::Account const& acct)
     return ((*env.le(acct))[sfFlags] & lsfDepositAuth) == lsfDepositAuth;
 }
 
-struct DepositAuth_test : public beast::unit_test::suite
+struct DepositAuth_test : public beast::unit_test::Suite
 {
     void
     testEnable()
@@ -97,45 +97,45 @@ struct DepositAuth_test : public beast::unit_test::suite
         Account const bob{"bob"};
         Account const carol{"carol"};
         Account const gw{"gw"};
-        IOU const USD = gw["USD"];
+        IOU const usd = gw["USD"];
 
         Env env(*this);
 
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
-        env.trust(USD(1000), alice, bob);
+        env.trust(usd(1000), alice, bob);
         env.close();
 
-        env(pay(gw, alice, USD(150)));
-        env(offer(carol, USD(100), XRP(100)));
+        env(pay(gw, alice, usd(150)));
+        env(offer(carol, usd(100), XRP(100)));
         env.close();
 
         // Make sure bob's trust line is all set up so he can receive USD.
-        env(pay(alice, bob, USD(50)));
+        env(pay(alice, bob, usd(50)));
         env.close();
 
         // bob sets the lsfDepositAuth flag.
-        env(fset(bob, asfDepositAuth), require(flags(bob, asfDepositAuth)));
+        env(fset(bob, asfDepositAuth), Require(Flags(bob, asfDepositAuth)));
         env.close();
 
         // None of the following payments should succeed.
-        auto failedIouPayments = [this, &env, &alice, &bob, &USD]() {
-            env.require(flags(bob, asfDepositAuth));
+        auto failedIouPayments = [this, &env, &alice, &bob, &usd]() {
+            env.require(Flags(bob, asfDepositAuth));
 
             // Capture bob's balances before hand to confirm they don't change.
             PrettyAmount const bobXrpBalance{env.balance(bob, XRP)};
-            PrettyAmount const bobUsdBalance{env.balance(bob, USD)};
+            PrettyAmount const bobUsdBalance{env.balance(bob, usd)};
 
-            env(pay(alice, bob, USD(50)), ter(tecNO_PERMISSION));
+            env(pay(alice, bob, usd(50)), Ter(tecNO_PERMISSION));
             env.close();
 
             // Note that even though alice is paying bob in XRP, the payment
             // is still not allowed since the payment passes through an offer.
-            env(pay(alice, bob, drops(1)), sendmax(USD(1)), ter(tecNO_PERMISSION));
+            env(pay(alice, bob, drops(1)), Sendmax(usd(1)), Ter(tecNO_PERMISSION));
             env.close();
 
             BEAST_EXPECT(bobXrpBalance == env.balance(bob, XRP));
-            BEAST_EXPECT(bobUsdBalance == env.balance(bob, USD));
+            BEAST_EXPECT(bobUsdBalance == env.balance(bob, usd));
         };
 
         //  Test when bob has an XRP balance > base reserve.
@@ -143,23 +143,23 @@ struct DepositAuth_test : public beast::unit_test::suite
 
         // Set bob's XRP balance == base reserve.  Also demonstrate that
         // bob can make payments while his lsfDepositAuth flag is set.
-        env(pay(bob, alice, USD(25)));
+        env(pay(bob, alice, usd(25)));
         env.close();
 
         {
             STAmount const bobPaysXRP{env.balance(bob, XRP) - reserve(env, 1)};
             XRPAmount const bobPaysFee{reserve(env, 1) - reserve(env, 0)};
-            env(pay(bob, alice, bobPaysXRP), fee(bobPaysFee));
+            env(pay(bob, alice, bobPaysXRP), Fee(bobPaysFee));
             env.close();
         }
 
         // Test when bob's XRP balance == base reserve.
         BEAST_EXPECT(env.balance(bob, XRP) == reserve(env, 0));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(25));
+        BEAST_EXPECT(env.balance(bob, usd) == usd(25));
         failedIouPayments();
 
         // Test when bob has an XRP balance == 0.
-        env(noop(bob), fee(reserve(env, 0)));
+        env(noop(bob), Fee(reserve(env, 0)));
         env.close();
 
         BEAST_EXPECT(env.balance(bob, XRP) == XRP(0));
@@ -172,10 +172,10 @@ struct DepositAuth_test : public beast::unit_test::suite
         env(fclear(bob, asfDepositAuth));
         env.close();
 
-        env(pay(alice, bob, USD(50)));
+        env(pay(alice, bob, usd(50)));
         env.close();
 
-        env(pay(alice, bob, drops(1)), sendmax(USD(1)));
+        env(pay(alice, bob, drops(1)), Sendmax(usd(1)));
         env.close();
     }
 
@@ -197,12 +197,12 @@ struct DepositAuth_test : public beast::unit_test::suite
         env.close();
 
         // bob sets the lsfDepositAuth flag.
-        env(fset(bob, asfDepositAuth), fee(drops(baseFee)));
+        env(fset(bob, asfDepositAuth), Fee(drops(baseFee)));
         env.close();
         BEAST_EXPECT(env.balance(bob, XRP) == XRP(10000) - drops(baseFee));
 
         // bob has more XRP than the base reserve.  Any XRP payment should fail.
-        env(pay(alice, bob, drops(1)), ter(tecNO_PERMISSION));
+        env(pay(alice, bob, drops(1)), Ter(tecNO_PERMISSION));
         env.close();
         BEAST_EXPECT(env.balance(bob, XRP) == XRP(10000) - drops(baseFee));
 
@@ -210,7 +210,7 @@ struct DepositAuth_test : public beast::unit_test::suite
         {
             STAmount const bobPaysXRP{env.balance(bob, XRP) - reserve(env, 1)};
             XRPAmount const bobPaysFee{reserve(env, 1) - reserve(env, 0)};
-            env(pay(bob, alice, bobPaysXRP), fee(bobPaysFee));
+            env(pay(bob, alice, bobPaysXRP), Fee(bobPaysFee));
             env.close();
         }
 
@@ -222,16 +222,16 @@ struct DepositAuth_test : public beast::unit_test::suite
 
         // bob has exactly the base reserve + 1.  No payment should succeed.
         BEAST_EXPECT(env.balance(bob, XRP) == reserve(env, 0) + drops(1));
-        env(pay(alice, bob, drops(1)), ter(tecNO_PERMISSION));
+        env(pay(alice, bob, drops(1)), Ter(tecNO_PERMISSION));
         env.close();
 
         // Take bob down to a balance of 0 XRP.
-        env(noop(bob), fee(reserve(env, 0) + drops(1)));
+        env(noop(bob), Fee(reserve(env, 0) + drops(1)));
         env.close();
         BEAST_EXPECT(env.balance(bob, XRP) == drops(0));
 
         // We should not be able to pay bob more than the base reserve.
-        env(pay(alice, bob, reserve(env, 0) + drops(1)), ter(tecNO_PERMISSION));
+        env(pay(alice, bob, reserve(env, 0) + drops(1)), Ter(tecNO_PERMISSION));
         env.close();
 
         // However a payment of exactly the base reserve should succeed.
@@ -245,17 +245,17 @@ struct DepositAuth_test : public beast::unit_test::suite
         BEAST_EXPECT(env.balance(bob, XRP) == (reserve(env, 0) + reserve(env, 0)));
 
         // bob's above the threshold again.  Any payment should fail.
-        env(pay(alice, bob, drops(1)), ter(tecNO_PERMISSION));
+        env(pay(alice, bob, drops(1)), Ter(tecNO_PERMISSION));
         env.close();
         BEAST_EXPECT(env.balance(bob, XRP) == (reserve(env, 0) + reserve(env, 0)));
 
         // Take bob back down to a zero XRP balance.
-        env(noop(bob), fee(env.balance(bob, XRP)));
+        env(noop(bob), Fee(env.balance(bob, XRP)));
         env.close();
         BEAST_EXPECT(env.balance(bob, XRP) == drops(0));
 
         // bob should not be able to clear lsfDepositAuth.
-        env(fclear(bob, asfDepositAuth), ter(terINSUF_FEE_B));
+        env(fclear(bob, asfDepositAuth), Ter(terINSUF_FEE_B));
         env.close();
 
         // We should be able to pay bob 1 drop now.
@@ -271,7 +271,7 @@ struct DepositAuth_test : public beast::unit_test::suite
         // request to clear lsfDepositAuth.  So the balance should be zero
         // and lsfDepositAuth should be cleared.
         BEAST_EXPECT(env.balance(bob, XRP) == drops(0));
-        env.require(nflags(bob, asfDepositAuth));
+        env.require(Nflags(bob, asfDepositAuth));
 
         // Since bob no longer has lsfDepositAuth set we should be able to
         // pay him more than the base reserve.
@@ -294,8 +294,8 @@ struct DepositAuth_test : public beast::unit_test::suite
         Account const alice("alice");
         Account const bob("bob");
 
-        IOU const USD1(gw1["USD"]);
-        IOU const USD2(gw2["USD"]);
+        IOU const usD1(gw1["USD"]);
+        IOU const usD2(gw2["USD"]);
 
         auto testIssuer = [&](FeatureBitset const& features,
                               bool noRipplePrev,
@@ -307,15 +307,15 @@ struct DepositAuth_test : public beast::unit_test::suite
             env.close();
             env(trust(gw1, alice["USD"](10), noRipplePrev ? tfSetNoRipple : 0));
             env(trust(gw1, bob["USD"](10), noRippleNext ? tfSetNoRipple : 0));
-            env.trust(USD1(10), alice, bob);
+            env.trust(usD1(10), alice, bob);
 
-            env(pay(gw1, alice, USD1(10)));
+            env(pay(gw1, alice, usD1(10)));
 
             if (withDepositAuth)
                 env(fset(gw1, asfDepositAuth));
 
             TER const result = (noRippleNext && noRipplePrev) ? TER{tecPATH_DRY} : TER{tesSUCCESS};
-            env(pay(alice, bob, USD1(10)), path(gw1), ter(result));
+            env(pay(alice, bob, usD1(10)), Path(gw1), Ter(result));
         };
 
         auto testNonIssuer = [&](FeatureBitset const& features,
@@ -326,15 +326,15 @@ struct DepositAuth_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), gw1, gw2, alice);
             env.close();
-            env(trust(alice, USD1(10), noRipplePrev ? tfSetNoRipple : 0));
-            env(trust(alice, USD2(10), noRippleNext ? tfSetNoRipple : 0));
-            env(pay(gw2, alice, USD2(10)));
+            env(trust(alice, usD1(10), noRipplePrev ? tfSetNoRipple : 0));
+            env(trust(alice, usD2(10), noRippleNext ? tfSetNoRipple : 0));
+            env(pay(gw2, alice, usD2(10)));
 
             if (withDepositAuth)
                 env(fset(alice, asfDepositAuth));
 
             TER const result = (noRippleNext && noRipplePrev) ? TER{tecPATH_DRY} : TER{tesSUCCESS};
-            env(pay(gw1, gw2, USD2(10)), path(alice), sendmax(USD1(10)), ter(result));
+            env(pay(gw1, gw2, usD2(10)), Path(alice), Sendmax(usD1(10)), Ter(result));
         };
 
         // Test every combo of noRipplePrev, noRippleNext, and withDepositAuth
@@ -344,10 +344,10 @@ struct DepositAuth_test : public beast::unit_test::suite
             auto const noRippleNext = i & 0x2;
             auto const withDepositAuth = i & 0x4;
             testIssuer(
-                testable_amendments(), noRipplePrev != 0, noRippleNext != 0, withDepositAuth != 0);
+                testableAmendments(), noRipplePrev != 0, noRippleNext != 0, withDepositAuth != 0);
 
             testNonIssuer(
-                testable_amendments(), noRipplePrev != 0, noRippleNext != 0, withDepositAuth != 0);
+                testableAmendments(), noRipplePrev != 0, noRippleNext != 0, withDepositAuth != 0);
         }
     }
 
@@ -361,16 +361,16 @@ struct DepositAuth_test : public beast::unit_test::suite
     }
 };
 
-static Json::Value
+static json::Value
 ledgerEntryDepositPreauth(
     jtx::Env& env,
     jtx::Account const& acc,
     std::vector<jtx::deposit::AuthorizeCredentials> const& auth)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = jss::validated;
     jvParams[jss::deposit_preauth][jss::owner] = acc.human();
-    jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+    jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
     auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
     for (auto const& o : auth)
     {
@@ -379,7 +379,7 @@ ledgerEntryDepositPreauth(
     return env.rpc("json", "ledger_entry", to_string(jvParams));
 }
 
-struct DepositPreauth_test : public beast::unit_test::suite
+struct DepositPreauth_test : public beast::unit_test::Suite
 {
     void
     testEnable()
@@ -400,14 +400,14 @@ struct DepositPreauth_test : public beast::unit_test::suite
             // Add a DepositPreauth to alice.
             env(deposit::auth(alice, becky));
             env.close();
-            env.require(owners(alice, 1));
-            env.require(owners(becky, 0));
+            env.require(Owners(alice, 1));
+            env.require(Owners(becky, 0));
 
             // Remove a DepositPreauth from alice.
             env(deposit::unauth(alice, becky));
             env.close();
-            env.require(owners(alice, 0));
-            env.require(owners(becky, 0));
+            env.require(Owners(alice, 0));
+            env.require(Owners(becky, 0));
         }
         {
             // Verify that an account can be preauthorized and unauthorized
@@ -425,21 +425,21 @@ struct DepositPreauth_test : public beast::unit_test::suite
             std::uint32_t aliceTicketSeq{env.seq(alice)};
 
             // Add a DepositPreauth to alice.
-            env(deposit::auth(alice, becky), ticket::use(--aliceTicketSeq));
+            env(deposit::auth(alice, becky), ticket::Use(--aliceTicketSeq));
             env.close();
             // Alice uses a ticket but gains a preauth entry.
             env.require(tickets(alice, 1));
-            env.require(owners(alice, 2));
+            env.require(Owners(alice, 2));
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
-            env.require(owners(becky, 0));
+            env.require(Owners(becky, 0));
 
             // Remove a DepositPreauth from alice.
-            env(deposit::unauth(alice, becky), ticket::use(--aliceTicketSeq));
+            env(deposit::unauth(alice, becky), ticket::Use(--aliceTicketSeq));
             env.close();
             env.require(tickets(alice, 0));
-            env.require(owners(alice, 0));
+            env.require(Owners(alice, 0));
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
-            env.require(owners(becky, 0));
+            env.require(Owners(becky, 0));
         }
     }
 
@@ -461,104 +461,104 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.memoize(carol);
 
         // Add DepositPreauth to an unfunded account.
-        env(deposit::auth(alice, becky), seq(1), ter(terNO_ACCOUNT));
+        env(deposit::auth(alice, becky), Seq(1), Ter(terNO_ACCOUNT));
 
         env.fund(XRP(10000), alice, becky);
         env.close();
 
         // Bad fee.
-        env(deposit::auth(alice, becky), fee(drops(-10)), ter(temBAD_FEE));
+        env(deposit::auth(alice, becky), Fee(drops(-10)), Ter(temBAD_FEE));
         env.close();
 
         // Bad flags.
-        env(deposit::auth(alice, becky), txflags(tfSell), ter(temINVALID_FLAG));
+        env(deposit::auth(alice, becky), Txflags(tfSell), Ter(temINVALID_FLAG));
         env.close();
 
         {
             // Neither auth not unauth.
-            Json::Value tx{deposit::auth(alice, becky)};
+            json::Value tx{deposit::auth(alice, becky)};
             tx.removeMember(sfAuthorize.jsonName);
-            env(tx, ter(temMALFORMED));
+            env(tx, Ter(temMALFORMED));
             env.close();
         }
         {
             // Both auth and unauth.
-            Json::Value tx{deposit::auth(alice, becky)};
+            json::Value tx{deposit::auth(alice, becky)};
             tx[sfUnauthorize.jsonName] = becky.human();
-            env(tx, ter(temMALFORMED));
+            env(tx, Ter(temMALFORMED));
             env.close();
         }
         {
             // Alice authorizes a zero account.
-            Json::Value tx{deposit::auth(alice, becky)};
+            json::Value tx{deposit::auth(alice, becky)};
             tx[sfAuthorize.jsonName] = to_string(xrpAccount());
-            env(tx, ter(temINVALID_ACCOUNT_ID));
+            env(tx, Ter(temINVALID_ACCOUNT_ID));
             env.close();
         }
 
         // alice authorizes herself.
-        env(deposit::auth(alice, alice), ter(temCANNOT_PREAUTH_SELF));
+        env(deposit::auth(alice, alice), Ter(temCANNOT_PREAUTH_SELF));
         env.close();
 
         // alice authorizes an unfunded account.
-        env(deposit::auth(alice, carol), ter(tecNO_TARGET));
+        env(deposit::auth(alice, carol), Ter(tecNO_TARGET));
         env.close();
 
         // alice successfully authorizes becky.
-        env.require(owners(alice, 0));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 0));
+        env.require(Owners(becky, 0));
         env(deposit::auth(alice, becky));
         env.close();
-        env.require(owners(alice, 1));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 1));
+        env.require(Owners(becky, 0));
 
         // alice attempts to create a duplicate authorization.
-        env(deposit::auth(alice, becky), ter(tecDUPLICATE));
+        env(deposit::auth(alice, becky), Ter(tecDUPLICATE));
         env.close();
-        env.require(owners(alice, 1));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 1));
+        env.require(Owners(becky, 0));
 
         // carol attempts to preauthorize but doesn't have enough reserve.
         env.fund(drops(249'999'999), carol);
         env.close();
 
-        env(deposit::auth(carol, becky), ter(tecINSUFFICIENT_RESERVE));
+        env(deposit::auth(carol, becky), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
-        env.require(owners(carol, 0));
-        env.require(owners(becky, 0));
+        env.require(Owners(carol, 0));
+        env.require(Owners(becky, 0));
 
         // carol gets enough XRP to (barely) meet the reserve.
         env(pay(alice, carol, drops(env.current()->fees().base + 1)));
         env.close();
         env(deposit::auth(carol, becky));
         env.close();
-        env.require(owners(carol, 1));
-        env.require(owners(becky, 0));
+        env.require(Owners(carol, 1));
+        env.require(Owners(becky, 0));
 
         // But carol can't meet the reserve for another pre-authorization.
-        env(deposit::auth(carol, alice), ter(tecINSUFFICIENT_RESERVE));
+        env(deposit::auth(carol, alice), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
-        env.require(owners(carol, 1));
-        env.require(owners(becky, 0));
-        env.require(owners(alice, 1));
+        env.require(Owners(carol, 1));
+        env.require(Owners(becky, 0));
+        env.require(Owners(alice, 1));
 
         // alice attempts to remove an authorization she doesn't have.
-        env(deposit::unauth(alice, carol), ter(tecNO_ENTRY));
+        env(deposit::unauth(alice, carol), Ter(tecNO_ENTRY));
         env.close();
-        env.require(owners(alice, 1));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 1));
+        env.require(Owners(becky, 0));
 
         // alice successfully removes her authorization of becky.
         env(deposit::unauth(alice, becky));
         env.close();
-        env.require(owners(alice, 0));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 0));
+        env.require(Owners(becky, 0));
 
         // alice removes becky again and gets an error.
-        env(deposit::unauth(alice, becky), ter(tecNO_ENTRY));
+        env(deposit::unauth(alice, becky), Ter(tecNO_ENTRY));
         env.close();
-        env.require(owners(alice, 0));
-        env.require(owners(becky, 0));
+        env.require(Owners(alice, 0));
+        env.require(Owners(becky, 0));
     }
 
     void
@@ -570,7 +570,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const becky{"becky"};
         Account const gw{"gw"};
-        IOU const USD(gw["USD"]);
+        IOU const usd(gw["USD"]);
 
         {
             // The initial implementation of DepositAuth had a bug where an
@@ -580,19 +580,19 @@ struct DepositPreauth_test : public beast::unit_test::suite
             env.fund(XRP(5000), alice, becky, gw);
             env.close();
 
-            env.trust(USD(1000), alice);
-            env.trust(USD(1000), becky);
+            env.trust(usd(1000), alice);
+            env.trust(usd(1000), becky);
             env.close();
 
-            env(pay(gw, alice, USD(500)));
+            env(pay(gw, alice, usd(500)));
             env.close();
 
-            env(offer(alice, XRP(100), USD(100), tfPassive), require(offers(alice, 1)));
+            env(offer(alice, XRP(100), usd(100), tfPassive), Require(offers(alice, 1)));
             env.close();
 
             // becky pays herself USD (10) by consuming part of alice's offer.
             // Make sure the payment works if PaymentAuth is not involved.
-            env(pay(becky, becky, USD(10)), path(~USD), sendmax(XRP(10)));
+            env(pay(becky, becky, usd(10)), Path(~usd), Sendmax(XRP(10)));
             env.close();
 
             // becky decides to require authorization for deposits.
@@ -600,7 +600,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             env.close();
 
             // becky pays herself again.
-            env(pay(becky, becky, USD(10)), path(~USD), sendmax(XRP(10)), ter(tesSUCCESS));
+            env(pay(becky, becky, usd(10)), Path(~usd), Sendmax(XRP(10)), Ter(tesSUCCESS));
             env.close();
 
             {
@@ -614,13 +614,13 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
                 TER const expectTer(!supportsCredentials ? TER(temDISABLED) : TER(tesSUCCESS));
 
-                env(deposit::authCredentials(becky, {{carol, credType}}), ter(expectTer));
+                env(deposit::authCredentials(becky, {{carol, credType}}), Ter(expectTer));
                 env.close();
 
                 // gw accept credentials
-                env(credentials::create(gw, carol, credType), ter(expectTer));
+                env(credentials::create(gw, carol, credType), Ter(expectTer));
                 env.close();
-                env(credentials::accept(gw, carol, credType), ter(expectTer));
+                env(credentials::accept(gw, carol, credType), Ter(expectTer));
                 env.close();
 
                 auto jv = credentials::ledgerEntry(env, gw, carol, credType);
@@ -629,7 +629,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
                     : "48004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6"
                       "EA288BE4";
 
-                env(pay(gw, becky, USD(100)), credentials::ids({credIdx}), ter(expectTer));
+                env(pay(gw, becky, usd(100)), credentials::Ids({credIdx}), Ter(expectTer));
                 env.close();
             }
         }
@@ -642,17 +642,17 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.fund(XRP(5000), alice, becky, carol, gw);
         env.close();
 
-        env.trust(USD(1000), alice);
-        env.trust(USD(1000), becky);
-        env.trust(USD(1000), carol);
+        env.trust(usd(1000), alice);
+        env.trust(usd(1000), becky);
+        env.trust(usd(1000), carol);
         env.close();
 
-        env(pay(gw, alice, USD(1000)));
+        env(pay(gw, alice, usd(1000)));
         env.close();
 
         // Make XRP and IOU payments from alice to becky.  Should be fine.
         env(pay(alice, becky, XRP(100)));
-        env(pay(alice, becky, USD(100)));
+        env(pay(alice, becky, usd(100)));
         env.close();
 
         // becky decides to require authorization for deposits.
@@ -660,8 +660,8 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.close();
 
         // alice can no longer pay becky.
-        env(pay(alice, becky, XRP(100)), ter(tecNO_PERMISSION));
-        env(pay(alice, becky, USD(100)), ter(tecNO_PERMISSION));
+        env(pay(alice, becky, XRP(100)), Ter(tecNO_PERMISSION));
+        env(pay(alice, becky, usd(100)), Ter(tecNO_PERMISSION));
         env.close();
 
         // becky preauthorizes carol for deposit, which doesn't provide
@@ -670,8 +670,8 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.close();
 
         // alice still can't pay becky.
-        env(pay(alice, becky, XRP(100)), ter(tecNO_PERMISSION));
-        env(pay(alice, becky, USD(100)), ter(tecNO_PERMISSION));
+        env(pay(alice, becky, XRP(100)), Ter(tecNO_PERMISSION));
+        env(pay(alice, becky, usd(100)), Ter(tecNO_PERMISSION));
         env.close();
 
         // becky preauthorizes alice for deposit.
@@ -680,7 +680,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
         // alice can now pay becky.
         env(pay(alice, becky, XRP(100)));
-        env(pay(alice, becky, USD(100)));
+        env(pay(alice, becky, usd(100)));
         env.close();
 
         // alice decides to require authorization for deposits.
@@ -689,8 +689,8 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
         // Even though alice is authorized to pay becky, becky is not
         // authorized to pay alice.
-        env(pay(becky, alice, XRP(100)), ter(tecNO_PERMISSION));
-        env(pay(becky, alice, USD(100)), ter(tecNO_PERMISSION));
+        env(pay(becky, alice, XRP(100)), Ter(tecNO_PERMISSION));
+        env(pay(becky, alice, usd(100)), Ter(tecNO_PERMISSION));
         env.close();
 
         // becky unauthorizes carol.  Should have no impact on alice.
@@ -698,15 +698,15 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.close();
 
         env(pay(alice, becky, XRP(100)));
-        env(pay(alice, becky, USD(100)));
+        env(pay(alice, becky, usd(100)));
         env.close();
 
         // becky unauthorizes alice.  alice now can't pay becky.
         env(deposit::unauth(becky, alice));
         env.close();
 
-        env(pay(alice, becky, XRP(100)), ter(tecNO_PERMISSION));
-        env(pay(alice, becky, USD(100)), ter(tecNO_PERMISSION));
+        env(pay(alice, becky, XRP(100)), Ter(tecNO_PERMISSION));
+        env(pay(alice, becky, usd(100)), Ter(tecNO_PERMISSION));
         env.close();
 
         // becky decides to remove authorization for deposits.  Now
@@ -715,7 +715,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
         env.close();
 
         env(pay(alice, becky, XRP(100)));
-        env(pay(alice, becky, USD(100)));
+        env(pay(alice, becky, usd(100)));
         env.close();
     }
 
@@ -734,7 +734,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
         {
             testcase("Payment failure with disabled credentials rule.");
 
-            Env env(*this, testable_amendments() - featureCredentials);
+            Env env(*this, testableAmendments() - featureCredentials);
 
             env.fund(XRP(5000), issuer, bob, alice);
             env.close();
@@ -744,7 +744,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             env.close();
 
             // Setup DepositPreauth object failed - amendent is not supported
-            env(deposit::authCredentials(bob, {{issuer, credType}}), ter(temDISABLED));
+            env(deposit::authCredentials(bob, {{issuer, credType}}), Ter(temDISABLED));
             env.close();
 
             // But can create old DepositPreauth
@@ -756,7 +756,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             std::string const invalidIdx =
                 "0E0B04ED60588A758B67E21FBBE95AC5A63598BA951761DC0EC9C08D7E"
                 "01E034";
-            env(pay(alice, bob, XRP(10)), credentials::ids({invalidIdx}), ter(temDISABLED));
+            env(pay(alice, bob, XRP(10)), credentials::Ids({invalidIdx}), Ter(temDISABLED));
             env.close();
         }
 
@@ -795,13 +795,13 @@ struct DepositPreauth_test : public beast::unit_test::suite
             // Alice can't pay - empty credentials array
             {
                 auto jv = pay(alice, bob, XRP(100));
-                jv[sfCredentialIDs.jsonName] = Json::arrayValue;
-                env(jv, ter(temMALFORMED));
+                jv[sfCredentialIDs.jsonName] = json::ArrayValue;
+                env(jv, Ter(temMALFORMED));
                 env.close();
             }
 
             // Alice can't pay - not accepted credentials
-            env(pay(alice, bob, XRP(100)), credentials::ids({credIdx}), ter(tecBAD_CREDENTIALS));
+            env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx}), Ter(tecBAD_CREDENTIALS));
             env.close();
 
             // Alice accept the credentials
@@ -809,18 +809,18 @@ struct DepositPreauth_test : public beast::unit_test::suite
             env.close();
 
             // Now Alice can pay
-            env(pay(alice, bob, XRP(100)), credentials::ids({credIdx}));
+            env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx}));
             env.close();
 
             // Alice can pay Maria without depositPreauth enabled
-            env(pay(alice, maria, XRP(250)), credentials::ids({credIdx}));
+            env(pay(alice, maria, XRP(250)), credentials::Ids({credIdx}));
             env.close();
 
             // john can accept payment with old depositPreauth and valid
             // credentials
             env(fset(john, asfDepositAuth));
             env(deposit::auth(john, alice));
-            env(pay(alice, john, XRP(100)), credentials::ids({credIdx}));
+            env(pay(alice, john, XRP(100)), credentials::Ids({credIdx}));
             env.close();
         }
 
@@ -845,7 +845,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             {
                 // Success as destination didn't enable pre-authorization so
                 // valid credentials will not fail
-                env(pay(alice, bob, XRP(100)), credentials::ids({credIdx}));
+                env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx}));
             }
 
             // Bob require pre-authorization
@@ -854,12 +854,12 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
             {
                 // Fail as destination didn't setup DepositPreauth object
-                env(pay(alice, bob, XRP(100)), credentials::ids({credIdx}), ter(tecNO_PERMISSION));
+                env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx}), Ter(tecNO_PERMISSION));
             }
 
             // Bob setup DepositPreauth object, duplicates is not allowed
             env(deposit::authCredentials(bob, {{issuer, credType}, {issuer, credType}}),
-                ter(temMALFORMED));
+                Ter(temMALFORMED));
 
             // Bob setup DepositPreauth object
             env(deposit::authCredentials(bob, {{issuer, credType}}));
@@ -871,15 +871,15 @@ struct DepositPreauth_test : public beast::unit_test::suite
                     "01E034";
                 // Alice can't pay with non-existing credentials
                 env(pay(alice, bob, XRP(100)),
-                    credentials::ids({invalidIdx}),
-                    ter(tecBAD_CREDENTIALS));
+                    credentials::Ids({invalidIdx}),
+                    Ter(tecBAD_CREDENTIALS));
             }
 
             {  // maria can't pay using valid credentials but issued for
                // different account
                 env(pay(maria, bob, XRP(100)),
-                    credentials::ids({credIdx}),
-                    ter(tecBAD_CREDENTIALS));
+                    credentials::Ids({credIdx}),
+                    Ter(tecBAD_CREDENTIALS));
             }
 
             {
@@ -894,15 +894,15 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
                 // Alice can't pay with invalid set of valid credentials
                 env(pay(alice, bob, XRP(100)),
-                    credentials::ids({credIdx, credIdx2}),
-                    ter(tecNO_PERMISSION));
+                    credentials::Ids({credIdx, credIdx2}),
+                    Ter(tecNO_PERMISSION));
             }
 
             // Error, duplicate credentials
-            env(pay(alice, bob, XRP(100)), credentials::ids({credIdx, credIdx}), ter(temMALFORMED));
+            env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx, credIdx}), Ter(temMALFORMED));
 
             // Alice can pay
-            env(pay(alice, bob, XRP(100)), credentials::ids({credIdx}));
+            env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx}));
             env.close();
         }
     }
@@ -929,62 +929,62 @@ struct DepositPreauth_test : public beast::unit_test::suite
             {
                 // both included [AuthorizeCredentials UnauthorizeCredentials]
                 auto jv = deposit::authCredentials(bob, {{issuer, credType}});
-                jv[sfUnauthorizeCredentials.jsonName] = Json::arrayValue;
-                env(jv, ter(temMALFORMED));
+                jv[sfUnauthorizeCredentials.jsonName] = json::ArrayValue;
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 // both included [Unauthorize, AuthorizeCredentials]
                 auto jv = deposit::authCredentials(bob, {{issuer, credType}});
                 jv[sfUnauthorize.jsonName] = issuer.human();
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 // both included [Authorize, AuthorizeCredentials]
                 auto jv = deposit::authCredentials(bob, {{issuer, credType}});
                 jv[sfAuthorize.jsonName] = issuer.human();
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 // both included [Unauthorize, UnauthorizeCredentials]
                 auto jv = deposit::unauthCredentials(bob, {{issuer, credType}});
                 jv[sfUnauthorize.jsonName] = issuer.human();
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 // both included [Authorize, UnauthorizeCredentials]
                 auto jv = deposit::unauthCredentials(bob, {{issuer, credType}});
                 jv[sfAuthorize.jsonName] = issuer.human();
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
                 // AuthorizeCredentials is empty
                 auto jv = deposit::authCredentials(bob, {});
-                env(jv, ter(temARRAY_EMPTY));
+                env(jv, Ter(temARRAY_EMPTY));
             }
 
             {
                 // invalid issuer
                 auto jv = deposit::authCredentials(bob, {});
                 auto& arr(jv[sfAuthorizeCredentials.jsonName]);
-                Json::Value cred = Json::objectValue;
+                json::Value cred = json::ObjectValue;
                 cred[jss::Issuer] = to_string(xrpAccount());
                 cred[sfCredentialType.jsonName] = strHex(std::string_view(credType));
-                Json::Value credParent;
+                json::Value credParent;
                 credParent[jss::Credential] = cred;
                 arr.append(std::move(credParent));
 
-                env(jv, ter(temINVALID_ACCOUNT_ID));
+                env(jv, Ter(temINVALID_ACCOUNT_ID));
             }
 
             {
                 // empty credential type
                 auto jv = deposit::authCredentials(bob, {{issuer, {}}});
-                env(jv, ter(temMALFORMED));
+                env(jv, Ter(temMALFORMED));
             }
 
             {
@@ -994,14 +994,14 @@ struct DepositPreauth_test : public beast::unit_test::suite
                 auto const& z = credType;
                 auto jv = deposit::authCredentials(
                     bob, {{a, z}, {b, z}, {c, z}, {d, z}, {e, z}, {f, z}, {g, z}, {h, z}, {i, z}});
-                env(jv, ter(temARRAY_TOO_LARGE));
+                env(jv, Ter(temARRAY_TOO_LARGE));
             }
 
             {
                 // Can't create with non-existing issuer
                 Account const rick{"rick"};
                 auto jv = deposit::authCredentials(bob, {{rick, credType}});
-                env(jv, ter(tecNO_ISSUER));
+                env(jv, Ter(tecNO_ISSUER));
                 env.close();
             }
 
@@ -1011,12 +1011,12 @@ struct DepositPreauth_test : public beast::unit_test::suite
                 env.fund(env.current()->fees().accountReserve(0), john);
                 env.close();
                 auto jv = deposit::authCredentials(john, {{issuer, credType}});
-                env(jv, ter(tecINSUFFICIENT_RESERVE));
+                env(jv, Ter(tecINSUFFICIENT_RESERVE));
             }
 
             {
                 // NO deposit object exists
-                env(deposit::unauthCredentials(bob, {{issuer, credType}}), ter(tecNO_ENTRY));
+                env(deposit::unauthCredentials(bob, {{issuer, credType}}), Ter(tecNO_ENTRY));
             }
 
             // Create DepositPreauth object
@@ -1045,7 +1045,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
                 }
 
                 // can't create duplicate
-                env(deposit::authCredentials(bob, {{issuer, credType}}), ter(tecDUPLICATE));
+                env(deposit::authCredentials(bob, {{issuer, credType}}), Ter(tecDUPLICATE));
             }
 
             // Delete DepositPreauth object
@@ -1071,7 +1071,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const bob{"bob"};
         Account const gw{"gw"};
-        IOU const USD = gw["USD"];
+        IOU const usd = gw["USD"];
         Account const zelda{"zelda"};
 
         {
@@ -1124,14 +1124,14 @@ struct DepositPreauth_test : public beast::unit_test::suite
 
             {
                 // Alice can pay
-                env(pay(alice, bob, XRP(100)), credentials::ids({credIdx, credIdx2}));
+                env(pay(alice, bob, XRP(100)), credentials::Ids({credIdx, credIdx2}));
                 env.close();
                 env.close();
 
                 // Ledger closed, time increased, alice can't pay anymore
                 env(pay(alice, bob, XRP(100)),
-                    credentials::ids({credIdx, credIdx2}),
-                    ter(tecEXPIRED));
+                    credentials::Ids({credIdx, credIdx2}),
+                    Ter(tecEXPIRED));
                 env.close();
 
                 {
@@ -1183,7 +1183,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
                 env.close();
 
                 // credentials are expired
-                env(pay(gw, bob, USD(150)), credentials::ids({credIdx}), ter(tecEXPIRED));
+                env(pay(gw, bob, usd(150)), credentials::Ids({credIdx}), Ter(tecEXPIRED));
                 env.close();
 
                 // check that expired credentials were deleted
@@ -1232,12 +1232,12 @@ struct DepositPreauth_test : public beast::unit_test::suite
             env.close();
 
             auto const seq = env.seq(alice);
-            env(escrow::create(alice, bob, XRP(1000)), escrow::finish_time(env.now() + 1s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
             env.close();
 
             // zelda can't finish escrow with invalid credentials
             {
-                env(escrow::finish(zelda, alice, seq), credentials::ids({}), ter(temMALFORMED));
+                env(escrow::finish(zelda, alice, seq), credentials::Ids({}), Ter(temMALFORMED));
                 env.close();
             }
 
@@ -1248,16 +1248,16 @@ struct DepositPreauth_test : public beast::unit_test::suite
                     "01E034";
 
                 env(escrow::finish(zelda, alice, seq),
-                    credentials::ids({invalidIdx}),
-                    ter(tecBAD_CREDENTIALS));
+                    credentials::Ids({invalidIdx}),
+                    Ter(tecBAD_CREDENTIALS));
                 env.close();
             }
 
             {  // Ledger closed, time increased, zelda can't finish escrow
                 env(escrow::finish(zelda, alice, seq),
-                    credentials::ids({credIdx}),
-                    fee(1500),
-                    ter(tecEXPIRED));
+                    credentials::Ids({credIdx}),
+                    Fee(1500),
+                    Ter(tecEXPIRED));
                 env.close();
             }
 
@@ -1346,7 +1346,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             for (int i = 0; i < 10; ++i)
             {
                 std::ranges::shuffle(credentials, gen);
-                env(deposit::authCredentials(stock, credentials), ter(tecDUPLICATE));
+                env(deposit::authCredentials(stock, credentials), Ter(tecDUPLICATE));
             }
         }
 
@@ -1361,7 +1361,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
             {
                 auto credentials2 = copyCredentials;
                 credentials2.push_back(c);
-                env(deposit::authCredentials(stock, credentials2), ter(temMALFORMED));
+                env(deposit::authCredentials(stock, credentials2), Ter(temMALFORMED));
             }
 
             // create batch of credentials and save their hashes
@@ -1385,7 +1385,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
                 auto credentialIDs2 = credentialIDs;
                 credentialIDs2.push_back(h);
 
-                env(pay(alice, bob, XRP(100)), credentials::ids(credentialIDs2), ter(temMALFORMED));
+                env(pay(alice, bob, XRP(100)), credentials::Ids(credentialIDs2), Ter(temMALFORMED));
             }
         }
     }
@@ -1395,7 +1395,7 @@ struct DepositPreauth_test : public beast::unit_test::suite
     {
         testEnable();
         testInvalid();
-        auto const supported{jtx::testable_amendments()};
+        auto const supported{jtx::testableAmendments()};
         testPayment(supported - featureCredentials);
         testPayment(supported);
         testCredentialsPayment();
diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp
index b01b11aa11..0d3460dd2a 100644
--- a/src/test/app/Discrepancy_test.cpp
+++ b/src/test/app/Discrepancy_test.cpp
@@ -22,7 +22,7 @@
 
 namespace xrpl {
 
-class Discrepancy_test : public beast::unit_test::suite
+class Discrepancy_test : public beast::unit_test::Suite
 {
     // This is a legacy test ported from js/coffee. The ledger
     // state was originally setup via a saved ledger file and the relevant
@@ -36,64 +36,64 @@ class Discrepancy_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this, features};
 
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
-        Account const A5{"A5"};
-        Account const A6{"A6"};
-        Account const A7{"A7"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
+        Account const a5{"A5"};
+        Account const a6{"A6"};
+        Account const a7{"A7"};
 
-        env.fund(XRP(2000), A1);
-        env.fund(XRP(1000), A2, A6, A7);
-        env.fund(XRP(5000), A3);
-        env.fund(XRP(1000000), A4);
-        env.fund(XRP(600000), A5);
+        env.fund(XRP(2000), a1);
+        env.fund(XRP(1000), a2, a6, a7);
+        env.fund(XRP(5000), a3);
+        env.fund(XRP(1000000), a4);
+        env.fund(XRP(600000), a5);
         env.close();
 
-        env(trust(A1, A3["CNY"](200000)));
-        env(pay(A3, A1, A3["CNY"](31)));
+        env(trust(a1, a3["CNY"](200000)));
+        env(pay(a3, a1, a3["CNY"](31)));
         env.close();
 
-        env(trust(A1, A2["JPY"](1000000)));
-        env(pay(A2, A1, A2["JPY"](729117)));
+        env(trust(a1, a2["JPY"](1000000)));
+        env(pay(a2, a1, a2["JPY"](729117)));
         env.close();
 
-        env(trust(A4, A2["JPY"](10000000)));
-        env(pay(A2, A4, A2["JPY"](470056)));
+        env(trust(a4, a2["JPY"](10000000)));
+        env(pay(a2, a4, a2["JPY"](470056)));
         env.close();
 
-        env(trust(A5, A3["CNY"](50000)));
-        env(pay(A3, A5, A3["CNY"](8683)));
+        env(trust(a5, a3["CNY"](50000)));
+        env(pay(a3, a5, a3["CNY"](8683)));
         env.close();
 
-        env(trust(A6, A3["CNY"](3000)));
-        env(pay(A3, A6, A3["CNY"](293)));
+        env(trust(a6, a3["CNY"](3000)));
+        env(pay(a3, a6, a3["CNY"](293)));
         env.close();
 
-        env(trust(A7, A6["CNY"](50000)));
-        env(pay(A6, A7, A6["CNY"](261)));
+        env(trust(a7, a6["CNY"](50000)));
+        env(pay(a6, a7, a6["CNY"](261)));
         env.close();
 
-        env(offer(A4, XRP(49147), A2["JPY"](34501)));
-        env(offer(A5, A3["CNY"](3150), XRP(80086)));
-        env(offer(A7, XRP(1233), A6["CNY"](25)));
+        env(offer(a4, XRP(49147), a2["JPY"](34501)));
+        env(offer(a5, a3["CNY"](3150), XRP(80086)));
+        env(offer(a7, XRP(1233), a6["CNY"](25)));
         env.close();
 
         test::PathSet const payPaths{
-            test::Path{A2["JPY"], A2},
-            test::Path{XRP, A2["JPY"], A2},
-            test::Path{A6, XRP, A2["JPY"], A2}};
+            test::TestPath{a2["JPY"], a2},
+            test::TestPath{XRP, a2["JPY"], a2},
+            test::TestPath{a6, XRP, a2["JPY"], a2}};
 
-        env(pay(A1, A1, A2["JPY"](1000)),
-            json(payPaths.json()),
-            txflags(tfPartialPayment),
-            sendmax(A3["CNY"](56)));
+        env(pay(a1, a1, a2["JPY"](1000)),
+            Json(payPaths.json()),
+            Txflags(tfPartialPayment),
+            Sendmax(a3["CNY"](56)));
         env.close();
 
-        Json::Value jrq2;
+        json::Value jrq2;
         jrq2[jss::binary] = false;
-        jrq2[jss::transaction] = env.tx()->getJson(JsonOptions::none)[jss::hash];
+        jrq2[jss::transaction] = env.tx()->getJson(JsonOptions::KNone)[jss::hash];
         jrq2[jss::id] = 3;
         auto jrr = env.rpc("json", "tx", to_string(jrq2))[jss::result];
         uint64_t const fee{jrr[jss::Fee].asUInt()};
@@ -103,7 +103,7 @@ class Discrepancy_test : public beast::unit_test::suite
         BEAST_EXPECT(meta[sfAffectedNodes.fieldName].size() == 9);
         for (auto const& an : meta[sfAffectedNodes.fieldName])
         {
-            Json::Value node;
+            json::Value node;
             if (an.isMember(sfCreatedNode.fieldName))
             {
                 node = an[sfCreatedNode.fieldName];
@@ -119,10 +119,10 @@ class Discrepancy_test : public beast::unit_test::suite
 
             if (node && node[sfLedgerEntryType.fieldName] == jss::AccountRoot)
             {
-                Json::Value prevFields = node.isMember(sfPreviousFields.fieldName)
+                json::Value prevFields = node.isMember(sfPreviousFields.fieldName)
                     ? node[sfPreviousFields.fieldName]
                     : node[sfNewFields.fieldName];
-                Json::Value finalFields = node.isMember(sfFinalFields.fieldName)
+                json::Value finalFields = node.isMember(sfFinalFields.fieldName)
                     ? node[sfFinalFields.fieldName]
                     : node[sfNewFields.fieldName];
                 if (prevFields)
@@ -147,7 +147,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testXRPDiscrepancy(sa - featurePermissionedDEX);
         testXRPDiscrepancy(sa);
     }
diff --git a/src/test/app/EscrowToken_test.cpp b/src/test/app/EscrowToken_test.cpp
index d77043a624..bf7cf90bf2 100644
--- a/src/test/app/EscrowToken_test.cpp
+++ b/src/test/app/EscrowToken_test.cpp
@@ -43,7 +43,7 @@
 
 namespace xrpl::test {
 
-struct EscrowToken_test : public beast::unit_test::suite
+struct EscrowToken_test : public beast::unit_test::Suite
 {
     static uint64_t
     mptEscrowed(jtx::Env const& env, jtx::Account const& account, jtx::MPT const& mpt)
@@ -66,7 +66,7 @@ struct EscrowToken_test : public beast::unit_test::suite
     static jtx::PrettyAmount
     issuerBalance(jtx::Env& env, jtx::Account const& account, Issue const& issue)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::account] = account.human();
         auto jrr = env.rpc("json", "gateway_balances", to_string(params));
         auto const result = jrr[jss::result];
@@ -80,7 +80,7 @@ struct EscrowToken_test : public beast::unit_test::suite
     static jtx::PrettyAmount
     issuerEscrowed(jtx::Env& env, jtx::Account const& account, Issue const& issue)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::account] = account.human();
         auto jrr = env.rpc("json", "gateway_balances", to_string(params));
         auto const result = jrr[jss::result];
@@ -107,39 +107,39 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, bob, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, bob, usd(5000)));
             env.close();
 
-            auto const createResult = withTokenEscrow ? ter(tesSUCCESS) : ter(temBAD_AMOUNT);
-            auto const finishResult = withTokenEscrow ? ter(tesSUCCESS) : ter(tecNO_TARGET);
+            auto const createResult = withTokenEscrow ? Ter(tesSUCCESS) : Ter(temBAD_AMOUNT);
+            auto const finishResult = withTokenEscrow ? Ter(tesSUCCESS) : Ter(tecNO_TARGET);
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
+            env(escrow::create(alice, bob, usd(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
+                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::condition(escrow::cb2),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
+            env(escrow::create(alice, bob, usd(1'000)),
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::cancel(bob, alice, seq2), finishResult);
@@ -154,25 +154,25 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, bob, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, bob, usd(5000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_TARGET));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_TARGET));
             env.close();
 
-            env(escrow::cancel(bob, alice, seq1), ter(tecNO_TARGET));
+            env(escrow::cancel(bob, alice, seq1), Ter(tecNO_TARGET));
             env.close();
         }
     }
@@ -190,56 +190,56 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(5000), alice, bob, gw);
         env(fset(gw, asfAllowTrustLineLocking));
         env.close();
-        env.trust(USD(10'000), alice, bob);
+        env.trust(usd(10'000), alice, bob);
         env.close();
-        env(pay(gw, alice, USD(5000)));
-        env(pay(gw, bob, USD(5000)));
+        env(pay(gw, alice, usd(5000)));
+        env(pay(gw, bob, usd(5000)));
         env.close();
 
         // Create Escrow #1 & #2
         auto const seq1 = env.seq(alice);
-        env(escrow::create(alice, bob, USD(1'000)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150),
-            ter(tesSUCCESS));
+        env(escrow::create(alice, bob, usd(1'000)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-            escrow::cancel_time(env.now() + 3s),
-            fee(baseFee),
-            ter(tesSUCCESS));
+        env(escrow::create(alice, bob, usd(1'000)),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCANCEL_TIME(env.now() + 3s),
+            Fee(baseFee),
+            Ter(tesSUCCESS));
         env.close();
 
         // Clear the asfAllowTrustLineLocking flag
         env(fclear(gw, asfAllowTrustLineLocking));
         env.close();
-        env.require(nflags(gw, asfAllowTrustLineLocking));
+        env.require(Nflags(gw, asfAllowTrustLineLocking));
 
         // Cannot Create Escrow without asfAllowTrustLineLocking
-        env(escrow::create(alice, bob, USD(1'000)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150),
-            ter(tecNO_PERMISSION));
+        env(escrow::create(alice, bob, usd(1'000)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(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::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150),
-            ter(tesSUCCESS));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFULFILLMENT(escrow::kFB1),
+            Fee(baseFee * 150),
+            Ter(tesSUCCESS));
         env.close();
 
         // Can cancel the escrow created before the flag was cleared
-        env(escrow::cancel(bob, alice, seq2), ter(tesSUCCESS));
+        env(escrow::cancel(bob, alice, seq2), Ter(tesSUCCESS));
         env.close();
     }
 
@@ -256,13 +256,13 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::finish_time(env.now() + 1s),
-                fee(XRP(-1)),
-                ter(temBAD_FEE));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(XRP(-1)),
+                Ter(temBAD_FEE));
             env.close();
         }
 
@@ -273,14 +273,14 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
 
-            env(escrow::create(alice, bob, USD(-1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(temBAD_AMOUNT));
+            env(escrow::create(alice, bob, usd(-1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(temBAD_AMOUNT));
             env.close();
         }
 
@@ -291,14 +291,14 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const BAD = IOU(gw, badCurrency());
+            auto const bad = IOU(gw, badCurrency());
             env.fund(XRP(5000), alice, bob, gw);
 
-            env(escrow::create(alice, bob, BAD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(temBAD_CURRENCY));
+            env(escrow::create(alice, bob, bad(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(temBAD_CURRENCY));
             env.close();
         }
     }
@@ -317,14 +317,14 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
 
-            env(escrow::create(gw, alice, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, alice, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -335,16 +335,16 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob);
             env.close();
             env.memoize(gw);
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_ISSUER));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_ISSUER));
             env.close();
         }
 
@@ -355,20 +355,20 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, bob, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, bob, usd(5000)));
             env.close();
 
-            env(escrow::create(gw, alice, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, alice, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -379,15 +379,15 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_LINE));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_LINE));
             env.close();
         }
 
@@ -400,19 +400,19 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env(fset(gw, asfRequireAuth));
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -423,21 +423,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const aliceUSD = alice["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env(fset(gw, asfRequireAuth));
             env.close();
-            env(trust(gw, aliceUSD(10'000)), txflags(tfSetfAuth));
-            env.trust(USD(10'000), alice, bob);
+            env(trust(gw, aliceUSD(10'000)), Txflags(tfSetfAuth));
+            env.trust(usd(10'000), alice, bob);
             env.close();
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -448,27 +448,27 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // set freeze on alice trustline
-            env(trust(gw, USD(10'000), alice, tfSetFreeze));
+            env(trust(gw, usd(10'000), alice, tfSetFreeze));
             env.close();
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
         }
 
@@ -479,27 +479,27 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze));
             env.close();
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
         }
 
@@ -510,20 +510,20 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
 
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_FUNDS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
         }
 
@@ -534,23 +534,23 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
-            env(escrow::create(alice, bob, USD(10'001)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_FUNDS));
+            env(escrow::create(alice, bob, usd(10'001)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
         }
 
@@ -560,27 +560,27 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100000000000000000), alice);
-            env.trust(USD(100000000000000000), bob);
+            env.trust(usd(100000000000000000), alice);
+            env.trust(usd(100000000000000000), bob);
             env.close();
-            env(pay(gw, alice, USD(10000000000000000)));
-            env(pay(gw, bob, USD(1)));
+            env(pay(gw, alice, usd(10000000000000000)));
+            env(pay(gw, bob, usd(1)));
             env.close();
 
             bool const largeMantissa =
                 features[featureSingleAssetVault] || features[featureLendingProtocol];
 
             // alice cannot create escrow for 1/10 iou - precision loss
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
             env.close();
         }
     }
@@ -599,43 +599,43 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const aliceUSD = alice["USD"];
             auto const bobUSD = bob["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env(fset(gw, asfRequireAuth));
             env.close();
-            env(trust(gw, aliceUSD(10'000)), txflags(tfSetfAuth));
-            env(trust(gw, bobUSD(10'000)), txflags(tfSetfAuth));
-            env.trust(USD(10'000), alice, bob);
+            env(trust(gw, aliceUSD(10'000)), Txflags(tfSetfAuth));
+            env(trust(gw, bobUSD(10'000)), Txflags(tfSetfAuth));
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env(pay(bob, gw, USD(10'000)));
-            env(trust(gw, bobUSD(0)), txflags(tfSetfAuth));
-            env(trust(bob, USD(0)));
+            env(pay(bob, gw, usd(10'000)));
+            env(trust(gw, bobUSD(0)), Txflags(tfSetfAuth));
+            env(trust(bob, usd(0)));
             env.close();
 
-            env.trust(USD(10'000), bob);
+            env.trust(usd(10'000), bob);
             env.close();
 
             // bob cannot finish because he is not authorized
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -646,33 +646,33 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
 
             // bob cannot finish because of deep freeze
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
         }
     }
@@ -693,31 +693,31 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, gw);
             env.fund(acctReserve + (incReserve - 1), bob);
             env.close();
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice);
+            env.trust(usd(10'000), alice);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(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::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_LINE_INSUF_RESERVE));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_LINE_INSUF_RESERVE));
             env.close();
         }
 
@@ -728,30 +728,30 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env.close();
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice);
+            env.trust(usd(10'000), alice);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(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::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_LINE));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_LINE));
             env.close();
         }
 
@@ -762,33 +762,33 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env.close();
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(1000)));
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(5)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(5)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env.trust(USD(1), bob);
+            env.trust(usd(1), bob);
             env.close();
 
             // alice cannot finish because bob's limit is too low
             env(escrow::finish(alice, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecLIMIT_EXCEEDED));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecLIMIT_EXCEEDED));
             env.close();
         }
 
@@ -799,39 +799,39 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env.close();
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(1000)));
+            env(pay(gw, alice, usd(1000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(5)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(5)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env.trust(USD(1), bob);
+            env.trust(usd(1), bob);
             env.close();
 
             // bob can finish even if bob's limit is too low
-            auto const bobPreLimit = env.limit(bob, USD);
+            auto const bobPreLimit = env.limit(bob, usd);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // bob's limit is not changed
-            BEAST_EXPECT(env.limit(bob, USD) == bobPreLimit);
+            BEAST_EXPECT(env.limit(bob, usd) == bobPreLimit);
         }
     }
 
@@ -849,39 +849,39 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             auto const aliceUSD = alice["USD"];
             auto const bobUSD = bob["USD"];
             env.fund(XRP(5000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env(fset(gw, asfRequireAuth));
             env.close();
-            env(trust(gw, aliceUSD(10'000)), txflags(tfSetfAuth));
-            env(trust(gw, bobUSD(10'000)), txflags(tfSetfAuth));
-            env.trust(USD(10'000), alice, bob);
+            env(trust(gw, aliceUSD(10'000)), Txflags(tfSetfAuth));
+            env(trust(gw, bobUSD(10'000)), Txflags(tfSetfAuth));
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                Fee(baseFee),
+                Ter(tesSUCCESS));
             env.close();
 
-            env(pay(alice, gw, USD(9'999)));
-            env(trust(gw, aliceUSD(0)), txflags(tfSetfAuth));
-            env(trust(alice, USD(0)));
+            env(pay(alice, gw, usd(9'999)));
+            env(trust(gw, aliceUSD(0)), Txflags(tfSetfAuth));
+            env(trust(alice, usd(0)));
             env.close();
 
-            env.trust(USD(10'000), alice);
+            env.trust(usd(10'000), alice);
             env.close();
 
             // alice cannot cancel because she is not authorized
-            env(escrow::cancel(bob, alice, seq1), fee(baseFee), ter(tecNO_AUTH));
+            env(escrow::cancel(bob, alice, seq1), Fee(baseFee), Ter(tecNO_AUTH));
             env.close();
         }
     }
@@ -899,79 +899,79 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(5000), alice, bob, gw);
         env(fset(gw, asfAllowTrustLineLocking));
         env.close();
-        env.trust(USD(10'000), alice, bob);
+        env.trust(usd(10'000), alice, bob);
         env.close();
-        env(pay(gw, alice, USD(5'000)));
-        env(pay(gw, bob, USD(5'000)));
+        env(pay(gw, alice, usd(5'000)));
+        env(pay(gw, bob, usd(5'000)));
         env.close();
 
-        auto const outstandingUSD = USD(10'000);
+        auto const outstandingUSD = usd(10'000);
 
         // Create & Finish Escrow
         auto const seq1 = env.seq(alice);
         {
-            auto const preAliceUSD = env.balance(alice, USD);
-            auto const preBobUSD = env.balance(bob, USD);
-            env(escrow::create(alice, bob, USD(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAliceUSD - USD(1'000));
-            BEAST_EXPECT(env.balance(bob, USD) == preBobUSD);
-            BEAST_EXPECT(issuerBalance(env, gw, USD) == outstandingUSD - USD(1'000));
-            BEAST_EXPECT(issuerEscrowed(env, gw, USD) == USD(1'000));
+            BEAST_EXPECT(env.balance(alice, usd) == preAliceUSD - usd(1'000));
+            BEAST_EXPECT(env.balance(bob, usd) == preBobUSD);
+            BEAST_EXPECT(issuerBalance(env, gw, usd) == outstandingUSD - usd(1'000));
+            BEAST_EXPECT(issuerEscrowed(env, gw, usd) == usd(1'000));
         }
         {
-            auto const preAliceUSD = env.balance(alice, USD);
-            auto const preBobUSD = env.balance(bob, USD);
+            auto const preAliceUSD = env.balance(alice, usd);
+            auto const preBobUSD = env.balance(bob, usd);
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAliceUSD);
-            BEAST_EXPECT(env.balance(bob, USD) == preBobUSD + USD(1'000));
-            BEAST_EXPECT(issuerBalance(env, gw, USD) == outstandingUSD);
-            BEAST_EXPECT(issuerEscrowed(env, gw, USD) == USD(0));
+            BEAST_EXPECT(env.balance(alice, usd) == preAliceUSD);
+            BEAST_EXPECT(env.balance(bob, usd) == preBobUSD + usd(1'000));
+            BEAST_EXPECT(issuerBalance(env, gw, usd) == outstandingUSD);
+            BEAST_EXPECT(issuerEscrowed(env, gw, usd) == usd(0));
         }
 
         // Create & Cancel Escrow
         auto const seq2 = env.seq(alice);
         {
-            auto const preAliceUSD = env.balance(alice, USD);
-            auto const preBobUSD = env.balance(bob, USD);
-            env(escrow::create(alice, bob, USD(1'000)),
-                escrow::condition(escrow::cb2),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAliceUSD - USD(1'000));
-            BEAST_EXPECT(env.balance(bob, USD) == preBobUSD);
-            BEAST_EXPECT(issuerBalance(env, gw, USD) == outstandingUSD - USD(1'000));
-            BEAST_EXPECT(issuerEscrowed(env, gw, USD) == USD(1'000));
+            BEAST_EXPECT(env.balance(alice, usd) == preAliceUSD - usd(1'000));
+            BEAST_EXPECT(env.balance(bob, usd) == preBobUSD);
+            BEAST_EXPECT(issuerBalance(env, gw, usd) == outstandingUSD - usd(1'000));
+            BEAST_EXPECT(issuerEscrowed(env, gw, usd) == usd(1'000));
         }
         {
-            auto const preAliceUSD = env.balance(alice, USD);
-            auto const preBobUSD = env.balance(bob, USD);
-            env(escrow::cancel(bob, alice, seq2), ter(tesSUCCESS));
+            auto const preAliceUSD = env.balance(alice, usd);
+            auto const preBobUSD = env.balance(bob, usd);
+            env(escrow::cancel(bob, alice, seq2), Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAliceUSD + USD(1'000));
-            BEAST_EXPECT(env.balance(bob, USD) == preBobUSD);
-            BEAST_EXPECT(issuerBalance(env, gw, USD) == outstandingUSD);
-            BEAST_EXPECT(issuerEscrowed(env, gw, USD) == USD(0));
+            BEAST_EXPECT(env.balance(alice, usd) == preAliceUSD + usd(1'000));
+            BEAST_EXPECT(env.balance(bob, usd) == preBobUSD);
+            BEAST_EXPECT(issuerBalance(env, gw, usd) == outstandingUSD);
+            BEAST_EXPECT(issuerEscrowed(env, gw, usd) == usd(0));
         }
     }
 
@@ -985,7 +985,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         {
             testcase("IOU Metadata to self");
 
@@ -993,18 +993,18 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(5000), alice, bob, carol, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob, carol);
+            env.trust(usd(10'000), alice, bob, carol);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, bob, USD(5000)));
-            env(pay(gw, carol, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, bob, usd(5000)));
+            env(pay(gw, carol, usd(5000)));
             env.close();
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, alice, USD(1'000)),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 500s));
+            env(escrow::create(alice, alice, usd(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 500s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1026,9 +1026,9 @@ struct EscrowToken_test : public beast::unit_test::suite
                     std::find(iod.begin(), iod.end(), aa) != iod.end());
             }
 
-            env(escrow::create(bob, bob, USD(1'000)),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+            env(escrow::create(bob, bob, usd(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1104,22 +1104,22 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(5000), alice, bob, carol, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob, carol);
+            env.trust(usd(10'000), alice, bob, carol);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, bob, USD(5000)));
-            env(pay(gw, carol, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, bob, usd(5000)));
+            env(pay(gw, carol, usd(5000)));
             env.close();
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, bob, USD(1'000)), escrow::finish_time(env.now() + 1s));
+            env(escrow::create(alice, bob, usd(1'000)), escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+            env(escrow::create(bob, carol, usd(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1238,22 +1238,22 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(5000), alice, carol, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, carol);
+            env.trust(usd(10'000), alice, carol);
             env.close();
-            env(pay(gw, alice, USD(5000)));
-            env(pay(gw, carol, USD(5000)));
+            env(pay(gw, alice, usd(5000)));
+            env(pay(gw, carol, usd(5000)));
             env.close();
             auto const aseq = env.seq(alice);
 
-            env(escrow::create(alice, gw, USD(1'000)), escrow::finish_time(env.now() + 1s));
+            env(escrow::create(alice, gw, usd(1'000)), escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, carol, usd(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                Ter(tecNO_PERMISSION));
             env.close(5s);
 
             auto const ag = env.le(keylet::escrow(alice.id(), aseq));
@@ -1370,47 +1370,47 @@ struct EscrowToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
             auto const baseFee = env.current()->fees().base;
-            auto const USD = t.gw["USD"];
+            auto const usd = t.gw["USD"];
             env.fund(XRP(5000), t.src, t.dst, t.gw);
             env(fset(t.gw, asfAllowTrustLineLocking));
             env.close();
 
             if (t.hasTrustline)
             {
-                env.trust(USD(100'000), t.src, t.dst);
+                env.trust(usd(100'000), t.src, t.dst);
             }
             else
             {
-                env.trust(USD(100'000), t.src);
+                env.trust(usd(100'000), t.src);
             }
             env.close();
 
-            env(pay(t.gw, t.src, USD(10'000)));
+            env(pay(t.gw, t.src, usd(10'000)));
             if (t.hasTrustline)
-                env(pay(t.gw, t.dst, USD(10'000)));
+                env(pay(t.gw, t.dst, usd(10'000)));
             env.close();
 
             // src can create escrow
             auto const seq1 = env.seq(t.src);
-            auto const delta = USD(1'000);
+            auto const delta = usd(1'000);
             env(escrow::create(t.src, t.dst, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // dst can finish escrow
-            auto const preSrc = env.balance(t.src, USD);
-            auto const preDst = env.balance(t.dst, USD);
+            auto const preSrc = env.balance(t.src, usd);
+            auto const preDst = env.balance(t.dst, usd);
 
             env(escrow::finish(t.dst, t.src, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(t.src, USD) == preSrc);
-            BEAST_EXPECT(env.balance(t.dst, USD) == preDst + delta);
+            BEAST_EXPECT(env.balance(t.src, usd) == preSrc);
+            BEAST_EXPECT(env.balance(t.dst, usd) == preDst + delta);
         }
     }
 
@@ -1434,22 +1434,22 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const alice = Account{"alice"};
             Env env{*this, features};
             auto const baseFee = env.current()->fees().base;
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(5000), alice, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100'000), alice);
+            env.trust(usd(100'000), alice);
             env.close();
 
-            env(pay(gw, alice, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
             // issuer cannot create escrow
-            env(escrow::create(gw, alice, USD(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, alice, usd(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -1469,43 +1469,43 @@ struct EscrowToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
             auto const baseFee = env.current()->fees().base;
-            auto const USD = t.dst["USD"];
+            auto const usd = t.dst["USD"];
             env.fund(XRP(5000), t.dst, t.src);
             env(fset(t.dst, asfAllowTrustLineLocking));
             env.close();
 
-            env.trust(USD(100'000), t.src);
+            env.trust(usd(100'000), t.src);
             env.close();
 
-            env(pay(t.dst, t.src, USD(10'000)));
+            env(pay(t.dst, t.src, usd(10'000)));
             env.close();
 
             // issuer can receive escrow
             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::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            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),
+                Fee(baseFee * 150));
             env.close();
 
             // issuer can finish escrow, no dest trustline
             env(escrow::finish(t.dst, t.src, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
             auto const preAmount = 10'000;
-            BEAST_EXPECT(preSrc == USD(preAmount));
+            BEAST_EXPECT(preSrc == usd(preAmount));
             auto const postAmount = 9000;
-            BEAST_EXPECT(env.balance(t.src, USD) == USD(postAmount));
-            BEAST_EXPECT(env.balance(t.dst, USD) == USD(0));
+            BEAST_EXPECT(env.balance(t.src, usd) == usd(postAmount));
+            BEAST_EXPECT(env.balance(t.dst, usd) == usd(0));
         }
 
         // issuer is source and destination
         {
             auto const gw = Account{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             Env env{*this, features};
             auto const baseFee = env.current()->fees().base;
             env.fund(XRP(5000), gw);
@@ -1513,11 +1513,11 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.close();
 
             // issuer cannot receive escrow
-            env(escrow::create(gw, gw, USD(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, gw, usd(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
     }
@@ -1533,7 +1533,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // test locked rate
         {
@@ -1543,34 +1543,34 @@ struct EscrowToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineLocking));
             env(rate(gw, 1.25));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, USD);
+            auto const preAlice = env.balance(alice, usd);
             auto const seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
 
             // bob can finish escrow
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAlice - delta);
-            BEAST_EXPECT(env.balance(bob, USD) == USD(10'100));
+            BEAST_EXPECT(env.balance(alice, usd) == preAlice - delta);
+            BEAST_EXPECT(env.balance(bob, usd) == usd(10'100));
         }
         // test rate change - higher
         {
@@ -1580,21 +1580,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineLocking));
             env(rate(gw, 1.25));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, USD);
+            auto const preAlice = env.balance(alice, usd);
             auto const seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
@@ -1605,13 +1605,13 @@ struct EscrowToken_test : public beast::unit_test::suite
 
             // bob can finish escrow - rate unchanged
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAlice - delta);
-            BEAST_EXPECT(env.balance(bob, USD) == USD(10'100));
+            BEAST_EXPECT(env.balance(alice, usd) == preAlice - delta);
+            BEAST_EXPECT(env.balance(bob, usd) == usd(10'100));
         }
 
         // test rate change - lower
@@ -1622,21 +1622,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineLocking));
             env(rate(gw, 1.25));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, USD);
+            auto const preAlice = env.balance(alice, usd);
             auto const seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
@@ -1647,13 +1647,13 @@ struct EscrowToken_test : public beast::unit_test::suite
 
             // bob can finish escrow - rate changed
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAlice - delta);
-            BEAST_EXPECT(env.balance(bob, USD) == USD(10125));
+            BEAST_EXPECT(env.balance(alice, usd) == preAlice - delta);
+            BEAST_EXPECT(env.balance(bob, usd) == usd(10125));
         }
 
         // test cancel doesn't charge rate
@@ -1664,21 +1664,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineLocking));
             env(rate(gw, 1.25));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, USD);
+            auto const preAlice = env.balance(alice, usd);
             auto const seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 3s),
-                fee(baseFee));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 3s),
+                Fee(baseFee));
             env.close();
             auto transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
@@ -1688,11 +1688,11 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.close();
 
             // alice can cancel escrow - rate is not charged
-            env(escrow::cancel(alice, alice, seq1), fee(baseFee));
+            env(escrow::cancel(alice, alice, seq1), Fee(baseFee));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == preAlice);
-            BEAST_EXPECT(env.balance(bob, USD) == USD(10000));
+            BEAST_EXPECT(env.balance(alice, usd) == preAlice);
+            BEAST_EXPECT(env.balance(bob, usd) == usd(10000));
         }
     }
 
@@ -1706,7 +1706,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // test LimitAmount
         {
@@ -1715,29 +1715,29 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(10'000), alice, bob);
+            env.trust(usd(10'000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(1'000)));
-            env(pay(gw, bob, USD(1'000)));
+            env(pay(gw, alice, usd(1'000)));
+            env(pay(gw, bob, usd(1'000)));
             env.close();
 
             // alice can create escrow
             auto seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // bob can finish
-            auto const preBobLimit = env.limit(bob, USD);
+            auto const preBobLimit = env.limit(bob, usd);
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
-            auto const postBobLimit = env.limit(bob, USD);
+            auto const postBobLimit = env.limit(bob, usd);
             // bob's limit is NOT changed
             BEAST_EXPECT(postBobLimit == preBobLimit);
         }
@@ -1754,7 +1754,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         auto const aliceUSD = alice["USD"];
         auto const bobUSD = bob["USD"];
@@ -1765,43 +1765,43 @@ struct EscrowToken_test : public beast::unit_test::suite
         env(fset(gw, asfAllowTrustLineLocking));
         env(fset(gw, asfRequireAuth));
         env.close();
-        env(trust(gw, aliceUSD(10'000)), txflags(tfSetfAuth));
-        env(trust(alice, USD(10'000)));
-        env(trust(bob, USD(10'000)));
+        env(trust(gw, aliceUSD(10'000)), Txflags(tfSetfAuth));
+        env(trust(alice, usd(10'000)));
+        env(trust(bob, usd(10'000)));
         env.close();
-        env(pay(gw, alice, USD(1'000)));
+        env(pay(gw, alice, usd(1'000)));
         env.close();
 
         // alice cannot create escrow - fails without auth
         auto seq1 = env.seq(alice);
-        auto const delta = USD(125);
+        auto const delta = usd(125);
         env(escrow::create(alice, bob, delta),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150),
-            ter(tecNO_AUTH));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150),
+            Ter(tecNO_AUTH));
         env.close();
 
         // set auth on bob
-        env(trust(gw, bobUSD(10'000)), txflags(tfSetfAuth));
-        env(trust(bob, USD(10'000)));
+        env(trust(gw, bobUSD(10'000)), Txflags(tfSetfAuth));
+        env(trust(bob, usd(10'000)));
         env.close();
-        env(pay(gw, bob, USD(1'000)));
+        env(pay(gw, bob, usd(1'000)));
         env.close();
 
         // alice can create escrow - bob has auth
         seq1 = env.seq(alice);
         env(escrow::create(alice, bob, delta),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150));
         env.close();
 
         // bob can finish
         env(escrow::finish(bob, alice, seq1),
-            escrow::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFULFILLMENT(escrow::kFB1),
+            Fee(baseFee * 150));
         env.close();
     }
 
@@ -1816,7 +1816,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // test Global Freeze
         {
@@ -1825,25 +1825,25 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
             env(fset(gw, asfGlobalFreeze));
             env.close();
 
             // setup transaction
             auto seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
 
             // clear global freeze
@@ -1853,9 +1853,9 @@ struct EscrowToken_test : public beast::unit_test::suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set global freeze
@@ -1864,9 +1864,9 @@ struct EscrowToken_test : public beast::unit_test::suite
 
             // bob finish escrow success regardless of frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
             // clear global freeze
@@ -1876,9 +1876,9 @@ struct EscrowToken_test : public beast::unit_test::suite
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::cancel_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set global freeze
@@ -1886,7 +1886,7 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.close();
 
             // bob cancel escrow success regardless of frozen assets
-            env(escrow::cancel(bob, alice, seq1), fee(baseFee));
+            env(escrow::cancel(bob, alice, seq1), Fee(baseFee));
             env.close();
         }
 
@@ -1898,71 +1898,71 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // set freeze on alice trustline
-            env(trust(gw, USD(10'000), alice, tfSetFreeze));
+            env(trust(gw, usd(10'000), alice, tfSetFreeze));
             env.close();
 
             // setup transaction
             auto seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
 
             // clear freeze on alice trustline
-            env(trust(gw, USD(10'000), alice, tfClearFreeze));
+            env(trust(gw, usd(10'000), alice, tfClearFreeze));
             env.close();
 
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze));
             env.close();
 
             // bob finish escrow success regardless of frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
             // reset freeze on bob and alice trustline
-            env(trust(gw, USD(10'000), alice, tfClearFreeze));
-            env(trust(gw, USD(10'000), bob, tfClearFreeze));
+            env(trust(gw, usd(10'000), alice, tfClearFreeze));
+            env(trust(gw, usd(10'000), bob, tfClearFreeze));
             env.close();
 
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::cancel_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze));
             env.close();
 
             // bob cancel escrow success regardless of frozen assets
-            env(escrow::cancel(bob, alice, seq1), fee(baseFee));
+            env(escrow::cancel(bob, alice, seq1), Fee(baseFee));
             env.close();
         }
 
@@ -1974,72 +1974,72 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env(trust(alice, USD(100'000)));
-            env(trust(bob, USD(100'000)));
+            env(trust(alice, usd(100'000)));
+            env(trust(bob, usd(100'000)));
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // set freeze on alice trustline
-            env(trust(gw, USD(10'000), alice, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(gw, usd(10'000), alice, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // setup transaction
             auto seq1 = env.seq(alice);
-            auto const delta = USD(125);
+            auto const delta = usd(125);
 
             // create escrow fails - frozen trustline
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
 
             // clear freeze on alice trustline
-            env(trust(gw, USD(10'000), alice, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(gw, usd(10'000), alice, tfClearFreeze | tfClearDeepFreeze));
             env.close();
 
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // bob finish escrow fails because of deep frozen assets
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecFROZEN));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecFROZEN));
             env.close();
 
             // reset freeze on alice and bob trustline
-            env(trust(gw, USD(10'000), alice, tfClearFreeze | tfClearDeepFreeze));
-            env(trust(gw, USD(10'000), bob, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(gw, usd(10'000), alice, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(gw, usd(10'000), bob, tfClearFreeze | tfClearDeepFreeze));
             env.close();
 
             // create escrow success
             seq1 = env.seq(alice);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::cancel_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // set freeze on bob trustline
-            env(trust(gw, USD(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(gw, usd(10'000), bob, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // bob cancel escrow fails because of deep frozen assets
-            env(escrow::cancel(bob, alice, seq1), fee(baseFee), ter(tesSUCCESS));
+            env(escrow::cancel(bob, alice, seq1), Fee(baseFee), Ter(tesSUCCESS));
             env.close();
         }
     }
@@ -2054,7 +2054,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         {
             // test tecPATH_PARTIAL
             // ie. has 10'000, escrow 1'000 then try to pay 10'000
@@ -2063,21 +2063,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
             // create escrow success
-            auto const delta = USD(1'000);
+            auto const delta = usd(1'000);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
-            env(pay(alice, gw, USD(10'000)), ter(tecPATH_PARTIAL));
+            env(pay(alice, gw, usd(10'000)), Ter(tecPATH_PARTIAL));
         }
         {
             // test tecINSUFFICIENT_FUNDS
@@ -2087,25 +2087,25 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100'000), alice);
-            env.trust(USD(100'000), bob);
+            env.trust(usd(100'000), alice);
+            env.trust(usd(100'000), bob);
             env.close();
-            env(pay(gw, alice, USD(10'000)));
-            env(pay(gw, bob, USD(10'000)));
+            env(pay(gw, alice, usd(10'000)));
+            env(pay(gw, bob, usd(10'000)));
             env.close();
 
-            auto const delta = USD(1'000);
+            auto const delta = usd(1'000);
             env(escrow::create(alice, bob, delta),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
-            env(escrow::create(alice, bob, USD(10'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_FUNDS));
+            env(escrow::create(alice, bob, usd(10'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
         }
     }
@@ -2120,7 +2120,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // test min create precision loss
         {
@@ -2129,37 +2129,37 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, gw);
             env(fset(gw, asfAllowTrustLineLocking));
             env.close();
-            env.trust(USD(100000000000000000), alice);
-            env.trust(USD(100000000000000000), bob);
+            env.trust(usd(100000000000000000), alice);
+            env.trust(usd(100000000000000000), bob);
             env.close();
-            env(pay(gw, alice, USD(10000000000000000)));
-            env(pay(gw, bob, USD(1)));
+            env(pay(gw, alice, usd(10000000000000000)));
+            env(pay(gw, bob, usd(1)));
             env.close();
 
             bool const largeMantissa =
                 features[featureSingleAssetVault] || features[featureLendingProtocol];
 
             // alice cannot create escrow for 1/10 iou - precision loss
-            env(escrow::create(alice, bob, USD(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
+            env(escrow::create(alice, bob, usd(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(largeMantissa ? (TER)tesSUCCESS : (TER)tecPRECISION_LOSS));
             env.close();
 
             auto const seq1 = env.seq(alice);
             // alice can create escrow for 1'000 iou
-            env(escrow::create(alice, bob, USD(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, bob, usd(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // bob finish escrow success
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
         }
     }
@@ -2186,32 +2186,32 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
-            auto const createResult = withTokenEscrow ? ter(tesSUCCESS) : ter(temBAD_AMOUNT);
-            auto const finishResult = withTokenEscrow ? ter(tesSUCCESS) : ter(tecNO_TARGET);
+            auto const createResult = withTokenEscrow ? Ter(tesSUCCESS) : Ter(temBAD_AMOUNT);
+            auto const finishResult = withTokenEscrow ? Ter(tesSUCCESS) : Ter(tecNO_TARGET);
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
+            env(escrow::create(alice, bob, mpt(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
+                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::condition(escrow::cb2),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
+            env(escrow::create(alice, bob, mpt(1'000)),
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                Fee(baseFee * 150),
                 createResult);
             env.close();
             env(escrow::cancel(bob, alice, seq2), finishResult);
@@ -2236,17 +2236,17 @@ struct EscrowToken_test : public beast::unit_test::suite
             auto const gw = Account("gw");
             env.fund(XRP(1'000), alice, bob, gw);
 
-            Json::Value jv = escrow::create(alice, bob, XRP(1));
+            json::Value jv = escrow::create(alice, bob, XRP(1));
             jv.removeMember(jss::Amount);
             jv[jss::Amount][jss::mpt_issuance_id] =
                 "00000004A407AF5856CCF3C42619DAA925813FC955C72983";
             jv[jss::Amount][jss::value] = "-1";
 
-            auto const result = withMPT ? ter(temBAD_AMOUNT) : ter(temDISABLED);
+            auto const result = withMPT ? Ter(temBAD_AMOUNT) : Ter(temDISABLED);
             env(jv,
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
                 result);
             env.close();
         }
@@ -2264,16 +2264,16 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
-            env(escrow::create(alice, bob, MPT(-1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(temBAD_AMOUNT));
+            env(escrow::create(alice, bob, mpt(-1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(temBAD_AMOUNT));
             env.close();
         }
     }
@@ -2296,15 +2296,15 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
-            env(escrow::create(gw, alice, MPT(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(gw, alice, mpt(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -2319,14 +2319,14 @@ struct EscrowToken_test : public beast::unit_test::suite
             env.close();
 
             auto const mpt = xrpl::test::jtx::MPT(alice.name(), makeMptID(env.seq(alice), alice));
-            Json::Value jv = escrow::create(alice, bob, mpt(2));
+            json::Value jv = escrow::create(alice, bob, mpt(2));
             jv[jss::Amount][jss::mpt_issuance_id] =
                 "00000004A407AF5856CCF3C42619DAA925813FC955C72983";
             env(jv,
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecOBJECT_NOT_FOUND));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecOBJECT_NOT_FOUND));
             env.close();
         }
 
@@ -2342,16 +2342,16 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create({.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
-            env(escrow::create(alice, bob, MPT(3)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+            env(escrow::create(alice, bob, mpt(3)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -2366,13 +2366,13 @@ struct EscrowToken_test : public beast::unit_test::suite
             MPTTester mptGw(env, gw, {.holders = {alice, bob}});
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
-            auto const MPT = mptGw["MPT"];
+            auto const mpt = mptGw["MPT"];
 
-            env(escrow::create(alice, bob, MPT(4)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecOBJECT_NOT_FOUND));
+            env(escrow::create(alice, bob, mpt(4)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecOBJECT_NOT_FOUND));
             env.close();
         }
 
@@ -2391,18 +2391,18 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer | tfMPTRequireAuth});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = gw, .holder = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             // unauthorize account
             mptGw.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
 
-            env(escrow::create(alice, bob, MPT(5)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+            env(escrow::create(alice, bob, mpt(5)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -2423,19 +2423,19 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.authorize({.account = gw, .holder = alice});
             mptGw.authorize({.account = bob});
             mptGw.authorize({.account = gw, .holder = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // unauthorize dest
             mptGw.authorize({.account = gw, .holder = bob, .flags = tfMPTUnauthorize});
 
-            env(escrow::create(alice, bob, MPT(6)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+            env(escrow::create(alice, bob, mpt(6)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -2454,19 +2454,19 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer | tfMPTCanLock});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // lock account
             mptGw.set({.account = gw, .holder = alice, .flags = tfMPTLock});
 
-            env(escrow::create(alice, bob, MPT(7)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecLOCKED));
+            env(escrow::create(alice, bob, mpt(7)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecLOCKED));
             env.close();
         }
 
@@ -2485,19 +2485,19 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer | tfMPTCanLock});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // lock dest
             mptGw.set({.account = gw, .holder = bob, .flags = tfMPTLock});
 
-            env(escrow::create(alice, bob, MPT(8)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecLOCKED));
+            env(escrow::create(alice, bob, mpt(8)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecLOCKED));
             env.close();
         }
 
@@ -2513,16 +2513,16 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create({.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
-            env(escrow::create(alice, bob, MPT(9)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+            env(escrow::create(alice, bob, mpt(9)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -2539,15 +2539,15 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, bob, MPT(10)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, bob, mpt(10)));
             env.close();
 
-            env(escrow::create(alice, bob, MPT(11)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_FUNDS));
+            env(escrow::create(alice, bob, mpt(11)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
         }
 
@@ -2564,16 +2564,16 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10)));
-            env(pay(gw, bob, MPT(10)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10)));
+            env(pay(gw, bob, mpt(10)));
             env.close();
 
-            env(escrow::create(alice, bob, MPT(11)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_FUNDS));
+            env(escrow::create(alice, bob, mpt(11)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
         }
     }
@@ -2602,27 +2602,27 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.authorize({.account = gw, .holder = alice});
             mptGw.authorize({.account = bob});
             mptGw.authorize({.account = gw, .holder = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // unauthorize dest
             mptGw.authorize({.account = gw, .holder = bob, .flags = tfMPTUnauthorize});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_AUTH));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -2637,7 +2637,7 @@ struct EscrowToken_test : public beast::unit_test::suite
 
             auto const seq1 = env.seq(alice);
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                Sandbox sb(&view, tapNONE);
+                Sandbox sb(&view, TapNone);
                 auto sleNew = std::make_shared<SLE>(keylet::escrow(alice, seq1));
                 MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
                 STAmount const amt(mpt, 10);
@@ -2649,10 +2649,10 @@ struct EscrowToken_test : public beast::unit_test::suite
             });
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecOBJECT_NOT_FOUND));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecOBJECT_NOT_FOUND));
             env.close();
         }
 
@@ -2671,27 +2671,27 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer | tfMPTCanLock});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(8)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(8)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // lock dest
             mptGw.set({.account = gw, .holder = bob, .flags = tfMPTLock});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecLOCKED));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecLOCKED));
             env.close();
         }
     }
@@ -2720,23 +2720,23 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecINSUFFICIENT_RESERVE));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecINSUFFICIENT_RESERVE));
             env.close();
         }
 
@@ -2754,23 +2754,23 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
         }
 
@@ -2789,23 +2789,23 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(carol, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
     }
@@ -2834,23 +2834,23 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.authorize({.account = gw, .holder = alice});
             mptGw.authorize({.account = bob});
             mptGw.authorize({.account = gw, .holder = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::cancel_time(env.now() + 2s),
-                escrow::condition(escrow::cb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                escrow::kCONDITION(escrow::kCB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // unauthorize account
             mptGw.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
 
-            env(escrow::cancel(bob, alice, seq1), ter(tecNO_AUTH));
+            env(escrow::cancel(bob, alice, seq1), Ter(tecNO_AUTH));
             env.close();
         }
 
@@ -2864,7 +2864,7 @@ struct EscrowToken_test : public beast::unit_test::suite
 
             auto const seq1 = env.seq(alice);
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                Sandbox sb(&view, tapNONE);
+                Sandbox sb(&view, TapNone);
                 auto sleNew = std::make_shared<SLE>(keylet::escrow(alice, seq1));
                 MPTIssue const mpt{MPTIssue{makeMptID(1, AccountID(0x4985601))}};
                 STAmount const amt(mpt, 10);
@@ -2875,7 +2875,7 @@ struct EscrowToken_test : public beast::unit_test::suite
                 return true;
             });
 
-            env(escrow::cancel(bob, alice, seq1), fee(baseFee), ter(tecOBJECT_NOT_FOUND));
+            env(escrow::cancel(bob, alice, seq1), Fee(baseFee), Ter(tecOBJECT_NOT_FOUND));
             env.close();
         }
     }
@@ -2901,166 +2901,166 @@ struct EscrowToken_test : public beast::unit_test::suite
             {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
         mptGw.authorize({.account = alice});
         mptGw.authorize({.account = carol});
-        auto const MPT = mptGw["MPT"];
-        env(pay(gw, alice, MPT(10'000)));
-        env(pay(gw, carol, MPT(10'000)));
+        auto const mpt = mptGw["MPT"];
+        env(pay(gw, alice, mpt(10'000)));
+        env(pay(gw, carol, mpt(10'000)));
         env.close();
 
-        auto outstandingMPT = env.balance(gw, MPT);
+        auto outstandingMPT = env.balance(gw, mpt);
 
         // Create & Finish Escrow
         auto const seq1 = env.seq(alice);
         {
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            env(escrow::create(alice, bob, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            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) == 1'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            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) == 1'000);
         }
         {
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
+            auto const preAliceMPT = env.balance(alice, mpt);
+            auto const preBobMPT = env.balance(bob, mpt);
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT);
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(env.balance(bob, MPT) == preBobMPT + MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, bob, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT);
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT + mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
         }
 
         // Create & Cancel Escrow
         auto const seq2 = env.seq(alice);
         {
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            env(escrow::create(alice, bob, MPT(1'000)),
-                escrow::condition(escrow::cb2),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            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) == 1'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            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) == 1'000);
         }
         {
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            env(escrow::cancel(bob, alice, seq2), ter(tesSUCCESS));
+            auto const preAliceMPT = env.balance(alice, mpt);
+            auto const preBobMPT = env.balance(bob, mpt);
+            env(escrow::cancel(bob, alice, seq2), Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT + MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            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) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT + mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            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) == 0);
         }
 
         // Self Escrow Create & Finish
         {
             auto const seq = env.seq(alice);
-            auto const preAliceMPT = env.balance(alice, MPT);
-            env(escrow::create(alice, alice, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 1'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 1'000);
 
             env(escrow::finish(alice, alice, seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT);
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT);
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
         }
 
         // Self Escrow Create & Cancel
         {
             auto const seq = env.seq(alice);
-            auto const preAliceMPT = env.balance(alice, MPT);
-            env(escrow::create(alice, alice, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 1'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 1'000);
 
-            env(escrow::cancel(alice, alice, seq), ter(tesSUCCESS));
+            env(escrow::cancel(alice, alice, seq), Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT);
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT);
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
         }
 
         // Multiple Escrows
         {
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            auto const preCarolMPT = env.balance(carol, MPT);
-            env(escrow::create(alice, bob, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            auto const preAliceMPT = env.balance(alice, mpt);
+            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),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env(escrow::create(carol, bob, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(carol, bob, mpt(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            BEAST_EXPECT(env.balance(bob, MPT) == preBobMPT);
-            BEAST_EXPECT(mptEscrowed(env, bob, MPT) == 0);
-            BEAST_EXPECT(env.balance(carol, MPT) == preCarolMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, carol, MPT) == 1'000);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 2'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT);
+            BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
+            BEAST_EXPECT(env.balance(carol, mpt) == preCarolMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, carol, mpt) == 1'000);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 2'000);
         }
 
         // Max MPT Amount Issued (Escrow 1 MPT)
@@ -3076,44 +3076,44 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(maxMPTokenAmount)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(kMAX_MP_TOKEN_AMOUNT)));
             env.close();
 
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            auto const outstandingMPT = env.balance(gw, MPT);
+            auto const preAliceMPT = env.balance(alice, mpt);
+            auto const preBobMPT = env.balance(bob, mpt);
+            auto const outstandingMPT = env.balance(gw, mpt);
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(1)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, bob, mpt(1)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1);
-            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) == 1);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1);
+            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) == 1);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
             BEAST_EXPECT(
-                !env.le(keylet::mptoken(MPT.mpt(), alice))->isFieldPresent(sfLockedAmount));
-            BEAST_EXPECT(env.balance(bob, MPT) == preBobMPT + MPT(1));
-            BEAST_EXPECT(mptEscrowed(env, bob, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
-            BEAST_EXPECT(!env.le(keylet::mptIssuance(MPT.mpt()))->isFieldPresent(sfLockedAmount));
+                !env.le(keylet::mptoken(mpt.mpt(), alice))->isFieldPresent(sfLockedAmount));
+            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT + mpt(1));
+            BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
+            BEAST_EXPECT(!env.le(keylet::mptIssuance(mpt.mpt()))->isFieldPresent(sfLockedAmount));
         }
 
         // Max MPT Amount Issued (Escrow Max MPT)
@@ -3129,57 +3129,57 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(maxMPTokenAmount)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(kMAX_MP_TOKEN_AMOUNT)));
             env.close();
 
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preBobMPT = env.balance(bob, MPT);
-            auto const outstandingMPT = env.balance(gw, MPT);
+            auto const preAliceMPT = env.balance(alice, mpt);
+            auto const preBobMPT = env.balance(bob, mpt);
+            auto const outstandingMPT = env.balance(gw, mpt);
 
             // Escrow Max MPT - 10
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(maxMPTokenAmount - 10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, bob, mpt(kMAX_MP_TOKEN_AMOUNT - 10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(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::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(maxMPTokenAmount));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == maxMPTokenAmount);
-            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) == maxMPTokenAmount);
+            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(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);
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             env(escrow::finish(bob, alice, seq2),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(maxMPTokenAmount));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(env.balance(bob, MPT) == preBobMPT + MPT(maxMPTokenAmount));
-            BEAST_EXPECT(mptEscrowed(env, bob, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == outstandingMPT);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(kMAX_MP_TOKEN_AMOUNT));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(env.balance(bob, mpt) == preBobMPT + mpt(kMAX_MP_TOKEN_AMOUNT));
+            BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == outstandingMPT);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
         }
     }
 
@@ -3202,16 +3202,16 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, alice, MPT(1'000)),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 500s));
+            env(escrow::create(alice, alice, mpt(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 500s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3233,9 +3233,9 @@ struct EscrowToken_test : public beast::unit_test::suite
                     std::find(iod.begin(), iod.end(), aa) == iod.end());
             }
 
-            env(escrow::create(bob, bob, MPT(1'000)),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+            env(escrow::create(bob, bob, mpt(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3295,21 +3295,21 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
             mptGw.authorize({.account = carol});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
-            env(pay(gw, carol, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
+            env(pay(gw, carol, mpt(10'000)));
             env.close();
             auto const aseq = env.seq(alice);
             auto const bseq = env.seq(bob);
 
-            env(escrow::create(alice, bob, MPT(1'000)), escrow::finish_time(env.now() + 1s));
+            env(escrow::create(alice, bob, mpt(1'000)), escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+            env(escrow::create(bob, carol, mpt(1'000)),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -3413,40 +3413,40 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             // issuer can be destination
             auto const seq1 = env.seq(alice);
-            auto const preAliceMPT = env.balance(alice, MPT);
-            auto const preOutstanding = env.balance(gw, MPT);
-            auto const preEscrowed = issuerMPTEscrowed(env, MPT);
-            BEAST_EXPECT(preOutstanding == MPT(-10'000));
+            auto const preAliceMPT = env.balance(alice, mpt);
+            auto const preOutstanding = env.balance(gw, mpt);
+            auto const preEscrowed = issuerMPTEscrowed(env, mpt);
+            BEAST_EXPECT(preOutstanding == mpt(-10'000));
             BEAST_EXPECT(preEscrowed == 0);
 
-            env(escrow::create(alice, gw, MPT(1'000)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, gw, mpt(1'000)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 1'000);
-            BEAST_EXPECT(env.balance(gw, MPT) == preOutstanding);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == preEscrowed + 1'000);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 1'000);
+            BEAST_EXPECT(env.balance(gw, mpt) == preOutstanding);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == preEscrowed + 1'000);
 
             // issuer (dest) can finish escrow
             env(escrow::finish(gw, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAliceMPT - MPT(1'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == preOutstanding + MPT(1'000));
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == preEscrowed);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAliceMPT - mpt(1'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == preOutstanding + mpt(1'000));
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == preEscrowed);
         }
     }
 
@@ -3461,7 +3461,7 @@ struct EscrowToken_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // test locked rate: finish
         {
@@ -3479,43 +3479,43 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, MPT);
+            auto const preAlice = env.balance(alice, mpt);
             auto const seq1 = env.seq(alice);
-            auto const delta = MPT(125);
-            env(escrow::create(alice, bob, MPT(125)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            auto const delta = mpt(125);
+            env(escrow::create(alice, bob, mpt(125)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
 
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 125);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 125);
-            BEAST_EXPECT(env.balance(gw, MPT) == MPT(-20'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 125);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 125);
+            BEAST_EXPECT(env.balance(gw, mpt) == mpt(-20'000));
 
             // bob can finish escrow
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAlice - delta);
-            BEAST_EXPECT(env.balance(bob, MPT) == MPT(10'100));
+            BEAST_EXPECT(env.balance(alice, mpt) == preAlice - delta);
+            BEAST_EXPECT(env.balance(bob, mpt) == mpt(10'100));
 
             auto const escrowedWithFix = env.current()->rules().enabled(fixTokenEscrowV1) ? 0 : 25;
             auto const outstandingWithFix =
-                env.current()->rules().enabled(fixTokenEscrowV1) ? MPT(19'975) : MPT(20'000);
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == escrowedWithFix);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == escrowedWithFix);
-            BEAST_EXPECT(env.balance(gw, MPT) == -outstandingWithFix);
+                env.current()->rules().enabled(fixTokenEscrowV1) ? mpt(19'975) : mpt(20'000);
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == escrowedWithFix);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == escrowedWithFix);
+            BEAST_EXPECT(env.balance(gw, mpt) == -outstandingWithFix);
         }
 
         // test locked rate: cancel
@@ -3534,34 +3534,34 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, MPT);
-            auto const preBob = env.balance(bob, MPT);
+            auto const preAlice = env.balance(alice, mpt);
+            auto const preBob = env.balance(bob, mpt);
             auto const seq1 = env.seq(alice);
-            auto const delta = MPT(125);
-            env(escrow::create(alice, bob, MPT(125)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 3s),
-                fee(baseFee * 150));
+            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),
+                Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
 
             // alice can cancel escrow
-            env(escrow::cancel(alice, alice, seq1), fee(baseFee));
+            env(escrow::cancel(alice, alice, seq1), Fee(baseFee));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAlice);
-            BEAST_EXPECT(env.balance(bob, MPT) == preBob);
-            BEAST_EXPECT(env.balance(gw, MPT) == MPT(-20'000));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == preAlice);
+            BEAST_EXPECT(env.balance(bob, mpt) == preBob);
+            BEAST_EXPECT(env.balance(gw, mpt) == mpt(-20'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
         }
 
         // test locked rate: issuer is destination
@@ -3580,38 +3580,38 @@ struct EscrowToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             // alice can create escrow w/ xfer rate
-            auto const preAlice = env.balance(alice, MPT);
+            auto const preAlice = env.balance(alice, mpt);
             auto const seq1 = env.seq(alice);
-            auto const delta = MPT(125);
-            env(escrow::create(alice, gw, MPT(125)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            auto const delta = mpt(125);
+            env(escrow::create(alice, gw, mpt(125)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
             auto const transferRate = escrow::rate(env, alice, seq1);
             BEAST_EXPECT(transferRate.value == std::uint32_t(1'000'000'000 * 1.25));
 
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 125);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 125);
-            BEAST_EXPECT(env.balance(gw, MPT) == MPT(-20'000));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 125);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 125);
+            BEAST_EXPECT(env.balance(gw, mpt) == mpt(-20'000));
 
             // bob can finish escrow
             env(escrow::finish(gw, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == preAlice - delta);
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
-            BEAST_EXPECT(issuerMPTEscrowed(env, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == MPT(-19'875));
+            BEAST_EXPECT(env.balance(alice, mpt) == preAlice - delta);
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
+            BEAST_EXPECT(issuerMPTEscrowed(env, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == mpt(-19'875));
         }
     }
 
@@ -3637,24 +3637,24 @@ struct EscrowToken_test : public beast::unit_test::suite
         mptGw.authorize({.account = gw, .holder = alice});
         mptGw.authorize({.account = bob});
         mptGw.authorize({.account = gw, .holder = bob});
-        auto const MPT = mptGw["MPT"];
-        env(pay(gw, alice, MPT(10'000)));
+        auto const mpt = mptGw["MPT"];
+        env(pay(gw, alice, mpt(10'000)));
         env.close();
 
         auto seq = env.seq(alice);
-        auto const delta = MPT(125);
+        auto const delta = mpt(125);
         // alice can create escrow - is authorized
-        env(escrow::create(alice, bob, MPT(100)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150));
+        env(escrow::create(alice, bob, mpt(100)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150));
         env.close();
 
         // bob can finish escrow - is authorized
         env(escrow::finish(bob, alice, seq),
-            escrow::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFULFILLMENT(escrow::kFB1),
+            Fee(baseFee * 150));
         env.close();
     }
 
@@ -3678,18 +3678,18 @@ struct EscrowToken_test : public beast::unit_test::suite
              .flags = tfMPTCanEscrow | tfMPTCanTransfer | tfMPTCanLock});
         mptGw.authorize({.account = alice});
         mptGw.authorize({.account = bob});
-        auto const MPT = mptGw["MPT"];
-        env(pay(gw, alice, MPT(10'000)));
-        env(pay(gw, bob, MPT(10'000)));
+        auto const mpt = mptGw["MPT"];
+        env(pay(gw, alice, mpt(10'000)));
+        env(pay(gw, bob, mpt(10'000)));
         env.close();
 
         // alice create escrow
         auto seq1 = env.seq(alice);
-        env(escrow::create(alice, bob, MPT(100)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            escrow::cancel_time(env.now() + 2s),
-            fee(baseFee * 150));
+        env(escrow::create(alice, bob, mpt(100)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCANCEL_TIME(env.now() + 2s),
+            Fee(baseFee * 150));
         env.close();
 
         // lock account & dest
@@ -3698,10 +3698,10 @@ struct EscrowToken_test : public beast::unit_test::suite
 
         // bob cannot finish
         env(escrow::finish(bob, alice, seq1),
-            escrow::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150),
-            ter(tecLOCKED));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFULFILLMENT(escrow::kFB1),
+            Fee(baseFee * 150),
+            Ter(tecLOCKED));
         env.close();
 
         // bob can cancel
@@ -3726,35 +3726,35 @@ struct EscrowToken_test : public beast::unit_test::suite
         mptGw.create({.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow});
         mptGw.authorize({.account = alice});
         mptGw.authorize({.account = bob});
-        auto const MPT = mptGw["MPT"];
-        env(pay(gw, alice, MPT(10'000)));
-        env(pay(gw, bob, MPT(10'000)));
+        auto const mpt = mptGw["MPT"];
+        env(pay(gw, alice, mpt(10'000)));
+        env(pay(gw, bob, mpt(10'000)));
         env.close();
 
         // alice cannot create escrow to non issuer
-        env(escrow::create(alice, bob, MPT(100)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            escrow::cancel_time(env.now() + 2s),
-            fee(baseFee * 150),
-            ter(tecNO_AUTH));
+        env(escrow::create(alice, bob, mpt(100)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCANCEL_TIME(env.now() + 2s),
+            Fee(baseFee * 150),
+            Ter(tecNO_AUTH));
         env.close();
 
         // Escrow Create & Finish
         {
             // alice an create escrow to issuer
             auto seq = env.seq(alice);
-            env(escrow::create(alice, gw, MPT(100)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, gw, mpt(100)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
             // gw can finish
             env(escrow::finish(gw, alice, seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150));
             env.close();
         }
 
@@ -3762,11 +3762,11 @@ 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::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, gw, mpt(100)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s),
+                Fee(baseFee * 150));
             env.close();
 
             // alice can cancel
@@ -3795,37 +3795,37 @@ struct EscrowToken_test : public beast::unit_test::suite
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
             mptGw.authorize({.account = bob});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
-            env(pay(gw, bob, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
+            env(pay(gw, bob, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150));
             env.close();
 
-            env(pay(alice, gw, MPT(10'000)), ter(tecPATH_PARTIAL));
-            env(pay(alice, gw, MPT(9'990)));
-            env(pay(bob, gw, MPT(10'000)));
-            BEAST_EXPECT(env.balance(alice, MPT) == MPT(0));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 10);
-            BEAST_EXPECT(env.balance(bob, MPT) == MPT(0));
-            BEAST_EXPECT(mptEscrowed(env, bob, MPT) == 0);
-            BEAST_EXPECT(env.balance(gw, MPT) == MPT(-10));
+            env(pay(alice, gw, mpt(10'000)), Ter(tecPATH_PARTIAL));
+            env(pay(alice, gw, mpt(9'990)));
+            env(pay(bob, gw, mpt(10'000)));
+            BEAST_EXPECT(env.balance(alice, mpt) == mpt(0));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 10);
+            BEAST_EXPECT(env.balance(bob, mpt) == mpt(0));
+            BEAST_EXPECT(mptEscrowed(env, bob, mpt) == 0);
+            BEAST_EXPECT(env.balance(gw, mpt) == mpt(-10));
             mptGw.authorize({.account = bob, .flags = tfMPTUnauthorize});
             mptGw.destroy({.id = mptGw.issuanceID(), .ownerCount = 1, .err = tecHAS_OBLIGATIONS});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env(pay(bob, gw, MPT(10)));
+            env(pay(bob, gw, mpt(10)));
             mptGw.destroy({.id = mptGw.issuanceID(), .ownerCount = 0});
         }
 
@@ -3843,37 +3843,37 @@ struct EscrowToken_test : public beast::unit_test::suite
             mptGw.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanEscrow | tfMPTCanTransfer});
             mptGw.authorize({.account = alice});
-            auto const MPT = mptGw["MPT"];
-            env(pay(gw, alice, MPT(10'000)));
+            auto const mpt = mptGw["MPT"];
+            env(pay(gw, alice, mpt(10'000)));
             env.close();
 
             auto const seq1 = env.seq(alice);
-            env(escrow::create(alice, bob, MPT(10)),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+            env(escrow::create(alice, bob, mpt(10)),
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            env(pay(alice, gw, MPT(9'990)));
+            env(pay(alice, gw, mpt(9'990)));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == MPT(0));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 10);
+            BEAST_EXPECT(env.balance(alice, mpt) == mpt(0));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 10);
             mptGw.authorize(
                 {.account = alice, .flags = tfMPTUnauthorize, .err = tecHAS_OBLIGATIONS});
 
             env(escrow::finish(bob, alice, seq1),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, MPT) == MPT(0));
-            BEAST_EXPECT(mptEscrowed(env, alice, MPT) == 0);
+            BEAST_EXPECT(env.balance(alice, mpt) == mpt(0));
+            BEAST_EXPECT(mptEscrowed(env, alice, mpt) == 0);
             mptGw.authorize({.account = alice, .flags = tfMPTUnauthorize});
-            BEAST_EXPECT(!env.le(keylet::mptoken(MPT.mpt(), alice)));
+            BEAST_EXPECT(!env.le(keylet::mptoken(mpt.mpt(), alice)));
         }
     }
 
@@ -3923,7 +3923,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         for (FeatureBitset const& feats :
              {all - featureSingleAssetVault - featureLendingProtocol, all})
         {
diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp
index 77d51f2758..408e9c4edf 100644
--- a/src/test/app/Escrow_test.cpp
+++ b/src/test/app/Escrow_test.cpp
@@ -34,7 +34,7 @@
 
 namespace xrpl::test {
 
-struct Escrow_test : public beast::unit_test::suite
+struct Escrow_test : public beast::unit_test::Suite
 {
     void
     testEnablement(FeatureBitset features)
@@ -47,30 +47,30 @@ 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::finish_time(env.now() + 1s));
+        env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
         env.close();
 
         auto const seq1 = env.seq("alice");
 
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150));
         env.close();
         env(escrow::finish("bob", "alice", seq1),
-            escrow::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150));
+            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::condition(escrow::cb2),
-            escrow::finish_time(env.now() + 1s),
-            escrow::cancel_time(env.now() + 2s),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB2),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            escrow::kCANCEL_TIME(env.now() + 2s),
+            Fee(baseFee * 150));
         env.close();
-        env(escrow::cancel("bob", "alice", seq2), fee(baseFee * 150));
+        env(escrow::cancel("bob", "alice", seq2), Fee(baseFee * 150));
     }
 
     void
@@ -90,14 +90,14 @@ 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::finish_time(ts));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(ts));
 
             // Advance the ledger, verifying that the finish won't complete
             // prematurely.
             for (; env.now() < ts; env.close())
-                env(escrow::finish("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+                env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
 
-            env(escrow::finish("bob", "alice", seq), fee(baseFee * 150));
+            env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150));
         }
 
         {
@@ -112,23 +112,23 @@ struct Escrow_test : public beast::unit_test::suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::condition(escrow::cb1),
-                escrow::cancel_time(ts));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(ts));
 
             // Advance the ledger, verifying that the cancel won't complete
             // prematurely.
             for (; env.now() < ts; env.close())
-                env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+                env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
 
             // Verify that a finish won't work anymore.
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tecNO_PERMISSION));
 
             // Verify that the cancel will succeed
-            env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150));
+            env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150));
         }
 
         {
@@ -144,22 +144,22 @@ struct Escrow_test : public beast::unit_test::suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::finish_time(fts),
-                escrow::cancel_time(cts));
+                escrow::kFINISH_TIME(fts),
+                escrow::kCANCEL_TIME(cts));
 
             // Advance the ledger, verifying that the finish and cancel won't
             // complete prematurely.
             for (; env.now() < fts; env.close())
             {
-                env(escrow::finish("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
-                env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+                env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
+                env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
             }
 
             // Verify that a cancel still won't work
-            env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
 
             // And verify that a finish will
-            env(escrow::finish("bob", "alice", seq), fee(baseFee * 150));
+            env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150));
         }
 
         {
@@ -175,28 +175,28 @@ struct Escrow_test : public beast::unit_test::suite
 
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "bob", XRP(1000)),
-                escrow::finish_time(fts),
-                escrow::cancel_time(cts));
+                escrow::kFINISH_TIME(fts),
+                escrow::kCANCEL_TIME(cts));
 
             // Advance the ledger, verifying that the finish and cancel won't
             // complete prematurely.
             for (; env.now() < fts; env.close())
             {
-                env(escrow::finish("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
-                env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+                env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
+                env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
             }
 
             // Continue advancing, verifying that the cancel won't complete
             // prematurely. At this point a finish would succeed.
             for (; env.now() < cts; env.close())
-                env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+                env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
 
             // Verify that finish will no longer work, since we are past the
             // cancel activation time.
-            env(escrow::finish("bob", "alice", seq), fee(baseFee * 150), ter(tecNO_PERMISSION));
+            env(escrow::finish("bob", "alice", seq), Fee(baseFee * 150), Ter(tecNO_PERMISSION));
 
             // And verify that a cancel will succeed.
-            env(escrow::cancel("bob", "alice", seq), fee(baseFee * 150));
+            env(escrow::cancel("bob", "alice", seq), Fee(baseFee * 150));
         }
     }
 
@@ -219,16 +219,16 @@ struct Escrow_test : public beast::unit_test::suite
         // required:
         env(fset(bob, asfRequireDest));
         env(escrow::create(alice, bob, XRP(1000)),
-            escrow::finish_time(env.now() + 1s),
-            ter(tecDST_TAG_NEEDED));
+            escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-            stag(1),
-            dtag(2));
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Stag(1),
+            Dtag(2));
 
         auto const sle = env.le(keylet::escrow(alice.id(), seq));
         BEAST_EXPECT(sle);
@@ -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::finish_time(env.now() + 1s));
+            env(escrow::create("bob", "george", XRP(10)), escrow::kFINISH_TIME(env.now() + 1s));
         }
     }
 
@@ -278,34 +278,34 @@ 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::cancel_time(env.now() + 90s),
-            fee(baseFee * 150),
-            ter(temMALFORMED));
+            escrow::kCANCEL_TIME(env.now() + 90s),
+            Fee(baseFee * 150),
+            Ter(temMALFORMED));
 
-        // Creating an escrow with only a cancel time and a condition 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::cancel_time(env.now() + 90s),
-            escrow::condition(escrow::cb1),
-            fee(baseFee * 150));
+            escrow::kCANCEL_TIME(env.now() + 90s),
+            escrow::kCONDITION(escrow::kCB1),
+            Fee(baseFee * 150));
         env.close();
         env(escrow::finish("carol", "alice", seq),
-            escrow::condition(escrow::cb1),
-            escrow::fulfillment(escrow::fb1),
-            fee(baseFee * 150));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFULFILLMENT(escrow::kFB1),
+            Fee(baseFee * 150));
         BEAST_EXPECT(env.balance("bob") == XRP(5100));
 
         // Creating an escrow with only a cancel time and a finish time is
         // allowed:
         auto const seqFt = env.seq("alice");
         env(escrow::create("alice", "bob", XRP(100)),
-            escrow::finish_time(env.now()),  // Set finish time to now so that
-                                             // we can call finish immediately.
-            escrow::cancel_time(env.now() + 50s),
-            fee(baseFee * 150));
+            escrow::kFINISH_TIME(env.now()),  // Set finish time to now so that
+                                              // we can call finish immediately.
+            escrow::kCANCEL_TIME(env.now() + 50s),
+            Fee(baseFee * 150));
         env.close();
-        env(escrow::finish("carol", "alice", seqFt), fee(150 * baseFee));
+        env(escrow::finish("carol", "alice", seqFt), Fee(150 * baseFee));
         BEAST_EXPECT(env.balance("bob") == XRP(5200));  // 5100 (from last transaction) + 100
     }
 
@@ -324,25 +324,25 @@ struct Escrow_test : public beast::unit_test::suite
 
         // temINVALID_FLAG
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::finish_time(env.now() + 5s),
-            txflags(tfPassive),
-            ter(temINVALID_FLAG));
+            escrow::kFINISH_TIME(env.now() + 5s),
+            Txflags(tfPassive),
+            Ter(temINVALID_FLAG));
 
         // Finish time is in the past
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::finish_time(env.now() - 5s),
-            ter(tecNO_PERMISSION));
+            escrow::kFINISH_TIME(env.now() - 5s),
+            Ter(tecNO_PERMISSION));
 
         // Cancel time is in the past
         env(escrow::create("alice", "bob", XRP(1000)),
-            escrow::condition(escrow::cb1),
-            escrow::cancel_time(env.now() - 5s),
-            ter(tecNO_PERMISSION));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kCANCEL_TIME(env.now() - 5s),
+            Ter(tecNO_PERMISSION));
 
         // no destination account
         env(escrow::create("alice", "carol", XRP(1000)),
-            escrow::finish_time(env.now() + 1s),
-            ter(tecNO_DST));
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Ter(tecNO_DST));
 
         env.fund(XRP(5000), "carol");
 
@@ -351,61 +351,61 @@ struct Escrow_test : public beast::unit_test::suite
         {
             // tecNO_PERMISSION: token escrow is enabled but the issuer did not
             // set the asfAllowTrustLineLocking flag
-            auto const txResult = withTokenEscrow ? ter(tecNO_PERMISSION) : ter(temBAD_AMOUNT);
+            auto const txResult = withTokenEscrow ? Ter(tecNO_PERMISSION) : Ter(temBAD_AMOUNT);
             env(escrow::create("alice", "carol", Account("alice")["USD"](500)),
-                escrow::finish_time(env.now() + 5s),
+                escrow::kFINISH_TIME(env.now() + 5s),
                 txResult);
         }
 
         // Sending zero or no XRP:
         env(escrow::create("alice", "carol", XRP(0)),
-            escrow::finish_time(env.now() + 1s),
-            ter(temBAD_AMOUNT));
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Ter(temBAD_AMOUNT));
         env(escrow::create("alice", "carol", XRP(-1000)),
-            escrow::finish_time(env.now() + 1s),
-            ter(temBAD_AMOUNT));
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Ter(temBAD_AMOUNT));
 
         // Fail if neither CancelAfter nor FinishAfter are specified:
-        env(escrow::create("alice", "carol", XRP(1)), ter(temBAD_EXPIRATION));
+        env(escrow::create("alice", "carol", XRP(1)), Ter(temBAD_EXPIRATION));
 
-        // Fail if neither a FinishTime nor a condition are attached:
+        // Fail if neither a FinishTime nor a kCONDITION are attached:
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::cancel_time(env.now() + 1s),
-            ter(temMALFORMED));
+            escrow::kCANCEL_TIME(env.now() + 1s),
+            Ter(temMALFORMED));
 
         // Fail if FinishAfter has already passed:
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::finish_time(env.now() - 1s),
-            ter(tecNO_PERMISSION));
+            escrow::kFINISH_TIME(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::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 10s),
-            escrow::cancel_time(env.now() + 10s),
-            ter(temBAD_EXPIRATION));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 10s),
+            escrow::kCANCEL_TIME(env.now() + 10s),
+            Ter(temBAD_EXPIRATION));
 
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 10s),
-            escrow::cancel_time(env.now() + 5s),
-            ter(temBAD_EXPIRATION));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 10s),
+            escrow::kCANCEL_TIME(env.now() + 5s),
+            Ter(temBAD_EXPIRATION));
 
         // Carol now requires the use of a destination tag
         env(fset("carol", asfRequireDest));
 
         // missing destination tag
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::condition(escrow::cb1),
-            escrow::cancel_time(env.now() + 1s),
-            ter(tecDST_TAG_NEEDED));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kCANCEL_TIME(env.now() + 1s),
+            Ter(tecDST_TAG_NEEDED));
 
         // Success!
         env(escrow::create("alice", "carol", XRP(1)),
-            escrow::condition(escrow::cb1),
-            escrow::cancel_time(env.now() + 1s),
-            dtag(1));
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kCANCEL_TIME(env.now() + 1s),
+            Dtag(1));
 
         {  // Fail if the sender wants to send more than he has:
             auto const accountReserve = drops(env.current()->fees().reserve);
@@ -413,41 +413,41 @@ struct Escrow_test : public beast::unit_test::suite
 
             env.fund(accountReserve + accountIncrement + XRP(50), "daniel");
             env(escrow::create("daniel", "bob", XRP(51)),
-                escrow::finish_time(env.now() + 1s),
-                ter(tecUNFUNDED));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Ter(tecUNFUNDED));
 
             env.fund(accountReserve + accountIncrement + XRP(50), "evan");
             env(escrow::create("evan", "bob", XRP(50)),
-                escrow::finish_time(env.now() + 1s),
-                ter(tecUNFUNDED));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Ter(tecUNFUNDED));
 
             env.fund(accountReserve, "frank");
             env(escrow::create("frank", "bob", XRP(1)),
-                escrow::finish_time(env.now() + 1s),
-                ter(tecINSUFFICIENT_RESERVE));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Ter(tecINSUFFICIENT_RESERVE));
         }
 
         {  // Specify incorrect sequence number
             env.fund(XRP(5000), "hannah");
             auto const seq = env.seq("hannah");
             env(escrow::create("hannah", "hannah", XRP(10)),
-                escrow::finish_time(env.now() + 1s),
-                fee(150 * baseFee));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(150 * baseFee));
             env.close();
-            env(escrow::finish("hannah", "hannah", seq + 7), fee(150 * baseFee), ter(tecNO_TARGET));
+            env(escrow::finish("hannah", "hannah", seq + 7), Fee(150 * baseFee), Ter(tecNO_TARGET));
         }
 
-        {  // Try to specify a condition 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::finish_time(env.now() + 1s));
+            env(escrow::create("ivan", "ivan", XRP(10)), escrow::kFINISH_TIME(env.now() + 1s));
             env.close();
             env(escrow::finish("ivan", "ivan", seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
         }
     }
 
@@ -465,21 +465,21 @@ 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::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+            env(escrow::create("alice", "alice", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
             // possible.
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("bob", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("bob", "alice", seq), Ter(tecNO_PERMISSION));
             env.close();
 
             // Cancel continues to not be possible
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
 
             // Finish should succeed. Verify funds.
             env(escrow::finish("bob", "alice", seq));
-            env.require(balance("alice", XRP(5000) - drops(baseFee)));
+            env.require(Balance("alice", XRP(5000) - drops(baseFee)));
         }
         {
             // Unconditionally pay from Alice to Bob.  Zelda (neither source nor
@@ -489,25 +489,25 @@ 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::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
             // possible.
-            env(escrow::cancel("zelda", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("zelda", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("zelda", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("zelda", "alice", seq), Ter(tecNO_PERMISSION));
             env.close();
 
             // Cancel continues to not be possible
-            env(escrow::cancel("zelda", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("zelda", "alice", seq), Ter(tecNO_PERMISSION));
 
             // Finish should succeed. Verify funds.
             env(escrow::finish("zelda", "alice", seq));
             env.close();
 
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
-            env.require(balance("bob", XRP(6000)));
-            env.require(balance("zelda", XRP(5000) - drops(4 * baseFee)));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
+            env.require(Balance("bob", XRP(6000)));
+            env.require(Balance("zelda", XRP(5000) - drops(4 * baseFee)));
         }
         {
             // Bob sets DepositAuth so only Bob can finish the escrow.
@@ -519,32 +519,32 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
             // possible.
-            env(escrow::cancel("zelda", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::cancel("alice", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("zelda", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("alice", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("bob", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("zelda", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::cancel("alice", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("zelda", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("alice", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("bob", "alice", seq), Ter(tecNO_PERMISSION));
             env.close();
 
             // Cancel continues to not be possible. Finish will only succeed for
             // Bob, because of DepositAuth.
-            env(escrow::cancel("zelda", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::cancel("alice", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("zelda", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("alice", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("zelda", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::cancel("alice", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("zelda", "alice", seq), Ter(tecNO_PERMISSION));
+            env(escrow::finish("alice", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("bob", "alice", seq));
             env.close();
 
-            env.require(balance("alice", XRP(4000) - (baseFee * 5)));
-            env.require(balance("bob", XRP(6000) - (baseFee * 5)));
-            env.require(balance("zelda", XRP(5000) - (baseFee * 4)));
+            env.require(Balance("alice", XRP(4000) - (baseFee * 5)));
+            env.require(Balance("bob", XRP(6000) - (baseFee * 5)));
+            env.require(Balance("zelda", XRP(5000) - (baseFee * 4)));
         }
         {
             // Bob sets DepositAuth but preauthorizes Zelda, so Zelda can
@@ -559,20 +559,20 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             auto const seq = env.seq("alice");
-            env(escrow::create("alice", "bob", XRP(1000)), escrow::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+            env(escrow::create("alice", "bob", XRP(1000)), escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
             // DepositPreauth allows Finish to succeed for either Zelda or
             // Bob. But Finish won't succeed for Alice since she is not
             // preauthorized.
-            env(escrow::finish("alice", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::finish("alice", "alice", seq), Ter(tecNO_PERMISSION));
             env(escrow::finish("zelda", "alice", seq));
             env.close();
 
-            env.require(balance("alice", XRP(4000) - (baseFee * 2)));
-            env.require(balance("bob", XRP(6000) - (baseFee * 2)));
-            env.require(balance("zelda", XRP(5000) - (baseFee * 1)));
+            env.require(Balance("alice", XRP(4000) - (baseFee * 2)));
+            env.require(Balance("bob", XRP(6000) - (baseFee * 2)));
+            env.require(Balance("zelda", XRP(5000) - (baseFee * 1)));
         }
         {
             // Conditional
@@ -581,40 +581,40 @@ 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::condition(escrow::cb2),
-                escrow::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
 
             // Not enough time has elapsed for a finish and canceling isn't
             // possible.
-            env(escrow::cancel("alice", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
-            env(escrow::finish("alice", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("alice", "alice", seq), Ter(tecNO_PERMISSION));
+            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::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee),
-                ter(tecNO_PERMISSION));
-            env(escrow::finish("bob", "alice", seq), ter(tecNO_PERMISSION));
+                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::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee),
-                ter(tecNO_PERMISSION));
+                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 fulfillment 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));
-            env(escrow::finish("alice", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
+            // 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));
+            env(escrow::finish("alice", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
             env.close();
 
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee));
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFULFILLMENT(escrow::kFB2),
+                Fee(150 * baseFee));
         }
         {
             // Self-escrowed conditional with DepositAuth.
@@ -624,14 +624,14 @@ 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::condition(escrow::cb3),
-                escrow::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
             // Finish is now possible but requires the cryptocondition.
-            env(escrow::finish("bob", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
-            env(escrow::finish("alice", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
+            env(escrow::finish("bob", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
+            env(escrow::finish("alice", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
 
             // Enable deposit authorization. After this only Alice can finish
             // the escrow.
@@ -639,19 +639,19 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             env(escrow::finish("alice", "alice", seq),
-                escrow::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFULFILLMENT(escrow::kFB2),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Fee(150 * baseFee),
+                Ter(tecNO_PERMISSION));
             env(escrow::finish("alice", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Fee(150 * baseFee));
         }
         {
             // Self-escrowed conditional with DepositAuth and DepositPreauth.
@@ -661,9 +661,9 @@ 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::condition(escrow::cb3),
-                escrow::finish_time(env.now() + 5s));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFINISH_TIME(env.now() + 5s));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             env.close();
 
             // Alice preauthorizes Zelda for deposit, even though Alice has not
@@ -672,9 +672,9 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             // Finish is now possible but requires the cryptocondition.
-            env(escrow::finish("alice", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
-            env(escrow::finish("bob", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
-            env(escrow::finish("zelda", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
+            env(escrow::finish("alice", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
+            env(escrow::finish("bob", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
+            env(escrow::finish("zelda", "alice", seq), Ter(tecCRYPTOCONDITION_ERROR));
 
             // Alice enables deposit authorization. After this only Alice or
             // Zelda (because Zelda is preauthorized) can finish the escrow.
@@ -682,19 +682,19 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             env(escrow::finish("alice", "alice", seq),
-                escrow::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kFULFILLMENT(escrow::kFB2),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Fee(150 * baseFee),
+                Ter(tecNO_PERMISSION));
             env(escrow::finish("zelda", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Fee(150 * baseFee));
         }
     }
 
@@ -713,87 +713,87 @@ 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::condition(escrow::cb1),
-                escrow::cancel_time(env.now() + 1s));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(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));
+            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 fulfillment
-            env(escrow::finish("bob", "alice", seq), ter(tecCRYPTOCONDITION_ERROR));
+            // 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 condition instead of a fulfillment
+            // Attempt to finish with a kCONDITION instead of a kFULFILLMENT
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::cb1),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb1),
-                escrow::fulfillment(escrow::cb2),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb1),
-                escrow::fulfillment(escrow::cb3),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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 condition and various
+            // Attempt to finish with an incorrect kCONDITION and various
             // combinations of correct and incorrect fulfillments.
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb1),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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 condition & fulfillment
+            // Attempt to finish with the correct kCONDITION & kFULFILLMENT
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(150 * baseFee));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(150 * baseFee));
 
             // SLE removed on finish
             BEAST_EXPECT(!env.le(keylet::escrow(Account("alice").id(), seq)));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 0);
-            env.require(balance("carol", XRP(6000)));
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_TARGET));
+            env.require(Balance("carol", XRP(6000)));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_TARGET));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 0);
-            env(escrow::cancel("bob", "carol", 1), ter(tecNO_TARGET));
+            env(escrow::cancel("bob", "carol", 1), Ter(tecNO_TARGET));
         }
-        {  // Test cancel when condition 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::condition(escrow::cb2),
-                escrow::cancel_time(env.now() + 1s));
+                escrow::kCONDITION(escrow::kCB2),
+                escrow::kCANCEL_TIME(env.now() + 1s));
             env.close();
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+            env.require(Balance("alice", XRP(4000) - drops(baseFee)));
             // balance restored on cancel
             env(escrow::cancel("bob", "alice", seq));
-            env.require(balance("alice", XRP(5000) - drops(baseFee)));
+            env.require(Balance("alice", XRP(5000) - drops(baseFee)));
             // SLE removed on cancel
             BEAST_EXPECT(!env.le(keylet::escrow(Account("alice").id(), seq)));
         }
@@ -804,29 +804,29 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
             auto const seq = env.seq("alice");
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(escrow::cb3),
-                escrow::cancel_time(env.now() + 1s));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kCANCEL_TIME(env.now() + 1s));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             // cancel fails before expiration
-            env(escrow::cancel("bob", "alice", seq), ter(tecNO_PERMISSION));
+            env(escrow::cancel("bob", "alice", seq), Ter(tecNO_PERMISSION));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
             env.close();
             // finish fails after expiration
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Fee(150 * baseFee),
+                Ter(tecNO_PERMISSION));
             BEAST_EXPECT((*env.le("alice"))[sfOwnerCount] == 1);
-            env.require(balance("carol", XRP(5000)));
+            env.require(Balance("carol", XRP(5000)));
         }
         {  // Test long & short conditions during creation
             Env env(*this, features);
             env.fund(XRP(5000), "alice", "bob", "carol");
 
             std::vector<std::uint8_t> v;
-            v.resize(escrow::cb1.size() + 2, 0x78);
-            std::memcpy(v.data() + 1, escrow::cb1.data(), escrow::cb1.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,64 +834,64 @@ struct Escrow_test : public beast::unit_test::suite
             auto const ts = env.now() + 1s;
 
             // All these are expected to fail, because the
-            // condition 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::condition(Slice{p, s}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p, s}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p, s - 1}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p, s - 1}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p, s - 2}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p, s - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p + 1, s - 1}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p + 1, s - 1}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p + 1, s - 3}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p + 1, s - 3}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p + 2, s - 2}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p + 2, s - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p + 2, s - 3}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{p + 2, s - 3}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
 
             auto const seq = env.seq("alice");
             auto const baseFee = env.current()->fees().base;
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{p + 1, s - 2}),
-                escrow::cancel_time(ts),
-                fee(10 * baseFee));
+                escrow::kCONDITION(Slice{p + 1, s - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Fee(10 * baseFee));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(150 * baseFee));
-            env.require(balance("alice", XRP(4000) - drops(10 * baseFee)));
-            env.require(balance("bob", XRP(5000) - drops(150 * baseFee)));
-            env.require(balance("carol", XRP(6000)));
+                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)));
+            env.require(Balance("carol", XRP(6000)));
         }
         {  // Test long and short conditions & fulfillments during finish
             Env env(*this, features);
             env.fund(XRP(5000), "alice", "bob", "carol");
 
             std::vector<std::uint8_t> cv;
-            cv.resize(escrow::cb2.size() + 2, 0x78);
-            std::memcpy(cv.data() + 1, escrow::cb2.data(), escrow::cb2.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::fb2.size() + 2, 0x13);
-            std::memcpy(fv.data() + 1, escrow::fb2.data(), escrow::fb2.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
-            // condition 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::condition(Slice{cp, cs}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp, cs}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp, cs - 1}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp, cs - 1}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp, cs - 2}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp, cs - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp + 1, cs - 1}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp + 1, cs - 1}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp + 1, cs - 3}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp + 1, cs - 3}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp + 2, cs - 2}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp + 2, cs - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp + 2, cs - 3}),
-                escrow::cancel_time(ts),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{cp + 2, cs - 3}),
+                escrow::kCANCEL_TIME(ts),
+                Ter(temMALFORMED));
 
             auto const seq = env.seq("alice");
             auto const baseFee = env.current()->fees().base;
             env(escrow::create("alice", "carol", XRP(1000)),
-                escrow::condition(Slice{cp + 1, cs - 2}),
-                escrow::cancel_time(ts),
-                fee(10 * baseFee));
+                escrow::kCONDITION(Slice{cp + 1, cs - 2}),
+                escrow::kCANCEL_TIME(ts),
+                Fee(10 * baseFee));
 
             // Now, try to fulfill using the same sequence of
             // malformed conditions.
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{cp, cs}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(Slice{cp, cs}),
+                escrow::kFULFILLMENT(Slice{fp, fs}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{cp, cs - 1}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(Slice{cp, cs - 1}),
+                escrow::kFULFILLMENT(Slice{fp, fs}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{cp, cs - 2}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(Slice{cp, cs - 2}),
+                escrow::kFULFILLMENT(Slice{fp, fs}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{cp + 1, cs - 1}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 3}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 2, cs - 2}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 2, cs - 3}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(Slice{cp + 2, cs - 3}),
+                escrow::kFULFILLMENT(Slice{fp, fs}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
 
-            // Now, using the correct condition, try malformed fulfillments:
+            // Now, using the correct kCONDITION, try malformed fulfillments:
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp, fs}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp, fs - 1}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp, fs - 2}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp + 1, fs - 1}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp + 1, fs - 3}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp + 1, fs - 3}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp + 2, fs - 2}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(Slice{cp + 1, cs - 2}),
-                escrow::fulfillment(Slice{fp + 2, fs - 3}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb2),
-                escrow::fulfillment(escrow::fb2),
-                fee(150 * baseFee));
-            env.require(balance("alice", XRP(4000) - drops(10 * baseFee)));
-            env.require(balance("carol", XRP(6000)));
+                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 condition during creation and
-           // empty condition & fulfillment 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::condition(Slice{}),
-                escrow::cancel_time(env.now() + 1s),
-                ter(temMALFORMED));
+                escrow::kCONDITION(Slice{}),
+                escrow::kCANCEL_TIME(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::condition(escrow::cb3),
-                escrow::cancel_time(env.now() + 1s));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kCANCEL_TIME(env.now() + 1s));
 
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{}),
-                escrow::fulfillment(Slice{}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(Slice{}),
+                escrow::kFULFILLMENT(Slice{}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(Slice{}),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                escrow::kCONDITION(escrow::kCB3),
+                escrow::kFULFILLMENT(Slice{}),
+                Fee(150 * baseFee),
+                Ter(tecCRYPTOCONDITION_ERROR));
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(Slice{}),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee),
-                ter(tecCRYPTOCONDITION_ERROR));
+                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::condition(escrow::cb3),
-                ter(temMALFORMED));
+                escrow::kCONDITION(escrow::kCB3),
+                Ter(temMALFORMED));
             env(escrow::finish("bob", "alice", seq),
-                escrow::fulfillment(escrow::fb3),
-                ter(temMALFORMED));
+                escrow::kFULFILLMENT(escrow::kFB3),
+                Ter(temMALFORMED));
 
             // Now finish it.
             env(escrow::finish("bob", "alice", seq),
-                escrow::condition(escrow::cb3),
-                escrow::fulfillment(escrow::fb3),
-                fee(150 * baseFee));
-            env.require(balance("carol", XRP(6000)));
-            env.require(balance("alice", XRP(4000) - drops(baseFee)));
+                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 condition 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,9 +1087,9 @@ 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::condition(cb),
-                escrow::cancel_time(env.now() + 1s),
-                ter(temMALFORMED));
+                escrow::kCONDITION(cb),
+                escrow::kCANCEL_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 500s));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(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::finish_time(env.now() + 1s));
+            env(escrow::create(alice, bruce, XRP(1000)), escrow::kFINISH_TIME(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::finish_time(env.now() + 1s),
-                escrow::cancel_time(env.now() + 2s));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                escrow::kCANCEL_TIME(env.now() + 2s));
             BEAST_EXPECT(
                 (*env.meta())[sfTransactionResult] == static_cast<std::uint8_t>(tesSUCCESS));
             env.close(5s);
@@ -1296,11 +1296,11 @@ struct Escrow_test : public beast::unit_test::suite
         {
             auto const jtx = env.jt(
                 escrow::create("alice", "carol", XRP(1000)),
-                escrow::finish_time(env.now() + 1s),
-                seq(1),
-                fee(baseFee));
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Seq(1),
+                Fee(baseFee));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(baseFee));
@@ -1308,9 +1308,9 @@ struct Escrow_test : public beast::unit_test::suite
         }
 
         {
-            auto const jtx = env.jt(escrow::cancel("bob", "alice", 3), seq(1), fee(baseFee));
+            auto const jtx = env.jt(escrow::cancel("bob", "alice", 3), Seq(1), Fee(baseFee));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(baseFee));
@@ -1318,9 +1318,9 @@ struct Escrow_test : public beast::unit_test::suite
         }
 
         {
-            auto const jtx = env.jt(escrow::finish("bob", "alice", 3), seq(1), fee(baseFee));
+            auto const jtx = env.jt(escrow::finish("bob", "alice", 3), Seq(1), Fee(baseFee));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(baseFee));
@@ -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 bobTicketCount{20};
-            env(ticket::create(bob, bobTicketCount));
+            constexpr static std::uint32_t kBOB_TICKET_COUNT{20};
+            env(ticket::create(bob, kBOB_TICKET_COUNT));
             env.close();
             std::uint32_t bobTicket{env.seq(bob)};
             env.require(tickets(alice, 1));
-            env.require(tickets(bob, bobTicketCount));
+            env.require(tickets(bob, kBOB_TICKET_COUNT));
 
             // Note that from here on all transactions use tickets.  No account
             // root sequences should change.
@@ -1369,33 +1369,33 @@ struct Escrow_test : public beast::unit_test::suite
 
             std::uint32_t const escrowSeq = aliceTicket;
             env(escrow::create(alice, bob, XRP(1000)),
-                escrow::finish_time(ts),
-                ticket::use(aliceTicket));
+                escrow::kFINISH_TIME(ts),
+                ticket::Use(aliceTicket));
             BEAST_EXPECT(env.seq(alice) == aliceRootSeq);
             env.require(tickets(alice, 0));
-            env.require(tickets(bob, bobTicketCount));
+            env.require(tickets(bob, kBOB_TICKET_COUNT));
 
             // Advance the ledger, verifying that the finish won't complete
             // prematurely.  Note that each tec consumes one of bob's tickets.
             for (; env.now() < ts; env.close())
             {
                 env(escrow::finish(bob, alice, escrowSeq),
-                    fee(150 * baseFee),
-                    ticket::use(--bobTicket),
-                    ter(tecNO_PERMISSION));
+                    Fee(150 * baseFee),
+                    ticket::Use(--bobTicket),
+                    Ter(tecNO_PERMISSION));
                 BEAST_EXPECT(env.seq(bob) == bobRootSeq);
             }
 
             // bob tries to re-use a ticket, which is rejected.
             env(escrow::finish(bob, alice, escrowSeq),
-                fee(150 * baseFee),
-                ticket::use(bobTicket),
-                ter(tefNO_TICKET));
+                Fee(150 * baseFee),
+                ticket::Use(bobTicket),
+                Ter(tefNO_TICKET));
 
             // bob uses one of his remaining tickets.  Success!
             env(escrow::finish(bob, alice, escrowSeq),
-                fee(150 * baseFee),
-                ticket::use(--bobTicket));
+                Fee(150 * baseFee),
+                ticket::Use(--bobTicket));
             env.close();
             BEAST_EXPECT(env.seq(bob) == bobRootSeq);
         }
@@ -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 bobTicketCount{20};
+            constexpr std::uint32_t kBOB_TICKET_COUNT{20};
             std::uint32_t bobTicket{env.seq(bob) + 1};
-            env(ticket::create(bob, bobTicketCount));
+            env(ticket::create(bob, kBOB_TICKET_COUNT));
             env.close();
             env.require(tickets(alice, 1));
-            env.require(tickets(bob, bobTicketCount));
+            env.require(tickets(bob, kBOB_TICKET_COUNT));
 
             // Note that from here on all transactions use tickets.  No account
             // root sequences should change.
@@ -1429,37 +1429,37 @@ struct Escrow_test : public beast::unit_test::suite
 
             std::uint32_t const escrowSeq = aliceTicket;
             env(escrow::create(alice, bob, XRP(1000)),
-                escrow::condition(escrow::cb1),
-                escrow::cancel_time(ts),
-                ticket::use(aliceTicket));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kCANCEL_TIME(ts),
+                ticket::Use(aliceTicket));
             BEAST_EXPECT(env.seq(alice) == aliceRootSeq);
             env.require(tickets(alice, 0));
-            env.require(tickets(bob, bobTicketCount));
+            env.require(tickets(bob, kBOB_TICKET_COUNT));
 
             // Advance the ledger, verifying that the cancel won't complete
             // prematurely.
             for (; env.now() < ts; env.close())
             {
                 env(escrow::cancel(bob, alice, escrowSeq),
-                    fee(150 * baseFee),
-                    ticket::use(bobTicket++),
-                    ter(tecNO_PERMISSION));
+                    Fee(150 * baseFee),
+                    ticket::Use(bobTicket++),
+                    Ter(tecNO_PERMISSION));
                 BEAST_EXPECT(env.seq(bob) == bobRootSeq);
             }
 
             // Verify that a finish won't work anymore.
             env(escrow::finish(bob, alice, escrowSeq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(150 * baseFee),
-                ticket::use(bobTicket++),
-                ter(tecNO_PERMISSION));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(150 * baseFee),
+                ticket::Use(bobTicket++),
+                Ter(tecNO_PERMISSION));
             BEAST_EXPECT(env.seq(bob) == bobRootSeq);
 
             // Verify that the cancel succeeds.
             env(escrow::cancel(bob, alice, escrowSeq),
-                fee(150 * baseFee),
-                ticket::use(bobTicket++));
+                Fee(150 * baseFee),
+                ticket::Use(bobTicket++));
             env.close();
             BEAST_EXPECT(env.seq(bob) == bobRootSeq);
 
@@ -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::finish_time(env.now() + 1s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
             env.close();
 
             env(fset(bob, asfDepositAuth));
@@ -1502,7 +1502,7 @@ struct Escrow_test : public beast::unit_test::suite
             std::string const credIdx =
                 "48004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288B"
                 "E4";
-            env(escrow::finish(bob, alice, seq), credentials::ids({credIdx}), ter(temDISABLED));
+            env(escrow::finish(bob, alice, seq), credentials::Ids({credIdx}), Ter(temDISABLED));
         }
 
         {
@@ -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::finish_time(env.now() + 50s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 50s));
             env.close();
 
             // Bob require pre-authorization
@@ -1526,8 +1526,8 @@ struct Escrow_test : public beast::unit_test::suite
 
             // Fail, credentials not accepted
             env(escrow::finish(carol, alice, seq),
-                credentials::ids({credIdx}),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Ter(tecBAD_CREDENTIALS));
 
             env.close();
 
@@ -1536,20 +1536,20 @@ struct Escrow_test : public beast::unit_test::suite
 
             // Fail, credentials doesn’t belong to root account
             env(escrow::finish(dillon, alice, seq),
-                credentials::ids({credIdx}),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Ter(tecBAD_CREDENTIALS));
 
             // Fail, no depositPreauth
             env(escrow::finish(carol, alice, seq),
-                credentials::ids({credIdx}),
-                ter(tecNO_PERMISSION));
+                credentials::Ids({credIdx}),
+                Ter(tecNO_PERMISSION));
 
             env(deposit::authCredentials(bob, {{zelda, credType}}));
             env.close();
 
             // Success
             env.close();
-            env(escrow::finish(carol, alice, seq), credentials::ids({credIdx}));
+            env(escrow::finish(carol, alice, seq), credentials::Ids({credIdx}));
             env.close();
         }
 
@@ -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::finish_time(env.now() + 50s));
+            env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 50s));
             // time advance
             env.close();
             env.close();
@@ -1580,7 +1580,7 @@ struct Escrow_test : public beast::unit_test::suite
             env.close();
 
             // Succeed, Bob doesn't require pre-authorization
-            env(escrow::finish(carol, alice, seq), credentials::ids({credIdx}));
+            env(escrow::finish(carol, alice, seq), credentials::Ids({credIdx}));
             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::finish_time(env.now() + 1s));
+                env(escrow::create(alice, bob, XRP(1000)), escrow::kFINISH_TIME(env.now() + 1s));
                 env.close();
 
                 // Bob require pre-authorization
@@ -1605,7 +1605,7 @@ struct Escrow_test : public beast::unit_test::suite
                 env.close();
 
                 // Use any valid credentials if account == dst
-                env(escrow::finish(bob, alice, seq), credentials::ids({credIdxBob}));
+                env(escrow::finish(bob, alice, seq), credentials::Ids({credIdxBob}));
                 env.close();
             }
         }
@@ -1633,7 +1633,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testWithFeats(all);
         testWithFeats(all - featureTokenEscrow);
         testTags(all - fixIncludeKeyletFields);
diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp
index e24b54c82a..8300b458b6 100644
--- a/src/test/app/FeeVote_test.cpp
+++ b/src/test/app/FeeVote_test.cpp
@@ -134,7 +134,7 @@ createInvalidFeeTx(
 bool
 applyFeeAndTestResult(jtx::Env& env, OpenView& view, STTx const& tx)
 {
-    auto const res = apply(env.app(), view, tx, ApplyFlags::tapNONE, env.journal);
+    auto const res = apply(env.app(), view, tx, ApplyFlags::TapNone, env.journal);
     return isTesSuccess(res.ter);
 }
 
@@ -203,7 +203,7 @@ getTxs(std::shared_ptr<SHAMap> const& txSet)
     return txs;
 };
 
-class FeeVote_test : public beast::unit_test::suite
+class FeeVote_test : public beast::unit_test::Suite
 {
     void
     testSetup()
@@ -212,7 +212,7 @@ class FeeVote_test : public beast::unit_test::suite
         {
             // defaults
             Section const config;
-            auto setup = setup_FeeVote(config);
+            auto setup = setupFeeVote(config);
             BEAST_EXPECT(setup.reference_fee == defaultSetup.reference_fee);
             BEAST_EXPECT(setup.account_reserve == defaultSetup.account_reserve);
             BEAST_EXPECT(setup.owner_reserve == defaultSetup.owner_reserve);
@@ -221,7 +221,7 @@ class FeeVote_test : public beast::unit_test::suite
             Section config;
             config.append(
                 {"reference_fee = 50", "account_reserve = 1234567", "owner_reserve = 1234"});
-            auto setup = setup_FeeVote(config);
+            auto setup = setupFeeVote(config);
             BEAST_EXPECT(setup.reference_fee == 50);
             BEAST_EXPECT(setup.account_reserve == 1234567);
             BEAST_EXPECT(setup.owner_reserve == 1234);
@@ -231,7 +231,7 @@ class FeeVote_test : public beast::unit_test::suite
             config.append(
                 {"reference_fee = blah", "account_reserve = yada", "owner_reserve = foo"});
             // Illegal values are ignored, and the defaults left unchanged
-            auto setup = setup_FeeVote(config);
+            auto setup = setupFeeVote(config);
             BEAST_EXPECT(setup.reference_fee == defaultSetup.reference_fee);
             BEAST_EXPECT(setup.account_reserve == defaultSetup.account_reserve);
             BEAST_EXPECT(setup.owner_reserve == defaultSetup.owner_reserve);
@@ -241,7 +241,7 @@ class FeeVote_test : public beast::unit_test::suite
             config.append(
                 {"reference_fee = -50", "account_reserve = -1234567", "owner_reserve = -1234"});
             // Illegal values are ignored, and the defaults left unchanged
-            auto setup = setup_FeeVote(config);
+            auto setup = setupFeeVote(config);
             BEAST_EXPECT(setup.reference_fee == defaultSetup.reference_fee);
             BEAST_EXPECT(setup.account_reserve == static_cast<std::uint32_t>(-1234567));
             BEAST_EXPECT(setup.owner_reserve == static_cast<std::uint32_t>(-1234));
@@ -255,7 +255,7 @@ class FeeVote_test : public beast::unit_test::suite
                  "account_reserve = " + big64,
                  "owner_reserve = " + big64});
             // Illegal values are ignored, and the defaults left unchanged
-            auto setup = setup_FeeVote(config);
+            auto setup = setupFeeVote(config);
             BEAST_EXPECT(setup.reference_fee == defaultSetup.reference_fee);
             BEAST_EXPECT(setup.account_reserve == defaultSetup.account_reserve);
             BEAST_EXPECT(setup.owner_reserve == defaultSetup.owner_reserve);
@@ -269,9 +269,9 @@ class FeeVote_test : public beast::unit_test::suite
 
         // Test with XRPFees disabled (legacy format)
         {
-            jtx::Env env(*this, jtx::testable_amendments() - featureXRPFees);
+            jtx::Env env(*this, jtx::testableAmendments() - featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -299,9 +299,9 @@ class FeeVote_test : public beast::unit_test::suite
 
         // Test with XRPFees enabled (new format)
         {
-            jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+            jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -332,9 +332,9 @@ class FeeVote_test : public beast::unit_test::suite
         testcase("Fee Transaction Validation");
 
         {
-            jtx::Env env(*this, jtx::testable_amendments() - featureXRPFees);
+            jtx::Env env(*this, jtx::testableAmendments() - featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -354,9 +354,9 @@ class FeeVote_test : public beast::unit_test::suite
         }
 
         {
-            jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+            jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -381,9 +381,9 @@ class FeeVote_test : public beast::unit_test::suite
     {
         testcase("Pseudo Transaction Properties");
 
-        jtx::Env env(*this, jtx::testable_amendments());
+        jtx::Env env(*this, jtx::testableAmendments());
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -420,9 +420,9 @@ class FeeVote_test : public beast::unit_test::suite
     {
         testcase("Multiple Fee Updates");
 
-        jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+        jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -468,9 +468,9 @@ class FeeVote_test : public beast::unit_test::suite
     {
         testcase("Wrong Ledger Sequence");
 
-        jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+        jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -499,9 +499,9 @@ class FeeVote_test : public beast::unit_test::suite
     {
         testcase("Partial Field Updates");
 
-        jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+        jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -545,9 +545,9 @@ class FeeVote_test : public beast::unit_test::suite
     {
         testcase("Single Invalid Transaction");
 
-        jtx::Env env(*this, jtx::testable_amendments() | featureXRPFees);
+        jtx::Env env(*this, jtx::testableAmendments() | featureXRPFees);
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -584,18 +584,18 @@ class FeeVote_test : public beast::unit_test::suite
 
         // Test with XRPFees enabled
         {
-            Env env(*this, testable_amendments() | featureXRPFees);
-            auto feeVote = make_FeeVote(setup, env.app().getJournal("FeeVote"));
+            Env env(*this, testableAmendments() | featureXRPFees);
+            auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
 
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
                 env.app().getNodeFamily());
 
             auto sec = randomSecretKey();
-            auto pub = derivePublicKey(KeyType::secp256k1, sec);
+            auto pub = derivePublicKey(KeyType::Secp256k1, sec);
 
             auto val = std::make_shared<STValidation>(
                 env.app().getTimeKeeper().now(), pub, sec, calcNodeID(pub), [](STValidation& v) {
@@ -614,18 +614,18 @@ class FeeVote_test : public beast::unit_test::suite
 
         // Test with XRPFees disabled (legacy format)
         {
-            Env env(*this, testable_amendments() - featureXRPFees);
-            auto feeVote = make_FeeVote(setup, env.app().getJournal("FeeVote"));
+            Env env(*this, testableAmendments() - featureXRPFees);
+            auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
 
             auto ledger = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
                 env.app().getNodeFamily());
 
             auto sec = randomSecretKey();
-            auto pub = derivePublicKey(KeyType::secp256k1, sec);
+            auto pub = derivePublicKey(KeyType::Secp256k1, sec);
 
             auto val = std::make_shared<STValidation>(
                 env.app().getTimeKeeper().now(), pub, sec, calcNodeID(pub), [](STValidation& v) {
@@ -654,16 +654,16 @@ class FeeVote_test : public beast::unit_test::suite
         setup.account_reserve = 1234567;
         setup.owner_reserve = 7654321;
 
-        Env env(*this, testable_amendments() | featureXRPFees);
+        Env env(*this, testableAmendments() | featureXRPFees);
 
         // establish what the current fees are
         BEAST_EXPECT(env.current()->fees().base == XRPAmount{UNIT_TEST_REFERENCE_FEE});
         BEAST_EXPECT(env.current()->fees().reserve == XRPAmount{200'000'000});
         BEAST_EXPECT(env.current()->fees().increment == XRPAmount{50'000'000});
 
-        auto feeVote = make_FeeVote(setup, env.app().getJournal("FeeVote"));
+        auto feeVote = makeFeeVote(setup, env.app().getJournal("FeeVote"));
         auto ledger = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -683,7 +683,7 @@ class FeeVote_test : public beast::unit_test::suite
         for (int i = 0; i < 5; i++)
         {
             auto sec = randomSecretKey();
-            auto pub = derivePublicKey(KeyType::secp256k1, sec);
+            auto pub = derivePublicKey(KeyType::Secp256k1, sec);
 
             auto val = std::make_shared<STValidation>(
                 env.app().getTimeKeeper().now(), pub, sec, calcNodeID(pub), [&](STValidation& v) {
diff --git a/src/test/app/FixNFTokenPageLinks_test.cpp b/src/test/app/FixNFTokenPageLinks_test.cpp
index 56484bb396..f77d924c94 100644
--- a/src/test/app/FixNFTokenPageLinks_test.cpp
+++ b/src/test/app/FixNFTokenPageLinks_test.cpp
@@ -30,16 +30,16 @@
 
 namespace xrpl {
 
-class FixNFTokenPageLinks_test : public beast::unit_test::suite
+class FixNFTokenPageLinks_test : public beast::unit_test::Suite
 {
     // Helper function that returns the number of nfts owned by an account.
     static std::uint32_t
     nftCount(test::jtx::Env& env, test::jtx::Account const& acct)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::account] = acct.human();
         params[jss::type] = "state";
-        Json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
+        json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
         return nfts[jss::result][jss::account_nfts].size();
     };
 
@@ -88,7 +88,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
             std::uint32_t const intTaxon = (i / 16) + (((i & 0b10000) != 0u) ? 2 : 0);
             uint32_t const extTaxon = internalTaxon(owner, intTaxon);
             nfts.push_back(token::getNextID(env, owner, extTaxon, tfTransferable));
-            env(token::mint(owner, extTaxon), txflags(tfTransferable));
+            env(token::mint(owner, extTaxon), Txflags(tfTransferable));
             env.close();
         }
 
@@ -99,14 +99,14 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Verify that the owner does indeed have exactly three pages
         // of NFTs with 32 entries in each page.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = owner.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
 
-            Json::Value const& acctObjs = resp[jss::result][jss::account_objects];
+            json::Value const& acctObjs = resp[jss::result][jss::account_objects];
 
             int pageCount = 0;
-            for (Json::UInt i = 0; i < acctObjs.size(); ++i)
+            for (json::UInt i = 0; i < acctObjs.size(); ++i)
             {
                 if (BEAST_EXPECT(
                         acctObjs[i].isMember(sfNFTokens.jsonName) &&
@@ -135,14 +135,14 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         {
             // Verify that the LedgerStateFix transaction is disabled
             // without the fixNFTokenPageLinks amendment.
-            Env env{*this, testable_amendments() - fixNFTokenPageLinks};
+            Env env{*this, testableAmendments() - fixNFTokenPageLinks};
             env.fund(XRP(1000), alice);
 
             auto const linkFixFee = drops(env.current()->fees().increment);
-            env(ledgerStateFix::nftPageLinks(alice, alice), fee(linkFixFee), ter(temDISABLED));
+            env(ledgerStateFix::nftPageLinks(alice, alice), Fee(linkFixFee), Ter(temDISABLED));
         }
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         env.fund(XRP(1000), alice);
         std::uint32_t const ticketSeq = env.seq(alice);
         env(ticket::create(alice, 1));
@@ -151,42 +151,42 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         {
             // Fail preflight1.  Can't combine AccountTxnID and ticket.
-            Json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
+            json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
             tx[sfAccountTxnID.jsonName] =
                 "00000000000000000000000000000000"
                 "00000000000000000000000000000000";
-            env(tx, ticket::use(ticketSeq), ter(temINVALID));
+            env(tx, ticket::Use(ticketSeq), Ter(temINVALID));
         }
         // Fee too low.
-        env(ledgerStateFix::nftPageLinks(alice, alice), ter(telINSUF_FEE_P));
+        env(ledgerStateFix::nftPageLinks(alice, alice), Ter(telINSUF_FEE_P));
 
         // Invalid flags.
         auto const linkFixFee = drops(env.current()->fees().increment);
         env(ledgerStateFix::nftPageLinks(alice, alice),
-            fee(linkFixFee),
-            txflags(tfPassive),
-            ter(temINVALID_FLAG));
+            Fee(linkFixFee),
+            Txflags(tfPassive),
+            Ter(temINVALID_FLAG));
 
         {
             // ledgerStateFix::nftPageLinks requires an Owner field.
-            Json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
+            json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
             tx.removeMember(sfOwner.jsonName);
-            env(tx, fee(linkFixFee), ter(temINVALID));
+            env(tx, Fee(linkFixFee), Ter(temINVALID));
         }
         {
             // Invalid LedgerFixType codes.
-            Json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
+            json::Value tx = ledgerStateFix::nftPageLinks(alice, alice);
             tx[sfLedgerFixType.jsonName] = 0;
-            env(tx, fee(linkFixFee), ter(tefINVALID_LEDGER_FIX_TYPE));
+            env(tx, Fee(linkFixFee), Ter(tefINVALID_LEDGER_FIX_TYPE));
 
             tx[sfLedgerFixType.jsonName] = 200;
-            env(tx, fee(linkFixFee), ter(tefINVALID_LEDGER_FIX_TYPE));
+            env(tx, Fee(linkFixFee), Ter(tefINVALID_LEDGER_FIX_TYPE));
         }
 
         // Preclaim
         Account const carol("carol");
         env.memoize(carol);
-        env(ledgerStateFix::nftPageLinks(alice, carol), fee(linkFixFee), ter(tecOBJECT_NOT_FOUND));
+        env(ledgerStateFix::nftPageLinks(alice, carol), Fee(linkFixFee), Ter(tecOBJECT_NOT_FOUND));
     }
 
     void
@@ -198,7 +198,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         Account const alice("alice");
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         env.fund(XRP(1000), alice);
 
         // These cases all return the same TER code, but they exercise
@@ -207,22 +207,22 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         // Owner has no pages to fix.
         auto const linkFixFee = drops(env.current()->fees().increment);
-        env(ledgerStateFix::nftPageLinks(alice, alice), fee(linkFixFee), ter(tecFAILED_PROCESSING));
+        env(ledgerStateFix::nftPageLinks(alice, alice), Fee(linkFixFee), Ter(tecFAILED_PROCESSING));
 
         // Alice has only one page.
-        env(token::mint(alice), txflags(tfTransferable));
+        env(token::mint(alice), Txflags(tfTransferable));
         env.close();
 
-        env(ledgerStateFix::nftPageLinks(alice, alice), fee(linkFixFee), ter(tecFAILED_PROCESSING));
+        env(ledgerStateFix::nftPageLinks(alice, alice), Fee(linkFixFee), Ter(tecFAILED_PROCESSING));
 
         // Alice has at least three pages.
         for (std::uint32_t i = 0; i < 64; ++i)
         {
-            env(token::mint(alice), txflags(tfTransferable));
+            env(token::mint(alice), Txflags(tfTransferable));
             env.close();
         }
 
-        env(ledgerStateFix::nftPageLinks(alice, alice), fee(linkFixFee), ter(tecFAILED_PROCESSING));
+        env(ledgerStateFix::nftPageLinks(alice, alice), Fee(linkFixFee), Ter(tecFAILED_PROCESSING));
     }
 
     void
@@ -245,7 +245,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         Account const carol("carol");
         Account const daria("daria");
 
-        Env env{*this, testable_amendments() - fixNFTokenPageLinks};
+        Env env{*this, testableAmendments() - fixNFTokenPageLinks};
         env.fund(XRP(1000), alice, bob, carol, daria);
 
         //**********************************************************************
@@ -260,7 +260,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         // Get the index of the middle page.
         uint256 const aliceMiddleNFTokenPageIndex = [&env, &alice]() {
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             return lastNFTokenPage->at(sfPreviousPageMin);
         }();
 
@@ -283,12 +283,12 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Removing the last token from the last page deletes the last
         // page.  This is a bug.  The contents of the next-to-last page
         // should have been moved into the last page.
-        BEAST_EXPECT(!env.le(keylet::nftpage_max(alice)));
+        BEAST_EXPECT(!env.le(keylet::nftpageMax(alice)));
 
         // alice's "middle" page is still present, but has no links.
         {
             auto aliceMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), aliceMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), aliceMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(aliceMiddleNFTokenPage))
                 return;
 
@@ -308,7 +308,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         // Get the index of the middle page.
         uint256 const bobMiddleNFTokenPageIndex = [&env, &bob]() {
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(bob));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(bob));
             return lastNFTokenPage->at(sfPreviousPageMin);
         }();
 
@@ -325,13 +325,13 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Removing the last token from the last page deletes the last
         // page.  This is a bug.  The contents of the next-to-last page
         // should have been moved into the last page.
-        BEAST_EXPECT(!env.le(keylet::nftpage_max(bob)));
+        BEAST_EXPECT(!env.le(keylet::nftpageMax(bob)));
 
         // bob's "middle" page is still present, but has lost the
         // NextPageMin field.
         {
             auto bobMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(bob), bobMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(bob), bobMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(bobMiddleNFTokenPage))
                 return;
 
@@ -351,7 +351,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         // Get the index of the middle page.
         uint256 const carolMiddleNFTokenPageIndex = [&env, &carol]() {
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(carol));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(carol));
             return lastNFTokenPage->at(sfPreviousPageMin);
         }();
 
@@ -361,7 +361,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         for (int i = 0; i < 32; ++i)
         {
             uint256 const offerIndex = keylet::nftoffer(carol, env.seq(carol)).key;
-            env(token::createOffer(carol, carolNFTs.back(), XRP(0)), txflags(tfSellNFToken));
+            env(token::createOffer(carol, carolNFTs.back(), XRP(0)), Txflags(tfSellNFToken));
             env.close();
 
             env(token::acceptSellOffer(daria, offerIndex));
@@ -376,12 +376,12 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Removing the last token from the last page deletes the last
         // page.  This is a bug.  The contents of the next-to-last page
         // should have been moved into the last page.
-        BEAST_EXPECT(!env.le(keylet::nftpage_max(carol)));
+        BEAST_EXPECT(!env.le(keylet::nftpageMax(carol)));
 
         // carol's "middle" page is still present, but has lost the
         // NextPageMin field.
         auto carolMiddleNFTokenPage =
-            env.le(keylet::nftpage(keylet::nftpage_min(carol), carolMiddleNFTokenPageIndex));
+            env.le(keylet::nftpage(keylet::nftpageMin(carol), carolMiddleNFTokenPageIndex));
         if (!BEAST_EXPECT(carolMiddleNFTokenPage))
             return;
 
@@ -395,7 +395,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         for (uint256 const& nft : dariaNFTs)
         {
             uint256 const offerIndex = keylet::nftoffer(carol, env.seq(carol)).key;
-            env(token::createOffer(carol, nft, drops(1)), token::owner(daria));
+            env(token::createOffer(carol, nft, drops(1)), token::Owner(daria));
             env.close();
 
             env(token::acceptBuyOffer(daria, offerIndex));
@@ -412,7 +412,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // carol's "middle" page is present and still has no NextPageMin field.
         {
             auto carolMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(carol), carolMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(carol), carolMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(carolMiddleNFTokenPage))
                 return;
 
@@ -421,7 +421,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         }
         // carol has a "last" page again, but it has no PreviousPageMin field.
         {
-            auto carolLastNFTokenPage = env.le(keylet::nftpage_max(carol));
+            auto carolLastNFTokenPage = env.le(keylet::nftpageMax(carol));
 
             BEAST_EXPECT(!carolLastNFTokenPage->isFieldPresent(sfPreviousPageMin));
             BEAST_EXPECT(!carolLastNFTokenPage->isFieldPresent(sfNextPageMin));
@@ -432,7 +432,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         //**********************************************************************
         // Verify that the LedgerStateFix transaction is not enabled.
         auto const linkFixFee = drops(env.current()->fees().increment);
-        env(ledgerStateFix::nftPageLinks(daria, alice), fee(linkFixFee), ter(temDISABLED));
+        env(ledgerStateFix::nftPageLinks(daria, alice), Fee(linkFixFee), Ter(temDISABLED));
 
         // Wait 15 ledgers so the LedgerStateFix transaction is no longer
         // retried.
@@ -449,12 +449,12 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Verify that alice's NFToken directory is still damaged.
 
         // alice's last page should still be missing.
-        BEAST_EXPECT(!env.le(keylet::nftpage_max(alice)));
+        BEAST_EXPECT(!env.le(keylet::nftpageMax(alice)));
 
         // alice's "middle" page is still present and has no links.
         {
             auto aliceMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), aliceMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), aliceMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(aliceMiddleNFTokenPage))
                 return;
 
@@ -468,12 +468,12 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         env(noop(daria));
 
         // daria fixes the links in alice's NFToken directory.
-        env(ledgerStateFix::nftPageLinks(daria, alice), fee(linkFixFee));
+        env(ledgerStateFix::nftPageLinks(daria, alice), Fee(linkFixFee));
         env.close();
 
         // alice's last page should now be present and include no links.
         {
-            auto aliceLastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            auto aliceLastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(aliceLastNFTokenPage))
                 return;
 
@@ -483,7 +483,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
         // alice's middle page should be gone.
         BEAST_EXPECT(
-            !env.le(keylet::nftpage(keylet::nftpage_min(alice), aliceMiddleNFTokenPageIndex)));
+            !env.le(keylet::nftpage(keylet::nftpageMin(alice), aliceMiddleNFTokenPageIndex)));
 
         BEAST_EXPECT(nftCount(env, alice) == 32);
         BEAST_EXPECT(ownerCount(env, alice) == 1);
@@ -495,12 +495,12 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // Verify that bob's NFToken directory is still damaged.
 
         // bob's last page should still be missing.
-        BEAST_EXPECT(!env.le(keylet::nftpage_max(bob)));
+        BEAST_EXPECT(!env.le(keylet::nftpageMax(bob)));
 
         // bob's "middle" page is still present and missing NextPageMin.
         {
             auto bobMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(bob), bobMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(bob), bobMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(bobMiddleNFTokenPage))
                 return;
 
@@ -509,13 +509,13 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         }
 
         // daria fixes the links in bob's NFToken directory.
-        env(ledgerStateFix::nftPageLinks(daria, bob), fee(linkFixFee));
+        env(ledgerStateFix::nftPageLinks(daria, bob), Fee(linkFixFee));
         env.close();
 
         // bob's last page should now be present and include a previous
         // link but no next link.
         {
-            auto const lastPageKeylet = keylet::nftpage_max(bob);
+            auto const lastPageKeylet = keylet::nftpageMax(bob);
             auto const bobLastNFTokenPage = env.le(lastPageKeylet);
             if (!BEAST_EXPECT(bobLastNFTokenPage))
                 return;
@@ -526,7 +526,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
 
             auto const bobNewFirstNFTokenPage = env.le(
                 keylet::nftpage(
-                    keylet::nftpage_min(bob), bobLastNFTokenPage->at(sfPreviousPageMin)));
+                    keylet::nftpageMin(bob), bobLastNFTokenPage->at(sfPreviousPageMin)));
             if (!BEAST_EXPECT(bobNewFirstNFTokenPage))
                 return;
 
@@ -537,7 +537,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         }
 
         // bob's middle page should be gone.
-        BEAST_EXPECT(!env.le(keylet::nftpage(keylet::nftpage_min(bob), bobMiddleNFTokenPageIndex)));
+        BEAST_EXPECT(!env.le(keylet::nftpage(keylet::nftpageMin(bob), bobMiddleNFTokenPageIndex)));
 
         BEAST_EXPECT(nftCount(env, bob) == 64);
         BEAST_EXPECT(ownerCount(env, bob) == 2);
@@ -551,7 +551,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         // carol's "middle" page is present and has no NextPageMin field.
         {
             auto carolMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(carol), carolMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(carol), carolMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(carolMiddleNFTokenPage))
                 return;
 
@@ -560,21 +560,21 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
         }
         // carol has a "last" page, but it has no PreviousPageMin field.
         {
-            auto carolLastNFTokenPage = env.le(keylet::nftpage_max(carol));
+            auto carolLastNFTokenPage = env.le(keylet::nftpageMax(carol));
 
             BEAST_EXPECT(!carolLastNFTokenPage->isFieldPresent(sfPreviousPageMin));
             BEAST_EXPECT(!carolLastNFTokenPage->isFieldPresent(sfNextPageMin));
         }
 
         // carol fixes the links in their own NFToken directory.
-        env(ledgerStateFix::nftPageLinks(carol, carol), fee(linkFixFee));
+        env(ledgerStateFix::nftPageLinks(carol, carol), Fee(linkFixFee));
         env.close();
 
         {
             // carol's "middle" page is present and now has a NextPageMin field.
-            auto const lastPageKeylet = keylet::nftpage_max(carol);
+            auto const lastPageKeylet = keylet::nftpageMax(carol);
             auto carolMiddleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(carol), carolMiddleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(carol), carolMiddleNFTokenPageIndex));
             if (!BEAST_EXPECT(carolMiddleNFTokenPage))
                 return;
 
@@ -596,7 +596,7 @@ class FixNFTokenPageLinks_test : public beast::unit_test::suite
             // carol also has a "first" page that includes a NextPageMin field.
             auto carolFirstNFTokenPage = env.le(
                 keylet::nftpage(
-                    keylet::nftpage_min(carol), carolMiddleNFTokenPage->at(sfPreviousPageMin)));
+                    keylet::nftpageMin(carol), carolMiddleNFTokenPage->at(sfPreviousPageMin)));
             if (!BEAST_EXPECT(carolFirstNFTokenPage))
                 return;
 
diff --git a/src/test/app/FlowMPT_test.cpp b/src/test/app/FlowMPT_test.cpp
index a94d48beb4..9bb91755c8 100644
--- a/src/test/app/FlowMPT_test.cpp
+++ b/src/test/app/FlowMPT_test.cpp
@@ -45,7 +45,7 @@
 
 namespace xrpl::test {
 
-struct FlowMPT_test : public beast::unit_test::suite
+struct FlowMPT_test : public beast::unit_test::Suite
 {
     using Accounts = std::vector<jtx::Account>;
 
@@ -64,22 +64,22 @@ struct FlowMPT_test : public beast::unit_test::suite
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, gw);
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
-            env(pay(gw, alice, USD(100)));
-            env(pay(alice, bob, USD(10)), paths(USD));
-            env.require(balance(bob, USD(10)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+            env(pay(gw, alice, usd(100)));
+            env(pay(alice, bob, usd(10)), Paths(usd));
+            env.require(Balance(bob, usd(10)));
         }
         {
             // Partial payments
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, gw);
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
-            env(pay(gw, alice, USD(100)));
-            env(pay(alice, bob, USD(110)), paths(USD), ter(tecPATH_PARTIAL));
-            env.require(balance(bob, USD(0)));
-            env(pay(alice, bob, USD(110)), paths(USD), txflags(tfPartialPayment));
-            env.require(balance(bob, USD(100)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+            env(pay(gw, alice, usd(100)));
+            env(pay(alice, bob, usd(110)), Paths(usd), Ter(tecPATH_PARTIAL));
+            env.require(Balance(bob, usd(0)));
+            env(pay(alice, bob, usd(110)), Paths(usd), Txflags(tfPartialPayment));
+            env.require(Balance(bob, usd(100)));
         }
 
         {
@@ -90,25 +90,25 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), gw, alice, bob, carol);
                 env.close();
 
-                auto const USD =
+                auto const usd =
                     issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, carol}});
-                auto const EUR =
+                auto const eur =
                     issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {bob}});
 
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, bob, EUR(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, bob, eur(100)));
 
-                env(offer(alice, EUR(4), USD(4)));
+                env(offer(alice, eur(4), usd(4)));
                 env.close();
 
-                env(pay(bob, carol, USD(5)),
-                    sendmax(EUR(4)),
-                    txflags(tfLimitQuality | tfPartialPayment),
-                    ter(tecPATH_DRY));
-                env.require(balance(carol, USD(0)));
+                env(pay(bob, carol, usd(5)),
+                    Sendmax(eur(4)),
+                    Txflags(tfLimitQuality | tfPartialPayment),
+                    Ter(tecPATH_DRY));
+                env.require(Balance(carol, usd(0)));
 
-                env(pay(bob, carol, USD(5)), sendmax(EUR(4)), txflags(tfPartialPayment));
-                env.require(balance(carol, USD(4)));
+                env(pay(bob, carol, usd(5)), Sendmax(eur(4)), Txflags(tfPartialPayment));
+                env.require(Balance(carol, usd(4)));
             };
             testHelper2TokensMix(test);
         }
@@ -134,23 +134,23 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env, .token = "BTC", .issuer = gw, .holders = {alice, bob, carol}});
 
-                env(pay(gw, alice, BTC(50)));
-                env(pay(gw, bob, USD(50)));
+                env(pay(gw, alice, btc(50)));
+                env(pay(gw, bob, usd(50)));
 
-                env(offer(bob, BTC(50), USD(50)));
+                env(offer(bob, btc(50), usd(50)));
 
-                env(pay(alice, carol, USD(50)), path(~USD), sendmax(BTC(50)));
+                env(pay(alice, carol, usd(50)), Path(~usd), Sendmax(btc(50)));
 
-                env.require(balance(alice, BTC(0)));
-                env.require(balance(bob, BTC(50)));
-                env.require(balance(bob, USD(0)));
-                env.require(balance(carol, USD(50)));
-                BEAST_EXPECT(!isOffer(env, bob, BTC(50), USD(50)));
+                env.require(Balance(alice, btc(0)));
+                env.require(Balance(bob, btc(50)));
+                env.require(Balance(bob, usd(0)));
+                env.require(Balance(carol, usd(50)));
+                BEAST_EXPECT(!isOffer(env, bob, btc(50), usd(50)));
             };
             testHelper2TokensMix(test);
         }
@@ -162,25 +162,25 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env, .token = "BTC", .issuer = gw, .holders = {alice, bob, carol}});
 
-                env(pay(gw, alice, BTC(50)));
-                env(pay(gw, bob, USD(50)));
+                env(pay(gw, alice, btc(50)));
+                env(pay(gw, bob, usd(50)));
 
-                env(offer(bob, BTC(50), XRP(50)));
-                env(offer(bob, XRP(50), USD(50)));
+                env(offer(bob, btc(50), XRP(50)));
+                env(offer(bob, XRP(50), usd(50)));
 
-                env(pay(alice, carol, USD(50)), path(~XRP, ~USD), sendmax(BTC(50)));
+                env(pay(alice, carol, usd(50)), Path(~XRP, ~usd), Sendmax(btc(50)));
 
-                env.require(balance(alice, BTC(0)));
-                env.require(balance(bob, BTC(50)));
-                env.require(balance(bob, USD(0)));
-                env.require(balance(carol, USD(50)));
-                BEAST_EXPECT(!isOffer(env, bob, XRP(50), USD(50)));
-                BEAST_EXPECT(!isOffer(env, bob, BTC(50), XRP(50)));
+                env.require(Balance(alice, btc(0)));
+                env.require(Balance(bob, btc(50)));
+                env.require(Balance(bob, usd(0)));
+                env.require(Balance(carol, usd(50)));
+                BEAST_EXPECT(!isOffer(env, bob, XRP(50), usd(50)));
+                BEAST_EXPECT(!isOffer(env, bob, btc(50), XRP(50)));
             };
             testHelper2TokensMix(test);
         }
@@ -191,22 +191,22 @@ struct FlowMPT_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, carol, gw);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
-            MPT const BTC = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const btc = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
 
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, bob, usd(50)));
 
-            env(offer(bob, XRP(50), USD(50)));
+            env(offer(bob, XRP(50), usd(50)));
 
-            env(pay(alice, carol, USD(50)), path(~USD), sendmax(XRP(50)));
+            env(pay(alice, carol, usd(50)), Path(~usd), Sendmax(XRP(50)));
 
             // fee: MPTokenAuthorize * 2(EUR, USD) + pay
-            env.require(balance(alice, XRP(10'000 - 50) - txfee(env, 3)));
+            env.require(Balance(alice, XRP(10'000 - 50) - txFee(env, 3)));
             // fee: MPTokenAuthorize * 2(EUR, USD) + offer
-            env.require(balance(bob, XRP(10'000 + 50) - txfee(env, 3)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(carol, USD(50)));
-            BEAST_EXPECT(!isOffer(env, bob, XRP(50), USD(50)));
+            env.require(Balance(bob, XRP(10'000 + 50) - txFee(env, 3)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(carol, usd(50)));
+            BEAST_EXPECT(!isOffer(env, bob, XRP(50), usd(50)));
         }
         {
             // simple USD -> XRP through offer and sendmax
@@ -215,20 +215,20 @@ struct FlowMPT_test : public beast::unit_test::suite
             env.fund(XRP(10'000), alice, bob, carol, gw);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
-            MPT const BTC = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const btc = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
 
-            env(pay(gw, alice, USD(50)));
+            env(pay(gw, alice, usd(50)));
 
-            env(offer(bob, USD(50), XRP(50)));
+            env(offer(bob, usd(50), XRP(50)));
 
-            env(pay(alice, carol, XRP(50)), path(~XRP), sendmax(USD(50)));
+            env(pay(alice, carol, XRP(50)), Path(~XRP), Sendmax(usd(50)));
 
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, XRP(10'000 - 50) - txfee(env, 3)));
-            env.require(balance(bob, USD(50)));
-            env.require(balance(carol, XRP(10'000 + 50) - txfee(env, 2)));
-            BEAST_EXPECT(!isOffer(env, bob, USD(50), XRP(50)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, XRP(10'000 - 50) - txFee(env, 3)));
+            env.require(Balance(bob, usd(50)));
+            env.require(Balance(carol, XRP(10'000 + 50) - txFee(env, 2)));
+            BEAST_EXPECT(!isOffer(env, bob, usd(50), XRP(50)));
         }
         {
             // test unfunded offers are removed when payment succeeds
@@ -238,41 +238,41 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env, .token = "BTC", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const EUR = issue3(
+                auto const eur = issue3(
                     {.env = env, .token = "EUR", .issuer = gw, .holders = {alice, bob, carol}});
 
-                env(pay(gw, alice, BTC(60)));
-                env(pay(gw, bob, USD(50)));
-                env(pay(gw, bob, EUR(50)));
+                env(pay(gw, alice, btc(60)));
+                env(pay(gw, bob, usd(50)));
+                env(pay(gw, bob, eur(50)));
 
-                env(offer(bob, BTC(50), USD(50)));
-                env(offer(bob, BTC(40), EUR(50)));
-                env(offer(bob, EUR(50), USD(50)));
+                env(offer(bob, btc(50), usd(50)));
+                env(offer(bob, btc(40), eur(50)));
+                env(offer(bob, eur(50), usd(50)));
 
                 // unfund offer
-                env(pay(bob, gw, EUR(50)));
-                env.require(balance(bob, EUR(0)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(50)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(40), EUR(50)));
-                BEAST_EXPECT(isOffer(env, bob, EUR(50), USD(50)));
+                env(pay(bob, gw, eur(50)));
+                env.require(Balance(bob, eur(0)));
+                BEAST_EXPECT(isOffer(env, bob, btc(50), usd(50)));
+                BEAST_EXPECT(isOffer(env, bob, btc(40), eur(50)));
+                BEAST_EXPECT(isOffer(env, bob, eur(50), usd(50)));
 
-                env(pay(alice, carol, USD(50)), path(~USD), path(~EUR, ~USD), sendmax(BTC(60)));
+                env(pay(alice, carol, usd(50)), Path(~usd), Path(~eur, ~usd), Sendmax(btc(60)));
 
-                env.require(balance(alice, BTC(10)));
-                env.require(balance(bob, BTC(50)));
-                env.require(balance(bob, USD(0)));
-                env.require(balance(bob, EUR(0)));
-                env.require(balance(carol, USD(50)));
+                env.require(Balance(alice, btc(10)));
+                env.require(Balance(bob, btc(50)));
+                env.require(Balance(bob, usd(0)));
+                env.require(Balance(bob, eur(0)));
+                env.require(Balance(carol, usd(50)));
                 // used in the payment
-                BEAST_EXPECT(!isOffer(env, bob, BTC(50), USD(50)));
+                BEAST_EXPECT(!isOffer(env, bob, btc(50), usd(50)));
                 // found unfunded
-                BEAST_EXPECT(!isOffer(env, bob, BTC(40), EUR(50)));
+                BEAST_EXPECT(!isOffer(env, bob, btc(40), eur(50)));
                 // unfunded, but should not yet be found unfunded
-                BEAST_EXPECT(isOffer(env, bob, EUR(50), USD(50)));
+                BEAST_EXPECT(isOffer(env, bob, eur(50), usd(50)));
             };
             testHelper3TokensMix(test);
         }
@@ -291,61 +291,61 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000});
-                auto const BTC = issue2(
+                auto const btc = issue2(
                     {.env = env,
                      .token = "BTC",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000});
-                auto const EUR = issue3(
+                auto const eur = issue3(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000});
 
-                env(pay(gw, alice, BTC(60)));
-                env(pay(gw, bob, USD(6'000)));
-                env(pay(gw, bob, EUR(5'000)));
-                env(pay(gw, carol, EUR(100)));
+                env(pay(gw, alice, btc(60)));
+                env(pay(gw, bob, usd(6'000)));
+                env(pay(gw, bob, eur(5'000)));
+                env(pay(gw, carol, eur(100)));
 
-                env(offer(bob, BTC(50), USD(5'000)));
-                env(offer(bob, BTC(60), EUR(5'000)));
-                env(offer(carol, BTC(1'000), EUR(100)));
-                env(offer(bob, EUR(5'000), USD(5'000)));
+                env(offer(bob, btc(50), usd(5'000)));
+                env(offer(bob, btc(60), eur(5'000)));
+                env(offer(carol, btc(1'000), eur(100)));
+                env(offer(bob, eur(5'000), usd(5'000)));
 
                 // unfund offer
-                env(pay(bob, gw, EUR(5'000)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(5'000)));
-                BEAST_EXPECT(isOffer(env, bob, BTC(60), EUR(5'000)));
-                BEAST_EXPECT(isOffer(env, carol, BTC(1'000), EUR(100)));
+                env(pay(bob, gw, eur(5'000)));
+                BEAST_EXPECT(isOffer(env, bob, btc(50), usd(5'000)));
+                BEAST_EXPECT(isOffer(env, bob, btc(60), eur(5'000)));
+                BEAST_EXPECT(isOffer(env, carol, btc(1'000), eur(100)));
 
                 auto flowJournal = env.app().getLogs().journal("Flow");
                 auto const flowResult = [&] {
-                    STAmount const deliver(USD(5'100));
-                    STAmount smax(BTC(61));
-                    PaymentSandbox sb(env.current().get(), tapNONE);
+                    STAmount const deliver(usd(5'100));
+                    STAmount smax(btc(61));
+                    PaymentSandbox sb(env.current().get(), TapNone);
                     STPathSet paths;
-                    auto IPE = [](Asset const& asset) {
+                    auto ipe = [](Asset const& asset) {
                         return STPathElement(
-                            STPathElement::typeAsset | STPathElement::typeIssuer,
+                            STPathElement::TypeAsset | STPathElement::TypeIssuer,
                             xrpAccount(),
                             asset,
                             asset.getIssuer());
                     };
                     {
                         // BTC -> USD
-                        STPath const p1({IPE(USD)});
-                        paths.push_back(p1);
+                        STPath const p1({ipe(usd)});
+                        paths.pushBack(p1);
                         // BTC -> EUR -> USD
-                        STPath const p2({IPE(EUR), IPE(USD)});
-                        paths.push_back(p2);
+                        STPath const p2({ipe(eur), ipe(usd)});
+                        paths.pushBack(p2);
                     }
 
                     return flow(
@@ -357,7 +357,7 @@ struct FlowMPT_test : public beast::unit_test::suite
                         false,
                         false,
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         std::nullopt,
                         smax,
                         std::nullopt,
@@ -368,7 +368,7 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
                     if (flowResult.removableOffers.empty())
                         return false;
-                    Sandbox sb(&view, tapNONE);
+                    Sandbox sb(&view, TapNone);
                     for (auto const& o : flowResult.removableOffers)
                     {
                         if (auto ok = sb.peek(keylet::offer(o)))
@@ -380,10 +380,10 @@ struct FlowMPT_test : public beast::unit_test::suite
 
                 // used in payment, but since payment failed should
                 // be untouched
-                BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(5'000)));
-                BEAST_EXPECT(isOffer(env, carol, BTC(1'000), EUR(100)));
+                BEAST_EXPECT(isOffer(env, bob, btc(50), usd(5'000)));
+                BEAST_EXPECT(isOffer(env, carol, btc(1'000), eur(100)));
                 // found unfunded
-                BEAST_EXPECT(!isOffer(env, bob, BTC(60), EUR(5'000)));
+                BEAST_EXPECT(!isOffer(env, bob, btc(60), eur(5'000)));
             };
             testHelper3TokensMix(test);
         }
@@ -400,17 +400,17 @@ struct FlowMPT_test : public beast::unit_test::suite
                 Env env(*this, features);
                 env.fund(XRP(10'000), alice, bob, carol, gw);
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob, carol}});
-                auto const EUR = issue1(
+                auto const eur = issue1(
                     {.env = env, .token = "EUR", .issuer = gw, .holders = {alice, bob, carol}});
 
-                env(pay(gw, alice, USD(1'000)));
-                env(pay(gw, bob, EUR(1'000)));
+                env(pay(gw, alice, usd(1'000)));
+                env(pay(gw, bob, eur(1'000)));
 
                 Keylet const bobUsdOffer = keylet::offer(bob, env.seq(bob));
-                env(offer(bob, USD(10), drops(2)), txflags(tfPassive));
-                env(offer(bob, drops(1), EUR(1'000)), txflags(tfPassive));
+                env(offer(bob, usd(10), drops(2)), Txflags(tfPassive));
+                env(offer(bob, drops(1), eur(1'000)), Txflags(tfPassive));
 
                 bool const reducedOffersV2 = features[fixReducedOffersV2];
 
@@ -420,17 +420,17 @@ struct FlowMPT_test : public beast::unit_test::suite
                 // remaining fractional offer would block the order
                 // book.
                 TER const expectedTER = reducedOffersV2 ? TER(tecPATH_DRY) : TER(tesSUCCESS);
-                env(pay(alice, carol, EUR(1)),
-                    path(~XRP, ~EUR),
-                    sendmax(USD(4)),
-                    txflags(tfNoRippleDirect | tfPartialPayment),
-                    ter(expectedTER));
+                env(pay(alice, carol, eur(1)),
+                    Path(~XRP, ~eur),
+                    Sendmax(usd(4)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment),
+                    Ter(expectedTER));
 
                 if (!reducedOffersV2)
                 {
-                    env.require(balance(carol, EUR(1)));
-                    env.require(balance(bob, USD(4)));
-                    env.require(balance(bob, EUR(999)));
+                    env.require(Balance(carol, eur(1)));
+                    env.require(Balance(bob, usd(4)));
+                    env.require(Balance(bob, eur(999)));
 
                     // Show that bob's USD offer is now a blocker.
                     std::shared_ptr<SLE const> const usdOffer = env.le(bobUsdOffer);
@@ -479,17 +479,17 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob, carol},
                  .transferFee = 25'000,
                  .maxAmt = 1'000});
 
-            env(pay(gw, alice, USD(50)));
-            env.require(balance(alice, USD(50)));
-            env(pay(alice, bob, USD(40)), sendmax(USD(50)));
-            env.require(balance(bob, USD(40)), balance(alice, USD(0)));
+            env(pay(gw, alice, usd(50)));
+            env.require(Balance(alice, usd(50)));
+            env(pay(alice, bob, usd(40)), Sendmax(usd(50)));
+            env.require(Balance(bob, usd(40)), Balance(alice, usd(0)));
         }
         {
             // transfer rate is not charged when issuer is src or
@@ -498,17 +498,17 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10'000), alice, bob, carol, gw);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob, carol},
                  .transferFee = 25'000,
                  .maxAmt = 1'000});
 
-            env(pay(gw, alice, USD(50)));
-            env.require(balance(alice, USD(50)));
-            env(pay(alice, gw, USD(40)), sendmax(USD(40)));
-            env.require(balance(alice, USD(10)));
+            env(pay(gw, alice, usd(50)));
+            env.require(Balance(alice, usd(50)));
+            env(pay(alice, gw, usd(40)), Sendmax(usd(40)));
+            env.require(Balance(alice, usd(10)));
         }
         {
             // transfer fee on an offer
@@ -516,7 +516,7 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10'000), alice, bob, carol, gw);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob, carol},
@@ -524,20 +524,20 @@ struct FlowMPT_test : public beast::unit_test::suite
                  .maxAmt = 10'000});
 
             // scale by 1
-            env(pay(gw, bob, USD(650)));
+            env(pay(gw, bob, usd(650)));
 
-            env(offer(bob, XRP(50), USD(500)));
+            env(offer(bob, XRP(50), usd(500)));
 
-            env(pay(alice, carol, USD(500)),
-                path(~USD),
-                sendmax(XRP(50)),
-                txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(500)),
+                Path(~usd),
+                Sendmax(XRP(50)),
+                Txflags(tfPartialPayment));
 
             // bob pays 25% on 500USD -> 100USD; 400USD goes to carol
             env.require(
-                balance(alice, XRP(10'000 - 50) - txfee(env, 2)),
-                balance(bob, USD(150)),
-                balance(carol, USD(400)));
+                Balance(alice, XRP(10'000 - 50) - txFee(env, 2)),
+                Balance(bob, usd(150)),
+                Balance(carol, usd(400)));
         }
         {
             // Transfer fee two consecutive offers
@@ -547,14 +547,14 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 1'000,
                      .transferFee = 25'000});
-                auto const EUR = issue2(
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
@@ -562,19 +562,19 @@ struct FlowMPT_test : public beast::unit_test::suite
                      .limit = 1'000,
                      .transferFee = 25'000});
 
-                env(pay(gw, bob, USD(50)));
-                env(pay(gw, bob, EUR(50)));
+                env(pay(gw, bob, usd(50)));
+                env(pay(gw, bob, eur(50)));
 
-                env(offer(bob, XRP(50), USD(50)));
-                env(offer(bob, USD(50), EUR(50)));
+                env(offer(bob, XRP(50), usd(50)));
+                env(offer(bob, usd(50), eur(50)));
 
-                env(pay(alice, carol, EUR(40)),
-                    path(~USD, ~EUR),
-                    sendmax(XRP(40)),
-                    txflags(tfPartialPayment));
+                env(pay(alice, carol, eur(40)),
+                    Path(~usd, ~eur),
+                    Sendmax(XRP(40)),
+                    Txflags(tfPartialPayment));
                 // +1 for fset in helperIssueIOU
-                using tEUR = std::decay_t<decltype(EUR)>;
-                auto const fee = txfee(env, 3);
+                using tEUR = std::decay_t<decltype(eur)>;
+                auto const fee = txFee(env, 3);
                 // bob pays 25% on 40USD (40 since sendmax is 40XRP)
                 // 8USD goes to gw and 32USD goes back to bob ->
                 // bob's USD balance is 42USD. USD/EUR offer is 32USD/32EUR.
@@ -583,18 +583,18 @@ struct FlowMPT_test : public beast::unit_test::suite
                 auto const carolEUR = [&]() {
                     if constexpr (std::is_same_v<tEUR, IOU>)
                     {
-                        return EUR(25.6);
+                        return eur(25.6);
                     }
                     else
                     {
-                        return EUR(25);
+                        return eur(25);
                     }
                 }();
                 env.require(
-                    balance(alice, XRP(10'000 - 40) - fee),
-                    balance(bob, USD(42)),
-                    balance(bob, EUR(18)),
-                    balance(carol, carolEUR));
+                    Balance(alice, XRP(10'000 - 40) - fee),
+                    Balance(bob, usd(42)),
+                    Balance(bob, eur(18)),
+                    Balance(carol, carolEUR));
             };
             testHelper2TokensMix(test);
         }
@@ -605,16 +605,16 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10'000), alice, bob, gw);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .transferFee = 25'000,
                  .maxAmt = 1'000});
 
-            env(offer(gw, XRP(100), USD(100)));
-            env(pay(alice, bob, USD(100)), sendmax(XRP(100)), txflags(tfPartialPayment));
-            env.require(balance(alice, XRP(10'000 - 100) - txfee(env, 2)), balance(bob, USD(80)));
+            env(offer(gw, XRP(100), usd(100)));
+            env(pay(alice, bob, usd(100)), Sendmax(XRP(100)), Txflags(tfPartialPayment));
+            env.require(Balance(alice, XRP(10'000 - 100) - txFee(env, 2)), Balance(bob, usd(80)));
         }
         {
             // Offer where the owner is also the issuer, sender pays
@@ -623,16 +623,16 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10'000), alice, bob, gw);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
                  .transferFee = 25'000,
                  .maxAmt = 1'000});
 
-            env(offer(gw, XRP(125), USD(125)));
-            env(pay(alice, bob, USD(100)), sendmax(XRP(200)));
-            env.require(balance(alice, XRP(10'000 - 125) - txfee(env, 2)), balance(bob, USD(100)));
+            env(offer(gw, XRP(125), usd(125)));
+            env(pay(alice, bob, usd(100)), Sendmax(XRP(200)));
+            env.require(Balance(alice, XRP(10'000 - 125) - txFee(env, 2)), Balance(bob, usd(100)));
         }
     }
 
@@ -655,13 +655,13 @@ struct FlowMPT_test : public beast::unit_test::suite
             env.fund(reserve(env, 5), bob);
             env.close();
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, carol, bob}});
-            auto const EUR =
+            auto const eur =
                 issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {alice, carol, bob}});
 
-            env(pay(gw, alice, EUR(50)));
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, alice, eur(50)));
+            env(pay(gw, bob, usd(50)));
 
             // Bob has _just_ slightly less than 50 xrp available
             // If his owner count changes, he will have more liquidity.
@@ -671,16 +671,16 @@ struct FlowMPT_test : public beast::unit_test::suite
             // second call will return tecPATH_DRY, but the entire path
             // should not be marked as dry. This is the second error
             // case to test (when flowV1 is used).
-            env(offer(bob, EUR(50), XRP(50)));
-            env(offer(bob, XRP(50), USD(50)));
+            env(offer(bob, eur(50), XRP(50)));
+            env(offer(bob, XRP(50), usd(50)));
 
-            env(pay(alice, carol, USD(1'000'000)),
-                path(~XRP, ~USD),
-                sendmax(EUR(500)),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(alice, carol, usd(1'000'000)),
+                Path(~XRP, ~usd),
+                Sendmax(eur(500)),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
 
-            auto const carolUSD = env.balance(carol, USD).value();
-            BEAST_EXPECT(carolUSD > USD(0) && carolUSD < USD(50));
+            auto const carolUSD = env.balance(carol, usd).value();
+            BEAST_EXPECT(carolUSD > usd(0) && carolUSD < usd(50));
         };
         testHelper2TokensMix(test);
     }
@@ -706,18 +706,18 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(10'000), alice, bob, carol, gw);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
 
-            env(pay(gw, bob, USD(100)));
-            env(offer(bob, XRP(50), USD(50)));
-            env(offer(bob, XRP(100), USD(50)));
+            env(pay(gw, bob, usd(100)));
+            env(offer(bob, XRP(50), usd(50)));
+            env(offer(bob, XRP(100), usd(50)));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(XRP(100)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice, carol, usd(100)),
+                Path(~usd),
+                Sendmax(XRP(100)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
 
-            env.require(balance(carol, USD(50)));
+            env.require(Balance(carol, usd(50)));
         }
     }
 
@@ -770,21 +770,21 @@ struct FlowMPT_test : public beast::unit_test::suite
             env.fund(reserve(env, 3) + f * 4, alice);
             env.close();
 
-            auto const USD = issue1(
+            auto const usd = issue1(
                 {.env = env, .token = "USD", .issuer = gw1, .holders = {alice}, .limit = 20'000});
-            auto const EUR = issue2(
+            auto const eur = issue2(
                 {.env = env, .token = "EUR", .issuer = gw2, .holders = {alice}, .limit = 20'000});
 
-            env(pay(gw1, alice, USD(10)));
-            env(pay(gw2, alice, EUR(10'000)));
+            env(pay(gw1, alice, usd(10)));
+            env(pay(gw2, alice, eur(10'000)));
             env.close();
 
-            env(offer(alice, USD(5'000), EUR(6'000)));
+            env(offer(alice, usd(5'000), eur(6'000)));
             env.close();
 
-            env.require(owners(alice, 3));
-            env.require(balance(alice, USD(10)));
-            env.require(balance(alice, EUR(10'000)));
+            env.require(Owners(alice, 3));
+            env.require(Balance(alice, usd(10)));
+            env.require(Balance(alice, eur(10'000)));
 
             auto aliceOffers = offersOnAccount(env, alice);
             BEAST_EXPECT(aliceOffers.size() == 1);
@@ -792,31 +792,31 @@ struct FlowMPT_test : public beast::unit_test::suite
             {
                 auto const offer = *offerPtr;
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(offer[sfTakerGets] == EUR(6'000));
-                BEAST_EXPECT(offer[sfTakerPays] == USD(5'000));
+                BEAST_EXPECT(offer[sfTakerGets] == eur(6'000));
+                BEAST_EXPECT(offer[sfTakerPays] == usd(5'000));
             }
 
-            env(pay(alice, alice, EUR(6'000)), sendmax(USD(5'000)), txflags(tfPartialPayment));
+            env(pay(alice, alice, eur(6'000)), Sendmax(usd(5'000)), Txflags(tfPartialPayment));
             env.close();
 
-            env.require(owners(alice, 3));
-            env.require(balance(alice, USD(10)));
-            env.require(balance(alice, EUR(10'000)));
+            env.require(Owners(alice, 3));
+            env.require(Balance(alice, usd(10)));
+            env.require(Balance(alice, eur(10'000)));
             aliceOffers = offersOnAccount(env, alice);
             BEAST_EXPECT(aliceOffers.size() == 1);
             for (auto const& offerPtr : aliceOffers)
             {
                 auto const offer = *offerPtr;
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                if constexpr (std::is_same_v<std::decay_t<decltype(EUR)>, IOU>)
+                if constexpr (std::is_same_v<std::decay_t<decltype(eur)>, IOU>)
                 {
-                    BEAST_EXPECT(offer[sfTakerGets] == EUR(5'988));
+                    BEAST_EXPECT(offer[sfTakerGets] == eur(5'988));
                 }
                 else
                 {
-                    BEAST_EXPECT(offer[sfTakerGets] == EUR(5'989));
+                    BEAST_EXPECT(offer[sfTakerGets] == eur(5'989));
                 }
-                BEAST_EXPECT(offer[sfTakerPays] == USD(4'990));
+                BEAST_EXPECT(offer[sfTakerPays] == usd(4'990));
             }
         };
         testHelper2TokensMix(test);
@@ -846,9 +846,9 @@ struct FlowMPT_test : public beast::unit_test::suite
         auto const alice = Account("alice");
 
         auto initMPT = [&](Env& env) {
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw1, .holders = {alice}, .maxAmt = 506});
-            MPT const EUR =
+            MPT const eur =
                 MPTTester({.env = env, .issuer = gw2, .holders = {alice}, .maxAmt = 606});
             // Payment's engine last step overflows
             // OutstandingAmount since it doesn't know if the
@@ -857,11 +857,11 @@ struct FlowMPT_test : public beast::unit_test::suite
             // Note remaining takerGets is 541 rather than 540 due to integral
             // rounding. XRP has a similar result.
             return TokenData<MPT, MPT>{
-                .gets = EUR, .pays = USD, .remTakerGets = EUR(541), .remTakerPays = USD(450)};
+                .gets = eur, .pays = usd, .remTakerGets = eur(541), .remTakerPays = usd(450)};
         };
 
         auto initXRP = [&](Env& env) {
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw1, .holders = {alice}, .maxAmt = 1'000});
             // Payment's engine last step overflows
             // OutstandingAmount since it doesn't know if the
@@ -869,37 +869,37 @@ struct FlowMPT_test : public beast::unit_test::suite
             // available. Consequently, the entire offer is crossed.
             // Note remaining takerGets is 540.000001 rather than 540 due to
             // integral rounding.
-            return TokenData<XRP_t, MPT>{
+            return TokenData<XrpT, MPT>{
                 .gets = XRP,
-                .pays = USD,
+                .pays = usd,
                 .remTakerGets = XRP(540.000001),
-                .remTakerPays = USD(450)};
+                .remTakerPays = usd(450)};
         };
 
         auto initIOU = [&](Env& env) {
-            auto const USD = gw1["USD"];
-            auto const EUR = gw2["EUR"];
-            env(trust(alice, USD(506)));
-            env(trust(alice, EUR(606)));
+            auto const usd = gw1["USD"];
+            auto const eur = gw2["EUR"];
+            env(trust(alice, usd(506)));
+            env(trust(alice, eur(606)));
             env.close();
             // Payment's engine last step is limited by alice's
             // trustline - 606. Therefore, only 6EUR is delivered
             // and the offer is partially crossed.
             return TokenData<IOU, IOU>{
-                .gets = EUR, .pays = USD, .remTakerGets = EUR(594), .remTakerPays = USD(495)};
+                .gets = eur, .pays = usd, .remTakerGets = eur(594), .remTakerPays = usd(495)};
         };
 
         auto initIOU1 = [&](Env& env) {
-            auto const USD = gw1["USD"];
-            auto const EUR = gw2["EUR"];
-            env(trust(alice, USD(1'000)));
-            env(trust(alice, EUR(1'000)));
+            auto const usd = gw1["USD"];
+            auto const eur = gw2["EUR"];
+            env(trust(alice, usd(1'000)));
+            env(trust(alice, eur(1'000)));
             env.close();
             // Payment's engine last step is not limited by alice's
             // trustline. Therefore, the entire offer is crossed.
             // This the same result as with MPT.
             return TokenData<IOU, IOU>{
-                .gets = EUR, .pays = USD, .remTakerGets = EUR(540), .remTakerPays = USD(450)};
+                .gets = eur, .pays = usd, .remTakerGets = eur(540), .remTakerPays = usd(450)};
         };
 
         auto test = [&](auto&& initToken) {
@@ -912,28 +912,28 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             auto const tok = initToken(env);
 
-            auto const& TOK1 = tok.pays;
-            auto const& TOK2 = tok.gets;
-            bool const isTakerGetsXRP = isXRP(Asset{TOK2});
+            auto const& toK1 = tok.pays;
+            auto const& toK2 = tok.gets;
+            bool const isTakerGetsXRP = isXRP(Asset{toK2});
             std::uint32_t const ownerCnt = isTakerGetsXRP ? 2 : 3;
 
-            env(pay(gw1, alice, TOK1(500)));
+            env(pay(gw1, alice, toK1(500)));
             if (!isTakerGetsXRP)
-                env(pay(gw2, alice, TOK2(600)));
+                env(pay(gw2, alice, toK2(600)));
             env.close();
 
-            env(offer(alice, TOK1(500), TOK2(600)));
+            env(offer(alice, toK1(500), toK2(600)));
             env.close();
 
-            env.require(owners(alice, ownerCnt));
-            env.require(balance(alice, TOK1(500)));
+            env.require(Owners(alice, ownerCnt));
+            env.require(Balance(alice, toK1(500)));
             if (isTakerGetsXRP)
             {
-                env.require(balance(alice, TOK2(2'000) - 2 * f));
+                env.require(Balance(alice, toK2(2'000) - 2 * f));
             }
             else
             {
-                env.require(balance(alice, TOK2(600)));
+                env.require(Balance(alice, toK2(600)));
             }
 
             auto aliceOffers = offersOnAccount(env, alice);
@@ -942,22 +942,22 @@ struct FlowMPT_test : public beast::unit_test::suite
             {
                 auto const offer = *offerPtr;
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(offer[sfTakerGets] == TOK2(600));
-                BEAST_EXPECT(offer[sfTakerPays] == TOK1(500));
+                BEAST_EXPECT(offer[sfTakerGets] == toK2(600));
+                BEAST_EXPECT(offer[sfTakerPays] == toK1(500));
             }
 
-            env(pay(alice, alice, TOK2(60)), sendmax(TOK1(50)), txflags(tfPartialPayment));
+            env(pay(alice, alice, toK2(60)), Sendmax(toK1(50)), Txflags(tfPartialPayment));
             env.close();
 
-            env.require(owners(alice, ownerCnt));
-            env.require(balance(alice, TOK1(500)));
+            env.require(Owners(alice, ownerCnt));
+            env.require(Balance(alice, toK1(500)));
             if (isTakerGetsXRP)
             {
-                env.require(balance(alice, TOK2(2'000) - 3 * f));
+                env.require(Balance(alice, toK2(2'000) - 3 * f));
             }
             else
             {
-                env.require(balance(alice, TOK2(600)));
+                env.require(Balance(alice, toK2(600)));
             }
             aliceOffers = offersOnAccount(env, alice);
             BEAST_EXPECT(aliceOffers.size() == 1);
@@ -995,18 +995,18 @@ struct FlowMPT_test : public beast::unit_test::suite
 
         env.fund(XRP(10'000), alice, gw);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 20});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 20});
 
-        env(pay(gw, alice, USD(10)));
-        env(offer(alice, XRP(50'000), USD(10)));
+        env(pay(gw, alice, usd(10)));
+        env(offer(alice, XRP(50'000), usd(10)));
 
         // Consuming the offer changes the owner count, which could
         // also cause liquidity to decrease in the forward pass
-        auto const toSend = consumeOffer ? USD(10) : USD(9);
+        auto const toSend = consumeOffer ? usd(10) : usd(9);
         env(pay(alice, alice, toSend),
-            path(~USD),
-            sendmax(XRP(20'000)),
-            txflags(tfPartialPayment | tfNoRippleDirect));
+            Path(~usd),
+            Sendmax(XRP(20'000)),
+            Txflags(tfPartialPayment | tfNoRippleDirect));
     }
 
     void
@@ -1025,21 +1025,21 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(100'000), alice, bob, gw);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 20E+17});
 
             // scale by 17
-            STAmount const tinyAmt1{USD, 9'000'000'000'000'000ll, 0, false, STAmount::unchecked{}};
-            STAmount const tinyAmt3{USD, 9'000'000'000'000'003ll, 0, false, STAmount::unchecked{}};
+            STAmount const tinyAmt1{usd, 9'000'000'000'000'000ll, 0, false, STAmount::Unchecked{}};
+            STAmount const tinyAmt3{usd, 9'000'000'000'000'003ll, 0, false, STAmount::Unchecked{}};
 
             env(offer(gw, drops(9'000'000'000), tinyAmt3));
 
             env(pay(alice, bob, tinyAmt1),
-                path(~USD),
-                sendmax(drops(9'000'000'000)),
-                txflags(tfNoRippleDirect));
+                Path(~usd),
+                Sendmax(drops(9'000'000'000)),
+                Txflags(tfNoRippleDirect));
 
-            BEAST_EXPECT(!isOffer(env, gw, XRP(0), USD(0)));
+            BEAST_EXPECT(!isOffer(env, gw, XRP(0), usd(0)));
         }
         {
             // Test forward
@@ -1051,22 +1051,22 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(100'000), alice, bob, gw);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 20E+17});
 
             // scale by 17
-            STAmount const tinyAmt1{USD, 9'000'000'000'000'000ll, 0, false, STAmount::unchecked{}};
-            STAmount const tinyAmt3{USD, 9'000'000'000'000'003ll, 0, false, STAmount::unchecked{}};
+            STAmount const tinyAmt1{usd, 9'000'000'000'000'000ll, 0, false, STAmount::Unchecked{}};
+            STAmount const tinyAmt3{usd, 9'000'000'000'000'003ll, 0, false, STAmount::Unchecked{}};
 
             env(pay(gw, alice, tinyAmt1));
 
             env(offer(gw, tinyAmt3, drops(9'000'000'000)));
             env(pay(alice, bob, drops(9'000'000'000)),
-                path(~XRP),
-                sendmax(USD(static_cast<std::uint64_t>(1E+17))),
-                txflags(tfNoRippleDirect));
+                Path(~XRP),
+                Sendmax(usd(static_cast<std::uint64_t>(1E+17))),
+                Txflags(tfNoRippleDirect));
 
-            BEAST_EXPECT(!isOffer(env, gw, USD(0), XRP(0)));
+            BEAST_EXPECT(!isOffer(env, gw, usd(0), XRP(0)));
         }
     }
 
@@ -1085,43 +1085,43 @@ struct FlowMPT_test : public beast::unit_test::suite
         env.fund(XRP(10'000), alice, bob, gw);
 
         // scale by 16
-        MPT const USD =
+        MPT const usd =
             MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 100E+16});
 
         env(
             pay(gw,
                 alice,
                 // 12.55....
-                STAmount{USD, std::uint64_t(1255555555555555ull), 2, false}));
+                STAmount{usd, std::uint64_t(1255555555555555ull), 2, false}));
 
         env(offer(
             gw,
             // 5.0...
-            STAmount{USD, std::uint64_t(5000000000000000ull), 1, false},
+            STAmount{usd, std::uint64_t(5000000000000000ull), 1, false},
             XRP(1000)));
 
         env(offer(
             gw,
             // .555...
-            STAmount{USD, std::uint64_t(5555555555555555ull), 0, false},
+            STAmount{usd, std::uint64_t(5555555555555555ull), 0, false},
             XRP(10)));
 
         env(offer(
             gw,
             // 4.44....
-            STAmount{USD, std::uint64_t(4444444444444444ull), 1, false},
+            STAmount{usd, std::uint64_t(4444444444444444ull), 1, false},
             XRP(.1)));
 
         env(offer(
             alice,
             // 17
-            STAmount{USD, std::uint64_t(1700000000000000ull), 0, false},
+            STAmount{usd, std::uint64_t(1700000000000000ull), 0, false},
             XRP(.001)));
 
         env(pay(alice, bob, XRP(10'000)),
-            path(~XRP),
-            sendmax(USD(static_cast<std::uint64_t>(100E+16))),
-            txflags(tfPartialPayment | tfNoRippleDirect));
+            Path(~XRP),
+            Sendmax(usd(static_cast<std::uint64_t>(100E+16))),
+            Txflags(tfPartialPayment | tfNoRippleDirect));
     }
 
     void
@@ -1144,21 +1144,21 @@ struct FlowMPT_test : public beast::unit_test::suite
         env.fund(reserve(env, 2) + fee * 4, gw);
 
         // scale by 5
-        MPT const CTB = MPTTester(
+        MPT const ctb = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {ann},
              .transferFee = 2'000,  // 2%
              .maxAmt = 1'000'000});
 
-        env(pay(gw, ann, CTB(285'600)));
+        env(pay(gw, ann, ctb(285'600)));
         env.close();
 
-        env(offer(ann, drops(365'611'702'030), CTB(571'300)));
+        env(offer(ann, drops(365'611'702'030), ctb(571'300)));
         env.close();
 
         // This payment caused assert.
-        env(pay(ann, ann, CTB(68'700)), sendmax(drops(20'000'000'000)), txflags(tfPartialPayment));
+        env(pay(ann, ann, ctb(68'700)), Sendmax(drops(20'000'000'000)), Txflags(tfPartialPayment));
     }
 
     void
@@ -1173,9 +1173,9 @@ struct FlowMPT_test : public beast::unit_test::suite
 
         env.fund(XRP(10000), alice);
 
-        MPT const USD;
+        MPT const usd;
 
-        env(pay(alice, alice, USD(100)), path(~USD), ter(temBAD_PATH));
+        env(pay(alice, alice, usd(100)), Path(~usd), Ter(temBAD_PATH));
     }
 
     void
@@ -1194,25 +1194,25 @@ struct FlowMPT_test : public beast::unit_test::suite
                 Env env(*this);
                 env.fund(XRP(10'000), alice, bob, gw);
 
-                auto const USD =
+                auto const usd =
                     issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob}});
-                auto const EUR =
+                auto const eur =
                     issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {alice, bob}});
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, alice, EUR(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, alice, eur(100)));
                 env.close();
 
-                env(offer(alice, XRP(100), USD(100)), txflags(tfPassive));
-                env(offer(alice, USD(100), XRP(100)), txflags(tfPassive));
-                env(offer(alice, XRP(100), EUR(100)), txflags(tfPassive));
+                env(offer(alice, XRP(100), usd(100)), Txflags(tfPassive));
+                env(offer(alice, usd(100), XRP(100)), Txflags(tfPassive));
+                env(offer(alice, XRP(100), eur(100)), Txflags(tfPassive));
                 env.close();
 
                 TER const expectedTer = TER{temBAD_PATH_LOOP};
-                env(pay(alice, bob, EUR(1)),
-                    path(~USD, ~XRP, ~EUR),
-                    sendmax(XRP(1)),
-                    txflags(tfNoRippleDirect),
-                    ter(expectedTer));
+                env(pay(alice, bob, eur(1)),
+                    Path(~usd, ~XRP, ~eur),
+                    Sendmax(XRP(1)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(expectedTer));
             };
             testHelper2TokensMix(test);
         }
@@ -1221,23 +1221,23 @@ struct FlowMPT_test : public beast::unit_test::suite
             auto test = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this);
                 env.fund(XRP(10'000), alice, bob, gw);
-                auto const USD =
+                auto const usd =
                     issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob}});
-                auto const EUR =
+                auto const eur =
                     issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {alice, bob}});
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, alice, EUR(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, alice, eur(100)));
                 env.close();
 
-                env(offer(alice, XRP(100), USD(100)), txflags(tfPassive));
-                env(offer(alice, EUR(100), XRP(100)), txflags(tfPassive));
+                env(offer(alice, XRP(100), usd(100)), Txflags(tfPassive));
+                env(offer(alice, eur(100), XRP(100)), Txflags(tfPassive));
                 env.close();
                 // EUR -> //XRP -> //USD ->XRP
                 env(pay(alice, bob, XRP(1)),
-                    path(~XRP, ~USD, ~XRP),
-                    sendmax(EUR(1)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                    Path(~XRP, ~usd, ~XRP),
+                    Sendmax(eur(1)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper2TokensMix(test);
         }
@@ -1248,28 +1248,28 @@ struct FlowMPT_test : public beast::unit_test::suite
                 Env env(*this);
                 env.fund(XRP(10'000), alice, bob, gw);
                 env.close();
-                auto const USD =
+                auto const usd =
                     issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob}});
-                auto const EUR =
+                auto const eur =
                     issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {alice, bob}});
-                auto const JPY =
+                auto const jpy =
                     issue3({.env = env, .token = "JPY", .issuer = gw, .holders = {alice, bob}});
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, alice, EUR(100)));
-                env(pay(gw, alice, JPY(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, alice, eur(100)));
+                env(pay(gw, alice, jpy(100)));
                 env.close();
 
-                env(offer(alice, USD(100), XRP(100)), txflags(tfPassive));
-                env(offer(alice, XRP(100), EUR(100)), txflags(tfPassive));
-                env(offer(alice, EUR(100), XRP(100)), txflags(tfPassive));
-                env(offer(alice, XRP(100), JPY(100)), txflags(tfPassive));
+                env(offer(alice, usd(100), XRP(100)), Txflags(tfPassive));
+                env(offer(alice, XRP(100), eur(100)), Txflags(tfPassive));
+                env(offer(alice, eur(100), XRP(100)), Txflags(tfPassive));
+                env(offer(alice, XRP(100), jpy(100)), Txflags(tfPassive));
                 env.close();
 
-                env(pay(alice, bob, JPY(1)),
-                    path(~XRP, ~EUR, ~XRP, ~JPY),
-                    sendmax(USD(1)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice, bob, jpy(1)),
+                    Path(~XRP, ~eur, ~XRP, ~jpy),
+                    Sendmax(usd(1)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper3TokensMix(test);
         }
@@ -1291,16 +1291,16 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}, .maxAmt = 100});
 
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, alice, usd(100)));
 
-            env(pay(alice, carol, USD(100)));
+            env(pay(alice, carol, usd(100)));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
         }
 
         // Direct payment between holders. Partial payment limited
@@ -1310,16 +1310,16 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}, .maxAmt = 100});
 
-            env(pay(gw, alice, USD(80)));
+            env(pay(gw, alice, usd(80)));
 
-            env(pay(alice, carol, USD(100)), txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(100)), Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-80));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(80));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-80));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(80));
         }
 
         // Direct payment between holders. Partial payment limited
@@ -1330,17 +1330,17 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol, bob);
 
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, carol, bob}, .maxAmt = 100});
 
-            env(pay(gw, bob, USD(20)));
-            env(pay(gw, alice, USD(80)));
+            env(pay(gw, bob, usd(20)));
+            env(pay(gw, alice, usd(80)));
 
-            env(pay(alice, carol, USD(100)), txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(100)), Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(80));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(80));
         }
 
         // Cross-currency payment holder to holder. Holder owns an
@@ -1351,18 +1351,18 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol, bob);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}, .maxAmt = 100});
 
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, alice, usd(100)));
 
-            env(offer(alice, XRP(100), USD(100)));
+            env(offer(alice, XRP(100), usd(100)));
 
-            env(pay(bob, carol, USD(100)), sendmax(XRP(100)), path(~USD));
+            env(pay(bob, carol, usd(100)), Sendmax(XRP(100)), Path(~usd));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
         }
 
         // Cross-currency payment holder to holder. Issuer owns an
@@ -1374,21 +1374,21 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {carol}, .maxAmt = 100});
 
-            env(pay(gw, carol, USD(100)));
+            env(pay(gw, carol, usd(100)));
 
-            env(offer(gw, XRP(100), USD(100)));
+            env(offer(gw, XRP(100), usd(100)));
 
-            env(pay(alice, carol, USD(100)),
-                sendmax(XRP(100)),
-                path(~USD),
-                txflags(tfPartialPayment),
-                ter(tecPATH_DRY));
+            env(pay(alice, carol, usd(100)),
+                Sendmax(XRP(100)),
+                Path(~usd),
+                Txflags(tfPartialPayment),
+                Ter(tecPATH_DRY));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
         }
 
         // Cross-currency payment holder to holder. Issuer owns an
@@ -1399,20 +1399,20 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {carol}, .maxAmt = 100});
 
-            env(pay(gw, carol, USD(80)));
+            env(pay(gw, carol, usd(80)));
 
-            env(offer(gw, XRP(100), USD(100)));
+            env(offer(gw, XRP(100), usd(100)));
 
-            env(pay(alice, carol, USD(100)),
-                sendmax(XRP(100)),
-                path(~USD),
-                txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(100)),
+                Sendmax(XRP(100)),
+                Path(~usd),
+                Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
         }
 
         // Cross-currency payment holder to holder. Holder owns an
@@ -1423,17 +1423,17 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = 100});
 
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, alice, usd(100)));
 
-            env(offer(alice, USD(100), XRP(100)));
+            env(offer(alice, usd(100), XRP(100)));
 
-            env(pay(gw, alice, XRP(100)), sendmax(USD(100)), path(~XRP), ter(tecPATH_PARTIAL));
+            env(pay(gw, alice, XRP(100)), Sendmax(usd(100)), Path(~XRP), Ter(tecPATH_PARTIAL));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(100));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(100));
         }
 
         // Cross-currency payment issuer to holder. Holder owns an
@@ -1448,31 +1448,31 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(1'000), gw, alice, carol);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol},
                      .limit = 100});
-                using tUSD = std::decay_t<decltype(USD)>;
-                auto const EUR = issue2(
+                using tUSD = std::decay_t<decltype(usd)>;
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, carol},
                      .limit = 100});
 
-                env(pay(gw, alice, USD(100)));
+                env(pay(gw, alice, usd(100)));
 
-                env(offer(alice, EUR(100), USD(100)));
+                env(offer(alice, eur(100), usd(100)));
 
-                env(pay(gw, carol, USD(100)), sendmax(EUR(100)), path(~USD));
+                env(pay(gw, carol, usd(100)), Sendmax(eur(100)), Path(~usd));
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
-                    BEAST_EXPECT(env.balance(gw, USD) == USD(-100));
-                BEAST_EXPECT(env.balance(alice, USD) == USD(0));
-                BEAST_EXPECT(env.balance(alice, EUR) == EUR(100));
-                BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+                    BEAST_EXPECT(env.balance(gw, usd) == usd(-100));
+                BEAST_EXPECT(env.balance(alice, usd) == usd(0));
+                BEAST_EXPECT(env.balance(alice, eur) == eur(100));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(100));
             };
             testHelper2TokensMix(test);
         }
@@ -1484,19 +1484,19 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {carol}, .maxAmt = 120});
 
-            env(pay(gw, carol, USD(100)));
+            env(pay(gw, carol, usd(100)));
 
-            env(offer(carol, XRP(100), USD(100)));
+            env(offer(carol, XRP(100), usd(100)));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(XRP(100)),
-                txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(100)),
+                Path(~usd),
+                Sendmax(XRP(100)),
+                Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
         }
 
         // Cross-currency payment holder to holder. Offer is owned
@@ -1507,19 +1507,19 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {carol}, .maxAmt = 100});
 
-            env(pay(gw, carol, USD(100)));
+            env(pay(gw, carol, usd(100)));
 
-            env(offer(carol, XRP(100), USD(100)));
+            env(offer(carol, XRP(100), usd(100)));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(XRP(100)),
-                txflags(tfPartialPayment));
+            env(pay(alice, carol, usd(100)),
+                Path(~usd),
+                Sendmax(XRP(100)),
+                Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
         }
 
         // Cross-currency payment holder to holder. Multiple offers
@@ -1531,66 +1531,66 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(1'000), gw, alice, carol, bob);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .limit = 1'000});
-                using tUSD = std::decay_t<decltype(USD)>;
-                auto const EUR = issue2(
+                using tUSD = std::decay_t<decltype(usd)>;
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .limit = 1'000});
-                using tEUR = std::decay_t<decltype(EUR)>;
+                using tEUR = std::decay_t<decltype(eur)>;
 
-                env(pay(gw, alice, USD(600)));
-                env(pay(gw, carol, EUR(700)));
+                env(pay(gw, alice, usd(600)));
+                env(pay(gw, carol, eur(700)));
 
-                env(offer(alice, EUR(100), USD(105)));
-                env(offer(gw, EUR(100), USD(104)));
-                env(offer(gw, EUR(100), USD(103)));
-                env(offer(gw, EUR(100), USD(102)));
-                env(offer(gw, EUR(100), USD(101)));
-                env(offer(gw, EUR(100), USD(100)));
+                env(offer(alice, eur(100), usd(105)));
+                env(offer(gw, eur(100), usd(104)));
+                env(offer(gw, eur(100), usd(103)));
+                env(offer(gw, eur(100), usd(102)));
+                env(offer(gw, eur(100), usd(101)));
+                env(offer(gw, eur(100), usd(100)));
 
-                env(pay(carol, bob, USD(2'000)),
-                    sendmax(EUR(2'000)),
-                    path(~USD),
-                    txflags(tfPartialPayment));
+                env(pay(carol, bob, usd(2'000)),
+                    Sendmax(eur(2'000)),
+                    Path(~usd),
+                    Txflags(tfPartialPayment));
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    BEAST_EXPECT(env.balance(gw, USD) == USD(-1'000));
-                    BEAST_EXPECT(env.balance(alice, USD) == USD(495));
-                    BEAST_EXPECT(env.balance(bob, USD) == USD(505));
+                    BEAST_EXPECT(env.balance(gw, usd) == usd(-1'000));
+                    BEAST_EXPECT(env.balance(alice, usd) == usd(495));
+                    BEAST_EXPECT(env.balance(bob, usd) == usd(505));
                 }
                 else
                 {
-                    BEAST_EXPECT(env.balance(gw, USD) == USD(0));
-                    BEAST_EXPECT(env.balance(alice, USD) == USD(495));
+                    BEAST_EXPECT(env.balance(gw, usd) == usd(0));
+                    BEAST_EXPECT(env.balance(alice, usd) == usd(495));
                     // all offers are consumed since the limit is different
                     // for the holders
-                    BEAST_EXPECT(env.balance(bob, USD) == USD(615));
+                    BEAST_EXPECT(env.balance(bob, usd) == usd(615));
                 }
                 if constexpr (std::is_same_v<tEUR, MPT>)
                 {
                     if constexpr (std::is_same_v<tUSD, MPT>)
                     {
-                        BEAST_EXPECT(env.balance(carol, EUR) == EUR(210));
+                        BEAST_EXPECT(env.balance(carol, eur) == eur(210));
                     }
                     else
                     {
                         // carol sells 600USD since all offers are consumed
-                        BEAST_EXPECT(env.balance(carol, EUR) == EUR(100));
+                        BEAST_EXPECT(env.balance(carol, eur) == eur(100));
                     }
                 }
                 else
                 {
                     BEAST_EXPECT(
-                        env.balance(carol, EUR) == STAmount(EUR, UINT64_C(209'9009900990099), -13));
+                        env.balance(carol, eur) == STAmount(eur, UINT64_C(209'9009900990099), -13));
                 }
                 // 100/101 is partially crossed (90/91) and 100/100 is
                 // unfunded when MPT. All offers are consumed if IOU.
@@ -1609,29 +1609,29 @@ struct FlowMPT_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}, .maxAmt = 2'000});
 
-            env(pay(gw, carol, USD(1'000)));
-            env(pay(gw, alice, USD(600)));
+            env(pay(gw, carol, usd(1'000)));
+            env(pay(gw, alice, usd(600)));
 
-            env(offer(gw, XRP(5), USD(11)));
-            env(offer(gw, XRP(6), USD(13)));
-            env(offer(carol, XRP(7), USD(15)));
-            env(offer(carol, XRP(17), USD(35)));
-            env(offer(carol, XRP(23), USD(47)));
-            env(offer(alice, XRP(10), USD(19)));
-            env(offer(alice, XRP(15), USD(28)));
-            env(offer(alice, XRP(25), USD(46)));
+            env(offer(gw, XRP(5), usd(11)));
+            env(offer(gw, XRP(6), usd(13)));
+            env(offer(carol, XRP(7), usd(15)));
+            env(offer(carol, XRP(17), usd(35)));
+            env(offer(carol, XRP(23), usd(47)));
+            env(offer(alice, XRP(10), usd(19)));
+            env(offer(alice, XRP(15), usd(28)));
+            env(offer(alice, XRP(25), usd(46)));
 
-            env(pay(carol, carol, USD(200)), sendmax(XRP(100)), txflags(tfPartialPayment));
+            env(pay(carol, carol, usd(200)), Sendmax(XRP(100)), Txflags(tfPartialPayment));
 
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-1'624));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(1'102));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-1'624));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(1'102));
             env.require(offers(carol, 0));
             env.require(offers(gw, 0));
             // 100 XRP's = 5+6+7+17+23+10+15+17(25-8)
-            BEAST_EXPECT(isOffer(env, alice, XRP(8), USD(15)));
+            BEAST_EXPECT(isOffer(env, alice, XRP(8), usd(15)));
         }
 
         // Cross-currency payment holder to holder. Multiple offers
@@ -1640,21 +1640,21 @@ struct FlowMPT_test : public beast::unit_test::suite
             Env env(*this);
             env.fund(XRP(1'000), gw, alice, carol, bob);
 
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .maxAmt = 30});
 
-            env(pay(gw, alice, USD(12)));  // 12, 15, 20
-            env(pay(gw, bob, USD(5)));     // 5, 5, 10
+            env(pay(gw, alice, usd(12)));  // 12, 15, 20
+            env(pay(gw, bob, usd(5)));     // 5, 5, 10
 
-            env(offer(alice, XRP(10), USD(12)));
-            env(offer(gw, XRP(10), USD(11)));
-            env(offer(bob, XRP(10), USD(10)));
+            env(offer(alice, XRP(10), usd(12)));
+            env(offer(gw, XRP(10), usd(11)));
+            env(offer(bob, XRP(10), usd(10)));
 
-            env(pay(carol, bob, USD(30)), sendmax(XRP(30)), txflags(tfPartialPayment), path(~USD));
-            BEAST_EXPECT(env.balance(gw, USD) == USD(-28));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
+            env(pay(carol, bob, usd(30)), Sendmax(XRP(30)), Txflags(tfPartialPayment), Path(~usd));
+            BEAST_EXPECT(env.balance(gw, usd) == usd(-28));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
             // 12+11+5
-            BEAST_EXPECT(env.balance(bob, USD) == USD(28));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(28));
         }
 
         // Cross-currency payment two steps. Second book step
@@ -1702,42 +1702,42 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(1'000), gw, alice, carol, bob, dan, john, ed, sam, bill);
                 env.close();
 
-                MPT const USD = MPTTester(
+                MPT const usd = MPTTester(
                     {.env = env, .issuer = gw, .holders = {alice, carol, bob}, .maxAmt = d.maxAmt});
-                auto const EUR = gw["EUR"];
+                auto const eur = gw["EUR"];
 
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, carol, USD(100)));
-                env(pay(gw, bob, USD(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, carol, usd(100)));
+                env(pay(gw, bob, usd(100)));
 
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-300));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-300));
 
-                env(trust(john, EUR(100)));
-                env(trust(dan, EUR(100)));
-                env(trust(ed, EUR(100)));
-                env(trust(bill, EUR(d.dstTrustLimit)));
+                env(trust(john, eur(100)));
+                env(trust(dan, eur(100)));
+                env(trust(ed, eur(100)));
+                env(trust(bill, eur(d.dstTrustLimit)));
 
-                env(pay(gw, john, EUR(100)));
-                env(pay(gw, dan, EUR(100)));
-                env(pay(gw, ed, EUR(100)));
+                env(pay(gw, john, eur(100)));
+                env(pay(gw, dan, eur(100)));
+                env(pay(gw, ed, eur(100)));
                 env.close();
 
                 // Sell USD
-                env(offer(alice, XRP(100), USD(100)));
+                env(offer(alice, XRP(100), usd(100)));
                 env.close();  // close after each create to ensure
                               // the order
-                env(offer(carol, XRP(100), USD(100)));
+                env(offer(carol, XRP(100), usd(100)));
                 env.close();
                 if (!d.lastGwBuyUSD)
                 {
-                    env(offer(gw, XRP(100), USD(100)));
+                    env(offer(gw, XRP(100), usd(100)));
                     env.close();
                 }
-                env(offer(bob, XRP(100), USD(100)));
+                env(offer(bob, XRP(100), usd(100)));
                 env.close();
                 if (d.lastGwBuyUSD)
                 {
-                    env(offer(gw, XRP(100), USD(100)));
+                    env(offer(gw, XRP(100), usd(100)));
                     env.close();
                 }
                 BEAST_EXPECT(expectOffers(env, alice, 1));
@@ -1746,36 +1746,36 @@ struct FlowMPT_test : public beast::unit_test::suite
                 BEAST_EXPECT(expectOffers(env, bob, 1));
 
                 // Buy USD
-                env(offer(john, USD(100), EUR(100)));
+                env(offer(john, usd(100), eur(100)));
                 env.close();
-                env(offer(gw, USD(100), EUR(100)));
+                env(offer(gw, usd(100), eur(100)));
                 env.close();
-                env(offer(dan, USD(100), EUR(100)));
+                env(offer(dan, usd(100), eur(100)));
                 env.close();
-                env(offer(ed, USD(100), EUR(100)));
+                env(offer(ed, usd(100), eur(100)));
                 env.close();
                 BEAST_EXPECT(expectOffers(env, john, 1));
                 BEAST_EXPECT(expectOffers(env, gw, 2));
                 BEAST_EXPECT(expectOffers(env, dan, 1));
                 BEAST_EXPECT(expectOffers(env, ed, 1));
 
-                env(pay(sam, bill, EUR(400)),
-                    sendmax(XRP(d.sendMax)),
-                    path(~USD, ~EUR),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                env(pay(sam, bill, eur(400)),
+                    Sendmax(XRP(d.sendMax)),
+                    Path(~usd, ~eur),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
                 env.close();
 
                 auto const baseFee = env.current()->fees().base.drops();
-                BEAST_EXPECT(env.balance(bill, EUR) == EUR(d.dstExpectEUR));
-                BEAST_EXPECT(env.balance(john, USD) == USD(100));
-                BEAST_EXPECT(env.balance(dan, USD) == USD(d.expDanBuyUSD));
-                BEAST_EXPECT(env.balance(ed, USD) == USD(d.expEdBuyUSD));
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-d.outstandingUSD));
-                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(bill, eur) == eur(d.dstExpectEUR));
+                BEAST_EXPECT(env.balance(john, usd) == usd(100));
+                BEAST_EXPECT(env.balance(dan, usd) == usd(d.expDanBuyUSD));
+                BEAST_EXPECT(env.balance(ed, usd) == usd(d.expEdBuyUSD));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-d.outstandingUSD));
+                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 * DROPS_PER_XRP - baseFee * 9});
+                    env.balance(gw) == XRPAmount{d.expGwXRP * kDROPS_PER_XRP - baseFee * 9});
                 BEAST_EXPECT(expectOffers(env, john, 0));
                 BEAST_EXPECT(expectOffers(env, gw, d.expOffersGw));
                 BEAST_EXPECT(expectOffers(env, dan, d.expOffersDan()));
@@ -1863,46 +1863,46 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(1'000), gw, alice, carol, bob, ed);
                 env.close();
 
-                MPT const USD =
+                MPT const usd =
                     MPTTester({.env = env, .issuer = gw, .holders = {alice}, .maxAmt = d.maxAmt});
 
-                env(pay(gw, alice, USD(300)));
+                env(pay(gw, alice, usd(300)));
                 env.close();
 
-                env(offer(carol, USD(100), XRP(100)));
+                env(offer(carol, usd(100), XRP(100)));
                 env.close();
                 if (!d.lastGwBuyUSD)
                 {
-                    env(offer(gw, USD(d.gwOffer), XRP(d.gwOffer)));
+                    env(offer(gw, usd(d.gwOffer), XRP(d.gwOffer)));
                     env.close();
                 }
-                env(offer(bob, USD(100), XRP(100)));
+                env(offer(bob, usd(100), XRP(100)));
                 env.close();
                 if (d.lastGwBuyUSD)
                 {
-                    env(offer(gw, USD(d.gwOffer), XRP(d.gwOffer)));
+                    env(offer(gw, usd(d.gwOffer), XRP(d.gwOffer)));
                     env.close();
                 }
 
                 BEAST_EXPECT(expectOffers(env, carol, 1));
                 BEAST_EXPECT(expectOffers(env, bob, 1));
                 BEAST_EXPECT(expectOffers(env, gw, 1));
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-300));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-300));
 
                 env(pay(alice, ed, XRP(300)),
-                    sendmax(USD(d.sendMax)),
-                    path(~XRP),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                    Sendmax(usd(d.sendMax)),
+                    Path(~XRP),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
                 env.close();
 
                 auto const baseFee = env.current()->fees().base.drops();
-                BEAST_EXPECT(env.balance(alice, USD) == USD(300 - d.sendMax));
-                BEAST_EXPECT(env.balance(carol, USD) == USD(100));
-                BEAST_EXPECT(env.balance(bob, USD) == USD(d.expBobBuyUSD));
+                BEAST_EXPECT(env.balance(alice, usd) == usd(300 - d.sendMax));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(100));
+                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, usd) == usd(-d.outstandingUSD));
                 BEAST_EXPECT(
-                    env.balance(gw) == XRPAmount{d.expGwXRP * DROPS_PER_XRP - baseFee * 3});
+                    env.balance(gw) == XRPAmount{d.expGwXRP * kDROPS_PER_XRP - baseFee * 3});
                 BEAST_EXPECT(expectOffers(env, carol, 0));
                 BEAST_EXPECT(expectOffers(env, bob, d.expOffersBob()));
                 BEAST_EXPECT(expectOffers(env, gw, d.expOffersGw));
@@ -1970,52 +1970,52 @@ struct FlowMPT_test : public beast::unit_test::suite
                 env.fund(XRP(1'000), gw, alice, carol, bob, ed);
                 env.close();
 
-                MPT const USD = MPTTester(
+                MPT const usd = MPTTester(
                     {.env = env, .issuer = gw, .holders = {carol, bob, ed}, .maxAmt = d.maxAmt});
 
                 if (d.initDst != 0)
-                    env(pay(gw, ed, USD(d.initDst)));
-                env(pay(gw, carol, USD(100)));
-                env(pay(gw, bob, USD(100)));
+                    env(pay(gw, ed, usd(d.initDst)));
+                env(pay(gw, carol, usd(100)));
+                env(pay(gw, bob, usd(100)));
                 env.close();
 
-                env(offer(carol, XRP(100), USD(100)));
+                env(offer(carol, XRP(100), usd(100)));
                 env.close();
                 if (!d.lastGwBuyUSD)
                 {
-                    env(offer(gw, XRP(d.gwOffer), USD(d.gwOffer)));
+                    env(offer(gw, XRP(d.gwOffer), usd(d.gwOffer)));
                     env.close();
                 }
-                env(offer(bob, XRP(100), USD(100)));
+                env(offer(bob, XRP(100), usd(100)));
                 env.close();
                 if (d.lastGwBuyUSD)
                 {
-                    env(offer(gw, XRP(d.gwOffer), USD(d.gwOffer)));
+                    env(offer(gw, XRP(d.gwOffer), usd(d.gwOffer)));
                     env.close();
                 }
 
                 BEAST_EXPECT(expectOffers(env, carol, 1));
                 BEAST_EXPECT(expectOffers(env, bob, 1));
                 BEAST_EXPECT(expectOffers(env, gw, 1));
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-200 - d.initDst));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-200 - d.initDst));
 
-                env(pay(alice, ed, USD(300)),
-                    sendmax(XRP(d.sendMax)),
-                    path(~USD),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                env(pay(alice, ed, usd(300)),
+                    Sendmax(XRP(d.sendMax)),
+                    Path(~usd),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
                 env.close();
 
                 auto const baseFee = env.current()->fees().base.drops();
                 BEAST_EXPECT(
-                    env.balance(alice) == XRPAmount{d.expAliceXRP * DROPS_PER_XRP - 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));
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-d.outstandingUSD));
+                    env.balance(alice) == XRPAmount{d.expAliceXRP * kDROPS_PER_XRP - 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));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-d.outstandingUSD));
                 BEAST_EXPECT(
                     env.balance(gw) ==
                     XRPAmount{
-                        d.expGwXRP * DROPS_PER_XRP - baseFee * (4 + (d.initDst != 0 ? 1 : 0))});
+                        d.expGwXRP * kDROPS_PER_XRP - 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));
@@ -2077,21 +2077,21 @@ struct FlowMPT_test : public beast::unit_test::suite
                 Env env(*this);
                 env.fund(XRP(1'000), gw, alice, carol);
 
-                MPT const USD = MPTTester({.env = env, .issuer = gw, .maxAmt = 300});
+                MPT const usd = MPTTester({.env = env, .issuer = gw, .maxAmt = 300});
 
-                env(offer(carol, USD(400), XRP(400)));
-                env(offer(gw, USD(100), XRP(100)));
+                env(offer(carol, usd(400), XRP(400)));
+                env(offer(gw, usd(100), XRP(100)));
                 BEAST_EXPECT(expectOffers(env, carol, 1));
                 BEAST_EXPECT(expectOffers(env, gw, 1));
 
                 env(pay(gw, alice, XRP(500)),
-                    sendmax(USD(sendMax)),
-                    path(~XRP),
-                    txflags(tfPartialPayment | tfNoRippleDirect));
+                    Sendmax(usd(sendMax)),
+                    Path(~XRP),
+                    Txflags(tfPartialPayment | tfNoRippleDirect));
 
                 BEAST_EXPECT(env.balance(alice) == XRP(dstXRP));
-                BEAST_EXPECT(env.balance(gw, USD) == USD(-300));
-                BEAST_EXPECT(env.balance(carol, USD) == USD(300));
+                BEAST_EXPECT(env.balance(gw, usd) == usd(-300));
+                BEAST_EXPECT(env.balance(carol, usd) == usd(300));
                 BEAST_EXPECT(expectOffers(env, carol, 0));
                 BEAST_EXPECT(expectOffers(env, gw, expGwOffers));
             };
@@ -2136,7 +2136,7 @@ struct FlowMPT_test : public beast::unit_test::suite
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testLimitQuality();
         testXRPPathLoop();
         testWithFeats(sa);
diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp
index 8f096a970f..c6f4cf59d1 100644
--- a/src/test/app/Flow_test.cpp
+++ b/src/test/app/Flow_test.cpp
@@ -67,7 +67,7 @@ getNoRippleFlag(
     return false;  // silence warning
 }
 
-struct Flow_test : public beast::unit_test::suite
+struct Flow_test : public beast::unit_test::Suite
 {
     void
     testDirectStep(FeatureBitset features)
@@ -80,22 +80,22 @@ struct Flow_test : public beast::unit_test::suite
         auto const carol = Account("carol");
         auto const dan = Account("dan");
         auto const erin = Account("erin");
-        auto const USDA = alice["USD"];
-        auto const USDB = bob["USD"];
-        auto const USDC = carol["USD"];
-        auto const USDD = dan["USD"];
+        auto const usda = alice["USD"];
+        auto const usdb = bob["USD"];
+        auto const usdc = carol["USD"];
+        auto const usdd = dan["USD"];
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         {
             // Pay USD, trivial path
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
-            env(pay(alice, bob, USD(10)), paths(USD));
-            env.require(balance(bob, USD(10)));
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
+            env(pay(alice, bob, usd(10)), Paths(usd));
+            env.require(Balance(bob, usd(10)));
         }
         {
             // XRP transfer
@@ -104,8 +104,8 @@ struct Flow_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob);
             env.close();
             env(pay(alice, bob, XRP(100)));
-            env.require(balance(bob, XRP(10000 + 100)));
-            env.require(balance(alice, xrpMinusFee(env, 10000 - 100)));
+            env.require(Balance(bob, XRP(10000 + 100)));
+            env.require(Balance(alice, xrpMinusFee(env, 10000 - 100)));
         }
         {
             // Partial payments
@@ -113,12 +113,12 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
-            env(pay(alice, bob, USD(110)), paths(USD), ter(tecPATH_PARTIAL));
-            env.require(balance(bob, USD(0)));
-            env(pay(alice, bob, USD(110)), paths(USD), txflags(tfPartialPayment));
-            env.require(balance(bob, USD(100)));
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
+            env(pay(alice, bob, usd(110)), Paths(usd), Ter(tecPATH_PARTIAL));
+            env.require(Balance(bob, usd(0)));
+            env(pay(alice, bob, usd(110)), Paths(usd), Txflags(tfPartialPayment));
+            env.require(Balance(bob, usd(100)));
         }
         {
             // Pay by rippling through accounts, use path finder
@@ -126,11 +126,11 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, dan);
             env.close();
-            env.trust(USDA(10), bob);
-            env.trust(USDB(10), carol);
-            env.trust(USDC(10), dan);
-            env(pay(alice, dan, USDC(10)), paths(USDA));
-            env.require(balance(bob, USDA(10)), balance(carol, USDB(10)), balance(dan, USDC(10)));
+            env.trust(usda(10), bob);
+            env.trust(usdb(10), carol);
+            env.trust(usdc(10), dan);
+            env(pay(alice, dan, usdc(10)), Paths(usda));
+            env.require(Balance(bob, usda(10)), Balance(carol, usdb(10)), Balance(dan, usdc(10)));
         }
         {
             // Pay by rippling through accounts, specify path
@@ -139,19 +139,19 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, dan);
             env.close();
-            env.trust(USDA(10), bob);
-            env.trust(USDB(10), alice, carol);
-            env.trust(USDC(10), dan);
+            env.trust(usda(10), bob);
+            env.trust(usdb(10), alice, carol);
+            env.trust(usdc(10), dan);
             env(rate(bob, 1.1));
 
             // alice will redeem to bob; a transfer fee will be charged
-            env(pay(bob, alice, USDB(6)));
-            env(pay(alice, dan, USDC(5)),
-                path(bob, carol),
-                sendmax(USDA(6)),
-                txflags(tfNoRippleDirect));
-            env.require(balance(dan, USDC(5)));
-            env.require(balance(alice, USDB(0.5)));
+            env(pay(bob, alice, usdb(6)));
+            env(pay(alice, dan, usdc(5)),
+                Path(bob, carol),
+                Sendmax(usda(6)),
+                Txflags(tfNoRippleDirect));
+            env.require(Balance(dan, usdc(5)));
+            env.require(Balance(alice, usdb(0.5)));
         }
         {
             // Pay by rippling through accounts, specify path and transfer fee
@@ -160,17 +160,17 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, dan);
             env.close();
-            env.trust(USDA(10), bob);
-            env.trust(USDB(10), alice, carol);
-            env.trust(USDC(10), dan);
+            env.trust(usda(10), bob);
+            env.trust(usdb(10), alice, carol);
+            env.trust(usdc(10), dan);
             env(rate(bob, 1.1));
 
-            env(pay(alice, dan, USDC(5)),
-                path(bob, carol),
-                sendmax(USDA(6)),
-                txflags(tfNoRippleDirect));
-            env.require(balance(dan, USDC(5)));
-            env.require(balance(bob, USDA(5)));
+            env(pay(alice, dan, usdc(5)),
+                Path(bob, carol),
+                Sendmax(usda(6)),
+                Txflags(tfNoRippleDirect));
+            env.require(Balance(dan, usdc(5)));
+            env.require(Balance(bob, usda(5)));
         }
         {
             // test best quality path is taken
@@ -179,23 +179,23 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, dan, erin);
             env.close();
-            env.trust(USDA(10), bob, carol);
-            env.trust(USDB(10), dan);
-            env.trust(USDC(10), alice, dan);
-            env.trust(USDD(20), erin);
+            env.trust(usda(10), bob, carol);
+            env.trust(usdb(10), dan);
+            env.trust(usdc(10), alice, dan);
+            env.trust(usdd(20), erin);
             env(rate(bob, 1));
             env(rate(carol, 1.1));
 
             // Pay alice so she redeems to carol and a transfer fee is charged
-            env(pay(carol, alice, USDC(10)));
-            env(pay(alice, erin, USDD(5)),
-                path(carol, dan),
-                path(bob, dan),
-                txflags(tfNoRippleDirect));
+            env(pay(carol, alice, usdc(10)));
+            env(pay(alice, erin, usdd(5)),
+                Path(carol, dan),
+                Path(bob, dan),
+                Txflags(tfNoRippleDirect));
 
-            env.require(balance(erin, USDD(5)));
-            env.require(balance(dan, USDB(5)));
-            env.require(balance(dan, USDC(0)));
+            env.require(Balance(erin, usdd(5)));
+            env.require(Balance(dan, usdb(5)));
+            env.require(Balance(dan, usdc(0)));
         }
         {
             // Limit quality
@@ -203,17 +203,17 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
-            env.trust(USDA(10), bob);
-            env.trust(USDB(10), carol);
+            env.trust(usda(10), bob);
+            env.trust(usdb(10), carol);
 
-            env(pay(alice, carol, USDB(5)),
-                sendmax(USDA(4)),
-                txflags(tfLimitQuality | tfPartialPayment),
-                ter(tecPATH_DRY));
-            env.require(balance(carol, USDB(0)));
+            env(pay(alice, carol, usdb(5)),
+                Sendmax(usda(4)),
+                Txflags(tfLimitQuality | tfPartialPayment),
+                Ter(tecPATH_DRY));
+            env.require(Balance(carol, usdb(0)));
 
-            env(pay(alice, carol, USDB(5)), sendmax(USDA(4)), txflags(tfPartialPayment));
-            env.require(balance(carol, USDB(4)));
+            env(pay(alice, carol, usdb(5)), Sendmax(usda(4)), Txflags(tfPartialPayment));
+            env.require(Balance(carol, usdb(4)));
         }
     }
 
@@ -227,10 +227,10 @@ struct Flow_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const dan = Account("dan");
-        auto const USDA = alice["USD"];
-        auto const USDB = bob["USD"];
-        auto const USDC = carol["USD"];
-        auto const USDD = dan["USD"];
+        auto const usda = alice["USD"];
+        auto const usdb = bob["USD"];
+        auto const usdc = carol["USD"];
+        auto const usdd = dan["USD"];
 
         //   Dan -> Bob -> Alice -> Carol; vary bobDanQIn and bobAliceQOut
         for (auto bobDanQIn : {80, 100, 120})
@@ -240,27 +240,27 @@ struct Flow_test : public beast::unit_test::suite
                 Env env(*this, features);
                 env.fund(XRP(10000), alice, bob, carol, dan);
                 env.close();
-                env(trust(bob, USDD(100)), qualityInPercent(bobDanQIn));
-                env(trust(bob, USDA(100)), qualityOutPercent(bobAliceQOut));
-                env(trust(carol, USDA(100)));
+                env(trust(bob, usdd(100)), QualityInPercent(bobDanQIn));
+                env(trust(bob, usda(100)), QualityOutPercent(bobAliceQOut));
+                env(trust(carol, usda(100)));
 
-                env(pay(alice, bob, USDA(100)));
-                env.require(balance(bob, USDA(100)));
-                env(pay(dan, carol, USDA(10)),
-                    path(bob),
-                    sendmax(USDD(100)),
-                    txflags(tfNoRippleDirect));
-                env.require(balance(bob, USDA(90)));
+                env(pay(alice, bob, usda(100)));
+                env.require(Balance(bob, usda(100)));
+                env(pay(dan, carol, usda(10)),
+                    Path(bob),
+                    Sendmax(usdd(100)),
+                    Txflags(tfNoRippleDirect));
+                env.require(Balance(bob, usda(90)));
                 if (bobAliceQOut > bobDanQIn)
                 {
                     env.require(
-                        balance(bob, USDD(10.0 * double(bobAliceQOut) / double(bobDanQIn))));
+                        Balance(bob, usdd(10.0 * double(bobAliceQOut) / double(bobDanQIn))));
                 }
                 else
                 {
-                    env.require(balance(bob, USDD(10)));
+                    env.require(Balance(bob, usdd(10)));
                 }
-                env.require(balance(carol, USDA(10)));
+                env.require(Balance(carol, usda(10)));
             }
         }
 
@@ -271,14 +271,14 @@ struct Flow_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
 
-            env(trust(bob, USDA(10)));
-            env(trust(carol, USDA(10)), qualityInPercent(carolAliceQIn));
+            env(trust(bob, usda(10)));
+            env(trust(carol, usda(10)), QualityInPercent(carolAliceQIn));
 
-            env(pay(alice, bob, USDA(10)));
-            env.require(balance(bob, USDA(10)));
-            env(pay(bob, carol, USDA(5)), sendmax(USDA(10)));
+            env(pay(alice, bob, usda(10)));
+            env.require(Balance(bob, usda(10)));
+            env(pay(bob, carol, usda(5)), Sendmax(usda(10)));
             auto const effectiveQ = carolAliceQIn > 100 ? 1.0 : carolAliceQIn / 100.0;
-            env.require(balance(bob, USDA(10.0 - (5.0 / effectiveQ))));
+            env.require(Balance(bob, usda(10.0 - (5.0 / effectiveQ))));
         }
 
         // bob -> alice -> carol; bobAliceQOut varies.
@@ -287,14 +287,14 @@ struct Flow_test : public beast::unit_test::suite
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, carol);
             env.close();
-            env(trust(bob, USDA(10)), qualityOutPercent(bobAliceQOut));
-            env(trust(carol, USDA(10)));
+            env(trust(bob, usda(10)), QualityOutPercent(bobAliceQOut));
+            env(trust(carol, usda(10)));
 
-            env(pay(alice, bob, USDA(10)));
-            env.require(balance(bob, USDA(10)));
-            env(pay(bob, carol, USDA(5)), sendmax(USDA(5)));
-            env.require(balance(carol, USDA(5)));
-            env.require(balance(bob, USDA(10 - 5)));
+            env(pay(alice, bob, usda(10)));
+            env.require(Balance(bob, usda(10)));
+            env(pay(bob, carol, usda(5)), Sendmax(usda(5)));
+            env.require(Balance(carol, usda(5)));
+            env.require(Balance(bob, usda(10 - 5)));
         }
     }
 
@@ -306,9 +306,9 @@ struct Flow_test : public beast::unit_test::suite
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
-        auto const BTC = gw["BTC"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const btc = gw["BTC"];
+        auto const eur = gw["EUR"];
         Account const alice("alice");
         Account const bob("bob");
         Account const carol("carol");
@@ -319,21 +319,21 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
 
-            env(pay(gw, alice, BTC(50)));
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, alice, btc(50)));
+            env(pay(gw, bob, usd(50)));
 
-            env(offer(bob, BTC(50), USD(50)));
+            env(offer(bob, btc(50), usd(50)));
 
-            env(pay(alice, carol, USD(50)), path(~USD), sendmax(BTC(50)));
+            env(pay(alice, carol, usd(50)), Path(~usd), Sendmax(btc(50)));
 
-            env.require(balance(alice, BTC(0)));
-            env.require(balance(bob, BTC(50)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(carol, USD(50)));
-            BEAST_EXPECT(!isOffer(env, bob, BTC(50), USD(50)));
+            env.require(Balance(alice, btc(0)));
+            env.require(Balance(bob, btc(50)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(carol, usd(50)));
+            BEAST_EXPECT(!isOffer(env, bob, btc(50), usd(50)));
         }
         {
             // simple IOU/XRP XRP/IOU offer
@@ -341,23 +341,23 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
 
-            env(pay(gw, alice, BTC(50)));
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, alice, btc(50)));
+            env(pay(gw, bob, usd(50)));
 
-            env(offer(bob, BTC(50), XRP(50)));
-            env(offer(bob, XRP(50), USD(50)));
+            env(offer(bob, btc(50), XRP(50)));
+            env(offer(bob, XRP(50), usd(50)));
 
-            env(pay(alice, carol, USD(50)), path(~XRP, ~USD), sendmax(BTC(50)));
+            env(pay(alice, carol, usd(50)), Path(~XRP, ~usd), Sendmax(btc(50)));
 
-            env.require(balance(alice, BTC(0)));
-            env.require(balance(bob, BTC(50)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(carol, USD(50)));
-            BEAST_EXPECT(!isOffer(env, bob, XRP(50), USD(50)));
-            BEAST_EXPECT(!isOffer(env, bob, BTC(50), XRP(50)));
+            env.require(Balance(alice, btc(0)));
+            env.require(Balance(bob, btc(50)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(carol, usd(50)));
+            BEAST_EXPECT(!isOffer(env, bob, XRP(50), usd(50)));
+            BEAST_EXPECT(!isOffer(env, bob, btc(50), XRP(50)));
         }
         {
             // simple XRP -> USD through offer and sendmax
@@ -365,20 +365,20 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, bob, usd(50)));
 
-            env(offer(bob, XRP(50), USD(50)));
+            env(offer(bob, XRP(50), usd(50)));
 
-            env(pay(alice, carol, USD(50)), path(~USD), sendmax(XRP(50)));
+            env(pay(alice, carol, usd(50)), Path(~usd), Sendmax(XRP(50)));
 
-            env.require(balance(alice, xrpMinusFee(env, 10000 - 50)));
-            env.require(balance(bob, xrpMinusFee(env, 10000 + 50)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(carol, USD(50)));
-            BEAST_EXPECT(!isOffer(env, bob, XRP(50), USD(50)));
+            env.require(Balance(alice, xrpMinusFee(env, 10000 - 50)));
+            env.require(Balance(bob, xrpMinusFee(env, 10000 + 50)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(carol, usd(50)));
+            BEAST_EXPECT(!isOffer(env, bob, XRP(50), usd(50)));
         }
         {
             // simple USD -> XRP through offer and sendmax
@@ -386,20 +386,20 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
 
-            env(pay(gw, alice, USD(50)));
+            env(pay(gw, alice, usd(50)));
 
-            env(offer(bob, USD(50), XRP(50)));
+            env(offer(bob, usd(50), XRP(50)));
 
-            env(pay(alice, carol, XRP(50)), path(~XRP), sendmax(USD(50)));
+            env(pay(alice, carol, XRP(50)), Path(~XRP), Sendmax(usd(50)));
 
-            env.require(balance(alice, USD(0)));
-            env.require(balance(bob, xrpMinusFee(env, 10000 - 50)));
-            env.require(balance(bob, USD(50)));
-            env.require(balance(carol, XRP(10000 + 50)));
-            BEAST_EXPECT(!isOffer(env, bob, USD(50), XRP(50)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(bob, xrpMinusFee(env, 10000 - 50)));
+            env.require(Balance(bob, usd(50)));
+            env.require(Balance(carol, XRP(10000 + 50)));
+            BEAST_EXPECT(!isOffer(env, bob, usd(50), XRP(50)));
         }
         {
             // test unfunded offers are removed when payment succeeds
@@ -407,37 +407,37 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
-            env.trust(EUR(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
+            env.trust(eur(1000), alice, bob, carol);
 
-            env(pay(gw, alice, BTC(60)));
-            env(pay(gw, bob, USD(50)));
-            env(pay(gw, bob, EUR(50)));
+            env(pay(gw, alice, btc(60)));
+            env(pay(gw, bob, usd(50)));
+            env(pay(gw, bob, eur(50)));
 
-            env(offer(bob, BTC(50), USD(50)));
-            env(offer(bob, BTC(40), EUR(50)));
-            env(offer(bob, EUR(50), USD(50)));
+            env(offer(bob, btc(50), usd(50)));
+            env(offer(bob, btc(40), eur(50)));
+            env(offer(bob, eur(50), usd(50)));
 
             // unfund offer
-            env(pay(bob, gw, EUR(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(40), EUR(50)));
-            BEAST_EXPECT(isOffer(env, bob, EUR(50), USD(50)));
+            env(pay(bob, gw, eur(50)));
+            BEAST_EXPECT(isOffer(env, bob, btc(50), usd(50)));
+            BEAST_EXPECT(isOffer(env, bob, btc(40), eur(50)));
+            BEAST_EXPECT(isOffer(env, bob, eur(50), usd(50)));
 
-            env(pay(alice, carol, USD(50)), path(~USD), path(~EUR, ~USD), sendmax(BTC(60)));
+            env(pay(alice, carol, usd(50)), Path(~usd), Path(~eur, ~usd), Sendmax(btc(60)));
 
-            env.require(balance(alice, BTC(10)));
-            env.require(balance(bob, BTC(50)));
-            env.require(balance(bob, USD(0)));
-            env.require(balance(bob, EUR(0)));
-            env.require(balance(carol, USD(50)));
+            env.require(Balance(alice, btc(10)));
+            env.require(Balance(bob, btc(50)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(bob, eur(0)));
+            env.require(Balance(carol, usd(50)));
             // used in the payment
-            BEAST_EXPECT(!isOffer(env, bob, BTC(50), USD(50)));
+            BEAST_EXPECT(!isOffer(env, bob, btc(50), usd(50)));
             // found unfunded
-            BEAST_EXPECT(!isOffer(env, bob, BTC(40), EUR(50)));
+            BEAST_EXPECT(!isOffer(env, bob, btc(40), eur(50)));
             // unfunded, but should not yet be found unfunded
-            BEAST_EXPECT(isOffer(env, bob, EUR(50), USD(50)));
+            BEAST_EXPECT(isOffer(env, bob, eur(50), usd(50)));
         }
         {
             // test unfunded offers are returned when the payment fails.
@@ -452,46 +452,46 @@ struct Flow_test : public beast::unit_test::suite
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(BTC(1000), alice, bob, carol);
-            env.trust(EUR(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(btc(1000), alice, bob, carol);
+            env.trust(eur(1000), alice, bob, carol);
 
-            env(pay(gw, alice, BTC(60)));
-            env(pay(gw, bob, USD(60)));
-            env(pay(gw, bob, EUR(50)));
-            env(pay(gw, carol, EUR(1)));
+            env(pay(gw, alice, btc(60)));
+            env(pay(gw, bob, usd(60)));
+            env(pay(gw, bob, eur(50)));
+            env(pay(gw, carol, eur(1)));
 
-            env(offer(bob, BTC(50), USD(50)));
-            env(offer(bob, BTC(60), EUR(50)));
-            env(offer(carol, BTC(1000), EUR(1)));
-            env(offer(bob, EUR(50), USD(50)));
+            env(offer(bob, btc(50), usd(50)));
+            env(offer(bob, btc(60), eur(50)));
+            env(offer(carol, btc(1000), eur(1)));
+            env(offer(bob, eur(50), usd(50)));
 
             // unfund offer
-            env(pay(bob, gw, EUR(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(50)));
-            BEAST_EXPECT(isOffer(env, bob, BTC(60), EUR(50)));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1000), EUR(1)));
+            env(pay(bob, gw, eur(50)));
+            BEAST_EXPECT(isOffer(env, bob, btc(50), usd(50)));
+            BEAST_EXPECT(isOffer(env, bob, btc(60), eur(50)));
+            BEAST_EXPECT(isOffer(env, carol, btc(1000), eur(1)));
 
             auto flowJournal = env.app().getJournal("Flow");
             auto const flowResult = [&] {
-                STAmount const deliver(USD(51));
-                STAmount smax(BTC(61));
-                PaymentSandbox sb(env.current().get(), tapNONE);
+                STAmount const deliver(usd(51));
+                STAmount smax(btc(61));
+                PaymentSandbox sb(env.current().get(), TapNone);
                 STPathSet paths;
-                auto IPE = [](Issue const& iss) {
+                auto ipe = [](Issue const& iss) {
                     return STPathElement(
-                        STPathElement::typeCurrency | STPathElement::typeIssuer,
+                        STPathElement::TypeCurrency | STPathElement::TypeIssuer,
                         xrpAccount(),
                         iss.currency,
                         iss.account);
                 };
                 {
                     // BTC -> USD
-                    STPath const p1({IPE(USD)});
-                    paths.push_back(p1);
+                    STPath const p1({ipe(usd)});
+                    paths.pushBack(p1);
                     // BTC -> EUR -> USD
-                    STPath const p2({IPE(EUR), IPE(USD)});
-                    paths.push_back(p2);
+                    STPath const p2({ipe(eur), ipe(usd)});
+                    paths.pushBack(p2);
                 }
 
                 return flow(
@@ -503,7 +503,7 @@ struct Flow_test : public beast::unit_test::suite
                     false,
                     false,
                     true,
-                    OfferCrossing::no,
+                    OfferCrossing::No,
                     std::nullopt,
                     smax,
                     std::nullopt,
@@ -514,7 +514,7 @@ struct Flow_test : public beast::unit_test::suite
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
                 if (flowResult.removableOffers.empty())
                     return false;
-                Sandbox sb(&view, tapNONE);
+                Sandbox sb(&view, TapNone);
                 for (auto const& o : flowResult.removableOffers)
                 {
                     if (auto ok = sb.peek(keylet::offer(o)))
@@ -525,10 +525,10 @@ struct Flow_test : public beast::unit_test::suite
             });
 
             // used in payment, but since payment failed should be untouched
-            BEAST_EXPECT(isOffer(env, bob, BTC(50), USD(50)));
-            BEAST_EXPECT(isOffer(env, carol, BTC(1000), EUR(1)));
+            BEAST_EXPECT(isOffer(env, bob, btc(50), usd(50)));
+            BEAST_EXPECT(isOffer(env, carol, btc(1000), eur(1)));
             // found unfunded
-            BEAST_EXPECT(!isOffer(env, bob, BTC(60), EUR(50)));
+            BEAST_EXPECT(!isOffer(env, bob, btc(60), eur(50)));
         }
         {
             // Do not produce more in the forward pass than the reverse pass
@@ -542,15 +542,15 @@ struct Flow_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
 
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(EUR(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(eur(1000), alice, bob, carol);
 
-            env(pay(gw, alice, USD(1000)));
-            env(pay(gw, bob, EUR(1000)));
+            env(pay(gw, alice, usd(1000)));
+            env(pay(gw, bob, eur(1000)));
 
             Keylet const bobUsdOffer = keylet::offer(bob, env.seq(bob));
-            env(offer(bob, USD(1), drops(2)), txflags(tfPassive));
-            env(offer(bob, drops(1), EUR(1000)), txflags(tfPassive));
+            env(offer(bob, usd(1), drops(2)), Txflags(tfPassive));
+            env(offer(bob, drops(1), eur(1000)), Txflags(tfPassive));
 
             bool const reducedOffersV2 = features[fixReducedOffersV2];
 
@@ -559,17 +559,17 @@ struct Flow_test : public beast::unit_test::suite
             // than USD(0.5), then the remaining fractional offer would
             // block the order book.
             TER const expectedTER = reducedOffersV2 ? TER(tecPATH_DRY) : TER(tesSUCCESS);
-            env(pay(alice, carol, EUR(1)),
-                path(~XRP, ~EUR),
-                sendmax(USD(0.4)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(expectedTER));
+            env(pay(alice, carol, eur(1)),
+                Path(~XRP, ~eur),
+                Sendmax(usd(0.4)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(expectedTER));
 
             if (!reducedOffersV2)
             {
-                env.require(balance(carol, EUR(1)));
-                env.require(balance(bob, USD(0.4)));
-                env.require(balance(bob, EUR(999)));
+                env.require(Balance(carol, eur(1)));
+                env.require(Balance(bob, usd(0.4)));
+                env.require(Balance(bob, eur(999)));
 
                 // Show that bob's USD offer is now a blocker.
                 std::shared_ptr<SLE const> const usdOffer = env.le(bobUsdOffer);
@@ -603,9 +603,9 @@ struct Flow_test : public beast::unit_test::suite
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
-        auto const BTC = gw["BTC"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const btc = gw["BTC"];
+        auto const eur = gw["EUR"];
         Account const alice("alice");
         Account const bob("bob");
         Account const carol("carol");
@@ -616,10 +616,10 @@ struct Flow_test : public beast::unit_test::suite
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
         env(rate(gw, 1.25));
-        env.trust(USD(1000), alice, bob);
-        env(offer(gw, XRP(125), USD(125)));
-        env(pay(alice, bob, USD(100)), sendmax(XRP(200)));
-        env.require(balance(alice, xrpMinusFee(env, 10000 - 125)), balance(bob, USD(100)));
+        env.trust(usd(1000), alice, bob);
+        env(offer(gw, XRP(125), usd(125)));
+        env(pay(alice, bob, usd(100)), Sendmax(XRP(200)));
+        env.require(Balance(alice, xrpMinusFee(env, 10000 - 125)), Balance(bob, usd(100)));
     }
 
     void
@@ -630,8 +630,8 @@ struct Flow_test : public beast::unit_test::suite
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
         Account const alice("alice");
         Account const bob("bob");
         Account const carol("carol");
@@ -641,11 +641,11 @@ struct Flow_test : public beast::unit_test::suite
         env.fund(XRP(10000), alice, carol, gw);
         env.fund(reserve(env, 5), bob);
         env.close();
-        env.trust(USD(1000), alice, bob, carol);
-        env.trust(EUR(1000), alice, bob, carol);
+        env.trust(usd(1000), alice, bob, carol);
+        env.trust(eur(1000), alice, bob, carol);
 
-        env(pay(gw, alice, EUR(50)));
-        env(pay(gw, bob, USD(50)));
+        env(pay(gw, alice, eur(50)));
+        env(pay(gw, bob, usd(50)));
 
         // Bob has _just_ slightly less than 50 xrp available
         // If his owner count changes, he will have more liquidity.
@@ -654,16 +654,16 @@ struct Flow_test : public beast::unit_test::suite
         // recursive calls to the EUR/XRP offer. The second call will return
         // tecPATH_DRY, but the entire path should not be marked as dry. This
         // is the second error case to test (when flowV1 is used).
-        env(offer(bob, EUR(50), XRP(50)));
-        env(offer(bob, XRP(50), USD(50)));
+        env(offer(bob, eur(50), XRP(50)));
+        env(offer(bob, XRP(50), usd(50)));
 
-        env(pay(alice, carol, USD(1000000)),
-            path(~XRP, ~USD),
-            sendmax(EUR(500)),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(alice, carol, usd(1000000)),
+            Path(~XRP, ~usd),
+            Sendmax(eur(500)),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
-        auto const carolUSD = env.balance(carol, USD).value();
-        BEAST_EXPECT(carolUSD > USD(0) && carolUSD < USD(50));
+        auto const carolUSD = env.balance(carol, usd).value();
+        BEAST_EXPECT(carolUSD > usd(0) && carolUSD < usd(50));
     }
 
     void
@@ -677,7 +677,7 @@ struct Flow_test : public beast::unit_test::suite
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         Account const alice("alice");
         Account const bob("bob");
         Account const carol("carol");
@@ -688,17 +688,17 @@ struct Flow_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
 
-            env.trust(USD(100), alice, bob, carol);
-            env(pay(gw, bob, USD(100)));
-            env(offer(bob, XRP(50), USD(50)));
-            env(offer(bob, XRP(100), USD(50)));
+            env.trust(usd(100), alice, bob, carol);
+            env(pay(gw, bob, usd(100)));
+            env(offer(bob, XRP(50), usd(50)));
+            env(offer(bob, XRP(100), usd(50)));
 
-            env(pay(alice, carol, USD(100)),
-                path(~USD),
-                sendmax(XRP(100)),
-                txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
+            env(pay(alice, carol, usd(100)),
+                Path(~usd),
+                Sendmax(XRP(100)),
+                Txflags(tfNoRippleDirect | tfPartialPayment | tfLimitQuality));
 
-            env.require(balance(carol, USD(50)));
+            env.require(Balance(carol, usd(50)));
         }
     }
 
@@ -737,8 +737,8 @@ struct Flow_test : public beast::unit_test::suite
         auto const gw1 = Account("gw1");
         auto const gw2 = Account("gw2");
         auto const alice = Account("alice");
-        auto const USD = gw1["USD"];
-        auto const EUR = gw2["EUR"];
+        auto const usd = gw1["USD"];
+        auto const eur = gw2["EUR"];
 
         Env env(*this, features);
 
@@ -751,20 +751,20 @@ struct Flow_test : public beast::unit_test::suite
         env.fund(reserve(env, 3) + f * 4, alice);
         env.close();
 
-        env(trust(alice, USD(2000)));
-        env(trust(alice, EUR(2000)));
+        env(trust(alice, usd(2000)));
+        env(trust(alice, eur(2000)));
         env.close();
 
-        env(pay(gw1, alice, USD(1)));
-        env(pay(gw2, alice, EUR(1000)));
+        env(pay(gw1, alice, usd(1)));
+        env(pay(gw2, alice, eur(1000)));
         env.close();
 
-        env(offer(alice, USD(500), EUR(600)));
+        env(offer(alice, usd(500), eur(600)));
         env.close();
 
-        env.require(owners(alice, 3));
-        env.require(balance(alice, USD(1)));
-        env.require(balance(alice, EUR(1000)));
+        env.require(Owners(alice, 3));
+        env.require(Balance(alice, usd(1)));
+        env.require(Balance(alice, eur(1000)));
 
         auto aliceOffers = offersOnAccount(env, alice);
         BEAST_EXPECT(aliceOffers.size() == 1);
@@ -772,24 +772,24 @@ struct Flow_test : public beast::unit_test::suite
         {
             auto const offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+            BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(500));
         }
 
-        env(pay(alice, alice, EUR(600)), sendmax(USD(500)), txflags(tfPartialPayment));
+        env(pay(alice, alice, eur(600)), Sendmax(usd(500)), Txflags(tfPartialPayment));
         env.close();
 
-        env.require(owners(alice, 3));
-        env.require(balance(alice, USD(1)));
-        env.require(balance(alice, EUR(1000)));
+        env.require(Owners(alice, 3));
+        env.require(Balance(alice, usd(1)));
+        env.require(Balance(alice, eur(1000)));
         aliceOffers = offersOnAccount(env, alice);
         BEAST_EXPECT(aliceOffers.size() == 1);
         for (auto const& offerPtr : aliceOffers)
         {
             auto const offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == EUR(598.8));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(499));
+            BEAST_EXPECT(offer[sfTakerGets] == eur(598.8));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(499));
         }
     }
 
@@ -806,8 +806,8 @@ struct Flow_test : public beast::unit_test::suite
         auto const gw1 = Account("gw1");
         auto const gw2 = Account("gw2");
         auto const alice = Account("alice");
-        auto const USD = gw1["USD"];
-        auto const EUR = gw2["EUR"];
+        auto const usd = gw1["USD"];
+        auto const eur = gw2["EUR"];
 
         Env env(*this, features);
 
@@ -820,20 +820,20 @@ struct Flow_test : public beast::unit_test::suite
         env.fund(reserve(env, 3) + f * 4, alice);
         env.close();
 
-        env(trust(alice, USD(506)));
-        env(trust(alice, EUR(606)));
+        env(trust(alice, usd(506)));
+        env(trust(alice, eur(606)));
         env.close();
 
-        env(pay(gw1, alice, USD(500)));
-        env(pay(gw2, alice, EUR(600)));
+        env(pay(gw1, alice, usd(500)));
+        env(pay(gw2, alice, eur(600)));
         env.close();
 
-        env(offer(alice, USD(500), EUR(600)));
+        env(offer(alice, usd(500), eur(600)));
         env.close();
 
-        env.require(owners(alice, 3));
-        env.require(balance(alice, USD(500)));
-        env.require(balance(alice, EUR(600)));
+        env.require(Owners(alice, 3));
+        env.require(Balance(alice, usd(500)));
+        env.require(Balance(alice, eur(600)));
 
         auto aliceOffers = offersOnAccount(env, alice);
         BEAST_EXPECT(aliceOffers.size() == 1);
@@ -841,24 +841,24 @@ struct Flow_test : public beast::unit_test::suite
         {
             auto const offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+            BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(500));
         }
 
-        env(pay(alice, alice, EUR(60)), sendmax(USD(50)), txflags(tfPartialPayment));
+        env(pay(alice, alice, eur(60)), Sendmax(usd(50)), Txflags(tfPartialPayment));
         env.close();
 
-        env.require(owners(alice, 3));
-        env.require(balance(alice, USD(500)));
-        env.require(balance(alice, EUR(600)));
+        env.require(Owners(alice, 3));
+        env.require(Balance(alice, usd(500)));
+        env.require(Balance(alice, eur(600)));
         aliceOffers = offersOnAccount(env, alice);
         BEAST_EXPECT(aliceOffers.size() == 1);
         for (auto const& offerPtr : aliceOffers)
         {
             auto const offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == EUR(594));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(495));
+            BEAST_EXPECT(offer[sfTakerGets] == eur(594));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(495));
         }
     }
     void
@@ -877,21 +877,21 @@ struct Flow_test : public beast::unit_test::suite
 
         auto const alice = Account("alice");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, gw);
         env.close();
-        env(trust(alice, USD(20)));
-        env(pay(gw, alice, USD(10)));
-        env(offer(alice, XRP(50000), USD(10)));
+        env(trust(alice, usd(20)));
+        env(pay(gw, alice, usd(10)));
+        env(offer(alice, XRP(50000), usd(10)));
 
         // Consuming the offer changes the owner count, which could also cause
         // liquidity to decrease in the forward pass
-        auto const toSend = consumeOffer ? USD(10) : USD(9);
+        auto const toSend = consumeOffer ? usd(10) : usd(9);
         env(pay(alice, alice, toSend),
-            path(~USD),
-            sendmax(XRP(20000)),
-            txflags(tfPartialPayment | tfNoRippleDirect));
+            Path(~usd),
+            Sendmax(XRP(20000)),
+            Txflags(tfPartialPayment | tfNoRippleDirect));
     }
 
     void
@@ -907,22 +907,22 @@ struct Flow_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(100000), alice, bob, gw);
             env.close();
-            env(trust(bob, USD(20)));
+            env(trust(bob, usd(20)));
 
-            STAmount const tinyAmt1{USD, 9000000000000000ll, -17, false, STAmount::unchecked{}};
-            STAmount const tinyAmt3{USD, 9000000000000003ll, -17, false, STAmount::unchecked{}};
+            STAmount const tinyAmt1{usd, 9000000000000000ll, -17, false, STAmount::Unchecked{}};
+            STAmount const tinyAmt3{usd, 9000000000000003ll, -17, false, STAmount::Unchecked{}};
 
             env(offer(gw, drops(9000000000), tinyAmt3));
             env(pay(alice, bob, tinyAmt1),
-                path(~USD),
-                sendmax(drops(9000000000)),
-                txflags(tfNoRippleDirect));
+                Path(~usd),
+                Sendmax(drops(9000000000)),
+                Txflags(tfNoRippleDirect));
 
-            BEAST_EXPECT(!isOffer(env, gw, XRP(0), USD(0)));
+            BEAST_EXPECT(!isOffer(env, gw, XRP(0), usd(0)));
         }
         {
             // Test forward
@@ -931,24 +931,24 @@ struct Flow_test : public beast::unit_test::suite
             auto const alice = Account("alice");
             auto const bob = Account("bob");
             auto const gw = Account("gw");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(100000), alice, bob, gw);
             env.close();
-            env(trust(alice, USD(20)));
+            env(trust(alice, usd(20)));
 
-            STAmount const tinyAmt1{USD, 9000000000000000ll, -17, false, STAmount::unchecked{}};
-            STAmount const tinyAmt3{USD, 9000000000000003ll, -17, false, STAmount::unchecked{}};
+            STAmount const tinyAmt1{usd, 9000000000000000ll, -17, false, STAmount::Unchecked{}};
+            STAmount const tinyAmt3{usd, 9000000000000003ll, -17, false, STAmount::Unchecked{}};
 
             env(pay(gw, alice, tinyAmt1));
 
             env(offer(gw, tinyAmt3, drops(9000000000)));
             env(pay(alice, bob, drops(9000000000)),
-                path(~XRP),
-                sendmax(USD(1)),
-                txflags(tfNoRippleDirect));
+                Path(~XRP),
+                Sendmax(usd(1)),
+                Txflags(tfNoRippleDirect));
 
-            BEAST_EXPECT(!isOffer(env, gw, USD(0), XRP(0)));
+            BEAST_EXPECT(!isOffer(env, gw, usd(0), XRP(0)));
         }
     }
 
@@ -963,12 +963,12 @@ struct Flow_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        auto const usdC = USD.currency;
+        auto const usd = gw["USD"];
+        auto const usdC = usd.currency;
 
         env.fund(XRP(10000), alice, bob, gw);
         env.close();
-        env(trust(alice, USD(100)));
+        env(trust(alice, usd(100)));
         env.close();
 
         BEAST_EXPECT(!getNoRippleFlag(env, gw, alice, usdC));
@@ -977,36 +977,36 @@ struct Flow_test : public beast::unit_test::suite
             pay(gw,
                 alice,
                 // 12.55....
-                STAmount{USD, std::uint64_t(1255555555555555ull), -14, false}));
+                STAmount{usd, std::uint64_t(1255555555555555ull), -14, false}));
 
         env(offer(
             gw,
             // 5.0...
-            STAmount{USD, std::uint64_t(5000000000000000ull), -15, false},
+            STAmount{usd, std::uint64_t(5000000000000000ull), -15, false},
             XRP(1000)));
 
         env(offer(
             gw,
             // .555...
-            STAmount{USD, std::uint64_t(5555555555555555ull), -16, false},
+            STAmount{usd, std::uint64_t(5555555555555555ull), -16, false},
             XRP(10)));
 
         env(offer(
             gw,
             // 4.44....
-            STAmount{USD, std::uint64_t(4444444444444444ull), -15, false},
+            STAmount{usd, std::uint64_t(4444444444444444ull), -15, false},
             XRP(.1)));
 
         env(offer(
             alice,
             // 17
-            STAmount{USD, std::uint64_t(1700000000000000ull), -14, false},
+            STAmount{usd, std::uint64_t(1700000000000000ull), -14, false},
             XRP(.001)));
 
         env(pay(alice, bob, XRP(10000)),
-            path(~XRP),
-            sendmax(USD(100)),
-            txflags(tfPartialPayment | tfNoRippleDirect));
+            Path(~XRP),
+            Sendmax(usd(100)),
+            Txflags(tfPartialPayment | tfNoRippleDirect));
     }
 
     void
@@ -1037,10 +1037,10 @@ struct Flow_test : public beast::unit_test::suite
         env.close();
 
         env(pay(alice, alice, XRP(1)),
-            path(gw, bob, ~XRP),
-            sendmax(gw["USD"](1000)),
-            txflags(tfNoRippleDirect),
-            ter(tecPATH_DRY));
+            Path(gw, bob, ~XRP),
+            Sendmax(gw["USD"](1000)),
+            Txflags(tfNoRippleDirect),
+            Ter(tecPATH_DRY));
         env.close();
 
         env.trust(bob["USD"](10000), alice);
@@ -1050,10 +1050,10 @@ struct Flow_test : public beast::unit_test::suite
         env.close();
 
         env(pay(carol, carol, gw["USD"](1000)),
-            path(~bob["USD"], gw),
-            sendmax(XRP(100000)),
-            txflags(tfNoRippleDirect),
-            ter(tecPATH_DRY));
+            Path(~bob["USD"], gw),
+            Sendmax(XRP(100000)),
+            Txflags(tfNoRippleDirect),
+            Ter(tecPATH_DRY));
         env.close();
 
         pass();
@@ -1075,28 +1075,28 @@ struct Flow_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(100000000), alice, bob, carol, gw);
         env.close();
-        env.trust(USD(10000), alice, carol);
-        env(trust(bob, USD(10000), tfSetNoRipple));
-        env.trust(USD(10000), bob);
+        env.trust(usd(10000), alice, carol);
+        env(trust(bob, usd(10000), tfSetNoRipple));
+        env.trust(usd(10000), bob);
         env.trust(bob["USD"](10000), carol);
         env.close();
 
         env(pay(bob, carol, bob["USD"](1000)));
-        env(pay(gw, bob, USD(1000)));
+        env(pay(gw, bob, usd(1000)));
         env.close();
 
         env(offer(carol, XRP(1), bob["USD"](1000)));
         env.close();
 
-        env(pay(alice, alice, USD(1000)),
-            path(~bob["USD"], bob, gw),
-            sendmax(XRP(1)),
-            txflags(tfNoRippleDirect),
-            ter(tecPATH_DRY));
+        env(pay(alice, alice, usd(1000)),
+            Path(~bob["USD"], bob, gw),
+            Sendmax(XRP(1)),
+            Txflags(tfNoRippleDirect),
+            Ter(tecPATH_DRY));
         env.close();
     }
 
@@ -1114,7 +1114,7 @@ struct Flow_test : public beast::unit_test::suite
 
         auto const ann = Account("ann");
         auto const gw = Account("gateway");
-        auto const CTB = gw["CTB"];
+        auto const ctb = gw["CTB"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 2) + drops(9999640) + fee, ann);
@@ -1122,17 +1122,17 @@ struct Flow_test : public beast::unit_test::suite
         env.close();
 
         env(rate(gw, 1.002));
-        env(trust(ann, CTB(10)));
+        env(trust(ann, ctb(10)));
         env.close();
 
-        env(pay(gw, ann, CTB(2.856)));
+        env(pay(gw, ann, ctb(2.856)));
         env.close();
 
-        env(offer(ann, drops(365611702030), CTB(5.713)));
+        env(offer(ann, drops(365611702030), ctb(5.713)));
         env.close();
 
         // This payment caused the assert.
-        env(pay(ann, ann, CTB(0.687)), sendmax(drops(20000000000)), txflags(tfPartialPayment));
+        env(pay(ann, ann, ctb(0.687)), Sendmax(drops(20000000000)), Txflags(tfPartialPayment));
     }
 
     void
@@ -1148,7 +1148,7 @@ struct Flow_test : public beast::unit_test::suite
         env.fund(XRP(10000), alice);
         env.close();
 
-        env(pay(alice, alice, alice["USD"](100)), path(~alice["USD"]), ter(temBAD_PATH));
+        env(pay(alice, alice, alice["USD"](100)), Path(~alice["USD"]), Ter(temBAD_PATH));
     }
 
     void
@@ -1160,32 +1160,32 @@ struct Flow_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         {
             // Payment path starting with XRP
-            Env env(*this, testable_amendments());
+            Env env(*this, testableAmendments());
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(100)));
-            env(pay(gw, alice, EUR(100)));
+            env(pay(gw, alice, usd(100)));
+            env(pay(gw, alice, eur(100)));
             env.close();
 
-            env(offer(alice, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(alice, USD(100), XRP(100)), txflags(tfPassive));
-            env(offer(alice, XRP(100), EUR(100)), txflags(tfPassive));
+            env(offer(alice, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(alice, usd(100), XRP(100)), Txflags(tfPassive));
+            env(offer(alice, XRP(100), eur(100)), Txflags(tfPassive));
             env.close();
 
             TER const expectedTer = TER{temBAD_PATH_LOOP};
-            env(pay(alice, bob, EUR(1)),
-                path(~USD, ~XRP, ~EUR),
-                sendmax(XRP(1)),
-                txflags(tfNoRippleDirect),
-                ter(expectedTer));
+            env(pay(alice, bob, eur(1)),
+                Path(~usd, ~XRP, ~eur),
+                Sendmax(XRP(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(expectedTer));
 
             pass();
         }
@@ -1194,49 +1194,49 @@ struct Flow_test : public beast::unit_test::suite
             Env env(*this);
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
-            env(pay(gw, alice, EUR(100)));
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
+            env(pay(gw, alice, eur(100)));
             env.close();
 
-            env(offer(alice, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(alice, EUR(100), XRP(100)), txflags(tfPassive));
+            env(offer(alice, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(alice, eur(100), XRP(100)), Txflags(tfPassive));
             env.close();
             // EUR -> //XRP -> //USD ->XRP
             env(pay(alice, bob, XRP(1)),
-                path(~XRP, ~USD, ~XRP),
-                sendmax(EUR(1)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+                Path(~XRP, ~usd, ~XRP),
+                Sendmax(eur(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
         {
             // Payment where loop is formed in the middle of the path, not on an
             // endpoint
-            auto const JPY = gw["JPY"];
+            auto const jpy = gw["JPY"];
             Env env(*this);
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
-            env.trust(JPY(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
+            env.trust(jpy(1000), alice, bob);
             env.close();
-            env(pay(gw, alice, USD(100)));
-            env(pay(gw, alice, EUR(100)));
-            env(pay(gw, alice, JPY(100)));
+            env(pay(gw, alice, usd(100)));
+            env(pay(gw, alice, eur(100)));
+            env(pay(gw, alice, jpy(100)));
             env.close();
 
-            env(offer(alice, USD(100), XRP(100)), txflags(tfPassive));
-            env(offer(alice, XRP(100), EUR(100)), txflags(tfPassive));
-            env(offer(alice, EUR(100), XRP(100)), txflags(tfPassive));
-            env(offer(alice, XRP(100), JPY(100)), txflags(tfPassive));
+            env(offer(alice, usd(100), XRP(100)), Txflags(tfPassive));
+            env(offer(alice, XRP(100), eur(100)), Txflags(tfPassive));
+            env(offer(alice, eur(100), XRP(100)), Txflags(tfPassive));
+            env(offer(alice, XRP(100), jpy(100)), Txflags(tfPassive));
             env.close();
 
-            env(pay(alice, bob, JPY(1)),
-                path(~XRP, ~EUR, ~XRP, ~JPY),
-                sendmax(USD(1)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice, bob, jpy(1)),
+                Path(~XRP, ~eur, ~XRP, ~jpy),
+                Sendmax(usd(1)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
     }
 
@@ -1259,10 +1259,10 @@ struct Flow_test : public beast::unit_test::suite
         env(ticket::create(alice, 1));
 
         // Make a payment using the ticket.
-        env(pay(alice, bob, XRP(1000)), ticket::use(ticketSeq));
+        env(pay(alice, bob, XRP(1000)), ticket::Use(ticketSeq));
         env.close();
-        env.require(balance(bob, XRP(1000)));
-        env.require(balance(alice, XRP(9000) - (env.current()->fees().base * 2)));
+        env.require(Balance(bob, XRP(1000)));
+        env.require(Balance(alice, XRP(9000) - (env.current()->fees().base * 2)));
     }
 
     void
@@ -1296,7 +1296,7 @@ struct Flow_test : public beast::unit_test::suite
         testRIPD1449();
 
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeats(sa - featurePermissionedDEX);
         testWithFeats(sa);
         testEmptyStrand(sa);
@@ -1309,7 +1309,7 @@ struct Flow_manual_test : public Flow_test
     run() override
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         FeatureBitset const permDex{featurePermissionedDEX};
 
         testWithFeats(all - permDex);
diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp
index 29127ec8e1..26b7a1e70a 100644
--- a/src/test/app/Freeze_test.cpp
+++ b/src/test/app/Freeze_test.cpp
@@ -35,7 +35,7 @@
 
 namespace xrpl {
 
-class Freeze_test : public beast::unit_test::suite
+class Freeze_test : public beast::unit_test::Suite
 {
     void
     testRippleState(FeatureBitset features)
@@ -45,29 +45,29 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
+        Account const g1{"G1"};
         Account const alice{"alice"};
         Account const bob{"bob"};
 
-        env.fund(XRP(1000), G1, alice, bob);
+        env.fund(XRP(1000), g1, alice, bob);
         env.close();
 
-        env.trust(G1["USD"](100), bob);
-        env.trust(G1["USD"](100), alice);
+        env.trust(g1["USD"](100), bob);
+        env.trust(g1["USD"](100), alice);
         env.close();
 
-        env(pay(G1, bob, G1["USD"](10)));
-        env(pay(G1, alice, G1["USD"](100)));
+        env(pay(g1, bob, g1["USD"](10)));
+        env(pay(g1, alice, g1["USD"](100)));
         env.close();
 
-        env(offer(alice, XRP(500), G1["USD"](100)));
+        env(offer(alice, XRP(500), g1["USD"](100)));
         env.close();
 
         {
             auto lines = getAccountLines(env, bob);
             if (!BEAST_EXPECT(checkArraySize(lines[jss::lines], 1u)))
                 return;
-            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == G1.human());
+            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == g1.human());
             BEAST_EXPECT(lines[jss::lines][0u][jss::limit] == "100");
             BEAST_EXPECT(lines[jss::lines][0u][jss::balance] == "10");
         }
@@ -76,7 +76,7 @@ class Freeze_test : public beast::unit_test::suite
             auto lines = getAccountLines(env, alice);
             if (!BEAST_EXPECT(checkArraySize(lines[jss::lines], 1u)))
                 return;
-            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == G1.human());
+            BEAST_EXPECT(lines[jss::lines][0u][jss::account] == g1.human());
             BEAST_EXPECT(lines[jss::lines][0u][jss::limit] == "100");
             BEAST_EXPECT(lines[jss::lines][0u][jss::balance] == "100");
         }
@@ -84,23 +84,23 @@ class Freeze_test : public beast::unit_test::suite
         {
             // Account with line unfrozen (proving operations normally work)
             //   test: can make Payment on that line
-            env(pay(alice, bob, G1["USD"](1)));
+            env(pay(alice, bob, g1["USD"](1)));
 
             //   test: can receive Payment on that line
-            env(pay(bob, alice, G1["USD"](1)));
+            env(pay(bob, alice, g1["USD"](1)));
             env.close();
         }
 
         {
             // Is created via a TrustSet with SetFreeze flag
             //   test: sets LowFreeze | HighFreeze flags
-            env(trust(G1, bob["USD"](0), tfSetFreeze));
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            env(trust(g1, bob["USD"](0), tfSetFreeze));
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             if (!BEAST_EXPECT(checkArraySize(affected, 2u)))
                 return;
             auto ff = affected[1u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
             BEAST_EXPECT(
-                ff[sfLowLimit.fieldName] == G1["USD"](0).value().getJson(JsonOptions::none));
+                ff[sfLowLimit.fieldName] == g1["USD"](0).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(ff[jss::Flags].asUInt() & lsfLowFreeze);
             BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfHighFreeze));
             env.close();
@@ -109,35 +109,35 @@ class Freeze_test : public beast::unit_test::suite
         {
             // Account with line frozen by issuer
             //    test: can buy more assets on that line
-            env(offer(bob, G1["USD"](5), XRP(25)));
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            env(offer(bob, g1["USD"](5), XRP(25)));
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             if (!BEAST_EXPECT(checkArraySize(affected, 5u)))
                 return;
             auto ff = affected[3u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
             BEAST_EXPECT(
-                ff[sfHighLimit.fieldName] == bob["USD"](100).value().getJson(JsonOptions::none));
-            auto amt = STAmount{Issue{to_currency("USD"), noAccount()}, -15}.value().getJson(
-                JsonOptions::none);
+                ff[sfHighLimit.fieldName] == bob["USD"](100).value().getJson(JsonOptions::KNone));
+            auto amt = STAmount{Issue{toCurrency("USD"), noAccount()}, -15}.value().getJson(
+                JsonOptions::KNone);
             BEAST_EXPECT(ff[sfBalance.fieldName] == amt);
             env.close();
         }
 
         {
             //    test: can not sell assets from that line
-            env(offer(bob, XRP(1), G1["USD"](5)), ter(tecUNFUNDED_OFFER));
+            env(offer(bob, XRP(1), g1["USD"](5)), Ter(tecUNFUNDED_OFFER));
 
             //    test: can receive Payment on that line
-            env(pay(alice, bob, G1["USD"](1)));
+            env(pay(alice, bob, g1["USD"](1)));
 
             //    test: can not make Payment from that line
-            env(pay(bob, alice, G1["USD"](1)), ter(tecPATH_DRY));
+            env(pay(bob, alice, g1["USD"](1)), Ter(tecPATH_DRY));
         }
 
         {
             // check G1 account lines
             //    test: shows freeze
-            auto lines = getAccountLines(env, G1);
-            Json::Value bobLine;
+            auto lines = getAccountLines(env, g1);
+            json::Value bobLine;
             for (auto const& it : lines[jss::lines])
             {
                 if (it[jss::account] == bob.human())
@@ -155,10 +155,10 @@ class Freeze_test : public beast::unit_test::suite
         {
             //    test: shows freeze peer
             auto lines = getAccountLines(env, bob);
-            Json::Value g1Line;
+            json::Value g1Line;
             for (auto const& it : lines[jss::lines])
             {
-                if (it[jss::account] == G1.human())
+                if (it[jss::account] == g1.human())
                 {
                     g1Line = it;
                     break;
@@ -173,13 +173,13 @@ class Freeze_test : public beast::unit_test::suite
         {
             // Is cleared via a TrustSet with ClearFreeze flag
             //    test: sets LowFreeze | HighFreeze flags
-            env(trust(G1, bob["USD"](0), tfClearFreeze));
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            env(trust(g1, bob["USD"](0), tfClearFreeze));
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             if (!BEAST_EXPECT(checkArraySize(affected, 2u)))
                 return;
             auto ff = affected[1u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
             BEAST_EXPECT(
-                ff[sfLowLimit.fieldName] == G1["USD"](0).value().getJson(JsonOptions::none));
+                ff[sfLowLimit.fieldName] == g1["USD"](0).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfLowFreeze));
             BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfHighFreeze));
             env.close();
@@ -194,20 +194,20 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
 
-        env.fund(XRP(10000), G1, A1);
+        env.fund(XRP(10000), g1, a1);
         env.close();
 
-        env.trust(G1["USD"](1000), A1);
+        env.trust(g1["USD"](1000), a1);
         env.close();
 
         if (features[featureDeepFreeze])
         {
             //  test: Issuer deep freezing the trust line in a single
             //  transaction
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(flags & lsfLowFreeze);
@@ -218,7 +218,7 @@ class Freeze_test : public beast::unit_test::suite
 
             //  test: Issuer clearing deep freeze and normal freeze in a single
             //  transaction
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(!(flags & (lsfLowFreeze | lsfLowDeepFreeze)));
@@ -227,13 +227,13 @@ class Freeze_test : public beast::unit_test::suite
             }
 
             //  test: Issuer deep freezing not already frozen line must fail
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze), ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze), Ter(tecNO_PERMISSION));
 
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             //  test: Issuer deep freezing already frozen trust line
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(flags & lsfLowFreeze);
@@ -244,7 +244,7 @@ class Freeze_test : public beast::unit_test::suite
 
             //  test: Holder clearing freeze flags has no effect. Each sides'
             //  flags are independent
-            env(trust(A1, G1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a1, g1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(flags & lsfLowFreeze);
@@ -254,11 +254,11 @@ class Freeze_test : public beast::unit_test::suite
             }
 
             //  test: Issuer can't clear normal freeze when line is deep frozen
-            env(trust(G1, A1["USD"](0), tfClearFreeze), ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfClearFreeze), Ter(tecNO_PERMISSION));
 
             //  test: Issuer clearing deep freeze but normal freeze is still in
             //  effect
-            env(trust(G1, A1["USD"](0), tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(flags & lsfLowFreeze);
@@ -270,10 +270,10 @@ class Freeze_test : public beast::unit_test::suite
         else
         {
             //  test: applying deep freeze before amendment fails
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze), ter(temINVALID_FLAG));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze), Ter(temINVALID_FLAG));
 
             //  test: clearing deep freeze before amendment fails
-            env(trust(G1, A1["USD"](0), tfClearDeepFreeze), ter(temINVALID_FLAG));
+            env(trust(g1, a1["USD"](0), tfClearDeepFreeze), Ter(temINVALID_FLAG));
         }
     }
 
@@ -285,44 +285,44 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
 
-        env.fund(XRP(10000), G1, A1);
+        env.fund(XRP(10000), g1, a1);
         env.close();
 
         // test: can create frozen trustline
         {
-            env(trust(G1, A1["USD"](1000), tfSetFreeze));
+            env(trust(g1, a1["USD"](1000), tfSetFreeze));
             auto const flags = getTrustlineFlags(env, 5u, 3u, false);
             BEAST_EXPECT(flags & lsfLowFreeze);
             env.close();
-            env.require(lines(A1, 1));
+            env.require(lines(a1, 1));
         }
 
         // Cleanup
-        env(trust(G1, A1["USD"](0), tfClearFreeze));
+        env(trust(g1, a1["USD"](0), tfClearFreeze));
         env.close();
-        env.require(lines(G1, 0));
-        env.require(lines(A1, 0));
+        env.require(lines(g1, 0));
+        env.require(lines(a1, 0));
 
         // test: cannot create deep frozen trustline without normal freeze
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](1000), tfSetDeepFreeze), ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](1000), tfSetDeepFreeze), Ter(tecNO_PERMISSION));
             env.close();
-            env.require(lines(A1, 0));
+            env.require(lines(a1, 0));
         }
 
         // test: can create deep frozen trustline together with normal freeze
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
             auto const flags = getTrustlineFlags(env, 5u, 3u, false);
             BEAST_EXPECT(flags & lsfLowFreeze);
             BEAST_EXPECT(flags & lsfLowDeepFreeze);
             env.close();
-            env.require(lines(A1, 1));
+            env.require(lines(a1, 1));
         }
     }
 
@@ -334,32 +334,32 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
 
-        env.fund(XRP(10000), G1, A1);
+        env.fund(XRP(10000), g1, a1);
         env.close();
 
-        env.trust(G1["USD"](1000), A1);
+        env.trust(g1["USD"](1000), a1);
         env.close();
 
         if (features[featureDeepFreeze])
         {
             //  test: can't have both set and clear flag families in the same
             //  transaction
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfClearFreeze), ter(tecNO_PERMISSION));
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfClearDeepFreeze), ter(tecNO_PERMISSION));
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze | tfClearFreeze), ter(tecNO_PERMISSION));
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze | tfClearDeepFreeze),
-                ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfClearFreeze), Ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfClearDeepFreeze), Ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze | tfClearFreeze), Ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze | tfClearDeepFreeze),
+                Ter(tecNO_PERMISSION));
         }
         else
         {
             //  test: old behavior, transaction succeed with no effect on a
             //  trust line
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfClearFreeze));
             {
-                auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+                auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
                 BEAST_EXPECT(checkArraySize(affected, 1u));  // means no trustline changes
             }
         }
@@ -373,54 +373,54 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
 
-        env.fund(XRP(12000), G1);
-        env.fund(XRP(1000), A1);
-        env.fund(XRP(20000), A2, A3, A4);
+        env.fund(XRP(12000), g1);
+        env.fund(XRP(1000), a1);
+        env.fund(XRP(20000), a2, a3, a4);
         env.close();
 
-        env.trust(G1["USD"](1200), A1);
-        env.trust(G1["USD"](200), A2);
-        env.trust(G1["BTC"](100), A3);
-        env.trust(G1["BTC"](100), A4);
+        env.trust(g1["USD"](1200), a1);
+        env.trust(g1["USD"](200), a2);
+        env.trust(g1["BTC"](100), a3);
+        env.trust(g1["BTC"](100), a4);
         env.close();
 
-        env(pay(G1, A1, G1["USD"](1000)));
-        env(pay(G1, A2, G1["USD"](100)));
-        env(pay(G1, A3, G1["BTC"](100)));
-        env(pay(G1, A4, G1["BTC"](100)));
+        env(pay(g1, a1, g1["USD"](1000)));
+        env(pay(g1, a2, g1["USD"](100)));
+        env(pay(g1, a3, g1["BTC"](100)));
+        env(pay(g1, a4, g1["BTC"](100)));
         env.close();
 
-        env(offer(G1, XRP(10000), G1["USD"](100)), txflags(tfPassive));
-        env(offer(G1, G1["USD"](100), XRP(10000)), txflags(tfPassive));
-        env(offer(A1, XRP(10000), G1["USD"](100)), txflags(tfPassive));
-        env(offer(A2, G1["USD"](100), XRP(10000)), txflags(tfPassive));
+        env(offer(g1, XRP(10000), g1["USD"](100)), Txflags(tfPassive));
+        env(offer(g1, g1["USD"](100), XRP(10000)), Txflags(tfPassive));
+        env(offer(a1, XRP(10000), g1["USD"](100)), Txflags(tfPassive));
+        env(offer(a2, g1["USD"](100), XRP(10000)), Txflags(tfPassive));
         env.close();
 
         {
             // Is toggled via AccountSet using SetFlag and ClearFlag
             //    test: SetFlag GlobalFreeze
-            env.require(nflags(G1, asfGlobalFreeze));
-            env(fset(G1, asfGlobalFreeze));
-            env.require(flags(G1, asfGlobalFreeze));
-            env.require(nflags(G1, asfNoFreeze));
+            env.require(Nflags(g1, asfGlobalFreeze));
+            env(fset(g1, asfGlobalFreeze));
+            env.require(Flags(g1, asfGlobalFreeze));
+            env.require(Nflags(g1, asfNoFreeze));
 
             //    test: ClearFlag GlobalFreeze
-            env(fclear(G1, asfGlobalFreeze));
-            env.require(nflags(G1, asfGlobalFreeze));
-            env.require(nflags(G1, asfNoFreeze));
+            env(fclear(g1, asfGlobalFreeze));
+            env.require(Nflags(g1, asfGlobalFreeze));
+            env.require(Nflags(g1, asfNoFreeze));
         }
 
         {
             // Account without GlobalFreeze (proving operations normally work)
             //    test: visible offers where taker_pays is unfrozen issuer
             auto offers = env.rpc(
-                "book_offers", std::string("USD/") + G1.human(), "XRP")[jss::result][jss::offers];
+                "book_offers", std::string("USD/") + g1.human(), "XRP")[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 2u)))
                 return;
             std::set<std::string> accounts;
@@ -428,12 +428,12 @@ class Freeze_test : public beast::unit_test::suite
             {
                 accounts.insert(offer[jss::Account].asString());
             }
-            BEAST_EXPECT(accounts.find(A2.human()) != std::end(accounts));
-            BEAST_EXPECT(accounts.find(G1.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(a2.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(g1.human()) != std::end(accounts));
 
             //    test: visible offers where taker_gets is unfrozen issuer
             offers = env.rpc(
-                "book_offers", "XRP", std::string("USD/") + G1.human())[jss::result][jss::offers];
+                "book_offers", "XRP", std::string("USD/") + g1.human())[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 2u)))
                 return;
             accounts.clear();
@@ -441,63 +441,63 @@ class Freeze_test : public beast::unit_test::suite
             {
                 accounts.insert(offer[jss::Account].asString());
             }
-            BEAST_EXPECT(accounts.find(A1.human()) != std::end(accounts));
-            BEAST_EXPECT(accounts.find(G1.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(a1.human()) != std::end(accounts));
+            BEAST_EXPECT(accounts.find(g1.human()) != std::end(accounts));
         }
 
         {
             // Offers/Payments
             //    test: assets can be bought on the market
-            env(offer(A3, G1["BTC"](1), XRP(1)));
+            env(offer(a3, g1["BTC"](1), XRP(1)));
 
             //    test: assets can be sold on the market
-            env(offer(A4, XRP(1), G1["BTC"](1)));
+            env(offer(a4, XRP(1), g1["BTC"](1)));
 
             //    test: direct issues can be sent
-            env(pay(G1, A2, G1["USD"](1)));
+            env(pay(g1, a2, g1["USD"](1)));
 
             //    test: direct redemptions can be sent
-            env(pay(A2, G1, G1["USD"](1)));
+            env(pay(a2, g1, g1["USD"](1)));
 
             //    test: via rippling can be sent
-            env(pay(A2, A1, G1["USD"](1)));
+            env(pay(a2, a1, g1["USD"](1)));
 
             //    test: via rippling can be sent back
-            env(pay(A1, A2, G1["USD"](1)));
+            env(pay(a1, a2, g1["USD"](1)));
         }
 
         {
             // Account with GlobalFreeze
             //  set GlobalFreeze first
             //    test: SetFlag GlobalFreeze will toggle back to freeze
-            env.require(nflags(G1, asfGlobalFreeze));
-            env(fset(G1, asfGlobalFreeze));
-            env.require(flags(G1, asfGlobalFreeze));
-            env.require(nflags(G1, asfNoFreeze));
+            env.require(Nflags(g1, asfGlobalFreeze));
+            env(fset(g1, asfGlobalFreeze));
+            env.require(Flags(g1, asfGlobalFreeze));
+            env.require(Nflags(g1, asfNoFreeze));
 
             //    test: assets can't be bought on the market
-            env(offer(A3, G1["BTC"](1), XRP(1)), ter(tecFROZEN));
+            env(offer(a3, g1["BTC"](1), XRP(1)), Ter(tecFROZEN));
 
             //    test: assets can't be sold on the market
-            env(offer(A4, XRP(1), G1["BTC"](1)), ter(tecFROZEN));
+            env(offer(a4, XRP(1), g1["BTC"](1)), Ter(tecFROZEN));
         }
 
         {
             // offers are filtered (seems to be broken?)
             //    test: account_offers always shows own offers
-            auto offers = getAccountOffers(env, G1)[jss::offers];
+            auto offers = getAccountOffers(env, g1)[jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 2u)))
                 return;
 
             //    test: book_offers shows offers
             //    (should these actually be filtered?)
             offers = env.rpc(
-                "book_offers", "XRP", std::string("USD/") + G1.human())[jss::result][jss::offers];
+                "book_offers", "XRP", std::string("USD/") + g1.human())[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 2u)))
                 return;
 
             offers = env.rpc(
-                "book_offers", std::string("USD/") + G1.human(), "XRP")[jss::result][jss::offers];
+                "book_offers", std::string("USD/") + g1.human(), "XRP")[jss::result][jss::offers];
             if (!BEAST_EXPECT(checkArraySize(offers, 2u)))
                 return;
         }
@@ -505,13 +505,13 @@ class Freeze_test : public beast::unit_test::suite
         {
             // Payments
             //    test: direct issues can be sent
-            env(pay(G1, A2, G1["USD"](1)));
+            env(pay(g1, a2, g1["USD"](1)));
 
             //    test: direct redemptions can be sent
-            env(pay(A2, G1, G1["USD"](1)));
+            env(pay(a2, g1, g1["USD"](1)));
 
             //    test: via rippling cant be sent
-            env(pay(A2, A1, G1["USD"](1)), ter(tecPATH_DRY));
+            env(pay(a2, a1, g1["USD"](1)), Ter(tecPATH_DRY));
         }
     }
 
@@ -523,29 +523,29 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
         Account const frozenAcc{"A2"};
         Account const deepFrozenAcc{"A3"};
 
-        env.fund(XRP(12000), G1);
-        env.fund(XRP(1000), A1);
+        env.fund(XRP(12000), g1);
+        env.fund(XRP(1000), a1);
         env.fund(XRP(1000), frozenAcc);
         env.fund(XRP(1000), deepFrozenAcc);
         env.close();
 
-        env.trust(G1["USD"](1000), A1);
-        env.trust(G1["USD"](1000), frozenAcc);
-        env.trust(G1["USD"](1000), deepFrozenAcc);
+        env.trust(g1["USD"](1000), a1);
+        env.trust(g1["USD"](1000), frozenAcc);
+        env.trust(g1["USD"](1000), deepFrozenAcc);
         env.close();
 
-        env(pay(G1, A1, G1["USD"](1000)));
-        env(pay(G1, frozenAcc, G1["USD"](1000)));
-        env(pay(G1, deepFrozenAcc, G1["USD"](1000)));
+        env(pay(g1, a1, g1["USD"](1000)));
+        env(pay(g1, frozenAcc, g1["USD"](1000)));
+        env(pay(g1, deepFrozenAcc, g1["USD"](1000)));
 
         // Freezing and deep freezing some of the trust lines to check deep
         // freeze and clearing of freeze separately
-        env(trust(G1, frozenAcc["USD"](0), tfSetFreeze));
+        env(trust(g1, frozenAcc["USD"](0), tfSetFreeze));
         {
             auto const flags = getTrustlineFlags(env, 2u, 1u);
             BEAST_EXPECT(flags & lsfLowFreeze);
@@ -553,7 +553,7 @@ class Freeze_test : public beast::unit_test::suite
         }
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, deepFrozenAcc["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, deepFrozenAcc["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(!(flags & (lsfLowFreeze | lsfLowDeepFreeze)));
@@ -565,41 +565,41 @@ class Freeze_test : public beast::unit_test::suite
 
         // TrustSet NoFreeze
         //    test: should set NoFreeze in Flags
-        env.require(nflags(G1, asfNoFreeze));
-        env(fset(G1, asfNoFreeze));
-        env.require(flags(G1, asfNoFreeze));
-        env.require(nflags(G1, asfGlobalFreeze));
+        env.require(Nflags(g1, asfNoFreeze));
+        env(fset(g1, asfNoFreeze));
+        env.require(Flags(g1, asfNoFreeze));
+        env.require(Nflags(g1, asfGlobalFreeze));
 
         //    test: cannot be cleared
-        env(fclear(G1, asfNoFreeze));
-        env.require(flags(G1, asfNoFreeze));
-        env.require(nflags(G1, asfGlobalFreeze));
+        env(fclear(g1, asfNoFreeze));
+        env.require(Flags(g1, asfNoFreeze));
+        env.require(Nflags(g1, asfGlobalFreeze));
 
         //    test: can set GlobalFreeze
-        env(fset(G1, asfGlobalFreeze));
-        env.require(flags(G1, asfNoFreeze));
-        env.require(flags(G1, asfGlobalFreeze));
+        env(fset(g1, asfGlobalFreeze));
+        env.require(Flags(g1, asfNoFreeze));
+        env.require(Flags(g1, asfGlobalFreeze));
 
         //    test: cannot unset GlobalFreeze
-        env(fclear(G1, asfGlobalFreeze));
-        env.require(flags(G1, asfNoFreeze));
-        env.require(flags(G1, asfGlobalFreeze));
+        env(fclear(g1, asfGlobalFreeze));
+        env.require(Flags(g1, asfNoFreeze));
+        env.require(Flags(g1, asfGlobalFreeze));
 
         //    test: trustlines can't be frozen when no freeze enacted
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze), ter(tecNO_PERMISSION));
+            env(trust(g1, a1["USD"](0), tfSetFreeze), Ter(tecNO_PERMISSION));
 
             // test: cannot deep freeze already frozen line when no freeze
             // enacted
-            env(trust(G1, frozenAcc["USD"](0), tfSetDeepFreeze), ter(tecNO_PERMISSION));
+            env(trust(g1, frozenAcc["USD"](0), tfSetDeepFreeze), Ter(tecNO_PERMISSION));
         }
         else
         {
             //  test: previous functionality, checking there's no changes to a
             //  trust line
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
-            auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
+            auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             if (!BEAST_EXPECT(checkArraySize(affected, 1u)))
                 return;
 
@@ -608,7 +608,7 @@ class Freeze_test : public beast::unit_test::suite
         }
 
         //  test: can clear freeze on account
-        env(trust(G1, frozenAcc["USD"](0), tfClearFreeze));
+        env(trust(g1, frozenAcc["USD"](0), tfClearFreeze));
         {
             auto const flags = getTrustlineFlags(env, 2u, 1u);
             BEAST_EXPECT(!(flags & lsfLowFreeze));
@@ -617,7 +617,7 @@ class Freeze_test : public beast::unit_test::suite
         if (features[featureDeepFreeze])
         {
             //  test: can clear deep freeze on account
-            env(trust(G1, deepFrozenAcc["USD"](0), tfClearDeepFreeze));
+            env(trust(g1, deepFrozenAcc["USD"](0), tfClearDeepFreeze));
             {
                 auto const flags = getTrustlineFlags(env, 2u, 1u);
                 BEAST_EXPECT(flags & lsfHighFreeze);
@@ -634,91 +634,91 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
+        Account const g1{"G1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
 
-        env.fund(XRP(1000), G1, A3, A4);
-        env.fund(XRP(2000), A2);
+        env.fund(XRP(1000), g1, a3, a4);
+        env.fund(XRP(2000), a2);
         env.close();
 
-        env.trust(G1["USD"](1000), A2);
-        env.trust(G1["USD"](2000), A3);
-        env.trust(G1["USD"](2000), A4);
+        env.trust(g1["USD"](1000), a2);
+        env.trust(g1["USD"](2000), a3);
+        env.trust(g1["USD"](2000), a4);
         env.close();
 
-        env(pay(G1, A3, G1["USD"](2000)));
-        env(pay(G1, A4, G1["USD"](2000)));
+        env(pay(g1, a3, g1["USD"](2000)));
+        env(pay(g1, a4, g1["USD"](2000)));
         env.close();
 
-        env(offer(A3, XRP(1000), G1["USD"](1000)), txflags(tfPassive));
+        env(offer(a3, XRP(1000), g1["USD"](1000)), Txflags(tfPassive));
         env.close();
 
         // removal after successful payment
         //    test: make a payment with partially consuming offer
-        env(pay(A2, G1, G1["USD"](1)), paths(G1["USD"]), sendmax(XRP(1)));
+        env(pay(a2, g1, g1["USD"](1)), Paths(g1["USD"]), Sendmax(XRP(1)));
         env.close();
 
         //    test: offer was only partially consumed
-        auto offers = getAccountOffers(env, A3)[jss::offers];
+        auto offers = getAccountOffers(env, a3)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
             return;
         BEAST_EXPECT(
-            offers[0u][jss::taker_gets] == G1["USD"](999).value().getJson(JsonOptions::none));
+            offers[0u][jss::taker_gets] == g1["USD"](999).value().getJson(JsonOptions::KNone));
 
         //    test: someone else creates an offer providing liquidity
-        env(offer(A4, XRP(999), G1["USD"](999)));
+        env(offer(a4, XRP(999), g1["USD"](999)));
         env.close();
 
         //    test: owner of partially consumed offers line is frozen
-        env(trust(G1, A3["USD"](0), tfSetFreeze));
-        auto affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+        env(trust(g1, a3["USD"](0), tfSetFreeze));
+        auto affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
         if (!BEAST_EXPECT(checkArraySize(affected, 2u)))
             return;
         auto ff = affected[1u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
-        BEAST_EXPECT(ff[sfHighLimit.fieldName] == G1["USD"](0).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(ff[sfHighLimit.fieldName] == g1["USD"](0).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfLowFreeze));
         BEAST_EXPECT(ff[jss::Flags].asUInt() & lsfHighFreeze);
         env.close();
 
         // verify offer on the books
-        offers = getAccountOffers(env, A3)[jss::offers];
+        offers = getAccountOffers(env, a3)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 1u)))
             return;
 
         //    test: Can make a payment via the new offer
-        env(pay(A2, G1, G1["USD"](1)), paths(G1["USD"]), sendmax(XRP(1)));
+        env(pay(a2, g1, g1["USD"](1)), Paths(g1["USD"]), Sendmax(XRP(1)));
         env.close();
 
         //    test: Partially consumed offer was removed by tes* payment
-        offers = getAccountOffers(env, A3)[jss::offers];
+        offers = getAccountOffers(env, a3)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 0u)))
             return;
 
         // removal buy successful OfferCreate
         //    test: freeze the new offer
-        env(trust(G1, A4["USD"](0), tfSetFreeze));
-        affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+        env(trust(g1, a4["USD"](0), tfSetFreeze));
+        affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
         if (!BEAST_EXPECT(checkArraySize(affected, 2u)))
             return;
         ff = affected[0u][sfModifiedNode.fieldName][sfFinalFields.fieldName];
-        BEAST_EXPECT(ff[sfLowLimit.fieldName] == G1["USD"](0).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(ff[sfLowLimit.fieldName] == g1["USD"](0).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(ff[jss::Flags].asUInt() & lsfLowFreeze);
         BEAST_EXPECT(!(ff[jss::Flags].asUInt() & lsfHighFreeze));
         env.close();
 
         //    test: can no longer create a crossing offer
-        env(offer(A2, G1["USD"](999), XRP(999)));
-        affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+        env(offer(a2, g1["USD"](999), XRP(999)));
+        affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
         if (!BEAST_EXPECT(checkArraySize(affected, 8u)))
             return;
         auto created = affected[0u][sfCreatedNode.fieldName];
-        BEAST_EXPECT(created[sfNewFields.fieldName][jss::Account] == A2.human());
+        BEAST_EXPECT(created[sfNewFields.fieldName][jss::Account] == a2.human());
         env.close();
 
         //    test: offer was removed by offer_create
-        offers = getAccountOffers(env, A4)[jss::offers];
+        offers = getAccountOffers(env, a4)[jss::offers];
         if (!BEAST_EXPECT(checkArraySize(offers, 0u)))
             return;
     }
@@ -731,74 +731,74 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2, A3);
+        env.fund(XRP(10000), g1, a1, a2, a3);
         env.close();
 
-        auto const limit = USD(10000);
-        env.trust(limit, A1, A2, A3);
+        auto const limit = usd(10000);
+        env.trust(limit, a1, a2, a3);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
         // Making large passive sell offer
         // Wants to sell 50 USD for 100 XRP
-        env(offer(A2, XRP(100), USD(50)), txflags(tfPassive));
+        env(offer(a2, XRP(100), usd(50)), Txflags(tfPassive));
         env.close();
         // Making large passive buy offer
         // Wants to buy 100 USD for 100 XRP
-        env(offer(A3, USD(100), XRP(100)), txflags(tfPassive));
+        env(offer(a3, usd(100), XRP(100)), Txflags(tfPassive));
         env.close();
-        env.require(offers(A2, 1), offers(A3, 1));
+        env.require(offers(a2, 1), offers(a3, 1));
 
         // Checking A1 can buy from A2 by crossing it's offer
-        env(offer(A1, USD(1), XRP(2)), txflags(tfFillOrKill));
+        env(offer(a1, usd(1), XRP(2)), Txflags(tfFillOrKill));
         env.close();
-        env.require(balance(A1, USD(1001)), balance(A2, USD(999)));
+        env.require(Balance(a1, usd(1001)), Balance(a2, usd(999)));
 
         // Checking A1 can sell to A3 by crossing it's offer
-        env(offer(A1, XRP(1), USD(1)), txflags(tfFillOrKill));
+        env(offer(a1, XRP(1), usd(1)), Txflags(tfFillOrKill));
         env.close();
-        env.require(balance(A1, USD(1000)), balance(A3, USD(1)));
+        env.require(Balance(a1, usd(1000)), Balance(a3, usd(1)));
 
         // Testing aggressive and passive offer placing, trustline frozen by
         // the issuer
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             // test: can still make passive buy offer
-            env(offer(A1, USD(1), XRP(0.5)), txflags(tfPassive));
+            env(offer(a1, usd(1), XRP(0.5)), Txflags(tfPassive));
             env.close();
-            env.require(balance(A1, USD(1000)), offers(A1, 1));
+            env.require(Balance(a1, usd(1000)), offers(a1, 1));
             // Cleanup
-            env(offer_cancel(A1, env.seq(A1) - 1));
-            env.require(offers(A1, 0));
+            env(offerCancel(a1, env.seq(a1) - 1));
+            env.require(offers(a1, 0));
             env.close();
 
             // test: can still buy from A2
-            env(offer(A1, USD(1), XRP(2)), txflags(tfFillOrKill));
+            env(offer(a1, usd(1), XRP(2)), Txflags(tfFillOrKill));
             env.close();
-            env.require(balance(A1, USD(1001)), balance(A2, USD(998)), offers(A1, 0));
+            env.require(Balance(a1, usd(1001)), Balance(a2, usd(998)), offers(a1, 0));
 
             // test: cannot create passive sell offer
-            env(offer(A1, XRP(2), USD(1)), txflags(tfPassive), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(2), usd(1)), Txflags(tfPassive), Ter(tecUNFUNDED_OFFER));
             env.close();
-            env.require(balance(A1, USD(1001)), offers(A1, 0));
+            env.require(Balance(a1, usd(1001)), offers(a1, 0));
 
             // test: cannot sell to A3
-            env(offer(A1, XRP(1), USD(1)), txflags(tfFillOrKill), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(1), usd(1)), Txflags(tfFillOrKill), Ter(tecUNFUNDED_OFFER));
             env.close();
-            env.require(balance(A1, USD(1001)), offers(A1, 0));
+            env.require(Balance(a1, usd(1001)), offers(a1, 0));
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze));
             env.close();
         }
 
@@ -806,55 +806,55 @@ class Freeze_test : public beast::unit_test::suite
         // by the issuer
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: cannot create passive buy offer
-            env(offer(A1, USD(1), XRP(0.5)), txflags(tfPassive), ter(tecFROZEN));
+            env(offer(a1, usd(1), XRP(0.5)), Txflags(tfPassive), Ter(tecFROZEN));
             env.close();
 
             // test: cannot buy from A2
-            env(offer(A1, USD(1), XRP(2)), txflags(tfFillOrKill), ter(tecFROZEN));
+            env(offer(a1, usd(1), XRP(2)), Txflags(tfFillOrKill), Ter(tecFROZEN));
             env.close();
 
             // test: cannot create passive sell offer
-            env(offer(A1, XRP(2), USD(1)), txflags(tfPassive), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(2), usd(1)), Txflags(tfPassive), Ter(tecUNFUNDED_OFFER));
             env.close();
 
             // test: cannot sell to A3
-            env(offer(A1, XRP(1), USD(1)), txflags(tfFillOrKill), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(1), usd(1)), Txflags(tfFillOrKill), Ter(tecUNFUNDED_OFFER));
             env.close();
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
-            env.require(balance(A1, USD(1001)), offers(A1, 0));
+            env.require(Balance(a1, usd(1001)), offers(a1, 0));
         }
 
         // Testing already existing offers behavior after trustline is frozen by
         // the issuer
         {
-            env.require(balance(A1, USD(1001)));
-            env(offer(A1, XRP(1.9), USD(1)));
-            env(offer(A1, USD(1), XRP(1.1)));
+            env.require(Balance(a1, usd(1001)));
+            env(offer(a1, XRP(1.9), usd(1)));
+            env(offer(a1, usd(1), XRP(1.1)));
             env.close();
-            env.require(balance(A1, USD(1001)), offers(A1, 2));
+            env.require(Balance(a1, usd(1001)), offers(a1, 2));
 
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             // test: A2 wants to sell to A1, must succeed
-            env.require(balance(A1, USD(1001)), balance(A2, USD(998)));
-            env(offer(A2, XRP(1.1), USD(1)), txflags(tfFillOrKill));
+            env.require(Balance(a1, usd(1001)), Balance(a2, usd(998)));
+            env(offer(a2, XRP(1.1), usd(1)), Txflags(tfFillOrKill));
             env.close();
-            env.require(balance(A1, USD(1002)), balance(A2, USD(997)), offers(A1, 1));
+            env.require(Balance(a1, usd(1002)), Balance(a2, usd(997)), offers(a1, 1));
 
             // test: A3 wants to buy from A1, must fail
-            env.require(balance(A1, USD(1002)), balance(A3, USD(1)), offers(A1, 1));
-            env(offer(A3, USD(1), XRP(1.9)), txflags(tfFillOrKill), ter(tecKILLED));
+            env.require(Balance(a1, usd(1002)), Balance(a3, usd(1)), offers(a1, 1));
+            env(offer(a3, usd(1), XRP(1.9)), Txflags(tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(A1, USD(1002)), balance(A3, USD(1)), offers(A1, 0));
+            env.require(Balance(a1, usd(1002)), Balance(a3, usd(1)), offers(a1, 0));
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze));
             env.close();
         }
 
@@ -862,66 +862,66 @@ class Freeze_test : public beast::unit_test::suite
         // the issuer
         if (features[featureDeepFreeze])
         {
-            env.require(balance(A1, USD(1002)));
-            env(offer(A1, XRP(1.9), USD(1)));
-            env(offer(A1, USD(1), XRP(1.1)));
+            env.require(Balance(a1, usd(1002)));
+            env(offer(a1, XRP(1.9), usd(1)));
+            env(offer(a1, usd(1), XRP(1.1)));
             env.close();
-            env.require(balance(A1, USD(1002)), offers(A1, 2));
+            env.require(Balance(a1, usd(1002)), offers(a1, 2));
 
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A2 wants to sell to A1, must fail
-            env.require(balance(A1, USD(1002)), balance(A2, USD(997)));
-            env(offer(A2, XRP(1.1), USD(1)), txflags(tfFillOrKill), ter(tecKILLED));
+            env.require(Balance(a1, usd(1002)), Balance(a2, usd(997)));
+            env(offer(a2, XRP(1.1), usd(1)), Txflags(tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(A1, USD(1002)), balance(A2, USD(997)), offers(A1, 1));
+            env.require(Balance(a1, usd(1002)), Balance(a2, usd(997)), offers(a1, 1));
 
             // test: A3 wants to buy from A1, must fail
-            env.require(balance(A1, USD(1002)), balance(A3, USD(1)), offers(A1, 1));
-            env(offer(A3, USD(1), XRP(1.9)), txflags(tfFillOrKill), ter(tecKILLED));
+            env.require(Balance(a1, usd(1002)), Balance(a3, usd(1)), offers(a1, 1));
+            env(offer(a3, usd(1), XRP(1.9)), Txflags(tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(A1, USD(1002)), balance(A3, USD(1)), offers(A1, 0));
+            env.require(Balance(a1, usd(1002)), Balance(a3, usd(1)), offers(a1, 0));
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing aggressive and passive offer placing, trustline frozen by
         // the holder
         {
-            env(trust(A1, limit, tfSetFreeze));
+            env(trust(a1, limit, tfSetFreeze));
             env.close();
 
             // test: A1 can make passive buy offer
-            env(offer(A1, USD(1), XRP(0.5)), txflags(tfPassive));
+            env(offer(a1, usd(1), XRP(0.5)), Txflags(tfPassive));
             env.close();
-            env.require(balance(A1, USD(1002)), offers(A1, 1));
+            env.require(Balance(a1, usd(1002)), offers(a1, 1));
             //  Cleanup
-            env(offer_cancel(A1, env.seq(A1) - 1));
-            env.require(offers(A1, 0));
+            env(offerCancel(a1, env.seq(a1) - 1));
+            env.require(offers(a1, 0));
             env.close();
 
             // test: A1 wants to buy, must fail
-            env(offer(A1, USD(1), XRP(2)), txflags(tfFillOrKill), ter(tecKILLED));
+            env(offer(a1, usd(1), XRP(2)), Txflags(tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(A1, USD(1002)), balance(A2, USD(997)), offers(A1, 0));
+            env.require(Balance(a1, usd(1002)), Balance(a2, usd(997)), offers(a1, 0));
 
             // test: A1 can create passive sell offer
-            env(offer(A1, XRP(2), USD(1)), txflags(tfPassive));
+            env(offer(a1, XRP(2), usd(1)), Txflags(tfPassive));
             env.close();
-            env.require(balance(A1, USD(1002)), offers(A1, 1));
+            env.require(Balance(a1, usd(1002)), offers(a1, 1));
             // Cleanup
-            env(offer_cancel(A1, env.seq(A1) - 1));
-            env.require(offers(A1, 0));
+            env(offerCancel(a1, env.seq(a1) - 1));
+            env.require(offers(a1, 0));
             env.close();
 
             // test: A1 can sell to A3
-            env(offer(A1, XRP(1), USD(1)), txflags(tfFillOrKill));
+            env(offer(a1, XRP(1), usd(1)), Txflags(tfFillOrKill));
             env.close();
-            env.require(balance(A1, USD(1001)), offers(A1, 0));
+            env.require(Balance(a1, usd(1001)), offers(a1, 0));
 
-            env(trust(A1, limit, tfClearFreeze));
+            env(trust(a1, limit, tfClearFreeze));
             env.close();
         }
 
@@ -929,26 +929,26 @@ class Freeze_test : public beast::unit_test::suite
         // by the holder
         if (features[featureDeepFreeze])
         {
-            env(trust(A1, limit, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(a1, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A1 cannot create passive buy offer
-            env(offer(A1, USD(1), XRP(0.5)), txflags(tfPassive), ter(tecFROZEN));
+            env(offer(a1, usd(1), XRP(0.5)), Txflags(tfPassive), Ter(tecFROZEN));
             env.close();
 
             // test: A1 cannot buy, must fail
-            env(offer(A1, USD(1), XRP(2)), txflags(tfFillOrKill), ter(tecFROZEN));
+            env(offer(a1, usd(1), XRP(2)), Txflags(tfFillOrKill), Ter(tecFROZEN));
             env.close();
 
             // test: A1 cannot create passive sell offer
-            env(offer(A1, XRP(2), USD(1)), txflags(tfPassive), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(2), usd(1)), Txflags(tfPassive), Ter(tecUNFUNDED_OFFER));
             env.close();
 
             // test: A1 cannot sell to A3
-            env(offer(A1, XRP(1), USD(1)), txflags(tfFillOrKill), ter(tecUNFUNDED_OFFER));
+            env(offer(a1, XRP(1), usd(1)), Txflags(tfFillOrKill), Ter(tecUNFUNDED_OFFER));
             env.close();
 
-            env(trust(A1, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a1, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
     }
@@ -958,94 +958,93 @@ class Freeze_test : public beast::unit_test::suite
     {
         testcase("Longer paths payment on frozen trust lines");
         using namespace test::jtx;
-        using path = test::jtx::path;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
+        env.fund(XRP(10000), g1, a1, a2);
         env.close();
 
-        auto const limit = USD(10000);
-        env.trust(limit, A1, A2);
+        auto const limit = usd(10000);
+        env.trust(limit, a1, a2);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
-        env(offer(A2, XRP(100), USD(100)), txflags(tfPassive));
+        env(offer(a2, XRP(100), usd(100)), Txflags(tfPassive));
         env.close();
 
         // Testing payments A1 <-> G1 using offer from A2 frozen by issuer.
         {
-            env(trust(G1, A2["USD"](0), tfSetFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze));
             env.close();
 
             // test: A1 cannot send USD using XRP through A2 offer
-            env(pay(A1, G1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(a1, g1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // test: G1 cannot send USD using XRP through A2 offer
-            env(pay(G1, A1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(g1, a1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze));
             env.close();
         }
 
         // Testing payments A1 <-> G1 using offer from A2 deep frozen by issuer.
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A1 cannot send USD using XRP through A2 offer
-            env(pay(A1, G1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(a1, g1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // test: G1 cannot send USD using XRP through A2 offer
-            env(pay(G1, A1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(g1, a1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing payments A1 <-> G1 using offer from A2 frozen by currency
         // holder.
         {
-            env(trust(A2, limit, tfSetFreeze));
+            env(trust(a2, limit, tfSetFreeze));
             env.close();
 
             // test: A1 can send USD using XRP through A2 offer
-            env(pay(A1, G1, USD(10)), path(~USD), sendmax(XRP(11)), txflags(tfNoRippleDirect));
+            env(pay(a1, g1, usd(10)), Path(~usd), Sendmax(XRP(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: G1 can send USD using XRP through A2 offer
-            env(pay(G1, A1, USD(10)), path(~USD), sendmax(XRP(11)), txflags(tfNoRippleDirect));
+            env(pay(g1, a1, usd(10)), Path(~usd), Sendmax(XRP(11)), Txflags(tfNoRippleDirect));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze));
+            env(trust(a2, limit, tfClearFreeze));
             env.close();
         }
 
@@ -1053,51 +1052,51 @@ class Freeze_test : public beast::unit_test::suite
         // currency holder.
         if (features[featureDeepFreeze])
         {
-            env(trust(A2, limit, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(a2, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A1 cannot send USD using XRP through A2 offer
-            env(pay(A1, G1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(a1, g1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // test: G1 cannot send USD using XRP through A2 offer
-            env(pay(G1, A1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(g1, a1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a2, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Cleanup
-        env(offer_cancel(A1, env.seq(A1) - 1));
-        env.require(offers(A1, 0));
+        env(offerCancel(a1, env.seq(a1) - 1));
+        env.require(offers(a1, 0));
         env.close();
 
-        env(offer(A2, USD(100), XRP(100)), txflags(tfPassive));
+        env(offer(a2, usd(100), XRP(100)), Txflags(tfPassive));
         env.close();
 
         // Testing payments A1 <-> G1 using offer from A2 frozen by issuer.
         {
-            env(trust(G1, A2["USD"](0), tfSetFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze));
             env.close();
 
             // test: A1 can send XRP using USD through A2 offer
-            env(pay(A1, G1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(a1, g1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: G1 can send XRP using USD through A2 offer
-            env(pay(G1, A1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(g1, a1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze));
             env.close();
         }
 
@@ -1105,44 +1104,44 @@ class Freeze_test : public beast::unit_test::suite
         // issuer.
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A1 cannot send XRP using USD through A2 offer
-            env(pay(A1, G1, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(a1, g1, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // test: G1 cannot send XRP using USD through A2 offer
-            env(pay(G1, A1, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(g1, a1, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing payments A1 <-> G1 using offer from A2 frozen by currency
         // holder.
         {
-            env(trust(A2, limit, tfSetFreeze));
+            env(trust(a2, limit, tfSetFreeze));
             env.close();
 
             // test: A1 can send XRP using USD through A2 offer
-            env(pay(A1, G1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(a1, g1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: G1 can send XRP using USD through A2 offer
-            env(pay(G1, A1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(g1, a1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze));
+            env(trust(a2, limit, tfClearFreeze));
             env.close();
         }
 
@@ -1150,32 +1149,32 @@ class Freeze_test : public beast::unit_test::suite
         // currency holder.
         if (features[featureDeepFreeze])
         {
-            env(trust(A2, limit, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(a2, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A1 cannot send XRP using USD through A2 offer
-            env(pay(A1, G1, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(a1, g1, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // test: G1 cannot send XRP using USD through A2 offer
-            env(pay(G1, A1, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_PARTIAL));
+            env(pay(g1, a1, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a2, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Cleanup
-        env(offer_cancel(A1, env.seq(A1) - 1));
-        env.require(offers(A1, 0));
+        env(offerCancel(a1, env.seq(a1) - 1));
+        env.require(offers(a1, 0));
         env.close();
     }
 
@@ -1187,117 +1186,117 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
+        env.fund(XRP(10000), g1, a1, a2);
         env.close();
 
-        auto const limit = USD(10000);
-        env.trust(limit, A1, A2);
+        auto const limit = usd(10000);
+        env.trust(limit, a1, a2);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
         // Checking payments before freeze
         // To issuer:
-        env(pay(A1, G1, USD(1)));
-        env(pay(A2, G1, USD(1)));
+        env(pay(a1, g1, usd(1)));
+        env(pay(a2, g1, usd(1)));
         env.close();
 
         // To each other:
-        env(pay(A1, A2, USD(1)));
-        env(pay(A2, A1, USD(1)));
+        env(pay(a1, a2, usd(1)));
+        env(pay(a2, a1, usd(1)));
         env.close();
 
         // Freeze A1
-        env(trust(G1, A1["USD"](0), tfSetFreeze));
+        env(trust(g1, a1["USD"](0), tfSetFreeze));
         env.close();
 
         // Issuer and A1 can send payments to each other
-        env(pay(A1, G1, USD(1)));
-        env(pay(G1, A1, USD(1)));
+        env(pay(a1, g1, usd(1)));
+        env(pay(g1, a1, usd(1)));
         env.close();
 
         // A1 cannot send tokens to A2
-        env(pay(A1, A2, USD(1)), ter(tecPATH_DRY));
+        env(pay(a1, a2, usd(1)), Ter(tecPATH_DRY));
 
         // A2 can still send to A1
-        env(pay(A2, A1, USD(1)));
+        env(pay(a2, a1, usd(1)));
         env.close();
 
         if (features[featureDeepFreeze])
         {
             // Deep freeze A1
-            env(trust(G1, A1["USD"](0), tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetDeepFreeze));
             env.close();
 
             // Issuer and A1 can send payments to each other
-            env(pay(A1, G1, USD(1)));
-            env(pay(G1, A1, USD(1)));
+            env(pay(a1, g1, usd(1)));
+            env(pay(g1, a1, usd(1)));
             env.close();
 
             // A1 cannot send tokens to A2
-            env(pay(A1, A2, USD(1)), ter(tecPATH_DRY));
+            env(pay(a1, a2, usd(1)), Ter(tecPATH_DRY));
 
             // A2 cannot send tokens to A1
-            env(pay(A2, A1, USD(1)), ter(tecPATH_DRY));
+            env(pay(a2, a1, usd(1)), Ter(tecPATH_DRY));
 
             // Clear deep freeze on A1
-            env(trust(G1, A1["USD"](0), tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearDeepFreeze));
             env.close();
         }
 
         // Clear freeze on A1
-        env(trust(G1, A1["USD"](0), tfClearFreeze));
+        env(trust(g1, a1["USD"](0), tfClearFreeze));
         env.close();
 
         // A1 freezes trust line
-        env(trust(A1, limit, tfSetFreeze));
+        env(trust(a1, limit, tfSetFreeze));
         env.close();
 
         // Issuer and A2 must not be affected
-        env(pay(A2, G1, USD(1)));
-        env(pay(G1, A2, USD(1)));
+        env(pay(a2, g1, usd(1)));
+        env(pay(g1, a2, usd(1)));
         env.close();
 
         // A1 can send tokens to the issuer
-        env(pay(A1, G1, USD(1)));
+        env(pay(a1, g1, usd(1)));
         env.close();
         // A1 can send tokens to A2
-        env(pay(A1, A2, USD(1)));
+        env(pay(a1, a2, usd(1)));
         env.close();
 
         // Issuer can sent tokens to A1
-        env(pay(G1, A1, USD(1)));
+        env(pay(g1, a1, usd(1)));
         // A2 cannot send tokens to A1
-        env(pay(A2, A1, USD(1)), ter(tecPATH_DRY));
+        env(pay(a2, a1, usd(1)), Ter(tecPATH_DRY));
 
         if (features[featureDeepFreeze])
         {
             // A1 deep freezes trust line
-            env(trust(A1, limit, tfSetDeepFreeze));
+            env(trust(a1, limit, tfSetDeepFreeze));
             env.close();
 
             // Issuer and A2 must not be affected
-            env(pay(A2, G1, USD(1)));
-            env(pay(G1, A2, USD(1)));
+            env(pay(a2, g1, usd(1)));
+            env(pay(g1, a2, usd(1)));
             env.close();
 
             // A1 can still send token to issuer
-            env(pay(A1, G1, USD(1)));
+            env(pay(a1, g1, usd(1)));
             env.close();
 
             // Issuer can send tokens to A1
-            env(pay(G1, A1, USD(1)));
+            env(pay(g1, a1, usd(1)));
             // A2 cannot send tokens to A1
-            env(pay(A2, A1, USD(1)), ter(tecPATH_DRY));
+            env(pay(a2, a1, usd(1)), Ter(tecPATH_DRY));
             // A1 cannot send tokens to A2
-            env(pay(A1, A2, USD(1)), ter(tecPATH_DRY));
+            env(pay(a1, a2, usd(1)), Ter(tecPATH_DRY));
         }
     }
 
@@ -1309,137 +1308,137 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this, features);
 
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
+        env.fund(XRP(10000), g1, a1, a2);
         env.close();
 
-        auto const limit = USD(10000);
-        env.trust(limit, A1, A2);
+        auto const limit = usd(10000);
+        env.trust(limit, a1, a2);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
         // Confirming we can write and cash checks
         {
-            uint256 const checkId{getCheckIndex(G1, env.seq(G1))};
-            env(check::create(G1, A1, USD(10)));
+            uint256 const checkId{getCheckIndex(g1, env.seq(g1))};
+            env(check::create(g1, a1, usd(10)));
             env.close();
-            env(check::cash(A1, checkId, USD(10)));
+            env(check::cash(a1, checkId, usd(10)));
             env.close();
         }
 
         {
-            uint256 const checkId{getCheckIndex(G1, env.seq(G1))};
-            env(check::create(G1, A2, USD(10)));
+            uint256 const checkId{getCheckIndex(g1, env.seq(g1))};
+            env(check::create(g1, a2, usd(10)));
             env.close();
-            env(check::cash(A2, checkId, USD(10)));
+            env(check::cash(a2, checkId, usd(10)));
             env.close();
         }
 
         {
-            uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, G1, USD(10)));
+            uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, g1, usd(10)));
             env.close();
-            env(check::cash(G1, checkId, USD(10)));
+            env(check::cash(g1, checkId, usd(10)));
             env.close();
         }
 
         {
-            uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, A2, USD(10)));
+            uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, a2, usd(10)));
             env.close();
-            env(check::cash(A2, checkId, USD(10)));
+            env(check::cash(a2, checkId, usd(10)));
             env.close();
         }
 
         {
-            uint256 const checkId{getCheckIndex(A2, env.seq(A2))};
-            env(check::create(A2, G1, USD(10)));
+            uint256 const checkId{getCheckIndex(a2, env.seq(a2))};
+            env(check::create(a2, g1, usd(10)));
             env.close();
-            env(check::cash(G1, checkId, USD(10)));
+            env(check::cash(g1, checkId, usd(10)));
             env.close();
         }
 
         {
-            uint256 const checkId{getCheckIndex(A2, env.seq(A2))};
-            env(check::create(A2, A1, USD(10)));
+            uint256 const checkId{getCheckIndex(a2, env.seq(a2))};
+            env(check::create(a2, a1, usd(10)));
             env.close();
-            env(check::cash(A1, checkId, USD(10)));
+            env(check::cash(a1, checkId, usd(10)));
             env.close();
         }
 
         // Testing creation and cashing of checks on a trustline frozen by
         // issuer
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             // test: issuer writes check to A1.
             {
-                uint256 const checkId{getCheckIndex(G1, env.seq(G1))};
-                env(check::create(G1, A1, USD(10)));
+                uint256 const checkId{getCheckIndex(g1, env.seq(g1))};
+                env(check::create(g1, a1, usd(10)));
                 env.close();
-                env(check::cash(A1, checkId, USD(10)), ter(tecFROZEN));
+                env(check::cash(a1, checkId, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A2 writes check to A1.
             {
-                uint256 const checkId{getCheckIndex(A2, env.seq(A2))};
-                env(check::create(A2, A1, USD(10)));
+                uint256 const checkId{getCheckIndex(a2, env.seq(a2))};
+                env(check::create(a2, a1, usd(10)));
                 env.close();
                 // Same as previous test
-                env(check::cash(A1, checkId, USD(10)), ter(tecFROZEN));
+                env(check::cash(a1, checkId, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to issuer
             {
-                env(check::create(A1, G1, USD(10)), ter(tecFROZEN));
+                env(check::create(a1, g1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to A2
             {
                 // Same as previous test
-                env(check::create(A1, A2, USD(10)), ter(tecFROZEN));
+                env(check::create(a1, a2, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // Unfreeze the trustline to create a couple of checks so that we
             // could try to cash them later when the trustline is frozen again.
-            env(trust(G1, A1["USD"](0), tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze));
             env.close();
 
-            uint256 const checkId1{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, G1, USD(10)));
+            uint256 const checkId1{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, g1, usd(10)));
             env.close();
-            uint256 const checkId2{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, A2, USD(10)));
+            uint256 const checkId2{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, a2, usd(10)));
             env.close();
 
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             // test: issuer tries to cash the check from A1
             {
-                env(check::cash(G1, checkId1, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(g1, checkId1, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
             // test: A2 tries to cash the check from A1
             {
-                env(check::cash(A2, checkId2, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(a2, checkId2, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze));
             env.close();
         }
 
@@ -1447,110 +1446,110 @@ class Freeze_test : public beast::unit_test::suite
         // issuer
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: issuer writes check to A1.
             {
-                uint256 const checkId{getCheckIndex(G1, env.seq(G1))};
-                env(check::create(G1, A1, USD(10)));
+                uint256 const checkId{getCheckIndex(g1, env.seq(g1))};
+                env(check::create(g1, a1, usd(10)));
                 env.close();
 
-                env(check::cash(A1, checkId, USD(10)), ter(tecFROZEN));
+                env(check::cash(a1, checkId, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A2 writes check to A1.
             {
-                uint256 const checkId{getCheckIndex(A2, env.seq(A2))};
-                env(check::create(A2, A1, USD(10)));
+                uint256 const checkId{getCheckIndex(a2, env.seq(a2))};
+                env(check::create(a2, a1, usd(10)));
                 env.close();
                 // Same as previous test
-                env(check::cash(A1, checkId, USD(10)), ter(tecFROZEN));
+                env(check::cash(a1, checkId, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to issuer
             {
-                env(check::create(A1, G1, USD(10)), ter(tecFROZEN));
+                env(check::create(a1, g1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to A2
             {
                 // Same as previous test
-                env(check::create(A1, A2, USD(10)), ter(tecFROZEN));
+                env(check::create(a1, a2, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // Unfreeze the trustline to create a couple of checks so that we
             // could try to cash them later when the trustline is frozen again.
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
 
-            uint256 const checkId1{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, G1, USD(10)));
+            uint256 const checkId1{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, g1, usd(10)));
             env.close();
-            uint256 const checkId2{getCheckIndex(A1, env.seq(A1))};
-            env(check::create(A1, A2, USD(10)));
+            uint256 const checkId2{getCheckIndex(a1, env.seq(a1))};
+            env(check::create(a1, a2, usd(10)));
             env.close();
 
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: issuer tries to cash the check from A1
             {
-                env(check::cash(G1, checkId1, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(g1, checkId1, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
             // test: A2 tries to cash the check from A1
             {
-                env(check::cash(A2, checkId2, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(a2, checkId2, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing creation and cashing of checks on a trustline frozen by
         // a currency holder
         {
-            env(trust(A1, limit, tfSetFreeze));
+            env(trust(a1, limit, tfSetFreeze));
             env.close();
 
             // test: issuer writes check to A1.
             {
-                env(check::create(G1, A1, USD(10)), ter(tecFROZEN));
+                env(check::create(g1, a1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A2 writes check to A1.
             {
-                env(check::create(A2, A1, USD(10)), ter(tecFROZEN));
+                env(check::create(a2, a1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to issuer
             {
-                uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-                env(check::create(A1, G1, USD(10)));
+                uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+                env(check::create(a1, g1, usd(10)));
                 env.close();
-                env(check::cash(G1, checkId, USD(10)));
+                env(check::cash(g1, checkId, usd(10)));
                 env.close();
             }
 
             // test: A1 writes check to A2
             {
-                uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-                env(check::create(A1, A2, USD(10)));
+                uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+                env(check::create(a1, a2, usd(10)));
                 env.close();
-                env(check::cash(A2, checkId, USD(10)));
+                env(check::cash(a2, checkId, usd(10)));
                 env.close();
             }
 
-            env(trust(A1, limit, tfClearFreeze));
+            env(trust(a1, limit, tfClearFreeze));
             env.close();
         }
 
@@ -1558,40 +1557,40 @@ class Freeze_test : public beast::unit_test::suite
         // a currency holder
         if (features[featureDeepFreeze])
         {
-            env(trust(A1, limit, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(a1, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: issuer writes check to A1.
             {
-                env(check::create(G1, A1, USD(10)), ter(tecFROZEN));
+                env(check::create(g1, a1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A2 writes check to A1.
             {
-                env(check::create(A2, A1, USD(10)), ter(tecFROZEN));
+                env(check::create(a2, a1, usd(10)), Ter(tecFROZEN));
                 env.close();
             }
 
             // test: A1 writes check to issuer
             {
-                uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-                env(check::create(A1, G1, USD(10)));
+                uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+                env(check::create(a1, g1, usd(10)));
                 env.close();
-                env(check::cash(G1, checkId, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(g1, checkId, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
             // test: A1 writes check to A2
             {
-                uint256 const checkId{getCheckIndex(A1, env.seq(A1))};
-                env(check::create(A1, A2, USD(10)));
+                uint256 const checkId{getCheckIndex(a1, env.seq(a1))};
+                env(check::create(a1, a2, usd(10)));
                 env.close();
-                env(check::cash(A2, checkId, USD(10)), ter(tecPATH_PARTIAL));
+                env(check::cash(a2, checkId, usd(10)), Ter(tecPATH_PARTIAL));
                 env.close();
             }
 
-            env(trust(A1, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a1, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
     }
@@ -1601,53 +1600,52 @@ class Freeze_test : public beast::unit_test::suite
     {
         testcase("AMM payments on frozen trust lines");
         using namespace test::jtx;
-        using path = test::jtx::path;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
+        env.fund(XRP(10000), g1, a1, a2);
         env.close();
 
-        env.trust(G1["USD"](10000), A1, A2);
+        env.trust(g1["USD"](10000), a1, a2);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
-        AMM const ammG1(env, G1, XRP(1'000), USD(1'000));
+        AMM const ammG1(env, g1, XRP(1'000), usd(1'000));
         env.close();
 
         // Testing basic payment using AMM when freezing one of the trust lines.
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze));
             env.close();
 
             // test: can still use XRP to make payment
-            env(pay(A1, A2, USD(10)), path(~USD), sendmax(XRP(11)), txflags(tfNoRippleDirect));
+            env(pay(a1, a2, usd(10)), Path(~usd), Sendmax(XRP(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: cannot use USD to make payment
-            env(pay(A1, A2, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(a1, a2, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_DRY));
             env.close();
 
             // test: can still receive USD payments.
-            env(pay(A2, A1, USD(10)), path(~USD), sendmax(XRP(11)), txflags(tfNoRippleDirect));
+            env(pay(a2, a1, usd(10)), Path(~usd), Sendmax(XRP(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: can still receive XRP payments.
-            env(pay(A2, A1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(a2, a1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze));
             env.close();
         }
 
@@ -1655,34 +1653,34 @@ class Freeze_test : public beast::unit_test::suite
         // lines.
         if (features[featureDeepFreeze])
         {
-            env(trust(G1, A1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: can still use XRP to make payment
-            env(pay(A1, A2, USD(10)), path(~USD), sendmax(XRP(11)), txflags(tfNoRippleDirect));
+            env(pay(a1, a2, usd(10)), Path(~usd), Sendmax(XRP(11)), Txflags(tfNoRippleDirect));
             env.close();
 
             // test: cannot use USD to make payment
-            env(pay(A1, A2, XRP(10)),
-                path(~XRP),
-                sendmax(USD(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(a1, a2, XRP(10)),
+                Path(~XRP),
+                Sendmax(usd(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_DRY));
             env.close();
 
             // test: cannot receive USD payments.
-            env(pay(A2, A1, USD(10)),
-                path(~USD),
-                sendmax(XRP(11)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(a2, a1, usd(10)),
+                Path(~usd),
+                Sendmax(XRP(11)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_DRY));
             env.close();
 
             // test: can still receive XRP payments.
-            env(pay(A2, A1, XRP(10)), path(~XRP), sendmax(USD(11)), txflags(tfNoRippleDirect));
+            env(pay(a2, a1, XRP(10)), Path(~XRP), Sendmax(usd(11)), Txflags(tfNoRippleDirect));
             env.close();
 
-            env(trust(G1, A1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a1["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
     }
@@ -1694,161 +1692,161 @@ class Freeze_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
+        env.fund(XRP(10000), g1, a1, a2);
         env.close();
 
-        auto const limit = USD(10000);
-        env.trust(limit, A1, A2);
+        auto const limit = usd(10000);
+        env.trust(limit, a1, a2);
         env.close();
 
-        env(pay(G1, A1, USD(1000)));
-        env(pay(G1, A2, USD(1000)));
+        env(pay(g1, a1, usd(1000)));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
         // Testing A2 nft offer sell when A2 frozen by issuer
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A2, USD(10));
-            env(trust(G1, A2["USD"](0), tfSetFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a2, usd(10));
+            env(trust(g1, a2["USD"](0), tfSetFreeze));
             env.close();
 
             // test: A2 can still receive USD for his NFT
-            env(token::acceptSellOffer(A1, sellOfferIndex));
+            env(token::acceptSellOffer(a1, sellOfferIndex));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze));
             env.close();
         }
 
         // Testing A2 nft offer sell when A2 deep frozen by issuer
         if (features[featureDeepFreeze])
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A2, USD(10));
+            auto const sellOfferIndex = createNFTSellOffer(env, a2, usd(10));
 
-            env(trust(G1, A2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A2 cannot receive USD for his NFT
-            env(token::acceptSellOffer(A1, sellOfferIndex), ter(tecFROZEN));
+            env(token::acceptSellOffer(a1, sellOfferIndex), Ter(tecFROZEN));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing A1 nft offer sell when A2 frozen by issuer
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A1, USD(10));
-            env(trust(G1, A2["USD"](0), tfSetFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a1, usd(10));
+            env(trust(g1, a2["USD"](0), tfSetFreeze));
             env.close();
 
             // test: A2 cannot send USD for NFT
-            env(token::acceptSellOffer(A2, sellOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptSellOffer(a2, sellOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze));
             env.close();
         }
 
         // Testing A1 nft offer sell when A2 deep frozen by issuer
         if (features[featureDeepFreeze])
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A1, USD(10));
-            env(trust(G1, A2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a1, usd(10));
+            env(trust(g1, a2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A2 cannot send USD for NFT
-            env(token::acceptSellOffer(A2, sellOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptSellOffer(a2, sellOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing A1 nft buy offer when A2 deep frozen by issuer
         if (features[featureDeepFreeze] && features[fixEnforceNFTokenTrustlineV2])
         {
-            env(trust(G1, A2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
-            uint256 const nftID{token::getNextID(env, A2, 0u, tfTransferable)};
-            env(token::mint(A2, 0), txflags(tfTransferable));
+            uint256 const nftID{token::getNextID(env, a2, 0u, tfTransferable)};
+            env(token::mint(a2, 0), Txflags(tfTransferable));
             env.close();
 
-            auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-            env(token::createOffer(A1, nftID, USD(10)), token::owner(A2));
+            auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+            env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2));
             env.close();
 
-            env(token::acceptBuyOffer(A2, buyIdx), ter(tecFROZEN));
+            env(token::acceptBuyOffer(a2, buyIdx), Ter(tecFROZEN));
             env.close();
 
-            env(trust(G1, A2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
+            env(trust(g1, a2["USD"](0), tfClearFreeze | tfClearDeepFreeze));
             env.close();
 
-            env(token::acceptBuyOffer(A2, buyIdx));
+            env(token::acceptBuyOffer(a2, buyIdx));
             env.close();
         }
 
         // Testing A2 nft offer sell when A2 frozen by currency holder
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A2, USD(10));
-            env(trust(A2, limit, tfSetFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a2, usd(10));
+            env(trust(a2, limit, tfSetFreeze));
             env.close();
 
             // test: offer can still be accepted.
-            env(token::acceptSellOffer(A1, sellOfferIndex));
+            env(token::acceptSellOffer(a1, sellOfferIndex));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze));
+            env(trust(a2, limit, tfClearFreeze));
             env.close();
         }
 
         // Testing A2 nft offer sell when A2 deep frozen by currency holder
         if (features[featureDeepFreeze])
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A2, USD(10));
+            auto const sellOfferIndex = createNFTSellOffer(env, a2, usd(10));
 
-            env(trust(A2, limit, tfSetFreeze | tfSetDeepFreeze));
+            env(trust(a2, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A2 cannot receive USD for his NFT
-            env(token::acceptSellOffer(A1, sellOfferIndex), ter(tecFROZEN));
+            env(token::acceptSellOffer(a1, sellOfferIndex), Ter(tecFROZEN));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a2, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
         // Testing A1 nft offer sell when A2 frozen by currency holder
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A1, USD(10));
-            env(trust(A2, limit, tfSetFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a1, usd(10));
+            env(trust(a2, limit, tfSetFreeze));
             env.close();
 
             // test: A2 cannot send USD for NFT
-            env(token::acceptSellOffer(A2, sellOfferIndex));
+            env(token::acceptSellOffer(a2, sellOfferIndex));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze));
+            env(trust(a2, limit, tfClearFreeze));
             env.close();
         }
 
         // Testing A1 nft offer sell when A2 deep frozen by currency holder
         if (features[featureDeepFreeze])
         {
-            auto const sellOfferIndex = createNFTSellOffer(env, A1, USD(10));
-            env(trust(A2, limit, tfSetFreeze | tfSetDeepFreeze));
+            auto const sellOfferIndex = createNFTSellOffer(env, a1, usd(10));
+            env(trust(a2, limit, tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
             // test: A2 cannot send USD for NFT
-            env(token::acceptSellOffer(A2, sellOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptSellOffer(a2, sellOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
-            env(trust(A2, limit, tfClearFreeze | tfClearDeepFreeze));
+            env(trust(a2, limit, tfClearFreeze | tfClearDeepFreeze));
             env.close();
         }
 
@@ -1858,23 +1856,23 @@ class Freeze_test : public beast::unit_test::suite
             Account const broker{"broker"};
             env.fund(XRP(10000), broker);
             env.close();
-            env(trust(G1, broker["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, broker["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
             env.close();
 
-            uint256 const nftID{token::getNextID(env, A2, 0u, tfTransferable)};
-            env(token::mint(A2, 0), txflags(tfTransferable));
+            uint256 const nftID{token::getNextID(env, a2, 0u, tfTransferable)};
+            env(token::mint(a2, 0), Txflags(tfTransferable));
             env.close();
 
-            uint256 const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key;
-            env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken));
+            uint256 const sellIdx = keylet::nftoffer(a2, env.seq(a2)).key;
+            env(token::createOffer(a2, nftID, usd(10)), Txflags(tfSellNFToken));
             env.close();
-            auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-            env(token::createOffer(A1, nftID, USD(11)), token::owner(A2));
+            auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+            env(token::createOffer(a1, nftID, usd(11)), token::Owner(a2));
             env.close();
 
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecFROZEN));
+                token::BrokerFee(usd(1)),
+                Ter(tecFROZEN));
             env.close();
         }
 
@@ -1884,25 +1882,25 @@ class Freeze_test : public beast::unit_test::suite
             Account const minter{"minter"};
             env.fund(XRP(10000), minter);
             env.close();
-            env(trust(G1, minter["USD"](1000)));
+            env(trust(g1, minter["USD"](1000)));
             env.close();
 
             uint256 const nftID{token::getNextID(env, minter, 0u, tfTransferable, 1u)};
-            env(token::mint(minter, 0), token::xferFee(1u), txflags(tfTransferable));
+            env(token::mint(minter, 0), token::XferFee(1u), Txflags(tfTransferable));
             env.close();
 
             uint256 const minterSellIdx = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, drops(1)), Txflags(tfSellNFToken));
             env.close();
-            env(token::acceptSellOffer(A2, minterSellIdx));
+            env(token::acceptSellOffer(a2, minterSellIdx));
             env.close();
 
-            uint256 const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key;
-            env(token::createOffer(A2, nftID, USD(100)), txflags(tfSellNFToken));
+            uint256 const sellIdx = keylet::nftoffer(a2, env.seq(a2)).key;
+            env(token::createOffer(a2, nftID, usd(100)), Txflags(tfSellNFToken));
             env.close();
-            env(trust(G1, minter["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
+            env(trust(g1, minter["USD"](1000), tfSetFreeze | tfSetDeepFreeze));
             env.close();
-            env(token::acceptSellOffer(A1, sellIdx), ter(tecFROZEN));
+            env(token::acceptSellOffer(a1, sellIdx), Ter(tecFROZEN));
             env.close();
         }
     }
@@ -1916,7 +1914,7 @@ class Freeze_test : public beast::unit_test::suite
         bool modified = true)
     {
         using namespace test::jtx;
-        auto const affected = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+        auto const affected = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
         if (!BEAST_EXPECT(checkArraySize(affected, expectedArraySize)))
             return 0;
 
@@ -1947,11 +1945,11 @@ class Freeze_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
         uint256 const nftID{token::getNextID(env, account, 0u, tfTransferable)};
-        env(token::mint(account, 0), txflags(tfTransferable));
+        env(token::mint(account, 0), Txflags(tfTransferable));
         env.close();
 
         uint256 const sellOfferIndex = keylet::nftoffer(account, env.seq(account)).key;
-        env(token::createOffer(account, nftID, currency), txflags(tfSellNFToken));
+        env(token::createOffer(account, nftID, currency), Txflags(tfSellNFToken));
         env.close();
 
         return sellOfferIndex;
@@ -1977,7 +1975,7 @@ public:
             testNFTOffersWhenFreeze(features);
         };
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testAll(sa - featureDeepFreeze - featurePermissionedDEX - fixEnforceNFTokenTrustlineV2);
         testAll(sa - featurePermissionedDEX - fixEnforceNFTokenTrustlineV2);
         testAll(sa - featureDeepFreeze - featurePermissionedDEX);
diff --git a/src/test/app/GRPCServerTLS_test.cpp b/src/test/app/GRPCServerTLS_test.cpp
index a3411682a2..6dbf335b6c 100644
--- a/src/test/app/GRPCServerTLS_test.cpp
+++ b/src/test/app/GRPCServerTLS_test.cpp
@@ -353,7 +353,7 @@ makeTestGRPCCall(std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stub>
     return status.ok();
 }
 
-class GRPCServerTLS_test : public beast::unit_test::suite, public TemporaryTLSCertificates
+class GRPCServerTLS_test : public beast::unit_test::Suite, public TemporaryTLSCertificates
 {
 public:
     void
diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp
index 3ad317b157..8f9cae351e 100644
--- a/src/test/app/HashRouter_test.cpp
+++ b/src/test/app/HashRouter_test.cpp
@@ -14,7 +14,7 @@
 
 namespace xrpl::test {
 
-class HashRouter_test : public beast::unit_test::suite
+class HashRouter_test : public beast::unit_test::Suite
 {
     static HashRouter::Setup
     getSetup(std::chrono::seconds hold, std::chrono::seconds relay)
@@ -267,7 +267,7 @@ class HashRouter_test : public beast::unit_test::suite
         {
             Config const cfg;
             // default
-            auto const setup = setup_HashRouter(cfg);
+            auto const setup = setupHashRouter(cfg);
             BEAST_EXPECT(setup.holdTime == 300s);
             BEAST_EXPECT(setup.relayTime == 30s);
         }
@@ -277,7 +277,7 @@ class HashRouter_test : public beast::unit_test::suite
             auto& h = cfg.section("hashrouter");
             h.set("hold_time", "600");
             h.set("relay_time", "15");
-            auto const setup = setup_HashRouter(cfg);
+            auto const setup = setupHashRouter(cfg);
             BEAST_EXPECT(setup.holdTime == 600s);
             BEAST_EXPECT(setup.relayTime == 15s);
         }
@@ -287,7 +287,7 @@ class HashRouter_test : public beast::unit_test::suite
             auto& h = cfg.section("hashrouter");
             h.set("hold_time", "400");
             h.set("relay_time", "400");
-            auto const setup = setup_HashRouter(cfg);
+            auto const setup = setupHashRouter(cfg);
             BEAST_EXPECT(setup.holdTime == 400s);
             BEAST_EXPECT(setup.relayTime == 400s);
         }
@@ -299,7 +299,7 @@ class HashRouter_test : public beast::unit_test::suite
             h.set("relay_time", "120");
             try
             {
-                setup_HashRouter(cfg);
+                setupHashRouter(cfg);
                 fail();
             }
             catch (std::exception const& e)
@@ -318,7 +318,7 @@ class HashRouter_test : public beast::unit_test::suite
             h.set("relay_time", "120");
             try
             {
-                setup_HashRouter(cfg);
+                setupHashRouter(cfg);
                 fail();
             }
             catch (std::exception const& e)
@@ -338,7 +338,7 @@ class HashRouter_test : public beast::unit_test::suite
             h.set("relay_time", "6");
             try
             {
-                setup_HashRouter(cfg);
+                setupHashRouter(cfg);
                 fail();
             }
             catch (std::exception const& e)
@@ -355,7 +355,7 @@ class HashRouter_test : public beast::unit_test::suite
             auto& h = cfg.section("hashrouter");
             h.set("hold_time", "alice");
             h.set("relay_time", "bob");
-            auto const setup = setup_HashRouter(cfg);
+            auto const setup = setupHashRouter(cfg);
             // The set function ignores values that don't convert, so the
             // defaults are left unchanged
             BEAST_EXPECT(setup.holdTime == 300s);
diff --git a/src/test/app/Invariants_test.cpp b/src/test/app/Invariants_test.cpp
index 36ba3e98ec..965414553f 100644
--- a/src/test/app/Invariants_test.cpp
+++ b/src/test/app/Invariants_test.cpp
@@ -76,7 +76,7 @@ makeTransactor(ApplyContext& ctx);
 
 namespace xrpl::test {
 
-class Invariants_test : public beast::unit_test::suite
+class Invariants_test : public beast::unit_test::Suite
 {
     // The optional Preclose function is used to process additional transactions
     // on the ledger after creating two accounts, but before closing it, and
@@ -94,7 +94,7 @@ class Invariants_test : public beast::unit_test::suite
     static FeatureBitset
     defaultAmendments()
     {
-        return xrpl::test::jtx::testable_amendments() | featureInvariantsV1_1 | fixSecurity3_1_3;
+        return xrpl::test::jtx::testableAmendments() | featureInvariantsV1_1 | fixSecurity3_1_3;
     }
 
     /** Run a specific test case to put the ledger into a state that will be
@@ -116,7 +116,7 @@ class Invariants_test : public beast::unit_test::suite
     enum class TxAccount : int { None = 0, A1, A2 };
     void
     doInvariantCheck(
-        std::vector<std::string> const& expect_logs,
+        std::vector<std::string> const& expectLogs,
         Precheck const& precheck,
         XRPAmount fee = XRPAmount{},
         STTx tx = STTx{ttACCOUNT_SET, [](STObject&) {}},
@@ -126,7 +126,7 @@ class Invariants_test : public beast::unit_test::suite
     {
         doInvariantCheck(
             test::jtx::Env(*this, defaultAmendments()),
-            expect_logs,
+            expectLogs,
             precheck,
             fee,
             tx,
@@ -138,7 +138,7 @@ class Invariants_test : public beast::unit_test::suite
     void
     doInvariantCheck(
         test::jtx::Env&& env,
-        std::vector<std::string> const& expect_logs,
+        std::vector<std::string> const& expectLogs,
         Precheck const& precheck,
         XRPAmount fee = XRPAmount{},
         STTx tx = STTx{ttACCOUNT_SET, [](STObject&) {}},
@@ -148,26 +148,26 @@ class Invariants_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
 
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        env.fund(XRP(1000), A1, A2);
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        env.fund(XRP(1000), a1, a2);
         if (preclose)
-            BEAST_EXPECT(preclose(A1, A2, env));
+            BEAST_EXPECT(preclose(a1, a2, env));
         env.close();
 
         if (setTxAccount != TxAccount::None)
-            tx.setAccountID(sfAccount, setTxAccount == TxAccount::A1 ? A1.id() : A2.id());
+            tx.setAccountID(sfAccount, setTxAccount == TxAccount::A1 ? a1.id() : a2.id());
 
-        doInvariantCheck(std::move(env), A1, A2, expect_logs, precheck, fee, tx, ters);
+        doInvariantCheck(std::move(env), a1, a2, expectLogs, precheck, fee, tx, ters);
     }
 
     void
     doInvariantCheck(
         // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
         test::jtx::Env&& env,
-        test::jtx::Account const& A1,
-        test::jtx::Account const& A2,
-        std::vector<std::string> const& expect_logs,
+        test::jtx::Account const& a1,
+        test::jtx::Account const& a2,
+        std::vector<std::string> const& expectLogs,
         Precheck const& precheck,
         XRPAmount fee = XRPAmount{},
         STTx tx = STTx{ttACCOUNT_SET, [](STObject&) {}},
@@ -176,15 +176,15 @@ class Invariants_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         OpenView ov{*env.current()};
-        test::StreamSink sink{beast::severities::kWarning};
+        test::StreamSink sink{beast::severities::KWarning};
         beast::Journal const jlog{sink};
-        ApplyContext ac{env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, jlog};
+        ApplyContext ac{env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, TapNone, jlog};
 
         // Invariants normally run in the Transaction's "apply" (operator()) context, and can always
         // access global Rules.
         CurrentTransactionRulesGuard const rg(ov.rules());
 
-        BEAST_EXPECT(precheck(A1, A2, ac));
+        BEAST_EXPECT(precheck(a1, a2, ac));
 
         auto transactor = makeTransactor(ac);
         if (!BEAST_EXPECT(transactor))
@@ -212,7 +212,7 @@ class Invariants_test : public beast::unit_test::suite
             }
 
             // std::cerr << messages << '\n';
-            for (auto const& m : expect_logs)
+            for (auto const& m : expectLogs)
             {
                 BEAST_EXPECTS(messages.find(m) != std::string::npos, m);
             }
@@ -226,9 +226,9 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "XRP created";
         doInvariantCheck(
             {{"XRP net change was positive: 500"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // put a single account in the view and "manufacture" some XRP
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 auto amt = sle->getFieldAmount(sfBalance);
@@ -247,15 +247,15 @@ class Invariants_test : public beast::unit_test::suite
         // An account was deleted, but not by an AccountDelete transaction.
         doInvariantCheck(
             {{"an account root was deleted"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // remove an account from the view
-                auto sle = ac.view().peek(keylet::account(A1.id()));
+                auto sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 // 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::zero;
+                sle->at(sfBalance) = beast::kZERO;
                 ac.view().erase(sle);
                 return true;
             });
@@ -275,17 +275,17 @@ class Invariants_test : public beast::unit_test::suite
         // Successful AccountDelete that deleted more than one account.
         doInvariantCheck(
             {{"account deletion succeeded but deleted multiple accounts"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // remove two accounts from the view
-                auto sleA1 = ac.view().peek(keylet::account(A1.id()));
-                auto sleA2 = ac.view().peek(keylet::account(A2.id()));
+                auto sleA1 = ac.view().peek(keylet::account(a1.id()));
+                auto sleA2 = ac.view().peek(keylet::account(a2.id()));
                 if (!sleA1 || !sleA2)
                     return false;
                 // 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::zero;
-                sleA2->at(sfBalance) = beast::zero;
+                sleA1->at(sfBalance) = beast::kZERO;
+                sleA2->at(sfBalance) = beast::kZERO;
                 ac.view().erase(sleA1);
                 ac.view().erase(sleA2);
                 return true;
@@ -302,13 +302,14 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"account deletion left behind a non-zero balance"}},
+            // NOLINTNEXTLINE(readability-identifier-naming)
             [&](Account const& A1, Account const& A2, ApplyContext& ac) {
                 // A1 has a balance. Delete A1
                 auto const a1 = A1.id();
                 auto const sleA1 = ac.view().peek(keylet::account(a1));
                 if (!sleA1)
                     return false;
-                if (!BEAST_EXPECT(*sleA1->at(sfBalance) != beast::zero))
+                if (!BEAST_EXPECT(*sleA1->at(sfBalance) != beast::kZERO))
                     return false;
 
                 ac.view().erase(sleA1);
@@ -320,6 +321,7 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"account deletion left behind a non-zero owner count"}},
+            // NOLINTNEXTLINE(readability-identifier-naming)
             [&](Account const& A1, Account const& A2, ApplyContext& ac) {
                 // Increment A1's owner count, then delete A1
                 auto const a1 = A1.id();
@@ -329,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::zero;
+                sleA1->at(sfBalance) = beast::kZERO;
                 BEAST_EXPECT(sleA1->at(sfOwnerCount) == 0);
                 adjustOwnerCount(ac.view(), sleA1, 1, ac.journal);
 
@@ -340,7 +342,7 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttACCOUNT_DELETE, [](STObject& tx) {}});
 
-        for (auto const& keyletInfo : directAccountKeylets)
+        for (auto const& keyletInfo : kDIRECT_ACCOUNT_KEYLETS)
         {
             // TODO: Use structured binding once LLVM 16 is the minimum
             // supported version. See also:
@@ -354,7 +356,8 @@ class Invariants_test : public beast::unit_test::suite
             using namespace std::string_literals;
 
             doInvariantCheck(
-                {{"account deletion left behind a "s + type.c_str() + " object"}},
+                {{"account deletion left behind a "s + type.cStr() + " object"}},
+                // NOLINTNEXTLINE(readability-identifier-naming)
                 [&](Account const& A1, Account const& A2, ApplyContext& ac) {
                     // Add an object to the ledger for account A1, then delete
                     // A1
@@ -369,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::zero;
+                    sleA1->at(sfBalance) = beast::kZERO;
                     ac.view().erase(sleA1);
 
                     return true;
@@ -381,15 +384,15 @@ class Invariants_test : public beast::unit_test::suite
         // NFT special case
         doInvariantCheck(
             {{"account deletion left behind a NFTokenPage object"}},
-            [&](Account const& A1, Account const&, ApplyContext& ac) {
+            [&](Account const& a1, Account const&, ApplyContext& ac) {
                 // remove an account from the view
-                auto sle = ac.view().peek(keylet::account(A1.id()));
+                auto sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 // 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::zero;
+                sle->at(sfBalance) = beast::kZERO;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
                 return true;
@@ -397,10 +400,10 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttACCOUNT_DELETE, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            [&](Account const& A1, Account const&, Env& env) {
+            [&](Account const& a1, Account const&, Env& env) {
                 // Preclose callback to mint the NFT which will be deleted in
                 // the Precheck callback above.
-                env(token::mint(A1));
+                env(token::mint(a1));
 
                 return true;
             });
@@ -411,7 +414,7 @@ class Invariants_test : public beast::unit_test::suite
         Issue ammIssue;
         doInvariantCheck(
             {{"account deletion left behind a DirectoryNode object"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // Delete the AMM account without cleaning up the directory or
                 // deleting the AMM object
                 auto sle = ac.view().peek(keylet::account(ammAcctID));
@@ -424,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::zero;
+                sle->at(sfBalance) = beast::kZERO;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
 
@@ -433,10 +436,10 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttAMM_WITHDRAW, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 // Preclose callback to create the AMM which will be partially
                 // deleted in the Precheck callback above.
-                AMM const amm(env, A1, XRP(100), A1["USD"](50));
+                AMM const amm(env, a1, XRP(100), a1["USD"](50));
                 ammAcctID = amm.ammAccount();
                 ammKey = amm.ammID();
                 ammIssue = amm.lptIssue();
@@ -444,7 +447,7 @@ class Invariants_test : public beast::unit_test::suite
             });
         doInvariantCheck(
             {{"account deletion left behind a AMM object"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // Delete all the AMM's trust lines, remove the AMM from the AMM
                 // account's directory (this deletes the directory), and delete
                 // the AMM account. Do not delete the AMM object.
@@ -456,7 +459,7 @@ class Invariants_test : public beast::unit_test::suite
                 BEAST_EXPECT(sle->at(~sfAMMID) == ammKey);
 
                 for (auto const& trustKeylet :
-                     {keylet::line(ammAcctID, A1["USD"]), keylet::line(A1, ammIssue)})
+                     {keylet::line(ammAcctID, a1["USD"]), keylet::line(a1, ammIssue)})
                 {
                     auto const line = ac.view().peek(trustKeylet);
                     if (!line)
@@ -488,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::zero;
+                sle->at(sfBalance) = beast::kZERO;
                 sle->at(sfOwnerCount) = 0;
                 ac.view().erase(sle);
 
@@ -497,10 +500,10 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttAMM_WITHDRAW, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 // Preclose callback to create the AMM which will be partially
                 // deleted in the Precheck callback above.
-                AMM const amm(env, A1, XRP(100), A1["USD"](50));
+                AMM const amm(env, a1, XRP(100), a1["USD"](50));
                 ammAcctID = amm.ammAccount();
                 ammKey = amm.ammID();
                 ammIssue = amm.lptIssue();
@@ -515,9 +518,9 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "ledger entry types don't match";
         doInvariantCheck(
             {{"ledger entry type mismatch"}, {"XRP net change of -1000000000 doesn't match fee 0"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // replace an entry in the table with an SLE of a different type
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 auto const sleNew = std::make_shared<SLE>(ltTICKET, sle->key());
@@ -527,9 +530,9 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"invalid ledger entry type added"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // add an entry in the table with an SLE of an invalid type
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
@@ -537,7 +540,7 @@ class Invariants_test : public beast::unit_test::suite
                 // unsupported value so that the valid type invariant check
                 // will fail.
                 auto const sleNew =
-                    std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                    std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
 
                 // We don't use ltNICKNAME directly since it's marked deprecated
                 // to prevent accidental use elsewhere.
@@ -554,10 +557,10 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "trust lines with XRP not allowed";
         doInvariantCheck(
             {{"an XRP trust line was created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create simple trust SLE with xrp currency
                 auto const sleNew =
-                    std::make_shared<SLE>(keylet::line(A1, A2, xrpIssue().currency));
+                    std::make_shared<SLE>(keylet::line(a1, a2, xrpIssue().currency));
                 ac.view().insert(sleNew);
                 return true;
             });
@@ -572,10 +575,10 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"a trust line with deep freeze flag without normal freeze was "
               "created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const sleNew = std::make_shared<SLE>(keylet::line(A1, A2, A1["USD"].currency));
-                sleNew->setFieldAmount(sfLowLimit, A1["USD"](0));
-                sleNew->setFieldAmount(sfHighLimit, A1["USD"](0));
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const sleNew = std::make_shared<SLE>(keylet::line(a1, a2, a1["USD"].currency));
+                sleNew->setFieldAmount(sfLowLimit, a1["USD"](0));
+                sleNew->setFieldAmount(sfHighLimit, a1["USD"](0));
 
                 std::uint32_t uFlags = 0u;
                 uFlags |= lsfLowDeepFreeze;
@@ -587,10 +590,10 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"a trust line with deep freeze flag without normal freeze was "
               "created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const sleNew = std::make_shared<SLE>(keylet::line(A1, A2, A1["USD"].currency));
-                sleNew->setFieldAmount(sfLowLimit, A1["USD"](0));
-                sleNew->setFieldAmount(sfHighLimit, A1["USD"](0));
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const sleNew = std::make_shared<SLE>(keylet::line(a1, a2, a1["USD"].currency));
+                sleNew->setFieldAmount(sfLowLimit, a1["USD"](0));
+                sleNew->setFieldAmount(sfHighLimit, a1["USD"](0));
                 std::uint32_t uFlags = 0u;
                 uFlags |= lsfHighDeepFreeze;
                 sleNew->setFieldU32(sfFlags, uFlags);
@@ -601,10 +604,10 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"a trust line with deep freeze flag without normal freeze was "
               "created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const sleNew = std::make_shared<SLE>(keylet::line(A1, A2, A1["USD"].currency));
-                sleNew->setFieldAmount(sfLowLimit, A1["USD"](0));
-                sleNew->setFieldAmount(sfHighLimit, A1["USD"](0));
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const sleNew = std::make_shared<SLE>(keylet::line(a1, a2, a1["USD"].currency));
+                sleNew->setFieldAmount(sfLowLimit, a1["USD"](0));
+                sleNew->setFieldAmount(sfHighLimit, a1["USD"](0));
                 std::uint32_t uFlags = 0u;
                 uFlags |= lsfLowDeepFreeze | lsfHighDeepFreeze;
                 sleNew->setFieldU32(sfFlags, uFlags);
@@ -615,10 +618,10 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"a trust line with deep freeze flag without normal freeze was "
               "created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const sleNew = std::make_shared<SLE>(keylet::line(A1, A2, A1["USD"].currency));
-                sleNew->setFieldAmount(sfLowLimit, A1["USD"](0));
-                sleNew->setFieldAmount(sfHighLimit, A1["USD"](0));
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const sleNew = std::make_shared<SLE>(keylet::line(a1, a2, a1["USD"].currency));
+                sleNew->setFieldAmount(sfLowLimit, a1["USD"](0));
+                sleNew->setFieldAmount(sfHighLimit, a1["USD"](0));
                 std::uint32_t uFlags = 0u;
                 uFlags |= lsfLowDeepFreeze | lsfHighFreeze;
                 sleNew->setFieldU32(sfFlags, uFlags);
@@ -629,10 +632,10 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"a trust line with deep freeze flag without normal freeze was "
               "created"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const sleNew = std::make_shared<SLE>(keylet::line(A1, A2, A1["USD"].currency));
-                sleNew->setFieldAmount(sfLowLimit, A1["USD"](0));
-                sleNew->setFieldAmount(sfHighLimit, A1["USD"](0));
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const sleNew = std::make_shared<SLE>(keylet::line(a1, a2, a1["USD"].currency));
+                sleNew->setFieldAmount(sfLowLimit, a1["USD"](0));
+                sleNew->setFieldAmount(sfHighLimit, a1["USD"](0));
                 std::uint32_t uFlags = 0u;
                 uFlags |= lsfLowFreeze | lsfHighDeepFreeze;
                 sleNew->setFieldU32(sfFlags, uFlags);
@@ -647,49 +650,49 @@ class Invariants_test : public beast::unit_test::suite
         using namespace test::jtx;
         testcase << "transfers when frozen";
 
-        Account const G1{"G1"};
+        Account const g1{"G1"};
         // Helper function to establish the trustlines
-        auto const createTrustlines = [&](Account const& A1, Account const& A2, Env& env) {
+        auto const createTrustlines = [&](Account const& a1, Account const& a2, Env& env) {
             // Preclose callback to establish trust lines with gateway
-            env.fund(XRP(1000), G1);
+            env.fund(XRP(1000), g1);
 
-            env.trust(G1["USD"](10000), A1);
-            env.trust(G1["USD"](10000), A2);
+            env.trust(g1["USD"](10000), a1);
+            env.trust(g1["USD"](10000), a2);
             env.close();
 
-            env(pay(G1, A1, G1["USD"](1000)));
-            env(pay(G1, A2, G1["USD"](1000)));
+            env(pay(g1, a1, g1["USD"](1000)));
+            env(pay(g1, a2, g1["USD"](1000)));
             env.close();
 
             return true;
         };
 
-        auto const A1FrozenByIssuer = [&](Account const& A1, Account const& A2, Env& env) {
-            createTrustlines(A1, A2, env);
-            env(trust(G1, A1["USD"](10000), tfSetFreeze));
+        auto const a1FrozenByIssuer = [&](Account const& a1, Account const& a2, Env& env) {
+            createTrustlines(a1, a2, env);
+            env(trust(g1, a1["USD"](10000), tfSetFreeze));
             env.close();
 
             return true;
         };
 
-        auto const A1DeepFrozenByIssuer = [&](Account const& A1, Account const& A2, Env& env) {
-            A1FrozenByIssuer(A1, A2, env);
-            env(trust(G1, A1["USD"](10000), tfSetDeepFreeze));
+        auto const a1DeepFrozenByIssuer = [&](Account const& a1, Account const& a2, Env& env) {
+            a1FrozenByIssuer(a1, a2, env);
+            env(trust(g1, a1["USD"](10000), tfSetDeepFreeze));
             env.close();
 
             return true;
         };
 
-        auto const changeBalances = [&](Account const& A1,
-                                        Account const& A2,
+        auto const changeBalances = [&](Account const& a1,
+                                        Account const& a2,
                                         ApplyContext& ac,
-                                        int A1Balance,
-                                        int A2Balance) {
-            auto const sleA1 = ac.view().peek(keylet::line(A1, G1["USD"]));
-            auto const sleA2 = ac.view().peek(keylet::line(A2, G1["USD"]));
+                                        int a1Balance,
+                                        int a2Balance) {
+            auto const sleA1 = ac.view().peek(keylet::line(a1, g1["USD"]));
+            auto const sleA2 = ac.view().peek(keylet::line(a2, g1["USD"]));
 
-            sleA1->setFieldAmount(sfBalance, G1["USD"](A1Balance));
-            sleA2->setFieldAmount(sfBalance, G1["USD"](A2Balance));
+            sleA1->setFieldAmount(sfBalance, g1["USD"](a1Balance));
+            sleA2->setFieldAmount(sfBalance, g1["USD"](a2Balance));
 
             ac.view().update(sleA1);
             ac.view().update(sleA2);
@@ -698,38 +701,38 @@ class Invariants_test : public beast::unit_test::suite
         // test: imitating frozen A1 making a payment to A2.
         doInvariantCheck(
             {{"Attempting to move frozen funds"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                changeBalances(A1, A2, ac, -900, -1100);
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                changeBalances(a1, a2, ac, -900, -1100);
                 return true;
             },
             XRPAmount{},
             STTx{ttPAYMENT, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            A1FrozenByIssuer);
+            a1FrozenByIssuer);
 
         // test: imitating deep frozen A1 making a payment to A2.
         doInvariantCheck(
             {{"Attempting to move frozen funds"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                changeBalances(A1, A2, ac, -900, -1100);
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                changeBalances(a1, a2, ac, -900, -1100);
                 return true;
             },
             XRPAmount{},
             STTx{ttPAYMENT, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            A1DeepFrozenByIssuer);
+            a1DeepFrozenByIssuer);
 
         // test: imitating A2 making a payment to deep frozen A1.
         doInvariantCheck(
             {{"Attempting to move frozen funds"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                changeBalances(A1, A2, ac, -1100, -900);
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                changeBalances(a1, a2, ac, -1100, -900);
                 return true;
             },
             XRPAmount{},
             STTx{ttPAYMENT, [](STObject& tx) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            A1DeepFrozenByIssuer);
+            a1DeepFrozenByIssuer);
     }
 
     void
@@ -740,12 +743,12 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"Cannot return non-native STAmount as XRPAmount"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // non-native balance
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                STAmount const nonNative(A2["USD"](51));
+                STAmount const nonNative(a2["USD"](51));
                 sle->setFieldAmount(sfBalance, nonNative);
                 ac.view().update(sle);
                 return true;
@@ -753,14 +756,14 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"incorrect account XRP balance"}, {"XRP net change was positive: 99999999000000001"}},
-            [this](Account const& A1, Account const&, ApplyContext& ac) {
+            [this](Account const& a1, Account const&, ApplyContext& ac) {
                 // balance exceeds genesis amount
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 // Use `drops(1)` to bypass a call to STAmount::canonicalize
                 // with an invalid value
-                sle->setFieldAmount(sfBalance, INITIAL_XRP + drops(1));
+                sle->setFieldAmount(sfBalance, kINITIAL_XRP + drops(1));
                 BEAST_EXPECT(!sle->getFieldAmount(sfBalance).negative());
                 ac.view().update(sle);
                 return true;
@@ -769,9 +772,9 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"incorrect account XRP balance"},
              {"XRP net change of -1000000001 doesn't match fee 0"}},
-            [this](Account const& A1, Account const&, ApplyContext& ac) {
+            [this](Account const& a1, Account const&, ApplyContext& ac) {
                 // balance is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 sle->setFieldAmount(sfBalance, STAmount{1, true});
@@ -794,10 +797,10 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{-1});
 
         doInvariantCheck(
-            {{"fee paid exceeds system limit: "s + to_string(INITIAL_XRP)},
-             {"XRP net change of 0 doesn't match fee "s + to_string(INITIAL_XRP)}},
+            {{"fee paid exceeds system limit: "s + to_string(kINITIAL_XRP)},
+             {"XRP net change of 0 doesn't match fee "s + to_string(kINITIAL_XRP)}},
             [](Account const&, Account const&, ApplyContext&) { return true; },
-            XRPAmount{INITIAL_XRP});
+            XRPAmount{kINITIAL_XRP});
 
         doInvariantCheck(
             {{"fee paid is 20 exceeds fee specified in transaction."},
@@ -814,13 +817,13 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "no bad offers";
 
         doInvariantCheck(
-            {{"offer with a bad amount"}}, [](Account const& A1, Account const&, ApplyContext& ac) {
+            {{"offer with a bad amount"}}, [](Account const& a1, Account const&, ApplyContext& ac) {
                 // offer with negative takerpays
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::offer(A1.id(), (*sle)[sfSequence]));
-                sleNew->setAccountID(sfAccount, A1.id());
+                auto sleNew = std::make_shared<SLE>(keylet::offer(a1.id(), (*sle)[sfSequence]));
+                sleNew->setAccountID(sfAccount, a1.id());
                 sleNew->setFieldU32(sfSequence, (*sle)[sfSequence]);
                 sleNew->setFieldAmount(sfTakerPays, XRP(-1));
                 ac.view().insert(sleNew);
@@ -828,28 +831,28 @@ class Invariants_test : public beast::unit_test::suite
             });
 
         doInvariantCheck(
-            {{"offer with a bad amount"}}, [](Account const& A1, Account const&, ApplyContext& ac) {
+            {{"offer with a bad amount"}}, [](Account const& a1, Account const&, ApplyContext& ac) {
                 // offer with negative takergets
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::offer(A1.id(), (*sle)[sfSequence]));
-                sleNew->setAccountID(sfAccount, A1.id());
+                auto sleNew = std::make_shared<SLE>(keylet::offer(a1.id(), (*sle)[sfSequence]));
+                sleNew->setAccountID(sfAccount, a1.id());
                 sleNew->setFieldU32(sfSequence, (*sle)[sfSequence]);
-                sleNew->setFieldAmount(sfTakerPays, A1["USD"](10));
+                sleNew->setFieldAmount(sfTakerPays, a1["USD"](10));
                 sleNew->setFieldAmount(sfTakerGets, XRP(-1));
                 ac.view().insert(sleNew);
                 return true;
             });
 
         doInvariantCheck(
-            {{"offer with a bad amount"}}, [](Account const& A1, Account const&, ApplyContext& ac) {
+            {{"offer with a bad amount"}}, [](Account const& a1, Account const&, ApplyContext& ac) {
                 // offer XRP to XRP
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::offer(A1.id(), (*sle)[sfSequence]));
-                sleNew->setAccountID(sfAccount, A1.id());
+                auto sleNew = std::make_shared<SLE>(keylet::offer(a1.id(), (*sle)[sfSequence]));
+                sleNew->setAccountID(sfAccount, a1.id());
                 sleNew->setFieldU32(sfSequence, (*sle)[sfSequence]);
                 sleNew->setFieldAmount(sfTakerPays, XRP(10));
                 sleNew->setFieldAmount(sfTakerGets, XRP(11));
@@ -867,12 +870,12 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"XRP net change of -1000000 doesn't match fee 0"},
              {"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // escrow with negative amount
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                auto sleNew = std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
                 sleNew->setFieldAmount(sfAmount, XRP(-1));
                 ac.view().insert(sleNew);
                 return true;
@@ -881,15 +884,15 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"XRP net change was positive: 100000000000000001"},
              {"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // escrow with too-large amount
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                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, INITIAL_XRP + drops(1));
+                sleNew->setFieldAmount(sfAmount, kINITIAL_XRP + drops(1));
                 ac.view().insert(sleNew);
                 return true;
             });
@@ -897,12 +900,12 @@ class Invariants_test : public beast::unit_test::suite
         // IOU < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // escrow with too-little iou
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                auto sleNew = std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
 
                 Issue const usd{Currency(0x5553440000000000), AccountID(0x4985601)};
                 STAmount const amt(usd, -1);
@@ -914,12 +917,12 @@ class Invariants_test : public beast::unit_test::suite
         // IOU bad currency
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // escrow with bad iou currency
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                auto sleNew = std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
 
                 Issue const bad{badCurrency(), AccountID(0x4985601)};
                 STAmount const amt(bad, 1);
@@ -931,12 +934,12 @@ class Invariants_test : public beast::unit_test::suite
         // MPT < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // escrow with too-little mpt
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
-                auto sleNew = std::make_shared<SLE>(keylet::escrow(A1, (*sle)[sfSequence] + 2));
+                auto sleNew = std::make_shared<SLE>(keylet::escrow(a1, (*sle)[sfSequence] + 2));
 
                 MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 STAmount const amt(mpt, -1);
@@ -948,9 +951,9 @@ class Invariants_test : public beast::unit_test::suite
         // MPT OutstandingAmount < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptissuance outstanding is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
@@ -964,9 +967,9 @@ class Invariants_test : public beast::unit_test::suite
         // MPT LockedAmount < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptissuance locked is less than locked
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
@@ -980,9 +983,9 @@ class Invariants_test : public beast::unit_test::suite
         // MPT OutstandingAmount < LockedAmount
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptissuance outstanding is less than locked
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
@@ -997,14 +1000,14 @@ class Invariants_test : public beast::unit_test::suite
         // MPT MPTAmount < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptoken amount is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
                 MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
-                auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A1));
+                auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), a1));
                 sleNew->setFieldU64(sfMPTAmount, -1);
                 ac.view().insert(sleNew);
                 return true;
@@ -1013,14 +1016,14 @@ class Invariants_test : public beast::unit_test::suite
         // MPT LockedAmount < 0
         doInvariantCheck(
             {{"escrow specifies invalid amount"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptoken locked amount is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
                 MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
-                auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A1));
+                auto sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), a1));
                 sleNew->setFieldU64(sfLockedAmount, -1);
                 ac.view().insert(sleNew);
                 return true;
@@ -1038,8 +1041,8 @@ class Invariants_test : public beast::unit_test::suite
             [](Account const&, Account const&, ApplyContext& ac) {
                 // Insert a new account root created by a non-payment into
                 // the view.
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 ac.view().insert(sleNew);
                 return true;
@@ -1050,14 +1053,14 @@ class Invariants_test : public beast::unit_test::suite
             [](Account const&, Account const&, ApplyContext& ac) {
                 // Insert two new account roots into the view.
                 {
-                    Account const A3{"A3"};
-                    Keylet const acctKeylet = keylet::account(A3);
+                    Account const a3{"A3"};
+                    Keylet const acctKeylet = keylet::account(a3);
                     auto const sleA3 = std::make_shared<SLE>(acctKeylet);
                     ac.view().insert(sleA3);
                 }
                 {
-                    Account const A4{"A4"};
-                    Keylet const acctKeylet = keylet::account(A4);
+                    Account const a4{"A4"};
+                    Keylet const acctKeylet = keylet::account(a4);
                     auto const sleA4 = std::make_shared<SLE>(acctKeylet);
                     ac.view().insert(sleA4);
                 }
@@ -1068,8 +1071,8 @@ class Invariants_test : public beast::unit_test::suite
             {{"account created with wrong starting sequence number"}},
             [](Account const&, Account const&, ApplyContext& ac) {
                 // Insert a new account root with the wrong starting sequence.
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 sleNew->setFieldU32(sfSequence, ac.view().seq() + 1);
                 ac.view().insert(sleNew);
@@ -1081,8 +1084,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"pseudo-account created by a wrong transaction type"}},
             [](Account const&, Account const&, ApplyContext& ac) {
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 sleNew->setFieldU32(sfSequence, 0);
                 sleNew->setFieldH256(sfAMMID, uint256(1));
@@ -1096,8 +1099,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"account created with wrong starting sequence number"}},
             [](Account const&, Account const&, ApplyContext& ac) {
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 sleNew->setFieldU32(sfSequence, ac.view().seq());
                 sleNew->setFieldH256(sfAMMID, uint256(1));
@@ -1111,8 +1114,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"pseudo-account created with wrong flags"}},
             [](Account const&, Account const&, ApplyContext& ac) {
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 sleNew->setFieldU32(sfSequence, 0);
                 sleNew->setFieldH256(sfAMMID, uint256(1));
@@ -1126,8 +1129,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {{"pseudo-account created with wrong flags"}},
             [](Account const&, Account const&, ApplyContext& ac) {
-                Account const A3{"A3"};
-                Keylet const acctKeylet = keylet::account(A3);
+                Account const a3{"A3"};
+                Keylet const acctKeylet = keylet::account(a3);
                 auto const sleNew = std::make_shared<SLE>(acctKeylet);
                 sleNew->setFieldU32(sfSequence, 0);
                 sleNew->setFieldH256(sfAMMID, uint256(1));
@@ -1161,7 +1164,7 @@ class Invariants_test : public beast::unit_test::suite
                 STObject newNFToken(*nfTokenTemplate, sfNFToken, [&nftID](STObject& object) {
                     object.setFieldH256(sfNFTokenID, nftID);
                 });
-                ret.push_back(std::move(newNFToken));
+                ret.pushBack(std::move(newNFToken));
                 ++nftID;
             }
             return ret;
@@ -1169,8 +1172,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page has invalid size"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, makeNFTokenIDs(0));
 
                 ac.view().insert(nftPage);
@@ -1179,8 +1182,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page has invalid size"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, makeNFTokenIDs(33));
 
                 ac.view().insert(nftPage);
@@ -1189,11 +1192,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFTs on page are not sorted"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
                 STArray nfTokens = makeNFTokenIDs(2);
                 std::iter_swap(nfTokens.begin(), nfTokens.begin() + 1);
 
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, nfTokens);
 
                 ac.view().insert(nftPage);
@@ -1202,11 +1205,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT contains empty URI"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
                 STArray nfTokens = makeNFTokenIDs(1);
                 nfTokens[0].setFieldVL(sfURI, Blob{});
 
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, nfTokens);
 
                 ac.view().insert(nftPage);
@@ -1215,10 +1218,10 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page is improperly linked"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, makeNFTokenIDs(1));
-                nftPage->setFieldH256(sfPreviousPageMin, keylet::nftpage_max(A1).key);
+                nftPage->setFieldH256(sfPreviousPageMin, keylet::nftpageMax(a1).key);
 
                 ac.view().insert(nftPage);
                 return true;
@@ -1226,10 +1229,10 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page is improperly linked"}},
-            [&makeNFTokenIDs](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+            [&makeNFTokenIDs](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, makeNFTokenIDs(1));
-                nftPage->setFieldH256(sfPreviousPageMin, keylet::nftpage_min(A2).key);
+                nftPage->setFieldH256(sfPreviousPageMin, keylet::nftpageMin(a2).key);
 
                 ac.view().insert(nftPage);
                 return true;
@@ -1237,8 +1240,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page is improperly linked"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
-                auto nftPage = std::make_shared<SLE>(keylet::nftpage_max(A1));
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
+                auto nftPage = std::make_shared<SLE>(keylet::nftpageMax(a1));
                 nftPage->setFieldArray(sfNFTokens, makeNFTokenIDs(1));
                 nftPage->setFieldH256(sfNextPageMin, nftPage->key());
 
@@ -1248,12 +1251,12 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT page is improperly linked"}},
-            [&makeNFTokenIDs](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&makeNFTokenIDs](Account const& a1, Account const& a2, ApplyContext& ac) {
                 STArray nfTokens = makeNFTokenIDs(1);
                 auto nftPage = std::make_shared<SLE>(keylet::nftpage(
-                    keylet::nftpage_max(A1), ++(nfTokens[0].getFieldH256(sfNFTokenID))));
+                    keylet::nftpageMax(a1), ++(nfTokens[0].getFieldH256(sfNFTokenID))));
                 nftPage->setFieldArray(sfNFTokens, nfTokens);
-                nftPage->setFieldH256(sfNextPageMin, keylet::nftpage_max(A2).key);
+                nftPage->setFieldH256(sfNextPageMin, keylet::nftpageMax(a2).key);
 
                 ac.view().insert(nftPage);
                 return true;
@@ -1261,10 +1264,10 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {{"NFT found in incorrect page"}},
-            [&makeNFTokenIDs](Account const& A1, Account const&, ApplyContext& ac) {
+            [&makeNFTokenIDs](Account const& a1, Account const&, ApplyContext& ac) {
                 STArray nfTokens = makeNFTokenIDs(2);
                 auto nftPage = std::make_shared<SLE>(keylet::nftpage(
-                    keylet::nftpage_max(A1), (nfTokens[1].getFieldH256(sfNFTokenID))));
+                    keylet::nftpageMax(a1), (nfTokens[1].getFieldH256(sfNFTokenID))));
                 nftPage->setFieldArray(sfNFTokens, nfTokens);
 
                 ac.view().insert(nftPage);
@@ -1275,15 +1278,15 @@ class Invariants_test : public beast::unit_test::suite
     static std::shared_ptr<SLE>
     createPermissionedDomain(
         ApplyContext& ac,
-        test::jtx::Account const& A1,
-        test::jtx::Account const& A2,
+        test::jtx::Account const& a1,
+        test::jtx::Account const& a2,
         std::uint32_t numCreds = 2,
         std::uint32_t seq = 10)
     {
-        Keylet const pdKeylet = keylet::permissionedDomain(A1.id(), seq);
+        Keylet const pdKeylet = keylet::permissionedDomain(a1.id(), seq);
         auto sle = std::make_shared<SLE>(pdKeylet);
 
-        sle->setAccountID(sfOwner, A1);
+        sle->setAccountID(sfOwner, a1);
         sle->setFieldU32(sfSequence, seq);
 
         if (numCreds != 0u)
@@ -1294,10 +1297,10 @@ class Invariants_test : public beast::unit_test::suite
             for (std::size_t n = 0; n < numCreds; ++n)
             {
                 auto cred = STObject::makeInnerObject(sfCredential);
-                cred.setAccountID(sfIssuer, A2);
+                cred.setAccountID(sfIssuer, a2);
                 auto credType = "cred_type" + std::to_string(n);
                 cred.setFieldVL(sfCredentialType, Slice(credType.c_str(), credType.size()));
-                credentials.push_back(std::move(cred));
+                credentials.pushBack(std::move(cred));
             }
             sle->setFieldArray(sfAcceptedCredentials, credentials);
         }
@@ -1320,8 +1323,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain with no rules."}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                return createPermissionedDomain(ac, A1, A2, 0).get();
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                return createPermissionedDomain(ac, a1, a2, 0).get();
             },
             XRPAmount{},
             STTx{ttPERMISSIONED_DOMAIN_SET, [](STObject&) {}},
@@ -1329,12 +1332,12 @@ class Invariants_test : public beast::unit_test::suite
 
         testcase << "PermissionedDomain 2";
 
-        auto constexpr tooBig = maxPermissionedDomainCredentialsArraySize + 1;
+        auto constexpr kTOO_BIG = kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE + 1;
         doInvariantCheck(
             Env(*this, features),
-            {{"permissioned domain bad credentials size " + std::to_string(tooBig)}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                return !!createPermissionedDomain(ac, A1, A2, tooBig);
+            {{"permissioned domain bad credentials size " + std::to_string(kTOO_BIG)}},
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                return !!createPermissionedDomain(ac, a1, a2, kTOO_BIG);
             },
             XRPAmount{},
             STTx{ttPERMISSIONED_DOMAIN_SET, [](STObject&) {}},
@@ -1344,17 +1347,17 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain credentials aren't sorted"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto slePd = createPermissionedDomain(ac, A1, A2, 0);
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto slePd = createPermissionedDomain(ac, a1, a2, 0);
 
                 STArray credentials(sfAcceptedCredentials, 2);
                 for (std::size_t n = 0; n < 2; ++n)
                 {
                     auto cred = STObject::makeInnerObject(sfCredential);
-                    cred.setAccountID(sfIssuer, A2);
+                    cred.setAccountID(sfIssuer, a2);
                     auto credType = std::string("cred_type") + std::to_string(9 - n);
                     cred.setFieldVL(sfCredentialType, Slice(credType.c_str(), credType.size()));
-                    credentials.push_back(std::move(cred));
+                    credentials.pushBack(std::move(cred));
                 }
                 slePd->setFieldArray(sfAcceptedCredentials, credentials);
                 ac.view().update(slePd);
@@ -1368,16 +1371,16 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain credentials aren't unique"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto slePd = createPermissionedDomain(ac, A1, A2, 0);
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto slePd = createPermissionedDomain(ac, a1, a2, 0);
 
                 STArray credentials(sfAcceptedCredentials, 2);
                 for (std::size_t n = 0; n < 2; ++n)
                 {
                     auto cred = STObject::makeInnerObject(sfCredential);
-                    cred.setAccountID(sfIssuer, A2);
+                    cred.setAccountID(sfIssuer, a2);
                     cred.setFieldVL(sfCredentialType, Slice("cred_type", 9));
-                    credentials.push_back(std::move(cred));
+                    credentials.pushBack(std::move(cred));
                 }
                 slePd->setFieldArray(sfAcceptedCredentials, credentials);
                 ac.view().update(slePd);
@@ -1391,9 +1394,9 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain with no rules."}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create PD
-                auto slePd = createPermissionedDomain(ac, A1, A2);
+                auto slePd = createPermissionedDomain(ac, a1, a2);
 
                 // update PD with empty rules
                 {
@@ -1411,22 +1414,22 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "PermissionedDomain Set 2";
         doInvariantCheck(
             Env(*this, features),
-            {{"permissioned domain bad credentials size " + std::to_string(tooBig)}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            {{"permissioned domain bad credentials size " + std::to_string(kTOO_BIG)}},
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create PD
-                auto slePd = createPermissionedDomain(ac, A1, A2);
+                auto slePd = createPermissionedDomain(ac, a1, a2);
 
                 // update PD
                 {
-                    STArray credentials(sfAcceptedCredentials, tooBig);
+                    STArray credentials(sfAcceptedCredentials, kTOO_BIG);
 
-                    for (std::size_t n = 0; n < tooBig; ++n)
+                    for (std::size_t n = 0; n < kTOO_BIG; ++n)
                     {
                         auto cred = STObject::makeInnerObject(sfCredential);
-                        cred.setAccountID(sfIssuer, A2);
+                        cred.setAccountID(sfIssuer, a2);
                         auto credType = "cred_type2" + std::to_string(n);
                         cred.setFieldVL(sfCredentialType, Slice(credType.c_str(), credType.size()));
-                        credentials.push_back(std::move(cred));
+                        credentials.pushBack(std::move(cred));
                     }
 
                     slePd->setFieldArray(sfAcceptedCredentials, credentials);
@@ -1443,9 +1446,9 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain credentials aren't sorted"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create PD
-                auto slePd = createPermissionedDomain(ac, A1, A2);
+                auto slePd = createPermissionedDomain(ac, a1, a2);
 
                 // update PD
                 {
@@ -1453,10 +1456,10 @@ class Invariants_test : public beast::unit_test::suite
                     for (std::size_t n = 0; n < 2; ++n)
                     {
                         auto cred = STObject::makeInnerObject(sfCredential);
-                        cred.setAccountID(sfIssuer, A2);
+                        cred.setAccountID(sfIssuer, a2);
                         auto credType = std::string("cred_type2") + std::to_string(9 - n);
                         cred.setFieldVL(sfCredentialType, Slice(credType.c_str(), credType.size()));
-                        credentials.push_back(std::move(cred));
+                        credentials.pushBack(std::move(cred));
                     }
 
                     slePd->setFieldArray(sfAcceptedCredentials, credentials);
@@ -1473,9 +1476,9 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"permissioned domain credentials aren't unique"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // create PD
-                auto slePd = createPermissionedDomain(ac, A1, A2);
+                auto slePd = createPermissionedDomain(ac, a1, a2);
 
                 // update PD
                 {
@@ -1483,9 +1486,9 @@ class Invariants_test : public beast::unit_test::suite
                     for (std::size_t n = 0; n < 2; ++n)
                     {
                         auto cred = STObject::makeInnerObject(sfCredential);
-                        cred.setAccountID(sfIssuer, A2);
+                        cred.setAccountID(sfIssuer, a2);
                         cred.setFieldVL(sfCredentialType, Slice("cred_type", 9));
-                        credentials.push_back(std::move(cred));
+                        credentials.pushBack(std::move(cred));
                     }
                     slePd->setFieldArray(sfAcceptedCredentials, credentials);
                     ac.view().update(slePd);
@@ -1514,9 +1517,9 @@ class Invariants_test : public beast::unit_test::suite
             doInvariantCheck(
                 Env(*this, features),
                 fixPDEnabled ? badMoreThan1 : emptyV,
-                [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    createPermissionedDomain(ac, A1, A2);
-                    createPermissionedDomain(ac, A1, A2, 2, 11);
+                [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    createPermissionedDomain(ac, a1, a2);
+                    createPermissionedDomain(ac, a1, a2, 2, 11);
                     return true;
                 },
                 XRPAmount{},
@@ -1529,19 +1532,19 @@ class Invariants_test : public beast::unit_test::suite
 
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
-            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
+            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 fixPDEnabled ? badMoreThan1 : emptyV,
                 [&pd1, &pd2](Account const&, Account const&, ApplyContext& ac) {
                     auto sle1 = ac.view().peek({ltPERMISSIONED_DOMAIN, pd1});
@@ -1571,19 +1574,19 @@ class Invariants_test : public beast::unit_test::suite
 
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
-            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
+            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 Env(*this, features),
-                A1,
-                A2,
+                a1,
+                a2,
                 fixPDEnabled ? badNoDomains : emptyV,
                 [](Account const&, Account const&, ApplyContext&) { return true; },
                 XRPAmount{},
@@ -1596,18 +1599,18 @@ class Invariants_test : public beast::unit_test::suite
 
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 fixPDEnabled ? badDeleted : emptyV,
                 [&pd1](Account const&, Account const&, ApplyContext& ac) {
                     auto sle1 = ac.view().peek({ltPERMISSIONED_DOMAIN, pd1});
@@ -1624,8 +1627,8 @@ class Invariants_test : public beast::unit_test::suite
             doInvariantCheck(
                 Env(*this, features),
                 fixPDEnabled ? badNotDeleted : emptyV,
-                [](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    createPermissionedDomain(ac, A1, A2);
+                [](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    createPermissionedDomain(ac, a1, a2);
                     return true;
                 },
                 XRPAmount{},
@@ -1638,8 +1641,8 @@ class Invariants_test : public beast::unit_test::suite
 
             doInvariantCheck(
                 fixPDEnabled ? badTx : emptyV,
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    createPermissionedDomain(ac, A1, A2);
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    createPermissionedDomain(ac, a1, a2);
                     return true;
                 },
                 XRPAmount{},
@@ -1711,7 +1714,7 @@ class Invariants_test : public beast::unit_test::suite
         {
             doInvariantCheck(
                 {{mod.expectedFailure}},
-                [&](Account const& A1, Account const&, ApplyContext& ac) {
+                [&](Account const& a1, Account const&, ApplyContext& ac) {
                     auto sle = ac.view().peek(keylet::account(pseudoAccountID));
                     if (!sle)
                         return false;
@@ -1732,7 +1735,7 @@ class Invariants_test : public beast::unit_test::suite
                 continue;
             doInvariantCheck(
                 {{"pseudo-account has 2 pseudo-account fields set"}},
-                [&](Account const& A1, Account const&, ApplyContext& ac) {
+                [&](Account const& a1, Account const&, ApplyContext& ac) {
                     auto sle = ac.view().peek(keylet::account(pseudoAccountID));
                     if (!sle)
                         return false;
@@ -1756,8 +1759,8 @@ class Invariants_test : public beast::unit_test::suite
             {{"pseudo-account has 0 pseudo-account fields set"},
              {"pseudo-account sequence changed"},
              {"pseudo-account flags are not set"}},
-            [&](Account const& A1, Account const&, ApplyContext& ac) {
-                auto sle = ac.view().peek(keylet::account(A1.id()));
+            [&](Account const& a1, Account const&, ApplyContext& ac) {
+                auto sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
                 sle->at(sfSequence) = 0;
@@ -1769,8 +1772,8 @@ class Invariants_test : public beast::unit_test::suite
     static std::pair<std::uint32_t, uint256>
     createPermissionedDomainEnv(
         test::jtx::Env& env,
-        test::jtx::Account const& A1,
-        test::jtx::Account const& A2,
+        test::jtx::Account const& a1,
+        test::jtx::Account const& a2,
         std::uint32_t numCreds = 2)
     {
         using namespace test::jtx;
@@ -1780,11 +1783,11 @@ class Invariants_test : public beast::unit_test::suite
         for (std::size_t n = 0; n < numCreds; ++n)
         {
             auto credType = "cred_type" + std::to_string(n);
-            credentials.push_back({A2, credType});
+            credentials.push_back({a2, credType});
         }
 
-        std::uint32_t const seq = env.seq(A1);
-        env(pdomain::setTx(A1, credentials));
+        std::uint32_t const seq = env.seq(a1);
+        env(pdomain::setTx(a1, credentials));
         uint256 const key = pdomain::getNewDomain(env.meta());
 
         // std::cout << "PD, acc: " << A1.id() << ", seq: " << seq << ", k: " <<
@@ -1806,11 +1809,11 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"domain doesn't exist"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
-                Keylet const offerKey = keylet::offer(A1.id(), 10);
+            [](Account const& a1, Account const&, ApplyContext& ac) {
+                Keylet const offerKey = keylet::offer(a1.id(), 10);
                 auto sleOffer = std::make_shared<SLE>(offerKey);
-                sleOffer->setAccountID(sfAccount, A1);
-                sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                sleOffer->setAccountID(sfAccount, a1);
+                sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                 sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                 ac.view().insert(sleOffer);
                 return true;
@@ -1823,8 +1826,8 @@ class Invariants_test : public beast::unit_test::suite
                         sfDomainID,
                         uint256{"F10D0CC9A0F9A3CBF585B80BE09A186483668FDBDD39AA7E33"
                                 "70F3649CE134E5"});
-                    Account const A1{"A1"};
-                    tx.setFieldAmount(sfTakerPays, A1["USD"](10));
+                    Account const a1{"A1"};
+                    tx.setFieldAmount(sfTakerPays, a1["USD"](10));
                     tx.setFieldAmount(sfTakerGets, XRP(1));
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED});
@@ -1833,16 +1836,16 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             Env(*this, features),
             {{"hybrid offer is malformed"}},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                Keylet const offerKey = keylet::offer(A2.id(), 10);
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                Keylet const offerKey = keylet::offer(a2.id(), 10);
                 auto sleOffer = std::make_shared<SLE>(offerKey);
-                sleOffer->setAccountID(sfAccount, A2);
-                sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                sleOffer->setAccountID(sfAccount, a2);
+                sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                 sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                 sleOffer->setFlag(lsfHybrid);
 
                 STArray bookArr;
-                bookArr.push_back(STObject::makeInnerObject(sfBook));
+                bookArr.pushBack(STObject::makeInnerObject(sfBook));
                 sleOffer->setFieldArray(sfAdditionalBooks, bookArr);
                 ac.view().insert(sleOffer);
                 return true;
@@ -1855,31 +1858,31 @@ class Invariants_test : public beast::unit_test::suite
         {
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 {{"hybrid offer is malformed"}},
-                [&pd1](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    Keylet const offerKey = keylet::offer(A2.id(), 10);
+                [&pd1](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    Keylet const offerKey = keylet::offer(a2.id(), 10);
                     auto sleOffer = std::make_shared<SLE>(offerKey);
-                    sleOffer->setAccountID(sfAccount, A2);
-                    sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                    sleOffer->setAccountID(sfAccount, a2);
+                    sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                     sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                     sleOffer->setFlag(lsfHybrid);
                     sleOffer->setFieldH256(sfDomainID, pd1);
 
                     STArray bookArr;
-                    bookArr.push_back(STObject::makeInnerObject(sfBook));
-                    bookArr.push_back(STObject::makeInnerObject(sfBook));
+                    bookArr.pushBack(STObject::makeInnerObject(sfBook));
+                    bookArr.pushBack(STObject::makeInnerObject(sfBook));
                     sleOffer->setFieldArray(sfAdditionalBooks, bookArr);
                     ac.view().insert(sleOffer);
                     return true;
@@ -1893,25 +1896,25 @@ class Invariants_test : public beast::unit_test::suite
         {
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 fixS313Enabled ? std::vector<std::string>{{"hybrid offer is malformed"}}
                                : std::vector<std::string>{},
-                [&pd1](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    Keylet const offerKey = keylet::offer(A2.id(), 10);
+                [&pd1](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    Keylet const offerKey = keylet::offer(a2.id(), 10);
                     auto sleOffer = std::make_shared<SLE>(offerKey);
-                    sleOffer->setAccountID(sfAccount, A2);
-                    sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                    sleOffer->setAccountID(sfAccount, a2);
+                    sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                     sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                     sleOffer->setFlag(lsfHybrid);
                     sleOffer->setFieldH256(sfDomainID, pd1);
@@ -1932,24 +1935,24 @@ class Invariants_test : public beast::unit_test::suite
         {
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 {{"hybrid offer is malformed"}},
-                [&pd1](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    Keylet const offerKey = keylet::offer(A2.id(), 10);
+                [&pd1](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    Keylet const offerKey = keylet::offer(a2.id(), 10);
                     auto sleOffer = std::make_shared<SLE>(offerKey);
-                    sleOffer->setAccountID(sfAccount, A2);
-                    sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                    sleOffer->setAccountID(sfAccount, a2);
+                    sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                     sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                     sleOffer->setFlag(lsfHybrid);
                     sleOffer->setFieldH256(sfDomainID, pd1);
@@ -1964,25 +1967,25 @@ class Invariants_test : public beast::unit_test::suite
         {
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
-            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
+            [[maybe_unused]] auto [seq2, pd2] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 {{"transaction consumed wrong domains"}},
-                [&pd1](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    Keylet const offerKey = keylet::offer(A2.id(), 10);
+                [&pd1](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    Keylet const offerKey = keylet::offer(a2.id(), 10);
                     auto sleOffer = std::make_shared<SLE>(offerKey);
-                    sleOffer->setAccountID(sfAccount, A2);
-                    sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                    sleOffer->setAccountID(sfAccount, a2);
+                    sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                     sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                     sleOffer->setFieldH256(sfDomainID, pd1);
                     ac.view().insert(sleOffer);
@@ -1991,9 +1994,9 @@ class Invariants_test : public beast::unit_test::suite
                 XRPAmount{},
                 STTx{
                     ttOFFER_CREATE,
-                    [&pd2, &A1](STObject& tx) {
+                    [&pd2, &a1](STObject& tx) {
                         tx.setFieldH256(sfDomainID, pd2);
-                        tx.setFieldAmount(sfTakerPays, A1["USD"](10));
+                        tx.setFieldAmount(sfTakerPays, a1["USD"](10));
                         tx.setFieldAmount(sfTakerGets, XRP(1));
                     }},
                 {tecINVARIANT_FAILED, tecINVARIANT_FAILED});
@@ -2002,24 +2005,24 @@ class Invariants_test : public beast::unit_test::suite
         {
             Env env1(*this, features);
 
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            env1.fund(XRP(1000), A1, A2);
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            env1.fund(XRP(1000), a1, a2);
             env1.close();
 
-            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, A1, A2);
+            [[maybe_unused]] auto [seq1, pd1] = createPermissionedDomainEnv(env1, a1, a2);
             env1.close();
 
             doInvariantCheck(
                 std::move(env1),
-                A1,
-                A2,
+                a1,
+                a2,
                 {{"domain transaction affected regular offers"}},
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    Keylet const offerKey = keylet::offer(A2.id(), 10);
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    Keylet const offerKey = keylet::offer(a2.id(), 10);
                     auto sleOffer = std::make_shared<SLE>(offerKey);
-                    sleOffer->setAccountID(sfAccount, A2);
-                    sleOffer->setFieldAmount(sfTakerPays, A1["USD"](10));
+                    sleOffer->setAccountID(sfAccount, a2);
+                    sleOffer->setFieldAmount(sfTakerPays, a1["USD"](10));
                     sleOffer->setFieldAmount(sfTakerGets, XRP(1));
                     ac.view().insert(sleOffer);
                     return true;
@@ -2028,9 +2031,9 @@ class Invariants_test : public beast::unit_test::suite
                 STTx{
                     ttOFFER_CREATE,
                     [&](STObject& tx) {
-                        Account const A1{"A1"};
+                        Account const a1{"A1"};
                         tx.setFieldH256(sfDomainID, pd1);
-                        tx.setFieldAmount(sfTakerPays, A1["USD"](10));
+                        tx.setFieldAmount(sfTakerPays, a1["USD"](10));
                         tx.setFieldAmount(sfTakerGets, XRP(1));
                     }},
                 {tecINVARIANT_FAILED, tecINVARIANT_FAILED});
@@ -2056,7 +2059,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(increment));
+        env(set(a, vaultID), Fee(kINCREMENT));
 
         return loanBrokerKeylet;
     };
@@ -2095,7 +2098,7 @@ class Invariants_test : public beast::unit_test::suite
             {
                 doInvariantCheck(
                     {{"changed an unchangeable field"}},
-                    [&](Account const& A1, Account const&, ApplyContext& ac) {
+                    [&](Account const& a1, Account const&, ApplyContext& ac) {
                         auto sle = ac.view().peek(loanBrokerKeylet);
                         if (!sle)
                             return false;
@@ -2122,8 +2125,8 @@ class Invariants_test : public beast::unit_test::suite
             {
                 doInvariantCheck(
                     {{"changed an unchangeable field"}},
-                    [&](Account const& A1, Account const&, ApplyContext& ac) {
-                        auto sle = ac.view().peek(keylet::account(A1.id()));
+                    [&](Account const& a1, Account const&, ApplyContext& ac) {
+                        auto sle = ac.view().peek(keylet::account(a1.id()));
                         if (!sle)
                             return false;
                         mod(sle);
@@ -2160,7 +2163,7 @@ class Invariants_test : public beast::unit_test::suite
                         return iouAsset;
                     }
                     case Asset::MPT: {
-                        MPTTester mptt{env, issuer, mptInitNoFund};
+                        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
                         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                         PrettyAsset const mptAsset = mptt.issuanceID();
                         mptt.authorize({.account = alice});
@@ -2185,7 +2188,7 @@ class Invariants_test : public beast::unit_test::suite
             // Ensure the test scenarios are set up completely. The test cases
             // will need to recompute any of these values it needs for itself
             // rather than trying to return a bunch of items
-            auto setupTest = [&, this](Account const& A1, Account const&, ApplyContext& ac)
+            auto setupTest = [&, this](Account const& a1, Account const&, ApplyContext& ac)
                 -> std::optional<std::pair<SLE::pointer, SLE::pointer>> {
                 if (loanBrokerKeylet.type != ltLOAN_BROKER)
                     return {};
@@ -2226,8 +2229,8 @@ class Invariants_test : public beast::unit_test::suite
             doInvariantCheck(
                 {{"Loan Broker with zero OwnerCount has multiple directory "
                   "pages"}},
-                [&setupTest, this](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    auto test = setupTest(A1, A2, ac);
+                [&setupTest, this](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    auto test = setupTest(a1, a2, ac);
                     if (!test || !test->first || !test->second)
                         return false;
 
@@ -2256,8 +2259,8 @@ class Invariants_test : public beast::unit_test::suite
             doInvariantCheck(
                 {{"Loan Broker with zero OwnerCount has multiple indexes in "
                   "the Directory root"}},
-                [&setupTest](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    auto test = setupTest(A1, A2, ac);
+                [&setupTest](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    auto test = setupTest(a1, a2, ac);
                     if (!test || !test->first || !test->second)
                         return false;
 
@@ -2280,8 +2283,8 @@ class Invariants_test : public beast::unit_test::suite
 
             doInvariantCheck(
                 {{"Loan Broker directory corrupt"}},
-                [&setupTest](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    auto test = setupTest(A1, A2, ac);
+                [&setupTest](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    auto test = setupTest(a1, a2, ac);
                     if (!test || !test->first || !test->second)
                         return false;
 
@@ -2307,8 +2310,8 @@ class Invariants_test : public beast::unit_test::suite
             doInvariantCheck(
                 {{"Loan Broker with zero OwnerCount has an unexpected entry in "
                   "the directory"}},
-                [&setupTest](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    auto test = setupTest(A1, A2, ac);
+                [&setupTest](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    auto test = setupTest(a1, a2, ac);
                     if (!test || !test->first || !test->second)
                         return false;
 
@@ -2331,7 +2334,7 @@ class Invariants_test : public beast::unit_test::suite
 
             doInvariantCheck(
                 {{"Loan Broker sequence number decreased"}},
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                     if (loanBrokerKeylet.type != ltLOAN_BROKER)
                         return false;
                     auto sleBroker = ac.view().peek(loanBrokerKeylet);
@@ -2427,7 +2430,7 @@ class Invariants_test : public beast::unit_test::suite
             std::optional<AccountAmount> accountShares = std::nullopt;
             // NOLINTEND(readability-redundant-member-init)
         };
-        auto constexpr adjust = [&](ApplyView& ac, xrpl::Keylet keylet, Adjustments args) {
+        auto constexpr kADJUST = [&](ApplyView& ac, xrpl::Keylet keylet, Adjustments args) {
             auto sleVault = ac.peek(keylet);
             if (!sleVault)
                 return false;
@@ -2526,7 +2529,7 @@ class Invariants_test : public beast::unit_test::suite
             return true;
         };
 
-        constexpr auto args = [](AccountID id, int adjustment, auto fn) -> Adjustments {
+        constexpr auto kARGS = [](AccountID id, int adjustment, auto fn) -> Adjustments {
             Adjustments sample = {
                 .assetsTotal = adjustment,
                 .assetsAvailable = adjustment,
@@ -2541,24 +2544,24 @@ class Invariants_test : public beast::unit_test::suite
             return sample;
         };
 
-        Account const A3{"A3"};
-        Account const A4{"A4"};
-        auto const precloseXrp = [&](Account const& A1, Account const& A2, Env& env) -> bool {
-            env.fund(XRP(1000), A3, A4);
+        Account const a3{"A3"};
+        Account const a4{"A4"};
+        auto const precloseXrp = [&](Account const& a1, Account const& a2, Env& env) -> bool {
+            env.fund(XRP(1000), a3, a4);
             Vault const vault{env};
-            auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+            auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
             env(tx);
-            env(vault.deposit({.depositor = A1, .id = keylet.key, .amount = XRP(10)}));
-            env(vault.deposit({.depositor = A2, .id = keylet.key, .amount = XRP(10)}));
-            env(vault.deposit({.depositor = A3, .id = keylet.key, .amount = XRP(10)}));
+            env(vault.deposit({.depositor = a1, .id = keylet.key, .amount = XRP(10)}));
+            env(vault.deposit({.depositor = a2, .id = keylet.key, .amount = XRP(10)}));
+            env(vault.deposit({.depositor = a3, .id = keylet.key, .amount = XRP(10)}));
             return true;
         };
 
         testcase << "Vault general checks";
         doInvariantCheck(
             {"vault deletion succeeded without deleting a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2568,17 +2571,17 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_DELETE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault updated by a wrong transaction type"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2588,17 +2591,17 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttPAYMENT, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault updated by a wrong transaction type"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2608,21 +2611,21 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttPAYMENT, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault updated by a wrong transaction type"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const sequence = ac.view().seq();
-                auto const vaultKeylet = keylet::vault(A1.id(), sequence);
+                auto const vaultKeylet = keylet::vault(a1.id(), sequence);
                 auto sleVault = std::make_shared<SLE>(vaultKeylet);
                 auto const vaultPage = ac.view().dirInsert(
-                    keylet::ownerDir(A1.id()), sleVault->key(), describeOwnerDir(A1.id()));
+                    keylet::ownerDir(a1.id()), sleVault->key(), describeOwnerDir(a1.id()));
                 sleVault->setFieldU64(sfOwnerNode, *vaultPage);
                 ac.view().insert(sleVault);
                 return true;
@@ -2633,8 +2636,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"vault deleted by a wrong transaction type"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2644,25 +2647,25 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation updated more than single vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 {
-                    auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+                    auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                     auto sleVault = ac.view().peek(keylet);
                     if (!sleVault)
                         return false;
                     ac.view().erase(sleVault);
                 }
                 {
-                    auto const keylet = keylet::vault(A2.id(), ac.view().seq());
+                    auto const keylet = keylet::vault(a2.id(), ac.view().seq());
                     auto sleVault = ac.view().peek(keylet);
                     if (!sleVault)
                         return false;
@@ -2673,14 +2676,14 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_DELETE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
                 {
-                    auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                    auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                     env(tx);
                 }
                 {
-                    auto [tx, _] = vault.create({.owner = A2, .asset = xrpIssue()});
+                    auto [tx, _] = vault.create({.owner = a2, .asset = xrpIssue()});
                     env(tx);
                 }
                 return true;
@@ -2688,18 +2691,18 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"vault operation updated more than single vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const sequence = ac.view().seq();
-                auto const insertVault = [&](Account const A) {
-                    auto const vaultKeylet = keylet::vault(A.id(), sequence);
+                auto const insertVault = [&](Account const a) {
+                    auto const vaultKeylet = keylet::vault(a.id(), sequence);
                     auto sleVault = std::make_shared<SLE>(vaultKeylet);
                     auto const vaultPage = ac.view().dirInsert(
-                        keylet::ownerDir(A.id()), sleVault->key(), describeOwnerDir(A.id()));
+                        keylet::ownerDir(a.id()), sleVault->key(), describeOwnerDir(a.id()));
                     sleVault->setFieldU64(sfOwnerNode, *vaultPage);
                     ac.view().insert(sleVault);
                 };
-                insertVault(A1);
-                insertVault(A2);
+                insertVault(a1);
+                insertVault(a2);
                 return true;
             },
             XRPAmount{},
@@ -2708,8 +2711,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"deleted vault must also delete shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2719,9 +2722,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_DELETE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -2730,8 +2733,8 @@ class Invariants_test : public beast::unit_test::suite
             {"deleted vault must have no shares outstanding",
              "deleted vault must have no assets outstanding",
              "deleted vault must have no assets available"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2745,18 +2748,18 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_DELETE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
-                env(vault.deposit({.depositor = A1, .id = keylet.key, .amount = XRP(10)}));
+                env(vault.deposit({.depositor = a1, .id = keylet.key, .amount = XRP(10)}));
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2777,73 +2780,73 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) { return true; },
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) { return true; },
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) { return true; },
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) { return true; },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) { return true; },
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) { return true; },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) { return true; },
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) { return true; },
             XRPAmount{},
             STTx{ttVAULT_CLAWBACK, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault operation succeeded without modifying a vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) { return true; },
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) { return true; },
             XRPAmount{},
             STTx{ttVAULT_DELETE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"updated vault must have shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2859,9 +2862,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject&) {}},
             {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, _] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, _] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -2869,8 +2872,8 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {"vault operation succeeded without updating shares",
              "assets available must not be greater than assets outstanding"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2881,11 +2884,11 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
-                env(vault.deposit({.depositor = A1, .id = keylet.key, .amount = XRP(10)}));
+                env(vault.deposit({.depositor = a1, .id = keylet.key, .amount = XRP(10)}));
                 return true;
             });
 
@@ -2897,8 +2900,8 @@ class Invariants_test : public beast::unit_test::suite
              "assets available must be positive",
              "assets available must not be greater than assets outstanding",
              "assets outstanding must be positive"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2909,17 +2912,17 @@ class Invariants_test : public beast::unit_test::suite
                 ac.view().update(slePseudoAccount);
 
                 // Move 10 drops to A4 to enforce total XRP balance
-                auto sleA4 = ac.view().peek(keylet::account(A4.id()));
+                auto sleA4 = ac.view().peek(keylet::account(a4.id()));
                 if (!sleA4)
                     return false;
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {
-                                  sample.assetsAvailable = (DROPS_PER_XRP * -100).value();
-                                  sample.assetsTotal = (DROPS_PER_XRP * -200).value();
-                                  sample.sharesTotal = -1;
-                              }));
+                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();
+                                   sample.sharesTotal = -1;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject& tx) {}},
@@ -2929,8 +2932,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"violation of vault immutable data"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2945,12 +2948,12 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"violation of vault immutable data"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
-                sleVault->setAccountID(sfAccount, A2.id());
+                sleVault->setAccountID(sfAccount, a2.id());
                 ac.view().update(sleVault);
                 return true;
             },
@@ -2961,8 +2964,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"violation of vault immutable data"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -2978,12 +2981,12 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {"vault transaction must not change loss unrealized",
              "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 adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {
-                                  sample.lossUnrealized = 13;
-                                  sample.assetsTotal = 20;
-                              }));
+            [&](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) {
+                                   sample.lossUnrealized = 13;
+                                   sample.assetsTotal = 20;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject& tx) {}},
@@ -2995,11 +2998,11 @@ class Invariants_test : public beast::unit_test::suite
             {"loss unrealized must not exceed the difference "
              "between assets outstanding and available",
              "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 adjust(ac.view(), keylet, args(A2.id(), 100, [&](Adjustments& sample) {
-                                  sample.lossUnrealized = 13;
-                              }));
+            [&](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) {
+                                   sample.lossUnrealized = 13;
+                               }));
             },
             XRPAmount{},
             STTx{
@@ -3010,11 +3013,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {
-                                  sample.assetsMaximum = 1;
-                              }));
+            [&](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) {
+                                   sample.assetsMaximum = 1;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject& tx) {}},
@@ -3024,11 +3027,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"assets maximum must be positive"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {
-                                  sample.assetsMaximum = -1;
-                              }));
+            [&](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) {
+                                   sample.assetsMaximum = -1;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_SET, [](STObject& tx) {}},
@@ -3040,8 +3043,8 @@ class Invariants_test : public beast::unit_test::suite
             {"set must not change shares outstanding",
              "updated zero sized vault must have no assets outstanding",
              "updated zero sized vault must have no assets available"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3061,8 +3064,8 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"updated shares must not exceed maximum"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3072,7 +3075,7 @@ class Invariants_test : public beast::unit_test::suite
                 (*sleShares)[sfMaximumAmount] = 10;
                 ac.view().update(sleShares);
 
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [](Adjustments&) {}));
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [](Adjustments&) {}));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject&) {}},
@@ -3082,9 +3085,9 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"updated shares must not exceed maximum"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                adjust(ac.view(), keylet, args(A2.id(), 10, [](Adjustments&) {}));
+            [&](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&) {}));
 
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
@@ -3092,7 +3095,7 @@ class Invariants_test : public beast::unit_test::suite
                 auto sleShares = ac.view().peek(keylet::mptIssuance((*sleVault)[sfShareMPTID]));
                 if (!sleShares)
                     return false;
-                (*sleShares)[sfOutstandingAmount] = maxMPTokenAmount + 1;
+                (*sleShares)[sfOutstandingAmount] = kMAX_MP_TOKEN_AMOUNT + 1;
                 ac.view().update(sleShares);
                 return true;
             },
@@ -3109,8 +3112,8 @@ class Invariants_test : public beast::unit_test::suite
                 "updated zero sized vault must have no assets outstanding",
                 "create operation must not have updated a vault",
             },
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3121,9 +3124,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -3135,8 +3138,8 @@ class Invariants_test : public beast::unit_test::suite
                 "assets available must not be greater than assets outstanding",
                 "create operation must not have updated a vault",
             },
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3147,9 +3150,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -3162,8 +3165,8 @@ class Invariants_test : public beast::unit_test::suite
                 "vault transaction must not change loss unrealized",
                 "create operation must not have updated a vault",
             },
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3174,9 +3177,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -3186,8 +3189,8 @@ class Invariants_test : public beast::unit_test::suite
                 "created vault must be empty",
                 "create operation must not have updated a vault",
             },
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3202,9 +3205,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -3214,8 +3217,8 @@ class Invariants_test : public beast::unit_test::suite
                 "assets maximum must be positive",
                 "create operation must not have updated a vault",
             },
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3226,9 +3229,9 @@ class Invariants_test : public beast::unit_test::suite
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
@@ -3238,8 +3241,8 @@ class Invariants_test : public beast::unit_test::suite
              "shares issuer and vault pseudo-account must be the same",
              "shares issuer must be a pseudo-account",
              "shares issuer pseudo-account must point back to the vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
                 auto sleVault = ac.view().peek(keylet);
                 if (!sleVault)
                     return false;
@@ -3247,31 +3250,31 @@ class Invariants_test : public beast::unit_test::suite
                 if (!sleShares)
                     return false;
                 ac.view().update(sleVault);
-                (*sleShares)[sfIssuer] = A1.id();
+                (*sleShares)[sfIssuer] = a1.id();
                 ac.view().update(sleShares);
                 return true;
             },
             XRPAmount{},
             STTx{ttVAULT_CREATE, [](STObject&) {}},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-            [&](Account const& A1, Account const& A2, Env& env) {
+            [&](Account const& a1, Account const& a2, Env& env) {
                 Vault const vault{env};
-                auto [tx, keylet] = vault.create({.owner = A1, .asset = xrpIssue()});
+                auto [tx, keylet] = vault.create({.owner = a1, .asset = xrpIssue()});
                 env(tx);
                 return true;
             });
 
         doInvariantCheck(
             {"vault created by a wrong transaction type", "account root created illegally"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // The code below will create a valid vault with (almost) all
                 // the invariants holding. Except one: it is created by the
                 // wrong transaction type.
                 auto const sequence = ac.view().seq();
-                auto const vaultKeylet = keylet::vault(A1.id(), sequence);
+                auto const vaultKeylet = keylet::vault(a1.id(), sequence);
                 auto sleVault = std::make_shared<SLE>(vaultKeylet);
                 auto const vaultPage = ac.view().dirInsert(
-                    keylet::ownerDir(A1.id()), sleVault->key(), describeOwnerDir(A1.id()));
+                    keylet::ownerDir(a1.id()), sleVault->key(), describeOwnerDir(a1.id()));
                 sleVault->setFieldU64(sfOwnerNode, *vaultPage);
 
                 auto pseudoId = pseudoAccountAddress(ac.view(), vaultKeylet.key);
@@ -3304,12 +3307,12 @@ class Invariants_test : public beast::unit_test::suite
                 sleVault->at(sfAccount) = pseudoId;
                 sleVault->at(sfFlags) = 0;
                 sleVault->at(sfSequence) = sequence;
-                sleVault->at(sfOwner) = A1.id();
+                sleVault->at(sfOwner) = a1.id();
                 sleVault->at(sfAssetsTotal) = Number(0);
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = vaultStrategyFirstComeFirstServe;
+                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3322,12 +3325,12 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {"shares issuer and vault pseudo-account must be the same",
              "shares issuer pseudo-account must point back to the vault"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const sequence = ac.view().seq();
-                auto const vaultKeylet = keylet::vault(A1.id(), sequence);
+                auto const vaultKeylet = keylet::vault(a1.id(), sequence);
                 auto sleVault = std::make_shared<SLE>(vaultKeylet);
                 auto const vaultPage = ac.view().dirInsert(
-                    keylet::ownerDir(A1.id()), sleVault->key(), describeOwnerDir(A1.id()));
+                    keylet::ownerDir(a1.id()), sleVault->key(), describeOwnerDir(a1.id()));
                 sleVault->setFieldU64(sfOwnerNode, *vaultPage);
 
                 auto pseudoId = pseudoAccountAddress(ac.view(), vaultKeylet.key);
@@ -3361,15 +3364,15 @@ class Invariants_test : public beast::unit_test::suite
 
                 // sleVault->at(sfAccount) = pseudoId;
                 // Setting wrong pseudo account ID
-                sleVault->at(sfAccount) = A2.id();
+                sleVault->at(sfAccount) = a2.id();
                 sleVault->at(sfFlags) = 0;
                 sleVault->at(sfSequence) = sequence;
-                sleVault->at(sfOwner) = A1.id();
+                sleVault->at(sfOwner) = a1.id();
                 sleVault->at(sfAssetsTotal) = Number(0);
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = vaultStrategyFirstComeFirstServe;
+                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3381,19 +3384,19 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"shares issuer and vault pseudo-account must be the same", "shares issuer must exist"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
                 auto const sequence = ac.view().seq();
-                auto const vaultKeylet = keylet::vault(A1.id(), sequence);
+                auto const vaultKeylet = keylet::vault(a1.id(), sequence);
                 auto sleVault = std::make_shared<SLE>(vaultKeylet);
                 auto const vaultPage = ac.view().dirInsert(
-                    keylet::ownerDir(A1.id()), sleVault->key(), describeOwnerDir(A1.id()));
+                    keylet::ownerDir(a1.id()), sleVault->key(), describeOwnerDir(a1.id()));
                 sleVault->setFieldU64(sfOwnerNode, *vaultPage);
 
-                auto const sharesMptId = makeMptID(sequence, A2.id());
+                auto const sharesMptId = makeMptID(sequence, a2.id());
                 auto const sharesKeylet = keylet::mptIssuance(sharesMptId);
                 auto sleShares = std::make_shared<SLE>(sharesKeylet);
                 auto const sharesPage = ac.view().dirInsert(
-                    keylet::ownerDir(A2.id()), sharesKeylet, describeOwnerDir(A2.id()));
+                    keylet::ownerDir(a2.id()), sharesKeylet, describeOwnerDir(a2.id()));
                 sleShares->setFieldU64(sfOwnerNode, *sharesPage);
 
                 sleShares->at(sfFlags) = 0;
@@ -3402,15 +3405,15 @@ class Invariants_test : public beast::unit_test::suite
                 sleShares->at(sfOutstandingAmount) = 0;
                 sleShares->at(sfSequence) = sequence;
 
-                sleVault->at(sfAccount) = A2.id();
+                sleVault->at(sfAccount) = a2.id();
                 sleVault->at(sfFlags) = 0;
                 sleVault->at(sfSequence) = sequence;
-                sleVault->at(sfOwner) = A1.id();
+                sleVault->at(sfOwner) = a1.id();
                 sleVault->at(sfAssetsTotal) = Number(0);
                 sleVault->at(sfAssetsAvailable) = Number(0);
                 sleVault->at(sfLossUnrealized) = Number(0);
                 sleVault->at(sfShareMPTID) = sharesMptId;
-                sleVault->at(sfWithdrawalPolicy) = vaultStrategyFirstComeFirstServe;
+                sleVault->at(sfWithdrawalPolicy) = kVAULT_STRATEGY_FIRST_COME_FIRST_SERVE;
 
                 ac.view().insert(sleVault);
                 ac.view().insert(sleShares);
@@ -3423,11 +3426,11 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "Vault deposit";
         doInvariantCheck(
             {"deposit must change vault balance"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 0, [](Adjustments& sample) {
-                                  sample.vaultAssets.reset();
-                              }));
+            [&](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) {
+                                   sample.vaultAssets.reset();
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject&) {}},
@@ -3436,11 +3439,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A2.id(), 200, [&](Adjustments& sample) {
-                                  sample.assetsMaximum = 1;
-                              }));
+            [&](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) {
+                                   sample.assetsMaximum = 1;
+                               }));
             },
             XRPAmount{},
             STTx{
@@ -3455,26 +3458,26 @@ class Invariants_test : public beast::unit_test::suite
         // ValidVault::finalize is otherwise impossible to trigger.
         doInvariantCheck(
             {"deposit must increase vault balance", "deposit must change depositor balance"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
                 // Move 10 drops to A4 to enforce total XRP balance
-                auto sleA4 = ac.view().peek(keylet::account(A4.id()));
+                auto sleA4 = ac.view().peek(keylet::account(a4.id()));
                 if (!sleA4)
                     return false;
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return adjust(ac.view(), keylet, args(A3.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountAssets->amount = -100;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a3.id(), -10, [&](Adjustments& sample) {
+                                   sample.accountAssets->amount = -100;
+                               }));
             },
             XRPAmount{100},
             STTx{
                 ttVAULT_DEPOSIT,
                 [&](STObject& tx) {
                     tx[sfFee] = XRPAmount(100);
-                    tx[sfAccount] = A3.id();
+                    tx[sfAccount] = a3.id();
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseXrp);
@@ -3485,20 +3488,20 @@ class Invariants_test : public beast::unit_test::suite
              "deposit must change vault and depositor balance by equal amount",
              "deposit and assets outstanding must add up",
              "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());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
                 // Move 10 drops from A2 to A3 to enforce total XRP balance
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 if (!sleA3)
                     return false;
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] + 10;
                 ac.view().update(sleA3);
 
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.vaultAssets = -20;
-                                  sample.accountAssets->amount = 10;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                                   sample.vaultAssets = -20;
+                                   sample.accountAssets->amount = 10;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(10); }},
@@ -3508,19 +3511,19 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"deposit must change depositor balance"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
                 // Move 10 drops from A3 to vault to enforce total XRP balance
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 if (!sleA3)
                     return false;
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] - 10;
                 ac.view().update(sleA3);
 
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.accountAssets->amount = 0;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                                   sample.accountAssets->amount = 0;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(10); }},
@@ -3530,11 +3533,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"deposit must change depositor shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.accountShares.reset();
-                              }));
+            [&](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) {
+                                   sample.accountShares.reset();
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(10); }},
@@ -3544,12 +3547,12 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"deposit must change vault shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [](Adjustments& sample) {
-                                  sample.sharesTotal = 0;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [](Adjustments& sample) {
+                                   sample.sharesTotal = 0;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(10); }},
@@ -3562,12 +3565,12 @@ class Invariants_test : public beast::unit_test::suite
              "deposit must change depositor and vault shares by equal amount",
              "deposit must not change vault balance by more than deposited "
              "amount"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.accountShares->amount = -5;
-                                  sample.sharesTotal = -10;
-                              }));
+            [&](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) {
+                                   sample.accountShares->amount = -5;
+                                   sample.sharesTotal = -10;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(5); }},
@@ -3577,22 +3580,22 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"deposit and assets outstanding must add up"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] - 2000;
                 ac.view().update(sleA3);
 
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.assetsTotal = 11;
-                              }));
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), 10, [&](Adjustments& sample) {
+                                   sample.assetsTotal = 11;
+                               }));
             },
             XRPAmount{2000},
             STTx{
                 ttVAULT_DEPOSIT,
                 [&](STObject& tx) {
                     tx[sfAmount] = XRPAmount(10);
-                    tx[sfDelegate] = A3.id();
+                    tx[sfDelegate] = a3.id();
                     tx[sfFee] = XRPAmount(2000);
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
@@ -3602,12 +3605,12 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {"deposit and assets outstanding must add up",
              "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 adjust(ac.view(), keylet, args(A2.id(), 10, [&](Adjustments& sample) {
-                                  sample.assetsTotal = 7;
-                                  sample.assetsAvailable = 7;
-                              }));
+            [&](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) {
+                                   sample.assetsTotal = 7;
+                                   sample.assetsAvailable = 7;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_DEPOSIT, [](STObject& tx) { tx[sfAmount] = XRPAmount(10); }},
@@ -3618,11 +3621,11 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "Vault withdrawal";
         doInvariantCheck(
             {"withdrawal must change vault balance"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), 0, [](Adjustments& sample) {
-                                  sample.vaultAssets.reset();
-                              }));
+            [&](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) {
+                                   sample.vaultAssets.reset();
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3635,26 +3638,26 @@ class Invariants_test : public beast::unit_test::suite
         // sfDestination would have been A4, but has been omitted.
         doInvariantCheck(
             {"withdrawal must change one destination balance"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
                 // Move 10 drops to A4 to enforce total XRP balance
-                auto sleA4 = ac.view().peek(keylet::account(A4.id()));
+                auto sleA4 = ac.view().peek(keylet::account(a4.id()));
                 if (!sleA4)
                     return false;
                 (*sleA4)[sfBalance] = *(*sleA4)[sfBalance] + 10;
                 ac.view().update(sleA4);
 
-                return adjust(ac.view(), keylet, args(A3.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountAssets->amount = -100;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a3.id(), -10, [&](Adjustments& sample) {
+                                   sample.accountAssets->amount = -100;
+                               }));
             },
             XRPAmount{100},
             STTx{
                 ttVAULT_WITHDRAW,
                 [&](STObject& tx) {
                     tx[sfFee] = XRPAmount(100);
-                    tx[sfAccount] = A3.id();
+                    tx[sfAccount] = a3.id();
                     // This commented out line causes the invariant violation.
                     // tx[sfDestination] = A4.id();
                 }},
@@ -3669,20 +3672,20 @@ class Invariants_test : public beast::unit_test::suite
                 "withdrawal and assets outstanding must add up",
                 "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());
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
 
                 // Move 10 drops from A2 to A3 to enforce total XRP balance
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 if (!sleA3)
                     return false;
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] + 10;
                 ac.view().update(sleA3);
 
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.vaultAssets = 10;
-                                  sample.accountAssets->amount = -20;
-                              }));
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                                   sample.vaultAssets = 10;
+                                   sample.accountAssets->amount = -20;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3692,13 +3695,13 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"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 (!adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                *sample.vaultAssets -= 5;
-                            })))
+            [&](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) {
+                                 *sample.vaultAssets -= 5;
+                             })))
                     return false;
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 if (!sleA3)
                     return false;
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] + 5;
@@ -3706,18 +3709,18 @@ class Invariants_test : public beast::unit_test::suite
                 return true;
             },
             XRPAmount{},
-            STTx{ttVAULT_WITHDRAW, [&](STObject& tx) { tx.setAccountID(sfDestination, A3.id()); }},
+            STTx{ttVAULT_WITHDRAW, [&](STObject& tx) { tx.setAccountID(sfDestination, a3.id()); }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseXrp,
             TxAccount::A2);
 
         doInvariantCheck(
             {"withdrawal must change depositor shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountShares.reset();
-                              }));
+            [&](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) {
+                                   sample.accountShares.reset();
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3727,11 +3730,11 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"withdrawal must change vault shares"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [](Adjustments& sample) {
-                                  sample.sharesTotal = 0;
-                              }));
+            [&](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) {
+                                   sample.sharesTotal = 0;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3743,12 +3746,12 @@ class Invariants_test : public beast::unit_test::suite
             {"withdrawal must decrease depositor shares",
              "withdrawal must change depositor and vault shares by equal "
              "amount"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountShares->amount = 5;
-                                  sample.sharesTotal = 10;
-                              }));
+            [&](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) {
+                                   sample.accountShares->amount = 5;
+                                   sample.sharesTotal = 10;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3759,12 +3762,12 @@ class Invariants_test : public beast::unit_test::suite
         doInvariantCheck(
             {"withdrawal and assets outstanding must add up",
              "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 adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.assetsTotal = -15;
-                                  sample.assetsAvailable = -15;
-                              }));
+            [&](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) {
+                                   sample.assetsTotal = -15;
+                                   sample.assetsAvailable = -15;
+                               }));
             },
             XRPAmount{},
             STTx{ttVAULT_WITHDRAW, [](STObject&) {}},
@@ -3774,71 +3777,71 @@ class Invariants_test : public beast::unit_test::suite
 
         doInvariantCheck(
             {"withdrawal and assets outstanding must add up"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto sleA3 = ac.view().peek(keylet::account(A3.id()));
+            [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                auto sleA3 = ac.view().peek(keylet::account(a3.id()));
                 (*sleA3)[sfBalance] = *(*sleA3)[sfBalance] - 2000;
                 ac.view().update(sleA3);
 
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq());
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.assetsTotal = -7;
-                              }));
+                auto const keylet = keylet::vault(a1.id(), ac.view().seq());
+                return kADJUST(ac.view(), keylet, kARGS(a2.id(), -10, [&](Adjustments& sample) {
+                                   sample.assetsTotal = -7;
+                               }));
             },
             XRPAmount{2000},
             STTx{
                 ttVAULT_WITHDRAW,
                 [&](STObject& tx) {
                     tx[sfAmount] = XRPAmount(10);
-                    tx[sfDelegate] = A3.id();
+                    tx[sfDelegate] = a3.id();
                     tx[sfFee] = XRPAmount(2000);
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseXrp,
             TxAccount::A2);
 
-        auto const precloseMpt = [&](Account const& A1, Account const& A2, Env& env) -> bool {
-            env.fund(XRP(1000), A3, A4);
+        auto const precloseMpt = [&](Account const& a1, Account const& a2, Env& env) -> bool {
+            env.fund(XRP(1000), a3, a4);
 
             // Create MPT asset
             {
-                Json::Value jv;
-                jv[sfAccount] = A3.human();
+                json::Value jv;
+                jv[sfAccount] = a3.human();
                 jv[sfTransactionType] = jss::MPTokenIssuanceCreate;
                 jv[sfFlags] = tfMPTCanTransfer;
                 env(jv);
                 env.close();
             }
 
-            auto const mptID = makeMptID(env.seq(A3) - 1, A3);
+            auto const mptID = makeMptID(env.seq(a3) - 1, a3);
             Asset const asset = MPTIssue(mptID);
             // Authorize A1 A2 A4
             {
-                Json::Value jv;
-                jv[sfAccount] = A1.human();
+                json::Value jv;
+                jv[sfAccount] = a1.human();
                 jv[sfTransactionType] = jss::MPTokenAuthorize;
                 jv[sfMPTokenIssuanceID] = to_string(mptID);
                 env(jv);
-                jv[sfAccount] = A2.human();
+                jv[sfAccount] = a2.human();
                 env(jv);
-                jv[sfAccount] = A4.human();
+                jv[sfAccount] = a4.human();
                 env(jv);
 
                 env.close();
             }
             // Send tokens to A1 A2 A4
             {
-                env(pay(A3, A1, asset(1000)));
-                env(pay(A3, A2, asset(1000)));
-                env(pay(A3, A4, asset(1000)));
+                env(pay(a3, a1, asset(1000)));
+                env(pay(a3, a2, asset(1000)));
+                env(pay(a3, a4, asset(1000)));
                 env.close();
             }
 
             Vault const vault{env};
-            auto [tx, keylet] = vault.create({.owner = A1, .asset = asset});
+            auto [tx, keylet] = vault.create({.owner = a1, .asset = asset});
             env(tx);
-            env(vault.deposit({.depositor = A1, .id = keylet.key, .amount = asset(10)}));
-            env(vault.deposit({.depositor = A2, .id = keylet.key, .amount = asset(10)}));
-            env(vault.deposit({.depositor = A4, .id = keylet.key, .amount = asset(10)}));
+            env(vault.deposit({.depositor = a1, .id = keylet.key, .amount = asset(10)}));
+            env(vault.deposit({.depositor = a2, .id = keylet.key, .amount = asset(10)}));
+            env(vault.deposit({.depositor = a4, .id = keylet.key, .amount = asset(10)}));
             return true;
         };
 
@@ -3846,14 +3849,14 @@ class Invariants_test : public beast::unit_test::suite
             {"withdrawal must decrease depositor shares",
              "withdrawal must change depositor and vault shares by equal "
              "amount"},
-            [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                auto const keylet = keylet::vault(A1.id(), ac.view().seq() - 2);
-                return adjust(ac.view(), keylet, args(A2.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountShares->amount = 5;
-                              }));
+            [&](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) {
+                                   sample.accountShares->amount = 5;
+                               }));
             },
             XRPAmount{},
-            STTx{ttVAULT_WITHDRAW, [&](STObject& tx) { tx[sfAccount] = A3.id(); }},
+            STTx{ttVAULT_WITHDRAW, [&](STObject& tx) { tx[sfAccount] = a3.id(); }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt,
             TxAccount::A2);
@@ -3861,23 +3864,23 @@ class Invariants_test : public beast::unit_test::suite
         testcase << "Vault clawback";
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A2.id(), -1, [&](Adjustments& sample) {
-                                  sample.vaultAssets.reset();
-                              }));
+            [&](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) {
+                                   sample.vaultAssets.reset();
+                               }));
             },
             XRPAmount{},
-            STTx{ttVAULT_CLAWBACK, [&](STObject& tx) { tx[sfAccount] = A3.id(); }},
+            STTx{ttVAULT_CLAWBACK, [&](STObject& tx) { tx[sfAccount] = a3.id(); }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt);
 
         // Not the same as below check: attempt to clawback XRP
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {}));
+            [&](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) {}));
             },
             XRPAmount{},
             STTx{ttVAULT_CLAWBACK, [](STObject&) {}},
@@ -3887,12 +3890,12 @@ class Invariants_test : public beast::unit_test::suite
         // Not the same as above check: attempt to clawback MPT by bad account
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A2.id(), 0, [&](Adjustments& sample) {}));
+            [&](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) {}));
             },
             XRPAmount{},
-            STTx{ttVAULT_CLAWBACK, [&](STObject& tx) { tx[sfAccount] = A4.id(); }},
+            STTx{ttVAULT_CLAWBACK, [&](STObject& tx) { tx[sfAccount] = a4.id(); }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt);
 
@@ -3900,36 +3903,36 @@ class Invariants_test : public beast::unit_test::suite
             {"clawback must decrease vault balance",
              "clawback must decrease holder shares",
              "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 adjust(ac.view(), keylet, args(A4.id(), 10, [&](Adjustments& sample) {
-                                  sample.sharesTotal = 0;
-                              }));
+            [&](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) {
+                                   sample.sharesTotal = 0;
+                               }));
             },
             XRPAmount{},
             STTx{
                 ttVAULT_CLAWBACK,
                 [&](STObject& tx) {
-                    tx[sfAccount] = A3.id();
-                    tx[sfHolder] = A4.id();
+                    tx[sfAccount] = a3.id();
+                    tx[sfHolder] = a4.id();
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt);
 
         doInvariantCheck(
             {"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 adjust(ac.view(), keylet, args(A4.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountShares.reset();
-                              }));
+            [&](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) {
+                                   sample.accountShares.reset();
+                               }));
             },
             XRPAmount{},
             STTx{
                 ttVAULT_CLAWBACK,
                 [&](STObject& tx) {
-                    tx[sfAccount] = A3.id();
-                    tx[sfHolder] = A4.id();
+                    tx[sfAccount] = a3.id();
+                    tx[sfHolder] = a4.id();
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt);
@@ -3938,20 +3941,20 @@ class Invariants_test : public beast::unit_test::suite
             {"clawback must change holder and vault shares by equal amount",
              "clawback and assets outstanding must add up",
              "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 adjust(ac.view(), keylet, args(A4.id(), -10, [&](Adjustments& sample) {
-                                  sample.accountShares->amount = -8;
-                                  sample.assetsTotal = -7;
-                                  sample.assetsAvailable = -7;
-                              }));
+            [&](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) {
+                                   sample.accountShares->amount = -8;
+                                   sample.assetsTotal = -7;
+                                   sample.assetsAvailable = -7;
+                               }));
             },
             XRPAmount{},
             STTx{
                 ttVAULT_CLAWBACK,
                 [&](STObject& tx) {
-                    tx[sfAccount] = A3.id();
-                    tx[sfHolder] = A4.id();
+                    tx[sfAccount] = a3.id();
+                    tx[sfHolder] = a4.id();
                 }},
             {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
             precloseMpt);
@@ -3966,13 +3969,13 @@ class Invariants_test : public beast::unit_test::suite
         // MPT OutstandingAmount > MaximumAmount
         doInvariantCheck(
             {{"OutstandingAmount overflow"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
+            [](Account const& a1, Account const&, ApplyContext& ac) {
                 // mptissuance outstanding is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), A1)};
+                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), a1)};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, 110);
                 sleNew->setFieldU64(sfMaximumAmount, 100);
@@ -3983,19 +3986,19 @@ class Invariants_test : public beast::unit_test::suite
         // MPTToken amount doesn't add up to OutstandingAmount
         doInvariantCheck(
             {{"invalid OutstandingAmount balance"}},
-            [](Account const& A1, Account const& A2, ApplyContext& ac) {
+            [](Account const& a1, Account const& a2, ApplyContext& ac) {
                 // mptissuance outstanding is negative
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
-                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), A1)};
+                MPTIssue const mpt{makeMptID(sle->getFieldU32(sfSequence), a1)};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                 sleNew->setFieldU64(sfOutstandingAmount, 100);
                 sleNew->setFieldU64(sfMaximumAmount, 100);
                 ac.view().insert(sleNew);
 
-                sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A2));
+                sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), a2));
                 sleNew->setFieldU64(sfMPTAmount, 90);
                 ac.view().insert(sleNew);
 
@@ -4007,25 +4010,25 @@ class Invariants_test : public beast::unit_test::suite
             MPTID id;
             doInvariantCheck(
                 {{log}},
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    return update(id, ac, A1);
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    return update(id, ac, a1);
                 },
                 XRPAmount{},
                 STTx{ttPAYMENT, [](STObject& tx) {}},
                 {tecINVARIANT_FAILED, tecINVARIANT_FAILED},
-                [&](Account const& A1, Account const& A2, Env& env) {
+                [&](Account const& a1, Account const& a2, Env& env) {
                     Account const gw("gw");
                     env.fund(XRP(1'000), gw);
                     MPTTester const mpt(
-                        {.env = env, .issuer = gw, .holders = {A1}, .pay = 100, .maxAmt = 100});
+                        {.env = env, .issuer = gw, .holders = {a1}, .pay = 100, .maxAmt = 100});
                     id = mpt.issuanceID();
                     return true;
                 });
         };
         testPayment(
             "invalid OutstandingAmount balance",
-            [&](MPTID const& id, ApplyContext& ac, Account const& A1) {
-                auto sle = ac.view().peek(keylet::mptoken(id, A1));
+            [&](MPTID const& id, ApplyContext& ac, Account const& a1) {
+                auto sle = ac.view().peek(keylet::mptoken(id, a1));
                 if (!sle)
                     return false;
                 sle->setFieldU64(sfMPTAmount, 101);
@@ -4052,19 +4055,19 @@ class Invariants_test : public beast::unit_test::suite
         {
             doInvariantCheck(
                 {{std::string("MPToken created for the MPT issuer")}},
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    auto const sle = ac.view().peek(keylet::account(A1.id()));
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    auto const sle = ac.view().peek(keylet::account(a1.id()));
                     if (!sle)
                         return false;
 
                     auto seq = sle->getFieldU32(sfSequence);
                     for (int i = 0; i < nTokens; ++i)
                     {
-                        MPTIssue const mpt{makeMptID(seq + i, A1)};
+                        MPTIssue const mpt{makeMptID(seq + i, a1)};
                         auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
                         ac.view().insert(sleNew);
 
-                        sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), A2));
+                        sleNew = std::make_shared<SLE>(keylet::mptoken(mpt.getMptID(), a2));
                         ac.view().insert(sleNew);
                     }
 
@@ -4079,11 +4082,11 @@ class Invariants_test : public beast::unit_test::suite
         for (auto const& tx : {ttAMM_WITHDRAW, ttAMM_CLAWBACK})
         {
             MPTID id;
-            Account const A3("A3");
+            Account const a3("A3");
             doInvariantCheck(
                 {{"MPT authorize  succeeded but created/deleted bad number of mptokens"}},
-                [&](Account const& A1, Account const& A2, ApplyContext& ac) {
-                    for (auto const& a : {A1, A2, A3})
+                [&](Account const& a1, Account const& a2, ApplyContext& ac) {
+                    for (auto const& a : {a1, a2, a3})
                     {
                         auto sle = ac.view().peek(keylet::mptoken(id, a));
                         if (!sle)
@@ -4095,10 +4098,10 @@ class Invariants_test : public beast::unit_test::suite
                 XRPAmount{},
                 STTx{tx, [](STObject& tx) {}},
                 {tecINVARIANT_FAILED, tefINVARIANT_FAILED},
-                [&](Account const& A1, Account const& A2, Env& env) {
+                [&](Account const& a1, Account const& a2, Env& env) {
                     Account const gw("gw");
-                    env.fund(XRP(1'000), gw, A3);
-                    MPTTester const mpt({.env = env, .issuer = gw, .holders = {A1, A2, A3}});
+                    env.fund(XRP(1'000), gw, a3);
+                    MPTTester const mpt({.env = env, .issuer = gw, .holders = {a1, a2, a3}});
                     id = mpt.issuanceID();
                     return true;
                 });
@@ -4122,21 +4125,21 @@ class Invariants_test : public beast::unit_test::suite
         // ApplyStateTable::visit(). The configurer callables receive the
         // SLE and the Issue corresponding to that side's keylet currency.
         auto const insertOrderedTrustLinePair = [](ApplyContext& ac,
-                                                   Account const& A1,
-                                                   Account const& A2,
-                                                   Account const& A3,
+                                                   Account const& a1,
+                                                   Account const& a2,
+                                                   Account const& a3,
                                                    auto const& badConfig,
                                                    auto const& goodConfig) {
             char const* const c1 = "USD";
             char const* const c2 = "EUR";
-            auto const k1 = keylet::line(A1, A2, A1[c1].currency);
-            auto const k2 = keylet::line(A1, A3, A1[c2].currency);
+            auto const k1 = keylet::line(a1, a2, a1[c1].currency);
+            auto const k2 = keylet::line(a1, a3, a1[c2].currency);
 
             bool const k1First = k1.key < k2.key;
             auto const& badKey = k1First ? k1 : k2;
             auto const& goodKey = k1First ? k2 : k1;
-            Issue const badIss{k1First ? A1[c1].currency : A1[c2].currency, A1.id()};
-            Issue const goodIss{k1First ? A1[c2].currency : A1[c1].currency, A1.id()};
+            Issue const badIss{k1First ? a1[c1].currency : a1[c2].currency, a1.id()};
+            Issue const goodIss{k1First ? a1[c2].currency : a1[c1].currency, a1.id()};
 
             auto const sleBad = std::make_shared<SLE>(badKey);
             badConfig(*sleBad, badIss);
@@ -4157,13 +4160,13 @@ class Invariants_test : public beast::unit_test::suite
             Env(*this, features),
             fixEnabled ? std::vector<std::string>{{"an XRP trust line was created"}}
                        : std::vector<std::string>{},
-            [&insertOrderedTrustLinePair](Account const& A1, Account const& A2, ApplyContext& ac) {
-                Account const A3{"A3"};
+            [&insertOrderedTrustLinePair](Account const& a1, Account const& a2, ApplyContext& ac) {
+                Account const a3{"A3"};
                 insertOrderedTrustLinePair(
                     ac,
-                    A1,
-                    A2,
-                    A3,
+                    a1,
+                    a2,
+                    a3,
                     [](SLE& sle, Issue const& iss) {
                         // sfLowLimit has xrpIssue, making isXrp = true
                         sle.setFieldAmount(sfLowLimit, STAmount{xrpIssue(), 0});
@@ -4186,13 +4189,13 @@ class Invariants_test : public beast::unit_test::suite
             fixEnabled ? std::vector<std::string>{{"a trust line with deep freeze flag without "
                                                    "normal freeze was created"}}
                        : std::vector<std::string>{},
-            [&insertOrderedTrustLinePair](Account const& A1, Account const& A2, ApplyContext& ac) {
-                Account const A3{"A3"};
+            [&insertOrderedTrustLinePair](Account const& a1, Account const& a2, ApplyContext& ac) {
+                Account const a3{"A3"};
                 insertOrderedTrustLinePair(
                     ac,
-                    A1,
-                    A2,
-                    A3,
+                    a1,
+                    a2,
+                    a3,
                     [](SLE& sle, Issue const& iss) {
                         sle.setFieldAmount(sfLowLimit, STAmount{iss, 0});
                         sle.setFieldAmount(sfHighLimit, STAmount{iss, 0});
@@ -4219,15 +4222,15 @@ class Invariants_test : public beast::unit_test::suite
             Env(*this, features),
             fixEnabled ? std::vector<std::string>{{"escrow specifies invalid amount"}}
                        : std::vector<std::string>{{"a MPT issuance was created"}},
-            [](Account const& A1, Account const&, ApplyContext& ac) {
-                auto const sle = ac.view().peek(keylet::account(A1.id()));
+            [](Account const& a1, Account const&, ApplyContext& ac) {
+                auto const sle = ac.view().peek(keylet::account(a1.id()));
                 if (!sle)
                     return false;
 
                 MPTIssue const mpt{makeMptID(1, AccountID(0x4985601))};
                 auto sleNew = std::make_shared<SLE>(keylet::mptIssuance(mpt.getMptID()));
-                // outstanding exceeds maxMPTokenAmount -> checkAmount sets bad_
-                sleNew->setFieldU64(sfOutstandingAmount, maxMPTokenAmount + 1);
+                // outstanding exceeds kMAX_MP_TOKEN_AMOUNT -> checkAmount sets bad_
+                sleNew->setFieldU64(sfOutstandingAmount, kMAX_MP_TOKEN_AMOUNT + 1);
                 // locked is valid and <= outstanding -> must NOT clear bad_
                 sleNew->setFieldU64(sfLockedAmount, 10);
                 ac.view().insert(sleNew);
@@ -4253,7 +4256,7 @@ class Invariants_test : public beast::unit_test::suite
             std::vector<ValidVault::DeltaInfo> values;
         };
 
-        NumberMantissaScaleGuard const g{MantissaRange::mantissa_scale::large};
+        NumberMantissaScaleGuard const g{MantissaRange::MantissaScale::Large};
 
         auto makeDelta = [&vaultAsset](Number const& n) -> ValidVault::DeltaInfo {
             return {.delta = n, .scale = scale(n, vaultAsset.raw())};
diff --git a/src/test/app/LPTokenTransfer_test.cpp b/src/test/app/LPTokenTransfer_test.cpp
index 2b440c67d5..4bf2db9515 100644
--- a/src/test/app/LPTokenTransfer_test.cpp
+++ b/src/test/app/LPTokenTransfer_test.cpp
@@ -31,50 +31,50 @@ class LPTokenTransfer_test : public jtx::AMMTest
 
         using namespace jtx;
         Env env{*this, features};
-        fund(env, gw, {alice}, {USD(20'000), BTC(0.5)}, Fund::All);
+        fund(env, gw_, {alice_}, {USD(20'000), BTC(0.5)}, Fund::All);
         env.close();
 
-        AMM ammAlice(env, alice, USD(20'000), BTC(0.5));
+        AMM ammAlice(env, alice_, USD(20'000), BTC(0.5));
         BEAST_EXPECT(ammAlice.expectBalances(USD(20'000), BTC(0.5), IOUAmount{100, 0}));
 
-        fund(env, gw, {carol}, {USD(4'000), BTC(1)}, Fund::Acct);
-        ammAlice.deposit(carol, 10);
+        fund(env, gw_, {carol_}, {USD(4'000), BTC(1)}, Fund::Acct);
+        ammAlice.deposit(carol_, 10);
         BEAST_EXPECT(ammAlice.expectBalances(USD(22'000), BTC(0.55), IOUAmount{110, 0}));
 
-        fund(env, gw, {bob}, {USD(4'000), BTC(1)}, Fund::Acct);
-        ammAlice.deposit(bob, 10);
+        fund(env, gw_, {bob_}, {USD(4'000), BTC(1)}, Fund::Acct);
+        ammAlice.deposit(bob_, 10);
         BEAST_EXPECT(ammAlice.expectBalances(USD(24'000), BTC(0.60), IOUAmount{120, 0}));
 
         auto const lpIssue = ammAlice.lptIssue();
-        env.trust(STAmount{lpIssue, 500}, alice);
-        env.trust(STAmount{lpIssue, 500}, bob);
-        env.trust(STAmount{lpIssue, 500}, carol);
+        env.trust(STAmount{lpIssue, 500}, alice_);
+        env.trust(STAmount{lpIssue, 500}, bob_);
+        env.trust(STAmount{lpIssue, 500}, carol_);
         env.close();
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // bob can still send lptoken to carol even tho carol's USD is
+        // bob_ can still send lptoken to carol_ even tho carol_'s USD is
         // frozen, regardless of whether fixFrozenLPTokenTransfer is enabled or
         // not
         // Note: Deep freeze is not considered for LPToken transfer
-        env(pay(bob, carol, STAmount{lpIssue, 5}));
+        env(pay(bob_, carol_, STAmount{lpIssue, 5}));
         env.close();
 
         // cannot transfer to an amm account
-        env(pay(carol, lpIssue.getIssuer(), STAmount{lpIssue, 5}), ter(tecNO_PERMISSION));
+        env(pay(carol_, lpIssue.getIssuer(), STAmount{lpIssue, 5}), Ter(tecNO_PERMISSION));
         env.close();
 
         if (features[fixFrozenLPTokenTransfer])
         {
-            // carol is frozen on USD and therefore can't send lptoken to bob
-            env(pay(carol, bob, STAmount{lpIssue, 5}), ter(tecPATH_DRY));
+            // carol_ is frozen on USD and therefore can't send lptoken to bob_
+            env(pay(carol_, bob_, STAmount{lpIssue, 5}), Ter(tecPATH_DRY));
         }
         else
         {
-            // carol can still send lptoken with frozen USD
-            env(pay(carol, bob, STAmount{lpIssue, 5}));
+            // carol_ can still send lptoken with frozen USD
+            env(pay(carol_, bob_, STAmount{lpIssue, 5}));
         }
     }
 
@@ -86,85 +86,85 @@ class LPTokenTransfer_test : public jtx::AMMTest
         using namespace jtx;
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob, carol}, {USD(10'000), EUR(10'000)}, Fund::All);
-        AMM ammAlice(env, alice, USD(10'000), EUR(10'000));
-        ammAlice.deposit(carol, 1'000);
-        ammAlice.deposit(bob, 1'000);
+        fund(env, gw_, {alice_, bob_, carol_}, {USD(10'000), EUR(10'000)}, Fund::All);
+        AMM ammAlice(env, alice_, USD(10'000), EUR(10'000));
+        ammAlice.deposit(carol_, 1'000);
+        ammAlice.deposit(bob_, 1'000);
 
         auto const lpIssue = ammAlice.lptIssue();
 
         // carols creates an offer to sell lptoken
-        env(offer(carol, XRP(10), STAmount{lpIssue, 10}), txflags(tfPassive));
+        env(offer(carol_, XRP(10), STAmount{lpIssue, 10}), Txflags(tfPassive));
         env.close();
-        BEAST_EXPECT(expectOffers(env, carol, 1));
+        BEAST_EXPECT(expectOffers(env, carol_, 1));
 
-        env.trust(STAmount{lpIssue, 1'000'000'000}, alice);
-        env.trust(STAmount{lpIssue, 1'000'000'000}, bob);
-        env.trust(STAmount{lpIssue, 1'000'000'000}, carol);
+        env.trust(STAmount{lpIssue, 1'000'000'000}, alice_);
+        env.trust(STAmount{lpIssue, 1'000'000'000}, bob_);
+        env.trust(STAmount{lpIssue, 1'000'000'000}, carol_);
         env.close();
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // exercises alice's ability to consume carol's offer to sell lptoken
-        // when carol's USD is frozen pre/post fixFrozenLPTokenTransfer
+        // exercises alice_'s ability to consume carol_'s offer to sell lptoken
+        // when carol_'s USD is frozen pre/post fixFrozenLPTokenTransfer
         // amendment
         if (features[fixFrozenLPTokenTransfer])
         {
-            // with fixFrozenLPTokenTransfer, alice fails to consume carol's
-            // offer since carol's USD is frozen
-            env(pay(alice, bob, STAmount{lpIssue, 10}),
-                txflags(tfPartialPayment),
-                sendmax(XRP(10)),
-                ter(tecPATH_DRY));
+            // with fixFrozenLPTokenTransfer, alice_ fails to consume carol_'s
+            // offer since carol_'s USD is frozen
+            env(pay(alice_, bob_, STAmount{lpIssue, 10}),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(10)),
+                Ter(tecPATH_DRY));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 1));
+            BEAST_EXPECT(expectOffers(env, carol_, 1));
 
-            // gateway unfreezes carol's USD
-            env(trust(gw, carol["USD"](1'000'000'000), tfClearFreeze));
+            // gateway unfreezes carol_'s USD
+            env(trust(gw_, carol_["USD"](1'000'000'000), tfClearFreeze));
             env.close();
 
-            // alice successfully consumes carol's offer
-            env(pay(alice, bob, STAmount{lpIssue, 10}),
-                txflags(tfPartialPayment),
-                sendmax(XRP(10)));
+            // alice_ successfully consumes carol_'s offer
+            env(pay(alice_, bob_, STAmount{lpIssue, 10}),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(10)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
         else
         {
-            // without fixFrozenLPTokenTransfer, alice can consume carol's offer
-            // even when carol's USD is frozen
-            env(pay(alice, bob, STAmount{lpIssue, 10}),
-                txflags(tfPartialPayment),
-                sendmax(XRP(10)));
+            // without fixFrozenLPTokenTransfer, alice_ can consume carol_'s offer
+            // even when carol_'s USD is frozen
+            env(pay(alice_, bob_, STAmount{lpIssue, 10}),
+                Txflags(tfPartialPayment),
+                Sendmax(XRP(10)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
 
-        // make sure carol's USD is not frozen
-        env(trust(gw, carol["USD"](1'000'000'000), tfClearFreeze));
+        // make sure carol_'s USD is not frozen
+        env(trust(gw_, carol_["USD"](1'000'000'000), tfClearFreeze));
         env.close();
 
-        // ensure that carol's offer to buy lptoken can be consumed by alice
-        // even when carol's USD is frozen
+        // ensure that carol_'s offer to buy lptoken can be consumed by alice_
+        // even when carol_'s USD is frozen
         {
-            // carol creates an offer to buy lptoken
-            env(offer(carol, STAmount{lpIssue, 10}, XRP(10)), txflags(tfPassive));
+            // carol_ creates an offer to buy lptoken
+            env(offer(carol_, STAmount{lpIssue, 10}, XRP(10)), Txflags(tfPassive));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 1));
+            BEAST_EXPECT(expectOffers(env, carol_, 1));
 
-            // gateway freezes carol's USD
-            env(trust(gw, carol["USD"](0), tfSetFreeze));
+            // gateway freezes carol_'s USD
+            env(trust(gw_, carol_["USD"](0), tfSetFreeze));
             env.close();
 
-            // alice successfully consumes carol's offer
-            env(pay(alice, bob, XRP(10)),
-                txflags(tfPartialPayment),
-                sendmax(STAmount{lpIssue, 10}));
+            // alice_ successfully consumes carol_'s offer
+            env(pay(alice_, bob_, XRP(10)),
+                Txflags(tfPartialPayment),
+                Sendmax(STAmount{lpIssue, 10}));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
         }
     }
 
@@ -176,56 +176,56 @@ class LPTokenTransfer_test : public jtx::AMMTest
         using namespace jtx;
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob, carol}, {USD(10'000), EUR(10'000)}, Fund::All);
-        AMM ammAlice(env, alice, USD(10'000), EUR(10'000));
-        ammAlice.deposit(carol, 1'000);
-        ammAlice.deposit(bob, 1'000);
+        fund(env, gw_, {alice_, bob_, carol_}, {USD(10'000), EUR(10'000)}, Fund::All);
+        AMM ammAlice(env, alice_, USD(10'000), EUR(10'000));
+        ammAlice.deposit(carol_, 1'000);
+        ammAlice.deposit(bob_, 1'000);
 
         auto const lpIssue = ammAlice.lptIssue();
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // exercises carol's ability to create a new offer to sell lptoken with
+        // exercises carol_'s ability to create a new offer to sell lptoken with
         // frozen USD, before and after fixFrozenLPTokenTransfer
         if (features[fixFrozenLPTokenTransfer])
         {
-            // with fixFrozenLPTokenTransfer, carol can't create an offer to
+            // with fixFrozenLPTokenTransfer, carol_ can't create an offer to
             // sell lptoken when one of the assets is frozen
 
-            // carol can't create an offer to sell lptoken
-            env(offer(carol, XRP(10), STAmount{lpIssue, 10}),
-                txflags(tfPassive),
-                ter(tecUNFUNDED_OFFER));
+            // carol_ can't create an offer to sell lptoken
+            env(offer(carol_, XRP(10), STAmount{lpIssue, 10}),
+                Txflags(tfPassive),
+                Ter(tecUNFUNDED_OFFER));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 0));
+            BEAST_EXPECT(expectOffers(env, carol_, 0));
 
-            // gateway unfreezes carol's USD
-            env(trust(gw, carol["USD"](1'000'000'000), tfClearFreeze));
+            // gateway unfreezes carol_'s USD
+            env(trust(gw_, carol_["USD"](1'000'000'000), tfClearFreeze));
             env.close();
 
-            // carol can create an offer to sell lptoken after USD is unfrozen
-            env(offer(carol, XRP(10), STAmount{lpIssue, 10}), txflags(tfPassive));
+            // carol_ can create an offer to sell lptoken after USD is unfrozen
+            env(offer(carol_, XRP(10), STAmount{lpIssue, 10}), Txflags(tfPassive));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 1));
+            BEAST_EXPECT(expectOffers(env, carol_, 1));
         }
         else
         {
-            // without fixFrozenLPTokenTransfer, carol can create an offer
-            env(offer(carol, XRP(10), STAmount{lpIssue, 10}), txflags(tfPassive));
+            // without fixFrozenLPTokenTransfer, carol_ can create an offer
+            env(offer(carol_, XRP(10), STAmount{lpIssue, 10}), Txflags(tfPassive));
             env.close();
-            BEAST_EXPECT(expectOffers(env, carol, 1));
+            BEAST_EXPECT(expectOffers(env, carol_, 1));
         }
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // carol can create offer to buy lptoken even if USD is frozen
-        env(offer(carol, STAmount{lpIssue, 10}, XRP(5)), txflags(tfPassive));
+        // carol_ can create offer to buy lptoken even if USD is frozen
+        env(offer(carol_, STAmount{lpIssue, 10}, XRP(5)), Txflags(tfPassive));
         env.close();
-        BEAST_EXPECT(expectOffers(env, carol, 2));
+        BEAST_EXPECT(expectOffers(env, carol_, 2));
     }
 
     void
@@ -237,55 +237,55 @@ class LPTokenTransfer_test : public jtx::AMMTest
         Env env{*this, features};
 
         // Offer crossing with two AMM LPTokens.
-        fund(env, gw, {alice, carol}, {USD(10'000)}, Fund::All);
-        AMM ammAlice1(env, alice, XRP(10'000), USD(10'000));
-        ammAlice1.deposit(carol, 10'000'000);
+        fund(env, gw_, {alice_, carol_}, {USD(10'000)}, Fund::All);
+        AMM ammAlice1(env, alice_, XRP(10'000), USD(10'000));
+        ammAlice1.deposit(carol_, 10'000'000);
 
-        fund(env, gw, {alice, carol}, {EUR(10'000)}, Fund::TokenOnly);
-        AMM ammAlice2(env, alice, XRP(10'000), EUR(10'000));
-        ammAlice2.deposit(carol, 10'000'000);
+        fund(env, gw_, {alice_, carol_}, {EUR(10'000)}, Fund::TokenOnly);
+        AMM ammAlice2(env, alice_, XRP(10'000), EUR(10'000));
+        ammAlice2.deposit(carol_, 10'000'000);
         auto const token1 = ammAlice1.lptIssue();
         auto const token2 = ammAlice2.lptIssue();
 
-        // carol creates offer
-        env(offer(carol, STAmount{token2, 100}, STAmount{token1, 100}));
+        // carol_ creates offer
+        env(offer(carol_, STAmount{token2, 100}, STAmount{token1, 100}));
         env.close();
-        BEAST_EXPECT(expectOffers(env, carol, 1));
+        BEAST_EXPECT(expectOffers(env, carol_, 1));
 
-        // gateway freezes carol's USD, carol's token1 should be frozen as well
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD, carol_'s token1 should be frozen as well
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // alice creates an offer which exhibits different behavior on offer
+        // alice_ creates an offer which exhibits different behavior on offer
         // crossing depending on if fixFrozenLPTokenTransfer is enabled
-        env(offer(alice, STAmount{token1, 100}, STAmount{token2, 100}));
+        env(offer(alice_, STAmount{token1, 100}, STAmount{token2, 100}));
         env.close();
 
-        // exercises carol's offer's ability to cross with alice's offer when
-        // carol's USD is frozen, before and after fixFrozenLPTokenTransfer
+        // exercises carol_'s offer's ability to cross with alice_'s offer when
+        // carol_'s USD is frozen, before and after fixFrozenLPTokenTransfer
         if (features[fixFrozenLPTokenTransfer])
         {
-            // with fixFrozenLPTokenTransfer enabled, alice's offer can no
-            // longer cross with carol's offer
+            // with fixFrozenLPTokenTransfer enabled, alice_'s offer can no
+            // longer cross with carol_'s offer
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount{token1, 10'000'000}) &&
-                expectHolding(env, alice, STAmount{token2, 10'000'000}));
+                expectHolding(env, alice_, STAmount{token1, 10'000'000}) &&
+                expectHolding(env, alice_, STAmount{token2, 10'000'000}));
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount{token2, 10'000'000}) &&
-                expectHolding(env, carol, STAmount{token1, 10'000'000}));
-            BEAST_EXPECT(expectOffers(env, alice, 1) && expectOffers(env, carol, 0));
+                expectHolding(env, carol_, STAmount{token2, 10'000'000}) &&
+                expectHolding(env, carol_, STAmount{token1, 10'000'000}));
+            BEAST_EXPECT(expectOffers(env, alice_, 1) && expectOffers(env, carol_, 0));
         }
         else
         {
-            // alice's offer still crosses with carol's offer despite carol's
+            // alice_'s offer still crosses with carol_'s offer despite carol_'s
             // token1 is frozen
             BEAST_EXPECT(
-                expectHolding(env, alice, STAmount{token1, 10'000'100}) &&
-                expectHolding(env, alice, STAmount{token2, 9'999'900}));
+                expectHolding(env, alice_, STAmount{token1, 10'000'100}) &&
+                expectHolding(env, alice_, STAmount{token2, 9'999'900}));
             BEAST_EXPECT(
-                expectHolding(env, carol, STAmount{token2, 10'000'100}) &&
-                expectHolding(env, carol, STAmount{token1, 9'999'900}));
-            BEAST_EXPECT(expectOffers(env, alice, 0) && expectOffers(env, carol, 0));
+                expectHolding(env, carol_, STAmount{token2, 10'000'100}) &&
+                expectHolding(env, carol_, STAmount{token1, 9'999'900}));
+            BEAST_EXPECT(expectOffers(env, alice_, 0) && expectOffers(env, carol_, 0));
         }
     }
 
@@ -297,43 +297,43 @@ class LPTokenTransfer_test : public jtx::AMMTest
         using namespace jtx;
         Env env{*this, features};
 
-        fund(env, gw, {alice, bob, carol}, {USD(10'000), EUR(10'000)}, Fund::All);
-        AMM ammAlice(env, alice, USD(10'000), EUR(10'000));
-        ammAlice.deposit(carol, 1'000);
-        ammAlice.deposit(bob, 1'000);
+        fund(env, gw_, {alice_, bob_, carol_}, {USD(10'000), EUR(10'000)}, Fund::All);
+        AMM ammAlice(env, alice_, USD(10'000), EUR(10'000));
+        ammAlice.deposit(carol_, 1'000);
+        ammAlice.deposit(bob_, 1'000);
 
         auto const lpIssue = ammAlice.lptIssue();
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
-        // carol can always create a check with lptoken that has frozen
+        // carol_ can always create a check with lptoken that has frozen
         // token
-        uint256 const carolChkId{keylet::check(carol, env.seq(carol)).key};
-        env(check::create(carol, bob, STAmount{lpIssue, 10}));
+        uint256 const carolChkId{keylet::check(carol_, env.seq(carol_)).key};
+        env(check::create(carol_, bob_, STAmount{lpIssue, 10}));
         env.close();
 
-        // with fixFrozenLPTokenTransfer enabled, bob fails to cash the check
+        // with fixFrozenLPTokenTransfer enabled, bob_ fails to cash the check
         if (features[fixFrozenLPTokenTransfer])
         {
-            env(check::cash(bob, carolChkId, STAmount{lpIssue, 10}), ter(tecPATH_PARTIAL));
+            env(check::cash(bob_, carolChkId, STAmount{lpIssue, 10}), Ter(tecPATH_PARTIAL));
         }
         else
         {
-            env(check::cash(bob, carolChkId, STAmount{lpIssue, 10}));
+            env(check::cash(bob_, carolChkId, STAmount{lpIssue, 10}));
         }
 
         env.close();
 
-        // bob creates a check
-        uint256 const bobChkId{keylet::check(bob, env.seq(bob)).key};
-        env(check::create(bob, carol, STAmount{lpIssue, 10}));
+        // bob_ creates a check
+        uint256 const bobChkId{keylet::check(bob_, env.seq(bob_)).key};
+        env(check::create(bob_, carol_, STAmount{lpIssue, 10}));
         env.close();
 
-        // carol cashes the bob's check. Even though carol is frozen, she can
+        // carol_ cashes the bob_'s check. Even though carol_ is frozen, she can
         // still receive LPToken
-        env(check::cash(carol, bobChkId, STAmount{lpIssue, 10}));
+        env(check::cash(carol_, bobChkId, STAmount{lpIssue, 10}));
         env.close();
     }
 
@@ -346,25 +346,25 @@ class LPTokenTransfer_test : public jtx::AMMTest
         Env env{*this, features};
 
         // Setup AMM
-        fund(env, gw, {alice, bob, carol}, {USD(10'000), EUR(10'000)}, Fund::All);
-        AMM ammAlice(env, alice, USD(10'000), EUR(10'000));
-        ammAlice.deposit(carol, 1'000);
-        ammAlice.deposit(bob, 1'000);
+        fund(env, gw_, {alice_, bob_, carol_}, {USD(10'000), EUR(10'000)}, Fund::All);
+        AMM ammAlice(env, alice_, USD(10'000), EUR(10'000));
+        ammAlice.deposit(carol_, 1'000);
+        ammAlice.deposit(bob_, 1'000);
 
         auto const lpIssue = ammAlice.lptIssue();
 
-        // bob mints a nft
-        uint256 const nftID{token::getNextID(env, bob, 0u, tfTransferable)};
-        env(token::mint(bob, 0), txflags(tfTransferable));
+        // bob_ mints a nft
+        uint256 const nftID{token::getNextID(env, bob_, 0u, tfTransferable)};
+        env(token::mint(bob_, 0), Txflags(tfTransferable));
         env.close();
 
-        // bob creates a sell offer for lptoken
-        uint256 const sellOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-        env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}), txflags(tfSellNFToken));
+        // bob_ creates a sell offer for lptoken
+        uint256 const sellOfferIndex = keylet::nftoffer(bob_, env.seq(bob_)).key;
+        env(token::createOffer(bob_, nftID, STAmount{lpIssue, 10}), Txflags(tfSellNFToken));
         env.close();
 
-        // gateway freezes carol's USD
-        env(trust(gw, carol["USD"](0), tfSetFreeze));
+        // gateway freezes carol_'s USD
+        env(trust(gw_, carol_["USD"](0), tfSetFreeze));
         env.close();
 
         // exercises one's ability to transfer NFT using lptoken when one of the
@@ -374,36 +374,36 @@ class LPTokenTransfer_test : public jtx::AMMTest
             // with fixFrozenLPTokenTransfer, freezing USD will prevent buy/sell
             // offers with lptokens from being created/accepted
 
-            // carol fails to accept bob's offer with lptoken because carol's
+            // carol_ fails to accept bob_'s offer with lptoken because carol_'s
             // USD is frozen
-            env(token::acceptSellOffer(carol, sellOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptSellOffer(carol_, sellOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
-            // gateway unfreezes carol's USD
-            env(trust(gw, carol["USD"](1'000'000), tfClearFreeze));
+            // gateway unfreezes carol_'s USD
+            env(trust(gw_, carol_["USD"](1'000'000), tfClearFreeze));
             env.close();
 
-            // carol can now accept the offer and own the nft
-            env(token::acceptSellOffer(carol, sellOfferIndex));
+            // carol_ can now accept the offer and own the nft
+            env(token::acceptSellOffer(carol_, sellOfferIndex));
             env.close();
 
-            // gateway freezes bob's USD
-            env(trust(gw, bob["USD"](0), tfSetFreeze));
+            // gateway freezes bob_'s USD
+            env(trust(gw_, bob_["USD"](0), tfSetFreeze));
             env.close();
 
-            // bob fails to create a buy offer with lptoken for carol's nft
-            // since bob's USD is frozen
-            env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}),
-                token::owner(carol),
-                ter(tecUNFUNDED_OFFER));
+            // bob_ fails to create a buy offer with lptoken for carol_'s nft
+            // since bob_'s USD is frozen
+            env(token::createOffer(bob_, nftID, STAmount{lpIssue, 10}),
+                token::Owner(carol_),
+                Ter(tecUNFUNDED_OFFER));
             env.close();
 
-            // gateway unfreezes bob's USD
-            env(trust(gw, bob["USD"](1'000'000), tfClearFreeze));
+            // gateway unfreezes bob_'s USD
+            env(trust(gw_, bob_["USD"](1'000'000), tfClearFreeze));
             env.close();
 
-            // bob can now create a buy offer
-            env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}), token::owner(carol));
+            // bob_ can now create a buy offer
+            env(token::createOffer(bob_, nftID, STAmount{lpIssue, 10}), token::Owner(carol_));
             env.close();
         }
         else
@@ -411,21 +411,21 @@ class LPTokenTransfer_test : public jtx::AMMTest
             // without fixFrozenLPTokenTransfer, freezing USD will still allow
             // buy/sell offers to be created/accepted with lptoken
 
-            // carol can still accept bob's offer despite carol's USD is frozen
-            env(token::acceptSellOffer(carol, sellOfferIndex));
+            // carol_ can still accept bob_'s offer despite carol_'s USD is frozen
+            env(token::acceptSellOffer(carol_, sellOfferIndex));
             env.close();
 
-            // gateway freezes bob's USD
-            env(trust(gw, bob["USD"](0), tfSetFreeze));
+            // gateway freezes bob_'s USD
+            env(trust(gw_, bob_["USD"](0), tfSetFreeze));
             env.close();
 
-            // bob creates a buy offer with lptoken despite bob's USD is frozen
-            uint256 const buyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftID, STAmount{lpIssue, 10}), token::owner(carol));
+            // bob_ creates a buy offer with lptoken despite bob_'s USD is frozen
+            uint256 const buyOfferIndex = keylet::nftoffer(bob_, env.seq(bob_)).key;
+            env(token::createOffer(bob_, nftID, STAmount{lpIssue, 10}), token::Owner(carol_));
             env.close();
 
-            // carol accepts bob's offer
-            env(token::acceptBuyOffer(carol, buyOfferIndex));
+            // carol_ accepts bob_'s offer
+            env(token::acceptBuyOffer(carol_, buyOfferIndex));
             env.close();
         }
     }
@@ -434,7 +434,7 @@ public:
     void
     run() override
     {
-        FeatureBitset const all{jtx::testable_amendments()};
+        FeatureBitset const all{jtx::testableAmendments()};
 
         for (auto const features : {all, all - fixFrozenLPTokenTransfer})
         {
diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp
index 73944b617c..396ec8db2d 100644
--- a/src/test/app/LedgerHistory_test.cpp
+++ b/src/test/app/LedgerHistory_test.cpp
@@ -26,7 +26,7 @@
 
 namespace xrpl::test {
 
-class LedgerHistory_test : public beast::unit_test::suite
+class LedgerHistory_test : public beast::unit_test::Suite
 {
 public:
     /** Generate a new ledger by hand, applying a specific close time offset
@@ -48,7 +48,7 @@ public:
         {
             assert(!stx);
             return std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{env.app().config().features},
                 env.app().config().FEES.toFees(),
                 std::vector<uint256>{},
@@ -59,14 +59,14 @@ public:
         if (stx)
         {
             OpenView accum(&*res);
-            applyTransaction(env.app(), accum, *stx, false, tapNONE, env.journal);
+            applyTransaction(env.app(), accum, *stx, false, TapNone, env.journal);
             accum.apply(*res);
         }
         res->updateSkipList();
 
         {
-            res->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
-            res->txMap().flushDirty(NodeObjectType::hotTRANSACTION_NODE);
+            res->stateMap().flushDirty(NodeObjectType::AccountNode);
+            res->txMap().flushDirty(NodeObjectType::TransactionNode);
         }
         res->unshare();
 
@@ -90,7 +90,7 @@ public:
         {
             bool found = false;
             Env env{*this, envconfig(), std::make_unique<CheckMessageLogs>("MISMATCH ", &found)};
-            LedgerHistory lh{beast::insight::NullCollector::New(), env.app()};
+            LedgerHistory lh{beast::insight::NullCollector::make(), env.app()};
             auto const genesis = makeLedger({}, env, lh, 0s);
             uint256 const dummyTxHash{1};
             lh.builtLedger(genesis, dummyTxHash, {});
@@ -106,7 +106,7 @@ public:
                 *this,
                 envconfig(),
                 std::make_unique<CheckMessageLogs>("MISMATCH on close time", &found)};
-            LedgerHistory lh{beast::insight::NullCollector::New(), env.app()};
+            LedgerHistory lh{beast::insight::NullCollector::make(), env.app()};
             auto const genesis = makeLedger({}, env, lh, 0s);
             auto const ledgerA = makeLedger(genesis, env, lh, 4s);
             auto const ledgerB = makeLedger(genesis, env, lh, 40s);
@@ -125,7 +125,7 @@ public:
                 *this,
                 envconfig(),
                 std::make_unique<CheckMessageLogs>("MISMATCH on prior ledger", &found)};
-            LedgerHistory lh{beast::insight::NullCollector::New(), env.app()};
+            LedgerHistory lh{beast::insight::NullCollector::make(), env.app()};
             auto const genesis = makeLedger({}, env, lh, 0s);
             auto const ledgerA = makeLedger(genesis, env, lh, 4s);
             auto const ledgerB = makeLedger(genesis, env, lh, 40s);
@@ -147,7 +147,7 @@ public:
                                           : "MISMATCH on consensus transaction set";
             bool found = false;
             Env env{*this, envconfig(), std::make_unique<CheckMessageLogs>(msg, &found)};
-            LedgerHistory lh{beast::insight::NullCollector::New(), env.app()};
+            LedgerHistory lh{beast::insight::NullCollector::make(), env.app()};
 
             Account const alice{"A1"};
             Account const bob{"A2"};
diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp
index a97b492921..3345f45aa6 100644
--- a/src/test/app/LedgerLoad_test.cpp
+++ b/src/test/app/LedgerLoad_test.cpp
@@ -31,7 +31,7 @@
 
 namespace xrpl {
 
-class LedgerLoad_test : public beast::unit_test::suite
+class LedgerLoad_test : public beast::unit_test::Suite
 {
     auto static ledgerConfig(
         std::unique_ptr<Config> cfg,
@@ -54,14 +54,14 @@ class LedgerLoad_test : public beast::unit_test::suite
         std::string const dbPath;
         // NOLINTBEGIN(readability-redundant-member-init)
         std::string ledgerFile = {};
-        Json::Value ledger = {};
-        Json::Value hashes = {};
+        json::Value ledger = {};
+        json::Value hashes = {};
         uint256 trapTxHash = {};
         // NOLINTEND(readability-redundant-member-init)
     };
 
     SetupData
-    setupLedger(beast::temp_dir const& td)
+    setupLedger(beast::TempDir const& td)
     {
         using namespace test::jtx;
         SetupData retval = {.dbPath = td.path()};
@@ -96,7 +96,7 @@ class LedgerLoad_test : public beast::unit_test::suite
                 if (it[sfLedgerEntryType.fieldName] == jss::LedgerHashes)
                     return it[sfHashes.fieldName];
             }
-            return Json::Value{};
+            return json::Value{};
         }();
 
         BEAST_EXPECT(retval.hashes.size() == 41);
@@ -127,7 +127,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, sd.ledgerFile, StartUpType::LoadFile, std::nullopt),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(
             sd.ledger[jss::ledger][jss::accountState].size() ==
@@ -147,7 +147,7 @@ class LedgerLoad_test : public beast::unit_test::suite
                 *this,
                 envconfig(ledgerConfig, sd.dbPath, "", StartUpType::LoadFile, std::nullopt),
                 nullptr,
-                beast::severities::kDisabled);
+                beast::severities::KDisabled);
         });
 
         // file does not exist
@@ -157,7 +157,7 @@ class LedgerLoad_test : public beast::unit_test::suite
                 envconfig(
                     ledgerConfig, sd.dbPath, "badfile.json", StartUpType::LoadFile, std::nullopt),
                 nullptr,
-                beast::severities::kDisabled);
+                beast::severities::KDisabled);
         });
 
         // make a corrupted version of the ledger file (last 10 bytes removed).
@@ -183,7 +183,7 @@ class LedgerLoad_test : public beast::unit_test::suite
                     StartUpType::LoadFile,
                     std::nullopt),
                 nullptr,
-                beast::severities::kDisabled);
+                beast::severities::KDisabled);
         });
     }
 
@@ -200,7 +200,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, ledgerHash, StartUpType::Load, std::nullopt),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(jrb[jss::ledger][jss::accountState].size() == 98);
         BEAST_EXPECT(
@@ -221,7 +221,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, ledgerHash, StartUpType::Replay, std::nullopt),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto const jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(jrb[jss::ledger][jss::accountState].size() == 97);
         // in replace mode do not automatically accept the ledger being replayed
@@ -247,7 +247,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, ledgerHash, StartUpType::Replay, sd.trapTxHash),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto const jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(jrb[jss::ledger][jss::accountState].size() == 97);
         // in replace mode do not automatically accept the ledger being replayed
@@ -277,7 +277,7 @@ class LedgerLoad_test : public beast::unit_test::suite
                 *this,
                 envconfig(ledgerConfig, sd.dbPath, ledgerHash, StartUpType::Replay, ~sd.trapTxHash),
                 nullptr,
-                beast::severities::kDisabled);
+                beast::severities::KDisabled);
             BEAST_EXPECT(false);
         }
         catch (std::runtime_error const&)
@@ -301,7 +301,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, "latest", StartUpType::Load, std::nullopt),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(
             sd.ledger[jss::ledger][jss::accountState].size() ==
@@ -319,7 +319,7 @@ class LedgerLoad_test : public beast::unit_test::suite
             *this,
             envconfig(ledgerConfig, sd.dbPath, "43", StartUpType::Load, std::nullopt),
             nullptr,
-            beast::severities::kDisabled);
+            beast::severities::KDisabled);
         auto jrb = env.rpc("ledger", "current", "full")[jss::result];
         BEAST_EXPECT(
             sd.ledger[jss::ledger][jss::accountState].size() ==
@@ -330,7 +330,7 @@ public:
     void
     run() override
     {
-        beast::temp_dir const td;
+        beast::TempDir const td;
         auto sd = setupLedger(td);
 
         // test cases
diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp
index 625eb22ac5..ee14a93d07 100644
--- a/src/test/app/LedgerMaster_test.cpp
+++ b/src/test/app/LedgerMaster_test.cpp
@@ -20,7 +20,7 @@
 
 namespace xrpl::test {
 
-class LedgerMaster_test : public beast::unit_test::suite
+class LedgerMaster_test : public beast::unit_test::Suite
 {
     static std::unique_ptr<Config>
     makeNetworkConfig(uint32_t networkID)
@@ -116,7 +116,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testWithFeats(all);
     }
 
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
index 7766be3545..a96fa2c499 100644
--- a/src/test/app/LedgerReplay_test.cpp
+++ b/src/test/app/LedgerReplay_test.cpp
@@ -65,7 +65,7 @@
 
 namespace xrpl::test {
 
-struct LedgerReplay_test : public beast::unit_test::suite
+struct LedgerReplay_test : public beast::unit_test::Suite
 {
     void
     run() override
@@ -87,7 +87,7 @@ struct LedgerReplay_test : public beast::unit_test::suite
         auto const lastClosedParent = ledgerMaster.getLedgerByHash(lastClosed->header().parentHash);
 
         auto const replayed = buildLedger(
-            LedgerReplay(lastClosedParent, lastClosed), tapNONE, env.app(), env.journal);
+            LedgerReplay(lastClosedParent, lastClosed), TapNone, env.app(), env.journal);
 
         BEAST_EXPECT(replayed->header().hash == lastClosed->header().hash);
     }
@@ -170,7 +170,7 @@ public:
     {
     }
 
-    Json::Value
+    json::Value
     getInfo() override
     {
         return {};
@@ -227,7 +227,7 @@ class TestPeer : public Peer
 public:
     TestPeer(bool enableLedgerReplay)
         : ledgerReplayEnabled_(enableLedgerReplay)
-        , nodePublicKey_(derivePublicKey(KeyType::ed25519, randomSecretKey()))
+        , nodePublicKey_(derivePublicKey(KeyType::Ed25519, randomSecretKey()))
     {
     }
 
@@ -269,7 +269,7 @@ public:
     {
         return nodePublicKey_;
     }
-    Json::Value
+    json::Value
     json() override
     {
         return {};
@@ -291,8 +291,8 @@ public:
     [[nodiscard]] uint256 const&
     getClosedLedgerHash() const override
     {
-        static uint256 const hash{};
-        return hash;
+        static uint256 const kHASH{};
+        return kHASH;
     }
     [[nodiscard]] bool
     hasLedger(uint256 const& hash, std::uint32_t seq) const override
@@ -346,9 +346,11 @@ public:
         return fingerprint_;
     }
 
+    // NOLINTBEGIN(readability-identifier-naming)
     std::string fingerprint_;
     bool ledgerReplayEnabled_;
     PublicKey nodePublicKey_;
+    // NOLINTEND(readability-identifier-naming)
 };
 
 enum class PeerSetBehavior {
@@ -443,8 +445,8 @@ struct TestPeerSet : public PeerSet
     [[nodiscard]] std::set<Peer::id_t> const&
     getPeerIds() const override
     {
-        static std::set<Peer::id_t> const emptyPeers;
-        return emptyPeers;
+        static std::set<Peer::id_t> const kEMPTY_PEERS;
+        return kEMPTY_PEERS;
     }
 
     LedgerReplayMsgHandler& local;
@@ -464,24 +466,24 @@ public:
         LedgerReplayMsgHandler& other,
         PeerSetBehavior bhvr,
         PeerFeature peerFeature)
-        : local(me)
-        , remote(other)
-        , behavior(bhvr)
-        , enableLedgerReplay(peerFeature == PeerFeature::LedgerReplayEnabled)
+        : local_(me)
+        , remote_(other)
+        , behavior_(bhvr)
+        , enableLedgerReplay_(peerFeature == PeerFeature::LedgerReplayEnabled)
     {
     }
 
     std::unique_ptr<PeerSet>
     build() override
     {
-        return std::make_unique<TestPeerSet>(local, remote, behavior, enableLedgerReplay);
+        return std::make_unique<TestPeerSet>(local_, remote_, behavior_, enableLedgerReplay_);
     }
 
 private:
-    LedgerReplayMsgHandler& local;
-    LedgerReplayMsgHandler& remote;
-    PeerSetBehavior behavior;
-    bool enableLedgerReplay;
+    LedgerReplayMsgHandler& local_;
+    LedgerReplayMsgHandler& remote_;
+    PeerSetBehavior behavior_;
+    bool enableLedgerReplay_;
 };
 
 /**
@@ -499,7 +501,7 @@ struct LedgerServer
         int txAmount = 10;
     };
 
-    LedgerServer(beast::unit_test::suite& suite, Parameter const& p)
+    LedgerServer(beast::unit_test::Suite& suite, Parameter const& p)
         : env(suite)
         , app(env.app())
         , ledgerMaster(env.app().getLedgerMaster())
@@ -509,7 +511,7 @@ struct LedgerServer
         assert(param.initLedgers > 0);
         createAccounts(param.initAccounts);
         createLedgerHistory();
-        app.getLogs().threshold(beast::severities::kWarning);
+        app.getLogs().threshold(beast::severities::KWarning);
     }
 
     /**
@@ -559,9 +561,9 @@ struct LedgerServer
                     accounts[toIdx],
                     jtx::drops(ledgerMaster.getClosedLedger()->fees().base) +
                         jtx::XRP(param.txAmount)),
-                jtx::seq(jtx::autofill),
-                jtx::fee(jtx::autofill),
-                jtx::sig(jtx::autofill));
+                jtx::Seq(jtx::kAUTOFILL),
+                jtx::Fee(jtx::kAUTOFILL),
+                jtx::Sig(jtx::kAUTOFILL));
         }
         env.close();
     }
@@ -604,12 +606,12 @@ class LedgerReplayClient
 {
 public:
     LedgerReplayClient(
-        beast::unit_test::suite& suite,
+        beast::unit_test::Suite& suite,
         LedgerServer& server,
         PeerSetBehavior behavior = PeerSetBehavior::Good,
         InboundLedgersBehavior inboundBhvr = InboundLedgersBehavior::Good,
         PeerFeature peerFeature = PeerFeature::LedgerReplayEnabled)
-        : env(suite, jtx::envconfig(), nullptr, beast::severities::kDisabled)
+        : env(suite, jtx::envconfig(), nullptr, beast::severities::KDisabled)
         , app(env.app())
         , ledgerMaster(env.app().getLedgerMaster())
         , inboundLedgers(server.app.getLedgerMaster(), ledgerMaster, inboundBhvr)
@@ -699,7 +701,7 @@ public:
     {
         std::unique_lock<std::mutex> const lock(replayer.mtx_);
         auto i = std::ranges::find_if(replayer.tasks_, [&](auto const& t) {
-            return t->parameter_.finishHash_ == hash && t->parameter_.totalLedgers_ == totalReplay;
+            return t->parameter_.finishHash == hash && t->parameter_.totalLedgers == totalReplay;
         });
         if (i == replayer.tasks_.end())
             return {};
@@ -846,7 +848,7 @@ void
 logAll(
     LedgerServer& server,
     LedgerReplayClient& client,
-    beast::severities::Severity level = Severity::kTrace)
+    beast::severities::Severity level = Severity::KTrace)
 {
     server.app.getLogs().threshold(level);
     client.app.getLogs().threshold(level);
@@ -859,7 +861,7 @@ logAll(
 struct NetworkOfTwo
 {
     NetworkOfTwo(
-        beast::unit_test::suite& suite,
+        beast::unit_test::Suite& suite,
         LedgerServer::Parameter const& param,
         PeerSetBehavior behavior = PeerSetBehavior::Good,
         InboundLedgersBehavior inboundBhvr = InboundLedgersBehavior::Good,
@@ -897,7 +899,7 @@ struct NetworkOfTwo
  * -- call replayer.replay() 4 times to replay 1000 ledgers
  */
 
-struct LedgerReplayer_test : public beast::unit_test::suite
+struct LedgerReplayer_test : public beast::unit_test::Suite
 {
     void
     testProofPath()
@@ -1033,19 +1035,19 @@ struct LedgerReplayer_test : public beast::unit_test::suite
         BEAST_EXPECT(tp9.canMergeInto(tp10));
         BEAST_EXPECT(!tp10.canMergeInto(tp9));
 
-        tp9.totalLedgers_++;
+        tp9.totalLedgers++;
         BEAST_EXPECT(!tp9.canMergeInto(tp10));
-        tp9.totalLedgers_--;
+        tp9.totalLedgers--;
         BEAST_EXPECT(tp9.canMergeInto(tp10));
 
-        tp9.reason_ = InboundLedger::Reason::CONSENSUS;
+        tp9.reason = InboundLedger::Reason::CONSENSUS;
         BEAST_EXPECT(!tp9.canMergeInto(tp10));
-        tp9.reason_ = InboundLedger::Reason::GENERIC;
+        tp9.reason = InboundLedger::Reason::GENERIC;
         BEAST_EXPECT(tp9.canMergeInto(tp10));
 
-        tp9.finishHash_ = uint256(1234);
+        tp9.finishHash = uint256(1234);
         BEAST_EXPECT(!tp9.canMergeInto(tp10));
-        tp9.finishHash_ = uint256(9);
+        tp9.finishHash = uint256(9);
         BEAST_EXPECT(tp9.canMergeInto(tp10));
 
         // larger task
@@ -1093,20 +1095,20 @@ struct LedgerReplayer_test : public beast::unit_test::suite
         testcase("handshake test");
         auto handshake = [&](bool client, bool server, bool expecting) -> bool {
             auto request = xrpl::makeRequest(true, false, client, false, false);
-            http_request_type http_request;
-            http_request.version(request.version());
-            http_request.base() = request.base();
+            http_request_type httpRequest;
+            httpRequest.version(request.version());
+            httpRequest.base() = request.base();
             bool const serverResult =
-                peerFeatureEnabled(http_request, FEATURE_LEDGER_REPLAY, server);
+                peerFeatureEnabled(httpRequest, kFEATURE_LEDGER_REPLAY, server);
             if (serverResult != expecting)
                 return false;
 
             beast::IP::Address const addr = boost::asio::ip::make_address("172.1.1.100");
             jtx::Env serverEnv(*this);
             serverEnv.app().config().LEDGER_REPLAY = server;
-            auto http_resp = xrpl::makeResponse(
-                true, http_request, addr, addr, uint256{1}, 1, {1, 0}, serverEnv.app());
-            auto const clientResult = peerFeatureEnabled(http_resp, FEATURE_LEDGER_REPLAY, client);
+            auto httpResp = xrpl::makeResponse(
+                true, httpRequest, addr, addr, uint256{1}, 1, {1, 0}, serverEnv.app());
+            auto const clientResult = peerFeatureEnabled(httpResp, kFEATURE_LEDGER_REPLAY, client);
             return clientResult == expecting;
         };
 
@@ -1285,7 +1287,7 @@ struct LedgerReplayer_test : public beast::unit_test::suite
         auto skipList = net.client.findSkipListAcquire(finalHash);
 
         std::uint8_t payload[55] = {0x6A, 0x09, 0xE6, 0x67, 0xF3, 0xBC, 0xC9, 0x08, 0xB2};
-        auto item = make_shamapitem(uint256(12345), Slice(payload, sizeof(payload)));
+        auto item = makeShamapitem(uint256(12345), Slice(payload, sizeof(payload)));
         skipList->processData(l->seq(), item);
 
         std::vector<TaskStatus> const deltaStatuses;
@@ -1363,29 +1365,28 @@ struct LedgerReplayer_test : public beast::unit_test::suite
         {
             l = net.server.ledgerMaster.getLedgerByHash(l->header().parentHash);
         }
-        auto finalHash_early = l->header().hash;
-        net.client.replayer.replay(InboundLedger::Reason::GENERIC, finalHash_early, totalReplay);
+        auto finalHashEarly = l->header().hash;
+        net.client.replayer.replay(InboundLedger::Reason::GENERIC, finalHashEarly, totalReplay);
         BEAST_EXPECT(net.client.waitAndCheckStatus(
-            finalHash_early,
+            finalHashEarly,
             totalReplay,
             TaskStatus::Completed,
             TaskStatus::Completed,
             deltaStatuses));  // deltaStatuses no change
-        BEAST_EXPECT(net.client.waitForLedgers(finalHash_early, totalReplay));
+        BEAST_EXPECT(net.client.waitForLedgers(finalHashEarly, totalReplay));
         BEAST_EXPECT(net.client.countsAsExpected(3, 2, 2 * (totalReplay - 1)));
 
         // partial overlap
         l = net.server.ledgerMaster.getLedgerByHash(l->header().parentHash);
-        auto finalHash_moreEarly = l->header().parentHash;
-        net.client.replayer.replay(
-            InboundLedger::Reason::GENERIC, finalHash_moreEarly, totalReplay);
+        auto finalHashMoreEarly = l->header().parentHash;
+        net.client.replayer.replay(InboundLedger::Reason::GENERIC, finalHashMoreEarly, totalReplay);
         BEAST_EXPECT(net.client.waitAndCheckStatus(
-            finalHash_moreEarly,
+            finalHashMoreEarly,
             totalReplay,
             TaskStatus::Completed,
             TaskStatus::Completed,
             deltaStatuses));  // deltaStatuses no change
-        BEAST_EXPECT(net.client.waitForLedgers(finalHash_moreEarly, totalReplay));
+        BEAST_EXPECT(net.client.waitForLedgers(finalHashMoreEarly, totalReplay));
         BEAST_EXPECT(net.client.countsAsExpected(4, 3, (2 * (totalReplay - 1)) + 2));
 
         // cover
@@ -1428,7 +1429,7 @@ struct LedgerReplayer_test : public beast::unit_test::suite
     }
 };
 
-struct LedgerReplayerTimeout_test : public beast::unit_test::suite
+struct LedgerReplayerTimeout_test : public beast::unit_test::Suite
 {
     void
     testSkipListTimeout()
@@ -1492,7 +1493,7 @@ struct LedgerReplayerTimeout_test : public beast::unit_test::suite
     }
 };
 
-struct LedgerReplayerLong_test : public beast::unit_test::suite
+struct LedgerReplayerLong_test : public beast::unit_test::Suite
 {
     void
     run() override
diff --git a/src/test/app/LendingHelpers_test.cpp b/src/test/app/LendingHelpers_test.cpp
index 82c80f0158..cbfd9da884 100644
--- a/src/test/app/LendingHelpers_test.cpp
+++ b/src/test/app/LendingHelpers_test.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl::test {
 
-class LendingHelpers_test : public beast::unit_test::suite
+class LendingHelpers_test : public beast::unit_test::Suite
 {
     void
     testComputeRaisedRate()
@@ -249,7 +249,7 @@ class LendingHelpers_test : public beast::unit_test::suite
         using namespace xrpl::detail;
 
         Account const issuer{"issuer"};
-        PrettyAsset const IOU = issuer["IOU"];
+        PrettyAsset const iou = issuer["IOU"];
         int32_t const loanScale = 1;
         auto const overpayment = Number{1'000};
         auto const overpaymentInterestRate = TenthBips32{10'000};  // 10%
@@ -263,7 +263,7 @@ class LendingHelpers_test : public beast::unit_test::suite
         auto const expectedPrincipalPortion = Number{400};          // 1,000 - 100 - 500
 
         auto const components = xrpl::detail::computeOverpaymentComponents(
-            IOU,
+            iou,
             loanScale,
             overpayment,
             overpaymentInterestRate,
@@ -304,7 +304,7 @@ class LendingHelpers_test : public beast::unit_test::suite
         };
 
         Account const issuer{"issuer"};
-        PrettyAsset const IOU = issuer["IOU"];
+        PrettyAsset const iou = issuer["IOU"];
         std::int32_t const loanScale = 1;
 
         auto const testCases = std::vector<TestCase>{
@@ -330,7 +330,7 @@ class LendingHelpers_test : public beast::unit_test::suite
             testcase("computeInterestAndFeeParts: " + tc.name);
 
             auto const [computedInterestPart, computedFeePart] =
-                computeInterestAndFeeParts(IOU, tc.interest, tc.managementFeeRate, loanScale);
+                computeInterestAndFeeParts(iou, tc.interest, tc.managementFeeRate, loanScale);
             BEAST_EXPECTS(
                 computedInterestPart == tc.expectedInterestPart,
                 "Interest part mismatch: expected " + to_string(tc.expectedInterestPart) +
diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp
index f6d05bf0e6..1122ac4ad6 100644
--- a/src/test/app/LoadFeeTrack_test.cpp
+++ b/src/test/app/LoadFeeTrack_test.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-class LoadFeeTrack_test : public beast::unit_test::suite
+class LoadFeeTrack_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -18,8 +18,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee;
-                f.reserve = 200 * DROPS_PER_XRP;
-                f.increment = 50 * DROPS_PER_XRP;
+                f.reserve = 200 * kDROPS_PER_XRP;
+                f.increment = 50 * kDROPS_PER_XRP;
                 return f;
             }();
 
@@ -31,8 +31,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee * 10;
-                f.reserve = 200 * DROPS_PER_XRP;
-                f.increment = 50 * DROPS_PER_XRP;
+                f.reserve = 200 * kDROPS_PER_XRP;
+                f.increment = 50 * kDROPS_PER_XRP;
                 return f;
             }();
 
@@ -44,8 +44,8 @@ public:
             Fees const fees = [&]() {
                 Fees f;
                 f.base = d.FEES.reference_fee;
-                f.reserve = 200 * DROPS_PER_XRP;
-                f.increment = 50 * DROPS_PER_XRP;
+                f.reserve = 200 * kDROPS_PER_XRP;
+                f.increment = 50 * kDROPS_PER_XRP;
                 return f;
             }();
 
diff --git a/src/test/app/LoanBroker_test.cpp b/src/test/app/LoanBroker_test.cpp
index 3bdd346877..58c925c043 100644
--- a/src/test/app/LoanBroker_test.cpp
+++ b/src/test/app/LoanBroker_test.cpp
@@ -59,11 +59,11 @@
 
 namespace xrpl::test {
 
-class LoanBroker_test : public beast::unit_test::suite
+class LoanBroker_test : public beast::unit_test::Suite
 {
     // Ensure that all the features needed for Lending Protocol are included,
     // even if they are set to unsupported.
-    FeatureBitset const all{jtx::testable_amendments()};
+    FeatureBitset const all_{jtx::testableAmendments()};
 
     void
     testDisabled()
@@ -84,34 +84,34 @@ class LoanBroker_test : public beast::unit_test::suite
             PrettyAsset const asset{xrpIssue(), 1'000'000};
             Vault const vault{env};
             auto const [tx, keylet] = vault.create({.owner = alice, .asset = asset});
-            env(tx, ter(goodVault ? ter(tesSUCCESS) : ter(temDISABLED)));
+            env(tx, Ter(goodVault ? Ter(tesSUCCESS) : Ter(temDISABLED)));
             env.close();
             BEAST_EXPECT(static_cast<bool>(env.le(keylet)) == goodVault);
 
             using namespace loanBroker;
             // Can't create a loan broker regardless of whether the vault exists
-            env(set(alice, keylet.key), ter(temDISABLED));
+            env(set(alice, keylet.key), Ter(temDISABLED));
             auto const brokerKeylet = keylet::loanbroker(alice.id(), env.seq(alice));
             // Other LoanBroker transactions are disabled, too.
             // 1. LoanBrokerCoverDeposit
-            env(coverDeposit(alice, brokerKeylet.key, asset(1000)), ter(temDISABLED));
+            env(coverDeposit(alice, brokerKeylet.key, asset(1000)), Ter(temDISABLED));
             // 2. LoanBrokerCoverWithdraw
-            env(coverWithdraw(alice, brokerKeylet.key, asset(1000)), ter(temDISABLED));
+            env(coverWithdraw(alice, brokerKeylet.key, asset(1000)), Ter(temDISABLED));
             // 3. LoanBrokerCoverClawback
-            env(coverClawback(alice), ter(temDISABLED));
-            env(coverClawback(alice), loanBrokerID(brokerKeylet.key), ter(temDISABLED));
-            env(coverClawback(alice), amount(asset(0)), ter(temDISABLED));
+            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),
-                loanBrokerID(brokerKeylet.key),
-                amount(asset(1000)),
-                ter(temDISABLED));
+                kLOAN_BROKER_ID(brokerKeylet.key),
+                kAMOUNT(asset(1000)),
+                Ter(temDISABLED));
             // 4. LoanBrokerDelete
-            env(del(alice, brokerKeylet.key), ter(temDISABLED));
+            env(del(alice, brokerKeylet.key), Ter(temDISABLED));
         };
-        failAll(all - featureMPTokensV1);
-        failAll(all - featureSingleAssetVault - featureLendingProtocol);
-        failAll(all - featureSingleAssetVault);
-        failAll(all - featureLendingProtocol, true);
+        failAll(all_ - featureMPTokensV1);
+        failAll(all_ - featureSingleAssetVault - featureLendingProtocol);
+        failAll(all_ - featureSingleAssetVault);
+        failAll(all_ - featureLendingProtocol, true);
     }
 
     struct VaultInfo
@@ -119,8 +119,8 @@ class LoanBroker_test : public beast::unit_test::suite
         jtx::PrettyAsset asset;
         uint256 vaultID;
         jtx::Account pseudoAccount;
-        VaultInfo(jtx::PrettyAsset const& asset_, uint256 const& vaultID_, AccountID const& pseudo)
-            : asset(asset_), vaultID(vaultID_), pseudoAccount("vault", pseudo)
+        VaultInfo(jtx::PrettyAsset const& asset, uint256 const& vaultId, AccountID const& pseudo)
+            : asset(asset), vaultID(vaultId), pseudoAccount("vault", pseudo)
         {
         }
     };
@@ -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 badMptAsset = [&]() {
-            MPTTester badMptt{env, evan, mptInitNoFund};
+        static PrettyAsset const kBAD_MPT_ASSET = [&]() {
+            MPTTester badMptt{env, evan, kMPT_INIT_NO_FUND};
             badMptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             env.close();
             return badMptt["BAD"];
         }();
-        static PrettyAsset const badIouAsset = evan["BAD"];
-        static Account const nonExistent{"NonExistent"};
-        static PrettyAsset const ghostIouAsset = nonExistent["GST"];
+        static PrettyAsset const kBAD_IOU_ASSET = evan["BAD"];
+        static Account const kNON_EXISTENT{"NonExistent"};
+        static PrettyAsset const kGHOST_IOU_ASSET = kNON_EXISTENT["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::zero);
+                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));
@@ -284,72 +284,72 @@ class LoanBroker_test : public beast::unit_test::suite
                     {
                         auto const amount = vault.asset(n);
                         BEAST_EXPECT(broker->at(sfCoverAvailable) == amount.number());
-                        env.require(balance(pseudoAccount, amount));
+                        env.require(Balance(pseudoAccount, amount));
                     }
                 };
 
             // Test Cover funding before allowing alterations
-            env(coverDeposit(alice, uint256(0), vault.asset(10)), ter(temINVALID));
-            env(coverDeposit(evan, keylet.key, vault.asset(10)), ter(tecNO_PERMISSION));
-            env(coverDeposit(evan, keylet.key, vault.asset(0)), ter(temBAD_AMOUNT));
-            env(coverDeposit(evan, keylet.key, vault.asset(-10)), ter(temBAD_AMOUNT));
-            env(coverDeposit(alice, vault.vaultID, vault.asset(10)), ter(tecNO_ENTRY));
+            env(coverDeposit(alice, uint256(0), vault.asset(10)), Ter(temINVALID));
+            env(coverDeposit(evan, keylet.key, vault.asset(10)), Ter(tecNO_PERMISSION));
+            env(coverDeposit(evan, keylet.key, vault.asset(0)), Ter(temBAD_AMOUNT));
+            env(coverDeposit(evan, keylet.key, vault.asset(-10)), Ter(temBAD_AMOUNT));
+            env(coverDeposit(alice, vault.vaultID, vault.asset(10)), Ter(tecNO_ENTRY));
 
             verifyCoverAmount(0);
 
             // Test cover clawback failure cases BEFORE depositing any cover
             // Need one of brokerID or amount
-            env(coverClawback(alice), ter(temINVALID));
-            env(coverClawback(alice), loanBrokerID(uint256(0)), ter(temINVALID));
-            env(coverClawback(alice), amount(XRP(1000)), ter(temBAD_AMOUNT));
-            env(coverClawback(alice), amount(vault.asset(-10)), ter(temBAD_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));
             // Clawbacks with an MPT need to specify the broker ID
-            env(coverClawback(alice), amount(badMptAsset(1)), ter(temINVALID));
-            env(coverClawback(evan), loanBrokerID(vault.vaultID), ter(tecNO_ENTRY));
+            env(coverClawback(alice), kAMOUNT(kBAD_MPT_ASSET(1)), Ter(temINVALID));
+            env(coverClawback(evan), kLOAN_BROKER_ID(vault.vaultID), Ter(tecNO_ENTRY));
             // Only the issuer can clawback
-            env(coverClawback(alice), loanBrokerID(keylet.key), ter(tecNO_PERMISSION));
+            env(coverClawback(alice), kLOAN_BROKER_ID(keylet.key), Ter(tecNO_PERMISSION));
             if (vault.asset.raw().native())
             {
                 // Can not clawback XRP under any circumstances
-                env(coverClawback(issuer), loanBrokerID(keylet.key), ter(tecNO_PERMISSION));
+                env(coverClawback(issuer), kLOAN_BROKER_ID(keylet.key), Ter(tecNO_PERMISSION));
             }
             else
             {
                 if (vault.asset.raw().holds<Issue>())
                 {
-                    // Clawbacks without a loanBrokerID need to specify an IOU
+                    // Clawbacks without a kLOAN_BROKER_ID need to specify an IOU
                     // with the broker's pseudo-account as the issuer
-                    env(coverClawback(alice), amount(ghostIouAsset(1)), ter(tecNO_ENTRY));
-                    env(coverClawback(alice), amount(badIouAsset(1)), ter(tecOBJECT_NOT_FOUND));
+                    env(coverClawback(alice), kAMOUNT(kGHOST_IOU_ASSET(1)), Ter(tecNO_ENTRY));
+                    env(coverClawback(alice), kAMOUNT(kBAD_IOU_ASSET(1)), Ter(tecOBJECT_NOT_FOUND));
                     // Pseudo-account is not for a broker
                     env(coverClawback(alice),
-                        amount(vaultPseudoIouAsset(1)),
-                        ter(tecOBJECT_NOT_FOUND));
+                        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),
-                        loanBrokerID(keylet.key),
-                        amount(badBrokerPseudoIouAsset(10)),
-                        ter(tecWRONG_ASSET));
+                        kLOAN_BROKER_ID(keylet.key),
+                        kAMOUNT(badBrokerPseudoIouAsset(10)),
+                        Ter(tecWRONG_ASSET));
                     PrettyAsset const brokerWrongCurrencyAsset = pseudoAccount["WAT"];
                     env(coverClawback(issuer),
-                        loanBrokerID(keylet.key),
-                        amount(brokerWrongCurrencyAsset(10)),
-                        ter(tecWRONG_ASSET));
+                        kLOAN_BROKER_ID(keylet.key),
+                        kAMOUNT(brokerWrongCurrencyAsset(10)),
+                        Ter(tecWRONG_ASSET));
                 }
                 else
                 {
                     // 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), amount(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),
-                    loanBrokerID(keylet.key),
-                    amount(vault.asset(10)),
-                    ter(tecINSUFFICIENT_FUNDS));
+                    kLOAN_BROKER_ID(keylet.key),
+                    kAMOUNT(vault.asset(10)),
+                    Ter(tecINSUFFICIENT_FUNDS));
             }
             env.close();
 
@@ -359,26 +359,26 @@ class LoanBroker_test : public beast::unit_test::suite
             verifyCoverAmount(10);
 
             // Test withdrawal failure cases
-            env(coverWithdraw(alice, uint256(0), vault.asset(10)), ter(temINVALID));
-            env(coverWithdraw(evan, keylet.key, vault.asset(10)), ter(tecNO_PERMISSION));
-            env(coverWithdraw(evan, keylet.key, vault.asset(0)), ter(temBAD_AMOUNT));
-            env(coverWithdraw(evan, keylet.key, vault.asset(-10)), ter(temBAD_AMOUNT));
-            env(coverWithdraw(alice, vault.vaultID, vault.asset(10)), ter(tecNO_ENTRY));
-            env(coverWithdraw(alice, keylet.key, vault.asset(900)), ter(tecINSUFFICIENT_FUNDS));
+            env(coverWithdraw(alice, uint256(0), vault.asset(10)), Ter(temINVALID));
+            env(coverWithdraw(evan, keylet.key, vault.asset(10)), Ter(tecNO_PERMISSION));
+            env(coverWithdraw(evan, keylet.key, vault.asset(0)), Ter(temBAD_AMOUNT));
+            env(coverWithdraw(evan, keylet.key, vault.asset(-10)), Ter(temBAD_AMOUNT));
+            env(coverWithdraw(alice, vault.vaultID, vault.asset(10)), Ter(tecNO_ENTRY));
+            env(coverWithdraw(alice, keylet.key, vault.asset(900)), Ter(tecINSUFFICIENT_FUNDS));
 
             // Skip this test for XRP, because that can always be sent
             if (!vault.asset.raw().native())
             {
                 TER const expected = vault.asset.raw().holds<MPTIssue>() ? tecNO_AUTH : tecNO_LINE;
                 env(coverWithdraw(alice, keylet.key, vault.asset(1)),
-                    destination(bystander),
-                    ter(expected));
+                    kDESTINATION(bystander),
+                    Ter(expected));
             }
 
             // Can not withdraw to the zero address
             env(coverWithdraw(alice, keylet.key, vault.asset(1)),
-                destination(AccountID{}),
-                ter(temMALFORMED));
+                kDESTINATION(AccountID{}),
+                Ter(temMALFORMED));
 
             // Withdraw some of the cover amount
             env(coverWithdraw(alice, keylet.key, vault.asset(7)));
@@ -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)), destination(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)), destination(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), loanBrokerID(keylet.key), amount(vault.asset(2)));
+                env(coverClawback(issuer), kLOAN_BROKER_ID(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),
-                             loanBrokerID(keylet.key),
-                             fee(none),
-                             seq(none),
-                             sig(none)),
+                             kLOAN_BROKER_ID(keylet.key),
+                             Fee(kNONE),
+                             Seq(kNONE),
+                             Sig(kNONE)),
                          env.json(
                              coverClawback(issuer),
-                             loanBrokerID(keylet.key),
-                             amount(vault.asset(0)),
-                             fee(none),
-                             seq(none),
-                             sig(none)),
+                             kLOAN_BROKER_ID(keylet.key),
+                             kAMOUNT(vault.asset(0)),
+                             Fee(kNONE),
+                             Seq(kNONE),
+                             Sig(kNONE)),
                          env.json(
                              coverClawback(issuer),
-                             loanBrokerID(keylet.key),
-                             amount(vault.asset(6)),
-                             fee(none),
-                             seq(none),
-                             sig(none)),
+                             kLOAN_BROKER_ID(keylet.key),
+                             kAMOUNT(vault.asset(6)),
+                             Fee(kNONE),
+                             Seq(kNONE),
+                             Sig(kNONE)),
                          // amount will be truncated to what's available
                          env.json(
                              coverClawback(issuer),
-                             loanBrokerID(keylet.key),
-                             amount(vault.asset(100)),
-                             fee(none),
-                             seq(none),
-                             sig(none)),
+                             kLOAN_BROKER_ID(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), loanBrokerID(keylet.key));
+            env(set(alice, vault.vaultID), kLOAN_BROKER_ID(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),
-                loanBrokerID(broker->key()),
-                debtMaximum(Number(0)),
-                data(""));
+                kLOAN_BROKER_ID(broker->key()),
+                kDEBT_MAXIMUM(Number(0)),
+                kDATA(""));
             env.close();
 
             // Check the updated fields
@@ -491,9 +491,9 @@ class LoanBroker_test : public beast::unit_test::suite
 
             /////////////////////////////////////
             // try to delete the wrong broker object
-            env(del(alice, vault.vaultID), ter(tecNO_ENTRY));
+            env(del(alice, vault.vaultID), Ter(tecNO_ENTRY));
             // evan tries to delete the broker
-            env(del(evan, keylet.key), ter(tecNO_PERMISSION));
+            env(del(evan, keylet.key), Ter(tecNO_PERMISSION));
 
             // Get the "bad" broker out of the way
             env(del(alice, badKeylet.key));
@@ -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::zero);
+            BEAST_EXPECT(coverFunds != beast::kZERO);
             verifyCoverAmount(6);
 
             // delete the broker
@@ -529,8 +529,8 @@ class LoanBroker_test : public beast::unit_test::suite
             auto const expectedBalance = aliceBalance + coverFunds -
                 (aliceBalance.value().native() ? STAmount(env.current()->fees().base.value())
                                                : vault.asset(0));
-            env.require(balance(alice, expectedBalance));
-            env.require(balance(pseudoAccount, vault.asset(none)));
+            env.require(Balance(alice, expectedBalance));
+            env.require(Balance(pseudoAccount, vault.asset(kNONE)));
         }
     }
 
@@ -542,7 +542,7 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // Create 3 loan brokers: one for XRP, one for an IOU, and one for an
         // MPT. That'll require three corresponding SAVs.
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         // For simplicity, alice will be the sole actor for the vault & brokers.
@@ -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, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         env.close();
         PrettyAsset const mptAsset = mptt["MPT"];
@@ -645,64 +645,66 @@ class LoanBroker_test : public beast::unit_test::suite
             auto badKeylet = keylet::vault(alice.id(), env.seq(alice));
             // Try some failure cases
             // not the vault owner
-            env(set(evan, vault.vaultID), ter(tecNO_PERMISSION));
+            env(set(evan, vault.vaultID), Ter(tecNO_PERMISSION));
             // not a vault
-            env(set(alice, badKeylet.key), ter(tecNO_ENTRY));
+            env(set(alice, badKeylet.key), Ter(tecNO_ENTRY));
             // flags are checked first
-            env(set(evan, vault.vaultID, ~tfUniversal), ter(temINVALID_FLAG));
+            env(set(evan, vault.vaultID, ~tfUniversal), Ter(temINVALID_FLAG));
             // field length validation
             // sfData: good length, bad account
             env(set(evan, vault.vaultID),
-                data(std::string(maxDataPayloadLength, 'X')),
-                ter(tecNO_PERMISSION));
+                kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH, 'X')),
+                Ter(tecNO_PERMISSION));
             // sfData: too long
             env(set(evan, vault.vaultID),
-                data(std::string(maxDataPayloadLength + 1, 'Y')),
-                ter(temINVALID));
+                kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'Y')),
+                Ter(temINVALID));
             // sfManagementFeeRate: good value, bad account
             env(set(evan, vault.vaultID),
-                managementFeeRate(maxManagementFeeRate),
-                ter(tecNO_PERMISSION));
+                kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE),
+                Ter(tecNO_PERMISSION));
             // sfManagementFeeRate: too big
             env(set(evan, vault.vaultID),
-                managementFeeRate(maxManagementFeeRate + TenthBips16(10)),
-                ter(temINVALID));
+                kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE + TenthBips16(10)),
+                Ter(temINVALID));
             // sfCoverRateMinimum and sfCoverRateLiquidation are linked
             // Cover: good value, bad account
             env(set(evan, vault.vaultID),
-                coverRateMinimum(maxCoverRate),
-                coverRateLiquidation(maxCoverRate),
-                ter(tecNO_PERMISSION));
+                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE),
+                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
+                Ter(tecNO_PERMISSION));
             // CoverMinimum: too big
             env(set(evan, vault.vaultID),
-                coverRateMinimum(maxCoverRate + 1),
-                coverRateLiquidation(maxCoverRate + 1),
-                ter(temINVALID));
+                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE + 1),
+                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE + 1),
+                Ter(temINVALID));
             // CoverLiquidation: too big
             env(set(evan, vault.vaultID),
-                coverRateMinimum(maxCoverRate / 2),
-                coverRateLiquidation(maxCoverRate + 1),
-                ter(temINVALID));
+                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE / 2),
+                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE + 1),
+                Ter(temINVALID));
             // Cover: zero min, non-zero liquidation - implicit and
             // explicit zero values.
-            env(set(evan, vault.vaultID), coverRateLiquidation(maxCoverRate), ter(temINVALID));
             env(set(evan, vault.vaultID),
-                coverRateMinimum(tenthBipsZero),
-                coverRateLiquidation(maxCoverRate),
-                ter(temINVALID));
+                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
+                Ter(temINVALID));
+            env(set(evan, vault.vaultID),
+                kCOVER_RATE_MINIMUM(tenthBipsZero),
+                kCOVER_RATE_LIQUIDATION(kMAX_COVER_RATE),
+                Ter(temINVALID));
             // Cover: non-zero min, zero liquidation - implicit and
             // explicit zero values.
-            env(set(evan, vault.vaultID), coverRateMinimum(maxCoverRate), ter(temINVALID));
+            env(set(evan, vault.vaultID), kCOVER_RATE_MINIMUM(kMAX_COVER_RATE), Ter(temINVALID));
             env(set(evan, vault.vaultID),
-                coverRateMinimum(maxCoverRate),
-                coverRateLiquidation(tenthBipsZero),
-                ter(temINVALID));
+                kCOVER_RATE_MINIMUM(kMAX_COVER_RATE),
+                kCOVER_RATE_LIQUIDATION(tenthBipsZero),
+                Ter(temINVALID));
             // sfDebtMaximum: good value, bad account
-            env(set(evan, vault.vaultID), debtMaximum(Number(0)), ter(tecNO_PERMISSION));
+            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(0)), Ter(tecNO_PERMISSION));
             // sfDebtMaximum: overflow
-            env(set(evan, vault.vaultID), debtMaximum(Number(1, 100)), ter(temINVALID));
+            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(1, 100)), Ter(temINVALID));
             // sfDebtMaximum: negative
-            env(set(evan, vault.vaultID), debtMaximum(Number(-1)), ter(temINVALID));
+            env(set(evan, vault.vaultID), kDEBT_MAXIMUM(Number(-1)), Ter(temINVALID));
 
             std::string testData;
             lifecycle(
@@ -737,57 +739,61 @@ class LoanBroker_test : public beast::unit_test::suite
 
                     // fields that can't be changed
                     // LoanBrokerID
-                    env(set(alice, vault.vaultID), loanBrokerID(nextKeylet.key), ter(tecNO_ENTRY));
+                    env(set(alice, vault.vaultID),
+                        kLOAN_BROKER_ID(nextKeylet.key),
+                        Ter(tecNO_ENTRY));
                     // VaultID
-                    env(set(alice, nextKeylet.key), loanBrokerID(broker->key()), ter(tecNO_ENTRY));
+                    env(set(alice, nextKeylet.key),
+                        kLOAN_BROKER_ID(broker->key()),
+                        Ter(tecNO_ENTRY));
                     // Owner
                     env(set(evan, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        ter(tecNO_PERMISSION));
+                        kLOAN_BROKER_ID(broker->key()),
+                        Ter(tecNO_PERMISSION));
                     // ManagementFeeRate
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        managementFeeRate(maxManagementFeeRate),
-                        ter(temINVALID));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kMANAGEMENT_FEE_RATE(kMAX_MANAGEMENT_FEE_RATE),
+                        Ter(temINVALID));
                     // CoverRateMinimum
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        coverRateMinimum(maxManagementFeeRate),
-                        ter(temINVALID));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kCOVER_RATE_MINIMUM(kMAX_MANAGEMENT_FEE_RATE),
+                        Ter(temINVALID));
                     // CoverRateLiquidation
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        coverRateLiquidation(maxManagementFeeRate),
-                        ter(temINVALID));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kCOVER_RATE_LIQUIDATION(kMAX_MANAGEMENT_FEE_RATE),
+                        Ter(temINVALID));
 
                     // fields that can be changed
                     testData = "Test Data 1234";
                     // Bad data: too long
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        data(std::string(maxDataPayloadLength + 1, 'W')),
-                        ter(temINVALID));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'W')),
+                        Ter(temINVALID));
 
                     // Bad debt maximum
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        debtMaximum(Number(-175, -1)),
-                        ter(temINVALID));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kDEBT_MAXIMUM(Number(-175, -1)),
+                        Ter(temINVALID));
                     Number debtMax{175, -1};
                     if (vault.asset.integral())
                     {
                         env(set(alice, vault.vaultID),
-                            loanBrokerID(broker->key()),
-                            data(testData),
-                            debtMaximum(debtMax),
-                            ter(tecPRECISION_LOSS));
+                            kLOAN_BROKER_ID(broker->key()),
+                            kDATA(testData),
+                            kDEBT_MAXIMUM(debtMax),
+                            Ter(tecPRECISION_LOSS));
                         roundToAsset(vault.asset, debtMax);
                     }
                     // Data & Debt maximum
                     env(set(alice, vault.vaultID),
-                        loanBrokerID(broker->key()),
-                        data(testData),
-                        debtMaximum(debtMax));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kDATA(testData),
+                        kDEBT_MAXIMUM(debtMax));
                 },
                 [&](SLE::const_ref broker) {
                     // Check the updated fields
@@ -810,15 +816,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 none of the
+                    // Finally, create another Loan Broker with kNONE of the
                     // values at default
                     return env.jt(
                         jv,
-                        data(testData),
-                        managementFeeRate(TenthBips16(123)),
-                        debtMaximum(Number(9)),
-                        coverRateMinimum(TenthBips32(100)),
-                        coverRateLiquidation(TenthBips32(200)));
+                        kDATA(testData),
+                        kMANAGEMENT_FEE_RATE(TenthBips16(123)),
+                        kDEBT_MAXIMUM(Number(9)),
+                        kCOVER_RATE_MINIMUM(TenthBips32(100)),
+                        kCOVER_RATE_LIQUIDATION(TenthBips32(200)));
                 },
                 [&](SLE::const_ref broker) {
                     // Extra checks
@@ -831,9 +837,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),
-                        loanBrokerID(broker->key()),
-                        data(""),
-                        debtMaximum(Number(0)));
+                        kLOAN_BROKER_ID(broker->key()),
+                        kDATA(""),
+                        kDEBT_MAXIMUM(Number(0)));
                 },
                 [&](SLE::const_ref broker) {
                     // Check the updated fields
@@ -901,23 +907,23 @@ class LoanBroker_test : public beast::unit_test::suite
             auto jv = getTxJv();
             // empty broker ID
             jv[sfLoanBrokerID] = "";
-            env(jv, ter(temINVALID));
+            env(jv, Ter(temINVALID));
             // zero broker ID
             jv[sfLoanBrokerID] = to_string(uint256{});
             // needs a flag to distinguish the parsed STTx from the prior
             // test
-            env(jv, txflags(tfFullyCanonicalSig), ter(temINVALID));
+            env(jv, Txflags(tfFullyCanonicalSig), Ter(temINVALID));
         };
         auto testZeroVaultID = [&](auto&& getTxJv) {
             auto jv = getTxJv();
             // empty broker ID
             jv[sfVaultID] = "";
-            env(jv, ter(temINVALID));
+            env(jv, Ter(temINVALID));
             // zero broker ID
             jv[sfVaultID] = to_string(uint256{});
             // needs a flag to distinguish the parsed STTx from the prior
             // test
-            env(jv, txflags(tfFullyCanonicalSig), ter(temINVALID));
+            env(jv, Txflags(tfFullyCanonicalSig), Ter(temINVALID));
         };
 
         if (brokerTest == LoanBrokerTest::CoverDeposit)
@@ -926,18 +932,18 @@ class LoanBroker_test : public beast::unit_test::suite
             testZeroBrokerID([&]() { return coverDeposit(alice, brokerKeylet.key, asset(10)); });
 
             // preclaim: tecWRONG_ASSET
-            env(coverDeposit(alice, brokerKeylet.key, issuer["BAD"](10)), ter(tecWRONG_ASSET));
+            env(coverDeposit(alice, brokerKeylet.key, issuer["BAD"](10)), Ter(tecWRONG_ASSET));
 
             // preclaim: tecINSUFFICIENT_FUNDS
             env(pay(alice, issuer, asset(100'000 - 50)));
             env.close();
             env(coverDeposit(alice, brokerKeylet.key, vaultInfo.asset(10)),
-                ter(tecINSUFFICIENT_FUNDS));
+                Ter(tecINSUFFICIENT_FUNDS));
 
             // preclaim: tecFROZEN
             env(fset(issuer, asfGlobalFreeze));
             env.close();
-            env(coverDeposit(alice, brokerKeylet.key, vaultInfo.asset(10)), ter(tecFROZEN));
+            env(coverDeposit(alice, brokerKeylet.key, vaultInfo.asset(10)), Ter(tecFROZEN));
         }
         else
         {
@@ -952,13 +958,13 @@ class LoanBroker_test : public beast::unit_test::suite
             testZeroBrokerID([&]() { return coverWithdraw(alice, brokerKeylet.key, asset(10)); });
 
             // preclaim: tecWRONG_ASSET
-            env(coverWithdraw(alice, brokerKeylet.key, issuer["BAD"](10)), ter(tecWRONG_ASSET));
+            env(coverWithdraw(alice, brokerKeylet.key, issuer["BAD"](10)), Ter(tecWRONG_ASSET));
 
             // preclaim: tecNO_DST
             Account const bogus{"bogus"};
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                destination(bogus),
-                ter(tecNO_DST));
+                kDESTINATION(bogus),
+                Ter(tecNO_DST));
 
             // preclaim: tecDST_TAG_NEEDED
             Account const dest{"dest"};
@@ -966,16 +972,16 @@ class LoanBroker_test : public beast::unit_test::suite
             env(fset(dest, asfRequireDest));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                destination(dest),
-                ter(tecDST_TAG_NEEDED));
+                kDESTINATION(dest),
+                Ter(tecDST_TAG_NEEDED));
 
             // preclaim: tecNO_PERMISSION
             env(fclear(dest, asfRequireDest));
             env(fset(dest, asfDepositAuth));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                destination(dest),
-                ter(tecNO_PERMISSION));
+                kDESTINATION(dest),
+                Ter(tecNO_PERMISSION));
 
             // preclaim: tecFROZEN
             env(trust(dest, asset(1'000)));
@@ -983,20 +989,20 @@ class LoanBroker_test : public beast::unit_test::suite
             env(fset(issuer, asfGlobalFreeze));
             env.close();
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                destination(dest),
-                ter(tecFROZEN));
+                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)),
-                destination(dest),
-                ter(tecFROZEN));
+                kDESTINATION(dest),
+                Ter(tecFROZEN));
 
             // preclaim: tecPSEUDO_ACCOUNT
             env(coverWithdraw(alice, brokerKeylet.key, asset(10)),
-                destination(vaultInfo.pseudoAccount),
-                ter(tecPSEUDO_ACCOUNT));
+                kDESTINATION(vaultInfo.pseudoAccount),
+                Ter(tecPSEUDO_ACCOUNT));
         }
 
         if (brokerTest == LoanBrokerTest::CoverClawback)
@@ -1005,33 +1011,33 @@ class LoanBroker_test : public beast::unit_test::suite
             testZeroBrokerID([&]() {
                 return env.json(
                     coverClawback(alice),
-                    loanBrokerID(brokerKeylet.key),
-                    amount(vaultInfo.asset(2)));
+                    kLOAN_BROKER_ID(brokerKeylet.key),
+                    kAMOUNT(vaultInfo.asset(2)));
             });
 
             if (asset.holds<Issue>())
             {
                 // preclaim: AllowTrustLineClawback is not set
                 env(coverClawback(issuer),
-                    loanBrokerID(brokerKeylet.key),
-                    amount(vaultInfo.asset(2)),
-                    ter(tecNO_PERMISSION));
+                    kLOAN_BROKER_ID(brokerKeylet.key),
+                    kAMOUNT(vaultInfo.asset(2)),
+                    Ter(tecNO_PERMISSION));
 
                 // preclaim: NoFreeze is set
                 env(fset(issuer, asfAllowTrustLineClawback | asfNoFreeze));
                 env.close();
                 env(coverClawback(issuer),
-                    loanBrokerID(brokerKeylet.key),
-                    amount(vaultInfo.asset(2)),
-                    ter(tecNO_PERMISSION));
+                    kLOAN_BROKER_ID(brokerKeylet.key),
+                    kAMOUNT(vaultInfo.asset(2)),
+                    Ter(tecNO_PERMISSION));
             }
             else
             {
                 // preclaim: MPTCanClawback is not set or MPTCanLock is not set
                 env(coverClawback(issuer),
-                    loanBrokerID(brokerKeylet.key),
-                    amount(vaultInfo.asset(2)),
-                    ter(tecNO_PERMISSION));
+                    kLOAN_BROKER_ID(brokerKeylet.key),
+                    kAMOUNT(vaultInfo.asset(2)),
+                    Ter(tecNO_PERMISSION));
             }
             env.close();
         }
@@ -1041,14 +1047,14 @@ class LoanBroker_test : public beast::unit_test::suite
             Account const borrower{"borrower"};
             env.fund(XRP(1'000), borrower);
             env(loan::set(borrower, brokerKeylet.key, asset(50).value()),
-                sig(sfCounterpartySignature, alice),
-                fee(env.current()->fees().base * 2));
+                Sig(sfCounterpartySignature, alice),
+                Fee(env.current()->fees().base * 2));
 
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() { return del(alice, brokerKeylet.key); });
 
             // preclaim: tecHAS_OBLIGATIONS
-            env(del(alice, brokerKeylet.key), ter(tecHAS_OBLIGATIONS));
+            env(del(alice, brokerKeylet.key), Ter(tecHAS_OBLIGATIONS));
 
             // Repay and delete the loan
             auto const loanKeylet = keylet::loan(brokerKeylet.key, 1);
@@ -1057,11 +1063,11 @@ class LoanBroker_test : public beast::unit_test::suite
 
             env(trust(issuer, asset(0), alice, tfSetFreeze | tfSetDeepFreeze));
             // preclaim: tecFROZEN (deep frozen)
-            env(del(alice, brokerKeylet.key), ter(tecFROZEN));
+            env(del(alice, brokerKeylet.key), Ter(tecFROZEN));
             env(trust(issuer, asset(0), alice, tfClearFreeze | tfClearDeepFreeze));
 
             // successful delete the loan broker object
-            env(del(alice, brokerKeylet.key), ter(tesSUCCESS));
+            env(del(alice, brokerKeylet.key), Ter(tesSUCCESS));
         }
         else
         {
@@ -1072,11 +1078,11 @@ class LoanBroker_test : public beast::unit_test::suite
         {
             // preflight: temINVALID (empty/zero broker id)
             testZeroBrokerID([&]() {
-                return env.json(set(alice, vaultInfo.vaultID), loanBrokerID(brokerKeylet.key));
+                return env.json(set(alice, vaultInfo.vaultID), kLOAN_BROKER_ID(brokerKeylet.key));
             });
             // preflight: temINVALID (empty/zero vault id)
             testZeroVaultID([&]() {
-                return env.json(set(alice, vaultInfo.vaultID), loanBrokerID(brokerKeylet.key));
+                return env.json(set(alice, vaultInfo.vaultID), kLOAN_BROKER_ID(brokerKeylet.key));
             });
 
             if (asset.holds<Issue>())
@@ -1084,7 +1090,7 @@ class LoanBroker_test : public beast::unit_test::suite
                 env(fclear(issuer, asfDefaultRipple));
                 env.close();
                 // preclaim: DefaultRipple is not set
-                env(set(alice, vaultInfo.vaultID), ter(terNO_RIPPLE));
+                env(set(alice, vaultInfo.vaultID), Ter(terNO_RIPPLE));
 
                 env(fset(issuer, asfDefaultRipple));
                 env.close();
@@ -1095,7 +1101,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env(pay(alice, issuer, amt));
 
             // preclaim:: tecINSUFFICIENT_RESERVE
-            env(set(alice, vaultInfo.vaultID), ter(tecINSUFFICIENT_RESERVE));
+            env(set(alice, vaultInfo.vaultID), Ter(tecINSUFFICIENT_RESERVE));
         }
     }
 
@@ -1110,18 +1116,18 @@ class LoanBroker_test : public beast::unit_test::suite
         {
             Account const alice{"alice"};
             Account const issuer{"issuer"};
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
             Env env(*this);
             env.fund(XRP(100'000), alice);
             env.close();
 
-            auto jtx = env.jt(coverClawback(alice), amount(USD(100)));
+            auto jtx = env.jt(coverClawback(alice), kAMOUNT(usd(100)));
 
             // holder == account
-            env(jtx, ter(temINVALID));
+            env(jtx, Ter(temINVALID));
 
             // holder == beast::zero
-            STAmount const bad(Issue{USD.currency, beast::zero}, 100);
+            STAmount const bad(Issue{usd.currency, beast::kZERO}, 100);
             jtx.jv[sfAmount] = bad.getJson();
             jtx.stx = env.ust(jtx);
             Serializer s;
@@ -1243,9 +1249,9 @@ class LoanBroker_test : public beast::unit_test::suite
         // Create a writable view cloned from the current ledger and remove the
         // vault SLE
         OpenView ov{*env.current()};
-        test::StreamSink sink{beast::severities::kWarning};
+        test::StreamSink sink{beast::severities::KWarning};
         beast::Journal const jlog{sink};
-        ApplyContext ac{env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, jlog};
+        ApplyContext ac{env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, TapNone, jlog};
 
         if (auto sleBroker = ac.view().peek(keylet::loanbroker(brokerKeylet.key)))
         {
@@ -1258,7 +1264,7 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // Invoke preclaim against the mutated (ApplyView) view; triggers
         // nullptr deref
-        PreclaimContext const pctx{env.app(), ac.view(), tesSUCCESS, tx, tapNONE, jlog};
+        PreclaimContext const pctx{env.app(), ac.view(), tesSUCCESS, tx, TapNone, jlog};
         (void)LoanBrokerCoverDeposit::preclaim(pctx);
     }
 
@@ -1281,7 +1287,7 @@ class LoanBroker_test : public beast::unit_test::suite
             .env = env,
             .issuer = issuer,
             .holders = {alice},
-            .flags = MPTDEXFlags | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
+            .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
             .authHolder = true,
         });
 
@@ -1322,14 +1328,14 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // Can't deposit into Vault if the vault owner is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(vault.deposit({.depositor = alice, .id = vaultKeylet.key, .amount = asset(51)}),
                 err);
         });
 
         // Can't withdraw from Vault if the vault owner is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(vault.withdraw({.depositor = alice, .id = vaultKeylet.key, .amount = asset(1)}),
                 err);
         });
@@ -1352,19 +1358,21 @@ class LoanBroker_test : public beast::unit_test::suite
 
         // Can't cover deposit into Vault if the vault owner is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(coverDeposit(alice, brokerKeylet.key, vaultInfo.asset(10)), err);
         });
 
         // Can't cover withdraw from Vault if the vault owner is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(coverWithdraw(alice, brokerKeylet.key, vaultInfo.asset(5)), err);
         });
 
         // Issuer can always cover clawback. The holder authorization is n/a.
         forUnauthAuth([&](bool) {
-            env(coverClawback(issuer), loanBrokerID(brokerKeylet.key), amount(vaultInfo.asset(1)));
+            env(coverClawback(issuer),
+                kLOAN_BROKER_ID(brokerKeylet.key),
+                kAMOUNT(vaultInfo.asset(1)));
         });
     }
 
@@ -1383,7 +1391,7 @@ class LoanBroker_test : public beast::unit_test::suite
         env.close();
 
         PrettyAsset const asset = [&]() {
-            MPTTester mptt{env, issuer, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             env.close();
             PrettyAsset const mptAsset = mptt["MPT"];
@@ -1417,8 +1425,8 @@ class LoanBroker_test : public beast::unit_test::suite
         Account const borrower{"borrower"};
         env.fund(XRP(1'000), borrower);
         env(loan::set(borrower, brokerKeylet.key, asset(50).value()),
-            sig(sfCounterpartySignature, alice),
-            fee(env.current()->fees().base * 2));
+            Sig(sfCounterpartySignature, alice),
+            Fee(env.current()->fees().base * 2));
         auto const broker = env.le(brokerKeylet);
         if (!BEAST_EXPECT(broker))
             return;
@@ -1429,47 +1437,47 @@ class LoanBroker_test : public beast::unit_test::suite
         auto tx2 = set(alice, vaultInfo.vaultID);
         tx2[sfLoanBrokerID] = to_string(brokerKeylet.key);
         tx2[sfDebtMaximum] = debtTotal - 1;
-        env(tx2, ter(tecLIMIT_EXCEEDED));
+        env(tx2, Ter(tecLIMIT_EXCEEDED));
 
         tx2[sfDebtMaximum] = debtTotal + 1;
-        env(tx2, ter(tesSUCCESS));
+        env(tx2, Ter(tesSUCCESS));
 
         tx2[sfDebtMaximum] = 0;
-        env(tx2, ter(tesSUCCESS));
+        env(tx2, Ter(tesSUCCESS));
 
-        tx2[sfDebtMaximum] = Json::Value::maxInt;
-        env(tx2, ter(tesSUCCESS));
+        tx2[sfDebtMaximum] = json::Value::kMAX_INT;
+        env(tx2, Ter(tesSUCCESS));
 
         {
             auto const dm = power(2, 64) - 1;
-            BEAST_EXPECT(dm > maxMPTokenAmount);
+            BEAST_EXPECT(dm > kMAX_MP_TOKEN_AMOUNT);
             tx2[sfDebtMaximum] = dm;
-            env(tx2, ter(temINVALID));
+            env(tx2, Ter(temINVALID));
         }
 
         {
             auto const dm = power(2, 63) - 1;
-            BEAST_EXPECTS(dm > maxMPTokenAmount, to_string(dm));
+            BEAST_EXPECTS(dm > kMAX_MP_TOKEN_AMOUNT, to_string(dm));
             tx2[sfDebtMaximum] = dm;
-            env(tx2, ter(temINVALID));
+            env(tx2, Ter(temINVALID));
         }
 
         {
             auto const dm = power(2, 63) - 3;
-            BEAST_EXPECTS(dm == maxMPTokenAmount, to_string(dm));
+            BEAST_EXPECTS(dm == kMAX_MP_TOKEN_AMOUNT, to_string(dm));
             tx2[sfDebtMaximum] = dm;
-            env(tx2, ter(tesSUCCESS));
+            env(tx2, Ter(tesSUCCESS));
         }
 
         {
             auto const dm = 2 * (power(2, 62) - 1) + 1;
-            BEAST_EXPECTS(dm == maxMPTokenAmount, to_string(dm));
+            BEAST_EXPECTS(dm == kMAX_MP_TOKEN_AMOUNT, to_string(dm));
             tx2[sfDebtMaximum] = dm;
-            env(tx2, ter(tesSUCCESS));
+            env(tx2, Ter(tesSUCCESS));
         }
 
         tx2[sfDebtMaximum] = Number{9223372036854775807, 0};
-        env(tx2, ter(tesSUCCESS));
+        env(tx2, Ter(tesSUCCESS));
     }
 
     void
@@ -1495,7 +1503,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             env(vault.deposit({.depositor = broker, .id = keylet.key, .amount = deposit}),
-                ter(err));
+                Ter(err));
             env.close();
 
             auto const brokerKeylet = keylet::loanbroker(broker, env.seq(broker));
@@ -1503,7 +1511,7 @@ class LoanBroker_test : public beast::unit_test::suite
             env(loanBroker::set(broker, keylet.key));
             env.close();
 
-            env(loanBroker::coverDeposit(broker, brokerKeylet.key, deposit), ter(err));
+            env(loanBroker::coverDeposit(broker, brokerKeylet.key, deposit), Ter(err));
             env.close();
         };
 
@@ -1525,14 +1533,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.
-                {maxMPTokenAmount - 500, std::nullopt, 250, tesSUCCESS},
+                {kMAX_MP_TOKEN_AMOUNT - 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.
-                {maxMPTokenAmount, std::nullopt, 250, tecINSUFFICIENT_FUNDS},
+                {kMAX_MP_TOKEN_AMOUNT, std::nullopt, 250, tecINSUFFICIENT_FUNDS},
             };
         for (auto const& [pay, max, deposit, err] : mptTests)
         {
@@ -1542,7 +1550,7 @@ class LoanBroker_test : public beast::unit_test::suite
                      .issuer = issuer,
                      .holders = {holder},
                      .pay = pay,
-                     .flags = MPTDEXFlags,
+                     .flags = kMPT_DEX_FLAGS,
                      .maxAmt = max});
                 return std::make_tuple(token, token(deposit), err);
             });
@@ -1550,7 +1558,7 @@ class LoanBroker_test : public beast::unit_test::suite
     }
 
     void
-    testAMB06_VaultFreezeCheckMissing()
+    testAmB06VaultFreezeCheckMissing()
     {
         testcase << "RIPD-4466 - LoanBrokerSet disallows frozen vaults";
         using namespace jtx;
@@ -1558,10 +1566,10 @@ class LoanBroker_test : public beast::unit_test::suite
 
         Account const issuer{"issuer"}, lender{"lender"}, borrower{"borrower"};
         env.fund(XRP(20'000), issuer, lender, borrower);
-        auto const IOU = issuer["IOU"];
+        auto const iou = issuer["IOU"];
 
         Vault const vault{env};
-        auto [tx, vaultKeylet] = vault.create({.owner = lender, .asset = IOU.asset()});
+        auto [tx, vaultKeylet] = vault.create({.owner = lender, .asset = iou.asset()});
         env(tx);
         env.close();
 
@@ -1571,7 +1579,7 @@ class LoanBroker_test : public beast::unit_test::suite
         auto const vaultPseudoAcct = Account("VaultPseudo", vaultPseudo);
         env(trust(issuer, vaultPseudoAcct["IOU"](0), tfSetFreeze));
 
-        env(loanBroker::set(lender, vaultKeylet.key), ter(tecFROZEN));
+        env(loanBroker::set(lender, vaultKeylet.key), Ter(tecFROZEN));
     }
 
     void
@@ -1658,8 +1666,8 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             env(vault.withdraw({.depositor = broker, .id = keylet.key, .amount = token(1'000)}),
-                loanBroker::destination(dest),
-                ter(std::ignore));
+                loanBroker::kDESTINATION(dest),
+                Ter(std::ignore));
             BEAST_EXPECT(env.ter() == tecNO_LINE);
             env.close();
 
@@ -1675,8 +1683,8 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                loanBroker::destination(dest),
-                ter(std::ignore));
+                loanBroker::kDESTINATION(dest),
+                Ter(std::ignore));
             BEAST_EXPECT(env.ter() == tecNO_LINE);
             env.close();
 
@@ -1687,8 +1695,8 @@ class LoanBroker_test : public beast::unit_test::suite
                 env.close();
 
                 env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                    loanBroker::destination(dest),
-                    ter(std::ignore));
+                    loanBroker::kDESTINATION(dest),
+                    Ter(std::ignore));
                 BEAST_EXPECT(env.ter() == tecNO_LINE);
                 env.close();
             }
@@ -1732,7 +1740,7 @@ class LoanBroker_test : public beast::unit_test::suite
                              .issuer = issuer,
                              .holders = {broker, dest},
                              .pay = 2'000,
-                             .flags = MPTDEXFlags | tfMPTRequireAuth,
+                             .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
                              .authHolder = true,
                              .maxAmt = 5'000});
                         // unauthorize dest
@@ -1746,7 +1754,7 @@ class LoanBroker_test : public beast::unit_test::suite
                              .issuer = issuer,
                              .holders = {broker, dest},
                              .pay = 2'000,
-                             .flags = MPTDEXFlags,
+                             .flags = kMPT_DEX_FLAGS,
                              .maxAmt = 4'000});
                         BEAST_EXPECT(env.balance(issuer, tester) == tester(-4'000));
                         return tester;
@@ -1757,7 +1765,7 @@ class LoanBroker_test : public beast::unit_test::suite
                              .issuer = issuer,
                              .holders = {broker},
                              .pay = 2'000,
-                             .flags = MPTDEXFlags,
+                             .flags = kMPT_DEX_FLAGS,
                              .maxAmt = 4'000});
                     }
                     default:
@@ -1779,8 +1787,8 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             env(vault.withdraw({.depositor = broker, .id = keylet.key, .amount = token(1'000)}),
-                loanBroker::destination(dest),
-                ter(std::ignore));
+                loanBroker::kDESTINATION(dest),
+                Ter(std::ignore));
 
             // Shouldn't fail if at MaximumAmount since no new tokens are issued
             TER const err = mptState == MPTState::ReachedMAX ? TER(tesSUCCESS) : tecNO_AUTH;
@@ -1803,8 +1811,8 @@ class LoanBroker_test : public beast::unit_test::suite
             env.close();
 
             env(loanBroker::coverWithdraw(broker, brokerKeylet.key, token(100)),
-                loanBroker::destination(dest),
-                ter(std::ignore));
+                loanBroker::kDESTINATION(dest),
+                Ter(std::ignore));
             BEAST_EXPECT(env.ter() == err);
             env.close();
         };
@@ -1838,7 +1846,7 @@ public:
         testRequireAuth();
 
         testRIPD4323();
-        testAMB06_VaultFreezeCheckMissing();
+        testAmB06VaultFreezeCheckMissing();
 
         testRIPD4274();
 
diff --git a/src/test/app/Loan_test.cpp b/src/test/app/Loan_test.cpp
index ad87603661..f189196a82 100644
--- a/src/test/app/Loan_test.cpp
+++ b/src/test/app/Loan_test.cpp
@@ -82,14 +82,14 @@
 
 namespace xrpl::test {
 
-class Loan_test : public beast::unit_test::suite
+class Loan_test : public beast::unit_test::Suite
 {
 protected:
     // Ensure that all the features needed for Lending Protocol are included,
     // even if they are set to unsupported.
-    FeatureBitset const all{jtx::testable_amendments()};
+    FeatureBitset const all_{jtx::testableAmendments()};
 
-    std::string const iouCurrency{"IOU"};
+    std::string const iouCurrency_{"IOU"};
 
     void
     testDisabled()
@@ -114,28 +114,28 @@ protected:
 
             // counter party signature is optional on LoanSet. Confirm that by
             // sending transaction without one.
-            auto setTx = env.jt(set(alice, keylet.key, Number(10000)), ter(temDISABLED));
+            auto setTx = env.jt(set(alice, keylet.key, Number(10000)), Ter(temDISABLED));
             env(setTx);
 
             // All loan transactions are disabled.
             // 1. LoanSet
-            setTx = env.jt(setTx, sig(sfCounterpartySignature, bob), ter(temDISABLED));
+            setTx = env.jt(setTx, Sig(sfCounterpartySignature, bob), Ter(temDISABLED));
             env(setTx);
             // Actual sequence will be based off the loan broker, but we
             // obviously don't have one of those if the amendment is disabled
             auto const loanKeylet = keylet::loan(keylet.key, env.seq(alice));
             // Other Loan transactions are disabled, too.
             // 2. LoanDelete
-            env(del(alice, loanKeylet.key), ter(temDISABLED));
+            env(del(alice, loanKeylet.key), Ter(temDISABLED));
             // 3. LoanManage
-            env(manage(alice, loanKeylet.key, tfLoanImpair), ter(temDISABLED));
+            env(manage(alice, loanKeylet.key, tfLoanImpair), Ter(temDISABLED));
             // 4. LoanPay
-            env(pay(alice, loanKeylet.key, XRP(500)), ter(temDISABLED));
+            env(pay(alice, loanKeylet.key, XRP(500)), Ter(temDISABLED));
         };
-        failAll(all - featureMPTokensV1);
-        failAll(all - featureSingleAssetVault - featureLendingProtocol);
-        failAll(all - featureSingleAssetVault);
-        failAll(all - featureLendingProtocol);
+        failAll(all_ - featureMPTokensV1);
+        failAll(all_ - featureSingleAssetVault - featureLendingProtocol);
+        failAll(all_ - featureSingleAssetVault);
+        failAll(all_ - featureLendingProtocol);
     }
 
     struct BrokerParameters
@@ -152,8 +152,8 @@ protected:
         [[nodiscard]] Number
         maxCoveredLoanValue(Number const& currentDebt) const
         {
-            NumberRoundModeGuard const mg(Number::rounding_mode::downward);
-            auto debtLimit = coverDeposit * tenthBipsPerUnity.value() / coverRateMin.value();
+            NumberRoundModeGuard const mg(Number::RoundingMode::Downward);
+            auto debtLimit = coverDeposit * kTENTH_BIPS_PER_UNITY.value() / coverRateMin.value();
 
             return debtLimit - currentDebt;
         }
@@ -161,8 +161,8 @@ protected:
         static BrokerParameters const&
         defaults()
         {
-            static BrokerParameters const result{};
-            return result;
+            static BrokerParameters const kRESULT{};
+            return kRESULT;
         }
 
         // TODO: create an operator() which returns a transaction similar to
@@ -176,13 +176,13 @@ protected:
         uint256 vaultID;
         BrokerParameters params;
         BrokerInfo(
-            jtx::PrettyAsset const& asset_,
-            Keylet const& brokerKeylet_,
-            Keylet const& vaultKeylet_,
+            jtx::PrettyAsset const& asset,
+            Keylet const& brokerKeylet,
+            Keylet const& vaultKeylet,
             BrokerParameters p)
-            : asset(asset_)
-            , brokerID(brokerKeylet_.key)
-            , vaultID(vaultKeylet_.key)
+            : asset(asset)
+            , brokerID(brokerKeylet.key)
+            , vaultID(vaultKeylet.key)
             , params(std::move(p))
         {
         }
@@ -248,36 +248,36 @@ protected:
                 broker.asset(principalRequest).number(),
                 flags.value_or(0))};
 
-            sig(sfCounterpartySignature, counter)(env, jt);
+            Sig(sfCounterpartySignature, counter)(env, jt);
 
-            fee{setFee.value_or(env.current()->fees().base * 2)}(env, jt);
+            Fee{setFee.value_or(env.current()->fees().base * 2)}(env, jt);
 
             if (counterpartyExplicit)
-                counterparty(counter)(env, jt);
+                kCOUNTERPARTY(counter)(env, jt);
             if (originationFee)
-                loanOriginationFee(broker.asset(*originationFee).number())(env, jt);
+                kLOAN_ORIGINATION_FEE(broker.asset(*originationFee).number())(env, jt);
             if (serviceFee)
-                loanServiceFee(broker.asset(*serviceFee).number())(env, jt);
+                kLOAN_SERVICE_FEE(broker.asset(*serviceFee).number())(env, jt);
             if (lateFee)
-                latePaymentFee(broker.asset(*lateFee).number())(env, jt);
+                kLATE_PAYMENT_FEE(broker.asset(*lateFee).number())(env, jt);
             if (closeFee)
-                closePaymentFee(broker.asset(*closeFee).number())(env, jt);
+                kCLOSE_PAYMENT_FEE(broker.asset(*closeFee).number())(env, jt);
             if (overFee)
-                overpaymentFee (*overFee)(env, jt);
+                kOVERPAYMENT_FEE (*overFee)(env, jt);
             if (interest)
-                interestRate (*interest)(env, jt);
+                kINTEREST_RATE (*interest)(env, jt);
             if (lateInterest)
-                lateInterestRate (*lateInterest)(env, jt);
+                kLATE_INTEREST_RATE (*lateInterest)(env, jt);
             if (closeInterest)
-                closeInterestRate (*closeInterest)(env, jt);
+                kCLOSE_INTEREST_RATE (*closeInterest)(env, jt);
             if (overpaymentInterest)
-                overpaymentInterestRate (*overpaymentInterest)(env, jt);
+                kOVERPAYMENT_INTEREST_RATE (*overpaymentInterest)(env, jt);
             if (payTotal)
-                paymentTotal (*payTotal)(env, jt);
+                kPAYMENT_TOTAL (*payTotal)(env, jt);
             if (payInterval)
-                paymentInterval (*payInterval)(env, jt);
+                kPAYMENT_INTERVAL (*payInterval)(env, jt);
             if (gracePd)
-                gracePeriod (*gracePd)(env, jt);
+                kGRACE_PERIOD (*gracePd)(env, jt);
 
             return env.jt(jt, fN...);
         }
@@ -294,8 +294,8 @@ protected:
         static PaymentParameters const&
         defaults()
         {
-            static PaymentParameters const result{};
-            return result;
+            static PaymentParameters const kRESULT{};
+            return kRESULT;
         }
     };
 
@@ -327,11 +327,11 @@ protected:
         Keylet const& loanKeylet;
 
         VerifyLoanStatus(
-            jtx::Env const& env_,
-            BrokerInfo const& broker_,
-            jtx::Account const& pseudo_,
-            Keylet const& keylet_)
-            : env(env_), broker(broker_), pseudoAccount(pseudo_), loanKeylet(keylet_)
+            jtx::Env const& env,
+            BrokerInfo const& broker,
+            jtx::Account const& pseudo,
+            Keylet const& keylet)
+            : env(env), broker(broker), pseudoAccount(pseudo), loanKeylet(keylet)
         {
         }
 
@@ -402,7 +402,7 @@ protected:
                     env.balance(account, broker.asset) - (balanceBefore - balanceChangeAmount),
                     borrowerScale);
                 env.test.expect(
-                    roundToScale(difference, loanScale) >= beast::zero,
+                    roundToScale(difference, loanScale) >= beast::kZERO,
                     "Balance before: " + to_string(balanceBefore.value()) +
                         ", expected change: " + to_string(balanceChangeAmount) +
                         ", difference (balance after - expected): " + to_string(difference),
@@ -521,13 +521,13 @@ protected:
 
         using namespace loanBroker;
         env(set(lender, vaultKeylet.key, params.flags),
-            data(params.data),
-            managementFeeRate(params.managementFeeRate),
-            debtMaximum(debtMaximumValue),
-            coverRateMinimum(coverRateMinValue),
-            coverRateLiquidation(TenthBips32(params.coverRateLiquidation)));
+            kDATA(params.data),
+            kMANAGEMENT_FEE_RATE(params.managementFeeRate),
+            kDEBT_MAXIMUM(debtMaximumValue),
+            kCOVER_RATE_MINIMUM(coverRateMinValue),
+            kCOVER_RATE_LIQUIDATION(TenthBips32(params.coverRateLiquidation)));
 
-        if (coverDepositValue != beast::zero)
+        if (coverDepositValue != beast::kZERO)
             env(coverDeposit(lender, keylet.key, coverDepositValue));
 
         env.close();
@@ -588,7 +588,7 @@ protected:
                  : std::max(broker.vaultScale(env), state.principalOutstanding.exponent())));
         BEAST_EXPECT(state.paymentInterval == 600);
         {
-            NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+            NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
             BEAST_EXPECT(
                 state.totalValue ==
                 roundToAsset(
@@ -652,7 +652,7 @@ protected:
                 return PrettyAsset{xrpIssue(), 1'000'000};
 
             case AssetType::IOU: {
-                PrettyAsset const asset{issuer[iouCurrency]};
+                PrettyAsset const asset{issuer[iouCurrency_]};
 
                 auto const limit =
                     asset(100 * (brokerParams.vaultDeposit + brokerParams.coverDeposit));
@@ -673,7 +673,7 @@ protected:
                 if (!env.le(keylet::account(borrower)))
                     env.fund(env.current()->fees().accountReserve(10) * 10, noripple(borrower));
 
-                MPTTester mptt{env, issuer, mptInitNoFund};
+                MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
                 mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                 // Scale the MPT asset so interest is interesting
                 PrettyAsset const asset{mptt.issuanceID(), 10'000};
@@ -709,8 +709,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::defaultPaymentInterval);
-        auto const total = loanParams.payTotal.value_or(LoanSet::defaultPaymentTotal);
+        auto const interval = loanParams.payInterval.value_or(LoanSet::kDEFAULT_PAYMENT_INTERVAL);
+        auto const total = loanParams.payTotal.value_or(LoanSet::kDEFAULT_PAYMENT_TOTAL);
         auto const feeRate = brokerParams.managementFeeRate;
         auto const props = computeLoanProperties(
             asset,
@@ -736,8 +736,8 @@ protected:
         BEAST_EXPECT(!checkLoanGuards(
             asset,
             asset(loanParams.principalRequest).number(),
-            loanParams.interest.value_or(TenthBips32{}) != beast::zero,
-            loanParams.payTotal.value_or(LoanSet::defaultPaymentTotal),
+            loanParams.interest.value_or(TenthBips32{}) != beast::kZERO,
+            loanParams.payTotal.value_or(LoanSet::kDEFAULT_PAYMENT_TOTAL),
             props,
             env.journal));
     }
@@ -844,7 +844,7 @@ protected:
 
         auto const shortage = totalNeeded - borrowerBalance.number();
 
-        if (shortage > beast::zero && (broker.asset.native() || issuer != borrower))
+        if (shortage > beast::kZERO && (broker.asset.native() || issuer != borrower))
         {
             env(
                 pay((broker.asset.native() ? env.master : issuer),
@@ -912,7 +912,7 @@ protected:
 
         // Include the service fee
         STAmount const totalDue = roundToScale(
-            roundedPeriodicPayment + serviceFee, state.loanScale, Number::rounding_mode::upward);
+            roundedPeriodicPayment + serviceFee, state.loanScale, Number::RoundingMode::Upward);
 
         auto currentRoundedState = constructLoanState(
             state.totalValue, state.principalOutstanding, state.managementFeeOutstanding);
@@ -971,7 +971,7 @@ protected:
                 return;
             auto const totalSpent =
                 (totalPaid.trackedValueDelta + totalFeesPaid +
-                 (broker.asset.native() ? Number(baseFee) * totalPaymentsMade : numZero));
+                 (broker.asset.native() ? Number(baseFee) * totalPaymentsMade : kNUM_ZERO));
             BEAST_EXPECT(
                 env.balance(borrower, broker.asset).number() ==
                 borrowerInitialBalance - totalSpent);
@@ -1002,7 +1002,7 @@ protected:
 
             BEAST_EXPECT(
                 paymentComponents.trackedValueDelta <= roundedPeriodicPayment ||
-                (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final &&
+                (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final &&
                  paymentComponents.trackedValueDelta >= roundedPeriodicPayment));
             BEAST_EXPECT(
                 paymentComponents.trackedValueDelta ==
@@ -1018,7 +1018,7 @@ protected:
             BEAST_EXPECT(
                 deltas.total() == deltas.principal + deltas.interest + deltas.managementFee);
             BEAST_EXPECT(
-                paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
+                paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
                 deltas.total() == state.periodicPayment ||
                 (state.loanScale - (deltas.total() - state.periodicPayment).exponent()) > 14);
 
@@ -1031,9 +1031,9 @@ protected:
                     << paymentComponents.trackedPrincipalDelta << ", "
                     << paymentComponents.trackedInterestPart() << ", "
                     << paymentComponents.trackedManagementFeeDelta << ", " << [&]() -> char const* {
-                    if (paymentComponents.specialCase == ::xrpl::detail::PaymentSpecialCase::final)
+                    if (paymentComponents.specialCase == ::xrpl::detail::PaymentSpecialCase::Final)
                         return "final";
-                    if (paymentComponents.specialCase == ::xrpl::detail::PaymentSpecialCase::extra)
+                    if (paymentComponents.specialCase == ::xrpl::detail::PaymentSpecialCase::Extra)
                         return "extra";
                     return "none";
                 }() << std::endl;
@@ -1052,17 +1052,17 @@ protected:
                 // IOUs, the difference should be dust.
                 Number const diff = totalDue - totalDueAmount;
                 BEAST_EXPECT(
-                    paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
-                    diff == beast::zero ||
-                    (diff > beast::zero &&
+                    paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
+                    diff == beast::kZERO ||
+                    (diff > beast::kZERO &&
                      ((broker.asset.integral() && (static_cast<Number>(diff) < 3)) ||
                       (state.loanScale - diff.exponent() > 13))));
 
                 BEAST_EXPECT(
-                    paymentComponents.trackedPrincipalDelta >= beast::zero &&
+                    paymentComponents.trackedPrincipalDelta >= beast::kZERO &&
                     paymentComponents.trackedPrincipalDelta <= state.principalOutstanding);
                 BEAST_EXPECT(
-                    paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::final ||
+                    paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::Final ||
                     paymentComponents.trackedPrincipalDelta == state.principalOutstanding);
             }
 
@@ -1122,7 +1122,7 @@ protected:
 
             --state.paymentRemaining;
             state.previousPaymentDate = state.nextPaymentDate;
-            if (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final)
+            if (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final)
             {
                 state.paymentRemaining = 0;
                 state.nextPaymentDate = 0;
@@ -1206,7 +1206,7 @@ protected:
         Account const lender("lender");
         Account const borrower("borrower");
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, borrower);
@@ -1436,31 +1436,31 @@ protected:
             env(jt);
         }
         // Only the lender can manage
-        env(manage(evan, keylet.key, 0), ter(tecNO_PERMISSION));
+        env(manage(evan, keylet.key, 0), Ter(tecNO_PERMISSION));
         // unknown flags
-        env(manage(lender, keylet.key, tfLoanManageMask), ter(temINVALID_FLAG));
+        env(manage(lender, keylet.key, tfLoanManageMask), Ter(temINVALID_FLAG));
         // combinations of flags are not allowed
-        env(manage(lender, keylet.key, tfLoanUnimpair | tfLoanImpair), ter(temINVALID_FLAG));
-        env(manage(lender, keylet.key, tfLoanImpair | tfLoanDefault), ter(temINVALID_FLAG));
-        env(manage(lender, keylet.key, tfLoanUnimpair | tfLoanDefault), ter(temINVALID_FLAG));
+        env(manage(lender, keylet.key, tfLoanUnimpair | tfLoanImpair), Ter(temINVALID_FLAG));
+        env(manage(lender, keylet.key, tfLoanImpair | tfLoanDefault), Ter(temINVALID_FLAG));
+        env(manage(lender, keylet.key, tfLoanUnimpair | tfLoanDefault), Ter(temINVALID_FLAG));
         env(manage(lender, keylet.key, tfLoanUnimpair | tfLoanImpair | tfLoanDefault),
-            ter(temINVALID_FLAG));
+            Ter(temINVALID_FLAG));
         // invalid loan ID
-        env(manage(lender, broker.brokerID, tfLoanImpair), ter(tecNO_ENTRY));
+        env(manage(lender, broker.brokerID, tfLoanImpair), Ter(tecNO_ENTRY));
         // Loan is unimpaired, can't unimpair it again
-        env(manage(lender, keylet.key, tfLoanUnimpair), ter(tecNO_PERMISSION));
+        env(manage(lender, keylet.key, tfLoanUnimpair), Ter(tecNO_PERMISSION));
         // Loan is unimpaired, it can go into default, but only after it's past
         // due
-        env(manage(lender, keylet.key, tfLoanDefault), ter(tecTOO_SOON));
+        env(manage(lender, keylet.key, tfLoanDefault), Ter(tecTOO_SOON));
 
         // Check the vault
         bool const canImpair = canImpairLoan(env, broker, state);
         // Impair the loan, if possible
         env(manage(lender, keylet.key, tfLoanImpair),
-            canImpair ? ter(tesSUCCESS) : ter(tecLIMIT_EXCEEDED));
+            canImpair ? Ter(tesSUCCESS) : Ter(tecLIMIT_EXCEEDED));
         // Unimpair the loan
         env(manage(lender, keylet.key, tfLoanUnimpair),
-            canImpair ? ter(tesSUCCESS) : ter(tecNO_PERMISSION));
+            canImpair ? Ter(tesSUCCESS) : Ter(tecNO_PERMISSION));
 
         auto const nextDueDate = startDate + *loanParams.payInterval;
 
@@ -1478,7 +1478,7 @@ protected:
             loanFlags | 0);
 
         // Can't delete the loan yet. It has payments remaining.
-        env(del(lender, keylet.key), ter(tecHAS_OBLIGATIONS));
+        env(del(lender, keylet.key), Ter(tecHAS_OBLIGATIONS));
 
         if (BEAST_EXPECT(toEndOfLife))
             toEndOfLife(keylet, verifyLoanStatus);
@@ -1493,21 +1493,21 @@ protected:
         auto const borrowerStartingBalance = env.balance(borrower, broker.asset);
 
         // Try to delete the loan broker with an active loan
-        env(loanBroker::del(lender, broker.brokerID), ter(tecHAS_OBLIGATIONS));
+        env(loanBroker::del(lender, broker.brokerID), Ter(tecHAS_OBLIGATIONS));
         // Ensure the above tx doesn't get ordered after the LoanDelete and
         // delete our broker!
         env.close();
 
         // Test failure cases
-        env(del(lender, keylet.key, tfLoanOverpayment), ter(temINVALID_FLAG));
-        env(del(evan, keylet.key), ter(tecNO_PERMISSION));
-        env(del(lender, broker.brokerID), ter(tecNO_ENTRY));
+        env(del(lender, keylet.key, tfLoanOverpayment), Ter(temINVALID_FLAG));
+        env(del(evan, keylet.key), Ter(tecNO_PERMISSION));
+        env(del(lender, broker.brokerID), Ter(tecNO_ENTRY));
 
         // Delete the loan
         // Either the borrower or the lender can delete the loan. Alternate
         // between who does it across tests.
-        static unsigned deleteCounter = 0;
-        auto const deleter = ((++deleteCounter % 2) != 0u) ? lender : borrower;
+        static unsigned kDELETE_COUNTER = 0;
+        auto const deleter = ((++kDELETE_COUNTER % 2) != 0u) ? lender : borrower;
         env(del(deleter, keylet.key));
         env.close();
 
@@ -1602,7 +1602,7 @@ protected:
         Number const totalVaultRequest = broker.asset(broker.params.vaultDeposit).value();
         Number const debtMaximumRequest = broker.asset(broker.params.debtMax).value();
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
 
         auto const pseudoAcct = [&]() {
             auto const brokerSle = env.le(keylet::loanbroker(broker.brokerID));
@@ -1618,251 +1618,251 @@ protected:
         // Try some failure cases
         // flags are checked first
         env(set(evan, broker.brokerID, principalRequest, tfLoanSetMask),
-            sig(sfCounterpartySignature, lender),
+            Sig(sfCounterpartySignature, lender),
             loanSetFee,
-            ter(temINVALID_FLAG));
+            Ter(temINVALID_FLAG));
 
         // field length validation
         // sfData: good length, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            data(std::string(maxDataPayloadLength, 'X')),
+            Sig(sfCounterpartySignature, borrower),
+            kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH, 'X')),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfData: too long
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            data(std::string(maxDataPayloadLength + 1, 'Y')),
+            Sig(sfCounterpartySignature, lender),
+            kDATA(std::string(kMAX_DATA_PAYLOAD_LENGTH + 1, 'Y')),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // field range validation
         // sfOverpaymentFee: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            overpaymentFee(maxOverpaymentFee),
+            Sig(sfCounterpartySignature, borrower),
+            kOVERPAYMENT_FEE(kMAX_OVERPAYMENT_FEE),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfOverpaymentFee: too big
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            overpaymentFee(maxOverpaymentFee + 1),
+            Sig(sfCounterpartySignature, lender),
+            kOVERPAYMENT_FEE(kMAX_OVERPAYMENT_FEE + 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            interestRate(maxInterestRate),
+            Sig(sfCounterpartySignature, borrower),
+            kINTEREST_RATE(kMAX_INTEREST_RATE),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            interestRate(TenthBips32(0)),
+            Sig(sfCounterpartySignature, borrower),
+            kINTEREST_RATE(TenthBips32(0)),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            interestRate(maxInterestRate + 1),
+            Sig(sfCounterpartySignature, lender),
+            kINTEREST_RATE(kMAX_INTEREST_RATE + 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
         // sfInterestRate: too small
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            interestRate(TenthBips32(-1)),
+            Sig(sfCounterpartySignature, lender),
+            kINTEREST_RATE(TenthBips32(-1)),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfLateInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            lateInterestRate(maxLateInterestRate),
+            Sig(sfCounterpartySignature, borrower),
+            kLATE_INTEREST_RATE(kMAX_LATE_INTEREST_RATE),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            lateInterestRate(TenthBips32(0)),
+            Sig(sfCounterpartySignature, borrower),
+            kLATE_INTEREST_RATE(TenthBips32(0)),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfLateInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            lateInterestRate(maxLateInterestRate + 1),
+            Sig(sfCounterpartySignature, lender),
+            kLATE_INTEREST_RATE(kMAX_LATE_INTEREST_RATE + 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
         // sfLateInterestRate: too small
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            lateInterestRate(TenthBips32(-1)),
+            Sig(sfCounterpartySignature, lender),
+            kLATE_INTEREST_RATE(TenthBips32(-1)),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfCloseInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            closeInterestRate(maxCloseInterestRate),
+            Sig(sfCounterpartySignature, borrower),
+            kCLOSE_INTEREST_RATE(kMAX_CLOSE_INTEREST_RATE),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            closeInterestRate(TenthBips32(0)),
+            Sig(sfCounterpartySignature, borrower),
+            kCLOSE_INTEREST_RATE(TenthBips32(0)),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfCloseInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            closeInterestRate(maxCloseInterestRate + 1),
+            Sig(sfCounterpartySignature, lender),
+            kCLOSE_INTEREST_RATE(kMAX_CLOSE_INTEREST_RATE + 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            closeInterestRate(TenthBips32(-1)),
+            Sig(sfCounterpartySignature, lender),
+            kCLOSE_INTEREST_RATE(TenthBips32(-1)),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfOverpaymentInterestRate: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            overpaymentInterestRate(maxOverpaymentInterestRate),
+            Sig(sfCounterpartySignature, borrower),
+            kOVERPAYMENT_INTEREST_RATE(kMAX_OVERPAYMENT_INTEREST_RATE),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            overpaymentInterestRate(TenthBips32(0)),
+            Sig(sfCounterpartySignature, borrower),
+            kOVERPAYMENT_INTEREST_RATE(TenthBips32(0)),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfOverpaymentInterestRate: too big
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            overpaymentInterestRate(maxOverpaymentInterestRate + 1),
+            Sig(sfCounterpartySignature, lender),
+            kOVERPAYMENT_INTEREST_RATE(kMAX_OVERPAYMENT_INTEREST_RATE + 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            overpaymentInterestRate(TenthBips32(-1)),
+            Sig(sfCounterpartySignature, lender),
+            kOVERPAYMENT_INTEREST_RATE(TenthBips32(-1)),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfPaymentTotal: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            paymentTotal(LoanSet::minPaymentTotal),
+            Sig(sfCounterpartySignature, borrower),
+            kPAYMENT_TOTAL(LoanSet::kMIN_PAYMENT_TOTAL),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfPaymentTotal: too small (there is no max)
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            paymentTotal(LoanSet::minPaymentTotal - 1),
+            Sig(sfCounterpartySignature, lender),
+            kPAYMENT_TOTAL(LoanSet::kMIN_PAYMENT_TOTAL - 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfPaymentInterval: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            paymentInterval(LoanSet::minPaymentInterval),
+            Sig(sfCounterpartySignature, borrower),
+            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfPaymentInterval: too small (there is no max)
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            paymentInterval(LoanSet::minPaymentInterval - 1),
+            Sig(sfCounterpartySignature, lender),
+            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL - 1),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // sfGracePeriod: good value, bad account
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, borrower),
-            paymentInterval(LoanSet::minPaymentInterval * 2),
-            gracePeriod(LoanSet::minPaymentInterval * 2),
+            Sig(sfCounterpartySignature, borrower),
+            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
+            kGRACE_PERIOD(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // sfGracePeriod: larger than paymentInterval
         env(set(evan, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            paymentInterval(LoanSet::minPaymentInterval * 2),
-            gracePeriod(LoanSet::minPaymentInterval * 3),
+            Sig(sfCounterpartySignature, lender),
+            kPAYMENT_INTERVAL(LoanSet::kMIN_PAYMENT_INTERVAL * 2),
+            kGRACE_PERIOD(LoanSet::kMIN_PAYMENT_INTERVAL * 3),
             loanSetFee,
-            ter(temINVALID));
+            Ter(temINVALID));
 
         // insufficient fee - single sign
         env(set(borrower, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, lender),
-            ter(telINSUF_FEE_P));
+            Sig(sfCounterpartySignature, lender),
+            Ter(telINSUF_FEE_P));
         // insufficient fee - multisign
         env(signers(lender, 2, {{evan, 1}, {borrower, 1}}));
         env(signers(borrower, 2, {{evan, 1}, {lender, 1}}));
         env(set(borrower, broker.brokerID, principalRequest),
-            counterparty(lender),
-            msig(evan, lender),
-            msig(sfCounterpartySignature, evan, borrower),
-            fee(env.current()->fees().base * 5 - 1),
-            ter(telINSUF_FEE_P));
+            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),
-            counterparty(lender),
-            msig(alice, issuer),
-            msig(sfCounterpartySignature, evan, borrower),
-            fee(env.current()->fees().base * 5),
-            ter(tefBAD_SIGNATURE));
+            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),
-            counterparty(lender),
-            msig(evan, lender),
-            msig(sfCounterpartySignature, alice, issuer),
-            fee(env.current()->fees().base * 5 - 1),
-            ter(tefBAD_SIGNATURE));
-        env(signers(lender, none));
-        env(signers(borrower, none));
+            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));
         // multisign sufficient fee, but no signers set up
         env(set(borrower, broker.brokerID, principalRequest),
-            counterparty(lender),
-            msig(evan, lender),
-            msig(sfCounterpartySignature, evan, borrower),
-            fee(env.current()->fees().base * 5),
-            ter(tefNOT_MULTI_SIGNING));
+            kCOUNTERPARTY(lender),
+            Msig(evan, lender),
+            Msig(sfCounterpartySignature, evan, borrower),
+            Fee(env.current()->fees().base * 5),
+            Ter(tefNOT_MULTI_SIGNING));
         // not the broker owner, no counterparty, not signed by broker
         // owner
         env(set(borrower, broker.brokerID, principalRequest),
-            sig(sfCounterpartySignature, evan),
+            Sig(sfCounterpartySignature, evan),
             loanSetFee,
-            ter(tefBAD_AUTH));
+            Ter(tefBAD_AUTH));
         // not the broker owner, counterparty is borrower
         env(set(evan, broker.brokerID, principalRequest),
-            counterparty(borrower),
-            sig(sfCounterpartySignature, borrower),
+            kCOUNTERPARTY(borrower),
+            Sig(sfCounterpartySignature, borrower),
             loanSetFee,
-            ter(tecNO_PERMISSION));
+            Ter(tecNO_PERMISSION));
         // not a LoanBroker object, no counterparty
         env(set(lender, badKeylet.key, principalRequest),
-            sig(sfCounterpartySignature, evan),
+            Sig(sfCounterpartySignature, evan),
             loanSetFee,
-            ter(temBAD_SIGNER));
+            Ter(temBAD_SIGNER));
         // not a LoanBroker object, counterparty is valid
         env(set(lender, badKeylet.key, principalRequest),
-            counterparty(borrower),
-            sig(sfCounterpartySignature, borrower),
+            kCOUNTERPARTY(borrower),
+            Sig(sfCounterpartySignature, borrower),
             loanSetFee,
-            ter(tecNO_ENTRY));
+            Ter(tecNO_ENTRY));
         // borrower doesn't exist
         env(set(lender, broker.brokerID, principalRequest),
-            counterparty(alice),
-            sig(sfCounterpartySignature, alice),
+            kCOUNTERPARTY(alice),
+            Sig(sfCounterpartySignature, alice),
             loanSetFee,
-            ter(terNO_ACCOUNT));
+            Ter(terNO_ACCOUNT));
 
         // Request more funds than the vault has available
         env(set(evan, broker.brokerID, totalVaultRequest + 1),
-            sig(sfCounterpartySignature, lender),
+            Sig(sfCounterpartySignature, lender),
             loanSetFee,
-            ter(tecINSUFFICIENT_FUNDS));
+            Ter(tecINSUFFICIENT_FUNDS));
 
         // Request more funds than the broker's first-loss capital can
         // cover.
         env(set(evan, broker.brokerID, maxCoveredLoanRequest + 1),
-            sig(sfCounterpartySignature, lender),
+            Sig(sfCounterpartySignature, lender),
             loanSetFee,
-            ter(tecINSUFFICIENT_FUNDS));
+            Ter(tecINSUFFICIENT_FUNDS));
 
         // Frozen trust line / locked MPT issuance
         // XRP can not be frozen, but run through the loop anyway to test
@@ -1899,14 +1899,14 @@ protected:
                 if (broker.asset.holds<Issue>())
                 {
                     auto freeze = [&](Account const& holder) {
-                        env(trust(issuer, holder[iouCurrency](0), tfSetFreeze));
+                        env(trust(issuer, holder[iouCurrency_](0), tfSetFreeze));
                     };
                     auto deepfreeze = [&](Account const& holder) {
-                        env(trust(issuer, holder[iouCurrency](0), tfSetFreeze | tfSetDeepFreeze));
+                        env(trust(issuer, holder[iouCurrency_](0), tfSetFreeze | tfSetDeepFreeze));
                     };
                     auto unfreeze = [&](Account const& holder) {
                         env(trust(
-                            issuer, holder[iouCurrency](0), tfClearFreeze | tfClearDeepFreeze));
+                            issuer, holder[iouCurrency_](0), tfClearFreeze | tfClearDeepFreeze));
                     };
                     return std::make_tuple(freeze, deepfreeze, unfreeze, tecFROZEN);
                 }
@@ -1930,9 +1930,9 @@ protected:
 
                     // Try to create a loan with a frozen line
                     env(set(evan, broker.brokerID, debtMaximumRequest),
-                        sig(sfCounterpartySignature, lender),
+                        Sig(sfCounterpartySignature, lender),
                         loanSetFee,
-                        ter(expectedResult));
+                        Ter(expectedResult));
 
                     // Unfreeze the account
                     BEAST_EXPECT(unfreeze);
@@ -1942,9 +1942,9 @@ protected:
                     // except too it requests more principal than the broker can
                     // carry
                     env(set(evan, broker.brokerID, debtMaximumRequest + 1),
-                        sig(sfCounterpartySignature, lender),
+                        Sig(sfCounterpartySignature, lender),
                         loanSetFee,
-                        ter(tecLIMIT_EXCEEDED));
+                        Ter(tecLIMIT_EXCEEDED));
                 }
             }
 
@@ -1956,7 +1956,7 @@ protected:
                 // freeze it. (Don't need to do this for the borrower,
                 // because LoanSet will create a line to the borrower
                 // automatically.)
-                env(trust(evan, issuer[iouCurrency](100'000)));
+                env(trust(evan, issuer[iouCurrency_](100'000)));
 
                 for (auto const& account : {// these accounts can't be frozen, which deep freeze
                                             // implies
@@ -1970,9 +1970,9 @@ protected:
 
                     // Try to create a loan with a deep frozen line
                     env(set(evan, broker.brokerID, debtMaximumRequest),
-                        sig(sfCounterpartySignature, lender),
+                        Sig(sfCounterpartySignature, lender),
                         loanSetFee,
-                        ter(expectedResult));
+                        Ter(expectedResult));
 
                     // Unfreeze evan
                     BEAST_EXPECT(unfreeze);
@@ -1982,9 +1982,9 @@ protected:
                     // except too it requests more principal than the broker can
                     // carry
                     env(set(evan, broker.brokerID, debtMaximumRequest + 1),
-                        sig(sfCounterpartySignature, lender),
+                        Sig(sfCounterpartySignature, lender),
                         loanSetFee,
-                        ter(tecLIMIT_EXCEEDED));
+                        Ter(tecLIMIT_EXCEEDED));
                 }
             }
         }
@@ -2011,7 +2011,7 @@ protected:
                          ? 0
                          : std::max(
                                broker.vaultScale(env), state.principalOutstanding.exponent())));
-                NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+                NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
                 auto const defaultAmount = roundToAsset(
                     broker.asset,
                     std::min(
@@ -2058,7 +2058,7 @@ protected:
                     bool const canImpair = canImpairLoan(env, broker, state);
                     // Impair the loan, if possible
                     env(manage(lender, loanKeylet.key, tfLoanImpair),
-                        canImpair ? ter(tesSUCCESS) : ter(tecLIMIT_EXCEEDED));
+                        canImpair ? Ter(tesSUCCESS) : Ter(tecLIMIT_EXCEEDED));
 
                     if (canImpair)
                     {
@@ -2066,7 +2066,7 @@ protected:
                         state.nextPaymentDate = env.now().time_since_epoch().count();
 
                         // Once the loan is impaired, it can't be impaired again
-                        env(manage(lender, loanKeylet.key, tfLoanImpair), ter(tecNO_PERMISSION));
+                        env(manage(lender, loanKeylet.key, tfLoanImpair), Ter(tecNO_PERMISSION));
                     }
                     verifyLoanStatus(state);
                 }
@@ -2075,7 +2075,7 @@ protected:
 
                 // Can't default the loan yet. The grace period hasn't
                 // expired
-                env(manage(lender, loanKeylet.key, tfLoanDefault), ter(tecTOO_SOON));
+                env(manage(lender, loanKeylet.key, tfLoanDefault), Ter(tecTOO_SOON));
 
                 // Let some time pass so that the loan can be
                 // defaulted
@@ -2100,10 +2100,10 @@ protected:
                 verifyLoanStatus(state);
 
                 // Once a loan is defaulted, it can't be managed
-                env(manage(lender, loanKeylet.key, tfLoanUnimpair), ter(tecNO_PERMISSION));
-                env(manage(lender, loanKeylet.key, tfLoanImpair), ter(tecNO_PERMISSION));
+                env(manage(lender, loanKeylet.key, tfLoanUnimpair), Ter(tecNO_PERMISSION));
+                env(manage(lender, loanKeylet.key, tfLoanImpair), Ter(tecNO_PERMISSION));
                 // Can't make a payment on it either
-                env(pay(borrower, loanKeylet.key, broker.asset(300)), ter(tecKILLED));
+                env(pay(borrower, loanKeylet.key, broker.asset(300)), Ter(tecKILLED));
             };
         };
 
@@ -2120,12 +2120,12 @@ protected:
 
             // Send some bogus pay transactions
             env(pay(borrower, keylet::loan(uint256(0)).key, broker.asset(10), txFlags),
-                ter(temINVALID));
+                Ter(temINVALID));
             // broker.asset(80) is less than a single payment, but all these
             // checks fail before that matters
-            env(pay(borrower, loanKeylet.key, broker.asset(-80), txFlags), ter(temBAD_AMOUNT));
-            env(pay(borrower, broker.brokerID, broker.asset(80), txFlags), ter(tecNO_ENTRY));
-            env(pay(evan, loanKeylet.key, broker.asset(80), txFlags), ter(tecNO_PERMISSION));
+            env(pay(borrower, loanKeylet.key, broker.asset(-80), txFlags), Ter(temBAD_AMOUNT));
+            env(pay(borrower, broker.brokerID, broker.asset(80), txFlags), Ter(tecNO_ENTRY));
+            env(pay(evan, loanKeylet.key, broker.asset(80), txFlags), Ter(tecNO_PERMISSION));
 
             // TODO: Write a general "isFlag" function? See STObject::isFlag.
             // Maybe add a static overloaded member?
@@ -2138,8 +2138,9 @@ protected:
                         loanKeylet.key,
                         STAmount{broker.asset, state.periodicPayment * Number{15, -1}},
                         tfLoanOverpayment),
-                    fee(XRPAmount{baseFee * (Number{15, -1} / loanPaymentsPerFeeIncrement + 1)}),
-                    ter(tecNO_PERMISSION));
+                    Fee(XRPAmount{
+                        baseFee * (Number{15, -1} / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)}),
+                    Ter(tecNO_PERMISSION));
 
                 {
                     env.disableFeature(fixSecurity3_1_3);
@@ -2147,9 +2148,9 @@ protected:
                             loanKeylet.key,
                             STAmount{broker.asset, state.periodicPayment * Number{15, -1}},
                             tfLoanOverpayment),
-                        fee(XRPAmount{
-                            baseFee * (Number{15, -1} / loanPaymentsPerFeeIncrement + 1)}),
-                        ter(temINVALID_FLAG));
+                        Fee(XRPAmount{
+                            baseFee * (Number{15, -1} / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)}),
+                        Ter(temINVALID_FLAG));
                     env.enableFeature(fixSecurity3_1_3);
                 }
             }
@@ -2160,32 +2161,32 @@ protected:
                     loanKeylet.key,
                     broker.asset(state.periodicPayment * 2),
                     tfLoanLatePayment | tfLoanFullPayment),
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
             env(pay(borrower,
                     loanKeylet.key,
                     broker.asset(state.periodicPayment * 2),
                     tfLoanLatePayment | tfLoanOverpayment),
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
             env(pay(borrower,
                     loanKeylet.key,
                     broker.asset(state.periodicPayment * 2),
                     tfLoanOverpayment | tfLoanFullPayment),
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
             env(pay(borrower,
                     loanKeylet.key,
                     broker.asset(state.periodicPayment * 2),
                     tfLoanLatePayment | tfLoanOverpayment | tfLoanFullPayment),
-                ter(temINVALID_FLAG));
+                Ter(temINVALID_FLAG));
 
             {
                 auto const otherAsset =
                     broker.asset.raw() == assets[0].raw() ? assets[1] : assets[0];
-                env(pay(borrower, loanKeylet.key, otherAsset(100), txFlags), ter(tecWRONG_ASSET));
+                env(pay(borrower, loanKeylet.key, otherAsset(100), txFlags), Ter(tecWRONG_ASSET));
             }
 
             // Amount doesn't cover a single payment
             env(pay(borrower, loanKeylet.key, STAmount{broker.asset, 1}, txFlags),
-                ter(tecINSUFFICIENT_PAYMENT));
+                Ter(tecINSUFFICIENT_PAYMENT));
 
             // Get the balance after these failed transactions take
             // fees
@@ -2201,17 +2202,17 @@ protected:
             XRPAmount const badFee{
                 baseFee *
                 (borrowerBalanceBeforePayment.number() * 2 / state.periodicPayment /
-                     loanPaymentsPerFeeIncrement +
+                     kLOAN_PAYMENTS_PER_FEE_INCREMENT +
                  1)};
             env(pay(borrower,
                     loanKeylet.key,
                     STAmount{broker.asset, borrowerBalanceBeforePayment.number() * 2},
                     txFlags),
-                fee(badFee),
-                ter(tecINSUFFICIENT_FUNDS));
+                Fee(badFee),
+                Ter(tecINSUFFICIENT_FUNDS));
 
-            XRPAmount const goodFee{baseFee * (numPayments / loanPaymentsPerFeeIncrement + 1)};
-            env(pay(borrower, loanKeylet.key, transactionAmount, txFlags), fee(goodFee));
+            XRPAmount const goodFee{baseFee * (numPayments / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+            env(pay(borrower, loanKeylet.key, transactionAmount, txFlags), Fee(goodFee));
 
             env.close();
 
@@ -2237,8 +2238,8 @@ protected:
                 state.loanScale, borrower, borrowerBalanceBeforePayment, payoffAmount, adjustment);
 
             // Can't impair or default a paid off loan
-            env(manage(lender, loanKeylet.key, tfLoanImpair), ter(tecNO_PERMISSION));
-            env(manage(lender, loanKeylet.key, tfLoanDefault), ter(tecNO_PERMISSION));
+            env(manage(lender, loanKeylet.key, tfLoanImpair), Ter(tecNO_PERMISSION));
+            env(manage(lender, loanKeylet.key, tfLoanDefault), Ter(tecNO_PERMISSION));
         };
 
         auto fullPayment = [&](std::uint32_t baseFlag) {
@@ -2260,9 +2261,9 @@ 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) / secondsInYear;
+                auto const periodicRate = interval * Number(12, -2) / kSECONDS_IN_YEAR;
                 BEAST_EXPECT(
-                    periodicRate == Number(2283105022831050228ULL, -24, Number::normalized{}));
+                    periodicRate == Number(2283105022831050228ULL, -24, Number::Normalized{}));
                 STAmount const principalOutstanding{broker.asset, state.principalOutstanding};
                 STAmount const accruedInterest{
                     broker.asset, state.principalOutstanding * periodicRate * loanAge / interval};
@@ -2315,7 +2316,7 @@ protected:
                     // service fee is 2
                     auto const startingPayments = state.paymentRemaining;
                     STAmount const payoffAmount = [&]() {
-                        NumberRoundModeGuard const mg(Number::rounding_mode::upward);
+                        NumberRoundModeGuard const mg(Number::RoundingMode::Upward);
                         auto const rawPayoff =
                             startingPayments * (state.periodicPayment + broker.asset(2).value());
                         STAmount payoffAmount{broker.asset, rawPayoff};
@@ -2500,9 +2501,9 @@ 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) / secondsInYear;
+                auto const periodicRate = interval * Number(12, -2) / kSECONDS_IN_YEAR;
                 BEAST_EXPECT(
-                    periodicRate == Number(2283105022831050228, -24, Number::normalized{}));
+                    periodicRate == Number(2283105022831050228, -24, Number::Normalized{}));
                 STAmount const roundedPeriodicPayment{
                     broker.asset,
                     roundPeriodicPayment(broker.asset, state.periodicPayment, state.loanScale)};
@@ -2518,24 +2519,24 @@ protected:
                     roundedPeriodicPayment ==
                     roundToScale(
                         broker.asset(
-                            Number(8333457002039338267, -17), Number::rounding_mode::upward),
+                            Number(8333457002039338267, -17), Number::RoundingMode::Upward),
                         state.loanScale,
-                        Number::rounding_mode::upward));
+                        Number::RoundingMode::Upward));
                 // 83334570.01162141
                 // Include the service fee
                 STAmount const totalDue = roundToScale(
                     roundedPeriodicPayment + serviceFee,
                     state.loanScale,
-                    Number::rounding_mode::upward);
+                    Number::RoundingMode::Upward);
                 // Only check the first payment since the rounding
                 // may drift as payments are made
                 BEAST_EXPECT(
                     totalDue ==
                     roundToScale(
                         broker.asset(
-                            Number(8533457002039338267, -17), Number::rounding_mode::upward),
+                            Number(8533457002039338267, -17), Number::RoundingMode::Upward),
                         state.loanScale,
-                        Number::rounding_mode::upward));
+                        Number::RoundingMode::Upward));
 
                 {
                     auto const raw = computeTheoreticalLoanState(
@@ -2563,9 +2564,9 @@ protected:
                 BEAST_EXPECT(
                     transactionAmount ==
                     roundToScale(
-                        broker.asset(Number(9533457002039400, -14), Number::rounding_mode::upward),
+                        broker.asset(Number(9533457002039400, -14), Number::RoundingMode::Upward),
                         state.loanScale,
-                        Number::rounding_mode::upward));
+                        Number::RoundingMode::Upward));
 
                 auto const initialState = state;
                 xrpl::detail::PaymentComponents totalPaid{
@@ -2596,7 +2597,7 @@ protected:
                         broker.params.managementFeeRate);
 
                     BEAST_EXPECTS(
-                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
+                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
                             paymentComponents.trackedValueDelta <= roundedPeriodicPayment,
                         "Delta: " + to_string(paymentComponents.trackedValueDelta) +
                             ", periodic payment: " + to_string(roundedPeriodicPayment));
@@ -2616,10 +2617,10 @@ protected:
                              << paymentComponents.trackedManagementFeeDelta << ", "
                              << [&]() -> char const* {
                         if (paymentComponents.specialCase ==
-                            ::xrpl::detail::PaymentSpecialCase::final)
+                            ::xrpl::detail::PaymentSpecialCase::Final)
                             return "final";
                         if (paymentComponents.specialCase ==
-                            ::xrpl::detail::PaymentSpecialCase::extra)
+                            ::xrpl::detail::PaymentSpecialCase::Extra)
                             return "extra";
                         return "none";
                     }();
@@ -2635,9 +2636,9 @@ protected:
                     // IOUs, the difference should be after the 8th digit.
                     Number const diff = totalDue - totalDueAmount;
                     BEAST_EXPECT(
-                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
-                        diff == beast::zero ||
-                        (diff > beast::zero &&
+                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
+                        diff == beast::kZERO ||
+                        (diff > beast::kZERO &&
                          ((broker.asset.integral() && (static_cast<Number>(diff) < 3)) ||
                           (state.loanScale - diff.exponent() > 13))));
 
@@ -2647,7 +2648,7 @@ protected:
                             paymentComponents.trackedInterestPart() +
                             paymentComponents.trackedManagementFeeDelta);
                     BEAST_EXPECT(
-                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
+                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
                         paymentComponents.trackedValueDelta <= roundedPeriodicPayment);
 
                     BEAST_EXPECT(
@@ -2656,21 +2657,20 @@ protected:
                             broker.asset,
                             deltas.principal,
                             state.loanScale,
-                            Number::rounding_mode::upward) ==
+                            Number::RoundingMode::Upward) ==
                             roundToScale(
                                 broker.asset(
-                                    Number(8333228691531218890, -17),
-                                    Number::rounding_mode::upward),
+                                    Number(8333228691531218890, -17), Number::RoundingMode::Upward),
                                 state.loanScale,
-                                Number::rounding_mode::upward));
+                                Number::RoundingMode::Upward));
                     BEAST_EXPECT(
-                        paymentComponents.trackedPrincipalDelta >= beast::zero &&
+                        paymentComponents.trackedPrincipalDelta >= beast::kZERO &&
                         paymentComponents.trackedPrincipalDelta <= state.principalOutstanding);
                     BEAST_EXPECT(
-                        paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::final ||
+                        paymentComponents.specialCase != xrpl::detail::PaymentSpecialCase::Final ||
                         paymentComponents.trackedPrincipalDelta == state.principalOutstanding);
                     BEAST_EXPECT(
-                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final ||
+                        paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final ||
                         (state.periodicPayment.exponent() -
                          (deltas.principal + deltas.interest + deltas.managementFee -
                           state.periodicPayment)
@@ -2708,7 +2708,7 @@ protected:
 
                     --state.paymentRemaining;
                     state.previousPaymentDate = state.nextPaymentDate;
-                    if (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::final)
+                    if (paymentComponents.specialCase == xrpl::detail::PaymentSpecialCase::Final)
                     {
                         state.paymentRemaining = 0;
                         state.nextPaymentDate = 0;
@@ -2752,8 +2752,8 @@ protected:
                 BEAST_EXPECT(totalPaymentsMade == initialState.paymentRemaining);
 
                 // Can't impair or default a paid off loan
-                env(manage(lender, loanKeylet.key, tfLoanImpair), ter(tecNO_PERMISSION));
-                env(manage(lender, loanKeylet.key, tfLoanDefault), ter(tecNO_PERMISSION));
+                env(manage(lender, loanKeylet.key, tfLoanImpair), Ter(tecNO_PERMISSION));
+                env(manage(lender, loanKeylet.key, tfLoanDefault), Ter(tecNO_PERMISSION));
             });
 
 #if LOAN_TODO
@@ -2818,7 +2818,7 @@ protected:
                 STAmount const bigPayment{broker.asset, totalDue * numPayments};
                 XRPAmount const bigFee{baseFee * (numPayments / loanPaymentsPerFeeIncrement + 1)};
                 time("ten payments", [&]() {
-                    env(pay(borrower, loanKeylet.key, bigPayment), fee(bigFee));
+                    env(pay(borrower, loanKeylet.key, bigPayment), Fee(bigFee));
                 });
                 env.close();
 
@@ -2908,7 +2908,7 @@ protected:
                                   std::function<void(Env&, BrokerInfo const&, MPTTester&)> mptTest,
                                   std::function<void(Env&, BrokerInfo const&)> iouTest,
                                   CaseArgs args = {}) {
-            Env env(*this, all);
+            Env env(*this, all_);
             env.fund(XRP(args.initialXRP), issuer, lender, borrower);
             env.close();
             if (args.requireAuth)
@@ -2919,12 +2919,12 @@ protected:
 
             // We need two different asset types, MPT and IOU. Prepare MPT
             // first
-            MPTTester mptt{env, issuer, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
 
-            auto const none = LedgerSpecificFlags(0);
+            auto const kNONE = LedgerSpecificFlags(0);
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock |
-                     (args.requireAuth ? tfMPTRequireAuth : none)});
+                     (args.requireAuth ? tfMPTRequireAuth : kNONE)});
             env.close();
             PrettyAsset const mptAsset = mptt.issuanceID();
             mptt.authorize({.account = lender});
@@ -2942,7 +2942,7 @@ protected:
             env.close();
 
             // Prepare IOU
-            PrettyAsset const iouAsset = issuer[iouCurrency];
+            PrettyAsset const iouAsset = issuer[iouCurrency_];
             env(trust(lender, iouAsset(10'000'000)));
             env(trust(borrower, iouAsset(10'000'000)));
             env.close();
@@ -2985,15 +2985,15 @@ protected:
 
                 testcase("MPT issuer is borrower, issuer submits");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
 
                 testcase("MPT issuer is borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(issuer),
-                    sig(sfCounterpartySignature, issuer),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(issuer),
+                    Sig(sfCounterpartySignature, issuer),
+                    Fee(env.current()->fees().base * 5));
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3001,15 +3001,15 @@ protected:
 
                 testcase("IOU issuer is borrower, issuer submits");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
 
                 testcase("IOU issuer is borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(issuer),
-                    sig(sfCounterpartySignature, issuer),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(issuer),
+                    Sig(sfCounterpartySignature, issuer),
+                    Fee(env.current()->fees().base * 5));
             },
             CaseArgs{.requireAuth = true});
 
@@ -3020,17 +3020,17 @@ protected:
 
                 testcase("MPT unauthorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    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),
-                    counterparty(borrower),
-                    sig(sfCounterpartySignature, borrower),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    kCOUNTERPARTY(borrower),
+                    Sig(sfCounterpartySignature, borrower),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_AUTH});
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3038,25 +3038,25 @@ protected:
 
                 testcase("IOU unauthorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    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),
-                    counterparty(borrower),
-                    sig(sfCounterpartySignature, borrower),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    kCOUNTERPARTY(borrower),
+                    Sig(sfCounterpartySignature, borrower),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_AUTH});
             },
             CaseArgs{.requireAuth = true});
 
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
-            Env const env{*this, testable_amendments()};
+            Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / DROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / DROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
+                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
         }();
 
         testCase(
@@ -3075,24 +3075,24 @@ protected:
                 BEAST_EXPECT(sleMPT1 == nullptr);
 
                 // Burn some XRP
-                env(noop(borrower), fee(XRP((acctReserve * 2) + (incReserve * 2))));
+                env(noop(borrower), Fee(XRP((acctReserve * 2) + (incReserve * 2))));
                 env.close();
 
                 // Cannot create loan, not enough reserve to create MPToken
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecINSUFFICIENT_RESERVE});
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecINSUFFICIENT_RESERVE});
                 env.close();
 
                 // Can create loan now, will implicitly create MPToken
                 env(pay(issuer, borrower, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
                 env.close();
 
                 auto const sleMPT2 = env.le(mptoken);
@@ -3121,24 +3121,24 @@ protected:
                 BEAST_EXPECT(sleLine1 == nullptr);
 
                 // Burn some XRP
-                env(noop(borrower), fee(XRP((acctReserve * 2) + (incReserve * 2))));
+                env(noop(borrower), Fee(XRP((acctReserve * 2) + (incReserve * 2))));
                 env.close();
 
                 // Cannot create loan, not enough reserve to create trust line
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_LINE_INSUF_RESERVE});
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_LINE_INSUF_RESERVE});
                 env.close();
 
                 // Can create loan now, will implicitly create trust line
                 env(pay(issuer, borrower, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
                 env.close();
 
                 auto const sleLine2 = env.le(trustline);
@@ -3168,26 +3168,26 @@ protected:
                 BEAST_EXPECT(sleMPT2 == nullptr);
 
                 // Burn some XRP
-                env(noop(lender), fee(XRP(incReserve)));
+                env(noop(lender), Fee(XRP(incReserve)));
                 env.close();
 
                 // Cannot create loan, not enough reserve to create MPToken
                 env(set(borrower, broker.brokerID, principalRequest),
-                    loanOriginationFee(broker.asset(1).value()),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecINSUFFICIENT_RESERVE});
+                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecINSUFFICIENT_RESERVE});
                 env.close();
 
                 // Can create loan now, will implicitly create MPToken
                 env(pay(issuer, lender, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    loanOriginationFee(broker.asset(1).value()),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
                 env.close();
 
                 auto const sleMPT3 = env.le(mptoken);
@@ -3219,26 +3219,26 @@ protected:
                 BEAST_EXPECT(sleLine2 == nullptr);
 
                 // Burn some XRP
-                env(noop(lender), fee(XRP(incReserve)));
+                env(noop(lender), Fee(XRP(incReserve)));
                 env.close();
 
                 // Cannot create loan, not enough reserve to create trust line
                 env(set(borrower, broker.brokerID, principalRequest),
-                    loanOriginationFee(broker.asset(1).value()),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_LINE_INSUF_RESERVE});
+                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_LINE_INSUF_RESERVE});
                 env.close();
 
                 // Can create loan now, will implicitly create trust line
                 env(pay(issuer, lender, XRP(incReserve)));
                 env.close();
                 env(set(borrower, broker.brokerID, principalRequest),
-                    loanOriginationFee(broker.asset(1).value()),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
                 env.close();
 
                 auto const sleLine3 = env.le(trustline);
@@ -3267,19 +3267,19 @@ protected:
 
                 // Cannot create loan, lender not authorized to receive fee
                 env(set(borrower, broker.brokerID, principalRequest),
-                    loanOriginationFee(broker.asset(1).value()),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    kLOAN_ORIGINATION_FEE(broker.asset(1).value()),
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_AUTH});
                 env.close();
 
                 // Cannot create loan, even without an origination fee
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter{tecNO_AUTH});
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter{tecNO_AUTH});
                 env.close();
 
                 // No MPToken for lender - no authorization and no payment
@@ -3296,9 +3296,9 @@ protected:
 
                 testcase("MPT authorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3306,9 +3306,9 @@ protected:
 
                 testcase("IOU authorized borrower, borrower submits");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5));
             },
             CaseArgs{.requireAuth = true, .authorizeBorrower = true});
 
@@ -3319,9 +3319,9 @@ protected:
 
                 testcase("MPT authorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(borrower),
-                    sig(sfCounterpartySignature, borrower),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(borrower),
+                    Sig(sfCounterpartySignature, borrower),
+                    Fee(env.current()->fees().base * 5));
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3329,16 +3329,16 @@ protected:
 
                 testcase("IOU authorized borrower, lender submits");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(borrower),
-                    sig(sfCounterpartySignature, borrower),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(borrower),
+                    Sig(sfCounterpartySignature, borrower),
+                    Fee(env.current()->fees().base * 5));
             },
             CaseArgs{.requireAuth = true, .authorizeBorrower = true});
 
         jtx::Account const alice{"alice"};
         jtx::Account const bella{"bella"};
         auto const msigSetup = [&](Env& env, Account const& account) {
-            Json::Value const tx1 = signers(account, 2, {{alice, 1}, {bella, 1}});
+            json::Value const tx1 = signers(account, 2, {{alice, 1}, {bella, 1}});
             env(tx1);
             env.close();
         };
@@ -3353,9 +3353,9 @@ protected:
                     "MPT authorized borrower, borrower submits, lender "
                     "multisign");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    msig(sfCounterpartySignature, alice, bella),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Msig(sfCounterpartySignature, alice, bella),
+                    Fee(env.current()->fees().base * 5));
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3366,9 +3366,9 @@ protected:
                     "IOU authorized borrower, borrower submits, lender "
                     "multisign");
                 env(set(borrower, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    msig(sfCounterpartySignature, alice, bella),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(lender),
+                    Msig(sfCounterpartySignature, alice, bella),
+                    Fee(env.current()->fees().base * 5));
             },
             CaseArgs{.requireAuth = true, .authorizeBorrower = true});
 
@@ -3382,9 +3382,9 @@ protected:
                     "MPT authorized borrower, lender submits, borrower "
                     "multisign");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(borrower),
-                    msig(sfCounterpartySignature, alice, bella),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(borrower),
+                    Msig(sfCounterpartySignature, alice, bella),
+                    Fee(env.current()->fees().base * 5));
             },
             [&, this](Env& env, BrokerInfo const& broker) {
                 using namespace loan;
@@ -3395,9 +3395,9 @@ protected:
                     "IOU authorized borrower, lender submits, borrower "
                     "multisign");
                 env(set(lender, broker.brokerID, principalRequest),
-                    counterparty(borrower),
-                    msig(sfCounterpartySignature, alice, bella),
-                    fee(env.current()->fees().base * 5));
+                    kCOUNTERPARTY(borrower),
+                    Msig(sfCounterpartySignature, alice, bella),
+                    Fee(env.current()->fees().base * 5));
             },
             CaseArgs{.requireAuth = true, .authorizeBorrower = true});
 
@@ -3413,11 +3413,11 @@ protected:
 
                 testcase("Vault at maximum value");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    interestRate(TenthBips32(10'000)),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    ter(tecLIMIT_EXCEEDED));
+                    kCOUNTERPARTY(lender),
+                    kINTEREST_RATE(TenthBips32(10'000)),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    Ter(tecLIMIT_EXCEEDED));
             },
             nullptr);
 
@@ -3434,13 +3434,13 @@ protected:
 
                 testcase("Vault maximum value exceeded");
                 env(set(issuer, broker.brokerID, principalRequest),
-                    counterparty(lender),
-                    interestRate(TenthBips32(100'000)),
-                    sig(sfCounterpartySignature, lender),
-                    fee(env.current()->fees().base * 5),
-                    paymentTotal(2),
-                    paymentInterval(3600 * 24),
-                    ter(tecLIMIT_EXCEEDED));
+                    kCOUNTERPARTY(lender),
+                    kINTEREST_RATE(TenthBips32(100'000)),
+                    Sig(sfCounterpartySignature, lender),
+                    Fee(env.current()->fees().base * 5),
+                    kPAYMENT_TOTAL(2),
+                    kPAYMENT_INTERVAL(3600 * 24),
+                    Ter(tecLIMIT_EXCEEDED));
             },
             nullptr);
     }
@@ -3453,7 +3453,7 @@ protected:
 
         // Create 3 loan brokers: one for XRP, one for an IOU, and one for
         // an MPT. That'll require three corresponding SAVs.
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         // For simplicity, lender will be the sole actor for the vault &
@@ -3473,7 +3473,7 @@ protected:
 
         // Create assets
         PrettyAsset const xrpAsset{xrpIssue(), 1'000'000};
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         env(trust(lender, iouAsset(10'000'000)));
         env(trust(borrower, iouAsset(10'000'000)));
         env(trust(evan, iouAsset(10'000'000)));
@@ -3483,7 +3483,7 @@ protected:
         env(pay(issuer, borrower, iouAsset(10'000)));
         env.close();
 
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         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};
@@ -3548,7 +3548,7 @@ protected:
         using namespace std::chrono_literals;
         // Create 3 loan brokers: one for XRP, one for an IOU, and one for
         // an MPT. That'll require three corresponding SAVs.
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         // For simplicity, lender will be the sole actor for the vault &
@@ -3568,19 +3568,19 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         // The LoanSet json can be created without a counterparty signature,
         // but it will not pass preflight
         auto createJson = env.json(
-            set(lender, broker.brokerID, broker.asset(principalRequest).value()), fee(loanSetFee));
-        env(createJson, ter(temBAD_SIGNER));
+            set(lender, broker.brokerID, broker.asset(principalRequest).value()), Fee(loanSetFee));
+        env(createJson, Ter(temBAD_SIGNER));
 
         // Adding an empty counterparty signature object also fails, but
         // at the RPC level.
-        createJson = env.json(createJson, json(sfCounterpartySignature, Json::objectValue));
-        env(createJson, ter(telENV_RPC_FAILED));
+        createJson = env.json(createJson, Json(sfCounterpartySignature, json::ObjectValue));
+        env(createJson, Ter(telENV_RPC_FAILED));
 
         if (auto const jt = env.jt(createJson); BEAST_EXPECT(jt.stx))
         {
@@ -3597,14 +3597,14 @@ protected:
         }
 
         // Copy the transaction signature into the counterparty signature.
-        Json::Value counterpartyJson{Json::objectValue};
+        json::Value counterpartyJson{json::ObjectValue};
         counterpartyJson[sfTxnSignature] = createJson[sfTxnSignature];
         counterpartyJson[sfSigningPubKey] = createJson[sfSigningPubKey];
         if (!BEAST_EXPECT(!createJson.isMember(jss::Signers)))
             counterpartyJson[sfSigners] = createJson[sfSigners];
 
         // The duplicated signature works
-        createJson = env.json(createJson, json(sfCounterpartySignature, counterpartyJson));
+        createJson = env.json(createJson, Json(sfCounterpartySignature, counterpartyJson));
         env(createJson);
 
         env.close();
@@ -3629,7 +3629,7 @@ protected:
             }
         }
         auto const loanID = [&]() {
-            Json::Value params(Json::objectValue);
+            json::Value params(json::ObjectValue);
             params[jss::account] = lender.human();
             params[jss::type] = "Loan";
             auto const res = env.rpc("json", "account_objects", to_string(params));
@@ -3681,12 +3681,12 @@ protected:
         testcase << "Batch Bypass Counterparty";
 
         bool const lendingBatchEnabled = !std::ranges::any_of(
-            Batch::disabledTxTypes,
+            Batch::kDISABLED_TX_TYPES,
             [](auto const& disabled) { return disabled == ttLOAN_BROKER_SET; });
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const lender{"lender"};
         Account const borrower{"borrower"};
@@ -3701,38 +3701,38 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         auto forgedLoanSet = set(borrower, broker.brokerID, principalRequest, 0);
 
-        Json::Value randomData{Json::objectValue};
-        randomData[jss::SigningPubKey] = Json::StaticString{"2600"};
-        Json::Value sigObject{Json::objectValue};
+        json::Value randomData{json::ObjectValue};
+        randomData[jss::SigningPubKey] = json::StaticString{"2600"};
+        json::Value sigObject{json::ObjectValue};
         sigObject[jss::SigningPubKey] = strHex(lender.pk().slice());
         Serializer ss;
-        ss.add32(HashPrefix::txSign);
+        ss.add32(HashPrefix::TxSign);
         parse(randomData).addWithoutSigningFields(ss);
         auto const sig = xrpl::sign(borrower.pk(), borrower.sk(), ss.slice());
         sigObject[jss::TxnSignature] = strHex(Slice{sig.data(), sig.size()});
 
-        forgedLoanSet[Json::StaticString{"CounterpartySignature"}] = sigObject;
+        forgedLoanSet[json::StaticString{"CounterpartySignature"}] = sigObject;
 
         // ? Fails because the lender hasn't signed the tx
-        env(env.json(forgedLoanSet, fee(loanSetFee)), ter(telENV_RPC_FAILED));
+        env(env.json(forgedLoanSet, Fee(loanSetFee)), Ter(telENV_RPC_FAILED));
 
         auto const seq = env.seq(borrower);
         auto const batchFee = batch::calcBatchFee(env, 1, 2);
         // ! Should fail because the lender hasn't signed the tx
         env(batch::outer(borrower, seq, batchFee, tfAllOrNothing),
-            batch::inner(forgedLoanSet, seq + 1),
-            batch::inner(pay(borrower, lender, XRP(1)), seq + 2),
-            ter(lendingBatchEnabled ? temBAD_SIGNATURE : temINVALID_INNER_BATCH));
+            batch::Inner(forgedLoanSet, seq + 1),
+            batch::Inner(pay(borrower, lender, XRP(1)), seq + 2),
+            Ter(lendingBatchEnabled ? temBAD_SIGNATURE : temINVALID_INNER_BATCH));
         env.close();
 
         // ? Check that the loan was NOT created
         {
-            Json::Value params(Json::objectValue);
+            json::Value params(json::ObjectValue);
             params[jss::account] = borrower.human();
             params[jss::type] = "Loan";
             auto const res = env.rpc("json", "account_objects", to_string(params));
@@ -3749,7 +3749,7 @@ protected:
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -3770,18 +3770,18 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
-        auto createJson = env.json(set(lender, broker.brokerID, principalRequest), fee(loanSetFee));
+        auto createJson = env.json(set(lender, broker.brokerID, principalRequest), Fee(loanSetFee));
 
-        Json::Value counterpartyJson{Json::objectValue};
+        json::Value counterpartyJson{json::ObjectValue};
         counterpartyJson[sfTxnSignature] = createJson[sfTxnSignature];
         counterpartyJson[sfSigningPubKey] = createJson[sfSigningPubKey];
         if (!BEAST_EXPECT(!createJson.isMember(jss::Signers)))
             counterpartyJson[sfSigners] = createJson[sfSigners];
 
-        createJson = env.json(createJson, json(sfCounterpartySignature, counterpartyJson));
+        createJson = env.json(createJson, Json(sfCounterpartySignature, counterpartyJson));
         env(createJson);
 
         env.close();
@@ -3796,7 +3796,7 @@ protected:
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -3811,7 +3811,7 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{640562, -5};
 
         Number const serviceFee{2462611968};
@@ -3819,10 +3819,10 @@ protected:
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            loanServiceFee(serviceFee),
-            paymentTotal(numPayments),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            kLOAN_SERVICE_FEE(serviceFee),
+            kPAYMENT_TOTAL(numPayments),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["CloseInterestRate"] = 55374;
         createJson["ClosePaymentFee"] = "3825205248";
@@ -3836,10 +3836,10 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
         // Fails in preclaim because principal requested can't be
         // represented as XRP
-        env(createJson, ter(tecPRECISION_LOSS));
+        env(createJson, Ter(tecPRECISION_LOSS));
         env.close();
 
         BEAST_EXPECT(!env.le(keylet));
@@ -3848,10 +3848,10 @@ protected:
 
         createJson[sfPrincipalRequested] = actualPrincipal;
         createJson.removeMember(sfSequence.jsonName);
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
         // Fails in doApply because the payment is too small to be
         // represented as XRP.
-        env(createJson, ter(tecPRECISION_LOSS));
+        env(createJson, Ter(tecPRECISION_LOSS));
         env.close();
     }
 
@@ -3864,7 +3864,7 @@ protected:
 
         using namespace jtx;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto lowerFee = [&]() {
             // Run the local fee back down.
@@ -3876,9 +3876,9 @@ protected:
 
         Account const alice{"alice"};
         std::string const borrowerPass = "borrower";
-        Account const borrower{borrowerPass, KeyType::ed25519};
+        Account const borrower{borrowerPass, KeyType::Ed25519};
         auto const lenderPass = "lender";
-        Account const lender{lenderPass, KeyType::ed25519};
+        Account const lender{lenderPass, KeyType::Ed25519};
 
         env.fund(XRP(1'000'000), alice, lender, borrower);
         env.close();
@@ -3891,12 +3891,12 @@ protected:
 
         {
             testcase("RPC AccountSet");
-            Json::Value txJson{Json::objectValue};
+            json::Value txJson{json::ObjectValue};
             txJson[sfTransactionType] = "AccountSet";
             txJson[sfAccount] = borrower.human();
 
             auto const signParams = [&]() {
-                Json::Value signParams{Json::objectValue};
+                json::Value signParams{json::ObjectValue};
                 signParams[jss::passphrase] = borrowerPass;
                 signParams[jss::key_type] = "ed25519";
                 signParams[jss::tx_json] = txJson;
@@ -3908,7 +3908,7 @@ protected:
             auto txSignBlob = jSign[jss::result][jss::tx_blob].asString();
             txSignResult.removeMember(jss::hash);
 
-            auto const jtx = env.jt(txJson, sig(borrower));
+            auto const jtx = env.jt(txJson, Sig(borrower));
             BEAST_EXPECT(txSignResult == jtx.jv);
 
             lowerFee();
@@ -3919,18 +3919,18 @@ protected:
                 jSubmit[jss::result][jss::engine_result].asString() == "tesSUCCESS");
 
             lowerFee();
-            env(jtx.jv, sig(none), seq(none), fee(none), ter(tefPAST_SEQ));
+            env(jtx.jv, Sig(kNONE), Seq(kNONE), Fee(kNONE), Ter(tefPAST_SEQ));
         }
 
         {
             testcase("RPC LoanSet - illegal signature_target");
 
-            Json::Value txJson{Json::objectValue};
+            json::Value txJson{json::ObjectValue};
             txJson[sfTransactionType] = "AccountSet";
             txJson[sfAccount] = borrower.human();
 
             auto const borrowerSignParams = [&]() {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::passphrase] = borrowerPass;
                 params[jss::key_type] = "ed25519";
                 params[jss::signature_target] = "Destination";
@@ -3948,7 +3948,7 @@ protected:
         {
             testcase("RPC LoanSet - sign and submit borrower initiated");
             // 1. Borrower creates the transaction
-            Json::Value txJson{Json::objectValue};
+            json::Value txJson{json::ObjectValue};
             txJson[sfTransactionType] = "LoanSet";
             txJson[sfAccount] = borrower.human();
             txJson[sfCounterparty] = lender.human();
@@ -3965,7 +3965,7 @@ protected:
 
             // 2. Borrower signs the transaction
             auto const borrowerSignParams = [&]() {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::passphrase] = borrowerPass;
                 params[jss::key_type] = "ed25519";
                 params[jss::tx_json] = txJson;
@@ -3997,7 +3997,7 @@ protected:
             // 3. Borrower sends the signed transaction to the lender
             // 4. Lender signs the transaction
             auto const lenderSignParams = [&]() {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::passphrase] = lenderPass;
                 params[jss::key_type] = "ed25519";
                 params[jss::signature_target] = "CounterpartySignature";
@@ -4055,7 +4055,7 @@ protected:
         {
             testcase("RPC LoanSet - sign and submit lender initiated");
             // 1. Lender creates the transaction
-            Json::Value txJson{Json::objectValue};
+            json::Value txJson{json::ObjectValue};
             txJson[sfTransactionType] = "LoanSet";
             txJson[sfAccount] = lender.human();
             txJson[sfCounterparty] = borrower.human();
@@ -4072,7 +4072,7 @@ protected:
 
             // 2. Lender signs the transaction
             auto const lenderSignParams = [&]() {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::passphrase] = lenderPass;
                 params[jss::key_type] = "ed25519";
                 params[jss::tx_json] = txJson;
@@ -4103,7 +4103,7 @@ protected:
             // 3. Lender sends the signed transaction to the Borrower
             // 4. Borrower signs the transaction
             auto const borrowerSignParams = [&]() {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::passphrase] = borrowerPass;
                 params[jss::key_type] = "ed25519";
                 params[jss::signature_target] = "CounterpartySignature";
@@ -4168,7 +4168,7 @@ protected:
         Account const issuer("issuer");
         Account const borrower("borrower");
         Account const broker("broker");
-        auto const IOU = issuer["IOU"];
+        auto const iou = issuer["IOU"];
 
         for (bool const deepFreeze : {true, false})
         {
@@ -4179,7 +4179,7 @@ protected:
                     BEAST_EXPECT(le))
                 {
                     auto const account = le->at(accountField);
-                    if (auto const sleLine = env.le(keylet::line(account, IOU));
+                    if (auto const sleLine = env.le(keylet::line(account, iou));
                         BEAST_EXPECT(sleLine))
                     {
                         STAmount balance = sleLine->at(sfBalance);
@@ -4188,33 +4188,33 @@ protected:
                         return balance;
                     }
                 }
-                return STAmount{IOU};
+                return STAmount{iou};
             };
 
             env.fund(XRP(20'000), issuer, broker, borrower);
             env.close();
 
-            env(trust(broker, IOU(20'000'000)));
-            env(pay(issuer, broker, IOU(10'000'000)));
+            env(trust(broker, iou(20'000'000)));
+            env(pay(issuer, broker, iou(10'000'000)));
             env.close();
 
-            auto const brokerInfo = createVaultAndBroker(env, IOU, broker);
+            auto const brokerInfo = createVaultAndBroker(env, iou, broker);
 
-            BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == IOU(1'000));
+            BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == iou(1'000));
 
             auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
 
             env(set(borrower, brokerInfo.brokerID, 10'000),
-                sig(sfCounterpartySignature, broker),
-                loanServiceFee(IOU(100).value()),
-                paymentInterval(100),
-                fee(XRP(100)));
+                Sig(sfCounterpartySignature, broker),
+                kLOAN_SERVICE_FEE(iou(100).value()),
+                kPAYMENT_INTERVAL(100),
+                Fee(XRP(100)));
             env.close();
 
-            env(trust(borrower, IOU(20'000'000)));
+            env(trust(borrower, iou(20'000'000)));
             // The borrower increases their limit and acquires some IOU so
             // they can pay interest
-            env(pay(issuer, borrower, IOU(500)));
+            env(pay(issuer, borrower, iou(500)));
             env.close();
 
             if (auto const le = env.le(keylet::loan(keylet.key)); BEAST_EXPECT(le))
@@ -4225,20 +4225,20 @@ protected:
                     env.close();
                 }
 
-                env(pay(borrower, keylet.key, IOU(10'100)), fee(XRP(100)));
+                env(pay(borrower, keylet.key, iou(10'100)), Fee(XRP(100)));
                 env.close();
 
                 if (deepFreeze)
                 {
                     // The fee goes to the broker pseudo-account
-                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == IOU(1'100));
-                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfOwner) == IOU(8'999'000));
+                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == iou(1'100));
+                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfOwner) == iou(8'999'000));
                 }
                 else
                 {
                     // The fee goes to the broker account
-                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfOwner) == IOU(8'999'100));
-                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == IOU(1'000));
+                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfOwner) == iou(8'999'100));
+                    BEAST_EXPECT(getCoverBalance(brokerInfo, sfAccount) == iou(1'000));
                 }
             }
         };
@@ -4258,28 +4258,28 @@ protected:
 
         env.fund(XRP(1'000), issuer, lender);
 
-        std::int64_t constexpr issuerBalance = 10'000'000;
+        std::int64_t constexpr kISSUER_BALANCE = 10'000'000;
         MPTTester const asset(
-            {.env = env, .issuer = issuer, .holders = {lender}, .pay = issuerBalance});
+            {.env = env, .issuer = issuer, .holders = {lender}, .pay = kISSUER_BALANCE});
 
         BrokerParameters const brokerParams{
             .debtMax = 200,
         };
         auto const broker = createVaultAndBroker(env, asset, lender, brokerParams);
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         // Create Loan
-        env(set(borrower, broker.brokerID, 200), sig(sfCounterpartySignature, lender), loanSetFee);
+        env(set(borrower, broker.brokerID, 200), Sig(sfCounterpartySignature, lender), loanSetFee);
         env.close();
         // 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(-issuerBalance + 200));
+        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kISSUER_BALANCE + 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(-issuerBalance));
+        BEAST_EXPECT(env.balance(issuer, asset) == asset(-kISSUER_BALANCE));
     }
 
     void
@@ -4295,7 +4295,7 @@ protected:
             Env env(*this);
             env.fund(XRP(1'000), alice);
             env.close();
-            env(del(alice, beast::zero), ter(temINVALID));
+            env(del(alice, beast::kZERO), Ter(temINVALID));
         }
     }
 
@@ -4312,7 +4312,7 @@ protected:
             Env env(*this);
             env.fund(XRP(1'000), alice);
             env.close();
-            env(manage(alice, beast::zero, tfLoanDefault), ter(temINVALID));
+            env(manage(alice, beast::kZERO, tfLoanDefault), Ter(temINVALID));
         }
     }
 
@@ -4325,20 +4325,20 @@ protected:
         Account const lender{"lender"};
         Account const issuer{"issuer"};
         Account const borrower{"borrower"};
-        auto const IOU = issuer["IOU"];
+        auto const iou = issuer["IOU"];
 
         // preclaim
         Env env(*this);
         env.fund(XRP(1'000), lender, issuer, borrower);
-        env(trust(lender, IOU(10'000'000)));
-        env(pay(issuer, lender, IOU(5'000'000)));
+        env(trust(lender, iou(10'000'000)));
+        env(pay(issuer, lender, iou(5'000'000)));
         BrokerInfo brokerInfo{createVaultAndBroker(env, issuer["IOU"], lender)};
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         STAmount const debtMaximumRequest = brokerInfo.asset(1'000).value();
 
         env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-            sig(sfCounterpartySignature, lender),
+            Sig(sfCounterpartySignature, lender),
             loanSetFee);
 
         env.close();
@@ -4350,7 +4350,7 @@ protected:
         env.close();
 
         // preclaim: tecFROZEN
-        env(pay(borrower, loanKeylet.key, debtMaximumRequest), ter(tecFROZEN));
+        env(pay(borrower, loanKeylet.key, debtMaximumRequest), Ter(tecFROZEN));
         env.close();
 
         env(fclear(issuer, asfGlobalFreeze));
@@ -4375,7 +4375,7 @@ protected:
         env.close();
 
         // preclaim: tecFROZEN due to deep frozen
-        env(pay(borrower, loanKeylet.key, debtMaximumRequest), ter(tecFROZEN));
+        env(pay(borrower, loanKeylet.key, debtMaximumRequest), Ter(tecFROZEN));
         env.close();
 
         // Only one needs to be unfrozen
@@ -4383,7 +4383,7 @@ protected:
         env.close();
 
         // The payment is late by this point
-        env(pay(borrower, loanKeylet.key, debtMaximumRequest), ter(tecEXPIRED));
+        env(pay(borrower, loanKeylet.key, debtMaximumRequest), Ter(tecEXPIRED));
         env.close();
         env(pay(borrower, loanKeylet.key, debtMaximumRequest, tfLoanLatePayment));
         env.close();
@@ -4391,7 +4391,7 @@ protected:
         // preclaim: tecKILLED
         // note that tecKILLED in loanMakePayment()
         // doesn't happen because of the preclaim check.
-        env(pay(borrower, loanKeylet.key, debtMaximumRequest), ter(tecKILLED));
+        env(pay(borrower, loanKeylet.key, debtMaximumRequest), Ter(tecKILLED));
     }
 
     void
@@ -4403,16 +4403,16 @@ protected:
         Account const lender{"lender"};
         Account const issuer{"issuer"};
         Account const borrower{"borrower"};
-        auto const IOU = issuer["IOU"];
+        auto const iou = issuer["IOU"];
 
         auto testWrapper = [&](auto&& test) {
             Env env(*this);
             env.fund(XRP(1'000), lender, issuer, borrower);
-            env(trust(lender, IOU(10'000'000)));
-            env(pay(issuer, lender, IOU(5'000'000)));
+            env(trust(lender, iou(10'000'000)));
+            env(pay(issuer, lender, iou(5'000'000)));
             BrokerInfo const brokerInfo{createVaultAndBroker(env, issuer["IOU"], lender)};
 
-            auto const loanSetFee = fee(env.current()->fees().base * 2);
+            auto const loanSetFee = Fee(env.current()->fees().base * 2);
             Number const debtMaximumRequest = brokerInfo.asset(1'000).value();
             test(env, brokerInfo, loanSetFee, debtMaximumRequest);
         };
@@ -4420,32 +4420,32 @@ protected:
         // preflight:
         testWrapper([&](Env& env,
                         BrokerInfo const& brokerInfo,
-                        jtx::fee const& loanSetFee,
+                        jtx::Fee const& loanSetFee,
                         Number const& debtMaximumRequest) {
             // first temBAD_SIGNER: TODO
             // invalid grace period
             {
                 // zero grace period
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                    sig(sfCounterpartySignature, lender),
-                    gracePeriod(0),
+                    Sig(sfCounterpartySignature, lender),
+                    kGRACE_PERIOD(0),
                     loanSetFee,
-                    ter(temINVALID));
+                    Ter(temINVALID));
 
                 // grace period less than default minimum
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                    sig(sfCounterpartySignature, lender),
-                    gracePeriod(LoanSet::defaultGracePeriod - 1),
+                    Sig(sfCounterpartySignature, lender),
+                    kGRACE_PERIOD(LoanSet::kDEFAULT_GRACE_PERIOD - 1),
                     loanSetFee,
-                    ter(temINVALID));
+                    Ter(temINVALID));
 
                 // grace period greater than payment interval
                 env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                    sig(sfCounterpartySignature, lender),
-                    paymentInterval(120),
-                    gracePeriod(121),
+                    Sig(sfCounterpartySignature, lender),
+                    kPAYMENT_INTERVAL(120),
+                    kGRACE_PERIOD(121),
                     loanSetFee,
-                    ter(temINVALID));
+                    Ter(temINVALID));
             }
             // empty/zero broker ID
             {
@@ -4455,10 +4455,10 @@ protected:
                     // empty broker ID
                     jv[sfLoanBrokerID] = id;
                     env(jv,
-                        sig(sfCounterpartySignature, lender),
+                        Sig(sfCounterpartySignature, lender),
                         loanSetFee,
-                        txflags(flags),
-                        ter(temINVALID));
+                        Txflags(flags),
+                        Ter(temINVALID));
                 };
                 // empty broker ID
                 testZeroBrokerID(std::string(""));
@@ -4474,7 +4474,7 @@ protected:
 
             JTx const tx = env.jt(
                 set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee);
             STTx local = *(tx.stx);
             auto counterpartySig = local.getFieldObject(sfCounterpartySignature);
@@ -4482,7 +4482,7 @@ protected:
             badPubKey[20] ^= 0xAA;
             counterpartySig.setFieldVL(sfSigningPubKey, badPubKey);
             local.setFieldObject(sfCounterpartySignature, counterpartySig);
-            Json::Value jvResult;
+            json::Value jvResult;
             jvResult[jss::tx_blob] = strHex(local.getSerializer().slice());
             auto res = env.rpc("json", "submit", to_string(jvResult))["result"];
             BEAST_EXPECT(
@@ -4494,7 +4494,7 @@ protected:
         // preclaim:
         testWrapper([&](Env& env,
                         BrokerInfo const& brokerInfo,
-                        jtx::fee const& loanSetFee,
+                        jtx::Fee const& loanSetFee,
                         Number const& debtMaximumRequest) {
             // canAddHoldingFailure (IOU only, if MPT doesn't have
             // MPTCanTransfer set, then can't create Vault/LoanBroker,
@@ -4502,15 +4502,15 @@ protected:
             env(fclear(issuer, asfDefaultRipple));
             env.close();
             env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee,
-                ter(terNO_RIPPLE));
+                Ter(terNO_RIPPLE));
         });
 
         // doApply:
         testWrapper([&](Env& env,
                         BrokerInfo const& brokerInfo,
-                        jtx::fee const& loanSetFee,
+                        jtx::Fee const& loanSetFee,
                         Number const& debtMaximumRequest) {
             auto const amt = env.balance(borrower) -
                 env.current()->fees().accountReserve(env.ownerCount(borrower));
@@ -4518,9 +4518,9 @@ protected:
 
             // tecINSUFFICIENT_RESERVE
             env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee,
-                ter(tecINSUFFICIENT_RESERVE));
+                Ter(tecINSUFFICIENT_RESERVE));
 
             // addEmptyHolding failure
             env(pay(issuer, borrower, amt));
@@ -4528,9 +4528,9 @@ protected:
             env.close();
 
             env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee,
-                ter(tecFROZEN));
+                Ter(tecFROZEN));
         });
     }
 
@@ -4543,7 +4543,7 @@ protected:
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4552,7 +4552,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
         PrettyAsset const mptAsset = mptt.issuanceID();
         mptt.authorize({.account = lender});
@@ -4565,13 +4565,13 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["CloseInterestRate"] = 76671;
         createJson["ClosePaymentFee"] = "2061925410";
@@ -4589,8 +4589,8 @@ protected:
 
         auto const brokerStateBefore = env.le(keylet::loanbroker(broker.brokerID));
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
-        env(createJson, ter(temINVALID));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
+        env(createJson, Ter(temINVALID));
         env.close();
     }
 
@@ -4604,7 +4604,7 @@ protected:
         using namespace jtx;
         using namespace std::chrono_literals;
         using namespace Lending;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4613,7 +4613,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         auto trustLenderTx = env.json(trust(lender, iouAsset(1'000'000'000)));
         env(trustLenderTx);
         auto trustBorrowerTx = env.json(trust(borrower, iouAsset(1'000'000'000)));
@@ -4629,13 +4629,13 @@ protected:
         using namespace loan;
 
         auto const baseFee = env.current()->fees().base;
-        auto const loanSetFee = fee(baseFee * 2);
+        auto const loanSetFee = Fee(baseFee * 2);
         Number const principalRequest{1, 3};
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["ClosePaymentFee"] = "0";
         createJson["GracePeriod"] = 60;
@@ -4652,8 +4652,8 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
-        env(createJson, ter(tesSUCCESS));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
+        env(createJson, Ter(tesSUCCESS));
         env.close();
 
         auto const pseudoAcct = [&]() {
@@ -4671,11 +4671,11 @@ protected:
         Number const payment{3'269'349'176'470'588, -12};
         XRPAmount const payFee{
             baseFee *
-            ((payment / originalState.periodicPayment) / loanPaymentsPerFeeIncrement + 1)};
+            ((payment / originalState.periodicPayment) / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
         auto loanPayTx =
-            env.json(pay(borrower, keylet.key, STAmount{broker.asset, payment}), fee(payFee));
+            env.json(pay(borrower, keylet.key, STAmount{broker.asset, payment}), Fee(payFee));
         BEAST_EXPECT(to_string(payment) == "3269.349176470588");
-        env(loanPayTx, ter(tesSUCCESS));
+        env(loanPayTx, Ter(tesSUCCESS));
         env.close();
 
         auto const newState = getCurrentState(env, broker, keylet);
@@ -4695,7 +4695,7 @@ protected:
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4704,7 +4704,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         auto trustLenderTx = env.json(trust(lender, iouAsset(1'000'000'000)));
         env(trustLenderTx);
         auto trustBorrowerTx = env.json(trust(borrower, iouAsset(1'000'000'000)));
@@ -4719,13 +4719,13 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["CloseInterestRate"] = 47299;
         createJson["ClosePaymentFee"] = "3985819770";
@@ -4742,13 +4742,13 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
         env(createJson);
         env.close();
 
         auto loanPayTx = env.json(pay(borrower, keylet.key, STAmount{broker.asset, Number{}}));
         loanPayTx["Amount"]["value"] = "0.000281284125490196";
-        env(loanPayTx, ter(tecINSUFFICIENT_PAYMENT));
+        env(loanPayTx, Ter(tecINSUFFICIENT_PAYMENT));
         env.close();
     }
 
@@ -4761,7 +4761,7 @@ protected:
         using namespace jtx;
         using namespace std::chrono_literals;
         using namespace Lending;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4770,7 +4770,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         env(trust(lender, iouAsset(100'000'000)));
         env(trust(borrower, iouAsset(100'000'000)));
         env(pay(issuer, lender, iouAsset(10'000'000)));
@@ -4781,14 +4781,14 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
         auto const baseFee = env.current()->fees().base;
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["ClosePaymentFee"] = "0";
         createJson["GracePeriod"] = 60;
@@ -4806,27 +4806,28 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
-        env(createJson, ter(tesSUCCESS));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
+        env(createJson, Ter(tesSUCCESS));
         env.close();
 
         auto const stateBefore = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(stateBefore.paymentRemaining == 3239184);
-        BEAST_EXPECT(stateBefore.paymentRemaining > loanMaximumPaymentsPerTransaction);
+        BEAST_EXPECT(stateBefore.paymentRemaining > kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
 
         auto loanPayTx = env.json(pay(borrower, keylet.key, STAmount{broker.asset, Number{}}));
         Number const amount{395937, -2};
         loanPayTx["Amount"]["value"] = to_string(amount);
         XRPAmount const payFee{
             baseFee *
-            std::int64_t(amount / stateBefore.periodicPayment / loanPaymentsPerFeeIncrement + 1)};
-        env(loanPayTx, ter(tesSUCCESS), fee(payFee));
+            std::int64_t(
+                amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
+        env(loanPayTx, Ter(tesSUCCESS), Fee(payFee));
         env.close();
 
         auto const stateAfter = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(
             stateAfter.paymentRemaining ==
-            stateBefore.paymentRemaining - loanMaximumPaymentsPerTransaction);
+            stateBefore.paymentRemaining - kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
     }
 
     void
@@ -4839,7 +4840,7 @@ protected:
         using namespace jtx;
         using namespace std::chrono_literals;
         using namespace Lending;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4848,7 +4849,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         auto trustLenderTx = env.json(trust(lender, iouAsset(1'000'000'000)));
         env(trustLenderTx);
         auto trustBorrowerTx = env.json(trust(borrower, iouAsset(1'000'000'000)));
@@ -4863,13 +4864,13 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["ClosePaymentFee"] = "0";
         createJson["InterestRate"] = 24346;
@@ -4885,8 +4886,8 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
-        env(createJson, ter(tesSUCCESS));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
+        env(createJson, Ter(tesSUCCESS));
         env.close();
 
         auto const baseFee = env.current()->fees().base;
@@ -4898,9 +4899,10 @@ protected:
             Number const amount{3074'745'058'823'529, -12};
             BEAST_EXPECT(to_string(amount) == "3074.745058823529");
             XRPAmount const payFee{
-                baseFee * (amount / stateBefore.periodicPayment / loanPaymentsPerFeeIncrement + 1)};
+                baseFee *
+                (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
             loanPayTx["Amount"]["value"] = to_string(amount);
-            env(loanPayTx, fee(payFee), ter(tesSUCCESS));
+            env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
             env.close();
         }
 
@@ -4909,9 +4911,10 @@ protected:
             Number const amount{6732'118'170'944'051, -12};
             BEAST_EXPECT(to_string(amount) == "6732.118170944051");
             XRPAmount const payFee{
-                baseFee * (amount / stateBefore.periodicPayment / loanPaymentsPerFeeIncrement + 1)};
+                baseFee *
+                (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
             loanPayTx["Amount"]["value"] = to_string(amount);
-            env(loanPayTx, fee(payFee), ter(tesSUCCESS));
+            env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
             env.close();
         }
 
@@ -4938,7 +4941,7 @@ protected:
         using namespace jtx;
         using namespace std::chrono_literals;
         using namespace Lending;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -4947,7 +4950,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         auto trustLenderTx = env.json(trust(lender, iouAsset(1'000'000'000)));
         env(trustLenderTx);
         auto trustBorrowerTx = env.json(trust(borrower, iouAsset(1'000'000'000)));
@@ -4967,13 +4970,13 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest{1, 3};
 
         auto createJson = env.json(
             set(borrower, broker.brokerID, principalRequest),
-            fee(loanSetFee),
-            json(sfCounterpartySignature, Json::objectValue));
+            Fee(loanSetFee),
+            Json(sfCounterpartySignature, json::ObjectValue));
 
         createJson["ClosePaymentFee"] = "0";
         createJson["InterestRate"] = 12833;
@@ -4989,29 +4992,30 @@ protected:
         auto const loanSequence = brokerStateBefore->at(sfLoanSequence);
         auto const keylet = keylet::loan(broker.brokerID, loanSequence);
 
-        createJson = env.json(createJson, sig(sfCounterpartySignature, lender));
-        env(createJson, ter(tesSUCCESS));
+        createJson = env.json(createJson, Sig(sfCounterpartySignature, lender));
+        env(createJson, Ter(tesSUCCESS));
         env.close();
 
         auto const baseFee = env.current()->fees().base;
 
         auto const stateBefore = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(stateBefore.paymentRemaining == 5678);
-        BEAST_EXPECT(stateBefore.paymentRemaining > loanMaximumPaymentsPerTransaction);
+        BEAST_EXPECT(stateBefore.paymentRemaining > kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
 
         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 / loanPaymentsPerFeeIncrement + 1)};
+            baseFee *
+            (amount / stateBefore.periodicPayment / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
         loanPayTx["Amount"]["value"] = to_string(amount);
-        env(loanPayTx, fee(payFee), ter(tesSUCCESS));
+        env(loanPayTx, Fee(payFee), Ter(tesSUCCESS));
         env.close();
 
         auto const stateAfter = getCurrentState(env, broker, keylet);
         BEAST_EXPECT(
             stateAfter.paymentRemaining ==
-            stateBefore.paymentRemaining - loanMaximumPaymentsPerTransaction);
+            stateBefore.paymentRemaining - kLOAN_MAXIMUM_PAYMENTS_PER_TRANSACTION);
     }
 
     void
@@ -5023,7 +5027,7 @@ protected:
         using namespace jtx;
         using namespace std::chrono_literals;
         using namespace Lending;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -5032,7 +5036,7 @@ protected:
         env.fund(XRP(1'000'000), issuer, lender, borrower);
         env.close();
 
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         auto trustLenderTx = env.json(trust(lender, iouAsset(1'000'000'000)));
         env(trustLenderTx);
         auto trustBorrowerTx = env.json(trust(borrower, iouAsset(1'000'000'000)));
@@ -5048,24 +5052,24 @@ protected:
 
         using namespace loan;
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
 
         using timeType = decltype(sfNextPaymentDueDate)::type::value_type;
         static_assert(std::is_same_v<timeType, std::uint32_t>);
-        timeType constexpr maxTime = std::numeric_limits<timeType>::max();
-        static_assert(maxTime == 4'294'967'295);
+        timeType constexpr kMAX_TIME = std::numeric_limits<timeType>::max();
+        static_assert(kMAX_TIME == 4'294'967'295);
 
         auto const baseJson = [&]() {
             auto createJson = env.json(
                 set(borrower, broker.brokerID, Number{55524'81, -2}),
-                fee(loanSetFee),
-                closePaymentFee(0),
-                gracePeriod(LoanSet::defaultGracePeriod),
-                interestRate(TenthBips32(12833)),
-                lateInterestRate(TenthBips32(77048)),
-                latePaymentFee(0),
-                loanOriginationFee(218),
-                json(sfCounterpartySignature, Json::objectValue));
+                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),
+                Json(sfCounterpartySignature, json::ObjectValue));
 
             createJson.removeMember(sfSequence.getJsonName());
 
@@ -5082,16 +5086,17 @@ protected:
 
             BEAST_EXPECT(startDate >= 50);
 
-            return maxTime - startDate;
+            return kMAX_TIME - startDate;
         };
 
         {
             // straight-up overflow: interval
             auto const interval = maxLoanTime() + 1;
             auto const total = 1;
-            auto createJson = env.json(baseJson, paymentInterval(interval), paymentTotal(total));
+            auto createJson =
+                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
@@ -5099,9 +5104,10 @@ protected:
             // min interval is 60
             auto const interval = 60;
             auto const total = maxLoanTime() + 1;
-            auto createJson = env.json(baseJson, paymentInterval(interval), paymentTotal(total));
+            auto createJson =
+                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
@@ -5111,19 +5117,20 @@ protected:
             auto const total = 1;
             auto const grace = interval;
             auto createJson = env.json(
-                baseJson, paymentInterval(interval), paymentTotal(total), gracePeriod(grace));
+                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
 
             // The grace period can't be larger than the interval.
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
             // Overflow with multiplication of a few large intervals
             auto const interval = 1'000'000'000;
             auto const total = 10;
-            auto createJson = env.json(baseJson, paymentInterval(interval), paymentTotal(total));
+            auto createJson =
+                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
@@ -5131,9 +5138,10 @@ protected:
             // min interval is 60
             auto const interval = 60;
             auto const total = 1'000'000'000;
-            auto createJson = env.json(baseJson, paymentInterval(interval), paymentTotal(total));
+            auto createJson =
+                env.json(baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
@@ -5143,9 +5151,9 @@ protected:
             auto const interval = (maxLoanTime() - total) / total;
             auto const grace = interval;
             auto createJson = env.json(
-                baseJson, paymentInterval(interval), paymentTotal(total), gracePeriod(grace));
+                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tecKILLED));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tecKILLED));
             env.close();
         }
         {
@@ -5158,9 +5166,9 @@ protected:
             auto const interval = maxLoanTime() - grace;
             auto const total = 1;
             auto createJson = env.json(
-                baseJson, paymentInterval(interval), paymentTotal(total), gracePeriod(grace));
+                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tesSUCCESS));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
 
             // The transaction is killed in the closed ledger
@@ -5183,12 +5191,12 @@ protected:
 
             auto const closeStartDate = (parentCloseTime() / 10 + 1) * 10;
             auto const grace = 5'000;
-            auto const interval = maxTime - closeStartDate - grace;
+            auto const interval = kMAX_TIME - closeStartDate - grace;
             auto const total = 1;
             auto createJson = env.json(
-                baseJson, paymentInterval(interval), paymentTotal(total), gracePeriod(grace));
+                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tesSUCCESS));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
 
             // The transaction succeeds in the closed ledger
@@ -5200,7 +5208,7 @@ protected:
 
             // This loan exists
             auto const afterState = getCurrentState(env, broker, keylet);
-            BEAST_EXPECT(afterState.nextPaymentDate == maxTime - grace);
+            BEAST_EXPECT(afterState.nextPaymentDate == kMAX_TIME - grace);
             BEAST_EXPECT(afterState.previousPaymentDate == 0);
             BEAST_EXPECT(afterState.paymentRemaining == 1);
         }
@@ -5212,7 +5220,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 = maxTime - closeStartDate - grace;
+            auto const maxLoanTime = kMAX_TIME - closeStartDate - grace;
             auto const total = [&]() {
                 if (maxLoanTime % 5 == 0)
                     return 5;
@@ -5232,9 +5240,9 @@ protected:
 
             auto const interval = maxLoanTime / total;
             auto createJson = env.json(
-                baseJson, paymentInterval(interval), paymentTotal(total), gracePeriod(grace));
+                baseJson, kPAYMENT_INTERVAL(interval), kPAYMENT_TOTAL(total), kGRACE_PERIOD(grace));
 
-            env(createJson, sig(sfCounterpartySignature, lender), ter(tesSUCCESS));
+            env(createJson, Sig(sfCounterpartySignature, lender), Ter(tesSUCCESS));
             env.close();
 
             // This loan exists
@@ -5246,21 +5254,22 @@ protected:
 
             // pay all but the last payment
             {
-                NumberRoundModeGuard const mg{Number::rounding_mode::upward};
+                NumberRoundModeGuard const mg{Number::RoundingMode::Upward};
                 Number const payment = beforeState.periodicPayment * (total - 1);
-                XRPAmount const payFee{baseFee * ((total - 1) / loanPaymentsPerFeeIncrement + 1)};
+                XRPAmount const payFee{
+                    baseFee * ((total - 1) / kLOAN_PAYMENTS_PER_FEE_INCREMENT + 1)};
                 STAmount const paymentAmount =
                     roundToScale(STAmount{broker.asset, payment}, beforeState.loanScale);
-                auto loanPayTx = env.json(pay(borrower, keylet.key, paymentAmount), fee(payFee));
-                env(loanPayTx, ter(tesSUCCESS));
+                auto loanPayTx = env.json(pay(borrower, keylet.key, paymentAmount), Fee(payFee));
+                env(loanPayTx, Ter(tesSUCCESS));
                 env.close();
             }
 
             // The loan is on the last payment
             auto const afterState = getCurrentState(env, broker, keylet);
             BEAST_EXPECT(afterState.paymentRemaining == 1);
-            BEAST_EXPECT(afterState.nextPaymentDate == maxTime - grace);
-            BEAST_EXPECT(afterState.previousPaymentDate == maxTime - grace - interval);
+            BEAST_EXPECT(afterState.nextPaymentDate == kMAX_TIME - grace);
+            BEAST_EXPECT(afterState.previousPaymentDate == kMAX_TIME - grace - interval);
         }
     }
 
@@ -5282,14 +5291,14 @@ protected:
             .env = env,
             .issuer = issuer,
             .holders = {lender, borrower},
-            .flags = MPTDEXFlags | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
+            .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth | tfMPTCanClawback | tfMPTCanLock,
             .authHolder = true,
         });
 
         env(pay(issuer, lender, asset(5'000'000)));
         BrokerInfo brokerInfo{createVaultAndBroker(env, asset, lender)};
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         STAmount const debtMaximumRequest = brokerInfo.asset(1'000).value();
 
         auto forUnauthAuth = [&](auto&& doTx) {
@@ -5304,19 +5313,19 @@ protected:
 
         // Can't create a loan if the borrower is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(set(borrower, brokerInfo.brokerID, debtMaximumRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee,
                 err);
         });
 
-        std::uint32_t constexpr loanSequence = 1;
-        auto const loanKeylet = keylet::loan(brokerInfo.brokerID, loanSequence);
+        std::uint32_t constexpr kLOAN_SEQUENCE = 1;
+        auto const loanKeylet = keylet::loan(brokerInfo.brokerID, kLOAN_SEQUENCE);
 
         // Can't loan pay if the borrower is not authorized
         forUnauthAuth([&](bool authorized) {
-            auto const err = !authorized ? ter(tecNO_AUTH) : ter(tesSUCCESS);
+            auto const err = !authorized ? Ter(tecNO_AUTH) : Ter(tesSUCCESS);
             env(pay(borrower, loanKeylet.key, debtMaximumRequest), err);
         });
     }
@@ -5336,7 +5345,7 @@ protected:
         env.fund(XRP(100'000), issuer, alice);
         env.close();
 
-        MPTTester mpt{env, issuer, mptInitNoFund};
+        MPTTester mpt{env, issuer, kMPT_INIT_NO_FUND};
 
         mpt.create({.flags = tfMPTCanTransfer, .mutableFlags = tmfMPTCanMutateCanTransfer});
 
@@ -5371,18 +5380,18 @@ protected:
 
         // Standard Payment path should forbid third-party transfers.
         auto const err = feature[featureMPTokensV2] ? tecNO_PERMISSION : tecNO_AUTH;
-        env(pay(alice, pseudoAccount, asset(1)), ter(err));
+        env(pay(alice, pseudoAccount, asset(1)), Ter(err));
         env.close();
 
         // Cover cannot be transferred to broker account
         auto const depositAmount = asset(1);
-        env(coverDeposit(alice, brokerKeylet.key, depositAmount), ter{tecNO_AUTH});
+        env(coverDeposit(alice, brokerKeylet.key, depositAmount), Ter{tecNO_AUTH});
         env.close();
 
         if (auto const refreshed = env.le(brokerKeylet); BEAST_EXPECT(refreshed))
         {
             BEAST_EXPECT(refreshed->at(sfCoverAvailable) == 0);
-            env.require(balance(pseudoAccount, asset(0)));
+            env.require(Balance(pseudoAccount, asset(0)));
         }
 
         // Set CanTransfer again and transfer some deposit
@@ -5395,7 +5404,7 @@ protected:
         if (auto const refreshed = env.le(brokerKeylet); BEAST_EXPECT(refreshed))
         {
             BEAST_EXPECT(refreshed->at(sfCoverAvailable) == 1);
-            env.require(balance(pseudoAccount, depositAmount));
+            env.require(Balance(pseudoAccount, depositAmount));
         }
 
         // Remove CanTransfer after the deposit
@@ -5403,7 +5412,7 @@ protected:
         env.close();
 
         // Cover cannot be transferred from broker account
-        env(coverWithdraw(alice, brokerKeylet.key, depositAmount), ter{tecNO_AUTH});
+        env(coverWithdraw(alice, brokerKeylet.key, depositAmount), Ter{tecNO_AUTH});
         env.close();
 
         // Set CanTransfer again and withdraw
@@ -5416,7 +5425,7 @@ protected:
         if (auto const refreshed = env.le(brokerKeylet); BEAST_EXPECT(refreshed))
         {
             BEAST_EXPECT(refreshed->at(sfCoverAvailable) == 0);
-            env.require(balance(pseudoAccount, asset(0)));
+            env.require(Balance(pseudoAccount, asset(0)));
         }
     }
 
@@ -5447,7 +5456,7 @@ protected:
 
         BrokerInfo broker{createVaultAndBroker(env, asset, lender)};
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
 
         auto const brokerPreLoan = env.le(keylet::loanbroker(broker.brokerID));
         if (BEAST_EXPECT(brokerPreLoan); !brokerPreLoan.has_value())
@@ -5462,17 +5471,17 @@ protected:
         Number const closeFee = asset(4).value();
 
         env(set(borrower, broker.brokerID, principal),
-            sig(sfCounterpartySignature, lender),
-            loanServiceFee(serviceFee),
-            latePaymentFee(lateFee),
-            closePaymentFee(closeFee),
-            interestRate(percentageToTenthBips(12)),
-            lateInterestRate(percentageToTenthBips(24) / 10),
-            closeInterestRate(percentageToTenthBips(5)),
-            paymentTotal(12),
-            paymentInterval(600),
-            gracePeriod(0),
-            fee(loanSetFee));
+            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),
+            Fee(loanSetFee));
         env.close();
 
         auto state1 = getCurrentState(env, broker, loanKeylet);
@@ -5604,14 +5613,14 @@ protected:
             BrokerParameters brokerParams{.debtMax = 0, .coverRateMin = TenthBips32{10'000}};
             BrokerInfo broker{createVaultAndBroker(env, asset, lender, brokerParams)};
 
-            auto const loanSetFee = fee(env.current()->fees().base * 2);
+            auto const loanSetFee = Fee(env.current()->fees().base * 2);
             auto createTx = env.jt(
                 set(borrower, broker.brokerID, principalRequest),
-                sig(sfCounterpartySignature, lender),
+                Sig(sfCounterpartySignature, lender),
                 loanSetFee,
-                paymentInterval(600),
-                paymentTotal(1),
-                gracePeriod(60));
+                kPAYMENT_INTERVAL(600),
+                kPAYMENT_TOTAL(1),
+                kGRACE_PERIOD(60));
             env(createTx);
             env.close();
 
@@ -5657,7 +5666,7 @@ protected:
 #endif
 
     void
-    testPoC_UnsignedUnderflowOnFullPayAfterEarlyPeriodic()
+    testPoCUnsignedUnderflowOnFullPayAfterEarlyPeriodic()
     {
         // --- PoC Summary ----------------------------------------------------
         // Scenario: Borrower makes one periodic payment early (before next due)
@@ -5679,7 +5688,7 @@ protected:
         using namespace loan;
         using namespace std::chrono_literals;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const lender{"poc_lender4"};
         Account const borrower{"poc_borrower4"};
@@ -5692,7 +5701,7 @@ protected:
 
         // Create a 3-payment loan so full-payment path is enabled after 1
         // periodic payment.
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
         Number const principalRequest = asset(1000).value();
         auto const originationFee = asset(0).value();
         auto const serviceFee = asset(1).value();
@@ -5709,20 +5718,20 @@ protected:
 
         auto createJtx = env.jt(
             set(borrower, broker.brokerID, principalRequest, 0),
-            sig(sfCounterpartySignature, lender),
-            loanOriginationFee(originationFee),
-            loanServiceFee(serviceFee),
-            latePaymentFee(lateFee),
-            closePaymentFee(closeFee),
-            overpaymentFee(percentageToTenthBips(5) / 10),
-            interestRate(interest),
-            lateInterestRate(lateInterest),
-            closeInterestRate(closeInterest),
-            overpaymentInterestRate(overpaymentInterest),
-            paymentTotal(total),
-            paymentInterval(interval),
-            gracePeriod(grace),
-            fee(loanSetFee));
+            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),
+            Fee(loanSetFee));
 
         auto const brokerSle = env.le(keylet::loanbroker(broker.brokerID));
         BEAST_EXPECT(brokerSle);
@@ -5840,7 +5849,7 @@ protected:
             << " roundedFullMgmtFeeClamped=" << roundedFullMgmtFeeClamped
             << " fullDueClamped=" << to_string(fullDueClamped.getJson()) << std::endl;
 
-        env(pay(borrower, loanKeylet.key, fullDue), txflags(tfLoanFullPayment));
+        env(pay(borrower, loanKeylet.key, fullDue), Txflags(tfLoanFullPayment));
         env.close();
 
         // Sanity: underflow present (unsigned delta very large relative to
@@ -5881,7 +5890,7 @@ protected:
 
         using namespace jtx;
         using namespace std::chrono_literals;
-        Env env(*this, all);
+        Env env(*this, all_);
 
         // Setup: Create accounts
         Account const issuer{"issuer"};
@@ -6042,7 +6051,7 @@ protected:
 
         auto const assetType = AssetType::XRP;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, borrower);
@@ -6113,7 +6122,7 @@ protected:
 
         auto const assetType = AssetType::MPT;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, borrower);
@@ -6151,7 +6160,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::zero);
+                BEAST_EXPECT(brokerSle->at(sfDebtTotal) == beast::kZERO);
             }
         }
     }
@@ -6166,7 +6175,7 @@ protected:
         Account const issuer{"issuer"};
         Account const borrower{"borrower"};
         Account const depositor{"depositor"};
-        auto const txfee = fee(XRP(100));
+        auto const txFee = Fee(XRP(100));
 
         Env env(*this);
         Vault const vault(env);
@@ -6175,16 +6184,16 @@ protected:
         env.close();
 
         auto [tx, vaultKeyLet] = vault.create({.owner = lender, .asset = xrpIssue()});
-        env(tx, txfee);
+        env(tx, txFee);
         env.close();
 
         env(vault.deposit({.depositor = depositor, .id = vaultKeyLet.key, .amount = XRP(1'000)}),
-            txfee);
+            txFee);
         env.close();
 
         auto const brokerKeyLet = keylet::loanbroker(lender.id(), env.seq(lender));
 
-        env(loanBroker::set(lender, vaultKeyLet.key), txfee);
+        env(loanBroker::set(lender, vaultKeyLet.key), txFee);
         env.close();
 
         // BrokerInfo brokerInfo{xrpIssue(), keylet, vaultKeyLet, {}};
@@ -6192,12 +6201,12 @@ protected:
         STAmount const debtMaximumRequest = XRPAmount(200'000);
 
         env(set(borrower, brokerKeyLet.key, debtMaximumRequest),
-            sig(sfCounterpartySignature, lender),
-            interestRate(TenthBips32(50'000)),
-            paymentTotal(2),
-            paymentInterval(150),
-            txflags(tfLoanOverpayment),
-            txfee);
+            Sig(sfCounterpartySignature, lender),
+            kINTEREST_RATE(TenthBips32(50'000)),
+            kPAYMENT_TOTAL(2),
+            kPAYMENT_INTERVAL(150),
+            Txflags(tfLoanOverpayment),
+            txFee);
         env.close();
 
         std::uint32_t const loanSequence = 1;
@@ -6206,8 +6215,8 @@ protected:
         if (auto loan = env.le(loanKeylet); env.test.BEAST_EXPECT(loan))
         {
             env(loan::pay(borrower, loanKeylet.key, XRPAmount(150'001)),
-                txflags(tfLoanOverpayment),
-                txfee);
+                Txflags(tfLoanOverpayment),
+                txFee);
             env.close();
         }
     }
@@ -6220,7 +6229,7 @@ protected:
         using namespace jtx;
         using namespace loanBroker;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const lender{"lender"};
         Account const borrower{"borrower"};
@@ -6249,9 +6258,9 @@ 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::interestRate(TenthBips32(0)),
-            sig(sfCounterpartySignature, lender),
-            fee(env.current()->fees().base * 2));
+            loan::kINTEREST_RATE(TenthBips32(0)),
+            Sig(sfCounterpartySignature, lender),
+            Fee(env.current()->fees().base * 2));
         BEAST_EXPECT(env.ter() == tesSUCCESS);
         env.close();
 
@@ -6266,7 +6275,7 @@ protected:
         // Attempt to withdraw 2 XRP to self, leaving 80 XRP CoverAvailable.
         // The minimum is 80.4 XRP, which rounds up to 81 XRP, so this fails.
         env(coverWithdraw(lender, brokerInfo.brokerID, xrpAsset(2).value()),
-            ter(tecINSUFFICIENT_FUNDS));
+            Ter(tecINSUFFICIENT_FUNDS));
         BEAST_EXPECT(env.ter() == tecINSUFFICIENT_FUNDS);
         env.close();
 
@@ -6319,7 +6328,7 @@ protected:
 
         auto const assetType = AssetType::IOU;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, borrower);
@@ -6353,7 +6362,7 @@ protected:
         using namespace loan;
         Account const broker{"broker"};
         Account const issuer{"issuer"};
-        Account const borrower_{"borrower"};
+        Account const borrower{"borrower"};
         Account const depositor{"depositor"};
 
         auto testLoanAsset = [&](auto&& getMaxDebt, auto const& borrower) {
@@ -6371,7 +6380,7 @@ protected:
             env.close();
 
             auto const xrpFee = XRP(100);
-            auto const txFee = fee(xrpFee);
+            auto const txFee = Fee(xrpFee);
 
             STAmount const debtMaximumRequest = getMaxDebt(env);
 
@@ -6395,10 +6404,10 @@ protected:
             auto const serviceFee = 101;
 
             env(set(broker, brokerKeylet.key, debtMaximumRequest),
-                counterparty(borrower),
-                sig(sfCounterpartySignature, borrower),
-                loanServiceFee(serviceFee),
-                paymentTotal(10),
+                kCOUNTERPARTY(borrower),
+                Sig(sfCounterpartySignature, borrower),
+                kLOAN_SERVICE_FEE(serviceFee),
+                kPAYMENT_TOTAL(10),
                 txFee);
             env.close();
 
@@ -6423,7 +6432,7 @@ protected:
                         // Since a borrower is the broker, the payment is
                         // transferred to the Vault from the broker but not
                         // the service fee.
-                        // If the asset is XRP then the broker pays the txfee.
+                        // If the asset is XRP then the broker pays the txFee.
                         if (asset.native())
                             return brokerBalanceBefore.number() - payment - xrpFee.number();
                         return brokerBalanceBefore.number() - payment;
@@ -6434,19 +6443,19 @@ protected:
         };
         // Test when a borrower is the broker and is not to verify correct
         // service fee transfer in both cases.
-        for (auto const& borrowerAcct : {broker, borrower_})
+        for (auto const& borrowerAcct : {broker, borrower})
         {
             testLoanAsset(
                 [&](Env&) -> STAmount { return STAmount{XRPAmount{200'000}}; }, borrowerAcct);
             testLoanAsset(
                 [&](Env& env) -> STAmount {
-                    auto const IOU = issuer["USD"];
-                    env(trust(broker, IOU(1'000'000'000)));
-                    env(trust(depositor, IOU(1'000'000'000)));
-                    env(pay(issuer, broker, IOU(100'000'000)));
-                    env(pay(issuer, depositor, IOU(100'000'000)));
+                    auto const iou = issuer["USD"];
+                    env(trust(broker, iou(1'000'000'000)));
+                    env(trust(depositor, iou(1'000'000'000)));
+                    env(pay(issuer, broker, iou(100'000'000)));
+                    env(pay(issuer, depositor, iou(100'000'000)));
                     env.close();
-                    return IOU(200'000);
+                    return iou(200'000);
                 },
                 borrowerAcct);
             testLoanAsset(
@@ -6483,7 +6492,7 @@ protected:
 
         auto const assetType = AssetType::IOU;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, issuer);
@@ -6539,7 +6548,7 @@ protected:
 
         auto const assetType = AssetType::XRP;
 
-        Env env(*this, makeConfig(), all, nullptr, beast::severities::Severity::kWarning);
+        Env env(*this, makeConfig(), all_, nullptr, beast::severities::Severity::KWarning);
 
         auto loanResult =
             createLoan(env, assetType, brokerParams, loanParams, issuer, lender, borrower);
@@ -6587,7 +6596,7 @@ protected:
         using namespace jtx;
         using namespace loan;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const lender{"lender"}, borrower{"borrower"};
 
@@ -6605,23 +6614,23 @@ protected:
                 .managementFeeRate = TenthBips16(10'000),
             });
 
-        auto const loanSetFee = fee(env.current()->fees().base * 2);
+        auto const loanSetFee = Fee(env.current()->fees().base * 2);
 
         auto const loanKeylet = keylet::loan(
             result.brokerKeylet().key, (env.le(result.brokerKeylet()))->at(sfLoanSequence));
         env(loan::set(
                 borrower, result.brokerKeylet().key, asset(10'000).value(), tfLoanOverpayment),
-            sig(sfCounterpartySignature, lender),
-            loan::paymentInterval(86400 * 30),
-            loan::paymentTotal(3),
-            loan::overpaymentInterestRate(TenthBips32(percentageToTenthBips(20))),
+            Sig(sfCounterpartySignature, lender),
+            loan::kPAYMENT_INTERVAL(86400 * 30),
+            loan::kPAYMENT_TOTAL(3),
+            loan::kOVERPAYMENT_INTEREST_RATE(TenthBips32(percentageToTenthBips(20))),
             loanSetFee);
 
         // From calculator
         auto const expectedOverpaymentManagementFee = Number{33333, 0};
         auto const loanBrokerBalanceBefore = env.balance(lender);
 
-        auto const loanPayFee = fee(env.current()->fees().base * 2);
+        auto const loanPayFee = Fee(env.current()->fees().base * 2);
         env(pay(borrower, loanKeylet.key, asset(5'000).value(), tfLoanOverpayment), loanPayFee);
         env.close();
 
@@ -6641,25 +6650,25 @@ protected:
         Account const issuer("issuer");
         Account const borrower("borrower");
         Account const broker("broker");
-        auto const IOU = issuer["IOU"];
-        Env env(*this, all);
+        auto const iou = issuer["IOU"];
+        Env env(*this, all_);
         env.fund(XRP(20'000), issuer, broker, borrower);
         env.close();
         // Set up trustlines and fund accounts
-        env(trust(broker, IOU(20'000'000)));
-        env(trust(borrower, IOU(20'000'000)));
-        env(pay(issuer, broker, IOU(10'000'000)));
-        env(pay(issuer, borrower, IOU(1'000)));
+        env(trust(broker, iou(20'000'000)));
+        env(trust(borrower, iou(20'000'000)));
+        env(pay(issuer, broker, iou(10'000'000)));
+        env(pay(issuer, borrower, iou(1'000)));
         env.close();
         // Create vault and broker
-        auto const brokerInfo = createVaultAndBroker(env, IOU, broker);
+        auto const brokerInfo = createVaultAndBroker(env, iou, broker);
         // Create a loan first (this creates debt)
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
-            sig(sfCounterpartySignature, broker),
-            loanServiceFee(IOU(100).value()),
-            paymentInterval(100),
-            fee(XRP(100)));
+            Sig(sfCounterpartySignature, broker),
+            kLOAN_SERVICE_FEE(iou(100).value()),
+            kPAYMENT_INTERVAL(100),
+            Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
         // We need coverAvailable >= (debtTotal * coverRateMinimum)
@@ -6667,25 +6676,25 @@ protected:
         // The default coverRateMinimum is 10%, so for a 10,000 loan we need
         // at least 1,000 cover. Default cover is 1,000, so we add more to be
         // safe.
-        auto const additionalCover = IOU(50'000).value();
-        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{IOU, additionalCover}));
+        auto const additionalCover = iou(50'000).value();
+        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{iou, additionalCover}));
         env.close();
         // Verify broker owner has a trustline
-        auto const brokerTrustline = keylet::line(broker, IOU);
+        auto const brokerTrustline = keylet::line(broker, iou);
         BEAST_EXPECT(env.le(brokerTrustline) != nullptr);
         // Broker owner deletes their trustline
         // First, pay any positive balance to issuer to zero it out
-        auto const brokerBalance = env.balance(broker, IOU);
+        auto const brokerBalance = env.balance(broker, iou);
         env(pay(broker, issuer, brokerBalance));
         env.close();
         // Remove the trustline by setting limit to 0
-        env(trust(broker, IOU(0)));
+        env(trust(broker, iou(0)));
         env.close();
         // Verify trustline is deleted
         BEAST_EXPECT(env.le(brokerTrustline) == nullptr);
         // Now borrower tries to make a payment
         // We should get a tesSUCCESS instead of a tecNO_LINE.
-        env(pay(borrower, keylet.key, IOU(10'100)), fee(XRP(100)), ter(tesSUCCESS));
+        env(pay(borrower, keylet.key, iou(10'100)), Fee(XRP(100)), Ter(tesSUCCESS));
         env.close();
         // Verify trustline is still deleted
         BEAST_EXPECT(env.le(brokerTrustline) == nullptr);
@@ -6694,9 +6703,9 @@ protected:
             BEAST_EXPECT(brokerSle))
         {
             Account const pseudo("pseudo-account", brokerSle->at(sfAccount));
-            auto const balance = env.balance(pseudo, IOU);
+            auto const balance = env.balance(pseudo, iou);
             // 1,000 default + 50,000 extra + 100 service fee from LoanPay
-            BEAST_EXPECTS(balance == IOU(51'100), to_string(Json::Value(balance)));
+            BEAST_EXPECTS(balance == iou(51'100), to_string(json::Value(balance)));
         }
     }
 
@@ -6711,14 +6720,14 @@ protected:
         Account const borrower("borrower");
         Account const broker("broker");
 
-        Env env(*this, all);
+        Env env(*this, all_);
         env.fund(XRP(20'000), issuer, broker, borrower);
         env.close();
 
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
 
-        PrettyAsset const MPT{mptt.issuanceID()};
+        PrettyAsset const mpt{mptt.issuanceID()};
 
         // Authorize broker and borrower
         mptt.authorize({.account = broker});
@@ -6727,19 +6736,19 @@ protected:
         env.close();
 
         // Fund accounts
-        env(pay(issuer, broker, MPT(10'000'000)));
-        env(pay(issuer, borrower, MPT(1'000)));
+        env(pay(issuer, broker, mpt(10'000'000)));
+        env(pay(issuer, borrower, mpt(1'000)));
         env.close();
 
         // Create vault and broker
-        auto const brokerInfo = createVaultAndBroker(env, MPT, broker);
+        auto const brokerInfo = createVaultAndBroker(env, mpt, broker);
         // Create a loan first (this creates debt)
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
-            sig(sfCounterpartySignature, broker),
-            loanServiceFee(MPT(100).value()),
-            paymentInterval(100),
-            fee(XRP(100)));
+            Sig(sfCounterpartySignature, broker),
+            kLOAN_SERVICE_FEE(mpt(100).value()),
+            kPAYMENT_INTERVAL(100),
+            Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
         // We need coverAvailable >= (debtTotal * coverRateMinimum)
@@ -6747,15 +6756,15 @@ protected:
         // The default coverRateMinimum is 10%, so for a 10,000 loan we need
         // at least 1,000 cover. Default cover is 1,000, so we add more to be
         // safe.
-        auto const additionalCover = MPT(50'000).value();
-        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{MPT, additionalCover}));
+        auto const additionalCover = mpt(50'000).value();
+        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{mpt, additionalCover}));
         env.close();
         // Verify broker owner is authorized
         auto const brokerMpt = keylet::mptoken(mptt.issuanceID(), broker);
         BEAST_EXPECT(env.le(brokerMpt) != nullptr);
         // Broker owner unauthorizes.
         // First, pay any positive balance to issuer to zero it out
-        auto const brokerBalance = env.balance(broker, MPT);
+        auto const brokerBalance = env.balance(broker, mpt);
         env(pay(broker, issuer, brokerBalance));
         env.close();
         // Then, unauthorize the MPT.
@@ -6765,8 +6774,8 @@ protected:
         BEAST_EXPECT(env.le(brokerMpt) == nullptr);
         // Now borrower tries to make a payment
         // We should get a tesSUCCESS instead of a tecNO_AUTH.
-        auto const borrowerBalance = env.balance(borrower, MPT);
-        env(pay(borrower, keylet.key, MPT(10'100)), fee(XRP(100)), ter(tesSUCCESS));
+        auto const borrowerBalance = env.balance(borrower, mpt);
+        env(pay(borrower, keylet.key, mpt(10'100)), Fee(XRP(100)), Ter(tesSUCCESS));
         env.close();
         // Verify the MPT is still unauthorized.
         BEAST_EXPECT(env.le(brokerMpt) == nullptr);
@@ -6775,9 +6784,9 @@ protected:
             BEAST_EXPECT(brokerSle))
         {
             Account const pseudo("pseudo-account", brokerSle->at(sfAccount));
-            auto const balance = env.balance(pseudo, MPT);
+            auto const balance = env.balance(pseudo, mpt);
             // 1,000 default + 50,000 extra + 100 service fee from LoanPay
-            BEAST_EXPECTS(balance == MPT(51'100), to_string(Json::Value(balance)));
+            BEAST_EXPECTS(balance == mpt(51'100), to_string(json::Value(balance)));
         }
     }
 
@@ -6792,7 +6801,7 @@ protected:
         Account const borrower("borrower");
         Account const broker("broker");
 
-        Env env(*this, all);
+        Env env(*this, all_);
         env.fund(XRP(20'000), issuer, broker, borrower);
         env.close();
 
@@ -6812,13 +6821,13 @@ protected:
         env(credentials::accept(borrower, issuer, credType));
         env.close();
 
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({
             .flags = tfMPTCanClawback | tfMPTRequireAuth | tfMPTCanTransfer | tfMPTCanLock,
             .domainID = domainID,
         });
 
-        PrettyAsset const MPT{mptt.issuanceID()};
+        PrettyAsset const mpt{mptt.issuanceID()};
 
         // Authorize broker and borrower
         mptt.authorize({.account = broker});
@@ -6827,19 +6836,19 @@ protected:
         env.close();
 
         // Fund accounts
-        env(pay(issuer, broker, MPT(10'000'000)));
-        env(pay(issuer, borrower, MPT(1'000)));
+        env(pay(issuer, broker, mpt(10'000'000)));
+        env(pay(issuer, borrower, mpt(1'000)));
         env.close();
 
         // Create vault and broker
-        auto const brokerInfo = createVaultAndBroker(env, MPT, broker);
+        auto const brokerInfo = createVaultAndBroker(env, mpt, broker);
         // Create a loan first (this creates debt)
         auto const keylet = keylet::loan(brokerInfo.brokerID, 1);
         env(set(borrower, brokerInfo.brokerID, 10'000),
-            sig(sfCounterpartySignature, broker),
-            loanServiceFee(MPT(100).value()),
-            paymentInterval(100),
-            fee(XRP(100)));
+            Sig(sfCounterpartySignature, broker),
+            kLOAN_SERVICE_FEE(mpt(100).value()),
+            kPAYMENT_INTERVAL(100),
+            Fee(XRP(100)));
         env.close();
         // Ensure broker has sufficient cover so brokerPayee == brokerOwner
         // We need coverAvailable >= (debtTotal * coverRateMinimum)
@@ -6847,15 +6856,15 @@ protected:
         // The default coverRateMinimum is 10%, so for a 10,000 loan we need
         // at least 1,000 cover. Default cover is 1,000, so we add more to be
         // safe.
-        auto const additionalCover = MPT(50'000).value();
-        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{MPT, additionalCover}));
+        auto const additionalCover = mpt(50'000).value();
+        env(loanBroker::coverDeposit(broker, brokerInfo.brokerID, STAmount{mpt, additionalCover}));
         env.close();
         // Verify broker owner is authorized
         auto const brokerMpt = keylet::mptoken(mptt.issuanceID(), broker);
         BEAST_EXPECT(env.le(brokerMpt) != nullptr);
         // Remove the credentials for the Broker owner.
         // First, pay any positive balance to issuer to zero it out
-        auto const brokerBalance = env.balance(broker, MPT);
+        auto const brokerBalance = env.balance(broker, mpt);
         env(pay(broker, issuer, brokerBalance));
         env.close();
 
@@ -6864,23 +6873,23 @@ protected:
 
         // Make sure the broker is not authorized to hold the MPT after we
         // deleted the credentials
-        env(pay(issuer, broker, MPT(1'000)), ter(tecNO_AUTH));
+        env(pay(issuer, broker, mpt(1'000)), Ter(tecNO_AUTH));
 
         // Now borrower tries to make a payment
         // We should get a tesSUCCESS instead of a tecNO_AUTH.
-        auto const borrowerBalance = env.balance(borrower, MPT);
-        env(pay(borrower, keylet.key, MPT(10'100)), fee(XRP(100)), ter(tesSUCCESS));
+        auto const borrowerBalance = env.balance(borrower, mpt);
+        env(pay(borrower, keylet.key, mpt(10'100)), Fee(XRP(100)), Ter(tesSUCCESS));
         env.close();
         // Verify broker is still not authorized
-        env(pay(issuer, broker, MPT(1'000)), ter(tecNO_AUTH));
+        env(pay(issuer, broker, mpt(1'000)), Ter(tecNO_AUTH));
         // Verify the service fee went to the broker pseudo-account
         if (auto const brokerSle = env.le(keylet::loanbroker(brokerInfo.brokerID));
             BEAST_EXPECT(brokerSle))
         {
             Account const pseudo("pseudo-account", brokerSle->at(sfAccount));
-            auto const balance = env.balance(pseudo, MPT);
+            auto const balance = env.balance(pseudo, mpt);
             // 1,000 default + 50,000 extra + 100 service fee from LoanPay
-            BEAST_EXPECTS(balance == MPT(51'100), to_string(Json::Value(balance)));
+            BEAST_EXPECTS(balance == mpt(51'100), to_string(json::Value(balance)));
         }
     }
 
@@ -6895,7 +6904,7 @@ protected:
         Account const borrower("borrower");
         Account const broker("broker");
 
-        Env env(*this, all);
+        Env env(*this, all_);
         env.fund(XRP(20'000), issuer, broker, borrower);
         env.close();
 
@@ -6916,13 +6925,13 @@ protected:
         env(credentials::accept(borrower, issuer, credType));
         env.close();
 
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({
             .flags = tfMPTCanClawback | tfMPTRequireAuth | tfMPTCanTransfer | tfMPTCanLock,
             .domainID = domainID,
         });
 
-        PrettyAsset const MPT{mptt.issuanceID()};
+        PrettyAsset const mpt{mptt.issuanceID()};
 
         // Authorize broker and borrower
         mptt.authorize({.account = broker});
@@ -6930,16 +6939,16 @@ protected:
         env.close();
 
         // Fund accounts
-        env(pay(issuer, broker, MPT(10'000'000)));
-        env(pay(issuer, borrower, MPT(1'000)));
+        env(pay(issuer, broker, mpt(10'000'000)));
+        env(pay(issuer, borrower, mpt(1'000)));
         env.close();
 
         // Create vault and broker
-        auto const brokerInfo = createVaultAndBroker(env, MPT, broker);
+        auto const brokerInfo = createVaultAndBroker(env, mpt, broker);
 
         // Remove the credentials for the Broker owner.
         // Clear the balance first.
-        auto const brokerBalance = env.balance(broker, MPT);
+        auto const brokerBalance = env.balance(broker, mpt);
         env(pay(broker, issuer, brokerBalance));
         env.close();
         // Delete the credentials
@@ -6948,11 +6957,11 @@ protected:
 
         // Create a loan, this should fail for tecNO_AUTH
         env(set(borrower, brokerInfo.brokerID, 10'000),
-            sig(sfCounterpartySignature, broker),
-            loanServiceFee(MPT(100).value()),
-            paymentInterval(100),
-            fee(XRP(100)),
-            ter(tecNO_AUTH));
+            Sig(sfCounterpartySignature, broker),
+            kLOAN_SERVICE_FEE(mpt(100).value()),
+            kPAYMENT_INTERVAL(100),
+            Fee(XRP(100)),
+            Ter(tecNO_AUTH));
         env.close();
     }
 
@@ -6965,7 +6974,7 @@ protected:
         using namespace loan;
         using namespace loanBroker;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         Account const issuer{"issuer"};
         Account const lender{"lender"};
@@ -7005,12 +7014,12 @@ protected:
         // Create Loan A
         auto loanATx = env.jt(
             set(borrowerA, brokerKeylet.key, principalAmount),
-            sig(sfCounterpartySignature, lender),
-            interestRate(TenthBips32(500)),  // 5%
-            paymentTotal(12),
-            loan::paymentInterval(loanPaymentInterval),
-            loan::gracePeriod(loanGracePeriod),
-            fee(XRP(10)));  // Sufficient fee for multi-sig transaction
+            Sig(sfCounterpartySignature, lender),
+            kINTEREST_RATE(TenthBips32(500)),  // 5%
+            kPAYMENT_TOTAL(12),
+            loan::kPAYMENT_INTERVAL(loanPaymentInterval),
+            loan::kGRACE_PERIOD(loanGracePeriod),
+            Fee(XRP(10)));  // Sufficient fee for multi-sig transaction
         env(loanATx);
         env.close();
 
@@ -7019,12 +7028,12 @@ protected:
         // Create Loan B
         auto loanBTx = env.jt(
             set(borrowerB, brokerKeylet.key, principalAmount),
-            sig(sfCounterpartySignature, lender),
-            interestRate(TenthBips32(500)),  // 5%
-            paymentTotal(12),
-            loan::paymentInterval(loanPaymentInterval),
-            loan::gracePeriod(loanGracePeriod),
-            fee(XRP(10)));  // Sufficient fee for multi-sig transaction
+            Sig(sfCounterpartySignature, lender),
+            kINTEREST_RATE(TenthBips32(500)),  // 5%
+            kPAYMENT_TOTAL(12),
+            loan::kPAYMENT_INTERVAL(loanPaymentInterval),
+            loan::kGRACE_PERIOD(loanGracePeriod),
+            Fee(XRP(10)));  // Sufficient fee for multi-sig transaction
         env(loanBTx);
         env.close();
 
@@ -7039,7 +7048,7 @@ protected:
         auto const loanAGrace = loanASle->at(sfGracePeriod);
         env.close(std::chrono::seconds{loanANextDue + loanAGrace + 60});
 
-        env(manage(lender, loanAKeylet.key, tfLoanDefault), ter(tesSUCCESS));
+        env(manage(lender, loanAKeylet.key, tfLoanDefault), Ter(tesSUCCESS));
         env.close();
 
         // Verify Loan A is defaulted
@@ -7062,7 +7071,7 @@ protected:
         // CoverAvailable should have decreased significantly
         BEAST_EXPECT(afterFirstCoverAvailable == 946);
 
-        env(manage(lender, loanBKeylet.key, tfLoanDefault), ter(tesSUCCESS));
+        env(manage(lender, loanBKeylet.key, tfLoanDefault), Ter(tesSUCCESS));
 
         brokerSle = env.le(brokerKeylet);
         if (!BEAST_EXPECT(brokerSle))
@@ -7088,17 +7097,17 @@ protected:
         testcase("Vault withdraw reflects sfLossUnrealized");
 
         // Test constants
-        static constexpr std::int64_t INITIAL_FUNDING = 1'000'000;
-        static constexpr std::int64_t LENDER_INITIAL_IOU = 5'000'000;
-        static constexpr std::int64_t DEPOSITOR_INITIAL_IOU = 1'000'000;
-        static constexpr std::int64_t BORROWER_INITIAL_IOU = 100'000;
-        static constexpr std::int64_t DEPOSIT_AMOUNT = 5'000;
-        static constexpr std::int64_t PRINCIPAL_AMOUNT = 99;
-        static constexpr std::uint64_t EXPECTED_SHARES_PER_DEPOSITOR = 5'000'000'000;
-        static constexpr std::uint32_t PAYMENT_INTERVAL = 600;
-        static constexpr std::uint32_t PAYMENT_TOTAL = 2;
+        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;
 
-        Env env(*this, all);
+        Env env(*this, all_);
 
         // Setup accounts
         Account const issuer{"issuer"};
@@ -7107,11 +7116,11 @@ protected:
         Account const depositorB{"lpB"};
         Account const borrower{"borrowerA"};
 
-        env.fund(XRP(INITIAL_FUNDING), issuer, lender, depositorA, depositorB, borrower);
+        env.fund(XRP(kINITIAL_FUNDING), issuer, lender, depositorA, depositorB, borrower);
         env.close();
 
         // Setup trust lines
-        PrettyAsset const iouAsset = issuer[iouCurrency];
+        PrettyAsset const iouAsset = issuer[iouCurrency_];
         env(trust(lender, iouAsset(10'000'000)));
         env(trust(depositorA, iouAsset(10'000'000)));
         env(trust(depositorB, iouAsset(10'000'000)));
@@ -7119,10 +7128,10 @@ protected:
         env.close();
 
         // Fund accounts with IOUs
-        env(pay(issuer, lender, iouAsset(LENDER_INITIAL_IOU)));
-        env(pay(issuer, depositorA, iouAsset(DEPOSITOR_INITIAL_IOU)));
-        env(pay(issuer, depositorB, iouAsset(DEPOSITOR_INITIAL_IOU)));
-        env(pay(issuer, borrower, iouAsset(BORROWER_INITIAL_IOU)));
+        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.close();
 
         // Create vault and broker, then add deposits from two depositors
@@ -7132,15 +7141,15 @@ protected:
         env(v.deposit({
                 .depositor = depositorA,
                 .id = broker.vaultKeylet().key,
-                .amount = iouAsset(DEPOSIT_AMOUNT),
+                .amount = iouAsset(kDEPOSIT_AMOUNT),
             }),
-            ter(tesSUCCESS));
+            Ter(tesSUCCESS));
         env(v.deposit({
                 .depositor = depositorB,
                 .id = broker.vaultKeylet().key,
-                .amount = iouAsset(DEPOSIT_AMOUNT),
+                .amount = iouAsset(kDEPOSIT_AMOUNT),
             }),
-            ter(tesSUCCESS));
+            Ter(tesSUCCESS));
         env.close();
 
         // Create a loan
@@ -7150,16 +7159,16 @@ protected:
 
         auto const loanKeylet = keylet::loan(broker.brokerID, sleBroker->at(sfLoanSequence));
 
-        env(set(borrower, broker.brokerID, PRINCIPAL_AMOUNT),
-            sig(sfCounterpartySignature, lender),
-            paymentTotal(PAYMENT_TOTAL),
-            paymentInterval(PAYMENT_INTERVAL),
-            fee(env.current()->fees().base * 2),
-            ter(tesSUCCESS));
+        env(set(borrower, broker.brokerID, kPRINCIPAL_AMOUNT),
+            Sig(sfCounterpartySignature, lender),
+            kPAYMENT_TOTAL(kLOCAL_PAYMENT_TOTAL),
+            kPAYMENT_INTERVAL(kLOCAL_PAYMENT_INTERVAL),
+            Fee(env.current()->fees().base * 2),
+            Ter(tesSUCCESS));
         env.close();
 
         // Impair the loan to create unrealized loss
-        env(manage(lender, loanKeylet.key, tfLoanImpair), ter(tesSUCCESS));
+        env(manage(lender, loanKeylet.key, tfLoanImpair), Ter(tesSUCCESS));
         env.close();
 
         // Verify unrealized loss is recorded in the vault
@@ -7168,7 +7177,7 @@ protected:
             return;
 
         BEAST_EXPECT(
-            vaultAfterImpair->at(sfLossUnrealized) == broker.asset(PRINCIPAL_AMOUNT).value());
+            vaultAfterImpair->at(sfLossUnrealized) == broker.asset(kPRINCIPAL_AMOUNT).value());
 
         // Helper to get share balance for a depositor
         auto const shareAsset = vaultAfterImpair->at(sfShareMPTID);
@@ -7180,8 +7189,8 @@ protected:
         // Verify both depositors have equal shares
         auto const sharesLpA = getShareBalance(depositorA);
         auto const sharesLpB = getShareBalance(depositorB);
-        BEAST_EXPECT(sharesLpA == EXPECTED_SHARES_PER_DEPOSITOR);
-        BEAST_EXPECT(sharesLpB == EXPECTED_SHARES_PER_DEPOSITOR);
+        BEAST_EXPECT(sharesLpA == kEXPECTED_SHARES_PER_DEPOSITOR);
+        BEAST_EXPECT(sharesLpB == kEXPECTED_SHARES_PER_DEPOSITOR);
         BEAST_EXPECT(sharesLpA == sharesLpB);
 
         // Helper to attempt withdrawal
@@ -7191,7 +7200,7 @@ protected:
             STAmount const shareAmt{MPTIssue{shareAsset}, Number(shareAmount)};
             env(v.withdraw(
                     {.depositor = depositor, .id = broker.vaultKeylet().key, .amount = shareAmt}),
-                ter(expected));
+                Ter(expected));
             env.close();
         };
 
@@ -7216,10 +7225,10 @@ public:
         testWithdrawReflectsUnrealizedLoss();
         testInvalidLoanSet();
 
-        auto const all = jtx::testable_amendments();
+        auto const all = jtx::testableAmendments();
         testCoverDepositWithdrawNonTransferableMPT(all);
         testCoverDepositWithdrawNonTransferableMPT(all - featureMPTokensV2);
-        testPoC_UnsignedUnderflowOnFullPayAfterEarlyPeriodic();
+        testPoCUnsignedUnderflowOnFullPayAfterEarlyPeriodic();
 
         testDisabled();
         testSelfLoan();
@@ -7269,13 +7278,13 @@ class LoanBatch_test : public Loan_test
 protected:
     beast::xor_shift_engine engine_;
 
-    std::uniform_int_distribution<> assetDist{0, 2};
-    std::uniform_int_distribution<std::int64_t> principalDist{100'000, 1'000'000'000};
-    std::uniform_int_distribution<std::uint32_t> interestRateDist{0, 10000};
-    std::uniform_int_distribution<> paymentTotalDist{12, 10000};
-    std::uniform_int_distribution<> paymentIntervalDist{60, 3600 * 24 * 30};
-    std::uniform_int_distribution<std::uint16_t> managementFeeRateDist{0, 10'000};
-    std::uniform_int_distribution<> serviceFeeDist{0, 20};
+    std::uniform_int_distribution<> assetDist_{0, 2};
+    std::uniform_int_distribution<std::int64_t> principalDist_{100'000, 1'000'000'000};
+    std::uniform_int_distribution<std::uint32_t> interestRateDist_{0, 10000};
+    std::uniform_int_distribution<> paymentTotalDist_{12, 10000};
+    std::uniform_int_distribution<> paymentIntervalDist_{60, 3600 * 24 * 30};
+    std::uniform_int_distribution<std::uint16_t> managementFeeRateDist_{0, 10'000};
+    std::uniform_int_distribution<> serviceFeeDist_{0, 20};
     /*
         # Generate parameters that are more likely to be valid
     principal = Decimal(str(rand.randint(100000,
@@ -7302,13 +7311,13 @@ protected:
         Account const borrower("borrower");
 
         // Determine all the random parameters at once
-        AssetType const assetType = static_cast<AssetType>(assetDist(engine_));
-        auto const principalRequest = principalDist(engine_);
-        TenthBips16 const managementFeeRate{managementFeeRateDist(engine_)};
-        auto const serviceFee = serviceFeeDist(engine_);
-        TenthBips32 interest{interestRateDist(engine_)};
-        auto const payTotal = paymentTotalDist(engine_);
-        auto const payInterval = paymentIntervalDist(engine_);
+        AssetType const assetType = static_cast<AssetType>(assetDist_(engine_));
+        auto const principalRequest = principalDist_(engine_);
+        TenthBips16 const managementFeeRate{managementFeeRateDist_(engine_)};
+        auto const serviceFee = serviceFeeDist_(engine_);
+        TenthBips32 interest{interestRateDist_(engine_)};
+        auto const payTotal = paymentTotalDist_(engine_);
+        auto const payInterval = paymentIntervalDist_(engine_);
 
         BrokerParameters const brokerParams{
             .vaultDeposit = principalRequest * 10,
diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp
index 681d2f2577..a9c36d93d2 100644
--- a/src/test/app/MPToken_test.cpp
+++ b/src/test/app/MPToken_test.cpp
@@ -30,7 +30,6 @@
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/unit_test/suite.h>
-#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/json/to_string.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ApplyViewImpl.h>
@@ -43,6 +42,7 @@
 #include <xrpl/protocol/MPTAmount.h>
 #include <xrpl/protocol/MPTIssue.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/SOTemplate.h>
 #include <xrpl/protocol/STAmount.h>
@@ -68,7 +68,7 @@
 
 namespace xrpl::test {
 
-class MPToken_test : public beast::unit_test::suite
+class MPToken_test : public beast::unit_test::Suite
 {
     void
     testCreateValidation(FeatureBitset features)
@@ -94,7 +94,7 @@ class MPToken_test : public beast::unit_test::suite
 
             mptAlice.create({.flags = 0x00000001, .err = temINVALID_FLAG});
 
-            // tries to set a txfee while not enabling in the flag
+            // tries to set a txFee while not enabling in the flag
             mptAlice.create(
                 {.maxAmt = 100,
                  .assetScale = 0,
@@ -140,24 +140,24 @@ class MPToken_test : public beast::unit_test::suite
                      .assetScale = 0,
                      .metadata = "test",
                      .flags = tfMPTRequireAuth,
-                     .domainID = beast::zero,
+                     .domainID = uint256{},
                      .err = temMALFORMED});
             }
 
-            // tries to set a txfee greater than max
+            // tries to set a txFee greater than max
             mptAlice.create(
                 {.maxAmt = 100,
                  .assetScale = 0,
-                 .transferFee = maxTransferFee + 1,
+                 .transferFee = kMAX_TRANSFER_FEE + 1,
                  .metadata = "test",
                  .flags = tfMPTCanTransfer,
                  .err = temBAD_TRANSFER_FEE});
 
-            // tries to set a txfee while not enabling transfer
+            // tries to set a txFee while not enabling transfer
             mptAlice.create(
                 {.maxAmt = 100,
                  .assetScale = 0,
-                 .transferFee = maxTransferFee,
+                 .transferFee = kMAX_TRANSFER_FEE,
                  .metadata = "test",
                  .err = temMALFORMED});
 
@@ -185,7 +185,7 @@ class MPToken_test : public beast::unit_test::suite
                  .metadata = "test",
                  .err = temMALFORMED});
             mptAlice.create(
-                {.maxAmt = maxMPTokenAmount + 1,  // 9'223'372'036'854'775'808
+                {.maxAmt = kMAX_MP_TOKEN_AMOUNT + 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 = maxMPTokenAmount,  // 9'223'372'036'854'775'807
+                {.maxAmt = kMAX_MP_TOKEN_AMOUNT,  // 9'223'372'036'854'775'807
                  .assetScale = 1,
                  .transferFee = 10,
                  .metadata = "123",
@@ -216,9 +216,9 @@ class MPToken_test : public beast::unit_test::suite
                      tfMPTCanTransfer | tfMPTCanClawback});
 
             // Get the hash for the most recent transaction.
-            std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+            std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
-            Json::Value const result = env.rpc("tx", txHash)[jss::result];
+            json::Value const result = env.rpc("tx", txHash)[jss::result];
             BEAST_EXPECT(result[sfMaximumAmount.getJsonName()] == "9223372036854775807");
         }
 
@@ -236,13 +236,13 @@ class MPToken_test : public beast::unit_test::suite
 
                 env(pdomain::setTx(credIssuer1, credentials1));
                 auto const domainId1 = [&]() {
-                    auto tx = env.tx()->getJson(JsonOptions::none);
+                    auto tx = env.tx()->getJson(JsonOptions::KNone);
                     return pdomain::getNewDomain(env.meta());
                 }();
 
                 MPTTester mptAlice(env, alice);
                 mptAlice.create({
-                    .maxAmt = maxMPTokenAmount,  // 9'223'372'036'854'775'807
+                    .maxAmt = kMAX_MP_TOKEN_AMOUNT,  // 9'223'372'036'854'775'807
                     .assetScale = 1,
                     .transferFee = 10,
                     .metadata = "123",
@@ -254,9 +254,9 @@ class MPToken_test : public beast::unit_test::suite
 
                 // Get the hash for the most recent transaction.
                 std::string const txHash{
-                    env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+                    env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
-                Json::Value const result = env.rpc("tx", txHash)[jss::result];
+                json::Value const result = env.rpc("tx", txHash)[jss::result];
                 BEAST_EXPECT(result[sfMaximumAmount.getJsonName()] == "9223372036854775807");
             }
         }
@@ -708,7 +708,7 @@ class MPToken_test : public beast::unit_test::suite
                 // Trying to set DomainID on a public MPTokenIssuance
                 mptAlice.set({.domainID = uint256(42), .err = tecNO_PERMISSION});
 
-                mptAlice.set({.domainID = beast::zero, .err = tecNO_PERMISSION});
+                mptAlice.set({.domainID = uint256{}, .err = tecNO_PERMISSION});
             }
 
             {
@@ -725,7 +725,7 @@ class MPToken_test : public beast::unit_test::suite
                     {.flags = tfMPTUnlock, .domainID = uint256(42), .err = tecNO_PERMISSION});
 
                 mptAlice.set(
-                    {.flags = tfMPTUnlock, .domainID = beast::zero, .err = tecNO_PERMISSION});
+                    {.flags = tfMPTUnlock, .domainID = uint256{}, .err = tecNO_PERMISSION});
             }
         }
     }
@@ -818,7 +818,7 @@ class MPToken_test : public beast::unit_test::suite
 
                 env(pdomain::setTx(credIssuer1, credentials1));
                 return [&]() {
-                    auto tx = env.tx()->getJson(JsonOptions::none);
+                    auto tx = env.tx()->getJson(JsonOptions::KNone);
                     return pdomain::getNewDomain(env.meta());
                 }();
             }();
@@ -832,7 +832,7 @@ class MPToken_test : public beast::unit_test::suite
 
                 env(pdomain::setTx(credIssuer2, credentials2));
                 return [&]() {
-                    auto tx = env.tx()->getJson(JsonOptions::none);
+                    auto tx = env.tx()->getJson(JsonOptions::KNone);
                     return pdomain::getNewDomain(env.meta());
                 }();
             }();
@@ -844,7 +844,7 @@ class MPToken_test : public beast::unit_test::suite
             BEAST_EXPECT(mptAlice.checkDomainID(std::nullopt));
 
             // reset "domain not set" to "domain not set", i.e. no change
-            mptAlice.set({.domainID = beast::zero});
+            mptAlice.set({.domainID = uint256{}});
             BEAST_EXPECT(mptAlice.checkDomainID(std::nullopt));
 
             // reset "domain not set" to domain1
@@ -856,7 +856,7 @@ class MPToken_test : public beast::unit_test::suite
             BEAST_EXPECT(mptAlice.checkDomainID(domainId2));
 
             // reset domain to "domain not set"
-            mptAlice.set({.domainID = beast::zero});
+            mptAlice.set({.domainID = uint256{}});
             BEAST_EXPECT(mptAlice.checkDomainID(std::nullopt));
         }
     }
@@ -870,13 +870,13 @@ class MPToken_test : public beast::unit_test::suite
         Account const alice("alice");  // issuer
         Account const bob("bob");      // holder
         Account const carol("carol");  // holder
-        auto const MPTokensV2 = features[featureMPTokensV2];
+        auto const mpTokensV2 = features[featureMPTokensV2];
 
         // preflight validation
 
         // MPT is disabled
         {
-            Env env{*this, features - featureMPTokensV1};
+            Env env{*this, features - featureMPTokensV1};  // NOLINT TODO
             Account const alice("alice");
             Account const bob("bob");
 
@@ -884,7 +884,7 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), bob);
             STAmount const mpt{MPTIssue{makeMptID(1, alice)}, UINT64_C(100)};
 
-            env(pay(alice, bob, mpt), ter(temDISABLED));
+            env(pay(alice, bob, mpt), Ter(temDISABLED));
         }
 
         // MPT is disabled, unsigned request
@@ -892,13 +892,13 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features - featureMPTokensV1};
             Account const alice("alice");  // issuer
             Account const carol("carol");
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
 
             env.fund(XRP(1'000), alice);
             env.fund(XRP(1'000), carol);
             STAmount const mpt{MPTIssue{makeMptID(1, alice)}, UINT64_C(100)};
 
-            Json::Value jv;
+            json::Value jv;
             jv[jss::secret] = alice.name();
             jv[jss::tx_json] = pay(alice, carol, mpt);
             jv[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
@@ -913,14 +913,14 @@ class MPToken_test : public beast::unit_test::suite
             MPTTester mptAlice(env, alice, {.holders = {bob}});
 
             mptAlice.create({.ownerCount = 1, .holderCount = 0});
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
 
             mptAlice.authorize({.account = bob});
 
-            auto err = !features[featureMPTokensV2] ? ter(temINVALID_FLAG) : ter(temRIPPLE_EMPTY);
-            env(pay(alice, bob, MPT(10)), txflags(tfNoRippleDirect), err);
-            err = !features[featureMPTokensV2] ? ter(temINVALID_FLAG) : ter(tesSUCCESS);
-            env(pay(alice, bob, MPT(10)), txflags(tfLimitQuality), err);
+            auto err = !features[featureMPTokensV2] ? Ter(temINVALID_FLAG) : Ter(temRIPPLE_EMPTY);
+            env(pay(alice, bob, mpt(10)), Txflags(tfNoRippleDirect), err);
+            err = !features[featureMPTokensV2] ? Ter(temINVALID_FLAG) : Ter(tesSUCCESS);
+            env(pay(alice, bob, mpt(10)), Txflags(tfLimitQuality), err);
         }
 
         // Invalid combination of send, sendMax, deliverMin, paths
@@ -938,25 +938,25 @@ class MPToken_test : public beast::unit_test::suite
 
             // sendMax and DeliverMin are valid XRP amount,
             // but is invalid combination with MPT amount
-            auto const MPT = mptAlice["MPT"];
-            auto err = !MPTokensV2 ? ter(temMALFORMED) : ter(tecPATH_PARTIAL);
-            env(pay(alice, carol, MPT(100)), sendmax(XRP(100)), err);
-            env(pay(alice, carol, MPT(100)), deliver_min(XRP(100)), ter(temBAD_AMOUNT));
+            auto const mpt = mptAlice["MPT"];
+            auto err = !mpTokensV2 ? Ter(temMALFORMED) : Ter(tecPATH_PARTIAL);
+            env(pay(alice, carol, mpt(100)), Sendmax(XRP(100)), err);
+            env(pay(alice, carol, mpt(100)), DeliverMin(XRP(100)), Ter(temBAD_AMOUNT));
             // sendMax MPT is invalid with IOU or XRP
-            auto const USD = alice["USD"];
-            err = !MPTokensV2 ? ter(temMALFORMED) : ter(tecPATH_DRY);
-            env(pay(alice, carol, USD(100)), sendmax(MPT(100)), err);
-            err = !MPTokensV2 ? ter(temMALFORMED) : ter(tecPATH_PARTIAL);
-            env(pay(alice, carol, XRP(100)), sendmax(MPT(100)), err);
-            env(pay(alice, carol, USD(100)), deliver_min(MPT(100)), ter(temBAD_AMOUNT));
-            env(pay(alice, carol, XRP(100)), deliver_min(MPT(100)), ter(temBAD_AMOUNT));
+            auto const usd = alice["USD"];
+            err = !mpTokensV2 ? Ter(temMALFORMED) : Ter(tecPATH_DRY);
+            env(pay(alice, carol, usd(100)), Sendmax(mpt(100)), err);
+            err = !mpTokensV2 ? Ter(temMALFORMED) : Ter(tecPATH_PARTIAL);
+            env(pay(alice, carol, XRP(100)), Sendmax(mpt(100)), err);
+            env(pay(alice, carol, usd(100)), DeliverMin(mpt(100)), Ter(temBAD_AMOUNT));
+            env(pay(alice, carol, XRP(100)), DeliverMin(mpt(100)), Ter(temBAD_AMOUNT));
             // sendmax and amount are different MPT issue
-            test::jtx::MPT const MPT1("MPT", makeMptID(env.seq(alice) + 10, alice));
-            err = !MPTokensV2 ? ter(temMALFORMED) : ter(tecOBJECT_NOT_FOUND);
-            env(pay(alice, carol, MPT1(100)), sendmax(MPT(100)), err);
+            test::jtx::MPT const mpT1("MPT", makeMptID(env.seq(alice) + 10, alice));
+            err = !mpTokensV2 ? Ter(temMALFORMED) : Ter(tecOBJECT_NOT_FOUND);
+            env(pay(alice, carol, mpT1(100)), Sendmax(mpt(100)), err);
             // "paths" is invalid in V1
-            err = !MPTokensV2 ? ter(temMALFORMED) : ter(tesSUCCESS);
-            env(pay(alice, carol, MPT(100)), path(~USD), err);
+            err = !mpTokensV2 ? Ter(temMALFORMED) : Ter(tesSUCCESS);
+            env(pay(alice, carol, mpt(100)), Path(~usd), err);
         }
 
         // build_path is invalid if MPT
@@ -968,13 +968,13 @@ class MPToken_test : public beast::unit_test::suite
             MPTTester mptAlice(env, alice, {.holders = {bob, carol}});
 
             mptAlice.create({.ownerCount = 1, .holderCount = 0});
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
 
             mptAlice.authorize({.account = carol});
 
-            Json::Value payment;
+            json::Value payment;
             payment[jss::secret] = alice.name();
-            payment[jss::tx_json] = pay(alice, carol, MPT(100));
+            payment[jss::tx_json] = pay(alice, carol, mpt(100));
 
             payment[jss::build_path] = true;
             auto jrr = env.rpc("json", "submit", to_string(payment));
@@ -991,7 +991,7 @@ class MPToken_test : public beast::unit_test::suite
             MPTTester mptAlice(env, alice, {.holders = {bob, carol}});
 
             mptAlice.create({.ownerCount = 1, .holderCount = 0});
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
 
             mptAlice.authorize({.account = bob});
             mptAlice.authorize({.account = carol});
@@ -1002,7 +1002,7 @@ class MPToken_test : public beast::unit_test::suite
 
             mptAlice.pay(bob, alice, -1, temBAD_AMOUNT);
 
-            env(pay(alice, bob, MPT(10)), sendmax(MPT(-1)), ter(temBAD_AMOUNT));
+            env(pay(alice, bob, mpt(10)), Sendmax(mpt(-1)), Ter(temBAD_AMOUNT));
         }
 
         // Pay to self
@@ -1095,7 +1095,7 @@ class MPToken_test : public beast::unit_test::suite
 
                     env(pdomain::setTx(credIssuer1, credentials1));
                     return [&]() {
-                        auto tx = env.tx()->getJson(JsonOptions::none);
+                        auto tx = env.tx()->getJson(JsonOptions::KNone);
                         return pdomain::getNewDomain(env.meta());
                     }();
                 }();
@@ -1119,7 +1119,7 @@ class MPToken_test : public beast::unit_test::suite
 
                 // bob is authorized via domain
                 mptAlice.pay(alice, bob, 100);
-                mptAlice.set({.domainID = beast::zero});
+                mptAlice.set({.domainID = uint256{}});
 
                 // bob is no longer authorized
                 mptAlice.pay(alice, bob, 100, tecNO_AUTH);
@@ -1137,7 +1137,7 @@ class MPToken_test : public beast::unit_test::suite
 
                     env(pdomain::setTx(credIssuer1, credentials1));
                     return [&]() {
-                        auto tx = env.tx()->getJson(JsonOptions::none);
+                        auto tx = env.tx()->getJson(JsonOptions::KNone);
                         return pdomain::getNewDomain(env.meta());
                     }();
                 }();
@@ -1171,7 +1171,7 @@ class MPToken_test : public beast::unit_test::suite
                 // bob is still authorized, via domain
                 mptAlice.pay(bob, alice, 10);
 
-                mptAlice.set({.domainID = beast::zero});
+                mptAlice.set({.domainID = uint256{}});
 
                 // bob fails to send back to alice because he is no longer
                 // authorize to move his funds!
@@ -1194,7 +1194,7 @@ class MPToken_test : public beast::unit_test::suite
 
                     env(pdomain::setTx(credIssuer1, credentials));
                     return [&]() {
-                        auto tx = env.tx()->getJson(JsonOptions::none);
+                        auto tx = env.tx()->getJson(JsonOptions::KNone);
                         return pdomain::getNewDomain(env.meta());
                     }();
                 }();
@@ -1206,7 +1206,7 @@ class MPToken_test : public beast::unit_test::suite
 
                     env(pdomain::setTx(credIssuer2, credentials));
                     return [&]() {
-                        auto tx = env.tx()->getJson(JsonOptions::none);
+                        auto tx = env.tx()->getJson(JsonOptions::KNone);
                         return pdomain::getNewDomain(env.meta());
                     }();
                 }();
@@ -1408,22 +1408,22 @@ class MPToken_test : public beast::unit_test::suite
             // but SendMax is not included.
             mptAlice.pay(bob, carol, 100, tecPATH_PARTIAL);
 
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
             // SendMax doesn't cover the fee
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(109)), ter(tecPATH_PARTIAL));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(109)), Ter(tecPATH_PARTIAL));
 
             // Payment succeeds if sufficient SendMax is included.
             // 100 to carol, 10 to issuer
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(110)));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(110)));
             // 100 to carol, 10 to issuer
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(115)));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(115)));
             BEAST_EXPECT(mptAlice.checkMPTokenAmount(bob, 780));
             BEAST_EXPECT(mptAlice.checkMPTokenAmount(carol, 200));
             // Payment succeeds if partial payment even if
             // SendMax is less than deliver amount
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(90)), txflags(tfPartialPayment));
-            // 82 to carol, 8 to issuer (90 / 1.1 ~ 81.81 (rounded to nearest in
-            // v1) = 82)
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(90)), Txflags(tfPartialPayment));
+            // 82 to carol, 8 to issuer (90 / 1.1 ~ 81.81 (rounded to nearest) =
+            // 82)
             BEAST_EXPECT(mptAlice.checkMPTokenAmount(bob, 690));
             // In V2 the payments are executed via the payment engine and
             // the rounding results in a higher quality trade
@@ -1444,16 +1444,16 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.authorize({.account = carol});
             mptAlice.pay(alice, bob, 1'000);
 
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
             // SendMax is less than the amount
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(99)), ter(tecPATH_PARTIAL));
-            env(pay(bob, alice, MPT(100)), sendmax(MPT(99)), ter(tecPATH_PARTIAL));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(99)), Ter(tecPATH_PARTIAL));
+            env(pay(bob, alice, mpt(100)), Sendmax(mpt(99)), Ter(tecPATH_PARTIAL));
 
             // Payment succeeds if sufficient SendMax is included.
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(100)));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(100)));
             BEAST_EXPECT(mptAlice.checkMPTokenAmount(carol, 100));
             // Payment succeeds if partial payment
-            env(pay(bob, carol, MPT(100)), sendmax(MPT(99)), txflags(tfPartialPayment));
+            env(pay(bob, carol, mpt(100)), Sendmax(mpt(99)), Txflags(tfPartialPayment));
             BEAST_EXPECT(mptAlice.checkMPTokenAmount(carol, 199));
         }
 
@@ -1470,19 +1470,19 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.authorize({.account = carol});
             mptAlice.pay(alice, bob, 1'000);
 
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
             // Fails even with the partial payment because
             // deliver amount < deliverMin
-            env(pay(bob, alice, MPT(100)),
-                sendmax(MPT(99)),
-                deliver_min(MPT(100)),
-                txflags(tfPartialPayment),
-                ter(tecPATH_PARTIAL));
+            env(pay(bob, alice, mpt(100)),
+                Sendmax(mpt(99)),
+                DeliverMin(mpt(100)),
+                Txflags(tfPartialPayment),
+                Ter(tecPATH_PARTIAL));
             // Payment succeeds if deliver amount >= deliverMin
-            env(pay(bob, alice, MPT(100)),
-                sendmax(MPT(99)),
-                deliver_min(MPT(99)),
-                txflags(tfPartialPayment));
+            env(pay(bob, alice, mpt(100)),
+                Sendmax(mpt(99)),
+                DeliverMin(mpt(99)),
+                Txflags(tfPartialPayment));
         }
 
         // Issuer fails trying to send more than the maximum amount allowed
@@ -1500,7 +1500,7 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.pay(alice, bob, 100);
 
             // issuer tries to exceed max amount
-            auto const err = MPTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
+            auto const err = mpTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
             mptAlice.pay(alice, bob, 1, err);
         }
 
@@ -1516,10 +1516,10 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.authorize({.account = bob});
 
             // issuer sends holder the default max amount allowed
-            mptAlice.pay(alice, bob, maxMPTokenAmount);
+            mptAlice.pay(alice, bob, kMAX_MP_TOKEN_AMOUNT);
 
             // issuer tries to exceed max amount
-            auto const err = MPTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
+            auto const err = mpTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
             mptAlice.pay(alice, bob, 1, err);
         }
 
@@ -1529,10 +1529,10 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), alice, bob);
             STAmount const mpt{MPTIssue{makeMptID(1, alice)}, UINT64_C(100)};
-            Json::Value jv;
+            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(maxMPTokenAmount + 1);
+            jv[jss::tx_json][jss::Amount][jss::value] = std::to_string(kMAX_MP_TOKEN_AMOUNT + 1);
             auto const jrr = env.rpc("json", "submit", to_string(jv));
             BEAST_EXPECT(jrr[jss::result][jss::error] == "invalidParams");
         }
@@ -1550,7 +1550,7 @@ class MPToken_test : public beast::unit_test::suite
                  .ownerCount = 1,
                  .holderCount = 0,
                  .flags = tfMPTCanTransfer});
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
 
             mptAlice.authorize({.account = bob});
             mptAlice.authorize({.account = carol});
@@ -1559,10 +1559,9 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.pay(alice, bob, 10'000);
 
             // payment between the holders
-            env(pay(bob, carol, MPT(10'000)), sendmax(MPT(10'000)), txflags(tfPartialPayment));
-
+            env(pay(bob, carol, mpt(10'000)), Sendmax(mpt(10'000)), Txflags(tfPartialPayment));
             // Verify the metadata
-            auto const meta = env.meta()->getJson(JsonOptions::none)[sfAffectedNodes.fieldName];
+            auto const meta = env.meta()->getJson(JsonOptions::KNone)[sfAffectedNodes.fieldName];
             // Issuer got 10 in the transfer fees
             BEAST_EXPECT(
                 meta[0u][sfModifiedNode.fieldName][sfFinalFields.fieldName]
@@ -1580,8 +1579,8 @@ class MPToken_test : public beast::unit_test::suite
 
             // payment between the holders fails without
             // partial payment
-            auto const err = MPTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
-            env(pay(bob, carol, MPT(10'000)), sendmax(MPT(10'000)), ter(err));
+            auto const err = mpTokensV2 ? tecPATH_DRY : tecPATH_PARTIAL;
+            env(pay(bob, carol, mpt(10'000)), Sendmax(mpt(10'000)), Ter(err));
         }
 
         // Pay maximum allowed amount
@@ -1591,24 +1590,24 @@ class MPToken_test : public beast::unit_test::suite
             MPTTester mptAlice(env, alice, {.holders = {bob, carol}});
 
             mptAlice.create(
-                {.maxAmt = maxMPTokenAmount,
+                {.maxAmt = kMAX_MP_TOKEN_AMOUNT,
                  .ownerCount = 1,
                  .holderCount = 0,
                  .flags = tfMPTCanTransfer});
-            auto const MPT = mptAlice["MPT"];
+            auto const mpt = mptAlice["MPT"];
 
             mptAlice.authorize({.account = bob});
             mptAlice.authorize({.account = carol});
 
             // issuer sends holder the max amount allowed
-            mptAlice.pay(alice, bob, maxMPTokenAmount);
-            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(maxMPTokenAmount));
+            mptAlice.pay(alice, bob, kMAX_MP_TOKEN_AMOUNT);
+            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMAX_MP_TOKEN_AMOUNT));
 
             // payment between the holders
-            mptAlice.pay(bob, carol, maxMPTokenAmount);
-            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(maxMPTokenAmount));
+            mptAlice.pay(bob, carol, kMAX_MP_TOKEN_AMOUNT);
+            BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(kMAX_MP_TOKEN_AMOUNT));
             // holder pays back to the issuer
-            mptAlice.pay(carol, alice, maxMPTokenAmount);
+            mptAlice.pay(carol, alice, kMAX_MP_TOKEN_AMOUNT);
             BEAST_EXPECT(mptAlice.checkMPTokenOutstandingAmount(0));
         }
 
@@ -1632,13 +1631,13 @@ class MPToken_test : public beast::unit_test::suite
 
         // Non-existent issuance
         {
-            Env env{*this, features};
+            Env env{*this, features};  // NOLINT TODO
 
             env.fund(XRP(1'000), alice, bob);
 
             STAmount const mpt{MPTID{0}, 100};
             auto const err =
-                !features[featureMPTokensV2] ? ter(tecOBJECT_NOT_FOUND) : ter(temBAD_CURRENCY);
+                !features[featureMPTokensV2] ? Ter(tecOBJECT_NOT_FOUND) : Ter(temBAD_CURRENCY);
             env(pay(alice, bob, mpt), err);
         }
 
@@ -1790,7 +1789,7 @@ class MPToken_test : public beast::unit_test::suite
 
         testcase("DepositPreauth disabled featureCredentials");
         {
-            Env env(*this, testable_amendments() - featureCredentials);
+            Env env(*this, testableAmendments() - featureCredentials);
 
             std::string const credIdx =
                 "D007AE4B6E1274B4AF872588267B810C2F82716726351D1C7D38D3E5499FC6"
@@ -1868,8 +1867,8 @@ class MPToken_test : public beast::unit_test::suite
                 // Transaction has amount/issue fields.
                 // Exclude pseudo-transaction SetFee. Don't consider
                 // the Fee field since it's included in every transaction.
-                if (e.supportMPT() == soeMPTNotSupported && e.sField().getName() != jss::Fee &&
-                    format.getName() != jss::SetFee)
+                if (e.supportMPT() == SoeMptNotSupported && e.sField().getName() != jss::Fee &&
+                    format.getName() != std::string("SetFee"))
                 {
                     txWithAmounts.insert(format.getName() + e.sField().fieldName);
                     break;
@@ -1878,17 +1877,17 @@ class MPToken_test : public beast::unit_test::suite
         }
 
         Account const alice("alice");
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
         Account const carol("carol");
         MPTIssue const issue(makeMptID(1, alice));
         STAmount mpt{issue, UINT64_C(100)};
-        auto const jvb = bridge(alice, USD, alice, USD);
+        auto const jvb = bridge(alice, usd, alice, usd);
         for (auto const& feature : {features, features - featureMPTokensV1})
         {
             Env env{*this, feature};
             env.fund(XRP(1'000), alice);
             env.fund(XRP(1'000), carol);
-            auto test = [&](Json::Value const& jv, std::string const& mptField) {
+            auto test = [&](json::Value const& jv, std::string const& mptField) {
                 txWithAmounts.erase(jv[jss::TransactionType].asString() + mptField);
 
                 // tx is signed
@@ -1899,7 +1898,7 @@ class MPToken_test : public beast::unit_test::suite
                 BEAST_EXPECT(jrr[jss::result][jss::error] == "invalidTransaction");
 
                 // tx is unsigned
-                Json::Value jv1;
+                json::Value jv1;
                 jv1[jss::secret] = alice.name();
                 jv1[jss::tx_json] = jv;
                 jrr = env.rpc("json", "submit", to_string(jv1));
@@ -1908,22 +1907,22 @@ class MPToken_test : public beast::unit_test::suite
                 jrr = env.rpc("json", "sign", to_string(jv1));
                 BEAST_EXPECT(jrr[jss::result][jss::error] == "invalidParams");
             };
-            auto setMPTFields = [&](SField const& field, Json::Value& jv, bool withAmount = true) {
-                jv[jss::Asset] = to_json(xrpIssue());
-                jv[jss::Asset2] = to_json(USD.issue());
+            auto setMPTFields = [&](SField const& field, json::Value& jv, bool withAmount = true) {
+                jv[jss::Asset] = toJson(xrpIssue());
+                jv[jss::Asset2] = toJson(usd.issue());
                 if (withAmount)
-                    jv[field.fieldName] = USD(10).value().getJson(JsonOptions::none);
+                    jv[field.fieldName] = usd(10).value().getJson(JsonOptions::KNone);
                 if (field == sfAsset)
                 {
-                    jv[jss::Asset] = to_json(mpt.get<MPTIssue>());
+                    jv[jss::Asset] = toJson(mpt.get<MPTIssue>());
                 }
                 else if (field == sfAsset2)
                 {
-                    jv[jss::Asset2] = to_json(mpt.get<MPTIssue>());
+                    jv[jss::Asset2] = toJson(mpt.get<MPTIssue>());
                 }
                 else
                 {
-                    jv[field.fieldName] = mpt.getJson(JsonOptions::none);
+                    jv[field.fieldName] = mpt.getJson(JsonOptions::KNone);
                 }
             };
             // All transactions with sfAmount, which don't support MPT.
@@ -1932,7 +1931,7 @@ class MPToken_test : public beast::unit_test::suite
 
             // AMMDeposit
             auto ammDeposit = [&](SField const& field) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::AMMDeposit;
                 jv[jss::Account] = alice.human();
                 jv[jss::Flags] = tfSingleAsset;
@@ -1943,7 +1942,7 @@ class MPToken_test : public beast::unit_test::suite
                 ammDeposit(field);
             // AMMWithdraw
             auto ammWithdraw = [&](SField const& field) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::AMMWithdraw;
                 jv[jss::Account] = alice.human();
                 jv[jss::Flags] = tfSingleAsset;
@@ -1954,7 +1953,7 @@ class MPToken_test : public beast::unit_test::suite
                 ammWithdraw(field);
             // AMMBid
             auto ammBid = [&](SField const& field) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::AMMBid;
                 jv[jss::Account] = alice.human();
                 setMPTFields(field, jv);
@@ -1964,132 +1963,132 @@ class MPToken_test : public beast::unit_test::suite
             ammBid(sfBidMax);
             // PaymentChannelCreate
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::PaymentChannelCreate;
                 jv[jss::Account] = alice.human();
                 jv[jss::Destination] = carol.human();
                 jv[jss::SettleDelay] = 1;
                 jv[sfPublicKey.fieldName] = strHex(alice.pk().slice());
-                jv[jss::Amount] = mpt.getJson(JsonOptions::none);
-                test(jv, jss::Amount.c_str());
+                jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
+                test(jv, jss::Amount.cStr());
             }
             // PaymentChannelFund
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::PaymentChannelFund;
                 jv[jss::Account] = alice.human();
                 jv[sfChannel.fieldName] = to_string(uint256{1});
-                jv[jss::Amount] = mpt.getJson(JsonOptions::none);
-                test(jv, jss::Amount.c_str());
+                jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
+                test(jv, jss::Amount.cStr());
             }
             // PaymentChannelClaim
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::PaymentChannelClaim;
                 jv[jss::Account] = alice.human();
                 jv[sfChannel.fieldName] = to_string(uint256{1});
-                jv[jss::Amount] = mpt.getJson(JsonOptions::none);
-                test(jv, jss::Amount.c_str());
+                jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
+                test(jv, jss::Amount.cStr());
             }
             // NFTokenCreateOffer
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::NFTokenCreateOffer;
                 jv[jss::Account] = alice.human();
                 jv[sfNFTokenID.fieldName] = to_string(uint256{1});
-                jv[jss::Amount] = mpt.getJson(JsonOptions::none);
-                test(jv, jss::Amount.c_str());
+                jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
+                test(jv, jss::Amount.cStr());
             }
             // NFTokenAcceptOffer
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::NFTokenAcceptOffer;
                 jv[jss::Account] = alice.human();
-                jv[sfNFTokenBrokerFee.fieldName] = mpt.getJson(JsonOptions::none);
+                jv[sfNFTokenBrokerFee.fieldName] = mpt.getJson(JsonOptions::KNone);
                 test(jv, sfNFTokenBrokerFee.fieldName);
             }
             // NFTokenMint
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::NFTokenMint;
                 jv[jss::Account] = alice.human();
                 jv[sfNFTokenTaxon.fieldName] = 1;
-                jv[jss::Amount] = mpt.getJson(JsonOptions::none);
-                test(jv, jss::Amount.c_str());
+                jv[jss::Amount] = mpt.getJson(JsonOptions::KNone);
+                test(jv, jss::Amount.cStr());
             }
             // TrustSet
             auto trustSet = [&](SField const& field) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::TrustSet;
                 jv[jss::Account] = alice.human();
                 jv[jss::Flags] = 0;
-                jv[field.fieldName] = mpt.getJson(JsonOptions::none);
+                jv[field.fieldName] = mpt.getJson(JsonOptions::KNone);
                 test(jv, field.fieldName);
             };
             trustSet(sfLimitAmount);
             trustSet(sfFee);
             // XChainCommit
             {
-                Json::Value const jv = xchain_commit(alice, jvb, 1, mpt);
-                test(jv, jss::Amount.c_str());
+                json::Value const jv = xchainCommit(alice, jvb, 1, mpt);
+                test(jv, jss::Amount.cStr());
             }
             // XChainClaim
             {
-                Json::Value const jv = xchain_claim(alice, jvb, 1, mpt, alice);
-                test(jv, jss::Amount.c_str());
+                json::Value const jv = xchainClaim(alice, jvb, 1, mpt, alice);
+                test(jv, jss::Amount.cStr());
             }
             // XChainCreateClaimID
             {
-                Json::Value const jv = xchain_create_claim_id(alice, jvb, mpt, alice);
+                json::Value const jv = xchainCreateClaimId(alice, jvb, mpt, alice);
                 test(jv, sfSignatureReward.fieldName);
             }
             // XChainAddClaimAttestation
             {
-                Json::Value const jv =
-                    claim_attestation(alice, jvb, alice, mpt, alice, true, 1, alice, signer(alice));
-                test(jv, jss::Amount.c_str());
+                json::Value const jv =
+                    claimAttestation(alice, jvb, alice, mpt, alice, true, 1, alice, Signer(alice));
+                test(jv, jss::Amount.cStr());
             }
             // XChainAddAccountCreateAttestation
             {
-                Json::Value jv = create_account_attestation(
-                    alice, jvb, alice, mpt, XRP(10), alice, false, 1, alice, signer(alice));
+                json::Value jv = createAccountAttestation(
+                    alice, jvb, alice, mpt, XRP(10), alice, false, 1, alice, Signer(alice));
                 for (auto const& field : {sfAmount.fieldName, sfSignatureReward.fieldName})
                 {
-                    jv[field] = mpt.getJson(JsonOptions::none);
+                    jv[field] = mpt.getJson(JsonOptions::KNone);
                     test(jv, field);
                 }
             }
             // XChainAccountCreateCommit
             {
-                Json::Value jv = sidechain_xchain_account_create(alice, jvb, alice, mpt, XRP(10));
+                json::Value jv = sidechainXchainAccountCreate(alice, jvb, alice, mpt, XRP(10));
                 for (auto const& field : {sfAmount.fieldName, sfSignatureReward.fieldName})
                 {
-                    jv[field] = mpt.getJson(JsonOptions::none);
+                    jv[field] = mpt.getJson(JsonOptions::KNone);
                     test(jv, field);
                 }
             }
             // XChain[Create|Modify]Bridge
-            auto bridgeTx = [&](Json::StaticString const& tt,
+            auto bridgeTx = [&](json::StaticString const& tt,
                                 STAmount const& rewardAmount,
                                 STAmount const& minAccountAmount,
                                 std::string const& field) {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = tt;
                 jv[jss::Account] = alice.human();
                 jv[sfXChainBridge.fieldName] = jvb;
-                jv[sfSignatureReward.fieldName] = rewardAmount.getJson(JsonOptions::none);
+                jv[sfSignatureReward.fieldName] = rewardAmount.getJson(JsonOptions::KNone);
                 jv[sfMinAccountCreateAmount.fieldName] =
-                    minAccountAmount.getJson(JsonOptions::none);
+                    minAccountAmount.getJson(JsonOptions::KNone);
                 test(jv, field);
             };
             auto reward = STAmount{sfSignatureReward, mpt};
-            auto minAmount = STAmount{sfMinAccountCreateAmount, USD(10)};
+            auto minAmount = STAmount{sfMinAccountCreateAmount, usd(10)};
             for (SField const& field :
                  {std::ref(sfSignatureReward), std::ref(sfMinAccountCreateAmount)})
             {
                 bridgeTx(jss::XChainCreateBridge, reward, minAmount, field.fieldName);
                 bridgeTx(jss::XChainModifyBridge, reward, minAmount, field.fieldName);
-                reward = STAmount{sfSignatureReward, USD(10)};
+                reward = STAmount{sfSignatureReward, usd(10)};
                 minAmount = STAmount{sfMinAccountCreateAmount, mpt};
             }
         }
@@ -2113,13 +2112,13 @@ class MPToken_test : public beast::unit_test::suite
 
         mptAlice.create();
 
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
         BEAST_EXPECTS(
             txHash ==
                 "E11F0E0CA14219922B7881F060B9CEE67CFBC87E4049A441ED2AE348FF8FAC"
                 "0E",
             txHash);
-        Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
         auto const id = meta[jss::mpt_issuance_id].asString();
         // Expect mpt_issuance_id field
         BEAST_EXPECT(meta.isMember(jss::mpt_issuance_id));
@@ -2142,16 +2141,16 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob);
             env.close();
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
             auto const mpt = xrpl::test::jtx::MPT(alice.name(), makeMptID(env.seq(alice), alice));
 
-            env(claw(alice, bob["USD"](5), bob), ter(temMALFORMED));
+            env(claw(alice, bob["USD"](5), bob), Ter(temMALFORMED));
             env.close();
 
-            env(claw(alice, mpt(5)), ter(temDISABLED));
+            env(claw(alice, mpt(5)), Ter(temDISABLED));
             env.close();
 
-            env(claw(alice, mpt(5), bob), ter(temDISABLED));
+            env(claw(alice, mpt(5), bob), Ter(temDISABLED));
             env.close();
         }
 
@@ -2164,27 +2163,27 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1000), alice, bob);
             env.close();
 
-            auto const USD = alice["USD"];
+            auto const usd = alice["USD"];
             auto const mpt = xrpl::test::jtx::MPT(alice.name(), makeMptID(env.seq(alice), alice));
 
             // clawing back IOU from a MPT holder fails
-            env(claw(alice, bob["USD"](5), bob), ter(temMALFORMED));
+            env(claw(alice, bob["USD"](5), bob), Ter(temMALFORMED));
             env.close();
 
             // clawing back MPT without specifying a holder fails
-            env(claw(alice, mpt(5)), ter(temMALFORMED));
+            env(claw(alice, mpt(5)), Ter(temMALFORMED));
             env.close();
 
             // clawing back zero amount fails
-            env(claw(alice, mpt(0), bob), ter(temBAD_AMOUNT));
+            env(claw(alice, mpt(0), bob), Ter(temBAD_AMOUNT));
             env.close();
 
             // alice can't claw back from herself
-            env(claw(alice, mpt(5), alice), ter(temMALFORMED));
+            env(claw(alice, mpt(5), alice), Ter(temMALFORMED));
             env.close();
 
             // can't clawback negative amount
-            env(claw(alice, mpt(-1), bob), ter(temBAD_AMOUNT));
+            env(claw(alice, mpt(-1), bob), Ter(temBAD_AMOUNT));
             env.close();
         }
 
@@ -2199,7 +2198,7 @@ class MPToken_test : public beast::unit_test::suite
             // enable asfAllowTrustLineClawback for alice
             env(fset(alice, asfAllowTrustLineClawback));
             env.close();
-            env.require(flags(alice, asfAllowTrustLineClawback));
+            env.require(Flags(alice, asfAllowTrustLineClawback));
 
             // Create issuance without enabling clawback
             mptAlice.create({.ownerCount = 1, .holderCount = 0});
@@ -2227,7 +2226,7 @@ class MPToken_test : public beast::unit_test::suite
                 xrpl::test::jtx::MPT(alice.name(), makeMptID(env.seq(alice), alice));
 
             // issuer tries to clawback MPT where issuance doesn't exist
-            env(claw(alice, fakeMpt(5), bob), ter(tecOBJECT_NOT_FOUND));
+            env(claw(alice, fakeMpt(5), bob), Ter(tecOBJECT_NOT_FOUND));
             env.close();
 
             // alice creates issuance
@@ -2263,9 +2262,9 @@ 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(maxMPTokenAmount + 1);
-            Json::Value jv1;
+            json::Value jv = claw(alice, mpt(1), bob);
+            jv[jss::Amount][jss::value] = std::to_string(kMAX_MP_TOKEN_AMOUNT + 1);
+            json::Value jv1;
             jv1[jss::secret] = alice.name();
             jv1[jss::tx_json] = jv;
             auto const jrr = env.rpc("json", "submit", to_string(jv1));
@@ -2382,8 +2381,8 @@ class MPToken_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
         testcase("Tokens Equality");
-        Currency const cur1{to_currency("CU1")};
-        Currency const cur2{to_currency("CU2")};
+        Currency const cur1{toCurrency("CU1")};
+        Currency const cur2{toCurrency("CU2")};
         Account const gw1{"gw1"};
         Account const gw2{"gw2"};
         MPTID const mpt1 = makeMptID(1, gw1);
@@ -2484,14 +2483,14 @@ class MPToken_test : public beast::unit_test::suite
         {
             testcase("Test MPTIssue from/to Json");
             MPTIssue const issue1{asset1.get<MPTIssue>()};
-            Json::Value const jv = to_json(issue1);
+            json::Value const jv = toJson(issue1);
             BEAST_EXPECT(jv[jss::mpt_issuance_id] == to_string(asset1.get<MPTIssue>()));
             BEAST_EXPECT(issue1 == mptIssueFromJson(jv));
         }
 
         {
             testcase("Test Asset from/to Json");
-            Json::Value const jv = to_json(asset1);
+            json::Value const jv = toJson(asset1);
             BEAST_EXPECT(jv[jss::mpt_issuance_id] == to_string(asset1.get<MPTIssue>()));
             BEAST_EXPECT(
                 to_string(jv) ==
@@ -2710,7 +2709,7 @@ class MPToken_test : public beast::unit_test::suite
 
             mptAlice.create({.ownerCount = 1, .mutableFlags = tmfMPTCanMutateMetadata});
 
-            std::string metadata(maxMPTokenMetadataLength + 1, 'a');
+            std::string const metadata(kMAX_MP_TOKEN_METADATA_LENGTH + 1, 'a');
             mptAlice.set({.account = alice, .metadata = metadata, .err = temMALFORMED});
         }
 
@@ -2734,7 +2733,7 @@ class MPToken_test : public beast::unit_test::suite
             mptAlice.set(
                 {.account = alice,
                  .id = mptID,
-                 .transferFee = maxTransferFee + 1,
+                 .transferFee = kMAX_TRANSFER_FEE + 1,
                  .err = temBAD_TRANSFER_FEE});
         }
 
@@ -2888,8 +2887,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, maxTransferFee})
+            for (std::uint16_t const fee : std::initializer_list<std::uint16_t>{
+                     1, 10, 100, 200, 500, 1000, kMAX_TRANSFER_FEE})
             {
                 mptAlice.set({.account = alice, .transferFee = fee});
                 BEAST_EXPECT(mptAlice.checkTransferFee(fee));
@@ -3142,32 +3141,32 @@ class MPToken_test : public beast::unit_test::suite
         mptAlice.authorize({.account = carol});
         mptAlice.authorize({.account = bob});
 
-        auto const MPT = mptAlice["MPT"];
-        env(pay(alice, carol, MPT(10'000)));
-        env(pay(alice, bob, MPT(10'000)));
+        auto const mpt = mptAlice["MPT"];
+        env(pay(alice, carol, mpt(10'000)));
+        env(pay(alice, bob, mpt(10'000)));
         env.close();
 
         // MPTCanEscrow is not enabled
-        env(escrow::create(carol, bob, MPT(3)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150),
-            ter(tecNO_PERMISSION));
+        env(escrow::create(carol, bob, mpt(3)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(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::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150));
+        env(escrow::create(carol, bob, mpt(3)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150));
 
         // Clear MPTCanEscrow
         mptAlice.set({.account = alice, .mutableFlags = tmfMPTClearCanEscrow});
-        env(escrow::create(carol, bob, MPT(3)),
-            escrow::condition(escrow::cb1),
-            escrow::finish_time(env.now() + 1s),
-            fee(baseFee * 150),
-            ter(tecNO_PERMISSION));
+        env(escrow::create(carol, bob, mpt(3)),
+            escrow::kCONDITION(escrow::kCB1),
+            escrow::kFINISH_TIME(env.now() + 1s),
+            Fee(baseFee * 150),
+            Ter(tecNO_PERMISSION));
     }
 
     void
@@ -3217,18 +3216,18 @@ class MPToken_test : public beast::unit_test::suite
             BEAST_EXPECT(mptAlice.isTransferFeePresent());
 
             // Bob can pay carol
-            MPT const MPTC = mptAlice;
+            MPT const mptc = mptAlice;
             if (!features[featureMPTokensV2])
             {
                 mptAlice.pay(bob, carol, 50);
-                BEAST_EXPECT(env.balance(carol, MPTC) == MPTC(50));
+                BEAST_EXPECT(env.balance(carol, mptc) == mptc(50));
             }
             else
             {
                 // The difference is due to the rounding in MPT/DEX.
                 // 1 MPTC is the transfer fee paid by bob to the issuer.
-                env(pay(bob, carol, mptAlice(50)), txflags(tfPartialPayment));
-                BEAST_EXPECT(env.balance(carol, MPTC) == MPTC(49));
+                env(pay(bob, carol, mptAlice(50)), Txflags(tfPartialPayment));
+                BEAST_EXPECT(env.balance(carol, mptc) == mptc(49));
             }
 
             // Alice clears MPTCanTransfer
@@ -3319,15 +3318,15 @@ class MPToken_test : public beast::unit_test::suite
         Account const alice("alice");
         Account const bob("bob");
 
-        std::uint64_t constexpr maxAmt = 150;
+        std::uint64_t constexpr kMAX_AMT = 150;
         Env env{*this, features};
 
-        MPTTester mptt(env, issuer, {.holders = {alice, bob}});
-        mptt.create({.maxAmt = maxAmt, .ownerCount = 1, .flags = tfMPTCanTransfer});
-        mptt.authorize({.account = alice});
-        mptt.authorize({.account = bob});
+        MPTTester mptTester(env, issuer, {.holders = {alice, bob}});
+        mptTester.create({.maxAmt = kMAX_AMT, .ownerCount = 1, .flags = tfMPTCanTransfer});
+        mptTester.authorize({.account = alice});
+        mptTester.authorize({.account = bob});
 
-        Asset const asset{MPTIssue{mptt.issuanceID()}};
+        Asset const asset{MPTIssue{mptTester.issuanceID()}};
 
         // Each test case creates a fresh ApplyView and calls
         // accountSendMulti from the issuer to the given receivers.
@@ -3335,7 +3334,7 @@ class MPToken_test : public beast::unit_test::suite
                                  TER expectedTer,
                                  std::optional<std::uint64_t> expectedOutstanding,
                                  std::string const& label) {
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             auto const ter =
                 accountSendMulti(av, issuer.id(), asset, receivers, env.app().getJournal("View"));
             BEAST_EXPECTS(ter == expectedTer, label);
@@ -3344,7 +3343,7 @@ class MPToken_test : public beast::unit_test::suite
             // view may contain partial state and must be discarded.
             if (expectedOutstanding)
             {
-                auto const sle = av.peek(keylet::mptIssuance(mptt.issuanceID()));
+                auto const sle = av.peek(keylet::mptIssuance(mptTester.issuanceID()));
                 if (!BEAST_EXPECT(sle))
                     return;
                 BEAST_EXPECTS(sle->getFieldU64(sfOutstandingAmount) == *expectedOutstanding, label);
@@ -3360,14 +3359,14 @@ class MPToken_test : public beast::unit_test::suite
             std::nullopt,
             "aggregate exceeds max");
 
-        runTest(R{{alice.id(), 75}, {bob.id(), 75}}, tesSUCCESS, maxAmt, "aggregate at boundary");
+        runTest(R{{alice.id(), 75}, {bob.id(), 75}}, tesSUCCESS, kMAX_AMT, "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,
-            maxAmt,
+            kMAX_AMT,
             "one receiver at max, other zero");
 
         runTest(
@@ -3378,14 +3377,14 @@ class MPToken_test : public beast::unit_test::suite
 
         // Issue 50 tokens so outstandingAmount is nonzero, then verify
         // the third condition: outstandingAmount > maximumAmount - sendAmount - totalSendAmount
-        mptt.pay(issuer, alice, 50);
+        mptTester.pay(issuer, alice, 50);
         env.close();
 
         // maxAmt=150, outstanding=50, so 100 more available
         runTest(
             R{{alice.id(), 50}, {bob.id(), 50}},
             tesSUCCESS,
-            maxAmt,
+            kMAX_AMT,
             "nonzero outstanding, aggregate at boundary");
 
         runTest(
@@ -3397,7 +3396,7 @@ class MPToken_test : public beast::unit_test::suite
         runTest(
             R{{alice.id(), 100}, {bob.id(), 0}},
             tesSUCCESS,
-            maxAmt,
+            kMAX_AMT,
             "nonzero outstanding, single send at remaining capacity");
 
         runTest(
@@ -3429,7 +3428,7 @@ class MPToken_test : public beast::unit_test::suite
         Account const gw = Account("gw");
         Account const alice = Account("alice");
         Account const carol = Account("carol");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Blocking flags
         for (auto flags :
@@ -3449,24 +3448,24 @@ class MPToken_test : public beast::unit_test::suite
                 (flags & (tfMPTCanLock | tfMPTCanClawback)) == (tfMPTCanLock | tfMPTCanClawback);
             bool const requireAuth = (flags & tfMPTRequireAuth) != 0u;
 
-            auto mpt = MPTTester(
+            auto mptTester = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 1'000,
                  .flags = flags,
                  .authHolder = true});
-            MPT const BTC = mpt;
+            MPT const btc = mptTester;
 
             if (requireAuth)
-                mpt.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
+                mptTester.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
             if (lockMPToken)
             {
-                mpt.set({.holder = alice, .flags = tfMPTLock});
+                mptTester.set({.holder = alice, .flags = tfMPTLock});
             }
             else if (lockMPTIssue)
             {
-                mpt.set({.flags = tfMPTLock});
+                mptTester.set({.flags = tfMPTLock});
             }
 
             auto testOffer =
@@ -3494,14 +3493,14 @@ class MPToken_test : public beast::unit_test::suite
                     auto const err = buyUSD ? errBuy : errSell;
 
                     auto seq(env.seq(account));
-                    env(offer(account, buy(10), sell(10)), ter(err));
-                    env(offer_cancel(account, seq));
+                    env(offer(account, buy(10), sell(10)), Ter(err));
+                    env(offerCancel(account, seq));
                     env.close();
                 };
 
             auto testOffers = [&](Account const& account) {
-                testOffer(account, XRP, BTC, false);
-                testOffer(account, BTC, XRP, true);
+                testOffer(account, XRP, btc, false);
+                testOffer(account, btc, XRP, true);
             };
             testOffers(alice);
             testOffers(gw);
@@ -3511,14 +3510,14 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features - featureMPTokensV2};
 
-            MPTTester mpt(env, gw, {.holders = {alice}});
+            MPTTester mptTester(env, gw, {.holders = {alice}});
 
-            mpt.create({.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer});
+            mptTester.create({.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer});
 
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 200);
 
-            env(offer(alice, XRP(100), mpt.mpt(101)), ter(temDISABLED));
+            env(offer(alice, XRP(100), mptTester.mpt(101)), Ter(temDISABLED));
             env.close();
         }
 
@@ -3527,22 +3526,22 @@ class MPToken_test : public beast::unit_test::suite
             Env env(*this);
             env.fund(XRP(1'000), gw, alice);
             env.close();
-            MPT const BTC = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 100});
-            MPT const ETH = MPT(gw, 1);
+            MPT const btc = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 100});
+            MPT const eth = MPT(gw, 1);
 
-            env(offer(alice, ETH(10), BTC(10)), ter(tecOBJECT_NOT_FOUND));
-            env(offer(alice, BTC(10), ETH(10)), ter(tecUNFUNDED_OFFER));
+            env(offer(alice, eth(10), btc(10)), Ter(tecOBJECT_NOT_FOUND));
+            env(offer(alice, btc(10), eth(10)), Ter(tecUNFUNDED_OFFER));
         }
 
         // MPToken object doesn't exist and the account is not the issuer of MPT
         {
             Env env(*this);
             env.fund(XRP(1'000), gw, alice);
-            MPTTester const BTC({.env = env, .issuer = gw, .holders = {alice}, .pay = 100});
-            MPTTester const ETH({.env = env, .issuer = gw});
+            MPTTester const btc({.env = env, .issuer = gw, .holders = {alice}, .pay = 100});
+            MPTTester const eth({.env = env, .issuer = gw});
 
-            env(offer(alice, ETH(10), BTC(10)));
-            env(offer(alice, BTC(10), ETH(10)), ter(tecUNFUNDED_OFFER));
+            env(offer(alice, eth(10), btc(10)));
+            env(offer(alice, btc(10), eth(10)), Ter(tecUNFUNDED_OFFER));
         }
 
         // MPTLock flag is set and the account is not the issuer of MPT
@@ -3551,39 +3550,39 @@ class MPToken_test : public beast::unit_test::suite
             Account const dan = Account("dan");
             Env env(*this);
             env.fund(XRP(1'000), gw, alice, carol, bob, dan);
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob, dan},
                  .pay = 100,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            MPTTester ETH(
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob, dan},
                  .pay = 100,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            env(offer(bob, ETH(10), BTC(10)), txflags(tfPassive));
-            env(offer(dan, BTC(10), ETH(10)), txflags(tfPassive));
+            env(offer(bob, eth(10), btc(10)), Txflags(tfPassive));
+            env(offer(dan, btc(10), eth(10)), Txflags(tfPassive));
 
             auto test = [&](auto const& flag, bool gwOwner = false) {
-                BTC.set({.holder = carol, .flags = flag});
-                BTC.set({.holder = alice, .flags = flag});
+                btc.set({.holder = carol, .flags = flag});
+                btc.set({.holder = alice, .flags = flag});
 
                 if (gwOwner)
                 {
                     // Succeeds if the account is the issuer
-                    env(offer(gw, ETH(1), BTC(1)));
-                    env(offer(gw, BTC(1), ETH(1)));
+                    env(offer(gw, eth(1), btc(1)));
+                    env(offer(gw, btc(1), eth(1)));
                 }
                 else
                 {
-                    auto const err = flag == tfMPTLock ? ter(tecUNFUNDED_OFFER) : ter(tesSUCCESS);
-                    env(offer(alice, ETH(1), BTC(1)), err);
+                    auto const err = flag == tfMPTLock ? Ter(tecUNFUNDED_OFFER) : Ter(tesSUCCESS);
+                    env(offer(alice, eth(1), btc(1)), err);
                     // Offer created by not crossed
-                    env(offer(carol, BTC(1), ETH(1)));
-                    BEAST_EXPECT(expectOffers(env, carol, 1, {{BTC(1), ETH(1)}}));
+                    env(offer(carol, btc(1), eth(1)));
+                    BEAST_EXPECT(expectOffers(env, carol, 1, {{btc(1), eth(1)}}));
                 }
             };
 
@@ -3596,28 +3595,28 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env(*this);
             env.fund(XRP(1'000), gw, alice);
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 100,
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 100,
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
 
-            BTC.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
+            btc.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
 
-            env(offer(alice, ETH(10), BTC(10)), ter(tecUNFUNDED_OFFER));
+            env(offer(alice, eth(10), btc(10)), Ter(tecUNFUNDED_OFFER));
 
             // issuer can create
 
-            env(offer(gw, ETH(10), BTC(10)));
+            env(offer(gw, eth(10), btc(10)));
             env.close();
         }
 
@@ -3625,14 +3624,14 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env(*this);
             env.fund(XRP(1'000), gw, alice, carol);
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
                  .pay = 100,
                  .flags = tfMPTCanTrade,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester ETH(
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
@@ -3641,24 +3640,24 @@ class MPToken_test : public beast::unit_test::suite
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
 
             // Can create
-            env(offer(alice, ETH(10), BTC(10)), txflags(tfPassive));
-            BTC.set({.mutableFlags = tmfMPTSetCanTransfer});
-            ETH.set({.mutableFlags = tmfMPTClearCanTransfer});
-            env(offer(alice, ETH(10), BTC(10)), txflags(tfPassive));
+            env(offer(alice, eth(10), btc(10)), Txflags(tfPassive));
+            btc.set({.mutableFlags = tmfMPTSetCanTransfer});
+            eth.set({.mutableFlags = tmfMPTClearCanTransfer});
+            env(offer(alice, eth(10), btc(10)), Txflags(tfPassive));
             BEAST_EXPECT(getAccountOffers(env, alice)[jss::offers].size() == 2);
 
             // issuer can create
-            env(offer(gw, ETH(10), BTC(10)), txflags(tfPassive));
+            env(offer(gw, eth(10), btc(10)), Txflags(tfPassive));
             env.close();
 
             // can cross issuer's offer, other offers are removed
-            env(offer(carol, BTC(10), ETH(10)));
+            env(offer(carol, btc(10), eth(10)));
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, gw, 0));
             BEAST_EXPECT(expectOffers(env, carol, 0));
             // can't cross holder's offer, holder's offer is removed
-            env(offer(alice, ETH(10), BTC(10)), txflags(tfPassive));
-            env(offer(carol, BTC(10), ETH(10)));
+            env(offer(alice, eth(10), btc(10)), Txflags(tfPassive));
+            env(offer(carol, btc(10), eth(10)));
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, carol, 1));
         }
@@ -3667,14 +3666,14 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env(*this);
             env.fund(XRP(1'000), gw, alice, carol);
-            MPTTester const BTC(
+            MPTTester const btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
                  .pay = 100,
                  .flags = tfMPTCanTransfer,
                  .mutableFlags = tmfMPTCanMutateCanTrade});
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
@@ -3683,7 +3682,7 @@ class MPToken_test : public beast::unit_test::suite
                  .mutableFlags = tmfMPTCanMutateCanTrade});
 
             // Can't create
-            env(offer(gw, ETH(10), BTC(10)), ter(tecNO_PERMISSION));
+            env(offer(gw, eth(10), btc(10)), Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -3691,110 +3690,110 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}});
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 200);
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            env(offer(alice, XRP(100), MPT(101)));
+            env(offer(alice, XRP(100), mpt(101)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(100), MPT(101)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(100), mpt(101)}}}));
 
-            env(offer(carol, MPT(101), XRP(100)));
+            env(offer(carol, mpt(101), XRP(100)));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 99));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 301));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 99));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 301));
         }
 
         // IOU/MPT
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}});
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            env(trust(alice, USD(2'000)));
-            env(pay(gw, alice, USD(1'000)));
+            env(trust(alice, usd(2'000)));
+            env(pay(gw, alice, usd(1'000)));
             env.close();
 
-            env(trust(carol, USD(2'000)));
-            env(pay(gw, carol, USD(1'000)));
+            env(trust(carol, usd(2'000)));
+            env(pay(gw, carol, usd(1'000)));
             env.close();
 
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 200);
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            env(offer(alice, USD(100), MPT(101)));
+            env(offer(alice, usd(100), mpt(101)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{USD(100), MPT(101)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{usd(100), mpt(101)}}}));
 
-            env(offer(carol, MPT(101), USD(100)));
+            env(offer(carol, mpt(101), usd(100)));
             env.close();
 
-            BEAST_EXPECT(env.balance(alice, USD) == USD(1'100));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(900));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(1'100));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(900));
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 99));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 301));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 99));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 301));
         }
 
         // MPT/MPT
         {
             Env env{*this, features};
 
-            MPTTester mpt1(env, gw, {.holders = {alice, carol}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw, {.holders = {alice, carol}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
+            auto const mpt1 = mptTester1["MPT1"];
 
-            MPTTester mpt2(env, gw, {.holders = {alice, carol}, .fund = false});
-            mpt2.create(
+            MPTTester mptTester2(env, gw, {.holders = {alice, carol}, .fund = false});
+            mptTester2.create(
                 {.ownerCount = 2, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT2"];
+            auto const mpt2 = mptTester2["MPT2"];
 
-            mpt1.authorize({.account = alice});
-            mpt1.authorize({.account = carol});
-            mpt1.pay(gw, alice, 200);
-            mpt1.pay(gw, carol, 200);
+            mptTester1.authorize({.account = alice});
+            mptTester1.authorize({.account = carol});
+            mptTester1.pay(gw, alice, 200);
+            mptTester1.pay(gw, carol, 200);
 
-            mpt2.authorize({.account = alice});
-            mpt2.authorize({.account = carol});
-            mpt2.pay(gw, alice, 200);
-            mpt2.pay(gw, carol, 200);
+            mptTester2.authorize({.account = alice});
+            mptTester2.authorize({.account = carol});
+            mptTester2.pay(gw, alice, 200);
+            mptTester2.pay(gw, carol, 200);
 
-            env(offer(alice, MPT2(100), MPT1(101)));
+            env(offer(alice, mpt2(100), mpt1(101)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{MPT2(100), MPT1(101)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{mpt2(100), mpt1(101)}}}));
 
-            env(offer(carol, MPT1(101), MPT2(100)));
+            env(offer(carol, mpt1(101), mpt2(100)));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, carol, 0));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 99));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(carol, 301));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 300));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 100));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 99));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(carol, 301));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 300));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 100));
         }
     }
 
@@ -3807,83 +3806,83 @@ class MPToken_test : public beast::unit_test::suite
         Account const alice = Account("alice");
         Account const carol = Account("carol");
         Account const bob = Account("bob");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Loop
         {
             Env env{*this, features};
-            MPTTester mpt(env, gw, {.holders = {carol, bob}});
+            MPTTester mptTester(env, gw, {.holders = {carol, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            mpt.authorize({.account = bob});
+            mptTester.authorize({.account = bob});
 
             // holder to holder
-            env(pay(carol, bob, MPT(1)),
-                test::jtx::path(~MPT, ~USD, ~MPT),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH_LOOP));
+            env(pay(carol, bob, mpt(1)),
+                test::jtx::Path(~mpt, ~usd, ~mpt),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH_LOOP));
             env.close();
 
             // issuer to holder
-            env(pay(gw, bob, MPT(1)),
-                test::jtx::path(~MPT, ~USD, ~MPT),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH_LOOP));
+            env(pay(gw, bob, mpt(1)),
+                test::jtx::Path(~mpt, ~usd, ~mpt),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH_LOOP));
             env.close();
 
             // holder to issuer
-            env(pay(bob, gw, MPT(1)),
-                test::jtx::path(~MPT, ~USD, ~MPT),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH_LOOP));
+            env(pay(bob, gw, mpt(1)),
+                test::jtx::Path(~mpt, ~usd, ~mpt),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH_LOOP));
             env.close();
         }
 
         // Rippling
         {
             Env env{*this, features};
-            MPTTester mpt(env, gw, {.holders = {carol, bob}});
+            MPTTester mptTester(env, gw, {.holders = {carol, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            mpt.authorize({.account = bob});
+            mptTester.authorize({.account = bob});
 
             // holder to holder
-            env(pay(carol, bob, MPT(1)),
-                test::jtx::path(~MPT, gw),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(carol, bob, mpt(1)),
+                test::jtx::Path(~mpt, gw),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH));
             env.close();
 
             // issuer to holder
-            env(pay(gw, bob, MPT(1)),
-                test::jtx::path(~MPT, carol),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(gw, bob, mpt(1)),
+                test::jtx::Path(~mpt, carol),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH));
             env.close();
 
             // holder to issuer
-            env(pay(bob, gw, MPT(1)),
-                test::jtx::path(~MPT, carol),
-                sendmax(XRP(1)),
-                txflags(tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(bob, gw, mpt(1)),
+                test::jtx::Path(~mpt, carol),
+                Sendmax(XRP(1)),
+                Txflags(tfPartialPayment),
+                Ter(temBAD_PATH));
             env.close();
         }
 
@@ -3891,128 +3890,128 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features - featureMPTokensV2};
 
-            MPTTester mpt(env, gw, {.holders = {alice}});
+            MPTTester mptTester(env, gw, {.holders = {alice}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
+            mptTester.authorize({.account = alice});
 
-            env(pay(gw, alice, MPT(101)),
-                test::jtx::path(~MPT),
-                sendmax(XRP(100)),
-                txflags(tfPartialPayment),
-                ter(temMALFORMED));
+            env(pay(gw, alice, mpt(101)),
+                test::jtx::Path(~mpt),
+                Sendmax(XRP(100)),
+                Txflags(tfPartialPayment),
+                Ter(temMALFORMED));
         }
 
         {
             auto const ed = Account{"ed"};
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol, bob, ed);
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .mutableFlags = tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanTrade |
                      tmfMPTCanMutateCanTransfer});
-            MPTTester ETH(
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester const USD(
+            MPTTester const usd(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = MPTDEXFlags | tfMPTCanLock,
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester const CAD(
+            MPTTester const cad(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = MPTDEXFlags | tfMPTCanLock,
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
 
-            env(offer(bob, ETH(1'000), BTC(1'000)), txflags(tfPassive));
+            env(offer(bob, eth(1'000), btc(1'000)), Txflags(tfPassive));
             env.close();
-            env(offer(bob, BTC(1'000), ETH(1'000)), txflags(tfPassive));
+            env(offer(bob, btc(1'000), eth(1'000)), Txflags(tfPassive));
             env.close();
 
             // MPTokenIssuance doesn't exist
 
-            env(pay(alice, carol, MPT(gw, 1'000)(10)), sendmax(ETH(10)), ter(tecOBJECT_NOT_FOUND));
+            env(pay(alice, carol, MPT(gw, 1'000)(10)), Sendmax(eth(10)), Ter(tecOBJECT_NOT_FOUND));
             env.close();
-            env(pay(alice, carol, ETH(10)), sendmax(MPT(gw)(10)), ter(tecOBJECT_NOT_FOUND));
+            env(pay(alice, carol, eth(10)), Sendmax(MPT(gw)(10)), Ter(tecOBJECT_NOT_FOUND));
             env.close();
 
             // MPToken object doesn't exist
 
             // holder and issuer fail
-            env(pay(ed, carol, BTC(10)), sendmax(ETH(10)), ter(tecNO_AUTH));
-            env(pay(carol, ed, BTC(10)), sendmax(ETH(10)), ter(tecNO_AUTH));
-            env(pay(ed, gw, BTC(10)), sendmax(ETH(10)), ter(tecNO_AUTH));
-            env(pay(gw, ed, BTC(10)), sendmax(ETH(10)), ter(tecNO_AUTH));
+            env(pay(ed, carol, btc(10)), Sendmax(eth(10)), Ter(tecNO_AUTH));
+            env(pay(carol, ed, btc(10)), Sendmax(eth(10)), Ter(tecNO_AUTH));
+            env(pay(ed, gw, btc(10)), Sendmax(eth(10)), Ter(tecNO_AUTH));
+            env(pay(gw, ed, btc(10)), Sendmax(eth(10)), Ter(tecNO_AUTH));
             env.close();
 
             // MPTRequireAuth is set
 
-            BTC.authorize({.account = ed});
-            ETH.authorize({.account = ed});
-            env(pay(gw, ed, ETH(100)));
-            env(pay(gw, ed, BTC(100)));
+            btc.authorize({.account = ed});
+            eth.authorize({.account = ed});
+            env(pay(gw, ed, eth(100)));
+            env(pay(gw, ed, btc(100)));
             env.close();
-            BTC.set({.mutableFlags = tmfMPTSetRequireAuth});
+            btc.set({.mutableFlags = tmfMPTSetRequireAuth});
             // authorize bob to enable the offers trading
-            BTC.authorize({.account = gw, .holder = bob});
+            btc.authorize({.account = gw, .holder = bob});
             env.close();
-            env(pay(ed, carol, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecNO_AUTH));
-            env(pay(carol, ed, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecNO_AUTH));
+            env(pay(ed, carol, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecNO_AUTH));
+            env(pay(carol, ed, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecNO_AUTH));
             // BTC is transferred from bob to ed, ed is not authorized
-            env(pay(gw, ed, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecNO_AUTH));
+            env(pay(gw, ed, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecNO_AUTH));
             // BTC is transferred from bob to issuer
-            env(pay(ed, gw, BTC(10)), path(~BTC), sendmax(ETH(10)));
+            env(pay(ed, gw, btc(10)), Path(~btc), Sendmax(eth(10)));
             // BTC is transferred from issuer to bob
-            env(pay(gw, ed, ETH(10)), path(~ETH), sendmax(BTC(10)));
+            env(pay(gw, ed, eth(10)), Path(~eth), Sendmax(btc(10)));
             // BTC is transferred from ed to bob, ed is not authorized
-            env(pay(ed, gw, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tecNO_AUTH));
+            env(pay(ed, gw, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tecNO_AUTH));
             env.close();
-            BTC.set({.mutableFlags = tmfMPTClearRequireAuth});
+            btc.set({.mutableFlags = tmfMPTClearRequireAuth});
 
             // MPTCanTransfer is not set
 
             // Fail regardless if source/destination is the issuer or
             // not since the offer is owned by a holder.
-            BTC.set({.mutableFlags = tmfMPTClearCanTransfer});
-            env(pay(ed, carol, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecPATH_PARTIAL));
-            env(pay(carol, ed, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecPATH_PARTIAL));
-            env(pay(ed, carol, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tecPATH_PARTIAL));
-            env(pay(carol, ed, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tecPATH_PARTIAL));
+            btc.set({.mutableFlags = tmfMPTClearCanTransfer});
+            env(pay(ed, carol, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecPATH_PARTIAL));
+            env(pay(carol, ed, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecPATH_PARTIAL));
+            env(pay(ed, carol, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tecPATH_PARTIAL));
+            env(pay(carol, ed, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tecPATH_PARTIAL));
             // Fail because BTC, which has CanTransfer disabled, is sent to
             // bob
-            env(pay(ed, gw, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tecPATH_PARTIAL));
-            env(pay(ed, gw, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tesSUCCESS));
-            env(pay(gw, ed, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tesSUCCESS));
+            env(pay(ed, gw, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tecPATH_PARTIAL));
+            env(pay(ed, gw, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tesSUCCESS));
+            env(pay(gw, ed, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tesSUCCESS));
             // Fail because BTC, which has CanTransfer disabled, is sent to
             // ed
-            env(pay(gw, ed, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tecPATH_PARTIAL));
+            env(pay(gw, ed, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tecPATH_PARTIAL));
             env.close();
-            env(offer(gw, ETH(100), BTC(100)), txflags(tfPassive));
+            env(offer(gw, eth(100), btc(100)), Txflags(tfPassive));
             env.close();
-            env(offer(gw, BTC(100), ETH(100)), txflags(tfPassive));
+            env(offer(gw, btc(100), eth(100)), Txflags(tfPassive));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 2));
-            env(pay(ed, carol, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tesSUCCESS));
-            env(pay(ed, carol, ETH(10)), path(~ETH), sendmax(BTC(10)), ter(tesSUCCESS));
-            env(pay(gw, carol, BTC(10)), path(~BTC), sendmax(ETH(10)), ter(tesSUCCESS));
+            env(pay(ed, carol, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tesSUCCESS));
+            env(pay(ed, carol, eth(10)), Path(~eth), Sendmax(btc(10)), Ter(tesSUCCESS));
+            env(pay(gw, carol, btc(10)), Path(~btc), Sendmax(eth(10)), Ter(tesSUCCESS));
             env.close();
-            env(pay(ed, gw, BTC(10)), path(~BTC), sendmax(ETH(10)));
+            env(pay(ed, gw, btc(10)), Path(~btc), Sendmax(eth(10)));
             env.close();
         }
         // Multiple steps: CAD/USD, USD/BTC, BTC/ETH
@@ -4021,33 +4020,33 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol, bob, ed);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester ETH(
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester USD(
+            MPTTester usd(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = MPTDEXFlags | tfMPTCanLock,
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
-            MPTTester CAD(
+            MPTTester cad(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
-                 .flags = MPTDEXFlags | tfMPTCanLock,
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             // takerGets can transfer if:
             //  - CanTransfer is set
@@ -4060,77 +4059,77 @@ class MPToken_test : public beast::unit_test::suite
             //  - The offer's owner is the issuer
             //  - Previous step is BookStep, which transfers per above
             //  - CanTransfer is set
-            env(offer(bob, CAD(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), BTC(100)), txflags(tfPassive));
-            env(offer(bob, BTC(100), ETH(100)), txflags(tfPassive));
+            env(offer(bob, cad(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), btc(100)), Txflags(tfPassive));
+            env(offer(bob, btc(100), eth(100)), Txflags(tfPassive));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 3));
-            BTC.set({.mutableFlags = tmfMPTSetCanTransfer});
-            USD.set({.mutableFlags = tmfMPTClearCanTransfer});
+            btc.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearCanTransfer});
             // TakerGets
             // fail - CAD/USD is owned by bob
-            env(pay(alice, carol, ETH(1)),
-                path(~USD, ~BTC, ~ETH),
-                sendmax(CAD(1)),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice, carol, eth(1)),
+                Path(~usd, ~btc, ~eth),
+                Sendmax(cad(1)),
+                Ter(tecPATH_PARTIAL));
             auto seq(env.seq(gw));
-            env(offer(gw, USD(1), BTC(1)), txflags(tfPassive));
+            env(offer(gw, usd(1), btc(1)), Txflags(tfPassive));
             env.close();
             // fail - CAD/USD is owned by bob
-            env(pay(alice, carol, ETH(1)),
-                path(~USD, ~BTC, ~ETH),
-                sendmax(CAD(1)),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice, carol, eth(1)),
+                Path(~usd, ~btc, ~eth),
+                Sendmax(cad(1)),
+                Ter(tecPATH_PARTIAL));
             env.close();
-            env(offer_cancel(gw, seq));
-            env(offer(gw, CAD(1), USD(1)), txflags(tfPassive));
+            env(offerCancel(gw, seq));
+            env(offer(gw, cad(1), usd(1)), Txflags(tfPassive));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 3));
             // succeed - CAD/USD is owned by issuer
-            env(pay(alice, carol, ETH(1)), path(~USD, ~BTC, ~ETH), sendmax(CAD(1)));
+            env(pay(alice, carol, eth(1)), Path(~usd, ~btc, ~eth), Sendmax(cad(1)));
             env.close();
             // bob's CAD/USD is deleted
             BEAST_EXPECT(expectOffers(env, bob, 2));
-            env(offer(bob, CAD(100), USD(100)), txflags(tfPassive));
+            env(offer(bob, cad(100), usd(100)), Txflags(tfPassive));
             BEAST_EXPECT(expectOffers(env, gw, 0));
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            ETH.set({.mutableFlags = tmfMPTClearCanTransfer});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
+            eth.set({.mutableFlags = tmfMPTClearCanTransfer});
             // fail - BTC/ETH is owned by bob, destination is carol
-            env(pay(alice, carol, ETH(1)),
-                path(~USD, ~BTC, ~ETH),
-                sendmax(CAD(1)),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice, carol, eth(1)),
+                Path(~usd, ~btc, ~eth),
+                Sendmax(cad(1)),
+                Ter(tecPATH_PARTIAL));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 3));
             // succeed - destination is an issuer
-            env(pay(alice, gw, ETH(1)), path(~USD, ~BTC, ~ETH), sendmax(CAD(1)));
+            env(pay(alice, gw, eth(1)), Path(~usd, ~btc, ~eth), Sendmax(cad(1)));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 3));
             // TakerPays
-            ETH.set({.mutableFlags = tmfMPTSetCanTransfer});
-            CAD.set({.mutableFlags = tmfMPTClearCanTransfer});
+            eth.set({.mutableFlags = tmfMPTSetCanTransfer});
+            cad.set({.mutableFlags = tmfMPTClearCanTransfer});
             // fail - CAD/USD is owned by bob, source is alice
-            env(pay(alice, carol, ETH(1)),
-                path(~USD, ~BTC, ~ETH),
-                sendmax(CAD(1)),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice, carol, eth(1)),
+                Path(~usd, ~btc, ~eth),
+                Sendmax(cad(1)),
+                Ter(tecPATH_PARTIAL));
             // succeed - source is the issuer
-            env(pay(gw, carol, ETH(1)), path(~USD, ~BTC, ~ETH), sendmax(CAD(1)));
+            env(pay(gw, carol, eth(1)), Path(~usd, ~btc, ~eth), Sendmax(cad(1)));
             env.close();
-            env(offer(gw, CAD(1), USD(1)), txflags(tfPassive));
+            env(offer(gw, cad(1), usd(1)), Txflags(tfPassive));
             env.close();
             // succeed - CAD/USD is owned by issuer
-            env(pay(alice, carol, ETH(1)), path(~USD, ~BTC, ~ETH), sendmax(CAD(1)));
+            env(pay(alice, carol, eth(1)), Path(~usd, ~btc, ~eth), Sendmax(cad(1)));
             env.close();
             BEAST_EXPECT(expectOffers(env, gw, 0));
             BEAST_EXPECT(expectOffers(env, bob, 2));
-            CAD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            BTC.set({.mutableFlags = tmfMPTClearCanTransfer});
-            env(offer(bob, CAD(1), USD(1)), txflags(tfPassive));
-            env(offer(gw, USD(1), BTC(1)), txflags(tfPassive));
+            cad.set({.mutableFlags = tmfMPTSetCanTransfer});
+            btc.set({.mutableFlags = tmfMPTClearCanTransfer});
+            env(offer(bob, cad(1), usd(1)), Txflags(tfPassive));
+            env(offer(gw, usd(1), btc(1)), Txflags(tfPassive));
             env.close();
             // succeed - USD/BTC is owned by issuer
-            env(pay(alice, carol, ETH(1)), path(~USD, ~BTC, ~ETH), sendmax(CAD(1)));
+            env(pay(alice, carol, eth(1)), Path(~usd, ~btc, ~eth), Sendmax(cad(1)));
             env.close();
             BEAST_EXPECT(expectOffers(env, gw, 0));
         }
@@ -4140,21 +4139,21 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol, bob);
             env.close();
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
                  .flags = tfMPTCanTransfer,
                  .mutableFlags = tmfMPTCanMutateCanTrade});
-            MPTTester const ETH(
+            MPTTester const eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 1'000,
                  .flags = tfMPTCanTransfer | tfMPTCanTrade,
                  .mutableFlags = tmfMPTCanMutateCanTrade});
-            MPTTester const USD(
+            MPTTester const usd(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
@@ -4162,20 +4161,20 @@ class MPToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanTransfer | tfMPTCanTrade,
                  .mutableFlags = tmfMPTCanMutateCanTrade});
 
-            env(pay(alice, carol, ETH(1)), path(~ETH), sendmax(BTC(1)), ter(tecNO_PERMISSION));
-            env(pay(alice, carol, BTC(1)), path(~BTC), sendmax(ETH(1)), ter(tecNO_PERMISSION));
+            env(pay(alice, carol, eth(1)), Path(~eth), Sendmax(btc(1)), Ter(tecNO_PERMISSION));
+            env(pay(alice, carol, btc(1)), Path(~btc), Sendmax(eth(1)), Ter(tecNO_PERMISSION));
             env.close();
 
-            BTC.set({.mutableFlags = tmfMPTSetCanTrade});
-            env(offer(bob, XRP(1), BTC(1)));
-            env(offer(bob, BTC(1), ETH(1)));
-            env(offer(bob, ETH(1), USD(1)));
+            btc.set({.mutableFlags = tmfMPTSetCanTrade});
+            env(offer(bob, XRP(1), btc(1)));
+            env(offer(bob, btc(1), eth(1)));
+            env(offer(bob, eth(1), usd(1)));
             env.close();
-            BTC.set({.mutableFlags = tmfMPTClearCanTrade});
-            env(pay(gw, carol, USD(1)),
-                path(~BTC, ~ETH, ~USD),
-                sendmax(XRP(1)),
-                ter(tecPATH_PARTIAL));
+            btc.set({.mutableFlags = tmfMPTClearCanTrade});
+            env(pay(gw, carol, usd(1)),
+                Path(~btc, ~eth, ~usd),
+                Sendmax(XRP(1)),
+                Ter(tecPATH_PARTIAL));
             env.close();
             BEAST_EXPECT(expectOffers(env, bob, 3));
         }
@@ -4208,19 +4207,19 @@ class MPToken_test : public beast::unit_test::suite
                 }
             };
             auto getMPT = [&](Env& env) {
-                MPTTester const BTC(
+                MPTTester const btc(
                     {.env = env,
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .pay = 100,
-                     .flags = tfMPTCanLock | MPTDEXFlags});
-                MPTTester const ETH(
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                MPTTester const eth(
                     {.env = env,
                      .issuer = gw,
                      .holders = {alice, carol, bob},
                      .pay = 100,
-                     .flags = tfMPTCanLock | MPTDEXFlags});
-                return std::make_pair(BTC, ETH);
+                     .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+                return std::make_pair(btc, eth);
             };
             auto getIOU = [&](Env& env) {
                 for (auto const& iou : {gw["BTC"], gw["ETH"]})
@@ -4268,36 +4267,36 @@ class MPToken_test : public beast::unit_test::suite
                 Env env(*this);
                 env.fund(XRP(1'000), gw, alice, carol, bob);
 
-                auto [BTC, ETH] = getTokens(env);
+                auto [btc, eth] = getTokens(env);
 
-                env(offer(arg.offerOwner, ETH(10), BTC(10)), txflags(tfPassive));
+                env(offer(arg.offerOwner, eth(10), btc(10)), Txflags(tfPassive));
                 env.close();
 
                 if (arg.globalFlagBuy != LockType::None)
                 {
-                    lock(env, gw, ETH, LockType::Global);
+                    lock(env, gw, eth, LockType::Global);
                 }
                 else
                 {
-                    lock(env, arg.offerOwner, ETH, arg.offerFlagBuy);
-                    lock(env, arg.src, ETH, arg.srcFlag);
+                    lock(env, arg.offerOwner, eth, arg.offerFlagBuy);
+                    lock(env, arg.src, eth, arg.srcFlag);
                 }
                 if (arg.globalFlagSell != LockType::None)
                 {
-                    lock(env, gw, BTC, LockType::Global);
+                    lock(env, gw, btc, LockType::Global);
                 }
                 else
                 {
-                    lock(env, arg.offerOwner, BTC, arg.offerFlagSell);
-                    lock(env, arg.dst, BTC, arg.dstFlag);
+                    lock(env, arg.offerOwner, btc, arg.offerFlagSell);
+                    lock(env, arg.dst, btc, arg.dstFlag);
                 }
 
-                auto const err = getErr(ETH, arg);
-                env(pay(arg.src, arg.dst, BTC(1)),
-                    path(~BTC),
-                    txflags(tfNoRippleDirect),
-                    sendmax(ETH(1)),
-                    ter(err));
+                auto const err = getErr(eth, arg);
+                env(pay(arg.src, arg.dst, btc(1)),
+                    Path(~btc),
+                    Txflags(tfNoRippleDirect),
+                    Sendmax(eth(1)),
+                    Ter(err));
                 env.close();
             };
             // clang-format off
@@ -4341,48 +4340,48 @@ class MPToken_test : public beast::unit_test::suite
         }
         {
             Env env(*this);
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(1'000), gw, alice, carol, bob);
-            MPTTester BTC(
+            MPTTester btc(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 100,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
-            MPTTester ETH(
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
+            MPTTester eth(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol, bob},
                  .pay = 100,
-                 .flags = tfMPTCanLock | MPTDEXFlags});
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS});
 
-            env(trust(alice, USD(100)));
-            env(pay(gw, alice, USD(100)));
-            env(trust(carol, USD(100)));
+            env(trust(alice, usd(100)));
+            env(pay(gw, alice, usd(100)));
+            env(trust(carol, usd(100)));
 
-            env(offer(alice, XRP(10), ETH(10)));
-            env(offer(bob, ETH(10), BTC(10)));
-            env(offer(alice, BTC(10), USD(10)));
+            env(offer(alice, XRP(10), eth(10)));
+            env(offer(bob, eth(10), btc(10)));
+            env(offer(alice, btc(10), usd(10)));
             env.close();
 
-            BTC.set({.holder = bob, .flags = tfMPTLock});
+            btc.set({.holder = bob, .flags = tfMPTLock});
 
             // Bob's offer is unfunded
-            env(pay(alice, carol, USD(1)),
-                path(~(MPT)ETH, ~(MPT)BTC, ~USD),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                sendmax(XRP(1)),
-                ter(tecPATH_DRY));
+            env(pay(alice, carol, usd(1)),
+                Path(~(MPT)eth, ~(MPT)btc, ~usd),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Sendmax(XRP(1)),
+                Ter(tecPATH_DRY));
             env.close();
 
-            BTC.set({.holder = bob, .flags = tfMPTUnlock});
-            ETH.set({.holder = bob, .flags = tfMPTLock});
+            btc.set({.holder = bob, .flags = tfMPTUnlock});
+            eth.set({.holder = bob, .flags = tfMPTLock});
 
-            env(pay(alice, carol, USD(1)),
-                path(~(MPT)ETH, ~(MPT)BTC, ~USD),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                sendmax(XRP(1)),
-                ter(tecPATH_DRY));
+            env(pay(alice, carol, usd(1)),
+                Path(~(MPT)eth, ~(MPT)btc, ~usd),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Sendmax(XRP(1)),
+                Ter(tecPATH_DRY));
         }
 
         // A domain payment should only consume a USD/MPT offer with a domain.
@@ -4394,25 +4393,25 @@ class MPToken_test : public beast::unit_test::suite
             auto const domainID =
                 setupDomain(env, {alice, bob, carol, gw}, domainOwner, "permdex-cred");
 
-            MPTTester BTC({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
-            MPTTester ETH({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
+            MPTTester btc({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
+            MPTTester eth({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
 
             auto test = [&](bool withDomain) {
                 if (withDomain)
                 {
-                    env(offer(bob, ETH(1), BTC(1)), domain(domainID));
+                    env(offer(bob, eth(1), btc(1)), Domain(domainID));
                 }
                 else
                 {
-                    env(offer(bob, ETH(1), BTC(1)));
+                    env(offer(bob, eth(1), btc(1)));
                 }
 
-                auto const err = withDomain ? ter(tesSUCCESS) : ter(tecPATH_DRY);
-                env(pay(alice, carol, BTC(1)),
-                    path(~(MPT)BTC),
-                    txflags(tfPartialPayment),
-                    sendmax(ETH(1)),
-                    domain(domainID),
+                auto const err = withDomain ? Ter(tesSUCCESS) : Ter(tecPATH_DRY);
+                env(pay(alice, carol, btc(1)),
+                    Path(~(MPT)btc),
+                    Txflags(tfPartialPayment),
+                    Sendmax(eth(1)),
+                    Domain(domainID),
                     err);
             };
             test(true);
@@ -4428,18 +4427,18 @@ class MPToken_test : public beast::unit_test::suite
             auto const domainID =
                 setupDomain(env, {alice, bob, carol, gw}, domainOwner, "permdex-cred");
 
-            MPTTester BTC({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
-            MPTTester ETH({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
+            MPTTester btc({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
+            MPTTester eth({.env = env, .issuer = gw, .holders = {alice, carol, bob}, .pay = 100});
 
             auto test = [&](bool isHybrid) {
                 auto const flags = isHybrid ? tfHybrid : 0;
-                env(offer(bob, ETH(1), BTC(1)), txflags(flags), domain(domainID));
+                env(offer(bob, eth(1), btc(1)), Txflags(flags), Domain(domainID));
 
-                auto const err = isHybrid ? ter(tesSUCCESS) : ter(tecPATH_DRY);
-                env(pay(alice, carol, BTC(1)),
-                    path(~(MPT)BTC),
-                    txflags(tfPartialPayment),
-                    sendmax(ETH(1)),
+                auto const err = isHybrid ? Ter(tesSUCCESS) : Ter(tecPATH_DRY);
+                env(pay(alice, carol, btc(1)),
+                    Path(~(MPT)btc),
+                    Txflags(tfPartialPayment),
+                    Sendmax(eth(1)),
                     err);
             };
             test(true);
@@ -4449,258 +4448,259 @@ class MPToken_test : public beast::unit_test::suite
         // MPT/XRP
         {
             Env env{*this, features};
-            MPTTester mpt(env, gw, {.holders = {alice, carol, bob}});
+            MPTTester mptTester(env, gw, {.holders = {alice, carol, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 200);
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            mpt.authorize({.account = bob});
+            mptTester.authorize({.account = bob});
 
-            env(offer(alice, XRP(100), MPT(101)));
+            env(offer(alice, XRP(100), mpt(101)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(100), MPT(101)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{XRP(100), mpt(101)}}}));
 
-            env(pay(carol, bob, MPT(101)),
-                test::jtx::path(~MPT),
-                sendmax(XRP(100)),
-                txflags(tfPartialPayment));
+            env(pay(carol, bob, mpt(101)),
+                test::jtx::Path(~mpt),
+                Sendmax(XRP(100)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 99));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(bob, 101));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 99));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(bob, 101));
         }
 
         // MPT/IOU
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol, bob}});
+            MPTTester mptTester(env, gw, {.holders = {alice, carol, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            env(trust(alice, USD(2'000)));
-            env(pay(gw, alice, USD(1'000)));
-            env(trust(bob, USD(2'000)));
-            env(pay(gw, bob, USD(1'000)));
-            env(trust(carol, USD(2'000)));
-            env(pay(gw, carol, USD(1'000)));
+            env(trust(alice, usd(2'000)));
+            env(pay(gw, alice, usd(1'000)));
+            env(trust(bob, usd(2'000)));
+            env(pay(gw, bob, usd(1'000)));
+            env(trust(carol, usd(2'000)));
+            env(pay(gw, carol, usd(1'000)));
             env.close();
 
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 200);
 
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            mpt.authorize({.account = bob});
+            mptTester.authorize({.account = bob});
 
-            env(offer(alice, USD(100), MPT(101)));
+            env(offer(alice, usd(100), mpt(101)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{USD(100), MPT(101)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{usd(100), mpt(101)}}}));
 
-            env(pay(carol, bob, MPT(101)),
-                test::jtx::path(~MPT),
-                sendmax(USD(100)),
-                txflags(tfPartialPayment));
+            env(pay(carol, bob, mpt(101)),
+                test::jtx::Path(~mpt),
+                Sendmax(usd(100)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(900));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 99));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(bob, 101));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(900));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 99));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(bob, 101));
         }
 
         // IOU/MPT
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol, bob}});
+            MPTTester mptTester(env, gw, {.holders = {alice, carol, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            env(trust(alice, USD(2'000)), txflags(tfClearNoRipple));
-            env(pay(gw, alice, USD(1'000)));
-            env(trust(bob, USD(2'000)), txflags(tfClearNoRipple));
+            env(trust(alice, usd(2'000)), Txflags(tfClearNoRipple));
+            env(pay(gw, alice, usd(1'000)));
+            env(trust(bob, usd(2'000)), Txflags(tfClearNoRipple));
             env.close();
 
-            mpt.authorize({.account = alice});
-            env(pay(gw, alice, MPT(200)));
+            mptTester.authorize({.account = alice});
+            env(pay(gw, alice, mpt(200)));
 
-            mpt.authorize({.account = carol});
-            env(pay(gw, carol, MPT(200)));
+            mptTester.authorize({.account = carol});
+            env(pay(gw, carol, mpt(200)));
 
-            env(offer(alice, MPT(101), USD(100)));
+            env(offer(alice, mpt(101), usd(100)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{MPT(101), USD(100)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{mpt(101), usd(100)}}}));
 
-            env(pay(carol, bob, USD(100)),
-                test::jtx::path(~USD),
-                sendmax(MPT(101)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, usd(100)),
+                test::jtx::Path(~usd),
+                Sendmax(mpt(101)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(900));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 301));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 99));
-            BEAST_EXPECT(env.balance(bob, USD) == USD(100));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(900));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 301));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 99));
+            BEAST_EXPECT(env.balance(bob, usd) == usd(100));
         }
 
         // MPT/MPT
         {
             Env env{*this, features};
 
-            MPTTester mpt1(env, gw, {.holders = {alice, carol, bob}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw, {.holders = {alice, carol, bob}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
+            auto const mpt1 = mptTester1["MPT1"];
 
-            MPTTester mpt2(env, gw, {.holders = {alice, carol, bob}, .fund = false});
-            mpt2.create(
+            MPTTester mptTester2(env, gw, {.holders = {alice, carol, bob}, .fund = false});
+            mptTester2.create(
                 {.ownerCount = 2, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT2"];
+            auto const mpt2 = mptTester2["MPT2"];
 
-            mpt1.authorize({.account = alice});
-            mpt1.pay(gw, alice, 200);
-            mpt2.authorize({.account = alice});
+            mptTester1.authorize({.account = alice});
+            mptTester1.pay(gw, alice, 200);
+            mptTester2.authorize({.account = alice});
 
-            mpt2.authorize({.account = carol});
-            mpt2.pay(gw, carol, 200);
+            mptTester2.authorize({.account = carol});
+            mptTester2.pay(gw, carol, 200);
 
-            mpt1.authorize({.account = bob});
-            mpt2.authorize({.account = bob});
-            mpt2.pay(gw, bob, 200);
+            mptTester1.authorize({.account = bob});
+            mptTester2.authorize({.account = bob});
+            mptTester2.pay(gw, bob, 200);
 
-            env(offer(alice, MPT2(100), MPT1(100)));
+            env(offer(alice, mpt2(100), mpt1(100)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{MPT2(100), MPT1(100)}}}));
+            BEAST_EXPECT(
+                expectOffers(env, alice, 1, {{Amounts{mptTester2(100), mptTester1(100)}}}));
 
             // holder to holder
-            env(pay(carol, bob, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(carol, bob, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 190));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 10));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(200));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(400));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 10));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 190));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 10));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(200));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(400));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 10));
 
             // issuer to holder
-            env(pay(gw, bob, MPT1(20)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(20)),
-                txflags(tfPartialPayment));
+            env(pay(gw, bob, mpt1(20)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(20)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 170));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 30));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(200));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(420));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 30));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 170));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 30));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(200));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(420));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 30));
 
             // holder to issuer
-            env(pay(bob, gw, MPT1(70)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(70)),
-                txflags(tfPartialPayment));
+            env(pay(bob, gw, mpt1(70)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(70)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 100));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 100));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(130));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(420));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 30));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 130));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(130));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(420));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 30));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 130));
         }
 
         // MPT/MPT, issuer owns the offer
         {
             Env env{*this, features};
 
-            MPTTester mpt1(env, gw, {.holders = {carol, bob}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw, {.holders = {carol, bob}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
+            auto const mpt1 = mptTester1["MPT1"];
 
-            MPTTester mpt2(env, gw, {.holders = {carol, bob}, .fund = false});
-            mpt2.create(
+            MPTTester mptTester2(env, gw, {.holders = {carol, bob}, .fund = false});
+            mptTester2.create(
                 {.ownerCount = 2, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT2"];
+            auto const mpt2 = mptTester2["MPT2"];
 
-            mpt2.authorize({.account = carol});
-            mpt2.pay(gw, carol, 200);
+            mptTester2.authorize({.account = carol});
+            mptTester2.pay(gw, carol, 200);
 
-            mpt1.authorize({.account = bob});
-            mpt2.authorize({.account = bob});
-            mpt2.pay(gw, bob, 200);
+            mptTester1.authorize({.account = bob});
+            mptTester2.authorize({.account = bob});
+            mptTester2.pay(gw, bob, 200);
 
-            env(offer(gw, MPT2(100), MPT1(100)));
+            env(offer(gw, mpt2(100), mpt1(100)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, gw, 1, {{Amounts{MPT2(100), MPT1(100)}}}));
+            BEAST_EXPECT(expectOffers(env, gw, 1, {{Amounts{mpt2(100), mpt1(100)}}}));
 
             // holder to holder
-            env(pay(carol, bob, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(carol, bob, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, gw, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(10));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(390));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 10));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(10));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(390));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 10));
 
             // issuer to holder
-            env(pay(gw, bob, MPT1(20)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(20)),
-                txflags(tfPartialPayment));
+            env(pay(gw, bob, mpt1(20)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(20)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, gw, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(30));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(390));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 30));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(30));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(390));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 30));
 
             // holder to issuer
-            env(pay(bob, gw, MPT1(70)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(70)),
-                txflags(tfPartialPayment));
+            env(pay(bob, gw, mpt1(70)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(70)),
+                Txflags(tfPartialPayment));
             env.close();
 
             BEAST_EXPECT(expectOffers(env, gw, 0));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(30));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(320));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 30));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 130));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(30));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(320));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 30));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 130));
         }
 
         // MPT/MPT, different issuer
@@ -4708,240 +4708,240 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             Account const gw1{"gw1"};
 
-            MPTTester mpt1(env, gw, {.holders = {alice, carol, bob}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw, {.holders = {alice, carol, bob}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
+            auto const mpt1 = mptTester1["MPT1"];
 
             env.fund(XRP(1'000), gw1);
-            MPTTester mpt2(env, gw1, {.holders = {alice, carol, bob}, .fund = false});
-            mpt2.create(
+            MPTTester mptTester2(env, gw1, {.holders = {alice, carol, bob}, .fund = false});
+            mptTester2.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT2"];
+            auto const mpt2 = mptTester2["MPT2"];
 
-            mpt1.authorize({.account = alice});
-            mpt1.pay(gw, alice, 200);
-            mpt2.authorize({.account = alice});
+            mptTester1.authorize({.account = alice});
+            mptTester1.pay(gw, alice, 200);
+            mptTester2.authorize({.account = alice});
 
-            mpt2.authorize({.account = carol});
-            mpt2.pay(gw1, carol, 200);
+            mptTester2.authorize({.account = carol});
+            mptTester2.pay(gw1, carol, 200);
 
-            mpt1.authorize({.account = bob});
-            mpt1.pay(gw, bob, 200);
-            mpt2.authorize({.account = bob});
-            mpt2.pay(gw1, bob, 200);
+            mptTester1.authorize({.account = bob});
+            mptTester1.pay(gw, bob, 200);
+            mptTester2.authorize({.account = bob});
+            mptTester2.pay(gw1, bob, 200);
 
-            mpt1.authorize({.account = gw1});
-            mpt1.pay(gw, gw1, 200);
+            mptTester1.authorize({.account = gw1});
+            mptTester1.pay(gw, gw1, 200);
 
-            mpt2.authorize({.account = gw});
-            mpt2.pay(gw1, gw, 200);
+            mptTester2.authorize({.account = gw});
+            mptTester2.pay(gw1, gw, 200);
 
-            env(offer(alice, MPT2(100), MPT1(100)));
+            env(offer(alice, mpt2(100), mpt1(100)));
             env.close();
-            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{MPT2(100), MPT1(100)}}}));
+            BEAST_EXPECT(expectOffers(env, alice, 1, {{Amounts{mpt2(100), mpt1(100)}}}));
 
-            env(pay(carol, bob, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(carol, bob, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(600));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(600));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 200));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 200));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(carol, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 210));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 200));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 190));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 10));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(600));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(600));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 200));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 200));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(carol, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 210));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 200));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 190));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 10));
 
-            env(pay(bob, gw, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(bob, gw, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(590));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(600));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 200));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 200));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 210));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 180));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 20));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(590));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(600));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 200));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 200));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 210));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 180));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 20));
 
-            env(pay(gw, bob, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(gw, bob, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(590));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(600));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 200));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 220));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 170));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 30));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(590));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(600));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 200));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 220));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 170));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 30));
 
-            env(pay(bob, gw1, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(bob, gw1, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(590));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(600));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 210));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 220));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 180));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 160));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 40));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(590));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(600));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 210));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 220));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 180));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 160));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 40));
 
-            env(pay(gw1, bob, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(gw1, bob, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(590));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(610));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 210));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 190));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 230));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(bob, 180));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 150));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 50));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(590));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(610));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 210));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 190));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 230));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(bob, 180));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 150));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 50));
 
-            env(pay(gw, gw1, MPT1(10)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(10)),
-                txflags(tfPartialPayment));
+            env(pay(gw, gw1, mpt1(10)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(10)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 1));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(590));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(610));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 220));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 180));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 140));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 60));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(590));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(610));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 220));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 180));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 140));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 60));
 
-            env(pay(gw1, gw, MPT1(40)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(40)),
-                txflags(tfPartialPayment));
+            env(pay(gw1, gw, mpt1(40)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(40)),
+                Txflags(tfPartialPayment));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 0));
-            BEAST_EXPECT(mpt1.checkMPTokenOutstandingAmount(550));
-            BEAST_EXPECT(mpt2.checkMPTokenOutstandingAmount(650));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(gw1, 220));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(gw, 180));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(alice, 100));
-            BEAST_EXPECT(mpt2.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester1.checkMPTokenOutstandingAmount(550));
+            BEAST_EXPECT(mptTester2.checkMPTokenOutstandingAmount(650));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(gw1, 220));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(gw, 180));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester2.checkMPTokenAmount(alice, 100));
         }
 
-        // MPT/IOU IOU/MPT1
+        // MPT/IOU IOU/mpt1
         {
             Env env = pathTestEnv(*this);
             Account const gw1{"gw1"};
             Account const gw2{"gw2"};
             Account const dan{"dan"};
             env.fund(XRP(1'000), gw2);
-            auto const USD = gw2["USD"];
+            auto const usd = gw2["USD"];
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            MPTTester mpt1(env, gw1, {.holders = {bob, dan}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw1, {.holders = {bob, dan}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
-            mpt1.authorize({.account = bob});
-            mpt1.pay(gw1, bob, 200);
-            mpt1.authorize({.account = dan});
+            auto const mpt1 = mptTester1["MPT1"];
+            mptTester1.authorize({.account = bob});
+            mptTester1.pay(gw1, bob, 200);
+            mptTester1.authorize({.account = dan});
 
-            env(trust(alice, USD(400)));
-            env(pay(gw2, alice, USD(200)));
-            env(trust(bob, USD(400)));
+            env(trust(alice, usd(400)));
+            env(pay(gw2, alice, usd(200)));
+            env(trust(bob, usd(400)));
 
-            env(offer(alice, MPT(100), USD(100)));
-            env(offer(bob, USD(100), MPT1(100)));
+            env(offer(alice, mpt(100), usd(100)));
+            env(offer(bob, usd(100), mpt1(100)));
             env.close();
 
-            env(pay(carol, dan, MPT1(100)),
-                sendmax(MPT(100)),
-                path(~USD, ~MPT1),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, dan, mpt1(100)),
+                Sendmax(mpt(100)),
+                Path(~usd, ~mpt1),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
             BEAST_EXPECT(expectOffers(env, alice, 0));
             BEAST_EXPECT(expectOffers(env, bob, 0));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 100));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(dan, 100));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 100));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(dan, 100));
         }
 
         // XRP/MPT AMM
         {
             Env env{*this, features};
 
-            fund(env, gw, {alice, carol, bob}, XRP(11'000), {USD(20'000)});
+            fund(env, gw, {alice, carol, bob}, XRP(11'000), {usd(20'000)});
 
-            MPTTester mpt(env, gw, {.fund = false});
+            MPTTester mptTester(env, gw, {.fund = false});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = bob});
-            mpt.pay(gw, alice, 10'100);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = bob});
+            mptTester.pay(gw, alice, 10'100);
 
-            AMM const amm(env, alice, XRP(10'000), MPT(10'100));
+            AMM const amm(env, alice, XRP(10'000), mpt(10'100));
 
-            env(pay(carol, bob, MPT(100)),
-                test::jtx::path(~MPT),
-                sendmax(XRP(100)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, mpt(100)),
+                test::jtx::Path(~mpt),
+                Sendmax(XRP(100)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(XRP(10'100), MPT(10'000), amm.tokens()));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(bob, 100));
+            BEAST_EXPECT(amm.expectBalances(XRP(10'100), mpt(10'000), amm.tokens()));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(bob, 100));
         }
 
         // IOU/MPT AMM
         {
             Env env{*this, features};
 
-            fund(env, gw, {alice, carol, bob}, XRP(11'000), {USD(20'000)});
+            fund(env, gw, {alice, carol, bob}, XRP(11'000), {usd(20'000)});
 
-            MPTTester mpt(env, gw, {.fund = false});
+            MPTTester mptTester(env, gw, {.fund = false});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = bob});
-            mpt.pay(gw, alice, 10'100);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = bob});
+            mptTester.pay(gw, alice, 10'100);
 
-            AMM const amm(env, alice, USD(10'000), MPT(10'100));
+            AMM const amm(env, alice, usd(10'000), mpt(10'100));
 
-            env(pay(carol, bob, MPT(100)),
-                test::jtx::path(~MPT),
-                sendmax(USD(100)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, mpt(100)),
+                test::jtx::Path(~mpt),
+                Sendmax(usd(100)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(USD(10'100), MPT(10'000), amm.tokens()));
-            BEAST_EXPECT(mpt.checkMPTokenAmount(bob, 100));
+            BEAST_EXPECT(amm.expectBalances(usd(10'100), mpt(10'000), amm.tokens()));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(bob, 100));
         }
 
         // MPT/MPT AMM cross-asset payment
@@ -4950,123 +4950,123 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(20'000), gw, alice, carol, bob);
             env.close();
 
-            MPTTester mpt1(env, gw, {.fund = false});
-            mpt1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
-            mpt1.authorize({.account = alice});
-            mpt1.authorize({.account = bob});
-            mpt1.pay(gw, alice, 10'100);
+            MPTTester mptTester1(env, gw, {.fund = false});
+            mptTester1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt1 = mptTester1["MPT1"];
+            mptTester1.authorize({.account = alice});
+            mptTester1.authorize({.account = bob});
+            mptTester1.pay(gw, alice, 10'100);
 
-            MPTTester mpt2(env, gw, {.fund = false});
-            mpt2.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT1"];
-            mpt2.authorize({.account = alice});
-            mpt2.authorize({.account = bob});
-            mpt2.authorize({.account = carol});
-            mpt2.pay(gw, alice, 10'100);
-            mpt2.pay(gw, carol, 100);
+            MPTTester mptTester2(env, gw, {.fund = false});
+            mptTester2.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt2 = mptTester2["MPT1"];
+            mptTester2.authorize({.account = alice});
+            mptTester2.authorize({.account = bob});
+            mptTester2.authorize({.account = carol});
+            mptTester2.pay(gw, alice, 10'100);
+            mptTester2.pay(gw, carol, 100);
 
-            AMM const amm(env, alice, MPT2(10'000), MPT1(10'100));
+            AMM const amm(env, alice, mpt2(10'000), mpt1(10'100));
 
-            env(pay(carol, bob, MPT1(100)),
-                test::jtx::path(~MPT1),
-                sendmax(MPT2(100)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, mpt1(100)),
+                test::jtx::Path(~mpt1),
+                Sendmax(mpt2(100)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
-            BEAST_EXPECT(amm.expectBalances(MPT2(10'100), MPT1(10'000), amm.tokens()));
-            BEAST_EXPECT(mpt1.checkMPTokenAmount(bob, 100));
+            BEAST_EXPECT(amm.expectBalances(mpt2(10'100), mpt1(10'000), amm.tokens()));
+            BEAST_EXPECT(mptTester1.checkMPTokenAmount(bob, 100));
         }
 
         // Multi-steps with AMM
         // EUR/MPT1 MPT1/MPT2 MPT2/USD USD/CRN AMM:CRN/MPT MPT/YAN
         {
             Env env{*this, features};
-            auto const USD = gw["USD"];
-            auto const EUR = gw["EUR"];
-            auto const CRN = gw["CRN"];
-            auto const YAN = gw["YAN"];
+            auto const usd = gw["USD"];
+            auto const eur = gw["EUR"];
+            auto const crn = gw["CRN"];
+            auto const yan = gw["YAN"];
 
             fund(
                 env,
                 gw,
                 {alice, carol, bob},
                 XRP(1'000),
-                {USD(1'000), EUR(1'000), CRN(2'000), YAN(1'000)});
+                {usd(1'000), eur(1'000), crn(2'000), yan(1'000)});
 
             auto createMPT = [&]() -> std::pair<MPTTester, MPT> {
-                MPTTester mpt(env, gw, {.fund = false});
-                mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-                mpt.authorize({.account = alice});
-                mpt.pay(gw, alice, 2'000);
-                return {mpt, mpt["MPT"]};
+                MPTTester mptTester(env, gw, {.fund = false});
+                mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+                mptTester.authorize({.account = alice});
+                mptTester.pay(gw, alice, 2'000);
+                return {mptTester, mptTester["MPT"]};
             };
 
-            auto const [mpt1, MPT1] = createMPT();
-            auto const [mpt2, MPT2] = createMPT();
-            auto const [mpt3, MPT3] = createMPT();
+            auto const [mptTester1, mpt1] = createMPT();
+            auto const [mptTester2, mpt2] = createMPT();
+            auto const [mptTester3, mpt3] = createMPT();
 
-            env(offer(alice, EUR(100), MPT1(101)));
-            env(offer(alice, MPT1(101), MPT2(102)));
-            env(offer(alice, MPT2(102), USD(103)));
-            env(offer(alice, USD(103), CRN(104)));
+            env(offer(alice, eur(100), mpt1(101)));
+            env(offer(alice, mpt1(101), mpt2(102)));
+            env(offer(alice, mpt2(102), usd(103)));
+            env(offer(alice, usd(103), crn(104)));
             env.close();
-            AMM const amm(env, alice, CRN(1'000), MPT3(1'104));
-            env(offer(alice, MPT3(104), YAN(100)));
+            AMM const amm(env, alice, crn(1'000), mpt3(1'104));
+            env(offer(alice, mpt3(104), yan(100)));
 
-            env(pay(carol, bob, YAN(100)),
-                test::jtx::path(~MPT1, ~MPT2, ~USD, ~CRN, ~MPT3, ~YAN),
-                sendmax(EUR(100)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, yan(100)),
+                test::jtx::Path(~mpt1, ~mpt2, ~usd, ~crn, ~mpt3, ~yan),
+                Sendmax(eur(100)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
-            BEAST_EXPECT(env.balance(carol, EUR) == EUR(900));
-            BEAST_EXPECT(env.balance(bob, YAN) == YAN(1'100));
-            BEAST_EXPECT(amm.expectBalances(CRN(1'104), MPT3(1'000), amm.tokens()));
+            BEAST_EXPECT(env.balance(carol, eur) == eur(900));
+            BEAST_EXPECT(env.balance(bob, yan) == yan(1'100));
+            BEAST_EXPECT(amm.expectBalances(crn(1'104), mpt3(1'000), amm.tokens()));
             BEAST_EXPECT(expectOffers(env, alice, 0));
         }
 
         // Multi-steps with AMM and MPT endpoints
-        // MPT1/EUR EUR/MPT2 MPT2/USD USD/CRN AMM:CRN/MPT3 MPT3/MPT4
+        // mpt1/EUR EUR/mpt2 mpt2/USD USD/CRN AMM:CRN/MPT3 MPT3/MPT4
         {
             Env env{*this, features};
-            auto const USD = gw["USD"];
-            auto const EUR = gw["EUR"];
-            auto const CRN = gw["CRN"];
+            auto const usd = gw["USD"];
+            auto const eur = gw["EUR"];
+            auto const crn = gw["CRN"];
 
-            fund(env, gw, {alice, carol, bob}, XRP(1'000), {USD(1'000), EUR(1'000), CRN(2'000)});
+            fund(env, gw, {alice, carol, bob}, XRP(1'000), {usd(1'000), eur(1'000), crn(2'000)});
 
             auto createMPT = [&]() -> std::pair<MPTTester, MPT> {
-                MPTTester mpt(env, gw, {.fund = false});
-                mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-                mpt.authorize({.account = alice});
-                mpt.pay(gw, alice, 2'000);
-                return {mpt, mpt["MPT"]};
+                MPTTester mptTester(env, gw, {.fund = false});
+                mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+                mptTester.authorize({.account = alice});
+                mptTester.pay(gw, alice, 2'000);
+                return {mptTester, mptTester["MPT"]};
             };
 
-            auto const [mpt1, MPT1] = createMPT();
-            auto const [mpt2, MPT2] = createMPT();
-            auto const [mpt3, MPT3] = createMPT();
-            auto [mpt4, MPT4] = createMPT();
-            mpt4.authorize({.account = bob});
+            auto const [mptTester1, mpt1] = createMPT();
+            auto const [mptTester2, mpt2] = createMPT();
+            auto const [mptTester3, mpt3] = createMPT();
+            auto [mptTester4, mpt4] = createMPT();
+            mptTester4.authorize({.account = bob});
 
-            env(offer(alice, EUR(100), MPT1(101)));
-            env(offer(alice, MPT1(101), MPT2(102)));
-            env(offer(alice, MPT2(102), USD(103)));
-            env(offer(alice, USD(103), CRN(104)));
+            env(offer(alice, eur(100), mpt1(101)));
+            env(offer(alice, mpt1(101), mpt2(102)));
+            env(offer(alice, mpt2(102), usd(103)));
+            env(offer(alice, usd(103), crn(104)));
             env.close();
-            AMM const amm(env, alice, CRN(1'000), MPT3(1'104));
-            env(offer(alice, MPT3(104), MPT4(100)));
+            AMM const amm(env, alice, crn(1'000), mpt3(1'104));
+            env(offer(alice, mpt3(104), mpt4(100)));
 
-            env(pay(carol, bob, MPT4(100)),
-                test::jtx::path(~MPT1, ~MPT2, ~USD, ~CRN, ~MPT3, ~MPT4),
-                sendmax(EUR(100)),
-                txflags(tfPartialPayment | tfNoRippleDirect));
+            env(pay(carol, bob, mpt4(100)),
+                test::jtx::Path(~mpt1, ~mpt2, ~usd, ~crn, ~mpt3, ~mpt4),
+                Sendmax(eur(100)),
+                Txflags(tfPartialPayment | tfNoRippleDirect));
             env.close();
 
-            BEAST_EXPECT(env.balance(carol, EUR) == EUR(900));
-            BEAST_EXPECT(mpt4.checkMPTokenAmount(bob, 100));
-            BEAST_EXPECT(amm.expectBalances(CRN(1'104), MPT3(1'000), amm.tokens()));
+            BEAST_EXPECT(env.balance(carol, eur) == eur(900));
+            BEAST_EXPECT(mptTester4.checkMPTokenAmount(bob, 100));
+            BEAST_EXPECT(amm.expectBalances(crn(1'104), mpt3(1'000), amm.tokens()));
             BEAST_EXPECT(expectOffers(env, alice, 0));
         }
 
@@ -5077,73 +5077,73 @@ class MPToken_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), gw, alice, carol, bob);
 
-            MPTTester usd(env, gw, {.holders = {alice, carol, bob}, .fund = false});
-            usd.create(
+            MPTTester usdTester(env, gw, {.holders = {alice, carol, bob}, .fund = false});
+            usdTester.create(
                 {.maxAmt = 1'000,
-                 .authorize = MPTCreate::AllHolders,
+                 .authorize = MPTCreate::allHolders,
                  .pay = {{{alice}, 1'000}},
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const USD = usd["USD"];
+            auto const usd = usdTester["USD"];
 
-            MPTTester eur(env, gw, {.holders = {alice, carol, bob}, .fund = false});
-            eur.create(
+            MPTTester eurTester(env, gw, {.holders = {alice, carol, bob}, .fund = false});
+            eurTester.create(
                 {.maxAmt = 1'000,
                  .authorize = {{alice, carol}},
                  .pay = {{{carol}, 100}},
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const EUR = eur["EUR"];
+            auto const eur = eurTester["EUR"];
 
-            env(offer(alice, EUR(10), USD(10)));
+            env(offer(alice, eur(10), usd(10)));
 
-            env(pay(carol, bob, USD(10)),
-                sendmax(EUR(10)),
-                path(~USD),
-                txflags(tfNoRippleDirect | tfPartialPayment));
+            env(pay(carol, bob, usd(10)),
+                Sendmax(eur(10)),
+                Path(~usd),
+                Txflags(tfNoRippleDirect | tfPartialPayment));
         }
         {
-            Env env(*this, features);
+            Env env(*this, features);  // NOLINT TODO
             env.fund(XRP(1'000), gw, alice, carol, bob);
 
-            auto MUSD = MPTTester(
+            auto musd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, carol, bob}, .maxAmt = 1'000});
-            MPT const USD = MUSD;
-            env(pay(gw, alice, USD(800)));
-            env(offer(gw, XRP(300), USD(300)));
-            env(pay(carol, bob, USD(300)),
-                sendmax(XRP(300)),
-                path(~USD),
-                txflags(tfPartialPayment));
-            BEAST_EXPECT(MUSD.checkMPTokenAmount(bob, 200));
-            BEAST_EXPECT(MUSD.checkMPTokenOutstandingAmount(1'000));
+            MPT const usd = musd;
+            env(pay(gw, alice, usd(800)));
+            env(offer(gw, XRP(300), usd(300)));
+            env(pay(carol, bob, usd(300)),
+                Sendmax(XRP(300)),
+                Path(~usd),
+                Txflags(tfPartialPayment));
+            BEAST_EXPECT(musd.checkMPTokenAmount(bob, 200));
+            BEAST_EXPECT(musd.checkMPTokenOutstandingAmount(1'000));
             // initial + offer - fees
-            BEAST_EXPECT(env.balance(gw) == (XRP(1'000) + XRP(200) - txfee(env, 3)));
+            BEAST_EXPECT(env.balance(gw) == (XRP(1'000) + XRP(200) - txFee(env, 3)));
         }
         {
             Env env(*this, features);
-            auto const EUR = gw["EUR"];
+            auto const eur = gw["EUR"];
             env.fund(XRP(1'000), gw, alice, carol, bob);
             env.close();
 
-            env(trust(alice, EUR(1'000)));
-            env(pay(gw, alice, EUR(300)));
-            env(trust(bob, EUR(1'000)));
+            env(trust(alice, eur(1'000)));
+            env(pay(gw, alice, eur(300)));
+            env(trust(bob, eur(1'000)));
 
-            auto MUSD = MPTTester(
+            auto musd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, carol, bob}, .maxAmt = 1'000});
-            MPT const USD = MUSD;
+            MPT const usd = musd;
 
-            env(pay(gw, alice, USD(800)));
-            env(offer(gw, XRP(300), USD(300)));
-            env(offer(alice, USD(300), EUR(300)));
-            env(pay(carol, bob, EUR(300)),
-                sendmax(XRP(300)),
-                path(~USD, ~EUR),
-                txflags(tfPartialPayment));
-            BEAST_EXPECT(MUSD.checkMPTokenAmount(alice, 1'000));
-            BEAST_EXPECT(MUSD.checkMPTokenOutstandingAmount(1'000));
+            env(pay(gw, alice, usd(800)));
+            env(offer(gw, XRP(300), usd(300)));
+            env(offer(alice, usd(300), eur(300)));
+            env(pay(carol, bob, eur(300)),
+                Sendmax(XRP(300)),
+                Path(~usd, ~eur),
+                Txflags(tfPartialPayment));
+            BEAST_EXPECT(musd.checkMPTokenAmount(alice, 1'000));
+            BEAST_EXPECT(musd.checkMPTokenOutstandingAmount(1'000));
             // initial + offer - fees
-            BEAST_EXPECT(env.balance(gw) == (XRP(1'000) + XRP(200) - txfee(env, 4)));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(200));
+            BEAST_EXPECT(env.balance(gw) == (XRP(1'000) + XRP(200) - txFee(env, 4)));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(200));
         }
     }
 
@@ -5158,8 +5158,8 @@ class MPToken_test : public beast::unit_test::suite
         Account const carol{"carol"};
         Account const bob{"bob"};
         Account const dan{"dan"};
-        auto const USD = gw["USD"];
-        auto const EUR = gw1["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw1["EUR"];
 
         // MPT can be a mpt end point step or a book-step
 
@@ -5167,17 +5167,17 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env = pathTestEnv(*this);
 
-            MPTTester mpt(env, gw, {.holders = {dan, carol}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {dan, carol}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = dan});
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = dan});
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            auto const [pathSet, srcAmt, dstAmt] = find_paths(env, carol, dan, MPT(-1));
-            BEAST_EXPECT(srcAmt == MPT(200));
-            BEAST_EXPECT(dstAmt == MPT(200));
+            auto const [pathSet, srcAmt, dstAmt] = findPaths(env, carol, dan, mpt(-1));
+            BEAST_EXPECT(srcAmt == mpt(200));
+            BEAST_EXPECT(dstAmt == mpt(200));
             // Direct payment, no path
             BEAST_EXPECT(pathSet.empty());
         }
@@ -5188,29 +5188,29 @@ class MPToken_test : public beast::unit_test::suite
 
             env.fund(XRP(1'000), carol);
 
-            MPTTester mpt(env, gw, {.holders = {alice, dan}});
+            MPTTester mptTester(env, gw, {.holders = {alice, dan}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = dan});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = dan});
+            mptTester.pay(gw, alice, 200);
 
-            env(offer(alice, XRP(100), MPT(100)));
+            env(offer(alice, XRP(100), mpt(100)));
             env.close();
 
-            auto const [pathSet, srcAmt, dstAmt] = find_paths(env, carol, dan, MPT(-1));
+            auto const [pathSet, srcAmt, dstAmt] = findPaths(env, carol, dan, mpt(-1));
             BEAST_EXPECT(srcAmt == XRP(100));
-            BEAST_EXPECT(dstAmt == MPT(100));
-            if (BEAST_EXPECT(same(pathSet, stpath(IPE(mpt.issuanceID())))))
+            BEAST_EXPECT(dstAmt == mpt(100));
+            if (BEAST_EXPECT(same(pathSet, stpath(ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(~MPT),
-                    sendmax(XRP(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(~mpt),
+                    Sendmax(XRP(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5221,66 +5221,67 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), carol);
             env.fund(XRP(1'000), gw);
 
-            MPTTester mpt(env, gw1, {.holders = {alice, dan}});
+            MPTTester mptTester(env, gw1, {.holders = {alice, dan}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = dan});
-            mpt.pay(gw1, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = dan});
+            mptTester.pay(gw1, alice, 200);
 
-            env(trust(alice, USD(400)));
-            env(trust(carol, USD(400)));
-            env(pay(gw, carol, USD(200)));
+            env(trust(alice, usd(400)));
+            env(trust(carol, usd(400)));
+            env(pay(gw, carol, usd(200)));
 
-            env(offer(alice, USD(100), MPT(100)));
+            env(offer(alice, usd(100), mpt(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT(-1));
-            BEAST_EXPECT(srcAmt == USD(100));
-            BEAST_EXPECT(dstAmt == MPT(100));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt(-1));
+            BEAST_EXPECT(srcAmt == usd(100));
+            BEAST_EXPECT(dstAmt == mpt(100));
             if (BEAST_EXPECT(
-                    pathSet.size() == 1 && same(pathSet, stpath(gw, IPE(mpt.issuanceID())))))
+                    pathSet.size() == 1 && same(pathSet, stpath(gw, ipe(mptTester.issuanceID())))))
             {
                 // Validate the payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(USD(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(usd(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT(-1), USD(-1));
-            BEAST_EXPECT(srcAmt == USD(90));
-            BEAST_EXPECT(dstAmt == MPT(90));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID())))))
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt(-1), usd(-1));
+            BEAST_EXPECT(srcAmt == usd(90));
+            BEAST_EXPECT(dstAmt == mpt(90));
+            if (BEAST_EXPECT(
+                    pathSet.size() == 1 && same(pathSet, stpath(ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(USD(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(usd(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include source token
             std::tie(pathSet, srcAmt, dstAmt) =
-                find_paths(env, carol, dan, MPT(-1), std::nullopt, USD.currency);
-            BEAST_EXPECT(srcAmt == USD(80));
-            BEAST_EXPECT(dstAmt == MPT(80));
+                findPaths(env, carol, dan, mpt(-1), std::nullopt, usd.currency);
+            BEAST_EXPECT(srcAmt == usd(80));
+            BEAST_EXPECT(dstAmt == mpt(80));
             if (BEAST_EXPECT(
-                    pathSet.size() == 1 && same(pathSet, stpath(gw, IPE(mpt.issuanceID())))))
+                    pathSet.size() == 1 && same(pathSet, stpath(gw, ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(USD(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(usd(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5291,133 +5292,136 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), dan);
             env.fund(XRP(1'000), gw);
 
-            MPTTester mpt(env, gw1, {.holders = {carol, alice}});
+            MPTTester mptTester(env, gw1, {.holders = {carol, alice}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = carol});
-            mpt.authorize({.account = alice});
-            mpt.pay(gw1, carol, 200);
+            mptTester.authorize({.account = carol});
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw1, carol, 200);
 
-            env(trust(dan, USD(400)));
-            env(trust(alice, USD(400)));
-            env(pay(gw, alice, USD(200)));
+            env(trust(dan, usd(400)));
+            env(trust(alice, usd(400)));
+            env(pay(gw, alice, usd(200)));
 
-            env(offer(alice, MPT(100), USD(100)));
+            env(offer(alice, mpt(100), usd(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, USD(-1));
-            BEAST_EXPECT(srcAmt == MPT(100));
-            BEAST_EXPECT(dstAmt == USD(100));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(USD)))))
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, usd(-1));
+            BEAST_EXPECT(srcAmt == mpt(100));
+            BEAST_EXPECT(dstAmt == usd(100));
+            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(ipe(usd)))))
             {
                 // Validate the payment works with the path
-                env(pay(carol, dan, USD(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, usd(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, USD(-1), MPT(-1));
-            BEAST_EXPECT(srcAmt == MPT(90));
-            BEAST_EXPECT(dstAmt == USD(90));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(USD)))))
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, usd(-1), mpt(-1));
+            BEAST_EXPECT(srcAmt == mpt(90));
+            BEAST_EXPECT(dstAmt == usd(90));
+            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(ipe(usd)))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, USD(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, usd(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include source token
             std::tie(pathSet, srcAmt, dstAmt) =
-                find_paths(env, carol, dan, USD(-1), std::nullopt, MPT.mpt());
-            BEAST_EXPECT(srcAmt == MPT(80));
-            BEAST_EXPECT(dstAmt == USD(80));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(USD)))))
+                findPaths(env, carol, dan, usd(-1), std::nullopt, mpt.mpt());
+            BEAST_EXPECT(srcAmt == mpt(80));
+            BEAST_EXPECT(dstAmt == usd(80));
+            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(ipe(usd)))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, USD(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, usd(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
-        // Cross-asset payment via MPT1/MPT offer (one step)
+        // Cross-asset payment via mpt1/MPT offer (one step)
         {
             Env env = pathTestEnv(*this);
 
-            MPTTester mpt(env, gw, {.holders = {alice, dan}});
-            MPTTester mpt1(env, gw1, {.holders = {carol}});
+            MPTTester mptTester(env, gw, {.holders = {alice, dan}});
+            MPTTester mptTester1(env, gw1, {.holders = {carol}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt1.create(
+            auto const mpt = mptTester["MPT"];
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
+            auto const mpt1 = mptTester1["MPT1"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = dan});
-            mpt.pay(gw, alice, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = dan});
+            mptTester.pay(gw, alice, 200);
 
-            mpt1.authorize({.account = carol});
-            mpt1.authorize({.account = alice});
-            mpt1.pay(gw1, carol, 200);
+            mptTester1.authorize({.account = carol});
+            mptTester1.authorize({.account = alice});
+            mptTester1.pay(gw1, carol, 200);
 
-            env(offer(alice, MPT1(100), MPT(100)));
+            env(offer(alice, mpt1(100), mpt(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT(-1));
-            BEAST_EXPECT(srcAmt == MPT1(100));
-            BEAST_EXPECT(dstAmt == MPT(100));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID())))))
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt(-1));
+            BEAST_EXPECT(srcAmt == mpt1(100));
+            BEAST_EXPECT(dstAmt == mpt(100));
+            if (BEAST_EXPECT(
+                    pathSet.size() == 1 && same(pathSet, stpath(ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT1(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt1(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT(-1), MPT1(-1));
-            BEAST_EXPECT(srcAmt == MPT1(90));
-            BEAST_EXPECT(dstAmt == MPT(90));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID())))))
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt(-1), mpt1(-1));
+            BEAST_EXPECT(srcAmt == mpt1(90));
+            BEAST_EXPECT(dstAmt == mpt(90));
+            if (BEAST_EXPECT(
+                    pathSet.size() == 1 && same(pathSet, stpath(ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT1(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt1(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include source token
             std::tie(pathSet, srcAmt, dstAmt) =
-                find_paths(env, carol, dan, MPT(-1), std::nullopt, MPT1.mpt());
-            BEAST_EXPECT(srcAmt == MPT1(80));
-            BEAST_EXPECT(dstAmt == MPT(80));
-            if (BEAST_EXPECT(pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID())))))
+                findPaths(env, carol, dan, mpt(-1), std::nullopt, mpt1.mpt());
+            BEAST_EXPECT(srcAmt == mpt1(80));
+            BEAST_EXPECT(dstAmt == mpt(80));
+            if (BEAST_EXPECT(
+                    pathSet.size() == 1 && same(pathSet, stpath(ipe(mptTester.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT1(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt1(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5428,55 +5432,57 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), carol);
             env.fund(XRP(1'000), dan);
 
-            MPTTester mpt(env, gw, {.holders = {alice, bob}});
+            MPTTester mptTester(env, gw, {.holders = {alice, bob}});
 
-            mpt.create(
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = bob});
-            mpt.pay(gw, alice, 200);
-            mpt.pay(gw, bob, 200);
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = bob});
+            mptTester.pay(gw, alice, 200);
+            mptTester.pay(gw, bob, 200);
 
-            env(trust(bob, USD(200)));
-            env(pay(gw, bob, USD(100)));
-            env(trust(dan, USD(200)));
-            env(trust(alice, USD(200)));
+            env(trust(bob, usd(200)));
+            env(pay(gw, bob, usd(100)));
+            env(trust(dan, usd(200)));
+            env(trust(alice, usd(200)));
 
-            env(offer(alice, XRP(100), MPT(100)));
-            env(offer(bob, MPT(100), USD(100)));
+            env(offer(alice, XRP(100), mpt(100)));
+            env(offer(bob, mpt(100), usd(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, USD(-1));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, usd(-1));
             BEAST_EXPECT(srcAmt == XRP(100));
-            BEAST_EXPECT(dstAmt == USD(100));
+            BEAST_EXPECT(dstAmt == usd(100));
             if (BEAST_EXPECT(
-                    pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID()), IPE(USD)))))
+                    pathSet.size() == 1 &&
+                    same(pathSet, stpath(ipe(mptTester.issuanceID()), ipe(usd)))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, USD(10)),
-                    path(pathSet[0]),
-                    sendmax(XRP(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, usd(10)),
+                    Path(pathSet[0]),
+                    Sendmax(XRP(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, USD(-1), XRP(100));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, usd(-1), XRP(100));
             BEAST_EXPECT(srcAmt == XRP(90));
-            BEAST_EXPECT(dstAmt == USD(90));
+            BEAST_EXPECT(dstAmt == usd(90));
             if (BEAST_EXPECT(
-                    pathSet.size() == 1 && same(pathSet, stpath(IPE(mpt.issuanceID()), IPE(USD)))))
+                    pathSet.size() == 1 &&
+                    same(pathSet, stpath(ipe(mptTester.issuanceID()), ipe(usd)))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, USD(10)),
-                    path(pathSet[0]),
-                    sendmax(XRP(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, usd(10)),
+                    Path(pathSet[0]),
+                    Sendmax(XRP(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5486,79 +5492,79 @@ class MPToken_test : public beast::unit_test::suite
             Env env = pathTestEnv(*this);
             Account const gw2{"gw2"};
             env.fund(XRP(1'000), gw2);
-            auto const USD2 = gw2["USD"];
+            auto const usd2 = gw2["USD"];
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            MPTTester mpt1(env, gw1, {.holders = {bob, dan}});
-            mpt1.create(
+            MPTTester mptTester1(env, gw1, {.holders = {bob, dan}});
+            mptTester1.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
-            mpt1.authorize({.account = bob});
-            mpt1.pay(gw1, bob, 200);
-            mpt1.authorize({.account = dan});
+            auto const mpt1 = mptTester1["MPT1"];
+            mptTester1.authorize({.account = bob});
+            mptTester1.pay(gw1, bob, 200);
+            mptTester1.authorize({.account = dan});
 
-            env(trust(alice, USD2(400)));
-            env(pay(gw2, alice, USD2(200)));
-            env(trust(bob, USD2(400)));
+            env(trust(alice, usd2(400)));
+            env(pay(gw2, alice, usd2(200)));
+            env(trust(bob, usd2(400)));
 
-            env(offer(alice, MPT(100), USD2(100)));
-            env(offer(bob, USD2(100), MPT1(100)));
+            env(offer(alice, mpt(100), usd2(100)));
+            env(offer(bob, usd2(100), mpt1(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT1(-1));
-            BEAST_EXPECT(srcAmt == MPT(100));
-            BEAST_EXPECT(dstAmt == MPT1(100));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt1(-1));
+            BEAST_EXPECT(srcAmt == mpt(100));
+            BEAST_EXPECT(dstAmt == mpt1(100));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(USD2), IPE(mpt1.issuanceID())))))
+                    same(pathSet, stpath(ipe(usd2), ipe(mptTester1.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT1(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt1(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT1(-1), MPT(-1));
-            BEAST_EXPECT(srcAmt == MPT(90));
-            BEAST_EXPECT(dstAmt == MPT1(90));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt1(-1), mpt(-1));
+            BEAST_EXPECT(srcAmt == mpt(90));
+            BEAST_EXPECT(dstAmt == mpt1(90));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(USD2), IPE(mpt1.issuanceID())))))
+                    same(pathSet, stpath(ipe(usd2), ipe(mptTester1.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT1(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt1(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include source token
             std::tie(pathSet, srcAmt, dstAmt) =
-                find_paths(env, carol, dan, MPT1(-1), std::nullopt, MPT.mpt());
-            BEAST_EXPECT(srcAmt == MPT(80));
-            BEAST_EXPECT(dstAmt == MPT1(80));
+                findPaths(env, carol, dan, mpt1(-1), std::nullopt, mpt.mpt());
+            BEAST_EXPECT(srcAmt == mpt(80));
+            BEAST_EXPECT(dstAmt == mpt1(80));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(USD2), IPE(mpt1.issuanceID())))))
+                    same(pathSet, stpath(ipe(usd2), ipe(mptTester1.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT1(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt1(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5570,79 +5576,85 @@ class MPToken_test : public beast::unit_test::suite
             Account const gw2{"gw2"};
             env.fund(XRP(1'000), gw, gw1, gw2, alice, bob, carol, dan);
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}, .fund = false});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}, .fund = false});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, carol, 200);
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, carol, 200);
 
-            MPTTester mpt1(env, gw1, {.holders = {bob, alice}, .fund = false});
-            mpt1.create({.ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
-            mpt1.authorize({.account = alice});
-            mpt1.pay(gw1, alice, 200);
-            mpt1.authorize({.account = bob});
+            MPTTester mptTester1(env, gw1, {.holders = {bob, alice}, .fund = false});
+            mptTester1.create({.ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt1 = mptTester1["MPT1"];
+            mptTester1.authorize({.account = alice});
+            mptTester1.pay(gw1, alice, 200);
+            mptTester1.authorize({.account = bob});
 
-            MPTTester mpt2(env, gw2, {.holders = {bob, dan}, .fund = false});
-            mpt2.create({.ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT2 = mpt2["MPT2"];
-            mpt2.authorize({.account = bob});
-            mpt2.pay(gw2, bob, 200);
-            mpt2.authorize({.account = dan});
+            MPTTester mptTester2(env, gw2, {.holders = {bob, dan}, .fund = false});
+            mptTester2.create({.ownerCount = 1, .flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt2 = mptTester2["MPT2"];
+            mptTester2.authorize({.account = bob});
+            mptTester2.pay(gw2, bob, 200);
+            mptTester2.authorize({.account = dan});
 
-            env(offer(alice, MPT(100), MPT1(100)));
-            env(offer(bob, MPT1(100), MPT2(100)));
+            env(offer(alice, mpt(100), mpt1(100)));
+            env(offer(bob, mpt1(100), mpt2(100)));
             env.close();
 
             // No sendMax
             STPathSet pathSet;
             STAmount srcAmt;
             STAmount dstAmt;
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT2(-1));
-            BEAST_EXPECT(srcAmt == MPT(100));
-            BEAST_EXPECT(dstAmt == MPT2(100));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt2(-1));
+            BEAST_EXPECT(srcAmt == mpt(100));
+            BEAST_EXPECT(dstAmt == mpt2(100));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(mpt1.issuanceID()), IPE(mpt2.issuanceID())))))
+                    same(
+                        pathSet,
+                        stpath(ipe(mptTester1.issuanceID()), ipe(mptTester2.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT2(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt2(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include sendMax
-            std::tie(pathSet, srcAmt, dstAmt) = find_paths(env, carol, dan, MPT2(-1), MPT(-1));
-            BEAST_EXPECT(srcAmt == MPT(90));
-            BEAST_EXPECT(dstAmt == MPT2(90));
+            std::tie(pathSet, srcAmt, dstAmt) = findPaths(env, carol, dan, mpt2(-1), mpt(-1));
+            BEAST_EXPECT(srcAmt == mpt(90));
+            BEAST_EXPECT(dstAmt == mpt2(90));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(mpt1.issuanceID()), IPE(mpt2.issuanceID())))))
+                    same(
+                        pathSet,
+                        stpath(ipe(mptTester1.issuanceID()), ipe(mptTester2.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT2(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt2(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
 
             // Include source token
             std::tie(pathSet, srcAmt, dstAmt) =
-                find_paths(env, carol, dan, MPT2(-1), std::nullopt, MPT.mpt());
-            BEAST_EXPECT(srcAmt == MPT(80));
-            BEAST_EXPECT(dstAmt == MPT2(80));
+                findPaths(env, carol, dan, mpt2(-1), std::nullopt, mpt.mpt());
+            BEAST_EXPECT(srcAmt == mpt(80));
+            BEAST_EXPECT(dstAmt == mpt2(80));
             if (BEAST_EXPECT(
                     pathSet.size() == 1 &&
-                    same(pathSet, stpath(IPE(mpt1.issuanceID()), IPE(mpt2.issuanceID())))))
+                    same(
+                        pathSet,
+                        stpath(ipe(mptTester1.issuanceID()), ipe(mptTester2.issuanceID())))))
             {
                 // validate a payment works with the path
-                env(pay(carol, dan, MPT2(10)),
-                    path(pathSet[0]),
-                    sendmax(MPT(10)),
-                    txflags(tfNoRippleDirect | tfPartialPayment));
+                env(pay(carol, dan, mpt2(10)),
+                    Path(pathSet[0]),
+                    Sendmax(mpt(10)),
+                    Txflags(tfNoRippleDirect | tfPartialPayment));
             }
         }
 
@@ -5666,39 +5678,39 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000'000), sean);
             env.close();
 
-            MPTTester usd(env, gw, {.holders = {carol, dan}, .fund = false});
-            usd.create(
-                {.authorize = MPTCreate::AllHolders,
-                 .pay = {{MPTCreate::AllHolders, 100}},
+            MPTTester usdTester(env, gw, {.holders = {carol, dan}, .fund = false});
+            usdTester.create(
+                {.authorize = MPTCreate::allHolders,
+                 .pay = {{MPTCreate::allHolders, 100}},
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const USD = usd["USD"];
-            env(offer(carol, XRP(100), USD(100)));
+            auto const usd = usdTester["USD"];
+            env(offer(carol, XRP(100), usd(100)));
 
-            MPTTester gbp(env, gw, {.holders = {bob, sean}, .fund = false});
-            gbp.create(
-                {.authorize = MPTCreate::AllHolders,
+            MPTTester gbpTester(env, gw, {.holders = {bob, sean}, .fund = false});
+            gbpTester.create(
+                {.authorize = MPTCreate::allHolders,
                  .pay = {{{bob}, 100}},
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const GBP = gbp["GBP"];
+            auto const gbp = gbpTester["GBP"];
 
             MPTTester usd1(env, gw1, {.holders = {bob, dan}, .fund = false});
             usd1.create(
-                {.authorize = MPTCreate::AllHolders,
+                {.authorize = MPTCreate::allHolders,
                  .pay = {{{dan}, 100}},
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const USD1 = usd1["USD1"];
-            env(offer(bob, USD1(100), GBP(100)));
+            auto const usD1 = usd1["USD1"];
+            env(offer(bob, usd1(100), gbp(100)));
 
             // dan has USD/gw and USD1/gw. Had USD been IOU, it would have
             // been able to ripple through dan's account.
-            auto const [pathSet, srcAmt, dstAmt] = find_paths(env, john, sean, GBP(-1), XRP(-1));
+            auto const [pathSet, srcAmt, dstAmt] = findPaths(env, john, sean, gbp(-1), XRP(-1));
             BEAST_EXPECT(pathSet.empty());
 
-            env(pay(john, sean, GBP(10)),
-                sendmax(XRP(20)),
-                path(~USD, dan, gw1, ~GBP),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(john, sean, gbp(10)),
+                Sendmax(XRP(20)),
+                Path(~usd, dan, gw1, ~gbp),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(temBAD_PATH));
         }
     }
 
@@ -5716,18 +5728,18 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features - featureMPTokensV2};
 
-            MPTTester mpt(env, gw, {.holders = {alice}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
 
             uint256 const checkId{keylet::check(gw, env.seq(gw)).key};
 
-            env(check::create(gw, alice, MPT(100)), ter(temDISABLED));
+            env(check::create(gw, alice, mpt(100)), Ter(temDISABLED));
             env.close();
 
-            env(check::cash(alice, checkId, MPT(100)), ter(temDISABLED));
+            env(check::cash(alice, checkId, mpt(100)), Ter(temDISABLED));
             env.close();
         }
 
@@ -5736,69 +5748,69 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             Account const carol{"carol"};
 
-            MPTTester mpt(env, gw, {.holders = {alice, carol}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice, carol}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 50);
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 50);
 
             uint256 const checkId{keylet::check(alice, env.seq(alice)).key};
 
             // can create
-            env(check::create(alice, carol, MPT(100)));
+            env(check::create(alice, carol, mpt(100)));
             env.close();
 
             // can't cash since alice only has 50 of MPT
-            env(check::cash(carol, checkId, MPT(100)), ter(tecPATH_PARTIAL));
+            env(check::cash(carol, checkId, mpt(100)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // can cash if DeliverMin is set
             // carol is not authorized, MPToken is authorized by CheckCash
-            env(check::cash(carol, checkId, check::DeliverMin(MPT(50))));
+            env(check::cash(carol, checkId, check::DeliverMin(mpt(50))));
             env.close();
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 50));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(50));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 50));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(50));
         }
 
         // Exceed max amount
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice}});
+            mptTester.create(
                 {.maxAmt = 100,
                  .ownerCount = 1,
                  .holderCount = 0,
                  .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
             uint256 const checkId{keylet::check(gw, env.seq(gw)).key};
 
             // can create
-            env(check::create(gw, alice, MPT(200)));
+            env(check::create(gw, alice, mpt(200)));
             env.close();
 
             // can't cash since the outstanding amount exceeds max amount
-            env(check::cash(alice, checkId, MPT(200)), ter(tecPATH_PARTIAL));
+            env(check::cash(alice, checkId, mpt(200)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // can cash if DeliverMin is set
-            env(check::cash(alice, checkId, check::DeliverMin(MPT(100))));
+            env(check::cash(alice, checkId, check::DeliverMin(mpt(100))));
             env.close();
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 100));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(100));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(100));
         }
 
         // MPTokenIssuance object doesn't exist
         {
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
-            env(check::create(alice, carol, MPT(gw)(50)), ter(tecOBJECT_NOT_FOUND));
+            env(check::create(alice, carol, MPT(gw)(50)), Ter(tecOBJECT_NOT_FOUND));
             env.close();
-            auto BTC = MPTTester({.env = env, .issuer = gw});
+            auto btc = MPTTester({.env = env, .issuer = gw});
             uint256 const chkId{getCheckIndex(gw, env.seq(gw))};
-            env(check::cash(carol, chkId, MPT(gw)(1)), ter(tecNO_ENTRY));
+            env(check::cash(carol, chkId, MPT(gw)(1)), Ter(tecNO_ENTRY));
             env.close();
         }
 
@@ -5807,13 +5819,13 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
-            auto BTC = MPTTester({.env = env, .issuer = gw});
+            auto btc = MPTTester({.env = env, .issuer = gw});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, carol, BTC(50)));
+            env(check::create(alice, carol, btc(50)));
             env.close();
 
             // But cashing fails if alice doesn't have MPToken
-            env(check::cash(carol, chkId, BTC(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(carol, chkId, btc(1)), Ter(tecPATH_PARTIAL));
             env.close();
         }
 
@@ -5827,14 +5839,14 @@ class MPToken_test : public beast::unit_test::suite
                  .issuer = gw,
                  .holders = {alice, carol},
                  .pay = 100,
-                 .flags = MPTDEXFlags | tfMPTCanLock});
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock});
 
             mpt.set({.flags = tfMPTLock});
 
             // Create Check fails, holder or issuer as destination
-            env(check::create(alice, carol, mpt(10)), ter(tecLOCKED));
+            env(check::create(alice, carol, mpt(10)), Ter(tecLOCKED));
             env.close();
-            env(check::create(gw, carol, mpt(10)), ter(tecLOCKED));
+            env(check::create(gw, carol, mpt(10)), Ter(tecLOCKED));
             env.close();
 
             mpt.set({.flags = tfMPTUnlock});
@@ -5852,7 +5864,7 @@ class MPToken_test : public beast::unit_test::suite
             // Cash Check fails, holder and issuer env(check::cash(carol,
             // chkIdAlice, mpt(1)), ter(tecPATH_PARTIAL)); // tec is different
             // if the source is the issuer (this is consistent with IOU)
-            env(check::cash(carol, chkIdGw, mpt(2)), ter(tecLOCKED));
+            env(check::cash(carol, chkIdGw, mpt(2)), Ter(tecLOCKED));
             env.close();
 
             mpt.set({.flags = tfMPTUnlock});
@@ -5863,9 +5875,9 @@ class MPToken_test : public beast::unit_test::suite
 
             // Individual lock
             mpt.set({.holder = alice, .flags = tfMPTLock});
-            env(check::create(alice, carol, mpt(10)), ter(tecLOCKED));
+            env(check::create(alice, carol, mpt(10)), Ter(tecLOCKED));
             env.close();
-            env(check::create(carol, alice, mpt(10)), ter(tecLOCKED));
+            env(check::create(carol, alice, mpt(10)), Ter(tecLOCKED));
             env.close();
 
             mpt.set({.holder = alice, .flags = tfMPTUnlock});
@@ -5882,10 +5894,10 @@ class MPToken_test : public beast::unit_test::suite
             env(check::create(gw, alice, mpt(10)));
             env.close();
             mpt.set({.holder = alice, .flags = tfMPTLock});
-            env(check::cash(carol, chkId1, mpt(1)), ter(tecPATH_PARTIAL));
-            env(check::cash(alice, chkId2, mpt(1)), ter(tecLOCKED));
-            env(check::cash(gw, chkId3, mpt(1)), ter(tecPATH_PARTIAL));
-            env(check::cash(alice, chkId4, mpt(1)), ter(tecLOCKED));
+            env(check::cash(carol, chkId1, mpt(1)), Ter(tecPATH_PARTIAL));
+            env(check::cash(alice, chkId2, mpt(1)), Ter(tecLOCKED));
+            env(check::cash(gw, chkId3, mpt(1)), Ter(tecPATH_PARTIAL));
+            env(check::cash(alice, chkId4, mpt(1)), Ter(tecLOCKED));
         }
 
         // MPTRequireAuth flag is set and the account is not authorized.
@@ -5894,26 +5906,26 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
-            auto BTC = MPTTester(
+            auto btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, carol},
-                 .flags = tfMPTRequireAuth | MPTDEXFlags});
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, carol, BTC(50)));
+            env(check::create(alice, carol, btc(50)));
             env.close();
 
             // Authorize alice
-            BTC.authorize({.account = gw, .holder = alice});
-            env(pay(gw, alice, BTC(100)));
+            btc.authorize({.account = gw, .holder = alice});
+            env(pay(gw, alice, btc(100)));
 
             // carol is still not authorized
-            env(check::cash(carol, chkId, BTC(10)), ter(tecNO_AUTH));
+            env(check::cash(carol, chkId, btc(10)), Ter(tecNO_AUTH));
             env.close();
 
             // authorize carol, can cash now
-            BTC.authorize({.account = gw, .holder = carol});
-            env(check::cash(carol, chkId, BTC(10)));
+            btc.authorize({.account = gw, .holder = carol});
+            env(check::cash(carol, chkId, btc(10)));
             env.close();
         }
 
@@ -5964,7 +5976,7 @@ class MPToken_test : public beast::unit_test::suite
             env.close();
 
             // can't cash
-            env(check::cash(carol, checkId, mpt(10)), ter(tecPATH_PARTIAL));
+            env(check::cash(carol, checkId, mpt(10)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // can cash now
@@ -5991,7 +6003,7 @@ class MPToken_test : public beast::unit_test::suite
             uint256 checkId{keylet::check(gw, env.seq(gw)).key};
 
             // can't create
-            env(check::create(gw, alice, mpt(100)), ter(tecNO_PERMISSION));
+            env(check::create(gw, alice, mpt(100)), Ter(tecNO_PERMISSION));
             env.close();
             mpt.set({.account = gw, .mutableFlags = tmfMPTSetCanTrade});
 
@@ -6000,7 +6012,7 @@ class MPToken_test : public beast::unit_test::suite
             env(check::create(gw, carol, mpt(100)));
             env.close();
             mpt.set({.account = gw, .mutableFlags = tmfMPTClearCanTrade});
-            env(check::cash(carol, checkId, mpt(10)), ter(tecNO_PERMISSION));
+            env(check::cash(carol, checkId, mpt(10)), Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -6008,14 +6020,14 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
-            auto USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            auto usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, carol, USD(1)));
+            env(check::create(alice, carol, usd(1)));
             env.close();
 
             // temMALFORMED because MPT is not USD. It doesn't matter if it
             // exists or not
-            env(check::cash(carol, chkId, MPT(alice)(1)), ter(temMALFORMED));
+            env(check::cash(carol, chkId, MPT(alice)(1)), Ter(temMALFORMED));
             env.close();
         }
 
@@ -6024,15 +6036,15 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
 
-            auto BTC = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 1'000});
+            auto btc = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 1'000});
 
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
 
-            env(check::create(alice, carol, BTC(1)));
+            env(check::create(alice, carol, btc(1)));
             env.close();
 
             // MPToken is automatically created
-            env(check::cash(carol, chkId, BTC(1)));
+            env(check::cash(carol, chkId, btc(1)));
             env.close();
         }
 
@@ -6041,17 +6053,17 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
 
-            auto BTC = MPTTester(
+            auto btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
-                 .flags = tfMPTRequireAuth | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | kMPT_DEX_FLAGS,
                  .authHolder = true});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
-            env(check::create(alice, carol, BTC(1)));
+            env(check::create(alice, carol, btc(1)));
             env.close();
 
-            env(check::cash(carol, chkId, BTC(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(carol, chkId, btc(1)), Ter(tecPATH_PARTIAL));
             env.close();
         }
 
@@ -6060,25 +6072,25 @@ class MPToken_test : public beast::unit_test::suite
             Env env{*this, features};
             env.fund(XRP(1'000), gw, alice, carol);
 
-            auto EUR = MPTTester(
+            auto eur = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, carol}, .flags = tfMPTCanTrade});
             uint256 const chkId{getCheckIndex(alice, env.seq(alice))};
             // alice can create
-            env(check::create(alice, carol, EUR(1)));
+            env(check::create(alice, carol, eur(1)));
             env.close();
 
             // carol can't cash
-            env(check::cash(carol, chkId, EUR(1)), ter(tecPATH_PARTIAL));
+            env(check::cash(carol, chkId, eur(1)), Ter(tecPATH_PARTIAL));
             env.close();
 
             // if issuer creates a check then carol can cash since
             // it's a transfer from the issuer
             uint256 const chkId1{getCheckIndex(gw, env.seq(gw))};
             // alice can't create since CanTransfer is not set
-            env(check::create(gw, carol, EUR(1)));
+            env(check::create(gw, carol, eur(1)));
             env.close();
 
-            env(check::cash(carol, chkId1, EUR(1)));
+            env(check::cash(carol, chkId1, eur(1)));
             env.close();
         }
 
@@ -6086,10 +6098,10 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw);
-            mpt.create(
+            MPTTester mptTester(env, gw);
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
+            auto const mpt = mptTester["MPT"];
 
             env.fund(XRP(1'000), alice, carol);
 
@@ -6097,41 +6109,41 @@ class MPToken_test : public beast::unit_test::suite
             uint256 const checkId{keylet::check(alice, env.seq(alice)).key};
 
             // can create
-            env(check::create(alice, carol, MPT(100)));
+            env(check::create(alice, carol, mpt(100)));
             env.close();
 
             // authorize/fund alice
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 100);
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 100);
 
             // carol can cash the check. MPToken is created automatically
-            env(check::cash(carol, checkId, MPT(100)));
+            env(check::cash(carol, checkId, mpt(100)));
             env.close();
 
-            BEAST_EXPECT(mpt.checkMPTokenAmount(carol, 100));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(100));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(carol, 100));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(100));
         }
 
         // Normal create/cash
         {
             Env env{*this, features};
 
-            MPTTester mpt(env, gw, {.holders = {alice}});
-            mpt.create(
+            MPTTester mptTester(env, gw, {.holders = {alice}});
+            mptTester.create(
                 {.ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
 
             uint256 const checkId{keylet::check(gw, env.seq(gw)).key};
 
-            env(check::create(gw, alice, MPT(100)));
+            env(check::create(gw, alice, mpt(100)));
             env.close();
 
-            env(check::cash(alice, checkId, MPT(100)));
+            env(check::cash(alice, checkId, mpt(100)));
             env.close();
 
-            BEAST_EXPECT(mpt.checkMPTokenAmount(alice, 100));
-            BEAST_EXPECT(mpt.checkMPTokenOutstandingAmount(100));
+            BEAST_EXPECT(mptTester.checkMPTokenAmount(alice, 100));
+            BEAST_EXPECT(mptTester.checkMPTokenOutstandingAmount(100));
         }
     }
 
@@ -6142,16 +6154,16 @@ class MPToken_test : public beast::unit_test::suite
         testcase("AMMClawback");
         Account const gw{"gw"};
         Account const alice{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // MPTokenIssuance object doesn't exist
         {
             Env env(*this, features);
             env.fund(XRP(1'000), gw, alice);
-            MPTTester const BTC({.env = env, .issuer = gw});
-            AMM const amm(env, gw, BTC(100), USD(100));
-            env(amm::ammClawback(gw, alice, USD, MPT(alice), std::nullopt), ter(terNO_AMM));
-            env(amm::ammClawback(gw, alice, USD, BTC, MPT(alice)(100)), ter(temBAD_AMOUNT));
+            MPTTester const btc({.env = env, .issuer = gw});
+            AMM const amm(env, gw, btc(100), usd(100));
+            env(amm::ammClawback(gw, alice, usd, MPT(alice), std::nullopt), Ter(terNO_AMM));
+            env(amm::ammClawback(gw, alice, usd, btc, MPT(alice)(100)), Ter(temBAD_AMOUNT));
         }
 
         // MPTLock flag is set and the account is not the issuer of MPT -
@@ -6164,25 +6176,25 @@ class MPToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto BTC = MPTTester(
+            auto btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTCanLock | tfMPTCanClawback | MPTDEXFlags});
+                 .flags = tfMPTCanLock | tfMPTCanClawback | kMPT_DEX_FLAGS});
 
-            env.trust(USD(10'000), alice);
-            env(pay(gw, alice, USD(10'000)));
+            env.trust(usd(10'000), alice);
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
-            AMM amm(env, gw, BTC(100), USD(100));
+            AMM amm(env, gw, btc(100), usd(100));
             env.close();
             amm.deposit(alice, 1'000);
             env.close();
 
-            BTC.set({.flags = tfMPTLock});
+            btc.set({.flags = tfMPTLock});
 
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt));
         }
 
         // MPTRequireAuth flag is set and the account is not authorized -
@@ -6195,26 +6207,26 @@ class MPToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto BTC = MPTTester(
+            auto btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 40'000,
-                 .flags = tfMPTRequireAuth | tfMPTCanClawback | MPTDEXFlags,
+                 .flags = tfMPTRequireAuth | tfMPTCanClawback | kMPT_DEX_FLAGS,
                  .authHolder = true});
 
-            env.trust(USD(10'000), alice);
-            env(pay(gw, alice, USD(10'000)));
+            env.trust(usd(10'000), alice);
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
-            AMM amm(env, gw, BTC(100), USD(100));
+            AMM amm(env, gw, btc(100), usd(100));
             env.close();
             amm.deposit(alice, 1'000);
             env.close();
 
-            BTC.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
+            btc.authorize({.account = gw, .holder = alice, .flags = tfMPTUnauthorize});
 
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt));
         }
 
         // MPTCanTransfer is not set and the account is not the issuer of MPT -
@@ -6227,7 +6239,7 @@ class MPToken_test : public beast::unit_test::suite
             env(fset(gw, asfAllowTrustLineClawback));
             env.close();
 
-            auto BTC = MPTTester(
+            auto btc = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
@@ -6235,43 +6247,43 @@ class MPToken_test : public beast::unit_test::suite
                  .flags = tfMPTCanClawback | tfMPTCanTrade,
                  .authHolder = true});
 
-            env.trust(USD(10'000), alice);
-            env(pay(gw, alice, USD(10'000)));
+            env.trust(usd(10'000), alice);
+            env(pay(gw, alice, usd(10'000)));
             env.close();
 
-            AMM amm(env, gw, BTC(100), USD(100));
+            AMM amm(env, gw, btc(100), usd(100));
             env.close();
             // alice can't deposit since MPTCanTransfer is not set
             amm.deposit(
-                DepositArg{.account = alice, .tokens = 1'000, .err = ter(tecNO_PERMISSION)});
+                DepositArg{.account = alice, .tokens = 1'000, .err = Ter(tecNO_PERMISSION)});
             env.close();
 
             // can't clawback since alice is not an LP
-            env(amm::ammClawback(gw, alice, BTC, USD, std::nullopt), ter(tecAMM_BALANCE));
+            env(amm::ammClawback(gw, alice, btc, usd, std::nullopt), Ter(tecAMM_BALANCE));
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice}, XRP(1'000), {USD(1'000)});
-            MPTTester mpt(env, gw, {.fund = false});
-            mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            AMM amm(env, gw, MPT(100), XRP(100));
+            fund(env, gw, {alice}, XRP(1'000), {usd(1'000)});
+            MPTTester mptTester(env, gw, {.fund = false});
+            mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt = mptTester["MPT"];
+            AMM amm(env, gw, mpt(100), XRP(100));
             amm.deposit(DepositArg{.account = alice, .asset1In = XRP(10)});
-            amm::ammClawback(gw, alice, MPTIssue(mpt.issuanceID()), xrpIssue(), MPT(10));
+            amm::ammClawback(gw, alice, MPTIssue(mptTester.issuanceID()), xrpIssue(), mpt(10));
         }
 
         {
             Env env(*this, features);
-            fund(env, gw, {alice}, XRP(1'000), {USD(1'000)});
-            MPTTester mpt(env, gw, {.fund = false});
-            mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            mpt.authorize({.account = alice});
-            mpt.pay(gw, alice, 1'000);
-            auto const MPT = mpt["MPT"];
-            AMM amm(env, gw, MPT(100), XRP(100));
+            fund(env, gw, {alice}, XRP(1'000), {usd(1'000)});
+            MPTTester mptTester(env, gw, {.fund = false});
+            mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            mptTester.authorize({.account = alice});
+            mptTester.pay(gw, alice, 1'000);
+            auto const mpt = mptTester["MPT"];
+            AMM amm(env, gw, mpt(100), XRP(100));
             amm.deposit(DepositArg{.account = alice, .tokens = 10'000});
-            amm::ammClawback(gw, alice, MPTIssue(mpt.issuanceID()), xrpIssue(), MPT(10));
+            amm::ammClawback(gw, alice, MPTIssue(mptTester.issuanceID()), xrpIssue(), mpt(10));
         }
 
         // clawback one asset from MPT/MPT AMM. MPToken for another asset
@@ -6279,21 +6291,21 @@ class MPToken_test : public beast::unit_test::suite
         {
             Env env(*this, features);
             env.fund(XRP(1'000), gw, alice);
-            auto USD = MPTTester(
+            auto usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice},
                  .pay = 10'000,
-                 .flags = tfMPTCanClawback | MPTDEXFlags});
-            auto EUR =
-                MPTTester({.env = env, .issuer = gw, .flags = tfMPTCanClawback | MPTDEXFlags});
-            AMM amm(env, gw, USD(1'000), EUR(1'000));
-            amm.deposit({.account = alice, .asset1In = USD(1'000)});
+                 .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+            auto eur =
+                MPTTester({.env = env, .issuer = gw, .flags = tfMPTCanClawback | kMPT_DEX_FLAGS});
+            AMM amm(env, gw, usd(1'000), eur(1'000));
+            amm.deposit({.account = alice, .asset1In = usd(1'000)});
             // MPToken doesn't exist
-            BEAST_EXPECT(env.le(keylet::mptoken(EUR.issuanceID(), alice)) == nullptr);
-            env(amm::ammClawback(gw, alice, USD, EUR, USD(100)));
+            BEAST_EXPECT(env.le(keylet::mptoken(eur.issuanceID(), alice)) == nullptr);
+            env(amm::ammClawback(gw, alice, usd, eur, usd(100)));
             // MPToken is created
-            BEAST_EXPECT(env.le(keylet::mptoken(EUR.issuanceID(), alice)));
+            BEAST_EXPECT(env.le(keylet::mptoken(eur.issuanceID(), alice)));
         }
     }
 
@@ -6306,34 +6318,34 @@ class MPToken_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const carol{"carol"};
         Account const bob{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Create/deposit/withdraw
         {
             Env env{*this};
 
-            fund(env, gw, {alice, carol, bob}, XRP(1'000), {USD(1'000)});
+            fund(env, gw, {alice, carol, bob}, XRP(1'000), {usd(1'000)});
 
-            MPTTester mpt(env, gw, {.fund = false});
-            mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            mpt.authorize({.account = alice});
-            mpt.authorize({.account = carol});
-            mpt.pay(gw, alice, 1'000);
-            mpt.pay(gw, carol, 1'000);
+            MPTTester mptTester(env, gw, {.fund = false});
+            mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt = mptTester["MPT"];
+            mptTester.authorize({.account = alice});
+            mptTester.authorize({.account = carol});
+            mptTester.pay(gw, alice, 1'000);
+            mptTester.pay(gw, carol, 1'000);
 
-            MPTTester mpt1(env, gw, {.fund = false});
-            mpt1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT1 = mpt1["MPT1"];
-            mpt1.authorize({.account = alice});
-            mpt1.authorize({.account = carol});
-            mpt1.pay(gw, alice, 1'000);
-            mpt1.pay(gw, carol, 1'000);
+            MPTTester mptTester1(env, gw, {.fund = false});
+            mptTester1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt1 = mptTester1["MPT1"];
+            mptTester1.authorize({.account = alice});
+            mptTester1.authorize({.account = carol});
+            mptTester1.pay(gw, alice, 1'000);
+            mptTester1.pay(gw, carol, 1'000);
 
             std::vector<std::tuple<PrettyAmount, PrettyAmount, IOUAmount>> pools = {
-                {XRP(100), MPT(100), IOUAmount{100'000}},
-                {USD(100), MPT(100), IOUAmount{100}},
-                {MPT(100), MPT1(100), IOUAmount{100}}};
+                {XRP(100), mpt(100), IOUAmount{100'000}},
+                {usd(100), mpt(100), IOUAmount{100}},
+                {mpt(100), mpt1(100), IOUAmount{100}}};
             for (auto& pool : pools)
             {
                 AMM amm(env, gw, std::get<0>(pool), std::get<1>(pool));
@@ -6342,7 +6354,7 @@ class MPToken_test : public beast::unit_test::suite
                 // bob doesn't own MPT
                 amm.deposit(
                     DepositArg{
-                        .account = bob, .tokens = std::get<2>(pool), .err = ter(tecNO_AUTH)});
+                        .account = bob, .tokens = std::get<2>(pool), .err = Ter(tecNO_AUTH)});
                 amm.withdrawAll(alice);
                 amm.withdrawAll(carol);
                 amm.withdrawAll(gw);
@@ -6357,18 +6369,18 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), gw, alice, carol);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
-            MPT const EUR = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+            MPT const eur = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
 
-            env(pay(gw, alice, EUR(100)));
+            env(pay(gw, alice, eur(100)));
 
-            AMM const amm(env, gw, USD(1'100), EUR(1'000));
+            AMM const amm(env, gw, usd(1'100), eur(1'000));
 
-            env(pay(alice, carol, USD(100)), sendmax(EUR(100)));
+            env(pay(alice, carol, usd(100)), Sendmax(eur(100)));
 
-            BEAST_EXPECT(amm.expectBalances(USD(1'000), EUR(1'100), amm.tokens()));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(100));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
+            BEAST_EXPECT(amm.expectBalances(usd(1'000), eur(1'100), amm.tokens()));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(100));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(0));
         }
 
         // Payment, two steps
@@ -6378,23 +6390,23 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), gw, alice, carol);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
-            MPT const EUR = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
-            MPT const BTC = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
-            env(pay(gw, alice, EUR(100)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+            MPT const eur = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+            MPT const btc = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+            env(pay(gw, alice, eur(100)));
 
-            AMM const ammEUR_USD(env, gw, EUR(1'000), USD(1'100));
-            AMM const ammUSD_BTC(env, gw, USD(1'000), BTC(1'100));
+            AMM const ammEurUsd(env, gw, eur(1'000), usd(1'100));
+            AMM const ammUsdBtc(env, gw, usd(1'000), btc(1'100));
 
-            env(pay(alice, carol, BTC(100)),
-                sendmax(EUR(100)),
-                path(~USD, ~BTC),
-                txflags(tfNoRippleDirect));
+            env(pay(alice, carol, btc(100)),
+                Sendmax(eur(100)),
+                Path(~usd, ~btc),
+                Txflags(tfNoRippleDirect));
 
-            BEAST_EXPECT(ammEUR_USD.expectBalances(USD(1'000), EUR(1'100), ammEUR_USD.tokens()));
-            BEAST_EXPECT(ammUSD_BTC.expectBalances(USD(1'100), BTC(1'000), ammUSD_BTC.tokens()));
-            BEAST_EXPECT(env.balance(carol, BTC) == BTC(100));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
+            BEAST_EXPECT(ammEurUsd.expectBalances(usd(1'000), eur(1'100), ammEurUsd.tokens()));
+            BEAST_EXPECT(ammUsdBtc.expectBalances(usd(1'100), btc(1'000), ammUsdBtc.tokens()));
+            BEAST_EXPECT(env.balance(carol, btc) == btc(100));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(0));
         }
 
         // Offer crossing
@@ -6404,42 +6416,42 @@ class MPToken_test : public beast::unit_test::suite
             env.fund(XRP(1'000), gw, alice);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
-            MPT const EUR = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            MPT const eur = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-            env(pay(gw, alice, EUR(1'000)));
+            env(pay(gw, alice, eur(1'000)));
 
-            AMM const amm(env, gw, EUR(1'000'000), USD(1'001'000));
+            AMM const amm(env, gw, eur(1'000'000), usd(1'001'000));
 
-            env(offer(alice, USD(1'000), EUR(1'000)));
+            env(offer(alice, usd(1'000), eur(1'000)));
 
-            BEAST_EXPECT(amm.expectBalances(USD(1'000'000), EUR(1'001'000), amm.tokens()));
-            BEAST_EXPECT(env.balance(alice, USD) == USD(1'000));
-            BEAST_EXPECT(env.balance(alice, EUR) == EUR(0));
+            BEAST_EXPECT(amm.expectBalances(usd(1'000'000), eur(1'001'000), amm.tokens()));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(1'000));
+            BEAST_EXPECT(env.balance(alice, eur) == eur(0));
         }
 
         {
             Env env(*this);
             env.fund(XRP(1'000'000), gw, alice, carol);
 
-            auto USD = MPTTester(
+            auto usd = MPTTester(
                 {.env = env,
                  .issuer = gw,
-                 .flags = tfMPTCanLock | MPTDEXFlags,
+                 .flags = tfMPTCanLock | kMPT_DEX_FLAGS,
                  .mutableFlags = tmfMPTCanMutateRequireAuth | tmfMPTCanMutateCanTransfer |
                      tmfMPTCanMutateCanClawback | tmfMPTCanMutateCanTrade});
-            auto EUR = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 1'000'000});
+            auto eur = MPTTester({.env = env, .issuer = gw, .holders = {alice}, .pay = 1'000'000});
 
             auto const increment = env.current()->fees().increment;
-            auto const txfee = fee(drops(increment));
+            auto const txfee = Fee(drops(increment));
             auto const badMPT = MPT(gw, 1'000);
 
             auto createDeleteAMM = [&](Account const& lp) {
                 AMM amm(
                     env,
                     lp,
-                    USD(1'000),
-                    EUR(1'000),
+                    usd(1'000),
+                    eur(1'000),
                     CreateArg{.fee = static_cast<std::uint32_t>(increment.value())});
                 amm.withdrawAll(lp);
                 BEAST_EXPECT(!amm.ammExists());
@@ -6449,11 +6461,11 @@ class MPToken_test : public beast::unit_test::suite
             // AMMCreate
             //
 
-            auto createJv = AMM::createJv(alice, badMPT(1'000), EUR(1'000), 0);
+            auto createJv = AMM::createJv(alice, badMPT(1'000), eur(1'000), 0);
 
             auto createFail = [&](Account const& account, auto const& err) {
                 createJv[sfAccount] = account.human();
-                env(createJv, txfee, ter(err));
+                env(createJv, txfee, Ter(err));
                 env.close();
             };
 
@@ -6463,148 +6475,148 @@ class MPToken_test : public beast::unit_test::suite
 
             // MPToken doesn't exist
 
-            createJv[sfAmount] = STAmount{USD(1'000)}.getJson();
+            createJv[sfAmount] = STAmount{usd(1'000)}.getJson();
             createFail(alice, tecNO_AUTH);
 
             // alice authorizes MPToken, can create
-            USD.authorize({.account = alice});
-            env(pay(gw, alice, USD(1'000'000)), txfee);
+            usd.authorize({.account = alice});
+            env(pay(gw, alice, usd(1'000'000)), txfee);
             env.close();
             createDeleteAMM(alice);
 
             // MPTLock is set
 
             // alice and issuer can't create
-            USD.set({.flags = tfMPTLock});
+            usd.set({.flags = tfMPTLock});
             createFail(alice, tecFROZEN);
             createFail(gw, tecFROZEN);
 
             // MPTRequireAuth is set
 
             // alice is not authorized
-            USD.set({.flags = tfMPTUnlock});
-            USD.set({.mutableFlags = tmfMPTSetRequireAuth});
+            usd.set({.flags = tfMPTUnlock});
+            usd.set({.mutableFlags = tmfMPTSetRequireAuth});
             createFail(alice, tecNO_AUTH);
             // issuer can create
             createDeleteAMM(gw);
 
             // alice is authorized, can create
-            USD.authorize({.account = gw, .holder = alice});
+            usd.authorize({.account = gw, .holder = alice});
             createDeleteAMM(alice);
 
             // MPTCanTransfer is not set
 
-            USD.set({.mutableFlags = tmfMPTClearRequireAuth});
-            USD.set({.mutableFlags = tmfMPTClearCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearRequireAuth});
+            usd.set({.mutableFlags = tmfMPTClearCanTransfer});
             // alice can't create
             createFail(alice, tecNO_PERMISSION);
             // issuer can create
             createDeleteAMM(gw);
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
             // alice can create
             createDeleteAMM(alice);
 
             // MPTCanTrade is not set
 
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            USD.set({.mutableFlags = tmfMPTClearCanTrade});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearCanTrade});
             // alice and issuer can't create
             createFail(alice, tecNO_PERMISSION);
             createFail(gw, tecNO_PERMISSION);
-            USD.set({.mutableFlags = tmfMPTSetCanTrade});
+            usd.set({.mutableFlags = tmfMPTSetCanTrade});
 
             //
             // AMMDeposit
             //
 
-            AMM amm(env, gw, USD(1'000), EUR(1'000));
+            AMM amm(env, gw, usd(1'000), eur(1'000));
 
             // MPTokenIssuance doesn't exist
 
             amm.deposit(
                 {.account = alice,
                  .asset1In = badMPT(1),
-                 .asset2In = EUR(1),
-                 .assets = std::make_pair(badMPT, EUR),
-                 .err = ter(terNO_AMM)});
+                 .asset2In = eur(1),
+                 .assets = std::make_pair(badMPT, eur),
+                 .err = Ter(terNO_AMM)});
 
             // MPToken doesn't exist
 
             amm.deposit(
-                {.account = carol, .asset1In = USD(1), .asset2In = EUR(1), .err = ter(tecNO_AUTH)});
+                {.account = carol, .asset1In = usd(1), .asset2In = eur(1), .err = Ter(tecNO_AUTH)});
 
             // MPTLock is set
 
-            USD.set({.flags = tfMPTLock});
+            usd.set({.flags = tfMPTLock});
             // alice and issuer can't deposit
             for (auto const& account : {carol, gw})
             {
                 amm.deposit(
                     {.account = account,
-                     .asset1In = USD(1),
-                     .asset2In = EUR(1),
-                     .err = ter(tecFROZEN)});
+                     .asset1In = usd(1),
+                     .asset2In = eur(1),
+                     .err = Ter(tecFROZEN)});
                 amm.deposit(
                     {.account = account,
-                     .asset1In = EUR(1),
-                     .assets = std::make_pair(EUR, USD),
-                     .err = ter(tecFROZEN)});
+                     .asset1In = eur(1),
+                     .assets = std::make_pair(eur, usd),
+                     .err = Ter(tecFROZEN)});
             }
-            USD.set({.flags = tfMPTUnlock});
+            usd.set({.flags = tfMPTUnlock});
 
             // MPTRequireAuth is set
 
             // carol authorizes MPToken but is not authorized by the issuer
-            USD.authorize({.account = carol});
-            env(pay(gw, carol, USD(1'000'000)));
+            usd.authorize({.account = carol});
+            env(pay(gw, carol, usd(1'000'000)));
             // carol authorizes EUR
-            EUR.authorize({.account = carol});
-            env(pay(gw, carol, EUR(1'000'000)));
-            USD.set({.mutableFlags = tmfMPTSetRequireAuth});
+            eur.authorize({.account = carol});
+            env(pay(gw, carol, eur(1'000'000)));
+            usd.set({.mutableFlags = tmfMPTSetRequireAuth});
             // have to authorize amm account
-            USD.authorize({.account = gw, .holder = Account{"amm", amm.ammAccount()}});
+            usd.authorize({.account = gw, .holder = Account{"amm", amm.ammAccount()}});
             env.close();
             amm.deposit(
-                {.account = carol, .asset1In = USD(1), .asset2In = EUR(1), .err = ter(tecNO_AUTH)});
+                {.account = carol, .asset1In = usd(1), .asset2In = eur(1), .err = Ter(tecNO_AUTH)});
             amm.deposit(
                 {.account = carol,
-                 .asset1In = EUR(1),
-                 .assets = std::make_pair(EUR, USD),
-                 .err = ter(tecNO_AUTH)});
+                 .asset1In = eur(1),
+                 .assets = std::make_pair(eur, usd),
+                 .err = Ter(tecNO_AUTH)});
             // issuer can deposit
             amm.deposit({.account = gw, .tokens = 1'000});
             // carol is authorized, can deposit
-            USD.authorize({.account = gw, .holder = carol});
+            usd.authorize({.account = gw, .holder = carol});
             amm.deposit({.account = carol, .tokens = 1'000});
 
             // MPTCanTransfer is not set
 
-            USD.set({.mutableFlags = tmfMPTClearRequireAuth});
-            USD.set({.mutableFlags = tmfMPTClearCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearRequireAuth});
+            usd.set({.mutableFlags = tmfMPTClearCanTransfer});
             // carol can't deposit
             amm.deposit(
                 {.account = carol,
-                 .asset1In = USD(1),
-                 .asset2In = EUR(1),
-                 .err = ter(tecNO_PERMISSION)});
+                 .asset1In = usd(1),
+                 .asset2In = eur(1),
+                 .err = Ter(tecNO_PERMISSION)});
             amm.deposit(
                 {.account = carol,
-                 .asset1In = EUR(1),
-                 .assets = std::make_pair(EUR, USD),
-                 .err = ter(tecNO_PERMISSION)});
+                 .asset1In = eur(1),
+                 .assets = std::make_pair(eur, usd),
+                 .err = Ter(tecNO_PERMISSION)});
             // issuer can deposit
             amm.deposit({.account = gw, .tokens = 1'000});
             // carol can deposit
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
             amm.deposit({.account = carol, .tokens = 1'000});
 
             // MPTCanTrade is not set
 
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            USD.set({.mutableFlags = tmfMPTClearCanTrade});
-            amm.deposit({.account = gw, .tokens = 1'000, .err = ter(tecNO_PERMISSION)});
-            amm.deposit({.account = carol, .tokens = 1'000, .err = ter(tecNO_PERMISSION)});
-            USD.set({.mutableFlags = tmfMPTSetCanTrade});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearCanTrade});
+            amm.deposit({.account = gw, .tokens = 1'000, .err = Ter(tecNO_PERMISSION)});
+            amm.deposit({.account = carol, .tokens = 1'000, .err = Ter(tecNO_PERMISSION)});
+            usd.set({.mutableFlags = tmfMPTSetCanTrade});
 
             //
             // AMMWithdraw
@@ -6616,88 +6628,88 @@ class MPToken_test : public beast::unit_test::suite
                 WithdrawArg{
                     .account = carol,
                     .asset1Out = badMPT(1),
-                    .asset2Out = EUR(1),
-                    .assets = std::make_pair(badMPT, EUR),
-                    .err = ter(terNO_AMM)});
+                    .asset2Out = eur(1),
+                    .assets = std::make_pair(badMPT, eur),
+                    .err = Ter(terNO_AMM)});
 
             // MPToken doesn't exist - doesn't apply since MPToken is created
             // on withdraw in this case
 
             // MPTLock is set
 
-            USD.set({.flags = tfMPTLock});
+            usd.set({.flags = tfMPTLock});
             // carol and issuer can't withdraw
             for (auto const& account : {carol, gw})
             {
                 amm.withdraw(
                     {.account = account,
-                     .asset1Out = USD(1),
-                     .asset2Out = EUR(1),
-                     .err = ter(tecFROZEN)});
-                amm.withdraw({.account = account, .tokens = 1'000, .err = ter(tecFROZEN)});
+                     .asset1Out = usd(1),
+                     .asset2Out = eur(1),
+                     .err = Ter(tecFROZEN)});
+                amm.withdraw({.account = account, .tokens = 1'000, .err = Ter(tecFROZEN)});
                 // can single withdraw another asset
                 amm.withdraw(
-                    {.account = account, .asset1Out = EUR(1), .assets = std::make_pair(EUR, USD)});
+                    {.account = account, .asset1Out = eur(1), .assets = std::make_pair(eur, usd)});
             }
-            USD.set({.flags = tfMPTUnlock});
+            usd.set({.flags = tfMPTUnlock});
 
             // MPTRequireAuth is set
 
-            USD.set({.mutableFlags = tmfMPTSetRequireAuth});
-            USD.authorize({.account = gw, .holder = carol, .flags = tfMPTUnauthorize});
+            usd.set({.mutableFlags = tmfMPTSetRequireAuth});
+            usd.authorize({.account = gw, .holder = carol, .flags = tfMPTUnauthorize});
             // carol can't withdraw
             amm.withdraw(
                 {.account = carol,
-                 .asset1Out = USD(1),
-                 .asset2Out = EUR(1),
-                 .err = ter(tecNO_AUTH)});
+                 .asset1Out = usd(1),
+                 .asset2Out = eur(1),
+                 .err = Ter(tecNO_AUTH)});
             // can withdraw another asset
             amm.withdraw(
-                {.account = carol, .asset1Out = EUR(1), .assets = std::make_pair(EUR, USD)});
+                {.account = carol, .asset1Out = eur(1), .assets = std::make_pair(eur, usd)});
             // issuer can withdraw
-            amm.withdraw({.account = gw, .asset1Out = USD(1), .asset2Out = EUR(1)});
+            amm.withdraw({.account = gw, .asset1Out = usd(1), .asset2Out = eur(1)});
             // carol is authorized, can withdraw
-            USD.authorize({.account = gw, .holder = carol});
-            amm.withdraw({.account = carol, .asset1Out = USD(1), .asset2Out = EUR(1)});
+            usd.authorize({.account = gw, .holder = carol});
+            amm.withdraw({.account = carol, .asset1Out = usd(1), .asset2Out = eur(1)});
 
             // MPTCanTransfer is set
 
-            USD.set({.mutableFlags = tmfMPTClearRequireAuth});
-            USD.set({.mutableFlags = tmfMPTClearCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearRequireAuth});
+            usd.set({.mutableFlags = tmfMPTClearCanTransfer});
             // carol can't withdraw
             amm.withdraw(
                 {.account = carol,
-                 .asset1Out = USD(1),
-                 .asset2Out = EUR(1),
-                 .err = ter(tecNO_PERMISSION)});
+                 .asset1Out = usd(1),
+                 .asset2Out = eur(1),
+                 .err = Ter(tecNO_PERMISSION)});
             // can withdraw another asset
             amm.withdraw(
-                {.account = carol, .asset1Out = EUR(1), .assets = std::make_pair(EUR, USD)});
+                {.account = carol, .asset1Out = eur(1), .assets = std::make_pair(eur, usd)});
             // issuer can withdraw
-            amm.withdraw({.account = gw, .asset1Out = USD(1), .asset2Out = EUR(1)});
+            amm.withdraw({.account = gw, .asset1Out = usd(1), .asset2Out = eur(1)});
             // carol can withdraw
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            amm.withdraw({.account = carol, .asset1Out = USD(1), .asset2Out = EUR(1)});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
+            amm.withdraw({.account = carol, .asset1Out = usd(1), .asset2Out = eur(1)});
 
-            USD.set({.mutableFlags = tmfMPTSetCanTransfer});
-            USD.set({.mutableFlags = tmfMPTClearCanTrade});
-            amm.withdraw({.account = gw, .tokens = 1'000, .err = ter(tecNO_PERMISSION)});
-            amm.withdraw({.account = carol, .tokens = 1'000, .err = ter(tecNO_PERMISSION)});
-            USD.set({.mutableFlags = tmfMPTSetCanTrade});
+            usd.set({.mutableFlags = tmfMPTSetCanTransfer});
+            usd.set({.mutableFlags = tmfMPTClearCanTrade});
+            amm.withdraw({.account = gw, .tokens = 1'000, .err = Ter(tecNO_PERMISSION)});
+            amm.withdraw({.account = carol, .tokens = 1'000, .err = Ter(tecNO_PERMISSION)});
+            usd.set({.mutableFlags = tmfMPTSetCanTrade});
 
             // MPToken created on withdraw
 
             // redeem all carol's USD and unauthorize USD
             amm.withdrawAll(carol);
-            env(pay(carol, gw, env.balance(carol, USD)));
-            USD.authorize({.account = carol, .flags = tfMPTUnauthorize});
-            BEAST_EXPECT(env.le(keylet::mptoken(USD.issuanceID(), carol)) == nullptr);
+            env(pay(carol, gw, env.balance(carol, usd)));
+            usd.authorize({.account = carol, .flags = tfMPTUnauthorize});
+            BEAST_EXPECT(env.le(keylet::mptoken(usd.issuanceID(), carol)) == nullptr);
             // single-deposit EUR
             amm.deposit(
-                {.account = carol, .asset1In = EUR(1'000), .assets = std::make_pair(EUR, USD)});
+                {.account = carol, .asset1In = eur(1'000), .assets = std::make_pair(eur, usd)});
             // withdraw in USD to create MPToken
-            amm.withdraw({.account = carol, .asset1Out = USD(100)});
-            BEAST_EXPECT(env.le(keylet::mptoken(USD.issuanceID(), carol)));
+            amm.withdraw({.account = carol, .asset1Out = usd(100)});
+            BEAST_EXPECT(env.le(keylet::mptoken(usd.issuanceID(), carol)));
         }
     }
 
@@ -6706,7 +6718,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         testMultiSendMaximumAmount(all);
         // MPTokenIssuanceCreate
diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp
index 1025b73fe8..f20847ae5c 100644
--- a/src/test/app/Manifest_test.cpp
+++ b/src/test/app/Manifest_test.cpp
@@ -39,19 +39,19 @@
 
 namespace xrpl::test {
 
-class Manifest_test : public beast::unit_test::suite
+class Manifest_test : public beast::unit_test::Suite
 {
 private:
     static PublicKey
     randomNode()
     {
-        return derivePublicKey(KeyType::secp256k1, randomSecretKey());
+        return derivePublicKey(KeyType::Secp256k1, randomSecretKey());
     }
 
     static PublicKey
     randomMasterKey()
     {
-        return derivePublicKey(KeyType::ed25519, randomSecretKey());
+        return derivePublicKey(KeyType::Ed25519, randomSecretKey());
     }
 
     static void
@@ -115,21 +115,21 @@ public:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        sign(st, HashPrefix::manifest, *publicKeyType(spk), ssk);
+        sign(st, HashPrefix::Manifest, *publicKeyType(spk), ssk);
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        sign(st, HashPrefix::manifest, *publicKeyType(pk), sk, sfMasterSignature);
+        sign(st, HashPrefix::Manifest, *publicKeyType(pk), sk, sfMasterSignature);
 
         Serializer s;
         st.add(s);
 
-        return base64_encode(std::string(static_cast<char const*>(s.data()), s.size()));
+        return base64Encode(std::string(static_cast<char const*>(s.data()), s.size()));
     }
 
     std::string
@@ -137,18 +137,18 @@ public:
     {
         auto const pk = derivePublicKey(type, sk);
 
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
         sign(
-            st, HashPrefix::manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
-        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::manifest, pk, sfMasterSignature));
+            st, HashPrefix::Manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
+        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::Manifest, pk, sfMasterSignature));
 
         Serializer s;
         st.add(s);
 
-        return base64_encode(std::string(static_cast<char const*>(s.data()), s.size()));
+        return base64Encode(std::string(static_cast<char const*>(s.data()), s.size()));
     }
 
     Manifest
@@ -156,13 +156,13 @@ public:
     {
         auto const pk = derivePublicKey(type, sk);
 
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
         sign(
-            st, HashPrefix::manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
-        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::manifest, pk, sfMasterSignature));
+            st, HashPrefix::Manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
+        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::Manifest, pk, sfMasterSignature));
 
         Serializer s;
         st.add(s);
@@ -186,17 +186,17 @@ public:
         auto const pk = derivePublicKey(type, sk);
         auto const spk = derivePublicKey(stype, ssk);
 
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
 
-        sign(st, HashPrefix::manifest, stype, ssk);
-        BEAST_EXPECT(verify(st, HashPrefix::manifest, spk));
+        sign(st, HashPrefix::Manifest, stype, ssk);
+        BEAST_EXPECT(verify(st, HashPrefix::Manifest, spk));
 
         sign(
-            st, HashPrefix::manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
-        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::manifest, pk, sfMasterSignature));
+            st, HashPrefix::Manifest, type, invalidSig ? randomSecretKey() : sk, sfMasterSignature);
+        BEAST_EXPECT(invalidSig ^ verify(st, HashPrefix::Manifest, pk, sfMasterSignature));
 
         Serializer s;
         st.add(s);
@@ -233,7 +233,7 @@ public:
                 [](ManifestCache const& cache) -> std::vector<Manifest const*> {
                 std::vector<Manifest const*> result;
                 result.reserve(32);
-                cache.for_each_manifest([&result](Manifest const& man) { result.push_back(&man); });
+                cache.forEachManifest([&result](Manifest const& man) { result.push_back(&man); });
                 return result;
             };
             auto sort = [](std::vector<Manifest const*> mv) -> std::vector<Manifest const*> {
@@ -310,8 +310,8 @@ public:
                     !loaded.load(*dbCon, "ValidatorManifests", badManifest, emptyRevocation));
 
                 auto const sk = randomSecretKey();
-                auto const pk = derivePublicKey(KeyType::ed25519, sk);
-                auto const kp = randomKeyPair(KeyType::secp256k1);
+                auto const pk = derivePublicKey(KeyType::Ed25519, sk);
+                auto const kp = randomKeyPair(KeyType::Secp256k1);
 
                 std::string const cfgManifest = makeManifestString(pk, sk, kp.first, kp.second, 0);
 
@@ -328,9 +328,9 @@ public:
                     !loaded.load(*dbCon, "ValidatorManifests", emptyManifest, badRevocation));
 
                 auto const sk = randomSecretKey();
-                auto const keyType = KeyType::ed25519;
+                auto const keyType = KeyType::Ed25519;
                 auto const pk = derivePublicKey(keyType, sk);
-                auto const kp = randomKeyPair(KeyType::secp256k1);
+                auto const kp = randomKeyPair(KeyType::Secp256k1);
                 std::vector<std::string> const nonRevocation = {
                     makeManifestString(pk, sk, kp.first, kp.second, 0)};
 
@@ -359,23 +359,23 @@ public:
     {
         testcase("getSignature");
         auto const sk = randomSecretKey();
-        auto const pk = derivePublicKey(KeyType::ed25519, sk);
-        auto const kp = randomKeyPair(KeyType::secp256k1);
-        auto const m = makeManifest(sk, KeyType::ed25519, kp.second, KeyType::secp256k1, 0);
+        auto const pk = derivePublicKey(KeyType::Ed25519, sk);
+        auto const kp = randomKeyPair(KeyType::Secp256k1);
+        auto const m = makeManifest(sk, KeyType::Ed25519, kp.second, KeyType::Secp256k1, 0);
 
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = 0;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = kp.first;
         Serializer ss;
-        ss.add32(HashPrefix::manifest);
+        ss.add32(HashPrefix::Manifest);
         st.addWithoutSigningFields(ss);
-        auto const sig = sign(KeyType::secp256k1, kp.second, ss.slice());
+        auto const sig = sign(KeyType::Secp256k1, kp.second, ss.slice());
         BEAST_EXPECT(
             strHex(sig) ==
             strHex(*m.getSignature()));  // NOLINT(bugprone-unchecked-optional-access)
 
-        auto const masterSig = sign(KeyType::ed25519, sk, ss.slice());
+        auto const masterSig = sign(KeyType::Ed25519, sk, ss.slice());
         BEAST_EXPECT(strHex(masterSig) == strHex(m.getMasterSignature()));
     }
 
@@ -386,7 +386,7 @@ public:
 
         ManifestCache cache;
         auto const sk = randomSecretKey();
-        auto const pk = derivePublicKey(KeyType::ed25519, sk);
+        auto const pk = derivePublicKey(KeyType::Ed25519, sk);
 
         // getSigningKey should return same key if there is no manifest
         BEAST_EXPECT(cache.getSigningKey(pk) == pk);
@@ -395,11 +395,11 @@ public:
         // for the listed validator master public key
         // getMasterKey should return the listed validator master key
         // for that ephemeral public key
-        auto const kp0 = randomKeyPair(KeyType::secp256k1);
+        auto const kp0 = randomKeyPair(KeyType::Secp256k1);
         BEAST_EXPECT(
-            ManifestDisposition::accepted ==
+            ManifestDisposition::Accepted ==
             cache.applyManifest(
-                makeManifest(sk, KeyType::ed25519, kp0.second, KeyType::secp256k1, 0)));
+                makeManifest(sk, KeyType::Ed25519, kp0.second, KeyType::Secp256k1, 0)));
         BEAST_EXPECT(cache.getSigningKey(pk) == kp0.first);
         BEAST_EXPECT(cache.getMasterKey(kp0.first) == pk);
 
@@ -407,11 +407,11 @@ public:
         // for the listed validator master public key
         // getMasterKey should only return a master key for the latest
         // ephemeral public key
-        auto const kp1 = randomKeyPair(KeyType::secp256k1);
+        auto const kp1 = randomKeyPair(KeyType::Secp256k1);
         BEAST_EXPECT(
-            ManifestDisposition::accepted ==
+            ManifestDisposition::Accepted ==
             cache.applyManifest(
-                makeManifest(sk, KeyType::ed25519, kp1.second, KeyType::secp256k1, 1)));
+                makeManifest(sk, KeyType::Ed25519, kp1.second, KeyType::Secp256k1, 1)));
         BEAST_EXPECT(cache.getSigningKey(pk) == kp1.first);
         BEAST_EXPECT(cache.getMasterKey(kp1.first) == pk);
         BEAST_EXPECT(cache.getMasterKey(kp0.first) == kp0.first);
@@ -419,9 +419,9 @@ public:
         // getSigningKey and getMasterKey should fail if a new manifest is
         // applied with the same signing key but a higher sequence
         BEAST_EXPECT(
-            ManifestDisposition::badEphemeralKey ==
+            ManifestDisposition::BadEphemeralKey ==
             cache.applyManifest(
-                makeManifest(sk, KeyType::ed25519, kp1.second, KeyType::secp256k1, 2)));
+                makeManifest(sk, KeyType::Ed25519, kp1.second, KeyType::Secp256k1, 2)));
         BEAST_EXPECT(cache.getSigningKey(pk) == kp1.first);
         BEAST_EXPECT(cache.getMasterKey(kp1.first) == pk);
         BEAST_EXPECT(cache.getMasterKey(kp0.first) == kp0.first);
@@ -430,8 +430,8 @@ public:
         // key getMasterKey should return std::nullopt for an ephemeral public
         // key from a revoked master public key
         BEAST_EXPECT(
-            ManifestDisposition::accepted ==
-            cache.applyManifest(makeRevocation(sk, KeyType::ed25519)));
+            ManifestDisposition::Accepted ==
+            cache.applyManifest(makeRevocation(sk, KeyType::Ed25519)));
         BEAST_EXPECT(cache.revoked(pk));
         BEAST_EXPECT(cache.getSigningKey(pk) == pk);
         BEAST_EXPECT(cache.getMasterKey(kp0.first) == kp0.first);
@@ -488,14 +488,14 @@ public:
     {
         testcase("Versioning");
 
-        auto const sk = generateSecretKey(KeyType::ed25519, randomSeed());
-        auto const pk = derivePublicKey(KeyType::ed25519, sk);
+        auto const sk = generateSecretKey(KeyType::Ed25519, randomSeed());
+        auto const pk = derivePublicKey(KeyType::Ed25519, sk);
 
-        auto const ssk = generateSecretKey(KeyType::secp256k1, randomSeed());
-        auto const spk = derivePublicKey(KeyType::secp256k1, ssk);
+        auto const ssk = generateSecretKey(KeyType::Secp256k1, randomSeed());
+        auto const spk = derivePublicKey(KeyType::Secp256k1, ssk);
 
         auto buildManifestObject = [&](std::uint16_t version) {
-            STObject st(sfGeneric);
+            STObject st(kSF_GENERIC);
             st[sfSequence] = 3;
             st[sfPublicKey] = pk;
             st[sfSigningPubKey] = spk;
@@ -503,8 +503,8 @@ public:
             if (version != 0)
                 st[sfVersion] = version;
 
-            sign(st, HashPrefix::manifest, KeyType::ed25519, sk, sfMasterSignature);
-            sign(st, HashPrefix::manifest, KeyType::secp256k1, ssk);
+            sign(st, HashPrefix::Manifest, KeyType::Ed25519, sk, sfMasterSignature);
+            sign(st, HashPrefix::Manifest, KeyType::Secp256k1, ssk);
 
             Serializer s;
             st.add(s);
@@ -523,7 +523,7 @@ public:
     void
     testManifestDeserialization()
     {
-        std::array<KeyType, 2> const keyTypes{{KeyType::ed25519, KeyType::secp256k1}};
+        std::array<KeyType, 2> const keyTypes{{KeyType::Ed25519, KeyType::Secp256k1}};
 
         std::uint32_t sequence = 0;
 
@@ -573,7 +573,7 @@ public:
                                                std::optional<std::string> domain,
                                                bool noSigningPublic = false,
                                                bool noSignature = false) {
-                    STObject st(sfGeneric);
+                    STObject st(kSF_GENERIC);
                     st[sfSequence] = seq;
                     st[sfPublicKey] = pk;
 
@@ -583,10 +583,10 @@ public:
                     if (!noSigningPublic)
                         st[sfSigningPubKey] = spk;
 
-                    sign(st, HashPrefix::manifest, keyType, sk, sfMasterSignature);
+                    sign(st, HashPrefix::Manifest, keyType, sk, sfMasterSignature);
 
                     if (!noSignature)
-                        sign(st, HashPrefix::manifest, sKeyType, ssk);
+                        sign(st, HashPrefix::Manifest, sKeyType, ssk);
 
                     return st;
                 };
@@ -724,14 +724,14 @@ public:
                     }
                     {
                         // reject matching master & ephemeral keys
-                        STObject st(sfGeneric);
+                        STObject st(kSF_GENERIC);
                         st[sfSequence] = 314159;
                         st[sfPublicKey] = pk;
                         st[sfSigningPubKey] = pk;
 
-                        sign(st, HashPrefix::manifest, keyType, sk, sfMasterSignature);
+                        sign(st, HashPrefix::Manifest, keyType, sk, sfMasterSignature);
 
-                        sign(st, HashPrefix::manifest, sKeyType, sk);
+                        sign(st, HashPrefix::Manifest, sKeyType, sk);
 
                         BEAST_EXPECT(!deserializeManifest(toString(st)));
                     }
@@ -790,21 +790,21 @@ public:
     {
         testcase("Manifest Domain Names");
 
-        auto const sk1 = generateSecretKey(KeyType::secp256k1, randomSeed());
-        auto const pk1 = derivePublicKey(KeyType::secp256k1, sk1);
+        auto const sk1 = generateSecretKey(KeyType::Secp256k1, randomSeed());
+        auto const pk1 = derivePublicKey(KeyType::Secp256k1, sk1);
 
-        auto const sk2 = generateSecretKey(KeyType::secp256k1, randomSeed());
-        auto const pk2 = derivePublicKey(KeyType::secp256k1, sk2);
+        auto const sk2 = generateSecretKey(KeyType::Secp256k1, randomSeed());
+        auto const pk2 = derivePublicKey(KeyType::Secp256k1, sk2);
 
         auto test = [&](std::string domain) {
-            STObject st(sfGeneric);
+            STObject st(kSF_GENERIC);
             st[sfSequence] = 7;
             st[sfPublicKey] = pk1;
             st[sfDomain] = makeSlice(domain);
             st[sfSigningPubKey] = pk2;
 
-            sign(st, HashPrefix::manifest, KeyType::secp256k1, sk1, sfMasterSignature);
-            sign(st, HashPrefix::manifest, KeyType::secp256k1, sk2);
+            sign(st, HashPrefix::Manifest, KeyType::Secp256k1, sk1, sfMasterSignature);
+            sign(st, HashPrefix::Manifest, KeyType::Secp256k1, sk2);
 
             Serializer s;
             st.add(s);
@@ -870,72 +870,71 @@ public:
         {
             testcase("apply");
 
-            auto const sk_a = randomSecretKey();
-            auto const pk_a = derivePublicKey(KeyType::ed25519, sk_a);
-            auto const kp_a0 = randomKeyPair(KeyType::secp256k1);
-            auto const kp_a1 = randomKeyPair(KeyType::secp256k1);
-            auto const s_a0 =
-                makeManifest(sk_a, KeyType::ed25519, kp_a0.second, KeyType::secp256k1, 0);
-            auto const s_a1 =
-                makeManifest(sk_a, KeyType::ed25519, kp_a1.second, KeyType::secp256k1, 1);
-            auto const s_a2 =
-                makeManifest(sk_a, KeyType::ed25519, kp_a1.second, KeyType::secp256k1, 2);
-            auto const s_aMax = makeRevocation(sk_a, KeyType::ed25519);
+            auto const skA = randomSecretKey();
+            auto const pkA = derivePublicKey(KeyType::Ed25519, skA);
+            auto const kpA0 = randomKeyPair(KeyType::Secp256k1);
+            auto const kpA1 = randomKeyPair(KeyType::Secp256k1);
+            auto const sA0 =
+                makeManifest(skA, KeyType::Ed25519, kpA0.second, KeyType::Secp256k1, 0);
+            auto const sA1 =
+                makeManifest(skA, KeyType::Ed25519, kpA1.second, KeyType::Secp256k1, 1);
+            auto const sA2 =
+                makeManifest(skA, KeyType::Ed25519, kpA1.second, KeyType::Secp256k1, 2);
+            auto const sAMax = makeRevocation(skA, KeyType::Ed25519);
 
-            auto const sk_b = randomSecretKey();
-            auto const kp_b0 = randomKeyPair(KeyType::secp256k1);
-            auto const kp_b1 = randomKeyPair(KeyType::secp256k1);
-            auto const kp_b2 = randomKeyPair(KeyType::secp256k1);
-            auto const s_b0 =
-                makeManifest(sk_b, KeyType::ed25519, kp_b0.second, KeyType::secp256k1, 0);
-            auto const s_b1 = makeManifest(
-                sk_b,
-                KeyType::ed25519,
-                kp_b1.second,
-                KeyType::secp256k1,
+            auto const skB = randomSecretKey();
+            auto const kpB0 = randomKeyPair(KeyType::Secp256k1);
+            auto const kpB1 = randomKeyPair(KeyType::Secp256k1);
+            auto const kpB2 = randomKeyPair(KeyType::Secp256k1);
+            auto const sB0 =
+                makeManifest(skB, KeyType::Ed25519, kpB0.second, KeyType::Secp256k1, 0);
+            auto const sB1 = makeManifest(
+                skB,
+                KeyType::Ed25519,
+                kpB1.second,
+                KeyType::Secp256k1,
                 1,
                 true);  // invalidSig
-            auto const s_b2 =
-                makeManifest(sk_b, KeyType::ed25519, kp_b2.second, KeyType::ed25519, 2);
+            auto const sB2 = makeManifest(skB, KeyType::Ed25519, kpB2.second, KeyType::Ed25519, 2);
 
-            auto const fake = s_b2.serialized + '\0';
+            auto const fake = sB2.serialized + '\0';
 
             // applyManifest should accept new manifests with
             // higher sequence numbers
             auto const seq0 = cache.sequence();
-            BEAST_EXPECT(cache.applyManifest(clone(s_a0)) == ManifestDisposition::accepted);
+            BEAST_EXPECT(cache.applyManifest(clone(sA0)) == ManifestDisposition::Accepted);
             BEAST_EXPECT(cache.sequence() > seq0);
 
             auto const seq1 = cache.sequence();
-            BEAST_EXPECT(cache.applyManifest(clone(s_a0)) == ManifestDisposition::stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sA0)) == ManifestDisposition::Stale);
             BEAST_EXPECT(cache.sequence() == seq1);
 
-            BEAST_EXPECT(cache.applyManifest(clone(s_a1)) == ManifestDisposition::accepted);
-            BEAST_EXPECT(cache.applyManifest(clone(s_a1)) == ManifestDisposition::stale);
-            BEAST_EXPECT(cache.applyManifest(clone(s_a0)) == ManifestDisposition::stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sA1)) == ManifestDisposition::Accepted);
+            BEAST_EXPECT(cache.applyManifest(clone(sA1)) == ManifestDisposition::Stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sA0)) == ManifestDisposition::Stale);
 
-            BEAST_EXPECT(cache.applyManifest(clone(s_a2)) == ManifestDisposition::badEphemeralKey);
+            BEAST_EXPECT(cache.applyManifest(clone(sA2)) == ManifestDisposition::BadEphemeralKey);
 
             // applyManifest should accept manifests with max sequence numbers
             // that revoke the master public key
-            BEAST_EXPECT(!cache.revoked(pk_a));
-            BEAST_EXPECT(s_aMax.revoked());
-            BEAST_EXPECT(cache.applyManifest(clone(s_aMax)) == ManifestDisposition::accepted);
-            BEAST_EXPECT(cache.applyManifest(clone(s_aMax)) == ManifestDisposition::stale);
-            BEAST_EXPECT(cache.applyManifest(clone(s_a1)) == ManifestDisposition::stale);
-            BEAST_EXPECT(cache.applyManifest(clone(s_a0)) == ManifestDisposition::stale);
-            BEAST_EXPECT(cache.revoked(pk_a));
+            BEAST_EXPECT(!cache.revoked(pkA));
+            BEAST_EXPECT(sAMax.revoked());
+            BEAST_EXPECT(cache.applyManifest(clone(sAMax)) == ManifestDisposition::Accepted);
+            BEAST_EXPECT(cache.applyManifest(clone(sAMax)) == ManifestDisposition::Stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sA1)) == ManifestDisposition::Stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sA0)) == ManifestDisposition::Stale);
+            BEAST_EXPECT(cache.revoked(pkA));
 
             // applyManifest should reject manifests with invalid signatures
-            BEAST_EXPECT(cache.applyManifest(clone(s_b0)) == ManifestDisposition::accepted);
-            BEAST_EXPECT(cache.applyManifest(clone(s_b0)) == ManifestDisposition::stale);
+            BEAST_EXPECT(cache.applyManifest(clone(sB0)) == ManifestDisposition::Accepted);
+            BEAST_EXPECT(cache.applyManifest(clone(sB0)) == ManifestDisposition::Stale);
             BEAST_EXPECT(!deserializeManifest(fake));
-            BEAST_EXPECT(cache.applyManifest(clone(s_b1)) == ManifestDisposition::invalid);
-            BEAST_EXPECT(cache.applyManifest(clone(s_b2)) == ManifestDisposition::accepted);
+            BEAST_EXPECT(cache.applyManifest(clone(sB1)) == ManifestDisposition::Invalid);
+            BEAST_EXPECT(cache.applyManifest(clone(sB2)) == ManifestDisposition::Accepted);
 
-            auto const s_c0 = makeManifest(
-                kp_b2.second, KeyType::ed25519, randomSecretKey(), KeyType::ed25519, 47);
-            BEAST_EXPECT(cache.applyManifest(clone(s_c0)) == ManifestDisposition::badMasterKey);
+            auto const sC0 = makeManifest(
+                kpB2.second, KeyType::Ed25519, randomSecretKey(), KeyType::Ed25519, 47);
+            BEAST_EXPECT(cache.applyManifest(clone(sC0)) == ManifestDisposition::BadMasterKey);
         }
 
         testLoadStore(cache);
diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp
index f41042644f..55e1b73158 100644
--- a/src/test/app/MultiSign_test.cpp
+++ b/src/test/app/MultiSign_test.cpp
@@ -47,41 +47,41 @@
 
 namespace xrpl::test {
 
-class MultiSign_test : public beast::unit_test::suite
+class MultiSign_test : public beast::unit_test::Suite
 {
     // Unfunded accounts to use for phantom signing.
-    jtx::Account const bogie{"bogie", KeyType::secp256k1};
-    jtx::Account const demon{"demon", KeyType::ed25519};
-    jtx::Account const ghost{"ghost", KeyType::secp256k1};
-    jtx::Account const haunt{"haunt", KeyType::ed25519};
-    jtx::Account const jinni{"jinni", KeyType::secp256k1};
-    jtx::Account const phase{"phase", KeyType::ed25519};
-    jtx::Account const shade{"shade", KeyType::secp256k1};
-    jtx::Account const spook{"spook", KeyType::ed25519};
-    jtx::Account const acc10{"acc10", KeyType::ed25519};
-    jtx::Account const acc11{"acc11", KeyType::ed25519};
-    jtx::Account const acc12{"acc12", KeyType::ed25519};
-    jtx::Account const acc13{"acc13", KeyType::ed25519};
-    jtx::Account const acc14{"acc14", KeyType::ed25519};
-    jtx::Account const acc15{"acc15", KeyType::ed25519};
-    jtx::Account const acc16{"acc16", KeyType::ed25519};
-    jtx::Account const acc17{"acc17", KeyType::ed25519};
-    jtx::Account const acc18{"acc18", KeyType::ed25519};
-    jtx::Account const acc19{"acc19", KeyType::ed25519};
-    jtx::Account const acc20{"acc20", KeyType::ed25519};
-    jtx::Account const acc21{"acc21", KeyType::ed25519};
-    jtx::Account const acc22{"acc22", KeyType::ed25519};
-    jtx::Account const acc23{"acc23", KeyType::ed25519};
-    jtx::Account const acc24{"acc24", KeyType::ed25519};
-    jtx::Account const acc25{"acc25", KeyType::ed25519};
-    jtx::Account const acc26{"acc26", KeyType::ed25519};
-    jtx::Account const acc27{"acc27", KeyType::ed25519};
-    jtx::Account const acc28{"acc28", KeyType::ed25519};
-    jtx::Account const acc29{"acc29", KeyType::ed25519};
-    jtx::Account const acc30{"acc30", KeyType::ed25519};
-    jtx::Account const acc31{"acc31", KeyType::ed25519};
-    jtx::Account const acc32{"acc32", KeyType::ed25519};
-    jtx::Account const acc33{"acc33", KeyType::ed25519};
+    jtx::Account const bogie_{"bogie", KeyType::Secp256k1};
+    jtx::Account const demon_{"demon", KeyType::Ed25519};
+    jtx::Account const ghost_{"ghost", KeyType::Secp256k1};
+    jtx::Account const haunt_{"haunt", KeyType::Ed25519};
+    jtx::Account const jinni_{"jinni", KeyType::Secp256k1};
+    jtx::Account const phase_{"phase", KeyType::Ed25519};
+    jtx::Account const shade_{"shade", KeyType::Secp256k1};
+    jtx::Account const spook_{"spook", KeyType::Ed25519};
+    jtx::Account const acc10_{"acc10", KeyType::Ed25519};
+    jtx::Account const acc11_{"acc11", KeyType::Ed25519};
+    jtx::Account const acc12_{"acc12", KeyType::Ed25519};
+    jtx::Account const acc13_{"acc13", KeyType::Ed25519};
+    jtx::Account const acc14_{"acc14", KeyType::Ed25519};
+    jtx::Account const acc15_{"acc15", KeyType::Ed25519};
+    jtx::Account const acc16_{"acc16", KeyType::Ed25519};
+    jtx::Account const acc17_{"acc17", KeyType::Ed25519};
+    jtx::Account const acc18_{"acc18", KeyType::Ed25519};
+    jtx::Account const acc19_{"acc19", KeyType::Ed25519};
+    jtx::Account const acc20_{"acc20", KeyType::Ed25519};
+    jtx::Account const acc21_{"acc21", KeyType::Ed25519};
+    jtx::Account const acc22_{"acc22", KeyType::Ed25519};
+    jtx::Account const acc23_{"acc23", KeyType::Ed25519};
+    jtx::Account const acc24_{"acc24", KeyType::Ed25519};
+    jtx::Account const acc25_{"acc25", KeyType::Ed25519};
+    jtx::Account const acc26_{"acc26", KeyType::Ed25519};
+    jtx::Account const acc27_{"acc27", KeyType::Ed25519};
+    jtx::Account const acc28_{"acc28", KeyType::Ed25519};
+    jtx::Account const acc29_{"acc29", KeyType::Ed25519};
+    jtx::Account const acc30_{"acc30", KeyType::Ed25519};
+    jtx::Account const acc31_{"acc31", KeyType::Ed25519};
+    jtx::Account const acc32_{"acc32", KeyType::Ed25519};
+    jtx::Account const acc33_{"acc33", KeyType::Ed25519};
 
 public:
     void
@@ -91,28 +91,28 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
 
         // Pay alice enough to meet the initial reserve, but not enough to
         // meet the reserve for a SignerListSet.
         auto const fee = env.current()->fees().base;
         env.fund(XRP(250) - drops(1), alice);
         env.close();
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
 
         {
             // Attach a signer list to alice.  Should fail.
-            Json::Value const signersList = signers(alice, 1, {{bogie, 1}});
-            env(signersList, ter(tecINSUFFICIENT_RESERVE));
+            json::Value const signersList = signers(alice, 1, {{bogie_, 1}});
+            env(signersList, Ter(tecINSUFFICIENT_RESERVE));
             env.close();
-            env.require(owners(alice, 0));
+            env.require(Owners(alice, 0));
 
             // Fund alice enough to set the signer list, then attach signers.
             env(pay(env.master, alice, fee + drops(1)));
             env.close();
             env(signersList);
             env.close();
-            env.require(owners(alice, 1));
+            env.require(Owners(alice, 1));
         }
         {
             // Pay alice enough to almost make the reserve for the biggest
@@ -120,32 +120,32 @@ public:
             env(pay(env.master, alice, fee - drops(1)));
 
             // Replace with the biggest possible signer list.  Should fail.
-            Json::Value const bigSigners = signers(
+            json::Value const bigSigners = signers(
                 alice,
                 1,
-                {{bogie, 1},
-                 {demon, 1},
-                 {ghost, 1},
-                 {haunt, 1},
-                 {jinni, 1},
-                 {phase, 1},
-                 {shade, 1},
-                 {spook, 1}});
-            env(bigSigners, ter(tecINSUFFICIENT_RESERVE));
+                {{bogie_, 1},
+                 {demon_, 1},
+                 {ghost_, 1},
+                 {haunt_, 1},
+                 {jinni_, 1},
+                 {phase_, 1},
+                 {shade_, 1},
+                 {spook_, 1}});
+            env(bigSigners, Ter(tecINSUFFICIENT_RESERVE));
             env.close();
-            env.require(owners(alice, 1));
+            env.require(Owners(alice, 1));
 
             // Fund alice one more drop (plus the fee) and succeed.
             env(pay(env.master, alice, fee + drops(1)));
             env.close();
             env(bigSigners);
             env.close();
-            env.require(owners(alice, 1));
+            env.require(Owners(alice, 1));
         }
         // Remove alice's signer list and get the owner count back.
-        env(signers(alice, jtx::none));
+        env(signers(alice, jtx::kNONE));
         env.close();
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
     }
 
     void
@@ -155,15 +155,15 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
         // Add alice as a multisigner for herself.  Should fail.
-        env(signers(alice, 1, {{alice, 1}}), ter(temBAD_SIGNER));
+        env(signers(alice, 1, {{alice, 1}}), Ter(temBAD_SIGNER));
 
         // Add a signer with a weight of zero.  Should fail.
-        env(signers(alice, 1, {{bogie, 0}}), ter(temBAD_WEIGHT));
+        env(signers(alice, 1, {{bogie_, 0}}), Ter(temBAD_WEIGHT));
 
         // Add a signer where the weight is too big.  Should fail since
         // the weight field is only 16 bits.  The jtx framework can't do
@@ -175,49 +175,50 @@ public:
         env(signers(
                 alice,
                 1,
-                {{bogie, 1},
-                 {demon, 1},
-                 {ghost, 1},
-                 {haunt, 1},
-                 {jinni, 1},
-                 {phase, 1},
-                 {demon, 1},
-                 {spook, 1}}),
-            ter(temBAD_SIGNER));
+                {{bogie_, 1},
+                 {demon_, 1},
+                 {ghost_, 1},
+                 {haunt_, 1},
+                 {jinni_, 1},
+                 {phase_, 1},
+                 {demon_, 1},
+                 {spook_, 1}}),
+            Ter(temBAD_SIGNER));
 
         // Set a quorum of zero.  Should fail.
-        env(signers(alice, 0, {{bogie, 1}}), ter(temMALFORMED));
+        env(signers(alice, 0, {{bogie_, 1}}), Ter(temMALFORMED));
 
         // Make a signer list where the quorum can't be met.  Should fail.
         env(signers(
                 alice,
                 9,
-                {{bogie, 1},
-                 {demon, 1},
-                 {ghost, 1},
-                 {haunt, 1},
-                 {jinni, 1},
-                 {phase, 1},
-                 {shade, 1},
-                 {spook, 1}}),
-            ter(temBAD_QUORUM));
+                {{bogie_, 1},
+                 {demon_, 1},
+                 {ghost_, 1},
+                 {haunt_, 1},
+                 {jinni_, 1},
+                 {phase_, 1},
+                 {shade_, 1},
+                 {spook_, 1}}),
+            Ter(temBAD_QUORUM));
 
         // Make a signer list that's too big.  Should fail.
-        Account const spare("spare", KeyType::secp256k1);
+        Account const spare("spare", KeyType::Secp256k1);
         env(signers(
                 alice,
                 1,
-                std::vector<signer>{
-                    {bogie, 1}, {demon, 1}, {ghost, 1}, {haunt, 1}, {jinni, 1}, {phase, 1},
-                    {shade, 1}, {spook, 1}, {spare, 1}, {acc10, 1}, {acc11, 1}, {acc12, 1},
-                    {acc13, 1}, {acc14, 1}, {acc15, 1}, {acc16, 1}, {acc17, 1}, {acc18, 1},
-                    {acc19, 1}, {acc20, 1}, {acc21, 1}, {acc22, 1}, {acc23, 1}, {acc24, 1},
-                    {acc25, 1}, {acc26, 1}, {acc27, 1}, {acc28, 1}, {acc29, 1}, {acc30, 1},
-                    {acc31, 1}, {acc32, 1}, {acc33, 1},
+                std::vector<Signer>{
+                    {bogie_, 1}, {demon_, 1}, {ghost_, 1}, {haunt_, 1}, {jinni_, 1}, {phase_, 1},
+                    {shade_, 1}, {spook_, 1}, {spare, 1},  {acc10_, 1}, {acc11_, 1}, {acc12_, 1},
+                    {acc13_, 1}, {acc14_, 1}, {acc15_, 1}, {acc16_, 1}, {acc17_, 1}, {acc18_, 1},
+                    {acc19_, 1}, {acc20_, 1}, {acc21_, 1}, {acc22_, 1}, {acc23_, 1}, {acc24_, 1},
+                    {acc25_, 1}, {acc26_, 1}, {acc27_, 1}, {acc28_, 1}, {acc29_, 1}, {acc30_, 1},
+                    {acc31_, 1}, {acc32_, 1}, {acc33_, 1},
                 }),
-            ter(temMALFORMED));
+            Ter(temMALFORMED));
+        // clang-format on
         env.close();
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
     }
 
     void
@@ -227,58 +228,58 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
         // Attach phantom signers to alice and use them for a transaction.
-        env(signers(alice, 1, {{bogie, 1}, {demon, 1}}));
+        env(signers(alice, 1, {{bogie_, 1}, {demon_, 1}}));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // This should work.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, demon), fee(3 * baseFee));
+        env(noop(alice), Msig(bogie_, demon_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Either signer alone should work.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee(2 * baseFee));
+        env(noop(alice), Msig(bogie_), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(demon), fee(2 * baseFee));
+        env(noop(alice), Msig(demon_), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Duplicate signers should fail.
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            msig(demon, demon),
-            fee(3 * baseFee),
-            rpc("invalidTransaction", "fails local checks: Duplicate Signers not allowed."));
+            Msig(demon_, demon_),
+            Fee(3 * baseFee),
+            Rpc("invalidTransaction", "fails local checks: Duplicate Signers not allowed."));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // A non-signer should fail.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, spook), fee(3 * baseFee), ter(tefBAD_SIGNATURE));
+        env(noop(alice), Msig(bogie_, spook_), Fee(3 * baseFee), Ter(tefBAD_SIGNATURE));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Don't meet the quorum.  Should fail.
-        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}));
+        env(signers(alice, 2, {{bogie_, 1}, {demon_, 1}}));
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee(2 * baseFee), ter(tefBAD_QUORUM));
+        env(noop(alice), Msig(bogie_), Fee(2 * baseFee), Ter(tefBAD_QUORUM));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Meet the quorum.  Should succeed.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, demon), fee(3 * baseFee));
+        env(noop(alice), Msig(bogie_, demon_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
     }
@@ -290,7 +291,7 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
@@ -298,28 +299,28 @@ public:
         env(signers(
             alice,
             1,
-            {{bogie, 1},
-             {demon, 1},
-             {ghost, 1},
-             {haunt, 1},
-             {jinni, 1},
-             {phase, 1},
-             {shade, 1},
-             {spook, 1}}));
+            {{bogie_, 1},
+             {demon_, 1},
+             {ghost_, 1},
+             {haunt_, 1},
+             {jinni_, 1},
+             {phase_, 1},
+             {shade_, 1},
+             {spook_, 1}}));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // This should work.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee(2 * baseFee));
+        env(noop(alice), Msig(bogie_), Fee(2 * baseFee));
         env.close();
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // This should fail because the fee is too small.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee((2 * baseFee) - 1), ter(telINSUF_FEE_P));
+        env(noop(alice), Msig(bogie_), Fee((2 * baseFee) - 1), Ter(telINSUF_FEE_P));
         env.close();
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -327,8 +328,8 @@ public:
         // This should work.
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            msig(bogie, demon, ghost, haunt, jinni, phase, shade, spook),
-            fee(9 * baseFee));
+            Msig(bogie_, demon_, ghost_, haunt_, jinni_, phase_, shade_, spook_),
+            Fee(9 * baseFee));
         env.close();
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
@@ -336,9 +337,9 @@ public:
         // This should fail because the fee is too small.
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            msig(bogie, demon, ghost, haunt, jinni, phase, shade, spook),
-            fee((9 * baseFee) - 1),
-            ter(telINSUF_FEE_P));
+            Msig(bogie_, demon_, ghost_, haunt_, jinni_, phase_, shade_, spook_),
+            Fee((9 * baseFee) - 1),
+            Ter(telINSUF_FEE_P));
         env.close();
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -351,22 +352,22 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
         // The signatures in a transaction must be submitted in sorted order.
         // Make sure the transaction fails if they are not.
-        env(signers(alice, 1, {{bogie, 1}, {demon, 1}}));
+        env(signers(alice, 1, {{bogie_, 1}, {demon_, 1}}));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
-        msig phantoms{bogie, demon};
+        Msig phantoms{bogie_, demon_};
         std::ranges::reverse(phantoms.signers);
         std::uint32_t const aliceSeq = env.seq(alice);
         env(noop(alice),
             phantoms,
-            rpc("invalidTransaction", "fails local checks: Unsorted Signers array."));
+            Rpc("invalidTransaction", "fails local checks: Unsorted Signers array."));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
     }
@@ -378,50 +379,50 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
-        Account const becky{"becky", KeyType::secp256k1};
-        Account const cheri{"cheri", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
+        Account const becky{"becky", KeyType::Secp256k1};
+        Account const cheri{"cheri", KeyType::Ed25519};
         env.fund(XRP(1000), alice, becky, cheri);
         env.close();
 
         // For a different situation, give alice a regular key but don't use it.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
         env.close();
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), sig(alice));
-        env(noop(alice), sig(alie));
+        env(noop(alice), Sig(alice));
+        env(noop(alice), Sig(alie));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 2);
 
         // Attach signers to alice
-        env(signers(alice, 4, {{becky, 3}, {cheri, 4}}), sig(alice));
+        env(signers(alice, 4, {{becky, 3}, {cheri, 4}}), Sig(alice));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // Attempt a multisigned transaction that meets the quorum.
         auto const baseFee = env.current()->fees().base;
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(cheri), fee(2 * baseFee));
+        env(noop(alice), Msig(cheri), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // If we don't meet the quorum the transaction should fail.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(becky), fee(2 * baseFee), ter(tefBAD_QUORUM));
+        env(noop(alice), Msig(becky), Fee(2 * baseFee), Ter(tefBAD_QUORUM));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Give becky and cheri regular keys.
-        Account const beck{"beck", KeyType::ed25519};
+        Account const beck{"beck", KeyType::Ed25519};
         env(regkey(becky, beck));
-        Account const cher{"cher", KeyType::ed25519};
+        Account const cher{"cher", KeyType::Ed25519};
         env(regkey(cheri, cher));
         env.close();
 
         // becky's and cheri's master keys should still work.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(becky, cheri), fee(3 * baseFee));
+        env(noop(alice), Msig(becky, cheri), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
     }
@@ -433,55 +434,55 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const cheri{"cheri", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const cheri{"cheri", KeyType::Secp256k1};
         env.fund(XRP(1000), alice, becky, cheri);
         env.close();
 
         // Attach signers to alice.
-        env(signers(alice, 1, {{becky, 1}, {cheri, 1}}), sig(alice));
+        env(signers(alice, 1, {{becky, 1}, {cheri, 1}}), Sig(alice));
 
         // Give everyone regular keys.
-        Account const alie{"alie", KeyType::ed25519};
+        Account const alie{"alie", KeyType::Ed25519};
         env(regkey(alice, alie));
-        Account const beck{"beck", KeyType::secp256k1};
+        Account const beck{"beck", KeyType::Secp256k1};
         env(regkey(becky, beck));
-        Account const cher{"cher", KeyType::ed25519};
+        Account const cher{"cher", KeyType::Ed25519};
         env(regkey(cheri, cher));
         env.close();
 
         // Disable cheri's master key to mix things up.
-        env(fset(cheri, asfDisableMaster), sig(cheri));
+        env(fset(cheri, asfDisableMaster), Sig(cheri));
         env.close();
 
         // Attempt a multisigned transaction that meets the quorum.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), msig(Reg{cheri, cher}), fee(2 * baseFee));
+        env(noop(alice), Msig(Reg{cheri, cher}), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // cheri should not be able to multisign using her master key.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(cheri), fee(2 * baseFee), ter(tefMASTER_DISABLED));
+        env(noop(alice), Msig(cheri), Fee(2 * baseFee), Ter(tefMASTER_DISABLED));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // becky should be able to multisign using either of her keys.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(becky), fee(2 * baseFee));
+        env(noop(alice), Msig(becky), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(Reg{becky, beck}), fee(2 * baseFee));
+        env(noop(alice), Msig(Reg{becky, beck}), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Both becky and cheri should be able to sign using regular keys.
         aliceSeq = env.seq(alice);
-        env(noop(alice), fee(3 * baseFee), msig(Reg{becky, beck}, Reg{cheri, cher}));
+        env(noop(alice), Fee(3 * baseFee), Msig(Reg{becky, beck}, Reg{cheri, cher}));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
     }
@@ -499,32 +500,32 @@ public:
                 return cfg;
             }),
             features);
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const cheri{"cheri", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const cheri{"cheri", KeyType::Secp256k1};
         env.fund(XRP(1000), alice, becky, cheri);
         env.close();
 
         // Attach signers to alice.
-        env(signers(alice, 2, {{becky, 1}, {cheri, 1}}), sig(alice));
+        env(signers(alice, 2, {{becky, 1}, {cheri, 1}}), Sig(alice));
 
         // Give everyone regular keys.
-        Account const beck{"beck", KeyType::secp256k1};
+        Account const beck{"beck", KeyType::Secp256k1};
         env(regkey(becky, beck));
-        Account const cher{"cher", KeyType::ed25519};
+        Account const cher{"cher", KeyType::Ed25519};
         env(regkey(cheri, cher));
         env.close();
 
         // Disable cheri's master key to mix things up.
-        env(fset(cheri, asfDisableMaster), sig(cheri));
+        env(fset(cheri, asfDisableMaster), Sig(cheri));
         env.close();
 
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = 0;
 
         // these represent oft-repeated setup for input json below
-        auto setup_tx = [&]() -> Json::Value {
-            Json::Value jv;
+        auto setupTx = [&]() -> json::Value {
+            json::Value jv;
             jv[jss::tx_json][jss::Account] = alice.human();
             jv[jss::tx_json][jss::TransactionType] = jss::AccountSet;
             jv[jss::tx_json][jss::Fee] = (8 * baseFee).jsonClipped();
@@ -532,12 +533,12 @@ public:
             jv[jss::tx_json][jss::SigningPubKey] = "";
             return jv;
         };
-        auto cheri_sign = [&](Json::Value& jv) {
+        auto cheriSign = [&](json::Value& jv) {
             jv[jss::account] = cheri.human();
             jv[jss::key_type] = "ed25519";
             jv[jss::passphrase] = cher.name();
         };
-        auto becky_sign = [&](Json::Value& jv) {
+        auto beckySign = [&](json::Value& jv) {
             jv[jss::account] = becky.human();
             jv[jss::secret] = beck.name();
         };
@@ -546,22 +547,22 @@ public:
             // Attempt a multisigned transaction that meets the quorum.
             // using sign_for and submit_multisigned
             aliceSeq = env.seq(alice);
-            Json::Value jv_one = setup_tx();
-            cheri_sign(jv_one);
-            auto jrr = env.rpc("json", "sign_for", to_string(jv_one))[jss::result];
+            json::Value jvOne = setupTx();
+            cheriSign(jvOne);
+            auto jrr = env.rpc("json", "sign_for", to_string(jvOne))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
             // for the second sign_for, use the returned tx_json with
             // first signer info
-            Json::Value jv_two;
-            jv_two[jss::tx_json] = jrr[jss::tx_json];
-            becky_sign(jv_two);
-            jrr = env.rpc("json", "sign_for", to_string(jv_two))[jss::result];
+            json::Value jvTwo;
+            jvTwo[jss::tx_json] = jrr[jss::tx_json];
+            beckySign(jvTwo);
+            jrr = env.rpc("json", "sign_for", to_string(jvTwo))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
-            Json::Value jv_submit;
-            jv_submit[jss::tx_json] = jrr[jss::tx_json];
-            jrr = env.rpc("json", "submit_multisigned", to_string(jv_submit))[jss::result];
+            json::Value jvSubmit;
+            jvSubmit[jss::tx_json] = jrr[jss::tx_json];
+            jrr = env.rpc("json", "submit_multisigned", to_string(jvSubmit))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
             env.close();
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
@@ -570,10 +571,10 @@ public:
         {
             // failure case -- SigningPubKey not empty
             aliceSeq = env.seq(alice);
-            Json::Value jv_one = setup_tx();
-            jv_one[jss::tx_json][jss::SigningPubKey] = strHex(alice.pk().slice());
-            cheri_sign(jv_one);
-            auto jrr = env.rpc("json", "sign_for", to_string(jv_one))[jss::result];
+            json::Value jvOne = setupTx();
+            jvOne[jss::tx_json][jss::SigningPubKey] = strHex(alice.pk().slice());
+            cheriSign(jvOne);
+            auto jrr = env.rpc("json", "sign_for", to_string(jvOne))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(
@@ -584,23 +585,23 @@ public:
         {
             // failure case - bad fee
             aliceSeq = env.seq(alice);
-            Json::Value jv_one = setup_tx();
-            jv_one[jss::tx_json][jss::Fee] = -1;
-            cheri_sign(jv_one);
-            auto jrr = env.rpc("json", "sign_for", to_string(jv_one))[jss::result];
+            json::Value jvOne = setupTx();
+            jvOne[jss::tx_json][jss::Fee] = -1;
+            cheriSign(jvOne);
+            auto jrr = env.rpc("json", "sign_for", to_string(jvOne))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
             // for the second sign_for, use the returned tx_json with
             // first signer info
-            Json::Value jv_two;
-            jv_two[jss::tx_json] = jrr[jss::tx_json];
-            becky_sign(jv_two);
-            jrr = env.rpc("json", "sign_for", to_string(jv_two))[jss::result];
+            json::Value jvTwo;
+            jvTwo[jss::tx_json] = jrr[jss::tx_json];
+            beckySign(jvTwo);
+            jrr = env.rpc("json", "sign_for", to_string(jvTwo))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
-            Json::Value jv_submit;
-            jv_submit[jss::tx_json] = jrr[jss::tx_json];
-            jrr = env.rpc("json", "submit_multisigned", to_string(jv_submit))[jss::result];
+            json::Value jvSubmit;
+            jvSubmit[jss::tx_json] = jrr[jss::tx_json];
+            jrr = env.rpc("json", "submit_multisigned", to_string(jvSubmit))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(
@@ -610,23 +611,23 @@ public:
         {
             // failure case - bad fee v2
             aliceSeq = env.seq(alice);
-            Json::Value jv_one = setup_tx();
-            jv_one[jss::tx_json][jss::Fee] = alice["USD"](10).value().getFullText();
-            cheri_sign(jv_one);
-            auto jrr = env.rpc("json", "sign_for", to_string(jv_one))[jss::result];
+            json::Value jvOne = setupTx();
+            jvOne[jss::tx_json][jss::Fee] = alice["USD"](10).value().getFullText();
+            cheriSign(jvOne);
+            auto jrr = env.rpc("json", "sign_for", to_string(jvOne))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
             // for the second sign_for, use the returned tx_json with
             // first signer info
-            Json::Value jv_two;
-            jv_two[jss::tx_json] = jrr[jss::tx_json];
-            becky_sign(jv_two);
-            jrr = env.rpc("json", "sign_for", to_string(jv_two))[jss::result];
+            json::Value jvTwo;
+            jvTwo[jss::tx_json] = jrr[jss::tx_json];
+            beckySign(jvTwo);
+            jrr = env.rpc("json", "sign_for", to_string(jvTwo))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
-            Json::Value jv_submit;
-            jv_submit[jss::tx_json] = jrr[jss::tx_json];
-            jrr = env.rpc("json", "submit_multisigned", to_string(jv_submit))[jss::result];
+            json::Value jvSubmit;
+            jvSubmit[jss::tx_json] = jrr[jss::tx_json];
+            jrr = env.rpc("json", "submit_multisigned", to_string(jvSubmit))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error] == "internal");
             BEAST_EXPECT(jrr[jss::error_message] == "Internal error.");
@@ -635,7 +636,7 @@ public:
         {
             // cheri should not be able to multisign using her master key.
             aliceSeq = env.seq(alice);
-            Json::Value jv = setup_tx();
+            json::Value jv = setupTx();
             jv[jss::account] = cheri.human();
             jv[jss::secret] = cheri.name();
             auto jrr = env.rpc("json", "sign_for", to_string(jv))[jss::result];
@@ -649,24 +650,24 @@ public:
             // Unlike cheri, becky should also be able to sign using her master
             // key
             aliceSeq = env.seq(alice);
-            Json::Value jv_one = setup_tx();
-            cheri_sign(jv_one);
-            auto jrr = env.rpc("json", "sign_for", to_string(jv_one))[jss::result];
+            json::Value jvOne = setupTx();
+            cheriSign(jvOne);
+            auto jrr = env.rpc("json", "sign_for", to_string(jvOne))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
             // for the second sign_for, use the returned tx_json with
             // first signer info
-            Json::Value jv_two;
-            jv_two[jss::tx_json] = jrr[jss::tx_json];
-            jv_two[jss::account] = becky.human();
-            jv_two[jss::key_type] = "ed25519";
-            jv_two[jss::passphrase] = becky.name();
-            jrr = env.rpc("json", "sign_for", to_string(jv_two))[jss::result];
+            json::Value jvTwo;
+            jvTwo[jss::tx_json] = jrr[jss::tx_json];
+            jvTwo[jss::account] = becky.human();
+            jvTwo[jss::key_type] = "ed25519";
+            jvTwo[jss::passphrase] = becky.name();
+            jrr = env.rpc("json", "sign_for", to_string(jvTwo))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
 
-            Json::Value jv_submit;
-            jv_submit[jss::tx_json] = jrr[jss::tx_json];
-            jrr = env.rpc("json", "submit_multisigned", to_string(jv_submit))[jss::result];
+            json::Value jvSubmit;
+            jvSubmit[jss::tx_json] = jrr[jss::tx_json];
+            jrr = env.rpc("json", "submit_multisigned", to_string(jvSubmit))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "success");
             env.close();
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
@@ -674,9 +675,9 @@ public:
 
         {
             // check for bad or bogus accounts in the tx
-            Json::Value jv = setup_tx();
+            json::Value jv = setupTx();
             jv[jss::tx_json][jss::Account] = "DEADBEEF";
-            cheri_sign(jv);
+            cheriSign(jv);
             auto jrr = env.rpc("json", "sign_for", to_string(jv))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error] == "srcActMalformed");
@@ -690,9 +691,9 @@ public:
 
         {
             aliceSeq = env.seq(alice);
-            Json::Value jv = setup_tx();
-            jv[jss::tx_json][sfSigners.fieldName] = Json::Value{Json::arrayValue};
-            becky_sign(jv);
+            json::Value jv = setupTx();
+            jv[jss::tx_json][sfSigners.fieldName] = json::Value{json::ArrayValue};
+            beckySign(jv);
             auto jrr = env.rpc("json", "submit_multisigned", to_string(jv))[jss::result];
             BEAST_EXPECT(jrr[jss::status] == "error");
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -709,65 +710,65 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const cheri{"cheri", KeyType::secp256k1};
-        Account const daria{"daria", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const cheri{"cheri", KeyType::Secp256k1};
+        Account const daria{"daria", KeyType::Ed25519};
         env.fund(XRP(1000), alice, becky, cheri, daria);
         env.close();
 
         // alice uses a regular key with the master disabled.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // becky is master only without a regular key.
 
         // cheri has a regular key, but leaves the master key enabled.
-        Account const cher{"cher", KeyType::secp256k1};
+        Account const cher{"cher", KeyType::Secp256k1};
         env(regkey(cheri, cher));
 
         // daria has a regular key and disables her master key.
-        Account const dari{"dari", KeyType::ed25519};
+        Account const dari{"dari", KeyType::Ed25519};
         env(regkey(daria, dari));
-        env(fset(daria, asfDisableMaster), sig(daria));
+        env(fset(daria, asfDisableMaster), Sig(daria));
         env.close();
 
         // Attach signers to alice.
-        env(signers(alice, 1, {{becky, 1}, {cheri, 1}, {daria, 1}, {jinni, 1}}), sig(alie));
+        env(signers(alice, 1, {{becky, 1}, {cheri, 1}, {daria, 1}, {jinni_, 1}}), Sig(alie));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // Each type of signer should succeed individually.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), msig(becky), fee(2 * baseFee));
+        env(noop(alice), Msig(becky), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(cheri), fee(2 * baseFee));
+        env(noop(alice), Msig(cheri), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(Reg{cheri, cher}), fee(2 * baseFee));
+        env(noop(alice), Msig(Reg{cheri, cher}), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(Reg{daria, dari}), fee(2 * baseFee));
+        env(noop(alice), Msig(Reg{daria, dari}), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(jinni), fee(2 * baseFee));
+        env(noop(alice), Msig(jinni_), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         //  Should also work if all signers sign.
         aliceSeq = env.seq(alice);
-        env(noop(alice), fee(5 * baseFee), msig(becky, Reg{cheri, cher}, Reg{daria, dari}, jinni));
+        env(noop(alice), Fee(5 * baseFee), Msig(becky, Reg{cheri, cher}, Reg{daria, dari}, jinni_));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
@@ -775,19 +776,19 @@ public:
         env(signers(
                 alice,
                 0x3FFFC,
-                {{becky, 0xFFFF}, {cheri, 0xFFFF}, {daria, 0xFFFF}, {jinni, 0xFFFF}}),
-            sig(alie));
+                {{becky, 0xFFFF}, {cheri, 0xFFFF}, {daria, 0xFFFF}, {jinni_, 0xFFFF}}),
+            Sig(alie));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), fee(9 * baseFee), msig(becky, Reg{cheri, cher}, Reg{daria, dari}, jinni));
+        env(noop(alice), Fee(9 * baseFee), Msig(becky, Reg{cheri, cher}, Reg{daria, dari}, jinni_));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Try cheri with both key types.
         aliceSeq = env.seq(alice);
-        env(noop(alice), fee(5 * baseFee), msig(becky, cheri, Reg{daria, dari}, jinni));
+        env(noop(alice), Fee(5 * baseFee), Msig(becky, cheri, Reg{daria, dari}, jinni_));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
@@ -798,35 +799,36 @@ public:
                 {{becky, 0xFFFF},
                  {cheri, 0xFFFF},
                  {daria, 0xFFFF},
-                 {haunt, 0xFFFF},
-                 {jinni, 0xFFFF},
-                 {phase, 0xFFFF},
-                 {shade, 0xFFFF},
-                 {spook, 0xFFFF}}),
-            sig(alie));
+                 {haunt_, 0xFFFF},
+                 {jinni_, 0xFFFF},
+                 {phase_, 0xFFFF},
+                 {shade_, 0xFFFF},
+                 {spook_, 0xFFFF}}),
+            Sig(alie));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            fee(9 * baseFee),
-            msig(becky, Reg{cheri, cher}, Reg{daria, dari}, haunt, jinni, phase, shade, spook));
+            Fee(9 * baseFee),
+            Msig(
+                becky, Reg{cheri, cher}, Reg{daria, dari}, haunt_, jinni_, phase_, shade_, spook_));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // One signer short should fail.
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            msig(becky, cheri, haunt, jinni, phase, shade, spook),
-            fee(8 * baseFee),
-            ter(tefBAD_QUORUM));
+            Msig(becky, cheri, haunt_, jinni_, phase_, shade_, spook_),
+            Fee(8 * baseFee),
+            Ter(tefBAD_QUORUM));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Remove alice's signer list and get the owner count back.
-        env(signers(alice, jtx::none), sig(alie));
+        env(signers(alice, jtx::kNONE), Sig(alie));
         env.close();
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
     }
 
     // We want to always leave an account signable.  Make sure the that we
@@ -838,7 +840,7 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
@@ -859,51 +861,51 @@ public:
 
         // Master key tests.
         // M0: A lone master key cannot be disabled.
-        env(fset(alice, asfDisableMaster), sig(alice), ter(tecNO_ALTERNATIVE_KEY));
+        env(fset(alice, asfDisableMaster), Sig(alice), Ter(tecNO_ALTERNATIVE_KEY));
 
         // Add a regular key.
-        Account const alie{"alie", KeyType::ed25519};
+        Account const alie{"alie", KeyType::Ed25519};
         env(regkey(alice, alie));
 
         // M1: The master key can be disabled if there's a regular key.
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // R0: A lone regular key cannot be removed.
-        env(regkey(alice, disabled), 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));
+        env(signers(alice, 1, {{bogie_, 1}}), Sig(alie));
 
         // R1: The regular key can be removed if there's a signer list.
-        env(regkey(alice, disabled), 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::none), 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));
+        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::none), 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));
+        env(signers(alice, 1, {{bogie_, 1}}), Sig(alice));
 
         // M2: The master key can be disabled if there's a signer list.
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // Add a regular key.
-        env(regkey(alice, alie), msig(bogie), fee(2 * baseFee));
+        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::none), sig(alie));
+        env(signers(alice, jtx::kNONE), Sig(alie));
 
         // Enable the master key.
-        env(fclear(alice, asfDisableMaster), sig(alie));
+        env(fclear(alice, asfDisableMaster), Sig(alie));
 
         // R2: The regular key can be removed if the master key is enabled.
-        env(regkey(alice, disabled), sig(alie));
+        env(regkey(alice, kDISABLED), Sig(alie));
     }
 
     // Verify that the first regular key can be made for free using the
@@ -915,33 +917,33 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
         env.fund(XRP(1000), alice);
         env.close();
 
         // Give alice a regular key with a zero fee.  Should succeed.  Once.
-        Account const alie{"alie", KeyType::ed25519};
-        env(regkey(alice, alie), sig(alice), fee(0));
+        Account const alie{"alie", KeyType::Ed25519};
+        env(regkey(alice, alie), Sig(alice), Fee(0));
 
         // Try it again and creating the regular key for free should fail.
-        Account const liss{"liss", KeyType::secp256k1};
-        env(regkey(alice, liss), sig(alice), fee(0), ter(telINSUF_FEE_P));
+        Account const liss{"liss", KeyType::Secp256k1};
+        env(regkey(alice, liss), Sig(alice), Fee(0), Ter(telINSUF_FEE_P));
 
         // But paying to create a regular key should succeed.
-        env(regkey(alice, liss), sig(alice));
+        env(regkey(alice, liss), Sig(alice));
 
         // In contrast, trying to multisign for a regular key with a zero
         // fee should always fail.  Even the first time.
-        Account const becky{"becky", KeyType::ed25519};
+        Account const becky{"becky", KeyType::Ed25519};
         env.fund(XRP(1000), becky);
         env.close();
 
-        env(signers(becky, 1, {{alice, 1}}), sig(becky));
-        env(regkey(becky, alie), msig(alice), fee(0), ter(telINSUF_FEE_P));
+        env(signers(becky, 1, {{alice, 1}}), Sig(becky));
+        env(regkey(becky, alie), Msig(alice), Fee(0), Ter(telINSUF_FEE_P));
 
         // Using the master key to sign for a regular key for free should
         // still work.
-        env(regkey(becky, alie), sig(becky), fee(0));
+        env(regkey(becky, alie), Sig(becky), Fee(0));
     }
 
     // See if every kind of transaction can be successfully multi-signed.
@@ -952,78 +954,78 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const zelda{"zelda", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const zelda{"zelda", KeyType::Secp256k1};
         Account const gw{"gw"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(1000), alice, becky, zelda, gw);
         env.close();
 
         // alice uses a regular key with the master disabled.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // Attach signers to alice.
-        env(signers(alice, 2, {{becky, 1}, {bogie, 1}}), sig(alie));
+        env(signers(alice, 2, {{becky, 1}, {bogie_, 1}}), Sig(alie));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // Multisign a ttPAYMENT.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(pay(alice, env.master, XRP(1)), msig(becky, bogie), fee(3 * baseFee));
+        env(pay(alice, env.master, XRP(1)), Msig(becky, bogie_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Multisign a ttACCOUNT_SET.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(becky, bogie), fee(3 * baseFee));
+        env(noop(alice), Msig(becky, bogie_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Multisign a ttREGULAR_KEY_SET.
         aliceSeq = env.seq(alice);
-        Account const ace{"ace", KeyType::secp256k1};
-        env(regkey(alice, ace), msig(becky, bogie), fee(3 * baseFee));
+        Account const ace{"ace", KeyType::Secp256k1};
+        env(regkey(alice, ace), Msig(becky, bogie_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Multisign a ttTRUST_SET
-        env(trust("alice", USD(100)),
-            msig(becky, bogie),
-            fee(3 * baseFee),
-            require(lines("alice", 1)));
+        env(trust("alice", usd(100)),
+            Msig(becky, bogie_),
+            Fee(3 * baseFee),
+            Require(lines("alice", 1)));
         env.close();
-        env.require(owners(alice, 2));
+        env.require(Owners(alice, 2));
 
         // Multisign a ttOFFER_CREATE transaction.
-        env(pay(gw, alice, USD(50)));
+        env(pay(gw, alice, usd(50)));
         env.close();
-        env.require(balance(alice, USD(50)));
-        env.require(balance(gw, alice["USD"](-50)));
+        env.require(Balance(alice, usd(50)));
+        env.require(Balance(gw, alice["USD"](-50)));
 
         std::uint32_t const offerSeq = env.seq(alice);
-        env(offer(alice, XRP(50), USD(50)), msig(becky, bogie), fee(3 * baseFee));
+        env(offer(alice, XRP(50), usd(50)), Msig(becky, bogie_), Fee(3 * baseFee));
         env.close();
-        env.require(owners(alice, 3));
+        env.require(Owners(alice, 3));
 
         // Now multisign a ttOFFER_CANCEL canceling the offer we just created.
         {
             aliceSeq = env.seq(alice);
-            env(offer_cancel(alice, offerSeq), seq(aliceSeq), msig(becky, bogie), fee(3 * baseFee));
+            env(offerCancel(alice, offerSeq), Seq(aliceSeq), Msig(becky, bogie_), Fee(3 * baseFee));
             env.close();
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
-            env.require(owners(alice, 2));
+            env.require(Owners(alice, 2));
         }
 
         // Multisign a ttSIGNER_LIST_SET.
-        env(signers(alice, 3, {{becky, 1}, {bogie, 1}, {demon, 1}}),
-            msig(becky, bogie),
-            fee(3 * baseFee));
+        env(signers(alice, 3, {{becky, 1}, {bogie_, 1}, {demon_, 1}}),
+            Msig(becky, bogie_),
+            Fee(3 * baseFee));
         env.close();
-        env.require(owners(alice, 2));
+        env.require(Owners(alice, 2));
     }
 
     void
@@ -1038,7 +1040,7 @@ public:
 
         // lambda that submits an STTx and returns the resulting JSON.
         auto submitSTTx = [&env](STTx const& stx) {
-            Json::Value jvResult;
+            json::Value jvResult;
             jvResult[jss::tx_blob] = strHex(stx.getSerializer().slice());
             return env.rpc("json", "submit", to_string(jvResult));
         };
@@ -1046,12 +1048,12 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(1000), alice);
         env.close();
-        env(signers(alice, 1, {{bogie, 1}, {demon, 1}}), sig(alice));
+        env(signers(alice, 1, {{bogie_, 1}, {demon_, 1}}), Sig(alice));
 
         auto const baseFee = env.current()->fees().base;
         {
             // Single-sign, but leave an empty SigningPubKey.
-            JTx const tx = env.jt(noop(alice), sig(alice));
+            JTx const tx = env.jt(noop(alice), Sig(alice));
             STTx local = *(tx.stx);
             local.setFieldVL(sfSigningPubKey, Blob());  // Empty SigningPubKey
             auto const info = submitSTTx(local);
@@ -1061,7 +1063,7 @@ public:
         }
         {
             // Single-sign, but invalidate the signature.
-            JTx const tx = env.jt(noop(alice), sig(alice));
+            JTx const tx = env.jt(noop(alice), Sig(alice));
             STTx local = *(tx.stx);
             // Flip some bits in the signature.
             auto badSig = local.getFieldVL(sfTxnSignature);
@@ -1075,7 +1077,7 @@ public:
         }
         {
             // Single-sign, but invalidate the sequence number.
-            JTx const tx = env.jt(noop(alice), sig(alice));
+            JTx const tx = env.jt(noop(alice), Sig(alice));
             STTx local = *(tx.stx);
             // Flip some bits in the signature.
             auto seq = local.getFieldU32(sfSequence);
@@ -1088,7 +1090,7 @@ public:
         }
         {
             // Multisign, but leave a nonempty sfSigningPubKey.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_));
             STTx local = *(tx.stx);
             local[sfSigningPubKey] = alice.pk();  // Insert sfSigningPubKey
             auto const info = submitSTTx(local);
@@ -1098,7 +1100,7 @@ public:
         }
         {
             // Both multi- and single-sign with an empty SigningPubKey.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_));
             STTx local = *(tx.stx);
             local.sign(alice.pk(), alice.sk());
             local.setFieldVL(sfSigningPubKey, Blob());  // Empty SigningPubKey
@@ -1109,7 +1111,7 @@ public:
         }
         {
             // Multisign but invalidate one of the signatures.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_));
             STTx local = *(tx.stx);
             // Flip some bits in the signature.
             auto& signer = local.peekFieldArray(sfSigners).back();
@@ -1124,7 +1126,7 @@ public:
         }
         {
             // Multisign with an empty signers array should fail.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_));
             STTx local = *(tx.stx);
             local.peekFieldArray(sfSigners).clear();  // Empty Signers array.
             auto const info = submitSTTx(local);
@@ -1135,42 +1137,42 @@ public:
         {
             JTx const tx = env.jt(
                 noop(alice),
-                fee(2 * baseFee),
+                Fee(2 * baseFee),
 
-                msig(
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie,
-                    bogie));
+                Msig(
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_,
+                    bogie_));
             STTx const local = *(tx.stx);
             auto const info = submitSTTx(local);
             BEAST_EXPECT(
@@ -1179,7 +1181,7 @@ public:
         }
         {
             // The account owner may not multisign for themselves.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(alice));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(alice));
             STTx const local = *(tx.stx);
             auto const info = submitSTTx(local);
             BEAST_EXPECT(
@@ -1188,7 +1190,7 @@ public:
         }
         {
             // No duplicate multisignatures allowed.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie, bogie));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_, bogie_));
             STTx const local = *(tx.stx);
             auto const info = submitSTTx(local);
             BEAST_EXPECT(
@@ -1197,7 +1199,7 @@ public:
         }
         {
             // Multisignatures must be submitted in sorted order.
-            JTx const tx = env.jt(noop(alice), fee(2 * baseFee), msig(bogie, demon));
+            JTx const tx = env.jt(noop(alice), Fee(2 * baseFee), Msig(bogie_, demon_));
             STTx local = *(tx.stx);
             // Unsort the Signers array.
             auto& signers = local.peekFieldArray(sfSigners);
@@ -1217,13 +1219,13 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
-        Account const becky{"becky", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Ed25519};
+        Account const becky{"becky", KeyType::Secp256k1};
         env.fund(XRP(1000), alice, becky);
         env.close();
 
         auto const baseFee = env.current()->fees().base;
-        env(noop(alice), msig(becky, demon), fee(3 * baseFee), ter(tefNOT_MULTI_SIGNING));
+        env(noop(alice), Msig(becky, demon_), Fee(3 * baseFee), Ter(tefNOT_MULTI_SIGNING));
     }
 
     void
@@ -1238,8 +1240,8 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
-        Account const becky{"becky", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Ed25519};
+        Account const becky{"becky", KeyType::Secp256k1};
         env.fund(XRP(1000), alice, becky);
         env.close();
 
@@ -1248,13 +1250,13 @@ public:
         env.close();
 
         // becky sets up her signer list.
-        env(signers(becky, 1, {{bogie, 1}, {demon, 1}}));
+        env(signers(becky, 1, {{bogie_, 1}, {demon_, 1}}));
         env.close();
 
         // Because becky has not (yet) disabled her master key, she can
         // multisign a transaction for alice.
         auto const baseFee = env.current()->fees().base;
-        env(noop(alice), msig(becky), fee(2 * baseFee));
+        env(noop(alice), Msig(becky), Fee(2 * baseFee));
         env.close();
 
         // Now becky disables her master key.
@@ -1263,31 +1265,31 @@ public:
 
         // Since becky's master key is disabled she can no longer
         // multisign for alice.
-        env(noop(alice), msig(becky), fee(2 * baseFee), ter(tefMASTER_DISABLED));
+        env(noop(alice), Msig(becky), Fee(2 * baseFee), Ter(tefMASTER_DISABLED));
         env.close();
 
         // Becky cannot 2-level multisign for alice.  2-level multisigning
         // is not supported.
-        env(noop(alice), msig(Reg{becky, bogie}), fee(2 * baseFee), ter(tefBAD_SIGNATURE));
+        env(noop(alice), Msig(Reg{becky, bogie_}), Fee(2 * baseFee), Ter(tefBAD_SIGNATURE));
         env.close();
 
         // Verify that becky cannot sign with a regular key that she has
         // not yet enabled.
-        Account const beck{"beck", KeyType::ed25519};
-        env(noop(alice), msig(Reg{becky, beck}), fee(2 * baseFee), ter(tefBAD_SIGNATURE));
+        Account const beck{"beck", KeyType::Ed25519};
+        env(noop(alice), Msig(Reg{becky, beck}), Fee(2 * baseFee), Ter(tefBAD_SIGNATURE));
         env.close();
 
         // Once becky gives herself the regular key, she can sign for alice
         // using that regular key.
-        env(regkey(becky, beck), msig(demon), fee(2 * baseFee));
+        env(regkey(becky, beck), Msig(demon_), Fee(2 * baseFee));
         env.close();
 
-        env(noop(alice), msig(Reg{becky, beck}), fee(2 * baseFee));
+        env(noop(alice), Msig(Reg{becky, beck}), Fee(2 * baseFee));
         env.close();
 
         // The presence of becky's regular key does not influence whether she
         // can 2-level multisign; it still won't work.
-        env(noop(alice), msig(Reg{becky, demon}), fee(2 * baseFee), ter(tefBAD_SIGNATURE));
+        env(noop(alice), Msig(Reg{becky, demon_}), Fee(2 * baseFee), Ter(tefBAD_SIGNATURE));
         env.close();
     }
 
@@ -1301,7 +1303,7 @@ public:
         // through "submit_multisigned".  Make sure that hash also locates
         // the transaction in the ledger.
         using namespace jtx;
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
 
         Env env(
             *this,
@@ -1313,15 +1315,15 @@ public:
         env.fund(XRP(1000), alice);
         env.close();
 
-        env(signers(alice, 2, {{bogie, 1}, {ghost, 1}}));
+        env(signers(alice, 2, {{bogie_, 1}, {ghost_, 1}}));
         env.close();
 
         // Use sign_for to sign a transaction where alice pays 10 XRP to
         // masterpassphrase.
         auto const baseFee = env.current()->fees().base;
-        Json::Value jvSig1;
-        jvSig1[jss::account] = bogie.human();
-        jvSig1[jss::secret] = bogie.name();
+        json::Value jvSig1;
+        jvSig1[jss::account] = bogie_.human();
+        jvSig1[jss::secret] = bogie_.name();
         jvSig1[jss::tx_json][jss::Account] = alice.human();
         jvSig1[jss::tx_json][jss::Amount] = 10000000;
         jvSig1[jss::tx_json][jss::Destination] = env.master.human();
@@ -1329,16 +1331,16 @@ public:
         jvSig1[jss::tx_json][jss::Sequence] = env.seq(alice);
         jvSig1[jss::tx_json][jss::TransactionType] = jss::Payment;
 
-        Json::Value jvSig2 = env.rpc("json", "sign_for", to_string(jvSig1));
+        json::Value jvSig2 = env.rpc("json", "sign_for", to_string(jvSig1));
         BEAST_EXPECT(jvSig2[jss::result][jss::status].asString() == "success");
 
         // Save the hash with one signature for use later.
         std::string const hash1 = jvSig2[jss::result][jss::tx_json][jss::hash].asString();
 
         // Add the next signature and sign again.
-        jvSig2[jss::result][jss::account] = ghost.human();
-        jvSig2[jss::result][jss::secret] = ghost.name();
-        Json::Value jvSubmit = env.rpc("json", "sign_for", to_string(jvSig2[jss::result]));
+        jvSig2[jss::result][jss::account] = ghost_.human();
+        jvSig2[jss::result][jss::secret] = ghost_.name();
+        json::Value jvSubmit = env.rpc("json", "sign_for", to_string(jvSig2[jss::result]));
         BEAST_EXPECT(jvSubmit[jss::result][jss::status].asString() == "success");
 
         // Save the hash with two signatures for use later.
@@ -1346,7 +1348,7 @@ public:
         BEAST_EXPECT(hash1 != hash2);
 
         // Submit the result of the two signatures.
-        Json::Value jvResult =
+        json::Value jvResult =
             env.rpc("json", "submit_multisigned", to_string(jvSubmit[jss::result]));
         BEAST_EXPECT(jvResult[jss::result][jss::status].asString() == "success");
         BEAST_EXPECT(jvResult[jss::result][jss::engine_result].asString() == "tesSUCCESS");
@@ -1358,7 +1360,7 @@ public:
 
         // The transaction we just submitted should now be available and
         // validated.
-        Json::Value jvTx = env.rpc("tx", hash2);
+        json::Value jvTx = env.rpc("tx", hash2);
         BEAST_EXPECT(jvTx[jss::result][jss::status].asString() == "success");
         BEAST_EXPECT(jvTx[jss::result][jss::validated].asString() == "true");
         BEAST_EXPECT(
@@ -1372,7 +1374,7 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(2000), alice);
         env.close();
 
@@ -1383,20 +1385,20 @@ public:
         std::uint32_t const aliceSeq = env.seq(alice);
 
         // Attach phantom signers to alice using a ticket.
-        env(signers(alice, 1, {{bogie, 1}, {demon, 1}}), ticket::use(aliceTicketSeq++));
+        env(signers(alice, 1, {{bogie_, 1}, {demon_, 1}}), ticket::Use(aliceTicketSeq++));
         env.close();
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // This should work.
         auto const baseFee = env.current()->fees().base;
-        env(noop(alice), msig(bogie, demon), fee(3 * baseFee), ticket::use(aliceTicketSeq++));
+        env(noop(alice), Msig(bogie_, demon_), Fee(3 * baseFee), ticket::Use(aliceTicketSeq++));
         env.close();
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Should also be able to remove the signer list using a ticket.
-        env(signers(alice, jtx::none), 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);
@@ -1409,7 +1411,7 @@ public:
 
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
         uint8_t tag1[] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x02, 0x03,
@@ -1418,57 +1420,57 @@ public:
 
         uint8_t tag2[] = "hello world some ascii 32b long";  // including 1 byte for NUL
 
-        uint256 bogie_tag = xrpl::base_uint<256>::fromVoid(tag1);
-        uint256 demon_tag = xrpl::base_uint<256>::fromVoid(tag2);
+        uint256 bogieTag = xrpl::BaseUint<256>::fromVoid(tag1);
+        uint256 demonTag = xrpl::BaseUint<256>::fromVoid(tag2);
 
         // Attach phantom signers to alice and use them for a transaction.
-        env(signers(alice, 1, {{bogie, 1, bogie_tag}, {demon, 1, demon_tag}}));
+        env(signers(alice, 1, {{bogie_, 1, bogieTag}, {demon_, 1, demonTag}}));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // This should work.
         auto const baseFee = env.current()->fees().base;
         std::uint32_t aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, demon), fee(3 * baseFee));
+        env(noop(alice), Msig(bogie_, demon_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Either signer alone should work.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee(2 * baseFee));
+        env(noop(alice), Msig(bogie_), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(demon), fee(2 * baseFee));
+        env(noop(alice), Msig(demon_), Fee(2 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Duplicate signers should fail.
         aliceSeq = env.seq(alice);
         env(noop(alice),
-            msig(demon, demon),
-            fee(3 * baseFee),
-            rpc("invalidTransaction", "fails local checks: Duplicate Signers not allowed."));
+            Msig(demon_, demon_),
+            Fee(3 * baseFee),
+            Rpc("invalidTransaction", "fails local checks: Duplicate Signers not allowed."));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // A non-signer should fail.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, spook), fee(3 * baseFee), ter(tefBAD_SIGNATURE));
+        env(noop(alice), Msig(bogie_, spook_), Fee(3 * baseFee), Ter(tefBAD_SIGNATURE));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Don't meet the quorum.  Should fail.
-        env(signers(alice, 2, {{bogie, 1}, {demon, 1}}));
+        env(signers(alice, 2, {{bogie_, 1}, {demon_, 1}}));
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie), fee(2 * baseFee), ter(tefBAD_QUORUM));
+        env(noop(alice), Msig(bogie_), Fee(2 * baseFee), Ter(tefBAD_QUORUM));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
 
         // Meet the quorum.  Should succeed.
         aliceSeq = env.seq(alice);
-        env(noop(alice), msig(bogie, demon), fee(3 * baseFee));
+        env(noop(alice), Msig(bogie_, demon_), Fee(3 * baseFee));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
     }
@@ -1487,8 +1489,8 @@ public:
         bool const enabled = features[fixInvalidTxFlags];
         testcase(std::string("SignerListSet flag, fix ") + (enabled ? "enabled" : "disabled"));
 
-        ter const expected(enabled ? TER(temINVALID_FLAG) : TER(tesSUCCESS));
-        env(signers(alice, 2, {{bogie, 1}, {ghost, 1}}), expected, txflags(tfPassive));
+        Ter const expected(enabled ? TER(temINVALID_FLAG) : TER(tesSUCCESS));
+        env(signers(alice, 2, {{bogie_, 1}, {ghost_, 1}}), expected, Txflags(tfPassive));
         env.close();
     }
 
@@ -1500,12 +1502,12 @@ public:
         // Verify that the SignerList object is created correctly.
         using namespace jtx;
         Env env{*this, features};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
         // Attach phantom signers to alice.
-        env(signers(alice, 1, {{bogie, 1}, {demon, 1}}));
+        env(signers(alice, 1, {{bogie_, 1}, {demon_, 1}}));
         env.close();
 
         // Verify that the SignerList object was created correctly.
@@ -1549,7 +1551,7 @@ public:
     run() override
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
 
         testAll(all);
 
diff --git a/src/test/app/NFTokenAuth_test.cpp b/src/test/app/NFTokenAuth_test.cpp
index 2542f2eb36..da5760f387 100644
--- a/src/test/app/NFTokenAuth_test.cpp
+++ b/src/test/app/NFTokenAuth_test.cpp
@@ -29,7 +29,7 @@
 
 namespace xrpl {
 
-class NFTokenAuth_test : public beast::unit_test::suite
+class NFTokenAuth_test : public beast::unit_test::Suite
 {
     static auto
     mintAndOfferNFT(
@@ -40,11 +40,11 @@ class NFTokenAuth_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
         auto const nftID{token::getNextID(env, account, 0u, tfTransferable, xfee)};
-        env(token::mint(account, 0), token::xferFee(xfee), txflags(tfTransferable));
+        env(token::mint(account, 0), token::XferFee(xfee), Txflags(tfTransferable));
         env.close();
 
         auto const sellIdx = keylet::nftoffer(account, env.seq(account)).key;
-        env(token::createOffer(account, nftID, currency), txflags(tfSellNFToken));
+        env(token::createOffer(account, nftID, currency), Txflags(tfSellNFToken));
         env.close();
 
         return std::make_tuple(nftID, sellIdx);
@@ -52,86 +52,86 @@ class NFTokenAuth_test : public beast::unit_test::suite
 
 public:
     void
-    testBuyOffer_UnauthorizedSeller(FeatureBitset features)
+    testBuyOfferUnauthorizedSeller(FeatureBitset features)
     {
         testcase("Unauthorized seller tries to accept buy offer");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
 
-        auto const [nftID, _] = mintAndOfferNFT(env, A2, drops(1));
-        auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
+        auto const [nftID, _] = mintAndOfferNFT(env, a2, drops(1));
+        auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
 
         // It should be possible to create a buy offer even if NFT owner is not
         // authorized
-        env(token::createOffer(A1, nftID, USD(10)), token::owner(A2));
+        env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2));
 
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: G1 requires authorization of A2, no trust line exists
-            env(token::acceptBuyOffer(A2, buyIdx), ter(tecNO_LINE));
+            env(token::acceptBuyOffer(a2, buyIdx), Ter(tecNO_LINE));
             env.close();
 
             // trust line created, but not authorized
-            env(trust(A2, limit));
+            env(trust(a2, limit));
 
             // test: G1 requires authorization of A2
-            env(token::acceptBuyOffer(A2, buyIdx), ter(tecNO_AUTH));
+            env(token::acceptBuyOffer(a2, buyIdx), Ter(tecNO_AUTH));
             env.close();
         }
         else
         {
             // Old behavior: it is possible to sell tokens and receive IOUs
             // without the authorization
-            env(token::acceptBuyOffer(A2, buyIdx));
+            env(token::acceptBuyOffer(a2, buyIdx));
             env.close();
 
-            BEAST_EXPECT(env.balance(A2, USD) == USD(10));
+            BEAST_EXPECT(env.balance(a2, usd) == usd(10));
         }
     }
 
     void
-    testCreateBuyOffer_UnauthorizedBuyer(FeatureBitset features)
+    testCreateBuyOfferUnauthorizedBuyer(FeatureBitset features)
     {
         testcase("Unauthorized buyer tries to create buy offer");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const [nftID, _] = mintAndOfferNFT(env, A2, drops(1));
+        auto const [nftID, _] = mintAndOfferNFT(env, a2, drops(1));
 
         // test: check that buyer can't make an offer if they're not authorized.
-        env(token::createOffer(A1, nftID, USD(10)), token::owner(A2), ter(tecUNFUNDED_OFFER));
+        env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2), Ter(tecUNFUNDED_OFFER));
         env.close();
 
         // Artificially create an unauthorized trustline with balance. Don't
         // close ledger before running the actual tests against this trustline.
         // After ledger is closed, the trustline will not exist.
         auto const unauthTrustline = [&](OpenView& view, beast::Journal) -> bool {
-            auto const sleA1 = std::make_shared<SLE>(keylet::line(A1, G1, G1["USD"].currency));
-            sleA1->setFieldAmount(sfBalance, A1["USD"](-1000));
+            auto const sleA1 = std::make_shared<SLE>(keylet::line(a1, g1, g1["USD"].currency));
+            sleA1->setFieldAmount(sfBalance, a1["USD"](-1000));
             view.rawInsert(sleA1);
             return true;
         };
@@ -140,52 +140,52 @@ public:
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: check that buyer can't make an offer even with balance
-            env(token::createOffer(A1, nftID, USD(10)), token::owner(A2), ter(tecNO_AUTH));
+            env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2), Ter(tecNO_AUTH));
         }
         else
         {
             // old behavior: can create an offer if balance allows, regardless
             // ot authorization
-            env(token::createOffer(A1, nftID, USD(10)), token::owner(A2));
+            env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2));
         }
     }
 
     void
-    testAcceptBuyOffer_UnauthorizedBuyer(FeatureBitset features)
+    testAcceptBuyOfferUnauthorizedBuyer(FeatureBitset features)
     {
         testcase("Seller tries to accept buy offer from unauth buyer");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        auto const [nftID, _] = mintAndOfferNFT(env, A2, drops(1));
+        auto const [nftID, _] = mintAndOfferNFT(env, a2, drops(1));
 
         // First we authorize buyer and seller so that he can create buy offer
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(10)));
-        env(trust(A2, limit));
-        env(trust(G1, limit, A2, tfSetfAuth));
-        env(pay(G1, A2, USD(10)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(10)));
+        env(trust(a2, limit));
+        env(trust(g1, limit, a2, tfSetfAuth));
+        env(pay(g1, a2, usd(10)));
         env.close();
 
-        auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-        env(token::createOffer(A1, nftID, USD(10)), token::owner(A2));
+        auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+        env(token::createOffer(a1, nftID, usd(10)), token::Owner(a2));
         env.close();
 
-        env(pay(A1, G1, USD(10)));
-        env(trust(A1, USD(0)));
-        env(trust(G1, A1["USD"](0)));
+        env(pay(a1, g1, usd(10)));
+        env(trust(a1, usd(0)));
+        env(trust(g1, a1["USD"](0)));
         env.close();
 
         // Replace an existing authorized trustline with artificial unauthorized
@@ -193,8 +193,8 @@ public:
         // tests against this trustline. After ledger is closed, the trustline
         // will not exist.
         auto const unauthTrustline = [&](OpenView& view, beast::Journal) -> bool {
-            auto const sleA1 = std::make_shared<SLE>(keylet::line(A1, G1, G1["USD"].currency));
-            sleA1->setFieldAmount(sfBalance, A1["USD"](-1000));
+            auto const sleA1 = std::make_shared<SLE>(keylet::line(a1, g1, g1["USD"].currency));
+            sleA1->setFieldAmount(sfBalance, a1["USD"](-1000));
             view.rawInsert(sleA1);
             return true;
         };
@@ -202,12 +202,12 @@ public:
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: check that offer can't be accepted even with balance
-            env(token::acceptBuyOffer(A2, buyIdx), ter(tecNO_AUTH));
+            env(token::acceptBuyOffer(a2, buyIdx), Ter(tecNO_AUTH));
         }
     }
 
     void
-    testSellOffer_UnauthorizedSeller(FeatureBitset features)
+    testSellOfferUnauthorizedSeller(FeatureBitset features)
     {
         testcase(
             "Authorized buyer tries to accept sell offer from unauthorized "
@@ -215,154 +215,154 @@ public:
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
 
-        auto const [nftID, _] = mintAndOfferNFT(env, A2, drops(1));
+        auto const [nftID, _] = mintAndOfferNFT(env, a2, drops(1));
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: can't create sell offer if there is no trustline but auth
             // required
-            env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken), ter(tecNO_LINE));
+            env(token::createOffer(a2, nftID, usd(10)), Txflags(tfSellNFToken), Ter(tecNO_LINE));
 
-            env(trust(A2, limit));
+            env(trust(a2, limit));
             // test: can't create sell offer if not authorized to hold token
-            env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken), ter(tecNO_AUTH));
+            env(token::createOffer(a2, nftID, usd(10)), Txflags(tfSellNFToken), Ter(tecNO_AUTH));
 
             // Authorizing trustline to make an offer creation possible
-            env(trust(G1, USD(0), A2, tfSetfAuth));
+            env(trust(g1, usd(0), a2, tfSetfAuth));
             env.close();
-            auto const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key;
-            env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken));
+            auto const sellIdx = keylet::nftoffer(a2, env.seq(a2)).key;
+            env(token::createOffer(a2, nftID, usd(10)), Txflags(tfSellNFToken));
             env.close();
             //
 
             // Reseting trustline to delete it. This allows to check if
             // already existing offers handled correctly
-            env(trust(A2, USD(0)));
+            env(trust(a2, usd(0)));
             env.close();
 
             // test: G1 requires authorization of A1, no trust line exists
-            env(token::acceptSellOffer(A1, sellIdx), ter(tecNO_LINE));
+            env(token::acceptSellOffer(a1, sellIdx), Ter(tecNO_LINE));
             env.close();
 
             // trust line created, but not authorized
-            env(trust(A2, limit));
+            env(trust(a2, limit));
             env.close();
 
             // test: G1 requires authorization of A1
-            env(token::acceptSellOffer(A1, sellIdx), ter(tecNO_AUTH));
+            env(token::acceptSellOffer(a1, sellIdx), Ter(tecNO_AUTH));
             env.close();
         }
         else
         {
-            auto const sellIdx = keylet::nftoffer(A2, env.seq(A2)).key;
+            auto const sellIdx = keylet::nftoffer(a2, env.seq(a2)).key;
 
             // Old behavior: sell offer can be created without authorization
-            env(token::createOffer(A2, nftID, USD(10)), txflags(tfSellNFToken));
+            env(token::createOffer(a2, nftID, usd(10)), Txflags(tfSellNFToken));
             env.close();
 
             // Old behavior: it is possible to sell NFT and receive IOUs
             // without the authorization
-            env(token::acceptSellOffer(A1, sellIdx));
+            env(token::acceptSellOffer(a1, sellIdx));
             env.close();
 
-            BEAST_EXPECT(env.balance(A2, USD) == USD(10));
+            BEAST_EXPECT(env.balance(a2, usd) == usd(10));
         }
     }
 
     void
-    testSellOffer_UnauthorizedBuyer(FeatureBitset features)
+    testSellOfferUnauthorizedBuyer(FeatureBitset features)
     {
         testcase("Unauthorized buyer tries to accept sell offer");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A2, limit));
-        env(trust(G1, limit, A2, tfSetfAuth));
+        env(trust(a2, limit));
+        env(trust(g1, limit, a2, tfSetfAuth));
 
-        auto const [_, sellIdx] = mintAndOfferNFT(env, A2, USD(10));
+        auto const [_, sellIdx] = mintAndOfferNFT(env, a2, usd(10));
 
         // test: check that buyer can't accept an offer if they're not
         // authorized.
-        env(token::acceptSellOffer(A1, sellIdx), ter(tecINSUFFICIENT_FUNDS));
+        env(token::acceptSellOffer(a1, sellIdx), Ter(tecINSUFFICIENT_FUNDS));
         env.close();
 
         // Creating an artificial unauth trustline
         auto const unauthTrustline = [&](OpenView& view, beast::Journal) -> bool {
-            auto const sleA1 = std::make_shared<SLE>(keylet::line(A1, G1, G1["USD"].currency));
-            sleA1->setFieldAmount(sfBalance, A1["USD"](-1000));
+            auto const sleA1 = std::make_shared<SLE>(keylet::line(a1, g1, g1["USD"].currency));
+            sleA1->setFieldAmount(sfBalance, a1["USD"](-1000));
             view.rawInsert(sleA1);
             return true;
         };
         env.app().getOpenLedger().modify(unauthTrustline);
         if (features[fixEnforceNFTokenTrustlineV2])
         {
-            env(token::acceptSellOffer(A1, sellIdx), ter(tecNO_AUTH));
+            env(token::acceptSellOffer(a1, sellIdx), Ter(tecNO_AUTH));
         }
     }
 
     void
-    testBrokeredAcceptOffer_UnauthorizedBroker(FeatureBitset features)
+    testBrokeredAcceptOfferUnauthorizedBroker(FeatureBitset features)
     {
         testcase("Unauthorized broker bridges authorized buyer and seller.");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
         Account const broker{"broker"};
-        auto const USD{G1["USD"]};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2, broker);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2, broker);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
-        env(trust(A2, limit));
-        env(trust(G1, limit, A2, tfSetfAuth));
-        env(pay(G1, A2, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
+        env(trust(a2, limit));
+        env(trust(g1, limit, a2, tfSetfAuth));
+        env(pay(g1, a2, usd(1000)));
         env.close();
 
-        auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10));
-        auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-        env(token::createOffer(A1, nftID, USD(11)), token::owner(A2));
+        auto const [nftID, sellIdx] = mintAndOfferNFT(env, a2, usd(10));
+        auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+        env(token::createOffer(a1, nftID, usd(11)), token::Owner(a2));
         env.close();
 
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: G1 requires authorization of broker, no trust line exists
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecNO_LINE));
+                token::BrokerFee(usd(1)),
+                Ter(tecNO_LINE));
             env.close();
 
             // trust line created, but not authorized
@@ -371,8 +371,8 @@ public:
 
             // test: G1 requires authorization of broker
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecNO_AUTH));
+                token::BrokerFee(usd(1)),
+                Ter(tecNO_AUTH));
             env.close();
 
             // test: can still be brokered without broker fee.
@@ -382,15 +382,15 @@ public:
         else
         {
             // Old behavior: broker can receive IOUs without the authorization
-            env(token::brokerOffers(broker, buyIdx, sellIdx), token::brokerFee(USD(1)));
+            env(token::brokerOffers(broker, buyIdx, sellIdx), token::BrokerFee(usd(1)));
             env.close();
 
-            BEAST_EXPECT(env.balance(broker, USD) == USD(1));
+            BEAST_EXPECT(env.balance(broker, usd) == usd(1));
         }
     }
 
     void
-    testBrokeredAcceptOffer_UnauthorizedBuyer(FeatureBitset features)
+    testBrokeredAcceptOfferUnauthorizedBuyer(FeatureBitset features)
     {
         testcase(
             "Authorized broker tries to bridge offers from unauthorized "
@@ -398,42 +398,42 @@ public:
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
         Account const broker{"broker"};
-        auto const USD{G1["USD"]};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2, broker);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2, broker);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, USD(0), A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
-        env(trust(A2, limit));
-        env(trust(G1, USD(0), A2, tfSetfAuth));
-        env(pay(G1, A2, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, usd(0), a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
+        env(trust(a2, limit));
+        env(trust(g1, usd(0), a2, tfSetfAuth));
+        env(pay(g1, a2, usd(1000)));
         env(trust(broker, limit));
-        env(trust(G1, USD(0), broker, tfSetfAuth));
-        env(pay(G1, broker, USD(1000)));
+        env(trust(g1, usd(0), broker, tfSetfAuth));
+        env(pay(g1, broker, usd(1000)));
         env.close();
 
-        auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10));
-        auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-        env(token::createOffer(A1, nftID, USD(11)), token::owner(A2));
+        auto const [nftID, sellIdx] = mintAndOfferNFT(env, a2, usd(10));
+        auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+        env(token::createOffer(a1, nftID, usd(11)), token::Owner(a2));
         env.close();
 
         // Resetting buyer's trust line to delete it
-        env(pay(A1, G1, USD(1000)));
-        env(trust(A1, USD(0)));
+        env(pay(a1, g1, usd(1000)));
+        env(trust(a1, usd(0)));
         env.close();
 
         auto const unauthTrustline = [&](OpenView& view, beast::Journal) -> bool {
-            auto const sleA1 = std::make_shared<SLE>(keylet::line(A1, G1, G1["USD"].currency));
-            sleA1->setFieldAmount(sfBalance, A1["USD"](-1000));
+            auto const sleA1 = std::make_shared<SLE>(keylet::line(a1, g1, g1["USD"].currency));
+            sleA1->setFieldAmount(sfBalance, a1["USD"](-1000));
             view.rawInsert(sleA1);
             return true;
         };
@@ -443,14 +443,14 @@ public:
         {
             // test: G1 requires authorization of A2
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecNO_AUTH));
+                token::BrokerFee(usd(1)),
+                Ter(tecNO_AUTH));
             env.close();
         }
     }
 
     void
-    testBrokeredAcceptOffer_UnauthorizedSeller(FeatureBitset features)
+    testBrokeredAcceptOfferUnauthorizedSeller(FeatureBitset features)
     {
         testcase(
             "Authorized broker tries to bridge offers from unauthorized "
@@ -458,98 +458,98 @@ public:
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
+        Account const g1{"G1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
         Account const broker{"broker"};
-        auto const USD{G1["USD"]};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, A1, A2, broker);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, a1, a2, broker);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
         env(trust(broker, limit));
-        env(trust(G1, limit, broker, tfSetfAuth));
-        env(pay(G1, broker, USD(1000)));
+        env(trust(g1, limit, broker, tfSetfAuth));
+        env(pay(g1, broker, usd(1000)));
         env.close();
 
         // Authorizing trustline to make an offer creation possible
-        env(trust(G1, USD(0), A2, tfSetfAuth));
+        env(trust(g1, usd(0), a2, tfSetfAuth));
         env.close();
 
-        auto const [nftID, sellIdx] = mintAndOfferNFT(env, A2, USD(10));
-        auto const buyIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-        env(token::createOffer(A1, nftID, USD(11)), token::owner(A2));
+        auto const [nftID, sellIdx] = mintAndOfferNFT(env, a2, usd(10));
+        auto const buyIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+        env(token::createOffer(a1, nftID, usd(11)), token::Owner(a2));
         env.close();
 
         // Reseting trustline to delete it. This allows to check if
         // already existing offers handled correctly
-        env(trust(A2, USD(0)));
+        env(trust(a2, usd(0)));
         env.close();
 
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: G1 requires authorization of broker, no trust line exists
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecNO_LINE));
+                token::BrokerFee(usd(1)),
+                Ter(tecNO_LINE));
             env.close();
 
             // trust line created, but not authorized
-            env(trust(A2, limit));
+            env(trust(a2, limit));
             env.close();
 
             // test: G1 requires authorization of A2
             env(token::brokerOffers(broker, buyIdx, sellIdx),
-                token::brokerFee(USD(1)),
-                ter(tecNO_AUTH));
+                token::BrokerFee(usd(1)),
+                Ter(tecNO_AUTH));
             env.close();
 
             // test: cannot be brokered even without broker fee.
-            env(token::brokerOffers(broker, buyIdx, sellIdx), ter(tecNO_AUTH));
+            env(token::brokerOffers(broker, buyIdx, sellIdx), Ter(tecNO_AUTH));
             env.close();
         }
         else
         {
             // Old behavior: broker can receive IOUs without the authorization
-            env(token::brokerOffers(broker, buyIdx, sellIdx), token::brokerFee(USD(1)));
+            env(token::brokerOffers(broker, buyIdx, sellIdx), token::BrokerFee(usd(1)));
             env.close();
 
-            BEAST_EXPECT(env.balance(A2, USD) == USD(10));
+            BEAST_EXPECT(env.balance(a2, usd) == usd(10));
             return;
         }
     }
 
     void
-    testTransferFee_UnauthorizedMinter(FeatureBitset features)
+    testTransferFeeUnauthorizedMinter(FeatureBitset features)
     {
         testcase("Unauthorized minter receives transfer fee.");
         using namespace test::jtx;
 
         Env env(*this, features);
-        Account const G1{"G1"};
+        Account const g1{"G1"};
         Account const minter{"minter"};
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        auto const USD{G1["USD"]};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        auto const usd{g1["USD"]};
 
-        env.fund(XRP(10000), G1, minter, A1, A2);
-        env(fset(G1, asfRequireAuth));
+        env.fund(XRP(10000), g1, minter, a1, a2);
+        env(fset(g1, asfRequireAuth));
         env.close();
 
-        auto const limit = USD(10000);
+        auto const limit = usd(10000);
 
-        env(trust(A1, limit));
-        env(trust(G1, limit, A1, tfSetfAuth));
-        env(pay(G1, A1, USD(1000)));
-        env(trust(A2, limit));
-        env(trust(G1, limit, A2, tfSetfAuth));
-        env(pay(G1, A2, USD(1000)));
+        env(trust(a1, limit));
+        env(trust(g1, limit, a1, tfSetfAuth));
+        env(pay(g1, a1, usd(1000)));
+        env(trust(a2, limit));
+        env(trust(g1, limit, a2, tfSetfAuth));
+        env(pay(g1, a2, usd(1000)));
 
         env(trust(minter, limit));
         env.close();
@@ -557,24 +557,24 @@ public:
         // We authorized A1 and A2, but not the minter.
         // Now mint NFT
         auto const [nftID, minterSellIdx] = mintAndOfferNFT(env, minter, drops(1), 1);
-        env(token::acceptSellOffer(A1, minterSellIdx));
+        env(token::acceptSellOffer(a1, minterSellIdx));
 
-        uint256 const sellIdx = keylet::nftoffer(A1, env.seq(A1)).key;
-        env(token::createOffer(A1, nftID, USD(100)), txflags(tfSellNFToken));
+        uint256 const sellIdx = keylet::nftoffer(a1, env.seq(a1)).key;
+        env(token::createOffer(a1, nftID, usd(100)), Txflags(tfSellNFToken));
 
         if (features[fixEnforceNFTokenTrustlineV2])
         {
             // test: G1 requires authorization
-            env(token::acceptSellOffer(A2, sellIdx), ter(tecNO_AUTH));
+            env(token::acceptSellOffer(a2, sellIdx), Ter(tecNO_AUTH));
             env.close();
         }
         else
         {
             // Old behavior: can sell for USD. Minter can receive tokens
-            env(token::acceptSellOffer(A2, sellIdx));
+            env(token::acceptSellOffer(a2, sellIdx));
             env.close();
 
-            BEAST_EXPECT(env.balance(minter, USD) == USD(0.001));
+            BEAST_EXPECT(env.balance(minter, usd) == usd(0.001));
         }
     }
 
@@ -582,21 +582,21 @@ public:
     run() override
     {
         using namespace test::jtx;
-        static FeatureBitset const all{testable_amendments()};
+        static FeatureBitset const kALL{testableAmendments()};
 
-        static std::array const features = {all - fixEnforceNFTokenTrustlineV2, all};
+        static std::array const kFEATURES = {kALL - fixEnforceNFTokenTrustlineV2, kALL};
 
-        for (auto const feature : features)
+        for (auto const feature : kFEATURES)
         {
-            testBuyOffer_UnauthorizedSeller(feature);
-            testCreateBuyOffer_UnauthorizedBuyer(feature);
-            testAcceptBuyOffer_UnauthorizedBuyer(feature);
-            testSellOffer_UnauthorizedSeller(feature);
-            testSellOffer_UnauthorizedBuyer(feature);
-            testBrokeredAcceptOffer_UnauthorizedBroker(feature);
-            testBrokeredAcceptOffer_UnauthorizedBuyer(feature);
-            testBrokeredAcceptOffer_UnauthorizedSeller(feature);
-            testTransferFee_UnauthorizedMinter(feature);
+            testBuyOfferUnauthorizedSeller(feature);
+            testCreateBuyOfferUnauthorizedBuyer(feature);
+            testAcceptBuyOfferUnauthorizedBuyer(feature);
+            testSellOfferUnauthorizedSeller(feature);
+            testSellOfferUnauthorizedBuyer(feature);
+            testBrokeredAcceptOfferUnauthorizedBroker(feature);
+            testBrokeredAcceptOfferUnauthorizedBuyer(feature);
+            testBrokeredAcceptOfferUnauthorizedSeller(feature);
+            testTransferFeeUnauthorizedMinter(feature);
         }
     }
 };
diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp
index efb255ea2d..56bb6b75d7 100644
--- a/src/test/app/NFTokenBurn_test.cpp
+++ b/src/test/app/NFTokenBurn_test.cpp
@@ -42,16 +42,16 @@
 
 namespace xrpl {
 
-class NFTokenBurn_test : public beast::unit_test::suite
+class NFTokenBurn_test : public beast::unit_test::Suite
 {
     // Helper function that returns the number of nfts owned by an account.
     static std::uint32_t
     nftCount(test::jtx::Env& env, test::jtx::Account const& acct)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::account] = acct.human();
         params[jss::type] = "state";
-        Json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
+        json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
         return nfts[jss::result][jss::account_nfts].size();
     };
 
@@ -67,8 +67,8 @@ 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(maxTokenURILength, 'u')),
-            txflags(tfTransferable));
+            token::Uri(std::string(kMAX_TOKEN_URI_LENGTH, 'u')),
+            Txflags(tfTransferable));
         env.close();
 
         offerIndexes.reserve(tokenCancelCount);
@@ -77,7 +77,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
         {
             // Create sell offer
             offerIndexes.push_back(keylet::nftoffer(owner, env.seq(owner)).key);
-            env(token::createOffer(owner, nftokenID, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(owner, nftokenID, drops(1)), Txflags(tfSellNFToken));
             env.close();
         }
 
@@ -89,18 +89,18 @@ class NFTokenBurn_test : public beast::unit_test::suite
     // It uses the ledger RPC command to show the NFT pages in the ledger.
     // This parameter controls how noisy the output is.
     enum class Volume : bool {
-        quiet = false,
-        noisy = true,
+        Quiet = false,
+        Noisy = true,
     };
 
     static void
     printNFTPages(test::jtx::Env& env, Volume vol)
     {
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = "current";
         jvParams[jss::binary] = false;
         {
-            Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+            json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
 
             // Iterate the state and print all NFTokenPages.
             if (!jrr.isMember(jss::result) || !jrr[jss::result].isMember(jss::state))
@@ -108,13 +108,13 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 std::cout << "No ledger state found!" << std::endl;
                 return;
             }
-            Json::Value& state = jrr[jss::result][jss::state];
+            json::Value& state = jrr[jss::result][jss::state];
             if (!state.isArray())
             {
                 std::cout << "Ledger state is not array!" << std::endl;
                 return;
             }
-            for (Json::UInt i = 0; i < state.size(); ++i)
+            for (json::UInt i = 0; i < state.size(); ++i)
             {
                 if (state[i].isMember(sfNFTokens.jsonName) &&
                     state[i][sfNFTokens.jsonName].isArray())
@@ -123,7 +123,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
                     std::cout << tokenCount << " NFtokens in page "
                               << state[i][jss::index].asString() << std::endl;
 
-                    if (vol == Volume::noisy)
+                    if (vol == Volume::Noisy)
                     {
                         std::cout << state[i].toStyledString() << std::endl;
                     }
@@ -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(maxTransferFee){}, maxTransferFee);
+            decltype(kMAX_TRANSFER_FEE){}, kMAX_TRANSFER_FEE);
 
         alice.nfts.reserve(105);
         while (alice.nfts.size() < 105)
@@ -208,7 +208,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
             std::uint16_t const xferFee = feeDist(engine);
             alice.nfts.push_back(
                 token::getNextID(env, alice, 0u, tfTransferable | tfBurnable, xferFee));
-            env(token::mint(alice), txflags(tfTransferable | tfBurnable), token::xferFee(xferFee));
+            env(token::mint(alice), Txflags(tfTransferable | tfBurnable), token::XferFee(xferFee));
             env.close();
         }
 
@@ -219,9 +219,9 @@ class NFTokenBurn_test : public beast::unit_test::suite
             minter.nfts.push_back(
                 token::getNextID(env, alice, 0u, tfTransferable | tfBurnable, xferFee));
             env(token::mint(minter),
-                txflags(tfTransferable | tfBurnable),
-                token::xferFee(xferFee),
-                token::issuer(alice));
+                Txflags(tfTransferable | tfBurnable),
+                token::XferFee(xferFee),
+                token::Issuer(alice));
             env.close();
         }
 
@@ -236,7 +236,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // We do the same work on alice and minter, so make a lambda.
                 auto xferNFT = [&env, &becky](AcctStat& acct, auto& iter) {
                     uint256 const offerIndex = keylet::nftoffer(acct.acct, env.seq(acct.acct)).key;
-                    env(token::createOffer(acct, *iter, XRP(0)), txflags(tfSellNFToken));
+                    env(token::createOffer(acct, *iter, XRP(0)), Txflags(tfSellNFToken));
                     env.close();
                     env(token::acceptSellOffer(becky, offerIndex));
                     env.close();
@@ -263,20 +263,20 @@ class NFTokenBurn_test : public beast::unit_test::suite
             {
                 // Create sell offers for owner.
                 env(token::createOffer(owner, nft, drops(1)),
-                    txflags(tfSellNFToken),
-                    token::destination(other1));
+                    Txflags(tfSellNFToken),
+                    token::Destination(other1));
                 env(token::createOffer(owner, nft, drops(1)),
-                    txflags(tfSellNFToken),
-                    token::destination(other2));
+                    Txflags(tfSellNFToken),
+                    token::Destination(other2));
                 env.close();
 
                 // Create buy offers for other1 and other2.
-                env(token::createOffer(other1, nft, drops(1)), token::owner(owner));
-                env(token::createOffer(other2, nft, drops(1)), token::owner(owner));
+                env(token::createOffer(other1, nft, drops(1)), token::Owner(owner));
+                env(token::createOffer(other2, nft, drops(1)), token::Owner(owner));
                 env.close();
 
-                env(token::createOffer(other2, nft, drops(2)), token::owner(owner));
-                env(token::createOffer(other1, nft, drops(2)), token::owner(owner));
+                env(token::createOffer(other2, nft, drops(2)), token::Owner(owner));
+                env(token::createOffer(other1, nft, drops(2)), token::Owner(owner));
                 env.close();
             }
         };
@@ -323,7 +323,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
             }
             else
             {
-                env(token::burn(burner, nft), token::owner(owner));
+                env(token::burn(burner, nft), token::Owner(owner));
             }
             env.close();
 
@@ -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 none 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);
@@ -404,16 +404,16 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that the ledger does indeed contain exactly three pages
             // of NFTs with 32 entries in each page.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "current";
             jvParams[jss::binary] = false;
             {
-                Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+                json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
 
-                Json::Value& state = jrr[jss::result][jss::state];
+                json::Value& state = jrr[jss::result][jss::state];
 
                 int pageCount = 0;
-                for (Json::UInt i = 0; i < state.size(); ++i)
+                for (json::UInt i = 0; i < state.size(); ++i)
                 {
                     if (state[i].isMember(sfNFTokens.jsonName) &&
                         state[i][sfNFTokens.jsonName].isArray())
@@ -447,15 +447,15 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
         // A lambda verifies that the ledger no longer contains any NFT pages.
         auto checkNoTokenPages = [this, &env]() {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "current";
             jvParams[jss::binary] = false;
             {
-                Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+                json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
 
-                Json::Value& state = jrr[jss::result][jss::state];
+                json::Value& state = jrr[jss::result][jss::state];
 
-                for (Json::UInt i = 0; i < state.size(); ++i)
+                for (json::UInt i = 0; i < state.size(); ++i)
                 {
                     BEAST_EXPECT(!state[i].isMember(sfNFTokens.jsonName));
                 }
@@ -472,19 +472,19 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that that all three pages are present and remember the
             // indexes.
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(lastNFTokenPage))
                 return;
 
             uint256 const middleNFTokenPageIndex = lastNFTokenPage->at(sfPreviousPageMin);
             auto middleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
             if (!BEAST_EXPECT(middleNFTokenPage))
                 return;
 
             uint256 const firstNFTokenPageIndex = middleNFTokenPage->at(sfPreviousPageMin);
             auto firstNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
             if (!BEAST_EXPECT(firstNFTokenPage))
                 return;
 
@@ -498,7 +498,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that the last page is still present and contains just one
             // NFT.
-            lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(lastNFTokenPage))
                 return;
 
@@ -517,7 +517,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // _previous_ page because we need to preserve that last
                 // page an an anchor.  The contents of the next-to-last page
                 // are moved into the last page.
-                lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+                lastNFTokenPage = env.le(keylet::nftpageMax(alice));
                 BEAST_EXPECT(lastNFTokenPage);
                 BEAST_EXPECT(lastNFTokenPage->at(~sfPreviousPageMin) == firstNFTokenPageIndex);
                 BEAST_EXPECT(!lastNFTokenPage->isFieldPresent(sfNextPageMin));
@@ -525,13 +525,13 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
                 // The "middle" page should be gone.
                 middleNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
                 BEAST_EXPECT(!middleNFTokenPage);
 
                 // The "first" page should still be present and linked to
                 // the last page.
                 firstNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
                 BEAST_EXPECT(firstNFTokenPage);
                 BEAST_EXPECT(!firstNFTokenPage->isFieldPresent(sfPreviousPageMin));
                 BEAST_EXPECT(firstNFTokenPage->at(~sfNextPageMin) == lastNFTokenPage->key());
@@ -542,13 +542,13 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // Removing the last token from the last page deletes the last
                 // page.  This is a bug.  The contents of the next-to-last page
                 // should have been moved into the last page.
-                lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+                lastNFTokenPage = env.le(keylet::nftpageMax(alice));
                 BEAST_EXPECT(!lastNFTokenPage);
 
                 // The "middle" page is still present, but has lost the
                 // NextPageMin field.
                 middleNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
                 if (!BEAST_EXPECT(middleNFTokenPage))
                     return;
                 BEAST_EXPECT(middleNFTokenPage->isFieldPresent(sfPreviousPageMin));
@@ -576,19 +576,19 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that that all three pages are present and remember the
             // indexes.
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(lastNFTokenPage))
                 return;
 
             uint256 const middleNFTokenPageIndex = lastNFTokenPage->at(sfPreviousPageMin);
             auto middleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
             if (!BEAST_EXPECT(middleNFTokenPage))
                 return;
 
             uint256 const firstNFTokenPageIndex = middleNFTokenPage->at(sfPreviousPageMin);
             auto firstNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
             if (!BEAST_EXPECT(firstNFTokenPage))
                 return;
 
@@ -604,17 +604,17 @@ class NFTokenBurn_test : public beast::unit_test::suite
             // Verify that middle page is gone and the links in the two
             // remaining pages are correct.
             middleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
             BEAST_EXPECT(!middleNFTokenPage);
 
-            lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             BEAST_EXPECT(!lastNFTokenPage->isFieldPresent(sfNextPageMin));
             BEAST_EXPECT(lastNFTokenPage->getFieldH256(sfPreviousPageMin) == firstNFTokenPageIndex);
 
             firstNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
             BEAST_EXPECT(
-                firstNFTokenPage->getFieldH256(sfNextPageMin) == keylet::nftpage_max(alice).key);
+                firstNFTokenPage->getFieldH256(sfNextPageMin) == keylet::nftpageMax(alice).key);
             BEAST_EXPECT(!firstNFTokenPage->isFieldPresent(sfPreviousPageMin));
 
             // Burn the remaining nfts.
@@ -637,19 +637,19 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that that all three pages are present and remember the
             // indexes.
-            auto lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            auto lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(lastNFTokenPage))
                 return;
 
             uint256 const middleNFTokenPageIndex = lastNFTokenPage->at(sfPreviousPageMin);
             auto middleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
             if (!BEAST_EXPECT(middleNFTokenPage))
                 return;
 
             uint256 const firstNFTokenPageIndex = middleNFTokenPage->at(sfPreviousPageMin);
             auto firstNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
             if (!BEAST_EXPECT(firstNFTokenPage))
                 return;
 
@@ -664,18 +664,18 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify the first page is gone.
             firstNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
             BEAST_EXPECT(!firstNFTokenPage);
 
             // Check the links in the other two pages.
             middleNFTokenPage =
-                env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
             if (!BEAST_EXPECT(middleNFTokenPage))
                 return;
             BEAST_EXPECT(!middleNFTokenPage->isFieldPresent(sfPreviousPageMin));
             BEAST_EXPECT(middleNFTokenPage->isFieldPresent(sfNextPageMin));
 
-            lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+            lastNFTokenPage = env.le(keylet::nftpageMax(alice));
             if (!BEAST_EXPECT(lastNFTokenPage))
                 return;
             BEAST_EXPECT(lastNFTokenPage->isFieldPresent(sfPreviousPageMin));
@@ -696,7 +696,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // _previous_ page because we need to preserve that last
                 // page an an anchor.  The contents of the next-to-last page
                 // are moved into the last page.
-                lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+                lastNFTokenPage = env.le(keylet::nftpageMax(alice));
                 BEAST_EXPECT(lastNFTokenPage);
                 BEAST_EXPECT(!lastNFTokenPage->isFieldPresent(sfPreviousPageMin));
                 BEAST_EXPECT(!lastNFTokenPage->isFieldPresent(sfNextPageMin));
@@ -704,12 +704,12 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
                 // The "middle" page should be gone.
                 middleNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
                 BEAST_EXPECT(!middleNFTokenPage);
 
                 // The "first" page should still be gone.
                 firstNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
                 BEAST_EXPECT(!firstNFTokenPage);
             }
             else
@@ -717,13 +717,13 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // Removing the last token from the last page deletes the last
                 // page.  This is a bug.  The contents of the next-to-last page
                 // should have been moved into the last page.
-                lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+                lastNFTokenPage = env.le(keylet::nftpageMax(alice));
                 BEAST_EXPECT(!lastNFTokenPage);
 
                 // The "middle" page is still present, but has lost the
                 // NextPageMin field.
                 middleNFTokenPage =
-                    env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+                    env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
                 if (!BEAST_EXPECT(middleNFTokenPage))
                     return;
                 BEAST_EXPECT(!middleNFTokenPage->isFieldPresent(sfPreviousPageMin));
@@ -771,13 +771,13 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // checks.  These variables must outlive the ApplyContext.
                 OpenView ov{*env.current()};
                 STTx const tx{ttACCOUNT_SET, [](STObject&) {}};
-                test::StreamSink sink{beast::severities::kWarning};
+                test::StreamSink sink{beast::severities::KWarning};
                 beast::Journal const jlog{sink};
                 ApplyContext ac{
-                    env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, jlog};
+                    env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, TapNone, jlog};
 
                 // Verify that the last page is present and contains one NFT.
-                auto lastNFTokenPage = ac.view().peek(keylet::nftpage_max(alice));
+                auto lastNFTokenPage = ac.view().peek(keylet::nftpageMax(alice));
                 if (!BEAST_EXPECT(lastNFTokenPage))
                     return;
                 BEAST_EXPECT(lastNFTokenPage->getFieldArray(sfNFTokens).size() == 1);
@@ -804,16 +804,16 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 // checks.  These variables must outlive the ApplyContext.
                 OpenView ov{*env.current()};
                 STTx const tx{ttACCOUNT_SET, [](STObject&) {}};
-                test::StreamSink sink{beast::severities::kWarning};
+                test::StreamSink sink{beast::severities::KWarning};
                 beast::Journal const jlog{sink};
                 ApplyContext ac{
-                    env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, tapNONE, jlog};
+                    env.app(), ov, tx, tesSUCCESS, env.current()->fees().base, TapNone, jlog};
 
                 // Verify that the middle  page is present.
-                auto lastNFTokenPage = ac.view().peek(keylet::nftpage_max(alice));
+                auto lastNFTokenPage = ac.view().peek(keylet::nftpageMax(alice));
                 auto middleNFTokenPage = ac.view().peek(
                     keylet::nftpage(
-                        keylet::nftpage_min(alice),
+                        keylet::nftpageMin(alice),
                         lastNFTokenPage->getFieldH256(sfPreviousPageMin)));
                 BEAST_EXPECT(middleNFTokenPage);
 
@@ -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, maxDeletableTokenOfferEntries - 2);
+            auto const nftokenID = createNftAndOffers(
+                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - 2);
 
             // Verify all sell offers are present in the ledger.
             for (uint256 const& offerIndex : offerIndexes)
@@ -872,7 +872,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Becky creates a buy offer
             uint256 const beckyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftokenID, drops(1)), token::owner(alice));
+            env(token::createOffer(becky, nftokenID, drops(1)), token::Owner(alice));
             env.close();
 
             // Burn the token
@@ -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, maxDeletableTokenOfferEntries + 1);
+            auto const nftokenID = createNftAndOffers(
+                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES + 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() == maxTokenOfferCancelCount + 1);
+            BEAST_EXPECT(offerIndexes.size() == kMAX_TOKEN_OFFER_CANCEL_COUNT + 1);
 
             // 500 sell offers should be removed
-            BEAST_EXPECT(offerDeletedCount == maxTokenOfferCancelCount);
+            BEAST_EXPECT(offerDeletedCount == kMAX_TOKEN_OFFER_CANCEL_COUNT);
 
             // 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, maxDeletableTokenOfferEntries - 1);
+            auto const nftokenID = createNftAndOffers(
+                env, alice, offerIndexes, kMAX_DELETABLE_TOKEN_OFFER_ENTRIES - 1);
 
             // Verify all sell offers are present in the ledger.
             for (uint256 const& offerIndex : offerIndexes)
@@ -962,9 +962,9 @@ class NFTokenBurn_test : public beast::unit_test::suite
             }
 
             // becky creates 2 buy offers
-            env(token::createOffer(becky, nftokenID, drops(1)), token::owner(alice));
+            env(token::createOffer(becky, nftokenID, drops(1)), token::Owner(alice));
             env.close();
-            env(token::createOffer(becky, nftokenID, drops(1)), token::owner(alice));
+            env(token::createOffer(becky, nftokenID, drops(1)), token::Owner(alice));
             env.close();
 
             // Burn the token
@@ -1042,12 +1042,12 @@ class NFTokenBurn_test : public beast::unit_test::suite
                 std::uint32_t const intTaxon = (i / 16) + (i & 0b10000 ? 2 : 0);
                 uint32_t const extTaxon = internalTaxon(minter, intTaxon);
                 nfts.push_back(token::getNextID(env, minter, extTaxon, tfTransferable));
-                env(token::mint(minter, extTaxon), txflags(tfTransferable));
+                env(token::mint(minter, extTaxon), Txflags(tfTransferable));
                 env.close();
 
                 // Minter creates an offer for the NFToken.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nfts.back(), XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nfts.back(), XRP(0)), Txflags(tfSellNFToken));
                 env.close();
 
                 // alice accepts the offer.
@@ -1061,16 +1061,16 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // Verify that the ledger does indeed contain exactly three pages
             // of NFTs with 32 entries in each page.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "current";
             jvParams[jss::binary] = false;
             {
-                Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+                json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
 
-                Json::Value& state = jrr[jss::result][jss::state];
+                json::Value& state = jrr[jss::result][jss::state];
 
                 int pageCount = 0;
-                for (Json::UInt i = 0; i < state.size(); ++i)
+                for (json::UInt i = 0; i < state.size(); ++i)
                 {
                     if (state[i].isMember(sfNFTokens.jsonName) &&
                         state[i][sfNFTokens.jsonName].isArray())
@@ -1093,19 +1093,19 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
         // Verify that that all three pages are present and remember the
         // indexes.
-        auto lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+        auto lastNFTokenPage = env.le(keylet::nftpageMax(alice));
         if (!BEAST_EXPECT(lastNFTokenPage))
             return;
 
         uint256 const middleNFTokenPageIndex = lastNFTokenPage->at(sfPreviousPageMin);
         auto middleNFTokenPage =
-            env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+            env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
         if (!BEAST_EXPECT(middleNFTokenPage))
             return;
 
         uint256 const firstNFTokenPageIndex = middleNFTokenPage->at(sfPreviousPageMin);
         auto firstNFTokenPage =
-            env.le(keylet::nftpage(keylet::nftpage_min(alice), firstNFTokenPageIndex));
+            env.le(keylet::nftpage(keylet::nftpageMin(alice), firstNFTokenPageIndex));
         if (!BEAST_EXPECT(firstNFTokenPage))
             return;
 
@@ -1118,7 +1118,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
             // alice creates an offer for the NFToken.
             uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, last32NFTs.back(), XRP(0)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, last32NFTs.back(), XRP(0)), Txflags(tfSellNFToken));
             env.close();
 
             // minter accepts the offer.
@@ -1129,14 +1129,14 @@ class NFTokenBurn_test : public beast::unit_test::suite
         // Removing the last token from the last page deletes alice's last
         // page.  This is a bug.  The contents of the next-to-last page
         // should have been moved into the last page.
-        lastNFTokenPage = env.le(keylet::nftpage_max(alice));
+        lastNFTokenPage = env.le(keylet::nftpageMax(alice));
         BEAST_EXPECT(!lastNFTokenPage);
         BEAST_EXPECT(ownerCount(env, alice) == 2);
 
         // The "middle" page is still present, but has lost the
         // NextPageMin field.
         middleNFTokenPage =
-            env.le(keylet::nftpage(keylet::nftpage_min(alice), middleNFTokenPageIndex));
+            env.le(keylet::nftpage(keylet::nftpageMin(alice), middleNFTokenPageIndex));
         if (!BEAST_EXPECT(middleNFTokenPage))
             return;
         BEAST_EXPECT(middleNFTokenPage->isFieldPresent(sfPreviousPageMin));
@@ -1144,7 +1144,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
 
         // Attempt to delete alice's account, but fail because she owns NFTs.
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, minter), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(alice, minter), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // minter sells the last 32 NFTs back to alice.
@@ -1152,7 +1152,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
         {
             // minter creates an offer for the NFToken.
             uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, XRP(0)), Txflags(tfSellNFToken));
             env.close();
 
             // alice accepts the offer.
@@ -1165,8 +1165,8 @@ class NFTokenBurn_test : public beast::unit_test::suite
         {
             // Try the account_objects RPC command.  Alice's account only shows
             // two NFT pages even though she owns more.
-            Json::Value acctObjs = [&env, &alice]() {
-                Json::Value params;
+            json::Value acctObjs = [&env, &alice]() {
+                json::Value params;
                 params[jss::account] = alice.human();
                 return env.rpc("json", "account_objects", to_string(params));
             }();
@@ -1176,8 +1176,8 @@ class NFTokenBurn_test : public beast::unit_test::suite
         {
             // Try the account_nfts RPC command.  It only returns 64 NFTs
             // although alice owns 96.
-            Json::Value aliceNFTs = [&env, &alice]() {
-                Json::Value params;
+            json::Value aliceNFTs = [&env, &alice]() {
+                json::Value params;
                 params[jss::account] = alice.human();
                 params[jss::type] = "state";
                 return env.rpc("json", "account_nfts", to_string(params));
@@ -1188,7 +1188,7 @@ class NFTokenBurn_test : public beast::unit_test::suite
     }
 
 protected:
-    FeatureBitset const allFeatures{test::jtx::testable_amendments()};
+    FeatureBitset const allFeatures_{test::jtx::testableAmendments()};
 
     void
     testWithFeats(FeatureBitset features)
@@ -1203,8 +1203,8 @@ public:
     void
     run() override
     {
-        testWithFeats(allFeatures - fixNFTokenPageLinks);
-        testWithFeats(allFeatures);
+        testWithFeats(allFeatures_ - fixNFTokenPageLinks);
+        testWithFeats(allFeatures_);
     }
 };
 
diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp
index a1527e8601..fbae51406b 100644
--- a/src/test/app/NFTokenDir_test.cpp
+++ b/src/test/app/NFTokenDir_test.cpp
@@ -36,25 +36,25 @@
 
 namespace xrpl {
 
-class NFTokenDir_test : public beast::unit_test::suite
+class NFTokenDir_test : public beast::unit_test::Suite
 {
     // printNFTPages is a helper function that may be used for debugging.
     //
     // It uses the ledger RPC command to show the NFT pages in the ledger.
     // This parameter controls how noisy the output is.
     enum class Volume : bool {
-        quiet = false,
-        noisy = true,
+        Quiet = false,
+        Noisy = true,
     };
 
     static void
     printNFTPages(test::jtx::Env& env, Volume vol)
     {
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = "current";
         jvParams[jss::binary] = false;
         {
-            Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+            json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
 
             // Iterate the state and print all NFTokenPages.
             if (!jrr.isMember(jss::result) || !jrr[jss::result].isMember(jss::state))
@@ -62,13 +62,13 @@ class NFTokenDir_test : public beast::unit_test::suite
                 std::cout << "No ledger state found!" << std::endl;
                 return;
             }
-            Json::Value& state = jrr[jss::result][jss::state];
+            json::Value& state = jrr[jss::result][jss::state];
             if (!state.isArray())
             {
                 std::cout << "Ledger state is not array!" << std::endl;
                 return;
             }
-            for (Json::UInt i = 0; i < state.size(); ++i)
+            for (json::UInt i = 0; i < state.size(); ++i)
             {
                 if (state[i].isMember(sfNFTokens.jsonName) &&
                     state[i][sfNFTokens.jsonName].isArray())
@@ -77,7 +77,7 @@ class NFTokenDir_test : public beast::unit_test::suite
                     std::cout << tokenCount << " NFtokens in page "
                               << state[i][jss::index].asString() << std::endl;
 
-                    if (vol == Volume::noisy)
+                    if (vol == Volume::Noisy)
                     {
                         std::cout << state[i].toStyledString() << std::endl;
                     }
@@ -126,14 +126,14 @@ 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 nftCount = 100;
+        constexpr std::size_t kNFT_COUNT = 100;
         std::vector<uint256> nftIDs;
-        nftIDs.reserve(nftCount);
-        for (int i = 0; i < nftCount; ++i)
+        nftIDs.reserve(kNFT_COUNT);
+        for (int i = 0; i < kNFT_COUNT; ++i)
         {
             std::uint32_t const taxon = toUInt32(nft::cipheredTaxon(i, nft::toTaxon(0)));
             nftIDs.emplace_back(token::getNextID(env, issuer, taxon, tfTransferable));
-            env(token::mint(issuer, taxon), txflags(tfTransferable));
+            env(token::mint(issuer, taxon), Txflags(tfTransferable));
             env.close();
         }
 
@@ -143,7 +143,7 @@ class NFTokenDir_test : public beast::unit_test::suite
         for (uint256 const& nftID : nftIDs)
         {
             offers.emplace_back(keylet::nftoffer(issuer, env.seq(issuer)).key);
-            env(token::createOffer(issuer, nftID, XRP(0)), txflags((tfSellNFToken)));
+            env(token::createOffer(issuer, nftID, XRP(0)), Txflags((tfSellNFToken)));
             env.close();
         }
 
@@ -190,7 +190,7 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (std::string_view const seed : seeds)
             {
                 Account const& account =
-                    accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
+                    accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
                 env.fund(XRP(10000), account);
 
                 // Do not close the ledger inside the loop.  If accounts are
@@ -210,14 +210,14 @@ class NFTokenDir_test : public beast::unit_test::suite
                 // Mint the NFT.
                 uint256 const& nftID =
                     nftIDs.emplace_back(token::getNextID(env, account, 0, tfTransferable));
-                env(token::mint(account, 0), txflags(tfTransferable));
+                env(token::mint(account, 0), Txflags(tfTransferable));
                 env.close();
 
                 // Create an offer to give the NFT to buyer for free.
                 offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key);
                 env(token::createOffer(account, nftID, XRP(0)),
-                    token::destination(buyer),
-                    txflags((tfSellNFToken)));
+                    token::Destination(buyer),
+                    Txflags((tfSellNFToken)));
             }
             env.close();
 
@@ -238,22 +238,22 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (uint256 const& nftID : nftIDs)
             {
                 uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken));
+                env(token::createOffer(buyer, nftID, XRP(100)), Txflags(tfSellNFToken));
                 env.close();
 
                 env(token::cancelOffer(buyer, {offerID}));
             }
 
             // Verify that all the NFTs are owned by buyer.
-            Json::Value buyerNFTs = [&env, &buyer]() {
-                Json::Value params;
+            json::Value buyerNFTs = [&env, &buyer]() {
+                json::Value params;
                 params[jss::account] = buyer.human();
                 params[jss::type] = "state";
                 return env.rpc("json", "account_nfts", to_string(params));
             }();
 
             BEAST_EXPECT(buyerNFTs[jss::result][jss::account_nfts].size() == nftIDs.size());
-            for (Json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
+            for (json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
             {
                 uint256 ownedID;
                 BEAST_EXPECT(ownedID.parseHex(ownedNFT[sfNFTokenID.jsonName].asString()));
@@ -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 splitAndAddToHi{
+        static std::initializer_list<std::string_view const> const kSPLIT_AND_ADD_TO_HI{
             "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 splitAndAddToLo{
+        static std::initializer_list<std::string_view const> const kSPLIT_AND_ADD_TO_LO{
             "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(splitAndAddToHi);
-        exerciseLopsided(splitAndAddToLo);
+        exerciseLopsided(kSPLIT_AND_ADD_TO_HI);
+        exerciseLopsided(kSPLIT_AND_ADD_TO_LO);
     }
 
     void
@@ -381,7 +381,7 @@ class NFTokenDir_test : public beast::unit_test::suite
 
         // Lambda that exercises the split.
         auto exercise = [this, &features](std::initializer_list<std::string_view const> seeds) {
-            Env env{*this, envconfig(), features, nullptr, beast::severities::kDisabled};
+            Env env{*this, envconfig(), features, nullptr, beast::severities::KDisabled};
 
             // Eventually all of the NFTokens will be owned by buyer.
             Account const buyer{"buyer"};
@@ -394,7 +394,7 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (std::string_view const seed : seeds)
             {
                 Account const& account =
-                    accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
+                    accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
                 env.fund(XRP(10000), account);
 
                 // Do not close the ledger inside the loop.  If accounts are
@@ -414,14 +414,14 @@ class NFTokenDir_test : public beast::unit_test::suite
                 // Mint the NFT.
                 uint256 const& nftID =
                     nftIDs.emplace_back(token::getNextID(env, account, 0, tfTransferable));
-                env(token::mint(account, 0), txflags(tfTransferable));
+                env(token::mint(account, 0), Txflags(tfTransferable));
                 env.close();
 
                 // Create an offer to give the NFT to buyer for free.
                 offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key);
                 env(token::createOffer(account, nftID, XRP(0)),
-                    token::destination(buyer),
-                    txflags((tfSellNFToken)));
+                    token::Destination(buyer),
+                    Txflags((tfSellNFToken)));
             }
             env.close();
 
@@ -446,22 +446,22 @@ class NFTokenDir_test : public beast::unit_test::suite
             for (uint256 const& nftID : nftIDs)
             {
                 uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken));
+                env(token::createOffer(buyer, nftID, XRP(100)), Txflags(tfSellNFToken));
                 env.close();
 
                 env(token::cancelOffer(buyer, {offerID}));
             }
 
             // Verify that all the NFTs are owned by buyer.
-            Json::Value buyerNFTs = [&env, &buyer]() {
-                Json::Value params;
+            json::Value buyerNFTs = [&env, &buyer]() {
+                json::Value params;
                 params[jss::account] = buyer.human();
                 params[jss::type] = "state";
                 return env.rpc("json", "account_nfts", to_string(params));
             }();
 
             BEAST_EXPECT(buyerNFTs[jss::result][jss::account_nfts].size() == nftIDs.size());
-            for (Json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
+            for (json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
             {
                 uint256 ownedID;
                 BEAST_EXPECT(ownedID.parseHex(ownedNFT[sfNFTokenID.jsonName].asString()));
@@ -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 seventeenHi{
+        static std::initializer_list<std::string_view const> const kSEVENTEEN_HI{
             // 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 seventeenLo{
+        static std::initializer_list<std::string_view const> const kSEVENTEEN_LO{
             // 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(seventeenHi);
-        exercise(seventeenLo);
+        exercise(kSEVENTEEN_HI);
+        exercise(kSEVENTEEN_LO);
     }
 
     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 seeds{
+        static std::initializer_list<std::string_view const> const kSEEDS{
             "sp6JS7f14BuwFY8Mw5FnqmbciPvH6",  //  0. 0x9a8ebed3
             "sp6JS7f14BuwFY8Mw5MBGbyMSsXLp",  //  1. 0x9a8ebed3
             "sp6JS7f14BuwFY8Mw5S4PnDyBdKKm",  //  2. 0x9a8ebed3
@@ -621,11 +621,11 @@ 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(seeds.size());
-        for (std::string_view const seed : seeds)
+        accounts.reserve(kSEEDS.size());
+        for (std::string_view const seed : kSEEDS)
         {
             Account const& account =
-                accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
+                accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
             env.fund(XRP(10000), account);
 
             // Do not close the ledger inside the loop.  If accounts are
@@ -644,22 +644,22 @@ class NFTokenDir_test : public beast::unit_test::suite
             // Mint the NFT.
             uint256 const& nftID =
                 nftIDs.emplace_back(token::getNextID(env, account, 0, tfTransferable));
-            env(token::mint(account, 0), txflags(tfTransferable));
+            env(token::mint(account, 0), Txflags(tfTransferable));
             env.close();
 
             // Create an offer to give the NFT to buyer for free.
             offers.emplace_back(keylet::nftoffer(account, env.seq(account)).key);
             env(token::createOffer(account, nftID, XRP(0)),
-                token::destination(buyer),
-                txflags((tfSellNFToken)));
+                token::Destination(buyer),
+                Txflags((tfSellNFToken)));
         }
         env.close();
 
         // Verify that the low 96 bits of all generated NFTs is identical.
-        uint256 const expectLowBits = nftIDs.front() & nft::pageMask;
+        uint256 const expectLowBits = nftIDs.front() & nft::kPAGE_MASK;
         for (uint256 const& nftID : nftIDs)
         {
-            BEAST_EXPECT(expectLowBits == (nftID & nft::pageMask));
+            BEAST_EXPECT(expectLowBits == (nftID & nft::kPAGE_MASK));
         }
 
         // Remove one NFT and offer from the vectors.  This offer is the one
@@ -676,7 +676,7 @@ class NFTokenDir_test : public beast::unit_test::suite
         }
 
         // buyer accepts the last offer which causes a page overflow.
-        env(token::acceptSellOffer(buyer, offerForPageOverflow), ter(tecNO_SUITABLE_NFTOKEN_PAGE));
+        env(token::acceptSellOffer(buyer, offerForPageOverflow), Ter(tecNO_SUITABLE_NFTOKEN_PAGE));
 
         // Verify that all expected NFTs are owned by buyer and findable in
         // the ledger by having buyer create sell offers for all of their NFTs.
@@ -685,22 +685,22 @@ class NFTokenDir_test : public beast::unit_test::suite
         for (uint256 const& nftID : nftIDs)
         {
             uint256 const offerID = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken));
+            env(token::createOffer(buyer, nftID, XRP(100)), Txflags(tfSellNFToken));
             env.close();
 
             env(token::cancelOffer(buyer, {offerID}));
         }
 
         // Verify that all the NFTs are owned by buyer.
-        Json::Value buyerNFTs = [&env, &buyer]() {
-            Json::Value params;
+        json::Value buyerNFTs = [&env, &buyer]() {
+            json::Value params;
             params[jss::account] = buyer.human();
             params[jss::type] = "state";
             return env.rpc("json", "account_nfts", to_string(params));
         }();
 
         BEAST_EXPECT(buyerNFTs[jss::result][jss::account_nfts].size() == nftIDs.size());
-        for (Json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
+        for (json::Value const& ownedNFT : buyerNFTs[jss::result][jss::account_nfts])
         {
             uint256 ownedID;
             BEAST_EXPECT(ownedID.parseHex(ownedNFT[sfNFTokenID.jsonName].asString()));
@@ -716,7 +716,7 @@ class NFTokenDir_test : public beast::unit_test::suite
         BEAST_EXPECT(nftIDs.empty());
 
         TER const expect = tesSUCCESS;
-        env(token::mint(buyer, 0), txflags(tfTransferable), ter(expect));
+        env(token::mint(buyer, 0), Txflags(tfTransferable), Ter(expect));
         env.close();
     }
 
@@ -731,7 +731,7 @@ class NFTokenDir_test : public beast::unit_test::suite
         //
         // All of the NFTs should be acquired by the buyer.
         //
-        // Lastly, none 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 seeds{
+        static std::initializer_list<std::string_view const> const kSEEDS{
             "sp6JS7f14BuwFY8Mw56vZeiBuhePx",  //  0. 0x115d0525
             "sp6JS7f14BuwFY8Mw5BodF9tGuTUe",  //  1. 0x115d0525
             "sp6JS7f14BuwFY8Mw5EnhC1cg84J7",  //  2. 0x115d0525
@@ -785,11 +785,11 @@ 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(seeds.size());
-        for (std::string_view const seed : seeds)
+        accounts.reserve(kSEEDS.size());
+        for (std::string_view const seed : kSEEDS)
         {
             Account const& account =
-                accounts.emplace_back(Account::AcctStringType::base58Seed, std::string(seed));
+                accounts.emplace_back(Account::AcctStringType::Base58Seed, std::string(seed));
             env.fund(XRP(10000), account);
 
             // Do not close the ledger inside the loop.  If accounts are
@@ -816,14 +816,14 @@ class NFTokenDir_test : public beast::unit_test::suite
 
                 uint256 const& nftID = nftIDsByPage[i].emplace_back(
                     token::getNextID(env, account, taxon, tfTransferable));
-                env(token::mint(account, taxon), txflags(tfTransferable));
+                env(token::mint(account, taxon), Txflags(tfTransferable));
                 env.close();
 
                 // Create an offer to give the NFT to buyer for free.
                 offers[i].emplace_back(keylet::nftoffer(account, env.seq(account)).key);
                 env(token::createOffer(account, nftID, XRP(0)),
-                    token::destination(buyer),
-                    txflags((tfSellNFToken)));
+                    token::Destination(buyer),
+                    Txflags((tfSellNFToken)));
             }
         }
         env.close();
@@ -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::pageMask;
+            uint256 const expectLowBits = vec.front() & nft::kPAGE_MASK;
             for (uint256 const& nftID : vec)
             {
-                BEAST_EXPECT(expectLowBits == (nftID & nft::pageMask));
+                BEAST_EXPECT(expectLowBits == (nftID & nft::kPAGE_MASK));
             }
         }
 
@@ -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() == seeds.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() == seeds.size() - 1);
+            BEAST_EXPECT(offers[i].size() == kSEEDS.size() - 1);
         }
 
         // buyer accepts all of the offers that won't cause an overflow.
@@ -873,7 +873,7 @@ class NFTokenDir_test : public beast::unit_test::suite
         // the transaction succeeded.
         for (uint256 const& offer : overflowOffers)
         {
-            env(token::acceptSellOffer(buyer, offer), ter(tecNO_SUITABLE_NFTOKEN_PAGE));
+            env(token::acceptSellOffer(buyer, offer), Ter(tecNO_SUITABLE_NFTOKEN_PAGE));
             env.close();
         }
 
@@ -885,19 +885,19 @@ class NFTokenDir_test : public beast::unit_test::suite
         {
             for (uint256 const& nftID : vec)
             {
-                env(token::createOffer(buyer, nftID, XRP(100)), txflags(tfSellNFToken));
+                env(token::createOffer(buyer, nftID, XRP(100)), Txflags(tfSellNFToken));
                 env.close();
             }
         }
 
         // See what the account_objects command does with "nft_offer".
         {
-            Json::Value ownedNftOffers(Json::arrayValue);
+            json::Value ownedNftOffers(json::ArrayValue);
             std::string marker;
             do
             {
-                Json::Value buyerOffers = [&env, &buyer, &marker]() {
-                    Json::Value params;
+                json::Value buyerOffers = [&env, &buyer, &marker]() {
+                    json::Value params;
                     params[jss::account] = buyer.human();
                     params[jss::type] = jss::nft_offer;
 
@@ -909,14 +909,14 @@ class NFTokenDir_test : public beast::unit_test::suite
                 marker.clear();
                 if (buyerOffers.isMember(jss::result))
                 {
-                    Json::Value& result = buyerOffers[jss::result];
+                    json::Value& result = buyerOffers[jss::result];
 
                     if (result.isMember(jss::marker))
                         marker = result[jss::marker].asString();
 
                     if (result.isMember(jss::account_objects))
                     {
-                        Json::Value& someOffers = result[jss::account_objects];
+                        json::Value& someOffers = result[jss::account_objects];
                         for (std::size_t i = 0; i < someOffers.size(); ++i)
                             ownedNftOffers.append(someOffers[i]);
                     }
@@ -950,8 +950,8 @@ class NFTokenDir_test : public beast::unit_test::suite
             }
 
             // account_objects should no longer return any "nft_offer"s.
-            Json::Value remainingOffers = [&env, &buyer]() {
-                Json::Value params;
+            json::Value remainingOffers = [&env, &buyer]() {
+                json::Value params;
                 params[jss::account] = buyer.human();
                 params[jss::type] = jss::nft_offer;
 
@@ -965,12 +965,12 @@ class NFTokenDir_test : public beast::unit_test::suite
 
         // Verify that the ledger reports all of the NFTs owned by buyer.
         // Use the account_nfts rpc call to get the values.
-        Json::Value ownedNFTs(Json::arrayValue);
+        json::Value ownedNFTs(json::ArrayValue);
         std::string marker;
         do
         {
-            Json::Value buyerNFTs = [&env, &buyer, &marker]() {
-                Json::Value params;
+            json::Value buyerNFTs = [&env, &buyer, &marker]() {
+                json::Value params;
                 params[jss::account] = buyer.human();
                 params[jss::type] = "state";
 
@@ -982,14 +982,14 @@ class NFTokenDir_test : public beast::unit_test::suite
             marker.clear();
             if (buyerNFTs.isMember(jss::result))
             {
-                Json::Value& result = buyerNFTs[jss::result];
+                json::Value& result = buyerNFTs[jss::result];
 
                 if (result.isMember(jss::marker))
                     marker = result[jss::marker].asString();
 
                 if (result.isMember(jss::account_nfts))
                 {
-                    Json::Value& someNFTs = result[jss::account_nfts];
+                    json::Value& someNFTs = result[jss::account_nfts];
                     for (std::size_t i = 0; i < someNFTs.size(); ++i)
                         ownedNFTs.append(someNFTs[i]);
                 }
@@ -1003,7 +1003,7 @@ class NFTokenDir_test : public beast::unit_test::suite
 
         BEAST_EXPECT(ownedNFTs.size() == allNftIDs.size());
 
-        for (Json::Value const& ownedNFT : ownedNFTs)
+        for (json::Value const& ownedNFT : ownedNFTs)
         {
             if (ownedNFT.isMember(sfNFTokenID.jsonName))
             {
@@ -1037,7 +1037,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         testWithFeats(all);
     }
diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp
index a9252d2b5e..3f4260e1b1 100644
--- a/src/test/app/NFToken_test.cpp
+++ b/src/test/app/NFToken_test.cpp
@@ -54,7 +54,7 @@
 
 namespace xrpl {
 
-class NFTokenBaseUtil_test : public beast::unit_test::suite
+class NFTokenBaseUtil_test : public beast::unit_test::Suite
 {
     // Helper function that returns the number of NFTs minted by an issuer.
     static std::uint32_t
@@ -80,10 +80,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
     static std::uint32_t
     nftCount(test::jtx::Env& env, test::jtx::Account const& acct)
     {
-        Json::Value params;
+        json::Value params;
         params[jss::account] = acct.human();
         params[jss::type] = "state";
-        Json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
+        json::Value nfts = env.rpc("json", "account_nfts", to_string(params));
         return nfts[jss::result][jss::account_nfts].size();
     };
 
@@ -134,7 +134,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(burnedCount(env, master) == 1);
 
             uint256 const nftId1{token::getNextID(env, env.master, 0u, tfTransferable)};
-            env(token::mint(env.master, 0u), txflags(tfTransferable));
+            env(token::mint(env.master, 0u), Txflags(tfTransferable));
             env.close();
             BEAST_EXPECT(ownerCount(env, master) == 1);
             BEAST_EXPECT(mintedCount(env, master) == 2);
@@ -144,7 +144,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice);
             env.close();
             uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId1, XRP(1000)), token::owner(master));
+            env(token::createOffer(alice, nftId1, XRP(1000)), token::Owner(master));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, master) == 1);
@@ -196,7 +196,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // alice does not have enough XRP to cover the reserve for an NFT
         // page.
-        env(token::mint(alice, 0u), ter(tecINSUFFICIENT_RESERVE));
+        env(token::mint(alice, 0u), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
 
         BEAST_EXPECT(ownerCount(env, alice) == 0);
@@ -233,7 +233,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // alice still does not have enough XRP for the reserve of an NFT
         // page.
-        env(token::mint(alice, 0u), ter(tecINSUFFICIENT_RESERVE));
+        env(token::mint(alice, 0u), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
 
         checkAliceOwnerMintedBurned(0, 0, 0, __LINE__);
@@ -258,7 +258,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // That NFT page is full.  Creating an additional NFT page requires
         // additional reserve.
-        env(token::mint(alice), ter(tecINSUFFICIENT_RESERVE));
+        env(token::mint(alice), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         checkAliceOwnerMintedBurned(1, 32, 0, __LINE__);
 
@@ -268,7 +268,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // alice still does not have enough XRP for the reserve of an NFT
         // page.
-        env(token::mint(alice), ter(tecINSUFFICIENT_RESERVE));
+        env(token::mint(alice), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         checkAliceOwnerMintedBurned(1, 32, 0, __LINE__);
 
@@ -292,7 +292,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         }
 
         // alice burns a non-existent NFT.
-        env(token::burn(alice, token::getID(env, alice, 197, 5)), ter(tecNO_ENTRY));
+        env(token::burn(alice, token::getID(env, alice, 197, 5)), Ter(tecNO_ENTRY));
         env.close();
         checkAliceOwnerMintedBurned(0, 33, 33, __LINE__);
 
@@ -346,9 +346,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // page. Just for grins (and code coverage), minter mints NFTs that
         // include a URI.
         env(token::mint(minter),
-            token::issuer(alice),
-            token::uri("uri"),
-            ter(tecINSUFFICIENT_RESERVE));
+            token::Issuer(alice),
+            token::Uri("uri"),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         checkMintersOwnerMintedBurned(0, 33, nftSeq, 0, 0, 0, __LINE__);
 
@@ -357,7 +357,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         // Now minter can mint an NFT for alice.
-        env(token::mint(minter), token::issuer(alice), token::uri("uri"));
+        env(token::mint(minter), token::Issuer(alice), token::Uri("uri"));
         env.close();
         checkMintersOwnerMintedBurned(0, 34, nftSeq, 1, 0, 0, __LINE__);
 
@@ -365,7 +365,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // without any additional reserve requirements.
         for (int i = 1; i < 32; ++i)
         {
-            env(token::mint(minter), token::issuer(alice), token::uri("uri"));
+            env(token::mint(minter), token::Issuer(alice), token::Uri("uri"));
             checkMintersOwnerMintedBurned(0, i + 34, nftSeq, 1, 0, 0, __LINE__);
         }
 
@@ -377,9 +377,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // That NFT page is full.  Creating an additional NFT page requires
         // additional reserve.
         env(token::mint(minter),
-            token::issuer(alice),
-            token::uri("uri"),
-            ter(tecINSUFFICIENT_RESERVE));
+            token::Issuer(alice),
+            token::Uri("uri"),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         checkMintersOwnerMintedBurned(0, 65, nftSeq, 1, 0, 0, __LINE__);
 
@@ -388,7 +388,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         // Now minter can mint an NFT.
-        env(token::mint(minter), token::issuer(alice), token::uri("uri"));
+        env(token::mint(minter), token::Issuer(alice), token::Uri("uri"));
         env.close();
         checkMintersOwnerMintedBurned(0, 66, nftSeq, 2, 0, 0, __LINE__);
 
@@ -408,7 +408,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         checkMintersOwnerMintedBurned(0, 66, nftSeq, 0, 0, 0, __LINE__);
 
         // minter burns a non-existent NFT.
-        env(token::burn(minter, token::getID(env, alice, 2009, 3)), ter(tecNO_ENTRY));
+        env(token::burn(minter, token::getID(env, alice, 2009, 3)), Ter(tecNO_ENTRY));
         env.close();
         checkMintersOwnerMintedBurned(0, 66, nftSeq, 0, 0, 0, __LINE__);
     }
@@ -468,8 +468,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         });
 
         // See whether alice is at the boundary that causes an error.
-        env(token::mint(alice, 0u), ter(tesSUCCESS));
-        env(token::mint(alice, 0u), ter(tecMAX_SEQUENCE_REACHED));
+        env(token::mint(alice, 0u), Ter(tesSUCCESS));
+        env(token::mint(alice, 0u), Ter(tecMAX_SEQUENCE_REACHED));
     }
 
     void
@@ -490,7 +490,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.fund(XRP(200), alice, minter);
         env.close();
 
-        env(token::mint(alice, 0u), ter(tecINSUFFICIENT_RESERVE));
+        env(token::mint(alice, 0u), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
 
         // Fund alice enough to start minting NFTs.
@@ -501,43 +501,43 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // preflight
 
         // Set a negative fee.
-        env(token::mint(alice, 0u), fee(STAmount(10ull, true)), ter(temBAD_FEE));
+        env(token::mint(alice, 0u), Fee(STAmount(10ull, true)), Ter(temBAD_FEE));
 
         // Set an invalid flag.
-        env(token::mint(alice, 0u), txflags(0x00008000), ter(temINVALID_FLAG));
+        env(token::mint(alice, 0u), Txflags(0x00008000), Ter(temINVALID_FLAG));
 
         // Can't set a transfer fee if the NFT does not have the tfTRANSFERABLE
         // flag set.
-        env(token::mint(alice, 0u), token::xferFee(maxTransferFee), ter(temMALFORMED));
+        env(token::mint(alice, 0u), token::XferFee(kMAX_TRANSFER_FEE), Ter(temMALFORMED));
 
         // Set a bad transfer fee.
         env(token::mint(alice, 0u),
-            token::xferFee(maxTransferFee + 1),
-            txflags(tfTransferable),
-            ter(temBAD_NFTOKEN_TRANSFER_FEE));
+            token::XferFee(kMAX_TRANSFER_FEE + 1),
+            Txflags(tfTransferable),
+            Ter(temBAD_NFTOKEN_TRANSFER_FEE));
 
         // Account can't also be issuer.
-        env(token::mint(alice, 0u), token::issuer(alice), ter(temMALFORMED));
+        env(token::mint(alice, 0u), token::Issuer(alice), Ter(temMALFORMED));
 
         // Invalid URI: zero length.
-        env(token::mint(alice, 0u), token::uri(""), ter(temMALFORMED));
+        env(token::mint(alice, 0u), token::Uri(""), Ter(temMALFORMED));
 
         // Invalid URI: too long.
         env(token::mint(alice, 0u),
-            token::uri(std::string(maxTokenURILength + 1, 'q')),
-            ter(temMALFORMED));
+            token::Uri(std::string(kMAX_TOKEN_URI_LENGTH + 1, 'q')),
+            Ter(temMALFORMED));
 
         //----------------------------------------------------------------------
         // preclaim
 
         // Non-existent issuer.
-        env(token::mint(alice, 0u), token::issuer(Account("demon")), ter(tecNO_ISSUER));
+        env(token::mint(alice, 0u), token::Issuer(Account("demon")), Ter(tecNO_ISSUER));
 
         //----------------------------------------------------------------------
         // doApply
 
         // Existent issuer, but not given minting permission
-        env(token::mint(minter, 0u), token::issuer(alice), ter(tecNO_PERMISSION));
+        env(token::mint(minter, 0u), token::Issuer(alice), Ter(tecNO_PERMISSION));
     }
 
     void
@@ -563,7 +563,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         uint256 const nftAlice0ID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(alice, 0u), txflags(tfTransferable));
+        env(token::mint(alice, 0u), Txflags(tfTransferable));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
@@ -571,12 +571,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // preflight
 
         // Set a negative fee.
-        env(token::burn(alice, nftAlice0ID), fee(STAmount(10ull, true)), ter(temBAD_FEE));
+        env(token::burn(alice, nftAlice0ID), Fee(STAmount(10ull, true)), Ter(temBAD_FEE));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // Set an invalid flag.
-        env(token::burn(alice, nftAlice0ID), txflags(0x00008000), ter(temINVALID_FLAG));
+        env(token::burn(alice, nftAlice0ID), Txflags(0x00008000), Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
@@ -584,7 +584,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // preclaim
 
         // Try to burn a token that doesn't exist.
-        env(token::burn(alice, token::getID(env, alice, 0, 1)), ter(tecNO_ENTRY));
+        env(token::burn(alice, token::getID(env, alice, 0, 1)), Ter(tecNO_ENTRY));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
@@ -616,12 +616,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         uint256 const nftAlice0ID = token::getNextID(env, alice, 0, tfTransferable, 10);
-        env(token::mint(alice, 0u), txflags(tfTransferable), token::xferFee(10));
+        env(token::mint(alice, 0u), Txflags(tfTransferable), token::XferFee(10));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         uint256 const nftXrpOnlyID = token::getNextID(env, alice, 0, tfOnlyXRP | tfTransferable);
-        env(token::mint(alice, 0), txflags(tfOnlyXRP | tfTransferable));
+        env(token::mint(alice, 0), Txflags(tfOnlyXRP | tfTransferable));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
@@ -640,73 +640,73 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // buyer tries to create an NFTokenOffer, but doesn't have the reserve.
         env(token::createOffer(buyer, nftAlice0ID, XRP(1000)),
-            token::owner(alice),
-            ter(tecINSUFFICIENT_RESERVE));
+            token::Owner(alice),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // Set a negative fee.
         env(token::createOffer(buyer, nftAlice0ID, XRP(1000)),
-            fee(STAmount(10ull, true)),
-            ter(temBAD_FEE));
+            Fee(STAmount(10ull, true)),
+            Ter(temBAD_FEE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // Set an invalid flag.
         env(token::createOffer(buyer, nftAlice0ID, XRP(1000)),
-            txflags(0x00008000),
-            ter(temINVALID_FLAG));
+            Txflags(0x00008000),
+            Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // Set an invalid amount.
-        env(token::createOffer(buyer, nftXrpOnlyID, buyer["USD"](1)), ter(temBAD_AMOUNT));
-        env(token::createOffer(buyer, nftAlice0ID, buyer["USD"](0)), ter(temBAD_AMOUNT));
-        env(token::createOffer(buyer, nftXrpOnlyID, drops(0)), ter(temBAD_AMOUNT));
+        env(token::createOffer(buyer, nftXrpOnlyID, buyer["USD"](1)), Ter(temBAD_AMOUNT));
+        env(token::createOffer(buyer, nftAlice0ID, buyer["USD"](0)), Ter(temBAD_AMOUNT));
+        env(token::createOffer(buyer, nftXrpOnlyID, drops(0)), Ter(temBAD_AMOUNT));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // Set a bad expiration.
         env(token::createOffer(buyer, nftAlice0ID, buyer["USD"](1)),
-            token::expiration(0),
-            ter(temBAD_EXPIRATION));
+            token::Expiration(0),
+            Ter(temBAD_EXPIRATION));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // Invalid Owner field and tfSellToken flag relationships.
         // A buy offer must specify the owner.
-        env(token::createOffer(buyer, nftXrpOnlyID, XRP(1000)), ter(temMALFORMED));
+        env(token::createOffer(buyer, nftXrpOnlyID, XRP(1000)), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // A sell offer must not specify the owner; the owner is implicit.
         env(token::createOffer(alice, nftXrpOnlyID, XRP(1000)),
-            token::owner(alice),
-            txflags(tfSellNFToken),
-            ter(temMALFORMED));
+            token::Owner(alice),
+            Txflags(tfSellNFToken),
+            Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // An owner may not offer to buy their own token.
         env(token::createOffer(alice, nftXrpOnlyID, XRP(1000)),
-            token::owner(alice),
-            ter(temMALFORMED));
+            token::Owner(alice),
+            Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // The destination may not be the account submitting the transaction.
         env(token::createOffer(alice, nftXrpOnlyID, XRP(1000)),
-            token::destination(alice),
-            txflags(tfSellNFToken),
-            ter(temMALFORMED));
+            token::Destination(alice),
+            Txflags(tfSellNFToken),
+            Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // The destination must be an account already established in the ledger.
         env(token::createOffer(alice, nftXrpOnlyID, XRP(1000)),
-            token::destination(Account("demon")),
-            txflags(tfSellNFToken),
-            ter(tecNO_DST));
+            token::Destination(Account("demon")),
+            Txflags(tfSellNFToken),
+            Ter(tecNO_DST));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
@@ -715,30 +715,30 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // The new NFTokenOffer may not have passed its expiration time.
         env(token::createOffer(buyer, nftXrpOnlyID, XRP(1000)),
-            token::owner(alice),
-            token::expiration(lastClose(env)),
-            ter(tecEXPIRED));
+            token::Owner(alice),
+            token::Expiration(lastClose(env)),
+            Ter(tecEXPIRED));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // The nftID must be present in the ledger.
         env(token::createOffer(buyer, token::getID(env, alice, 0, 1), XRP(1000)),
-            token::owner(alice),
-            ter(tecNO_ENTRY));
+            token::Owner(alice),
+            Ter(tecNO_ENTRY));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // The nftID must be present in the ledger of a sell offer too.
         env(token::createOffer(alice, token::getID(env, alice, 0, 1), XRP(1000)),
-            txflags(tfSellNFToken),
-            ter(tecNO_ENTRY));
+            Txflags(tfSellNFToken),
+            Ter(tecNO_ENTRY));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         // buyer must have the funds to pay for their offer.
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecNO_LINE));
+            token::Owner(alice),
+            Ter(tecNO_LINE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
@@ -749,8 +749,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Issuer (alice) must have a trust line for the offered funds.
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecNO_LINE));
+            token::Owner(alice),
+            Ter(tecNO_LINE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -761,8 +761,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // Issuer (alice) must have a trust line for the offered funds and
         // the trust line may not be frozen.
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecFROZEN));
+            token::Owner(alice),
+            Ter(tecFROZEN));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -772,8 +772,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Can't transfer the NFT if the transferable flag is not set.
         env(token::createOffer(buyer, nftNoXferID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+            token::Owner(alice),
+            Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -782,8 +782,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecFROZEN));
+            token::Owner(alice),
+            Ter(tecFROZEN));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -794,8 +794,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecUNFUNDED_OFFER));
+            token::Owner(alice),
+            Ter(tecUNFUNDED_OFFER));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);  // the trust line.
 
@@ -809,8 +809,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // However buyer doesn't have enough XRP to cover the reserve for
         // an NFT offer.
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecINSUFFICIENT_RESERVE));
+            token::Owner(alice),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -820,8 +820,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tecINSUFFICIENT_RESERVE));
+            token::Owner(alice),
+            Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -832,8 +832,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // We don't care whether the offer is fully funded until the offer is
         // accepted.  Success at last!
         env(token::createOffer(buyer, nftAlice0ID, gwAUD(1000)),
-            token::owner(alice),
-            ter(tesSUCCESS));
+            token::Owner(alice),
+            Ter(tesSUCCESS));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 2);
     }
@@ -856,13 +856,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, alice) == 0);
 
         uint256 const nftAlice0ID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(alice, 0u), txflags(tfTransferable));
+        env(token::mint(alice, 0u), Txflags(tfTransferable));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 1);
 
         // This is the offer we'll try to cancel.
         uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-        env(token::createOffer(buyer, nftAlice0ID, XRP(1)), token::owner(alice), ter(tesSUCCESS));
+        env(token::createOffer(buyer, nftAlice0ID, XRP(1)), token::Owner(alice), Ter(tesSUCCESS));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -871,43 +871,43 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Set a negative fee.
         env(token::cancelOffer(buyer, {buyerOfferIndex}),
-            fee(STAmount(10ull, true)),
-            ter(temBAD_FEE));
+            Fee(STAmount(10ull, true)),
+            Ter(temBAD_FEE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
         // Set an invalid flag.
         env(token::cancelOffer(buyer, {buyerOfferIndex}),
-            txflags(0x00008000),
-            ter(temINVALID_FLAG));
+            Txflags(0x00008000),
+            Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
         // Empty list of tokens to delete.
         {
-            Json::Value jv = token::cancelOffer(buyer);
-            jv[sfNFTokenOffers.jsonName] = Json::arrayValue;
-            env(jv, ter(temMALFORMED));
+            json::Value jv = token::cancelOffer(buyer);
+            jv[sfNFTokenOffers.jsonName] = json::ArrayValue;
+            env(jv, Ter(temMALFORMED));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
         }
 
         // List of tokens to delete is too long.
         {
-            std::vector<uint256> const offers(maxTokenOfferCancelCount + 1, buyerOfferIndex);
+            std::vector<uint256> const offers(kMAX_TOKEN_OFFER_CANCEL_COUNT + 1, buyerOfferIndex);
 
-            env(token::cancelOffer(buyer, offers), ter(temMALFORMED));
+            env(token::cancelOffer(buyer, offers), Ter(temMALFORMED));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
         }
 
         // Duplicate entries are not allowed in the list of offers to cancel.
-        env(token::cancelOffer(buyer, {buyerOfferIndex, buyerOfferIndex}), ter(temMALFORMED));
+        env(token::cancelOffer(buyer, {buyerOfferIndex, buyerOfferIndex}), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
         // Provide neither offers to cancel nor a root index.
-        env(token::cancelOffer(buyer), ter(temMALFORMED));
+        env(token::cancelOffer(buyer), Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -929,7 +929,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(check::create(gw, env.master, XRP(300)));
             env.close();
 
-            env(token::cancelOffer(gw, {gwCheckId}), ter(tecNO_PERMISSION));
+            env(token::cancelOffer(gw, {gwCheckId}), Ter(tecNO_PERMISSION));
             env.close();
 
             // Cancel the check so it doesn't mess up later tests.
@@ -938,7 +938,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         }
 
         // gw attempts to cancel an offer they don't have permission to cancel.
-        env(token::cancelOffer(gw, {buyerOfferIndex}), ter(tecNO_PERMISSION));
+        env(token::cancelOffer(gw, {buyerOfferIndex}), Ter(tecNO_PERMISSION));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
@@ -971,13 +971,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, buyer) == 0);
 
         uint256 const nftAlice0ID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(alice, 0u), txflags(tfTransferable));
+        env(token::mint(alice, 0u), Txflags(tfTransferable));
         env.close();
         uint8_t aliceCount = 1;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
         uint256 const nftXrpOnlyID = token::getNextID(env, alice, 0, tfOnlyXRP | tfTransferable);
-        env(token::mint(alice, 0), txflags(tfOnlyXRP | tfTransferable));
+        env(token::mint(alice, 0), Txflags(tfOnlyXRP | tfTransferable));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
@@ -988,25 +988,25 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // alice creates sell offers for her nfts.
         uint256 const plainOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-        env(token::createOffer(alice, nftAlice0ID, XRP(10)), txflags(tfSellNFToken));
+        env(token::createOffer(alice, nftAlice0ID, XRP(10)), Txflags(tfSellNFToken));
         env.close();
         aliceCount++;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
         uint256 const audOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-        env(token::createOffer(alice, nftAlice0ID, gwAUD(30)), txflags(tfSellNFToken));
+        env(token::createOffer(alice, nftAlice0ID, gwAUD(30)), Txflags(tfSellNFToken));
         env.close();
         aliceCount++;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
         uint256 const xrpOnlyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-        env(token::createOffer(alice, nftXrpOnlyID, XRP(20)), txflags(tfSellNFToken));
+        env(token::createOffer(alice, nftXrpOnlyID, XRP(20)), Txflags(tfSellNFToken));
         env.close();
         aliceCount++;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
         uint256 const noXferOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-        env(token::createOffer(alice, nftNoXferID, XRP(30)), txflags(tfSellNFToken));
+        env(token::createOffer(alice, nftNoXferID, XRP(30)), Txflags(tfSellNFToken));
         env.close();
         aliceCount++;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
@@ -1014,8 +1014,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // alice creates a sell offer that will expire soon.
         uint256 const aliceExpOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
         env(token::createOffer(alice, nftNoXferID, XRP(40)),
-            txflags(tfSellNFToken),
-            token::expiration(lastClose(env) + 5));
+            Txflags(tfSellNFToken),
+            token::Expiration(lastClose(env) + 5));
         env.close();
         aliceCount++;
         BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
@@ -1023,8 +1023,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // buyer creates a Buy offer that will expire soon.
         uint256 const buyerExpOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
         env(token::createOffer(buyer, nftAlice0ID, XRP(40)),
-            token::owner(alice),
-            token::expiration(lastClose(env) + 5));
+            token::Owner(alice),
+            token::Expiration(lastClose(env) + 5));
         env.close();
         uint8_t buyerCount = 1;
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
@@ -1034,49 +1034,49 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Set a negative fee.
         env(token::acceptSellOffer(buyer, noXferOfferIndex),
-            fee(STAmount(10ull, true)),
-            ter(temBAD_FEE));
+            Fee(STAmount(10ull, true)),
+            Ter(temBAD_FEE));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // Set an invalid flag.
         env(token::acceptSellOffer(buyer, noXferOfferIndex),
-            txflags(0x00008000),
-            ter(temINVALID_FLAG));
+            Txflags(0x00008000),
+            Ter(temINVALID_FLAG));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // Supply nether an sfNFTokenBuyOffer nor an sfNFTokenSellOffer field.
         {
-            Json::Value jv = token::acceptSellOffer(buyer, noXferOfferIndex);
+            json::Value jv = token::acceptSellOffer(buyer, noXferOfferIndex);
             jv.removeMember(sfNFTokenSellOffer.jsonName);
-            env(jv, ter(temMALFORMED));
+            env(jv, Ter(temMALFORMED));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
         }
 
         // A buy offer may not contain a sfNFTokenBrokerFee field.
         {
-            Json::Value jv = token::acceptBuyOffer(buyer, noXferOfferIndex);
-            jv[sfNFTokenBrokerFee.jsonName] = STAmount(500000).getJson(JsonOptions::none);
-            env(jv, ter(temMALFORMED));
+            json::Value jv = token::acceptBuyOffer(buyer, noXferOfferIndex);
+            jv[sfNFTokenBrokerFee.jsonName] = STAmount(500000).getJson(JsonOptions::KNone);
+            env(jv, Ter(temMALFORMED));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
         }
 
         // A sell offer may not contain a sfNFTokenBrokerFee field.
         {
-            Json::Value jv = token::acceptSellOffer(buyer, noXferOfferIndex);
-            jv[sfNFTokenBrokerFee.jsonName] = STAmount(500000).getJson(JsonOptions::none);
-            env(jv, ter(temMALFORMED));
+            json::Value jv = token::acceptSellOffer(buyer, noXferOfferIndex);
+            jv[sfNFTokenBrokerFee.jsonName] = STAmount(500000).getJson(JsonOptions::KNone);
+            env(jv, Ter(temMALFORMED));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
         }
 
         // A brokered offer may not contain a negative or zero brokerFee.
         env(token::brokerOffers(buyer, noXferOfferIndex, xrpOnlyOfferIndex),
-            token::brokerFee(gwAUD(0)),
-            ter(temMALFORMED));
+            token::BrokerFee(gwAUD(0)),
+            Ter(temMALFORMED));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1084,20 +1084,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // preclaim
 
         // The buy offer must be non-zero.
-        env(token::acceptBuyOffer(buyer, beast::zero), ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptBuyOffer(buyer, beast::kZERO), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // The buy offer must be present in the ledger.
         uint256 const missingOfferIndex = keylet::nftoffer(alice, 1).key;
-        env(token::acceptBuyOffer(buyer, missingOfferIndex), ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptBuyOffer(buyer, missingOfferIndex), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // The buy offer must not have expired.
-        // NOTE: this is only a preclaim check with the
-        // fixSecurity3_1_3 amendment disabled.
-        env(token::acceptBuyOffer(alice, buyerExpOfferIndex), ter(tecEXPIRED));
+        // NOTE: this is only a preclaim check with the fixSecurity3_1_3 amendment disabled.
+        env(token::acceptBuyOffer(alice, buyerExpOfferIndex), Ter(tecEXPIRED));
         env.close();
         if (features[fixSecurity3_1_3])
         {
@@ -1106,19 +1105,19 @@ 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::zero), ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptSellOffer(buyer, beast::kZERO), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // The sell offer must be present in the ledger.
-        env(token::acceptSellOffer(buyer, missingOfferIndex), ter(tecOBJECT_NOT_FOUND));
+        env(token::acceptSellOffer(buyer, missingOfferIndex), Ter(tecOBJECT_NOT_FOUND));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
         // The sell offer must not have expired.
-        // NOTE: this is only a preclaim check with the
-        // fixSecurity3_1_3 amendment disabled.
-        env(token::acceptSellOffer(buyer, aliceExpOfferIndex), ter(tecEXPIRED));
+        // NOTE: this is only a preclaim check with the fixSecurity3_1_3 amendment disabled.
+        env(token::acceptSellOffer(buyer, aliceExpOfferIndex), Ter(tecEXPIRED));
+
         env.close();
         // Alice's count is decremented by one when the expired offer is
         // removed.
@@ -1152,27 +1151,27 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // buyer creates a buy offer for one of alice's nfts.
             uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftAlice0ID, gwAUD(29)), token::owner(alice));
+            env(token::createOffer(buyer, nftAlice0ID, gwAUD(29)), token::Owner(alice));
             env.close();
             buyerCount++;
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // gw attempts to broker offers that are not for the same token.
             env(token::brokerOffers(gw, buyerOfferIndex, xrpOnlyOfferIndex),
-                ter(tecNFTOKEN_BUY_SELL_MISMATCH));
+                Ter(tecNFTOKEN_BUY_SELL_MISMATCH));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // gw attempts to broker offers that are not for the same currency.
             env(token::brokerOffers(gw, buyerOfferIndex, plainOfferIndex),
-                ter(tecNFTOKEN_BUY_SELL_MISMATCH));
+                Ter(tecNFTOKEN_BUY_SELL_MISMATCH));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // In a brokered offer, the buyer must offer greater than or
             // equal to the selling price.
             env(token::brokerOffers(gw, buyerOfferIndex, audOfferIndex),
-                ter(tecINSUFFICIENT_PAYMENT));
+                Ter(tecINSUFFICIENT_PAYMENT));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1185,7 +1184,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // buyer creates a buy offer for one of alice's nfts.
             uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftAlice0ID, gwAUD(31)), token::owner(alice));
+            env(token::createOffer(buyer, nftAlice0ID, gwAUD(31)), token::Owner(alice));
             env.close();
             buyerCount++;
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
@@ -1193,23 +1192,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Broker sets their fee in a denomination other than the one
             // used by the offers
             env(token::brokerOffers(gw, buyerOfferIndex, audOfferIndex),
-                token::brokerFee(XRP(40)),
-                ter(tecNFTOKEN_BUY_SELL_MISMATCH));
+                token::BrokerFee(XRP(40)),
+                Ter(tecNFTOKEN_BUY_SELL_MISMATCH));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // Broker fee way too big.
             env(token::brokerOffers(gw, buyerOfferIndex, audOfferIndex),
-                token::brokerFee(gwAUD(31)),
-                ter(tecINSUFFICIENT_PAYMENT));
+                token::BrokerFee(gwAUD(31)),
+                Ter(tecINSUFFICIENT_PAYMENT));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // Broker fee is smaller, but still too big once the offer
             // seller's minimum is taken into account.
             env(token::brokerOffers(gw, buyerOfferIndex, audOfferIndex),
-                token::brokerFee(gwAUD(1.5)),
-                ter(tecINSUFFICIENT_PAYMENT));
+                token::BrokerFee(gwAUD(1.5)),
+                Ter(tecINSUFFICIENT_PAYMENT));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1224,19 +1223,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // buyer creates a buy offer for one of alice's nfts.
             uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftAlice0ID, gwAUD(30)), token::owner(alice));
+            env(token::createOffer(buyer, nftAlice0ID, gwAUD(30)), token::Owner(alice));
             env.close();
             buyerCount++;
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // Don't accept a buy offer if the sell flag is set.
-            env(token::acceptBuyOffer(buyer, plainOfferIndex), ter(tecNFTOKEN_OFFER_TYPE_MISMATCH));
+            env(token::acceptBuyOffer(buyer, plainOfferIndex), Ter(tecNFTOKEN_OFFER_TYPE_MISMATCH));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
             // An account can't accept its own offer.
             env(token::acceptBuyOffer(buyer, buyerOfferIndex),
-                ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
+                Ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1244,14 +1243,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(pay(buyer, gw, gwAUD(30)));
             env.close();
             BEAST_EXPECT(env.balance(buyer, gwAUD) == gwAUD(0));
-            env(token::acceptBuyOffer(alice, buyerOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptBuyOffer(alice, buyerOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // alice gives her NFT to gw, so alice no longer owns nftAlice0.
             {
                 uint256 const offerIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-                env(token::createOffer(alice, nftAlice0ID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(alice, nftAlice0ID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
                 env(token::acceptSellOffer(gw, offerIndex));
                 env.close();
@@ -1261,7 +1260,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
             // alice can't accept a buy offer for an NFT she no longer owns.
-            env(token::acceptBuyOffer(alice, buyerOfferIndex), ter(tecNO_PERMISSION));
+            env(token::acceptBuyOffer(alice, buyerOfferIndex), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1276,26 +1275,26 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // buyer creates a buy offer for one of alice's nfts.
             uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftXrpOnlyID, XRP(30)), token::owner(alice));
+            env(token::createOffer(buyer, nftXrpOnlyID, XRP(30)), token::Owner(alice));
             env.close();
             buyerCount++;
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // Don't accept a sell offer without the sell flag set.
             env(token::acceptSellOffer(alice, buyerOfferIndex),
-                ter(tecNFTOKEN_OFFER_TYPE_MISMATCH));
+                Ter(tecNFTOKEN_OFFER_TYPE_MISMATCH));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == aliceCount);
 
             // An account can't accept its own offer.
             env(token::acceptSellOffer(alice, plainOfferIndex),
-                ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
+                Ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // The seller must currently be in possession of the token they
             // are selling.  alice gave nftAlice0ID to gw.
-            env(token::acceptSellOffer(buyer, plainOfferIndex), ter(tecNO_PERMISSION));
+            env(token::acceptSellOffer(buyer, plainOfferIndex), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
@@ -1304,7 +1303,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // insufficient funds.
             {
                 uint256 const offerIndex = keylet::nftoffer(gw, env.seq(gw)).key;
-                env(token::createOffer(gw, nftAlice0ID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(gw, nftAlice0ID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
                 env(token::acceptSellOffer(alice, offerIndex));
                 env.close();
@@ -1313,7 +1312,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(pay(buyer, gw, gwAUD(30)));
             env.close();
             BEAST_EXPECT(env.balance(buyer, gwAUD) == gwAUD(0));
-            env(token::acceptSellOffer(buyer, audOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptSellOffer(buyer, audOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
         }
@@ -1321,7 +1320,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         //----------------------------------------------------------------------
         // doApply
         //
-        // As far as I can see none 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.
     }
 
@@ -1353,11 +1352,11 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         //  3. transfers that nft to buyer.
         auto nftToBuyer = [&env, &alice, &minter1, &buyer](std::uint32_t flags) {
             uint256 const nftID{token::getNextID(env, alice, 0u, flags)};
-            env(token::mint(minter1, 0u), token::issuer(alice), txflags(flags));
+            env(token::mint(minter1, 0u), token::Issuer(alice), Txflags(flags));
             env.close();
 
             uint256 const offerIndex = keylet::nftoffer(minter1, env.seq(minter1)).key;
-            env(token::createOffer(minter1, nftID, XRP(0)), txflags(tfSellNFToken));
+            env(token::createOffer(minter1, nftID, XRP(0)), Txflags(tfSellNFToken));
             env.close();
 
             env(token::acceptSellOffer(buyer, offerIndex));
@@ -1369,26 +1368,26 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // An NFT without flagBurnable can only be burned by its owner.
         {
             uint256 const noBurnID = nftToBuyer(0);
-            env(token::burn(alice, noBurnID), token::owner(buyer), ter(tecNO_PERMISSION));
+            env(token::burn(alice, noBurnID), token::Owner(buyer), Ter(tecNO_PERMISSION));
             env.close();
-            env(token::burn(minter1, noBurnID), token::owner(buyer), ter(tecNO_PERMISSION));
+            env(token::burn(minter1, noBurnID), token::Owner(buyer), Ter(tecNO_PERMISSION));
             env.close();
-            env(token::burn(minter2, noBurnID), token::owner(buyer), ter(tecNO_PERMISSION));
+            env(token::burn(minter2, noBurnID), token::Owner(buyer), Ter(tecNO_PERMISSION));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
-            env(token::burn(buyer, noBurnID), token::owner(buyer));
+            env(token::burn(buyer, noBurnID), token::Owner(buyer));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 0);
         }
         // An NFT with flagBurnable can be burned by the issuer.
         {
             uint256 const burnableID = nftToBuyer(tfBurnable);
-            env(token::burn(minter2, burnableID), token::owner(buyer), ter(tecNO_PERMISSION));
+            env(token::burn(minter2, burnableID), token::Owner(buyer), Ter(tecNO_PERMISSION));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
-            env(token::burn(alice, burnableID), token::owner(buyer));
+            env(token::burn(alice, burnableID), token::Owner(buyer));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 0);
         }
@@ -1404,7 +1403,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const burnableID = nftToBuyer(tfBurnable);
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
-            env(token::burn(buyer, burnableID), token::owner(buyer));
+            env(token::burn(buyer, burnableID), token::Owner(buyer));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 0);
         }
@@ -1419,12 +1418,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter1 is no longer alice's minter, so no longer has
             // permission to burn alice's nfts.
-            env(token::burn(minter1, burnableID), token::owner(buyer), ter(tecNO_PERMISSION));
+            env(token::burn(minter1, burnableID), token::Owner(buyer), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
             // minter2, however, can burn alice's nfts.
-            env(token::burn(minter2, burnableID), token::owner(buyer));
+            env(token::burn(minter2, burnableID), token::Owner(buyer));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 0);
         }
@@ -1455,18 +1454,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // Don't set flagOnlyXRP and offers can be made with IOUs.
         {
             uint256 const nftIOUsOkayID{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, alice) == 2);
             uint256 const aliceOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftIOUsOkayID, gwAUD(50)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftIOUsOkayID, gwAUD(50)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 3);
 
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
             uint256 const buyerOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftIOUsOkayID, gwAUD(50)), token::owner(alice));
+            env(token::createOffer(buyer, nftIOUsOkayID, gwAUD(50)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 2);
 
@@ -1487,31 +1486,31 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const nftOnlyXrpID{
                 token::getNextID(env, alice, 0u, tfOnlyXRP | tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfOnlyXRP | tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfOnlyXRP | tfTransferable));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, alice) == 2);
             env(token::createOffer(alice, nftOnlyXrpID, gwAUD(50)),
-                txflags(tfSellNFToken),
-                ter(temBAD_AMOUNT));
+                Txflags(tfSellNFToken),
+                Ter(temBAD_AMOUNT));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 2);
 
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
             env(token::createOffer(buyer, nftOnlyXrpID, gwAUD(50)),
-                token::owner(alice),
-                ter(temBAD_AMOUNT));
+                token::Owner(alice),
+                Ter(temBAD_AMOUNT));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
             // However offers for XRP are okay.
             BEAST_EXPECT(ownerCount(env, alice) == 2);
-            env(token::createOffer(alice, nftOnlyXrpID, XRP(60)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftOnlyXrpID, XRP(60)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 3);
 
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
-            env(token::createOffer(buyer, nftOnlyXrpID, XRP(60)), token::owner(alice));
+            env(token::createOffer(buyer, nftOnlyXrpID, XRP(60)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(ownerCount(env, buyer) == 2);
         }
@@ -1564,12 +1563,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 uint256 const nftNoAutoTrustID{
                     token::getNextID(env, alice, 0u, tfTransferable, xferFee)};
-                env(token::mint(alice, 0u), token::xferFee(xferFee), txflags(tfTransferable));
+                env(token::mint(alice, 0u), token::XferFee(xferFee), Txflags(tfTransferable));
                 env.close();
 
                 // becky buys the nft for 1 drop.
                 uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(alice));
+                env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::Owner(alice));
                 env.close();
                 env(token::acceptBuyOffer(alice, beckyBuyOfferIndex));
                 env.close();
@@ -1578,15 +1577,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 TER const createOfferTER = (xferFee != 0u) ? TER(tecNO_LINE) : TER(tesSUCCESS);
                 uint256 const beckyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
                 env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)),
-                    txflags(tfSellNFToken),
-                    ter(createOfferTER));
+                    Txflags(tfSellNFToken),
+                    Ter(createOfferTER));
                 env.close();
 
                 // cheri offers to buy the nft for CAD.
                 uint256 const cheriOfferIndex = keylet::nftoffer(cheri, env.seq(cheri)).key;
                 env(token::createOffer(cheri, nftNoAutoTrustID, gwCAD(100)),
-                    token::owner(becky),
-                    ter(createOfferTER));
+                    token::Owner(becky),
+                    Ter(createOfferTER));
                 env.close();
 
                 // To keep things tidy, cancel the offers.
@@ -1610,9 +1609,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                         : static_cast<TER>(tesSUCCESS);
 
                     env(token::mint(alice, 0u),
-                        token::xferFee(transferFee),
-                        txflags(tfTransferable | tfTrustLine),
-                        ter(mintTER));
+                        token::XferFee(transferFee),
+                        Txflags(tfTransferable | tfTrustLine),
+                        Ter(mintTER));
                     env.close();
 
                     // If fixRemoveNFTokenAutoTrustLine is active the rest
@@ -1622,14 +1621,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 }
                 // becky buys the nft for 1 drop.
                 uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(alice));
+                env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::Owner(alice));
                 env.close();
                 env(token::acceptBuyOffer(alice, beckyBuyOfferIndex));
                 env.close();
 
                 // becky sells the nft for AUD.
                 uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), txflags(tfSellNFToken));
+                env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), Txflags(tfSellNFToken));
                 env.close();
                 env(token::acceptSellOffer(cheri, beckySellOfferIndex));
                 env.close();
@@ -1639,7 +1638,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // becky buys the nft back for CAD.
                 uint256 const beckyBuyBackOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftAutoTrustID, gwCAD(50)), token::owner(cheri));
+                env(token::createOffer(becky, nftAutoTrustID, gwCAD(50)), token::Owner(cheri));
                 env.close();
                 env(token::acceptBuyOffer(cheri, beckyBuyBackOfferIndex));
                 env.close();
@@ -1654,13 +1653,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 std::uint16_t const transferFee = 5000;  // 5%
                 uint256 const nftNoAutoTrustID{
                     token::getNextID(env, alice, 0u, tfTransferable, transferFee)};
-                env(token::mint(alice, 0u), token::xferFee(transferFee), txflags(tfTransferable));
+                env(token::mint(alice, 0u), token::XferFee(transferFee), Txflags(tfTransferable));
                 env.close();
 
                 // alice sells the nft using AUD.
                 uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
                 env(token::createOffer(alice, nftNoAutoTrustID, gwAUD(200)),
-                    txflags(tfSellNFToken));
+                    Txflags(tfSellNFToken));
                 env.close();
                 env(token::acceptSellOffer(cheri, aliceSellOfferIndex));
                 env.close();
@@ -1672,12 +1671,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // cheri can't sell the NFT for EUR, but can for CAD.
                 env(token::createOffer(cheri, nftNoAutoTrustID, gwEUR(50)),
-                    txflags(tfSellNFToken),
-                    ter(tecNO_LINE));
+                    Txflags(tfSellNFToken),
+                    Ter(tecNO_LINE));
                 env.close();
                 uint256 const cheriSellOfferIndex = keylet::nftoffer(cheri, env.seq(cheri)).key;
                 env(token::createOffer(cheri, nftNoAutoTrustID, gwCAD(100)),
-                    txflags(tfSellNFToken));
+                    Txflags(tfSellNFToken));
                 env.close();
                 env(token::acceptSellOffer(becky, cheriSellOfferIndex));
                 env.close();
@@ -1711,19 +1710,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             uint256 const nftAliceNoTransferID{token::getNextID(env, alice, 0u)};
-            env(token::mint(alice, 0u), token::xferFee(0));
+            env(token::mint(alice, 0u), token::XferFee(0));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 1);
 
             // becky tries to offer to buy alice's nft.
             BEAST_EXPECT(ownerCount(env, becky) == 0);
             env(token::createOffer(becky, nftAliceNoTransferID, XRP(20)),
-                token::owner(alice),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                token::Owner(alice),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
 
             // alice offers to sell the nft and becky accepts the offer.
             uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftAliceNoTransferID, XRP(20)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftAliceNoTransferID, XRP(20)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(becky, aliceSellOfferIndex));
             env.close();
@@ -1732,8 +1731,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky tries to offer the nft for sale.
             env(token::createOffer(becky, nftAliceNoTransferID, XRP(21)),
-                txflags(tfSellNFToken),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                Txflags(tfSellNFToken),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, becky) == 1);
@@ -1741,9 +1740,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // becky tries to offer the nft for sale with alice as the
             // destination.  That also doesn't work.
             env(token::createOffer(becky, nftAliceNoTransferID, XRP(21)),
-                txflags(tfSellNFToken),
-                token::destination(alice),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                Txflags(tfSellNFToken),
+                token::Destination(alice),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, becky) == 1);
@@ -1751,7 +1750,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // alice offers to buy the nft back from becky.  becky accepts
             // the offer.
             uint256 const aliceBuyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftAliceNoTransferID, XRP(22)), token::owner(becky));
+            env(token::createOffer(alice, nftAliceNoTransferID, XRP(22)), token::Owner(becky));
             env.close();
             env(token::acceptBuyOffer(becky, aliceBuyOfferIndex));
             env.close();
@@ -1771,15 +1770,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             BEAST_EXPECT(ownerCount(env, minter) == 0);
             uint256 const nftMinterNoTransferID{token::getNextID(env, alice, 0u)};
-            env(token::mint(minter), token::issuer(alice));
+            env(token::mint(minter), token::Issuer(alice));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 1);
 
             // becky tries to offer to buy minter's nft.
             BEAST_EXPECT(ownerCount(env, becky) == 0);
             env(token::createOffer(becky, nftMinterNoTransferID, XRP(20)),
-                token::owner(minter),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                token::Owner(minter),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
             BEAST_EXPECT(ownerCount(env, becky) == 0);
 
@@ -1790,8 +1789,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // minter tries to offer their nft for sale.
             BEAST_EXPECT(ownerCount(env, minter) == 1);
             env(token::createOffer(minter, nftMinterNoTransferID, XRP(21)),
-                txflags(tfSellNFToken),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                Txflags(tfSellNFToken),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 1);
 
@@ -1807,7 +1806,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // minter successfully offers their nft for sale.
             BEAST_EXPECT(ownerCount(env, minter) == 1);
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftMinterNoTransferID, XRP(22)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftMinterNoTransferID, XRP(22)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 2);
 
@@ -1826,23 +1825,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky attempts to sell the nft.
             env(token::createOffer(becky, nftMinterNoTransferID, XRP(23)),
-                txflags(tfSellNFToken),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                Txflags(tfSellNFToken),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
 
             // Since minter is not, at the moment, alice's official minter
             // they cannot create an offer to buy the nft they minted.
             BEAST_EXPECT(ownerCount(env, minter) == 0);
             env(token::createOffer(minter, nftMinterNoTransferID, XRP(24)),
-                token::owner(becky),
-                ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
+                token::Owner(becky),
+                Ter(tefNFTOKEN_IS_NOT_TRANSFERABLE));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 0);
 
             // alice can create an offer to buy the nft.
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             uint256 const aliceBuyOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftMinterNoTransferID, XRP(25)), token::owner(becky));
+            env(token::createOffer(alice, nftMinterNoTransferID, XRP(25)), token::Owner(becky));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 1);
 
@@ -1857,7 +1856,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Now minter can create an offer to buy the nft.
             BEAST_EXPECT(ownerCount(env, minter) == 0);
             uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftMinterNoTransferID, XRP(26)), token::owner(becky));
+            env(token::createOffer(minter, nftMinterNoTransferID, XRP(26)), token::Owner(becky));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 1);
 
@@ -1877,7 +1876,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter burns their nft and alice cancels her offer so the
             // next tests can start with a clean slate.
-            env(token::burn(minter, nftMinterNoTransferID), ter(tesSUCCESS));
+            env(token::burn(minter, nftMinterNoTransferID), Ter(tesSUCCESS));
             env.close();
             env(token::cancelOffer(alice, {aliceBuyOfferIndex}));
             env.close();
@@ -1890,18 +1889,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             uint256 const nftAliceID{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 1);
 
             // Both alice and becky can make offers for alice's nft.
             uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftAliceID, XRP(20)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftAliceID, XRP(20)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 2);
 
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAliceID, XRP(21)), token::owner(alice));
+            env(token::createOffer(becky, nftAliceID, XRP(21)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 2);
 
@@ -1913,7 +1912,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky offers to sell the nft.
             uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAliceID, XRP(22)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftAliceID, XRP(22)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, becky) == 3);
@@ -1928,7 +1927,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter offers to sell the nft.
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftAliceID, XRP(23)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftAliceID, XRP(23)), Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, alice) == 0);
             BEAST_EXPECT(ownerCount(env, becky) == 1);
@@ -2005,12 +2004,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == 1);
 
             uint256 const nftID = token::getNextID(env, alice, 0u, tfTransferable);
-            env(token::mint(alice), txflags(tfTransferable));
+            env(token::mint(alice), Txflags(tfTransferable));
             env.close();
 
             // Becky buys the nft for XAU(10).  Check balances.
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice));
+            env(token::createOffer(becky, nftID, gwXAU(10)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000));
             BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(1000));
@@ -2022,7 +2021,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky sells nft to carol.  alice's balance should not change.
             uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(10)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftID, gwXAU(10)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(carol, beckySellOfferIndex));
             env.close();
@@ -2032,7 +2031,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter buys nft from carol.  alice's balance should not change.
             uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, gwXAU(10)), token::owner(carol));
+            env(token::createOffer(minter, nftID, gwXAU(10)), token::Owner(carol));
             env.close();
             env(token::acceptBuyOffer(carol, minterBuyOfferIndex));
             env.close();
@@ -2044,7 +2043,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // minter sells the nft to alice.  gwXAU balances should finish
             // where they started.
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, gwXAU(10)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, gwXAU(10)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(alice, minterSellOfferIndex));
             env.close();
@@ -2066,12 +2065,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // An nft with a transfer fee of 1 basis point.
             uint256 const nftID = token::getNextID(env, alice, 0u, tfTransferable, 1);
-            env(token::mint(alice), txflags(tfTransferable), token::xferFee(1));
+            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(1));
             env.close();
 
             // Becky buys the nft for XAU(10).  Check balances.
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice));
+            env(token::createOffer(becky, nftID, gwXAU(10)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000));
             BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(1000));
@@ -2083,7 +2082,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky sells nft to carol.  alice's balance goes up.
             uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(10)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftID, gwXAU(10)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(carol, beckySellOfferIndex));
             env.close();
@@ -2094,7 +2093,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter buys nft from carol.  alice's balance goes up.
             uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, gwXAU(10)), token::owner(carol));
+            env(token::createOffer(minter, nftID, gwXAU(10)), token::Owner(carol));
             env.close();
             env(token::acceptBuyOffer(carol, minterBuyOfferIndex));
             env.close();
@@ -2107,7 +2106,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // minter sells the nft to alice.  Because alice is part of the
             // transaction no transfer fee is removed.
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, gwXAU(10)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, gwXAU(10)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(alice, minterSellOfferIndex));
             env.close();
@@ -2140,19 +2139,20 @@ 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(maxTransferFee + 1),
-                ter(temBAD_NFTOKEN_TRANSFER_FEE));
+                Txflags(tfTransferable),
+                token::XferFee(kMAX_TRANSFER_FEE + 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, maxTransferFee);
-            env(token::mint(alice), txflags(tfTransferable), token::xferFee(maxTransferFee));
+            uint256 const nftID =
+                token::getNextID(env, alice, 0u, tfTransferable, kMAX_TRANSFER_FEE);
+            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(kMAX_TRANSFER_FEE));
             env.close();
 
             // Becky buys the nft for XAU(10).  Check balances.
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(10)), token::owner(alice));
+            env(token::createOffer(becky, nftID, gwXAU(10)), token::Owner(alice));
             env.close();
             BEAST_EXPECT(env.balance(alice, gwXAU) == gwXAU(1000));
             BEAST_EXPECT(env.balance(becky, gwXAU) == gwXAU(1000));
@@ -2164,7 +2164,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky sells nft to minter.  alice's balance goes up.
             uint256 const beckySellOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, gwXAU(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftID, gwXAU(100)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(minter, beckySellOfferIndex));
             env.close();
@@ -2175,7 +2175,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // carol buys nft from minter.  alice's balance goes up.
             uint256 const carolBuyOfferIndex = keylet::nftoffer(carol, env.seq(carol)).key;
-            env(token::createOffer(carol, nftID, gwXAU(10)), token::owner(minter));
+            env(token::createOffer(carol, nftID, gwXAU(10)), token::Owner(minter));
             env.close();
             env(token::acceptBuyOffer(minter, carolBuyOfferIndex));
             env.close();
@@ -2188,7 +2188,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // carol sells the nft to alice.  Because alice is part of the
             // transaction no transfer fee is removed.
             uint256 const carolSellOfferIndex = keylet::nftoffer(carol, env.seq(carol)).key;
-            env(token::createOffer(carol, nftID, gwXAU(10)), txflags(tfSellNFToken));
+            env(token::createOffer(carol, nftID, gwXAU(10)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(alice, carolSellOfferIndex));
             env.close();
@@ -2218,9 +2218,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // See the impact of rounding when the nft is sold for small amounts
         // of drops.
-        for (auto NumberSwitchOver : {true})
+        for (auto numberSwitchOver : {true})
         {
-            if (NumberSwitchOver)
+            if (numberSwitchOver)
             {
                 env.enableFeature(fixUniversalNumber);
             }
@@ -2231,7 +2231,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // An nft with a transfer fee of 1 basis point.
             uint256 const nftID = token::getNextID(env, alice, 0u, tfTransferable, 1);
-            env(token::mint(alice), txflags(tfTransferable), token::xferFee(1));
+            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(1));
             env.close();
 
             // minter buys the nft for XRP(1).  Since the transfer involves
@@ -2239,7 +2239,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             STAmount aliceBalance = env.balance(alice);
             STAmount minterBalance = env.balance(minter);
             uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, XRP(1)), token::owner(alice));
+            env(token::createOffer(minter, nftID, XRP(1)), token::Owner(alice));
             env.close();
             env(token::acceptBuyOffer(alice, minterBuyOfferIndex));
             env.close();
@@ -2250,10 +2250,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // minter sells to carol.  The payment is just small enough that
             // alice does not get any transfer fee.
-            auto pmt = NumberSwitchOver ? drops(50000) : drops(99999);
+            auto pmt = numberSwitchOver ? drops(50000) : drops(99999);
             STAmount carolBalance = env.balance(carol);
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, pmt), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, pmt), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(carol, minterSellOfferIndex));
             env.close();
@@ -2267,8 +2267,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // transfer that enables a transfer fee of 1 basis point.
             STAmount beckyBalance = env.balance(becky);
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            pmt = NumberSwitchOver ? drops(50001) : drops(100000);
-            env(token::createOffer(becky, nftID, pmt), token::owner(carol));
+            pmt = numberSwitchOver ? drops(50001) : drops(100000);
+            env(token::createOffer(becky, nftID, pmt), token::Owner(carol));
             env.close();
             env(token::acceptBuyOffer(carol, beckyBuyOfferIndex));
             env.close();
@@ -2287,7 +2287,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // An nft with a transfer fee of 1 basis point.
             uint256 const nftID = token::getNextID(env, alice, 0u, tfTransferable, 1);
-            env(token::mint(alice), txflags(tfTransferable), token::xferFee(1));
+            env(token::mint(alice), Txflags(tfTransferable), token::XferFee(1));
             env.close();
 
             // Due to the floating point nature of IOUs we need to
@@ -2298,21 +2298,21 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(pay(becky, gw, env.balance(becky, gwXAU)));
             env.close();
 
-            STAmount const startXAUBalance(gwXAU, STAmount::cMinValue, STAmount::cMinOffset + 5);
+            STAmount const startXAUBalance(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 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::cMinValue, STAmount::cMinOffset);
+            STAmount const tinyXAU(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET);
 
             // minter buys the nft for tinyXAU.  Since the transfer involves
             // alice there should be no transfer fee.
             STAmount aliceBalance = env.balance(alice, gwXAU);
             STAmount minterBalance = env.balance(minter, gwXAU);
             uint256 const minterBuyOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, tinyXAU), token::owner(alice));
+            env(token::createOffer(minter, nftID, tinyXAU), token::Owner(alice));
             env.close();
             env(token::acceptBuyOffer(alice, minterBuyOfferIndex));
             env.close();
@@ -2324,7 +2324,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // minter sells to carol.
             STAmount carolBalance = env.balance(carol, gwXAU);
             uint256 const minterSellOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftID, tinyXAU), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftID, tinyXAU), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(carol, minterSellOfferIndex));
             env.close();
@@ -2338,11 +2338,11 @@ 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::cMinValue, STAmount::cMinOffset + 5);
+            STAmount const cheapNFT(gwXAU, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 5);
 
             STAmount beckyBalance = env.balance(becky, gwXAU);
             uint256 const beckyBuyOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftID, cheapNFT), token::owner(carol));
+            env(token::createOffer(becky, nftID, cheapNFT), token::Owner(carol));
             env.close();
             env(token::acceptBuyOffer(carol, beckyBuyOfferIndex));
             env.close();
@@ -2393,7 +2393,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // Do some touch testing to show that the taxon is recoverable no
         // matter what else changes around it in the nft ID.
         {
-            std::uint32_t const taxon = rand_int<std::uint32_t>();
+            std::uint32_t const taxon = randInt<std::uint32_t>();
             for (int i = 0; i < 10; ++i)
             {
                 // lambda to produce a useful message on error.
@@ -2416,18 +2416,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                     env,
                     alice,
                     taxon,
-                    rand_int<std::uint32_t>(),
-                    rand_int<std::uint16_t>(),
-                    rand_int<std::uint16_t>());
+                    randInt<std::uint32_t>(),
+                    randInt<std::uint16_t>(),
+                    randInt<std::uint16_t>());
                 check(taxon, nftAliceID);
 
                 uint256 const nftBeckyID = token::getID(
                     env,
                     becky,
                     taxon,
-                    rand_int<std::uint32_t>(),
-                    rand_int<std::uint16_t>(),
-                    rand_int<std::uint16_t>());
+                    randInt<std::uint32_t>(),
+                    randInt<std::uint16_t>(),
+                    randInt<std::uint16_t>());
                 check(taxon, nftBeckyID);
             }
         }
@@ -2459,13 +2459,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             std::string ret;
 
             // About 20% of the returned strings should be empty
-            if (rand_int(4) == 0)
+            if (randInt(4) == 0)
                 return ret;
 
-            std::size_t const strLen = rand_int(256);
+            std::size_t const strLen = randInt(256);
             ret.reserve(strLen);
             for (std::size_t i = 0; i < strLen; ++i)
-                ret.push_back(rand_byte());
+                ret.push_back(randByte());
 
             return ret;
         };
@@ -2476,7 +2476,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             std::string uri;
             std::uint32_t taxon;
 
-            Entry(std::string uri_, std::uint32_t taxon_) : uri(std::move(uri_)), taxon(taxon_)
+            Entry(std::string uri, std::uint32_t taxon) : uri(std::move(uri)), taxon(taxon)
             {
             }
         };
@@ -2484,7 +2484,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         std::vector<Entry> entries;
         entries.reserve(100);
         for (std::size_t i = 0; i < 100; ++i)
-            entries.emplace_back(randURI(), rand_int<std::uint32_t>());
+            entries.emplace_back(randURI(), randInt<std::uint32_t>());
 
         // alice creates nfts using entries.
         for (Entry const& entry : entries)
@@ -2495,41 +2495,41 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             }
             else
             {
-                env(token::mint(alice, entry.taxon), token::uri(entry.uri));
+                env(token::mint(alice, entry.taxon), token::Uri(entry.uri));
             }
             env.close();
         }
 
         // Recover alice's nfts from the ledger.
-        Json::Value aliceNFTs = [&env, &alice]() {
-            Json::Value params;
+        json::Value aliceNFTs = [&env, &alice]() {
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::type] = "state";
             return env.rpc("json", "account_nfts", to_string(params));
         }();
 
         // Verify that the returned NFTs match what we sent.
-        Json::Value& nfts = aliceNFTs[jss::result][jss::account_nfts];
+        json::Value& nfts = aliceNFTs[jss::result][jss::account_nfts];
         if (!BEAST_EXPECT(nfts.size() == entries.size()))
             return;
 
         // Sort the returned NFTs by nft_serial so the are in the same order
         // as entries.
-        std::vector<Json::Value> sortedNFTs;
+        std::vector<json::Value> sortedNFTs;
         sortedNFTs.reserve(nfts.size());
         for (std::size_t i = 0; i < nfts.size(); ++i)
             sortedNFTs.push_back(nfts[i]);
         std::ranges::sort(
             sortedNFTs,
 
-            [](Json::Value const& lhs, Json::Value const& rhs) {
+            [](json::Value const& lhs, json::Value const& rhs) {
                 return lhs[jss::nft_serial] < rhs[jss::nft_serial];
             });
 
         for (std::size_t i = 0; i < entries.size(); ++i)
         {
             Entry const& entry = entries[i];
-            Json::Value const& ret = sortedNFTs[i];
+            json::Value const& ret = sortedNFTs[i];
             BEAST_EXPECT(entry.taxon == ret[sfNFTokenTaxon.jsonName]);
             if (entry.uri.empty())
             {
@@ -2565,7 +2565,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         uint256 const nftokenID = token::getNextID(env, issuer, 0, tfTransferable);
-        env(token::mint(minter, 0), token::issuer(issuer), txflags(tfTransferable));
+        env(token::mint(minter, 0), token::Issuer(issuer), Txflags(tfTransferable));
         env.close();
 
         // Test how adding a Destination field to an offer affects permissions
@@ -2573,23 +2573,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerMinterToIssuer = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(issuer),
-                txflags(tfSellNFToken));
+                token::Destination(issuer),
+                Txflags(tfSellNFToken));
 
             uint256 const offerMinterToBuyer = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken));
 
             uint256 const offerIssuerToMinter = keylet::nftoffer(issuer, env.seq(issuer)).key;
             env(token::createOffer(issuer, nftokenID, drops(1)),
-                token::owner(minter),
-                token::destination(minter));
+                token::Owner(minter),
+                token::Destination(minter));
 
             uint256 const offerIssuerToBuyer = keylet::nftoffer(issuer, env.seq(issuer)).key;
             env(token::createOffer(issuer, nftokenID, drops(1)),
-                token::owner(minter),
-                token::destination(buyer));
+                token::Owner(minter),
+                token::Destination(buyer));
 
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 2);
@@ -2603,10 +2603,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Note that issuer does not have any special permissions regarding
             // offer cancellation.  issuer cannot cancel an offer for an
             // NFToken they issued.
-            env(token::cancelOffer(issuer, {offerMinterToBuyer}), ter(tecNO_PERMISSION));
-            env(token::cancelOffer(buyer, {offerMinterToIssuer}), ter(tecNO_PERMISSION));
-            env(token::cancelOffer(buyer, {offerIssuerToMinter}), ter(tecNO_PERMISSION));
-            env(token::cancelOffer(minter, {offerIssuerToBuyer}), ter(tecNO_PERMISSION));
+            env(token::cancelOffer(issuer, {offerMinterToBuyer}), Ter(tecNO_PERMISSION));
+            env(token::cancelOffer(buyer, {offerMinterToIssuer}), Ter(tecNO_PERMISSION));
+            env(token::cancelOffer(buyer, {offerIssuerToMinter}), Ter(tecNO_PERMISSION));
+            env(token::cancelOffer(minter, {offerIssuerToBuyer}), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 2);
             BEAST_EXPECT(ownerCount(env, minter) == 3);
@@ -2629,8 +2629,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerMinterSellsToBuyer = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 2);
@@ -2638,7 +2638,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // issuer cannot accept a sell offer where they are not the
             // destination.
-            env(token::acceptSellOffer(issuer, offerMinterSellsToBuyer), ter(tecNO_PERMISSION));
+            env(token::acceptSellOffer(issuer, offerMinterSellsToBuyer), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 2);
@@ -2657,8 +2657,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerMinterBuysFromBuyer = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::owner(buyer),
-                token::destination(buyer));
+                token::Owner(buyer),
+                token::Destination(buyer));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 1);
@@ -2666,7 +2666,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // issuer cannot accept a buy offer where they are the
             // destination.
-            env(token::acceptBuyOffer(issuer, offerMinterBuysFromBuyer), ter(tecNO_PERMISSION));
+            env(token::acceptBuyOffer(issuer, offerMinterBuysFromBuyer), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 1);
@@ -2684,14 +2684,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // simply accept the offer.
             uint256 const offerBuyerBuysFromMinter = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID, drops(1)),
-                token::owner(minter),
-                token::destination(broker));
+                token::Owner(minter),
+                token::Destination(broker));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 1);
             BEAST_EXPECT(ownerCount(env, buyer) == 1);
 
-            env(token::acceptBuyOffer(minter, offerBuyerBuysFromMinter), ter(tecNO_PERMISSION));
+            env(token::acceptBuyOffer(minter, offerBuyerBuysFromMinter), Ter(tecNO_PERMISSION));
             env.close();
 
             // Clean up the unused offer.
@@ -2707,11 +2707,11 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerMinterToBroker = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(broker),
-                txflags(tfSellNFToken));
+                token::Destination(broker),
+                Txflags(tfSellNFToken));
 
             uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftokenID, drops(1)), token::owner(minter));
+            env(token::createOffer(buyer, nftokenID, drops(1)), token::Owner(minter));
 
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
@@ -2722,7 +2722,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // issuer cannot broker the offers, because they are not the
                 // Destination.
                 env(token::brokerOffers(issuer, offerBuyerToMinter, offerMinterToBroker),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, issuer) == 0);
                 BEAST_EXPECT(ownerCount(env, minter) == 2);
@@ -2744,14 +2744,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID, drops(1)),
-                token::destination(minter),
-                txflags(tfSellNFToken));
+                token::Destination(minter),
+                Txflags(tfSellNFToken));
 
             uint256 const offerMinterToBuyer = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftokenID, drops(1)), token::owner(buyer));
+            env(token::createOffer(minter, nftokenID, drops(1)), token::Owner(buyer));
 
             uint256 const offerIssuerToBuyer = keylet::nftoffer(issuer, env.seq(issuer)).key;
-            env(token::createOffer(issuer, nftokenID, drops(1)), token::owner(buyer));
+            env(token::createOffer(issuer, nftokenID, drops(1)), token::Owner(buyer));
 
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 1);
@@ -2762,7 +2762,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // Cannot broker offers when the sell destination is not the
                 // buyer.
                 env(token::brokerOffers(broker, offerIssuerToBuyer, offerBuyerToMinter),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
 
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
@@ -2770,7 +2770,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 BEAST_EXPECT(ownerCount(env, buyer) == 2);
 
                 env(token::brokerOffers(broker, offerMinterToBuyer, offerBuyerToMinter),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
 
                 // Buyer is successful with acceptOffer.
@@ -2800,19 +2800,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const offerMinterToBroker = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(broker),
-                txflags(tfSellNFToken));
+                token::Destination(broker),
+                Txflags(tfSellNFToken));
 
             uint256 const offerBuyerToBroker = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID, drops(1)),
-                token::owner(minter),
-                token::destination(broker));
+                token::Owner(minter),
+                token::Destination(broker));
 
             {
                 // Cannot broker offers when the sell destination is not the
                 // buyer or the broker.
                 env(token::brokerOffers(issuer, offerBuyerToBroker, offerMinterToBroker),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, issuer) == 0);
                 BEAST_EXPECT(ownerCount(env, minter) == 2);
@@ -2848,7 +2848,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         uint256 const nftokenID = token::getNextID(env, issuer, 0, tfTransferable);
-        env(token::mint(minter, 0), token::issuer(issuer), txflags(tfTransferable));
+        env(token::mint(minter, 0), token::Issuer(issuer), Txflags(tfTransferable));
         env.close();
 
         // enable flag
@@ -2858,9 +2858,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // a sell offer from the minter to the buyer should be rejected
         {
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken),
-                ter(tecNO_PERMISSION));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken),
+                Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, minter) == 1);
@@ -2876,8 +2876,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key;
 
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken));
             env.close();
 
             env(token::cancelOffer(minter, {offerIndex}));
@@ -2889,8 +2889,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key;
 
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken));
             env.close();
 
             env(fset(buyer, asfDisallowIncomingNFTokenOffer));
@@ -2908,8 +2908,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const offerIndex = keylet::nftoffer(minter, env.seq(minter)).key;
 
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::destination(buyer),
-                txflags(tfSellNFToken));
+                token::Destination(buyer),
+                Txflags(tfSellNFToken));
             env.close();
 
             env(token::acceptSellOffer(buyer, offerIndex));
@@ -2925,16 +2925,16 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // a random offer to buy the token
         {
             env(token::createOffer(alice, nftokenID, drops(1)),
-                token::owner(buyer),
-                ter(tecNO_PERMISSION));
+                token::Owner(buyer),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
         // minter offer to buy the token
         {
             env(token::createOffer(minter, nftokenID, drops(1)),
-                token::owner(buyer),
-                ter(tecNO_PERMISSION));
+                token::Owner(buyer),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -2945,14 +2945,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env(fset(buyer, asfDisallowIncomingNFTokenOffer));
             // a sell offer from the minter to the buyer should be rejected
             env(token::mint(minter),
-                token::amount(drops(1)),
-                token::destination(buyer),
-                ter(tecNO_PERMISSION));
+                token::Amount(drops(1)),
+                token::Destination(buyer),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             // disable flag
             env(fclear(buyer, asfDisallowIncomingNFTokenOffer));
-            env(token::mint(minter), token::amount(drops(1)), token::destination(buyer));
+            env(token::mint(minter), token::Amount(drops(1)), token::Destination(buyer));
             env.close();
         }
     }
@@ -2979,11 +2979,11 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         uint256 const nftokenID0 = token::getNextID(env, issuer, 0, tfTransferable);
-        env(token::mint(minter, 0), token::issuer(issuer), txflags(tfTransferable));
+        env(token::mint(minter, 0), token::Issuer(issuer), Txflags(tfTransferable));
         env.close();
 
         uint256 const nftokenID1 = token::getNextID(env, issuer, 0, tfTransferable);
-        env(token::mint(minter, 0), token::issuer(issuer), txflags(tfTransferable));
+        env(token::mint(minter, 0), token::Issuer(issuer), Txflags(tfTransferable));
         env.close();
         uint8_t issuerCount = 0, minterCount = 0, buyerCount = 0;
 
@@ -2994,24 +2994,24 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             uint256 const offerMinterToIssuer = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID0, drops(1)),
-                token::destination(issuer),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Destination(issuer),
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
 
             uint256 const offerMinterToAnyone = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
 
             uint256 const offerIssuerToMinter = keylet::nftoffer(issuer, env.seq(issuer)).key;
             env(token::createOffer(issuer, nftokenID0, drops(1)),
-                token::owner(minter),
-                token::expiration(expiration));
+                token::Owner(minter),
+                token::Expiration(expiration));
 
             uint256 const offerBuyerToMinter = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, drops(1)),
-                token::owner(minter),
-                token::expiration(expiration));
+                token::Owner(minter),
+                token::Expiration(expiration));
             env.close();
             issuerCount = 1;
             minterCount = 3;
@@ -3026,8 +3026,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             //
             // Note that these are tec responses, so these transactions will
             // not be retried by the ledger.
-            env(token::cancelOffer(issuer, {offerMinterToAnyone}), ter(tecNO_PERMISSION));
-            env(token::cancelOffer(buyer, {offerIssuerToMinter}), ter(tecNO_PERMISSION));
+            env(token::cancelOffer(issuer, {offerMinterToAnyone}), Ter(tecNO_PERMISSION));
+            env(token::cancelOffer(buyer, {offerIssuerToMinter}), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(lastClose(env) < expiration);
             BEAST_EXPECT(ownerCount(env, issuer) == issuerCount);
@@ -3070,14 +3070,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             uint256 const offer0 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
             minterCount++;
 
             uint256 const offer1 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID1, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
             minterCount++;
             env.close();
             BEAST_EXPECT(lastClose(env) < expiration);
@@ -3099,7 +3099,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // No one can accept an expired sell offer.
-            env(token::acceptSellOffer(buyer, offer1), ter(tecEXPIRED));
+            env(token::acceptSellOffer(buyer, offer1), Ter(tecEXPIRED));
 
             // With fixSecurity3_1_3 amendment, the first accept
             // attempt deletes the expired offer. Without the amendment,
@@ -3108,13 +3108,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 // After amendment: offer was deleted by first accept attempt
                 minterCount--;
-                env(token::acceptSellOffer(issuer, offer1), ter(tecOBJECT_NOT_FOUND));
+                env(token::acceptSellOffer(issuer, offer1), Ter(tecOBJECT_NOT_FOUND));
             }
             else
             {
                 // Before amendment: offer still exists, second accept also
                 // fails
-                env(token::acceptSellOffer(issuer, offer1), ter(tecEXPIRED));
+                env(token::acceptSellOffer(issuer, offer1), Ter(tecEXPIRED));
             }
             env.close();
 
@@ -3141,8 +3141,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // a simple place.
             uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, XRP(0)),
-                txflags(tfSellNFToken),
-                token::destination(minter));
+                Txflags(tfSellNFToken),
+                token::Destination(minter));
             env.close();
             env(token::acceptSellOffer(minter, offerSellBack));
             buyerCount--;
@@ -3160,14 +3160,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             uint256 const offer0 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, drops(1)),
-                token::owner(minter),
-                token::expiration(expiration));
+                token::Owner(minter),
+                token::Expiration(expiration));
             buyerCount++;
 
             uint256 const offer1 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID1, drops(1)),
-                token::owner(minter),
-                token::expiration(expiration));
+                token::Owner(minter),
+                token::Expiration(expiration));
             buyerCount++;
             env.close();
             BEAST_EXPECT(lastClose(env) < expiration);
@@ -3187,7 +3187,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // An expired buy offer cannot be accepted.
-            env(token::acceptBuyOffer(minter, offer1), ter(tecEXPIRED));
+            env(token::acceptBuyOffer(minter, offer1), Ter(tecEXPIRED));
 
             // With fixSecurity3_1_3 amendment, the first accept
             // attempt deletes the expired offer. Without the amendment,
@@ -3196,13 +3196,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 // After amendment: offer was deleted by first accept attempt
                 buyerCount--;
-                env(token::acceptBuyOffer(issuer, offer1), ter(tecOBJECT_NOT_FOUND));
+                env(token::acceptBuyOffer(issuer, offer1), Ter(tecOBJECT_NOT_FOUND));
             }
             else
             {
                 // Before amendment: offer still exists, second accept also
                 // fails
-                env(token::acceptBuyOffer(issuer, offer1), ter(tecEXPIRED));
+                env(token::acceptBuyOffer(issuer, offer1), Ter(tecEXPIRED));
             }
             env.close();
 
@@ -3229,8 +3229,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // a simple place.
             uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, XRP(0)),
-                txflags(tfSellNFToken),
-                token::destination(minter));
+                Txflags(tfSellNFToken),
+                token::Destination(minter));
             env.close();
             env(token::acceptSellOffer(minter, offerSellBack));
             env.close();
@@ -3248,22 +3248,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
             minterCount++;
 
             uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID1, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
             minterCount++;
 
             uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftokenID0, drops(1)), token::owner(minter));
+            env(token::createOffer(buyer, nftokenID0, drops(1)), token::Owner(minter));
             buyerCount++;
 
             uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key;
-            env(token::createOffer(buyer, nftokenID1, drops(1)), token::owner(minter));
+            env(token::createOffer(buyer, nftokenID1, drops(1)), token::Owner(minter));
             buyerCount++;
 
             env.close();
@@ -3285,7 +3285,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, buyer) == buyerCount);
 
             // If the sell offer is expired it cannot be brokered.
-            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), ter(tecEXPIRED));
+            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), Ter(tecEXPIRED));
             env.close();
 
             if (features[fixSecurity3_1_3])
@@ -3323,8 +3323,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // a simple place.
             uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, XRP(0)),
-                txflags(tfSellNFToken),
-                token::destination(minter));
+                Txflags(tfSellNFToken),
+                token::Destination(minter));
             env.close();
             env(token::acceptSellOffer(minter, offerSellBack));
             env.close();
@@ -3341,20 +3341,20 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             std::uint32_t const expiration = lastClose(env) + 25;
 
             uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftokenID0, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftokenID0, drops(1)), Txflags(tfSellNFToken));
 
             uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key;
-            env(token::createOffer(minter, nftokenID1, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(minter, nftokenID1, drops(1)), Txflags(tfSellNFToken));
 
             uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                token::owner(minter));
+                token::Expiration(expiration),
+                token::Owner(minter));
 
             uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID1, drops(1)),
-                token::expiration(expiration),
-                token::owner(minter));
+                token::Expiration(expiration),
+                token::Owner(minter));
 
             env.close();
             BEAST_EXPECT(lastClose(env) < expiration);
@@ -3373,7 +3373,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == 2);
             BEAST_EXPECT(ownerCount(env, buyer) == 2);
 
-            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), ter(tecEXPIRED));
+            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), Ter(tecEXPIRED));
             env.close();
 
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
@@ -3404,8 +3404,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // a simple place.
             uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, XRP(0)),
-                txflags(tfSellNFToken),
-                token::destination(minter));
+                Txflags(tfSellNFToken),
+                token::Destination(minter));
             env.close();
             env(token::acceptSellOffer(minter, offerSellBack));
             env.close();
@@ -3423,23 +3423,23 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             uint256 const sellOffer0 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
 
             uint256 const sellOffer1 = keylet::nftoffer(minter, env.seq(minter)).key;
             env(token::createOffer(minter, nftokenID1, drops(1)),
-                token::expiration(expiration),
-                txflags(tfSellNFToken));
+                token::Expiration(expiration),
+                Txflags(tfSellNFToken));
 
             uint256 const buyOffer0 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, drops(1)),
-                token::expiration(expiration),
-                token::owner(minter));
+                token::Expiration(expiration),
+                token::Owner(minter));
 
             uint256 const buyOffer1 = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID1, drops(1)),
-                token::expiration(expiration),
-                token::owner(minter));
+                token::Expiration(expiration),
+                token::Owner(minter));
 
             env.close();
             BEAST_EXPECT(lastClose(env) < expiration);
@@ -3458,7 +3458,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, minter) == 2);
             BEAST_EXPECT(ownerCount(env, buyer) == 2);
 
-            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), ter(tecEXPIRED));
+            env(token::brokerOffers(issuer, buyOffer1, sellOffer1), Ter(tecEXPIRED));
             env.close();
 
             // The expired offers are still in the ledger.
@@ -3480,8 +3480,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // a simple place.
             uint256 const offerSellBack = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftokenID0, XRP(0)),
-                txflags(tfSellNFToken),
-                token::destination(minter));
+                Txflags(tfSellNFToken),
+                token::Destination(minter));
             env.close();
             env(token::acceptSellOffer(minter, offerSellBack));
             env.close();
@@ -3512,20 +3512,20 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         uint256 const nftokenID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(alice, 0), txflags(tfTransferable));
+        env(token::mint(alice, 0), Txflags(tfTransferable));
         env.close();
 
         // Anyone can cancel an expired offer.
         uint256 const expiredOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
 
         env(token::createOffer(alice, nftokenID, XRP(1000)),
-            txflags(tfSellNFToken),
-            token::expiration(lastClose(env) + 13));
+            Txflags(tfSellNFToken),
+            token::Expiration(lastClose(env) + 13));
         env.close();
 
         // The offer has not expired yet, so becky can't cancel it now.
         BEAST_EXPECT(ownerCount(env, alice) == 2);
-        env(token::cancelOffer(becky, {expiredOfferIndex}), ter(tecNO_PERMISSION));
+        env(token::cancelOffer(becky, {expiredOfferIndex}), Ter(tecNO_PERMISSION));
         env.close();
 
         // Close a couple of ledgers and advance the time.  Then becky
@@ -3541,13 +3541,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         uint256 const dest1OfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
 
         env(token::createOffer(alice, nftokenID, XRP(1000)),
-            token::destination(becky),
-            txflags(tfSellNFToken));
+            token::Destination(becky),
+            Txflags(tfSellNFToken));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 2);
 
         // Minter can't cancel that offer, but becky (the destination) can.
-        env(token::cancelOffer(minter, {dest1OfferIndex}), ter(tecNO_PERMISSION));
+        env(token::cancelOffer(minter, {dest1OfferIndex}), Ter(tecNO_PERMISSION));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 2);
 
@@ -3559,8 +3559,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         uint256 const dest2OfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
 
         env(token::createOffer(alice, nftokenID, XRP(1000)),
-            token::destination(becky),
-            txflags(tfSellNFToken));
+            token::Destination(becky),
+            Txflags(tfSellNFToken));
         env.close();
         BEAST_EXPECT(ownerCount(env, alice) == 2);
 
@@ -3572,18 +3572,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // Minter creates a token with alice as issuer.  alice cannot cancel
         // minter's offer.
         uint256 const mintersNFTokenID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(minter, 0), token::issuer(alice), txflags(tfTransferable));
+        env(token::mint(minter, 0), token::Issuer(alice), Txflags(tfTransferable));
         env.close();
 
         uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
 
-        env(token::createOffer(minter, mintersNFTokenID, XRP(1000)), txflags(tfSellNFToken));
+        env(token::createOffer(minter, mintersNFTokenID, XRP(1000)), Txflags(tfSellNFToken));
         env.close();
         BEAST_EXPECT(ownerCount(env, minter) == 2);
 
         // Nobody other than minter should be able to cancel minter's offer.
-        env(token::cancelOffer(alice, {minterOfferIndex}), ter(tecNO_PERMISSION));
-        env(token::cancelOffer(becky, {minterOfferIndex}), ter(tecNO_PERMISSION));
+        env(token::cancelOffer(alice, {minterOfferIndex}), Ter(tecNO_PERMISSION));
+        env(token::cancelOffer(becky, {minterOfferIndex}), Ter(tecNO_PERMISSION));
         env.close();
         BEAST_EXPECT(ownerCount(env, minter) == 2);
 
@@ -3619,10 +3619,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.fund(XRP(1000), alice);
         env.close();
 
-        std::string const uri(maxTokenURILength, '?');
+        std::string const uri(kMAX_TOKEN_URI_LENGTH, '?');
         std::vector<uint256> offerIndexes;
-        offerIndexes.reserve(maxTokenOfferCancelCount + 1);
-        for (uint32_t i = 0; i < maxTokenOfferCancelCount + 1; ++i)
+        offerIndexes.reserve(kMAX_TOKEN_OFFER_CANCEL_COUNT + 1);
+        for (uint32_t i = 0; i < kMAX_TOKEN_OFFER_CANCEL_COUNT + 1; ++i)
         {
             Account const nftAcct(std::string("nftAcct") + std::to_string(i));
             Account const offerAcct(std::string("offerAcct") + std::to_string(i));
@@ -3630,13 +3630,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
             uint256 const nftokenID = token::getNextID(env, nftAcct, 0, tfTransferable);
-            env(token::mint(nftAcct, 0), token::uri(uri), txflags(tfTransferable));
+            env(token::mint(nftAcct, 0), token::Uri(uri), Txflags(tfTransferable));
             env.close();
 
             offerIndexes.push_back(keylet::nftoffer(offerAcct, env.seq(offerAcct)).key);
             env(token::createOffer(offerAcct, nftokenID, drops(1)),
-                token::owner(nftAcct),
-                token::expiration(lastClose(env) + 5));
+                token::Owner(nftAcct),
+                token::Expiration(lastClose(env) + 5));
             env.close();
         }
 
@@ -3651,7 +3651,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // alice attempts to cancel all of the expired offers.  There is one
         // too many so the request fails.
-        env(token::cancelOffer(alice, offerIndexes), ter(temMALFORMED));
+        env(token::cancelOffer(alice, offerIndexes), Ter(temMALFORMED));
         env.close();
 
         // However alice can cancel just one of the offers.
@@ -3665,11 +3665,11 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // But alice adds a sell offer to the list...
         {
             uint256 const nftokenID = token::getNextID(env, alice, 0, tfTransferable);
-            env(token::mint(alice, 0), token::uri(uri), txflags(tfTransferable));
+            env(token::mint(alice, 0), token::Uri(uri), Txflags(tfTransferable));
             env.close();
 
             offerIndexes.push_back(keylet::nftoffer(alice, env.seq(alice)).key);
-            env(token::createOffer(alice, nftokenID, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftokenID, drops(1)), Txflags(tfSellNFToken));
             env.close();
 
             // alice's owner count should now to 2 for the nft and the offer.
@@ -3677,7 +3677,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // Because alice added the sell offer there are still too many
             // offers in the list to cancel.
-            env(token::cancelOffer(alice, offerIndexes), ter(temMALFORMED));
+            env(token::cancelOffer(alice, offerIndexes), Ter(temMALFORMED));
             env.close();
 
             // alice burns her nft which removes the nft and the offer.
@@ -3761,9 +3761,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             auto mintNFT = [&env, &issuer, &minter](std::uint16_t xferFee = 0) {
                 uint256 const nftID = token::getNextID(env, issuer, 0, tfTransferable, xferFee);
                 env(token::mint(minter, 0),
-                    token::issuer(issuer),
-                    token::xferFee(xferFee),
-                    txflags(tfTransferable));
+                    token::Issuer(issuer),
+                    token::XferFee(xferFee),
+                    Txflags(tfTransferable));
                 env.close();
                 return nftID;
             };
@@ -3780,13 +3780,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates their offer.  Note: a buy offer can never
                 // offer zero.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, XRP(1)), token::Owner(minter));
                 env.close();
 
                 auto const minterBalance = env.balance(minter);
@@ -3822,19 +3822,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates their offer.  Note: a buy offer can never
                 // offer zero.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, XRP(1)), token::Owner(minter));
                 env.close();
 
                 // Broker attempts to charge a 1.1 XRP brokerFee and fails.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(XRP(1.1)),
-                    ter(tecINSUFFICIENT_PAYMENT));
+                    token::BrokerFee(XRP(1.1)),
+                    Ter(tecINSUFFICIENT_PAYMENT));
                 env.close();
 
                 auto const minterBalance = env.balance(minter);
@@ -3844,7 +3844,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // Broker charges a 0.5 XRP brokerFee.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(XRP(0.5)));
+                    token::BrokerFee(XRP(0.5)));
                 env.close();
 
                 // Note that minter's XRP balance goes up even though they
@@ -3867,17 +3867,17 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
 
-                uint256 const nftID = mintNFT(maxTransferFee);
+                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates their offer.  Note: a buy offer can never
                 // offer zero.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, XRP(1)), token::Owner(minter));
                 env.close();
 
                 auto const minterBalance = env.balance(minter);
@@ -3909,17 +3909,17 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 checkOwnerCountIsOne({issuer, minter, buyer, broker}, __LINE__);
 
-                uint256 const nftID = mintNFT(maxTransferFee);
+                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, XRP(0)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, XRP(0)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates their offer.  Note: a buy offer can never
                 // offer zero.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, XRP(1)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, XRP(1)), token::Owner(minter));
                 env.close();
 
                 auto const minterBalance = env.balance(minter);
@@ -3929,7 +3929,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // Broker charges a 0.75 XRP brokerFee.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(XRP(0.75)));
+                    token::BrokerFee(XRP(0.75)));
                 env.close();
 
                 // Note that, with a 50% transfer fee, issuer gets 1/2 of what's
@@ -3986,19 +3986,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, gwXAU(1000)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, gwXAU(1000)), Txflags(tfSellNFToken));
                 env.close();
 
                 {
                     // buyer creates an offer for more XAU than they currently
                     // own.
                     uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                    env(token::createOffer(buyer, nftID, gwXAU(1001)), token::owner(minter));
+                    env(token::createOffer(buyer, nftID, gwXAU(1001)), token::Owner(minter));
                     env.close();
 
                     // broker attempts to broker the offers but cannot.
                     env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                        ter(tecINSUFFICIENT_FUNDS));
+                        Ter(tecINSUFFICIENT_FUNDS));
                     env.close();
 
                     // Cancel buyer's bad offer so the next test starts in a
@@ -4010,12 +4010,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                     // buyer creates an offer for less that what minter is
                     // asking.
                     uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                    env(token::createOffer(buyer, nftID, gwXAU(999)), token::owner(minter));
+                    env(token::createOffer(buyer, nftID, gwXAU(999)), token::Owner(minter));
                     env.close();
 
                     // broker attempts to broker the offers but cannot.
                     env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                        ter(tecINSUFFICIENT_PAYMENT));
+                        Ter(tecINSUFFICIENT_PAYMENT));
                     env.close();
 
                     // Cancel buyer's bad offer so the next test starts in a
@@ -4026,13 +4026,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // buyer creates a large enough offer.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::Owner(minter));
                 env.close();
 
                 // Broker attempts to charge a brokerFee but cannot.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(gwXAU(0.1)),
-                    ter(tecINSUFFICIENT_PAYMENT));
+                    token::BrokerFee(gwXAU(0.1)),
+                    Ter(tecINSUFFICIENT_PAYMENT));
                 env.close();
 
                 // broker charges no brokerFee and succeeds.
@@ -4059,22 +4059,22 @@ 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(maxTransferFee);
+                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE);
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, gwXAU(900)), Txflags(tfSellNFToken));
                 env.close();
                 {
                     // buyer creates an offer for more XAU than they currently
                     // own.
                     uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                    env(token::createOffer(buyer, nftID, gwXAU(1001)), token::owner(minter));
+                    env(token::createOffer(buyer, nftID, gwXAU(1001)), token::Owner(minter));
                     env.close();
 
                     // broker attempts to broker the offers but cannot.
                     env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                        ter(tecINSUFFICIENT_FUNDS));
+                        Ter(tecINSUFFICIENT_FUNDS));
                     env.close();
 
                     // Cancel buyer's bad offer so the next test starts in a
@@ -4086,12 +4086,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                     // buyer creates an offer for less that what minter is
                     // asking.
                     uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                    env(token::createOffer(buyer, nftID, gwXAU(899)), token::owner(minter));
+                    env(token::createOffer(buyer, nftID, gwXAU(899)), token::Owner(minter));
                     env.close();
 
                     // broker attempts to broker the offers but cannot.
                     env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                        ter(tecINSUFFICIENT_PAYMENT));
+                        Ter(tecINSUFFICIENT_PAYMENT));
                     env.close();
 
                     // Cancel buyer's bad offer so the next test starts in a
@@ -4101,20 +4101,20 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 }
                 // buyer creates a large enough offer.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::Owner(minter));
                 env.close();
 
                 // Broker attempts to charge a brokerFee larger than the
                 // difference between the two offers but cannot.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(gwXAU(101)),
-                    ter(tecINSUFFICIENT_PAYMENT));
+                    token::BrokerFee(gwXAU(101)),
+                    Ter(tecINSUFFICIENT_PAYMENT));
                 env.close();
 
                 // broker charges the full difference between the two offers and
                 // succeeds.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(gwXAU(100)));
+                    token::BrokerFee(gwXAU(100)));
                 env.close();
 
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
@@ -4137,23 +4137,23 @@ 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(maxTransferFee / 2);  // 25%
+                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE / 2);  // 25%
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, gwXAU(900)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates a large enough offer.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::Owner(minter));
                 env.close();
 
                 // broker charges half difference between the two offers and
                 // succeeds.  25% of the remaining difference goes to issuer.
                 // The rest goes to minter.
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(gwXAU(50)));
+                    token::BrokerFee(gwXAU(50)));
                 env.close();
 
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
@@ -4174,20 +4174,20 @@ 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(maxTransferFee / 2);  // 25%
+                uint256 const nftID = mintNFT(kMAX_TRANSFER_FEE / 2);  // 25%
 
                 // minter creates their offer.
                 uint256 const minterOfferIndex = keylet::nftoffer(minter, env.seq(minter)).key;
-                env(token::createOffer(minter, nftID, gwXAU(900)), txflags(tfSellNFToken));
+                env(token::createOffer(minter, nftID, gwXAU(900)), Txflags(tfSellNFToken));
                 env.close();
 
                 // buyer creates a large enough offer.
                 uint256 const buyOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
-                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::owner(minter));
+                env(token::createOffer(buyer, nftID, gwXAU(1000)), token::Owner(minter));
                 env.close();
 
                 env(token::brokerOffers(broker, buyOfferIndex, minterOfferIndex),
-                    token::brokerFee(gwXAU(50)));
+                    token::BrokerFee(gwXAU(50)));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
                 BEAST_EXPECT(ownerCount(env, minter) == 1);
@@ -4223,7 +4223,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // issuer creates an NFT.
         uint256 const nftId{token::getNextID(env, issuer, 0u, tfTransferable)};
-        env(token::mint(issuer, 0u), txflags(tfTransferable));
+        env(token::mint(issuer, 0u), Txflags(tfTransferable));
         env.close();
 
         // Prove that issuer now owns nftId.
@@ -4233,18 +4233,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Both buyer1 and buyer2 create buy offers for nftId.
         uint256 const buyer1OfferIndex = keylet::nftoffer(buyer1, env.seq(buyer1)).key;
-        env(token::createOffer(buyer1, nftId, XRP(100)), token::owner(issuer));
+        env(token::createOffer(buyer1, nftId, XRP(100)), token::Owner(issuer));
         uint256 const buyer2OfferIndex = keylet::nftoffer(buyer2, env.seq(buyer2)).key;
-        env(token::createOffer(buyer2, nftId, XRP(100)), token::owner(issuer));
+        env(token::createOffer(buyer2, nftId, XRP(100)), token::Owner(issuer));
         env.close();
 
         // Lambda that counts the number of buy offers for a given NFT.
         auto nftBuyOfferCount = [&env](uint256 const& nftId) -> std::size_t {
             // We know that in this case not very many offers will be
             // returned, so we skip the marker stuff.
-            Json::Value params;
+            json::Value params;
             params[jss::nft_id] = to_string(nftId);
-            Json::Value buyOffers = env.rpc("json", "nft_buy_offers", to_string(params));
+            json::Value buyOffers = env.rpc("json", "nft_buy_offers", to_string(params));
 
             if (buyOffers.isMember(jss::result) && buyOffers[jss::result].isMember(jss::offers))
                 return buyOffers[jss::result][jss::offers].size();
@@ -4315,7 +4315,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // NFTokenMint
         BEAST_EXPECT(ownerCount(env, issuer) == 10);
         uint256 const nftId{token::getNextID(env, issuer, 0u, tfTransferable)};
-        env(token::mint(issuer, 0u), txflags(tfTransferable), ticket::use(issuerTicketSeq++));
+        env(token::mint(issuer, 0u), Txflags(tfTransferable), ticket::Use(issuerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, issuer) == 10);
         BEAST_EXPECT(ticketCount(env, issuer) == 9);
@@ -4324,14 +4324,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         BEAST_EXPECT(ownerCount(env, buyer) == 10);
         uint256 const offerIndex0 = keylet::nftoffer(buyer, buyerTicketSeq).key;
         env(token::createOffer(buyer, nftId, XRP(1)),
-            token::owner(issuer),
-            ticket::use(buyerTicketSeq++));
+            token::Owner(issuer),
+            ticket::Use(buyerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 10);
         BEAST_EXPECT(ticketCount(env, buyer) == 9);
 
         // NFTokenCancelOffer
-        env(token::cancelOffer(buyer, {offerIndex0}), ticket::use(buyerTicketSeq++));
+        env(token::cancelOffer(buyer, {offerIndex0}), ticket::Use(buyerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 8);
         BEAST_EXPECT(ticketCount(env, buyer) == 8);
@@ -4339,21 +4339,21 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // NFTokenCreateOffer.  buyer tries again.
         uint256 const offerIndex1 = keylet::nftoffer(buyer, buyerTicketSeq).key;
         env(token::createOffer(buyer, nftId, XRP(2)),
-            token::owner(issuer),
-            ticket::use(buyerTicketSeq++));
+            token::Owner(issuer),
+            ticket::Use(buyerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, buyer) == 8);
         BEAST_EXPECT(ticketCount(env, buyer) == 7);
 
         // NFTokenAcceptOffer.  issuer accepts buyer's offer.
-        env(token::acceptBuyOffer(issuer, offerIndex1), ticket::use(issuerTicketSeq++));
+        env(token::acceptBuyOffer(issuer, offerIndex1), ticket::Use(issuerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, issuer) == 8);
         BEAST_EXPECT(ownerCount(env, buyer) == 8);
         BEAST_EXPECT(ticketCount(env, issuer) == 8);
 
         // NFTokenBurn.  buyer burns the token they just bought.
-        env(token::burn(buyer, nftId), ticket::use(buyerTicketSeq++));
+        env(token::burn(buyer, nftId), ticket::Use(buyerTicketSeq++));
         env.close();
         BEAST_EXPECT(ownerCount(env, issuer) == 8);
         BEAST_EXPECT(ownerCount(env, buyer) == 6);
@@ -4395,14 +4395,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env.close();
 
         uint256 const nftId{token::getNextID(env, issuer, 0u, tfTransferable)};
-        env(token::mint(minter, 0u), token::issuer(issuer), txflags(tfTransferable));
+        env(token::mint(minter, 0u), token::Issuer(issuer), Txflags(tfTransferable));
         env.close();
 
         // At the moment issuer and minter cannot delete themselves.
         //  o issuer has an issued NFT in the ledger.
         //  o minter owns an NFT.
-        env(acctdelete(issuer, daria), fee(XRP(50)), ter(tecHAS_OBLIGATIONS));
-        env(acctdelete(minter, daria), fee(XRP(50)), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(issuer, daria), Fee(XRP(50)), Ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(minter, daria), Fee(XRP(50)), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Let enough ledgers pass so the account delete transactions are
@@ -4411,16 +4411,16 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
         // becky and carla create offers for minter's NFT.
-        env(token::createOffer(becky, nftId, XRP(2)), token::owner(minter));
+        env(token::createOffer(becky, nftId, XRP(2)), token::Owner(minter));
         env.close();
 
         uint256 const carlaOfferIndex = keylet::nftoffer(carla, env.seq(carla)).key;
-        env(token::createOffer(carla, nftId, XRP(3)), token::owner(minter));
+        env(token::createOffer(carla, nftId, XRP(3)), token::Owner(minter));
         env.close();
 
         // It should be possible for becky to delete herself, even though
         // becky has an active NFT offer.
-        env(acctdelete(becky, daria), fee(XRP(50)));
+        env(acctdelete(becky, daria), Fee(XRP(50)));
         env.close();
 
         // minter accepts carla's offer.
@@ -4429,14 +4429,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Now it should be possible for minter to delete themselves since
         // they no longer own an NFT.
-        env(acctdelete(minter, daria), fee(XRP(50)));
+        env(acctdelete(minter, daria), Fee(XRP(50)));
         env.close();
 
         // 1. issuer cannot delete themselves because they issued an NFT that
         //    is still in the ledger.
         // 2. carla owns an NFT, so she cannot delete herself.
-        env(acctdelete(issuer, daria), fee(XRP(50)), ter(tecHAS_OBLIGATIONS));
-        env(acctdelete(carla, daria), fee(XRP(50)), ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(issuer, daria), Fee(XRP(50)), Ter(tecHAS_OBLIGATIONS));
+        env(acctdelete(carla, daria), Fee(XRP(50)), Ter(tecHAS_OBLIGATIONS));
         env.close();
 
         // Let enough ledgers pass so the account delete transactions are
@@ -4449,8 +4449,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         env(token::burn(carla, nftId));
         env.close();
 
-        env(acctdelete(issuer, daria), fee(XRP(50)));
-        env(acctdelete(carla, daria), fee(XRP(50)));
+        env(acctdelete(issuer, daria), Fee(XRP(50)));
+        env(acctdelete(carla, daria), Fee(XRP(50)));
         env.close();
     }
 
@@ -4479,7 +4479,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Create an NFT that we'll make offers for.
         uint256 const nftID{token::getNextID(env, issuer, 0u, tfTransferable)};
-        env(token::mint(issuer, 0), txflags(tfTransferable));
+        env(token::mint(issuer, 0), Txflags(tfTransferable));
         env.close();
 
         // A lambda that validates nft_XXX_offers query responses.
@@ -4489,14 +4489,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                                int expectMarkerCount,
                                int line) {
             int markerCount = 0;
-            Json::Value allOffers(Json::arrayValue);
+            json::Value allOffers(json::ArrayValue);
             std::string marker;
 
             // The do/while collects results until no marker is returned.
             do
             {
-                Json::Value nftOffers = [&env, &nftID, &request, &marker]() {
-                    Json::Value params;
+                json::Value nftOffers = [&env, &nftID, &request, &marker]() {
+                    json::Value params;
                     params[jss::nft_id] = to_string(nftID);
 
                     if (!marker.empty())
@@ -4529,7 +4529,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 marker.clear();
                 if (expect(nftOffers.isMember(jss::result), "expected \"result\"", __FILE__, line))
                 {
-                    Json::Value& result = nftOffers[jss::result];
+                    json::Value& result = nftOffers[jss::result];
 
                     if (result.isMember(jss::marker))
                     {
@@ -4539,7 +4539,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                     if (expect(result.isMember(jss::offers), "expected \"offers\"", __FILE__, line))
                     {
-                        Json::Value& someOffers = result[jss::offers];
+                        json::Value& someOffers = result[jss::offers];
                         for (std::size_t i = 0; i < someOffers.size(); ++i)
                             allOffers.append(someOffers[i]);
                     }
@@ -4553,7 +4553,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             std::optional<int> globalFlags;
             std::set<std::string> offerIndexes;
             std::set<std::string> amounts;
-            for (Json::Value const& offer : allOffers)
+            for (json::Value const& offer : allOffers)
             {
                 // The flags on all found offers should be the same.
                 if (!globalFlags)
@@ -4587,7 +4587,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             while (sellPrice < limit)
             {
                 sellPrice += XRP(1);
-                env(token::createOffer(issuer, nftID, sellPrice), txflags(tfSellNFToken));
+                env(token::createOffer(issuer, nftID, sellPrice), Txflags(tfSellNFToken));
                 if (++offerCount % 10 == 0)
                     env.close();
             }
@@ -4625,7 +4625,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             while (buyPrice < limit)
             {
                 buyPrice += XRP(1);
-                env(token::createOffer(buyer, nftID, buyPrice), token::owner(issuer));
+                env(token::createOffer(buyer, nftID, buyPrice), token::Owner(issuer));
                 if (++offerCount % 10 == 0)
                     env.close();
             }
@@ -4681,12 +4681,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // Create an NFT that we'll make XRP offers for.
             uint256 const nftID0{token::getNextID(env, issuer, 0u, tfTransferable)};
-            env(token::mint(issuer, 0), txflags(tfTransferable));
+            env(token::mint(issuer, 0), Txflags(tfTransferable));
             env.close();
 
             // Create an NFT that we'll make IOU offers for.
             uint256 const nftID1{token::getNextID(env, issuer, 1u, tfTransferable)};
-            env(token::mint(issuer, 1), txflags(tfTransferable));
+            env(token::mint(issuer, 1), Txflags(tfTransferable));
             env.close();
 
             TER const offerCreateTER = temBAD_AMOUNT;
@@ -4694,26 +4694,26 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Make offers with negative amounts for the NFTs
             uint256 const sellNegXrpOfferIndex = keylet::nftoffer(issuer, env.seq(issuer)).key;
             env(token::createOffer(issuer, nftID0, XRP(-2)),
-                txflags(tfSellNFToken),
-                ter(offerCreateTER));
+                Txflags(tfSellNFToken),
+                Ter(offerCreateTER));
             env.close();
 
             uint256 const sellNegIouOfferIndex = keylet::nftoffer(issuer, env.seq(issuer)).key;
             env(token::createOffer(issuer, nftID1, gwXAU(-2)),
-                txflags(tfSellNFToken),
-                ter(offerCreateTER));
+                Txflags(tfSellNFToken),
+                Ter(offerCreateTER));
             env.close();
 
             uint256 const buyNegXrpOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftID0, XRP(-1)),
-                token::owner(issuer),
-                ter(offerCreateTER));
+                token::Owner(issuer),
+                Ter(offerCreateTER));
             env.close();
 
             uint256 const buyNegIouOfferIndex = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::createOffer(buyer, nftID1, gwXAU(-1)),
-                token::owner(issuer),
-                ter(offerCreateTER));
+                token::Owner(issuer),
+                Ter(offerCreateTER));
             env.close();
 
             {
@@ -4721,15 +4721,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 TER const offerAcceptTER = tecOBJECT_NOT_FOUND;
 
                 // Sell offers.
-                env(token::acceptSellOffer(buyer, sellNegXrpOfferIndex), ter(offerAcceptTER));
+                env(token::acceptSellOffer(buyer, sellNegXrpOfferIndex), Ter(offerAcceptTER));
                 env.close();
-                env(token::acceptSellOffer(buyer, sellNegIouOfferIndex), ter(offerAcceptTER));
+                env(token::acceptSellOffer(buyer, sellNegIouOfferIndex), Ter(offerAcceptTER));
                 env.close();
 
                 // Buy offers.
-                env(token::acceptBuyOffer(issuer, buyNegXrpOfferIndex), ter(offerAcceptTER));
+                env(token::acceptBuyOffer(issuer, buyNegXrpOfferIndex), Ter(offerAcceptTER));
                 env.close();
-                env(token::acceptBuyOffer(issuer, buyNegIouOfferIndex), ter(offerAcceptTER));
+                env(token::acceptBuyOffer(issuer, buyNegIouOfferIndex), Ter(offerAcceptTER));
                 env.close();
             }
             {
@@ -4737,10 +4737,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // Brokered offers.
                 env(token::brokerOffers(gw, buyNegXrpOfferIndex, sellNegXrpOfferIndex),
-                    ter(offerAcceptTER));
+                    Ter(offerAcceptTER));
                 env.close();
                 env(token::brokerOffers(gw, buyNegIouOfferIndex, sellNegIouOfferIndex),
-                    ter(offerAcceptTER));
+                    Ter(offerAcceptTER));
                 env.close();
             }
         }
@@ -4753,15 +4753,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // Create an NFT that we'll make offers for.
             uint256 const nftID{token::getNextID(env, issuer, 0u, tfTransferable)};
-            env(token::mint(issuer, 0), txflags(tfTransferable));
+            env(token::mint(issuer, 0), Txflags(tfTransferable));
             env.close();
 
             TER const offerCreateTER = tesSUCCESS;
 
             env(token::createOffer(buyer, nftID, drops(1)),
-                token::owner(issuer),
-                token::destination(issuer),
-                ter(offerCreateTER));
+                token::Owner(issuer),
+                token::Destination(issuer),
+                Ter(offerCreateTER));
             env.close();
         }
     }
@@ -4862,7 +4862,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             auto mintNFT = [&env](Account const& minter, int transferFee = 0) {
                 uint256 const nftID = token::getNextID(env, minter, 0, tfTransferable, transferFee);
-                env(token::mint(minter), token::xferFee(transferFee), txflags(tfTransferable));
+                env(token::mint(minter), token::XferFee(transferFee), Txflags(tfTransferable));
                 env.close();
                 return nftID;
             };
@@ -4875,8 +4875,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                                       std::optional<TER const> const terCode = {}) {
                 uint256 const offerID = keylet::nftoffer(offerer, env.seq(offerer)).key;
                 env(token::createOffer(offerer, nftID, amount),
-                    token::owner(owner),
-                    terCode ? ter(*terCode) : ter(static_cast<TER>(tesSUCCESS)));
+                    token::Owner(owner),
+                    terCode ? Ter(*terCode) : Ter(static_cast<TER>(tesSUCCESS)));
                 env.close();
                 return offerID;
             };
@@ -4888,8 +4888,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                                        std::optional<TER const> const terCode = {}) {
                 uint256 const offerID = keylet::nftoffer(offerer, env.seq(offerer)).key;
                 env(token::createOffer(offerer, nftID, amount),
-                    txflags(tfSellNFToken),
-                    terCode ? ter(*terCode) : ter(static_cast<TER>(tesSUCCESS)));
+                    Txflags(tfSellNFToken),
+                    terCode ? Ter(*terCode) : Ter(static_cast<TER>(tesSUCCESS)));
                 env.close();
                 return offerID;
             };
@@ -4901,7 +4901,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createSellOffer(minter, nftID, gwXAU(1000));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptSellOffer(buyer, offerID), ter(sellTER));
+                env(token::acceptSellOffer(buyer, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -4913,7 +4913,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createBuyOffer(buyer, minter, nftID, gwXAU(1000));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptBuyOffer(minter, offerID), ter(sellTER));
+                env(token::acceptBuyOffer(minter, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -4926,7 +4926,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createSellOffer(minter, nftID, gwXAU(995));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptSellOffer(buyer, offerID), ter(sellTER));
+                env(token::acceptSellOffer(buyer, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -4939,7 +4939,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createBuyOffer(buyer, minter, nftID, gwXAU(995));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptBuyOffer(minter, offerID), ter(sellTER));
+                env(token::acceptBuyOffer(minter, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -5026,7 +5026,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createSellOffer(minter, nftID, gwXAU(1000));
                 TER const sellTER = tesSUCCESS;
-                env(token::acceptSellOffer(gw, offerID), ter(sellTER));
+                env(token::acceptSellOffer(gw, offerID), Ter(sellTER));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(1000));
@@ -5041,7 +5041,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 TER const offerTER = tesSUCCESS;
                 auto const offerID = createBuyOffer(gw, minter, nftID, gwXAU(1000), {offerTER});
                 TER const sellTER = tesSUCCESS;
-                env(token::acceptBuyOffer(minter, offerID), ter(sellTER));
+                env(token::acceptBuyOffer(minter, offerID), Ter(sellTER));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(1000));
@@ -5054,7 +5054,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createSellOffer(minter, nftID, gwXAU(5000));
                 TER const sellTER = tesSUCCESS;
-                env(token::acceptSellOffer(gw, offerID), ter(sellTER));
+                env(token::acceptSellOffer(gw, offerID), Ter(sellTER));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(5000));
@@ -5069,7 +5069,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 TER const offerTER = tesSUCCESS;
                 auto const offerID = createBuyOffer(gw, minter, nftID, gwXAU(5000), {offerTER});
                 TER const sellTER = tesSUCCESS;
-                env(token::acceptBuyOffer(minter, offerID), ter(sellTER));
+                env(token::acceptBuyOffer(minter, offerID), Ter(sellTER));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(5000));
@@ -5110,7 +5110,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(gw);
                 auto const offerID = createSellOffer(gw, nftID, gwXAU(2000));
                 env(token::acceptSellOffer(buyer, offerID),
-                    ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
+                    Ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
                 env.close();
                 expectInitialState();
             }
@@ -5122,30 +5122,30 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(gw);
                 auto const offerID = createBuyOffer(buyer, gw, nftID, gwXAU(2000));
                 env(token::acceptBuyOffer(gw, offerID),
-                    ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
+                    Ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
                 env.close();
                 expectInitialState();
             }
             {
                 // Minter attempts to sell the token for XPB 10, which they
-                // have no trust line for and buyer has none 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));
                 env(token::acceptSellOffer(buyer, offerID),
-                    ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
+                    Ter(static_cast<TER>(tecINSUFFICIENT_FUNDS)));
                 env.close();
                 expectInitialState();
             }
             {
                 // Minter attempts to sell the token for XPB 10, which they
-                // have no trust line for and buyer has none of (buyside).
+                // have no trust line for and buyer has kNONE of (buyside).
                 reinitializeTrustLineBalances();
                 auto const nftID = mintNFT(minter);
                 auto const offerID = createBuyOffer(
                     buyer, minter, nftID, gwXPB(10), {static_cast<TER>(tecUNFUNDED_OFFER)});
                 env(token::acceptBuyOffer(minter, offerID),
-                    ter(static_cast<TER>(tecOBJECT_NOT_FOUND)));
+                    Ter(static_cast<TER>(tecOBJECT_NOT_FOUND)));
                 env.close();
                 expectInitialState();
             }
@@ -5200,7 +5200,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // now we can do a secondary sale
                 auto const offerID = createSellOffer(secondarySeller, nftID, gwXAU(1000));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptSellOffer(buyer, offerID), ter(sellTER));
+                env(token::acceptSellOffer(buyer, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -5220,7 +5220,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // now we can do a secondary sale
                 auto const offerID = createBuyOffer(buyer, secondarySeller, nftID, gwXAU(1000));
                 TER const sellTER = tecINSUFFICIENT_FUNDS;
-                env(token::acceptBuyOffer(secondarySeller, offerID), ter(sellTER));
+                env(token::acceptBuyOffer(secondarySeller, offerID), Ter(sellTER));
                 env.close();
 
                 expectInitialState();
@@ -5297,7 +5297,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 auto const nftID = mintNFT(minter);
                 auto const sellOffer = createSellOffer(minter, nftID, gwXAU(300));
                 auto const buyOffer = createBuyOffer(buyer, minter, nftID, gwXAU(500));
-                env(token::brokerOffers(broker, buyOffer, sellOffer), token::brokerFee(gwXAU(100)));
+                env(token::brokerOffers(broker, buyOffer, sellOffer), token::BrokerFee(gwXAU(100)));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(400));
@@ -5335,7 +5335,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // now we can do a secondary sale
                 auto const sellOffer = createSellOffer(secondarySeller, nftID, gwXAU(300));
                 auto const buyOffer = createBuyOffer(buyer, secondarySeller, nftID, gwXAU(500));
-                env(token::brokerOffers(broker, buyOffer, sellOffer), token::brokerFee(gwXAU(100)));
+                env(token::brokerOffers(broker, buyOffer, sellOffer), token::BrokerFee(gwXAU(100)));
                 env.close();
 
                 BEAST_EXPECT(env.balance(minter, gwXAU) == gwXAU(12));
@@ -5394,18 +5394,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         //     a broker can sell the NFT that bob owns to bob and pocket the
         //     difference.
         uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-        env(token::mint(alice, 0u), txflags(tfTransferable));
+        env(token::mint(alice, 0u), Txflags(tfTransferable));
         env.close();
 
         // Bob creates a buy offer for 5 XRP.  Alice creates a sell offer
         // for 0 XRP.
         uint256 const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-        env(token::createOffer(bob, nftId, XRP(5)), token::owner(alice));
+        env(token::createOffer(bob, nftId, XRP(5)), token::Owner(alice));
 
         uint256 const aliceSellOfferIndex = keylet::nftoffer(alice, env.seq(alice)).key;
         env(token::createOffer(alice, nftId, XRP(0)),
-            token::destination(bob),
-            txflags(tfSellNFToken));
+            token::Destination(bob),
+            Txflags(tfSellNFToken));
         env.close();
 
         // bob accepts alice's offer but forgets to remove the old buy offer.
@@ -5417,7 +5417,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
         // Bob creates a sell offer for the gift NFT from alice.
         uint256 const bobSellOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-        env(token::createOffer(bob, nftId, XRP(4)), txflags(tfSellNFToken));
+        env(token::createOffer(bob, nftId, XRP(4)), Txflags(tfSellNFToken));
         env.close();
 
         // bob now has a buy offer and a sell offer on the books.  A broker
@@ -5426,8 +5426,8 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         auto const bobPriorBalance = env.balance(bob);
         auto const brokerPriorBalance = env.balance(broker);
         env(token::brokerOffers(broker, bobBuyOfferIndex, bobSellOfferIndex),
-            token::brokerFee(XRP(1)),
-            ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
+            token::BrokerFee(XRP(1)),
+            Ter(tecCANT_ACCEPT_OWN_NFTOKEN_OFFER));
         env.close();
 
         // A tec result was returned, so no state should change other
@@ -5503,7 +5503,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // alice's account is deleted
             Keylet const aliceAcctKey{keylet::account(alice.id())};
             auto const acctDelFee{drops(env.current()->fees().increment)};
-            env(acctdelete(alice, becky), fee(acctDelFee));
+            env(acctdelete(alice, becky), Fee(acctDelFee));
             env.close();
 
             // alice's account root is gone from the most recently
@@ -5555,7 +5555,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 uint256 const nftokenID = token::getNextID(env, alice, 0u);
                 nftIDs.push_back(nftokenID);
-                env(token::mint(minter), token::issuer(alice));
+                env(token::mint(minter), token::Issuer(alice));
             }
             env.close();
 
@@ -5582,7 +5582,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // MintedNFTokens + 256> enabled by this amendment will enforce
             // alice to wait for more ledgers to close before she can
             // delete her account, to prevent duplicate NFTokenIDs
-            env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+            env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
             env.close();
 
             // alice's account is still present
@@ -5594,7 +5594,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             incLgrSeqForFixNftRemint(env, alice);
 
             // alice's account is deleted
-            env(acctdelete(alice, becky), fee(acctDelFee));
+            env(acctdelete(alice, becky), Fee(acctDelFee));
             env.close();
 
             // alice's account root is gone from the most recently
@@ -5652,14 +5652,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             for (int i = 0; i < 50; i++)
             {
                 nftIDs.push_back(token::getNextID(env, alice, 0u));
-                env(token::mint(alice, 0u), ticket::use(aliceTicketSeq++));
+                env(token::mint(alice, 0u), ticket::Use(aliceTicketSeq++));
                 env.close();
             }
 
             // alice burns 50 NFTs using tickets
             for (auto const nftokenID : nftIDs)
             {
-                env(token::burn(alice, nftokenID), ticket::use(aliceTicketSeq++));
+                env(token::burn(alice, nftokenID), ticket::Use(aliceTicketSeq++));
             }
             env.close();
 
@@ -5681,7 +5681,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // MintedNFTokens + 256> enabled by this amendment will enforce
             // alice to wait for more ledgers to close before she can
             // delete her account, to prevent duplicate NFTokenIDs
-            env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+            env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
             env.close();
 
             // alice's account is still present
@@ -5693,7 +5693,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             incLgrSeqForFixNftRemint(env, alice);
 
             // alice's account is deleted
-            env(acctdelete(alice, becky), fee(acctDelFee));
+            env(acctdelete(alice, becky), Fee(acctDelFee));
             env.close();
 
             // alice's account root is gone from the most recently
@@ -5756,14 +5756,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             uint256 const nftokenID = token::getNextID(env, alice, 0u);
             nftIDs.push_back(nftokenID);
-            env(token::mint(minter), token::issuer(alice), ticket::use(minterTicketSeq++));
+            env(token::mint(minter), token::Issuer(alice), ticket::Use(minterTicketSeq++));
         }
         env.close();
 
         // minter burns 50 NFTs using tickets
         for (auto const nftokenID : nftIDs)
         {
-            env(token::burn(minter, nftokenID), ticket::use(minterTicketSeq++));
+            env(token::burn(minter, nftokenID), ticket::Use(minterTicketSeq++));
         }
         env.close();
 
@@ -5784,7 +5784,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // alice to wait for more ledgers to close before she can delete her
         // account, to prevent duplicate NFTokenIDs
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(alice, becky), fee(acctDelFee), ter(tecTOO_SOON));
+        env(acctdelete(alice, becky), Fee(acctDelFee), Ter(tecTOO_SOON));
         env.close();
 
         // alice's account is still present
@@ -5796,7 +5796,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         incLgrSeqForFixNftRemint(env, alice);
 
         // alice's account is deleted
-        env(acctdelete(alice, becky), fee(acctDelFee));
+        env(acctdelete(alice, becky), Fee(acctDelFee));
         env.close();
 
         // alice's account root is gone from the most recently
@@ -5844,13 +5844,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice, buyer);
             env.close();
 
-            env(token::mint(alice), token::amount(XRP(10000)), ter(temDISABLED));
+            env(token::mint(alice), token::Amount(XRP(10000)), Ter(temDISABLED));
             env.close();
 
-            env(token::mint(alice), token::destination("buyer"), ter(temDISABLED));
+            env(token::mint(alice), token::Destination("buyer"), Ter(temDISABLED));
             env.close();
 
-            env(token::mint(alice), token::expiration(lastClose(env) + 25), ter(temDISABLED));
+            env(token::mint(alice), token::Expiration(lastClose(env) + 25), Ter(temDISABLED));
             env.close();
 
             return;
@@ -5873,12 +5873,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             {
                 // Destination field specified but Amount field not specified
-                env(token::mint(alice), token::destination(buyer), ter(temMALFORMED));
+                env(token::mint(alice), token::Destination(buyer), Ter(temMALFORMED));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
                 // Expiration field specified but Amount field not specified
-                env(token::mint(alice), token::expiration(lastClose(env) + 25), ter(temMALFORMED));
+                env(token::mint(alice), token::Expiration(lastClose(env) + 25), Ter(temMALFORMED));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, buyer) == 0);
             }
@@ -5887,18 +5887,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // The destination may not be the account submitting the
                 // transaction.
                 env(token::mint(alice),
-                    token::amount(XRP(1000)),
-                    token::destination(alice),
-                    ter(temMALFORMED));
+                    token::Amount(XRP(1000)),
+                    token::Destination(alice),
+                    Ter(temMALFORMED));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
                 // The destination must be an account already established in the
                 // ledger.
                 env(token::mint(alice),
-                    token::amount(XRP(1000)),
-                    token::destination(Account("demon")),
-                    ter(tecNO_DST));
+                    token::Amount(XRP(1000)),
+                    token::Destination(Account("demon")),
+                    Ter(tecNO_DST));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
             }
@@ -5906,17 +5906,17 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 // Set a bad expiration.
                 env(token::mint(alice),
-                    token::amount(XRP(1000)),
-                    token::expiration(0),
-                    ter(temBAD_EXPIRATION));
+                    token::Amount(XRP(1000)),
+                    token::Expiration(0),
+                    Ter(temBAD_EXPIRATION));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
                 // The new NFTokenOffer may not have passed its expiration time.
                 env(token::mint(alice),
-                    token::amount(XRP(1000)),
-                    token::expiration(lastClose(env)),
-                    ter(tecEXPIRED));
+                    token::Amount(XRP(1000)),
+                    token::Expiration(lastClose(env)),
+                    Ter(tecEXPIRED));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
             }
@@ -5924,19 +5924,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 // Set an invalid amount.
                 env(token::mint(alice),
-                    token::amount(buyer["USD"](1)),
-                    txflags(tfOnlyXRP),
-                    ter(temBAD_AMOUNT));
-                env(token::mint(alice), token::amount(buyer["USD"](0)), ter(temBAD_AMOUNT));
+                    token::Amount(buyer["USD"](1)),
+                    Txflags(tfOnlyXRP),
+                    Ter(temBAD_AMOUNT));
+                env(token::mint(alice), token::Amount(buyer["USD"](0)), Ter(temBAD_AMOUNT));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
                 // Issuer (alice) must have a trust line for the offered funds.
                 env(token::mint(alice),
-                    token::amount(gwAUD(1000)),
-                    txflags(tfTransferable),
-                    token::xferFee(10),
-                    ter(tecNO_LINE));
+                    token::Amount(gwAUD(1000)),
+                    Txflags(tfTransferable),
+                    token::XferFee(10),
+                    Ter(tecNO_LINE));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
@@ -5944,9 +5944,9 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // then that issuer does not need a trust line to accept their
                 // fee.
                 env(token::mint(gw),
-                    token::amount(gwAUD(1000)),
-                    txflags(tfTransferable),
-                    token::xferFee(10));
+                    token::Amount(gwAUD(1000)),
+                    Txflags(tfTransferable),
+                    token::XferFee(10));
                 env.close();
 
                 // Give alice the needed trust line, but freeze it.
@@ -5956,15 +5956,15 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // Issuer (alice) must have a trust line for the offered funds
                 // and the trust line may not be frozen.
                 env(token::mint(alice),
-                    token::amount(gwAUD(1000)),
-                    txflags(tfTransferable),
-                    token::xferFee(10),
-                    ter(tecFROZEN));
+                    token::Amount(gwAUD(1000)),
+                    Txflags(tfTransferable),
+                    token::XferFee(10),
+                    Ter(tecFROZEN));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
                 // Seller (alice) must have a trust line may not be frozen.
-                env(token::mint(alice), token::amount(gwAUD(1000)), ter(tecFROZEN));
+                env(token::mint(alice), token::Amount(gwAUD(1000)), Ter(tecFROZEN));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, alice) == 0);
 
@@ -5982,66 +5982,66 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 env.close();
 
                 // doesn't have reserve for 2 objects (NFTokenPage, Offer)
-                env(token::mint(bob), token::amount(XRP(0)), ter(tecINSUFFICIENT_RESERVE));
+                env(token::mint(bob), token::Amount(XRP(0)), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // have reserve for NFTokenPage, Offer
                 env(pay(env.master, bob, incReserve + drops(baseFee)));
                 env.close();
-                env(token::mint(bob), token::amount(XRP(0)));
+                env(token::mint(bob), token::Amount(XRP(0)));
                 env.close();
 
                 // doesn't have reserve for Offer
                 env(pay(env.master, bob, drops(baseFee)));
                 env.close();
-                env(token::mint(bob), token::amount(XRP(0)), ter(tecINSUFFICIENT_RESERVE));
+                env(token::mint(bob), token::Amount(XRP(0)), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // have reserve for Offer
                 env(pay(env.master, bob, incReserve + drops(baseFee)));
                 env.close();
-                env(token::mint(bob), token::amount(XRP(0)));
+                env(token::mint(bob), token::Amount(XRP(0)));
                 env.close();
             }
 
             // Amount field specified
             BEAST_EXPECT(ownerCount(env, alice) == 0);
-            env(token::mint(alice), token::amount(XRP(10)));
+            env(token::mint(alice), token::Amount(XRP(10)));
             BEAST_EXPECT(ownerCount(env, alice) == 2);
             env.close();
 
             // Amount field and Destination field, Expiration field specified
             env(token::mint(alice),
-                token::amount(XRP(10)),
-                token::destination(buyer),
-                token::expiration(lastClose(env) + 25));
+                token::Amount(XRP(10)),
+                token::Destination(buyer),
+                token::Expiration(lastClose(env) + 25));
             env.close();
 
             // With TransferFee field
             env(trust(alice, gwAUD(1000)));
             env.close();
             env(token::mint(alice),
-                token::amount(gwAUD(1)),
-                token::destination(buyer),
-                token::expiration(lastClose(env) + 25),
-                txflags(tfTransferable),
-                token::xferFee(10));
+                token::Amount(gwAUD(1)),
+                token::Destination(buyer),
+                token::Expiration(lastClose(env) + 25),
+                Txflags(tfTransferable),
+                token::XferFee(10));
             env.close();
 
             // Can be canceled by the issuer.
             env(token::mint(alice),
-                token::amount(XRP(10)),
-                token::destination(buyer),
-                token::expiration(lastClose(env) + 25));
+                token::Amount(XRP(10)),
+                token::Destination(buyer),
+                token::Expiration(lastClose(env) + 25));
             uint256 const offerAliceSellsToBuyer = keylet::nftoffer(alice, env.seq(alice)).key;
             env(token::cancelOffer(alice, {offerAliceSellsToBuyer}));
             env.close();
 
             // Can be canceled by the buyer.
             env(token::mint(buyer),
-                token::amount(XRP(10)),
-                token::destination(alice),
-                token::expiration(lastClose(env) + 25));
+                token::Amount(XRP(10)),
+                token::Destination(alice),
+                token::Expiration(lastClose(env) + 25));
             uint256 const offerBuyerSellsToAlice = keylet::nftoffer(buyer, env.seq(buyer)).key;
             env(token::cancelOffer(alice, {offerBuyerSellsToAlice}));
             env.close();
@@ -6052,7 +6052,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Minter will have offer not issuer
             BEAST_EXPECT(ownerCount(env, minter) == 0);
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
-            env(token::mint(minter), token::issuer(issuer), token::amount(drops(1)));
+            env(token::mint(minter), token::Issuer(issuer), token::Amount(drops(1)));
             env.close();
             BEAST_EXPECT(ownerCount(env, minter) == 2);
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
@@ -6066,7 +6066,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         TER const offerCreateTER = temBAD_AMOUNT;
 
         // Make offers with negative amounts for the NFTs
-        env(token::mint(alice), token::amount(XRP(-2)), ter(offerCreateTER));
+        env(token::mint(alice), token::Amount(XRP(-2)), Ter(offerCreateTER));
         env.close();
     }
 
@@ -6101,10 +6101,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // transaction
         auto verifyNFTokenID = [&](uint256 const& actualNftID) {
             // Get the hash for the most recent transaction.
-            std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+            std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
             env.close();
-            Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+            json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
             // Expect nftokens_id field
             if (!BEAST_EXPECT(meta.isMember(jss::nftoken_id)))
@@ -6121,22 +6121,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // changed in the most recent NFTokenCancelOffer transaction
         auto verifyNFTokenIDsInCancelOffer = [&](std::vector<uint256> actualNftIDs) {
             // Get the hash for the most recent transaction.
-            std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+            std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
             env.close();
-            Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+            json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
             // Expect nftokens_ids field and verify the values
             if (!BEAST_EXPECT(meta.isMember(jss::nftoken_ids)))
                 return;
 
-            // Convert NFT IDs from Json::Value to uint256
+            // Convert NFT IDs from json::Value to uint256
             std::vector<uint256> metaIDs;
             std::transform(
                 meta[jss::nftoken_ids].begin(),
                 meta[jss::nftoken_ids].end(),
                 std::back_inserter(metaIDs),
-                [this](Json::Value id) {
+                [this](json::Value id) {
                     uint256 nftID;
                     BEAST_EXPECT(nftID.parseHex(id.asString()));
                     return nftID;
@@ -6159,10 +6159,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         // changed in the most recent NFTokenCreateOffer tx
         auto verifyNFTokenOfferID = [&](uint256 const& offerID) {
             // Get the hash for the most recent transaction.
-            std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+            std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
             env.close();
-            Json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+            json::Value const meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
             // Expect offer_id field and verify the value
             if (!BEAST_EXPECT(meta.isMember(jss::offer_id)))
@@ -6178,12 +6178,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Alice mints 2 NFTs
             // Verify the NFTokenIDs are correct in the NFTokenMint tx meta
             uint256 const nftId1{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
             verifyNFTokenID(nftId1);
 
             uint256 const nftId2{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
             verifyNFTokenID(nftId2);
 
@@ -6191,12 +6191,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Verify the offer indexes are correct in the NFTokenCreateOffer tx
             // meta
             uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId1, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId1, drops(1)), Txflags(tfSellNFToken));
             env.close();
             verifyNFTokenOfferID(aliceOfferIndex1);
 
             uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId2, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId2, drops(1)), Txflags(tfSellNFToken));
             env.close();
             verifyNFTokenOfferID(aliceOfferIndex2);
 
@@ -6210,7 +6210,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // Bobs creates a buy offer for nftId1
             // Verify the offer id is correct in the NFTokenCreateOffer tx meta
             auto const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId1, drops(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId1, drops(1)), token::Owner(alice));
             env.close();
             verifyNFTokenOfferID(bobBuyOfferIndex);
 
@@ -6225,21 +6225,21 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
             verifyNFTokenID(nftId);
 
             // Alice creates sell offer and set broker as destination
             uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key;
             env(token::createOffer(alice, nftId, drops(1)),
-                token::destination(broker),
-                txflags(tfSellNFToken));
+                token::Destination(broker),
+                Txflags(tfSellNFToken));
             env.close();
             verifyNFTokenOfferID(offerAliceToBroker);
 
             // Bob creates buy offer
             uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId, drops(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId, drops(1)), token::Owner(alice));
             env.close();
             verifyNFTokenOfferID(offerBobToBroker);
 
@@ -6254,18 +6254,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         {
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
             verifyNFTokenID(nftId);
 
             // Alice creates 2 sell offers for the same NFT
             uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId, drops(1)), Txflags(tfSellNFToken));
             env.close();
             verifyNFTokenOfferID(aliceOfferIndex1);
 
             uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId, drops(1)), Txflags(tfSellNFToken));
             env.close();
             verifyNFTokenOfferID(aliceOfferIndex2);
 
@@ -6279,7 +6279,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         if (features[featureNFTokenMintOffer])
         {
             uint256 const aliceMintWithOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::mint(alice), token::amount(XRP(0)));
+            env(token::mint(alice), token::Amount(XRP(0)));
             env.close();
             verifyNFTokenOfferID(aliceMintWithOfferIndex1);
         }
@@ -6297,12 +6297,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             [](test::jtx::Env& env, test::jtx::Account const& acct, STAmount const amt) -> uint256 {
             // acct mints a NFT
             uint256 const nftId{token::getNextID(env, acct, 0u, tfTransferable)};
-            env(token::mint(acct, 0u), txflags(tfTransferable));
+            env(token::mint(acct, 0u), Txflags(tfTransferable));
             env.close();
 
             // acct makes an sell offer
             uint256 const sellOfferIndex = keylet::nftoffer(acct, env.seq(acct)).key;
-            env(token::createOffer(acct, nftId, amt), txflags(tfSellNFToken));
+            env(token::createOffer(acct, nftId, amt), Txflags(tfSellNFToken));
             env.close();
 
             return sellOfferIndex;
@@ -6357,7 +6357,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 // Bob is not able to accept the offer with only the account
                 // reserve (200,000,000 drops)
-                env(token::acceptSellOffer(bob, sellOfferIndex), ter(tecINSUFFICIENT_RESERVE));
+                env(token::acceptSellOffer(bob, sellOfferIndex), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // after prev transaction, Bob owns `200M - base fee` drops due
@@ -6365,7 +6365,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 BEAST_EXPECT(ownerCount(env, bob) == 0);
 
-                // Send bob an increment 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)));
@@ -6373,7 +6373,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // However, this transaction will still fail because the reserve
                 // requirement is `base fee` drops higher
-                env(token::acceptSellOffer(bob, sellOfferIndex), ter(tecINSUFFICIENT_RESERVE));
+                env(token::acceptSellOffer(bob, sellOfferIndex), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // Send bob `base fee * 2` drops
@@ -6425,7 +6425,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // Bob cannot accept this offer because he doesn't have the
                 // reserve for the NFT
-                env(token::acceptSellOffer(bob, sellOfferIndex1), ter(tecINSUFFICIENT_RESERVE));
+                env(token::acceptSellOffer(bob, sellOfferIndex1), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // Give bob enough reserve
@@ -6461,7 +6461,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
                 // Bob fails to accept this NFT because he does not have enough
                 // reserve for a new NFTokenPage
-                env(token::acceptSellOffer(bob, sellOfferIndex33), ter(tecINSUFFICIENT_RESERVE));
+                env(token::acceptSellOffer(bob, sellOfferIndex33), Ter(tecINSUFFICIENT_RESERVE));
                 env.close();
 
                 // Send bob incremental reserve
@@ -6494,26 +6494,26 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.fund(XRP(10000), alice);
             env.close();
 
-            // Bob is funded with account reserve + increment reserve + 1 XRP
-            // increment 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();
 
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
 
             // Bob makes a buy offer for 1 XRP
             auto const buyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId, XRP(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId, XRP(1)), token::Owner(alice));
             env.close();
 
             // accepting the buy offer fails because bob's balance is `base fee`
             // drops lower than the required amount, since the previous tx burnt
             // drops for tx fee.
-            env(token::acceptBuyOffer(alice, buyOfferIndex), ter(tecINSUFFICIENT_FUNDS));
+            env(token::acceptBuyOffer(alice, buyOfferIndex), Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
             // send Bob `base fee` drops
@@ -6550,19 +6550,19 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             env.close();
 
             // Alice creates sell offer and set broker as destination
             uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key;
             env(token::createOffer(alice, nftId, XRP(1)),
-                token::destination(broker),
-                txflags(tfSellNFToken));
+                token::Destination(broker),
+                Txflags(tfSellNFToken));
             env.close();
 
             // Bob creates buy offer
             uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId, XRP(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId, XRP(1)), token::Owner(alice));
             env.close();
 
             // broker offers.
@@ -6570,7 +6570,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // created his buy offer, which makes his spendable balance to be
             // less than the required amount.
             env(token::brokerOffers(broker, offerBobToBroker, offerAliceToBroker),
-                ter(tecINSUFFICIENT_FUNDS));
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
             // send Bob `base fee` drops
@@ -6644,22 +6644,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const nftAutoTrustID{
                 token::getNextID(env, issuer, 0u, tfTransferable | tfTrustLine, xferFee)};
             env(token::mint(issuer, 0u),
-                token::xferFee(xferFee),
-                txflags(tfTransferable | tfTrustLine));
+                token::XferFee(xferFee),
+                Txflags(tfTransferable | tfTrustLine));
             env.close();
 
             uint256 const nftNoAutoTrustID{
                 token::getNextID(env, issuer, 0u, tfTransferable, xferFee)};
-            env(token::mint(issuer, 0u), token::xferFee(xferFee), txflags(tfTransferable));
+            env(token::mint(issuer, 0u), token::XferFee(xferFee), Txflags(tfTransferable));
             env.close();
 
             // becky buys the nfts for 1 drop each.
             {
                 uint256 const beckyBuyOfferIndex1 = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(issuer));
+                env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::Owner(issuer));
 
                 uint256 const beckyBuyOfferIndex2 = keylet::nftoffer(becky, env.seq(becky)).key;
-                env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(issuer));
+                env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::Owner(issuer));
 
                 env.close();
                 env(token::acceptBuyOffer(issuer, beckyBuyOfferIndex1));
@@ -6669,14 +6669,14 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // becky creates offers to sell the nfts for AUD.
             uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftAutoTrustID, gwAUD(100)), Txflags(tfSellNFToken));
             env.close();
 
             // Creating an offer for the NFToken without tfTrustLine fails
             // because issuer does not have a trust line for AUD.
             env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)),
-                txflags(tfSellNFToken),
-                ter(tecNO_LINE));
+                Txflags(tfSellNFToken),
+                Ter(tecNO_LINE));
             env.close();
 
             // issuer creates a trust line.  Now the offer create for the
@@ -6687,7 +6687,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             BEAST_EXPECT(ownerCount(env, issuer) == 1);
 
             uint256 const beckyNoAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftNoAutoTrustID, gwAUD(100)), Txflags(tfSellNFToken));
             env.close();
 
             // Now that the offers are in place, issuer removes the trustline.
@@ -6717,7 +6717,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 // With fixEnforceNFTokenTrustline cheri can't accept the
                 // offer because issuer could not get their transfer fee
                 // without the appropriate trustline.
-                env(token::acceptSellOffer(cheri, beckyNoAutoTrustOfferIndex), ter(tecNO_LINE));
+                env(token::acceptSellOffer(cheri, beckyNoAutoTrustOfferIndex), Ter(tecNO_LINE));
                 env.close();
 
                 // But if issuer re-establishes the trustline then the offer
@@ -6800,21 +6800,21 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
         uint256 const nftAutoTrustID{
             token::getNextID(env, issuer, 0u, tfTransferable | tfTrustLine, xferFee)};
         env(token::mint(issuer, 0u),
-            token::xferFee(xferFee),
-            txflags(tfTransferable | tfTrustLine));
+            token::XferFee(xferFee),
+            Txflags(tfTransferable | tfTrustLine));
         env.close();
 
         uint256 const nftNoAutoTrustID{token::getNextID(env, issuer, 0u, tfTransferable, xferFee)};
-        env(token::mint(issuer, 0u), token::xferFee(xferFee), txflags(tfTransferable));
+        env(token::mint(issuer, 0u), token::XferFee(xferFee), Txflags(tfTransferable));
         env.close();
 
         // becky buys the nfts for 1 drop each.
         {
             uint256 const beckyBuyOfferIndex1 = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::owner(issuer));
+            env(token::createOffer(becky, nftAutoTrustID, drops(1)), token::Owner(issuer));
 
             uint256 const beckyBuyOfferIndex2 = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::owner(issuer));
+            env(token::createOffer(becky, nftNoAutoTrustID, drops(1)), token::Owner(issuer));
 
             env.close();
             env(token::acceptBuyOffer(issuer, beckyBuyOfferIndex1));
@@ -6830,18 +6830,18 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // create an offer for a non-tfTrustLine NFToken that would
             // pay the transfer fee in issuer's own IOU.
             env(token::createOffer(becky, nftNoAutoTrustID, isISU(100)),
-                txflags(tfSellNFToken),
-                ter(tecNO_LINE));
+                Txflags(tfSellNFToken),
+                Ter(tecNO_LINE));
             env.close();
 
             // And issuer can't create a trust line to themselves.
-            env(trust(issuer, isISU(1000)), ter(temDST_IS_SRC));
+            env(trust(issuer, isISU(1000)), Ter(temDST_IS_SRC));
             env.close();
 
             // However if the NFToken has the tfTrustLine flag set,
             // then becky can create the offer.
             uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAutoTrustID, isISU(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftAutoTrustID, isISU(100)), Txflags(tfSellNFToken));
             env.close();
 
             // And cheri can accept the offer.
@@ -6858,10 +6858,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             // With featureNFTokenMintOffer things go better.
             // becky creates offers to sell the nfts for ISU.
             uint256 const beckyNoAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftNoAutoTrustID, isISU(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftNoAutoTrustID, isISU(100)), Txflags(tfSellNFToken));
             env.close();
             uint256 const beckyAutoTrustOfferIndex = keylet::nftoffer(becky, env.seq(becky)).key;
-            env(token::createOffer(becky, nftAutoTrustID, isISU(100)), txflags(tfSellNFToken));
+            env(token::createOffer(becky, nftAutoTrustID, isISU(100)), Txflags(tfSellNFToken));
             env.close();
 
             // cheri accepts becky's offers.  Behavior is uniform:
@@ -6905,7 +6905,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
             auto const expectedTer = modifyEnabled ? TER{tesSUCCESS} : TER{temINVALID_FLAG};
-            env(token::mint(issuer, 0u), txflags(tfMutable), ter(expectedTer));
+            env(token::mint(issuer, 0u), Txflags(tfMutable), Ter(expectedTer));
             env.close();
         }
         {
@@ -6917,7 +6917,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const nftId{token::getNextID(env, issuer, 0u, tfMutable)};
             if (modifyEnabled)
             {
-                env(token::mint(issuer, 0u), txflags(tfMutable));
+                env(token::mint(issuer, 0u), Txflags(tfMutable));
                 env.close();
                 BEAST_EXPECT(ownerCount(env, issuer) == 1);
                 env(token::modify(issuer, nftId));
@@ -6927,7 +6927,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             {
                 env(token::mint(issuer, 0u));
                 env.close();
-                env(token::modify(issuer, nftId), ter(temDISABLED));
+                env(token::modify(issuer, nftId), Ter(temDISABLED));
                 env.close();
             }
         }
@@ -6940,28 +6940,28 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             env.close();
 
             uint256 const nftId{token::getNextID(env, issuer, 0u, tfMutable)};
-            env(token::mint(issuer, 0u), txflags(tfMutable));
+            env(token::mint(issuer, 0u), Txflags(tfMutable));
             env.close();
 
             // Set a negative fee. Exercises invalid preflight1.
-            env(token::modify(issuer, nftId), fee(STAmount(10ull, true)), ter(temBAD_FEE));
+            env(token::modify(issuer, nftId), Fee(STAmount(10ull, true)), Ter(temBAD_FEE));
             env.close();
 
             // Invalid Flags
-            env(token::modify(issuer, nftId), txflags(0x00000001), ter(temINVALID_FLAG));
+            env(token::modify(issuer, nftId), Txflags(0x00000001), Ter(temINVALID_FLAG));
 
             // Invalid Owner
-            env(token::modify(issuer, nftId), token::owner(issuer), ter(temMALFORMED));
+            env(token::modify(issuer, nftId), token::Owner(issuer), Ter(temMALFORMED));
             env.close();
 
             // Invalid URI length = 0
-            env(token::modify(issuer, nftId), token::uri(""), ter(temMALFORMED));
+            env(token::modify(issuer, nftId), token::Uri(""), Ter(temMALFORMED));
             env.close();
 
             // Invalid URI length > 256
             env(token::modify(issuer, nftId),
-                token::uri(std::string(maxTokenURILength + 1, 'q')),
-                ter(temMALFORMED));
+                token::Uri(std::string(kMAX_TOKEN_URI_LENGTH + 1, 'q')),
+                Ter(temMALFORMED));
             env.close();
         }
         {
@@ -6974,7 +6974,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 uint256 const nftIDNotExists{token::getNextID(env, issuer, 0u, tfMutable)};
                 env.close();
 
-                env(token::modify(issuer, nftIDNotExists), ter(tecNO_ENTRY));
+                env(token::modify(issuer, nftIDNotExists), Ter(tecNO_ENTRY));
                 env.close();
             }
             {
@@ -6983,22 +6983,22 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
                 env(token::mint(issuer, 0u));
                 env.close();
 
-                env(token::modify(issuer, nftIDNotModifiable), ter(tecNO_PERMISSION));
+                env(token::modify(issuer, nftIDNotModifiable), Ter(tecNO_PERMISSION));
                 env.close();
             }
             {
                 // Unauthorized account
                 uint256 const nftId{token::getNextID(env, issuer, 0u, tfMutable)};
-                env(token::mint(issuer, 0u), txflags(tfMutable));
+                env(token::mint(issuer, 0u), Txflags(tfMutable));
                 env.close();
 
-                env(token::modify(bob, nftId), token::owner(issuer), ter(tecNO_PERMISSION));
+                env(token::modify(bob, nftId), token::Owner(issuer), Ter(tecNO_PERMISSION));
                 env.close();
 
                 env(token::setMinter(issuer, alice));
                 env.close();
 
-                env(token::modify(bob, nftId), token::owner(issuer), ter(tecNO_PERMISSION));
+                env(token::modify(bob, nftId), token::Owner(issuer), Ter(tecNO_PERMISSION));
                 env.close();
             }
         }
@@ -7009,10 +7009,10 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // modify with tfFullyCanonicalSig should success
             uint256 const nftId{token::getNextID(env, issuer, 0u, tfMutable)};
-            env(token::mint(issuer, 0u), txflags(tfMutable), token::uri("uri"));
+            env(token::mint(issuer, 0u), Txflags(tfMutable), token::Uri("uri"));
             env.close();
 
-            env(token::modify(issuer, nftId), txflags(tfFullyCanonicalSig));
+            env(token::modify(issuer, nftId), Txflags(tfFullyCanonicalSig));
             env.close();
         }
         {
@@ -7022,7 +7022,7 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
 
             // lambda that returns the JSON form of NFTokens held by acct
             auto accountNFTs = [&env](Account const& acct) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = acct.human();
                 params[jss::type] = "state";
                 auto response = env.rpc("json", "account_nfts", to_string(params));
@@ -7074,12 +7074,12 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             uint256 const nftId{token::getNextID(env, issuer, 0u, tfMutable)};
             env.close();
 
-            env(token::mint(issuer, 0u), txflags(tfMutable), token::uri("uri"));
+            env(token::mint(issuer, 0u), Txflags(tfMutable), token::Uri("uri"));
             env.close();
             checkURI(issuer, "uri", __LINE__);
 
             // set URI Field
-            env(token::modify(issuer, nftId), token::uri("new_uri"));
+            env(token::modify(issuer, nftId), token::Uri("new_uri"));
             env.close();
             checkURI(issuer, "new_uri", __LINE__);
 
@@ -7089,13 +7089,13 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             checkURI(issuer, nullptr, __LINE__);
 
             // set URI Field
-            env(token::modify(issuer, nftId), token::uri("uri"));
+            env(token::modify(issuer, nftId), token::Uri("uri"));
             env.close();
             checkURI(issuer, "uri", __LINE__);
 
             // Account != Owner
             uint256 const offerID = keylet::nftoffer(issuer, env.seq(issuer)).key;
-            env(token::createOffer(issuer, nftId, XRP(0)), txflags(tfSellNFToken));
+            env(token::createOffer(issuer, nftId, XRP(0)), Txflags(tfSellNFToken));
             env.close();
             env(token::acceptSellOffer(alice, offerID));
             env.close();
@@ -7104,45 +7104,45 @@ class NFTokenBaseUtil_test : public beast::unit_test::suite
             checkURI(alice, "uri", __LINE__);
 
             // Modify by owner fails.
-            env(token::modify(alice, nftId), token::uri("new_uri"), ter(tecNO_PERMISSION));
+            env(token::modify(alice, nftId), token::Uri("new_uri"), Ter(tecNO_PERMISSION));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             checkURI(alice, "uri", __LINE__);
 
-            env(token::modify(issuer, nftId), token::owner(alice), token::uri("new_uri"));
+            env(token::modify(issuer, nftId), token::Owner(alice), token::Uri("new_uri"));
             env.close();
             BEAST_EXPECT(ownerCount(env, issuer) == 0);
             BEAST_EXPECT(ownerCount(env, alice) == 1);
             checkURI(alice, "new_uri", __LINE__);
 
-            env(token::modify(issuer, nftId), token::owner(alice));
+            env(token::modify(issuer, nftId), token::Owner(alice));
             env.close();
             checkURI(alice, nullptr, __LINE__);
 
-            env(token::modify(issuer, nftId), token::owner(alice), token::uri("uri"));
+            env(token::modify(issuer, nftId), token::Owner(alice), token::Uri("uri"));
             env.close();
             checkURI(alice, "uri", __LINE__);
 
             // Modify by authorized minter
             env(token::setMinter(issuer, bob));
             env.close();
-            env(token::modify(bob, nftId), token::owner(alice), token::uri("new_uri"));
+            env(token::modify(bob, nftId), token::Owner(alice), token::Uri("new_uri"));
             env.close();
             checkURI(alice, "new_uri", __LINE__);
 
-            env(token::modify(bob, nftId), token::owner(alice));
+            env(token::modify(bob, nftId), token::Owner(alice));
             env.close();
             checkURI(alice, nullptr, __LINE__);
 
-            env(token::modify(bob, nftId), token::owner(alice), token::uri("uri"));
+            env(token::modify(bob, nftId), token::Owner(alice), token::Uri("uri"));
             env.close();
             checkURI(alice, "uri", __LINE__);
         }
     }
 
 protected:
-    FeatureBitset const allFeatures{test::jtx::testable_amendments()};
+    FeatureBitset const allFeatures_{test::jtx::testableAmendments()};
 
     void
     testWithFeats(FeatureBitset features)
@@ -7189,7 +7189,7 @@ public:
     run() override
     {
         testWithFeats(
-            allFeatures - fixNFTokenReserve - featureNFTokenMintOffer - featureDynamicNFT -
+            allFeatures_ - fixNFTokenReserve - featureNFTokenMintOffer - featureDynamicNFT -
             fixSecurity3_1_3);
     }
 };
@@ -7200,7 +7200,7 @@ class NFTokenDisallowIncoming_test : public NFTokenBaseUtil_test
     run() override
     {
         testWithFeats(
-            allFeatures - fixNFTokenReserve - featureNFTokenMintOffer - featureDynamicNFT);
+            allFeatures_ - fixNFTokenReserve - featureNFTokenMintOffer - featureDynamicNFT);
     }
 };
 
@@ -7209,7 +7209,7 @@ class NFTokenWOMintOffer_test : public NFTokenBaseUtil_test
     void
     run() override
     {
-        testWithFeats(allFeatures - featureNFTokenMintOffer - featureDynamicNFT);
+        testWithFeats(allFeatures_ - featureNFTokenMintOffer - featureDynamicNFT);
     }
 };
 
@@ -7218,16 +7218,16 @@ class NFTokenWOModify_test : public NFTokenBaseUtil_test
     void
     run() override
     {
-        testWithFeats(allFeatures - featureDynamicNFT);
+        testWithFeats(allFeatures_ - featureDynamicNFT);
     }
 };
 
-class NFTokenWOExpiredOfferRemoval_test : public NFTokenBaseUtil_test
+class NfTokenWoExpiredOfferRemovalTest : public NFTokenBaseUtil_test
 {
     void
     run() override
     {
-        testWithFeats(allFeatures - fixSecurity3_1_3);
+        testWithFeats(allFeatures_ - fixSecurity3_1_3);
     }
 };
 
@@ -7236,7 +7236,7 @@ class NFTokenAllFeatures_test : public NFTokenBaseUtil_test
     void
     run() override
     {
-        testWithFeats(allFeatures);
+        testWithFeats(allFeatures_);
     }
 };
 
diff --git a/src/test/app/NetworkID_test.cpp b/src/test/app/NetworkID_test.cpp
index 5ac97b8df3..a98fbd6b4f 100644
--- a/src/test/app/NetworkID_test.cpp
+++ b/src/test/app/NetworkID_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl::test {
 
-class NetworkID_test : public beast::unit_test::suite
+class NetworkID_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -52,21 +52,21 @@ public:
 
         auto const alice = Account{"alice"};
 
-        auto const runTx = [&](test::jtx::Env& env, Json::Value const& jv, TER expectedOutcome) {
+        auto const runTx = [&](test::jtx::Env& env, json::Value const& jv, TER expectedOutcome) {
             env.memoize(env.master);
             env.memoize(alice);
 
             // fund alice
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = env.master.human();
                 jv[jss::Destination] = alice.human();
                 jv[jss::TransactionType] = "Payment";
                 jv[jss::Amount] = "10000000000";
-                env(jv, fee(1000), sig(env.master));
+                env(jv, Fee(1000), Sig(env.master));
             }
 
-            env(jv, fee(1000), ter(expectedOutcome));
+            env(jv, Fee(1000), Ter(expectedOutcome));
             env.close();
         };
 
@@ -76,7 +76,7 @@ public:
             BEAST_EXPECT(env.app().getNetworkIDService().getNetworkID() == 0);
 
             // try to submit a txn without network id, this should work
-            Json::Value jv;
+            json::Value jv;
             jv[jss::Account] = alice.human();
             jv[jss::TransactionType] = jss::AccountSet;
             runTx(env, jv, tesSUCCESS);
@@ -99,7 +99,7 @@ public:
             BEAST_EXPECT(env.app().getNetworkIDService().getNetworkID() == 1024);
 
             // try to submit a txn without network id, this should work
-            Json::Value jv;
+            json::Value jv;
             jv[jss::Account] = alice.human();
             jv[jss::TransactionType] = jss::AccountSet;
             runTx(env, jv, tesSUCCESS);
@@ -120,7 +120,7 @@ public:
             {
                 env.fund(XRP(200), alice);
                 // try to submit a txn without network id, this should not work
-                Json::Value jvn;
+                json::Value jvn;
                 jvn[jss::Account] = alice.human();
                 jvn[jss::TransactionType] = jss::AccountSet;
                 jvn[jss::Fee] = to_string(env.current()->fees().base);
@@ -135,7 +135,7 @@ public:
                 env.close();
             }
 
-            Json::Value jv;
+            json::Value jv;
             jv[jss::Account] = alice.human();
             jv[jss::TransactionType] = jss::AccountSet;
 
diff --git a/src/test/app/NetworkOPs_test.cpp b/src/test/app/NetworkOPs_test.cpp
index e6673dc2f5..02667ce275 100644
--- a/src/test/app/NetworkOPs_test.cpp
+++ b/src/test/app/NetworkOPs_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::test {
 
-class NetworkOPs_test : public beast::unit_test::suite
+class NetworkOPs_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -39,16 +39,16 @@ public:
             using namespace jtx;
             auto const alice = Account{"alice"};
             Env env{
-                *this, envconfig(), std::make_unique<CaptureLogs>(&logs), beast::severities::kAll};
+                *this, envconfig(), std::make_unique<CaptureLogs>(&logs), beast::severities::KAll};
             env.memoize(env.master);
             env.memoize(alice);
 
-            auto const jtx = env.jt(ticket::create(alice, 1), seq(1), fee(10));
+            auto const jtx = env.jt(ticket::create(alice, 1), Seq(1), Fee(10));
 
             auto transactionId = jtx.stx->getTransactionID();
             env.app().getHashRouter().setFlags(transactionId, HashRouterFlags::HELD);
 
-            env(jtx, json(jss::Sequence, 1), ter(terNO_ACCOUNT));
+            env(jtx, Json(jss::Sequence, 1), Ter(terNO_ACCOUNT));
 
             env.app().getHashRouter().setFlags(transactionId, HashRouterFlags::BAD);
 
diff --git a/src/test/app/OfferMPT_test.cpp b/src/test/app/OfferMPT_test.cpp
index f67c2ce9c2..21ee05289c 100644
--- a/src/test/app/OfferMPT_test.cpp
+++ b/src/test/app/OfferMPT_test.cpp
@@ -53,7 +53,7 @@
 
 namespace xrpl::test {
 
-class OfferMPT_test : public beast::unit_test::suite
+class OfferMPT_test : public beast::unit_test::Suite
 {
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
@@ -94,40 +94,40 @@ public:
             env.fund(XRP(10'000), alice, bob, carol, gw);
             env.close();
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, bob, carol}});
-            auto const BTC =
+            auto const btc =
                 issue2({.env = env, .token = "BTC", .issuer = gw, .holders = {alice, bob, carol}});
 
-            env(pay(gw, alice, BTC(1'000)));
+            env(pay(gw, alice, btc(1'000)));
 
-            env(pay(gw, carol, USD(1'000)));
-            env(pay(gw, carol, BTC(1'000)));
+            env(pay(gw, carol, usd(1'000)));
+            env(pay(gw, carol, btc(1'000)));
 
             // Must be two offers at the same quality
             // "taker gets" must be XRP
             // (Different amounts, so I can distinguish the offers)
-            env(offer(carol, BTC(49), XRP(49)));
-            env(offer(carol, BTC(51), XRP(51)));
+            env(offer(carol, btc(49), XRP(49)));
+            env(offer(carol, btc(51), XRP(51)));
 
             // Offers for the poor quality path
             // Must be two offers at the same quality
-            env(offer(carol, XRP(50), USD(50)));
-            env(offer(carol, XRP(50), USD(50)));
+            env(offer(carol, XRP(50), usd(50)));
+            env(offer(carol, XRP(50), usd(50)));
 
             // Offers for the good quality path
-            env(offer(carol, BTC(1), USD(100)));
+            env(offer(carol, btc(1), usd(100)));
 
-            PathSet const paths(Path(XRP, USD), Path(USD));
+            PathSet const paths(TestPath(XRP, usd), TestPath(usd));
 
-            env(pay(alice, bob, USD(100)),
-                json(paths.json()),
-                sendmax(BTC(1'000)),
-                txflags(tfPartialPayment));
+            env(pay(alice, bob, usd(100)),
+                Json(paths.json()),
+                Sendmax(btc(1'000)),
+                Txflags(tfPartialPayment));
 
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(bob, usd(100)));
             BEAST_EXPECT(
-                !isOffer(env, carol, BTC(1), USD(100)) && isOffer(env, carol, BTC(49), XRP(49)));
+                !isOffer(env, carol, btc(1), usd(100)) && isOffer(env, carol, btc(49), XRP(49)));
         };
         testHelper2TokensMix(test);
     }
@@ -146,65 +146,65 @@ public:
         env.fund(XRP(10'000), alice, gw);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-        env(pay(gw, alice, USD(50)));
+        env(pay(gw, alice, usd(50)));
         env.close();
 
         auto const offer1Seq = env.seq(alice);
 
-        env(offer(alice, XRP(500), USD(100)), require(offers(alice, 1)));
+        env(offer(alice, XRP(500), usd(100)), Require(offers(alice, 1)));
         env.close();
 
-        BEAST_EXPECT(isOffer(env, alice, XRP(500), USD(100)));
+        BEAST_EXPECT(isOffer(env, alice, XRP(500), usd(100)));
 
         // cancel the offer above and replace it with a new offer
         auto const offer2Seq = env.seq(alice);
 
-        env(offer(alice, XRP(300), USD(100)),
-            json(jss::OfferSequence, offer1Seq),
-            require(offers(alice, 1)));
+        env(offer(alice, XRP(300), usd(100)),
+            Json(jss::OfferSequence, offer1Seq),
+            Require(offers(alice, 1)));
         env.close();
 
         BEAST_EXPECT(
-            isOffer(env, alice, XRP(300), USD(100)) && !isOffer(env, alice, XRP(500), USD(100)));
+            isOffer(env, alice, XRP(300), usd(100)) && !isOffer(env, alice, XRP(500), usd(100)));
 
         // Test canceling non-existent offer.
         //      auto const offer3Seq = env.seq (alice);
 
-        env(offer(alice, XRP(400), USD(200)),
-            json(jss::OfferSequence, offer1Seq),
-            require(offers(alice, 2)));
+        env(offer(alice, XRP(400), usd(200)),
+            Json(jss::OfferSequence, offer1Seq),
+            Require(offers(alice, 2)));
         env.close();
 
         BEAST_EXPECT(
-            isOffer(env, alice, XRP(300), USD(100)) && isOffer(env, alice, XRP(400), USD(200)));
+            isOffer(env, alice, XRP(300), usd(100)) && isOffer(env, alice, XRP(400), usd(200)));
 
         // Test cancellation now with OfferCancel tx
         auto const offer4Seq = env.seq(alice);
-        env(offer(alice, XRP(222), USD(111)), require(offers(alice, 3)));
+        env(offer(alice, XRP(222), usd(111)), Require(offers(alice, 3)));
         env.close();
 
-        BEAST_EXPECT(isOffer(env, alice, XRP(222), USD(111)));
-        env(offer_cancel(alice, offer4Seq));
+        BEAST_EXPECT(isOffer(env, alice, XRP(222), usd(111)));
+        env(offerCancel(alice, offer4Seq));
         env.close();
         BEAST_EXPECT(env.seq(alice) == offer4Seq + 2);
 
-        BEAST_EXPECT(!isOffer(env, alice, XRP(222), USD(111)));
+        BEAST_EXPECT(!isOffer(env, alice, XRP(222), usd(111)));
 
         // Create an offer that both fails with a tecEXPIRED code and removes
         // an offer.  Show that the attempt to remove the offer fails.
         env.require(offers(alice, 2));
 
-        env(offer(alice, XRP(5), USD(2)),
-            json(sfExpiration.fieldName, lastClose(env)),
-            json(jss::OfferSequence, offer2Seq),
-            ter(TER{tecEXPIRED}));
+        env(offer(alice, XRP(5), usd(2)),
+            Json(sfExpiration.fieldName, lastClose(env)),
+            Json(jss::OfferSequence, offer2Seq),
+            Ter(TER{tecEXPIRED}));
         env.close();
 
         env.require(offers(alice, 2));
-        BEAST_EXPECT(isOffer(env, alice, XRP(300), USD(100)));  // offer2
-        BEAST_EXPECT(!isOffer(env, alice, XRP(5), USD(2)));     // expired
+        BEAST_EXPECT(isOffer(env, alice, XRP(300), usd(100)));  // offer2
+        BEAST_EXPECT(!isOffer(env, alice, XRP(5), usd(2)));     // expired
     }
 
     void
@@ -226,33 +226,33 @@ public:
             env.fund(XRP(10'000), alice, bob, carol, gw);
             env.close();
 
-            auto const USD = issue1(
+            auto const usd = issue1(
                 {.env = env,
                  .token = "USD",
                  .issuer = gw,
                  .holders = {alice, bob, carol},
                  .limit = 400'000'000});
-            auto const EUR = issue2(
+            auto const eur = issue2(
                 {.env = env,
                  .token = "EUR",
                  .issuer = gw,
                  .holders = {alice, bob, carol},
                  .limit = 400'000'000});
 
-            env(pay(gw, alice, USD(100'000'000)));
-            env(pay(gw, carol, EUR(100'000'000)));
+            env(pay(gw, alice, usd(100'000'000)));
+            env(pay(gw, carol, eur(100'000'000)));
 
             // Create more offers than the loop max count in DeliverNodeReverse
             // Note: the DeliverNodeReverse code has been removed; however since
             // this is a regression test the original test is being left as-is
             // for now.
             for (int i = 0; i < 101; ++i)
-                env(offer(carol, USD(1'000'000), EUR(2'000'000)));
+                env(offer(carol, usd(1'000'000), eur(2'000'000)));
 
             // Original Offer test sends EUR(10**-81). MPT is integral,
             // therefore and integral value is sent respecting the exchange
             // rate. I.e. if EUR(1) is sent then it'll result in USD(0).
-            env(pay(alice, bob, EUR(2)), path(~EUR), sendmax(USD(100)));
+            env(pay(alice, bob, eur(2)), Path(~eur), Sendmax(usd(100)));
         };
         testHelper2TokensMix(test);
     }
@@ -291,14 +291,14 @@ public:
         env.fund(XRP(10'000), alice, bob, carol, dan, erin, gw);
         env.close();
 
-        MPT const USD = MPTTester(
+        MPT const usd = MPTTester(
             {.env = env,
              .issuer = gw,
              .holders = {alice, bob, carol, dan, erin},
              .pay = std::nullopt});
-        env(pay(gw, carol, USD(99'999)));
-        env(pay(gw, dan, USD(100'000)));
-        env(pay(gw, erin, USD(100'000)));
+        env(pay(gw, carol, usd(99'999)));
+        env(pay(gw, dan, usd(100'000)));
+        env(pay(gw, erin, usd(100'000)));
         env.close();
 
         // Carol doesn't quite have enough funds for this offer
@@ -306,10 +306,10 @@ public:
         // STAmount to incorrectly round to zero when the next offer
         // (at a good quality) is considered. (when the now removed
         // stAmountCalcSwitchover2 patch was inactive)
-        env(offer(carol, drops(1), USD(99'999)));
+        env(offer(carol, drops(1), usd(99'999)));
         // Offer at a quality poor enough so when the input xrp is
         // calculated  in the reverse pass, the amount is not zero.
-        env(offer(dan, XRP(100), USD(1)));
+        env(offer(dan, XRP(100), usd(1)));
 
         env.close();
         // This is the funded offer that will be incorrectly removed.
@@ -318,18 +318,18 @@ public:
         // needed for this offer, it will incorrectly compute zero in both
         // the forward and reverse passes (when the now removed
         // stAmountCalcSwitchover2 was inactive.)
-        env(offer(erin, drops(2), USD(100'000)));
+        env(offer(erin, drops(2), usd(100'000)));
 
-        env(pay(alice, bob, USD(100'000)),
-            path(~USD),
-            sendmax(XRP(102)),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(alice, bob, usd(100'000)),
+            Path(~usd),
+            Sendmax(XRP(102)),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
         env.require(offers(carol, 0), offers(dan, 1));
 
         // offer was correctly consumed. There is still some
         // liquidity left on that offer.
-        env.require(balance(erin, USD(99'999)), offers(erin, 1));
+        env.require(Balance(erin, usd(99'999)), offers(erin, 1));
     }
 
     void
@@ -356,40 +356,40 @@ public:
 
             env.fund(XRP(10'000), alice, bob, carol, gw);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
             // underfund carol's offer
-            auto initialCarolUSD = USD(499);
+            auto initialCarolUSD = usd(499);
             env(pay(gw, carol, initialCarolUSD));
-            env(pay(gw, bob, USD(100'000)));
+            env(pay(gw, bob, usd(100'000)));
             env.close();
             // This offer is underfunded
-            env(offer(carol, drops(1), USD(1'000)));
+            env(offer(carol, drops(1), usd(1'000)));
             env.close();
             // offer at a lower quality
-            env(offer(bob, drops(2), USD(1'000), tfPassive));
+            env(offer(bob, drops(2), usd(1'000), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
             // alice places an offer that crosses carol's; depending on
             // "crossBothOffers" it may cross bob's as well
             auto aliceTakerGets = crossBothOffers ? drops(2) : drops(1);
-            env(offer(alice, USD(1'000), aliceTakerGets));
+            env(offer(alice, usd(1'000), aliceTakerGets));
             env.close();
 
             env.require(
                 offers(carol, 0),
-                balance(
+                Balance(
                     carol,
                     initialCarolUSD));  // offer is removed but not taken
             if (crossBothOffers)
             {
                 env.require(
-                    offers(alice, 0), balance(alice, USD(1'000)));  // alice's offer is crossed
+                    offers(alice, 0), Balance(alice, usd(1'000)));  // alice's offer is crossed
             }
             else
             {
                 env.require(
-                    offers(alice, 1), balance(alice, USD(0)));  // alice's offer is not crossed
+                    offers(alice, 1), Balance(alice, usd(0)));  // alice's offer is not crossed
             }
         }
 
@@ -401,15 +401,15 @@ public:
             env.fund(XRP(10'000), alice, bob, carol, gw);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
-            auto const initialCarolUSD = USD(999);
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, carol}});
+            auto const initialCarolUSD = usd(999);
             env(pay(gw, carol, initialCarolUSD));
             env.close();
-            env(pay(gw, bob, USD(100'000)));
+            env(pay(gw, bob, usd(100'000)));
             env.close();
-            env(offer(carol, drops(1), USD(1'000)));
+            env(offer(carol, drops(1), usd(1'000)));
             env.close();
-            env(offer(bob, drops(2), USD(2'000), tfPassive));
+            env(offer(bob, drops(2), usd(2'000), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
@@ -418,17 +418,17 @@ public:
 
             TER const expectedTer = partialPayment ? TER{tesSUCCESS} : TER{tecPATH_PARTIAL};
 
-            env(pay(alice, bob, USD(5'000)),
-                path(~USD),
-                sendmax(XRP(1)),
-                txflags(flags),
-                ter(expectedTer));
+            env(pay(alice, bob, usd(5'000)),
+                Path(~usd),
+                Sendmax(XRP(1)),
+                Txflags(flags),
+                Ter(expectedTer));
             env.close();
 
             if (expectedTer == tesSUCCESS)
             {
                 env.require(offers(carol, 0));
-                env.require(balance(carol,
+                env.require(Balance(carol,
                                     initialCarolUSD));  // offer is removed but not taken
             }
             else
@@ -486,57 +486,57 @@ public:
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000'000});
-                auto const EUR = issue2(
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000'000});
                 // underfund carol's offer
-                auto initialCarolUSD = tinyAmount(USD);
+                auto initialCarolUSD = tinyAmount(usd);
                 env(pay(gw, carol, initialCarolUSD));
-                env(pay(gw, bob, USD(100'000)));
-                env(pay(gw, alice, EUR(100'000)));
+                env(pay(gw, bob, usd(100'000)));
+                env(pay(gw, alice, eur(100'000)));
                 env.close();
                 // This offer is underfunded
-                env(offer(carol, EUR(10), USD(10'000)));
+                env(offer(carol, eur(10), usd(10'000)));
                 env.close();
                 // offer at a lower quality
-                env(offer(bob, EUR(10), USD(5'000), tfPassive));
+                env(offer(bob, eur(10), usd(5'000), tfPassive));
                 env.close();
                 env.require(offers(bob, 1), offers(carol, 1));
 
                 // alice places an offer that crosses carol's; depending on
                 // "crossBothOffers" it may cross bob's as well
                 // Whatever
-                auto aliceTakerGets = crossBothOffers ? EUR(2) : EUR(1);
-                env(offer(alice, USD(1'000), aliceTakerGets));
+                auto aliceTakerGets = crossBothOffers ? eur(2) : eur(1);
+                env(offer(alice, usd(1'000), aliceTakerGets));
                 env.close();
 
                 // carol's offer can be partially crossed when EUR is IOU:
                 // 10e-3EUR/1USD
-                using tEUR = std::decay_t<decltype(EUR)>;
-                bool constexpr isEURIOU = std::is_same_v<tEUR, IOU>;
+                using tEUR = std::decay_t<decltype(eur)>;
+                bool constexpr kIS_EURIOU = std::is_same_v<tEUR, IOU>;
                 // partially crossed if IOU, removed but not taken if MPT
-                auto const balanceCarolUSD = isEURIOU ? USD(0) : initialCarolUSD;
+                auto const balanceCarolUSD = kIS_EURIOU ? usd(0) : initialCarolUSD;
 
-                env.require(offers(carol, 0), balance(carol, balanceCarolUSD));
+                env.require(offers(carol, 0), Balance(carol, balanceCarolUSD));
                 if (crossBothOffers)
                 {
                     env.require(
-                        offers(alice, 0), balance(alice, USD(1'000)));  // alice's offer is crossed
+                        offers(alice, 0), Balance(alice, usd(1'000)));  // alice's offer is crossed
                 }
                 else
                 {
                     // partially crossed if IOU, not crossed if MPT
-                    auto const balanceAliceUSD = isEURIOU ? USD(1) : USD(0);
-                    env.require(offers(alice, 1), balance(alice, balanceAliceUSD));
+                    auto const balanceAliceUSD = kIS_EURIOU ? usd(1) : usd(0);
+                    env.require(offers(alice, 1), Balance(alice, balanceAliceUSD));
                 }
             }
 
@@ -548,28 +548,28 @@ public:
                 env.fund(XRP(10'000), alice, bob, carol, gw);
                 env.close();
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000'000});
-                auto const EUR = issue2(
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 100'000'000});
                 // underfund carol's offer
-                auto const initialCarolUSD = tinyAmount(USD);
+                auto const initialCarolUSD = tinyAmount(usd);
                 env(pay(gw, carol, initialCarolUSD));
-                env(pay(gw, bob, USD(100'000)));
-                env(pay(gw, alice, EUR(100'000)));
+                env(pay(gw, bob, usd(100'000)));
+                env(pay(gw, alice, eur(100'000)));
                 env.close();
                 // This offer is underfunded
-                env(offer(carol, EUR(10), USD(2'000)));
+                env(offer(carol, eur(10), usd(2'000)));
                 env.close();
-                env(offer(bob, EUR(20), USD(4'000), tfPassive));
+                env(offer(bob, eur(20), usd(4'000), tfPassive));
                 env.close();
                 env.require(offers(bob, 1), offers(carol, 1));
 
@@ -578,23 +578,23 @@ public:
 
                 TER const expectedTer = partialPayment ? TER{tesSUCCESS} : TER{tecPATH_PARTIAL};
 
-                env(pay(alice, bob, USD(5'000)),
-                    path(~USD),
-                    sendmax(EUR(100)),
-                    txflags(flags),
-                    ter(expectedTer));
+                env(pay(alice, bob, usd(5'000)),
+                    Path(~usd),
+                    Sendmax(eur(100)),
+                    Txflags(flags),
+                    Ter(expectedTer));
                 env.close();
 
                 if (expectedTer == tesSUCCESS)
                 {
                     // carol's offer can be partially crossed when EUR is IOU:
                     // 10e-3EUR/1USD
-                    using tEUR = std::decay_t<decltype(EUR)>;
-                    bool constexpr isEURIOU = std::is_same_v<tEUR, IOU>;
+                    using tEUR = std::decay_t<decltype(eur)>;
+                    bool constexpr kIS_EURIOU = std::is_same_v<tEUR, IOU>;
                     // partially crossed if IOU, removed but not taken if MPT
-                    auto const balanceCarolUSD = isEURIOU ? USD(0) : initialCarolUSD;
+                    auto const balanceCarolUSD = kIS_EURIOU ? usd(0) : initialCarolUSD;
                     env.require(offers(carol, 0));
-                    env.require(balance(carol, balanceCarolUSD));
+                    env.require(Balance(carol, balanceCarolUSD));
                 }
                 else
                 {
@@ -639,14 +639,14 @@ public:
 
             env.fund(r + f, alice);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-            auto const usdOffer = USD(1'000);
+            auto const usdOffer = usd(1'000);
 
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tecINSUF_RESERVE_OFFER));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tecINSUF_RESERVE_OFFER));
 
-            env.require(balance(alice, r - f), owners(alice, 1));
+            env.require(Balance(alice, r - f), Owners(alice, 1));
         }
 
         // Partial cross:
@@ -661,24 +661,24 @@ public:
             env.fund(r + f, alice);
             env.fund(r + 2 * f + xrpOffer, bob);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-            auto const usdOffer = USD(1'000);
-            auto const usdOffer2 = USD(500);
+            auto const usdOffer = usd(1'000);
+            auto const usdOffer2 = usd(500);
             auto const xrpOffer2 = XRP(500);
 
-            env(offer(bob, usdOffer2, xrpOffer2), ter(tesSUCCESS));
+            env(offer(bob, usdOffer2, xrpOffer2), Ter(tesSUCCESS));
 
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tesSUCCESS));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, r - f + xrpOffer2),
-                balance(alice, usdOffer2),
-                owners(alice, 1),
-                balance(bob, r + xrpOffer2),
-                balance(bob, usdOffer2),
-                owners(bob, 1));
+                Balance(alice, r - f + xrpOffer2),
+                Balance(alice, usdOffer2),
+                Owners(alice, 1),
+                Balance(bob, r + xrpOffer2),
+                Balance(bob, usdOffer2),
+                Owners(bob, 1));
         }
 
         // Account has enough reserve as is, but not enough
@@ -694,29 +694,29 @@ public:
 
             env.fund(r + f, alice);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-            auto const usdOffer = USD(1'000);
-            auto const usdOffer2 = USD(500);
+            auto const usdOffer = usd(1'000);
+            auto const usdOffer2 = usd(500);
             auto const xrpOffer2 = XRP(500);
 
             env.fund(r + f + xrpOffer, bob, carol);
-            env(offer(bob, usdOffer2, xrpOffer2), ter(tesSUCCESS));
-            env(offer(carol, usdOffer, xrpOffer), ter(tesSUCCESS));
+            env(offer(bob, usdOffer2, xrpOffer2), Ter(tesSUCCESS));
+            env(offer(carol, usdOffer, xrpOffer), Ter(tesSUCCESS));
 
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tesSUCCESS));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, r - f + xrpOffer),
-                balance(alice, USD(0)),
-                owners(alice, 1),
-                balance(bob, r + xrpOffer2),
-                balance(bob, usdOffer2),
-                owners(bob, 1),
-                balance(carol, r + xrpOffer2),
-                balance(carol, usdOffer2),
-                owners(carol, 2));
+                Balance(alice, r - f + xrpOffer),
+                Balance(alice, usd(0)),
+                Owners(alice, 1),
+                Balance(bob, r + xrpOffer2),
+                Balance(bob, usdOffer2),
+                Owners(bob, 1),
+                Balance(carol, r + xrpOffer2),
+                Balance(carol, usdOffer2),
+                Owners(carol, 2));
         }
     }
 
@@ -755,50 +755,50 @@ public:
 
             env.fund(startBalance, gw, alice, bob);
 
-            MPTTester MUSD({.env = env, .issuer = gw});
-            MPT const USD = MUSD["USD"];
+            MPTTester musd({.env = env, .issuer = gw});
+            MPT const usd = musd["USD"];
 
             // bob creates an offer that expires before the next ledger close.
-            env(offer(bob, USD(500), XRP(500)),
-                json(sfExpiration.fieldName, lastClose(env) + 1),
-                ter(tesSUCCESS));
+            env(offer(bob, usd(500), XRP(500)),
+                Json(sfExpiration.fieldName, lastClose(env) + 1),
+                Ter(tesSUCCESS));
 
             // The offer expires (it's not removed yet).
             env.close();
-            env.require(owners(bob, 1), offers(bob, 1));
+            env.require(Owners(bob, 1), offers(bob, 1));
 
             // bob creates the offer that will be crossed.
-            env(offer(bob, USD(500), XRP(500)), ter(tesSUCCESS));
+            env(offer(bob, usd(500), XRP(500)), Ter(tesSUCCESS));
             env.close();
-            env.require(owners(bob, 2), offers(bob, 2));
+            env.require(Owners(bob, 2), offers(bob, 2));
 
-            MUSD.authorize({.account = alice});
-            env(pay(gw, alice, USD(1'000)), ter(tesSUCCESS));
+            musd.authorize({.account = alice});
+            env(pay(gw, alice, usd(1'000)), Ter(tesSUCCESS));
 
             // Order that can't be filled but will remove bob's expired offer:
-            env(offer(alice, XRP(1'000), USD(1'000)), txflags(tfFillOrKill), ter(tecKILLED));
+            env(offer(alice, XRP(1'000), usd(1'000)), Txflags(tfFillOrKill), Ter(tecKILLED));
 
             env.require(
-                balance(alice, startBalance - (f * 2)),
-                balance(alice, USD(1'000)),
-                owners(alice, 1),
+                Balance(alice, startBalance - (f * 2)),
+                Balance(alice, usd(1'000)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - (f * 2)),
-                balance(bob, USD(none)),
-                owners(bob, 1),
+                Balance(bob, startBalance - (f * 2)),
+                Balance(bob, usd(kNONE)),
+                Owners(bob, 1),
                 offers(bob, 1));
 
             // Order that can be filled
-            env(offer(alice, XRP(500), USD(500)), txflags(tfFillOrKill), ter(tesSUCCESS));
+            env(offer(alice, XRP(500), usd(500)), Txflags(tfFillOrKill), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - (f * 3) + XRP(500)),
-                balance(alice, USD(500)),
-                owners(alice, 1),
+                Balance(alice, startBalance - (f * 3) + XRP(500)),
+                Balance(alice, usd(500)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - (f * 2) - XRP(500)),
-                balance(bob, USD(500)),
-                owners(bob, 1),
+                Balance(bob, startBalance - (f * 2) - XRP(500)),
+                Balance(bob, usd(500)),
+                Owners(bob, 1),
                 offers(bob, 0));
         }
 
@@ -811,49 +811,49 @@ public:
 
             env.fund(startBalance, gw, alice, bob);
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-            env(pay(gw, alice, USD(1'000)), ter(tesSUCCESS));
+            env(pay(gw, alice, usd(1'000)), Ter(tesSUCCESS));
 
             // No cross:
             {
-                env(offer(alice, XRP(1'000), USD(1000)),
-                    txflags(tfImmediateOrCancel),
-                    ter(tecKILLED));
+                env(offer(alice, XRP(1'000), usd(1000)),
+                    Txflags(tfImmediateOrCancel),
+                    Ter(tecKILLED));
             }
 
             env.require(
-                balance(alice, startBalance - f - f),
-                balance(alice, USD(1000)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f),
+                Balance(alice, usd(1000)),
+                Owners(alice, 1),
                 offers(alice, 0));
 
             // Partially cross:
-            env(offer(bob, USD(50), XRP(50)), ter(tesSUCCESS));
-            env(offer(alice, XRP(1000), USD(1000)), txflags(tfImmediateOrCancel), ter(tesSUCCESS));
+            env(offer(bob, usd(50), XRP(50)), Ter(tesSUCCESS));
+            env(offer(alice, XRP(1000), usd(1000)), Txflags(tfImmediateOrCancel), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - f - f - f + XRP(50)),
-                balance(alice, USD(950)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f - f + XRP(50)),
+                Balance(alice, usd(950)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - f - XRP(50)),
-                balance(bob, USD(50)),
-                owners(bob, 1),
+                Balance(bob, startBalance - f - XRP(50)),
+                Balance(bob, usd(50)),
+                Owners(bob, 1),
                 offers(bob, 0));
 
             // Fully cross:
-            env(offer(bob, USD(50), XRP(50)), ter(tesSUCCESS));
-            env(offer(alice, XRP(50), USD(50)), txflags(tfImmediateOrCancel), ter(tesSUCCESS));
+            env(offer(bob, usd(50), XRP(50)), Ter(tesSUCCESS));
+            env(offer(alice, XRP(50), usd(50)), Txflags(tfImmediateOrCancel), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - f - f - f - f + XRP(100)),
-                balance(alice, USD(900)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f - f - f + XRP(100)),
+                Balance(alice, usd(900)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - f - f - XRP(100)),
-                balance(bob, USD(100)),
-                owners(bob, 1),
+                Balance(bob, startBalance - f - f - XRP(100)),
+                Balance(bob, usd(100)),
+                Owners(bob, 1),
                 offers(bob, 0));
         }
 
@@ -864,12 +864,12 @@ public:
             env.fund(startBalance, gw, alice, bob);
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
 
-            env(pay(gw, bob, USD(1'000)));
+            env(pay(gw, bob, usd(1'000)));
             env.close();
 
-            env(offer(alice, USD(1'000), XRP(2'000)));
+            env(offer(alice, usd(1'000), XRP(2'000)));
             env.close();
 
             auto const aliceOffers = offersOnAccount(env, alice);
@@ -878,12 +878,12 @@ public:
             {
                 auto const& offer = *offerPtr;
                 BEAST_EXPECT(offer[sfTakerGets] == XRP(2'000));
-                BEAST_EXPECT(offer[sfTakerPays] == USD(1'000));
+                BEAST_EXPECT(offer[sfTakerPays] == usd(1'000));
             }
 
             // bob creates a passive offer that could cross alice's.
             // bob's offer should stay in the ledger.
-            env(offer(bob, XRP(2'000), USD(1'000), tfPassive));
+            env(offer(bob, XRP(2'000), usd(1'000), tfPassive));
             env.close();
             env.require(offers(alice, 1));
 
@@ -892,18 +892,18 @@ public:
             for (auto const& offerPtr : bobOffers)
             {
                 auto const& offer = *offerPtr;
-                BEAST_EXPECT(offer[sfTakerGets] == USD(1'000));
+                BEAST_EXPECT(offer[sfTakerGets] == usd(1'000));
                 BEAST_EXPECT(offer[sfTakerPays] == XRP(2'000));
             }
 
             // It should be possible for gw to cross both of those offers.
-            env(offer(gw, XRP(2'000), USD(1'000)));
+            env(offer(gw, XRP(2'000), usd(1'000)));
             env.close();
             env.require(offers(alice, 0));
             env.require(offers(gw, 0));
             env.require(offers(bob, 1));
 
-            env(offer(gw, USD(1'000), XRP(2'000)));
+            env(offer(gw, usd(1'000), XRP(2'000)));
             env.close();
             env.require(offers(bob, 0));
             env.require(offers(gw, 0));
@@ -916,13 +916,13 @@ public:
             env.fund(startBalance, gw, "alice", "bob");
             env.close();
 
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
 
-            env(pay(gw, "bob", USD(10'000)));
-            env(offer("alice", USD(5'000), XRP(1'001)));
+            env(pay(gw, "bob", usd(10'000)));
+            env(offer("alice", usd(5'000), XRP(1'001)));
             env.close();
 
-            env(offer("alice", USD(5'000), XRP(1'000)));
+            env(offer("alice", usd(5'000), XRP(1'000)));
             env.close();
 
             auto const aliceOffers = offersOnAccount(env, "alice");
@@ -931,7 +931,7 @@ public:
             // bob creates a passive offer.  That offer should cross one
             // of alice's (the one with better quality) and leave alice's
             // other offer untouched.
-            env(offer("bob", XRP(2'000), USD(10'000), tfPassive));
+            env(offer("bob", XRP(2'000), usd(10'000), tfPassive));
             env.close();
             env.require(offers("alice", 1));
 
@@ -940,7 +940,7 @@ public:
             for (auto const& offerPtr : bobOffers)
             {
                 auto const& offer = *offerPtr;
-                BEAST_EXPECT(offer[sfTakerGets] == USD(4'995));
+                BEAST_EXPECT(offer[sfTakerGets] == usd(4'995));
                 BEAST_EXPECT(offer[sfTakerPays] == XRP(999));
             }
         }
@@ -961,28 +961,28 @@ public:
 
         env.fund(startBalance, gw, alice);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
         // Sell and buy the same asset
         {
             // Alice tries an MPT to MPT order:
-            env(pay(gw, alice, USD(1'000)), ter(tesSUCCESS));
-            env(offer(alice, USD(1'000), USD(1'000)), ter(temREDUNDANT));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(pay(gw, alice, usd(1'000)), Ter(tesSUCCESS));
+            env(offer(alice, usd(1'000), usd(1'000)), Ter(temREDUNDANT));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Offers with negative amounts
         {
-            env(offer(alice, -USD(1'000), XRP(1'000)), ter(temBAD_OFFER));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, -usd(1'000), XRP(1'000)), Ter(temBAD_OFFER));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Bad MPT
         {
-            auto const BAD = MPT(badMPT());
+            auto const bad = MPT(badMPT());
 
-            env(offer(alice, XRP(1'000), BAD(1'000)), ter(temBAD_CURRENCY));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, XRP(1'000), bad(1'000)), Ter(temBAD_CURRENCY));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
     }
 
@@ -1007,59 +1007,59 @@ public:
 
         auto const f = env.current()->fees().base;
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
-        auto const usdOffer = USD(1'000);
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        auto const usdOffer = usd(1'000);
 
-        env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
+        env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
         env.close();
         env.require(
-            balance(alice, startBalance - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1));
+            Owners(alice, 1));
 
         // Place an offer that should have already expired.
         env(offer(alice, xrpOffer, usdOffer),
-            json(sfExpiration.fieldName, lastClose(env)),
-            ter(TER{tecEXPIRED}));
+            Json(sfExpiration.fieldName, lastClose(env)),
+            Ter(TER{tecEXPIRED}));
 
         env.require(
-            balance(alice, startBalance - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1));
+            Owners(alice, 1));
         env.close();
 
         // Add an offer that expires before the next ledger close
         env(offer(alice, xrpOffer, usdOffer),
-            json(sfExpiration.fieldName, lastClose(env) + 1),
-            ter(tesSUCCESS));
+            Json(sfExpiration.fieldName, lastClose(env) + 1),
+            Ter(tesSUCCESS));
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 1),
-            owners(alice, 2));
+            Owners(alice, 2));
 
         // The offer expires (it's not removed yet)
         env.close();
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 1),
-            owners(alice, 2));
+            Owners(alice, 2));
 
         // Add offer - the expired offer is removed
-        env(offer(bob, usdOffer, xrpOffer), ter(tesSUCCESS));
+        env(offer(bob, usdOffer, xrpOffer), Ter(tesSUCCESS));
 
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1),
-            balance(bob, startBalance - f),
-            balance(bob, USD(none)),
+            Owners(alice, 1),
+            Balance(bob, startBalance - f),
+            Balance(bob, usd(kNONE)),
             offers(bob, 1),
-            owners(bob, 1));
+            Owners(bob, 1));
     }
 
     void
@@ -1083,41 +1083,41 @@ public:
         // Account is at the reserve, and will dip below once
         // fees are subtracted.
         env.fund(reserve(env, 0), "alice");
-        MPT const USD = MPTTester({.env = env, .issuer = gw});
-        auto const usdOffer = USD(1'000);
-        env(offer("alice", usdOffer, xrpOffer), ter(tecUNFUNDED_OFFER));
-        env.require(balance("alice", reserve(env, 0) - f), owners("alice", 0));
+        MPT const usd = MPTTester({.env = env, .issuer = gw});
+        auto const usdOffer = usd(1'000);
+        env(offer("alice", usdOffer, xrpOffer), Ter(tecUNFUNDED_OFFER));
+        env.require(Balance("alice", reserve(env, 0) - f), Owners("alice", 0));
 
         // Account has just enough for the reserve and the
         // fee.
         env.fund(reserve(env, 0) + f, "bob");
-        env(offer("bob", usdOffer, xrpOffer), ter(tecUNFUNDED_OFFER));
-        env.require(balance("bob", reserve(env, 0)), owners("bob", 0));
+        env(offer("bob", usdOffer, xrpOffer), Ter(tecUNFUNDED_OFFER));
+        env.require(Balance("bob", reserve(env, 0)), Owners("bob", 0));
 
         // Account has enough for the reserve, the fee and
         // the offer, and a bit more, but not enough for the
         // reserve after the offer is placed.
         env.fund(reserve(env, 0) + f + XRP(1), "carol");
-        env(offer("carol", usdOffer, xrpOffer), ter(tecINSUF_RESERVE_OFFER));
-        env.require(balance("carol", reserve(env, 0) + XRP(1)), owners("carol", 0));
+        env(offer("carol", usdOffer, xrpOffer), Ter(tecINSUF_RESERVE_OFFER));
+        env.require(Balance("carol", reserve(env, 0) + XRP(1)), Owners("carol", 0));
 
         // Account has enough for the reserve plus one
         // offer, and the fee.
         env.fund(reserve(env, 1) + f, "dan");
-        env(offer("dan", usdOffer, xrpOffer), ter(tesSUCCESS));
-        env.require(balance("dan", reserve(env, 1)), owners("dan", 1));
+        env(offer("dan", usdOffer, xrpOffer), Ter(tesSUCCESS));
+        env.require(Balance("dan", reserve(env, 1)), Owners("dan", 1));
 
         // Account has enough for the reserve plus one
         // offer, the fee and the entire offer amount.
         env.fund(reserve(env, 1) + f + xrpOffer, "eve");
-        env(offer("eve", usdOffer, xrpOffer), ter(tesSUCCESS));
-        env.require(balance("eve", reserve(env, 1) + xrpOffer), owners("eve", 1));
+        env(offer("eve", usdOffer, xrpOffer), Ter(tesSUCCESS));
+        env.require(Balance("eve", reserve(env, 1) + xrpOffer), Owners("eve", 1));
     }
 
     void
-    testSelfCross(bool use_partner, FeatureBitset features)
+    testSelfCross(bool usePartner, FeatureBitset features)
     {
-        testcase(std::string("Self-crossing") + (use_partner ? ", with partner account" : ""));
+        testcase(std::string("Self-crossing") + (usePartner ? ", with partner account" : ""));
 
         using namespace jtx;
         auto const gw = Account{"gateway"};
@@ -1128,70 +1128,70 @@ public:
             env.close();
 
             env.fund(XRP(10'000), gw);
-            auto const USD = issue1({.env = env, .token = "USD", .issuer = gw});
-            auto const BTC = issue2({.env = env, .token = "BTC", .issuer = gw});
-            using tUSD = std::decay_t<decltype(USD)>;
-            using tBTC = std::decay_t<decltype(BTC)>;
-            if (use_partner)
+            auto const usd = issue1({.env = env, .token = "USD", .issuer = gw});
+            auto const btc = issue2({.env = env, .token = "BTC", .issuer = gw});
+            using tUSD = std::decay_t<decltype(usd)>;
+            using tBTC = std::decay_t<decltype(btc)>;
+            if (usePartner)
             {
                 env.fund(XRP(10'000), partner);
                 if constexpr (std::is_same_v<tUSD, IOU>)
                 {
-                    env(trust(partner, USD(100)));
+                    env(trust(partner, usd(100)));
                 }
                 else
                 {
-                    MPTTester MUSD(env, gw, USD);
-                    MUSD.authorize({.account = partner});
+                    MPTTester musd(env, gw, usd);
+                    musd.authorize({.account = partner});
                 }
                 if constexpr (std::is_same_v<tBTC, IOU>)
                 {
-                    env(trust(partner, BTC(500)));
+                    env(trust(partner, btc(500)));
                 }
                 else
                 {
-                    MPTTester MBTC(env, gw, BTC);
-                    MBTC.authorize({.account = partner});
+                    MPTTester mbtc(env, gw, btc);
+                    mbtc.authorize({.account = partner});
                 }
-                env(pay(gw, partner, USD(100)));
-                env(pay(gw, partner, BTC(500)));
+                env(pay(gw, partner, usd(100)));
+                env(pay(gw, partner, btc(500)));
             }
-            auto const& account_to_test = use_partner ? partner : gw;
+            auto const& accountToTest = usePartner ? partner : gw;
 
             env.close();
-            env.require(offers(account_to_test, 0));
+            env.require(offers(accountToTest, 0));
 
             // PART 1:
             // we will make two offers that can be used to bridge BTC to USD
             // through XRP
-            env(offer(account_to_test, BTC(250), XRP(1'000)));
-            env.require(offers(account_to_test, 1));
+            env(offer(accountToTest, btc(250), XRP(1'000)));
+            env.require(offers(accountToTest, 1));
 
             // validate that the book now shows a BTC for XRP offer
-            BEAST_EXPECT(isOffer(env, account_to_test, BTC(250), XRP(1'000)));
+            BEAST_EXPECT(isOffer(env, accountToTest, btc(250), XRP(1'000)));
 
-            auto const secondLegSeq = env.seq(account_to_test);
-            env(offer(account_to_test, XRP(1'000), USD(50)));
-            env.require(offers(account_to_test, 2));
+            auto const secondLegSeq = env.seq(accountToTest);
+            env(offer(accountToTest, XRP(1'000), usd(50)));
+            env.require(offers(accountToTest, 2));
 
             // validate that the book also shows a XRP for USD offer
-            BEAST_EXPECT(isOffer(env, account_to_test, XRP(1'000), USD(50)));
+            BEAST_EXPECT(isOffer(env, accountToTest, XRP(1'000), usd(50)));
 
             // now make an offer that will cross and auto-bridge, meaning
             // the outstanding offers will be taken leaving us with none
-            env(offer(account_to_test, USD(50), BTC(250)));
+            env(offer(accountToTest, usd(50), btc(250)));
 
-            auto jrr = getBookOffers(env, USD, BTC);
+            auto jrr = getBookOffers(env, usd, btc);
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
-            jrr = getBookOffers(env, BTC, XRP);
+            jrr = getBookOffers(env, btc, XRP);
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
             // At this point, all offers are expected to be consumed.
             {
-                auto acctOffers = offersOnAccount(env, account_to_test);
+                auto acctOffers = offersOnAccount(env, accountToTest);
 
                 // No stale offers
                 BEAST_EXPECT(acctOffers.empty());
@@ -1199,7 +1199,7 @@ public:
                 {
                     auto const& offer = *offerPtr;
                     BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                    BEAST_EXPECT(offer[sfTakerGets] == USD(0));
+                    BEAST_EXPECT(offer[sfTakerGets] == usd(0));
                     BEAST_EXPECT(offer[sfTakerPays] == XRP(0));
                 }
             }
@@ -1207,35 +1207,35 @@ public:
             // cancel that lingering second offer so that it doesn't interfere
             // with the next set of offers we test. This will not be needed once
             // the bridging bug is fixed
-            env(offer_cancel(account_to_test, secondLegSeq));
-            env.require(offers(account_to_test, 0));
+            env(offerCancel(accountToTest, secondLegSeq));
+            env.require(offers(accountToTest, 0));
 
             // PART 2:
             // simple direct crossing  BTC to USD and then USD to BTC which
             // causes the first offer to be replaced
-            env(offer(account_to_test, BTC(250), USD(50)));
-            env.require(offers(account_to_test, 1));
+            env(offer(accountToTest, btc(250), usd(50)));
+            env.require(offers(accountToTest, 1));
 
             // validate that the book shows one BTC for USD offer and no USD for
             // BTC offers
-            BEAST_EXPECT(isOffer(env, account_to_test, BTC(250), USD(50)));
+            BEAST_EXPECT(isOffer(env, accountToTest, btc(250), usd(50)));
 
-            jrr = getBookOffers(env, USD, BTC);
+            jrr = getBookOffers(env, usd, btc);
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
             // this second offer would self-cross directly, so it causes the
             // first offer by the same owner/taker to be removed
-            env(offer(account_to_test, USD(50), BTC(250)));
-            env.require(offers(account_to_test, 1));
+            env(offer(accountToTest, usd(50), btc(250)));
+            env.require(offers(accountToTest, 1));
 
             // validate that we now have just the second offer...the first
             // was removed
-            jrr = getBookOffers(env, BTC, USD);
+            jrr = getBookOffers(env, btc, usd);
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
-            BEAST_EXPECT(isOffer(env, account_to_test, USD(50), BTC(250)));
+            BEAST_EXPECT(isOffer(env, accountToTest, usd(50), btc(250)));
         };
         testHelper2TokensMix(test);
     }
@@ -1258,55 +1258,55 @@ public:
 
         // these *interesting* amounts were taken
         // from the original JS test that was ported here
-        auto const gw_initial_balance = drops(1'149'999'730);
-        auto const alice_initial_balance = drops(499'946'999'680);
-        auto const bob_initial_balance = drops(10'199'999'920);
+        auto const gwInitialBalance = drops(1'149'999'730);
+        auto const aliceInitialBalance = drops(499'946'999'680);
+        auto const bobInitialBalance = drops(10'199'999'920);
 
-        env.fund(gw_initial_balance, gw);
-        env.fund(alice_initial_balance, alice);
-        env.fund(bob_initial_balance, bob);
+        env.fund(gwInitialBalance, gw);
+        env.fund(aliceInitialBalance, alice);
+        env.fund(bobInitialBalance, bob);
 
-        MPTTester const MUSD(
+        MPTTester const musd(
             {.env = env, .issuer = gw, .holders = {alice, bob}, .transferFee = 5'000});
-        MPT const USD = MUSD;
-        auto const small_amount = STAmount{USD, 1};
+        MPT const usd = musd;
+        auto const smallAmount = STAmount{usd, 1};
 
-        env(pay(gw, alice, USD(50)));
-        env(pay(gw, bob, small_amount));
+        env(pay(gw, alice, usd(50)));
+        env(pay(gw, bob, smallAmount));
 
-        env(offer(alice, USD(50), XRP(150'000)));
+        env(offer(alice, usd(50), XRP(150'000)));
 
         // unfund the offer
-        env(pay(alice, gw, USD(50)));
+        env(pay(alice, gw, usd(50)));
 
         // verify balances
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         // this represents 0 since MPTAmount is a default field
         BEAST_EXPECT(!jrr[jss::node].isMember(sfMPTAmount.fieldName));
 
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "1");
 
         // create crossing offer
         std::uint32_t const bobOfferSeq = env.seq(bob);
-        env(offer(bob, XRP(2000), USD(1)));
+        env(offer(bob, XRP(2000), usd(1)));
 
         // With the rounding introduced by fixReducedOffersV2, bob's
         // offer does not cross alice's offer and goes straight into
         // the ledger.
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "1");
 
-        Json::Value const bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq)[jss::node];
+        json::Value const bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq)[jss::node];
         BEAST_EXPECT(bobOffer[sfTakerGets.jsonName][jss::value] == "1");
         BEAST_EXPECT(bobOffer[sfTakerPays.jsonName] == "2000000000");
     }
 
     void
-    testOfferCrossWithXRP(bool reverse_order, FeatureBitset features)
+    testOfferCrossWithXRP(bool reverseOrder, FeatureBitset features)
     {
         testcase(
-            std::string("Offer Crossing with XRP, ") + (reverse_order ? "Reverse" : "Normal") +
+            std::string("Offer Crossing with XRP, ") + (reverseOrder ? "Reverse" : "Normal") +
             " order");
 
         using namespace jtx;
@@ -1319,38 +1319,38 @@ public:
 
         env.fund(XRP(10'000), gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, alice, USD(500)));
+        env(pay(gw, alice, usd(500)));
 
-        if (reverse_order)
-            env(offer(bob, USD(1), XRP(4'000)));
+        if (reverseOrder)
+            env(offer(bob, usd(1), XRP(4'000)));
 
-        env(offer(alice, XRP(150'000), USD(50)));
+        env(offer(alice, XRP(150'000), usd(50)));
 
-        if (!reverse_order)
-            env(offer(bob, USD(1), XRP(4000)));
+        if (!reverseOrder)
+            env(offer(bob, usd(1), XRP(4000)));
 
         // Existing offer pays better than this wants.
         // Fully consume existing offer.
         // Pay 1 USD, get 4000 XRP.
 
-        auto jrr = ledgerEntryMPT(env, bob, USD);
+        auto jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "1");
         jrr = ledgerEntryRoot(env, bob);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string(
-                (XRP(10000) - XRP(reverse_order ? 4000 : 3000) - env.current()->fees().base * 2)
+                (XRP(10000) - XRP(reverseOrder ? 4000 : 3000) - env.current()->fees().base * 2)
                     .xrp()));
 
-        jrr = ledgerEntryMPT(env, alice, USD);
+        jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "499");
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string(
-                (XRP(10000) + XRP(reverse_order ? 4000 : 3000) - env.current()->fees().base * 2)
+                (XRP(10000) + XRP(reverseOrder ? 4000 : 3000) - env.current()->fees().base * 2)
                     .xrp()));
     }
 
@@ -1369,21 +1369,21 @@ public:
 
         env.fund(XRP(100000), gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-        env(pay(gw, alice, USD(500)));
+        env(pay(gw, alice, usd(500)));
 
-        env(offer(alice, XRP(150'000), USD(50)));
-        env(offer(bob, USD(1), XRP(3'000)));
+        env(offer(alice, XRP(150'000), usd(50)));
+        env(offer(bob, usd(1), XRP(3'000)));
 
-        auto jrr = ledgerEntryMPT(env, bob, USD);
+        auto jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "1");
         jrr = ledgerEntryRoot(env, bob);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string((XRP(100'000) - XRP(3'000) - env.current()->fees().base * 1).xrp()));
 
-        jrr = ledgerEntryMPT(env, alice, USD);
+        jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "499");
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
@@ -1400,13 +1400,13 @@ public:
 
         Env env{*this, features};
 
-        MPT const USD = MPTTester({.env = env, .issuer = env.master});
+        MPT const usd = MPTTester({.env = env, .issuer = env.master});
 
         auto const nextOfferSeq = env.seq(env.master);
-        env(offer(env.master, XRP(500), USD(100)));
+        env(offer(env.master, XRP(500), usd(100)));
         env.close();
 
-        env(offer_cancel(env.master, nextOfferSeq));
+        env(offerCancel(env.master, nextOfferSeq));
         BEAST_EXPECT(env.seq(env.master) == nextOfferSeq + 2);
 
         // ledger_accept, call twice and verify no odd behavior
@@ -1429,37 +1429,38 @@ public:
         auto const bob = Account{"bob"};
 
         env.fund(XRP(10'000), gw, alice, bob);
-        env.require(owners(bob, 0));
+        env.require(Owners(bob, 0));
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice, 1), Owners(bob, 1));
 
-        env(pay(gw, alice, USD(100)));
+        env(pay(gw, alice, usd(100)));
         auto const bobOfferSeq = env.seq(bob);
-        env(offer(bob, USD(100), XRP(500)));
+        env(offer(bob, usd(100), XRP(500)));
 
-        env.require(owners(alice, 1), owners(bob, 2));
+        env.require(Owners(alice, 1), Owners(bob, 2));
         auto jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(500).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(100).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(
+            jro[jss::node][jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone));
 
-        env(pay(alice, alice, XRP(500)), sendmax(USD(100)));
+        env(pay(alice, alice, XRP(500)), Sendmax(usd(100)));
 
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(!jrr[jss::node].isMember(sfMPTAmount.fieldName));
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string((XRP(10'000) + XRP(500) - env.current()->fees().base * 2).xrp()));
 
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "100");
 
         jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::error] == "entryNotFound");
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice, 1), Owners(bob, 1));
     }
 
     void
@@ -1477,17 +1478,17 @@ public:
 
             env.fund(XRP(10'000), alice, bob, carol);
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = alice, .holders = {bob}});
-            auto const EURC =
+            auto const eurc =
                 issue2({.env = env, .token = "EUC", .issuer = carol, .holders = {alice}});
-            auto const EURB =
+            auto const eurb =
                 issue3({.env = env, .token = "EUB", .issuer = bob, .holders = {carol}});
 
             auto const bobOfferSeq = env.seq(bob);
-            env(offer(bob, USD(50), EURC(200)), ter(tecUNFUNDED_OFFER));
+            env(offer(bob, usd(50), eurc(200)), Ter(tecUNFUNDED_OFFER));
 
-            env(offer(alice, EURC(200), USD(50)));
+            env(offer(alice, eurc(200), usd(50)));
 
             auto jro = ledgerEntryOffer(env, bob, bobOfferSeq);
             BEAST_EXPECT(jro[jss::error] == "entryNotFound");
@@ -1510,23 +1511,23 @@ public:
 
         env.fund(XRP(10'000), gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
 
         auto const bobOfferSeq = env.seq(bob);
-        env(offer(bob, USD(100), XRP(500)));
+        env(offer(bob, usd(100), XRP(500)));
 
-        env(pay(alice, alice, XRP(200)), sendmax(USD(100)));
+        env(pay(alice, alice, XRP(200)), Sendmax(usd(100)));
 
         // The previous payment reduced the remaining offer amount by 200 XRP
         auto jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(300).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(60).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == usd(60).value().getJson(JsonOptions::KNone));
 
         // the balance between alice and gw is 160 USD..200 less the 40 taken
         // by the offer
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "160");
         // alice now has 200 more XRP from the payment
         jrr = ledgerEntryRoot(env, alice);
@@ -1535,16 +1536,16 @@ public:
             to_string((XRP(10'000) + XRP(200) - env.current()->fees().base * 2).xrp()));
 
         // bob got 40 USD from partial consumption of the offer
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "40");
 
         // Alice converts USD to XRP which should fail
         // due to PartialPayment.
-        env(pay(alice, alice, XRP(600)), sendmax(USD(100)), ter(tecPATH_PARTIAL));
+        env(pay(alice, alice, XRP(600)), Sendmax(usd(100)), Ter(tecPATH_PARTIAL));
 
         // Alice converts USD to XRP, should succeed because
         // we permit partial payment
-        env(pay(alice, alice, XRP(600)), sendmax(USD(100)), txflags(tfPartialPayment));
+        env(pay(alice, alice, XRP(600)), Sendmax(usd(100)), Txflags(tfPartialPayment));
 
         // Verify the offer was consumed
         jro = ledgerEntryOffer(env, bob, bobOfferSeq);
@@ -1555,7 +1556,7 @@ public:
         // that remained in the offer from bob. The alice balance is now
         // 100 USD because another 60 USD were transferred to bob in the second
         // payment
-        jrr = ledgerEntryMPT(env, alice, USD);
+        jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "100");
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
@@ -1564,7 +1565,7 @@ public:
 
         // bob now has 100 USD - 40 from the first payment and 60 from the
         // second (partial) payment
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "100");
     }
 
@@ -1584,23 +1585,23 @@ public:
 
         env.fund(XRP(10'000), gw, alice, bob, carol);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {carol, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {carol, bob}});
 
-        env(pay(gw, carol, USD(500)));
+        env(pay(gw, carol, usd(500)));
 
         auto const carolOfferSeq = env.seq(carol);
-        env(offer(carol, XRP(500), USD(50)));
+        env(offer(carol, XRP(500), usd(50)));
 
-        env(pay(alice, bob, USD(25)), sendmax(XRP(333)));
+        env(pay(alice, bob, usd(25)), Sendmax(XRP(333)));
 
-        auto jrr = ledgerEntryMPT(env, bob, USD);
+        auto jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "25");
 
-        jrr = ledgerEntryMPT(env, carol, USD);
+        jrr = ledgerEntryMPT(env, carol, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "475");
 
         auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
-        BEAST_EXPECT(jro[jss::node][jss::TakerGets] == USD(25).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerGets] == usd(25).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(jro[jss::node][jss::TakerPays] == XRP(250).value().getText());
     }
 
@@ -1620,19 +1621,19 @@ public:
 
         env.fund(XRP(10'000), gw, alice, bob, carol);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, carol}});
 
-        env(pay(gw, alice, USD(500)));
+        env(pay(gw, alice, usd(500)));
 
         auto const carolOfferSeq = env.seq(carol);
-        env(offer(carol, USD(50), XRP(500)));
+        env(offer(carol, usd(50), XRP(500)));
 
-        env(pay(alice, bob, XRP(250)), sendmax(USD(333)));
+        env(pay(alice, bob, XRP(250)), Sendmax(usd(333)));
 
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "475");
 
-        jrr = ledgerEntryMPT(env, carol, USD);
+        jrr = ledgerEntryMPT(env, carol, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "25");
 
         jrr = ledgerEntryRoot(env, bob);
@@ -1642,7 +1643,7 @@ public:
 
         auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(250).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(25).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == usd(25).value().getJson(JsonOptions::KNone));
     }
 
     void
@@ -1663,37 +1664,37 @@ public:
 
             env.fund(XRP(10'000), gw1, gw2, alice, bob, carol, dan);
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = gw1, .holders = {alice, carol}});
-            auto const EUR =
+            auto const eur =
                 issue1({.env = env, .token = "EUR", .issuer = gw2, .holders = {bob, dan}});
 
-            env(pay(gw1, alice, USD(500)));
-            env(pay(gw2, dan, EUR(400)));
+            env(pay(gw1, alice, usd(500)));
+            env(pay(gw2, dan, eur(400)));
 
             auto const carolOfferSeq = env.seq(carol);
-            env(offer(carol, USD(50), XRP(500)));
+            env(offer(carol, usd(50), XRP(500)));
 
             auto const danOfferSeq = env.seq(dan);
-            env(offer(dan, XRP(500), EUR(50)));
+            env(offer(dan, XRP(500), eur(50)));
 
-            Json::Value jtp{Json::arrayValue};
+            json::Value jtp{json::ArrayValue};
             jtp[0u][0u][jss::currency] = "XRP";
-            env(pay(alice, bob, EUR(30)), json(jss::Paths, jtp), sendmax(USD(333)));
+            env(pay(alice, bob, eur(30)), Json(jss::Paths, jtp), Sendmax(usd(333)));
 
-            BEAST_EXPECT(env.balance(alice, USD) == USD(470));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(30));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(30));
-            BEAST_EXPECT(env.balance(dan, EUR) == EUR(370));
+            BEAST_EXPECT(env.balance(alice, usd) == usd(470));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(30));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(30));
+            BEAST_EXPECT(env.balance(dan, eur) == eur(370));
 
             auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
             BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(200).value().getText());
             BEAST_EXPECT(
-                jro[jss::node][jss::TakerPays] == USD(20).value().getJson(JsonOptions::none));
+                jro[jss::node][jss::TakerPays] == usd(20).value().getJson(JsonOptions::KNone));
 
             jro = ledgerEntryOffer(env, dan, danOfferSeq);
             BEAST_EXPECT(
-                jro[jss::node][jss::TakerGets] == EUR(20).value().getJson(JsonOptions::none));
+                jro[jss::node][jss::TakerGets] == eur(20).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(jro[jss::node][jss::TakerPays] == XRP(200).value().getText());
         };
         testHelper2TokensMix(test);
@@ -1719,18 +1720,18 @@ public:
             env.fund(XRP(100'000'000), alice, bob, carol, gw);
             env.close();
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice, carol}});
-            auto const EUR = issue1({.env = env, .token = "EUR", .issuer = gw, .holders = {bob}});
+            auto const eur = issue1({.env = env, .token = "EUR", .issuer = gw, .holders = {bob}});
 
-            env(pay(gw, alice, USD(10)));
-            env(pay(gw, carol, USD(3)));
+            env(pay(gw, alice, usd(10)));
+            env(pay(gw, carol, usd(3)));
 
-            env(offer(alice, EUR(2), XRP(1)));
-            env(offer(alice, EUR(2), XRP(1)));
+            env(offer(alice, eur(2), XRP(1)));
+            env(offer(alice, eur(2), XRP(1)));
 
-            env(offer(alice, XRP(1), USD(4)));
-            env(offer(carol, XRP(1), USD(3)));
+            env(offer(alice, XRP(1), usd(4)));
+            env(offer(carol, XRP(1), usd(3)));
             env.close();
 
             // Bob offers to buy 10 USD for 10 EUR.
@@ -1742,26 +1743,26 @@ public:
             // The key for this test is that Alice's XRP->USD leg goes dry
             // before Alice's EUR->XRP.  The XRP->USD leg is the second leg
             // which showed some sensitivity.
-            env(pay(gw, bob, EUR(10)));
+            env(pay(gw, bob, eur(10)));
             env.close();
-            env(offer(bob, USD(10), EUR(10)));
+            env(offer(bob, usd(10), eur(10)));
             env.close();
 
-            env.require(balance(bob, USD(7)));
-            env.require(balance(bob, EUR(6)));
+            env.require(Balance(bob, usd(7)));
+            env.require(Balance(bob, eur(6)));
             env.require(offers(bob, 1));
-            env.require(owners(bob, 3));
+            env.require(Owners(bob, 3));
 
-            env.require(balance(alice, USD(6)));
-            env.require(balance(alice, EUR(4)));
+            env.require(Balance(alice, usd(6)));
+            env.require(Balance(alice, eur(4)));
             env.require(offers(alice, 0));
-            env.require(owners(alice, 2));
+            env.require(Owners(alice, 2));
 
-            env.require(balance(carol, USD(0)));
-            env.require(balance(carol, EUR(none)));
+            env.require(Balance(carol, usd(0)));
+            env.require(Balance(carol, eur(kNONE)));
 
             env.require(offers(carol, 0));
-            env.require(owners(carol, 1));
+            env.require(Owners(carol, 1));
         };
         testHelper2TokensMix(test);
     }
@@ -1787,29 +1788,29 @@ public:
             //  1 for each trust limit == 3 (alice < mtgox/amazon/bitstamp) +
             //  1 for payment          == 4
             auto const base = env.current()->fees().base;
-            auto const starting_xrp = XRP(100) + env.current()->fees().accountReserve(3) + base * 4;
+            auto const startingXrp = XRP(100) + env.current()->fees().accountReserve(3) + base * 4;
 
-            env.fund(starting_xrp, gw1, gw2, gw3, alice, bob);
+            env.fund(startingXrp, gw1, gw2, gw3, alice, bob);
             env.close();
 
-            auto const USD1 =
+            auto const usD1 =
                 issue1({.env = env, .token = "US1", .issuer = gw1, .holders = {alice, bob}});
-            auto const USD2 =
+            auto const usD2 =
                 issue2({.env = env, .token = "US2", .issuer = gw2, .holders = {alice, bob}});
-            auto const USD3 =
+            auto const usD3 =
                 issue3({.env = env, .token = "US3", .issuer = gw3, .holders = {alice}});
 
-            env(pay(gw1, bob, USD1(500)));
+            env(pay(gw1, bob, usD1(500)));
 
-            env(offer(bob, XRP(200), USD1(200)));
+            env(offer(bob, XRP(200), usD1(200)));
             // Alice has 350 fees - a reserve of 50 = 250 reserve = 100
             // available. Ask for more than available to prove reserve works.
-            env(offer(alice, USD1(200), XRP(200)));
+            env(offer(alice, usD1(200), XRP(200)));
 
-            BEAST_EXPECT(env.balance(alice, USD1) == USD1(100));
+            BEAST_EXPECT(env.balance(alice, usD1) == usD1(100));
             BEAST_EXPECT(env.balance(alice) == STAmount(env.current()->fees().accountReserve(3)));
 
-            BEAST_EXPECT(env.balance(bob, USD1) == USD1(400));
+            BEAST_EXPECT(env.balance(bob, usD1) == usD1(400));
         };
         testHelper3TokensMix(test);
     }
@@ -1830,18 +1831,18 @@ public:
 
         env.fund(XRP(10'000), gw, alice, bob);
 
-        MPT const CUR =
+        MPT const cur =
             MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .transferFee = 5'000});
 
-        env(pay(gw, bob, CUR(100)));
+        env(pay(gw, bob, cur(100)));
 
-        env(offer(alice, CUR(50'000), XRP(150'000)));
-        env(offer(bob, XRP(100), CUR(100)));
+        env(offer(alice, cur(50'000), XRP(150'000)));
+        env(offer(bob, XRP(100), cur(100)));
 
-        auto jrr = ledgerEntryMPT(env, alice, CUR);
+        auto jrr = ledgerEntryMPT(env, alice, cur);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "34");
 
-        jrr = ledgerEntryMPT(env, bob, CUR);
+        jrr = ledgerEntryMPT(env, bob, cur);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "64");
     }
 
@@ -1858,29 +1859,29 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
 
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice, bob);
+        env.fund(startingXrp, gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, bob, USD(500)));
+        env(pay(gw, bob, usd(500)));
 
-        env(offer(bob, XRP(200), USD(200)), json(jss::Flags, tfSell));
+        env(offer(bob, XRP(200), usd(200)), Json(jss::Flags, tfSell));
         // Alice has 350 + fees - a reserve of 50 = 250 reserve = 100 available.
         // Alice has 350 + fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
-        env(offer(alice, USD(200), XRP(200)), json(jss::Flags, tfSell));
+        env(offer(alice, usd(200), XRP(200)), Json(jss::Flags, tfSell));
 
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "100");
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             STAmount(env.current()->fees().accountReserve(1)).getText());
 
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "400");
     }
 
@@ -1897,31 +1898,31 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
 
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice, bob);
+        env.fund(startingXrp, gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, bob, USD(500)));
+        env(pay(gw, bob, usd(500)));
 
-        env(offer(bob, XRP(100), USD(200)));
+        env(offer(bob, XRP(100), usd(200)));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
         // Taker pays 100 USD for 100 XRP.
         // Selling XRP.
         // Will sell all 100 XRP and get more USD than asked for.
-        env(offer(alice, USD(100), XRP(100)), json(jss::Flags, tfSell));
+        env(offer(alice, usd(100), XRP(100)), Json(jss::Flags, tfSell));
 
-        auto jrr = ledgerEntryMPT(env, alice, USD);
+        auto jrr = ledgerEntryMPT(env, alice, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "200");
         jrr = ledgerEntryRoot(env, alice);
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             STAmount(env.current()->fees().accountReserve(1)).getText());
 
-        jrr = ledgerEntryMPT(env, bob, USD);
+        jrr = ledgerEntryMPT(env, bob, usd);
         BEAST_EXPECT(jrr[jss::node][sfMPTAmount.fieldName] == "300");
     }
 
@@ -1939,37 +1940,37 @@ public:
             Env env{*this, features};
 
             auto const base = env.current()->fees().base;
-            auto const starting_xrp =
+            auto const startingXrp =
                 XRP(100.1) + env.current()->fees().accountReserve(1) + base * 2;
 
-            env.fund(starting_xrp, gw, alice, bob);
+            env.fund(startingXrp, gw, alice, bob);
             env.close();
 
-            auto const XTS =
+            auto const xts =
                 issue1({.env = env, .token = "XTS", .issuer = gw, .holders = {alice, bob}});
-            auto const XXX =
+            auto const xxx =
                 issue2({.env = env, .token = "XXX", .issuer = gw, .holders = {alice, bob}});
             env.close();
 
-            env(pay(gw, alice, XTS(1'000)));
-            env(pay(gw, alice, XXX(100)));
-            env(pay(gw, bob, XTS(1'000)));
-            env(pay(gw, bob, XXX(100)));
+            env(pay(gw, alice, xts(1'000)));
+            env(pay(gw, alice, xxx(100)));
+            env(pay(gw, bob, xts(1'000)));
+            env(pay(gw, bob, xxx(100)));
 
-            env(offer(alice, XTS(1'000), XXX(100)));
+            env(offer(alice, xts(1'000), xxx(100)));
 
             // WS client is used here because the RPC client could not
             // be convinced to pass the build_path argument
             auto wsc = makeWSClient(env.app().config());
-            Json::Value payment;
+            json::Value payment;
             payment[jss::secret] = toBase58(generateSeed("bob"));
             payment[jss::id] = env.seq(bob);
             payment[jss::build_path] = true;
-            payment[jss::tx_json] = pay(bob, bob, XXX(1));
+            payment[jss::tx_json] = pay(bob, bob, xxx(1));
             payment[jss::tx_json][jss::Sequence] =
                 env.current()->read(keylet::account(bob.id()))->getFieldU32(sfSequence);
             payment[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
-            payment[jss::tx_json][jss::SendMax] = XTS(15).value().getJson(JsonOptions::none);
+            payment[jss::tx_json][jss::SendMax] = xts(15).value().getJson(JsonOptions::KNone);
             auto jrr = wsc->invoke("submit", payment);
             BEAST_EXPECT(jrr[jss::status] == "success");
             BEAST_EXPECT(jrr[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -1980,11 +1981,11 @@ public:
                 BEAST_EXPECT(jrr.isMember(jss::id) && jrr[jss::id] == 5);
             }
 
-            BEAST_EXPECT(env.balance(alice, XTS) == XTS(1010));
-            BEAST_EXPECT(env.balance(alice, XXX) == XXX(99));
+            BEAST_EXPECT(env.balance(alice, xts) == xts(1010));
+            BEAST_EXPECT(env.balance(alice, xxx) == xxx(99));
 
-            BEAST_EXPECT(env.balance(bob, XTS) == XTS(990));
-            BEAST_EXPECT(env.balance(bob, XXX) == XXX(101));
+            BEAST_EXPECT(env.balance(bob, xts) == xts(990));
+            BEAST_EXPECT(env.balance(bob, xxx) == xxx(101));
         };
         testHelper2TokensMix(test);
     }
@@ -2006,20 +2007,20 @@ public:
         env.fund(XRP(10'000'000), gw);
         env.close();
 
-        auto MUSD = MPTTester({.env = env, .issuer = gw});
-        MPT const USD = MUSD;
+        auto musd = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = musd;
 
         // The fee that's charged for transactions
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum class preAuthType { noPreAuth, acctPreAuth };
+        enum class PreAuthType { NoPreAuth, AcctPreAuth };
         struct TestData
         {
             std::string account;      // Account operated on
             STAmount fundXrp;         // Account funded with
             int bookAmount;           // USD -> XRP offer on the books
-            preAuthType preAuth;      // If true, pre-auth MPToken
+            PreAuthType preAuth;      // If true, pre-auth MPToken
             int offerAmount;          // Account offers this much XRP -> USD
             TER tec;                  // Returned tec code
             STAmount spentXrp;        // Amount removed from fundXrp
@@ -2032,37 +2033,37 @@ public:
         // clang-format off
         TestData const tests[]{
             // acct                     fundXrp        bookAmt   preTrust  offerAmt                   tec     spentXrp       balanceUSD offers  owners scale
-            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
-            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
-            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
-            {.account="deb",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},  // Account has enough to buy a little USD then the offer runs dry.
-            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
-            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
-            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
-            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
-            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
-            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
-            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preAuth=preAuthType::noPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
+            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
+            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
+            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
+            {.account="deb",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=usd(      1),    .offers=0, .owners=1, .scale=100000},  // Account has enough to buy a little USD then the offer runs dry.
+            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=1, .owners=1},  // No offer to cross
+            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=usd(     50),    .offers=0, .owners=1},
+            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=usd(    800),    .offers=0, .owners=1},
+            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=1, .owners=2},
+            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=usd(    998),    .offers=0, .owners=1},
+            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=1, .owners=2},
+            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=usd(   1000),    .offers=0, .owners=1},
+            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=usd(   1000),    .offers=0, .owners=1},
+            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preAuth=PreAuthType::NoPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=1, .owners=1},
             //---------------- Pre-created MPT ---------------------
             // Unlike from IOU, an issuer can't pre-create MPToken for an account (see similar tests in Offer_test.cpp)
-            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="syd",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=3 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1, .scale=100000},
-            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
-            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
-            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preAuth=preAuthType::acctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="syd",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=3 * f, .balanceUsd=usd(      1),    .offers=0, .owners=1, .scale=100000},
+            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=usd(     20),    .offers=0, .owners=1},
+            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=1, .owners=2},
+            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preAuth=PreAuthType::AcctPreAuth, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=usd(      1),    .offers=1, .owners=2},
         };
         // clang-format on
 
@@ -2078,21 +2079,21 @@ public:
             // The gateway optionally creates an offer that would be crossed.
             auto const book = t.bookAmount;
             if (book != 0)
-                env(offer(gw, XRP(book), USD(book * t.scale)));
+                env(offer(gw, XRP(book), usd(book * t.scale)));
             env.close();
             std::uint32_t const gwOfferSeq = env.seq(gw) - 1;
 
             // Optionally pre-authorize MPT for acct.
             // Note this is not really part of the test, so we expect there
             // to be enough XRP reserve for acct to create the trust line.
-            if (t.preAuth == preAuthType::acctPreAuth)
-                MUSD.authorize({.account = acct});
+            if (t.preAuth == PreAuthType::AcctPreAuth)
+                musd.authorize({.account = acct});
             env.close();
 
             {
                 // Acct creates an offer.  This is the heart of the test.
                 auto const acctOffer = t.offerAmount;
-                env(offer(acct, USD(acctOffer * t.scale), XRP(acctOffer)), ter(t.tec));
+                env(offer(acct, usd(acctOffer * t.scale), XRP(acctOffer)), Ter(t.tec));
                 env.close();
             }
             std::uint32_t const acctOfferSeq = env.seq(acct) - 1;
@@ -2102,12 +2103,12 @@ public:
                     return t.balanceUsd;
                 // crossed offer has XRP available balance of 1 fee
                 // mpt to XRP ratio is 10
-                return USD(f.value() / 10);
+                return usd(f.value() / 10);
             }();
-            BEAST_EXPECT(env.balance(acct, USD) == expBalanceUsd);
+            BEAST_EXPECT(env.balance(acct, usd) == expBalanceUsd);
             BEAST_EXPECT(env.balance(acct, xrpIssue()) == t.fundXrp - t.spentXrp);
             env.require(offers(acct, t.offers));
-            env.require(owners(acct, t.owners));
+            env.require(Owners(acct, t.owners));
 
             auto acctOffers = offersOnAccount(env, acct);
             BEAST_EXPECT(acctOffers.size() == t.offers);
@@ -2117,28 +2118,28 @@ public:
 
                 auto const leftover = t.offerAmount - t.bookAmount;
                 BEAST_EXPECT(acctOffer[sfTakerGets] == XRP(leftover));
-                BEAST_EXPECT(acctOffer[sfTakerPays] == USD(leftover));
+                BEAST_EXPECT(acctOffer[sfTakerPays] == usd(leftover));
             }
 
-            if (t.preAuth == preAuthType::noPreAuth)
+            if (t.preAuth == PreAuthType::NoPreAuth)
             {
                 if (t.balanceUsd.value().signum() != 0)
                 {
                     // Verify the correct contents of MPT
-                    BEAST_EXPECT(env.balance(acct, USD) == expBalanceUsd);
+                    BEAST_EXPECT(env.balance(acct, usd) == expBalanceUsd);
                 }
                 else
                 {
                     // Verify that no MPT was created.
-                    auto const sle = env.le(keylet::mptoken(USD.issuanceID, acct));
+                    auto const sle = env.le(keylet::mptoken(usd.issuanceID, acct));
                     BEAST_EXPECT(!sle);
                 }
             }
 
             // Give the next loop a clean slate by canceling any left-overs
             // in the offers.
-            env(offer_cancel(acct, acctOfferSeq));
-            env(offer_cancel(gw, gwOfferSeq));
+            env(offerCancel(acct, acctOfferSeq));
+            env(offerCancel(gw, gwOfferSeq));
             env.close();
         }
     }
@@ -2167,14 +2168,14 @@ public:
         env.fund(reserve(env, 2) + fee * 2, alice);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-        auto const usdOffer = USD(1'000);
+        auto const usdOffer = usd(1'000);
         auto const xrpOffer = XRP(1'000);
 
         env(pay(gw, alice, usdOffer));
         env.close();
-        env.require(balance(alice, usdOffer), offers(alice, 0), offers(bob, 0));
+        env.require(Balance(alice, usdOffer), offers(alice, 0), offers(bob, 0));
 
         // The scenario:
         //   o alice has USD but wants XRP.
@@ -2188,31 +2189,31 @@ public:
 
         env.close();
         env.require(
-            balance(alice, USD(0)),
-            balance(bob, usdOffer),
-            balance(alice, aliceXRP + xrpOffer - fee),
-            balance(bob, bobsXRP - xrpOffer - fee),
+            Balance(alice, usd(0)),
+            Balance(bob, usdOffer),
+            Balance(alice, aliceXRP + xrpOffer - fee),
+            Balance(bob, bobsXRP - xrpOffer - fee),
             offers(alice, 0),
             offers(bob, 0));
 
-        BEAST_EXPECT(env.balance(bob, USD) == usdOffer);
+        BEAST_EXPECT(env.balance(bob, usd) == usdOffer);
 
         // Make two more offers that leave one of the offers non-dry.
-        env(offer(alice, USD(999), XRP(999)));
+        env(offer(alice, usd(999), XRP(999)));
         env(offer(bob, xrpOffer, usdOffer));
 
         env.close();
-        env.require(balance(alice, USD(999)));
-        env.require(balance(bob, USD(1)));
+        env.require(Balance(alice, usd(999)));
+        env.require(Balance(bob, usd(1)));
         env.require(offers(alice, 0));
-        BEAST_EXPECT(env.balance(bob, USD) == USD(1));
+        BEAST_EXPECT(env.balance(bob, usd) == usd(1));
         {
             auto const bobsOffers = offersOnAccount(env, bob);
             BEAST_EXPECT(bobsOffers.size() == 1);
             auto const& bobsOffer = *(bobsOffers.front());
 
             BEAST_EXPECT(bobsOffer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(bobsOffer[sfTakerGets] == USD(1));
+            BEAST_EXPECT(bobsOffer[sfTakerGets] == usd(1));
             BEAST_EXPECT(bobsOffer[sfTakerPays] == XRP(1));
         }
     }
@@ -2242,17 +2243,17 @@ public:
             env.fund(reserve(env, 3) + fee * 2, bob);
             env.close();
 
-            auto const USD = issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice}});
-            auto const EUR = issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {bob}});
+            auto const usd = issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice}});
+            auto const eur = issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {bob}});
 
-            auto const usdOffer = USD(1'000);
-            auto const eurOffer = EUR(1'000);
+            auto const usdOffer = usd(1'000);
+            auto const eurOffer = eur(1'000);
 
             env(pay(gw, alice, usdOffer));
             env(pay(gw, bob, eurOffer));
             env.close();
 
-            env.require(balance(alice, usdOffer), balance(bob, eurOffer));
+            env.require(Balance(alice, usdOffer), Balance(bob, eurOffer));
 
             // The scenario:
             //   o alice has USD but wants EUR.
@@ -2262,12 +2263,12 @@ public:
 
             env.close();
             env.require(
-                balance(alice, eurOffer), balance(bob, usdOffer), offers(alice, 0), offers(bob, 0));
+                Balance(alice, eurOffer), Balance(bob, usdOffer), offers(alice, 0), offers(bob, 0));
 
             // Alice's offer crossing created a default EUR trustline and
             // Bob's offer crossing created a default USD trustline:
-            BEAST_EXPECT(env.balance(alice, EUR) == eurOffer);
-            BEAST_EXPECT(env.balance(bob, USD) == usdOffer);
+            BEAST_EXPECT(env.balance(alice, eur) == eurOffer);
+            BEAST_EXPECT(env.balance(bob, usd) == usdOffer);
 
             // Make two more offers that leave one of the offers non-dry.
             // Guarantee the order of application by putting a close()
@@ -2275,16 +2276,16 @@ public:
             env(offer(bob, eurOffer, usdOffer));
             env.close();
 
-            env(offer(alice, USD(999), eurOffer));
+            env(offer(alice, usd(999), eurOffer));
             env.close();
 
             env.require(offers(alice, 0));
             env.require(offers(bob, 1));
 
-            env.require(balance(alice, USD(999)));
-            env.require(balance(alice, EUR(1)));
-            env.require(balance(bob, USD(1)));
-            env.require(balance(bob, EUR(999)));
+            env.require(Balance(alice, usd(999)));
+            env.require(Balance(alice, eur(1)));
+            env.require(Balance(bob, usd(1)));
+            env.require(Balance(bob, eur(999)));
 
             {
                 auto bobsOffers = offersOnAccount(env, bob);
@@ -2292,42 +2293,42 @@ public:
                 {
                     auto const& bobsOffer = *(bobsOffers.front());
 
-                    BEAST_EXPECT(bobsOffer[sfTakerGets] == USD(1));
-                    BEAST_EXPECT(bobsOffer[sfTakerPays] == EUR(1));
+                    BEAST_EXPECT(bobsOffer[sfTakerGets] == usd(1));
+                    BEAST_EXPECT(bobsOffer[sfTakerPays] == eur(1));
                 }
             }
 
             // alice makes one more offer that cleans out bob's offer.
-            env(offer(alice, USD(1), EUR(1)));
+            env(offer(alice, usd(1), eur(1)));
             env.close();
 
-            env.require(balance(alice, USD(1'000)));
-            env.require(balance(alice, EUR(none)));
-            env.require(balance(bob, USD(none)));
-            env.require(balance(bob, EUR(1'000)));
+            env.require(Balance(alice, usd(1'000)));
+            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));
 
             // The two MPT that were generated by the offers still here
             // Unlike IOU, MPToken is not automatically deleted
-            if constexpr (std::is_same_v<std::decay_t<decltype(EUR)>, MPT>)
+            if constexpr (std::is_same_v<std::decay_t<decltype(eur)>, MPT>)
             {
-                BEAST_EXPECT(env.le(keylet::mptoken(EUR.issuanceID, alice)));
-                auto MEUR = MPTTester(env, gw, EUR, {bob});
+                BEAST_EXPECT(env.le(keylet::mptoken(eur.issuanceID, alice)));
+                auto meur = MPTTester(env, gw, eur, {bob});
                 // Delete created MPToken to free up reserve
-                MEUR.authorize({.account = alice, .flags = tfMPTUnauthorize});
+                meur.authorize({.account = alice, .flags = tfMPTUnauthorize});
             }
-            if constexpr (std::is_same_v<std::decay_t<decltype(USD)>, MPT>)
+            if constexpr (std::is_same_v<std::decay_t<decltype(usd)>, MPT>)
             {
-                BEAST_EXPECT(env.le(keylet::mptoken(USD.issuanceID, bob)));
-                auto MUSD = MPTTester(env, gw, USD, {alice});
+                BEAST_EXPECT(env.le(keylet::mptoken(usd.issuanceID, bob)));
+                auto musd = MPTTester(env, gw, usd, {alice});
                 // Delete created MPToken to free up reserve
-                MUSD.authorize({.account = bob, .flags = tfMPTUnauthorize});
+                musd.authorize({.account = bob, .flags = tfMPTUnauthorize});
             }
 
             // Make two more offers that leave one of the offers non-dry. We
             // need to properly sequence the transactions:
-            env(offer(alice, EUR(999), usdOffer));
+            env(offer(alice, eur(999), usdOffer));
             env.close();
 
             env(offer(bob, usdOffer, eurOffer));
@@ -2336,10 +2337,10 @@ public:
             env.require(offers(alice, 0));
             env.require(offers(bob, 0));
 
-            env.require(balance(alice, USD(0)));
-            env.require(balance(alice, EUR(999)));
-            env.require(balance(bob, USD(1'000)));
-            env.require(balance(bob, EUR(1)));
+            env.require(Balance(alice, usd(0)));
+            env.require(Balance(alice, eur(999)));
+            env.require(Balance(bob, usd(1'000)));
+            env.require(Balance(bob, eur(1)));
         };
         testHelper2TokensMix(test);
     }
@@ -2361,11 +2362,11 @@ public:
             env.fund(XRP(1'000'000), gw, alice, bob, carol);
             env.close();
 
-            auto const USD = issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice}});
-            auto const EUR = issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {carol}});
+            auto const usd = issue1({.env = env, .token = "USD", .issuer = gw, .holders = {alice}});
+            auto const eur = issue2({.env = env, .token = "EUR", .issuer = gw, .holders = {carol}});
 
-            auto const usdOffer = USD(1'000);
-            auto const eurOffer = EUR(1'000);
+            auto const usdOffer = usd(1'000);
+            auto const eurOffer = eur(1'000);
 
             env(pay(gw, alice, usdOffer));
             env(pay(gw, carol, eurOffer));
@@ -2384,24 +2385,24 @@ public:
 
             // carol makes an offer that partially consumes alice and bob's
             // offers.
-            env(offer(carol, USD(400), EUR(400)));
+            env(offer(carol, usd(400), eur(400)));
             env.close();
 
             env.require(
-                balance(alice, USD(600)),
-                balance(bob, EUR(400)),
-                balance(carol, USD(400)),
-                balance(bob, bobXrpBalance - XRP(400)),
+                Balance(alice, usd(600)),
+                Balance(bob, eur(400)),
+                Balance(carol, usd(400)),
+                Balance(bob, bobXrpBalance - XRP(400)),
                 offers(carol, 0));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(400));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(400));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(400));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(400));
             {
                 auto const aliceOffers = offersOnAccount(env, alice);
                 BEAST_EXPECT(aliceOffers.size() == 1);
                 auto const& aliceOffer = *(aliceOffers.front());
 
                 BEAST_EXPECT(aliceOffer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(aliceOffer[sfTakerGets] == USD(600));
+                BEAST_EXPECT(aliceOffer[sfTakerGets] == usd(600));
                 BEAST_EXPECT(aliceOffer[sfTakerPays] == XRP(600));
             }
             {
@@ -2411,23 +2412,23 @@ public:
 
                 BEAST_EXPECT(bobsOffer[sfLedgerEntryType] == ltOFFER);
                 BEAST_EXPECT(bobsOffer[sfTakerGets] == XRP(600));
-                BEAST_EXPECT(bobsOffer[sfTakerPays] == EUR(600));
+                BEAST_EXPECT(bobsOffer[sfTakerPays] == eur(600));
             }
 
             // carol makes an offer that exactly consumes alice and bob's
             // offers.
-            env(offer(carol, USD(600), EUR(600)));
+            env(offer(carol, usd(600), eur(600)));
             env.close();
 
             env.require(
-                balance(alice, USD(0)),
-                balance(bob, eurOffer),
-                balance(carol, usdOffer),
-                balance(bob, bobXrpBalance - XRP(1'000)),
+                Balance(alice, usd(0)),
+                Balance(bob, eurOffer),
+                Balance(carol, usdOffer),
+                Balance(bob, bobXrpBalance - XRP(1'000)),
                 offers(bob, 0),
                 offers(carol, 0));
-            BEAST_EXPECT(env.balance(bob, EUR) == EUR(1'000));
-            BEAST_EXPECT(env.balance(carol, USD) == USD(1'000));
+            BEAST_EXPECT(env.balance(bob, eur) == eur(1'000));
+            BEAST_EXPECT(env.balance(carol, usd) == usd(1'000));
 
             // In pre-flow code alice's offer is left empty in the ledger.
             auto const aliceOffers = offersOnAccount(env, alice);
@@ -2437,7 +2438,7 @@ public:
                 auto const& aliceOffer = *(aliceOffers.front());
 
                 BEAST_EXPECT(aliceOffer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(aliceOffer[sfTakerGets] == USD(0));
+                BEAST_EXPECT(aliceOffer[sfTakerGets] == usd(0));
                 BEAST_EXPECT(aliceOffer[sfTakerPays] == XRP(0));
             }
         };
@@ -2460,8 +2461,8 @@ public:
 
         env.fund(XRP(10'000'000), gw);
 
-        auto MUSD = MPTTester({.env = env, .issuer = gw});
-        MPT const USD = MUSD;
+        auto musd = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = musd;
 
         // The fee that's charged for transactions
         auto const f = env.current()->fees().base;
@@ -2486,64 +2487,64 @@ public:
 
             // Constructor with takerGets/takerPays
             TestData(
-                std::string&& account_,  // Account operated on
-                STAmount fundXrp_,       // XRP acct funded with
-                STAmount fundUSD_,       // USD acct funded with
-                STAmount gwGets_,        // gw's offer
-                STAmount gwPays_,        //
-                STAmount acctGets_,      // acct's offer
-                STAmount acctPays_,      //
-                TER tec_,                // Returned tec code
-                STAmount spentXrp_,      // Amount removed from fundXrp
-                STAmount finalUsd_,      // Final USD balance on acct
-                int offers_,             // Offers on acct
-                int owners_,             // Owners on acct
-                STAmount takerGets_,     // Remainder of acct's offer
-                STAmount takerPays_)     //
-                : account(std::move(account_))
-                , fundXrp(std::move(fundXrp_))
-                , fundUSD(std::move(fundUSD_))
-                , gwGets(std::move(gwGets_))
-                , gwPays(std::move(gwPays_))
-                , acctGets(std::move(acctGets_))
-                , acctPays(std::move(acctPays_))
-                , tec(tec_)
-                , spentXrp(std::move(spentXrp_))
-                , finalUsd(std::move(finalUsd_))
-                , offers(offers_)
-                , owners(owners_)
-                , takerGets(std::move(takerGets_))
-                , takerPays(std::move(takerPays_))
+                std::string&& account,  // Account operated on
+                STAmount fundXrp,       // XRP acct funded with
+                STAmount fundUsd,       // USD acct funded with
+                STAmount gwGets,        // gw's offer
+                STAmount gwPays,        //
+                STAmount acctGets,      // acct's offer
+                STAmount acctPays,      //
+                TER tec,                // Returned tec code
+                STAmount spentXrp,      // Amount removed from fundXrp
+                STAmount finalUsd,      // Final USD balance on acct
+                int offers,             // Offers on acct
+                int owners,             // Owners on acct
+                STAmount takerGets,     // Remainder of acct's offer
+                STAmount takerPays)     //
+                : account(std::move(account))
+                , fundXrp(std::move(fundXrp))
+                , fundUSD(std::move(fundUsd))
+                , gwGets(std::move(gwGets))
+                , gwPays(std::move(gwPays))
+                , acctGets(std::move(acctGets))
+                , acctPays(std::move(acctPays))
+                , tec(tec)
+                , spentXrp(std::move(spentXrp))
+                , finalUsd(std::move(finalUsd))
+                , offers(offers)
+                , owners(owners)
+                , takerGets(std::move(takerGets))
+                , takerPays(std::move(takerPays))
             {
             }
 
             // Constructor without takerGets/takerPays
             TestData(
-                std::string&& account_,     // Account operated on
-                STAmount const& fundXrp_,   // XRP acct funded with
-                STAmount const& fundUSD_,   // USD acct funded with
-                STAmount const& gwGets_,    // gw's offer
-                STAmount const& gwPays_,    //
-                STAmount const& acctGets_,  // acct's offer
-                STAmount const& acctPays_,  //
-                TER tec_,                   // Returned tec code
-                STAmount const& spentXrp_,  // Amount removed from fundXrp
-                STAmount const& finalUsd_,  // Final USD balance on acct
-                int offers_,                // Offers on acct
-                int owners_)                // Owners on acct
+                std::string&& account,     // Account operated on
+                STAmount const& fundXrp,   // XRP acct funded with
+                STAmount const& fundUsd,   // USD acct funded with
+                STAmount const& gwGets,    // gw's offer
+                STAmount const& gwPays,    //
+                STAmount const& acctGets,  // acct's offer
+                STAmount const& acctPays,  //
+                TER tec,                   // Returned tec code
+                STAmount const& spentXrp,  // Amount removed from fundXrp
+                STAmount const& finalUsd,  // Final USD balance on acct
+                int offers,                // Offers on acct
+                int owners)                // Owners on acct
                 : TestData(
-                      std::move(account_),
-                      fundXrp_,
-                      fundUSD_,
-                      gwGets_,
-                      gwPays_,
-                      acctGets_,
-                      acctPays_,
-                      tec_,
-                      spentXrp_,
-                      finalUsd_,
-                      offers_,
-                      owners_,
+                      std::move(account),
+                      fundXrp,
+                      fundUsd,
+                      gwGets,
+                      gwPays,
+                      acctGets,
+                      acctPays,
+                      tec,
+                      spentXrp,
+                      finalUsd,
+                      offers,
+                      owners,
                       STAmount{0},
                       STAmount{0})
             {
@@ -2554,26 +2555,26 @@ public:
         TestData const tests[]{
             // acct pays XRP
             // acct                           fundXrp  fundUSD   gwGets   gwPays acctGets acctPays                     tec            spentXrp  finalUSD offers  owners  takerGets  takerPays
-            {"ann", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD( 5), USD(10), XRP(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (1 * f), USD( 0),      0,      0},
-            {"bev", XRP(10) + reserve(env, 1) + 1 * f, USD( 0), XRP(10), USD( 5), USD(10), XRP(10),             tesSUCCESS, XRP(  0) + (1 * f), USD( 0),      1,      1,   XRP(10), USD(10)},
-            {"cam", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(10), USD(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), USD(10),      0,      1},
-            {"deb", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"eve", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD( 5), XRP( 5),             tesSUCCESS, XRP(  5) + (1 * f), USD(10),      0,      1},
-            {"flo", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"gay", XRP(20) + reserve(env, 1) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"hye", XRP(20) + reserve(env, 2) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      1,      2,   XRP(10), USD(10)},
+            {"ann", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd( 5), usd(10), XRP(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (1 * f), usd( 0),      0,      0},
+            {"bev", XRP(10) + reserve(env, 1) + 1 * f, usd( 0), XRP(10), usd( 5), usd(10), XRP(10),             tesSUCCESS, XRP(  0) + (1 * f), usd( 0),      1,      1,   XRP(10), usd(10)},
+            {"cam", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(10), usd(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), usd(10),      0,      1},
+            {"deb", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"eve", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd( 5), XRP( 5),             tesSUCCESS, XRP(  5) + (1 * f), usd(10),      0,      1},
+            {"flo", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"gay", XRP(20) + reserve(env, 1) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"hye", XRP(20) + reserve(env, 2) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      1,      2,   XRP(10), usd(10)},
             // acct pays USD
-            {"meg",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP( 5), XRP(10), USD(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (2 * f), USD(10),      0,      1},
-            {"nia",           reserve(env, 2) + 2 * f, USD(10), USD(10), XRP( 5), XRP(10), USD(10),             tesSUCCESS, XRP(  0) + (2 * f), USD(10),      1,      2,   USD(10), XRP(10)},
-            {"ova",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP(10), XRP(10), USD(10),             tesSUCCESS, XRP(-10) + (2 * f), USD( 0),      0,      1},
-            {"pam",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP(20), XRP(10), USD(10),             tesSUCCESS, XRP(-20) + (2 * f), USD( 0),      0,      1},
-            {"qui",           reserve(env, 1) + 2 * f, USD(10), USD(20), XRP(40), XRP(10), USD(10),             tesSUCCESS, XRP(-20) + (2 * f), USD( 0),      0,      1},
-            {"rae",           reserve(env, 2) + 2 * f, USD(10), USD( 5), XRP( 5), XRP(10), USD(10),             tesSUCCESS, XRP( -5) + (2 * f), USD( 5),      1,      2,   USD( 5), XRP( 5)},
-            {"sue",           reserve(env, 2) + 2 * f, USD(10), USD( 5), XRP(10), XRP(10), USD(10),             tesSUCCESS, XRP(-10) + (2 * f), USD( 5),      1,      2,   USD( 5), XRP( 5)},
+            {"meg",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP( 5), XRP(10), usd(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (2 * f), usd(10),      0,      1},
+            {"nia",           reserve(env, 2) + 2 * f, usd(10), usd(10), XRP( 5), XRP(10), usd(10),             tesSUCCESS, XRP(  0) + (2 * f), usd(10),      1,      2,   usd(10), XRP(10)},
+            {"ova",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP(10), XRP(10), usd(10),             tesSUCCESS, XRP(-10) + (2 * f), usd( 0),      0,      1},
+            {"pam",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP(20), XRP(10), usd(10),             tesSUCCESS, XRP(-20) + (2 * f), usd( 0),      0,      1},
+            {"qui",           reserve(env, 1) + 2 * f, usd(10), usd(20), XRP(40), XRP(10), usd(10),             tesSUCCESS, XRP(-20) + (2 * f), usd( 0),      0,      1},
+            {"rae",           reserve(env, 2) + 2 * f, usd(10), usd( 5), XRP( 5), XRP(10), usd(10),             tesSUCCESS, XRP( -5) + (2 * f), usd( 5),      1,      2,   usd( 5), XRP( 5)},
+            {"sue",           reserve(env, 2) + 2 * f, usd(10), usd( 5), XRP(10), XRP(10), usd(10),             tesSUCCESS, XRP(-10) + (2 * f), usd( 5),      1,      2,   usd( 5), XRP( 5)},
         };
         // clang-format on
 
-        auto const zeroUsd = USD(0);
+        auto const zeroUsd = usd(0);
         for (auto const& t : tests)
         {
             // Make sure gateway has no current offers.
@@ -2589,7 +2590,7 @@ public:
             // on the trust line.
             if (t.fundUSD != zeroUsd)
             {
-                MUSD.authorize({.account = acct});
+                musd.authorize({.account = acct});
                 env.close();
                 env(pay(gw, acct, t.fundUSD));
                 env.close();
@@ -2600,15 +2601,15 @@ public:
             std::uint32_t const gwOfferSeq = env.seq(gw) - 1;
 
             // Acct creates a tfSell offer.  This is the heart of the test.
-            env(offer(acct, t.acctGets, t.acctPays, tfSell), ter(t.tec));
+            env(offer(acct, t.acctGets, t.acctPays, tfSell), Ter(t.tec));
             env.close();
             std::uint32_t const acctOfferSeq = env.seq(acct) - 1;
 
             // Check results
-            BEAST_EXPECT(env.balance(acct, USD) == t.finalUsd);
+            BEAST_EXPECT(env.balance(acct, usd) == t.finalUsd);
             BEAST_EXPECT(env.balance(acct, xrpIssue()) == t.fundXrp - t.spentXrp);
             env.require(offers(acct, t.offers));
-            env.require(owners(acct, t.owners));
+            env.require(Owners(acct, t.owners));
 
             if (t.offers != 0)
             {
@@ -2626,8 +2627,8 @@ public:
 
             // Give the next loop a clean slate by canceling any left-overs
             // in the offers.
-            env(offer_cancel(acct, acctOfferSeq));
-            env(offer_cancel(gw, gwOfferSeq));
+            env(offerCancel(acct, acctOfferSeq));
+            env(offerCancel(gw, gwOfferSeq));
             env.close();
         }
     }
@@ -2649,40 +2650,40 @@ public:
 
         env.fund(XRP(10'000'000), gw, alice, bob);
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
 
         // bob offers XRP for USD.
-        env(pay(gw, bob, USD(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
-        env(offer(bob, XRP(2'000), USD(20)));
+        env(offer(bob, XRP(2'000), usd(20)));
         env.close();
         {
             // alice submits a tfSell | tfFillOrKill offer that does not cross.
-            env(offer(alice, USD(21), XRP(2'100), tfSell | tfFillOrKill), ter(tecKILLED));
+            env(offer(alice, usd(21), XRP(2'100), tfSell | tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(alice, USD(none)));
+            env.require(Balance(alice, usd(kNONE)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(bob, usd(100)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that crosses.
             // Even though tfSell is present it doesn't matter this time.
-            env(offer(alice, USD(20), XRP(2'000), tfSell | tfFillOrKill));
+            env(offer(alice, usd(20), XRP(2'000), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(20)));
+            env.require(Balance(alice, usd(20)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(80)));
+            env.require(Balance(bob, usd(80)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that crosses and
             // returns more than was asked for (because of the tfSell flag).
-            env(offer(bob, XRP(2'000), USD(20)));
+            env(offer(bob, XRP(2'000), usd(20)));
             env.close();
-            env(offer(alice, USD(10), XRP(1'500), tfSell | tfFillOrKill));
+            env(offer(alice, usd(10), XRP(1'500), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(35)));
+            env.require(Balance(alice, usd(35)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(65)));
+            env.require(Balance(bob, usd(65)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that doesn't cross.
@@ -2691,22 +2692,22 @@ public:
             // all of the offer is consumed.
 
             // We're using bob's left-over offer for XRP(500), USD(5)
-            env(offer(alice, USD(1), XRP(501), tfSell | tfFillOrKill), ter(tecKILLED));
+            env(offer(alice, usd(1), XRP(501), tfSell | tfFillOrKill), Ter(tecKILLED));
             env.close();
-            env.require(balance(alice, USD(35)));
+            env.require(Balance(alice, usd(35)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(65)));
+            env.require(Balance(bob, usd(65)));
         }
         {
             // Alice submits a tfSell | tfFillOrKill offer that finishes
             // off the remainder of bob's offer.
 
             // We're using bob's left-over offer for XRP(500), USD(5)
-            env(offer(alice, USD(1), XRP(500), tfSell | tfFillOrKill));
+            env(offer(alice, usd(1), XRP(500), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(40)));
+            env.require(Balance(alice, usd(40)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(60)));
+            env.require(Balance(bob, usd(60)));
         }
     }
 
@@ -2727,9 +2728,9 @@ public:
             env.fund(XRP(100'000), gw1);
             env.close();
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = gw1, .transferFee = 25'000});
-            using tUSD = std::decay_t<decltype(USD)>;
+            using tUSD = std::decay_t<decltype(usd)>;
             {
                 auto const ann = Account("ann");
                 auto const bob = Account("bob");
@@ -2738,18 +2739,18 @@ public:
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = ann});
-                    MUSD.authorize({.account = bob});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = ann});
+                    musd.authorize({.account = bob});
                 }
                 else
                 {
-                    env(trust(ann, USD(20'000)));
-                    env(trust(bob, USD(20'000)));
+                    env(trust(ann, usd(20'000)));
+                    env(trust(bob, usd(20'000)));
                     env.close();
                 }
 
-                env(pay(gw1, bob, USD(12'500)));
+                env(pay(gw1, bob, usd(12'500)));
                 env.close();
 
                 // bob offers to sell USD(100) for XRP.  alice takes bob's
@@ -2758,18 +2759,18 @@ public:
                 //
                 // A comparable payment would look like this:
                 //   env (pay (bob, alice, USD(100)), sendmax(USD(125)))
-                env(offer(bob, XRP(1), USD(10'000)));
+                env(offer(bob, XRP(1), usd(10'000)));
                 env.close();
 
-                env(offer(ann, USD(10'000), XRP(1)));
+                env(offer(ann, usd(10'000), XRP(1)));
                 env.close();
 
-                env.require(balance(ann, USD(10'000)));
-                env.require(balance(ann, XRP(99) + reserve(env, 2)));
+                env.require(Balance(ann, usd(10'000)));
+                env.require(Balance(ann, XRP(99) + reserve(env, 2)));
                 env.require(offers(ann, 0));
 
-                env.require(balance(bob, USD(0)));
-                env.require(balance(bob, XRP(101) + reserve(env, 2)));
+                env.require(Balance(bob, usd(0)));
+                env.require(Balance(bob, XRP(101) + reserve(env, 2)));
                 env.require(offers(bob, 0));
             }
             {
@@ -2783,32 +2784,32 @@ public:
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = che});
-                    MUSD.authorize({.account = deb});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = che});
+                    musd.authorize({.account = deb});
                 }
                 else
                 {
-                    env(trust(che, USD(20'000)));
-                    env(trust(deb, USD(20'000)));
+                    env(trust(che, usd(20'000)));
+                    env(trust(deb, usd(20'000)));
                     env.close();
                 }
 
-                env(pay(gw1, deb, USD(12'500)));
+                env(pay(gw1, deb, usd(12'500)));
                 env.close();
 
-                env(offer(che, USD(10'000), XRP(1)));
+                env(offer(che, usd(10'000), XRP(1)));
                 env.close();
 
-                env(offer(deb, XRP(1), USD(10'000)));
+                env(offer(deb, XRP(1), usd(10'000)));
                 env.close();
 
-                env.require(balance(che, USD(10'000)));
-                env.require(balance(che, XRP(99) + reserve(env, 2)));
+                env.require(Balance(che, usd(10'000)));
+                env.require(Balance(che, XRP(99) + reserve(env, 2)));
                 env.require(offers(che, 0));
 
-                env.require(balance(deb, USD(0)));
-                env.require(balance(deb, XRP(101) + reserve(env, 2)));
+                env.require(Balance(deb, usd(0)));
+                env.require(Balance(deb, XRP(101) + reserve(env, 2)));
                 env.require(offers(deb, 0));
             }
             {
@@ -2820,33 +2821,33 @@ public:
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = eve});
-                    MUSD.authorize({.account = fyn});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = eve});
+                    musd.authorize({.account = fyn});
                 }
                 else
                 {
-                    env(trust(eve, USD(20'000)));
-                    env(trust(fyn, USD(20'000)));
+                    env(trust(eve, usd(20'000)));
+                    env(trust(fyn, usd(20'000)));
                     env.close();
                 }
 
-                env(pay(gw1, eve, USD(10'000)));
-                env(pay(gw1, fyn, USD(10'000)));
+                env(pay(gw1, eve, usd(10'000)));
+                env(pay(gw1, fyn, usd(10'000)));
                 env.close();
 
                 // This test verifies that the amount removed from an offer
                 // accounts for the transfer fee that is removed from the
                 // account but not from the remaining offer.
-                env(offer(eve, USD(1'000), XRP(4'000)));
+                env(offer(eve, usd(1'000), XRP(4'000)));
                 env.close();
                 std::uint32_t const eveOfferSeq = env.seq(eve) - 1;
 
-                env(offer(fyn, XRP(2'000), USD(500)));
+                env(offer(fyn, XRP(2'000), usd(500)));
                 env.close();
 
-                env.require(balance(eve, USD(10'500)));
-                env.require(balance(eve, XRP(18'000)));
+                env.require(Balance(eve, usd(10'500)));
+                env.require(Balance(eve, XRP(18'000)));
                 auto const evesOffers = offersOnAccount(env, eve);
                 BEAST_EXPECT(evesOffers.size() == 1);
                 if (!evesOffers.empty())
@@ -2854,12 +2855,12 @@ public:
                     auto const& evesOffer = *(evesOffers.front());
                     BEAST_EXPECT(evesOffer[sfLedgerEntryType] == ltOFFER);
                     BEAST_EXPECT(evesOffer[sfTakerGets] == XRP(2'000));
-                    BEAST_EXPECT(evesOffer[sfTakerPays] == USD(500));
+                    BEAST_EXPECT(evesOffer[sfTakerPays] == usd(500));
                 }
-                env(offer_cancel(eve, eveOfferSeq));  // For later tests
+                env(offerCancel(eve, eveOfferSeq));  // For later tests
 
-                env.require(balance(fyn, USD(9'375)));
-                env.require(balance(fyn, XRP(22'000)));
+                env.require(Balance(fyn, usd(9'375)));
+                env.require(Balance(fyn, XRP(22'000)));
                 env.require(offers(fyn, 0));
             }
             // Start messing with two non-native currencies.
@@ -2868,9 +2869,9 @@ public:
             env.fund(XRP(100'000), gw2);
             env.close();
 
-            auto const EUR =
+            auto const eur =
                 issue2({.env = env, .token = "EUR", .issuer = gw2, .transferFee = 50'000});
-            using tEUR = std::decay_t<decltype(EUR)>;
+            using tEUR = std::decay_t<decltype(eur)>;
             {
                 // Remove XRP from the equation.  Give the two currencies two
                 // different transfer rates so we can see both transfer rates
@@ -2882,47 +2883,47 @@ public:
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = gay});
-                    MUSD.authorize({.account = hal});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = gay});
+                    musd.authorize({.account = hal});
                 }
                 else
                 {
-                    env(trust(gay, USD(20'000)));
-                    env(trust(hal, USD(20'000)));
+                    env(trust(gay, usd(20'000)));
+                    env(trust(hal, usd(20'000)));
                     env.close();
                 }
                 if constexpr (std::is_same_v<tEUR, MPT>)
                 {
-                    auto MEUR = MPTTester(env, gw2, EUR);
-                    MEUR.authorize({.account = gay});
-                    MEUR.authorize({.account = hal});
+                    auto meur = MPTTester(env, gw2, eur);
+                    meur.authorize({.account = gay});
+                    meur.authorize({.account = hal});
                 }
                 else
                 {
-                    env(trust(gay, EUR(20'000)));
-                    env(trust(hal, EUR(20'000)));
+                    env(trust(gay, eur(20'000)));
+                    env(trust(hal, eur(20'000)));
                     env.close();
                 }
 
-                env(pay(gw1, gay, USD(12'500)));
-                env(pay(gw2, hal, EUR(150)));
+                env(pay(gw1, gay, usd(12'500)));
+                env(pay(gw2, hal, eur(150)));
                 env.close();
 
-                env(offer(gay, EUR(100), USD(10'000)));
+                env(offer(gay, eur(100), usd(10'000)));
                 env.close();
 
-                env(offer(hal, USD(10'000), EUR(100)));
+                env(offer(hal, usd(10'000), eur(100)));
                 env.close();
 
-                env.require(balance(gay, USD(0)));
-                env.require(balance(gay, EUR(100)));
-                env.require(balance(gay, reserve(env, 3)));
+                env.require(Balance(gay, usd(0)));
+                env.require(Balance(gay, eur(100)));
+                env.require(Balance(gay, reserve(env, 3)));
                 env.require(offers(gay, 0));
 
-                env.require(balance(hal, USD(10'000)));
-                env.require(balance(hal, EUR(0)));
-                env.require(balance(hal, reserve(env, 3)));
+                env.require(Balance(hal, usd(10'000)));
+                env.require(Balance(hal, eur(0)));
+                env.require(Balance(hal, reserve(env, 3)));
                 env.require(offers(hal, 0));
             }
 
@@ -2939,47 +2940,47 @@ public:
                 //   o qae has EUR but wants USD.
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = ova});
-                    MUSD.authorize({.account = pat});
-                    MUSD.authorize({.account = qae});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = ova});
+                    musd.authorize({.account = pat});
+                    musd.authorize({.account = qae});
                 }
                 else
                 {
-                    env(trust(ova, USD(20'000)));
-                    env(trust(pat, USD(20'000)));
-                    env(trust(qae, USD(20'000)));
+                    env(trust(ova, usd(20'000)));
+                    env(trust(pat, usd(20'000)));
+                    env(trust(qae, usd(20'000)));
                     env.close();
                 }
                 if constexpr (std::is_same_v<tEUR, MPT>)
                 {
-                    auto MEUR = MPTTester(env, gw2, EUR);
-                    MEUR.authorize({.account = ova});
-                    MEUR.authorize({.account = pat});
-                    MEUR.authorize({.account = qae});
+                    auto meur = MPTTester(env, gw2, eur);
+                    meur.authorize({.account = ova});
+                    meur.authorize({.account = pat});
+                    meur.authorize({.account = qae});
                 }
                 else
                 {
-                    env(trust(ova, EUR(20'000)));
-                    env(trust(pat, EUR(20'000)));
-                    env(trust(qae, EUR(20'000)));
+                    env(trust(ova, eur(20'000)));
+                    env(trust(pat, eur(20'000)));
+                    env(trust(qae, eur(20'000)));
                     env.close();
                 }
 
-                env(pay(gw1, ova, USD(12'500)));
-                env(pay(gw2, qae, EUR(150)));
+                env(pay(gw1, ova, usd(12'500)));
+                env(pay(gw2, qae, eur(150)));
                 env.close();
 
-                env(offer(ova, XRP(2), USD(10'000)));
-                env(offer(pat, EUR(100), XRP(2)));
+                env(offer(ova, XRP(2), usd(10'000)));
+                env(offer(pat, eur(100), XRP(2)));
                 env.close();
 
-                env(offer(qae, USD(10'000), EUR(100)));
+                env(offer(qae, usd(10'000), eur(100)));
                 env.close();
 
-                env.require(balance(ova, USD(0)));
-                env.require(balance(ova, EUR(0)));
-                env.require(balance(ova, XRP(4) + reserve(env, 3)));
+                env.require(Balance(ova, usd(0)));
+                env.require(Balance(ova, eur(0)));
+                env.require(Balance(ova, XRP(4) + reserve(env, 3)));
 
                 // In pre-flow code ova's offer is left empty in the ledger.
                 auto const ovasOffers = offersOnAccount(env, ova);
@@ -2989,18 +2990,18 @@ public:
                     auto const& ovasOffer = *(ovasOffers.front());
 
                     BEAST_EXPECT(ovasOffer[sfLedgerEntryType] == ltOFFER);
-                    BEAST_EXPECT(ovasOffer[sfTakerGets] == USD(0));
+                    BEAST_EXPECT(ovasOffer[sfTakerGets] == usd(0));
                     BEAST_EXPECT(ovasOffer[sfTakerPays] == XRP(0));
                 }
 
-                env.require(balance(pat, USD(0)));
-                env.require(balance(pat, EUR(100)));
-                env.require(balance(pat, XRP(0) + reserve(env, 3)));
+                env.require(Balance(pat, usd(0)));
+                env.require(Balance(pat, eur(100)));
+                env.require(Balance(pat, XRP(0) + reserve(env, 3)));
                 env.require(offers(pat, 0));
 
-                env.require(balance(qae, USD(10'000)));
-                env.require(balance(qae, EUR(0)));
-                env.require(balance(qae, XRP(2) + reserve(env, 3)));
+                env.require(Balance(qae, usd(10'000)));
+                env.require(Balance(qae, eur(0)));
+                env.require(Balance(qae, XRP(2) + reserve(env, 3)));
                 env.require(offers(qae, 0));
             }
         };
@@ -3037,18 +3038,18 @@ public:
         env.fund(startBalance + (fee * 5), gw);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = MPTTester({.env = env, .issuer = gw});
 
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
 
         // three offers + MPTokenIssuance
-        env.require(owners(gw, 4));
-        env.require(balance(gw, startBalance + fee));
+        env.require(Owners(gw, 4));
+        env.require(Balance(gw, startBalance + fee));
 
         auto gwOffers = offersOnAccount(env, gw);
         BEAST_EXPECT(gwOffers.size() == 3);
@@ -3057,16 +3058,16 @@ public:
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(offer[sfTakerGets] == XRP(600));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(60));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(60));
         }
 
         // Since this offer crosses the first offers, the previous offers
         // will be deleted and this offer will be put on the order book.
-        env(offer(gw, XRP(1'000), USD(100)));
+        env(offer(gw, XRP(1'000), usd(100)));
         env.close();
-        env.require(owners(gw, 2));
+        env.require(Owners(gw, 2));
         env.require(offers(gw, 1));
-        env.require(balance(gw, startBalance));
+        env.require(Balance(gw, startBalance));
 
         gwOffers = offersOnAccount(env, gw);
         BEAST_EXPECT(gwOffers.size() == 1);
@@ -3074,7 +3075,7 @@ public:
         {
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == USD(100));
+            BEAST_EXPECT(offer[sfTakerGets] == usd(100));
             BEAST_EXPECT(offer[sfTakerPays] == XRP(1'000));
         }
     }
@@ -3094,10 +3095,10 @@ public:
             env.fund(XRP(1'000'000), gw1, gw2);
             env.close();
 
-            auto const USD = issue1({.env = env, .token = "USD", .issuer = gw1});
-            using tUSD = std::decay_t<decltype(USD)>;
-            auto const EUR = issue2({.env = env, .token = "EUR", .issuer = gw2});
-            using tEUR = std::decay_t<decltype(EUR)>;
+            auto const usd = issue1({.env = env, .token = "USD", .issuer = gw1});
+            using tUSD = std::decay_t<decltype(usd)>;
+            auto const eur = issue2({.env = env, .token = "EUR", .issuer = gw2});
+            using tEUR = std::decay_t<decltype(eur)>;
 
             // The fee that's charged for transactions.
             auto const f = env.current()->fees().base;
@@ -3116,12 +3117,12 @@ public:
             // clang-format off
             TestData const tests[]{
                 // acct                 fundXRP   fundUSD    fundEUR            firstOfferTec           secondOfferTec
-                {"ann", reserve(env, 3) + f * 4, USD(1000), EUR(1000),             tesSUCCESS,             tesSUCCESS},
-                {"bev", reserve(env, 3) + f * 4, USD(   1), EUR(1000),             tesSUCCESS,             tesSUCCESS},
-                {"cam", reserve(env, 3) + f * 4, USD(1000), EUR(   1),             tesSUCCESS,             tesSUCCESS},
-                {"deb", reserve(env, 3) + f * 4, USD(   0), EUR(   1),             tesSUCCESS,      tecUNFUNDED_OFFER},
-                {"eve", reserve(env, 3) + f * 4, USD(   1), EUR(   0),      tecUNFUNDED_OFFER,             tesSUCCESS},
-                {"flo", reserve(env, 3) +     0, USD(1000), EUR(1000), tecINSUF_RESERVE_OFFER, tecINSUF_RESERVE_OFFER},
+                {"ann", reserve(env, 3) + f * 4, usd(1000), eur(1000),             tesSUCCESS,             tesSUCCESS},
+                {"bev", reserve(env, 3) + f * 4, usd(   1), eur(1000),             tesSUCCESS,             tesSUCCESS},
+                {"cam", reserve(env, 3) + f * 4, usd(1000), eur(   1),             tesSUCCESS,             tesSUCCESS},
+                {"deb", reserve(env, 3) + f * 4, usd(   0), eur(   1),             tesSUCCESS,      tecUNFUNDED_OFFER},
+                {"eve", reserve(env, 3) + f * 4, usd(   1), eur(   0),      tecUNFUNDED_OFFER,             tesSUCCESS},
+                {"flo", reserve(env, 3) +     0, usd(1000), eur(1000), tecINSUF_RESERVE_OFFER, tecINSUF_RESERVE_OFFER},
             };
             //clang-format on
 
@@ -3133,39 +3134,39 @@ public:
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    auto MUSD = MPTTester(env, gw1, USD);
-                    MUSD.authorize({.account = acct});
+                    auto musd = MPTTester(env, gw1, usd);
+                    musd.authorize({.account = acct});
                 }
                 else
                 {
-                    env(trust(acct, USD(1'000)));
+                    env(trust(acct, usd(1'000)));
                     env.close();
                 }
                 if constexpr (std::is_same_v<tEUR, MPT>)
                 {
-                    auto MEUR = MPTTester(env, gw2, EUR);
-                    MEUR.authorize({.account = acct});
+                    auto meur = MPTTester(env, gw2, eur);
+                    meur.authorize({.account = acct});
                 }
                 else
                 {
-                    env(trust(acct, EUR(1'000)));
+                    env(trust(acct, eur(1'000)));
                     env.close();
                 }
 
-                if (t.fundUSD > USD(0))
+                if (t.fundUSD > usd(0))
                     env(pay(gw1, acct, t.fundUSD));
-                if (t.fundEUR > EUR(0))
+                if (t.fundEUR > eur(0))
                     env(pay(gw2, acct, t.fundEUR));
                 env.close();
 
-                env(offer(acct, USD(500), EUR(600)), ter(t.firstOfferTec));
+                env(offer(acct, usd(500), eur(600)), Ter(t.firstOfferTec));
                 env.close();
                 std::uint32_t const firstOfferSeq = env.seq(acct) - 1;
 
                 int offerCount = t.firstOfferTec == tesSUCCESS ? 1 : 0;
-                env.require(owners(acct, 2 + offerCount));
-                env.require(balance(acct, t.fundUSD));
-                env.require(balance(acct, t.fundEUR));
+                env.require(Owners(acct, 2 + offerCount));
+                env.require(Balance(acct, t.fundUSD));
+                env.require(Balance(acct, t.fundEUR));
 
                 auto acctOffers = offersOnAccount(env, acct);
                 BEAST_EXPECT(acctOffers.size() == offerCount);
@@ -3173,18 +3174,18 @@ public:
                 {
                     auto const& offer = *offerPtr;
                     BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                    BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-                    BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+                    BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+                    BEAST_EXPECT(offer[sfTakerPays] == usd(500));
                 }
 
-                env(offer(acct, EUR(600), USD(500)), ter(t.secondOfferTec));
+                env(offer(acct, eur(600), usd(500)), Ter(t.secondOfferTec));
                 env.close();
                 std::uint32_t const secondOfferSeq = env.seq(acct) - 1;
 
                 offerCount = t.secondOfferTec == tesSUCCESS ? 1 : offerCount;
-                env.require(owners(acct, 2 + offerCount));
-                env.require(balance(acct, t.fundUSD));
-                env.require(balance(acct, t.fundEUR));
+                env.require(Owners(acct, 2 + offerCount));
+                env.require(Balance(acct, t.fundUSD));
+                env.require(Balance(acct, t.fundEUR));
 
                 acctOffers = offersOnAccount(env, acct);
                 BEAST_EXPECT(acctOffers.size() == offerCount);
@@ -3194,20 +3195,20 @@ public:
                     BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
                     if (offer[sfSequence] == firstOfferSeq)
                     {
-                        BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-                        BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+                        BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+                        BEAST_EXPECT(offer[sfTakerPays] == usd(500));
                     }
                     else
                     {
-                        BEAST_EXPECT(offer[sfTakerGets] == USD(500));
-                        BEAST_EXPECT(offer[sfTakerPays] == EUR(600));
+                        BEAST_EXPECT(offer[sfTakerGets] == usd(500));
+                        BEAST_EXPECT(offer[sfTakerPays] == eur(600));
                     }
                 }
 
                 // Remove any offers from acct for the next pass.
-                env(offer_cancel(acct, firstOfferSeq));
+                env(offerCancel(acct, firstOfferSeq));
                 env.close();
-                env(offer_cancel(acct, secondOfferSeq));
+                env(offerCancel(acct, secondOfferSeq));
                 env.close();
             }
         };
@@ -3240,19 +3241,19 @@ public:
         env.fund(XRP(50'000) + f, alice, bob);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = bob});
+        MPT const usd = MPTTester({.env = env, .issuer = bob});
 
-        env(offer(alice, USD(5'000), XRP(50'000)));
+        env(offer(alice, usd(5'000), XRP(50'000)));
         env.close();
 
         // This offer should take alice's offer up to Alice's reserve.
-        env(offer(bob, XRP(50'000), USD(5'000)));
+        env(offer(bob, XRP(50'000), usd(5'000)));
         env.close();
 
         // alice's offer should have been removed, since she's down to her
         // XRP reserve.
-        env.require(balance(alice, XRP(250)));
-        env.require(owners(alice, 1));
+        env.require(Balance(alice, XRP(250)));
+        env.require(Owners(alice, 1));
         env.require(mptokens(alice, 1));
 
         // However bob's offer should be in the ledger, since it was not
@@ -3263,7 +3264,7 @@ public:
         {
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == USD(25));
+            BEAST_EXPECT(offer[sfTakerGets] == usd(25));
             BEAST_EXPECT(offer[sfTakerPays] == XRP(250));
         }
     }
@@ -3289,36 +3290,36 @@ public:
             env.fund(reserve(env, 4) + (fee * 5), ann, bob, cam);
             env.close();
 
-            auto const A_BUX = issue1(
+            auto const aBux = issue1(
                 {.env = env, .token = "AUX", .issuer = ann, .holders = {cam}});
-            auto const B_BUX = issue2(
+            auto const bBux = issue2(
                 {.env = env,
                  .token = "BUX",
                  .issuer = bob,
                  .holders = {ann, cam}});
 
-            env(pay(ann, cam, A_BUX(35)));
-            env(pay(bob, cam, B_BUX(35)));
+            env(pay(ann, cam, aBux(35)));
+            env(pay(bob, cam, bBux(35)));
 
-            env(offer(bob, A_BUX(30), B_BUX(30)));
+            env(offer(bob, aBux(30), bBux(30)));
             env.close();
 
             // cam puts an offer on the books that her upcoming offer could
             // cross. But this offer should be deleted, not crossed, by her
             // upcoming offer.
-            env(offer(cam, A_BUX(29), B_BUX(30), tfPassive));
+            env(offer(cam, aBux(29), bBux(30), tfPassive));
             env.close();
-            env.require(balance(cam, A_BUX(35)));
-            env.require(balance(cam, B_BUX(35)));
+            env.require(Balance(cam, aBux(35)));
+            env.require(Balance(cam, bBux(35)));
             env.require(offers(cam, 1));
 
             // This offer caused the assert.
-            env(offer(cam, B_BUX(30), A_BUX(30)));
+            env(offer(cam, bBux(30), aBux(30)));
             env.close();
 
-            env.require(balance(bob, A_BUX(30)));
-            env.require(balance(cam, A_BUX(5)));
-            env.require(balance(cam, B_BUX(65)));
+            env.require(Balance(bob, aBux(30)));
+            env.require(Balance(cam, aBux(5)));
+            env.require(Balance(cam, bBux(65)));
             env.require(offers(cam, 0));
         };
         testHelper2TokensMix(test);
@@ -3344,18 +3345,18 @@ public:
         env.fund(reserve(env, 2) + (fee * 4), gw);
         env.close();
 
-        MPT const BTC = MPTTester(
+        MPT const btc = MPTTester(
             {.env = env, .issuer = gw, .holders = {ann}, .transferFee = 2'000});
 
-        env(pay(gw, ann, BTC(2'856)));
+        env(pay(gw, ann, btc(2'856)));
         env.close();
 
-        env(offer(ann, drops(365'611'702'030), BTC(5'713)));
+        env(offer(ann, drops(365'611'702'030), btc(5'713)));
         env.close();
 
         // This offer caused the assert.
-        env(offer(ann, BTC(687), drops(20'000'000'000)),
-            ter(tecINSUF_RESERVE_OFFER));
+        env(offer(ann, btc(687), drops(20'000'000'000)),
+            Ter(tecINSUF_RESERVE_OFFER));
     }
 
     void
@@ -3380,16 +3381,16 @@ public:
         env.fund(reserve(env, 2) + (fee * 4), gw);
         env.close();
 
-        MPT const CNY = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
+        MPT const cny = MPTTester({.env = env, .issuer = gw, .holders = {bob}});
 
-        env(pay(gw, bob, CNY(3'000'000)));
+        env(pay(gw, bob, cny(3'000'000)));
         env.close();
 
-        env(offer(bob, drops(5'400'000'000), CNY(2'160'540)));
+        env(offer(bob, drops(5'400'000'000), cny(2'160'540)));
         env.close();
 
         // This offer did not round result of partial crossing correctly.
-        env(offer(alice, CNY(135'620'001), drops(339'000'000'000)));
+        env(offer(alice, cny(135'620'001), drops(339'000'000'000)));
         env.close();
 
         auto const aliceOffers = offersOnAccount(env, alice);
@@ -3399,7 +3400,7 @@ public:
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(offer[sfTakerGets] == drops(333'599'446'582));
-            BEAST_EXPECT(offer[sfTakerPays] == CNY(13'3459'461));
+            BEAST_EXPECT(offer[sfTakerPays] == cny(13'3459'461));
         }
     }
 
@@ -3427,32 +3428,32 @@ public:
             env.fund(reserve(env, 2) + (fee * 4), gw);
             env.close();
 
-            auto const JPY = issue1(
+            auto const jpy = issue1(
                 {.env = env,
                  .token = "JPY",
                  .issuer = gw,
                  .holders = {alice},
-                 .limit = maxMPTokenAmount,
+                 .limit = kMAX_MP_TOKEN_AMOUNT,
                  .transferFee = 2'000});
-            auto const BTC = issue2(
+            auto const btc = issue2(
                 {.env = env,
                  .token = "BTC",
                  .issuer = gw,
                  .holders = {bob},
-                 .limit = maxMPTokenAmount,
+                 .limit = kMAX_MP_TOKEN_AMOUNT,
                  .transferFee = 2'000});
 
-            env(pay(gw, alice, JPY(3'699'034'802'280'317)));
-            env(pay(gw, bob, BTC(115'672'255'914'031'100)));
+            env(pay(gw, alice, jpy(3'699'034'802'280'317)));
+            env(pay(gw, bob, btc(115'672'255'914'031'100)));
             env.close();
 
             env(offer(
-                bob, JPY(1'241'913'390'770'747), BTC(1'969'825'690'469'254)));
+                bob, jpy(1'241'913'390'770'747), btc(1'969'825'690'469'254)));
             env.close();
 
             // This offer did not round result of partial crossing correctly.
             env(offer(
-                alice, BTC(5'507'568'706'427'876), JPY(3'472'696'773'391'072)));
+                alice, btc(5'507'568'706'427'876), jpy(3'472'696'773'391'072)));
             env.close();
 
             auto const aliceOffers = offersOnAccount(env, alice);
@@ -3469,8 +3470,8 @@ public:
                 // MPT test has the same order of magnitude for the scaled
                 // values and the first 5 digits match. Is the difference due to
                 // int arithmetics?
-                BEAST_EXPECT(offer[sfTakerGets] == JPY(2'230'659'191'281'247));
-                BEAST_EXPECT(offer[sfTakerPays] == BTC(3'537'743'015'958'622));
+                BEAST_EXPECT(offer[sfTakerGets] == jpy(2'230'659'191'281'247));
+                BEAST_EXPECT(offer[sfTakerPays] == btc(3'537'743'015'958'622));
             }
         };
         testHelper2TokensMix(test);
@@ -3527,19 +3528,19 @@ public:
             env.fund(startXrpBalance, gw);
             env.close();
 
-            auto const BTC = issue1(
+            auto const btc = issue1(
                 {.env = env,
                  .token = "BTC",
                  .issuer = gw,
                  .transferFee = 25'000});
-            using tBTC = std::decay_t<decltype(BTC)>;
+            using tBTC = std::decay_t<decltype(btc)>;
             env.close();
-            auto const USD = issue2(
+            auto const usd = issue2(
                 {.env = env,
                  .token = "USD",
                  .issuer = gw,
                  .transferFee = 25'000});
-            using tUSD = std::decay_t<decltype(USD)>;
+            using tUSD = std::decay_t<decltype(usd)>;
             env.close();
 
             // Test cases
@@ -3567,10 +3568,10 @@ public:
             // clang-format off
             TestData const tests[]{
                 //        btcStart   --------------------- actor[0] ---------------------    -------------------- actor[1] -------------------
-                {0, 0, 1, BTC(200), {{"ann", 0, drops(3900000'000000 - (4 * baseFee)), BTC(200), USD(3000)}, {"abe", 0, drops(4100000'000000 - (3 * baseFee)), BTC( 0), USD(750)}}},  // no BTC xfer fee
-                {0, 1, 0, BTC(200), {{"bev", 0, drops(4100000'000000 - (4 * baseFee)), BTC( 75), USD(2000)}, {"bob", 0, drops(3900000'000000 - (3 * baseFee)), BTC(100), USD(  0)}}},  // no USD xfer fee
-                {0, 0, 0, BTC(200), {{"cam", 0, drops(4000000'000000 - (5 * baseFee)), BTC(200), USD(2000)}                                                     }},  // no xfer fee
-                {0, 1, 0, BTC( 50), {{"deb", 1, drops(4040000'000000 - (4 * baseFee)), BTC(  0), USD(2000)}, {"dan", 1, drops(3960000'000000 - (3 * baseFee)), BTC( 40), USD(  0)}}},  // no USD xfer fee
+                {0, 0, 1, btc(200), {{"ann", 0, drops(3900000'000000 - (4 * baseFee)), btc(200), usd(3000)}, {"abe", 0, drops(4100000'000000 - (3 * baseFee)), btc( 0), usd(750)}}},  // no BTC xfer fee
+                {0, 1, 0, btc(200), {{"bev", 0, drops(4100000'000000 - (4 * baseFee)), btc( 75), usd(2000)}, {"bob", 0, drops(3900000'000000 - (3 * baseFee)), btc(100), usd(  0)}}},  // no USD xfer fee
+                {0, 0, 0, btc(200), {{"cam", 0, drops(4000000'000000 - (5 * baseFee)), btc(200), usd(2000)}                                                     }},  // no xfer fee
+                {0, 1, 0, btc( 50), {{"deb", 1, drops(4040000'000000 - (4 * baseFee)), btc(  0), usd(2000)}, {"dan", 1, drops(3960000'000000 - (3 * baseFee)), btc( 40), usd(  0)}}},  // no USD xfer fee
             };
             // clang-format on
 
@@ -3587,45 +3588,45 @@ public:
 
                     if constexpr (std::is_same_v<tBTC, MPT>)
                     {
-                        auto MBTC = MPTTester(env, gw, BTC);
-                        MBTC.authorize({.account = actor.acct});
+                        auto mbtc = MPTTester(env, gw, btc);
+                        mbtc.authorize({.account = actor.acct});
                     }
                     else
                     {
-                        env(trust(actor.acct, BTC(400)));
+                        env(trust(actor.acct, btc(400)));
                         env.close();
                     }
                     if constexpr (std::is_same_v<tUSD, MPT>)
                     {
-                        auto MUSD = MPTTester(env, gw, USD);
-                        MUSD.authorize({.account = actor.acct});
+                        auto musd = MPTTester(env, gw, usd);
+                        musd.authorize({.account = actor.acct});
                     }
                     else
                     {
-                        env(trust(actor.acct, USD(8000)));
+                        env(trust(actor.acct, usd(8000)));
                         env.close();
                     }
                     env.close();
                 }
 
                 env(pay(gw, self, t.btcStart));
-                env(pay(gw, self, USD(2'000)));
+                env(pay(gw, self, usd(2'000)));
                 if (self.id() != leg1.id())
-                    env(pay(gw, leg1, USD(2'000)));
+                    env(pay(gw, leg1, usd(2'000)));
                 env.close();
 
                 // Get the initial offers in place.  Remember their sequences
                 // so we can delete them later.
-                env(offer(leg0, BTC(100), XRP(100'000), tfPassive));
+                env(offer(leg0, btc(100), XRP(100'000), tfPassive));
                 env.close();
                 std::uint32_t const leg0OfferSeq = env.seq(leg0) - 1;
 
-                env(offer(leg1, XRP(100'000), USD(1'000), tfPassive));
+                env(offer(leg1, XRP(100'000), usd(1'000), tfPassive));
                 env.close();
                 std::uint32_t const leg1OfferSeq = env.seq(leg1) - 1;
 
                 // This is the offer that matters.
-                env(offer(self, USD(1'000), BTC(100)));
+                env(offer(self, usd(1'000), btc(100)));
                 env.close();
                 std::uint32_t const selfOfferSeq = env.seq(self) - 1;
 
@@ -3645,17 +3646,17 @@ public:
                             }));
                     BEAST_EXPECT(offerCount == actor.offers);
 
-                    env.require(balance(actor.acct, actor.xrp));
-                    env.require(balance(actor.acct, actor.btc));
-                    env.require(balance(actor.acct, actor.usd));
+                    env.require(Balance(actor.acct, actor.xrp));
+                    env.require(Balance(actor.acct, actor.btc));
+                    env.require(Balance(actor.acct, actor.usd));
                 }
                 // Remove any offers that might be left hanging around.  They
                 // could bollix up later loops.
-                env(offer_cancel(leg0, leg0OfferSeq));
+                env(offerCancel(leg0, leg0OfferSeq));
                 env.close();
-                env(offer_cancel(leg1, leg1OfferSeq));
+                env(offerCancel(leg1, leg1OfferSeq));
                 env.close();
-                env(offer_cancel(self, selfOfferSeq));
+                env(offerCancel(self, selfOfferSeq));
                 env.close();
             }
         };
@@ -3709,12 +3710,12 @@ public:
             env.fund(startXrpBalance, gw);
             env.close();
 
-            auto const BTC = issue1(
+            auto const btc = issue1(
                 {.env = env, .token = "BTC", .issuer = gw, .limit = 40, .transferFee = 25'000});
-            using tBTC = std::decay_t<decltype(BTC)>;
-            auto const USD = issue2(
+            using tBTC = std::decay_t<decltype(btc)>;
+            auto const usd = issue2(
                 {.env = env, .token = "USD", .issuer = gw, .limit = 8'000, .transferFee = 25'000});
-            using tUSD = std::decay_t<decltype(USD)>;
+            using tUSD = std::decay_t<decltype(usd)>;
             env.close();
 
             // Test cases
@@ -3742,8 +3743,8 @@ public:
             // clang-format off
             TestData const flowTests[]{
                 //         btcStart    ------------------- actor[0] --------------------    ------------------- actor[1] --------------------
-                {0, 0, 1, BTC(5), {{"gay", 1, drops(3950000'000000 - (4 * baseFee)), BTC(5), USD (2500)}, {"gar", 1, drops(4050000'000000 - (3 * baseFee)), BTC(0), USD(1375)}}}, // no BTC xfer fee
-                {0, 0, 0, BTC(5), {{"hye", 2, drops(4000000'000000 - (5 * baseFee)), BTC(5), USD (2000)}                                                     }}  // no xfer fee
+                {0, 0, 1, btc(5), {{"gay", 1, drops(3950000'000000 - (4 * baseFee)), btc(5), usd (2500)}, {"gar", 1, drops(4050000'000000 - (3 * baseFee)), btc(0), usd(1375)}}}, // no BTC xfer fee
+                {0, 0, 0, btc(5), {{"hye", 2, drops(4000000'000000 - (5 * baseFee)), btc(5), usd (2000)}                                                     }}  // no xfer fee
             };
             // clang-format on
 
@@ -3760,44 +3761,44 @@ public:
 
                     if constexpr (std::is_same_v<tBTC, MPT>)
                     {
-                        auto MBTC = MPTTester(env, gw, BTC);
-                        MBTC.authorize({.account = actor.acct});
+                        auto mbtc = MPTTester(env, gw, btc);
+                        mbtc.authorize({.account = actor.acct});
                     }
                     else
                     {
-                        env(trust(actor.acct, BTC(40)));
+                        env(trust(actor.acct, btc(40)));
                         env.close();
                     }
                     if constexpr (std::is_same_v<tUSD, MPT>)
                     {
-                        auto MUSD = MPTTester(env, gw, USD);
-                        MUSD.authorize({.account = actor.acct});
+                        auto musd = MPTTester(env, gw, usd);
+                        musd.authorize({.account = actor.acct});
                     }
                     else
                     {
-                        env(trust(actor.acct, USD(8'000)));
+                        env(trust(actor.acct, usd(8'000)));
                         env.close();
                     }
                 }
 
                 env(pay(gw, self, t.btcStart));
-                env(pay(gw, self, USD(2'000)));
+                env(pay(gw, self, usd(2'000)));
                 if (self.id() != leg1.id())
-                    env(pay(gw, leg1, USD(2'000)));
+                    env(pay(gw, leg1, usd(2'000)));
                 env.close();
 
                 // Get the initial offers in place.  Remember their sequences
                 // so we can delete them later.
-                env(offer(leg0, BTC(10), XRP(100'000), tfPassive));
+                env(offer(leg0, btc(10), XRP(100'000), tfPassive));
                 env.close();
                 std::uint32_t const leg0OfferSeq = env.seq(leg0) - 1;
 
-                env(offer(leg1, XRP(100'000), USD(1'000), tfPassive));
+                env(offer(leg1, XRP(100'000), usd(1'000), tfPassive));
                 env.close();
                 std::uint32_t const leg1OfferSeq = env.seq(leg1) - 1;
 
                 // This is the offer that matters.
-                env(offer(self, USD(1'000), BTC(10)));
+                env(offer(self, usd(1'000), btc(10)));
                 env.close();
                 std::uint32_t const selfOfferSeq = env.seq(self) - 1;
 
@@ -3817,17 +3818,17 @@ public:
                             }));
                     BEAST_EXPECT(offerCount == actor.offers);
 
-                    env.require(balance(actor.acct, actor.xrp));
-                    env.require(balance(actor.acct, actor.btc));
-                    env.require(balance(actor.acct, actor.usd));
+                    env.require(Balance(actor.acct, actor.xrp));
+                    env.require(Balance(actor.acct, actor.btc));
+                    env.require(Balance(actor.acct, actor.usd));
                 }
                 // Remove any offers that might be left hanging around.  They
                 // could bollix up later loops.
-                env(offer_cancel(leg0, leg0OfferSeq));
+                env(offerCancel(leg0, leg0OfferSeq));
                 env.close();
-                env(offer_cancel(leg1, leg1OfferSeq));
+                env(offerCancel(leg1, leg1OfferSeq));
                 env.close();
-                env(offer_cancel(self, selfOfferSeq));
+                env(offerCancel(self, selfOfferSeq));
                 env.close();
             }
         };
@@ -3852,7 +3853,7 @@ public:
 
         // GW requires authorization for holders of its IOUs
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = MPTDEXFlags | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // Have gw authorize bob and alice
@@ -3865,22 +3866,22 @@ public:
         env.close();
 
         env.require(offers(alice, 1));
-        env.require(balance(alice, gwUSD(0)));
+        env.require(Balance(alice, gwUSD(0)));
 
         env(pay(gw, bob, gwUSD(50)));
         env.close();
 
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // Bob's offer should cross Alice's
         env(offer(bob, XRP(4'000), gwUSD(40)));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(40)));
+        env.require(Balance(alice, gwUSD(40)));
 
         env.require(offers(bob, 0));
-        env.require(balance(bob, gwUSD(10)));
+        env.require(Balance(bob, gwUSD(10)));
     }
 
     void
@@ -3911,23 +3912,23 @@ public:
         env.close();
 
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = MPTDEXFlags | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // alice can't create an offer because alice doesn't own
         // MPToken and MPTokenIssuance requires authorization
-        env(offer(alice, gwUSD(40), XRP(4'000)), ter(tecNO_AUTH));
+        env(offer(alice, gwUSD(40), XRP(4'000)), Ter(tecNO_AUTH));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(none)));
+        env.require(Balance(alice, gwUSD(kNONE)));
 
         gwMUSD.authorize({.account = bob});
         gwMUSD.authorize({.account = gw, .holder = bob});
 
         env(pay(gw, bob, gwUSD(50)));
         env.close();
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // bob can create an offer since bob owns MPToken
         // and it is authorized.
@@ -3941,17 +3942,17 @@ public:
         // should still not be able to create an offer for USD/gw.
         gwMUSD.authorize({.account = alice});
 
-        env(offer(alice, gwUSD(40), XRP(4'000)), ter(tecNO_AUTH));
+        env(offer(alice, gwUSD(40), XRP(4'000)), Ter(tecNO_AUTH));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(0)));
+        env.require(Balance(alice, gwUSD(0)));
 
         env.require(offers(bob, 1));
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // Delete bob's offer so alice can create an offer without crossing.
-        env(offer_cancel(bob, bobOfferSeq));
+        env(offerCancel(bob, bobOfferSeq));
         env.close();
         env.require(offers(bob, 0));
 
@@ -3969,10 +3970,10 @@ public:
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(40)));
+        env.require(Balance(alice, gwUSD(40)));
 
         env.require(offers(bob, 0));
-        env.require(balance(bob, gwUSD(10)));
+        env.require(Balance(bob, gwUSD(10)));
     }
 
     void
@@ -3991,7 +3992,7 @@ public:
         env.close();
 
         auto gwMUSD =
-            MPTTester({.env = env, .issuer = gw, .flags = MPTDEXFlags | tfMPTRequireAuth});
+            MPTTester({.env = env, .issuer = gw, .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth});
         MPT const gwUSD = gwMUSD;
 
         // Test that gw can create an offer to buy gw's currency.
@@ -4001,7 +4002,7 @@ public:
         env.require(offers(gw, 1));
 
         // Cancel gw's offer
-        env(offer_cancel(gw, gwOfferSeq));
+        env(offerCancel(gw, gwOfferSeq));
         env.close();
         env.require(offers(gw, 0));
 
@@ -4022,14 +4023,14 @@ public:
         env(pay(gw, alice, gwUSD(50)));
         env.close();
 
-        env.require(balance(alice, gwUSD(50)));
+        env.require(Balance(alice, gwUSD(50)));
 
         // alice's offer should cross gw's
         env(offer(alice, XRP(4'000), gwUSD(40)));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(10)));
+        env.require(Balance(alice, gwUSD(10)));
 
         env.require(offers(gw, 0));
     }
@@ -4042,7 +4043,7 @@ public:
 
         testcase("Deleted offer issuer");
 
-        auto MPTokenExists =
+        auto mpTokenExists =
             [](jtx::Env const& env, AccountID const& account, MPTID const& issuanceID) -> bool {
             return bool(env.le(keylet::mptoken(issuanceID, account)));
         };
@@ -4056,36 +4057,36 @@ public:
 
         env.fund(XRP(10'000), alice, becky, carol, noripple(gw));
 
-        auto MUSD = MPTTester({.env = env, .issuer = gw});
-        MPT const USD = MUSD;
+        auto musd = MPTTester({.env = env, .issuer = gw});
+        MPT const usd = musd;
 
-        MUSD.authorize({.account = becky});
-        BEAST_EXPECT(MPTokenExists(env, becky, USD.issuanceID));
-        env(pay(gw, becky, USD(5)));
+        musd.authorize({.account = becky});
+        BEAST_EXPECT(mpTokenExists(env, becky, usd.issuanceID));
+        env(pay(gw, becky, usd(5)));
         env.close();
 
-        auto MBUX = MPTTester({.env = env, .issuer = alice});
-        MPT const BUX = MBUX;
+        auto mbux = MPTTester({.env = env, .issuer = alice});
+        MPT const bux = mbux;
 
         // Make offers that produce USD and can be crossed two ways:
         // direct XRP -> USD
         // direct BUX -> USD
-        env(offer(becky, XRP(2), USD(2)), txflags(tfPassive));
+        env(offer(becky, XRP(2), usd(2)), Txflags(tfPassive));
         std::uint32_t const beckyBuxUsdSeq{env.seq(becky)};
-        env(offer(becky, BUX(3), USD(3)), txflags(tfPassive));
+        env(offer(becky, bux(3), usd(3)), Txflags(tfPassive));
         env.close();
 
         // becky keeps the offers, but removes MPT.
-        env(pay(becky, gw, USD(5)));
-        MUSD.authorize({.account = becky, .flags = tfMPTUnauthorize});
+        env(pay(becky, gw, usd(5)));
+        musd.authorize({.account = becky, .flags = tfMPTUnauthorize});
 
-        BEAST_EXPECT(!MPTokenExists(env, becky, USD.issuanceID));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(!mpTokenExists(env, becky, usd.issuanceID));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // Have to delete MPTokenIssuance in order to delete
         // the issuer account.
-        MUSD.destroy({});
+        musd.destroy({});
 
         // Delete gw's account.
         {
@@ -4102,7 +4103,7 @@ public:
                 env.close();
 
             // Account deletion has a high fee.  Account for that.
-            env(acctdelete(gw, alice), fee(drops(env.current()->fees().increment)));
+            env(acctdelete(gw, alice), Fee(drops(env.current()->fees().increment)));
             env.close();
 
             // Verify that gw's account root is gone from the ledger.
@@ -4111,38 +4112,38 @@ public:
 
         // alice crosses becky's first offer.  The offer create fails because
         // the USD issuer is not in the ledger.
-        env(offer(alice, USD(2), XRP(2)), ter(tecNO_ISSUER));
+        env(offer(alice, usd(2), XRP(2)), Ter(tecNO_ISSUER));
         env.close();
         env.require(offers(alice, 0));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // alice crosses becky's second offer.  Again, the offer create fails
         // because the USD issuer is not in the ledger.
-        env(offer(alice, USD(3), BUX(3)), ter(tecNO_ISSUER));
+        env(offer(alice, usd(3), bux(3)), Ter(tecNO_ISSUER));
         env.require(offers(alice, 0));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // Cancel becky's BUX -> USD offer so we can try auto-bridging.
-        env(offer_cancel(becky, beckyBuxUsdSeq));
+        env(offerCancel(becky, beckyBuxUsdSeq));
         env.close();
-        BEAST_EXPECT(!isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(!isOffer(env, becky, bux(3), usd(3)));
 
         // alice creates an offer that can be auto-bridged with becky's
         // remaining offer.
-        MBUX.authorize({.account = carol});
-        env(pay(alice, carol, BUX(2)));
+        mbux.authorize({.account = carol});
+        env(pay(alice, carol, bux(2)));
 
-        env(offer(alice, BUX(2), XRP(2)));
+        env(offer(alice, bux(2), XRP(2)));
         env.close();
 
         // carol attempts the auto-bridge.  Again, the offer create fails
         // because the USD issuer is not in the ledger.
-        env(offer(carol, USD(2), BUX(2)), ter(tecNO_ISSUER));
+        env(offer(carol, usd(2), bux(2)), Ter(tecNO_ISSUER));
         env.close();
-        BEAST_EXPECT(isOffer(env, alice, BUX(2), XRP(2)));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
+        BEAST_EXPECT(isOffer(env, alice, bux(2), XRP(2)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
     }
 
     // Helper function that returns offers on an account sorted by sequence.
@@ -4179,16 +4180,16 @@ public:
         env.fund(XRP(10'000), gw, alice, bob);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Create four offers from the same account with identical quality
         // so they go in the same order book.  Each offer goes in a different
         // ledger so the chronology is clear.
-        std::uint32_t const offerId_0{env.seq(alice)};
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerId0{env.seq(alice)};
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create two tickets.
@@ -4197,71 +4198,71 @@ public:
         env.close();
 
         // Create another sequence-based offer.
-        std::uint32_t const offerId_1{env.seq(alice)};
-        BEAST_EXPECT(offerId_1 == offerId_0 + 4);
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerId1{env.seq(alice)};
+        BEAST_EXPECT(offerId1 == offerId0 + 4);
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create two ticket based offers in reverse order.
-        std::uint32_t const offerId_2{ticketSeq + 1};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerId_2));
+        std::uint32_t const offerId2{ticketSeq + 1};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerId2));
         env.close();
 
         // Create the last offer.
-        std::uint32_t const offerId_3{ticketSeq};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerId_3));
+        std::uint32_t const offerId3{ticketSeq};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerId3));
         env.close();
 
         // Verify that all of alice's offers are present.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 4);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_0);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId_2);
-            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerId_1);
-            env.require(balance(alice, USD(200)));
-            env.require(owners(alice, 5));
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId0);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId2);
+            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerId1);
+            env.require(Balance(alice, usd(200)));
+            env.require(Owners(alice, 5));
         }
 
         // Cross alice's first offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the first offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 3);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_2);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId2);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId1);
         }
 
         // Cross alice's second offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the second offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 2);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_2);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId2);
         }
 
         // Cross alice's third offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the third offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 1);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
         }
 
         // Cross alice's last offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the third offer alice created was consumed.
@@ -4269,10 +4270,10 @@ public:
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.empty());
         }
-        env.require(balance(alice, USD(0)));
-        env.require(owners(alice, 1));
-        env.require(balance(bob, USD(200)));
-        env.require(owners(bob, 1));
+        env.require(Balance(alice, usd(0)));
+        env.require(Owners(alice, 1));
+        env.require(Balance(bob, usd(200)));
+        env.require(Owners(bob, 1));
     }
 
     void
@@ -4291,99 +4292,99 @@ public:
         env.fund(XRP(10'000), gw, alice);
         env.close();
 
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice}});
 
-        env.require(owners(alice, 1), tickets(alice, 0));
+        env.require(Owners(alice, 1), tickets(alice, 0));
 
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Create the first of four offers using a sequence.
-        std::uint32_t const offerSeqId_0{env.seq(alice)};
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerSeqId0{env.seq(alice)};
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 0));
+        env.require(Owners(alice, 2), tickets(alice, 0));
 
         // Create four tickets.
         std::uint32_t const ticketSeq{env.seq(alice) + 1};
         env(ticket::create(alice, 4));
         env.close();
-        env.require(owners(alice, 6), tickets(alice, 4));
+        env.require(Owners(alice, 6), tickets(alice, 4));
 
         // Create the second (also sequence-based) offer.
-        std::uint32_t const offerSeqId_1{env.seq(alice)};
-        BEAST_EXPECT(offerSeqId_1 == offerSeqId_0 + 6);
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerSeqId1{env.seq(alice)};
+        BEAST_EXPECT(offerSeqId1 == offerSeqId0 + 6);
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create the third (ticket-based) offer.
-        std::uint32_t const offerTixId_0{ticketSeq + 1};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerTixId_0));
+        std::uint32_t const offerTixId0{ticketSeq + 1};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerTixId0));
         env.close();
 
         // Create the last offer.
-        std::uint32_t const offerTixId_1{ticketSeq};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerTixId_1));
+        std::uint32_t const offerTixId1{ticketSeq};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerTixId1));
         env.close();
 
         // Verify that all of alice's offers are present.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 4);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId_0);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerTixId_0);
-            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerSeqId_1);
-            env.require(balance(alice, USD(200)));
-            env.require(owners(alice, 7));
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId0);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerTixId0);
+            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerSeqId1);
+            env.require(Balance(alice, usd(200)));
+            env.require(Owners(alice, 7));
         }
 
         // Use a ticket to cancel an offer created with a sequence.
-        env(offer_cancel(alice, offerSeqId_0), ticket::use(ticketSeq + 2));
+        env(offerCancel(alice, offerSeqId0), ticket::Use(ticketSeq + 2));
         env.close();
 
         // Verify that offerSeqId_0 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 3);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId_0);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId0);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // Use a ticket to cancel an offer created with a ticket.
-        env(offer_cancel(alice, offerTixId_0), ticket::use(ticketSeq + 3));
+        env(offerCancel(alice, offerTixId0), ticket::Use(ticketSeq + 3));
         env.close();
 
         // Verify that offerTixId_0 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 2);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // All of alice's tickets should now be used up.
-        env.require(owners(alice, 3), tickets(alice, 0));
+        env.require(Owners(alice, 3), tickets(alice, 0));
 
         // Use a sequence to cancel an offer created with a ticket.
-        env(offer_cancel(alice, offerTixId_1));
+        env(offerCancel(alice, offerTixId1));
         env.close();
 
         // Verify that offerTixId_1 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 1);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // Use a sequence to cancel an offer created with a sequence.
-        env(offer_cancel(alice, offerSeqId_1));
+        env(offerCancel(alice, offerSeqId1));
         env.close();
 
         // Verify that offerSeqId_1 was canceled.
         // All of alice's tickets should now be used up.
-        env.require(owners(alice, 1), tickets(alice, 0), offers(alice, 0));
+        env.require(Owners(alice, 1), tickets(alice, 0), offers(alice, 0));
     }
 
     void
@@ -4402,20 +4403,20 @@ public:
             env.fund(XRP(1'000), maker, taker);
             env.close();
 
-            auto const USD =
+            auto const usd =
                 issue1({.env = env, .token = "USD", .issuer = issuer, .holders = {maker, taker}});
-            auto const EUR =
+            auto const eur =
                 issue2({.env = env, .token = "EUR", .issuer = issuer, .holders = {maker, taker}});
 
-            env(pay(issuer, maker, USD(1'000)));
-            env(pay(issuer, taker, USD(1'000)));
-            env(pay(issuer, maker, EUR(1'000)));
+            env(pay(issuer, maker, usd(1'000)));
+            env(pay(issuer, taker, usd(1'000)));
+            env(pay(issuer, maker, eur(1'000)));
             env.close();
 
-            auto makerUSDBalance = env.balance(maker, USD).value();
-            auto takerUSDBalance = env.balance(taker, USD).value();
-            auto makerEURBalance = env.balance(maker, EUR).value();
-            auto takerEURBalance = env.balance(taker, EUR).value();
+            auto makerUSDBalance = env.balance(maker, usd).value();
+            auto takerUSDBalance = env.balance(taker, usd).value();
+            auto makerEURBalance = env.balance(maker, eur).value();
+            auto takerEURBalance = env.balance(taker, eur).value();
             auto makerXRPBalance = env.balance(maker, XRP).value();
             auto takerXRPBalance = env.balance(taker, XRP).value();
 
@@ -4423,138 +4424,138 @@ public:
             {
                 TER const err = features[fixFillOrKill] ? TER(tesSUCCESS) : tecKILLED;
 
-                env(offer(maker, XRP(100), USD(100)));
+                env(offer(maker, XRP(100), usd(100)));
                 env.close();
 
-                env(offer(taker, USD(100), XRP(101)), txflags(tfFillOrKill), ter(err));
+                env(offer(taker, usd(100), XRP(101)), Txflags(tfFillOrKill), Ter(err));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 if (err == tesSUCCESS)
                 {
-                    makerUSDBalance -= USD(100);
-                    takerUSDBalance += USD(100);
+                    makerUSDBalance -= usd(100);
+                    takerUSDBalance += usd(100);
                     makerXRPBalance += XRP(100).value();
                     takerXRPBalance -= XRP(100).value();
                 }
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(100), XRP(100)));
+                env(offer(maker, usd(100), XRP(100)));
                 env.close();
 
-                env(offer(taker, XRP(100), USD(101)), txflags(tfFillOrKill), ter(err));
+                env(offer(taker, XRP(100), usd(101)), Txflags(tfFillOrKill), Ter(err));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 if (err == tesSUCCESS)
                 {
-                    makerUSDBalance += USD(100);
-                    takerUSDBalance -= USD(100);
+                    makerUSDBalance += usd(100);
+                    takerUSDBalance -= usd(100);
                     makerXRPBalance -= XRP(100).value();
                     takerXRPBalance += XRP(100).value();
                 }
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(100), EUR(100)));
+                env(offer(maker, usd(100), eur(100)));
                 env.close();
 
-                env(offer(taker, EUR(100), USD(101)), txflags(tfFillOrKill), ter(err));
+                env(offer(taker, eur(100), usd(101)), Txflags(tfFillOrKill), Ter(err));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 if (err == tesSUCCESS)
                 {
-                    makerUSDBalance += USD(100);
-                    takerUSDBalance -= USD(100);
-                    makerEURBalance -= EUR(100);
-                    takerEURBalance += EUR(100);
+                    makerUSDBalance += usd(100);
+                    takerUSDBalance -= usd(100);
+                    makerEURBalance -= eur(100);
+                    takerEURBalance += eur(100);
                 }
                 BEAST_EXPECT(expectOffers(env, taker, 0));
             }
 
             // tfFillOrKill + tfSell, TakerGets must be filled
             {
-                env(offer(maker, XRP(101), USD(101)));
+                env(offer(maker, XRP(101), usd(101)));
                 env.close();
 
-                env(offer(taker, USD(100), XRP(101)), txflags(tfFillOrKill | tfSell));
+                env(offer(taker, usd(100), XRP(101)), Txflags(tfFillOrKill | tfSell));
                 env.close();
 
-                makerUSDBalance -= USD(101);
-                takerUSDBalance += USD(101);
-                makerXRPBalance += XRP(101).value() - txfee(env, 1);
-                takerXRPBalance -= XRP(101).value() + txfee(env, 1);
+                makerUSDBalance -= usd(101);
+                takerUSDBalance += usd(101);
+                makerXRPBalance += XRP(101).value() - txFee(env, 1);
+                takerXRPBalance -= XRP(101).value() + txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(101), XRP(101)));
+                env(offer(maker, usd(101), XRP(101)));
                 env.close();
 
-                env(offer(taker, XRP(100), USD(101)), txflags(tfFillOrKill | tfSell));
+                env(offer(taker, XRP(100), usd(101)), Txflags(tfFillOrKill | tfSell));
                 env.close();
 
-                makerUSDBalance += USD(101);
-                takerUSDBalance -= USD(101);
-                makerXRPBalance -= XRP(101).value() + txfee(env, 1);
-                takerXRPBalance += XRP(101).value() - txfee(env, 1);
+                makerUSDBalance += usd(101);
+                takerUSDBalance -= usd(101);
+                makerXRPBalance -= XRP(101).value() + txFee(env, 1);
+                takerXRPBalance += XRP(101).value() - txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(101), EUR(101)));
+                env(offer(maker, usd(101), eur(101)));
                 env.close();
 
-                env(offer(taker, EUR(100), USD(101)), txflags(tfFillOrKill | tfSell));
+                env(offer(taker, eur(100), usd(101)), Txflags(tfFillOrKill | tfSell));
                 env.close();
 
-                makerUSDBalance += USD(101);
-                takerUSDBalance -= USD(101);
-                makerEURBalance -= EUR(101);
-                takerEURBalance += EUR(101);
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerUSDBalance += usd(101);
+                takerUSDBalance -= usd(101);
+                makerEURBalance -= eur(101);
+                takerEURBalance += eur(101);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
             }
 
             // Fail regardless of fixFillOrKill amendment
             for (auto const flags : {tfFillOrKill, tfFillOrKill + tfSell})
             {
-                env(offer(maker, XRP(100), USD(100)));
+                env(offer(maker, XRP(100), usd(100)));
                 env.close();
 
-                env(offer(taker, USD(100), XRP(99)), txflags(flags), ter(tecKILLED));
+                env(offer(taker, usd(100), XRP(99)), Txflags(flags), Ter(tecKILLED));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(100), XRP(100)));
+                env(offer(maker, usd(100), XRP(100)));
                 env.close();
 
-                env(offer(taker, XRP(100), USD(99)), txflags(flags), ter(tecKILLED));
+                env(offer(taker, XRP(100), usd(99)), Txflags(flags), Ter(tecKILLED));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
 
-                env(offer(maker, USD(100), EUR(100)));
+                env(offer(maker, usd(100), eur(100)));
                 env.close();
 
-                env(offer(taker, EUR(100), USD(99)), txflags(flags), ter(tecKILLED));
+                env(offer(taker, eur(100), usd(99)), Txflags(flags), Ter(tecKILLED));
                 env.close();
 
-                makerXRPBalance -= txfee(env, 1);
-                takerXRPBalance -= txfee(env, 1);
+                makerXRPBalance -= txFee(env, 1);
+                takerXRPBalance -= txFee(env, 1);
                 BEAST_EXPECT(expectOffers(env, taker, 0));
             }
 
             BEAST_EXPECT(
-                env.balance(maker, USD) == makerUSDBalance &&
-                env.balance(taker, USD) == takerUSDBalance &&
-                env.balance(maker, EUR) == makerEURBalance &&
-                env.balance(taker, EUR) == takerEURBalance &&
+                env.balance(maker, usd) == makerUSDBalance &&
+                env.balance(taker, usd) == takerUSDBalance &&
+                env.balance(maker, eur) == makerEURBalance &&
+                env.balance(taker, eur) == takerEURBalance &&
                 env.balance(maker, XRP) == makerXRPBalance &&
                 env.balance(taker, XRP) == takerXRPBalance);
         };
@@ -4572,8 +4573,8 @@ public:
         auto const alice = Account{"alice"};
 
         auto getIOU = [&](Env& env) -> PrettyAsset {
-            static int i = 0;
-            std::string const name = "IO" + std::to_string(i++);
+            static int kI = 0;
+            std::string const name = "IO" + std::to_string(kI++);
             auto const iou = gw[name];
             env(trust(alice, iou(1'000)));
             env(pay(gw, alice, iou(100)));
@@ -4613,8 +4614,8 @@ public:
             env.fund(XRP(10'000), gw, alice);
             env.close();
 
-            auto const XTS = t.toAsset1(env);
-            auto const XXX = t.toAsset2(env);
+            auto const xts = t.toAsset1(env);
+            auto const xxx = t.toAsset2(env);
 
             auto tokenType = [](PrettyAsset const& asset) -> std::string {
                 return asset.raw().visit(
@@ -4622,7 +4623,7 @@ public:
                     [&](MPTIssue const&) { return "MPTIssue"; });
             };
 
-            testcase << "offer: " << tokenType(XTS) << "/" << tokenType(XXX);
+            testcase << "offer: " << tokenType(xts) << "/" << tokenType(xxx);
 
             {
                 // Gateway sets its tick size to 5
@@ -4632,10 +4633,10 @@ public:
                 BEAST_EXPECT((*env.le(gw))[sfTickSize] == 5);
             }
 
-            env(offer(alice, XTS(t.val1), XXX(t.val2)));
-            env(offer(alice, XTS(t.val2), XXX(t.val1)));
-            env(offer(alice, XTS(t.val1), XXX(t.val2)), json(jss::Flags, tfSell));
-            env(offer(alice, XTS(t.val2), XXX(t.val1)), json(jss::Flags, tfSell));
+            env(offer(alice, xts(t.val1), xxx(t.val2)));
+            env(offer(alice, xts(t.val2), xxx(t.val1)));
+            env(offer(alice, xts(t.val1), xxx(t.val2)), Json(jss::Flags, tfSell));
+            env(offer(alice, xts(t.val2), xxx(t.val1)), Json(jss::Flags, tfSell));
 
             std::map<std::uint32_t, std::pair<STAmount, STAmount>> offers;
             forEachItem(*env.current(), alice, [&](std::shared_ptr<SLE const> const& sle) {
@@ -4650,51 +4651,51 @@ public:
             // first offer
             auto it = offers.begin();
             BEAST_EXPECT(it != offers.end());
-            if (XXX.native() && !XTS.holds<MPTIssue>())
+            if (xxx.native() && !xts.holds<MPTIssue>())
             {
                 BEAST_EXPECT(
-                    it->second.first == XTS(t.val1) && it->second.second == XRPAmount(29'999'400));
+                    it->second.first == xts(t.val1) && it->second.second == XRPAmount(29'999'400));
             }
-            else if (!XXX.integral())
+            else if (!xxx.integral())
             {
                 BEAST_EXPECT(
-                    it->second.first == XTS(t.val1) && it->second.second < XXX(t.val2) &&
-                    it->second.second > STAmount(XXX, 29'9994, -4));
+                    it->second.first == xts(t.val1) && it->second.second < xxx(t.val2) &&
+                    it->second.second > STAmount(xxx, 29'9994, -4));
             }
             else
             {
-                BEAST_EXPECT(it->second.first == XTS(t.val1) && it->second.second == XXX(t.val2));
+                BEAST_EXPECT(it->second.first == xts(t.val1) && it->second.second == xxx(t.val2));
             }
 
             // second offer
             ++it;
             BEAST_EXPECT(it != offers.end());
-            BEAST_EXPECT(it->second.first == XTS(t.val2) && it->second.second == XXX(t.val1));
+            BEAST_EXPECT(it->second.first == xts(t.val2) && it->second.second == xxx(t.val1));
 
             // third offer
             ++it;
             BEAST_EXPECT(it != offers.end());
-            if (XTS.native() && !XXX.holds<MPTIssue>())
+            if (xts.native() && !xxx.holds<MPTIssue>())
             {
                 BEAST_EXPECT(
-                    it->second.first == XRPAmount(10'000'200) && it->second.second == XXX(t.val2));
+                    it->second.first == XRPAmount(10'000'200) && it->second.second == xxx(t.val2));
             }
-            else if (!XTS.integral())
+            else if (!xts.integral())
             {
                 BEAST_EXPECT(
-                    it->second.first == STAmount(XTS, 10'0002, -4) &&
-                    it->second.second == XXX(t.val2));
+                    it->second.first == STAmount(xts, 10'0002, -4) &&
+                    it->second.second == xxx(t.val2));
             }
             else
             {
-                BEAST_EXPECT(it->second.first == XTS(t.val1) && it->second.second == XXX(t.val2));
+                BEAST_EXPECT(it->second.first == xts(t.val1) && it->second.second == xxx(t.val2));
             }
 
             // fourth offer
             // exact TakerPays is XTS(1/.033333)
             ++it;
             BEAST_EXPECT(it != offers.end());
-            BEAST_EXPECT(it->second.first == XTS(t.val2) && it->second.second == XXX(t.val1));
+            BEAST_EXPECT(it->second.first == xts(t.val2) && it->second.second == xxx(t.val1));
 
             BEAST_EXPECT(++it == offers.end());
         }
@@ -4762,8 +4763,8 @@ public:
     run() override
     {
         using namespace jtx;
-        static FeatureBitset const all{testable_amendments()};
-        testAll(all);
+        static FeatureBitset const kALL{testableAmendments()};
+        testAll(kALL);
     }
 };
 
diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp
index 9cd3724b7b..72d1c29b42 100644
--- a/src/test/app/OfferStream_test.cpp
+++ b/src/test/app/OfferStream_test.cpp
@@ -2,7 +2,7 @@
 
 namespace xrpl {
 
-class OfferStream_test : public beast::unit_test::suite
+class OfferStream_test : public beast::unit_test::Suite
 {
 public:
     void
diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp
index 78bdd3fef2..5d5f16981c 100644
--- a/src/test/app/Offer_test.cpp
+++ b/src/test/app/Offer_test.cpp
@@ -56,7 +56,7 @@
 
 namespace xrpl::test {
 
-class OfferBaseUtil_test : public beast::unit_test::suite
+class OfferBaseUtil_test : public beast::unit_test::Suite
 {
     static XRPAmount
     reserve(jtx::Env& env, std::uint32_t count)
@@ -71,23 +71,23 @@ class OfferBaseUtil_test : public beast::unit_test::suite
     }
 
     static auto
-    ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offer_seq)
+    ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offerSeq)
     {
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::offer][jss::account] = acct.human();
-        jvParams[jss::offer][jss::seq] = offer_seq;
+        jvParams[jss::offer][jss::seq] = offerSeq;
         return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
     }
 
     static auto
-    getBookOffers(jtx::Env& env, Issue const& taker_pays, Issue const& taker_gets)
+    getBookOffers(jtx::Env& env, Issue const& takerPays, Issue const& takerGets)
     {
-        Json::Value jvbp;
+        json::Value jvbp;
         jvbp[jss::ledger_index] = "current";
-        jvbp[jss::taker_pays][jss::currency] = to_string(taker_pays.currency);
-        jvbp[jss::taker_pays][jss::issuer] = to_string(taker_pays.account);
-        jvbp[jss::taker_gets][jss::currency] = to_string(taker_gets.currency);
-        jvbp[jss::taker_gets][jss::issuer] = to_string(taker_gets.account);
+        jvbp[jss::taker_pays][jss::currency] = to_string(takerPays.currency);
+        jvbp[jss::taker_pays][jss::issuer] = to_string(takerPays.account);
+        jvbp[jss::taker_gets][jss::currency] = to_string(takerGets.currency);
+        jvbp[jss::taker_gets][jss::issuer] = to_string(takerGets.account);
         return env.rpc("json", "book_offers", to_string(jvbp))[jss::result];
     }
 
@@ -110,46 +110,46 @@ public:
         Env env{*this, features};
 
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
-        auto const BTC = gw["BTC"];
+        auto const usd = gw["USD"];
+        auto const btc = gw["BTC"];
         Account const alice{"alice"};
         Account const bob{"bob"};
         Account const carol{"carol"};
 
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
-        env.trust(USD(1000), alice, bob, carol);
-        env.trust(BTC(1000), alice, bob, carol);
+        env.trust(usd(1000), alice, bob, carol);
+        env.trust(btc(1000), alice, bob, carol);
 
-        env(pay(gw, alice, BTC(1000)));
+        env(pay(gw, alice, btc(1000)));
 
-        env(pay(gw, carol, USD(1000)));
-        env(pay(gw, carol, BTC(1000)));
+        env(pay(gw, carol, usd(1000)));
+        env(pay(gw, carol, btc(1000)));
 
         // Must be two offers at the same quality
         // "taker gets" must be XRP
         // (Different amounts so I can distinguish the offers)
-        env(offer(carol, BTC(49), XRP(49)));
-        env(offer(carol, BTC(51), XRP(51)));
+        env(offer(carol, btc(49), XRP(49)));
+        env(offer(carol, btc(51), XRP(51)));
 
         // Offers for the poor quality path
         // Must be two offers at the same quality
-        env(offer(carol, XRP(50), USD(50)));
-        env(offer(carol, XRP(50), USD(50)));
+        env(offer(carol, XRP(50), usd(50)));
+        env(offer(carol, XRP(50), usd(50)));
 
         // Offers for the good quality path
-        env(offer(carol, BTC(1), USD(100)));
+        env(offer(carol, btc(1), usd(100)));
 
-        PathSet const paths(Path(XRP, USD), Path(USD));
+        PathSet const paths(TestPath(XRP, usd), TestPath(usd));
 
-        env(pay(alice, bob, USD(100)),
-            json(paths.json()),
-            sendmax(BTC(1000)),
-            txflags(tfPartialPayment));
+        env(pay(alice, bob, usd(100)),
+            Json(paths.json()),
+            Sendmax(btc(1000)),
+            Txflags(tfPartialPayment));
 
-        env.require(balance(bob, USD(100)));
+        env.require(Balance(bob, usd(100)));
         BEAST_EXPECT(
-            !isOffer(env, carol, BTC(1), USD(100)) && isOffer(env, carol, BTC(49), XRP(49)));
+            !isOffer(env, carol, btc(1), usd(100)) && isOffer(env, carol, btc(49), XRP(49)));
     }
 
     void
@@ -162,70 +162,70 @@ public:
 
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, gw);
         env.close();
-        env.trust(USD(100), alice);
+        env.trust(usd(100), alice);
         env.close();
 
-        env(pay(gw, alice, USD(50)));
+        env(pay(gw, alice, usd(50)));
         env.close();
 
         auto const offer1Seq = env.seq(alice);
 
-        env(offer(alice, XRP(500), USD(100)), require(offers(alice, 1)));
+        env(offer(alice, XRP(500), usd(100)), Require(offers(alice, 1)));
         env.close();
 
-        BEAST_EXPECT(isOffer(env, alice, XRP(500), USD(100)));
+        BEAST_EXPECT(isOffer(env, alice, XRP(500), usd(100)));
 
         // cancel the offer above and replace it with a new offer
         auto const offer2Seq = env.seq(alice);
 
-        env(offer(alice, XRP(300), USD(100)),
-            json(jss::OfferSequence, offer1Seq),
-            require(offers(alice, 1)));
+        env(offer(alice, XRP(300), usd(100)),
+            Json(jss::OfferSequence, offer1Seq),
+            Require(offers(alice, 1)));
         env.close();
 
         BEAST_EXPECT(
-            isOffer(env, alice, XRP(300), USD(100)) && !isOffer(env, alice, XRP(500), USD(100)));
+            isOffer(env, alice, XRP(300), usd(100)) && !isOffer(env, alice, XRP(500), usd(100)));
 
         // Test canceling non-existent offer.
         //      auto const offer3Seq = env.seq (alice);
 
-        env(offer(alice, XRP(400), USD(200)),
-            json(jss::OfferSequence, offer1Seq),
-            require(offers(alice, 2)));
+        env(offer(alice, XRP(400), usd(200)),
+            Json(jss::OfferSequence, offer1Seq),
+            Require(offers(alice, 2)));
         env.close();
 
         BEAST_EXPECT(
-            isOffer(env, alice, XRP(300), USD(100)) && isOffer(env, alice, XRP(400), USD(200)));
+            isOffer(env, alice, XRP(300), usd(100)) && isOffer(env, alice, XRP(400), usd(200)));
 
         // Test cancellation now with OfferCancel tx
         auto const offer4Seq = env.seq(alice);
-        env(offer(alice, XRP(222), USD(111)), require(offers(alice, 3)));
+        env(offer(alice, XRP(222), usd(111)), Require(offers(alice, 3)));
         env.close();
 
-        BEAST_EXPECT(isOffer(env, alice, XRP(222), USD(111)));
-        env(offer_cancel(alice, offer4Seq));
+        BEAST_EXPECT(isOffer(env, alice, XRP(222), usd(111)));
+        env(offerCancel(alice, offer4Seq));
         env.close();
         BEAST_EXPECT(env.seq(alice) == offer4Seq + 2);
 
-        BEAST_EXPECT(!isOffer(env, alice, XRP(222), USD(111)));
+        BEAST_EXPECT(!isOffer(env, alice, XRP(222), usd(111)));
 
         // Create an offer that both fails with a tecEXPIRED code and removes
         // an offer.  Show that the attempt to remove the offer fails.
         env.require(offers(alice, 2));
 
-        env(offer(alice, XRP(5), USD(2)),
-            json(sfExpiration.fieldName, lastClose(env)),
-            json(jss::OfferSequence, offer2Seq),
-            ter(tecEXPIRED));
+        env(offer(alice, XRP(5), usd(2)),
+            Json(sfExpiration.fieldName, lastClose(env)),
+            Json(jss::OfferSequence, offer2Seq),
+            Ter(tecEXPIRED));
         env.close();
 
         env.require(offers(alice, 2));
-        BEAST_EXPECT(isOffer(env, alice, XRP(300), USD(100)));  // offer2
-        BEAST_EXPECT(!isOffer(env, alice, XRP(5), USD(2)));     // expired
+        BEAST_EXPECT(isOffer(env, alice, XRP(300), usd(100)));  // offer2
+        BEAST_EXPECT(!isOffer(env, alice, XRP(5), usd(2)));     // expired
     }
 
     void
@@ -241,26 +241,26 @@ public:
         auto const carol = Account{"carol"};
         auto const gw = Account{"gw"};
 
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         Env env{*this, features};
 
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
-        env.trust(USD(1000), alice, bob, carol);
-        env.trust(EUR(1000), alice, bob, carol);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, carol, EUR(100)));
+        env.trust(usd(1000), alice, bob, carol);
+        env.trust(eur(1000), alice, bob, carol);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, carol, eur(100)));
 
         // Create more offers than the loop max count in DeliverNodeReverse
         // Note: the DeliverNodeReverse code has been removed; however since
         // this is a regression test the original test is being left as-is for
         // now.
         for (int i = 0; i < 101; ++i)
-            env(offer(carol, USD(1), EUR(2)));
+            env(offer(carol, usd(1), eur(2)));
 
-        env(pay(alice, bob, EUR(epsilon)), path(~EUR), sendmax(USD(100)));
+        env(pay(alice, bob, eur(kEPSILON)), Path(~eur), Sendmax(usd(100)));
     }
 
     void
@@ -292,16 +292,16 @@ public:
         auto const erin = Account{"erin"};
         auto const gw = Account{"gw"};
 
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         Env env{*this, features};
 
         env.fund(XRP(10000), alice, bob, carol, dan, erin, gw);
         env.close();
-        env.trust(USD(1000), alice, bob, carol, dan, erin);
+        env.trust(usd(1000), alice, bob, carol, dan, erin);
         env.close();
-        env(pay(gw, carol, USD(0.99999)));
-        env(pay(gw, dan, USD(1)));
-        env(pay(gw, erin, USD(1)));
+        env(pay(gw, carol, usd(0.99999)));
+        env(pay(gw, dan, usd(1)));
+        env(pay(gw, erin, usd(1)));
         env.close();
 
         // Carol doesn't quite have enough funds for this offer
@@ -309,10 +309,10 @@ public:
         // STAmount to incorrectly round to zero when the next offer
         // (at a good quality) is considered. (when the now removed
         // stAmountCalcSwitchover2 patch was inactive)
-        env(offer(carol, drops(1), USD(0.99999)));
+        env(offer(carol, drops(1), usd(0.99999)));
         // Offer at a quality poor enough so when the input xrp is
         // calculated  in the reverse pass, the amount is not zero.
-        env(offer(dan, XRP(100), USD(1)));
+        env(offer(dan, XRP(100), usd(1)));
 
         env.close();
         // This is the funded offer that will be incorrectly removed.
@@ -321,18 +321,18 @@ public:
         // needed for this offer, it will incorrectly compute zero in both
         // the forward and reverse passes (when the now removed
         // stAmountCalcSwitchover2 was inactive.)
-        env(offer(erin, drops(2), USD(1)));
+        env(offer(erin, drops(2), usd(1)));
 
-        env(pay(alice, bob, USD(1)),
-            path(~USD),
-            sendmax(XRP(102)),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(alice, bob, usd(1)),
+            Path(~usd),
+            Sendmax(XRP(102)),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
         env.require(offers(carol, 0), offers(dan, 1));
 
         // offer was correctly consumed. There is still some
         // liquidity left on that offer.
-        env.require(balance(erin, USD(0.99999)), offers(erin, 1));
+        env.require(Balance(erin, usd(0.99999)), offers(erin, 1));
     }
 
     void
@@ -352,7 +352,7 @@ public:
         auto const carol = Account{"carol"};
         auto const gw = Account{"gw"};
 
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Test offer crossing
         for (auto crossBothOffers : {false, true})
@@ -361,39 +361,39 @@ public:
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
             // underfund carol's offer
-            auto initialCarolUSD = USD(0.499);
+            auto initialCarolUSD = usd(0.499);
             env(pay(gw, carol, initialCarolUSD));
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
             env.close();
             // This offer is underfunded
-            env(offer(carol, drops(1), USD(1)));
+            env(offer(carol, drops(1), usd(1)));
             env.close();
             // offer at a lower quality
-            env(offer(bob, drops(2), USD(1), tfPassive));
+            env(offer(bob, drops(2), usd(1), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
             // alice places an offer that crosses carol's; depending on
             // "crossBothOffers" it may cross bob's as well
             auto aliceTakerGets = crossBothOffers ? drops(2) : drops(1);
-            env(offer(alice, USD(1), aliceTakerGets));
+            env(offer(alice, usd(1), aliceTakerGets));
             env.close();
 
             env.require(
                 offers(carol, 0),
-                balance(
+                Balance(
                     carol,
                     initialCarolUSD));  // offer is removed but not taken
             if (crossBothOffers)
             {
-                env.require(offers(alice, 0), balance(alice, USD(1)));  // alice's offer is crossed
+                env.require(offers(alice, 0), Balance(alice, usd(1)));  // alice's offer is crossed
             }
             else
             {
                 env.require(
-                    offers(alice, 1), balance(alice, USD(0)));  // alice's offer is not crossed
+                    offers(alice, 1), Balance(alice, usd(0)));  // alice's offer is not crossed
             }
         }
 
@@ -404,16 +404,16 @@ public:
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
             env.close();
-            auto const initialCarolUSD = USD(0.999);
+            auto const initialCarolUSD = usd(0.999);
             env(pay(gw, carol, initialCarolUSD));
             env.close();
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
             env.close();
-            env(offer(carol, drops(1), USD(1)));
+            env(offer(carol, drops(1), usd(1)));
             env.close();
-            env(offer(bob, drops(2), USD(2), tfPassive));
+            env(offer(bob, drops(2), usd(2), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
@@ -422,17 +422,17 @@ public:
 
             TER const expectedTer = partialPayment ? TER{tesSUCCESS} : TER{tecPATH_PARTIAL};
 
-            env(pay(alice, bob, USD(5)),
-                path(~USD),
-                sendmax(XRP(1)),
-                txflags(flags),
-                ter(expectedTer));
+            env(pay(alice, bob, usd(5)),
+                Path(~usd),
+                Sendmax(XRP(1)),
+                Txflags(flags),
+                Ter(expectedTer));
             env.close();
 
             if (isTesSuccess(expectedTer))
             {
                 env.require(offers(carol, 0));
-                env.require(balance(carol,
+                env.require(Balance(carol,
                                     initialCarolUSD));  // offer is removed but not taken
             }
             else
@@ -462,8 +462,8 @@ public:
         auto const carol = Account{"carol"};
         auto const gw = Account{"gw"};
 
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         auto tinyAmount = [&](IOU const& iou) -> PrettyAmount {
             STAmount const amt(
@@ -480,42 +480,42 @@ public:
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(EUR(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(eur(1000), alice, bob, carol);
             // underfund carol's offer
-            auto initialCarolUSD = tinyAmount(USD);
+            auto initialCarolUSD = tinyAmount(usd);
             env(pay(gw, carol, initialCarolUSD));
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, alice, EUR(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, alice, eur(100)));
             env.close();
             // This offer is underfunded
-            env(offer(carol, EUR(1), USD(10)));
+            env(offer(carol, eur(1), usd(10)));
             env.close();
             // offer at a lower quality
-            env(offer(bob, EUR(1), USD(5), tfPassive));
+            env(offer(bob, eur(1), usd(5), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
             // alice places an offer that crosses carol's; depending on
             // "crossBothOffers" it may cross bob's as well
             // Whatever
-            auto aliceTakerGets = crossBothOffers ? EUR(0.2) : EUR(0.1);
-            env(offer(alice, USD(1), aliceTakerGets));
+            auto aliceTakerGets = crossBothOffers ? eur(0.2) : eur(0.1);
+            env(offer(alice, usd(1), aliceTakerGets));
             env.close();
 
             env.require(
                 offers(carol, 0),
-                balance(
+                Balance(
                     carol,
                     initialCarolUSD));  // offer is removed but not taken
             if (crossBothOffers)
             {
-                env.require(offers(alice, 0), balance(alice, USD(1)));  // alice's offer is crossed
+                env.require(offers(alice, 0), Balance(alice, usd(1)));  // alice's offer is crossed
             }
             else
             {
                 env.require(
-                    offers(alice, 1), balance(alice, USD(0)));  // alice's offer is not crossed
+                    offers(alice, 1), Balance(alice, usd(0)));  // alice's offer is not crossed
             }
         }
 
@@ -526,19 +526,19 @@ public:
 
             env.fund(XRP(10000), alice, bob, carol, gw);
             env.close();
-            env.trust(USD(1000), alice, bob, carol);
-            env.trust(EUR(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
+            env.trust(eur(1000), alice, bob, carol);
             env.close();
             // underfund carol's offer
-            auto const initialCarolUSD = tinyAmount(USD);
+            auto const initialCarolUSD = tinyAmount(usd);
             env(pay(gw, carol, initialCarolUSD));
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, alice, EUR(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, alice, eur(100)));
             env.close();
             // This offer is underfunded
-            env(offer(carol, EUR(1), USD(2)));
+            env(offer(carol, eur(1), usd(2)));
             env.close();
-            env(offer(bob, EUR(2), USD(4), tfPassive));
+            env(offer(bob, eur(2), usd(4), tfPassive));
             env.close();
             env.require(offers(bob, 1), offers(carol, 1));
 
@@ -547,17 +547,17 @@ public:
 
             TER const expectedTer = partialPayment ? TER{tesSUCCESS} : TER{tecPATH_PARTIAL};
 
-            env(pay(alice, bob, USD(5)),
-                path(~USD),
-                sendmax(EUR(10)),
-                txflags(flags),
-                ter(expectedTer));
+            env(pay(alice, bob, usd(5)),
+                Path(~usd),
+                Sendmax(eur(10)),
+                Txflags(flags),
+                Ter(expectedTer));
             env.close();
 
             if (isTesSuccess(expectedTer))
             {
                 env.require(offers(carol, 0));
-                env.require(balance(carol,
+                env.require(Balance(carol,
                                     initialCarolUSD));  // offer is removed but not taken
             }
             else
@@ -578,9 +578,9 @@ public:
         using namespace jtx;
 
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
-        auto const BTC = gw["BTC"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const btc = gw["BTC"];
+        auto const eur = gw["EUR"];
         Account const alice{"alice"};
         Account const bob{"bob"};
         Account const carol{"carol"};
@@ -591,58 +591,58 @@ public:
             Env env{*this, features};
 
             auto const gw1 = Account{"gw1"};
-            auto const USD1 = gw1["USD"];
+            auto const usD1 = gw1["USD"];
             auto const gw2 = Account{"gw2"};
-            auto const USD2 = gw2["USD"];
+            auto const usD2 = gw2["USD"];
 
             env.fund(XRP(10000), alice, noripple(bob), carol, dan, gw1, gw2);
             env.close();
-            env.trust(USD1(1000), alice, carol, dan);
-            env(trust(bob, USD1(1000), tfSetNoRipple));
-            env.trust(USD2(1000), alice, carol, dan);
-            env(trust(bob, USD2(1000), tfSetNoRipple));
+            env.trust(usD1(1000), alice, carol, dan);
+            env(trust(bob, usD1(1000), tfSetNoRipple));
+            env.trust(usD2(1000), alice, carol, dan);
+            env(trust(bob, usD2(1000), tfSetNoRipple));
 
-            env(pay(gw1, dan, USD1(50)));
-            env(pay(gw1, bob, USD1(50)));
-            env(pay(gw2, bob, USD2(50)));
+            env(pay(gw1, dan, usD1(50)));
+            env(pay(gw1, bob, usD1(50)));
+            env(pay(gw2, bob, usD2(50)));
 
-            env(offer(dan, XRP(50), USD1(50)));
+            env(offer(dan, XRP(50), usD1(50)));
 
-            env(pay(alice, carol, USD2(50)),
-                path(~USD1, bob),
-                sendmax(XRP(50)),
-                txflags(tfNoRippleDirect),
-                ter(tecPATH_DRY));
+            env(pay(alice, carol, usD2(50)),
+                Path(~usD1, bob),
+                Sendmax(XRP(50)),
+                Txflags(tfNoRippleDirect),
+                Ter(tecPATH_DRY));
         }
         {
             // Make sure payment works with default flags
             Env env{*this, features};
 
             auto const gw1 = Account{"gw1"};
-            auto const USD1 = gw1["USD"];
+            auto const usD1 = gw1["USD"];
             auto const gw2 = Account{"gw2"};
-            auto const USD2 = gw2["USD"];
+            auto const usD2 = gw2["USD"];
 
             env.fund(XRP(10000), alice, bob, carol, dan, gw1, gw2);
             env.close();
-            env.trust(USD1(1000), alice, bob, carol, dan);
-            env.trust(USD2(1000), alice, bob, carol, dan);
+            env.trust(usD1(1000), alice, bob, carol, dan);
+            env.trust(usD2(1000), alice, bob, carol, dan);
 
-            env(pay(gw1, dan, USD1(50)));
-            env(pay(gw1, bob, USD1(50)));
-            env(pay(gw2, bob, USD2(50)));
+            env(pay(gw1, dan, usD1(50)));
+            env(pay(gw1, bob, usD1(50)));
+            env(pay(gw2, bob, usD2(50)));
 
-            env(offer(dan, XRP(50), USD1(50)));
+            env(offer(dan, XRP(50), usD1(50)));
 
-            env(pay(alice, carol, USD2(50)),
-                path(~USD1, bob),
-                sendmax(XRP(50)),
-                txflags(tfNoRippleDirect));
+            env(pay(alice, carol, usD2(50)),
+                Path(~usD1, bob),
+                Sendmax(XRP(50)),
+                Txflags(tfNoRippleDirect));
 
-            env.require(balance(alice, xrpMinusFee(env, 10000 - 50)));
-            env.require(balance(bob, USD1(100)));
-            env.require(balance(bob, USD2(0)));
-            env.require(balance(carol, USD2(50)));
+            env.require(Balance(alice, xrpMinusFee(env, 10000 - 50)));
+            env.require(Balance(bob, usD1(100)));
+            env.require(Balance(bob, usD2(0)));
+            env.require(Balance(carol, usD2(50)));
         }
     }
 
@@ -663,9 +663,9 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
         auto const carol = Account{"carol"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const usdOffer = USD(1000);
+        auto const usdOffer = usd(1000);
         auto const xrpOffer = XRP(1000);
 
         // No crossing:
@@ -679,11 +679,11 @@ public:
 
             env.fund(r + f, alice);
 
-            env(trust(alice, usdOffer), ter(tesSUCCESS));
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tecINSUF_RESERVE_OFFER));
+            env(trust(alice, usdOffer), Ter(tesSUCCESS));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tecINSUF_RESERVE_OFFER));
 
-            env.require(balance(alice, r - f), owners(alice, 1));
+            env.require(Balance(alice, r - f), Owners(alice, 1));
         }
 
         // Partial cross:
@@ -695,25 +695,25 @@ public:
             auto const f = env.current()->fees().base;
             auto const r = reserve(env, 0);
 
-            auto const usdOffer2 = USD(500);
+            auto const usdOffer2 = usd(500);
             auto const xrpOffer2 = XRP(500);
 
             env.fund(r + f + xrpOffer, bob);
 
-            env(offer(bob, usdOffer2, xrpOffer2), ter(tesSUCCESS));
+            env(offer(bob, usdOffer2, xrpOffer2), Ter(tesSUCCESS));
             env.fund(r + f, alice);
 
-            env(trust(alice, usdOffer), ter(tesSUCCESS));
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tesSUCCESS));
+            env(trust(alice, usdOffer), Ter(tesSUCCESS));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, r - f + xrpOffer2),
-                balance(alice, usdOffer2),
-                owners(alice, 1),
-                balance(bob, r + xrpOffer2),
-                balance(bob, usdOffer2),
-                owners(bob, 1));
+                Balance(alice, r - f + xrpOffer2),
+                Balance(alice, usdOffer2),
+                Owners(alice, 1),
+                Balance(bob, r + xrpOffer2),
+                Balance(bob, usdOffer2),
+                Owners(bob, 1));
         }
 
         // Account has enough reserve as is, but not enough
@@ -727,30 +727,30 @@ public:
             auto const f = env.current()->fees().base;
             auto const r = reserve(env, 0);
 
-            auto const usdOffer2 = USD(500);
+            auto const usdOffer2 = usd(500);
             auto const xrpOffer2 = XRP(500);
 
             env.fund(r + f + xrpOffer, bob, carol);
 
-            env(offer(bob, usdOffer2, xrpOffer2), ter(tesSUCCESS));
-            env(offer(carol, usdOffer, xrpOffer), ter(tesSUCCESS));
+            env(offer(bob, usdOffer2, xrpOffer2), Ter(tesSUCCESS));
+            env(offer(carol, usdOffer, xrpOffer), Ter(tesSUCCESS));
 
             env.fund(r + f, alice);
 
-            env(trust(alice, usdOffer), ter(tesSUCCESS));
-            env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
-            env(offer(alice, xrpOffer, usdOffer), ter(tesSUCCESS));
+            env(trust(alice, usdOffer), Ter(tesSUCCESS));
+            env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
+            env(offer(alice, xrpOffer, usdOffer), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, r - f + xrpOffer),
-                balance(alice, USD(0)),
-                owners(alice, 1),
-                balance(bob, r + xrpOffer2),
-                balance(bob, usdOffer2),
-                owners(bob, 1),
-                balance(carol, r + xrpOffer2),
-                balance(carol, usdOffer2),
-                owners(carol, 2));
+                Balance(alice, r - f + xrpOffer),
+                Balance(alice, usd(0)),
+                Owners(alice, 1),
+                Balance(bob, r + xrpOffer2),
+                Balance(bob, usdOffer2),
+                Owners(bob, 1),
+                Balance(carol, r + xrpOffer2),
+                Balance(carol, usdOffer2),
+                Owners(carol, 2));
         }
     }
 
@@ -777,7 +777,7 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Fill or Kill - unless we fully cross, just charge a fee and don't
         // place the offer on the books.  But also clean up expired offers
@@ -791,48 +791,48 @@ public:
             env.close();
 
             // bob creates an offer that expires before the next ledger close.
-            env(offer(bob, USD(500), XRP(500)),
-                json(sfExpiration.fieldName, lastClose(env) + 1),
-                ter(tesSUCCESS));
+            env(offer(bob, usd(500), XRP(500)),
+                Json(sfExpiration.fieldName, lastClose(env) + 1),
+                Ter(tesSUCCESS));
 
             // The offer expires (it's not removed yet).
             env.close();
-            env.require(owners(bob, 1), offers(bob, 1));
+            env.require(Owners(bob, 1), offers(bob, 1));
 
             // bob creates the offer that will be crossed.
-            env(offer(bob, USD(500), XRP(500)), ter(tesSUCCESS));
+            env(offer(bob, usd(500), XRP(500)), Ter(tesSUCCESS));
             env.close();
-            env.require(owners(bob, 2), offers(bob, 2));
+            env.require(Owners(bob, 2), offers(bob, 2));
 
-            env(trust(alice, USD(1000)), ter(tesSUCCESS));
-            env(pay(gw, alice, USD(1000)), ter(tesSUCCESS));
+            env(trust(alice, usd(1000)), Ter(tesSUCCESS));
+            env(pay(gw, alice, usd(1000)), Ter(tesSUCCESS));
 
             // Order that can't be filled but will remove bob's expired offer:
             {
                 TER const killedCode{TER{tecKILLED}};
-                env(offer(alice, XRP(1000), USD(1000)), txflags(tfFillOrKill), ter(killedCode));
+                env(offer(alice, XRP(1000), usd(1000)), Txflags(tfFillOrKill), Ter(killedCode));
             }
             env.require(
-                balance(alice, startBalance - (f * 2)),
-                balance(alice, USD(1000)),
-                owners(alice, 1),
+                Balance(alice, startBalance - (f * 2)),
+                Balance(alice, usd(1000)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - (f * 2)),
-                balance(bob, USD(none)),
-                owners(bob, 1),
+                Balance(bob, startBalance - (f * 2)),
+                Balance(bob, usd(kNONE)),
+                Owners(bob, 1),
                 offers(bob, 1));
 
             // Order that can be filled
-            env(offer(alice, XRP(500), USD(500)), txflags(tfFillOrKill), ter(tesSUCCESS));
+            env(offer(alice, XRP(500), usd(500)), Txflags(tfFillOrKill), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - (f * 3) + XRP(500)),
-                balance(alice, USD(500)),
-                owners(alice, 1),
+                Balance(alice, startBalance - (f * 3) + XRP(500)),
+                Balance(alice, usd(500)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - (f * 2) - XRP(500)),
-                balance(bob, USD(500)),
-                owners(bob, 1),
+                Balance(bob, startBalance - (f * 2) - XRP(500)),
+                Balance(bob, usd(500)),
+                Owners(bob, 1),
                 offers(bob, 0));
         }
 
@@ -846,49 +846,49 @@ public:
             env.fund(startBalance, gw, alice, bob);
             env.close();
 
-            env(trust(alice, USD(1000)), ter(tesSUCCESS));
-            env(pay(gw, alice, USD(1000)), ter(tesSUCCESS));
+            env(trust(alice, usd(1000)), Ter(tesSUCCESS));
+            env(pay(gw, alice, usd(1000)), Ter(tesSUCCESS));
 
             // No cross:
             {
                 TER const expectedCode = tecKILLED;
-                env(offer(alice, XRP(1000), USD(1000)),
-                    txflags(tfImmediateOrCancel),
-                    ter(expectedCode));
+                env(offer(alice, XRP(1000), usd(1000)),
+                    Txflags(tfImmediateOrCancel),
+                    Ter(expectedCode));
             }
 
             env.require(
-                balance(alice, startBalance - f - f),
-                balance(alice, USD(1000)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f),
+                Balance(alice, usd(1000)),
+                Owners(alice, 1),
                 offers(alice, 0));
 
             // Partially cross:
-            env(offer(bob, USD(50), XRP(50)), ter(tesSUCCESS));
-            env(offer(alice, XRP(1000), USD(1000)), txflags(tfImmediateOrCancel), ter(tesSUCCESS));
+            env(offer(bob, usd(50), XRP(50)), Ter(tesSUCCESS));
+            env(offer(alice, XRP(1000), usd(1000)), Txflags(tfImmediateOrCancel), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - f - f - f + XRP(50)),
-                balance(alice, USD(950)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f - f + XRP(50)),
+                Balance(alice, usd(950)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - f - XRP(50)),
-                balance(bob, USD(50)),
-                owners(bob, 1),
+                Balance(bob, startBalance - f - XRP(50)),
+                Balance(bob, usd(50)),
+                Owners(bob, 1),
                 offers(bob, 0));
 
             // Fully cross:
-            env(offer(bob, USD(50), XRP(50)), ter(tesSUCCESS));
-            env(offer(alice, XRP(50), USD(50)), txflags(tfImmediateOrCancel), ter(tesSUCCESS));
+            env(offer(bob, usd(50), XRP(50)), Ter(tesSUCCESS));
+            env(offer(alice, XRP(50), usd(50)), Txflags(tfImmediateOrCancel), Ter(tesSUCCESS));
 
             env.require(
-                balance(alice, startBalance - f - f - f - f + XRP(100)),
-                balance(alice, USD(900)),
-                owners(alice, 1),
+                Balance(alice, startBalance - f - f - f - f + XRP(100)),
+                Balance(alice, usd(900)),
+                Owners(alice, 1),
                 offers(alice, 0),
-                balance(bob, startBalance - f - f - XRP(100)),
-                balance(bob, USD(100)),
-                owners(bob, 1),
+                Balance(bob, startBalance - f - f - XRP(100)),
+                Balance(bob, usd(100)),
+                Owners(bob, 1),
                 offers(bob, 0));
         }
 
@@ -899,13 +899,13 @@ public:
             env.fund(startBalance, gw, alice, bob);
             env.close();
 
-            env(trust(bob, USD(1000)));
+            env(trust(bob, usd(1000)));
             env.close();
 
-            env(pay(gw, bob, USD(1000)));
+            env(pay(gw, bob, usd(1000)));
             env.close();
 
-            env(offer(alice, USD(1000), XRP(2000)));
+            env(offer(alice, usd(1000), XRP(2000)));
             env.close();
 
             auto const aliceOffers = offersOnAccount(env, alice);
@@ -914,12 +914,12 @@ public:
             {
                 auto const& offer = *offerPtr;
                 BEAST_EXPECT(offer[sfTakerGets] == XRP(2000));
-                BEAST_EXPECT(offer[sfTakerPays] == USD(1000));
+                BEAST_EXPECT(offer[sfTakerPays] == usd(1000));
             }
 
             // bob creates a passive offer that could cross alice's.
             // bob's offer should stay in the ledger.
-            env(offer(bob, XRP(2000), USD(1000), tfPassive));
+            env(offer(bob, XRP(2000), usd(1000), tfPassive));
             env.close();
             env.require(offers(alice, 1));
 
@@ -928,18 +928,18 @@ public:
             for (auto const& offerPtr : bobOffers)
             {
                 auto const& offer = *offerPtr;
-                BEAST_EXPECT(offer[sfTakerGets] == USD(1000));
+                BEAST_EXPECT(offer[sfTakerGets] == usd(1000));
                 BEAST_EXPECT(offer[sfTakerPays] == XRP(2000));
             }
 
             // It should be possible for gw to cross both of those offers.
-            env(offer(gw, XRP(2000), USD(1000)));
+            env(offer(gw, XRP(2000), usd(1000)));
             env.close();
             env.require(offers(alice, 0));
             env.require(offers(gw, 0));
             env.require(offers(bob, 1));
 
-            env(offer(gw, USD(1000), XRP(2000)));
+            env(offer(gw, usd(1000), XRP(2000)));
             env.close();
             env.require(offers(bob, 0));
             env.require(offers(gw, 0));
@@ -952,14 +952,14 @@ public:
             env.fund(startBalance, gw, "alice", "bob");
             env.close();
 
-            env(trust("bob", USD(1000)));
+            env(trust("bob", usd(1000)));
             env.close();
 
-            env(pay(gw, "bob", USD(1000)));
-            env(offer("alice", USD(500), XRP(1001)));
+            env(pay(gw, "bob", usd(1000)));
+            env(offer("alice", usd(500), XRP(1001)));
             env.close();
 
-            env(offer("alice", USD(500), XRP(1000)));
+            env(offer("alice", usd(500), XRP(1000)));
             env.close();
 
             auto const aliceOffers = offersOnAccount(env, "alice");
@@ -968,7 +968,7 @@ public:
             // bob creates a passive offer.  That offer should cross one
             // of alice's (the one with better quality) and leave alice's
             // other offer untouched.
-            env(offer("bob", XRP(2000), USD(1000), tfPassive));
+            env(offer("bob", XRP(2000), usd(1000), tfPassive));
             env.close();
             env.require(offers("alice", 1));
 
@@ -977,7 +977,7 @@ public:
             for (auto const& offerPtr : bobOffers)
             {
                 auto const& offer = *offerPtr;
-                BEAST_EXPECT(offer[sfTakerGets] == USD(499.5));
+                BEAST_EXPECT(offer[sfTakerGets] == usd(499.5));
                 BEAST_EXPECT(offer[sfTakerPays] == XRP(999));
             }
         }
@@ -993,7 +993,7 @@ public:
         auto const startBalance = XRP(1000000);
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env{*this, features};
 
@@ -1001,61 +1001,61 @@ public:
         env.close();
 
         // Order that has invalid flags
-        env(offer(alice, USD(1000), XRP(1000)),
-            txflags(tfImmediateOrCancel + 1),
-            ter(temINVALID_FLAG));
-        env.require(balance(alice, startBalance), owners(alice, 0), offers(alice, 0));
+        env(offer(alice, usd(1000), XRP(1000)),
+            Txflags(tfImmediateOrCancel + 1),
+            Ter(temINVALID_FLAG));
+        env.require(Balance(alice, startBalance), Owners(alice, 0), offers(alice, 0));
 
         // Order with incompatible flags
-        env(offer(alice, USD(1000), XRP(1000)),
-            txflags(tfImmediateOrCancel | tfFillOrKill),
-            ter(temINVALID_FLAG));
-        env.require(balance(alice, startBalance), owners(alice, 0), offers(alice, 0));
+        env(offer(alice, usd(1000), XRP(1000)),
+            Txflags(tfImmediateOrCancel | tfFillOrKill),
+            Ter(temINVALID_FLAG));
+        env.require(Balance(alice, startBalance), Owners(alice, 0), offers(alice, 0));
 
         // Sell and buy the same asset
         {
             // Alice tries an XRP to XRP order:
-            env(offer(alice, XRP(1000), XRP(1000)), ter(temBAD_OFFER));
-            env.require(owners(alice, 0), offers(alice, 0));
+            env(offer(alice, XRP(1000), XRP(1000)), Ter(temBAD_OFFER));
+            env.require(Owners(alice, 0), offers(alice, 0));
 
             // Alice tries an IOU to IOU order:
-            env(trust(alice, USD(1000)), ter(tesSUCCESS));
-            env(pay(gw, alice, USD(1000)), ter(tesSUCCESS));
-            env(offer(alice, USD(1000), USD(1000)), ter(temREDUNDANT));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(trust(alice, usd(1000)), Ter(tesSUCCESS));
+            env(pay(gw, alice, usd(1000)), Ter(tesSUCCESS));
+            env(offer(alice, usd(1000), usd(1000)), Ter(temREDUNDANT));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Offers with negative amounts
         {
-            env(offer(alice, -USD(1000), XRP(1000)), ter(temBAD_OFFER));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, -usd(1000), XRP(1000)), Ter(temBAD_OFFER));
+            env.require(Owners(alice, 1), offers(alice, 0));
 
-            env(offer(alice, USD(1000), -XRP(1000)), ter(temBAD_OFFER));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, usd(1000), -XRP(1000)), Ter(temBAD_OFFER));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Offer with a bad expiration
         {
-            env(offer(alice, USD(1000), XRP(1000)),
-                json(sfExpiration.fieldName, std::uint32_t(0)),
-                ter(temBAD_EXPIRATION));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, usd(1000), XRP(1000)),
+                Json(sfExpiration.fieldName, std::uint32_t(0)),
+                Ter(temBAD_EXPIRATION));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Offer with a bad offer sequence
         {
-            env(offer(alice, USD(1000), XRP(1000)),
-                json(jss::OfferSequence, std::uint32_t(0)),
-                ter(temBAD_SEQUENCE));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, usd(1000), XRP(1000)),
+                Json(jss::OfferSequence, std::uint32_t(0)),
+                Ter(temBAD_SEQUENCE));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
 
         // Use XRP as a currency code
         {
-            auto const BAD = IOU(gw, badCurrency());
+            auto const bad = IOU(gw, badCurrency());
 
-            env(offer(alice, XRP(1000), BAD(1000)), ter(temBAD_CURRENCY));
-            env.require(owners(alice, 1), offers(alice, 0));
+            env(offer(alice, XRP(1000), bad(1000)), Ter(temBAD_CURRENCY));
+            env.require(Owners(alice, 1), offers(alice, 0));
         }
     }
 
@@ -1069,10 +1069,10 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         auto const startBalance = XRP(1000000);
-        auto const usdOffer = USD(1000);
+        auto const usdOffer = usd(1000);
         auto const xrpOffer = XRP(1000);
 
         Env env{*this, features};
@@ -1082,55 +1082,55 @@ public:
 
         auto const f = env.current()->fees().base;
 
-        env(trust(alice, usdOffer), ter(tesSUCCESS));
-        env(pay(gw, alice, usdOffer), ter(tesSUCCESS));
+        env(trust(alice, usdOffer), Ter(tesSUCCESS));
+        env(pay(gw, alice, usdOffer), Ter(tesSUCCESS));
         env.close();
         env.require(
-            balance(alice, startBalance - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1));
+            Owners(alice, 1));
 
         env(offer(alice, xrpOffer, usdOffer),
-            json(sfExpiration.fieldName, lastClose(env)),
-            ter(tecEXPIRED));
+            Json(sfExpiration.fieldName, lastClose(env)),
+            Ter(tecEXPIRED));
 
         env.require(
-            balance(alice, startBalance - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1));
+            Owners(alice, 1));
         env.close();
 
         // Add an offer that expires before the next ledger close
         env(offer(alice, xrpOffer, usdOffer),
-            json(sfExpiration.fieldName, lastClose(env) + 1),
-            ter(tesSUCCESS));
+            Json(sfExpiration.fieldName, lastClose(env) + 1),
+            Ter(tesSUCCESS));
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 1),
-            owners(alice, 2));
+            Owners(alice, 2));
 
         // The offer expires (it's not removed yet)
         env.close();
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 1),
-            owners(alice, 2));
+            Owners(alice, 2));
 
         // Add offer - the expired offer is removed
-        env(offer(bob, usdOffer, xrpOffer), ter(tesSUCCESS));
+        env(offer(bob, usdOffer, xrpOffer), Ter(tesSUCCESS));
         env.require(
-            balance(alice, startBalance - f - f - f),
-            balance(alice, usdOffer),
+            Balance(alice, startBalance - f - f - f),
+            Balance(alice, usdOffer),
             offers(alice, 0),
-            owners(alice, 1),
-            balance(bob, startBalance - f),
-            balance(bob, USD(none)),
+            Owners(alice, 1),
+            Balance(bob, startBalance - f),
+            Balance(bob, usd(kNONE)),
             offers(bob, 1),
-            owners(bob, 1));
+            Owners(bob, 1));
     }
 
     void
@@ -1141,9 +1141,9 @@ public:
         using namespace jtx;
 
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const usdOffer = USD(1000);
+        auto const usdOffer = usd(1000);
         auto const xrpOffer = XRP(1000);
 
         Env env{*this, features};
@@ -1158,108 +1158,108 @@ public:
         // fees are subtracted.
         env.fund(reserve(env, 0), "alice");
         env.close();
-        env(offer("alice", usdOffer, xrpOffer), ter(tecUNFUNDED_OFFER));
-        env.require(balance("alice", reserve(env, 0) - f), owners("alice", 0));
+        env(offer("alice", usdOffer, xrpOffer), Ter(tecUNFUNDED_OFFER));
+        env.require(Balance("alice", reserve(env, 0) - f), Owners("alice", 0));
 
         // Account has just enough for the reserve and the
         // fee.
         env.fund(reserve(env, 0) + f, "bob");
         env.close();
-        env(offer("bob", usdOffer, xrpOffer), ter(tecUNFUNDED_OFFER));
-        env.require(balance("bob", reserve(env, 0)), owners("bob", 0));
+        env(offer("bob", usdOffer, xrpOffer), Ter(tecUNFUNDED_OFFER));
+        env.require(Balance("bob", reserve(env, 0)), Owners("bob", 0));
 
         // Account has enough for the reserve, the fee and
         // the offer, and a bit more, but not enough for the
         // reserve after the offer is placed.
         env.fund(reserve(env, 0) + f + XRP(1), "carol");
         env.close();
-        env(offer("carol", usdOffer, xrpOffer), ter(tecINSUF_RESERVE_OFFER));
-        env.require(balance("carol", reserve(env, 0) + XRP(1)), owners("carol", 0));
+        env(offer("carol", usdOffer, xrpOffer), Ter(tecINSUF_RESERVE_OFFER));
+        env.require(Balance("carol", reserve(env, 0) + XRP(1)), Owners("carol", 0));
 
         // Account has enough for the reserve plus one
         // offer, and the fee.
         env.fund(reserve(env, 1) + f, "dan");
         env.close();
-        env(offer("dan", usdOffer, xrpOffer), ter(tesSUCCESS));
-        env.require(balance("dan", reserve(env, 1)), owners("dan", 1));
+        env(offer("dan", usdOffer, xrpOffer), Ter(tesSUCCESS));
+        env.require(Balance("dan", reserve(env, 1)), Owners("dan", 1));
 
         // Account has enough for the reserve plus one
         // offer, the fee and the entire offer amount.
         env.fund(reserve(env, 1) + f + xrpOffer, "eve");
         env.close();
-        env(offer("eve", usdOffer, xrpOffer), ter(tesSUCCESS));
-        env.require(balance("eve", reserve(env, 1) + xrpOffer), owners("eve", 1));
+        env(offer("eve", usdOffer, xrpOffer), Ter(tesSUCCESS));
+        env.require(Balance("eve", reserve(env, 1) + xrpOffer), Owners("eve", 1));
     }
 
     void
-    testSelfCross(bool use_partner, FeatureBitset features)
+    testSelfCross(bool usePartner, FeatureBitset features)
     {
-        testcase(std::string("Self-crossing") + (use_partner ? ", with partner account" : ""));
+        testcase(std::string("Self-crossing") + (usePartner ? ", with partner account" : ""));
 
         using namespace jtx;
 
         auto const gw = Account{"gateway"};
         auto const partner = Account{"partner"};
-        auto const USD = gw["USD"];
-        auto const BTC = gw["BTC"];
+        auto const usd = gw["USD"];
+        auto const btc = gw["BTC"];
 
         Env env{*this, features};
         env.close();
 
         env.fund(XRP(10000), gw);
-        if (use_partner)
+        if (usePartner)
         {
             env.fund(XRP(10000), partner);
             env.close();
-            env(trust(partner, USD(100)));
-            env(trust(partner, BTC(500)));
+            env(trust(partner, usd(100)));
+            env(trust(partner, btc(500)));
             env.close();
-            env(pay(gw, partner, USD(100)));
-            env(pay(gw, partner, BTC(500)));
+            env(pay(gw, partner, usd(100)));
+            env(pay(gw, partner, btc(500)));
         }
-        auto const& account_to_test = use_partner ? partner : gw;
+        auto const& accountToTest = usePartner ? partner : gw;
 
         env.close();
-        env.require(offers(account_to_test, 0));
+        env.require(offers(accountToTest, 0));
 
         // PART 1:
         // we will make two offers that can be used to bridge BTC to USD
         // through XRP
-        env(offer(account_to_test, BTC(250), XRP(1000)));
-        env.require(offers(account_to_test, 1));
+        env(offer(accountToTest, btc(250), XRP(1000)));
+        env.require(offers(accountToTest, 1));
 
         // validate that the book now shows a BTC for XRP offer
-        BEAST_EXPECT(isOffer(env, account_to_test, BTC(250), XRP(1000)));
+        BEAST_EXPECT(isOffer(env, accountToTest, btc(250), XRP(1000)));
 
-        auto const secondLegSeq = env.seq(account_to_test);
-        env(offer(account_to_test, XRP(1000), USD(50)));
-        env.require(offers(account_to_test, 2));
+        auto const secondLegSeq = env.seq(accountToTest);
+        env(offer(accountToTest, XRP(1000), usd(50)));
+        env.require(offers(accountToTest, 2));
 
         // validate that the book also shows a XRP for USD offer
-        BEAST_EXPECT(isOffer(env, account_to_test, XRP(1000), USD(50)));
+        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 none
-        env(offer(account_to_test, USD(50), BTC(250)));
+        // the outstanding offers will be taken leaving us with kNONE
+        env(offer(accountToTest, usd(50), btc(250)));
 
-        auto jrr = getBookOffers(env, USD, BTC);
+        auto jrr = getBookOffers(env, usd, btc);
         BEAST_EXPECT(jrr[jss::offers].isArray());
         BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
-        jrr = getBookOffers(env, BTC, XRP);
+        jrr = getBookOffers(env, btc, XRP);
         BEAST_EXPECT(jrr[jss::offers].isArray());
         BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
         // At this point, all offers are expected to be consumed.
         {
-            auto acctOffers = offersOnAccount(env, account_to_test);
+            auto acctOffers = offersOnAccount(env, accountToTest);
 
             BEAST_EXPECT(acctOffers.empty());
             for (auto const& offerPtr : acctOffers)
             {
                 auto const& offer = *offerPtr;
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(offer[sfTakerGets] == USD(0));
+                BEAST_EXPECT(offer[sfTakerGets] == usd(0));
                 BEAST_EXPECT(offer[sfTakerPays] == XRP(0));
             }
         }
@@ -1267,35 +1267,35 @@ public:
         // cancel that lingering second offer so that it doesn't interfere
         // with the next set of offers we test. This will not be needed once
         // the bridging bug is fixed
-        env(offer_cancel(account_to_test, secondLegSeq));
-        env.require(offers(account_to_test, 0));
+        env(offerCancel(accountToTest, secondLegSeq));
+        env.require(offers(accountToTest, 0));
 
         // PART 2:
         // simple direct crossing  BTC to USD and then USD to BTC which causes
         // the first offer to be replaced
-        env(offer(account_to_test, BTC(250), USD(50)));
-        env.require(offers(account_to_test, 1));
+        env(offer(accountToTest, btc(250), usd(50)));
+        env.require(offers(accountToTest, 1));
 
         // validate that the book shows one BTC for USD offer and no USD for
         // BTC offers
-        BEAST_EXPECT(isOffer(env, account_to_test, BTC(250), USD(50)));
+        BEAST_EXPECT(isOffer(env, accountToTest, btc(250), usd(50)));
 
-        jrr = getBookOffers(env, USD, BTC);
+        jrr = getBookOffers(env, usd, btc);
         BEAST_EXPECT(jrr[jss::offers].isArray());
         BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
         // this second offer would self-cross directly, so it causes the first
         // offer by the same owner/taker to be removed
-        env(offer(account_to_test, USD(50), BTC(250)));
-        env.require(offers(account_to_test, 1));
+        env(offer(accountToTest, usd(50), btc(250)));
+        env.require(offers(accountToTest, 1));
 
         // validate that we now have just the second offer...the first
         // was removed
-        jrr = getBookOffers(env, BTC, USD);
+        jrr = getBookOffers(env, btc, usd);
         BEAST_EXPECT(jrr[jss::offers].isArray());
         BEAST_EXPECT(jrr[jss::offers].size() == 0);
 
-        BEAST_EXPECT(isOffer(env, account_to_test, USD(50), BTC(250)));
+        BEAST_EXPECT(isOffer(env, accountToTest, usd(50), btc(250)));
     }
 
     void
@@ -1317,34 +1317,34 @@ public:
             auto const gw = Account{"gateway"};
             auto const alice = Account{"alice"};
             auto const bob = Account{"bob"};
-            auto const USD = gw["USD"];
-            auto const BTC = gw["BTC"];
+            auto const usd = gw["USD"];
+            auto const btc = gw["BTC"];
 
             // these *interesting* amounts were taken
             // from the original JS test that was ported here
-            auto const gw_initial_balance = drops(1149999730);
-            auto const alice_initial_balance = drops(499946999680);
-            auto const bob_initial_balance = drops(10199999920);
-            auto const small_amount = STAmount{bob["USD"], UINT64_C(2710505431213761), -33};
+            auto const gwInitialBalance = drops(1149999730);
+            auto const aliceInitialBalance = drops(499946999680);
+            auto const bobInitialBalance = drops(10199999920);
+            auto const smallAmount = STAmount{bob["USD"], UINT64_C(2710505431213761), -33};
 
-            env.fund(gw_initial_balance, gw);
-            env.fund(alice_initial_balance, alice);
-            env.fund(bob_initial_balance, bob);
+            env.fund(gwInitialBalance, gw);
+            env.fund(aliceInitialBalance, alice);
+            env.fund(bobInitialBalance, bob);
             env.close();
 
             env(rate(gw, 1.005));
 
-            env(trust(alice, USD(500)));
-            env(trust(bob, USD(50)));
+            env(trust(alice, usd(500)));
+            env(trust(bob, usd(50)));
             env(trust(gw, alice["USD"](100)));
 
             env(pay(gw, alice, alice["USD"](50)));
-            env(pay(gw, bob, small_amount));
+            env(pay(gw, bob, smallAmount));
 
-            env(offer(alice, USD(50), XRP(150000)));
+            env(offer(alice, usd(50), XRP(150000)));
 
             // unfund the offer
-            env(pay(alice, gw, USD(100)));
+            env(pay(alice, gw, usd(100)));
 
             // drop the trust line (set to 0)
             env(trust(gw, alice["USD"](0)));
@@ -1359,7 +1359,7 @@ public:
 
             // create crossing offer
             std::uint32_t const bobOfferSeq = env.seq(bob);
-            env(offer(bob, XRP(2000), USD(1)));
+            env(offer(bob, XRP(2000), usd(1)));
 
             if (localFeatures[fixReducedOffersV2])
             {
@@ -1370,7 +1370,7 @@ public:
                 BEAST_EXPECT(
                     jrr[jss::node][sfBalance.fieldName][jss::value] == "-2710505431213761e-33");
 
-                Json::Value const bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq)[jss::node];
+                json::Value const bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq)[jss::node];
                 BEAST_EXPECT(bobOffer[sfTakerGets.jsonName][jss::value] == "1");
                 BEAST_EXPECT(bobOffer[sfTakerPays.jsonName] == "2000000000");
                 return;
@@ -1389,21 +1389,21 @@ public:
             BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "50");
             BEAST_EXPECT(
                 env.balance(alice, xrpIssue()) ==
-                alice_initial_balance - env.current()->fees().base * 3 - crossingDelta);
+                aliceInitialBalance - env.current()->fees().base * 3 - crossingDelta);
 
             jrr = ledgerEntryState(env, bob, gw, "USD");
             BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "0");
             BEAST_EXPECT(
                 env.balance(bob, xrpIssue()) ==
-                bob_initial_balance - env.current()->fees().base * 2 + crossingDelta);
+                bobInitialBalance - env.current()->fees().base * 2 + crossingDelta);
         }
     }
 
     void
-    testOfferCrossWithXRP(bool reverse_order, FeatureBitset features)
+    testOfferCrossWithXRP(bool reverseOrder, FeatureBitset features)
     {
         testcase(
-            std::string("Offer Crossing with XRP, ") + (reverse_order ? "Reverse" : "Normal") +
+            std::string("Offer Crossing with XRP, ") + (reverseOrder ? "Reverse" : "Normal") +
             " order");
 
         using namespace jtx;
@@ -1413,23 +1413,23 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, usd(1000)));
 
         env(pay(gw, alice, alice["USD"](500)));
 
-        if (reverse_order)
-            env(offer(bob, USD(1), XRP(4000)));
+        if (reverseOrder)
+            env(offer(bob, usd(1), XRP(4000)));
 
-        env(offer(alice, XRP(150000), USD(50)));
+        env(offer(alice, XRP(150000), usd(50)));
 
-        if (!reverse_order)
-            env(offer(bob, USD(1), XRP(4000)));
+        if (!reverseOrder)
+            env(offer(bob, usd(1), XRP(4000)));
 
         // Existing offer pays better than this wants.
         // Fully consume existing offer.
@@ -1441,7 +1441,7 @@ public:
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string(
-                (XRP(10000) - XRP(reverse_order ? 4000 : 3000) - env.current()->fees().base * 2)
+                (XRP(10000) - XRP(reverseOrder ? 4000 : 3000) - env.current()->fees().base * 2)
                     .xrp()));
 
         jrr = ledgerEntryState(env, alice, gw, "USD");
@@ -1450,7 +1450,7 @@ public:
         BEAST_EXPECT(
             jrr[jss::node][sfBalance.fieldName] ==
             to_string(
-                (XRP(10000) + XRP(reverse_order ? 4000 : 3000) - env.current()->fees().base * 2)
+                (XRP(10000) + XRP(reverseOrder ? 4000 : 3000) - env.current()->fees().base * 2)
                     .xrp()));
     }
 
@@ -1466,17 +1466,17 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(100000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
+        env(trust(alice, usd(1000)));
 
         env(pay(gw, alice, alice["USD"](500)));
 
-        env(offer(alice, XRP(150000), USD(50)));
-        env(offer(bob, USD(1), XRP(3000)));
+        env(offer(alice, XRP(150000), usd(50)));
+        env(offer(bob, usd(1), XRP(3000)));
 
         auto jrr = ledgerEntryState(env, bob, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-1");
@@ -1502,13 +1502,13 @@ public:
 
         Env env{*this, features};
 
-        auto const USD = env.master["USD"];
+        auto const usd = env.master["USD"];
 
         auto const nextOfferSeq = env.seq(env.master);
-        env(offer(env.master, XRP(500), USD(100)));
+        env(offer(env.master, XRP(500), usd(100)));
         env.close();
 
-        env(offer_cancel(env.master, nextOfferSeq));
+        env(offerCancel(env.master, nextOfferSeq));
         BEAST_EXPECT(env.seq(env.master) == nextOfferSeq + 2);
 
         // ledger_accept, call twice and verify no odd behavior
@@ -1532,11 +1532,11 @@ public:
         env.fund(XRP(10000), alice);
         env.close();
 
-        env(offer_cancel(env.master, nextOfferSeq));
+        env(offerCancel(env.master, nextOfferSeq));
 
-        env(offer_cancel(env.master, env.seq(env.master)), ter(temBAD_SEQUENCE));
+        env(offerCancel(env.master, env.seq(env.master)), Ter(temBAD_SEQUENCE));
 
-        env(offer_cancel(env.master, env.seq(env.master) + 1), ter(temBAD_SEQUENCE));
+        env(offerCancel(env.master, env.seq(env.master) + 1), Ter(temBAD_SEQUENCE));
 
         env.close();
     }
@@ -1553,27 +1553,28 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob);
         env.close();
-        env.require(owners(bob, 0));
+        env.require(Owners(bob, 0));
 
-        env(trust(alice, USD(100)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(100)));
+        env(trust(bob, usd(1000)));
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice, 1), Owners(bob, 1));
 
         env(pay(gw, alice, alice["USD"](100)));
         auto const bobOfferSeq = env.seq(bob);
-        env(offer(bob, USD(100), XRP(500)));
+        env(offer(bob, usd(100), XRP(500)));
 
-        env.require(owners(alice, 1), owners(bob, 2));
+        env.require(Owners(alice, 1), Owners(bob, 2));
         auto jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(500).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(100).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(
+            jro[jss::node][jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone));
 
-        env(pay(alice, alice, XRP(500)), sendmax(USD(100)));
+        env(pay(alice, alice, XRP(500)), Sendmax(usd(100)));
 
         auto jrr = ledgerEntryState(env, alice, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "0");
@@ -1588,7 +1589,7 @@ public:
         jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::error] == "entryNotFound");
 
-        env.require(owners(alice, 1), owners(bob, 1));
+        env.require(Owners(alice, 1), Owners(bob, 1));
     }
 
     void
@@ -1612,7 +1613,7 @@ public:
         env(trust(carol, bob["EUR"](1000)));
 
         auto const bobOfferSeq = env.seq(bob);
-        env(offer(bob, alice["USD"](50), carol["EUR"](200)), ter(tecUNFUNDED_OFFER));
+        env(offer(bob, alice["USD"](50), carol["EUR"](200)), Ter(tecUNFUNDED_OFFER));
 
         env(offer(alice, carol["EUR"](200), alice["USD"](50)));
 
@@ -1632,25 +1633,25 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(200)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(200)));
+        env(trust(bob, usd(1000)));
 
         env(pay(gw, alice, alice["USD"](200)));
 
         auto const bobOfferSeq = env.seq(bob);
-        env(offer(bob, USD(100), XRP(500)));
+        env(offer(bob, usd(100), XRP(500)));
 
-        env(pay(alice, alice, XRP(200)), sendmax(USD(100)));
+        env(pay(alice, alice, XRP(200)), Sendmax(usd(100)));
 
         // The previous payment reduced the remaining offer amount by 200 XRP
         auto jro = ledgerEntryOffer(env, bob, bobOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(300).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(60).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == usd(60).value().getJson(JsonOptions::KNone));
 
         // the balance between alice and gw is 160 USD..200 less the 40 taken
         // by the offer
@@ -1668,11 +1669,11 @@ public:
 
         // Alice converts USD to XRP which should fail
         // due to PartialPayment.
-        env(pay(alice, alice, XRP(600)), sendmax(USD(100)), ter(tecPATH_PARTIAL));
+        env(pay(alice, alice, XRP(600)), Sendmax(usd(100)), Ter(tecPATH_PARTIAL));
 
         // Alice converts USD to XRP, should succeed because
         // we permit partial payment
-        env(pay(alice, alice, XRP(600)), sendmax(USD(100)), txflags(tfPartialPayment));
+        env(pay(alice, alice, XRP(600)), Sendmax(usd(100)), Txflags(tfPartialPayment));
 
         // Verify the offer was consumed
         jro = ledgerEntryOffer(env, bob, bobOfferSeq);
@@ -1709,20 +1710,20 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
         auto const carol = Account{"carol"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob, carol);
         env.close();
 
-        env(trust(carol, USD(1000)));
-        env(trust(bob, USD(2000)));
+        env(trust(carol, usd(1000)));
+        env(trust(bob, usd(2000)));
 
         env(pay(gw, carol, carol["USD"](500)));
 
         auto const carolOfferSeq = env.seq(carol);
-        env(offer(carol, XRP(500), USD(50)));
+        env(offer(carol, XRP(500), usd(50)));
 
-        env(pay(alice, bob, USD(25)), sendmax(XRP(333)));
+        env(pay(alice, bob, usd(25)), Sendmax(XRP(333)));
 
         auto jrr = ledgerEntryState(env, bob, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-25");
@@ -1731,7 +1732,7 @@ public:
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-475");
 
         auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
-        BEAST_EXPECT(jro[jss::node][jss::TakerGets] == USD(25).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerGets] == usd(25).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(jro[jss::node][jss::TakerPays] == XRP(250).value().getText());
     }
 
@@ -1748,20 +1749,20 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
         auto const carol = Account{"carol"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob, carol);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(carol, USD(2000)));
+        env(trust(alice, usd(1000)));
+        env(trust(carol, usd(2000)));
 
         env(pay(gw, alice, alice["USD"](500)));
 
         auto const carolOfferSeq = env.seq(carol);
-        env(offer(carol, USD(50), XRP(500)));
+        env(offer(carol, usd(50), XRP(500)));
 
-        env(pay(alice, bob, XRP(250)), sendmax(USD(333)));
+        env(pay(alice, bob, XRP(250)), Sendmax(usd(333)));
 
         auto jrr = ledgerEntryState(env, alice, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-475");
@@ -1776,7 +1777,7 @@ public:
 
         auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(250).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(25).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == usd(25).value().getJson(JsonOptions::KNone));
     }
 
     void
@@ -1794,29 +1795,29 @@ public:
         auto const bob = Account{"bob"};
         auto const carol = Account{"carol"};
         auto const dan = Account{"dan"};
-        auto const USD = gw1["USD"];
-        auto const EUR = gw2["EUR"];
+        auto const usd = gw1["USD"];
+        auto const eur = gw2["EUR"];
 
         env.fund(XRP(10000), gw1, gw2, alice, bob, carol, dan);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, EUR(1000)));
-        env(trust(carol, USD(1000)));
-        env(trust(dan, EUR(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, eur(1000)));
+        env(trust(carol, usd(1000)));
+        env(trust(dan, eur(1000)));
 
         env(pay(gw1, alice, alice["USD"](500)));
         env(pay(gw2, dan, dan["EUR"](400)));
 
         auto const carolOfferSeq = env.seq(carol);
-        env(offer(carol, USD(50), XRP(500)));
+        env(offer(carol, usd(50), XRP(500)));
 
         auto const danOfferSeq = env.seq(dan);
-        env(offer(dan, XRP(500), EUR(50)));
+        env(offer(dan, XRP(500), eur(50)));
 
-        Json::Value jtp{Json::arrayValue};
+        json::Value jtp{json::ArrayValue};
         jtp[0u][0u][jss::currency] = "XRP";
-        env(pay(alice, bob, EUR(30)), json(jss::Paths, jtp), sendmax(USD(333)));
+        env(pay(alice, bob, eur(30)), Json(jss::Paths, jtp), Sendmax(usd(333)));
 
         auto jrr = ledgerEntryState(env, alice, gw1, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "470");
@@ -1832,11 +1833,11 @@ public:
 
         auto jro = ledgerEntryOffer(env, carol, carolOfferSeq);
         BEAST_EXPECT(jro[jss::node][jss::TakerGets] == XRP(200).value().getText());
-        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == USD(20).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jro[jss::node][jss::TakerPays] == usd(20).value().getJson(JsonOptions::KNone));
 
         jro = ledgerEntryOffer(env, dan, danOfferSeq);
         BEAST_EXPECT(
-            jro[jss::node][jss::TakerGets] == gw2["EUR"](20).value().getJson(JsonOptions::none));
+            jro[jss::node][jss::TakerGets] == gw2["EUR"](20).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(jro[jss::node][jss::TakerPays] == XRP(200).value().getText());
     }
 
@@ -1855,24 +1856,24 @@ public:
         Account const bob{"bob"};
         Account const carol{"carol"};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         env.fund(XRP(100000000), alice, bob, carol, gw);
         env.close();
 
-        env.trust(USD(10), alice);
+        env.trust(usd(10), alice);
         env.close();
-        env(pay(gw, alice, USD(10)));
-        env.trust(USD(10), carol);
+        env(pay(gw, alice, usd(10)));
+        env.trust(usd(10), carol);
         env.close();
-        env(pay(gw, carol, USD(3)));
+        env(pay(gw, carol, usd(3)));
 
-        env(offer(alice, EUR(2), XRP(1)));
-        env(offer(alice, EUR(2), XRP(1)));
+        env(offer(alice, eur(2), XRP(1)));
+        env(offer(alice, eur(2), XRP(1)));
 
-        env(offer(alice, XRP(1), USD(4)));
-        env(offer(carol, XRP(1), USD(3)));
+        env(offer(alice, XRP(1), usd(4)));
+        env(offer(carol, XRP(1), usd(3)));
         env.close();
 
         // Bob offers to buy 10 USD for 10 EUR.
@@ -1883,28 +1884,28 @@ public:
         // The key for this test is that Alice's XRP->USD leg goes dry before
         // Alice's EUR->XRP.  The XRP->USD leg is the second leg which showed
         // some sensitivity.
-        env.trust(EUR(10), bob);
+        env.trust(eur(10), bob);
         env.close();
-        env(pay(gw, bob, EUR(10)));
+        env(pay(gw, bob, eur(10)));
         env.close();
-        env(offer(bob, USD(10), EUR(10)));
+        env(offer(bob, usd(10), eur(10)));
         env.close();
 
-        env.require(balance(bob, USD(7)));
-        env.require(balance(bob, EUR(6)));
+        env.require(Balance(bob, usd(7)));
+        env.require(Balance(bob, eur(6)));
         env.require(offers(bob, 1));
-        env.require(owners(bob, 3));
+        env.require(Owners(bob, 3));
 
-        env.require(balance(alice, USD(6)));
-        env.require(balance(alice, EUR(4)));
+        env.require(Balance(alice, usd(6)));
+        env.require(Balance(alice, eur(4)));
         env.require(offers(alice, 0));
-        env.require(owners(alice, 2));
+        env.require(Owners(alice, 2));
 
-        env.require(balance(carol, USD(0)));
-        env.require(balance(carol, EUR(none)));
+        env.require(Balance(carol, usd(0)));
+        env.require(Balance(carol, eur(kNONE)));
 
         env.require(offers(carol, 0));
-        env.require(owners(carol, 1));
+        env.require(Owners(carol, 1));
     }
 
     void
@@ -1921,9 +1922,9 @@ public:
         auto const gw3 = Account{"gateway_3"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD1 = gw1["USD"];
-        auto const USD2 = gw2["USD"];
-        auto const USD3 = gw3["USD"];
+        auto const usD1 = gw1["USD"];
+        auto const usD2 = gw2["USD"];
+        auto const usD3 = gw3["USD"];
 
         // Provide micro amounts to compensate for fees to make results round
         // nice.
@@ -1931,24 +1932,24 @@ public:
         // fees:
         //  1 for each trust limit == 3 (alice < mtgox/amazon/bitstamp) +
         //  1 for payment          == 4
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(3) + env.current()->fees().base * 4;
 
-        env.fund(starting_xrp, gw1, gw2, gw3, alice, bob);
+        env.fund(startingXrp, gw1, gw2, gw3, alice, bob);
         env.close();
 
-        env(trust(alice, USD1(1000)));
-        env(trust(alice, USD2(1000)));
-        env(trust(alice, USD3(1000)));
-        env(trust(bob, USD1(1000)));
-        env(trust(bob, USD2(1000)));
+        env(trust(alice, usD1(1000)));
+        env(trust(alice, usD2(1000)));
+        env(trust(alice, usD3(1000)));
+        env(trust(bob, usD1(1000)));
+        env(trust(bob, usD2(1000)));
 
         env(pay(gw1, bob, bob["USD"](500)));
 
-        env(offer(bob, XRP(200), USD1(200)));
+        env(offer(bob, XRP(200), usD1(200)));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
-        env(offer(alice, USD1(200), XRP(200)));
+        env(offer(alice, usD1(200), XRP(200)));
 
         auto jrr = ledgerEntryState(env, alice, gw1, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "100");
@@ -1968,10 +1969,10 @@ public:
 
         using namespace jtx;
 
-        for (auto NumberSwitchOver : {false, true})
+        for (auto numberSwitchOver : {false, true})
         {
             Env env{*this, features};
-            if (NumberSwitchOver)
+            if (numberSwitchOver)
             {
                 env.enableFeature(fixUniversalNumber);
             }
@@ -1983,31 +1984,31 @@ public:
             auto const gw = Account{"gateway"};
             auto const alice = Account{"alice"};
             auto const bob = Account{"bob"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
 
             env.fund(XRP(10000), gw, alice, bob);
             env.close();
 
             env(rate(gw, 1.005));
 
-            env(trust(alice, USD(1000)));
-            env(trust(bob, USD(1000)));
+            env(trust(alice, usd(1000)));
+            env(trust(bob, usd(1000)));
             env(trust(gw, alice["USD"](50)));
 
             env(pay(gw, bob, bob["USD"](1)));
-            env(pay(alice, gw, USD(50)));
+            env(pay(alice, gw, usd(50)));
 
             env(trust(gw, alice["USD"](0)));
 
-            env(offer(alice, USD(50), XRP(150000)));
-            env(offer(bob, XRP(100), USD(0.1)));
+            env(offer(alice, usd(50), XRP(150000)));
+            env(offer(bob, XRP(100), usd(0.1)));
 
             auto jrr = ledgerEntryState(env, alice, gw, "USD");
             BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "49.96666666666667");
 
             jrr = ledgerEntryState(env, bob, gw, "USD");
-            Json::Value const bobUSD = jrr[jss::node][sfBalance.fieldName][jss::value];
-            if (!NumberSwitchOver)
+            json::Value const bobUSD = jrr[jss::node][sfBalance.fieldName][jss::value];
+            if (!numberSwitchOver)
             {
                 BEAST_EXPECT(bobUSD == "-0.966500000033334");
             }
@@ -2030,24 +2031,24 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice, bob);
+        env.fund(startingXrp, gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, usd(1000)));
 
         env(pay(gw, bob, bob["USD"](500)));
 
-        env(offer(bob, XRP(200), USD(200)), json(jss::Flags, tfSell));
+        env(offer(bob, XRP(200), usd(200)), Json(jss::Flags, tfSell));
         // Alice has 350 + fees - a reserve of 50 = 250 reserve = 100 available.
         // Alice has 350 + fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
-        env(offer(alice, USD(200), XRP(200)), json(jss::Flags, tfSell));
+        env(offer(alice, usd(200), XRP(200)), Json(jss::Flags, tfSell));
 
         auto jrr = ledgerEntryState(env, alice, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-100");
@@ -2072,26 +2073,26 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100) + env.current()->fees().accountReserve(1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice, bob);
+        env.fund(startingXrp, gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(150)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(150)));
+        env(trust(bob, usd(1000)));
 
         env(pay(gw, bob, bob["USD"](500)));
 
-        env(offer(bob, XRP(100), USD(200)));
+        env(offer(bob, XRP(100), usd(200)));
         // Alice has 350 fees - a reserve of 50 = 250 reserve = 100 available.
         // Ask for more than available to prove reserve works.
         // Taker pays 100 USD for 100 XRP.
         // Selling XRP.
         // Will sell all 100 XRP and get more USD than asked for.
-        env(offer(alice, USD(100), XRP(100)), json(jss::Flags, tfSell));
+        env(offer(alice, usd(100), XRP(100)), Json(jss::Flags, tfSell));
 
         auto jrr = ledgerEntryState(env, alice, gw, "USD");
         BEAST_EXPECT(jrr[jss::node][sfBalance.fieldName][jss::value] == "-200");
@@ -2116,31 +2117,31 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const XTS = gw["XTS"];
-        auto const XXX = gw["XXX"];
+        auto const xts = gw["XTS"];
+        auto const xxx = gw["XXX"];
 
-        auto const starting_xrp =
+        auto const startingXrp =
             XRP(100.1) + env.current()->fees().accountReserve(1) + env.current()->fees().base * 2;
 
-        env.fund(starting_xrp, gw, alice, bob);
+        env.fund(startingXrp, gw, alice, bob);
         env.close();
 
-        env(trust(alice, XTS(1000)));
-        env(trust(alice, XXX(1000)));
-        env(trust(bob, XTS(1000)));
-        env(trust(bob, XXX(1000)));
+        env(trust(alice, xts(1000)));
+        env(trust(alice, xxx(1000)));
+        env(trust(bob, xts(1000)));
+        env(trust(bob, xxx(1000)));
 
         env(pay(gw, alice, alice["XTS"](100)));
         env(pay(gw, alice, alice["XXX"](100)));
         env(pay(gw, bob, bob["XTS"](100)));
         env(pay(gw, bob, bob["XXX"](100)));
 
-        env(offer(alice, XTS(100), XXX(100)));
+        env(offer(alice, xts(100), xxx(100)));
 
         // WS client is used here because the RPC client could not
         // be convinced to pass the build_path argument
         auto wsc = makeWSClient(env.app().config());
-        Json::Value payment;
+        json::Value payment;
         payment[jss::secret] = toBase58(generateSeed("bob"));
         payment[jss::id] = env.seq(bob);
         payment[jss::build_path] = true;
@@ -2148,7 +2149,7 @@ public:
         payment[jss::tx_json][jss::Sequence] =
             env.current()->read(keylet::account(bob.id()))->getFieldU32(sfSequence);
         payment[jss::tx_json][jss::Fee] = to_string(env.current()->fees().base);
-        payment[jss::tx_json][jss::SendMax] = bob["XTS"](1.5).value().getJson(JsonOptions::none);
+        payment[jss::tx_json][jss::SendMax] = bob["XTS"](1.5).value().getJson(JsonOptions::KNone);
         auto jrr = wsc->invoke("submit", payment);
         BEAST_EXPECT(jrr[jss::status] == "success");
         BEAST_EXPECT(jrr[jss::result][jss::engine_result] == "tesSUCCESS");
@@ -2217,7 +2218,7 @@ public:
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env{*this, features};
 
@@ -2228,13 +2229,13 @@ public:
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum class preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
+        enum class PreTrustType { NoPreTrust, GwPreTrust, AcctPreTrust };
         struct TestData
         {
             std::string account;      // Account operated on
             STAmount fundXrp;         // Account funded with
             int bookAmount;           // USD -> XRP offer on the books
-            preTrustType preTrust;    // If true, pre-establish trust line
+            PreTrustType preTrust;    // If true, pre-establish trust line
             int offerAmount;          // Account offers this much XRP -> USD
             TER tec;                  // Returned tec code
             STAmount spentXrp;        // Amount removed from fundXrp
@@ -2246,45 +2247,45 @@ public:
         // clang-format off
         TestData const tests[]{
             // acct                     fundXrp        bookAmt   preTrust  offerAmount                   tec     spentXrp       balanceUSD offers  owners
-            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
-            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
-            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
-            {.account="deb", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},  // Account has enough to buy a little USD then the offer runs dry.
-            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},  // No offer to cross
-            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=USD(     50),    .offers=0, .owners=1},
-            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=USD(    800),    .offers=0, .owners=1},
-            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
-            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=USD(    998),    .offers=0, .owners=1},
-            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=1, .owners=2},
-            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=USD(    999),    .offers=0, .owners=1},
-            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=USD(   1000),    .offers=0, .owners=1},
-            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preTrust=preTrustType::noPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
+            {.account="ann",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account is at the reserve, and will dip below once fees are subtracted.
+            {.account="bev",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account has just enough for the reserve and the fee.
+            {.account="cam",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},  // Account has enough for the reserve, the fee and the offer, and a bit more, but not enough for the reserve after the offer is placed.
+            {.account="deb", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=usd(0.00001),    .offers=0, .owners=1},  // Account has enough to buy a little USD then the offer runs dry.
+            {.account="eve",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=1, .owners=1},  // No offer to cross
+            {.account="flo",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="gay",             .fundXrp=reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(  50)   + f, .balanceUsd=usd(     50),    .offers=0, .owners=1},
+            {.account="hye", .fundXrp=XRP(1000)                   + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 800)   + f, .balanceUsd=usd(    800),    .offers=0, .owners=1},
+            {.account="ivy", .fundXrp=XRP(   1) + reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="joy", .fundXrp=XRP(   1) + reserve(env, 2) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(   1)   + f, .balanceUsd=usd(      1),    .offers=1, .owners=2},
+            {.account="kim", .fundXrp=XRP( 900) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="liz", .fundXrp=XRP( 998) + reserve(env, 0) + 1 * f,  .bookAmount=999,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 998)   + f, .balanceUsd=usd(    998),    .offers=0, .owners=1},
+            {.account="meg", .fundXrp=XRP( 998) + reserve(env, 1) + 1 * f,  .bookAmount=999,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="nia", .fundXrp=XRP( 998) + reserve(env, 2) + 1 * f,  .bookAmount=999,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=1, .owners=2},
+            {.account="ova", .fundXrp=XRP( 999) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 999)   + f, .balanceUsd=usd(    999),    .offers=0, .owners=1},
+            {.account="pam", .fundXrp=XRP( 999) + reserve(env, 1) + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=usd(   1000),    .offers=0, .owners=1},
+            {.account="rae", .fundXrp=XRP( 999) + reserve(env, 2) + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(1000)   + f, .balanceUsd=usd(   1000),    .offers=0, .owners=1},
+            {.account="sue", .fundXrp=XRP(1000) + reserve(env, 2) + 1 * f,    .bookAmount=0,   .preTrust=PreTrustType::NoPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=1, .owners=1},
             //---------------- Pre-established trust lines ---------------------
-            {.account="abe",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="bud",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="che",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=0, .owners=0},
-            {.account="dan", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=USD(0.00001),    .offers=0, .owners=0},
-            {.account="eli", .fundXrp=XRP(  20) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 1 * f, .balanceUsd=USD(     20),    .offers=0, .owners=0},
-            {.account="fyn",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=USD(      0),    .offers=1, .owners=1},
-            {.account="gar",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
-            {.account="hal",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=preTrustType::gwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=USD(      1),    .offers=1, .owners=1},
+            {.account="abe",             .fundXrp=reserve(env, 0) + 0 * f,    .bookAmount=1,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},
+            {.account="bud",             .fundXrp=reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},
+            {.account="che",             .fundXrp=reserve(env, 0) + 2 * f,    .bookAmount=0,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=0, .owners=0},
+            {.account="dan", .fundXrp=drops(10) + reserve(env, 0) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10)   + f, .balanceUsd=usd(0.00001),    .offers=0, .owners=0},
+            {.account="eli", .fundXrp=XRP(  20) + reserve(env, 0) + 1 * f, .bookAmount=1000,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 1 * f, .balanceUsd=usd(     20),    .offers=0, .owners=0},
+            {.account="fyn",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=0,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,               .spentXrp=f, .balanceUsd=usd(      0),    .offers=1, .owners=1},
+            {.account="gar",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=usd(      1),    .offers=1, .owners=1},
+            {.account="hal",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1,   .preTrust=PreTrustType::GwPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) +     f, .balanceUsd=usd(      1),    .offers=1, .owners=1},
 
-            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="syd", .fundXrp=drops(10) + reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10) + 2 * f, .balanceUsd=USD(0.00001),    .offers=0, .owners=1},
-            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=USD(     20),    .offers=0, .owners=1},
-            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=0, .owners=1},
-            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=0, .owners=1},
-            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=USD(      0),    .offers=1, .owners=2},
-            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preTrust=preTrustType::acctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=USD(      1),    .offers=1, .owners=2},
+            {.account="ned",             .fundXrp=reserve(env, 1) + 0 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="ole",             .fundXrp=reserve(env, 1) + 1 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="pat",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=0, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="quy",             .fundXrp=reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,      .tec=tecUNFUNDED_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="ron",             .fundXrp=reserve(env, 1) + 3 * f,    .bookAmount=0, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="syd", .fundXrp=drops(10) + reserve(env, 1) + 2 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=drops(10) + 2 * f, .balanceUsd=usd(0.00001),    .offers=0, .owners=1},
+            {.account="ted", .fundXrp=XRP(  20) + reserve(env, 1) + 2 * f, .bookAmount=1000, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP(20) + 2 * f, .balanceUsd=usd(     20),    .offers=0, .owners=1},
+            {.account="uli",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=0, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000, .tec=tecINSUF_RESERVE_OFFER,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=0, .owners=1},
+            {.account="vic",             .fundXrp=reserve(env, 2) + 0 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=usd(      1),    .offers=0, .owners=1},
+            {.account="wes",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=0, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS,           .spentXrp=2 * f, .balanceUsd=usd(      0),    .offers=1, .owners=2},
+            {.account="xan",             .fundXrp=reserve(env, 2) + 1 * f,    .bookAmount=1, .preTrust=PreTrustType::AcctPreTrust, .offerAmount=1000,             .tec=tesSUCCESS, .spentXrp=XRP( 1) + 2 * f, .balanceUsd=usd(      1),    .offers=1, .owners=2},
         };
         // clang-format on
 
@@ -2300,34 +2301,34 @@ public:
             // The gateway optionally creates an offer that would be crossed.
             auto const book = t.bookAmount;
             if (book != 0)
-                env(offer(gw, XRP(book), USD(book)));
+                env(offer(gw, XRP(book), usd(book)));
             env.close();
             std::uint32_t const gwOfferSeq = env.seq(gw) - 1;
 
             // Optionally pre-establish a trustline between gw and acct.
-            if (t.preTrust == preTrustType::gwPreTrust)
+            if (t.preTrust == PreTrustType::GwPreTrust)
                 env(trust(gw, acct["USD"](1)));
             env.close();
 
             // Optionally pre-establish a trustline between acct and gw.
             // Note this is not really part of the test, so we expect there
             // to be enough XRP reserve for acct to create the trust line.
-            if (t.preTrust == preTrustType::acctPreTrust)
-                env(trust(acct, USD(1)));
+            if (t.preTrust == PreTrustType::AcctPreTrust)
+                env(trust(acct, usd(1)));
             env.close();
 
             {
                 // Acct creates an offer.  This is the heart of the test.
                 auto const acctOffer = t.offerAmount;
-                env(offer(acct, USD(acctOffer), XRP(acctOffer)), ter(t.tec));
+                env(offer(acct, usd(acctOffer), XRP(acctOffer)), Ter(t.tec));
                 env.close();
             }
             std::uint32_t const acctOfferSeq = env.seq(acct) - 1;
 
-            BEAST_EXPECT(env.balance(acct, USD) == t.balanceUsd);
+            BEAST_EXPECT(env.balance(acct, usd) == t.balanceUsd);
             BEAST_EXPECT(env.balance(acct, xrpIssue()) == t.fundXrp - t.spentXrp);
             env.require(offers(acct, t.offers));
-            env.require(owners(acct, t.owners));
+            env.require(Owners(acct, t.owners));
 
             auto acctOffers = offersOnAccount(env, acct);
             BEAST_EXPECT(acctOffers.size() == t.offers);
@@ -2337,10 +2338,10 @@ public:
 
                 auto const leftover = t.offerAmount - t.bookAmount;
                 BEAST_EXPECT(acctOffer[sfTakerGets] == XRP(leftover));
-                BEAST_EXPECT(acctOffer[sfTakerPays] == USD(leftover));
+                BEAST_EXPECT(acctOffer[sfTakerPays] == usd(leftover));
             }
 
-            if (t.preTrust == preTrustType::noPreTrust)
+            if (t.preTrust == PreTrustType::NoPreTrust)
             {
                 if (t.balanceUsd.value().signum() != 0)
                 {
@@ -2350,15 +2351,15 @@ public:
                 else
                 {
                     // Verify that no trustline was created.
-                    auto const sleTrust = env.le(keylet::line(acct, USD));
+                    auto const sleTrust = env.le(keylet::line(acct, usd));
                     BEAST_EXPECT(!sleTrust);
                 }
             }
 
             // Give the next loop a clean slate by canceling any left-overs
             // in the offers.
-            env(offer_cancel(acct, acctOfferSeq));
-            env(offer_cancel(gw, gwOfferSeq));
+            env(offerCancel(acct, acctOfferSeq));
+            env(offerCancel(gw, gwOfferSeq));
             env.close();
         }
     }
@@ -2373,9 +2374,9 @@ public:
         auto const gw = Account("gateway");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const usdOffer = USD(1000);
+        auto const usdOffer = usd(1000);
         auto const xrpOffer = XRP(1000);
 
         Env env{*this, features};
@@ -2397,7 +2398,7 @@ public:
 
         env(pay(gw, alice, usdOffer));
         env.close();
-        env.require(balance(alice, usdOffer), offers(alice, 0), offers(bob, 0));
+        env.require(Balance(alice, usdOffer), offers(alice, 0), offers(bob, 0));
 
         // The scenario:
         //   o alice has USD but wants XRP.
@@ -2411,31 +2412,31 @@ public:
 
         env.close();
         env.require(
-            balance(alice, USD(0)),
-            balance(bob, usdOffer),
-            balance(alice, aliceXRP + xrpOffer - fee),
-            balance(bob, bobXRP - xrpOffer - fee),
+            Balance(alice, usd(0)),
+            Balance(bob, usdOffer),
+            Balance(alice, aliceXRP + xrpOffer - fee),
+            Balance(bob, bobXRP - xrpOffer - fee),
             offers(alice, 0),
             offers(bob, 0));
 
         verifyDefaultTrustline(env, bob, usdOffer);
 
         // Make two more offers that leave one of the offers non-dry.
-        env(offer(alice, USD(999), XRP(999)));
+        env(offer(alice, usd(999), XRP(999)));
         env(offer(bob, xrpOffer, usdOffer));
 
         env.close();
-        env.require(balance(alice, USD(999)));
-        env.require(balance(bob, USD(1)));
+        env.require(Balance(alice, usd(999)));
+        env.require(Balance(bob, usd(1)));
         env.require(offers(alice, 0));
-        verifyDefaultTrustline(env, bob, USD(1));
+        verifyDefaultTrustline(env, bob, usd(1));
         {
             auto const bobOffers = offersOnAccount(env, bob);
             BEAST_EXPECT(bobOffers.size() == 1);
             auto const& bobOffer = *(bobOffers.front());
 
             BEAST_EXPECT(bobOffer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(bobOffer[sfTakerGets] == USD(1));
+            BEAST_EXPECT(bobOffer[sfTakerGets] == usd(1));
             BEAST_EXPECT(bobOffer[sfTakerPays] == XRP(1));
         }
     }
@@ -2450,11 +2451,11 @@ public:
         auto const gw = Account("gateway");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
-        auto const usdOffer = USD(1000);
-        auto const eurOffer = EUR(1000);
+        auto const usdOffer = usd(1000);
+        auto const eurOffer = eur(1000);
 
         Env env{*this, features};
 
@@ -2478,7 +2479,7 @@ public:
         env(pay(gw, bob, eurOffer));
         env.close();
 
-        env.require(balance(alice, usdOffer), balance(bob, eurOffer));
+        env.require(Balance(alice, usdOffer), Balance(bob, eurOffer));
 
         // The scenario:
         //   o alice has USD but wants EUR.
@@ -2488,7 +2489,7 @@ public:
 
         env.close();
         env.require(
-            balance(alice, eurOffer), balance(bob, usdOffer), offers(alice, 0), offers(bob, 0));
+            Balance(alice, eurOffer), Balance(bob, usdOffer), offers(alice, 0), offers(bob, 0));
 
         // Alice's offer crossing created a default EUR trustline and
         // Bob's offer crossing created a default USD trustline:
@@ -2501,16 +2502,16 @@ public:
         env(offer(bob, eurOffer, usdOffer));
         env.close();
 
-        env(offer(alice, USD(999), eurOffer));
+        env(offer(alice, usd(999), eurOffer));
         env.close();
 
         env.require(offers(alice, 0));
         env.require(offers(bob, 1));
 
-        env.require(balance(alice, USD(999)));
-        env.require(balance(alice, EUR(1)));
-        env.require(balance(bob, USD(1)));
-        env.require(balance(bob, EUR(999)));
+        env.require(Balance(alice, usd(999)));
+        env.require(Balance(alice, eur(1)));
+        env.require(Balance(bob, usd(1)));
+        env.require(Balance(bob, eur(999)));
 
         {
             auto bobOffers = offersOnAccount(env, bob);
@@ -2518,29 +2519,29 @@ public:
             {
                 auto const& bobOffer = *(bobOffers.front());
 
-                BEAST_EXPECT(bobOffer[sfTakerGets] == USD(1));
-                BEAST_EXPECT(bobOffer[sfTakerPays] == EUR(1));
+                BEAST_EXPECT(bobOffer[sfTakerGets] == usd(1));
+                BEAST_EXPECT(bobOffer[sfTakerPays] == eur(1));
             }
         }
 
         // alice makes one more offer that cleans out bob's offer.
-        env(offer(alice, USD(1), EUR(1)));
+        env(offer(alice, usd(1), eur(1)));
         env.close();
 
-        env.require(balance(alice, USD(1000)));
-        env.require(balance(alice, EUR(none)));
-        env.require(balance(bob, USD(none)));
-        env.require(balance(bob, EUR(1000)));
+        env.require(Balance(alice, usd(1000)));
+        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));
 
         // The two trustlines that were generated by offers should be gone.
-        BEAST_EXPECT(!env.le(keylet::line(alice.id(), EUR)));
-        BEAST_EXPECT(!env.le(keylet::line(bob.id(), USD)));
+        BEAST_EXPECT(!env.le(keylet::line(alice.id(), eur)));
+        BEAST_EXPECT(!env.le(keylet::line(bob.id(), usd)));
 
         // Make two more offers that leave one of the offers non-dry. We
         // need to properly sequence the transactions:
-        env(offer(alice, EUR(999), usdOffer));
+        env(offer(alice, eur(999), usdOffer));
         env.close();
 
         env(offer(bob, usdOffer, eurOffer));
@@ -2549,10 +2550,10 @@ public:
         env.require(offers(alice, 0));
         env.require(offers(bob, 0));
 
-        env.require(balance(alice, USD(0)));
-        env.require(balance(alice, EUR(999)));
-        env.require(balance(bob, USD(1000)));
-        env.require(balance(bob, EUR(1)));
+        env.require(Balance(alice, usd(0)));
+        env.require(Balance(alice, eur(999)));
+        env.require(Balance(bob, usd(1000)));
+        env.require(Balance(bob, eur(1)));
     }
 
     void
@@ -2566,11 +2567,11 @@ public:
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const carol = Account("carol");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
-        auto const usdOffer = USD(1000);
-        auto const eurOffer = EUR(1000);
+        auto const usdOffer = usd(1000);
+        auto const eurOffer = eur(1000);
 
         Env env{*this, features};
 
@@ -2596,24 +2597,24 @@ public:
         env.close();
 
         // carol makes an offer that partially consumes alice and bob's offers.
-        env(offer(carol, USD(400), EUR(400)));
+        env(offer(carol, usd(400), eur(400)));
         env.close();
 
         env.require(
-            balance(alice, USD(600)),
-            balance(bob, EUR(400)),
-            balance(carol, USD(400)),
-            balance(bob, bobXrpBalance - XRP(400)),
+            Balance(alice, usd(600)),
+            Balance(bob, eur(400)),
+            Balance(carol, usd(400)),
+            Balance(bob, bobXrpBalance - XRP(400)),
             offers(carol, 0));
-        verifyDefaultTrustline(env, bob, EUR(400));
-        verifyDefaultTrustline(env, carol, USD(400));
+        verifyDefaultTrustline(env, bob, eur(400));
+        verifyDefaultTrustline(env, carol, usd(400));
         {
             auto const aliceOffers = offersOnAccount(env, alice);
             BEAST_EXPECT(aliceOffers.size() == 1);
             auto const& aliceOffer = *(aliceOffers.front());
 
             BEAST_EXPECT(aliceOffer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(aliceOffer[sfTakerGets] == USD(600));
+            BEAST_EXPECT(aliceOffer[sfTakerGets] == usd(600));
             BEAST_EXPECT(aliceOffer[sfTakerPays] == XRP(600));
         }
         {
@@ -2623,22 +2624,22 @@ public:
 
             BEAST_EXPECT(bobOffer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(bobOffer[sfTakerGets] == XRP(600));
-            BEAST_EXPECT(bobOffer[sfTakerPays] == EUR(600));
+            BEAST_EXPECT(bobOffer[sfTakerPays] == eur(600));
         }
 
         // carol makes an offer that exactly consumes alice and bob's offers.
-        env(offer(carol, USD(600), EUR(600)));
+        env(offer(carol, usd(600), eur(600)));
         env.close();
 
         env.require(
-            balance(alice, USD(0)),
-            balance(bob, eurOffer),
-            balance(carol, usdOffer),
-            balance(bob, bobXrpBalance - XRP(1000)),
+            Balance(alice, usd(0)),
+            Balance(bob, eurOffer),
+            Balance(carol, usdOffer),
+            Balance(bob, bobXrpBalance - XRP(1000)),
             offers(bob, 0),
             offers(carol, 0));
-        verifyDefaultTrustline(env, bob, EUR(1000));
-        verifyDefaultTrustline(env, carol, USD(1000));
+        verifyDefaultTrustline(env, bob, eur(1000));
+        verifyDefaultTrustline(env, carol, usd(1000));
 
         // In pre-flow code alice's offer is left empty in the ledger.
         auto const aliceOffers = offersOnAccount(env, alice);
@@ -2648,7 +2649,7 @@ public:
             auto const& aliceOffer = *(aliceOffers.front());
 
             BEAST_EXPECT(aliceOffer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(aliceOffer[sfTakerGets] == USD(0));
+            BEAST_EXPECT(aliceOffer[sfTakerGets] == usd(0));
             BEAST_EXPECT(aliceOffer[sfTakerPays] == XRP(0));
         }
     }
@@ -2664,7 +2665,7 @@ public:
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env{*this, features};
 
@@ -2675,7 +2676,7 @@ public:
         auto const f = env.current()->fees().base;
 
         // To keep things simple all offers are 1 : 1 for XRP : USD.
-        enum class preTrustType { noPreTrust, gwPreTrust, acctPreTrust };
+        enum class PreTrustType { NoPreTrust, GwPreTrust, AcctPreTrust };
         struct TestData
         {
             std::string account;  // Account operated on
@@ -2695,64 +2696,64 @@ public:
 
             // Constructor with takerGets/takerPays
             TestData(
-                std::string&& account_,  // Account operated on
-                STAmount fundXrp_,       // XRP acct funded with
-                STAmount fundUSD_,       // USD acct funded with
-                STAmount gwGets_,        // gw's offer
-                STAmount gwPays_,        //
-                STAmount acctGets_,      // acct's offer
-                STAmount acctPays_,      //
-                TER tec_,                // Returned tec code
-                STAmount spentXrp_,      // Amount removed from fundXrp
-                STAmount finalUsd_,      // Final USD balance on acct
-                int offers_,             // Offers on acct
-                int owners_,             // Owners on acct
-                STAmount takerGets_,     // Remainder of acct's offer
-                STAmount takerPays_)     //
-                : account(std::move(account_))
-                , fundXrp(std::move(fundXrp_))
-                , fundUSD(std::move(fundUSD_))
-                , gwGets(std::move(gwGets_))
-                , gwPays(std::move(gwPays_))
-                , acctGets(std::move(acctGets_))
-                , acctPays(std::move(acctPays_))
-                , tec(tec_)
-                , spentXrp(std::move(spentXrp_))
-                , finalUsd(std::move(finalUsd_))
-                , offers(offers_)
-                , owners(owners_)
-                , takerGets(std::move(takerGets_))
-                , takerPays(std::move(takerPays_))
+                std::string&& account,  // Account operated on
+                STAmount fundXrp,       // XRP acct funded with
+                STAmount fundUsd,       // USD acct funded with
+                STAmount gwGets,        // gw's offer
+                STAmount gwPays,        //
+                STAmount acctGets,      // acct's offer
+                STAmount acctPays,      //
+                TER tec,                // Returned tec code
+                STAmount spentXrp,      // Amount removed from fundXrp
+                STAmount finalUsd,      // Final USD balance on acct
+                int offers,             // Offers on acct
+                int owners,             // Owners on acct
+                STAmount takerGets,     // Remainder of acct's offer
+                STAmount takerPays)     //
+                : account(std::move(account))
+                , fundXrp(std::move(fundXrp))
+                , fundUSD(std::move(fundUsd))
+                , gwGets(std::move(gwGets))
+                , gwPays(std::move(gwPays))
+                , acctGets(std::move(acctGets))
+                , acctPays(std::move(acctPays))
+                , tec(tec)
+                , spentXrp(std::move(spentXrp))
+                , finalUsd(std::move(finalUsd))
+                , offers(offers)
+                , owners(owners)
+                , takerGets(std::move(takerGets))
+                , takerPays(std::move(takerPays))
             {
             }
 
             // Constructor without takerGets/takerPays
             TestData(
-                std::string&& account_,     // Account operated on
-                STAmount const& fundXrp_,   // XRP acct funded with
-                STAmount const& fundUSD_,   // USD acct funded with
-                STAmount const& gwGets_,    // gw's offer
-                STAmount const& gwPays_,    //
-                STAmount const& acctGets_,  // acct's offer
-                STAmount const& acctPays_,  //
-                TER tec_,                   // Returned tec code
-                STAmount const& spentXrp_,  // Amount removed from fundXrp
-                STAmount const& finalUsd_,  // Final USD balance on acct
-                int offers_,                // Offers on acct
-                int owners_)                // Owners on acct
+                std::string&& account,     // Account operated on
+                STAmount const& fundXrp,   // XRP acct funded with
+                STAmount const& fundUsd,   // USD acct funded with
+                STAmount const& gwGets,    // gw's offer
+                STAmount const& gwPays,    //
+                STAmount const& acctGets,  // acct's offer
+                STAmount const& acctPays,  //
+                TER tec,                   // Returned tec code
+                STAmount const& spentXrp,  // Amount removed from fundXrp
+                STAmount const& finalUsd,  // Final USD balance on acct
+                int offers,                // Offers on acct
+                int owners)                // Owners on acct
                 : TestData(
-                      std::move(account_),
-                      fundXrp_,
-                      fundUSD_,
-                      gwGets_,
-                      gwPays_,
-                      acctGets_,
-                      acctPays_,
-                      tec_,
-                      spentXrp_,
-                      finalUsd_,
-                      offers_,
-                      owners_,
+                      std::move(account),
+                      fundXrp,
+                      fundUsd,
+                      gwGets,
+                      gwPays,
+                      acctGets,
+                      acctPays,
+                      tec,
+                      spentXrp,
+                      finalUsd,
+                      offers,
+                      owners,
                       STAmount{0},
                       STAmount{0})
             {
@@ -2763,26 +2764,26 @@ public:
         TestData const tests[]{
             // acct pays XRP
             // acct                           fundXrp  fundUSD   gwGets   gwPays acctGets acctPays                     tec            spentXrp  finalUSD offers  owners  takerGets  takerPays
-            {"ann", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD( 5), USD(10), XRP(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (1 * f), USD( 0),      0,      0},
-            {"bev", XRP(10) + reserve(env, 1) + 1 * f, USD( 0), XRP(10), USD( 5), USD(10), XRP(10),             tesSUCCESS, XRP(  0) + (1 * f), USD( 0),      1,      1,   XRP(10), USD(10)},
-            {"cam", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(10), USD(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), USD(10),      0,      1},
-            {"deb", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"eve", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD( 5), XRP( 5),             tesSUCCESS, XRP(  5) + (1 * f), USD(10),      0,      1},
-            {"flo", XRP(10) + reserve(env, 0) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"gay", XRP(20) + reserve(env, 1) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      0,      1},
-            {"hye", XRP(20) + reserve(env, 2) + 1 * f, USD( 0), XRP(10), USD(20), USD(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), USD(20),      1,      2,   XRP(10), USD(10)},
+            {"ann", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd( 5), usd(10), XRP(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (1 * f), usd( 0),      0,      0},
+            {"bev", XRP(10) + reserve(env, 1) + 1 * f, usd( 0), XRP(10), usd( 5), usd(10), XRP(10),             tesSUCCESS, XRP(  0) + (1 * f), usd( 0),      1,      1,   XRP(10), usd(10)},
+            {"cam", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(10), usd(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), usd(10),      0,      1},
+            {"deb", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd(10), XRP(10),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"eve", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd( 5), XRP( 5),             tesSUCCESS, XRP(  5) + (1 * f), usd(10),      0,      1},
+            {"flo", XRP(10) + reserve(env, 0) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"gay", XRP(20) + reserve(env, 1) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      0,      1},
+            {"hye", XRP(20) + reserve(env, 2) + 1 * f, usd( 0), XRP(10), usd(20), usd(20), XRP(20),             tesSUCCESS, XRP( 10) + (1 * f), usd(20),      1,      2,   XRP(10), usd(10)},
             // acct pays USD
-            {"meg",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP( 5), XRP(10), USD(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (2 * f), USD(10),      0,      1},
-            {"nia",           reserve(env, 2) + 2 * f, USD(10), USD(10), XRP( 5), XRP(10), USD(10),             tesSUCCESS, XRP(  0) + (2 * f), USD(10),      1,      2,   USD(10), XRP(10)},
-            {"ova",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP(10), XRP(10), USD(10),             tesSUCCESS, XRP(-10) + (2 * f), USD( 0),      0,      1},
-            {"pam",           reserve(env, 1) + 2 * f, USD(10), USD(10), XRP(20), XRP(10), USD(10),             tesSUCCESS, XRP(-20) + (2 * f), USD( 0),      0,      1},
-            {"qui",           reserve(env, 1) + 2 * f, USD(10), USD(20), XRP(40), XRP(10), USD(10),             tesSUCCESS, XRP(-20) + (2 * f), USD( 0),      0,      1},
-            {"rae",           reserve(env, 2) + 2 * f, USD(10), USD( 5), XRP( 5), XRP(10), USD(10),             tesSUCCESS, XRP( -5) + (2 * f), USD( 5),      1,      2,   USD( 5), XRP( 5)},
-            {"sue",           reserve(env, 2) + 2 * f, USD(10), USD( 5), XRP(10), XRP(10), USD(10),             tesSUCCESS, XRP(-10) + (2 * f), USD( 5),      1,      2,   USD( 5), XRP( 5)},
+            {"meg",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP( 5), XRP(10), usd(10), tecINSUF_RESERVE_OFFER, XRP(  0) + (2 * f), usd(10),      0,      1},
+            {"nia",           reserve(env, 2) + 2 * f, usd(10), usd(10), XRP( 5), XRP(10), usd(10),             tesSUCCESS, XRP(  0) + (2 * f), usd(10),      1,      2,   usd(10), XRP(10)},
+            {"ova",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP(10), XRP(10), usd(10),             tesSUCCESS, XRP(-10) + (2 * f), usd( 0),      0,      1},
+            {"pam",           reserve(env, 1) + 2 * f, usd(10), usd(10), XRP(20), XRP(10), usd(10),             tesSUCCESS, XRP(-20) + (2 * f), usd( 0),      0,      1},
+            {"qui",           reserve(env, 1) + 2 * f, usd(10), usd(20), XRP(40), XRP(10), usd(10),             tesSUCCESS, XRP(-20) + (2 * f), usd( 0),      0,      1},
+            {"rae",           reserve(env, 2) + 2 * f, usd(10), usd( 5), XRP( 5), XRP(10), usd(10),             tesSUCCESS, XRP( -5) + (2 * f), usd( 5),      1,      2,   usd( 5), XRP( 5)},
+            {"sue",           reserve(env, 2) + 2 * f, usd(10), usd( 5), XRP(10), XRP(10), usd(10),             tesSUCCESS, XRP(-10) + (2 * f), usd( 5),      1,      2,   usd( 5), XRP( 5)},
         };
         // clang-format on
 
-        auto const zeroUsd = USD(0);
+        auto const zeroUsd = usd(0);
         for (auto const& t : tests)
         {
             // Make sure gateway has no current offers.
@@ -2809,15 +2810,15 @@ public:
             std::uint32_t const gwOfferSeq = env.seq(gw) - 1;
 
             // Acct creates a tfSell offer.  This is the heart of the test.
-            env(offer(acct, t.acctGets, t.acctPays, tfSell), ter(t.tec));
+            env(offer(acct, t.acctGets, t.acctPays, tfSell), Ter(t.tec));
             env.close();
             std::uint32_t const acctOfferSeq = env.seq(acct) - 1;
 
             // Check results
-            BEAST_EXPECT(env.balance(acct, USD) == t.finalUsd);
+            BEAST_EXPECT(env.balance(acct, usd) == t.finalUsd);
             BEAST_EXPECT(env.balance(acct, xrpIssue()) == t.fundXrp - t.spentXrp);
             env.require(offers(acct, t.offers));
-            env.require(owners(acct, t.owners));
+            env.require(Owners(acct, t.owners));
 
             if (t.offers != 0)
             {
@@ -2835,8 +2836,8 @@ public:
 
             // Give the next loop a clean slate by canceling any left-overs
             // in the offers.
-            env(offer_cancel(acct, acctOfferSeq));
-            env(offer_cancel(gw, gwOfferSeq));
+            env(offerCancel(acct, acctOfferSeq));
+            env(offerCancel(gw, gwOfferSeq));
             env.close();
         }
     }
@@ -2853,7 +2854,7 @@ public:
         auto const gw = Account("gateway");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env{*this, features};
 
@@ -2864,39 +2865,39 @@ public:
         TER const killedCode{TER{tecKILLED}};
 
         // bob offers XRP for USD.
-        env(trust(bob, USD(200)));
+        env(trust(bob, usd(200)));
         env.close();
-        env(pay(gw, bob, USD(100)));
+        env(pay(gw, bob, usd(100)));
         env.close();
-        env(offer(bob, XRP(2000), USD(20)));
+        env(offer(bob, XRP(2000), usd(20)));
         env.close();
         {
             // alice submits a tfSell | tfFillOrKill offer that does not cross.
-            env(offer(alice, USD(21), XRP(2100), tfSell | tfFillOrKill), ter(killedCode));
+            env(offer(alice, usd(21), XRP(2100), tfSell | tfFillOrKill), Ter(killedCode));
             env.close();
-            env.require(balance(alice, USD(none)));
+            env.require(Balance(alice, usd(kNONE)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(100)));
+            env.require(Balance(bob, usd(100)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that crosses.
             // Even though tfSell is present it doesn't matter this time.
-            env(offer(alice, USD(20), XRP(2000), tfSell | tfFillOrKill));
+            env(offer(alice, usd(20), XRP(2000), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(20)));
+            env.require(Balance(alice, usd(20)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(80)));
+            env.require(Balance(bob, usd(80)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that crosses and
             // returns more than was asked for (because of the tfSell flag).
-            env(offer(bob, XRP(2000), USD(20)));
+            env(offer(bob, XRP(2000), usd(20)));
             env.close();
-            env(offer(alice, USD(10), XRP(1500), tfSell | tfFillOrKill));
+            env(offer(alice, usd(10), XRP(1500), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(35)));
+            env.require(Balance(alice, usd(35)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(65)));
+            env.require(Balance(bob, usd(65)));
         }
         {
             // alice submits a tfSell | tfFillOrKill offer that doesn't cross.
@@ -2905,22 +2906,22 @@ public:
             // all of the offer is consumed.
 
             // We're using bob's left-over offer for XRP(500), USD(5)
-            env(offer(alice, USD(1), XRP(501), tfSell | tfFillOrKill), ter(killedCode));
+            env(offer(alice, usd(1), XRP(501), tfSell | tfFillOrKill), Ter(killedCode));
             env.close();
-            env.require(balance(alice, USD(35)));
+            env.require(Balance(alice, usd(35)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(65)));
+            env.require(Balance(bob, usd(65)));
         }
         {
             // Alice submits a tfSell | tfFillOrKill offer that finishes
             // off the remainder of bob's offer.
 
             // We're using bob's left-over offer for XRP(500), USD(5)
-            env(offer(alice, USD(1), XRP(500), tfSell | tfFillOrKill));
+            env(offer(alice, usd(1), XRP(500), tfSell | tfFillOrKill));
             env.close();
-            env.require(balance(alice, USD(40)));
+            env.require(Balance(alice, usd(40)));
             env.require(offers(alice, 0));
-            env.require(balance(bob, USD(60)));
+            env.require(Balance(bob, usd(60)));
         }
     }
 
@@ -2932,7 +2933,7 @@ public:
         using namespace jtx;
 
         auto const gw1 = Account("gateway1");
-        auto const USD = gw1["USD"];
+        auto const usd = gw1["USD"];
 
         Env env{*this, features};
 
@@ -2949,11 +2950,11 @@ public:
             env.fund(XRP(100) + reserve(env, 2) + (fee * 2), ann, bob);
             env.close();
 
-            env(trust(ann, USD(200)));
-            env(trust(bob, USD(200)));
+            env(trust(ann, usd(200)));
+            env(trust(bob, usd(200)));
             env.close();
 
-            env(pay(gw1, bob, USD(125)));
+            env(pay(gw1, bob, usd(125)));
             env.close();
 
             // bob offers to sell USD(100) for XRP.  alice takes bob's offer.
@@ -2962,18 +2963,18 @@ public:
             //
             // A comparable payment would look like this:
             //   env (pay (bob, alice, USD(100)), sendmax(USD(125)))
-            env(offer(bob, XRP(1), USD(100)));
+            env(offer(bob, XRP(1), usd(100)));
             env.close();
 
-            env(offer(ann, USD(100), XRP(1)));
+            env(offer(ann, usd(100), XRP(1)));
             env.close();
 
-            env.require(balance(ann, USD(100)));
-            env.require(balance(ann, XRP(99) + reserve(env, 2)));
+            env.require(Balance(ann, usd(100)));
+            env.require(Balance(ann, XRP(99) + reserve(env, 2)));
             env.require(offers(ann, 0));
 
-            env.require(balance(bob, USD(0)));
-            env.require(balance(bob, XRP(101) + reserve(env, 2)));
+            env.require(Balance(bob, usd(0)));
+            env.require(Balance(bob, XRP(101) + reserve(env, 2)));
             env.require(offers(bob, 0));
         }
         {
@@ -2984,25 +2985,25 @@ public:
             env.fund(XRP(100) + reserve(env, 2) + (fee * 2), che, deb);
             env.close();
 
-            env(trust(che, USD(200)));
-            env(trust(deb, USD(200)));
+            env(trust(che, usd(200)));
+            env(trust(deb, usd(200)));
             env.close();
 
-            env(pay(gw1, deb, USD(125)));
+            env(pay(gw1, deb, usd(125)));
             env.close();
 
-            env(offer(che, USD(100), XRP(1)));
+            env(offer(che, usd(100), XRP(1)));
             env.close();
 
-            env(offer(deb, XRP(1), USD(100)));
+            env(offer(deb, XRP(1), usd(100)));
             env.close();
 
-            env.require(balance(che, USD(100)));
-            env.require(balance(che, XRP(99) + reserve(env, 2)));
+            env.require(Balance(che, usd(100)));
+            env.require(Balance(che, XRP(99) + reserve(env, 2)));
             env.require(offers(che, 0));
 
-            env.require(balance(deb, USD(0)));
-            env.require(balance(deb, XRP(101) + reserve(env, 2)));
+            env.require(Balance(deb, usd(0)));
+            env.require(Balance(deb, XRP(101) + reserve(env, 2)));
             env.require(offers(deb, 0));
         }
         {
@@ -3012,26 +3013,26 @@ public:
             env.fund(XRP(20000) + (fee * 2), eve, fyn);
             env.close();
 
-            env(trust(eve, USD(1000)));
-            env(trust(fyn, USD(1000)));
+            env(trust(eve, usd(1000)));
+            env(trust(fyn, usd(1000)));
             env.close();
 
-            env(pay(gw1, eve, USD(100)));
-            env(pay(gw1, fyn, USD(100)));
+            env(pay(gw1, eve, usd(100)));
+            env(pay(gw1, fyn, usd(100)));
             env.close();
 
             // This test verifies that the amount removed from an offer
             // accounts for the transfer fee that is removed from the
             // account but not from the remaining offer.
-            env(offer(eve, USD(10), XRP(4000)));
+            env(offer(eve, usd(10), XRP(4000)));
             env.close();
             std::uint32_t const eveOfferSeq = env.seq(eve) - 1;
 
-            env(offer(fyn, XRP(2000), USD(5)));
+            env(offer(fyn, XRP(2000), usd(5)));
             env.close();
 
-            env.require(balance(eve, USD(105)));
-            env.require(balance(eve, XRP(18000)));
+            env.require(Balance(eve, usd(105)));
+            env.require(Balance(eve, XRP(18000)));
             auto const evesOffers = offersOnAccount(env, eve);
             BEAST_EXPECT(evesOffers.size() == 1);
             if (!evesOffers.empty())
@@ -3039,17 +3040,17 @@ public:
                 auto const& evesOffer = *(evesOffers.front());
                 BEAST_EXPECT(evesOffer[sfLedgerEntryType] == ltOFFER);
                 BEAST_EXPECT(evesOffer[sfTakerGets] == XRP(2000));
-                BEAST_EXPECT(evesOffer[sfTakerPays] == USD(5));
+                BEAST_EXPECT(evesOffer[sfTakerPays] == usd(5));
             }
-            env(offer_cancel(eve, eveOfferSeq));  // For later tests
+            env(offerCancel(eve, eveOfferSeq));  // For later tests
 
-            env.require(balance(fyn, USD(93.75)));
-            env.require(balance(fyn, XRP(22000)));
+            env.require(Balance(fyn, usd(93.75)));
+            env.require(Balance(fyn, XRP(22000)));
             env.require(offers(fyn, 0));
         }
         // Start messing with two non-native currencies.
         auto const gw2 = Account("gateway2");
-        auto const EUR = gw2["EUR"];
+        auto const eur = gw2["EUR"];
 
         env.fund(XRP(100000), gw2);
         env.close();
@@ -3064,30 +3065,30 @@ public:
             env.fund(reserve(env, 3) + (fee * 3), gay, hal);
             env.close();
 
-            env(trust(gay, USD(200)));
-            env(trust(gay, EUR(200)));
-            env(trust(hal, USD(200)));
-            env(trust(hal, EUR(200)));
+            env(trust(gay, usd(200)));
+            env(trust(gay, eur(200)));
+            env(trust(hal, usd(200)));
+            env(trust(hal, eur(200)));
             env.close();
 
-            env(pay(gw1, gay, USD(125)));
-            env(pay(gw2, hal, EUR(150)));
+            env(pay(gw1, gay, usd(125)));
+            env(pay(gw2, hal, eur(150)));
             env.close();
 
-            env(offer(gay, EUR(100), USD(100)));
+            env(offer(gay, eur(100), usd(100)));
             env.close();
 
-            env(offer(hal, USD(100), EUR(100)));
+            env(offer(hal, usd(100), eur(100)));
             env.close();
 
-            env.require(balance(gay, USD(0)));
-            env.require(balance(gay, EUR(100)));
-            env.require(balance(gay, reserve(env, 3)));
+            env.require(Balance(gay, usd(0)));
+            env.require(Balance(gay, eur(100)));
+            env.require(Balance(gay, reserve(env, 3)));
             env.require(offers(gay, 0));
 
-            env.require(balance(hal, USD(100)));
-            env.require(balance(hal, EUR(0)));
-            env.require(balance(hal, reserve(env, 3)));
+            env.require(Balance(hal, usd(100)));
+            env.require(Balance(hal, eur(0)));
+            env.require(Balance(hal, reserve(env, 3)));
             env.require(offers(hal, 0));
         }
         {
@@ -3097,82 +3098,82 @@ public:
             env.fund(reserve(env, 3) + (fee * 3), ivy, joe);
             env.close();
 
-            env(trust(ivy, USD(400)), qualityInPercent(90));
-            env(trust(ivy, EUR(400)), qualityInPercent(80));
-            env(trust(joe, USD(400)), qualityInPercent(70));
-            env(trust(joe, EUR(400)), qualityInPercent(60));
+            env(trust(ivy, usd(400)), QualityInPercent(90));
+            env(trust(ivy, eur(400)), QualityInPercent(80));
+            env(trust(joe, usd(400)), QualityInPercent(70));
+            env(trust(joe, eur(400)), QualityInPercent(60));
             env.close();
 
-            env(pay(gw1, ivy, USD(270)), sendmax(USD(500)));
-            env(pay(gw2, joe, EUR(150)), sendmax(EUR(300)));
+            env(pay(gw1, ivy, usd(270)), Sendmax(usd(500)));
+            env(pay(gw2, joe, eur(150)), Sendmax(eur(300)));
             env.close();
-            env.require(balance(ivy, USD(300)));
-            env.require(balance(joe, EUR(250)));
+            env.require(Balance(ivy, usd(300)));
+            env.require(Balance(joe, eur(250)));
 
-            env(offer(ivy, EUR(100), USD(200)));
+            env(offer(ivy, eur(100), usd(200)));
             env.close();
 
-            env(offer(joe, USD(200), EUR(100)));
+            env(offer(joe, usd(200), eur(100)));
             env.close();
 
-            env.require(balance(ivy, USD(50)));
-            env.require(balance(ivy, EUR(100)));
-            env.require(balance(ivy, reserve(env, 3)));
+            env.require(Balance(ivy, usd(50)));
+            env.require(Balance(ivy, eur(100)));
+            env.require(Balance(ivy, reserve(env, 3)));
             env.require(offers(ivy, 0));
 
-            env.require(balance(joe, USD(200)));
-            env.require(balance(joe, EUR(100)));
-            env.require(balance(joe, reserve(env, 3)));
+            env.require(Balance(joe, usd(200)));
+            env.require(Balance(joe, eur(100)));
+            env.require(Balance(joe, reserve(env, 3)));
             env.require(offers(joe, 0));
         }
         {
             // A trust line's QualityOut should not affect offer crossing.
             auto const kim = Account("kim");
-            auto const K_BUX = kim["BUX"];
+            auto const kBux = kim["BUX"];
             auto const lex = Account("lex");
             auto const meg = Account("meg");
             auto const ned = Account("ned");
-            auto const N_BUX = ned["BUX"];
+            auto const nBux = ned["BUX"];
 
             // Verify trust line QualityOut affects payments.
             env.fund(reserve(env, 4) + (fee * 4), kim, lex, meg, ned);
             env.close();
 
-            env(trust(lex, K_BUX(400)));
-            env(trust(lex, N_BUX(200)), qualityOutPercent(120));
-            env(trust(meg, N_BUX(100)));
+            env(trust(lex, kBux(400)));
+            env(trust(lex, nBux(200)), QualityOutPercent(120));
+            env(trust(meg, nBux(100)));
             env.close();
-            env(pay(ned, lex, N_BUX(100)));
+            env(pay(ned, lex, nBux(100)));
             env.close();
-            env.require(balance(lex, N_BUX(100)));
+            env.require(Balance(lex, nBux(100)));
 
-            env(pay(kim, meg, N_BUX(60)), path(lex, ned), sendmax(K_BUX(200)));
+            env(pay(kim, meg, nBux(60)), Path(lex, ned), Sendmax(kBux(200)));
             env.close();
 
-            env.require(balance(kim, K_BUX(none)));
-            env.require(balance(kim, N_BUX(none)));
-            env.require(balance(lex, K_BUX(72)));
-            env.require(balance(lex, N_BUX(40)));
-            env.require(balance(meg, K_BUX(none)));
-            env.require(balance(meg, N_BUX(60)));
-            env.require(balance(ned, K_BUX(none)));
-            env.require(balance(ned, N_BUX(none)));
+            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, nBux(60)));
+            env.require(Balance(ned, kBux(kNONE)));
+            env.require(Balance(ned, nBux(kNONE)));
 
             // Now verify that offer crossing is unaffected by QualityOut.
-            env(offer(lex, K_BUX(30), N_BUX(30)));
+            env(offer(lex, kBux(30), nBux(30)));
             env.close();
 
-            env(offer(kim, N_BUX(30), K_BUX(30)));
+            env(offer(kim, nBux(30), kBux(30)));
             env.close();
 
-            env.require(balance(kim, K_BUX(none)));
-            env.require(balance(kim, N_BUX(30)));
-            env.require(balance(lex, K_BUX(102)));
-            env.require(balance(lex, N_BUX(10)));
-            env.require(balance(meg, K_BUX(none)));
-            env.require(balance(meg, N_BUX(60)));
-            env.require(balance(ned, K_BUX(-30)));
-            env.require(balance(ned, N_BUX(none)));
+            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, nBux(60)));
+            env.require(Balance(ned, kBux(-30)));
+            env.require(Balance(ned, nBux(kNONE)));
         }
         {
             // Make sure things work right when we're auto-bridging as well.
@@ -3185,28 +3186,28 @@ public:
             //   o ova has USD but wants XRP.
             //   o pat has XRP but wants EUR.
             //   o qae has EUR but wants USD.
-            env(trust(ova, USD(200)));
-            env(trust(ova, EUR(200)));
-            env(trust(pat, USD(200)));
-            env(trust(pat, EUR(200)));
-            env(trust(qae, USD(200)));
-            env(trust(qae, EUR(200)));
+            env(trust(ova, usd(200)));
+            env(trust(ova, eur(200)));
+            env(trust(pat, usd(200)));
+            env(trust(pat, eur(200)));
+            env(trust(qae, usd(200)));
+            env(trust(qae, eur(200)));
             env.close();
 
-            env(pay(gw1, ova, USD(125)));
-            env(pay(gw2, qae, EUR(150)));
+            env(pay(gw1, ova, usd(125)));
+            env(pay(gw2, qae, eur(150)));
             env.close();
 
-            env(offer(ova, XRP(2), USD(100)));
-            env(offer(pat, EUR(100), XRP(2)));
+            env(offer(ova, XRP(2), usd(100)));
+            env(offer(pat, eur(100), XRP(2)));
             env.close();
 
-            env(offer(qae, USD(100), EUR(100)));
+            env(offer(qae, usd(100), eur(100)));
             env.close();
 
-            env.require(balance(ova, USD(0)));
-            env.require(balance(ova, EUR(0)));
-            env.require(balance(ova, XRP(4) + reserve(env, 3)));
+            env.require(Balance(ova, usd(0)));
+            env.require(Balance(ova, eur(0)));
+            env.require(Balance(ova, XRP(4) + reserve(env, 3)));
 
             // In pre-flow code ova's offer is left empty in the ledger.
             auto const ovasOffers = offersOnAccount(env, ova);
@@ -3216,18 +3217,18 @@ public:
                 auto const& ovasOffer = *(ovasOffers.front());
 
                 BEAST_EXPECT(ovasOffer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(ovasOffer[sfTakerGets] == USD(0));
+                BEAST_EXPECT(ovasOffer[sfTakerGets] == usd(0));
                 BEAST_EXPECT(ovasOffer[sfTakerPays] == XRP(0));
             }
 
-            env.require(balance(pat, USD(0)));
-            env.require(balance(pat, EUR(100)));
-            env.require(balance(pat, XRP(0) + reserve(env, 3)));
+            env.require(Balance(pat, usd(0)));
+            env.require(Balance(pat, eur(100)));
+            env.require(Balance(pat, XRP(0) + reserve(env, 3)));
             env.require(offers(pat, 0));
 
-            env.require(balance(qae, USD(100)));
-            env.require(balance(qae, EUR(0)));
-            env.require(balance(qae, XRP(2) + reserve(env, 3)));
+            env.require(Balance(qae, usd(100)));
+            env.require(Balance(qae, eur(0)));
+            env.require(Balance(qae, XRP(2) + reserve(env, 3)));
             env.require(offers(qae, 0));
         }
     }
@@ -3252,7 +3253,7 @@ public:
         using namespace jtx;
 
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env{*this, features};
 
@@ -3263,15 +3264,15 @@ public:
         env.fund(startBalance + (fee * 4), gw);
         env.close();
 
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
-        env(offer(gw, USD(60), XRP(600)));
+        env(offer(gw, usd(60), XRP(600)));
         env.close();
 
-        env.require(owners(gw, 3));
-        env.require(balance(gw, startBalance + fee));
+        env.require(Owners(gw, 3));
+        env.require(Balance(gw, startBalance + fee));
 
         auto gwOffers = offersOnAccount(env, gw);
         BEAST_EXPECT(gwOffers.size() == 3);
@@ -3280,16 +3281,16 @@ public:
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(offer[sfTakerGets] == XRP(600));
-            BEAST_EXPECT(offer[sfTakerPays] == USD(60));
+            BEAST_EXPECT(offer[sfTakerPays] == usd(60));
         }
 
         // Since this offer crosses the first offers, the previous offers
         // will be deleted and this offer will be put on the order book.
-        env(offer(gw, XRP(1000), USD(100)));
+        env(offer(gw, XRP(1000), usd(100)));
         env.close();
-        env.require(owners(gw, 1));
+        env.require(Owners(gw, 1));
         env.require(offers(gw, 1));
-        env.require(balance(gw, startBalance));
+        env.require(Balance(gw, startBalance));
 
         gwOffers = offersOnAccount(env, gw);
         BEAST_EXPECT(gwOffers.size() == 1);
@@ -3297,7 +3298,7 @@ public:
         {
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == USD(100));
+            BEAST_EXPECT(offer[sfTakerGets] == usd(100));
             BEAST_EXPECT(offer[sfTakerPays] == XRP(1000));
         }
     }
@@ -3310,8 +3311,8 @@ public:
         auto const gw1 = Account("gateway1");
         auto const gw2 = Account("gateway2");
         auto const alice = Account("alice");
-        auto const USD = gw1["USD"];
-        auto const EUR = gw2["EUR"];
+        auto const usd = gw1["USD"];
+        auto const eur = gw2["EUR"];
 
         Env env{*this, features};
 
@@ -3335,12 +3336,12 @@ public:
         // clang-format off
         TestData const tests[]{
             // acct                 fundXRP   fundUSD    fundEUR            firstOfferTec           secondOfferTec
-            {.acct="ann", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=USD(1000), .fundEUR=EUR(1000),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
-            {.acct="bev", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=USD(   1), .fundEUR=EUR(1000),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
-            {.acct="cam", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=USD(1000), .fundEUR=EUR(   1),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
-            {.acct="deb", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=USD(   0), .fundEUR=EUR(   1),             .firstOfferTec=tesSUCCESS,      .secondOfferTec=tecUNFUNDED_OFFER},
-            {.acct="eve", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=USD(   1), .fundEUR=EUR(   0),      .firstOfferTec=tecUNFUNDED_OFFER,             .secondOfferTec=tesSUCCESS},
-            {.acct="flo", .fundXRP=reserve(env, 3) +     0, .fundUSD=USD(1000), .fundEUR=EUR(1000), .firstOfferTec=tecINSUF_RESERVE_OFFER, .secondOfferTec=tecINSUF_RESERVE_OFFER},
+            {.acct="ann", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=usd(1000), .fundEUR=eur(1000),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
+            {.acct="bev", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=usd(   1), .fundEUR=eur(1000),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
+            {.acct="cam", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=usd(1000), .fundEUR=eur(   1),             .firstOfferTec=tesSUCCESS,             .secondOfferTec=tesSUCCESS},
+            {.acct="deb", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=usd(   0), .fundEUR=eur(   1),             .firstOfferTec=tesSUCCESS,      .secondOfferTec=tecUNFUNDED_OFFER},
+            {.acct="eve", .fundXRP=reserve(env, 3) + f * 4, .fundUSD=usd(   1), .fundEUR=eur(   0),      .firstOfferTec=tecUNFUNDED_OFFER,             .secondOfferTec=tesSUCCESS},
+            {.acct="flo", .fundXRP=reserve(env, 3) +     0, .fundUSD=usd(1000), .fundEUR=eur(1000), .firstOfferTec=tecINSUF_RESERVE_OFFER, .secondOfferTec=tecINSUF_RESERVE_OFFER},
         };
         //clang-format on
 
@@ -3350,24 +3351,24 @@ public:
             env.fund(t.fundXRP, acct);
             env.close();
 
-            env(trust(acct, USD(1000)));
-            env(trust(acct, EUR(1000)));
+            env(trust(acct, usd(1000)));
+            env(trust(acct, eur(1000)));
             env.close();
 
-            if (t.fundUSD > USD(0))
+            if (t.fundUSD > usd(0))
                 env(pay(gw1, acct, t.fundUSD));
-            if (t.fundEUR > EUR(0))
+            if (t.fundEUR > eur(0))
                 env(pay(gw2, acct, t.fundEUR));
             env.close();
 
-            env(offer(acct, USD(500), EUR(600)), ter(t.firstOfferTec));
+            env(offer(acct, usd(500), eur(600)), Ter(t.firstOfferTec));
             env.close();
             std::uint32_t const firstOfferSeq = env.seq(acct) - 1;
 
             int offerCount = isTesSuccess(t.firstOfferTec) ? 1 : 0;
-            env.require(owners(acct, 2 + offerCount));
-            env.require(balance(acct, t.fundUSD));
-            env.require(balance(acct, t.fundEUR));
+            env.require(Owners(acct, 2 + offerCount));
+            env.require(Balance(acct, t.fundUSD));
+            env.require(Balance(acct, t.fundEUR));
 
             auto acctOffers = offersOnAccount(env, acct);
             BEAST_EXPECT(acctOffers.size() == offerCount);
@@ -3375,18 +3376,18 @@ public:
             {
                 auto const& offer = *offerPtr;
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-                BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-                BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+                BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+                BEAST_EXPECT(offer[sfTakerPays] == usd(500));
             }
 
-            env(offer(acct, EUR(600), USD(500)), ter(t.secondOfferTec));
+            env(offer(acct, eur(600), usd(500)), Ter(t.secondOfferTec));
             env.close();
             std::uint32_t const secondOfferSeq = env.seq(acct) - 1;
 
             offerCount = isTesSuccess(t.secondOfferTec) ? 1 : offerCount;
-            env.require(owners(acct, 2 + offerCount));
-            env.require(balance(acct, t.fundUSD));
-            env.require(balance(acct, t.fundEUR));
+            env.require(Owners(acct, 2 + offerCount));
+            env.require(Balance(acct, t.fundUSD));
+            env.require(Balance(acct, t.fundEUR));
 
             acctOffers = offersOnAccount(env, acct);
             BEAST_EXPECT(acctOffers.size() == offerCount);
@@ -3396,20 +3397,20 @@ public:
                 BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
                 if (offer[sfSequence] == firstOfferSeq)
                 {
-                    BEAST_EXPECT(offer[sfTakerGets] == EUR(600));
-                    BEAST_EXPECT(offer[sfTakerPays] == USD(500));
+                    BEAST_EXPECT(offer[sfTakerGets] == eur(600));
+                    BEAST_EXPECT(offer[sfTakerPays] == usd(500));
                 }
                 else
                 {
-                    BEAST_EXPECT(offer[sfTakerGets] == USD(500));
-                    BEAST_EXPECT(offer[sfTakerPays] == EUR(600));
+                    BEAST_EXPECT(offer[sfTakerGets] == usd(500));
+                    BEAST_EXPECT(offer[sfTakerPays] == eur(600));
                 }
             }
 
             // Remove any offers from acct for the next pass.
-            env(offer_cancel(acct, firstOfferSeq));
+            env(offerCancel(acct, firstOfferSeq));
             env.close();
-            env(offer_cancel(acct, secondOfferSeq));
+            env(offerCancel(acct, secondOfferSeq));
             env.close();
         }
     }
@@ -3435,23 +3436,23 @@ public:
 
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const USD = bob["USD"];
+        auto const usd = bob["USD"];
         auto const f = env.current()->fees().base;
 
         env.fund(XRP(50000) + f, alice, bob);
         env.close();
 
-        env(offer(alice, USD(5000), XRP(50000)));
+        env(offer(alice, usd(5000), XRP(50000)));
         env.close();
 
         // This offer should take alice's offer up to Alice's reserve.
-        env(offer(bob, XRP(50000), USD(5000)));
+        env(offer(bob, XRP(50000), usd(5000)));
         env.close();
 
         // alice's offer should have been removed, since she's down to her
         // XRP reserve.
-        env.require(balance(alice, XRP(250)));
-        env.require(owners(alice, 1));
+        env.require(Balance(alice, XRP(250)));
+        env.require(Owners(alice, 1));
         env.require(lines(alice, 1));
 
         // However bob's offer should be in the ledger, since it was not
@@ -3462,7 +3463,7 @@ public:
         {
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
-            BEAST_EXPECT(offer[sfTakerGets] == USD(25));
+            BEAST_EXPECT(offer[sfTakerGets] == usd(25));
             BEAST_EXPECT(offer[sfTakerPays] == XRP(250));
         }
     }
@@ -3484,57 +3485,57 @@ public:
         {
             // A trust line's QualityOut should not affect offer crossing.
             auto const ann = Account("ann");
-            auto const A_BUX = ann["BUX"];
+            auto const aBux = ann["BUX"];
             auto const bob = Account("bob");
             auto const cam = Account("cam");
             auto const dan = Account("dan");
-            auto const D_BUX = dan["BUX"];
+            auto const dBux = dan["BUX"];
 
             // Verify trust line QualityOut affects payments.
             env.fund(reserve(env, 4) + (fee * 4), ann, bob, cam, dan);
             env.close();
 
-            env(trust(bob, A_BUX(400)));
-            env(trust(bob, D_BUX(200)), qualityOutPercent(120));
-            env(trust(cam, D_BUX(100)));
+            env(trust(bob, aBux(400)));
+            env(trust(bob, dBux(200)), QualityOutPercent(120));
+            env(trust(cam, dBux(100)));
             env.close();
-            env(pay(dan, bob, D_BUX(100)));
+            env(pay(dan, bob, dBux(100)));
             env.close();
-            env.require(balance(bob, D_BUX(100)));
+            env.require(Balance(bob, dBux(100)));
 
-            env(pay(ann, cam, D_BUX(60)), path(bob, dan), sendmax(A_BUX(200)));
+            env(pay(ann, cam, dBux(60)), Path(bob, dan), Sendmax(aBux(200)));
             env.close();
 
-            env.require(balance(ann, A_BUX(none)));
-            env.require(balance(ann, D_BUX(none)));
-            env.require(balance(bob, A_BUX(72)));
-            env.require(balance(bob, D_BUX(40)));
-            env.require(balance(cam, A_BUX(none)));
-            env.require(balance(cam, D_BUX(60)));
-            env.require(balance(dan, A_BUX(none)));
-            env.require(balance(dan, D_BUX(none)));
+            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, dBux(60)));
+            env.require(Balance(dan, aBux(kNONE)));
+            env.require(Balance(dan, dBux(kNONE)));
 
-            env(offer(bob, A_BUX(30), D_BUX(30)));
+            env(offer(bob, aBux(30), dBux(30)));
             env.close();
 
-            env(trust(ann, D_BUX(100)));
+            env(trust(ann, dBux(100)));
             env.close();
 
             // This payment caused the assert.
-            env(pay(ann, ann, D_BUX(30)),
-                path(A_BUX, D_BUX),
-                sendmax(A_BUX(30)),
-                ter(temBAD_PATH));
+            env(pay(ann, ann, dBux(30)),
+                Path(aBux, dBux),
+                Sendmax(aBux(30)),
+                Ter(temBAD_PATH));
             env.close();
 
-            env.require(balance(ann, A_BUX(none)));
-            env.require(balance(ann, D_BUX(0)));
-            env.require(balance(bob, A_BUX(72)));
-            env.require(balance(bob, D_BUX(40)));
-            env.require(balance(cam, A_BUX(none)));
-            env.require(balance(cam, D_BUX(60)));
-            env.require(balance(dan, A_BUX(0)));
-            env.require(balance(dan, D_BUX(none)));
+            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, dBux(60)));
+            env.require(Balance(dan, aBux(0)));
+            env.require(Balance(dan, dBux(kNONE)));
         }
     }
 
@@ -3554,40 +3555,40 @@ public:
         auto const ann = Account("ann");
         auto const bob = Account("bob");
         auto const cam = Account("cam");
-        auto const A_BUX = ann["BUX"];
-        auto const B_BUX = bob["BUX"];
+        auto const aBux = ann["BUX"];
+        auto const bBux = bob["BUX"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 4) + (fee * 5), ann, bob, cam);
         env.close();
 
-        env(trust(ann, B_BUX(40)));
-        env(trust(cam, A_BUX(40)));
-        env(trust(cam, B_BUX(40)));
+        env(trust(ann, bBux(40)));
+        env(trust(cam, aBux(40)));
+        env(trust(cam, bBux(40)));
         env.close();
 
-        env(pay(ann, cam, A_BUX(35)));
-        env(pay(bob, cam, B_BUX(35)));
+        env(pay(ann, cam, aBux(35)));
+        env(pay(bob, cam, bBux(35)));
 
-        env(offer(bob, A_BUX(30), B_BUX(30)));
+        env(offer(bob, aBux(30), bBux(30)));
         env.close();
 
         // cam puts an offer on the books that her upcoming offer could cross.
         // But this offer should be deleted, not crossed, by her upcoming
         // offer.
-        env(offer(cam, A_BUX(29), B_BUX(30), tfPassive));
+        env(offer(cam, aBux(29), bBux(30), tfPassive));
         env.close();
-        env.require(balance(cam, A_BUX(35)));
-        env.require(balance(cam, B_BUX(35)));
+        env.require(Balance(cam, aBux(35)));
+        env.require(Balance(cam, bBux(35)));
         env.require(offers(cam, 1));
 
         // This offer caused the assert.
-        env(offer(cam, B_BUX(30), A_BUX(30)));
+        env(offer(cam, bBux(30), aBux(30)));
         env.close();
 
-        env.require(balance(bob, A_BUX(30)));
-        env.require(balance(cam, A_BUX(5)));
-        env.require(balance(cam, B_BUX(65)));
+        env.require(Balance(bob, aBux(30)));
+        env.require(Balance(cam, aBux(5)));
+        env.require(Balance(cam, bBux(65)));
         env.require(offers(cam, 0));
     }
 
@@ -3605,7 +3606,7 @@ public:
 
         auto const ann = Account("ann");
         auto const gw = Account("gateway");
-        auto const BTC = gw["BTC"];
+        auto const btc = gw["BTC"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 2) + drops(9999640) + (fee), ann);
@@ -3613,18 +3614,18 @@ public:
         env.close();
 
         env(rate(gw, 1.002));
-        env(trust(ann, BTC(10)));
+        env(trust(ann, btc(10)));
         env.close();
 
-        env(pay(gw, ann, BTC(2.856)));
+        env(pay(gw, ann, btc(2.856)));
         env.close();
 
-        env(offer(ann, drops(365611702030), BTC(5.713)));
+        env(offer(ann, drops(365611702030), btc(5.713)));
         env.close();
 
         // This offer caused the assert.
-        env(offer(ann, BTC(0.687), drops(20000000000)),
-            ter(tecINSUF_RESERVE_OFFER));
+        env(offer(ann, btc(0.687), drops(20000000000)),
+            Ter(tecINSUF_RESERVE_OFFER));
     }
 
     void
@@ -3643,24 +3644,24 @@ public:
         auto const gw = Account("gateway");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const CNY = gw["CNY"];
+        auto const cny = gw["CNY"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 2) + drops(400000000000) + (fee), alice, bob);
         env.fund(reserve(env, 2) + (fee * 4), gw);
         env.close();
 
-        env(trust(bob, CNY(500)));
+        env(trust(bob, cny(500)));
         env.close();
 
-        env(pay(gw, bob, CNY(300)));
+        env(pay(gw, bob, cny(300)));
         env.close();
 
-        env(offer(bob, drops(5400000000), CNY(216.054)));
+        env(offer(bob, drops(5400000000), cny(216.054)));
         env.close();
 
         // This offer did not round result of partial crossing correctly.
-        env(offer(alice, CNY(13562.0001), drops(339000000000)));
+        env(offer(alice, cny(13562.0001), drops(339000000000)));
         env.close();
 
         auto const aliceOffers = offersOnAccount(env, alice);
@@ -3670,7 +3671,7 @@ public:
             auto const& offer = *offerPtr;
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(offer[sfTakerGets] == drops(333599446582));
-            BEAST_EXPECT(offer[sfTakerPays] == CNY(13345.9461));
+            BEAST_EXPECT(offer[sfTakerPays] == cny(13345.9461));
         }
     }
 
@@ -3689,8 +3690,8 @@ public:
         auto const gw = Account("gateway");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const BTC = gw["BTC"];
-        auto const JPY = gw["JPY"];
+        auto const btc = gw["BTC"];
+        auto const jpy = gw["JPY"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 2) + drops(400000000000) + (fee), alice, bob);
@@ -3698,19 +3699,19 @@ public:
         env.close();
 
         env(rate(gw, 1.002));
-        env(trust(alice, JPY(4000)));
-        env(trust(bob, BTC(2)));
+        env(trust(alice, jpy(4000)));
+        env(trust(bob, btc(2)));
         env.close();
 
-        env(pay(gw, alice, JPY(3699.034802280317)));
-        env(pay(gw, bob, BTC(1.156722559140311)));
+        env(pay(gw, alice, jpy(3699.034802280317)));
+        env(pay(gw, bob, btc(1.156722559140311)));
         env.close();
 
-        env(offer(bob, JPY(1241.913390770747), BTC(0.01969825690469254)));
+        env(offer(bob, jpy(1241.913390770747), btc(0.01969825690469254)));
         env.close();
 
         // This offer did not round result of partial crossing correctly.
-        env(offer(alice, BTC(0.05507568706427876), JPY(3472.696773391072)));
+        env(offer(alice, btc(0.05507568706427876), jpy(3472.696773391072)));
         env.close();
 
         auto const aliceOffers = offersOnAccount(env, alice);
@@ -3721,8 +3722,8 @@ public:
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(
                 offer[sfTakerGets] ==
-                STAmount(JPY, std::uint64_t(2230682446713524ul), -12));
-            BEAST_EXPECT(offer[sfTakerPays] == BTC(0.035378));
+                STAmount(jpy, std::uint64_t(2230682446713524ul), -12));
+            BEAST_EXPECT(offer[sfTakerPays] == btc(0.035378));
         }
     }
 
@@ -3742,8 +3743,8 @@ public:
         auto const gw2 = Account("gw2");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const USD = gw1["USD"];
-        auto const JPY = gw2["JPY"];
+        auto const usd = gw1["USD"];
+        auto const jpy = gw2["JPY"];
 
         auto const fee = env.current()->fees().base;
         env.fund(reserve(env, 2) + drops(400000000000) + (fee), alice, bob);
@@ -3751,31 +3752,31 @@ public:
         env.close();
 
         env(rate(gw1, 1.002));
-        env(trust(alice, USD(1000)));
-        env(trust(bob, JPY(100000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, jpy(100000)));
         env.close();
 
         env(
             pay(gw1,
                 alice,
-                STAmount{USD, std::uint64_t(2185410179555600), -14}));
+                STAmount{usd, std::uint64_t(2185410179555600), -14}));
         env(
             pay(gw2,
                 bob,
-                STAmount{JPY, std::uint64_t(6351823459548956), -12}));
+                STAmount{jpy, std::uint64_t(6351823459548956), -12}));
         env.close();
 
         env(offer(
             bob,
-            STAmount{USD, std::uint64_t(4371257532306000), -17},
-            STAmount{JPY, std::uint64_t(4573216636606000), -15}));
+            STAmount{usd, std::uint64_t(4371257532306000), -17},
+            STAmount{jpy, std::uint64_t(4573216636606000), -15}));
         env.close();
 
         // This offer did not partially cross correctly.
         env(offer(
             alice,
-            STAmount{JPY, std::uint64_t(2291181510070762), -12},
-            STAmount{USD, std::uint64_t(2190218999914694), -14}));
+            STAmount{jpy, std::uint64_t(2291181510070762), -12},
+            STAmount{usd, std::uint64_t(2190218999914694), -14}));
         env.close();
 
         auto const aliceOffers = offersOnAccount(env, alice);
@@ -3786,10 +3787,10 @@ public:
             BEAST_EXPECT(offer[sfLedgerEntryType] == ltOFFER);
             BEAST_EXPECT(
                 offer[sfTakerGets] ==
-                STAmount(USD, std::uint64_t(2185847305256635), -14));
+                STAmount(usd, std::uint64_t(2185847305256635), -14));
             BEAST_EXPECT(
                 offer[sfTakerPays] ==
-                STAmount(JPY, std::uint64_t(2286608293434156), -12));
+                STAmount(jpy, std::uint64_t(2286608293434156), -12));
         }
     }
 
@@ -3805,40 +3806,40 @@ public:
         auto const gw = Account("gw");
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const CNY = gw["CNY"];
+        auto const cny = gw["CNY"];
         auto const fee = env.current()->fees().base;
         auto const startXrpBalance = drops(400000000000) + (fee * 2);
 
         env.fund(startXrpBalance, gw, alice, bob);
         env.close();
 
-        env(trust(bob, CNY(100000)));
+        env(trust(bob, cny(100000)));
         env.close();
 
         // Place alice's tiny offer in the book first.  Let's see what happens
         // when a reasonable offer crosses it.
         STAmount const aliceCnyOffer{
-            CNY, std::uint64_t(4926000000000000), -23};
+            cny, std::uint64_t(4926000000000000), -23};
 
         env(offer(alice, aliceCnyOffer, drops(1), tfPassive));
         env.close();
 
         // bob places an ordinary offer
         STAmount const bobCnyStartBalance{
-            CNY, std::uint64_t(3767479960090235), -15};
+            cny, std::uint64_t(3767479960090235), -15};
         env(pay(gw, bob, bobCnyStartBalance));
         env.close();
 
         env(offer(
             bob,
             drops(203),
-            STAmount{CNY, std::uint64_t(1000000000000000), -20}));
+            STAmount{cny, std::uint64_t(1000000000000000), -20}));
         env.close();
 
-        env.require(balance(alice, aliceCnyOffer));
-        env.require(balance(alice, startXrpBalance - fee - drops(1)));
-        env.require(balance(bob, bobCnyStartBalance - aliceCnyOffer));
-        env.require(balance(bob, startXrpBalance - (fee * 2) + drops(1)));
+        env.require(Balance(alice, aliceCnyOffer));
+        env.require(Balance(alice, startXrpBalance - fee - drops(1)));
+        env.require(Balance(bob, bobCnyStartBalance - aliceCnyOffer));
+        env.require(Balance(bob, startXrpBalance - (fee * 2) + drops(1)));
     }
 
     void
@@ -3886,8 +3887,8 @@ public:
         auto const baseFee = env.current()->fees().base.drops();
 
         auto const gw = Account("gw");
-        auto const BTC = gw["BTC"];
-        auto const USD = gw["USD"];
+        auto const btc = gw["BTC"];
+        auto const usd = gw["USD"];
         auto const startXrpBalance = XRP(4000000);
 
         env.fund(startXrpBalance, gw);
@@ -3921,10 +3922,10 @@ public:
         // clang-format off
         TestData const tests[]{
             //        btcStart   --------------------- actor[0] ---------------------    -------------------- actor[1] -------------------
-            {.self=0, .leg0=0, .leg1=1, .btcStart=BTC(20), .actors={{"ann", 0, drops(3900000'000000 - (4 * baseFee)), BTC(20.0), USD(3000)}, {"abe", 0, drops(4100000'000000 - (3 * baseFee)), BTC( 0), USD(750)}}},  // no BTC xfer fee
-            {.self=0, .leg0=1, .leg1=0, .btcStart=BTC(20), .actors={{"bev", 0, drops(4100000'000000 - (4 * baseFee)), BTC( 7.5), USD(2000)}, {"bob", 0, drops(3900000'000000 - (3 * baseFee)), BTC(10), USD(  0)}}},  // no USD xfer fee
-            {.self=0, .leg0=0, .leg1=0, .btcStart=BTC(20), .actors={{"cam", 0, drops(4000000'000000 - (5 * baseFee)), BTC(20.0), USD(2000)}                                                     }},  // no xfer fee
-            {.self=0, .leg0=1, .leg1=0, .btcStart=BTC( 5), .actors={{"deb", 1, drops(4040000'000000 - (4 * baseFee)), BTC( 0.0), USD(2000)}, {"dan", 1, drops(3960000'000000 - (3 * baseFee)), BTC( 4), USD(  0)}}},  // no USD xfer fee
+            {.self=0, .leg0=0, .leg1=1, .btcStart=btc(20), .actors={{"ann", 0, drops(3900000'000000 - (4 * baseFee)), btc(20.0), usd(3000)}, {"abe", 0, drops(4100000'000000 - (3 * baseFee)), btc( 0), usd(750)}}},  // no BTC xfer fee
+            {.self=0, .leg0=1, .leg1=0, .btcStart=btc(20), .actors={{"bev", 0, drops(4100000'000000 - (4 * baseFee)), btc( 7.5), usd(2000)}, {"bob", 0, drops(3900000'000000 - (3 * baseFee)), btc(10), usd(  0)}}},  // no USD xfer fee
+            {.self=0, .leg0=0, .leg1=0, .btcStart=btc(20), .actors={{"cam", 0, drops(4000000'000000 - (5 * baseFee)), btc(20.0), usd(2000)}                                                     }},  // no xfer fee
+            {.self=0, .leg0=1, .leg1=0, .btcStart=btc( 5), .actors={{"deb", 1, drops(4040000'000000 - (4 * baseFee)), btc( 0.0), usd(2000)}, {"dan", 1, drops(3960000'000000 - (3 * baseFee)), btc( 4), usd(  0)}}},  // no USD xfer fee
         };
         // clang-format on
 
@@ -3939,29 +3940,29 @@ public:
                 env.fund(XRP(4000000), actor.acct);
                 env.close();
 
-                env(trust(actor.acct, BTC(40)));
-                env(trust(actor.acct, USD(8000)));
+                env(trust(actor.acct, btc(40)));
+                env(trust(actor.acct, usd(8000)));
                 env.close();
             }
 
             env(pay(gw, self, t.btcStart));
-            env(pay(gw, self, USD(2000)));
+            env(pay(gw, self, usd(2000)));
             if (self.id() != leg1.id())
-                env(pay(gw, leg1, USD(2000)));
+                env(pay(gw, leg1, usd(2000)));
             env.close();
 
             // Get the initial offers in place.  Remember their sequences
             // so we can delete them later.
-            env(offer(leg0, BTC(10), XRP(100000), tfPassive));
+            env(offer(leg0, btc(10), XRP(100000), tfPassive));
             env.close();
             std::uint32_t const leg0OfferSeq = env.seq(leg0) - 1;
 
-            env(offer(leg1, XRP(100000), USD(1000), tfPassive));
+            env(offer(leg1, XRP(100000), usd(1000), tfPassive));
             env.close();
             std::uint32_t const leg1OfferSeq = env.seq(leg1) - 1;
 
             // This is the offer that matters.
-            env(offer(self, USD(1000), BTC(10)));
+            env(offer(self, usd(1000), btc(10)));
             env.close();
             std::uint32_t const selfOfferSeq = env.seq(self) - 1;
 
@@ -3978,17 +3979,17 @@ public:
                     }).begin());
                 BEAST_EXPECT(offerCount == actor.offers);
 
-                env.require(balance(actor.acct, actor.xrp));
-                env.require(balance(actor.acct, actor.btc));
-                env.require(balance(actor.acct, actor.usd));
+                env.require(Balance(actor.acct, actor.xrp));
+                env.require(Balance(actor.acct, actor.btc));
+                env.require(Balance(actor.acct, actor.usd));
             }
             // Remove any offers that might be left hanging around.  They
             // could bollix up later loops.
-            env(offer_cancel(leg0, leg0OfferSeq));
+            env(offerCancel(leg0, leg0OfferSeq));
             env.close();
-            env(offer_cancel(leg1, leg1OfferSeq));
+            env(offerCancel(leg1, leg1OfferSeq));
             env.close();
-            env(offer_cancel(self, selfOfferSeq));
+            env(offerCancel(self, selfOfferSeq));
             env.close();
         }
     }
@@ -4034,8 +4035,8 @@ public:
         auto const baseFee = env.current()->fees().base.drops();
 
         auto const gw = Account("gw");
-        auto const BTC = gw["BTC"];
-        auto const USD = gw["USD"];
+        auto const btc = gw["BTC"];
+        auto const usd = gw["USD"];
         auto const startXrpBalance = XRP(4000000);
 
         env.fund(startXrpBalance, gw);
@@ -4069,8 +4070,8 @@ public:
         // clang-format off
         TestData const tests[]{
             //         btcStart    ------------------- actor[0] --------------------    ------------------- actor[1] --------------------
-            {.self=0, .leg0=0, .leg1=1, .btcStart=BTC(5), .actors={{"gay", 1, drops(3950000'000000 - (4 * baseFee)), BTC(5), USD(2500)}, {"gar", 1, drops(4050000'000000 - (3 * baseFee)), BTC(0), USD(1375)}}}, // no BTC xfer fee
-            {.self=0, .leg0=0, .leg1=0, .btcStart=BTC(5), .actors={{"hye", 2, drops(4000000'000000 - (5 * baseFee)), BTC(5), USD(2000)}                                                     }}  // no xfer fee
+            {.self=0, .leg0=0, .leg1=1, .btcStart=btc(5), .actors={{"gay", 1, drops(3950000'000000 - (4 * baseFee)), btc(5), usd(2500)}, {"gar", 1, drops(4050000'000000 - (3 * baseFee)), btc(0), usd(1375)}}}, // no BTC xfer fee
+            {.self=0, .leg0=0, .leg1=0, .btcStart=btc(5), .actors={{"hye", 2, drops(4000000'000000 - (5 * baseFee)), btc(5), usd(2000)}                                                     }}  // no xfer fee
         };
         // clang-format on
 
@@ -4085,29 +4086,29 @@ public:
                 env.fund(XRP(4000000), actor.acct);
                 env.close();
 
-                env(trust(actor.acct, BTC(40)));
-                env(trust(actor.acct, USD(8000)));
+                env(trust(actor.acct, btc(40)));
+                env(trust(actor.acct, usd(8000)));
                 env.close();
             }
 
             env(pay(gw, self, t.btcStart));
-            env(pay(gw, self, USD(2000)));
+            env(pay(gw, self, usd(2000)));
             if (self.id() != leg1.id())
-                env(pay(gw, leg1, USD(2000)));
+                env(pay(gw, leg1, usd(2000)));
             env.close();
 
             // Get the initial offers in place.  Remember their sequences
             // so we can delete them later.
-            env(offer(leg0, BTC(10), XRP(100000), tfPassive));
+            env(offer(leg0, btc(10), XRP(100000), tfPassive));
             env.close();
             std::uint32_t const leg0OfferSeq = env.seq(leg0) - 1;
 
-            env(offer(leg1, XRP(100000), USD(1000), tfPassive));
+            env(offer(leg1, XRP(100000), usd(1000), tfPassive));
             env.close();
             std::uint32_t const leg1OfferSeq = env.seq(leg1) - 1;
 
             // This is the offer that matters.
-            env(offer(self, USD(1000), BTC(10)));
+            env(offer(self, usd(1000), btc(10)));
             env.close();
             std::uint32_t const selfOfferSeq = env.seq(self) - 1;
 
@@ -4124,17 +4125,17 @@ public:
                     }).begin());
                 BEAST_EXPECT(offerCount == actor.offers);
 
-                env.require(balance(actor.acct, actor.xrp));
-                env.require(balance(actor.acct, actor.btc));
-                env.require(balance(actor.acct, actor.usd));
+                env.require(Balance(actor.acct, actor.xrp));
+                env.require(Balance(actor.acct, actor.btc));
+                env.require(Balance(actor.acct, actor.usd));
             }
             // Remove any offers that might be left hanging around.  They
             // could bollix up later loops.
-            env(offer_cancel(leg0, leg0OfferSeq));
+            env(offerCancel(leg0, leg0OfferSeq));
             env.close();
-            env(offer_cancel(leg1, leg1OfferSeq));
+            env(offerCancel(leg1, leg1OfferSeq));
             env.close();
-            env(offer_cancel(self, selfOfferSeq));
+            env(offerCancel(self, selfOfferSeq));
             env.close();
         }
     }
@@ -4163,31 +4164,31 @@ public:
         env.close();
 
         // Properly set trust and have gw authorize bob and alice
-        env(trust(gw, bobUSD(100)), txflags(tfSetfAuth));
+        env(trust(gw, bobUSD(100)), Txflags(tfSetfAuth));
         env(trust(bob, gwUSD(100)));
-        env(trust(gw, aliceUSD(100)), txflags(tfSetfAuth));
+        env(trust(gw, aliceUSD(100)), Txflags(tfSetfAuth));
         env(trust(alice, gwUSD(100)));
         // Alice is able to place the offer since the GW has authorized her
         env(offer(alice, gwUSD(40), XRP(4000)));
         env.close();
 
         env.require(offers(alice, 1));
-        env.require(balance(alice, gwUSD(0)));
+        env.require(Balance(alice, gwUSD(0)));
 
         env(pay(gw, bob, gwUSD(50)));
         env.close();
 
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // Bob's offer should cross Alice's
         env(offer(bob, XRP(4000), gwUSD(40)));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(40)));
+        env.require(Balance(alice, gwUSD(40)));
 
         env.require(offers(bob, 0));
-        env.require(balance(bob, gwUSD(10)));
+        env.require(Balance(bob, gwUSD(10)));
     }
 
     void
@@ -4230,18 +4231,18 @@ public:
         env.close();
 
         env.require(offers(alice, 1));
-        env.require(balance(alice, gwUSD(none)));
+        env.require(Balance(alice, gwUSD(kNONE)));
         env(fset(gw, asfRequireAuth));
         env.close();
 
-        env(trust(gw, bobUSD(100)), txflags(tfSetfAuth));
+        env(trust(gw, bobUSD(100)), Txflags(tfSetfAuth));
         env.close();
         env(trust(bob, gwUSD(100)));
         env.close();
 
         env(pay(gw, bob, gwUSD(50)));
         env.close();
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // gw now requires authorization and bob has gwUSD(50).  Let's see if
         // bob can cross alice's offer.
@@ -4254,45 +4255,45 @@ public:
 
         env.require(offers(alice, 0));
         // alice's unauthorized offer is deleted & bob's offer not crossed.
-        env.require(balance(alice, gwUSD(none)));
+        env.require(Balance(alice, gwUSD(kNONE)));
         env.require(offers(bob, 1));
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // See if alice can create an offer without authorization.  alice
         // should not be able to create the offer and bob's offer should be
         // untouched.
-        env(offer(alice, gwUSD(40), XRP(4000)), ter(tecNO_LINE));
+        env(offer(alice, gwUSD(40), XRP(4000)), Ter(tecNO_LINE));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(none)));
+        env.require(Balance(alice, gwUSD(kNONE)));
 
         env.require(offers(bob, 1));
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // Set up a trust line for alice, but don't authorize it.  alice
         // should still not be able to create an offer for USD/gw.
         env(trust(gw, aliceUSD(100)));
         env.close();
 
-        env(offer(alice, gwUSD(40), XRP(4000)), ter(tecNO_AUTH));
+        env(offer(alice, gwUSD(40), XRP(4000)), Ter(tecNO_AUTH));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(0)));
+        env.require(Balance(alice, gwUSD(0)));
 
         env.require(offers(bob, 1));
-        env.require(balance(bob, gwUSD(50)));
+        env.require(Balance(bob, gwUSD(50)));
 
         // Delete bob's offer so alice can create an offer without crossing.
-        env(offer_cancel(bob, bobOfferSeq));
+        env(offerCancel(bob, bobOfferSeq));
         env.close();
         env.require(offers(bob, 0));
 
         // Finally, set up an authorized trust line for alice.  Now alice's
         // offer should succeed.  Note that, since this is an offer rather
         // than a payment, alice does not need to set a trust line limit.
-        env(trust(gw, aliceUSD(100)), txflags(tfSetfAuth));
+        env(trust(gw, aliceUSD(100)), Txflags(tfSetfAuth));
         env.close();
 
         env(offer(alice, gwUSD(40), XRP(4000)));
@@ -4305,10 +4306,10 @@ public:
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(40)));
+        env.require(Balance(alice, gwUSD(40)));
 
         env.require(offers(bob, 0));
-        env.require(balance(bob, gwUSD(10)));
+        env.require(Balance(bob, gwUSD(10)));
     }
 
     void
@@ -4332,8 +4333,8 @@ public:
         auto const coldEU = Account("coldEU");
         auto const mm = Account("mm");
 
-        auto const USD = coldUS["USD"];
-        auto const EUR = coldEU["EUR"];
+        auto const usd = coldUS["USD"];
+        auto const eur = coldEU["EUR"];
 
         env.fund(XRP(100000), hotUS, coldUS, hotEU, coldEU, mm);
         env.close();
@@ -4347,52 +4348,52 @@ public:
         env.close();
 
         // Each hot wallet trusts the related cold wallet for a large amount
-        env(trust(hotUS, USD(10000000)), txflags(tfSetNoRipple));
-        env(trust(hotEU, EUR(10000000)), txflags(tfSetNoRipple));
+        env(trust(hotUS, usd(10000000)), Txflags(tfSetNoRipple));
+        env(trust(hotEU, eur(10000000)), Txflags(tfSetNoRipple));
         // Market maker trusts both cold wallets for a large amount
-        env(trust(mm, USD(10000000)), txflags(tfSetNoRipple));
-        env(trust(mm, EUR(10000000)), txflags(tfSetNoRipple));
+        env(trust(mm, usd(10000000)), Txflags(tfSetNoRipple));
+        env(trust(mm, eur(10000000)), Txflags(tfSetNoRipple));
         env.close();
 
         // Gateways authorize the trustlines of hot and market maker
-        env(trust(coldUS, USD(0), hotUS, tfSetfAuth));
-        env(trust(coldEU, EUR(0), hotEU, tfSetfAuth));
-        env(trust(coldUS, USD(0), mm, tfSetfAuth));
-        env(trust(coldEU, EUR(0), mm, tfSetfAuth));
+        env(trust(coldUS, usd(0), hotUS, tfSetfAuth));
+        env(trust(coldEU, eur(0), hotEU, tfSetfAuth));
+        env(trust(coldUS, usd(0), mm, tfSetfAuth));
+        env(trust(coldEU, eur(0), mm, tfSetfAuth));
         env.close();
 
         // Issue currency from cold wallets to hot and market maker
-        env(pay(coldUS, hotUS, USD(5000000)));
-        env(pay(coldEU, hotEU, EUR(5000000)));
-        env(pay(coldUS, mm, USD(5000000)));
-        env(pay(coldEU, mm, EUR(5000000)));
+        env(pay(coldUS, hotUS, usd(5000000)));
+        env(pay(coldEU, hotEU, eur(5000000)));
+        env(pay(coldUS, mm, usd(5000000)));
+        env(pay(coldEU, mm, eur(5000000)));
         env.close();
 
         // MM places offers
         float const rate = 0.9f;  // 0.9 USD = 1 EUR
-        env(offer(mm, EUR(4000000 * rate), USD(4000000)), json(jss::Flags, tfSell));
+        env(offer(mm, eur(4000000 * rate), usd(4000000)), Json(jss::Flags, tfSell));
 
         float const reverseRate = 1.0f / rate * 1.00101f;
-        env(offer(mm, USD(4000000 * reverseRate), EUR(4000000)), json(jss::Flags, tfSell));
+        env(offer(mm, usd(4000000 * reverseRate), eur(4000000)), Json(jss::Flags, tfSell));
         env.close();
 
         // There should be a path available from hot US to cold EUR
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::destination_account] = coldEU.human();
             jvParams[jss::destination_amount][jss::issuer] = coldEU.human();
             jvParams[jss::destination_amount][jss::currency] = "EUR";
             jvParams[jss::destination_amount][jss::value] = 10;
             jvParams[jss::source_account] = hotUS.human();
 
-            Json::Value const jrr{
+            json::Value const jrr{
                 env.rpc("json", "ripple_path_find", to_string(jvParams))[jss::result]};
 
             BEAST_EXPECT(jrr[jss::status] == "success");
             BEAST_EXPECT(jrr[jss::alternatives].isArray() && jrr[jss::alternatives].size() > 0);
         }
         // Send the payment using the found path.
-        env(pay(hotUS, coldEU, EUR(10)), sendmax(USD(11.1223326)));
+        env(pay(hotUS, coldEU, eur(10)), Sendmax(usd(11.1223326)));
     }
 
     void
@@ -4419,11 +4420,11 @@ public:
         env.require(offers(gw, 1));
 
         // Since gw has an offer out, gw should not be able to set RequireAuth.
-        env(fset(gw, asfRequireAuth), ter(tecOWNERS));
+        env(fset(gw, asfRequireAuth), Ter(tecOWNERS));
         env.close();
 
         // Cancel gw's offer so we can set RequireAuth.
-        env(offer_cancel(gw, gwOfferSeq));
+        env(offerCancel(gw, gwOfferSeq));
         env.close();
         env.require(offers(gw, 0));
 
@@ -4434,27 +4435,27 @@ public:
         // Before DepositPreauth an account with lsfRequireAuth set could not
         // create an offer to buy their own currency.  After DepositPreauth
         // they can.
-        env(offer(gw, gwUSD(40), XRP(4000)), ter(tesSUCCESS));
+        env(offer(gw, gwUSD(40), XRP(4000)), Ter(tesSUCCESS));
         env.close();
 
         env.require(offers(gw, 1));
 
         // Set up an authorized trust line and pay alice gwUSD 50.
-        env(trust(gw, aliceUSD(100)), txflags(tfSetfAuth));
+        env(trust(gw, aliceUSD(100)), Txflags(tfSetfAuth));
         env(trust(alice, gwUSD(100)));
         env.close();
 
         env(pay(gw, alice, gwUSD(50)));
         env.close();
 
-        env.require(balance(alice, gwUSD(50)));
+        env.require(Balance(alice, gwUSD(50)));
 
         // alice's offer should cross gw's
         env(offer(alice, XRP(4000), gwUSD(40)));
         env.close();
 
         env.require(offers(alice, 0));
-        env.require(balance(alice, gwUSD(10)));
+        env.require(Balance(alice, gwUSD(10)));
 
         env.require(offers(gw, 0));
     }
@@ -4478,33 +4479,33 @@ public:
         Account const becky("becky");
         Account const carol("carol");
         Account const gw("gateway");
-        auto const USD = gw["USD"];
-        auto const BUX = alice["BUX"];
+        auto const usd = gw["USD"];
+        auto const bux = alice["BUX"];
 
         Env env{*this, features};
 
         env.fund(XRP(10000), alice, becky, carol, noripple(gw));
         env.close();
-        env.trust(USD(1000), becky);
-        env(pay(gw, becky, USD(5)));
+        env.trust(usd(1000), becky);
+        env(pay(gw, becky, usd(5)));
         env.close();
-        BEAST_EXPECT(trustLineExists(env, gw, becky, USD.currency));
+        BEAST_EXPECT(trustLineExists(env, gw, becky, usd.currency));
 
         // Make offers that produce USD and can be crossed two ways:
         // direct XRP -> USD
         // direct BUX -> USD
-        env(offer(becky, XRP(2), USD(2)), txflags(tfPassive));
+        env(offer(becky, XRP(2), usd(2)), Txflags(tfPassive));
         std::uint32_t const beckyBuxUsdSeq{env.seq(becky)};
-        env(offer(becky, BUX(3), USD(3)), txflags(tfPassive));
+        env(offer(becky, bux(3), usd(3)), Txflags(tfPassive));
         env.close();
 
         // becky keeps the offers, but removes the trustline.
-        env(pay(becky, gw, USD(5)));
-        env.trust(USD(0), becky);
+        env(pay(becky, gw, usd(5)));
+        env.trust(usd(0), becky);
         env.close();
-        BEAST_EXPECT(!trustLineExists(env, gw, becky, USD.currency));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(!trustLineExists(env, gw, becky, usd.currency));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // Delete gw's account.
         {
@@ -4521,7 +4522,7 @@ public:
                 env.close();
 
             // Account deletion has a high fee.  Account for that.
-            env(acctdelete(gw, alice), fee(drops(env.current()->fees().increment)));
+            env(acctdelete(gw, alice), Fee(drops(env.current()->fees().increment)));
             env.close();
 
             // Verify that gw's account root is gone from the ledger.
@@ -4530,38 +4531,38 @@ public:
 
         // alice crosses becky's first offer.  The offer create fails because
         // the USD issuer is not in the ledger.
-        env(offer(alice, USD(2), XRP(2)), ter(tecNO_ISSUER));
+        env(offer(alice, usd(2), XRP(2)), Ter(tecNO_ISSUER));
         env.close();
         env.require(offers(alice, 0));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // alice crosses becky's second offer.  Again, the offer create fails
         // because the USD issuer is not in the ledger.
-        env(offer(alice, USD(3), BUX(3)), ter(tecNO_ISSUER));
+        env(offer(alice, usd(3), bux(3)), Ter(tecNO_ISSUER));
         env.require(offers(alice, 0));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
-        BEAST_EXPECT(isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
+        BEAST_EXPECT(isOffer(env, becky, bux(3), usd(3)));
 
         // Cancel becky's BUX -> USD offer so we can try auto-bridging.
-        env(offer_cancel(becky, beckyBuxUsdSeq));
+        env(offerCancel(becky, beckyBuxUsdSeq));
         env.close();
-        BEAST_EXPECT(!isOffer(env, becky, BUX(3), USD(3)));
+        BEAST_EXPECT(!isOffer(env, becky, bux(3), usd(3)));
 
         // alice creates an offer that can be auto-bridged with becky's
         // remaining offer.
-        env.trust(BUX(1000), carol);
-        env(pay(alice, carol, BUX(2)));
+        env.trust(bux(1000), carol);
+        env(pay(alice, carol, bux(2)));
 
-        env(offer(alice, BUX(2), XRP(2)));
+        env(offer(alice, bux(2), XRP(2)));
         env.close();
 
         // carol attempts the auto-bridge.  Again, the offer create fails
         // because the USD issuer is not in the ledger.
-        env(offer(carol, USD(2), BUX(2)), ter(tecNO_ISSUER));
+        env(offer(carol, usd(2), bux(2)), Ter(tecNO_ISSUER));
         env.close();
-        BEAST_EXPECT(isOffer(env, alice, BUX(2), XRP(2)));
-        BEAST_EXPECT(isOffer(env, becky, XRP(2), USD(2)));
+        BEAST_EXPECT(isOffer(env, alice, bux(2), XRP(2)));
+        BEAST_EXPECT(isOffer(env, becky, XRP(2), usd(2)));
     }
 
     void
@@ -4579,26 +4580,26 @@ public:
             env.close();
 
             auto txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::minTickSize - 1;
-            env(txn, ter(temBAD_TICK_SIZE));
+            txn[sfTickSize.fieldName] = Quality::kMIN_TICK_SIZE - 1;
+            env(txn, Ter(temBAD_TICK_SIZE));
 
-            txn[sfTickSize.fieldName] = Quality::minTickSize;
+            txn[sfTickSize.fieldName] = Quality::kMIN_TICK_SIZE;
             env(txn);
-            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::minTickSize);
+            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMIN_TICK_SIZE);
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::maxTickSize;
+            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE;
             env(txn);
             BEAST_EXPECT(!env.le(gw)->isFieldPresent(sfTickSize));
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::maxTickSize - 1;
+            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE - 1;
             env(txn);
-            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::maxTickSize - 1);
+            BEAST_EXPECT((*env.le(gw))[sfTickSize] == Quality::kMAX_TICK_SIZE - 1);
 
             txn = noop(gw);
-            txn[sfTickSize.fieldName] = Quality::maxTickSize + 1;
-            env(txn, ter(temBAD_TICK_SIZE));
+            txn[sfTickSize.fieldName] = Quality::kMAX_TICK_SIZE + 1;
+            env(txn, Ter(temBAD_TICK_SIZE));
 
             txn[sfTickSize.fieldName] = 0;
             env(txn);
@@ -4608,8 +4609,8 @@ public:
         Env env{*this, features};
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const XTS = gw["XTS"];
-        auto const XXX = gw["XXX"];
+        auto const xts = gw["XTS"];
+        auto const xxx = gw["XXX"];
 
         env.fund(XRP(10000), gw, alice);
         env.close();
@@ -4622,16 +4623,16 @@ public:
             BEAST_EXPECT((*env.le(gw))[sfTickSize] == 5);
         }
 
-        env(trust(alice, XTS(1000)));
-        env(trust(alice, XXX(1000)));
+        env(trust(alice, xts(1000)));
+        env(trust(alice, xxx(1000)));
 
         env(pay(gw, alice, alice["XTS"](100)));
         env(pay(gw, alice, alice["XXX"](100)));
 
-        env(offer(alice, XTS(10), XXX(30)));
-        env(offer(alice, XTS(30), XXX(10)));
-        env(offer(alice, XTS(10), XXX(30)), json(jss::Flags, tfSell));
-        env(offer(alice, XTS(30), XXX(10)), json(jss::Flags, tfSell));
+        env(offer(alice, xts(10), xxx(30)));
+        env(offer(alice, xts(30), xxx(10)));
+        env(offer(alice, xts(10), xxx(30)), Json(jss::Flags, tfSell));
+        env(offer(alice, xts(30), xxx(10)), Json(jss::Flags, tfSell));
 
         std::map<std::uint32_t, std::pair<STAmount, STAmount>> offers;
         forEachItem(*env.current(), alice, [&](std::shared_ptr<SLE const> const& sle) {
@@ -4646,24 +4647,24 @@ public:
         auto it = offers.begin();
         BEAST_EXPECT(it != offers.end());
         BEAST_EXPECT(
-            it->second.first == XTS(10) && it->second.second < XXX(30) &&
-            it->second.second > XXX(29.9994));
+            it->second.first == xts(10) && it->second.second < xxx(30) &&
+            it->second.second > xxx(29.9994));
 
         // second offer
         ++it;
         BEAST_EXPECT(it != offers.end());
-        BEAST_EXPECT(it->second.first == XTS(30) && it->second.second == XXX(10));
+        BEAST_EXPECT(it->second.first == xts(30) && it->second.second == xxx(10));
 
         // third offer
         ++it;
         BEAST_EXPECT(it != offers.end());
-        BEAST_EXPECT(it->second.first == XTS(10.0002) && it->second.second == XXX(30));
+        BEAST_EXPECT(it->second.first == xts(10.0002) && it->second.second == xxx(30));
 
         // fourth offer
         // exact TakerPays is XTS(1/.033333)
         ++it;
         BEAST_EXPECT(it != offers.end());
-        BEAST_EXPECT(it->second.first == XTS(30) && it->second.second == XXX(10));
+        BEAST_EXPECT(it->second.first == xts(30) && it->second.second == xxx(10));
 
         BEAST_EXPECT(++it == offers.end());
     }
@@ -4698,23 +4699,23 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob);
         env.close();
 
-        env(trust(alice, USD(1000)));
-        env(trust(bob, USD(1000)));
+        env(trust(alice, usd(1000)));
+        env(trust(bob, usd(1000)));
         env.close();
 
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Create four offers from the same account with identical quality
         // so they go in the same order book.  Each offer goes in a different
         // ledger so the chronology is clear.
-        std::uint32_t const offerId_0{env.seq(alice)};
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerId0{env.seq(alice)};
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create two tickets.
@@ -4723,71 +4724,71 @@ public:
         env.close();
 
         // Create another sequence-based offer.
-        std::uint32_t const offerId_1{env.seq(alice)};
-        BEAST_EXPECT(offerId_1 == offerId_0 + 4);
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerId1{env.seq(alice)};
+        BEAST_EXPECT(offerId1 == offerId0 + 4);
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create two ticket based offers in reverse order.
-        std::uint32_t const offerId_2{ticketSeq + 1};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerId_2));
+        std::uint32_t const offerId2{ticketSeq + 1};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerId2));
         env.close();
 
         // Create the last offer.
-        std::uint32_t const offerId_3{ticketSeq};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerId_3));
+        std::uint32_t const offerId3{ticketSeq};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerId3));
         env.close();
 
         // Verify that all of alice's offers are present.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 4);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_0);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId_2);
-            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerId_1);
-            env.require(balance(alice, USD(200)));
-            env.require(owners(alice, 5));
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId0);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId2);
+            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerId1);
+            env.require(Balance(alice, usd(200)));
+            env.require(Owners(alice, 5));
         }
 
         // Cross alice's first offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the first offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 3);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_2);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId2);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerId1);
         }
 
         // Cross alice's second offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the second offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 2);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId_2);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerId2);
         }
 
         // Cross alice's third offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the third offer alice created was consumed.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 1);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId_3);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerId3);
         }
 
         // Cross alice's last offer.
-        env(offer(bob, USD(50), XRP(50)));
+        env(offer(bob, usd(50), XRP(50)));
         env.close();
 
         // Verify that the third offer alice created was consumed.
@@ -4795,10 +4796,10 @@ public:
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.empty());
         }
-        env.require(balance(alice, USD(0)));
-        env.require(owners(alice, 1));
-        env.require(balance(bob, USD(200)));
-        env.require(owners(bob, 1));
+        env.require(Balance(alice, usd(0)));
+        env.require(Owners(alice, 1));
+        env.require(Balance(bob, usd(200)));
+        env.require(Owners(bob, 1));
     }
 
     void
@@ -4813,104 +4814,104 @@ public:
         Env env{*this, features};
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice);
         env.close();
 
-        env(trust(alice, USD(1000)));
+        env(trust(alice, usd(1000)));
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 0));
+        env.require(Owners(alice, 1), tickets(alice, 0));
 
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Create the first of four offers using a sequence.
-        std::uint32_t const offerSeqId_0{env.seq(alice)};
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerSeqId0{env.seq(alice)};
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 0));
+        env.require(Owners(alice, 2), tickets(alice, 0));
 
         // Create four tickets.
         std::uint32_t const ticketSeq{env.seq(alice) + 1};
         env(ticket::create(alice, 4));
         env.close();
-        env.require(owners(alice, 6), tickets(alice, 4));
+        env.require(Owners(alice, 6), tickets(alice, 4));
 
         // Create the second (also sequence-based) offer.
-        std::uint32_t const offerSeqId_1{env.seq(alice)};
-        BEAST_EXPECT(offerSeqId_1 == offerSeqId_0 + 6);
-        env(offer(alice, XRP(50), USD(50)));
+        std::uint32_t const offerSeqId1{env.seq(alice)};
+        BEAST_EXPECT(offerSeqId1 == offerSeqId0 + 6);
+        env(offer(alice, XRP(50), usd(50)));
         env.close();
 
         // Create the third (ticket-based) offer.
-        std::uint32_t const offerTixId_0{ticketSeq + 1};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerTixId_0));
+        std::uint32_t const offerTixId0{ticketSeq + 1};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerTixId0));
         env.close();
 
         // Create the last offer.
-        std::uint32_t const offerTixId_1{ticketSeq};
-        env(offer(alice, XRP(50), USD(50)), ticket::use(offerTixId_1));
+        std::uint32_t const offerTixId1{ticketSeq};
+        env(offer(alice, XRP(50), usd(50)), ticket::Use(offerTixId1));
         env.close();
 
         // Verify that all of alice's offers are present.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 4);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId_0);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerTixId_0);
-            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerSeqId_1);
-            env.require(balance(alice, USD(200)));
-            env.require(owners(alice, 7));
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId0);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerTixId0);
+            BEAST_EXPECT(offers[3]->getFieldU32(sfSequence) == offerSeqId1);
+            env.require(Balance(alice, usd(200)));
+            env.require(Owners(alice, 7));
         }
 
         // Use a ticket to cancel an offer created with a sequence.
-        env(offer_cancel(alice, offerSeqId_0), ticket::use(ticketSeq + 2));
+        env(offerCancel(alice, offerSeqId0), ticket::Use(ticketSeq + 2));
         env.close();
 
         // Verify that offerSeqId_0 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 3);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId_0);
-            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerTixId0);
+            BEAST_EXPECT(offers[2]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // Use a ticket to cancel an offer created with a ticket.
-        env(offer_cancel(alice, offerTixId_0), ticket::use(ticketSeq + 3));
+        env(offerCancel(alice, offerTixId0), ticket::Use(ticketSeq + 3));
         env.close();
 
         // Verify that offerTixId_0 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 2);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId_1);
-            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerTixId1);
+            BEAST_EXPECT(offers[1]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // All of alice's tickets should now be used up.
-        env.require(owners(alice, 3), tickets(alice, 0));
+        env.require(Owners(alice, 3), tickets(alice, 0));
 
         // Use a sequence to cancel an offer created with a ticket.
-        env(offer_cancel(alice, offerTixId_1));
+        env(offerCancel(alice, offerTixId1));
         env.close();
 
         // Verify that offerTixId_1 was canceled.
         {
             auto offers = sortedOffersOnAccount(env, alice);
             BEAST_EXPECT(offers.size() == 1);
-            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId_1);
+            BEAST_EXPECT(offers[0]->getFieldU32(sfSequence) == offerSeqId1);
         }
 
         // Use a sequence to cancel an offer created with a sequence.
-        env(offer_cancel(alice, offerSeqId_1));
+        env(offerCancel(alice, offerSeqId1));
         env.close();
 
         // Verify that offerSeqId_1 was canceled.
         // All of alice's tickets should now be used up.
-        env.require(owners(alice, 1), tickets(alice, 0), offers(alice, 0));
+        env.require(Owners(alice, 1), tickets(alice, 0), offers(alice, 0));
     }
 
     void
@@ -4923,11 +4924,11 @@ public:
 
         Env env{*this};
         auto const alice = Account("alice");
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
 
         env.fund(XRP(10000), alice);
         env.close();
-        env(offer(alice, XRP(100000000000), USD(100000000)));
+        env(offer(alice, XRP(100000000000), usd(100000000)));
         pass();
     }
 
@@ -4940,26 +4941,26 @@ public:
         Account const issuer("issuer");
         Account const maker("maker");
         Account const taker("taker");
-        auto const USD = issuer["USD"];
-        auto const EUR = issuer["EUR"];
+        auto const usd = issuer["USD"];
+        auto const eur = issuer["EUR"];
 
         env.fund(XRP(1'000), issuer);
         env.fund(XRP(1'000), maker, taker);
         env.close();
 
-        env.trust(USD(1'000), maker, taker);
-        env.trust(EUR(1'000), maker, taker);
+        env.trust(usd(1'000), maker, taker);
+        env.trust(eur(1'000), maker, taker);
         env.close();
 
-        env(pay(issuer, maker, USD(1'000)));
-        env(pay(issuer, taker, USD(1'000)));
-        env(pay(issuer, maker, EUR(1'000)));
+        env(pay(issuer, maker, usd(1'000)));
+        env(pay(issuer, taker, usd(1'000)));
+        env(pay(issuer, maker, eur(1'000)));
         env.close();
 
-        auto makerUSDBalance = env.balance(maker, USD).value();
-        auto takerUSDBalance = env.balance(taker, USD).value();
-        auto makerEURBalance = env.balance(maker, EUR).value();
-        auto takerEURBalance = env.balance(taker, EUR).value();
+        auto makerUSDBalance = env.balance(maker, usd).value();
+        auto takerUSDBalance = env.balance(taker, usd).value();
+        auto makerEURBalance = env.balance(maker, eur).value();
+        auto takerEURBalance = env.balance(taker, eur).value();
         auto makerXRPBalance = env.balance(maker, XRP).value();
         auto takerXRPBalance = env.balance(taker, XRP).value();
 
@@ -4967,138 +4968,138 @@ public:
         {
             TER const err = features[fixFillOrKill] ? TER(tesSUCCESS) : tecKILLED;
 
-            env(offer(maker, XRP(100), USD(100)));
+            env(offer(maker, XRP(100), usd(100)));
             env.close();
 
-            env(offer(taker, USD(100), XRP(101)), txflags(tfFillOrKill), ter(err));
+            env(offer(taker, usd(100), XRP(101)), Txflags(tfFillOrKill), Ter(err));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             if (isTesSuccess(err))
             {
-                makerUSDBalance -= USD(100);
-                takerUSDBalance += USD(100);
+                makerUSDBalance -= usd(100);
+                takerUSDBalance += usd(100);
                 makerXRPBalance += XRP(100).value();
                 takerXRPBalance -= XRP(100).value();
             }
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(100), XRP(100)));
+            env(offer(maker, usd(100), XRP(100)));
             env.close();
 
-            env(offer(taker, XRP(100), USD(101)), txflags(tfFillOrKill), ter(err));
+            env(offer(taker, XRP(100), usd(101)), Txflags(tfFillOrKill), Ter(err));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             if (isTesSuccess(err))
             {
-                makerUSDBalance += USD(100);
-                takerUSDBalance -= USD(100);
+                makerUSDBalance += usd(100);
+                takerUSDBalance -= usd(100);
                 makerXRPBalance -= XRP(100).value();
                 takerXRPBalance += XRP(100).value();
             }
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(100), EUR(100)));
+            env(offer(maker, usd(100), eur(100)));
             env.close();
 
-            env(offer(taker, EUR(100), USD(101)), txflags(tfFillOrKill), ter(err));
+            env(offer(taker, eur(100), usd(101)), Txflags(tfFillOrKill), Ter(err));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             if (isTesSuccess(err))
             {
-                makerUSDBalance += USD(100);
-                takerUSDBalance -= USD(100);
-                makerEURBalance -= EUR(100);
-                takerEURBalance += EUR(100);
+                makerUSDBalance += usd(100);
+                takerUSDBalance -= usd(100);
+                makerEURBalance -= eur(100);
+                takerEURBalance += eur(100);
             }
             BEAST_EXPECT(expectOffers(env, taker, 0));
         }
 
         // tfFillOrKill + tfSell, TakerGets must be filled
         {
-            env(offer(maker, XRP(101), USD(101)));
+            env(offer(maker, XRP(101), usd(101)));
             env.close();
 
-            env(offer(taker, USD(100), XRP(101)), txflags(tfFillOrKill | tfSell));
+            env(offer(taker, usd(100), XRP(101)), Txflags(tfFillOrKill | tfSell));
             env.close();
 
-            makerUSDBalance -= USD(101);
-            takerUSDBalance += USD(101);
-            makerXRPBalance += XRP(101).value() - txfee(env, 1);
-            takerXRPBalance -= XRP(101).value() + txfee(env, 1);
+            makerUSDBalance -= usd(101);
+            takerUSDBalance += usd(101);
+            makerXRPBalance += XRP(101).value() - txFee(env, 1);
+            takerXRPBalance -= XRP(101).value() + txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(101), XRP(101)));
+            env(offer(maker, usd(101), XRP(101)));
             env.close();
 
-            env(offer(taker, XRP(100), USD(101)), txflags(tfFillOrKill | tfSell));
+            env(offer(taker, XRP(100), usd(101)), Txflags(tfFillOrKill | tfSell));
             env.close();
 
-            makerUSDBalance += USD(101);
-            takerUSDBalance -= USD(101);
-            makerXRPBalance -= XRP(101).value() + txfee(env, 1);
-            takerXRPBalance += XRP(101).value() - txfee(env, 1);
+            makerUSDBalance += usd(101);
+            takerUSDBalance -= usd(101);
+            makerXRPBalance -= XRP(101).value() + txFee(env, 1);
+            takerXRPBalance += XRP(101).value() - txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(101), EUR(101)));
+            env(offer(maker, usd(101), eur(101)));
             env.close();
 
-            env(offer(taker, EUR(100), USD(101)), txflags(tfFillOrKill | tfSell));
+            env(offer(taker, eur(100), usd(101)), Txflags(tfFillOrKill | tfSell));
             env.close();
 
-            makerUSDBalance += USD(101);
-            takerUSDBalance -= USD(101);
-            makerEURBalance -= EUR(101);
-            takerEURBalance += EUR(101);
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerUSDBalance += usd(101);
+            takerUSDBalance -= usd(101);
+            makerEURBalance -= eur(101);
+            takerEURBalance += eur(101);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
         }
 
         // Fail regardless of fixFillOrKill amendment
         for (auto const flags : {tfFillOrKill, tfFillOrKill + tfSell})
         {
-            env(offer(maker, XRP(100), USD(100)));
+            env(offer(maker, XRP(100), usd(100)));
             env.close();
 
-            env(offer(taker, USD(100), XRP(99)), txflags(flags), ter(tecKILLED));
+            env(offer(taker, usd(100), XRP(99)), Txflags(flags), Ter(tecKILLED));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(100), XRP(100)));
+            env(offer(maker, usd(100), XRP(100)));
             env.close();
 
-            env(offer(taker, XRP(100), USD(99)), txflags(flags), ter(tecKILLED));
+            env(offer(taker, XRP(100), usd(99)), Txflags(flags), Ter(tecKILLED));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
 
-            env(offer(maker, USD(100), EUR(100)));
+            env(offer(maker, usd(100), eur(100)));
             env.close();
 
-            env(offer(taker, EUR(100), USD(99)), txflags(flags), ter(tecKILLED));
+            env(offer(taker, eur(100), usd(99)), Txflags(flags), Ter(tecKILLED));
             env.close();
 
-            makerXRPBalance -= txfee(env, 1);
-            takerXRPBalance -= txfee(env, 1);
+            makerXRPBalance -= txFee(env, 1);
+            takerXRPBalance -= txFee(env, 1);
             BEAST_EXPECT(expectOffers(env, taker, 0));
         }
 
         BEAST_EXPECT(
-            env.balance(maker, USD) == makerUSDBalance &&
-            env.balance(taker, USD) == takerUSDBalance &&
-            env.balance(maker, EUR) == makerEURBalance &&
-            env.balance(taker, EUR) == takerEURBalance &&
+            env.balance(maker, usd) == makerUSDBalance &&
+            env.balance(taker, usd) == takerUSDBalance &&
+            env.balance(maker, eur) == makerEURBalance &&
+            env.balance(taker, eur) == takerEURBalance &&
             env.balance(maker, XRP) == makerXRPBalance &&
             env.balance(taker, XRP) == takerXRPBalance);
     }
@@ -5167,7 +5168,7 @@ public:
         testFillOrKill(features);
     }
 
-    FeatureBitset const allFeatures{jtx::testable_amendments()};
+    FeatureBitset const allFeatures{jtx::testableAmendments()};
 
     void
     run() override
@@ -5201,7 +5202,7 @@ class Offer_manual_test : public OfferBaseUtil_test
     run() override
     {
         using namespace jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         FeatureBitset const fillOrKill{fixFillOrKill};
         FeatureBitset const permDEX{featurePermissionedDEX};
 
diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp
index 43d4a13e2b..84ef568d52 100644
--- a/src/test/app/Oracle_test.cpp
+++ b/src/test/app/Oracle_test.cpp
@@ -33,7 +33,7 @@
 
 namespace xrpl::test::jtx::oracle {
 
-struct Oracle_test : public beast::unit_test::suite
+struct Oracle_test : public beast::unit_test::Suite
 {
 private:
     void
@@ -52,9 +52,9 @@ private:
             Oracle const oracle(
                 env,
                 {.owner = bad,
-                 .seq = seq(1),
+                 .seq = Seq(1),
                  .fee = static_cast<int>(env.current()->fees().base.drops()),
-                 .err = ter(terNO_ACCOUNT)});
+                 .err = Ter(terNO_ACCOUNT)});
         }
 
         // Insufficient reserve
@@ -65,7 +65,7 @@ private:
                 env,
                 {.owner = owner,
                  .fee = static_cast<int>(env.current()->fees().base.drops()),
-                 .err = ter(tecINSUFFICIENT_RESERVE)});
+                 .err = Ter(tecINSUFFICIENT_RESERVE)});
         }
         // Insufficient reserve if the data series extends to greater than 5
         {
@@ -86,7 +86,7 @@ private:
                             {"XRP", "AUD", 740, 1},
                         },
                     .fee = static_cast<int>(env.current()->fees().base.drops()),
-                    .err = ter(tecINSUFFICIENT_RESERVE)});
+                    .err = Ter(tecINSUFFICIENT_RESERVE)});
         }
 
         {
@@ -97,34 +97,34 @@ private:
 
             // Invalid flag
             oracle.set(
-                CreateArg{.flags = tfSellNFToken, .fee = baseFee, .err = ter(temINVALID_FLAG)});
+                CreateArg{.flags = tfSellNFToken, .fee = baseFee, .err = Ter(temINVALID_FLAG)});
 
             // Duplicate token pair
             oracle.set(
                 CreateArg{
                     .series = {{"XRP", "USD", 740, 1}, {"XRP", "USD", 750, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
 
             // Price is not included
             oracle.set(
                 CreateArg{
                     .series = {{"XRP", "USD", 740, 1}, {"XRP", "EUR", std::nullopt, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
 
             // Token pair is in update and delete
             oracle.set(
                 CreateArg{
                     .series = {{"XRP", "USD", 740, 1}, {"XRP", "USD", std::nullopt, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
             // Token pair is in add and delete
             oracle.set(
                 CreateArg{
                     .series = {{"XRP", "EUR", 740, 1}, {"XRP", "EUR", std::nullopt, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
 
             // Array of token pair is 0 or exceeds 10
             oracle.set(
@@ -142,8 +142,8 @@ private:
                          {"XRP", "U10", 750, 1},
                          {"XRP", "U11", 740, 1}},
                     .fee = baseFee,
-                    .err = ter(temARRAY_TOO_LARGE)});
-            oracle.set(CreateArg{.series = {}, .fee = baseFee, .err = ter(temARRAY_EMPTY)});
+                    .err = Ter(temARRAY_TOO_LARGE)});
+            oracle.set(CreateArg{.series = {}, .fee = baseFee, .err = Ter(temARRAY_EMPTY)});
         }
 
         // Array of token pair exceeds 10 after update
@@ -171,7 +171,7 @@ private:
                             {"XRP", "U10", 750, 1},
                         },
                     .fee = baseFee,
-                    .err = ter(tecARRAY_TOO_LARGE)});
+                    .err = Ter(tecARRAY_TOO_LARGE)});
         }
 
         {
@@ -186,14 +186,14 @@ private:
                     .assetClass = std::nullopt,
                     .provider = "provider",
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
             oracle.set(
                 CreateArg{
                     .assetClass = "currency",
                     .provider = std::nullopt,
                     .uri = "URI",
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
 
             // Asset class or provider are included on update
             // and don't match the current values
@@ -204,13 +204,13 @@ private:
                     .series = {{"XRP", "USD", 740, 1}},
                     .provider = "provider1",
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", 740, 1}},
                     .assetClass = "currency1",
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
         }
 
         {
@@ -223,19 +223,19 @@ private:
             // Asset class
             std::string assetClass(17, '0');
             oracle.set(
-                CreateArg{.assetClass = assetClass, .fee = baseFee, .err = ter(temMALFORMED)});
+                CreateArg{.assetClass = assetClass, .fee = baseFee, .err = Ter(temMALFORMED)});
             // provider
             std::string const large(257, '0');
-            oracle.set(CreateArg{.provider = large, .fee = baseFee, .err = ter(temMALFORMED)});
+            oracle.set(CreateArg{.provider = large, .fee = baseFee, .err = Ter(temMALFORMED)});
             // URI
-            oracle.set(CreateArg{.uri = large, .fee = baseFee, .err = ter(temMALFORMED)});
+            oracle.set(CreateArg{.uri = large, .fee = baseFee, .err = Ter(temMALFORMED)});
             // Empty field
             // Asset class
-            oracle.set(CreateArg{.assetClass = "", .fee = baseFee, .err = ter(temMALFORMED)});
+            oracle.set(CreateArg{.assetClass = "", .fee = baseFee, .err = Ter(temMALFORMED)});
             // provider
-            oracle.set(CreateArg{.provider = "", .fee = baseFee, .err = ter(temMALFORMED)});
+            oracle.set(CreateArg{.provider = "", .fee = baseFee, .err = Ter(temMALFORMED)});
             // URI
-            oracle.set(CreateArg{.uri = "", .fee = baseFee, .err = ter(temMALFORMED)});
+            oracle.set(CreateArg{.uri = "", .fee = baseFee, .err = Ter(temMALFORMED)});
         }
 
         {
@@ -253,7 +253,7 @@ private:
                     .owner = some,
                     .series = {{"XRP", "USD", 740, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
         }
 
         {
@@ -276,31 +276,31 @@ private:
                     .series = {{"XRP", "USD", 740, 1}},
                     .lastUpdateTime = static_cast<std::uint32_t>(closeTime() - 301),
                     .fee = baseFee,
-                    .err = ter(tecINVALID_UPDATE_TIME)});
+                    .err = Ter(tecINVALID_UPDATE_TIME)});
             // Greater than last close time + 300s
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", 740, 1}},
                     .lastUpdateTime = static_cast<std::uint32_t>(closeTime() + 311),
                     .fee = baseFee,
-                    .err = ter(tecINVALID_UPDATE_TIME)});
+                    .err = Ter(tecINVALID_UPDATE_TIME)});
             oracle.set(UpdateArg{.series = {{"XRP", "USD", 740, 1}}, .fee = baseFee});
             BEAST_EXPECT(oracle.expectLastUpdateTime(
-                static_cast<std::uint32_t>(testStartTime.count() + 450)));
+                static_cast<std::uint32_t>(kTEST_START_TIME.count() + 450)));
             // Less than the previous lastUpdateTime
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", 740, 1}},
                     .lastUpdateTime = static_cast<std::uint32_t>(449),
                     .fee = baseFee,
-                    .err = ter(tecINVALID_UPDATE_TIME)});
+                    .err = Ter(tecINVALID_UPDATE_TIME)});
             // Less than the epoch time
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", 740, 1}},
-                    .lastUpdateTime = static_cast<int>(epoch_offset.count() - 1),
+                    .lastUpdateTime = static_cast<int>(kEPOCH_OFFSET.count() - 1),
                     .fee = baseFee,
-                    .err = ter(tecINVALID_UPDATE_TIME)});
+                    .err = Ter(tecINVALID_UPDATE_TIME)});
         }
 
         {
@@ -314,13 +314,13 @@ private:
                 UpdateArg{
                     .series = {{"XRP", "EUR", std::nullopt, std::nullopt}},
                     .fee = baseFee,
-                    .err = ter(tecTOKEN_PAIR_NOT_FOUND)});
+                    .err = Ter(tecTOKEN_PAIR_NOT_FOUND)});
             // delete all token pairs
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "USD", std::nullopt, std::nullopt}},
                     .fee = baseFee,
-                    .err = ter(tecARRAY_EMPTY)});
+                    .err = Ter(tecARRAY_EMPTY)});
         }
 
         {
@@ -333,7 +333,7 @@ private:
                 {.owner = owner,
                  .series = {{"USD", "USD", 740, 1}},
                  .fee = baseFee,
-                 .err = ter(temMALFORMED)});
+                 .err = Ter(temMALFORMED)});
         }
 
         {
@@ -344,9 +344,9 @@ private:
             Oracle const oracle(
                 env,
                 {.owner = owner,
-                 .series = {{"USD", "BTC", 740, maxPriceScale + 1}},
+                 .series = {{"USD", "BTC", 740, kMAX_PRICE_SCALE + 1}},
                  .fee = baseFee,
-                 .err = ter(temMALFORMED)});
+                 .err = Ter(temMALFORMED)});
         }
 
         {
@@ -359,30 +359,30 @@ private:
                 UpdateArg{
                     .series = {{"XRP", "EUR", std::nullopt, std::nullopt}, {"XRP", "EUR", 740, 1}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
             // Delete token pair that doesn't exist in this oracle
             oracle.set(
                 UpdateArg{
                     .series = {{"XRP", "EUR", std::nullopt, std::nullopt}},
                     .fee = baseFee,
-                    .err = ter(tecTOKEN_PAIR_NOT_FOUND)});
+                    .err = Ter(tecTOKEN_PAIR_NOT_FOUND)});
             // Delete token pair in oracle, which is not in the ledger
             oracle.set(
                 UpdateArg{
                     .documentID = 10,
                     .series = {{"XRP", "EUR", std::nullopt, std::nullopt}},
                     .fee = baseFee,
-                    .err = ter(temMALFORMED)});
+                    .err = Ter(temMALFORMED)});
         }
 
         {
             // Bad fee
             Env env(*this);
             env.fund(XRP(1'000), owner);
-            Oracle oracle(env, {.owner = owner, .fee = -1, .err = ter(temBAD_FEE)});
+            Oracle oracle(env, {.owner = owner, .fee = -1, .err = Ter(temBAD_FEE)});
             Oracle const oracle1(
                 env, {.owner = owner, .fee = static_cast<int>(env.current()->fees().base.drops())});
-            oracle.set(UpdateArg{.owner = owner, .fee = -1, .err = ter(temBAD_FEE)});
+            oracle.set(UpdateArg{.owner = owner, .fee = -1, .err = Ter(temBAD_FEE)});
         }
     }
 
@@ -465,22 +465,22 @@ private:
             // Invalid account
             Account const bad("bad");
             env.memoize(bad);
-            oracle.remove({.owner = bad, .seq = seq(1), .fee = baseFee, .err = ter(terNO_ACCOUNT)});
+            oracle.remove({.owner = bad, .seq = Seq(1), .fee = baseFee, .err = Ter(terNO_ACCOUNT)});
         }
 
         // Invalid DocumentID
-        oracle.remove({.documentID = 2, .fee = baseFee, .err = ter(tecNO_ENTRY)});
+        oracle.remove({.documentID = 2, .fee = baseFee, .err = Ter(tecNO_ENTRY)});
 
         // Invalid owner
         Account const invalid("invalid");
         env.fund(XRP(1'000), invalid);
-        oracle.remove({.owner = invalid, .fee = baseFee, .err = ter(tecNO_ENTRY)});
+        oracle.remove({.owner = invalid, .fee = baseFee, .err = Ter(tecNO_ENTRY)});
 
         // Invalid flags
-        oracle.remove({.flags = tfSellNFToken, .fee = baseFee, .err = ter(temINVALID_FLAG)});
+        oracle.remove({.flags = tfSellNFToken, .fee = baseFee, .err = Ter(temINVALID_FLAG)});
 
         // Bad fee
-        oracle.remove({.fee = -1, .err = ter(temBAD_FEE)});
+        oracle.remove({.fee = -1, .err = Ter(temBAD_FEE)});
     }
 
     void
@@ -547,18 +547,18 @@ private:
             auto const hash = env.closed()->header().hash;
             for (int i = 0; i < 256; ++i)
                 env.close();
-            env(acctdelete(owner, alice), fee(acctDelFee));
+            env(acctdelete(owner, alice), Fee(acctDelFee));
             env.close();
             BEAST_EXPECT(!oracle.exists());
             BEAST_EXPECT(!oracle1.exists());
 
             // can still get the oracles via the ledger index or hash
             auto verifyLedgerData = [&](auto const& field, auto const& value) {
-                Json::Value jvParams;
+                json::Value jvParams;
                 jvParams[field] = value;
                 jvParams[jss::binary] = false;
                 jvParams[jss::type] = jss::oracle;
-                Json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
+                json::Value jrr = env.rpc("json", "ledger_data", to_string(jvParams));
                 BEAST_EXPECT(jrr[jss::result][jss::state].size() == 2);
             };
             verifyLedgerData(jss::ledger_index, index);
@@ -650,7 +650,7 @@ private:
             // Should be same order as creation
             Env env(
                 *this,
-                withFixOrder ? testable_amendments() : testable_amendments() - fixPriceOracleOrder);
+                withFixOrder ? testableAmendments() : testableAmendments() - fixPriceOracleOrder);
             auto const baseFee = static_cast<int>(env.current()->fees().base.drops());
 
             auto test = [&](Env& env, DataSeries const& series) {
@@ -702,78 +702,78 @@ private:
         Env env(*this);
         auto const baseFee = static_cast<int>(env.current()->fees().base.drops());
 
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const bogie{"bogie", KeyType::secp256k1};
-        Account const ed{"ed", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
-        Account const zelda{"zelda", KeyType::secp256k1};
-        Account const bob{"bob", KeyType::secp256k1};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const bogie{"bogie", KeyType::Secp256k1};
+        Account const ed{"ed", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
+        Account const zelda{"zelda", KeyType::Secp256k1};
+        Account const bob{"bob", KeyType::Secp256k1};
         env.fund(XRP(10'000), alice, becky, zelda, ed, bob);
 
         // alice uses a regular key with the master disabled.
-        Account const alie{"alie", KeyType::secp256k1};
+        Account const alie{"alie", KeyType::Secp256k1};
         env(regkey(alice, alie));
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
 
         // Attach signers to alice.
-        env(signers(alice, 2, {{becky, 1}, {bogie, 1}, {ed, 2}}), sig(alie));
+        env(signers(alice, 2, {{becky, 1}, {bogie, 1}, {ed, 2}}), Sig(alie));
         env.close();
 
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
 
         // Create
         // Force close (true) and time advancement because the close time
         // is no longer 0.
         Oracle oracle(env, CreateArg{.owner = alice, .fee = baseFee, .close = true}, false);
-        oracle.set(CreateArg{.msig = msig(becky), .fee = baseFee, .err = ter(tefBAD_QUORUM)});
-        oracle.set(CreateArg{.msig = msig(zelda), .fee = baseFee, .err = ter(tefBAD_SIGNATURE)});
-        oracle.set(CreateArg{.msig = msig(becky, bogie), .fee = baseFee});
+        oracle.set(CreateArg{.msig = Msig(becky), .fee = baseFee, .err = Ter(tefBAD_QUORUM)});
+        oracle.set(CreateArg{.msig = Msig(zelda), .fee = baseFee, .err = Ter(tefBAD_SIGNATURE)});
+        oracle.set(CreateArg{.msig = Msig(becky, bogie), .fee = baseFee});
         BEAST_EXPECT(oracle.exists());
 
         // Update
         oracle.set(
             UpdateArg{
                 .series = {{"XRP", "USD", 740, 1}},
-                .msig = msig(becky),
+                .msig = Msig(becky),
                 .fee = baseFee,
-                .err = ter(tefBAD_QUORUM)});
+                .err = Ter(tefBAD_QUORUM)});
         oracle.set(
             UpdateArg{
                 .series = {{"XRP", "USD", 740, 1}},
-                .msig = msig(zelda),
+                .msig = Msig(zelda),
                 .fee = baseFee,
-                .err = ter(tefBAD_SIGNATURE)});
+                .err = Ter(tefBAD_SIGNATURE)});
         oracle.set(
             UpdateArg{
-                .series = {{"XRP", "USD", 741, 1}}, .msig = msig(becky, bogie), .fee = baseFee});
+                .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::none), sig(alie));
+        env(signers(alice, jtx::kNONE), Sig(alie));
         env.close();
-        env.require(owners(alice, 1));
+        env.require(Owners(alice, 1));
         // create new signer list
-        env(signers(alice, 2, {{zelda, 1}, {bob, 1}, {ed, 2}}), sig(alie));
+        env(signers(alice, 2, {{zelda, 1}, {bob, 1}, {ed, 2}}), Sig(alie));
         env.close();
         // old list fails
         oracle.set(
             UpdateArg{
                 .series = {{"XRP", "USD", 740, 1}},
-                .msig = msig(becky, bogie),
+                .msig = Msig(becky, bogie),
                 .fee = baseFee,
-                .err = ter(tefBAD_SIGNATURE)});
+                .err = Ter(tefBAD_SIGNATURE)});
         // updated list succeeds
         oracle.set(
             UpdateArg{
-                .series = {{"XRP", "USD", 7412, 2}}, .msig = msig(zelda, bob), .fee = baseFee});
+                .series = {{"XRP", "USD", 7412, 2}}, .msig = Msig(zelda, bob), .fee = baseFee});
         BEAST_EXPECT(oracle.expectPrice({{"XRP", "USD", 7412, 2}}));
         oracle.set(
-            UpdateArg{.series = {{"XRP", "USD", 74245, 3}}, .msig = msig(ed), .fee = baseFee});
+            UpdateArg{.series = {{"XRP", "USD", 74245, 3}}, .msig = Msig(ed), .fee = baseFee});
         BEAST_EXPECT(oracle.expectPrice({{"XRP", "USD", 74245, 3}}));
 
         // Remove
-        oracle.remove({.msig = msig(bob), .fee = baseFee, .err = ter(tefBAD_QUORUM)});
-        oracle.remove({.msig = msig(becky), .fee = baseFee, .err = ter(tefBAD_SIGNATURE)});
-        oracle.remove({.msig = msig(ed), .fee = baseFee});
+        oracle.remove({.msig = Msig(bob), .fee = baseFee, .err = Ter(tefBAD_QUORUM)});
+        oracle.remove({.msig = Msig(becky), .fee = baseFee, .err = Ter(tefBAD_SIGNATURE)});
+        oracle.remove({.msig = Msig(ed), .fee = baseFee});
         BEAST_EXPECT(!oracle.exists());
     }
 
@@ -783,19 +783,19 @@ private:
         testcase("Amendment");
         using namespace jtx;
 
-        auto const features = testable_amendments() - featurePriceOracle;
+        auto const features = testableAmendments() - featurePriceOracle;
         Account const owner("owner");
         Env env(*this, features);
         auto const baseFee = static_cast<int>(env.current()->fees().base.drops());
 
         env.fund(XRP(1'000), owner);
         {
-            Oracle const oracle(env, {.owner = owner, .fee = baseFee, .err = ter(temDISABLED)});
+            Oracle const oracle(env, {.owner = owner, .fee = baseFee, .err = Ter(temDISABLED)});
         }
 
         {
             Oracle oracle(env, {.owner = owner, .fee = baseFee}, false);
-            oracle.remove({.fee = baseFee, .err = ter(temDISABLED)});
+            oracle.remove({.fee = baseFee, .err = Ter(temDISABLED)});
         }
     }
 
@@ -804,7 +804,7 @@ public:
     run() override
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         testInvalidSet();
         testInvalidDelete();
         testCreate(all);
diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 17f4410cf6..729fc57f70 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -15,7 +15,7 @@
 namespace xrpl::test {
 
 // Make sure "plump" order books don't have problems
-class PlumpBook_test : public beast::unit_test::suite
+class PlumpBook_test : public beast::unit_test::Suite
 {
 public:
     static void
@@ -35,13 +35,13 @@ public:
         using namespace jtx;
         auto const billion = 1000000000ul;
         Env env(*this);
-        env.disable_sigs();
+        env.disableSigs();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(billion), gw, "alice");
-        env.trust(USD(billion), "alice");
-        env(pay(gw, "alice", USD(billion)));
-        createOffers(env, USD, n);
+        env.trust(usd(billion), "alice");
+        env(pay(gw, "alice", usd(billion)));
+        createOffers(env, usd, n);
     }
 
     void
@@ -70,7 +70,7 @@ BEAST_DEFINE_TESTSUITE(ThinBook, app, xrpl);
 
 //------------------------------------------------------------------------------
 
-class OversizeMeta_test : public beast::unit_test::suite
+class OversizeMeta_test : public beast::unit_test::Suite
 {
 public:
     static void
@@ -91,15 +91,15 @@ public:
         using namespace jtx;
         auto const billion = 1000000000ul;
         Env env(*this);
-        env.disable_sigs();
+        env.disableSigs();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(billion), gw, "alice");
-        env.trust(USD(billion), "alice");
-        env(pay(gw, "alice", USD(billion)));
-        createOffers(env, USD, n);
-        env(pay("alice", gw, USD(billion)));
-        env(offer("alice", USD(1), XRP(1)));
+        env.trust(usd(billion), "alice");
+        env(pay(gw, "alice", usd(billion)));
+        createOffers(env, usd, n);
+        env(pay("alice", gw, usd(billion)));
+        env(offer("alice", usd(1), XRP(1)));
     }
 
     void
@@ -113,7 +113,7 @@ BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(OversizeMeta, app, xrpl, 3);
 
 //------------------------------------------------------------------------------
 
-class FindOversizeCross_test : public beast::unit_test::suite
+class FindOversizeCross_test : public beast::unit_test::Suite
 {
 public:
     // Return lowest x in [lo, hi] for which f(x)==true
@@ -156,15 +156,15 @@ public:
         using namespace jtx;
         auto const billion = 1000000000ul;
         Env env(*this);
-        env.disable_sigs();
+        env.disableSigs();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(billion), gw, "alice");
-        env.trust(USD(billion), "alice");
-        env(pay(gw, "alice", USD(billion)));
-        createOffers(env, USD, n);
-        env(pay("alice", gw, USD(billion)));
-        env(offer("alice", USD(1), XRP(1)), ter(std::ignore));
+        env.trust(usd(billion), "alice");
+        env(pay(gw, "alice", usd(billion)));
+        createOffers(env, usd, n);
+        env(pay("alice", gw, usd(billion)));
+        env(offer("alice", usd(1), XRP(1)), Ter(std::ignore));
         return env.ter() == tecOVERSIZE;
     }
 
diff --git a/src/test/app/PathMPT_test.cpp b/src/test/app/PathMPT_test.cpp
index 482d120342..ef8aa587f8 100644
--- a/src/test/app/PathMPT_test.cpp
+++ b/src/test/app/PathMPT_test.cpp
@@ -42,21 +42,21 @@
 namespace xrpl::test {
 namespace detail {
 
-static Json::Value
+static json::Value
 rpf(jtx::Account const& src,
     jtx::Account const& dst,
-    xrpl::test::jtx::MPT const& USD,
-    std::vector<MPTID> const& num_src)
+    xrpl::test::jtx::MPT const& usd,
+    std::vector<MPTID> const& numSrc)
 {
-    Json::Value jv = Json::objectValue;
+    json::Value jv = json::ObjectValue;
     jv[jss::command] = "ripple_path_find";
     jv[jss::source_account] = toBase58(src);
 
-    if (!num_src.empty())
+    if (!numSrc.empty())
     {
-        auto& sc = (jv[jss::source_currencies] = Json::arrayValue);
-        Json::Value j = Json::objectValue;
-        for (auto const& id : num_src)
+        auto& sc = (jv[jss::source_currencies] = json::ArrayValue);
+        json::Value j = json::ObjectValue;
+        for (auto const& id : numSrc)
         {
             j[jss::mpt_issuance_id] = to_string(id);
             sc.append(j);
@@ -66,8 +66,8 @@ rpf(jtx::Account const& src,
     auto const d = toBase58(dst);
     jv[jss::destination_account] = d;
 
-    Json::Value& j = (jv[jss::destination_amount] = Json::objectValue);
-    j[jss::mpt_issuance_id] = to_string(USD.mpt());
+    json::Value& j = (jv[jss::destination_amount] = json::ObjectValue);
+    j[jss::mpt_issuance_id] = to_string(usd.mpt());
     j[jss::value] = "1";
 
     return jv;
@@ -77,7 +77,7 @@ rpf(jtx::Account const& src,
 
 //------------------------------------------------------------------------------
 
-class PathMPT_test : public beast::unit_test::suite
+class PathMPT_test : public beast::unit_test::Suite
 {
     jtx::Env
     pathTestEnv()
@@ -96,7 +96,7 @@ class PathMPT_test : public beast::unit_test::suite
 
 public:
     void
-    source_currencies_limit()
+    sourceCurrenciesLimit()
     {
         testcase("source currency limits");
         using namespace std::chrono_literals;
@@ -108,11 +108,11 @@ public:
 
         env.fund(XRP(10'000), "alice", "bob", gw);
 
-        MPT const USD =
+        MPT const usd =
             MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 100});
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::feeReferenceRPC;
+        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -125,66 +125,66 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::apiVersionIfUnspecified},
+             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
             {},
             {}};
-        Json::Value result;
-        gate g;
+        json::Value result;
+        Gate g;
         // Test RPC::Tuning::max_src_cur source currencies.
-        std::vector<MPTID> num_src;
-        num_src.reserve(RPC::Tuning::max_src_cur);
-        for (std::uint8_t i = 0; i < RPC::Tuning::max_src_cur; ++i)
-            num_src.push_back(makeMptID(i, bob));
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
-            context.params = xrpl::test::detail::rpf(alice, bob, USD, num_src);
+        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.push_back(makeMptID(i, bob));
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = xrpl::test::detail::rpf(alice, bob, usd, numSrc);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(!result.isMember(jss::error));
 
         // Test more than RPC::Tuning::max_src_cur source currencies.
-        num_src.push_back(makeMptID(RPC::Tuning::max_src_cur, bob));
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
-            context.params = xrpl::test::detail::rpf(alice, bob, USD, num_src);
+        numSrc.push_back(makeMptID(RPC::Tuning::kMAX_SRC_CUR, bob));
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = xrpl::test::detail::rpf(alice, bob, usd, numSrc);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(result.isMember(jss::error));
 
         // Test RPC::Tuning::max_auto_src_cur source currencies.
-        num_src.clear();
-        for (auto i = 0; i < (RPC::Tuning::max_auto_src_cur - 1); ++i)
+        numSrc.clear();
+        for (auto i = 0; i < (RPC::Tuning::kMAX_AUTO_SRC_CUR - 1); ++i)
         {
-            auto CURM = MPTTester({.env = env, .issuer = alice, .holders = {bob}});
-            num_src.push_back(CURM.issuanceID());
+            auto curm = MPTTester({.env = env, .issuer = alice, .holders = {bob}});
+            numSrc.push_back(curm.issuanceID());
         }
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
-            context.params = xrpl::test::detail::rpf(alice, bob, USD, {});
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = xrpl::test::detail::rpf(alice, bob, usd, {});
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(!result.isMember(jss::error));
 
         // Test more than RPC::Tuning::max_auto_src_cur source currencies.
-        auto CURM = MPTTester({.env = env, .issuer = alice, .holders = {bob}});
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
-            context.params = xrpl::test::detail::rpf(alice, bob, USD, {});
+        auto curm = MPTTester({.env = env, .issuer = alice, .holders = {bob}});
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = xrpl::test::detail::rpf(alice, bob, usd, {});
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(result.isMember(jss::error));
     }
 
     void
-    no_direct_path_no_intermediary_no_alternatives()
+    noDirectPathNoIntermediaryNoAlternatives()
     {
         testcase("no direct path no intermediary no alternatives");
         using namespace jtx;
@@ -193,55 +193,55 @@ public:
 
         env.fund(XRP(10'000), "alice", "bob");
 
-        auto USDM = MPTTester({.env = env, .issuer = "bob"});
+        auto usdm = MPTTester({.env = env, .issuer = "bob"});
 
-        auto const result = find_paths(env, "alice", "bob", USDM(5));
+        auto const result = findPaths(env, "alice", "bob", usdm(5));
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    direct_path_no_intermediary()
+    directPathNoIntermediary()
     {
         testcase("direct path no intermediary");
         using namespace jtx;
         Env env = pathTestEnv();
         env.fund(XRP(10'000), "alice", "bob");
 
-        MPT const USD = MPTTester({.env = env, .issuer = "alice", .holders = {"bob"}});
+        MPT const usd = MPTTester({.env = env, .issuer = "alice", .holders = {"bob"}});
 
         STPathSet st;
         STAmount sa;
-        std::tie(st, sa, std::ignore) = find_paths(env, "alice", "bob", USD(5));
+        std::tie(st, sa, std::ignore) = findPaths(env, "alice", "bob", usd(5));
         BEAST_EXPECT(st.empty());
-        BEAST_EXPECT(equal(sa, USD(5)));
+        BEAST_EXPECT(equal(sa, usd(5)));
     }
 
     void
-    payment_auto_path_find()
+    paymentAutoPathFind()
     {
         testcase("payment auto path find");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
         env.fund(XRP(10'000), "alice", "bob", gw);
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
-        env(pay(gw, "alice", USD(70)));
-        env(pay("alice", "bob", USD(24)));
-        env.require(balance("alice", USD(46)));
-        env.require(balance("bob", USD(24)));
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
+        env(pay(gw, "alice", usd(70)));
+        env(pay("alice", "bob", usd(24)));
+        env.require(Balance("alice", usd(46)));
+        env.require(Balance("bob", usd(24)));
     }
 
     void
-    path_find(bool const domainEnabled)
+    pathFind(bool const domainEnabled)
     {
         testcase(std::string("path find") + (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
         env.fund(XRP(10'000), "alice", "bob", gw);
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
-        env(pay(gw, "alice", USD(70)));
-        env(pay(gw, "bob", USD(50)));
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
+        env(pay(gw, "alice", usd(70)));
+        env(pay(gw, "bob", usd(50)));
 
         std::optional<uint256> domainID;
         if (domainEnabled)
@@ -250,17 +250,17 @@ public:
         STPathSet st;
         STAmount sa;
         STAmount da;
-        std::tie(st, sa, da) = find_paths(
-            env, "alice", "bob", USD(5), std::nullopt, std::nullopt, std::nullopt, domainID);
+        std::tie(st, sa, da) = findPaths(
+            env, "alice", "bob", usd(5), std::nullopt, std::nullopt, std::nullopt, domainID);
         // Note, a direct IOU payment will have "gateway" as alternative path
         // since IOU supports rippling
         BEAST_EXPECT(st.empty());
-        BEAST_EXPECT(equal(sa, USD(5)));
-        BEAST_EXPECT(equal(da, USD(5)));
+        BEAST_EXPECT(equal(sa, usd(5)));
+        BEAST_EXPECT(equal(da, usd(5)));
     }
 
     void
-    path_find_consume_all(bool const domainEnabled)
+    pathFindConsumeAll(bool const domainEnabled)
     {
         testcase(
             std::string("path find consume all") + (domainEnabled ? " w/ " : " w/o ") + "domain");
@@ -270,39 +270,39 @@ public:
             Env env = pathTestEnv();
             auto const gw = Account("gateway");
             env.fund(XRP(10'000), "alice", "bob", "carol", gw);
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {"bob", "carol"}});
-            MPT const AUD(makeMptID(0, gw));
-            env(pay(gw, "carol", USD(100)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {"bob", "carol"}});
+            MPT const aud(makeMptID(0, gw));
+            env(pay(gw, "carol", usd(100)));
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {"alice", "bob", "carol", "gateway"});
-                env(offer("carol", XRP(100), USD(100)), domain(*domainID));
+                env(offer("carol", XRP(100), usd(100)), Domain(*domainID));
             }
             else
             {
-                env(offer("carol", XRP(100), USD(100)));
+                env(offer("carol", XRP(100), usd(100)));
             }
             env.close();
 
             STPathSet st;
             STAmount sa;
             STAmount da;
-            std::tie(st, sa, da) = find_paths(
+            std::tie(st, sa, da) = findPaths(
                 env,
                 "alice",
                 "bob",
-                AUD(-1),
+                aud(-1),
                 std::optional<STAmount>(XRP(100'000'000)),
                 std::nullopt,
                 std::nullopt,
                 domainID);
             BEAST_EXPECT(st.empty());
-            std::tie(st, sa, da) = find_paths(
+            std::tie(st, sa, da) = findPaths(
                 env,
                 "alice",
                 "bob",
-                USD(-1),
+                usd(-1),
                 std::optional<STAmount>(XRP(100'000'000)),
                 std::nullopt,
                 std::nullopt,
@@ -312,16 +312,16 @@ public:
                 auto const& pathElem = st[0][0];
                 BEAST_EXPECT(
                     pathElem.isOffer() && pathElem.getIssuerID() == gw.id() &&
-                    pathElem.getMPTID() == USD.issuanceID);
+                    pathElem.getMPTID() == usd.issuanceID);
             }
             BEAST_EXPECT(sa == XRP(100));
-            BEAST_EXPECT(equal(da, USD(100)));
+            BEAST_EXPECT(equal(da, usd(100)));
 
             // if domain is used, finding path in the open offerbook will return
             // empty result
             if (domainEnabled)
             {
-                std::tie(st, sa, da) = find_paths(
+                std::tie(st, sa, da) = findPaths(
                     env,
                     "alice",
                     "bob",
@@ -335,7 +335,7 @@ public:
     }
 
     void
-    alternative_paths_consume_best_transfer(bool const domainEnabled)
+    alternativePathsConsumeBestTransfer(bool const domainEnabled)
     {
         testcase(
             std::string("alternative path consume best transfer") +
@@ -345,31 +345,31 @@ public:
         auto const gw = Account("gateway");
         auto const gw2 = Account("gateway2");
         env.fund(XRP(10'000), "alice", "bob", gw, gw2);
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
-        MPT const gw2_USD = MPTTester(
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {"alice", "bob"}});
+        MPT const gw2Usd = MPTTester(
             {.env = env, .issuer = gw2, .holders = {"alice", "bob"}, .transferFee = 1'000});
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
             domainID = setupDomain(env, {"alice", "bob", "gateway", "gateway2"});
-            env(pay(gw, "alice", USD(70)), domain(*domainID));
-            env(pay(gw2, "alice", gw2_USD(70)), domain(*domainID));
-            env(pay("alice", "bob", USD(70)), domain(*domainID));
+            env(pay(gw, "alice", usd(70)), Domain(*domainID));
+            env(pay(gw2, "alice", gw2Usd(70)), Domain(*domainID));
+            env(pay("alice", "bob", usd(70)), Domain(*domainID));
         }
         else
         {
-            env(pay(gw, "alice", USD(70)));
-            env(pay(gw2, "alice", gw2_USD(70)));
-            env(pay("alice", "bob", USD(70)));
+            env(pay(gw, "alice", usd(70)));
+            env(pay(gw2, "alice", gw2Usd(70)));
+            env(pay("alice", "bob", usd(70)));
         }
-        env.require(balance("alice", USD(0)));
-        env.require(balance("alice", gw2_USD(70)));
-        env.require(balance("bob", USD(70)));
-        env.require(balance("bob", gw2_USD(0)));
+        env.require(Balance("alice", usd(0)));
+        env.require(Balance("alice", gw2Usd(70)));
+        env.require(Balance("bob", usd(70)));
+        env.require(Balance("bob", gw2Usd(0)));
     }
 
     void
-    receive_max(bool const domainEnabled)
+    receiveMax(bool const domainEnabled)
     {
         testcase(std::string("Receive max") + (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
@@ -382,30 +382,30 @@ public:
             Env env = pathTestEnv();
             env.fund(XRP(10'000), alice, bob, charlie, gw);
             env.close();
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, charlie}});
-            env(pay(gw, charlie, USD(10)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, charlie}});
+            env(pay(gw, charlie, usd(10)));
             env.close();
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {alice, bob, charlie, gw});
-                env(offer(charlie, XRP(10), USD(10)), domain(*domainID));
+                env(offer(charlie, XRP(10), usd(10)), Domain(*domainID));
             }
             else
             {
-                env(offer(charlie, XRP(10), USD(10)));
+                env(offer(charlie, XRP(10), usd(10)));
             }
             env.close();
-            auto [st, sa, da] = find_paths(
-                env, alice, bob, USD(-1), XRP(100).value(), std::nullopt, std::nullopt, domainID);
+            auto [st, sa, da] = findPaths(
+                env, alice, bob, usd(-1), XRP(100).value(), std::nullopt, std::nullopt, domainID);
             BEAST_EXPECT(sa == XRP(10));
-            BEAST_EXPECT(equal(da, USD(10)));
+            BEAST_EXPECT(equal(da, usd(10)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
                 auto const& pathElem = st[0][0];
                 BEAST_EXPECT(
                     pathElem.isOffer() && pathElem.getIssuerID() == gw.id() &&
-                    pathElem.getMPTID() == USD.mpt());
+                    pathElem.getMPTID() == usd.mpt());
             }
         }
         {
@@ -413,23 +413,23 @@ public:
             Env env = pathTestEnv();
             env.fund(XRP(10'000), alice, bob, charlie, gw);
             env.close();
-            MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, charlie}});
-            env(pay(gw, alice, USD(10)));
+            MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob, charlie}});
+            env(pay(gw, alice, usd(10)));
             env.close();
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {alice, bob, charlie, gw});
-                env(offer(charlie, USD(10), XRP(10)), domain(*domainID));
+                env(offer(charlie, usd(10), XRP(10)), Domain(*domainID));
             }
             else
             {
-                env(offer(charlie, USD(10), XRP(10)));
+                env(offer(charlie, usd(10), XRP(10)));
             }
             env.close();
-            auto [st, sa, da] = find_paths(
-                env, alice, bob, drops(-1), USD(100).value(), std::nullopt, std::nullopt, domainID);
-            BEAST_EXPECT(sa == USD(10));
+            auto [st, sa, da] = findPaths(
+                env, alice, bob, drops(-1), usd(100).value(), std::nullopt, std::nullopt, domainID);
+            BEAST_EXPECT(sa == usd(10));
             BEAST_EXPECT(equal(da, XRP(10)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
@@ -444,16 +444,16 @@ public:
     void
     run() override
     {
-        source_currencies_limit();
-        no_direct_path_no_intermediary_no_alternatives();
-        direct_path_no_intermediary();
-        payment_auto_path_find();
+        sourceCurrenciesLimit();
+        noDirectPathNoIntermediaryNoAlternatives();
+        directPathNoIntermediary();
+        paymentAutoPathFind();
         for (auto const domainEnabled : {false, true})
         {
-            path_find(domainEnabled);
-            path_find_consume_all(domainEnabled);
-            alternative_paths_consume_best_transfer(domainEnabled);
-            receive_max(domainEnabled);
+            pathFind(domainEnabled);
+            pathFindConsumeAll(domainEnabled);
+            alternativePathsConsumeBestTransfer(domainEnabled);
+            receiveMax(domainEnabled);
         }
     }
 };
diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp
index e6d27de415..9424bc05bf 100644
--- a/src/test/app/Path_test.cpp
+++ b/src/test/app/Path_test.cpp
@@ -60,20 +60,20 @@ namespace xrpl::test {
 
 //------------------------------------------------------------------------------
 
-Json::Value
-rpf(jtx::Account const& src, jtx::Account const& dst, std::uint32_t num_src)
+json::Value
+rpf(jtx::Account const& src, jtx::Account const& dst, std::uint32_t numSrc)
 {
-    Json::Value jv = Json::objectValue;
+    json::Value jv = json::ObjectValue;
     jv[jss::command] = "ripple_path_find";
     jv[jss::source_account] = toBase58(src);
 
-    if (num_src > 0)
+    if (numSrc > 0)
     {
-        auto& sc = (jv[jss::source_currencies] = Json::arrayValue);
-        Json::Value j = Json::objectValue;
-        while ((num_src--) != 0u)
+        auto& sc = (jv[jss::source_currencies] = json::ArrayValue);
+        json::Value j = json::ObjectValue;
+        while ((numSrc--) != 0u)
         {
-            j[jss::currency] = std::to_string(num_src + 100);
+            j[jss::currency] = std::to_string(numSrc + 100);
             sc.append(j);
         }
     }
@@ -81,7 +81,7 @@ rpf(jtx::Account const& src, jtx::Account const& dst, std::uint32_t num_src)
     auto const d = toBase58(dst);
     jv[jss::destination_account] = d;
 
-    Json::Value& j = (jv[jss::destination_amount] = Json::objectValue);
+    json::Value& j = (jv[jss::destination_amount] = json::ObjectValue);
     j[jss::currency] = "USD";
     j[jss::value] = "0.01";
     j[jss::issuer] = d;
@@ -91,7 +91,7 @@ rpf(jtx::Account const& src, jtx::Account const& dst, std::uint32_t num_src)
 
 //------------------------------------------------------------------------------
 
-class Path_test : public beast::unit_test::suite
+class Path_test : public beast::unit_test::Suite
 {
     jtx::Env
     pathTestEnv()
@@ -109,7 +109,7 @@ class Path_test : public beast::unit_test::suite
     }
 
 public:
-    class gate
+    class Gate
     {
     private:
         std::condition_variable cv_;
@@ -121,10 +121,10 @@ public:
         // Returns `true` if signaled.
         template <class Rep, class Period>
         bool
-        wait_for(std::chrono::duration<Rep, Period> const& rel_time)
+        waitFor(std::chrono::duration<Rep, Period> const& relTime)
         {
             std::unique_lock<std::mutex> lk(mutex_);
-            auto b = cv_.wait_for(lk, rel_time, [this] { return signaled_; });
+            auto b = cv_.wait_for(lk, relTime, [this] { return signaled_; });
             signaled_ = false;
             return b;
         }
@@ -139,7 +139,7 @@ public:
     };
 
     auto
-    find_paths_request(
+    findPathsRequest(
         jtx::Env& env,
         jtx::Account const& src,
         jtx::Account const& dst,
@@ -151,7 +151,7 @@ public:
         using namespace jtx;
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::feeReferenceRPC;
+        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -164,30 +164,30 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::apiVersionIfUnspecified},
+             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
             {},
             {}};
 
-        Json::Value params = Json::objectValue;
+        json::Value params = json::ObjectValue;
         params[jss::command] = "ripple_path_find";
         params[jss::source_account] = toBase58(src);
         params[jss::destination_account] = toBase58(dst);
-        params[jss::destination_amount] = saDstAmount.getJson(JsonOptions::none);
+        params[jss::destination_amount] = saDstAmount.getJson(JsonOptions::KNone);
         if (saSendMax)
-            params[jss::send_max] = saSendMax->getJson(JsonOptions::none);
+            params[jss::send_max] = saSendMax->getJson(JsonOptions::KNone);
         if (saSrcCurrency)
         {
-            auto& sc = params[jss::source_currencies] = Json::arrayValue;
-            Json::Value j = Json::objectValue;
+            auto& sc = params[jss::source_currencies] = json::ArrayValue;
+            json::Value j = json::ObjectValue;
             j[jss::currency] = to_string(saSrcCurrency.value());
             sc.append(j);
         }
         if (domain)
             params[jss::domain] = to_string(*domain);
 
-        Json::Value result;
-        gate g;
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
+        json::Value result;
+        Gate g;
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = std::move(params);
             context.coro = coro;
             RPC::doCommand(context, result);
@@ -195,13 +195,13 @@ public:
         });
 
         using namespace std::chrono_literals;
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(!result.isMember(jss::error));
         return result;
     }
 
     std::tuple<STPathSet, STAmount, STAmount>
-    find_paths(
+    findPaths(
         jtx::Env& env,
         jtx::Account const& src,
         jtx::Account const& dst,
@@ -210,13 +210,13 @@ public:
         std::optional<Currency> const& saSrcCurrency = std::nullopt,
         std::optional<uint256> const& domain = std::nullopt)
     {
-        Json::Value result =
-            find_paths_request(env, src, dst, saDstAmount, saSendMax, saSrcCurrency, domain);
+        json::Value result =
+            findPathsRequest(env, src, dst, saDstAmount, saSendMax, saSrcCurrency, domain);
         BEAST_EXPECT(!result.isMember(jss::error));
 
         STAmount da;
         if (result.isMember(jss::destination_amount))
-            da = amountFromJson(sfGeneric, result[jss::destination_amount]);
+            da = amountFromJson(kSF_GENERIC, result[jss::destination_amount]);
 
         STAmount sa;
         STPathSet paths;
@@ -228,14 +228,14 @@ public:
                 auto const& path = alts[0u];
 
                 if (path.isMember(jss::source_amount))
-                    sa = amountFromJson(sfGeneric, path[jss::source_amount]);
+                    sa = amountFromJson(kSF_GENERIC, path[jss::source_amount]);
 
                 if (path.isMember(jss::destination_amount))
-                    da = amountFromJson(sfGeneric, path[jss::destination_amount]);
+                    da = amountFromJson(kSF_GENERIC, path[jss::destination_amount]);
 
                 if (path.isMember(jss::paths_computed))
                 {
-                    Json::Value p;
+                    json::Value p;
                     p["Paths"] = path[jss::paths_computed];
                     STParsedJSONObject po("generic", p);
 
@@ -249,7 +249,7 @@ public:
     }
 
     void
-    source_currencies_limit()
+    sourceCurrenciesLimit()
     {
         testcase("source currency limits");
         using namespace std::chrono_literals;
@@ -262,7 +262,7 @@ public:
         env.close();
 
         auto& app = env.app();
-        Resource::Charge loadType = Resource::feeReferenceRPC;
+        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
         Resource::Consumer c;
 
         RPC::JsonContext context{
@@ -275,57 +275,57 @@ public:
              .role = Role::USER,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::apiVersionIfUnspecified},
+             .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
             {},
             {}};
-        Json::Value result;
-        gate g;
+        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::max_src_cur);
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMAX_SRC_CUR);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(!result.isMember(jss::error));
 
         // 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::max_src_cur + 1);
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
+            context.params = rpf(Account("alice"), Account("bob"), RPC::Tuning::kMAX_SRC_CUR + 1);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(result.isMember(jss::error));
 
         // Test RPC::Tuning::max_auto_src_cur source currencies.
-        for (auto i = 0; i < (RPC::Tuning::max_auto_src_cur - 1); ++i)
+        for (auto i = 0; i < (RPC::Tuning::kMAX_AUTO_SRC_CUR - 1); ++i)
             env.trust(Account("alice")[std::to_string(i + 100)](100), "bob");
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = rpf(Account("alice"), Account("bob"), 0);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(!result.isMember(jss::error));
 
         // Test more than RPC::Tuning::max_auto_src_cur source currencies.
         env.trust(Account("alice")["AUD"](100), "bob");
-        app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
+        app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
             context.params = rpf(Account("alice"), Account("bob"), 0);
             context.coro = coro;
             RPC::doCommand(context, result);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(result.isMember(jss::error));
     }
 
     void
-    no_direct_path_no_intermediary_no_alternatives()
+    noDirectPathNoIntermediaryNoAlternatives()
     {
         testcase("no direct path no intermediary no alternatives");
         using namespace jtx;
@@ -333,12 +333,12 @@ public:
         env.fund(XRP(10000), "alice", "bob");
         env.close();
 
-        auto const result = find_paths(env, "alice", "bob", Account("bob")["USD"](5));
+        auto const result = findPaths(env, "alice", "bob", Account("bob")["USD"](5));
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    direct_path_no_intermediary()
+    directPathNoIntermediary()
     {
         testcase("direct path no intermediary");
         using namespace jtx;
@@ -349,45 +349,45 @@ public:
 
         STPathSet st;
         STAmount sa;
-        std::tie(st, sa, std::ignore) = find_paths(env, "alice", "bob", Account("bob")["USD"](5));
+        std::tie(st, sa, std::ignore) = findPaths(env, "alice", "bob", Account("bob")["USD"](5));
         BEAST_EXPECT(st.empty());
         BEAST_EXPECT(equal(sa, Account("alice")["USD"](5)));
     }
 
     void
-    payment_auto_path_find()
+    paymentAutoPathFind()
     {
         testcase("payment auto path find");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), "alice", "bob", gw);
         env.close();
-        env.trust(USD(600), "alice");
-        env.trust(USD(700), "bob");
-        env(pay(gw, "alice", USD(70)));
-        env(pay("alice", "bob", USD(24)));
-        env.require(balance("alice", USD(46)));
-        env.require(balance(gw, Account("alice")["USD"](-46)));
-        env.require(balance("bob", USD(24)));
-        env.require(balance(gw, Account("bob")["USD"](-24)));
+        env.trust(usd(600), "alice");
+        env.trust(usd(700), "bob");
+        env(pay(gw, "alice", usd(70)));
+        env(pay("alice", "bob", usd(24)));
+        env.require(Balance("alice", usd(46)));
+        env.require(Balance(gw, Account("alice")["USD"](-46)));
+        env.require(Balance("bob", usd(24)));
+        env.require(Balance(gw, Account("bob")["USD"](-24)));
     }
 
     void
-    path_find(bool const domainEnabled)
+    pathFind(bool const domainEnabled)
     {
         testcase(std::string("path find") + (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), "alice", "bob", gw);
         env.close();
-        env.trust(USD(600), "alice");
-        env.trust(USD(700), "bob");
-        env(pay(gw, "alice", USD(70)));
-        env(pay(gw, "bob", USD(50)));
+        env.trust(usd(600), "alice");
+        env.trust(usd(700), "bob");
+        env(pay(gw, "alice", usd(70)));
+        env(pay(gw, "bob", usd(50)));
 
         std::optional<uint256> domainID;
         if (domainEnabled)
@@ -395,14 +395,14 @@ public:
 
         STPathSet st;
         STAmount sa;
-        std::tie(st, sa, std::ignore) = find_paths(
+        std::tie(st, sa, std::ignore) = findPaths(
             env, "alice", "bob", Account("bob")["USD"](5), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(same(st, stpath("gateway")));
         BEAST_EXPECT(equal(sa, Account("alice")["USD"](5)));
     }
 
     void
-    xrp_to_xrp(bool const domainEnabled)
+    xrpToXrp(bool const domainEnabled)
     {
         using namespace jtx;
         testcase(std::string("XRP to XRP") + (domainEnabled ? " w/ " : " w/o ") + "domain");
@@ -415,12 +415,12 @@ public:
             domainID = setupDomain(env, {"alice", "bob"});
 
         auto const result =
-            find_paths(env, "alice", "bob", XRP(5), std::nullopt, std::nullopt, domainID);
+            findPaths(env, "alice", "bob", XRP(5), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    path_find_consume_all(bool const domainEnabled)
+    pathFindConsumeAll(bool const domainEnabled)
     {
         testcase(
             std::string("path find consume all") + (domainEnabled ? " w/ " : " w/o ") + "domain");
@@ -443,7 +443,7 @@ public:
             STPathSet st;
             STAmount sa;
             STAmount da;
-            std::tie(st, sa, da) = find_paths(
+            std::tie(st, sa, da) = findPaths(
                 env,
                 "alice",
                 "edward",
@@ -459,30 +459,30 @@ public:
         {
             Env env = pathTestEnv();
             auto const gw = Account("gateway");
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(10000), "alice", "bob", "carol", gw);
             env.close();
-            env.trust(USD(100), "bob", "carol");
+            env.trust(usd(100), "bob", "carol");
             env.close();
-            env(pay(gw, "carol", USD(100)));
+            env(pay(gw, "carol", usd(100)));
             env.close();
 
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {"alice", "bob", "carol", "gateway"});
-                env(offer("carol", XRP(100), USD(100)), domain(*domainID));
+                env(offer("carol", XRP(100), usd(100)), Domain(*domainID));
             }
             else
             {
-                env(offer("carol", XRP(100), USD(100)));
+                env(offer("carol", XRP(100), usd(100)));
             }
             env.close();
 
             STPathSet st;
             STAmount sa;
             STAmount da;
-            std::tie(st, sa, da) = find_paths(
+            std::tie(st, sa, da) = findPaths(
                 env,
                 "alice",
                 "bob",
@@ -491,7 +491,7 @@ public:
                 std::nullopt,
                 domainID);
             BEAST_EXPECT(st.empty());
-            std::tie(st, sa, da) = find_paths(
+            std::tie(st, sa, da) = findPaths(
                 env,
                 "alice",
                 "bob",
@@ -506,7 +506,7 @@ public:
             // empty result
             if (domainEnabled)
             {
-                std::tie(st, sa, da) = find_paths(
+                std::tie(st, sa, da) = findPaths(
                     env,
                     "alice",
                     "bob",
@@ -520,7 +520,7 @@ public:
     }
 
     void
-    alternative_path_consume_both(bool const domainEnabled)
+    alternativePathConsumeBoth(bool const domainEnabled)
     {
         testcase(
             std::string("alternative path consume both") + (domainEnabled ? " w/ " : " w/o ") +
@@ -528,45 +528,45 @@ public:
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const gw2 = Account("gateway2");
-        auto const gw2_USD = gw2["USD"];
+        auto const gw2Usd = gw2["USD"];
         env.fund(XRP(10000), "alice", "bob", gw, gw2);
         env.close();
-        env.trust(USD(600), "alice");
-        env.trust(gw2_USD(800), "alice");
-        env.trust(USD(700), "bob");
-        env.trust(gw2_USD(900), "bob");
+        env.trust(usd(600), "alice");
+        env.trust(gw2Usd(800), "alice");
+        env.trust(usd(700), "bob");
+        env.trust(gw2Usd(900), "bob");
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
             domainID = setupDomain(env, {"alice", "bob", "gateway", "gateway2"});
-            env(pay(gw, "alice", USD(70)), domain(*domainID));
-            env(pay(gw2, "alice", gw2_USD(70)), domain(*domainID));
+            env(pay(gw, "alice", usd(70)), Domain(*domainID));
+            env(pay(gw2, "alice", gw2Usd(70)), Domain(*domainID));
             env(pay("alice", "bob", Account("bob")["USD"](140)),
-                paths(Account("alice")["USD"]),
-                domain(*domainID));
+                Paths(Account("alice")["USD"]),
+                Domain(*domainID));
         }
         else
         {
-            env(pay(gw, "alice", USD(70)));
-            env(pay(gw2, "alice", gw2_USD(70)));
-            env(pay("alice", "bob", Account("bob")["USD"](140)), paths(Account("alice")["USD"]));
+            env(pay(gw, "alice", usd(70)));
+            env(pay(gw2, "alice", gw2Usd(70)));
+            env(pay("alice", "bob", Account("bob")["USD"](140)), Paths(Account("alice")["USD"]));
         }
 
-        env.require(balance("alice", USD(0)));
-        env.require(balance("alice", gw2_USD(0)));
-        env.require(balance("bob", USD(70)));
-        env.require(balance("bob", gw2_USD(70)));
-        env.require(balance(gw, Account("alice")["USD"](0)));
-        env.require(balance(gw, Account("bob")["USD"](-70)));
-        env.require(balance(gw2, Account("alice")["USD"](0)));
-        env.require(balance(gw2, Account("bob")["USD"](-70)));
+        env.require(Balance("alice", usd(0)));
+        env.require(Balance("alice", gw2Usd(0)));
+        env.require(Balance("bob", usd(70)));
+        env.require(Balance("bob", gw2Usd(70)));
+        env.require(Balance(gw, Account("alice")["USD"](0)));
+        env.require(Balance(gw, Account("bob")["USD"](-70)));
+        env.require(Balance(gw2, Account("alice")["USD"](0)));
+        env.require(Balance(gw2, Account("bob")["USD"](-70)));
     }
 
     void
-    alternative_paths_consume_best_transfer(bool const domainEnabled)
+    alternativePathsConsumeBestTransfer(bool const domainEnabled)
     {
         testcase(
             std::string("alternative paths consume best transfer") +
@@ -574,75 +574,75 @@ public:
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const gw2 = Account("gateway2");
-        auto const gw2_USD = gw2["USD"];
+        auto const gw2Usd = gw2["USD"];
         env.fund(XRP(10000), "alice", "bob", gw, gw2);
         env.close();
         env(rate(gw2, 1.1));
-        env.trust(USD(600), "alice");
-        env.trust(gw2_USD(800), "alice");
-        env.trust(USD(700), "bob");
-        env.trust(gw2_USD(900), "bob");
+        env.trust(usd(600), "alice");
+        env.trust(gw2Usd(800), "alice");
+        env.trust(usd(700), "bob");
+        env.trust(gw2Usd(900), "bob");
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
             domainID = setupDomain(env, {"alice", "bob", "gateway", "gateway2"});
-            env(pay(gw, "alice", USD(70)), domain(*domainID));
-            env(pay(gw2, "alice", gw2_USD(70)), domain(*domainID));
-            env(pay("alice", "bob", USD(70)), domain(*domainID));
+            env(pay(gw, "alice", usd(70)), Domain(*domainID));
+            env(pay(gw2, "alice", gw2Usd(70)), Domain(*domainID));
+            env(pay("alice", "bob", usd(70)), Domain(*domainID));
         }
         else
         {
-            env(pay(gw, "alice", USD(70)));
-            env(pay(gw2, "alice", gw2_USD(70)));
-            env(pay("alice", "bob", USD(70)));
+            env(pay(gw, "alice", usd(70)));
+            env(pay(gw2, "alice", gw2Usd(70)));
+            env(pay("alice", "bob", usd(70)));
         }
-        env.require(balance("alice", USD(0)));
-        env.require(balance("alice", gw2_USD(70)));
-        env.require(balance("bob", USD(70)));
-        env.require(balance("bob", gw2_USD(0)));
-        env.require(balance(gw, Account("alice")["USD"](0)));
-        env.require(balance(gw, Account("bob")["USD"](-70)));
-        env.require(balance(gw2, Account("alice")["USD"](-70)));
-        env.require(balance(gw2, Account("bob")["USD"](0)));
+        env.require(Balance("alice", usd(0)));
+        env.require(Balance("alice", gw2Usd(70)));
+        env.require(Balance("bob", usd(70)));
+        env.require(Balance("bob", gw2Usd(0)));
+        env.require(Balance(gw, Account("alice")["USD"](0)));
+        env.require(Balance(gw, Account("bob")["USD"](-70)));
+        env.require(Balance(gw2, Account("alice")["USD"](-70)));
+        env.require(Balance(gw2, Account("bob")["USD"](0)));
     }
 
     void
-    alternative_paths_consume_best_transfer_first()
+    alternativePathsConsumeBestTransferFirst()
     {
         testcase("alternative paths - consume best transfer first");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const gw2 = Account("gateway2");
-        auto const gw2_USD = gw2["USD"];
+        auto const gw2Usd = gw2["USD"];
         env.fund(XRP(10000), "alice", "bob", gw, gw2);
         env.close();
         env(rate(gw2, 1.1));
-        env.trust(USD(600), "alice");
-        env.trust(gw2_USD(800), "alice");
-        env.trust(USD(700), "bob");
-        env.trust(gw2_USD(900), "bob");
-        env(pay(gw, "alice", USD(70)));
-        env(pay(gw2, "alice", gw2_USD(70)));
+        env.trust(usd(600), "alice");
+        env.trust(gw2Usd(800), "alice");
+        env.trust(usd(700), "bob");
+        env.trust(gw2Usd(900), "bob");
+        env(pay(gw, "alice", usd(70)));
+        env(pay(gw2, "alice", gw2Usd(70)));
         env(pay("alice", "bob", Account("bob")["USD"](77)),
-            sendmax(Account("alice")["USD"](100)),
-            paths(Account("alice")["USD"]));
-        env.require(balance("alice", USD(0)));
-        env.require(balance("alice", gw2_USD(62.3)));
-        env.require(balance("bob", USD(70)));
-        env.require(balance("bob", gw2_USD(7)));
-        env.require(balance(gw, Account("alice")["USD"](0)));
-        env.require(balance(gw, Account("bob")["USD"](-70)));
-        env.require(balance(gw2, Account("alice")["USD"](-62.3)));
-        env.require(balance(gw2, Account("bob")["USD"](-7)));
+            Sendmax(Account("alice")["USD"](100)),
+            Paths(Account("alice")["USD"]));
+        env.require(Balance("alice", usd(0)));
+        env.require(Balance("alice", gw2Usd(62.3)));
+        env.require(Balance("bob", usd(70)));
+        env.require(Balance("bob", gw2Usd(7)));
+        env.require(Balance(gw, Account("alice")["USD"](0)));
+        env.require(Balance(gw, Account("bob")["USD"](-70)));
+        env.require(Balance(gw2, Account("alice")["USD"](-62.3)));
+        env.require(Balance(gw2, Account("bob")["USD"](-7)));
     }
 
     void
-    alternative_paths_limit_returned_paths_to_best_quality(bool const domainEnabled)
+    alternativePathsLimitReturnedPathsToBestQuality(bool const domainEnabled)
     {
         testcase(
             std::string("alternative paths - limit returned paths to best quality") +
@@ -650,24 +650,24 @@ public:
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const gw2 = Account("gateway2");
-        auto const gw2_USD = gw2["USD"];
+        auto const gw2Usd = gw2["USD"];
         env.fund(XRP(10000), "alice", "bob", "carol", "dan", gw, gw2);
         env.close();
         env(rate("carol", 1.1));
         env.trust(Account("carol")["USD"](800), "alice", "bob");
         env.trust(Account("dan")["USD"](800), "alice", "bob");
-        env.trust(USD(800), "alice", "bob");
-        env.trust(gw2_USD(800), "alice", "bob");
+        env.trust(usd(800), "alice", "bob");
+        env.trust(gw2Usd(800), "alice", "bob");
         env.trust(Account("alice")["USD"](800), "dan");
         env.trust(Account("bob")["USD"](800), "dan");
         env.close();
-        env(pay(gw2, "alice", gw2_USD(100)));
+        env(pay(gw2, "alice", gw2Usd(100)));
         env.close();
         env(pay("carol", "alice", Account("carol")["USD"](100)));
         env.close();
-        env(pay(gw, "alice", USD(100)));
+        env(pay(gw, "alice", usd(100)));
         env.close();
 
         std::optional<uint256> domainID;
@@ -678,7 +678,7 @@ public:
 
         STPathSet st;
         STAmount sa;
-        std::tie(st, sa, std::ignore) = find_paths(
+        std::tie(st, sa, std::ignore) = findPaths(
             env, "alice", "bob", Account("bob")["USD"](5), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(
             same(st, stpath("gateway"), stpath("gateway2"), stpath("dan"), stpath("carol")));
@@ -686,7 +686,7 @@ public:
     }
 
     void
-    issues_path_negative_issue(bool const domainEnabled)
+    issuesPathNegativeIssue(bool const domainEnabled)
     {
         testcase(
             std::string("path negative: Issue #5") + (domainEnabled ? " w/ " : " w/o ") + "domain");
@@ -698,8 +698,8 @@ public:
         env.trust(Account("alice")["USD"](100), "dan");
         env.trust(Account("carol")["USD"](100), "dan");
         env(pay("bob", "carol", Account("bob")["USD"](75)));
-        env.require(balance("bob", Account("carol")["USD"](-75)));
-        env.require(balance("carol", Account("bob")["USD"](75)));
+        env.require(Balance("bob", Account("carol")["USD"](-75)));
+        env.require(Balance("carol", Account("bob")["USD"](75)));
         env.close();
 
         std::optional<uint256> domainID;
@@ -708,34 +708,34 @@ public:
             domainID = setupDomain(env, {"alice", "bob", "carol", "dan"});
         }
 
-        auto result = find_paths(
+        auto result = findPaths(
             env, "alice", "bob", Account("bob")["USD"](25), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(std::get<0>(result).empty());
 
-        env(pay("alice", "bob", Account("alice")["USD"](25)), ter(tecPATH_DRY));
+        env(pay("alice", "bob", Account("alice")["USD"](25)), Ter(tecPATH_DRY));
         env.close();
 
-        result = find_paths(
+        result = findPaths(
             env, "alice", "bob", Account("alice")["USD"](25), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(std::get<0>(result).empty());
 
-        env.require(balance("alice", Account("bob")["USD"](0)));
-        env.require(balance("alice", Account("dan")["USD"](0)));
-        env.require(balance("bob", Account("alice")["USD"](0)));
-        env.require(balance("bob", Account("carol")["USD"](-75)));
-        env.require(balance("bob", Account("dan")["USD"](0)));
-        env.require(balance("carol", Account("bob")["USD"](75)));
-        env.require(balance("carol", Account("dan")["USD"](0)));
-        env.require(balance("dan", Account("alice")["USD"](0)));
-        env.require(balance("dan", Account("bob")["USD"](0)));
-        env.require(balance("dan", Account("carol")["USD"](0)));
+        env.require(Balance("alice", Account("bob")["USD"](0)));
+        env.require(Balance("alice", Account("dan")["USD"](0)));
+        env.require(Balance("bob", Account("alice")["USD"](0)));
+        env.require(Balance("bob", Account("carol")["USD"](-75)));
+        env.require(Balance("bob", Account("dan")["USD"](0)));
+        env.require(Balance("carol", Account("bob")["USD"](75)));
+        env.require(Balance("carol", Account("dan")["USD"](0)));
+        env.require(Balance("dan", Account("alice")["USD"](0)));
+        env.require(Balance("dan", Account("bob")["USD"](0)));
+        env.require(Balance("dan", Account("carol")["USD"](0)));
     }
 
-    // alice -- limit 40 --> bob
-    // alice --> carol --> dan --> bob
+    // alice_ -- limit 40 --> bob_
+    // alice_ --> carol_ --> dan --> bob_
     // Balance of 100 USD Bob - Balance of 37 USD -> Rod
     void
-    issues_path_negative_ripple_client_issue_23_smaller()
+    issuesPathNegativeRippleClientIssue23Smaller()
     {
         testcase("path negative: ripple-client issue #23: smaller");
         using namespace jtx;
@@ -746,15 +746,15 @@ public:
         env.trust(Account("dan")["USD"](20), "bob");
         env.trust(Account("alice")["USD"](20), "carol");
         env.trust(Account("carol")["USD"](20), "dan");
-        env(pay("alice", "bob", Account("bob")["USD"](55)), paths(Account("alice")["USD"]));
-        env.require(balance("bob", Account("alice")["USD"](40)));
-        env.require(balance("bob", Account("dan")["USD"](15)));
+        env(pay("alice", "bob", Account("bob")["USD"](55)), Paths(Account("alice")["USD"]));
+        env.require(Balance("bob", Account("alice")["USD"](40)));
+        env.require(Balance("bob", Account("dan")["USD"](15)));
     }
 
-    // alice -120 USD-> edward -25 USD-> bob
-    // alice -25 USD-> carol -75 USD -> dan -100 USD-> bob
+    // alice_ -120 USD-> edward -25 USD-> bob_
+    // alice_ -25 USD-> carol_ -75 USD -> dan -100 USD-> bob_
     void
-    issues_path_negative_ripple_client_issue_23_larger()
+    issuesPathNegativeRippleClientIssue23Larger()
     {
         testcase("path negative: ripple-client issue #23: larger");
         using namespace jtx;
@@ -766,64 +766,64 @@ public:
         env.trust(Account("dan")["USD"](100), "bob");
         env.trust(Account("alice")["USD"](25), "carol");
         env.trust(Account("carol")["USD"](75), "dan");
-        env(pay("alice", "bob", Account("bob")["USD"](50)), paths(Account("alice")["USD"]));
-        env.require(balance("alice", Account("edward")["USD"](-25)));
-        env.require(balance("alice", Account("carol")["USD"](-25)));
-        env.require(balance("bob", Account("edward")["USD"](25)));
-        env.require(balance("bob", Account("dan")["USD"](25)));
-        env.require(balance("carol", Account("alice")["USD"](25)));
-        env.require(balance("carol", Account("dan")["USD"](-25)));
-        env.require(balance("dan", Account("carol")["USD"](25)));
-        env.require(balance("dan", Account("bob")["USD"](-25)));
+        env(pay("alice", "bob", Account("bob")["USD"](50)), Paths(Account("alice")["USD"]));
+        env.require(Balance("alice", Account("edward")["USD"](-25)));
+        env.require(Balance("alice", Account("carol")["USD"](-25)));
+        env.require(Balance("bob", Account("edward")["USD"](25)));
+        env.require(Balance("bob", Account("dan")["USD"](25)));
+        env.require(Balance("carol", Account("alice")["USD"](25)));
+        env.require(Balance("carol", Account("dan")["USD"](-25)));
+        env.require(Balance("dan", Account("carol")["USD"](25)));
+        env.require(Balance("dan", Account("bob")["USD"](-25)));
     }
 
-    // carol holds gateway AUD, sells gateway AUD for XRP
-    // bob will hold gateway AUD
-    // alice pays bob gateway AUD using XRP
+    // carol_ holds gateway AUD, sells gateway AUD for XRP
+    // bob_ will hold gateway AUD
+    // alice_ pays bob_ gateway AUD using XRP
     void
-    via_offers_via_gateway(bool const domainEnabled)
+    viaOffersViaGateway(bool const domainEnabled)
     {
         testcase(std::string("via gateway") + (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
         auto const gw = Account("gateway");
-        auto const AUD = gw["AUD"];
+        auto const aud = gw["AUD"];
         env.fund(XRP(10000), "alice", "bob", "carol", gw);
         env.close();
         env(rate(gw, 1.1));
         env.close();
-        env.trust(AUD(100), "bob", "carol");
+        env.trust(aud(100), "bob", "carol");
         env.close();
-        env(pay(gw, "carol", AUD(50)));
+        env(pay(gw, "carol", aud(50)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
             domainID = setupDomain(env, {"alice", "bob", "carol", gw});
-            env(offer("carol", XRP(50), AUD(50)), domain(*domainID));
+            env(offer("carol", XRP(50), aud(50)), Domain(*domainID));
             env.close();
-            env(pay("alice", "bob", AUD(10)), sendmax(XRP(100)), paths(XRP), domain(*domainID));
+            env(pay("alice", "bob", aud(10)), Sendmax(XRP(100)), Paths(XRP), Domain(*domainID));
             env.close();
         }
         else
         {
-            env(offer("carol", XRP(50), AUD(50)));
+            env(offer("carol", XRP(50), aud(50)));
             env.close();
-            env(pay("alice", "bob", AUD(10)), sendmax(XRP(100)), paths(XRP));
+            env(pay("alice", "bob", aud(10)), Sendmax(XRP(100)), Paths(XRP));
             env.close();
         }
 
-        env.require(balance("bob", AUD(10)));
-        env.require(balance("carol", AUD(39)));
+        env.require(Balance("bob", aud(10)));
+        env.require(Balance("carol", aud(39)));
 
-        auto const result = find_paths(
+        auto const result = findPaths(
             env, "alice", "bob", Account("bob")["USD"](25), std::nullopt, std::nullopt, domainID);
         BEAST_EXPECT(std::get<0>(result).empty());
     }
 
     void
-    indirect_paths_path_find()
+    indirectPathsPathFind()
     {
         testcase("path find");
         using namespace jtx;
@@ -836,13 +836,13 @@ public:
         STPathSet st;
         STAmount sa;
         std::tie(st, sa, std::ignore) =
-            find_paths(env, "alice", "carol", Account("carol")["USD"](5));
+            findPaths(env, "alice", "carol", Account("carol")["USD"](5));
         BEAST_EXPECT(same(st, stpath("bob")));
         BEAST_EXPECT(equal(sa, Account("alice")["USD"](5)));
     }
 
     void
-    quality_paths_quality_set_and_test()
+    qualityPathsQualitySetAndTest()
     {
         testcase("quality set and test");
         using namespace jtx;
@@ -850,11 +850,11 @@ public:
         env.fund(XRP(10000), "alice", "bob");
         env.close();
         env(trust("bob", Account("alice")["USD"](1000)),
-            json("{\"" + sfQualityIn.fieldName + "\": 2000}"),
-            json("{\"" + sfQualityOut.fieldName + "\": 1400000000}"));
+            Json("{\"" + sfQualityIn.fieldName + "\": 2000}"),
+            Json("{\"" + sfQualityOut.fieldName + "\": 1400000000}"));
 
-        Json::Value jv;
-        Json::Reader().parse(
+        json::Value jv;
+        json::Reader().parse(
             R"({
                 "Balance" : {
                     "currency" : "USD",
@@ -880,14 +880,14 @@ public:
             })",
             jv);
 
-        auto const jv_l = env.le(keylet::line(Account("bob").id(), Account("alice")["USD"]))
-                              ->getJson(JsonOptions::none);
+        auto const jvL = env.le(keylet::line(Account("bob").id(), Account("alice")["USD"]))
+                             ->getJson(JsonOptions::KNone);
         for (auto it = jv.begin(); it != jv.end(); ++it)
-            BEAST_EXPECT(*it == jv_l[it.memberName()]);
+            BEAST_EXPECT(*it == jvL[it.memberName()]);
     }
 
     void
-    trust_auto_clear_trust_normal_clear()
+    trustAutoClearTrustNormalClear()
     {
         testcase("trust normal clear");
         using namespace jtx;
@@ -897,8 +897,8 @@ public:
         env.trust(Account("bob")["USD"](1000), "alice");
         env.trust(Account("alice")["USD"](1000), "bob");
 
-        Json::Value jv;
-        Json::Reader().parse(
+        json::Value jv;
+        json::Reader().parse(
             R"({
                 "Balance" : {
                     "currency" : "USD",
@@ -922,10 +922,10 @@ public:
             })",
             jv);
 
-        auto const jv_l = env.le(keylet::line(Account("bob").id(), Account("alice")["USD"]))
-                              ->getJson(JsonOptions::none);
+        auto const jvL = env.le(keylet::line(Account("bob").id(), Account("alice")["USD"]))
+                             ->getJson(JsonOptions::KNone);
         for (auto it = jv.begin(); it != jv.end(); ++it)
-            BEAST_EXPECT(*it == jv_l[it.memberName()]);
+            BEAST_EXPECT(*it == jvL[it.memberName()]);
 
         env.trust(Account("bob")["USD"](0), "alice");
         env.trust(Account("alice")["USD"](0), "bob");
@@ -933,7 +933,7 @@ public:
     }
 
     void
-    trust_auto_clear_trust_auto_clear()
+    trustAutoClearTrustAutoClear()
     {
         testcase("trust auto clear");
         using namespace jtx;
@@ -944,8 +944,8 @@ public:
         env(pay("bob", "alice", Account("bob")["USD"](50)));
         env.trust(Account("bob")["USD"](0), "alice");
 
-        Json::Value jv;
-        Json::Reader().parse(
+        json::Value jv;
+        json::Reader().parse(
             R"({
                 "Balance" :
                 {
@@ -972,64 +972,64 @@ public:
             })",
             jv);
 
-        auto const jv_l = env.le(keylet::line(Account("alice").id(), Account("bob")["USD"]))
-                              ->getJson(JsonOptions::none);
+        auto const jvL = env.le(keylet::line(Account("alice").id(), Account("bob")["USD"]))
+                             ->getJson(JsonOptions::KNone);
         for (auto it = jv.begin(); it != jv.end(); ++it)
-            BEAST_EXPECT(*it == jv_l[it.memberName()]);
+            BEAST_EXPECT(*it == jvL[it.memberName()]);
 
         env(pay("alice", "bob", Account("alice")["USD"](50)));
         BEAST_EXPECT(env.le(keylet::line(Account("alice").id(), Account("bob")["USD"])) == nullptr);
     }
 
     void
-    path_find_01(bool const domainEnabled)
+    pathFind01(bool const domainEnabled)
     {
         testcase(
             std::string("Path Find: XRP -> XRP and XRP -> IOU") +
             (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const G3{"G3"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const g3{"G3"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(100000), A1);
-        env.fund(XRP(10000), A2);
-        env.fund(XRP(1000), A3, G1, G2, G3, M1);
+        env.fund(XRP(100000), a1);
+        env.fund(XRP(10000), a2);
+        env.fund(XRP(1000), a3, g1, g2, g3, m1);
         env.close();
 
-        env.trust(G1["XYZ"](5000), A1);
-        env.trust(G3["ABC"](5000), A1);
-        env.trust(G2["XYZ"](5000), A2);
-        env.trust(G3["ABC"](5000), A2);
-        env.trust(A2["ABC"](1000), A3);
-        env.trust(G1["XYZ"](100000), M1);
-        env.trust(G2["XYZ"](100000), M1);
-        env.trust(G3["ABC"](100000), M1);
+        env.trust(g1["XYZ"](5000), a1);
+        env.trust(g3["ABC"](5000), a1);
+        env.trust(g2["XYZ"](5000), a2);
+        env.trust(g3["ABC"](5000), a2);
+        env.trust(a2["ABC"](1000), a3);
+        env.trust(g1["XYZ"](100000), m1);
+        env.trust(g2["XYZ"](100000), m1);
+        env.trust(g3["ABC"](100000), m1);
         env.close();
 
-        env(pay(G1, A1, G1["XYZ"](3500)));
-        env(pay(G3, A1, G3["ABC"](1200)));
-        env(pay(G2, M1, G2["XYZ"](25000)));
-        env(pay(G3, M1, G3["ABC"](25000)));
+        env(pay(g1, a1, g1["XYZ"](3500)));
+        env(pay(g3, a1, g3["ABC"](1200)));
+        env(pay(g2, m1, g2["XYZ"](25000)));
+        env(pay(g3, m1, g3["ABC"](25000)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
-            domainID = setupDomain(env, {A1, A2, A3, G1, G2, G3, M1});
-            env(offer(M1, G1["XYZ"](1000), G2["XYZ"](1000)), domain(*domainID));
-            env(offer(M1, XRP(10000), G3["ABC"](1000)), domain(*domainID));
+            domainID = setupDomain(env, {a1, a2, a3, g1, g2, g3, m1});
+            env(offer(m1, g1["XYZ"](1000), g2["XYZ"](1000)), Domain(*domainID));
+            env(offer(m1, XRP(10000), g3["ABC"](1000)), Domain(*domainID));
             env.close();
         }
         else
         {
-            env(offer(M1, G1["XYZ"](1000), G2["XYZ"](1000)));
-            env(offer(M1, XRP(10000), G3["ABC"](1000)));
+            env(offer(m1, g1["XYZ"](1000), g2["XYZ"](1000)));
+            env(offer(m1, XRP(10000), g3["ABC"](1000)));
             env.close();
         }
 
@@ -1037,98 +1037,98 @@ public:
         STAmount sa, da;
 
         {
-            auto const& send_amt = XRP(10);
+            auto const& sendAmt = XRP(10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency(), domainID);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency(), domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
             // no path should exist for this since dest account
             // does not exist.
-            auto const& send_amt = XRP(200);
+            auto const& sendAmt = XRP(200);
             std::tie(st, sa, da) =
-                find_paths(env, A1, Account{"A0"}, send_amt, std::nullopt, xrpCurrency(), domainID);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, Account{"A0"}, sendAmt, std::nullopt, xrpCurrency(), domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
 
         {
-            auto const& send_amt = G3["ABC"](10);
+            auto const& sendAmt = g3["ABC"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A2, G3, send_amt, std::nullopt, xrpCurrency(), domainID);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a2, g3, sendAmt, std::nullopt, xrpCurrency(), domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRP(100)));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]))));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]))));
         }
 
         {
-            auto const& send_amt = A2["ABC"](1);
+            auto const& sendAmt = a2["ABC"](1);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, xrpCurrency(), domainID);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, xrpCurrency(), domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRP(10)));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]), G3)));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]), g3)));
         }
 
         {
-            auto const& send_amt = A3["ABC"](1);
+            auto const& sendAmt = a3["ABC"](1);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A3, send_amt, std::nullopt, xrpCurrency(), domainID);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, a3, sendAmt, std::nullopt, xrpCurrency(), domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(equal(sa, XRP(10)));
-            BEAST_EXPECT(same(st, stpath(IPE(G3["ABC"]), G3, A2)));
+            BEAST_EXPECT(same(st, stpath(ipe(g3["ABC"]), g3, a2)));
         }
     }
 
     void
-    path_find_02(bool const domainEnabled)
+    pathFind02(bool const domainEnabled)
     {
         testcase(
             std::string("Path Find: non-XRP -> XRP") + (domainEnabled ? " w/ " : " w/o ") +
             "domain");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const G3{"G3"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const g3{"G3"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(1000), A1, A2, G3);
-        env.fund(XRP(11000), M1);
+        env.fund(XRP(1000), a1, a2, g3);
+        env.fund(XRP(11000), m1);
         env.close();
 
-        env.trust(G3["ABC"](1000), A1, A2);
-        env.trust(G3["ABC"](100000), M1);
+        env.trust(g3["ABC"](1000), a1, a2);
+        env.trust(g3["ABC"](100000), m1);
         env.close();
 
-        env(pay(G3, A1, G3["ABC"](1000)));
-        env(pay(G3, A2, G3["ABC"](1000)));
-        env(pay(G3, M1, G3["ABC"](1200)));
+        env(pay(g3, a1, g3["ABC"](1000)));
+        env(pay(g3, a2, g3["ABC"](1000)));
+        env(pay(g3, m1, g3["ABC"](1200)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
-            domainID = setupDomain(env, {A1, A2, G3, M1});
-            env(offer(M1, G3["ABC"](1000), XRP(10000)), domain(*domainID));
+            domainID = setupDomain(env, {a1, a2, g3, m1});
+            env(offer(m1, g3["ABC"](1000), XRP(10000)), Domain(*domainID));
         }
         else
         {
-            env(offer(M1, G3["ABC"](1000), XRP(10000)));
+            env(offer(m1, g3["ABC"](1000), XRP(10000)));
         }
 
         STPathSet st;
         STAmount sa, da;
-        auto const& send_amt = XRP(10);
+        auto const& sendAmt = XRP(10);
 
         {
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, A2["ABC"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["ABC"](1)));
-            BEAST_EXPECT(same(st, stpath(G3, IPE(xrpIssue()))));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, a2["ABC"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["ABC"](1)));
+            BEAST_EXPECT(same(st, stpath(g3, ipe(xrpIssue()))));
         }
 
         // domain offer will not be considered in pathfinding for non-domain
@@ -1136,153 +1136,153 @@ public:
         if (domainEnabled)
         {
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, A2["ABC"].currency);
-            BEAST_EXPECT(equal(da, send_amt));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, a2["ABC"].currency);
+            BEAST_EXPECT(equal(da, sendAmt));
             BEAST_EXPECT(st.empty());
         }
     }
 
     void
-    path_find_04(bool const domainEnabled)
+    pathFind04(bool const domainEnabled)
     {
         testcase(
             std::string("Path Find: Bitstamp and SnapSwap, liquidity with no offers") +
             (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const G1BS{"G1BS"};
-        Account const G2SW{"G2SW"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const g1Bs{"G1BS"};
+        Account const g2Sw{"G2SW"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(1000), G1BS, G2SW, A1, A2);
-        env.fund(XRP(11000), M1);
+        env.fund(XRP(1000), g1Bs, g2Sw, a1, a2);
+        env.fund(XRP(11000), m1);
         env.close();
 
-        env.trust(G1BS["HKD"](2000), A1);
-        env.trust(G2SW["HKD"](2000), A2);
-        env.trust(G1BS["HKD"](100000), M1);
-        env.trust(G2SW["HKD"](100000), M1);
+        env.trust(g1Bs["HKD"](2000), a1);
+        env.trust(g2Sw["HKD"](2000), a2);
+        env.trust(g1Bs["HKD"](100000), m1);
+        env.trust(g2Sw["HKD"](100000), m1);
         env.close();
 
-        env(pay(G1BS, A1, G1BS["HKD"](1000)));
-        env(pay(G2SW, A2, G2SW["HKD"](1000)));
+        env(pay(g1Bs, a1, g1Bs["HKD"](1000)));
+        env(pay(g2Sw, a2, g2Sw["HKD"](1000)));
         // SnapSwap wants to be able to set trust line quality settings so they
         // can charge a fee when transactions ripple across. Liquidity
         // provider, via trusting/holding both accounts
-        env(pay(G1BS, M1, G1BS["HKD"](1200)));
-        env(pay(G2SW, M1, G2SW["HKD"](5000)));
+        env(pay(g1Bs, m1, g1Bs["HKD"](1200)));
+        env(pay(g2Sw, m1, g2Sw["HKD"](5000)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
-            domainID = setupDomain(env, {A1, A2, G1BS, G2SW, M1});
+            domainID = setupDomain(env, {a1, a2, g1Bs, g2Sw, m1});
 
         STPathSet st;
         STAmount sa, da;
 
         {
-            auto const& send_amt = A2["HKD"](10);
+            auto const& sendAmt = a2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, A2["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(G1BS, M1, G2SW)));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, a2["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(g1Bs, m1, g2Sw)));
         }
 
         {
-            auto const& send_amt = A1["HKD"](10);
+            auto const& sendAmt = a1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A2, A1, send_amt, std::nullopt, A1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A2["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(G2SW, M1, G1BS)));
+                findPaths(env, a2, a1, sendAmt, std::nullopt, a1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a2["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(g2Sw, m1, g1Bs)));
         }
 
         {
-            auto const& send_amt = A2["HKD"](10);
+            auto const& sendAmt = a2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, G1BS, A2, send_amt, std::nullopt, A1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, G1BS["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(M1, G2SW)));
+                findPaths(env, g1Bs, a2, sendAmt, std::nullopt, a1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, g1Bs["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(m1, g2Sw)));
         }
 
         {
-            auto const& send_amt = M1["HKD"](10);
+            auto const& sendAmt = m1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, M1, G1BS, send_amt, std::nullopt, A1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, M1["HKD"](10)));
+                findPaths(env, m1, g1Bs, sendAmt, std::nullopt, a1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, m1["HKD"](10)));
             BEAST_EXPECT(st.empty());
         }
 
         {
-            auto const& send_amt = A1["HKD"](10);
+            auto const& sendAmt = a1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, G2SW, A1, send_amt, std::nullopt, A1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, G2SW["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(M1, G1BS)));
+                findPaths(env, g2Sw, a1, sendAmt, std::nullopt, a1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, g2Sw["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(m1, g1Bs)));
         }
     }
 
     void
-    path_find_05(bool const domainEnabled)
+    pathFind05(bool const domainEnabled)
     {
         testcase(
             std::string("Path Find: non-XRP -> non-XRP, same currency") +
             (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const A4{"A4"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const G3{"G3"};
-        Account const G4{"G4"};
-        Account const M1{"M1"};
-        Account const M2{"M2"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const a4{"A4"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const g3{"G3"};
+        Account const g4{"G4"};
+        Account const m1{"M1"};
+        Account const m2{"M2"};
 
-        env.fund(XRP(1000), A1, A2, A3, G1, G2, G3, G4);
-        env.fund(XRP(10000), A4);
-        env.fund(XRP(11000), M1, M2);
+        env.fund(XRP(1000), a1, a2, a3, g1, g2, g3, g4);
+        env.fund(XRP(10000), a4);
+        env.fund(XRP(11000), m1, m2);
         env.close();
 
-        env.trust(G1["HKD"](2000), A1);
-        env.trust(G2["HKD"](2000), A2);
-        env.trust(G1["HKD"](2000), A3);
-        env.trust(G1["HKD"](100000), M1);
-        env.trust(G2["HKD"](100000), M1);
-        env.trust(G1["HKD"](100000), M2);
-        env.trust(G2["HKD"](100000), M2);
+        env.trust(g1["HKD"](2000), a1);
+        env.trust(g2["HKD"](2000), a2);
+        env.trust(g1["HKD"](2000), a3);
+        env.trust(g1["HKD"](100000), m1);
+        env.trust(g2["HKD"](100000), m1);
+        env.trust(g1["HKD"](100000), m2);
+        env.trust(g2["HKD"](100000), m2);
         env.close();
 
-        env(pay(G1, A1, G1["HKD"](1000)));
-        env(pay(G2, A2, G2["HKD"](1000)));
-        env(pay(G1, A3, G1["HKD"](1000)));
-        env(pay(G1, M1, G1["HKD"](1200)));
-        env(pay(G2, M1, G2["HKD"](5000)));
-        env(pay(G1, M2, G1["HKD"](1200)));
-        env(pay(G2, M2, G2["HKD"](5000)));
+        env(pay(g1, a1, g1["HKD"](1000)));
+        env(pay(g2, a2, g2["HKD"](1000)));
+        env(pay(g1, a3, g1["HKD"](1000)));
+        env(pay(g1, m1, g1["HKD"](1200)));
+        env(pay(g2, m1, g2["HKD"](5000)));
+        env(pay(g1, m2, g1["HKD"](1200)));
+        env(pay(g2, m2, g2["HKD"](5000)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
-            domainID = setupDomain(env, {A1, A2, A3, A4, G1, G2, G3, G4, M1, M2});
-            env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)), domain(*domainID));
-            env(offer(M2, XRP(10000), G2["HKD"](1000)), domain(*domainID));
-            env(offer(M2, G1["HKD"](1000), XRP(10000)), domain(*domainID));
+            domainID = setupDomain(env, {a1, a2, a3, a4, g1, g2, g3, g4, m1, m2});
+            env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)), Domain(*domainID));
+            env(offer(m2, XRP(10000), g2["HKD"](1000)), Domain(*domainID));
+            env(offer(m2, g1["HKD"](1000), XRP(10000)), Domain(*domainID));
         }
         else
         {
-            env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)));
-            env(offer(M2, XRP(10000), G2["HKD"](1000)));
-            env(offer(M2, G1["HKD"](1000), XRP(10000)));
+            env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)));
+            env(offer(m2, XRP(10000), g2["HKD"](1000)));
+            env(offer(m2, g1["HKD"](1000), XRP(10000)));
         }
 
         STPathSet st;
@@ -1291,143 +1291,143 @@ public:
         {
             // A) Borrow or repay --
             //  Source -> Destination (repay source issuer)
-            auto const& send_amt = G1["HKD"](10);
+            auto const& sendAmt = g1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G1, send_amt, std::nullopt, G1["HKD"].currency, domainID);
+                findPaths(env, a1, g1, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
             BEAST_EXPECT(st.empty());
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
         }
 
         {
             // A2) Borrow or repay --
             //  Source -> Destination (repay destination issuer)
-            auto const& send_amt = A1["HKD"](10);
+            auto const& sendAmt = a1["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G1, send_amt, std::nullopt, G1["HKD"].currency, domainID);
+                findPaths(env, a1, g1, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
             BEAST_EXPECT(st.empty());
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
         }
 
         {
             // B) Common gateway --
             //  Source -> AC -> Destination
-            auto const& send_amt = A3["HKD"](10);
+            auto const& sendAmt = a3["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A3, send_amt, std::nullopt, G1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
-            BEAST_EXPECT(same(st, stpath(G1)));
+                findPaths(env, a1, a3, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
+            BEAST_EXPECT(same(st, stpath(g1)));
         }
 
         {
             // C) Gateway to gateway --
             //  Source -> OB -> Destination
-            auto const& send_amt = G2["HKD"](10);
+            auto const& sendAmt = g2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, G1, G2, send_amt, std::nullopt, G1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, G1["HKD"](10)));
+                findPaths(env, g1, g2, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, g1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(IPE(G2["HKD"])),
-                stpath(M1),
-                stpath(M2),
-                stpath(IPE(xrpIssue()), IPE(G2["HKD"]))));
+                stpath(ipe(g2["HKD"])),
+                stpath(m1),
+                stpath(m2),
+                stpath(ipe(xrpIssue()), ipe(g2["HKD"]))));
         }
 
         {
             // D) User to unlinked gateway via order book --
             //  Source -> AC -> OB -> Destination
-            auto const& send_amt = G2["HKD"](10);
+            auto const& sendAmt = g2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, G2, send_amt, std::nullopt, G1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                findPaths(env, a1, g2, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(G1, M1),
-                stpath(G1, M2),
-                stpath(G1, IPE(G2["HKD"])),
-                stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]))));
+                stpath(g1, m1),
+                stpath(g1, m2),
+                stpath(g1, ipe(g2["HKD"])),
+                stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]))));
         }
 
         {
             // I4) XRP bridge" --
             //  Source -> AC -> OB to XRP -> OB from XRP -> AC ->
             //  Destination
-            auto const& send_amt = A2["HKD"](10);
+            auto const& sendAmt = a2["HKD"](10);
             std::tie(st, sa, da) =
-                find_paths(env, A1, A2, send_amt, std::nullopt, G1["HKD"].currency, domainID);
-            BEAST_EXPECT(equal(da, send_amt));
-            BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                findPaths(env, a1, a2, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
+            BEAST_EXPECT(equal(da, sendAmt));
+            BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             BEAST_EXPECT(same(
                 st,
-                stpath(G1, M1, G2),
-                stpath(G1, M2, G2),
-                stpath(G1, IPE(G2["HKD"]), G2),
-                stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]), G2)));
+                stpath(g1, m1, g2),
+                stpath(g1, m2, g2),
+                stpath(g1, ipe(g2["HKD"]), g2),
+                stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]), g2)));
         }
     }
 
     void
-    path_find_06(bool const domainEnabled)
+    pathFind06(bool const domainEnabled)
     {
         testcase(
             std::string("Path Find: non-XRP -> non-XRP, same currency)") +
             (domainEnabled ? " w/ " : " w/o ") + "domain");
         using namespace jtx;
         Env env = pathTestEnv();
-        Account const A1{"A1"};
-        Account const A2{"A2"};
-        Account const A3{"A3"};
-        Account const G1{"G1"};
-        Account const G2{"G2"};
-        Account const M1{"M1"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
+        Account const a3{"A3"};
+        Account const g1{"G1"};
+        Account const g2{"G2"};
+        Account const m1{"M1"};
 
-        env.fund(XRP(11000), M1);
-        env.fund(XRP(1000), A1, A2, A3, G1, G2);
+        env.fund(XRP(11000), m1);
+        env.fund(XRP(1000), a1, a2, a3, g1, g2);
         env.close();
 
-        env.trust(G1["HKD"](2000), A1);
-        env.trust(G2["HKD"](2000), A2);
-        env.trust(A2["HKD"](2000), A3);
-        env.trust(G1["HKD"](100000), M1);
-        env.trust(G2["HKD"](100000), M1);
+        env.trust(g1["HKD"](2000), a1);
+        env.trust(g2["HKD"](2000), a2);
+        env.trust(a2["HKD"](2000), a3);
+        env.trust(g1["HKD"](100000), m1);
+        env.trust(g2["HKD"](100000), m1);
         env.close();
 
-        env(pay(G1, A1, G1["HKD"](1000)));
-        env(pay(G2, A2, G2["HKD"](1000)));
-        env(pay(G1, M1, G1["HKD"](5000)));
-        env(pay(G2, M1, G2["HKD"](5000)));
+        env(pay(g1, a1, g1["HKD"](1000)));
+        env(pay(g2, a2, g2["HKD"](1000)));
+        env(pay(g1, m1, g1["HKD"](5000)));
+        env(pay(g2, m1, g2["HKD"](5000)));
         env.close();
 
         std::optional<uint256> domainID;
         if (domainEnabled)
         {
-            domainID = setupDomain(env, {A1, A2, A3, G1, G2, M1});
-            env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)), domain(*domainID));
+            domainID = setupDomain(env, {a1, a2, a3, g1, g2, m1});
+            env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)), Domain(*domainID));
         }
         else
         {
-            env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)));
+            env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)));
         }
 
         // E) Gateway to user
         //  Source -> OB -> AC -> Destination
-        auto const& send_amt = A2["HKD"](10);
+        auto const& sendAmt = a2["HKD"](10);
         STPathSet st;
         STAmount sa, da;
         std::tie(st, sa, da) =
-            find_paths(env, G1, A2, send_amt, std::nullopt, G1["HKD"].currency, domainID);
-        BEAST_EXPECT(equal(da, send_amt));
-        BEAST_EXPECT(equal(sa, G1["HKD"](10)));
-        BEAST_EXPECT(same(st, stpath(M1, G2), stpath(IPE(G2["HKD"]), G2)));
+            findPaths(env, g1, a2, sendAmt, std::nullopt, g1["HKD"].currency, domainID);
+        BEAST_EXPECT(equal(da, sendAmt));
+        BEAST_EXPECT(equal(sa, g1["HKD"](10)));
+        BEAST_EXPECT(same(st, stpath(m1, g2), stpath(ipe(g2["HKD"]), g2)));
     }
 
     void
-    receive_max(bool const domainEnabled)
+    receiveMax(bool const domainEnabled)
     {
         testcase(std::string("Receive max") + (domainEnabled ? " w/ " : " w/o ") + "domain");
 
@@ -1436,40 +1436,40 @@ public:
         auto const bob = Account("bob");
         auto const charlie = Account("charlie");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         {
             // XRP -> IOU receive max
             Env env = pathTestEnv();
             env.fund(XRP(10000), alice, bob, charlie, gw);
             env.close();
-            env.trust(USD(100), alice, bob, charlie);
+            env.trust(usd(100), alice, bob, charlie);
             env.close();
-            env(pay(gw, charlie, USD(10)));
+            env(pay(gw, charlie, usd(10)));
             env.close();
 
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {alice, bob, charlie, gw});
-                env(offer(charlie, XRP(10), USD(10)), domain(*domainID));
+                env(offer(charlie, XRP(10), usd(10)), Domain(*domainID));
                 env.close();
             }
             else
             {
-                env(offer(charlie, XRP(10), USD(10)));
+                env(offer(charlie, XRP(10), usd(10)));
                 env.close();
             }
 
             auto [st, sa, da] =
-                find_paths(env, alice, bob, USD(-1), XRP(100).value(), std::nullopt, domainID);
+                findPaths(env, alice, bob, usd(-1), XRP(100).value(), std::nullopt, domainID);
             BEAST_EXPECT(sa == XRP(10));
-            BEAST_EXPECT(equal(da, USD(10)));
+            BEAST_EXPECT(equal(da, usd(10)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
                 auto const& pathElem = st[0][0];
                 BEAST_EXPECT(
                     pathElem.isOffer() && pathElem.getIssuerID() == gw.id() &&
-                    pathElem.getCurrency() == USD.currency);
+                    pathElem.getCurrency() == usd.currency);
             }
         }
         {
@@ -1477,27 +1477,27 @@ public:
             Env env = pathTestEnv();
             env.fund(XRP(10000), alice, bob, charlie, gw);
             env.close();
-            env.trust(USD(100), alice, bob, charlie);
+            env.trust(usd(100), alice, bob, charlie);
             env.close();
-            env(pay(gw, alice, USD(10)));
+            env(pay(gw, alice, usd(10)));
             env.close();
 
             std::optional<uint256> domainID;
             if (domainEnabled)
             {
                 domainID = setupDomain(env, {alice, bob, charlie, gw});
-                env(offer(charlie, USD(10), XRP(10)), domain(*domainID));
+                env(offer(charlie, usd(10), XRP(10)), Domain(*domainID));
                 env.close();
             }
             else
             {
-                env(offer(charlie, USD(10), XRP(10)));
+                env(offer(charlie, usd(10), XRP(10)));
                 env.close();
             }
 
             auto [st, sa, da] =
-                find_paths(env, alice, bob, drops(-1), USD(100).value(), std::nullopt, domainID);
-            BEAST_EXPECT(sa == USD(10));
+                findPaths(env, alice, bob, drops(-1), usd(100).value(), std::nullopt, domainID);
+            BEAST_EXPECT(sa == usd(10));
             BEAST_EXPECT(equal(da, XRP(10)));
             if (BEAST_EXPECT(st.size() == 1 && st[0].size() == 1))
             {
@@ -1510,17 +1510,17 @@ public:
     }
 
     void
-    noripple_combinations()
+    norippleCombinations()
     {
         using namespace jtx;
         // This test will create trust lines with various values of the noRipple
-        // flag. alice <-> george <-> bob george will sort of act like a
+        // flag. alice_ <-> george <-> bob_ george will sort of act like a
         // gateway, but use a different name to avoid the usual assumptions
         // about gateways.
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const george = Account("george");
-        auto const USD = george["USD"];
+        auto const usd = george["USD"];
         auto test = [&](std::string casename, bool aliceRipple, bool bobRipple, bool expectPath) {
             testcase(casename);
 
@@ -1529,15 +1529,15 @@ public:
             env.close();
             // Set the same flags at both ends of the trustline, even though
             // only george's matter.
-            env(trust(alice, USD(100), aliceRipple ? tfClearNoRipple : tfSetNoRipple));
+            env(trust(alice, usd(100), aliceRipple ? tfClearNoRipple : tfSetNoRipple));
             env(trust(george, alice["USD"](100), aliceRipple ? tfClearNoRipple : tfSetNoRipple));
-            env(trust(bob, USD(100), bobRipple ? tfClearNoRipple : tfSetNoRipple));
+            env(trust(bob, usd(100), bobRipple ? tfClearNoRipple : tfSetNoRipple));
             env(trust(george, bob["USD"](100), bobRipple ? tfClearNoRipple : tfSetNoRipple));
             env.close();
-            env(pay(george, alice, USD(70)));
+            env(pay(george, alice, usd(70)));
             env.close();
 
-            auto [st, sa, da] = find_paths(env, "alice", "bob", Account("bob")["USD"](5));
+            auto [st, sa, da] = findPaths(env, "alice", "bob", Account("bob")["USD"](5));
             BEAST_EXPECT(equal(da, bob["USD"](5)));
 
             if (expectPath)
@@ -1559,7 +1559,7 @@ public:
     }
 
     void
-    hybrid_offer_path()
+    hybridOfferPath()
     {
         testcase("Hybrid offer path");
         using namespace jtx;
@@ -1569,45 +1569,45 @@ public:
         // lambda param that creates different types of offers
         auto testPathfind = [&](auto func, bool const domainEnabled = false) {
             Env env = pathTestEnv();
-            Account const A1{"A1"};
-            Account const A2{"A2"};
-            Account const A3{"A3"};
-            Account const A4{"A4"};
-            Account const G1{"G1"};
-            Account const G2{"G2"};
-            Account const G3{"G3"};
-            Account const G4{"G4"};
-            Account const M1{"M1"};
-            Account const M2{"M2"};
+            Account const a1{"A1"};
+            Account const a2{"A2"};
+            Account const a3{"A3"};
+            Account const a4{"A4"};
+            Account const g1{"G1"};
+            Account const g2{"G2"};
+            Account const g3{"G3"};
+            Account const g4{"G4"};
+            Account const m1{"M1"};
+            Account const m2{"M2"};
 
-            env.fund(XRP(1000), A1, A2, A3, G1, G2, G3, G4);
-            env.fund(XRP(10000), A4);
-            env.fund(XRP(11000), M1, M2);
+            env.fund(XRP(1000), a1, a2, a3, g1, g2, g3, g4);
+            env.fund(XRP(10000), a4);
+            env.fund(XRP(11000), m1, m2);
             env.close();
 
-            env.trust(G1["HKD"](2000), A1);
-            env.trust(G2["HKD"](2000), A2);
-            env.trust(G1["HKD"](2000), A3);
-            env.trust(G1["HKD"](100000), M1);
-            env.trust(G2["HKD"](100000), M1);
-            env.trust(G1["HKD"](100000), M2);
-            env.trust(G2["HKD"](100000), M2);
+            env.trust(g1["HKD"](2000), a1);
+            env.trust(g2["HKD"](2000), a2);
+            env.trust(g1["HKD"](2000), a3);
+            env.trust(g1["HKD"](100000), m1);
+            env.trust(g2["HKD"](100000), m1);
+            env.trust(g1["HKD"](100000), m2);
+            env.trust(g2["HKD"](100000), m2);
             env.close();
 
-            env(pay(G1, A1, G1["HKD"](1000)));
-            env(pay(G2, A2, G2["HKD"](1000)));
-            env(pay(G1, A3, G1["HKD"](1000)));
-            env(pay(G1, M1, G1["HKD"](1200)));
-            env(pay(G2, M1, G2["HKD"](5000)));
-            env(pay(G1, M2, G1["HKD"](1200)));
-            env(pay(G2, M2, G2["HKD"](5000)));
+            env(pay(g1, a1, g1["HKD"](1000)));
+            env(pay(g2, a2, g2["HKD"](1000)));
+            env(pay(g1, a3, g1["HKD"](1000)));
+            env(pay(g1, m1, g1["HKD"](1200)));
+            env(pay(g2, m1, g2["HKD"](5000)));
+            env(pay(g1, m2, g1["HKD"](1200)));
+            env(pay(g2, m2, g2["HKD"](5000)));
             env.close();
 
             std::optional<uint256> domainID =
-                setupDomain(env, {A1, A2, A3, A4, G1, G2, G3, G4, M1, M2});
+                setupDomain(env, {a1, a2, a3, a4, g1, g2, g3, g4, m1, m2});
             BEAST_EXPECT(domainID);
 
-            func(env, M1, M2, G1, G2, *domainID);
+            func(env, m1, m2, g1, g2, *domainID);
 
             STPathSet st;
             STAmount sa, da;
@@ -1615,119 +1615,119 @@ public:
             {
                 // A) Borrow or repay --
                 //  Source -> Destination (repay source issuer)
-                auto const& send_amt = G1["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = g1["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    A1,
-                    G1,
-                    send_amt,
+                    a1,
+                    g1,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
                 BEAST_EXPECT(st.empty());
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             }
 
             {
                 // A2) Borrow or repay --
                 //  Source -> Destination (repay destination issuer)
-                auto const& send_amt = A1["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = a1["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    A1,
-                    G1,
-                    send_amt,
+                    a1,
+                    g1,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
                 BEAST_EXPECT(st.empty());
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, a1["HKD"](10)));
             }
 
             {
                 // B) Common gateway --
                 //  Source -> AC -> Destination
-                auto const& send_amt = A3["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = a3["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    A1,
-                    A3,
-                    send_amt,
+                    a1,
+                    a3,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, A1["HKD"](10)));
-                BEAST_EXPECT(same(st, stpath(G1)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, a1["HKD"](10)));
+                BEAST_EXPECT(same(st, stpath(g1)));
             }
 
             {
                 // C) Gateway to gateway --
                 //  Source -> OB -> Destination
-                auto const& send_amt = G2["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = g2["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    G1,
-                    G2,
-                    send_amt,
+                    g1,
+                    g2,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, G1["HKD"](10)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, g1["HKD"](10)));
                 BEAST_EXPECT(same(
                     st,
-                    stpath(IPE(G2["HKD"])),
-                    stpath(M1),
-                    stpath(M2),
-                    stpath(IPE(xrpIssue()), IPE(G2["HKD"]))));
+                    stpath(ipe(g2["HKD"])),
+                    stpath(m1),
+                    stpath(m2),
+                    stpath(ipe(xrpIssue()), ipe(g2["HKD"]))));
             }
 
             {
                 // D) User to unlinked gateway via order book --
                 //  Source -> AC -> OB -> Destination
-                auto const& send_amt = G2["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = g2["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    A1,
-                    G2,
-                    send_amt,
+                    a1,
+                    g2,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, a1["HKD"](10)));
                 BEAST_EXPECT(same(
                     st,
-                    stpath(G1, M1),
-                    stpath(G1, M2),
-                    stpath(G1, IPE(G2["HKD"])),
-                    stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]))));
+                    stpath(g1, m1),
+                    stpath(g1, m2),
+                    stpath(g1, ipe(g2["HKD"])),
+                    stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]))));
             }
 
             {
                 // I4) XRP bridge" --
                 //  Source -> AC -> OB to XRP -> OB from XRP -> AC ->
                 //  Destination
-                auto const& send_amt = A2["HKD"](10);
-                std::tie(st, sa, da) = find_paths(
+                auto const& sendAmt = a2["HKD"](10);
+                std::tie(st, sa, da) = findPaths(
                     env,
-                    A1,
-                    A2,
-                    send_amt,
+                    a1,
+                    a2,
+                    sendAmt,
                     std::nullopt,
-                    G1["HKD"].currency,
+                    g1["HKD"].currency,
                     domainEnabled ? domainID : std::nullopt);
-                BEAST_EXPECT(equal(da, send_amt));
-                BEAST_EXPECT(equal(sa, A1["HKD"](10)));
+                BEAST_EXPECT(equal(da, sendAmt));
+                BEAST_EXPECT(equal(sa, a1["HKD"](10)));
                 BEAST_EXPECT(same(
                     st,
-                    stpath(G1, M1, G2),
-                    stpath(G1, M2, G2),
-                    stpath(G1, IPE(G2["HKD"]), G2),
-                    stpath(G1, IPE(xrpIssue()), IPE(G2["HKD"]), G2)));
+                    stpath(g1, m1, g2),
+                    stpath(g1, m2, g2),
+                    stpath(g1, ipe(g2["HKD"]), g2),
+                    stpath(g1, ipe(xrpIssue()), ipe(g2["HKD"]), g2)));
             }
         };
 
@@ -1736,56 +1736,56 @@ public:
         // order book
         {
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)));
                 });
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)));
                 });
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
                 });
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
                 });
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
                 });
         }
 
@@ -1794,103 +1794,103 @@ public:
         // order book
         {
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)), domain(domainID));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)), domain(domainID));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)), Domain(domainID));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)), Domain(domainID));
                 },
                 true);
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)), domain(domainID));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)), Domain(domainID));
                 },
                 true);
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)), domain(domainID));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)), domain(domainID));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)), Domain(domainID));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)), Domain(domainID));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
                 },
                 true);
 
             testPathfind(
-                [](Env& env, Account M1, Account M2, Account G1, Account G2, uint256 domainID) {
-                    env(offer(M1, G1["HKD"](1000), G2["HKD"](1000)), domain(domainID));
-                    env(offer(M2, XRP(10000), G2["HKD"](1000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
-                    env(offer(M2, G1["HKD"](1000), XRP(10000)),
-                        domain(domainID),
-                        txflags(tfHybrid));
+                [](Env& env, Account m1, Account m2, Account g1, Account g2, uint256 domainID) {
+                    env(offer(m1, g1["HKD"](1000), g2["HKD"](1000)), Domain(domainID));
+                    env(offer(m2, XRP(10000), g2["HKD"](1000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
+                    env(offer(m2, g1["HKD"](1000), XRP(10000)),
+                        Domain(domainID),
+                        Txflags(tfHybrid));
                 },
                 true);
         }
     }
 
     void
-    amm_domain_path()
+    ammDomainPath()
     {
         testcase("AMM not used in domain path");
         using namespace jtx;
         Env env = pathTestEnv();
         PermissionedDEX const permDex(env);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] = permDex;
-        AMM const amm(env, alice, XRP(10), USD(50));
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] = permDex;
+        AMM const amm(env, alice_, XRP(10), USD(50));
 
         STPathSet st;
         STAmount sa, da;
 
-        auto const& send_amt = XRP(1);
+        auto const& sendAmt = XRP(1);
 
         // doing pathfind with domain won't include amm
         std::tie(st, sa, da) =
-            find_paths(env, bob, carol, send_amt, std::nullopt, USD.currency, domainID);
+            findPaths(env, bob_, carol_, sendAmt, std::nullopt, USD.currency, domainID);
         BEAST_EXPECT(st.empty());
 
         // a non-domain pathfind returns amm in the path
-        std::tie(st, sa, da) = find_paths(env, bob, carol, send_amt, std::nullopt, USD.currency);
-        BEAST_EXPECT(same(st, stpath(gw, IPE(xrpIssue()))));
+        std::tie(st, sa, da) = findPaths(env, bob_, carol_, sendAmt, std::nullopt, USD.currency);
+        BEAST_EXPECT(same(st, stpath(gw_, ipe(xrpIssue()))));
     }
 
     void
     run() override
     {
-        source_currencies_limit();
-        no_direct_path_no_intermediary_no_alternatives();
-        direct_path_no_intermediary();
-        payment_auto_path_find();
-        indirect_paths_path_find();
-        alternative_paths_consume_best_transfer_first();
-        issues_path_negative_ripple_client_issue_23_smaller();
-        issues_path_negative_ripple_client_issue_23_larger();
-        quality_paths_quality_set_and_test();
-        trust_auto_clear_trust_normal_clear();
-        trust_auto_clear_trust_auto_clear();
-        noripple_combinations();
+        sourceCurrenciesLimit();
+        noDirectPathNoIntermediaryNoAlternatives();
+        directPathNoIntermediary();
+        paymentAutoPathFind();
+        indirectPathsPathFind();
+        alternativePathsConsumeBestTransferFirst();
+        issuesPathNegativeRippleClientIssue23Smaller();
+        issuesPathNegativeRippleClientIssue23Larger();
+        qualityPathsQualitySetAndTest();
+        trustAutoClearTrustNormalClear();
+        trustAutoClearTrustAutoClear();
+        norippleCombinations();
 
         for (bool const domainEnabled : {false, true})
         {
-            path_find(domainEnabled);
-            path_find_consume_all(domainEnabled);
-            alternative_path_consume_both(domainEnabled);
-            alternative_paths_consume_best_transfer(domainEnabled);
-            alternative_paths_limit_returned_paths_to_best_quality(domainEnabled);
-            issues_path_negative_issue(domainEnabled);
-            via_offers_via_gateway(domainEnabled);
-            xrp_to_xrp(domainEnabled);
-            receive_max(domainEnabled);
+            pathFind(domainEnabled);
+            pathFindConsumeAll(domainEnabled);
+            alternativePathConsumeBoth(domainEnabled);
+            alternativePathsConsumeBestTransfer(domainEnabled);
+            alternativePathsLimitReturnedPathsToBestQuality(domainEnabled);
+            issuesPathNegativeIssue(domainEnabled);
+            viaOffersViaGateway(domainEnabled);
+            xrpToXrp(domainEnabled);
+            receiveMax(domainEnabled);
 
             // The following path_find_NN tests are data driven tests
             // that were originally implemented in js/coffee and migrated
@@ -1898,15 +1898,15 @@ public:
             // those legacy tests, which in some cases probably represented
             // customer use cases.
 
-            path_find_01(domainEnabled);
-            path_find_02(domainEnabled);
-            path_find_04(domainEnabled);
-            path_find_05(domainEnabled);
-            path_find_06(domainEnabled);
+            pathFind01(domainEnabled);
+            pathFind02(domainEnabled);
+            pathFind04(domainEnabled);
+            pathFind05(domainEnabled);
+            pathFind06(domainEnabled);
         }
 
-        hybrid_offer_path();
-        amm_domain_path();
+        hybridOfferPath();
+        ammDomainPath();
     }
 };
 
diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp
index f69187c50f..c775dd2b6a 100644
--- a/src/test/app/PayChan_test.cpp
+++ b/src/test/app/PayChan_test.cpp
@@ -19,6 +19,7 @@
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/beast/utility/Zero.h>
 #include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/json/to_string.h>
@@ -54,7 +55,7 @@
 namespace xrpl::test {
 using namespace jtx::paychan;
 
-struct PayChan_test : public beast::unit_test::suite
+struct PayChan_test : public beast::unit_test::Suite
 {
     static std::pair<uint256, std::shared_ptr<SLE const>>
     channelKeyAndSle(ReadView const& view, jtx::Account const& account, jtx::Account const& dst)
@@ -107,7 +108,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto USDA = alice["USD"];
+        auto usda = alice["USD"];
         env.fund(XRP(10000), alice, bob);
         auto const pk = alice.pk();
         auto const settleDelay = 100s;
@@ -130,34 +131,34 @@ struct PayChan_test : public beast::unit_test::suite
 
         {
             // bad amounts (non-xrp, negative amounts)
-            env(create(alice, bob, USDA(1000), settleDelay, pk), ter(temBAD_AMOUNT));
-            env(fund(alice, chan, USDA(1000)), ter(temBAD_AMOUNT));
-            env(create(alice, bob, XRP(-1000), settleDelay, pk), ter(temBAD_AMOUNT));
-            env(fund(alice, chan, XRP(-1000)), ter(temBAD_AMOUNT));
+            env(create(alice, bob, usda(1000), settleDelay, pk), Ter(temBAD_AMOUNT));
+            env(fund(alice, chan, usda(1000)), Ter(temBAD_AMOUNT));
+            env(create(alice, bob, XRP(-1000), settleDelay, pk), Ter(temBAD_AMOUNT));
+            env(fund(alice, chan, XRP(-1000)), Ter(temBAD_AMOUNT));
         }
 
         // invalid account
-        env(create(alice, "noAccount", XRP(1000), settleDelay, pk), ter(tecNO_DST));
+        env(create(alice, "noAccount", XRP(1000), settleDelay, pk), Ter(tecNO_DST));
         // can't create channel to the same account
-        env(create(alice, alice, XRP(1000), settleDelay, pk), ter(temDST_IS_SRC));
+        env(create(alice, alice, XRP(1000), settleDelay, pk), Ter(temDST_IS_SRC));
         // invalid channel
 
         env(fund(alice, channel(alice, "noAccount", env.seq(alice) - 1), XRP(1000)),
-            ter(tecNO_ENTRY));
+            Ter(tecNO_ENTRY));
         // not enough funds
-        env(create(alice, bob, XRP(10000), settleDelay, pk), ter(tecUNFUNDED));
+        env(create(alice, bob, XRP(10000), settleDelay, pk), Ter(tecUNFUNDED));
 
         {
             // No signature claim with bad amounts (negative and non-xrp)
-            auto const iou = USDA(100).value();
+            auto const iou = usda(100).value();
             auto const negXRP = XRP(-100).value();
             auto const posXRP = XRP(100).value();
-            env(claim(alice, chan, iou, iou), ter(temBAD_AMOUNT));
-            env(claim(alice, chan, posXRP, iou), ter(temBAD_AMOUNT));
-            env(claim(alice, chan, iou, posXRP), ter(temBAD_AMOUNT));
-            env(claim(alice, chan, negXRP, negXRP), ter(temBAD_AMOUNT));
-            env(claim(alice, chan, posXRP, negXRP), ter(temBAD_AMOUNT));
-            env(claim(alice, chan, negXRP, posXRP), ter(temBAD_AMOUNT));
+            env(claim(alice, chan, iou, iou), Ter(temBAD_AMOUNT));
+            env(claim(alice, chan, posXRP, iou), Ter(temBAD_AMOUNT));
+            env(claim(alice, chan, iou, posXRP), Ter(temBAD_AMOUNT));
+            env(claim(alice, chan, negXRP, negXRP), Ter(temBAD_AMOUNT));
+            env(claim(alice, chan, posXRP, negXRP), Ter(temBAD_AMOUNT));
+            env(claim(alice, chan, negXRP, posXRP), Ter(temBAD_AMOUNT));
         }
         {
             // No signature claim more than authorized
@@ -165,7 +166,7 @@ struct PayChan_test : public beast::unit_test::suite
             auto const reqBal = chanBal + delta;
             auto const authAmt = reqBal + XRP(-100);
             assert(reqBal <= chanAmt);
-            env(claim(alice, chan, reqBal, authAmt), ter(temBAD_AMOUNT));
+            env(claim(alice, chan, reqBal, authAmt), Ter(temBAD_AMOUNT));
         }
         {
             // No signature needed since the owner is claiming
@@ -198,7 +199,7 @@ struct PayChan_test : public beast::unit_test::suite
             // claim again
             preBob = env.balance(bob);
             env(claim(bob, chan, reqBal, authAmt, Slice(sig), alice.pk()),
-                ter(tecUNFUNDED_PAYMENT));
+                Ter(tecUNFUNDED_PAYMENT));
             BEAST_EXPECT(channelBalance(*env.current(), chan) == chanBal);
             BEAST_EXPECT(channelAmount(*env.current(), chan) == chanAmt);
             BEAST_EXPECT(env.balance(bob) == preBob - feeDrops);
@@ -210,14 +211,14 @@ struct PayChan_test : public beast::unit_test::suite
             STAmount const reqAmt = authAmt + STAmount{1};
             assert(reqAmt <= chanAmt);
             auto const sig = signClaimAuth(alice.pk(), alice.sk(), chan, authAmt);
-            env(claim(bob, chan, reqAmt, authAmt, Slice(sig), alice.pk()), ter(temBAD_AMOUNT));
+            env(claim(bob, chan, reqAmt, authAmt, Slice(sig), alice.pk()), Ter(temBAD_AMOUNT));
             BEAST_EXPECT(channelBalance(*env.current(), chan) == chanBal);
             BEAST_EXPECT(channelAmount(*env.current(), chan) == chanAmt);
             BEAST_EXPECT(env.balance(bob) == preBob);
         }
 
         // Dst tries to fund the channel
-        env(fund(bob, chan, XRP(1000)), ter(tecNO_PERMISSION));
+        env(fund(bob, chan, XRP(1000)), Ter(tecNO_PERMISSION));
         BEAST_EXPECT(channelBalance(*env.current(), chan) == chanBal);
         BEAST_EXPECT(channelAmount(*env.current(), chan) == chanAmt);
 
@@ -225,7 +226,7 @@ struct PayChan_test : public beast::unit_test::suite
             // Wrong signing key
             auto const sig = signClaimAuth(bob.pk(), bob.sk(), chan, XRP(1500));
             env(claim(bob, chan, XRP(1500).value(), XRP(1500).value(), Slice(sig), bob.pk()),
-                ter(temBAD_SIGNER));
+                Ter(temBAD_SIGNER));
             BEAST_EXPECT(channelBalance(*env.current(), chan) == chanBal);
             BEAST_EXPECT(channelAmount(*env.current(), chan) == chanAmt);
         }
@@ -233,7 +234,7 @@ struct PayChan_test : public beast::unit_test::suite
             // Bad signature
             auto const sig = signClaimAuth(bob.pk(), bob.sk(), chan, XRP(1500));
             env(claim(bob, chan, XRP(1500).value(), XRP(1500).value(), Slice(sig), alice.pk()),
-                ter(temBAD_SIGNATURE));
+                Ter(temBAD_SIGNATURE));
             BEAST_EXPECT(channelBalance(*env.current(), chan) == chanBal);
             BEAST_EXPECT(channelAmount(*env.current(), chan) == chanAmt);
         }
@@ -241,11 +242,11 @@ struct PayChan_test : public beast::unit_test::suite
             // Dst closes channel
             auto const preAlice = env.balance(alice);
             auto const preBob = env.balance(bob);
-            env(claim(bob, chan), txflags(tfClose));
+            env(claim(bob, chan), Txflags(tfClose));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             auto const feeDrops = env.current()->fees().base;
             auto const delta = chanAmt - chanBal;
-            assert(delta > beast::zero);
+            assert(delta > beast::kZERO);
             BEAST_EXPECT(env.balance(alice) == preAlice + delta);
             BEAST_EXPECT(env.balance(bob) == preBob - feeDrops);
         }
@@ -273,7 +274,7 @@ struct PayChan_test : public beast::unit_test::suite
         // channel creation from alice to bob is disallowed
         {
             auto const chan = channel(alice, bob, env.seq(alice));
-            env(create(alice, bob, XRP(1000), settleDelay, pk), ter(tecNO_PERMISSION));
+            env(create(alice, bob, XRP(1000), settleDelay, pk), Ter(tecNO_PERMISSION));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
         }
 
@@ -284,7 +285,7 @@ struct PayChan_test : public beast::unit_test::suite
         // channel creation from bob to alice is now disallowed
         {
             auto const chan = channel(bob, alice, env.seq(bob));
-            env(create(bob, alice, XRP(1000), settleDelay, pk), ter(tecNO_PERMISSION));
+            env(create(bob, alice, XRP(1000), settleDelay, pk), Ter(tecNO_PERMISSION));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
         }
 
@@ -295,14 +296,14 @@ struct PayChan_test : public beast::unit_test::suite
         // now the channel between alice and bob can exist
         {
             auto const chan = channel(alice, bob, env.seq(alice));
-            env(create(alice, bob, XRP(1000), settleDelay, pk), ter(tesSUCCESS));
+            env(create(alice, bob, XRP(1000), settleDelay, pk), Ter(tesSUCCESS));
             BEAST_EXPECT(channelExists(*env.current(), chan));
         }
 
         // a channel from cho to alice isn't allowed
         {
             auto const chan = channel(cho, alice, env.seq(cho));
-            env(create(cho, alice, XRP(1000), settleDelay, pk), ter(tecNO_PERMISSION));
+            env(create(cho, alice, XRP(1000), settleDelay, pk), Ter(tecNO_PERMISSION));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
         }
 
@@ -313,7 +314,7 @@ struct PayChan_test : public beast::unit_test::suite
         // now a channel from cho to alice is allowed
         {
             auto const chan = channel(cho, alice, env.seq(cho));
-            env(create(cho, alice, XRP(1000), settleDelay, pk), ter(tesSUCCESS));
+            env(create(cho, alice, XRP(1000), settleDelay, pk), Ter(tesSUCCESS));
             BEAST_EXPECT(channelExists(*env.current(), chan));
         }
     }
@@ -371,12 +372,12 @@ struct PayChan_test : public beast::unit_test::suite
             env(create(alice, bob, channelFunds, settleDelay, pk, cancelAfter));
             BEAST_EXPECT(channelExists(*env.current(), chan));
             // third party close before cancelAfter
-            env(claim(carol, chan), txflags(tfClose), ter(tecNO_PERMISSION));
+            env(claim(carol, chan), Txflags(tfClose), Ter(tecNO_PERMISSION));
             BEAST_EXPECT(channelExists(*env.current(), chan));
             env.close(cancelAfter);
             // third party close after cancelAfter
             auto const preAlice = env.balance(alice);
-            env(claim(carol, chan), txflags(tfClose));
+            env(claim(carol, chan), Txflags(tfClose));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             BEAST_EXPECT(env.balance(alice) == preAlice + channelFunds);
         }
@@ -395,7 +396,7 @@ struct PayChan_test : public beast::unit_test::suite
                 auto const channelFunds = XRP(1000);
                 NetClock::time_point const cancelAfter =
                     env.current()->header().parentCloseTime - 1s;
-                auto const txResult = withFixPayChan ? ter(tecEXPIRED) : ter(tesSUCCESS);
+                auto const txResult = withFixPayChan ? Ter(tecEXPIRED) : Ter(tesSUCCESS);
                 env(create(alice, bob, channelFunds, settleDelay, pk, cancelAfter), txResult);
             }
         }
@@ -414,7 +415,7 @@ struct PayChan_test : public beast::unit_test::suite
                 auto const channelFunds = XRP(1000);
                 NetClock::time_point const cancelAfter = env.current()->header().parentCloseTime;
                 env(create(alice, bob, channelFunds, settleDelay, pk, cancelAfter),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
             }
         }
     }
@@ -441,7 +442,7 @@ struct PayChan_test : public beast::unit_test::suite
         BEAST_EXPECT(channelExists(*env.current(), chan));
         BEAST_EXPECT(!channelExpiration(*env.current(), chan));
         // Owner closes, will close after settleDelay
-        env(claim(alice, chan), txflags(tfClose));
+        env(claim(alice, chan), Txflags(tfClose));
         auto counts = [](auto const& t) { return t.time_since_epoch().count(); };
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         BEAST_EXPECT(*channelExpiration(*env.current(), chan) == counts(minExpiration));
@@ -455,17 +456,17 @@ struct PayChan_test : public beast::unit_test::suite
         BEAST_EXPECT(*channelExpiration(*env.current(), chan) == counts(minExpiration) + 50);
         // decrease the expiration below minExpiration
         env(fund(alice, chan, XRP(1), NetClock::time_point{minExpiration - 50s}),
-            ter(temBAD_EXPIRATION));
+            Ter(temBAD_EXPIRATION));
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         BEAST_EXPECT(*channelExpiration(*env.current(), chan) == counts(minExpiration) + 50);
-        env(claim(bob, chan), txflags(tfRenew), ter(tecNO_PERMISSION));
+        env(claim(bob, chan), Txflags(tfRenew), Ter(tecNO_PERMISSION));
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         BEAST_EXPECT(*channelExpiration(*env.current(), chan) == counts(minExpiration) + 50);
-        env(claim(alice, chan), txflags(tfRenew));
+        env(claim(alice, chan), Txflags(tfRenew));
         BEAST_EXPECT(!channelExpiration(*env.current(), chan));
         // decrease the expiration below minExpiration
         env(fund(alice, chan, XRP(1), NetClock::time_point{minExpiration - 50s}),
-            ter(temBAD_EXPIRATION));
+            Ter(temBAD_EXPIRATION));
         BEAST_EXPECT(!channelExpiration(*env.current(), chan));
         env(fund(alice, chan, XRP(1), NetClock::time_point{minExpiration}));
         env.close(minExpiration);
@@ -493,7 +494,7 @@ struct PayChan_test : public beast::unit_test::suite
         env(create(alice, bob, channelFunds, settleDelay, pk));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         // Owner closes, will close after settleDelay
-        env(claim(alice, chan), txflags(tfClose));
+        env(claim(alice, chan), Txflags(tfClose));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         env.close(settleTimepoint - settleDelay / 2);
         {
@@ -549,7 +550,7 @@ struct PayChan_test : public beast::unit_test::suite
         env(create(alice, bob, channelFunds, settleDelay, pk));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         // Owner tries to close channel, but it will remain open (settle delay)
-        env(claim(alice, chan), txflags(tfClose));
+        env(claim(alice, chan), Txflags(tfClose));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         {
             // claim the entire amount
@@ -560,7 +561,7 @@ struct PayChan_test : public beast::unit_test::suite
         }
         auto const preAlice = env.balance(alice);
         // Channel is now dry, can close before expiration date
-        env(claim(alice, chan), txflags(tfClose));
+        env(claim(alice, chan), Txflags(tfClose));
         BEAST_EXPECT(!channelExists(*env.current(), chan));
         auto const feeDrops = env.current()->fees().base;
         BEAST_EXPECT(env.balance(alice) == preAlice - feeDrops);
@@ -584,7 +585,7 @@ struct PayChan_test : public beast::unit_test::suite
         env(create(alice, bob, channelFunds, settleDelay, pk));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         // Owner tries to close channel, but it will remain open (settle delay)
-        env(claim(alice, chan), txflags(tfClose));
+        env(claim(alice, chan), Txflags(tfClose));
         BEAST_EXPECT(channelExists(*env.current(), chan));
         {
             auto chanBal = channelBalance(*env.current(), chan);
@@ -674,7 +675,7 @@ struct PayChan_test : public beast::unit_test::suite
         auto const channelFunds = XRP(1000);
         {
             auto const chan = channel(alice, bob, env.seq(alice));
-            env(create(alice, bob, channelFunds, settleDelay, pk), ter(tecDST_TAG_NEEDED));
+            env(create(alice, bob, channelFunds, settleDelay, pk), Ter(tecDST_TAG_NEEDED));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
         }
         {
@@ -694,7 +695,7 @@ struct PayChan_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const carol = Account("carol");
-        auto USDA = alice["USD"];
+        auto usda = alice["USD"];
         {
             Env env{*this, features};
             env.fund(XRP(10000), alice, bob, carol);
@@ -717,7 +718,7 @@ struct PayChan_test : public beast::unit_test::suite
             env.close();
 
             // alice claims. Fails because bob's lsfDepositAuth flag is set.
-            env(claim(alice, chan, XRP(500).value(), XRP(500).value()), ter(tecNO_PERMISSION));
+            env(claim(alice, chan, XRP(500).value(), XRP(500).value()), Ter(tecNO_PERMISSION));
             env.close();
 
             // Claim with signature
@@ -729,13 +730,13 @@ struct PayChan_test : public beast::unit_test::suite
 
                 // alice claims with signature.  Fails since bob has
                 // lsfDepositAuth flag set.
-                env(claim(alice, chan, delta, delta, Slice(sig), pk), ter(tecNO_PERMISSION));
+                env(claim(alice, chan, delta, delta, Slice(sig), pk), Ter(tecNO_PERMISSION));
                 env.close();
                 BEAST_EXPECT(env.balance(bob) == preBob);
 
                 // bob claims but omits the signature.  Fails because only
                 // alice can claim without a signature.
-                env(claim(bob, chan, delta, delta), ter(temBAD_SIGNATURE));
+                env(claim(bob, chan, delta, delta), Ter(temBAD_SIGNATURE));
                 env.close();
 
                 // bob claims with signature.  Succeeds even though bob's
@@ -752,7 +753,7 @@ struct PayChan_test : public beast::unit_test::suite
 
                 // carol claims and fails.  Only channel participants (bob or
                 // alice) may claim.
-                env(claim(carol, chan, delta, delta, Slice(sig), pk), ter(tecNO_PERMISSION));
+                env(claim(carol, chan, delta, delta, Slice(sig), pk), Ter(tecNO_PERMISSION));
                 env.close();
 
                 // bob preauthorizes carol for deposit.  But after that carol
@@ -760,11 +761,11 @@ struct PayChan_test : public beast::unit_test::suite
                 env(deposit::auth(bob, carol));
                 env.close();
 
-                env(claim(carol, chan, delta, delta, Slice(sig), pk), ter(tecNO_PERMISSION));
+                env(claim(carol, chan, delta, delta, Slice(sig), pk), Ter(tecNO_PERMISSION));
 
                 // Since alice is not preauthorized she also may not claim
                 // for bob.
-                env(claim(alice, chan, delta, delta, Slice(sig), pk), ter(tecNO_PERMISSION));
+                env(claim(alice, chan, delta, delta, Slice(sig), pk), Ter(tecNO_PERMISSION));
                 env.close();
 
                 // However if bob preauthorizes alice for deposit then she can
@@ -786,7 +787,7 @@ struct PayChan_test : public beast::unit_test::suite
                 env.close();
 
                 // alice claims and fails since she is no longer preauthorized.
-                env(claim(alice, chan, delta, delta), ter(tecNO_PERMISSION));
+                env(claim(alice, chan, delta, delta), Ter(tecNO_PERMISSION));
                 env.close();
 
                 // bob clears lsfDepositAuth.  Now alice can claim.
@@ -854,8 +855,8 @@ struct PayChan_test : public beast::unit_test::suite
 
             // Fail, credentials not accepted
             env(claim(alice, chan, delta, delta),
-                credentials::ids({credIdx}),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Ter(tecBAD_CREDENTIALS));
             env.close();
 
             env(credentials::accept(alice, carol, credType));
@@ -863,8 +864,8 @@ struct PayChan_test : public beast::unit_test::suite
 
             // Fail, no depositPreauth object
             env(claim(alice, chan, delta, delta),
-                credentials::ids({credIdx}),
-                ter(tecNO_PERMISSION));
+                credentials::Ids({credIdx}),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             // Setup deposit authorization
@@ -873,19 +874,19 @@ struct PayChan_test : public beast::unit_test::suite
 
             // Fail, credentials doesn’t belong to root account
             env(claim(dillon, chan, delta, delta),
-                credentials::ids({credIdx}),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credIdx}),
+                Ter(tecBAD_CREDENTIALS));
 
             // Fails because bob's lsfDepositAuth flag is set.
-            env(claim(alice, chan, delta, delta), ter(tecNO_PERMISSION));
+            env(claim(alice, chan, delta, delta), Ter(tecNO_PERMISSION));
 
             // Fail, bad credentials index.
             env(claim(alice, chan, delta, delta),
-                credentials::ids({credBadIdx}),
-                ter(tecBAD_CREDENTIALS));
+                credentials::Ids({credBadIdx}),
+                Ter(tecBAD_CREDENTIALS));
 
             // Fail, empty credentials
-            env(claim(alice, chan, delta, delta), credentials::ids({}), ter(temMALFORMED));
+            env(claim(alice, chan, delta, delta), credentials::Ids({}), Ter(temMALFORMED));
 
             {
                 // claim fails cause of expired credentials
@@ -894,7 +895,7 @@ struct PayChan_test : public beast::unit_test::suite
                 for (int i = 0; i < 10; ++i)
                     env.close();
 
-                env(claim(alice, chan, delta, delta), credentials::ids({credIdx}), ter(tecEXPIRED));
+                env(claim(alice, chan, delta, delta), credentials::Ids({credIdx}), Ter(tecEXPIRED));
                 env.close();
             }
 
@@ -908,7 +909,7 @@ struct PayChan_test : public beast::unit_test::suite
                 std::string const credIdx = jv[jss::result][jss::index].asString();
 
                 // Success
-                env(claim(alice, chan, delta, delta), credentials::ids({credIdx}));
+                env(claim(alice, chan, delta, delta), credentials::Ids({credIdx}));
             }
         }
 
@@ -939,13 +940,13 @@ struct PayChan_test : public beast::unit_test::suite
             std::string const credIdx = jv[jss::result][jss::index].asString();
 
             // Succeed, lsfDepositAuth is not set
-            env(claim(alice, chan, delta, delta), credentials::ids({credIdx}));
+            env(claim(alice, chan, delta, delta), credentials::Ids({credIdx}));
             env.close();
         }
 
         {
             // Credentials amendment not enabled
-            Env env(*this, testable_amendments() - featureCredentials);
+            Env env(*this, testableAmendments() - featureCredentials);
             env.fund(XRP(5000), "alice", "bob");
             env.close();
 
@@ -968,8 +969,8 @@ struct PayChan_test : public beast::unit_test::suite
             env.close();
 
             env(claim(alice, chan, XRP(500).value(), XRP(500).value()),
-                credentials::ids({credIdx}),
-                ter(temDISABLED));
+                credentials::Ids({credIdx}),
+                Ter(temDISABLED));
         }
     }
 
@@ -1006,7 +1007,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const charlie = Account("charlie", KeyType::ed25519);
+        auto const charlie = Account("charlie", KeyType::Ed25519);
         env.fund(XRP(10000), alice, bob, charlie);
         auto const pk = alice.pk();
         auto const settleDelay = 3600s;
@@ -1017,7 +1018,7 @@ struct PayChan_test : public beast::unit_test::suite
         {
             // test account non-string
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto const jrr =
                     env.rpc("json", "account_channels", to_string(params))[jss::result];
@@ -1028,14 +1029,14 @@ struct PayChan_test : public beast::unit_test::suite
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
         {
             // test destination_account non-string
             auto testInvalidDestAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = alice.human();
                 params[jss::destination_account] = param;
                 auto const jrr =
@@ -1047,9 +1048,9 @@ struct PayChan_test : public beast::unit_test::suite
             testInvalidDestAccountParam(1);
             testInvalidDestAccountParam(1.1);
             testInvalidDestAccountParam(true);
-            testInvalidDestAccountParam(Json::Value(Json::nullValue));
-            testInvalidDestAccountParam(Json::Value(Json::objectValue));
-            testInvalidDestAccountParam(Json::Value(Json::arrayValue));
+            testInvalidDestAccountParam(json::Value(json::NullValue));
+            testInvalidDestAccountParam(json::Value(json::ObjectValue));
+            testInvalidDestAccountParam(json::Value(json::ArrayValue));
         }
         {
             auto const r = env.rpc("account_channels", alice.human(), bob.human());
@@ -1126,9 +1127,9 @@ struct PayChan_test : public beast::unit_test::suite
         auto testLimit = [](test::jtx::Env& env,
                             test::jtx::Account const& src,
                             std::optional<int> limit = std::nullopt,
-                            Json::Value const& marker = Json::nullValue,
+                            json::Value const& marker = json::NullValue,
                             std::optional<test::jtx::Account> const& dst = std::nullopt) {
-            Json::Value jvc;
+            json::Value jvc;
             jvc[jss::account] = src.human();
             if (dst)
                 jvc[jss::destination_account] = dst->human();
@@ -1160,7 +1161,7 @@ struct PayChan_test : public beast::unit_test::suite
             auto const numFull = bobs.size() / limit;
             auto const numNonFull = ((bobs.size() % limit) != 0u) ? 1 : 0;
 
-            Json::Value marker = Json::nullValue;
+            json::Value marker = json::NullValue;
 
             auto const testIt = [&](bool expectMarker, int expectedBatchSize) {
                 auto const r = testLimit(env, alice, limit, marker);
@@ -1222,7 +1223,7 @@ struct PayChan_test : public beast::unit_test::suite
         env(create(bob, alice, channelFunds, settleDelay, bob.pk()));
 
         auto const r = [&] {
-            Json::Value jvc;
+            json::Value jvc;
             jvc[jss::account] = alice.human();
 
             return env.rpc("json", "account_channels", to_string(jvc))[jss::result];
@@ -1241,7 +1242,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const charlie = Account("charlie", KeyType::ed25519);
+        auto const charlie = Account("charlie", KeyType::Ed25519);
         env.fund(XRP(10000), alice, bob, charlie);
         auto const pk = alice.pk();
         auto const settleDelay = 3600s;
@@ -1250,7 +1251,7 @@ struct PayChan_test : public beast::unit_test::suite
         env(create(alice, bob, channelFunds, settleDelay, pk));
         env.close();
 
-        Json::Value args{Json::objectValue};
+        json::Value args{json::ObjectValue};
         args[jss::channel_id] = chan1Str;
         args[jss::key_type] = "ed255191";
         args[jss::seed] = "snHq1rzQoN2qiUkC3XF5RyxBzUtN";
@@ -1276,7 +1277,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto const charlie = Account("charlie", KeyType::ed25519);
+        auto const charlie = Account("charlie", KeyType::Ed25519);
         env.fund(XRP(10000), alice, bob, charlie);
         auto const pk = alice.pk();
         auto const settleDelay = 3600s;
@@ -1481,7 +1482,7 @@ struct PayChan_test : public beast::unit_test::suite
             BEAST_EXPECT(rs[jss::error] == "channelAmtMalformed");
             {
                 // Missing channel_id
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = "2000";
                 args[jss::key_type] = "secp256k1";
                 args[jss::passphrase] = "passphrase_can_be_anything";
@@ -1490,7 +1491,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // Missing amount
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::channel_id] = chan1Str;
                 args[jss::key_type] = "secp256k1";
                 args[jss::passphrase] = "passphrase_can_be_anything";
@@ -1499,7 +1500,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // Missing key_type and no secret.
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = "2000";
                 args[jss::channel_id] = chan1Str;
                 args[jss::passphrase] = "passphrase_can_be_anything";
@@ -1508,7 +1509,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // Both passphrase and seed specified.
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = "2000";
                 args[jss::channel_id] = chan1Str;
                 args[jss::key_type] = "secp256k1";
@@ -1519,7 +1520,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // channel_id is not exact hex.
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = "2000";
                 args[jss::channel_id] = chan1Str + "1";
                 args[jss::key_type] = "secp256k1";
@@ -1529,7 +1530,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // amount is not a string
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = 2000;
                 args[jss::channel_id] = chan1Str;
                 args[jss::key_type] = "secp256k1";
@@ -1539,7 +1540,7 @@ struct PayChan_test : public beast::unit_test::suite
             }
             {
                 // Amount is not a decimal string.
-                Json::Value args{Json::objectValue};
+                json::Value args{json::ObjectValue};
                 args[jss::amount] = "TwoThousand";
                 args[jss::channel_id] = chan1Str;
                 args[jss::key_type] = "secp256k1";
@@ -1596,7 +1597,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto USDA = alice["USD"];
+        auto usda = alice["USD"];
         env.fund(XRP(10000), alice, bob);
         auto const pk = alice.pk();
         auto const settleDelay = 100s;
@@ -1605,14 +1606,14 @@ struct PayChan_test : public beast::unit_test::suite
         auto jv = create(alice, bob, XRP(1000), settleDelay, pk);
         auto const pkHex = strHex(pk.slice());
         jv["PublicKey"] = pkHex.substr(2, pkHex.size() - 2);
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
         jv["PublicKey"] = pkHex.substr(0, pkHex.size() - 2);
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
         auto badPrefix = pkHex;
         badPrefix[0] = 'f';
         badPrefix[1] = 'f';
         jv["PublicKey"] = badPrefix;
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
 
         jv["PublicKey"] = pkHex;
         env(jv);
@@ -1621,18 +1622,18 @@ struct PayChan_test : public beast::unit_test::suite
         auto const sig = signClaimAuth(alice.pk(), alice.sk(), chan, authAmt);
         jv = claim(bob, chan, authAmt.value(), authAmt.value(), Slice(sig), alice.pk());
         jv["PublicKey"] = pkHex.substr(2, pkHex.size() - 2);
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
         jv["PublicKey"] = pkHex.substr(0, pkHex.size() - 2);
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
         badPrefix = pkHex;
         badPrefix[0] = 'f';
         badPrefix[1] = 'f';
         jv["PublicKey"] = badPrefix;
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
 
         // missing public key
         jv.removeMember("PublicKey");
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
 
         {
             auto const txn = R"*(
@@ -1689,7 +1690,7 @@ struct PayChan_test : public beast::unit_test::suite
             BEAST_EXPECT(inOwnerDir(*env.current(), bob, chanSle));
             BEAST_EXPECT(ownerDirCount(*env.current(), bob) == 1);
             // close the channel
-            env(claim(bob, chan), txflags(tfClose));
+            env(claim(bob, chan), Txflags(tfClose));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             BEAST_EXPECT(!inOwnerDir(*env.current(), alice, chanSle));
             BEAST_EXPECT(ownerDirCount(*env.current(), alice) == 0);
@@ -1711,7 +1712,7 @@ struct PayChan_test : public beast::unit_test::suite
             BEAST_EXPECT(inOwnerDir(*env.current(), bob, chanSle));
             BEAST_EXPECT(ownerDirCount(*env.current(), bob) == 1);
 
-            env(claim(bob, chan), txflags(tfClose));
+            env(claim(bob, chan), Txflags(tfClose));
             BEAST_EXPECT(!channelExists(*env.current(), chan));
             BEAST_EXPECT(!inOwnerDir(*env.current(), alice, chanSle));
             BEAST_EXPECT(ownerDirCount(*env.current(), alice) == 0);
@@ -1737,8 +1738,8 @@ struct PayChan_test : public beast::unit_test::suite
                 }
 
                 env(acctdelete(toRm, dst),
-                    fee(drops(env.current()->fees().increment)),
-                    ter(expectedTer));
+                    Fee(drops(env.current()->fees().increment)),
+                    Ter(expectedTer));
                 env.close();
                 this->BEAST_EXPECT(
                     isTesSuccess(expectedTer) == !env.closed()->exists(keylet::account(toRm.id())));
@@ -1793,14 +1794,14 @@ struct PayChan_test : public beast::unit_test::suite
 
             {
                 // Owner closes, will close after settleDelay
-                env(claim(alice, chan), txflags(tfClose));
+                env(claim(alice, chan), Txflags(tfClose));
                 env.close();
                 // settle delay hasn't elapsed. Channels should exist.
                 BEAST_EXPECT(channelExists(*env.current(), chan));
                 auto const closeTime = env.current()->header().parentCloseTime;
                 auto const minExpiration = closeTime + settleDelay;
                 env.close(minExpiration);
-                env(claim(alice, chan), txflags(tfClose));
+                env(claim(alice, chan), Txflags(tfClose));
                 BEAST_EXPECT(!channelExists(*env.current(), chan));
             }
         }
@@ -1815,7 +1816,7 @@ struct PayChan_test : public beast::unit_test::suite
         Env env{*this, features};
         auto const alice = Account("alice");
         auto const bob = Account("bob");
-        auto USDA = alice["USD"];
+        auto usda = alice["USD"];
         env.fund(XRP(10000), alice, bob);
 
         // alice and bob grab enough tickets for all of the following
@@ -1833,7 +1834,7 @@ struct PayChan_test : public beast::unit_test::suite
         auto const settleDelay = 100s;
         auto const chan = channel(alice, bob, aliceTicketSeq);
 
-        env(create(alice, bob, XRP(1000), settleDelay, pk), ticket::use(aliceTicketSeq++));
+        env(create(alice, bob, XRP(1000), settleDelay, pk), ticket::Use(aliceTicketSeq++));
 
         env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1843,7 +1844,7 @@ struct PayChan_test : public beast::unit_test::suite
 
         {
             auto const preAlice = env.balance(alice);
-            env(fund(alice, chan, XRP(1000)), ticket::use(aliceTicketSeq++));
+            env(fund(alice, chan, XRP(1000)), ticket::Use(aliceTicketSeq++));
 
             env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1864,7 +1865,7 @@ struct PayChan_test : public beast::unit_test::suite
             auto const reqBal = chanBal + delta;
             auto const authAmt = reqBal + XRP(100);
             assert(reqBal <= chanAmt);
-            env(claim(alice, chan, reqBal, authAmt), ticket::use(aliceTicketSeq++));
+            env(claim(alice, chan, reqBal, authAmt), ticket::Use(aliceTicketSeq++));
 
             env.require(tickets(alice, env.seq(alice) - aliceTicketSeq));
             BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1883,7 +1884,7 @@ struct PayChan_test : public beast::unit_test::suite
             assert(reqBal <= chanAmt);
             auto const sig = signClaimAuth(alice.pk(), alice.sk(), chan, authAmt);
             env(claim(bob, chan, reqBal, authAmt, Slice(sig), alice.pk()),
-                ticket::use(bobTicketSeq++));
+                ticket::Use(bobTicketSeq++));
 
             env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
             BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1898,8 +1899,8 @@ struct PayChan_test : public beast::unit_test::suite
             preBob = env.balance(bob);
             // A transaction that generates a tec still consumes its ticket.
             env(claim(bob, chan, reqBal, authAmt, Slice(sig), alice.pk()),
-                ticket::use(bobTicketSeq++),
-                ter(tecUNFUNDED_PAYMENT));
+                ticket::Use(bobTicketSeq++),
+                Ter(tecUNFUNDED_PAYMENT));
 
             env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
             BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1915,11 +1916,11 @@ 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 increment 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),
-                ter(temBAD_AMOUNT));
+                ticket::Use(bobTicketSeq),
+                Ter(temBAD_AMOUNT));
 
             env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
             BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1930,7 +1931,7 @@ struct PayChan_test : public beast::unit_test::suite
         }
 
         // Dst tries to fund the channel
-        env(fund(bob, chan, XRP(1000)), ticket::use(bobTicketSeq++), ter(tecNO_PERMISSION));
+        env(fund(bob, chan, XRP(1000)), ticket::Use(bobTicketSeq++), Ter(tecNO_PERMISSION));
 
         env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
         BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1942,7 +1943,7 @@ struct PayChan_test : public beast::unit_test::suite
             // Dst closes channel
             auto const preAlice = env.balance(alice);
             auto const preBob = env.balance(bob);
-            env(claim(bob, chan), txflags(tfClose), ticket::use(bobTicketSeq++));
+            env(claim(bob, chan), Txflags(tfClose), ticket::Use(bobTicketSeq++));
 
             env.require(tickets(bob, env.seq(bob) - bobTicketSeq));
             BEAST_EXPECT(env.seq(bob) == bobSeq);
@@ -1950,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::zero);
+            assert(delta > beast::kZERO);
             BEAST_EXPECT(env.balance(alice) == preAlice + delta);
             BEAST_EXPECT(env.balance(bob) == preBob - feeDrops);
         }
@@ -1991,7 +1992,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testWithFeats(all);
         testDepositAuthCreds();
         testMetaAndOwnership(all - fixIncludeKeyletFields);
diff --git a/src/test/app/PayStrandMPT_test.cpp b/src/test/app/PayStrandMPT_test.cpp
index 44f25d54dc..5550a26ab2 100644
--- a/src/test/app/PayStrandMPT_test.cpp
+++ b/src/test/app/PayStrandMPT_test.cpp
@@ -34,7 +34,7 @@
 
 namespace xrpl::test {
 
-struct PayStrandMPT_test : public beast::unit_test::suite
+struct PayStrandMPT_test : public beast::unit_test::Suite
 {
     static jtx::DirectStepInfo
     makeEndpointStep(jtx::Account const& src, jtx::Account const& dst, jtx::IOU const& iou)
@@ -81,7 +81,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                 sendMaxIssue,
                 path,
                 true,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getLogs().journal("Flow"));
@@ -94,7 +94,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
             auto testMultiToken = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this, features);
                 env.fund(XRP(10'000), alice, bob, gw);
-                MPT const USD =
+                MPT const usd =
                     MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 1'000});
                 auto const bobUSD = issue1(
                     {.env = env,
@@ -102,7 +102,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                      .issuer = bob,
                      .holders = {alice},
                      .limit = 1'000});
-                MPT const EUR =
+                MPT const eur =
                     MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 1'000});
                 auto const bobEUR = issue2(
                     {.env = env,
@@ -110,7 +110,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                      .issuer = bob,
                      .holders = {alice},
                      .limit = 1'000});
-                env(pay(gw, alice, EUR(100)));
+                env(pay(gw, alice, eur(100)));
 
                 {
                     // Original test is
@@ -130,10 +130,10 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                         alice,
                         /*deliver*/ xrpIssue(),
                         /*limitQuality*/ std::nullopt,
-                        /*sendMaxIssue*/ EUR,
+                        /*sendMaxIssue*/ eur,
                         path,
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         ammContext,
                         std::nullopt,
                         env.app().getLogs().journal("Flow"));
@@ -141,17 +141,17 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                     BEAST_EXPECT(ter == tesSUCCESS);
                 }
                 {
-                    STPath const path = STPath({ipe(USD), cpe(xrpCurrency())});
+                    STPath const path = STPath({ipe(usd), cpe(xrpCurrency())});
                     auto [ter, _] = toStrand(
                         *env.current(),
                         alice,
                         alice,
                         /*deliver*/ xrpIssue(),
                         /*limitQuality*/ std::nullopt,
-                        /*sendMaxIssue*/ EUR,
+                        /*sendMaxIssue*/ eur,
                         path,
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         ammContext,
                         std::nullopt,
                         env.app().getLogs().journal("Flow"));
@@ -165,10 +165,10 @@ struct PayStrandMPT_test : public beast::unit_test::suite
             auto testMultiToken = [&](auto&& issue1, auto&& issue2) {
                 Env env(*this, features);
                 env.fund(XRP(10'000), alice, bob, carol, gw);
-                auto USD = issue1({.env = env, .token = "USD", .issuer = gw, .limit = 1'000});
-                using tUSD = std::decay_t<decltype(USD)>;
-                auto EUR = issue2({.env = env, .token = "EUR", .issuer = gw, .limit = 1'000});
-                using tEUR = std::decay_t<decltype(EUR)>;
+                auto usd = issue1({.env = env, .token = "USD", .issuer = gw, .limit = 1'000});
+                using tUSD = std::decay_t<decltype(usd)>;
+                auto eur = issue2({.env = env, .token = "EUR", .issuer = gw, .limit = 1'000});
+                using tEUR = std::decay_t<decltype(eur)>;
 
                 auto const err = [&]() {
                     if constexpr (std::is_same_v<tUSD, MPT>)
@@ -180,102 +180,102 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                         return terNO_LINE;
                     }
                 }();
-                test(env, USD, std::nullopt, STPath(), err);
+                test(env, usd, std::nullopt, STPath(), err);
 
                 if constexpr (std::is_same_v<tUSD, MPT>)
                 {
-                    MPTTester(env, gw, USD).authorizeHolders({alice, bob, carol});
+                    MPTTester(env, gw, usd).authorizeHolders({alice, bob, carol});
                 }
                 else
                 {
-                    env.trust(USD(1'000), alice, bob, carol);
+                    env.trust(usd(1'000), alice, bob, carol);
                 }
 
-                test(env, USD, std::nullopt, STPath(), tecPATH_DRY);
+                test(env, usd, std::nullopt, STPath(), tecPATH_DRY);
 
-                env(pay(gw, alice, USD(100)));
-                env(pay(gw, carol, USD(100)));
+                env(pay(gw, alice, usd(100)));
+                env(pay(gw, carol, usd(100)));
 
                 // Insert implied account
                 test(
                     env,
-                    USD,
+                    usd,
                     std::nullopt,
                     STPath(),
                     tesSUCCESS,
-                    makeEndpointStep(alice, gw, USD),
-                    makeEndpointStep(gw, bob, USD));
+                    makeEndpointStep(alice, gw, usd),
+                    makeEndpointStep(gw, bob, usd));
                 if constexpr (std::is_same_v<tEUR, MPT>)
                 {
-                    MPTTester(env, gw, EUR).authorizeHolders({alice, bob});
+                    MPTTester(env, gw, eur).authorizeHolders({alice, bob});
                 }
                 else
                 {
-                    env.trust(EUR(1'000), alice, bob);
+                    env.trust(eur(1'000), alice, bob);
                 }
 
                 // Insert implied offer
                 test(
                     env,
-                    EUR,
-                    USD,
+                    eur,
+                    usd,
                     STPath(),
                     tesSUCCESS,
-                    makeEndpointStep(alice, gw, USD),
-                    B{USD, EUR, std::nullopt},
-                    makeEndpointStep(gw, bob, EUR));
+                    makeEndpointStep(alice, gw, usd),
+                    B{usd, eur, std::nullopt},
+                    makeEndpointStep(gw, bob, eur));
 
                 // Path with explicit offer
                 test(
                     env,
-                    EUR,
-                    USD,
-                    STPath({ipe(EUR)}),
+                    eur,
+                    usd,
+                    STPath({ipe(eur)}),
                     tesSUCCESS,
-                    makeEndpointStep(alice, gw, USD),
-                    B{USD, EUR, std::nullopt},
-                    makeEndpointStep(gw, bob, EUR));
+                    makeEndpointStep(alice, gw, usd),
+                    B{usd, eur, std::nullopt},
+                    makeEndpointStep(gw, bob, eur));
 
                 // Path with XRP src currency
                 test(
                     env,
-                    USD,
+                    usd,
                     xrpIssue(),
-                    STPath({ipe(USD)}),
+                    STPath({ipe(usd)}),
                     tesSUCCESS,
                     XRPS{alice},
-                    B{XRP, USD, std::nullopt},
-                    makeEndpointStep(gw, bob, USD));
+                    B{XRP, usd, std::nullopt},
+                    makeEndpointStep(gw, bob, usd));
 
                 // Path with XRP dst currency.
                 test(
                     env,
                     xrpIssue(),
-                    USD,
+                    usd,
                     STPath({STPathElement{
-                        STPathElement::typeCurrency, xrpAccount(), xrpCurrency(), xrpAccount()}}),
+                        STPathElement::TypeCurrency, xrpAccount(), xrpCurrency(), xrpAccount()}}),
                     tesSUCCESS,
-                    makeEndpointStep(alice, gw, USD),
-                    B{USD, XRP, std::nullopt},
+                    makeEndpointStep(alice, gw, usd),
+                    B{usd, XRP, std::nullopt},
                     XRPS{bob});
 
                 // Path with XRP cross currency bridged payment
                 test(
                     env,
-                    EUR,
-                    USD,
+                    eur,
+                    usd,
                     STPath({cpe(xrpCurrency())}),
                     tesSUCCESS,
-                    makeEndpointStep(alice, gw, USD),
-                    B{USD, XRP, std::nullopt},
-                    B{XRP, EUR, std::nullopt},
-                    makeEndpointStep(gw, bob, EUR));
+                    makeEndpointStep(alice, gw, usd),
+                    B{usd, XRP, std::nullopt},
+                    B{XRP, eur, std::nullopt},
+                    makeEndpointStep(gw, bob, eur));
 
                 // Create an offer with the same in/out issue
-                test(env, EUR, USD, STPath({ipe(USD), ipe(EUR)}), temBAD_PATH);
+                test(env, eur, usd, STPath({ipe(usd), ipe(eur)}), temBAD_PATH);
 
                 // The same offer can't appear more than once on a path
-                test(env, EUR, USD, STPath({ipe(EUR), ipe(USD), ipe(EUR)}), temBAD_PATH_LOOP);
+                test(env, eur, usd, STPath({ipe(eur), ipe(usd), ipe(eur)}), temBAD_PATH_LOOP);
             };
             testHelper2TokensMix(testMultiToken);
         }
@@ -290,32 +290,32 @@ struct PayStrandMPT_test : public beast::unit_test::suite
 
                 env.fund(XRP(10'000), alice, bob, carol, gw);
 
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 10'000});
-                auto const EUR = issue2(
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 10'000});
 
-                env(pay(gw, bob, USD(100)));
-                env(pay(gw, bob, EUR(100)));
+                env(pay(gw, bob, usd(100)));
+                env(pay(gw, bob, eur(100)));
 
-                env(offer(bob, XRP(100), USD(100)));
-                env(offer(bob, USD(100), EUR(100)), txflags(tfPassive));
-                env(offer(bob, EUR(100), USD(100)), txflags(tfPassive));
+                env(offer(bob, XRP(100), usd(100)));
+                env(offer(bob, usd(100), eur(100)), Txflags(tfPassive));
+                env(offer(bob, eur(100), usd(100)), Txflags(tfPassive));
 
                 // payment path: XRP -> XRP/USD -> USD/EUR -> EUR/USD
-                env(pay(alice, carol, USD(100)),
-                    path(~USD, ~EUR, ~USD),
-                    sendmax(XRP(200)),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice, carol, usd(100)),
+                    Path(~usd, ~eur, ~usd),
+                    Sendmax(XRP(200)),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper2TokensMix(testMultiToken);
         }
@@ -324,32 +324,32 @@ struct PayStrandMPT_test : public beast::unit_test::suite
             // check global freeze
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
-            auto USDM = MPTTester(
+            auto usdm = MPTTester(
                 {.env = env,
                  .issuer = gw,
                  .holders = {alice, bob},
-                 .flags = MPTDEXFlags | tfMPTCanLock,
+                 .flags = kMPT_DEX_FLAGS | tfMPTCanLock,
                  .maxAmt = 1'000});
-            MPT const USD = USDM;
-            env(pay(gw, alice, USD(100)));
+            MPT const usd = usdm;
+            env(pay(gw, alice, usd(100)));
 
             // Account can't issue payments
-            USDM.set({.holder = alice, .flags = tfMPTLock});
-            test(env, USD, std::nullopt, STPath(), terLOCKED);
-            USDM.set({.holder = alice, .flags = tfMPTUnlock});
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            usdm.set({.holder = alice, .flags = tfMPTLock});
+            test(env, usd, std::nullopt, STPath(), terLOCKED);
+            usdm.set({.holder = alice, .flags = tfMPTUnlock});
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
 
             // Account can not issue funds
-            USDM.set({.flags = tfMPTLock});
-            test(env, USD, std::nullopt, STPath(), terLOCKED);
-            USDM.set({.flags = tfMPTUnlock});
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            usdm.set({.flags = tfMPTLock});
+            test(env, usd, std::nullopt, STPath(), terLOCKED);
+            usdm.set({.flags = tfMPTUnlock});
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
 
             // Account can not receive funds
-            USDM.set({.holder = bob, .flags = tfMPTLock});
-            test(env, USD, std::nullopt, STPath(), terLOCKED);
-            USDM.set({.holder = bob, .flags = tfMPTUnlock});
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            usdm.set({.holder = bob, .flags = tfMPTLock});
+            test(env, usd, std::nullopt, STPath(), terLOCKED);
+            usdm.set({.holder = bob, .flags = tfMPTUnlock});
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
         }
 
         {
@@ -358,49 +358,49 @@ struct PayStrandMPT_test : public beast::unit_test::suite
             // issuer
             Env env(*this, features);
             env.fund(XRP(10'000), alice, bob, gw);
-            auto USDM = MPTTester(
+            auto usdm = MPTTester(
                 {.env = env,
                  .issuer = gw,
-                 .flags = MPTDEXFlags | tfMPTRequireAuth,
+                 .flags = kMPT_DEX_FLAGS | tfMPTRequireAuth,
                  .maxAmt = 1'000});
-            MPT const USD = USDM;
+            MPT const usd = usdm;
 
             // Authorize alice but not bob
-            USDM.authorize({.account = alice});
-            USDM.authorize({.holder = alice});
-            env(pay(gw, alice, USD(100)));
-            env.require(balance(alice, USD(100)));
-            test(env, USD, std::nullopt, STPath(), tecNO_AUTH);
+            usdm.authorize({.account = alice});
+            usdm.authorize({.holder = alice});
+            env(pay(gw, alice, usd(100)));
+            env.require(Balance(alice, usd(100)));
+            test(env, usd, std::nullopt, STPath(), tecNO_AUTH);
 
             // Check pure issue redeem still works
             auto [ter, strand] = toStrand(
                 *env.current(),
                 alice,
                 gw,
-                USD,
+                usd,
                 std::nullopt,
                 std::nullopt,
                 STPath(),
                 true,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getLogs().journal("Flow"));
             BEAST_EXPECT(ter == tesSUCCESS);
-            BEAST_EXPECT(equal(strand, M{alice, gw, USD}));
+            BEAST_EXPECT(equal(strand, M{alice, gw, usd}));
         }
 
         {
             // last step xrp from offer
             Env env(*this, features);
             env.fund(XRP(10'000), alice, bob, gw);
-            MPT const USD =
+            MPT const usd =
                 MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}, .maxAmt = 1'000});
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, alice, usd(100)));
 
             // alice -> USD/XRP -> bob
             STPath path;
-            path.emplace_back(std::nullopt, xrpCurrency(), std::nullopt);
+            path.emplaceBack(std::nullopt, xrpCurrency(), std::nullopt);
 
             auto [ter, strand] = toStrand(
                 *env.current(),
@@ -408,16 +408,16 @@ struct PayStrandMPT_test : public beast::unit_test::suite
                 bob,
                 XRP,
                 std::nullopt,
-                USD,
+                usd,
                 path,
                 false,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getLogs().journal("Flow"));
             BEAST_EXPECT(ter == tesSUCCESS);
             BEAST_EXPECT(
-                equal(strand, M{alice, gw, USD}, B{USD, xrpIssue(), std::nullopt}, XRPS{bob}));
+                equal(strand, M{alice, gw, usd}, B{usd, xrpIssue(), std::nullopt}, XRPS{bob}));
         }
     }
 
@@ -436,39 +436,39 @@ struct PayStrandMPT_test : public beast::unit_test::suite
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .maxAmt = 10'000});
 
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
             env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_PATHS));
+                Path(~usd, ~XRP),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_PATHS));
         }
 
         {
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .maxAmt = 10'000});
 
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
             env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                sendmax(XRP(200)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_MAX));
+                Path(~usd, ~XRP),
+                Sendmax(XRP(200)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_MAX));
         }
     }
 
@@ -482,67 +482,67 @@ struct PayStrandMPT_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const EUR = gw["EUR"];
-        auto const CNY = gw["CNY"];
+        auto const eur = gw["EUR"];
+        auto const cny = gw["CNY"];
 
         {
             Env env(*this, features);
 
             env.fund(XRP(10'000), alice, bob, carol, gw);
-            MPT const USD = MPTTester(
+            MPT const usd = MPTTester(
                 {.env = env, .issuer = gw, .holders = {alice, bob, carol}, .maxAmt = 10'000});
 
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, alice, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: USD -> USD/XRP -> XRP/USD
-            env(pay(alice, carol, USD(100)),
-                sendmax(USD(100)),
-                path(~XRP, ~USD),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice, carol, usd(100)),
+                Sendmax(usd(100)),
+                Path(~XRP, ~usd),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
         {
             auto testMultiToken = [&](auto&& issue1, auto&& issue2, auto&& issue3) {
                 Env env(*this, features);
 
                 env.fund(XRP(10'000), alice, bob, carol, gw);
-                auto const USD = issue1(
+                auto const usd = issue1(
                     {.env = env,
                      .token = "USD",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 10'000});
-                auto const EUR = issue2(
+                auto const eur = issue2(
                     {.env = env,
                      .token = "EUR",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 10'000});
-                auto const CNY = issue3(
+                auto const cny = issue3(
                     {.env = env,
                      .token = "CNY",
                      .issuer = gw,
                      .holders = {alice, bob, carol},
                      .limit = 10'000});
 
-                env(pay(gw, bob, USD(100)));
-                env(pay(gw, bob, EUR(100)));
-                env(pay(gw, bob, CNY(100)));
+                env(pay(gw, bob, usd(100)));
+                env(pay(gw, bob, eur(100)));
+                env(pay(gw, bob, cny(100)));
 
-                env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-                env(offer(bob, USD(100), EUR(100)), txflags(tfPassive));
-                env(offer(bob, EUR(100), CNY(100)), txflags(tfPassive));
+                env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+                env(offer(bob, usd(100), eur(100)), Txflags(tfPassive));
+                env(offer(bob, eur(100), cny(100)), Txflags(tfPassive));
 
                 // payment path: XRP->XRP/USD->USD/EUR->USD/CNY
-                env(pay(alice, carol, CNY(100)),
-                    sendmax(XRP(100)),
-                    path(~USD, ~EUR, ~USD, ~CNY),
-                    txflags(tfNoRippleDirect),
-                    ter(temBAD_PATH_LOOP));
+                env(pay(alice, carol, cny(100)),
+                    Sendmax(XRP(100)),
+                    Path(~usd, ~eur, ~usd, ~cny),
+                    Txflags(tfNoRippleDirect),
+                    Ter(temBAD_PATH_LOOP));
             };
             testHelper3TokensMix(testMultiToken);
         }
@@ -560,9 +560,9 @@ struct PayStrandMPT_test : public beast::unit_test::suite
 
         Env env(*this, features);
         env.fund(XRP(10'000), alice, bob, gw);
-        MPT const USD = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
+        MPT const usd = MPTTester({.env = env, .issuer = gw, .holders = {alice, bob}});
 
-        STAmount const sendMax{USD, 100, 1};
+        STAmount const sendMax{usd, 100, 1};
         STAmount const noAccountAmount{MPTIssue{0, noAccount()}, 100, 1};
         STAmount const deliver;
         AccountID const srcAcc = alice.id();
@@ -572,7 +572,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
         inputs.defaultPathsAllowed = true;
         try
         {
-            PaymentSandbox sb{env.current().get(), tapNONE};
+            PaymentSandbox sb{env.current().get(), TapNone};
             {
                 auto const r = ::xrpl::path::RippleCalc::rippleCalculate(
                     sb,
@@ -636,7 +636,7 @@ struct PayStrandMPT_test : public beast::unit_test::suite
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testToStrand(sa);
 
         testRIPD1373(sa);
diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp
index 161903ee6d..78b152d690 100644
--- a/src/test/app/PayStrand_test.cpp
+++ b/src/test/app/PayStrand_test.cpp
@@ -49,22 +49,22 @@
 
 namespace xrpl::test {
 
-enum class TrustFlag { freeze, auth, noripple };
+enum class TrustFlag { Freeze, Auth, Noripple };
 
 /*constexpr*/ std::uint32_t
 trustFlag(TrustFlag f, bool useHigh)
 {
     switch (f)
     {
-        case TrustFlag::freeze:
+        case TrustFlag::Freeze:
             if (useHigh)
                 return lsfHighFreeze;
             return lsfLowFreeze;
-        case TrustFlag::auth:
+        case TrustFlag::Auth:
             if (useHigh)
                 return lsfHighAuth;
             return lsfLowAuth;
-        case TrustFlag::noripple:
+        case TrustFlag::Noripple:
             if (useHigh)
                 return lsfHighNoRipple;
             return lsfLowNoRipple;
@@ -93,25 +93,25 @@ class ElementComboIter
 {
     enum class SB /*state bit*/
         : std::uint16_t {
-            acc,
-            iss,
-            cur,
-            rootAcc,
-            rootIss,
-            xrp,
-            sameAccIss,
-            existingAcc,
-            existingCur,
-            existingIss,
-            prevAcc,
-            prevCur,
-            prevIss,
-            boundary,
-            last
+            Acc,
+            Iss,
+            Cur,
+            RootAcc,
+            RootIss,
+            Xrp,
+            SameAccIss,
+            ExistingAcc,
+            ExistingCur,
+            ExistingIss,
+            PrevAcc,
+            PrevCur,
+            PrevIss,
+            Boundary,
+            Last
         };
 
     std::uint16_t state_ = 0;
-    static_assert(safe_cast<size_t>(SB::last) <= sizeof(decltype(state_)) * 8, "");
+    static_assert(safeCast<size_t>(SB::Last) <= sizeof(decltype(state_)) * 8, "");
     STPathElement const* prev_ = nullptr;
     // disallow iss and cur to be specified with acc is specified (simplifies
     // some tests)
@@ -120,7 +120,7 @@ class ElementComboIter
     [[nodiscard]] bool
     has(SB s) const
     {
-        return (state_ & (1 << safe_cast<int>(s))) != 0;
+        return (state_ & (1 << safeCast<int>(s))) != 0;
     }
 
     [[nodiscard]] bool
@@ -155,34 +155,34 @@ public:
     [[nodiscard]] bool
     valid() const
     {
-        return (allowCompound_ || !(has(SB::acc) && hasAny({SB::cur, SB::iss}))) &&
-            (!hasAny({SB::prevAcc, SB::prevCur, SB::prevIss}) || (prev_ != nullptr)) &&
-            (!hasAny({SB::rootAcc, SB::sameAccIss, SB::existingAcc, SB::prevAcc}) ||
-             has(SB::acc)) &&
-            (!hasAny({SB::rootIss, SB::sameAccIss, SB::existingIss, SB::prevIss}) ||
-             has(SB::iss)) &&
-            (!hasAny({SB::xrp, SB::existingCur, SB::prevCur}) || has(SB::cur)) &&
+        return (allowCompound_ || !(has(SB::Acc) && hasAny({SB::Cur, SB::Iss}))) &&
+            (!hasAny({SB::PrevAcc, SB::PrevCur, SB::PrevIss}) || (prev_ != nullptr)) &&
+            (!hasAny({SB::RootAcc, SB::SameAccIss, SB::ExistingAcc, SB::PrevAcc}) ||
+             has(SB::Acc)) &&
+            (!hasAny({SB::RootIss, SB::SameAccIss, SB::ExistingIss, SB::PrevIss}) ||
+             has(SB::Iss)) &&
+            (!hasAny({SB::Xrp, SB::ExistingCur, SB::PrevCur}) || has(SB::Cur)) &&
             // These will be duplicates
-            (count({SB::xrp, SB::existingCur, SB::prevCur}) <= 1) &&
-            (count({SB::rootAcc, SB::existingAcc, SB::prevAcc}) <= 1) &&
-            (count({SB::rootIss, SB::existingIss, SB::rootIss}) <= 1);
+            (count({SB::Xrp, SB::ExistingCur, SB::PrevCur}) <= 1) &&
+            (count({SB::RootAcc, SB::ExistingAcc, SB::PrevAcc}) <= 1) &&
+            (count({SB::RootIss, SB::ExistingIss, SB::RootIss}) <= 1);
     }
     bool
     next()
     {
-        if (!(has(SB::last)))
+        if (!(has(SB::Last)))
         {
             do
             {
                 ++state_;
             } while (!valid());
         }
-        return !has(SB::last);
+        return !has(SB::Last);
     }
 
     template <class Col, class AccFactory, class IssFactory, class CurrencyFactory>
     void
-    emplace_into(
+    emplaceInto(
         Col& col,
         AccFactory&& accF,
         IssFactory&& issF,
@@ -191,45 +191,45 @@ public:
         std::optional<Currency> const& existingCur,
         std::optional<AccountID> const& existingIss)
     {
-        assert(!has(SB::last));
+        assert(!has(SB::Last));
 
         auto const acc = [&]() -> std::optional<AccountID> {
-            if (!has(SB::acc))
+            if (!has(SB::Acc))
                 return std::nullopt;
-            if (has(SB::rootAcc))
+            if (has(SB::RootAcc))
                 return xrpAccount();
-            if (has(SB::existingAcc) && existingAcc)
+            if (has(SB::ExistingAcc) && existingAcc)
                 return existingAcc;
             return accF().id();
         }();
         auto const iss = [&]() -> std::optional<AccountID> {
-            if (!has(SB::iss))
+            if (!has(SB::Iss))
                 return std::nullopt;
-            if (has(SB::rootIss))
+            if (has(SB::RootIss))
                 return xrpAccount();
-            if (has(SB::sameAccIss))
+            if (has(SB::SameAccIss))
                 return acc;
-            if (has(SB::existingIss) && existingIss)
+            if (has(SB::ExistingIss) && existingIss)
                 return existingIss;
             return issF().id();
         }();
         auto const cur = [&]() -> std::optional<Currency> {
-            if (!has(SB::cur))
+            if (!has(SB::Cur))
                 return std::nullopt;
-            if (has(SB::xrp))
+            if (has(SB::Xrp))
                 return xrpCurrency();
-            if (has(SB::existingCur) && existingCur)
+            if (has(SB::ExistingCur) && existingCur)
                 return existingCur;
             return currencyF();
         }();
-        if (!has(SB::boundary))
+        if (!has(SB::Boundary))
         {
             col.emplace_back(acc, cur, iss);
         }
         else
         {
             col.emplace_back(
-                STPathElement::Type::typeBoundary,
+                STPathElement::Type::TypeBoundary,
                 acc.value_or(AccountID{}),
                 cur.value_or(Currency{}),
                 iss.value_or(AccountID{}));
@@ -277,15 +277,15 @@ struct ExistingElementPool
 
     struct StateGuard
     {
-        ExistingElementPool& p_;
-        ResetState state_;
+        ExistingElementPool& p;
+        ResetState state;
 
-        explicit StateGuard(ExistingElementPool& p) : p_{p}, state_{p.getResetState()}
+        explicit StateGuard(ExistingElementPool& p) : p{p}, state{p.getResetState()}
         {
         }
         ~StateGuard()
         {
-            p_.resetTo(state_);
+            p.resetTo(state);
         }
     };
 
@@ -308,12 +308,12 @@ struct ExistingElementPool
         currencyNames.clear();
         currencyNames.reserve(numCur);
 
-        constexpr size_t bufSize = 32;
-        char buf[bufSize];
+        constexpr size_t kBUF_SIZE = 32;
+        char buf[kBUF_SIZE];
 
         for (size_t id = 0; id < numAct; ++id)
         {
-            snprintf(buf, bufSize, "A%zu", id);
+            snprintf(buf, kBUF_SIZE, "A%zu", id);
             accounts.emplace_back(buf);
         }
 
@@ -321,17 +321,17 @@ struct ExistingElementPool
         {
             if (id < 10)
             {
-                snprintf(buf, bufSize, "CC%zu", id);
+                snprintf(buf, kBUF_SIZE, "CC%zu", id);
             }
             else if (id < 100)
             {
-                snprintf(buf, bufSize, "C%zu", id);
+                snprintf(buf, kBUF_SIZE, "C%zu", id);
             }
             else
             {
-                snprintf(buf, bufSize, "%zu", id);
+                snprintf(buf, kBUF_SIZE, "%zu", id);
             }
-            currencies.emplace_back(to_currency(buf));
+            currencies.emplace_back(toCurrency(buf));
             currencyNames.emplace_back(buf);
         }
 
@@ -381,7 +381,7 @@ struct ExistingElementPool
                 if (owner.id() != takerGets->account.id())
                     env(pay(takerGets->account, owner, (*takerGets)(1000)));
 
-                env(offer(owner, (*takerPays)(1000), (*takerGets)(1000)), txflags(tfPassive));
+                env(offer(owner, (*takerPays)(1000), (*takerGets)(1000)), Txflags(tfPassive));
             }
             env.close();
         }
@@ -390,8 +390,8 @@ struct ExistingElementPool
         for (auto const& iou : ious)
         {
             auto const owner = offererIndex ? accounts[*offererIndex] : iou.account;
-            env(offer(owner, iou(1000), XRP(1000)), txflags(tfPassive));
-            env(offer(owner, XRP(1000), iou(1000)), txflags(tfPassive));
+            env(offer(owner, iou(1000), XRP(1000)), Txflags(tfPassive));
+            env(offer(owner, XRP(1000), iou(1000)), Txflags(tfPassive));
             env.close();
         }
     }
@@ -479,7 +479,7 @@ struct ExistingElementPool
 
     template <class F>
     void
-    for_each_element_pair(
+    forEachElementPair(
         STAmount const& sendMax,
         STAmount const& deliver,
         std::vector<STPathElement> const& prefix,
@@ -505,7 +505,7 @@ struct ExistingElementPool
         {
             StateGuard const og{*this};
             outerResult = prefix;
-            outer.emplace_into(
+            outer.emplaceInto(
                 outerResult, accF, issF, currencyF, existingAcc, existingCur, existingIss);
             STPathElement const* prevInner = &outerResult.back();
             ElementComboIter inner(prevInner);
@@ -513,7 +513,7 @@ struct ExistingElementPool
             {
                 StateGuard const ig{*this};
                 result = outerResult;
-                inner.emplace_into(
+                inner.emplaceInto(
                     result, accF, issF, currencyF, existingAcc, existingCur, existingIss);
                 result.insert(result.end(), suffix.begin(), suffix.end());
                 f(sendMax, deliver, result);
@@ -522,7 +522,7 @@ struct ExistingElementPool
     }
 };
 
-struct PayStrand_test : public beast::unit_test::suite
+struct PayStrand_test : public beast::unit_test::Suite
 {
     void
     testToStrand(FeatureBitset features)
@@ -536,11 +536,11 @@ struct PayStrand_test : public beast::unit_test::suite
         auto const carol = Account("carol");
         auto const gw = Account("gw");
 
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
-        auto const eurC = EUR.currency;
-        auto const usdC = USD.currency;
+        auto const eurC = eur.currency;
+        auto const usdC = usd.currency;
 
         using D = DirectStepInfo;
         using B = xrpl::Book;
@@ -564,7 +564,7 @@ struct PayStrand_test : public beast::unit_test::suite
                 sendMaxIssue,
                 path,
                 true,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getJournal("Flow"));
@@ -576,22 +576,22 @@ struct PayStrand_test : public beast::unit_test::suite
         {
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
-            env(pay(gw, alice, EUR(100)));
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
+            env(pay(gw, alice, eur(100)));
 
             {
-                STPath const path = STPath({ipe(bob["USD"]), cpe(EUR.currency)});
+                STPath const path = STPath({ipe(bob["USD"]), cpe(eur.currency)});
                 auto [ter, _] = toStrand(
                     *env.current(),
                     alice,
                     alice,
                     /*deliver*/ xrpIssue(),
                     /*limitQuality*/ std::nullopt,
-                    /*sendMaxIssue*/ EUR,
+                    /*sendMaxIssue*/ eur,
                     path,
                     true,
-                    OfferCrossing::no,
+                    OfferCrossing::No,
                     ammContext,
                     std::nullopt,
                     env.app().getJournal("Flow"));
@@ -599,17 +599,17 @@ struct PayStrand_test : public beast::unit_test::suite
                 BEAST_EXPECT(isTesSuccess(ter));
             }
             {
-                STPath const path = STPath({ipe(USD), cpe(xrpCurrency())});
+                STPath const path = STPath({ipe(usd), cpe(xrpCurrency())});
                 auto [ter, _] = toStrand(
                     *env.current(),
                     alice,
                     alice,
                     /*deliver*/ xrpIssue(),
                     /*limitQuality*/ std::nullopt,
-                    /*sendMaxIssue*/ EUR,
+                    /*sendMaxIssue*/ eur,
                     path,
                     true,
-                    OfferCrossing::no,
+                    OfferCrossing::No,
                     ammContext,
                     std::nullopt,
                     env.app().getJournal("Flow"));
@@ -622,39 +622,39 @@ struct PayStrand_test : public beast::unit_test::suite
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, carol, gw);
 
-            test(env, USD, std::nullopt, STPath(), terNO_LINE);
+            test(env, usd, std::nullopt, STPath(), terNO_LINE);
 
-            env.trust(USD(1000), alice, bob, carol);
-            test(env, USD, std::nullopt, STPath(), tecPATH_DRY);
+            env.trust(usd(1000), alice, bob, carol);
+            test(env, usd, std::nullopt, STPath(), tecPATH_DRY);
 
-            env(pay(gw, alice, USD(100)));
-            env(pay(gw, carol, USD(100)));
+            env(pay(gw, alice, usd(100)));
+            env(pay(gw, carol, usd(100)));
 
             // Insert implied account
             test(
-                env, USD, std::nullopt, STPath(), tesSUCCESS, D{alice, gw, usdC}, D{gw, bob, usdC});
-            env.trust(EUR(1000), alice, bob);
+                env, usd, std::nullopt, STPath(), tesSUCCESS, D{alice, gw, usdC}, D{gw, bob, usdC});
+            env.trust(eur(1000), alice, bob);
 
             // Insert implied offer
             test(
                 env,
-                EUR,
-                USD,
+                eur,
+                usd,
                 STPath(),
                 tesSUCCESS,
                 D{alice, gw, usdC},
-                B{USD, EUR, std::nullopt},
+                B{usd, eur, std::nullopt},
                 D{gw, bob, eurC});
 
             // Path with explicit offer
             test(
                 env,
-                EUR,
-                USD,
-                STPath({ipe(EUR)}),
+                eur,
+                usd,
+                STPath({ipe(eur)}),
                 tesSUCCESS,
                 D{alice, gw, usdC},
-                B{USD, EUR, std::nullopt},
+                B{usd, eur, std::nullopt},
                 D{gw, bob, eurC});
 
             // Path with offer that changes issuer only
@@ -662,46 +662,46 @@ struct PayStrand_test : public beast::unit_test::suite
             test(
                 env,
                 carol["USD"],
-                USD,
+                usd,
                 STPath({iape(carol)}),
                 tesSUCCESS,
                 D{alice, gw, usdC},
-                B{USD, carol["USD"], std::nullopt},
+                B{usd, carol["USD"], std::nullopt},
                 D{carol, bob, usdC});
 
             // Path with XRP src currency
             test(
                 env,
-                USD,
+                usd,
                 xrpIssue(),
-                STPath({ipe(USD)}),
+                STPath({ipe(usd)}),
                 tesSUCCESS,
                 XRPS{alice},
-                B{XRP, USD, std::nullopt},
+                B{XRP, usd, std::nullopt},
                 D{gw, bob, usdC});
 
             // Path with XRP dst currency.
             test(
                 env,
                 xrpIssue(),
-                USD,
+                usd,
                 STPath({STPathElement{
-                    STPathElement::typeCurrency, xrpAccount(), xrpCurrency(), xrpAccount()}}),
+                    STPathElement::TypeCurrency, xrpAccount(), xrpCurrency(), xrpAccount()}}),
                 tesSUCCESS,
                 D{alice, gw, usdC},
-                B{USD, XRP, std::nullopt},
+                B{usd, XRP, std::nullopt},
                 XRPS{bob});
 
             // Path with XRP cross currency bridged payment
             test(
                 env,
-                EUR,
-                USD,
+                eur,
+                usd,
                 STPath({cpe(xrpCurrency())}),
                 tesSUCCESS,
                 D{alice, gw, usdC},
-                B{USD, XRP, std::nullopt},
-                B{XRP, EUR, std::nullopt},
+                B{usd, XRP, std::nullopt},
+                B{XRP, eur, std::nullopt},
                 D{gw, bob, eurC});
 
             // XRP -> XRP transaction can't include a path
@@ -718,10 +718,10 @@ struct PayStrand_test : public beast::unit_test::suite
                         xrpAccount(),
                         XRP,
                         std::nullopt,
-                        USD,
+                        usd,
                         STPath(),
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         ammContext,
                         std::nullopt,
                         flowJournal);
@@ -738,7 +738,7 @@ struct PayStrand_test : public beast::unit_test::suite
                         std::nullopt,
                         STPath(),
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         ammContext,
                         std::nullopt,
                         flowJournal);
@@ -750,12 +750,12 @@ struct PayStrand_test : public beast::unit_test::suite
                         *env.current(),
                         noAccount(),
                         bob,
-                        USD,
+                        usd,
                         std::nullopt,
                         std::nullopt,
                         STPath(),
                         true,
-                        OfferCrossing::no,
+                        OfferCrossing::No,
                         ammContext,
                         std::nullopt,
                         flowJournal);
@@ -764,12 +764,12 @@ struct PayStrand_test : public beast::unit_test::suite
             }
 
             // Create an offer with the same in/out issue
-            test(env, EUR, USD, STPath({ipe(USD), ipe(EUR)}), temBAD_PATH);
+            test(env, eur, usd, STPath({ipe(usd), ipe(eur)}), temBAD_PATH);
 
             // Path element with type zero
             test(
                 env,
-                USD,
+                usd,
                 std::nullopt,
                 STPath({STPathElement(0, xrpAccount(), xrpCurrency(), xrpAccount())}),
                 temBAD_PATH);
@@ -777,10 +777,10 @@ struct PayStrand_test : public beast::unit_test::suite
             // The same account can't appear more than once on a path
             // `gw` will be used from alice->carol and implied between carol
             // and bob
-            test(env, USD, std::nullopt, STPath({ape(gw), ape(carol)}), temBAD_PATH_LOOP);
+            test(env, usd, std::nullopt, STPath({ape(gw), ape(carol)}), temBAD_PATH_LOOP);
 
             // The same offer can't appear more than once on a path
-            test(env, EUR, USD, STPath({ipe(EUR), ipe(USD), ipe(EUR)}), temBAD_PATH_LOOP);
+            test(env, eur, usd, STPath({ipe(eur), ipe(usd), ipe(eur)}), temBAD_PATH_LOOP);
         }
 
         {
@@ -790,67 +790,67 @@ struct PayStrand_test : public beast::unit_test::suite
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(10000), alice, bob, carol);
-            env.trust(EUR(10000), alice, bob, carol);
+            env.trust(usd(10000), alice, bob, carol);
+            env.trust(eur(10000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, bob, EUR(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, bob, eur(100)));
 
-            env(offer(bob, XRP(100), USD(100)));
-            env(offer(bob, USD(100), EUR(100)), txflags(tfPassive));
-            env(offer(bob, EUR(100), USD(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)));
+            env(offer(bob, usd(100), eur(100)), Txflags(tfPassive));
+            env(offer(bob, eur(100), usd(100)), Txflags(tfPassive));
 
             // payment path: XRP -> XRP/USD -> USD/EUR -> EUR/USD
-            env(pay(alice, carol, USD(100)),
-                path(~USD, ~EUR, ~USD),
-                sendmax(XRP(200)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice, carol, usd(100)),
+                Path(~usd, ~eur, ~usd),
+                Sendmax(XRP(200)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, noripple(gw));
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
-            test(env, USD, std::nullopt, STPath(), terNO_RIPPLE);
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
+            test(env, usd, std::nullopt, STPath(), terNO_RIPPLE);
         }
 
         {
             // check global freeze
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
 
             // Account can still issue payments
             env(fset(alice, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
             env(fclear(alice, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
 
             // Account can not issue funds
             env(fset(gw, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), terNO_LINE);
+            test(env, usd, std::nullopt, STPath(), terNO_LINE);
             env(fclear(gw, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
 
             // Account can not receive funds
             env(fset(bob, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), terNO_LINE);
+            test(env, usd, std::nullopt, STPath(), terNO_LINE);
             env(fclear(bob, asfGlobalFreeze));
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
         }
         {
             // Freeze between gw and alice
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
-            test(env, USD, std::nullopt, STPath(), tesSUCCESS);
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
+            test(env, usd, std::nullopt, STPath(), tesSUCCESS);
             env(trust(gw, alice["USD"](0), tfSetFreeze));
-            BEAST_EXPECT(getTrustFlag(env, gw, alice, usdC, TrustFlag::freeze));
-            test(env, USD, std::nullopt, STPath(), terNO_LINE);
+            BEAST_EXPECT(getTrustFlag(env, gw, alice, usdC, TrustFlag::Freeze));
+            test(env, usd, std::nullopt, STPath(), terNO_LINE);
         }
         {
             // check no auth
@@ -859,25 +859,25 @@ struct PayStrand_test : public beast::unit_test::suite
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
             env(fset(gw, asfRequireAuth));
-            env.trust(USD(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
             // Authorize alice but not bob
             env(trust(gw, alice["USD"](1000), tfSetfAuth));
-            BEAST_EXPECT(getTrustFlag(env, gw, alice, usdC, TrustFlag::auth));
-            env(pay(gw, alice, USD(100)));
-            env.require(balance(alice, USD(100)));
-            test(env, USD, std::nullopt, STPath(), terNO_AUTH);
+            BEAST_EXPECT(getTrustFlag(env, gw, alice, usdC, TrustFlag::Auth));
+            env(pay(gw, alice, usd(100)));
+            env.require(Balance(alice, usd(100)));
+            test(env, usd, std::nullopt, STPath(), terNO_AUTH);
 
             // Check pure issue redeem still works
             auto [ter, strand] = toStrand(
                 *env.current(),
                 alice,
                 gw,
-                USD,
+                usd,
                 std::nullopt,
                 std::nullopt,
                 STPath(),
                 true,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getJournal("Flow"));
@@ -889,12 +889,12 @@ struct PayStrand_test : public beast::unit_test::suite
             // last step xrp from offer
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
-            env.trust(USD(1000), alice, bob);
-            env(pay(gw, alice, USD(100)));
+            env.trust(usd(1000), alice, bob);
+            env(pay(gw, alice, usd(100)));
 
             // alice -> USD/XRP -> bob
             STPath path;
-            path.emplace_back(std::nullopt, xrpCurrency(), std::nullopt);
+            path.emplaceBack(std::nullopt, xrpCurrency(), std::nullopt);
 
             auto [ter, strand] = toStrand(
                 *env.current(),
@@ -902,16 +902,16 @@ struct PayStrand_test : public beast::unit_test::suite
                 bob,
                 XRP,
                 std::nullopt,
-                USD,
+                usd,
                 path,
                 false,
-                OfferCrossing::no,
+                OfferCrossing::No,
                 ammContext,
                 std::nullopt,
                 env.app().getJournal("Flow"));
             BEAST_EXPECT(isTesSuccess(ter));
             BEAST_EXPECT(
-                equal(strand, D{alice, gw, usdC}, B{USD, xrpIssue(), std::nullopt}, XRPS{bob}));
+                equal(strand, D{alice, gw, usdC}, B{usd, xrpIssue(), std::nullopt}, XRPS{bob}));
         }
     }
 
@@ -925,75 +925,75 @@ struct PayStrand_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         {
             Env env(*this, features);
             env.fund(XRP(10000), alice, bob, gw);
 
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
             env.trust(bob["USD"](1000), alice, gw);
             env.trust(bob["EUR"](1000), alice, gw);
 
-            env(offer(bob, XRP(100), bob["USD"](100)), txflags(tfPassive));
-            env(offer(gw, XRP(100), USD(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), bob["USD"](100)), Txflags(tfPassive));
+            env(offer(gw, XRP(100), usd(100)), Txflags(tfPassive));
 
-            env(offer(bob, bob["USD"](100), bob["EUR"](100)), txflags(tfPassive));
-            env(offer(gw, USD(100), EUR(100)), txflags(tfPassive));
+            env(offer(bob, bob["USD"](100), bob["EUR"](100)), Txflags(tfPassive));
+            env(offer(gw, usd(100), eur(100)), Txflags(tfPassive));
 
-            Path const p = [&] {
-                Path result;
-                result.push_back(allPathElements(gw, bob["USD"]));
-                result.push_back(cpe(EUR.currency));
+            TestPath const p = [&] {
+                TestPath result;
+                result.pushBack(allPathElements(gw, bob["USD"]));
+                result.pushBack(cpe(eur.currency));
                 return result;
             }();
 
             PathSet const paths(p);
 
-            env(pay(alice, alice, EUR(1)),
-                json(paths.json()),
-                sendmax(XRP(10)),
-                txflags(tfNoRippleDirect | tfPartialPayment),
-                ter(temBAD_PATH));
+            env(pay(alice, alice, eur(1)),
+                Json(paths.json()),
+                Sendmax(XRP(10)),
+                Txflags(tfNoRippleDirect | tfPartialPayment),
+                Ter(temBAD_PATH));
         }
 
         {
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(10000), alice, bob, carol);
+            env.trust(usd(10000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
             env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_PATHS));
+                Path(~usd, ~XRP),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_PATHS));
         }
 
         {
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(10000), alice, bob, carol);
+            env.trust(usd(10000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(100)));
+            env(pay(gw, bob, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: XRP -> XRP/USD -> USD/XRP
             env(pay(alice, carol, XRP(100)),
-                path(~USD, ~XRP),
-                sendmax(XRP(200)),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_SEND_XRP_MAX));
+                Path(~usd, ~XRP),
+                Sendmax(XRP(200)),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_SEND_XRP_MAX));
         }
     }
 
@@ -1007,51 +1007,51 @@ struct PayStrand_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
-        auto const CNY = gw["CNY"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
+        auto const cny = gw["CNY"];
 
         {
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(10000), alice, bob, carol);
+            env.trust(usd(10000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, alice, USD(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, alice, usd(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), XRP(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), XRP(100)), Txflags(tfPassive));
 
             // payment path: USD -> USD/XRP -> XRP/USD
-            env(pay(alice, carol, USD(100)),
-                sendmax(USD(100)),
-                path(~XRP, ~USD),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice, carol, usd(100)),
+                Sendmax(usd(100)),
+                Path(~XRP, ~usd),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
         {
             Env env(*this, features);
 
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(10000), alice, bob, carol);
-            env.trust(EUR(10000), alice, bob, carol);
-            env.trust(CNY(10000), alice, bob, carol);
+            env.trust(usd(10000), alice, bob, carol);
+            env.trust(eur(10000), alice, bob, carol);
+            env.trust(cny(10000), alice, bob, carol);
 
-            env(pay(gw, bob, USD(100)));
-            env(pay(gw, bob, EUR(100)));
-            env(pay(gw, bob, CNY(100)));
+            env(pay(gw, bob, usd(100)));
+            env(pay(gw, bob, eur(100)));
+            env(pay(gw, bob, cny(100)));
 
-            env(offer(bob, XRP(100), USD(100)), txflags(tfPassive));
-            env(offer(bob, USD(100), EUR(100)), txflags(tfPassive));
-            env(offer(bob, EUR(100), CNY(100)), txflags(tfPassive));
+            env(offer(bob, XRP(100), usd(100)), Txflags(tfPassive));
+            env(offer(bob, usd(100), eur(100)), Txflags(tfPassive));
+            env(offer(bob, eur(100), cny(100)), Txflags(tfPassive));
 
             // payment path: XRP->XRP/USD->USD/EUR->USD/CNY
-            env(pay(alice, carol, CNY(100)),
-                sendmax(XRP(100)),
-                path(~USD, ~EUR, ~USD, ~CNY),
-                txflags(tfNoRippleDirect),
-                ter(temBAD_PATH_LOOP));
+            env(pay(alice, carol, cny(100)),
+                Sendmax(XRP(100)),
+                Path(~usd, ~eur, ~usd, ~cny),
+                Txflags(tfNoRippleDirect),
+                Ter(temBAD_PATH_LOOP));
         }
     }
 
@@ -1064,13 +1064,13 @@ struct PayStrand_test : public beast::unit_test::suite
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env(*this, features);
         env.fund(XRP(10000), alice, bob, gw);
 
-        STAmount const sendMax{USD, 100, 1};
-        STAmount const noAccountAmount{Issue{USD.currency, noAccount()}, 100, 1};
+        STAmount const sendMax{usd, 100, 1};
+        STAmount const noAccountAmount{Issue{usd.currency, noAccount()}, 100, 1};
         STAmount const deliver;
         AccountID const srcAcc = alice.id();
         AccountID const dstAcc = bob.id();
@@ -1079,7 +1079,7 @@ struct PayStrand_test : public beast::unit_test::suite
         inputs.defaultPathsAllowed = true;
         try
         {
-            PaymentSandbox sb{env.current().get(), tapNONE};
+            PaymentSandbox sb{env.current().get(), TapNone};
             {
                 auto const r = ::xrpl::path::RippleCalc::rippleCalculate(
                     sb,
@@ -1143,7 +1143,7 @@ struct PayStrand_test : public beast::unit_test::suite
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testToStrand(sa - featurePermissionedDEX);
         testToStrand(sa);
 
diff --git a/src/test/app/PermissionedDEX_test.cpp b/src/test/app/PermissionedDEX_test.cpp
index 600f753c96..a0b16aa557 100644
--- a/src/test/app/PermissionedDEX_test.cpp
+++ b/src/test/app/PermissionedDEX_test.cpp
@@ -49,7 +49,7 @@ namespace xrpl::test {
 
 using namespace jtx;
 
-class PermissionedDEX_test : public beast::unit_test::suite
+class PermissionedDEX_test : public beast::unit_test::Suite
 {
     [[nodiscard]] static bool
     offerExists(Env const& env, Account const& account, std::uint32_t offerSeq)
@@ -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::book(book), getRate(takerGets, takerPays)).key;
+        return keylet::quality(keylet::kBOOK(book), getRate(takerGets, takerPays)).key;
     }
 
     static std::optional<uint256>
@@ -181,22 +181,22 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // test preflight
         {
             Env env(*this, features - featurePermissionedDEX);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID), ter(temDISABLED));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID), Ter(temDISABLED));
             env.close();
 
             env.enableFeature(featurePermissionedDEX);
             env.close();
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
         }
 
         // preclaim - someone outside of the domain cannot create domain offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // create devin account who is not part of the domain
@@ -205,10 +205,10 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
-            env(offer(devin, XRP(10), USD(10)), domain(domainID), ter(tecNO_PERMISSION));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID), Ter(tecNO_PERMISSION));
             env.close();
 
             // domain owner also issues a credential for devin
@@ -216,20 +216,20 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
 
             // devin still cannot create offer since he didn't accept credential
-            env(offer(devin, XRP(10), USD(10)), domain(domainID), ter(tecNO_PERMISSION));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID), Ter(tecNO_PERMISSION));
             env.close();
 
             env(credentials::accept(devin, domainOwner, credType));
             env.close();
 
-            env(offer(devin, XRP(10), USD(10)), domain(domainID));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID));
             env.close();
         }
 
         // preclaim - someone with expired cred cannot create domain offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // create devin account who is not part of the domain
@@ -238,7 +238,7 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
             auto jv = credentials::create(devin, domainOwner, credType);
@@ -250,27 +250,27 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
 
             // devin can still create offer while his cred is not expired
-            env(offer(devin, XRP(10), USD(10)), domain(domainID));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // time advance
             env.close(std::chrono::seconds(20));
 
             // devin cannot create offer with expired cred
-            env(offer(devin, XRP(10), USD(10)), domain(domainID), ter(tecNO_PERMISSION));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID), Ter(tecNO_PERMISSION));
             env.close();
         }
 
         // preclaim - cannot create an offer in a non existent domain
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
             uint256 const badDomain{
                 "F10D0CC9A0F9A3CBF585B80BE09A186483668FDBDD39AA7E3370F3649CE134"
                 "E5"};
 
-            env(offer(bob, XRP(10), USD(10)), domain(badDomain), ter(tecNO_PERMISSION));
+            env(offer(bob_, XRP(10), USD(10)), Domain(badDomain), Ter(tecNO_PERMISSION));
             env.close();
         }
 
@@ -278,68 +278,68 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // domain
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(credentials::deleteCred(domainOwner, gw, domainOwner, credType));
+            env(credentials::deleteCred(domainOwner, gw_, domainOwner, credType));
             env.close();
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
         }
 
         // apply - offer can be created even if takerpays issuer is not in
         // domain
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(credentials::deleteCred(domainOwner, gw, domainOwner, credType));
+            env(credentials::deleteCred(domainOwner, gw_, domainOwner, credType));
             env.close();
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, USD(10), XRP(10)), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, USD(10), XRP(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, USD(10), XRP(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, USD(10), XRP(10), 0, true));
         }
 
         // apply - two domain offers cross with each other
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
-            BEAST_EXPECT(ownerCount(env, bob) == 3);
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(ownerCount(env, bob_) == 3);
 
             // a non domain offer cannot cross with domain offer
-            env(offer(carol, USD(10), XRP(10)));
+            env(offer(carol_, USD(10), XRP(10)));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
 
-            auto const aliceOfferSeq{env.seq(alice)};
-            env(offer(alice, USD(10), XRP(10)), domain(domainID));
+            auto const aliceOfferSeq{env.seq(alice_)};
+            env(offer(alice_, USD(10), XRP(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, alice, aliceOfferSeq));
-            BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, alice) == 2);
+            BEAST_EXPECT(!offerExists(env, alice_, aliceOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, alice_) == 2);
         }
 
         // apply - create lots of domain offers
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             std::vector<std::uint32_t> offerSeqs;
@@ -347,19 +347,19 @@ class PermissionedDEX_test : public beast::unit_test::suite
 
             for (size_t i = 0; i <= 100; i++)
             {
-                auto const bobOfferSeq{env.seq(bob)};
+                auto const bobOfferSeq{env.seq(bob_)};
                 offerSeqs.emplace_back(bobOfferSeq);
 
-                env(offer(bob, XRP(10), USD(10)), domain(domainID));
+                env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
                 env.close();
-                BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
+                BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
             }
 
             for (auto const offerSeq : offerSeqs)
             {
-                env(offer_cancel(bob, offerSeq));
+                env(offerCancel(bob_, offerSeq));
                 env.close();
-                BEAST_EXPECT(!offerExists(env, bob, offerSeq));
+                BEAST_EXPECT(!offerExists(env, bob_, offerSeq));
             }
         }
     }
@@ -372,50 +372,50 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // test preflight - without enabling featurePermissionedDEX amendment
         {
             Env env(*this, features - featurePermissionedDEX);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(pay(bob, alice, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(temDISABLED));
+            env(pay(bob_, alice_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(temDISABLED));
             env.close();
 
             env.enableFeature(featurePermissionedDEX);
             env.close();
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            env(pay(bob, alice, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(bob_, alice_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
         }
 
         // preclaim - cannot send payment with non existent domain
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
             uint256 const badDomain{
                 "F10D0CC9A0F9A3CBF585B80BE09A186483668FDBDD39AA7E3370F3649CE134"
                 "E5"};
 
-            env(pay(bob, alice, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(badDomain),
-                ter(tecNO_PERMISSION));
+            env(pay(bob_, alice_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(badDomain),
+                Ter(tecNO_PERMISSION));
             env.close();
         }
 
         // preclaim - payment with non-domain destination fails
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // create devin account who is not part of the domain
@@ -424,15 +424,15 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
             // devin is not part of domain
-            env(pay(alice, devin, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecNO_PERMISSION));
+            env(pay(alice_, devin, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             // domain owner also issues a credential for devin
@@ -440,28 +440,28 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
 
             // devin has not yet accepted cred
-            env(pay(alice, devin, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecNO_PERMISSION));
+            env(pay(alice_, devin, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             env(credentials::accept(devin, domainOwner, credType));
             env.close();
 
             // devin can now receive payment after he is in domain
-            env(pay(alice, devin, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(alice_, devin, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
         }
 
         // preclaim - non-domain sender cannot send payment
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // create devin account who is not part of the domain
@@ -470,15 +470,15 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
             // devin tries to send domain payment
-            env(pay(devin, alice, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecNO_PERMISSION));
+            env(pay(devin, alice_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             // domain owner also issues a credential for devin
@@ -486,39 +486,39 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
 
             // devin has not yet accepted cred
-            env(pay(devin, alice, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecNO_PERMISSION));
+            env(pay(devin, alice_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecNO_PERMISSION));
             env.close();
 
             env(credentials::accept(devin, domainOwner, credType));
             env.close();
 
             // devin can now send payment after he is in domain
-            env(pay(devin, alice, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(devin, alice_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
         }
 
         // apply - domain owner can always send and receive domain payment
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // domain owner can always be destination
-            env(pay(alice, domainOwner, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(alice_, domainOwner, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // domain owner can send
-            env(pay(domainOwner, alice, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(domainOwner, alice_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
         }
     }
@@ -531,46 +531,46 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // test domain cross currency payment consuming one offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // create a regular offer without domain
-            auto const regularOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)));
+            auto const regularOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, XRP(10), USD(10)));
+            BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, XRP(10), USD(10)));
 
-            auto const regularDirKey = getDefaultOfferDirKey(env, bob, regularOfferSeq);
+            auto const regularDirKey = getDefaultOfferDirKey(env, bob_, regularOfferSeq);
             BEAST_EXPECT(regularDirKey);
             BEAST_EXPECT(checkDirectorySize(
                 env, *regularDirKey, 1));  // NOLINT(bugprone-unchecked-optional-access)
 
             // a domain payment cannot consume regular offers
-            env(pay(alice, carol, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
             // create a domain offer
-            auto const domainOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const domainOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, domainOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, domainOfferSeq, XRP(10), USD(10), 0, true));
 
-            auto const domainDirKey = getDefaultOfferDirKey(env, bob, domainOfferSeq);
+            auto const domainDirKey = getDefaultOfferDirKey(env, bob_, domainOfferSeq);
             BEAST_EXPECT(domainDirKey);
             BEAST_EXPECT(checkDirectorySize(
                 env, *domainDirKey, 1));  // NOLINT(bugprone-unchecked-optional-access)
 
             // cross-currency permissioned payment consumed
             // domain offer instead of regular offer
-            env(pay(alice, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(alice_, carol_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(!offerExists(env, bob, domainOfferSeq));
-            BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, XRP(10), USD(10)));
+            BEAST_EXPECT(!offerExists(env, bob_, domainOfferSeq));
+            BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, XRP(10), USD(10)));
 
             // domain directory is empty
             BEAST_EXPECT(checkDirectorySize(
@@ -582,79 +582,79 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // test domain payment consuming two offers in the path
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(1000), alice);
+            auto const eur = gw_["EUR"];
+            env.trust(eur(1000), alice_);
             env.close();
-            env.trust(EUR(1000), bob);
+            env.trust(eur(1000), bob_);
             env.close();
-            env.trust(EUR(1000), carol);
+            env.trust(eur(1000), carol_);
             env.close();
-            env(pay(gw, bob, EUR(100)));
+            env(pay(gw_, bob_, eur(100)));
             env.close();
 
             // create XRP/USD domain offer
-            auto const usdOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const usdOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(10), USD(10), 0, true));
 
             // payment fail because there isn't eur offer
-            env(pay(alice, carol, EUR(10)),
-                path(~USD, ~EUR),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, eur(10)),
+                Path(~USD, ~eur),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(10), USD(10), 0, true));
 
-            // bob creates a regular USD/EUR offer
-            auto const regularOfferSeq{env.seq(bob)};
-            env(offer(bob, USD(10), EUR(10)));
+            // bob_ creates a regular USD/EUR offer
+            auto const regularOfferSeq{env.seq(bob_)};
+            env(offer(bob_, USD(10), eur(10)));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, USD(10), EUR(10)));
+            BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, USD(10), eur(10)));
 
-            // alice tries to pay again, but still fails because the regular
+            // alice_ tries to pay again, but still fails because the regular
             // offer cannot be consumed
-            env(pay(alice, carol, EUR(10)),
-                path(~USD, ~EUR),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, eur(10)),
+                Path(~USD, ~eur),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            // bob creates a domain USD/EUR offer
-            auto const eurOfferSeq{env.seq(bob)};
-            env(offer(bob, USD(10), EUR(10)), domain(domainID));
+            // bob_ creates a domain USD/EUR offer
+            auto const eurOfferSeq{env.seq(bob_)};
+            env(offer(bob_, USD(10), eur(10)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(10), EUR(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(10), eur(10), 0, true));
 
-            // alice successfully consume two domain offers: xrp/usd and usd/eur
-            env(pay(alice, carol, EUR(5)), sendmax(XRP(5)), domain(domainID), path(~USD, ~EUR));
+            // alice_ successfully consume two domain offers: xrp/usd and usd/eur
+            env(pay(alice_, carol_, eur(5)), Sendmax(XRP(5)), Domain(domainID), Path(~USD, ~eur));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(5), USD(5), 0, true));
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(5), EUR(5), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(5), USD(5), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(5), eur(5), 0, true));
 
-            // alice successfully consume two domain offers and deletes them
+            // alice_ successfully consume two domain offers and deletes them
             // we compute path this time using `paths`
-            env(pay(alice, carol, EUR(5)), sendmax(XRP(5)), domain(domainID), paths(XRP));
+            env(pay(alice_, carol_, eur(5)), Sendmax(XRP(5)), Domain(domainID), Paths(XRP));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, bob, usdOfferSeq));
-            BEAST_EXPECT(!offerExists(env, bob, eurOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, usdOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, eurOfferSeq));
 
             // regular offer is not consumed
-            BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, USD(10), EUR(10)));
+            BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, USD(10), eur(10)));
         }
 
         // domain payment cannot consume offer from another domain
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // Fund devin and create USD trustline
@@ -664,7 +664,7 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
             auto const badCredType = "badCred";
@@ -679,28 +679,28 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env(credentials::accept(devin, badDomainOwner, badCredType));
 
             // devin creates a domain offer in another domain
-            env(offer(devin, XRP(10), USD(10)), domain(badDomainID));
+            env(offer(devin, XRP(10), USD(10)), Domain(badDomainID));
             env.close();
 
             // domain payment can't consume an offer from another domain
-            env(pay(alice, carol, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, USD(10)),
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
 
-            // bob creates an offer under the right domain
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            // bob_ creates an offer under the right domain
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
 
             // domain payment now consumes from the right domain
-            env(pay(alice, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(alice_, carol_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
         }
 
         // sanity check: devin, who is part of the domain but doesn't have a
@@ -708,10 +708,10 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // fund devin but don't create a USD trustline with gateway
@@ -727,14 +727,14 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
 
             // successful payment because offer is consumed
-            env(pay(devin, alice, USD(10)), sendmax(XRP(10)), domain(domainID));
+            env(pay(devin, alice_, USD(10)), Sendmax(XRP(10)), Domain(domainID));
             env.close();
         }
 
         // offer becomes unfunded when offer owner's cred expires
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // create devin account who is not part of the domain
@@ -743,7 +743,7 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close();
             env.trust(USD(1000), devin);
             env.close();
-            env(pay(gw, devin, USD(100)));
+            env(pay(gw_, devin, USD(100)));
             env.close();
 
             auto jv = credentials::create(devin, domainOwner, credType);
@@ -756,11 +756,11 @@ class PermissionedDEX_test : public beast::unit_test::suite
 
             // devin can still create offer while his cred is not expired
             auto const offerSeq{env.seq(devin)};
-            env(offer(devin, XRP(10), USD(10)), domain(domainID));
+            env(offer(devin, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
             // devin's offer can still be consumed while his cred isn't expired
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)), domain(domainID));
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)), Domain(domainID));
             env.close();
             BEAST_EXPECT(checkOffer(env, devin, offerSeq, XRP(5), USD(5), 0, true));
 
@@ -768,11 +768,11 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env.close(std::chrono::seconds(20));
 
             // devin's offer is unfunded now due to expired cred
-            env(pay(alice, carol, USD(5)),
-                path(~USD),
-                sendmax(XRP(5)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, USD(5)),
+                Path(~USD),
+                Sendmax(XRP(5)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
             BEAST_EXPECT(checkOffer(env, devin, offerSeq, XRP(5), USD(5), 0, true));
         }
@@ -780,30 +780,30 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // offer becomes unfunded when offer owner's cred is removed
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const offerSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const offerSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            // bob's offer can still be consumed while his cred exists
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)), domain(domainID));
+            // bob_'s offer can still be consumed while his cred exists
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, offerSeq, XRP(5), USD(5), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, offerSeq, XRP(5), USD(5), 0, true));
 
-            // remove bob's cred
-            env(credentials::deleteCred(domainOwner, bob, domainOwner, credType));
+            // remove bob_'s cred
+            env(credentials::deleteCred(domainOwner, bob_, domainOwner, credType));
             env.close();
 
-            // bob's offer is unfunded now due to expired cred
-            env(pay(alice, carol, USD(5)),
-                path(~USD),
-                sendmax(XRP(5)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            // bob_'s offer is unfunded now due to expired cred
+            env(pay(alice_, carol_, USD(5)),
+                Path(~USD),
+                Sendmax(XRP(5)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, offerSeq, XRP(5), USD(5), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, offerSeq, XRP(5), USD(5), 0, true));
         }
     }
 
@@ -816,34 +816,34 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // payment. If the domain wishes to control who is allowed to ripple
         // through, they should set the rippling individually
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
 
-        auto const EURA = alice["EUR"];
-        auto const EURB = bob["EUR"];
+        auto const eura = alice_["EUR"];
+        auto const eurb = bob_["EUR"];
 
-        env.trust(EURA(100), bob);
-        env.trust(EURB(100), carol);
+        env.trust(eura(100), bob_);
+        env.trust(eurb(100), carol_);
         env.close();
 
-        // remove bob from domain
-        env(credentials::deleteCred(domainOwner, bob, domainOwner, credType));
+        // remove bob_ from domain
+        env(credentials::deleteCred(domainOwner, bob_, domainOwner, credType));
         env.close();
 
-        // alice can still ripple through bob even though he's not part
+        // alice_ can still ripple through bob_ even though he's not part
         // of the domain, this is intentional
-        env(pay(alice, carol, EURB(10)), paths(EURA), domain(domainID));
+        env(pay(alice_, carol_, eurb(10)), Paths(eura), Domain(domainID));
         env.close();
-        env.require(balance(bob, EURA(10)), balance(carol, EURB(10)));
+        env.require(Balance(bob_, eura(10)), Balance(carol_, eurb(10)));
 
-        // carol sets no ripple on bob
-        env(trust(carol, bob["EUR"](0), bob, tfSetNoRipple));
+        // carol_ sets no ripple on bob_
+        env(trust(carol_, bob_["EUR"](0), bob_, tfSetNoRipple));
         env.close();
 
-        // payment no longer works because carol has no ripple on bob
-        env(pay(alice, carol, EURB(5)), paths(EURA), domain(domainID), ter(tecPATH_DRY));
+        // payment no longer works because carol_ has no ripple on bob_
+        env(pay(alice_, carol_, eurb(5)), Paths(eura), Domain(domainID), Ter(tecPATH_DRY));
         env.close();
-        env.require(balance(bob, EURA(10)), balance(carol, EURB(10)));
+        env.require(Balance(bob_, eura(10)), Balance(carol_, eurb(10)));
     }
 
     void
@@ -854,37 +854,37 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // whether the issuer is in the domain should NOT affect whether an
         // offer can be consumed in domain payment
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
 
         // create an xrp/usd offer with usd as takergets
-        auto const bobOffer1Seq{env.seq(bob)};
-        env(offer(bob, XRP(10), USD(10)), domain(domainID));
+        auto const bobOffer1Seq{env.seq(bob_)};
+        env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
         env.close();
 
         // create an usd/xrp offer with usd as takerpays
-        auto const bobOffer2Seq{env.seq(bob)};
-        env(offer(bob, USD(10), XRP(10)), domain(domainID), txflags(tfPassive));
+        auto const bobOffer2Seq{env.seq(bob_)};
+        env(offer(bob_, USD(10), XRP(10)), Domain(domainID), Txflags(tfPassive));
         env.close();
 
-        BEAST_EXPECT(checkOffer(env, bob, bobOffer1Seq, XRP(10), USD(10), 0, true));
-        BEAST_EXPECT(checkOffer(env, bob, bobOffer2Seq, USD(10), XRP(10), lsfPassive, true));
+        BEAST_EXPECT(checkOffer(env, bob_, bobOffer1Seq, XRP(10), USD(10), 0, true));
+        BEAST_EXPECT(checkOffer(env, bob_, bobOffer2Seq, USD(10), XRP(10), lsfPassive, true));
 
         // remove gateway from domain
-        env(credentials::deleteCred(domainOwner, gw, domainOwner, credType));
+        env(credentials::deleteCred(domainOwner, gw_, domainOwner, credType));
         env.close();
 
         // payment succeeds even if issuer is not in domain
         // xrp/usd offer is consumed
-        env(pay(alice, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+        env(pay(alice_, carol_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
         env.close();
-        BEAST_EXPECT(!offerExists(env, bob, bobOffer1Seq));
+        BEAST_EXPECT(!offerExists(env, bob_, bobOffer1Seq));
 
         // payment succeeds even if issuer is not in domain
         // usd/xrp offer is consumed
-        env(pay(alice, carol, XRP(10)), path(~XRP), sendmax(USD(10)), domain(domainID));
+        env(pay(alice_, carol_, XRP(10)), Path(~XRP), Sendmax(USD(10)), Domain(domainID));
         env.close();
-        BEAST_EXPECT(!offerExists(env, bob, bobOffer2Seq));
+        BEAST_EXPECT(!offerExists(env, bob_, bobOffer2Seq));
     }
 
     void
@@ -895,36 +895,36 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // checking that an unfunded offer will be implicitly removed by a
         // successful payment tx
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
 
-        auto const aliceOfferSeq{env.seq(alice)};
-        env(offer(alice, XRP(100), USD(100)), domain(domainID));
+        auto const aliceOfferSeq{env.seq(alice_)};
+        env(offer(alice_, XRP(100), USD(100)), Domain(domainID));
         env.close();
 
-        auto const bobOfferSeq{env.seq(bob)};
-        env(offer(bob, XRP(20), USD(20)), domain(domainID));
+        auto const bobOfferSeq{env.seq(bob_)};
+        env(offer(bob_, XRP(20), USD(20)), Domain(domainID));
         env.close();
 
-        BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(20), USD(20), 0, true));
-        BEAST_EXPECT(checkOffer(env, alice, aliceOfferSeq, XRP(100), USD(100), 0, true));
+        BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(20), USD(20), 0, true));
+        BEAST_EXPECT(checkOffer(env, alice_, aliceOfferSeq, XRP(100), USD(100), 0, true));
 
-        auto const domainDirKey = getDefaultOfferDirKey(env, bob, bobOfferSeq);
+        auto const domainDirKey = getDefaultOfferDirKey(env, bob_, bobOfferSeq);
         BEAST_EXPECT(domainDirKey);
         BEAST_EXPECT(checkDirectorySize(
             env, *domainDirKey, 2));  // NOLINT(bugprone-unchecked-optional-access)
 
-        // remove alice from domain and thus alice's offer becomes unfunded
-        env(credentials::deleteCred(domainOwner, alice, domainOwner, credType));
+        // remove alice_ from domain and thus alice_'s offer becomes unfunded
+        env(credentials::deleteCred(domainOwner, alice_, domainOwner, credType));
         env.close();
 
-        env(pay(gw, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+        env(pay(gw_, carol_, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
         env.close();
 
-        BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
+        BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
 
-        // alice's unfunded offer is removed implicitly
-        BEAST_EXPECT(!offerExists(env, alice, aliceOfferSeq));
+        // alice_'s unfunded offer is removed implicitly
+        BEAST_EXPECT(!offerExists(env, alice_, aliceOfferSeq));
         BEAST_EXPECT(checkDirectorySize(
             env, *domainDirKey, 1));  // NOLINT(bugprone-unchecked-optional-access)
     }
@@ -935,20 +935,20 @@ class PermissionedDEX_test : public beast::unit_test::suite
         testcase("AMM not used");
 
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
-        AMM const amm(env, alice, XRP(10), USD(50));
+        AMM const amm(env, alice_, XRP(10), USD(50));
 
         // a domain payment isn't able to consume AMM
-        env(pay(bob, carol, USD(5)),
-            path(~USD),
-            sendmax(XRP(5)),
-            domain(domainID),
-            ter(tecPATH_PARTIAL));
+        env(pay(bob_, carol_, USD(5)),
+            Path(~USD),
+            Sendmax(XRP(5)),
+            Domain(domainID),
+            Ter(tecPATH_PARTIAL));
         env.close();
 
         // a non domain payment can use AMM
-        env(pay(bob, carol, USD(5)), path(~USD), sendmax(XRP(5)));
+        env(pay(bob_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)));
         env.close();
 
         // USD amount in AMM is changed
@@ -964,126 +964,126 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // test preflight - invalid hybrid flag
         {
             Env env(*this, features - featurePermissionedDEX);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            env(offer(bob, XRP(10), USD(10)),
-                domain(domainID),
-                txflags(tfHybrid),
-                ter(temDISABLED));
+            env(offer(bob_, XRP(10), USD(10)),
+                Domain(domainID),
+                Txflags(tfHybrid),
+                Ter(temDISABLED));
             env.close();
 
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), ter(temINVALID_FLAG));
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Ter(temINVALID_FLAG));
             env.close();
 
             env.enableFeature(featurePermissionedDEX);
             env.close();
 
             // hybrid offer must have domainID
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), ter(temINVALID_FLAG));
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Ter(temINVALID_FLAG));
             env.close();
 
             // hybrid offer must have domainID
-            auto const offerSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            auto const offerSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, offerSeq, XRP(10), USD(10), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, offerSeq, XRP(10), USD(10), lsfHybrid, true));
         }
 
         // apply - domain offer can cross with hybrid
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
-            BEAST_EXPECT(offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, bob) == 3);
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
+            BEAST_EXPECT(offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, bob_) == 3);
 
-            auto const aliceOfferSeq{env.seq(alice)};
-            env(offer(alice, USD(10), XRP(10)), domain(domainID));
+            auto const aliceOfferSeq{env.seq(alice_)};
+            env(offer(alice_, USD(10), XRP(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, alice, aliceOfferSeq));
-            BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, alice) == 2);
+            BEAST_EXPECT(!offerExists(env, alice_, aliceOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, alice_) == 2);
         }
 
         // apply - open offer can cross with hybrid
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, bob) == 3);
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
+            BEAST_EXPECT(offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, bob_) == 3);
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
 
-            auto const aliceOfferSeq{env.seq(alice)};
-            env(offer(alice, USD(10), XRP(10)));
+            auto const aliceOfferSeq{env.seq(alice_)};
+            env(offer(alice_, USD(10), XRP(10)));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, alice, aliceOfferSeq));
-            BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, alice) == 2);
+            BEAST_EXPECT(!offerExists(env, alice_, aliceOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, alice_) == 2);
         }
 
         // apply - by default, hybrid offer tries to cross with offers in the
         // domain book
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, true));
-            BEAST_EXPECT(ownerCount(env, bob) == 3);
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(ownerCount(env, bob_) == 3);
 
             // hybrid offer auto crosses with domain offer
-            auto const aliceOfferSeq{env.seq(alice)};
-            env(offer(alice, USD(10), XRP(10)), domain(domainID), txflags(tfHybrid));
+            auto const aliceOfferSeq{env.seq(alice_)};
+            env(offer(alice_, USD(10), XRP(10)), Domain(domainID), Txflags(tfHybrid));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, alice, aliceOfferSeq));
-            BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(ownerCount(env, alice) == 2);
+            BEAST_EXPECT(!offerExists(env, alice_, aliceOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(ownerCount(env, alice_) == 2);
         }
 
         // apply - hybrid offer does not automatically cross with open offers
         // because by default, it only tries to cross domain offers
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const bobOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)));
+            auto const bobOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, false));
-            BEAST_EXPECT(ownerCount(env, bob) == 3);
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, false));
+            BEAST_EXPECT(ownerCount(env, bob_) == 3);
 
             // hybrid offer auto crosses with domain offer
-            auto const aliceOfferSeq{env.seq(alice)};
-            env(offer(alice, USD(10), XRP(10)), domain(domainID), txflags(tfHybrid));
+            auto const aliceOfferSeq{env.seq(alice_)};
+            env(offer(alice_, USD(10), XRP(10)), Domain(domainID), Txflags(tfHybrid));
             env.close();
 
-            BEAST_EXPECT(offerExists(env, alice, aliceOfferSeq));
-            BEAST_EXPECT(offerExists(env, bob, bobOfferSeq));
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), 0, false));
-            BEAST_EXPECT(checkOffer(env, alice, aliceOfferSeq, USD(10), XRP(10), lsfHybrid, true));
-            BEAST_EXPECT(ownerCount(env, alice) == 3);
+            BEAST_EXPECT(offerExists(env, alice_, aliceOfferSeq));
+            BEAST_EXPECT(offerExists(env, bob_, bobOfferSeq));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), 0, false));
+            BEAST_EXPECT(checkOffer(env, alice_, aliceOfferSeq, USD(10), XRP(10), lsfHybrid, true));
+            BEAST_EXPECT(ownerCount(env, alice_) == 3);
         }
     }
 
@@ -1092,45 +1092,45 @@ class PermissionedDEX_test : public beast::unit_test::suite
     {
         testcase("Hybrid invalid offer");
 
-        // bob has a hybrid offer and then he is removed from domain.
+        // bob_ has a hybrid offer and then he is removed from domain.
         // in this case, the hybrid offer will be considered as unfunded even in
         // a regular payment
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
 
-        auto const hybridOfferSeq{env.seq(bob)};
-        env(offer(bob, XRP(50), USD(50)), txflags(tfHybrid), domain(domainID));
+        auto const hybridOfferSeq{env.seq(bob_)};
+        env(offer(bob_, XRP(50), USD(50)), Txflags(tfHybrid), Domain(domainID));
         env.close();
 
-        // remove bob from domain
-        env(credentials::deleteCred(domainOwner, bob, domainOwner, credType));
+        // remove bob_ from domain
+        env(credentials::deleteCred(domainOwner, bob_, domainOwner, credType));
         env.close();
 
-        // bob's hybrid offer is unfunded and can not be consumed in a domain
+        // bob_'s hybrid offer is unfunded and can not be consumed in a domain
         // payment
-        env(pay(alice, carol, USD(5)),
-            path(~USD),
-            sendmax(XRP(5)),
-            domain(domainID),
-            ter(tecPATH_PARTIAL));
+        env(pay(alice_, carol_, USD(5)),
+            Path(~USD),
+            Sendmax(XRP(5)),
+            Domain(domainID),
+            Ter(tecPATH_PARTIAL));
         env.close();
-        BEAST_EXPECT(checkOffer(env, bob, hybridOfferSeq, XRP(50), USD(50), lsfHybrid, true));
+        BEAST_EXPECT(checkOffer(env, bob_, hybridOfferSeq, XRP(50), USD(50), lsfHybrid, true));
 
-        // bob's unfunded hybrid offer can't be consumed even with a regular
+        // bob_'s unfunded hybrid offer can't be consumed even with a regular
         // payment
-        env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)), ter(tecPATH_PARTIAL));
+        env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)), Ter(tecPATH_PARTIAL));
         env.close();
-        BEAST_EXPECT(checkOffer(env, bob, hybridOfferSeq, XRP(50), USD(50), lsfHybrid, true));
+        BEAST_EXPECT(checkOffer(env, bob_, hybridOfferSeq, XRP(50), USD(50), lsfHybrid, true));
 
         // create a regular offer
-        auto const regularOfferSeq{env.seq(bob)};
-        env(offer(bob, XRP(10), USD(10)));
+        auto const regularOfferSeq{env.seq(bob_)};
+        env(offer(bob_, XRP(10), USD(10)));
         env.close();
-        BEAST_EXPECT(offerExists(env, bob, regularOfferSeq));
-        BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, XRP(10), USD(10)));
+        BEAST_EXPECT(offerExists(env, bob_, regularOfferSeq));
+        BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, XRP(10), USD(10)));
 
-        auto const sleHybridOffer = env.le(keylet::offer(bob.id(), hybridOfferSeq));
+        auto const sleHybridOffer = env.le(keylet::offer(bob_.id(), hybridOfferSeq));
         BEAST_EXPECT(sleHybridOffer);
         auto const openDir =
             sleHybridOffer->getFieldArray(sfAdditionalBooks)[0].getFieldH256(sfBookDirectory);
@@ -1138,11 +1138,11 @@ class PermissionedDEX_test : public beast::unit_test::suite
 
         // this normal payment should consume the regular offer and remove the
         // unfunded hybrid offer
-        env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)));
+        env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)));
         env.close();
 
-        BEAST_EXPECT(!offerExists(env, bob, hybridOfferSeq));
-        BEAST_EXPECT(checkOffer(env, bob, regularOfferSeq, XRP(5), USD(5)));
+        BEAST_EXPECT(!offerExists(env, bob_, hybridOfferSeq));
+        BEAST_EXPECT(checkOffer(env, bob_, regularOfferSeq, XRP(5), USD(5)));
         BEAST_EXPECT(checkDirectorySize(env, openDir, 1));
     }
 
@@ -1154,29 +1154,29 @@ class PermissionedDEX_test : public beast::unit_test::suite
         // both non domain and domain payments can consume hybrid offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const hybridOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            auto const hybridOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
 
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)), domain(domainID));
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, hybridOfferSeq, XRP(5), USD(5), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, hybridOfferSeq, XRP(5), USD(5), lsfHybrid, true));
 
-            // hybrid offer can't be consumed since bob is not in domain anymore
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)));
+            // hybrid offer can't be consumed since bob_ is not in domain anymore
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, bob, hybridOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, hybridOfferSeq));
         }
 
         // someone from another domain can't cross hybrid if they specified
         // wrong domainID
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
             // Fund accounts
@@ -1197,110 +1197,110 @@ class PermissionedDEX_test : public beast::unit_test::suite
             env(credentials::accept(devin, badDomainOwner, badCredType));
             env.close();
 
-            auto const hybridOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            auto const hybridOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
 
             // other domains can't consume the offer
             env(pay(devin, badDomainOwner, USD(5)),
-                path(~USD),
-                sendmax(XRP(5)),
-                domain(badDomainID),
-                ter(tecPATH_DRY));
+                Path(~USD),
+                Sendmax(XRP(5)),
+                Domain(badDomainID),
+                Ter(tecPATH_DRY));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, hybridOfferSeq, XRP(10), USD(10), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, hybridOfferSeq, XRP(10), USD(10), lsfHybrid, true));
 
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)), domain(domainID));
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)), Domain(domainID));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, hybridOfferSeq, XRP(5), USD(5), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, hybridOfferSeq, XRP(5), USD(5), lsfHybrid, true));
 
-            // hybrid offer can't be consumed since bob is not in domain anymore
-            env(pay(alice, carol, USD(5)), path(~USD), sendmax(XRP(5)));
+            // hybrid offer can't be consumed since bob_ is not in domain anymore
+            env(pay(alice_, carol_, USD(5)), Path(~USD), Sendmax(XRP(5)));
             env.close();
 
-            BEAST_EXPECT(!offerExists(env, bob, hybridOfferSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, hybridOfferSeq));
         }
 
         // test domain payment consuming two offers w/ hybrid offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(1000), alice);
+            auto const eur = gw_["EUR"];
+            env.trust(eur(1000), alice_);
             env.close();
-            env.trust(EUR(1000), bob);
+            env.trust(eur(1000), bob_);
             env.close();
-            env.trust(EUR(1000), carol);
+            env.trust(eur(1000), carol_);
             env.close();
-            env(pay(gw, bob, EUR(100)));
+            env(pay(gw_, bob_, eur(100)));
             env.close();
 
-            auto const usdOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)), domain(domainID));
+            auto const usdOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(10), USD(10), 0, true));
 
             // payment fail because there isn't eur offer
-            env(pay(alice, carol, EUR(5)),
-                path(~USD, ~EUR),
-                sendmax(XRP(5)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+            env(pay(alice_, carol_, eur(5)),
+                Path(~USD, ~eur),
+                Sendmax(XRP(5)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(10), USD(10), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(10), USD(10), 0, true));
 
-            // bob creates a hybrid eur offer
-            auto const eurOfferSeq{env.seq(bob)};
-            env(offer(bob, USD(10), EUR(10)), domain(domainID), txflags(tfHybrid));
+            // bob_ creates a hybrid eur offer
+            auto const eurOfferSeq{env.seq(bob_)};
+            env(offer(bob_, USD(10), eur(10)), Domain(domainID), Txflags(tfHybrid));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(10), EUR(10), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(10), eur(10), lsfHybrid, true));
 
-            // alice successfully consume two domain offers: xrp/usd and usd/eur
-            env(pay(alice, carol, EUR(5)), path(~USD, ~EUR), sendmax(XRP(5)), domain(domainID));
+            // alice_ successfully consume two domain offers: xrp/usd and usd/eur
+            env(pay(alice_, carol_, eur(5)), Path(~USD, ~eur), Sendmax(XRP(5)), Domain(domainID));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(5), USD(5), 0, true));
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(5), EUR(5), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(5), USD(5), 0, true));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(5), eur(5), lsfHybrid, true));
         }
 
         // test regular payment using a regular offer and a hybrid offer
         {
             Env env(*this, features);
-            auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+            auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
                 PermissionedDEX(env);
 
-            auto const EUR = gw["EUR"];
-            env.trust(EUR(1000), alice);
+            auto const eur = gw_["EUR"];
+            env.trust(eur(1000), alice_);
             env.close();
-            env.trust(EUR(1000), bob);
+            env.trust(eur(1000), bob_);
             env.close();
-            env.trust(EUR(1000), carol);
+            env.trust(eur(1000), carol_);
             env.close();
-            env(pay(gw, bob, EUR(100)));
+            env(pay(gw_, bob_, eur(100)));
             env.close();
 
-            // bob creates a regular usd offer
-            auto const usdOfferSeq{env.seq(bob)};
-            env(offer(bob, XRP(10), USD(10)));
+            // bob_ creates a regular usd offer
+            auto const usdOfferSeq{env.seq(bob_)};
+            env(offer(bob_, XRP(10), USD(10)));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(10), USD(10), 0, false));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(10), USD(10), 0, false));
 
-            // bob creates a hybrid eur offer
-            auto const eurOfferSeq{env.seq(bob)};
-            env(offer(bob, USD(10), EUR(10)), domain(domainID), txflags(tfHybrid));
+            // bob_ creates a hybrid eur offer
+            auto const eurOfferSeq{env.seq(bob_)};
+            env(offer(bob_, USD(10), eur(10)), Domain(domainID), Txflags(tfHybrid));
             env.close();
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(10), EUR(10), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(10), eur(10), lsfHybrid, true));
 
-            // alice successfully consume two offers: xrp/usd and usd/eur
-            env(pay(alice, carol, EUR(5)), path(~USD, ~EUR), sendmax(XRP(5)));
+            // alice_ successfully consume two offers: xrp/usd and usd/eur
+            env(pay(alice_, carol_, eur(5)), Path(~USD, ~eur), Sendmax(XRP(5)));
             env.close();
 
-            BEAST_EXPECT(checkOffer(env, bob, usdOfferSeq, XRP(5), USD(5), 0, false));
-            BEAST_EXPECT(checkOffer(env, bob, eurOfferSeq, USD(5), EUR(5), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, usdOfferSeq, XRP(5), USD(5), 0, false));
+            BEAST_EXPECT(checkOffer(env, bob_, eurOfferSeq, USD(5), eur(5), lsfHybrid, true));
         }
     }
 
@@ -1308,7 +1308,7 @@ class PermissionedDEX_test : public beast::unit_test::suite
     testHybridOfferDirectories(FeatureBitset features)
     {
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
 
         std::vector<std::uint32_t> offerSeqs;
@@ -1324,12 +1324,12 @@ class PermissionedDEX_test : public beast::unit_test::suite
 
         for (size_t i = 1; i <= dirCnt; i++)
         {
-            auto const bobOfferSeq{env.seq(bob)};
+            auto const bobOfferSeq{env.seq(bob_)};
             offerSeqs.emplace_back(bobOfferSeq);
-            env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+            env(offer(bob_, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
             env.close();
 
-            auto const sleOffer = env.le(keylet::offer(bob.id(), bobOfferSeq));
+            auto const sleOffer = env.le(keylet::offer(bob_.id(), bobOfferSeq));
             BEAST_EXPECT(sleOffer);
             BEAST_EXPECT(sleOffer->getFieldH256(sfBookDirectory) == domainDir);
             BEAST_EXPECT(sleOffer->getFieldArray(sfAdditionalBooks).size() == 1);
@@ -1337,17 +1337,17 @@ class PermissionedDEX_test : public beast::unit_test::suite
                 sleOffer->getFieldArray(sfAdditionalBooks)[0].getFieldH256(sfBookDirectory) ==
                 openDir);
 
-            BEAST_EXPECT(checkOffer(env, bob, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
+            BEAST_EXPECT(checkOffer(env, bob_, bobOfferSeq, XRP(10), USD(10), lsfHybrid, true));
             BEAST_EXPECT(checkDirectorySize(env, domainDir, i));
             BEAST_EXPECT(checkDirectorySize(env, openDir, i));
         }
 
         for (auto const offerSeq : offerSeqs)
         {
-            env(offer_cancel(bob, offerSeq));
+            env(offerCancel(bob_, offerSeq));
             env.close();
             dirCnt--;
-            BEAST_EXPECT(!offerExists(env, bob, offerSeq));
+            BEAST_EXPECT(!offerExists(env, bob_, offerSeq));
             BEAST_EXPECT(checkDirectorySize(env, domainDir, dirCnt));
             BEAST_EXPECT(checkDirectorySize(env, openDir, dirCnt));
         }
@@ -1359,34 +1359,34 @@ class PermissionedDEX_test : public beast::unit_test::suite
         testcase("Auto bridge");
 
         Env env(*this, features);
-        auto const& [gw, domainOwner, alice, bob, carol, USD, domainID, credType] =
+        auto const& [gw_, domainOwner, alice_, bob_, carol_, USD, domainID, credType] =
             PermissionedDEX(env);
-        auto const EUR = gw["EUR"];
+        auto const eur = gw_["EUR"];
 
-        for (auto const& account : {alice, bob, carol})
+        for (auto const& account : {alice_, bob_, carol_})
         {
-            env(trust(account, EUR(10000)));
+            env(trust(account, eur(10000)));
             env.close();
         }
 
-        env(pay(gw, carol, EUR(1)));
+        env(pay(gw_, carol_, eur(1)));
         env.close();
 
-        auto const aliceOfferSeq{env.seq(alice)};
-        auto const bobOfferSeq{env.seq(bob)};
-        env(offer(alice, XRP(100), USD(1)), domain(domainID));
-        env(offer(bob, EUR(1), XRP(100)), domain(domainID));
+        auto const aliceOfferSeq{env.seq(alice_)};
+        auto const bobOfferSeq{env.seq(bob_)};
+        env(offer(alice_, XRP(100), USD(1)), Domain(domainID));
+        env(offer(bob_, eur(1), XRP(100)), Domain(domainID));
         env.close();
 
-        // carol's offer should cross bob and alice's offers due to auto
+        // carol_'s offer should cross bob_ and alice_'s offers due to auto
         // bridging
-        auto const carolOfferSeq{env.seq(carol)};
-        env(offer(carol, USD(1), EUR(1)), domain(domainID));
+        auto const carolOfferSeq{env.seq(carol_)};
+        env(offer(carol_, USD(1), eur(1)), Domain(domainID));
         env.close();
 
-        BEAST_EXPECT(!offerExists(env, bob, aliceOfferSeq));
-        BEAST_EXPECT(!offerExists(env, bob, bobOfferSeq));
-        BEAST_EXPECT(!offerExists(env, bob, carolOfferSeq));
+        BEAST_EXPECT(!offerExists(env, bob_, aliceOfferSeq));
+        BEAST_EXPECT(!offerExists(env, bob_, bobOfferSeq));
+        BEAST_EXPECT(!offerExists(env, bob_, carolOfferSeq));
     }
 
     void
@@ -1419,7 +1419,7 @@ class PermissionedDEX_test : public beast::unit_test::suite
 
         // Create a valid hybrid offer (sfAdditionalBooks has exactly 1 entry)
         auto const bobOfferSeq{env.seq(bob)};
-        env(offer(bob, XRP(10), USD(10)), txflags(tfHybrid), domain(domainID));
+        env(offer(bob, XRP(10), USD(10)), Txflags(tfHybrid), Domain(domainID));
         env.close();
         BEAST_EXPECT(offerExists(env, bob, bobOfferSeq));
 
@@ -1442,17 +1442,17 @@ class PermissionedDEX_test : public beast::unit_test::suite
             // post-fixSecurity3_1_3: offerInDomain rejects the malformed
             // offer (size == 0), so no valid domain offer is found.
             env(pay(alice, carol, USD(10)),
-                path(~USD),
-                sendmax(XRP(10)),
-                domain(domainID),
-                ter(tecPATH_PARTIAL));
+                Path(~USD),
+                Sendmax(XRP(10)),
+                Domain(domainID),
+                Ter(tecPATH_PARTIAL));
         }
         else
         {
             // pre-fixSecurity3_1_3: offerInDomain only checks for a missing
             // sfAdditionalBooks field; size == 0 passes through, so the
             // malformed offer is crossed and the payment succeeds.
-            env(pay(alice, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+            env(pay(alice, carol, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
         }
     }
 
@@ -1460,7 +1460,7 @@ public:
     void
     run() override
     {
-        FeatureBitset const all{jtx::testable_amendments()};
+        FeatureBitset const all{jtx::testableAmendments()};
 
         // Test domain offer (w/o hybrid)
         testOfferCreate(all);
diff --git a/src/test/app/PermissionedDomains_test.cpp b/src/test/app/PermissionedDomains_test.cpp
index f94fc53f71..a49f913861 100644
--- a/src/test/app/PermissionedDomains_test.cpp
+++ b/src/test/app/PermissionedDomains_test.cpp
@@ -34,11 +34,11 @@ namespace xrpl::test {
 using namespace jtx;
 
 static std::string
-exceptionExpected(Env& env, Json::Value const& jv)
+exceptionExpected(Env& env, json::Value const& jv)
 {
     try
     {
-        env(jv, ter(temMALFORMED));
+        env(jv, Ter(temMALFORMED));
     }
     catch (std::exception const& ex)
     {
@@ -47,15 +47,15 @@ exceptionExpected(Env& env, Json::Value const& jv)
     return {};
 }
 
-class PermissionedDomains_test : public beast::unit_test::suite
+class PermissionedDomains_test : public beast::unit_test::Suite
 {
-    FeatureBitset withoutFeature_{testable_amendments() - featurePermissionedDomains};
+    FeatureBitset withoutFeature_{testableAmendments() - featurePermissionedDomains};
     FeatureBitset withFeature_{
-        testable_amendments()  //
+        testableAmendments()  //
         | featurePermissionedDomains | featureCredentials};
 
     FeatureBitset withFix_{
-        testable_amendments()  //
+        testableAmendments()  //
         | featurePermissionedDomains | featureCredentials};
 
     // Verify that each tx type can execute if the feature is enabled.
@@ -81,7 +81,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
     void
     testCredentialsDisabled()
     {
-        auto amendments = testable_amendments();
+        auto amendments = testableAmendments();
         amendments.set(featurePermissionedDomains);
         amendments.reset(featureCredentials);
         testcase("Credentials disabled");
@@ -89,7 +89,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
         Env env(*this, amendments);
         env.fund(XRP(1000), alice);
         pdomain::Credentials const credentials{{alice, "first credential"}};
-        env(pdomain::setTx(alice, credentials), ter(temDISABLED));
+        env(pdomain::setTx(alice, credentials), Ter(temDISABLED));
     }
 
     // Verify that each tx does not execute if feature is disabled
@@ -101,8 +101,8 @@ class PermissionedDomains_test : public beast::unit_test::suite
         Env env(*this, withoutFeature_);
         env.fund(XRP(1000), alice);
         pdomain::Credentials const credentials{{alice, "first credential"}};
-        env(pdomain::setTx(alice, credentials), ter(temDISABLED));
-        env(pdomain::deleteTx(alice, uint256(75)), ter(temDISABLED));
+        env(pdomain::setTx(alice, credentials), Ter(temDISABLED));
+        env(pdomain::deleteTx(alice, uint256(75)), Ter(temDISABLED));
     }
 
     // Verify that bad inputs fail for each of create new and update
@@ -124,7 +124,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
         auto const setFee(drops(env.current()->fees().increment));
 
         // Test empty credentials.
-        env(pdomain::setTx(account, pdomain::Credentials(), domain), ter(temARRAY_EMPTY));
+        env(pdomain::setTx(account, pdomain::Credentials(), domain), Ter(temARRAY_EMPTY));
 
         // Test 11 credentials.
         pdomain::Credentials const credentials11{
@@ -139,8 +139,8 @@ class PermissionedDomains_test : public beast::unit_test::suite
             {alice10, "credential9"},
             {alice11, "credential10"},
             {alice12, "credential11"}};
-        BEAST_EXPECT(credentials11.size() == maxPermissionedDomainCredentialsArraySize + 1);
-        env(pdomain::setTx(account, credentials11, domain), ter(temARRAY_TOO_LARGE));
+        BEAST_EXPECT(credentials11.size() == kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE + 1);
+        env(pdomain::setTx(account, credentials11, domain), Ter(temARRAY_TOO_LARGE));
 
         // Test credentials including non-existent issuer.
         Account const nobody("nobody");
@@ -152,10 +152,10 @@ class PermissionedDomains_test : public beast::unit_test::suite
             {alice5, "credential5"},
             {alice6, "credential6"},
             {alice7, "credential7"}};
-        env(pdomain::setTx(account, credentialsNon, domain), ter(tecNO_ISSUER));
+        env(pdomain::setTx(account, credentialsNon, domain), Ter(tecNO_ISSUER));
 
         // Test bad fee
-        env(pdomain::setTx(account, credentials11, domain), fee(1, true), ter(temBAD_FEE));
+        env(pdomain::setTx(account, credentials11, domain), Fee(1, true), Ter(temBAD_FEE));
 
         pdomain::Credentials const credentials4{
             {alice2, "credential1"},
@@ -173,15 +173,15 @@ class PermissionedDomains_test : public beast::unit_test::suite
         // Make an empty CredentialType.
         txJsonMutable["AcceptedCredentials"][2u] = credentialOrig;
         txJsonMutable["AcceptedCredentials"][2u][jss::Credential]["CredentialType"] = "";
-        env(txJsonMutable, ter(temMALFORMED));
+        env(txJsonMutable, Ter(temMALFORMED));
 
         // Make too long CredentialType.
-        constexpr std::string_view longCredentialType =
+        constexpr std::string_view kLONG_CREDENTIAL_TYPE =
             "Cred0123456789012345678901234567890123456789012345678901234567890";
-        static_assert(longCredentialType.size() == maxCredentialTypeLength + 1);
+        static_assert(kLONG_CREDENTIAL_TYPE.size() == kMAX_CREDENTIAL_TYPE_LENGTH + 1);
         txJsonMutable["AcceptedCredentials"][2u] = credentialOrig;
         txJsonMutable["AcceptedCredentials"][2u][jss::Credential]["CredentialType"] =
-            std::string(longCredentialType);
+            std::string(kLONG_CREDENTIAL_TYPE);
         BEAST_EXPECT(exceptionExpected(env, txJsonMutable).starts_with("invalidParams"));
 
         // Remove Credentialtype from a credential and apply.
@@ -209,7 +209,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
 
             auto const sorted = pdomain::sortCredentials(credentialsDup);
             BEAST_EXPECT(sorted.size() == 4);
-            env(pdomain::setTx(account, credentialsDup, domain), ter(temMALFORMED));
+            env(pdomain::setTx(account, credentialsDup, domain), Ter(temMALFORMED));
 
             env.close();
             env(pdomain::setTx(account, sorted, domain));
@@ -270,7 +270,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
     {
         testcase("Set");
         Env env(*this, features);
-        env.set_parse_failure_expected(true);
+        env.setParseFailureExpected(true);
 
         int const accNum = 12;
         Account const alice[accNum] = {
@@ -298,7 +298,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
         {
             env(pdomain::setTx(alice[0], credentials1));
             BEAST_EXPECT(env.ownerCount(alice[0]) == 1);
-            auto tx = env.tx()->getJson(JsonOptions::none);
+            auto tx = env.tx()->getJson(JsonOptions::KNone);
             BEAST_EXPECT(tx[jss::TransactionType] == "PermissionedDomainSet");
             BEAST_EXPECT(tx["Account"] == alice[0].human());
             auto objects = pdomain::getObjects(alice[0], env);
@@ -313,18 +313,19 @@ class PermissionedDomains_test : public beast::unit_test::suite
 
         // Make longest possible CredentialType.
         {
-            constexpr std::string_view longCredentialType =
+            constexpr std::string_view kLONG_CREDENTIAL_TYPE =
                 "Cred0123456789012345678901234567890123456789012345678901234567"
                 "89";
-            static_assert(longCredentialType.size() == maxCredentialTypeLength);
-            pdomain::Credentials const longCredentials{{alice[1], std::string(longCredentialType)}};
+            static_assert(kLONG_CREDENTIAL_TYPE.size() == kMAX_CREDENTIAL_TYPE_LENGTH);
+            pdomain::Credentials const longCredentials{
+                {alice[1], std::string(kLONG_CREDENTIAL_TYPE)}};
 
             env(pdomain::setTx(alice[0], longCredentials));
 
             // One account can create multiple domains
             BEAST_EXPECT(env.ownerCount(alice[0]) == 2);
 
-            auto tx = env.tx()->getJson(JsonOptions::none);
+            auto tx = env.tx()->getJson(JsonOptions::KNone);
             BEAST_EXPECT(tx[jss::TransactionType] == "PermissionedDomainSet");
             BEAST_EXPECT(tx["Account"] == alice[0].human());
 
@@ -361,10 +362,10 @@ class PermissionedDomains_test : public beast::unit_test::suite
         };
         uint256 domain2;
         {
-            BEAST_EXPECT(credentials10.size() == maxPermissionedDomainCredentialsArraySize);
+            BEAST_EXPECT(credentials10.size() == kMAX_PERMISSIONED_DOMAIN_CREDENTIALS_ARRAY_SIZE);
             BEAST_EXPECT(credentials10 != pdomain::sortCredentials(credentials10));
             env(pdomain::setTx(alice[0], credentials10));
-            auto tx = env.tx()->getJson(JsonOptions::none);
+            auto tx = env.tx()->getJson(JsonOptions::KNone);
             domain2 = pdomain::getNewDomain(env.meta());
             auto objects = pdomain::getObjects(alice[0], env);
             auto object = objects[domain2];
@@ -387,16 +388,16 @@ class PermissionedDomains_test : public beast::unit_test::suite
             pdomain::sortCredentials(credentials10));
 
         // Update from the wrong owner.
-        env(pdomain::setTx(alice[2], credentials1, domain2), ter(tecNO_PERMISSION));
+        env(pdomain::setTx(alice[2], credentials1, domain2), Ter(tecNO_PERMISSION));
 
         // Update a uint256(0) domain
-        env(pdomain::setTx(alice[0], credentials1, uint256(0)), ter(temMALFORMED));
+        env(pdomain::setTx(alice[0], credentials1, uint256(0)), Ter(temMALFORMED));
 
         // Update non-existent domain
-        env(pdomain::setTx(alice[0], credentials1, uint256(75)), ter(tecNO_ENTRY));
+        env(pdomain::setTx(alice[0], credentials1, uint256(75)), Ter(tecNO_ENTRY));
 
         // Wrong flag
-        env(pdomain::setTx(alice[0], credentials1), txflags(tfClawTwoAssets), ter(temINVALID_FLAG));
+        env(pdomain::setTx(alice[0], credentials1), Txflags(tfClawTwoAssets), Ter(temINVALID_FLAG));
 
         // Test bad data when creating a domain.
         testBadData(alice[0], env);
@@ -405,13 +406,13 @@ 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 deleteDelta = 255;
+        constexpr std::size_t kDELETE_DELTA = 255;
         {
             // Close enough ledgers to make it potentially deletable if empty.
             std::size_t const ownerSeq = env.seq(alice[0]);
-            while (deleteDelta + ownerSeq > env.current()->seq())
+            while (kDELETE_DELTA + ownerSeq > env.current()->seq())
                 env.close();
-            env(acctdelete(alice[0], alice[2]), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+            env(acctdelete(alice[0], alice[2]), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         }
 
         {
@@ -420,9 +421,9 @@ 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 (deleteDelta + ownerSeq > env.current()->seq())
+            while (kDELETE_DELTA + ownerSeq > env.current()->seq())
                 env.close();
-            env(acctdelete(alice[0], alice[2]), fee(acctDelFee));
+            env(acctdelete(alice[0], alice[2]), Fee(acctDelFee));
         }
     }
 
@@ -448,19 +449,19 @@ class PermissionedDomains_test : public beast::unit_test::suite
         // Delete a domain that doesn't belong to the account.
         Account const bob("bob");
         env.fund(XRP(1000), bob);
-        env(pdomain::deleteTx(bob, domain), ter(tecNO_PERMISSION));
+        env(pdomain::deleteTx(bob, domain), Ter(tecNO_PERMISSION));
 
         // Delete a non-existent domain.
-        env(pdomain::deleteTx(alice, uint256(75)), ter(tecNO_ENTRY));
+        env(pdomain::deleteTx(alice, uint256(75)), Ter(tecNO_ENTRY));
 
         // Test bad fee
-        env(pdomain::deleteTx(alice, uint256(75)), ter(temBAD_FEE), fee(1, true));
+        env(pdomain::deleteTx(alice, uint256(75)), Ter(temBAD_FEE), Fee(1, true));
 
         // Wrong flag
-        env(pdomain::deleteTx(alice, domain), ter(temINVALID_FLAG), txflags(tfClawTwoAssets));
+        env(pdomain::deleteTx(alice, domain), Ter(temINVALID_FLAG), Txflags(tfClawTwoAssets));
 
         // Delete a zero domain.
-        env(pdomain::deleteTx(alice, uint256(0)), ter(temMALFORMED));
+        env(pdomain::deleteTx(alice, uint256(0)), Ter(temMALFORMED));
 
         // Make sure owner count reflects the existing domain.
         BEAST_EXPECT(env.ownerCount(alice) == 1);
@@ -469,7 +470,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
 
         // Delete domain that belongs to user.
         env(pdomain::deleteTx(alice, domain));
-        auto const tx = env.tx()->getJson(JsonOptions::none);
+        auto const tx = env.tx()->getJson(JsonOptions::KNone);
         BEAST_EXPECT(tx[jss::TransactionType] == "PermissionedDomainDelete");
 
         // Make sure the owner count goes back to 0.
@@ -502,7 +503,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
 
         // alice does not have enough XRP to cover the reserve.
         pdomain::Credentials const credentials{{alice, "first credential"}};
-        env(pdomain::setTx(alice, credentials), ter(tecINSUFFICIENT_RESERVE));
+        env(pdomain::setTx(alice, credentials), Ter(tecINSUFFICIENT_RESERVE));
         BEAST_EXPECT(env.ownerCount(alice) == 0);
         BEAST_EXPECT(pdomain::getObjects(alice, env).empty());
         env.close();
@@ -515,7 +516,7 @@ class PermissionedDomains_test : public beast::unit_test::suite
         env.close();
 
         // alice still does not have enough XRP for the reserve.
-        env(pdomain::setTx(alice, credentials), ter(tecINSUFFICIENT_RESERVE));
+        env(pdomain::setTx(alice, credentials), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
         BEAST_EXPECT(env.ownerCount(alice) == 0);
 
diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp
index 22c0cff075..9f65daad18 100644
--- a/src/test/app/PseudoTx_test.cpp
+++ b/src/test/app/PseudoTx_test.cpp
@@ -20,7 +20,7 @@
 
 namespace xrpl::test {
 
-struct PseudoTx_test : public beast::unit_test::suite
+struct PseudoTx_test : public beast::unit_test::Suite
 {
     static std::vector<STTx>
     getPseudoTxs(Rules const& rules, std::uint32_t seq)
@@ -82,7 +82,7 @@ struct PseudoTx_test : public beast::unit_test::suite
             BEAST_EXPECT(!passesLocalChecks(stx, reason));
             BEAST_EXPECT(reason == "Cannot submit pseudo transactions.");
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                auto const result = xrpl::apply(env.app(), view, stx, tapNONE, j);
+                auto const result = xrpl::apply(env.app(), view, stx, TapNone, j);
                 BEAST_EXPECT(!result.applied && result.ter == temINVALID);
                 return result.applied;
             });
@@ -104,7 +104,7 @@ struct PseudoTx_test : public beast::unit_test::suite
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         FeatureBitset const xrpFees{featureXRPFees};
 
         testPrevented(all - featureXRPFees);
diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp
index 14b9979e07..6b3ea8cdbe 100644
--- a/src/test/app/RCLValidations_test.cpp
+++ b/src/test/app/RCLValidations_test.cpp
@@ -21,13 +21,13 @@
 
 namespace xrpl::test {
 
-class RCLValidations_test : public beast::unit_test::suite
+class RCLValidations_test : public beast::unit_test::Suite
 {
     void
     testChangeTrusted()
     {
         testcase("Change validation trusted status");
-        auto keys = randomKeyPair(KeyType::secp256k1);
+        auto keys = randomKeyPair(KeyType::Secp256k1);
         auto v = std::make_shared<STValidation>(
             xrpl::NetClock::time_point{},
             keys.first,
@@ -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>(
-            create_genesis,
+            kCREATE_GENESIS,
             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>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -253,37 +253,37 @@ class RCLValidations_test : public beast::unit_test::suite
 
         // First, create the single branch trie, with ledgers
         // separated by exactly 256 ledgers
-        auto ledg_002 = RCLValidatedLedger{history[1], j};
-        auto ledg_258 = RCLValidatedLedger{history[257], j};
-        auto ledg_259 = RCLValidatedLedger{history[258], j};
+        auto ledg002 = RCLValidatedLedger{history[1], j};
+        auto ledg258 = RCLValidatedLedger{history[257], j};
+        auto ledg259 = RCLValidatedLedger{history[258], j};
 
-        trie.insert(ledg_002);
-        trie.insert(ledg_258, 4);
+        trie.insert(ledg002);
+        trie.insert(ledg258, 4);
         // trie.dump(std::cout);
         // 000000[0,1)(T:0,B:5)
         //                     |-AB868A..36C8[1,3)(T:1,B:5)
         //                                                 |-AB868A..37C8[3,259)(T:4,B:4)
-        BEAST_EXPECT(trie.tipSupport(ledg_002) == 1);
-        BEAST_EXPECT(trie.branchSupport(ledg_002) == 5);
-        BEAST_EXPECT(trie.tipSupport(ledg_258) == 4);
-        BEAST_EXPECT(trie.branchSupport(ledg_258) == 4);
+        BEAST_EXPECT(trie.tipSupport(ledg002) == 1);
+        BEAST_EXPECT(trie.branchSupport(ledg002) == 5);
+        BEAST_EXPECT(trie.tipSupport(ledg258) == 4);
+        BEAST_EXPECT(trie.branchSupport(ledg258) == 4);
 
         // Move three of the s258 ledgers to s259, which splits the trie
         // due to the 256 ancestry limit
-        BEAST_EXPECT(trie.remove(ledg_258, 3));
-        trie.insert(ledg_259, 3);
+        BEAST_EXPECT(trie.remove(ledg258, 3));
+        trie.insert(ledg259, 3);
         [[maybe_unused]] auto unused1 = trie.getPreferred(1);
         // trie.dump(std::cout);
         // 000000[0,1)(T:0,B:5)
         //                     |-AB868A..37C9[1,260)(T:3,B:3)
         //                     |-AB868A..36C8[1,3)(T:1,B:2)
         //                                                 |-AB868A..37C8[3,259)(T:1,B:1)
-        BEAST_EXPECT(trie.tipSupport(ledg_002) == 1);
-        BEAST_EXPECT(trie.branchSupport(ledg_002) == 2);
-        BEAST_EXPECT(trie.tipSupport(ledg_258) == 1);
-        BEAST_EXPECT(trie.branchSupport(ledg_258) == 1);
-        BEAST_EXPECT(trie.tipSupport(ledg_259) == 3);
-        BEAST_EXPECT(trie.branchSupport(ledg_259) == 3);
+        BEAST_EXPECT(trie.tipSupport(ledg002) == 1);
+        BEAST_EXPECT(trie.branchSupport(ledg002) == 2);
+        BEAST_EXPECT(trie.tipSupport(ledg258) == 1);
+        BEAST_EXPECT(trie.branchSupport(ledg258) == 1);
+        BEAST_EXPECT(trie.tipSupport(ledg259) == 3);
+        BEAST_EXPECT(trie.branchSupport(ledg259) == 3);
 
         // The last call to trie.getPreferred cycled the children of the root
         // node to make the new branch the first child (since it has support 3)
@@ -301,15 +301,15 @@ class RCLValidations_test : public beast::unit_test::suite
         // 000000[0,1)(T:0,B:5)
         //                      |-AB868A..37C9[1,260)(T:4,B:4)
         //                      |-AB868A..36C8[1,3)(T:1,B:1)
-        BEAST_EXPECT(trie.tipSupport(ledg_002) == 1);
-        BEAST_EXPECT(trie.branchSupport(ledg_002) == 1);
-        BEAST_EXPECT(trie.tipSupport(ledg_258) == 0);
+        BEAST_EXPECT(trie.tipSupport(ledg002) == 1);
+        BEAST_EXPECT(trie.branchSupport(ledg002) == 1);
+        BEAST_EXPECT(trie.tipSupport(ledg258) == 0);
         // 258 no longer lives on a tip in the tree, BUT it is an ancestor
         // of 259 which is a tip and therefore gets it's branchSupport value
         // implicitly
-        BEAST_EXPECT(trie.branchSupport(ledg_258) == 4);
-        BEAST_EXPECT(trie.tipSupport(ledg_259) == 4);
-        BEAST_EXPECT(trie.branchSupport(ledg_259) == 4);
+        BEAST_EXPECT(trie.branchSupport(ledg258) == 4);
+        BEAST_EXPECT(trie.tipSupport(ledg259) == 4);
+        BEAST_EXPECT(trie.branchSupport(ledg259) == 4);
     }
 
 public:
diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp
index a6d7160071..4a2c2dba0a 100644
--- a/src/test/app/ReducedOffer_test.cpp
+++ b/src/test/app/ReducedOffer_test.cpp
@@ -26,21 +26,21 @@
 
 namespace xrpl::test {
 
-class ReducedOffer_test : public beast::unit_test::suite
+class ReducedOffer_test : public beast::unit_test::Suite
 {
     static auto
-    ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offer_seq)
+    ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offerSeq)
     {
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::offer][jss::account] = acct.human();
-        jvParams[jss::offer][jss::seq] = offer_seq;
+        jvParams[jss::offer][jss::seq] = offerSeq;
         return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
     }
 
     static bool
     offerInLedger(jtx::Env& env, jtx::Account const& acct, std::uint32_t offerSeq)
     {
-        Json::Value ledgerOffer = ledgerEntryOffer(env, acct, offerSeq);
+        json::Value ledgerOffer = ledgerEntryOffer(env, acct, offerSeq);
         return !(
             ledgerOffer.isMember(jss::error) &&
             ledgerOffer[jss::error].asString() == "entryNotFound");
@@ -53,7 +53,7 @@ class ReducedOffer_test : public beast::unit_test::suite
         std::initializer_list<std::pair<jtx::Account const&, std::uint32_t>> list)
     {
         for (auto [acct, offerSeq] : list)
-            env(offer_cancel(acct, offerSeq));
+            env(offerCancel(acct, offerSeq));
         env.close();
     }
 
@@ -68,20 +68,20 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
 
             // Make sure none of the offers we generate are under funded.
             env.fund(XRP(10'000'000), gw, alice, bob);
             env.close();
 
-            env(trust(alice, USD(10'000'000)));
-            env(trust(bob, USD(10'000'000)));
+            env(trust(alice, usd(10'000'000)));
+            env(trust(bob, usd(10'000'000)));
             env.close();
 
-            env(pay(gw, bob, USD(10'000'000)));
+            env(pay(gw, bob, usd(10'000'000)));
             env.close();
 
             // Lambda that:
@@ -102,7 +102,7 @@ public:
                 std::uint32_t const bobOfferSeq = env.seq(bob);
                 STAmount const bobInitialBalance = env.balance(bob);
                 STAmount const bobFee = env.current()->fees().base;
-                env(offer(bob, newOffer.in, newOffer.out, tfSell), fee(bobFee));
+                env(offer(bob, newOffer.in, newOffer.out, tfSell), Fee(bobFee));
                 env.close();
                 STAmount const bobFinalBalance = env.balance(bob);
 
@@ -118,7 +118,7 @@ public:
                 // bob's offer should be in the ledger, but reduced in size.
                 unsigned int badRate = 1;
                 {
-                    Json::Value bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq);
+                    json::Value bobOffer = ledgerEntryOffer(env, bob, bobOfferSeq);
 
                     STAmount const reducedTakerGets =
                         amountFromJson(sfTakerGets, bobOffer[jss::node][sfTakerGets.jsonName]);
@@ -167,7 +167,7 @@ public:
             };
 
             // bob's offer (the new offer) is the same every time:
-            Amounts const bobOffer{STAmount(XRP(1)), STAmount(USD, 1, 0)};
+            Amounts const bobOffer{STAmount(XRP(1)), STAmount(usd, 1, 0)};
 
             // alice's offer has a slightly smaller TakerPays with each
             // iteration.  This should mean that the size of the offer bob
@@ -202,19 +202,19 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         {
             // Make sure none of the offers we generate are under funded.
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             env.fund(XRP(10'000'000), gw, alice, bob);
             env.close();
 
-            env(trust(alice, USD(10'000'000)));
-            env(trust(bob, USD(10'000'000)));
+            env(trust(alice, usd(10'000'000)));
+            env(trust(bob, usd(10'000'000)));
             env.close();
 
-            env(pay(gw, alice, USD(10'000'000)));
+            env(pay(gw, alice, usd(10'000'000)));
             env.close();
 
             // Lambda that:
@@ -250,7 +250,7 @@ public:
                 // size.
                 unsigned int badRate = 1;
                 {
-                    Json::Value aliceOffer = ledgerEntryOffer(env, alice, aliceOfferSeq);
+                    json::Value aliceOffer = ledgerEntryOffer(env, alice, aliceOfferSeq);
 
                     STAmount const reducedTakerGets =
                         amountFromJson(sfTakerGets, aliceOffer[jss::node][sfTakerGets.jsonName]);
@@ -299,7 +299,7 @@ public:
             };
 
             // alice's offer (the old offer) is the same every time:
-            Amounts const aliceOffer{STAmount(XRP(1)), STAmount(USD, 1, 0)};
+            Amounts const aliceOffer{STAmount(XRP(1)), STAmount(usd, 1, 0)};
 
             // bob's offer has a slightly smaller TakerPays with each iteration.
             // This should mean that the size of the offer alice leaves in the
@@ -336,31 +336,31 @@ public:
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
         auto const gw = Account{"gw"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
 
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
 
             int blockedOrderBookCount = 0;
-            for (STAmount initialBobUSD = USD(0.45); initialBobUSD <= USD(1);
-                 initialBobUSD += USD(0.025))
+            for (STAmount initialBobUSD = usd(0.45); initialBobUSD <= usd(1);
+                 initialBobUSD += usd(0.025))
             {
                 // underfund bob's offer
                 env(pay(gw, bob, initialBobUSD));
                 env.close();
 
                 std::uint32_t const bobOfferSeq = env.seq(bob);
-                env(offer(bob, drops(2), USD(1)));
+                env(offer(bob, drops(2), usd(1)));
                 env.close();
 
                 // alice places an offer that would cross bob's if bob's were
                 // well funded.
                 std::uint32_t const aliceOfferSeq = env.seq(alice);
-                env(offer(alice, USD(1), drops(2)));
+                env(offer(alice, usd(1), drops(2)));
                 env.close();
 
                 // We want to detect order book blocking.  If:
@@ -370,13 +370,13 @@ public:
                 // order book.
                 {
                     bool const bobOfferGone = !offerInLedger(env, bob, bobOfferSeq);
-                    STAmount const aliceBalanceUSD = env.balance(alice, USD);
+                    STAmount const aliceBalanceUSD = env.balance(alice, usd);
 
                     // Sanity check the ledger if alice got USD.
                     if (aliceBalanceUSD.signum() > 0)
                     {
                         BEAST_EXPECT(aliceBalanceUSD == initialBobUSD);
-                        BEAST_EXPECT(env.balance(bob, USD) == USD(0));
+                        BEAST_EXPECT(env.balance(bob, usd) == usd(0));
                         BEAST_EXPECT(bobOfferGone);
                     }
 
@@ -391,11 +391,11 @@ public:
                     cleanupOldOffers(env, {{alice, aliceOfferSeq}, {bob, bobOfferSeq}});
 
                     // Zero out alice's and bob's USD balances.
-                    if (STAmount const aliceBalance = env.balance(alice, USD);
+                    if (STAmount const aliceBalance = env.balance(alice, usd);
                         aliceBalance.signum() > 0)
                         env(pay(alice, gw, aliceBalance));
 
-                    if (STAmount const bobBalance = env.balance(bob, USD); bobBalance.signum() > 0)
+                    if (STAmount const bobBalance = env.balance(bob, usd); bobBalance.signum() > 0)
                         env(pay(bob, gw, bobBalance));
 
                     env.close();
@@ -421,23 +421,23 @@ public:
         auto const bob = Account{"bob"};
         auto const gw = Account{"gw"};
 
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
-        STAmount const tinyUSD(USD, /*mantissa*/ 1, /*exponent*/ -81);
+        STAmount const tinyUSD(usd, /*mantissa*/ 1, /*exponent*/ -81);
 
         {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
 
             env.fund(XRP(10000), alice, bob, gw);
             env.close();
-            env.trust(USD(1000), alice, bob);
-            env.trust(EUR(1000), alice, bob);
+            env.trust(usd(1000), alice, bob);
+            env.trust(eur(1000), alice, bob);
 
-            STAmount const eurOffer(EUR, /*mantissa*/ 2957, /*exponent*/ -76);
-            STAmount const usdOffer(USD, /*mantissa*/ 7109, /*exponent*/ -76);
+            STAmount const eurOffer(eur, /*mantissa*/ 2957, /*exponent*/ -76);
+            STAmount const usdOffer(usd, /*mantissa*/ 7109, /*exponent*/ -76);
 
-            STAmount const endLoop(USD, /*mantissa*/ 50, /*exponent*/ -81);
+            STAmount const endLoop(usd, /*mantissa*/ 50, /*exponent*/ -81);
 
             int blockedOrderBookCount = 0;
             for (STAmount initialBobUSD = tinyUSD; initialBobUSD <= endLoop;
@@ -445,7 +445,7 @@ public:
             {
                 // underfund bob's offer
                 env(pay(gw, bob, initialBobUSD));
-                env(pay(gw, alice, EUR(100)));
+                env(pay(gw, alice, eur(100)));
                 env.close();
 
                 // This offer is underfunded
@@ -462,7 +462,7 @@ public:
                 // Examine the aftermath of alice's offer.
                 {
                     bool const bobOfferGone = !offerInLedger(env, bob, bobOfferSeq);
-                    STAmount const aliceBalanceUSD = env.balance(alice, USD);
+                    STAmount const aliceBalanceUSD = env.balance(alice, usd);
 #if 0
                     std::cout
                         << "bob initial: " << initialBobUSD
@@ -474,7 +474,7 @@ public:
                     if (aliceBalanceUSD.signum() > 0)
                     {
                         BEAST_EXPECT(aliceBalanceUSD == initialBobUSD);
-                        BEAST_EXPECT(env.balance(bob, USD) == USD(0));
+                        BEAST_EXPECT(env.balance(bob, usd) == usd(0));
                         BEAST_EXPECT(bobOfferGone);
                     }
 
@@ -495,10 +495,10 @@ public:
                         env(pay(acct, gw, balance));
                 };
 
-                zeroBalance(alice, EUR);
-                zeroBalance(alice, USD);
-                zeroBalance(bob, EUR);
-                zeroBalance(bob, USD);
+                zeroBalance(alice, eur);
+                zeroBalance(alice, usd);
+                zeroBalance(bob, eur);
+                zeroBalance(bob, usd);
                 env.close();
             }
 
@@ -509,7 +509,7 @@ public:
     }
 
     static Amounts
-    jsonOfferToAmounts(Json::Value const& json)
+    jsonOfferToAmounts(json::Value const& json)
     {
         STAmount const in = amountFromJson(sfTakerPays, json[sfTakerPays.jsonName]);
         STAmount const out = amountFromJson(sfTakerGets, json[sfTakerGets.jsonName]);
@@ -531,38 +531,37 @@ public:
         Account const alice("alice");
         Account const bob("bob");
         Account const carol("carol");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         // Make one test run without fixReducedOffersV2 and one with.
         for (FeatureBitset features :
-             {testable_amendments() - fixReducedOffersV2,
-              testable_amendments() | fixReducedOffersV2})
+             {testableAmendments() - fixReducedOffersV2, testableAmendments() | fixReducedOffersV2})
         {
             // Make sure none of the offers we generate are under funded.
             Env env{*this, features};
             env.fund(XRP(10'000'000), gw, alice, bob, carol);
             env.close();
 
-            env(trust(alice, USD(10'000'000)));
-            env(trust(bob, USD(10'000'000)));
-            env(trust(carol, USD(10'000'000)));
+            env(trust(alice, usd(10'000'000)));
+            env(trust(bob, usd(10'000'000)));
+            env(trust(carol, usd(10'000'000)));
             env.close();
 
-            env(pay(gw, alice, USD(10'000'000)));
-            env(pay(gw, bob, USD(10'000'000)));
-            env(pay(gw, carol, USD(10'000'000)));
+            env(pay(gw, alice, usd(10'000'000)));
+            env(pay(gw, bob, usd(10'000'000)));
+            env(pay(gw, carol, usd(10'000'000)));
             env.close();
 
             // Lambda that:
             //  1. Exercises one offer trio,
             //  2. Collects the results, and
             //  3. Cleans up for the next offer trio.
-            auto exerciseOfferTrio = [this, &env, &alice, &bob, &carol, &USD](
+            auto exerciseOfferTrio = [this, &env, &alice, &bob, &carol, &usd](
                                          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 aliceInitialOffer(USD(2), drops(3382562));
-                env(offer(alice, aliceInitialOffer.in, aliceInitialOffer.out));
+                static Amounts const kALICE_INITIAL_OFFER(usd(2), drops(3382562));
+                env(offer(alice, kALICE_INITIAL_OFFER.in, kALICE_INITIAL_OFFER.out));
                 env.close();
                 STAmount const initialRate = Quality(jsonOfferToAmounts(ledgerEntryOffer(
                                                          env, alice, aliceOfferSeq)[jss::node]))
@@ -570,13 +569,13 @@ public:
 
                 // bob submits an offer that is more desirable than alice's
                 std::uint32_t const bobOfferSeq = env.seq(bob);
-                env(offer(bob, USD(0.97086565812384), drops(1642020)));
+                env(offer(bob, usd(0.97086565812384), drops(1642020)));
                 env.close();
 
                 // Now carol's offer consumes bob's and partially crosses
                 // alice's.  The tfSell flag is important.
                 std::uint32_t const carolOfferSeq = env.seq(carol);
-                env(offer(carol, carolOffer.in, carolOffer.out), txflags(tfSell));
+                env(offer(carol, carolOffer.in, carolOffer.out), Txflags(tfSell));
                 env.close();
 
                 // carol's offer should not have made it into the ledger and
@@ -595,12 +594,12 @@ public:
                 // size.
                 unsigned int badRate = 1;
                 {
-                    Json::Value aliceOffer = ledgerEntryOffer(env, alice, aliceOfferSeq);
+                    json::Value aliceOffer = ledgerEntryOffer(env, alice, aliceOfferSeq);
 
                     Amounts const aliceReducedOffer = jsonOfferToAmounts(aliceOffer[jss::node]);
 
-                    BEAST_EXPECT(aliceReducedOffer.in < aliceInitialOffer.in);
-                    BEAST_EXPECT(aliceReducedOffer.out < aliceInitialOffer.out);
+                    BEAST_EXPECT(aliceReducedOffer.in < kALICE_INITIAL_OFFER.in);
+                    BEAST_EXPECT(aliceReducedOffer.out < kALICE_INITIAL_OFFER.out);
                     STAmount const inLedgerRate = Quality(aliceReducedOffer).rate();
                     badRate = inLedgerRate > initialRate ? 1 : 0;
 
@@ -642,15 +641,15 @@ public:
                 return badRate;
             };
 
-            constexpr int loopCount = 100;
+            constexpr int kLOOP_COUNT = 100;
             unsigned int blockedCount = 0;
             {
-                STAmount increaseGets = USD(0);
+                STAmount increaseGets = usd(0);
                 STAmount const step(increaseGets.asset(), 1, -8);
-                for (unsigned int i = 0; i < loopCount; ++i)
+                for (unsigned int i = 0; i < kLOOP_COUNT; ++i)
                 {
                     blockedCount +=
-                        exerciseOfferTrio(Amounts(drops(1642020), USD(1) + increaseGets));
+                        exerciseOfferTrio(Amounts(drops(1642020), usd(1) + increaseGets));
                     increaseGets += step;
                 }
             }
diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp
index c38013d1f3..d7c92f1748 100644
--- a/src/test/app/Regression_test.cpp
+++ b/src/test/app/Regression_test.cpp
@@ -37,6 +37,7 @@
 #include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/TER.h>
 #include <xrpl/protocol/TxFormats.h>
+#include <xrpl/protocol/XRPAmount.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/tx/apply.h>
 
@@ -53,7 +54,7 @@
 
 namespace xrpl::test {
 
-struct Regression_test : public beast::unit_test::suite
+struct Regression_test : public beast::unit_test::Suite
 {
     // OfferCreate, then OfferCreate with cancel
     void
@@ -62,14 +63,14 @@ struct Regression_test : public beast::unit_test::suite
         using namespace jtx;
         Env env(*this);
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), "alice", gw);
-        env(offer("alice", USD(10), XRP(10)), require(owners("alice", 1)));
-        env(offer("alice", USD(20), XRP(10)),
-            json(R"raw(
+        env(offer("alice", usd(10), XRP(10)), Require(Owners("alice", 1)));
+        env(offer("alice", usd(20), XRP(10)),
+            Json(R"raw(
                 { "OfferSequence" : 4 }
             )raw"),
-            require(owners("alice", 1)));
+            Require(Owners("alice", 1)));
     }
 
     void
@@ -84,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>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
             env.app().getNodeFamily());
-        auto expectedDrops = INITIAL_XRP;
+        auto expectedDrops = kINITIAL_XRP;
         BEAST_EXPECT(closed->header().drops == expectedDrops);
 
         auto const aliceXRP = 400;
@@ -101,7 +102,7 @@ struct Regression_test : public beast::unit_test::suite
             auto const jt = env.jt(pay(env.master, "alice", aliceAmount));
             OpenView accum(&*next);
 
-            auto const result = xrpl::apply(env.app(), accum, *jt.stx, tapNONE, env.journal);
+            auto const result = xrpl::apply(env.app(), accum, *jt.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(result.ter));
             BEAST_EXPECT(result.applied);
 
@@ -120,11 +121,11 @@ struct Regression_test : public beast::unit_test::suite
         {
             // Specify the seq manually since the env's open ledger
             // doesn't know about this account.
-            auto const jt = env.jt(noop("alice"), fee(expectedDrops), seq(2));
+            auto const jt = env.jt(noop("alice"), Fee(expectedDrops), Seq(2));
 
             OpenView accum(&*next);
 
-            auto const result = xrpl::apply(env.app(), accum, *jt.stx, tapNONE, env.journal);
+            auto const result = xrpl::apply(env.app(), accum, *jt.stx, TapNone, env.journal);
             BEAST_EXPECT(result.ter == tecINSUFF_FEE);
             BEAST_EXPECT(result.applied);
 
@@ -137,7 +138,7 @@ struct Regression_test : public beast::unit_test::suite
 
             BEAST_EXPECT(balance == XRP(0));
         }
-        expectedDrops -= aliceXRP * dropsPerXRP;
+        expectedDrops -= aliceXRP * kDROPS_PER_XRP;
         BEAST_EXPECT(next->header().drops == expectedDrops);
     }
 
@@ -152,10 +153,10 @@ struct Regression_test : public beast::unit_test::suite
         auto test256r1key = [&env](Account const& acct) {
             auto const baseFee = env.current()->fees().base;
             std::uint32_t const acctSeq = env.seq(acct);
-            Json::Value const jsonNoop =
-                env.json(noop(acct), fee(baseFee), seq(acctSeq), sig(acct));
-            JTx jt = env.jt(jsonNoop);
-            jt.fill_sig = false;
+            json::Value const jsonNoOp =
+                env.json(noop(acct), Fee(baseFee), Seq(acctSeq), Sig(acct));
+            JTx jt = env.jt(jsonNoOp);
+            jt.fillSig = false;
 
             // Random secp256r1 public key generated by
             // https://kjur.github.io/jsrsasign/sample-ecdsa.html
@@ -174,11 +175,11 @@ struct Regression_test : public beast::unit_test::suite
             secp256r1Sig->setFieldVL(sfSigningPubKey, *pubKeyBlob);
             jt.stx.reset(secp256r1Sig.release());
 
-            env(jt, rpc("invalidTransaction", "fails local checks: Invalid signature."));
+            env(jt, Rpc("invalidTransaction", "fails local checks: Invalid signature."));
         };
 
-        Account const alice{"alice", KeyType::secp256k1};
-        Account const becky{"becky", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Secp256k1};
+        Account const becky{"becky", KeyType::Ed25519};
 
         env.fund(XRP(10000), alice, becky);
 
@@ -196,12 +197,12 @@ struct Regression_test : public beast::unit_test::suite
             cfg->FEES.reference_fee = 10;
             return cfg;
         }));
-        Env_ss envs(env);
+        EnvSs envs(env);
 
         auto const alice = Account("alice");
         env.fund(XRP(100000), alice);
 
-        auto params = Json::Value(Json::objectValue);
+        auto params = json::Value(json::ObjectValue);
         // Max fee = 50k drops
         params[jss::fee_mult_max] = 5000;
         std::vector<int> const expectedFees({10, 10, 8889, 13889, 20000});
@@ -210,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(none), seq(none))(params);
+            envs(noop(alice), Fee(kNONE), Seq(kNONE))(params);
 
             auto tx = env.tx();
             if (BEAST_EXPECT(tx))
@@ -259,8 +260,8 @@ struct Regression_test : public beast::unit_test::suite
         std::string const request =
             R"json({"command":"path_find","id":19,"subcommand":"create","source_account":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","destination_account":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","destination_amount":"1000000","source_currencies":[{"currency":"0000000000000000000000000000000000000000"},{"currency":"0000000000000000000000005553440000000000"},{"currency":"0000000000000000000000004254430000000000"},{"issuer":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","currency":"0000000000000000000000004254430000000000"},{"issuer":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","currency":"0000000000000000000000004254430000000000"},{"issuer":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","currency":"0000000000000000000000004555520000000000"},{"currency":"0000000000000000000000004554480000000000"},{"currency":"0000000000000000000000004A50590000000000"},{"issuer":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","currency":"000000000000000000000000434E590000000000"},{"currency":"0000000000000000000000004742490000000000"},{"issuer":"rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh","currency":"0000000000000000000000004341440000000000"}]})json";
 
-        Json::Value jvRequest;
-        Json::Reader jrReader;
+        json::Value jvRequest;
+        json::Reader jrReader;
 
         std::vector<boost::asio::const_buffer> buffers;
         buffers.emplace_back(buffer(request, 1024));
@@ -283,22 +284,22 @@ struct Regression_test : public beast::unit_test::suite
         env.close();
 
         {
-            auto const alice_index = keylet::account(alice).key;
-            if (BEAST_EXPECT(alice_index.isNonZero()))
+            auto const aliceIndex = keylet::account(alice).key;
+            if (BEAST_EXPECT(aliceIndex.isNonZero()))
             {
-                env(check::cash(alice, alice_index, check::DeliverMin(XRP(100))), ter(tecNO_ENTRY));
+                env(check::cash(alice, aliceIndex, check::DeliverMin(XRP(100))), Ter(tecNO_ENTRY));
             }
         }
 
         {
-            auto const bob_index = keylet::account(bob).key;
+            auto const bobIndex = keylet::account(bob).key;
 
             auto const digest = [&]() -> std::optional<uint256> {
                 auto const& state = env.app().getLedgerMaster().getClosedLedger()->stateMap();
                 SHAMapHash digest;
-                if (!state.peekItem(bob_index, digest))
+                if (!state.peekItem(bobIndex, digest))
                     return std::nullopt;
-                return digest.as_uint256();
+                return digest.asUint256();
             }();
 
             auto const mapCounts = [&](CountedObjects::List const& list) {
@@ -311,13 +312,13 @@ struct Regression_test : public beast::unit_test::suite
                 return result;
             };
 
-            if (BEAST_EXPECT(bob_index.isNonZero()) && BEAST_EXPECT(digest.has_value()))
+            if (BEAST_EXPECT(bobIndex.isNonZero()) && BEAST_EXPECT(digest.has_value()))
             {
                 auto& cache = env.app().getCachedSLEs();
                 cache.del(*digest, false);  // NOLINT(bugprone-unchecked-optional-access)
                 auto const beforeCounts = mapCounts(CountedObjects::getInstance().getCounts(0));
 
-                env(check::cash(alice, bob_index, check::DeliverMin(XRP(100))), ter(tecNO_ENTRY));
+                env(check::cash(alice, bobIndex, check::DeliverMin(XRP(100))), Ter(tecNO_ENTRY));
 
                 auto const afterCounts = mapCounts(CountedObjects::getInstance().getCounts(0));
 
diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp
index 75e4c0c721..574874e005 100644
--- a/src/test/app/SHAMapStore_test.cpp
+++ b/src/test/app/SHAMapStore_test.cpp
@@ -34,16 +34,16 @@
 
 namespace xrpl::test {
 
-class SHAMapStore_test : public beast::unit_test::suite
+class SHAMapStore_test : public beast::unit_test::Suite
 {
-    static auto const deleteInterval = 8;
+    static auto const kDELETE_INTERVAL = 8;
 
     static auto
     onlineDelete(std::unique_ptr<Config> cfg)
     {
-        cfg->LEDGER_HISTORY = deleteInterval;
+        cfg->LEDGER_HISTORY = kDELETE_INTERVAL;
         auto& section = cfg->section(ConfigSection::nodeDatabase());
-        section.set("online_delete", std::to_string(deleteInterval));
+        section.set("online_delete", std::to_string(kDELETE_INTERVAL));
         return cfg;
     }
 
@@ -56,9 +56,9 @@ class SHAMapStore_test : public beast::unit_test::suite
     }
 
     static bool
-    goodLedger(jtx::Env& env, Json::Value const& json, std::string ledgerID, bool checkDB = false)
+    goodLedger(jtx::Env& env, json::Value const& json, std::string ledgerID, bool checkDB = false)
     {
-        auto good = json.isMember(jss::result) && !RPC::contains_error(json[jss::result]) &&
+        auto good = json.isMember(jss::result) && !RPC::containsError(json[jss::result]) &&
             json[jss::result][jss::ledger][jss::ledger_index] == ledgerID;
         if (!good || !checkDB)
             return good;
@@ -95,14 +95,14 @@ class SHAMapStore_test : public beast::unit_test::suite
     }
 
     static bool
-    bad(Json::Value const& json, error_code_i error = rpcLGR_NOT_FOUND)
+    bad(json::Value const& json, ErrorCodeI error = RpcLgrNotFound)
     {
-        return json.isMember(jss::result) && RPC::contains_error(json[jss::result]) &&
+        return json.isMember(jss::result) && RPC::containsError(json[jss::result]) &&
             json[jss::result][jss::error_code] == error;
     }
 
     std::string
-    getHash(Json::Value const& json)
+    getHash(json::Value const& json)
     {
         BEAST_EXPECT(
             json.isMember(jss::result) && json[jss::result].isMember(jss::ledger) &&
@@ -173,7 +173,7 @@ public:
         transactionCheck(env, 0);
         accountTransactionCheck(env, 0);
 
-        std::map<std::uint32_t, Json::Value const> ledgers;
+        std::map<std::uint32_t, json::Value const> ledgers;
 
         auto ledgerTmp = env.rpc("ledger", "0");
         BEAST_EXPECT(bad(ledgerTmp));
@@ -196,7 +196,7 @@ public:
         auto const firstSeq = waitForReady(env);
         auto lastRotated = firstSeq - 1;
 
-        for (auto i = firstSeq + 1; i < deleteInterval + firstSeq; ++i)
+        for (auto i = firstSeq + 1; i < kDELETE_INTERVAL + 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 < deleteInterval + lastRotated; ++i)
+        for (auto i = 3; i < kDELETE_INTERVAL + 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, deleteInterval + 1, 2);
-        transactionCheck(env, deleteInterval);
-        accountTransactionCheck(env, 2 * deleteInterval);
+        ledgerCheck(env, kDELETE_INTERVAL + 1, 2);
+        transactionCheck(env, kDELETE_INTERVAL);
+        accountTransactionCheck(env, 2 * kDELETE_INTERVAL);
 
         {
             // Closing one more ledger triggers a rotate
             env.close();
 
             auto ledger = env.rpc("ledger", "current");
-            BEAST_EXPECT(goodLedger(env, ledger, std::to_string(deleteInterval + 4)));
+            BEAST_EXPECT(goodLedger(env, ledger, std::to_string(kDELETE_INTERVAL + 4)));
         }
 
         store.rendezvous();
 
-        BEAST_EXPECT(store.getLastRotated() == deleteInterval + 3);
+        BEAST_EXPECT(store.getLastRotated() == kDELETE_INTERVAL + 3);
         lastRotated = store.getLastRotated();
         BEAST_EXPECT(lastRotated == 11);
 
         // That took care of the fake hashes
-        ledgerCheck(env, deleteInterval + 1, 3);
-        transactionCheck(env, deleteInterval);
-        accountTransactionCheck(env, 2 * deleteInterval);
+        ledgerCheck(env, kDELETE_INTERVAL + 1, 3);
+        transactionCheck(env, kDELETE_INTERVAL);
+        accountTransactionCheck(env, 2 * kDELETE_INTERVAL);
 
         // The last iteration of this loop should trigger a rotate
-        for (auto i = lastRotated - 1; i < lastRotated + deleteInterval - 1; ++i)
+        for (auto i = lastRotated - 1; i < lastRotated + kDELETE_INTERVAL - 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 + deleteInterval - 2);
+                store.getLastRotated() == lastRotated || i == lastRotated + kDELETE_INTERVAL - 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() == deleteInterval + lastRotated);
+        BEAST_EXPECT(store.getLastRotated() == kDELETE_INTERVAL + lastRotated);
 
-        ledgerCheck(env, deleteInterval + 1, lastRotated);
+        ledgerCheck(env, kDELETE_INTERVAL + 1, lastRotated);
         transactionCheck(env, 0);
         accountTransactionCheck(env, 0);
     }
@@ -280,10 +280,10 @@ public:
         // Because advisory_delete is unset,
         // "can_delete" is disabled.
         auto const canDelete = env.rpc("can_delete");
-        BEAST_EXPECT(bad(canDelete, rpcNOT_ENABLED));
+        BEAST_EXPECT(bad(canDelete, RpcNotEnabled));
 
         // Close ledgers without triggering a rotate
-        for (; ledgerSeq < lastRotated + deleteInterval; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
         {
             env.close();
 
@@ -314,7 +314,7 @@ public:
         lastRotated = store.getLastRotated();
 
         // Close enough ledgers to trigger another rotate
-        for (; ledgerSeq < lastRotated + deleteInterval + 1; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL + 1; ++ledgerSeq)
         {
             env.close();
 
@@ -324,7 +324,7 @@ public:
 
         store.rendezvous();
 
-        ledgerCheck(env, deleteInterval + 1, lastRotated);
+        ledgerCheck(env, kDELETE_INTERVAL + 1, lastRotated);
         BEAST_EXPECT(lastRotated != store.getLastRotated());
     }
 
@@ -345,14 +345,14 @@ public:
         BEAST_EXPECT(lastRotated != 2);
 
         auto canDelete = env.rpc("can_delete");
-        BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
+        BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == 0);
 
         canDelete = env.rpc("can_delete", "never");
-        BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
+        BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == 0);
 
-        auto const firstBatch = deleteInterval + ledgerSeq;
+        auto const firstBatch = kDELETE_INTERVAL + 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 + (deleteInterval / 2)));
-        BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
-        BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + (deleteInterval / 2));
+        canDelete = env.rpc("can_delete", std::to_string(ledgerSeq + (kDELETE_INTERVAL / 2)));
+        BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
+        BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq + (kDELETE_INTERVAL / 2));
 
         store.rendezvous();
 
@@ -391,7 +391,7 @@ public:
         BEAST_EXPECT(store.getLastRotated() == ledgerSeq - 1);
         lastRotated = ledgerSeq - 1;
 
-        for (; ledgerSeq < lastRotated + deleteInterval; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -421,11 +421,11 @@ public:
 
         // This does not kick off a cleanup
         canDelete = env.rpc("can_delete", "always");
-        BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
+        BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(
             canDelete[jss::result][jss::can_delete] == std::numeric_limits<unsigned int>::max());
 
-        for (; ledgerSeq < lastRotated + deleteInterval; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -455,10 +455,10 @@ public:
 
         // This does not kick off a cleanup
         canDelete = env.rpc("can_delete", "now");
-        BEAST_EXPECT(!RPC::contains_error(canDelete[jss::result]));
+        BEAST_EXPECT(!RPC::containsError(canDelete[jss::result]));
         BEAST_EXPECT(canDelete[jss::result][jss::can_delete] == ledgerSeq - 1);
 
-        for (; ledgerSeq < lastRotated + deleteInterval; ++ledgerSeq)
+        for (; ledgerSeq < lastRotated + kDELETE_INTERVAL; ++ledgerSeq)
         {
             // No cleanups in this loop.
             env.close();
@@ -498,9 +498,9 @@ public:
         newPath = path;
         section.set("path", newPath.string());
 
-        auto backend{NodeStore::Manager::instance().make_Backend(
+        auto backend{NodeStore::Manager::instance().makeBackend(
             section,
-            megabytes(env.app().config().getValueFor(SizedItem::burstSize, std::nullopt)),
+            megabytes(env.app().config().getValueFor(SizedItem::BurstSize, std::nullopt)),
             scheduler,
             env.app().getJournal("NodeStoreTest"))};
         backend->open();
@@ -527,11 +527,11 @@ public:
         auto writableBackend = makeBackendRotating(env, scheduler, writableDb);
         auto archiveBackend = makeBackendRotating(env, scheduler, archiveDb);
 
-        constexpr int readThreads = 4;
+        constexpr int kREAD_THREADS = 4;
         auto nscfg = env.app().config().section(ConfigSection::nodeDatabase());
         auto dbr = std::make_unique<NodeStore::DatabaseRotatingImp>(
             scheduler,
-            readThreads,
+            kREAD_THREADS,
             std::move(writableBackend),
             std::move(archiveBackend),
             nscfg,
diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp
index 5982fc282d..f2e6aa29cc 100644
--- a/src/test/app/SetAuth_test.cpp
+++ b/src/test/app/SetAuth_test.cpp
@@ -20,19 +20,19 @@
 
 namespace xrpl::test {
 
-struct SetAuth_test : public beast::unit_test::suite
+struct SetAuth_test : public beast::unit_test::Suite
 {
     // Set just the tfSetfAuth flag on a trust line
     // If the trust line does not exist, then it should
     // be created under the new rules.
-    static Json::Value
+    static json::Value
     auth(jtx::Account const& account, jtx::Account const& dest, std::string const& currency)
     {
         using namespace jtx;
-        Json::Value jv;
+        json::Value jv;
         jv[jss::Account] = account.human();
         jv[jss::LimitAmount] =
-            STAmount(Issue{to_currency(currency), dest}).getJson(JsonOptions::none);
+            STAmount(Issue{toCurrency(currency), dest}).getJson(JsonOptions::KNone);
         jv[jss::TransactionType] = jss::TrustSet;
         jv[jss::Flags] = tfSetfAuth;
         return jv;
@@ -43,7 +43,7 @@ struct SetAuth_test : public beast::unit_test::suite
     {
         using namespace jtx;
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         Env env(*this);
 
@@ -51,21 +51,21 @@ struct SetAuth_test : public beast::unit_test::suite
         env(fset(gw, asfRequireAuth));
         env.close();
         env(auth(gw, "alice", "USD"));
-        BEAST_EXPECT(env.le(keylet::line(Account("alice").id(), gw.id(), USD.currency)));
-        env(trust("alice", USD(1000)));
-        env(trust("bob", USD(1000)));
-        env(pay(gw, "alice", USD(100)));
-        env(pay(gw, "bob", USD(100)),
-            ter(tecPATH_DRY));  // Should be terNO_AUTH
-        env(pay("alice", "bob", USD(50)),
-            ter(tecPATH_DRY));  // Should be terNO_AUTH
+        BEAST_EXPECT(env.le(keylet::line(Account("alice").id(), gw.id(), usd.currency)));
+        env(trust("alice", usd(1000)));
+        env(trust("bob", usd(1000)));
+        env(pay(gw, "alice", usd(100)));
+        env(pay(gw, "bob", usd(100)),
+            Ter(tecPATH_DRY));  // Should be terNO_AUTH
+        env(pay("alice", "bob", usd(50)),
+            Ter(tecPATH_DRY));  // Should be terNO_AUTH
     }
 
     void
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testAuth(sa - featurePermissionedDEX);
         testAuth(sa);
     }
diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp
index af79bb75bc..00b1fe3f84 100644
--- a/src/test/app/SetRegularKey_test.cpp
+++ b/src/test/app/SetRegularKey_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl {
 
-class SetRegularKey_test : public beast::unit_test::suite
+class SetRegularKey_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -32,31 +32,31 @@ public:
         using namespace test::jtx;
 
         testcase("Set regular key");
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const alice("alice");
         Account const bob("bob");
         env.fund(XRP(10000), alice, bob);
 
         env(regkey(alice, bob));
-        env(noop(alice), sig(bob));
-        env(noop(alice), sig(alice));
+        env(noop(alice), Sig(bob));
+        env(noop(alice), Sig(alice));
 
         testcase("Disable master key");
-        env(fset(alice, asfDisableMaster), sig(alice));
-        env(noop(alice), sig(bob));
-        env(noop(alice), sig(alice), ter(tefMASTER_DISABLED));
+        env(fset(alice, asfDisableMaster), Sig(alice));
+        env(noop(alice), Sig(bob));
+        env(noop(alice), Sig(alice), Ter(tefMASTER_DISABLED));
 
         testcase("Re-enable master key");
-        env(fclear(alice, asfDisableMaster), sig(alice), ter(tefMASTER_DISABLED));
+        env(fclear(alice, asfDisableMaster), Sig(alice), Ter(tefMASTER_DISABLED));
 
-        env(fclear(alice, asfDisableMaster), sig(bob));
-        env(noop(alice), sig(bob));
-        env(noop(alice), sig(alice));
+        env(fclear(alice, asfDisableMaster), Sig(bob));
+        env(noop(alice), Sig(bob));
+        env(noop(alice), Sig(alice));
 
         testcase("Revoke regular key");
-        env(regkey(alice, disabled));
-        env(noop(alice), sig(bob), ter(tefBAD_AUTH));
-        env(noop(alice), sig(alice));
+        env(regkey(alice, kDISABLED));
+        env(noop(alice), Sig(bob), Ter(tefBAD_AUTH));
+        env(noop(alice), Sig(alice));
     }
 
     void
@@ -65,11 +65,11 @@ public:
         using namespace test::jtx;
 
         testcase("Set regular key to master key");
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const alice("alice");
         env.fund(XRP(10000), alice);
 
-        env(regkey(alice, alice), ter(temBAD_REGKEY));
+        env(regkey(alice, alice), Ter(temBAD_REGKEY));
     }
 
     void
@@ -87,7 +87,7 @@ public:
         BEAST_EXPECT(
             ar->isFieldPresent(sfFlags) && ((ar->getFieldU32(sfFlags) & lsfPasswordSpent) == 0));
 
-        env(regkey(alice, bob), sig(alice), fee(0));
+        env(regkey(alice, bob), Sig(alice), Fee(0));
 
         ar = env.le(alice);
         BEAST_EXPECT(
@@ -95,7 +95,7 @@ public:
             ((ar->getFieldU32(sfFlags) & lsfPasswordSpent) == lsfPasswordSpent));
 
         // The second SetRegularKey transaction with Fee=0 should fail.
-        env(regkey(alice, bob), sig(alice), fee(0), ter(telINSUF_FEE_P));
+        env(regkey(alice, bob), Sig(alice), Fee(0), Ter(telINSUF_FEE_P));
 
         env.trust(bob["USD"](1), alice);
         env(pay(bob, alice, bob["USD"](1)));
@@ -117,7 +117,7 @@ public:
 
         auto jv = regkey(alice, bob);
         jv[sfFlags.fieldName] = tfUniversalMask;
-        env(jv, ter(temINVALID_FLAG));
+        env(jv, Ter(temINVALID_FLAG));
     }
 
     void
@@ -127,7 +127,7 @@ public:
 
         testcase("Ticket regular key");
         Env env{*this};
-        Account const alice{"alice", KeyType::ed25519};
+        Account const alice{"alice", KeyType::Ed25519};
         env.fund(XRP(1000), alice);
         env.close();
 
@@ -137,34 +137,34 @@ public:
         std::uint32_t ticketSeq{env.seq(alice)};
 
         // Make sure we can give a regular key using a ticket.
-        Account const alie{"alie", KeyType::secp256k1};
-        env(regkey(alice, alie), ticket::use(--ticketSeq));
+        Account const alie{"alie", KeyType::Secp256k1};
+        env(regkey(alice, alie), ticket::Use(--ticketSeq));
         env.close();
 
         // Disable alice's master key using a ticket.
-        env(fset(alice, asfDisableMaster), sig(alice), ticket::use(--ticketSeq));
+        env(fset(alice, asfDisableMaster), Sig(alice), ticket::Use(--ticketSeq));
         env.close();
 
         // alice should be able to sign using the regular key but not the
         // master key.
         std::uint32_t const aliceSeq{env.seq(alice)};
-        env(noop(alice), sig(alice), ter(tefMASTER_DISABLED));
-        env(noop(alice), sig(alie), ter(tesSUCCESS));
+        env(noop(alice), Sig(alice), Ter(tefMASTER_DISABLED));
+        env(noop(alice), Sig(alie), Ter(tesSUCCESS));
         env.close();
         BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
 
         // Re-enable the master key using a ticket.
-        env(fclear(alice, asfDisableMaster), sig(alie), ticket::use(--ticketSeq));
+        env(fclear(alice, asfDisableMaster), Sig(alie), ticket::Use(--ticketSeq));
         env.close();
 
         // Disable the regular key using a ticket.
-        env(regkey(alice, disabled), 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
         // regular key.
-        env(noop(alice), sig(alice), ter(tesSUCCESS));
-        env(noop(alice), sig(alie), ter(tefBAD_AUTH));
+        env(noop(alice), Sig(alice), Ter(tesSUCCESS));
+        env(noop(alice), Sig(alie), Ter(tefBAD_AUTH));
         env.close();
     }
 
diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp
index 2316b3249f..ed6f91f475 100644
--- a/src/test/app/TheoreticalQuality_test.cpp
+++ b/src/test/app/TheoreticalQuality_test.cpp
@@ -56,7 +56,7 @@ struct RippleCalcTestParams
 
     STPathSet paths;
 
-    explicit RippleCalcTestParams(Json::Value const& jv)
+    explicit RippleCalcTestParams(json::Value const& jv)
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         : srcAccount{*parseBase58<AccountID>(jv[jss::Account].asString())}
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -78,7 +78,7 @@ struct RippleCalcTestParams
                     if (pe.isMember(jss::account))
                     {
                         assert(!pe.isMember(jss::currency) && !pe.isMember(jss::issuer));
-                        p.emplace_back(
+                        p.emplaceBack(
                             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
                             *parseBase58<AccountID>(pe[jss::account].asString()),
                             std::nullopt,
@@ -86,7 +86,7 @@ struct RippleCalcTestParams
                     }
                     else if (pe.isMember(jss::currency) && pe.isMember(jss::issuer))
                     {
-                        auto const currency = to_currency(pe[jss::currency].asString());
+                        auto const currency = toCurrency(pe[jss::currency].asString());
                         std::optional<AccountID> issuer;
                         if (!isXRP(currency))
                         {
@@ -98,14 +98,14 @@ struct RippleCalcTestParams
                             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
                             assert(isXRP(*parseBase58<AccountID>(pe[jss::issuer].asString())));
                         }
-                        p.emplace_back(std::nullopt, currency, issuer);
+                        p.emplaceBack(std::nullopt, currency, issuer);
                     }
                     else
                     {
                         assert(0);
                     }
                 }
-                paths.emplace_back(std::move(p));
+                paths.emplaceBack(std::move(p));
             }
         }
     }
@@ -125,9 +125,9 @@ class RandomAccountParams
     std::uint32_t const initialBalance_;
 
     // probability of changing a value from its default
-    constexpr static double probChangeDefault_ = 0.75;
+    constexpr static double kPROB_CHANGE_DEFAULT = 0.75;
     // probability that an account redeems into another account
-    constexpr static double probRedeem_ = 0.5;
+    constexpr static double kPROB_REDEEM = 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,17 +135,17 @@ class RandomAccountParams
     bool
     shouldSet()
     {
-        return zeroOneDist_(engine_) <= probChangeDefault_;
+        return zeroOneDist_(engine_) <= kPROB_CHANGE_DEFAULT;
     };
 
     void
-    maybeInsertQuality(Json::Value& jv, QualityDirection qDir)
+    maybeInsertQuality(json::Value& jv, QualityDirection qDir)
     {
         if (!shouldSet())
             return;
 
         auto const percent = qualityPercentDist_(engine_);
-        auto const& field = qDir == QualityDirection::in ? sfQualityIn : sfQualityOut;
+        auto const& field = qDir == QualityDirection::In ? sfQualityIn : sfQualityOut;
         auto const value = static_cast<std::uint32_t>((percent / 100) * QUALITY_ONE);
         jv[field.jsonName] = value;
     };
@@ -160,9 +160,9 @@ class RandomAccountParams
     {
         using namespace jtx;
         IOU const iou{peer, currency};
-        Json::Value jv = trust(acc, iou(trustAmount_));
-        maybeInsertQuality(jv, QualityDirection::in);
-        maybeInsertQuality(jv, QualityDirection::out);
+        json::Value jv = trust(acc, iou(trustAmount_));
+        maybeInsertQuality(jv, QualityDirection::In);
+        maybeInsertQuality(jv, QualityDirection::Out);
         env(jv);
         env.close();
     };
@@ -193,8 +193,8 @@ public:
         // Since input qualities complicate this payment, use `sendMax` with
         // `initialBalance` to make sure the balance is set correctly.
         env(pay(peer, acc, iou(trustAmount_)),
-            sendmax(iou(initialBalance_)),
-            txflags(tfPartialPayment));
+            Sendmax(iou(initialBalance_)),
+            Txflags(tfPartialPayment));
         env.close();
     }
 
@@ -206,7 +206,7 @@ public:
         Currency const& currency)
     {
         using namespace jtx;
-        if (zeroOneDist_(engine_) > probRedeem_)
+        if (zeroOneDist_(engine_) > kPROB_REDEEM)
             return;
         setInitialBalance(env, acc, peer, currency);
     }
@@ -225,7 +225,7 @@ public:
     };
 };
 
-class TheoreticalQuality_test : public beast::unit_test::suite
+class TheoreticalQuality_test : public beast::unit_test::Suite
 {
     static std::string
     prettyQuality(Quality const& q)
@@ -252,7 +252,7 @@ class TheoreticalQuality_test : public beast::unit_test::suite
         std::shared_ptr<ReadView const> closed,
         std::optional<Quality> const& expectedQ = {})
     {
-        PaymentSandbox const sb(closed.get(), tapNONE);
+        PaymentSandbox const sb(closed.get(), TapNone);
         AMMContext ammContext(rcp.srcAccount, false);
 
         auto const sendMaxIssue = [&rcp]() -> std::optional<Asset> {
@@ -273,7 +273,7 @@ class TheoreticalQuality_test : public beast::unit_test::suite
             rcp.paths,
             /*defaultPaths*/ rcp.paths.empty(),
             false,
-            OfferCrossing::no,
+            OfferCrossing::No,
             ammContext,
             std::nullopt,
             dummyJ);
@@ -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 tolerance = 0.0000001;
-            return relativeDistance(q1, q2) <= tolerance;
+            constexpr double kTOLERANCE = 0.0000001;
+            return relativeDistance(q1, q2) <= kTOLERANCE;
         };
 
         for (auto const& strand : sr.second)
@@ -337,15 +337,15 @@ public:
 
         using namespace jtx;
 
-        auto const currency = to_currency("USD");
+        auto const currency = toCurrency("USD");
 
-        constexpr std::size_t const numAccounts = 4;
+        constexpr std::size_t const kNUM_ACCOUNTS = 4;
 
         // There are three relevant trust lines: `alice->bob`, `bob->carol`, and
         // `carol->dan`. There are four accounts. If we count the number of
         // combinations of parameters where a parameter is changed from its
         // default value, there are
-        // 2^(num_trust_lines*num_trust_qualities+numAccounts) combinations of
+        // 2^(nutrust_lines_*nutrust_qualities_+numAccounts) combinations of
         // values to test, or 2^13 combinations. Use this value to set the
         // number of iterations. Note however that many of these parameter
         // combinations run essentially the same test. For example, changing the
@@ -355,7 +355,7 @@ public:
         // randomly sample the test space.
         int const numTestIterations = reqNumIterations.value_or(250);
 
-        constexpr std::uint32_t paymentAmount = 1;
+        constexpr std::uint32_t kPAYMENT_AMOUNT = 1;
 
         // Class to randomly set account transfer rates, qualities, and other
         // params.
@@ -363,7 +363,7 @@ public:
 
         // Tests are sped up by a factor of 2 if a new environment isn't created
         // on every iteration.
-        Env env(*this, testable_amendments());
+        Env env(*this, testableAmendments());
         for (int i = 0; i < numTestIterations; ++i)
         {
             auto const iterAsStr = std::to_string(i);
@@ -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, numAccounts> accounts{{alice, bob, carol, dan}};
-            static_assert(numAccounts == 4, "Path is only correct for four accounts");
-            path const accountsPath(accounts[1], accounts[2]);
+            std::array<Account, kNUM_ACCOUNTS> accounts{{alice, bob, carol, dan}};
+            static_assert(kNUM_ACCOUNTS == 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 < numAccounts; ++ii)
+            for (std::size_t ii = 0; ii < kNUM_ACCOUNTS; ++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 == numAccounts)
+                if (j == kNUM_ACCOUNTS)
                     continue;
 
                 rndAccParams.setupTrustLines(env, accounts[ii], accounts[j], currency);
@@ -399,9 +399,9 @@ 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(paymentAmount)),
+                pay(accounts.front(), accounts.back(), iou(kPAYMENT_AMOUNT)),
                 accountsPath,
-                txflags(tfNoRippleDirect))};
+                Txflags(tfNoRippleDirect))};
 
             testCase(rcp, env.closed());
         }
@@ -422,10 +422,10 @@ public:
 
         int const numTestIterations = reqNumIterations.value_or(100);
 
-        constexpr std::uint32_t paymentAmount = 1;
+        constexpr std::uint32_t kPAYMENT_AMOUNT = 1;
 
-        Currency const eurCurrency = to_currency("EUR");
-        Currency const usdCurrency = to_currency("USD");
+        Currency const eurCurrency = toCurrency("EUR");
+        Currency const usdCurrency = toCurrency("USD");
 
         // Class to randomly set account transfer rates, qualities, and other
         // params.
@@ -433,7 +433,7 @@ public:
 
         // Speed up tests by creating the environment outside the loop
         // (factor of 2 speedup on the DirectStep tests)
-        Env env(*this, testable_amendments());
+        Env env(*this, testableAmendments());
         for (int i = 0; i < numTestIterations; ++i)
         {
             auto const iterAsStr = std::to_string(i);
@@ -442,15 +442,15 @@ public:
             auto const carol = Account("carol" + iterAsStr);
             auto const dan = Account("dan" + iterAsStr);
             auto const oscar = Account("oscar" + iterAsStr);  // offer owner
-            auto const USDB = bob["USD"];
-            auto const EURC = carol["EUR"];
-            constexpr std::size_t const numAccounts = 5;
-            std::array<Account, numAccounts> const accounts{{alice, bob, carol, dan, oscar}};
+            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}};
 
             // sendmax should be in USDB and delivered amount should be in EURC
             // normalized path should be:
             // alice -> bob -> (USD/bob)|(EUR/carol) -> carol -> dan
-            path const bookPath(~EURC);
+            Path const bookPath(~eurc);
 
             env.fund(XRP(10000), alice, bob, carol, dan, oscar);
             env.close();
@@ -471,17 +471,17 @@ public:
             rndAccParams.setInitialBalance(env, oscar, bob, usdCurrency);
             rndAccParams.setInitialBalance(env, oscar, carol, eurCurrency);
 
-            env(offer(oscar, USDB(50), EURC(50)));
+            env(offer(oscar, usdb(50), eurc(50)));
             env.close();
 
             // Accounts are set up, make the payment
             IOU const srcIOU{bob, usdCurrency};
             IOU const dstIOU{carol, eurCurrency};
             RippleCalcTestParams const rcp{env.json(
-                pay(alice, dan, dstIOU(paymentAmount)),
-                sendmax(srcIOU(100 * paymentAmount)),
+                pay(alice, dan, dstIOU(kPAYMENT_AMOUNT)),
+                Sendmax(srcIOU(100 * kPAYMENT_AMOUNT)),
                 bookPath,
-                txflags(tfNoRippleDirect))};
+                Txflags(tfNoRippleDirect))};
 
             testCase(rcp, env.closed());
         }
diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp
index 0dc9f0155f..d266ec12d2 100644
--- a/src/test/app/Ticket_test.cpp
+++ b/src/test/app/Ticket_test.cpp
@@ -45,7 +45,7 @@
 
 namespace xrpl {
 
-class Ticket_test : public beast::unit_test::suite
+class Ticket_test : public beast::unit_test::Suite
 {
     /// @brief Validate metadata for a successful TicketCreate transaction.
     ///
@@ -55,7 +55,7 @@ class Ticket_test : public beast::unit_test::suite
     {
         using namespace std::string_literals;
 
-        Json::Value const& tx{env.tx()->getJson(JsonOptions::none)};
+        json::Value const& tx{env.tx()->getJson(JsonOptions::KNone)};
         {
             std::string const txType = tx[sfTransactionType.jsonName].asString();
 
@@ -71,7 +71,7 @@ class Ticket_test : public beast::unit_test::suite
         std::uint32_t const txSeq = {tx[sfSequence.jsonName].asUInt()};
         std::string const account = tx[sfAccount.jsonName].asString();
 
-        Json::Value const& metadata = env.meta()->getJson(JsonOptions::none);
+        json::Value const& metadata = env.meta()->getJson(JsonOptions::KNone);
         if (!BEAST_EXPECTS(
                 metadata.isMember(sfTransactionResult.jsonName) &&
                     metadata[sfTransactionResult.jsonName].asString() == "tesSUCCESS",
@@ -85,11 +85,11 @@ class Ticket_test : public beast::unit_test::suite
         std::uint32_t acctRootFinalSeq = {0};
         std::vector<std::uint32_t> ticketSeqs;
         ticketSeqs.reserve(count);
-        for (Json::Value const& node : metadata[sfAffectedNodes.jsonName])
+        for (json::Value const& node : metadata[sfAffectedNodes.jsonName])
         {
             if (node.isMember(sfModifiedNode.jsonName))
             {
-                Json::Value const& modified = node[sfModifiedNode.jsonName];
+                json::Value const& modified = node[sfModifiedNode.jsonName];
                 std::string const entryType = modified[sfLedgerEntryType.jsonName].asString();
                 if (entryType == jss::AccountRoot)
                 {
@@ -181,7 +181,7 @@ class Ticket_test : public beast::unit_test::suite
             }
             else if (node.isMember(sfCreatedNode.jsonName))
             {
-                Json::Value const& created = node[sfCreatedNode.jsonName];
+                json::Value const& created = node[sfCreatedNode.jsonName];
                 std::string const entryType = created[sfLedgerEntryType.jsonName].asString();
                 if (entryType == jss::Ticket)
                 {
@@ -201,7 +201,7 @@ class Ticket_test : public beast::unit_test::suite
             }
             else if (node.isMember(sfDeletedNode.jsonName))
             {
-                Json::Value const& deleted = node[sfDeletedNode.jsonName];
+                json::Value const& deleted = node[sfDeletedNode.jsonName];
                 std::string const entryType = deleted[sfLedgerEntryType.jsonName].asString();
 
                 if (entryType == jss::Ticket)
@@ -241,7 +241,7 @@ class Ticket_test : public beast::unit_test::suite
     void
     checkTicketConsumeMeta(test::jtx::Env& env)
     {
-        Json::Value const& tx{env.tx()->getJson(JsonOptions::none)};
+        json::Value const& tx{env.tx()->getJson(JsonOptions::KNone)};
 
         // Verify that the transaction includes a TicketSequence.
 
@@ -274,7 +274,7 @@ class Ticket_test : public beast::unit_test::suite
 
         std::uint32_t const ticketSeq{tx[sfTicketSequence.jsonName].asUInt()};
 
-        Json::Value const& metadata{env.meta()->getJson(JsonOptions::none)};
+        json::Value const& metadata{env.meta()->getJson(JsonOptions::KNone)};
         if (!BEAST_EXPECTS(
                 metadata.isMember(sfTransactionResult.jsonName),
                 "Metadata is missing TransactionResult."))
@@ -295,11 +295,11 @@ class Ticket_test : public beast::unit_test::suite
         bool acctRootFound{false};
         std::uint32_t acctRootSeq{0};
         int ticketsRemoved{0};
-        for (Json::Value const& node : metadata[sfAffectedNodes.jsonName])
+        for (json::Value const& node : metadata[sfAffectedNodes.jsonName])
         {
             if (node.isMember(sfModifiedNode.jsonName))
             {
-                Json::Value const& modified{node[sfModifiedNode.jsonName]};
+                json::Value const& modified{node[sfModifiedNode.jsonName]};
                 std::string const entryType = modified[sfLedgerEntryType.jsonName].asString();
                 if (entryType == "AccountRoot" &&
                     modified[sfFinalFields.jsonName][sfAccount.jsonName].asString() == account)
@@ -337,7 +337,7 @@ class Ticket_test : public beast::unit_test::suite
             }
             else if (node.isMember(sfDeletedNode.jsonName))
             {
-                Json::Value const& deleted{node[sfDeletedNode.jsonName]};
+                json::Value const& deleted{node[sfDeletedNode.jsonName]};
                 std::string const entryType{deleted[sfLedgerEntryType.jsonName].asString()};
 
                 if (entryType == jss::Ticket)
@@ -371,40 +371,40 @@ class Ticket_test : public beast::unit_test::suite
         Account const master{env.master};
 
         // Exercise boundaries on count.
-        env(ticket::create(master, 0), ter(temINVALID_COUNT));
-        env(ticket::create(master, 251), ter(temINVALID_COUNT));
+        env(ticket::create(master, 0), Ter(temINVALID_COUNT));
+        env(ticket::create(master, 251), Ter(temINVALID_COUNT));
 
         // Exercise fees.
-        std::uint32_t const ticketSeq_A{env.seq(master) + 1};
-        env(ticket::create(master, 1), fee(XRP(10)));
+        std::uint32_t const ticketSeqA{env.seq(master) + 1};
+        env(ticket::create(master, 1), Fee(XRP(10)));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(master, 1), tickets(master, 1));
+        env.require(Owners(master, 1), tickets(master, 1));
 
-        env(ticket::create(master, 1), fee(XRP(-1)), ter(temBAD_FEE));
+        env(ticket::create(master, 1), Fee(XRP(-1)), Ter(temBAD_FEE));
 
         // Exercise flags.
-        std::uint32_t const ticketSeq_B{env.seq(master) + 1};
-        env(ticket::create(master, 1), txflags(tfFullyCanonicalSig));
+        std::uint32_t const ticketSeqB{env.seq(master) + 1};
+        env(ticket::create(master, 1), Txflags(tfFullyCanonicalSig));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(master, 2), tickets(master, 2));
+        env.require(Owners(master, 2), tickets(master, 2));
 
-        env(ticket::create(master, 1), txflags(tfSell), ter(temINVALID_FLAG));
+        env(ticket::create(master, 1), Txflags(tfSell), Ter(temINVALID_FLAG));
         env.close();
-        env.require(owners(master, 2), tickets(master, 2));
+        env.require(Owners(master, 2), tickets(master, 2));
 
         // We successfully created 1 ticket earlier.  Verify that we can
         // create 250 tickets in one shot.  We must consume one ticket first.
-        env(noop(master), ticket::use(ticketSeq_A));
+        env(noop(master), ticket::Use(ticketSeqA));
         checkTicketConsumeMeta(env);
         env.close();
-        env.require(owners(master, 1), tickets(master, 1));
+        env.require(Owners(master, 1), tickets(master, 1));
 
-        env(ticket::create(master, 250), ticket::use(ticketSeq_B));
+        env(ticket::create(master, 250), ticket::Use(ticketSeqB));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(master, 250), tickets(master, 250));
+        env.require(Owners(master, 250), tickets(master, 250));
     }
 
     void
@@ -419,7 +419,7 @@ class Ticket_test : public beast::unit_test::suite
             Account const alice{"alice"};
             env.memoize(alice);
 
-            env(ticket::create(alice, 1), json(jss::Sequence, 1), ter(terNO_ACCOUNT));
+            env(ticket::create(alice, 1), Json(jss::Sequence, 1), Ter(terNO_ACCOUNT));
         }
         {
             // Exceed the threshold where tickets can no longer be
@@ -433,31 +433,31 @@ class Ticket_test : public beast::unit_test::suite
             env(ticket::create(alice, 250));
             checkTicketCreateMeta(env);
             env.close();
-            env.require(owners(alice, 250), tickets(alice, 250));
+            env.require(Owners(alice, 250), tickets(alice, 250));
 
             // Note that we can add one more ticket while consuming a ticket
             // because the final result is still 250 tickets.
-            env(ticket::create(alice, 1), ticket::use(ticketSeq + 0));
+            env(ticket::create(alice, 1), ticket::Use(ticketSeq + 0));
             checkTicketCreateMeta(env);
             env.close();
-            env.require(owners(alice, 250), tickets(alice, 250));
+            env.require(Owners(alice, 250), tickets(alice, 250));
 
             // Adding one more ticket will exceed the threshold.
-            env(ticket::create(alice, 2), ticket::use(ticketSeq + 1), ter(tecDIR_FULL));
+            env(ticket::create(alice, 2), ticket::Use(ticketSeq + 1), Ter(tecDIR_FULL));
             env.close();
-            env.require(owners(alice, 249), tickets(alice, 249));
+            env.require(Owners(alice, 249), tickets(alice, 249));
 
             // Now we can successfully add one more ticket.
-            env(ticket::create(alice, 2), ticket::use(ticketSeq + 2));
+            env(ticket::create(alice, 2), ticket::Use(ticketSeq + 2));
             checkTicketCreateMeta(env);
             env.close();
-            env.require(owners(alice, 250), tickets(alice, 250));
+            env.require(Owners(alice, 250), tickets(alice, 250));
 
             // Since we're at 250, we can't add another ticket using a
             // sequence.
-            env(ticket::create(alice, 1), ter(tecDIR_FULL));
+            env(ticket::create(alice, 1), Ter(tecDIR_FULL));
             env.close();
-            env.require(owners(alice, 250), tickets(alice, 250));
+            env.require(Owners(alice, 250), tickets(alice, 250));
         }
         {
             // Explore exceeding the ticket threshold from another angle.
@@ -467,29 +467,29 @@ class Ticket_test : public beast::unit_test::suite
             env.fund(XRP(100000), alice);
             env.close();
 
-            std::uint32_t const ticketSeq_AB{env.seq(alice) + 1};
+            std::uint32_t const ticketSeqAb{env.seq(alice) + 1};
             env(ticket::create(alice, 2));
             checkTicketCreateMeta(env);
             env.close();
-            env.require(owners(alice, 2), tickets(alice, 2));
+            env.require(Owners(alice, 2), tickets(alice, 2));
 
             // Adding 250 tickets (while consuming one) will exceed the
             // threshold.
-            env(ticket::create(alice, 250), ticket::use(ticketSeq_AB + 0), ter(tecDIR_FULL));
+            env(ticket::create(alice, 250), ticket::Use(ticketSeqAb + 0), Ter(tecDIR_FULL));
             env.close();
-            env.require(owners(alice, 1), tickets(alice, 1));
+            env.require(Owners(alice, 1), tickets(alice, 1));
 
             // Adding 250 tickets (without consuming one) will exceed the
             // threshold.
-            env(ticket::create(alice, 250), ter(tecDIR_FULL));
+            env(ticket::create(alice, 250), Ter(tecDIR_FULL));
             env.close();
-            env.require(owners(alice, 1), tickets(alice, 1));
+            env.require(Owners(alice, 1), tickets(alice, 1));
 
             // Alice can now add 250 tickets while consuming one.
-            env(ticket::create(alice, 250), ticket::use(ticketSeq_AB + 1));
+            env(ticket::create(alice, 250), ticket::Use(ticketSeqAb + 1));
             checkTicketCreateMeta(env);
             env.close();
-            env.require(owners(alice, 250), tickets(alice, 250));
+            env.require(Owners(alice, 250), tickets(alice, 250));
         }
     }
 
@@ -506,9 +506,9 @@ class Ticket_test : public beast::unit_test::suite
         env.fund(env.current()->fees().accountReserve(1) - drops(1), alice);
         env.close();
 
-        env(ticket::create(alice, 1), ter(tecINSUFFICIENT_RESERVE));
+        env(ticket::create(alice, 1), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
-        env.require(owners(alice, 0), tickets(alice, 0));
+        env.require(Owners(alice, 0), tickets(alice, 0));
 
         // Give alice enough to exactly meet the reserve for one Ticket.
         env(pay(env.master, alice, env.current()->fees().accountReserve(1) - env.balance(alice)));
@@ -517,7 +517,7 @@ class Ticket_test : public beast::unit_test::suite
         env(ticket::create(alice, 1));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
 
         // Give alice not quite enough to make the reserve for a total of
         // 250 Tickets.
@@ -529,9 +529,9 @@ class Ticket_test : public beast::unit_test::suite
 
         // alice doesn't quite have the reserve for a total of 250
         // Tickets, so the transaction fails.
-        env(ticket::create(alice, 249), ter(tecINSUFFICIENT_RESERVE));
+        env(ticket::create(alice, 249), Ter(tecINSUFFICIENT_RESERVE));
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
 
         // Give alice enough so she can make the reserve for all 250
         // Tickets.
@@ -542,7 +542,7 @@ class Ticket_test : public beast::unit_test::suite
         env(ticket::create(alice, 249));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 250), tickets(alice, 250));
+        env.require(Owners(alice, 250), tickets(alice, 250));
         BEAST_EXPECT(ticketSeq + 249 == env.seq(alice));
     }
 
@@ -559,77 +559,77 @@ class Ticket_test : public beast::unit_test::suite
         env.close();
 
         // Successfully create tickets (using a sequence)
-        std::uint32_t const ticketSeq_AB{env.seq(alice) + 1};
+        std::uint32_t const ticketSeqAb{env.seq(alice) + 1};
         env(ticket::create(alice, 2));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 2));
-        BEAST_EXPECT(ticketSeq_AB + 2 == env.seq(alice));
+        env.require(Owners(alice, 2), tickets(alice, 2));
+        BEAST_EXPECT(ticketSeqAb + 2 == env.seq(alice));
 
         // You can use a ticket to create one ticket ...
-        std::uint32_t const ticketSeq_C{env.seq(alice)};
-        env(ticket::create(alice, 1), ticket::use(ticketSeq_AB + 0));
+        std::uint32_t const ticketSeqC{env.seq(alice)};
+        env(ticket::create(alice, 1), ticket::Use(ticketSeqAb + 0));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 2));
-        BEAST_EXPECT(ticketSeq_C + 1 == env.seq(alice));
+        env.require(Owners(alice, 2), tickets(alice, 2));
+        BEAST_EXPECT(ticketSeqC + 1 == env.seq(alice));
 
         // ... you can use a ticket to create multiple tickets ...
-        std::uint32_t const ticketSeq_DE{env.seq(alice)};
-        env(ticket::create(alice, 2), ticket::use(ticketSeq_AB + 1));
+        std::uint32_t const ticketSeqDe{env.seq(alice)};
+        env(ticket::create(alice, 2), ticket::Use(ticketSeqAb + 1));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 3), tickets(alice, 3));
-        BEAST_EXPECT(ticketSeq_DE + 2 == env.seq(alice));
+        env.require(Owners(alice, 3), tickets(alice, 3));
+        BEAST_EXPECT(ticketSeqDe + 2 == env.seq(alice));
 
         // ... and you can use a ticket for other things.
-        env(noop(alice), ticket::use(ticketSeq_DE + 0));
+        env(noop(alice), ticket::Use(ticketSeqDe + 0));
         checkTicketConsumeMeta(env);
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 2));
-        BEAST_EXPECT(ticketSeq_DE + 2 == env.seq(alice));
+        env.require(Owners(alice, 2), tickets(alice, 2));
+        BEAST_EXPECT(ticketSeqDe + 2 == env.seq(alice));
 
-        env(pay(alice, env.master, XRP(20)), ticket::use(ticketSeq_DE + 1));
+        env(pay(alice, env.master, XRP(20)), ticket::Use(ticketSeqDe + 1));
         checkTicketConsumeMeta(env);
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
-        BEAST_EXPECT(ticketSeq_DE + 2 == env.seq(alice));
+        env.require(Owners(alice, 1), tickets(alice, 1));
+        BEAST_EXPECT(ticketSeqDe + 2 == env.seq(alice));
 
-        env(trust(alice, env.master["USD"](20)), ticket::use(ticketSeq_C));
+        env(trust(alice, env.master["USD"](20)), ticket::Use(ticketSeqC));
         checkTicketConsumeMeta(env);
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 0));
-        BEAST_EXPECT(ticketSeq_DE + 2 == env.seq(alice));
+        env.require(Owners(alice, 1), tickets(alice, 0));
+        BEAST_EXPECT(ticketSeqDe + 2 == env.seq(alice));
 
         // Attempt to use a ticket that has already been used.
-        env(noop(alice), ticket::use(ticketSeq_C), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(ticketSeqC), Ter(tefNO_TICKET));
         env.close();
 
         // Attempt to use a ticket from the future.
-        std::uint32_t const ticketSeq_F{env.seq(alice) + 1};
-        env(noop(alice), ticket::use(ticketSeq_F), ter(terPRE_TICKET));
+        std::uint32_t const ticketSeqF{env.seq(alice) + 1};
+        env(noop(alice), ticket::Use(ticketSeqF), Ter(terPRE_TICKET));
         env.close();
 
         // Now create the ticket.  The retry will consume the new ticket.
         env(ticket::create(alice, 1));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 0));
-        BEAST_EXPECT(ticketSeq_F + 1 == env.seq(alice));
+        env.require(Owners(alice, 1), tickets(alice, 0));
+        BEAST_EXPECT(ticketSeqF + 1 == env.seq(alice));
 
         // Try a transaction that combines consuming a ticket with
         // AccountTxnID.
-        std::uint32_t const ticketSeq_G{env.seq(alice) + 1};
+        std::uint32_t const ticketSeqG{env.seq(alice) + 1};
         env(ticket::create(alice, 1));
         checkTicketCreateMeta(env);
         env.close();
 
         env(noop(alice),
-            ticket::use(ticketSeq_G),
-            json(R"({"AccountTxnID": "0"})"),
-            ter(temINVALID));
+            ticket::Use(ticketSeqG),
+            Json(R"({"AccountTxnID": "0"})"),
+            Ter(temINVALID));
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 1));
+        env.require(Owners(alice, 2), tickets(alice, 1));
     }
 
     void
@@ -673,36 +673,36 @@ 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 ticketCount{10};
-        env(ticket::create(alice, ticketCount));
-        uint256 const txHash_1{getTxID()};
+        static constexpr std::uint32_t kTICKET_COUNT{10};
+        env(ticket::create(alice, kTICKET_COUNT));
+        uint256 const txHash1{getTxID()};
 
         // Just for grins use the tickets in reverse from largest to smallest.
-        ticketSeq += ticketCount;
-        env(noop(alice), ticket::use(--ticketSeq));
-        uint256 const txHash_2{getTxID()};
+        ticketSeq += kTICKET_COUNT;
+        env(noop(alice), ticket::Use(--ticketSeq));
+        uint256 const txHash2{getTxID()};
 
-        env(pay(alice, env.master, XRP(200)), ticket::use(--ticketSeq));
-        uint256 const txHash_3{getTxID()};
+        env(pay(alice, env.master, XRP(200)), ticket::Use(--ticketSeq));
+        uint256 const txHash3{getTxID()};
 
-        env(deposit::auth(alice, env.master), ticket::use(--ticketSeq));
-        uint256 const txHash_4{getTxID()};
+        env(deposit::auth(alice, env.master), ticket::Use(--ticketSeq));
+        uint256 const txHash4{getTxID()};
 
         // Close the ledger so we look at transactions from a couple of
         // different ledgers.
         env.close();
 
-        env(pay(alice, env.master, XRP(300)), ticket::use(--ticketSeq));
-        uint256 const txHash_5{getTxID()};
+        env(pay(alice, env.master, XRP(300)), ticket::Use(--ticketSeq));
+        uint256 const txHash5{getTxID()};
 
-        env(pay(alice, env.master, XRP(400)), ticket::use(--ticketSeq));
-        uint256 const txHash_6{getTxID()};
+        env(pay(alice, env.master, XRP(400)), ticket::Use(--ticketSeq));
+        uint256 const txHash6{getTxID()};
 
-        env(deposit::unauth(alice, env.master), ticket::use(--ticketSeq));
-        uint256 const txHash_7{getTxID()};
+        env(deposit::unauth(alice, env.master), ticket::Use(--ticketSeq));
+        uint256 const txHash7{getTxID()};
 
-        env(noop(alice), ticket::use(--ticketSeq));
-        uint256 const txHash_8{getTxID()};
+        env(noop(alice), ticket::Use(--ticketSeq));
+        uint256 const txHash8{getTxID()};
 
         env.close();
 
@@ -718,13 +718,13 @@ class Ticket_test : public beast::unit_test::suite
                                  std::uint32_t txSeq,
                                  std::optional<std::uint32_t> ticketSeq,
                                  TxType txType) {
-            error_code_i txErrCode{rpcSUCCESS};
+            ErrorCodeI txErrCode{RpcSuccess};
 
             using TxPair = std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>;
             std::variant<TxPair, TxSearched> maybeTx =
                 Transaction::load(txID, env.app(), txErrCode);
 
-            BEAST_EXPECT(txErrCode == rpcSUCCESS);
+            BEAST_EXPECT(txErrCode == RpcSuccess);
             if (auto txPtr = std::get_if<TxPair>(&maybeTx))
             {
                 std::shared_ptr<Transaction> const& tx = txPtr->first;
@@ -742,22 +742,22 @@ class Ticket_test : public beast::unit_test::suite
         };
 
         //   txID ledgerSeq txSeq ticketSeq          txType
-        checkTxFromDB(txHash_1, 4, 4, {}, ttTICKET_CREATE);
-        checkTxFromDB(txHash_2, 4, 0, 13, ttACCOUNT_SET);
-        checkTxFromDB(txHash_3, 4, 0, 12, ttPAYMENT);
-        checkTxFromDB(txHash_4, 4, 0, 11, ttDEPOSIT_PREAUTH);
+        checkTxFromDB(txHash1, 4, 4, {}, ttTICKET_CREATE);
+        checkTxFromDB(txHash2, 4, 0, 13, ttACCOUNT_SET);
+        checkTxFromDB(txHash3, 4, 0, 12, ttPAYMENT);
+        checkTxFromDB(txHash4, 4, 0, 11, ttDEPOSIT_PREAUTH);
 
-        checkTxFromDB(txHash_5, 5, 0, 10, ttPAYMENT);
-        checkTxFromDB(txHash_6, 5, 0, 9, ttPAYMENT);
-        checkTxFromDB(txHash_7, 5, 0, 8, ttDEPOSIT_PREAUTH);
-        checkTxFromDB(txHash_8, 5, 0, 7, ttACCOUNT_SET);
+        checkTxFromDB(txHash5, 5, 0, 10, ttPAYMENT);
+        checkTxFromDB(txHash6, 5, 0, 9, ttPAYMENT);
+        checkTxFromDB(txHash7, 5, 0, 8, ttDEPOSIT_PREAUTH);
+        checkTxFromDB(txHash8, 5, 0, 7, ttACCOUNT_SET);
     }
 
     void
     testSignWithTicketSequence()
     {
         // The sign and the submit RPC commands automatically fill in the
-        // Sequence field of a transaction if none 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");
@@ -774,16 +774,16 @@ class Ticket_test : public beast::unit_test::suite
         env(ticket::create(alice, 2));
         checkTicketCreateMeta(env);
         env.close();
-        env.require(owners(alice, 2), tickets(alice, 2));
+        env.require(Owners(alice, 2), tickets(alice, 2));
         BEAST_EXPECT(ticketSeq + 2 == env.seq(alice));
 
         {
             // Test that the "sign" RPC command fills in a "Sequence": 0 field
-            // if none is provided.
+            // if kNONE is provided.
 
             // Create a noop transaction using a TicketSequence but don't fill
             // in the Sequence field.
-            Json::Value tx = Json::objectValue;
+            json::Value tx = json::ObjectValue;
             tx[jss::tx_json] = noop(alice);
             tx[jss::tx_json][sfTicketSequence.jsonName] = ticketSeq;
             tx[jss::secret] = toBase58(generateSeed("alice"));
@@ -793,7 +793,7 @@ class Ticket_test : public beast::unit_test::suite
 
             // Call the "sign" RPC command and see the "Sequence": 0 field
             // filled in.
-            Json::Value jr = env.rpc("json", "sign", to_string(tx));
+            json::Value jr = env.rpc("json", "sign", to_string(tx));
 
             // Verify that "sign" inserted a "Sequence": 0 field.
             if (BEAST_EXPECT(jr[jss::result][jss::tx_json].isMember(sfSequence.jsonName)))
@@ -803,20 +803,20 @@ class Ticket_test : public beast::unit_test::suite
 
             // "sign" should not have consumed any of alice's tickets.
             env.close();
-            env.require(owners(alice, 2), tickets(alice, 2));
+            env.require(Owners(alice, 2), tickets(alice, 2));
 
             // "submit" the signed blob and see one of alice's tickets consumed.
             env.rpc("submit", jr[jss::result][jss::tx_blob].asString());
             env.close();
-            env.require(owners(alice, 1), tickets(alice, 1));
+            env.require(Owners(alice, 1), tickets(alice, 1));
         }
         {
             // Test that the "submit" RPC command fills in a "Sequence": 0
-            // field if none is provided.
+            // field if kNONE is provided.
 
             // Create a noop transaction using a TicketSequence but don't fill
             // in the Sequence field.
-            Json::Value tx = Json::objectValue;
+            json::Value tx = json::ObjectValue;
             tx[jss::tx_json] = noop(alice);
             tx[jss::tx_json][sfTicketSequence.jsonName] = ticketSeq + 1;
             tx[jss::secret] = toBase58(generateSeed("alice"));
@@ -826,7 +826,7 @@ class Ticket_test : public beast::unit_test::suite
 
             // Call the "submit" RPC command and see the "Sequence": 0 field
             // filled in.
-            Json::Value jr = env.rpc("json", "submit", to_string(tx));
+            json::Value jr = env.rpc("json", "submit", to_string(tx));
 
             // Verify that "submit" inserted a "Sequence": 0 field.
             if (BEAST_EXPECT(jr[jss::result][jss::tx_json].isMember(sfSequence.jsonName)))
@@ -836,7 +836,7 @@ class Ticket_test : public beast::unit_test::suite
 
             // "submit" should have consumed the last of alice's tickets.
             env.close();
-            env.require(owners(alice, 0), tickets(alice, 0));
+            env.require(Owners(alice, 0), tickets(alice, 0));
         }
     }
 
@@ -849,7 +849,7 @@ class Ticket_test : public beast::unit_test::suite
         // and a TicketSequence field.  Verify that the error is detected.
         testcase("Fix both Seq and Ticket");
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const alice{"alice"};
 
         env.fund(XRP(10000), alice);
@@ -859,17 +859,17 @@ class Ticket_test : public beast::unit_test::suite
         std::uint32_t const ticketSeq = env.seq(alice) + 1;
         env(ticket::create(alice, 1));
         env.close();
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
         BEAST_EXPECT(ticketSeq + 1 == env.seq(alice));
 
         // Create a transaction that includes both a ticket and a non-zero
         // sequence number.  The transaction fails with temSEQ_AND_TICKET.
-        env(noop(alice), ticket::use(ticketSeq), seq(env.seq(alice)), ter(temSEQ_AND_TICKET));
+        env(noop(alice), ticket::Use(ticketSeq), Seq(env.seq(alice)), Ter(temSEQ_AND_TICKET));
         env.close();
 
         // Verify that the transaction failed by looking at alice's
         // sequence number and tickets.
-        env.require(owners(alice, 1), tickets(alice, 1));
+        env.require(Owners(alice, 1), tickets(alice, 1));
         BEAST_EXPECT(ticketSeq + 1 == env.seq(alice));
     }
 
diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp
index af5001b06e..50340497a4 100644
--- a/src/test/app/Transaction_ordering_test.cpp
+++ b/src/test/app/Transaction_ordering_test.cpp
@@ -20,7 +20,7 @@
 
 namespace xrpl::test {
 
-struct Transaction_ordering_test : public beast::unit_test::suite
+struct Transaction_ordering_test : public beast::unit_test::Suite
 {
     void
     testCorrectOrder()
@@ -34,8 +34,8 @@ struct Transaction_ordering_test : public beast::unit_test::suite
 
         auto const aliceSequence = env.seq(alice);
 
-        auto const tx1 = env.jt(noop(alice), seq(aliceSequence));
-        auto const tx2 = env.jt(noop(alice), seq(aliceSequence + 1), last_ledger_seq(7));
+        auto const tx1 = env.jt(noop(alice), Seq(aliceSequence));
+        auto const tx2 = env.jt(noop(alice), Seq(aliceSequence + 1), LastLedgerSeq(7));
 
         env(tx1);
         env.close();
@@ -73,10 +73,10 @@ struct Transaction_ordering_test : public beast::unit_test::suite
 
         auto const aliceSequence = env.seq(alice);
 
-        auto const tx1 = env.jt(noop(alice), seq(aliceSequence));
-        auto const tx2 = env.jt(noop(alice), seq(aliceSequence + 1), last_ledger_seq(7));
+        auto const tx1 = env.jt(noop(alice), Seq(aliceSequence));
+        auto const tx2 = env.jt(noop(alice), Seq(aliceSequence + 1), LastLedgerSeq(7));
 
-        env(tx2, ter(terPRE_SEQ));
+        env(tx2, Ter(terPRE_SEQ));
         BEAST_EXPECT(env.seq(alice) == aliceSequence);
         env(tx1);
         env.app().getJobQueue().rendezvous();
@@ -116,12 +116,12 @@ struct Transaction_ordering_test : public beast::unit_test::suite
         tx.reserve(kSIZE);
         for (auto i = 0; i < kSIZE; ++i)
         {
-            tx.emplace_back(env.jt(noop(alice), seq(aliceSequence + i), last_ledger_seq(7)));
+            tx.emplace_back(env.jt(noop(alice), Seq(aliceSequence + i), LastLedgerSeq(7)));
         }
 
         for (auto i = 1; i < kSIZE; ++i)
         {
-            env(tx[i], ter(terPRE_SEQ));
+            env(tx[i], Ter(terPRE_SEQ));
             BEAST_EXPECT(env.seq(alice) == aliceSequence);
         }
 
diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp
index e6cc7e71ca..fe3d442f73 100644
--- a/src/test/app/TrustAndBalance_test.cpp
+++ b/src/test/app/TrustAndBalance_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl {
 
-class TrustAndBalance_test : public beast::unit_test::suite
+class TrustAndBalance_test : public beast::unit_test::Suite
 {
     void
     testPayNonexistent(FeatureBitset features)
@@ -32,7 +32,7 @@ class TrustAndBalance_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         Env env{*this, features};
-        env(pay(env.master, "alice", XRP(1)), ter(tecNO_DST_INSUF_XRP));
+        env(pay(env.master, "alice", XRP(1)), Ter(tecNO_DST_INSUF_XRP));
         env.close();
     }
 
@@ -45,7 +45,7 @@ class TrustAndBalance_test : public beast::unit_test::suite
         Env env{*this};
         Account const alice{"alice"};
 
-        env(trust(env.master, alice["USD"](100)), ter(tecNO_DST));
+        env(trust(env.master, alice["USD"](100)), Ter(tecNO_DST));
     }
 
     void
@@ -92,7 +92,7 @@ class TrustAndBalance_test : public beast::unit_test::suite
         BEAST_EXPECT(jrr[jss::node][sfLowLimit.fieldName][jss::currency] == "USD");
 
         // set negative limit - expect failure
-        env(trust(alice, gw["USD"](-1)), ter(temBAD_LIMIT));
+        env(trust(alice, gw["USD"](-1)), Ter(temBAD_LIMIT));
 
         // set zero limit
         env(trust(alice, gw["USD"](0)));
@@ -138,34 +138,34 @@ class TrustAndBalance_test : public beast::unit_test::suite
 
         // alice sends bob partial with alice as issuer
         env(pay(alice, bob, alice["USD"](24)));
-        env.require(balance(bob, alice["USD"](24)));
+        env.require(Balance(bob, alice["USD"](24)));
 
         // alice sends bob more with bob as issuer
         env(pay(alice, bob, bob["USD"](33)));
-        env.require(balance(bob, alice["USD"](57)));
+        env.require(Balance(bob, alice["USD"](57)));
 
         // bob sends back more than sent
         env(pay(bob, alice, bob["USD"](90)));
-        env.require(balance(bob, alice["USD"](-33)));
+        env.require(Balance(bob, alice["USD"](-33)));
 
         // alice sends to her limit
         env(pay(alice, bob, bob["USD"](733)));
-        env.require(balance(bob, alice["USD"](700)));
+        env.require(Balance(bob, alice["USD"](700)));
 
         // bob sends to his limit
         env(pay(bob, alice, bob["USD"](1300)));
-        env.require(balance(bob, alice["USD"](-600)));
+        env.require(Balance(bob, alice["USD"](-600)));
 
         // bob sends past limit
-        env(pay(bob, alice, bob["USD"](1)), ter(tecPATH_DRY));
-        env.require(balance(bob, alice["USD"](-600)));
+        env(pay(bob, alice, bob["USD"](1)), Ter(tecPATH_DRY));
+        env.require(Balance(bob, alice["USD"](-600)));
     }
 
     void
-    testWithTransferFee(bool subscribe, bool with_rate, FeatureBitset features)
+    testWithTransferFee(bool subscribe, bool withRate, FeatureBitset features)
     {
         testcase(
-            std::string("Direct Payment: ") + (with_rate ? "With " : "Without ") + " Xfer Fee, " +
+            std::string("Direct Payment: ") + (withRate ? "With " : "Without ") + " Xfer Fee, " +
             (subscribe ? "With " : "Without ") + " Subscribe");
         using namespace test::jtx;
 
@@ -184,23 +184,23 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env(pay(gw, alice, alice["AUD"](1)));
         env.close();
 
-        env.require(balance(alice, gw["AUD"](1)));
+        env.require(Balance(alice, gw["AUD"](1)));
 
         // alice sends bob 1 AUD
         env(pay(alice, bob, gw["AUD"](1)));
         env.close();
 
-        env.require(balance(alice, gw["AUD"](0)));
-        env.require(balance(bob, gw["AUD"](1)));
-        env.require(balance(gw, bob["AUD"](-1)));
+        env.require(Balance(alice, gw["AUD"](0)));
+        env.require(Balance(bob, gw["AUD"](1)));
+        env.require(Balance(gw, bob["AUD"](-1)));
 
-        if (with_rate)
+        if (withRate)
         {
             // set a transfer rate
             env(rate(gw, 1.1));
             env.close();
             // bob sends alice 0.5 AUD with a max to spend
-            env(pay(bob, alice, gw["AUD"](0.5)), sendmax(gw["AUD"](0.55)));
+            env(pay(bob, alice, gw["AUD"](0.5)), Sendmax(gw["AUD"](0.55)));
         }
         else
         {
@@ -208,16 +208,16 @@ class TrustAndBalance_test : public beast::unit_test::suite
             env(pay(bob, alice, gw["AUD"](0.5)));
         }
 
-        env.require(balance(alice, gw["AUD"](0.5)));
-        env.require(balance(bob, gw["AUD"](with_rate ? 0.45 : 0.5)));
-        env.require(balance(gw, bob["AUD"](with_rate ? -0.45 : -0.5)));
+        env.require(Balance(alice, gw["AUD"](0.5)));
+        env.require(Balance(bob, gw["AUD"](withRate ? 0.45 : 0.5)));
+        env.require(Balance(gw, bob["AUD"](withRate ? -0.45 : -0.5)));
 
         if (subscribe)
         {
-            Json::Value jvs;
-            jvs[jss::accounts] = Json::arrayValue;
+            json::Value jvs;
+            jvs[jss::accounts] = json::ArrayValue;
             jvs[jss::accounts].append(gw.human());
-            jvs[jss::streams] = Json::arrayValue;
+            jvs[jss::streams] = json::ArrayValue;
             jvs[jss::streams].append("transactions");
             jvs[jss::streams].append("ledger");
             auto jv = wsc->invoke("subscribe", jvs);
@@ -258,30 +258,30 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env(trust(bob, gw["AUD"](100)));
 
         env(pay(gw, alice, alice["AUD"](4.4)));
-        env.require(balance(alice, gw["AUD"](4.4)));
+        env.require(Balance(alice, gw["AUD"](4.4)));
 
         // alice sends gw issues to bob with a max spend that allows for the
         // xfer rate
-        env(pay(alice, bob, gw["AUD"](1)), sendmax(gw["AUD"](1.1)));
-        env.require(balance(alice, gw["AUD"](3.3)));
-        env.require(balance(bob, gw["AUD"](1)));
+        env(pay(alice, bob, gw["AUD"](1)), Sendmax(gw["AUD"](1.1)));
+        env.require(Balance(alice, gw["AUD"](3.3)));
+        env.require(Balance(bob, gw["AUD"](1)));
 
         // alice sends bob issues to bob with a max spend
-        env(pay(alice, bob, bob["AUD"](1)), sendmax(gw["AUD"](1.1)));
-        env.require(balance(alice, gw["AUD"](2.2)));
-        env.require(balance(bob, gw["AUD"](2)));
+        env(pay(alice, bob, bob["AUD"](1)), Sendmax(gw["AUD"](1.1)));
+        env.require(Balance(alice, gw["AUD"](2.2)));
+        env.require(Balance(bob, gw["AUD"](2)));
 
         // alice sends gw issues to bob with a max spend
-        env(pay(alice, bob, gw["AUD"](1)), sendmax(alice["AUD"](1.1)));
-        env.require(balance(alice, gw["AUD"](1.1)));
-        env.require(balance(bob, gw["AUD"](3)));
+        env(pay(alice, bob, gw["AUD"](1)), Sendmax(alice["AUD"](1.1)));
+        env.require(Balance(alice, gw["AUD"](1.1)));
+        env.require(Balance(bob, gw["AUD"](3)));
 
         // alice sends bob issues to bob with a max spend in alice issues.
         // expect fail since gw is not involved
-        env(pay(alice, bob, bob["AUD"](1)), sendmax(alice["AUD"](1.1)), ter(tecPATH_DRY));
+        env(pay(alice, bob, bob["AUD"](1)), Sendmax(alice["AUD"](1.1)), Ter(tecPATH_DRY));
 
-        env.require(balance(alice, gw["AUD"](1.1)));
-        env.require(balance(bob, gw["AUD"](3)));
+        env.require(Balance(alice, gw["AUD"](1.1)));
+        env.require(Balance(bob, gw["AUD"](3)));
     }
 
     void
@@ -304,32 +304,32 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env(pay(gw, alice, alice["USD"](70)));
         env(pay(gw, bob, bob["USD"](50)));
 
-        env.require(balance(alice, gw["USD"](70)));
-        env.require(balance(bob, gw["USD"](50)));
+        env.require(Balance(alice, gw["USD"](70)));
+        env.require(Balance(bob, gw["USD"](50)));
 
         // alice sends more than has to issuer: 100 out of 70
-        env(pay(alice, gw, gw["USD"](100)), ter(tecPATH_PARTIAL));
+        env(pay(alice, gw, gw["USD"](100)), Ter(tecPATH_PARTIAL));
 
         // alice sends more than has to bob: 100 out of 70
-        env(pay(alice, bob, gw["USD"](100)), ter(tecPATH_PARTIAL));
+        env(pay(alice, bob, gw["USD"](100)), Ter(tecPATH_PARTIAL));
 
         env.close();
 
-        env.require(balance(alice, gw["USD"](70)));
-        env.require(balance(bob, gw["USD"](50)));
+        env.require(Balance(alice, gw["USD"](70)));
+        env.require(Balance(bob, gw["USD"](50)));
 
         // send with an account path
-        env(pay(alice, bob, gw["USD"](5)), test::jtx::path(gw));
+        env(pay(alice, bob, gw["USD"](5)), test::jtx::Path(gw));
 
-        env.require(balance(alice, gw["USD"](65)));
-        env.require(balance(bob, gw["USD"](55)));
+        env.require(Balance(alice, gw["USD"](65)));
+        env.require(Balance(bob, gw["USD"](55)));
     }
 
     void
-    testIndirectMultiPath(bool with_rate, FeatureBitset features)
+    testIndirectMultiPath(bool withRate, FeatureBitset features)
     {
         testcase(
-            std::string("Indirect Payment, Multi Path, ") + (with_rate ? "With " : "Without ") +
+            std::string("Indirect Payment, Multi Path, ") + (withRate ? "With " : "Without ") +
             " Xfer Fee, ");
         using namespace test::jtx;
 
@@ -349,7 +349,7 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env(trust(carol, alice["USD"](700)));
         env(trust(carol, gw["USD"](1000)));
 
-        if (with_rate)
+        if (withRate)
             env(rate(gw, 1.1));
 
         env(pay(gw, bob, bob["USD"](100)));
@@ -357,33 +357,33 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env.close();
 
         // alice pays amazon via multiple paths
-        if (with_rate)
+        if (withRate)
         {
             env(pay(alice, amazon, gw["USD"](150)),
-                sendmax(alice["USD"](200)),
-                test::jtx::path(bob),
-                test::jtx::path(carol));
+                Sendmax(alice["USD"](200)),
+                test::jtx::Path(bob),
+                test::jtx::Path(carol));
         }
         else
         {
-            env(pay(alice, amazon, gw["USD"](150)), test::jtx::path(bob), test::jtx::path(carol));
+            env(pay(alice, amazon, gw["USD"](150)), test::jtx::Path(bob), test::jtx::Path(carol));
         }
 
-        if (with_rate)
+        if (withRate)
         {
-            env.require(balance(
+            env.require(Balance(
                 alice,
-                STAmount(carol["USD"], 6500000000000000ull, -14, true, STAmount::unchecked{})));
-            env.require(balance(carol, gw["USD"](35)));
+                STAmount(carol["USD"], 6500000000000000ull, -14, true, STAmount::Unchecked{})));
+            env.require(Balance(carol, gw["USD"](35)));
         }
         else
         {
-            env.require(balance(alice, carol["USD"](-50)));
-            env.require(balance(carol, gw["USD"](50)));
+            env.require(Balance(alice, carol["USD"](-50)));
+            env.require(Balance(carol, gw["USD"](50)));
         }
-        env.require(balance(alice, bob["USD"](-100)));
-        env.require(balance(amazon, gw["USD"](150)));
-        env.require(balance(bob, gw["USD"](0)));
+        env.require(Balance(alice, bob["USD"](-100)));
+        env.require(Balance(amazon, gw["USD"](150)));
+        env.require(Balance(bob, gw["USD"](0)));
     }
 
     void
@@ -399,18 +399,18 @@ class TrustAndBalance_test : public beast::unit_test::suite
         env.fund(XRP(10000), alice);
         env.close();
 
-        Json::Value jvs;
-        jvs[jss::accounts] = Json::arrayValue;
+        json::Value jvs;
+        jvs[jss::accounts] = json::ArrayValue;
         jvs[jss::accounts].append(env.master.human());
-        jvs[jss::streams] = Json::arrayValue;
+        jvs[jss::streams] = json::ArrayValue;
         jvs[jss::streams].append("transactions");
         BEAST_EXPECT(wsc->invoke("subscribe", jvs)[jss::status] == "success");
 
         char const* invoiceId = "243F6A8885A308D313198A2E03707344A4093822299F31D0082EFA98EC4E6C89";
 
-        Json::Value jv;
+        json::Value jv;
         auto tx =
-            env.jt(pay(env.master, alice, XRP(10000)), json(sfInvoiceID.fieldName, invoiceId));
+            env.jt(pay(env.master, alice, XRP(10000)), Json(sfInvoiceID.fieldName, invoiceId));
         jv[jss::tx_blob] = strHex(tx.stx->getSerializer().slice());
         auto jrr = wsc->invoke("submit", jv)[jss::result];
         BEAST_EXPECT(jrr[jss::status] == "success");
@@ -448,7 +448,7 @@ public:
         };
 
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeatures(sa - featurePermissionedDEX);
         testWithFeatures(sa);
     }
diff --git a/src/test/app/TrustSet_test.cpp b/src/test/app/TrustSet_test.cpp
index 6d24b695c7..31b7e97ee7 100644
--- a/src/test/app/TrustSet_test.cpp
+++ b/src/test/app/TrustSet_test.cpp
@@ -26,7 +26,7 @@
 
 namespace xrpl::test {
 
-class TrustSet_test : public beast::unit_test::suite
+class TrustSet_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -57,7 +57,7 @@ public:
         env.require(lines(becky, 1));
 
         // Fetch the trust-lines via RPC for verification
-        Json::Value jv;
+        json::Value jv;
         jv["account"] = becky.human();
         auto beckyLines = env.rpc("json", "account_lines", to_string(jv));
 
@@ -135,7 +135,7 @@ public:
         env.require(lines(becky, 1));
 
         // Fetch the trust-lines via RPC for verification
-        Json::Value jv;
+        json::Value jv;
         jv["account"] = becky.human();
         auto beckyLines = env.rpc("json", "account_lines", to_string(jv));
 
@@ -201,24 +201,24 @@ public:
                 + drops(3 * txFee) /* and to pay for 3 transactions */,
             creator);
 
-        env(trust(creator, gwA["USD"](100)), require(lines(creator, 1)));
-        env(trust(creator, gwB["USD"](100)), require(lines(creator, 2)));
+        env(trust(creator, gwA["USD"](100)), Require(lines(creator, 1)));
+        env(trust(creator, gwB["USD"](100)), Require(lines(creator, 2)));
 
         if (thirdLineCreatesLE)
         {
             // creator does not have enough for the third trust line
             env(trust(creator, assistor["USD"](100)),
-                ter(tecNO_LINE_INSUF_RESERVE),
-                require(lines(creator, 2)));
+                Ter(tecNO_LINE_INSUF_RESERVE),
+                Require(lines(creator, 2)));
         }
         else
         {
             // First establish opposite trust direction from assistor
-            env(trust(assistor, creator["USD"](100)), require(lines(creator, 3)));
+            env(trust(assistor, creator["USD"](100)), Require(lines(creator, 3)));
 
             // creator does not have enough to create the other direction on
             // the existing trust line ledger entry
-            env(trust(creator, assistor["USD"](100)), ter(tecINSUF_RESERVE_LINE));
+            env(trust(creator, assistor["USD"](100)), Ter(tecINSUF_RESERVE_LINE));
         }
 
         // Fund creator additional amount to cover
@@ -226,13 +226,13 @@ public:
 
         if (thirdLineCreatesLE)
         {
-            env(trust(creator, assistor["USD"](100)), require(lines(creator, 3)));
+            env(trust(creator, assistor["USD"](100)), Require(lines(creator, 3)));
         }
         else
         {
-            env(trust(creator, assistor["USD"](100)), require(lines(creator, 3)));
+            env(trust(creator, assistor["USD"](100)), Require(lines(creator, 3)));
 
-            Json::Value jv;
+            json::Value jv;
             jv["account"] = creator.human();
             auto const lines = env.rpc("json", "account_lines", to_string(jv));
             // Verify that all lines have 100 limit from creator
@@ -256,13 +256,13 @@ public:
         Env env{*this, features};
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice);
         env.close();
 
         // Cannot pay alice without a trustline.
-        env(pay(gw, alice, USD(200)), ter(tecPATH_DRY));
+        env(pay(gw, alice, usd(200)), Ter(tecPATH_DRY));
         env.close();
 
         // Create a ticket.
@@ -271,20 +271,20 @@ public:
         env.close();
 
         // Use that ticket to create a trust line.
-        env(trust(alice, USD(1000)), ticket::use(ticketSeq));
+        env(trust(alice, usd(1000)), ticket::Use(ticketSeq));
         env.close();
 
         // Now the payment succeeds.
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
     }
 
-    static Json::Value
-    trust_explicit_amt(jtx::Account const& a, STAmount const& amt)
+    static json::Value
+    trustExplicitAmt(jtx::Account const& a, STAmount const& amt)
     {
-        Json::Value jv;
+        json::Value jv;
         jv[jss::Account] = a.human();
-        jv[jss::LimitAmount] = amt.getJson(JsonOptions::none);
+        jv[jss::LimitAmount] = amt.getJson(JsonOptions::KNone);
         jv[jss::TransactionType] = jss::TrustSet;
         jv[jss::Flags] = 0;
         return jv;
@@ -309,28 +309,28 @@ public:
             if ((badFlag & tfTrustSetMask) != 0u)
             {
                 env(trust(alice, gw["USD"](100), static_cast<std::uint32_t>(badFlag)),
-                    ter(temINVALID_FLAG));
+                    Ter(temINVALID_FLAG));
             }
         }
 
         // trust amount can't be XRP
-        env(trust_explicit_amt(alice, drops(10000)), ter(temBAD_LIMIT));
+        env(trustExplicitAmt(alice, drops(10000)), Ter(temBAD_LIMIT));
 
         // trust amount can't be badCurrency IOU
-        env(trust_explicit_amt(alice, gw[to_string(badCurrency())](100)), ter(temBAD_CURRENCY));
+        env(trustExplicitAmt(alice, gw[to_string(badCurrency())](100)), Ter(temBAD_CURRENCY));
 
         // trust amount can't be negative
-        env(trust(alice, gw["USD"](-1000)), ter(temBAD_LIMIT));
+        env(trust(alice, gw["USD"](-1000)), Ter(temBAD_LIMIT));
 
         // trust amount can't be from invalid issuer
-        env(trust_explicit_amt(alice, STAmount{Issue{to_currency("USD"), noAccount()}, 100}),
-            ter(temDST_NEEDED));
+        env(trustExplicitAmt(alice, STAmount{Issue{toCurrency("USD"), noAccount()}, 100}),
+            Ter(temDST_NEEDED));
 
         // trust cannot be to self
-        env(trust(alice, alice["USD"](100)), ter(temDST_IS_SRC));
+        env(trust(alice, alice["USD"](100)), Ter(temDST_IS_SRC));
 
         // tfSetAuth flag should not be set if not required by lsfRequireAuth
-        env(trust(alice, gw["USD"](100), tfSetfAuth), ter(tefNO_AUTH_REQUIRED));
+        env(trust(alice, gw["USD"](100), tfSetfAuth), Ter(tefNO_AUTH_REQUIRED));
     }
 
     void
@@ -352,7 +352,7 @@ public:
         env.close();
 
         // send a payment for a large quantity through the trust line
-        env(pay(gw, alice, gw["USD"](200)), ter(tecPATH_PARTIAL));
+        env(pay(gw, alice, gw["USD"](200)), Ter(tecPATH_PARTIAL));
         env.close();
 
         // on the other hand, smaller payments should succeed
@@ -385,7 +385,7 @@ public:
         env.close();
 
         // send a payment from alice to bob, validate that the payment fails
-        env(pay(alice, bob, alice["USD"](10)), ter(tecPATH_DRY));
+        env(pay(alice, bob, alice["USD"](10)), Ter(tecPATH_DRY));
         env.close();
     }
 
@@ -409,21 +409,21 @@ public:
         env.close();
 
         // archetypical payment transaction from alice to bob must succeed
-        env(pay(alice, bob, alice["USD"](20)), ter(tesSUCCESS));
+        env(pay(alice, bob, alice["USD"](20)), Ter(tesSUCCESS));
         env.close();
 
         // Issued tokens are fungible. i.e. alice's USD is identical to bob's
         // USD
-        env(pay(bob, alice, bob["USD"](10)), ter(tesSUCCESS));
+        env(pay(bob, alice, bob["USD"](10)), Ter(tesSUCCESS));
         env.close();
 
         // bob cannot place alice in his debt i.e. alice's balance of the USD
         // tokens cannot go below zero.
-        env(pay(bob, alice, bob["USD"](11)), ter(tecPATH_PARTIAL));
+        env(pay(bob, alice, bob["USD"](11)), Ter(tecPATH_PARTIAL));
         env.close();
 
         // payments that respect the trust line limits of alice should succeed
-        env(pay(bob, alice, bob["USD"](10)), ter(tesSUCCESS));
+        env(pay(bob, alice, bob["USD"](10)), Ter(tesSUCCESS));
         env.close();
     }
 
@@ -456,8 +456,8 @@ public:
         auto& tx1 = createQuality ? txWithQuality : txWithoutQuality;
         auto& tx2 = createQuality ? txWithoutQuality : txWithQuality;
 
-        auto check_quality = [&](bool const exists) {
-            Json::Value jv;
+        auto checkQuality = [&](bool const exists) {
+            json::Value jv;
             jv["account"] = toAcct.human();
             auto const lines = env.rpc("json", "account_lines", to_string(jv));
             auto quality = exists ? 1000 : 0;
@@ -467,11 +467,11 @@ public:
             BEAST_EXPECT(lines[jss::result][jss::lines][0u][jss::quality_out] == quality);
         };
 
-        env(tx1, require(lines(toAcct, 1)), require(lines(fromAcct, 1)));
-        check_quality(createQuality);
+        env(tx1, Require(lines(toAcct, 1)), Require(lines(fromAcct, 1)));
+        checkQuality(createQuality);
 
-        env(tx2, require(lines(toAcct, 1)), require(lines(fromAcct, 1)));
-        check_quality(!createQuality);
+        env(tx2, Require(lines(toAcct, 1)), Require(lines(fromAcct, 1)));
+        checkQuality(!createQuality);
     }
 
     void
@@ -490,7 +490,7 @@ public:
                 Env env{*this, amend};
                 auto const dist = Account("dist");
                 auto const gw = Account("gw");
-                auto const USD = gw["USD"];
+                auto const usd = gw["USD"];
                 auto const distUSD = dist["USD"];
 
                 env.fund(XRP(1000), gw, dist);
@@ -502,17 +502,17 @@ public:
                 env(fset(dist, asfDisallowIncomingTrustline));
                 env.close();
 
-                env(trust(dist, USD(10000)));
+                env(trust(dist, usd(10000)));
                 env.close();
 
                 // withFix: can set trustline
                 // withOutFix: cannot set trustline
-                auto const trustResult = withFix ? ter(tesSUCCESS) : ter(tecNO_PERMISSION);
-                env(trust(gw, distUSD(10000)), txflags(tfSetfAuth), trustResult);
+                auto const trustResult = withFix ? Ter(tesSUCCESS) : Ter(tecNO_PERMISSION);
+                env(trust(gw, distUSD(10000)), Txflags(tfSetfAuth), trustResult);
                 env.close();
 
-                auto const txResult = withFix ? ter(tesSUCCESS) : ter(tecPATH_DRY);
-                env(pay(gw, dist, USD(1000)), txResult);
+                auto const txResult = withFix ? Ter(tesSUCCESS) : Ter(tecPATH_DRY);
+                env(pay(gw, dist, usd(1000)), txResult);
                 env.close();
             }
         }
@@ -522,7 +522,7 @@ public:
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), gw, alice, bob);
         env.close();
@@ -532,7 +532,7 @@ public:
         env.close();
 
         // Create a trustline which will fail
-        env(trust(alice, USD(1000)), ter(tecNO_PERMISSION));
+        env(trust(alice, usd(1000)), Ter(tecNO_PERMISSION));
         env.close();
 
         // Unset the flag
@@ -540,11 +540,11 @@ public:
         env.close();
 
         // Create a trustline which will now succeed
-        env(trust(alice, USD(1000)));
+        env(trust(alice, usd(1000)));
         env.close();
 
         // Now the payment succeeds.
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Set flag on gateway again
@@ -552,12 +552,12 @@ public:
         env.close();
 
         // Destroy the balance by sending it back
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // The trustline still exists in default state
         // So a further payment should work
-        env(pay(gw, alice, USD(200)));
+        env(pay(gw, alice, usd(200)));
         env.close();
 
         // Also set the flag on bob
@@ -565,12 +565,12 @@ public:
         env.close();
 
         // But now bob can't open a trustline because he didn't already have one
-        env(trust(bob, USD(1000)), ter(tecNO_PERMISSION));
+        env(trust(bob, usd(1000)), Ter(tecNO_PERMISSION));
         env.close();
 
         // The gateway also can't open this trustline because bob has the flag
         // set
-        env(trust(gw, bob["USD"](1000)), ter(tecNO_PERMISSION));
+        env(trust(gw, bob["USD"](1000)), Ter(tecNO_PERMISSION));
         env.close();
 
         // Unset the flag only on the gateway
@@ -578,11 +578,11 @@ public:
         env.close();
 
         // Now bob can open a trustline
-        env(trust(bob, USD(1000)));
+        env(trust(bob, usd(1000)));
         env.close();
 
         // And the gateway can send bob a balance
-        env(pay(gw, bob, USD(200)));
+        env(pay(gw, bob, usd(200)));
         env.close();
     }
 
@@ -614,7 +614,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testWithFeats(sa);
     }
 };
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index 844a3cd743..52781ee9e3 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -57,11 +57,11 @@
 
 namespace xrpl::test {
 
-class TxQPosNegFlows_test : public beast::unit_test::suite
+class TxQPosNegFlows_test : public beast::unit_test::Suite
 {
     // Same as corresponding values from TxQ.h
-    static constexpr FeeLevel64 baseFeeLevel{256};
-    static constexpr FeeLevel64 minEscalationFeeLevel = baseFeeLevel * 500;
+    static constexpr FeeLevel64 kBASE_FEE_LEVEL{256};
+    static constexpr FeeLevel64 kMIN_ESCALATION_FEE_LEVEL = kBASE_FEE_LEVEL * 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, minEscalationFeeLevel).fee();
+        return std::max(expectedMedFeeLevel, kMIN_ESCALATION_FEE_LEVEL).fee();
     }
 
     static auto
@@ -179,7 +179,7 @@ public:
         auto hank = Account("hank");
         auto iris = Account("iris");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
         auto const baseFee = env.current()->fees().base.drops();
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 3);
@@ -193,11 +193,11 @@ public:
         checkMetrics(*this, env, 1, std::nullopt, 4, 3);
 
         // Bob with really high fee - applies
-        env(noop(bob), fee(openLedgerCost(env)));
+        env(noop(bob), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, std::nullopt, 5, 3);
 
         // Daria with low fee: hold
-        env(noop(daria), fee(baseFee * 100), queued);
+        env(noop(daria), Fee(baseFee * 100), queued);
         checkMetrics(*this, env, 2, std::nullopt, 5, 3);
 
         env.close();
@@ -211,16 +211,16 @@ public:
         checkMetrics(*this, env, 0, 10, 6, 5);
 
         // Now get a bunch of transactions held.
-        env(noop(alice), fee(baseFee * 1.2), queued);
+        env(noop(alice), Fee(baseFee * 1.2), queued);
         checkMetrics(*this, env, 1, 10, 6, 5);
 
-        env(noop(bob), fee(baseFee), queued);  // won't clear the queue
-        env(noop(charlie), fee(baseFee * 2), queued);
-        env(noop(daria), fee(baseFee * 1.5), queued);
-        env(noop(elmo), fee(baseFee * 1.1), queued);
-        env(noop(fred), fee(baseFee * 1.9), queued);
-        env(noop(gwen), fee(baseFee * 1.6), queued);
-        env(noop(hank), fee(baseFee * 1.8), queued);
+        env(noop(bob), Fee(baseFee), queued);  // won't clear the queue
+        env(noop(charlie), Fee(baseFee * 2), queued);
+        env(noop(daria), Fee(baseFee * 1.5), queued);
+        env(noop(elmo), Fee(baseFee * 1.1), queued);
+        env(noop(fred), Fee(baseFee * 1.9), queued);
+        env(noop(gwen), Fee(baseFee * 1.6), queued);
+        env(noop(hank), Fee(baseFee * 1.8), queued);
         checkMetrics(*this, env, 8, 10, 6, 5);
 
         env.close();
@@ -232,32 +232,32 @@ public:
         //////////////////////////////////////////////////////////////
 
         // Hank sends another txn
-        env(noop(hank), fee(baseFee), queued);
+        env(noop(hank), Fee(baseFee), queued);
         // But he's not going to leave it in the queue
         checkMetrics(*this, env, 2, 12, 7, 6);
 
         // Hank sees his txn got held and bumps the fee,
         // but doesn't even bump it enough to requeue
-        env(noop(hank), fee(baseFee * 1.1), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(hank), Fee(baseFee * 1.1), Ter(telCAN_NOT_QUEUE_FEE));
         checkMetrics(*this, env, 2, 12, 7, 6);
 
         // Hank sees his txn got held and bumps the fee,
         // enough to requeue, but doesn't bump it enough to
         // apply to the ledger
-        env(noop(hank), fee(baseFee * 600), queued);
+        env(noop(hank), Fee(baseFee * 600), queued);
         // But he's not going to leave it in the queue
         checkMetrics(*this, env, 2, 12, 7, 6);
 
         // Hank sees his txn got held and bumps the fee,
         // high enough to get into the open ledger, because
         // he doesn't want to wait.
-        env(noop(hank), fee(openLedgerCost(env)));
+        env(noop(hank), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, 12, 8, 6);
 
         // Hank then sends another, less important txn
         // (In addition to the metrics, this will verify that
         //  the original txn got removed.)
-        env(noop(hank), fee(baseFee * 2), queued);
+        env(noop(hank), Fee(baseFee * 2), queued);
         checkMetrics(*this, env, 2, 12, 8, 6);
 
         env.close();
@@ -276,39 +276,39 @@ public:
 
         //////////////////////////////////////////////////////////////
 
-        constexpr auto largeFeeMultiplier = 700;
-        auto const largeFee = baseFee * largeFeeMultiplier;
+        constexpr auto kLARGE_FEE_MULTIPLIER = 700;
+        auto const largeFee = baseFee * kLARGE_FEE_MULTIPLIER;
 
         // Stuff the ledger and queue so we can verify that
         // stuff gets kicked out.
-        env(noop(hank), fee(largeFee));
-        env(noop(gwen), fee(largeFee));
-        env(noop(fred), fee(largeFee));
-        env(noop(elmo), fee(largeFee));
+        env(noop(hank), Fee(largeFee));
+        env(noop(gwen), Fee(largeFee));
+        env(noop(fred), Fee(largeFee));
+        env(noop(elmo), Fee(largeFee));
         checkMetrics(*this, env, 0, 6, 4, 3);
 
         // Use explicit fees so we can control which txn
         // will get dropped
         // This one gets into the queue, but gets dropped when the
         // higher fee one is added later.
-        env(noop(daria), fee(baseFee * 1.5), queued);
+        env(noop(daria), Fee(baseFee * 1.5), queued);
         // These stay in the queue.
-        env(noop(elmo), fee(baseFee * 1.6), queued);
-        env(noop(fred), fee(baseFee * 1.7), queued);
-        env(noop(gwen), fee(baseFee * 1.8), queued);
-        env(noop(hank), fee(baseFee * 1.9), queued);
-        env(noop(alice), fee(baseFee * 2.0), queued);
+        env(noop(elmo), Fee(baseFee * 1.6), queued);
+        env(noop(fred), Fee(baseFee * 1.7), queued);
+        env(noop(gwen), Fee(baseFee * 1.8), queued);
+        env(noop(hank), Fee(baseFee * 1.9), queued);
+        env(noop(alice), Fee(baseFee * 2.0), queued);
 
         // Queue is full now.
         checkMetrics(*this, env, 6, 6, 4, 3, txFeeLevelByAccount(env, daria) + 1);
         // Try to add another transaction with the default (low) fee,
         // it should fail because the queue is full.
-        env(noop(charlie), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(charlie), Ter(telCAN_NOT_QUEUE_FULL));
 
         // Add another transaction, with a higher fee,
         // Not high enough to get into the ledger, but high
         // enough to get into the queue (and kick somebody out)
-        env(noop(charlie), fee(baseFee * 10), queued);
+        env(noop(charlie), Fee(baseFee * 10), queued);
 
         // Queue is still full, of course, but the min fee has gone up
         checkMetrics(*this, env, 6, 6, 4, 3, txFeeLevelByAccount(env, elmo) + 1);
@@ -318,15 +318,9 @@ public:
         // point, daria's transaction that was dropped from the queue
         // is put back in. Neat.
         env.close();
-        checkMetrics(
-            *this,
-            env,
-            2,
-            8,
-            5,
-            4,
-            baseFeeLevel.fee(),
-            calcMedFeeLevel(FeeLevel64{baseFeeLevel.fee() * largeFeeMultiplier}));
+        // clang-format off
+        checkMetrics(*this, env, 2, 8, 5, 4, kBASE_FEE_LEVEL.fee(), calcMedFeeLevel(FeeLevel64{kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER}));
+        // clang-format on
 
         env.close();
         checkMetrics(*this, env, 0, 10, 2, 5);
@@ -342,13 +336,13 @@ public:
         env(noop(charlie));
         env(noop(daria));
         env(pay(alice, iris, XRP(1000)), queued);
-        env(noop(iris), seq(1), fee(baseFee * 2), ter(terNO_ACCOUNT));
+        env(noop(iris), Seq(1), Fee(baseFee * 2), Ter(terNO_ACCOUNT));
         checkMetrics(*this, env, 1, 10, 6, 5);
 
         env.close();
         checkMetrics(*this, env, 0, 12, 1, 6);
 
-        env.require(balance(iris, XRP(1000)));
+        env.require(Balance(iris, XRP(1000)));
         BEAST_EXPECT(env.seq(iris) == 11);
 
         //////////////////////////////////////////////////////////////
@@ -368,7 +362,7 @@ public:
         }
 
         // Queue one straightforward transaction
-        env(noop(env.master), fee(baseFee * 2), queued);
+        env(noop(env.master), Fee(baseFee * 2), queued);
         ++metrics.txCount;
 
         checkMetrics(
@@ -390,7 +384,7 @@ public:
 
         auto alice = Account("alice");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
         auto const baseFee = env.current()->fees().base.drops();
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 3);
@@ -407,15 +401,15 @@ public:
         // Alice requests tickets, but that transaction is queued.  So
         // Alice can't queue ticketed transactions yet.
         std::uint32_t const tkt1{env.seq(alice) + 1};
-        env(ticket::create(alice, 250), seq(tkt1 - 1), queued);
+        env(ticket::create(alice, 250), Seq(tkt1 - 1), queued);
 
-        env(noop(alice), ticket::use(tkt1 - 2), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 - 1), ter(terPRE_TICKET));
-        env.require(owners(alice, 0), tickets(alice, 0));
+        env(noop(alice), ticket::Use(tkt1 - 2), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 - 1), Ter(terPRE_TICKET));
+        env.require(Owners(alice, 0), tickets(alice, 0));
         checkMetrics(*this, env, 1, std::nullopt, 4, 3);
 
         env.close();
-        env.require(owners(alice, 250), tickets(alice, 250));
+        env.require(Owners(alice, 250), tickets(alice, 250));
         checkMetrics(*this, env, 0, 8, 1, 4);
         BEAST_EXPECT(env.seq(alice) == tkt1 + 250);
 
@@ -427,20 +421,20 @@ public:
         // Demonstrate that.
 
         // Fill the ledger so we can start queuing things.
-        env(noop(alice), ticket::use(tkt1 + 1), fee(baseFee * 1.1));
-        env(noop(alice), ticket::use(tkt1 + 2), fee(baseFee * 1.2));
-        env(noop(alice), ticket::use(tkt1 + 3), fee(baseFee * 1.3));
-        env(noop(alice), ticket::use(tkt1 + 4), fee(baseFee * 1.4));
-        env(noop(alice), ticket::use(tkt1 + 5), fee(baseFee * 1.5), queued);
+        env(noop(alice), ticket::Use(tkt1 + 1), Fee(baseFee * 1.1));
+        env(noop(alice), ticket::Use(tkt1 + 2), Fee(baseFee * 1.2));
+        env(noop(alice), ticket::Use(tkt1 + 3), Fee(baseFee * 1.3));
+        env(noop(alice), ticket::Use(tkt1 + 4), Fee(baseFee * 1.4));
+        env(noop(alice), ticket::Use(tkt1 + 5), Fee(baseFee * 1.5), queued);
         auto const expectedMinFeeLevel = txFeeLevelByAccount(env, alice) + 1;
-        env(noop(alice), ticket::use(tkt1 + 6), fee(baseFee * 1.6), queued);
-        env(noop(alice), ticket::use(tkt1 + 7), fee(baseFee * 1.7), queued);
-        env(noop(alice), ticket::use(tkt1 + 8), fee(baseFee * 1.8), queued);
-        env(noop(alice), ticket::use(tkt1 + 9), fee(baseFee * 1.9), queued);
-        env(noop(alice), ticket::use(tkt1 + 10), fee(baseFee * 2.0), queued);
-        env(noop(alice), ticket::use(tkt1 + 11), fee(baseFee * 2.1), queued);
-        env(noop(alice), ticket::use(tkt1 + 12), fee(baseFee * 2.2), queued);
-        env(noop(alice), ticket::use(tkt1 + 13), fee(baseFee * 2.3), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(tkt1 + 6), Fee(baseFee * 1.6), queued);
+        env(noop(alice), ticket::Use(tkt1 + 7), Fee(baseFee * 1.7), queued);
+        env(noop(alice), ticket::Use(tkt1 + 8), Fee(baseFee * 1.8), queued);
+        env(noop(alice), ticket::Use(tkt1 + 9), Fee(baseFee * 1.9), queued);
+        env(noop(alice), ticket::Use(tkt1 + 10), Fee(baseFee * 2.0), queued);
+        env(noop(alice), ticket::Use(tkt1 + 11), Fee(baseFee * 2.1), queued);
+        env(noop(alice), ticket::Use(tkt1 + 12), Fee(baseFee * 2.2), queued);
+        env(noop(alice), ticket::Use(tkt1 + 13), Fee(baseFee * 2.3), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 8, 8, 5, 4, expectedMinFeeLevel);
 
         // Check which of the queued transactions got into the ledger by
@@ -448,30 +442,30 @@ public:
         //  o Get tefNO_TICKET if the ticket has already been used.
         //  o Get telCAN_NOT_QUEUE_FEE if the transaction is still in the queue.
         env.close();
-        env.require(owners(alice, 240), tickets(alice, 240));
+        env.require(Owners(alice, 240), tickets(alice, 240));
 
         // These 4 went straight to the ledger:
-        env(noop(alice), ticket::use(tkt1 + 1), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 2), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 3), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 4), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 1), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 2), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 3), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 4), Ter(tefNO_TICKET));
 
         // These two are still in the TxQ:
-        env(noop(alice), ticket::use(tkt1 + 5), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt1 + 6), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 5), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 6), Ter(telCAN_NOT_QUEUE_FEE));
 
         // These six were moved from the queue into the open ledger
         // since those with the highest fees go first.
-        env(noop(alice), ticket::use(tkt1 + 7), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 8), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 9), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 10), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 11), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 12), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 7), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 8), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 9), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 10), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 11), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 12), Ter(tefNO_TICKET));
 
         // This last one was moved from the local transactions into
         // the queue.
-        env(noop(alice), ticket::use(tkt1 + 13), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 13), Ter(telCAN_NOT_QUEUE_FEE));
 
         checkMetrics(*this, env, 3, 10, 6, 5);
 
@@ -485,25 +479,25 @@ public:
         // The fee is escalated so unless we pay a sufficient fee
         // transactions will go straight to the queue.
         std::uint32_t const nextSeq{env.seq(alice)};
-        env(noop(alice), seq(nextSeq + 1), ter(terPRE_SEQ));
-        env(noop(alice), seq(nextSeq - 1), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 0), queued);
+        env(noop(alice), Seq(nextSeq + 1), Ter(terPRE_SEQ));
+        env(noop(alice), Seq(nextSeq - 1), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 0), queued);
 
         // Now that nextSeq is in the queue, we should be able to queue
         // nextSeq + 1.
-        env(noop(alice), seq(nextSeq + 1), queued);
+        env(noop(alice), Seq(nextSeq + 1), queued);
 
         // Fill the queue with sequence-based transactions.  When the
         // ledger closes we should find the three ticket-based
         // transactions gone from the queue (because they had the
         // highest fee).  Then the earliest of the sequence-based
         // transactions should also be gone from the queue.
-        env(noop(alice), seq(nextSeq + 2), queued);
-        env(noop(alice), seq(nextSeq + 3), queued);
-        env(noop(alice), seq(nextSeq + 4), queued);
-        env(noop(alice), seq(nextSeq + 5), queued);
-        env(noop(alice), seq(nextSeq + 6), queued);
-        env(noop(alice), seq(nextSeq + 7), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(nextSeq + 2), queued);
+        env(noop(alice), Seq(nextSeq + 3), queued);
+        env(noop(alice), Seq(nextSeq + 4), queued);
+        env(noop(alice), Seq(nextSeq + 5), queued);
+        env(noop(alice), Seq(nextSeq + 6), queued);
+        env(noop(alice), Seq(nextSeq + 7), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 10, 10, 6, 5, 257);
 
         // Check which of the queued transactions got into the ledger by
@@ -513,24 +507,24 @@ public:
         //  o Get telCAN_NOT_QUEUE_FEE if the transaction is still in
         //    the queue.
         env.close();
-        env.require(owners(alice, 237), tickets(alice, 237));
+        env.require(Owners(alice, 237), tickets(alice, 237));
 
         // The four ticket-based transactions went out first, since
         // they paid the highest fee.
-        env(noop(alice), ticket::use(tkt1 + 4), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 5), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 12), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 13), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 4), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 5), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 12), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 13), Ter(tefNO_TICKET));
 
         // Three of the sequence-based transactions also moved out of
         // the queue.
-        env(noop(alice), seq(nextSeq + 1), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 2), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 3), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 4), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), seq(nextSeq + 5), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), seq(nextSeq + 6), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), seq(nextSeq + 7), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 1), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 2), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 3), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 4), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 5), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 6), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 7), Ter(telCAN_NOT_QUEUE_FEE));
 
         checkMetrics(*this, env, 4, 12, 7, 6);
         BEAST_EXPECT(env.seq(alice) == nextSeq + 4);
@@ -540,46 +534,46 @@ public:
         // We haven't yet shown that ticket-based transactions can be added
         // to the queue in any order.  We should do that...
         std::uint32_t const tkt250 = tkt1 + 249;
-        env(noop(alice), ticket::use(tkt250 - 0), fee(baseFee * 3.0), queued);
-        env(noop(alice), ticket::use(tkt1 + 14), fee(baseFee * 2.9), queued);
-        env(noop(alice), ticket::use(tkt250 - 1), fee(baseFee * 2.8), queued);
-        env(noop(alice), ticket::use(tkt1 + 15), fee(baseFee * 2.7), queued);
-        env(noop(alice), ticket::use(tkt250 - 2), fee(baseFee * 2.6), queued);
-        env(noop(alice), ticket::use(tkt1 + 16), fee(baseFee * 2.5), queued);
-        env(noop(alice), ticket::use(tkt250 - 3), fee(baseFee * 2.4), ter(telCAN_NOT_QUEUE_FULL));
-        env(noop(alice), ticket::use(tkt1 + 17), fee(baseFee * 2.3), ter(telCAN_NOT_QUEUE_FULL));
-        env(noop(alice), ticket::use(tkt250 - 4), fee(baseFee * 2.2), ter(telCAN_NOT_QUEUE_FULL));
-        env(noop(alice), ticket::use(tkt1 + 18), fee(baseFee * 2.1), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(tkt250 - 0), Fee(baseFee * 3.0), queued);
+        env(noop(alice), ticket::Use(tkt1 + 14), Fee(baseFee * 2.9), queued);
+        env(noop(alice), ticket::Use(tkt250 - 1), Fee(baseFee * 2.8), queued);
+        env(noop(alice), ticket::Use(tkt1 + 15), Fee(baseFee * 2.7), queued);
+        env(noop(alice), ticket::Use(tkt250 - 2), Fee(baseFee * 2.6), queued);
+        env(noop(alice), ticket::Use(tkt1 + 16), Fee(baseFee * 2.5), queued);
+        env(noop(alice), ticket::Use(tkt250 - 3), Fee(baseFee * 2.4), Ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(tkt1 + 17), Fee(baseFee * 2.3), Ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(tkt250 - 4), Fee(baseFee * 2.2), Ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(tkt1 + 18), Fee(baseFee * 2.1), Ter(telCAN_NOT_QUEUE_FULL));
 
         checkMetrics(*this, env, 10, 12, 7, 6);
 
         env.close();
-        env.require(owners(alice, 231), tickets(alice, 231));
+        env.require(Owners(alice, 231), tickets(alice, 231));
 
         // These three ticket-based transactions escaped the queue.
-        env(noop(alice), ticket::use(tkt1 + 14), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 15), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt1 + 16), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 14), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 15), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt1 + 16), Ter(tefNO_TICKET));
 
         // But these four ticket-based transactions are in the queue
         // now; they moved into the TxQ from local transactions.
-        env(noop(alice), ticket::use(tkt250 - 3), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt1 + 17), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt250 - 4), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt1 + 18), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt250 - 3), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 17), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt250 - 4), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 18), Ter(telCAN_NOT_QUEUE_FEE));
 
         // These three ticket-based transactions also escaped the queue.
-        env(noop(alice), ticket::use(tkt250 - 2), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt250 - 1), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt250 - 0), ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt250 - 2), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt250 - 1), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt250 - 0), Ter(tefNO_TICKET));
 
         // These sequence-based transactions escaped the queue.
-        env(noop(alice), seq(nextSeq + 4), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 5), ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 4), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 5), Ter(tefPAST_SEQ));
 
         // But these sequence-based transactions are still stuck in the queue.
-        env(noop(alice), seq(nextSeq + 6), ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), seq(nextSeq + 7), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 6), Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(nextSeq + 7), Ter(telCAN_NOT_QUEUE_FEE));
 
         BEAST_EXPECT(env.seq(alice) == nextSeq + 6);
         checkMetrics(*this, env, 6, 14, 8, 7);
@@ -591,28 +585,28 @@ public:
 
         // The lowest fee ticket is baseFee * 2.1, trying to replace it
         env(noop(alice),
-            ticket::use(tkt1 + 18),
-            fee((baseFee * 2.1 * 1.25) - 1),
-            ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt1 + 18), fee((baseFee * 2.1 * 1.25) + 1), queued);
+            ticket::Use(tkt1 + 18),
+            Fee((baseFee * 2.1 * 1.25) - 1),
+            Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt1 + 18), Fee((baseFee * 2.1 * 1.25) + 1), queued);
 
         // New lowest fee ticket is baseFee * 2.2
         env(noop(alice),
-            ticket::use(tkt250 - 4),
-            fee((baseFee * 2.2 * 1.25) - 1),
-            ter(telCAN_NOT_QUEUE_FEE));
-        env(noop(alice), ticket::use(tkt250 - 4), fee((baseFee * 2.2 * 1.25) + 1), queued);
+            ticket::Use(tkt250 - 4),
+            Fee((baseFee * 2.2 * 1.25) - 1),
+            Ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), ticket::Use(tkt250 - 4), Fee((baseFee * 2.2 * 1.25) + 1), queued);
 
         env.close();
-        env.require(owners(alice, 227), tickets(alice, 227));
+        env.require(Owners(alice, 227), tickets(alice, 227));
 
         // Verify that all remaining transactions made it out of the TxQ.
-        env(noop(alice), ticket::use(tkt1 + 18), ter(tefNO_TICKET));
-        env(noop(alice), ticket::use(tkt250 - 4), ter(tefNO_TICKET));
-        env(noop(alice), seq(nextSeq + 4), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 5), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 6), ter(tefPAST_SEQ));
-        env(noop(alice), seq(nextSeq + 7), ter(tefPAST_SEQ));
+        env(noop(alice), ticket::Use(tkt1 + 18), Ter(tefNO_TICKET));
+        env(noop(alice), ticket::Use(tkt250 - 4), Ter(tefNO_TICKET));
+        env(noop(alice), Seq(nextSeq + 4), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 5), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 6), Ter(tefPAST_SEQ));
+        env(noop(alice), Seq(nextSeq + 7), Ter(tefPAST_SEQ));
 
         BEAST_EXPECT(env.seq(alice) == nextSeq + 8);
         checkMetrics(*this, env, 0, 16, 6, 8);
@@ -628,7 +622,7 @@ public:
 
         auto alice = Account("alice");
         auto gw = Account("gw");
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 2);
 
@@ -639,14 +633,14 @@ public:
         checkMetrics(*this, env, 0, 4, 0, 2);
 
         // Alice creates an unfunded offer while the ledger is not full
-        env(offer(alice, XRP(1000), USD(1000)), ter(tecUNFUNDED_OFFER));
+        env(offer(alice, XRP(1000), usd(1000)), Ter(tecUNFUNDED_OFFER));
         checkMetrics(*this, env, 0, 4, 1, 2);
 
         fillQueue(env, alice);
         checkMetrics(*this, env, 0, 4, 3, 2);
 
         // Alice creates an unfunded offer that goes in the queue
-        env(offer(alice, XRP(1000), USD(1000)), ter(terQUEUED));
+        env(offer(alice, XRP(1000), usd(1000)), Ter(terQUEUED));
         checkMetrics(*this, env, 1, 4, 3, 2);
 
         // The offer comes out of the queue
@@ -667,7 +661,7 @@ public:
         auto bob = Account("bob");
         auto charlie = Account("charlie");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
         auto const baseFee = env.current()->fees().base.drops();
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 2);
@@ -677,7 +671,7 @@ public:
         checkMetrics(*this, env, 0, std::nullopt, 3, 2);
 
         // Future transaction for Alice - fails
-        env(noop(alice), fee(openLedgerCost(env)), seq(env.seq(alice) + 1), ter(terPRE_SEQ));
+        env(noop(alice), Fee(openLedgerCost(env)), Seq(env.seq(alice) + 1), Ter(terPRE_SEQ));
         checkMetrics(*this, env, 0, std::nullopt, 3, 2);
 
         // Current transaction for Alice: held
@@ -685,19 +679,19 @@ public:
         checkMetrics(*this, env, 1, std::nullopt, 3, 2);
 
         // Alice - sequence is too far ahead, so won't queue.
-        env(noop(alice), seq(env.seq(alice) + 2), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), Seq(env.seq(alice) + 2), Ter(telCAN_NOT_QUEUE));
         checkMetrics(*this, env, 1, std::nullopt, 3, 2);
 
         // Bob with really high fee - applies
-        env(noop(bob), fee(openLedgerCost(env)));
+        env(noop(bob), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, std::nullopt, 4, 2);
 
         // Daria with low fee: hold
-        env(noop(charlie), fee(baseFee * 100), queued);
+        env(noop(charlie), Fee(baseFee * 100), queued);
         checkMetrics(*this, env, 2, std::nullopt, 4, 2);
 
         // Alice with normal fee: hold
-        env(noop(alice), seq(env.seq(alice) + 1), queued);
+        env(noop(alice), Seq(env.seq(alice) + 1), queued);
         checkMetrics(*this, env, 3, std::nullopt, 4, 2);
 
         env.close();
@@ -723,7 +717,7 @@ public:
         auto edgar = Account("edgar");
         auto felicia = Account("felicia");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
         auto const baseFee = env.current()->fees().base.drops();
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 2);
@@ -744,25 +738,25 @@ public:
 
         BEAST_EXPECT(env.current()->header().seq == 6);
         // Fail to queue an item with a low LastLedgerSeq
-        env(noop(alice), last_ledger_seq(7), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), LastLedgerSeq(7), Ter(telCAN_NOT_QUEUE));
         // Queue an item with a sufficient LastLedgerSeq.
-        env(noop(alice), last_ledger_seq(8), queued);
+        env(noop(alice), LastLedgerSeq(8), queued);
 
-        constexpr auto largeFeeMultiplier = 700;
-        auto const largeFee = baseFee * largeFeeMultiplier;
+        constexpr auto kLARGE_FEE_MULTIPLIER = 700;
+        auto const largeFee = baseFee * kLARGE_FEE_MULTIPLIER;
 
         // Queue items with higher fees to force the previous
         // txn to wait.
-        env(noop(bob), fee(largeFee), queued);
-        env(noop(charlie), fee(largeFee), queued);
-        env(noop(daria), fee(largeFee), queued);
-        env(noop(edgar), fee(largeFee), queued);
+        env(noop(bob), Fee(largeFee), queued);
+        env(noop(charlie), Fee(largeFee), queued);
+        env(noop(daria), Fee(largeFee), queued);
+        env(noop(edgar), Fee(largeFee), queued);
         checkMetrics(*this, env, 5, std::nullopt, 3, 2);
         {
             auto& txQ = env.app().getTxQ();
             auto aliceStat = txQ.getAccountTxs(alice.id());
             BEAST_EXPECT(aliceStat.size() == 1);
-            BEAST_EXPECT(aliceStat.begin()->feeLevel == baseFeeLevel);
+            BEAST_EXPECT(aliceStat.begin()->feeLevel == kBASE_FEE_LEVEL);
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             BEAST_EXPECT(aliceStat.begin()->lastValid && *aliceStat.begin()->lastValid == 8);
             BEAST_EXPECT(!aliceStat.begin()->consequences.isBlocker());
@@ -770,11 +764,12 @@ public:
             auto bobStat = txQ.getAccountTxs(bob.id());
             BEAST_EXPECT(bobStat.size() == 1);
             BEAST_EXPECT(
-                bobStat.begin()->feeLevel == FeeLevel64{baseFeeLevel.fee() * largeFeeMultiplier});
+                bobStat.begin()->feeLevel ==
+                FeeLevel64{kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER});
             BEAST_EXPECT(!bobStat.begin()->lastValid);
             BEAST_EXPECT(!bobStat.begin()->consequences.isBlocker());
 
-            auto noStat = txQ.getAccountTxs(Account::master.id());
+            auto noStat = txQ.getAccountTxs(Account::kMASTER.id());
             BEAST_EXPECT(noStat.empty());
         }
 
@@ -782,59 +777,49 @@ public:
         checkMetrics(*this, env, 1, 6, 4, 3);
 
         // Keep alice's transaction waiting.
-        env(noop(bob), fee(largeFee), queued);
-        env(noop(charlie), fee(largeFee), queued);
-        env(noop(daria), fee(largeFee), queued);
-        env(noop(edgar), fee(largeFee), queued);
-        env(noop(felicia), fee(largeFee - 1), queued);
+        env(noop(bob), Fee(largeFee), queued);
+        env(noop(charlie), Fee(largeFee), queued);
+        env(noop(daria), Fee(largeFee), queued);
+        env(noop(edgar), Fee(largeFee), queued);
+        env(noop(felicia), Fee(largeFee - 1), queued);
         checkMetrics(*this, env, 6, 6, 4, 3, 257);
 
         env.close();
         // alice's transaction is still hanging around
-        checkMetrics(
-            *this, env, 1, 8, 5, 4, baseFeeLevel.fee(), baseFeeLevel.fee() * largeFeeMultiplier);
+        // clang-format off
+        checkMetrics(*this, env, 1, 8, 5, 4, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER);
+        // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
 
-        constexpr auto anotherLargeFeeMultiplier = 800;
-        auto const anotherLargeFee = baseFee * anotherLargeFeeMultiplier;
+        constexpr auto kANOTHER_LARGE_FEE_MULTIPLIER = 800;
+        auto const anotherLargeFee = baseFee * kANOTHER_LARGE_FEE_MULTIPLIER;
         // Keep alice's transaction waiting.
-        env(noop(bob), fee(anotherLargeFee), queued);
-        env(noop(charlie), fee(anotherLargeFee), queued);
-        env(noop(daria), fee(anotherLargeFee), queued);
-        env(noop(daria), fee(anotherLargeFee), seq(env.seq(daria) + 1), queued);
-        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,
-            baseFeeLevel.fee() + 1,
-            baseFeeLevel.fee() * largeFeeMultiplier);
+        // clang-format off
+        env(noop(bob), Fee(anotherLargeFee), queued);
+        env(noop(charlie), Fee(anotherLargeFee), queued);
+        env(noop(daria), Fee(anotherLargeFee), queued);
+        env(noop(daria), Fee(anotherLargeFee), Seq(env.seq(daria) + 1), queued);
+        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);
+        // clang-format on
 
         env.close();
         // alice's transaction expired without getting
         // into the ledger, so her transaction is gone,
         // though one of felicia's is still in the queue.
-        checkMetrics(
-            *this, env, 1, 10, 6, 5, baseFeeLevel.fee(), baseFeeLevel.fee() * largeFeeMultiplier);
+        // clang-format off
+        checkMetrics(*this, env, 1, 10, 6, 5, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kLARGE_FEE_MULTIPLIER);
+        // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
         BEAST_EXPECT(env.seq(felicia) == 7);
 
         env.close();
         // And now the queue is empty
-        checkMetrics(
-            *this,
-            env,
-            0,
-            12,
-            1,
-            6,
-            baseFeeLevel.fee(),
-            baseFeeLevel.fee() * anotherLargeFeeMultiplier);
+        // clang-format off
+        checkMetrics(*this, env, 0, 12, 1, 6, kBASE_FEE_LEVEL.fee(), kBASE_FEE_LEVEL.fee() * kANOTHER_LARGE_FEE_MULTIPLIER);
+        // clang-format on
         BEAST_EXPECT(env.seq(alice) == 3);
         BEAST_EXPECT(env.seq(felicia) == 8);
     }
@@ -852,7 +837,7 @@ public:
         auto bob = Account("bob");
         auto carol = Account("carol");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
         auto const baseFee = env.current()->fees().base.drops();
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 2);
@@ -873,7 +858,7 @@ public:
         checkMetrics(*this, env, 1, std::nullopt, 3, 2);
 
         // Since Alice's queue is empty this blocker can go into her queue.
-        env(regkey(alice, bob), fee(0), queued);
+        env(regkey(alice, bob), Fee(0), queued);
         checkMetrics(*this, env, 2, std::nullopt, 3, 2);
 
         // Close out this ledger so we can get a maxsize
@@ -883,12 +868,12 @@ public:
         fillQueue(env, alice);
         checkMetrics(*this, env, 0, 6, 4, 3);
 
-        constexpr auto aliceFeeMultiplier = 3;
-        auto feeAlice = baseFee * aliceFeeMultiplier;
+        constexpr auto kALICE_FEE_MULTIPLIER = 3;
+        auto feeAlice = baseFee * kALICE_FEE_MULTIPLIER;
         auto seqAlice = env.seq(alice);
         for (int i = 0; i < 4; ++i)
         {
-            env(noop(alice), fee(feeAlice), seq(seqAlice), queued);
+            env(noop(alice), Fee(feeAlice), Seq(seqAlice), queued);
             feeAlice = (feeAlice + 1) * 125 / 100;
             ++seqAlice;
         }
@@ -896,7 +881,7 @@ public:
 
         // Bob adds a zero fee blocker to his queue.
         auto const seqBob = env.seq(bob);
-        env(regkey(bob, alice), fee(0), queued);
+        env(regkey(bob, alice), Fee(0), queued);
         checkMetrics(*this, env, 5, 6, 4, 3);
 
         // Carol fills the queue.
@@ -904,17 +889,19 @@ public:
         auto seqCarol = env.seq(carol);
         for (int i = 0; i < 4; ++i)
         {
-            env(noop(carol), fee(feeCarol), seq(seqCarol), queued);
+            env(noop(carol), Fee(feeCarol), Seq(seqCarol), queued);
             feeCarol = (feeCarol + 1) * 125 / 100;
             ++seqCarol;
         }
-        checkMetrics(*this, env, 6, 6, 4, 3, (baseFeeLevel.fee() * aliceFeeMultiplier) + 1);
+        // clang-format off
+        checkMetrics(*this, env, 6, 6, 4, 3, (kBASE_FEE_LEVEL.fee() * kALICE_FEE_MULTIPLIER) + 1);
+        // clang-format on
 
         // Carol submits high enough to beat Bob's average fee which kicks
         // out Bob's queued transaction.  However Bob's transaction stays
         // in the localTx queue, so it will return to the TxQ next time
         // around.
-        env(noop(carol), fee(feeCarol), seq(seqCarol), ter(terQUEUED));
+        env(noop(carol), Fee(feeCarol), Seq(seqCarol), Ter(terQUEUED));
 
         env.close();
         // Some of Alice's transactions stay in the queue.  Bob's
@@ -956,13 +943,13 @@ public:
         // expected.
 
         // Fail in preflight
-        env(pay(alice, bob, XRP(-1000)), ter(temBAD_AMOUNT));
+        env(pay(alice, bob, XRP(-1000)), Ter(temBAD_AMOUNT));
 
         // Fail in preflight
-        env(pay(alice, alice, XRP(100)), ter(temREDUNDANT));
+        env(pay(alice, alice, XRP(100)), Ter(temREDUNDANT));
 
         // Fail in preclaim
-        env(noop(alice), fee(XRP(100000)), ter(terINSUF_FEE_B));
+        env(noop(alice), Fee(XRP(100000)), Ter(terINSUF_FEE_B));
     }
 
     void
@@ -976,7 +963,7 @@ public:
         auto alice = Account("alice");
         auto bob = Account("bob");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 2);
 
@@ -1000,7 +987,7 @@ public:
             Env::ParsedResult parsed;
 
             env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-                auto const result = xrpl::apply(env.app(), view, *jt.stx, tapNONE, env.journal);
+                auto const result = xrpl::apply(env.app(), view, *jt.stx, TapNone, env.journal);
                 parsed.ter = result.ter;
                 return result.applied;
             });
@@ -1031,7 +1018,7 @@ public:
         auto charlie = Account("charlie");
         auto daria = Account("daria");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 3);
 
@@ -1044,7 +1031,7 @@ public:
         checkMetrics(*this, env, 0, initQueueMax, 4, 3);
 
         // Alice - price starts exploding: held
-        env(noop(alice), fee(11), queued);
+        env(noop(alice), Fee(11), queued);
         checkMetrics(*this, env, 1, initQueueMax, 4, 3);
 
         auto aliceSeq = env.seq(alice);
@@ -1052,15 +1039,15 @@ public:
         auto charlieSeq = env.seq(charlie);
 
         // Alice - try to queue a second transaction, but leave a gap
-        env(noop(alice), seq(aliceSeq + 2), fee(100), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), Seq(aliceSeq + 2), Fee(100), Ter(telCAN_NOT_QUEUE));
         checkMetrics(*this, env, 1, initQueueMax, 4, 3);
 
         // Alice - queue a second transaction. Yay!
-        env(noop(alice), seq(aliceSeq + 1), fee(13), queued);
+        env(noop(alice), Seq(aliceSeq + 1), Fee(13), queued);
         checkMetrics(*this, env, 2, initQueueMax, 4, 3);
 
         // Alice - queue a third transaction. Yay.
-        env(noop(alice), seq(aliceSeq + 2), fee(17), queued);
+        env(noop(alice), Seq(aliceSeq + 2), Fee(17), queued);
         checkMetrics(*this, env, 3, initQueueMax, 4, 3);
 
         // Bob - queue a transaction
@@ -1068,12 +1055,12 @@ public:
         checkMetrics(*this, env, 4, initQueueMax, 4, 3);
 
         // Bob - queue a second transaction
-        env(noop(bob), seq(bobSeq + 1), fee(50), queued);
+        env(noop(bob), Seq(bobSeq + 1), Fee(50), queued);
         checkMetrics(*this, env, 5, initQueueMax, 4, 3);
 
         // Charlie - queue a transaction, with a higher fee
         // than default
-        env(noop(charlie), fee(15), queued);
+        env(noop(charlie), Fee(15), queued);
         checkMetrics(*this, env, 6, initQueueMax, 4, 3, 257);
 
         BEAST_EXPECT(env.seq(alice) == aliceSeq);
@@ -1099,9 +1086,9 @@ public:
         for (auto i = 0; i < 7; i++)
         {
             env(noop(alice),
-                seq(aliceSeq),
-                json(jss::LastLedgerSequence, lastLedgerSeq + i),
-                fee(--aliceFee),
+                Seq(aliceSeq),
+                Json(jss::LastLedgerSequence, lastLedgerSeq + i),
+                Fee(--aliceFee),
                 queued);
             ++aliceSeq;
         }
@@ -1131,45 +1118,45 @@ public:
         // but you can't force your own earlier txn off the
         // queue.
         env(noop(alice),
-            seq(aliceSeq),
-            json(jss::LastLedgerSequence, lastLedgerSeq + 7),
-            fee(aliceFee),
-            ter(telCAN_NOT_QUEUE_FULL));
+            Seq(aliceSeq),
+            Json(jss::LastLedgerSequence, lastLedgerSeq + 7),
+            Fee(aliceFee),
+            Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 8, 8, 5, 4, 513);
 
         // Charlie - try to add another item to the queue,
         // which fails because fee is lower than Alice's
         // queued average.
-        env(noop(charlie), fee(19), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(charlie), Fee(19), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 8, 8, 5, 4, 513);
 
         // Charlie - add another item to the queue, which
         // causes Alice's last txn to drop
-        env(noop(charlie), fee(30), queued);
+        env(noop(charlie), Fee(30), queued);
         checkMetrics(*this, env, 8, 8, 5, 4, 538);
 
         // Alice - now attempt to add one more to the queue,
         // which fails because the last tx was dropped, so
         // there is no complete chain.
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), Ter(telCAN_NOT_QUEUE));
         checkMetrics(*this, env, 8, 8, 5, 4, 538);
 
         // Alice wants this tx more than the dropped tx,
         // so resubmits with higher fee, but the queue
         // is full, and her account is the cheapest.
-        env(noop(alice), seq(aliceSeq - 1), fee(aliceFee), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq - 1), Fee(aliceFee), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 8, 8, 5, 4, 538);
 
         // Try to replace a middle item in the queue
         // without enough fee.
         aliceSeq = env.seq(alice) + 2;
         aliceFee = 29;
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), Ter(telCAN_NOT_QUEUE_FEE));
         checkMetrics(*this, env, 8, 8, 5, 4, 538);
 
         // Replace a middle item from the queue successfully
         ++aliceFee;
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), queued);
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), queued);
         checkMetrics(*this, env, 8, 8, 5, 4, 538);
 
         env.close();
@@ -1185,18 +1172,18 @@ public:
         // more than the minimum reserve in flight before the
         // last queued transaction
         aliceFee = env.le(alice)->getFieldAmount(sfBalance).xrp().drops() - (62);
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 4, 10, 6, 5);
 
         // Try to spend more than Alice can afford with all the other txs.
         aliceSeq += 2;
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), ter(terINSUF_FEE_B));
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), Ter(terINSUF_FEE_B));
         checkMetrics(*this, env, 4, 10, 6, 5);
 
         // Replace the last queued item with a transaction that will
         // bankrupt Alice
         --aliceFee;
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), queued);
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), queued);
         checkMetrics(*this, env, 4, 10, 6, 5);
 
         // Alice - Attempt to queue a last transaction, but it
@@ -1204,7 +1191,7 @@ public:
         // the fee is checked against the balance
         aliceFee /= 5;
         ++aliceSeq;
-        env(noop(alice), seq(aliceSeq), fee(aliceFee), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(alice), Seq(aliceSeq), Fee(aliceFee), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 4, 10, 6, 5);
 
         env.close();
@@ -1215,8 +1202,8 @@ public:
         checkMetrics(*this, env, 0, 12, 0, 6);
 
         // Alice is broke
-        env.require(balance(alice, XRP(0)));
-        env(noop(alice), ter(terINSUF_FEE_B));
+        env.require(Balance(alice, XRP(0)));
+        env(noop(alice), Ter(terINSUF_FEE_B));
 
         // Bob tries to queue up more than the single
         // account limit (10) txs.
@@ -1224,21 +1211,21 @@ public:
         bobSeq = env.seq(bob);
         checkMetrics(*this, env, 0, 12, 7, 6);
         for (int i = 0; i < 10; ++i)
-            env(noop(bob), seq(bobSeq + i), queued);
+            env(noop(bob), Seq(bobSeq + i), queued);
         checkMetrics(*this, env, 10, 12, 7, 6);
         // Bob hit the single account limit
-        env(noop(bob), seq(bobSeq + 10), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(bob), Seq(bobSeq + 10), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 10, 12, 7, 6);
         // Bob can replace one of the earlier txs regardless
         // of the limit
-        env(noop(bob), seq(bobSeq + 5), fee(20), queued);
+        env(noop(bob), Seq(bobSeq + 5), Fee(20), queued);
         checkMetrics(*this, env, 10, 12, 7, 6);
 
         // Try to replace a middle item in the queue
         // with enough fee to bankrupt bob and make the
         // later transactions unable to pay their fees
         std::int64_t bobFee = env.le(bob)->getFieldAmount(sfBalance).xrp().drops() - (9 * 10 - 1);
-        env(noop(bob), seq(bobSeq + 5), fee(bobFee), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(bob), Seq(bobSeq + 5), Fee(bobFee), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 10, 12, 7, 6);
 
         // Attempt to replace a middle item in the queue with enough fee
@@ -1248,7 +1235,7 @@ public:
         // The attempt fails because the sum of bob's fees now exceeds the
         // (artificially lowered to 200 drops) account reserve.
         bobFee = env.le(bob)->getFieldAmount(sfBalance).xrp().drops() - (9 * 10);
-        env(noop(bob), seq(bobSeq + 5), fee(bobFee), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(bob), Seq(bobSeq + 5), Fee(bobFee), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 10, 12, 7, 6);
 
         // Close the ledger and verify that the queued transactions succeed
@@ -1257,7 +1244,7 @@ public:
         checkMetrics(*this, env, 3, 14, 8, 7);
         env.close();
         checkMetrics(*this, env, 0, 16, 3, 8);
-        env.require(balance(bob, drops(499'999'999'750)));
+        env.require(Balance(bob, drops(499'999'999'750)));
     }
 
     void
@@ -1280,7 +1267,7 @@ public:
         auto gwen = Account("gwen");
         auto hank = Account("hank");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         BEAST_EXPECT(env.current()->fees().base == 10);
 
@@ -1323,14 +1310,14 @@ public:
 
         // All of these get into the queue, but one gets dropped when the
         // higher fee one is added later. Which one depends on ordering.
-        env(noop(alice), fee(15), queued);
-        env(noop(bob), fee(15), queued);
-        env(noop(charlie), fee(15), queued);
-        env(noop(daria), fee(15), queued);
-        env(noop(elmo), fee(15), queued);
-        env(noop(fred), fee(15), queued);
-        env(noop(gwen), fee(15), queued);
-        env(noop(hank), fee(15), queued);
+        env(noop(alice), Fee(15), queued);
+        env(noop(bob), Fee(15), queued);
+        env(noop(charlie), Fee(15), queued);
+        env(noop(daria), Fee(15), queued);
+        env(noop(elmo), Fee(15), queued);
+        env(noop(fred), Fee(15), queued);
+        env(noop(gwen), Fee(15), queued);
+        env(noop(hank), Fee(15), queued);
 
         // Queue is full now. Minimum fee now reflects the
         // lowest fee in the queue.
@@ -1340,12 +1327,12 @@ public:
         // Try to add another transaction with the default (low) fee,
         // it should fail because it can't replace the one already
         // there.
-        env(noop(charlie), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(charlie), Ter(telCAN_NOT_QUEUE_FEE));
 
         // Add another transaction, with a higher fee,
         // Not high enough to get into the ledger, but high
         // enough to get into the queue (and kick somebody out)
-        env(noop(charlie), fee(100), seq(charlieSeq + 1), queued);
+        env(noop(charlie), Fee(100), Seq(charlieSeq + 1), queued);
 
         // Queue is still full.
         checkMetrics(*this, env, 8, 8, 5, 4, minFeeLevel + 1);
@@ -1413,13 +1400,13 @@ public:
         BEAST_EXPECT(qTxCount1.size() <= 3);
 
         // Fill up the queue again
-        env(noop(alice), seq(aliceSeq + qTxCount1[alice.id()]++), fee(15), queued);
-        env(noop(bob), seq(bobSeq + qTxCount1[bob.id()]++), fee(15), queued);
-        env(noop(charlie), seq(charlieSeq + qTxCount1[charlie.id()]++), fee(15), queued);
-        env(noop(daria), seq(dariaSeq + qTxCount1[daria.id()]++), fee(15), queued);
-        env(noop(elmo), seq(elmoSeq + qTxCount1[elmo.id()]++), fee(15), queued);
-        env(noop(fred), seq(fredSeq + qTxCount1[fred.id()]++), fee(15), queued);
-        env(noop(gwen), seq(gwenSeq + qTxCount1[gwen.id()]++), fee(15), queued);
+        env(noop(alice), Seq(aliceSeq + qTxCount1[alice.id()]++), Fee(15), queued);
+        env(noop(bob), Seq(bobSeq + qTxCount1[bob.id()]++), Fee(15), queued);
+        env(noop(charlie), Seq(charlieSeq + qTxCount1[charlie.id()]++), Fee(15), queued);
+        env(noop(daria), Seq(dariaSeq + qTxCount1[daria.id()]++), Fee(15), queued);
+        env(noop(elmo), Seq(elmoSeq + qTxCount1[elmo.id()]++), Fee(15), queued);
+        env(noop(fred), Seq(fredSeq + qTxCount1[fred.id()]++), Fee(15), queued);
+        env(noop(gwen), Seq(gwenSeq + qTxCount1[gwen.id()]++), Fee(15), queued);
 
         minFeeLevel = txFeeLevelByAccount(env, gwen) + 1;
         checkMetrics(*this, env, 10, 10, 6, 5, minFeeLevel);
@@ -1427,7 +1414,7 @@ public:
         // Add another transaction, with a higher fee,
         // Not high enough to get into the ledger, but high
         // enough to get into the queue (and kick somebody out)
-        env(noop(alice), fee(100), seq(aliceSeq + qTxCount1[alice.id()]++), queued);
+        env(noop(alice), Fee(100), Seq(aliceSeq + qTxCount1[alice.id()]++), queued);
 
         checkMetrics(*this, env, 10, 10, 6, 5, minFeeLevel);
 
@@ -1495,7 +1482,7 @@ public:
         // Immediately after the fset, the sfAccountTxnID field
         // is still uninitialized, so preflight succeeds here,
         // and this txn fails because it can't be stored in the queue.
-        env(noop(alice), json(R"({"AccountTxnID": "0"})"), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), Json(R"({"AccountTxnID": "0"})"), Ter(telCAN_NOT_QUEUE));
 
         checkMetrics(*this, env, 0, std::nullopt, 2, 1);
         env.close();
@@ -1506,7 +1493,7 @@ public:
         env(noop(alice));
         checkMetrics(*this, env, 0, 4, 2, 2);
 
-        env(noop(alice), json(R"({"AccountTxnID": "0"})"), ter(tefWRONG_PRIOR));
+        env(noop(alice), Json(R"({"AccountTxnID": "0"})"), Ter(tefWRONG_PRIOR));
     }
 
     void
@@ -1544,17 +1531,19 @@ public:
                 {
                     double const feeMultiplier = static_cast<double>(cost.drops()) / baseFee;
                     medFeeLevel =
-                        FeeLevel64{static_cast<uint64_t>(feeMultiplier * baseFeeLevel.fee())};
+                        FeeLevel64{static_cast<uint64_t>(feeMultiplier * kBASE_FEE_LEVEL.fee())};
                 }
 
-                env(noop(alice), fee(cost));
+                env(noop(alice), Fee(cost));
             }
 
             checkMetrics(*this, env, 0, std::nullopt, 11, 2);
 
             env.close();
             // If not for the maximum, the per ledger would be 11.
-            checkMetrics(*this, env, 0, 10, 0, 5, baseFeeLevel.fee(), calcMedFeeLevel(medFeeLevel));
+            // clang-format off
+            checkMetrics(*this, env, 0, 10, 0, 5, kBASE_FEE_LEVEL.fee(), calcMedFeeLevel(medFeeLevel));
+            // clang-format on
         }
 
         try
@@ -1637,7 +1626,7 @@ public:
         auto alice = Account("alice");
         auto bob = Account("bob");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         // ledgers in queue is 2 because of makeConfig
         auto const initQueueMax = initFee(env, 3, 2, 10, 200, 50);
@@ -1647,9 +1636,9 @@ public:
         env.fund(drops(5000), noripple(alice));
         env.fund(XRP(50000), noripple(bob));
         checkMetrics(*this, env, 0, initQueueMax, 2, 3);
-        auto USD = bob["USD"];
+        auto usd = bob["USD"];
 
-        env(offer(alice, USD(5000), drops(5000)), require(owners(alice, 1)));
+        env(offer(alice, usd(5000), drops(5000)), Require(Owners(alice, 1)));
         checkMetrics(*this, env, 0, initQueueMax, 3, 3);
 
         env.close();
@@ -1662,33 +1651,33 @@ public:
         // Queue up a couple of transactions, plus one
         // more expensive one.
         auto aliceSeq = env.seq(alice);
-        env(noop(alice), seq(aliceSeq++), queued);
-        env(noop(alice), seq(aliceSeq++), queued);
-        env(noop(alice), seq(aliceSeq++), queued);
-        env(noop(alice), fee(drops(1000)), seq(aliceSeq), queued);
+        env(noop(alice), Seq(aliceSeq++), queued);
+        env(noop(alice), Seq(aliceSeq++), queued);
+        env(noop(alice), Seq(aliceSeq++), queued);
+        env(noop(alice), Fee(drops(1000)), Seq(aliceSeq), queued);
         checkMetrics(*this, env, 4, 6, 4, 3);
 
         // This offer should take Alice's offer
         // up to Alice's reserve.
-        env(offer(bob, drops(5000), USD(5000)),
-            fee(openLedgerCost(env)),
-            require(balance(alice, drops(250)), owners(alice, 1), lines(alice, 1)));
+        env(offer(bob, drops(5000), usd(5000)),
+            Fee(openLedgerCost(env)),
+            Require(Balance(alice, drops(250)), Owners(alice, 1), lines(alice, 1)));
         checkMetrics(*this, env, 4, 6, 5, 3);
 
         // Try adding a new transaction.
         // Too many fees in flight.
-        env(noop(alice), fee(drops(200)), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(alice), Fee(drops(200)), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 4, 6, 5, 3);
 
         // Close the ledger. All of Alice's transactions
         // take a fee, except the last one.
         env.close();
         checkMetrics(*this, env, 1, 10, 3, 5);
-        env.require(balance(alice, drops(250 - 30)));
+        env.require(Balance(alice, drops(250 - 30)));
 
         // Still can't add a new transaction for Alice,
         // no matter the fee.
-        env(noop(alice), fee(drops(200)), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(alice), Fee(drops(200)), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 1, 10, 3, 5);
 
         /* At this point, Alice's transaction is indefinitely
@@ -1721,7 +1710,7 @@ public:
         auto charlie = Account("charlie");
         auto daria = Account("daria");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
@@ -1743,25 +1732,25 @@ public:
 
             // Put two "normal" txs in the queue
             auto const aliceSeq = env.seq(alice);
-            env(noop(alice), seq(aliceSeq + 0), queued);
-            env(noop(alice), seq(aliceSeq + 1), queued);
+            env(noop(alice), Seq(aliceSeq + 0), queued);
+            env(noop(alice), Seq(aliceSeq + 1), queued);
 
             // Can't replace either queued transaction with a blocker
             env(fset(alice, asfAccountTxnID),
-                seq(aliceSeq + 0),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                Seq(aliceSeq + 0),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             env(regkey(alice, bob),
-                seq(aliceSeq + 1),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                Seq(aliceSeq + 1),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             // Can't append a blocker to the queue.
             env(signers(alice, 2, {{bob}, {charlie}, {daria}}),
-                seq(aliceSeq + 2),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                Seq(aliceSeq + 2),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             // Other accounts are not affected
             env(noop(bob), queued);
@@ -1778,32 +1767,32 @@ public:
             env(noop(alice));
 
             auto const aliceSeq = env.seq(alice);
-            env(noop(alice), seq(aliceSeq + 0), queued);
+            env(noop(alice), Seq(aliceSeq + 0), queued);
 
             // Since there's only one entry in the queue we can replace
             // that entry with a blocker.
-            env(regkey(alice, bob), seq(aliceSeq + 0), fee(baseFee * 2), queued);
+            env(regkey(alice, bob), Seq(aliceSeq + 0), Fee(baseFee * 2), queued);
 
             // Now that there's a blocker in the queue we can't append to
             // the queue.
-            env(noop(alice), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // Other accounts are unaffected.
             env(noop(bob), queued);
 
             // We can replace the blocker with a different blocker.
             env(signers(alice, 2, {{bob}, {charlie}, {daria}}),
-                seq(aliceSeq + 0),
-                fee(baseFee * 2.6),
+                Seq(aliceSeq + 0),
+                Fee(baseFee * 2.6),
                 queued);
 
             // Prove that the queue is still blocked.
-            env(noop(alice), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // We can replace the blocker with a non-blocker.  Then we can
             // successfully append to the queue.
-            env(noop(alice), seq(aliceSeq + 0), fee(baseFee * 3.3), queued);
-            env(noop(alice), seq(aliceSeq + 1), queued);
+            env(noop(alice), Seq(aliceSeq + 0), Fee(baseFee * 3.3), queued);
+            env(noop(alice), Seq(aliceSeq + 1), queued);
 
             // Drain the queue.
             env.close();
@@ -1819,19 +1808,19 @@ public:
             env(noop(alice));
 
             auto const aliceSeq = env.seq(alice);
-            env(fset(alice, asfAccountTxnID), seq(aliceSeq + 0), queued);
+            env(fset(alice, asfAccountTxnID), Seq(aliceSeq + 0), queued);
 
             // Since there's a blocker in the queue we can't append to
             // the queue.
-            env(noop(alice), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // Other accounts are unaffected.
             env(noop(bob), queued);
 
             // We can replace the blocker with a non-blocker.  Then we can
             // successfully append to the queue.
-            env(noop(alice), seq(aliceSeq + 0), fee(baseFee * 2), queued);
-            env(noop(alice), seq(aliceSeq + 1), queued);
+            env(noop(alice), Seq(aliceSeq + 0), Fee(baseFee * 2), queued);
+            env(noop(alice), Seq(aliceSeq + 1), queued);
 
             // Drain the queue.
             env.close();
@@ -1850,7 +1839,7 @@ public:
         auto charlie = Account("charlie");
         auto daria = Account("daria");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
@@ -1868,36 +1857,36 @@ public:
             // already holds two or more (non-blocker) entries.
 
             // Fill up the open ledger
-            env(ticket::create(alice, 250), seq(tkt - 1));
+            env(ticket::create(alice, 250), Seq(tkt - 1));
             // Set a regular key just to clear the password spent flag
             env(regkey(alice, charlie));
             checkMetrics(*this, env, 0, std::nullopt, 4, 3);
 
             // Put two "normal" txs in the queue
             auto const aliceSeq = env.seq(alice);
-            env(noop(alice), ticket::use(tkt + 2), queued);
-            env(noop(alice), ticket::use(tkt + 1), queued);
+            env(noop(alice), ticket::Use(tkt + 2), queued);
+            env(noop(alice), ticket::Use(tkt + 1), queued);
 
             // Can't replace either queued transaction with a blocker
             env(fset(alice, asfAccountTxnID),
-                ticket::use(tkt + 1),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                ticket::Use(tkt + 1),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             env(regkey(alice, bob),
-                ticket::use(tkt + 2),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                ticket::Use(tkt + 2),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             // Can't append a blocker to the queue.
             env(signers(alice, 2, {{bob}, {charlie}, {daria}}),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             env(signers(alice, 2, {{bob}, {charlie}, {daria}}),
-                ticket::use(tkt + 0),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                ticket::Use(tkt + 0),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             // Other accounts are not affected
             env(noop(bob), queued);
@@ -1909,9 +1898,9 @@ public:
 
             // Show that the local transactions have flushed through as well.
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
-            env(noop(alice), ticket::use(tkt + 0), ter(tefNO_TICKET));
-            env(noop(alice), ticket::use(tkt + 1), ter(tefNO_TICKET));
-            env(noop(alice), ticket::use(tkt + 2), ter(tefNO_TICKET));
+            env(noop(alice), ticket::Use(tkt + 0), Ter(tefNO_TICKET));
+            env(noop(alice), ticket::Use(tkt + 1), Ter(tefNO_TICKET));
+            env(noop(alice), ticket::Use(tkt + 2), Ter(tefNO_TICKET));
             tkt += 3;
         }
         {
@@ -1919,42 +1908,42 @@ public:
 
             // Put just one entry in the TxQ.
             auto const aliceSeq = env.seq(alice);
-            env(noop(alice), ticket::use(tkt + 0), queued);
+            env(noop(alice), ticket::Use(tkt + 0), queued);
 
             // Since there's an entry in the queue we cannot append a
             // blocker to the account's queue.
-            env(regkey(alice, bob), fee(baseFee * 2), ter(telCAN_NOT_QUEUE_BLOCKS));
+            env(regkey(alice, bob), Fee(baseFee * 2), Ter(telCAN_NOT_QUEUE_BLOCKS));
             env(regkey(alice, bob),
-                ticket::use(tkt + 1),
-                fee(baseFee * 2),
-                ter(telCAN_NOT_QUEUE_BLOCKS));
+                ticket::Use(tkt + 1),
+                Fee(baseFee * 2),
+                Ter(telCAN_NOT_QUEUE_BLOCKS));
 
             // However we can _replace_ that lone entry with a blocker.
-            env(regkey(alice, bob), ticket::use(tkt + 0), fee(baseFee * 2), queued);
+            env(regkey(alice, bob), ticket::Use(tkt + 0), Fee(baseFee * 2), queued);
 
             // Now that there's a blocker in the queue we can't append to
             // the queue.
-            env(noop(alice), ter(telCAN_NOT_QUEUE_BLOCKED));
-            env(noop(alice), ticket::use(tkt + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), Ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), ticket::Use(tkt + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // Other accounts are unaffected.
             env(noop(bob), queued);
 
             // We can replace the blocker with a different blocker.
             env(signers(alice, 2, {{bob}, {charlie}, {daria}}),
-                ticket::use(tkt + 0),
-                fee(baseFee * 2.6),
+                ticket::Use(tkt + 0),
+                Fee(baseFee * 2.6),
                 queued);
 
             // Prove that the queue is still blocked.
-            env(noop(alice), ter(telCAN_NOT_QUEUE_BLOCKED));
-            env(noop(alice), ticket::use(tkt + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), Ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), ticket::Use(tkt + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // We can replace the blocker with a non-blocker.  Then we can
             // successfully append to the queue.
-            env(noop(alice), ticket::use(tkt + 0), fee(baseFee * 3.3), queued);
-            env(noop(alice), ticket::use(tkt + 1), queued);
-            env(noop(alice), seq(aliceSeq), queued);
+            env(noop(alice), ticket::Use(tkt + 0), Fee(baseFee * 3.3), queued);
+            env(noop(alice), ticket::Use(tkt + 1), queued);
+            env(noop(alice), Seq(aliceSeq), queued);
 
             // Drain the queue.
             env.close();
@@ -1962,8 +1951,8 @@ public:
 
             // Show that the local transactions have flushed through as well.
             BEAST_EXPECT(env.seq(alice) == aliceSeq + 1);
-            env(noop(alice), ticket::use(tkt + 0), ter(tefNO_TICKET));
-            env(noop(alice), ticket::use(tkt + 1), ter(tefNO_TICKET));
+            env(noop(alice), ticket::Use(tkt + 0), Ter(tefNO_TICKET));
+            env(noop(alice), ticket::Use(tkt + 1), Ter(tefNO_TICKET));
             tkt += 2;
         }
         {
@@ -1974,19 +1963,19 @@ public:
             env(noop(alice));
             env(noop(alice));
 
-            env(fset(alice, asfAccountTxnID), ticket::use(tkt + 2), queued);
+            env(fset(alice, asfAccountTxnID), ticket::Use(tkt + 2), queued);
 
             // Since there's a blocker in the queue we can't append to
             // the queue.
-            env(noop(alice), ticket::use(tkt + 1), ter(telCAN_NOT_QUEUE_BLOCKED));
+            env(noop(alice), ticket::Use(tkt + 1), Ter(telCAN_NOT_QUEUE_BLOCKED));
 
             // Other accounts are unaffected.
             env(noop(bob), queued);
 
             // We can replace the blocker with a non-blocker.  Then we can
             // successfully append to the queue.
-            env(noop(alice), ticket::use(tkt + 2), fee(baseFee * 2), queued);
-            env(noop(alice), ticket::use(tkt + 1), queued);
+            env(noop(alice), ticket::Use(tkt + 2), Fee(baseFee * 2), queued);
+            env(noop(alice), ticket::Use(tkt + 1), queued);
 
             // Drain the queue.
             env.close();
@@ -2010,7 +1999,7 @@ public:
         auto charlie = Account("charlie");
         auto gw = Account("gw");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         // Set the fee reserves _really_ low so transactions with fees
         // in the ballpark of the reserves can be queued. With default
@@ -2027,24 +2016,24 @@ public:
         env.fund(XRP(50000), noripple(alice, charlie), gw);
         checkMetrics(*this, env, 0, initQueueMax, limit + 1, limit);
 
-        auto USD = gw["USD"];
-        auto BUX = gw["BUX"];
+        auto usd = gw["USD"];
+        auto bux = gw["BUX"];
 
         //////////////////////////////////////////
         // Offer with high XRP out and low fee doesn't block
         auto aliceSeq = env.seq(alice);
         auto aliceBal = env.balance(alice);
 
-        env.require(balance(alice, XRP(50000)), owners(alice, 0));
+        env.require(Balance(alice, XRP(50000)), Owners(alice, 0));
 
         // If this offer crosses, all of alice's
         // XRP will be taken (except the reserve).
-        env(offer(alice, BUX(5000), XRP(50000)), queued);
+        env(offer(alice, bux(5000), XRP(50000)), queued);
         checkMetrics(*this, env, 1, initQueueMax, limit + 1, limit);
 
         // But because the reserve is protected, another
         // transaction will be allowed to queue
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, initQueueMax, limit + 1, limit);
 
         env.close();
@@ -2054,9 +2043,9 @@ public:
         // But once we close the ledger, we find alice
         // has plenty of XRP, because the offer didn't
         // cross (of course).
-        env.require(balance(alice, aliceBal - drops(20)), owners(alice, 1));
+        env.require(Balance(alice, aliceBal - drops(20)), Owners(alice, 1));
         // cancel the offer
-        env(offer_cancel(alice, aliceSeq));
+        env(offerCancel(alice, aliceSeq));
 
         //////////////////////////////////////////
         // Offer with high XRP out and high total fee blocks later txs
@@ -2065,20 +2054,20 @@ public:
         aliceSeq = env.seq(alice);
         aliceBal = env.balance(alice);
 
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
 
         // Alice creates an offer with a fee of half the reserve
-        env(offer(alice, BUX(5000), XRP(50000)), fee(drops(100)), queued);
+        env(offer(alice, bux(5000), XRP(50000)), Fee(drops(100)), queued);
         checkMetrics(*this, env, 1, limit * 2, limit + 1, limit);
 
         // Alice creates another offer with a fee
         // that brings the total to just shy of the reserve
-        env(noop(alice), fee(drops(99)), seq(aliceSeq + 1), queued);
+        env(noop(alice), Fee(drops(99)), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         // So even a noop will look like alice
         // doesn't have the balance to pay the fee
-        env(noop(alice), fee(drops(51)), seq(aliceSeq + 2), ter(terINSUF_FEE_B));
+        env(noop(alice), Fee(drops(51)), Seq(aliceSeq + 2), Ter(terINSUF_FEE_B));
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2088,9 +2077,9 @@ public:
         // But once we close the ledger, we find alice
         // has plenty of XRP, because the offer didn't
         // cross (of course).
-        env.require(balance(alice, aliceBal - drops(250)), owners(alice, 1));
+        env.require(Balance(alice, aliceBal - drops(250)), Owners(alice, 1));
         // cancel the offer
-        env(offer_cancel(alice, aliceSeq));
+        env(offerCancel(alice, aliceSeq));
 
         //////////////////////////////////////////
         // Offer with high XRP out and super high fee blocks later txs
@@ -2099,16 +2088,16 @@ public:
         aliceSeq = env.seq(alice);
         aliceBal = env.balance(alice);
 
-        env.require(owners(alice, 0));
+        env.require(Owners(alice, 0));
 
         // Alice creates an offer with a fee larger than the reserve
         // This one can queue because it's the first in the queue for alice
-        env(offer(alice, BUX(5000), XRP(50000)), fee(drops(300)), queued);
+        env(offer(alice, bux(5000), XRP(50000)), Fee(drops(300)), queued);
         checkMetrics(*this, env, 1, limit * 2, limit + 1, limit);
 
         // So even a noop will look like alice
         // doesn't have the balance to pay the fee
-        env(noop(alice), fee(drops(51)), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BALANCE));
+        env(noop(alice), Fee(drops(51)), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BALANCE));
         checkMetrics(*this, env, 1, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2118,9 +2107,9 @@ public:
         // But once we close the ledger, we find alice
         // has plenty of XRP, because the offer didn't
         // cross (of course).
-        env.require(balance(alice, aliceBal - drops(351)), owners(alice, 1));
+        env.require(Balance(alice, aliceBal - drops(351)), Owners(alice, 1));
         // cancel the offer
-        env(offer_cancel(alice, aliceSeq));
+        env(offerCancel(alice, aliceSeq));
 
         //////////////////////////////////////////
         // Offer with low XRP out allows later txs
@@ -2131,10 +2120,10 @@ public:
 
         // If this offer crosses, just a bit
         // of alice's XRP will be taken.
-        env(offer(alice, BUX(50), XRP(500)), queued);
+        env(offer(alice, bux(50), XRP(500)), queued);
 
         // And later transactions are just fine
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2144,9 +2133,9 @@ public:
         // But once we close the ledger, we find alice
         // has plenty of XRP, because the offer didn't
         // cross (of course).
-        env.require(balance(alice, aliceBal - drops(20)), owners(alice, 1));
+        env.require(Balance(alice, aliceBal - drops(20)), Owners(alice, 1));
         // cancel the offer
-        env(offer_cancel(alice, aliceSeq));
+        env(offerCancel(alice, aliceSeq));
 
         //////////////////////////////////////////
         // Large XRP payment doesn't block later txs
@@ -2163,7 +2152,7 @@ public:
 
         // But because the reserve is protected, another
         // transaction will be allowed to queue
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2173,7 +2162,7 @@ public:
         // But once we close the ledger, we find alice
         // still has most of her balance, because the
         // payment was unfunded!
-        env.require(balance(alice, aliceBal - drops(20)), owners(alice, 0));
+        env.require(Balance(alice, aliceBal - drops(20)), Owners(alice, 0));
 
         //////////////////////////////////////////
         // Small XRP payment allows later txs
@@ -2188,7 +2177,7 @@ public:
         env(pay(alice, charlie, XRP(500)), queued);
 
         // And later transactions are just fine
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2196,13 +2185,13 @@ public:
         checkMetrics(*this, env, 0, limit * 2, 2, limit);
 
         // The payment succeeds
-        env.require(balance(alice, aliceBal - XRP(500) - drops(20)), owners(alice, 0));
+        env.require(Balance(alice, aliceBal - XRP(500) - drops(20)), Owners(alice, 0));
 
         //////////////////////////////////////////
         // Large IOU payment allows later txs
-        auto const amount = USD(500000);
-        env(trust(alice, USD(50000000)));
-        env(trust(charlie, USD(50000000)));
+        auto const amount = usd(500000);
+        env(trust(alice, usd(50000000)));
+        env(trust(charlie, usd(50000000)));
         checkMetrics(*this, env, 0, limit * 2, 4, limit);
         // Close so we don't have to deal
         // with tx ordering in consensus.
@@ -2219,7 +2208,7 @@ public:
 
         aliceSeq = env.seq(alice);
         aliceBal = env.balance(alice);
-        auto aliceUSD = env.balance(alice, USD);
+        auto aliceUSD = env.balance(alice, usd);
 
         // If this payment succeeds, alice will
         // send her entire USD balance to charlie.
@@ -2227,7 +2216,7 @@ public:
 
         // But that's fine, because it doesn't affect
         // alice's XRP balance (other than the fee, of course).
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2237,16 +2226,16 @@ public:
         // So once we close the ledger, alice has her
         // XRP balance, but her USD balance went to charlie.
         env.require(
-            balance(alice, aliceBal - drops(20)),
-            balance(alice, USD(0)),
-            balance(charlie, aliceUSD),
-            owners(alice, 1),
-            owners(charlie, 1));
+            Balance(alice, aliceBal - drops(20)),
+            Balance(alice, usd(0)),
+            Balance(charlie, aliceUSD),
+            Owners(alice, 1),
+            Owners(charlie, 1));
 
         //////////////////////////////////////////
         // Large XRP to IOU payment doesn't block later txs.
 
-        env(offer(gw, XRP(500000), USD(50000)));
+        env(offer(gw, XRP(500000), usd(50000)));
         // Close so we don't have to deal
         // with tx ordering in consensus.
         env.close();
@@ -2256,18 +2245,18 @@ public:
 
         aliceSeq = env.seq(alice);
         aliceBal = env.balance(alice);
-        auto charlieUSD = env.balance(charlie, USD);
+        auto charlieUSD = env.balance(charlie, usd);
 
         // If this payment succeeds, and uses the
         // entire sendMax, alice will send her
         // entire XRP balance to charlie in the
         // form of USD.
         BEAST_EXPECT(XRP(60000) > aliceBal);
-        env(pay(alice, charlie, USD(1000)), sendmax(XRP(60000)), queued);
+        env(pay(alice, charlie, usd(1000)), Sendmax(XRP(60000)), queued);
 
         // But because the reserve is protected, another
         // transaction will be allowed to queue
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2277,11 +2266,11 @@ public:
         // So once we close the ledger, alice sent a payment
         // to charlie using only a portion of her XRP balance
         env.require(
-            balance(alice, aliceBal - XRP(10000) - drops(20)),
-            balance(alice, USD(0)),
-            balance(charlie, charlieUSD + USD(1000)),
-            owners(alice, 1),
-            owners(charlie, 1));
+            Balance(alice, aliceBal - XRP(10000) - drops(20)),
+            Balance(alice, usd(0)),
+            Balance(charlie, charlieUSD + usd(1000)),
+            Owners(alice, 1),
+            Owners(charlie, 1));
 
         //////////////////////////////////////////
         // Small XRP to IOU payment allows later txs.
@@ -2291,17 +2280,17 @@ public:
 
         aliceSeq = env.seq(alice);
         aliceBal = env.balance(alice);
-        charlieUSD = env.balance(charlie, USD);
+        charlieUSD = env.balance(charlie, usd);
 
         // If this payment succeeds, and uses the
         // entire sendMax, alice will only send
         // a portion of her XRP balance to charlie
         // in the form of USD.
         BEAST_EXPECT(aliceBal > XRP(6001));
-        env(pay(alice, charlie, USD(500)), sendmax(XRP(6000)), queued);
+        env(pay(alice, charlie, usd(500)), Sendmax(XRP(6000)), queued);
 
         // And later transactions are just fine
-        env(noop(alice), seq(aliceSeq + 1), queued);
+        env(noop(alice), Seq(aliceSeq + 1), queued);
         checkMetrics(*this, env, 2, limit * 2, limit + 1, limit);
 
         env.close();
@@ -2311,15 +2300,15 @@ public:
         // So once we close the ledger, alice sent a payment
         // to charlie using only a portion of her XRP balance
         env.require(
-            balance(alice, aliceBal - XRP(5000) - drops(20)),
-            balance(alice, USD(0)),
-            balance(charlie, charlieUSD + USD(500)),
-            owners(alice, 1),
-            owners(charlie, 1));
+            Balance(alice, aliceBal - XRP(5000) - drops(20)),
+            Balance(alice, usd(0)),
+            Balance(charlie, charlieUSD + usd(500)),
+            Owners(alice, 1),
+            Owners(charlie, 1));
 
         //////////////////////////////////////////
         // Edge case: what happens if the balance is below the reserve?
-        env(noop(alice), fee(env.balance(alice) - drops(30)));
+        env(noop(alice), Fee(env.balance(alice) - drops(30)));
         env.close();
 
         fillQueue(env, charlie);
@@ -2329,8 +2318,8 @@ public:
         aliceBal = env.balance(alice);
         BEAST_EXPECT(aliceBal == drops(30));
 
-        env(noop(alice), fee(drops(25)), queued);
-        env(noop(alice), seq(aliceSeq + 1), ter(terINSUF_FEE_B));
+        env(noop(alice), Fee(drops(25)), queued);
+        env(noop(alice), Seq(aliceSeq + 1), Ter(terINSUF_FEE_B));
         BEAST_EXPECT(env.balance(alice) == drops(30));
 
         checkMetrics(*this, env, 1, limit * 2, limit + 1, limit);
@@ -2354,9 +2343,9 @@ public:
         env.memoize("bob");
         env.memoize("carol");
         {
-            auto const jtx = env.jt(offer_cancel(alice, 3), seq(5), fee(10));
+            auto const jtx = env.jt(offerCancel(alice, 3), Seq(5), Fee(10));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(10));
@@ -2364,11 +2353,11 @@ public:
         }
 
         {
-            auto USD = alice["USD"];
+            auto usd = alice["USD"];
 
-            auto const jtx = env.jt(trust("carol", USD(50000000)), seq(1), fee(10));
+            auto const jtx = env.jt(trust("carol", usd(50000000)), Seq(1), Fee(10));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(10));
@@ -2376,9 +2365,9 @@ public:
         }
 
         {
-            auto const jtx = env.jt(ticket::create(alice, 1), seq(1), fee(10));
+            auto const jtx = env.jt(ticket::create(alice, 1), Seq(1), Fee(10));
             auto const pf =
-                preflight(env.app(), env.current()->rules(), *jtx.stx, tapNONE, env.journal);
+                preflight(env.app(), env.current()->rules(), *jtx.stx, TapNone, env.journal);
             BEAST_EXPECT(isTesSuccess(pf.ter));
             BEAST_EXPECT(!pf.consequences.isBlocker());
             BEAST_EXPECT(pf.consequences.fee() == drops(10));
@@ -2404,7 +2393,7 @@ public:
         auto bob = Account("bob");
         auto charlie = Account("charlie");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
@@ -2420,11 +2409,11 @@ public:
         checkMetrics(*this, env, 0, std::nullopt, 4, 3);
 
         // Bob with really high fee - applies
-        env(noop(bob), fee(openLedgerCost(env)));
+        env(noop(bob), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 0, std::nullopt, 5, 3);
 
         // Charlie with low fee: queued
-        env(noop(charlie), fee(baseFee * 100), queued);
+        env(noop(charlie), Fee(baseFee * 100), queued);
         checkMetrics(*this, env, 1, std::nullopt, 5, 3);
 
         env.close();
@@ -2435,11 +2424,11 @@ public:
 
         // Stuff the ledger and queue so we can verify that
         // stuff gets kicked out.
-        env(noop(bob), fee(baseFee * 100));
-        env(noop(bob), fee(baseFee * 100));
-        env(noop(bob), fee(baseFee * 100));
-        env(noop(bob), fee(baseFee * 100));
-        env(noop(bob), fee(baseFee * 100));
+        env(noop(bob), Fee(baseFee * 100));
+        env(noop(bob), Fee(baseFee * 100));
+        env(noop(bob), Fee(baseFee * 100));
+        env(noop(bob), Fee(baseFee * 100));
+        env(noop(bob), Fee(baseFee * 100));
         checkMetrics(*this, env, 0, 10, 6, 5);
 
         // Use explicit fees so we can control which txn
@@ -2447,34 +2436,34 @@ public:
         // This one gets into the queue, but gets dropped when the
         // higher fee one is added later.
         std::uint32_t const charlieSeq{env.seq(charlie)};
-        env(noop(charlie), fee(baseFee * 1.5), seq(charlieSeq), queued);
+        env(noop(charlie), Fee(baseFee * 1.5), Seq(charlieSeq), queued);
         auto const expectedFeeLevel = txFeeLevelByAccount(env, charlie);
 
         // These stay in the queue.
         std::uint32_t aliceSeq{env.seq(alice)};
         std::uint32_t bobSeq{env.seq(bob)};
 
-        env(noop(alice), fee(baseFee * 1.6), seq(aliceSeq++), queued);
-        env(noop(bob), fee(baseFee * 1.6), seq(bobSeq++), queued);
-        env(noop(alice), fee(baseFee * 1.7), seq(aliceSeq++), queued);
-        env(noop(bob), fee(baseFee * 1.7), seq(bobSeq++), queued);
-        env(noop(alice), fee(baseFee * 1.8), seq(aliceSeq++), queued);
-        env(noop(bob), fee(baseFee * 1.9), seq(bobSeq++), queued);
-        env(noop(alice), fee(baseFee * 2), seq(aliceSeq++), queued);
-        env(noop(bob), fee(baseFee * 2), seq(bobSeq++), queued);
-        env(noop(alice), fee(baseFee * 2.1), seq(aliceSeq++), queued);
+        env(noop(alice), Fee(baseFee * 1.6), Seq(aliceSeq++), queued);
+        env(noop(bob), Fee(baseFee * 1.6), Seq(bobSeq++), queued);
+        env(noop(alice), Fee(baseFee * 1.7), Seq(aliceSeq++), queued);
+        env(noop(bob), Fee(baseFee * 1.7), Seq(bobSeq++), queued);
+        env(noop(alice), Fee(baseFee * 1.8), Seq(aliceSeq++), queued);
+        env(noop(bob), Fee(baseFee * 1.9), Seq(bobSeq++), queued);
+        env(noop(alice), Fee(baseFee * 2), Seq(aliceSeq++), queued);
+        env(noop(bob), Fee(baseFee * 2), Seq(bobSeq++), queued);
+        env(noop(alice), Fee(baseFee * 2.1), Seq(aliceSeq++), queued);
 
         // Queue is full now.
         checkMetrics(*this, env, 10, 10, 6, 5, expectedFeeLevel + 1);
 
         // Try to add another transaction with the default (low) fee,
         // it should fail because the queue is full.
-        env(noop(alice), seq(aliceSeq++), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq++), Ter(telCAN_NOT_QUEUE_FULL));
 
         // Add another transaction, with a higher fee,
         // not high enough to get into the ledger, but high
         // enough to get into the queue (and kick Charlie's out)
-        env(noop(bob), fee(baseFee * 2.2), seq(bobSeq++), queued);
+        env(noop(bob), Fee(baseFee * 2.2), Seq(bobSeq++), queued);
 
         /////////////////////////////////////////////////////////
 
@@ -2486,9 +2475,9 @@ public:
         // Charlie is paying a high enough fee to go straight into the
         // ledger in order to get into the vicinity of an assert which
         // should no longer fire :-).
-        env(noop(charlie), fee(baseFee * 800), seq(charlieSeq - 1), ter(tefPAST_SEQ));
-        env(noop(charlie), fee(baseFee * 800), seq(charlieSeq + 1), ter(terPRE_SEQ));
-        env(noop(charlie), fee(baseFee * 800), seq(charlieSeq), ter(tesSUCCESS));
+        env(noop(charlie), Fee(baseFee * 800), Seq(charlieSeq - 1), Ter(tefPAST_SEQ));
+        env(noop(charlie), Fee(baseFee * 800), Seq(charlieSeq + 1), Ter(terPRE_SEQ));
+        env(noop(charlie), Fee(baseFee * 800), Seq(charlieSeq), Ter(tesSUCCESS));
     }
 
     void
@@ -2502,7 +2491,7 @@ public:
         auto fee = env.rpc("fee");
 
         if (BEAST_EXPECT(fee.isMember(jss::result)) &&
-            BEAST_EXPECT(!RPC::contains_error(fee[jss::result])))
+            BEAST_EXPECT(!RPC::containsError(fee[jss::result])))
         {
             auto const& result = fee[jss::result];
             BEAST_EXPECT(
@@ -2531,7 +2520,7 @@ public:
         fee = env.rpc("fee");
 
         if (BEAST_EXPECT(fee.isMember(jss::result)) &&
-            BEAST_EXPECT(!RPC::contains_error(fee[jss::result])))
+            BEAST_EXPECT(!RPC::containsError(fee[jss::result])))
         {
             auto const& result = fee[jss::result];
             BEAST_EXPECT(
@@ -2590,10 +2579,10 @@ public:
 
         auto const aliceSeq = env.seq(alice);
         BEAST_EXPECT(env.current()->header().seq == 3);
-        env(noop(alice), seq(aliceSeq), last_ledger_seq(5), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 1), last_ledger_seq(5), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 2), last_ledger_seq(10), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 3), last_ledger_seq(11), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq), LastLedgerSeq(5), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 1), LastLedgerSeq(5), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 2), LastLedgerSeq(10), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 3), LastLedgerSeq(11), Ter(terQUEUED));
         checkMetrics(*this, env, 4, std::nullopt, 2, 1);
         auto const bobSeq = env.seq(bob);
         // Ledger 4 gets 3,
@@ -2601,7 +2590,7 @@ public:
         // Ledger 6 gets 5.
         for (int i = 0; i < 3 + 4 + 5; ++i)
         {
-            env(noop(bob), seq(bobSeq + i), fee(baseFee * 20), ter(terQUEUED));
+            env(noop(bob), Seq(bobSeq + i), Fee(baseFee * 20), Ter(terQUEUED));
         }
         checkMetrics(*this, env, 4 + 3 + 4 + 5, std::nullopt, 2, 1);
         // Close ledger 3
@@ -2616,22 +2605,22 @@ public:
         checkMetrics(*this, env, 2, 40, 5, 4);
 
         // Because aliceSeq is missing, aliceSeq + 1 fails
-        env(noop(alice), seq(aliceSeq + 1), ter(terPRE_SEQ));
+        env(noop(alice), Seq(aliceSeq + 1), Ter(terPRE_SEQ));
 
         // Cannot fill the gap with a blocker since Alice's queue is not empty.
-        env(fset(alice, asfAccountTxnID), seq(aliceSeq), ter(telCAN_NOT_QUEUE_BLOCKS));
+        env(fset(alice, asfAccountTxnID), Seq(aliceSeq), Ter(telCAN_NOT_QUEUE_BLOCKS));
         checkMetrics(*this, env, 2, 40, 5, 4);
 
         // However we can fill the gap with a non-blocker.
-        env(noop(alice), seq(aliceSeq), fee(baseFee * 2), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq), Fee(baseFee * 2), Ter(terQUEUED));
         checkMetrics(*this, env, 3, 40, 5, 4);
 
         // Attempt to queue up a new aliceSeq + 1 tx that's a blocker.
-        env(fset(alice, asfAccountTxnID), seq(aliceSeq + 1), ter(telCAN_NOT_QUEUE_BLOCKS));
+        env(fset(alice, asfAccountTxnID), Seq(aliceSeq + 1), Ter(telCAN_NOT_QUEUE_BLOCKS));
         checkMetrics(*this, env, 3, 40, 5, 4);
 
         // Queue up a non-blocker replacement for aliceSeq + 1.
-        env(noop(alice), seq(aliceSeq + 1), fee(baseFee * 2), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 1), Fee(baseFee * 2), Ter(terQUEUED));
         checkMetrics(*this, env, 4, 40, 5, 4);
 
         // Close ledger 6
@@ -2679,16 +2668,16 @@ public:
 
         // Start by procuring tickets for alice to use to keep her queue full
         // without affecting the sequence gap that will appear later.
-        env(ticket::create(alice, 11), seq(aliceSeq + 0), fee((baseFee * 20) + 1), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 11), last_ledger_seq(11), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 12), last_ledger_seq(11), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 13), last_ledger_seq(11), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 14), last_ledger_seq(11), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 15), last_ledger_seq(11), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 16), last_ledger_seq(5), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 17), last_ledger_seq(5), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 18), last_ledger_seq(5), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 19), last_ledger_seq(11), ter(terQUEUED));
+        env(ticket::create(alice, 11), Seq(aliceSeq + 0), Fee((baseFee * 20) + 1), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 11), LastLedgerSeq(11), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 12), LastLedgerSeq(11), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 13), LastLedgerSeq(11), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 14), LastLedgerSeq(11), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 15), LastLedgerSeq(11), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 16), LastLedgerSeq(5), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 17), LastLedgerSeq(5), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 18), LastLedgerSeq(5), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 19), LastLedgerSeq(11), Ter(terQUEUED));
         checkMetrics(*this, env, 10, std::nullopt, 2, 1);
 
         auto const bobSeq = env.seq(bob);
@@ -2697,7 +2686,7 @@ public:
         // Ledger 6 gets 5 from bob.
         for (int i = 0; i < 2 + 4 + 5; ++i)
         {
-            env(noop(bob), seq(bobSeq + i), fee(baseFee * 20), ter(terQUEUED));
+            env(noop(bob), Seq(bobSeq + i), Fee(baseFee * 20), Ter(terQUEUED));
         }
         checkMetrics(*this, env, 10 + 2 + 4 + 5, std::nullopt, 2, 1);
         // Close ledger 3
@@ -2718,12 +2707,12 @@ public:
 
         // Top off Alice's queue again using Tickets so the sequence gap is
         // unaffected.
-        env(noop(alice), ticket::use(aliceSeq + 1), ter(terQUEUED));
-        env(noop(alice), ticket::use(aliceSeq + 2), ter(terQUEUED));
-        env(noop(alice), ticket::use(aliceSeq + 3), ter(terQUEUED));
-        env(noop(alice), ticket::use(aliceSeq + 4), ter(terQUEUED));
-        env(noop(alice), ticket::use(aliceSeq + 5), ter(terQUEUED));
-        env(noop(alice), ticket::use(aliceSeq + 6), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), ticket::Use(aliceSeq + 1), Ter(terQUEUED));
+        env(noop(alice), ticket::Use(aliceSeq + 2), Ter(terQUEUED));
+        env(noop(alice), ticket::Use(aliceSeq + 3), Ter(terQUEUED));
+        env(noop(alice), ticket::Use(aliceSeq + 4), Ter(terQUEUED));
+        env(noop(alice), ticket::Use(aliceSeq + 5), Ter(terQUEUED));
+        env(noop(alice), ticket::Use(aliceSeq + 6), Ter(telCAN_NOT_QUEUE_FULL));
         checkMetrics(*this, env, 11, 40, 5, 4);
 
         // Even though alice's queue is full we can still slide in a couple
@@ -2733,32 +2722,32 @@ public:
 
         // Verify that we can't queue a sequence-based transaction that
         // follows a gap.
-        env(noop(alice), seq(aliceSeq + 20), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq + 20), Ter(telCAN_NOT_QUEUE_FULL));
 
         // Verify that the transaction in front of the gap is still present
         // by attempting to replace it without a sufficient fee.
-        env(noop(alice), seq(aliceSeq + 15), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(aliceSeq + 15), Ter(telCAN_NOT_QUEUE_FEE));
 
         // We can't queue a transaction into the middle of the gap.  It must
         // go at the front.
-        env(noop(alice), seq(aliceSeq + 18), ter(telCAN_NOT_QUEUE_FULL));
-        env(noop(alice), seq(aliceSeq + 17), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq + 18), Ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq + 17), Ter(telCAN_NOT_QUEUE_FULL));
 
         // Successfully put this transaction into the front of the gap.
-        env(noop(alice), seq(aliceSeq + 16), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 16), Ter(terQUEUED));
 
         // Still can't put a sequence-based transaction at the end of the gap.
-        env(noop(alice), seq(aliceSeq + 18), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq + 18), Ter(telCAN_NOT_QUEUE_FULL));
 
         // But we can still fill the gap from the front.
-        env(noop(alice), seq(aliceSeq + 17), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 17), Ter(terQUEUED));
 
         // Finally we can fill in the entire gap.
-        env(noop(alice), seq(aliceSeq + 18), ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 18), Ter(terQUEUED));
         checkMetrics(*this, env, 14, 40, 5, 4);
 
         // Verify that nothing can be added now that the gap is filled.
-        env(noop(alice), seq(aliceSeq + 20), ter(telCAN_NOT_QUEUE_FULL));
+        env(noop(alice), Seq(aliceSeq + 20), Ter(telCAN_NOT_QUEUE_FULL));
 
         // Close ledger 6.  That removes some of alice's transactions,
         // but alice adds some more transaction(s) so expectedCount
@@ -2786,7 +2775,7 @@ public:
         using namespace jtx;
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "6"}}));
         auto const baseFee = env.current()->fees().base.drops();
-        Env_ss envs(env);
+        EnvSs envs(env);
         auto const& txQ = env.app().getTxQ();
 
         auto const alice = Account("alice");
@@ -2800,21 +2789,21 @@ public:
         auto const aliceSeq = env.seq(alice);
         auto const lastLedgerSeq = env.current()->header().seq + 2;
 
-        auto submitParams = Json::Value(Json::objectValue);
+        auto submitParams = json::Value(json::ObjectValue);
         for (int i = 0; i < 5; ++i)
         {
             if (i == 2)
             {
                 envs(
                     noop(alice),
-                    fee(baseFee * 100),
-                    seq(none),
-                    json(jss::LastLedgerSequence, lastLedgerSeq),
-                    ter(terQUEUED))(submitParams);
+                    Fee(baseFee * 100),
+                    Seq(kNONE),
+                    Json(jss::LastLedgerSequence, lastLedgerSeq),
+                    Ter(terQUEUED))(submitParams);
             }
             else
             {
-                envs(noop(alice), fee(baseFee * 100), seq(none), ter(terQUEUED))(submitParams);
+                envs(noop(alice), Fee(baseFee * 100), Seq(kNONE), Ter(terQUEUED))(submitParams);
             }
         }
         checkMetrics(*this, env, 5, std::nullopt, 7, 6);
@@ -2825,7 +2814,7 @@ public:
             for (auto const& tx : aliceStat)
             {
                 BEAST_EXPECT(tx.seqProxy == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{baseFeeLevel.fee() * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 100});
                 if (seq.value() == aliceSeq + 2)
                 {
                     BEAST_EXPECT(tx.lastValid && *tx.lastValid == lastLedgerSeq);
@@ -2840,7 +2829,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(none), ter(terQUEUED))();
+            envs(noop(bob), Fee(baseFee * 200), Seq(kNONE), Ter(terQUEUED))();
         checkMetrics(*this, env, 13, std::nullopt, 7, 6);
 
         env.close();
@@ -2849,14 +2838,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(none), 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(none), 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);
@@ -2878,13 +2867,13 @@ public:
                     ++seq;
 
                 BEAST_EXPECT(tx.seqProxy.isSeq() && tx.seqProxy.value() == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{baseFeeLevel.fee() * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 100});
                 BEAST_EXPECT(!tx.lastValid);
                 ++seq;
             }
         }
         // Now, fill the gap.
-        envs(noop(alice), fee(baseFee * 100), seq(none), 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());
@@ -2893,7 +2882,7 @@ public:
             for (auto const& tx : aliceStat)
             {
                 BEAST_EXPECT(tx.seqProxy.isSeq() && tx.seqProxy.value() == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{baseFeeLevel * 100});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL * 100});
                 BEAST_EXPECT(!tx.lastValid);
                 ++seq;
             }
@@ -2920,20 +2909,20 @@ public:
 
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
-        Env_ss envs(env);
+        EnvSs envs(env);
 
         Account const alice{"alice"};
         env.fund(XRP(1000000), alice);
         env.close();
 
-        Json::Value withQueue;
+        json::Value withQueue;
         withQueue[jss::account] = alice.human();
         withQueue[jss::queue] = true;
 
-        Json::Value withoutQueue;
+        json::Value withoutQueue;
         withoutQueue[jss::account] = alice.human();
 
-        Json::Value prevLedgerWithQueue;
+        json::Value prevLedgerWithQueue;
         prevLedgerWithQueue[jss::account] = alice.human();
         prevLedgerWithQueue[jss::queue] = true;
         prevLedgerWithQueue[jss::ledger_index] = 3;
@@ -2953,15 +2942,15 @@ public:
                 info.isMember(jss::result) && info[jss::result].isMember(jss::account_data));
             auto const& result = info[jss::result];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 0);
-            BEAST_EXPECT(!queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::highest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(!queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(!queue_data.isMember(jss::transactions));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 0);
+            BEAST_EXPECT(!queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::highest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(!queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(!queueData.isMember(jss::transactions));
         }
         checkMetrics(*this, env, 0, 6, 0, 3);
 
@@ -2974,22 +2963,22 @@ public:
                 info.isMember(jss::result) && info[jss::result].isMember(jss::account_data));
             auto const& result = info[jss::result];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 0);
-            BEAST_EXPECT(!queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::highest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(!queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(!queue_data.isMember(jss::transactions));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 0);
+            BEAST_EXPECT(!queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::highest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(!queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(!queueData.isMember(jss::transactions));
         }
 
-        auto submitParams = Json::Value(Json::objectValue);
-        envs(noop(alice), fee(baseFee * 10), seq(none), ter(terQUEUED))(submitParams);
-        envs(noop(alice), fee(baseFee * 10), seq(none), ter(terQUEUED))(submitParams);
-        envs(noop(alice), fee(baseFee * 10), seq(none), ter(terQUEUED))(submitParams);
-        envs(noop(alice), fee(baseFee * 10), seq(none), ter(terQUEUED))(submitParams);
+        auto submitParams = json::Value(json::ObjectValue);
+        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);
 
         {
@@ -2999,28 +2988,28 @@ public:
             auto const& result = info[jss::result];
             auto const& data = result[jss::account_data];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 4);
-            BEAST_EXPECT(queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(queue_data[jss::lowest_sequence] == data[jss::Sequence]);
-            BEAST_EXPECT(queue_data.isMember(jss::highest_sequence));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 4);
+            BEAST_EXPECT(queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(queueData[jss::lowest_sequence] == data[jss::Sequence]);
+            BEAST_EXPECT(queueData.isMember(jss::highest_sequence));
             BEAST_EXPECT(
-                queue_data[jss::highest_sequence] ==
-                data[jss::Sequence].asUInt() + queue_data[jss::txn_count].asUInt() - 1);
-            BEAST_EXPECT(queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(queue_data[jss::auth_change_queued] == false);
-            BEAST_EXPECT(queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(queue_data[jss::max_spend_drops_total] == std::to_string(baseFee * 40));
-            BEAST_EXPECT(queue_data.isMember(jss::transactions));
-            auto const& queued = queue_data[jss::transactions];
-            BEAST_EXPECT(queued.size() == queue_data[jss::txn_count]);
+                queueData[jss::highest_sequence] ==
+                data[jss::Sequence].asUInt() + queueData[jss::txn_count].asUInt() - 1);
+            BEAST_EXPECT(queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(queueData[jss::auth_change_queued] == false);
+            BEAST_EXPECT(queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(queueData[jss::max_spend_drops_total] == std::to_string(baseFee * 40));
+            BEAST_EXPECT(queueData.isMember(jss::transactions));
+            auto const& queued = queueData[jss::transactions];
+            BEAST_EXPECT(queued.size() == queueData[jss::txn_count]);
             for (unsigned i = 0; i < queued.size(); ++i)
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(baseFeeLevel.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.fee() * 10));
                 BEAST_EXPECT(!item.isMember(jss::LastLedgerSequence));
 
                 BEAST_EXPECT(item.isMember(jss::fee));
@@ -3037,14 +3026,14 @@ public:
         checkMetrics(*this, env, 0, 8, 4, 4);
 
         // Fill the ledger and then queue up a blocker.
-        envs(noop(alice), seq(none))(submitParams);
+        envs(noop(alice), Seq(kNONE))(submitParams);
 
         envs(
             fset(alice, asfAccountTxnID),
-            fee(baseFee * 10),
-            seq(none),
-            json(jss::LastLedgerSequence, 10),
-            ter(terQUEUED))(submitParams);
+            Fee(baseFee * 10),
+            Seq(kNONE),
+            Json(jss::LastLedgerSequence, 10),
+            Ter(terQUEUED))(submitParams);
         checkMetrics(*this, env, 1, 8, 5, 4);
 
         {
@@ -3054,28 +3043,28 @@ public:
             auto const& result = info[jss::result];
             auto const& data = result[jss::account_data];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 1);
-            BEAST_EXPECT(queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(queue_data[jss::lowest_sequence] == data[jss::Sequence]);
-            BEAST_EXPECT(queue_data.isMember(jss::highest_sequence));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 1);
+            BEAST_EXPECT(queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(queueData[jss::lowest_sequence] == data[jss::Sequence]);
+            BEAST_EXPECT(queueData.isMember(jss::highest_sequence));
             BEAST_EXPECT(
-                queue_data[jss::highest_sequence] ==
-                data[jss::Sequence].asUInt() + queue_data[jss::txn_count].asUInt() - 1);
-            BEAST_EXPECT(queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(queue_data[jss::auth_change_queued] == true);
-            BEAST_EXPECT(queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(queue_data[jss::max_spend_drops_total] == std::to_string(baseFee * 10));
-            BEAST_EXPECT(queue_data.isMember(jss::transactions));
-            auto const& queued = queue_data[jss::transactions];
-            BEAST_EXPECT(queued.size() == queue_data[jss::txn_count]);
+                queueData[jss::highest_sequence] ==
+                data[jss::Sequence].asUInt() + queueData[jss::txn_count].asUInt() - 1);
+            BEAST_EXPECT(queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(queueData[jss::auth_change_queued] == true);
+            BEAST_EXPECT(queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(queueData[jss::max_spend_drops_total] == std::to_string(baseFee * 10));
+            BEAST_EXPECT(queueData.isMember(jss::transactions));
+            auto const& queued = queueData[jss::transactions];
+            BEAST_EXPECT(queued.size() == queueData[jss::txn_count]);
             for (unsigned i = 0; i < queued.size(); ++i)
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(baseFeeLevel.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.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));
@@ -3096,8 +3085,8 @@ public:
             }
         }
 
-        envs(
-            noop(alice), fee(baseFee * 10), seq(none), ter(telCAN_NOT_QUEUE_BLOCKED))(submitParams);
+        envs(noop(alice), Fee(baseFee * 10), Seq(kNONE), Ter(telCAN_NOT_QUEUE_BLOCKED))(
+            submitParams);
         checkMetrics(*this, env, 1, 8, 5, 4);
 
         {
@@ -3107,28 +3096,28 @@ public:
             auto const& result = info[jss::result];
             auto const& data = result[jss::account_data];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 1);
-            BEAST_EXPECT(queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(queue_data[jss::lowest_sequence] == data[jss::Sequence]);
-            BEAST_EXPECT(queue_data.isMember(jss::highest_sequence));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 1);
+            BEAST_EXPECT(queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(queueData[jss::lowest_sequence] == data[jss::Sequence]);
+            BEAST_EXPECT(queueData.isMember(jss::highest_sequence));
             BEAST_EXPECT(
-                queue_data[jss::highest_sequence] ==
-                data[jss::Sequence].asUInt() + queue_data[jss::txn_count].asUInt() - 1);
-            BEAST_EXPECT(queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(queue_data[jss::auth_change_queued].asBool());
-            BEAST_EXPECT(queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(queue_data[jss::max_spend_drops_total] == std::to_string(baseFee * 10));
-            BEAST_EXPECT(queue_data.isMember(jss::transactions));
-            auto const& queued = queue_data[jss::transactions];
-            BEAST_EXPECT(queued.size() == queue_data[jss::txn_count]);
+                queueData[jss::highest_sequence] ==
+                data[jss::Sequence].asUInt() + queueData[jss::txn_count].asUInt() - 1);
+            BEAST_EXPECT(queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(queueData[jss::auth_change_queued].asBool());
+            BEAST_EXPECT(queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(queueData[jss::max_spend_drops_total] == std::to_string(baseFee * 10));
+            BEAST_EXPECT(queueData.isMember(jss::transactions));
+            auto const& queued = queueData[jss::transactions];
+            BEAST_EXPECT(queued.size() == queueData[jss::txn_count]);
             for (unsigned i = 0; i < queued.size(); ++i)
             {
                 auto const& item = queued[i];
                 BEAST_EXPECT(item[jss::seq] == data[jss::Sequence].asInt() + i);
-                BEAST_EXPECT(item[jss::fee_level] == std::to_string(baseFeeLevel.fee() * 10));
+                BEAST_EXPECT(item[jss::fee_level] == std::to_string(kBASE_FEE_LEVEL.fee() * 10));
 
                 if (i == queued.size() - 1)
                 {
@@ -3156,7 +3145,7 @@ public:
 
         {
             auto const info = env.rpc("json", "account_info", to_string(prevLedgerWithQueue));
-            BEAST_EXPECT(info.isMember(jss::result) && RPC::contains_error(info[jss::result]));
+            BEAST_EXPECT(info.isMember(jss::result) && RPC::containsError(info[jss::result]));
         }
 
         env.close();
@@ -3170,15 +3159,15 @@ public:
                 info.isMember(jss::result) && info[jss::result].isMember(jss::account_data));
             auto const& result = info[jss::result];
             BEAST_EXPECT(result.isMember(jss::queue_data));
-            auto const& queue_data = result[jss::queue_data];
-            BEAST_EXPECT(queue_data.isObject());
-            BEAST_EXPECT(queue_data.isMember(jss::txn_count));
-            BEAST_EXPECT(queue_data[jss::txn_count] == 0);
-            BEAST_EXPECT(!queue_data.isMember(jss::lowest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::highest_sequence));
-            BEAST_EXPECT(!queue_data.isMember(jss::auth_change_queued));
-            BEAST_EXPECT(!queue_data.isMember(jss::max_spend_drops_total));
-            BEAST_EXPECT(!queue_data.isMember(jss::transactions));
+            auto const& queueData = result[jss::queue_data];
+            BEAST_EXPECT(queueData.isObject());
+            BEAST_EXPECT(queueData.isMember(jss::txn_count));
+            BEAST_EXPECT(queueData[jss::txn_count] == 0);
+            BEAST_EXPECT(!queueData.isMember(jss::lowest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::highest_sequence));
+            BEAST_EXPECT(!queueData.isMember(jss::auth_change_queued));
+            BEAST_EXPECT(!queueData.isMember(jss::max_spend_drops_total));
+            BEAST_EXPECT(!queueData.isMember(jss::transactions));
         }
     }
 
@@ -3190,17 +3179,17 @@ public:
 
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
-        Env_ss envs(env);
+        EnvSs envs(env);
 
         Account const alice{"alice"};
         env.fund(XRP(1000000), alice);
         env.close();
 
         {
-            auto const server_info = env.rpc("server_info");
+            auto const serverInfo = env.rpc("server_info");
             BEAST_EXPECT(
-                server_info.isMember(jss::result) && server_info[jss::result].isMember(jss::info));
-            auto const& info = server_info[jss::result][jss::info];
+                serverInfo.isMember(jss::result) && serverInfo[jss::result].isMember(jss::info));
+            auto const& info = serverInfo[jss::result][jss::info];
             BEAST_EXPECT(info.isMember(jss::load_factor) && info[jss::load_factor] == 1);
             BEAST_EXPECT(!info.isMember(jss::load_factor_server));
             BEAST_EXPECT(!info.isMember(jss::load_factor_local));
@@ -3208,8 +3197,8 @@ public:
             BEAST_EXPECT(!info.isMember(jss::load_factor_fee_escalation));
         }
         {
-            auto const server_state = env.rpc("server_state");
-            auto const& state = server_state[jss::result][jss::state];
+            auto const serverState = env.rpc("server_state");
+            auto const& state = serverState[jss::result][jss::state];
             BEAST_EXPECT(state.isMember(jss::load_factor) && state[jss::load_factor] == 256);
             BEAST_EXPECT(state.isMember(jss::load_base) && state[jss::load_base] == 256);
             BEAST_EXPECT(
@@ -3231,16 +3220,16 @@ public:
         checkMetrics(*this, env, 0, 6, 4, 3);
 
         auto aliceSeq = env.seq(alice);
-        auto submitParams = Json::Value(Json::objectValue);
+        auto submitParams = json::Value(json::ObjectValue);
         for (auto i = 0; i < 4; ++i)
-            envs(noop(alice), fee(baseFee * 10), seq(aliceSeq + i), ter(terQUEUED))(submitParams);
+            envs(noop(alice), Fee(baseFee * 10), Seq(aliceSeq + i), Ter(terQUEUED))(submitParams);
         checkMetrics(*this, env, 4, 6, 4, 3);
 
         {
-            auto const server_info = env.rpc("server_info");
+            auto const serverInfo = env.rpc("server_info");
             BEAST_EXPECT(
-                server_info.isMember(jss::result) && server_info[jss::result].isMember(jss::info));
-            auto const& info = server_info[jss::result][jss::info];
+                serverInfo.isMember(jss::result) && serverInfo[jss::result].isMember(jss::info));
+            auto const& info = serverInfo[jss::result][jss::info];
             // Avoid double rounding issues by comparing to a range.
             BEAST_EXPECT(
                 info.isMember(jss::load_factor) && info[jss::load_factor] > 888.88 &&
@@ -3255,8 +3244,8 @@ public:
                 info[jss::load_factor_fee_escalation] < 888.89);
         }
         {
-            auto const server_state = env.rpc("server_state");
-            auto const& state = server_state[jss::result][jss::state];
+            auto const serverState = env.rpc("server_state");
+            auto const& state = serverState[jss::result][jss::state];
             BEAST_EXPECT(state.isMember(jss::load_factor) && state[jss::load_factor] == 227555);
             BEAST_EXPECT(state.isMember(jss::load_base) && state[jss::load_base] == 256);
             BEAST_EXPECT(
@@ -3275,10 +3264,10 @@ public:
         env.app().getFeeTrack().setRemoteFee(256000);
 
         {
-            auto const server_info = env.rpc("server_info");
+            auto const serverInfo = env.rpc("server_info");
             BEAST_EXPECT(
-                server_info.isMember(jss::result) && server_info[jss::result].isMember(jss::info));
-            auto const& info = server_info[jss::result][jss::info];
+                serverInfo.isMember(jss::result) && serverInfo[jss::result].isMember(jss::info));
+            auto const& info = serverInfo[jss::result][jss::info];
             // Avoid double rounding issues by comparing to a range.
             BEAST_EXPECT(info.isMember(jss::load_factor) && info[jss::load_factor] == 1000);
             BEAST_EXPECT(!info.isMember(jss::load_factor_server));
@@ -3290,8 +3279,8 @@ public:
                 info[jss::load_factor_fee_escalation] < 888.89);
         }
         {
-            auto const server_state = env.rpc("server_state");
-            auto const& state = server_state[jss::result][jss::state];
+            auto const serverState = env.rpc("server_state");
+            auto const& state = serverState[jss::result][jss::state];
             BEAST_EXPECT(state.isMember(jss::load_factor) && state[jss::load_factor] == 256000);
             BEAST_EXPECT(state.isMember(jss::load_base) && state[jss::load_base] == 256);
             BEAST_EXPECT(
@@ -3316,10 +3305,10 @@ public:
         BEAST_EXPECT(env.app().getFeeTrack().getLoadFactor() == 625);
 
         {
-            auto const server_info = env.rpc("server_info");
+            auto const serverInfo = env.rpc("server_info");
             BEAST_EXPECT(
-                server_info.isMember(jss::result) && server_info[jss::result].isMember(jss::info));
-            auto const& info = server_info[jss::result][jss::info];
+                serverInfo.isMember(jss::result) && serverInfo[jss::result].isMember(jss::info));
+            auto const& info = serverInfo[jss::result][jss::info];
             // Avoid double rounding issues by comparing to a range.
             BEAST_EXPECT(
                 info.isMember(jss::load_factor) && info[jss::load_factor] > 888.88 &&
@@ -3340,8 +3329,8 @@ public:
                 info[jss::load_factor_fee_escalation] < 888.89);
         }
         {
-            auto const server_state = env.rpc("server_state");
-            auto const& state = server_state[jss::result][jss::state];
+            auto const serverState = env.rpc("server_state");
+            auto const& state = serverState[jss::result][jss::state];
             BEAST_EXPECT(state.isMember(jss::load_factor) && state[jss::load_factor] == 227555);
             BEAST_EXPECT(state.isMember(jss::load_base) && state[jss::load_base] == 256);
             // There can be a race between LoadManager lowering the fee,
@@ -3364,10 +3353,10 @@ public:
         env.close();
 
         {
-            auto const server_info = env.rpc("server_info");
+            auto const serverInfo = env.rpc("server_info");
             BEAST_EXPECT(
-                server_info.isMember(jss::result) && server_info[jss::result].isMember(jss::info));
-            auto const& info = server_info[jss::result][jss::info];
+                serverInfo.isMember(jss::result) && serverInfo[jss::result].isMember(jss::info));
+            auto const& info = serverInfo[jss::result][jss::info];
             // Avoid double rounding issues by comparing to a range.
 
             // There can be a race between LoadManager lowering the fee,
@@ -3384,8 +3373,8 @@ public:
             BEAST_EXPECT(!info.isMember(jss::load_factor_fee_escalation));
         }
         {
-            auto const server_state = env.rpc("server_state");
-            auto const& state = server_state[jss::result][jss::state];
+            auto const serverState = env.rpc("server_state");
+            auto const& state = serverState[jss::result][jss::state];
             BEAST_EXPECT(
                 state.isMember(jss::load_factor) && state[jss::load_factor] >= 320 &&
                 state[jss::load_factor] <= 625);
@@ -3417,8 +3406,8 @@ public:
         Env env(*this, makeConfig({{"minimum_txn_in_ledger_standalone", "3"}}));
         auto const baseFee = env.current()->fees().base.drops();
 
-        Json::Value stream;
-        stream[jss::streams] = Json::arrayValue;
+        json::Value stream;
+        stream[jss::streams] = json::ArrayValue;
         stream[jss::streams].append("server");
         auto wsc = makeWSClient(env.app().config());
         {
@@ -3480,14 +3469,14 @@ public:
         env.fund(XRP(50000), noripple(e, f, g, h, i));
 
         // Extra transactions with low fee are queued
-        auto queued = ter(terQUEUED);
-        env(noop(a), fee(baseFee), queued);
-        env(noop(b), fee(baseFee), queued);
-        env(noop(c), fee(baseFee), queued);
-        env(noop(d), fee(baseFee), queued);
-        env(noop(e), fee(baseFee), queued);
-        env(noop(f), fee(baseFee), queued);
-        env(noop(g), fee(baseFee), queued);
+        auto queued = Ter(terQUEUED);
+        env(noop(a), Fee(baseFee), queued);
+        env(noop(b), Fee(baseFee), queued);
+        env(noop(c), Fee(baseFee), queued);
+        env(noop(d), Fee(baseFee), queued);
+        env(noop(e), Fee(baseFee), queued);
+        env(noop(f), Fee(baseFee), queued);
+        env(noop(g), Fee(baseFee), queued);
         checkMetrics(*this, env, 7, 8, 5, 4);
 
         // Last transaction escalates the fee
@@ -3596,7 +3585,7 @@ public:
             std::uint64_t totalPaid = 0;
             for (int i = 0; i < 2; ++i)
             {
-                env(noop(alice), fee(baseFee * 10), seq(aliceSeq++), ter(terQUEUED));
+                env(noop(alice), Fee(baseFee * 10), Seq(aliceSeq++), Ter(terQUEUED));
                 totalPaid += baseFee * 10;
             }
 
@@ -3604,7 +3593,7 @@ public:
             // This will be the first tx to call the operative function,
             // but it won't succeed.
             totalPaid += openLedgerCost(env).drops();
-            env(noop(alice), fee(openLedgerCost(env)), seq(aliceSeq++), ter(terQUEUED));
+            env(noop(alice), Fee(openLedgerCost(env)), Seq(aliceSeq++), Ter(terQUEUED));
 
             checkMetrics(*this, env, 3, std::nullopt, 4, 3);
 
@@ -3616,7 +3605,7 @@ public:
             // Submit a transaction with that fee. It will get queued
             // because the fee level calculation rounds down. This is
             // the edge case test.
-            env(noop(alice), fee(totalFee), seq(aliceSeq++), ter(terQUEUED));
+            env(noop(alice), Fee(totalFee), Seq(aliceSeq++), Ter(terQUEUED));
 
             checkMetrics(*this, env, 4, std::nullopt, 4, 3);
 
@@ -3626,7 +3615,7 @@ public:
             totalFee = calcTotalFee(totalPaid);
 
             // Submit a transaction with that fee. It will succeed.
-            env(noop(alice), fee(totalFee), seq(aliceSeq++));
+            env(noop(alice), Fee(totalFee), Seq(aliceSeq++));
 
             checkMetrics(*this, env, 0, std::nullopt, 9, 3);
         }
@@ -3638,14 +3627,14 @@ public:
             uint64_t totalPaid = 0;
             for (int i = 0; i < 2; ++i)
             {
-                env(noop(alice), fee(baseFee * 10), seq(aliceSeq++), ter(terQUEUED));
+                env(noop(alice), Fee(baseFee * 10), Seq(aliceSeq++), Ter(terQUEUED));
                 totalPaid += baseFee * 10;
             }
 
             // Queue up a transaction paying the open ledger fee
             // This will be the first tx to call the operative function,
             // but it won't succeed.
-            env(noop(alice), fee(openLedgerCost(env)), seq(aliceSeq++), ter(terQUEUED));
+            env(noop(alice), Fee(openLedgerCost(env)), Seq(aliceSeq++), Ter(terQUEUED));
 
             checkMetrics(*this, env, 3, std::nullopt, 9, 3);
 
@@ -3655,7 +3644,7 @@ public:
             std::uint64_t const totalFee = calcTotalFee(totalPaid, metrics.txCount);
             // Replacing the last tx with the large fee succeeds.
             --aliceSeq;
-            env(noop(alice), fee(totalFee), seq(aliceSeq++));
+            env(noop(alice), Fee(totalFee), Seq(aliceSeq++));
 
             // The queue is clear
             checkMetrics(*this, env, 0, std::nullopt, 12, 3);
@@ -3671,7 +3660,7 @@ public:
             auto aliceSeq = env.seq(alice);
             for (int i = 0; i < 5; ++i)
             {
-                env(noop(alice), fee(baseFee * 10), seq(aliceSeq++), ter(terQUEUED));
+                env(noop(alice), Fee(baseFee * 10), Seq(aliceSeq++), Ter(terQUEUED));
             }
 
             checkMetrics(*this, env, 5, 24, 13, 12);
@@ -3680,7 +3669,7 @@ public:
             uint64_t const totalFee = calcTotalFee(baseFee * 10 * 2, 3);
             // Replacing the last tx with the large fee succeeds.
             aliceSeq -= 3;
-            env(noop(alice), fee(totalFee), seq(aliceSeq++));
+            env(noop(alice), Fee(totalFee), Seq(aliceSeq++));
 
             checkMetrics(*this, env, 2, 24, 16, 12);
             auto const aliceQueue = env.app().getTxQ().getAccountTxs(alice.id());
@@ -3689,7 +3678,7 @@ public:
             for (auto const& tx : aliceQueue)
             {
                 BEAST_EXPECT(tx.seqProxy == seq);
-                BEAST_EXPECT(tx.feeLevel == FeeLevel64{baseFeeLevel.fee() * 10});
+                BEAST_EXPECT(tx.feeLevel == FeeLevel64{kBASE_FEE_LEVEL.fee() * 10});
                 seq.advanceBy(1);
             }
 
@@ -3706,12 +3695,12 @@ public:
             uint64_t totalPaid = 0;
             for (int i = 0; i < 2; ++i)
             {
-                env(noop(alice), fee(baseFee * 20), seq(aliceSeq++), ter(terQUEUED));
+                env(noop(alice), Fee(baseFee * 20), Seq(aliceSeq++), Ter(terQUEUED));
                 totalPaid += baseFee * 20;
             }
             for (int i = 0; i < 2; ++i)
             {
-                env(noop(alice), fee(baseFee * 2.2), seq(aliceSeq++), ter(terQUEUED));
+                env(noop(alice), Fee(baseFee * 2.2), Seq(aliceSeq++), Ter(terQUEUED));
                 totalPaid += baseFee * 2.2;
             }
 
@@ -3726,7 +3715,7 @@ public:
             feeTrack.setRemoteFee(origFee * 5);
             // Instead the tx gets queued, and all of the queued
             // txs stay in the queue.
-            env(noop(alice), fee(totalFee), seq(aliceSeq++), ter(terQUEUED));
+            env(noop(alice), Fee(totalFee), Seq(aliceSeq++), Ter(terQUEUED));
 
             // The original last transaction is still in the queue
             checkMetrics(*this, env, 5, 32, 17, 16);
@@ -3743,7 +3732,7 @@ public:
             fillQueue(env, bob);
             checkMetrics(*this, env, 3, 34, 18, 17);
 
-            env(noop(alice), fee(XRP(1)), seq(aliceSeq++), ter(terQUEUED));
+            env(noop(alice), Fee(XRP(1)), Seq(aliceSeq++), Ter(terQUEUED));
             checkMetrics(*this, env, 4, 34, 18, 17);
 
             // With normal load, those txs get into the ledger
@@ -3778,7 +3767,7 @@ public:
             auto seqAlice = env.seq(alice);
             auto txCount = 140;
             for (int i = 0; i < txCount; ++i)
-                env(noop(alice), seq(seqAlice++), ter(terQUEUED));
+                env(noop(alice), Seq(seqAlice++), Ter(terQUEUED));
             checkMetrics(*this, env, txCount, std::nullopt, 4, 3);
 
             // Close a few ledgers successfully, so the limit grows
@@ -3864,7 +3853,7 @@ public:
             auto seqAlice = env.seq(alice);
             auto txCount = 43;
             for (int i = 0; i < txCount; ++i)
-                env(noop(alice), seq(seqAlice++), ter(terQUEUED));
+                env(noop(alice), Seq(seqAlice++), Ter(terQUEUED));
             checkMetrics(*this, env, txCount, std::nullopt, 4, 3);
 
             // Close a few ledgers successfully, so the limit grows
@@ -3910,7 +3899,7 @@ public:
 
         auto const alice = Account("alice");
 
-        auto const queued = ter(terQUEUED);
+        auto const queued = Ter(terQUEUED);
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 3);
 
@@ -3932,8 +3921,8 @@ public:
         //  which won't work if unit tests are separated to only
         //  be callable via RPC.)
         env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-            auto const tx = env.jt(noop(alice), seq(aliceSeq), fee(openLedgerCost(env)));
-            auto const result = xrpl::apply(env.app(), view, *tx.stx, tapUNLIMITED, j);
+            auto const tx = env.jt(noop(alice), Seq(aliceSeq), Fee(openLedgerCost(env)));
+            auto const result = xrpl::apply(env.app(), view, *tx.stx, TapUnlimited, j);
             BEAST_EXPECT(isTesSuccess(result.ter) && result.applied);
             return result.applied;
         });
@@ -3943,12 +3932,12 @@ public:
         // The next transaction should be able to go into the open
         // ledger, even though aliceSeq is queued.  In earlier incarnations
         // of the TxQ this would cause an assert.
-        env(noop(alice), seq(aliceSeq + 1), fee(openLedgerCost(env)));
+        env(noop(alice), Seq(aliceSeq + 1), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, std::nullopt, 6, 3);
         // Now queue a couple more transactions to make sure
         // they succeed despite aliceSeq being queued
-        env(noop(alice), seq(aliceSeq + 2), queued);
-        env(noop(alice), seq(aliceSeq + 3), queued);
+        env(noop(alice), Seq(aliceSeq + 2), queued);
+        env(noop(alice), Seq(aliceSeq + 3), queued);
         checkMetrics(*this, env, 3, std::nullopt, 6, 3);
 
         // Now close the ledger. One of the queued transactions
@@ -3973,7 +3962,7 @@ public:
 
         auto alice = Account("alice");
 
-        auto queued = ter(terQUEUED);
+        auto queued = Ter(terQUEUED);
 
         checkMetrics(*this, env, 0, std::nullopt, 0, 3);
 
@@ -3991,7 +3980,7 @@ public:
 
         // Queue a transaction with a ticket.  Leave an unused ticket
         // on either side.
-        env(noop(alice), ticket::use(tktSeq0 + 1), queued);
+        env(noop(alice), ticket::Use(tktSeq0 + 1), queued);
         checkMetrics(*this, env, 1, std::nullopt, 4, 3);
 
         // Now, apply a (different) transaction directly
@@ -4000,8 +3989,8 @@ public:
         //  which won't work if unit tests are separated to only
         //  be callable via RPC.)
         env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
-            auto const tx = env.jt(noop(alice), ticket::use(tktSeq0 + 1), fee(openLedgerCost(env)));
-            auto const result = xrpl::apply(env.app(), view, *tx.stx, tapUNLIMITED, j);
+            auto const tx = env.jt(noop(alice), ticket::Use(tktSeq0 + 1), Fee(openLedgerCost(env)));
+            auto const result = xrpl::apply(env.app(), view, *tx.stx, TapUnlimited, j);
             BEAST_EXPECT(isTesSuccess(result.ter) && result.applied);
             return result.applied;
         });
@@ -4012,18 +4001,18 @@ public:
         // the open ledger, even though tktSeq0 is queued.  Note that this
         // sequence-based transaction goes in front of the queued
         // transaction, so the queued transaction is left in the queue.
-        env(noop(alice), fee(openLedgerCost(env)));
+        env(noop(alice), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, std::nullopt, 6, 3);
 
         // We should be able to do the same thing with a ticket that goes
         // if front of the queued transaction.  This one too will leave
         // the queued transaction in place.
-        env(noop(alice), ticket::use(tktSeq0 + 0), fee(openLedgerCost(env)));
+        env(noop(alice), ticket::Use(tktSeq0 + 0), Fee(openLedgerCost(env)));
         checkMetrics(*this, env, 1, std::nullopt, 7, 3);
 
         // We have one ticketed transaction in the queue.  We should able
         // to add another to the queue.
-        env(noop(alice), ticket::use(tktSeq0 + 2), queued);
+        env(noop(alice), ticket::Use(tktSeq0 + 2), queued);
         checkMetrics(*this, env, 2, std::nullopt, 7, 3);
 
         // Here we try to force the queued transactions into the ledger by
@@ -4039,7 +4028,7 @@ public:
         // Fee averaging does not make sense with tickets.  Every ticketed
         // transaction is equally capable of going into the ledger independent
         // of all other ticket- or sequence-based transactions.
-        env(noop(alice), ticket::use(tktSeq0 + 3), fee(XRP(10)));
+        env(noop(alice), ticket::Use(tktSeq0 + 3), Fee(XRP(10)));
         checkMetrics(*this, env, 2, std::nullopt, 8, 3);
 
         // Now close the ledger. One of the queued transactions
@@ -4068,10 +4057,10 @@ public:
         Account const ellie("ellie");
         Account const fiona("fiona");
 
-        constexpr int ledgersInQueue = 30;
+        constexpr int kLEDGERS_IN_QUEUE = 30;
         auto cfg = makeConfig(
             {{"minimum_txn_in_ledger_standalone", "1"},
-             {"ledgers_in_queue", std::to_string(ledgersInQueue)},
+             {"ledgers_in_queue", std::to_string(kLEDGERS_IN_QUEUE)},
              {"maximum_txn_per_account", "10"}},
             {{"account_reserve", "1000"}, {"owner_reserve", "50"}});
 
@@ -4096,7 +4085,7 @@ public:
         env.close();
 
         auto const metrics = env.app().getTxQ().getMetrics(*env.current());
-        checkMetrics(*this, env, 0, ledgersInQueue * metrics.txPerLedger, 0, 2);
+        checkMetrics(*this, env, 0, kLEDGERS_IN_QUEUE * metrics.txPerLedger, 0, 2);
 
         // Close ledgers until the amendments show up.
         int i = 0;
@@ -4107,7 +4096,7 @@ public:
                 break;
         }
         auto expectedPerLedger = xrpl::detail::numUpVotedAmendments() + 1;
-        checkMetrics(*this, env, 0, ledgersInQueue * expectedPerLedger, 0, expectedPerLedger);
+        checkMetrics(*this, env, 0, kLEDGERS_IN_QUEUE * 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,
@@ -4126,7 +4115,7 @@ public:
             *this,
             env,
             0,
-            ledgersInQueue * expectedPerLedger,
+            kLEDGERS_IN_QUEUE * expectedPerLedger,
             expectedPerLedger + 1,
             expectedPerLedger);
 
@@ -4141,25 +4130,25 @@ public:
         // Use fees to guarantee order
         int txFee{static_cast<int>(baseFee * 9)};
         auto prepareFee = [&](uint64_t multiplier) {
-            return fee(txFee - (multiplier * baseFee / 10));
+            return Fee(txFee - (multiplier * baseFee / 10));
         };
 
         uint64_t multiplier = 0;
         for (int i = 0; i < 10; ++i)
         {
-            env(noop(alice), seq(seqAlice++), prepareFee(++multiplier), ter(terQUEUED));
-            env(noop(bob), seq(seqBob++), prepareFee(++multiplier), ter(terQUEUED));
-            env(noop(carol), seq(seqCarol++), prepareFee(++multiplier), ter(terQUEUED));
-            env(noop(daria), seq(seqDaria++), prepareFee(++multiplier), ter(terQUEUED));
-            env(noop(ellie), seq(seqEllie++), prepareFee(++multiplier), ter(terQUEUED));
-            env(noop(fiona), seq(seqFiona++), prepareFee(++multiplier), ter(terQUEUED));
+            env(noop(alice), Seq(seqAlice++), prepareFee(++multiplier), Ter(terQUEUED));
+            env(noop(bob), Seq(seqBob++), prepareFee(++multiplier), Ter(terQUEUED));
+            env(noop(carol), Seq(seqCarol++), prepareFee(++multiplier), Ter(terQUEUED));
+            env(noop(daria), Seq(seqDaria++), prepareFee(++multiplier), Ter(terQUEUED));
+            env(noop(ellie), Seq(seqEllie++), prepareFee(++multiplier), Ter(terQUEUED));
+            env(noop(fiona), Seq(seqFiona++), prepareFee(++multiplier), Ter(terQUEUED));
         }
         std::size_t expectedInQueue = multiplier;
         checkMetrics(
             *this,
             env,
             expectedInQueue,
-            ledgersInQueue * expectedPerLedger,
+            kLEDGERS_IN_QUEUE * expectedPerLedger,
             expectedPerLedger + 1,
             expectedPerLedger);
 
@@ -4185,7 +4174,7 @@ public:
                 *this,
                 env,
                 expectedInQueue,
-                ledgersInQueue * expectedPerLedger,
+                kLEDGERS_IN_QUEUE * expectedPerLedger,
                 expectedInLedger,
                 expectedPerLedger);
             {
@@ -4270,16 +4259,16 @@ public:
         auto seqAlice = env.seq(alice);
         auto const seqSaveAlice = seqAlice;
         int feeDrops = baseFee * 4;
-        env(noop(alice), seq(seqAlice++), fee(--feeDrops), last_ledger_seq(7), ter(terQUEUED));
-        env(noop(alice), seq(seqAlice++), fee(--feeDrops), ter(terQUEUED));
-        env(noop(alice), seq(seqAlice++), fee(--feeDrops), ter(terQUEUED));
+        env(noop(alice), Seq(seqAlice++), Fee(--feeDrops), LastLedgerSeq(7), Ter(terQUEUED));
+        env(noop(alice), Seq(seqAlice++), Fee(--feeDrops), Ter(terQUEUED));
+        env(noop(alice), Seq(seqAlice++), Fee(--feeDrops), Ter(terQUEUED));
         BEAST_EXPECT(env.seq(alice) == seqSaveAlice);
 
         // Similarly for bob, but bob uses tickets in his transactions.
         // The drop penalty works a little differently with tickets.
-        env(noop(bob), ticket::use(bobTicketSeq + 0), last_ledger_seq(7), ter(terQUEUED));
-        env(noop(bob), ticket::use(bobTicketSeq + 1), fee(--feeDrops), ter(terQUEUED));
-        env(noop(bob), ticket::use(bobTicketSeq + 2), fee(--feeDrops), ter(terQUEUED));
+        env(noop(bob), ticket::Use(bobTicketSeq + 0), LastLedgerSeq(7), Ter(terQUEUED));
+        env(noop(bob), ticket::Use(bobTicketSeq + 1), Fee(--feeDrops), Ter(terQUEUED));
+        env(noop(bob), ticket::Use(bobTicketSeq + 2), Fee(--feeDrops), Ter(terQUEUED));
 
         // Fill the queue with higher fee transactions so alice's and
         // bob's transactions are stuck in the queue.
@@ -4290,10 +4279,10 @@ public:
         feeDrops = medFee;
         for (int i = 0; i < 7; ++i)
         {
-            env(noop(carol), seq(seqCarol++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(daria), seq(seqDaria++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(ellie), seq(seqEllie++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(fiona), seq(seqFiona++), fee(--feeDrops), ter(terQUEUED));
+            env(noop(carol), Seq(seqCarol++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(daria), Seq(seqDaria++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(ellie), Seq(seqEllie++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(fiona), Seq(seqFiona++), Fee(--feeDrops), Ter(terQUEUED));
         }
 
         checkMetrics(*this, env, 34, 50, 7, 6);
@@ -4304,10 +4293,10 @@ public:
         feeDrops = medFee;
         for (int i = 0; i < 3; ++i)
         {
-            env(noop(carol), seq(seqCarol++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(daria), seq(seqDaria++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(ellie), seq(seqEllie++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(fiona), seq(seqFiona++), fee(--feeDrops), ter(terQUEUED));
+            env(noop(carol), Seq(seqCarol++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(daria), Seq(seqDaria++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(ellie), Seq(seqEllie++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(fiona), Seq(seqFiona++), Fee(--feeDrops), Ter(terQUEUED));
         }
         checkMetrics(*this, env, 38, 50, 8, 7);
         env.close();
@@ -4317,10 +4306,10 @@ public:
         feeDrops = medFee;
         for (int i = 0; i < 3; ++i)
         {
-            env(noop(carol), seq(seqCarol++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(daria), seq(seqDaria++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(ellie), seq(seqEllie++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(fiona), seq(seqFiona++), fee(--feeDrops), ter(terQUEUED));
+            env(noop(carol), Seq(seqCarol++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(daria), Seq(seqDaria++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(ellie), Seq(seqEllie++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(fiona), Seq(seqFiona++), Fee(--feeDrops), Ter(terQUEUED));
         }
         checkMetrics(*this, env, 41, 50, 9, 8);
         env.close();
@@ -4332,20 +4321,20 @@ public:
         //
         // This also means that alice has a sequence gap in her transactions,
         // and thus can't queue any more.
-        env(noop(alice), seq(seqAlice), fee(hiFee), ter(telCAN_NOT_QUEUE));
+        env(noop(alice), Seq(seqAlice), Fee(hiFee), Ter(telCAN_NOT_QUEUE));
 
         // Once again, fill the queue almost to the brim.
         feeDrops = medFee;
         for (int i = 0; i < 4; ++i)
         {
-            env(noop(carol), seq(seqCarol++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(daria), seq(seqDaria++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(ellie), seq(seqEllie++), fee(--feeDrops), ter(terQUEUED));
-            env(noop(fiona), seq(seqFiona++), fee(--feeDrops), ter(terQUEUED));
+            env(noop(carol), Seq(seqCarol++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(daria), Seq(seqDaria++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(ellie), Seq(seqEllie++), Fee(--feeDrops), Ter(terQUEUED));
+            env(noop(fiona), Seq(seqFiona++), Fee(--feeDrops), Ter(terQUEUED));
         }
-        env(noop(carol), seq(seqCarol++), fee(--feeDrops), ter(terQUEUED));
-        env(noop(daria), seq(seqDaria++), fee(--feeDrops), ter(terQUEUED));
-        env(noop(ellie), seq(seqEllie++), fee(--feeDrops), ter(terQUEUED));
+        env(noop(carol), Seq(seqCarol++), Fee(--feeDrops), Ter(terQUEUED));
+        env(noop(daria), Seq(seqDaria++), Fee(--feeDrops), Ter(terQUEUED));
+        env(noop(ellie), Seq(seqEllie++), Fee(--feeDrops), Ter(terQUEUED));
         checkMetrics(*this, env, 48, 50, 10, 9);
 
         // Now induce a fee jump which should cause all the transactions
@@ -4389,22 +4378,22 @@ public:
         //    b) For just now having a queued transaction fail on apply()
         //       because of the sequence gap.
         //
-        // Verify that none 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;
 
         // Verify that there's a gap at the front of alice's queue by
         // queuing another low fee transaction into that spot.
-        env(noop(alice), seq(seqAlice++), fee(baseFee * 1.1), ter(terQUEUED));
+        env(noop(alice), Seq(seqAlice++), Fee(baseFee * 1.1), Ter(terQUEUED));
 
         // Verify that the first entry in alice's queue is still there
         // by trying to replace it and having that fail.
-        env(noop(alice), seq(seqAlice++), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(alice), Seq(seqAlice++), Ter(telCAN_NOT_QUEUE_FEE));
 
         // Verify that the last transaction in alice's queue was removed by
         // appending to her queue with a very low fee.
-        env(noop(alice), seq(seqAlice++), ter(terQUEUED));
+        env(noop(alice), Seq(seqAlice++), Ter(terQUEUED));
 
         // Before the close() bob had two transactions in his queue.
         // We now expect him to have one.  Here's the state of bob's queue.
@@ -4422,15 +4411,15 @@ public:
 
         // Verify that bob's first transaction was removed from the queue
         // by queueing another low fee transaction into that spot.
-        env(noop(bob), ticket::use(bobTicketSeq + 0), fee(baseFee * 1.2), ter(terQUEUED));
+        env(noop(bob), ticket::Use(bobTicketSeq + 0), Fee(baseFee * 1.2), Ter(terQUEUED));
 
         // Verify that bob's second transaction was removed from the queue
         // by queueing another low fee transaction into that spot.
-        env(noop(bob), ticket::use(bobTicketSeq + 1), fee(baseFee * 1.1), ter(terQUEUED));
+        env(noop(bob), ticket::Use(bobTicketSeq + 1), Fee(baseFee * 1.1), Ter(terQUEUED));
 
         // Verify that the last entry in bob's queue is still there
         // by trying to replace it and having that fail.
-        env(noop(bob), ticket::use(bobTicketSeq + 2), ter(telCAN_NOT_QUEUE_FEE));
+        env(noop(bob), ticket::Use(bobTicketSeq + 2), Ter(telCAN_NOT_QUEUE_FEE));
     }
 
     void
@@ -4441,7 +4430,7 @@ public:
 
         Account const alice("alice");
         auto gw = Account("gw");
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
 
         auto cfg = makeConfig(
             {{"minimum_txn_in_ledger_standalone", "5"},
@@ -4462,18 +4451,18 @@ public:
 
             // Alice creates a couple offers
             auto const aliceSeq = env.seq(alice);
-            env(offer(alice, USD(1000), XRP(1000)), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1000)), Ter(terQUEUED));
 
-            env(offer(alice, USD(1000), XRP(1001)), seq(aliceSeq + 1), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1001)), Seq(aliceSeq + 1), Ter(terQUEUED));
 
             // Alice creates transactions that cancel the first set of
             // offers, one through another offer, and one cancel
-            env(offer(alice, USD(1000), XRP(1002)),
-                seq(aliceSeq + 2),
-                json(jss::OfferSequence, aliceSeq),
-                ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1002)),
+                Seq(aliceSeq + 2),
+                Json(jss::OfferSequence, aliceSeq),
+                Ter(terQUEUED));
 
-            env(offer_cancel(alice, aliceSeq + 1), seq(aliceSeq + 3), ter(terQUEUED));
+            env(offerCancel(alice, aliceSeq + 1), Seq(aliceSeq + 3), Ter(terQUEUED));
 
             env.close();
 
@@ -4493,9 +4482,9 @@ public:
             // Alice creates a couple offers using tickets, consuming the
             // tickets in reverse order
             auto const aliceSeq = env.seq(alice);
-            env(offer(alice, USD(1000), XRP(1000)), ticket::use(aliceTkt + 4), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1000)), ticket::Use(aliceTkt + 4), Ter(terQUEUED));
 
-            env(offer(alice, USD(1000), XRP(1001)), ticket::use(aliceTkt + 3), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1001)), ticket::Use(aliceTkt + 3), Ter(terQUEUED));
 
             // Alice creates a couple more transactions that cancel the first
             // set of offers, also in reverse order. This allows Alice to submit
@@ -4503,25 +4492,25 @@ public:
             // These transactions succeed because Ticket ordering is arbitrary
             // and it's up to the user to ensure they don't step on their own
             // feet.
-            env(offer(alice, USD(1000), XRP(1002)),
-                ticket::use(aliceTkt + 2),
-                json(jss::OfferSequence, aliceTkt + 4),
-                ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1002)),
+                ticket::Use(aliceTkt + 2),
+                Json(jss::OfferSequence, aliceTkt + 4),
+                Ter(terQUEUED));
 
-            env(offer_cancel(alice, aliceTkt + 3), ticket::use(aliceTkt + 1), ter(terQUEUED));
+            env(offerCancel(alice, aliceTkt + 3), ticket::Use(aliceTkt + 1), Ter(terQUEUED));
 
             // Create a couple more offers using sequences
-            env(offer(alice, USD(1000), XRP(1000)), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1000)), Ter(terQUEUED));
 
-            env(offer(alice, USD(1000), XRP(1001)), seq(aliceSeq + 1), ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1001)), Seq(aliceSeq + 1), Ter(terQUEUED));
 
             // And try to cancel those using tickets
-            env(offer(alice, USD(1000), XRP(1002)),
-                ticket::use(aliceTkt + 5),
-                json(jss::OfferSequence, aliceSeq),
-                ter(terQUEUED));
+            env(offer(alice, usd(1000), XRP(1002)),
+                ticket::Use(aliceTkt + 5),
+                Json(jss::OfferSequence, aliceSeq),
+                Ter(terQUEUED));
 
-            env(offer_cancel(alice, aliceSeq + 1), ticket::use(aliceTkt + 6), ter(terQUEUED));
+            env(offerCancel(alice, aliceSeq + 1), ticket::Use(aliceTkt + 6), Ter(terQUEUED));
 
             env.close();
 
@@ -4539,7 +4528,7 @@ public:
         using namespace jtx;
 
         Account const alice("alice");
-        auto const queued = ter(terQUEUED);
+        auto const queued = Ter(terQUEUED);
 
         Env env(
             *this,
@@ -4558,7 +4547,7 @@ public:
             auto const fee = env.rpc("fee");
 
             if (BEAST_EXPECT(fee.isMember(jss::result)) &&
-                BEAST_EXPECT(!RPC::contains_error(fee[jss::result])))
+                BEAST_EXPECT(!RPC::containsError(fee[jss::result])))
             {
                 auto const& result = fee[jss::result];
 
@@ -4599,7 +4588,7 @@ public:
 
         checkMetrics(*this, env, 0, 6, 4, 3);
 
-        env(noop(alice), fee(openLedgerCost(env)));
+        env(noop(alice), Fee(openLedgerCost(env)));
 
         checkMetrics(*this, env, 0, 6, 5, 3);
 
@@ -4608,7 +4597,7 @@ public:
 
         checkMetrics(*this, env, 1, 6, 5, 3);
 
-        env(noop(alice), seq(aliceSeq + 1), fee(10), queued);
+        env(noop(alice), Seq(aliceSeq + 1), Fee(10), queued);
 
         checkMetrics(*this, env, 2, 6, 5, 3);
 
@@ -4616,7 +4605,7 @@ public:
             auto const fee = env.rpc("fee");
 
             if (BEAST_EXPECT(fee.isMember(jss::result)) &&
-                BEAST_EXPECT(!RPC::contains_error(fee[jss::result])))
+                BEAST_EXPECT(!RPC::containsError(fee[jss::result])))
             {
                 auto const& result = fee[jss::result];
 
diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp
index bbc77671bc..fa8ec7ea3d 100644
--- a/src/test/app/ValidatorKeys_test.cpp
+++ b/src/test/app/ValidatorKeys_test.cpp
@@ -22,15 +22,15 @@
 
 namespace xrpl::test {
 
-class ValidatorKeys_test : public beast::unit_test::suite
+class ValidatorKeys_test : public beast::unit_test::Suite
 {
     // Used with [validation_seed]
-    std::string const seed = "shUwVw52ofnCUX5m7kPTKzJdr4HEH";
+    std::string const seed_ = "shUwVw52ofnCUX5m7kPTKzJdr4HEH";
 
     // Used with [validation_token]
-    std::string const tokenSecretStr = "paQmjZ37pKKPMrgadBLsuf9ab7Y7EUNzh27LQrZqoexpAs31nJi";
+    std::string const tokenSecretStr_ = "paQmjZ37pKKPMrgadBLsuf9ab7Y7EUNzh27LQrZqoexpAs31nJi";
 
-    std::vector<std::string> const tokenBlob = {
+    std::vector<std::string> const tokenBlob_ = {
         "    eyJ2YWxpZGF0aW9uX3NlY3JldF9rZXkiOiI5ZWQ0NWY4NjYyNDFjYzE4YTI3NDdiNT\n",
         " \tQzODdjMDYyNTkwNzk3MmY0ZTcxOTAyMzFmYWE5Mzc0NTdmYTlkYWY2IiwibWFuaWZl     \n",
         "\tc3QiOiJKQUFBQUFGeEllMUZ0d21pbXZHdEgyaUNjTUpxQzlnVkZLaWxHZncxL3ZDeE\n",
@@ -41,7 +41,7 @@ class ValidatorKeys_test : public beast::unit_test::suite
         "VUSmEydzBpMjFlcTNNWXl3TFZKWm5GT3I3QzBrdzJBaVR6U0NqSXpkaXRROD0ifQ==\n",
     };
 
-    std::string const tokenManifest =
+    std::string const tokenManifest_ =
         "JAAAAAFxIe1FtwmimvGtH2iCcMJqC9gVFKilGfw1/vCxHXXLplc2GnMhAkE1agqXxBwD"
         "wDbID6OMSYuM0FDAlpAgNk8SKFn7MO2fdkcwRQIhAOngu9sAKqXYouJ+l2V0W+sAOkVB"
         "+ZRS6PShlJAfUsXfAiBsVJGesaadOJc/aAZokS1vymGmVrlHPKWX3Yywu6in8HASQKPu"
@@ -49,7 +49,7 @@ class ValidatorKeys_test : public beast::unit_test::suite
         "2AiTzSCjIzditQ8=";
 
     // Manifest does not match private key
-    std::vector<std::string> const invalidTokenBlob = {
+    std::vector<std::string> const invalidTokenBlob_ = {
         "eyJtYW5pZmVzdCI6IkpBQUFBQVZ4SWUyOVVBdzViZFJudHJ1elVkREk4aDNGV1JWZl\n",
         "k3SXVIaUlKQUhJd3MxdzZzM01oQWtsa1VXQWR2RnFRVGRlSEpvS1pNY0hlS0RzOExo\n",
         "b3d3bDlHOEdkVGNJbmFka1l3UkFJZ0h2Q01lQU1aSzlqQnV2aFhlaFRLRzVDQ3BBR1\n",
@@ -66,23 +66,24 @@ public:
     {
         // We're only using Env for its Journal.  That Journal gives better
         // coverage in unit tests.
-        test::jtx::Env env{*this, test::jtx::envconfig(), nullptr, beast::severities::kDisabled};
+        test::jtx::Env env{*this, test::jtx::envconfig(), nullptr, beast::severities::KDisabled};
         beast::Journal const journal{env.app().getJournal("ValidatorKeys_test")};
 
         // Keys/ID when using [validation_seed]
         SecretKey const seedSecretKey =
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            generateSecretKey(KeyType::secp256k1, *parseBase58<Seed>(seed));
-        PublicKey const seedPublicKey = derivePublicKey(KeyType::secp256k1, seedSecretKey);
+            generateSecretKey(KeyType::Secp256k1, *parseBase58<Seed>(seed_));
+        PublicKey const seedPublicKey = derivePublicKey(KeyType::Secp256k1, seedSecretKey);
         NodeID const seedNodeID = calcNodeID(seedPublicKey);
 
         // Keys when using [validation_token]
-        // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        auto const tokenSecretKey = *parseBase58<SecretKey>(TokenType::NodePrivate, tokenSecretStr);
+        auto const tokenSecretKey =
+            // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
+            *parseBase58<SecretKey>(TokenType::NodePrivate, tokenSecretStr_);
 
-        auto const tokenPublicKey = derivePublicKey(KeyType::secp256k1, tokenSecretKey);
+        auto const tokenPublicKey = derivePublicKey(KeyType::Secp256k1, tokenSecretKey);
 
-        auto const m = deserializeManifest(base64_decode(tokenManifest));
+        auto const m = deserializeManifest(base64Decode(tokenManifest_));
         BEAST_EXPECT(m);
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -99,7 +100,7 @@ public:
         {
             // validation seed section -> empty manifest and valid seeds
             Config c;
-            c.section(SECTION_VALIDATION_SEED).append(seed);
+            c.section(SECTION_VALIDATION_SEED).append(seed_);
 
             ValidatorKeys k{c, journal};
             if (BEAST_EXPECT(k.keys); k.keys.has_value())
@@ -126,7 +127,7 @@ public:
         {
             // validator token
             Config c;
-            c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob);
+            c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob_);
             ValidatorKeys k{c, journal};
 
             if (BEAST_EXPECT(k.keys); k.keys.has_value())
@@ -135,7 +136,7 @@ public:
                 BEAST_EXPECT(test::equal(k.keys->secretKey, tokenSecretKey));
             }
             BEAST_EXPECT(k.nodeID == tokenNodeID);
-            BEAST_EXPECT(k.manifest == tokenManifest);
+            BEAST_EXPECT(k.manifest == tokenManifest_);
             BEAST_EXPECT(!k.configInvalid());
         }
         {
@@ -151,8 +152,8 @@ public:
         {
             // Cannot specify both
             Config c;
-            c.section(SECTION_VALIDATION_SEED).append(seed);
-            c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob);
+            c.section(SECTION_VALIDATION_SEED).append(seed_);
+            c.section(SECTION_VALIDATOR_TOKEN).append(tokenBlob_);
             ValidatorKeys const k{c, journal};
 
             BEAST_EXPECT(k.configInvalid());
@@ -163,7 +164,7 @@ public:
         {
             // Token manifest and private key must match
             Config c;
-            c.section(SECTION_VALIDATOR_TOKEN).append(invalidTokenBlob);
+            c.section(SECTION_VALIDATOR_TOKEN).append(invalidTokenBlob_);
             ValidatorKeys const k{c, journal};
 
             BEAST_EXPECT(k.configInvalid());
diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
index 63c2ca37d8..52ab2e69aa 100644
--- a/src/test/app/ValidatorList_test.cpp
+++ b/src/test/app/ValidatorList_test.cpp
@@ -51,7 +51,7 @@
 
 namespace xrpl::test {
 
-class ValidatorList_test : public beast::unit_test::suite
+class ValidatorList_test : public beast::unit_test::Suite
 {
 private:
     struct Validator
@@ -64,13 +64,13 @@ private:
     static PublicKey
     randomNode()
     {
-        return derivePublicKey(KeyType::secp256k1, randomSecretKey());
+        return derivePublicKey(KeyType::Secp256k1, randomSecretKey());
     }
 
     static PublicKey
     randomMasterKey()
     {
-        return derivePublicKey(KeyType::ed25519, randomSecretKey());
+        return derivePublicKey(KeyType::Ed25519, randomSecretKey());
     }
 
     static std::string
@@ -81,7 +81,7 @@ private:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
 
@@ -89,11 +89,11 @@ private:
         {
             st[sfSigningPubKey] = spk;
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            sign(st, HashPrefix::manifest, *publicKeyType(spk), ssk);
+            sign(st, HashPrefix::Manifest, *publicKeyType(spk), ssk);
         }
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        sign(st, HashPrefix::manifest, *publicKeyType(pk), sk, sfMasterSignature);
+        sign(st, HashPrefix::Manifest, *publicKeyType(pk), sk, sfMasterSignature);
 
         Serializer s;
         st.add(s);
@@ -104,12 +104,12 @@ private:
     static std::string
     makeRevocationString(PublicKey const& pk, SecretKey const& sk)
     {
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = std::numeric_limits<std::uint32_t>::max();
         st[sfPublicKey] = pk;
 
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        sign(st, HashPrefix::manifest, *publicKeyType(pk), sk, sfMasterSignature);
+        sign(st, HashPrefix::Manifest, *publicKeyType(pk), sk, sfMasterSignature);
 
         Serializer s;
         st.add(s);
@@ -121,12 +121,12 @@ private:
     randomValidator()
     {
         auto const secret = randomSecretKey();
-        auto const masterPublic = derivePublicKey(KeyType::ed25519, secret);
-        auto const signingKeys = randomKeyPair(KeyType::secp256k1);
+        auto const masterPublic = derivePublicKey(KeyType::Ed25519, secret);
+        auto const signingKeys = randomKeyPair(KeyType::Secp256k1);
         return {
             .masterPublic = masterPublic,
             .signingPublic = signingKeys.first,
-            .manifest = base64_encode(makeManifestString(
+            .manifest = base64Encode(makeManifestString(
                 masterPublic, secret, signingKeys.first, signingKeys.second, 1))};
     }
 
@@ -151,13 +151,13 @@ private:
 
         data.pop_back();
         data += "]}";
-        return base64_encode(data);
+        return base64Encode(data);
     }
 
     static std::string
     signList(std::string const& blob, std::pair<PublicKey, SecretKey> const& keys)
     {
-        auto const data = base64_decode(blob);
+        auto const data = base64Decode(blob);
         return strHex(sign(keys.first, keys.second, makeSlice(data)));
     }
 
@@ -179,7 +179,7 @@ private:
         ListDisposition expectedBest)
     {
         BEAST_EXPECT(
-            result.bestDisposition() > ListDisposition::same_sequence ||
+            result.bestDisposition() > ListDisposition::SameSequence ||
             (result.publisherKey && *result.publisherKey == pubKey));
         BEAST_EXPECT(result.bestDisposition() == expectedBest);
         BEAST_EXPECT(result.worstDisposition() == expectedWorst);
@@ -220,16 +220,16 @@ private:
     {
         testcase("Config Load");
 
-        jtx::Env env(*this, jtx::envconfig(), nullptr, beast::severities::kDisabled);
+        jtx::Env env(*this, jtx::envconfig(), nullptr, beast::severities::KDisabled);
         auto& app = env.app();
         std::vector<std::string> const emptyCfgKeys;
         std::vector<std::string> const emptyCfgPublishers;
 
-        auto const localSigningKeys = randomKeyPair(KeyType::secp256k1);
+        auto const localSigningKeys = randomKeyPair(KeyType::Secp256k1);
         auto const localSigningPublicOuter = localSigningKeys.first;
         auto const localSigningSecret = localSigningKeys.second;
         auto const localMasterSecret = randomSecretKey();
-        auto const localMasterPublic = derivePublicKey(KeyType::ed25519, localMasterSecret);
+        auto const localMasterPublic = derivePublicKey(KeyType::Ed25519, localMasterSecret);
 
         std::string const cfgManifest(makeManifestString(
             localMasterPublic, localMasterSecret, localSigningPublicOuter, localSigningSecret, 1));
@@ -450,8 +450,8 @@ private:
                 env.journal);
 
             auto const pubRevokedSecret = randomSecretKey();
-            auto const pubRevokedPublic = derivePublicKey(KeyType::ed25519, pubRevokedSecret);
-            auto const pubRevokedSigning = randomKeyPair(KeyType::secp256k1);
+            auto const pubRevokedPublic = derivePublicKey(KeyType::Ed25519, pubRevokedSecret);
+            auto const pubRevokedSigning = randomKeyPair(KeyType::Secp256k1);
             // make this manifest revoked (seq num = max)
             //  -- thus should not be loaded
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -489,8 +489,8 @@ private:
                 env.journal);
 
             auto const pubRevokedSecret = randomSecretKey();
-            auto const pubRevokedPublic = derivePublicKey(KeyType::ed25519, pubRevokedSecret);
-            auto const pubRevokedSigning = randomKeyPair(KeyType::secp256k1);
+            auto const pubRevokedPublic = derivePublicKey(KeyType::Ed25519, pubRevokedSecret);
+            auto const pubRevokedSigning = randomKeyPair(KeyType::Secp256k1);
             // make this manifest revoked (seq num = max)
             //  -- thus should not be loaded
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -552,13 +552,13 @@ private:
                     {
                         BEAST_EXPECT(!a.isMember(jss::blob));
                         BEAST_EXPECT(!a.isMember(jss::signature));
-                        auto const& blobs_v2 = a[jss::blobs_v2];
-                        BEAST_EXPECT(blobs_v2.isArray() && blobs_v2.size() == expected.size());
+                        auto const& blobsV2 = a[jss::blobs_v2];
+                        BEAST_EXPECT(blobsV2.isArray() && blobsV2.size() == expected.size());
 
                         for (unsigned int i = 0; i < expected.size(); ++i)
                         {
-                            BEAST_EXPECT(blobs_v2[i][jss::blob] == expected[i].first);
-                            BEAST_EXPECT(blobs_v2[i][jss::signature] == expected[i].second);
+                            BEAST_EXPECT(blobsV2[i][jss::blob] == expected[i].first);
+                            BEAST_EXPECT(blobsV2[i][jss::signature] == expected[i].second);
                         }
                     }
                 }
@@ -591,10 +591,10 @@ private:
         };
 
         auto const publisherSecret = randomSecretKey();
-        auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
+        auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
         auto const hexPublic = strHex(publisherPublic.begin(), publisherPublic.end());
-        auto const pubSigningKeys1 = randomKeyPair(KeyType::secp256k1);
-        auto const manifest1 = base64_encode(makeManifestString(
+        auto const pubSigningKeys1 = randomKeyPair(KeyType::Secp256k1);
+        auto const manifest1 = base64Encode(makeManifestString(
             publisherPublic, publisherSecret, pubSigningKeys1.first, pubSigningKeys1.second, 1));
 
         std::vector<std::string> const cfgPublisherKeys({strHex(publisherPublic)});
@@ -603,15 +603,15 @@ private:
         BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublisherKeys));
 
         std::map<std::size_t, std::vector<Validator>> const lists = []() {
-            auto constexpr listSize = 20;
-            auto constexpr numLists = 9;
+            auto constexpr kLIST_SIZE = 20;
+            auto constexpr kNUM_LISTS = 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 <= numLists; ++i)
+            for (auto i = 1; i <= kNUM_LISTS; ++i)
             {
                 auto& list = lists[i];
-                list.reserve(listSize);
-                while (list.size() < listSize)
+                list.reserve(kLIST_SIZE);
+                while (list.size() < kLIST_SIZE)
                     list.push_back(randomValidator());
             }
             return lists;
@@ -634,8 +634,8 @@ private:
             trustedKeys->applyLists(
                 manifest1, version, {{expiredblob, expiredSig, {}}, {blob2, sig2, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::expired,
-            ListDisposition::accepted);
+            ListDisposition::Expired,
+            ListDisposition::Accepted);
 
         expectTrusted(lists.at(2));
 
@@ -667,8 +667,8 @@ private:
             trustedKeys->applyLists(
                 manifest1, version2, {{blob7, sig7, {}}, {blob8, sig8, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::pending,
-            ListDisposition::pending);
+            ListDisposition::Pending,
+            ListDisposition::Pending);
 
         expectUntrusted(lists.at(7));
         expectUntrusted(lists.at(8));
@@ -699,8 +699,8 @@ private:
             trustedKeys->applyLists(
                 manifest1, version, {{blob6a, sig6a, {}}, {blob6, sig6, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::pending,
-            ListDisposition::pending);
+            ListDisposition::Pending,
+            ListDisposition::Pending);
 
         expectUntrusted(lists.at(6));
         expectTrusted(lists.at(2));
@@ -711,8 +711,8 @@ private:
             trustedKeys->applyLists(
                 manifest1, version, {{blob7, sig7, {}}, {blob6, sig6, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::known_sequence,
-            ListDisposition::known_sequence);
+            ListDisposition::KnownSequence,
+            ListDisposition::KnownSequence);
 
         expectUntrusted(lists.at(6));
         expectUntrusted(lists.at(7));
@@ -722,36 +722,36 @@ private:
         checkResult(
             trustedKeys->applyLists("", version, {{blob7, sig7, {}}, {blob6, sig6, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::invalid,
-            ListDisposition::invalid);
+            ListDisposition::Invalid,
+            ListDisposition::Invalid);
 
         checkResult(
             trustedKeys->applyLists(
-                base64_encode("not a manifest"),
+                base64Encode("not a manifest"),
                 version,
                 {{blob7, sig7, {}}, {blob6, sig6, {}}},
                 siteUri),
             publisherPublic,
-            ListDisposition::invalid,
-            ListDisposition::invalid);
+            ListDisposition::Invalid,
+            ListDisposition::Invalid);
 
         // do not use list from untrusted publisher
-        auto const untrustedManifest = base64_encode(makeManifestString(
+        auto const untrustedManifest = base64Encode(makeManifestString(
             randomMasterKey(), publisherSecret, pubSigningKeys1.first, pubSigningKeys1.second, 1));
 
         checkResult(
             trustedKeys->applyLists(untrustedManifest, version, {{blob2, sig2, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::untrusted,
-            ListDisposition::untrusted);
+            ListDisposition::Untrusted,
+            ListDisposition::Untrusted);
 
         // do not use list with unhandled version
         auto const badVersion = 666;
         checkResult(
             trustedKeys->applyLists(manifest1, badVersion, {{blob2, sig2, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::unsupported_version,
-            ListDisposition::unsupported_version);
+            ListDisposition::UnsupportedVersion,
+            ListDisposition::UnsupportedVersion);
 
         // apply list with highest sequence number
         auto const sequence3 = 3;
@@ -761,8 +761,8 @@ private:
         checkResult(
             trustedKeys->applyLists(manifest1, version, {{blob3, sig3, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::accepted,
-            ListDisposition::accepted);
+            ListDisposition::Accepted,
+            ListDisposition::Accepted);
 
         expectUntrusted(lists.at(1));
         expectUntrusted(lists.at(2));
@@ -782,13 +782,13 @@ private:
             trustedKeys->applyLists(
                 manifest1, version, {{blob2, sig2, {}}, {blob3, sig3, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::stale,
-            ListDisposition::same_sequence);
+            ListDisposition::Stale,
+            ListDisposition::SameSequence);
 
         // apply list with new publisher key updated by manifest. Also send some
         // old lists along with the old manifest
-        auto const pubSigningKeys2 = randomKeyPair(KeyType::secp256k1);
-        auto manifest2 = base64_encode(makeManifestString(
+        auto const pubSigningKeys2 = randomKeyPair(KeyType::Secp256k1);
+        auto manifest2 = base64Encode(makeManifestString(
             publisherPublic, publisherSecret, pubSigningKeys2.first, pubSigningKeys2.second, 2));
 
         auto const sequence4 = 4;
@@ -802,8 +802,8 @@ private:
                 {{blob2, sig2, manifest1}, {blob3, sig3, manifest1}, {blob4, sig4, {}}},
                 siteUri),
             publisherPublic,
-            ListDisposition::stale,
-            ListDisposition::accepted);
+            ListDisposition::Stale,
+            ListDisposition::Accepted);
 
         expectUntrusted(lists.at(2));
         expectUntrusted(lists.at(3));
@@ -822,8 +822,8 @@ private:
         checkResult(
             trustedKeys->applyLists(manifest1, version, {{blob5, badSig, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::invalid,
-            ListDisposition::invalid);
+            ListDisposition::Invalid,
+            ListDisposition::Invalid);
 
         expectUntrusted(lists.at(2));
         expectUntrusted(lists.at(3));
@@ -835,8 +835,8 @@ private:
             trustedKeys->applyLists(
                 manifest1, version, {{blob7, sig7, {}}, {blob8, sig8, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::invalid,
-            ListDisposition::invalid);
+            ListDisposition::Invalid,
+            ListDisposition::Invalid);
 
         expectTrusted(lists.at(4));
         expectUntrusted(lists.at(7));
@@ -880,14 +880,14 @@ private:
         // already valid Also try reprocessing the pending list with an
         // explicit manifest
         // - it is still invalid
-        auto const sig8_2 = signList(blob8, pubSigningKeys2);
+        auto const sig82 = signList(blob8, pubSigningKeys2);
 
         checkResult(
             trustedKeys->applyLists(
-                manifest2, version, {{blob8, sig8, manifest1}, {blob8, sig8_2, {}}}, siteUri),
+                manifest2, version, {{blob8, sig8, manifest1}, {blob8, sig82, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::invalid,
-            ListDisposition::same_sequence);
+            ListDisposition::Invalid,
+            ListDisposition::SameSequence);
 
         expectTrusted(lists.at(8));
 
@@ -895,8 +895,8 @@ private:
 
         // do not apply list with revoked publisher key
         // applied list is removed due to revoked publisher key
-        auto const signingKeysMax = randomKeyPair(KeyType::secp256k1);
-        auto maxManifest = base64_encode(makeRevocationString(publisherPublic, publisherSecret));
+        auto const signingKeysMax = randomKeyPair(KeyType::Secp256k1);
+        auto maxManifest = base64Encode(makeRevocationString(publisherPublic, publisherSecret));
 
         auto const sequence9 = 9;
         auto const blob9 = makeList(lists.at(9), sequence9, validUntil.time_since_epoch().count());
@@ -905,8 +905,8 @@ private:
         checkResult(
             trustedKeys->applyLists(maxManifest, version, {{blob9, sig9, {}}}, siteUri),
             publisherPublic,
-            ListDisposition::untrusted,
-            ListDisposition::untrusted);
+            ListDisposition::Untrusted,
+            ListDisposition::Untrusted);
 
         BEAST_EXPECT(!trustedKeys->trustedPublisher(publisherPublic));
         for (auto const& [num, list] : lists)
@@ -937,10 +937,10 @@ private:
             env.journal);
 
         auto const publisherSecret = randomSecretKey();
-        auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
+        auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
         auto const hexPublic = strHex(publisherPublic.begin(), publisherPublic.end());
-        auto const pubSigningKeys1 = randomKeyPair(KeyType::secp256k1);
-        auto const manifest = base64_encode(makeManifestString(
+        auto const pubSigningKeys1 = randomKeyPair(KeyType::Secp256k1);
+        auto const manifest = base64Encode(makeManifestString(
             publisherPublic, publisherSecret, pubSigningKeys1.first, pubSigningKeys1.second, 1));
 
         std::vector<std::string> const cfgPublisherKeys({strHex(publisherPublic)});
@@ -949,10 +949,10 @@ private:
         BEAST_EXPECT(trustedKeys->load({}, emptyCfgKeys, cfgPublisherKeys));
 
         std::vector<Validator> const list = []() {
-            auto constexpr listSize = 20;
+            auto constexpr kLIST_SIZE = 20;
             std::vector<Validator> list;
-            list.reserve(listSize);
-            while (list.size() < listSize)
+            list.reserve(kLIST_SIZE);
+            while (list.size() < kLIST_SIZE)
                 list.push_back(randomValidator());
             return list;
         }();
@@ -971,7 +971,7 @@ private:
 
         BEAST_EXPECT(
             trustedKeys->applyLists(manifest, 1, {{blob, sig, {}}}, siteUri).bestDisposition() ==
-            ListDisposition::accepted);
+            ListDisposition::Accepted);
 
         {
             // invalid public key
@@ -982,7 +982,7 @@ private:
         {
             // unknown public key
             auto const badSecret = randomSecretKey();
-            auto const badPublic = derivePublicKey(KeyType::ed25519, badSecret);
+            auto const badPublic = derivePublicKey(KeyType::Ed25519, badSecret);
             auto const hexBad = strHex(badPublic.begin(), badPublic.end());
 
             auto const available = trustedKeys->getAvailable(hexBad, 1);
@@ -1040,11 +1040,11 @@ private:
                 {
                     BEAST_EXPECT(!a.isMember(jss::blob));
                     BEAST_EXPECT(!a.isMember(jss::signature));
-                    auto const& blobs_v2 = a[jss::blobs_v2];
-                    BEAST_EXPECT(blobs_v2.isArray() && blobs_v2.size() == 1);
+                    auto const& blobsV2 = a[jss::blobs_v2];
+                    BEAST_EXPECT(blobsV2.isArray() && blobsV2.size() == 1);
 
-                    BEAST_EXPECT(blobs_v2[0u][jss::blob] == blob);
-                    BEAST_EXPECT(blobs_v2[0u][jss::signature] == sig);
+                    BEAST_EXPECT(blobsV2[0u][jss::blob] == blob);
+                    BEAST_EXPECT(blobsV2[0u][jss::signature] == sig);
                 }
             }
         }
@@ -1133,13 +1133,13 @@ private:
         {
             // update with manifests
             auto const masterPrivate = randomSecretKey();
-            auto const masterPublic = derivePublicKey(KeyType::ed25519, masterPrivate);
+            auto const masterPublic = derivePublicKey(KeyType::Ed25519, masterPrivate);
 
             std::vector<std::string> const cfgKeys({toBase58(TokenType::NodePublic, masterPublic)});
 
             BEAST_EXPECT(trustedKeysOuter->load({}, cfgKeys, cfgPublishersOuter));
 
-            auto const signingKeys1 = randomKeyPair(KeyType::secp256k1);
+            auto const signingKeys1 = randomKeyPair(KeyType::Secp256k1);
             auto const signingPublic1 = signingKeys1.first;
             activeValidatorsOuter.emplace(calcNodeID(masterPublic));
 
@@ -1164,7 +1164,7 @@ private:
 
             BEAST_EXPECT(
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                manifestsOuter.applyManifest(std::move(*m1)) == ManifestDisposition::accepted);
+                manifestsOuter.applyManifest(std::move(*m1)) == ManifestDisposition::Accepted);
             BEAST_EXPECT(trustedKeysOuter->listed(masterPublic));
             BEAST_EXPECT(trustedKeysOuter->trusted(masterPublic));
             BEAST_EXPECT(trustedKeysOuter->listed(signingPublic1));
@@ -1172,13 +1172,13 @@ private:
 
             // Should only trust the ephemeral signing key
             // from the newest applied manifest
-            auto const signingKeys2 = randomKeyPair(KeyType::secp256k1);
+            auto const signingKeys2 = randomKeyPair(KeyType::Secp256k1);
             auto const signingPublic2 = signingKeys2.first;
             auto m2 = deserializeManifest(makeManifestString(
                 masterPublic, masterPrivate, signingPublic2, signingKeys2.second, 2));
             BEAST_EXPECT(
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                manifestsOuter.applyManifest(std::move(*m2)) == ManifestDisposition::accepted);
+                manifestsOuter.applyManifest(std::move(*m2)) == ManifestDisposition::Accepted);
             BEAST_EXPECT(trustedKeysOuter->listed(masterPublic));
             BEAST_EXPECT(trustedKeysOuter->trusted(masterPublic));
             BEAST_EXPECT(trustedKeysOuter->listed(signingPublic2));
@@ -1187,15 +1187,15 @@ private:
             BEAST_EXPECT(!trustedKeysOuter->trusted(signingPublic1));
 
             // Should not trust keys from revoked master public key
-            auto const signingKeysMax = randomKeyPair(KeyType::secp256k1);
+            auto const signingKeysMax = randomKeyPair(KeyType::Secp256k1);
             auto const signingPublicMax = signingKeysMax.first;
             activeValidatorsOuter.emplace(calcNodeID(signingPublicMax));
-            auto mMax = deserializeManifest(makeRevocationString(masterPublic, masterPrivate));
+            auto max = deserializeManifest(makeRevocationString(masterPublic, masterPrivate));
 
             // NOLINTBEGIN(bugprone-unchecked-optional-access)
-            BEAST_EXPECT(mMax->revoked());
+            BEAST_EXPECT(max->revoked());
             BEAST_EXPECT(
-                manifestsOuter.applyManifest(std::move(*mMax)) == ManifestDisposition::accepted);
+                manifestsOuter.applyManifest(std::move(*max)) == ManifestDisposition::Accepted);
             // NOLINTEND(bugprone-unchecked-optional-access)
 
             BEAST_EXPECT(manifestsOuter.getSigningKey(masterPublic) == masterPublic);
@@ -1233,7 +1233,7 @@ private:
                 app.config().legacy("database_path"),
                 env.journal);
             auto const publisherSecret = randomSecretKey();
-            auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
+            auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
 
             std::vector<std::string> const cfgPublishers({strHex(publisherPublic)});
             std::vector<std::string> const emptyCfgKeys;
@@ -1260,13 +1260,13 @@ private:
                 app.config().legacy("database_path"),
                 env.journal);
             auto const masterPrivate = randomSecretKey();
-            auto const masterPublic = derivePublicKey(KeyType::ed25519, masterPrivate);
+            auto const masterPublic = derivePublicKey(KeyType::Ed25519, masterPrivate);
             std::vector<std::string> const cfgKeys({toBase58(TokenType::NodePublic, masterPublic)});
 
             auto const publisher1Secret = randomSecretKey();
-            auto const publisher1Public = derivePublicKey(KeyType::ed25519, publisher1Secret);
+            auto const publisher1Public = derivePublicKey(KeyType::Ed25519, publisher1Secret);
             auto const publisher2Secret = randomSecretKey();
-            auto const publisher2Public = derivePublicKey(KeyType::ed25519, publisher2Secret);
+            auto const publisher2Public = derivePublicKey(KeyType::Ed25519, publisher2Secret);
             std::vector<std::string> const cfgPublishers(
                 {strHex(publisher1Public), strHex(publisher2Public)});
 
@@ -1351,9 +1351,9 @@ private:
                 env.journal);
 
             std::vector<std::string> const emptyCfgKeys;
-            auto const publisherKeys = randomKeyPair(KeyType::secp256k1);
-            auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
-            auto const manifest = base64_encode(makeManifestString(
+            auto const publisherKeys = randomKeyPair(KeyType::Secp256k1);
+            auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
+            auto const manifest = base64Encode(makeManifestString(
                 publisherKeys.first,
                 publisherKeys.second,
                 pubSigningKeys.first,
@@ -1377,7 +1377,7 @@ private:
             auto const sig = signList(blob, pubSigningKeys);
 
             BEAST_EXPECT(
-                ListDisposition::accepted ==
+                ListDisposition::Accepted ==
                 trustedKeys->applyLists(manifest, version, {{blob, sig, {}}}, siteUri)
                     .bestDisposition());
 
@@ -1418,7 +1418,7 @@ private:
             auto const sig2 = signList(blob2, pubSigningKeys);
 
             BEAST_EXPECT(
-                ListDisposition::accepted ==
+                ListDisposition::Accepted ==
                 trustedKeys->applyLists(manifest, version, {{blob2, sig2, {}}}, siteUri)
                     .bestDisposition());
 
@@ -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 publishers = 3;
+            constexpr static int kPUBLISHERS = 3;
             std::array<
                 std::pair<decltype(valKeys)::const_iterator, decltype(valKeys)::const_iterator>,
-                publishers>
+                kPUBLISHERS>
                 locals = {
                     std::make_pair(valKeys.cbegin(), valKeys.cend() - 4),
                     std::make_pair(valKeys.cbegin() + 1, valKeys.cend() - 2),
@@ -1557,9 +1557,9 @@ private:
 
             auto addPublishedList = [&, this](int i) {
                 auto const publisherSecret = randomSecretKey();
-                auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
-                auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
-                auto const manifest = base64_encode(makeManifestString(
+                auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
+                auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
+                auto const manifest = base64Encode(makeManifestString(
                     publisherPublic,
                     publisherSecret,
                     pubSigningKeys.first,
@@ -1582,13 +1582,13 @@ private:
                 auto const sig = signList(blob, pubSigningKeys);
 
                 BEAST_EXPECT(
-                    ListDisposition::accepted ==
+                    ListDisposition::Accepted ==
                     trustedKeys->applyLists(manifest, version, {{blob, sig, {}}}, siteUri)
                         .bestDisposition());
             };
 
             // Apply multiple published lists
-            for (auto i = 0; i < publishers; ++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 publishers = 3;
+            constexpr static int kPUBLISHERS = 3;
             std::array<
                 std::pair<decltype(valKeys)::const_iterator, decltype(valKeys)::const_iterator>,
-                publishers>
+                kPUBLISHERS>
                 locals = {
                     std::make_pair(valKeys.cbegin(), valKeys.cend() - 4),
                     std::make_pair(valKeys.cbegin() + 1, valKeys.cend() - 2),
@@ -1649,9 +1649,9 @@ private:
                 [&, this](
                     int i, NetClock::time_point& validUntil1, NetClock::time_point& validUntil2) {
                     auto const publisherSecret = randomSecretKey();
-                    auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
-                    auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
-                    auto const manifest = base64_encode(makeManifestString(
+                    auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
+                    auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
+                    auto const manifest = base64Encode(makeManifestString(
                         publisherPublic,
                         publisherSecret,
                         pubSigningKeys.first,
@@ -1695,7 +1695,7 @@ private:
                     auto const sig = signList(blob, pubSigningKeys);
 
                     BEAST_EXPECT(
-                        ListDisposition::accepted ==
+                        ListDisposition::Accepted ==
                         trustedKeys->applyLists(manifest, version, {{blob, sig, {}}}, siteUri)
                             .bestDisposition());
                 };
@@ -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 < publishers; ++i)
+            for (auto i = 0; i < kPUBLISHERS; ++i)
                 addPublishedList(i, validUntil1, validUntil2);
             BEAST_EXPECT(trustedKeys->getListThreshold() == 2);
 
@@ -1866,9 +1866,9 @@ private:
             using namespace std::chrono_literals;
             auto addPublishedList = [this, &env, &trustedKeys, &validators]() {
                 auto const publisherSecret = randomSecretKey();
-                auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
-                auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
-                auto const manifest = base64_encode(makeManifestString(
+                auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
+                auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
+                auto const manifest = base64Encode(makeManifestString(
                     publisherPublic,
                     publisherSecret,
                     pubSigningKeys.first,
@@ -1917,8 +1917,8 @@ private:
             checkResult(
                 trustedKeys->applyLists(prep1.manifest, prep1.version, prep1.blobs, siteUri),
                 prep1.publisherPublic,
-                ListDisposition::pending,
-                ListDisposition::accepted);
+                ListDisposition::Pending,
+                ListDisposition::Accepted);
 
             // One list still hasn't published, so expiration is still
             // unknown
@@ -1928,8 +1928,8 @@ private:
             checkResult(
                 trustedKeys->applyLists(prep2.manifest, prep2.version, prep2.blobs, siteUri),
                 prep2.publisherPublic,
-                ListDisposition::pending,
-                ListDisposition::accepted);
+                ListDisposition::Pending,
+                ListDisposition::Accepted);
             // We now have loaded both lists, so expiration is known
             BEAST_EXPECT(
                 trustedKeys->expires() &&
@@ -2087,10 +2087,10 @@ private:
                             ++it;
                         }
                         validators->setNegativeUNL(nUnl);
-                        auto nUnl_temp = validators->getNegativeUNL();
-                        if (nUnl_temp.size() == nUnl.size())
+                        auto nUnlTemp = validators->getNegativeUNL();
+                        if (nUnlTemp.size() == nUnl.size())
                         {
-                            for (auto& n : nUnl_temp)
+                            for (auto& n : nUnlTemp)
                             {
                                 if (!nUnl.contains(n))
                                     return false;
@@ -2548,10 +2548,10 @@ private:
         jtx::Env env(*this);
         auto& app = env.app();
 
-        constexpr std::size_t maxKeys = 20;
+        constexpr std::size_t kMAX_KEYS = 20;
         hash_set<NodeID> activeValidators;
         std::vector<Validator> valKeys;
-        while (valKeys.size() != maxKeys)
+        while (valKeys.size() != kMAX_KEYS)
         {
             valKeys.push_back(randomValidator());
             activeValidators.emplace(calcNodeID(valKeys.back().masterPublic));
@@ -2588,17 +2588,17 @@ private:
             for (std::size_t i = 0; i < countTotal; ++i)
             {
                 auto const publisherSecret = randomSecretKey();
-                auto const publisherPublic = derivePublicKey(KeyType::ed25519, publisherSecret);
-                auto const pubSigningKeys = randomKeyPair(KeyType::secp256k1);
+                auto const publisherPublic = derivePublicKey(KeyType::Ed25519, publisherSecret);
+                auto const pubSigningKeys = randomKeyPair(KeyType::Secp256k1);
                 cfgPublishers.push_back(strHex(publisherPublic));
 
-                constexpr auto revoked = std::numeric_limits<std::uint32_t>::max();
-                auto const manifest = base64_encode(makeManifestString(
+                constexpr auto kREVOKED = std::numeric_limits<std::uint32_t>::max();
+                auto const manifest = base64Encode(makeManifestString(
                     publisherPublic,
                     publisherSecret,
                     pubSigningKeys.first,
                     pubSigningKeys.second,
-                    i < countRevoked ? revoked : 1));
+                    i < countRevoked ? kREVOKED : 1));
                 publishers.push_back(
                     Publisher{
                         .revoked = i < countRevoked,
@@ -2612,7 +2612,7 @@ private:
             auto threshold = listThreshold > 0 ? std::optional(listThreshold) : std::nullopt;
             if (self)
             {
-                valManifests.applyManifest(*deserializeManifest(base64_decode(self->manifest)));
+                valManifests.applyManifest(*deserializeManifest(base64Decode(self->manifest)));
                 BEAST_EXPECT(
                     result->load(self->signingPublic, emptyCfgKeys, cfgPublishers, threshold));
             }
@@ -2632,15 +2632,15 @@ private:
                 BEAST_EXPECT(
                     result->applyLists(publishers[i].manifest, 1, {{blob, sig, {}}}, siteUri)
                         .bestDisposition() ==
-                    (publishers[i].revoked ? ListDisposition::untrusted
-                                           : ListDisposition::accepted));
+                    (publishers[i].revoked ? ListDisposition::Untrusted
+                                           : ListDisposition::Accepted));
             }
 
             return result;
         };
 
         // Test cases use 5 publishers.
-        constexpr auto quorumDisabled = std::numeric_limits<std::size_t>::max();
+        constexpr auto kQUORUM_DISABLED = 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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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() == quorumDisabled);
+            BEAST_EXPECT(trustedKeys->quorum() == kQUORUM_DISABLED);
             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 f652689b2b..4145b4f8b1 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -45,12 +45,12 @@ realValidatorContents()
 )vl";
 }
 
-auto constexpr default_expires = std::chrono::seconds{3600};
-auto constexpr default_effective_overlap = std::chrono::seconds{30};
+auto constexpr kDEFAULT_EXPIRES = std::chrono::seconds{3600};
+auto constexpr kDEFAULT_EFFECTIVE_OVERLAP = std::chrono::seconds{30};
 }  // namespace detail
 
 namespace test {
-class ValidatorSite_test : public beast::unit_test::suite
+class ValidatorSite_test : public beast::unit_test::Suite
 {
 private:
     using Validator = TrustedPublisherServer::Validator;
@@ -62,7 +62,7 @@ private:
 
         using namespace jtx;
 
-        Env env(*this, envconfig(), nullptr, beast::severities::kDisabled);
+        Env env(*this, envconfig(), nullptr, beast::severities::KDisabled);
         auto trustedSites = std::make_unique<ValidatorSite>(env.app(), env.journal);
 
         // load should accept empty sites list
@@ -129,8 +129,8 @@ private:
         bool failFetch = false;
         bool failApply = false;
         int serverVersion = 1;
-        std::chrono::seconds expiresFromNow = detail::default_expires;
-        std::chrono::seconds effectiveOverlap = detail::default_effective_overlap;
+        std::chrono::seconds expiresFromNow = detail::kDEFAULT_EXPIRES;
+        std::chrono::seconds effectiveOverlap = detail::kDEFAULT_EFFECTIVE_OVERLAP;
         int expectedRefreshMin = 0;
     };
     void
@@ -159,9 +159,9 @@ private:
         beast::Journal journal{sink};
 
         std::vector<std::string> const emptyCfgKeys;
-        struct publisher
+        struct Publisher
         {
-            publisher(FetchListConfig const& c) : cfg{c}
+            Publisher(FetchListConfig const& c) : cfg{c}
             {
             }
             std::shared_ptr<TrustedPublisherServer> server;
@@ -170,9 +170,9 @@ private:
             FetchListConfig const& cfg;
             bool isRetry{};
         };
-        std::vector<publisher> servers;
+        std::vector<Publisher> servers;
 
-        auto constexpr listSize = 20;
+        auto constexpr kLIST_SIZE = 20;
         std::vector<std::string> cfgPublishers;
 
         for (auto const& cfg : paths)
@@ -180,14 +180,14 @@ private:
             servers.emplace_back(cfg);
             auto& item = servers.back();
             item.isRetry = cfg.path == "/bad-resource";
-            item.list.reserve(listSize);
-            while (item.list.size() < listSize)
+            item.list.reserve(kLIST_SIZE);
+            while (item.list.size() < kLIST_SIZE)
                 item.list.push_back(TrustedPublisherServer::randomValidator());
 
             NetClock::time_point const expires = env.timeKeeper().now() + cfg.expiresFromNow;
             NetClock::time_point const effective2 = expires - cfg.effectiveOverlap;
             NetClock::time_point const expires2 = effective2 + cfg.expiresFromNow;
-            item.server = make_TrustedPublisherServer(
+            item.server = makeTrustedPublisherServer(
                 env.app().getIOContext(),
                 item.list,
                 expires,
@@ -206,7 +206,7 @@ private:
             }
 
             std::stringstream uri;
-            uri << (cfg.ssl ? "https://" : "http://") << item.server->local_endpoint() << cfg.path;
+            uri << (cfg.ssl ? "https://" : "http://") << item.server->localEndpoint() << cfg.path;
             item.uri = uri.str();
         }
 
@@ -236,7 +236,7 @@ private:
                 BEAST_EXPECT(trustedKeys.listed(val.signingPublic) != u.cfg.failApply);
             }
 
-            Json::Value myStatus;
+            json::Value myStatus;
             for (auto const& vs : jv[jss::validator_sites])
             {
                 if (vs[jss::uri].asString().find(u.uri) != std::string::npos)
@@ -288,13 +288,13 @@ private:
         test::StreamSink sink;
         beast::Journal journal{sink};
 
-        struct publisher
+        struct Publisher
         {
             std::string uri;
             std::string expectMsg;
             bool shouldFail;
         };
-        std::vector<publisher> servers;
+        std::vector<Publisher> servers;
 
         for (auto const& cfg : paths)
         {
@@ -321,7 +321,7 @@ private:
         for (auto const& u : servers)
         {
             auto const jv = sites->getJson();
-            Json::Value myStatus;
+            json::Value myStatus;
             for (auto const& vs : jv[jss::validator_sites])
             {
                 if (vs[jss::uri].asString().find(u.uri) != std::string::npos)
@@ -405,7 +405,7 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
+                  detail::kDEFAULT_EXPIRES,
                   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::minInt}}});
+                  std::chrono::seconds{json::Value::kMIN_INT}}});
             // 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::maxInt - 300},
+                  std::chrono::seconds{json::Value::kMAX_INT - 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::maxInt - 300},
+                  std::chrono::seconds{json::Value::kMAX_INT - 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::minInt},
-                  std::chrono::seconds{Json::Value::maxInt - 6000}}});
+                  std::chrono::seconds{json::Value::kMIN_INT},
+                  std::chrono::seconds{json::Value::kMAX_INT - 6000}}});
             // verify refresh intervals are properly clamped
             testFetchList(
                 good,
@@ -542,8 +542,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   1}});  // minimum of 1 minute
             testFetchList(
                 good,
@@ -553,8 +553,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   1}});  // minimum of 1 minute
             testFetchList(
                 good,
@@ -564,8 +564,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   10}});  // 10 minutes is fine
             testFetchList(
                 good,
@@ -575,8 +575,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   10}});  // 10 minutes is fine
             testFetchList(
                 good,
@@ -586,8 +586,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   60 * 24}});  // max of 24 hours
             testFetchList(
                 good,
@@ -597,8 +597,8 @@ public:
                   false,
                   false,
                   1,
-                  detail::default_expires,
-                  detail::default_effective_overlap,
+                  detail::kDEFAULT_EXPIRES,
+                  detail::kDEFAULT_EFFECTIVE_OVERLAP,
                   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 775d579b9b..b0b93e0b3f 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -64,13 +64,13 @@
 
 namespace xrpl {
 
-class Vault_test : public beast::unit_test::suite
+class Vault_test : public beast::unit_test::Suite
 {
     using PrettyAsset = xrpl::test::jtx::PrettyAsset;
     using PrettyAmount = xrpl::test::jtx::PrettyAmount;
 
-    static auto constexpr negativeAmount = [](PrettyAsset const& asset) -> PrettyAmount {
-        return {STAmount{asset.raw(), 1ul, 0, true, STAmount::unchecked{}}, ""};
+    static auto constexpr kNEGATIVE_AMOUNT = [](PrettyAsset const& asset) -> PrettyAmount {
+        return {STAmount{asset.raw(), 1ul, 0, true, STAmount::Unchecked{}}, ""};
     };
 
     void
@@ -134,7 +134,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to deposit more than assets held");
                 auto tx = vault.deposit(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(10000)});
-                env(tx, ter(tecINSUFFICIENT_FUNDS));
+                env(tx, Ter(tecINSUFFICIENT_FUNDS));
                 env.close();
             }
 
@@ -159,7 +159,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 testcase(prefix + " fail to delete non-empty vault");
                 auto tx = vault.del({.owner = owner, .id = keylet.key});
-                env(tx, ter(tecHAS_OBLIGATIONS));
+                env(tx, Ter(tecHAS_OBLIGATIONS));
                 env.close();
             }
 
@@ -167,7 +167,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to update because wrong owner");
                 auto tx = vault.set({.owner = issuer, .id = keylet.key});
                 tx[sfAssetsMaximum] = asset(50).number();
-                env(tx, ter(tecNO_PERMISSION));
+                env(tx, Ter(tecNO_PERMISSION));
                 env.close();
             }
 
@@ -175,7 +175,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to set maximum lower than current amount");
                 auto tx = vault.set({.owner = owner, .id = keylet.key});
                 tx[sfAssetsMaximum] = asset(50).number();
-                env(tx, ter(tecLIMIT_EXCEEDED));
+                env(tx, Ter(tecLIMIT_EXCEEDED));
                 env.close();
             }
 
@@ -206,8 +206,8 @@ class Vault_test : public beast::unit_test::suite
             {
                 testcase(prefix + " fail to set domain on public vault");
                 auto tx = vault.set({.owner = owner, .id = keylet.key});
-                tx[sfDomainID] = to_string(base_uint<256>(42ul));
-                env(tx, ter{tecNO_PERMISSION});
+                tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+                env(tx, Ter{tecNO_PERMISSION});
                 env.close();
             }
 
@@ -215,7 +215,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to deposit more than maximum");
                 auto tx =
                     vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-                env(tx, ter(tecLIMIT_EXCEEDED));
+                env(tx, Ter(tecLIMIT_EXCEEDED));
                 env.close();
             }
 
@@ -231,7 +231,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to withdraw more than assets held");
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(1000)});
-                env(tx, ter(tecINSUFFICIENT_FUNDS));
+                env(tx, Ter(tecINSUFFICIENT_FUNDS));
                 env.close();
             }
 
@@ -246,7 +246,7 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 testcase(prefix + " clawback some");
-                auto code = asset.raw().native() ? ter(temMALFORMED) : ter(tesSUCCESS);
+                auto code = asset.raw().native() ? Ter(temMALFORMED) : Ter(tesSUCCESS);
                 auto tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = depositor, .amount = asset(10)});
                 env(tx, code);
@@ -259,7 +259,7 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 testcase(prefix + " clawback all");
-                auto code = asset.raw().native() ? ter(tecNO_PERMISSION) : ter(tesSUCCESS);
+                auto code = asset.raw().native() ? Ter(tecNO_PERMISSION) : Ter(tesSUCCESS);
                 auto tx = vault.clawback({.issuer = issuer, .id = keylet.key, .holder = depositor});
                 env(tx, code);
                 env.close();
@@ -273,14 +273,14 @@ class Vault_test : public beast::unit_test::suite
                              .id = keylet.key,
                              .holder = depositor,
                              .amount = asset(10)});
-                        env(tx, ter{tecPRECISION_LOSS});
+                        env(tx, Ter{tecPRECISION_LOSS});
                         env.close();
                     }
 
                     {
                         auto tx = vault.withdraw(
                             {.depositor = depositor, .id = keylet.key, .amount = asset(10)});
-                        env(tx, ter{tecPRECISION_LOSS});
+                        env(tx, Ter{tecPRECISION_LOSS});
                         env.close();
                     }
                 }
@@ -335,7 +335,7 @@ class Vault_test : public beast::unit_test::suite
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
                 tx[sfDestination] = alice.human();
-                env(tx, ter{tecNO_PERMISSION});
+                env(tx, Ter{tecNO_PERMISSION});
                 env.close();
             }
 
@@ -344,7 +344,7 @@ class Vault_test : public beast::unit_test::suite
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(1000)});
                 tx[sfDestination] = "0";
-                env(tx, ter(temMALFORMED));
+                env(tx, Ter(temMALFORMED));
                 env.close();
             }
 
@@ -354,7 +354,7 @@ class Vault_test : public beast::unit_test::suite
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
                 tx[sfDestination] = erin.human();
-                env(tx, ter{asset.raw().holds<Issue>() ? tecNO_LINE : tecNO_AUTH});
+                env(tx, Ter{asset.raw().holds<Issue>() ? tecNO_LINE : tecNO_AUTH});
                 env.close();
             }
 
@@ -363,7 +363,7 @@ class Vault_test : public beast::unit_test::suite
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
                 tx[sfDestination] = dave.human();
-                env(tx, ter{tecDST_TAG_NEEDED});
+                env(tx, Ter{tecDST_TAG_NEEDED});
                 env.close();
             }
 
@@ -388,7 +388,7 @@ class Vault_test : public beast::unit_test::suite
                 testcase(prefix + " fail to withdraw lsfRequireDestTag");
                 auto tx =
                     vault.withdraw({.depositor = dave, .id = keylet.key, .amount = asset(50)});
-                env(tx, ter{tecDST_TAG_NEEDED});
+                env(tx, Ter{tecDST_TAG_NEEDED});
                 env.close();
             }
 
@@ -453,14 +453,14 @@ class Vault_test : public beast::unit_test::suite
                          .id = keylet.key,
                          .holder = depositor,
                          .amount = asset(0)});
-                    env(tx, ter{tecPRECISION_LOSS});
+                    env(tx, Ter{tecPRECISION_LOSS});
                     env.close();
                 }
 
                 {
                     auto tx = vault.withdraw(
                         {.depositor = depositor, .id = keylet.key, .amount = share(10)});
-                    env(tx, ter{tecINSUFFICIENT_FUNDS});
+                    env(tx, Ter{tecINSUFFICIENT_FUNDS});
                     env.close();
                 }
             }
@@ -480,7 +480,7 @@ class Vault_test : public beast::unit_test::suite
                     auto tx = pay(erin, depositor, share(10 * scale));
 
                     // depositor no longer has MPToken for shares
-                    env(tx, ter{tecNO_AUTH});
+                    env(tx, Ter{tecNO_AUTH});
                     env.close();
 
                     // depositor will gain MPToken for shares again
@@ -509,7 +509,7 @@ class Vault_test : public beast::unit_test::suite
                 env.close();
 
                 // Erin has MPToken but is no longer authorized to hold assets
-                env(pay(depositor, erin, share(1)), ter{tecNO_LINE});
+                env(pay(depositor, erin, share(1)), Ter{tecNO_LINE});
                 env.close();
 
                 // Depositor withdraws remaining single asset
@@ -521,7 +521,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 testcase(prefix + " fail to delete because wrong owner");
                 auto tx = vault.del({.owner = issuer, .id = keylet.key});
-                env(tx, ter(tecNO_PERMISSION));
+                env(tx, Ter(tecNO_PERMISSION));
                 env.close();
             }
 
@@ -536,7 +536,7 @@ class Vault_test : public beast::unit_test::suite
 
         auto testCases = [&, this](
                              std::string prefix, std::function<PrettyAsset(Env & env)> setup) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
 
             Vault vault{env};
             env.fund(XRP(1000), issuer, owner, depositor, charlie, dave);
@@ -545,8 +545,8 @@ class Vault_test : public beast::unit_test::suite
             env(fset(issuer, asfRequireAuth));
             env(fset(dave, asfRequireDest));
             env.close();
-            env.require(flags(issuer, asfAllowTrustLineClawback));
-            env.require(flags(issuer, asfRequireAuth));
+            env.require(Flags(issuer, asfAllowTrustLineClawback));
+            env.require(Flags(issuer, asfRequireAuth));
 
             PrettyAsset const asset = setup(env);
             testSequence(prefix, env, vault, asset);
@@ -570,7 +570,7 @@ class Vault_test : public beast::unit_test::suite
         });
 
         testCases("MPT", [&](Env& env) -> Asset {
-            MPTTester mptt{env, issuer, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = depositor});
@@ -589,7 +589,7 @@ class Vault_test : public beast::unit_test::suite
 
         struct CaseArgs
         {
-            FeatureBitset features = testable_amendments();
+            FeatureBitset features = testableAmendments();
         };
 
         auto testCase = [&, this](
@@ -630,42 +630,41 @@ class Vault_test : public beast::unit_test::suite
                 testcase("disabled single asset vault");
 
                 auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
-                env(tx, ter{temDISABLED});
+                env(tx, Ter{temDISABLED});
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    env(tx, data("test"), ter{resultAfterCreate});
+                    env(tx, kDATA("test"), Ter{resultAfterCreate});
                 }
 
                 {
                     auto tx =
                         vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-                    env(tx, ter{resultAfterCreate});
+                    env(tx, Ter{resultAfterCreate});
                 }
 
                 {
                     auto tx =
                         vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-                    env(tx, ter{resultAfterCreate});
+                    env(tx, Ter{resultAfterCreate});
                 }
 
                 {
                     auto tx = vault.clawback(
                         {.issuer = issuer, .id = keylet.key, .holder = owner, .amount = asset(10)});
-                    env(tx, ter{resultAfterCreate});
+                    env(tx, Ter{resultAfterCreate});
                 }
 
                 {
                     auto tx = vault.del({.owner = owner, .id = keylet.key});
-                    env(tx, ter{resultAfterCreate});
+                    env(tx, Ter{resultAfterCreate});
                 }
             };
         };
 
-        testCase(testDisabled(), {.features = testable_amendments() - featureSingleAssetVault});
+        testCase(testDisabled(), {.features = testableAmendments() - featureSingleAssetVault});
 
-        testCase(
-            testDisabled(tecNO_ENTRY), {.features = testable_amendments() - featureMPTokensV1});
+        testCase(testDisabled(tecNO_ENTRY), {.features = testableAmendments() - featureMPTokensV1});
 
         testCase(
             [&](Env& env,
@@ -679,18 +678,18 @@ class Vault_test : public beast::unit_test::suite
                 env(tx);
 
                 tx[sfFlags] = tx[sfFlags].asUInt() | tfVaultPrivate;
-                tx[sfDomainID] = to_string(base_uint<256>(42ul));
-                env(tx, ter{temDISABLED});
+                tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+                env(tx, Ter{temDISABLED});
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    env(tx, data("Test"));
+                    env(tx, kDATA("Test"));
 
-                    tx[sfDomainID] = to_string(base_uint<256>(13ul));
-                    env(tx, ter{temDISABLED});
+                    tx[sfDomainID] = to_string(BaseUint<256>(13ul));
+                    env(tx, Ter{temDISABLED});
                 }
             },
-            {.features = testable_amendments() - featurePermissionedDomains});
+            {.features = testableAmendments() - featurePermissionedDomains});
 
         testCase([&](Env& env,
                      Account const& issuer,
@@ -701,39 +700,39 @@ class Vault_test : public beast::unit_test::suite
 
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfFlags] = tfClearDeepFreeze;
-            env(tx, ter{temINVALID_FLAG});
+            env(tx, Ter{temINVALID_FLAG});
 
             {
                 auto tx = vault.set({.owner = owner, .id = keylet.key});
                 tx[sfFlags] = tfClearDeepFreeze;
-                env(tx, ter{temINVALID_FLAG});
+                env(tx, Ter{temINVALID_FLAG});
             }
 
             {
                 auto tx =
                     vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(10)});
                 tx[sfFlags] = tfClearDeepFreeze;
-                env(tx, ter{temINVALID_FLAG});
+                env(tx, Ter{temINVALID_FLAG});
             }
 
             {
                 auto tx =
                     vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
                 tx[sfFlags] = tfClearDeepFreeze;
-                env(tx, ter{temINVALID_FLAG});
+                env(tx, Ter{temINVALID_FLAG});
             }
 
             {
                 auto tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = owner, .amount = asset(10)});
                 tx[sfFlags] = tfClearDeepFreeze;
-                env(tx, ter{temINVALID_FLAG});
+                env(tx, Ter{temINVALID_FLAG});
             }
 
             {
                 auto tx = vault.del({.owner = owner, .id = keylet.key});
                 tx[sfFlags] = tfClearDeepFreeze;
-                env(tx, ter{temINVALID_FLAG});
+                env(tx, Ter{temINVALID_FLAG});
             }
         });
 
@@ -746,39 +745,39 @@ class Vault_test : public beast::unit_test::suite
 
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[jss::Fee] = "-1";
-            env(tx, ter{temBAD_FEE});
+            env(tx, Ter{temBAD_FEE});
 
             {
                 auto tx = vault.set({.owner = owner, .id = keylet.key});
                 tx[jss::Fee] = "-1";
-                env(tx, ter{temBAD_FEE});
+                env(tx, Ter{temBAD_FEE});
             }
 
             {
                 auto tx =
                     vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(10)});
                 tx[jss::Fee] = "-1";
-                env(tx, ter{temBAD_FEE});
+                env(tx, Ter{temBAD_FEE});
             }
 
             {
                 auto tx =
                     vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
                 tx[jss::Fee] = "-1";
-                env(tx, ter{temBAD_FEE});
+                env(tx, Ter{temBAD_FEE});
             }
 
             {
                 auto tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = owner, .amount = asset(10)});
                 tx[jss::Fee] = "-1";
-                env(tx, ter{temBAD_FEE});
+                env(tx, Ter{temBAD_FEE});
             }
 
             {
                 auto tx = vault.del({.owner = owner, .id = keylet.key});
                 tx[jss::Fee] = "-1";
-                env(tx, ter{temBAD_FEE});
+                env(tx, Ter{temBAD_FEE});
             }
         });
 
@@ -787,22 +786,22 @@ class Vault_test : public beast::unit_test::suite
                 testcase("disabled permissioned domain");
 
                 auto [tx, keylet] = vault.create({.owner = owner, .asset = xrpIssue()});
-                tx[sfDomainID] = to_string(base_uint<256>(42ul));
-                env(tx, ter{temDISABLED});
+                tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+                env(tx, Ter{temDISABLED});
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    tx[sfDomainID] = to_string(base_uint<256>(42ul));
-                    env(tx, ter{temDISABLED});
+                    tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+                    env(tx, Ter{temDISABLED});
                 }
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
                     tx[sfDomainID] = "0";
-                    env(tx, ter{temDISABLED});
+                    env(tx, Ter{temDISABLED});
                 }
             },
-            {.features = (testable_amendments()) - featurePermissionedDomains});
+            {.features = (testableAmendments()) - featurePermissionedDomains});
 
         testCase([&](Env& env,
                      Account const& issuer,
@@ -816,35 +815,35 @@ class Vault_test : public beast::unit_test::suite
             {
                 auto tx = vault.set({
                     .owner = owner,
-                    .id = beast::zero,
+                    .id = beast::kZERO,
                 });
-                env(tx, ter{temMALFORMED});
+                env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx =
-                    vault.deposit({.depositor = owner, .id = beast::zero, .amount = asset(10)});
-                env(tx, ter(temMALFORMED));
+                    vault.deposit({.depositor = owner, .id = beast::kZERO, .amount = asset(10)});
+                env(tx, Ter(temMALFORMED));
             }
 
             {
                 auto tx =
-                    vault.withdraw({.depositor = owner, .id = beast::zero, .amount = asset(10)});
-                env(tx, ter{temMALFORMED});
+                    vault.withdraw({.depositor = owner, .id = beast::kZERO, .amount = asset(10)});
+                env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx = vault.clawback(
-                    {.issuer = issuer, .id = beast::zero, .holder = owner, .amount = asset(10)});
-                env(tx, ter{temMALFORMED});
+                    {.issuer = issuer, .id = beast::kZERO, .holder = owner, .amount = asset(10)});
+                env(tx, Ter{temMALFORMED});
             }
 
             {
                 auto tx = vault.del({
                     .owner = owner,
-                    .id = beast::zero,
+                    .id = beast::kZERO,
                 });
-                env(tx, ter{temMALFORMED});
+                env(tx, Ter{temMALFORMED});
             }
         });
 
@@ -858,7 +857,7 @@ class Vault_test : public beast::unit_test::suite
                     auto tx =
                         vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
                     tx[jss::Destination] = "0";
-                    env(tx, ter{temMALFORMED});
+                    env(tx, Ter{temMALFORMED});
                 }
             });
 
@@ -869,13 +868,13 @@ class Vault_test : public beast::unit_test::suite
                 {
                     auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
                     tx[sfScale] = 255;
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 {
                     auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
                     tx[sfScale] = 19;
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 // accepted range from 0 to 18
@@ -918,27 +917,27 @@ class Vault_test : public beast::unit_test::suite
                 {
                     auto tx = tx1;
                     tx[sfData] = "";
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 {
                     auto tx = tx1;
                     // A hexadecimal string of 257 bytes.
                     tx[sfData] = std::string(514, 'A');
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
                     tx[sfData] = "";
-                    env(tx, ter{temMALFORMED});
+                    env(tx, Ter{temMALFORMED});
                 }
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
                     // A hexadecimal string of 257 bytes.
                     tx[sfData] = std::string(514, 'A');
-                    env(tx, ter{temMALFORMED});
+                    env(tx, Ter{temMALFORMED});
                 }
             });
 
@@ -950,7 +949,7 @@ class Vault_test : public beast::unit_test::suite
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    env(tx, ter{temMALFORMED});
+                    env(tx, Ter{temMALFORMED});
                 }
             });
 
@@ -963,7 +962,7 @@ class Vault_test : public beast::unit_test::suite
                 {
                     auto tx = tx1;
                     tx[sfMPTokenMetadata] = "";
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 {
@@ -971,7 +970,7 @@ class Vault_test : public beast::unit_test::suite
                     // This metadata is for the share token.
                     // A hexadecimal string of 1025 bytes.
                     tx[sfMPTokenMetadata] = std::string(2050, 'B');
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
             });
 
@@ -983,8 +982,8 @@ class Vault_test : public beast::unit_test::suite
 
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
-                    tx[sfAssetsMaximum] = negativeAmount(asset).number();
-                    env(tx, ter{temMALFORMED});
+                    tx[sfAssetsMaximum] = kNEGATIVE_AMOUNT(asset).number();
+                    env(tx, Ter{temMALFORMED});
                 }
             });
 
@@ -996,14 +995,14 @@ class Vault_test : public beast::unit_test::suite
 
                 {
                     auto tx = vault.deposit(
-                        {.depositor = owner, .id = keylet.key, .amount = negativeAmount(asset)});
-                    env(tx, ter(temBAD_AMOUNT));
+                        {.depositor = owner, .id = keylet.key, .amount = kNEGATIVE_AMOUNT(asset)});
+                    env(tx, Ter(temBAD_AMOUNT));
                 }
 
                 {
                     auto tx =
                         vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(0)});
-                    env(tx, ter(temBAD_AMOUNT));
+                    env(tx, Ter(temBAD_AMOUNT));
                 }
             });
 
@@ -1016,7 +1015,7 @@ class Vault_test : public beast::unit_test::suite
                 {
                     auto tx = vault.set({.owner = owner, .id = keylet.key});
                     tx[sfFlags] = tfVaultPrivate;
-                    env(tx, ter(temINVALID_FLAG));
+                    env(tx, Ter(temINVALID_FLAG));
                 }
             });
 
@@ -1028,14 +1027,14 @@ class Vault_test : public beast::unit_test::suite
 
                 {
                     auto tx = vault.withdraw(
-                        {.depositor = owner, .id = keylet.key, .amount = negativeAmount(asset)});
-                    env(tx, ter(temBAD_AMOUNT));
+                        {.depositor = owner, .id = keylet.key, .amount = kNEGATIVE_AMOUNT(asset)});
+                    env(tx, Ter(temBAD_AMOUNT));
                 }
 
                 {
                     auto tx =
                         vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(0)});
-                    env(tx, ter(temBAD_AMOUNT));
+                    env(tx, Ter(temBAD_AMOUNT));
                 }
             });
 
@@ -1053,7 +1052,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 auto tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = owner, .amount = asset(50)});
-                env(tx, ter(temMALFORMED));
+                env(tx, Ter(temMALFORMED));
             }
 
             {
@@ -1061,8 +1060,8 @@ class Vault_test : public beast::unit_test::suite
                     {.issuer = issuer,
                      .id = keylet.key,
                      .holder = owner,
-                     .amount = negativeAmount(asset)});
-                env(tx, ter(temBAD_AMOUNT));
+                     .amount = kNEGATIVE_AMOUNT(asset)});
+                env(tx, Ter(temBAD_AMOUNT));
             }
         });
 
@@ -1075,26 +1074,26 @@ class Vault_test : public beast::unit_test::suite
                 {
                     auto tx = tx1;
                     tx[sfWithdrawalPolicy] = 0;
-                    env(tx, ter(temMALFORMED));
+                    env(tx, Ter(temMALFORMED));
                 }
 
                 {
                     auto tx = tx1;
-                    tx[sfDomainID] = to_string(base_uint<256>(42ul));
-                    env(tx, ter{temMALFORMED});
+                    tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+                    env(tx, Ter{temMALFORMED});
                 }
 
                 {
                     auto tx = tx1;
-                    tx[sfAssetsMaximum] = negativeAmount(asset).number();
-                    env(tx, ter{temMALFORMED});
+                    tx[sfAssetsMaximum] = kNEGATIVE_AMOUNT(asset).number();
+                    env(tx, Ter{temMALFORMED});
                 }
 
                 {
                     auto tx = tx1;
                     tx[sfFlags] = tfVaultPrivate;
                     tx[sfDomainID] = "0";
-                    env(tx, ter{temMALFORMED});
+                    env(tx, Ter{temMALFORMED});
                 }
             });
     }
@@ -1113,7 +1112,7 @@ class Vault_test : public beast::unit_test::suite
                                 Account const& depositor,
                                 Asset const& asset,
                                 Vault& vault)> test) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -1136,7 +1135,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("nothing to set");
             auto tx = vault.set({.owner = owner, .id = keylet::skip().key});
             tx[sfAssetsMaximum] = asset(0).number();
-            env(tx, ter(tecNO_ENTRY));
+            env(tx, Ter(tecNO_ENTRY));
         });
 
         testCase([this](
@@ -1149,7 +1148,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("nothing to deposit to");
             auto tx = vault.deposit(
                 {.depositor = depositor, .id = keylet::skip().key, .amount = asset(10)});
-            env(tx, ter(tecNO_ENTRY));
+            env(tx, Ter(tecNO_ENTRY));
         });
 
         testCase([this](
@@ -1162,7 +1161,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("nothing to withdraw from");
             auto tx = vault.withdraw(
                 {.depositor = depositor, .id = keylet::skip().key, .amount = asset(10)});
-            env(tx, ter(tecNO_ENTRY));
+            env(tx, Ter(tecNO_ENTRY));
         });
 
         testCase([this](
@@ -1174,7 +1173,7 @@ class Vault_test : public beast::unit_test::suite
                      Vault& vault) {
             testcase("nothing to delete");
             auto tx = vault.del({.owner = owner, .id = keylet::skip().key});
-            env(tx, ter(tecNO_ENTRY));
+            env(tx, Ter(tecNO_ENTRY));
         });
 
         testCase([this](
@@ -1211,7 +1210,7 @@ class Vault_test : public beast::unit_test::suite
                      Vault& vault) {
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             testcase("insufficient fee");
-            env(tx, fee(env.current()->fees().base - 1), ter(telINSUF_FEE_P));
+            env(tx, Fee(env.current()->fees().base - 1), Ter(telINSUF_FEE_P));
         });
 
         testCase([this](
@@ -1227,7 +1226,7 @@ class Vault_test : public beast::unit_test::suite
             // expression for this amount, but it is sadly not easy.
             env(pay(owner, issuer, XRP(775)));
             env.close();
-            env(tx, ter(tecINSUFFICIENT_RESERVE));
+            env(tx, Ter(tecINSUFFICIENT_RESERVE));
         });
 
         testCase([this](
@@ -1239,9 +1238,9 @@ class Vault_test : public beast::unit_test::suite
                      Vault& vault) {
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfFlags] = tfVaultPrivate;
-            tx[sfDomainID] = to_string(base_uint<256>(42ul));
+            tx[sfDomainID] = to_string(BaseUint<256>(42ul));
             testcase("non-existing domain");
-            env(tx, ter{tecOBJECT_NOT_FOUND});
+            env(tx, Ter{tecOBJECT_NOT_FOUND});
         });
 
         testCase([this](
@@ -1254,7 +1253,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("cannot set Scale=0");
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfScale] = 0;
-            env(tx, ter{temMALFORMED});
+            env(tx, Ter{temMALFORMED});
         });
 
         testCase([this](
@@ -1267,7 +1266,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("cannot set Scale=1");
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfScale] = 1;
-            env(tx, ter{temMALFORMED});
+            env(tx, Ter{temMALFORMED});
         });
     }
 
@@ -1278,7 +1277,7 @@ class Vault_test : public beast::unit_test::suite
         {
             {
                 testcase("IOU fail because MPT is disabled");
-                Env env{*this, (testable_amendments() - featureMPTokensV1)};
+                Env env{*this, (testableAmendments() - featureMPTokensV1)};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1288,13 +1287,13 @@ class Vault_test : public beast::unit_test::suite
                 Asset const asset = issuer["IOU"].asset();
                 auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
 
-                env(tx, ter(temDISABLED));
+                env(tx, Ter(temDISABLED));
                 env.close();
             }
 
             {
                 testcase("IOU fail create frozen");
-                Env env{*this, testable_amendments()};
+                Env env{*this, testableAmendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1306,13 +1305,13 @@ class Vault_test : public beast::unit_test::suite
                 Asset const asset = issuer["IOU"].asset();
                 auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
 
-                env(tx, ter(tecFROZEN));
+                env(tx, Ter(tecFROZEN));
                 env.close();
             }
 
             {
                 testcase("IOU fail create no ripling");
-                Env env{*this, testable_amendments()};
+                Env env{*this, testableAmendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), issuer, owner);
@@ -1323,13 +1322,13 @@ class Vault_test : public beast::unit_test::suite
                 Vault const vault{env};
                 Asset const asset = issuer["IOU"].asset();
                 auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
-                env(tx, ter(terNO_RIPPLE));
+                env(tx, Ter(terNO_RIPPLE));
                 env.close();
             }
 
             {
                 testcase("IOU no issuer");
-                Env env{*this, testable_amendments()};
+                Env env{*this, testableAmendments()};
                 Account const issuer{"issuer"};
                 Account const owner{"owner"};
                 env.fund(XRP(1000), owner);
@@ -1339,7 +1338,7 @@ class Vault_test : public beast::unit_test::suite
                 Asset const asset = issuer["IOU"].asset();
                 {
                     auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
-                    env(tx, ter(terNO_ACCOUNT));
+                    env(tx, Ter(terNO_ACCOUNT));
                     env.close();
                 }
             }
@@ -1347,13 +1346,13 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("IOU fail create vault for AMM LPToken");
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const gw("gateway");
             Account const alice("alice");
             Account const carol("carol");
-            IOU const USD = gw["USD"];
+            IOU const usd = gw["USD"];
 
-            auto const [asset1, asset2] = std::pair<STAmount, STAmount>(XRP(10000), USD(10000));
+            auto const [asset1, asset2] = std::pair<STAmount, STAmount>(XRP(10000), usd(10000));
             auto toFund = [&](STAmount const& a) -> STAmount {
                 if (a.native())
                 {
@@ -1391,7 +1390,7 @@ class Vault_test : public beast::unit_test::suite
 
             Vault const vault{env};
             auto [tx, k] = vault.create({.owner = owner, .asset = ammAlice.lptIssue()});
-            env(tx, ter{tecWRONG_ASSET});
+            env(tx, Ter{tecWRONG_ASSET});
             env.close();
         }
     }
@@ -1409,14 +1408,14 @@ class Vault_test : public beast::unit_test::suite
                                 Account const& depositor,
                                 Asset const& asset,
                                 Vault& vault)> test) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
             env.fund(XRP(1000), issuer, owner, depositor);
             env.close();
             Vault vault{env};
-            MPTTester mptt{env, issuer, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             // Locked because that is the default flag.
             mptt.create();
             Asset const asset = mptt.issuanceID();
@@ -1433,7 +1432,7 @@ class Vault_test : public beast::unit_test::suite
                      Vault& vault) {
             testcase("MPT no authorization");
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tecNO_AUTH));
+            env(tx, Ter(tecNO_AUTH));
         });
 
         testCase([this](
@@ -1446,7 +1445,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("MPT cannot set Scale=0");
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfScale] = 0;
-            env(tx, ter{temMALFORMED});
+            env(tx, Ter{temMALFORMED});
         });
 
         testCase([this](
@@ -1459,7 +1458,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("MPT cannot set Scale=1");
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
             tx[sfScale] = 1;
-            env(tx, ter{temMALFORMED});
+            env(tx, Ter{temMALFORMED});
         });
     }
 
@@ -1468,7 +1467,7 @@ class Vault_test : public beast::unit_test::suite
     {
         using namespace test::jtx;
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const issuer{"issuer"};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
@@ -1512,13 +1511,13 @@ class Vault_test : public beast::unit_test::suite
                 .value();
         }();
 
-        auto const MptID = makeMptID(1, vaultAccount);
-        Asset const shares = MptID;
+        auto const mptId = makeMptID(1, vaultAccount);
+        Asset const shares = mptId;
 
         {
             testcase("nontransferable shares cannot be moved");
-            env(pay(owner, depositor, shares(10)), ter{tecNO_AUTH});
-            env(pay(depositor, owner, shares(10)), ter{tecNO_AUTH});
+            env(pay(owner, depositor, shares(10)), Ter{tecNO_AUTH});
+            env(pay(depositor, owner, shares(10)), Ter{tecNO_AUTH});
         }
 
         {
@@ -1581,7 +1580,7 @@ class Vault_test : public beast::unit_test::suite
                                 Vault& vault,
                                 MPTTester& mptt)> test,
                             CaseArgs args = {}) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const issuer{"issuer"};
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -1589,12 +1588,12 @@ class Vault_test : public beast::unit_test::suite
             env.close();
             Vault vault{env};
 
-            MPTTester mptt{env, issuer, mptInitNoFund};
-            auto const none = LedgerSpecificFlags(0);
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
+            auto const kNONE = LedgerSpecificFlags(0);
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock |
-                     (args.enableClawback ? tfMPTCanClawback : none) |
-                     (args.requireAuth ? tfMPTRequireAuth : none),
+                     (args.enableClawback ? tfMPTCanClawback : kNONE) |
+                     (args.requireAuth ? tfMPTRequireAuth : kNONE),
                  .mutableFlags = tmfMPTCanMutateCanTransfer});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = owner});
@@ -1625,7 +1624,7 @@ class Vault_test : public beast::unit_test::suite
                  .id = keylet::skip().key,
                  .holder = depositor,
                  .amount = asset(10)});
-            env(tx, ter(tecNO_ENTRY));
+            env(tx, Ter(tecNO_ENTRY));
         });
 
         testCase([this](
@@ -1639,7 +1638,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("MPT global lock blocks create");
             mptt.set({.account = issuer, .flags = tfMPTLock});
             auto [tx, keylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tecLOCKED));
+            env(tx, Ter(tecLOCKED));
         });
 
         testCase([this](
@@ -1659,7 +1658,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-            env(tx, ter{tecLOCKED});
+            env(tx, Ter{tecLOCKED});
             env.close();
 
             // Can delete empty vault, even if global lock
@@ -1697,10 +1696,10 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-            env(tx, ter(tecLOCKED));
+            env(tx, Ter(tecLOCKED));
 
             tx[sfDestination] = issuer.human();
-            env(tx, ter(tecLOCKED));
+            env(tx, Ter(tecLOCKED));
 
             // Clawback is still permitted, even with global lock
             tx = vault.clawback(
@@ -1741,7 +1740,7 @@ class Vault_test : public beast::unit_test::suite
                     .id = keylet.key,
                     .holder = depositor,
                 });
-                env(tx, ter(tecNO_PERMISSION));
+                env(tx, Ter(tecNO_PERMISSION));
             }
 
             {
@@ -1750,7 +1749,7 @@ class Vault_test : public beast::unit_test::suite
                     .id = keylet.key,
                     .holder = depositor,
                 });
-                env(tx, ter(tecNO_PERMISSION));
+                env(tx, Ter(tecNO_PERMISSION));
             }
         });
 
@@ -1785,7 +1784,7 @@ class Vault_test : public beast::unit_test::suite
 
                     tx = vault.withdraw(
                         {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-                    env(tx, ter{tecNO_AUTH});
+                    env(tx, Ter{tecNO_AUTH});
                     env.close();
 
                     auto const sleMPT2 = env.le(mptoken);
@@ -1801,7 +1800,7 @@ class Vault_test : public beast::unit_test::suite
                     tx = vault.withdraw(
                         {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
                     tx[sfDestination] = charlie.human();
-                    env(tx, ter(tecNO_AUTH));
+                    env(tx, Ter(tecNO_AUTH));
                 }
             },
             {.requireAuth = true});
@@ -1861,7 +1860,7 @@ class Vault_test : public beast::unit_test::suite
                     tx = vault.withdraw(
                         {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
                     tx[sfDestination] = owner.human();
-                    env(tx, ter(tecNO_AUTH));
+                    env(tx, Ter(tecNO_AUTH));
                     env.close();
 
                     auto const sleMPT2 = env.le(mptoken);
@@ -1871,10 +1870,10 @@ class Vault_test : public beast::unit_test::suite
             {.requireAuth = false});
 
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
-            Env const env{*this, testable_amendments()};
+            Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / DROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / DROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
+                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
         }();
 
         testCase(
@@ -1920,7 +1919,7 @@ class Vault_test : public beast::unit_test::suite
                     // No reserve to create MPToken for asset in VaultWithdraw
                     tx = vault.withdraw(
                         {.depositor = owner, .id = keylet.key, .amount = asset(100)});
-                    env(tx, ter{tecINSUFFICIENT_RESERVE});
+                    env(tx, Ter{tecINSUFFICIENT_RESERVE});
                     env.close();
 
                     env(pay(depositor, owner, XRP(incReserve)));
@@ -1962,25 +1961,25 @@ class Vault_test : public beast::unit_test::suite
 
             {
                 auto [tx, keylet] = vault.create({.owner = depositor, .asset = asset});
-                env(tx, ter{tecOBJECT_NOT_FOUND});
+                env(tx, Ter{tecOBJECT_NOT_FOUND});
             }
 
             {
                 auto tx =
                     vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(10)});
-                env(tx, ter{tecOBJECT_NOT_FOUND});
+                env(tx, Ter{tecOBJECT_NOT_FOUND});
             }
 
             {
                 auto tx =
                     vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(10)});
-                env(tx, ter{tecOBJECT_NOT_FOUND});
+                env(tx, Ter{tecOBJECT_NOT_FOUND});
             }
 
             {
                 auto tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = depositor, .amount = asset(0)});
-                env(tx, ter{tecOBJECT_NOT_FOUND});
+                env(tx, Ter{tecOBJECT_NOT_FOUND});
             }
 
             env(vault.del({.owner = owner, .id = keylet.key}));
@@ -2038,7 +2037,7 @@ class Vault_test : public beast::unit_test::suite
 
                 {
                     // explicitly destroy vault owners MPToken with zero balance
-                    Json::Value jv;
+                    json::Value jv;
                     jv[sfAccount] = owner.human();
                     jv[sfMPTokenIssuanceID] = to_string(issuanceId);
                     jv[sfFlags] = tfMPTUnauthorize;
@@ -2049,7 +2048,7 @@ class Vault_test : public beast::unit_test::suite
 
                 // owner no longer has MPToken for vault shares
                 tx = pay(depositor, owner, shares(1));
-                env(tx, ter{tecNO_AUTH});
+                env(tx, Ter{tecNO_AUTH});
                 env.close();
 
                 // destroy all remaining shares, so we can delete vault
@@ -2090,7 +2089,7 @@ class Vault_test : public beast::unit_test::suite
                          .id = keylet.key,
                          .holder = depositor,
                          .amount = asset(0)});
-                    env(tx, ter{tecNO_PERMISSION});
+                    env(tx, Ter{tecNO_PERMISSION});
                 }
             },
             {.enableClawback = false});
@@ -2117,7 +2116,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 auto tx = vault.withdraw(
                     {.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-                env(tx, ter(tecNO_AUTH));
+                env(tx, Ter(tecNO_AUTH));
 
                 // Withdrawal to other (authorized) accounts works
                 tx[sfDestination] = issuer.human();
@@ -2133,14 +2132,14 @@ class Vault_test : public beast::unit_test::suite
                 // Cannot deposit some more
                 auto tx =
                     vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-                env(tx, ter(tecNO_AUTH));
+                env(tx, Ter(tecNO_AUTH));
             }
 
             {
                 // Cannot clawback if issuer is the holder
                 tx = vault.clawback(
                     {.issuer = issuer, .id = keylet.key, .holder = issuer, .amount = asset(800)});
-                env(tx, ter(tecNO_PERMISSION));
+                env(tx, Ter(tecNO_PERMISSION));
             }
             // Clawback works
             tx = vault.clawback(
@@ -2175,7 +2174,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = [&]() {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = issuer.human();
                 jv[sfMPTokenIssuanceID] = to_string(asset.get<MPTIssue>().getMptID());
                 jv[jss::Holder] = toBase58(vaultAccount);
@@ -2187,10 +2186,10 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-            env(tx, ter(tecLOCKED));
+            env(tx, Ter(tecLOCKED));
 
             tx = vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
-            env(tx, ter(tecLOCKED));
+            env(tx, Ter(tecLOCKED));
 
             // Clawback works, even when locked
             tx = vault.clawback(
@@ -2205,14 +2204,14 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("MPT shares to a vault");
 
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             env.fund(XRP(1000000), owner, issuer);
             env.close();
             Vault const vault{env};
 
-            MPTTester mptt{env, issuer, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create(
                 {.flags = tfMPTCanTransfer | tfMPTCanLock | lsfMPTCanClawback | tfMPTRequireAuth});
             mptt.authorize({.account = owner});
@@ -2230,7 +2229,7 @@ class Vault_test : public beast::unit_test::suite
             }();
 
             auto [tx2, k2] = vault.create({.owner = owner, .asset = shares});
-            env(tx2, ter{tecWRONG_ASSET});
+            env(tx2, Ter{tecWRONG_ASSET});
             env.close();
         }
 
@@ -2256,12 +2255,12 @@ class Vault_test : public beast::unit_test::suite
             mptt.set({.mutableFlags = tmfMPTClearCanTransfer});
             env.close();
 
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
 
             tx = vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(100)});
 
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
 
             // Restore CanTransfer
@@ -2278,35 +2277,35 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("MPT OutstandingAmount > MaximumAmount");
 
-            Env env{*this, testable_amendments() | featureSingleAssetVault};
+            Env env{*this, testableAmendments() | featureSingleAssetVault};
             Account const alice{"alice"};
             Account const issuer{"issuer"};
             env.fund(XRP(1'000), alice, issuer);
             env.close();
             Vault const vault{env};
 
-            MPTTester const BTC({.env = env, .issuer = issuer, .holders = {alice}, .maxAmt = 100});
+            MPTTester const btc({.env = env, .issuer = issuer, .holders = {alice}, .maxAmt = 100});
 
-            auto [tx, k] = vault.create({.owner = issuer, .asset = BTC});
+            auto [tx, k] = vault.create({.owner = issuer, .asset = btc});
             env(tx);
             env.close();
 
-            tx = vault.deposit({.depositor = issuer, .id = k.key, .amount = BTC(110)});
+            tx = vault.deposit({.depositor = issuer, .id = k.key, .amount = btc(110)});
             // accountHolds is the first check and the issuer has only BTC(100)
             // available
-            env(tx, ter{tecINSUFFICIENT_FUNDS});
+            env(tx, Ter{tecINSUFFICIENT_FUNDS});
             env.close();
 
             // OutstandingAmount == MaximumAmount
-            env(pay(issuer, alice, BTC(100)));
+            env(pay(issuer, alice, btc(100)));
             env.close();
 
-            tx = vault.deposit({.depositor = issuer, .id = k.key, .amount = BTC(100)});
+            tx = vault.deposit({.depositor = issuer, .id = k.key, .amount = btc(100)});
             // the issuer has BTC(0) available
-            env(tx, ter{tecINSUFFICIENT_FUNDS});
+            env(tx, Ter{tecINSUFFICIENT_FUNDS});
             env.close();
 
-            tx = vault.deposit({.depositor = alice, .id = k.key, .amount = BTC(100)});
+            tx = vault.deposit({.depositor = alice, .id = k.key, .amount = btc(100)});
             // alice transfers BTC(100), OutstandingAmount is 100
             env(tx);
             env.close();
@@ -2337,7 +2336,7 @@ class Vault_test : public beast::unit_test::suite
                                 PrettyAsset const& asset,
                                 std::function<MPTID(xrpl::Keylet)> issuanceId)> test,
                             CaseArgs args = {}) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             Account const charlie{"charlie"};
@@ -2397,30 +2396,31 @@ class Vault_test : public beast::unit_test::suite
             {
                 // Cannot create new trustline to a vault
                 auto tx = [&, account = vaultAccount(keylet)]() {
-                    Json::Value jv;
+                    json::Value jv;
                     jv[jss::Account] = issuer.human();
                     {
-                        auto& ja = jv[jss::LimitAmount] = foo(0).value().getJson(JsonOptions::none);
+                        auto& ja = jv[jss::LimitAmount] =
+                            foo(0).value().getJson(JsonOptions::KNone);
                         ja[jss::issuer] = toBase58(account);
                     }
                     jv[jss::TransactionType] = jss::TrustSet;
                     jv[jss::Flags] = tfSetFreeze;
                     return jv;
                 }();
-                env(tx, ter{tecNO_PERMISSION});
+                env(tx, Ter{tecNO_PERMISSION});
                 env.close();
             }
 
             {
                 auto tx = vault.deposit({.depositor = issuer, .id = keylet.key, .amount = foo(20)});
-                env(tx, ter{tecWRONG_ASSET});
+                env(tx, Ter{tecWRONG_ASSET});
                 env.close();
             }
 
             {
                 auto tx =
                     vault.withdraw({.depositor = issuer, .id = keylet.key, .amount = foo(20)});
-                env(tx, ter{tecWRONG_ASSET});
+                env(tx, Ter{tecWRONG_ASSET});
                 env.close();
             }
 
@@ -2450,10 +2450,10 @@ class Vault_test : public beast::unit_test::suite
 
             // Freeze the trustline to the vault
             auto trustSet = [&, account = vaultAccount(keylet)]() {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = issuer.human();
                 {
-                    auto& ja = jv[jss::LimitAmount] = asset(0).value().getJson(JsonOptions::none);
+                    auto& ja = jv[jss::LimitAmount] = asset(0).value().getJson(JsonOptions::KNone);
                     ja[jss::issuer] = toBase58(account);
                 }
                 jv[jss::TransactionType] = jss::TrustSet;
@@ -2470,17 +2470,17 @@ class Vault_test : public beast::unit_test::suite
                 // isFrozen.
                 auto tx =
                     vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(80)});
-                env(tx, ter{tecLOCKED});
+                env(tx, Ter{tecLOCKED});
             }
 
             {
                 auto tx =
                     vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(100)});
-                env(tx, ter{tecLOCKED});
+                env(tx, Ter{tecLOCKED});
 
                 // also when trying to withdraw to a 3rd party
                 tx[sfDestination] = charlie.human();
-                env(tx, ter{tecLOCKED});
+                env(tx, Ter{tecLOCKED});
                 env.close();
             }
 
@@ -2599,17 +2599,17 @@ class Vault_test : public beast::unit_test::suite
             // Cannot withdraw
             auto const withdraw =
                 vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-            env(withdraw, ter{tecFROZEN});
+            env(withdraw, Ter{tecFROZEN});
 
             // Cannot withdraw to 3rd party
-            env(withdrawToCharlie, ter{tecLOCKED});
+            env(withdrawToCharlie, Ter{tecLOCKED});
             env.close();
 
             {
                 // Cannot deposit some more
                 auto tx =
                     vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-                env(tx, ter{tecFROZEN});
+                env(tx, Ter{tecFROZEN});
             }
 
             {
@@ -2653,7 +2653,7 @@ class Vault_test : public beast::unit_test::suite
                 tx[sfDestination] = erin.human();
                 return tx;
             }(keylet);
-            env(tx1, ter{tecNO_LINE});
+            env(tx1, Ter{tecNO_LINE});
         });
 
         testCase([&, this](
@@ -2715,7 +2715,7 @@ class Vault_test : public beast::unit_test::suite
                     // Charlie cannot deposit
                     auto tx = vault.deposit(
                         {.depositor = charlie, .id = keylet.key, .amount = asset(100)});
-                    env(tx, ter{terNO_RIPPLE});
+                    env(tx, Ter{terNO_RIPPLE});
                     env.close();
                 }
 
@@ -2730,12 +2730,12 @@ class Vault_test : public beast::unit_test::suite
                     auto tx2 = vault.withdraw(
                         {.depositor = owner, .id = keylet.key, .amount = shares(100)});
                     tx2[sfDestination] = charlie.human();
-                    env(tx2, ter{terNO_RIPPLE});
+                    env(tx2, Ter{terNO_RIPPLE});
                     env.close();
 
                     {
                         // Create MPToken for shares held by Charlie
-                        Json::Value tx{Json::objectValue};
+                        json::Value tx{json::ObjectValue};
                         tx[sfAccount] = charlie.human();
                         tx[sfMPTokenIssuanceID] =
                             to_string(shares.raw().get<MPTIssue>().getMptID());
@@ -2749,7 +2749,7 @@ class Vault_test : public beast::unit_test::suite
                     // Charlie cannot withdraw
                     auto tx3 = vault.withdraw(
                         {.depositor = charlie, .id = keylet.key, .amount = shares(100)});
-                    env(tx3, ter{terNO_RIPPLE});
+                    env(tx3, Ter{terNO_RIPPLE});
                     env.close();
 
                     env(pay(charlie, owner, shares(100)));
@@ -2819,10 +2819,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::zero);
+                    BEAST_EXPECT(env.balance(vaultAccount(keylet), asset) == beast::kZERO);
                     auto const vault = env.le(keylet);
-                    BEAST_EXPECT(vault->at(sfAssetsAvailable) == beast::zero);
-                    BEAST_EXPECT(vault->at(sfAssetsTotal) == beast::zero);
+                    BEAST_EXPECT(vault->at(sfAssetsAvailable) == beast::kZERO);
+                    BEAST_EXPECT(vault->at(sfAssetsTotal) == beast::kZERO);
                 }
 
                 env(vault.del({.owner = owner, .id = keylet.key}));
@@ -2831,10 +2831,10 @@ class Vault_test : public beast::unit_test::suite
             {.initialIOU = Number(11875, -2)});
 
         auto const [acctReserve, incReserve] = [this]() -> std::pair<int, int> {
-            Env const env{*this, testable_amendments()};
+            Env const env{*this, testableAmendments()};
             return {
-                env.current()->fees().accountReserve(0).drops() / DROPS_PER_XRP.drops(),
-                env.current()->fees().increment.drops() / DROPS_PER_XRP.drops()};
+                env.current()->fees().accountReserve(0).drops() / kDROPS_PER_XRP.drops(),
+                env.current()->fees().increment.drops() / kDROPS_PER_XRP.drops()};
         }();
 
         testCase(
@@ -2868,7 +2868,7 @@ class Vault_test : public beast::unit_test::suite
 
                 // Fail because not enough reserve to create trust line
                 tx = vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-                env(tx, ter{tecNO_LINE_INSUF_RESERVE});
+                env(tx, Ter{tecNO_LINE_INSUF_RESERVE});
                 env.close();
 
                 env(pay(charlie, owner, XRP(incReserve)));
@@ -2903,7 +2903,7 @@ class Vault_test : public beast::unit_test::suite
 
                 // Fail because not enough reserve to create MPToken for shares
                 tx = vault.deposit({.depositor = charlie, .id = keylet.key, .amount = asset(100)});
-                env(tx, ter{tecINSUFFICIENT_RESERVE});
+                env(tx, Ter{tecINSUFFICIENT_RESERVE});
                 env.close();
 
                 env(pay(issuer, charlie, XRP(incReserve)));
@@ -2953,7 +2953,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             // Cannot withdraw to 3rd party
-            env(withdrawToCharlie, ter{tecFROZEN});
+            env(withdrawToCharlie, Ter{tecFROZEN});
             env.close();
 
             env(vault.clawback(
@@ -2989,17 +2989,17 @@ class Vault_test : public beast::unit_test::suite
                 // Cannot withdraw
                 auto tx =
                     vault.withdraw({.depositor = owner, .id = keylet.key, .amount = asset(10)});
-                env(tx, ter{tecFROZEN});
+                env(tx, Ter{tecFROZEN});
 
                 // Cannot withdraw to 3rd party
                 tx[sfDestination] = charlie.human();
-                env(tx, ter{tecFROZEN});
+                env(tx, Ter{tecFROZEN});
                 env.close();
 
                 // Cannot deposit some more
                 tx = vault.deposit({.depositor = owner, .id = keylet.key, .amount = asset(10)});
 
-                env(tx, ter{tecFROZEN});
+                env(tx, Ter{tecFROZEN});
             }
 
             // Clawback is permitted
@@ -3019,7 +3019,7 @@ class Vault_test : public beast::unit_test::suite
 
         testcase("private vault");
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const issuer{"issuer"};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
@@ -3033,7 +3033,7 @@ class Vault_test : public beast::unit_test::suite
         env.close();
         env(fset(issuer, asfAllowTrustLineClawback));
         env.close();
-        env.require(flags(issuer, asfAllowTrustLineClawback));
+        env.require(Flags(issuer, asfAllowTrustLineClawback));
 
         PrettyAsset const asset = issuer["IOU"];
         env.trust(asset(1000), owner);
@@ -3059,14 +3059,14 @@ class Vault_test : public beast::unit_test::suite
             testcase("private vault depositor not authorized yet");
             auto tx =
                 vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
         }
 
         {
             testcase("private vault cannot set non-existing domain");
             auto tx = vault.set({.owner = owner, .id = keylet.key});
-            tx[sfDomainID] = to_string(base_uint<256>(42ul));
-            env(tx, ter{tecOBJECT_NOT_FOUND});
+            tx[sfDomainID] = to_string(BaseUint<256>(42ul));
+            env(tx, Ter{tecOBJECT_NOT_FOUND});
         }
 
         {
@@ -3078,7 +3078,7 @@ class Vault_test : public beast::unit_test::suite
 
                 env(pdomain::setTx(pdOwner, credentials1));
                 auto const domainId1 = [&]() {
-                    auto tx = env.tx()->getJson(JsonOptions::none);
+                    auto tx = env.tx()->getJson(JsonOptions::KNone);
                     return pdomain::getNewDomain(env.meta());
                 }();
 
@@ -3099,7 +3099,7 @@ class Vault_test : public beast::unit_test::suite
 
                 env(pdomain::setTx(pdOwner, credentials));
                 auto const domainId = [&]() {
-                    auto tx = env.tx()->getJson(JsonOptions::none);
+                    auto tx = env.tx()->getJson(JsonOptions::KNone);
                     return pdomain::getNewDomain(env.meta());
                 }();
 
@@ -3120,7 +3120,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("private vault depositor still not authorized");
             auto tx =
                 vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
         }
 
@@ -3141,7 +3141,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = vault.deposit({.depositor = charlie, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
         }
 
@@ -3155,7 +3155,7 @@ class Vault_test : public beast::unit_test::suite
 
             auto tx =
                 vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
         }
 
@@ -3205,7 +3205,7 @@ class Vault_test : public beast::unit_test::suite
 
                 auto tx2 =
                     vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(1)});
-                env(tx2, ter{tecEXPIRED});
+                env(tx2, Ter{tecEXPIRED});
                 env.close();
 
                 BEAST_EXPECT(env.le(credsKeylet) == nullptr);
@@ -3220,7 +3220,7 @@ class Vault_test : public beast::unit_test::suite
 
                 auto tx3 =
                     vault.deposit({.depositor = charlie, .id = keylet.key, .amount = asset(2)});
-                env(tx3, ter{tecEXPIRED});
+                env(tx3, Ter{tecEXPIRED});
 
                 env.close();
                 BEAST_EXPECT(env.le(credsKeylet) == nullptr);
@@ -3236,7 +3236,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx = vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
             env.close();
 
             tx = vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
@@ -3261,13 +3261,13 @@ class Vault_test : public beast::unit_test::suite
     }
 
     void
-    testWithDomainCheckXRP()
+    testWithDomainChecXRP()
     {
         using namespace test::jtx;
 
         testcase("private XRP vault");
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const owner{"owner"};
         Account const depositor{"depositor"};
         Account const alice{"charlie"};
@@ -3300,14 +3300,14 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("private XRP vault cannot pay shares to depositor yet");
-            env(pay(owner, depositor, shares(1)), ter{tecNO_AUTH});
+            env(pay(owner, depositor, shares(1)), Ter{tecNO_AUTH});
         }
 
         {
             testcase("private XRP vault depositor not authorized yet");
             auto tx =
                 vault.deposit({.depositor = depositor, .id = keylet.key, .amount = asset(50)});
-            env(tx, ter{tecNO_AUTH});
+            env(tx, Ter{tecNO_AUTH});
         }
 
         {
@@ -3316,7 +3316,7 @@ class Vault_test : public beast::unit_test::suite
 
             env(pdomain::setTx(owner, credentials));
             auto const domainId = [&]() {
-                auto tx = env.tx()->getJson(JsonOptions::none);
+                auto tx = env.tx()->getJson(JsonOptions::KNone);
                 return pdomain::getNewDomain(env.meta());
             }();
 
@@ -3347,14 +3347,14 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("private XRP vault cannot pay shares to 3rd party");
-            Json::Value jv;
+            json::Value jv;
             jv[sfAccount] = alice.human();
             jv[sfTransactionType] = jss::MPTokenAuthorize;
             jv[sfMPTokenIssuanceID] = to_string(issuanceId);
             env(jv);
             env.close();
 
-            env(pay(owner, alice, shares(1)), ter{tecNO_AUTH});
+            env(pay(owner, alice, shares(1)), Ter{tecNO_AUTH});
         }
     }
 
@@ -3364,7 +3364,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         testcase("fail pseudo-account allocation");
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const owner{"owner"};
         Vault const vault{env};
         env.fund(XRP(1000), owner);
@@ -3375,14 +3375,14 @@ 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(autofill),
-                fee(autofill),
-                sig(autofill));
+                Seq(kAUTOFILL),
+                Fee(kAUTOFILL),
+                Sig(kAUTOFILL));
         }
 
         auto [tx, keylet1] = vault.create({.owner = owner, .asset = xrpIssue()});
         BEAST_EXPECT(keylet.key == keylet1.key);
-        env(tx, ter{terADDRESS_COLLISION});
+        env(tx, Ter{terADDRESS_COLLISION});
     }
 
     void
@@ -3407,7 +3407,7 @@ class Vault_test : public beast::unit_test::suite
 
         auto testCase = [&, this](
                             std::uint8_t scale, std::function<void(Env & env, Data data)> test) {
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             Account const owner{"owner"};
             Account const issuer{"issuer"};
             Account const depositor{"depositor"};
@@ -3438,7 +3438,7 @@ class Vault_test : public beast::unit_test::suite
             auto const peek = [keylet, &env, this](std::function<bool(SLE&, SLE&)> fn) -> bool {
                 return env.app().getOpenLedger().modify(
                     [&](OpenView& view, beast::Journal j) -> bool {
-                        Sandbox sb(&view, tapNONE);
+                        Sandbox sb(&view, TapNone);
                         auto vault = sb.peek(keylet::vault(keylet.key));
                         if (!BEAST_EXPECT(vault))
                             return false;
@@ -3475,7 +3475,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("Scale deposit overflow on first deposit");
             auto tx = d.vault.deposit(
                 {.depositor = d.depositor, .id = d.keylet.key, .amount = d.asset(10)});
-            env(tx, ter{tecPATH_DRY});
+            env(tx, Ter{tecPATH_DRY});
             env.close();
         });
 
@@ -3492,7 +3492,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 auto tx = d.vault.deposit(
                     {.depositor = d.depositor, .id = d.keylet.key, .amount = d.asset(10)});
-                env(tx, ter{tecPATH_DRY});
+                env(tx, Ter{tecPATH_DRY});
                 env.close();
             }
         });
@@ -3510,7 +3510,7 @@ class Vault_test : public beast::unit_test::suite
             {
                 auto tx = d.vault.deposit(
                     {.depositor = d.depositor, .id = d.keylet.key, .amount = d.asset(5)});
-                env(tx, ter{tecPATH_DRY});
+                env(tx, Ter{tecPATH_DRY});
                 env.close();
             }
         });
@@ -3534,7 +3534,7 @@ class Vault_test : public beast::unit_test::suite
                 {.depositor = d.depositor,
                  .id = d.keylet.key,
                  .amount = STAmount(d.asset, Number(9, -2))});
-            env(tx, ter{tecPRECISION_LOSS});
+            env(tx, Ter{tecPRECISION_LOSS});
         });
 
         testCase(1, [&, this](Env& env, Data d) {
@@ -3717,7 +3717,7 @@ class Vault_test : public beast::unit_test::suite
                     {.depositor = d.depositor,
                      .id = d.keylet.key,
                      .amount = STAmount(d.share, Number(25, 0))});
-                env(tx, ter{tecINSUFFICIENT_FUNDS});
+                env(tx, Ter{tecINSUFFICIENT_FUNDS});
                 env.close();
                 BEAST_EXPECT(env.balance(d.depositor, d.shares) == d.share(900 - 25));
                 BEAST_EXPECT(
@@ -3788,7 +3788,7 @@ class Vault_test : public beast::unit_test::suite
                     {.depositor = d.depositor,
                      .id = d.keylet.key,
                      .amount = STAmount(d.asset, Number(10, 0))});
-                env(tx, ter{tecPATH_DRY});
+                env(tx, Ter{tecPATH_DRY});
                 env.close();
             }
         });
@@ -3841,7 +3841,7 @@ class Vault_test : public beast::unit_test::suite
                     {.depositor = d.depositor,
                      .id = d.keylet.key,
                      .amount = STAmount(d.asset, Number(4, -2))});
-                env(tx, ter{tecPRECISION_LOSS});
+                env(tx, Ter{tecPRECISION_LOSS});
             }
 
             {
@@ -3867,7 +3867,7 @@ class Vault_test : public beast::unit_test::suite
                     {.depositor = d.depositor,
                      .id = d.keylet.key,
                      .amount = STAmount(d.asset, Number(25, -1))});
-                env(tx, ter{tecINSUFFICIENT_FUNDS});
+                env(tx, Ter{tecINSUFFICIENT_FUNDS});
                 env.close();
                 BEAST_EXPECT(env.balance(d.depositor, d.shares) == d.share(900 - 25));
                 BEAST_EXPECT(
@@ -3990,7 +3990,7 @@ class Vault_test : public beast::unit_test::suite
                      .id = d.keylet.key,
                      .holder = d.depositor,
                      .amount = STAmount(d.asset, Number(10, 0))});
-                env(tx, ter{tecPATH_DRY});
+                env(tx, Ter{tecPATH_DRY});
                 env.close();
             }
         });
@@ -4043,7 +4043,7 @@ class Vault_test : public beast::unit_test::suite
                      .id = d.keylet.key,
                      .holder = d.depositor,
                      .amount = STAmount(d.asset, Number(4, -2))});
-                env(tx, ter{tecPRECISION_LOSS});
+                env(tx, Ter{tecPRECISION_LOSS});
             }
 
             {
@@ -4197,13 +4197,13 @@ 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::interestRate(TenthBips32(0)),
-                gracePeriod(60),
-                paymentInterval(120),
-                paymentTotal(10),
-                sig(sfCounterpartySignature, d.owner),
-                fee(env.current()->fees().base * 2),
-                ter(tesSUCCESS));
+                loan::kINTEREST_RATE(TenthBips32(0)),
+                kGRACE_PERIOD(60),
+                kPAYMENT_INTERVAL(120),
+                kPAYMENT_TOTAL(10),
+                Sig(sfCounterpartySignature, d.owner),
+                Fee(env.current()->fees().base * 2),
+                Ter(tesSUCCESS));
             env.close();
 
             {
@@ -4219,7 +4219,7 @@ class Vault_test : public beast::unit_test::suite
                  .id = d.keylet.key,
                  .holder = d.depositor,
                  .amount = STAmount(d.asset, Number(80, 0))});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             {
@@ -4240,7 +4240,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
 
         testcase("RPC");
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const owner{"owner"};
         Account const issuer{"issuer"};
         Vault const vault{env};
@@ -4275,58 +4275,59 @@ class Vault_test : public beast::unit_test::suite
         }();
 
         auto const check = [&, keylet = keylet, sle = sleVault, this](
-                               Json::Value const& vault,
-                               Json::Value const& issuance = Json::nullValue) {
+                               json::Value const& vault,
+                               json::Value const& issuance = json::NullValue) {
             BEAST_EXPECT(vault.isObject());
 
-            constexpr auto checkString =
+            constexpr auto kCHECK_STRING =
                 [](auto& node, SField const& field, std::string v) -> bool {
                 return node.isMember(field.fieldName) && node[field.fieldName].isString() &&
                     node[field.fieldName] == v;
             };
-            constexpr auto checkObject =
-                [](auto& node, SField const& field, Json::Value v) -> bool {
+            constexpr auto kCHECK_OBJECT =
+                [](auto& node, SField const& field, json::Value v) -> bool {
                 return node.isMember(field.fieldName) && node[field.fieldName].isObject() &&
                     node[field.fieldName] == v;
             };
-            constexpr auto checkInt = [](auto& node, SField const& field, int v) -> bool {
+            constexpr auto kCHECK_INT = [](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)));
+                    ((node[field.fieldName].isInt() && node[field.fieldName] == json::Int(v)) ||
+                     (node[field.fieldName].isUInt() && node[field.fieldName] == json::UInt(v)));
             };
 
             BEAST_EXPECT(vault["LedgerEntryType"].asString() == "Vault");
             BEAST_EXPECT(vault[jss::index].asString() == strHex(keylet.key));
-            BEAST_EXPECT(checkInt(vault, sfFlags, 0));
+            BEAST_EXPECT(kCHECK_INT(vault, sfFlags, 0));
             // Ignore all other standard fields, this test doesn't care
 
-            BEAST_EXPECT(checkString(vault, sfAccount, toBase58(sle->at(sfAccount))));
-            BEAST_EXPECT(checkObject(vault, sfAsset, to_json(sle->at(sfAsset))));
-            BEAST_EXPECT(checkString(vault, sfAssetsAvailable, "50"));
-            BEAST_EXPECT(checkString(vault, sfAssetsMaximum, "1000"));
-            BEAST_EXPECT(checkString(vault, sfAssetsTotal, "50"));
+            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(!vault.isMember(sfLossUnrealized.getJsonName()));
 
             auto const strShareID = strHex(sle->at(sfShareMPTID));
-            BEAST_EXPECT(checkString(vault, sfShareMPTID, strShareID));
-            BEAST_EXPECT(checkString(vault, sfOwner, toBase58(owner.id())));
-            BEAST_EXPECT(checkInt(vault, sfSequence, sequence));
-            BEAST_EXPECT(checkInt(vault, sfWithdrawalPolicy, vaultStrategyFirstComeFirstServe));
+            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));
 
             if (issuance.isObject())
             {
                 BEAST_EXPECT(issuance["LedgerEntryType"].asString() == "MPTokenIssuance");
                 BEAST_EXPECT(issuance[jss::mpt_issuance_id].asString() == strShareID);
-                BEAST_EXPECT(checkInt(issuance, sfSequence, 1));
-                BEAST_EXPECT(checkInt(
+                BEAST_EXPECT(kCHECK_INT(issuance, sfSequence, 1));
+                BEAST_EXPECT(kCHECK_INT(
                     issuance, sfFlags, int(lsfMPTCanEscrow | lsfMPTCanTrade | lsfMPTCanTransfer)));
-                BEAST_EXPECT(checkString(issuance, sfOutstandingAmount, "50000000"));
+                BEAST_EXPECT(kCHECK_STRING(issuance, sfOutstandingAmount, "50000000"));
             }
         };
 
         {
             testcase("RPC ledger_entry selected by key");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault] = strHex(keylet.key);
             auto jvVault = env.rpc("json", "ledger_entry", to_string(jvParams));
@@ -4338,7 +4339,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry selected by owner and seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = owner.human();
             jvParams[jss::vault][jss::seq] = sequence;
@@ -4351,7 +4352,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry cannot find vault by key");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault] = to_string(uint256(42));
             auto jvVault = env.rpc("json", "ledger_entry", to_string(jvParams));
@@ -4360,7 +4361,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry cannot find vault by owner and seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = issuer.human();
             jvParams[jss::vault][jss::seq] = 1'000'000;
@@ -4370,7 +4371,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry malformed key");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault] = 42;
             auto jvVault = env.rpc("json", "ledger_entry", to_string(jvParams));
@@ -4379,7 +4380,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry malformed owner");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = 42;
             jvParams[jss::vault][jss::seq] = sequence;
@@ -4389,7 +4390,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry malformed seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = issuer.human();
             jvParams[jss::vault][jss::seq] = "foo";
@@ -4399,7 +4400,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry negative seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = issuer.human();
             jvParams[jss::vault][jss::seq] = -1;
@@ -4409,7 +4410,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry oversized seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = issuer.human();
             jvParams[jss::vault][jss::seq] = 1e20;
@@ -4419,7 +4420,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC ledger_entry bool seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault][jss::owner] = issuer.human();
             jvParams[jss::vault][jss::seq] = true;
@@ -4430,7 +4431,7 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("RPC account_objects");
 
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = owner.human();
             jvParams[jss::type] = jss::vault;
             auto jv = env.rpc("json", "account_objects", to_string(jvParams))[jss::result];
@@ -4442,18 +4443,18 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("RPC ledger_data");
 
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::binary] = false;
             jvParams[jss::type] = jss::vault;
-            Json::Value jv = env.rpc("json", "ledger_data", to_string(jvParams));
+            json::Value jv = env.rpc("json", "ledger_data", to_string(jvParams));
             BEAST_EXPECT(jv[jss::result][jss::state].size() == 1);
             check(jv[jss::result][jss::state][0u]);
         }
 
         {
             testcase("RPC vault_info command line");
-            Json::Value jv = env.rpc("vault_info", strHex(keylet.key), "validated");
+            json::Value jv = env.rpc("vault_info", strHex(keylet.key), "validated");
 
             BEAST_EXPECT(!jv[jss::result].isMember(jss::error));
             BEAST_EXPECT(jv[jss::result].isMember(jss::vault));
@@ -4462,7 +4463,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = strHex(keylet.key);
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
@@ -4474,7 +4475,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info invalid vault_id");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = "foobar";
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
@@ -4483,7 +4484,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid index");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = 0;
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
@@ -4492,7 +4493,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json by owner and sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = sequence;
@@ -4505,7 +4506,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json malformed sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = "foobar";
@@ -4515,7 +4516,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = 0;
@@ -4525,7 +4526,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json negative sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = -1;
@@ -4535,7 +4536,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json oversized sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = 1e20;
@@ -4545,7 +4546,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json bool sequence");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             jvParams[jss::seq] = true;
@@ -4555,7 +4556,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json malformed owner");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = "foobar";
             jvParams[jss::seq] = sequence;
@@ -4565,7 +4566,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid combination only owner");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::owner] = owner.human();
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
@@ -4574,7 +4575,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid combination only seq");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::seq] = sequence;
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
@@ -4583,7 +4584,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid combination seq vault_id");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = strHex(keylet.key);
             jvParams[jss::seq] = sequence;
@@ -4593,7 +4594,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json invalid combination owner vault_id");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = strHex(keylet.key);
             jvParams[jss::owner] = owner.human();
@@ -4605,7 +4606,7 @@ class Vault_test : public beast::unit_test::suite
             testcase(
                 "RPC vault_info json invalid combination owner seq "
                 "vault_id");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::vault_id] = strHex(keylet.key);
             jvParams[jss::seq] = sequence;
@@ -4616,7 +4617,7 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info json no input");
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             auto jv = env.rpc("json", "vault_info", to_string(jvParams));
             BEAST_EXPECT(jv[jss::result][jss::error].asString() == "malformedRequest");
@@ -4624,25 +4625,25 @@ class Vault_test : public beast::unit_test::suite
 
         {
             testcase("RPC vault_info command line invalid index");
-            Json::Value jv = env.rpc("vault_info", "foobar", "validated");
+            json::Value jv = env.rpc("vault_info", "foobar", "validated");
             BEAST_EXPECT(jv[jss::error].asString() == "invalidParams");
         }
 
         {
             testcase("RPC vault_info command line invalid index");
-            Json::Value jv = env.rpc("vault_info", "0", "validated");
+            json::Value jv = env.rpc("vault_info", "0", "validated");
             BEAST_EXPECT(jv[jss::result][jss::error].asString() == "malformedRequest");
         }
 
         {
             testcase("RPC vault_info command line invalid index");
-            Json::Value jv = env.rpc("vault_info", strHex(uint256(42)), "validated");
+            json::Value jv = env.rpc("vault_info", strHex(uint256(42)), "validated");
             BEAST_EXPECT(jv[jss::result][jss::error].asString() == "entryNotFound");
         }
 
         {
             testcase("RPC vault_info command line invalid ledger");
-            Json::Value jv = env.rpc("vault_info", strHex(keylet.key), "0");
+            json::Value jv = env.rpc("vault_info", strHex(keylet.key), "0");
             BEAST_EXPECT(jv[jss::result][jss::error].asString() == "lgrNotFound");
         }
     }
@@ -4653,7 +4654,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
         using namespace loanBroker;
         using namespace loan;
-        Env env(*this, beast::severities::kWarning);
+        Env env(*this, beast::severities::KWarning);
 
         auto const vaultAssetBalance = [&](Keylet const& vaultKeylet) {
             auto const sleVault = env.le(vaultKeylet);
@@ -4678,7 +4679,7 @@ class Vault_test : public beast::unit_test::suite
             Vault const vault{env};
 
             auto const& [tx, vaultKeylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             auto const& vaultSle = env.le(vaultKeylet);
@@ -4688,7 +4689,7 @@ class Vault_test : public beast::unit_test::suite
 
             env(vault.deposit(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             auto const& [availablePreDefault, totalPreDefault] = vaultAssetBalance(vaultKeylet);
@@ -4701,7 +4702,7 @@ class Vault_test : public beast::unit_test::suite
                      .id = vaultKeylet.key,
                      .holder = depositor,
                      .amount = share(0).value()}),
-                ter(tecNO_PERMISSION));
+                Ter(tecNO_PERMISSION));
             env.close();
 
             auto const& sharesAvailable = vaultShareBalance(vaultKeylet);
@@ -4714,13 +4715,13 @@ 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::interestRate(TenthBips32(0)),
-                gracePeriod(60),
-                paymentInterval(120),
-                paymentTotal(10),
-                sig(sfCounterpartySignature, owner),
-                fee(env.current()->fees().base * 2),
-                ter(tesSUCCESS));
+                loan::kINTEREST_RATE(TenthBips32(0)),
+                kGRACE_PERIOD(60),
+                kPAYMENT_INTERVAL(120),
+                kPAYMENT_TOTAL(10),
+                Sig(sfCounterpartySignature, owner),
+                Fee(env.current()->fees().base * 2),
+                Ter(tesSUCCESS));
             env.close();
 
             // attempt to clawback shares while there assetsAvailable == 0 and
@@ -4730,12 +4731,12 @@ class Vault_test : public beast::unit_test::suite
                      .id = vaultKeylet.key,
                      .holder = depositor,
                      .amount = share(0).value()}),
-                ter(tecNO_PERMISSION));
+                Ter(tecNO_PERMISSION));
             env.close();
 
             env.close(std::chrono::seconds{120 + 60});
 
-            env(manage(owner, loanKeylet.key, tfLoanDefault), ter(tesSUCCESS));
+            env(manage(owner, loanKeylet.key, tfLoanDefault), Ter(tesSUCCESS));
 
             auto const& [availablePostDefault, totalPostDefault] = vaultAssetBalance(vaultKeylet);
 
@@ -4758,10 +4759,10 @@ class Vault_test : public beast::unit_test::suite
                 // empty
                 auto const expectedTer = [&]() {
                     if (asset.native())
-                        return ter(temMALFORMED);
+                        return Ter(temMALFORMED);
                     if (asset.raw().getIssuer() != owner.id())
-                        return ter(tecNO_PERMISSION);
-                    return ter(tecPRECISION_LOSS);
+                        return Ter(tecNO_PERMISSION);
+                    return Ter(tecPRECISION_LOSS);
                 }();
                 env(vault.clawback({
                         .issuer = owner,
@@ -4787,7 +4788,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = share(1).value(),
                     }),
-                    ter(tecLIMIT_EXCEEDED));
+                    Ter(tecLIMIT_EXCEEDED));
                 env.close();
             }
 
@@ -4802,8 +4803,8 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                     }),
                     // when owner is issuer implicit clawback fails
-                    asset.native() || asset.raw().getIssuer() != owner.id() ? ter(tesSUCCESS)
-                                                                            : ter(tecWRONG_ASSET));
+                    asset.native() || asset.raw().getIssuer() != owner.id() ? Ter(tesSUCCESS)
+                                                                            : Ter(tecWRONG_ASSET));
                 env.close();
             }
 
@@ -4822,7 +4823,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = share(vaultShareBalance(vaultKeylet)).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
             }
             {
@@ -4838,7 +4839,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = owner,
                         .amount = share(vaultShareBalance(vaultKeylet)).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
             }
 
@@ -4855,7 +4856,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = owner,
                         .amount = share(vaultShareBalance(vaultKeylet)).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
 
                 // Now the vault is empty, clawback again fails
                 env(vault.clawback({
@@ -4864,7 +4865,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = owner,
                         .amount = share(vaultShareBalance(vaultKeylet)).value(),
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 env.close();
             }
         };
@@ -4882,29 +4883,29 @@ class Vault_test : public beast::unit_test::suite
         testCase(xrp, "XRP (depositor is owner)", owner, owner);
 
         // Test IOU
-        PrettyAsset const IOU = issuer["IOU"];
+        PrettyAsset const iou = issuer["IOU"];
         env(fset(issuer, asfAllowTrustLineClawback));
         env.close();
 
-        env.trust(IOU(1000), owner);
-        env.trust(IOU(1000), depositor);
-        env(pay(issuer, owner, IOU(100)));
-        env(pay(issuer, depositor, IOU(100)));
+        env.trust(iou(1000), owner);
+        env.trust(iou(1000), depositor);
+        env(pay(issuer, owner, iou(100)));
+        env(pay(issuer, depositor, iou(100)));
         env.close();
-        testCase(IOU, "IOU", owner, depositor);
-        testCase(IOU, "IOU (owner is issuer)", issuer, depositor);
+        testCase(iou, "IOU", owner, depositor);
+        testCase(iou, "IOU (owner is issuer)", issuer, depositor);
 
         // Test MPT
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
-        PrettyAsset const MPT = mptt.issuanceID();
+        PrettyAsset const mpt = mptt.issuanceID();
         mptt.authorize({.account = owner});
         mptt.authorize({.account = depositor});
-        env(pay(issuer, owner, MPT(1000)));
-        env(pay(issuer, depositor, MPT(1000)));
+        env(pay(issuer, owner, mpt(1000)));
+        env(pay(issuer, depositor, mpt(1000)));
         env.close();
-        testCase(MPT, "MPT", owner, depositor);
-        testCase(MPT, "MPT (owner is issuer)", issuer, depositor);
+        testCase(mpt, "MPT", owner, depositor);
+        testCase(mpt, "MPT (owner is issuer)", issuer, depositor);
     }
 
     void
@@ -4923,7 +4924,7 @@ class Vault_test : public beast::unit_test::suite
             Vault const vault{env};
 
             auto const& [tx, vaultKeylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             auto const& vaultSle = env.le(vaultKeylet);
@@ -4931,7 +4932,7 @@ class Vault_test : public beast::unit_test::suite
             env.memoize(Account("vault", vaultSle->at(sfAccount)));
             env(vault.deposit(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             return std::make_pair(vault, vaultKeylet);
@@ -4954,14 +4955,14 @@ class Vault_test : public beast::unit_test::suite
                         .holder = issuer,
                         .amount = asset(1).value(),
                     }),
-                    ter(temMALFORMED));
+                    Ter(temMALFORMED));
                 // When asset is implicit, clawback fails as no permission.
                 env(vault.clawback({
                         .issuer = issuer,
                         .id = vaultKeylet.key,
                         .holder = issuer,
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
                 return;
             }
 
@@ -4978,7 +4979,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset2(1).value(),
                     }),
-                    ter(tecWRONG_ASSET));
+                    Ter(tecWRONG_ASSET));
             }
 
             {
@@ -4991,7 +4992,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = issuer,
                     }),
-                    ter(tecWRONG_ASSET));
+                    Ter(tecWRONG_ASSET));
             }
 
             {
@@ -5003,7 +5004,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = depositor,
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
 
                 env(vault.clawback({
                         .issuer = owner,
@@ -5011,7 +5012,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(1).value(),
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
             }
 
             {
@@ -5022,7 +5023,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = issuer,
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
             }
 
             {
@@ -5039,7 +5040,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = share(1).value(),
                     }),
-                    ter(tecNO_PERMISSION));
+                    Ter(tecNO_PERMISSION));
             }
 
             {
@@ -5054,7 +5055,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(1).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
             }
 
             {
@@ -5068,7 +5069,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(100).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
             }
 
             {
@@ -5082,7 +5083,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = depositor,
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
             }
 
             {
@@ -5105,13 +5106,13 @@ 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::interestRate(TenthBips32(0)),
-                    gracePeriod(60),
-                    paymentInterval(120),
-                    paymentTotal(10),
-                    sig(sfCounterpartySignature, owner),
-                    fee(env.current()->fees().base * 2),
-                    ter(tesSUCCESS));
+                    loan::kINTEREST_RATE(TenthBips32(0)),
+                    kGRACE_PERIOD(60),
+                    kPAYMENT_INTERVAL(120),
+                    kPAYMENT_TOTAL(10),
+                    Sig(sfCounterpartySignature, owner),
+                    Fee(env.current()->fees().base * 2),
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5128,7 +5129,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = depositor,
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
 
                 // Only 60 assets clawed back; loan's 40 still outstanding
@@ -5162,13 +5163,13 @@ class Vault_test : public beast::unit_test::suite
 
                 // Depositor borrows 40 units
                 env(set(depositor, brokerKeylet.key, asset(40).value()),
-                    loan::interestRate(TenthBips32(0)),
-                    gracePeriod(60),
-                    paymentInterval(120),
-                    paymentTotal(10),
-                    sig(sfCounterpartySignature, owner),
-                    fee(env.current()->fees().base * 2),
-                    ter(tesSUCCESS));
+                    loan::kINTEREST_RATE(TenthBips32(0)),
+                    kGRACE_PERIOD(60),
+                    kPAYMENT_INTERVAL(120),
+                    kPAYMENT_TOTAL(10),
+                    Sig(sfCounterpartySignature, owner),
+                    Fee(env.current()->fees().base * 2),
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5184,7 +5185,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(100).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5217,13 +5218,13 @@ 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::interestRate(TenthBips32(0)),
-                    gracePeriod(60),
-                    paymentInterval(120),
-                    paymentTotal(10),
-                    sig(sfCounterpartySignature, owner),
-                    fee(env.current()->fees().base * 2),
-                    ter(tesSUCCESS));
+                    loan::kINTEREST_RATE(TenthBips32(0)),
+                    kGRACE_PERIOD(60),
+                    kPAYMENT_INTERVAL(120),
+                    kPAYMENT_TOTAL(10),
+                    Sig(sfCounterpartySignature, owner),
+                    Fee(env.current()->fees().base * 2),
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5239,7 +5240,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(30).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5271,13 +5272,13 @@ 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::interestRate(TenthBips32(0)),
-                    gracePeriod(60),
-                    paymentInterval(120),
-                    paymentTotal(10),
-                    sig(sfCounterpartySignature, owner),
-                    fee(env.current()->fees().base * 2),
-                    ter(tesSUCCESS));
+                    loan::kINTEREST_RATE(TenthBips32(0)),
+                    kGRACE_PERIOD(60),
+                    kPAYMENT_INTERVAL(120),
+                    kPAYMENT_TOTAL(10),
+                    Sig(sfCounterpartySignature, owner),
+                    Fee(env.current()->fees().base * 2),
+                    Ter(tesSUCCESS));
                 env.close();
 
                 // Clawback exactly 60 — at the boundary, no clamping needed
@@ -5287,7 +5288,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(60).value(),
                     }),
-                    ter(tesSUCCESS));
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5319,13 +5320,13 @@ 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::interestRate(TenthBips32(0)),
-                    gracePeriod(60),
-                    paymentInterval(120),
-                    paymentTotal(10),
-                    sig(sfCounterpartySignature, owner),
-                    fee(env.current()->fees().base * 2),
-                    ter(tesSUCCESS));
+                    loan::kINTEREST_RATE(TenthBips32(0)),
+                    kGRACE_PERIOD(60),
+                    kPAYMENT_INTERVAL(120),
+                    kPAYMENT_TOTAL(10),
+                    Sig(sfCounterpartySignature, owner),
+                    Fee(env.current()->fees().base * 2),
+                    Ter(tesSUCCESS));
                 env.close();
 
                 {
@@ -5343,7 +5344,7 @@ class Vault_test : public beast::unit_test::suite
                         .id = vaultKeylet.key,
                         .holder = depositor,
                     }),
-                    ter(tecPRECISION_LOSS));
+                    Ter(tecPRECISION_LOSS));
                 env.close();
 
                 // Explicit amount clawback — also nothing available
@@ -5353,7 +5354,7 @@ class Vault_test : public beast::unit_test::suite
                         .holder = depositor,
                         .amount = asset(50).value(),
                     }),
-                    ter(tecPRECISION_LOSS));
+                    Ter(tecPRECISION_LOSS));
                 env.close();
 
                 {
@@ -5380,25 +5381,26 @@ class Vault_test : public beast::unit_test::suite
         testCase(xrp, "XRP", owner, depositor, issuer);
 
         // Test IOU
-        PrettyAsset const IOU = issuer["IOU"];
+        PrettyAsset const iou = issuer["IOU"];
         env(fset(issuer, asfAllowTrustLineClawback));
         env.close();
-        env.trust(IOU(2000), owner);
-        env.trust(IOU(2000), depositor);
-        env(pay(issuer, owner, IOU(2000)));
-        env(pay(issuer, depositor, IOU(2000)));
+        env.trust(iou(2000), owner);
+        env.trust(iou(2000), depositor);
+        env(pay(issuer, owner, iou(2000)));
+        env(pay(issuer, depositor, iou(2000)));
         env.close();
-        testCase(IOU, "IOU", owner, depositor, issuer);
+        testCase(iou, "IOU", owner, depositor, issuer);
 
         // Test MPT
-        MPTTester mptt{env, issuer, mptInitNoFund};
+        MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
         mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
-        PrettyAsset const MPT = mptt.issuanceID();
+
+        PrettyAsset const mpt = mptt.issuanceID();
         mptt.authorize({.account = owner});
         mptt.authorize({.account = depositor});
-        env(pay(issuer, depositor, MPT(2000)));
+        env(pay(issuer, depositor, mpt(2000)));
         env.close();
-        testCase(MPT, "MPT", owner, depositor, issuer);
+        testCase(mpt, "MPT", owner, depositor, issuer);
 
         // Test pre-fixSecurity3_1_3 legacy path: zero-amount clawback
         // returns early without clamping to assetsAvailable.
@@ -5409,7 +5411,7 @@ class Vault_test : public beast::unit_test::suite
 
             env.disableFeature(fixSecurity3_1_3);
 
-            auto [vault, vaultKeylet] = setupVault(IOU, owner, depositor, issuer);
+            auto [vault, vaultKeylet] = setupVault(iou, owner, depositor, issuer);
 
             auto const vaultSle = env.le(vaultKeylet);
             BEAST_EXPECT(vaultSle != nullptr);
@@ -5425,20 +5427,20 @@ 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::interestRate(TenthBips32(0)),
-                gracePeriod(60),
-                paymentInterval(120),
-                paymentTotal(10),
-                sig(sfCounterpartySignature, owner),
-                fee(env.current()->fees().base * 2),
-                ter(tesSUCCESS));
+            env(set(depositor, brokerKeylet.key, iou(40).value()),
+                loan::kINTEREST_RATE(TenthBips32(0)),
+                kGRACE_PERIOD(60),
+                kPAYMENT_INTERVAL(120),
+                kPAYMENT_TOTAL(10),
+                Sig(sfCounterpartySignature, owner),
+                Fee(env.current()->fees().base * 2),
+                Ter(tesSUCCESS));
             env.close();
 
             {
                 auto const sle = env.le(vaultKeylet);
-                BEAST_EXPECT(sle->at(sfAssetsAvailable) == IOU(60).value());
-                BEAST_EXPECT(sle->at(sfAssetsTotal) == IOU(100).value());
+                BEAST_EXPECT(sle->at(sfAssetsAvailable) == iou(60).value());
+                BEAST_EXPECT(sle->at(sfAssetsTotal) == iou(100).value());
             }
 
             auto const sharesBefore = env.balance(depositor, shares);
@@ -5452,15 +5454,15 @@ class Vault_test : public beast::unit_test::suite
                     .id = vaultKeylet.key,
                     .holder = depositor,
                 }),
-                ter(tefINTERNAL));
+                Ter(tefINTERNAL));
             env.close();
 
             {
                 // Transaction rolled back — vault and shares unchanged
                 auto const sle = env.le(vaultKeylet);
                 BEAST_EXPECT(sle != nullptr);
-                BEAST_EXPECT(sle->at(sfAssetsAvailable) == IOU(60).value());
-                BEAST_EXPECT(sle->at(sfAssetsTotal) == IOU(100).value());
+                BEAST_EXPECT(sle->at(sfAssetsAvailable) == iou(60).value());
+                BEAST_EXPECT(sle->at(sfAssetsTotal) == iou(100).value());
                 auto const sharesAfter = env.balance(depositor, shares);
                 BEAST_EXPECT(sharesAfter == sharesBefore);
             }
@@ -5476,7 +5478,7 @@ class Vault_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        Env env{*this, testable_amendments()};
+        Env env{*this, testableAmendments()};
         Account const owner{"owner"};
         Account const issuer{"issuer"};
 
@@ -5492,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(INITIAL_XRP);
+        auto const initialXRP = to_string(kINITIAL_XRP);
         BEAST_EXPECT(initialXRP == "100000000000000000");
 
-        auto const initialXRPPlus1 = to_string(INITIAL_XRP + 1);
+        auto const initialXRPPlus1 = to_string(kINITIAL_XRP + 1);
         BEAST_EXPECT(initialXRPPlus1 == "100000000000000001");
 
         {
@@ -5507,11 +5509,11 @@ class Vault_test : public beast::unit_test::suite
             tx[sfData] = "4D65746144617461";
 
             tx[sfAssetsMaximum] = maxInt64;
-            env(tx, ter(tefEXCEPTION));
+            env(tx, Ter(tefEXCEPTION));
             env.close();
 
             tx[sfAssetsMaximum] = initialXRPPlus1;
-            env(tx, ter(tefEXCEPTION));
+            env(tx, Ter(tefEXCEPTION));
             env.close();
 
             tx[sfAssetsMaximum] = initialXRP;
@@ -5519,7 +5521,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx[sfAssetsMaximum] = maxInt64Plus1;
-            env(tx, ter(tefEXCEPTION));
+            env(tx, Ter(tefEXCEPTION));
             env.close();
 
             // This value will be rounded
@@ -5543,7 +5545,7 @@ class Vault_test : public beast::unit_test::suite
             testcase("Assets Maximum: MPT");
 
             PrettyAsset const mptAsset = [&]() {
-                MPTTester mptt{env, issuer, mptInitNoFund};
+                MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
                 mptt.create({.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock});
                 env.close();
                 PrettyAsset const mptAsset = mptt["MPT"];
@@ -5571,7 +5573,7 @@ class Vault_test : public beast::unit_test::suite
             env.close();
 
             tx[sfAssetsMaximum] = maxInt64Plus1;
-            env(tx, ter(tefEXCEPTION));
+            env(tx, Ter(tefEXCEPTION));
             env.close();
 
             // This value will be rounded
@@ -5642,7 +5644,7 @@ class Vault_test : public beast::unit_test::suite
 
                 BEAST_EXPECT(
                     (vaultSle->at(sfAssetsMaximum) ==
-                     Number{9223372036854776, 2, Number::normalized{}}));
+                     Number{9223372036854776, 2, Number::Normalized{}}));
             }
             {
                 tx[sfAssetsMaximum] = "9223372036854775807e40";  // max int64 * 10^40
@@ -5656,7 +5658,7 @@ class Vault_test : public beast::unit_test::suite
 
                 BEAST_EXPECT(
                     (vaultSle->at(sfAssetsMaximum) ==
-                     Number{9223372036854776, 43, Number::normalized{}}));
+                     Number{9223372036854776, 43, Number::Normalized{}}));
             }
             {
                 tx[sfAssetsMaximum] = "9223372036854775807e-40";  // max int64 * 10^-40
@@ -5670,7 +5672,7 @@ class Vault_test : public beast::unit_test::suite
 
                 BEAST_EXPECT(
                     (vaultSle->at(sfAssetsMaximum) ==
-                     Number{9223372036854776, -37, Number::normalized{}}));
+                     Number{9223372036854776, -37, Number::Normalized{}}));
             }
             {
                 tx[sfAssetsMaximum] = "9223372036854775807e-100";  // max int64 * 10^-100
@@ -5683,30 +5685,30 @@ class Vault_test : public beast::unit_test::suite
                 if (!BEAST_EXPECT(vaultSle))
                     return;
 
-                BEAST_EXPECT(vaultSle->at(sfAssetsMaximum) == numZero);
+                BEAST_EXPECT(vaultSle->at(sfAssetsMaximum) == kNUM_ZERO);
             }
 
             // What _can't_ IOUs do?
             // 1. Exceed maximum exponent / offset
             tx[sfAssetsMaximum] = "1000000000000000e81";
-            env(tx, ter(tefEXCEPTION));
+            env(tx, Ter(tefEXCEPTION));
             env.close();
 
             // 2. Mantissa larger than uint64 max
-            env.set_parse_failure_expected(true);
+            env.setParseFailureExpected(true);
             try
             {
                 tx[sfAssetsMaximum] = "18446744073709551617e5";  // uint64 max + 1
                 env(tx);
                 BEAST_EXPECTS(false, "Expected parse_error for mantissa larger than uint64 max");
             }
-            catch (parse_error const& e)
+            catch (ParseError const& e)
             {
                 using namespace std::string_literals;
                 BEAST_EXPECT(
                     e.what() == "invalidParamsField 'tx_json.AssetsMaximum' has invalid data."s);
             }
-            env.set_parse_failure_expected(false);
+            env.setParseFailureExpected(false);
         }
     }
 
@@ -5725,7 +5727,7 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("Vault deposit fails when MPT asset is escrowed");
 
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             auto const baseFee = env.current()->fees().base;
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -5735,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, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5748,26 +5750,26 @@ 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::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             Vault const vault{env};
             auto [tx, vaultKeylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             // Deposit 100 should fail — only 40 spendable
             env(vault.deposit(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tecINSUFFICIENT_FUNDS));
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
             // Deposit 40 (the unlocked balance) should succeed
             env(vault.deposit({.depositor = depositor, .id = vaultKeylet.key, .amount = asset(40)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             {
@@ -5777,17 +5779,17 @@ class Vault_test : public beast::unit_test::suite
 
             // Clean up escrow
             env(escrow::finish(bob, depositor, escrowSeq),
-                escrow::condition(escrow::cb1),
-                escrow::fulfillment(escrow::fb1),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFULFILLMENT(escrow::kFB1),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
         }
 
         {
             testcase("Vault withdraw respects escrowed shares");
 
-            Env env{*this, testable_amendments()};
+            Env env{*this, testableAmendments()};
             auto const baseFee = env.current()->fees().base;
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -5797,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, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5808,13 +5810,13 @@ class Vault_test : public beast::unit_test::suite
 
             Vault const vault{env};
             auto [tx, vaultKeylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             // Deposit 100 → get shares
             env(vault.deposit(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             auto const vaultSle = env.le(vaultKeylet);
@@ -5826,33 +5828,33 @@ class Vault_test : public beast::unit_test::suite
             // Authorize bob for share MPT so he can receive escrowed shares
             auto const shareMPTID = vaultSle->at(sfShareMPTID);
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = bob.human();
                 jv[sfMPTokenIssuanceID] = to_string(shareMPTID);
                 jv[jss::TransactionType] = jss::MPTokenAuthorize;
-                env(jv, ter(tesSUCCESS));
+                env(jv, Ter(tesSUCCESS));
                 env.close();
             }
 
             // Escrow 60% of shares
             auto const escrowAmount = shares(Number{6, vaultSle->at(sfScale) + 1});
             env(escrow::create(depositor, bob, escrowAmount),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // Withdraw all 100 should fail — only 40% of shares are unlocked
             env(vault.withdraw(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tecINSUFFICIENT_FUNDS));
+                Ter(tecINSUFFICIENT_FUNDS));
             env.close();
 
             // Withdraw 40 (matching unlocked shares) should succeed
             env(vault.withdraw(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(40)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             {
@@ -5864,7 +5866,7 @@ class Vault_test : public beast::unit_test::suite
         {
             testcase("Vault clawback only recovers unlocked shares");
 
-            Env env{*this, testable_amendments() | fixSecurity3_1_3};
+            Env env{*this, testableAmendments() | fixSecurity3_1_3};
             auto const baseFee = env.current()->fees().base;
             Account const owner{"owner"};
             Account const depositor{"depositor"};
@@ -5874,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, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create(
                 {.flags = tfMPTCanClawback | tfMPTCanTransfer | tfMPTCanLock | tfMPTCanEscrow});
             mptt.authorize({.account = owner});
@@ -5885,13 +5887,13 @@ class Vault_test : public beast::unit_test::suite
 
             Vault const vault{env};
             auto [tx, vaultKeylet] = vault.create({.owner = owner, .asset = asset});
-            env(tx, ter(tesSUCCESS));
+            env(tx, Ter(tesSUCCESS));
             env.close();
 
             // Deposit 100 → get shares
             env(vault.deposit(
                     {.depositor = depositor, .id = vaultKeylet.key, .amount = asset(100)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             auto const vaultSle = env.le(vaultKeylet);
@@ -5903,21 +5905,21 @@ class Vault_test : public beast::unit_test::suite
             // Authorize bob for share MPT so he can receive escrowed shares
             auto const shareMPTID = vaultSle->at(sfShareMPTID);
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::Account] = bob.human();
                 jv[sfMPTokenIssuanceID] = to_string(shareMPTID);
                 jv[jss::TransactionType] = jss::MPTokenAuthorize;
-                env(jv, ter(tesSUCCESS));
+                env(jv, Ter(tesSUCCESS));
                 env.close();
             }
 
             // Escrow 60% of shares
             auto const escrowAmount = shares(Number{6, vaultSle->at(sfScale) + 1});
             env(escrow::create(depositor, bob, escrowAmount),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // Zero-amount clawback ("all") — should only recover assets
@@ -5927,7 +5929,7 @@ class Vault_test : public beast::unit_test::suite
                     .id = vaultKeylet.key,
                     .holder = depositor,
                 }),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             {
@@ -5947,12 +5949,12 @@ class Vault_test : public beast::unit_test::suite
     // Reproduction: canWithdraw IOU limit check bypassed when
     // withdrawal amount is specified in shares (MPT) rather than in assets.
     void
-    testBug6_LimitBypassWithShares()
+    testBug6LimitBypassWithShares()
     {
         using namespace test::jtx;
         testcase("Bug6 - limit bypass with share-denominated withdrawal");
 
-        auto const allAmendments = testable_amendments() | featureSingleAssetVault;
+        auto const allAmendments = testableAmendments() | featureSingleAssetVault;
 
         for (auto const& features : {allAmendments, allAmendments - fixSecurity3_1_3})
         {
@@ -6004,7 +6006,7 @@ class Vault_test : public beast::unit_test::suite
                 auto withdrawTx =
                     vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(10)});
                 withdrawTx[sfDestination] = charlie.human();
-                env(withdrawTx, ter{tecNO_LINE});
+                env(withdrawTx, Ter{tecNO_LINE});
                 env.close();
             }
             auto const charlieBalanceBefore = env.balance(charlie, asset.raw().get<Issue>());
@@ -6020,7 +6022,7 @@ class Vault_test : public beast::unit_test::suite
                      .id = keylet.key,
                      .amount = STAmount(share, 10'000'000)});
                 withdrawTx[sfDestination] = charlie.human();
-                env(withdrawTx, ter{withFix ? TER{tecNO_LINE} : TER{tesSUCCESS}});
+                env(withdrawTx, Ter{withFix ? TER{tecNO_LINE} : TER{tesSUCCESS}});
                 env.close();
 
                 auto const charlieBalanceAfter = env.balance(charlie, asset.raw().get<Issue>());
@@ -6047,7 +6049,7 @@ class Vault_test : public beast::unit_test::suite
         using namespace test::jtx;
         using namespace std::literals;
 
-        auto const amendments = testable_amendments();
+        auto const amendments = testableAmendments();
         auto runTest = [&](FeatureBitset f) {
             Env env{*this, f};
             auto const baseFee = env.current()->fees().base;
@@ -6063,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, mptInitNoFund};
+            MPTTester mptt{env, issuer, kMPT_INIT_NO_FUND};
             mptt.create({.flags = tfMPTCanTransfer | tfMPTCanLock});
             PrettyAsset const asset = mptt.issuanceID();
             mptt.authorize({.account = owner});
@@ -6094,10 +6096,10 @@ class Vault_test : public beast::unit_test::suite
 
             // Escrow 500 of those shares
             env(escrow::create(depositor, bob, STAmount{shareIssue, 500}),
-                escrow::condition(escrow::cb1),
-                escrow::finish_time(env.now() + 1s),
-                fee(baseFee * 150),
-                ter(tesSUCCESS));
+                escrow::kCONDITION(escrow::kCB1),
+                escrow::kFINISH_TIME(env.now() + 1s),
+                Fee(baseFee * 150),
+                Ter(tesSUCCESS));
             env.close();
 
             // Verify: sfMPTAmount=500, sfLockedAmount=500
@@ -6110,7 +6112,7 @@ class Vault_test : public beast::unit_test::suite
 
             // Withdraw remaining spendable shares — triggers removeEmptyHolding
             env(vault.withdraw({.depositor = depositor, .id = keylet.key, .amount = asset(500)}),
-                ter(tesSUCCESS));
+                Ter(tesSUCCESS));
             env.close();
 
             auto const sleMptAfter = env.le(keylet::mptoken(shareMptID, depositor));
@@ -6150,7 +6152,7 @@ public:
         testWithMPT();
         testWithIOU();
         testWithDomainCheck();
-        testWithDomainCheckXRP();
+        testWithDomainChecXRP();
         testNonTransferableShares();
         testFailedPseudoAccount();
         testScaleIOU();
@@ -6159,7 +6161,7 @@ public:
         testVaultClawbackAssets();
         testVaultEscrowedMPT();
         testAssetsMaximum();
-        testBug6_LimitBypassWithShares();
+        testBug6LimitBypassWithShares();
         testRemoveEmptyHoldingLockedAmount();
     }
 };
diff --git a/src/test/app/XChain_test.cpp b/src/test/app/XChain_test.cpp
index c790895921..a8899e4e43 100644
--- a/src/test/app/XChain_test.cpp
+++ b/src/test/app/XChain_test.cpp
@@ -62,36 +62,36 @@ namespace xrpl::test {
 template <class T>
 struct SEnv
 {
-    jtx::Env env_;
+    jtx::Env env;
 
     SEnv(
         T& s,
         std::unique_ptr<Config> config,
         FeatureBitset features,
         std::unique_ptr<Logs> logs = nullptr,
-        beast::severities::Severity thresh = beast::severities::kError)
-        : env_(s, std::move(config), features, std::move(logs), thresh)
+        beast::severities::Severity thresh = beast::severities::KError)
+        : env(s, std::move(config), features, std::move(logs), thresh)
     {
     }
 
     SEnv&
     close()
     {
-        env_.close();
+        env.close();
         return *this;
     }
 
     SEnv&
     enableFeature(uint256 const feature)
     {
-        env_.enableFeature(feature);
+        env.enableFeature(feature);
         return *this;
     }
 
     SEnv&
     disableFeature(uint256 const feature)
     {
-        env_.app().config().features.erase(feature);
+        env.app().config().features.erase(feature);
         return *this;
     }
 
@@ -99,7 +99,7 @@ struct SEnv
     SEnv&
     fund(STAmount const& amount, Arg const& arg, Args const&... args)
     {
-        env_.fund(amount, arg, args...);
+        env.fund(amount, arg, args...);
         return *this;
     }
 
@@ -107,7 +107,7 @@ struct SEnv
     SEnv&
     tx(JsonValue&& jv, FN const&... fN)
     {
-        env_(std::forward<JsonValue>(jv), fN...);
+        env(std::forward<JsonValue>(jv), fN...);
         return *this;
     }
 
@@ -116,86 +116,86 @@ struct SEnv
     multiTx(jtx::JValueVec const& jvv, FN const&... fN)
     {
         for (auto const& jv : jvv)
-            env_(jv, fN...);
+            env(jv, fN...);
         return *this;
     }
 
     [[nodiscard]] TER
     ter() const
     {
-        return env_.ter();
+        return env.ter();
     }
 
     [[nodiscard]] STAmount
     balance(jtx::Account const& account) const
     {
-        return env_.balance(account).value();
+        return env.balance(account).value();
     }
 
     [[nodiscard]] STAmount
     balance(jtx::Account const& account, Issue const& issue) const
     {
-        return env_.balance(account, issue).value();
+        return env.balance(account, issue).value();
     }
 
     XRPAmount
     reserve(std::uint32_t count)
     {
-        return env_.current()->fees().accountReserve(count);
+        return env.current()->fees().accountReserve(count);
     }
 
     XRPAmount
     txFee()
     {
-        return env_.current()->fees().base;
+        return env.current()->fees().base;
     }
 
     std::shared_ptr<SLE const>
     account(jtx::Account const& account)
     {
-        return env_.le(account);
+        return env.le(account);
     }
 
     std::shared_ptr<SLE const>
-    bridge(Json::Value const& jvb)
+    bridge(json::Value const& jvb)
     {
         STXChainBridge const b(jvb);
 
         auto tryGet = [&](STXChainBridge::ChainType ct) -> std::shared_ptr<SLE const> {
-            if (auto r = env_.le(keylet::bridge(b, ct)))
+            if (auto r = env.le(keylet::bridge(b, ct)))
             {
                 if ((*r)[sfXChainBridge] == b)
                     return r;
             }
             return nullptr;
         };
-        if (auto r = tryGet(STXChainBridge::ChainType::locking))
+        if (auto r = tryGet(STXChainBridge::ChainType::Locking))
             return r;
-        return tryGet(STXChainBridge::ChainType::issuing);
+        return tryGet(STXChainBridge::ChainType::Issuing);
     }
 
     std::uint64_t
-    claimCount(Json::Value const& jvb)
+    claimCount(json::Value const& jvb)
     {
         return (*bridge(jvb))[sfXChainAccountClaimCount];
     }
 
     std::uint64_t
-    claimID(Json::Value const& jvb)
+    claimID(json::Value const& jvb)
     {
         return (*bridge(jvb))[sfXChainClaimID];
     }
 
     std::shared_ptr<SLE const>
-    claimID(Json::Value const& jvb, std::uint64_t seq)
+    claimID(json::Value const& jvb, std::uint64_t seq)
     {
-        return env_.le(keylet::xChainClaimID(STXChainBridge(jvb), seq));
+        return env.le(keylet::xChainClaimID(STXChainBridge(jvb), seq));
     }
 
     std::shared_ptr<SLE const>
-    caClaimID(Json::Value const& jvb, std::uint64_t seq)
+    caClaimID(json::Value const& jvb, std::uint64_t seq)
     {
-        return env_.le(keylet::xChainCreateAccountClaimID(STXChainBridge(jvb), seq));
+        return env.le(keylet::xChainCreateAccountClaimID(STXChainBridge(jvb), seq));
     }
 };
 
@@ -209,29 +209,29 @@ struct XEnv : public jtx::XChainBridgeObjects, public SEnv<T>
     XEnv(T& s, bool side = false) : SEnv<T>(s, jtx::envconfig(), features)
     {
         using namespace jtx;
-        STAmount const xrp_funds{XRP(10000)};
+        STAmount const xrpFunds{XRP(10000)};
 
         if (!side)
         {
-            this->fund(xrp_funds, mcDoor, mcAlice, mcBob, mcCarol, mcGw);
+            this->fund(xrpFunds, mcDoor, mcAlice, mcBob, mcCarol, mcGw);
 
             // Signer's list must match the attestation signers
             // env_(jtx::signers(mcDoor, quorum, signers));
             for (auto& s : signers)
-                this->fund(xrp_funds, s.account);
+                this->fund(xrpFunds, s.account);
         }
         else
         {
-            this->fund(xrp_funds, scDoor, scAlice, scBob, scCarol, scGw, scAttester, scReward);
+            this->fund(xrpFunds, scDoor, scAlice, scBob, scCarol, scGw, scAttester, scReward);
 
             for (auto& ra : payees)
-                this->fund(xrp_funds, ra);
+                this->fund(xrpFunds, ra);
 
             for (auto& s : signers)
-                this->fund(xrp_funds, s.account);
+                this->fund(xrpFunds, s.account);
 
             // Signer's list must match the attestation signers
-            // env_(jtx::signers(Account::master, quorum, signers));
+            // env_(jtx::signers(Account::kMASTER, quorum, signers));
         }
         this->close();
     }
@@ -241,19 +241,19 @@ struct XEnv : public jtx::XChainBridgeObjects, public SEnv<T>
 template <class T>
 struct Balance
 {
-    jtx::Account const& account_;
-    T& env_;
+    jtx::Account const& account;
+    T& env;
     STAmount startAmount;
 
-    Balance(T& env, jtx::Account const& account) : account_(account), env_(env)
+    Balance(T& env, jtx::Account const& account) : account(account), env(env)
     {
-        startAmount = env_.balance(account_);
+        startAmount = env.balance(account);
     }
 
     [[nodiscard]] STAmount
     diff() const
     {
-        return env_.balance(account_) - startAmount;
+        return env.balance(account) - startAmount;
     }
 };
 
@@ -264,47 +264,47 @@ struct BalanceTransfer
 {
     using balance = Balance<T>;
 
-    balance from_;
-    balance to_;
-    balance payer_;                        // pays the rewards
+    balance from;
+    balance to;
+    balance payer;                         // pays the rewards
     std::vector<balance> reward_accounts;  // receives the reward
-    XRPAmount txFees_;
+    XRPAmount txFees;
 
     BalanceTransfer(
         T& env,
-        jtx::Account const& from_acct,
-        jtx::Account const& to_acct,
+        jtx::Account const& fromAcct,
+        jtx::Account const& toAcct,
         jtx::Account const& payer,
         jtx::Account const* payees,
-        size_t num_payees,
+        size_t numPayees,
         bool withClaim)
-        : from_(env, from_acct)
-        , to_(env, to_acct)
-        , payer_(env, payer)
+        : from(env, fromAcct)
+        , to(env, toAcct)
+        , payer(env, payer)
         , reward_accounts([&]() {
             std::vector<balance> r;
-            r.reserve(num_payees);
-            for (size_t i = 0; i < num_payees; ++i)
+            r.reserve(numPayees);
+            for (size_t i = 0; i < numPayees; ++i)
                 r.emplace_back(env, payees[i]);
             return r;
         }())
-        , txFees_(withClaim ? env.env_.current()->fees().base : XRPAmount(0))
+        , txFees(withClaim ? env.env.current()->fees().base : XRPAmount(0))
     {
     }
 
     BalanceTransfer(
         T& env,
-        jtx::Account const& from_acct,
-        jtx::Account const& to_acct,
+        jtx::Account const& fromAcct,
+        jtx::Account const& toAcct,
         jtx::Account const& payer,
         std::vector<jtx::Account> const& payees,
         bool withClaim)
-        : BalanceTransfer(env, from_acct, to_acct, payer, &payees[0], payees.size(), withClaim)
+        : BalanceTransfer(env, fromAcct, toAcct, payer, &payees[0], payees.size(), withClaim)
     {
     }
 
     [[nodiscard]] bool
-    payees_received(STAmount const& reward) const
+    payeesReceived(STAmount const& reward) const
     {
         return std::all_of(reward_accounts.begin(), reward_accounts.end(), [&](balance const& b) {
             return b.diff() == reward;
@@ -312,24 +312,24 @@ struct BalanceTransfer
     }
 
     bool
-    check_most_balances(STAmount const& amt, STAmount const& reward)
+    checkMostBalances(STAmount const& amt, STAmount const& reward)
     {
-        return from_.diff() == -amt && to_.diff() == amt && payees_received(reward);
+        return from.diff() == -amt && to.diff() == amt && payeesReceived(reward);
     }
 
     bool
-    has_happened(STAmount const& amt, STAmount const& reward, bool check_payer = true)
+    hasHappened(STAmount const& amt, STAmount const& reward, bool checkPayer = true)
     {
-        auto reward_cost = multiply(reward, STAmount(reward_accounts.size()), reward.asset());
-        return check_most_balances(amt, reward) &&
-            (!check_payer || payer_.diff() == -(reward_cost + txFees_));
+        auto rewardCost = multiply(reward, STAmount(reward_accounts.size()), reward.asset());
+        return checkMostBalances(amt, reward) &&
+            (!checkPayer || payer.diff() == -(rewardCost + txFees));
     }
 
     bool
-    has_not_happened()
+    hasNotHappened()
     {
-        return check_most_balances(STAmount(0), STAmount(0)) &&
-            payer_.diff() <= txFees_;  // could have paid fee for failed claim
+        return checkMostBalances(STAmount(0), STAmount(0)) &&
+            payer.diff() <= txFees;  // could have paid fee for failed claim
     }
 };
 
@@ -342,8 +342,8 @@ struct BridgeDef
     STAmount reward;
     STAmount minAccountCreate;
     uint32_t quorum;
-    std::vector<jtx::signer> const& signers;
-    Json::Value jvb;
+    std::vector<jtx::Signer> const& signers;
+    json::Value jvb;
 
     template <class ENV>
     void
@@ -356,34 +356,34 @@ struct BridgeDef
                 return {};
             return minAccountCreate;
         }();
-        mcEnv.tx(bridge_create(doorA, jvb, reward, optAccountCreate))
+        mcEnv.tx(bridgeCreate(doorA, jvb, reward, optAccountCreate))
             .tx(jtx::signers(doorA, quorum, signers))
             .close();
 
-        scEnv.tx(bridge_create(doorB, jvb, reward, optAccountCreate))
+        scEnv.tx(bridgeCreate(doorB, jvb, reward, optAccountCreate))
             .tx(jtx::signers(doorB, quorum, signers))
             .close();
     }
 };
 
-struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObjects
+struct XChain_test : public beast::unit_test::Suite, public jtx::XChainBridgeObjects
 {
     XRPAmount
     reserve(std::uint32_t count)
     {
-        return XEnv(*this).env_.current()->fees().accountReserve(count);
+        return XEnv(*this).env.current()->fees().accountReserve(count);
     }
 
     XRPAmount
     txFee()
     {
-        return XEnv(*this).env_.current()->fees().base;
+        return XEnv(*this).env.current()->fees().base;
     }
 
     void
     testXChainBridgeExtraFields()
     {
-        auto jBridge = create_bridge(mcDoor)[sfXChainBridge.jsonName];
+        auto jBridge = createBridge(mcDoor)[sfXChainBridge.jsonName];
         bool exceptionPresent = false;
         try
         {
@@ -420,38 +420,38 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         testcase("Create Bridge");
 
         // Normal create_bridge => should succeed
-        XEnv(*this).tx(create_bridge(mcDoor)).close();
+        XEnv(*this).tx(createBridge(mcDoor)).close();
 
         // Bridge not owned by one of the door account.
-        XEnv(*this).tx(create_bridge(mcBob), ter(temXCHAIN_BRIDGE_NONDOOR_OWNER));
+        XEnv(*this).tx(createBridge(mcBob), Ter(temXCHAIN_BRIDGE_NONDOOR_OWNER));
 
         // Create twice on the same account
-        XEnv(*this).tx(create_bridge(mcDoor)).close().tx(create_bridge(mcDoor), ter(tecDUPLICATE));
+        XEnv(*this).tx(createBridge(mcDoor)).close().tx(createBridge(mcDoor), Ter(tecDUPLICATE));
 
         // Create USD bridge Alice -> Bob ... should succeed
         XEnv(*this).tx(
-            create_bridge(mcAlice, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])),
-            ter(tesSUCCESS));
+            createBridge(mcAlice, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])),
+            Ter(tesSUCCESS));
 
         // Create USD bridge, Alice is both the locking door and locking issue,
         // ... should fail.
         XEnv(*this).tx(
-            create_bridge(mcAlice, bridge(mcAlice, mcAlice["USD"], mcBob, mcBob["USD"])),
-            ter(temXCHAIN_BRIDGE_BAD_ISSUES));
+            createBridge(mcAlice, bridge(mcAlice, mcAlice["USD"], mcBob, mcBob["USD"])),
+            Ter(temXCHAIN_BRIDGE_BAD_ISSUES));
 
         // Bridge where the two door accounts are equal.
         XEnv(*this).tx(
-            create_bridge(mcBob, bridge(mcBob, mcGw["USD"], mcBob, mcGw["USD"])),
-            ter(temXCHAIN_EQUAL_DOOR_ACCOUNTS));
+            createBridge(mcBob, bridge(mcBob, mcGw["USD"], mcBob, mcGw["USD"])),
+            Ter(temXCHAIN_EQUAL_DOOR_ACCOUNTS));
 
         // Both door accounts are on the same chain. This is not allowed.
         // Although it doesn't violate any invariants, it's not a useful thing
         // to do and it complicates the "add claim" transactions.
         XEnv(*this)
-            .tx(create_bridge(mcAlice, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])))
+            .tx(createBridge(mcAlice, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])))
             .close()
-            .tx(create_bridge(mcBob, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])),
-                ter(tecDUPLICATE))
+            .tx(createBridge(mcBob, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"])),
+                Ter(tecDUPLICATE))
             .close();
 
         // Create a bridge on an account with exactly enough balance to
@@ -459,63 +459,62 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         XEnv(*this)
             .fund(res1, mcuDoor)  // exact reserve for account + 1 object
             .close()
-            .tx(create_bridge(mcuDoor, jvub), ter(tesSUCCESS));
+            .tx(createBridge(mcuDoor, jvub), Ter(tesSUCCESS));
 
         // Create a bridge on an account with no enough balance to meet the
         // new reserve
         XEnv(*this)
             .fund(res1 - 1, mcuDoor)  // just short of required reserve
             .close()
-            .tx(create_bridge(mcuDoor, jvub), ter(tecINSUFFICIENT_RESERVE));
+            .tx(createBridge(mcuDoor, jvub), Ter(tecINSUFFICIENT_RESERVE));
 
         // Reward amount is non-xrp
         XEnv(*this).tx(
-            create_bridge(mcDoor, jvb, mcUSD(1)), ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
+            createBridge(mcDoor, jvb, mcUSD(1)), Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
 
         // Reward amount is XRP and negative
-        XEnv(*this).tx(
-            create_bridge(mcDoor, jvb, XRP(-1)), ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
+        XEnv(*this).tx(createBridge(mcDoor, jvb, XRP(-1)), Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
 
         // Reward amount is 1 xrp => should succeed
-        XEnv(*this).tx(create_bridge(mcDoor, jvb, XRP(1)), ter(tesSUCCESS));
+        XEnv(*this).tx(createBridge(mcDoor, jvb, XRP(1)), Ter(tesSUCCESS));
 
         // Min create amount is 1 xrp, mincreate is 1 xrp => should succeed
-        XEnv(*this).tx(create_bridge(mcDoor, jvb, XRP(1), XRP(1)), ter(tesSUCCESS));
+        XEnv(*this).tx(createBridge(mcDoor, jvb, XRP(1), XRP(1)), Ter(tesSUCCESS));
 
         // Min create amount is non-xrp
         XEnv(*this).tx(
-            create_bridge(mcDoor, jvb, XRP(1), mcUSD(100)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            createBridge(mcDoor, jvb, XRP(1), mcUSD(100)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // Min create amount is zero (should fail, currently succeeds)
         XEnv(*this).tx(
-            create_bridge(mcDoor, jvb, XRP(1), XRP(0)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            createBridge(mcDoor, jvb, XRP(1), XRP(0)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // Min create amount is negative
         XEnv(*this).tx(
-            create_bridge(mcDoor, jvb, XRP(1), XRP(-1)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            createBridge(mcDoor, jvb, XRP(1), XRP(-1)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // coverage test: BridgeCreate::preflight() - create bridge when feature
         // disabled.
         {
-            Env env(*this, testable_amendments() - featureXChainBridge);
-            env(create_bridge(Account::master, jvb), ter(temDISABLED));
+            Env env(*this, testableAmendments() - featureXChainBridge);
+            env(createBridge(Account::kMASTER, jvb), Ter(temDISABLED));
         }
 
         // coverage test: BridgeCreate::preclaim() returns tecNO_ISSUER.
         XEnv(*this).tx(
-            create_bridge(mcAlice, bridge(mcAlice, mcuAlice["USD"], mcBob, mcBob["USD"])),
-            ter(tecNO_ISSUER));
+            createBridge(mcAlice, bridge(mcAlice, mcuAlice["USD"], mcBob, mcBob["USD"])),
+            Ter(tecNO_ISSUER));
 
         // coverage test: create_bridge transaction with incorrect flag
-        XEnv(*this).tx(create_bridge(mcAlice, jvb), txflags(tfFillOrKill), ter(temINVALID_FLAG));
+        XEnv(*this).tx(createBridge(mcAlice, jvb), Txflags(tfFillOrKill), Ter(temINVALID_FLAG));
 
         // coverage test: create_bridge transaction with xchain feature disabled
         XEnv(*this)
             .disableFeature(featureXChainBridge)
-            .tx(create_bridge(mcAlice, jvb), ter(temDISABLED));
+            .tx(createBridge(mcAlice, jvb), Ter(temDISABLED));
     }
 
     void
@@ -569,17 +568,17 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         using namespace jtx;
         testcase("Bridge create constraints");
         XEnv env(*this, true);
-        auto& A = scAlice;
-        auto& B = scBob;
-        auto& C = scCarol;
-        auto AUSD = A["USD"];
-        auto BUSD = B["USD"];
-        auto CUSD = C["USD"];
-        auto GUSD = scGw["USD"];
-        auto AEUR = A["EUR"];
-        auto BEUR = B["EUR"];
-        auto CEUR = C["EUR"];
-        auto GEUR = scGw["EUR"];
+        auto& a = scAlice;
+        auto& b = scBob;
+        auto& c = scCarol;
+        auto ausd = a["USD"];
+        auto busd = b["USD"];
+        auto cusd = c["USD"];
+        auto gusd = scGw["USD"];
+        auto aeur = a["EUR"];
+        auto beur = b["EUR"];
+        auto ceur = c["EUR"];
+        auto geur = scGw["EUR"];
 
         // Accounts to own single bridges
         Account const a1("a1");
@@ -594,51 +593,51 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
         // Add a bridge on two different accounts with the same locking and
         // issuing assets
-        env.tx(create_bridge(a1, bridge(a1, GUSD, B, BUSD))).close();
-        env.tx(create_bridge(a2, bridge(a2, GUSD, B, BUSD))).close();
+        env.tx(createBridge(a1, bridge(a1, gusd, b, busd))).close();
+        env.tx(createBridge(a2, bridge(a2, gusd, b, busd))).close();
 
         // Add the exact same bridge to two different accounts (one locking
         // account and one issuing)
-        env.tx(create_bridge(a3, bridge(a3, GUSD, a4, a4["USD"]))).close();
-        env.tx(create_bridge(a4, bridge(a3, GUSD, a4, a4["USD"])), ter(tecDUPLICATE)).close();
+        env.tx(createBridge(a3, bridge(a3, gusd, a4, a4["USD"]))).close();
+        env.tx(createBridge(a4, bridge(a3, gusd, a4, a4["USD"])), Ter(tecDUPLICATE)).close();
 
         // Add the exact same bridge to two different accounts (one issuing
         // account and one locking - opposite order from the test above)
-        env.tx(create_bridge(a5, bridge(a6, GUSD, a5, a5["USD"]))).close();
-        env.tx(create_bridge(a6, bridge(a6, GUSD, a5, a5["USD"])), ter(tecDUPLICATE)).close();
+        env.tx(createBridge(a5, bridge(a6, gusd, a5, a5["USD"]))).close();
+        env.tx(createBridge(a6, bridge(a6, gusd, a5, a5["USD"])), Ter(tecDUPLICATE)).close();
 
         // Test case 1 ~ 5, create bridges
-        auto const goodBridge1 = bridge(A, GUSD, B, BUSD);
-        auto const goodBridge2 = bridge(A, BUSD, C, CUSD);
-        env.tx(create_bridge(B, goodBridge1)).close();
+        auto const goodBridge1 = bridge(a, gusd, b, busd);
+        auto const goodBridge2 = bridge(a, busd, c, cusd);
+        env.tx(createBridge(b, goodBridge1)).close();
         // Issuing asset is the same, this is a duplicate
-        env.tx(create_bridge(B, bridge(A, GEUR, B, BUSD)), ter(tecDUPLICATE)).close();
-        env.tx(create_bridge(A, goodBridge2), ter(tesSUCCESS)).close();
+        env.tx(createBridge(b, bridge(a, geur, b, busd)), Ter(tecDUPLICATE)).close();
+        env.tx(createBridge(a, goodBridge2), Ter(tesSUCCESS)).close();
         // Locking asset is the same - this is a duplicate
-        env.tx(create_bridge(A, bridge(A, BUSD, B, BEUR)), ter(tecDUPLICATE)).close();
+        env.tx(createBridge(a, bridge(a, busd, b, beur)), Ter(tecDUPLICATE)).close();
         // Locking asset is USD - this is a duplicate even tho it has a
         // different issuer
-        env.tx(create_bridge(A, bridge(A, CUSD, B, BEUR)), ter(tecDUPLICATE)).close();
+        env.tx(createBridge(a, bridge(a, cusd, b, beur)), Ter(tecDUPLICATE)).close();
 
         // Test case 6 and 7, commits
-        env.tx(trust(C, BUSD(1000)))
-            .tx(trust(A, BUSD(1000)))
+        env.tx(trust(c, busd(1000)))
+            .tx(trust(a, busd(1000)))
             .close()
-            .tx(pay(B, C, BUSD(1000)))
+            .tx(pay(b, c, busd(1000)))
             .close();
-        auto const aBalanceStart = env.balance(A, BUSD);
-        auto const cBalanceStart = env.balance(C, BUSD);
-        env.tx(xchain_commit(C, goodBridge1, 1, BUSD(50))).close();
-        BEAST_EXPECT(env.balance(A, BUSD) - aBalanceStart == BUSD(0));
-        BEAST_EXPECT(env.balance(C, BUSD) - cBalanceStart == BUSD(-50));
-        env.tx(xchain_commit(C, goodBridge2, 1, BUSD(60))).close();
-        BEAST_EXPECT(env.balance(A, BUSD) - aBalanceStart == BUSD(60));
-        BEAST_EXPECT(env.balance(C, BUSD) - cBalanceStart == BUSD(-50 - 60));
+        auto const aBalanceStart = env.balance(a, busd);
+        auto const cBalanceStart = env.balance(c, busd);
+        env.tx(xchainCommit(c, goodBridge1, 1, busd(50))).close();
+        BEAST_EXPECT(env.balance(a, busd) - aBalanceStart == busd(0));
+        BEAST_EXPECT(env.balance(c, busd) - cBalanceStart == busd(-50));
+        env.tx(xchainCommit(c, goodBridge2, 1, busd(60))).close();
+        BEAST_EXPECT(env.balance(a, busd) - aBalanceStart == busd(60));
+        BEAST_EXPECT(env.balance(c, busd) - cBalanceStart == busd(-50 - 60));
 
         // bridge modify test cases
-        env.tx(bridge_modify(B, goodBridge1, XRP(33), std::nullopt)).close();
+        env.tx(bridgeModify(b, goodBridge1, XRP(33), std::nullopt)).close();
         BEAST_EXPECT((*env.bridge(goodBridge1))[sfSignatureReward] == XRP(33));
-        env.tx(bridge_modify(A, goodBridge2, XRP(44), std::nullopt)).close();
+        env.tx(bridgeModify(a, goodBridge2, XRP(44), std::nullopt)).close();
         BEAST_EXPECT((*env.bridge(goodBridge2))[sfSignatureReward] == XRP(44));
     }
 
@@ -773,11 +772,11 @@ 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::master;
+                    b = Account::kMASTER;
                     ib = xrpIssue();
                 })};
 
-        std::vector<std::pair<int, int>> expected_result{
+        std::vector<std::pair<int, int>> expectedResult{
             {temXCHAIN_BRIDGE_BAD_ISSUES, temXCHAIN_BRIDGE_BAD_ISSUES},
             {temXCHAIN_BRIDGE_BAD_ISSUES, temXCHAIN_BRIDGE_BAD_ISSUES},
             {temXCHAIN_BRIDGE_BAD_ISSUES, temXCHAIN_BRIDGE_BAD_ISSUES},
@@ -821,7 +820,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {temXCHAIN_BRIDGE_BAD_ISSUES, temXCHAIN_BRIDGE_BAD_ISSUES},
             {tesSUCCESS, tesSUCCESS}};
 
-        std::vector<std::tuple<TER, TER, bool>> test_result;
+        std::vector<std::tuple<TER, TER, bool>> testResult;
 
         auto testcase = [&](auto const& lc, auto const& ic) {
             XEnv mcEnv(*this);
@@ -833,24 +832,24 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             ic.second(mcEnv, false);
             ic.second(scEnv, true);
 
-            auto const& expected = expected_result[test_result.size()];
+            auto const& expected = expectedResult[testResult.size()];
 
-            mcEnv.tx(create_bridge(a, bridge(a, ia, b, ib)), ter(TER::fromInt(expected.first)));
-            TER const mcTER = mcEnv.env_.ter();
+            mcEnv.tx(createBridge(a, bridge(a, ia, b, ib)), Ter(TER::fromInt(expected.first)));
+            TER const mcTER = mcEnv.env.ter();
 
-            scEnv.tx(create_bridge(b, bridge(a, ia, b, ib)), ter(TER::fromInt(expected.second)));
-            TER const scTER = scEnv.env_.ter();
+            scEnv.tx(createBridge(b, bridge(a, ia, b, ib)), Ter(TER::fromInt(expected.second)));
+            TER const scTER = scEnv.env.ter();
 
             bool const pass = isTesSuccess(mcTER) && isTesSuccess(scTER);
 
-            test_result.emplace_back(mcTER, scTER, pass);
+            testResult.emplace_back(mcTER, scTER, pass);
         };
 
-        auto apply_ics = [&](auto const& lc, auto const& ics) {
+        auto applyIcs = [&](auto const& lc, auto const& ics) {
             std::apply([&](auto const&... ic) { (testcase(lc, ic), ...); }, ics);
         };
 
-        std::apply([&](auto const&... lc) { (apply_ics(lc, ics), ...); }, lcs);
+        std::apply([&](auto const&... lc) { (applyIcs(lc, ics), ...); }, lcs);
 
 #if GENERATE_MTX_OUTPUT
         // optional output of matrix results in markdown format
@@ -928,44 +927,44 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
         // Changing a non-existent bridge should fail
         XEnv(*this).tx(
-            bridge_modify(
+            bridgeModify(
                 mcAlice, bridge(mcAlice, mcGw["USD"], mcBob, mcBob["USD"]), XRP(2), std::nullopt),
-            ter(tecNO_ENTRY));
+            Ter(tecNO_ENTRY));
 
         // must change something
         // XEnv(*this)
         //    .tx(create_bridge(mcDoor, jvb, XRP(1), XRP(1)))
         //    .tx(bridge_modify(mcDoor, jvb, XRP(1), XRP(1)),
-        //    ter(temMALFORMED));
+        //    Ter(temMALFORMED));
 
         // must change something
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb, XRP(1), XRP(1)))
+            .tx(createBridge(mcDoor, jvb, XRP(1), XRP(1)))
             .close()
-            .tx(bridge_modify(mcDoor, jvb, {}, {}), ter(temMALFORMED));
+            .tx(bridgeModify(mcDoor, jvb, {}, {}), Ter(temMALFORMED));
 
         // Reward amount is non-xrp
         XEnv(*this).tx(
-            bridge_modify(mcDoor, jvb, mcUSD(2), XRP(10)), ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
+            bridgeModify(mcDoor, jvb, mcUSD(2), XRP(10)), Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
 
         // Reward amount is XRP and negative
         XEnv(*this).tx(
-            bridge_modify(mcDoor, jvb, XRP(-2), XRP(10)), ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
+            bridgeModify(mcDoor, jvb, XRP(-2), XRP(10)), Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT));
 
         // Min create amount is non-xrp
         XEnv(*this).tx(
-            bridge_modify(mcDoor, jvb, XRP(2), mcUSD(10)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            bridgeModify(mcDoor, jvb, XRP(2), mcUSD(10)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // Min create amount is zero
         XEnv(*this).tx(
-            bridge_modify(mcDoor, jvb, XRP(2), XRP(0)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            bridgeModify(mcDoor, jvb, XRP(2), XRP(0)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // Min create amount is negative
         XEnv(*this).tx(
-            bridge_modify(mcDoor, jvb, XRP(2), XRP(-10)),
-            ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
+            bridgeModify(mcDoor, jvb, XRP(2), XRP(-10)),
+            Ter(temXCHAIN_BRIDGE_BAD_MIN_ACCOUNT_CREATE_AMOUNT));
 
         // First check the regular claim process (without bridge_modify)
         for (auto withClaim : {false, true})
@@ -973,42 +972,42 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
         }
 
         // Check that the reward paid from a claim Id was the reward when
@@ -1019,48 +1018,48 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             // Now modify the reward on the bridge
-            mcEnv.tx(bridge_modify(mcDoor, jvb, XRP(2), XRP(10))).close();
-            scEnv.tx(bridge_modify(Account::master, jvb, XRP(2), XRP(10))).close();
+            mcEnv.tx(bridgeModify(mcDoor, jvb, XRP(2), XRP(10))).close();
+            scEnv.tx(bridgeModify(Account::kMASTER, jvb, XRP(2), XRP(10))).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             // make sure the reward accounts indeed received the original
             // split reward (1 split 5 ways) instead of the updated 2 XRP.
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
         }
 
         // Check that the signatures used to verify attestations and decide
@@ -1072,91 +1071,91 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             // change signers - claim should not be processed is the batch
             // is signed by original signers
-            scEnv.tx(jtx::signers(Account::master, quorum, alt_signers)).close();
+            scEnv.tx(jtx::signers(Account::kMASTER, quorum, alt_signers)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             // submit claim using outdated signers - should fail
             scEnv
                 .multiTx(
-                    claim_attestations(
+                    claimAttestations(
                         scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers),
-                    ter(tecNO_PERMISSION))
+                    Ter(tecNO_PERMISSION))
                 .close();
             if (withClaim)
             {
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, amt, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
             // make sure transfer has not happened as we sent attestations
             // using outdated signers
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
 
             // submit claim using current signers - should succeed
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, alt_signers))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             // make sure the transfer went through as we sent attestations
             // using new signers
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum, false));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum, false));
         }
 
         // coverage test: bridge_modify transaction with incorrect flag
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .close()
-            .tx(bridge_modify(mcDoor, jvb, XRP(1), XRP(2)),
-                txflags(tfFillOrKill),
-                ter(temINVALID_FLAG));
+            .tx(bridgeModify(mcDoor, jvb, XRP(1), XRP(2)),
+                Txflags(tfFillOrKill),
+                Ter(temINVALID_FLAG));
 
         // coverage test: bridge_modify transaction with xchain feature
         // disabled
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .disableFeature(featureXChainBridge)
             .close()
-            .tx(bridge_modify(mcDoor, jvb, XRP(1), XRP(2)), ter(temDISABLED));
+            .tx(bridgeModify(mcDoor, jvb, XRP(1), XRP(2)), Ter(temDISABLED));
 
         // coverage test: bridge_modify return temSIDECHAIN_NONDOOR_OWNER;
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .close()
-            .tx(bridge_modify(mcAlice, jvb, XRP(1), XRP(2)), ter(temXCHAIN_BRIDGE_NONDOOR_OWNER));
+            .tx(bridgeModify(mcAlice, jvb, XRP(1), XRP(2)), Ter(temXCHAIN_BRIDGE_NONDOOR_OWNER));
 
         /**
          * test tfClearAccountCreateAmount flag in BridgeModify tx
@@ -1165,18 +1164,18 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
          * -- XChainCreateAccountCommit tx fail after previous step
          */
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20)))
+            .tx(createBridge(mcDoor, jvb, XRP(1), XRP(20)))
             .close()
-            .tx(sidechain_xchain_account_create(mcAlice, jvb, scuAlice, XRP(100), reward))
+            .tx(sidechainXchainAccountCreate(mcAlice, jvb, scuAlice, XRP(100), reward))
             .close()
-            .tx(bridge_modify(mcDoor, jvb, {}, XRP(2)),
-                txflags(tfClearAccountCreateAmount),
-                ter(temMALFORMED))
+            .tx(bridgeModify(mcDoor, jvb, {}, XRP(2)),
+                Txflags(tfClearAccountCreateAmount),
+                Ter(temMALFORMED))
             .close()
-            .tx(bridge_modify(mcDoor, jvb, XRP(3), {}), txflags(tfClearAccountCreateAmount))
+            .tx(bridgeModify(mcDoor, jvb, XRP(3), {}), Txflags(tfClearAccountCreateAmount))
             .close()
-            .tx(sidechain_xchain_account_create(mcAlice, jvb, scuBob, XRP(100), XRP(3)),
-                ter(tecXCHAIN_CREATE_ACCOUNT_DISABLED))
+            .tx(sidechainXchainAccountCreate(mcAlice, jvb, scuBob, XRP(100), XRP(3)),
+                Ter(tecXCHAIN_CREATE_ACCOUNT_DISABLED))
             .close();
     }
 
@@ -1185,83 +1184,82 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
     {
         using namespace jtx;
         XRPAmount const res1 = reserve(1);
-        XRPAmount const tx_fee = txFee();
+        XRPAmount const fee = txFee();
 
         testcase("Create ClaimID");
 
         // normal bridge create for sanity check with the exact necessary
         // account balance
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .fund(res1, scuAlice)  // acct reserve + 1 object
             .close()
-            .tx(xchain_create_claim_id(scuAlice, jvb, reward, mcAlice))
+            .tx(xchainCreateClaimId(scuAlice, jvb, reward, mcAlice))
             .close();
 
         // check reward not deducted when claim id is created
         {
             XEnv xenv(*this, true);
 
-            Balance const scAlice_bal(xenv, scAlice);
+            test::Balance const scAliceBal(xenv, scAlice);
 
-            xenv.tx(create_bridge(Account::master, jvb))
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+            xenv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
-            BEAST_EXPECT(scAlice_bal.diff() == -tx_fee);
+            BEAST_EXPECT(scAliceBal.diff() == -fee);
         }
 
         // Non-existent bridge
         XEnv(*this, true)
-            .tx(xchain_create_claim_id(
+            .tx(xchainCreateClaimId(
                     scAlice, bridge(mcAlice, mcAlice["USD"], scBob, scBob["USD"]), reward, mcAlice),
-                ter(tecNO_ENTRY))
+                Ter(tecNO_ENTRY))
             .close();
 
         // Creating the new object would put the account below the reserve
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .fund(res1 - xrp_dust, scuAlice)  // barely not enough
             .close()
-            .tx(xchain_create_claim_id(scuAlice, jvb, reward, mcAlice),
-                ter(tecINSUFFICIENT_RESERVE))
+            .tx(xchainCreateClaimId(scuAlice, jvb, reward, mcAlice), Ter(tecINSUFFICIENT_RESERVE))
             .close();
 
         // The specified reward doesn't match the reward on the bridge (test
         // by giving the reward amount for the other side, as well as a
         // completely non-matching reward)
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .close()
-            .tx(xchain_create_claim_id(scAlice, jvb, split_reward_quorum, mcAlice),
-                ter(tecXCHAIN_REWARD_MISMATCH))
+            .tx(xchainCreateClaimId(scAlice, jvb, split_reward_quorum, mcAlice),
+                Ter(tecXCHAIN_REWARD_MISMATCH))
             .close();
 
         // A reward amount that isn't XRP
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .close()
-            .tx(xchain_create_claim_id(scAlice, jvb, mcUSD(1), mcAlice),
-                ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT))
+            .tx(xchainCreateClaimId(scAlice, jvb, mcUSD(1), mcAlice),
+                Ter(temXCHAIN_BRIDGE_BAD_REWARD_AMOUNT))
             .close();
 
         // coverage test: xchain_create_claim_id transaction with incorrect
         // flag
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .close()
-            .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice),
-                txflags(tfFillOrKill),
-                ter(temINVALID_FLAG))
+            .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice),
+                Txflags(tfFillOrKill),
+                Ter(temINVALID_FLAG))
             .close();
 
         // coverage test: xchain_create_claim_id transaction with xchain
         // feature disabled
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .disableFeature(featureXChainBridge)
             .close()
-            .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice), ter(temDISABLED))
+            .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice), Ter(temDISABLED))
             .close();
     }
 
@@ -1270,98 +1268,98 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
     {
         using namespace jtx;
         XRPAmount const res0 = reserve(0);
-        XRPAmount const tx_fee = txFee();
+        XRPAmount const fee = txFee();
 
         testcase("Commit");
 
         // Commit to a non-existent bridge
-        XEnv(*this).tx(xchain_commit(mcAlice, jvb, 1, one_xrp, scBob), ter(tecNO_ENTRY));
+        XEnv(*this).tx(xchainCommit(mcAlice, jvb, 1, one_xrp, scBob), Ter(tecNO_ENTRY));
 
         // check that reward not deducted when doing the commit
         {
             XEnv xenv(*this);
 
-            Balance const alice_bal(xenv, mcAlice);
+            test::Balance const aliceBal(xenv, mcAlice);
             auto const amt = XRP(1000);
 
-            xenv.tx(create_bridge(mcDoor, jvb))
+            xenv.tx(createBridge(mcDoor, jvb))
                 .close()
-                .tx(xchain_commit(mcAlice, jvb, 1, amt, scBob))
+                .tx(xchainCommit(mcAlice, jvb, 1, amt, scBob))
                 .close();
 
-            STAmount const claim_cost = amt;
-            BEAST_EXPECT(alice_bal.diff() == -(claim_cost + tx_fee));
+            STAmount const claimCost = amt;
+            BEAST_EXPECT(aliceBal.diff() == -(claimCost + fee));
         }
 
         // Commit a negative amount
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .close()
-            .tx(xchain_commit(mcAlice, jvb, 1, XRP(-1), scBob), ter(temBAD_AMOUNT));
+            .tx(xchainCommit(mcAlice, jvb, 1, XRP(-1), scBob), Ter(temBAD_AMOUNT));
 
         // Commit an amount whose issue that does not match the expected
         // issue on the bridge (either LockingChainIssue or
         // IssuingChainIssue, depending on the chain).
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .close()
-            .tx(xchain_commit(mcAlice, jvb, 1, mcUSD(100), scBob), ter(temBAD_ISSUER));
+            .tx(xchainCommit(mcAlice, jvb, 1, mcUSD(100), scBob), Ter(temBAD_ISSUER));
 
         // Commit an amount that would put the sender below the required
         // reserve (if XRP)
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .fund(res0 + one_xrp - xrp_dust, mcuAlice)  // barely not enough
             .close()
-            .tx(xchain_commit(mcuAlice, jvb, 1, one_xrp, scBob), ter(tecUNFUNDED_PAYMENT));
+            .tx(xchainCommit(mcuAlice, jvb, 1, one_xrp, scBob), Ter(tecUNFUNDED_PAYMENT));
 
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .fund(
                 res0 + one_xrp + xrp_dust,  // "xrp_dust" for tx fees
                 mcuAlice)                   // exactly enough => should succeed
             .close()
-            .tx(xchain_commit(mcuAlice, jvb, 1, one_xrp, scBob));
+            .tx(xchainCommit(mcuAlice, jvb, 1, one_xrp, scBob));
 
         // Commit an amount above the account's balance (for both XRP and
         // IOUs)
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .fund(res0, mcuAlice)  // barely not enough
             .close()
-            .tx(xchain_commit(mcuAlice, jvb, 1, res0 + one_xrp, scBob), ter(tecUNFUNDED_PAYMENT));
+            .tx(xchainCommit(mcuAlice, jvb, 1, res0 + one_xrp, scBob), Ter(tecUNFUNDED_PAYMENT));
 
-        auto jvb_USD = bridge(mcDoor, mcUSD, scGw, scUSD);
+        auto jvbUsd = bridge(mcDoor, mcUSD, scGw, scUSD);
 
         // commit sent from iou issuer (mcGw) succeeds - should it?
         XEnv(*this)
             .tx(trust(mcDoor, mcUSD(10000)))  // door needs to have a trustline
-            .tx(create_bridge(mcDoor, jvb_USD))
+            .tx(createBridge(mcDoor, jvbUsd))
             .close()
-            .tx(xchain_commit(mcGw, jvb_USD, 1, mcUSD(1), scBob));
+            .tx(xchainCommit(mcGw, jvbUsd, 1, mcUSD(1), scBob));
 
         // commit to a door account from the door account. This should fail.
         XEnv(*this)
             .tx(trust(mcDoor, mcUSD(10000)))  // door needs to have a trustline
-            .tx(create_bridge(mcDoor, jvb_USD))
+            .tx(createBridge(mcDoor, jvbUsd))
             .close()
-            .tx(xchain_commit(mcDoor, jvb_USD, 1, mcUSD(1), scBob), ter(tecXCHAIN_SELF_COMMIT));
+            .tx(xchainCommit(mcDoor, jvbUsd, 1, mcUSD(1), scBob), Ter(tecXCHAIN_SELF_COMMIT));
 
         // commit sent from mcAlice which has no IOU balance => should fail
         XEnv(*this)
             .tx(trust(mcDoor, mcUSD(10000)))  // door needs to have a trustline
-            .tx(create_bridge(mcDoor, jvb_USD))
+            .tx(createBridge(mcDoor, jvbUsd))
             .close()
-            .tx(xchain_commit(mcAlice, jvb_USD, 1, mcUSD(1), scBob), ter(terNO_LINE));
+            .tx(xchainCommit(mcAlice, jvbUsd, 1, mcUSD(1), scBob), Ter(terNO_LINE));
 
         // commit sent from mcAlice which has no IOU balance => should fail
         // just changed the destination to scGw (which is the door account
         // and may not make much sense)
         XEnv(*this)
             .tx(trust(mcDoor, mcUSD(10000)))  // door needs to have a trustline
-            .tx(create_bridge(mcDoor, jvb_USD))
+            .tx(createBridge(mcDoor, jvbUsd))
             .close()
-            .tx(xchain_commit(mcAlice, jvb_USD, 1, mcUSD(1), scGw), ter(terNO_LINE));
+            .tx(xchainCommit(mcAlice, jvbUsd, 1, mcUSD(1), scGw), Ter(terNO_LINE));
 
         // commit sent from mcAlice which has a IOU balance => should
         // succeed
@@ -1370,26 +1368,26 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             .tx(trust(mcAlice, mcUSD(10000)))
             .close()
             .tx(pay(mcGw, mcAlice, mcUSD(10)))
-            .tx(create_bridge(mcDoor, jvb_USD))
+            .tx(createBridge(mcDoor, jvbUsd))
             .close()
             //.tx(pay(mcAlice, mcDoor, mcUSD(10)));
-            .tx(xchain_commit(mcAlice, jvb_USD, 1, mcUSD(10), scAlice));
+            .tx(xchainCommit(mcAlice, jvbUsd, 1, mcUSD(10), scAlice));
 
         // coverage test: xchain_commit transaction with incorrect flag
         XEnv(*this)
-            .tx(create_bridge(mcDoor))
+            .tx(createBridge(mcDoor))
             .close()
-            .tx(xchain_commit(mcAlice, jvb, 1, one_xrp, scBob),
-                txflags(tfFillOrKill),
-                ter(temINVALID_FLAG));
+            .tx(xchainCommit(mcAlice, jvb, 1, one_xrp, scBob),
+                Txflags(tfFillOrKill),
+                Ter(temINVALID_FLAG));
 
         // coverage test: xchain_commit transaction with xchain feature
         // disabled
         XEnv(*this)
-            .tx(create_bridge(mcDoor))
+            .tx(createBridge(mcDoor))
             .disableFeature(featureXChainBridge)
             .close()
-            .tx(xchain_commit(mcAlice, jvb, 1, one_xrp, scBob), ter(temDISABLED));
+            .tx(xchainCommit(mcAlice, jvb, 1, one_xrp, scBob), Ter(temDISABLED));
     }
 
     void
@@ -1399,10 +1397,10 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
         testcase("Add Attestation");
         XRPAmount const res0 = reserve(0);
-        XRPAmount tx_fee = txFee();
+        XRPAmount fee = txFee();
 
         auto multiTtxFee = [&](std::uint32_t m) -> STAmount {
-            return multiply(tx_fee, STAmount(m), xrpIssue());
+            return multiply(fee, STAmount(m), xrpIssue());
         };
 
         // Add an attestation to a claim id that has already reached quorum.
@@ -1417,24 +1415,24 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
             std::uint32_t const claimID = 1;
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id present
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester,
                     jvb,
                     mcAlice,
@@ -1444,32 +1442,32 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                     claimID,
                     dst,
                     signers,
-                    UT_XCHAIN_DEFAULT_QUORUM))
+                    kUT_XCHAIN_DEFAULT_QUORUM))
                 .close();
             scEnv
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                     scAttester,
                     jvb,
                     mcAlice,
                     amt,
-                    payees[UT_XCHAIN_DEFAULT_QUORUM],
+                    payees[kUT_XCHAIN_DEFAULT_QUORUM],
                     true,
                     claimID,
                     dst,
-                    signers[UT_XCHAIN_DEFAULT_QUORUM]))
+                    signers[kUT_XCHAIN_DEFAULT_QUORUM]))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
                 BEAST_EXPECT(!scEnv.claimID(jvb, claimID));  // claim id deleted
                 BEAST_EXPECT(scEnv.claimID(jvb) == claimID);
             }
 
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_everyone));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_everyone));
         }
 
         // Test that signature weights are correctly handled. Assign
@@ -1483,14 +1481,14 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            std::uint32_t const quorum_7 = 7;
-            std::vector<signer> const signers_ = [] {
-                constexpr int numSigners = 4;
+            std::uint32_t const quorum7 = 7;
+            std::vector<Signer> const signers = [] {
+                constexpr int kNUM_SIGNERS = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
-                std::vector<signer> result;
-                result.reserve(numSigners);
-                for (int i = 0; i < numSigners; ++i)
+                std::vector<Signer> result;
+                result.reserve(kNUM_SIGNERS);
+                for (int i = 0; i < kNUM_SIGNERS; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1499,12 +1497,12 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 return result;
             }();
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum_7, signers_))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
             std::uint32_t const claimID = 1;
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id present
@@ -1512,27 +1510,27 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
 
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[0], 3, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 3, withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
-                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers_, 3))
+                .multiTx(claimAttestations(
+                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers, 3))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             BEAST_EXPECT(!scEnv.claimID(jvb, 1));  // claim id deleted
 
-            BEAST_EXPECT(transfer.has_happened(amt, divide(reward, STAmount(3), reward.asset())));
+            BEAST_EXPECT(transfer.hasHappened(amt, divide(reward, STAmount(3), reward.asset())));
         }
 
         // 4,4 => should succeed
@@ -1541,14 +1539,14 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            std::uint32_t const quorum_7 = 7;
-            std::vector<signer> const signers_ = [] {
-                constexpr int numSigners = 4;
+            std::uint32_t const quorum7 = 7;
+            std::vector<Signer> const signers = [] {
+                constexpr int kNUM_SIGNERS = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
-                std::vector<signer> result;
-                result.reserve(numSigners);
-                for (int i = 0; i < numSigners; ++i)
+                std::vector<Signer> result;
+                result.reserve(kNUM_SIGNERS);
+                for (int i = 0; i < kNUM_SIGNERS; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1556,15 +1554,14 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 }
                 return result;
             }();
-            STAmount const split_reward_ =
-                divide(reward, STAmount(signers_.size()), reward.asset());
+            STAmount const splitReward = divide(reward, STAmount(signers.size()), reward.asset());
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum_7, signers_))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
             std::uint32_t const claimID = 1;
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id present
@@ -1572,27 +1569,27 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
 
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[2], 2, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[2], 2, withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
-                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers_, 2, 2))
+                .multiTx(claimAttestations(
+                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers, 2, 2))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             BEAST_EXPECT(!scEnv.claimID(jvb, claimID));  // claim id deleted
 
-            BEAST_EXPECT(transfer.has_happened(amt, divide(reward, STAmount(2), reward.asset())));
+            BEAST_EXPECT(transfer.hasHappened(amt, divide(reward, STAmount(2), reward.asset())));
         }
 
         // 1,2 => should fail
@@ -1601,14 +1598,14 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            std::uint32_t const quorum_7 = 7;
-            std::vector<signer> const signers_ = [] {
-                constexpr int numSigners = 4;
+            std::uint32_t const quorum7 = 7;
+            std::vector<Signer> const signers = [] {
+                constexpr int kNUM_SIGNERS = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
-                std::vector<signer> result;
-                result.reserve(numSigners);
-                for (int i = 0; i < numSigners; ++i)
+                std::vector<Signer> result;
+                result.reserve(kNUM_SIGNERS);
+                for (int i = 0; i < kNUM_SIGNERS; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1617,12 +1614,12 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 return result;
             }();
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum_7, signers_))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             std::uint32_t const claimID = 1;
@@ -1630,28 +1627,28 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[0], 2, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 2, withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
-                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers_, 2))
+                .multiTx(claimAttestations(
+                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers, 2))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, amt, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id still present
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // 2,4 => should fail
@@ -1660,14 +1657,14 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            std::uint32_t const quorum_7 = 7;
-            std::vector<signer> const signers_ = [] {
-                constexpr int numSigners = 4;
+            std::uint32_t const quorum7 = 7;
+            std::vector<Signer> const signers = [] {
+                constexpr int kNUM_SIGNERS = 4;
                 std::uint32_t const weights[] = {1, 2, 4, 4};
 
-                std::vector<signer> result;
-                result.reserve(numSigners);
-                for (int i = 0; i < numSigners; ++i)
+                std::vector<Signer> result;
+                result.reserve(kNUM_SIGNERS);
+                for (int i = 0; i < kNUM_SIGNERS; ++i)
                 {
                     using namespace std::literals;
                     auto const a = Account("signer_"s + std::to_string(i));
@@ -1676,12 +1673,12 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 return result;
             }();
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum_7, signers_))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum7, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             std::uint32_t const claimID = 1;
@@ -1690,29 +1687,29 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
 
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[1], 2, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[1], 2, withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
-                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers_, 2, 1))
+                .multiTx(claimAttestations(
+                    scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers, 2, 1))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, amt, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id still present
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Confirm that account create transactions happen in the correct
@@ -1723,37 +1720,37 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
             auto const amt = XRP(1000);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
             {
-                Balance const door(mcEnv, mcDoor);
-                Balance const carol(mcEnv, mcCarol);
+                test::Balance const door(mcEnv, mcDoor);
+                test::Balance const carol(mcEnv, mcCarol);
 
-                mcEnv.tx(create_bridge(mcDoor, jvb, reward, XRP(20)))
+                mcEnv.tx(createBridge(mcDoor, jvb, reward, XRP(20)))
                     .close()
-                    .tx(sidechain_xchain_account_create(mcAlice, jvb, scuAlice, amt, reward))
-                    .tx(sidechain_xchain_account_create(mcBob, jvb, scuBob, amt, reward))
-                    .tx(sidechain_xchain_account_create(mcCarol, jvb, scuCarol, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcAlice, jvb, scuAlice, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcBob, jvb, scuBob, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuCarol, amt, reward))
                     .close();
 
                 BEAST_EXPECT(
-                    door.diff() == (multiply(amt_plus_reward, STAmount(3), xrpIssue()) - tx_fee));
-                BEAST_EXPECT(carol.diff() == -(amt + reward + tx_fee));
+                    door.diff() == (multiply(amtPlusReward, STAmount(3), xrpIssue()) - fee));
+                BEAST_EXPECT(carol.diff() == -(amt + reward + fee));
             }
 
-            scEnv.tx(create_bridge(Account::master, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::master, 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
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 2))
-                    .multiTx(att_create_acct_vec(3, amt, scuCarol, 2))
-                    .multiTx(att_create_acct_vec(2, amt, scuBob, 2))
+                scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 2))
+                    .multiTx(attCreateAcctVec(3, amt, scuCarol, 2))
+                    .multiTx(attCreateAcctVec(2, amt, scuBob, 2))
                     .close();
 
                 BEAST_EXPECT(door.diff() == STAmount(0));
@@ -1769,10 +1766,10 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // complete attestations for 2nd account create => should
                 // not complete
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(2, amt, scuBob, 3, 2)).close();
+                scEnv.multiTx(attCreateAcctVec(2, amt, scuBob, 3, 2)).close();
 
                 BEAST_EXPECT(door.diff() == STAmount(0));
                 // att_create_acct_vec return vectors of size 3, so 3 txns
@@ -1785,10 +1782,10 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // complete attestations for 3rd account create => should
                 // not complete
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(3, amt, scuCarol, 3, 2)).close();
+                scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 3, 2)).close();
 
                 BEAST_EXPECT(door.diff() == STAmount(0));
                 // att_create_acct_vec return vectors of size 3, so 3 txns
@@ -1801,12 +1798,12 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // complete attestations for 1st account create => account
                 // should be created
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 3, 1)).close();
+                scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 3, 1)).close();
 
-                BEAST_EXPECT(door.diff() == -amt_plus_reward);
+                BEAST_EXPECT(door.diff() == -amtPlusReward);
                 // att_create_acct_vec return vectors of size 3, so 3 txns
                 BEAST_EXPECT(attester.diff() == -multiTtxFee(3));
                 BEAST_EXPECT(scEnv.balance(scuAlice) == amt);
@@ -1820,10 +1817,10 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // resend attestations for 3rd account create => still
                 // should not complete
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(3, amt, scuCarol, 3, 2)).close();
+                scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 3, 2)).close();
 
                 BEAST_EXPECT(door.diff() == STAmount(0));
                 // att_create_acct_vec return vectors of size 3, so 3 txns
@@ -1837,13 +1834,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // resend attestations for 2nd account create => account
                 // should be created
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(2, amt, scuBob, 1)).close();
+                scEnv.multiTx(attCreateAcctVec(2, amt, scuBob, 1)).close();
 
-                BEAST_EXPECT(door.diff() == -amt_plus_reward);
-                BEAST_EXPECT(attester.diff() == -tx_fee);
+                BEAST_EXPECT(door.diff() == -amtPlusReward);
+                BEAST_EXPECT(attester.diff() == -fee);
                 BEAST_EXPECT(scEnv.balance(scuBob) == amt);
 
                 BEAST_EXPECT(!scEnv.caClaimID(jvb, 2));    // claim id 2 deleted
@@ -1853,13 +1850,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 // resend attestations for 3rc account create => account
                 // should be created
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
 
-                scEnv.multiTx(att_create_acct_vec(3, amt, scuCarol, 1)).close();
+                scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 1)).close();
 
-                BEAST_EXPECT(door.diff() == -amt_plus_reward);
-                BEAST_EXPECT(attester.diff() == -tx_fee);
+                BEAST_EXPECT(door.diff() == -amtPlusReward);
+                BEAST_EXPECT(attester.diff() == -fee);
                 BEAST_EXPECT(scEnv.balance(scuCarol) == amt);
 
                 BEAST_EXPECT(!scEnv.caClaimID(jvb, 3));    // claim id 3 deleted
@@ -1874,33 +1871,32 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
 
             auto const amt = res0 - XRP(1);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, reward, XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, reward, XRP(20))).close();
 
             {
-                Balance const door(mcEnv, mcDoor);
-                Balance const carol(mcEnv, mcCarol);
+                test::Balance const door(mcEnv, mcDoor);
+                test::Balance const carol(mcEnv, mcCarol);
 
-                mcEnv.tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, amt, reward))
-                    .close();
+                mcEnv.tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, amt, reward)).close();
 
-                BEAST_EXPECT(door.diff() == amt_plus_reward);
-                BEAST_EXPECT(carol.diff() == -(amt_plus_reward + tx_fee));
+                BEAST_EXPECT(door.diff() == amtPlusReward);
+                BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(create_bridge(Account::master, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close();
 
-            Balance const attester(scEnv, scAttester);
-            Balance const door(scEnv, Account::master);
+            test::Balance const attester(scEnv, scAttester);
+            test::Balance const door(scEnv, Account::kMASTER);
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 2)).close();
             BEAST_EXPECT(!!scEnv.caClaimID(jvb, 1));   // claim id present
             BEAST_EXPECT(scEnv.claimCount(jvb) == 0);  // claim count is one less
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 2, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 2, 2)).close();
             BEAST_EXPECT(!scEnv.caClaimID(jvb, 1));    // claim id deleted
             BEAST_EXPECT(scEnv.claimCount(jvb) == 1);  // claim count was incremented
 
@@ -1916,38 +1912,37 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
 
             auto const amt = XRP(111);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, reward, XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, reward, XRP(20))).close();
 
             {
-                Balance const door(mcEnv, mcDoor);
-                Balance const carol(mcEnv, mcCarol);
+                test::Balance const door(mcEnv, mcDoor);
+                test::Balance const carol(mcEnv, mcCarol);
 
-                mcEnv.tx(sidechain_xchain_account_create(mcCarol, jvb, scAlice, amt, reward))
-                    .close();
+                mcEnv.tx(sidechainXchainAccountCreate(mcCarol, jvb, scAlice, amt, reward)).close();
 
-                BEAST_EXPECT(door.diff() == amt_plus_reward);
-                BEAST_EXPECT(carol.diff() == -(amt_plus_reward + tx_fee));
+                BEAST_EXPECT(door.diff() == amtPlusReward);
+                BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(create_bridge(Account::master, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close();
 
-            Balance const attester(scEnv, scAttester);
-            Balance const door(scEnv, Account::master);
-            Balance const alice(scEnv, scAlice);
+            test::Balance const attester(scEnv, scAttester);
+            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const alice(scEnv, scAlice);
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scAlice, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2)).close();
             BEAST_EXPECT(!!scEnv.caClaimID(jvb, 1));   // claim id present
             BEAST_EXPECT(scEnv.claimCount(jvb) == 0);  // claim count is one less
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scAlice, 2, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2, 2)).close();
             BEAST_EXPECT(!scEnv.caClaimID(jvb, 1));    // claim id deleted
             BEAST_EXPECT(scEnv.claimCount(jvb) == 1);  // claim count was incremented
 
-            BEAST_EXPECT(door.diff() == -amt_plus_reward);
+            BEAST_EXPECT(door.diff() == -amtPlusReward);
             BEAST_EXPECT(attester.diff() == -multiTtxFee(4));
             BEAST_EXPECT(alice.diff() == amt);
         }
@@ -1959,35 +1954,34 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
 
             auto const amt = XRP(1000);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, reward, XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, reward, XRP(20))).close();
 
             {
-                Balance const door(mcEnv, mcDoor);
-                Balance const carol(mcEnv, mcCarol);
+                test::Balance const door(mcEnv, mcDoor);
+                test::Balance const carol(mcEnv, mcCarol);
 
-                mcEnv.tx(sidechain_xchain_account_create(mcCarol, jvb, scAlice, amt, reward))
-                    .close();
+                mcEnv.tx(sidechainXchainAccountCreate(mcCarol, jvb, scAlice, amt, reward)).close();
 
-                BEAST_EXPECT(door.diff() == amt_plus_reward);
-                BEAST_EXPECT(carol.diff() == -(amt_plus_reward + tx_fee));
+                BEAST_EXPECT(door.diff() == amtPlusReward);
+                BEAST_EXPECT(carol.diff() == -(amtPlusReward + fee));
             }
 
-            scEnv.tx(create_bridge(Account::master, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::master, 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();
 
-            Balance const attester(scEnv, scAttester);
-            Balance const door(scEnv, Account::master);
-            Balance const alice(scEnv, scAlice);
+            test::Balance const attester(scEnv, scAttester);
+            test::Balance const door(scEnv, Account::kMASTER);
+            test::Balance const alice(scEnv, scAlice);
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scAlice, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2)).close();
             BEAST_EXPECT(!!scEnv.caClaimID(jvb, 1));   // claim id present
             BEAST_EXPECT(scEnv.claimCount(jvb) == 0);  // claim count is one less
 
-            scEnv.multiTx(att_create_acct_vec(1, amt, scAlice, 2, 2)).close();
+            scEnv.multiTx(attCreateAcctVec(1, amt, scAlice, 2, 2)).close();
             BEAST_EXPECT(!scEnv.caClaimID(jvb, 1));    // claim id deleted
             BEAST_EXPECT(scEnv.claimCount(jvb) == 1);  // claim count was incremented
 
@@ -2005,42 +1999,42 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
             auto const amt = XRP(1000);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
             {
-                Balance const door(mcEnv, mcDoor);
-                Balance const carol(mcEnv, mcCarol);
+                test::Balance const door(mcEnv, mcDoor);
+                test::Balance const carol(mcEnv, mcCarol);
 
-                mcEnv.tx(create_bridge(mcDoor, jvb, reward, XRP(20)))
+                mcEnv.tx(createBridge(mcDoor, jvb, reward, XRP(20)))
                     .close()
-                    .tx(sidechain_xchain_account_create(mcAlice, jvb, scuAlice, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcAlice, jvb, scuAlice, amt, reward))
                     .close()  // make sure Alice gets claim #1
-                    .tx(sidechain_xchain_account_create(mcBob, jvb, scuBob, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcBob, jvb, scuBob, amt, reward))
                     .close()  // make sure Bob gets claim #2
-                    .tx(sidechain_xchain_account_create(mcCarol, jvb, scuCarol, amt, reward))
+                    .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuCarol, amt, reward))
                     .close();  // and Carol will get claim #3
 
                 BEAST_EXPECT(
-                    door.diff() == (multiply(amt_plus_reward, STAmount(3), xrpIssue()) - tx_fee));
-                BEAST_EXPECT(carol.diff() == -(amt + reward + tx_fee));
+                    door.diff() == (multiply(amtPlusReward, STAmount(3), xrpIssue()) - fee));
+                BEAST_EXPECT(carol.diff() == -(amt + reward + fee));
             }
 
-            std::uint32_t const red_quorum = 2;
-            scEnv.tx(create_bridge(Account::master, jvb, reward, XRP(20)))
-                .tx(jtx::signers(Account::master, red_quorum, signers))
+            std::uint32_t const redQuorum = 2;
+            scEnv.tx(createBridge(Account::kMASTER, jvb, reward, XRP(20)))
+                .tx(jtx::signers(Account::kMASTER, redQuorum, signers))
                 .close();
 
             {
-                Balance const attester(scEnv, scAttester);
-                Balance const door(scEnv, Account::master);
-                auto const bad_amt = XRP(10);
+                test::Balance const attester(scEnv, scAttester);
+                test::Balance const door(scEnv, Account::kMASTER);
+                auto const badAmt = XRP(10);
                 std::uint32_t txCount = 0;
 
                 // send attestations with incorrect amounts to for all 3
                 // AccountCreate. They will be replaced later
-                scEnv.multiTx(att_create_acct_vec(1, bad_amt, scuAlice, 1))
-                    .multiTx(att_create_acct_vec(2, bad_amt, scuBob, 1, 2))
-                    .multiTx(att_create_acct_vec(3, bad_amt, scuCarol, 1, 1))
+                scEnv.multiTx(attCreateAcctVec(1, badAmt, scuAlice, 1))
+                    .multiTx(attCreateAcctVec(2, badAmt, scuBob, 1, 2))
+                    .multiTx(attCreateAcctVec(3, badAmt, scuCarol, 1, 1))
                     .close();
                 txCount += 3;
 
@@ -2052,9 +2046,9 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 // batch, the transaction errors.
 
                 // from now on we send correct attestations
-                scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 1, 0))
-                    .multiTx(att_create_acct_vec(2, amt, scuBob, 1, 2))
-                    .multiTx(att_create_acct_vec(3, amt, scuCarol, 1, 4))
+                scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 1, 0))
+                    .multiTx(attCreateAcctVec(2, amt, scuBob, 1, 2))
+                    .multiTx(attCreateAcctVec(3, amt, scuCarol, 1, 4))
                     .close();
                 txCount += 3;
 
@@ -2063,22 +2057,22 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 BEAST_EXPECTS(!!scEnv.caClaimID(jvb, 3), "claim id 3 still there");
                 BEAST_EXPECTS(scEnv.claimCount(jvb) == 0, "No account created yet");
 
-                scEnv.multiTx(att_create_acct_vec(3, amt, scuCarol, 1, 1)).close();
+                scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 1, 1)).close();
                 txCount += 1;
 
                 BEAST_EXPECTS(!!scEnv.caClaimID(jvb, 3), "claim id 3 still there");
                 BEAST_EXPECTS(scEnv.claimCount(jvb) == 0, "No account created yet");
 
-                scEnv.multiTx(att_create_acct_vec(1, amt, scuAlice, 1, 2)).close();
+                scEnv.multiTx(attCreateAcctVec(1, amt, scuAlice, 1, 2)).close();
                 txCount += 1;
 
                 BEAST_EXPECTS(!scEnv.caClaimID(jvb, 1), "claim id 1 deleted");
                 BEAST_EXPECTS(scEnv.claimCount(jvb) == 1, "scuAlice created");
 
-                scEnv.multiTx(att_create_acct_vec(2, amt, scuBob, 1, 3))
+                scEnv.multiTx(attCreateAcctVec(2, amt, scuBob, 1, 3))
                     .multiTx(
-                        att_create_acct_vec(1, amt, scuAlice, 1, 3),
-                        ter(tecXCHAIN_ACCOUNT_CREATE_PAST))
+                        attCreateAcctVec(1, amt, scuAlice, 1, 3),
+                        Ter(tecXCHAIN_ACCOUNT_CREATE_PAST))
                     .close();
                 txCount += 2;
 
@@ -2086,7 +2080,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 BEAST_EXPECTS(!scEnv.caClaimID(jvb, 1), "claim id 1 not added");
                 BEAST_EXPECTS(scEnv.claimCount(jvb) == 2, "scuAlice & scuBob created");
 
-                scEnv.multiTx(att_create_acct_vec(3, amt, scuCarol, 1, 0)).close();
+                scEnv.multiTx(attCreateAcctVec(3, amt, scuCarol, 1, 0)).close();
                 txCount += 1;
 
                 BEAST_EXPECTS(!scEnv.caClaimID(jvb, 3), "claim id 3 deleted");
@@ -2096,7 +2090,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 // sometimes a couple drops are left over unspent in the
                 // door account (here 2 drops)
                 BEAST_EXPECT(
-                    multiply(amt_plus_reward, STAmount(3), xrpIssue()) + door.diff() < drops(3));
+                    multiply(amtPlusReward, STAmount(3), xrpIssue()) + door.diff() < drops(3));
                 BEAST_EXPECT(attester.diff() == -multiTtxFee(txCount));
                 BEAST_EXPECT(scEnv.balance(scuAlice) == amt);
                 BEAST_EXPECT(scEnv.balance(scuBob) == amt);
@@ -2111,13 +2105,13 @@ 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(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                         scAttester, jvb, mcAlice, XRP(1000), payees[0], true, 1, {}, signers[0]),
-                    txflags(tfFillOrKill),
-                    ter(temINVALID_FLAG))
+                    Txflags(tfFillOrKill),
+                    Ter(temINVALID_FLAG))
                 .close();
         }
 
@@ -2125,13 +2119,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         // disabled
         {
             XEnv scEnv(*this, true);
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .disableFeature(featureXChainBridge)
                 .close()
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                         scAttester, jvb, mcAlice, XRP(1000), payees[0], true, 1, {}, signers[0]),
-                    ter(temDISABLED))
+                    Ter(temDISABLED))
                 .close();
         }
     }
@@ -2148,47 +2142,47 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv scEnv(*this, true);
             std::uint32_t const claimID = 1;
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             BEAST_EXPECT(!!scEnv.claimID(jvb, claimID));  // claim id present
 
             Account const dst{scBob};
             auto const amt = XRP(1000);
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            auto const dstStartBalance = scEnv.env_.balance(dst);
+            auto const dstStartBalance = scEnv.env.balance(dst);
 
             for (int i = 0; i < signers.size(); ++i)
             {
-                auto const att = claim_attestation(
+                auto const att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[i], true, claimID, dst, signers[i]);
 
                 TER const expectedTER = i < quorum ? tesSUCCESS : TER{tecXCHAIN_NO_CLAIM_ID};
                 if (i + 1 == quorum)
                 {
-                    scEnv.tx(att, ter(expectedTER)).close();
+                    scEnv.tx(att, Ter(expectedTER)).close();
                 }
                 else
                 {
-                    scEnv.tx(att, ter(expectedTER)).close();
+                    scEnv.tx(att, Ter(expectedTER)).close();
                 }
 
                 if (i + 1 < quorum)
                 {
-                    BEAST_EXPECT(dstStartBalance == scEnv.env_.balance(dst));
+                    BEAST_EXPECT(dstStartBalance == scEnv.env.balance(dst));
                 }
                 else
                 {
-                    BEAST_EXPECT(dstStartBalance + amt == scEnv.env_.balance(dst));
+                    BEAST_EXPECT(dstStartBalance + amt == scEnv.env.balance(dst));
                 }
             }
-            BEAST_EXPECT(dstStartBalance + amt == scEnv.env_.balance(dst));
+            BEAST_EXPECT(dstStartBalance + amt == scEnv.env.balance(dst));
         }
 
         {
@@ -2213,24 +2207,24 @@ 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 < UT_XCHAIN_DEFAULT_NUM_SIGNERS - 2; ++i)
+            for (auto i = 0; i < kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 2; ++i)
                 scEnv.fund(amt, alt_signers[i].account);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, alt_signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, alt_signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             Account const dst{scBob};
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
-            auto const dstStartBalance = scEnv.env_.balance(dst);
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
+            auto const dstStartBalance = scEnv.env.balance(dst);
 
             {
                 // G1: master key
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, alt_signers[0]);
                 scEnv.tx(att).close();
             }
@@ -2239,7 +2233,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 // alt_signers[0] is the regular key of alt_signers[1]
                 // There should be 2 attestations after the transaction
                 scEnv.tx(jtx::regkey(alt_signers[1].account, alt_signers[0].account)).close();
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[1], true, claimID, dst, alt_signers[0]);
                 att[sfAttestationSignerAccount.getJsonName()] = alt_signers[1].account.human();
                 scEnv.tx(att).close();
@@ -2247,28 +2241,28 @@ 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[UT_XCHAIN_DEFAULT_NUM_SIGNERS - 1];
-                auto const unfundedSigner2 = alt_signers[UT_XCHAIN_DEFAULT_NUM_SIGNERS - 2];
-                auto att = claim_attestation(
+                auto const unfundedSigner1 = alt_signers[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 1];
+                auto const unfundedSigner2 = alt_signers[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 2];
+                auto att = claimAttestation(
                     scAttester,
                     jvb,
                     mcAlice,
                     amt,
-                    payees[UT_XCHAIN_DEFAULT_NUM_SIGNERS - 1],
+                    payees[kUT_XCHAIN_DEFAULT_NUM_SIGNERS - 1],
                     true,
                     claimID,
                     dst,
                     unfundedSigner1);
                 att[sfAttestationSignerAccount.getJsonName()] = unfundedSigner2.account.human();
-                scEnv.tx(att, ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
+                scEnv.tx(att, Ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
                 att[sfAttestationSignerAccount.getJsonName()] = unfundedSigner1.account.human();
                 scEnv.tx(att).close();
             }
             {
                 // B2: single item signer list
-                std::vector<signer> tempSignerList = {signers[0]};
+                std::vector<Signer> tempSignerList = {signers[0]};
                 scEnv.tx(jtx::signers(alt_signers[2].account, 1, tempSignerList));
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester,
                     jvb,
                     mcAlice,
@@ -2279,32 +2273,32 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                     dst,
                     tempSignerList.front());
                 att[sfAttestationSignerAccount.getJsonName()] = alt_signers[2].account.human();
-                scEnv.tx(att, ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
+                scEnv.tx(att, Ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
             }
             {
                 // B1: disabled master key
                 scEnv.tx(fset(alt_signers[2].account, asfDisableMaster, 0)).close();
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[2], true, claimID, dst, alt_signers[2]);
-                scEnv.tx(att, ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
+                scEnv.tx(att, Ter(tecXCHAIN_BAD_PUBLIC_KEY_ACCOUNT_PAIR)).close();
             }
             {
                 // --B4: not on signer list
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, signers[0]);
-                scEnv.tx(att, ter(tecNO_PERMISSION)).close();
+                scEnv.tx(att, Ter(tecNO_PERMISSION)).close();
             }
             {
                 // --B5: missing sfAttestationSignerAccount field
                 // Then submit the one with the field. Should reach quorum.
-                auto att = claim_attestation(
+                auto att = claimAttestation(
                     scAttester, jvb, mcAlice, amt, payees[3], true, claimID, dst, alt_signers[3]);
                 att.removeMember(sfAttestationSignerAccount.getJsonName());
-                scEnv.tx(att, ter(temMALFORMED)).close();
-                BEAST_EXPECT(dstStartBalance == scEnv.env_.balance(dst));
+                scEnv.tx(att, Ter(temMALFORMED)).close();
+                BEAST_EXPECT(dstStartBalance == scEnv.env.balance(dst));
                 att[sfAttestationSignerAccount.getJsonName()] = alt_signers[3].account.human();
                 scEnv.tx(att).close();
-                BEAST_EXPECT(dstStartBalance + amt == scEnv.env_.balance(dst));
+                BEAST_EXPECT(dstStartBalance + amt == scEnv.env.balance(dst));
             }
         }
     }
@@ -2319,7 +2313,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         XEnv mcEnv(*this);
         XEnv scEnv(*this, true);
 
-        XRPAmount const tx_fee = mcEnv.txFee();
+        XRPAmount const txFee = mcEnv.txFee();
 
         Account const a{"a"};
         Account const doorA{"doorA"};
@@ -2330,58 +2324,58 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
         Account const ua{"ua"};  // unfunded account we want to create
 
-        BridgeDef xrp_b{
+        BridgeDef xrpB{
             .doorA = doorA,
             .issueA = xrpIssue(),
-            .doorB = Account::master,
+            .doorB = Account::kMASTER,
             .issueB = xrpIssue(),
             .reward = XRP(1),             // reward
             .minAccountCreate = XRP(20),  // minAccountCreate
             .quorum = 4,                  // quorum
             .signers = signers,
-            .jvb = Json::nullValue};
+            .jvb = json::NullValue};
 
-        xrp_b.initBridge(mcEnv, scEnv);
+        xrpB.initBridge(mcEnv, scEnv);
 
         auto const amt = XRP(777);
-        auto const amt_plus_reward = amt + xrp_b.reward;
+        auto const amtPlusReward = amt + xrpB.reward;
         {
-            Balance const bal_doorA(mcEnv, doorA);
-            Balance const bal_a(mcEnv, a);
+            test::Balance const balDoorA(mcEnv, doorA);
+            test::Balance const balA(mcEnv, a);
 
-            mcEnv.tx(sidechain_xchain_account_create(a, xrp_b.jvb, ua, amt, xrp_b.reward)).close();
+            mcEnv.tx(sidechainXchainAccountCreate(a, xrpB.jvb, ua, amt, xrpB.reward)).close();
 
-            BEAST_EXPECT(bal_doorA.diff() == amt_plus_reward);
-            BEAST_EXPECT(bal_a.diff() == -(amt_plus_reward + tx_fee));
+            BEAST_EXPECT(balDoorA.diff() == amtPlusReward);
+            BEAST_EXPECT(balA.diff() == -(amtPlusReward + txFee));
         }
 
         for (int i = 0; i < signers.size(); ++i)
         {
-            auto const att = create_account_attestation(
+            auto const att = createAccountAttestation(
                 signers[0].account,
-                xrp_b.jvb,
+                xrpB.jvb,
                 a,
                 amt,
-                xrp_b.reward,
+                xrpB.reward,
                 signers[i].account,
                 true,
                 1,
                 ua,
                 signers[i]);
             TER const expectedTER =
-                i < xrp_b.quorum ? tesSUCCESS : TER{tecXCHAIN_ACCOUNT_CREATE_PAST};
+                i < xrpB.quorum ? tesSUCCESS : TER{tecXCHAIN_ACCOUNT_CREATE_PAST};
 
-            scEnv.tx(att, ter(expectedTER)).close();
-            if (i + 1 < xrp_b.quorum)
+            scEnv.tx(att, Ter(expectedTER)).close();
+            if (i + 1 < xrpB.quorum)
             {
-                BEAST_EXPECT(!scEnv.env_.le(ua));
+                BEAST_EXPECT(!scEnv.env.le(ua));
             }
             else
             {
-                BEAST_EXPECT(scEnv.env_.le(ua));
+                BEAST_EXPECT(scEnv.env.le(ua));
             }
         }
-        BEAST_EXPECT(scEnv.env_.le(ua));
+        BEAST_EXPECT(scEnv.env.le(ua));
     }
 
     void
@@ -2390,7 +2384,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         using namespace jtx;
 
         XRPAmount const res0 = reserve(0);
-        XRPAmount const tx_fee = txFee();
+        XRPAmount const fee = txFee();
 
         testcase("Claim");
 
@@ -2403,41 +2397,41 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
         }
 
         // Claim with just one attestation signed by the Master key
@@ -2448,39 +2442,31 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
             scEnv
-                .tx(create_bridge(Account::master, jvb))
-                //.tx(jtx::signers(Account::master, quorum, signers))
+                .tx(createBridge(Account::kMASTER, jvb))
+                //.tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[0], 1, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 1, withClaim);
 
-            jtx::signer const master_signer(Account::master);
+            jtx::Signer const masterSigner(Account::kMASTER);
             scEnv
-                .tx(claim_attestation(
-                        scAttester,
-                        jvb,
-                        mcAlice,
-                        amt,
-                        payees[0],
-                        true,
-                        claimID,
-                        dst,
-                        master_signer),
-                    ter(tecXCHAIN_NO_SIGNERS_LIST))
+                .tx(claimAttestation(
+                        scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, masterSigner),
+                    Ter(tecXCHAIN_NO_SIGNERS_LIST))
                 .close();
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim with just one attestation signed by a regular key
@@ -2492,40 +2478,32 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
             scEnv
-                .tx(create_bridge(Account::master, jvb))
-                //.tx(jtx::signers(Account::master, quorum, signers))
-                .tx(jtx::regkey(Account::master, payees[0]))
+                .tx(createBridge(Account::kMASTER, jvb))
+                //.tx(jtx::signers(Account::kMASTER, quorum, signers))
+                .tx(jtx::regkey(Account::kMASTER, payees[0]))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
-                scEnv, Account::master, scBob, scAlice, &payees[0], 1, withClaim);
+                scEnv, Account::kMASTER, scBob, scAlice, &payees[0], 1, withClaim);
 
-            jtx::signer const master_signer(payees[0]);
+            jtx::Signer const masterSigner(payees[0]);
             scEnv
-                .tx(claim_attestation(
-                        scAttester,
-                        jvb,
-                        mcAlice,
-                        amt,
-                        payees[0],
-                        true,
-                        claimID,
-                        dst,
-                        master_signer),
-                    ter(tecXCHAIN_NO_SIGNERS_LIST))
+                .tx(claimAttestation(
+                        scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, masterSigner),
+                    Ter(tecXCHAIN_NO_SIGNERS_LIST))
                 .close();
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim against non-existent bridge
@@ -2535,27 +2513,27 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            auto jvb_unknown = bridge(mcBob, xrpIssue(), Account::master, xrpIssue());
+            auto jvbUnknown = bridge(mcBob, xrpIssue(), Account::kMASTER, xrpIssue());
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb_unknown, reward, mcAlice), ter(tecNO_ENTRY))
+                .tx(xchainCreateClaimId(scAlice, jvbUnknown, reward, mcAlice), Ter(tecNO_ENTRY))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb_unknown, claimID, amt, dst), ter(tecNO_ENTRY))
+            mcEnv.tx(xchainCommit(mcAlice, jvbUnknown, claimID, amt, dst), Ter(tecNO_ENTRY))
                 .close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
             scEnv
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                         scAttester,
-                        jvb_unknown,
+                        jvbUnknown,
                         mcAlice,
                         amt,
                         payees[0],
@@ -2563,19 +2541,19 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                         claimID,
                         dst,
                         signers[0]),
-                    ter(tecNO_ENTRY))
+                    Ter(tecNO_ENTRY))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb_unknown, claimID, amt, scBob), ter(tecNO_ENTRY))
+                scEnv.tx(xchainClaim(scAlice, jvbUnknown, claimID, amt, scBob), Ter(tecNO_ENTRY))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim against non-existent claim id
@@ -2585,37 +2563,37 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
 
             // attest using non-existent claim id
             scEnv
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                         scAttester, jvb, mcAlice, amt, payees[0], true, 999, dst, signers[0]),
-                    ter(tecXCHAIN_NO_CLAIM_ID))
+                    Ter(tecXCHAIN_NO_CLAIM_ID))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // claim using non-existent claim id
-                scEnv.tx(xchain_claim(scAlice, jvb, 999, amt, scBob), ter(tecXCHAIN_NO_CLAIM_ID))
+                scEnv.tx(xchainClaim(scAlice, jvb, 999, amt, scBob), Ter(tecXCHAIN_NO_CLAIM_ID))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim against a claim id owned by another account
@@ -2625,45 +2603,45 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // submit a claim transaction with the wrong account (scGw
                 // instead of scAlice)
-                scEnv.tx(xchain_claim(scGw, jvb, claimID, amt, scBob), ter(tecXCHAIN_BAD_CLAIM_ID))
+                scEnv.tx(xchainClaim(scGw, jvb, claimID, amt, scBob), Ter(tecXCHAIN_BAD_CLAIM_ID))
                     .close();
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
             }
             else
             {
-                BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+                BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
             }
         }
 
@@ -2674,35 +2652,35 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
 
             // don't send any attestations
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, amt, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim against a claim id with attestations, but not enough to
@@ -2713,38 +2691,38 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
 
             auto tooFew = quorum - 1;
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers, tooFew))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, amt, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim id of zero
@@ -2754,37 +2732,36 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scAlice, payees, withClaim);
 
             scEnv
                 .multiTx(
-                    claim_attestations(
-                        scAttester, jvb, mcAlice, amt, payees, true, 0, dst, signers),
-                    ter(tecXCHAIN_NO_CLAIM_ID))
+                    claimAttestations(scAttester, jvb, mcAlice, amt, payees, true, 0, dst, signers),
+                    Ter(tecXCHAIN_NO_CLAIM_ID))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, 0, amt, scBob), ter(tecXCHAIN_NO_CLAIM_ID))
+                scEnv.tx(xchainClaim(scAlice, jvb, 0, amt, scBob), Ter(tecXCHAIN_NO_CLAIM_ID))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim issue that does not match the expected issue on the bridge
@@ -2797,44 +2774,43 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, scUSD(1000), scBob), ter(temBAD_AMOUNT))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, scUSD(1000), scBob), Ter(temBAD_AMOUNT))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim to a destination that does not already exist on the chain
@@ -2844,41 +2820,41 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scuBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             scEnv
-                .multiTx(claim_attestations(
+                .multiTx(claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scuBob), ter(tecNO_DST)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scuBob), Ter(tecNO_DST)).close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim where the claim id owner does not have enough XRP to pay
@@ -2889,47 +2865,47 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
-            STAmount const huge_reward{XRP(20000)};
-            BEAST_EXPECT(huge_reward > scEnv.balance(scAlice));
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
+            STAmount const hugeReward{XRP(20000)};
+            BEAST_EXPECT(hugeReward > scEnv.balance(scAlice));
 
-            scEnv.tx(create_bridge(Account::master, jvb, huge_reward))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb, hugeReward))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, huge_reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, hugeReward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
 
             if (withClaim)
             {
                 scEnv
-                    .multiTx(claim_attestations(
+                    .multiTx(claimAttestations(
                         scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers))
                     .close();
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecUNFUNDED_PAYMENT))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecUNFUNDED_PAYMENT))
                     .close();
             }
             else
             {
-                auto txns = claim_attestations(
+                auto txns = claimAttestations(
                     scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-                for (int i = 0; i < UT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+                for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
                 {
                     scEnv.tx(txns[i]).close();
                 }
@@ -2938,11 +2914,11 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 // The attestation should succeed, because it adds an
                 // attestation, but the claim should fail with insufficient
                 // funds
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecUNFUNDED_PAYMENT))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecUNFUNDED_PAYMENT))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Claim where the claim id owner has enough XRP to pay the reward,
@@ -2953,42 +2929,41 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, 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
                 .close()
-                .tx(xchain_create_claim_id(scuAlice, jvb, reward, mcAlice),
-                    ter(tecINSUFFICIENT_RESERVE))
+                .tx(xchainCreateClaimId(scuAlice, jvb, reward, mcAlice),
+                    Ter(tecINSUFFICIENT_RESERVE))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
-            BalanceTransfer transfer(scEnv, Account::master, scBob, scuAlice, payees, withClaim);
+            BalanceTransfer transfer(scEnv, Account::kMASTER, scBob, scuAlice, payees, withClaim);
 
             scEnv
-                .tx(claim_attestation(
+                .tx(claimAttestation(
                         scAttester, jvb, mcAlice, amt, payees[0], true, claimID, dst, signers[0]),
-                    ter(tecXCHAIN_NO_CLAIM_ID))
+                    Ter(tecXCHAIN_NO_CLAIM_ID))
                 .close();
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
                 scEnv
-                    .tx(xchain_claim(scuAlice, jvb, claimID, amt, scBob),
-                        ter(tecXCHAIN_NO_CLAIM_ID))
+                    .tx(xchainClaim(scuAlice, jvb, claimID, amt, scBob), Ter(tecXCHAIN_NO_CLAIM_ID))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Pay to an account with deposit auth set
@@ -2998,31 +2973,31 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .tx(fset("scBob", asfDepositAuth))  // set deposit auth
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
-            auto txns = claim_attestations(
+            auto txns = claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-            for (int i = 0; i < UT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+            for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
             {
                 scEnv.tx(txns[i]).close();
             }
@@ -3030,23 +3005,23 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             {
                 scEnv.tx(txns.back()).close();
 
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecNO_PERMISSION))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecNO_PERMISSION))
                     .close();
 
                 // the transfer failed, but check that we can still use the
                 // claimID with a different account
-                Balance const scCarol_bal(scEnv, scCarol);
+                test::Balance const scCarolBal(scEnv, scCarol);
 
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scCarol)).close();
-                BEAST_EXPECT(scCarol_bal.diff() == amt);
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scCarol)).close();
+                BEAST_EXPECT(scCarolBal.diff() == amt);
             }
             else
             {
                 scEnv.tx(txns.back()).close();
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecNO_PERMISSION))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecNO_PERMISSION))
                     .close();
                 // A way would be to remove deposit auth and resubmit the
                 // attestations (even though the witness servers won't do
@@ -3055,9 +3030,9 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                     .tx(fset("scBob", 0, asfDepositAuth))  // clear deposit auth
                     .close();
 
-                Balance const scBob_bal(scEnv, scBob);
+                test::Balance const scBobBal(scEnv, scBob);
                 scEnv.tx(txns.back()).close();
-                BEAST_EXPECT(scBob_bal.diff() == amt);
+                BEAST_EXPECT(scBobBal.diff() == amt);
             }
         }
 
@@ -3068,54 +3043,54 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .tx(fset("scBob", asfRequireDest))  // set dest tag
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
-            auto txns = claim_attestations(
+            auto txns = claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers);
-            for (int i = 0; i < UT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
+            for (int i = 0; i < kUT_XCHAIN_DEFAULT_QUORUM - 1; ++i)
             {
                 scEnv.tx(txns[i]).close();
             }
             if (withClaim)
             {
                 scEnv.tx(txns.back()).close();
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecDST_TAG_NEEDED))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecDST_TAG_NEEDED))
                     .close();
 
                 // the transfer failed, but check that we can still use the
                 // claimID with a different account
-                Balance const scCarol_bal(scEnv, scCarol);
+                test::Balance const scCarolBal(scEnv, scCarol);
 
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scCarol)).close();
-                BEAST_EXPECT(scCarol_bal.diff() == amt);
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scCarol)).close();
+                BEAST_EXPECT(scCarolBal.diff() == amt);
             }
             else
             {
                 scEnv.tx(txns.back()).close();
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob), ter(tecDST_TAG_NEEDED))
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob), Ter(tecDST_TAG_NEEDED))
                     .close();
                 // A way would be to remove the destination tag requirement
                 // and resubmit the attestations (even though the witness
@@ -3124,10 +3099,10 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                     .tx(fset("scBob", 0, asfRequireDest))  // clear dest tag
                     .close();
 
-                Balance const scBob_bal(scEnv, scBob);
+                test::Balance const scBobBal(scEnv, scBob);
 
                 scEnv.tx(txns.back()).close();
-                BEAST_EXPECT(scBob_bal.diff() == amt);
+                BEAST_EXPECT(scBobBal.diff() == amt);
             }
         }
 
@@ -3139,34 +3114,34 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .tx(fset("scBob", asfDepositAuth))  // set deposit auth
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             // we should be able to submit the attestations, but the transfer
             // should not occur because dest account has deposit auth set
-            Balance const scBob_bal(scEnv, scBob);
+            test::Balance const scBobBal(scEnv, scBob);
 
-            scEnv.multiTx(claim_attestations(
+            scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
-            BEAST_EXPECT(scBob_bal.diff() == STAmount(0));
+            BEAST_EXPECT(scBobBal.diff() == STAmount(0));
 
             // Check that check that we still can use the claimID to transfer
             // the amount to a different account
-            Balance const scCarol_bal(scEnv, scCarol);
+            test::Balance const scCarolBal(scEnv, scCarol);
 
-            scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scCarol)).close();
-            BEAST_EXPECT(scCarol_bal.diff() == amt);
+            scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scCarol)).close();
+            BEAST_EXPECT(scCarolBal.diff() == amt);
         }
 
         // Claim where the amount different from what is attested to
@@ -3176,41 +3151,41 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
-            scEnv.multiTx(claim_attestations(
+            scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // claim wrong amount
                 scEnv
-                    .tx(xchain_claim(scAlice, jvb, claimID, one_xrp, scBob),
-                        ter(tecXCHAIN_CLAIM_NO_QUORUM))
+                    .tx(xchainClaim(scAlice, jvb, claimID, one_xrp, scBob),
+                        Ter(tecXCHAIN_CLAIM_NO_QUORUM))
                     .close();
             }
 
-            BEAST_EXPECT(transfer.has_not_happened());
+            BEAST_EXPECT(transfer.hasNotHappened());
         }
 
         // Verify that rewards are paid from the account that owns the claim
@@ -3221,44 +3196,44 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
-            Balance const scAlice_bal(scEnv, scAlice);
-            scEnv.multiTx(claim_attestations(
+            test::Balance const scAliceBal(scEnv, scAlice);
+            scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
 
-            STAmount claim_cost = reward;
+            STAmount claimCost = reward;
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
-                claim_cost += tx_fee;
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
+                claimCost += fee;
             }
 
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
-            BEAST_EXPECT(scAlice_bal.diff() == -claim_cost);  // because reward % 4 == 0
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
+            BEAST_EXPECT(scAliceBal.diff() == -claimCost);  // because reward % 4 == 0
         }
 
         // Verify that if a reward is not evenly divisible among the reward
@@ -3269,43 +3244,43 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, tiny_reward)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, tiny_reward)).close();
 
-            scEnv.tx(create_bridge(Account::master, jvb, tiny_reward))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb, tiny_reward))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, tiny_reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, tiny_reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM,
+                kUT_XCHAIN_DEFAULT_QUORUM,
                 withClaim);
-            Balance const scAlice_bal(scEnv, scAlice);
-            scEnv.multiTx(claim_attestations(
+            test::Balance const scAliceBal(scEnv, scAlice);
+            scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
-            STAmount claim_cost = tiny_reward;
+            STAmount claimCost = tiny_reward;
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
-                claim_cost += tx_fee;
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
+                claimCost += fee;
             }
 
-            BEAST_EXPECT(transfer.has_happened(amt, tiny_reward_split));
-            BEAST_EXPECT(scAlice_bal.diff() == -(claim_cost - tiny_reward_remainder));
+            BEAST_EXPECT(transfer.hasHappened(amt, tiny_reward_split));
+            BEAST_EXPECT(scAliceBal.diff() == -(claimCost - tiny_reward_remainder));
         }
 
         // If a reward distribution fails for one of the reward accounts
@@ -3318,45 +3293,45 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
+            mcEnv.tx(createBridge(mcDoor, jvb)).close();
 
-            std::vector<Account> alt_payees{payees.begin(), payees.end() - 1};
-            alt_payees.back() = Account("inexistent");
+            std::vector<Account> altPayees{payees.begin(), payees.end() - 1};
+            altPayees.back() = Account("inexistent");
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM - 1,
+                kUT_XCHAIN_DEFAULT_QUORUM - 1,
                 withClaim);
-            scEnv.multiTx(claim_attestations(
-                scAttester, jvb, mcAlice, amt, alt_payees, true, claimID, dst, signers));
+            scEnv.multiTx(claimAttestations(
+                scAttester, jvb, mcAlice, amt, altPayees, true, claimID, dst, signers));
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             // this also checks that only 3 * split_reward was deducted from
             // scAlice (the payer account), since we passed alt_payees to
             // BalanceTransfer
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
         }
 
         for (auto withClaim : {false, true})
@@ -3364,77 +3339,77 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
             XEnv mcEnv(*this);
             XEnv scEnv(*this, true);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb)).close();
-            auto& unpaid = payees[UT_XCHAIN_DEFAULT_QUORUM - 1];
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            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))
                 .tx(fset(unpaid, asfDepositAuth))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             auto dst(withClaim ? std::nullopt : std::optional<Account>{scBob});
             auto const amt = XRP(1000);
             std::uint32_t const claimID = 1;
-            mcEnv.tx(xchain_commit(mcAlice, jvb, claimID, amt, dst)).close();
+            mcEnv.tx(xchainCommit(mcAlice, jvb, claimID, amt, dst)).close();
 
             // balance of last signer should not change (has deposit auth)
-            Balance const last_signer(scEnv, unpaid);
+            test::Balance const lastSigner(scEnv, unpaid);
 
             // make sure all signers except the last one get the
             // split_reward
 
             BalanceTransfer transfer(
                 scEnv,
-                Account::master,
+                Account::kMASTER,
                 scBob,
                 scAlice,
                 &payees[0],
-                UT_XCHAIN_DEFAULT_QUORUM - 1,
+                kUT_XCHAIN_DEFAULT_QUORUM - 1,
                 withClaim);
-            scEnv.multiTx(claim_attestations(
+            scEnv.multiTx(claimAttestations(
                 scAttester, jvb, mcAlice, amt, payees, true, claimID, dst, signers));
 
             if (withClaim)
             {
-                BEAST_EXPECT(transfer.has_not_happened());
+                BEAST_EXPECT(transfer.hasNotHappened());
 
                 // need to submit a claim transactions
-                scEnv.tx(xchain_claim(scAlice, jvb, claimID, amt, scBob)).close();
+                scEnv.tx(xchainClaim(scAlice, jvb, claimID, amt, scBob)).close();
             }
 
             // this also checks that only 3 * split_reward was deducted from
             // scAlice (the payer account), since we passed payees.size() -
             // 1 to BalanceTransfer
-            BEAST_EXPECT(transfer.has_happened(amt, split_reward_quorum));
+            BEAST_EXPECT(transfer.hasHappened(amt, split_reward_quorum));
 
             // and make sure the account with deposit auth received nothing
-            BEAST_EXPECT(last_signer.diff() == STAmount(0));
+            BEAST_EXPECT(lastSigner.diff() == STAmount(0));
         }
 
         // coverage test: xchain_claim transaction with incorrect flag
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .close()
-            .tx(xchain_claim(scAlice, jvb, 1, XRP(1000), scBob),
-                txflags(tfFillOrKill),
-                ter(temINVALID_FLAG))
+            .tx(xchainClaim(scAlice, jvb, 1, XRP(1000), scBob),
+                Txflags(tfFillOrKill),
+                Ter(temINVALID_FLAG))
             .close();
 
         // coverage test: xchain_claim transaction with xchain feature
         // disabled
         XEnv(*this, true)
-            .tx(create_bridge(Account::master, jvb))
+            .tx(createBridge(Account::kMASTER, jvb))
             .disableFeature(featureXChainBridge)
             .close()
-            .tx(xchain_claim(scAlice, jvb, 1, XRP(1000), scBob), ter(temDISABLED))
+            .tx(xchainClaim(scAlice, jvb, 1, XRP(1000), scBob), Ter(temDISABLED))
             .close();
 
         // coverage test: XChainClaim::preclaim - isLockingChain = true;
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .close()
-            .tx(xchain_claim(mcAlice, jvb, 1, XRP(1000), mcBob), ter(tecXCHAIN_NO_CLAIM_ID));
+            .tx(xchainClaim(mcAlice, jvb, 1, XRP(1000), mcBob), Ter(tecXCHAIN_NO_CLAIM_ID));
     }
 
     void
@@ -3443,30 +3418,30 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         using namespace jtx;
 
         testcase("Bridge Create Account");
-        XRPAmount const tx_fee = txFee();
+        XRPAmount const fee = txFee();
 
         // coverage test: transferHelper() - dst == src
         {
             XEnv scEnv(*this, true);
 
             auto const amt = XRP(111);
-            auto const amt_plus_reward = amt + reward;
+            auto const amtPlusReward = amt + reward;
 
-            scEnv.tx(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close();
 
-            Balance const door(scEnv, Account::master);
+            test::Balance const door(scEnv, Account::kMASTER);
 
             // scEnv.tx(att_create_acct_batch1(1, amt,
-            // Account::master)).close();
-            scEnv.multiTx(att_create_acct_vec(1, amt, Account::master, 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::master)).close();
-            scEnv.multiTx(att_create_acct_vec(1, amt, Account::master, 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
 
@@ -3478,32 +3453,32 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
-            Balance const carol(mcEnv, mcCarol);
+            test::Balance const door(mcEnv, mcDoor);
+            test::Balance const carol(mcEnv, mcCarol);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(19), reward),
-                    ter(tecXCHAIN_INSUFF_CREATE_AMOUNT))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(19), reward),
+                    Ter(tecXCHAIN_INSUFF_CREATE_AMOUNT))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
-            BEAST_EXPECT(carol.diff() == -tx_fee);
+            BEAST_EXPECT(carol.diff() == -fee);
         }
 
         // Check that creating an account with invalid flags fails.
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(20), reward),
-                    txflags(tfFillOrKill),
-                    ter(temINVALID_FLAG))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(20), reward),
+                    Txflags(tfFillOrKill),
+                    Ter(temINVALID_FLAG))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
@@ -3514,13 +3489,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv.disableFeature(featureXChainBridge)
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(20), reward),
-                    ter(temDISABLED))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(20), reward),
+                    Ter(temDISABLED))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
@@ -3530,13 +3505,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(-20), reward),
-                    ter(temBAD_AMOUNT))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(-20), reward),
+                    Ter(temBAD_AMOUNT))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
@@ -3546,13 +3521,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(20), XRP(-1)),
-                    ter(temBAD_AMOUNT))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(20), XRP(-1)),
+                    Ter(temBAD_AMOUNT))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
@@ -3562,29 +3537,29 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcDoor, jvb, scuAlice, XRP(20), XRP(1)),
-                    ter(tecXCHAIN_SELF_COMMIT))
+                .tx(sidechainXchainAccountCreate(mcDoor, jvb, scuAlice, XRP(20), XRP(1)),
+                    Ter(tecXCHAIN_SELF_COMMIT))
                 .close();
 
-            BEAST_EXPECT(door.diff() == -tx_fee);
+            BEAST_EXPECT(door.diff() == -fee);
         }
 
         // Check that reward matches the amount specified in bridge
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(20))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(20))).close();
 
-            Balance const door(mcEnv, mcDoor);
+            test::Balance const door(mcEnv, mcDoor);
 
             mcEnv
-                .tx(sidechain_xchain_account_create(mcCarol, jvb, scuAlice, XRP(20), XRP(2)),
-                    ter(tecXCHAIN_REWARD_MISMATCH))
+                .tx(sidechainXchainAccountCreate(mcCarol, jvb, scuAlice, XRP(20), XRP(2)),
+                    Ter(tecXCHAIN_REWARD_MISMATCH))
                 .close();
 
             BEAST_EXPECT(door.diff() == STAmount(0));
@@ -3596,44 +3571,44 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
     {
         using namespace jtx;
         XRPAmount const res0 = reserve(0);
-        XRPAmount const tx_fee = txFee();
+        XRPAmount const fee = txFee();
 
         testcase("Fee dips into reserve");
 
         // commit where the fee dips into the reserve, this should succeed
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
-            .fund(res0 + one_xrp + tx_fee - drops(1), mcuAlice)
+            .tx(createBridge(mcDoor, jvb))
+            .fund(res0 + one_xrp + fee - drops(1), mcuAlice)
             .close()
-            .tx(xchain_commit(mcuAlice, jvb, 1, one_xrp, scBob), ter(tesSUCCESS));
+            .tx(xchainCommit(mcuAlice, jvb, 1, one_xrp, scBob), Ter(tesSUCCESS));
 
         // commit where the commit amount drips into the reserve, this should
         // fail
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb))
+            .tx(createBridge(mcDoor, jvb))
             .fund(res0 + one_xrp - drops(1), mcuAlice)
             .close()
-            .tx(xchain_commit(mcuAlice, jvb, 1, one_xrp, scBob), ter(tecUNFUNDED_PAYMENT));
+            .tx(xchainCommit(mcuAlice, jvb, 1, one_xrp, scBob), Ter(tecUNFUNDED_PAYMENT));
 
         auto const minAccountCreate = XRP(20);
 
         // account create commit where the fee dips into the reserve,
         // this should succeed
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb, reward, minAccountCreate))
-            .fund(res0 + tx_fee + minAccountCreate + reward - drops(1), mcuAlice)
+            .tx(createBridge(mcDoor, jvb, reward, minAccountCreate))
+            .fund(res0 + fee + minAccountCreate + reward - drops(1), mcuAlice)
             .close()
-            .tx(sidechain_xchain_account_create(mcuAlice, jvb, scuAlice, minAccountCreate, reward),
-                ter(tesSUCCESS));
+            .tx(sidechainXchainAccountCreate(mcuAlice, jvb, scuAlice, minAccountCreate, reward),
+                Ter(tesSUCCESS));
 
         // account create commit where the commit dips into the reserve,
         // this should fail
         XEnv(*this)
-            .tx(create_bridge(mcDoor, jvb, reward, minAccountCreate))
+            .tx(createBridge(mcDoor, jvb, reward, minAccountCreate))
             .fund(res0 + minAccountCreate + reward - drops(1), mcuAlice)
             .close()
-            .tx(sidechain_xchain_account_create(mcuAlice, jvb, scuAlice, minAccountCreate, reward),
-                ter(tecUNFUNDED_PAYMENT));
+            .tx(sidechainXchainAccountCreate(mcuAlice, jvb, scuAlice, minAccountCreate, reward),
+                Ter(tecUNFUNDED_PAYMENT));
     }
 
     void
@@ -3643,13 +3618,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
         testcase("Bridge Delete Door Account");
 
-        auto const acctDelFee{drops(XEnv(*this).env_.current()->fees().increment)};
+        auto const acctDelFee{drops(XEnv(*this).env.current()->fees().increment)};
 
         // Deleting an account that owns bridge should fail
         {
             XEnv mcEnv(*this);
 
-            mcEnv.tx(create_bridge(mcDoor, jvb, XRP(1), XRP(1))).close();
+            mcEnv.tx(createBridge(mcDoor, jvb, XRP(1), XRP(1))).close();
 
             // We don't allow an account to be deleted if its sequence
             // number is within 256 of the current ledger.
@@ -3657,16 +3632,16 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 mcEnv.close();
 
             // try to delete mcDoor, send funds to mcAlice
-            mcEnv.tx(acctdelete(mcDoor, mcAlice), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+            mcEnv.tx(acctdelete(mcDoor, mcAlice), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         }
 
         // Deleting an account that owns a claim id should fail
         {
             XEnv scEnv(*this, true);
 
-            scEnv.tx(create_bridge(Account::master, jvb))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
                 .close()
-                .tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice))
+                .tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice))
                 .close();
 
             // We don't allow an account to be deleted if its sequence
@@ -3675,7 +3650,7 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
                 scEnv.close();
 
             // try to delete scAlice, send funds to scBob
-            scEnv.tx(acctdelete(scAlice, scBob), fee(acctDelFee), ter(tecHAS_OBLIGATIONS));
+            scEnv.tx(acctdelete(scAlice, scBob), Fee(acctDelFee), Ter(tecHAS_OBLIGATIONS));
         }
     }
 
@@ -3691,27 +3666,27 @@ 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(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close();
-            scEnv.tx(xchain_create_claim_id(scAlice, jvb, reward, mcAlice)).close();
-            auto jvAtt = claim_attestation(
+            scEnv.tx(xchainCreateClaimId(scAlice, jvb, reward, mcAlice)).close();
+            auto jvAtt = claimAttestation(
                 scAttester,
                 jvb,
                 mcAlice,
                 amt,
-                payees[UT_XCHAIN_DEFAULT_QUORUM],
+                payees[kUT_XCHAIN_DEFAULT_QUORUM],
                 true,
                 claimID,
                 dst,
-                signers[UT_XCHAIN_DEFAULT_QUORUM]);
+                signers[kUT_XCHAIN_DEFAULT_QUORUM]);
             {
                 // Change to an invalid keytype
                 auto k = jvAtt["PublicKey"].asString();
                 k.at(1) = '9';
                 jvAtt["PublicKey"] = k;
             }
-            scEnv.tx(jvAtt, ter(temMALFORMED)).close();
+            scEnv.tx(jvAtt, Ter(temMALFORMED)).close();
         }
         {
             // Create a bridge and add an create account attestation with a bad
@@ -3721,27 +3696,27 @@ 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(create_bridge(Account::master, jvb))
-                .tx(jtx::signers(Account::master, quorum, signers))
+            scEnv.tx(createBridge(Account::kMASTER, jvb))
+                .tx(jtx::signers(Account::kMASTER, quorum, signers))
                 .close();
-            auto jvAtt = create_account_attestation(
+            auto jvAtt = createAccountAttestation(
                 scAttester,
                 jvb,
                 mcAlice,
                 amt,
                 rewardAmt,
-                payees[UT_XCHAIN_DEFAULT_QUORUM],
+                payees[kUT_XCHAIN_DEFAULT_QUORUM],
                 true,
                 createCount,
                 dst,
-                signers[UT_XCHAIN_DEFAULT_QUORUM]);
+                signers[kUT_XCHAIN_DEFAULT_QUORUM]);
             {
                 // Change to an invalid keytype
                 auto k = jvAtt["PublicKey"].asString();
                 k.at(1) = '9';
                 jvAtt["PublicKey"] = k;
             }
-            scEnv.tx(jvAtt, ter(temMALFORMED)).close();
+            scEnv.tx(jvAtt, Ter(temMALFORMED)).close();
         }
     }
 
@@ -3768,13 +3743,13 @@ struct XChain_test : public beast::unit_test::suite, public jtx::XChainBridgeObj
 
 // -----------------------------------------------------------
 // -----------------------------------------------------------
-struct XChainSim_test : public beast::unit_test::suite, public jtx::XChainBridgeObjects
+struct XChainSim_test : public beast::unit_test::Suite, public jtx::XChainBridgeObjects
 {
 private:
-    static constexpr size_t num_signers = 5;
+    static constexpr size_t kNUM_SIGNERS = 5;
 
     // --------------------------------------------------
-    enum class WithClaim { no, yes };
+    enum class WithClaim { No, Yes };
     struct Transfer
     {
         jtx::Account from;
@@ -3782,9 +3757,9 @@ private:
         jtx::Account finaldest;
         STAmount amt;
         bool a2b;  // direction of transfer
-        WithClaim with_claim{WithClaim::no};
+        WithClaim with_claim{WithClaim::No};
         uint32_t claim_id{0};
-        std::array<bool, num_signers> attested{};
+        std::array<bool, kNUM_SIGNERS> attested{};
     };
 
     struct AccountCreate
@@ -3795,7 +3770,7 @@ private:
         STAmount reward;
         bool a2b;
         uint32_t claim_id{0};
-        std::array<bool, num_signers> attested{};
+        std::array<bool, kNUM_SIGNERS> attested{};
     };
 
     using ENV = XEnv<XChainSim_test>;
@@ -3831,50 +3806,50 @@ private:
         using CreateClaimVec = jtx::JValueVec;
         using CreateClaimMap = std::map<uint32_t, CreateClaimVec>;
 
-        ChainStateTrack(ENV& env) : env(env), tx_fee(env.env_.current()->fees().base)
+        ChainStateTrack(ENV& env) : env(env), tx_fee(env.env.current()->fees().base)
         {
         }
 
         void
-        sendAttestations(size_t signer_idx, BridgeID bridge, ClaimVec& claims)
+        sendAttestations(size_t signerIdx, BridgeID bridge, ClaimVec& claims)
         {
             for (auto const& c : claims)
             {
                 env.tx(c).close();
-                spendFee(bridge->signers[signer_idx].account);
+                spendFee(bridge->signers[signerIdx].account);
             }
             claims.clear();
         }
 
         uint32_t
-        sendCreateAttestations(size_t signer_idx, BridgeID bridge, CreateClaimVec& claims)
+        sendCreateAttestations(size_t signerIdx, BridgeID bridge, CreateClaimVec& claims)
         {
-            size_t num_successful = 0;
+            size_t numSuccessful = 0;
             for (auto const& c : claims)
             {
                 env.tx(c).close();
                 if (env.ter() == tesSUCCESS)
                 {
-                    counters[bridge].signers.push_back(signer_idx);
-                    num_successful++;
+                    counters[bridge].signers.push_back(signerIdx);
+                    numSuccessful++;
                 }
-                spendFee(bridge->signers[signer_idx].account);
+                spendFee(bridge->signers[signerIdx].account);
             }
             claims.clear();
-            return num_successful;
+            return numSuccessful;
         }
 
         void
         sendAttestations()
         {
-            bool callback_called = false;
+            bool callbackCalled = false;
 
             // we have this "do {} while" loop because we want to process
             // all the account create which can reach quorum at this time
             // stamp.
             do
             {
-                callback_called = false;
+                callbackCalled = false;
                 // cspell: ignore attns
                 for (size_t i = 0; i < signers_attns.size(); ++i)
                 {
@@ -3883,12 +3858,12 @@ private:
                         sendAttestations(i, bridge, claims.xfer_claims);
 
                         auto& c = counters[bridge];
-                        auto& create_claims = claims.create_claims[c.claim_count];
-                        auto num_attns = create_claims.size();
-                        if (num_attns != 0u)
+                        auto& createClaims = claims.create_claims[c.claim_count];
+                        auto numAttns = createClaims.size();
+                        if (numAttns != 0u)
                         {
                             c.num_create_attn_sent +=
-                                sendCreateAttestations(i, bridge, create_claims);
+                                sendCreateAttestations(i, bridge, createClaims);
                         }
                         assert(claims.create_claims[c.claim_count].empty());
                     }
@@ -3897,14 +3872,14 @@ private:
                 {
                     if (c.num_create_attn_sent >= bridge->quorum)
                     {
-                        callback_called = true;
+                        callbackCalled = true;
                         c.create_callbacks[c.claim_count](c.signers);
                         ++c.claim_count;
                         c.num_create_attn_sent = 0;
                         c.signers.clear();
                     }
                 }
-            } while (callback_called);
+            } while (callbackCalled);
         }
 
         void
@@ -3986,7 +3961,7 @@ private:
         };
 
         using SignerAttns = std::unordered_map<BridgeID, Claims>;
-        using SignersAttns = std::array<SignerAttns, num_signers>;
+        using SignersAttns = std::array<SignerAttns, kNUM_SIGNERS>;
 
         ENV& env;
         std::map<jtx::Account, AccountStateTrack> accounts;
@@ -3997,43 +3972,45 @@ private:
 
     struct ChainStateTracker
     {
-        ChainStateTracker(ENV& a_env, ENV& b_env) : a_(a_env), b_(b_env)
+        ChainStateTracker(ENV& aEnv, ENV& bEnv) : a(aEnv), b(bEnv)
         {
         }
 
         [[nodiscard]] bool
         verify() const
         {
-            return a_.verify() && b_.verify();
+            return a.verify() && b.verify();
         }
 
         void
         sendAttestations()
         {
-            a_.sendAttestations();
-            b_.sendAttestations();
+            a.sendAttestations();
+            b.sendAttestations();
         }
 
         void
         init(jtx::Account const& acct)
         {
-            a_.init(acct);
-            b_.init(acct);
+            a.init(acct);
+            b.init(acct);
         }
 
-        ChainStateTrack a_;
-        ChainStateTrack b_;
+        ChainStateTrack a;
+        ChainStateTrack b;
     };
 
     enum class SmState {
-        st_initial,
-        st_claim_id_created,
-        st_attesting,
-        st_attested,
-        st_completed,
-        st_closed,
+        Initial,
+        ClaimIdCreated,
+        Attesting,
+        Attested,
+        Completed,
+        Closed,
     };
 
+    enum class ActFlags { A2b = 1 << 0 };
+
     // --------------------------------------------------
     template <class T>
     class SmBase
@@ -4047,13 +4024,13 @@ private:
         ChainStateTrack&
         srcState()
         {
-            return static_cast<T&>(*this).a2b() ? st_->a_ : st_->b_;
+            return static_cast<T&>(*this).a2b() ? st_->a : st_->b;
         }
 
         ChainStateTrack&
         destState()
         {
-            return static_cast<T&>(*this).a2b() ? st_->b_ : st_->a_;
+            return static_cast<T&>(*this).a2b() ? st_->b : st_->a;
         }
 
         jtx::Account const&
@@ -4085,28 +4062,29 @@ private:
             std::shared_ptr<ChainStateTracker> const& chainstate,
             BridgeDef const& bridge,
             AccountCreate create)
-            : Base(chainstate, bridge), cr(std::move(create))
+            : Base(chainstate, bridge), cr_(std::move(create))
         {
         }
 
         [[nodiscard]] bool
         a2b() const
         {
-            return cr.a2b;
+            return cr_.a2b;
         }
 
         uint32_t
-        issue_account_create()
+        issueAccountCreate()
         {
             ChainStateTrack& st = srcState();
             jtx::Account const& srcdoor = srcDoor();
 
             st.env
-                .tx(sidechain_xchain_account_create(cr.from, bridge_.jvb, cr.to, cr.amt, cr.reward))
+                .tx(sidechainXchainAccountCreate(
+                    cr_.from, bridge_.jvb, cr_.to, cr_.amt, cr_.reward))
                 .close();  // needed for claim_id sequence to be correct'
-            st.spendFee(cr.from);
-            st.transfer(cr.from, srcdoor, cr.amt);
-            st.transfer(cr.from, srcdoor, cr.reward);
+            st.spendFee(cr_.from);
+            st.transfer(cr_.from, srcdoor, cr_.amt);
+            st.transfer(cr_.from, srcdoor, cr_.reward);
 
             return ++st.counters[&bridge_].create_count;
         }
@@ -4118,72 +4096,72 @@ private:
 
             // check all signers, but start at a random one
             size_t i = 0;
-            for (i = 0; i < num_signers; ++i)
+            for (i = 0; i < kNUM_SIGNERS; ++i)
             {
-                size_t const signer_idx = (rnd + i) % num_signers;
+                size_t const signerIdx = (rnd + i) % kNUM_SIGNERS;
 
-                if (!(cr.attested[signer_idx]))
+                if (!(cr_.attested[signerIdx]))
                 {
                     // enqueue one attestation for this signer
-                    cr.attested[signer_idx] = true;
+                    cr_.attested[signerIdx] = true;
 
-                    st.signers_attns[signer_idx][&bridge_]
-                        .create_claims[cr.claim_id - 1]
-                        .emplace_back(create_account_attestation(
-                            bridge_.signers[signer_idx].account,
+                    st.signers_attns[signerIdx][&bridge_]
+                        .create_claims[cr_.claim_id - 1]
+                        .emplace_back(createAccountAttestation(
+                            bridge_.signers[signerIdx].account,
                             bridge_.jvb,
-                            cr.from,
-                            cr.amt,
-                            cr.reward,
-                            bridge_.signers[signer_idx].account,
-                            cr.a2b,
-                            cr.claim_id,
-                            cr.to,
-                            bridge_.signers[signer_idx]));
+                            cr_.from,
+                            cr_.amt,
+                            cr_.reward,
+                            bridge_.signers[signerIdx].account,
+                            cr_.a2b,
+                            cr_.claim_id,
+                            cr_.to,
+                            bridge_.signers[signerIdx]));
                     break;
                 }
             }
 
-            if (i == num_signers)
+            if (i == kNUM_SIGNERS)
                 return;  // did not attest
 
             auto& counters = st.counters[&bridge_];
-            if (counters.create_callbacks.size() < cr.claim_id)
-                counters.create_callbacks.resize(cr.claim_id);
+            if (counters.create_callbacks.size() < cr_.claim_id)
+                counters.create_callbacks.resize(cr_.claim_id);
 
-            auto complete_cb = [&](std::vector<size_t> const& signers) {
-                auto num_attestors = signers.size();
+            auto completeCb = [&](std::vector<size_t> const& signers) {
+                auto numAttestors = signers.size();
                 st.env.close();
-                assert(num_attestors <= std::count(cr.attested.begin(), cr.attested.end(), true));
-                assert(num_attestors >= bridge_.quorum);
-                assert(cr.claim_id - 1 == counters.claim_count);
+                assert(numAttestors <= std::count(cr_.attested.begin(), cr_.attested.end(), true));
+                assert(numAttestors >= bridge_.quorum);
+                assert(cr_.claim_id - 1 == counters.claim_count);
 
-                auto r = cr.reward;
-                auto reward = divide(r, STAmount(num_attestors), r.asset());
+                auto r = cr_.reward;
+                auto reward = divide(r, STAmount(numAttestors), r.asset());
 
                 for (auto i : signers)
                     st.receive(bridge_.signers[i].account, reward);
 
-                st.spend(dstDoor(), reward, num_attestors);
-                st.transfer(dstDoor(), cr.to, cr.amt);
-                st.env.env_.memoize(cr.to);
-                sm_state = SmState::st_completed;
+                st.spend(dstDoor(), reward, numAttestors);
+                st.transfer(dstDoor(), cr_.to, cr_.amt);
+                st.env.env.memoize(cr_.to);
+                sm_state_ = SmState::Completed;
             };
 
-            counters.create_callbacks[cr.claim_id - 1] = std::move(complete_cb);
+            counters.create_callbacks[cr_.claim_id - 1] = std::move(completeCb);
         }
 
         SmState
         advance(uint64_t time, uint32_t rnd)
         {
-            switch (sm_state)
+            switch (sm_state_)
             {
-                case SmState::st_initial:
-                    cr.claim_id = issue_account_create();
-                    sm_state = SmState::st_attesting;
+                case SmState::Initial:
+                    cr_.claim_id = issueAccountCreate();
+                    sm_state_ = SmState::Attesting;
                     break;
 
-                case SmState::st_attesting:
+                case SmState::Attesting:
                     attest(time, rnd);
                     break;
 
@@ -4191,15 +4169,15 @@ private:
                     assert(0);
                     break;
 
-                case SmState::st_completed:
+                case SmState::Completed:
                     break;  // will get this once
             }
-            return sm_state;
+            return sm_state_;
         }
 
     private:
-        SmState sm_state{SmState::st_initial};
-        AccountCreate cr;
+        SmState sm_state_{SmState::Initial};
+        AccountCreate cr_;
     };
 
     // --------------------------------------------------
@@ -4212,25 +4190,25 @@ private:
             std::shared_ptr<ChainStateTracker> const& chainstate,
             BridgeDef const& bridge,
             Transfer xfer)
-            : Base(chainstate, bridge), xfer(std::move(xfer))
+            : Base(chainstate, bridge), xfer_(std::move(xfer))
         {
         }
 
         [[nodiscard]] bool
         a2b() const
         {
-            return xfer.a2b;
+            return xfer_.a2b;
         }
 
         uint32_t
-        create_claim_id()
+        createClaimId()
         {
             ChainStateTrack& st = destState();
 
-            st.env.tx(xchain_create_claim_id(xfer.to, bridge_.jvb, bridge_.reward, xfer.from))
+            st.env.tx(xchainCreateClaimId(xfer_.to, bridge_.jvb, bridge_.reward, xfer_.from))
                 .close();  // needed for claim_id sequence to be
                            // correct'
-            st.spendFee(xfer.to);
+            st.spendFee(xfer_.to);
             return ++st.counters[&bridge_].claim_id;
         }
 
@@ -4240,34 +4218,34 @@ private:
             ChainStateTrack& st = srcState();
             jtx::Account const& srcdoor = srcDoor();
 
-            if (xfer.amt.asset() != xrpIssue())
+            if (xfer_.amt.asset() != xrpIssue())
             {
-                st.env.tx(pay(srcdoor, xfer.from, xfer.amt));
+                st.env.tx(pay(srcdoor, xfer_.from, xfer_.amt));
                 st.spendFee(srcdoor);
             }
-            st.env.tx(xchain_commit(
-                xfer.from,
+            st.env.tx(xchainCommit(
+                xfer_.from,
                 bridge_.jvb,
-                xfer.claim_id,
-                xfer.amt,
-                xfer.with_claim == WithClaim::yes ? std::nullopt
-                                                  : std::optional<jtx::Account>(xfer.finaldest)));
-            st.spendFee(xfer.from);
-            st.transfer(xfer.from, srcdoor, xfer.amt);
+                xfer_.claim_id,
+                xfer_.amt,
+                xfer_.with_claim == WithClaim::Yes ? std::nullopt
+                                                   : std::optional<jtx::Account>(xfer_.finaldest)));
+            st.spendFee(xfer_.from);
+            st.transfer(xfer_.from, srcdoor, xfer_.amt);
         }
 
         void
-        distribute_reward(ChainStateTrack& st)
+        distributeReward(ChainStateTrack& st)
         {
             auto r = bridge_.reward;
             auto reward = divide(r, STAmount(bridge_.quorum), r.asset());
 
-            for (size_t i = 0; i < num_signers; ++i)
+            for (size_t i = 0; i < kNUM_SIGNERS; ++i)
             {
-                if (xfer.attested[i])
+                if (xfer_.attested[i])
                     st.receive(bridge_.signers[i].account, reward);
             }
-            st.spend(xfer.to, reward, bridge_.quorum);
+            st.spend(xfer_.to, reward, bridge_.quorum);
         }
 
         bool
@@ -4276,38 +4254,37 @@ private:
             ChainStateTrack& st = destState();
 
             // check all signers, but start at a random one
-            for (size_t i = 0; i < num_signers; ++i)
+            for (size_t i = 0; i < kNUM_SIGNERS; ++i)
             {
-                size_t const signer_idx = (rnd + i) % num_signers;
-                if (!(xfer.attested[signer_idx]))
+                size_t const signerIdx = (rnd + i) % kNUM_SIGNERS;
+                if (!(xfer_.attested[signerIdx]))
                 {
                     // enqueue one attestation for this signer
-                    xfer.attested[signer_idx] = true;
+                    xfer_.attested[signerIdx] = true;
 
-                    st.signers_attns[signer_idx][&bridge_].xfer_claims.emplace_back(
-                        claim_attestation(
-                            bridge_.signers[signer_idx].account,
-                            bridge_.jvb,
-                            xfer.from,
-                            xfer.amt,
-                            bridge_.signers[signer_idx].account,
-                            xfer.a2b,
-                            xfer.claim_id,
-                            xfer.with_claim == WithClaim::yes
-                                ? std::nullopt
-                                : std::optional<jtx::Account>(xfer.finaldest),
-                            bridge_.signers[signer_idx]));
+                    st.signers_attns[signerIdx][&bridge_].xfer_claims.emplace_back(claimAttestation(
+                        bridge_.signers[signerIdx].account,
+                        bridge_.jvb,
+                        xfer_.from,
+                        xfer_.amt,
+                        bridge_.signers[signerIdx].account,
+                        xfer_.a2b,
+                        xfer_.claim_id,
+                        xfer_.with_claim == WithClaim::Yes
+                            ? std::nullopt
+                            : std::optional<jtx::Account>(xfer_.finaldest),
+                        bridge_.signers[signerIdx]));
                     break;
                 }
             }
 
             // return true if quorum was reached, false otherwise
             bool const quorum =
-                std::count(xfer.attested.begin(), xfer.attested.end(), true) >= bridge_.quorum;
-            if (quorum && xfer.with_claim == WithClaim::no)
+                std::count(xfer_.attested.begin(), xfer_.attested.end(), true) >= bridge_.quorum;
+            if (quorum && xfer_.with_claim == WithClaim::No)
             {
-                distribute_reward(st);
-                st.transfer(dstDoor(), xfer.finaldest, xfer.amt);
+                distributeReward(st);
+                st.transfer(dstDoor(), xfer_.finaldest, xfer_.amt);
             }
             return quorum;
         }
@@ -4316,56 +4293,57 @@ private:
         claim()
         {
             ChainStateTrack& st = destState();
-            st.env.tx(xchain_claim(xfer.to, bridge_.jvb, xfer.claim_id, xfer.amt, xfer.finaldest));
-            distribute_reward(st);
-            st.transfer(dstDoor(), xfer.finaldest, xfer.amt);
-            st.spendFee(xfer.to);
+            st.env.tx(
+                xchainClaim(xfer_.to, bridge_.jvb, xfer_.claim_id, xfer_.amt, xfer_.finaldest));
+            distributeReward(st);
+            st.transfer(dstDoor(), xfer_.finaldest, xfer_.amt);
+            st.spendFee(xfer_.to);
         }
 
         SmState
         advance(uint64_t time, uint32_t rnd)
         {
-            switch (sm_state)
+            switch (sm_state_)
             {
-                case SmState::st_initial:
-                    xfer.claim_id = create_claim_id();
-                    sm_state = SmState::st_claim_id_created;
+                case SmState::Initial:
+                    xfer_.claim_id = createClaimId();
+                    sm_state_ = SmState::ClaimIdCreated;
                     break;
 
-                case SmState::st_claim_id_created:
+                case SmState::ClaimIdCreated:
                     commit();
-                    sm_state = SmState::st_attesting;
+                    sm_state_ = SmState::Attesting;
                     break;
 
-                case SmState::st_attesting:
+                case SmState::Attesting:
                     if (attest(time, rnd))
                     {
-                        sm_state = xfer.with_claim == WithClaim::yes ? SmState::st_attested
-                                                                     : SmState::st_completed;
+                        sm_state_ = xfer_.with_claim == WithClaim::Yes ? SmState::Attested
+                                                                       : SmState::Completed;
                     }
                     else
                     {
-                        sm_state = SmState::st_attesting;
+                        sm_state_ = SmState::Attesting;
                     }
                     break;
 
-                case SmState::st_attested:
-                    assert(xfer.with_claim == WithClaim::yes);
+                case SmState::Attested:
+                    assert(xfer_.with_claim == WithClaim::Yes);
                     claim();
-                    sm_state = SmState::st_completed;
+                    sm_state_ = SmState::Completed;
                     break;
 
                 default:
-                case SmState::st_completed:
+                case SmState::Completed:
                     assert(0);  // should have been removed
                     break;
             }
-            return sm_state;
+            return sm_state_;
         }
 
     private:
-        Transfer xfer;
-        SmState sm_state{SmState::st_initial};
+        Transfer xfer_;
+        SmState sm_state_{SmState::Initial};
     };
 
     // --------------------------------------------------
@@ -4395,7 +4373,7 @@ private:
 
 public:
     void
-    runSimulation(std::shared_ptr<ChainStateTracker> const& st, bool verify_balances = true)
+    runSimulation(std::shared_ptr<ChainStateTracker> const& st, bool verifyBalances = true)
     {
         using namespace jtx;
         uint64_t time = 0;
@@ -4412,7 +4390,7 @@ public:
                     return sm.advance(time, rnd);
                 };
                 auto& [t, sm] = *it;
-                if (t <= time && std::visit(vis, sm) == SmState::st_completed)
+                if (t <= time && std::visit(vis, sm) == SmState::Completed)
                 {
                     it = sm_.erase(it);
                 }
@@ -4426,10 +4404,10 @@ public:
             st->sendAttestations();
 
             // make sure all transactions have been applied
-            st->a_.env.close();
-            st->b_.env.close();
+            st->a.env.close();
+            st->b.env.close();
 
-            if (verify_balances)
+            if (verifyBalances)
             {
                 BEAST_EXPECT(st->verify());
             }
@@ -4453,15 +4431,15 @@ public:
         Account doorXRPLocking("doorXRPLocking"), doorUSDLocking("doorUSDLocking"),
             doorUSDIssuing("doorUSDIssuing");
 
-        constexpr size_t num_acct = 10;
+        constexpr size_t kNUM_ACCT = 10;
         auto a = [&doorXRPLocking, &doorUSDLocking, &doorUSDIssuing]() {
             using namespace std::literals;
             std::vector<Account> result;
-            result.reserve(num_acct);
-            for (int i = 0; i < num_acct; ++i)
+            result.reserve(kNUM_ACCT);
+            for (int i = 0; i < kNUM_ACCT; ++i)
             {
                 result.emplace_back(
-                    "a"s + std::to_string(i), (i % 2) ? KeyType::ed25519 : KeyType::secp256k1);
+                    "a"s + std::to_string(i), (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
             }
             result.emplace_back("doorXRPLocking");
             doorXRPLocking = result.back();
@@ -4479,20 +4457,20 @@ public:
             mcEnv.fund(amt, acct);
             scEnv.fund(amt, acct);
         }
-        Account const USDLocking{"USDLocking"};
-        IOU const usdLocking{USDLocking["USD"]};
+        Account const usdLockingAcc{"USDLocking"};
+        IOU const usdLocking{usdLockingAcc["USD"]};
         IOU const usdIssuing{doorUSDIssuing["USD"]};
 
-        mcEnv.fund(XRP(100000), USDLocking);
+        mcEnv.fund(XRP(100000), usdLockingAcc);
         mcEnv.close();
         mcEnv.tx(trust(doorUSDLocking, usdLocking(100000)));
         mcEnv.close();
-        mcEnv.tx(pay(USDLocking, doorUSDLocking, usdLocking(50000)));
+        mcEnv.tx(pay(usdLockingAcc, doorUSDLocking, usdLocking(50000)));
 
         for (int i = 0; i < a.size(); ++i)
         {
             auto& acct{a[i]};
-            if (i < num_acct)
+            if (i < kNUM_ACCT)
             {
                 mcEnv.tx(trust(acct, usdLocking(100000)));
                 scEnv.tx(trust(acct, usdIssuing(100000)));
@@ -4502,18 +4480,18 @@ public:
         for (auto& s : signers)
             st->init(s.account);
 
-        st->b_.init(Account::master);
+        st->b.init(Account::kMASTER);
 
         // also create some unfunded accounts
-        constexpr size_t num_ua = 20;
+        constexpr size_t kNUM_UA = 20;
         auto ua = []() {
             using namespace std::literals;
             std::vector<Account> result;
-            result.reserve(num_ua);
-            for (int i = 0; i < num_ua; ++i)
+            result.reserve(kNUM_UA);
+            for (int i = 0; i < kNUM_UA; ++i)
             {
                 result.emplace_back(
-                    "ua"s + std::to_string(i), (i % 2) ? KeyType::ed25519 : KeyType::secp256k1);
+                    "ua"s + std::to_string(i), (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
             }
             return result;
         }();
@@ -4521,28 +4499,28 @@ public:
         // initialize a bridge from a BridgeDef
         auto initBridge = [&mcEnv, &scEnv, &st](BridgeDef& bd) {
             bd.initBridge(mcEnv, scEnv);
-            st->a_.spendFee(bd.doorA, 2);
-            st->b_.spendFee(bd.doorB, 2);
+            st->a.spendFee(bd.doorA, 2);
+            st->b.spendFee(bd.doorB, 2);
         };
 
         // create XRP -> XRP bridge
         // ------------------------
-        BridgeDef xrp_b{
+        BridgeDef xrpB{
             .doorA = doorXRPLocking,
             .issueA = xrpIssue(),
-            .doorB = Account::master,
+            .doorB = Account::kMASTER,
             .issueB = xrpIssue(),
             .reward = XRP(1),
             .minAccountCreate = XRP(20),
             .quorum = quorum,
             .signers = signers,
-            .jvb = Json::nullValue};
+            .jvb = json::NullValue};
 
-        initBridge(xrp_b);
+        initBridge(xrpB);
 
         // create USD -> USD bridge
         // ------------------------
-        BridgeDef usd_b{
+        BridgeDef usdB{
             .doorA = doorUSDLocking,
             .issueA = usdLocking,
             .doorB = doorUSDIssuing,
@@ -4551,9 +4529,9 @@ public:
             .minAccountCreate = XRP(20),
             .quorum = quorum,
             .signers = signers,
-            .jvb = Json::nullValue};
+            .jvb = json::NullValue};
 
-        initBridge(usd_b);
+        initBridge(usdB);
 
         // try a single account create + transfer to validate the simulation
         // engine. Do the transfer 8 time steps after the account create, to
@@ -4562,12 +4540,12 @@ public:
         // -----------------------------------------------------------------
         ac(0,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[0], .amt = XRP(777), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[0], .amt = XRP(777), .reward = xrpB.reward, .a2b = true});
         xfer(
             8,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0], .to = ua[0], .finaldest = a[2], .amt = XRP(3), .a2b = true});
         runSimulation(st);
 
@@ -4575,12 +4553,12 @@ public:
         // -----------------------------------------
         ac(0,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[0], .amt = XRP(777), .reward = xrp_b.reward, .a2b = false});
+           xrpB,
+           {.from = a[0], .to = ua[0], .amt = XRP(777), .reward = xrpB.reward, .a2b = false});
         xfer(
             8,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0], .to = ua[0], .finaldest = a[2], .amt = XRP(3), .a2b = false});
         runSimulation(st);
 
@@ -4589,53 +4567,47 @@ public:
         xfer(
             0,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0],
              .to = a[0],
              .finaldest = a[1],
              .amt = XRP(6),
              .a2b = true,
-             .with_claim = WithClaim::no});
+             .with_claim = WithClaim::No});
         xfer(
             1,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0],
              .to = a[0],
              .finaldest = a[1],
              .amt = XRP(8),
              .a2b = false,
-             .with_claim = WithClaim::no});
+             .with_claim = WithClaim::No});
         xfer(
-            1,
-            st,
-            xrp_b,
-            {.from = a[1], .to = a[1], .finaldest = a[1], .amt = XRP(1), .a2b = true});
+            1, st, xrpB, {.from = a[1], .to = a[1], .finaldest = a[1], .amt = XRP(1), .a2b = true});
         xfer(
             2,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0], .to = a[0], .finaldest = a[1], .amt = XRP(3), .a2b = false});
         xfer(
             2,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[1], .to = a[1], .finaldest = a[1], .amt = XRP(5), .a2b = false});
         xfer(
             2,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0],
              .to = a[0],
              .finaldest = a[1],
              .amt = XRP(7),
              .a2b = false,
-             .with_claim = WithClaim::no});
+             .with_claim = WithClaim::No});
         xfer(
-            2,
-            st,
-            xrp_b,
-            {.from = a[1], .to = a[1], .finaldest = a[1], .amt = XRP(9), .a2b = true});
+            2, st, xrpB, {.from = a[1], .to = a[1], .finaldest = a[1], .amt = XRP(9), .a2b = true});
         runSimulation(st);
 
         // run one USD transfer
@@ -4643,7 +4615,7 @@ public:
         xfer(
             0,
             st,
-            usd_b,
+            usdB,
             {.from = a[0], .to = a[1], .finaldest = a[2], .amt = usdLocking(3), .a2b = true});
         runSimulation(st);
 
@@ -4652,93 +4624,81 @@ public:
         xfer(
             0,
             st,
-            usd_b,
+            usdB,
             {.from = a[0], .to = a[0], .finaldest = a[1], .amt = usdLocking(6), .a2b = true});
         xfer(
             1,
             st,
-            usd_b,
+            usdB,
             {.from = a[0], .to = a[0], .finaldest = a[1], .amt = usdIssuing(8), .a2b = false});
         xfer(
             1,
             st,
-            usd_b,
+            usdB,
             {.from = a[1], .to = a[1], .finaldest = a[1], .amt = usdLocking(1), .a2b = true});
         xfer(
             2,
             st,
-            usd_b,
+            usdB,
             {.from = a[0], .to = a[0], .finaldest = a[1], .amt = usdIssuing(3), .a2b = false});
         xfer(
             2,
             st,
-            usd_b,
+            usdB,
             {.from = a[1], .to = a[1], .finaldest = a[1], .amt = usdIssuing(5), .a2b = false});
         xfer(
             2,
             st,
-            usd_b,
+            usdB,
             {.from = a[0], .to = a[0], .finaldest = a[1], .amt = usdIssuing(7), .a2b = false});
         xfer(
             2,
             st,
-            usd_b,
+            usdB,
             {.from = a[1], .to = a[1], .finaldest = a[1], .amt = usdLocking(9), .a2b = true});
         runSimulation(st);
 
         // run mixed transfers
         // -------------------
         xfer(
-            0,
-            st,
-            xrp_b,
-            {.from = a[0], .to = a[0], .finaldest = a[0], .amt = XRP(1), .a2b = true});
+            0, st, xrpB, {.from = a[0], .to = a[0], .finaldest = a[0], .amt = XRP(1), .a2b = true});
         xfer(
             0,
             st,
-            usd_b,
+            usdB,
             {.from = a[1], .to = a[3], .finaldest = a[3], .amt = usdIssuing(3), .a2b = false});
         xfer(
             0,
             st,
-            usd_b,
+            usdB,
             {.from = a[3], .to = a[2], .finaldest = a[1], .amt = usdIssuing(5), .a2b = false});
 
         xfer(
             1,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0], .to = a[0], .finaldest = a[0], .amt = XRP(4), .a2b = false});
         xfer(
-            1,
-            st,
-            xrp_b,
-            {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(8), .a2b = true});
+            1, st, xrpB, {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(8), .a2b = true});
         xfer(
             1,
             st,
-            usd_b,
+            usdB,
             {.from = a[4], .to = a[1], .finaldest = a[1], .amt = usdLocking(7), .a2b = true});
 
         xfer(
-            3,
-            st,
-            xrp_b,
-            {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(7), .a2b = true});
+            3, st, xrpB, {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(7), .a2b = true});
         xfer(
             3,
             st,
-            xrp_b,
+            xrpB,
             {.from = a[0], .to = a[4], .finaldest = a[3], .amt = XRP(2), .a2b = false});
         xfer(
-            3,
-            st,
-            xrp_b,
-            {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(9), .a2b = true});
+            3, st, xrpB, {.from = a[1], .to = a[1], .finaldest = a[0], .amt = XRP(9), .a2b = true});
         xfer(
             3,
             st,
-            usd_b,
+            usdB,
             {.from = a[3], .to = a[1], .finaldest = a[1], .amt = usdIssuing(11), .a2b = false});
         runSimulation(st);
 
@@ -4746,76 +4706,76 @@ public:
         // ----------------------------------------------------------
         ac(0,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[1], .amt = XRP(301), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[1], .amt = XRP(301), .reward = xrpB.reward, .a2b = true});
         ac(0,
            st,
-           xrp_b,
-           {.from = a[1], .to = ua[2], .amt = XRP(302), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[1], .to = ua[2], .amt = XRP(302), .reward = xrpB.reward, .a2b = true});
         ac(1,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[3], .amt = XRP(303), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[3], .amt = XRP(303), .reward = xrpB.reward, .a2b = true});
         ac(2,
            st,
-           xrp_b,
-           {.from = a[1], .to = ua[4], .amt = XRP(304), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[1], .to = ua[4], .amt = XRP(304), .reward = xrpB.reward, .a2b = true});
         ac(3,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[5], .amt = XRP(305), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[5], .amt = XRP(305), .reward = xrpB.reward, .a2b = true});
         ac(4,
            st,
-           xrp_b,
-           {.from = a[1], .to = ua[6], .amt = XRP(306), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[1], .to = ua[6], .amt = XRP(306), .reward = xrpB.reward, .a2b = true});
         ac(6,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[7], .amt = XRP(307), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[7], .amt = XRP(307), .reward = xrpB.reward, .a2b = true});
         ac(7,
            st,
-           xrp_b,
-           {.from = a[2], .to = ua[8], .amt = XRP(308), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[2], .to = ua[8], .amt = XRP(308), .reward = xrpB.reward, .a2b = true});
         ac(9,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[9], .amt = XRP(309), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[9], .amt = XRP(309), .reward = xrpB.reward, .a2b = true});
         ac(9,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[9], .amt = XRP(309), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[9], .amt = XRP(309), .reward = xrpB.reward, .a2b = true});
         ac(10,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[10], .amt = XRP(310), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[10], .amt = XRP(310), .reward = xrpB.reward, .a2b = true});
         ac(12,
            st,
-           xrp_b,
-           {.from = a[0], .to = ua[11], .amt = XRP(311), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[0], .to = ua[11], .amt = XRP(311), .reward = xrpB.reward, .a2b = true});
         ac(12,
            st,
-           xrp_b,
-           {.from = a[3], .to = ua[12], .amt = XRP(312), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[3], .to = ua[12], .amt = XRP(312), .reward = xrpB.reward, .a2b = true});
         ac(12,
            st,
-           xrp_b,
-           {.from = a[4], .to = ua[13], .amt = XRP(313), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[4], .to = ua[13], .amt = XRP(313), .reward = xrpB.reward, .a2b = true});
         ac(12,
            st,
-           xrp_b,
-           {.from = a[3], .to = ua[14], .amt = XRP(314), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[3], .to = ua[14], .amt = XRP(314), .reward = xrpB.reward, .a2b = true});
         ac(12,
            st,
-           xrp_b,
-           {.from = a[6], .to = ua[15], .amt = XRP(315), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[6], .to = ua[15], .amt = XRP(315), .reward = xrpB.reward, .a2b = true});
         ac(13,
            st,
-           xrp_b,
-           {.from = a[7], .to = ua[16], .amt = XRP(316), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[7], .to = ua[16], .amt = XRP(316), .reward = xrpB.reward, .a2b = true});
         ac(15,
            st,
-           xrp_b,
-           {.from = a[3], .to = ua[17], .amt = XRP(317), .reward = xrp_b.reward, .a2b = true});
+           xrpB,
+           {.from = a[3], .to = ua[17], .amt = XRP(317), .reward = xrpB.reward, .a2b = true});
         runSimulation(st, true);  // balances verification working now.
     }
 
diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp
index ffacc0a563..8f71d47fcf 100644
--- a/src/test/app/tx/apply_test.cpp
+++ b/src/test/app/tx/apply_test.cpp
@@ -14,7 +14,7 @@
 
 namespace xrpl {
 
-class Apply_test : public beast::unit_test::suite
+class Apply_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -28,7 +28,7 @@ public:
     testFullyCanonicalSigs()
     {
         // Construct a payments w/out a fully-canonical tx
-        std::string const non_fully_canonical_tx =
+        std::string const nonFullyCanonicalTx =
             "12000022000000002400000001201B00497D9C6140000000000F6950684000000"
             "00000000C732103767C7B2C13AD90050A4263745E4BAB2B975417FA22E87780E1"
             "506DDAF21139BE74483046022100E95670988A34C4DB0FA73A8BFD6383872AF43"
@@ -36,16 +36,16 @@ public:
             "2C2DC3AFEDBED37BBCCD97BC8C40E08F8114E25A26437D923EEF4D6D815DF9336"
             "8B62E6440848314BB85996936E4F595287774684DC2AC6266024BEF";
 
-        auto ret = strUnHex(non_fully_canonical_tx);
+        auto ret = strUnHex(nonFullyCanonicalTx);
         SerialIter sitTrans(makeSlice(*ret));  // NOLINT(bugprone-unchecked-optional-access)
         STTx const tx = *std::make_shared<STTx const>(std::ref(sitTrans));
 
         {
-            test::jtx::Env fully_canonical(*this, test::jtx::testable_amendments());
+            test::jtx::Env fullyCanonical(*this, test::jtx::testableAmendments());
 
             Validity const valid =
                 checkValidity(
-                    fully_canonical.app().getHashRouter(), tx, fully_canonical.current()->rules())
+                    fullyCanonical.app().getHashRouter(), tx, fullyCanonical.current()->rules())
                     .first;
             if (valid == Validity::Valid)
                 fail("Non-Fully canonical signature was permitted");
diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp
index 1fd0ed9e09..816a697ca4 100644
--- a/src/test/basics/Buffer_test.cpp
+++ b/src/test/basics/Buffer_test.cpp
@@ -10,7 +10,7 @@
 
 namespace xrpl::test {
 
-struct Buffer_test : beast::unit_test::suite
+struct Buffer_test : beast::unit_test::Suite
 {
     static bool
     sane(Buffer const& b)
diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp
index b47975873e..311ab960ec 100644
--- a/src/test/basics/DetectCrash_test.cpp
+++ b/src/test/basics/DetectCrash_test.cpp
@@ -4,7 +4,7 @@
 
 namespace xrpl::test {
 
-struct DetectCrash_test : public beast::unit_test::suite
+struct DetectCrash_test : public beast::unit_test::Suite
 {
     void
     testDetectCrash()
diff --git a/src/test/basics/Expected_test.cpp b/src/test/basics/Expected_test.cpp
index b76955f53a..c8e570835b 100644
--- a/src/test/basics/Expected_test.cpp
+++ b/src/test/basics/Expected_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl::test {
 
-struct Expected_test : beast::unit_test::suite
+struct Expected_test : beast::unit_test::Suite
 {
     void
     run() override
diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp
index b427e800ec..959d3ca695 100644
--- a/src/test/basics/FileUtilities_test.cpp
+++ b/src/test/basics/FileUtilities_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl {
 
-class FileUtilities_test : public beast::unit_test::suite
+class FileUtilities_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -18,7 +18,7 @@ public:
         using namespace xrpl::detail;
         using namespace boost::system;
 
-        constexpr char const* expectedContents = "This file is very short. That's all we need.";
+        constexpr char const* kEXPECTED_CONTENTS = "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 +26,21 @@ public:
         error_code ec;
         auto const path = file.file();
 
-        writeFileContents(ec, path, expectedContents);
+        writeFileContents(ec, path, kEXPECTED_CONTENTS);
         BEAST_EXPECT(!ec);
 
         {
             // Test with no max
             auto const good = getFileContents(ec, path);
             BEAST_EXPECT(!ec);
-            BEAST_EXPECT(good == expectedContents);
+            BEAST_EXPECT(good == kEXPECTED_CONTENTS);
         }
 
         {
             // Test with large max
             auto const good = getFileContents(ec, path, kilobytes(1));
             BEAST_EXPECT(!ec);
-            BEAST_EXPECT(good == expectedContents);
+            BEAST_EXPECT(good == kEXPECTED_CONTENTS);
         }
 
         {
diff --git a/src/test/basics/IOUAmount_test.cpp b/src/test/basics/IOUAmount_test.cpp
index 5c01445e31..738990aac2 100644
--- a/src/test/basics/IOUAmount_test.cpp
+++ b/src/test/basics/IOUAmount_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl {
 
-class IOUAmount_test : public beast::unit_test::suite
+class IOUAmount_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -23,18 +23,18 @@ public:
         BEAST_EXPECT(z.exponent() == -100);
         BEAST_EXPECT(!z);
         BEAST_EXPECT(z.signum() == 0);
-        BEAST_EXPECT(z == beast::zero);
+        BEAST_EXPECT(z == beast::kZERO);
 
         BEAST_EXPECT((z + z) == z);
         BEAST_EXPECT((z - z) == z);
         BEAST_EXPECT(z == -z);
 
-        IOUAmount const zz(beast::zero);
+        IOUAmount const zz(beast::kZERO);
         BEAST_EXPECT(z == zz);
 
         // https://github.com/XRPLF/rippled/issues/5170
         IOUAmount const zzz{};
-        BEAST_EXPECT(zzz == beast::zero);
+        BEAST_EXPECT(zzz == beast::kZERO);
         // BEAST_EXPECT(zzz == zz);
     }
 
@@ -58,32 +58,32 @@ public:
     {
         testcase("beast::Zero Comparisons");
 
-        using beast::zero;
+        using beast::kZERO;
 
         {
-            IOUAmount const z(zero);
-            BEAST_EXPECT(z == zero);
-            BEAST_EXPECT(z >= zero);
-            BEAST_EXPECT(z <= zero);
-            unexpected(z != zero);
-            unexpected(z > zero);
-            unexpected(z < zero);
+            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 < zero);
-            BEAST_EXPECT(neg <= zero);
-            BEAST_EXPECT(neg != zero);
-            unexpected(neg == zero);
+            BEAST_EXPECT(neg < kZERO);
+            BEAST_EXPECT(neg <= kZERO);
+            BEAST_EXPECT(neg != kZERO);
+            unexpected(neg == kZERO);
         }
 
         {
             IOUAmount const pos(2, 0);
-            BEAST_EXPECT(pos > zero);
-            BEAST_EXPECT(pos >= zero);
-            BEAST_EXPECT(pos != zero);
-            unexpected(pos == zero);
+            BEAST_EXPECT(pos > kZERO);
+            BEAST_EXPECT(pos >= kZERO);
+            BEAST_EXPECT(pos != kZERO);
+            unexpected(pos == kZERO);
         }
     }
 
@@ -157,7 +157,7 @@ public:
         };
 
         for (auto const mantissaSize :
-             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
+             {MantissaRange::MantissaScale::Small, MantissaRange::MantissaScale::Large})
         {
             NumberMantissaScaleGuard const mg(mantissaSize);
 
@@ -179,68 +179,68 @@ public:
         testcase("mulRatio");
 
         /* The range for the mantissa when normalized */
-        constexpr std::int64_t minMantissa = 1000000000000000ull;
-        constexpr std::int64_t maxMantissa = 9999999999999999ull;
+        constexpr std::int64_t kMIN_MANTISSA = 1000000000000000ull;
+        constexpr std::int64_t kMAX_MANTISSA = 9999999999999999ull;
         // log(2,maxMantissa) ~ 53.15
         /* The range for the exponent when normalized */
-        constexpr int minExponent = -96;
-        constexpr int maxExponent = 80;
-        constexpr auto maxUInt = std::numeric_limits<std::uint32_t>::max();
+        constexpr int kMIN_EXPONENT = -96;
+        constexpr int kMAX_EXPONENT = 80;
+        constexpr auto kMAX_U_INT = 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(maxMantissa, 0);
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, maxUInt, maxUInt, true));
+            IOUAmount const bigMan(kMAX_MANTISSA, 0);
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_U_INT, kMAX_U_INT, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, maxUInt, maxUInt, false));
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_U_INT, kMAX_U_INT, false));
         }
         {
             // Similar test as above, but for negative values
-            IOUAmount const bigMan(-maxMantissa, 0);
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, maxUInt, maxUInt, true));
+            IOUAmount const bigMan(-kMAX_MANTISSA, 0);
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_U_INT, kMAX_U_INT, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(bigMan == mulRatio(bigMan, maxUInt, maxUInt, false));
+            BEAST_EXPECT(bigMan == mulRatio(bigMan, kMAX_U_INT, kMAX_U_INT, false));
         }
 
         {
             // small amounts
-            IOUAmount const tiny(minMantissa, minExponent);
+            IOUAmount const tiny(kMIN_MANTISSA, kMIN_EXPONENT);
             // Round up should give the smallest allowable number
-            BEAST_EXPECT(tiny == mulRatio(tiny, 1, maxUInt, true));
-            BEAST_EXPECT(tiny == mulRatio(tiny, maxUInt - 1, maxUInt, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMAX_U_INT, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, kMAX_U_INT - 1, kMAX_U_INT, true));
             // rounding down should be zero
-            BEAST_EXPECT(beast::zero == mulRatio(tiny, 1, maxUInt, false));
-            BEAST_EXPECT(beast::zero == mulRatio(tiny, maxUInt - 1, maxUInt, false));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, 1, kMAX_U_INT, false));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, kMAX_U_INT - 1, kMAX_U_INT, false));
 
             // tiny negative numbers
-            IOUAmount const tinyNeg(-minMantissa, minExponent);
+            IOUAmount const tinyNeg(-kMIN_MANTISSA, kMIN_EXPONENT);
             // Round up should give zero
-            BEAST_EXPECT(beast::zero == mulRatio(tinyNeg, 1, maxUInt, true));
-            BEAST_EXPECT(beast::zero == mulRatio(tinyNeg, maxUInt - 1, maxUInt, true));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, 1, kMAX_U_INT, true));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, kMAX_U_INT - 1, kMAX_U_INT, true));
             // rounding down should be tiny
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, 1, maxUInt, false));
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, maxUInt - 1, maxUInt, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, 1, kMAX_U_INT, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMAX_U_INT - 1, kMAX_U_INT, false));
         }
 
         {  // rounding
             {
                 IOUAmount const one(1, 0);
-                auto const rup = mulRatio(one, maxUInt - 1, maxUInt, true);
-                auto const rdown = mulRatio(one, maxUInt - 1, maxUInt, false);
+                auto const rup = mulRatio(one, kMAX_U_INT - 1, kMAX_U_INT, true);
+                auto const rdown = mulRatio(one, kMAX_U_INT - 1, kMAX_U_INT, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
             {
-                IOUAmount const big(maxMantissa, maxExponent);
-                auto const rup = mulRatio(big, maxUInt - 1, maxUInt, true);
-                auto const rdown = mulRatio(big, maxUInt - 1, maxUInt, false);
+                IOUAmount const big(kMAX_MANTISSA, kMAX_EXPONENT);
+                auto const rup = mulRatio(big, kMAX_U_INT - 1, kMAX_U_INT, true);
+                auto const rdown = mulRatio(big, kMAX_U_INT - 1, kMAX_U_INT, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
 
             {
                 IOUAmount const negOne(-1, 0);
-                auto const rup = mulRatio(negOne, maxUInt - 1, maxUInt, true);
-                auto const rdown = mulRatio(negOne, maxUInt - 1, maxUInt, false);
+                auto const rup = mulRatio(negOne, kMAX_U_INT - 1, kMAX_U_INT, true);
+                auto const rdown = mulRatio(negOne, kMAX_U_INT - 1, kMAX_U_INT, false);
                 BEAST_EXPECT(rup.mantissa() - rdown.mantissa() == 1);
             }
         }
@@ -253,7 +253,7 @@ public:
 
         {
             // overflow
-            IOUAmount big(maxMantissa, maxExponent);
+            IOUAmount big(kMAX_MANTISSA, kMAX_EXPONENT);
             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 23b0c43499..50d3fab7a2 100644
--- a/src/test/basics/IntrusiveShared_test.cpp
+++ b/src/test/basics/IntrusiveShared_test.cpp
@@ -59,7 +59,7 @@ struct Barrier
     }
 
     void
-    arrive_and_wait()
+    arriveAndWait()
     {
         std::unique_lock lock(mtx);
         if (--count == 0)
@@ -76,19 +76,19 @@ struct Barrier
 
 namespace {
 enum class TrackedState : std::uint8_t {
-    uninitialized,
-    alive,
-    partiallyDeletedStarted,
-    partiallyDeleted,
-    deletedStarted,
-    deleted
+    Uninitialized,
+    Alive,
+    PartiallyDeletedStarted,
+    PartiallyDeleted,
+    DeletedStarted,
+    Deleted
 };
 
 class TIBase : public IntrusiveRefCounts
 {
 public:
-    static constexpr std::size_t maxStates = 128;
-    static std::array<std::atomic<TrackedState>, maxStates> state;
+    static constexpr std::size_t kMAX_STATES = 128;
+    static std::array<std::atomic<TrackedState>, kMAX_STATES> state;
     static std::atomic<int> nextId;
     static TrackedState
     getState(int id)
@@ -99,53 +99,53 @@ public:
     static void
     resetStates(bool resetCallback)
     {
-        for (int i = 0; i < maxStates; ++i)
+        for (int i = 0; i < kMAX_STATES; ++i)
         {
-            state[i].store(TrackedState::uninitialized, std::memory_order_release);
+            state[i].store(TrackedState::Uninitialized, std::memory_order_release);
         }
         nextId.store(0, std::memory_order_release);
         if (resetCallback)
-            TIBase::tracingCallback_ = [](TrackedState, std::optional<TrackedState>) {};
+            TIBase::tracingCallback = [](TrackedState, std::optional<TrackedState>) {};
     }
 
     struct ResetStatesGuard
     {
-        bool resetCallback_{false};
+        bool resetCallback{false};
 
-        ResetStatesGuard(bool resetCallback) : resetCallback_{resetCallback}
+        ResetStatesGuard(bool resetCallback) : resetCallback{resetCallback}
         {
-            TIBase::resetStates(resetCallback_);
+            TIBase::resetStates(resetCallback);
         }
         ~ResetStatesGuard()
         {
-            TIBase::resetStates(resetCallback_);
+            TIBase::resetStates(resetCallback);
         }
     };
 
-    TIBase() : id_{checkoutID()}
+    TIBase() : id{checkoutID()}
     {
-        assert(state.size() > id_);
-        state[id_].store(TrackedState::alive, std::memory_order_relaxed);
+        assert(state.size() > id);
+        state[id].store(TrackedState::Alive, std::memory_order_relaxed);
     }
     ~TIBase() override
     {
         using enum TrackedState;
 
-        assert(state.size() > id_);
-        tracingCallback_(state[id_].load(std::memory_order_relaxed), deletedStarted);
+        assert(state.size() > id);
+        tracingCallback(state[id].load(std::memory_order_relaxed), DeletedStarted);
 
-        assert(state.size() > id_);
+        assert(state.size() > id);
         // Use relaxed memory order to try to avoid atomic operations from
         // adding additional memory synchronizations that may hide threading
         // errors in the underlying shared pointer class.
-        state[id_].store(deletedStarted, std::memory_order_relaxed);
+        state[id].store(DeletedStarted, std::memory_order_relaxed);
 
-        tracingCallback_(deletedStarted, deleted);
+        tracingCallback(DeletedStarted, Deleted);
 
-        assert(state.size() > id_);
-        state[id_].store(TrackedState::deleted, std::memory_order_relaxed);
+        assert(state.size() > id);
+        state[id].store(TrackedState::Deleted, std::memory_order_relaxed);
 
-        tracingCallback_(TrackedState::deleted, std::nullopt);
+        tracingCallback(TrackedState::Deleted, std::nullopt);
     }
 
     void
@@ -153,23 +153,23 @@ public:
     {
         using enum TrackedState;
 
-        assert(state.size() > id_);
-        tracingCallback_(state[id_].load(std::memory_order_relaxed), partiallyDeletedStarted);
+        assert(state.size() > id);
+        tracingCallback(state[id].load(std::memory_order_relaxed), PartiallyDeletedStarted);
 
-        assert(state.size() > id_);
-        state[id_].store(partiallyDeletedStarted, std::memory_order_relaxed);
+        assert(state.size() > id);
+        state[id].store(PartiallyDeletedStarted, std::memory_order_relaxed);
 
-        tracingCallback_(partiallyDeletedStarted, partiallyDeleted);
+        tracingCallback(PartiallyDeletedStarted, PartiallyDeleted);
 
-        assert(state.size() > id_);
-        state[id_].store(partiallyDeleted, std::memory_order_relaxed);
+        assert(state.size() > id);
+        state[id].store(PartiallyDeleted, std::memory_order_relaxed);
 
-        tracingCallback_(partiallyDeleted, std::nullopt);
+        tracingCallback(PartiallyDeleted, std::nullopt);
     }
 
-    static std::function<void(TrackedState, std::optional<TrackedState>)> tracingCallback_;
+    static std::function<void(TrackedState, std::optional<TrackedState>)> tracingCallback;
 
-    int id_;
+    int id;
 
 private:
     static int
@@ -179,15 +179,15 @@ private:
     }
 };
 
-std::array<std::atomic<TrackedState>, TIBase::maxStates> TIBase::state;
+std::array<std::atomic<TrackedState>, TIBase::kMAX_STATES> TIBase::state;
 std::atomic<int> TIBase::nextId{0};
 
-std::function<void(TrackedState, std::optional<TrackedState>)> TIBase::tracingCallback_ =
+std::function<void(TrackedState, std::optional<TrackedState>)> TIBase::tracingCallback =
     [](TrackedState, std::optional<TrackedState>) {};
 
 }  // namespace
 
-class IntrusiveShared_test : public beast::unit_test::suite
+class IntrusiveShared_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -199,17 +199,17 @@ public:
             TIBase::ResetStatesGuard const rsg{true};
 
             TIBase const b;
-            BEAST_EXPECT(b.use_count() == 1);
+            BEAST_EXPECT(b.useCount() == 1);
             b.addWeakRef();
-            BEAST_EXPECT(b.use_count() == 1);
+            BEAST_EXPECT(b.useCount() == 1);
             auto s = b.releaseStrongRef();
-            BEAST_EXPECT(s == ReleaseStrongRefAction::partialDestroy);
-            BEAST_EXPECT(b.use_count() == 0);
+            BEAST_EXPECT(s == ReleaseStrongRefAction::PartialDestroy);
+            BEAST_EXPECT(b.useCount() == 0);
             TIBase const* pb = &b;
             partialDestructorFinished(&pb);
             BEAST_EXPECT(!pb);
             auto w = b.releaseWeakRef();
-            BEAST_EXPECT(w == ReleaseWeakRefAction::destroy);
+            BEAST_EXPECT(w == ReleaseWeakRefAction::Destroy);
         }
 
         std::vector<SharedIntrusive<TIBase>> strong;
@@ -218,109 +218,109 @@ public:
             TIBase::ResetStatesGuard const rsg{true};
 
             using enum TrackedState;
-            auto b = make_SharedIntrusive<TIBase>();
-            auto id = b->id_;
-            BEAST_EXPECT(TIBase::getState(id) == alive);
-            BEAST_EXPECT(b->use_count() == 1);
+            auto b = makeSharedIntrusive<TIBase>();
+            auto id = b->id;
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
+            BEAST_EXPECT(b->useCount() == 1);
             for (int i = 0; i < 10; ++i)
             {
                 strong.push_back(b);
             }
             b.reset();
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             strong.resize(strong.size() - 1);
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             strong.clear();
-            BEAST_EXPECT(TIBase::getState(id) == deleted);
+            BEAST_EXPECT(TIBase::getState(id) == Deleted);
 
-            b = make_SharedIntrusive<TIBase>();
-            id = b->id_;
-            BEAST_EXPECT(TIBase::getState(id) == alive);
-            BEAST_EXPECT(b->use_count() == 1);
+            b = makeSharedIntrusive<TIBase>();
+            id = b->id;
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
+            BEAST_EXPECT(b->useCount() == 1);
             for (int i = 0; i < 10; ++i)
             {
                 weak.emplace_back(b);
-                BEAST_EXPECT(b->use_count() == 1);
+                BEAST_EXPECT(b->useCount() == 1);
             }
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             weak.resize(weak.size() - 1);
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             b.reset();
-            BEAST_EXPECT(TIBase::getState(id) == partiallyDeleted);
+            BEAST_EXPECT(TIBase::getState(id) == PartiallyDeleted);
             while (!weak.empty())
             {
                 weak.resize(weak.size() - 1);
                 if (!weak.empty())
-                    BEAST_EXPECT(TIBase::getState(id) == partiallyDeleted);
+                    BEAST_EXPECT(TIBase::getState(id) == PartiallyDeleted);
             }
-            BEAST_EXPECT(TIBase::getState(id) == deleted);
+            BEAST_EXPECT(TIBase::getState(id) == Deleted);
         }
         {
             TIBase::ResetStatesGuard const rsg{true};
 
             using enum TrackedState;
-            auto b = make_SharedIntrusive<TIBase>();
-            auto id = b->id_;
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            auto b = makeSharedIntrusive<TIBase>();
+            auto id = b->id;
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             WeakIntrusive<TIBase> w{b};
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             auto s = w.lock();
-            BEAST_EXPECT(s && s->use_count() == 2);
+            BEAST_EXPECT(s && s->useCount() == 2);
             b.reset();
-            BEAST_EXPECT(TIBase::getState(id) == alive);
-            BEAST_EXPECT(s && s->use_count() == 1);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
+            BEAST_EXPECT(s && s->useCount() == 1);
             s.reset();
-            BEAST_EXPECT(TIBase::getState(id) == partiallyDeleted);
+            BEAST_EXPECT(TIBase::getState(id) == PartiallyDeleted);
             BEAST_EXPECT(w.expired());
             s = w.lock();
             // Cannot convert a weak pointer to a strong pointer if object is
             // already partially deleted
             BEAST_EXPECT(!s);
             w.reset();
-            BEAST_EXPECT(TIBase::getState(id) == deleted);
+            BEAST_EXPECT(TIBase::getState(id) == Deleted);
         }
         {
             TIBase::ResetStatesGuard const rsg{true};
 
             using enum TrackedState;
             using swu = SharedWeakUnion<TIBase>;
-            swu b = make_SharedIntrusive<TIBase>();
-            BEAST_EXPECT(b.isStrong() && b.use_count() == 1);
-            auto id = b.get()->id_;
-            BEAST_EXPECT(TIBase::getState(id) == alive);
+            swu b = makeSharedIntrusive<TIBase>();
+            BEAST_EXPECT(b.isStrong() && b.useCount() == 1);
+            auto id = b.get()->id;
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
             swu w = b;
-            BEAST_EXPECT(TIBase::getState(id) == alive);
-            BEAST_EXPECT(w.isStrong() && b.use_count() == 2);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
+            BEAST_EXPECT(w.isStrong() && b.useCount() == 2);
             w.convertToWeak();
-            BEAST_EXPECT(w.isWeak() && b.use_count() == 1);
+            BEAST_EXPECT(w.isWeak() && b.useCount() == 1);
             swu s = w;
-            BEAST_EXPECT(s.isWeak() && b.use_count() == 1);
+            BEAST_EXPECT(s.isWeak() && b.useCount() == 1);
             s.convertToStrong();
-            BEAST_EXPECT(s.isStrong() && b.use_count() == 2);
+            BEAST_EXPECT(s.isStrong() && b.useCount() == 2);
             b.reset();
-            BEAST_EXPECT(TIBase::getState(id) == alive);
-            BEAST_EXPECT(s.use_count() == 1);
+            BEAST_EXPECT(TIBase::getState(id) == Alive);
+            BEAST_EXPECT(s.useCount() == 1);
             BEAST_EXPECT(!w.expired());
             s.reset();
-            BEAST_EXPECT(TIBase::getState(id) == partiallyDeleted);
+            BEAST_EXPECT(TIBase::getState(id) == PartiallyDeleted);
             BEAST_EXPECT(w.expired());
             w.convertToStrong();
             // Cannot convert a weak pointer to a strong pointer if object is
             // already partially deleted
             BEAST_EXPECT(w.isWeak());
             w.reset();
-            BEAST_EXPECT(TIBase::getState(id) == deleted);
+            BEAST_EXPECT(TIBase::getState(id) == Deleted);
         }
         {
             // Testing SharedWeakUnion assignment operator
 
             TIBase::ResetStatesGuard const rsg{true};
 
-            auto strong1 = make_SharedIntrusive<TIBase>();
-            auto strong2 = make_SharedIntrusive<TIBase>();
+            auto strong1 = makeSharedIntrusive<TIBase>();
+            auto strong2 = makeSharedIntrusive<TIBase>();
 
-            auto id1 = strong1->id_;
-            auto id2 = strong2->id_;
+            auto id1 = strong1->id;
+            auto id2 = strong2->id;
 
             BEAST_EXPECT(id1 != id2);
 
@@ -337,20 +337,20 @@ public:
             BEAST_EXPECT(union1.isStrong());
             BEAST_EXPECT(union2.isStrong());
             BEAST_EXPECT(union1.get() == union2.get());
-            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::alive);
-            BEAST_EXPECT(TIBase::getState(id2) == TrackedState::alive);
+            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::Alive);
+            BEAST_EXPECT(TIBase::getState(id2) == TrackedState::Alive);
 
             // 2) Test self-assignment
             BEAST_EXPECT(union1.isStrong());
-            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::alive);
-            int const initialRefCount = strong1->use_count();
+            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::Alive);
+            int const initialRefCount = strong1->useCount();
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-assign-overloaded"
             union1 = union1;  // Self-assignment
 #pragma clang diagnostic pop
             BEAST_EXPECT(union1.isStrong());
-            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::alive);
-            BEAST_EXPECT(strong1->use_count() == initialRefCount);
+            BEAST_EXPECT(TIBase::getState(id1) == TrackedState::Alive);
+            BEAST_EXPECT(strong1->useCount() == initialRefCount);
 
             // 3) Test assignment from null union pointer
             union1 = SharedWeakUnion<TIBase>();
@@ -361,7 +361,7 @@ public:
             union2.reset();
             union1 = union2;
             BEAST_EXPECT(union1.get() == nullptr);
-            BEAST_EXPECT(TIBase::getState(id2) == TrackedState::deleted);
+            BEAST_EXPECT(TIBase::getState(id2) == TrackedState::Deleted);
         }
     }
 
@@ -381,23 +381,23 @@ public:
 
         TIBase::ResetStatesGuard const rsg{true};
 
-        auto strong = make_SharedIntrusive<TIBase>();
+        auto strong = makeSharedIntrusive<TIBase>();
         WeakIntrusive<TIBase> weak{strong};
         bool destructorRan = false;
         bool partialDeleteRan = false;
         std::latch partialDeleteStartedSyncPoint{2};
-        strong->tracingCallback_ = [&](TrackedState cur, std::optional<TrackedState> next) {
+        strong->tracingCallback = [&](TrackedState cur, std::optional<TrackedState> next) {
             using enum TrackedState;
-            if (next == deletedStarted)
+            if (next == DeletedStarted)
             {
                 // strong goes out of scope while weak is still in scope
                 // This checks that partialDelete has run to completion
                 // before the destructor is called. A sleep is inserted
                 // inside the partial delete to make sure the destructor is
                 // given an opportunity to run during partial delete.
-                BEAST_EXPECT(cur == partiallyDeleted);
+                BEAST_EXPECT(cur == PartiallyDeleted);
             }
-            if (next == partiallyDeletedStarted)
+            if (next == PartiallyDeletedStarted)
             {
                 partialDeleteStartedSyncPoint.arrive_and_wait();
                 using namespace std::chrono_literals;
@@ -406,12 +406,12 @@ public:
                 // is running. The test is to make sure that doesn't happen.
                 std::this_thread::sleep_for(800ms);
             }
-            if (next == partiallyDeleted)
+            if (next == PartiallyDeleted)
             {
                 BEAST_EXPECT(!partialDeleteRan && !destructorRan);
                 partialDeleteRan = true;
             }
-            if (next == deleted)
+            if (next == Deleted)
             {
                 BEAST_EXPECT(!destructorRan);
                 destructorRan = true;
@@ -448,19 +448,19 @@ public:
 
         TIBase::ResetStatesGuard const rsg{true};
 
-        auto strong = make_SharedIntrusive<TIBase>();
+        auto strong = makeSharedIntrusive<TIBase>();
         WeakIntrusive<TIBase> weak{strong};
         bool destructorRan = false;
         bool partialDeleteRan = false;
         std::latch weakResetSyncPoint{2};
-        strong->tracingCallback_ = [&](TrackedState cur, std::optional<TrackedState> next) {
+        strong->tracingCallback = [&](TrackedState cur, std::optional<TrackedState> next) {
             using enum TrackedState;
-            if (next == partiallyDeleted)
+            if (next == PartiallyDeleted)
             {
                 BEAST_EXPECT(!partialDeleteRan && !destructorRan);
                 partialDeleteRan = true;
             }
-            if (next == deleted)
+            if (next == Deleted)
             {
                 BEAST_EXPECT(!destructorRan);
                 destructorRan = true;
@@ -508,12 +508,12 @@ public:
         auto tracingCallback = [&](TrackedState cur, std::optional<TrackedState> next) {
             using enum TrackedState;
             auto [destructorRan, partialDeleteRan] = getDestructorState();
-            if (next == partiallyDeleted)
+            if (next == PartiallyDeleted)
             {
                 BEAST_EXPECT(!partialDeleteRan && !destructorRan);
                 setPartialDeleteRan();
             }
-            if (next == deleted)
+            if (next == Deleted)
             {
                 BEAST_EXPECT(!destructorRan);
                 setDestructorRan();
@@ -539,17 +539,17 @@ public:
             }
             return result;
         };
-        constexpr int loopIters = 2 * 1024;
-        constexpr int numThreads = 16;
+        constexpr int kLOOP_ITERS = 2 * 1024;
+        constexpr int kNUM_THREADS = 16;
         std::vector<SharedIntrusive<TIBase>> toClone;
-        Barrier loopStartSyncPoint{numThreads};
-        Barrier postCreateToCloneSyncPoint{numThreads};
-        Barrier postCreateVecOfPointersSyncPoint{numThreads};
+        Barrier loopStartSyncPoint{kNUM_THREADS};
+        Barrier postCreateToCloneSyncPoint{kNUM_THREADS};
+        Barrier postCreateVecOfPointersSyncPoint{kNUM_THREADS};
         auto engines = [&]() -> std::vector<std::default_random_engine> {
             std::random_device rd;
             std::vector<std::default_random_engine> result;
-            result.reserve(numThreads);
-            for (int i = 0; i < numThreads; ++i)
+            result.reserve(kNUM_THREADS);
+            for (int i = 0; i < kNUM_THREADS; ++i)
                 result.emplace_back(rd());
             return result;
         }();
@@ -558,10 +558,10 @@ public:
         // strong and weak pointers and destroys them all at once.
         // threadId==0 is special.
         auto cloneAndDestroy = [&](int threadId) {
-            for (int i = 0; i < loopIters; ++i)
+            for (int i = 0; i < kLOOP_ITERS; ++i)
             {
                 // ------ Sync Point ------
-                loopStartSyncPoint.arrive_and_wait();
+                loopStartSyncPoint.arriveAndWait();
 
                 // only thread 0 should reset the state
                 std::optional<TIBase::ResetStatesGuard> rsg;
@@ -578,31 +578,31 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toClone.clear();
-                    toClone.resize(numThreads);
-                    auto strong = make_SharedIntrusive<TIBase>();
-                    strong->tracingCallback_ = tracingCallback;
+                    toClone.resize(kNUM_THREADS);
+                    auto strong = makeSharedIntrusive<TIBase>();
+                    strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toClone, strong);
                 }
 
                 // ------ Sync Point ------
-                postCreateToCloneSyncPoint.arrive_and_wait();
+                postCreateToCloneSyncPoint.arriveAndWait();
 
                 auto v = createVecOfPointers(toClone[threadId], engines[threadId]);
                 toClone[threadId].reset();
 
                 // ------ Sync Point ------
-                postCreateVecOfPointersSyncPoint.arrive_and_wait();
+                postCreateVecOfPointersSyncPoint.arriveAndWait();
 
                 v.clear();
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(numThreads);
-        for (int i = 0; i < numThreads; ++i)
+        threads.reserve(kNUM_THREADS);
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads.emplace_back(cloneAndDestroy, i);
         }
-        for (int i = 0; i < numThreads; ++i)
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads[i].join();
         }
@@ -642,12 +642,12 @@ public:
         auto tracingCallback = [&](TrackedState cur, std::optional<TrackedState> next) {
             using enum TrackedState;
             auto [destructorRan, partialDeleteRan] = getDestructorState();
-            if (next == partiallyDeleted)
+            if (next == PartiallyDeleted)
             {
                 BEAST_EXPECT(!partialDeleteRan && !destructorRan);
                 setPartialDeleteRan();
             }
-            if (next == deleted)
+            if (next == Deleted)
             {
                 BEAST_EXPECT(!destructorRan);
                 setDestructorRan();
@@ -664,19 +664,19 @@ public:
                 result.emplace_back(SharedIntrusive<TIBase>(toClone));
             return result;
         };
-        constexpr int loopIters = 2 * 1024;
-        constexpr int flipPointersLoopIters = 256;
-        constexpr int numThreads = 16;
+        constexpr int kLOOP_ITERS = 2 * 1024;
+        constexpr int kFLIP_POINTERS_LOOP_ITERS = 256;
+        constexpr int kNUM_THREADS = 16;
         std::vector<SharedIntrusive<TIBase>> toClone;
-        Barrier loopStartSyncPoint{numThreads};
-        Barrier postCreateToCloneSyncPoint{numThreads};
-        Barrier postCreateVecOfPointersSyncPoint{numThreads};
-        Barrier postFlipPointersLoopSyncPoint{numThreads};
+        Barrier loopStartSyncPoint{kNUM_THREADS};
+        Barrier postCreateToCloneSyncPoint{kNUM_THREADS};
+        Barrier postCreateVecOfPointersSyncPoint{kNUM_THREADS};
+        Barrier postFlipPointersLoopSyncPoint{kNUM_THREADS};
         auto engines = [&]() -> std::vector<std::default_random_engine> {
             std::random_device rd;
             std::vector<std::default_random_engine> result;
-            result.reserve(numThreads);
-            for (int i = 0; i < numThreads; ++i)
+            result.reserve(kNUM_THREADS);
+            for (int i = 0; i < kNUM_THREADS; ++i)
                 result.emplace_back(rd());
             return result;
         }();
@@ -686,10 +686,10 @@ public:
         // changes strong pointers to weak pointers,  and destroys them
         // all at once.
         auto cloneAndDestroy = [&](int threadId) {
-            for (int i = 0; i < loopIters; ++i)
+            for (int i = 0; i < kLOOP_ITERS; ++i)
             {
                 // ------ Sync Point ------
-                loopStartSyncPoint.arrive_and_wait();
+                loopStartSyncPoint.arriveAndWait();
 
                 // only thread 0 should reset the state
                 std::optional<TIBase::ResetStatesGuard> rsg;
@@ -705,23 +705,23 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toClone.clear();
-                    toClone.resize(numThreads);
-                    auto strong = make_SharedIntrusive<TIBase>();
-                    strong->tracingCallback_ = tracingCallback;
+                    toClone.resize(kNUM_THREADS);
+                    auto strong = makeSharedIntrusive<TIBase>();
+                    strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toClone, strong);
                 }
 
                 // ------ Sync Point ------
-                postCreateToCloneSyncPoint.arrive_and_wait();
+                postCreateToCloneSyncPoint.arriveAndWait();
 
                 auto v = createVecOfPointers(toClone[threadId], engines[threadId]);
                 toClone[threadId].reset();
 
                 // ------ Sync Point ------
-                postCreateVecOfPointersSyncPoint.arrive_and_wait();
+                postCreateVecOfPointersSyncPoint.arriveAndWait();
 
                 std::uniform_int_distribution<> isStrongDist(0, 1);
-                for (int f = 0; f < flipPointersLoopIters; ++f)
+                for (int f = 0; f < kFLIP_POINTERS_LOOP_ITERS; ++f)
                 {
                     for (auto& p : v)
                     {
@@ -737,18 +737,18 @@ public:
                 }
 
                 // ------ Sync Point ------
-                postFlipPointersLoopSyncPoint.arrive_and_wait();
+                postFlipPointersLoopSyncPoint.arriveAndWait();
 
                 v.clear();
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(numThreads);
-        for (int i = 0; i < numThreads; ++i)
+        threads.reserve(kNUM_THREADS);
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads.emplace_back(cloneAndDestroy, i);
         }
-        for (int i = 0; i < numThreads; ++i)
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads[i].join();
         }
@@ -783,34 +783,34 @@ public:
         auto tracingCallback = [&](TrackedState cur, std::optional<TrackedState> next) {
             using enum TrackedState;
             auto [destructorRan, partialDeleteRan] = getDestructorState();
-            if (next == partiallyDeleted)
+            if (next == PartiallyDeleted)
             {
                 BEAST_EXPECT(!partialDeleteRan && !destructorRan);
                 setPartialDeleteRan();
             }
-            if (next == deleted)
+            if (next == Deleted)
             {
                 BEAST_EXPECT(!destructorRan);
                 setDestructorRan();
             }
         };
 
-        constexpr int loopIters = 2 * 1024;
-        constexpr int lockWeakLoopIters = 256;
-        constexpr int numThreads = 16;
+        constexpr int kLOOP_ITERS = 2 * 1024;
+        constexpr int kLOCK_WEAK_LOOP_ITERS = 256;
+        constexpr int kNUM_THREADS = 16;
         std::vector<SharedIntrusive<TIBase>> toLock;
-        Barrier loopStartSyncPoint{numThreads};
-        Barrier postCreateToLockSyncPoint{numThreads};
-        Barrier postLockWeakLoopSyncPoint{numThreads};
+        Barrier loopStartSyncPoint{kNUM_THREADS};
+        Barrier postCreateToLockSyncPoint{kNUM_THREADS};
+        Barrier postLockWeakLoopSyncPoint{kNUM_THREADS};
 
         // 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 < loopIters; ++i)
+            for (int i = 0; i < kLOOP_ITERS; ++i)
             {
                 // ------ Sync Point ------
-                loopStartSyncPoint.arrive_and_wait();
+                loopStartSyncPoint.arriveAndWait();
 
                 // only thread 0 should reset the state
                 std::optional<TIBase::ResetStatesGuard> rsg;
@@ -826,19 +826,19 @@ public:
                     destructionState.store(0, std::memory_order_release);
 
                     toLock.clear();
-                    toLock.resize(numThreads);
-                    auto strong = make_SharedIntrusive<TIBase>();
-                    strong->tracingCallback_ = tracingCallback;
+                    toLock.resize(kNUM_THREADS);
+                    auto strong = makeSharedIntrusive<TIBase>();
+                    strong->tracingCallback = tracingCallback;
                     std::ranges::fill(toLock, strong);
                 }
 
                 // ------ Sync Point ------
-                postCreateToLockSyncPoint.arrive_and_wait();
+                postCreateToLockSyncPoint.arriveAndWait();
 
                 // Multiple threads all create a weak pointer from the same
                 // strong pointer
                 WeakIntrusive const weak{toLock[threadId]};
-                for (int wi = 0; wi < lockWeakLoopIters; ++wi)
+                for (int wi = 0; wi < kLOCK_WEAK_LOOP_ITERS; ++wi)
                 {
                     BEAST_EXPECT(!weak.expired());
                     auto strong = weak.lock();
@@ -846,18 +846,18 @@ public:
                 }
 
                 // ------ Sync Point ------
-                postLockWeakLoopSyncPoint.arrive_and_wait();
+                postLockWeakLoopSyncPoint.arriveAndWait();
 
                 toLock[threadId].reset();
             }
         };
         std::vector<std::thread> threads;
-        threads.reserve(numThreads);
-        for (int i = 0; i < numThreads; ++i)
+        threads.reserve(kNUM_THREADS);
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads.emplace_back(lockAndDestroy, i);
         }
-        for (int i = 0; i < numThreads; ++i)
+        for (int i = 0; i < kNUM_THREADS; ++i)
         {
             threads[i].join();
         }
diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp
index 2370f87f5d..e83ae4c277 100644
--- a/src/test/basics/KeyCache_test.cpp
+++ b/src/test/basics/KeyCache_test.cpp
@@ -10,7 +10,7 @@
 
 namespace xrpl {
 
-class KeyCache_test : public beast::unit_test::suite
+class KeyCache_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -33,14 +33,14 @@ public:
             BEAST_EXPECT(c.insert("one"));
             BEAST_EXPECT(!c.insert("one"));
             BEAST_EXPECT(c.size() == 1);
-            BEAST_EXPECT(c.touch_if_exists("one"));
+            BEAST_EXPECT(c.touchIfExists("one"));
             ++clock;
             c.sweep();
             BEAST_EXPECT(c.size() == 1);
             ++clock;
             c.sweep();
             BEAST_EXPECT(c.size() == 0);
-            BEAST_EXPECT(!c.touch_if_exists("one"));
+            BEAST_EXPECT(!c.touchIfExists("one"));
         }
 
         // Insert two items, have one expire
@@ -54,7 +54,7 @@ public:
             ++clock;
             c.sweep();
             BEAST_EXPECT(c.size() == 2);
-            BEAST_EXPECT(c.touch_if_exists("two"));
+            BEAST_EXPECT(c.touchIfExists("two"));
             ++clock;
             c.sweep();
             BEAST_EXPECT(c.size() == 1);
diff --git a/src/test/basics/Number_test.cpp b/src/test/basics/Number_test.cpp
index 607ae004b1..9e06d6de53 100644
--- a/src/test/basics/Number_test.cpp
+++ b/src/test/basics/Number_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl {
 
-class Number_test : public beast::unit_test::suite
+class Number_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -37,7 +37,7 @@ public:
     }
 
     void
-    test_limits()
+    testLimits()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_limits " << to_string(scale);
@@ -46,7 +46,7 @@ public:
         try
         {
             [[maybe_unused]] Number const x =
-                Number{false, minMantissa * 10, 32768, Number::normalized{}};
+                Number{false, minMantissa * 10, 32768, Number::Normalized{}};
         }
         catch (std::overflow_error const&)
         {
@@ -62,32 +62,32 @@ public:
         };
 
         test(
-            Number{false, minMantissa * 10, 32767, Number::normalized{}},
-            Number{false, minMantissa, 32768, Number::normalized{}},
+            Number{false, minMantissa * 10, 32767, Number::Normalized{}},
+            Number{false, minMantissa, 32768, Number::Normalized{}},
             __LINE__);
-        test(Number{false, minMantissa, -32769, Number::normalized{}}, Number{}, __LINE__);
+        test(Number{false, minMantissa, -32769, Number::Normalized{}}, Number{}, __LINE__);
         test(
-            Number{false, minMantissa, 32000, Number::normalized{}} * 1'000 +
-                Number{false, 1'500, 32000, Number::normalized{}},
-            Number{false, minMantissa + 2, 32003, Number::normalized{}},
+            Number{false, minMantissa, 32000, Number::Normalized{}} * 1'000 +
+                Number{false, 1'500, 32000, Number::Normalized{}},
+            Number{false, minMantissa + 2, 32003, Number::Normalized{}},
             __LINE__);
         // 9,223,372,036,854,775,808
 
         test(
             Number{std::numeric_limits<std::int64_t>::min()},
-            scale == MantissaRange::mantissa_scale::small
+            scale == MantissaRange::MantissaScale::Small
                 ? Number{-9'223'372'036'854'776, 3}
-                : Number{true, 9'223'372'036'854'775'808ULL, 0, Number::normalized{}},
+                : Number{true, 9'223'372'036'854'775'808ULL, 0, Number::Normalized{}},
             __LINE__);
         test(
             Number{std::numeric_limits<std::int64_t>::min() + 1},
-            scale == MantissaRange::mantissa_scale::small ? Number{-9'223'372'036'854'776, 3}
-                                                          : Number{-9'223'372'036'854'775'807},
+            scale == MantissaRange::MantissaScale::Small ? Number{-9'223'372'036'854'776, 3}
+                                                         : Number{-9'223'372'036'854'775'807},
             __LINE__);
         test(
             Number{std::numeric_limits<std::int64_t>::max()},
             Number{
-                scale == MantissaRange::mantissa_scale::small
+                scale == MantissaRange::MantissaScale::Small
                     ? 9'223'372'036'854'776
                     : std::numeric_limits<std::int64_t>::max(),
                 18 - Number::mantissaLog()},
@@ -96,7 +96,7 @@ public:
         try
         {
             [[maybe_unused]]
-            Number const q = Number{false, minMantissa, 32767, Number::normalized{}} * 100;
+            Number const q = Number{false, minMantissa, 32767, Number::Normalized{}} * 100;
         }
         catch (std::overflow_error const&)
         {
@@ -106,7 +106,7 @@ public:
     }
 
     void
-    test_add()
+    testAdd()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_add " << to_string(scale);
@@ -146,10 +146,10 @@ public:
                  Number{-1'000'000'000'000'065'556, -18}},
                 {Number{-1'000'000'000'000'000, -15},
                  Number{6'555'555'555'555'555, -29},
-                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{-6'555'555'555'555'555, -29},
                  Number{1'000'000'000'000'000, -15},
-                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{}, Number{5}, Number{5}},
                 {Number{5}, Number{}, Number{5}},
                 {Number{5'555'555'555'555'555'000, -32768},
@@ -167,25 +167,25 @@ public:
                  Number{-1'000'000'000'000'000'066, -18}},
                 {Number{-1'000'000'000'000'000'000, -18},
                  Number{6'555'555'555'555'555'555, -35},
-                 Number{true, 9'999'999'999'999'999'344ULL, -19, Number::normalized{}}},
+                 Number{true, 9'999'999'999'999'999'344ULL, -19, Number::Normalized{}}},
                 {Number{-6'555'555'555'555'555'555, -35},
                  Number{1'000'000'000'000'000'000, -18},
-                 Number{false, 9'999'999'999'999'999'344ULL, -19, Number::normalized{}}},
+                 Number{false, 9'999'999'999'999'999'344ULL, -19, Number::Normalized{}}},
                 {Number{}, Number{5}, Number{5}},
                 {Number{5'555'555'555'555'555'555, -32768},
                  Number{-5'555'555'555'555'555'554, -32768},
                  Number{0}},
-                {Number{true, 9'999'999'999'999'999'999ULL, -37, Number::normalized{}},
+                {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::maxRep}, Number{6, -1}, Number{Number::maxRep / 10, 1}},
-                {Number{Number::maxRep - 1}, Number{1, 0}, Number{Number::maxRep}},
+                 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}},
                 // Test extremes
                 {
                     // Each Number operand rounds up, so the actual mantissa is
                     // minMantissa
-                    Number{false, 9'999'999'999'999'999'999ULL, 0, Number::normalized{}},
-                    Number{false, 9'999'999'999'999'999'999ULL, 0, Number::normalized{}},
+                    Number{false, 9'999'999'999'999'999'999ULL, 0, Number::Normalized{}},
+                    Number{false, 9'999'999'999'999'999'999ULL, 0, Number::Normalized{}},
                     Number{2, 19},
                 },
                 {
@@ -194,9 +194,9 @@ public:
                     // With addition using uint128_t, there's no problem. After
                     // normalizing, the resulting mantissa ends up less than
                     // maxRep.
-                    Number{false, 9'999'999'999'999'999'990ULL, 0, Number::normalized{}},
-                    Number{false, 9'999'999'999'999'999'990ULL, 0, Number::normalized{}},
-                    Number{false, 1'999'999'999'999'999'998ULL, 1, Number::normalized{}},
+                    Number{false, 9'999'999'999'999'999'990ULL, 0, Number::Normalized{}},
+                    Number{false, 9'999'999'999'999'999'990ULL, 0, Number::Normalized{}},
+                    Number{false, 1'999'999'999'999'999'998ULL, 1, Number::Normalized{}},
                 },
             });
         auto test = [this](auto const& c) {
@@ -208,7 +208,7 @@ public:
                 BEAST_EXPECTS(result == z, ss.str());
             }
         };
-        if (scale == MantissaRange::mantissa_scale::small)
+        if (scale == MantissaRange::MantissaScale::Small)
         {
             test(cSmall);
         }
@@ -220,8 +220,8 @@ public:
             bool caught = false;
             try
             {
-                Number{false, Number::maxMantissa(), 32768, Number::normalized{}} +
-                    Number{false, Number::minMantissa(), 32767, Number::normalized{}} * 5;
+                Number{false, Number::maxMantissa(), 32768, Number::Normalized{}} +
+                    Number{false, Number::minMantissa(), 32767, Number::Normalized{}} * 5;
             }
             catch (std::overflow_error const&)
             {
@@ -232,7 +232,7 @@ public:
     }
 
     void
-    test_sub()
+    testSub()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_sub " << to_string(scale);
@@ -259,10 +259,10 @@ public:
             {
                 {Number{1'000'000'000'000'000, -15},
                  Number{6'555'555'555'555'555, -29},
-                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{6'555'555'555'555'555, -29},
                  Number{1'000'000'000'000'000, -15},
-                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{1'000'000'000'000'000, -15}, Number{1'000'000'000'000'000, -15}, Number{0}},
                 {Number{1'000'000'000'000'000, -15},
                  Number{1'000'000'000'000'001, -15},
@@ -273,10 +273,10 @@ public:
                 // Items from cSmall expanded for the larger mantissa
                 {Number{1'000'000'000'000'000'000, -18},
                  Number{6'555'555'555'555'555'555, -32},
-                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{false, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{6'555'555'555'555'555'555, -32},
                  Number{1'000'000'000'000'000'000, -18},
-                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::normalized{}}},
+                 Number{true, 9'999'999'999'999'344'444ULL, -19, Number::Normalized{}}},
                 {Number{1'000'000'000'000'000'000, -18},
                  Number{1'000'000'000'000'000'000, -18},
                  Number{0}},
@@ -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::maxRep}, Number{6, -1}, Number{Number::maxRep - 1}},
-                {Number{false, Number::maxRep + 1, 0, Number::normalized{}},
+                {Number{Number::kMAX_REP}, Number{6, -1}, Number{Number::kMAX_REP - 1}},
+                {Number{false, Number::kMAX_REP + 1, 0, Number::Normalized{}},
                  Number{1, 0},
-                 Number{(Number::maxRep / 10) + 1, 1}},
-                {Number{false, Number::maxRep + 1, 0, Number::normalized{}},
+                 Number{(Number::kMAX_REP / 10) + 1, 1}},
+                {Number{false, Number::kMAX_REP + 1, 0, Number::Normalized{}},
                  Number{3, 0},
-                 Number{Number::maxRep}},
-                {power(2, 63), Number{3, 0}, Number{Number::maxRep}},
+                 Number{Number::kMAX_REP}},
+                {power(2, 63), Number{3, 0}, Number{Number::kMAX_REP}},
             });
         auto test = [this](auto const& c) {
             for (auto const& [x, y, z] : c)
@@ -304,7 +304,7 @@ public:
                 BEAST_EXPECTS(result == z, ss.str());
             }
         };
-        if (scale == MantissaRange::mantissa_scale::small)
+        if (scale == MantissaRange::MantissaScale::Small)
         {
             test(cSmall);
         }
@@ -315,7 +315,7 @@ public:
     }
 
     void
-    test_mul()
+    testMul()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_mul " << to_string(scale);
@@ -331,7 +331,7 @@ public:
             }
         };
         auto tests = [&](auto const& cSmall, auto const& cLarge) {
-            if (scale == MantissaRange::mantissa_scale::small)
+            if (scale == MantissaRange::MantissaScale::Small)
             {
                 test(cSmall);
             }
@@ -342,7 +342,7 @@ public:
         };
         auto const maxMantissa = Number::maxMantissa();
 
-        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
+        SaveNumberRoundMode const save{Number::setround(Number::RoundingMode::ToNearest)};
         {
             auto const cSmall = std::to_array<Case>({
                 {Number{7}, Number{8}, Number{56}},
@@ -380,7 +380,7 @@ public:
                  Number{1999999999999999862, -18}},
                 {Number{3214285714285706, -15},
                  Number{3111111111111119, -15},
-                 Number{false, 9'999'999'999'999'999'579ULL, -18, Number::normalized{}}},
+                 Number{false, 9'999'999'999'999'999'579ULL, -18, Number::Normalized{}}},
                 {Number{1000000000000000000, -32768},
                  Number{1000000000000000000, -32768},
                  Number{0}},
@@ -398,17 +398,17 @@ public:
                  Number{1999999999999999999, -18}},
                 {Number{3214285714285714278, -18}, Number{3111111111111111119, -18}, Number{10, 0}},
                 // Maximum mantissa range - rounds up to 1e19
-                {Number{false, maxMantissa, 0, Number::normalized{}},
-                 Number{false, maxMantissa, 0, Number::normalized{}},
+                {Number{false, maxMantissa, 0, Number::Normalized{}},
+                 Number{false, maxMantissa, 0, Number::Normalized{}},
                  Number{1, 38}},
                 // Maximum int64 range
-                {Number{Number::maxRep, 0},
-                 Number{Number::maxRep, 0},
+                {Number{Number::kMAX_REP, 0},
+                 Number{Number::kMAX_REP, 0},
                  Number{85'070'591'730'234'615'85, 19}},
             });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::rounding_mode::towards_zero);
+        Number::setround(Number::RoundingMode::TowardsZero);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " towards_zero";
         {
             auto const cSmall = std::to_array<Case>(
@@ -443,7 +443,7 @@ public:
                      Number{1999999999999999861, -18}},
                     {Number{3214285714285706, -15},
                      Number{3111111111111119, -15},
-                     Number{false, 9999999999999999579ULL, -18, Number::normalized{}}},
+                     Number{false, 9999999999999999579ULL, -18, Number::Normalized{}}},
                     {Number{1000000000000000000, -32768},
                      Number{1000000000000000000, -32768},
                      Number{0}},
@@ -464,18 +464,18 @@ public:
                      Number{10, 0}},
                     // Maximum mantissa range - rounds down to maxMantissa/10e1
                     // 99'999'999'999'999'999'800'000'000'000'000'000'100
-                    {Number{false, maxMantissa, 0, Number::normalized{}},
-                     Number{false, maxMantissa, 0, Number::normalized{}},
-                     Number{false, (maxMantissa / 10) - 1, 20, Number::normalized{}}},
+                    {Number{false, maxMantissa, 0, Number::Normalized{}},
+                     Number{false, maxMantissa, 0, Number::Normalized{}},
+                     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::maxRep, 0},
-                     Number{Number::maxRep, 0},
+                    {Number{Number::kMAX_REP, 0},
+                     Number{Number::kMAX_REP, 0},
                      Number{85'070'591'730'234'615'84, 19}},
                 });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " downward";
         {
             auto const cSmall = std::to_array<Case>(
@@ -510,7 +510,7 @@ public:
                      Number{1999999999999999861, -18}},
                     {Number{3214285714285706, -15},
                      Number{3111111111111119, -15},
-                     Number{false, 9'999'999'999'999'999'579ULL, -18, Number::normalized{}}},
+                     Number{false, 9'999'999'999'999'999'579ULL, -18, Number::Normalized{}}},
                     {Number{1000000000000000000, -32768},
                      Number{1000000000000000000, -32768},
                      Number{0}},
@@ -531,18 +531,18 @@ public:
                      Number{10, 0}},
                     // Maximum mantissa range - rounds down to maxMantissa/10e1
                     // 99'999'999'999'999'999'800'000'000'000'000'000'100
-                    {Number{false, maxMantissa, 0, Number::normalized{}},
-                     Number{false, maxMantissa, 0, Number::normalized{}},
-                     Number{false, (maxMantissa / 10) - 1, 20, Number::normalized{}}},
+                    {Number{false, maxMantissa, 0, Number::Normalized{}},
+                     Number{false, maxMantissa, 0, Number::Normalized{}},
+                     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::maxRep, 0},
-                     Number{Number::maxRep, 0},
+                    {Number{Number::kMAX_REP, 0},
+                     Number{Number::kMAX_REP, 0},
                      Number{85'070'591'730'234'615'84, 19}},
                 });
             tests(cSmall, cLarge);
         }
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         testcase << "test_mul " << to_string(Number::getMantissaScale()) << " upward";
         {
             auto const cSmall = std::to_array<Case>(
@@ -598,13 +598,13 @@ public:
                      Number{1000000000000000001, -17}},
                     // Maximum mantissa range - rounds up to minMantissa*10
                     // 1e19*1e19=1e38
-                    {Number{false, maxMantissa, 0, Number::normalized{}},
-                     Number{false, maxMantissa, 0, Number::normalized{}},
+                    {Number{false, maxMantissa, 0, Number::Normalized{}},
+                     Number{false, maxMantissa, 0, Number::Normalized{}},
                      Number{1, 38}},
                     // Maximum int64 range
                     // 85'070'591'730'234'615'847'396'907'784'232'501'249
-                    {Number{Number::maxRep, 0},
-                     Number{Number::maxRep, 0},
+                    {Number{Number::kMAX_REP, 0},
+                     Number{Number::kMAX_REP, 0},
                      Number{85'070'591'730'234'615'85, 19}},
                 });
             tests(cSmall, cLarge);
@@ -614,8 +614,8 @@ public:
             bool caught = false;
             try
             {
-                Number{false, maxMantissa, 32768, Number::normalized{}} *
-                    Number{false, Number::minMantissa() * 5, 32767, Number::normalized{}};
+                Number{false, maxMantissa, 32768, Number::Normalized{}} *
+                    Number{false, Number::minMantissa() * 5, 32767, Number::Normalized{}};
             }
             catch (std::overflow_error const&)
             {
@@ -626,7 +626,7 @@ public:
     }
 
     void
-    test_div()
+    testDiv()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_div " << to_string(scale);
@@ -643,7 +643,7 @@ public:
         };
         auto const maxMantissa = Number::maxMantissa();
         auto tests = [&](auto const& cSmall, auto const& cLarge) {
-            if (scale == MantissaRange::mantissa_scale::small)
+            if (scale == MantissaRange::MantissaScale::Small)
             {
                 test(cSmall);
             }
@@ -652,7 +652,7 @@ public:
                 test(cLarge);
             }
         };
-        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
+        SaveNumberRoundMode const save{Number::setround(Number::RoundingMode::ToNearest)};
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -684,13 +684,13 @@ public:
                  // Items from cSmall expanded for the larger mantissa, except
                  // duplicates.
                  {Number{1414213562373095049, -13}, Number{1414213562373095049, -13}, Number{1}},
-                 {Number{false, maxMantissa, 0, Number::normalized{}},
+                 {Number{false, maxMantissa, 0, Number::Normalized{}},
                   Number{1'000'000'000'000'000'000},
-                  Number{false, maxMantissa, -18, Number::normalized{}}}});
+                  Number{false, maxMantissa, -18, Number::Normalized{}}}});
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " towards_zero";
-        Number::setround(Number::rounding_mode::towards_zero);
+        Number::setround(Number::RoundingMode::TowardsZero);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -722,13 +722,13 @@ public:
                  // Items from cSmall expanded for the larger mantissa, except
                  // duplicates.
                  {Number{1414213562373095049, -13}, Number{1414213562373095049, -13}, Number{1}},
-                 {Number{false, maxMantissa, 0, Number::normalized{}},
+                 {Number{false, maxMantissa, 0, Number::Normalized{}},
                   Number{1'000'000'000'000'000'000},
-                  Number{false, maxMantissa, -18, Number::normalized{}}}});
+                  Number{false, maxMantissa, -18, Number::Normalized{}}}});
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " downward";
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -760,13 +760,13 @@ public:
                  // Items from cSmall expanded for the larger mantissa, except
                  // duplicates.
                  {Number{1414213562373095049, -13}, Number{1414213562373095049, -13}, Number{1}},
-                 {Number{false, maxMantissa, 0, Number::normalized{}},
+                 {Number{false, maxMantissa, 0, Number::Normalized{}},
                   Number{1'000'000'000'000'000'000},
-                  Number{false, maxMantissa, -18, Number::normalized{}}}});
+                  Number{false, maxMantissa, -18, Number::Normalized{}}}});
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " upward";
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         {
             auto const cSmall = std::to_array<Case>(
                 {{Number{1}, Number{2}, Number{5, -1}},
@@ -798,9 +798,9 @@ public:
                  // Items from cSmall expanded for the larger mantissa, except
                  // duplicates.
                  {Number{1414213562373095049, -13}, Number{1414213562373095049, -13}, Number{1}},
-                 {Number{false, maxMantissa, 0, Number::normalized{}},
+                 {Number{false, maxMantissa, 0, Number::Normalized{}},
                   Number{1'000'000'000'000'000'000},
-                  Number{false, maxMantissa, -18, Number::normalized{}}}});
+                  Number{false, maxMantissa, -18, Number::Normalized{}}}});
             tests(cSmall, cLarge);
         }
         testcase << "test_div " << to_string(Number::getMantissaScale()) << " overflow";
@@ -817,7 +817,7 @@ public:
     }
 
     void
-    test_root()
+    testRoot()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_root " << to_string(scale);
@@ -851,23 +851,23 @@ public:
              {Number{0}, 5, Number{0}},
              {Number{5625, -4}, 2, Number{75, -2}}});
         auto const cLarge = std::to_array<Case>({
-            {Number{false, Number::maxMantissa() - 9, -1, Number::normalized{}},
+            {Number{false, Number::maxMantissa() - 9, -1, Number::Normalized{}},
              2,
-             Number{false, 999'999'999'999'999'999, -9, Number::normalized{}}},
-            {Number{false, Number::maxMantissa() - 9, 0, Number::normalized{}},
+             Number{false, 999'999'999'999'999'999, -9, Number::Normalized{}}},
+            {Number{false, Number::maxMantissa() - 9, 0, Number::Normalized{}},
              2,
-             Number{false, 3'162'277'660'168'379'330, -9, Number::normalized{}}},
-            {Number{Number::maxRep},
+             Number{false, 3'162'277'660'168'379'330, -9, Number::Normalized{}}},
+            {Number{Number::kMAX_REP},
              2,
-             Number{false, 3'037'000'499'976049692, -9, Number::normalized{}}},
-            {Number{Number::maxRep},
+             Number{false, 3'037'000'499'976049692, -9, Number::Normalized{}}},
+            {Number{Number::kMAX_REP},
              4,
-             Number{false, 55'108'98747006743627, -14, Number::normalized{}}},
+             Number{false, 55'108'98747006743627, -14, Number::Normalized{}}},
         });
         test(cSmall);
-        if (Number::getMantissaScale() != MantissaRange::mantissa_scale::small)
+        if (Number::getMantissaScale() != MantissaRange::MantissaScale::Small)
         {
-            NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
+            NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
             test(cLarge);
         }
         bool caught = false;
@@ -893,7 +893,7 @@ public:
     }
 
     void
-    test_root2()
+    testRoot2()
     {
         auto const scale = Number::getMantissaScale();
         testcase << "test_root2 " << to_string(scale);
@@ -918,7 +918,7 @@ public:
             Number{5, -1},
             Number{0},
             Number{5625, -4},
-            Number{Number::maxRep},
+            Number{Number::kMAX_REP},
         });
         test(cSmall);
         bool caught = false;
@@ -934,7 +934,7 @@ public:
     }
 
     void
-    test_power1()
+    testPower1()
     {
         testcase << "test_power1 " << to_string(Number::getMantissaScale());
         using Case = std::tuple<Number, unsigned, Number>;
@@ -945,14 +945,14 @@ public:
             {Number{-64}, 2, Number{4096}},
             {Number{64}, 3, Number{262144}},
             {Number{-64}, 3, Number{-262144}},
-            {Number{64}, 11, Number{false, 7378697629483820646ULL, 1, Number::normalized{}}},
-            {Number{-64}, 11, Number{true, 7378697629483820646ULL, 1, Number::normalized{}}}};
+            {Number{64}, 11, Number{false, 7378697629483820646ULL, 1, Number::Normalized{}}},
+            {Number{-64}, 11, Number{true, 7378697629483820646ULL, 1, Number::Normalized{}}}};
         for (auto const& [x, y, z] : c)
             BEAST_EXPECT((power(x, y) == z));
     }
 
     void
-    test_power2()
+    testPower2()
     {
         testcase << "test_power2 " << to_string(Number::getMantissaScale());
         using Case = std::tuple<Number, unsigned, unsigned, Number>;
@@ -1024,11 +1024,11 @@ public:
     }
 
     void
-    test_to_integer()
+    testToInteger()
     {
         testcase << "test_to_integer " << to_string(Number::getMantissaScale());
         using Case = std::tuple<Number, std::int64_t>;
-        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
+        SaveNumberRoundMode const save{Number::setround(Number::RoundingMode::ToNearest)};
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1065,8 +1065,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        auto prev_mode = Number::setround(Number::rounding_mode::towards_zero);
-        BEAST_EXPECT(prev_mode == Number::rounding_mode::to_nearest);
+        auto prevMode = Number::setround(Number::RoundingMode::TowardsZero);
+        BEAST_EXPECT(prevMode == Number::RoundingMode::ToNearest);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1103,8 +1103,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        prev_mode = Number::setround(Number::rounding_mode::downward);
-        BEAST_EXPECT(prev_mode == Number::rounding_mode::towards_zero);
+        prevMode = Number::setround(Number::RoundingMode::Downward);
+        BEAST_EXPECT(prevMode == Number::RoundingMode::TowardsZero);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1141,8 +1141,8 @@ public:
                 BEAST_EXPECT(j == y);
             }
         }
-        prev_mode = Number::setround(Number::rounding_mode::upward);
-        BEAST_EXPECT(prev_mode == Number::rounding_mode::downward);
+        prevMode = Number::setround(Number::RoundingMode::Upward);
+        BEAST_EXPECT(prevMode == Number::RoundingMode::Downward);
         {
             Case const c[]{
                 {Number{0}, 0},
@@ -1192,7 +1192,7 @@ public:
     }
 
     void
-    test_squelch()
+    testSquelch()
     {
         testcase << "test_squelch " << to_string(Number::getMantissaScale());
         Number const limit{1, -6};
@@ -1237,21 +1237,21 @@ public:
 
         switch (scale)
         {
-            case MantissaRange::mantissa_scale::small:
+            case MantissaRange::MantissaScale::Small:
 
                 test(Number::min(), "1e-32753");
                 test(Number::max(), "9999999999999999e32768");
                 test(Number::lowest(), "-9999999999999999e32768");
                 {
-                    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
+                    NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
 
                     auto const maxMantissa = Number::maxMantissa();
                     BEAST_EXPECT(maxMantissa == 9'999'999'999'999'999);
                     test(
-                        Number{false, (maxMantissa * 1000) + 999, -3, Number::normalized()},
+                        Number{false, (maxMantissa * 1000) + 999, -3, Number::Normalized()},
                         "9999999999999999");
                     test(
-                        Number{true, (maxMantissa * 1000) + 999, -3, Number::normalized()},
+                        Number{true, (maxMantissa * 1000) + 999, -3, Number::Normalized()},
                         "-9999999999999999");
 
                     test(Number{std::numeric_limits<std::int64_t>::max(), -3}, "9223372036854775");
@@ -1266,21 +1266,21 @@ public:
                         "9223372036854775e3");
                 }
                 break;
-            case MantissaRange::mantissa_scale::large:
+            case MantissaRange::MantissaScale::Large:
                 // Test the edges
                 // ((exponent < -(28)) || (exponent > -(8)))))
                 test(Number::min(), "1e-32750");
                 test(Number::max(), "9223372036854775807e32768");
                 test(Number::lowest(), "-9223372036854775807e32768");
                 {
-                    NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
+                    NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
 
                     auto const maxMantissa = Number::maxMantissa();
                     BEAST_EXPECT(maxMantissa == 9'999'999'999'999'999'999ULL);
                     test(
-                        Number{false, maxMantissa, 0, Number::normalized{}}, "9999999999999999990");
+                        Number{false, maxMantissa, 0, Number::Normalized{}}, "9999999999999999990");
                     test(
-                        Number{true, maxMantissa, 0, Number::normalized{}}, "-9999999999999999990");
+                        Number{true, maxMantissa, 0, Number::Normalized{}}, "-9999999999999999990");
 
                     test(
                         Number{std::numeric_limits<std::int64_t>::max(), 0}, "9223372036854775807");
@@ -1311,7 +1311,7 @@ public:
     }
 
     void
-    test_relationals()
+    testRelationals()
     {
         testcase << "test_relationals " << to_string(Number::getMantissaScale());
         BEAST_EXPECT(!(Number{100} < Number{10}));
@@ -1321,7 +1321,7 @@ public:
     }
 
     void
-    test_stream()
+    testStream()
     {
         testcase << "test_stream " << to_string(Number::getMantissaScale());
         Number const x{100};
@@ -1331,7 +1331,7 @@ public:
     }
 
     void
-    test_inc_dec()
+    testIncDec()
     {
         testcase << "test_inc_dec " << to_string(Number::getMantissaScale());
         Number x{100};
@@ -1344,30 +1344,30 @@ public:
     }
 
     void
-    test_toSTAmount()
+    testToStAmount()
     {
         NumberSO const stNumberSO{true};
         Issue const issue;
         Number const n{7'518'783'80596, -5};
-        saveNumberRoundMode const save{Number::setround(Number::rounding_mode::to_nearest)};
+        SaveNumberRoundMode const save{Number::setround(Number::RoundingMode::ToNearest)};
         auto res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518784});
 
-        Number::setround(Number::rounding_mode::towards_zero);
+        Number::setround(Number::RoundingMode::TowardsZero);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518783});
 
-        Number::setround(Number::rounding_mode::downward);
+        Number::setround(Number::RoundingMode::Downward);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518783});
 
-        Number::setround(Number::rounding_mode::upward);
+        Number::setround(Number::RoundingMode::Upward);
         res2 = STAmount{issue, n};
         BEAST_EXPECT(res2 == STAmount{7518784});
     }
 
     void
-    test_truncate()
+    testTruncate()
     {
         BEAST_EXPECT(Number(25, +1).truncate() == Number(250, 0));
         BEAST_EXPECT(Number(25, 0).truncate() == Number(25, 0));
@@ -1396,92 +1396,92 @@ public:
         // Test that rounding works as expected.
         testcase("Rounding");
 
-        using NumberRoundings = std::map<Number::rounding_mode, std::int64_t>;
+        using NumberRoundings = std::map<Number::RoundingMode, std::int64_t>;
 
         std::map<Number, NumberRoundings> const expected{
             // Positive numbers
             {Number{13, -1},
-             {{Number::rounding_mode::to_nearest, 1},
-              {Number::rounding_mode::towards_zero, 1},
-              {Number::rounding_mode::downward, 1},
-              {Number::rounding_mode::upward, 2}}},
+             {{Number::RoundingMode::ToNearest, 1},
+              {Number::RoundingMode::TowardsZero, 1},
+              {Number::RoundingMode::Downward, 1},
+              {Number::RoundingMode::Upward, 2}}},
             {Number{23, -1},
-             {{Number::rounding_mode::to_nearest, 2},
-              {Number::rounding_mode::towards_zero, 2},
-              {Number::rounding_mode::downward, 2},
-              {Number::rounding_mode::upward, 3}}},
+             {{Number::RoundingMode::ToNearest, 2},
+              {Number::RoundingMode::TowardsZero, 2},
+              {Number::RoundingMode::Downward, 2},
+              {Number::RoundingMode::Upward, 3}}},
             {Number{15, -1},
-             {{Number::rounding_mode::to_nearest, 2},
-              {Number::rounding_mode::towards_zero, 1},
-              {Number::rounding_mode::downward, 1},
-              {Number::rounding_mode::upward, 2}}},
+             {{Number::RoundingMode::ToNearest, 2},
+              {Number::RoundingMode::TowardsZero, 1},
+              {Number::RoundingMode::Downward, 1},
+              {Number::RoundingMode::Upward, 2}}},
             {Number{25, -1},
-             {{Number::rounding_mode::to_nearest, 2},
-              {Number::rounding_mode::towards_zero, 2},
-              {Number::rounding_mode::downward, 2},
-              {Number::rounding_mode::upward, 3}}},
+             {{Number::RoundingMode::ToNearest, 2},
+              {Number::RoundingMode::TowardsZero, 2},
+              {Number::RoundingMode::Downward, 2},
+              {Number::RoundingMode::Upward, 3}}},
             {Number{152, -2},
-             {{Number::rounding_mode::to_nearest, 2},
-              {Number::rounding_mode::towards_zero, 1},
-              {Number::rounding_mode::downward, 1},
-              {Number::rounding_mode::upward, 2}}},
+             {{Number::RoundingMode::ToNearest, 2},
+              {Number::RoundingMode::TowardsZero, 1},
+              {Number::RoundingMode::Downward, 1},
+              {Number::RoundingMode::Upward, 2}}},
             {Number{252, -2},
-             {{Number::rounding_mode::to_nearest, 3},
-              {Number::rounding_mode::towards_zero, 2},
-              {Number::rounding_mode::downward, 2},
-              {Number::rounding_mode::upward, 3}}},
+             {{Number::RoundingMode::ToNearest, 3},
+              {Number::RoundingMode::TowardsZero, 2},
+              {Number::RoundingMode::Downward, 2},
+              {Number::RoundingMode::Upward, 3}}},
             {Number{17, -1},
-             {{Number::rounding_mode::to_nearest, 2},
-              {Number::rounding_mode::towards_zero, 1},
-              {Number::rounding_mode::downward, 1},
-              {Number::rounding_mode::upward, 2}}},
+             {{Number::RoundingMode::ToNearest, 2},
+              {Number::RoundingMode::TowardsZero, 1},
+              {Number::RoundingMode::Downward, 1},
+              {Number::RoundingMode::Upward, 2}}},
             {Number{27, -1},
-             {{Number::rounding_mode::to_nearest, 3},
-              {Number::rounding_mode::towards_zero, 2},
-              {Number::rounding_mode::downward, 2},
-              {Number::rounding_mode::upward, 3}}},
+             {{Number::RoundingMode::ToNearest, 3},
+              {Number::RoundingMode::TowardsZero, 2},
+              {Number::RoundingMode::Downward, 2},
+              {Number::RoundingMode::Upward, 3}}},
 
             // Negative numbers
             {Number{-13, -1},
-             {{Number::rounding_mode::to_nearest, -1},
-              {Number::rounding_mode::towards_zero, -1},
-              {Number::rounding_mode::downward, -2},
-              {Number::rounding_mode::upward, -1}}},
+             {{Number::RoundingMode::ToNearest, -1},
+              {Number::RoundingMode::TowardsZero, -1},
+              {Number::RoundingMode::Downward, -2},
+              {Number::RoundingMode::Upward, -1}}},
             {Number{-23, -1},
-             {{Number::rounding_mode::to_nearest, -2},
-              {Number::rounding_mode::towards_zero, -2},
-              {Number::rounding_mode::downward, -3},
-              {Number::rounding_mode::upward, -2}}},
+             {{Number::RoundingMode::ToNearest, -2},
+              {Number::RoundingMode::TowardsZero, -2},
+              {Number::RoundingMode::Downward, -3},
+              {Number::RoundingMode::Upward, -2}}},
             {Number{-15, -1},
-             {{Number::rounding_mode::to_nearest, -2},
-              {Number::rounding_mode::towards_zero, -1},
-              {Number::rounding_mode::downward, -2},
-              {Number::rounding_mode::upward, -1}}},
+             {{Number::RoundingMode::ToNearest, -2},
+              {Number::RoundingMode::TowardsZero, -1},
+              {Number::RoundingMode::Downward, -2},
+              {Number::RoundingMode::Upward, -1}}},
             {Number{-25, -1},
-             {{Number::rounding_mode::to_nearest, -2},
-              {Number::rounding_mode::towards_zero, -2},
-              {Number::rounding_mode::downward, -3},
-              {Number::rounding_mode::upward, -2}}},
+             {{Number::RoundingMode::ToNearest, -2},
+              {Number::RoundingMode::TowardsZero, -2},
+              {Number::RoundingMode::Downward, -3},
+              {Number::RoundingMode::Upward, -2}}},
             {Number{-152, -2},
-             {{Number::rounding_mode::to_nearest, -2},
-              {Number::rounding_mode::towards_zero, -1},
-              {Number::rounding_mode::downward, -2},
-              {Number::rounding_mode::upward, -1}}},
+             {{Number::RoundingMode::ToNearest, -2},
+              {Number::RoundingMode::TowardsZero, -1},
+              {Number::RoundingMode::Downward, -2},
+              {Number::RoundingMode::Upward, -1}}},
             {Number{-252, -2},
-             {{Number::rounding_mode::to_nearest, -3},
-              {Number::rounding_mode::towards_zero, -2},
-              {Number::rounding_mode::downward, -3},
-              {Number::rounding_mode::upward, -2}}},
+             {{Number::RoundingMode::ToNearest, -3},
+              {Number::RoundingMode::TowardsZero, -2},
+              {Number::RoundingMode::Downward, -3},
+              {Number::RoundingMode::Upward, -2}}},
             {Number{-17, -1},
-             {{Number::rounding_mode::to_nearest, -2},
-              {Number::rounding_mode::towards_zero, -1},
-              {Number::rounding_mode::downward, -2},
-              {Number::rounding_mode::upward, -1}}},
+             {{Number::RoundingMode::ToNearest, -2},
+              {Number::RoundingMode::TowardsZero, -1},
+              {Number::RoundingMode::Downward, -2},
+              {Number::RoundingMode::Upward, -1}}},
             {Number{-27, -1},
-             {{Number::rounding_mode::to_nearest, -3},
-              {Number::rounding_mode::towards_zero, -2},
-              {Number::rounding_mode::downward, -3},
-              {Number::rounding_mode::upward, -2}}},
+             {{Number::RoundingMode::ToNearest, -3},
+              {Number::RoundingMode::TowardsZero, -2},
+              {Number::RoundingMode::Downward, -3},
+              {Number::RoundingMode::Upward, -2}}},
         };
 
         for (auto const& [num, roundings] : expected)
@@ -1509,45 +1509,45 @@ public:
         Number const ten{10};
         BEAST_EXPECT(ten.exponent() <= 0);
 
-        if (scale == MantissaRange::mantissa_scale::small)
+        if (scale == MantissaRange::MantissaScale::Small)
         {
-            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > INITIAL_XRP.drops());
-            BEAST_EXPECT(Number::maxMantissa() < INITIAL_XRP.drops());
-            Number const initalXrp{INITIAL_XRP};
+            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(initalXrp.exponent() > 0);
 
-            Number const maxInt64{Number::maxRep};
+            Number const maxInt64{Number::kMAX_REP};
             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}));
 
-            Number const max = Number{false, Number::maxMantissa(), 0, Number::normalized{}};
+            Number const max = Number{false, Number::maxMantissa(), 0, Number::Normalized{}};
             BEAST_EXPECT(max.exponent() <= 0);
             // 99'999'999'999'999'980'000'000'000'000'001 - 32 digits
             BEAST_EXPECT((power(max, 2) == Number{99'999'999'999'999'98, 16}));
         }
         else
         {
-            BEAST_EXPECT(std::numeric_limits<std::int64_t>::max() > INITIAL_XRP.drops());
-            BEAST_EXPECT(Number::maxMantissa() > INITIAL_XRP.drops());
-            Number const initalXrp{INITIAL_XRP};
+            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(initalXrp.exponent() <= 0);
 
-            Number const maxInt64{Number::maxRep};
+            Number const maxInt64{Number::kMAX_REP};
             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}));
 
-            NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
+            NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
 
             auto const maxMantissa = Number::maxMantissa();
-            Number const max = Number{false, maxMantissa, 0, Number::normalized{}};
+            Number const max = Number{false, maxMantissa, 0, Number::Normalized{}};
             BEAST_EXPECT(max.mantissa() == maxMantissa / 10);
             BEAST_EXPECT(max.exponent() == 1);
             // 99'999'999'999'999'999'800'000'000'000'000'000'100 - also 38
             // digits
             BEAST_EXPECT(
-                (power(max, 2) == Number{false, (maxMantissa / 10) - 1, 20, Number::normalized{}}));
+                (power(max, 2) == Number{false, (maxMantissa / 10) - 1, 20, Number::Normalized{}}));
         }
     }
 
@@ -1555,28 +1555,28 @@ public:
     run() override
     {
         for (auto const scale :
-             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
+             {MantissaRange::MantissaScale::Small, MantissaRange::MantissaScale::Large})
         {
             NumberMantissaScaleGuard const sg(scale);
             testZero();
-            test_limits();
+            testLimits();
             testToString();
-            test_add();
-            test_sub();
-            test_mul();
-            test_div();
-            test_root();
-            test_root2();
-            test_power1();
-            test_power2();
+            testAdd();
+            testSub();
+            testMul();
+            testDiv();
+            testRoot();
+            testRoot2();
+            testPower1();
+            testPower2();
             testConversions();
-            test_to_integer();
-            test_squelch();
-            test_relationals();
-            test_stream();
-            test_inc_dec();
-            test_toSTAmount();
-            test_truncate();
+            testToInteger();
+            testSquelch();
+            testRelationals();
+            testStream();
+            testIncDec();
+            testToStAmount();
+            testTruncate();
             testRounding();
             testInt64();
         }
diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp
index 9a7d89efce..00b2f90c65 100644
--- a/src/test/basics/PerfLog_test.cpp
+++ b/src/test/basics/PerfLog_test.cpp
@@ -39,24 +39,24 @@
 
 namespace xrpl {
 
-class PerfLog_test : public beast::unit_test::suite
+class PerfLog_test : public beast::unit_test::Suite
 {
-    enum class WithFile : bool { no = false, yes = true };
+    enum class WithFile : bool { No = false, Yes = true };
 
     using path = boost::filesystem::path;
 
     // We're only using Env for its Journal.  That Journal gives better
     // coverage in unit tests.
-    test::jtx::Env env_{*this, test::jtx::envconfig(), nullptr, beast::severities::kDisabled};
+    test::jtx::Env env_{*this, test::jtx::envconfig(), nullptr, beast::severities::KDisabled};
     beast::Journal j_{env_.app().getJournal("PerfLog_test")};
 
     struct Fixture
     {
-        Application& app_;
-        beast::Journal j_;
+        Application& app;
+        beast::Journal j;
         bool stopSignaled{false};
 
-        explicit Fixture(Application& app, beast::Journal j) : app_(app), j_(j)
+        explicit Fixture(Application& app, beast::Journal j) : app(app), j(j)
         {
             // Clean up any stale state from a previous test run.  On
             // self-hosted CI runners the temp directory persists between
@@ -116,8 +116,8 @@ class PerfLog_test : public beast::unit_test::suite
         perfLog(WithFile withFile)
         {
             perf::PerfLog::Setup const setup{
-                .perfLog = withFile == WithFile::no ? "" : logFile(), .logInterval = logInterval()};
-            return perf::make_PerfLog(setup, app_, j_, [this]() {
+                .perfLog = withFile == WithFile::No ? "" : logFile(), .logInterval = logInterval()};
+            return perf::makePerfLog(setup, app, j, [this]() {
                 signalStop();
                 return;
             });
@@ -154,7 +154,7 @@ class PerfLog_test : public beast::unit_test::suite
 
     // Return a uint64 from a JSON string.
     static std::uint64_t
-    jsonToUint64(Json::Value const& jsonUintAsString)
+    jsonToUint64(json::Value const& jsonUintAsString)
     {
         return std::stoull(jsonUintAsString.asString());
     }
@@ -176,11 +176,11 @@ class PerfLog_test : public beast::unit_test::suite
     // goes from longest to shortest duration.  That way stuff that was started
     // earlier goes to the front.
     static std::vector<Cur>
-    getSortedCurrent(Json::Value const& currentJson)
+    getSortedCurrent(json::Value const& currentJson)
     {
         std::vector<Cur> currents;
         currents.reserve(currentJson.size());
-        for (Json::Value const& cur : currentJson)
+        for (json::Value const& cur : currentJson)
         {
             currents.emplace_back(
                 jsonToUint64(cur[jss::duration_us]),
@@ -208,7 +208,7 @@ public:
             Fixture fixture{env_.app(), j_};
             BEAST_EXPECT(!exists(fixture.logFile()));
 
-            auto perfLog{fixture.perfLog(WithFile::yes)};
+            auto perfLog{fixture.perfLog(WithFile::Yes)};
 
             BEAST_EXPECT(fixture.stopSignaled == false);
             BEAST_EXPECT(exists(fixture.logFile()));
@@ -233,7 +233,7 @@ public:
             // Now construct a PerfLog.  The PerfLog should attempt to shut
             // down the server because it can't open its file.
             BEAST_EXPECT(fixture.stopSignaled == false);
-            auto perfLog{fixture.perfLog(WithFile::yes)};
+            auto perfLog{fixture.perfLog(WithFile::Yes)};
             BEAST_EXPECT(fixture.stopSignaled == true);
 
             // Start PerfLog and wait long enough for PerfLog::report()
@@ -284,7 +284,7 @@ public:
             // Now construct a PerfLog.  The PerfLog should attempt to shut
             // down the server because it can't open its file.
             BEAST_EXPECT(fixture.stopSignaled == false);
-            auto perfLog{fixture.perfLog(WithFile::yes)};
+            auto perfLog{fixture.perfLog(WithFile::Yes)};
             BEAST_EXPECT(fixture.stopSignaled == true);
 
             // Start PerfLog and wait long enough for PerfLog::report()
@@ -312,8 +312,8 @@ public:
 
         // Get the all the labels we can use for RPC interfaces without
         // causing an assert.
-        std::vector<char const*> labels = test::jtx::make_vector(xrpl::RPC::getHandlerNames());
-        std::shuffle(labels.begin(), labels.end(), default_prng());
+        std::vector<char const*> labels = test::jtx::makeVector(xrpl::RPC::getHandlerNames());
+        std::shuffle(labels.begin(), labels.end(), defaultPrng());
 
         // Get two IDs to associate with each label.  Errors tend to happen at
         // boundaries, so we pick IDs starting from zero and ending at
@@ -328,7 +328,7 @@ public:
             std::back_inserter(ids),
             labels.size(),
             [i = std::numeric_limits<std::uint64_t>::max()]() mutable { return i--; });
-        std::shuffle(ids.begin(), ids.end(), default_prng());
+        std::shuffle(ids.begin(), ids.end(), defaultPrng());
 
         // Start all of the RPC commands twice to show they can all be tracked
         // simultaneously.
@@ -342,19 +342,19 @@ public:
         }
         {
             // Examine current PerfLog::counterJson() values.
-            Json::Value const countersJson{perfLog->countersJson()[jss::rpc]};
+            json::Value const countersJson{perfLog->countersJson()[jss::rpc]};
             BEAST_EXPECT(countersJson.size() == labels.size() + 1);
             for (auto& label : labels)
             {
                 // Expect every label in labels to have the same contents.
-                Json::Value const& counter{countersJson[label]};
+                json::Value const& counter{countersJson[label]};
                 BEAST_EXPECT(counter[jss::duration_us] == "0");
                 BEAST_EXPECT(counter[jss::errored] == "0");
                 BEAST_EXPECT(counter[jss::finished] == "0");
                 BEAST_EXPECT(counter[jss::started] == "2");
             }
             // Expect "total" to have a lot of "started"
-            Json::Value const& total{countersJson[jss::total]};
+            json::Value const& total{countersJson[jss::total]};
             BEAST_EXPECT(total[jss::duration_us] == "0");
             BEAST_EXPECT(total[jss::errored] == "0");
             BEAST_EXPECT(total[jss::finished] == "0");
@@ -389,14 +389,14 @@ public:
         perfLog->rpcFinish(labels[0], ids[0 + 1]);
         // Note that label[0] id[0] is intentionally left unfinished.
 
-        auto validateFinalCounters = [this, &labels](Json::Value const& countersJson) {
+        auto validateFinalCounters = [this, &labels](json::Value const& countersJson) {
             {
-                Json::Value const& jobQueue = countersJson[jss::job_queue];
+                json::Value const& jobQueue = countersJson[jss::job_queue];
                 BEAST_EXPECT(jobQueue.isObject());
                 BEAST_EXPECT(jobQueue.size() == 0);
             }
 
-            Json::Value const& rpc = countersJson[jss::rpc];
+            json::Value const& rpc = countersJson[jss::rpc];
             BEAST_EXPECT(rpc.size() == labels.size() + 1);
 
             // Verify that every entry in labels appears in rpc.
@@ -404,7 +404,7 @@ public:
             // their durations with the appropriate labels.
             {
                 // The first label is special.  It should have "errored" : "0".
-                Json::Value const& first = rpc[labels[0]];
+                json::Value const& first = rpc[labels[0]];
                 BEAST_EXPECT(first[jss::duration_us] != "0");
                 BEAST_EXPECT(first[jss::errored] == "0");
                 BEAST_EXPECT(first[jss::finished] == "1");
@@ -415,7 +415,7 @@ public:
             std::uint64_t prevDur = std::numeric_limits<std::uint64_t>::max();
             for (int i = 1; i < labels.size(); ++i)
             {
-                Json::Value const& counter{rpc[labels[i]]};
+                json::Value const& counter{rpc[labels[i]]};
                 std::uint64_t const dur{jsonToUint64(counter[jss::duration_us])};
                 BEAST_EXPECT(dur != 0 && dur < prevDur);
                 prevDur = dur;
@@ -425,25 +425,25 @@ public:
             }
 
             // Check "total"
-            Json::Value const& total{rpc[jss::total]};
+            json::Value const& total{rpc[jss::total]};
             BEAST_EXPECT(total[jss::duration_us] != "0");
             BEAST_EXPECT(jsonToUint64(total[jss::errored]) == labels.size() - 1);
             BEAST_EXPECT(jsonToUint64(total[jss::finished]) == labels.size());
             BEAST_EXPECT(jsonToUint64(total[jss::started]) == labels.size() * 2);
         };
 
-        auto validateFinalCurrent = [this, &labels](Json::Value const& currentJson) {
+        auto validateFinalCurrent = [this, &labels](json::Value const& currentJson) {
             {
-                Json::Value const& job_queue = currentJson[jss::jobs];
-                BEAST_EXPECT(job_queue.isArray());
-                BEAST_EXPECT(job_queue.size() == 0);
+                json::Value const& jobQueue = currentJson[jss::jobs];
+                BEAST_EXPECT(jobQueue.isArray());
+                BEAST_EXPECT(jobQueue.size() == 0);
             }
 
-            Json::Value const& methods = currentJson[jss::methods];
+            json::Value const& methods = currentJson[jss::methods];
             BEAST_EXPECT(methods.size() == 1);
             BEAST_EXPECT(methods.isArray());
 
-            Json::Value const& only = methods[0u];
+            json::Value const& only = methods[0u];
             BEAST_EXPECT(only.size() == 2);
             BEAST_EXPECT(only.isObject());
             BEAST_EXPECT(only[jss::duration_us] != "0");
@@ -462,7 +462,7 @@ public:
 
         auto const fullPath = fixture.logFile();
 
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fullPath));
         }
@@ -481,9 +481,9 @@ public:
                     lastLine = std::move(line);
             }
 
-            Json::Value parsedLastLine;
-            Json::Reader().parse(lastLine, parsedLastLine);
-            if (!BEAST_EXPECT(!RPC::contains_error(parsedLastLine)))
+            json::Value parsedLastLine;
+            json::Reader().parse(lastLine, parsedLastLine);
+            if (!BEAST_EXPECT(!RPC::containsError(parsedLastLine)))
             {
                 // Avoid cascade of failures
                 return;
@@ -527,21 +527,21 @@ public:
                 jobs.emplace_back(job.first, job.second.name());
             }
         }
-        std::shuffle(jobs.begin(), jobs.end(), default_prng());
+        std::shuffle(jobs.begin(), jobs.end(), defaultPrng());
 
         // Walk through all of the jobs, enqueuing every job once.  Check
         // the jobs data with every addition.
         for (int i = 0; i < jobs.size(); ++i)
         {
             perfLog->jobQueue(jobs[i].type);
-            Json::Value const jq_counters{perfLog->countersJson()[jss::job_queue]};
+            json::Value const jqCounters{perfLog->countersJson()[jss::job_queue]};
 
-            BEAST_EXPECT(jq_counters.size() == i + 2);
+            BEAST_EXPECT(jqCounters.size() == i + 2);
             for (int j = 0; j <= i; ++j)
             {
                 // Verify all expected counters are present and contain
                 // expected values.
-                Json::Value const& counter{jq_counters[jobs[j].typeName]};
+                json::Value const& counter{jqCounters[jobs[j].typeName]};
                 BEAST_EXPECT(counter.size() == 5);
                 BEAST_EXPECT(counter[jss::queued] == "1");
                 BEAST_EXPECT(counter[jss::started] == "0");
@@ -551,7 +551,7 @@ public:
             }
 
             // Verify jss::total is present and has expected values.
-            Json::Value const& total{jq_counters[jss::total]};
+            json::Value const& total{jqCounters[jss::total]};
             BEAST_EXPECT(total.size() == 5);
             BEAST_EXPECT(jsonToUint64(total[jss::queued]) == i + 1);
             BEAST_EXPECT(total[jss::started] == "0");
@@ -562,7 +562,7 @@ public:
 
         // Even with jobs queued, the perfLog should report nothing current.
         {
-            Json::Value current{perfLog->currentJson()};
+            json::Value current{perfLog->currentJson()};
             BEAST_EXPECT(current.size() == 2);
             BEAST_EXPECT(current.isMember(jss::jobs));
             BEAST_EXPECT(current[jss::jobs].size() == 0);
@@ -585,25 +585,25 @@ public:
             std::this_thread::sleep_for(microseconds(10));
 
             // Check each jobType counter entry.
-            Json::Value const jq_counters{perfLog->countersJson()[jss::job_queue]};
+            json::Value const jqCounters{perfLog->countersJson()[jss::job_queue]};
             for (int j = 0; j < jobs.size(); ++j)
             {
-                Json::Value const& counter{jq_counters[jobs[j].typeName]};
-                std::uint64_t const queued_dur_us{jsonToUint64(counter[jss::queued_duration_us])};
+                json::Value const& counter{jqCounters[jobs[j].typeName]};
+                std::uint64_t const queuedDurUs{jsonToUint64(counter[jss::queued_duration_us])};
                 if (j < i)
                 {
                     BEAST_EXPECT(counter[jss::started] == "2");
-                    BEAST_EXPECT(queued_dur_us == j + 1);
+                    BEAST_EXPECT(queuedDurUs == j + 1);
                 }
                 else if (j == i)
                 {
                     BEAST_EXPECT(counter[jss::started] == "1");
-                    BEAST_EXPECT(queued_dur_us == j + 1);
+                    BEAST_EXPECT(queuedDurUs == j + 1);
                 }
                 else
                 {
                     BEAST_EXPECT(counter[jss::started] == "0");
-                    BEAST_EXPECT(queued_dur_us == 0);
+                    BEAST_EXPECT(queuedDurUs == 0);
                 }
 
                 BEAST_EXPECT(counter[jss::queued] == "1");
@@ -612,7 +612,7 @@ public:
             }
             {
                 // Verify values in jss::total are what we expect.
-                Json::Value const& total{jq_counters[jss::total]};
+                json::Value const& total{jqCounters[jss::total]};
                 BEAST_EXPECT(jsonToUint64(total[jss::queued]) == jobs.size());
                 BEAST_EXPECT(jsonToUint64(total[jss::started]) == (i * 2) + 1);
                 BEAST_EXPECT(total[jss::finished] == "0");
@@ -654,35 +654,35 @@ public:
             perfLog->jobFinish(jobs[i].type, microseconds(finished), (i * 2) + 1);
             std::this_thread::sleep_for(microseconds(10));
 
-            Json::Value const jq_counters{perfLog->countersJson()[jss::job_queue]};
+            json::Value const jqCounters{perfLog->countersJson()[jss::job_queue]};
             for (int j = 0; j < jobs.size(); ++j)
             {
-                Json::Value const& counter{jq_counters[jobs[j].typeName]};
-                std::uint64_t const running_dur_us{jsonToUint64(counter[jss::running_duration_us])};
+                json::Value const& counter{jqCounters[jobs[j].typeName]};
+                std::uint64_t const runningDurUs{jsonToUint64(counter[jss::running_duration_us])};
                 if (j < i)
                 {
                     BEAST_EXPECT(counter[jss::finished] == "0");
-                    BEAST_EXPECT(running_dur_us == 0);
+                    BEAST_EXPECT(runningDurUs == 0);
                 }
                 else if (j == i)
                 {
                     BEAST_EXPECT(counter[jss::finished] == "1");
-                    BEAST_EXPECT(running_dur_us == ((jobs.size() - j) * 2) - 1);
+                    BEAST_EXPECT(runningDurUs == ((jobs.size() - j) * 2) - 1);
                 }
                 else
                 {
                     BEAST_EXPECT(counter[jss::finished] == "2");
-                    BEAST_EXPECT(running_dur_us == ((jobs.size() - j) * 4) - 1);
+                    BEAST_EXPECT(runningDurUs == ((jobs.size() - j) * 4) - 1);
                 }
 
-                std::uint64_t const queued_dur_us{jsonToUint64(counter[jss::queued_duration_us])};
-                BEAST_EXPECT(queued_dur_us == j + 1);
+                std::uint64_t const queuedDurUs{jsonToUint64(counter[jss::queued_duration_us])};
+                BEAST_EXPECT(queuedDurUs == j + 1);
                 BEAST_EXPECT(counter[jss::queued] == "1");
                 BEAST_EXPECT(counter[jss::started] == "2");
             }
             {
                 // Verify values in jss::total are what we expect.
-                Json::Value const& total{jq_counters[jss::total]};
+                json::Value const& total{jqCounters[jss::total]};
                 BEAST_EXPECT(jsonToUint64(total[jss::queued]) == jobs.size());
                 BEAST_EXPECT(jsonToUint64(total[jss::started]) == jobs.size() * 2);
                 BEAST_EXPECT(jsonToUint64(total[jss::finished]) == finished);
@@ -719,22 +719,22 @@ public:
         }
 
         // Validate the final results.
-        auto validateFinalCounters = [this, &jobs](Json::Value const& countersJson) {
+        auto validateFinalCounters = [this, &jobs](json::Value const& countersJson) {
             {
-                Json::Value const& rpc = countersJson[jss::rpc];
+                json::Value const& rpc = countersJson[jss::rpc];
                 BEAST_EXPECT(rpc.isObject());
                 BEAST_EXPECT(rpc.size() == 0);
             }
 
-            Json::Value const& jobQueue = countersJson[jss::job_queue];
+            json::Value const& jobQueue = countersJson[jss::job_queue];
             for (int i = jobs.size() - 1; i >= 0; --i)
             {
-                Json::Value const& counter{jobQueue[jobs[i].typeName]};
-                std::uint64_t const running_dur_us{jsonToUint64(counter[jss::running_duration_us])};
-                BEAST_EXPECT(running_dur_us == ((jobs.size() - i) * 4) - 1);
+                json::Value const& counter{jobQueue[jobs[i].typeName]};
+                std::uint64_t const runningDurUs{jsonToUint64(counter[jss::running_duration_us])};
+                BEAST_EXPECT(runningDurUs == ((jobs.size() - i) * 4) - 1);
 
-                std::uint64_t const queued_dur_us{jsonToUint64(counter[jss::queued_duration_us])};
-                BEAST_EXPECT(queued_dur_us == i + 1);
+                std::uint64_t const queuedDurUs{jsonToUint64(counter[jss::queued_duration_us])};
+                BEAST_EXPECT(queuedDurUs == i + 1);
 
                 BEAST_EXPECT(counter[jss::queued] == "1");
                 BEAST_EXPECT(counter[jss::started] == "2");
@@ -742,7 +742,7 @@ public:
             }
 
             // Verify values in jss::total are what we expect.
-            Json::Value const& total{jobQueue[jss::total]};
+            json::Value const& total{jobQueue[jss::total]};
             int const finished = jobs.size() * 2;
             BEAST_EXPECT(jsonToUint64(total[jss::queued]) == jobs.size());
             BEAST_EXPECT(jsonToUint64(total[jss::started]) == finished);
@@ -758,14 +758,14 @@ public:
             BEAST_EXPECT(jsonToUint64(total[jss::running_duration_us]) == runningDur);
         };
 
-        auto validateFinalCurrent = [this](Json::Value const& currentJson) {
+        auto validateFinalCurrent = [this](json::Value const& currentJson) {
             {
-                Json::Value const& j = currentJson[jss::jobs];
+                json::Value const& j = currentJson[jss::jobs];
                 BEAST_EXPECT(j.isArray());
                 BEAST_EXPECT(j.size() == 0);
             }
 
-            Json::Value const& methods = currentJson[jss::methods];
+            json::Value const& methods = currentJson[jss::methods];
             BEAST_EXPECT(methods.size() == 0);
             BEAST_EXPECT(methods.isArray());
         };
@@ -783,7 +783,7 @@ public:
         // Check file contents if that is appropriate.
         auto const fullPath = fixture.logFile();
 
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fullPath));
         }
@@ -802,9 +802,9 @@ public:
                     lastLine = std::move(line);
             }
 
-            Json::Value parsedLastLine;
-            Json::Reader().parse(lastLine, parsedLastLine);
-            if (!BEAST_EXPECT(!RPC::contains_error(parsedLastLine)))
+            json::Value parsedLastLine;
+            json::Reader().parse(lastLine, parsedLastLine);
+            if (!BEAST_EXPECT(!RPC::containsError(parsedLastLine)))
             {
                 // Avoid cascade of failures
                 return;
@@ -830,14 +830,14 @@ public:
         perfLog->start();
 
         // Randomly select a job type and its name.
-        JobType jobType = jtINVALID;
+        JobType jobType = JtInvalid;
         std::string jobTypeName;
         {
             auto const& jobTypes = JobTypes::instance();
 
             std::uniform_int_distribution<> dis(0, jobTypes.size() - 1);
             auto iter{jobTypes.begin()};
-            std::advance(iter, dis(default_prng()));
+            std::advance(iter, dis(defaultPrng()));
 
             jobType = iter->second.type();
             jobTypeName = iter->second.name();
@@ -848,11 +848,11 @@ public:
 
         // Lambda to validate countersJson for this test.
         auto verifyCounters = [this, jobTypeName](
-                                  Json::Value const& countersJson,
+                                  json::Value const& countersJson,
                                   int started,
                                   int finished,
-                                  int queued_us,
-                                  int running_us) {
+                                  int queuedUs,
+                                  int runningUs) {
             BEAST_EXPECT(countersJson.isObject());
             BEAST_EXPECT(countersJson.size() == 2);
 
@@ -864,20 +864,20 @@ public:
             BEAST_EXPECT(countersJson[jss::job_queue].isObject());
             BEAST_EXPECT(countersJson[jss::job_queue].size() == 1);
             {
-                Json::Value const& job{countersJson[jss::job_queue][jobTypeName]};
+                json::Value const& job{countersJson[jss::job_queue][jobTypeName]};
 
                 BEAST_EXPECT(job.isObject());
                 BEAST_EXPECT(jsonToUint64(job[jss::queued]) == 0);
                 BEAST_EXPECT(jsonToUint64(job[jss::started]) == started);
                 BEAST_EXPECT(jsonToUint64(job[jss::finished]) == finished);
 
-                BEAST_EXPECT(jsonToUint64(job[jss::queued_duration_us]) == queued_us);
-                BEAST_EXPECT(jsonToUint64(job[jss::running_duration_us]) == running_us);
+                BEAST_EXPECT(jsonToUint64(job[jss::queued_duration_us]) == queuedUs);
+                BEAST_EXPECT(jsonToUint64(job[jss::running_duration_us]) == runningUs);
             }
         };
 
         // Lambda to validate currentJson (always empty) for this test.
-        auto verifyEmptyCurrent = [this](Json::Value const& currentJson) {
+        auto verifyEmptyCurrent = [this](json::Value const& currentJson) {
             BEAST_EXPECT(currentJson.isObject());
             BEAST_EXPECT(currentJson.size() == 2);
 
@@ -923,7 +923,7 @@ public:
         // Check file contents if that is appropriate.
         auto const fullPath = fixture.logFile();
 
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fullPath));
         }
@@ -942,9 +942,9 @@ public:
                     lastLine = std::move(line);
             }
 
-            Json::Value parsedLastLine;
-            Json::Reader().parse(lastLine, parsedLastLine);
-            if (!BEAST_EXPECT(!RPC::contains_error(parsedLastLine)))
+            json::Value parsedLastLine;
+            json::Reader().parse(lastLine, parsedLastLine);
+            if (!BEAST_EXPECT(!RPC::containsError(parsedLastLine)))
             {
                 // Avoid cascade of failures
                 return;
@@ -970,7 +970,7 @@ public:
         auto perfLog{fixture.perfLog(withFile)};
 
         BEAST_EXPECT(fixture.stopSignaled == false);
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fixture.logDir()));
         }
@@ -986,7 +986,7 @@ public:
         fixture.wait();
 
         decltype(file_size(fixture.logFile())) firstFileSize{0};
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fixture.logDir()));
         }
@@ -1002,7 +1002,7 @@ public:
 
         perfLog->stop();
 
-        if (withFile == WithFile::no)
+        if (withFile == WithFile::No)
         {
             BEAST_EXPECT(!exists(fixture.logDir()));
         }
@@ -1016,14 +1016,14 @@ public:
     run() override
     {
         testFileCreation();
-        testRPC(WithFile::no);
-        testRPC(WithFile::yes);
-        testJobs(WithFile::no);
-        testJobs(WithFile::yes);
-        testInvalidID(WithFile::no);
-        testInvalidID(WithFile::yes);
-        testRotate(WithFile::no);
-        testRotate(WithFile::yes);
+        testRPC(WithFile::No);
+        testRPC(WithFile::Yes);
+        testJobs(WithFile::No);
+        testJobs(WithFile::Yes);
+        testInvalidID(WithFile::No);
+        testInvalidID(WithFile::Yes);
+        testRotate(WithFile::No);
+        testRotate(WithFile::Yes);
     }
 };
 
diff --git a/src/test/basics/StringUtilities_test.cpp b/src/test/basics/StringUtilities_test.cpp
index e566e43c9f..e12bc53857 100644
--- a/src/test/basics/StringUtilities_test.cpp
+++ b/src/test/basics/StringUtilities_test.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-class StringUtilities_test : public beast::unit_test::suite
+class StringUtilities_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -53,7 +53,7 @@ public:
 
         // Expected passes.
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -68,7 +68,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme:///"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -79,7 +79,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "lower://domain"));
             BEAST_EXPECT(pUrl.scheme == "lower");
             BEAST_EXPECT(pUrl.username.empty());
@@ -90,7 +90,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "UPPER://domain:234/"));
             BEAST_EXPECT(pUrl.scheme == "upper");
             BEAST_EXPECT(pUrl.username.empty());
@@ -101,7 +101,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "Mixed://domain/path"));
             BEAST_EXPECT(pUrl.scheme == "mixed");
             BEAST_EXPECT(pUrl.username.empty());
@@ -112,7 +112,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://[::1]:123/path"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -123,7 +123,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://user:pass@domain:123/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username == "user");
@@ -134,7 +134,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://user@domain:123/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username == "user");
@@ -145,7 +145,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://:pass@domain:123/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -156,7 +156,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://domain:123/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -167,7 +167,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://user:pass@domain/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username == "user");
@@ -178,7 +178,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://user@domain/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username == "user");
@@ -189,7 +189,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://:pass@domain/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -200,7 +200,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://domain/abc:321"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -211,7 +211,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme:///path/to/file"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -222,7 +222,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://user:pass@domain/path/with/an@sign"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username == "user");
@@ -233,7 +233,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://domain/path/with/an@sign"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -244,7 +244,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "scheme://:999/"));
             BEAST_EXPECT(pUrl.scheme == "scheme");
             BEAST_EXPECT(pUrl.username.empty());
@@ -255,7 +255,7 @@ public:
         }
 
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(parseUrl(pUrl, "http://::1:1234/validators"));
             BEAST_EXPECT(pUrl.scheme == "http");
             BEAST_EXPECT(pUrl.username.empty());
@@ -267,7 +267,7 @@ public:
 
         // Expected fails.
         {
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(!parseUrl(pUrl, ""));
             BEAST_EXPECT(!parseUrl(pUrl, "nonsense"));
             BEAST_EXPECT(!parseUrl(pUrl, "://"));
@@ -282,7 +282,7 @@ public:
 
         {
             std::string const strUrl("s://" + std::string(8192, ':'));
-            parsedURL pUrl;
+            ParsedUrl pUrl;
             BEAST_EXPECT(!parseUrl(pUrl, strUrl));
         }
     }
diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp
index 9621719803..c728536e08 100644
--- a/src/test/basics/TaggedCache_test.cpp
+++ b/src/test/basics/TaggedCache_test.cpp
@@ -20,7 +20,7 @@ then canonicalize a new object with the same key, make sure you get the
 original object.
 */
 
-class TaggedCache_test : public beast::unit_test::suite
+class TaggedCache_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -89,7 +89,7 @@ public:
             {
                 auto const p1 = c.fetch(3);
                 auto p2 = std::make_shared<Value>("three");
-                c.canonicalize_replace_client(3, p2);
+                c.canonicalizeReplaceClient(3, p2);
                 BEAST_EXPECT(p1.get() == p2.get());
             }
             ++clock;
@@ -120,7 +120,7 @@ public:
                 BEAST_EXPECT(c.getTrackSize() == 1);
                 // Canonicalize a new object with the same key
                 auto p2 = std::make_shared<std::string>("four");
-                BEAST_EXPECT(c.canonicalize_replace_client(4, p2));
+                BEAST_EXPECT(c.canonicalizeReplaceClient(4, p2));
                 BEAST_EXPECT(c.getCacheSize() == 1);
                 BEAST_EXPECT(c.getTrackSize() == 1);
                 // Make sure we get the original object
diff --git a/src/test/basics/Units_test.cpp b/src/test/basics/Units_test.cpp
index 8769a0d386..4a224a2708 100644
--- a/src/test/basics/Units_test.cpp
+++ b/src/test/basics/Units_test.cpp
@@ -11,7 +11,7 @@
 
 namespace xrpl::test {
 
-class units_test : public beast::unit_test::suite
+class units_test : public beast::unit_test::Suite
 {
 private:
     void
@@ -96,57 +96,57 @@ private:
         {
             FeeLevel32 const x{std::numeric_limits<std::uint32_t>::max()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::uintValue);
-            BEAST_EXPECT(y == Json::Value{x.fee()});
+            BEAST_EXPECT(y.type() == json::UintValue);
+            BEAST_EXPECT(y == json::Value{x.fee()});
         }
 
         {
             FeeLevel32 const x{std::numeric_limits<std::uint32_t>::min()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::uintValue);
-            BEAST_EXPECT(y == Json::Value{x.fee()});
+            BEAST_EXPECT(y.type() == json::UintValue);
+            BEAST_EXPECT(y == json::Value{x.fee()});
         }
 
         {
             FeeLevel64 const x{std::numeric_limits<std::uint64_t>::max()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::uintValue);
-            BEAST_EXPECT(y == Json::Value{std::numeric_limits<std::uint32_t>::max()});
+            BEAST_EXPECT(y.type() == json::UintValue);
+            BEAST_EXPECT(y == json::Value{std::numeric_limits<std::uint32_t>::max()});
         }
 
         {
             FeeLevel64 const x{std::numeric_limits<std::uint64_t>::min()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::uintValue);
-            BEAST_EXPECT(y == Json::Value{0});
+            BEAST_EXPECT(y.type() == json::UintValue);
+            BEAST_EXPECT(y == json::Value{0});
         }
 
         {
             FeeLevelDouble const x{std::numeric_limits<double>::max()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::realValue);
-            BEAST_EXPECT(y == Json::Value{std::numeric_limits<double>::max()});
+            BEAST_EXPECT(y.type() == json::RealValue);
+            BEAST_EXPECT(y == json::Value{std::numeric_limits<double>::max()});
         }
 
         {
             FeeLevelDouble const x{std::numeric_limits<double>::min()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::realValue);
-            BEAST_EXPECT(y == Json::Value{std::numeric_limits<double>::min()});
+            BEAST_EXPECT(y.type() == json::RealValue);
+            BEAST_EXPECT(y == json::Value{std::numeric_limits<double>::min()});
         }
 
         {
             XRPAmount const x{std::numeric_limits<std::int64_t>::max()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::intValue);
-            BEAST_EXPECT(y == Json::Value{std::numeric_limits<std::int32_t>::max()});
+            BEAST_EXPECT(y.type() == json::IntValue);
+            BEAST_EXPECT(y == json::Value{std::numeric_limits<std::int32_t>::max()});
         }
 
         {
             XRPAmount const x{std::numeric_limits<std::int64_t>::min()};
             auto y = x.jsonClipped();
-            BEAST_EXPECT(y.type() == Json::intValue);
-            BEAST_EXPECT(y == Json::Value{std::numeric_limits<std::int32_t>::min()});
+            BEAST_EXPECT(y.type() == json::IntValue);
+            BEAST_EXPECT(y == json::Value{std::numeric_limits<std::int32_t>::min()});
         }
     }
 
@@ -166,10 +166,10 @@ private:
             FeeLevel64 test{0};
             BEAST_EXPECT(test.fee() == 0);
 
-            test = explicitmake(beast::zero);
+            test = explicitmake(beast::kZERO);
             BEAST_EXPECT(test.fee() == 0);
 
-            test = beast::zero;
+            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::zero);
+            test = explicitmake(beast::kZERO);
             BEAST_EXPECT(test.fee() == 0);
 
-            test = beast::zero;
+            test = beast::kZERO;
             BEAST_EXPECT(test.fee() == 0);
 
             test = explicitmake(100.0);
@@ -330,8 +330,8 @@ public:
     void
     run() override
     {
-        BEAST_EXPECT(INITIAL_XRP.drops() == 100'000'000'000'000'000);
-        BEAST_EXPECT(INITIAL_XRP == XRPAmount{100'000'000'000'000'000});
+        BEAST_EXPECT(kINITIAL_XRP.drops() == 100'000'000'000'000'000);
+        BEAST_EXPECT(kINITIAL_XRP == 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 b0e8213b73..50cd17b3bc 100644
--- a/src/test/basics/XRPAmount_test.cpp
+++ b/src/test/basics/XRPAmount_test.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-class XRPAmount_test : public beast::unit_test::suite
+class XRPAmount_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -39,25 +39,25 @@ public:
     {
         testcase("beast::Zero Comparisons");
 
-        using beast::zero;
+        using beast::kZERO;
 
         for (auto i : {-1, 0, 1})
         {
             XRPAmount const x(i);
 
-            BEAST_EXPECT((i == 0) == (x == zero));
-            BEAST_EXPECT((i != 0) == (x != zero));
-            BEAST_EXPECT((i < 0) == (x < zero));
-            BEAST_EXPECT((i > 0) == (x > zero));
-            BEAST_EXPECT((i <= 0) == (x <= zero));
-            BEAST_EXPECT((i >= 0) == (x >= zero));
+            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) == (zero == x));
-            BEAST_EXPECT((0 != i) == (zero != x));
-            BEAST_EXPECT((0 < i) == (zero < x));
-            BEAST_EXPECT((0 > i) == (zero > x));
-            BEAST_EXPECT((0 <= i) == (zero <= x));
-            BEAST_EXPECT((0 >= i) == (zero >= 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(DROPS_PER_XRP.decimalXRP() == 1);
+        BEAST_EXPECT(kDROPS_PER_XRP.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::zero);
+        test = make(beast::kZERO);
         BEAST_EXPECT(test.drops() == 0);
 
-        test = beast::zero;
+        test = beast::kZERO;
         BEAST_EXPECT(test.drops() == 0);
 
         test = make(100);
@@ -212,17 +212,17 @@ public:
     {
         testcase("mulRatio");
 
-        constexpr auto maxUInt32 = std::numeric_limits<std::uint32_t>::max();
-        constexpr auto maxXRP = std::numeric_limits<XRPAmount::value_type>::max();
-        constexpr auto minXRP = std::numeric_limits<XRPAmount::value_type>::min();
+        constexpr auto kMAX_U_INT32 = 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();
 
         {
             // multiply by a number that would overflow then divide by the same
             // number, and check we didn't lose any value
-            XRPAmount big(maxXRP);
-            BEAST_EXPECT(big == mulRatio(big, maxUInt32, maxUInt32, true));
+            XRPAmount big(kMAX_XRP);
+            BEAST_EXPECT(big == mulRatio(big, kMAX_U_INT32, kMAX_U_INT32, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(big == mulRatio(big, maxUInt32, maxUInt32, false));
+            BEAST_EXPECT(big == mulRatio(big, kMAX_U_INT32, kMAX_U_INT32, false));
 
             // multiply and divide by values that would overflow if done
             // naively, and check that it gives the correct answer
@@ -234,11 +234,10 @@ public:
 
         {
             // Similar test as above, but for negative values
-            XRPAmount big(minXRP);  // NOLINT(misc-const-correctness): const breaks overflow check
-                                    // at end of this scope
-            BEAST_EXPECT(big == mulRatio(big, maxUInt32, maxUInt32, true));
+            XRPAmount big(kMIN_XRP);  // NOLINT TODO
+            BEAST_EXPECT(big == mulRatio(big, kMAX_U_INT32, kMAX_U_INT32, true));
             // rounding mode shouldn't matter as the result is exact
-            BEAST_EXPECT(big == mulRatio(big, maxUInt32, maxUInt32, false));
+            BEAST_EXPECT(big == mulRatio(big, kMAX_U_INT32, kMAX_U_INT32, false));
 
             // multiply and divide by values that would overflow if done
             // naively, and check that it gives the correct answer
@@ -251,39 +250,39 @@ public:
             // small amounts
             XRPAmount const tiny(1);
             // Round up should give the smallest allowable number
-            BEAST_EXPECT(tiny == mulRatio(tiny, 1, maxUInt32, true));
+            BEAST_EXPECT(tiny == mulRatio(tiny, 1, kMAX_U_INT32, true));
             // rounding down should be zero
-            BEAST_EXPECT(beast::zero == mulRatio(tiny, 1, maxUInt32, false));
-            BEAST_EXPECT(beast::zero == mulRatio(tiny, maxUInt32 - 1, maxUInt32, false));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, 1, kMAX_U_INT32, false));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tiny, kMAX_U_INT32 - 1, kMAX_U_INT32, false));
 
             // tiny negative numbers
             XRPAmount const tinyNeg(-1);
             // Round up should give zero
-            BEAST_EXPECT(beast::zero == mulRatio(tinyNeg, 1, maxUInt32, true));
-            BEAST_EXPECT(beast::zero == mulRatio(tinyNeg, maxUInt32 - 1, maxUInt32, true));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, 1, kMAX_U_INT32, true));
+            BEAST_EXPECT(beast::kZERO == mulRatio(tinyNeg, kMAX_U_INT32 - 1, kMAX_U_INT32, true));
             // rounding down should be tiny
-            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, maxUInt32 - 1, maxUInt32, false));
+            BEAST_EXPECT(tinyNeg == mulRatio(tinyNeg, kMAX_U_INT32 - 1, kMAX_U_INT32, false));
         }
 
         {  // rounding
             {
                 XRPAmount const one(1);
-                auto const rup = mulRatio(one, maxUInt32 - 1, maxUInt32, true);
-                auto const rdown = mulRatio(one, maxUInt32 - 1, maxUInt32, false);
+                auto const rup = mulRatio(one, kMAX_U_INT32 - 1, kMAX_U_INT32, true);
+                auto const rdown = mulRatio(one, kMAX_U_INT32 - 1, kMAX_U_INT32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
 
             {
-                XRPAmount const big(maxXRP);
-                auto const rup = mulRatio(big, maxUInt32 - 1, maxUInt32, true);
-                auto const rdown = mulRatio(big, maxUInt32 - 1, maxUInt32, false);
+                XRPAmount const big(kMAX_XRP);
+                auto const rup = mulRatio(big, kMAX_U_INT32 - 1, kMAX_U_INT32, true);
+                auto const rdown = mulRatio(big, kMAX_U_INT32 - 1, kMAX_U_INT32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
 
             {
                 XRPAmount const negOne(-1);
-                auto const rup = mulRatio(negOne, maxUInt32 - 1, maxUInt32, true);
-                auto const rdown = mulRatio(negOne, maxUInt32 - 1, maxUInt32, false);
+                auto const rup = mulRatio(negOne, kMAX_U_INT32 - 1, kMAX_U_INT32, true);
+                auto const rdown = mulRatio(negOne, kMAX_U_INT32 - 1, kMAX_U_INT32, false);
                 BEAST_EXPECT(rup.drops() - rdown.drops() == 1);
             }
         }
@@ -296,14 +295,14 @@ public:
 
         {
             // overflow
-            XRPAmount big(maxXRP);
+            XRPAmount big(kMAX_XRP);
             except([&] { mulRatio(big, 2, 1, true); });
         }
 
         {
             // underflow
-            XRPAmount const bigNegative(minXRP + 10);
-            BEAST_EXPECT(mulRatio(bigNegative, 2, 1, true) == minXRP);
+            XRPAmount const bigNegative(kMIN_XRP + 10);
+            BEAST_EXPECT(mulRatio(bigNegative, 2, 1, true) == kMIN_XRP);
         }
     }  // namespace xrpl
 
diff --git a/src/test/basics/base58_test.cpp b/src/test/basics/base58_test.cpp
index 948195b424..e0a9433f4e 100644
--- a/src/test/basics/base58_test.cpp
+++ b/src/test/basics/base58_test.cpp
@@ -31,19 +31,19 @@ namespace {
 [[nodiscard]] inline auto
 randEngine() -> std::mt19937&
 {
-    static std::mt19937 r = [] {
+    static std::mt19937 kR = [] {
         std::random_device rd;
         return std::mt19937{rd()};
     }();
-    return r;
+    return kR;
 }
 
-constexpr int numTokenTypeIndexes = 9;
+constexpr int kNUM_TOKEN_TYPE_INDEXES = 9;
 
 [[nodiscard]] inline auto
 tokenTypeAndSize(int i) -> std::tuple<xrpl::TokenType, std::size_t>
 {
-    assert(i < numTokenTypeIndexes);
+    assert(i < kNUM_TOKEN_TYPE_INDEXES);
 
     switch (i)
     {
@@ -157,7 +157,7 @@ randomBigInt(std::uint8_t minSize = 1, std::uint8_t maxSize = 5)
 }
 }  // namespace multiprecision_utils
 
-class base58_test : public beast::unit_test::suite
+class base58_test : public beast::unit_test::Suite
 {
     void
     testMultiprecision()
@@ -166,11 +166,11 @@ class base58_test : public beast::unit_test::suite
 
         using namespace boost::multiprecision;
 
-        constexpr std::size_t iters = 100000;
+        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 < iters; ++i)
+        for (int i = 0; i < kITERS; ++i)
         {
             std::uint64_t const d = dist(eng);
             if (d == 0u)
@@ -182,13 +182,13 @@ class base58_test : public beast::unit_test::suite
             auto const refDiv = boostBigInt / d;
             auto const refMod = boostBigInt % d;
 
-            auto const mod = b58_fast::detail::inplace_bigint_div_rem(
+            auto const mod = b58_fast::detail::inplaceBigintDivRem(
                 std::span<uint64_t>(bigInt.data(), bigInt.size()), d);
             auto const foundDiv = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refMod.convert_to<std::uint64_t>() == mod);
             BEAST_EXPECT(foundDiv == refDiv);
         }
-        for (int i = 0; i < iters; ++i)
+        for (int i = 0; i < kITERS; ++i)
         {
             std::uint64_t const d = dist(eng);
             auto bigInt = multiprecision_utils::randomBigInt(/*minSize*/ 2);
@@ -201,13 +201,13 @@ class base58_test : public beast::unit_test::suite
 
             auto const refAdd = boostBigInt + d;
 
-            auto const result = b58_fast::detail::inplace_bigint_add(
+            auto const result = b58_fast::detail::inplaceBigintAdd(
                 std::span<uint64_t>(bigInt.data(), bigInt.size()), d);
-            BEAST_EXPECT(result == TokenCodecErrc::success);
+            BEAST_EXPECT(result == TokenCodecErrc::Success);
             auto const foundAdd = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refAdd == foundAdd);
         }
-        for (int i = 0; i < iters; ++i)
+        for (int i = 0; i < kITERS; ++i)
         {
             std::uint64_t const d = dist1(eng);
             // Force overflow
@@ -218,13 +218,13 @@ class base58_test : public beast::unit_test::suite
 
             auto const refAdd = boostBigInt + d;
 
-            auto const result = b58_fast::detail::inplace_bigint_add(
+            auto const result = b58_fast::detail::inplaceBigintAdd(
                 std::span<uint64_t>(bigInt.data(), bigInt.size()), d);
-            BEAST_EXPECT(result == TokenCodecErrc::overflowAdd);
+            BEAST_EXPECT(result == TokenCodecErrc::OverflowAdd);
             auto const foundAdd = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refAdd != foundAdd);
         }
-        for (int i = 0; i < iters; ++i)
+        for (int i = 0; i < kITERS; ++i)
         {
             std::uint64_t const d = dist(eng);
             auto bigInt = multiprecision_utils::randomBigInt(/* minSize */ 2);
@@ -236,13 +236,13 @@ class base58_test : public beast::unit_test::suite
 
             auto const refMul = boostBigInt * d;
 
-            auto const result = b58_fast::detail::inplace_bigint_mul(
+            auto const result = b58_fast::detail::inplaceBigintMul(
                 std::span<uint64_t>(bigInt.data(), bigInt.size()), d);
-            BEAST_EXPECT(result == TokenCodecErrc::success);
+            BEAST_EXPECT(result == TokenCodecErrc::Success);
             auto const foundMul = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refMul == foundMul);
         }
-        for (int i = 0; i < iters; ++i)
+        for (int i = 0; i < kITERS; ++i)
         {
             std::uint64_t const d = dist1(eng);
             // Force overflow
@@ -252,9 +252,9 @@ class base58_test : public beast::unit_test::suite
 
             auto const refMul = boostBigInt * d;
 
-            auto const result = b58_fast::detail::inplace_bigint_mul(
+            auto const result = b58_fast::detail::inplaceBigintMul(
                 std::span<uint64_t>(bigInt.data(), bigInt.size()), d);
-            BEAST_EXPECT(result == TokenCodecErrc::inputTooLarge);
+            BEAST_EXPECT(result == TokenCodecErrc::InputTooLarge);
             auto const foundMul = multiprecision_utils::toBoostMP(bigInt);
             BEAST_EXPECT(refMul != foundMul);
         }
@@ -275,7 +275,7 @@ class base58_test : public beast::unit_test::suite
                 std::span const outBuf{b58ResultBuf[i]};
                 if (i == 0)
                 {
-                    auto const r = xrpl::b58_fast::detail::b256_to_b58_be(b256Data, outBuf);
+                    auto const r = xrpl::b58_fast::detail::b256ToB58Be(b256Data, outBuf);
                     BEAST_EXPECT(r);
                     b58Result[i] = r.value();
                 }
@@ -305,7 +305,7 @@ class base58_test : public beast::unit_test::suite
                 {
                     std::string const in(
                         b58Result[i].data(), b58Result[i].data() + b58Result[i].size());
-                    auto const r = xrpl::b58_fast::detail::b58_to_b256_be(in, outBuf);
+                    auto const r = xrpl::b58_fast::detail::b58ToB256Be(in, outBuf);
                     BEAST_EXPECT(r);
                     b256Result[i] = r.value();
                 }
@@ -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 < numTokenTypeIndexes; ++i)
+        for (int i = 0; i < kNUM_TOKEN_TYPE_INDEXES; ++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 iters = 100000;
-        for (int i = 0; i < iters; ++i)
+        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 8148f3bdce..cf5ece6240 100644
--- a/src/test/basics/base_uint_test.cpp
+++ b/src/test/basics/base_uint_test.cpp
@@ -24,32 +24,32 @@ namespace xrpl::test {
 // a non-hashing Hasher that just copies the bytes.
 // Used to test hash_append in base_uint
 template <std::size_t Bits>
-struct nonhash
+struct Nonhash
 {
-    static constexpr auto const endian = boost::endian::order::big;
-    static constexpr std::size_t WIDTH = Bits / 8;
+    static constexpr auto const kENDIAN = boost::endian::order::big;
+    static constexpr std::size_t kWIDTH = Bits / 8;
 
-    std::array<std::uint8_t, WIDTH> data_;
+    std::array<std::uint8_t, kWIDTH> data;
 
-    nonhash() = default;
+    Nonhash() = default;
 
     void
     operator()(void const* key, std::size_t len) noexcept
     {
-        assert(len == WIDTH);
-        memcpy(data_.data(), key, len);
+        assert(len == kWIDTH);
+        memcpy(data.data(), key, len);
     }
 
     explicit
     operator std::size_t() noexcept
     {
-        return WIDTH;
+        return kWIDTH;
     }
 };
 
-struct base_uint_test : beast::unit_test::suite
+struct base_uint_test : beast::unit_test::Suite
 {
-    using test96 = base_uint<96>;
+    using test96 = BaseUint<96>;
     static_assert(std::is_copy_constructible_v<test96>);
     static_assert(std::is_copy_assignable_v<test96>);
 
@@ -57,17 +57,18 @@ struct base_uint_test : beast::unit_test::suite
     testComparisons()
     {
         {
-            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6> test_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>
+                kTEST_ARGS{
+                    {{"0000000000000000", "0000000000000001"},
+                     {"0000000000000000", "ffffffffffffffff"},
+                     {"1234567812345678", "2345678923456789"},
+                     {"8000000000000000", "8000000000000001"},
+                     {"aaaaaaaaaaaaaaa9", "aaaaaaaaaaaaaaaa"},
+                     {"fffffffffffffffe", "ffffffffffffffff"}}};
 
-            for (auto const& arg : test_args)
+            for (auto const& arg : kTEST_ARGS)
             {
-                xrpl::base_uint<64> const u{arg.first}, v{arg.second};
+                xrpl::BaseUint<64> const u{arg.first}, v{arg.second};
                 BEAST_EXPECT(u < v);
                 BEAST_EXPECT(u <= v);
                 BEAST_EXPECT(u != v);
@@ -86,8 +87,8 @@ struct base_uint_test : beast::unit_test::suite
         }
 
         {
-            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6> test_args{
-                {
+            static constexpr std::array<std::pair<std::string_view, std::string_view>, 6>
+                kTEST_ARGS{{
                     {"000000000000000000000000", "000000000000000000000001"},
                     {"000000000000000000000000", "ffffffffffffffffffffffff"},
                     {"0123456789ab0123456789ab", "123456789abc123456789abc"},
@@ -96,9 +97,9 @@ struct base_uint_test : beast::unit_test::suite
                     {"fffffffffffffffffffffffe", "ffffffffffffffffffffffff"},
                 }};
 
-            for (auto const& arg : test_args)
+            for (auto const& arg : kTEST_ARGS)
             {
-                xrpl::base_uint<96> const u{arg.first}, v{arg.second};
+                xrpl::BaseUint<96> const u{arg.first}, v{arg.second};
                 BEAST_EXPECT(u < v);
                 BEAST_EXPECT(u <= v);
                 BEAST_EXPECT(u != v);
@@ -128,16 +129,16 @@ struct base_uint_test : beast::unit_test::suite
         testComparisons();
 
         // used to verify set insertion (hashing required)
-        std::unordered_set<test96, hardened_hash<>> uset;
+        std::unordered_set<test96, HardenedHash<>> uset;
 
         Blob const raw{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
-        BEAST_EXPECT(test96::bytes == raw.size());
+        BEAST_EXPECT(test96::kBYTES == raw.size());
 
         test96 u{raw};
         uset.insert(u);
         BEAST_EXPECT(raw.size() == u.size());
         BEAST_EXPECT(to_string(u) == "0102030405060708090A0B0C");
-        BEAST_EXPECT(to_short_string(u) == "01020304...");
+        BEAST_EXPECT(toShortString(u) == "01020304...");
         BEAST_EXPECT(*u.data() == 1);
         BEAST_EXPECT(u.signum() == 1);
         BEAST_EXPECT(!!u);
@@ -152,15 +153,15 @@ struct base_uint_test : beast::unit_test::suite
         // Test hash_append by "hashing" with a no-op hasher (h)
         // and then extracting the bytes that were written during hashing
         // back into another base_uint (w) for comparison with the original
-        nonhash<96> h{};
+        Nonhash<96> h{};
         hash_append(h, u);
-        test96 const w{std::vector<std::uint8_t>(h.data_.begin(), h.data_.end())};
+        test96 const w{std::vector<std::uint8_t>(h.data.begin(), h.data.end())};
         BEAST_EXPECT(w == u);
 
         test96 v{~u};
         uset.insert(v);
         BEAST_EXPECT(to_string(v) == "FEFDFCFBFAF9F8F7F6F5F4F3");
-        BEAST_EXPECT(to_short_string(v) == "FEFDFCFB...");
+        BEAST_EXPECT(toShortString(v) == "FEFDFCFB...");
         BEAST_EXPECT(*v.data() == 0xfe);
         BEAST_EXPECT(v.signum() == 1);
         BEAST_EXPECT(!!v);
@@ -178,10 +179,10 @@ struct base_uint_test : beast::unit_test::suite
         v = u;
         BEAST_EXPECT(v == u);
 
-        test96 z{beast::zero};
+        test96 z{beast::kZERO};
         uset.insert(z);
         BEAST_EXPECT(to_string(z) == "000000000000000000000000");
-        BEAST_EXPECT(to_short_string(z) == "00000000...");
+        BEAST_EXPECT(toShortString(z) == "00000000...");
         BEAST_EXPECT(*z.data() == 0);
         BEAST_EXPECT(*z.begin() == 0);
         BEAST_EXPECT(*std::prev(z.end(), 1) == 0);
@@ -198,12 +199,12 @@ struct base_uint_test : beast::unit_test::suite
         n++;
         BEAST_EXPECT(n == test96(1));
         n--;
-        BEAST_EXPECT(n == beast::zero);
+        BEAST_EXPECT(n == beast::kZERO);
         BEAST_EXPECT(n == z);
         n--;
         BEAST_EXPECT(to_string(n) == "FFFFFFFFFFFFFFFFFFFFFFFF");
-        BEAST_EXPECT(to_short_string(n) == "FFFFFFFF...");
-        n = beast::zero;
+        BEAST_EXPECT(toShortString(n) == "FFFFFFFF...");
+        n = beast::kZERO;
         BEAST_EXPECT(n == z);
 
         test96 zp1{z};
@@ -213,7 +214,7 @@ struct base_uint_test : beast::unit_test::suite
         test96 const x{zm1 ^ zp1};
         uset.insert(x);
         BEAST_EXPECTS(to_string(x) == "FFFFFFFFFFFFFFFFFFFFFFFE", to_string(x));
-        BEAST_EXPECTS(to_short_string(x) == "FFFFFFFF...", to_short_string(x));
+        BEAST_EXPECTS(toShortString(x) == "FFFFFFFF...", toShortString(x));
 
         BEAST_EXPECT(uset.size() == 4);
 
@@ -335,7 +336,7 @@ struct base_uint_test : beast::unit_test::suite
                 {
                 }
             };
-            constexpr StrBaseUint testCases[] = {
+            constexpr StrBaseUint kTEST_CASES[] = {
                 "000000000000000000000000",
                 "000000000000000000000001",
                 "fedcba9876543210ABCDEF91",
@@ -343,7 +344,7 @@ struct base_uint_test : beast::unit_test::suite
                 "800000000000000000000000",
                 "fFfFfFfFfFfFfFfFfFfFfFfF"};
 
-            for (StrBaseUint const& t : testCases)
+            for (StrBaseUint const& t : kTEST_CASES)
             {
                 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 10e9c87309..a4ecdf7081 100644
--- a/src/test/basics/hardened_hash_test.cpp
+++ b/src/test/basics/hardened_hash_test.cpp
@@ -15,42 +15,44 @@
 namespace xrpl::detail {
 
 template <class T>
-class test_user_type_member
+class TestUserTypeMember
 {
 private:
-    T t;
+    T t_;
 
 public:
-    explicit test_user_type_member(T const& t_ = T()) : t(t_)
+    explicit TestUserTypeMember(T const& t = T()) : t_(t)
     {
     }
 
     template <class Hasher>
     friend void
-    hash_append(Hasher& h, test_user_type_member const& a) noexcept
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    hash_append(Hasher& h, TestUserTypeMember const& a) noexcept
     {
         using beast::hash_append;
-        hash_append(h, a.t);
+        hash_append(h, a.t_);
     }
 };
 
 template <class T>
-class test_user_type_free
+class TestUserTypeFree
 {
 private:
-    T t;
+    T t_;
 
 public:
-    explicit test_user_type_free(T const& t_ = T()) : t(t_)
+    explicit TestUserTypeFree(T const& t = T()) : t_(t)
     {
     }
 
     template <class Hasher>
     friend void
-    hash_append(Hasher& h, test_user_type_free const& a) noexcept
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    hash_append(Hasher& h, TestUserTypeFree const& a) noexcept
     {
         using beast::hash_append;
-        hash_append(h, a.t);
+        hash_append(h, a.t_);
     }
 };
 
@@ -63,21 +65,21 @@ namespace xrpl {
 namespace detail {
 
 template <class T>
-using test_hardened_unordered_set = std::unordered_set<T, hardened_hash<>>;
+using test_hardened_unordered_set = std::unordered_set<T, HardenedHash<>>;
 
 template <class T>
-using test_hardened_unordered_map = std::unordered_map<T, int, hardened_hash<>>;
+using test_hardened_unordered_map = std::unordered_map<T, int, HardenedHash<>>;
 
 template <class T>
-using test_hardened_unordered_multiset = std::unordered_multiset<T, hardened_hash<>>;
+using test_hardened_unordered_multiset = std::unordered_multiset<T, HardenedHash<>>;
 
 template <class T>
-using test_hardened_unordered_multimap = std::unordered_multimap<T, int, hardened_hash<>>;
+using test_hardened_unordered_multimap = std::unordered_multimap<T, int, HardenedHash<>>;
 
 }  // namespace detail
 
 template <std::size_t Bits, class UInt = std::uint64_t>
-class unsigned_integer
+class UnsignedInteger
 {
 private:
     static_assert(
@@ -88,60 +90,60 @@ private:
 
     static_assert(Bits >= (8 * sizeof(UInt)), "Bits must be at least 8*sizeof(UInt)");
 
-    static std::size_t const size = Bits / (8 * sizeof(UInt));
+    static std::size_t const kSIZE = Bits / (8 * sizeof(UInt));
 
-    std::array<UInt, size> m_vec;
+    std::array<UInt, kSIZE> vec_;
 
 public:
     using value_type = UInt;
 
-    static std::size_t const bits = Bits;
-    static std::size_t const bytes = bits / 8;
+    static std::size_t const kBITS = Bits;
+    static std::size_t const kBYTES = kBITS / 8;
 
     template <class Int>
-    static unsigned_integer
-    from_number(Int v)
+    static UnsignedInteger
+    fronumber(Int v)
     {
-        unsigned_integer result;
-        for (std::size_t i(1); i < size; ++i)
-            result.m_vec[i] = 0;
-        result.m_vec[0] = v;
+        UnsignedInteger result;
+        for (std::size_t i(1); i < kSIZE; ++i)
+            result.vec_[i] = 0;
+        result.vec_[0] = v;
         return result;
     }
 
     void*
     data() noexcept
     {
-        return &m_vec[0];
+        return &vec_[0];
     }
 
     [[nodiscard]] void const*
     data() const noexcept
     {
-        return &m_vec[0];
+        return &vec_[0];
     }
 
     template <class Hasher>
     friend void
-    hash_append(Hasher& h, unsigned_integer const& a) noexcept
+    hash_append(Hasher& h, UnsignedInteger const& a) noexcept
     {
         using beast::hash_append;
-        hash_append(h, a.m_vec);
+        hash_append(h, a.vec_);
     }
 
     friend std::ostream&
-    operator<<(std::ostream& s, unsigned_integer const& v)
+    operator<<(std::ostream& s, UnsignedInteger const& v)
     {
-        for (std::size_t i(0); i < size; ++i)
-            s << std::hex << std::setfill('0') << std::setw(2 * sizeof(UInt)) << v.m_vec[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;
     }
 };
 
-using sha256_t = unsigned_integer<256, std::size_t>;
+using sha256_t = UnsignedInteger<256, std::size_t>;
 
 #ifndef __INTELLISENSE__
-static_assert(sha256_t::bits == 256, "sha256_t must have 256 bits");
+static_assert(sha256_t::kBITS == 256, "sha256_t must have 256 bits");
 #endif
 
 }  // namespace xrpl
@@ -150,7 +152,7 @@ static_assert(sha256_t::bits == 256, "sha256_t must have 256 bits");
 
 namespace xrpl {
 
-class hardened_hash_test : public beast::unit_test::suite
+class hardened_hash_test : public beast::unit_test::Suite
 {
 public:
     template <class T>
@@ -158,13 +160,13 @@ public:
     check()
     {
         T t{};
-        hardened_hash<>()(t);
+        HardenedHash<>()(t);
         pass();
     }
 
     template <template <class T> class U>
     void
-    check_user_type()
+    checkUserType()
     {
         check<U<bool>>();
         check<U<char>>();
@@ -189,44 +191,44 @@ public:
 
     template <template <class T> class C>
     void
-    check_container()
+    checkContainer()
     {
         {
-            C<detail::test_user_type_member<std::string>> const c;
+            C<detail::TestUserTypeMember<std::string>> const c;
         }
 
         pass();
 
         {
-            C<detail::test_user_type_free<std::string>> const c;
+            C<detail::TestUserTypeFree<std::string>> const c;
         }
 
         pass();
     }
 
     void
-    test_user_types()
+    testUserTypes()
     {
         testcase("user types");
-        check_user_type<detail::test_user_type_member>();
-        check_user_type<detail::test_user_type_free>();
+        checkUserType<detail::TestUserTypeMember>();
+        checkUserType<detail::TestUserTypeFree>();
     }
 
     void
-    test_containers()
+    testContainers()
     {
         testcase("containers");
-        check_container<detail::test_hardened_unordered_set>();
-        check_container<detail::test_hardened_unordered_map>();
-        check_container<detail::test_hardened_unordered_multiset>();
-        check_container<detail::test_hardened_unordered_multimap>();
+        checkContainer<detail::test_hardened_unordered_set>();
+        checkContainer<detail::test_hardened_unordered_map>();
+        checkContainer<detail::test_hardened_unordered_multiset>();
+        checkContainer<detail::test_hardened_unordered_multimap>();
     }
 
     void
     run() override
     {
-        test_user_types();
-        test_containers();
+        testUserTypes();
+        testContainers();
     }
 };
 
diff --git a/src/test/basics/join_test.cpp b/src/test/basics/join_test.cpp
index c03a027971..cce8e19a92 100644
--- a/src/test/basics/join_test.cpp
+++ b/src/test/basics/join_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl::test {
 
-struct join_test : beast::unit_test::suite
+struct join_test : beast::unit_test::Suite
 {
     void
     run() override
@@ -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::master}, "xxx"),
-                Account::master.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/IPEndpointCommon.h b/src/test/beast/IPEndpointCommon.h
index 2f839af5e2..15566cb830 100644
--- a/src/test/beast/IPEndpointCommon.h
+++ b/src/test/beast/IPEndpointCommon.h
@@ -9,33 +9,33 @@ randomEP(bool v4 = true)
     using namespace xrpl;
     auto dv4 = []() -> AddressV4::bytes_type {
         return {
-            {static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX))}};
+            {static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX))}};
     };
     auto dv6 = []() -> AddressV6::bytes_type {
         return {
-            {static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX)),
-             static_cast<std::uint8_t>(rand_int<int>(1, UINT8_MAX))}};
+            {static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX)),
+             static_cast<std::uint8_t>(randInt<int>(1, UINT8_MAX))}};
     };
     return Endpoint{
         v4 ? Address{AddressV4{dv4()}} : Address{AddressV6{dv6()}},
-        rand_int<std::uint16_t>(1, UINT16_MAX)};
+        randInt<std::uint16_t>(1, UINT16_MAX)};
 }
 
 }  // namespace beast::IP
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index 759a3fe3ad..0cf5e9794a 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -26,7 +26,7 @@ namespace beast::IP {
 
 //------------------------------------------------------------------------------
 
-class IPEndpoint_test : public unit_test::suite
+class IPEndpoint_test : public unit_test::Suite
 {
 public:
     void
@@ -57,14 +57,14 @@ public:
         testcase("AddressV4");
 
         BEAST_EXPECT(AddressV4{}.to_uint() == 0);
-        BEAST_EXPECT(is_unspecified(AddressV4{}));
+        BEAST_EXPECT(isUnspecified(AddressV4{}));
         BEAST_EXPECT(AddressV4{0x01020304}.to_uint() == 0x01020304);
 
         {
             AddressV4::bytes_type const d = {{1, 2, 3, 4}};
             BEAST_EXPECT(AddressV4{d}.to_uint() == 0x01020304);
 
-            unexpected(is_unspecified(AddressV4{d}));
+            unexpected(isUnspecified(AddressV4{d}));
         }
 
         AddressV4 const v1{1};
@@ -161,7 +161,7 @@ public:
         std::uint16_t p,
         std::string const& normal = "")
     {
-        auto const result = Endpoint::from_string_checked(s);
+        auto const result = Endpoint::fromStringChecked(s);
         if (BEAST_EXPECT(result); !result.has_value())
             return;
         if (!BEAST_EXPECT(result->address().is_v4()))
@@ -180,7 +180,7 @@ public:
         std::uint16_t p,
         std::string const& normal = "")
     {
-        auto result = Endpoint::from_string_checked(s);
+        auto result = Endpoint::fromStringChecked(s);
         if (BEAST_EXPECT(result); !result.has_value())
             return;
         if (!BEAST_EXPECT(result->address().is_v6()))
@@ -195,15 +195,15 @@ public:
     void
     failParseEP(std::string s)
     {
-        auto a1 = Endpoint::from_string(s);
-        BEAST_EXPECTS(is_unspecified(a1), s + " parses as " + a1.to_string());
+        auto a1 = Endpoint::fromString(s);
+        BEAST_EXPECTS(isUnspecified(a1), s + " parses as " + a1.toString());
 
-        auto a2 = Endpoint::from_string(s);
-        BEAST_EXPECTS(is_unspecified(a2), s + " parses as " + a2.to_string());
+        auto a2 = Endpoint::fromString(s);
+        BEAST_EXPECTS(isUnspecified(a2), s + " parses as " + a2.toString());
 
         boost::replace_last(s, ":", " ");
-        auto a3 = Endpoint::from_string(s);
-        BEAST_EXPECTS(is_unspecified(a3), s + " parses as " + a3.to_string());
+        auto a3 = Endpoint::fromString(s);
+        BEAST_EXPECTS(isUnspecified(a3), s + " parses as " + a3.toString());
     }
 
     void
@@ -241,94 +241,94 @@ public:
 
         AddressV4::bytes_type d = {{127, 0, 0, 1}};
         ep = Endpoint(AddressV4{d}, 80);
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(!is_public(ep));
-        BEAST_EXPECT(is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(is_loopback(ep));
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(!isPublic(ep));
+        BEAST_EXPECT(isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(isLoopback(ep));
         BEAST_EXPECT(to_string(ep) == "127.0.0.1:80");
         // same address as v4 mapped in ipv6
         ep = Endpoint(
             boost::asio::ip::make_address_v6(boost::asio::ip::v4_mapped, AddressV4{d}), 80);
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(!is_public(ep));
-        BEAST_EXPECT(is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));  // mapped loopback is not a loopback
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(!isPublic(ep));
+        BEAST_EXPECT(isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));  // mapped loopback is not a loopback
         BEAST_EXPECTS(to_string(ep) == "[::ffff:127.0.0.1]:80", to_string(ep));
 
         d = {{10, 0, 0, 1}};
         ep = Endpoint(AddressV4{d});
-        BEAST_EXPECT(get_class(ep.to_v4()) == 'A');
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(!is_public(ep));
-        BEAST_EXPECT(is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));
+        BEAST_EXPECT(getClass(ep.toV4()) == 'A');
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(!isPublic(ep));
+        BEAST_EXPECT(isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));
         BEAST_EXPECT(to_string(ep) == "10.0.0.1");
         // same address as v4 mapped in ipv6
         ep = Endpoint(boost::asio::ip::make_address_v6(boost::asio::ip::v4_mapped, AddressV4{d}));
         BEAST_EXPECT(
-            get_class(boost::asio::ip::make_address_v4(boost::asio::ip::v4_mapped, ep.to_v6())) ==
+            getClass(boost::asio::ip::make_address_v4(boost::asio::ip::v4_mapped, ep.toV6())) ==
             'A');
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(!is_public(ep));
-        BEAST_EXPECT(is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(!isPublic(ep));
+        BEAST_EXPECT(isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));
         BEAST_EXPECTS(to_string(ep) == "::ffff:10.0.0.1", to_string(ep));
 
         d = {{166, 78, 151, 147}};
         ep = Endpoint(AddressV4{d});
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(is_public(ep));
-        BEAST_EXPECT(!is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(isPublic(ep));
+        BEAST_EXPECT(!isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));
         BEAST_EXPECT(to_string(ep) == "166.78.151.147");
         // same address as v4 mapped in ipv6
         ep = Endpoint(boost::asio::ip::make_address_v6(boost::asio::ip::v4_mapped, AddressV4{d}));
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(is_public(ep));
-        BEAST_EXPECT(!is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(isPublic(ep));
+        BEAST_EXPECT(!isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));
         BEAST_EXPECTS(to_string(ep) == "::ffff:166.78.151.147", to_string(ep));
 
         // a private IPv6
         AddressV6::bytes_type const d2 = {{253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}};
         ep = Endpoint(AddressV6{d2});
-        BEAST_EXPECT(!is_unspecified(ep));
-        BEAST_EXPECT(!is_public(ep));
-        BEAST_EXPECT(is_private(ep));
-        BEAST_EXPECT(!is_multicast(ep));
-        BEAST_EXPECT(!is_loopback(ep));
+        BEAST_EXPECT(!isUnspecified(ep));
+        BEAST_EXPECT(!isPublic(ep));
+        BEAST_EXPECT(isPrivate(ep));
+        BEAST_EXPECT(!isMulticast(ep));
+        BEAST_EXPECT(!isLoopback(ep));
         BEAST_EXPECTS(to_string(ep) == "fd00::1", to_string(ep));
 
         {
-            ep = Endpoint::from_string("192.0.2.112");
-            BEAST_EXPECT(!is_unspecified(ep));
-            BEAST_EXPECT(ep == Endpoint::from_string("192.0.2.112"));
+            ep = Endpoint::fromString("192.0.2.112");
+            BEAST_EXPECT(!isUnspecified(ep));
+            BEAST_EXPECT(ep == Endpoint::fromString("192.0.2.112"));
 
-            auto const ep1 = Endpoint::from_string("192.0.2.112:2016");
-            BEAST_EXPECT(!is_unspecified(ep1));
+            auto const ep1 = Endpoint::fromString("192.0.2.112:2016");
+            BEAST_EXPECT(!isUnspecified(ep1));
             BEAST_EXPECT(ep.address() == ep1.address());
             BEAST_EXPECT(ep1.port() == 2016);
 
-            auto const ep2 = Endpoint::from_string("192.0.2.112:2016");
-            BEAST_EXPECT(!is_unspecified(ep2));
+            auto const ep2 = Endpoint::fromString("192.0.2.112:2016");
+            BEAST_EXPECT(!isUnspecified(ep2));
             BEAST_EXPECT(ep.address() == ep2.address());
             BEAST_EXPECT(ep2.port() == 2016);
             BEAST_EXPECT(ep1 == ep2);
 
-            auto const ep3 = Endpoint::from_string("192.0.2.112 2016");
-            BEAST_EXPECT(!is_unspecified(ep3));
+            auto const ep3 = Endpoint::fromString("192.0.2.112 2016");
+            BEAST_EXPECT(!isUnspecified(ep3));
             BEAST_EXPECT(ep.address() == ep3.address());
             BEAST_EXPECT(ep3.port() == 2016);
             BEAST_EXPECT(ep2 == ep3);
 
-            auto const ep4 = Endpoint::from_string("192.0.2.112     2016");
-            BEAST_EXPECT(!is_unspecified(ep4));
+            auto const ep4 = Endpoint::fromString("192.0.2.112     2016");
+            BEAST_EXPECT(!isUnspecified(ep4));
             BEAST_EXPECT(ep.address() == ep4.address());
             BEAST_EXPECT(ep4.port() == 2016);
             BEAST_EXPECT(ep3 == ep4);
@@ -339,8 +339,8 @@ public:
         }
 
         {
-            ep = Endpoint::from_string("[::]:2017");
-            BEAST_EXPECT(is_unspecified(ep));
+            ep = Endpoint::fromString("[::]:2017");
+            BEAST_EXPECT(isUnspecified(ep));
             BEAST_EXPECT(ep.port() == 2017);
             BEAST_EXPECT(ep.address() == AddressV6{});
         }
@@ -375,15 +375,15 @@ public:
 
         // test with hashed container
         std::unordered_set<Endpoint> eps;
-        constexpr auto items{100};
-        float max_lf{0};
-        for (auto i = 0; i < items; ++i)
+        constexpr auto kITEMS{100};
+        float maxLf{0};
+        for (auto i = 0; i < kITEMS; ++i)
         {
-            eps.insert(randomEP(xrpl::rand_int(0, 1) == 1));
-            max_lf = std::max(max_lf, eps.load_factor());
+            eps.insert(randomEP(xrpl::randInt(0, 1) == 1));
+            maxLf = std::max(maxLf, eps.load_factor());
         }
-        BEAST_EXPECT(eps.bucket_count() >= items);
-        BEAST_EXPECT(max_lf > 0.90);
+        BEAST_EXPECT(eps.bucket_count() >= kITEMS);
+        BEAST_EXPECT(maxLf > 0.90);
     }
 
     //--------------------------------------------------------------------------
diff --git a/src/test/beast/LexicalCast_test.cpp b/src/test/beast/LexicalCast_test.cpp
index 12c2c2a464..f988aa03cf 100644
--- a/src/test/beast/LexicalCast_test.cpp
+++ b/src/test/beast/LexicalCast_test.cpp
@@ -9,7 +9,7 @@
 
 namespace beast {
 
-class LexicalCast_test : public unit_test::suite
+class LexicalCast_test : public unit_test::Suite
 {
 public:
     template <class IntType>
diff --git a/src/test/beast/SemanticVersion_test.cpp b/src/test/beast/SemanticVersion_test.cpp
index 7e25e845fc..d7079080c8 100644
--- a/src/test/beast/SemanticVersion_test.cpp
+++ b/src/test/beast/SemanticVersion_test.cpp
@@ -5,7 +5,7 @@
 
 namespace beast {
 
-class SemanticVersion_test : public unit_test::suite
+class SemanticVersion_test : public unit_test::Suite
 {
     using identifier_list = SemanticVersion::identifier_list;
 
diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp
index a979cdbb38..f2ce72b584 100644
--- a/src/test/beast/aged_associative_container_test.cpp
+++ b/src/test/beast/aged_associative_container_test.cpp
@@ -39,7 +39,7 @@
 
 namespace beast {
 
-class aged_associative_container_test_base : public unit_test::suite
+class AgedAssociativeContainerTestBase : public unit_test::Suite
 {
 public:
     template <class T>
@@ -58,11 +58,11 @@ public:
         bool
         operator()(T const& lhs, T const& rhs) const
         {
-            return m_less(lhs, rhs);
+            return less_(lhs, rhs);
         }
 
     private:
-        std::less<T> m_less;
+        std::less<T> less_;
     };
 
     template <class T>
@@ -78,11 +78,11 @@ public:
         std::size_t
         operator()(T const& t) const
         {
-            return m_hash(t);
+            return hash_(t);
         }
 
     private:
-        std::hash<T> m_hash;
+        std::hash<T> hash_;
     };
 
     template <class T>
@@ -98,11 +98,11 @@ public:
         bool
         operator()(T const& lhs, T const& rhs) const
         {
-            return m_eq(lhs, rhs);
+            return eq_(lhs, rhs);
         }
 
     private:
-        std::equal_to<T> m_eq;
+        std::equal_to<T> eq_;
     };
 
     template <class T>
@@ -113,7 +113,7 @@ public:
         // using std::true_type::type = propagate_on_container_swap :;
 
         template <class U>
-        struct rebind
+        struct Rebind
         {
             using other = AllocT<U>;
         };
@@ -176,7 +176,7 @@ public:
 
     protected:
         static std::string
-        name_ordered_part()
+        nameOrderedPart()
         {
             return "";
         }
@@ -194,7 +194,7 @@ public:
 
     protected:
         static std::string
-        name_ordered_part()
+        nameOrderedPart()
         {
             return "unordered_";
         }
@@ -207,7 +207,7 @@ public:
     public:
     protected:
         static std::string
-        name_multi_part()
+        nameMultiPart()
         {
             return "";
         }
@@ -220,7 +220,7 @@ public:
     public:
     protected:
         static std::string
-        name_multi_part()
+        nameMultiPart()
         {
             return "multi";
         }
@@ -256,7 +256,7 @@ public:
 
     protected:
         static std::string
-        name_map_part()
+        nameMapPart()
         {
             return "set";
         }
@@ -291,7 +291,7 @@ public:
 
     protected:
         static std::string
-        name_map_part()
+        nameMapPart()
         {
             return "map";
         }
@@ -306,7 +306,7 @@ public:
         template <
             class Compare = std::less<typename Base::Key>,
             class Allocator = std::allocator<typename Base::Value>>
-        using Cont = detail::aged_ordered_container<
+        using Cont = detail::AgedOrderedContainer<
             Base::is_multi::value,
             Base::is_map::value,
             typename Base::Key,
@@ -324,7 +324,7 @@ public:
             class Hash = std::hash<typename Base::Key>,
             class KeyEqual = std::equal_to<typename Base::Key>,
             class Allocator = std::allocator<typename Base::Value>>
-        using Cont = detail::aged_unordered_container<
+        using Cont = detail::AgedUnorderedContainer<
             Base::is_multi::value,
             Base::is_map::value,
             typename Base::Key,
@@ -341,7 +341,7 @@ public:
     {
         using Key = std::string;
         using Clock = std::chrono::steady_clock;
-        using ManualClock = manual_clock<Clock>;
+        using ManualClock = beast::ManualClock<Clock>;
     };
 
     template <bool IsUnordered, bool IsMulti, bool IsMap>
@@ -384,7 +384,7 @@ public:
     }
 
     template <class Traits>
-    struct equal_value
+    struct EqualValue
     {
         bool
         operator()(typename Traits::Value const& lhs, typename Traits::Value const& rhs)
@@ -395,7 +395,7 @@ public:
 
     template <class Cont>
     static std::vector<typename Cont::value_type>
-    make_list(Cont const& c)
+    makeList(Cont const& c)
     {
         return std::vector<typename Cont::value_type>(c.begin(), c.end());
     }
@@ -616,7 +616,7 @@ public:
 // map, unordered_map
 template <class Container, class Values>
 std::enable_if_t<Container::is_map::value && !Container::is_multi::value>
-aged_associative_container_test_base::checkMapContents(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkMapContents(Container& c, Values const& v)
 {
     if (v.empty())
     {
@@ -642,15 +642,15 @@ aged_associative_container_test_base::checkMapContents(Container& c, Values cons
 // unordered
 template <class C, class Values>
 std::enable_if_t<std::remove_reference<C>::type::is_unordered::value>
-aged_associative_container_test_base::checkUnorderedContentsRefRef(C&& c, Values const& v)
+AgedAssociativeContainerTestBase::checkUnorderedContentsRefRef(C&& c, Values const& v)
 {
     using Cont = std::remove_reference_t<C>;
     using Traits =
         TestTraits<Cont::is_unordered::value, Cont::is_multi::value, Cont::is_map::value>;
     using size_type = typename Cont::size_type;
-    auto const hash(c.hash_function());
-    auto const key_eq(c.key_eq());
-    for (size_type i(0); i < c.bucket_count(); ++i)
+    auto const hash(c.hashFunction());
+    auto const keyEq(c.keyEq());
+    for (size_type i(0); i < c.bucketCount(); ++i)
     {
         auto const last(c.end(i));
         for (auto iter(c.begin(i)); iter != last; ++iter)
@@ -660,7 +660,7 @@ aged_associative_container_test_base::checkUnorderedContentsRefRef(C&& c, Values
                     return Traits::extract(*iter) == Traits::extract(e);
                 }));
             BEAST_EXPECT(match != v.end());
-            BEAST_EXPECT(key_eq(Traits::extract(*iter), Traits::extract(*match)));
+            BEAST_EXPECT(keyEq(Traits::extract(*iter), Traits::extract(*match)));
             BEAST_EXPECT(hash(Traits::extract(*iter)) == hash(Traits::extract(*match)));
         }
     }
@@ -668,7 +668,7 @@ aged_associative_container_test_base::checkUnorderedContentsRefRef(C&& c, Values
 
 template <class C, class Values>
 void
-aged_associative_container_test_base::checkContentsRefRef(C&& c, Values const& v)
+AgedAssociativeContainerTestBase::checkContentsRefRef(C&& c, Values const& v)
 {
     using Cont = std::remove_reference_t<C>;
     using size_type = typename Cont::size_type;
@@ -690,7 +690,7 @@ aged_associative_container_test_base::checkContentsRefRef(C&& c, Values const& v
 
 template <class Cont, class Values>
 void
-aged_associative_container_test_base::checkContents(Cont& c, Values const& v)
+AgedAssociativeContainerTestBase::checkContents(Cont& c, Values const& v)
 {
     checkContentsRefRef(c, v);
     checkContentsRefRef(const_cast<Cont const&>(c), v);
@@ -699,7 +699,7 @@ aged_associative_container_test_base::checkContents(Cont& c, Values const& v)
 
 template <class Cont>
 void
-aged_associative_container_test_base::checkContents(Cont& c)
+AgedAssociativeContainerTestBase::checkContents(Cont& c)
 {
     using Traits =
         TestTraits<Cont::is_unordered::value, Cont::is_multi::value, Cont::is_map::value>;
@@ -716,7 +716,7 @@ aged_associative_container_test_base::checkContents(Cont& c)
 // ordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testConstructEmpty()
+AgedAssociativeContainerTestBase::testConstructEmpty()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     using Comp = typename Traits::Comp;
@@ -752,7 +752,7 @@ aged_associative_container_test_base::testConstructEmpty()
 // unordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<IsUnordered>
-aged_associative_container_test_base::testConstructEmpty()
+AgedAssociativeContainerTestBase::testConstructEmpty()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     using Hash = typename Traits::Hash;
@@ -810,7 +810,7 @@ aged_associative_container_test_base::testConstructEmpty()
 // ordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testConstructRange()
+AgedAssociativeContainerTestBase::testConstructRange()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     using Comp = typename Traits::Comp;
@@ -857,7 +857,7 @@ aged_associative_container_test_base::testConstructRange()
 // unordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<IsUnordered>
-aged_associative_container_test_base::testConstructRange()
+AgedAssociativeContainerTestBase::testConstructRange()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     using Hash = typename Traits::Hash;
@@ -923,7 +923,7 @@ aged_associative_container_test_base::testConstructRange()
 // ordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testConstructInitList()
+AgedAssociativeContainerTestBase::testConstructInitList()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock const clock;
@@ -939,7 +939,7 @@ aged_associative_container_test_base::testConstructInitList()
 // unordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<IsUnordered>
-aged_associative_container_test_base::testConstructInitList()
+AgedAssociativeContainerTestBase::testConstructInitList()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock const clock;
@@ -959,7 +959,7 @@ aged_associative_container_test_base::testConstructInitList()
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testCopyMove()
+AgedAssociativeContainerTestBase::testCopyMove()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     using Alloc = typename Traits::Alloc;
@@ -1029,7 +1029,7 @@ aged_associative_container_test_base::testCopyMove()
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testIterator()
+AgedAssociativeContainerTestBase::testIterator()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1044,33 +1044,33 @@ aged_associative_container_test_base::testIterator()
     using const_iterator = decltype(c.cbegin());
 
     // Should be able to construct or assign an iterator from an iterator.
-    iterator const nnIt_0{c.begin()};
-    iterator const nnIt_1{nnIt_0};
-    BEAST_EXPECT(nnIt_0 == nnIt_1);
-    iterator nnIt_2;
-    nnIt_2 = nnIt_1;
-    BEAST_EXPECT(nnIt_1 == nnIt_2);
+    iterator const nnIt0{c.begin()};
+    iterator const nnIt1{nnIt0};
+    BEAST_EXPECT(nnIt0 == nnIt1);
+    iterator nnIt2;
+    nnIt2 = nnIt1;
+    BEAST_EXPECT(nnIt1 == nnIt2);
 
     // Should be able to construct or assign a const_iterator from a
     // const_iterator.
-    const_iterator const ccIt_0{c.cbegin()};
-    const_iterator const ccIt_1{ccIt_0};
-    BEAST_EXPECT(ccIt_0 == ccIt_1);
-    const_iterator ccIt_2;
-    ccIt_2 = ccIt_1;
-    BEAST_EXPECT(ccIt_1 == ccIt_2);
+    const_iterator const ccIt0{c.cbegin()};
+    const_iterator const ccIt1{ccIt0};
+    BEAST_EXPECT(ccIt0 == ccIt1);
+    const_iterator ccIt2;
+    ccIt2 = ccIt1;
+    BEAST_EXPECT(ccIt1 == ccIt2);
 
     // Comparison between iterator and const_iterator is okay
-    BEAST_EXPECT(nnIt_0 == ccIt_0);
-    BEAST_EXPECT(ccIt_1 == nnIt_1);
+    BEAST_EXPECT(nnIt0 == ccIt0);
+    BEAST_EXPECT(ccIt1 == nnIt1);
 
     // Should be able to construct a const_iterator from an iterator.
-    const_iterator const ncIt_3{c.begin()};
-    const_iterator const ncIt_4{nnIt_0};
-    BEAST_EXPECT(ncIt_3 == ncIt_4);
-    const_iterator ncIt_5;
-    ncIt_5 = nnIt_2;
-    BEAST_EXPECT(ncIt_5 == ncIt_4);
+    const_iterator const ncIt3{c.begin()};
+    const_iterator const ncIt4{nnIt0};
+    BEAST_EXPECT(ncIt3 == ncIt4);
+    const_iterator ncIt5;
+    ncIt5 = nnIt2;
+    BEAST_EXPECT(ncIt5 == ncIt4);
 
     // None of these should compile because they construct or assign to a
     // non-const iterator with a const_iterator.
@@ -1085,7 +1085,7 @@ aged_associative_container_test_base::testIterator()
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testReverseIterator()
+AgedAssociativeContainerTestBase::testReverseIterator()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1109,33 +1109,33 @@ aged_associative_container_test_base::testReverseIterator()
 
     // Should be able to construct or assign a reverse_iterator from a
     // reverse_iterator.
-    reverse_iterator const rNrNit_0{c.rbegin()};
-    reverse_iterator const rNrNit_1{rNrNit_0};
-    BEAST_EXPECT(rNrNit_0 == rNrNit_1);
-    reverse_iterator xXrNit_2;
-    xXrNit_2 = rNrNit_1;
-    BEAST_EXPECT(rNrNit_1 == xXrNit_2);
+    reverse_iterator const rNrNit0{c.rbegin()};
+    reverse_iterator const rNrNit1{rNrNit0};
+    BEAST_EXPECT(rNrNit0 == rNrNit1);
+    reverse_iterator xXrNit2;
+    xXrNit2 = rNrNit1;
+    BEAST_EXPECT(rNrNit1 == xXrNit2);
 
     // Should be able to construct or assign a const_reverse_iterator from a
     // const_reverse_iterator
-    const_reverse_iterator const rCrCit_0{c.crbegin()};
-    const_reverse_iterator const rCrCit_1{rCrCit_0};
-    BEAST_EXPECT(rCrCit_0 == rCrCit_1);
-    const_reverse_iterator xXrCit_2;
-    xXrCit_2 = rCrCit_1;
-    BEAST_EXPECT(rCrCit_1 == xXrCit_2);
+    const_reverse_iterator const rCrCit0{c.crbegin()};
+    const_reverse_iterator const rCrCit1{rCrCit0};
+    BEAST_EXPECT(rCrCit0 == rCrCit1);
+    const_reverse_iterator xXrCit2;
+    xXrCit2 = rCrCit1;
+    BEAST_EXPECT(rCrCit1 == xXrCit2);
 
     // Comparison between reverse_iterator and const_reverse_iterator is okay
-    BEAST_EXPECT(rNrNit_0 == rCrCit_0);
-    BEAST_EXPECT(rCrCit_1 == rNrNit_1);
+    BEAST_EXPECT(rNrNit0 == rCrCit0);
+    BEAST_EXPECT(rCrCit1 == rNrNit1);
 
     // Should be able to construct or assign a const_reverse_iterator from a
     // reverse_iterator
-    const_reverse_iterator const rNrCit_0{c.rbegin()};
-    const_reverse_iterator const rNrCit_1{rNrNit_0};
-    BEAST_EXPECT(rNrCit_0 == rNrCit_1);
-    xXrCit_2 = rNrNit_1;
-    BEAST_EXPECT(rNrCit_1 == xXrCit_2);
+    const_reverse_iterator const rNrCit0{c.rbegin()};
+    const_reverse_iterator const rNrCit1{rNrNit0};
+    BEAST_EXPECT(rNrCit0 == rNrCit1);
+    xXrCit2 = rNrNit1;
+    BEAST_EXPECT(rNrCit1 == xXrCit2);
 
     // The standard allows these conversions:
     //  o reverse_iterator is explicitly constructible from iterator.
@@ -1143,11 +1143,11 @@ aged_associative_container_test_base::testReverseIterator()
     //  const_iterator.
     // Should be able to construct or assign reverse_iterators from
     // non-reverse iterators.
-    reverse_iterator const fNrNit_0{c.begin()};
-    const_reverse_iterator const fNrCit_0{c.begin()};
-    BEAST_EXPECT(fNrNit_0 == fNrCit_0);
-    const_reverse_iterator const fCrCit_0{c.cbegin()};
-    BEAST_EXPECT(fNrCit_0 == fCrCit_0);
+    reverse_iterator const fNrNit0{c.begin()};
+    const_reverse_iterator const fNrCit0{c.begin()};
+    BEAST_EXPECT(fNrNit0 == fNrCit0);
+    const_reverse_iterator const fCrCit0{c.cbegin()};
+    BEAST_EXPECT(fNrCit0 == fCrCit0);
 
     // None of these should compile because they construct a non-reverse
     // iterator from a reverse_iterator.
@@ -1157,7 +1157,7 @@ aged_associative_container_test_base::testReverseIterator()
 
     // You should not be able to assign an iterator to a reverse_iterator or
     // vise-versa.  So the following lines should not compile.
-    iterator const xXfNit_0;
+    iterator const xXfNit0;
     //  xXfNit_0 = xXrNit_2;
     //  xXrNit_2 = xXfNit_0;
 }
@@ -1170,7 +1170,7 @@ aged_associative_container_test_base::testReverseIterator()
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkInsertCopy(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkInsertCopy(Container& c, Values const& v)
 {
     for (auto const& e : v)
         c.insert(e);
@@ -1179,7 +1179,7 @@ aged_associative_container_test_base::checkInsertCopy(Container& c, Values const
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkInsertMove(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkInsertMove(Container& c, Values const& v)
 {
     Values v2(v);
     for (auto& e : v2)
@@ -1189,7 +1189,7 @@ aged_associative_container_test_base::checkInsertMove(Container& c, Values const
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkInsertHintCopy(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkInsertHintCopy(Container& c, Values const& v)
 {
     for (auto const& e : v)
         c.insert(c.cend(), e);
@@ -1198,7 +1198,7 @@ aged_associative_container_test_base::checkInsertHintCopy(Container& c, Values c
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkInsertHintMove(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkInsertHintMove(Container& c, Values const& v)
 {
     Values v2(v);
     for (auto& e : v2)
@@ -1208,7 +1208,7 @@ aged_associative_container_test_base::checkInsertHintMove(Container& c, Values c
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkEmplace(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkEmplace(Container& c, Values const& v)
 {
     for (auto const& e : v)
         c.emplace(e);
@@ -1217,7 +1217,7 @@ aged_associative_container_test_base::checkEmplace(Container& c, Values const& v
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::checkEmplaceHint(Container& c, Values const& v)
+AgedAssociativeContainerTestBase::checkEmplaceHint(Container& c, Values const& v)
 {
     for (auto const& e : v)
         c.emplace_hint(c.cend(), e);
@@ -1226,12 +1226,12 @@ aged_associative_container_test_base::checkEmplaceHint(Container& c, Values cons
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testModifiers()
+AgedAssociativeContainerTestBase::testModifiers()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
     auto const v(Traits::values());
-    auto const l(make_list(v));
+    auto const l(makeList(v));
 
     // testcase (Traits::name() + " modify");
     testcase("modify");
@@ -1285,7 +1285,7 @@ aged_associative_container_test_base::testModifiers()
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testChronological()
+AgedAssociativeContainerTestBase::testChronological()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1302,7 +1302,7 @@ aged_associative_container_test_base::testChronological()
             c.chronological.cend(),
             v.begin(),
             v.end(),
-            equal_value<Traits>()));
+            EqualValue<Traits>()));
 
     // Test touch() with a non-const iterator.
     for (auto iter(v.crbegin()); iter != v.crend(); ++iter)
@@ -1322,7 +1322,7 @@ aged_associative_container_test_base::testChronological()
             c.chronological.cend(),
             v.crbegin(),
             v.crend(),
-            equal_value<Traits>()));
+            EqualValue<Traits>()));
 
     // Test touch() with a const_iterator
     for (auto iter(v.cbegin()); iter != v.cend(); ++iter)
@@ -1342,7 +1342,7 @@ aged_associative_container_test_base::testChronological()
             c.chronological.cend(),
             v.cbegin(),
             v.cend(),
-            equal_value<Traits>()));
+            EqualValue<Traits>()));
 
     {
         // Because touch (reverse_iterator pos) is not allowed, the following
@@ -1361,7 +1361,7 @@ aged_associative_container_test_base::testChronological()
 // map, unordered_map
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<IsMap && !IsMulti>
-aged_associative_container_test_base::testArrayCreate()
+AgedAssociativeContainerTestBase::testArrayCreate()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1395,12 +1395,12 @@ aged_associative_container_test_base::testArrayCreate()
 
 template <class Container, class Values>
 void
-aged_associative_container_test_base::reverseFillAgedContainer(Container& c, Values const& values)
+AgedAssociativeContainerTestBase::reverseFillAgedContainer(Container& c, Values const& values)
 {
     // Just in case the passed in container was not empty.
     c.clear();
 
-    // c.clock() returns an abstract_clock, so dynamic_cast to manual_clock.
+    // c.clock() returns an abstract_clock, so dynamic_cast to ManualClock.
     // VFALCO NOTE This is sketchy
     using ManualClock = TestTraitsBase::ManualClock;
     ManualClock& clk(dynamic_cast<ManualClock&>(c.clock()));
@@ -1421,7 +1421,7 @@ aged_associative_container_test_base::reverseFillAgedContainer(Container& c, Val
 // cannot use operator-- with unordered container iterators.
 template <class Iter>
 Iter
-aged_associative_container_test_base::nextToEndIter(Iter beginIter, Iter const endIter)
+AgedAssociativeContainerTestBase::nextToEndIter(Iter beginIter, Iter const endIter)
 {
     if (beginIter == endIter)
     {
@@ -1453,7 +1453,7 @@ aged_associative_container_test_base::nextToEndIter(Iter beginIter, Iter const e
 // the whole test.
 template <class Container, class Iter>
 bool
-aged_associative_container_test_base::doElementErase(
+AgedAssociativeContainerTestBase::doElementErase(
     Container& c,
     Iter const beginItr,
     Iter const endItr)
@@ -1499,7 +1499,7 @@ aged_associative_container_test_base::doElementErase(
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testElementErase()
+AgedAssociativeContainerTestBase::testElementErase()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
 
@@ -1584,7 +1584,7 @@ aged_associative_container_test_base::testElementErase()
 //
 template <class Container, class BeginEndSrc>
 void
-aged_associative_container_test_base::doRangeErase(Container& c, BeginEndSrc const& beginEndSrc)
+AgedAssociativeContainerTestBase::doRangeErase(Container& c, BeginEndSrc const& beginEndSrc)
 {
     BEAST_EXPECT(c.size() > 2);
     auto itBeginPlusOne(beginEndSrc.begin());
@@ -1612,7 +1612,7 @@ aged_associative_container_test_base::doRangeErase(Container& c, BeginEndSrc con
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testRangeErase()
+AgedAssociativeContainerTestBase::testRangeErase()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
 
@@ -1644,7 +1644,7 @@ aged_associative_container_test_base::testRangeErase()
 // ordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testCompare()
+AgedAssociativeContainerTestBase::testCompare()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1675,7 +1675,7 @@ aged_associative_container_test_base::testCompare()
 // ordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<!IsUnordered>
-aged_associative_container_test_base::testObservers()
+AgedAssociativeContainerTestBase::testObservers()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1684,8 +1684,8 @@ aged_associative_container_test_base::testObservers()
     testcase("observers");
 
     typename Traits::template Cont<> const c(clock);
-    c.key_comp();
-    c.value_comp();
+    c.keyComp();
+    c.valueComp();
 
     pass();
 }
@@ -1693,7 +1693,7 @@ aged_associative_container_test_base::testObservers()
 // unordered
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 std::enable_if_t<IsUnordered>
-aged_associative_container_test_base::testObservers()
+AgedAssociativeContainerTestBase::testObservers()
 {
     using Traits = TestTraits<IsUnordered, IsMulti, IsMap>;
     typename Traits::ManualClock clock;
@@ -1702,8 +1702,8 @@ aged_associative_container_test_base::testObservers()
     testcase("observers");
 
     typename Traits::template Cont<> const c(clock);
-    c.hash_function();
-    c.key_eq();
+    c.hashFunction();
+    c.keyEq();
 
     pass();
 }
@@ -1716,7 +1716,7 @@ aged_associative_container_test_base::testObservers()
 
 template <bool IsUnordered, bool IsMulti, bool IsMap>
 void
-aged_associative_container_test_base::testMaybeUnorderedMultiMap()
+AgedAssociativeContainerTestBase::testMaybeUnorderedMultiMap()
 {
     testConstructEmpty<IsUnordered, IsMulti, IsMap>();
     testConstructRange<IsUnordered, IsMulti, IsMap>();
@@ -1735,7 +1735,7 @@ aged_associative_container_test_base::testMaybeUnorderedMultiMap()
 
 //------------------------------------------------------------------------------
 
-class aged_set_test : public aged_associative_container_test_base
+class aged_set_test : public AgedAssociativeContainerTestBase
 {
 public:
     // Compile time checks
@@ -1744,43 +1744,43 @@ public:
     using T = int;
 
     static_assert(
-        std::is_same_v<aged_set<Key>, detail::aged_ordered_container<false, false, Key, void>>,
+        std::is_same_v<aged_set<Key>, detail::AgedOrderedContainer<false, false, Key, void>>,
         "bad alias: aged_set");
 
     static_assert(
-        std::is_same_v<aged_multiset<Key>, detail::aged_ordered_container<true, false, Key, void>>,
+        std::is_same_v<aged_multiset<Key>, detail::AgedOrderedContainer<true, false, Key, void>>,
         "bad alias: aged_multiset");
 
     static_assert(
-        std::is_same_v<aged_map<Key, T>, detail::aged_ordered_container<false, true, Key, T>>,
+        std::is_same_v<aged_map<Key, T>, detail::AgedOrderedContainer<false, true, Key, T>>,
         "bad alias: aged_map");
 
     static_assert(
-        std::is_same_v<aged_multimap<Key, T>, detail::aged_ordered_container<true, true, Key, T>>,
+        std::is_same_v<aged_multimap<Key, T>, detail::AgedOrderedContainer<true, true, Key, T>>,
         "bad alias: aged_multimap");
 
     static_assert(
         std::is_same_v<
             aged_unordered_set<Key>,
-            detail::aged_unordered_container<false, false, Key, void>>,
+            detail::AgedUnorderedContainer<false, false, Key, void>>,
         "bad alias: aged_unordered_set");
 
     static_assert(
         std::is_same_v<
             aged_unordered_multiset<Key>,
-            detail::aged_unordered_container<true, false, Key, void>>,
+            detail::AgedUnorderedContainer<true, false, Key, void>>,
         "bad alias: aged_unordered_multiset");
 
     static_assert(
         std::is_same_v<
             aged_unordered_map<Key, T>,
-            detail::aged_unordered_container<false, true, Key, T>>,
+            detail::AgedUnorderedContainer<false, true, Key, T>>,
         "bad alias: aged_unordered_map");
 
     static_assert(
         std::is_same_v<
             aged_unordered_multimap<Key, T>,
-            detail::aged_unordered_container<true, true, Key, T>>,
+            detail::AgedUnorderedContainer<true, true, Key, T>>,
         "bad alias: aged_unordered_multimap");
 
     void
@@ -1790,7 +1790,7 @@ public:
     }
 };
 
-class aged_map_test : public aged_associative_container_test_base
+class aged_map_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1800,7 +1800,7 @@ public:
     }
 };
 
-class aged_multiset_test : public aged_associative_container_test_base
+class aged_multiset_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1810,7 +1810,7 @@ public:
     }
 };
 
-class aged_multimap_test : public aged_associative_container_test_base
+class aged_multimap_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1820,7 +1820,7 @@ public:
     }
 };
 
-class aged_unordered_set_test : public aged_associative_container_test_base
+class aged_unordered_set_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1830,7 +1830,7 @@ public:
     }
 };
 
-class aged_unordered_map_test : public aged_associative_container_test_base
+class aged_unordered_map_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1840,7 +1840,7 @@ public:
     }
 };
 
-class aged_unordered_multiset_test : public aged_associative_container_test_base
+class aged_unordered_multiset_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
@@ -1850,7 +1850,7 @@ public:
     }
 };
 
-class aged_unordered_multimap_test : public aged_associative_container_test_base
+class aged_unordered_multimap_test : public AgedAssociativeContainerTestBase
 {
 public:
     void
diff --git a/src/test/beast/beast_CurrentThreadName_test.cpp b/src/test/beast/beast_CurrentThreadName_test.cpp
index d3d3850d75..570dcae0ba 100644
--- a/src/test/beast/beast_CurrentThreadName_test.cpp
+++ b/src/test/beast/beast_CurrentThreadName_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl::test {
 
-class CurrentThreadName_test : public beast::unit_test::suite
+class CurrentThreadName_test : public beast::unit_test::Suite
 {
 private:
     static void
@@ -52,7 +52,7 @@ private:
             beast::setCurrentThreadName(nameToSet);
 
             // Initialize buffer to be safe.
-            char actualName[beast::maxThreadNameLength + 1] = {};
+            char actualName[beast::kMAX_THREAD_NAME_LENGTH + 1] = {};
             pthread_getname_np(pthread_self(), actualName, sizeof(actualName));
 
             BEAST_EXPECT(std::string(actualName) == expectedName);
diff --git a/src/test/beast/beast_Journal_test.cpp b/src/test/beast/beast_Journal_test.cpp
index f37a740e57..4b58ed29a8 100644
--- a/src/test/beast/beast_Journal_test.cpp
+++ b/src/test/beast/beast_Journal_test.cpp
@@ -5,42 +5,42 @@
 
 namespace beast {
 
-class Journal_test : public unit_test::suite
+class Journal_test : public unit_test::Suite
 {
 public:
     class TestSink : public Journal::Sink
     {
     private:
-        int m_count{0};
+        int count_{0};
 
     public:
-        TestSink() : Sink(severities::kWarning, false)
+        TestSink() : Sink(severities::KWarning, false)
         {
         }
 
         [[nodiscard]] int
         count() const
         {
-            return m_count;
+            return count_;
         }
 
         void
         reset()
         {
-            m_count = 0;
+            count_ = 0;
         }
 
         void
         write(severities::Severity level, std::string const&) override
         {
             if (level >= threshold())
-                ++m_count;
+                ++count_;
         }
 
         void
         writeAlways(severities::Severity level, std::string const&) override
         {
-            ++m_count;
+            ++count_;
         }
     };
 
@@ -50,7 +50,7 @@ public:
         TestSink sink;
 
         using namespace beast::severities;
-        sink.threshold(kInfo);
+        sink.threshold(KInfo);
 
         Journal const j(sink);
 
@@ -69,7 +69,7 @@ public:
 
         sink.reset();
 
-        sink.threshold(kDebug);
+        sink.threshold(KDebug);
 
         j.trace() << " ";
         BEAST_EXPECT(sink.count() == 0);
diff --git a/src/test/beast/beast_PropertyStream_test.cpp b/src/test/beast/beast_PropertyStream_test.cpp
index 6709671a70..7885547f92 100644
--- a/src/test/beast/beast_PropertyStream_test.cpp
+++ b/src/test/beast/beast_PropertyStream_test.cpp
@@ -5,22 +5,19 @@
 
 namespace beast {
 
-class PropertyStream_test : public unit_test::suite
+class PropertyStream_test : public unit_test::Suite
 {
 public:
     using Source = PropertyStream::Source;
 
     void
-    test_peel_name(
-        std::string s,
-        std::string const& expected,
-        std::string const& expected_remainder)
+    testPeelName(std::string s, std::string const& expected, std::string const& expectedRemainder)
     {
         try
         {
-            std::string const peeled_name = Source::peel_name(&s);
-            BEAST_EXPECT(peeled_name == expected);
-            BEAST_EXPECT(s == expected_remainder);
+            std::string const peeledName = Source::peelName(&s);
+            BEAST_EXPECT(peeledName == expected);
+            BEAST_EXPECT(s == expectedRemainder);
         }
         catch (...)
         {
@@ -30,12 +27,12 @@ public:
     }
 
     void
-    test_peel_leading_slash(std::string s, std::string const& expected, bool should_be_found)
+    testPeelLeadingSlash(std::string s, std::string const& expected, bool shouldBeFound)
     {
         try
         {
-            bool const found(Source::peel_leading_slash(&s));
-            BEAST_EXPECT(found == should_be_found);
+            bool const found(Source::peelLeadingSlash(&s));
+            BEAST_EXPECT(found == shouldBeFound);
             BEAST_EXPECT(s == expected);
         }
         catch (...)
@@ -46,16 +43,16 @@ public:
     }
 
     void
-    test_peel_trailing_slashstar(
+    testPeelTrailingSlashstar(
         std::string s,
-        std::string const& expected_remainder,
-        bool should_be_found)
+        std::string const& expectedRemainder,
+        bool shouldBeFound)
     {
         try
         {
-            bool const found(Source::peel_trailing_slashstar(&s));
-            BEAST_EXPECT(found == should_be_found);
-            BEAST_EXPECT(s == expected_remainder);
+            bool const found(Source::peelTrailingSlashstar(&s));
+            BEAST_EXPECT(found == shouldBeFound);
+            BEAST_EXPECT(s == expectedRemainder);
         }
         catch (...)
         {
@@ -65,11 +62,11 @@ public:
     }
 
     void
-    test_find_one(Source& root, Source* expected, std::string const& name)
+    testFindOne(Source& root, Source* expected, std::string const& name)
     {
         try
         {
-            Source const* source(root.find_one(name));
+            Source const* source(root.findOne(name));
             BEAST_EXPECT(source == expected);
         }
         catch (...)
@@ -80,11 +77,11 @@ public:
     }
 
     void
-    test_find_path(Source& root, std::string const& path, Source* expected)
+    testFindPath(Source& root, std::string const& path, Source* expected)
     {
         try
         {
-            Source const* source(root.find_path(path));
+            Source const* source(root.findPath(path));
             BEAST_EXPECT(source == expected);
         }
         catch (...)
@@ -95,11 +92,11 @@ public:
     }
 
     void
-    test_find_one_deep(Source& root, std::string const& name, Source* expected)
+    testFindOneDeep(Source& root, std::string const& name, Source* expected)
     {
         try
         {
-            Source const* source(root.find_one_deep(name));
+            Source const* source(root.findOneDeep(name));
             BEAST_EXPECT(source == expected);
         }
         catch (...)
@@ -110,13 +107,13 @@ public:
     }
 
     void
-    test_find(Source& root, std::string path, Source* expected, bool expected_star)
+    testFind(Source& root, std::string path, Source* expected, bool expectedStar)
     {
         try
         {
             auto const result(root.find(path));
             BEAST_EXPECT(result.first == expected);
-            BEAST_EXPECT(result.second == expected_star);
+            BEAST_EXPECT(result.second == expectedStar);
         }
         catch (...)
         {
@@ -148,69 +145,69 @@ public:
         d.add(f);
 
         testcase("peel_name");
-        test_peel_name("a", "a", "");
-        test_peel_name("foo/bar", "foo", "bar");
-        test_peel_name("foo/goo/bar", "foo", "goo/bar");
-        test_peel_name("", "", "");
+        testPeelName("a", "a", "");
+        testPeelName("foo/bar", "foo", "bar");
+        testPeelName("foo/goo/bar", "foo", "goo/bar");
+        testPeelName("", "", "");
 
         testcase("peel_leading_slash");
-        test_peel_leading_slash("foo/", "foo/", false);
-        test_peel_leading_slash("foo", "foo", false);
-        test_peel_leading_slash("/foo/", "foo/", true);
-        test_peel_leading_slash("/foo", "foo", true);
+        testPeelLeadingSlash("foo/", "foo/", false);
+        testPeelLeadingSlash("foo", "foo", false);
+        testPeelLeadingSlash("/foo/", "foo/", true);
+        testPeelLeadingSlash("/foo", "foo", true);
 
         testcase("peel_trailing_slashstar");
-        test_peel_trailing_slashstar("/foo/goo/*", "/foo/goo", true);
-        test_peel_trailing_slashstar("foo/goo/*", "foo/goo", true);
-        test_peel_trailing_slashstar("/foo/goo/", "/foo/goo", false);
-        test_peel_trailing_slashstar("foo/goo", "foo/goo", false);
-        test_peel_trailing_slashstar("", "", false);
-        test_peel_trailing_slashstar("/", "", false);
-        test_peel_trailing_slashstar("/*", "", true);
-        test_peel_trailing_slashstar("//", "/", false);
-        test_peel_trailing_slashstar("**", "*", true);
-        test_peel_trailing_slashstar("*/", "*", false);
+        testPeelTrailingSlashstar("/foo/goo/*", "/foo/goo", true);
+        testPeelTrailingSlashstar("foo/goo/*", "foo/goo", true);
+        testPeelTrailingSlashstar("/foo/goo/", "/foo/goo", false);
+        testPeelTrailingSlashstar("foo/goo", "foo/goo", false);
+        testPeelTrailingSlashstar("", "", false);
+        testPeelTrailingSlashstar("/", "", false);
+        testPeelTrailingSlashstar("/*", "", true);
+        testPeelTrailingSlashstar("//", "/", false);
+        testPeelTrailingSlashstar("**", "*", true);
+        testPeelTrailingSlashstar("*/", "*", false);
 
         testcase("find_one");
-        test_find_one(a, &b, "b");
-        test_find_one(a, nullptr, "d");
-        test_find_one(b, &e, "e");
-        test_find_one(d, &f, "f");
+        testFindOne(a, &b, "b");
+        testFindOne(a, nullptr, "d");
+        testFindOne(b, &e, "e");
+        testFindOne(d, &f, "f");
 
         testcase("find_path");
-        test_find_path(a, "a", nullptr);
-        test_find_path(a, "e", nullptr);
-        test_find_path(a, "a/b", nullptr);
-        test_find_path(a, "a/b/e", nullptr);
-        test_find_path(a, "b/e/g", nullptr);
-        test_find_path(a, "b/e/f", nullptr);
-        test_find_path(a, "b", &b);
-        test_find_path(a, "b/e", &e);
-        test_find_path(a, "b/d/f", &f);
+        testFindPath(a, "a", nullptr);
+        testFindPath(a, "e", nullptr);
+        testFindPath(a, "a/b", nullptr);
+        testFindPath(a, "a/b/e", nullptr);
+        testFindPath(a, "b/e/g", nullptr);
+        testFindPath(a, "b/e/f", nullptr);
+        testFindPath(a, "b", &b);
+        testFindPath(a, "b/e", &e);
+        testFindPath(a, "b/d/f", &f);
 
         testcase("find_one_deep");
-        test_find_one_deep(a, "z", nullptr);
-        test_find_one_deep(a, "g", &g);
-        test_find_one_deep(a, "b", &b);
-        test_find_one_deep(a, "d", &d);
-        test_find_one_deep(a, "f", &f);
+        testFindOneDeep(a, "z", nullptr);
+        testFindOneDeep(a, "g", &g);
+        testFindOneDeep(a, "b", &b);
+        testFindOneDeep(a, "d", &d);
+        testFindOneDeep(a, "f", &f);
 
         testcase("find");
-        test_find(a, "", &a, false);
-        test_find(a, "*", &a, true);
-        test_find(a, "/b", &b, false);
-        test_find(a, "b", &b, false);
-        test_find(a, "d", &d, false);
-        test_find(a, "/b*", &b, true);
-        test_find(a, "b*", &b, true);
-        test_find(a, "d*", &d, true);
-        test_find(a, "/b/*", &b, true);
-        test_find(a, "b/*", &b, true);
-        test_find(a, "d/*", &d, true);
-        test_find(a, "a", nullptr, false);
-        test_find(a, "/d", nullptr, false);
-        test_find(a, "/d*", nullptr, true);
-        test_find(a, "/d/*", nullptr, true);
+        testFind(a, "", &a, false);
+        testFind(a, "*", &a, true);
+        testFind(a, "/b", &b, false);
+        testFind(a, "b", &b, false);
+        testFind(a, "d", &d, false);
+        testFind(a, "/b*", &b, true);
+        testFind(a, "b*", &b, true);
+        testFind(a, "d*", &d, true);
+        testFind(a, "/b/*", &b, true);
+        testFind(a, "b/*", &b, true);
+        testFind(a, "d/*", &d, true);
+        testFind(a, "a", nullptr, false);
+        testFind(a, "/d", nullptr, false);
+        testFind(a, "/d*", nullptr, true);
+        testFind(a, "/d/*", nullptr, true);
     }
 };
 
diff --git a/src/test/beast/beast_Zero_test.cpp b/src/test/beast/beast_Zero_test.cpp
index 657bea7022..ca5f45ce6b 100644
--- a/src/test/beast/beast_Zero_test.cpp
+++ b/src/test/beast/beast_Zero_test.cpp
@@ -3,31 +3,31 @@
 
 namespace beast {
 
-struct adl_tester
+struct AdlTester
 {
 };
 
 int
-signum(adl_tester)
+signum(AdlTester)
 {
     return 0;
 }
 
 namespace inner_adl_test {
 
-struct adl_tester2
+struct AdlTester2
 {
 };
 
 int
-signum(adl_tester2)
+signum(AdlTester2)
 {
     return 0;
 }
 
 }  // namespace inner_adl_test
 
-class Zero_test : public beast::unit_test::suite
+class Zero_test : public beast::unit_test::Suite
 {
 private:
     struct IntegerWrapper
@@ -47,66 +47,66 @@ private:
 
 public:
     void
-    expect_same(bool result, bool correct, char const* message)
+    expectSame(bool result, bool correct, char const* message)
     {
         expect(result == correct, message);
     }
 
     void
-    test_lhs_zero(IntegerWrapper x)
+    testLhsZero(IntegerWrapper x)
     {
-        expect_same(x >= zero, x.signum() >= 0, "lhs greater-than-or-equal-to");
-        expect_same(x > zero, x.signum() > 0, "lhs greater than");
-        expect_same(x == zero, x.signum() == 0, "lhs equal to");
-        expect_same(x != zero, x.signum() != 0, "lhs not equal to");
-        expect_same(x < zero, x.signum() < 0, "lhs less than");
-        expect_same(x <= zero, 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
-    test_lhs_zero()
+    testLhsZero()
     {
         testcase("lhs zero");
 
-        test_lhs_zero(-7);
-        test_lhs_zero(0);
-        test_lhs_zero(32);
+        testLhsZero(-7);
+        testLhsZero(0);
+        testLhsZero(32);
     }
 
     void
-    test_rhs_zero(IntegerWrapper x)
+    testRhsZero(IntegerWrapper x)
     {
-        expect_same(zero >= x, 0 >= x.signum(), "rhs greater-than-or-equal-to");
-        expect_same(zero > x, 0 > x.signum(), "rhs greater than");
-        expect_same(zero == x, 0 == x.signum(), "rhs equal to");
-        expect_same(zero != x, 0 != x.signum(), "rhs not equal to");
-        expect_same(zero < x, 0 < x.signum(), "rhs less than");
-        expect_same(zero <= 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
-    test_rhs_zero()
+    testRhsZero()
     {
         testcase("rhs zero");
 
-        test_rhs_zero(-4);
-        test_rhs_zero(0);
-        test_rhs_zero(64);
+        testRhsZero(-4);
+        testRhsZero(0);
+        testRhsZero(64);
     }
 
     void
-    test_adl()
+    testAdl()
     {
-        expect(adl_tester{} == zero, "ADL failure!");
-        expect(inner_adl_test::adl_tester2{} == zero, "ADL failure!");
+        expect(AdlTester{} == kZERO, "ADL failure!");
+        expect(inner_adl_test::AdlTester2{} == kZERO, "ADL failure!");
     }
 
     void
     run() override
     {
-        test_lhs_zero();
-        test_rhs_zero();
-        test_adl();
+        testLhsZero();
+        testRhsZero();
+        testAdl();
     }
 };
 
diff --git a/src/test/beast/beast_abstract_clock_test.cpp b/src/test/beast/beast_abstract_clock_test.cpp
index c1a0c18839..5fb44ae637 100644
--- a/src/test/beast/beast_abstract_clock_test.cpp
+++ b/src/test/beast/beast_abstract_clock_test.cpp
@@ -11,12 +11,12 @@
 
 namespace beast {
 
-class abstract_clock_test : public unit_test::suite
+class abstract_clock_test : public unit_test::Suite
 {
 public:
     template <class Clock>
     void
-    test(std::string name, abstract_clock<Clock>& c)
+    test(std::string name, AbstractClock<Clock>& c)
     {
         testcase(name);
 
@@ -31,11 +31,11 @@ public:
     }
 
     void
-    test_manual()
+    testManual()
     {
         testcase("manual");
 
-        using clock_type = manual_clock<std::chrono::steady_clock>;
+        using clock_type = ManualClock<std::chrono::steady_clock>;
         clock_type c;
 
         auto c1 = c.now().time_since_epoch();
@@ -52,11 +52,11 @@ public:
     void
     run() override
     {
-        test("steady_clock", get_abstract_clock<std::chrono::steady_clock>());
-        test("system_clock", get_abstract_clock<std::chrono::system_clock>());
-        test("high_resolution_clock", get_abstract_clock<std::chrono::high_resolution_clock>());
+        test("steady_clock", getAbstractClock<std::chrono::steady_clock>());
+        test("system_clock", getAbstractClock<std::chrono::system_clock>());
+        test("high_resolution_clock", getAbstractClock<std::chrono::high_resolution_clock>());
 
-        test_manual();
+        testManual();
     }
 };
 
diff --git a/src/test/beast/beast_basic_seconds_clock_test.cpp b/src/test/beast/beast_basic_seconds_clock_test.cpp
index b0d8ab5e92..ed74270ae2 100644
--- a/src/test/beast/beast_basic_seconds_clock_test.cpp
+++ b/src/test/beast/beast_basic_seconds_clock_test.cpp
@@ -3,17 +3,17 @@
 
 namespace beast {
 
-class basic_seconds_clock_test : public unit_test::suite
+class BasicSecondsClock_test : public unit_test::Suite
 {
 public:
     void
     run() override
     {
-        basic_seconds_clock::now();
+        BasicSecondsClock::now();
         pass();
     }
 };
 
-BEAST_DEFINE_TESTSUITE(basic_seconds_clock, beast, beast);
+BEAST_DEFINE_TESTSUITE(BasicSecondsClock, beast, beast);
 
 }  // namespace beast
diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp
index 206fdfc8b1..a884256986 100644
--- a/src/test/beast/beast_io_latency_probe_test.cpp
+++ b/src/test/beast/beast_io_latency_probe_test.cpp
@@ -21,7 +21,7 @@
 
 using namespace std::chrono_literals;
 
-class io_latency_probe_test : public beast::unit_test::suite, public beast::test::enable_yield_to
+class io_latency_probe_test : public beast::unit_test::Suite, public beast::test::EnableYieldTo
 {
     using MyTimer = boost::asio::basic_waitable_timer<std::chrono::steady_clock>;
 
@@ -34,14 +34,14 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
      *
      */
     template <class Clock, class MeasureClock = std::chrono::high_resolution_clock>
-    struct measure_asio_timers
+    struct MeasureAsioTimers
     {
         using duration = typename Clock::duration;
         using rep = typename MeasureClock::duration::rep;
 
-        std::vector<duration> elapsed_times_;
+        std::vector<duration> elapsedTimes;
 
-        measure_asio_timers(duration interval = 100ms, size_t num_samples = 50)
+        MeasureAsioTimers(duration interval = 100ms, size_t numSamples = 50)
         {
             using namespace std::chrono;
             boost::asio::io_context ios;
@@ -49,23 +49,23 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
                 work{boost::asio::make_work_guard(ios)};
             std::thread worker{[&] { ios.run(); }};
             boost::asio::basic_waitable_timer<Clock> timer{ios};
-            elapsed_times_.reserve(num_samples);
+            elapsedTimes.reserve(numSamples);
             std::mutex mtx;
             std::unique_lock<std::mutex> mainlock{mtx};
             std::condition_variable cv;
             bool done = false;
-            boost::system::error_code wait_err;
+            boost::system::error_code waitErr;
 
-            while (--num_samples > 0u)
+            while (--numSamples > 0u)
             {
                 auto const start{MeasureClock::now()};
                 done = false;
                 timer.expires_after(interval);
                 timer.async_wait([&](boost::system::error_code const& ec) {
                     if (ec)
-                        wait_err = ec;
+                        waitErr = ec;
                     auto const end{MeasureClock::now()};
-                    elapsed_times_.emplace_back(end - start);
+                    elapsedTimes.emplace_back(end - start);
                     std::scoped_lock const lk{mtx};
                     done = true;
                     cv.notify_one();
@@ -74,8 +74,8 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
             }
             work.reset();
             worker.join();
-            if (wait_err)
-                boost::asio::detail::throw_error(wait_err, "wait");
+            if (waitErr)
+                boost::asio::detail::throw_error(waitErr, "wait");
         }
 
         template <class D>
@@ -83,11 +83,11 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
         getMean()
         {
             double sum = {0};
-            for (auto const& v : elapsed_times_)
+            for (auto const& v : elapsedTimes)
             {
                 sum += static_cast<double>(std::chrono::duration_cast<D>(v).count());
             }
-            return sum / elapsed_times_.size();
+            return sum / elapsedTimes.size();
         }
 
         template <class D>
@@ -95,7 +95,7 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
         getMax()
         {
             return std::chrono::duration_cast<D>(
-                       *std::max_element(elapsed_times_.begin(), elapsed_times_.end()))
+                       *std::max_element(elapsedTimes.begin(), elapsedTimes.end()))
                 .count();
         }
 
@@ -104,38 +104,38 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
         getMin()
         {
             return std::chrono::duration_cast<D>(
-                       *std::min_element(elapsed_times_.begin(), elapsed_times_.end()))
+                       *std::min_element(elapsedTimes.begin(), elapsedTimes.end()))
                 .count();
         }
     };
 #endif
 
-    struct test_sampler
+    struct TestSampler
     {
-        beast::io_latency_probe<std::chrono::steady_clock> probe_;
-        std::vector<std::chrono::steady_clock::duration> durations_;
+        beast::IoLatencyProbe<std::chrono::steady_clock> probe;
+        std::vector<std::chrono::steady_clock::duration> durations;
 
-        test_sampler(std::chrono::milliseconds interval, boost::asio::io_context& ios)
-            : probe_(interval, ios)
+        TestSampler(std::chrono::milliseconds interval, boost::asio::io_context& ios)
+            : probe(interval, ios)
         {
         }
 
         void
         start()
         {
-            probe_.sample(std::ref(*this));
+            probe.sample(std::ref(*this));
         }
 
         void
-        start_one()
+        startOne()
         {
-            probe_.sample_one(std::ref(*this));
+            probe.sampleOne(std::ref(*this));
         }
 
         void
         operator()(std::chrono::steady_clock::duration const& elapsed)
         {
-            durations_.push_back(elapsed);
+            durations.push_back(elapsed);
         }
     };
 
@@ -144,14 +144,14 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
     {
         testcase << "sample one";
         boost::system::error_code ec;
-        test_sampler io_probe{100ms, get_io_context()};
-        io_probe.start_one();
-        MyTimer timer{get_io_context(), 1s};
+        TestSampler ioProbe{100ms, getIoContext()};
+        ioProbe.startOne();
+        MyTimer timer{getIoContext(), 1s};
         timer.async_wait(yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
-        BEAST_EXPECT(io_probe.durations_.size() == 1);
-        io_probe.probe_.cancel_async();
+        BEAST_EXPECT(ioProbe.durations.size() == 1);
+        ioProbe.probe.cancelAsync();
     }
 
     void
@@ -161,33 +161,32 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
         boost::system::error_code ec;
         using namespace std::chrono;
         auto interval = 99ms;
-        auto probe_duration = 1s;
+        auto probeDuration = 1s;
 
-        size_t const expected_probe_count_max = (probe_duration / interval);
+        size_t const expectedProbeCountMax = (probeDuration / interval);
         // NOLINTNEXTLINE(misc-const-correctness)
-        size_t expected_probe_count_min = expected_probe_count_max;
+        size_t expectedProbeCountMin = expectedProbeCountMax;
 #ifdef XRPL_RUNNING_IN_CI
         // adjust min expected based on measurements
         // if running in CI/VM environment
-        measure_asio_timers<steady_clock> tt{interval};
+        MeasureAsioTimers<steady_clock> tt{interval};
         log << "measured mean for timers: " << tt.getMean<milliseconds>() << "ms\n";
         log << "measured max for timers: " << tt.getMax<milliseconds>() << "ms\n";
-        expected_probe_count_min =
-            static_cast<size_t>(duration_cast<milliseconds>(probe_duration).count()) /
+        expectedProbeCountMin =
+            static_cast<size_t>(duration_cast<milliseconds>(probeDuration).count()) /
             static_cast<size_t>(tt.getMean<milliseconds>());
 #endif
-        test_sampler io_probe{interval, get_io_context()};
-        io_probe.start();
-        MyTimer timer{get_io_context(), probe_duration};
+        TestSampler ioProbe{interval, getIoContext()};
+        ioProbe.start();
+        MyTimer timer{getIoContext(), probeDuration};
         timer.async_wait(yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
-        auto probes_seen = io_probe.durations_.size();
+        auto probesSeen = ioProbe.durations.size();
         BEAST_EXPECTS(
-            probes_seen >= (expected_probe_count_min - 1) &&
-                probes_seen <= (expected_probe_count_max + 1),
-            std::string("probe count is ") + std::to_string(probes_seen));
-        io_probe.probe_.cancel_async();
+            probesSeen >= (expectedProbeCountMin - 1) && probesSeen <= (expectedProbeCountMax + 1),
+            std::string("probe count is ") + std::to_string(probesSeen));
+        ioProbe.probe.cancelAsync();
         // wait again in order to flush the remaining
         // probes from the work queue
         timer.expires_after(1s);
@@ -198,17 +197,17 @@ class io_latency_probe_test : public beast::unit_test::suite, public beast::test
     testCanceled(boost::asio::yield_context& yield)
     {
         testcase << "canceled";
-        test_sampler io_probe{100ms, get_io_context()};
-        io_probe.probe_.cancel_async();
-        except<std::logic_error>([&io_probe]() { io_probe.start_one(); });
-        except<std::logic_error>([&io_probe]() { io_probe.start(); });
+        TestSampler ioProbe{100ms, getIoContext()};
+        ioProbe.probe.cancelAsync();
+        except<std::logic_error>([&ioProbe]() { ioProbe.startOne(); });
+        except<std::logic_error>([&ioProbe]() { ioProbe.start(); });
     }
 
 public:
     void
     run() override
     {
-        yield_to([&](boost::asio::yield_context& yield) {
+        yieldTo([&](boost::asio::yield_context& yield) {
             testSampleOne(yield);
             testSampleOngoing(yield);
             testCanceled(yield);
diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp
index e3da3e7fe1..569b06ca67 100644
--- a/src/test/beast/define_print.cpp
+++ b/src/test/beast/define_print.cpp
@@ -16,7 +16,7 @@
 namespace beast::unit_test {
 
 /** A suite that prints the list of globally defined suites. */
-class print_test : public suite
+class print_test : public Suite
 {
 public:
     void
@@ -25,18 +25,18 @@ public:
         std::size_t manual = 0;
         std::size_t total = 0;
 
-        auto prefix = [](suite_info const& s) { return s.manual() ? "|M| " : "    "; };
+        auto prefix = [](SuiteInfo const& s) { return s.manual() ? "|M| " : "    "; };
 
-        for (auto const& s : global_suites())
+        for (auto const& s : globalSuites())
         {
-            log << prefix(s) << s.full_name() << '\n';
+            log << prefix(s) << s.fullName() << '\n';
 
             if (s.manual())
                 ++manual;
             ++total;
         }
 
-        log << amount(total, "suite") << " total, " << amount(manual, "manual suite") << std::endl;
+        log << Amount(total, "suite") << " total, " << Amount(manual, "manual suite") << std::endl;
 
         pass();
     }
diff --git a/src/test/beast/xxhasher_test.cpp b/src/test/beast/xxhasher_test.cpp
index 385ed0558a..068617630b 100644
--- a/src/test/beast/xxhasher_test.cpp
+++ b/src/test/beast/xxhasher_test.cpp
@@ -5,7 +5,7 @@
 
 namespace beast {
 
-class XXHasher_test : public unit_test::suite
+class XXHasher_test : public unit_test::Suite
 {
 public:
     void
@@ -13,12 +13,12 @@ public:
     {
         testcase("Without seed");
 
-        xxhasher hasher{};
+        Xxhasher hasher{};
 
         std::string objectToHash{"Hello, xxHash!"};
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 16042857369214894119ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 16042857369214894119ULL);
     }
 
     void
@@ -26,31 +26,31 @@ public:
     {
         testcase("With seed");
 
-        xxhasher hasher{static_cast<std::uint32_t>(102)};
+        Xxhasher hasher{static_cast<std::uint32_t>(102)};
 
         std::string objectToHash{"Hello, xxHash!"};
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 14440132435660934800ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 14440132435660934800ULL);
     }
 
     void
     testWithTwoSeeds()
     {
         testcase("With two seeds");
-        xxhasher hasher{static_cast<std::uint32_t>(102), static_cast<std::uint32_t>(103)};
+        Xxhasher hasher{static_cast<std::uint32_t>(102), static_cast<std::uint32_t>(103)};
 
         std::string objectToHash{"Hello, xxHash!"};
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 14440132435660934800ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 14440132435660934800ULL);
     }
 
     void
     testBigObjectWithMultipleSmallUpdatesWithoutSeed()
     {
         testcase("Big object with multiple small updates without seed");
-        xxhasher hasher{};
+        Xxhasher hasher{};
 
         std::string objectToHash{"Hello, xxHash!"};
         for (int i = 0; i < 100; i++)
@@ -58,14 +58,14 @@ public:
             hasher(objectToHash.data(), objectToHash.size());
         }
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 15296278154063476002ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 15296278154063476002ULL);
     }
 
     void
     testBigObjectWithMultipleSmallUpdatesWithSeed()
     {
         testcase("Big object with multiple small updates with seed");
-        xxhasher hasher{static_cast<std::uint32_t>(103)};
+        Xxhasher hasher{static_cast<std::uint32_t>(103)};
 
         std::string objectToHash{"Hello, xxHash!"};
         for (int i = 0; i < 100; i++)
@@ -73,14 +73,14 @@ public:
             hasher(objectToHash.data(), objectToHash.size());
         }
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 17285302196561698791ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 17285302196561698791ULL);
     }
 
     void
     testBigObjectWithSmallAndBigUpdatesWithoutSeed()
     {
         testcase("Big object with small and big updates without seed");
-        xxhasher hasher{};
+        Xxhasher hasher{};
 
         std::string objectToHash{"Hello, xxHash!"};
         std::string bigObject;
@@ -92,14 +92,14 @@ public:
         hasher(bigObject.data(), bigObject.size());
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 1865045178324729219ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 1865045178324729219ULL);
     }
 
     void
     testBigObjectWithSmallAndBigUpdatesWithSeed()
     {
         testcase("Big object with small and big updates with seed");
-        xxhasher hasher{static_cast<std::uint32_t>(103)};
+        Xxhasher hasher{static_cast<std::uint32_t>(103)};
 
         std::string objectToHash{"Hello, xxHash!"};
         std::string bigObject;
@@ -111,14 +111,14 @@ public:
         hasher(bigObject.data(), bigObject.size());
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 16189862915636005281ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 16189862915636005281ULL);
     }
 
     void
     testBigObjectWithOneUpdateWithoutSeed()
     {
         testcase("Big object with one update without seed");
-        xxhasher hasher{};
+        Xxhasher hasher{};
 
         std::string objectToHash;
         for (int i = 0; i < 100; i++)
@@ -127,14 +127,14 @@ public:
         }
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 15296278154063476002ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 15296278154063476002ULL);
     }
 
     void
     testBigObjectWithOneUpdateWithSeed()
     {
         testcase("Big object with one update with seed");
-        xxhasher hasher{static_cast<std::uint32_t>(103)};
+        Xxhasher hasher{static_cast<std::uint32_t>(103)};
 
         std::string objectToHash;
         for (int i = 0; i < 100; i++)
@@ -143,7 +143,7 @@ public:
         }
         hasher(objectToHash.data(), objectToHash.size());
 
-        BEAST_EXPECT(static_cast<xxhasher::result_type>(hasher) == 17285302196561698791ULL);
+        BEAST_EXPECT(static_cast<Xxhasher::result_type>(hasher) == 17285302196561698791ULL);
     }
 
     void
@@ -151,17 +151,17 @@ public:
     {
         testcase("Operator result type doesn't change the internal state");
         {
-            xxhasher hasher;
+            Xxhasher hasher;
 
             std::string object{"Hello xxhash"};
             hasher(object.data(), object.size());
-            auto xxhashResult1 = static_cast<xxhasher::result_type>(hasher);
-            auto xxhashResult2 = static_cast<xxhasher::result_type>(hasher);
+            auto xxhashResult1 = static_cast<Xxhasher::result_type>(hasher);
+            auto xxhashResult2 = static_cast<Xxhasher::result_type>(hasher);
 
             BEAST_EXPECT(xxhashResult1 == xxhashResult2);
         }
         {
-            xxhasher hasher;
+            Xxhasher hasher;
 
             std::string object;
             for (int i = 0; i < 100; i++)
@@ -169,8 +169,8 @@ public:
                 object += "Hello, xxHash!";
             }
             hasher(object.data(), object.size());
-            auto xxhashResult1 = hasher.operator xxhasher::result_type();
-            auto xxhashResult2 = hasher.operator xxhasher::result_type();
+            auto xxhashResult1 = hasher.operator Xxhasher::result_type();
+            auto xxhashResult2 = hasher.operator Xxhasher::result_type();
 
             BEAST_EXPECT(xxhashResult1 == xxhashResult2);
         }
diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp
index 3e6ee24d57..055ba4b12e 100644
--- a/src/test/conditions/PreimageSha256_test.cpp
+++ b/src/test/conditions/PreimageSha256_test.cpp
@@ -12,7 +12,7 @@
 
 namespace xrpl::cryptoconditions {
 
-class PreimageSha256_test : public beast::unit_test::suite
+class PreimageSha256_test : public beast::unit_test::Suite
 {
     Buffer
     hexblob(std::string const& s)
@@ -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 fulfillment & 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/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp
index 19de5ac83c..ad75a78086 100644
--- a/src/test/consensus/ByzantineFailureSim_test.cpp
+++ b/src/test/consensus/ByzantineFailureSim_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl::test {
 
-class ByzantineFailureSim_test : public beast::unit_test::suite
+class ByzantineFailureSim_test : public beast::unit_test::Suite
 {
     void
     run() override
diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp
index c8be3f09f5..51d99367e7 100644
--- a/src/test/consensus/Consensus_test.cpp
+++ b/src/test/consensus/Consensus_test.cpp
@@ -31,7 +31,7 @@
 
 namespace xrpl::test {
 
-class Consensus_test : public beast::unit_test::suite
+class Consensus_test : public beast::unit_test::Suite
 {
     SuiteJournal journal_;
 
@@ -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(increaseLedgerTimeResolutionEvery - 2);
+        sim.run(kINCREASE_LEDGER_TIME_RESOLUTION_EVERY - 2);
 
         // In order to create the discrepancy, we want a case where if
         //   X = effCloseTime(closeTime, resolution, parentCloseTime)
@@ -664,7 +664,7 @@ public:
             when += 1s;
         // Advance the clock without consensus running (IS THIS WHAT
         // PREVENTS IT IN PRACTICE?)
-        sim.scheduler.step_for(NetClock::time_point{when} - network[0]->now());
+        sim.scheduler.stepFor(NetClock::time_point{when} - network[0]->now());
 
         // Run one more ledger with 30s resolution
         sim.run(1);
@@ -1086,7 +1086,7 @@ public:
         ConsensusParms const p;
         std::size_t peersUnchanged = 0;
 
-        auto logs = std::make_unique<Logs>(beast::severities::kError);
+        auto logs = std::make_unique<Logs>(beast::severities::KError);
         auto j = logs->journal("Test");
         auto clog = std::make_unique<std::stringstream>();
 
@@ -1100,10 +1100,10 @@ public:
             Dispute proposingFalse{txFalse.id(), false, numPeers, journal_};
             Dispute followingTrue{txFollowingTrue.id(), true, numPeers, journal_};
             Dispute followingFalse{txFollowingFalse.id(), false, numPeers, journal_};
-            BEAST_EXPECT(proposingTrue.ID() == 99);
-            BEAST_EXPECT(proposingFalse.ID() == 98);
-            BEAST_EXPECT(followingTrue.ID() == 97);
-            BEAST_EXPECT(followingFalse.ID() == 96);
+            BEAST_EXPECT(proposingTrue.id() == 99);
+            BEAST_EXPECT(proposingFalse.id() == 98);
+            BEAST_EXPECT(followingTrue.id() == 97);
+            BEAST_EXPECT(followingFalse.id() == 96);
 
             // Create an even split in the peer votes
             for (int i = 0; i < numPeers; ++i)
diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp
index 70a7e59988..6d9ac6bede 100644
--- a/src/test/consensus/DistributedValidatorsSim_test.cpp
+++ b/src/test/consensus/DistributedValidatorsSim_test.cpp
@@ -24,7 +24,7 @@ namespace xrpl::test {
 
 /** In progress simulations for diversifying and distributing validators
  */
-class DistributedValidators_test : public beast::unit_test::suite
+class DistributedValidators_test : public beast::unit_test::Suite
 {
     void
     completeTrustCompleteConnectFixedDelay(
diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp
index 749a2488b3..e56785a46a 100644
--- a/src/test/consensus/LedgerTiming_test.cpp
+++ b/src/test/consensus/LedgerTiming_test.cpp
@@ -8,23 +8,23 @@
 
 namespace xrpl::test {
 
-class LedgerTiming_test : public beast::unit_test::suite
+class LedgerTiming_test : public beast::unit_test::Suite
 {
     void
     testGetNextLedgerTimeResolution()
     {
         // helper to iteratively call into getNextLedgerTimeResolution
-        struct test_res
+        struct TestRes
         {
             std::uint32_t decrease = 0;
             std::uint32_t equal = 0;
             std::uint32_t increase = 0;
 
-            static test_res
+            static TestRes
             run(bool previousAgree, std::uint32_t rounds)
             {
-                test_res res;
-                auto closeResolution = ledgerDefaultTimeResolution;
+                TestRes res;
+                auto closeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
                 auto nextCloseResolution = closeResolution;
                 std::uint32_t round = 0;
                 do
@@ -51,14 +51,14 @@ class LedgerTiming_test : public beast::unit_test::suite
 
         // If we never agree on close time, only can increase resolution
         // until hit the max
-        auto decreases = test_res::run(false, 10);
+        auto decreases = TestRes::run(false, 10);
         BEAST_EXPECT(decreases.increase == 3);
         BEAST_EXPECT(decreases.decrease == 0);
         BEAST_EXPECT(decreases.equal == 7);
 
         // If we always agree on close time, only can decrease resolution
         // until hit the min
-        auto increases = test_res::run(false, 100);
+        auto increases = TestRes::run(false, 100);
         BEAST_EXPECT(increases.increase == 3);
         BEAST_EXPECT(increases.decrease == 0);
         BEAST_EXPECT(increases.equal == 97);
diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp
index 1ae6e99d80..2b638b1dfa 100644
--- a/src/test/consensus/LedgerTrie_test.cpp
+++ b/src/test/consensus/LedgerTrie_test.cpp
@@ -10,7 +10,7 @@
 
 namespace xrpl::test {
 
-class LedgerTrie_test : public beast::unit_test::suite
+class LedgerTrie_test : public beast::unit_test::Suite
 {
     void
     testInsert()
diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp
index bb1bcb0c0f..b4c98eadef 100644
--- a/src/test/consensus/NegativeUNL_test.cpp
+++ b/src/test/consensus/NegativeUNL_test.cpp
@@ -88,7 +88,7 @@ applyAndTestResult(jtx::Env& env, OpenView& view, STTx const& tx, bool pass);
  * @return true if meet the expectation
  */
 bool
-VerifyPubKeyAndSeq(
+verifyPubKeyAndSeq(
     std::shared_ptr<Ledger const> const& l,
     hash_map<PublicKey, std::uint32_t> nUnlLedgerSeq);
 
@@ -121,7 +121,7 @@ createPublicKeys(std::size_t n);
 STTx
 createTx(bool disabling, LedgerIndex seq, PublicKey const& txKey);
 
-class NegativeUNL_test : public beast::unit_test::suite
+class NegativeUNL_test : public beast::unit_test::Suite
 {
     /**
      * Test filling and applying ttUNL_MODIFY Tx, as well as ledger update:
@@ -233,11 +233,11 @@ class NegativeUNL_test : public beast::unit_test::suite
 
         testcase("Create UNLModify Tx and apply to ledgers");
 
-        jtx::Env env(*this, jtx::testable_amendments());
+        jtx::Env env(*this, jtx::testableAmendments());
         std::vector<PublicKey> publicKeys = createPublicKeys(3);
         // genesis ledger
         auto l = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -251,12 +251,12 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(1) the ledger after genesis, not a flag ledger
             l = std::make_shared<Ledger>(*l, env.app().getTimeKeeper().closeTime());
 
-            auto txDisable_0 = createTx(true, l->seq(), publicKeys[0]);
-            auto txReEnable_1 = createTx(false, l->seq(), publicKeys[1]);
+            auto txDisable0 = createTx(true, l->seq(), publicKeys[0]);
+            auto txReEnable1 = createTx(false, l->seq(), publicKeys[1]);
 
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_0, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_1, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable0, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable1, false));
             accum.apply(*l);
             BEAST_EXPECT(negUnlSizeTest(l, 0, false, false));
         }
@@ -271,24 +271,24 @@ class NegativeUNL_test : public beast::unit_test::suite
             BEAST_EXPECT(l->isFlagLedger());
             l->updateNegativeUNL();
 
-            auto txDisable_0 = createTx(true, l->seq(), publicKeys[0]);
-            auto txDisable_1 = createTx(true, l->seq(), publicKeys[1]);
-            auto txReEnable_2 = createTx(false, l->seq(), publicKeys[2]);
+            auto txDisable0 = createTx(true, l->seq(), publicKeys[0]);
+            auto txDisable1 = createTx(true, l->seq(), publicKeys[1]);
+            auto txReEnable2 = createTx(false, l->seq(), publicKeys[2]);
 
             // can apply 1 and only 1 ToDisable Tx,
             // cannot apply ToReEnable Tx, since negative UNL is empty
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_0, true));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_1, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_2, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable0, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable1, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable2, false));
             accum.apply(*l);
-            auto good_size = negUnlSizeTest(l, 0, true, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            auto goodSize = negUnlSizeTest(l, 0, true, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->validatorToDisable() == publicKeys[0]);
                 //++ first ToDisable Tx in ledger's TxSet
-                uint256 const txID = txDisable_0.getTransactionID();
+                uint256 const txID = txDisable0.getTransactionID();
                 BEAST_EXPECT(l->txExists(txID));
             }
         }
@@ -297,9 +297,9 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(3) ledgers before the next flag ledger
             for (auto i = 0; i < 256; ++i)
             {
-                auto good_size = negUnlSizeTest(l, 0, true, false);
-                BEAST_EXPECT(good_size);
-                if (good_size)
+                auto goodSize = negUnlSizeTest(l, 0, true, false);
+                BEAST_EXPECT(goodSize);
+                if (goodSize)
                     BEAST_EXPECT(l->validatorToDisable() == publicKeys[0]);
                 l = std::make_shared<Ledger>(*l, env.app().getTimeKeeper().closeTime());
             }
@@ -308,36 +308,36 @@ class NegativeUNL_test : public beast::unit_test::suite
 
             //(4) next flag ledger
             // test if the ledger updated correctly
-            auto good_size = negUnlSizeTest(l, 1, false, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            auto goodSize = negUnlSizeTest(l, 1, false, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(*(l->negativeUNL().begin()) == publicKeys[0]);
                 nUnlLedgerSeq.emplace(publicKeys[0], l->seq());
             }
 
-            auto txDisable_0 = createTx(true, l->seq(), publicKeys[0]);
-            auto txDisable_1 = createTx(true, l->seq(), publicKeys[1]);
-            auto txReEnable_0 = createTx(false, l->seq(), publicKeys[0]);
-            auto txReEnable_1 = createTx(false, l->seq(), publicKeys[1]);
-            auto txReEnable_2 = createTx(false, l->seq(), publicKeys[2]);
+            auto txDisable0 = createTx(true, l->seq(), publicKeys[0]);
+            auto txDisable1 = createTx(true, l->seq(), publicKeys[1]);
+            auto txReEnable0 = createTx(false, l->seq(), publicKeys[0]);
+            auto txReEnable1 = createTx(false, l->seq(), publicKeys[1]);
+            auto txReEnable2 = createTx(false, l->seq(), publicKeys[2]);
 
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_0, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_1, true));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_1, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_2, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_0, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable0, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable1, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable1, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable2, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable0, true));
             accum.apply(*l);
-            good_size = negUnlSizeTest(l, 1, true, true);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            goodSize = negUnlSizeTest(l, 1, true, true);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[0]));
                 BEAST_EXPECT(l->validatorToDisable() == publicKeys[1]);
                 BEAST_EXPECT(l->validatorToReEnable() == publicKeys[0]);
                 // test sfFirstLedgerSequence
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
         }
 
@@ -345,9 +345,9 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(5) ledgers before the next flag ledger
             for (auto i = 0; i < 256; ++i)
             {
-                auto good_size = negUnlSizeTest(l, 1, true, true);
-                BEAST_EXPECT(good_size);
-                if (good_size)
+                auto goodSize = negUnlSizeTest(l, 1, true, true);
+                BEAST_EXPECT(goodSize);
+                if (goodSize)
                 {
                     BEAST_EXPECT(l->negativeUNL().count(publicKeys[0]));
                     BEAST_EXPECT(l->validatorToDisable() == publicKeys[1]);
@@ -360,27 +360,27 @@ class NegativeUNL_test : public beast::unit_test::suite
 
             //(6) next flag ledger
             // test if the ledger updated correctly
-            auto good_size = negUnlSizeTest(l, 1, false, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            auto goodSize = negUnlSizeTest(l, 1, false, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
             }
 
-            auto txDisable_0 = createTx(true, l->seq(), publicKeys[0]);
+            auto txDisable0 = createTx(true, l->seq(), publicKeys[0]);
 
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_0, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable0, true));
             accum.apply(*l);
-            good_size = negUnlSizeTest(l, 1, true, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            goodSize = negUnlSizeTest(l, 1, true, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                 BEAST_EXPECT(l->validatorToDisable() == publicKeys[0]);
                 nUnlLedgerSeq.emplace(publicKeys[1], l->seq());
                 nUnlLedgerSeq.erase(publicKeys[0]);
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
         }
 
@@ -388,9 +388,9 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(7) ledgers before the next flag ledger
             for (auto i = 0; i < 256; ++i)
             {
-                auto good_size = negUnlSizeTest(l, 1, true, false);
-                BEAST_EXPECT(good_size);
-                if (good_size)
+                auto goodSize = negUnlSizeTest(l, 1, true, false);
+                BEAST_EXPECT(goodSize);
+                if (goodSize)
                 {
                     BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                     BEAST_EXPECT(l->validatorToDisable() == publicKeys[0]);
@@ -402,33 +402,33 @@ class NegativeUNL_test : public beast::unit_test::suite
 
             //(8) next flag ledger
             // test if the ledger updated correctly
-            auto good_size = negUnlSizeTest(l, 2, false, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            auto goodSize = negUnlSizeTest(l, 2, false, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[0]));
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                 nUnlLedgerSeq.emplace(publicKeys[0], l->seq());
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
 
-            auto txDisable_0 = createTx(true, l->seq(), publicKeys[0]);
-            auto txReEnable_0 = createTx(false, l->seq(), publicKeys[0]);
-            auto txReEnable_1 = createTx(false, l->seq(), publicKeys[1]);
+            auto txDisable0 = createTx(true, l->seq(), publicKeys[0]);
+            auto txReEnable0 = createTx(false, l->seq(), publicKeys[0]);
+            auto txReEnable1 = createTx(false, l->seq(), publicKeys[1]);
 
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_0, true));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_1, false));
-            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable_0, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable0, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable1, false));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txDisable0, false));
             accum.apply(*l);
-            good_size = negUnlSizeTest(l, 2, false, true);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            goodSize = negUnlSizeTest(l, 2, false, true);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[0]));
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                 BEAST_EXPECT(l->validatorToReEnable() == publicKeys[0]);
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
         }
 
@@ -436,9 +436,9 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(9) ledgers before the next flag ledger
             for (auto i = 0; i < 256; ++i)
             {
-                auto good_size = negUnlSizeTest(l, 2, false, true);
-                BEAST_EXPECT(good_size);
-                if (good_size)
+                auto goodSize = negUnlSizeTest(l, 2, false, true);
+                BEAST_EXPECT(goodSize);
+                if (goodSize)
                 {
                     BEAST_EXPECT(l->negativeUNL().count(publicKeys[0]));
                     BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
@@ -451,27 +451,27 @@ class NegativeUNL_test : public beast::unit_test::suite
 
             //(10) next flag ledger
             // test if the ledger updated correctly
-            auto good_size = negUnlSizeTest(l, 1, false, false);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            auto goodSize = negUnlSizeTest(l, 1, false, false);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                 nUnlLedgerSeq.erase(publicKeys[0]);
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
 
-            auto txReEnable_1 = createTx(false, l->seq(), publicKeys[1]);
+            auto txReEnable1 = createTx(false, l->seq(), publicKeys[1]);
 
             OpenView accum(&*l);
-            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable_1, true));
+            BEAST_EXPECT(applyAndTestResult(env, accum, txReEnable1, true));
             accum.apply(*l);
-            good_size = negUnlSizeTest(l, 1, false, true);
-            BEAST_EXPECT(good_size);
-            if (good_size)
+            goodSize = negUnlSizeTest(l, 1, false, true);
+            BEAST_EXPECT(goodSize);
+            if (goodSize)
             {
                 BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                 BEAST_EXPECT(l->validatorToReEnable() == publicKeys[1]);
-                BEAST_EXPECT(VerifyPubKeyAndSeq(l, nUnlLedgerSeq));
+                BEAST_EXPECT(verifyPubKeyAndSeq(l, nUnlLedgerSeq));
             }
         }
 
@@ -479,9 +479,9 @@ class NegativeUNL_test : public beast::unit_test::suite
             //(11) ledgers before the next flag ledger
             for (auto i = 0; i < 256; ++i)
             {
-                auto good_size = negUnlSizeTest(l, 1, false, true);
-                BEAST_EXPECT(good_size);
-                if (good_size)
+                auto goodSize = negUnlSizeTest(l, 1, false, true);
+                BEAST_EXPECT(goodSize);
+                if (goodSize)
                 {
                     BEAST_EXPECT(l->negativeUNL().count(publicKeys[1]));
                     BEAST_EXPECT(l->validatorToReEnable() == publicKeys[1]);
@@ -541,8 +541,8 @@ struct NetworkHistory
         std::optional<int> numLedgers;
     };
 
-    NetworkHistory(beast::unit_test::suite& suite, Parameter const& p)
-        : env(suite, jtx::testable_amendments()), param(p), validations(env.app().getValidations())
+    NetworkHistory(beast::unit_test::Suite& suite, Parameter const& p)
+        : env(suite, jtx::testableAmendments()), param(p), validations(env.app().getValidations())
     {
         createNodes();
         if (!param.numLedgers)
@@ -570,12 +570,12 @@ struct NetworkHistory
     bool
     createLedgerHistory()
     {
-        static uint256 fake_amendment;  // So we have different genesis ledgers
+        static uint256 kFAKE_AMENDMENT;  // So we have different genesis ledgers
         auto l = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
-            std::vector<uint256>{fake_amendment++},
+            std::vector<uint256>{kFAKE_AMENDMENT++},
             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 keyPair = randomKeyPair(KeyType::secp256k1);
+        static auto kEY_PAIR = randomKeyPair(KeyType::Secp256k1);
         return std::make_shared<STValidation>(
             env.app().getTimeKeeper().now(),
-            keyPair.first,
-            keyPair.second,
+            kEY_PAIR.first,
+            kEY_PAIR.second,
             v,
             [&](STValidation& v) {
                 v.setFieldH256(sfLedgerHash, ledger->header().hash);
                 v.setFieldU32(sfLedgerSequence, ledger->seq());
-                v.setFlag(vfFullValidation);
+                v.setFlag(kVF_FULL_VALIDATION);
             });
     };
 
@@ -690,7 +690,7 @@ struct NetworkHistory
     bool goodHistory;
 };
 
-auto defaultPreVote = [](NegativeUNLVote& vote) {};
+auto gDefaultPreVote = [](NegativeUNLVote& vote) {};
 /**
  * Create a NegativeUNLVote object. It then creates ttUNL_MODIFY Tx as its vote
  * on negative UNL changes.
@@ -702,13 +702,13 @@ auto defaultPreVote = [](NegativeUNLVote& vote) {};
  * @param pre the PreVote function
  * @return true if the number of ttUNL_MODIFY Txes created meet expectation
  */
-template <typename PreVote = decltype(defaultPreVote)>
+template <typename PreVote = decltype(gDefaultPreVote)>
 bool
 voteAndCheck(
     NetworkHistory& history,
     NodeID const& myId,
     std::size_t expect,
-    PreVote const& pre = defaultPreVote)
+    PreVote const& pre = gDefaultPreVote)
 {
     NegativeUNLVote vote(myId, history.env.journal);
     pre(vote);
@@ -721,7 +721,7 @@ voteAndCheck(
 /**
  * Test the private member functions of NegativeUNLVote
  */
-class NegativeUNLVoteInternal_test : public beast::unit_test::suite
+class NegativeUNLVoteInternal_test : public beast::unit_test::Suite
 {
     void
     testAddTx()
@@ -734,8 +734,8 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
 
         // one add, one remove
         auto txSet = std::make_shared<SHAMap>(SHAMapType::TRANSACTION, env.app().getNodeFamily());
-        PublicKey const toDisableKey(derivePublicKey(KeyType::ed25519, randomSecretKey()));
-        PublicKey const toReEnableKey(derivePublicKey(KeyType::ed25519, randomSecretKey()));
+        PublicKey const toDisableKey(derivePublicKey(KeyType::Ed25519, randomSecretKey()));
+        PublicKey const toReEnableKey(derivePublicKey(KeyType::Ed25519, randomSecretKey()));
         LedgerIndex const seq(1234);
         BEAST_EXPECT(countTx(txSet) == 0);
         vote.addTx(seq, toDisableKey, NegativeUNLVote::NegativeUNLModify::ToDisable, txSet);
@@ -755,20 +755,20 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
         NodeID const myId(0xA0);
         NegativeUNLVote const vote(myId, env.journal);
 
-        uint256 const pad_0(0);
-        uint256 const pad_f = ~pad_0;
-        NodeID const n_1(1);
-        NodeID const n_2(2);
-        NodeID const n_3(3);
-        std::vector<NodeID> candidates({n_1});
-        BEAST_EXPECT(vote.choose(pad_0, candidates) == n_1);
-        BEAST_EXPECT(vote.choose(pad_f, candidates) == n_1);
+        uint256 const pad0(0);
+        uint256 const padF = ~pad0;
+        NodeID const n1(1);
+        NodeID const n2(2);
+        NodeID const n3(3);
+        std::vector<NodeID> candidates({n1});
+        BEAST_EXPECT(vote.choose(pad0, candidates) == n1);
+        BEAST_EXPECT(vote.choose(padF, candidates) == n1);
         candidates.emplace_back(2);
-        BEAST_EXPECT(vote.choose(pad_0, candidates) == n_1);
-        BEAST_EXPECT(vote.choose(pad_f, candidates) == n_2);
+        BEAST_EXPECT(vote.choose(pad0, candidates) == n1);
+        BEAST_EXPECT(vote.choose(padF, candidates) == n2);
         candidates.emplace_back(3);
-        BEAST_EXPECT(vote.choose(pad_0, candidates) == n_1);
-        BEAST_EXPECT(vote.choose(pad_f, candidates) == n_3);
+        BEAST_EXPECT(vote.choose(pad0, candidates) == n1);
+        BEAST_EXPECT(vote.choose(padF, candidates) == n3);
     }
 
     void
@@ -999,63 +999,63 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
              .hasToReEnable = false,
              .numLedgers = 0}};
 
-        hash_set<NodeID> negUnl_012;
+        hash_set<NodeID> negUnl012;
         for (std::uint32_t i = 0; i < 3; ++i)
-            negUnl_012.insert(history.UNLNodeIDs[i]);
+            negUnl012.insert(history.UNLNodeIDs[i]);
 
         // 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::negativeUNLHighWaterMark + 1;
+            goodScoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
 
         NegativeUNLVote vote(history.UNLNodeIDs[0], history.env.journal);
 
         {
             // all good scores
             BEAST_EXPECT(
-                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl_012, goodScoreTable, 0, 3));
+                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, goodScoreTable, 0, 3));
         }
         {
             // all bad scores
             hash_map<NodeID, std::uint32_t> scoreTable;
             for (auto& n : history.UNLNodeIDs)
-                scoreTable[n] = NegativeUNLVote::negativeUNLLowWaterMark - 1;
+                scoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
             BEAST_EXPECT(
-                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl_012, scoreTable, 35 - 3, 0));
+                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 35 - 3, 0));
         }
         {
             // all between watermarks
             hash_map<NodeID, std::uint32_t> scoreTable;
             for (auto& n : history.UNLNodeIDs)
-                scoreTable[n] = NegativeUNLVote::negativeUNLLowWaterMark + 1;
+                scoreTable[n] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
             BEAST_EXPECT(
-                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl_012, scoreTable, 0, 0));
+                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 0, 0));
         }
 
         {
             // 2 good scorers in negUnl
             auto scoreTable = goodScoreTable;
-            scoreTable[*negUnl_012.begin()] = NegativeUNLVote::negativeUNLLowWaterMark + 1;
+            scoreTable[*negUnl012.begin()] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
             BEAST_EXPECT(
-                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl_012, scoreTable, 0, 2));
+                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 0, 2));
         }
 
         {
             // 2 bad scorers not in negUnl
             auto scoreTable = goodScoreTable;
-            scoreTable[history.UNLNodeIDs[11]] = NegativeUNLVote::negativeUNLLowWaterMark - 1;
-            scoreTable[history.UNLNodeIDs[12]] = NegativeUNLVote::negativeUNLLowWaterMark - 1;
+            scoreTable[history.UNLNodeIDs[11]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
+            scoreTable[history.UNLNodeIDs[12]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK - 1;
             BEAST_EXPECT(
-                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl_012, scoreTable, 2, 3));
+                checkCandidateSizes(vote, history.UNLNodeIDSet, negUnl012, scoreTable, 2, 3));
         }
 
         {
             // 2 in negUnl but not in unl, have a remove candidate from score
             // table
-            hash_set<NodeID> UNL_temp = history.UNLNodeIDSet;
-            UNL_temp.erase(history.UNLNodeIDs[0]);
-            UNL_temp.erase(history.UNLNodeIDs[1]);
-            BEAST_EXPECT(checkCandidateSizes(vote, UNL_temp, negUnl_012, goodScoreTable, 0, 3));
+            hash_set<NodeID> unlTemp = history.UNLNodeIDSet;
+            unlTemp.erase(history.UNLNodeIDs[0]);
+            unlTemp.erase(history.UNLNodeIDs[1]);
+            BEAST_EXPECT(checkCandidateSizes(vote, unlTemp, negUnl012, goodScoreTable, 0, 3));
         }
 
         {
@@ -1063,47 +1063,46 @@ 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::negativeUNLLowWaterMark + 1;
-            hash_set<NodeID> UNL_temp = history.UNLNodeIDSet;
-            UNL_temp.erase(history.UNLNodeIDs[0]);
-            UNL_temp.erase(history.UNLNodeIDs[1]);
-            BEAST_EXPECT(checkCandidateSizes(vote, UNL_temp, negUnl_012, scoreTable, 0, 2));
+            scoreTable[history.UNLNodeIDs[2]] = NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK + 1;
+            hash_set<NodeID> unlTemp = history.UNLNodeIDSet;
+            unlTemp.erase(history.UNLNodeIDs[0]);
+            unlTemp.erase(history.UNLNodeIDs[1]);
+            BEAST_EXPECT(checkCandidateSizes(vote, unlTemp, negUnl012, scoreTable, 0, 2));
         }
 
         {
             // 2 new validators
-            NodeID const new_1(0xbead);
-            NodeID const new_2(0xbeef);
-            hash_set<NodeID> const nowTrusted = {new_1, new_2};
-            hash_set<NodeID> UNL_temp = history.UNLNodeIDSet;
-            UNL_temp.insert(new_1);
-            UNL_temp.insert(new_2);
+            NodeID const new1(0xbead);
+            NodeID const new2(0xbeef);
+            hash_set<NodeID> const nowTrusted = {new1, new2};
+            hash_set<NodeID> unlTemp = history.UNLNodeIDSet;
+            unlTemp.insert(new1);
+            unlTemp.insert(new2);
             vote.newValidators(256, nowTrusted);
             {
                 // 2 new validators have good scores, already in negUnl
                 auto scoreTable = goodScoreTable;
-                scoreTable[new_1] = NegativeUNLVote::negativeUNLHighWaterMark + 1;
-                scoreTable[new_2] = NegativeUNLVote::negativeUNLHighWaterMark + 1;
-                hash_set<NodeID> negUnl_temp = negUnl_012;
-                negUnl_temp.insert(new_1);
-                negUnl_temp.insert(new_2);
-                BEAST_EXPECT(
-                    checkCandidateSizes(vote, UNL_temp, negUnl_temp, scoreTable, 0, 3 + 2));
+                scoreTable[new1] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
+                scoreTable[new2] = NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK + 1;
+                hash_set<NodeID> negUnlTemp = negUnl012;
+                negUnlTemp.insert(new1);
+                negUnlTemp.insert(new2);
+                BEAST_EXPECT(checkCandidateSizes(vote, unlTemp, negUnlTemp, scoreTable, 0, 3 + 2));
             }
             {
                 // 2 new validators have bad scores, not in negUnl
                 auto scoreTable = goodScoreTable;
-                scoreTable[new_1] = 0;
-                scoreTable[new_2] = 0;
-                BEAST_EXPECT(checkCandidateSizes(vote, UNL_temp, negUnl_012, scoreTable, 0, 3));
+                scoreTable[new1] = 0;
+                scoreTable[new2] = 0;
+                BEAST_EXPECT(checkCandidateSizes(vote, unlTemp, negUnl012, scoreTable, 0, 3));
             }
             {
                 // expired the new validators have bad scores, not in negUnl
-                vote.purgeNewValidators(256 + NegativeUNLVote::newValidatorDisableSkip + 1);
+                vote.purgeNewValidators(256 + NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 1);
                 auto scoreTable = goodScoreTable;
-                scoreTable[new_1] = 0;
-                scoreTable[new_2] = 0;
-                BEAST_EXPECT(checkCandidateSizes(vote, UNL_temp, negUnl_012, scoreTable, 2, 3));
+                scoreTable[new1] = 0;
+                scoreTable[new2] = 0;
+                BEAST_EXPECT(checkCandidateSizes(vote, unlTemp, negUnl012, scoreTable, 2, 3));
             }
         }
     }
@@ -1137,31 +1136,31 @@ 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::negativeUNLLowWaterMark - 1,
-            NegativeUNLVote::negativeUNLLowWaterMark,
-            NegativeUNLVote::negativeUNLLowWaterMark + 1,
-            NegativeUNLVote::negativeUNLHighWaterMark - 1,
-            NegativeUNLVote::negativeUNLHighWaterMark,
-            NegativeUNLVote::negativeUNLHighWaterMark + 1,
-            NegativeUNLVote::negativeUNLMinLocalValsToVote};
+            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};
 
         //== combination 1:
         {
-            auto fillScoreTable = [&](std::uint32_t unl_size,
-                                      std::uint32_t nUnl_size,
+            auto fillScoreTable = [&](std::uint32_t unlSize,
+                                      std::uint32_t nUnlSize,
                                       std::uint32_t score,
                                       hash_set<NodeID>& unl,
                                       hash_set<NodeID>& negUnl,
                                       hash_map<NodeID, std::uint32_t>& scoreTable) {
                 std::vector<NodeID> nodeIDs;
-                std::vector<PublicKey> const keys = createPublicKeys(unl_size);
+                std::vector<PublicKey> const keys = createPublicKeys(unlSize);
                 for (auto const& k : keys)
                 {
                     nodeIDs.emplace_back(calcNodeID(k));
                     unl.emplace(nodeIDs.back());
                     scoreTable[nodeIDs.back()] = score;
                 }
-                for (std::uint32_t i = 0; i < nUnl_size; ++i)
+                for (std::uint32_t i = 0; i < nUnlSize; ++i)
                     negUnl.insert(nodeIDs[i]);
             };
 
@@ -1179,44 +1178,44 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
                         BEAST_EXPECT(negUnl.size() == us * np / 100);
                         BEAST_EXPECT(scoreTable.size() == us);
 
-                        std::size_t toDisable_expect = 0;
-                        std::size_t toReEnable_expect = 0;
+                        std::size_t toDisableExpect = 0;
+                        std::size_t toReEnableExpect = 0;
                         if (np == 0)
                         {
-                            if (score < NegativeUNLVote::negativeUNLLowWaterMark)
+                            if (score < NegativeUNLVote::kNEGATIVE_UNL_LOW_WATER_MARK)
                             {
-                                toDisable_expect = us;
+                                toDisableExpect = us;
                             }
                         }
                         else if (np == 50)
                         {
-                            if (score > NegativeUNLVote::negativeUNLHighWaterMark)
+                            if (score > NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK)
                             {
-                                toReEnable_expect = us * np / 100;
+                                toReEnableExpect = us * np / 100;
                             }
                         }
                         else
                         {
-                            if (score > NegativeUNLVote::negativeUNLHighWaterMark)
+                            if (score > NegativeUNLVote::kNEGATIVE_UNL_HIGH_WATER_MARK)
                             {
-                                toReEnable_expect = us;
+                                toReEnableExpect = us;
                             }
                         }
                         BEAST_EXPECT(checkCandidateSizes(
-                            vote, unl, negUnl, scoreTable, toDisable_expect, toReEnable_expect));
+                            vote, unl, negUnl, scoreTable, toDisableExpect, toReEnableExpect));
                     }
                 }
             }
 
             //== combination 2:
             {
-                auto fillScoreTable = [&](std::uint32_t unl_size,
-                                          std::uint32_t nUnl_percent,
+                auto fillScoreTable = [&](std::uint32_t unlSize,
+                                          std::uint32_t nUnlPercent,
                                           hash_set<NodeID>& unl,
                                           hash_set<NodeID>& negUnl,
                                           hash_map<NodeID, std::uint32_t>& scoreTable) {
                     std::vector<NodeID> nodeIDs;
-                    std::vector<PublicKey> const keys = createPublicKeys(unl_size);
+                    std::vector<PublicKey> const keys = createPublicKeys(unlSize);
                     for (auto const& k : keys)
                     {
                         nodeIDs.emplace_back(calcNodeID(k));
@@ -1229,18 +1228,18 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
                         scoreTable[nodeIDs[nIdx++]] = score;
                         scoreTable[nodeIDs[nIdx++]] = score;
                     }
-                    for (; nIdx < unl_size;)
+                    for (; nIdx < unlSize;)
                     {
                         scoreTable[nodeIDs[nIdx++]] = scores.back();
                     }
 
-                    if (nUnl_percent == 100)
+                    if (nUnlPercent == 100)
                     {
                         negUnl = unl;
                     }
-                    else if (nUnl_percent == 50)
+                    else if (nUnlPercent == 50)
                     {
-                        for (std::uint32_t i = 1; i < unl_size; i += 2)
+                        for (std::uint32_t i = 1; i < unlSize; i += 2)
                             negUnl.insert(nodeIDs[i]);
                     }
                 };
@@ -1258,22 +1257,22 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
                         BEAST_EXPECT(negUnl.size() == us * np / 100);
                         BEAST_EXPECT(scoreTable.size() == us);
 
-                        std::size_t toDisable_expect = 0;
-                        std::size_t toReEnable_expect = 0;
+                        std::size_t toDisableExpect = 0;
+                        std::size_t toReEnableExpect = 0;
                         if (np == 0)
                         {
-                            toDisable_expect = 4;
+                            toDisableExpect = 4;
                         }
                         else if (np == 50)
                         {
-                            toReEnable_expect = negUnl.size() - 6;
+                            toReEnableExpect = negUnl.size() - 6;
                         }
                         else
                         {
-                            toReEnable_expect = negUnl.size() - 12;
+                            toReEnableExpect = negUnl.size() - 12;
                         }
                         BEAST_EXPECT(checkCandidateSizes(
-                            vote, unl, negUnl, scoreTable, toDisable_expect, toReEnable_expect));
+                            vote, unl, negUnl, scoreTable, toDisableExpect, toReEnableExpect));
                     }
                 }
             }
@@ -1315,24 +1314,24 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
             BEAST_EXPECT(vote.newValidators_[n2] == 3);
         }
 
-        vote.newValidators(NegativeUNLVote::newValidatorDisableSkip, {n1, n2, n3});
+        vote.newValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP, {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::newValidatorDisableSkip);
+            BEAST_EXPECT(vote.newValidators_[n3] == NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP);
         }
 
-        vote.purgeNewValidators(NegativeUNLVote::newValidatorDisableSkip + 2);
+        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 2);
         BEAST_EXPECT(vote.newValidators_.size() == 3);
-        vote.purgeNewValidators(NegativeUNLVote::newValidatorDisableSkip + 3);
+        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 3);
         BEAST_EXPECT(vote.newValidators_.size() == 2);
-        vote.purgeNewValidators(NegativeUNLVote::newValidatorDisableSkip + 4);
+        vote.purgeNewValidators(NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP + 4);
         BEAST_EXPECT(vote.newValidators_.size() == 1);
         BEAST_EXPECT(vote.newValidators_.begin()->first == n3);
         BEAST_EXPECT(
-            vote.newValidators_.begin()->second == NegativeUNLVote::newValidatorDisableSkip);
+            vote.newValidators_.begin()->second == NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP);
     }
 
     void
@@ -1352,7 +1351,7 @@ class NegativeUNLVoteInternal_test : public beast::unit_test::suite
  * This was a part of NegativeUNLVoteInternal. It is redundant and has long
  * runtime. So we separate it out as a manual test.
  */
-class NegativeUNLVoteScoreTable_test : public beast::unit_test::suite
+class NegativeUNLVoteScoreTable_test : public beast::unit_test::Suite
 {
     void
     testBuildScoreTableCombination()
@@ -1399,10 +1398,10 @@ class NegativeUNLVoteScoreTable_test : public beast::unit_test::suite
                                 k = 2;
                             }
 
-                            bool const add_50 = scorePattern[sp][k] == 50 && l->seq() % 2 == 0;
-                            bool const add_100 = scorePattern[sp][k] == 100;
-                            bool const add_me = history.UNLNodeIDs[idx] == myId;
-                            return add_50 || add_100 || add_me;
+                            bool const add50 = scorePattern[sp][k] == 50 && l->seq() % 2 == 0;
+                            bool const add100 = scorePattern[sp][k] == 100;
+                            bool const addMe = history.UNLNodeIDs[idx] == myId;
+                            return add50 || add100 || addMe;
                         });
 
                     NegativeUNLVote vote(myId, history.env.journal);
@@ -1483,7 +1482,7 @@ class NegativeUNLVoteScoreTable_test : public beast::unit_test::suite
  * -- txSet.size = 1
  */
 
-class NegativeUNLVoteGoodScore_test : public beast::unit_test::suite
+class NegativeUNLVoteGoodScore_test : public beast::unit_test::Suite
 {
     void
     testDoVoting()
@@ -1540,7 +1539,7 @@ class NegativeUNLVoteGoodScore_test : public beast::unit_test::suite
     }
 };
 
-class NegativeUNLVoteOffline_test : public beast::unit_test::suite
+class NegativeUNLVoteOffline_test : public beast::unit_test::Suite
 {
     void
     testDoVoting()
@@ -1602,7 +1601,7 @@ class NegativeUNLVoteOffline_test : public beast::unit_test::suite
     }
 };
 
-class NegativeUNLVoteMaxListed_test : public beast::unit_test::suite
+class NegativeUNLVoteMaxListed_test : public beast::unit_test::Suite
 {
     void
     testDoVoting()
@@ -1639,7 +1638,7 @@ class NegativeUNLVoteMaxListed_test : public beast::unit_test::suite
     }
 };
 
-class NegativeUNLVoteRetiredValidator_test : public beast::unit_test::suite
+class NegativeUNLVoteRetiredValidator_test : public beast::unit_test::Suite
 {
     void
     testDoVoting()
@@ -1721,7 +1720,7 @@ class NegativeUNLVoteRetiredValidator_test : public beast::unit_test::suite
     }
 };
 
-class NegativeUNLVoteNewValidator_test : public beast::unit_test::suite
+class NegativeUNLVoteNewValidator_test : public beast::unit_test::Suite
 {
     void
     testDoVoting()
@@ -1747,13 +1746,13 @@ class NegativeUNLVoteNewValidator_test : public beast::unit_test::suite
                     });
                 BEAST_EXPECT(
                     voteAndCheck(history, history.UNLNodeIDs[0], 0, [&](NegativeUNLVote& vote) {
-                        auto extra_key_1 = randomKeyPair(KeyType::ed25519).first;
-                        auto extra_key_2 = randomKeyPair(KeyType::ed25519).first;
-                        history.UNLKeySet.insert(extra_key_1);
-                        history.UNLKeySet.insert(extra_key_2);
+                        auto extraKey1 = randomKeyPair(KeyType::Ed25519).first;
+                        auto extraKey2 = randomKeyPair(KeyType::Ed25519).first;
+                        history.UNLKeySet.insert(extraKey1);
+                        history.UNLKeySet.insert(extraKey2);
                         hash_set<NodeID> nowTrusted;
-                        nowTrusted.insert(calcNodeID(extra_key_1));
-                        nowTrusted.insert(calcNodeID(extra_key_2));
+                        nowTrusted.insert(calcNodeID(extraKey1));
+                        nowTrusted.insert(calcNodeID(extraKey2));
                         vote.newValidators(history.lastLedger()->seq(), nowTrusted);
                     }));
             }
@@ -1768,7 +1767,7 @@ class NegativeUNLVoteNewValidator_test : public beast::unit_test::suite
                  .negUNLSize = 0,
                  .hasToDisable = false,
                  .hasToReEnable = false,
-                 .numLedgers = NegativeUNLVote::newValidatorDisableSkip * 2}};
+                 .numLedgers = NegativeUNLVote::kNEW_VALIDATOR_DISABLE_SKIP * 2}};
             BEAST_EXPECT(history.goodHistory);
             if (history.goodHistory)
             {
@@ -1778,13 +1777,13 @@ class NegativeUNLVoteNewValidator_test : public beast::unit_test::suite
                     });
                 BEAST_EXPECT(
                     voteAndCheck(history, history.UNLNodeIDs[0], 1, [&](NegativeUNLVote& vote) {
-                        auto extra_key_1 = randomKeyPair(KeyType::ed25519).first;
-                        auto extra_key_2 = randomKeyPair(KeyType::ed25519).first;
-                        history.UNLKeySet.insert(extra_key_1);
-                        history.UNLKeySet.insert(extra_key_2);
+                        auto extraKey1 = randomKeyPair(KeyType::Ed25519).first;
+                        auto extraKey2 = randomKeyPair(KeyType::Ed25519).first;
+                        history.UNLKeySet.insert(extraKey1);
+                        history.UNLKeySet.insert(extraKey2);
                         hash_set<NodeID> nowTrusted;
-                        nowTrusted.insert(calcNodeID(extra_key_1));
-                        nowTrusted.insert(calcNodeID(extra_key_2));
+                        nowTrusted.insert(calcNodeID(extraKey1));
+                        nowTrusted.insert(calcNodeID(extraKey2));
                         vote.newValidators(256, nowTrusted);
                     }));
             }
@@ -1798,7 +1797,7 @@ class NegativeUNLVoteNewValidator_test : public beast::unit_test::suite
     }
 };
 
-class NegativeUNLVoteFilterValidations_test : public beast::unit_test::suite
+class NegativeUNLVoteFilterValidations_test : public beast::unit_test::Suite
 {
     void
     testFilterValidations()
@@ -1806,7 +1805,7 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::suite
         testcase("Filter Validations");
         jtx::Env env(*this);
         auto l = std::make_shared<Ledger>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{env.app().config().features},
             env.app().config().FEES.toFees(),
             std::vector<uint256>{},
@@ -1821,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(vfFullValidation);
+                    v.setFlag(kVF_FULL_VALIDATION);
                 });
         };
 
@@ -1834,7 +1833,7 @@ class NegativeUNLVoteFilterValidations_test : public beast::unit_test::suite
         std::vector<std::shared_ptr<STValidation>> vals;
         for (int i = 0; i < numNodes; ++i)
         {
-            auto keyPair = randomKeyPair(KeyType::secp256k1);
+            auto keyPair = randomKeyPair(KeyType::Secp256k1);
             vals.emplace_back(createSTVal(keyPair));
             cfgKeys.push_back(toBase58(TokenType::NodePublic, keyPair.first));
             activeValidators.emplace(calcNodeID(keyPair.first));
@@ -1903,7 +1902,7 @@ negUnlSizeTest(
 bool
 applyAndTestResult(jtx::Env& env, OpenView& view, STTx const& tx, bool pass)
 {
-    auto const res = apply(env.app(), view, tx, ApplyFlags::tapNONE, env.journal);
+    auto const res = apply(env.app(), view, tx, ApplyFlags::TapNone, env.journal);
     if (pass)
     {
         return isTesSuccess(res.ter);
@@ -1913,7 +1912,7 @@ applyAndTestResult(jtx::Env& env, OpenView& view, STTx const& tx, bool pass)
 }
 
 bool
-VerifyPubKeyAndSeq(
+verifyPubKeyAndSeq(
     std::shared_ptr<Ledger const> const& l,
     hash_map<PublicKey, std::uint32_t> nUnlLedgerSeq)
 {
diff --git a/src/test/consensus/RCLCensorshipDetector_test.cpp b/src/test/consensus/RCLCensorshipDetector_test.cpp
index 1ebf85c848..32117e0089 100644
--- a/src/test/consensus/RCLCensorshipDetector_test.cpp
+++ b/src/test/consensus/RCLCensorshipDetector_test.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl::test {
 
-class RCLCensorshipDetector_test : public beast::unit_test::suite
+class RCLCensorshipDetector_test : public beast::unit_test::Suite
 {
     void
     test(
diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp
index 23952ab850..7e75aea72a 100644
--- a/src/test/consensus/ScaleFreeSim_test.cpp
+++ b/src/test/consensus/ScaleFreeSim_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::test {
 
-class ScaleFreeSim_test : public beast::unit_test::suite
+class ScaleFreeSim_test : public beast::unit_test::Suite
 {
     void
     run() override
@@ -28,14 +28,14 @@ class ScaleFreeSim_test : public beast::unit_test::suite
         // Generate a quasi-random scale free network and simulate consensus
         // as we vary transaction submission rates
 
-        int const N = 100;  // Peers
+        int const n = 100;  // Peers
 
         int const numUNLs = 15;  //  UNL lists
-        int const minUNLSize = N / 4, maxUNLSize = N / 2;
+        int const minUNLSize = n / 4, maxUNLSize = n / 2;
 
         ConsensusParms const parms{};
         Sim sim;
-        PeerGroup network = sim.createGroup(N);
+        PeerGroup network = sim.createGroup(n);
 
         // generate trust ranks
         std::vector<double> const ranks =
diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp
index edb728af08..323f8fcb77 100644
--- a/src/test/consensus/Validations_test.cpp
+++ b/src/test/consensus/Validations_test.cpp
@@ -20,9 +20,9 @@
 #include <vector>
 
 namespace xrpl::test::csf {
-class Validations_test : public beast::unit_test::suite
+class Validations_test : public beast::unit_test::Suite
 {
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock> const;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock> const;
 
     // Helper to convert steady_clock to a reasonable NetClock
     // This allows a single manual clock in the unit tests
@@ -192,7 +192,7 @@ class Validations_test : public beast::unit_test::suite
     class TestHarness
     {
         ValidationParms p_;
-        beast::manual_clock<std::chrono::steady_clock> clock_;
+        beast::ManualClock<std::chrono::steady_clock> clock_;
         TestValidations tv_;
         PeerID nextNodeId_{0};
 
@@ -232,7 +232,7 @@ class Validations_test : public beast::unit_test::suite
         }
     };
 
-    Ledger const genesisLedger{Ledger::MakeGenesis{}};
+    Ledger const genesisLedger_{Ledger::MakeGenesis{}};
 
     void
     testAddValidation()
@@ -255,15 +255,15 @@ class Validations_test : public beast::unit_test::suite
             auto const v = n.validate(ledgerA);
 
             // Add a current validation
-            BEAST_EXPECT(ValStatus::current == harness.add(v));
+            BEAST_EXPECT(ValStatus::Current == harness.add(v));
 
             // Re-adding violates the increasing seq requirement for full
             // validations
-            BEAST_EXPECT(ValStatus::badSeq == harness.add(v));
+            BEAST_EXPECT(ValStatus::BadSeq == harness.add(v));
 
             harness.clock().advance(1s);
 
-            BEAST_EXPECT(ValStatus::current == harness.add(n.validate(ledgerAB)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(n.validate(ledgerAB)));
 
             // Test the node changing signing key
 
@@ -277,13 +277,13 @@ class Validations_test : public beast::unit_test::suite
             harness.clock().advance(1s);
 
             // Cannot re-do the same full validation sequence
-            BEAST_EXPECT(ValStatus::conflicting == harness.add(n.validate(ledgerAB)));
+            BEAST_EXPECT(ValStatus::Conflicting == harness.add(n.validate(ledgerAB)));
             // Cannot send the same partial validation sequence
-            BEAST_EXPECT(ValStatus::conflicting == harness.add(n.partial(ledgerAB)));
+            BEAST_EXPECT(ValStatus::Conflicting == harness.add(n.partial(ledgerAB)));
 
             // Now trusts the newest ledger too
             harness.clock().advance(1s);
-            BEAST_EXPECT(ValStatus::current == harness.add(n.validate(ledgerABC)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(n.validate(ledgerABC)));
             BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerAB.id()) == 1);
             BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerABC.id()) == 1);
 
@@ -295,9 +295,9 @@ class Validations_test : public beast::unit_test::suite
             harness.clock().advance(4s);
             auto const valABCD = n.validate(ledgerABCD);
 
-            BEAST_EXPECT(ValStatus::current == harness.add(valABCD));
+            BEAST_EXPECT(ValStatus::Current == harness.add(valABCD));
 
-            BEAST_EXPECT(ValStatus::stale == harness.add(valABCDE));
+            BEAST_EXPECT(ValStatus::Stale == harness.add(valABCDE));
         }
 
         {
@@ -307,14 +307,14 @@ class Validations_test : public beast::unit_test::suite
             Node const n = harness.makeNode();
 
             // Establish a new current validation
-            BEAST_EXPECT(ValStatus::current == harness.add(n.validate(ledgerA)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(n.validate(ledgerA)));
 
             // Process a validation that has "later" seq but early sign time
-            BEAST_EXPECT(ValStatus::stale == harness.add(n.validate(ledgerAB, -1s, -1s)));
+            BEAST_EXPECT(ValStatus::Stale == harness.add(n.validate(ledgerAB, -1s, -1s)));
 
             // Process a validation that has a later seq and later sign
             // time
-            BEAST_EXPECT(ValStatus::current == harness.add(n.validate(ledgerABC, 1s, 1s)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(n.validate(ledgerABC, 1s, 1s)));
         }
 
         {
@@ -323,15 +323,15 @@ class Validations_test : public beast::unit_test::suite
             Node const n = harness.makeNode();
 
             BEAST_EXPECT(
-                ValStatus::stale ==
+                ValStatus::Stale ==
                 harness.add(n.validate(ledgerA, -harness.parms().validationCURRENT_EARLY, 0s)));
 
             BEAST_EXPECT(
-                ValStatus::stale ==
+                ValStatus::Stale ==
                 harness.add(n.validate(ledgerA, harness.parms().validationCURRENT_WALL, 0s)));
 
             BEAST_EXPECT(
-                ValStatus::stale ==
+                ValStatus::Stale ==
                 harness.add(n.validate(ledgerA, 0s, harness.parms().validationCURRENT_LOCAL)));
         }
 
@@ -349,16 +349,16 @@ class Validations_test : public beast::unit_test::suite
                     return harness.add(n.partial(lgr));
                 };
 
-                BEAST_EXPECT(ValStatus::current == process(ledgerABC));
+                BEAST_EXPECT(ValStatus::Current == process(ledgerABC));
                 harness.clock().advance(1s);
                 BEAST_EXPECT(ledgerAB.seq() < ledgerABC.seq());
-                BEAST_EXPECT(ValStatus::badSeq == process(ledgerAB));
+                BEAST_EXPECT(ValStatus::BadSeq == process(ledgerAB));
 
                 // If we advance far enough for AB to expire, we can fully
                 // validate or partially validate that sequence number again
-                BEAST_EXPECT(ValStatus::conflicting == process(ledgerAZ));
+                BEAST_EXPECT(ValStatus::Conflicting == process(ledgerAZ));
                 harness.clock().advance(harness.parms().validationSET_EXPIRES + 1ms);
-                BEAST_EXPECT(ValStatus::current == process(ledgerAZ));
+                BEAST_EXPECT(ValStatus::Current == process(ledgerAZ));
             }
         }
     }
@@ -379,18 +379,18 @@ class Validations_test : public beast::unit_test::suite
         std::vector<Trigger> const triggers = {
             [&](TestValidations& vals) { vals.currentTrusted(); },
             [&](TestValidations& vals) { vals.getCurrentNodeIDs(); },
-            [&](TestValidations& vals) { vals.getPreferred(genesisLedger); },
+            [&](TestValidations& vals) { vals.getPreferred(genesisLedger_); },
             [&](TestValidations& vals) { vals.getNodesAfter(ledgerA, ledgerA.id()); }};
         for (Trigger const& trigger : triggers)
         {
             TestHarness harness(h.oracle);
             Node const n = harness.makeNode();
 
-            BEAST_EXPECT(ValStatus::current == harness.add(n.validate(ledgerAB)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(n.validate(ledgerAB)));
             trigger(harness.vals());
             BEAST_EXPECT(harness.vals().getNodesAfter(ledgerA, ledgerA.id()) == 1);
             BEAST_EXPECT(
-                harness.vals().getPreferred(genesisLedger) ==
+                harness.vals().getPreferred(genesisLedger_) ==
                 std::make_pair(ledgerAB.seq(), ledgerAB.id()));
             harness.clock().advance(harness.parms().validationCURRENT_LOCAL);
 
@@ -398,7 +398,7 @@ class Validations_test : public beast::unit_test::suite
             trigger(harness.vals());
 
             BEAST_EXPECT(harness.vals().getNodesAfter(ledgerA, ledgerA.id()) == 0);
-            BEAST_EXPECT(harness.vals().getPreferred(genesisLedger) == std::nullopt);
+            BEAST_EXPECT(harness.vals().getPreferred(genesisLedger_) == std::nullopt);
         }
     }
 
@@ -427,20 +427,20 @@ class Validations_test : public beast::unit_test::suite
         notTrustedNode.untrust();
 
         // first round a,b,c agree, d has is partial
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode1.validate(ledgerA)));
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode2.validate(ledgerA)));
-        BEAST_EXPECT(ValStatus::current == harness.add(notTrustedNode.validate(ledgerA)));
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode3.partial(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode1.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode2.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(notTrustedNode.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode3.partial(ledgerA)));
 
         for (Ledger const& ledger : {ledgerA, ledgerAB, ledgerABC, ledgerAD})
             BEAST_EXPECT(harness.vals().getNodesAfter(ledger, ledger.id()) == 0);
 
         harness.clock().advance(5s);
 
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode1.validate(ledgerAB)));
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode2.validate(ledgerABC)));
-        BEAST_EXPECT(ValStatus::current == harness.add(notTrustedNode.validate(ledgerAB)));
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode3.partial(ledgerABC)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode1.validate(ledgerAB)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode2.validate(ledgerABC)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(notTrustedNode.validate(ledgerAB)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode3.partial(ledgerABC)));
 
         BEAST_EXPECT(harness.vals().getNodesAfter(ledgerA, ledgerA.id()) == 3);
         BEAST_EXPECT(harness.vals().getNodesAfter(ledgerAB, ledgerAB.id()) == 2);
@@ -468,8 +468,8 @@ class Validations_test : public beast::unit_test::suite
         Node b = harness.makeNode();
         b.untrust();
 
-        BEAST_EXPECT(ValStatus::current == harness.add(a.validate(ledgerA)));
-        BEAST_EXPECT(ValStatus::current == harness.add(b.validate(ledgerB)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(b.validate(ledgerB)));
 
         // Only a is trusted
         BEAST_EXPECT(harness.vals().currentTrusted().size() == 1);
@@ -479,7 +479,7 @@ class Validations_test : public beast::unit_test::suite
         harness.clock().advance(3s);
 
         for (auto const& node : {a, b})
-            BEAST_EXPECT(ValStatus::current == harness.add(node.validate(ledgerAC)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(node.validate(ledgerAC)));
 
         // New validation for a
         BEAST_EXPECT(harness.vals().currentTrusted().size() == 1);
@@ -506,7 +506,7 @@ class Validations_test : public beast::unit_test::suite
         b.untrust();
 
         for (auto const& node : {a, b})
-            BEAST_EXPECT(ValStatus::current == harness.add(node.validate(ledgerA)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(node.validate(ledgerA)));
 
         {
             hash_set<PeerID> const expectedKeys = {a.nodeID(), b.nodeID()};
@@ -520,7 +520,7 @@ class Validations_test : public beast::unit_test::suite
         b.advanceKey();
 
         for (auto const& node : {a, b})
-            BEAST_EXPECT(ValStatus::current == harness.add(node.partial(ledgerAC)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(node.partial(ledgerAC)));
 
         {
             hash_set<PeerID> const expectedKeys = {a.nodeID(), b.nodeID()};
@@ -602,19 +602,19 @@ class Validations_test : public beast::unit_test::suite
         for (auto const& node : {a, b, c})
         {
             auto const val = node.validate(ledgerA);
-            BEAST_EXPECT(ValStatus::current == harness.add(val));
+            BEAST_EXPECT(ValStatus::Current == harness.add(val));
             if (val.trusted())
                 trustedValidations[{val.ledgerID(), val.seq()}].emplace_back(val);
         }
         // d disagrees
         {
             auto const val = d.validate(ledgerB);
-            BEAST_EXPECT(ValStatus::current == harness.add(val));
+            BEAST_EXPECT(ValStatus::Current == harness.add(val));
             trustedValidations[{val.ledgerID(), val.seq()}].emplace_back(val);
         }
         // e only issues partials
         {
-            BEAST_EXPECT(ValStatus::current == harness.add(e.partial(ledgerA)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(e.partial(ledgerA)));
         }
 
         harness.clock().advance(5s);
@@ -622,18 +622,18 @@ class Validations_test : public beast::unit_test::suite
         for (auto const& node : {a, b, c})
         {
             auto const val = node.validate(ledgerAC);
-            BEAST_EXPECT(ValStatus::current == harness.add(val));
+            BEAST_EXPECT(ValStatus::Current == harness.add(val));
             if (val.trusted())
                 trustedValidations[{val.ledgerID(), val.seq()}].emplace_back(val);
         }
         // d now thinks ledger 1, but cannot re-issue a previously used seq
         // and attempting it should generate a conflict.
         {
-            BEAST_EXPECT(ValStatus::conflicting == harness.add(d.partial(ledgerA)));
+            BEAST_EXPECT(ValStatus::Conflicting == harness.add(d.partial(ledgerA)));
         }
         // e only issues partials
         {
-            BEAST_EXPECT(ValStatus::current == harness.add(e.partial(ledgerAC)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(e.partial(ledgerAC)));
         }
 
         compare();
@@ -648,12 +648,12 @@ class Validations_test : public beast::unit_test::suite
         LedgerHistoryHelper h;
         TestHarness harness(h.oracle);
         Node const a = harness.makeNode();
-        constexpr Ledger::Seq one(1);
-        constexpr Ledger::Seq two(2);
+        constexpr Ledger::Seq kONE(1);
+        constexpr Ledger::Seq kTWO(2);
 
         // simple cases
         Ledger const ledgerA = h["a"];
-        BEAST_EXPECT(ValStatus::current == harness.add(a.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerA)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerA.id()) == 1);
         harness.vals().expire(j);
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerA.id()) == 1);
@@ -663,14 +663,14 @@ class Validations_test : public beast::unit_test::suite
 
         // use setSeqToKeep to keep the validation from expire
         Ledger const ledgerB = h["ab"];
-        BEAST_EXPECT(ValStatus::current == harness.add(a.validate(ledgerB)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerB)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerB.id()) == 1);
-        harness.vals().setSeqToKeep(ledgerB.seq(), ledgerB.seq() + one);
+        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() + one, ledgerB.seq() + two);
+        harness.vals().setSeqToKeep(ledgerB.seq() + kONE, ledgerB.seq() + kTWO);
         // advance clock slowly
         int const loops =
             harness.parms().validationSET_EXPIRES / harness.parms().validationFRESHNESS + 1;
@@ -683,9 +683,9 @@ class Validations_test : public beast::unit_test::suite
 
         // Allow the validation with high seq to expire
         Ledger const ledgerC = h["abc"];
-        BEAST_EXPECT(ValStatus::current == harness.add(a.validate(ledgerC)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerC)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerC.id()) == 1);
-        harness.vals().setSeqToKeep(ledgerC.seq() - one, 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);
@@ -712,7 +712,7 @@ class Validations_test : public beast::unit_test::suite
         for (auto const& node : {trustedNode1, trustedNode2, notTrustedNode})
         {
             auto const val = node.validate(ledgerA);
-            BEAST_EXPECT(ValStatus::current == harness.add(val));
+            BEAST_EXPECT(ValStatus::Current == harness.add(val));
             expected.emplace(node.nodeID(), val);
         }
 
@@ -720,7 +720,7 @@ class Validations_test : public beast::unit_test::suite
         // map after setting the proper prior ledger ID it replaced
         harness.clock().advance(1s);
         auto newVal = trustedNode1.validate(ledgerAB);
-        BEAST_EXPECT(ValStatus::current == harness.add(newVal));
+        BEAST_EXPECT(ValStatus::Current == harness.add(newVal));
         expected.find(trustedNode1.nodeID())->second = newVal;
     }
 
@@ -752,7 +752,7 @@ class Validations_test : public beast::unit_test::suite
         BEAST_EXPECT(harness.vals().getPreferred(ledgerA) == std::nullopt);
 
         // Single ledger
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode1.validate(ledgerB)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode1.validate(ledgerB)));
         BEAST_EXPECT(harness.vals().getPreferred(ledgerA) == pref(ledgerB));
         BEAST_EXPECT(harness.vals().getPreferred(ledgerB) == pref(ledgerB));
 
@@ -761,14 +761,14 @@ class Validations_test : public beast::unit_test::suite
 
         // Untrusted doesn't impact preferred ledger
         // (ledgerB has tie-break over ledgerA)
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode2.validate(ledgerA)));
-        BEAST_EXPECT(ValStatus::current == harness.add(notTrustedNode.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode2.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(notTrustedNode.validate(ledgerA)));
         BEAST_EXPECT(ledgerB.id() > ledgerA.id());
         BEAST_EXPECT(harness.vals().getPreferred(ledgerA) == pref(ledgerB));
         BEAST_EXPECT(harness.vals().getPreferred(ledgerB) == pref(ledgerB));
 
         // Partial does break ties
-        BEAST_EXPECT(ValStatus::current == harness.add(trustedNode3.partial(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(trustedNode3.partial(ledgerA)));
         BEAST_EXPECT(harness.vals().getPreferred(ledgerA) == pref(ledgerA));
         BEAST_EXPECT(harness.vals().getPreferred(ledgerB) == pref(ledgerA));
 
@@ -776,7 +776,7 @@ class Validations_test : public beast::unit_test::suite
 
         // Parent of preferred-> stick with ledger
         for (auto const& node : {trustedNode1, trustedNode2, notTrustedNode, trustedNode3})
-            BEAST_EXPECT(ValStatus::current == harness.add(node.validate(ledgerAC)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(node.validate(ledgerAC)));
         // Parent of preferred stays put
         BEAST_EXPECT(harness.vals().getPreferred(ledgerA) == pref(ledgerA));
         // Earlier different chain, switch
@@ -787,7 +787,7 @@ class Validations_test : public beast::unit_test::suite
         // Any later grandchild or different chain is preferred
         harness.clock().advance(5s);
         for (auto const& node : {trustedNode1, trustedNode2, notTrustedNode, trustedNode3})
-            BEAST_EXPECT(ValStatus::current == harness.add(node.validate(ledgerACD)));
+            BEAST_EXPECT(ValStatus::Current == harness.add(node.validate(ledgerACD)));
         for (auto const& ledger : {ledgerA, ledgerB, ledgerACD})
             BEAST_EXPECT(harness.vals().getPreferred(ledger) == pref(ledgerACD));
     }
@@ -828,7 +828,7 @@ class Validations_test : public beast::unit_test::suite
         peerCounts[ledgerC.id()] += 1000;
 
         // Single trusted always wins over peer counts
-        BEAST_EXPECT(ValStatus::current == harness.add(a.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.validate(ledgerA)));
         BEAST_EXPECT(harness.vals().getPreferredLCL(ledgerA, Seq{0}, peerCounts) == ledgerA.id());
         BEAST_EXPECT(harness.vals().getPreferredLCL(ledgerB, Seq{0}, peerCounts) == ledgerA.id());
         BEAST_EXPECT(harness.vals().getPreferredLCL(ledgerC, Seq{0}, peerCounts) == ledgerA.id());
@@ -855,49 +855,49 @@ class Validations_test : public beast::unit_test::suite
         // Validate the ledger before it is actually available
         Validation const val = a.validate(ID{2}, Seq{2}, 0s, 0s, true);
 
-        BEAST_EXPECT(ValStatus::current == harness.add(val));
+        BEAST_EXPECT(ValStatus::Current == harness.add(val));
         // Validation is available
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ID{2}) == 1);
         // but ledger based data is not
-        BEAST_EXPECT(harness.vals().getNodesAfter(genesisLedger, ID{0}) == 0);
+        BEAST_EXPECT(harness.vals().getNodesAfter(genesisLedger_, ID{0}) == 0);
         // Initial preferred branch falls back to the ledger we are trying to
         // acquire
-        BEAST_EXPECT(harness.vals().getPreferred(genesisLedger) == std::make_pair(Seq{2}, ID{2}));
+        BEAST_EXPECT(harness.vals().getPreferred(genesisLedger_) == std::make_pair(Seq{2}, ID{2}));
 
         // After adding another unavailable validation, the preferred ledger
         // breaks ties via higher ID
-        BEAST_EXPECT(ValStatus::current == harness.add(b.validate(ID{3}, Seq{2}, 0s, 0s, true)));
-        BEAST_EXPECT(harness.vals().getPreferred(genesisLedger) == std::make_pair(Seq{2}, ID{3}));
+        BEAST_EXPECT(ValStatus::Current == harness.add(b.validate(ID{3}, Seq{2}, 0s, 0s, true)));
+        BEAST_EXPECT(harness.vals().getPreferred(genesisLedger_) == std::make_pair(Seq{2}, ID{3}));
 
         // Create the ledger
         Ledger const ledgerAB = h["ab"];
         // Now it should be available
-        BEAST_EXPECT(harness.vals().getNodesAfter(genesisLedger, ID{0}) == 1);
+        BEAST_EXPECT(harness.vals().getNodesAfter(genesisLedger_, ID{0}) == 1);
 
         // Create a validation that is not available
         harness.clock().advance(5s);
         Validation const val2 = a.validate(ID{4}, Seq{4}, 0s, 0s, true);
-        BEAST_EXPECT(ValStatus::current == harness.add(val2));
+        BEAST_EXPECT(ValStatus::Current == harness.add(val2));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ID{4}) == 1);
         BEAST_EXPECT(
-            harness.vals().getPreferred(genesisLedger) ==
+            harness.vals().getPreferred(genesisLedger_) ==
             std::make_pair(ledgerAB.seq(), ledgerAB.id()));
 
         // Another node requesting that ledger still doesn't change things
         Validation const val3 = b.validate(ID{4}, Seq{4}, 0s, 0s, true);
-        BEAST_EXPECT(ValStatus::current == harness.add(val3));
+        BEAST_EXPECT(ValStatus::Current == harness.add(val3));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ID{4}) == 2);
         BEAST_EXPECT(
-            harness.vals().getPreferred(genesisLedger) ==
+            harness.vals().getPreferred(genesisLedger_) ==
             std::make_pair(ledgerAB.seq(), ledgerAB.id()));
 
         // Switch to validation that is available
         harness.clock().advance(5s);
         Ledger const ledgerABCDE = h["abcde"];
-        BEAST_EXPECT(ValStatus::current == harness.add(a.partial(ledgerABCDE)));
-        BEAST_EXPECT(ValStatus::current == harness.add(b.partial(ledgerABCDE)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.partial(ledgerABCDE)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(b.partial(ledgerABCDE)));
         BEAST_EXPECT(
-            harness.vals().getPreferred(genesisLedger) ==
+            harness.vals().getPreferred(genesisLedger_) ==
             std::make_pair(ledgerABCDE.seq(), ledgerABCDE.id()));
     }
 
@@ -911,10 +911,10 @@ class Validations_test : public beast::unit_test::suite
         Node const b = harness.makeNode();
         Ledger const ledgerA = h["a"];
 
-        BEAST_EXPECT(ValStatus::current == harness.add(a.partial(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(a.partial(ledgerA)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerA.id()) == 0);
 
-        BEAST_EXPECT(ValStatus::current == harness.add(b.validate(ledgerA)));
+        BEAST_EXPECT(ValStatus::Current == harness.add(b.validate(ledgerA)));
         BEAST_EXPECT(harness.vals().numTrustedForLedger(ledgerA.id()) == 1);
     }
 
@@ -925,7 +925,7 @@ class Validations_test : public beast::unit_test::suite
         using Seq = Ledger::Seq;
         using namespace std::chrono;
 
-        beast::manual_clock<steady_clock> clock;
+        beast::ManualClock<steady_clock> clock;
         SeqEnforcer<Seq> enforcer;
 
         ValidationParms const p;
@@ -951,20 +951,21 @@ class Validations_test : public beast::unit_test::suite
                            hash_set<PeerID> const& listed,
                            std::vector<Validation> const& trustedVals) {
             Ledger::ID const testID =
-                trustedVals.empty() ? this->genesisLedger.id() : trustedVals[0].ledgerID();
+                trustedVals.empty() ? this->genesisLedger_.id() : trustedVals[0].ledgerID();
             Ledger::Seq const testSeq =
-                trustedVals.empty() ? this->genesisLedger.seq() : trustedVals[0].seq();
+                trustedVals.empty() ? this->genesisLedger_.seq() : trustedVals[0].seq();
             BEAST_EXPECT(vals.currentTrusted() == trustedVals);
             BEAST_EXPECT(vals.getCurrentNodeIDs() == listed);
             BEAST_EXPECT(
-                vals.getNodesAfter(this->genesisLedger, genesisLedger.id()) == trustedVals.size());
+                vals.getNodesAfter(this->genesisLedger_, genesisLedger_.id()) ==
+                trustedVals.size());
             if (trustedVals.empty())
             {
-                BEAST_EXPECT(vals.getPreferred(this->genesisLedger) == std::nullopt);
+                BEAST_EXPECT(vals.getPreferred(this->genesisLedger_) == std::nullopt);
             }
             else
             {
-                BEAST_EXPECT(vals.getPreferred(this->genesisLedger)->second == testID);
+                BEAST_EXPECT(vals.getPreferred(this->genesisLedger_)->second == testID);
             }
             BEAST_EXPECT(vals.getTrustedForLedger(testID, testSeq) == trustedVals);
             BEAST_EXPECT(vals.numTrustedForLedger(testID) == trustedVals.size());
@@ -977,7 +978,7 @@ class Validations_test : public beast::unit_test::suite
             Node const a = harness.makeNode();
             Ledger const ledgerAB = h["ab"];
             Validation const v = a.validate(ledgerAB);
-            BEAST_EXPECT(ValStatus::current == harness.add(v));
+            BEAST_EXPECT(ValStatus::Current == harness.add(v));
 
             hash_set<PeerID> const listed({a.nodeID()});
             std::vector<Validation> trustedVals({v});
@@ -996,7 +997,7 @@ class Validations_test : public beast::unit_test::suite
             a.untrust();
             Ledger const ledgerAB = h["ab"];
             Validation const v = a.validate(ledgerAB);
-            BEAST_EXPECT(ValStatus::current == harness.add(v));
+            BEAST_EXPECT(ValStatus::Current == harness.add(v));
 
             hash_set<PeerID> const listed({a.nodeID()});
             std::vector<Validation> trustedVals;
@@ -1013,7 +1014,7 @@ class Validations_test : public beast::unit_test::suite
             TestHarness harness(h.oracle);
             Node const a = harness.makeNode();
             Validation const v = a.validate(Ledger::ID{2}, Ledger::Seq{2}, 0s, 0s, true);
-            BEAST_EXPECT(ValStatus::current == harness.add(v));
+            BEAST_EXPECT(ValStatus::Current == harness.add(v));
 
             hash_set<PeerID> const listed({a.nodeID()});
             std::vector<Validation> trustedVals({v});
@@ -1021,16 +1022,16 @@ class Validations_test : public beast::unit_test::suite
             BEAST_EXPECT(vals.currentTrusted() == trustedVals);
 
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            BEAST_EXPECT(vals.getPreferred(genesisLedger)->second == v.ledgerID());
-            BEAST_EXPECT(vals.getNodesAfter(genesisLedger, genesisLedger.id()) == 0);
+            BEAST_EXPECT(vals.getPreferred(genesisLedger_)->second == v.ledgerID());
+            BEAST_EXPECT(vals.getNodesAfter(genesisLedger_, genesisLedger_.id()) == 0);
 
             trustedVals.clear();
             harness.vals().trustChanged({}, {a.nodeID()});
             // make acquiring ledger available
             h["ab"];
             BEAST_EXPECT(vals.currentTrusted() == trustedVals);
-            BEAST_EXPECT(vals.getPreferred(genesisLedger) == std::nullopt);
-            BEAST_EXPECT(vals.getNodesAfter(genesisLedger, genesisLedger.id()) == 0);
+            BEAST_EXPECT(vals.getPreferred(genesisLedger_) == std::nullopt);
+            BEAST_EXPECT(vals.getNodesAfter(genesisLedger_, genesisLedger_.id()) == 0);
         }
     }
 
diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp
index d8e95a1dda..d859c71520 100644
--- a/src/test/core/ClosureCounter_test.cpp
+++ b/src/test/core/ClosureCounter_test.cpp
@@ -14,12 +14,12 @@ namespace xrpl::test {
 
 //------------------------------------------------------------------------------
 
-class ClosureCounter_test : public beast::unit_test::suite
+class ClosureCounter_test : public beast::unit_test::Suite
 {
     // We're only using Env for its Journal.  That Journal gives better
     // coverage in unit tests.
-    test::jtx::Env env_{*this, jtx::envconfig(), nullptr, beast::severities::kDisabled};
-    beast::Journal j{env_.app().getJournal("ClosureCounter_test")};
+    test::jtx::Env env_{*this, jtx::envconfig(), nullptr, beast::severities::KDisabled};
+    beast::Journal j_{env_.app().getJournal("ClosureCounter_test")};
 
     void
     testConstruction()
@@ -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 none 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.
@@ -259,7 +259,7 @@ class ClosureCounter_test : public beast::unit_test::suite
 
         // Join with 0 count should not stall.
         using namespace std::chrono_literals;
-        voidCounter.join("testWrap", 1ms, j);
+        voidCounter.join("testWrap", 1ms, j_);
 
         // Wrapping a closure after join() should return std::nullopt.
         BEAST_EXPECT(voidCounter.wrap([]() {}) == std::nullopt);
@@ -280,7 +280,7 @@ class ClosureCounter_test : public beast::unit_test::suite
         std::thread localThread([&voidCounter, &threadExited, this]() {
             // Should stall after calling join.
             using namespace std::chrono_literals;
-            voidCounter.join("testWaitOnJoin", 1ms, j);
+            voidCounter.join("testWaitOnJoin", 1ms, j_);
             threadExited.store(true);
         });
 
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index 33ee5aa5ee..95f277212d 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 configContentsTemplate(R"xrpldConfig(
+    static boost::format kCONFIG_CONTENTS_TEMPLATE(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(configContentsTemplate % dbPathSection % valFileSection);
+    return boost::str(kCONFIG_CONTENTS_TEMPLATE % dbPathSection % valFileSection);
 }
 
 /**
@@ -137,7 +137,7 @@ private:
 
 public:
     FileCfgGuard(
-        beast::unit_test::suite& test,
+        beast::unit_test::Suite& test,
         path subDir,
         path const& dbPath,
         path const& configFile,
@@ -154,7 +154,7 @@ public:
         , dataDir_(dbPath)
     {
         if (dbPath.empty())
-            dataDir_ = subdir() / path(Config::databaseDirName);
+            dataDir_ = subdir() / path(Config::kDATABASE_DIR_NAME);
 
         rmDataDir_ = !exists(dataDir_);
         config_.setup(
@@ -241,14 +241,14 @@ class ValidatorsTxtGuard : public detail::FileDirGuard
 {
 public:
     ValidatorsTxtGuard(
-        beast::unit_test::suite& test,
+        beast::unit_test::Suite& test,
         path subDir,
         path const& validatorsFileName,
         bool useCounter = true)
         : FileDirGuard(
               test,
               std::move(subDir),
-              path(validatorsFileName.empty() ? Config::validatorsFileName : validatorsFileName),
+              path(validatorsFileName.empty() ? Config::kVALIDATORS_FILE_NAME : validatorsFileName),
               valFileContents(),
               useCounter)
     {
@@ -313,13 +313,14 @@ port_wss_admin
         auto const cwd = current_path();
 
         // Test both config file names.
-        std::string_view const configFiles[] = {Config::configFileName, Config::configLegacyName};
+        std::string_view const configFiles[] = {
+            Config::kCONFIG_FILE_NAME, Config::kCONFIG_LEGACY_NAME};
 
         // Config file in current directory.
         for (auto const& configFile : configFiles)
         {
             // Use a temporary directory for testing.
-            beast::temp_dir const td;
+            beast::TempDir const td;
             current_path(td.path());
             path const f = td.file(std::string{configFile});
             std::ofstream o(f.string());
@@ -341,13 +342,13 @@ port_wss_admin
         {
             // Point the current working directory to a temporary directory, so
             // we don't pick up an actual config file from the repository root.
-            beast::temp_dir const td;
+            beast::TempDir const td;
             current_path(td.path());
 
             // The XDG config directory is set: the config file must be in a
             // subdirectory named after the system.
             {
-                beast::temp_dir const tc;
+                beast::TempDir const tc;
 
                 // Set the HOME and XDG_CONFIG_HOME environment variables. The
                 // HOME variable is not used when XDG_CONFIG_HOME is set, but
@@ -381,7 +382,7 @@ port_wss_admin
             // The XDG config directory is not set: the config file must be in a
             // subdirectory named .config followed by the system name.
             {
-                beast::temp_dir const tc;
+                beast::TempDir const tc;
 
                 // Set only the HOME environment variable.
                 char const* h = getenv("HOME");
@@ -460,7 +461,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::configFileName, "", false);
+                *this, g0.subdir(), dataDirAbs, Config::kCONFIG_FILE_NAME, "", false);
             auto const& c(g.config());
             BEAST_EXPECT(g.dataDirExists());
             BEAST_EXPECT(g.configFileExists());
@@ -469,7 +470,7 @@ port_wss_admin
         {
             // read from file relative path
             std::string const dbPath("my_db");
-            detail::FileCfgGuard const g(*this, "test_db", dbPath, Config::configFileName, "");
+            detail::FileCfgGuard const g(*this, "test_db", dbPath, Config::kCONFIG_FILE_NAME, "");
             auto const& c(g.config());
             std::string const nativeDbPath = absolute(path(dbPath)).string();
             BEAST_EXPECT(g.dataDirExists());
@@ -478,10 +479,10 @@ port_wss_admin
         }
         {
             // read from file no path
-            detail::FileCfgGuard const g(*this, "test_db", "", Config::configFileName, "");
+            detail::FileCfgGuard const g(*this, "test_db", "", Config::kCONFIG_FILE_NAME, "");
             auto const& c(g.config());
             std::string const nativeDbPath =
-                absolute(g.subdir() / path(Config::databaseDirName)).string();
+                absolute(g.subdir() / path(Config::kDATABASE_DIR_NAME)).string();
             BEAST_EXPECT(g.dataDirExists());
             BEAST_EXPECT(g.configFileExists());
             BEAST_EXPECT(c.legacy("database_path") == nativeDbPath);
@@ -508,7 +509,7 @@ port_wss_admin
 
         {
             Config c;
-            static boost::format configTemplate(R"xrpldConfig(
+            static boost::format kCONFIG_TEMPLATE(R"xrpldConfig(
 [validation_seed]
 %1%
 
@@ -521,7 +522,7 @@ port_wss_admin
                 "and [validator_token] config sections";
             try
             {
-                c.loadFromString(boost::str(configTemplate % validationSeed % token));
+                c.loadFromString(boost::str(kCONFIG_TEMPLATE % validationSeed % token));
             }
             catch (std::runtime_error const& e)
             {
@@ -844,7 +845,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::configFileName, valFileName, false);
+                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, valFileName, false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -861,7 +862,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::configFileName, valFilePath, false);
+                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, valFilePath, false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -876,7 +877,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::configFileName, "", false);
+                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, "", false);
             BEAST_EXPECT(vtg.validatorsFileExists());
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
@@ -896,7 +897,7 @@ trust-these-validators.gov
                 *this, vtg.subdir(), "validators.txt", false);
             BEAST_EXPECT(vtgDefault.validatorsFileExists());
             detail::FileCfgGuard const rcg(
-                *this, vtg.subdir(), "", Config::configFileName, vtg.validatorsFile(), false);
+                *this, vtg.subdir(), "", Config::kCONFIG_FILE_NAME, vtg.validatorsFile(), false);
             BEAST_EXPECT(rcg.configFileExists());
             auto const& c(rcg.config());
             BEAST_EXPECT(c.legacy("validators_file") == vtg.validatorsFile());
@@ -1002,7 +1003,7 @@ trust-these-validators.gov
     testSetup(bool explicitPath)
     {
         detail::FileCfgGuard const cfg(
-            *this, "testSetup", explicitPath ? "test_db" : "", Config::configFileName, "");
+            *this, "testSetup", explicitPath ? "test_db" : "", Config::kCONFIG_FILE_NAME, "");
         /* 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.
@@ -1116,18 +1117,18 @@ trust-these-validators.gov
     void
     testPort()
     {
-        detail::FileCfgGuard const cfg(*this, "testPort", "", Config::configFileName, "");
+        detail::FileCfgGuard const cfg(*this, "testPort", "", Config::kCONFIG_FILE_NAME, "");
         auto const& conf = cfg.config();
         if (!BEAST_EXPECT(conf.exists("port_rpc")))
             return;
         if (!BEAST_EXPECT(conf.exists("port_wss_admin")))
             return;
         ParsedPort rpc;
-        if (!unexcept([&]() { parse_Port(rpc, conf["port_rpc"], log); }))
+        if (!unexcept([&]() { parsePort(rpc, conf["port_rpc"], log); }))
             return;
         BEAST_EXPECT(rpc.admin_nets_v4.size() + rpc.admin_nets_v6.size() == 2);
         ParsedPort wss;
-        if (!unexcept([&]() { parse_Port(wss, conf["port_wss_admin"], log); }))
+        if (!unexcept([&]() { parsePort(wss, conf["port_wss_admin"], log); }))
             return;
         BEAST_EXPECT(wss.admin_nets_v4.size() + wss.admin_nets_v6.size() == 1);
     }
@@ -1141,7 +1142,7 @@ trust-these-validators.gov
         try
         {
             detail::FileCfgGuard const cfg(
-                *this, "testPort", "", Config::configFileName, "", true, contents);
+                *this, "testPort", "", Config::kCONFIG_FILE_NAME, "", true, contents);
             BEAST_EXPECT(false);
         }
         catch (std::exception const& ex)
@@ -1318,7 +1319,7 @@ r.ripple.com:51235
         {
             Section s;
             s.append(std::string(t.line));
-            BEAST_EXPECT(s.had_trailing_comments() == t.had_comment);
+            BEAST_EXPECT(s.hadTrailingComments() == t.had_comment);
             if (t.field.empty())
             {
                 BEAST_EXPECTS(s.legacy() == t.expect, s.legacy());
@@ -1361,65 +1362,65 @@ r.ripple.com:51235
         s.append("bool_ish = 1");
 
         {
-            auto val_1 = "value 1"s;
-            BEAST_EXPECT(set(val_1, "a_string", s));
-            BEAST_EXPECT(val_1 == "mystring");
+            auto val1 = "value 1"s;
+            BEAST_EXPECT(set(val1, "a_string", s));
+            BEAST_EXPECT(val1 == "mystring");
 
-            auto val_2 = "value 2"s;
-            BEAST_EXPECT(!set(val_2, "not_a_key", s));
-            BEAST_EXPECT(val_2 == "value 2");
-            BEAST_EXPECT(!set(val_2, "default"s, "not_a_key", s));
-            BEAST_EXPECT(val_2 == "default");
+            auto val2 = "value 2"s;
+            BEAST_EXPECT(!set(val2, "not_a_key", s));
+            BEAST_EXPECT(val2 == "value 2");
+            BEAST_EXPECT(!set(val2, "default"s, "not_a_key", s));
+            BEAST_EXPECT(val2 == "default");
 
-            auto val_3 = get<std::string>(s, "a_string");
-            BEAST_EXPECT(val_3 == "mystring");
-            auto val_4 = get<std::string>(s, "not_a_key");
-            BEAST_EXPECT(val_4.empty());
-            auto val_5 = get<std::string>(s, "not_a_key", "default");
-            BEAST_EXPECT(val_5 == "default");
+            auto val3 = get<std::string>(s, "a_string");
+            BEAST_EXPECT(val3 == "mystring");
+            auto val4 = get<std::string>(s, "not_a_key");
+            BEAST_EXPECT(val4.empty());
+            auto val5 = get<std::string>(s, "not_a_key", "default");
+            BEAST_EXPECT(val5 == "default");
 
-            auto val_6 = "value 6"s;
-            BEAST_EXPECT(get_if_exists(s, "a_string", val_6));
-            BEAST_EXPECT(val_6 == "mystring");
+            auto val6 = "value 6"s;
+            BEAST_EXPECT(getIfExists(s, "a_string", val6));
+            BEAST_EXPECT(val6 == "mystring");
 
-            auto val_7 = "value 7"s;
-            BEAST_EXPECT(!get_if_exists(s, "not_a_key", val_7));
-            BEAST_EXPECT(val_7 == "value 7");
+            auto val7 = "value 7"s;
+            BEAST_EXPECT(!getIfExists(s, "not_a_key", val7));
+            BEAST_EXPECT(val7 == "value 7");
         }
 
         {
-            int val_1 = 1;
-            BEAST_EXPECT(set(val_1, "positive_int", s));
-            BEAST_EXPECT(val_1 == 2);
+            int val1 = 1;
+            BEAST_EXPECT(set(val1, "positive_int", s));
+            BEAST_EXPECT(val1 == 2);
 
-            int val_2 = 2;
-            BEAST_EXPECT(set(val_2, "negative_int", s));
-            BEAST_EXPECT(val_2 == -3);
+            int val2 = 2;
+            BEAST_EXPECT(set(val2, "negative_int", s));
+            BEAST_EXPECT(val2 == -3);
 
-            int val_3 = 3;
-            BEAST_EXPECT(!set(val_3, "a_string", s));
-            BEAST_EXPECT(val_3 == 3);
+            int val3 = 3;
+            BEAST_EXPECT(!set(val3, "a_string", s));
+            BEAST_EXPECT(val3 == 3);
 
-            auto val_4 = get<int>(s, "positive_int");
-            BEAST_EXPECT(val_4 == 2);
-            auto val_5 = get<int>(s, "not_a_key");
-            BEAST_EXPECT(val_5 == 0);
-            auto val_6 = get<int>(s, "not_a_key", 5);
-            BEAST_EXPECT(val_6 == 5);
-            auto val_7 = get<int>(s, "a_string", 6);
-            BEAST_EXPECT(val_7 == 6);
+            auto val4 = get<int>(s, "positive_int");
+            BEAST_EXPECT(val4 == 2);
+            auto val5 = get<int>(s, "not_a_key");
+            BEAST_EXPECT(val5 == 0);
+            auto val6 = get<int>(s, "not_a_key", 5);
+            BEAST_EXPECT(val6 == 5);
+            auto val7 = get<int>(s, "a_string", 6);
+            BEAST_EXPECT(val7 == 6);
 
-            int val_8 = 8;
-            BEAST_EXPECT(get_if_exists(s, "positive_int", val_8));
-            BEAST_EXPECT(val_8 == 2);
+            int val8 = 8;
+            BEAST_EXPECT(getIfExists(s, "positive_int", val8));
+            BEAST_EXPECT(val8 == 2);
 
-            auto val_9 = 9;
-            BEAST_EXPECT(!get_if_exists(s, "not_a_key", val_9));
-            BEAST_EXPECT(val_9 == 9);
+            auto val9 = 9;
+            BEAST_EXPECT(!getIfExists(s, "not_a_key", val9));
+            BEAST_EXPECT(val9 == 9);
 
-            auto val_10 = 10;
-            BEAST_EXPECT(!get_if_exists(s, "a_string", val_10));
-            BEAST_EXPECT(val_10 == 10);
+            auto val10 = 10;
+            BEAST_EXPECT(!getIfExists(s, "a_string", val10));
+            BEAST_EXPECT(val10 == 10);
 
             BEAST_EXPECT(s.get<int>("not_a_key") == std::nullopt);
             try
@@ -1434,13 +1435,13 @@ r.ripple.com:51235
         }
 
         {
-            bool flag_1 = false;
-            BEAST_EXPECT(get_if_exists(s, "bool_ish", flag_1));
-            BEAST_EXPECT(flag_1 == true);
+            bool flag1 = false;
+            BEAST_EXPECT(getIfExists(s, "bool_ish", flag1));
+            BEAST_EXPECT(flag1 == true);
 
-            bool flag_2 = false;
-            BEAST_EXPECT(!get_if_exists(s, "not_a_key", flag_2));
-            BEAST_EXPECT(flag_2 == false);
+            bool flag2 = false;
+            BEAST_EXPECT(!getIfExists(s, "not_a_key", flag2));
+            BEAST_EXPECT(flag2 == false);
         }
     }
 
diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp
index 9696451f6a..103191ec59 100644
--- a/src/test/core/Coroutine_test.cpp
+++ b/src/test/core/Coroutine_test.cpp
@@ -17,10 +17,10 @@
 
 namespace xrpl::test {
 
-class Coroutine_test : public beast::unit_test::suite
+class Coroutine_test : public beast::unit_test::Suite
 {
 public:
-    class gate
+    class Gate
     {
     private:
         std::condition_variable cv_;
@@ -32,10 +32,10 @@ public:
         // Returns `true` if signaled.
         template <class Rep, class Period>
         bool
-        wait_for(std::chrono::duration<Rep, Period> const& rel_time)
+        waitFor(std::chrono::duration<Rep, Period> const& relTime)
         {
             std::unique_lock<std::mutex> lk(mutex_);
-            auto b = cv_.wait_for(lk, rel_time, [this] { return signaled_; });
+            auto b = cv_.wait_for(lk, relTime, [this] { return signaled_; });
             signaled_ = false;
             return b;
         }
@@ -50,7 +50,7 @@ public:
     };
 
     void
-    correct_order()
+    correctOrder()
     {
         using namespace std::chrono_literals;
         using namespace jtx;
@@ -62,22 +62,22 @@ public:
             return cfg;
         }));
 
-        gate g1, g2;
+        Gate g1, g2;
         std::shared_ptr<JobQueue::Coro> c;
-        env.app().getJobQueue().postCoro(jtCLIENT, "CoroTest", [&](auto const& cr) {
+        env.app().getJobQueue().postCoro(JtClient, "CoroTest", [&](auto const& cr) {
             c = cr;
             g1.signal();
             c->yield();
             g2.signal();
         });
-        BEAST_EXPECT(g1.wait_for(5s));
+        BEAST_EXPECT(g1.waitFor(5s));
         c->join();
         c->post();
-        BEAST_EXPECT(g2.wait_for(5s));
+        BEAST_EXPECT(g2.waitFor(5s));
     }
 
     void
-    incorrect_order()
+    incorrectOrder()
     {
         using namespace std::chrono_literals;
         using namespace jtx;
@@ -89,17 +89,17 @@ public:
             return cfg;
         }));
 
-        gate g;
-        env.app().getJobQueue().postCoro(jtCLIENT, "CoroTest", [&](auto const& c) {
+        Gate g;
+        env.app().getJobQueue().postCoro(JtClient, "CoroTest", [&](auto const& c) {
             c->post();
             c->yield();
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
     }
 
     void
-    thread_specific_storage()
+    threadSpecificStorage()
     {
         using namespace std::chrono_literals;
         using namespace jtx;
@@ -109,25 +109,25 @@ public:
 
         auto& jq = env.app().getJobQueue();
 
-        static int const N = 4;
-        std::array<std::shared_ptr<JobQueue::Coro>, N> a;
+        static int const kN = 4;
+        std::array<std::shared_ptr<JobQueue::Coro>, kN> a;
 
         LocalValue<int> lv(-1);
         BEAST_EXPECT(*lv == -1);
 
-        gate g;
-        jq.addJob(jtCLIENT, "LocalValTest", [&]() {
+        Gate g;
+        jq.addJob(JtClient, "LocalValTest", [&]() {
             this->BEAST_EXPECT(*lv == -1);
             *lv = -2;
             this->BEAST_EXPECT(*lv == -2);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(*lv == -1);
 
-        for (int i = 0; i < N; ++i)
+        for (int i = 0; i < kN; ++i)
         {
-            jq.postCoro(jtCLIENT, "CoroTest", [&, id = i](auto const& c) {
+            jq.postCoro(JtClient, "CoroTest", [&, id = i](auto const& c) {
                 a[id] = c;
                 g.signal();
                 c->yield();
@@ -140,13 +140,13 @@ public:
 
                 this->BEAST_EXPECT(*lv == id);
             });
-            BEAST_EXPECT(g.wait_for(5s));
+            BEAST_EXPECT(g.waitFor(5s));
             a[i]->join();
         }
         for (auto const& c : a)
         {
             c->post();
-            BEAST_EXPECT(g.wait_for(5s));
+            BEAST_EXPECT(g.waitFor(5s));
             c->join();
         }
         for (auto const& c : a)
@@ -155,20 +155,20 @@ public:
             c->join();
         }
 
-        jq.addJob(jtCLIENT, "LocalValTest", [&]() {
+        jq.addJob(JtClient, "LocalValTest", [&]() {
             this->BEAST_EXPECT(*lv == -2);
             g.signal();
         });
-        BEAST_EXPECT(g.wait_for(5s));
+        BEAST_EXPECT(g.waitFor(5s));
         BEAST_EXPECT(*lv == -1);
     }
 
     void
     run() override
     {
-        correct_order();
-        incorrect_order();
-        thread_specific_storage();
+        correctOrder();
+        incorrectOrder();
+        threadSpecificStorage();
     }
 };
 
diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index 8163c7b057..aa6a0d60a8 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -11,7 +11,7 @@ namespace xrpl::test {
 
 //------------------------------------------------------------------------------
 
-class JobQueue_test : public beast::unit_test::suite
+class JobQueue_test : public beast::unit_test::Suite
 {
     void
     testAddJob()
@@ -23,7 +23,7 @@ class JobQueue_test : public beast::unit_test::suite
             // addJob() should run the Job (and return true).
             std::atomic<bool> jobRan{false};
             BEAST_EXPECT(
-                jQueue.addJob(jtCLIENT, "JobAddTest1", [&jobRan]() { jobRan = true; }) == true);
+                jQueue.addJob(JtClient, "JobAddTest1", [&jobRan]() { jobRan = true; }) == true);
 
             // Wait for the Job to run.
             while (!jobRan)
@@ -40,7 +40,7 @@ class JobQueue_test : public beast::unit_test::suite
             // unprotected variable on the stack should be completely safe.
             // Not recommended for the faint of heart...
             bool unprotected = false;
-            BEAST_EXPECT(jQueue.addJob(jtCLIENT, "JobAddTest2", [&unprotected]() {
+            BEAST_EXPECT(jQueue.addJob(JtClient, "JobAddTest2", [&unprotected]() {
                 unprotected = false;
             }) == false);
         }
@@ -56,7 +56,7 @@ class JobQueue_test : public beast::unit_test::suite
             // Test repeated post()s until the Coro completes.
             std::atomic<int> yieldCount{0};
             auto const coro = jQueue.postCoro(
-                jtCLIENT,
+                JtClient,
                 "PostCoroTest1",
                 [&yieldCount](std::shared_ptr<JobQueue::Coro> const& coroCopy) {
                     while (++yieldCount < 4)
@@ -85,7 +85,7 @@ class JobQueue_test : public beast::unit_test::suite
             // Test repeated resume()s until the Coro completes.
             int yieldCount{0};
             auto const coro = jQueue.postCoro(
-                jtCLIENT,
+                JtClient,
                 "PostCoroTest2",
                 [&yieldCount](std::shared_ptr<JobQueue::Coro> const& coroCopy) {
                     while (++yieldCount < 4)
@@ -123,7 +123,7 @@ class JobQueue_test : public beast::unit_test::suite
             // Not recommended for the faint of heart...
             bool unprotected = false;
             auto const coro = jQueue.postCoro(
-                jtCLIENT, "PostCoroTest3", [&unprotected](std::shared_ptr<JobQueue::Coro> const&) {
+                JtClient, "PostCoroTest3", [&unprotected](std::shared_ptr<JobQueue::Coro> const&) {
                     unprotected = false;
                 });
             BEAST_EXPECT(coro == nullptr);
diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp
index e8a9f21816..fe3820b84a 100644
--- a/src/test/core/Workers_test.cpp
+++ b/src/test/core/Workers_test.cpp
@@ -54,16 +54,16 @@ class PerfLogTest : public PerfLog
     {
     }
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     countersJson() const override
     {
-        return Json::Value();
+        return json::Value();
     }
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     currentJson() const override
     {
-        return Json::Value();
+        return json::Value();
     }
 
     void
@@ -81,7 +81,7 @@ class PerfLogTest : public PerfLog
 
 //------------------------------------------------------------------------------
 
-class Workers_test : public beast::unit_test::suite
+class Workers_test : public beast::unit_test::Suite
 {
 public:
     struct TestCallback : Workers::Callback
diff --git a/src/test/csf/BasicNetwork.h b/src/test/csf/BasicNetwork.h
index 8fb48ca97d..e1d519b30b 100644
--- a/src/test/csf/BasicNetwork.h
+++ b/src/test/csf/BasicNetwork.h
@@ -31,11 +31,11 @@ namespace xrpl::test::csf {
     When creating the Peer set, the caller needs to provide a
     Scheduler object for managing the timing and delivery
     of messages. After constructing the network, and establishing
-    connections, the caller uses the scheduler's step_* functions
+    connections, the caller uses the scheduler's step* functions
     to drive messages through the network.
 
     The graph of peers and connections is internally represented
-    using Digraph<Peer,BasicNetwork::link_type>. Clients have
+    using Digraph<Peer,BasicNetwork::LinkType>. Clients have
     const access to that graph to perform additional operations not
     directly provided by BasicNetwork.
 
@@ -68,20 +68,20 @@ class BasicNetwork
 
     using time_point = typename clock_type::time_point;
 
-    struct link_type
+    struct LinkType
     {
         bool inbound = false;
         duration delay{};
         time_point established;
-        link_type() = default;
-        link_type(bool inbound_, duration delay_, time_point established_)
-            : inbound(inbound_), delay(delay_), established(established_)
+        LinkType() = default;
+        LinkType(bool inbound, duration delay, time_point established)
+            : inbound(inbound), delay(delay), established(established)
         {
         }
     };
 
-    Scheduler& scheduler;
-    Digraph<Peer, link_type> links_;
+    Scheduler& scheduler_;
+    Digraph<Peer, LinkType> links_;
 
 public:
     BasicNetwork(BasicNetwork const&) = delete;
@@ -164,7 +164,7 @@ public:
 
     /** Return the underlying digraph
      */
-    [[nodiscard]] Digraph<Peer, link_type> const&
+    [[nodiscard]] Digraph<Peer, LinkType> const&
     graph() const
     {
         return links_;
@@ -172,7 +172,7 @@ public:
 };
 //------------------------------------------------------------------------------
 template <class Peer>
-BasicNetwork<Peer>::BasicNetwork(Scheduler& s) : scheduler(s)
+BasicNetwork<Peer>::BasicNetwork(Scheduler& s) : scheduler_(s)
 {
 }
 
@@ -182,10 +182,10 @@ BasicNetwork<Peer>::connect(Peer const& from, Peer const& to, duration const& de
 {
     if (to == from)
         return false;
-    time_point const now = scheduler.now();
-    if (!links_.connect(from, to, link_type{false, delay, now}))
+    time_point const now = scheduler_.now();
+    if (!links_.connect(from, to, LinkType{false, delay, now}))
         return false;
-    auto const result = links_.connect(to, from, link_type{true, delay, now});
+    auto const result = links_.connect(to, from, LinkType{true, delay, now});
     (void)result;
     assert(result);
     return true;
@@ -211,8 +211,8 @@ BasicNetwork<Peer>::send(Peer const& from, Peer const& to, Function&& f)
     auto link = links_.edge(from, to);
     if (!link)
         return;
-    time_point const sent = scheduler.now();
-    scheduler.in(link->delay, [from, to, sent, f = std::forward<Function>(f), this] {
+    time_point const sent = scheduler_.now();
+    scheduler_.in(link->delay, [from, to, sent, f = std::forward<Function>(f), this] {
         // only process if still connected and connection was
         // not broken since the message was sent
         if (auto l = links_.edge(from, to); l && l->established <= sent)
diff --git a/src/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp
index d81638c214..22f52a1b63 100644
--- a/src/test/csf/BasicNetwork_test.cpp
+++ b/src/test/csf/BasicNetwork_test.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl::test {
 
-class BasicNetwork_test : public beast::unit_test::suite
+class BasicNetwork_test : public beast::unit_test::Suite
 {
 public:
     struct Peer
@@ -19,7 +19,7 @@ public:
         Peer(Peer const&) = default;
         Peer(Peer&&) = default;
 
-        explicit Peer(int id_) : id(id_)
+        explicit Peer(int id) : id(id)
         {
         }
 
@@ -77,11 +77,11 @@ public:
         BEAST_EXPECT(!net.connect(&pv[0], &pv[1]));
         for (auto& peer : pv)
             peer.start(scheduler, net);
-        BEAST_EXPECT(scheduler.step_for(0s));
-        BEAST_EXPECT(scheduler.step_for(1s));
+        BEAST_EXPECT(scheduler.stepFor(0s));
+        BEAST_EXPECT(scheduler.stepFor(1s));
         BEAST_EXPECT(scheduler.step());
         BEAST_EXPECT(!scheduler.step());
-        BEAST_EXPECT(!scheduler.step_for(1s));
+        BEAST_EXPECT(!scheduler.stepFor(1s));
         net.send(&pv[0], &pv[1], [] {});
         net.send(&pv[1], &pv[0], [] {});
         BEAST_EXPECT(net.disconnect(&pv[0], &pv[1]));
diff --git a/src/test/csf/Digraph.h b/src/test/csf/Digraph.h
index b9fa447133..6fbb8c3514 100644
--- a/src/test/csf/Digraph.h
+++ b/src/test/csf/Digraph.h
@@ -38,7 +38,7 @@ class Digraph
     Graph graph_;
 
     // Allows returning empty iterables for unknown vertices
-    Links empty;
+    Links empty_;
 
 public:
     /** Connect two vertices
@@ -144,7 +144,7 @@ public:
         if (it != graph_.end())
             return boost::adaptors::transform(it->second, transform);
 
-        return boost::adaptors::transform(empty, transform);
+        return boost::adaptors::transform(empty_, transform);
     }
 
     /** Vertices and data associated with an Edge
@@ -173,7 +173,7 @@ public:
         if (it != graph_.end())
             return boost::adaptors::transform(it->second, transform);
 
-        return boost::adaptors::transform(empty, transform);
+        return boost::adaptors::transform(empty_, transform);
     }
 
     /** Vertex out-degree
diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp
index 8f5a0fea1b..40bfafde9c 100644
--- a/src/test/csf/Digraph_test.cpp
+++ b/src/test/csf/Digraph_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl::test {
 
-class Digraph_test : public beast::unit_test::suite
+class Digraph_test : public beast::unit_test::Suite
 {
 public:
     void
diff --git a/src/test/csf/Histogram.h b/src/test/csf/Histogram.h
index ad3b9fd49d..84f1cc7b72 100644
--- a/src/test/csf/Histogram.h
+++ b/src/test/csf/Histogram.h
@@ -25,7 +25,7 @@ class Histogram
     // TODO: Consider logarithmic bins around expected median if this becomes
     // unscalable
     std::map<T, std::size_t, Compare> counts_;
-    std::size_t samples = 0;
+    std::size_t samples_ = 0;
 
 public:
     /** Insert an sample */
@@ -33,14 +33,14 @@ public:
     insert(T const& s)
     {
         ++counts_[s];
-        ++samples;
+        ++samples_;
     }
 
     /** The number of samples */
     [[nodiscard]] std::size_t
     size() const
     {
-        return samples;
+        return samples_;
     }
 
     /** The number of distinct samples (bins) */
@@ -69,7 +69,7 @@ public:
     avg() const
     {
         T tmp{};
-        if (samples == 0)
+        if (samples_ == 0)
             return tmp;
         // Since counts are sorted, shouldn't need to worry much about numerical
         // error
@@ -77,7 +77,7 @@ public:
         {
             tmp += bin * count;
         }
-        return tmp / samples;
+        return tmp / samples_;
     }
 
     /** Calculate the given percentile of the distribution.
@@ -90,7 +90,7 @@ public:
     percentile(float p) const
     {
         assert(p >= 0 && p <= 1);
-        std::size_t const pos = std::round(p * samples);
+        std::size_t const pos = std::round(p * samples_);
 
         if (counts_.empty())
             return T{};
diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp
index 6de04ad1ab..65edb14e5d 100644
--- a/src/test/csf/Histogram_test.cpp
+++ b/src/test/csf/Histogram_test.cpp
@@ -4,7 +4,7 @@
 
 namespace xrpl::test {
 
-class Histogram_test : public beast::unit_test::suite
+class Histogram_test : public beast::unit_test::Suite
 {
 public:
     void
diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h
index f0b903e69e..d3b35c19a1 100644
--- a/src/test/csf/Peer.h
+++ b/src/test/csf/Peer.h
@@ -55,7 +55,7 @@ struct Peer
             return proposal_;
         }
 
-        Json::Value
+        json::Value
         getJson() const
         {
             return proposal_.getJson();
@@ -496,7 +496,12 @@ struct Peer
         return Result(
             TxSet{openTxs},
             Proposal(
-                prevLedger.id(), Proposal::seqJoin, TxSet::calcID(openTxs), closeTime, now(), id));
+                prevLedger.id(),
+                Proposal::kSEQ_JOIN,
+                TxSet::calcID(openTxs),
+                closeTime,
+                now(),
+                id));
     }
 
     void
@@ -506,7 +511,7 @@ struct Peer
         NetClock::duration const& closeResolution,
         ConsensusCloseTimes const& rawCloseTimes,
         ConsensusMode const& mode,
-        Json::Value const& consensusJson)
+        json::Value const& consensusJson)
     {
         onAccept(
             result, prevLedger, closeResolution, rawCloseTimes, mode, consensusJson, validating());
@@ -519,11 +524,11 @@ struct Peer
         NetClock::duration const& closeResolution,
         ConsensusCloseTimes const& rawCloseTimes,
         ConsensusMode const& mode,
-        Json::Value const& consensusJson,
+        json::Value const& consensusJson,
         bool const validating)
     {
         schedule(delays.ledgerAccept, [mode, result, prevLedger, closeResolution, this]() {
-            bool const proposing = mode == ConsensusMode::proposing;
+            bool const proposing = mode == ConsensusMode::Proposing;
             bool const consensusFail = result.state == ConsensusState::MovedOn;
 
             TxSet const acceptedTxs = injectTxs(prevLedger, result.txns);
@@ -591,7 +596,7 @@ struct Peer
 
         if (netLgr != ledgerID)
         {
-            JLOG(j.trace()) << Json::Compact(validations.getJsonTrie());
+            JLOG(j.trace()) << json::Compact(validations.getJsonTrie());
             issue(WrongPrevLedger{.wrong = ledgerID, .right = netLgr});
         }
 
@@ -643,7 +648,7 @@ struct Peer
         v.setSeen(now());
         ValStatus const res = validations.add(v.nodeID(), v);
 
-        if (res == ValStatus::stale)
+        if (res == ValStatus::Stale)
             return false;
 
         // Acquire will try to get from network if not already local
diff --git a/src/test/csf/PeerGroup.h b/src/test/csf/PeerGroup.h
index 8793425534..01bba82c98 100644
--- a/src/test/csf/PeerGroup.h
+++ b/src/test/csf/PeerGroup.h
@@ -278,7 +278,7 @@ randomRankedGroups(
     groups.reserve(numGroups);
     std::vector<Peer*> rawPeers(peers.begin(), peers.end());
     std::generate_n(std::back_inserter(groups), numGroups, [&]() {
-        std::vector<Peer*> res = random_weighted_shuffle(rawPeers, ranks, g);
+        std::vector<Peer*> res = randomWeightedShuffle(rawPeers, ranks, g);
         res.resize(sizeDist(g));
         return PeerGroup(std::move(res));
     });
diff --git a/src/test/csf/Scheduler.h b/src/test/csf/Scheduler.h
index d3f4a1c1c3..c70b7d4854 100644
--- a/src/test/csf/Scheduler.h
+++ b/src/test/csf/Scheduler.h
@@ -19,13 +19,13 @@ namespace xrpl::test::csf {
     specific time. Events may be canceled using a token returned when the
     event is scheduled.
 
-    The caller uses one or more of the step, step_one, step_for, step_until and
-    step_while functions to process scheduled events.
+    The caller uses one or more of the step, stepOne, stepFor, stepUntil and
+    stepWhile functions to process scheduled events.
 */
 class Scheduler
 {
 public:
-    using clock_type = beast::manual_clock<std::chrono::steady_clock>;
+    using clock_type = beast::ManualClock<std::chrono::steady_clock>;
 
     using duration = typename clock_type::duration;
 
@@ -35,45 +35,45 @@ private:
     using by_when_hook =
         boost::intrusive::set_base_hook<boost::intrusive::link_mode<boost::intrusive::normal_link>>;
 
-    struct event : by_when_hook
+    struct Event : by_when_hook
     {
         time_point when;
 
-        event(event const&) = delete;
-        event&
-        operator=(event const&) = delete;
+        Event(Event const&) = delete;
+        Event&
+        operator=(Event const&) = delete;
 
-        virtual ~event() = default;
+        virtual ~Event() = default;
 
         // Called to perform the event
         virtual void
         operator()() const = 0;
 
-        event(time_point when_) : when(when_)
+        Event(time_point when) : when(when)
         {
         }
 
         bool
-        operator<(event const& other) const
+        operator<(Event const& other) const
         {
             return when < other.when;
         }
     };
 
     template <class Handler>
-    class event_impl : public event
+    class EventImpl : public Event
     {
         Handler const h_;
 
     public:
-        event_impl(event_impl const&) = delete;
+        EventImpl(EventImpl const&) = delete;
 
-        event_impl&
-        operator=(event_impl const&) = delete;
+        EventImpl&
+        operator=(EventImpl const&) = delete;
 
         template <class DeducedHandler>
-        event_impl(time_point when_, DeducedHandler&& h)
-            : event(when_), h_(std::forward<DeducedHandler>(h))
+        EventImpl(time_point when, DeducedHandler&& h)
+            : Event(when), h_(std::forward<DeducedHandler>(h))
         {
         }
 
@@ -84,11 +84,11 @@ private:
         }
     };
 
-    class queue_type
+    class QueueType
     {
     private:
         using by_when_set = typename boost::intrusive::
-            make_multiset<event, boost::intrusive::constant_time_size<false>>::type;
+            make_multiset<Event, boost::intrusive::constant_time_size<false>>::type;
         // alloc_ is owned by the scheduler
         boost::container::pmr::monotonic_buffer_resource* alloc_;
         by_when_set by_when_;
@@ -96,13 +96,13 @@ private:
     public:
         using iterator = typename by_when_set::iterator;
 
-        queue_type(queue_type const&) = delete;
-        queue_type&
-        operator=(queue_type const&) = delete;
+        QueueType(QueueType const&) = delete;
+        QueueType&
+        operator=(QueueType const&) = delete;
 
-        explicit queue_type(boost::container::pmr::monotonic_buffer_resource* alloc);
+        explicit QueueType(boost::container::pmr::monotonic_buffer_resource* alloc);
 
-        ~queue_type();
+        ~QueueType();
 
         [[nodiscard]] bool
         empty() const;
@@ -122,7 +122,7 @@ private:
     };
 
     boost::container::pmr::monotonic_buffer_resource alloc_{kilobytes(256)};
-    queue_type queue_;
+    QueueType queue_;
 
     // Aged containers that rely on this clock take a non-const reference =(
     mutable clock_type clock_;
@@ -146,7 +146,7 @@ public:
     now() const;
 
     // Used to cancel timers
-    struct cancel_token;
+    struct CancelToken;
 
     /** Schedule an event at a specific time
 
@@ -157,7 +157,7 @@ public:
             no arguments.
     */
     template <class Function>
-    cancel_token
+    CancelToken
     at(time_point const& when, Function&& f);
 
     /** Schedule an event after a specified duration passes
@@ -169,7 +169,7 @@ public:
             no arguments.
     */
     template <class Function>
-    cancel_token
+    CancelToken
     in(duration const& delay, Function&& f);
 
     /** Cancel a timer.
@@ -180,7 +180,7 @@ public:
             timer() which has not yet been invoked.
     */
     void
-    cancel(cancel_token const& token);
+    cancel(CancelToken const& token);
 
     /** Run the scheduler for up to one event.
 
@@ -192,7 +192,7 @@ public:
         @return `true` if an event was processed.
     */
     bool
-    step_one();
+    stepOne();
 
     /** Run the scheduler until no events remain.
 
@@ -221,7 +221,7 @@ public:
     */
     template <class Function>
     bool
-    step_while(Function&& func);
+    stepWhile(Function&& func);
 
     /** Run the scheduler until the specified time.
 
@@ -233,7 +233,7 @@ public:
         @return `true` if any event remain.
     */
     bool
-    step_until(time_point const& until);
+    stepUntil(time_point const& until);
 
     /** Run the scheduler until time has elapsed.
 
@@ -246,80 +246,80 @@ public:
     */
     template <class Period, class Rep>
     bool
-    step_for(std::chrono::duration<Period, Rep> const& amount);
+    stepFor(std::chrono::duration<Period, Rep> const& amount);
 };
 
 //------------------------------------------------------------------------------
 
-inline Scheduler::queue_type::queue_type(boost::container::pmr::monotonic_buffer_resource* alloc)
+inline Scheduler::QueueType::QueueType(boost::container::pmr::monotonic_buffer_resource* alloc)
     : alloc_(alloc)
 {
 }
 
-inline Scheduler::queue_type::~queue_type()
+inline Scheduler::QueueType::~QueueType()
 {
     for (auto iter = by_when_.begin(); iter != by_when_.end();)
     {
         auto e = &*iter;
         ++iter;
-        e->~event();
+        e->~Event();
         alloc_->deallocate(e, sizeof(e));  // NOLINT(bugprone-sizeof-expression)
     }
 }
 
 inline bool
-Scheduler::queue_type::empty() const
+Scheduler::QueueType::empty() const
 {
     return by_when_.empty();
 }
 
 inline auto
-Scheduler::queue_type::begin() -> iterator
+Scheduler::QueueType::begin() -> iterator
 {
     return by_when_.begin();
 }
 
 inline auto
-Scheduler::queue_type::end() -> iterator
+Scheduler::QueueType::end() -> iterator
 {
     return by_when_.end();
 }
 
 template <class Handler>
 inline auto
-Scheduler::queue_type::emplace(time_point when, Handler&& h) -> typename by_when_set::iterator
+Scheduler::QueueType::emplace(time_point when, Handler&& h) -> typename by_when_set::iterator
 {
-    using event_type = event_impl<std::decay_t<Handler>>;
+    using event_type = EventImpl<std::decay_t<Handler>>;
     auto const p = alloc_->allocate(sizeof(event_type));
     auto& e = *new (p) event_type(when, std::forward<Handler>(h));
     return by_when_.insert(e);
 }
 
 inline auto
-Scheduler::queue_type::erase(iterator iter) -> typename by_when_set::iterator
+Scheduler::QueueType::erase(iterator iter) -> typename by_when_set::iterator
 {
     auto& e = *iter;
     auto next = by_when_.erase(iter);
-    e.~event();
+    e.~Event();
     alloc_->deallocate(&e, sizeof(e));
     return next;
 }
 
 //-----------------------------------------------------------------------------
-struct Scheduler::cancel_token
+struct Scheduler::CancelToken
 {
 private:
-    typename queue_type::iterator iter_;
+    typename QueueType::iterator iter_;
 
 public:
-    cancel_token() = delete;
-    cancel_token(cancel_token const&) = default;
-    cancel_token&
-    operator=(cancel_token const&) = default;
+    CancelToken() = delete;
+    CancelToken(CancelToken const&) = default;
+    CancelToken&
+    operator=(CancelToken const&) = default;
 
 private:
     friend class Scheduler;
-    cancel_token(typename queue_type::iterator iter) : iter_(iter)
+    CancelToken(typename QueueType::iterator iter) : iter_(iter)
     {
     }
 };
@@ -343,26 +343,26 @@ Scheduler::now() const -> time_point
 
 template <class Function>
 inline auto
-Scheduler::at(time_point const& when, Function&& f) -> cancel_token
+Scheduler::at(time_point const& when, Function&& f) -> CancelToken
 {
     return queue_.emplace(when, std::forward<Function>(f));
 }
 
 template <class Function>
 inline auto
-Scheduler::in(duration const& delay, Function&& f) -> cancel_token
+Scheduler::in(duration const& delay, Function&& f) -> CancelToken
 {
     return at(clock_.now() + delay, std::forward<Function>(f));
 }
 
 inline void
-Scheduler::cancel(cancel_token const& token)
+Scheduler::cancel(CancelToken const& token)
 {
     queue_.erase(token.iter_);
 }
 
 inline bool
-Scheduler::step_one()
+Scheduler::stepOne()
 {
     if (queue_.empty())
         return false;
@@ -376,11 +376,11 @@ Scheduler::step_one()
 inline bool
 Scheduler::step()
 {
-    if (!step_one())
+    if (!stepOne())
         return false;
     for (;;)
     {
-        if (!step_one())
+        if (!stepOne())
             break;
     }
     return true;
@@ -388,16 +388,16 @@ Scheduler::step()
 
 template <class Function>
 inline bool
-Scheduler::step_while(Function&& f)
+Scheduler::stepWhile(Function&& f)
 {
     bool ran = false;
-    while (f() && step_one())
+    while (f() && stepOne())
         ran = true;
     return ran;
 }
 
 inline bool
-Scheduler::step_until(time_point const& until)
+Scheduler::stepUntil(time_point const& until)
 {
     // VFALCO This routine needs optimizing
     if (queue_.empty())
@@ -413,7 +413,7 @@ Scheduler::step_until(time_point const& until)
     }
     do
     {
-        step_one();
+        stepOne();
         iter = queue_.begin();
     } while (iter != queue_.end() && iter->when <= until);
     clock_.set(until);
@@ -422,9 +422,9 @@ Scheduler::step_until(time_point const& until)
 
 template <class Period, class Rep>
 inline bool
-Scheduler::step_for(std::chrono::duration<Period, Rep> const& amount)
+Scheduler::stepFor(std::chrono::duration<Period, Rep> const& amount)
 {
-    return step_until(now() + amount);
+    return stepUntil(now() + amount);
 }
 
 }  // namespace xrpl::test::csf
diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp
index 6b14a771d3..6f4ac051c4 100644
--- a/src/test/csf/Scheduler_test.cpp
+++ b/src/test/csf/Scheduler_test.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl::test {
 
-class Scheduler_test : public beast::unit_test::suite
+class Scheduler_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -26,28 +26,28 @@ public:
 
         // Process first event
         BEAST_EXPECT(seen.empty());
-        BEAST_EXPECT(scheduler.step_one());
+        BEAST_EXPECT(scheduler.stepOne());
         BEAST_EXPECT(seen == std::set<int>({1}));
         BEAST_EXPECT(scheduler.now() == (start + 1s));
 
         // No processing if stepping until current time
-        BEAST_EXPECT(scheduler.step_until(scheduler.now()));
+        BEAST_EXPECT(scheduler.stepUntil(scheduler.now()));
         BEAST_EXPECT(seen == std::set<int>({1}));
         BEAST_EXPECT(scheduler.now() == (start + 1s));
 
         // Process next event
-        BEAST_EXPECT(scheduler.step_for(1s));
+        BEAST_EXPECT(scheduler.stepFor(1s));
         BEAST_EXPECT(seen == std::set<int>({1, 2}));
         BEAST_EXPECT(scheduler.now() == (start + 2s));
 
         // Don't process cancelled event, but advance clock
         scheduler.cancel(token);
-        BEAST_EXPECT(scheduler.step_for(1s));
+        BEAST_EXPECT(scheduler.stepFor(1s));
         BEAST_EXPECT(seen == std::set<int>({1, 2}));
         BEAST_EXPECT(scheduler.now() == (start + 3s));
 
         // Process until 3 seen ints
-        BEAST_EXPECT(scheduler.step_while([&]() { return seen.size() < 3; }));
+        BEAST_EXPECT(scheduler.stepWhile([&]() { return seen.size() < 3; }));
         BEAST_EXPECT(seen == std::set<int>({1, 2, 4}));
         BEAST_EXPECT(scheduler.now() == (start + 4s));
 
diff --git a/src/test/csf/Sim.h b/src/test/csf/Sim.h
index ca85d79f47..0b1b3473d6 100644
--- a/src/test/csf/Sim.h
+++ b/src/test/csf/Sim.h
@@ -22,7 +22,7 @@ class BasicSink : public beast::Journal::Sink
 
 public:
     BasicSink(Scheduler::clock_type const& clock)
-        : Sink(beast::severities::kDisabled, false), clock_{clock}
+        : Sink(beast::severities::KDisabled, false), clock_{clock}
     {
     }
 
@@ -46,8 +46,8 @@ class Sim
 {
     // Use a deque to have stable pointers even when dynamically adding peers
     //  - Alternatively consider using unique_ptrs allocated from arena
-    std::deque<Peer> peers;
-    PeerGroup allPeers;
+    std::deque<Peer> peers_;
+    PeerGroup allPeers_;
 
 public:
     std::mt19937_64 rng;
@@ -87,18 +87,18 @@ public:
         newPeers.reserve(numPeers);
         for (std::size_t i = 0; i < numPeers; ++i)
         {
-            peers.emplace_back(
-                PeerID{static_cast<std::uint32_t>(peers.size())},
+            peers_.emplace_back(
+                PeerID{static_cast<std::uint32_t>(peers_.size())},
                 scheduler,
                 oracle,
                 net,
                 trustGraph,
                 collectors,
                 j);
-            newPeers.emplace_back(&peers.back());
+            newPeers.emplace_back(&peers_.back());
         }
         PeerGroup res{newPeers};
-        allPeers = allPeers + res;
+        allPeers_ = allPeers_ + res;
         return res;
     }
 
@@ -106,7 +106,7 @@ public:
     std::size_t
     size() const
     {
-        return peers.size();
+        return peers_.size();
     }
 
     /** Run consensus protocol to generate the provided number of ledgers.
diff --git a/src/test/csf/SimTime.h b/src/test/csf/SimTime.h
index 662f3fe19c..e38a375e02 100644
--- a/src/test/csf/SimTime.h
+++ b/src/test/csf/SimTime.h
@@ -10,7 +10,7 @@ using RealClock = std::chrono::system_clock;
 using RealDuration = RealClock::duration;
 using RealTime = RealClock::time_point;
 
-using SimClock = beast::manual_clock<std::chrono::steady_clock>;
+using SimClock = beast::ManualClock<std::chrono::steady_clock>;
 using SimDuration = typename SimClock::duration;
 using SimTime = typename SimClock::time_point;
 
diff --git a/src/test/csf/Tx.h b/src/test/csf/Tx.h
index daa663af2b..5a0f6a9bae 100644
--- a/src/test/csf/Tx.h
+++ b/src/test/csf/Tx.h
@@ -61,13 +61,13 @@ using TxSetType = boost::container::flat_set<Tx>;
 class TxSet
 {
 public:
-    using ID = beast::uhash<>::result_type;
+    using ID = beast::Uhash<>::result_type;
     using Tx = csf::Tx;
 
     static ID
     calcID(TxSetType const& txs)
     {
-        return beast::uhash<>{}(txs);
+        return beast::Uhash<>{}(txs);
     }
 
     class MutableTxSet
@@ -141,7 +141,7 @@ public:
     {
         std::map<Tx::ID, bool> res;
 
-        auto populate_diffs = [&res](auto const& a, auto const& b, bool s) {
+        auto populateDiffs = [&res](auto const& a, auto const& b, bool s) {
             auto populator = [&](auto const& tx) { res[tx.id()] = s; };
             std::set_difference(
                 a.begin(),
@@ -151,8 +151,8 @@ public:
                 boost::make_function_output_iterator(std::ref(populator)));
         };
 
-        populate_diffs(txs_, other.txs_, true);
-        populate_diffs(other.txs_, txs_, false);
+        populateDiffs(txs_, other.txs_, true);
+        populateDiffs(other.txs_, txs_, false);
         return res;
     }
 
@@ -178,16 +178,16 @@ inline std::ostream&
 operator<<(std::ostream& o, boost::container::flat_set<T> const& ts)
 {
     o << "{ ";
-    bool do_comma = false;
+    bool doComma = false;
     for (auto const& t : ts)
     {
-        if (do_comma)
+        if (doComma)
         {
             o << ", ";
         }
         else
         {
-            do_comma = true;
+            doComma = true;
         }
         o << t;
     }
diff --git a/src/test/csf/Validation.h b/src/test/csf/Validation.h
index df7d1ed265..81f14efa18 100644
--- a/src/test/csf/Validation.h
+++ b/src/test/csf/Validation.h
@@ -12,7 +12,7 @@ namespace xrpl::test::csf {
 
 struct PeerIDTag;
 //< Uniquely identifies a peer
-using PeerID = tagged_integer<std::uint32_t, PeerIDTag>;
+using PeerID = TaggedInteger<std::uint32_t, PeerIDTag>;
 
 /** The current key of a peer
 
diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h
index 9e437eaef9..6dcbd65a1e 100644
--- a/src/test/csf/collectors.h
+++ b/src/test/csf/collectors.h
@@ -32,7 +32,7 @@ namespace xrpl::test::csf {
 template <class... Cs>
 class Collectors
 {
-    std::tuple<Cs&...> cs;
+    std::tuple<Cs&...> cs_;
 
     template <class C, class E>
     static void
@@ -53,7 +53,7 @@ public:
 
         @param cs References to the collectors to call together
     */
-    Collectors(Cs&... cs_) : cs(std::tie(cs_...))
+    Collectors(Cs&... cs) : cs_(std::tie(cs...))
     {
     }
 
@@ -61,7 +61,7 @@ public:
     void
     on(PeerID who, SimTime when, E e)
     {
-        apply(cs, who, when, e, std::index_sequence_for<Cs...>{});
+        apply(cs_, who, when, e, std::index_sequence_for<Cs...>{});
     }
 };
 
@@ -161,7 +161,7 @@ struct TxCollector
         std::optional<SimTime> accepted;
         std::optional<SimTime> validated;
 
-        Tracker(Tx tx_, SimTime submitted_) : tx{tx_}, submitted{submitted_}
+        Tracker(Tx tx, SimTime submitted) : tx{tx}, submitted{submitted}
         {
         }
     };
@@ -387,12 +387,12 @@ struct LedgerCollector
         SimTime accepted;
         std::optional<SimTime> fullyValidated;
 
-        Tracker(SimTime accepted_) : accepted{accepted_}
+        Tracker(SimTime accepted) : accepted{accepted}
         {
         }
     };
 
-    hash_map<Ledger::ID, Tracker> ledgers_;
+    hash_map<Ledger::ID, Tracker> ledgers;
 
     using Hist = Histogram<SimTime::duration>;
     Hist acceptToFullyValid;
@@ -410,14 +410,14 @@ struct LedgerCollector
     on(PeerID who, SimTime when, AcceptLedger const& e)
     {
         // First time this ledger accepted
-        if (ledgers_.emplace(e.ledger.id(), Tracker{when}).second)
+        if (ledgers.emplace(e.ledger.id(), Tracker{when}).second)
         {
             ++accepted;
             // ignore jumps?
             if (e.prior.id() == e.ledger.parentID())
             {
-                auto const it = ledgers_.find(e.ledger.parentID());
-                if (it != ledgers_.end())
+                auto const it = ledgers.find(e.ledger.parentID());
+                if (it != ledgers.end())
                 {
                     acceptToAccept.insert(when - it->second.accepted);
                 }
@@ -431,8 +431,8 @@ struct LedgerCollector
         // ignore jumps
         if (e.prior.id() == e.ledger.parentID())
         {
-            auto const it = ledgers_.find(e.ledger.id());
-            assert(it != ledgers_.end());
+            auto const it = ledgers.find(e.ledger.id());
+            assert(it != ledgers.end());
             auto& tracker = it->second;
             // first time fully validated
             if (!tracker.fullyValidated)
@@ -441,8 +441,8 @@ struct LedgerCollector
                 tracker.fullyValidated = when;
                 acceptToFullyValid.insert(when - tracker.accepted);
 
-                auto const parentIt = ledgers_.find(e.ledger.parentID());
-                if (parentIt != ledgers_.end())
+                auto const parentIt = ledgers.find(e.ledger.parentID());
+                if (parentIt != ledgers.end())
                 {
                     auto& parentTracker = parentIt->second;
                     if (parentTracker.fullyValidated)
@@ -457,7 +457,7 @@ struct LedgerCollector
     [[nodiscard]] std::size_t
     unvalidated() const
     {
-        return std::count_if(ledgers_.begin(), ledgers_.end(), [](auto const& it) {
+        return std::count_if(ledgers.begin(), ledgers.end(), [](auto const& it) {
             return !it.second.fullyValidated;
         });
     }
diff --git a/src/test/csf/impl/Sim.cpp b/src/test/csf/impl/Sim.cpp
index 8cf6869522..bf4706927e 100644
--- a/src/test/csf/impl/Sim.cpp
+++ b/src/test/csf/impl/Sim.cpp
@@ -13,7 +13,7 @@ namespace xrpl::test::csf {
 void
 Sim::run(int ledgers)
 {
-    for (auto& p : peers)
+    for (auto& p : peers_)
     {
         p.targetLedgers = p.completedLedgers + ledgers;
         p.start();
@@ -24,18 +24,18 @@ Sim::run(int ledgers)
 void
 Sim::run(SimDuration const& dur)
 {
-    for (auto& p : peers)
+    for (auto& p : peers_)
     {
         p.targetLedgers = std::numeric_limits<decltype(p.targetLedgers)>::max();
         p.start();
     }
-    scheduler.step_for(dur);
+    scheduler.stepFor(dur);
 }
 
 bool
 Sim::synchronized() const
 {
-    return synchronized(allPeers);
+    return synchronized(allPeers_);
 }
 
 bool
@@ -53,7 +53,7 @@ Sim::synchronized(PeerGroup const& g)
 std::size_t
 Sim::branches() const
 {
-    return branches(allPeers);
+    return branches(allPeers_);
 }
 std::size_t
 Sim::branches(PeerGroup const& g) const
diff --git a/src/test/csf/impl/ledgers.cpp b/src/test/csf/impl/ledgers.cpp
index a4203b2a15..0e3764d5ab 100644
--- a/src/test/csf/impl/ledgers.cpp
+++ b/src/test/csf/impl/ledgers.cpp
@@ -15,12 +15,12 @@
 
 namespace xrpl::test::csf {
 
-Ledger::Instance const Ledger::genesis;
+Ledger::Instance const Ledger::kGENESIS;
 
-Json::Value
+json::Value
 Ledger::getJson() const
 {
-    Json::Value res(Json::objectValue);
+    json::Value res(json::ObjectValue);
     res["id"] = static_cast<ID::value_type>(id());
     res["seq"] = static_cast<Seq::value_type>(seq());
     return res;
@@ -76,7 +76,7 @@ mismatch(Ledger const& a, Ledger const& b)
 
 LedgerOracle::LedgerOracle()
 {
-    instances_.insert(InstanceEntry{Ledger::genesis, nextID()});
+    instances_.insert(InstanceEntry{Ledger::kGENESIS, nextID()});
 }
 
 Ledger::ID
diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h
index 14495f78a9..96082bc987 100644
--- a/src/test/csf/ledgers.h
+++ b/src/test/csf/ledgers.h
@@ -43,10 +43,10 @@ class Ledger
 
 public:
     struct SeqTag;
-    using Seq = tagged_integer<std::uint32_t, SeqTag>;
+    using Seq = TaggedInteger<std::uint32_t, SeqTag>;
 
     struct IdTag;
-    using ID = tagged_integer<std::uint32_t, IdTag>;
+    using ID = TaggedInteger<std::uint32_t, IdTag>;
 
     struct MakeGenesis
     {
@@ -66,7 +66,7 @@ private:
         TxSetType txs;
 
         // Resolution used to determine close time
-        NetClock::duration closeTimeResolution = ledgerDefaultTimeResolution;
+        NetClock::duration closeTimeResolution = kLEDGER_DEFAULT_TIME_RESOLUTION;
 
         //! When the ledger closed (up to closeTimeResolution)
         NetClock::time_point closeTime;
@@ -118,7 +118,9 @@ private:
 
         template <class Hasher>
         friend void
-        hash_append(Hasher& h, Ledger::Instance const& instance)
+        hash_append(
+            Hasher& h,
+            Ledger::Instance const& instance)  // NOLINT(readability-identifier-naming)
         {
             using beast::hash_append;
             hash_append(h, instance.asTie());
@@ -126,14 +128,14 @@ private:
     };
 
     // Single common genesis instance
-    static Instance const genesis;
+    static Instance const kGENESIS;
 
     Ledger(ID id, Instance const* i) : id_{id}, instance_{i}
     {
     }
 
 public:
-    Ledger(MakeGenesis) : instance_(&genesis)
+    Ledger(MakeGenesis) : instance_(&kGENESIS)
     {
     }
 
@@ -205,7 +207,7 @@ public:
     friend Ledger::Seq
     mismatch(Ledger const& a, Ledger const& o);
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson() const;
 
     friend bool
diff --git a/src/test/csf/random.h b/src/test/csf/random.h
index a5c54ec9bf..08002aed7f 100644
--- a/src/test/csf/random.h
+++ b/src/test/csf/random.h
@@ -12,11 +12,11 @@ namespace xrpl::test::csf {
     @param g  A pseudo-random number generator
     @return A vector with entries randomly sampled without replacement
             from the original vector based on the provided weights.
-            I.e.  res[0] comes from sample v[i] with weight w[i]/sum_k w[k]
+            I.e.  res[0] comes from sample v[i] with weight w[i]/suk_ w[k]
 */
 template <class T, class G>
 std::vector<T>
-random_weighted_shuffle(std::vector<T> v, std::vector<double> w, G& g)
+randomWeightedShuffle(std::vector<T> v, std::vector<double> w, G& g)
 {
     using std::swap;
 
diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h
index 88b7e22580..e954a043b8 100644
--- a/src/test/json/TestOutputSuite.h
+++ b/src/test/json/TestOutputSuite.h
@@ -12,14 +12,14 @@ class TestOutputSuite : public TestSuite
 {
 protected:
     std::string output_;
-    std::unique_ptr<Json::Writer> writer_;
+    std::unique_ptr<json::Writer> writer_;
 
     void
     setup(std::string const& testName)
     {
         testcase(testName);
         output_.clear();
-        writer_ = std::make_unique<Json::Writer>(Json::stringOutput(output_));
+        writer_ = std::make_unique<json::Writer>(json::stringOutput(output_));
     }
 
     // Test the result and report values.
diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h
index 2bd3da8cf5..2876522218 100644
--- a/src/test/jtx/AMM.h
+++ b/src/test/jtx/AMM.h
@@ -49,9 +49,9 @@ struct CreateArg
     std::uint16_t tfee = 0;
     std::uint32_t fee = 0;
     std::optional<std::uint32_t> flags = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
-    std::optional<jtx::msig> ms = std::nullopt;
-    std::optional<ter> err = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
+    std::optional<jtx::Msig> ms = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
     bool close = true;
 };
 
@@ -64,9 +64,9 @@ struct DepositArg
     std::optional<STAmount> maxEP = std::nullopt;
     std::optional<std::uint32_t> flags = std::nullopt;
     std::optional<std::pair<Asset, Asset>> assets = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
     std::optional<std::uint16_t> tfee = std::nullopt;
-    std::optional<ter> err = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
 };
 
 struct WithdrawArg
@@ -78,8 +78,8 @@ struct WithdrawArg
     std::optional<LPToken> maxEP = std::nullopt;
     std::optional<std::uint32_t> flags = std::nullopt;
     std::optional<std::pair<Asset, Asset>> assets = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
-    std::optional<ter> err = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
 };
 
 struct VoteArg
@@ -87,9 +87,9 @@ struct VoteArg
     std::optional<Account> account = std::nullopt;
     std::uint32_t tfee = 0;
     std::optional<std::uint32_t> flags = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
     std::optional<std::pair<Asset, Asset>> assets = std::nullopt;
-    std::optional<ter> err = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
 };
 
 struct BidArg
@@ -109,7 +109,7 @@ struct ClawbackArg
     std::optional<std::pair<Asset, Asset>> assets = std::nullopt;
     std::optional<STAmount> amount = std::nullopt;
     std::optional<std::uint32_t> flags = std::nullopt;
-    std::optional<ter> err = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
 };
 
 /** Convenience class to test AMM functionality.
@@ -128,7 +128,7 @@ class AMM
     std::optional<IOUAmount> bidMin_;
     std::optional<IOUAmount> bidMax_;
     // Multi-signature
-    std::optional<msig> const msig_;
+    std::optional<Msig> const msig_;
     // Transaction fee
     std::uint32_t const fee_;
     AccountID const ammAccount_;
@@ -144,15 +144,15 @@ public:
         std::uint16_t tfee = 0,
         std::uint32_t fee = 0,
         std::optional<std::uint32_t> flags = std::nullopt,
-        std::optional<jtx::seq> seq = std::nullopt,
-        std::optional<jtx::msig> ms = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt,
+        std::optional<jtx::Seq> seq = std::nullopt,
+        std::optional<jtx::Msig> ms = std::nullopt,
+        std::optional<Ter> const& ter = std::nullopt,
         bool close = true);
     AMM(Env& env,
         Account const& account,
         STAmount const& asset1,
         STAmount const& asset2,
-        ter const& ter,
+        Ter const& ter,
         bool log = false,
         bool close = true);
     AMM(Env& env,
@@ -161,7 +161,7 @@ public:
         STAmount const& asset2,
         CreateArg const& arg);
 
-    static Json::Value
+    static json::Value
     createJv(
         AccountID const& account,
         STAmount const& asset1,
@@ -170,7 +170,7 @@ public:
 
     /** Send amm_info RPC command
      */
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     ammRpcInfo(
         std::optional<AccountID> const& account = std::nullopt,
         std::optional<std::string> const& ledgerIndex = std::nullopt,
@@ -178,7 +178,7 @@ public:
         std::optional<Asset> asset2 = std::nullopt,
         std::optional<AccountID> const& ammAccount = std::nullopt,
         bool ignoreParams = false,
-        unsigned apiVersion = RPC::apiInvalidVersion) const;
+        unsigned apiVersion = RPC::kAPI_INVALID_VERSION) const;
 
     /** Verify the AMM balances.
      */
@@ -229,13 +229,13 @@ public:
         STAmount const& asset2,
         IOUAmount const& balance,
         std::optional<AccountID> const& account = std::nullopt,
-        std::optional<std::string> const& ledger_index = std::nullopt,
+        std::optional<std::string> const& ledgerIndex = std::nullopt,
         std::optional<AccountID> const& ammAccount = std::nullopt) const;
 
     [[nodiscard]] bool
     ammExists() const;
 
-    static Json::Value
+    static json::Value
     depositJv(DepositArg const& arg);
 
     IOUAmount
@@ -244,7 +244,7 @@ public:
         LPToken tokens,
         std::optional<STAmount> const& asset1InDetails = std::nullopt,
         std::optional<std::uint32_t> const& flags = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     deposit(
@@ -253,7 +253,7 @@ public:
         std::optional<STAmount> const& asset2InAmount = std::nullopt,
         std::optional<STAmount> const& maxEP = std::nullopt,
         std::optional<std::uint32_t> const& flags = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     deposit(
@@ -264,14 +264,14 @@ public:
         std::optional<STAmount> const& maxEP,
         std::optional<std::uint32_t> const& flags,
         std::optional<std::pair<Asset, Asset>> const& assets,
-        std::optional<jtx::seq> const& seq,
+        std::optional<jtx::Seq> const& seq,
         std::optional<std::uint16_t> const& tfee = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     deposit(DepositArg const& arg);
 
-    static Json::Value
+    static json::Value
     withdrawJv(WithdrawArg const& arg);
 
     IOUAmount
@@ -280,13 +280,13 @@ public:
         std::optional<LPToken> const& tokens,
         std::optional<STAmount> const& asset1OutDetails = std::nullopt,
         std::optional<std::uint32_t> const& flags = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     withdrawAll(
         std::optional<Account> const& account,
         std::optional<STAmount> const& asset1OutDetails = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt)
+        std::optional<Ter> const& ter = std::nullopt)
     {
         return withdraw(
             account,
@@ -302,7 +302,7 @@ public:
         STAmount const& asset1Out,
         std::optional<STAmount> const& asset2Out = std::nullopt,
         std::optional<LPToken> const& maxEP = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     withdraw(
@@ -313,13 +313,13 @@ public:
         std::optional<LPToken> const& maxEP,
         std::optional<std::uint32_t> const& flags,
         std::optional<std::pair<Asset, Asset>> const& assets,
-        std::optional<jtx::seq> const& seq,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<jtx::Seq> const& seq,
+        std::optional<Ter> const& ter = std::nullopt);
 
     IOUAmount
     withdraw(WithdrawArg const& arg);
 
-    static Json::Value
+    static json::Value
     voteJv(VoteArg const& arg);
 
     void
@@ -327,14 +327,14 @@ public:
         std::optional<Account> const& account,
         std::uint32_t feeVal,
         std::optional<std::uint32_t> const& flags = std::nullopt,
-        std::optional<jtx::seq> const& seq = std::nullopt,
+        std::optional<jtx::Seq> const& seq = std::nullopt,
         std::optional<std::pair<Asset, Asset>> const& assets = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<Ter> const& ter = std::nullopt);
 
     void
     vote(VoteArg const& arg);
 
-    Json::Value
+    json::Value
     bid(BidArg const& arg);
 
     void
@@ -375,17 +375,17 @@ public:
         return ammRpcInfo(lp).toStyledString();
     }
 
-    Json::Value
+    json::Value
     operator()(AccountID const& lp) const
     {
         return ammRpcInfo(lp);
     }
 
-    static Json::Value
+    static json::Value
     deleteJv(AccountID const& account, Asset const& asset1, Asset const& assets);
 
     void
-    ammDelete(AccountID const& account, std::optional<ter> const& ter = std::nullopt);
+    ammDelete(AccountID const& account, std::optional<Ter> const& ter = std::nullopt);
 
     void
     setClose(bool close)
@@ -400,7 +400,7 @@ public:
     }
 
     void
-    setTokens(Json::Value& jv, std::optional<std::pair<Asset, Asset>> const& assets = std::nullopt);
+    setTokens(json::Value& jv, std::optional<std::pair<Asset, Asset>> const& assets = std::nullopt);
 
     Asset const&
     operator[](std::uint8_t i)
@@ -413,15 +413,15 @@ public:
     struct Pool
     {
         AMM const& amm;
-        std::vector<Json::StaticString> names;
-        Pool(AMM const& a, std::vector<Json::StaticString> const& n = {}) : amm(a), names(n)
+        std::vector<json::StaticString> names;
+        Pool(AMM const& a, std::vector<json::StaticString> const& n = {}) : amm(a), names(n)
         {
         }
         friend std::ostream&
         operator<<(std::ostream& s, Pool const& p)
         {
             auto const& jr = p.amm.ammRpcInfo();
-            auto out = [&](Json::Value const& jv) {
+            auto out = [&](json::Value const& jv) {
                 if (jv.isMember(jss::value))
                 {
                     std::cout << jv[jss::value].asString();
@@ -449,14 +449,14 @@ public:
     };
     struct Offers
     {
-        Json::Value const& jv;
-        Offers(Json::Value const& j) : jv(j)
+        json::Value const& jv;
+        Offers(json::Value const& j) : jv(j)
         {
         }
         friend std::ostream&
         operator<<(std::ostream& s, Offers const& offers)
         {
-            auto out = [&](Json::Value const& jv) {
+            auto out = [&](json::Value const& jv) {
                 if (jv.isMember(jss::value))
                 {
                     s << jv[jss::value].asString();
@@ -483,8 +483,8 @@ private:
     create(
         std::uint32_t tfee = 0,
         std::optional<std::uint32_t> const& flags = std::nullopt,
-        std::optional<jtx::seq> const& seq = std::nullopt,
-        std::optional<ter> const& ter = std::nullopt);
+        std::optional<jtx::Seq> const& seq = std::nullopt,
+        std::optional<Ter> const& ter = std::nullopt);
 
     void
     log(bool log)
@@ -497,13 +497,13 @@ private:
         STAmount const& asset1,
         STAmount const& asset2,
         IOUAmount const& balance,
-        Json::Value const& jv) const;
+        json::Value const& jv) const;
 
     void
     submit(
-        Json::Value const& jv,
-        std::optional<jtx::seq> const& seq,
-        std::optional<ter> const& ter);
+        json::Value const& jv,
+        std::optional<jtx::Seq> const& seq,
+        std::optional<Ter> const& ter);
 
     [[nodiscard]] bool
     expectAuctionSlot(auto&& cb) const;
@@ -514,7 +514,7 @@ private:
 
 namespace amm {
 
-Json::Value
+json::Value
 ammClawback(
     Account const& issuer,
     Account const& holder,
diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h
index ffb186e0d6..a2e6c38db3 100644
--- a/src/test/jtx/AMMTest.h
+++ b/src/test/jtx/AMMTest.h
@@ -17,11 +17,11 @@ struct TestAMMArg
 {
     std::optional<std::pair<STAmount, STAmount>> pool = std::nullopt;
     std::uint16_t tfee = 0;
-    std::optional<jtx::ter> ter = std::nullopt;
+    std::optional<jtx::Ter> ter = std::nullopt;
     std::vector<FeatureBitset> features = {
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
-        jtx::testable_amendments() - featureSingleAssetVault - featureLendingProtocol};
+        jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol};
 
     bool noLog = false;
 };
@@ -30,7 +30,7 @@ struct TestAMMArg
 // A distinct MPT is created if both AMM assets
 // are MPT. The actual MPT asset can be accessed
 // via AMM::operator[](0|1).
-inline static auto AMMMPT = MPT("AMM");
+inline static auto gAmmmpt = MPT("AMM");
 
 [[maybe_unused]] std::vector<STAmount>
 fund(
@@ -62,32 +62,32 @@ struct TestAMMArgs
 {
     std::optional<std::pair<STAmount, STAmount>> const& pool = std::nullopt;
     std::uint16_t tfee = 0;
-    std::optional<jtx::ter> const& ter = std::nullopt;
-    std::vector<FeatureBitset> const& features = {testable_amendments()};
+    std::optional<jtx::Ter> const& ter = std::nullopt;
+    std::vector<FeatureBitset> const& features = {testableAmendments()};
 };
 
-class AMMTestBase : public beast::unit_test::suite
+class AMMTestBase : public beast::unit_test::Suite
 {
 protected:
-    jtx::Account const gw;
-    jtx::Account const carol;
-    jtx::Account const alice;
-    jtx::Account const bob;
-    jtx::IOU const USD;
-    jtx::IOU const EUR;
-    jtx::IOU const GBP;
-    jtx::IOU const BTC;
-    jtx::IOU const BAD;
+    jtx::Account const gw_;
+    jtx::Account const carol_;
+    jtx::Account const alice_;
+    jtx::Account const bob_;
+    jtx::IOU const USD;  // NOLINT(readability-identifier-naming)
+    jtx::IOU const EUR;  // NOLINT(readability-identifier-naming)
+    jtx::IOU const GBP;  // NOLINT(readability-identifier-naming)
+    jtx::IOU const BTC;  // NOLINT(readability-identifier-naming)
+    jtx::IOU const BAD;  // NOLINT(readability-identifier-naming)
 
 public:
     AMMTestBase();
 
     static FeatureBitset
-    testable_amendments()
+    testableAmendments()
     {
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
-        return jtx::testable_amendments() - featureSingleAssetVault - featureLendingProtocol;
+        return jtx::testableAmendments() - featureSingleAssetVault - featureLendingProtocol;
     }
 
 protected:
@@ -99,8 +99,8 @@ protected:
         std::function<void(jtx::AMM&, jtx::Env&)> const& cb,
         std::optional<std::pair<STAmount, STAmount>> const& pool = std::nullopt,
         std::uint16_t tfee = 0,
-        std::optional<jtx::ter> const& ter = std::nullopt,
-        std::vector<FeatureBitset> const& features = {testable_amendments()});
+        std::optional<jtx::Ter> const& ter = std::nullopt,
+        std::vector<FeatureBitset> const& features = {testableAmendments()});
 
     void
     testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAMMArg const& arg);
@@ -117,7 +117,7 @@ protected:
 
     /* Path_test */
     /************************************************/
-    class gate
+    class Gate
     {
     private:
         std::condition_variable cv_;
@@ -129,10 +129,10 @@ protected:
         // Returns `true` if signaled.
         template <class Rep, class Period>
         bool
-        wait_for(std::chrono::duration<Rep, Period> const& rel_time)
+        waitFor(std::chrono::duration<Rep, Period> const& relTime)
         {
             std::unique_lock<std::mutex> lk(mutex_);
-            auto b = cv_.wait_for(lk, rel_time, [this] { return signaled_; });
+            auto b = cv_.wait_for(lk, relTime, [this] { return signaled_; });
             signaled_ = false;
             return b;
         }
diff --git a/src/test/jtx/AbstractClient.h b/src/test/jtx/AbstractClient.h
index eb46788c34..1eb51f2123 100644
--- a/src/test/jtx/AbstractClient.h
+++ b/src/test/jtx/AbstractClient.h
@@ -25,12 +25,12 @@ public:
         is using the JSON-RPC over HTTP/S or WebSocket transport.
 
         @param cmd The command to execute
-        @param params Json::Value of null or object type
+        @param params json::Value of null or object type
                       with zero or more key/value pairs.
         @return The server response in normalized format.
     */
-    virtual Json::Value
-    invoke(std::string const& cmd, Json::Value const& params = {}) = 0;
+    virtual json::Value
+    invoke(std::string const& cmd, json::Value const& params = {}) = 0;
 
     /// Get RPC 1.0 or RPC 2.0
     [[nodiscard]] virtual unsigned
diff --git a/src/test/jtx/Account.h b/src/test/jtx/Account.h
index a30b974522..2a11c5540e 100644
--- a/src/test/jtx/Account.h
+++ b/src/test/jtx/Account.h
@@ -17,13 +17,13 @@ class Account
 {
 private:
     // Tag for access to private contr
-    struct privateCtorTag
+    struct PrivateCtorTag
     {
     };
 
 public:
     /** The master account. */
-    static Account const master;
+    static Account const kMASTER;
 
     Account() = delete;
     Account(Account&&) = default;
@@ -35,16 +35,16 @@ public:
 
     /** Create an account from a simple string name. */
     /** @{ */
-    Account(std::string name, KeyType type = KeyType::secp256k1);
+    Account(std::string name, KeyType type = KeyType::Secp256k1);
 
-    Account(char const* name, KeyType type = KeyType::secp256k1) : Account(std::string(name), type)
+    Account(char const* name, KeyType type = KeyType::Secp256k1) : Account(std::string(name), type)
     {
     }
 
     // This constructor needs to be public so `std::pair` can use it when
     // emplacing into the cache. However, it is logically `private`. This is
     // enforced with the `privateTag` parameter.
-    Account(std::string name, std::pair<PublicKey, SecretKey> const& keys, Account::privateCtorTag);
+    Account(std::string name, std::pair<PublicKey, SecretKey> const& keys, Account::PrivateCtorTag);
 
     /** @} */
 
@@ -52,7 +52,7 @@ public:
      * secret key is unavailable, such as for pseudo-accounts. */
     explicit Account(std::string name, AccountID const& id);
 
-    enum class AcctStringType { base58Seed, other };
+    enum class AcctStringType { Base58Seed, Other };
     /** Create an account from a base58 seed string.  Throws on invalid seed. */
     Account(AcctStringType stringType, std::string base58SeedStr);
 
@@ -109,7 +109,7 @@ public:
     operator[](std::string const& s) const;
 
 private:
-    static std::unordered_map<std::pair<std::string, KeyType>, Account, beast::uhash<>> cache_;
+    static std::unordered_map<std::pair<std::string, KeyType>, Account, beast::Uhash<>> cache;
 
     // Return the account from the cache & add it to the cache if needed
     static Account
@@ -130,7 +130,7 @@ operator==(Account const& lhs, Account const& rhs) noexcept
 
 template <class Hasher>
 void
-hash_append(Hasher& h, Account const& v) noexcept
+hash_append(Hasher& h, Account const& v) noexcept  // NOLINT(readability-identifier-naming)
 {
     hash_append(h, v.id());
 }
diff --git a/src/test/jtx/CaptureLogs.h b/src/test/jtx/CaptureLogs.h
index 491a341540..7effa30074 100644
--- a/src/test/jtx/CaptureLogs.h
+++ b/src/test/jtx/CaptureLogs.h
@@ -49,7 +49,7 @@ class CaptureLogs : public Logs
     };
 
 public:
-    explicit CaptureLogs(std::string* pResult) : Logs(beast::severities::kInfo), pResult_(pResult)
+    explicit CaptureLogs(std::string* pResult) : Logs(beast::severities::KInfo), pResult_(pResult)
     {
     }
 
diff --git a/src/test/jtx/CheckMessageLogs.h b/src/test/jtx/CheckMessageLogs.h
index 4c6bd35036..34e776e871 100644
--- a/src/test/jtx/CheckMessageLogs.h
+++ b/src/test/jtx/CheckMessageLogs.h
@@ -43,7 +43,7 @@ public:
        found
     */
     CheckMessageLogs(std::string msg, bool* pFound)
-        : Logs{beast::severities::kDebug}, msg_{std::move(msg)}, pFound_{pFound}
+        : Logs{beast::severities::KDebug}, msg_{std::move(msg)}, pFound_{pFound}
     {
     }
 
diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h
index 3b55e6ef09..45c42da2e2 100644
--- a/src/test/jtx/Env.h
+++ b/src/test/jtx/Env.h
@@ -73,9 +73,9 @@ noripple(Account const& account, Args const&... args)
 }
 
 inline FeatureBitset
-testable_amendments()
+testableAmendments()
 {
-    static FeatureBitset const ids = [] {
+    static FeatureBitset const kIDS = [] {
         auto const& sa = allAmendments();
         std::vector<uint256> feats;
         feats.reserve(sa.size());
@@ -93,18 +93,18 @@ testable_amendments()
         }
         return FeatureBitset(feats);
     }();
-    return ids;
+    return kIDS;
 }
 
 //------------------------------------------------------------------------------
 
 class SuiteLogs : public Logs
 {
-    beast::unit_test::suite& suite_;
+    beast::unit_test::Suite& suite_;
 
 public:
-    explicit SuiteLogs(beast::unit_test::suite& suite)
-        : Logs(beast::severities::kError), suite_(suite)
+    explicit SuiteLogs(beast::unit_test::Suite& suite)
+        : Logs(beast::severities::KError), suite_(suite)
     {
     }
 
@@ -123,9 +123,9 @@ public:
 class Env
 {
 public:
-    beast::unit_test::suite& test;
+    beast::unit_test::Suite& test;
 
-    Account const& master = Account::master;
+    Account const& master = Account::kMASTER;
 
     /// Used by parseResult() and postConditions()
     struct ParsedResult
@@ -135,7 +135,7 @@ public:
         // with an "error" that corresponds to the "code"), or with an "error"
         // and an "exception". However, this structure allows all possible
         // combinations.
-        std::optional<error_code_i> rpcCode;
+        std::optional<ErrorCodeI> rpcCode;
         std::string rpcMessage;
         std::string rpcError;
         std::string rpcException;
@@ -152,7 +152,7 @@ private:
 
         AppBundle() = default;
         AppBundle(
-            beast::unit_test::suite& suite,
+            beast::unit_test::Suite& suite,
             std::unique_ptr<Config> config,
             std::unique_ptr<Logs> logs,
             beast::severities::Severity thresh);
@@ -176,7 +176,7 @@ public:
      * and takes ownership the passed Config pointer. Features will be enabled
      * according to rules described below (see next constructor).
      *
-     * @param suite_ the current unit_test::suite
+     * @param suite the current unit_test::suite
      * @param config The desired Config - ownership will be taken by moving
      * the pointer. See envconfig and related functions for common config
      * tweaks.
@@ -184,16 +184,16 @@ public:
      * supported_features_except() to enable all and disable specific features.
      */
     // VFALCO Could wrap the suite::log in a Journal here
-    Env(beast::unit_test::suite& suite_,
+    Env(beast::unit_test::Suite& suite,
         std::unique_ptr<Config> config,
         FeatureBitset features,
         std::unique_ptr<Logs> logs = nullptr,
-        beast::severities::Severity thresh = beast::severities::kError)
-        : test(suite_)
-        , bundle_(suite_, std::move(config), std::move(logs), thresh)
+        beast::severities::Severity thresh = beast::severities::KError)
+        : test(suite)
+        , bundle_(suite, std::move(config), std::move(logs), thresh)
         , journal{bundle_.app->getJournal("Env")}
     {
-        memoize(Account::master);
+        memoize(Account::kMASTER);
         Pathfinder::initPathTable();
         foreachFeature(features, [&appFeats = app().config().features](uint256 const& f) {
             appFeats.insert(f);
@@ -209,14 +209,14 @@ public:
      * with_only_features(...) or supported_features_except(...) to create a
      * collection of features appropriate for passing here.
      *
-     * @param suite_ the current unit_test::suite
+     * @param suite the current unit_test::suite
      * @param args collection of features
      *
      */
-    Env(beast::unit_test::suite& suite_,
+    Env(beast::unit_test::Suite& suite,
         FeatureBitset features,
         std::unique_ptr<Logs> logs = nullptr)
-        : Env(suite_, envconfig(), features, std::move(logs))
+        : Env(suite, envconfig(), features, std::move(logs))
     {
     }
 
@@ -227,16 +227,16 @@ public:
      * and takes ownership the passed Config pointer. All supported amendments
      * are enabled by this version of the constructor.
      *
-     * @param suite_ the current unit_test::suite
+     * @param suite the current unit_test::suite
      * @param config The desired Config - ownership will be taken by moving
      * the pointer. See envconfig and related functions for common config
      * tweaks.
      */
-    Env(beast::unit_test::suite& suite_,
+    Env(beast::unit_test::Suite& suite,
         std::unique_ptr<Config> config,
         std::unique_ptr<Logs> logs = nullptr,
-        beast::severities::Severity thresh = beast::severities::kError)
-        : Env(suite_, std::move(config), testable_amendments(), std::move(logs), thresh)
+        beast::severities::Severity thresh = beast::severities::KError)
+        : Env(suite, std::move(config), testableAmendments(), std::move(logs), thresh)
     {
     }
 
@@ -247,11 +247,11 @@ public:
      * test Env configuration (from envconfig()) and all supported
      * amendments enabled.
      *
-     * @param suite_ the current unit_test::suite
+     * @param suite the current unit_test::suite
      */
-    Env(beast::unit_test::suite& suite_,
-        beast::severities::Severity thresh = beast::severities::kError)
-        : Env(suite_, envconfig(), nullptr, thresh)
+    Env(beast::unit_test::Suite& suite,
+        beast::severities::Severity thresh = beast::severities::KError)
+        : Env(suite, envconfig(), nullptr, thresh)
     {
     }
 
@@ -303,24 +303,24 @@ public:
         the correct JSON as per the arguments.
     */
     template <class... Args>
-    Json::Value
+    json::Value
     rpc(unsigned apiVersion,
         std::unordered_map<std::string, std::string> const& headers,
         std::string const& cmd,
         Args&&... args);
 
     template <class... Args>
-    Json::Value
+    json::Value
     rpc(unsigned apiVersion, std::string const& cmd, Args&&... args);
 
     template <class... Args>
-    Json::Value
+    json::Value
     rpc(std::unordered_map<std::string, std::string> const& headers,
         std::string const& cmd,
         Args&&... args);
 
     template <class... Args>
-    Json::Value
+    json::Value
     rpc(std::string const& cmd, Args&&... args);
 
     /** Returns the current ledger.
@@ -459,21 +459,21 @@ public:
     }
 
     void
-    set_parse_failure_expected(bool b)
+    setParseFailureExpected(bool b)
     {
         parseFailureExpected_ = b;
     }
 
     /** Turn off signature checks. */
     void
-    disable_sigs()
+    disableSigs()
     {
         app().checkSigs(false);
     }
 
     // set rpc retries
     void
-    set_retries(unsigned r = 5)
+    setRetries(unsigned r = 5)
     {
         retries_ = r;
     }
@@ -561,7 +561,7 @@ public:
     {
         JTx jt(std::forward<JsonValue>(jv));
         invoke(jt, fN...);
-        autofill_sig(jt);
+        autofillSig(jt);
         jt.stx = st(jt);
         return jt;
     }
@@ -570,7 +570,7 @@ public:
         This will apply funclets and autofill.
     */
     template <class JsonValue, class... FN>
-    Json::Value
+    json::Value
     json(JsonValue&& jv, FN const&... fN)
     {
         auto tj = jt(std::forward<JsonValue>(jv), fN...);
@@ -592,7 +592,7 @@ public:
     /** Gets the TER result and `didApply` flag from a RPC Json result object.
      */
     static ParsedResult
-    parseResult(Json::Value const& jr);
+    parseResult(json::Value const& jr);
 
     /** Submit an existing JTx.
         This calls postconditions.
@@ -604,9 +604,9 @@ public:
         This calls postconditions.
     */
     void
-    sign_and_submit(
+    signAndSubmit(
         JTx const& jt,
-        Json::Value params = Json::nullValue,
+        json::Value params = json::NullValue,
         std::source_location const& loc = std::source_location::current());
 
     /** Check expected postconditions
@@ -616,14 +616,14 @@ public:
     postconditions(
         JTx const& jt,
         ParsedResult const& parsed,
-        Json::Value const& jr = Json::Value(),
+        json::Value const& jr = json::Value(),
         std::source_location const& loc = std::source_location::current());
 
     /** Apply funclets and submit. */
     /** @{ */
     template <class... FN>
     Env&
-    apply(WithSourceLocation<Json::Value> jv, FN const&... fN)
+    apply(WithSourceLocation<json::Value> jv, FN const&... fN)
     {
         submit(jt(std::move(jv.value), fN...), jv.loc);
         return *this;
@@ -639,7 +639,7 @@ public:
 
     template <class... FN>
     Env&
-    operator()(WithSourceLocation<Json::Value> jv, FN const&... fN)
+    operator()(WithSourceLocation<json::Value> jv, FN const&... fN)
     {
         return apply(std::move(jv), fN...);
     }
@@ -704,14 +704,14 @@ private:
     fund(bool setDefaultRipple, STAmount const& amount, Account const& account);
 
     void
-    fund_arg(STAmount const& amount, Account const& account)
+    fundArg(STAmount const& amount, Account const& account)
     {
         fund(true, amount, account);
     }
 
     template <std::size_t N>
     void
-    fund_arg(STAmount const& amount, std::array<Account, N> const& list)
+    fundArg(STAmount const& amount, std::array<Account, N> const& list)
     {
         for (auto const& account : list)
             fund(false, amount, account);
@@ -748,7 +748,7 @@ public:
     void
     fund(STAmount const& amount, Arg const& arg, Args const&... args)
     {
-        fund_arg(amount, arg);
+        fundArg(amount, arg);
         if constexpr (sizeof...(args) > 0)
             fund(amount, args...);
     }
@@ -798,14 +798,14 @@ protected:
     bool parseFailureExpected_ = false;
     unsigned retries_ = 5;
 
-    Json::Value
-    do_rpc(
+    json::Value
+    doRpc(
         unsigned apiVersion,
         std::vector<std::string> const& args,
         std::unordered_map<std::string, std::string> const& headers = {});
 
     void
-    autofill_sig(JTx& jt);
+    autofillSig(JTx& jt);
 
     virtual void
     autofill(JTx& jt);
@@ -815,7 +815,7 @@ protected:
         On a parse error, the JSON is logged and
         an exception thrown.
         Throws:
-            parse_error
+            ParseError
     */
     std::shared_ptr<STTx const>
     st(JTx const& jt);
@@ -842,18 +842,18 @@ protected:
 };
 
 template <class... Args>
-Json::Value
+json::Value
 Env::rpc(
     unsigned apiVersion,
     std::unordered_map<std::string, std::string> const& headers,
     std::string const& cmd,
     Args&&... args)
 {
-    return do_rpc(apiVersion, std::vector<std::string>{cmd, std::forward<Args>(args)...}, headers);
+    return doRpc(apiVersion, std::vector<std::string>{cmd, std::forward<Args>(args)...}, headers);
 }
 
 template <class... Args>
-Json::Value
+json::Value
 Env::rpc(unsigned apiVersion, std::string const& cmd, Args&&... args)
 {
     return rpc(
@@ -864,20 +864,20 @@ Env::rpc(unsigned apiVersion, std::string const& cmd, Args&&... args)
 }
 
 template <class... Args>
-Json::Value
+json::Value
 Env::rpc(
     std::unordered_map<std::string, std::string> const& headers,
     std::string const& cmd,
     Args&&... args)
 {
-    return do_rpc(
-        RPC::apiCommandLineVersion,
+    return doRpc(
+        RPC::kAPI_COMMAND_LINE_VERSION,
         std::vector<std::string>{cmd, std::forward<Args>(args)...},
         headers);
 }
 
 template <class... Args>
-Json::Value
+json::Value
 Env::rpc(std::string const& cmd, Args&&... args)
 {
     return rpc(std::unordered_map<std::string, std::string>(), cmd, std::forward<Args>(args)...);
diff --git a/src/test/jtx/Env_ss.h b/src/test/jtx/Env_ss.h
index e9f6ae3bb1..a49cf96bb6 100644
--- a/src/test/jtx/Env_ss.h
+++ b/src/test/jtx/Env_ss.h
@@ -8,7 +8,7 @@ namespace xrpl::test::jtx {
     Transactions submitted in sign-and-submit mode
     by default.
 */
-class Env_ss
+class EnvSs
 {
 private:
     Env& env_;
@@ -27,9 +27,9 @@ private:
         }
 
         void
-        operator()(Json::Value const& params = Json::nullValue)
+        operator()(json::Value const& params = json::NullValue)
         {
-            env_.sign_and_submit(jt_, params, loc_);
+            env_.signAndSubmit(jt_, params, loc_);
         }
 
     private:
@@ -39,17 +39,17 @@ private:
     };
 
 public:
-    Env_ss(Env_ss const&) = delete;
-    Env_ss&
-    operator=(Env_ss const&) = delete;
+    EnvSs(EnvSs const&) = delete;
+    EnvSs&
+    operator=(EnvSs const&) = delete;
 
-    Env_ss(Env& env) : env_(env)
+    EnvSs(Env& env) : env_(env)
     {
     }
 
     template <class... FN>
     SignSubmitRunner
-    operator()(WithSourceLocation<Json::Value> jv, FN const&... fN)
+    operator()(WithSourceLocation<json::Value> jv, FN const&... fN)
     {
         auto jtx = env_.jt(std::move(jv.value), fN...);
         return SignSubmitRunner(env_, std::move(jtx), jv.loc);
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index 6cef617ea7..6a28a564b7 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -65,12 +65,12 @@
 
 namespace xrpl::test {
 
-class Env_test : public beast::unit_test::suite
+class Env_test : public beast::unit_test::Suite
 {
 public:
     template <class T>
     static std::string
-    to_string(T const& t)
+    toString(T const& t)
     {
         return boost::lexical_cast<std::string>(t);
     }
@@ -88,14 +88,14 @@ public:
             Account const c(std::move(a));
         }
         Account("alice");                      // NOLINT(bugprone-unused-raii)
-        Account("alice", KeyType::secp256k1);  // NOLINT(bugprone-unused-raii)
-        Account("alice", KeyType::ed25519);    // NOLINT(bugprone-unused-raii)
+        Account("alice", KeyType::Secp256k1);  // NOLINT(bugprone-unused-raii)
+        Account("alice", KeyType::Ed25519);    // NOLINT(bugprone-unused-raii)
         auto const gw = Account("gw");
         [](AccountID) {}(gw);
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         void(Account("alice") < gw);
         std::set<Account>().emplace(gw);
-        std::unordered_set<Account, beast::uhash<>>().emplace("alice");
+        std::unordered_set<Account, beast::Uhash<>>().emplace("alice");
     }
 
     // Declarations in amount.h
@@ -134,36 +134,36 @@ public:
             pass();
         }
 
-        BEAST_EXPECT(to_string(XRP(5)) == "5 XRP");
-        BEAST_EXPECT(to_string(XRP(.80)) == "0.8 XRP");
-        BEAST_EXPECT(to_string(XRP(.005)) == "5000 drops");
-        BEAST_EXPECT(to_string(XRP(0.1)) == "0.1 XRP");
-        BEAST_EXPECT(to_string(XRP(10000)) == "10000 XRP");
-        BEAST_EXPECT(to_string(drops(10)) == "10 drops");
-        BEAST_EXPECT(to_string(drops(123400000)) == "123.4 XRP");
-        BEAST_EXPECT(to_string(XRP(-5)) == "-5 XRP");
-        BEAST_EXPECT(to_string(XRP(-.99)) == "-0.99 XRP");
-        BEAST_EXPECT(to_string(XRP(-.005)) == "-5000 drops");
-        BEAST_EXPECT(to_string(XRP(-0.1)) == "-0.1 XRP");
-        BEAST_EXPECT(to_string(drops(-10)) == "-10 drops");
-        BEAST_EXPECT(to_string(drops(-123400000)) == "-123.4 XRP");
+        BEAST_EXPECT(toString(XRP(5)) == "5 XRP");
+        BEAST_EXPECT(toString(XRP(.80)) == "0.8 XRP");
+        BEAST_EXPECT(toString(XRP(.005)) == "5000 drops");
+        BEAST_EXPECT(toString(XRP(0.1)) == "0.1 XRP");
+        BEAST_EXPECT(toString(XRP(10000)) == "10000 XRP");
+        BEAST_EXPECT(toString(drops(10)) == "10 drops");
+        BEAST_EXPECT(toString(drops(123400000)) == "123.4 XRP");
+        BEAST_EXPECT(toString(XRP(-5)) == "-5 XRP");
+        BEAST_EXPECT(toString(XRP(-.99)) == "-0.99 XRP");
+        BEAST_EXPECT(toString(XRP(-.005)) == "-5000 drops");
+        BEAST_EXPECT(toString(XRP(-0.1)) == "-0.1 XRP");
+        BEAST_EXPECT(toString(drops(-10)) == "-10 drops");
+        BEAST_EXPECT(toString(drops(-123400000)) == "-123.4 XRP");
 
         BEAST_EXPECT(XRP(1) == drops(1000000));
         BEAST_EXPECT(XRP(1) == STAmount(1000000));
         BEAST_EXPECT(STAmount(1000000) == XRP(1));
 
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        BEAST_EXPECT(to_string(USD(0)) == "0/USD(gw)");
-        BEAST_EXPECT(to_string(USD(10)) == "10/USD(gw)");
-        BEAST_EXPECT(to_string(USD(-10)) == "-10/USD(gw)");
-        BEAST_EXPECT(USD(0) == STAmount(USD, 0));
-        BEAST_EXPECT(USD(1) == STAmount(USD, 1));
-        BEAST_EXPECT(USD(-1) == STAmount(USD, -1));
+        auto const usd = gw["USD"];
+        BEAST_EXPECT(toString(usd(0)) == "0/USD(gw)");
+        BEAST_EXPECT(toString(usd(10)) == "10/USD(gw)");
+        BEAST_EXPECT(toString(usd(-10)) == "-10/USD(gw)");
+        BEAST_EXPECT(usd(0) == STAmount(usd, 0));
+        BEAST_EXPECT(usd(1) == STAmount(usd, 1));
+        BEAST_EXPECT(usd(-1) == STAmount(usd, -1));
 
         auto const get = [](AnyAmount a) { return a; };
-        BEAST_EXPECT(!get(USD(10)).is_any);
-        BEAST_EXPECT(get(any(USD(10))).is_any);
+        BEAST_EXPECT(!get(usd(10)).isAny);
+        BEAST_EXPECT(get(kANY(usd(10))).isAny);
     }
 
     // Test Env
@@ -173,13 +173,13 @@ public:
         using namespace jtx;
         auto const n = XRP(10000);
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const alice = Account("alice");
 
         // unfunded
         {
             Env env(*this);
-            env(pay("alice", "bob", XRP(1000)), seq(1), fee(10), sig("alice"), ter(terNO_ACCOUNT));
+            env(pay("alice", "bob", XRP(1000)), Seq(1), Fee(10), Sig("alice"), Ter(terNO_ACCOUNT));
         }
 
         // fund
@@ -197,9 +197,9 @@ public:
 
             // flags
             env.fund(n, noripple("xavier"));
-            env.require(nflags("xavier", asfDefaultRipple));
+            env.require(Nflags("xavier", asfDefaultRipple));
             env.fund(n, "zachary");
-            env.require(flags("zachary", asfDefaultRipple));
+            env.require(Flags("zachary", asfDefaultRipple));
         }
 
         // trust
@@ -207,23 +207,23 @@ public:
             Env env(*this);
             env.fund(n, "alice", "bob", gw);
             env.close();
-            env(trust("alice", USD(100)), require(lines("alice", 1)));
+            env(trust("alice", usd(100)), Require(lines("alice", 1)));
         }
 
         // balance
         {
             Env env(*this);
             BEAST_EXPECT(env.balance(alice) == 0);
-            BEAST_EXPECT(env.balance(alice, USD) != 0);
-            BEAST_EXPECT(env.balance(alice, USD) == USD(0));
+            BEAST_EXPECT(env.balance(alice, usd) != 0);
+            BEAST_EXPECT(env.balance(alice, usd) == usd(0));
             env.fund(n, alice, gw);
             env.close();
             BEAST_EXPECT(env.balance(alice) == n);
             BEAST_EXPECT(env.balance(gw) == n);
-            env.trust(USD(1000), alice);
-            env(pay(gw, alice, USD(10)));
-            BEAST_EXPECT(to_string(env.balance("alice", USD)) == "10/USD(gw)");
-            BEAST_EXPECT(to_string(env.balance(gw, alice["USD"])) == "-10/USD(alice)");
+            env.trust(usd(1000), alice);
+            env(pay(gw, alice, usd(10)));
+            BEAST_EXPECT(toString(env.balance("alice", usd)) == "10/USD(gw)");
+            BEAST_EXPECT(toString(env.balance(gw, alice["USD"])) == "-10/USD(alice)");
         }
 
         // seq
@@ -238,15 +238,15 @@ public:
         {
             Env env(*this);
             env.fund(n, "alice");
-            env.require(balance("alice", n));
-            env(noop("alice"), fee(1), ter(telINSUF_FEE_P));
-            env(noop("alice"), seq(none), ter(temMALFORMED));
-            env(noop("alice"), seq(none), fee(10), ter(temMALFORMED));
-            env(noop("alice"), fee(none), ter(temMALFORMED));
-            env(noop("alice"), sig(none), ter(temMALFORMED));
-            env(noop("alice"), fee(autofill));
-            env(noop("alice"), fee(autofill), seq(autofill));
-            env(noop("alice"), fee(autofill), seq(autofill), sig(autofill));
+            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));
         }
     }
 
@@ -257,20 +257,20 @@ public:
         using namespace jtx;
         Env env(*this);
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
-        env.require(balance("alice", none));
-        env.require(balance("alice", XRP(none)));
+        auto const usd = gw["USD"];
+        env.require(Balance("alice", kNONE));
+        env.require(Balance("alice", XRP(kNONE)));
         env.fund(XRP(10000), "alice", gw);
         env.close();
-        env.require(balance("alice", USD(none)));
-        env.trust(USD(100), "alice");
-        env.require(balance("alice", XRP(10000)));  // fee refunded
-        env.require(balance("alice", USD(0)));
-        env(pay(gw, "alice", USD(10)), require(balance("alice", USD(10))));
+        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)));
+        env(pay(gw, "alice", usd(10)), Require(Balance("alice", usd(10))));
 
-        env.require(nflags("alice", asfRequireDest));
-        env(fset("alice", asfRequireDest), require(flags("alice", asfRequireDest)));
-        env(fclear("alice", asfRequireDest), require(nflags("alice", asfRequireDest)));
+        env.require(Nflags("alice", asfRequireDest));
+        env(fset("alice", asfRequireDest), Require(Flags("alice", asfRequireDest)));
+        env(fclear("alice", asfRequireDest), Require(Nflags("alice", asfRequireDest)));
     }
 
     // Signing with secp256k1 and ed25519 keys
@@ -279,34 +279,34 @@ public:
     {
         using namespace jtx;
 
-        Env env{*this, testable_amendments()};
-        Account const alice("alice", KeyType::ed25519);
-        Account const bob("bob", KeyType::secp256k1);
+        Env env{*this, testableAmendments()};
+        Account const alice("alice", KeyType::Ed25519);
+        Account const bob("bob", KeyType::Secp256k1);
         Account const carol("carol");
         env.fund(XRP(10000), alice, bob);
 
         // Master key only
         env(noop(alice));
         env(noop(bob));
-        env(noop(alice), sig("alice"), ter(tefBAD_AUTH));
-        env(noop(alice), sig(Account("alice", KeyType::secp256k1)), ter(tefBAD_AUTH));
-        env(noop(bob), sig(Account("bob", KeyType::ed25519)), ter(tefBAD_AUTH));
-        env(noop(alice), sig(carol), ter(tefBAD_AUTH));
+        env(noop(alice), Sig("alice"), Ter(tefBAD_AUTH));
+        env(noop(alice), Sig(Account("alice", KeyType::Secp256k1)), Ter(tefBAD_AUTH));
+        env(noop(bob), Sig(Account("bob", KeyType::Ed25519)), Ter(tefBAD_AUTH));
+        env(noop(alice), Sig(carol), Ter(tefBAD_AUTH));
 
         // Master and Regular key
         env(regkey(alice, bob));
         env(noop(alice));
-        env(noop(alice), sig(bob));
-        env(noop(alice), sig(alice));
+        env(noop(alice), Sig(bob));
+        env(noop(alice), Sig(alice));
 
         // Regular key only
-        env(fset(alice, asfDisableMaster), sig(alice));
+        env(fset(alice, asfDisableMaster), Sig(alice));
         env(noop(alice));
-        env(noop(alice), sig(bob));
-        env(noop(alice), sig(alice), ter(tefMASTER_DISABLED));
-        env(fclear(alice, asfDisableMaster), sig(alice), ter(tefMASTER_DISABLED));
-        env(fclear(alice, asfDisableMaster), sig(bob));
-        env(noop(alice), sig(alice));
+        env(noop(alice), Sig(bob));
+        env(noop(alice), Sig(alice), Ter(tefMASTER_DISABLED));
+        env(fclear(alice, asfDisableMaster), Sig(alice), Ter(tefMASTER_DISABLED));
+        env(fclear(alice, asfDisableMaster), Sig(bob));
+        env(noop(alice), Sig(alice));
     }
 
     // Payment basics
@@ -316,60 +316,60 @@ public:
         using namespace jtx;
         Env env(*this);
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), "alice", "bob", "carol", gw);
-        env.require(balance("alice", XRP(10000)));
-        env.require(balance("bob", XRP(10000)));
-        env.require(balance("carol", XRP(10000)));
-        env.require(balance(gw, XRP(10000)));
+        env.require(Balance("alice", XRP(10000)));
+        env.require(Balance("bob", XRP(10000)));
+        env.require(Balance("carol", XRP(10000)));
+        env.require(Balance(gw, XRP(10000)));
 
-        env(pay(env.master, "alice", XRP(1000)), fee(none), ter(temMALFORMED));
-        env(pay(env.master, "alice", XRP(1000)), fee(1), ter(telINSUF_FEE_P));
-        env(pay(env.master, "alice", XRP(1000)), seq(none), ter(temMALFORMED));
-        env(pay(env.master, "alice", XRP(1000)), seq(20), ter(terPRE_SEQ));
-        env(pay(env.master, "alice", XRP(1000)), sig(none), ter(temMALFORMED));
-        env(pay(env.master, "alice", XRP(1000)), sig("bob"), ter(tefBAD_AUTH));
+        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(20), Ter(terPRE_SEQ));
+        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));
+        env(pay(env.master, "dilbert", XRP(1000)), Sig(env.master));
 
-        env.trust(USD(100), "alice", "bob", "carol");
-        env.require(owners("alice", 1), lines("alice", 1));
+        env.trust(usd(100), "alice", "bob", "carol");
+        env.require(Owners("alice", 1), lines("alice", 1));
         env(rate(gw, 1.05));
 
-        env(pay(gw, "carol", USD(50)));
-        env.require(balance("carol", USD(50)));
-        env.require(balance(gw, Account("carol")["USD"](-50)));
+        env(pay(gw, "carol", usd(50)));
+        env.require(Balance("carol", usd(50)));
+        env.require(Balance(gw, Account("carol")["USD"](-50)));
 
-        env(offer("carol", XRP(50), USD(50)), require(owners("carol", 2)));
-        env(pay("alice", "bob", any(USD(10))), ter(tecPATH_DRY));
-        env(pay("alice", "bob", any(USD(10))), paths(XRP), sendmax(XRP(10)), ter(tecPATH_PARTIAL));
-        env(pay("alice", "bob", any(USD(10))), paths(XRP), sendmax(XRP(20)));
-        env.require(balance("bob", USD(10)));
-        env.require(balance("carol", USD(39.5)));
+        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.require(Balance("bob", usd(10)));
+        env.require(Balance("carol", usd(39.5)));
 
         env.memoize("eric");
         env(regkey("alice", "eric"));
         env(noop("alice"));
-        env(noop("alice"), sig("alice"));
-        env(noop("alice"), sig("eric"));
-        env(noop("alice"), sig("bob"), ter(tefBAD_AUTH));
-        env(fset("alice", asfDisableMaster), ter(tecNEED_MASTER_KEY));
-        env(fset("alice", asfDisableMaster), sig("eric"), ter(tecNEED_MASTER_KEY));
-        env.require(nflags("alice", asfDisableMaster));
-        env(fset("alice", asfDisableMaster), sig("alice"));
-        env.require(flags("alice", asfDisableMaster));
-        env(regkey("alice", disabled), ter(tecNO_ALTERNATIVE_KEY));
+        env(noop("alice"), Sig("alice"));
+        env(noop("alice"), Sig("eric"));
+        env(noop("alice"), Sig("bob"), Ter(tefBAD_AUTH));
+        env(fset("alice", asfDisableMaster), Ter(tecNEED_MASTER_KEY));
+        env(fset("alice", asfDisableMaster), Sig("eric"), Ter(tecNEED_MASTER_KEY));
+        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(noop("alice"));
-        env(noop("alice"), sig("alice"), ter(tefMASTER_DISABLED));
-        env(noop("alice"), sig("eric"));
-        env(noop("alice"), sig("bob"), ter(tefBAD_AUTH));
-        env(fclear("alice", asfDisableMaster), sig("bob"), ter(tefBAD_AUTH));
-        env(fclear("alice", asfDisableMaster), sig("alice"), ter(tefMASTER_DISABLED));
+        env(noop("alice"), Sig("alice"), Ter(tefMASTER_DISABLED));
+        env(noop("alice"), Sig("eric"));
+        env(noop("alice"), Sig("bob"), Ter(tefBAD_AUTH));
+        env(fclear("alice", asfDisableMaster), Sig("bob"), Ter(tefBAD_AUTH));
+        env(fclear("alice", asfDisableMaster), Sig("alice"), Ter(tefMASTER_DISABLED));
         env(fclear("alice", asfDisableMaster));
-        env.require(nflags("alice", asfDisableMaster));
-        env(regkey("alice", disabled));
-        env(noop("alice"), sig("eric"), ter(tefBAD_AUTH));
+        env.require(Nflags("alice", asfDisableMaster));
+        env(regkey("alice", kDISABLED));
+        env(noop("alice"), Sig("eric"), Ter(tefBAD_AUTH));
         env(noop("alice"));
     }
 
@@ -382,7 +382,7 @@ public:
         using namespace jtx;
         Env env(*this);
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         auto const alice = Account{"alice"};
         env.fund(XRP(10000), alice);
@@ -397,7 +397,7 @@ public:
             Serializer s;
             jt.stx->add(s);
 
-            Json::Value args{Json::objectValue};
+            json::Value args{json::ObjectValue};
 
             args[jss::tx_blob] = strHex(s.slice());
             args[jss::fail_hard] = true;
@@ -405,35 +405,35 @@ public:
             return env.rpc("json", "submit", args.toStyledString());
         };
 
-        auto jr = applyTxn(noop(alice), fee(1));
+        auto jr = applyTxn(noop(alice), Fee(1));
 
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "telINSUF_FEE_P");
         BEAST_EXPECT(env.app().getTxQ().getMetrics(*env.current()).txCount == queueTxCount);
         BEAST_EXPECT(env.app().getOPs().getLocalTxCount() == localTxCnt);
         BEAST_EXPECT(env.current()->txCount() == openTxCount);
 
-        jr = applyTxn(noop(alice), sig("bob"));
+        jr = applyTxn(noop(alice), Sig("bob"));
 
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "tefBAD_AUTH");
         BEAST_EXPECT(env.app().getTxQ().getMetrics(*env.current()).txCount == queueTxCount);
         BEAST_EXPECT(env.app().getOPs().getLocalTxCount() == localTxCnt);
         BEAST_EXPECT(env.current()->txCount() == openTxCount);
 
-        jr = applyTxn(noop(alice), seq(20));
+        jr = applyTxn(noop(alice), Seq(20));
 
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "terPRE_SEQ");
         BEAST_EXPECT(env.app().getTxQ().getMetrics(*env.current()).txCount == queueTxCount);
         BEAST_EXPECT(env.app().getOPs().getLocalTxCount() == localTxCnt);
         BEAST_EXPECT(env.current()->txCount() == openTxCount);
 
-        jr = applyTxn(offer(alice, XRP(1000), USD(1000)));
+        jr = applyTxn(offer(alice, XRP(1000), usd(1000)));
 
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "tecUNFUNDED_OFFER");
         BEAST_EXPECT(env.app().getTxQ().getMetrics(*env.current()).txCount == queueTxCount);
         BEAST_EXPECT(env.app().getOPs().getLocalTxCount() == localTxCnt);
         BEAST_EXPECT(env.current()->txCount() == openTxCount);
 
-        jr = applyTxn(noop(alice), fee(drops(-10)));
+        jr = applyTxn(noop(alice), Fee(drops(-10)));
 
         BEAST_EXPECT(jr[jss::result][jss::engine_result] == "temBAD_FEE");
         BEAST_EXPECT(env.app().getTxQ().getMetrics(*env.current()).txCount == queueTxCount);
@@ -455,20 +455,20 @@ public:
 
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        env(signers("alice", 1, {{"alice", 1}, {"bob", 2}}), ter(temBAD_SIGNER));
+        env(signers("alice", 1, {{"alice", 1}, {"bob", 2}}), Ter(temBAD_SIGNER));
         env(signers("alice", 1, {{"bob", 1}, {"carol", 2}}));
         env(noop("alice"));
 
         auto const baseFee = env.current()->fees().base;
-        env(noop("alice"), msig("bob"), fee(2 * baseFee));
-        env(noop("alice"), msig("carol"), fee(2 * baseFee));
-        env(noop("alice"), msig("bob", "carol"), fee(3 * baseFee));
+        env(noop("alice"), Msig("bob"), Fee(2 * baseFee));
+        env(noop("alice"), Msig("carol"), Fee(2 * baseFee));
+        env(noop("alice"), Msig("bob", "carol"), Fee(3 * baseFee));
         env(noop("alice"),
-            msig("bob", "carol", "dilbert"),
-            fee(4 * baseFee),
-            ter(tefBAD_SIGNATURE));
+            Msig("bob", "carol", "dilbert"),
+            Fee(4 * baseFee),
+            Ter(tefBAD_SIGNATURE));
 
-        env(signers("alice", none));
+        env(signers("alice", kNONE));
     }
 
     void
@@ -481,8 +481,8 @@ public:
         {
             Env env(*this);
             env.fund(XRP(10000), "alice");
-            env(noop("alice"), require(owners("alice", 0), tickets("alice", 0)));
-            env(ticket::create("alice", 1), require(owners("alice", 1), tickets("alice", 1)));
+            env(noop("alice"), Require(Owners("alice", 0), tickets("alice", 0)));
+            env(ticket::create("alice", 1), Require(Owners("alice", 1), tickets("alice", 1)));
         }
     }
 
@@ -535,10 +535,10 @@ public:
         env.fund(XRP(100000), "alice");
         auto jt1 = env.jt(noop("alice"));
         BEAST_EXPECT(!jt1.get<std::uint16_t>());
-        auto jt2 = env.jt(noop("alice"), prop<std::uint16_t>(-1));
+        auto jt2 = env.jt(noop("alice"), Prop<std::uint16_t>(-1));
         BEAST_EXPECT(jt2.get<std::uint16_t>());
         BEAST_EXPECT(*jt2.get<std::uint16_t>() == 65535);
-        auto jt3 = env.jt(noop("alice"), prop<std::string>("Hello, world!"), prop<bool>(false));
+        auto jt3 = env.jt(noop("alice"), Prop<std::string>("Hello, world!"), Prop<bool>(false));
         BEAST_EXPECT(jt3.get<std::string>());
         BEAST_EXPECT(*jt3.get<std::string>() == "Hello, world!");
         BEAST_EXPECT(jt3.get<bool>());
@@ -600,11 +600,11 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        env(noop("alice"), memo_data("data"));
-        env(noop("alice"), memo_format("format"));
-        env(noop("alice"), memo_type("type"));
-        env(noop("alice"), memo("data", "format", "type"));
-        env(noop("alice"), memo("data1", "format1", "type1"), memo("data2", "format2", "type2"));
+        env(noop("alice"), MemoData("data"));
+        env(noop("alice"), MemoFormat("format"));
+        env(noop("alice"), MemoType("type"));
+        env(noop("alice"), Memo("data", "format", "type"));
+        env(noop("alice"), Memo("data1", "format1", "type1"), Memo("data2", "format2", "type2"));
     }
 
     void
@@ -613,7 +613,7 @@ public:
         using namespace jtx;
         Env env(*this);
         JTx jt(noop("alice"));
-        memo("data", "format", "type")(env, jt);
+        Memo("data", "format", "type")(env, jt);
 
         auto const& memo = jt.jv["Memos"][0u]["Memo"];
         BEAST_EXPECT(memo["MemoData"].asString() == strHex(std::string("data")));
@@ -658,17 +658,17 @@ public:
         using namespace jtx;
         Env env(*this);
         auto const gw = Account("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), "alice", "bob");
         env.close();
         env.json(
-            pay("alice", "bob", USD(10)),
-            path(Account("alice")),
-            path("bob"),
-            path(USD),
-            path(~XRP),
-            path(~USD),
-            path("bob", USD, ~XRP, ~USD));
+            pay("alice", "bob", usd(10)),
+            Path(Account("alice")),
+            Path("bob"),
+            Path(usd),
+            Path(~XRP),
+            Path(~usd),
+            Path("bob", usd, ~XRP, ~usd));
     }
 
     // Test that jtx can re-sign a transaction that's already been signed.
@@ -682,11 +682,11 @@ public:
         auto const baseFee = env.current()->fees().base;
         std::uint32_t const aliceSeq = env.seq("alice");
 
-        // Sign jsonNoop.
-        Json::Value const jsonNoop =
-            env.json(noop("alice"), fee(baseFee), seq(aliceSeq), sig("alice"));
-        // Re-sign jsonNoop.
-        JTx const jt = env.jt(jsonNoop);
+        // Sign jsonNoOp.
+        json::Value const jsonNoOp =
+            env.json(noop("alice"), Fee(baseFee), Seq(aliceSeq), Sig("alice"));
+        // Re-sign jsonNoOp.
+        JTx const jt = env.jt(jsonNoOp);
         env(jt);
     }
 
@@ -695,7 +695,7 @@ public:
     {
         using namespace jtx;
         Env env(*this);
-        Env_ss envs(env);
+        EnvSs envs(env);
 
         auto const baseFee = env.current()->fees().base;
 
@@ -703,7 +703,7 @@ public:
         env.fund(XRP(10000), alice);
 
         {
-            envs(noop(alice), fee(none), seq(none))();
+            envs(noop(alice), Fee(kNONE), Seq(kNONE))();
 
             // Make sure we get the right account back.
             auto tx = env.tx();
@@ -715,8 +715,8 @@ public:
         }
 
         {
-            auto params = Json::Value(Json::nullValue);
-            envs(noop(alice), fee(none), seq(none))(params);
+            auto params = json::Value(json::NullValue);
+            envs(noop(alice), Fee(kNONE), Seq(kNONE))(params);
 
             // Make sure we get the right account back.
             auto tx = env.tx();
@@ -728,14 +728,14 @@ public:
         }
 
         {
-            auto params = Json::Value(Json::objectValue);
+            auto params = json::Value(json::ObjectValue);
             // Force the factor low enough to fail
             params[jss::fee_mult_max] = 1;
             params[jss::fee_div_max] = 2;
 
             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(none), seq(none), rpc(rpcHIGH_FEE, expectedErrorString))(params);
+            envs(noop(alice), Fee(kNONE), Seq(kNONE), Rpc(RpcHighFee, expectedErrorString))(params);
 
             auto tx = env.tx();
             BEAST_EXPECT(!tx);
@@ -747,7 +747,7 @@ public:
     {
         testcase("Env features");
         using namespace jtx;
-        auto const supported = testable_amendments();
+        auto const supported = testableAmendments();
 
         // this finds a feature that is not in
         // the supported amendments list and tests that it can be
@@ -794,7 +794,7 @@ public:
         }
 
         auto const missingSomeFeatures =
-            testable_amendments() - featureDynamicMPT - featureTokenEscrow;
+            testableAmendments() - featureDynamicMPT - featureTokenEscrow;
         BEAST_EXPECT(missingSomeFeatures.count() == (supported.count() - 2));
         {
             // a Env supported_features_except is missing *only* those features
@@ -845,7 +845,7 @@ public:
             // add a feature that is NOT in the supported amendments list
             // along with all supported amendments
             // the unsupported features should be enabled
-            Env env{*this, testable_amendments().set(*neverSupportedFeat)};
+            Env env{*this, testableAmendments().set(*neverSupportedFeat)};
 
             // this app will have all supported amendments and then the
             // one additional never supported feature flag
@@ -867,7 +867,7 @@ public:
                     return cfg;
                 }),
                 nullptr,
-                beast::severities::kDisabled};
+                beast::severities::KDisabled};
         });
         pass();
     }
diff --git a/src/test/jtx/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h
index a2ff815f48..2864cbbdc8 100644
--- a/src/test/jtx/JSONRPCClient.h
+++ b/src/test/jtx/JSONRPCClient.h
@@ -10,6 +10,6 @@ namespace xrpl::test {
 
 /** Returns a client using JSON-RPC over HTTP/S. */
 std::unique_ptr<AbstractClient>
-makeJSONRPCClient(Config const& cfg, unsigned rpc_version = 2);
+makeJSONRPCClient(Config const& cfg, unsigned rpcVersion = 2);
 
 }  // namespace xrpl::test
diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h
index 4693c4e1a7..121e6cc825 100644
--- a/src/test/jtx/JTx.h
+++ b/src/test/jtx/JTx.h
@@ -21,15 +21,15 @@ class Env;
 */
 struct JTx
 {
-    Json::Value jv;
+    json::Value jv;
     requires_t require;
     std::optional<TER> ter = TER{tesSUCCESS};
-    std::optional<std::pair<error_code_i, std::string>> rpcCode = std::nullopt;
+    std::optional<std::pair<ErrorCodeI, std::string>> rpcCode = std::nullopt;
     std::optional<std::pair<std::string, std::optional<std::string>>> rpcException = std::nullopt;
-    bool fill_fee = true;
-    bool fill_seq = true;
-    bool fill_sig = true;
-    bool fill_netid = true;
+    bool fillFee = true;
+    bool fillSeq = true;
+    bool fillSig = true;
+    bool fillNetid = true;
     std::shared_ptr<STTx const> stx;
     // Functions that sign the transaction from the Account
     std::vector<std::function<void(Env&, JTx&)>> mainSigners;
@@ -45,16 +45,16 @@ struct JTx
     JTx&
     operator=(JTx&&) = default;
 
-    JTx(Json::Value&& jv_) : jv(std::move(jv_))
+    JTx(json::Value&& jv) : jv(std::move(jv))
     {
     }
 
-    JTx(Json::Value const& jv_) : jv(jv_)
+    JTx(json::Value const& jv) : jv(jv)
     {
     }
 
     template <class Key>
-    Json::Value&
+    json::Value&
     operator[](Key const& key)
     {
         return jv[key];
@@ -71,7 +71,7 @@ struct JTx
     {
         for (auto& prop : props_.list)
         {
-            if (auto test = dynamic_cast<prop_type<Prop>*>(prop.get()))
+            if (auto test = dynamic_cast<PropType<Prop>*>(prop.get()))
                 return &test->t;
         }
         return nullptr;
@@ -83,7 +83,7 @@ struct JTx
     {
         for (auto& prop : props_.list)
         {
-            if (auto test = dynamic_cast<prop_type<Prop> const*>(prop.get()))
+            if (auto test = dynamic_cast<PropType<Prop> const*>(prop.get()))
                 return &test->t;
         }
         return nullptr;
@@ -96,7 +96,7 @@ struct JTx
     */
     /** @{ */
     void
-    set(std::unique_ptr<basic_prop> p)
+    set(std::unique_ptr<BasicProp> p)
     {
         for (auto& prop : props_.list)
         {
@@ -113,23 +113,23 @@ struct JTx
     void
     set(Args&&... args)
     {
-        set(std::make_unique<prop_type<Prop>>(std::forward<Args>(args)...));
+        set(std::make_unique<PropType<Prop>>(std::forward<Args>(args)...));
     }
     /** @} */
 
 private:
-    struct prop_list
+    struct PropList
     {
-        prop_list() = default;
+        PropList() = default;
 
-        prop_list(prop_list const& other)
+        PropList(PropList const& other)
         {
             for (auto const& prop : other.list)
                 list.emplace_back(prop->clone());
         }
 
-        prop_list&
-        operator=(prop_list const& other)
+        PropList&
+        operator=(PropList const& other)
         {
             if (this != &other)
             {
@@ -140,14 +140,14 @@ private:
             return *this;
         }
 
-        prop_list(prop_list&& src) = default;
-        prop_list&
-        operator=(prop_list&& src) = default;
+        PropList(PropList&& src) = default;
+        PropList&
+        operator=(PropList&& src) = default;
 
-        std::vector<std::unique_ptr<basic_prop>> list;
+        std::vector<std::unique_ptr<BasicProp>> list;
     };
 
-    prop_list props_;
+    PropList props_;
 };
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/Oracle.h b/src/test/jtx/Oracle.h
index c70bce623f..becc572e4a 100644
--- a/src/test/jtx/Oracle.h
+++ b/src/test/jtx/Oracle.h
@@ -6,14 +6,14 @@
 
 namespace xrpl::test::jtx::oracle {
 
-using AnyValue = std::variant<std::string, double, Json::Int, Json::UInt>;
+using AnyValue = std::variant<std::string, double, json::Int, json::UInt>;
 using OraclesData = std::vector<std::pair<std::optional<Account>, std::optional<AnyValue>>>;
 
 // Special string value, which is converted to unquoted string in the string
 // passed to rpc.
-constexpr char const* NoneTag = "%None%";
-constexpr char const* UnquotedNone = "None";
-constexpr char const* NonePattern = "\"%None%\"";
+constexpr char const* kNONE_TAG = "%None%";
+constexpr char const* kUNQUOTED_NONE = "None";
+constexpr char const* kNONE_PATTERN = "\"%None%\"";
 
 std::uint32_t
 asUInt(AnyValue const& v);
@@ -22,10 +22,10 @@ bool
 validDocumentID(AnyValue const& v);
 
 void
-toJson(Json::Value& jv, AnyValue const& v);
+toJson(json::Value& jv, AnyValue const& v);
 
 void
-toJsonHex(Json::Value& jv, AnyValue const& v);
+toJsonHex(json::Value& jv, AnyValue const& v);
 
 // base asset, quote asset, price, scale
 using DataSeries = std::vector<
@@ -43,10 +43,10 @@ struct CreateArg
     std::optional<AnyValue> uri = "URI";
     std::optional<AnyValue> lastUpdateTime = std::nullopt;
     std::uint32_t flags = 0;
-    std::optional<jtx::msig> msig = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
+    std::optional<jtx::Msig> msig = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
     int fee = 10;
-    std::optional<ter> err = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
     bool close = false;
 };
 
@@ -61,10 +61,10 @@ struct UpdateArg
     std::optional<AnyValue> uri = "URI";
     std::optional<AnyValue> lastUpdateTime = std::nullopt;
     std::uint32_t flags = 0;
-    std::optional<jtx::msig> msig = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
+    std::optional<jtx::Msig> msig = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
     int fee = 10;
-    std::optional<ter> err = std::nullopt;
+    std::optional<Ter> err = std::nullopt;
 };
 
 struct RemoveArg
@@ -72,10 +72,10 @@ struct RemoveArg
     std::optional<AccountID> const& owner = std::nullopt;
     std::optional<AnyValue> const& documentID = std::nullopt;
     std::uint32_t flags = 0;
-    std::optional<jtx::msig> const& msig = std::nullopt;
-    std::optional<jtx::seq> seq = std::nullopt;
+    std::optional<jtx::Msig> const& msig = std::nullopt;
+    std::optional<jtx::Seq> seq = std::nullopt;
     int fee = 10;
-    std::optional<ter> const& err = std::nullopt;
+    std::optional<Ter> const& err = std::nullopt;
 };
 
 // Simulate testStartTime as 10'000s from XRPL epoch time to make
@@ -83,7 +83,8 @@ 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 testStartTime = epoch_offset + std::chrono::seconds(10'000);
+constexpr static std::chrono::seconds kTEST_START_TIME =
+    kEPOCH_OFFSET + 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,
@@ -101,10 +102,10 @@ private:
 private:
     void
     submit(
-        Json::Value const& jv,
-        std::optional<jtx::msig> const& msig,
-        std::optional<jtx::seq> const& seq,
-        std::optional<ter> const& err);
+        json::Value const& jv,
+        std::optional<jtx::Msig> const& msig,
+        std::optional<jtx::Seq> const& seq,
+        std::optional<Ter> const& err);
 
 public:
     Oracle(Env& env, CreateArg const& arg, bool submit = true);
@@ -117,7 +118,7 @@ public:
     void
     set(UpdateArg const& arg);
 
-    static Json::Value
+    static json::Value
     aggregatePrice(
         Env& env,
         std::optional<AnyValue> const& baseAsset,
@@ -147,14 +148,14 @@ public:
     [[nodiscard]] bool
     expectLastUpdateTime(std::uint32_t lastUpdateTime) const;
 
-    static Json::Value
+    static json::Value
     ledgerEntry(
         Env& env,
         std::optional<std::variant<AccountID, std::string>> const& account,
         std::optional<AnyValue> const& documentID,
         std::optional<std::string> const& index = std::nullopt);
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     ledgerEntry(std::optional<std::string> const& index = std::nullopt) const
     {
         return Oracle::ledgerEntry(env_, owner_, documentID_, index);
diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h
index fc739861cb..9b5f893d5a 100644
--- a/src/test/jtx/PathSet.h
+++ b/src/test/jtx/PathSet.h
@@ -62,33 +62,33 @@ isOffer(jtx::Env& env, jtx::Account const& account, Asset const& takerPays, Asse
     return countOffers(env, account, takerPays, takerGets) > 0;
 }
 
-class Path
+class TestPath
 {
 public:
     STPath path;
 
-    Path() = default;
-    Path(Path const&) = default;
-    Path&
-    operator=(Path const&) = default;
-    Path(Path&&) = default;
-    Path&
-    operator=(Path&&) = default;
+    TestPath() = default;
+    TestPath(TestPath const&) = default;
+    TestPath&
+    operator=(TestPath const&) = default;
+    TestPath(TestPath&&) = default;
+    TestPath&
+    operator=(TestPath&&) = default;
 
     template <class First, class... Rest>
-    explicit Path(First&& first, Rest&&... rest)
+    explicit TestPath(First&& first, Rest&&... rest)
     {
         addHelper(std::forward<First>(first), std::forward<Rest>(rest)...);
     }
-    Path&
-    push_back(Issue const& iss);
-    Path&
-    push_back(MPTIssue const& iss);
-    Path&
-    push_back(jtx::Account const& acc);
-    Path&
-    push_back(STPathElement const& pe);
-    [[nodiscard]] Json::Value
+    TestPath&
+    pushBack(Issue const& iss);
+    TestPath&
+    pushBack(MPTIssue const& iss);
+    TestPath&
+    pushBack(jtx::Account const& acc);
+    TestPath&
+    pushBack(STPathElement const& pe);
+    [[nodiscard]] json::Value
     json() const;
 
 private:
@@ -97,55 +97,55 @@ private:
     addHelper(First&& first, Rest&&... rest);
 };
 
-inline Path&
-Path::push_back(STPathElement const& pe)
+inline TestPath&
+TestPath::pushBack(STPathElement const& pe)
 {
-    path.emplace_back(pe);
+    path.emplaceBack(pe);
     return *this;
 }
 
-inline Path&
-Path::push_back(Issue const& iss)
+inline TestPath&
+TestPath::pushBack(Issue const& iss)
 {
-    path.emplace_back(
-        STPathElement::typeCurrency | STPathElement::typeIssuer,
-        beast::zero,
+    path.emplaceBack(
+        STPathElement::TypeCurrency | STPathElement::TypeIssuer,
+        beast::kZERO,
         iss.currency,
         iss.account);
     return *this;
 }
 
-inline Path&
-Path::push_back(MPTIssue const& iss)
+inline TestPath&
+TestPath::pushBack(MPTIssue const& iss)
 {
-    path.emplace_back(
-        STPathElement::typeMPT | STPathElement::typeIssuer,
-        beast::zero,
+    path.emplaceBack(
+        STPathElement::TypeMpt | STPathElement::TypeIssuer,
+        beast::kZERO,
         iss.getMptID(),
         iss.getIssuer());
     return *this;
 }
 
-inline Path&
-Path::push_back(jtx::Account const& account)
+inline TestPath&
+TestPath::pushBack(jtx::Account const& account)
 {
-    path.emplace_back(account.id(), Currency{beast::zero}, beast::zero);
+    path.emplaceBack(account.id(), Currency{beast::kZERO}, beast::kZERO);
     return *this;
 }
 
 template <class First, class... Rest>
 void
-Path::addHelper(First&& first, Rest&&... rest)
+TestPath::addHelper(First&& first, Rest&&... rest)
 {
-    push_back(std::forward<First>(first));
+    pushBack(std::forward<First>(first));
     if constexpr (sizeof...(rest) > 0)
         addHelper(std::forward<Rest>(rest)...);
 }
 
-inline Json::Value
-Path::json() const
+inline json::Value
+TestPath::json() const
 {
-    return path.getJson(JsonOptions::none);
+    return path.getJson(JsonOptions::KNone);
 }
 
 class PathSet
@@ -166,11 +166,11 @@ public:
     {
         addHelper(std::forward<First>(first), std::forward<Rest>(rest)...);
     }
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     json() const
     {
-        Json::Value v;
-        v["Paths"] = paths.getJson(JsonOptions::none);
+        json::Value v;
+        v["Paths"] = paths.getJson(JsonOptions::KNone);
         return v;
     }
 
@@ -179,7 +179,7 @@ private:
     void
     addHelper(First first, Rest... rest)
     {
-        paths.emplace_back(std::move(first.path));
+        paths.emplaceBack(std::move(first.path));
         if constexpr (sizeof...(rest) > 0)
             addHelper(std::move(rest)...);
     }
diff --git a/src/test/jtx/SignerUtils.h b/src/test/jtx/SignerUtils.h
index dd68701303..92188202b8 100644
--- a/src/test/jtx/SignerUtils.h
+++ b/src/test/jtx/SignerUtils.h
@@ -17,7 +17,7 @@ struct Reg
     {
     }
 
-    Reg(Account acct_, Account regularSig) : acct(std::move(acct_)), sig(std::move(regularSig))
+    Reg(Account acct, Account regularSig) : acct(std::move(acct)), sig(std::move(regularSig))
     {
     }
 
@@ -25,7 +25,7 @@ struct Reg
     {
     }
 
-    Reg(char const* acct_, char const* regularSig) : acct(acct_), sig(regularSig)
+    Reg(char const* acct, char const* regularSig) : acct(acct), sig(regularSig)
     {
     }
 
diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h
index ae52c50b89..de0017bfa9 100644
--- a/src/test/jtx/TestHelpers.h
+++ b/src/test/jtx/TestHelpers.h
@@ -79,7 +79,7 @@ public:
     }
 };
 
-struct timePointField : public JTxField<SF_UINT32, NetClock::time_point, NetClock::rep>
+struct TimePointField : public JTxField<SF_UINT32, NetClock::time_point, NetClock::rep>
 {
     using SF = SF_UINT32;
     using SV = NetClock::time_point;
@@ -90,7 +90,7 @@ protected:
     using base::value_;
 
 public:
-    explicit timePointField(SF const& sfield, SV const& value) : JTxField(sfield, value)
+    explicit TimePointField(SF const& sfield, SV const& value) : JTxField(sfield, value)
     {
     }
 
@@ -101,7 +101,7 @@ public:
     }
 };
 
-struct uint256Field : public JTxField<SF_UINT256, uint256, std::string>
+struct Uint256Field : public JTxField<SF_UINT256, uint256, std::string>
 {
     using SF = SF_UINT256;
     using SV = uint256;
@@ -112,7 +112,7 @@ protected:
     using base::value_;
 
 public:
-    explicit uint256Field(SF const& sfield, SV const& value) : JTxField(sfield, value)
+    explicit Uint256Field(SF const& sfield, SV const& value) : JTxField(sfield, value)
     {
     }
 
@@ -123,7 +123,7 @@ public:
     }
 };
 
-struct accountIDField : public JTxField<SF_ACCOUNT, AccountID, std::string>
+struct AccountIdField : public JTxField<SF_ACCOUNT, AccountID, std::string>
 {
     using SF = SF_ACCOUNT;
     using SV = AccountID;
@@ -134,7 +134,7 @@ protected:
     using base::value_;
 
 public:
-    explicit accountIDField(SF const& sfield, SV const& value) : JTxField(sfield, value)
+    explicit AccountIdField(SF const& sfield, SV const& value) : JTxField(sfield, value)
     {
     }
 
@@ -145,29 +145,29 @@ public:
     }
 };
 
-struct stAmountField : public JTxField<SF_AMOUNT, STAmount, Json::Value>
+struct StAmountField : public JTxField<SF_AMOUNT, STAmount, json::Value>
 {
     using SF = SF_AMOUNT;
     using SV = STAmount;
-    using OV = Json::Value;
+    using OV = json::Value;
     using base = JTxField<SF, SV, OV>;
 
 protected:
     using base::value_;
 
 public:
-    explicit stAmountField(SF const& sfield, SV const& value) : JTxField(sfield, value)
+    explicit StAmountField(SF const& sfield, SV const& value) : JTxField(sfield, value)
     {
     }
 
     [[nodiscard]] OV
     value() const override
     {
-        return value_.getJson(JsonOptions::none);
+        return value_.getJson(JsonOptions::KNone);
     }
 };
 
-struct blobField : public JTxField<SF_VL, std::string>
+struct BlobField : public JTxField<SF_VL, std::string>
 {
     using SF = SF_VL;
     using SV = std::string;
@@ -175,19 +175,19 @@ struct blobField : public JTxField<SF_VL, std::string>
 
     using JTxField::JTxField;
 
-    explicit blobField(SF const& sfield, Slice const& cond) : JTxField(sfield, strHex(cond))
+    explicit BlobField(SF const& sfield, Slice const& cond) : JTxField(sfield, strHex(cond))
     {
     }
 
     template <size_t N>
-    explicit blobField(SF const& sfield, std::array<std::uint8_t, N> const& c)
-        : blobField(sfield, makeSlice(c))
+    explicit BlobField(SF const& sfield, std::array<std::uint8_t, N> const& c)
+        : BlobField(sfield, makeSlice(c))
     {
     }
 };
 
 template <class SField, class UnitTag, class ValueType>
-struct valueUnitField : public JTxField<SField, unit::ValueUnit<UnitTag, ValueType>, ValueType>
+struct ValueUnitField : public JTxField<SField, unit::ValueUnit<UnitTag, ValueType>, ValueType>
 {
     using SF = SField;
     using SV = unit::ValueUnit<UnitTag, ValueType>;
@@ -232,9 +232,9 @@ public:
 };
 
 template <>
-struct JTxFieldWrapper<blobField>
+struct JTxFieldWrapper<BlobField>
 {
-    using JF = blobField;
+    using JF = BlobField;
     using SF = JF::SF;
     using SV = JF::SV;
 
@@ -267,16 +267,16 @@ public:
 };
 
 template <class SField, class UnitTag, class ValueType = typename SField::type::value_type>
-using valueUnitWrapper = JTxFieldWrapper<valueUnitField<SField, UnitTag, ValueType>>;
+using valueUnitWrapper = JTxFieldWrapper<ValueUnitField<SField, UnitTag, ValueType>>;
 
 template <class SField, class StoredValue = typename SField::type::value_type>
 using simpleField = JTxFieldWrapper<JTxField<SField, StoredValue>>;
 
 /** General field definitions, or fields used in multiple transaction namespaces
  */
-auto const data = JTxFieldWrapper<blobField>(sfData);
+auto const kDATA = JTxFieldWrapper<BlobField>(sfData);
 
-auto const amount = 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
@@ -284,7 +284,7 @@ auto const amount = JTxFieldWrapper<stAmountField>(sfAmount);
 // when we have moved to better compilers.
 template <typename Input>
 auto
-make_vector(Input const& input)
+makeVector(Input const& input)
     requires requires(Input& v) {
         std::begin(v);
         std::end(v);
@@ -294,37 +294,37 @@ make_vector(Input const& input)
 }
 
 // Functions used in debugging
-Json::Value
+json::Value
 getAccountOffers(Env& env, AccountID const& acct, bool current = false);
 
-inline Json::Value
+inline json::Value
 getAccountOffers(Env& env, Account const& acct, bool current = false)
 {
     return getAccountOffers(env, acct.id(), current);
 }
 
-Json::Value
+json::Value
 getAccountLines(Env& env, AccountID const& acctId);
 
-inline Json::Value
+inline json::Value
 getAccountLines(Env& env, Account const& acct)
 {
     return getAccountLines(env, acct.id());
 }
 
 template <typename... IOU>
-Json::Value
+json::Value
 getAccountLines(Env& env, AccountID const& acctId, IOU... ious)
 {
     auto jrr = getAccountLines(env, acctId);
-    Json::Value res;
+    json::Value res;
     for (auto const& line : jrr[jss::lines])
     {
         for (auto const& iou : {ious...})
         {
             if (line[jss::currency].asString() == to_string(iou.currency))
             {
-                Json::Value v;
+                json::Value v;
                 v[jss::currency] = line[jss::currency];
                 v[jss::balance] = line[jss::balance];
                 v[jss::limit] = line[jss::limit];
@@ -339,7 +339,7 @@ getAccountLines(Env& env, AccountID const& acctId, IOU... ious)
 }
 
 [[nodiscard]] bool
-checkArraySize(Json::Value const& val, unsigned int size);
+checkArraySize(json::Value const& val, unsigned int size);
 
 // Helper function that returns the owner count on an account.
 std::uint32_t
@@ -364,52 +364,45 @@ checkVL(std::shared_ptr<SLE const> const& sle, SField const& field, std::string
 /* Path finding */
 /******************************************************************************/
 void
-stpath_append_one(STPath& st, Account const& account);
+stpathAppendOne(STPath& st, Account const& account);
 
 template <class T>
 std::enable_if_t<std::is_constructible_v<Account, T>>
-stpath_append_one(STPath& st, T const& t)
+stpathAppendOne(STPath& st, T const& t)
 {
-    stpath_append_one(st, Account{t});
+    stpathAppendOne(st, Account{t});
 }
 
 void
-stpath_append_one(STPath& st, STPathElement const& pe);
+stpathAppendOne(STPath& st, STPathElement const& pe);
 
 template <class T, class... Args>
 void
-stpath_append(STPath& st, T const& t, Args const&... args)
+stpathAppend(STPath& st, T const& t, Args const&... args)
 {
-    stpath_append_one(st, t);
+    stpathAppendOne(st, t);
     if constexpr (sizeof...(args) > 0)
-        stpath_append(st, args...);
+        stpathAppend(st, args...);
 }
 
 template <class... Args>
 void
-stpathset_append(STPathSet& st, STPath const& p, Args const&... args)
+stpathsetAppend(STPathSet& st, STPath const& p, Args const&... args)
 {
-    st.push_back(p);
+    st.pushBack(p);
     if constexpr (sizeof...(args) > 0)
-        stpathset_append(st, args...);
+        stpathsetAppend(st, args...);
 }
 
 bool
 equal(STAmount const& sa1, STAmount const& sa2);
 
-// Issue path element
-STPathElement
-IPE(Issue const& iss);
-
-STPathElement
-IPE(MPTIssue const& iss);
-
 template <class... Args>
 STPath
 stpath(Args const&... args)
 {
     STPath st;
-    stpath_append(st, args...);
+    stpathAppend(st, args...);
     return st;
 }
 
@@ -418,7 +411,7 @@ bool
 same(STPathSet const& st1, Args const&... args)
 {
     STPathSet st2;
-    stpathset_append(st2, args...);
+    stpathsetAppend(st2, args...);
     if (st1.size() != st2.size())
         return false;
 
@@ -430,7 +423,7 @@ same(STPathSet const& st1, Args const&... args)
     return true;
 }
 
-Json::Value
+json::Value
 rpf(jtx::Account const& src,
     jtx::Account const& dst,
     STAmount const& dstAmount,
@@ -439,9 +432,9 @@ rpf(jtx::Account const& src,
     std::optional<AccountID> const& srcIssuer = std::nullopt);
 
 jtx::Env
-pathTestEnv(beast::unit_test::suite& suite);
+pathTestEnv(beast::unit_test::Suite& suite);
 
-class gate
+class Gate
 {
 private:
     std::condition_variable cv_;
@@ -453,10 +446,10 @@ public:
     // Returns `true` if signaled.
     template <class Rep, class Period>
     bool
-    wait_for(std::chrono::duration<Rep, Period> const& rel_time)
+    waitFor(std::chrono::duration<Rep, Period> const& relTime)
     {
         std::unique_lock<std::mutex> lk(mutex_);
-        auto b = cv_.wait_for(lk, rel_time, [this] { return signaled_; });
+        auto b = cv_.wait_for(lk, relTime, [this] { return signaled_; });
         signaled_ = false;
         return b;
     }
@@ -470,8 +463,8 @@ public:
     }
 };
 
-Json::Value
-find_paths_request(
+json::Value
+findPathsRequest(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -482,7 +475,7 @@ find_paths_request(
     std::optional<uint256> const& domain = std::nullopt);
 
 std::tuple<STPathSet, STAmount, STAmount>
-find_paths(
+findPaths(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -493,7 +486,7 @@ find_paths(
     std::optional<uint256> const& domain = std::nullopt);
 
 std::tuple<STPathSet, STAmount, STAmount>
-find_paths_by_element(
+findPathsByElement(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -506,7 +499,7 @@ find_paths_by_element(
 /******************************************************************************/
 
 XRPAmount
-txfee(Env const& env, std::uint16_t n);
+txFee(Env const& env, std::uint16_t n);
 
 PrettyAmount
 xrpMinusFee(Env const& env, std::int64_t xrpAmount);
@@ -538,26 +531,22 @@ expectOffers(
     std::uint16_t size,
     std::vector<Amounts> const& toMatch = {});
 
-Json::Value
+json::Value
 ledgerEntryRoot(Env& env, Account const& acct);
 
-Json::Value
-ledgerEntryState(
-    Env& env,
-    Account const& acct_a,
-    Account const& acct_b,
-    std::string const& currency);
+json::Value
+ledgerEntryState(Env& env, Account const& acctA, Account const& acctB, std::string const& currency);
 
-Json::Value
-ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offer_seq);
+json::Value
+ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offerSeq);
 
-Json::Value
+json::Value
 ledgerEntryMPT(jtx::Env& env, jtx::Account const& acct, MPTID const& mptID);
 
-Json::Value
-getBookOffers(jtx::Env& env, Asset const& taker_pays, Asset const& taker_gets);
+json::Value
+getBookOffers(jtx::Env& env, Asset const& takerPays, Asset const& takerGets);
 
-Json::Value
+json::Value
 accountBalance(Env& env, Account const& acct);
 
 [[nodiscard]] bool
@@ -567,7 +556,7 @@ expectLedgerEntryRoot(Env& env, Account const& acct, STAmount const& expectedVal
 /******************************************************************************/
 namespace paychan {
 
-Json::Value
+json::Value
 create(
     AccountID const& account,
     AccountID const& to,
@@ -577,7 +566,7 @@ create(
     std::optional<NetClock::time_point> const& cancelAfter = std::nullopt,
     std::optional<std::uint32_t> const& dstTag = std::nullopt);
 
-inline Json::Value
+inline json::Value
 create(
     Account const& account,
     Account const& to,
@@ -590,14 +579,14 @@ create(
     return create(account.id(), to.id(), amount, settleDelay, pk, cancelAfter, dstTag);
 }
 
-Json::Value
+json::Value
 fund(
     AccountID const& account,
     uint256 const& channel,
     STAmount const& amount,
     std::optional<NetClock::time_point> const& expiration = std::nullopt);
 
-Json::Value
+json::Value
 claim(
     AccountID const& account,
     uint256 const& channel,
@@ -627,7 +616,7 @@ channelExists(ReadView const& view, uint256 const& chan);
 /******************************************************************************/
 
 void
-n_offers(Env& env, std::size_t n, Account const& account, STAmount const& in, STAmount const& out);
+nOffers(Env& env, std::size_t n, Account const& account, STAmount const& in, STAmount const& out);
 
 /* Pay Strand */
 /***************************************************************/
@@ -720,18 +709,18 @@ namespace check {
 /** Create a check. */
 template <typename A>
     requires std::is_same_v<A, AccountID>
-Json::Value
+json::Value
 create(A const& account, A const& dest, STAmount const& sendMax)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = to_string(account);
-    jv[sfSendMax.jsonName] = sendMax.getJson(JsonOptions::none);
+    jv[sfSendMax.jsonName] = sendMax.getJson(JsonOptions::KNone);
     jv[sfDestination.jsonName] = to_string(dest);
     jv[sfTransactionType.jsonName] = jss::CheckCreate;
     return jv;
 }
 
-inline Json::Value
+inline json::Value
 create(jtx::Account const& account, jtx::Account const& dest, STAmount const& sendMax)
 {
     return create(account.id(), dest.id(), sendMax);
@@ -739,8 +728,8 @@ create(jtx::Account const& account, jtx::Account const& dest, STAmount const& se
 
 }  // namespace check
 
-static constexpr FeeLevel64 baseFeeLevel{TxQ::baseLevel};
-static constexpr FeeLevel64 minEscalationFeeLevel = baseFeeLevel * 500;
+static constexpr FeeLevel64 kBASE_FEE_LEVEL{TxQ::kBASE_LEVEL};
+static constexpr FeeLevel64 kMIN_ESCALATION_FEE_LEVEL = kBASE_FEE_LEVEL * 500;
 
 inline uint256
 getCheckIndex(AccountID const& account, std::uint32_t uSequence)
@@ -757,8 +746,8 @@ checkMetrics(
     std::optional<std::size_t> expectedMaxCount,
     std::size_t expectedInLedger,
     std::size_t expectedPerLedger,
-    std::uint64_t expectedMinFeeLevel = baseFeeLevel.fee(),
-    std::uint64_t expectedMedFeeLevel = minEscalationFeeLevel.fee(),
+    std::uint64_t expectedMinFeeLevel = kBASE_FEE_LEVEL.fee(),
+    std::uint64_t expectedMedFeeLevel = kMIN_ESCALATION_FEE_LEVEL.fee(),
     std::source_location const location = std::source_location::current())
 {
     int const line = location.line();
@@ -768,11 +757,11 @@ checkMetrics(
     auto const metrics = env.app().getTxQ().getMetrics(*env.current());
     using namespace std::string_literals;
 
-    metrics.referenceFeeLevel == baseFeeLevel
+    metrics.referenceFeeLevel == kBASE_FEE_LEVEL
         ? test.pass()
         : test.fail(
               "reference: "s + std::to_string(metrics.referenceFeeLevel.value()) + "/" +
-                  std::to_string(baseFeeLevel.value()),
+                  std::to_string(kBASE_FEE_LEVEL.value()),
               file,
               line);
 
@@ -842,21 +831,21 @@ checkMetrics(
 
 namespace loanBroker {
 
-Json::Value
+json::Value
 set(AccountID const& account, uint256 const& vaultId, std::uint32_t flags = 0);
 
 // Use "del" because "delete" is a reserved word in C++.
-Json::Value
+json::Value
 del(AccountID const& account, uint256 const& brokerID, std::uint32_t flags = 0);
 
-Json::Value
+json::Value
 coverDeposit(
     AccountID const& account,
     uint256 const& brokerID,
     STAmount const& amount,
     std::uint32_t flags = 0);
 
-Json::Value
+json::Value
 coverWithdraw(
     AccountID const& account,
     uint256 const& brokerID,
@@ -864,21 +853,23 @@ coverWithdraw(
     std::uint32_t flags = 0);
 
 // Must specify at least one of loanBrokerID or amount.
-Json::Value
+json::Value
 coverClawback(AccountID const& account, std::uint32_t flags = 0);
 
-auto const loanBrokerID = JTxFieldWrapper<uint256Field>(sfLoanBrokerID);
+auto const kLOAN_BROKER_ID = JTxFieldWrapper<Uint256Field>(sfLoanBrokerID);
 
-auto const managementFeeRate = valueUnitWrapper<SF_UINT16, unit::TenthBipsTag>(sfManagementFeeRate);
+auto const kMANAGEMENT_FEE_RATE =
+    valueUnitWrapper<SF_UINT16, unit::TenthBipsTag>(sfManagementFeeRate);
 
-auto const debtMaximum = simpleField<SF_NUMBER>(sfDebtMaximum);
+auto const kDEBT_MAXIMUM = simpleField<SF_NUMBER>(sfDebtMaximum);
 
-auto const coverRateMinimum = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateMinimum);
+auto const kCOVER_RATE_MINIMUM =
+    valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateMinimum);
 
-auto const coverRateLiquidation =
+auto const kCOVER_RATE_LIQUIDATION =
     valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCoverRateLiquidation);
 
-auto const destination = JTxFieldWrapper<accountIDField>(sfDestination);
+auto const kDESTINATION = JTxFieldWrapper<AccountIdField>(sfDestination);
 
 }  // namespace loanBroker
 
@@ -886,48 +877,50 @@ auto const destination = JTxFieldWrapper<accountIDField>(sfDestination);
 /******************************************************************************/
 namespace loan {
 
-Json::Value
+json::Value
 set(AccountID const& account,
     uint256 const& loanBrokerID,
     Number principalRequested,
     std::uint32_t flags = 0);
 
-auto const counterparty = JTxFieldWrapper<accountIDField>(sfCounterparty);
+auto const kCOUNTERPARTY = JTxFieldWrapper<AccountIdField>(sfCounterparty);
 
-// For `CounterPartySignature`, use `sig(sfCounterpartySignature, ...)`
+// For `CounterPartySignature`, use `Sig(sfCounterpartySignature, ...)`
 
-auto const loanOriginationFee = simpleField<SF_NUMBER>(sfLoanOriginationFee);
+auto const kLOAN_ORIGINATION_FEE = simpleField<SF_NUMBER>(sfLoanOriginationFee);
 
-auto const loanServiceFee = simpleField<SF_NUMBER>(sfLoanServiceFee);
+auto const kLOAN_SERVICE_FEE = simpleField<SF_NUMBER>(sfLoanServiceFee);
 
-auto const latePaymentFee = simpleField<SF_NUMBER>(sfLatePaymentFee);
+auto const kLATE_PAYMENT_FEE = simpleField<SF_NUMBER>(sfLatePaymentFee);
 
-auto const closePaymentFee = simpleField<SF_NUMBER>(sfClosePaymentFee);
+auto const kCLOSE_PAYMENT_FEE = simpleField<SF_NUMBER>(sfClosePaymentFee);
 
-auto const overpaymentFee = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentFee);
+auto const kOVERPAYMENT_FEE = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentFee);
 
-auto const interestRate = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfInterestRate);
+auto const kINTEREST_RATE = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfInterestRate);
 
-auto const lateInterestRate = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfLateInterestRate);
+auto const kLATE_INTEREST_RATE =
+    valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfLateInterestRate);
 
-auto const closeInterestRate = valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCloseInterestRate);
+auto const kCLOSE_INTEREST_RATE =
+    valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfCloseInterestRate);
 
-auto const overpaymentInterestRate =
+auto const kOVERPAYMENT_INTEREST_RATE =
     valueUnitWrapper<SF_UINT32, unit::TenthBipsTag>(sfOverpaymentInterestRate);
 
-auto const paymentTotal = simpleField<SF_UINT32>(sfPaymentTotal);
+auto const kPAYMENT_TOTAL = simpleField<SF_UINT32>(sfPaymentTotal);
 
-auto const paymentInterval = simpleField<SF_UINT32>(sfPaymentInterval);
+auto const kPAYMENT_INTERVAL = simpleField<SF_UINT32>(sfPaymentInterval);
 
-auto const gracePeriod = simpleField<SF_UINT32>(sfGracePeriod);
+auto const kGRACE_PERIOD = simpleField<SF_UINT32>(sfGracePeriod);
 
-Json::Value
+json::Value
 manage(AccountID const& account, uint256 const& loanID, std::uint32_t flags);
 
-Json::Value
+json::Value
 del(AccountID const& account, uint256 const& loanID, std::uint32_t flags = 0);
 
-Json::Value
+json::Value
 pay(AccountID const& account,
     uint256 const& loanID,
     STAmount const& amount,
@@ -936,13 +929,13 @@ pay(AccountID const& account,
 }  // namespace loan
 
 /** Set Expiration on a JTx. */
-class expiration
+class Expiration
 {
 private:
     std::uint32_t const expiry_;
 
 public:
-    explicit expiration(NetClock::time_point const& expiry)
+    explicit Expiration(NetClock::time_point const& expiry)
         : expiry_{expiry.time_since_epoch().count()}
     {
     }
@@ -955,13 +948,13 @@ public:
 };
 
 /** Set SourceTag on a JTx. */
-class source_tag
+class SourceTag
 {
 private:
     std::uint32_t const tag_;
 
 public:
-    explicit source_tag(std::uint32_t tag) : tag_{tag}
+    explicit SourceTag(std::uint32_t tag) : tag_{tag}
     {
     }
 
@@ -973,13 +966,13 @@ public:
 };
 
 /** Set DestinationTag on a JTx. */
-class dest_tag
+class DestTag
 {
 private:
     std::uint32_t const tag_;
 
 public:
-    explicit dest_tag(std::uint32_t tag) : tag_{tag}
+    explicit DestTag(std::uint32_t tag) : tag_{tag}
     {
     }
 
diff --git a/src/test/jtx/TestSuite.h b/src/test/jtx/TestSuite.h
index 604557c155..705adbb620 100644
--- a/src/test/jtx/TestSuite.h
+++ b/src/test/jtx/TestSuite.h
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-class TestSuite : public beast::unit_test::suite
+class TestSuite : public beast::unit_test::Suite
 {
 public:
     template <class S, class T>
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index 50045044d7..05efc9eea2 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -55,7 +55,7 @@ class TrustedPublisherServer : public std::enable_shared_from_this<TrustedPublis
     // Load a signed certificate into the ssl context, and configure
     // the context for use with a server.
     void
-    load_server_certificate()
+    loadServerCertificate()
     {
         sslCtx_.set_password_callback(
             [](std::size_t, boost::asio::ssl::context_base::password_purpose) { return "test"; });
@@ -101,29 +101,29 @@ public:
         SecretKey const& ssk,
         int seq)
     {
-        STObject st(sfGeneric);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = seq;
         st[sfPublicKey] = pk;
         st[sfSigningPubKey] = spk;
 
         // NOLINTBEGIN(bugprone-unchecked-optional-access) publicKeyType returns value for valid
         // keys
-        sign(st, HashPrefix::manifest, *publicKeyType(spk), ssk);
-        sign(st, HashPrefix::manifest, *publicKeyType(pk), sk, sfMasterSignature);
+        sign(st, HashPrefix::Manifest, *publicKeyType(spk), ssk);
+        sign(st, HashPrefix::Manifest, *publicKeyType(pk), sk, sfMasterSignature);
         // NOLINTEND(bugprone-unchecked-optional-access)
 
         Serializer s;
         st.add(s);
 
-        return base64_encode(std::string(static_cast<char const*>(s.data()), s.size()));
+        return base64Encode(std::string(static_cast<char const*>(s.data()), s.size()));
     }
 
     static Validator
     randomValidator()
     {
         auto const secret = randomSecretKey();
-        auto const masterPublic = derivePublicKey(KeyType::ed25519, secret);
-        auto const signingKeys = randomKeyPair(KeyType::secp256k1);
+        auto const masterPublic = derivePublicKey(KeyType::Ed25519, secret);
+        auto const signingKeys = randomKeyPair(KeyType::Secp256k1);
         return {
             .masterPublic = masterPublic,
             .signingPublic = signingKeys.first,
@@ -133,7 +133,7 @@ public:
 
     // TrustedPublisherServer must be accessed through a shared_ptr.
     // This constructor is only public so std::make_shared has access.
-    // The function `make_TrustedPublisherServer` should be used to create
+    // The function `makeTrustedPublisherServer` should be used to create
     // instances.
     // The `futures` member is expected to be structured as
     // effective / expiration time point pairs for use in version 2 UNLs
@@ -153,9 +153,9 @@ public:
         , acceptor_{ioc}
         , useSSL_{useSSL}
         , publisherSecret_{randomSecretKey()}
-        , publisherPublic_{derivePublicKey(KeyType::ed25519, publisherSecret_)}
+        , publisherPublic_{derivePublicKey(KeyType::Ed25519, publisherSecret_)}
     {
-        auto const keys = randomKeyPair(KeyType::secp256k1);
+        auto const keys = randomKeyPair(KeyType::Secp256k1);
         auto const manifest =
             makeManifestString(publisherPublic_, publisherSecret_, keys.first, keys.second, 1);
 
@@ -174,7 +174,7 @@ public:
             }
             data.pop_back();
             data += "]}";
-            std::string const blob = base64_encode(data);
+            std::string const blob = base64Encode(data);
             return std::make_pair(data, blob);
         }();
         auto const sig = strHex(sign(keys.first, keys.second, makeSlice(data)));
@@ -202,7 +202,7 @@ public:
             }
             data.pop_back();
             data += "]}";
-            std::string const blob = base64_encode(data);
+            std::string const blob = base64Encode(data);
             auto const sig = strHex(sign(keys.first, keys.second, makeSlice(data)));
             blobInfo.emplace_back(blob, sig);
         }
@@ -227,7 +227,7 @@ public:
         if (useSSL_)
         {
             // This holds the self-signed certificate used by the server
-            load_server_certificate();
+            loadServerCertificate();
         }
     }
 
@@ -243,7 +243,7 @@ public:
             sock_, [wp = std::weak_ptr<TrustedPublisherServer>{shared_from_this()}](error_code ec) {
                 if (auto p = wp.lock())
                 {
-                    p->on_accept(ec);
+                    p->onAccept(ec);
                 }
             });
     }
@@ -263,7 +263,7 @@ public:
     }
 
     endpoint_type
-    local_endpoint() const
+    localEndpoint() const
     {
         return acceptor_.local_endpoint();
     }
@@ -279,14 +279,14 @@ public:
      * The following three methods return certs/keys used by
      * server and/or client to do the SSL handshake. These strings
      * were generated using the script below. The server key and cert
-     * are used to configure the server (see load_server_certificate
+     * are used to configure the server (see loadServerCertificate
      * above). The ca.crt should be used to configure the client
      * when ssl verification is enabled.
      *
      *    note:
      *        cert()    ==> server.crt
      *        key()     ==> server.key
-     *        ca_cert() ==> ca.crt
+     *        caCert() ==> ca.crt
      *        dh()      ==> dh.pem
      ```
         #!/usr/bin/env bash
@@ -339,7 +339,7 @@ public:
     static std::string const&
     cert()
     {
-        static std::string const cert{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 cert;
+        return kCERT;
     }
 
     static std::string const&
     key()
     {
-        static std::string const key{R"pkey(
+        static std::string const kEY{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 kEY;
     }
 
     static std::string const&
-    ca_cert()
+    caCert()
     {
-        static std::string const cert{R"cert(
+        static std::string const kCERT{R"cert(
 -----BEGIN CERTIFICATE-----
 MIIDpzCCAo+gAwIBAgIUWc45WqaaNuaSLoFYTMC/Mjfqw/gwDQYJKoZIhvcNAQEL
 BQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRQwEgYDVQQHDAtMb3MgQW5n
@@ -427,13 +427,13 @@ mRMyNekaRw+Npy4Hjou5sx272cXHHmPCSF5TjwdaibSaGjx1k0Q50mOf7S9KG5b5
 7X1e3FekJlaD02EBEhtkXURIxogOQALdFncj
 -----END CERTIFICATE-----
 )cert"};
-        return cert;
+        return kCERT;
     }
 
     static std::string const&
     dh()
     {
-        static std::string const dh{R"dh(
+        static std::string const kDH{R"dh(
 -----BEGIN DH PARAMETERS-----
 MIIBCAKCAQEAp2I2fWEUZ3sCNfitSRC/MdAhJE/bS+NO0O2tWdIdlvmIFE6B5qhC
 sGW9ojrQT8DTxBvGAcbjr/jagmlE3BV4oSnxyhP37G2mDvMOJ29J3NvFD/ZFAW0d
@@ -443,11 +443,11 @@ xbEQ+TUZ5jbJGSeBqNFKFeuOUQGJ46Io0jBSYd4rSmKUXkvElQwR+n7KF3jy1uAt
 /8hzd8tHn9TyW7Q2/CPkOA6dCXzltpOSowIBAg==
 -----END DH PARAMETERS-----
 )dh"};
-        return dh;
+        return kDH;
     }
 
 private:
-    struct lambda
+    struct Lambda
     {
         int id;
         TrustedPublisherServer& self;
@@ -455,51 +455,51 @@ private:
         boost::asio::executor_work_guard<boost::asio::executor> work;
         bool ssl;
 
-        lambda(int id_, TrustedPublisherServer& self_, socket_type&& sock_, bool ssl_)
-            : id(id_), self(self_), sock(std::move(sock_)), work(sock.get_executor()), ssl(ssl_)
+        Lambda(int id, TrustedPublisherServer& self, socket_type&& sock, bool ssl)
+            : id(id), self(self), sock(std::move(sock)), work(this->sock.get_executor()), ssl(ssl)
         {
         }
 
         void
         operator()()
         {
-            self.do_peer(id, std::move(sock), ssl);
+            self.doPeer(id, std::move(sock), ssl);
         }
     };
 
     void
-    on_accept(error_code ec)
+    onAccept(error_code ec)
     {
         if (ec || !acceptor_.is_open())
             return;
 
-        static int id_ = 0;
-        std::thread{lambda{++id_, *this, std::move(sock_), useSSL_}}.detach();
+        static int nextId = 0;  // NOLINT(readability-identifier-naming)
+        std::thread{Lambda{++nextId, *this, std::move(sock_), useSSL_}}.detach();
         acceptor_.async_accept(
             sock_, [wp = std::weak_ptr<TrustedPublisherServer>{shared_from_this()}](error_code ec) {
                 if (auto p = wp.lock())
                 {
-                    p->on_accept(ec);
+                    p->onAccept(ec);
                 }
             });
     }
 
     void
-    do_peer(int id, socket_type&& s, bool ssl)
+    doPeer(int id, socket_type&& s, bool ssl)
     {
         using namespace boost::beast;
         using namespace boost::asio;
         socket_type sock(std::move(s));
         flat_buffer sb;
         error_code ec;
-        std::optional<ssl_stream<ip::tcp::socket&>> ssl_stream;
+        std::optional<ssl_stream<ip::tcp::socket&>> sslStream;
 
         if (ssl)
         {
             // Construct the stream around the socket
-            ssl_stream.emplace(sock, sslCtx_);
+            sslStream.emplace(sock, sslCtx_);
             // Perform the SSL handshake
-            ssl_stream->handshake(ssl::stream_base::server, ec);
+            sslStream->handshake(ssl::stream_base::server, ec);
             if (ec)
                 return;
         }
@@ -513,8 +513,8 @@ private:
                 if (ssl)
                 {
                     http::read(
-                        *ssl_stream, sb, req, ec);  // NOLINT(bugprone-unchecked-optional-access)
-                                                    // ssl_stream emplaced when ssl==true
+                        *sslStream, sb, req, ec);  // NOLINT(bugprone-unchecked-optional-access)
+                                                   // ssl_stream emplaced when ssl==true
                 }
                 else
                 {
@@ -545,11 +545,11 @@ private:
                     else
                     {
                         int refresh = 5;
-                        constexpr char const* refreshPrefix = "/validators2/refresh/";
-                        if (boost::starts_with(path, refreshPrefix))
+                        constexpr char const* kREFRESH_PREFIX = "/validators2/refresh/";
+                        if (boost::starts_with(path, kREFRESH_PREFIX))
                         {
                             refresh = boost::lexical_cast<unsigned int>(
-                                path.substr(strlen(refreshPrefix)));
+                                path.substr(strlen(kREFRESH_PREFIX)));
                         }
                         res.body() = getList2_(refresh);
                     }
@@ -569,11 +569,11 @@ private:
                     else
                     {
                         int refresh = 5;
-                        constexpr char const* refreshPrefix = "/validators/refresh/";
-                        if (boost::starts_with(path, refreshPrefix))
+                        constexpr char const* kREFRESH_PREFIX = "/validators/refresh/";
+                        if (boost::starts_with(path, kREFRESH_PREFIX))
                         {
                             refresh = boost::lexical_cast<unsigned int>(
-                                path.substr(strlen(refreshPrefix)));
+                                path.substr(strlen(kREFRESH_PREFIX)));
                         }
                         res.body() = getList_(refresh);
                     }
@@ -593,15 +593,15 @@ private:
                         std::stringstream body;
                         for (auto i = 0; i < 1024; ++i)
                         {
-                            body << static_cast<char>(rand_int<short>(32, 126)),
+                            body << static_cast<char>(randInt<short>(32, 126)),
                                 res.body() = body.str();
                         }
                     }
                 }
                 else if (boost::starts_with(path, "/sleep/"))
                 {
-                    auto const sleep_sec = boost::lexical_cast<unsigned int>(path.substr(7));
-                    std::this_thread::sleep_for(std::chrono::seconds(sleep_sec));
+                    auto const sleepSec = boost::lexical_cast<unsigned int>(path.substr(7));
+                    std::this_thread::sleep_for(std::chrono::seconds(sleepSec));
                 }
                 else if (boost::starts_with(path, "/redirect"))
                 {
@@ -629,7 +629,7 @@ private:
                     }
                     else if (!boost::starts_with(path, "/redirect_nolo"))
                     {
-                        location << (ssl ? "https://" : "http://") << local_endpoint()
+                        location << (ssl ? "https://" : "http://") << localEndpoint()
                                  << (boost::starts_with(path, "/redirect_forever/")
                                          ? path
                                          : "/validators");
@@ -663,8 +663,8 @@ private:
 
             if (ssl)
             {
-                write(*ssl_stream, res, ec);  // NOLINT(bugprone-unchecked-optional-access)
-                                              // ssl_stream emplaced when ssl==true
+                write(*sslStream, res, ec);  // NOLINT(bugprone-unchecked-optional-access)
+                                             // ssl_stream emplaced when ssl==true
             }
             else
             {
@@ -677,13 +677,13 @@ private:
 
         // Perform the SSL shutdown
         if (ssl)
-            ssl_stream->shutdown(ec);  // NOLINT(bugprone-unchecked-optional-access) ssl_stream
-                                       // emplaced when ssl==true
+            sslStream->shutdown(ec);  // NOLINT(bugprone-unchecked-optional-access) ssl_stream
+                                      // emplaced when ssl==true
     }
 };
 
 inline std::shared_ptr<TrustedPublisherServer>
-make_TrustedPublisherServer(
+makeTrustedPublisherServer(
     boost::asio::io_context& ioc,
     std::vector<TrustedPublisherServer::Validator> const& validators,
     NetClock::time_point validUntil,
diff --git a/src/test/jtx/WSClient.h b/src/test/jtx/WSClient.h
index e95920d085..5a22fafe2e 100644
--- a/src/test/jtx/WSClient.h
+++ b/src/test/jtx/WSClient.h
@@ -14,14 +14,14 @@ class WSClient : public AbstractClient
 {
 public:
     /** Retrieve a message. */
-    virtual std::optional<Json::Value>
+    virtual std::optional<json::Value>
     getMsg(std::chrono::milliseconds const& timeout = std::chrono::milliseconds{0}) = 0;
 
     /** Retrieve a message that meets the predicate criteria. */
-    virtual std::optional<Json::Value>
+    virtual std::optional<json::Value>
     findMsg(
         std::chrono::milliseconds const& timeout,
-        std::function<bool(Json::Value const&)> pred) = 0;
+        std::function<bool(json::Value const&)> pred) = 0;
 };
 
 /** Returns a client operating through WebSockets/S. */
@@ -29,7 +29,7 @@ std::unique_ptr<WSClient>
 makeWSClient(
     Config const& cfg,
     bool v2 = true,
-    unsigned rpc_version = 2,
+    unsigned rpcVersion = 2,
     std::unordered_map<std::string, std::string> const& headers = {});
 
 }  // namespace xrpl::test
diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp
index 157b7665a8..25d922d48e 100644
--- a/src/test/jtx/WSClient_test.cpp
+++ b/src/test/jtx/WSClient_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl::test {
 
-class WSClient_test : public beast::unit_test::suite
+class WSClient_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -19,8 +19,8 @@ public:
         Env env(*this);
         auto wsc = makeWSClient(env.app().config());
         {
-            Json::Value jv;
-            jv["streams"] = Json::arrayValue;
+            json::Value jv;
+            jv["streams"] = json::ArrayValue;
             jv["streams"].append("ledger");
         }
         env.fund(XRP(10000), "alice");
diff --git a/src/test/jtx/account_txn_id.h b/src/test/jtx/account_txn_id.h
index 424ce13b14..89f7368ee6 100644
--- a/src/test/jtx/account_txn_id.h
+++ b/src/test/jtx/account_txn_id.h
@@ -4,13 +4,13 @@
 
 namespace xrpl::test::jtx {
 
-struct account_txn_id
+struct AccountTxnId
 {
 private:
     uint256 hash_;
 
 public:
-    explicit account_txn_id(uint256 const& hash) : hash_(hash)
+    explicit AccountTxnId(uint256 const& hash) : hash_(hash)
     {
     }
 
diff --git a/src/test/jtx/acctdelete.h b/src/test/jtx/acctdelete.h
index 774baca7a1..5c8a136617 100644
--- a/src/test/jtx/acctdelete.h
+++ b/src/test/jtx/acctdelete.h
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 /** Delete account.  If successful transfer remaining XRP to dest. */
-Json::Value
+json::Value
 acctdelete(Account const& account, Account const& dest);
 
 // Close the ledger until the ledger sequence is large enough to close
diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h
index 4e06392948..4bf5bffd6b 100644
--- a/src/test/jtx/amount.h
+++ b/src/test/jtx/amount.h
@@ -18,7 +18,7 @@
 namespace xrpl {
 namespace detail {
 
-struct epsilon_multiple
+struct EpsilonMultiple
 {
     std::size_t n;
 };
@@ -55,7 +55,8 @@ 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).
-constexpr XRPAmount dropsPerXRP{1'000'000};
+// TODO: rename — clashes with xrpl::kDROPS_PER_XRP
+constexpr XRPAmount kJTX_DROPS_PER_XRP{1'000'000};
 
 /** Represents an XRP, IOU, or MPT quantity
     This customizes the string conversion and supports
@@ -134,9 +135,9 @@ public:
 
     operator AnyAmount() const;
 
-    operator Json::Value() const
+    operator json::Value() const
     {
-        return to_json(value());
+        return toJson(value());
     }
 };
 
@@ -183,20 +184,20 @@ public:
         return asset_;
     }
 
-    operator Json::Value() const
+    operator json::Value() const
     {
-        return to_json(asset_);
+        return toJson(asset_);
     }
 
     template <std::integral T>
     PrettyAmount
-    operator()(T v, Number::rounding_mode rounding = Number::getround()) const
+    operator()(T v, Number::RoundingMode rounding = Number::getround()) const
     {
         return operator()(Number(v), rounding);
     }
 
     PrettyAmount
-    operator()(Number v, Number::rounding_mode rounding = Number::getround()) const
+    operator()(Number v, Number::RoundingMode rounding = Number::getround()) const
     {
         NumberRoundModeGuard const mg(rounding);
         STAmount const amount{asset_, v * scale_};
@@ -204,7 +205,7 @@ public:
     }
 
     None
-    operator()(none_t) const
+    operator()(NoneT) const
     {
         return {asset_};
     }
@@ -235,14 +236,14 @@ struct BookSpec
 {
     xrpl::Asset asset;
 
-    BookSpec(xrpl::Asset const& asset_) : asset(asset_)
+    BookSpec(xrpl::Asset const& asset) : asset(asset)
     {
     }
 };
 
 //------------------------------------------------------------------------------
 
-struct XRP_t
+struct XrpT
 {
     /** Implicit conversion to Issue.
 
@@ -275,7 +276,7 @@ struct XRP_t
     operator()(T v) const
     {
         using TOut = std::conditional_t<std::is_signed_v<T>, std::int64_t, std::uint64_t>;
-        return {TOut{v} * dropsPerXRP};
+        return {TOut{v} * kJTX_DROPS_PER_XRP};
     }
 
     /** Returns an amount of XRP as PrettyAmount,
@@ -286,7 +287,7 @@ struct XRP_t
     PrettyAmount
     operator()(Number v) const
     {
-        auto const c = dropsPerXRP.drops();
+        auto const c = kJTX_DROPS_PER_XRP.drops();
         auto const d = std::int64_t(v * c);
         if (Number(d) / c != v)
             Throw<std::domain_error>("unrepresentable");
@@ -296,7 +297,7 @@ struct XRP_t
     PrettyAmount
     operator()(double v) const
     {
-        auto const c = dropsPerXRP.drops();
+        auto const c = kJTX_DROPS_PER_XRP.drops();
         if (v >= 0)
         {
             auto const d = std::uint64_t(std::round(v * c));
@@ -313,13 +314,13 @@ struct XRP_t
 
     /** Returns None-of-XRP */
     None
-    operator()(none_t) const
+    operator()(NoneT) const
     {
         return {xrpIssue()};
     }
 
     friend BookSpec
-    operator~(XRP_t const&)
+    operator~(XrpT const&)
     {
         return BookSpec(Issue{xrpCurrency(), xrpAccount()});
     }
@@ -331,7 +332,7 @@ struct XRP_t
         XRP         Converts to the XRP Issue
         XRP(10)     Returns STAmount of 10 XRP
 */
-extern XRP_t const XRP;
+extern XrpT const XRP;  // NOLINT(readability-identifier-naming)
 
 /** Returns an XRP PrettyAmount, which is trivially convertible to STAmount.
 
@@ -359,18 +360,18 @@ drops(XRPAmount i)
 //------------------------------------------------------------------------------
 
 // The smallest possible IOU STAmount
-struct epsilon_t
+struct EpsilonT
 {
-    epsilon_t() = default;
+    EpsilonT() = default;
 
-    detail::epsilon_multiple
+    detail::EpsilonMultiple
     operator()(std::size_t n) const
     {
         return {n};
     }
 };
 
-static epsilon_t const epsilon;
+static EpsilonT const kEPSILON;
 
 /** Converts to IOU Issue or STAmount.
 
@@ -385,8 +386,8 @@ public:
     Account account;
     xrpl::Currency currency;
 
-    IOU(Account account_, xrpl::Currency const& currency_)
-        : account(std::move(account_)), currency(currency_)
+    IOU(Account account, xrpl::Currency const& currency)
+        : account(std::move(account)), currency(currency)
     {
     }
 
@@ -436,16 +437,16 @@ public:
     }
 
     PrettyAmount
-    operator()(epsilon_t) const;
+    operator()(EpsilonT) const;
     PrettyAmount
-    operator()(detail::epsilon_multiple) const;
+    operator()(detail::EpsilonMultiple) const;
 
     // VFALCO TODO
     // STAmount operator()(char const* s) const;
 
     /** Returns None-of-Issue */
     None
-    operator()(none_t) const
+    operator()(NoneT) const
     {
         return {issue()};
     }
@@ -475,7 +476,7 @@ public:
     std::string name;
     xrpl::MPTID issuanceID;
 
-    MPT(std::string n, xrpl::MPTID const& issuanceID_) : name(std::move(n)), issuanceID(issuanceID_)
+    MPT(std::string n, xrpl::MPTID const& issuanceID) : name(std::move(n)), issuanceID(issuanceID)
     {
     }
     MPT(std::string n = "") : name(std::move(n)), issuanceID(noMPT())
@@ -544,13 +545,13 @@ public:
     }
 
     PrettyAmount
-    operator()(epsilon_t) const;
+    operator()(EpsilonT) const;
     PrettyAmount
-    operator()(detail::epsilon_multiple) const;
+    operator()(detail::EpsilonMultiple) const;
 
     /** Returns None-of-Issue */
     None
-    operator()(none_t) const
+    operator()(NoneT) const
     {
         return {noMPT()};
     }
@@ -567,7 +568,7 @@ operator<<(std::ostream& os, MPT const& mpt);
 
 //------------------------------------------------------------------------------
 
-struct any_t
+struct AnyT
 {
     inline AnyAmount
     operator()(STAmount const& sta) const;
@@ -576,7 +577,7 @@ struct any_t
 /** Amount specifier with an option for any issuer. */
 struct AnyAmount
 {
-    bool is_any;
+    bool isAny;
     STAmount value;
 
     AnyAmount() = delete;
@@ -584,11 +585,11 @@ struct AnyAmount
     AnyAmount&
     operator=(AnyAmount const&) = default;
 
-    AnyAmount(STAmount amount) : is_any(false), value(std::move(amount))
+    AnyAmount(STAmount amount) : isAny(false), value(std::move(amount))
     {
     }
 
-    AnyAmount(STAmount amount, any_t const*) : is_any(true), value(std::move(amount))
+    AnyAmount(STAmount amount, AnyT const*) : isAny(true), value(std::move(amount))
     {
     }
 
@@ -596,14 +597,14 @@ struct AnyAmount
     void
     to(AccountID const& id)
     {
-        if (!is_any)
+        if (!isAny)
             return;
         value.get<Issue>().account = id;
     }
 };
 
 inline AnyAmount
-any_t::operator()(STAmount const& sta) const
+AnyT::operator()(STAmount const& sta) const
 {
     return AnyAmount(sta, this);
 }
@@ -611,7 +612,7 @@ any_t::operator()(STAmount const& sta) const
 /** Returns an amount representing "any issuer"
     @note With respect to what the recipient will accept
 */
-extern any_t const any;
+extern AnyT const kANY;
 
 }  // namespace test::jtx
 
diff --git a/src/test/jtx/attester.h b/src/test/jtx/attester.h
index 1c38684890..e288629cbd 100644
--- a/src/test/jtx/attester.h
+++ b/src/test/jtx/attester.h
@@ -16,7 +16,7 @@ class STAmount;
 namespace test::jtx {
 
 Buffer
-sign_claim_attestation(
+signClaimAttestation(
     PublicKey const& pk,
     SecretKey const& sk,
     STXChainBridge const& bridge,
@@ -28,7 +28,7 @@ sign_claim_attestation(
     std::optional<AccountID> const& dst);
 
 Buffer
-sign_create_account_attestation(
+signCreateAccountAttestation(
     PublicKey const& pk,
     SecretKey const& sk,
     STXChainBridge const& bridge,
diff --git a/src/test/jtx/balance.h b/src/test/jtx/balance.h
index a75583b1a3..5ea80c77f8 100644
--- a/src/test/jtx/balance.h
+++ b/src/test/jtx/balance.h
@@ -15,7 +15,7 @@ namespace xrpl::test::jtx {
     exist even if the amount is 0, or else the test
     fails.
 */
-class balance
+class Balance
 {
 private:
     bool const none_;
@@ -23,16 +23,16 @@ private:
     STAmount const value_;
 
 public:
-    balance(Account account, none_t) : none_(true), account_(std::move(account)), value_(XRP)
+    Balance(Account account, NoneT) : none_(true), account_(std::move(account)), value_(XRP)
     {
     }
 
-    balance(Account account, None const& value)
+    Balance(Account account, None const& value)
         : none_(true), account_(std::move(account)), value_(value.asset)
     {
     }
 
-    balance(Account account, STAmount value)
+    Balance(Account account, STAmount value)
         : none_(false), account_(std::move(account)), value_(std::move(value))
     {
     }
diff --git a/src/test/jtx/basic_prop.h b/src/test/jtx/basic_prop.h
index 16e1d8cd6d..97177b280b 100644
--- a/src/test/jtx/basic_prop.h
+++ b/src/test/jtx/basic_prop.h
@@ -4,35 +4,35 @@
 
 namespace xrpl::test::jtx {
 
-struct basic_prop
+struct BasicProp
 {
-    virtual ~basic_prop() = default;
-    [[nodiscard]] virtual std::unique_ptr<basic_prop>
+    virtual ~BasicProp() = default;
+    [[nodiscard]] virtual std::unique_ptr<BasicProp>
     clone() const = 0;
     virtual bool
-    assignable(basic_prop const*) const = 0;
+    assignable(BasicProp const*) const = 0;
 };
 
 template <class T>
-struct prop_type : basic_prop
+struct PropType : BasicProp
 {
     T t;
 
     template <class... Args>
-    prop_type(Args&&... args) : t(std::forward<Args>(args)...)
+    PropType(Args&&... args) : t(std::forward<Args>(args)...)
     {
     }
 
-    [[nodiscard]] std::unique_ptr<basic_prop>
+    [[nodiscard]] std::unique_ptr<BasicProp>
     clone() const override
     {
-        return std::make_unique<prop_type<T>>(t);
+        return std::make_unique<PropType<T>>(t);
     }
 
     bool
-    assignable(basic_prop const* src) const override
+    assignable(BasicProp const* src) const override
     {
-        return dynamic_cast<prop_type<T> const*>(src);
+        return dynamic_cast<PropType<T> const*>(src);
     }
 };
 
diff --git a/src/test/jtx/batch.h b/src/test/jtx/batch.h
index 846adc9adc..a80ce46b9c 100644
--- a/src/test/jtx/batch.h
+++ b/src/test/jtx/batch.h
@@ -22,20 +22,20 @@ XRPAmount
 calcBatchFee(jtx::Env const& env, uint32_t const& numSigners, uint32_t const& txns = 0);
 
 /** Batch. */
-Json::Value
+json::Value
 outer(jtx::Account const& account, uint32_t seq, STAmount const& fee, std::uint32_t flags);
 
 /** Adds a new Batch Txn on a JTx and autofills. */
-class inner
+class Inner
 {
 private:
-    Json::Value txn_;
+    json::Value txn_;
     std::uint32_t seq_;
     std::optional<std::uint32_t> ticket_;
 
 public:
-    inner(
-        Json::Value txn,
+    Inner(
+        json::Value txn,
         std::uint32_t const& sequence,
         std::optional<std::uint32_t> const& ticket = std::nullopt)
         : txn_(std::move(txn)), seq_(sequence), ticket_(ticket)
@@ -56,19 +56,19 @@ public:
     void
     operator()(Env&, JTx& jtx) const;
 
-    Json::Value&
-    operator[](Json::StaticString const& key)
+    json::Value&
+    operator[](json::StaticString const& key)
     {
         return txn_[key];
     }
 
     void
-    removeMember(Json::StaticString const& key)
+    removeMember(json::StaticString const& key)
     {
         txn_.removeMember(key);
     }
 
-    [[nodiscard]] Json::Value const&
+    [[nodiscard]] json::Value const&
     getTxn() const
     {
         return txn_;
@@ -76,19 +76,19 @@ public:
 };
 
 /** Set a batch signature on a JTx. */
-class sig
+class Sig
 {
 public:
     std::vector<Reg> signers;
 
-    sig(std::vector<Reg> signers_) : signers(std::move(signers_))
+    Sig(std::vector<Reg> s) : signers(std::move(s))
     {
         sortSigners(signers);
     }
 
     template <class AccountType, class... Accounts>
         requires std::convertible_to<AccountType, Reg>
-    explicit sig(AccountType&& a0, Accounts&&... aN)
+    explicit Sig(AccountType&& a0, Accounts&&... aN)
         : signers{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}
     {
         sortSigners(signers);
@@ -99,21 +99,21 @@ public:
 };
 
 /** Set a batch nested multi-signature on a JTx. */
-class msig
+class Msig
 {
 public:
     Account master;
     std::vector<Reg> signers;
 
-    msig(Account masterAccount, std::vector<Reg> signers_)
-        : master(std::move(masterAccount)), signers(std::move(signers_))
+    Msig(Account masterAccount, std::vector<Reg> s)
+        : master(std::move(masterAccount)), signers(std::move(s))
     {
         sortSigners(signers);
     }
 
     template <class AccountType, class... Accounts>
         requires std::convertible_to<AccountType, Reg>
-    explicit msig(Account masterAccount, AccountType&& a0, Accounts&&... aN)
+    explicit Msig(Account masterAccount, AccountType&& a0, Accounts&&... aN)
         : master(std::move(masterAccount))
         , signers{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}
     {
diff --git a/src/test/jtx/check.h b/src/test/jtx/check.h
index fc1d8054c6..7c3dc6aa80 100644
--- a/src/test/jtx/check.h
+++ b/src/test/jtx/check.h
@@ -12,7 +12,7 @@ namespace xrpl::test::jtx {
 namespace check {
 
 /** Cash a check requiring that a specific amount be delivered. */
-Json::Value
+json::Value
 cash(jtx::Account const& dest, uint256 const& checkId, STAmount const& amount);
 
 /** Type used to specify DeliverMin for cashing a check. */
@@ -25,16 +25,16 @@ struct DeliverMin
 };
 
 /** Cash a check requiring that at least a minimum amount be delivered. */
-Json::Value
+json::Value
 cash(jtx::Account const& dest, uint256 const& checkId, DeliverMin const& atLeast);
 
 /** Cancel a check. */
-Json::Value
+json::Value
 cancel(jtx::Account const& dest, uint256 const& checkId);
 
 }  // namespace check
 
 /** Match the number of checks on the account. */
-using checks = owner_count<ltCHECK>;
+using checks = OwnerCount<ltCHECK>;
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/credentials.h b/src/test/jtx/credentials.h
index fd6d31f56d..e441232825 100644
--- a/src/test/jtx/credentials.h
+++ b/src/test/jtx/credentials.h
@@ -16,13 +16,13 @@ keylet(
 }
 
 // Sets the optional URI.
-class uri
+class Uri
 {
 private:
     std::string const uri_;
 
 public:
-    explicit uri(std::string_view u) : uri_(strHex(u))
+    explicit Uri(std::string_view u) : uri_(strHex(u))
     {
     }
 
@@ -34,46 +34,46 @@ public:
 };
 
 // Set credentialsIDs array
-class ids
+class Ids
 {
 private:
     std::vector<std::string> const credentials_;
 
 public:
-    explicit ids(std::vector<std::string> const& creds) : credentials_(creds)
+    explicit Ids(std::vector<std::string> const& creds) : credentials_(creds)
     {
     }
 
     void
     operator()(jtx::Env&, jtx::JTx& jtx) const
     {
-        auto& arr(jtx.jv[sfCredentialIDs.jsonName] = Json::arrayValue);
+        auto& arr(jtx.jv[sfCredentialIDs.jsonName] = json::ArrayValue);
         for (auto const& hash : credentials_)
             arr.append(hash);
     }
 };
 
-Json::Value
+json::Value
 create(jtx::Account const& subject, jtx::Account const& issuer, std::string_view credType);
 
-Json::Value
+json::Value
 accept(jtx::Account const& subject, jtx::Account const& issuer, std::string_view credType);
 
-Json::Value
+json::Value
 deleteCred(
     jtx::Account const& acc,
     jtx::Account const& subject,
     jtx::Account const& issuer,
     std::string_view credType);
 
-Json::Value
+json::Value
 ledgerEntry(
     jtx::Env& env,
     jtx::Account const& subject,
     jtx::Account const& issuer,
     std::string_view credType);
 
-Json::Value
+json::Value
 ledgerEntry(jtx::Env& env, std::string const& credIdx);
 
 }  // namespace xrpl::test::jtx::credentials
diff --git a/src/test/jtx/delegate.h b/src/test/jtx/delegate.h
index 197750a511..ae848603a7 100644
--- a/src/test/jtx/delegate.h
+++ b/src/test/jtx/delegate.h
@@ -7,21 +7,21 @@
 
 namespace xrpl::test::jtx::delegate {
 
-Json::Value
+json::Value
 set(jtx::Account const& account,
     jtx::Account const& authorize,
     std::vector<std::string> const& permissions);
 
-Json::Value
+json::Value
 entry(jtx::Env& env, jtx::Account const& account, jtx::Account const& authorize);
 
-struct as
+struct As
 {
 private:
     jtx::Account delegate_;
 
 public:
-    explicit as(jtx::Account account) : delegate_(std::move(account))
+    explicit As(jtx::Account account) : delegate_(std::move(account))
     {
     }
 
diff --git a/src/test/jtx/delivermin.h b/src/test/jtx/delivermin.h
index 6dc0bea2ad..0a8fa9f823 100644
--- a/src/test/jtx/delivermin.h
+++ b/src/test/jtx/delivermin.h
@@ -9,13 +9,13 @@
 namespace xrpl::test::jtx {
 
 /** Sets the DeliverMin on a JTx. */
-class deliver_min
+class DeliverMin
 {
 private:
     STAmount amount_;
 
 public:
-    deliver_min(STAmount amount) : amount_(std::move(amount))
+    DeliverMin(STAmount amount) : amount_(std::move(amount))
     {
     }
 
diff --git a/src/test/jtx/deposit.h b/src/test/jtx/deposit.h
index 1d032bf1e0..0d8e363138 100644
--- a/src/test/jtx/deposit.h
+++ b/src/test/jtx/deposit.h
@@ -7,11 +7,11 @@
 namespace xrpl::test::jtx::deposit {
 
 /** Preauthorize for deposit.  Invoke as deposit::auth. */
-Json::Value
+json::Value
 auth(Account const& account, Account const& auth);
 
 /** Remove pre-authorization for deposit.  Invoke as deposit::unauth. */
-Json::Value
+json::Value
 unauth(Account const& account, Account const& unauth);
 
 struct AuthorizeCredentials
@@ -22,30 +22,30 @@ struct AuthorizeCredentials
     auto
     operator<=>(AuthorizeCredentials const&) const = default;
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     toJson() const
     {
-        Json::Value jv;
+        json::Value jv;
         jv[jss::Issuer] = issuer.human();
         jv[sfCredentialType.jsonName] = strHex(credType);
         return jv;
     }
 
     // "ledger_entry" uses a different naming convention
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     toLEJson() const
     {
-        Json::Value jv;
+        json::Value jv;
         jv[jss::issuer] = issuer.human();
         jv[jss::credential_type] = strHex(credType);
         return jv;
     }
 };
 
-Json::Value
+json::Value
 authCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials> const& auth);
 
-Json::Value
+json::Value
 unauthCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials> const& auth);
 
 }  // namespace xrpl::test::jtx::deposit
diff --git a/src/test/jtx/did.h b/src/test/jtx/did.h
index faf4b2046c..7662c6556a 100644
--- a/src/test/jtx/did.h
+++ b/src/test/jtx/did.h
@@ -7,20 +7,20 @@
 /** DID operations. */
 namespace xrpl::test::jtx::did {
 
-Json::Value
+json::Value
 set(jtx::Account const& account);
 
-Json::Value
+json::Value
 setValid(jtx::Account const& account);
 
 /** Sets the optional DIDDocument on a DIDSet. */
-class document
+class Document
 {
 private:
     std::string document_;
 
 public:
-    explicit document(std::string const& u) : document_(strHex(u))
+    explicit Document(std::string const& u) : document_(strHex(u))
     {
     }
 
@@ -32,13 +32,13 @@ public:
 };
 
 /** Sets the optional URI on a DIDSet. */
-class uri
+class Uri
 {
 private:
     std::string uri_;
 
 public:
-    explicit uri(std::string const& u) : uri_(strHex(u))
+    explicit Uri(std::string const& u) : uri_(strHex(u))
     {
     }
 
@@ -50,13 +50,13 @@ public:
 };
 
 /** Sets the optional Data on a DIDSet. */
-class data
+class Data
 {
 private:
     std::string data_;
 
 public:
-    explicit data(std::string const& u) : data_(strHex(u))
+    explicit Data(std::string const& u) : data_(strHex(u))
     {
     }
 
@@ -67,7 +67,7 @@ public:
     }
 };
 
-Json::Value
+json::Value
 del(jtx::Account const& account);
 
 }  // namespace xrpl::test::jtx::did
diff --git a/src/test/jtx/directory.h b/src/test/jtx/directory.h
index 08d8fef73e..5f277d6c91 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 dirNodeMaxPages - 1;
+    return kDIR_NODE_MAX_PAGES - 1;
 }
 
 }  // namespace xrpl::test::jtx::directory
diff --git a/src/test/jtx/domain.h b/src/test/jtx/domain.h
index 993c89ee19..b3a0744768 100644
--- a/src/test/jtx/domain.h
+++ b/src/test/jtx/domain.h
@@ -5,13 +5,13 @@
 namespace xrpl::test::jtx {
 
 /** Set the domain on a JTx. */
-class domain
+class Domain
 {
 private:
     uint256 v_;
 
 public:
-    explicit domain(uint256 const& v) : v_(v)
+    explicit Domain(uint256 const& v) : v_(v)
     {
     }
 
diff --git a/src/test/jtx/envconfig.h b/src/test/jtx/envconfig.h
index dcfafc426e..9a4e1dc20a 100644
--- a/src/test/jtx/envconfig.h
+++ b/src/test/jtx/envconfig.h
@@ -9,12 +9,12 @@ namespace xrpl::test {
 #define PORT_RPC "port_rpc"
 #define PORT_PEER "port_peer"
 
-extern std::atomic<bool> envUseIPv4;
+extern std::atomic<bool> gEnvUseIPv4;
 
 inline char const*
 getEnvLocalhostAddr()
 {
-    return envUseIPv4 ? "127.0.0.1" : "::1";
+    return gEnvUseIPv4 ? "127.0.0.1" : "::1";
 }
 
 /// @brief initializes a config object for use with jtx::Env
@@ -59,20 +59,20 @@ envconfig(F&& modfunc, Args&&... args)
 /// @brief adjust config so no admin ports are enabled
 ///
 /// this is intended for use with envconfig, as in
-/// envconfig(no_admin)
+/// envconfig(noAdmin)
 ///
 /// @param cfg config instance to be modified
 ///
 /// @return unique_ptr to Config instance
-std::unique_ptr<Config> no_admin(std::unique_ptr<Config>);
+std::unique_ptr<Config> noAdmin(std::unique_ptr<Config>);
 
-std::unique_ptr<Config> secure_gateway(std::unique_ptr<Config>);
+std::unique_ptr<Config> secureGateway(std::unique_ptr<Config>);
 
-std::unique_ptr<Config> admin_localnet(std::unique_ptr<Config>);
+std::unique_ptr<Config> adminLocalnet(std::unique_ptr<Config>);
 
-std::unique_ptr<Config> secure_gateway_localnet(std::unique_ptr<Config>);
+std::unique_ptr<Config> secureGatewayLocalnet(std::unique_ptr<Config>);
 
-std::unique_ptr<Config> single_thread_io(std::unique_ptr<Config>);
+std::unique_ptr<Config> singleThreadIo(std::unique_ptr<Config>);
 
 /// @brief adjust configuration with params needed to be a validator
 ///
@@ -96,7 +96,7 @@ validator(std::unique_ptr<Config>, std::string const&);
 /// @param cfg config instance to be modified
 std::unique_ptr<Config> addGrpcConfig(std::unique_ptr<Config>);
 
-/// @brief add a grpc address, port and secure_gateway to config
+/// @brief add a grpc address, port and secureGateway to config
 ///
 /// This is intended for use with envconfig, for tests that require a grpc
 /// server. If this function is not called, grpc server will not start
diff --git a/src/test/jtx/escrow.h b/src/test/jtx/escrow.h
index 8bb505a592..5cb6f65395 100644
--- a/src/test/jtx/escrow.h
+++ b/src/test/jtx/escrow.h
@@ -11,28 +11,28 @@
 /** Escrow operations. */
 namespace xrpl::test::jtx::escrow {
 
-Json::Value
+json::Value
 create(AccountID const& account, AccountID const& to, STAmount const& amount);
 
-inline Json::Value
+inline json::Value
 create(Account const& account, Account const& to, STAmount const& amount)
 {
     return create(account.id(), to.id(), amount);
 }
 
-Json::Value
+json::Value
 finish(AccountID const& account, AccountID const& from, std::uint32_t seq);
 
-inline Json::Value
+inline json::Value
 finish(Account const& account, Account const& from, std::uint32_t seq)
 {
     return finish(account.id(), from.id(), seq);
 }
 
-Json::Value
+json::Value
 cancel(AccountID const& account, Account const& from, std::uint32_t seq);
 
-inline Json::Value
+inline json::Value
 cancel(Account const& account, Account const& from, std::uint32_t seq)
 {
     return cancel(account.id(), from, seq);
@@ -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 condition.
-std::array<std::uint8_t, 4> const fb1 = {{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 cb1 = {
+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 condition.
-std::array<std::uint8_t, 7> const fb2 = {{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 cb2 = {
+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 fulfillment and its associated condition.
-std::array<std::uint8_t, 8> const fb3 = {{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 cb3 = {
+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 finish_time = JTxFieldWrapper<timePointField>(sfFinishAfter);
+auto const kFINISH_TIME = JTxFieldWrapper<TimePointField>(sfFinishAfter);
 
 /** Set the "CancelAfter" time tag on a JTx */
-auto const cancel_time = JTxFieldWrapper<timePointField>(sfCancelAfter);
+auto const kCANCEL_TIME = JTxFieldWrapper<TimePointField>(sfCancelAfter);
 
-auto const condition = JTxFieldWrapper<blobField>(sfCondition);
+auto const kCONDITION = JTxFieldWrapper<BlobField>(sfCondition);
 
-auto const fulfillment = JTxFieldWrapper<blobField>(sfFulfillment);
+auto const kFULFILLMENT = JTxFieldWrapper<BlobField>(sfFulfillment);
 
 }  // namespace xrpl::test::jtx::escrow
diff --git a/src/test/jtx/fee.h b/src/test/jtx/fee.h
index f586e2a082..048b262e88 100644
--- a/src/test/jtx/fee.h
+++ b/src/test/jtx/fee.h
@@ -11,7 +11,7 @@
 namespace xrpl::test::jtx {
 
 /** Set the fee on a JTx. */
-class fee
+class Fee
 {
 private:
     bool manual_ = true;
@@ -19,25 +19,25 @@ private:
     std::optional<STAmount> amount_;
 
 public:
-    explicit fee(autofill_t) : manual_(false)
+    explicit Fee(AutofillT) : manual_(false)
     {
     }
 
-    explicit fee(increment_t) : increment_(true)
+    explicit Fee(IncrementT) : increment_(true)
     {
     }
 
-    explicit fee(none_t)
+    explicit Fee(NoneT)
     {
     }
 
-    explicit fee(STAmount const& amount) : amount_(amount)
+    explicit Fee(STAmount const& amount) : amount_(amount)
     {
         if (!isXRP(*amount_))
             Throw<std::runtime_error>("fee: not XRP");
     }
 
-    explicit fee(std::uint64_t amount, bool negative = false) : fee{STAmount{amount, negative}}
+    explicit Fee(std::uint64_t amount, bool negative = false) : Fee{STAmount{amount, negative}}
     {
     }
 
diff --git a/src/test/jtx/flags.h b/src/test/jtx/flags.h
index 4bf095e685..6e0c49b752 100644
--- a/src/test/jtx/flags.h
+++ b/src/test/jtx/flags.h
@@ -11,14 +11,14 @@
 namespace xrpl {
 namespace detail {
 
-class flags_helper
+class FlagsHelper
 {
 protected:
     std::uint32_t mask_{0};
 
 private:
     void
-    set_args(std::uint32_t flag)
+    setArgs(std::uint32_t flag)
     {
         switch (flag)
         {
@@ -72,18 +72,18 @@ private:
 
     template <class Flag, class... Args>
     void
-    set_args(std::uint32_t flag, Args... args)
+    setArgs(std::uint32_t flag, Args... args)
     {
-        set_args(flag);
+        setArgs(flag);
         if constexpr (sizeof...(args))
-            set_args(args...);
+            setArgs(args...);
     }
 
 protected:
     template <class... Args>
-    flags_helper(Args... args)
+    FlagsHelper(Args... args)
     {
-        set_args(args...);
+        setArgs(args...);
     }
 };
 
@@ -94,25 +94,25 @@ namespace test::jtx {
 // JSON generators
 
 /** Add and/or remove flag. */
-Json::Value
+json::Value
 fset(Account const& account, std::uint32_t on, std::uint32_t off = 0);
 
 /** Remove account flag. */
-inline Json::Value
+inline json::Value
 fclear(Account const& account, std::uint32_t off)
 {
     return fset(account, 0, off);
 }
 
 /** Match set account flags */
-class flags : private xrpl::detail::flags_helper
+class Flags : private xrpl::detail::FlagsHelper
 {
 private:
     Account account_;
 
 public:
     template <class... Args>
-    flags(Account account, Args... args) : flags_helper(args...), account_(std::move(account))
+    Flags(Account account, Args... args) : FlagsHelper(args...), account_(std::move(account))
     {
     }
 
@@ -121,14 +121,14 @@ public:
 };
 
 /** Match clear account flags */
-class nflags : private xrpl::detail::flags_helper
+class Nflags : private xrpl::detail::FlagsHelper
 {
 private:
     Account account_;
 
 public:
     template <class... Args>
-    nflags(Account account, Args... args) : flags_helper(args...), account_(std::move(account))
+    Nflags(Account account, Args... args) : FlagsHelper(args...), account_(std::move(account))
     {
     }
 
diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp
index 6f68033fc4..5193034826 100644
--- a/src/test/jtx/impl/AMM.cpp
+++ b/src/test/jtx/impl/AMM.cpp
@@ -68,9 +68,9 @@ AMM::AMM(
     std::uint16_t tfee,
     std::uint32_t fee,
     std::optional<std::uint32_t> flags,
-    std::optional<jtx::seq> seq,
-    std::optional<jtx::msig> ms,
-    std::optional<ter> const& ter,
+    std::optional<jtx::Seq> seq,
+    std::optional<jtx::Msig> ms,
+    std::optional<Ter> const& ter,
     bool close)
     : env_(env)
     , creatorAccount_(std::move(account))
@@ -93,7 +93,7 @@ AMM::AMM(
     Account const& account,
     STAmount const& asset1,
     STAmount const& asset2,
-    ter const& ter,
+    Ter const& ter,
     bool log,
     bool close)
     : AMM(env,
@@ -132,17 +132,17 @@ AMM::AMM(
 {
 }
 
-Json::Value
+json::Value
 AMM::createJv(
     AccountID const& account,
     STAmount const& asset1,
     STAmount const& asset2,
     std::uint16_t const& tfee)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = to_string(account);
-    jv[jss::Amount] = asset1.getJson(JsonOptions::none);
-    jv[jss::Amount2] = asset2.getJson(JsonOptions::none);
+    jv[jss::Amount] = asset1.getJson(JsonOptions::KNone);
+    jv[jss::Amount2] = asset2.getJson(JsonOptions::KNone);
     jv[jss::TradingFee] = tfee;
     jv[jss::TransactionType] = jss::AMMCreate;
 
@@ -153,10 +153,10 @@ AMM::createJv(
 AMM::create(
     std::uint32_t tfee,
     std::optional<std::uint32_t> const& flags,
-    std::optional<jtx::seq> const& seq,
-    std::optional<ter> const& ter)
+    std::optional<jtx::Seq> const& seq,
+    std::optional<Ter> const& ter)
 {
-    Json::Value jv = createJv(creatorAccount_, asset1_, asset2_, tfee);
+    json::Value jv = createJv(creatorAccount_, asset1_, asset2_, tfee);
     if (flags)
         jv[jss::Flags] = *flags;
     if (fee_ != 0)
@@ -179,7 +179,7 @@ AMM::create(
     return {};
 }
 
-Json::Value
+json::Value
 AMM::ammRpcInfo(
     std::optional<AccountID> const& account,
     std::optional<std::string> const& ledgerIndex,
@@ -189,7 +189,7 @@ AMM::ammRpcInfo(
     bool ignoreParams,
     unsigned apiVersion) const
 {
-    Json::Value jv;
+    json::Value jv;
     if (account)
         jv[jss::account] = to_string(*account);
     if (ledgerIndex)
@@ -199,25 +199,25 @@ AMM::ammRpcInfo(
         if (asset1 || asset2)
         {
             if (asset1)
-                jv[jss::asset] = STIssue(sfAsset, *asset1).getJson(JsonOptions::none);
+                jv[jss::asset] = STIssue(sfAsset, *asset1).getJson(JsonOptions::KNone);
             if (asset2)
-                jv[jss::asset2] = STIssue(sfAsset2, *asset2).getJson(JsonOptions::none);
+                jv[jss::asset2] = STIssue(sfAsset2, *asset2).getJson(JsonOptions::KNone);
         }
         else if (!ammAccount)
         {
-            jv[jss::asset] = STIssue(sfAsset, asset1_.asset()).getJson(JsonOptions::none);
-            jv[jss::asset2] = STIssue(sfAsset2, asset2_.asset()).getJson(JsonOptions::none);
+            jv[jss::asset] = STIssue(sfAsset, asset1_.asset()).getJson(JsonOptions::KNone);
+            jv[jss::asset2] = STIssue(sfAsset2, asset2_.asset()).getJson(JsonOptions::KNone);
         }
         if (ammAccount)
             jv[jss::amm_account] = to_string(*ammAccount);
     }
     auto jr =
-        (apiVersion == RPC::apiInvalidVersion
+        (apiVersion == RPC::kAPI_INVALID_VERSION
              ? 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))
         return jr[jss::result];
-    return Json::nullValue;
+    return json::NullValue;
 }
 
 std::tuple<STAmount, STAmount, STAmount>
@@ -232,8 +232,8 @@ AMM::balances(Asset const& asset1, Asset const& asset2, std::optional<AccountID>
             ammAccountID,
             asset1,
             asset2,
-            FreezeHandling::fhIGNORE_FREEZE,
-            AuthHandling::ahIGNORE_AUTH,
+            FreezeHandling::IgnoreFreeze,
+            AuthHandling::IgnoreAuth,
             env_.journal);
         auto const lptAMMBalance = account
             ? ammLPHolds(*env_.current(), *amm, *account, env_.journal)
@@ -262,11 +262,7 @@ AMM::getLPTokensBalance(std::optional<AccountID> const& account) const
     if (account)
     {
         return accountHolds(
-                   *env_.current(),
-                   *account,
-                   lptIssue_,
-                   FreezeHandling::fhZERO_IF_FROZEN,
-                   env_.journal)
+                   *env_.current(), *account, lptIssue_, FreezeHandling::ZeroIfFrozen, env_.journal)
             .iou();
     }
     if (auto const amm = env_.current()->read(keylet::amm(asset1_.asset(), asset2_.asset())))
@@ -338,10 +334,10 @@ AMM::expectAmmRpcInfo(
     STAmount const& asset2,
     IOUAmount const& balance,
     std::optional<AccountID> const& account,
-    std::optional<std::string> const& ledger_index,
+    std::optional<std::string> const& ledgerIndex,
     std::optional<AccountID> const& ammAccount) const
 {
-    auto const jv = ammRpcInfo(account, ledger_index, std::nullopt, std::nullopt, ammAccount);
+    auto const jv = ammRpcInfo(account, ledgerIndex, std::nullopt, std::nullopt, ammAccount);
     return expectAmmInfo(asset1, asset2, balance, jv);
 }
 
@@ -350,7 +346,7 @@ AMM::expectAmmInfo(
     STAmount const& asset1,
     STAmount const& asset2,
     IOUAmount const& balance,
-    Json::Value const& jvRes) const
+    json::Value const& jvRes) const
 {
     if (!jvRes.isMember(jss::amm))
         return false;
@@ -374,30 +370,30 @@ AMM::expectAmmInfo(
 }
 
 void
-AMM::setTokens(Json::Value& jv, std::optional<std::pair<Asset, Asset>> const& assets)
+AMM::setTokens(json::Value& jv, std::optional<std::pair<Asset, Asset>> const& assets)
 {
     if (assets)
     {
-        jv[jss::Asset] = STIssue(sfAsset, assets->first).getJson(JsonOptions::none);
-        jv[jss::Asset2] = STIssue(sfAsset, assets->second).getJson(JsonOptions::none);
+        jv[jss::Asset] = STIssue(sfAsset, assets->first).getJson(JsonOptions::KNone);
+        jv[jss::Asset2] = STIssue(sfAsset, assets->second).getJson(JsonOptions::KNone);
     }
     else
     {
-        jv[jss::Asset] = STIssue(sfAsset, asset1_.asset()).getJson(JsonOptions::none);
-        jv[jss::Asset2] = STIssue(sfAsset, asset2_.asset()).getJson(JsonOptions::none);
+        jv[jss::Asset] = STIssue(sfAsset, asset1_.asset()).getJson(JsonOptions::KNone);
+        jv[jss::Asset2] = STIssue(sfAsset, asset2_.asset()).getJson(JsonOptions::KNone);
     }
 }
 
-Json::Value
+json::Value
 AMM::depositJv(DepositArg const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.account || !arg.assets)
         Throw<std::runtime_error>("AMM::depositJv: account or assets not set");
 
     jv[jss::Account] = arg.account->human();
-    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::none);
-    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::none);
+    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::KNone);
+    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::KNone);
     if (arg.tokens)
         arg.tokens->tokens().setJson(jv[jss::LPTokenOut]);
     if (arg.asset1In)
@@ -450,7 +446,7 @@ AMM::deposit(
     LPToken tokens,
     std::optional<STAmount> const& asset1In,
     std::optional<std::uint32_t> const& flags,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
     return deposit(
         account,
@@ -472,7 +468,7 @@ AMM::deposit(
     std::optional<STAmount> const& asset2In,
     std::optional<STAmount> const& maxEP,
     std::optional<std::uint32_t> const& flags,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
     if (asset2In && maxEP)
         Throw<std::runtime_error>("Invalid options: asset2In and maxEP");
@@ -498,13 +494,13 @@ AMM::deposit(
     std::optional<STAmount> const& maxEP,
     std::optional<std::uint32_t> const& flags,
     std::optional<std::pair<Asset, Asset>> const& assets,
-    std::optional<jtx::seq> const& seq,
+    std::optional<jtx::Seq> const& seq,
     std::optional<std::uint16_t> const& tfee,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
     auto const acct = account ? account : creatorAccount_;
     auto const lpTokens = getLPTokensBalance(acct);
-    Json::Value jv = depositJv(
+    json::Value jv = depositJv(
         {.account = acct,
          .tokens = tokens ? tokens->tokens(lptIssue_) : tokens,
          .asset1In = asset1In,
@@ -535,15 +531,15 @@ AMM::deposit(DepositArg const& arg)
         arg.err);
 }
 
-Json::Value
+json::Value
 AMM::withdrawJv(WithdrawArg const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.account || !arg.assets)
         Throw<std::runtime_error>("AMM::withdrawJv: account or assets not set");
     jv[jss::Account] = arg.account->human();
-    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::none);
-    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::none);
+    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::KNone);
+    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::KNone);
     if (arg.tokens)
         arg.tokens->tokens().setJson(jv[jss::LPTokenIn]);
     if (arg.asset1Out)
@@ -591,7 +587,7 @@ AMM::withdraw(
     std::optional<LPToken> const& tokens,
     std::optional<STAmount> const& asset1Out,
     std::optional<std::uint32_t> const& flags,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
     return withdraw(
         account,
@@ -611,7 +607,7 @@ AMM::withdraw(
     STAmount const& asset1Out,
     std::optional<STAmount> const& asset2Out,
     std::optional<LPToken> const& maxEP,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
     if (asset2Out && maxEP)
         Throw<std::runtime_error>("Invalid options: asset2Out and maxEP");
@@ -636,12 +632,12 @@ AMM::withdraw(
     std::optional<LPToken> const& maxEP,
     std::optional<std::uint32_t> const& flags,
     std::optional<std::pair<Asset, Asset>> const& assets,
-    std::optional<jtx::seq> const& seq,
-    std::optional<ter> const& ter)
+    std::optional<jtx::Seq> const& seq,
+    std::optional<Ter> const& ter)
 {
     auto const acct = account ? account : creatorAccount_;
     auto const lpTokens = getLPTokensBalance(acct);
-    Json::Value jv = withdrawJv({
+    json::Value jv = withdrawJv({
         .account = acct,
         .tokens = tokens ? tokens->tokens(lptIssue_) : tokens,
         .asset1Out = asset1Out,
@@ -671,15 +667,15 @@ AMM::withdraw(WithdrawArg const& arg)
         arg.err);
 }
 
-Json::Value
+json::Value
 AMM::voteJv(VoteArg const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.account || !arg.assets)
         Throw<std::runtime_error>("AMM::withdrawJv: account or assets not set");
     jv[jss::Account] = arg.account->human();
-    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::none);
-    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::none);
+    jv[jss::Asset] = STIssue(sfAsset, arg.assets->first).getJson(JsonOptions::KNone);
+    jv[jss::Asset2] = STIssue(sfAsset, arg.assets->second).getJson(JsonOptions::KNone);
     jv[jss::TradingFee] = arg.tfee;
     if (arg.flags)
         jv[jss::Flags] = *arg.flags;
@@ -694,11 +690,11 @@ AMM::vote(
     std::optional<Account> const& account,
     std::uint32_t feeVal,
     std::optional<std::uint32_t> const& flags,
-    std::optional<jtx::seq> const& seq,
+    std::optional<jtx::Seq> const& seq,
     std::optional<std::pair<Asset, Asset>> const& assets,
-    std::optional<ter> const& ter)
+    std::optional<Ter> const& ter)
 {
-    Json::Value jv = voteJv({
+    json::Value jv = voteJv({
         .account = account ? account : creatorAccount_,
         .tfee = feeVal,
         .flags = flags,
@@ -715,7 +711,7 @@ AMM::vote(VoteArg const& arg)
     vote(arg.account, arg.tfee, arg.flags, arg.seq, arg.assets, arg.err);
 }
 
-Json::Value
+json::Value
 AMM::bid(BidArg const& arg)
 {
     if (auto const amm = env_.current()->read(keylet::amm(asset1_.asset(), asset2_.asset())))
@@ -726,14 +722,14 @@ AMM::bid(BidArg const& arg)
         if (amm->isFieldPresent(sfAuctionSlot))
         {
             auto const& auctionSlot =
-                safe_downcast<STObject const&>(amm->peekAtField(sfAuctionSlot));
+                safeDowncast<STObject const&>(amm->peekAtField(sfAuctionSlot));
             lastPurchasePrice_ = auctionSlot[sfPrice].iou();
         }
     }
     bidMin_ = std::nullopt;
     bidMax_ = std::nullopt;
 
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = arg.account ? arg.account->human() : creatorAccount_.human();
     setTokens(jv, arg.assets);
     auto getBid = [&](auto const& bid) {
@@ -762,11 +758,11 @@ AMM::bid(BidArg const& arg)
     }
     if (!arg.authAccounts.empty())
     {
-        Json::Value accounts(Json::arrayValue);
+        json::Value accounts(json::ArrayValue);
         for (auto const& account : arg.authAccounts)
         {
-            Json::Value acct;
-            Json::Value authAcct;
+            json::Value acct;
+            json::Value authAcct;
             acct[jss::Account] = account.human();
             authAcct[jss::AuthAccount] = acct;
             accounts.append(authAcct);
@@ -799,9 +795,9 @@ AMM::clawback(ClawbackArg const& arg)
 
 void
 AMM::submit(
-    Json::Value const& jv,
-    std::optional<jtx::seq> const& seq,
-    std::optional<ter> const& ter)
+    json::Value const& jv,
+    std::optional<jtx::Seq> const& seq,
+    std::optional<Ter> const& ter)
 {
     if (log_)
         std::cout << jv.toStyledString();
@@ -855,7 +851,7 @@ AMM::expectAuctionSlot(auto&& cb) const
         if (amm->isFieldPresent(sfAuctionSlot))
         {
             auto const& auctionSlot =
-                safe_downcast<STObject const&>(amm->peekAtField(sfAuctionSlot));
+                safeDowncast<STObject const&>(amm->peekAtField(sfAuctionSlot));
             if (auctionSlot.isFieldPresent(sfAccount))
             {
                 // This could fail in pre-fixInnerObjTemplate tests
@@ -874,13 +870,13 @@ AMM::expectAuctionSlot(auto&& cb) const
     return false;
 }
 
-Json::Value
+json::Value
 AMM::deleteJv(AccountID const& account, Asset const& asset1, Asset const& asset2)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = to_string(account);
-    jv[jss::Asset] = STIssue(sfAsset, asset1).getJson(JsonOptions::none);
-    jv[jss::Asset2] = STIssue(sfAsset, asset2).getJson(JsonOptions::none);
+    jv[jss::Asset] = STIssue(sfAsset, asset1).getJson(JsonOptions::KNone);
+    jv[jss::Asset2] = STIssue(sfAsset, asset2).getJson(JsonOptions::KNone);
 
     jv[jss::TransactionType] = jss::AMMDelete;
 
@@ -888,9 +884,9 @@ AMM::deleteJv(AccountID const& account, Asset const& asset1, Asset const& asset2
 }
 
 void
-AMM::ammDelete(AccountID const& account, std::optional<ter> const& ter)
+AMM::ammDelete(AccountID const& account, std::optional<Ter> const& ter)
 {
-    Json::Value jv = deleteJv(account, asset1_.asset(), asset2_.asset());
+    json::Value jv = deleteJv(account, asset1_.asset(), asset2_.asset());
     if (fee_ != 0)
         jv[jss::Fee] = std::to_string(fee_);
     submit(jv, std::nullopt, ter);
@@ -898,7 +894,7 @@ AMM::ammDelete(AccountID const& account, std::optional<ter> const& ter)
 
 namespace amm {
 
-Json::Value
+json::Value
 ammClawback(
     Account const& issuer,
     Account const& holder,
@@ -906,14 +902,14 @@ ammClawback(
     Asset const& asset2,
     std::optional<STAmount> const& amount)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::AMMClawback;
     jv[jss::Account] = issuer.human();
     jv[jss::Holder] = holder.human();
-    jv[jss::Asset] = to_json(asset);
-    jv[jss::Asset2] = to_json(asset2);
+    jv[jss::Asset] = toJson(asset);
+    jv[jss::Asset2] = toJson(asset2);
     if (amount)
-        jv[jss::Amount] = amount->getJson(JsonOptions::none);
+        jv[jss::Amount] = amount->getJson(JsonOptions::KNone);
 
     return jv;
 }
diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp
index dbd8b690f7..5801e8fb44 100644
--- a/src/test/jtx/impl/AMMTest.cpp
+++ b/src/test/jtx/impl/AMMTest.cpp
@@ -65,7 +65,7 @@ fund(
         int i = 0;
         for (auto const& amt : amts)
         {
-            auto amt_ = [&]() {
+            auto amount = [&]() {
                 if (amtsOut.size() == amts.size())
                 {
                     return amtsOut[i++];
@@ -77,11 +77,11 @@ fund(
                 }
                 return amt;
             }();
-            if (amt.holds<Issue>())
-                env.trust(amt_ + amt_, account);
+            if (amount.holds<Issue>())
+                env.trust(amount + amount, account);
             if (amtsOut.size() != amts.size())
-                amtsOut.push_back(amt_);
-            env(pay(amt_.getIssuer(), account, amt_));
+                amtsOut.push_back(amount);
+            env(pay(amount.getIssuer(), account, amount));
         }
     }
     env.close();
@@ -104,15 +104,15 @@ fund(
 }
 
 AMMTestBase::AMMTestBase()
-    : gw("gateway")
-    , carol("carol")
-    , alice("alice")
-    , bob("bob")
-    , USD(gw["USD"])
-    , EUR(gw["EUR"])
-    , GBP(gw["GBP"])
-    , BTC(gw["BTC"])
-    , BAD(jtx::IOU(gw, badCurrency()))
+    : gw_("gateway")
+    , carol_("carol")
+    , alice_("alice")
+    , bob_("bob")
+    , USD(gw_["USD"])
+    , EUR(gw_["EUR"])
+    , GBP(gw_["GBP"])
+    , BTC(gw_["BTC"])
+    , BAD(jtx::IOU(gw_, badCurrency()))
 {
 }
 
@@ -121,7 +121,7 @@ AMMTestBase::testAMM(
     std::function<void(jtx::AMM&, jtx::Env&)> const& cb,
     std::optional<std::pair<STAmount, STAmount>> const& pool,
     std::uint16_t tfee,
-    std::optional<jtx::ter> const& ter,
+    std::optional<jtx::Ter> const& ter,
     std::vector<FeatureBitset> const& vfeatures)
 {
     testAMM(cb, TestAMMArg{.pool = pool, .tfee = tfee, .ter = ter, .features = vfeatures});
@@ -137,7 +137,7 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
     for (auto const& features : arg.features)
     {
         // Use small Number mantissas for the life of this test.
-        NumberMantissaScaleGuard const sg{xrpl::MantissaRange::mantissa_scale::small};
+        NumberMantissaScaleGuard const sg{xrpl::MantissaRange::MantissaScale::Small};
 
         // For now, just disable SAV entirely, which locks in the small Number
         // mantissas
@@ -171,16 +171,16 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
         std::vector<STAmount> funded;
         if (!asset1.native() && !asset2.native())
         {
-            funded = fund(env, gw, {alice, carol}, {toFund1, toFund2}, Fund::All);
+            funded = fund(env, gw_, {alice_, carol_}, {toFund1, toFund2}, Fund::All);
         }
         else if (asset1.native())
         {
-            funded = fund(env, gw, {alice, carol}, toFund1, {toFund2}, Fund::All);
+            funded = fund(env, gw_, {alice_, carol_}, toFund1, {toFund2}, Fund::All);
             funded.insert(funded.begin(), toFund1);
         }
         else if (asset2.native())
         {
-            funded = fund(env, gw, {alice, carol}, toFund2, {toFund1}, Fund::All);
+            funded = fund(env, gw_, {alice_, carol_}, toFund2, {toFund1}, Fund::All);
             funded.push_back(toFund2);
         }
 
@@ -188,7 +188,7 @@ AMMTestBase::testAMM(std::function<void(jtx::AMM&, jtx::Env&)> const& cb, TestAM
         auto const pool2 = STAmount{funded[1].asset(), static_cast<Number>(asset2)};
 
         AMM ammAlice(
-            env, alice, pool1, pool2, CreateArg{.log = false, .tfee = arg.tfee, .err = arg.ter});
+            env, alice_, pool1, pool2, CreateArg{.log = false, .tfee = arg.tfee, .err = arg.ter});
         if (BEAST_EXPECT(ammAlice.expectBalances(pool1, pool2, ammAlice.tokens())))
             cb(ammAlice, env);
     }
@@ -219,4 +219,5 @@ AMMTest::pathTestEnv()
         return cfg;
     }));
 }
+
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp
index e93e6c6068..50e6c701f1 100644
--- a/src/test/jtx/impl/Account.cpp
+++ b/src/test/jtx/impl/Account.cpp
@@ -21,17 +21,17 @@
 
 namespace xrpl::test::jtx {
 
-std::unordered_map<std::pair<std::string, KeyType>, Account, beast::uhash<>> Account::cache_;
+std::unordered_map<std::pair<std::string, KeyType>, Account, beast::Uhash<>> Account::cache;
 
-Account const Account::master(
+Account const Account::kMASTER(
     "master",
-    generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase")),
-    Account::privateCtorTag{});
+    generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")),
+    Account::PrivateCtorTag{});
 
 Account::Account(
     std::string name,
     std::pair<PublicKey, SecretKey> const& keys,
-    Account::privateCtorTag)
+    Account::PrivateCtorTag)
     : name_(std::move(name))
     , pk_(keys.first)
     , sk_(keys.second)
@@ -44,13 +44,13 @@ Account
 Account::fromCache(AcctStringType stringType, std::string name, KeyType type)
 {
     auto p = std::make_pair(name, type);  // non-const so it can be moved from
-    auto const iter = cache_.find(p);
-    if (iter != cache_.end())
+    auto const iter = cache.find(p);
+    if (iter != cache.end())
         return iter->second;
 
     auto const keys = [stringType, &name, type]() {
         // Special handling for base58Seeds.
-        if (stringType == AcctStringType::base58Seed)
+        if (stringType == AcctStringType::Base58Seed)
         {
             std::optional<Seed> const seed = parseBase58<Seed>(name);
             if (!seed.has_value())
@@ -60,28 +60,28 @@ Account::fromCache(AcctStringType stringType, std::string name, KeyType type)
         }
         return generateKeyPair(type, generateSeed(name));
     }();
-    auto r = cache_.emplace(
+    auto r = cache.emplace(
         std::piecewise_construct,
         std::forward_as_tuple(std::move(p)),
-        std::forward_as_tuple(std::move(name), keys, privateCtorTag{}));
+        std::forward_as_tuple(std::move(name), keys, PrivateCtorTag{}));
     return r.first->second;
 }
 
 Account::Account(std::string name, KeyType type)
-    : Account(fromCache(Account::AcctStringType::other, std::move(name), type))
+    : Account(fromCache(Account::AcctStringType::Other, std::move(name), type))
 {
 }
 
 Account::Account(AcctStringType stringType, std::string base58SeedStr)
     : Account(fromCache(
-          Account::AcctStringType::base58Seed,
+          Account::AcctStringType::Base58Seed,
           std::move(base58SeedStr),
-          KeyType::secp256k1))
+          KeyType::Secp256k1))
 {
 }
 
 Account::Account(std::string name, AccountID const& id)
-    : Account(name, randomKeyPair(KeyType::secp256k1), privateCtorTag{})
+    : Account(name, randomKeyPair(KeyType::Secp256k1), PrivateCtorTag{})
 {
     // override the randomly generated values
     id_ = id;
@@ -91,7 +91,7 @@ Account::Account(std::string name, AccountID const& id)
 IOU
 Account::operator[](std::string const& s) const
 {
-    auto const currency = to_currency(s);
+    auto const currency = toCurrency(s);
     assert(currency != noCurrency());
     return IOU(*this, currency);
 }
diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index f03e26b567..cc3db4f1e1 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -70,7 +70,7 @@ namespace xrpl::test::jtx {
 //------------------------------------------------------------------------------
 
 Env::AppBundle::AppBundle(
-    beast::unit_test::suite& suite,
+    beast::unit_test::Suite& suite,
     std::unique_ptr<Config> config,
     std::unique_ptr<Logs> logs,
     beast::severities::Severity thresh)
@@ -79,20 +79,20 @@ Env::AppBundle::AppBundle(
     using namespace beast::severities;
     if (logs)
     {
-        setDebugLogSink(logs->makeSink("Debug", kFatal));
+        setDebugLogSink(logs->makeSink("Debug", KFatal));
     }
     else
     {
         logs = std::make_unique<SuiteLogs>(suite);
         // Use kFatal threshold to reduce noise from STObject.
-        setDebugLogSink(std::make_unique<SuiteJournalSink>("Debug", kFatal, suite));
+        setDebugLogSink(std::make_unique<SuiteJournalSink>("Debug", KFatal, suite));
     }
-    auto timeKeeper_ = std::make_unique<ManualTimeKeeper>();
-    timeKeeper = timeKeeper_.get();
+    auto tk = std::make_unique<ManualTimeKeeper>();
+    timeKeeper = tk.get();
     // Hack so we don't have to call Config::setup
     HTTPClient::initializeSSLContext(
         config->SSL_VERIFY_DIR, config->SSL_VERIFY_FILE, config->SSL_VERIFY, debugLog());
-    owned = make_Application(std::move(config), std::move(logs), std::move(timeKeeper_));
+    owned = makeApplication(std::move(config), std::move(logs), std::move(tk));
     app = owned.get();
     app->getLogs().threshold(thresh);
     if (!app->setup({}))
@@ -301,26 +301,26 @@ 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::autofill),
-            fee(jtx::autofill),
-            sig(jtx::autofill));
+            jtx::Seq(jtx::kAUTOFILL),
+            Fee(jtx::kAUTOFILL),
+            Sig(jtx::kAUTOFILL));
         apply(
             fset(account, asfDefaultRipple),
-            jtx::seq(jtx::autofill),
-            fee(jtx::autofill),
-            sig(jtx::autofill));
-        require(flags(account, asfDefaultRipple));
+            jtx::Seq(jtx::kAUTOFILL),
+            Fee(jtx::kAUTOFILL),
+            Sig(jtx::kAUTOFILL));
+        require(Flags(account, asfDefaultRipple));
     }
     else
     {
         apply(
             pay(master, account, amount),
-            jtx::seq(jtx::autofill),
-            fee(jtx::autofill),
-            sig(jtx::autofill));
-        require(nflags(account, asfDefaultRipple));
+            jtx::Seq(jtx::kAUTOFILL),
+            Fee(jtx::kAUTOFILL),
+            Sig(jtx::kAUTOFILL));
+        require(Nflags(account, asfDefaultRipple));
     }
-    require(jtx::balance(account, amount));
+    require(jtx::Balance(account, amount));
 }
 
 void
@@ -331,21 +331,21 @@ Env::trust(STAmount const& amount, Account const& account)
     auto const start = balance(account);
     apply(
         jtx::trust(account, amount),
-        jtx::seq(jtx::autofill),
-        fee(jtx::autofill),
-        sig(jtx::autofill));
+        jtx::Seq(jtx::kAUTOFILL),
+        Fee(jtx::kAUTOFILL),
+        Sig(jtx::kAUTOFILL));
     apply(
         pay(master, account, drops(current()->fees().base)),
-        jtx::seq(jtx::autofill),
-        fee(jtx::autofill),
-        sig(jtx::autofill));
+        jtx::Seq(jtx::kAUTOFILL),
+        Fee(jtx::kAUTOFILL),
+        Sig(jtx::kAUTOFILL));
     test.expect(balance(account) == start);
 }
 
 Env::ParsedResult
-Env::parseResult(Json::Value const& jr)
+Env::parseResult(json::Value const& jr)
 {
-    auto error = [](ParsedResult& parsed, Json::Value const& object) {
+    auto error = [](ParsedResult& parsed, json::Value const& object) {
         // Use an error code that is not used anywhere in the transaction
         // engine to distinguish this case.
         parsed.ter = telENV_RPC_FAILED;
@@ -353,7 +353,7 @@ Env::parseResult(Json::Value const& jr)
         if (!object.isObject())
             return;
         if (object.isMember(jss::error_code))
-            parsed.rpcCode = safe_cast<error_code_i>(object[jss::error_code].asInt());
+            parsed.rpcCode = safeCast<ErrorCodeI>(object[jss::error_code].asInt());
         if (object.isMember(jss::error_message))
             parsed.rpcMessage = object[jss::error_message].asString();
         if (object.isMember(jss::error))
@@ -368,7 +368,7 @@ Env::parseResult(Json::Value const& jr)
         if (result.isMember(jss::engine_result_code))
         {
             parsed.ter = TER::fromInt(result[jss::engine_result_code].asInt());
-            parsed.rpcCode.emplace(rpcSUCCESS);
+            parsed.rpcCode.emplace(RpcSuccess);
         }
         else
         {
@@ -406,18 +406,18 @@ Env::submit(JTx const& jt, std::source_location const& loc)
         // otherwise missing the stx field.
         parsedResult.ter = ter_ = temMALFORMED;
 
-        return Json::Value();
+        return json::Value();
     }();
     postconditions(jt, parsedResult, jr, loc);
 }
 
 void
-Env::sign_and_submit(JTx const& jt, Json::Value params, std::source_location const& loc)
+Env::signAndSubmit(JTx const& jt, json::Value params, std::source_location const& loc)
 {
     auto const account = lookup(jt.jv[jss::Account].asString());
     auto const& passphrase = account.name();
 
-    Json::Value jr;
+    json::Value jr;
     if (params.isNull())
     {
         // Use the command line interface
@@ -453,7 +453,7 @@ void
 Env::postconditions(
     JTx const& jt,
     ParsedResult const& parsed,
-    Json::Value const& jr,
+    json::Value const& jr,
     std::source_location const& loc)
 {
     auto const locStr = std::string("(") + loc.file_name() + ":" + to_string(loc.line()) + ")";
@@ -466,15 +466,15 @@ Env::postconditions(
                  transHuman(*parsed.ter) + "); Expected " + transToken(*jt.ter) + " (" +
                  transHuman(*jt.ter) + ")"));
     using namespace std::string_literals;
-    bad = (jt.rpcCode &&
-           !test.expect(
-               parsed.rpcCode == jt.rpcCode->first && parsed.rpcMessage == jt.rpcCode->second,
-               "apply " + locStr + ": Got RPC result "s +
-                   (parsed.rpcCode ? RPC::get_error_info(*parsed.rpcCode).token.c_str()
-                                   : "NO RESULT") +
-                   " (" + parsed.rpcMessage + "); Expected " +
-                   RPC::get_error_info(jt.rpcCode->first).token.c_str() + " (" +
-                   jt.rpcCode->second + ")")) ||
+    bad =
+        (jt.rpcCode &&
+         !test.expect(
+             parsed.rpcCode == jt.rpcCode->first && parsed.rpcMessage == jt.rpcCode->second,
+             "apply " + locStr + ": Got RPC result "s +
+                 (parsed.rpcCode ? RPC::getErrorInfo(*parsed.rpcCode).token.cStr() : "NO RESULT") +
+                 " (" + parsed.rpcMessage + "); Expected " +
+                 RPC::getErrorInfo(jt.rpcCode->first).token.cStr() + " (" + jt.rpcCode->second +
+                 ")")) ||
         bad;
     // If we have an rpcCode (just checked), then the rpcException check is
     // optional - the 'error' field may not be defined, but if it is, it must
@@ -536,11 +536,11 @@ Env::tx() const
 }
 
 void
-Env::autofill_sig(JTx& jt)
+Env::autofillSig(JTx& jt)
 {
     auto& jv = jt.jv;
 
-    scope_success const success([&]() {
+    ScopeSuccess const success([&]() {
         // Call all the post-signers after the main signers or autofill are done
         for (auto const& signer : jt.postSigners)
             signer(*this, jt);
@@ -555,7 +555,7 @@ Env::autofill_sig(JTx& jt)
     }
 
     // If the sig is still needed, get it here.
-    if (!jt.fill_sig)
+    if (!jt.fillSig)
         return;
     auto const account = jv.isMember(sfDelegate.jsonName)
         ? lookup(jv[sfDelegate.jsonName].asString())
@@ -582,12 +582,12 @@ void
 Env::autofill(JTx& jt)
 {
     auto& jv = jt.jv;
-    if (jt.fill_fee)
-        jtx::fill_fee(jv, *current());
-    if (jt.fill_seq)
-        jtx::fill_seq(jv, *current());
+    if (jt.fillFee)
+        jtx::fillFee(jv, *current());
+    if (jt.fillSeq)
+        jtx::fillSeq(jv, *current());
 
-    if (jt.fill_netid)
+    if (jt.fillNetid)
     {
         uint32_t const networkID = app().getNetworkIDService().getNetworkID();
         if (!jv.isMember(jss::NetworkID) && networkID > 1024)
@@ -597,13 +597,13 @@ Env::autofill(JTx& jt)
     // Must come last
     try
     {
-        autofill_sig(jt);
+        autofillSig(jt);
     }
-    catch (parse_error const&)
+    catch (ParseError const&)
     {
         if (!parseFailureExpected_)
             test.log << "parse failed:\n" << pretty(jv) << std::endl;
-        Rethrow();
+        rethrow();
     }
 }
 
@@ -617,10 +617,10 @@ Env::st(JTx const& jt)
     {
         obj = jtx::parse(jt.jv);
     }
-    catch (jtx::parse_error const&)
+    catch (jtx::ParseError const&)
     {
-        test.log << "Exception: parse_error\n" << pretty(jt.jv) << std::endl;
-        Rethrow();
+        test.log << "Exception: ParseError\n" << pretty(jt.jv) << std::endl;
+        rethrow();
     }
 
     try
@@ -643,10 +643,10 @@ Env::ust(JTx const& jt)
     {
         obj = jtx::parse(jt.jv);
     }
-    catch (jtx::parse_error const&)
+    catch (jtx::ParseError const&)
     {
-        test.log << "Exception: parse_error\n" << pretty(jt.jv) << std::endl;
-        Rethrow();
+        test.log << "Exception: ParseError\n" << pretty(jt.jv) << std::endl;
+        rethrow();
     }
 
     try
@@ -659,17 +659,17 @@ Env::ust(JTx const& jt)
     }
 }
 
-Json::Value
-Env::do_rpc(
+json::Value
+Env::doRpc(
     unsigned apiVersion,
     std::vector<std::string> const& args,
     std::unordered_map<std::string, std::string> const& headers)
 {
     auto response = rpcClient(args, app().config(), app().getLogs(), apiVersion, headers);
 
-    for (unsigned ctr = 0; (ctr < retries_) and (response.first == rpcINTERNAL); ++ctr)
+    for (unsigned ctr = 0; (ctr < retries_) and (response.first == RpcInternal); ++ctr)
     {
-        JLOG(journal.error()) << "Env::do_rpc error, retrying, attempt #" << ctr + 1 << " ...";
+        JLOG(journal.error()) << "Env::doRpc error, retrying, attempt #" << ctr + 1 << " ...";
         std::this_thread::sleep_for(std::chrono::milliseconds(500));
 
         response = rpcClient(args, app().config(), app().getLogs(), apiVersion, headers);
diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp
index 5b00836089..01b8b5863a 100644
--- a/src/test/jtx/impl/JSONRPCClient.cpp
+++ b/src/test/jtx/impl/JSONRPCClient.cpp
@@ -40,13 +40,13 @@ class JSONRPCClient : public AbstractClient
     {
         auto& log = std::cerr;
         ParsedPort common;
-        parse_Port(common, cfg["server"], log);
+        parsePort(common, cfg["server"], log);
         for (auto const& name : cfg.section("server").values())
         {
             if (!cfg.exists(name))
                 continue;
             ParsedPort pp;
-            parse_Port(pp, cfg[name], log);
+            parsePort(pp, cfg[name], log);
             if (not pp.protocol.contains("http"))
                 continue;
             using namespace boost::asio::ip;
@@ -67,7 +67,7 @@ class JSONRPCClient : public AbstractClient
 
     template <class ConstBufferSequence>
     static std::string
-    buffer_string(ConstBufferSequence const& b)
+    bufferString(ConstBufferSequence const& b)
     {
         using namespace boost::asio;
         std::string s;
@@ -84,8 +84,8 @@ class JSONRPCClient : public AbstractClient
     unsigned rpc_version_;
 
 public:
-    explicit JSONRPCClient(Config const& cfg, unsigned rpc_version)
-        : ep_(getEndpoint(cfg)), stream_(ios_), rpc_version_(rpc_version)
+    explicit JSONRPCClient(Config const& cfg, unsigned rpcVersion)
+        : ep_(getEndpoint(cfg)), stream_(ios_), rpc_version_(rpcVersion)
     {
         stream_.connect(ep_);
     }
@@ -96,8 +96,8 @@ public:
             error
             result
     */
-    Json::Value
-    invoke(std::string const& cmd, Json::Value const& params) override
+    json::Value
+    invoke(std::string const& cmd, json::Value const& params) override
     {
         using namespace boost::beast::http;
         using namespace boost::asio;
@@ -114,7 +114,7 @@ public:
             req.insert("Host", ostr.str());
         }
         {
-            Json::Value jr;
+            json::Value jr;
             jr[jss::method] = cmd;
             if (rpc_version_ == 2)
             {
@@ -124,7 +124,7 @@ public:
             }
             if (params)
             {
-                Json::Value& ja = jr[jss::params] = Json::arrayValue;
+                json::Value& ja = jr[jss::params] = json::ArrayValue;
                 ja.append(params);
             }
             req.body() = to_string(jr);
@@ -135,9 +135,9 @@ public:
         response<dynamic_body> res;
         read(stream_, bin_, res);
 
-        Json::Reader jr;
-        Json::Value jv;
-        jr.parse(buffer_string(res.body().data()), jv);
+        json::Reader jr;
+        json::Value jv;
+        jr.parse(bufferString(res.body().data()), jv);
         if (jv["result"].isMember("error"))
             jv["error"] = jv["result"]["error"];
         if (jv["result"].isMember("status"))
@@ -153,9 +153,9 @@ public:
 };
 
 std::unique_ptr<AbstractClient>
-makeJSONRPCClient(Config const& cfg, unsigned rpc_version)
+makeJSONRPCClient(Config const& cfg, unsigned rpcVersion)
 {
-    return std::make_unique<JSONRPCClient>(cfg, rpc_version);
+    return std::make_unique<JSONRPCClient>(cfg, rpcVersion);
 }
 
 }  // namespace xrpl::test
diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp
index d9cace5624..051e1f4470 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 + testStartTime - epoch_offset);
+        env_.close(now + kTEST_START_TIME - kEPOCH_OFFSET);
     if (arg.owner)
         owner_ = *arg.owner;
     if (arg.documentID && validDocumentID(*arg.documentID))
@@ -51,7 +51,7 @@ Oracle::Oracle(Env& env, CreateArg const& arg, bool submit) : env_(env)
 void
 Oracle::remove(RemoveArg const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::OracleDelete;
     jv[jss::Account] = to_string(arg.owner.value_or(owner_));
     toJson(jv[jss::OracleDocumentID], arg.documentID.value_or(documentID_));
@@ -74,10 +74,10 @@ Oracle::remove(RemoveArg const& arg)
 
 void
 Oracle::submit(
-    Json::Value const& jv,
-    std::optional<jtx::msig> const& msig,
-    std::optional<jtx::seq> const& seq,
-    std::optional<ter> const& err)
+    json::Value const& jv,
+    std::optional<jtx::Msig> const& msig,
+    std::optional<jtx::Seq> const& seq,
+    std::optional<Ter> const& err)
 {
     if (msig)
     {
@@ -157,7 +157,7 @@ Oracle::expectLastUpdateTime(std::uint32_t lastUpdateTime) const
     return sle && (*sle)[sfLastUpdateTime] == lastUpdateTime;
 }
 
-Json::Value
+json::Value
 Oracle::aggregatePrice(
     Env& env,
     std::optional<AnyValue> const& baseAsset,
@@ -166,13 +166,13 @@ Oracle::aggregatePrice(
     std::optional<AnyValue> const& trim,
     std::optional<AnyValue> const& timeThreshold)
 {
-    Json::Value jv;
-    Json::Value jvOracles(Json::arrayValue);
+    json::Value jv;
+    json::Value jvOracles(json::ArrayValue);
     if (oracles)
     {
         for (auto const& id : *oracles)
         {
-            Json::Value oracle;
+            json::Value oracle;
             if (id.first)
                 oracle[jss::account] = to_string((*id.first).id());
             if (id.second)
@@ -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(NonePattern), UnquotedNone);
+    str = boost::regex_replace(str, boost::regex(kNONE_PATTERN), kUNQUOTED_NONE);
     auto jr = env.rpc("json", "get_aggregate_price", str);
 
     if (jr.isObject())
@@ -205,14 +205,14 @@ Oracle::aggregatePrice(
             return jr;
         }
     }
-    return Json::nullValue;
+    return json::NullValue;
 }
 
 void
 Oracle::set(UpdateArg const& arg)
 {
     using namespace std::chrono;
-    Json::Value jv;
+    json::Value jv;
     if (arg.owner)
         owner_ = *arg.owner;
     if (arg.documentID && std::holds_alternative<std::uint32_t>(*arg.documentID))
@@ -256,7 +256,7 @@ Oracle::set(UpdateArg const& arg)
         if (std::holds_alternative<std::uint32_t>(*arg.lastUpdateTime))
         {
             jv[jss::LastUpdateTime] =
-                to_string(testStartTime.count() + std::get<std::uint32_t>(*arg.lastUpdateTime));
+                to_string(kTEST_START_TIME.count() + std::get<std::uint32_t>(*arg.lastUpdateTime));
         }
         else
         {
@@ -267,9 +267,9 @@ Oracle::set(UpdateArg const& arg)
     {
         jv[jss::LastUpdateTime] = to_string(
             duration_cast<seconds>(env_.current()->header().closeTime.time_since_epoch()).count() +
-            epoch_offset.count());
+            kEPOCH_OFFSET.count());
     }
-    Json::Value dataSeries(Json::arrayValue);
+    json::Value dataSeries(json::ArrayValue);
     auto assetToStr = [](std::string const& s) {
         // assume standard currency
         if (s.size() == 3)
@@ -280,8 +280,8 @@ Oracle::set(UpdateArg const& arg)
     };
     for (auto const& data : arg.series)
     {
-        Json::Value priceData;
-        Json::Value price;
+        json::Value priceData;
+        json::Value price;
         price[jss::BaseAsset] = assetToStr(std::get<0>(data));
         price[jss::QuoteAsset] = assetToStr(std::get<1>(data));
         if (std::get<2>(data))
@@ -316,14 +316,14 @@ Oracle::set(CreateArg const& arg)
         .err = arg.err});
 }
 
-Json::Value
+json::Value
 Oracle::ledgerEntry(
     Env& env,
     std::optional<std::variant<AccountID, std::string>> const& account,
     std::optional<AnyValue> const& documentID,
     std::optional<std::string> const& index)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     if (account)
     {
         if (std::holds_alternative<AccountID>(*account))
@@ -351,7 +351,7 @@ Oracle::ledgerEntry(
     }
     // Convert "%None%" to None
     auto str = to_string(jvParams);
-    str = boost::regex_replace(str, boost::regex(NonePattern), UnquotedNone);
+    str = boost::regex_replace(str, boost::regex(kNONE_PATTERN), kUNQUOTED_NONE);
     auto jr = env.rpc("json", "ledger_entry", str);
 
     if (jr.isObject())
@@ -361,17 +361,17 @@ Oracle::ledgerEntry(
         if (jr.isMember(jss::result) && jr[jss::result].isMember(jss::status))
             return jr[jss::result];
     }
-    return Json::nullValue;
+    return json::NullValue;
 }
 
 void
-toJson(Json::Value& jv, AnyValue const& v)
+toJson(json::Value& jv, AnyValue const& v)
 {
     std::visit([&](auto&& arg) { jv = arg; }, v);
 }
 
 void
-toJsonHex(Json::Value& jv, AnyValue const& v)
+toJsonHex(json::Value& jv, AnyValue const& v)
 {
     std::visit(
         [&]<typename T>(T&& arg) {
@@ -397,7 +397,7 @@ toJsonHex(Json::Value& jv, AnyValue const& v)
 std::uint32_t
 asUInt(AnyValue const& v)
 {
-    Json::Value jv;
+    json::Value jv;
     toJson(jv, v);
     return jv.asUInt();
 }
@@ -407,7 +407,7 @@ validDocumentID(AnyValue const& v)
 {
     try
     {
-        Json::Value jv;
+        json::Value jv;
         toJson(jv, v);
         [[maybe_unused]] auto unused1 = jv.asUInt();
         [[maybe_unused]] auto unused2 = jv.isNumeric();
diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp
index f585e7b28f..6be3220220 100644
--- a/src/test/jtx/impl/TestHelpers.cpp
+++ b/src/test/jtx/impl/TestHelpers.cpp
@@ -36,6 +36,7 @@
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/LedgerFormats.h>
 #include <xrpl/protocol/MPTIssue.h>
+#include <xrpl/protocol/PathAsset.h>
 #include <xrpl/protocol/PublicKey.h>
 #include <xrpl/protocol/Quality.h>
 #include <xrpl/protocol/SField.h>
@@ -65,24 +66,24 @@
 namespace xrpl::test::jtx {
 
 // Functions used in debugging
-Json::Value
+json::Value
 getAccountOffers(Env& env, AccountID const& acct, bool current)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::account] = to_string(acct);
     return env.rpc("json", "account_offers", to_string(jv))[jss::result];
 }
 
-Json::Value
+json::Value
 getAccountLines(Env& env, AccountID const& acctId)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::account] = to_string(acctId);
     return env.rpc("json", "account_lines", to_string(jv))[jss::result];
 }
 
 bool
-checkArraySize(Json::Value const& val, unsigned int size)
+checkArraySize(json::Value const& val, unsigned int size)
 {
     return val.isArray() && val.size() == size;
 }
@@ -96,15 +97,15 @@ ownerCount(Env const& env, Account const& account)
 /* Path finding */
 /******************************************************************************/
 void
-stpath_append_one(STPath& st, Account const& account)
+stpathAppendOne(STPath& st, Account const& account)
 {
-    st.push_back(STPathElement({account.id(), std::nullopt, std::nullopt}));
+    st.pushBack(STPathElement({account.id(), std::nullopt, std::nullopt}));
 }
 
 void
-stpath_append_one(STPath& st, STPathElement const& pe)
+stpathAppendOne(STPath& st, STPathElement const& pe)
 {
-    st.push_back(pe);
+    st.pushBack(pe);
 }
 
 bool
@@ -113,29 +114,9 @@ equal(STAmount const& sa1, STAmount const& sa2)
     return sa1 == sa2 && sa1.getIssuer() == sa2.getIssuer();
 }
 
-// Issue path element
-STPathElement
-IPE(Issue const& iss)
-{
-    return STPathElement(
-        STPathElement::typeCurrency | STPathElement::typeIssuer,
-        xrpAccount(),
-        PathAsset{iss.currency},
-        iss.account);
-}
-STPathElement
-IPE(MPTIssue const& iss)
-{
-    return STPathElement(
-        STPathElement::typeMPT | STPathElement::typeIssuer,
-        xrpAccount(),
-        PathAsset{iss.getMptID()},
-        iss.getIssuer());
-}
-
 static void
 addSourceAsset(
-    Json::Value& jv,
+    json::Value& jv,
     PathAsset const& srcAsset,
     std::optional<AccountID> const& srcIssuer)
 {
@@ -157,7 +138,7 @@ addSourceAsset(
         srcAsset.value());
 }
 
-Json::Value
+json::Value
 rpf(jtx::Account const& src,
     jtx::Account const& dst,
     STAmount const& dstAmount,
@@ -165,17 +146,17 @@ rpf(jtx::Account const& src,
     std::optional<PathAsset> const& srcAsset,
     std::optional<AccountID> const& srcIssuer)
 {
-    Json::Value jv = Json::objectValue;
+    json::Value jv = json::ObjectValue;
     jv[jss::command] = "ripple_path_find";
     jv[jss::source_account] = toBase58(src);
     jv[jss::destination_account] = toBase58(dst);
-    jv[jss::destination_amount] = dstAmount.getJson(JsonOptions::none);
+    jv[jss::destination_amount] = dstAmount.getJson(JsonOptions::KNone);
     if (sendMax)
-        jv[jss::send_max] = sendMax->getJson(JsonOptions::none);
+        jv[jss::send_max] = sendMax->getJson(JsonOptions::KNone);
     if (srcAsset)
     {
-        auto& sc = jv[jss::source_currencies] = Json::arrayValue;
-        Json::Value j = Json::objectValue;
+        auto& sc = jv[jss::source_currencies] = json::ArrayValue;
+        json::Value j = json::ObjectValue;
         addSourceAsset(j, *srcAsset, srcIssuer);
         sc.append(j);
     }
@@ -184,7 +165,7 @@ rpf(jtx::Account const& src,
 }
 
 jtx::Env
-pathTestEnv(beast::unit_test::suite& suite)
+pathTestEnv(beast::unit_test::Suite& suite)
 {
     // These tests were originally written with search parameters that are
     // different from the current defaults. This function creates an env
@@ -198,8 +179,8 @@ pathTestEnv(beast::unit_test::suite& suite)
                }));
 }
 
-Json::Value
-find_paths_request(
+json::Value
+findPathsRequest(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -212,7 +193,7 @@ find_paths_request(
     using namespace jtx;
 
     auto& app = env.app();
-    Resource::Charge loadType = Resource::feeReferenceRPC;
+    Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
     Resource::Consumer c;
 
     RPC::JsonContext context{
@@ -225,22 +206,22 @@ find_paths_request(
          .role = Role::USER,
          .coro = {},
          .infoSub = {},
-         .apiVersion = RPC::apiVersionIfUnspecified},
+         .apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED},
         {},
         {}};
 
-    Json::Value params = Json::objectValue;
+    json::Value params = json::ObjectValue;
     params[jss::command] = "ripple_path_find";
     params[jss::source_account] = toBase58(src);
     params[jss::destination_account] = toBase58(dst);
-    params[jss::destination_amount] = saDstAmount.getJson(JsonOptions::none);
+    params[jss::destination_amount] = saDstAmount.getJson(JsonOptions::KNone);
     if (saSendMax)
-        params[jss::send_max] = saSendMax->getJson(JsonOptions::none);
+        params[jss::send_max] = saSendMax->getJson(JsonOptions::KNone);
 
     if (srcAsset)
     {
-        auto& sc = params[jss::source_currencies] = Json::arrayValue;
-        Json::Value j = Json::objectValue;
+        auto& sc = params[jss::source_currencies] = json::ArrayValue;
+        json::Value j = json::ObjectValue;
         addSourceAsset(j, *srcAsset, srcIssuer);
         sc.append(j);
     }
@@ -248,9 +229,9 @@ find_paths_request(
     if (domain)
         params[jss::domain] = to_string(*domain);
 
-    Json::Value result;
-    gate g;
-    app.getJobQueue().postCoro(jtCLIENT, "RPC-Client", [&](auto const& coro) {
+    json::Value result;
+    Gate g;
+    app.getJobQueue().postCoro(JtClient, "RPC-Client", [&](auto const& coro) {
         context.params = std::move(params);
         context.coro = coro;
         RPC::doCommand(context, result);
@@ -259,12 +240,12 @@ find_paths_request(
 
     using namespace std::chrono_literals;
     using namespace beast::unit_test;
-    g.wait_for(5s);
+    g.waitFor(5s);
     return result;
 }
 
 std::tuple<STPathSet, STAmount, STAmount>
-find_paths(
+findPaths(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -274,14 +255,14 @@ find_paths(
     std::optional<AccountID> const& srcIssuer,
     std::optional<uint256> const& domain)
 {
-    Json::Value result =
-        find_paths_request(env, src, dst, saDstAmount, saSendMax, srcAsset, srcIssuer, domain);
+    json::Value result =
+        findPathsRequest(env, src, dst, saDstAmount, saSendMax, srcAsset, srcIssuer, domain);
     if (result.isMember(jss::error))
         return std::make_tuple(STPathSet{}, STAmount{}, STAmount{});
 
     STAmount da;
     if (result.isMember(jss::destination_amount))
-        da = amountFromJson(sfGeneric, result[jss::destination_amount]);
+        da = amountFromJson(kSF_GENERIC, result[jss::destination_amount]);
 
     STAmount sa;
     STPathSet paths;
@@ -293,14 +274,14 @@ find_paths(
             auto const& path = alts[0u];
 
             if (path.isMember(jss::source_amount))
-                sa = amountFromJson(sfGeneric, path[jss::source_amount]);
+                sa = amountFromJson(kSF_GENERIC, path[jss::source_amount]);
 
             if (path.isMember(jss::destination_amount))
-                da = amountFromJson(sfGeneric, path[jss::destination_amount]);
+                da = amountFromJson(kSF_GENERIC, path[jss::destination_amount]);
 
             if (path.isMember(jss::paths_computed))
             {
-                Json::Value p;
+                json::Value p;
                 p["Paths"] = path[jss::paths_computed];
                 STParsedJSONObject po("generic", p);
                 if (po.object)
@@ -313,7 +294,7 @@ find_paths(
 }
 
 std::tuple<STPathSet, STAmount, STAmount>
-find_paths_by_element(
+findPathsByElement(
     jtx::Env& env,
     jtx::Account const& src,
     jtx::Account const& dst,
@@ -325,9 +306,9 @@ find_paths_by_element(
 {
     // srcElement is optional but is expected to always be present
     XRPL_ASSERT(
-        srcElement.has_value(), "xrpl::test::jtx::find_paths_by_element::srcElement : nullptr");
+        srcElement.has_value(), "xrpl::test::jtx::findPathsByElement::srcElement : nullptr");
 
-    return find_paths(
+    return findPaths(
         env,
         src,
         dst,
@@ -342,7 +323,7 @@ find_paths_by_element(
 /******************************************************************************/
 
 XRPAmount
-txfee(Env const& env, std::uint16_t n)
+txFee(Env const& env, std::uint16_t n)
 {
     return env.current()->fees().base * n;
 }
@@ -351,7 +332,7 @@ PrettyAmount
 xrpMinusFee(Env const& env, std::int64_t xrpAmount)
 {
     auto feeDrops = env.current()->fees().base;
-    return drops(dropsPerXRP * xrpAmount - feeDrops);
+    return drops(kJTX_DROPS_PER_XRP * xrpAmount - feeDrops);
 };
 
 [[nodiscard]] bool
@@ -438,60 +419,56 @@ expectOffers(
     return size == cnt && ((toMatch.empty() && size != 0) || (matched == toMatch.size()));
 }
 
-Json::Value
+json::Value
 ledgerEntryRoot(Env& env, Account const& acct)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = "current";
     jvParams[jss::account_root] = acct.human();
     return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 }
 
-Json::Value
-ledgerEntryState(
-    Env& env,
-    Account const& acct_a,
-    Account const& acct_b,
-    std::string const& currency)
+json::Value
+ledgerEntryState(Env& env, Account const& acctA, Account const& acctB, std::string const& currency)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = "current";
     jvParams[jss::ripple_state][jss::currency] = currency;
-    jvParams[jss::ripple_state][jss::accounts] = Json::arrayValue;
-    jvParams[jss::ripple_state][jss::accounts].append(acct_a.human());
-    jvParams[jss::ripple_state][jss::accounts].append(acct_b.human());
+    jvParams[jss::ripple_state][jss::accounts] = json::ArrayValue;
+    jvParams[jss::ripple_state][jss::accounts].append(acctA.human());
+    jvParams[jss::ripple_state][jss::accounts].append(acctB.human());
     return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 }
 
-Json::Value
-ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offer_seq)
+json::Value
+ledgerEntryOffer(jtx::Env& env, jtx::Account const& acct, std::uint32_t offerSeq)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::offer][jss::account] = acct.human();
-    jvParams[jss::offer][jss::seq] = offer_seq;
+    jvParams[jss::offer][jss::seq] = offerSeq;
     return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 }
 
-Json::Value
+json::Value
 ledgerEntryMPT(jtx::Env& env, jtx::Account const& acct, MPTID const& mptID)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::mptoken][jss::account] = acct.human();
     jvParams[jss::mptoken][jss::mpt_issuance_id] = to_string(mptID);
     return env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 }
 
-Json::Value
-getBookOffers(jtx::Env& env, Asset const& taker_pays, Asset const& taker_gets)
+json::Value
+getBookOffers(jtx::Env& env, Asset const& takerPays, Asset const& takerGets)
 {
-    Json::Value jvbp;
+    json::Value jvbp;
     jvbp[jss::ledger_index] = "current";
-    taker_pays.setJson(jvbp[jss::taker_pays]);
-    taker_gets.setJson(jvbp[jss::taker_gets]);
+    takerPays.setJson(jvbp[jss::taker_pays]);
+    takerGets.setJson(jvbp[jss::taker_gets]);
     return env.rpc("json", "book_offers", to_string(jvbp))[jss::result];
 }
 
-Json::Value
+json::Value
 accountBalance(Env& env, Account const& acct)
 {
     auto const jrr = ledgerEntryRoot(env, acct);
@@ -508,7 +485,7 @@ expectLedgerEntryRoot(Env& env, Account const& acct, STAmount const& expectedVal
 /******************************************************************************/
 namespace paychan {
 
-Json::Value
+json::Value
 create(
     AccountID const& account,
     AccountID const& to,
@@ -518,11 +495,11 @@ create(
     std::optional<NetClock::time_point> const& cancelAfter,
     std::optional<std::uint32_t> const& dstTag)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::PaymentChannelCreate;
     jv[jss::Account] = to_string(account);
     jv[jss::Destination] = to_string(to);
-    jv[jss::Amount] = amount.getJson(JsonOptions::none);
+    jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
     jv[jss::SettleDelay] = settleDelay.count();
     jv[sfPublicKey.fieldName] = strHex(pk.slice());
     if (cancelAfter)
@@ -532,24 +509,24 @@ create(
     return jv;
 }
 
-Json::Value
+json::Value
 fund(
     AccountID const& account,
     uint256 const& channel,
     STAmount const& amount,
     std::optional<NetClock::time_point> const& expiration)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::PaymentChannelFund;
     jv[jss::Account] = to_string(account);
     jv[sfChannel.fieldName] = to_string(channel);
-    jv[jss::Amount] = amount.getJson(JsonOptions::none);
+    jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
     if (expiration)
         jv[sfExpiration.fieldName] = expiration->time_since_epoch().count();
     return jv;
 }
 
-Json::Value
+json::Value
 claim(
     AccountID const& account,
     uint256 const& channel,
@@ -558,14 +535,14 @@ claim(
     std::optional<Slice> const& signature,
     std::optional<PublicKey> const& pk)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::PaymentChannelClaim;
     jv[jss::Account] = to_string(account);
     jv["Channel"] = to_string(channel);
     if (amount)
-        jv[jss::Amount] = amount->getJson(JsonOptions::none);
+        jv[jss::Amount] = amount->getJson(JsonOptions::KNone);
     if (balance)
-        jv["Balance"] = balance->getJson(JsonOptions::none);
+        jv["Balance"] = balance->getJson(JsonOptions::KNone);
     if (signature)
         jv["Signature"] = strHex(*signature);
     if (pk)
@@ -602,7 +579,7 @@ channelExists(ReadView const& view, uint256 const& chan)
 /******************************************************************************/
 
 void
-n_offers(Env& env, std::size_t n, Account const& account, STAmount const& in, STAmount const& out)
+nOffers(Env& env, std::size_t n, Account const& account, STAmount const& in, STAmount const& out)
 {
     auto const ownerCount = env.le(account)->getFieldU32(sfOwnerCount);
     for (std::size_t i = 0; i < n; i++)
@@ -610,7 +587,7 @@ n_offers(Env& env, std::size_t n, Account const& account, STAmount const& in, ST
         env(offer(account, in, out));
         env.close();
     }
-    env.require(owners(account, ownerCount + n));
+    env.require(Owners(account, ownerCount + n));
 }
 
 /* Pay Strand */
@@ -622,10 +599,10 @@ cpe(PathAsset const& pa)
 {
     return pa.visit(
         [](Currency const& currency) {
-            return STPathElement(STPathElement::typeCurrency, xrpAccount(), currency, xrpAccount());
+            return STPathElement(STPathElement::TypeCurrency, xrpAccount(), currency, xrpAccount());
         },
         [](MPTID const& mpt) {
-            return STPathElement(STPathElement::typeMPT, xrpAccount(), mpt, xrpAccount());
+            return STPathElement(STPathElement::TypeMpt, xrpAccount(), mpt, xrpAccount());
         });
 };
 
@@ -642,14 +619,14 @@ ipe(Asset const& asset)
     return asset.visit(
         [](Issue const& issue) {
             return STPathElement(
-                STPathElement::typeCurrency | STPathElement::typeIssuer,
+                STPathElement::TypeCurrency | STPathElement::TypeIssuer,
                 xrpAccount(),
                 issue.currency,
                 issue.account);
         },
         [](MPTIssue const& issue) {
             return STPathElement(
-                STPathElement::typeMPT | STPathElement::typeIssuer,
+                STPathElement::TypeMpt | STPathElement::TypeIssuer,
                 xrpAccount(),
                 issue.getMptID(),
                 issue.getIssuer());
@@ -660,14 +637,14 @@ ipe(Asset const& asset)
 STPathElement
 iape(AccountID const& account)
 {
-    return STPathElement(STPathElement::typeIssuer, xrpAccount(), xrpCurrency(), account);
+    return STPathElement(STPathElement::TypeIssuer, xrpAccount(), xrpCurrency(), account);
 };
 
 // Account path element
 STPathElement
 ape(AccountID const& a)
 {
-    return STPathElement(STPathElement::typeAccount, a, xrpCurrency(), xrpAccount());
+    return STPathElement(STPathElement::TypeAccount, a, xrpCurrency(), xrpAccount());
 };
 
 bool
@@ -750,10 +727,10 @@ issueHelperMPT(IssuerArgs const& args)
 
 namespace loanBroker {
 
-Json::Value
+json::Value
 set(AccountID const& account, uint256 const& vaultId, uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanBrokerSet;
     jv[sfAccount] = to_string(account);
     jv[sfVaultID] = to_string(vaultId);
@@ -761,10 +738,10 @@ set(AccountID const& account, uint256 const& vaultId, uint32_t flags)
     return jv;
 }
 
-Json::Value
+json::Value
 del(AccountID const& account, uint256 const& brokerID, uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanBrokerDelete;
     jv[sfAccount] = to_string(account);
     jv[sfLoanBrokerID] = to_string(brokerID);
@@ -772,42 +749,42 @@ del(AccountID const& account, uint256 const& brokerID, uint32_t flags)
     return jv;
 }
 
-Json::Value
+json::Value
 coverDeposit(
     AccountID const& account,
     uint256 const& brokerID,
     STAmount const& amount,
     uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanBrokerCoverDeposit;
     jv[sfAccount] = to_string(account);
     jv[sfLoanBrokerID] = to_string(brokerID);
-    jv[sfAmount] = amount.getJson(JsonOptions::none);
+    jv[sfAmount] = amount.getJson(JsonOptions::KNone);
     jv[sfFlags] = flags;
     return jv;
 }
 
-Json::Value
+json::Value
 coverWithdraw(
     AccountID const& account,
     uint256 const& brokerID,
     STAmount const& amount,
     uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanBrokerCoverWithdraw;
     jv[sfAccount] = to_string(account);
     jv[sfLoanBrokerID] = to_string(brokerID);
-    jv[sfAmount] = amount.getJson(JsonOptions::none);
+    jv[sfAmount] = amount.getJson(JsonOptions::KNone);
     jv[sfFlags] = flags;
     return jv;
 }
 
-Json::Value
+json::Value
 coverClawback(AccountID const& account, std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanBrokerCoverClawback;
     jv[sfAccount] = to_string(account);
     jv[sfFlags] = flags;
@@ -820,13 +797,13 @@ coverClawback(AccountID const& account, std::uint32_t flags)
 /******************************************************************************/
 namespace loan {
 
-Json::Value
+json::Value
 set(AccountID const& account,
     uint256 const& loanBrokerID,
     Number principalRequested,
     std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanSet;
     jv[sfAccount] = to_string(account);
     jv[sfLoanBrokerID] = to_string(loanBrokerID);
@@ -835,10 +812,10 @@ set(AccountID const& account,
     return jv;
 }
 
-Json::Value
+json::Value
 manage(AccountID const& account, uint256 const& loanID, std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanManage;
     jv[sfAccount] = to_string(account);
     jv[sfLoanID] = to_string(loanID);
@@ -846,10 +823,10 @@ manage(AccountID const& account, uint256 const& loanID, std::uint32_t flags)
     return jv;
 }
 
-Json::Value
+json::Value
 del(AccountID const& account, uint256 const& loanID, std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanDelete;
     jv[sfAccount] = to_string(account);
     jv[sfLoanID] = to_string(loanID);
@@ -857,10 +834,10 @@ del(AccountID const& account, uint256 const& loanID, std::uint32_t flags)
     return jv;
 }
 
-Json::Value
+json::Value
 pay(AccountID const& account, uint256 const& loanID, STAmount const& amount, std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::LoanPay;
     jv[sfAccount] = to_string(account);
     jv[sfLoanID] = to_string(loanID);
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index 72f9e25b7c..ba09647ce7 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -48,11 +48,11 @@ class WSClientImpl : public WSClient
 {
     using error_code = boost::system::error_code;
 
-    struct msg
+    struct Msg
     {
-        Json::Value jv;
+        json::Value jv;
 
-        explicit msg(Json::Value&& jv_) : jv(std::move(jv_))
+        explicit Msg(json::Value&& jv) : jv(std::move(jv))
         {
         }
     };
@@ -62,14 +62,14 @@ class WSClientImpl : public WSClient
     {
         auto& log = std::cerr;
         ParsedPort common;
-        parse_Port(common, cfg["server"], log);
+        parsePort(common, cfg["server"], log);
         auto const ps = v2 ? "ws2" : "ws";
         for (auto const& name : cfg.section("server").values())
         {
             if (!cfg.exists(name))
                 continue;
             ParsedPort pp;
-            parse_Port(pp, cfg[name], log);
+            parsePort(pp, cfg[name], log);
             if (pp.protocol.count(ps) == 0)
                 continue;
             using namespace boost::asio::ip;
@@ -90,7 +90,7 @@ class WSClientImpl : public WSClient
 
     template <class ConstBuffers>
     static std::string
-    buffer_string(ConstBuffers const& b)
+    bufferString(ConstBuffers const& b)
     {
         using boost::asio::buffer;
         using boost::asio::buffer_size;
@@ -118,7 +118,7 @@ class WSClientImpl : public WSClient
     // synchronize message queue
     std::mutex m_;
     std::condition_variable cv_;
-    std::list<std::shared_ptr<msg>> msgs_;
+    std::list<std::shared_ptr<Msg>> msgs_;
 
     unsigned rpc_version_;
 
@@ -150,14 +150,14 @@ public:
     WSClientImpl(
         Config const& cfg,
         bool v2,
-        unsigned rpc_version,
+        unsigned rpcVersion,
         std::unordered_map<std::string, std::string> const& headers = {})
         : work_(std::in_place, boost::asio::make_work_guard(ios_))
         , strand_(boost::asio::make_strand(ios_))
         , thread_([&] { ios_.run(); })
         , stream_(ios_)
         , ws_(stream_)
-        , rpc_version_(rpc_version)
+        , rpc_version_(rpcVersion)
     {
         try
         {
@@ -173,12 +173,12 @@ public:
             ws_.async_read(
                 rb_,
                 boost::asio::bind_executor(
-                    strand_, std::bind(&WSClientImpl::on_read_msg, this, std::placeholders::_1)));
+                    strand_, std::bind(&WSClientImpl::onReadMsg, this, std::placeholders::_1)));
         }
         catch (std::exception&)
         {
             cleanup();
-            Rethrow();
+            rethrow();
         }
     }
 
@@ -187,14 +187,14 @@ public:
         cleanup();
     }
 
-    Json::Value
-    invoke(std::string const& cmd, Json::Value const& params) override
+    json::Value
+    invoke(std::string const& cmd, json::Value const& params) override
     {
         using boost::asio::buffer;
         using namespace std::chrono_literals;
 
         {
-            Json::Value jp;
+            json::Value jp;
             if (params)
                 jp = params;
             if (rpc_version_ == 2)
@@ -220,14 +220,14 @@ public:
         }
 
         auto jv =
-            findMsg(5s, [&](Json::Value const& jval) { return jval[jss::type] == jss::response; });
+            findMsg(5s, [&](json::Value const& jval) { return jval[jss::type] == jss::response; });
         if (jv)
         {
             // Normalize JSON output
             jv->removeMember(jss::type);
             if ((*jv).isMember(jss::status) && (*jv)[jss::status] == jss::error)
             {
-                Json::Value ret;
+                json::Value ret;
                 ret[jss::result] = *jv;
                 if ((*jv).isMember(jss::error))
                     ret[jss::error] = (*jv)[jss::error];
@@ -241,10 +241,10 @@ public:
         return {};
     }
 
-    std::optional<Json::Value>
+    std::optional<json::Value>
     getMsg(std::chrono::milliseconds const& timeout) override
     {
-        std::shared_ptr<msg> m;
+        std::shared_ptr<Msg> m;
         {
             std::unique_lock<std::mutex> lock(m_);
             if (!cv_.wait_for(lock, timeout, [&] { return !msgs_.empty(); }))
@@ -255,11 +255,11 @@ public:
         return std::move(m->jv);
     }
 
-    std::optional<Json::Value>
-    findMsg(std::chrono::milliseconds const& timeout, std::function<bool(Json::Value const&)> pred)
+    std::optional<json::Value>
+    findMsg(std::chrono::milliseconds const& timeout, std::function<bool(json::Value const&)> pred)
         override
     {
-        std::shared_ptr<msg> m;
+        std::shared_ptr<Msg> m;
         {
             std::unique_lock<std::mutex> lock(m_);
             if (!cv_.wait_for(lock, timeout, [&] {
@@ -289,7 +289,7 @@ public:
 
 private:
     void
-    on_read_msg(error_code const& ec)
+    onReadMsg(error_code const& ec)
     {
         if (ec)
         {
@@ -298,11 +298,11 @@ private:
             return;
         }
 
-        Json::Value jv;
-        Json::Reader jr;
-        jr.parse(buffer_string(rb_.data()), jv);
+        json::Value jv;
+        json::Reader jr;
+        jr.parse(bufferString(rb_.data()), jv);
         rb_.consume(rb_.size());
-        auto m = std::make_shared<msg>(std::move(jv));
+        auto m = std::make_shared<Msg>(std::move(jv));
         {
             std::scoped_lock const lock(m_);
             msgs_.push_front(m);
@@ -311,12 +311,12 @@ private:
         ws_.async_read(
             rb_,
             boost::asio::bind_executor(
-                strand_, std::bind(&WSClientImpl::on_read_msg, this, std::placeholders::_1)));
+                strand_, std::bind(&WSClientImpl::onReadMsg, this, std::placeholders::_1)));
     }
 
     // Called when the read op terminates
     void
-    on_read_done()
+    onReadDone()
     {
         std::scoped_lock const lock(m0_);
         b0_ = true;
@@ -328,10 +328,10 @@ std::unique_ptr<WSClient>
 makeWSClient(
     Config const& cfg,
     bool v2,
-    unsigned rpc_version,
+    unsigned rpcVersion,
     std::unordered_map<std::string, std::string> const& headers)
 {
-    return std::make_unique<WSClientImpl>(cfg, v2, rpc_version, headers);
+    return std::make_unique<WSClientImpl>(cfg, v2, rpcVersion, headers);
 }
 
 }  // namespace xrpl::test
diff --git a/src/test/jtx/impl/account_txn_id.cpp b/src/test/jtx/impl/account_txn_id.cpp
index a556ea8e91..17bafaadf5 100644
--- a/src/test/jtx/impl/account_txn_id.cpp
+++ b/src/test/jtx/impl/account_txn_id.cpp
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 void
-account_txn_id::operator()(Env&, JTx& jt) const
+AccountTxnId::operator()(Env&, JTx& jt) const
 {
     if (!hash_.isZero())
         jt["AccountTxnID"] = strHex(hash_);
diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp
index 433ed5ec92..55b6f2c3eb 100644
--- a/src/test/jtx/impl/acctdelete.cpp
+++ b/src/test/jtx/impl/acctdelete.cpp
@@ -13,10 +13,10 @@
 namespace xrpl::test::jtx {
 
 // Delete account.  If successful transfer remaining XRP to dest.
-Json::Value
+json::Value
 acctdelete(jtx::Account const& account, jtx::Account const& dest)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfDestination.jsonName] = dest.human();
     jv[sfTransactionType.jsonName] = jss::AccountDelete;
diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp
index 1a02e07bdf..873eab1a6a 100644
--- a/src/test/jtx/impl/amount.cpp
+++ b/src/test/jtx/impl/amount.cpp
@@ -12,6 +12,7 @@
 #include <cstdint>
 #include <iomanip>
 #include <ios>
+#include <limits>
 #include <ostream>
 #include <sstream>
 #include <string>
@@ -26,7 +27,7 @@ operator AnyAmount() const
 
 template <typename T>
 static std::string
-to_places(T const d, std::uint8_t places)
+toPlaces(T const d, std::uint8_t places)
 {
     assert(places <= std::numeric_limits<T>::digits10);
 
@@ -49,7 +50,7 @@ operator<<(std::ostream& os, PrettyAmount const& amount)
             if (issue.native())
             {
                 // measure in hundredths
-                auto const c = dropsPerXRP.drops() / 100;
+                auto const c = kJTX_DROPS_PER_XRP.drops() / 100;
                 auto const n = amount.value().mantissa();
                 if (n < c)
                 {
@@ -64,13 +65,13 @@ operator<<(std::ostream& os, PrettyAmount const& amount)
                 }
                 else
                 {
-                    auto const d = double(n) / dropsPerXRP.drops();
+                    auto const d = double(n) / kJTX_DROPS_PER_XRP.drops();
                     if (amount.value().negative())
                     {
                         os << "-";
                     }
 
-                    os << to_places(d, 6) << " XRP";
+                    os << toPlaces(d, 6) << " XRP";
                 }
             }
             else
@@ -88,18 +89,18 @@ operator<<(std::ostream& os, PrettyAmount const& amount)
 
 //------------------------------------------------------------------------------
 
-XRP_t const XRP{};
+XrpT const XRP{};
 
 PrettyAmount
-IOU::operator()(epsilon_t) const
+IOU::operator()(EpsilonT) const
 {
     return {STAmount(issue(), 1, -81), account.name()};
 }
 
 PrettyAmount
-IOU::operator()(xrpl::detail::epsilon_multiple m) const
+IOU::operator()(xrpl::detail::EpsilonMultiple m) const
 {
-    return {STAmount(issue(), safe_cast<std::uint64_t>(m.n), -81), account.name()};
+    return {STAmount(issue(), safeCast<std::uint64_t>(m.n), -81), account.name()};
 }
 
 std::ostream&
@@ -116,6 +117,6 @@ operator<<(std::ostream& os, MPT const& mpt)
     return os;
 }
 
-any_t const any{};
+AnyT const kANY{};
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/impl/attester.cpp b/src/test/jtx/impl/attester.cpp
index 74c0ae24ed..ac946a1bf3 100644
--- a/src/test/jtx/impl/attester.cpp
+++ b/src/test/jtx/impl/attester.cpp
@@ -13,7 +13,7 @@
 namespace xrpl::test::jtx {
 
 Buffer
-sign_claim_attestation(
+signClaimAttestation(
     PublicKey const& pk,
     SecretKey const& sk,
     STXChainBridge const& bridge,
@@ -30,7 +30,7 @@ sign_claim_attestation(
 }
 
 Buffer
-sign_create_account_attestation(
+signCreateAccountAttestation(
     PublicKey const& pk,
     SecretKey const& sk,
     STXChainBridge const& bridge,
diff --git a/src/test/jtx/impl/balance.cpp b/src/test/jtx/impl/balance.cpp
index 1c7b4c0c25..1290888ab6 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 none, 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 (none)
+        if (kNONE)
         {
             TEST_EXPECT(!sle);
         }
@@ -37,7 +37,7 @@ doBalance(Env& env, AccountID const& account, bool none, STAmount const& value,
     else
     {
         auto const sle = env.le(keylet::line(account, issue));
-        if (none)
+        if (kNONE)
         {
             TEST_EXPECT(!sle);
         }
@@ -56,12 +56,12 @@ void
 doBalance(
     Env& env,
     AccountID const& account,
-    bool none,
+    bool kNONE,
     STAmount const& value,
     MPTIssue const& mptIssue)
 {
     auto const sle = env.le(keylet::mptoken(mptIssue.getMptID(), account));
-    if (none)
+    if (kNONE)
     {
         TEST_EXPECT(!sle);
     }
@@ -73,7 +73,7 @@ doBalance(
 }
 
 void
-balance::operator()(Env& env) const
+Balance::operator()(Env& env) const
 {
     std::visit(
         [&](auto const& issue) { doBalance(env, account_.id(), none_, value_, issue); },
diff --git a/src/test/jtx/impl/batch.cpp b/src/test/jtx/impl/batch.cpp
index d45f195b66..857991cfd1 100644
--- a/src/test/jtx/impl/batch.cpp
+++ b/src/test/jtx/impl/batch.cpp
@@ -38,13 +38,13 @@ calcBatchFee(test::jtx::Env const& env, uint32_t const& numSigners, uint32_t con
 }
 
 // Batch.
-Json::Value
+json::Value
 outer(jtx::Account const& account, uint32_t seq, STAmount const& fee, std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::Batch;
     jv[jss::Account] = account.human();
-    jv[jss::RawTransactions] = Json::Value{Json::arrayValue};
+    jv[jss::RawTransactions] = json::Value{json::ArrayValue};
     jv[jss::Sequence] = seq;
     jv[jss::Flags] = flags;
     jv[jss::Fee] = to_string(fee);
@@ -52,18 +52,18 @@ outer(jtx::Account const& account, uint32_t seq, STAmount const& fee, std::uint3
 }
 
 void
-inner::operator()(Env& env, JTx& jt) const
+Inner::operator()(Env& env, JTx& jt) const
 {
     auto const index = jt.jv[jss::RawTransactions].size();
-    Json::Value& batchTransaction = jt.jv[jss::RawTransactions][index];
+    json::Value& batchTransaction = jt.jv[jss::RawTransactions][index];
 
     // Initialize the batch transaction
-    batchTransaction = Json::Value{};
+    batchTransaction = json::Value{};
     batchTransaction[jss::RawTransaction] = txn_;
 }
 
 void
-sig::operator()(Env& env, JTx& jt) const
+Sig::operator()(Env& env, JTx& jt) const
 {
     auto const mySigners = signers;
     std::optional<STObject> st;
@@ -73,10 +73,10 @@ sig::operator()(Env& env, JTx& jt) const
         jt.jv[jss::SigningPubKey] = "";
         st = parse(jt.jv);
     }
-    catch (parse_error const&)
+    catch (ParseError const&)
     {
         env.test.log << pretty(jt.jv) << std::endl;
-        Rethrow();
+        rethrow();
     }
     STTx const& stx = STTx{std::move(*st)};
     auto& js = jt[sfBatchSigners.getJsonName()];
@@ -96,7 +96,7 @@ sig::operator()(Env& env, JTx& jt) const
 }
 
 void
-msig::operator()(Env& env, JTx& jt) const
+Msig::operator()(Env& env, JTx& jt) const
 {
     auto const mySigners = signers;
     std::optional<STObject> st;
@@ -106,10 +106,10 @@ msig::operator()(Env& env, JTx& jt) const
         jt.jv[jss::SigningPubKey] = "";
         st = parse(jt.jv);
     }
-    catch (parse_error const&)
+    catch (ParseError const&)
     {
         env.test.log << pretty(jt.jv) << std::endl;
-        Rethrow();
+        rethrow();
     }
     STTx const& stx = STTx{std::move(*st)};
     auto& bs = jt[sfBatchSigners.getJsonName()];
diff --git a/src/test/jtx/impl/check.cpp b/src/test/jtx/impl/check.cpp
index d03700e2c3..ec3e4e12fc 100644
--- a/src/test/jtx/impl/check.cpp
+++ b/src/test/jtx/impl/check.cpp
@@ -11,34 +11,34 @@
 namespace xrpl::test::jtx::check {
 
 // Cash a check requiring that a specific amount be delivered.
-Json::Value
+json::Value
 cash(jtx::Account const& dest, uint256 const& checkId, STAmount const& amount)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = dest.human();
-    jv[sfAmount.jsonName] = amount.getJson(JsonOptions::none);
+    jv[sfAmount.jsonName] = amount.getJson(JsonOptions::KNone);
     jv[sfCheckID.jsonName] = to_string(checkId);
     jv[sfTransactionType.jsonName] = jss::CheckCash;
     return jv;
 }
 
 // Cash a check requiring that at least a minimum amount be delivered.
-Json::Value
+json::Value
 cash(jtx::Account const& dest, uint256 const& checkId, DeliverMin const& atLeast)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = dest.human();
-    jv[sfDeliverMin.jsonName] = atLeast.value.getJson(JsonOptions::none);
+    jv[sfDeliverMin.jsonName] = atLeast.value.getJson(JsonOptions::KNone);
     jv[sfCheckID.jsonName] = to_string(checkId);
     jv[sfTransactionType.jsonName] = jss::CheckCash;
     return jv;
 }
 
 // Cancel a check.
-Json::Value
+json::Value
 cancel(jtx::Account const& dest, uint256 const& checkId)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = dest.human();
     jv[sfCheckID.jsonName] = to_string(checkId);
     jv[sfTransactionType.jsonName] = jss::CheckCancel;
diff --git a/src/test/jtx/impl/creds.cpp b/src/test/jtx/impl/creds.cpp
index 4d38d6d88b..8c31ac9232 100644
--- a/src/test/jtx/impl/creds.cpp
+++ b/src/test/jtx/impl/creds.cpp
@@ -12,10 +12,10 @@
 
 namespace xrpl::test::jtx::credentials {
 
-Json::Value
+json::Value
 create(jtx::Account const& subject, jtx::Account const& issuer, std::string_view credType)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::CredentialCreate;
 
     jv[jss::Account] = issuer.human();
@@ -25,10 +25,10 @@ create(jtx::Account const& subject, jtx::Account const& issuer, std::string_view
     return jv;
 }
 
-Json::Value
+json::Value
 accept(jtx::Account const& subject, jtx::Account const& issuer, std::string_view credType)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::CredentialAccept;
     jv[jss::Account] = subject.human();
     jv[jss::Issuer] = issuer.human();
@@ -36,14 +36,14 @@ accept(jtx::Account const& subject, jtx::Account const& issuer, std::string_view
     return jv;
 }
 
-Json::Value
+json::Value
 deleteCred(
     jtx::Account const& acc,
     jtx::Account const& subject,
     jtx::Account const& issuer,
     std::string_view credType)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::CredentialDelete;
     jv[jss::Account] = acc.human();
     jv[jss::Subject] = subject.human();
@@ -52,14 +52,14 @@ deleteCred(
     return jv;
 }
 
-Json::Value
+json::Value
 ledgerEntry(
     jtx::Env& env,
     jtx::Account const& subject,
     jtx::Account const& issuer,
     std::string_view credType)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = jss::validated;
     jvParams[jss::credential][jss::subject] = subject.human();
     jvParams[jss::credential][jss::issuer] = issuer.human();
@@ -67,10 +67,10 @@ ledgerEntry(
     return env.rpc("json", "ledger_entry", to_string(jvParams));
 }
 
-Json::Value
+json::Value
 ledgerEntry(jtx::Env& env, std::string const& credIdx)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = jss::validated;
     jvParams[jss::credential] = credIdx;
     return env.rpc("json", "ledger_entry", to_string(jvParams));
diff --git a/src/test/jtx/impl/delegate.cpp b/src/test/jtx/impl/delegate.cpp
index e4e5e4ca96..139311cf39 100644
--- a/src/test/jtx/impl/delegate.cpp
+++ b/src/test/jtx/impl/delegate.cpp
@@ -13,21 +13,21 @@
 
 namespace xrpl::test::jtx::delegate {
 
-Json::Value
+json::Value
 set(jtx::Account const& account,
     jtx::Account const& authorize,
     std::vector<std::string> const& permissions)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::DelegateSet;
     jv[jss::Account] = account.human();
     jv[sfAuthorize.jsonName] = authorize.human();
-    Json::Value permissionsJson(Json::arrayValue);
+    json::Value permissionsJson(json::ArrayValue);
     for (auto const& permission : permissions)
     {
-        Json::Value permissionValue;
+        json::Value permissionValue;
         permissionValue[sfPermissionValue.jsonName] = permission;
-        Json::Value permissionObj;
+        json::Value permissionObj;
         permissionObj[sfPermission.jsonName] = permissionValue;
         permissionsJson.append(permissionObj);
     }
@@ -37,10 +37,10 @@ set(jtx::Account const& account,
     return jv;
 }
 
-Json::Value
+json::Value
 entry(jtx::Env& env, jtx::Account const& account, jtx::Account const& authorize)
 {
-    Json::Value jvParams;
+    json::Value jvParams;
     jvParams[jss::ledger_index] = jss::validated;
     jvParams[jss::delegate][jss::account] = account.human();
     jvParams[jss::delegate][jss::authorize] = authorize.human();
diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp
index 140f4d7c66..4d13a06ac4 100644
--- a/src/test/jtx/impl/delivermin.cpp
+++ b/src/test/jtx/impl/delivermin.cpp
@@ -8,9 +8,9 @@
 namespace xrpl::test::jtx {
 
 void
-deliver_min::operator()(Env& env, JTx& jt) const
+DeliverMin::operator()(Env& env, JTx& jt) const
 {
-    jt.jv[jss::DeliverMin] = amount_.getJson(JsonOptions::none);
+    jt.jv[jss::DeliverMin] = amount_.getJson(JsonOptions::KNone);
 }
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/impl/deposit.cpp b/src/test/jtx/impl/deposit.cpp
index 5e432b6aa8..daa35d5e20 100644
--- a/src/test/jtx/impl/deposit.cpp
+++ b/src/test/jtx/impl/deposit.cpp
@@ -12,10 +12,10 @@
 namespace xrpl::test::jtx::deposit {
 
 // Add DepositPreauth.
-Json::Value
+json::Value
 auth(jtx::Account const& account, jtx::Account const& auth)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfAuthorize.jsonName] = auth.human();
     jv[sfTransactionType.jsonName] = jss::DepositPreauth;
@@ -23,10 +23,10 @@ auth(jtx::Account const& account, jtx::Account const& auth)
 }
 
 // Remove DepositPreauth.
-Json::Value
+json::Value
 unauth(jtx::Account const& account, jtx::Account const& unauth)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfUnauthorize.jsonName] = unauth.human();
     jv[sfTransactionType.jsonName] = jss::DepositPreauth;
@@ -34,16 +34,16 @@ unauth(jtx::Account const& account, jtx::Account const& unauth)
 }
 
 // Add DepositPreauth.
-Json::Value
+json::Value
 authCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials> const& auth)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
-    jv[sfAuthorizeCredentials.jsonName] = Json::arrayValue;
+    jv[sfAuthorizeCredentials.jsonName] = json::ArrayValue;
     auto& arr(jv[sfAuthorizeCredentials.jsonName]);
     for (auto const& o : auth)
     {
-        Json::Value j2;
+        json::Value j2;
         j2[jss::Credential] = o.toJson();
         arr.append(std::move(j2));
     }
@@ -52,16 +52,16 @@ authCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials> c
 }
 
 // Remove DepositPreauth.
-Json::Value
+json::Value
 unauthCredentials(jtx::Account const& account, std::vector<AuthorizeCredentials> const& auth)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
-    jv[sfUnauthorizeCredentials.jsonName] = Json::arrayValue;
+    jv[sfUnauthorizeCredentials.jsonName] = json::ArrayValue;
     auto& arr(jv[sfUnauthorizeCredentials.jsonName]);
     for (auto const& o : auth)
     {
-        Json::Value j2;
+        json::Value j2;
         j2[jss::Credential] = o.toJson();
         arr.append(std::move(j2));
     }
diff --git a/src/test/jtx/impl/dids.cpp b/src/test/jtx/impl/dids.cpp
index 9b3a08bbfa..d82250ca34 100644
--- a/src/test/jtx/impl/dids.cpp
+++ b/src/test/jtx/impl/dids.cpp
@@ -10,29 +10,29 @@
 /** DID operations. */
 namespace xrpl::test::jtx::did {
 
-Json::Value
+json::Value
 set(jtx::Account const& account)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::DIDSet;
     jv[jss::Account] = to_string(account.id());
     return jv;
 }
 
-Json::Value
+json::Value
 setValid(jtx::Account const& account)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::DIDSet;
     jv[jss::Account] = to_string(account.id());
     jv[sfURI.jsonName] = strHex(std::string{"uri"});
     return jv;
 }
 
-Json::Value
+json::Value
 del(jtx::Account const& account)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::DIDDelete;
     jv[jss::Account] = to_string(account.id());
     return jv;
diff --git a/src/test/jtx/impl/directory.cpp b/src/test/jtx/impl/directory.cpp
index 0d545bd6f4..7a92c2bf25 100644
--- a/src/test/jtx/impl/directory.cpp
+++ b/src/test/jtx/impl/directory.cpp
@@ -30,7 +30,7 @@ bumpLastPage(
 {
     Expected<void, Error> res{};
     env.app().getOpenLedger().modify([&](OpenView& view, beast::Journal j) -> bool {
-        Sandbox sb(&view, tapNONE);
+        Sandbox sb(&view, TapNone);
 
         // Find the root page
         auto sleRoot = sb.peek(directory);
@@ -85,7 +85,7 @@ bumpLastPage(
 
         // Adjust root previous and previous node's next
         sleRoot->setFieldU64(sfIndexPrevious, newLastPage);
-        if (prevIndex.value_or(0) == 0)
+        if (prevIndex.valueOr(0) == 0)
         {
             sleRoot->setFieldU64(sfIndexNext, newLastPage);
         }
diff --git a/src/test/jtx/impl/domain.cpp b/src/test/jtx/impl/domain.cpp
index 70d4daf002..640212ebc3 100644
--- a/src/test/jtx/impl/domain.cpp
+++ b/src/test/jtx/impl/domain.cpp
@@ -9,7 +9,7 @@
 namespace xrpl::test::jtx {
 
 void
-domain::operator()(Env&, JTx& jt) const
+Domain::operator()(Env&, JTx& jt) const
 {
     jt[sfDomainID.jsonName] = to_string(v_);
 }
diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp
index ae05e4f1dd..93d976a7c9 100644
--- a/src/test/jtx/impl/envconfig.cpp
+++ b/src/test/jtx/impl/envconfig.cpp
@@ -12,7 +12,7 @@
 
 namespace xrpl::test {
 
-std::atomic<bool> envUseIPv4{false};
+std::atomic<bool> gEnvUseIPv4{false};
 
 void
 setupConfigForUnitTests(Config& cfg)
@@ -60,7 +60,7 @@ setupConfigForUnitTests(Config& cfg)
 namespace jtx {
 
 std::unique_ptr<Config>
-no_admin(std::unique_ptr<Config> cfg)
+noAdmin(std::unique_ptr<Config> cfg)
 {
     (*cfg)[PORT_RPC].set("admin", "");
     (*cfg)[PORT_WS].set("admin", "");
@@ -68,16 +68,16 @@ no_admin(std::unique_ptr<Config> cfg)
 }
 
 std::unique_ptr<Config>
-secure_gateway(std::unique_ptr<Config> cfg)
+secureGateway(std::unique_ptr<Config> cfg)
 {
     (*cfg)[PORT_RPC].set("admin", "");
     (*cfg)[PORT_WS].set("admin", "");
-    (*cfg)[PORT_RPC].set("secure_gateway", getEnvLocalhostAddr());
+    (*cfg)[PORT_RPC].set("secureGateway", getEnvLocalhostAddr());
     return cfg;
 }
 
 std::unique_ptr<Config>
-admin_localnet(std::unique_ptr<Config> cfg)
+adminLocalnet(std::unique_ptr<Config> cfg)
 {
     (*cfg)[PORT_RPC].set("admin", "127.0.0.0/8");
     (*cfg)[PORT_WS].set("admin", "127.0.0.0/8");
@@ -85,29 +85,29 @@ admin_localnet(std::unique_ptr<Config> cfg)
 }
 
 std::unique_ptr<Config>
-secure_gateway_localnet(std::unique_ptr<Config> cfg)
+secureGatewayLocalnet(std::unique_ptr<Config> cfg)
 {
     (*cfg)[PORT_RPC].set("admin", "");
     (*cfg)[PORT_WS].set("admin", "");
-    (*cfg)[PORT_RPC].set("secure_gateway", "127.0.0.0/8");
-    (*cfg)[PORT_WS].set("secure_gateway", "127.0.0.0/8");
+    (*cfg)[PORT_RPC].set("secureGateway", "127.0.0.0/8");
+    (*cfg)[PORT_WS].set("secureGateway", "127.0.0.0/8");
     return cfg;
 }
 std::unique_ptr<Config>
-single_thread_io(std::unique_ptr<Config> cfg)
+singleThreadIo(std::unique_ptr<Config> cfg)
 {
     cfg->IO_WORKERS = 1;
     return cfg;
 }
 
-auto constexpr defaultseed = "shUwVw52ofnCUX5m7kPTKzJdr4HEH";
+auto constexpr 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() ? defaultseed : seed});
+        .append(std::vector<std::string>{seed.empty() ? kDEFAULTSEED : seed});
     return cfg;
 }
 
@@ -127,7 +127,7 @@ addGrpcConfigWithSecureGateway(std::unique_ptr<Config> cfg, std::string const& s
     // Check https://man7.org/linux/man-pages/man7/ip.7.html
     // "ip_local_port_range" section for using 0 ports
     (*cfg)[SECTION_PORT_GRPC].set("port", "0");
-    (*cfg)[SECTION_PORT_GRPC].set("secure_gateway", secureGateway);
+    (*cfg)[SECTION_PORT_GRPC].set("secureGateway", secureGateway);
     return cfg;
 }
 
diff --git a/src/test/jtx/impl/escrow.cpp b/src/test/jtx/impl/escrow.cpp
index 3d5d1e2bac..f6fce08b66 100644
--- a/src/test/jtx/impl/escrow.cpp
+++ b/src/test/jtx/impl/escrow.cpp
@@ -17,22 +17,22 @@
 /** Escrow operations. */
 namespace xrpl::test::jtx::escrow {
 
-Json::Value
+json::Value
 create(AccountID const& account, AccountID const& to, STAmount const& amount)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::EscrowCreate;
     jv[jss::Flags] = tfFullyCanonicalSig;
     jv[jss::Account] = to_string(account);
     jv[jss::Destination] = to_string(to);
-    jv[jss::Amount] = amount.getJson(JsonOptions::none);
+    jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
     return jv;
 }
 
-Json::Value
+json::Value
 finish(AccountID const& account, AccountID const& from, std::uint32_t seq)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::EscrowFinish;
     jv[jss::Flags] = tfFullyCanonicalSig;
     jv[jss::Account] = to_string(account);
@@ -41,10 +41,10 @@ finish(AccountID const& account, AccountID const& from, std::uint32_t seq)
     return jv;
 }
 
-Json::Value
+json::Value
 cancel(AccountID const& account, Account const& from, std::uint32_t seq)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::EscrowCancel;
     jv[jss::Flags] = tfFullyCanonicalSig;
     jv[jss::Account] = to_string(account);
diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp
index edc3b5adf9..4dd0f01ece 100644
--- a/src/test/jtx/impl/fee.cpp
+++ b/src/test/jtx/impl/fee.cpp
@@ -10,11 +10,11 @@
 namespace xrpl::test::jtx {
 
 void
-fee::operator()(Env& env, JTx& jt) const
+Fee::operator()(Env& env, JTx& jt) const
 {
     if (!manual_)
         return;
-    jt.fill_fee = false;
+    jt.fillFee = false;
     assert(!increment_ || !amount_);
     if (increment_)
     {
@@ -22,7 +22,7 @@ fee::operator()(Env& env, JTx& jt) const
     }
     else if (amount_)
     {
-        jt[sfFee] = amount_->getJson(JsonOptions::none);
+        jt[sfFee] = amount_->getJson(JsonOptions::KNone);
     }
 }
 
diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp
index 3caa2ece17..7733335668 100644
--- a/src/test/jtx/impl/flags.cpp
+++ b/src/test/jtx/impl/flags.cpp
@@ -11,10 +11,10 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
+json::Value
 fset(Account const& account, std::uint32_t on, std::uint32_t off)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransactionType] = jss::AccountSet;
     if (on != 0)
@@ -25,7 +25,7 @@ fset(Account const& account, std::uint32_t on, std::uint32_t off)
 }
 
 void
-flags::operator()(Env& env) const
+Flags::operator()(Env& env) const
 {
     auto const sle = env.le(account_);
     if (!sle)
@@ -43,7 +43,7 @@ flags::operator()(Env& env) const
 }
 
 void
-nflags::operator()(Env& env) const
+Nflags::operator()(Env& env) const
 {
     auto const sle = env.le(account_);
     if (!sle)
diff --git a/src/test/jtx/impl/invoice_id.cpp b/src/test/jtx/impl/invoice_id.cpp
index ce3eb783ac..fe87261612 100644
--- a/src/test/jtx/impl/invoice_id.cpp
+++ b/src/test/jtx/impl/invoice_id.cpp
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 void
-invoice_id::operator()(Env&, JTx& jt) const
+InvoiceId::operator()(Env&, JTx& jt) const
 {
     if (!hash_.isZero())
         jt["InvoiceID"] = strHex(hash_);
diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp
index 0360dba351..cdac62f97f 100644
--- a/src/test/jtx/impl/jtx_json.cpp
+++ b/src/test/jtx/impl/jtx_json.cpp
@@ -13,22 +13,22 @@
 
 namespace xrpl::test::jtx {
 
-json::json(std::string const& s)
+Json::Json(std::string const& s)
 {
-    if (!Json::Reader().parse(s, jv_))
-        Throw<parse_error>("bad json");
+    if (!json::Reader().parse(s, jv_))
+        Throw<ParseError>("bad json");
 }
 
-json::json(char const* s) : json(std::string(s))
+Json::Json(char const* s) : Json(std::string(s))
 {
 }
 
-json::json(Json::Value jv) : jv_(std::move(jv))
+Json::Json(json::Value jv) : jv_(std::move(jv))
 {
 }
 
 void
-json::operator()(Env&, JTx& jt) const
+Json::operator()(Env&, JTx& jt) const
 {
     auto& jv = jt.jv;
     for (auto iter = jv_.begin(); iter != jv_.end(); ++iter)
diff --git a/src/test/jtx/impl/last_ledger_sequence.cpp b/src/test/jtx/impl/last_ledger_sequence.cpp
index dc4bae6212..ba59364571 100644
--- a/src/test/jtx/impl/last_ledger_sequence.cpp
+++ b/src/test/jtx/impl/last_ledger_sequence.cpp
@@ -6,7 +6,7 @@
 namespace xrpl::test::jtx {
 
 void
-last_ledger_seq::operator()(Env&, JTx& jt) const
+LastLedgerSeq::operator()(Env&, JTx& jt) const
 {
     jt["LastLedgerSequence"] = num_;
 }
diff --git a/src/test/jtx/impl/ledgerStateFixes.cpp b/src/test/jtx/impl/ledgerStateFixes.cpp
index bc19915957..a4b6d9b986 100644
--- a/src/test/jtx/impl/ledgerStateFixes.cpp
+++ b/src/test/jtx/impl/ledgerStateFixes.cpp
@@ -11,13 +11,12 @@
 namespace xrpl::test::jtx::ledgerStateFix {
 
 // Fix NFTokenPage links on owner's account.  acct pays fee.
-Json::Value
+json::Value
 nftPageLinks(jtx::Account const& acct, jtx::Account const& owner)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = acct.human();
-    jv[sfLedgerFixType.jsonName] =
-        static_cast<std::uint16_t>(LedgerStateFix::FixType::nfTokenPageLink);
+    jv[sfLedgerFixType.jsonName] = static_cast<uint16_t>(LedgerStateFix::FixType::NfTokenPageLink);
     jv[sfOwner.jsonName] = owner.human();
     jv[sfTransactionType.jsonName] = jss::LedgerStateFix;
     return jv;
diff --git a/src/test/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp
index f092f48d70..35488e9d4f 100644
--- a/src/test/jtx/impl/memo.cpp
+++ b/src/test/jtx/impl/memo.cpp
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 void
-memo::operator()(Env&, JTx& jt) const
+Memo::operator()(Env&, JTx& jt) const
 {
     auto& jv = jt.jv;
     auto& ma = jv["Memos"];
@@ -20,7 +20,7 @@ memo::operator()(Env&, JTx& jt) const
 }
 
 void
-memo_data::operator()(Env&, JTx& jt) const
+MemoData::operator()(Env&, JTx& jt) const
 {
     auto& jv = jt.jv;
     auto& ma = jv["Memos"];
@@ -30,7 +30,7 @@ memo_data::operator()(Env&, JTx& jt) const
 }
 
 void
-memo_format::operator()(Env&, JTx& jt) const
+MemoFormat::operator()(Env&, JTx& jt) const
 {
     auto& jv = jt.jv;
     auto& ma = jv["Memos"];
@@ -40,7 +40,7 @@ memo_format::operator()(Env&, JTx& jt) const
 }
 
 void
-memo_type::operator()(Env&, JTx& jt) const
+MemoType::operator()(Env&, JTx& jt) const
 {
     auto& jv = jt.jv;
     auto& ma = jv["Memos"];
diff --git a/src/test/jtx/impl/mpt.cpp b/src/test/jtx/impl/mpt.cpp
index e2fd95144c..1e127e7c05 100644
--- a/src/test/jtx/impl/mpt.cpp
+++ b/src/test/jtx/impl/mpt.cpp
@@ -41,19 +41,19 @@
 namespace xrpl::test::jtx {
 
 void
-mptflags::operator()(Env& env) const
+MptFlags::operator()(Env& env) const
 {
     env.test.expect(tester_.checkFlags(flags_, holder_));
 }
 
 void
-mptbalance::operator()(Env& env) const
+MptBalance::operator()(Env& env) const
 {
     env.test.expect(amount_ == tester_.getBalance(account_));
 }
 
 void
-requireAny::operator()(Env& env) const
+RequireAny::operator()(Env& env) const
 {
     env.test.expect(cb_());
 }
@@ -84,12 +84,12 @@ MPTTester::MPTTester(Env& env, Account issuer, MPTInit const& arg)
         env.close();
     if (arg.fund)
     {
-        env_.require(owners(issuer_, 0));
+        env_.require(Owners(issuer_, 0));
         for (auto const& it : holders_)
         {
             if (issuer_.id() == it.second.id())
                 Throw<std::runtime_error>("Issuer can't be holder");
-            env_.require(owners(it.second, 0));
+            env_.require(Owners(it.second, 0));
         }
     }
     if (arg.create)
@@ -144,12 +144,12 @@ operator MPT() const
     return MPT("", *id_);
 }
 
-Json::Value
+json::Value
 MPTTester::createJV(MPTCreate const& arg)
 {
     if (!arg.issuer)
         Throw<std::runtime_error>("MPTTester::createJV: issuer is not set");
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount] = arg.issuer->human();
     if (arg.assetScale)
         jv[sfAssetScale] = *arg.assetScale;
@@ -174,7 +174,7 @@ MPTTester::create(MPTCreate const& arg)
     if (id_)
         Throw<std::runtime_error>("MPT can't be reused");
     id_ = makeMptID(env_.seq(issuer_), issuer_);
-    Json::Value const jv = createJV(
+    json::Value const jv = createJV(
         {.issuer = issuer_,
          .maxAmt = arg.maxAmt,
          .assetScale = arg.assetScale,
@@ -186,13 +186,13 @@ MPTTester::create(MPTCreate const& arg)
     {
         // Verify issuance doesn't exist
         env_.require(
-            requireAny([&]() -> bool { return env_.le(keylet::mptIssuance(*id_)) == nullptr; }));
+            RequireAny([&]() -> bool { return env_.le(keylet::mptIssuance(*id_)) == nullptr; }));
 
         id_.reset();
     }
     else
     {
-        env_.require(mptflags(*this, arg.flags.value_or(0)));
+        env_.require(MptFlags(*this, arg.flags.value_or(0)));
         auto authAndPay = [&](auto const& accts, auto const&& getAcct) {
             for (auto const& it : accts)
             {
@@ -233,10 +233,10 @@ MPTTester::create(MPTCreate const& arg)
     }
 }
 
-Json::Value
+json::Value
 MPTTester::destroyJV(MPTDestroy const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.issuer || !arg.id)
         Throw<std::runtime_error>("MPTTester::destroyJV: issuer/id is not set");
     jv[sfAccount] = arg.issuer->human();
@@ -251,24 +251,24 @@ MPTTester::destroy(MPTDestroy const& arg)
 {
     if (!arg.id && !id_)
         Throw<std::runtime_error>("MPT has not been created");
-    Json::Value const jv =
+    json::Value const jv =
         destroyJV({.issuer = arg.issuer ? arg.issuer : issuer_, .id = arg.id ? arg.id : id_});
     submit(arg, jv);
 }
 
 Account const&
-MPTTester::holder(std::string const& holder_) const
+MPTTester::holder(std::string const& holder) const
 {
-    auto const& it = holders_.find(holder_);
+    auto const& it = holders_.find(holder);
     if (it == holders_.cend())
         Throw<std::runtime_error>("Holder is not found");
     return it->second;
 }
 
-Json::Value
+json::Value
 MPTTester::authorizeJV(MPTAuthorize const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.account || !arg.id)
         Throw<std::runtime_error>("MPTTester::authorizeJV: account/id is not set");
     jv[sfAccount] = arg.account->human();
@@ -285,7 +285,7 @@ MPTTester::authorize(MPTAuthorize const& arg)
 {
     if (!arg.id && !id_)
         Throw<std::runtime_error>("MPT has not been created");
-    Json::Value const jv = authorizeJV({
+    json::Value const jv = authorizeJV({
         .account = arg.account ? arg.account : issuer_,
         .holder = arg.holder,
         .id = arg.id ? arg.id : id_,
@@ -299,12 +299,12 @@ MPTTester::authorize(MPTAuthorize const& arg)
             // issuer un-authorizes the holder
             if (arg.flags.value_or(0) == tfMPTUnauthorize)
             {
-                env_.require(mptflags(*this, flags, arg.holder));
+                env_.require(MptFlags(*this, flags, arg.holder));
                 // issuer authorizes the holder
             }
             else
             {
-                env_.require(mptflags(*this, flags | lsfMPTAuthorized, arg.holder));
+                env_.require(MptFlags(*this, flags | lsfMPTAuthorized, arg.holder));
             }
         }
         // Holder authorizes
@@ -312,8 +312,8 @@ MPTTester::authorize(MPTAuthorize const& arg)
         {
             auto const flags = getFlags(arg.account);
             // holder creates a token
-            env_.require(mptflags(*this, flags, arg.account));
-            env_.require(mptbalance(*this, *arg.account, 0));
+            env_.require(MptFlags(*this, flags, arg.account));
+            env_.require(MptBalance(*this, *arg.account, 0));
         }
         else
         {
@@ -327,7 +327,7 @@ MPTTester::authorize(MPTAuthorize const& arg)
         if (result == tecDUPLICATE)
         {
             // Verify that MPToken already exists
-            env_.require(requireAny([&]() -> bool {
+            env_.require(RequireAny([&]() -> bool {
                 return env_.le(keylet::mptoken(*id_, arg.account->id())) != nullptr;
             }));
         }
@@ -335,7 +335,7 @@ MPTTester::authorize(MPTAuthorize const& arg)
         {
             // Verify MPToken doesn't exist if holder failed authorizing(unless
             // it already exists)
-            env_.require(requireAny([&]() -> bool {
+            env_.require(RequireAny([&]() -> bool {
                 return env_.le(keylet::mptoken(*id_, arg.account->id())) == nullptr;
             }));
         }
@@ -351,10 +351,10 @@ MPTTester::authorizeHolders(Holders const& holders)
     }
 }
 
-Json::Value
+json::Value
 MPTTester::setJV(MPTSet const& arg)
 {
-    Json::Value jv;
+    json::Value jv;
     if (!arg.account || !arg.id)
         Throw<std::runtime_error>("MPTTester::setJV: account and/or id is not set");
     jv[sfAccount] = arg.account->human();
@@ -395,7 +395,7 @@ MPTTester::set(MPTSet const& arg)
 {
     if (!arg.id && !id_)
         Throw<std::runtime_error>("MPT has not been created");
-    Json::Value const jv = setJV(
+    json::Value const jv = setJV(
         {.account = arg.account ? arg.account : issuer_,
          .holder = arg.holder,
          .id = arg.id ? arg.id : id_,
@@ -479,7 +479,7 @@ MPTTester::set(MPTSet const& arg)
                     }
                 }
             }
-            env_.require(mptflags(*this, flags, holder));
+            env_.require(MptFlags(*this, flags, holder));
         };
         if (arg.account)
             require(std::nullopt, arg.holder.has_value());
@@ -491,11 +491,11 @@ MPTTester::set(MPTSet const& arg)
 bool
 MPTTester::forObject(
     std::function<bool(SLEP const& sle)> const& cb,
-    std::optional<Account> const& holder_) const
+    std::optional<Account> const& holder) const
 {
     if (!id_)
         Throw<std::runtime_error>("MPT has not been created");
-    auto const key = holder_ ? keylet::mptoken(*id_, holder_->id()) : keylet::mptIssuance(*id_);
+    auto const key = holder ? keylet::mptoken(*id_, holder->id()) : keylet::mptIssuance(*id_);
     if (auto const sle = env_.le(key))
         return cb(sle);
     return false;
@@ -512,10 +512,10 @@ MPTTester::checkDomainID(std::optional<uint256> expected) const
 }
 
 [[nodiscard]] bool
-MPTTester::checkMPTokenAmount(Account const& holder_, std::int64_t expectedAmount) const
+MPTTester::checkMPTokenAmount(Account const& holder, std::int64_t expectedAmount) const
 {
     return forObject(
-        [&](SLEP const& sle) { return expectedAmount == (*sle)[sfMPTAmount]; }, holder_);
+        [&](SLEP const& sle) { return expectedAmount == (*sle)[sfMPTAmount]; }, holder);
 }
 
 [[nodiscard]] bool
@@ -582,12 +582,12 @@ MPTTester::pay(
     {
         env_(
             jtx::pay(src, dest, mpt(amount)),
-            ter(err.value_or(tesSUCCESS)),
-            credentials::ids(*credentials));
+            Ter(err.value_or(tesSUCCESS)),
+            credentials::Ids(*credentials));
     }
     else
     {
-        env_(jtx::pay(src, dest, mpt(amount)), ter(err.value_or(tesSUCCESS)));
+        env_(jtx::pay(src, dest, mpt(amount)), Ter(err.value_or(tesSUCCESS)));
     }
 
     if (!isTesSuccess(env_.ter()))
@@ -596,23 +596,23 @@ MPTTester::pay(
         env_.close();
     if (src == issuer_)
     {
-        env_.require(mptbalance(*this, src, srcAmt + amount));
-        env_.require(mptbalance(*this, dest, destAmt + amount));
+        env_.require(MptBalance(*this, src, srcAmt + amount));
+        env_.require(MptBalance(*this, dest, destAmt + amount));
     }
     else if (dest == issuer_)
     {
-        env_.require(mptbalance(*this, src, srcAmt - amount));
-        env_.require(mptbalance(*this, dest, destAmt - amount));
+        env_.require(MptBalance(*this, src, srcAmt - amount));
+        env_.require(MptBalance(*this, dest, destAmt - amount));
     }
     else
     {
         STAmount const saAmount = {*id_, amount};
         auto const actual = multiply(saAmount, transferRate(*env_.current(), *id_)).mpt().value();
         // Sender pays the transfer fee if any
-        env_.require(mptbalance(*this, src, srcAmt - actual));
-        env_.require(mptbalance(*this, dest, destAmt + amount));
+        env_.require(MptBalance(*this, src, srcAmt - actual));
+        env_.require(MptBalance(*this, dest, destAmt + amount));
         // Outstanding amount is reduced by the transfer fee if any
-        env_.require(mptbalance(*this, issuer_, outstandingAmt - (actual - amount)));
+        env_.require(MptBalance(*this, issuer_, outstandingAmt - (actual - amount)));
     }
 }
 
@@ -627,14 +627,14 @@ MPTTester::claw(
         Throw<std::runtime_error>("MPT has not been created");
     auto const issuerAmt = getBalance(issuer);
     auto const holderAmt = getBalance(holder);
-    env_(jtx::claw(issuer, mpt(amount), holder), ter(err.value_or(tesSUCCESS)));
+    env_(jtx::claw(issuer, mpt(amount), holder), Ter(err.value_or(tesSUCCESS)));
     if (!isTesSuccess(env_.ter()))
         amount = 0;
     if (close_)
         env_.close();
 
-    env_.require(mptbalance(*this, issuer, issuerAmt - std::min(holderAmt, amount)));
-    env_.require(mptbalance(*this, holder, holderAmt - std::min(holderAmt, amount)));
+    env_.require(MptBalance(*this, issuer, issuerAmt - std::min(holderAmt, amount)));
+    env_.require(MptBalance(*this, holder, holderAmt - std::min(holderAmt, amount)));
 }
 
 PrettyAmount
diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp
index e21a3621be..1ac65a0274 100644
--- a/src/test/jtx/impl/multisign.cpp
+++ b/src/test/jtx/impl/multisign.cpp
@@ -27,10 +27,10 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
-signers(Account const& account, std::uint32_t quorum, std::vector<signer> const& v)
+json::Value
+signers(Account const& account, std::uint32_t quorum, std::vector<Signer> const& v)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransactionType] = jss::SignerListSet;
     jv[sfSignerQuorum.getJsonName()] = quorum;
@@ -47,10 +47,10 @@ signers(Account const& account, std::uint32_t quorum, std::vector<signer> const&
     return jv;
 }
 
-Json::Value
-signers(Account const& account, none_t)
+json::Value
+signers(Account const& account, NoneT)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransactionType] = jss::SignerListSet;
     jv[sfSignerQuorum.getJsonName()] = 0;
@@ -60,7 +60,7 @@ signers(Account const& account, none_t)
 //------------------------------------------------------------------------------
 
 void
-msig::operator()(Env& env, JTx& jt) const
+Msig::operator()(Env& env, JTx& jt) const
 {
     auto const mySigners = signers;
     auto callback = [subField = subField, mySigners, &env](Env&, JTx& jtx) {
@@ -74,17 +74,17 @@ msig::operator()(Env& env, JTx& jt) const
         }
         else if (sigObject.isNull())
         {
-            sigObject = Json::Value(Json::objectValue);
+            sigObject = json::Value(json::ObjectValue);
         }
         std::optional<STObject> st;
         try
         {
             st = parse(jtx.jv);
         }
-        catch (parse_error const&)
+        catch (ParseError const&)
         {
             env.test.log << pretty(jtx.jv) << std::endl;
-            Rethrow();
+            rethrow();
         }
         auto& js = sigObject[sfSigners];
         for (std::size_t i = 0; i < mySigners.size(); ++i)
diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp
index abb777484a..2c40b9867b 100644
--- a/src/test/jtx/impl/offer.cpp
+++ b/src/test/jtx/impl/offer.cpp
@@ -10,27 +10,27 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
+json::Value
 offer(
     Account const& account,
     STAmount const& takerPays,
     STAmount const& takerGets,
     std::uint32_t flags)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
-    jv[jss::TakerPays] = takerPays.getJson(JsonOptions::none);
-    jv[jss::TakerGets] = takerGets.getJson(JsonOptions::none);
+    jv[jss::TakerPays] = takerPays.getJson(JsonOptions::KNone);
+    jv[jss::TakerGets] = takerGets.getJson(JsonOptions::KNone);
     if (flags != 0u)
         jv[jss::Flags] = flags;
     jv[jss::TransactionType] = jss::OfferCreate;
     return jv;
 }
 
-Json::Value
-offer_cancel(Account const& account, std::uint32_t offerSeq)
+json::Value
+offerCancel(Account const& account, std::uint32_t offerSeq)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::OfferSequence] = offerSeq;
     jv[jss::TransactionType] = jss::OfferCancel;
diff --git a/src/test/jtx/impl/owners.cpp b/src/test/jtx/impl/owners.cpp
index fde456f3ab..cb2cd5af29 100644
--- a/src/test/jtx/impl/owners.cpp
+++ b/src/test/jtx/impl/owners.cpp
@@ -16,7 +16,7 @@ namespace xrpl {
 namespace detail {
 
 std::uint32_t
-owned_count_of(ReadView const& view, AccountID const& id, LedgerEntryType type)
+ownedCountOf(ReadView const& view, AccountID const& id, LedgerEntryType type)
 {
     std::uint32_t count = 0;
     forEachItem(view, id, [&count, type](std::shared_ptr<SLE const> const& sle) {
@@ -27,13 +27,13 @@ owned_count_of(ReadView const& view, AccountID const& id, LedgerEntryType type)
 }
 
 void
-owned_count_helper(
+ownedCountHelper(
     test::jtx::Env& env,
     AccountID const& id,
     LedgerEntryType type,
     std::uint32_t value)
 {
-    env.test.expect(owned_count_of(*env.current(), id, type) == value);
+    env.test.expect(ownedCountOf(*env.current(), id, type) == value);
 }
 
 }  // namespace detail
@@ -41,7 +41,7 @@ owned_count_helper(
 namespace test::jtx {
 
 void
-owners::operator()(Env& env) const
+Owners::operator()(Env& env) const
 {
     env.test.expect(env.le(account_)->getFieldU32(sfOwnerCount) == value_);
 }
diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp
index f508d0d3b6..e644895cb0 100644
--- a/src/test/jtx/impl/paths.cpp
+++ b/src/test/jtx/impl/paths.cpp
@@ -23,7 +23,7 @@
 namespace xrpl::test::jtx {
 
 void
-paths::operator()(Env& env, JTx& jt) const
+Paths::operator()(Env& env, JTx& jt) const
 {
     auto& jv = jt.jv;
     auto const from = env.lookup(jv[jss::Account].asString());
@@ -61,37 +61,37 @@ paths::operator()(Env& env, JTx& jt) const
     // VFALCO TODO API to allow caller to examine the STPathSet
     // VFALCO isDefault should be renamed to empty()
     if (!found.isDefault())
-        jv[jss::Paths] = found.getJson(JsonOptions::none);
+        jv[jss::Paths] = found.getJson(JsonOptions::KNone);
 }
 
 //------------------------------------------------------------------------------
 
-path::path(STPath const& p)
+Path::Path(STPath const& p)
 {
-    jv_ = p.getJson(JsonOptions::none);
+    jv_ = p.getJson(JsonOptions::KNone);
 }
 
-Json::Value&
-path::create()
+json::Value&
+Path::create()
 {
-    return jv_.append(Json::objectValue);
+    return jv_.append(json::ObjectValue);
 }
 
 void
-path::append_one(Account const& account)
+Path::appendOne(Account const& account)
 {
-    append_one(account.id());
+    appendOne(account.id());
 }
 
 void
-path::append_one(AccountID const& account)
+Path::appendOne(AccountID const& account)
 {
     auto& jv = create();
     jv["account"] = toBase58(account);
 }
 
 void
-path::append_one(IOU const& iou)
+Path::appendOne(IOU const& iou)
 {
     auto& jv = create();
     jv["currency"] = to_string(iou.currency);
@@ -99,7 +99,7 @@ path::append_one(IOU const& iou)
 }
 
 void
-path::append_one(BookSpec const& book)
+Path::appendOne(BookSpec const& book)
 {
     auto& jv = create();
     book.asset.visit(
@@ -111,7 +111,7 @@ path::append_one(BookSpec const& book)
 }
 
 void
-path::operator()(Env& env, JTx& jt) const
+Path::operator()(Env& env, JTx& jt) const
 {
     jt.jv["Paths"].append(jv_);
 }
diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp
index 34b6b13d86..90a9cd8df0 100644
--- a/src/test/jtx/impl/pay.cpp
+++ b/src/test/jtx/impl/pay.cpp
@@ -10,19 +10,19 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
+json::Value
 pay(AccountID const& account, AccountID const& to, AnyAmount amount)
 {
     amount.to(to);
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = to_string(account);
-    jv[jss::Amount] = amount.value.getJson(JsonOptions::none);
+    jv[jss::Amount] = amount.value.getJson(JsonOptions::KNone);
     jv[jss::Destination] = to_string(to);
     jv[jss::TransactionType] = jss::Payment;
     jv[jss::Flags] = tfFullyCanonicalSig;
     return jv;
 }
-Json::Value
+json::Value
 pay(Account const& account, Account const& to, AnyAmount amount)
 {
     return pay(account.id(), to.id(), amount);
diff --git a/src/test/jtx/impl/permissioned_domains.cpp b/src/test/jtx/impl/permissioned_domains.cpp
index ff3146e67a..f39c9a43ed 100644
--- a/src/test/jtx/impl/permissioned_domains.cpp
+++ b/src/test/jtx/impl/permissioned_domains.cpp
@@ -26,19 +26,19 @@ namespace xrpl::test::jtx::pdomain {
 
 // helpers
 // Make json for PermissionedDomainSet transaction
-Json::Value
+json::Value
 setTx(AccountID const& account, Credentials const& credentials, std::optional<uint256> domain)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfTransactionType] = jss::PermissionedDomainSet;
     jv[sfAccount] = to_string(account);
     if (domain)
         jv[sfDomainID] = to_string(*domain);
 
-    Json::Value acceptedCredentials(Json::arrayValue);
+    json::Value acceptedCredentials(json::ArrayValue);
     for (auto const& credential : credentials)
     {
-        Json::Value object(Json::objectValue);
+        json::Value object(json::ObjectValue);
         object[sfCredential] = credential.toJson();
         acceptedCredentials.append(std::move(object));
     }
@@ -48,10 +48,10 @@ setTx(AccountID const& account, Credentials const& credentials, std::optional<ui
 }
 
 // Make json for PermissionedDomainDelete transaction
-Json::Value
+json::Value
 deleteTx(AccountID const& account, uint256 const& domain)
 {
-    Json::Value jv{Json::objectValue};
+    json::Value jv{json::ObjectValue};
     jv[sfTransactionType] = jss::PermissionedDomainDelete;
     jv[sfAccount] = to_string(account);
     jv[sfDomainID] = to_string(domain);
@@ -59,17 +59,17 @@ deleteTx(AccountID const& account, uint256 const& domain)
 }
 
 // Get PermissionedDomain objects by type from account_objects rpc call
-std::map<uint256, Json::Value>
+std::map<uint256, json::Value>
 getObjects(Account const& account, Env& env, bool withType)
 {
-    std::map<uint256, Json::Value> ret;
-    Json::Value params;
+    std::map<uint256, json::Value> ret;
+    json::Value params;
     params[jss::account] = account.human();
     if (withType)
         params[jss::type] = jss::permissioned_domain;
 
     auto const& resp = env.rpc("json", "account_objects", to_string(params));
-    Json::Value objects(Json::arrayValue);
+    json::Value objects(json::ArrayValue);
     objects = resp[jss::result][jss::account_objects];
     for (auto const& object : objects)
     {
@@ -96,7 +96,7 @@ getObjects(Account const& account, Env& env, bool withType)
 bool
 objectExists(uint256 const& objID, Env& env)
 {
-    Json::Value params;
+    json::Value params;
     params[jss::index] = to_string(objID);
 
     auto const result = env.rpc("json", "ledger_entry", to_string(params))["result"];
@@ -116,15 +116,15 @@ objectExists(uint256 const& objID, Env& env)
 // Extract credentials from account_object object
 Credentials
 credentialsFromJson(
-    Json::Value const& object,
+    json::Value const& object,
     std::unordered_map<std::string, Account> const& human2Acc)
 {
     Credentials ret;
-    Json::Value credentials(Json::arrayValue);
+    json::Value credentials(json::ArrayValue);
     credentials = object["AcceptedCredentials"];
     for (auto const& credential : credentials)
     {
-        Json::Value obj(Json::objectValue);
+        json::Value obj(json::ObjectValue);
         obj = credential[jss::Credential];
         auto const& issuer = obj[jss::Issuer];
         auto const& credentialType = obj["CredentialType"];
@@ -150,8 +150,8 @@ uint256
 getNewDomain(std::shared_ptr<STObject const> const& meta)
 {
     uint256 ret;
-    auto metaJson = meta->getJson(JsonOptions::none);
-    Json::Value a(Json::arrayValue);
+    auto metaJson = meta->getJson(JsonOptions::KNone);
+    json::Value a(json::ArrayValue);
     a = metaJson["AffectedNodes"];
 
     for (auto const& node : a)
diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp
index 32aca1b1cd..d4f43961ce 100644
--- a/src/test/jtx/impl/quality2.cpp
+++ b/src/test/jtx/impl/quality2.cpp
@@ -10,15 +10,13 @@
 
 namespace xrpl::test::jtx {
 
-qualityInPercent::qualityInPercent(double percent)
-    // NOLINTNEXTLINE(cppcoreguidelines-use-default-member-init)
+QualityInPercent::QualityInPercent(double percent)
     : qIn_(static_cast<std::uint32_t>((percent / 100) * QUALITY_ONE))
 {
     assert(percent <= 400 && percent >= 0);
 }
 
-qualityOutPercent::qualityOutPercent(double percent)
-    // NOLINTNEXTLINE(cppcoreguidelines-use-default-member-init)
+QualityOutPercent::QualityOutPercent(double percent)
     : qOut_(static_cast<std::uint32_t>((percent / 100) * QUALITY_ONE))
 {
     assert(percent <= 400 && percent >= 0);
@@ -31,25 +29,25 @@ insertQualityIntoJtx(SField const& field, std::uint32_t value, JTx& jt)
 }
 
 void
-qualityIn::operator()(Env&, JTx& jt) const
+QualityIn::operator()(Env&, JTx& jt) const
 {
     insertQualityIntoJtx(sfQualityIn, qIn_, jt);
 }
 
 void
-qualityInPercent::operator()(Env&, JTx& jt) const
+QualityInPercent::operator()(Env&, JTx& jt) const
 {
     insertQualityIntoJtx(sfQualityIn, qIn_, jt);
 }
 
 void
-qualityOut::operator()(Env&, JTx& jt) const
+QualityOut::operator()(Env&, JTx& jt) const
 {
     insertQualityIntoJtx(sfQualityOut, qOut_, jt);
 }
 
 void
-qualityOutPercent::operator()(Env&, JTx& jt) const
+QualityOutPercent::operator()(Env&, JTx& jt) const
 {
     insertQualityIntoJtx(sfQualityOut, qOut_, jt);
 }
diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp
index dab02b33c4..e5c188ca1c 100644
--- a/src/test/jtx/impl/rate.cpp
+++ b/src/test/jtx/impl/rate.cpp
@@ -11,12 +11,12 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
+json::Value
 rate(Account const& account, double multiplier)
 {
     if (multiplier > 4)
         Throw<std::runtime_error>("rate multiplier out of range");
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransferRate] = std::uint32_t(1000000000 * multiplier);
     jv[jss::TransactionType] = jss::AccountSet;
diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp
index 2f4c1bccdd..927a14ff2f 100644
--- a/src/test/jtx/impl/regkey.cpp
+++ b/src/test/jtx/impl/regkey.cpp
@@ -9,19 +9,19 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
-regkey(Account const& account, disabled_t)
+json::Value
+regkey(Account const& account, DisabledT)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransactionType] = jss::SetRegularKey;
     return jv;
 }
 
-Json::Value
+json::Value
 regkey(Account const& account, Account const& signer)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv["RegularKey"] = to_string(signer.id());
     jv[jss::TransactionType] = jss::SetRegularKey;
diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp
index c33cab79fa..3bc39a4a59 100644
--- a/src/test/jtx/impl/sendmax.cpp
+++ b/src/test/jtx/impl/sendmax.cpp
@@ -8,9 +8,9 @@
 namespace xrpl::test::jtx {
 
 void
-sendmax::operator()(Env& env, JTx& jt) const
+Sendmax::operator()(Env& env, JTx& jt) const
 {
-    jt.jv[jss::SendMax] = amount_.getJson(JsonOptions::none);
+    jt.jv[jss::SendMax] = amount_.getJson(JsonOptions::KNone);
 }
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp
index cab970974b..cb5435cc3e 100644
--- a/src/test/jtx/impl/seq.cpp
+++ b/src/test/jtx/impl/seq.cpp
@@ -8,11 +8,11 @@
 namespace xrpl::test::jtx {
 
 void
-seq::operator()(Env&, JTx& jt) const
+Seq::operator()(Env&, JTx& jt) const
 {
     if (!manual_)
         return;
-    jt.fill_seq = false;
+    jt.fillSeq = false;
     if (num_)
         jt[jss::Sequence] = *num_;
 }
diff --git a/src/test/jtx/impl/sig.cpp b/src/test/jtx/impl/sig.cpp
index fe246f8f90..7140fad3de 100644
--- a/src/test/jtx/impl/sig.cpp
+++ b/src/test/jtx/impl/sig.cpp
@@ -7,12 +7,12 @@
 namespace xrpl::test::jtx {
 
 void
-sig::operator()(Env&, JTx& jt) const
+Sig::operator()(Env&, JTx& jt) const
 {
     if (!manual_)
         return;
     if (subField_ == nullptr)
-        jt.fill_sig = false;
+        jt.fillSig = false;
     if (account_)
     {
         // VFALCO Inefficient pre-C++14
diff --git a/src/test/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp
index 9c1dab724c..4b804ab62f 100644
--- a/src/test/jtx/impl/tag.cpp
+++ b/src/test/jtx/impl/tag.cpp
@@ -6,13 +6,13 @@
 namespace xrpl::test::jtx {
 
 void
-dtag::operator()(Env&, JTx& jt) const
+Dtag::operator()(Env&, JTx& jt) const
 {
     jt.jv["DestinationTag"] = value_;
 }
 
 void
-stag::operator()(Env&, JTx& jt) const
+Stag::operator()(Env&, JTx& jt) const
 {
     jt.jv["SourceTag"] = value_;
 }
diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp
index f0975e6151..3ea4cc60b8 100644
--- a/src/test/jtx/impl/ticket.cpp
+++ b/src/test/jtx/impl/ticket.cpp
@@ -12,10 +12,10 @@
 
 namespace xrpl::test::jtx::ticket {
 
-Json::Value
+json::Value
 create(Account const& account, std::uint32_t count)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     jv[jss::TransactionType] = jss::TicketCreate;
     jv[sfTicketCount.jsonName] = count;
@@ -23,9 +23,9 @@ create(Account const& account, std::uint32_t count)
 }
 
 void
-use::operator()(Env&, JTx& jt) const
+Use::operator()(Env&, JTx& jt) const
 {
-    jt.fill_seq = false;
+    jt.fillSeq = false;
     jt[sfSequence.jsonName] = 0u;
     jt[sfTicketSequence.jsonName] = ticketSeq_;
 }
diff --git a/src/test/jtx/impl/token.cpp b/src/test/jtx/impl/token.cpp
index c3779c3c56..27d21c1694 100644
--- a/src/test/jtx/impl/token.cpp
+++ b/src/test/jtx/impl/token.cpp
@@ -19,10 +19,10 @@
 
 namespace xrpl::test::jtx::token {
 
-Json::Value
+json::Value
 mint(jtx::Account const& account, std::uint32_t nfTokenTaxon)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenTaxon.jsonName] = nfTokenTaxon;
     jv[sfTransactionType.jsonName] = jss::NFTokenMint;
@@ -30,27 +30,27 @@ mint(jtx::Account const& account, std::uint32_t nfTokenTaxon)
 }
 
 void
-xferFee::operator()(Env& env, JTx& jt) const
+XferFee::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfTransferFee.jsonName] = xferFee_;
 }
 
 void
-issuer::operator()(Env& env, JTx& jt) const
+Issuer::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfIssuer.jsonName] = issuer_;
 }
 
 void
-uri::operator()(Env& env, JTx& jt) const
+Uri::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfURI.jsonName] = uri_;
 }
 
 void
-amount::operator()(Env& env, JTx& jt) const
+Amount::operator()(Env& env, JTx& jt) const
 {
-    jt.jv[sfAmount.jsonName] = amount_.getJson(JsonOptions::none);
+    jt.jv[sfAmount.jsonName] = amount_.getJson(JsonOptions::KNone);
 }
 
 uint256
@@ -82,54 +82,54 @@ getID(
         flags, xferFee, issuer, nft::toTaxon(nfTokenTaxon), nftSeq);
 }
 
-Json::Value
+json::Value
 burn(jtx::Account const& account, uint256 const& nftokenID)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenID.jsonName] = to_string(nftokenID);
     jv[jss::TransactionType] = jss::NFTokenBurn;
     return jv;
 }
 
-Json::Value
+json::Value
 createOffer(jtx::Account const& account, uint256 const& nftokenID, STAmount const& amount)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenID.jsonName] = to_string(nftokenID);
-    jv[sfAmount.jsonName] = amount.getJson(JsonOptions::none);
+    jv[sfAmount.jsonName] = amount.getJson(JsonOptions::KNone);
     jv[jss::TransactionType] = jss::NFTokenCreateOffer;
     return jv;
 }
 
 void
-owner::operator()(Env& env, JTx& jt) const
+Owner::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfOwner.jsonName] = owner_;
 }
 
 void
-expiration::operator()(Env& env, JTx& jt) const
+Expiration::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfExpiration.jsonName] = expires_;
 }
 
 void
-destination::operator()(Env& env, JTx& jt) const
+Destination::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfDestination.jsonName] = dest_;
 }
 
 template <typename T>
-static Json::Value
+static json::Value
 cancelOfferImpl(jtx::Account const& account, T const& nftokenOffers)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     if (!empty(nftokenOffers))
     {
-        jv[sfNFTokenOffers.jsonName] = Json::arrayValue;
+        jv[sfNFTokenOffers.jsonName] = json::ArrayValue;
         for (uint256 const& nftokenOffer : nftokenOffers)
             jv[sfNFTokenOffers.jsonName].append(to_string(nftokenOffer));
     }
@@ -137,51 +137,51 @@ cancelOfferImpl(jtx::Account const& account, T const& nftokenOffers)
     return jv;
 }
 
-Json::Value
+json::Value
 cancelOffer(jtx::Account const& account, std::initializer_list<uint256> const& nftokenOffers)
 {
     return cancelOfferImpl(account, nftokenOffers);
 }
 
-Json::Value
+json::Value
 cancelOffer(jtx::Account const& account, std::vector<uint256> const& nftokenOffers)
 {
     return cancelOfferImpl(account, nftokenOffers);
 }
 
 void
-rootIndex::operator()(Env& env, JTx& jt) const
+RootIndex::operator()(Env& env, JTx& jt) const
 {
     jt.jv[sfRootIndex.jsonName] = rootIndex_;
 }
 
-Json::Value
+json::Value
 acceptBuyOffer(jtx::Account const& account, uint256 const& offerIndex)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenBuyOffer.jsonName] = to_string(offerIndex);
     jv[jss::TransactionType] = jss::NFTokenAcceptOffer;
     return jv;
 }
 
-Json::Value
+json::Value
 acceptSellOffer(jtx::Account const& account, uint256 const& offerIndex)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenSellOffer.jsonName] = to_string(offerIndex);
     jv[jss::TransactionType] = jss::NFTokenAcceptOffer;
     return jv;
 }
 
-Json::Value
+json::Value
 brokerOffers(
     jtx::Account const& account,
     uint256 const& buyOfferIndex,
     uint256 const& sellOfferIndex)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenBuyOffer.jsonName] = to_string(buyOfferIndex);
     jv[sfNFTokenSellOffer.jsonName] = to_string(sellOfferIndex);
@@ -190,29 +190,29 @@ brokerOffers(
 }
 
 void
-brokerFee::operator()(Env& env, JTx& jt) const
+BrokerFee::operator()(Env& env, JTx& jt) const
 {
-    jt.jv[sfNFTokenBrokerFee.jsonName] = brokerFee_.getJson(JsonOptions::none);
+    jt.jv[sfNFTokenBrokerFee.jsonName] = brokerFee_.getJson(JsonOptions::KNone);
 }
 
-Json::Value
+json::Value
 setMinter(jtx::Account const& account, jtx::Account const& minter)
 {
-    Json::Value jt = fset(account, asfAuthorizedNFTokenMinter);
+    json::Value jt = fset(account, asfAuthorizedNFTokenMinter);
     jt[sfNFTokenMinter.fieldName] = minter.human();
     return jt;
 }
 
-Json::Value
+json::Value
 clearMinter(jtx::Account const& account)
 {
     return fclear(account, asfAuthorizedNFTokenMinter);
 }
 
-Json::Value
+json::Value
 modify(jtx::Account const& account, uint256 const& nftokenID)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[sfAccount.jsonName] = account.human();
     jv[sfNFTokenID.jsonName] = to_string(nftokenID);
     jv[jss::TransactionType] = jss::NFTokenModify;
diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp
index 5450e0892d..ffe14694d9 100644
--- a/src/test/jtx/impl/trust.cpp
+++ b/src/test/jtx/impl/trust.cpp
@@ -14,14 +14,14 @@
 
 namespace xrpl::test::jtx {
 
-Json::Value
+json::Value
 trust(Account const& account, STAmount const& amount, std::uint32_t flags)
 {
     if (isXRP(amount))
         Throw<std::runtime_error>("trust() requires IOU");
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
-    jv[jss::LimitAmount] = amount.getJson(JsonOptions::none);
+    jv[jss::LimitAmount] = amount.getJson(JsonOptions::KNone);
     jv[jss::TransactionType] = jss::TrustSet;
     jv[jss::Flags] = flags;
     return jv;
@@ -31,15 +31,15 @@ trust(Account const& account, STAmount const& amount, std::uint32_t flags)
 // lines. account (first function parameter) is the issuing authority, it
 // authorises peer (third function parameter) to hold a certain currency
 // (amount, the second function parameter)
-Json::Value
+json::Value
 trust(Account const& account, STAmount const& amount, Account const& peer, std::uint32_t flags)
 {
     if (isXRP(amount))
         Throw<std::runtime_error>("trust() requires IOU");
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
     {
-        auto& ja = jv[jss::LimitAmount] = amount.getJson(JsonOptions::none);
+        auto& ja = jv[jss::LimitAmount] = amount.getJson(JsonOptions::KNone);
         ja[jss::issuer] = peer.human();
     }
     jv[jss::TransactionType] = jss::TrustSet;
@@ -47,12 +47,12 @@ trust(Account const& account, STAmount const& amount, Account const& peer, std::
     return jv;
 }
 
-Json::Value
+json::Value
 claw(Account const& account, STAmount const& amount, std::optional<Account> const& mptHolder)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::Account] = account.human();
-    jv[jss::Amount] = amount.getJson(JsonOptions::none);
+    jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
     jv[jss::TransactionType] = jss::Clawback;
 
     if (mptHolder)
diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp
index 686be767fe..21c440370e 100644
--- a/src/test/jtx/impl/txflags.cpp
+++ b/src/test/jtx/impl/txflags.cpp
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 void
-txflags::operator()(Env&, JTx& jt) const
+Txflags::operator()(Env&, JTx& jt) const
 {
     jt[jss::Flags] = v_ /*| tfFullyCanonicalSig*/;
 }
diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp
index 4bb6c83b88..21cf8a89c4 100644
--- a/src/test/jtx/impl/utility.cpp
+++ b/src/test/jtx/impl/utility.cpp
@@ -27,33 +27,33 @@
 namespace xrpl::test::jtx {
 
 STObject
-parse(Json::Value const& jv)
+parse(json::Value const& jv)
 {
     STParsedJSONObject p("tx_json", jv);
     if (!p.object)
-        Throw<parse_error>(rpcErrorString(p.error));
+        Throw<ParseError>(rpcErrorString(p.error));
     return std::move(*p.object);
 }
 
 void
-sign(Json::Value& jv, Account const& account, Json::Value& sigObject)
+sign(json::Value& jv, Account const& account, json::Value& sigObject)
 {
     sigObject[jss::SigningPubKey] = strHex(account.pk().slice());
     Serializer ss;
-    ss.add32(HashPrefix::txSign);
+    ss.add32(HashPrefix::TxSign);
     parse(jv).addWithoutSigningFields(ss);
     auto const sig = xrpl::sign(account.pk(), account.sk(), ss.slice());
     sigObject[jss::TxnSignature] = strHex(Slice{sig.data(), sig.size()});
 }
 
 void
-sign(Json::Value& jv, Account const& account)
+sign(json::Value& jv, Account const& account)
 {
     sign(jv, account, jv);
 }
 
 void
-fill_fee(Json::Value& jv, ReadView const& view)
+fillFee(json::Value& jv, ReadView const& view)
 {
     if (jv.isMember(jss::Fee))
         return;
@@ -61,23 +61,23 @@ fill_fee(Json::Value& jv, ReadView const& view)
 }
 
 void
-fill_seq(Json::Value& jv, ReadView const& view)
+fillSeq(json::Value& jv, ReadView const& view)
 {
     if (jv.isMember(jss::Sequence))
         return;
     auto const account = parseBase58<AccountID>(jv[jss::Account].asString());
     if (!account)
-        Throw<parse_error>("unexpected invalid Account");
+        Throw<ParseError>("unexpected invalid Account");
     auto const ar = view.read(keylet::account(*account));
     if (!ar)
-        Throw<parse_error>("unexpected missing account root");
+        Throw<ParseError>("unexpected missing account root");
     jv[jss::Sequence] = ar->getFieldU32(sfSequence);
 }
 
-Json::Value
+json::Value
 cmdToJSONRPC(std::vector<std::string> const& args, beast::Journal j, unsigned int apiVersion)
 {
-    Json::Value jv = Json::Value(Json::objectValue);
+    json::Value jv = json::Value(json::ObjectValue);
     auto const paramsObj = rpcCmdToJson(args, jv, apiVersion, j);
 
     // Re-use jv to return our formatted result.
@@ -89,7 +89,7 @@ cmdToJSONRPC(std::vector<std::string> const& args, beast::Journal j, unsigned in
     // If paramsObj is not empty, put it in a [params] array.
     if (paramsObj.begin() != paramsObj.end())
     {
-        auto& paramsArray = jv[jss::params] = Json::arrayValue;
+        auto& paramsArray = jv[jss::params] = json::ArrayValue;
         paramsArray.append(paramsObj);
     }
     if (paramsObj.isMember(jss::jsonrpc))
diff --git a/src/test/jtx/impl/vault.cpp b/src/test/jtx/impl/vault.cpp
index 5f4b488092..7084347763 100644
--- a/src/test/jtx/impl/vault.cpp
+++ b/src/test/jtx/impl/vault.cpp
@@ -16,71 +16,71 @@
 
 namespace xrpl::test::jtx {
 
-std::tuple<Json::Value, Keylet>
+std::tuple<json::Value, Keylet>
 Vault::create(CreateArgs const& args) const
 {
     auto keylet = keylet::vault(args.owner.id(), env.seq(args.owner));
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultCreate;
     jv[jss::Account] = args.owner.human();
-    jv[jss::Asset] = to_json(args.asset);
+    jv[jss::Asset] = toJson(args.asset);
     if (args.flags)
         jv[jss::Flags] = *args.flags;
     return {jv, keylet};
 }
 
-Json::Value
+json::Value
 Vault::set(SetArgs const& args)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultSet;
     jv[jss::Account] = args.owner.human();
     jv[sfVaultID] = to_string(args.id);
     return jv;
 }
 
-Json::Value
+json::Value
 Vault::del(DeleteArgs const& args)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultDelete;
     jv[jss::Account] = args.owner.human();
     jv[sfVaultID] = to_string(args.id);
     return jv;
 }
 
-Json::Value
+json::Value
 Vault::deposit(DepositArgs const& args)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultDeposit;
     jv[jss::Account] = args.depositor.human();
     jv[sfVaultID] = to_string(args.id);
-    jv[jss::Amount] = to_json(args.amount);
+    jv[jss::Amount] = toJson(args.amount);
     return jv;
 }
 
-Json::Value
+json::Value
 Vault::withdraw(WithdrawArgs const& args)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultWithdraw;
     jv[jss::Account] = args.depositor.human();
     jv[sfVaultID] = to_string(args.id);
-    jv[jss::Amount] = to_json(args.amount);
+    jv[jss::Amount] = toJson(args.amount);
     return jv;
 }
 
-Json::Value
+json::Value
 Vault::clawback(ClawbackArgs const& args)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::TransactionType] = jss::VaultClawback;
     jv[jss::Account] = args.issuer.human();
     jv[sfVaultID] = to_string(args.id);
     jv[jss::Holder] = args.holder.human();
     if (args.amount)
-        jv[jss::Amount] = to_json(*args.amount);
+        jv[jss::Amount] = toJson(*args.amount);
     return jv;
 }
 
diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp
index 2cf1c305a7..8941067378 100644
--- a/src/test/jtx/impl/xchain_bridge.cpp
+++ b/src/test/jtx/impl/xchain_bridge.cpp
@@ -28,108 +28,108 @@
 namespace xrpl::test::jtx {
 
 // use this for creating a bridge for a transaction
-Json::Value
+json::Value
 bridge(
     Account const& lockingChainDoor,
     Issue const& lockingChainIssue,
     Account const& issuingChainDoor,
     Issue const& issuingChainIssue)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::LockingChainDoor] = lockingChainDoor.human();
-    jv[jss::LockingChainIssue] = to_json(lockingChainIssue);
+    jv[jss::LockingChainIssue] = toJson(lockingChainIssue);
     jv[jss::IssuingChainDoor] = issuingChainDoor.human();
-    jv[jss::IssuingChainIssue] = to_json(issuingChainIssue);
+    jv[jss::IssuingChainIssue] = toJson(issuingChainIssue);
     return jv;
 }
 
 // use this for creating a bridge for a rpc query
-Json::Value
-bridge_rpc(
+json::Value
+bridgeRpc(
     Account const& lockingChainDoor,
     Issue const& lockingChainIssue,
     Account const& issuingChainDoor,
     Issue const& issuingChainIssue)
 {
-    Json::Value jv;
+    json::Value jv;
     jv[jss::LockingChainDoor] = lockingChainDoor.human();
-    jv[jss::LockingChainIssue] = to_json(lockingChainIssue);
+    jv[jss::LockingChainIssue] = toJson(lockingChainIssue);
     jv[jss::IssuingChainDoor] = issuingChainDoor.human();
-    jv[jss::IssuingChainIssue] = to_json(issuingChainIssue);
+    jv[jss::IssuingChainIssue] = toJson(issuingChainIssue);
     return jv;
 }
 
-Json::Value
-bridge_create(
+json::Value
+bridgeCreate(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     STAmount const& reward,
     std::optional<STAmount> const& minAccountCreate)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[jss::Account] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
-    jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::none);
+    jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::KNone);
     if (minAccountCreate)
-        jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::none);
+        jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::KNone);
 
     jv[jss::TransactionType] = jss::XChainCreateBridge;
     return jv;
 }
 
-Json::Value
-bridge_modify(
+json::Value
+bridgeModify(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::optional<STAmount> const& reward,
     std::optional<STAmount> const& minAccountCreate)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[jss::Account] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
     if (reward)
-        jv[sfSignatureReward.getJsonName()] = reward->getJson(JsonOptions::none);
+        jv[sfSignatureReward.getJsonName()] = reward->getJson(JsonOptions::KNone);
     if (minAccountCreate)
-        jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::none);
+        jv[sfMinAccountCreateAmount.getJsonName()] = minAccountCreate->getJson(JsonOptions::KNone);
 
     jv[jss::TransactionType] = jss::XChainModifyBridge;
     return jv;
 }
 
-Json::Value
-xchain_create_claim_id(
+json::Value
+xchainCreateClaimId(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     STAmount const& reward,
     Account const& otherChainSource)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[jss::Account] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
-    jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::none);
+    jv[sfSignatureReward.getJsonName()] = reward.getJson(JsonOptions::KNone);
     jv[sfOtherChainSource.getJsonName()] = otherChainSource.human();
 
     jv[jss::TransactionType] = jss::XChainCreateClaimID;
     return jv;
 }
 
-Json::Value
-xchain_commit(
+json::Value
+xchainCommit(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::uint32_t claimID,
     AnyAmount const& amt,
     std::optional<Account> const& dst)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[jss::Account] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
     jv[sfXChainClaimID.getJsonName()] = claimID;
-    jv[jss::Amount] = amt.value.getJson(JsonOptions::none);
+    jv[jss::Amount] = amt.value.getJson(JsonOptions::KNone);
     if (dst)
         jv[sfOtherChainDestination.getJsonName()] = dst->human();
 
@@ -137,63 +137,63 @@ xchain_commit(
     return jv;
 }
 
-Json::Value
-xchain_claim(
+json::Value
+xchainClaim(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::uint32_t claimID,
     AnyAmount const& amt,
     Account const& dst)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[sfAccount.getJsonName()] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
     jv[sfXChainClaimID.getJsonName()] = claimID;
     jv[sfDestination.getJsonName()] = dst.human();
-    jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::none);
+    jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::KNone);
 
     jv[jss::TransactionType] = jss::XChainClaim;
     return jv;
 }
 
-Json::Value
-sidechain_xchain_account_create(
+json::Value
+sidechainXchainAccountCreate(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     Account const& dst,
     AnyAmount const& amt,
     AnyAmount const& reward)
 {
-    Json::Value jv;
+    json::Value jv;
 
     jv[sfAccount.getJsonName()] = acc.human();
     jv[sfXChainBridge.getJsonName()] = bridge;
     jv[sfDestination.getJsonName()] = dst.human();
-    jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::none);
-    jv[sfSignatureReward.getJsonName()] = reward.value.getJson(JsonOptions::none);
+    jv[sfAmount.getJsonName()] = amt.value.getJson(JsonOptions::KNone);
+    jv[sfSignatureReward.getJsonName()] = reward.value.getJson(JsonOptions::KNone);
 
     jv[jss::TransactionType] = jss::XChainAccountCreateCommit;
     return jv;
 }
 
-Json::Value
-claim_attestation(
+json::Value
+claimAttestation(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::Account const& rewardAccount,
     bool wasLockingChainSend,
     std::uint64_t claimID,
     std::optional<jtx::Account> const& dst,
-    jtx::signer const& signer)
+    jtx::Signer const& signer)
 {
     STXChainBridge const stBridge(jvBridge);
 
     auto const& pk = signer.account.pk();
     auto const& sk = signer.account.sk();
-    auto const sig = sign_claim_attestation(
+    auto const sig = signClaimAttestation(
         pk,
         sk,
         stBridge,
@@ -204,7 +204,7 @@ claim_attestation(
         claimID,
         dst);
 
-    Json::Value result;
+    json::Value result;
 
     result[sfAccount.getJsonName()] = submittingAccount.human();
     result[sfXChainBridge.getJsonName()] = jvBridge;
@@ -213,11 +213,11 @@ claim_attestation(
     result[sfPublicKey.getJsonName()] = strHex(pk.slice());
     result[sfSignature.getJsonName()] = strHex(sig);
     result[sfOtherChainSource.getJsonName()] = toBase58(sendingAccount);
-    result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::none);
+    result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::KNone);
     result[sfAttestationRewardAccount.getJsonName()] = toBase58(rewardAccount);
     result[sfWasLockingChainSend.getJsonName()] = wasLockingChainSend ? 1 : 0;
 
-    result[sfXChainClaimID.getJsonName()] = STUInt64{claimID}.getJson(JsonOptions::none);
+    result[sfXChainClaimID.getJsonName()] = STUInt64{claimID}.getJson(JsonOptions::KNone);
     if (dst)
         result[sfDestination.getJsonName()] = toBase58(*dst);
 
@@ -226,10 +226,10 @@ claim_attestation(
     return result;
 }
 
-Json::Value
-create_account_attestation(
+json::Value
+createAccountAttestation(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::AnyAmount const& rewardAmount,
@@ -237,13 +237,13 @@ create_account_attestation(
     bool wasLockingChainSend,
     std::uint64_t createCount,
     jtx::Account const& dst,
-    jtx::signer const& signer)
+    jtx::Signer const& signer)
 {
     STXChainBridge const stBridge(jvBridge);
 
     auto const& pk = signer.account.pk();
     auto const& sk = signer.account.sk();
-    auto const sig = jtx::sign_create_account_attestation(
+    auto const sig = jtx::signCreateAccountAttestation(
         pk,
         sk,
         stBridge,
@@ -255,7 +255,7 @@ create_account_attestation(
         createCount,
         dst);
 
-    Json::Value result;
+    json::Value result;
 
     result[sfAccount.getJsonName()] = submittingAccount.human();
     result[sfXChainBridge.getJsonName()] = jvBridge;
@@ -264,14 +264,14 @@ create_account_attestation(
     result[sfPublicKey.getJsonName()] = strHex(pk.slice());
     result[sfSignature.getJsonName()] = strHex(sig);
     result[sfOtherChainSource.getJsonName()] = toBase58(sendingAccount);
-    result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::none);
+    result[sfAmount.getJsonName()] = sendingAmount.value.getJson(JsonOptions::KNone);
     result[sfAttestationRewardAccount.getJsonName()] = toBase58(rewardAccount);
     result[sfWasLockingChainSend.getJsonName()] = wasLockingChainSend ? 1 : 0;
 
     result[sfXChainAccountCreateCount.getJsonName()] =
-        STUInt64{createCount}.getJson(JsonOptions::none);
+        STUInt64{createCount}.getJson(JsonOptions::KNone);
     result[sfDestination.getJsonName()] = toBase58(dst);
-    result[sfSignatureReward.getJsonName()] = rewardAmount.value.getJson(JsonOptions::none);
+    result[sfSignatureReward.getJsonName()] = rewardAmount.value.getJson(JsonOptions::KNone);
 
     result[jss::TransactionType] = jss::XChainAddAccountCreateAttestation;
 
@@ -279,16 +279,16 @@ create_account_attestation(
 }
 
 JValueVec
-claim_attestations(
+claimAttestations(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     std::vector<jtx::Account> const& rewardAccounts,
     bool wasLockingChainSend,
     std::uint64_t claimID,
     std::optional<jtx::Account> const& dst,
-    std::vector<jtx::signer> const& signers,
+    std::vector<jtx::Signer> const& signers,
     std::size_t const numAtts,
     std::size_t const fromIdx)
 {
@@ -298,7 +298,7 @@ claim_attestations(
     vec.reserve(numAtts);
     for (auto i = fromIdx; i < fromIdx + numAtts; ++i)
     {
-        vec.emplace_back(claim_attestation(
+        vec.emplace_back(claimAttestation(
             submittingAccount,
             jvBridge,
             sendingAccount,
@@ -313,9 +313,9 @@ claim_attestations(
 }
 
 JValueVec
-create_account_attestations(
+createAccountAttestations(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::AnyAmount const& rewardAmount,
@@ -323,7 +323,7 @@ create_account_attestations(
     bool wasLockingChainSend,
     std::uint64_t createCount,
     jtx::Account const& dst,
-    std::vector<jtx::signer> const& signers,
+    std::vector<jtx::Signer> const& signers,
     std::size_t const numAtts,
     std::size_t const fromIdx)
 {
@@ -333,7 +333,7 @@ create_account_attestations(
     vec.reserve(numAtts);
     for (auto i = fromIdx; i < fromIdx + numAtts; ++i)
     {
-        vec.emplace_back(create_account_attestation(
+        vec.emplace_back(createAccountAttestation(
             submittingAccount,
             jvBridge,
             sendingAccount,
@@ -373,33 +373,33 @@ XChainBridgeObjects::XChainBridgeObjects()
     , scuGw("scuGw")
     , mcUSD(mcGw["USD"])
     , scUSD(scGw["USD"])
-    , jvXRPBridgeRPC(bridge_rpc(mcDoor, xrpIssue(), Account::master, xrpIssue()))
-    , jvb(bridge(mcDoor, xrpIssue(), Account::master, xrpIssue()))
-    , jvub(bridge(mcuDoor, xrpIssue(), Account::master, xrpIssue()))
-    , features(testable_amendments() | FeatureBitset{featureXChainBridge})
+    , 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 numSigners = UT_XCHAIN_DEFAULT_NUM_SIGNERS;
-        std::vector<signer> result;
-        result.reserve(numSigners);
-        for (int i = 0; i < numSigners; ++i)
+        constexpr int kNUM_SIGNERS = kUT_XCHAIN_DEFAULT_NUM_SIGNERS;
+        std::vector<Signer> result;
+        result.reserve(kNUM_SIGNERS);
+        for (int i = 0; i < kNUM_SIGNERS; ++i)
         {
             using namespace std::literals;
             auto const a = Account(
-                "signer_"s + std::to_string(i), (i % 2) ? KeyType::ed25519 : KeyType::secp256k1);
+                "signer_"s + std::to_string(i), (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
             result.emplace_back(a);
         }
         return result;
     }())
     , alt_signers([] {
-        constexpr int numSigners = UT_XCHAIN_DEFAULT_NUM_SIGNERS;
-        std::vector<signer> result;
-        result.reserve(numSigners);
-        for (int i = 0; i < numSigners; ++i)
+        constexpr int kNUM_SIGNERS = kUT_XCHAIN_DEFAULT_NUM_SIGNERS;
+        std::vector<Signer> result;
+        result.reserve(kNUM_SIGNERS);
+        for (int i = 0; i < kNUM_SIGNERS; ++i)
         {
             using namespace std::literals;
             auto const a = Account(
                 "alt_signer_"s + std::to_string(i),
-                (i % 2) ? KeyType::ed25519 : KeyType::secp256k1);
+                (i % 2) ? KeyType::Ed25519 : KeyType::Secp256k1);
             result.emplace_back(a);
         }
         return result;
@@ -425,15 +425,18 @@ XChainBridgeObjects::XChainBridgeObjects()
         return r;
     }())
     , reward(XRP(1))
-    , split_reward_quorum(divide(reward, STAmount(UT_XCHAIN_DEFAULT_QUORUM), reward.get<Issue>()))
+    , split_reward_quorum(divide(reward, STAmount(kUT_XCHAIN_DEFAULT_QUORUM), reward.get<Issue>()))
     , split_reward_everyone(
-          divide(reward, STAmount(UT_XCHAIN_DEFAULT_NUM_SIGNERS), reward.get<Issue>()))
+          divide(reward, STAmount(kUT_XCHAIN_DEFAULT_NUM_SIGNERS), reward.get<Issue>()))
     , tiny_reward(drops(37))
     , tiny_reward_split(
-          (divide(tiny_reward, STAmount(UT_XCHAIN_DEFAULT_QUORUM), tiny_reward.get<Issue>())))
+          (divide(tiny_reward, STAmount(kUT_XCHAIN_DEFAULT_QUORUM), tiny_reward.get<Issue>())))
     , tiny_reward_remainder(
           tiny_reward -
-          multiply(tiny_reward_split, STAmount(UT_XCHAIN_DEFAULT_QUORUM), tiny_reward.get<Issue>()))
+          multiply(
+              tiny_reward_split,
+              STAmount(kUT_XCHAIN_DEFAULT_QUORUM),
+              tiny_reward.get<Issue>()))
     , one_xrp(XRP(1))
     , xrp_dust(divide(one_xrp, STAmount(10000), one_xrp.get<Issue>()))
 {
@@ -442,8 +445,8 @@ XChainBridgeObjects::XChainBridgeObjects()
 void
 XChainBridgeObjects::createMcBridgeObjects(Env& mcEnv)
 {
-    STAmount const xrp_funds{XRP(10000)};
-    mcEnv.fund(xrp_funds, mcDoor, mcAlice, mcBob, mcCarol, mcGw);
+    STAmount const xrpFunds{XRP(10000)};
+    mcEnv.fund(xrpFunds, mcDoor, mcAlice, mcBob, mcCarol, mcGw);
 
     // Signer's list must match the attestation signers
     mcEnv(jtx::signers(mcDoor, signers.size(), signers));
@@ -452,24 +455,24 @@ XChainBridgeObjects::createMcBridgeObjects(Env& mcEnv)
     auto const reward = XRP(1);
     STAmount const minCreate = XRP(20);
 
-    mcEnv(bridge_create(mcDoor, jvb, reward, minCreate));
+    mcEnv(bridgeCreate(mcDoor, jvb, reward, minCreate));
     mcEnv.close();
 }
 
 void
 XChainBridgeObjects::createScBridgeObjects(Env& scEnv)
 {
-    STAmount const xrp_funds{XRP(10000)};
-    scEnv.fund(xrp_funds, scDoor, scAlice, scBob, scCarol, scGw, scAttester, scReward);
+    STAmount const xrpFunds{XRP(10000)};
+    scEnv.fund(xrpFunds, scDoor, scAlice, scBob, scCarol, scGw, scAttester, scReward);
 
     // Signer's list must match the attestation signers
-    scEnv(jtx::signers(Account::master, 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(bridge_create(Account::master, jvb, reward, minCreate));
+    scEnv(bridgeCreate(Account::kMASTER, jvb, reward, minCreate));
     scEnv.close();
 }
 
diff --git a/src/test/jtx/invoice_id.h b/src/test/jtx/invoice_id.h
index 9366cc9bf5..2246d54abf 100644
--- a/src/test/jtx/invoice_id.h
+++ b/src/test/jtx/invoice_id.h
@@ -4,13 +4,13 @@
 
 namespace xrpl::test::jtx {
 
-struct invoice_id
+struct InvoiceId
 {
 private:
     uint256 hash_;
 
 public:
-    explicit invoice_id(uint256 const& hash) : hash_(hash)
+    explicit InvoiceId(uint256 const& hash) : hash_(hash)
     {
     }
 
diff --git a/src/test/jtx/jtx_json.h b/src/test/jtx/jtx_json.h
index 0bd7c2ff94..d58f0b47ac 100644
--- a/src/test/jtx/jtx_json.h
+++ b/src/test/jtx/jtx_json.h
@@ -7,26 +7,26 @@
 namespace xrpl::test::jtx {
 
 /** Inject raw JSON. */
-class json
+class Json
 {
 private:
-    Json::Value jv_;
+    ::json::Value jv_;
 
 public:
-    explicit json(std::string const&);
+    explicit Json(std::string const&);
 
-    explicit json(char const*);
+    explicit Json(char const*);
 
-    explicit json(Json::Value);
+    explicit Json(::json::Value);
 
     template <class T>
-    json(Json::StaticString const& key, T const& value)
+    Json(::json::StaticString const& key, T const& value)
     {
         jv_[key] = value;
     }
 
     template <class T>
-    json(std::string const& key, T const& value)
+    Json(std::string const& key, T const& value)
     {
         jv_[key] = value;
     }
diff --git a/src/test/jtx/last_ledger_sequence.h b/src/test/jtx/last_ledger_sequence.h
index 9015c87f02..6170c2e4e1 100644
--- a/src/test/jtx/last_ledger_sequence.h
+++ b/src/test/jtx/last_ledger_sequence.h
@@ -4,13 +4,13 @@
 
 namespace xrpl::test::jtx {
 
-struct last_ledger_seq
+struct LastLedgerSeq
 {
 private:
     std::uint32_t num_;
 
 public:
-    explicit last_ledger_seq(std::uint32_t num) : num_(num)
+    explicit LastLedgerSeq(std::uint32_t num) : num_(num)
     {
     }
 
diff --git a/src/test/jtx/ledgerStateFix.h b/src/test/jtx/ledgerStateFix.h
index 8735882d15..769a28fb08 100644
--- a/src/test/jtx/ledgerStateFix.h
+++ b/src/test/jtx/ledgerStateFix.h
@@ -7,7 +7,7 @@
 namespace xrpl::test::jtx::ledgerStateFix {
 
 /** Repair the links in an NFToken directory. */
-Json::Value
+json::Value
 nftPageLinks(jtx::Account const& acct, jtx::Account const& owner);
 
 }  // namespace xrpl::test::jtx::ledgerStateFix
diff --git a/src/test/jtx/memo.h b/src/test/jtx/memo.h
index 8cb41b3f1c..9b5c1118ac 100644
--- a/src/test/jtx/memo.h
+++ b/src/test/jtx/memo.h
@@ -11,7 +11,7 @@ namespace xrpl::test::jtx {
     If a memo already exists, the new
     memo is appended to the array.
 */
-class memo
+class Memo
 {
 private:
     std::string data_;
@@ -19,7 +19,7 @@ private:
     std::string type_;
 
 public:
-    memo(std::string data, std::string format, std::string type)
+    Memo(std::string data, std::string format, std::string type)
         : data_(std::move(data)), format_(std::move(format)), type_(std::move(type))
     {
     }
@@ -28,13 +28,13 @@ public:
     operator()(Env&, JTx& jt) const;
 };
 
-class memo_data
+class MemoData
 {
 private:
     std::string s_;
 
 public:
-    memo_data(std::string s) : s_(std::move(s))
+    MemoData(std::string s) : s_(std::move(s))
     {
     }
 
@@ -42,13 +42,13 @@ public:
     operator()(Env&, JTx& jt) const;
 };
 
-class memo_format
+class MemoFormat
 {
 private:
     std::string s_;
 
 public:
-    memo_format(std::string s) : s_(std::move(s))
+    MemoFormat(std::string s) : s_(std::move(s))
     {
     }
 
@@ -56,13 +56,13 @@ public:
     operator()(Env&, JTx& jt) const;
 };
 
-class memo_type
+class MemoType
 {
 private:
     std::string s_;
 
 public:
-    memo_type(std::string s) : s_(std::move(s))
+    MemoType(std::string s) : s_(std::move(s))
     {
     }
 
diff --git a/src/test/jtx/mpt.h b/src/test/jtx/mpt.h
index 77597d795d..9dec95a2a2 100644
--- a/src/test/jtx/mpt.h
+++ b/src/test/jtx/mpt.h
@@ -13,10 +13,10 @@ namespace xrpl::test::jtx {
 
 class MPTTester;
 
-auto const MPTDEXFlags = tfMPTCanTrade | tfMPTCanTransfer;
+auto const kMPT_DEX_FLAGS = tfMPTCanTrade | tfMPTCanTransfer;
 
 // Check flags settings on MPT create
-class mptflags
+class MptFlags
 {
 private:
     MPTTester& tester_;
@@ -24,7 +24,7 @@ private:
     std::optional<Account> holder_;
 
 public:
-    mptflags(
+    MptFlags(
         MPTTester& tester,
         std::uint32_t flags,
         std::optional<Account> const& holder = std::nullopt)
@@ -37,7 +37,7 @@ public:
 };
 
 // Check mptissuance or mptoken amount balances on payment
-class mptbalance
+class MptBalance
 {
 private:
     MPTTester const& tester_;
@@ -45,7 +45,7 @@ private:
     std::int64_t const amount_;
 
 public:
-    mptbalance(MPTTester& tester, Account const& account, std::int64_t amount)
+    MptBalance(MPTTester& tester, Account const& account, std::int64_t amount)
         : tester_(tester), account_(account), amount_(amount)
     {
     }
@@ -54,13 +54,13 @@ public:
     operator()(Env& env) const;
 };
 
-class requireAny
+class RequireAny
 {
 private:
     std::function<bool()> cb_;
 
 public:
-    requireAny(std::function<bool()> const& cb) : cb_(cb)
+    RequireAny(std::function<bool()> const& cb) : cb_(cb)
     {
     }
 
@@ -72,7 +72,7 @@ using Holders = std::vector<Account>;
 
 struct MPTCreate
 {
-    static inline std::vector<Account> AllHolders = {};
+    static inline std::vector<Account> allHolders = {};
     std::optional<Account> issuer = std::nullopt;
     std::optional<std::uint64_t> maxAmt = std::nullopt;
     std::optional<std::uint8_t> assetScale = std::nullopt;
@@ -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 mptInitNoFund{.fund = false};
+static MPTInit const kMPT_INIT_NO_FUND{.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 = MPTDEXFlags;
+    std::uint32_t flags = kMPT_DEX_FLAGS;
     std::optional<std::uint32_t> mutableFlags = std::nullopt;
     bool authHolder = false;
     bool fund = false;
@@ -180,19 +180,19 @@ public:
     void
     create(MPTCreate const& arg = MPTCreate{});
 
-    static Json::Value
+    static json::Value
     createJV(MPTCreate const& arg = MPTCreate{});
 
     void
     destroy(MPTDestroy const& arg = MPTDestroy{});
 
-    static Json::Value
+    static json::Value
     destroyJV(MPTDestroy const& arg = MPTDestroy{});
 
     void
     authorize(MPTAuthorize const& arg = MPTAuthorize{});
 
-    static Json::Value
+    static json::Value
     authorizeJV(MPTAuthorize const& arg = MPTAuthorize{});
 
     void
@@ -201,7 +201,7 @@ public:
     void
     set(MPTSet const& set = {});
 
-    static Json::Value
+    static json::Value
     setJV(MPTSet const& set = {});
 
     [[nodiscard]] bool
@@ -288,18 +288,18 @@ private:
 
     template <typename A>
     TER
-    submit(A const& arg, Json::Value const& jv)
+    submit(A const& arg, json::Value const& jv)
     {
-        env_(jv, txflags(arg.flags.value_or(0)), ter(arg.err.value_or(tesSUCCESS)));
+        env_(jv, Txflags(arg.flags.value_or(0)), Ter(arg.err.value_or(tesSUCCESS)));
         auto const err = env_.ter();
         if (close_)
             env_.close();
         if (arg.ownerCount)
-            env_.require(owners(issuer_, *arg.ownerCount));
+            env_.require(Owners(issuer_, *arg.ownerCount));
         if (arg.holderCount)
         {
             for (auto const& it : holders_)
-                env_.require(owners(it.second, *arg.holderCount));
+                env_.require(Owners(it.second, *arg.holderCount));
         }
         return err;
     }
diff --git a/src/test/jtx/multisign.h b/src/test/jtx/multisign.h
index 5b6a18b527..62da7f65bc 100644
--- a/src/test/jtx/multisign.h
+++ b/src/test/jtx/multisign.h
@@ -13,29 +13,29 @@
 namespace xrpl::test::jtx {
 
 /** A signer in a SignerList */
-struct signer
+struct Signer
 {
     std::uint32_t weight;
     Account account;
     std::optional<uint256> tag;
 
-    signer(Account account_, std::uint32_t weight_ = 1, std::optional<uint256> tag_ = std::nullopt)
-        : weight(weight_), account(std::move(account_)), tag(tag_)
+    Signer(Account account, std::uint32_t weight = 1, std::optional<uint256> tag = std::nullopt)
+        : weight(weight), account(std::move(account)), tag(tag)
     {
     }
 };
 
-Json::Value
-signers(Account const& account, std::uint32_t quorum, std::vector<signer> const& v);
+json::Value
+signers(Account const& account, std::uint32_t quorum, std::vector<Signer> const& v);
 
 /** Remove a signer list. */
-Json::Value
-signers(Account const& account, none_t);
+json::Value
+signers(Account const& account, NoneT);
 
 //------------------------------------------------------------------------------
 
 /** Set a multisignature on a JTx. */
-class msig
+class Msig
 {
 public:
     std::vector<Reg> signers;
@@ -46,45 +46,45 @@ public:
     SField const* const subField = nullptr;
     /// Used solely as a convenience placeholder for ctors that do _not_ specify
     /// a subfield.
-    static constexpr SField* const topLevel = nullptr;
+    static constexpr SField* const kTOP_LEVEL = nullptr;
 
-    msig(SField const* subField_, std::vector<Reg> signers_)
-        : signers(std::move(signers_)), subField(subField_)
+    Msig(SField const* subField, std::vector<Reg> signers)
+        : signers(std::move(signers)), subField(subField)
     {
-        sortSigners(signers);
+        sortSigners(this->signers);
     }
 
-    msig(SField const& subField_, std::vector<Reg> signers_) : msig{&subField_, signers_}
+    Msig(SField const& subField, std::vector<Reg> signers) : Msig{&subField, signers}
     {
     }
 
-    msig(std::vector<Reg> signers_) : msig(topLevel, signers_)
+    Msig(std::vector<Reg> signers) : Msig(kTOP_LEVEL, signers)
     {
     }
 
     template <class AccountType, class... Accounts>
         requires std::convertible_to<AccountType, Reg>
-    explicit msig(SField const* subField_, AccountType&& a0, Accounts&&... aN)
-        : msig{
-              subField_,
+    explicit Msig(SField const* subField, AccountType&& a0, Accounts&&... aN)
+        : Msig{
+              subField,
               std::vector<Reg>{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}}
     {
     }
 
     template <class AccountType, class... Accounts>
         requires std::convertible_to<AccountType, Reg>
-    explicit msig(SField const& subField_, AccountType&& a0, Accounts&&... aN)
-        : msig{
-              &subField_,
+    explicit Msig(SField const& subField, AccountType&& a0, Accounts&&... aN)
+        : Msig{
+              &subField,
               std::vector<Reg>{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}}
     {
     }
 
     template <class AccountType, class... Accounts>
         requires(std::convertible_to<AccountType, Reg> && !std::is_same_v<AccountType, SField*>)
-    explicit msig(AccountType&& a0, Accounts&&... aN)
-        : msig{
-              topLevel,
+    explicit Msig(AccountType&& a0, Accounts&&... aN)
+        : Msig{
+              kTOP_LEVEL,
               std::vector<Reg>{std::forward<AccountType>(a0), std::forward<Accounts>(aN)...}}
     {
     }
@@ -96,6 +96,6 @@ public:
 //------------------------------------------------------------------------------
 
 /** The number of signer lists matches. */
-using siglists = owner_count<ltSIGNER_LIST>;
+using siglists = OwnerCount<ltSIGNER_LIST>;
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/noop.h b/src/test/jtx/noop.h
index 29c6188386..095e20f387 100644
--- a/src/test/jtx/noop.h
+++ b/src/test/jtx/noop.h
@@ -5,7 +5,7 @@
 namespace xrpl::test::jtx {
 
 /** The null transaction. */
-inline Json::Value
+inline json::Value
 noop(Account const& account)
 {
     return fset(account, 0);
diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h
index 5f81db751f..9a31904058 100644
--- a/src/test/jtx/offer.h
+++ b/src/test/jtx/offer.h
@@ -8,7 +8,7 @@
 namespace xrpl::test::jtx {
 
 /** Create an offer. */
-Json::Value
+json::Value
 offer(
     Account const& account,
     STAmount const& takerPays,
@@ -16,7 +16,7 @@ offer(
     std::uint32_t flags = 0);
 
 /** Cancel an offer. */
-Json::Value
-offer_cancel(Account const& account, std::uint32_t offerSeq);
+json::Value
+offerCancel(Account const& account, std::uint32_t offerSeq);
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h
index 572b63757c..44fd3762c2 100644
--- a/src/test/jtx/owners.h
+++ b/src/test/jtx/owners.h
@@ -14,10 +14,10 @@ namespace xrpl {
 namespace detail {
 
 std::uint32_t
-owned_count_of(ReadView const& view, AccountID const& id, LedgerEntryType type);
+ownedCountOf(ReadView const& view, AccountID const& id, LedgerEntryType type);
 
 void
-owned_count_helper(
+ownedCountHelper(
     test::jtx::Env& env,
     AccountID const& id,
     LedgerEntryType type,
@@ -29,33 +29,33 @@ namespace test::jtx {
 
 // Helper for aliases
 template <LedgerEntryType Type>
-class owner_count
+class OwnerCount
 {
 private:
     Account account_;
     std::uint32_t value_;
 
 public:
-    owner_count(Account account, std::uint32_t value) : account_(std::move(account)), value_(value)
+    OwnerCount(Account account, std::uint32_t value) : account_(std::move(account)), value_(value)
     {
     }
 
     void
     operator()(Env& env) const
     {
-        xrpl::detail::owned_count_helper(env, account_.id(), Type, value_);
+        xrpl::detail::ownedCountHelper(env, account_.id(), Type, value_);
     }
 };
 
 /** Match the number of items in the account's owner directory */
-class owners
+class Owners
 {
 private:
     Account account_;
     std::uint32_t value_;
 
 public:
-    owners(Account account, std::uint32_t value) : account_(std::move(account)), value_(value)
+    Owners(Account account, std::uint32_t value) : account_(std::move(account)), value_(value)
     {
     }
 
@@ -64,13 +64,13 @@ public:
 };
 
 /** Match the number of trust lines in the account's owner directory */
-using lines = owner_count<ltRIPPLE_STATE>;
+using lines = OwnerCount<ltRIPPLE_STATE>;
 
 /** Match the number of offers in the account's owner directory */
-using offers = owner_count<ltOFFER>;
+using offers = OwnerCount<ltOFFER>;
 
 /** Match the number of MPToken in the account's owner directory */
-using mptokens = owner_count<ltMPTOKEN>;
+using mptokens = OwnerCount<ltMPTOKEN>;
 
 }  // namespace test::jtx
 
diff --git a/src/test/jtx/paths.h b/src/test/jtx/paths.h
index f63faa6292..e2c88e215d 100644
--- a/src/test/jtx/paths.h
+++ b/src/test/jtx/paths.h
@@ -12,7 +12,7 @@ class STPath;
 namespace test::jtx {
 
 /** Set Paths, SendMax on a JTx. */
-class paths
+class Paths
 {
 private:
     Asset in_;
@@ -20,7 +20,7 @@ private:
     unsigned int limit_;
 
 public:
-    paths(Asset const& in, int depth = 7, unsigned int limit = 4)
+    Paths(Asset const& in, int depth = 7, unsigned int limit = 4)
         : in_(in), depth_(depth), limit_(limit)
     {
     }
@@ -35,44 +35,44 @@ public:
 
     If no paths are present, a new one is created.
 */
-class path
+class Path
 {
 private:
-    Json::Value jv_;
+    json::Value jv_;
 
 public:
-    path();
+    Path();
 
     template <class T, class... Args>
-    explicit path(T const& t, Args const&... args);
+    explicit Path(T const& t, Args const&... args);
 
-    path(STPath const& p);
+    Path(STPath const& p);
 
     void
     operator()(Env&, JTx& jt) const;
 
 private:
-    Json::Value&
+    json::Value&
     create();
 
     void
-    append_one(Account const& account);
+    appendOne(Account const& account);
 
     void
-    append_one(AccountID const& account);
+    appendOne(AccountID const& account);
 
     template <class T>
     std::enable_if_t<std::is_constructible_v<Account, T>>
-    append_one(T const& t)
+    appendOne(T const& t)
     {
-        append_one(Account{t});
+        appendOne(Account{t});
     }
 
     void
-    append_one(IOU const& iou);
+    appendOne(IOU const& iou);
 
     void
-    append_one(BookSpec const& book);
+    appendOne(BookSpec const& book);
 
     template <class T, class... Args>
     void
@@ -80,16 +80,16 @@ private:
 };
 
 template <class T, class... Args>
-path::path(T const& t, Args const&... args) : jv_(Json::arrayValue)
+Path::Path(T const& t, Args const&... args) : jv_(json::ArrayValue)
 {
     append(t, args...);
 }
 
 template <class T, class... Args>
 void
-path::append(T const& t, Args const&... args)
+Path::append(T const& t, Args const&... args)
 {
-    append_one(t);
+    appendOne(t);
     if constexpr (sizeof...(args) > 0)
         append(args...);
 }
diff --git a/src/test/jtx/pay.h b/src/test/jtx/pay.h
index 093920a970..8f4f3287ae 100644
--- a/src/test/jtx/pay.h
+++ b/src/test/jtx/pay.h
@@ -8,9 +8,9 @@
 namespace xrpl::test::jtx {
 
 /** Create a payment. */
-Json::Value
+json::Value
 pay(AccountID const& account, AccountID const& to, AnyAmount amount);
-Json::Value
+json::Value
 pay(Account const& account, Account const& to, AnyAmount amount);
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/permissioned_domains.h b/src/test/jtx/permissioned_domains.h
index a582b001b1..fdd2b0da1d 100644
--- a/src/test/jtx/permissioned_domains.h
+++ b/src/test/jtx/permissioned_domains.h
@@ -12,18 +12,18 @@ using Credentials = std::vector<Credential>;
 
 // helpers
 // Make json for PermissionedDomainSet transaction
-Json::Value
+json::Value
 setTx(
     AccountID const& account,
     Credentials const& credentials,
     std::optional<uint256> domain = std::nullopt);
 
 // Make json for PermissionedDomainDelete transaction
-Json::Value
+json::Value
 deleteTx(AccountID const& account, uint256 const& domain);
 
 // Get PermissionedDomain objects from account_objects rpc call
-std::map<uint256, Json::Value>
+std::map<uint256, json::Value>
 getObjects(Account const& account, Env& env, bool withType = true);
 
 // Check if ledger object is there
@@ -33,7 +33,7 @@ objectExists(uint256 const& objID, Env& env);
 // Extract credentials from account_object object
 Credentials
 credentialsFromJson(
-    Json::Value const& object,
+    json::Value const& object,
     std::unordered_map<std::string, Account> const& human2Acc);
 
 // Sort credentials the same way as PermissionedDomainSet
diff --git a/src/test/jtx/prop.h b/src/test/jtx/prop.h
index 5651ac58ce..c3ec6bc0fe 100644
--- a/src/test/jtx/prop.h
+++ b/src/test/jtx/prop.h
@@ -7,20 +7,20 @@
 namespace xrpl::test::jtx {
 
 /** Set a property on a JTx. */
-template <class Prop>
-struct prop
+template <class T>
+struct Prop
 {
-    std::unique_ptr<basic_prop> p_;
+    std::unique_ptr<BasicProp> p;
 
     template <class... Args>
-    prop(Args&&... args) : p_(std::make_unique<prop_type<Prop>>(std::forward<Args>(args)...))
+    Prop(Args&&... args) : p(std::make_unique<PropType<T>>(std::forward<Args>(args)...))
     {
     }
 
     void
     operator()(Env& env, JTx& jt) const
     {
-        jt.set(p_->clone());
+        jt.set(p->clone());
     }
 };
 
diff --git a/src/test/jtx/quality.h b/src/test/jtx/quality.h
index adb198038a..75bf930434 100644
--- a/src/test/jtx/quality.h
+++ b/src/test/jtx/quality.h
@@ -5,13 +5,13 @@
 namespace xrpl::test::jtx {
 
 /** Sets the literal QualityIn on a trust JTx. */
-class qualityIn
+class QualityIn
 {
 private:
     std::uint32_t qIn_;
 
 public:
-    explicit qualityIn(std::uint32_t qIn) : qIn_(qIn)
+    explicit QualityIn(std::uint32_t qIn) : qIn_(qIn)
     {
     }
 
@@ -20,26 +20,26 @@ public:
 };
 
 /** Sets the QualityIn on a trust JTx. */
-class qualityInPercent
+class QualityInPercent
 {
 private:
     std::uint32_t qIn_;  // NOLINT(cppcoreguidelines-use-default-member-init)
 
 public:
-    explicit qualityInPercent(double percent);
+    explicit QualityInPercent(double percent);
 
     void
     operator()(Env&, JTx& jtx) const;
 };
 
 /** Sets the literal QualityOut on a trust JTx. */
-class qualityOut
+class QualityOut
 {
 private:
     std::uint32_t qOut_;
 
 public:
-    explicit qualityOut(std::uint32_t qOut) : qOut_(qOut)
+    explicit QualityOut(std::uint32_t qOut) : qOut_(qOut)
     {
     }
 
@@ -48,13 +48,13 @@ public:
 };
 
 /** Sets the QualityOut on a trust JTx as a percentage. */
-class qualityOutPercent
+class QualityOutPercent
 {
 private:
     std::uint32_t qOut_;  // NOLINT(cppcoreguidelines-use-default-member-init)
 
 public:
-    explicit qualityOutPercent(double percent);
+    explicit QualityOutPercent(double percent);
 
     void
     operator()(Env&, JTx& jtx) const;
diff --git a/src/test/jtx/rate.h b/src/test/jtx/rate.h
index 740c2ffd1a..f76c2dd538 100644
--- a/src/test/jtx/rate.h
+++ b/src/test/jtx/rate.h
@@ -7,7 +7,7 @@
 namespace xrpl::test::jtx {
 
 /** Set a transfer rate. */
-Json::Value
+json::Value
 rate(Account const& account, double multiplier);
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/regkey.h b/src/test/jtx/regkey.h
index 3da055c66f..676633b2b7 100644
--- a/src/test/jtx/regkey.h
+++ b/src/test/jtx/regkey.h
@@ -8,11 +8,11 @@
 namespace xrpl::test::jtx {
 
 /** Disable the regular key. */
-Json::Value
-regkey(Account const& account, disabled_t);
+json::Value
+regkey(Account const& account, DisabledT);
 
 /** Set a regular key. */
-Json::Value
+json::Value
 regkey(Account const& account, Account const& signer);
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/require.h b/src/test/jtx/require.h
index 20f79ff838..91cc75b3f5 100644
--- a/src/test/jtx/require.h
+++ b/src/test/jtx/require.h
@@ -11,11 +11,11 @@ namespace detail {
 
 template <class Cond, class... Args>
 inline void
-require_args(test::jtx::requires_t& vec, Cond const& cond, Args const&... args)
+requireArgs(test::jtx::requires_t& vec, Cond const& cond, Args const&... args)
 {
     vec.push_back(cond);
     if constexpr (sizeof...(args) > 0)
-        require_args(vec, args...);
+        requireArgs(vec, args...);
 }
 
 }  // namespace detail
@@ -28,7 +28,7 @@ require_t
 required(Args const&... args)
 {
     requires_t vec;
-    detail::require_args(vec, args...);
+    detail::requireArgs(vec, args...);
     return [vec](Env& env) {
         for (auto const& f : vec)
             f(env);
@@ -41,14 +41,14 @@ required(Args const&... args)
     applied, and only if the resulting TER
     matches the expected TER.
 */
-class require
+class Require
 {
 private:
     require_t cond_;
 
 public:
     template <class... Args>
-    require(Args const&... args) : cond_(required(args...))
+    Require(Args const&... args) : cond_(required(args...))
     {
     }
 
diff --git a/src/test/jtx/rpc.h b/src/test/jtx/rpc.h
index be7ab8d456..1f538f9ca5 100644
--- a/src/test/jtx/rpc.h
+++ b/src/test/jtx/rpc.h
@@ -10,23 +10,23 @@ namespace xrpl::test::jtx {
 /** Set the expected result code for a JTx
     The test will fail if the code doesn't match.
 */
-class rpc
+class Rpc
 {
 private:
-    std::optional<error_code_i> code_;
+    std::optional<ErrorCodeI> code_;
     std::optional<std::string> errorMessage_;
     std::optional<std::string> error_;
     std::optional<std::string> errorException_;
 
 public:
     /// If there's an error code, we expect an error message
-    explicit rpc(error_code_i code, std::optional<std::string> m = {})
+    explicit Rpc(ErrorCodeI code, std::optional<std::string> m = {})
         : code_(code), errorMessage_(std::move(m))
     {
     }
 
     ///  If there is not a code, we expect an exception message
-    explicit rpc(std::string error, std::optional<std::string> exceptionMessage = {})
+    explicit Rpc(std::string error, std::optional<std::string> exceptionMessage = {})
         : error_(error), errorException_(std::move(exceptionMessage))
     {
     }
@@ -38,7 +38,7 @@ public:
         jt.ter = telENV_RPC_FAILED;
         if (code_)
         {
-            auto const& errorInfo = RPC::get_error_info(*code_);
+            auto const& errorInfo = RPC::getErrorInfo(*code_);
             // When an RPC request returns an error code ('error_code'), it
             // always includes an error message ('error_message'), and sometimes
             // includes an error token ('error'). If it does, the error token is
@@ -47,8 +47,8 @@ public:
             // Take advantage of that fact to populate jt.rpcException. The
             // check will be aware of whether the rpcException can be safely
             // ignored.
-            jt.rpcCode = {*code_, errorMessage_ ? *errorMessage_ : errorInfo.message.c_str()};
-            jt.rpcException = {errorInfo.token.c_str(), std::nullopt};
+            jt.rpcCode = {*code_, errorMessage_ ? *errorMessage_ : errorInfo.message.cStr()};
+            jt.rpcException = {errorInfo.token.cStr(), std::nullopt};
         }
         if (error_)
             jt.rpcException = {*error_, errorException_};
diff --git a/src/test/jtx/sendmax.h b/src/test/jtx/sendmax.h
index e559a87641..125b10b7d4 100644
--- a/src/test/jtx/sendmax.h
+++ b/src/test/jtx/sendmax.h
@@ -9,13 +9,13 @@
 namespace xrpl::test::jtx {
 
 /** Sets the SendMax on a JTx. */
-class sendmax
+class Sendmax
 {
 private:
     STAmount amount_;
 
 public:
-    sendmax(STAmount amount) : amount_(std::move(amount))
+    Sendmax(STAmount amount) : amount_(std::move(amount))
     {
     }
 
diff --git a/src/test/jtx/seq.h b/src/test/jtx/seq.h
index ea5ccfa259..de06ac3fbc 100644
--- a/src/test/jtx/seq.h
+++ b/src/test/jtx/seq.h
@@ -8,22 +8,22 @@
 namespace xrpl::test::jtx {
 
 /** Set the sequence number on a JTx. */
-struct seq
+struct Seq
 {
 private:
     bool manual_ = true;
     std::optional<std::uint32_t> num_;
 
 public:
-    explicit seq(autofill_t) : manual_(false)
+    explicit Seq(AutofillT) : manual_(false)
     {
     }
 
-    explicit seq(none_t)
+    explicit Seq(NoneT)
     {
     }
 
-    explicit seq(std::uint32_t num) : num_(num)
+    explicit Seq(std::uint32_t num) : num_(num)
     {
     }
 
diff --git a/src/test/jtx/sig.h b/src/test/jtx/sig.h
index e23022b4b5..374f106684 100644
--- a/src/test/jtx/sig.h
+++ b/src/test/jtx/sig.h
@@ -9,7 +9,7 @@ namespace xrpl::test::jtx {
 /** Set the regular signature on a JTx.
     @note For multisign, use msig.
 */
-class sig
+class Sig
 {
 private:
     bool manual_ = true;
@@ -21,32 +21,32 @@ private:
     /** Account that will generate the signature.
      *
      * If not provided, no signature will be added by this helper. See also
-     * Env::autofill_sig.
+     * Env::autofillSig.
      */
     std::optional<Account> account_;
     /// Used solely as a convenience placeholder for ctors that do _not_ specify
     /// a subfield.
-    static constexpr SField* const topLevel = nullptr;
+    static constexpr SField* const kTOP_LEVEL = nullptr;
 
 public:
-    explicit sig(autofill_t) : manual_(false)
+    explicit Sig(AutofillT) : manual_(false)
     {
     }
 
-    explicit sig(none_t)
+    explicit Sig(NoneT)
     {
     }
 
-    explicit sig(SField const* subField, Account const& account)
+    explicit Sig(SField const* subField, Account const& account)
         : subField_(subField), account_(account)
     {
     }
 
-    explicit sig(SField const& subField, Account const& account) : sig(&subField, account)
+    explicit Sig(SField const& subField, Account const& account) : Sig(&subField, account)
     {
     }
 
-    explicit sig(Account const& account) : sig(topLevel, account)
+    explicit Sig(Account const& account) : Sig(kTOP_LEVEL, account)
     {
     }
 
diff --git a/src/test/jtx/tag.h b/src/test/jtx/tag.h
index c11dff2550..9279e2a13b 100644
--- a/src/test/jtx/tag.h
+++ b/src/test/jtx/tag.h
@@ -5,13 +5,13 @@
 namespace xrpl::test::jtx {
 
 /** Set the destination tag on a JTx*/
-struct dtag
+struct Dtag
 {
 private:
     std::uint32_t value_;
 
 public:
-    explicit dtag(std::uint32_t value) : value_(value)
+    explicit Dtag(std::uint32_t value) : value_(value)
     {
     }
 
@@ -20,13 +20,13 @@ public:
 };
 
 /** Set the source tag on a JTx*/
-struct stag
+struct Stag
 {
 private:
     std::uint32_t value_;
 
 public:
-    explicit stag(std::uint32_t value) : value_(value)
+    explicit Stag(std::uint32_t value) : value_(value)
     {
     }
 
diff --git a/src/test/jtx/tags.h b/src/test/jtx/tags.h
index 9c7a21145d..66cf3b6ef7 100644
--- a/src/test/jtx/tags.h
+++ b/src/test/jtx/tags.h
@@ -2,30 +2,30 @@
 
 namespace xrpl::test::jtx {
 
-struct none_t
+struct NoneT
 {
-    none_t() = default;
+    NoneT() = default;
 };
-static none_t const none;
+static NoneT const kNONE;
 
-struct autofill_t
+struct AutofillT
 {
-    autofill_t() = default;
+    AutofillT() = default;
 };
-static autofill_t const autofill;
+static AutofillT const kAUTOFILL;
 
-struct disabled_t
+struct DisabledT
 {
-    disabled_t() = default;
+    DisabledT() = default;
 };
-static disabled_t const disabled;
+static DisabledT const kDISABLED;
 
-/** Used for fee() calls that use an owner reserve increment */
-struct increment_t
+/** Used for Fee() calls that use an owner reserve increment */
+struct IncrementT
 {
-    increment_t() = default;
+    IncrementT() = default;
 };
 
-static increment_t const increment;
+static IncrementT const kINCREMENT;
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/ter.h b/src/test/jtx/ter.h
index ab21bc8e2b..c410b46a1e 100644
--- a/src/test/jtx/ter.h
+++ b/src/test/jtx/ter.h
@@ -9,17 +9,17 @@ namespace xrpl::test::jtx {
 /** Set the expected result code for a JTx
     The test will fail if the code doesn't match.
 */
-class ter
+class Ter
 {
 private:
     std::optional<TER> v_;
 
 public:
-    explicit ter(decltype(std::ignore))
+    explicit Ter(decltype(std::ignore))
     {
     }
 
-    explicit ter(TER v) : v_(v)
+    explicit Ter(TER v) : v_(v)
     {
     }
 
diff --git a/src/test/jtx/ticket.h b/src/test/jtx/ticket.h
index 7ab3b9c1f9..02f742ee93 100644
--- a/src/test/jtx/ticket.h
+++ b/src/test/jtx/ticket.h
@@ -18,17 +18,17 @@ namespace xrpl::test::jtx {
 namespace ticket {
 
 /** Create one of more tickets */
-Json::Value
+json::Value
 create(Account const& account, std::uint32_t count);
 
 /** Set a ticket sequence on a JTx. */
-class use
+class Use
 {
 private:
     std::uint32_t ticketSeq_;
 
 public:
-    use(std::uint32_t ticketSeq) : ticketSeq_{ticketSeq}
+    Use(std::uint32_t ticketSeq) : ticketSeq_{ticketSeq}
     {
     }
 
@@ -39,6 +39,6 @@ public:
 }  // namespace ticket
 
 /** Match the number of tickets on the account. */
-using tickets = owner_count<ltTICKET>;
+using tickets = OwnerCount<ltTICKET>;
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/token.h b/src/test/jtx/token.h
index 28ccd7520b..206d170534 100644
--- a/src/test/jtx/token.h
+++ b/src/test/jtx/token.h
@@ -11,17 +11,17 @@
 namespace xrpl::test::jtx::token {
 
 /** Mint an NFToken. */
-Json::Value
+json::Value
 mint(jtx::Account const& account, std::uint32_t tokenTaxon = 0);
 
 /** Sets the optional TransferFee on an NFTokenMint. */
-class xferFee
+class XferFee
 {
 private:
     std::uint16_t xferFee_;
 
 public:
-    explicit xferFee(std::uint16_t fee) : xferFee_(fee)
+    explicit XferFee(std::uint16_t fee) : xferFee_(fee)
     {
     }
 
@@ -30,13 +30,13 @@ public:
 };
 
 /** Sets the optional Issuer on an NFTokenMint. */
-class issuer
+class Issuer
 {
 private:
     std::string issuer_;
 
 public:
-    explicit issuer(jtx::Account const& issue) : issuer_(issue.human())
+    explicit Issuer(jtx::Account const& issue) : issuer_(issue.human())
     {
     }
 
@@ -45,13 +45,13 @@ public:
 };
 
 /** Sets the optional URI on an NFTokenMint. */
-class uri
+class Uri
 {
 private:
     std::string uri_;
 
 public:
-    explicit uri(std::string const& u) : uri_(strHex(u))
+    explicit Uri(std::string const& u) : uri_(strHex(u))
     {
     }
 
@@ -60,13 +60,13 @@ public:
 };
 
 /** Sets the optional amount field on an NFTokenMint. */
-class amount
+class Amount
 {
 private:
     STAmount const amount_;
 
 public:
-    explicit amount(STAmount const amount) : amount_(amount)
+    explicit Amount(STAmount const amount) : amount_(amount)
     {
     }
 
@@ -94,21 +94,21 @@ getID(
     std::uint16_t xferFee = 0);
 
 /** Burn an NFToken. */
-Json::Value
+json::Value
 burn(jtx::Account const& account, uint256 const& nftokenID);
 
 /** Create an NFTokenOffer. */
-Json::Value
+json::Value
 createOffer(jtx::Account const& account, uint256 const& nftokenID, STAmount const& amount);
 
 /** Sets the optional Owner on an NFTokenOffer. */
-class owner
+class Owner
 {
 private:
     std::string owner_;
 
 public:
-    explicit owner(jtx::Account const& ownedBy) : owner_(ownedBy.human())
+    explicit Owner(jtx::Account const& ownedBy) : owner_(ownedBy.human())
     {
     }
 
@@ -117,13 +117,13 @@ public:
 };
 
 /** Sets the optional Expiration field on an NFTokenOffer. */
-class expiration
+class Expiration
 {
 private:
     std::uint32_t expires_;
 
 public:
-    explicit expiration(std::uint32_t const& expires) : expires_(expires)
+    explicit Expiration(std::uint32_t const& expires) : expires_(expires)
     {
     }
 
@@ -132,13 +132,13 @@ public:
 };
 
 /** Sets the optional Destination field on an NFTokenOffer. */
-class destination
+class Destination
 {
 private:
     std::string dest_;
 
 public:
-    explicit destination(jtx::Account const& dest) : dest_(dest.human())
+    explicit Destination(jtx::Account const& dest) : dest_(dest.human())
     {
     }
 
@@ -147,20 +147,20 @@ public:
 };
 
 /** Cancel NFTokenOffers. */
-Json::Value
+json::Value
 cancelOffer(jtx::Account const& account, std::initializer_list<uint256> const& nftokenOffers = {});
 
-Json::Value
+json::Value
 cancelOffer(jtx::Account const& account, std::vector<uint256> const& nftokenOffers);
 
 /** Sets the optional RootIndex field when canceling NFTokenOffers. */
-class rootIndex
+class RootIndex
 {
 private:
     std::string rootIndex_;
 
 public:
-    explicit rootIndex(uint256 const& index) : rootIndex_(to_string(index))
+    explicit RootIndex(uint256 const& index) : rootIndex_(to_string(index))
     {
     }
 
@@ -169,28 +169,28 @@ public:
 };
 
 /** Accept an NFToken buy offer. */
-Json::Value
+json::Value
 acceptBuyOffer(jtx::Account const& account, uint256 const& offerIndex);
 
 /** Accept an NFToken sell offer. */
-Json::Value
+json::Value
 acceptSellOffer(jtx::Account const& account, uint256 const& offerIndex);
 
 /** Broker two NFToken offers. */
-Json::Value
+json::Value
 brokerOffers(
     jtx::Account const& account,
     uint256 const& buyOfferIndex,
     uint256 const& sellOfferIndex);
 
 /** Sets the optional NFTokenBrokerFee field in a brokerOffer transaction. */
-class brokerFee
+class BrokerFee
 {
 private:
     STAmount const brokerFee_;
 
 public:
-    explicit brokerFee(STAmount const fee) : brokerFee_(fee)
+    explicit BrokerFee(STAmount const fee) : brokerFee_(fee)
     {
     }
 
@@ -199,15 +199,15 @@ public:
 };
 
 /** Set the authorized minter on an account root. */
-Json::Value
+json::Value
 setMinter(jtx::Account const& account, jtx::Account const& minter);
 
 /** Clear any authorized minter from an account root. */
-Json::Value
+json::Value
 clearMinter(jtx::Account const& account);
 
 /** Modify an NFToken. */
-Json::Value
+json::Value
 modify(jtx::Account const& account, uint256 const& nftokenID);
 
 }  // namespace xrpl::test::jtx::token
diff --git a/src/test/jtx/trust.h b/src/test/jtx/trust.h
index f6fb5b388f..07fd0f7c4e 100644
--- a/src/test/jtx/trust.h
+++ b/src/test/jtx/trust.h
@@ -8,14 +8,14 @@
 namespace xrpl::test::jtx {
 
 /** Modify a trust line. */
-Json::Value
+json::Value
 trust(Account const& account, STAmount const& amount, std::uint32_t flags = 0);
 
 /** Change flags on a trust line. */
-Json::Value
+json::Value
 trust(Account const& account, STAmount const& amount, Account const& peer, std::uint32_t flags);
 
-Json::Value
+json::Value
 claw(
     Account const& account,
     STAmount const& amount,
diff --git a/src/test/jtx/txflags.h b/src/test/jtx/txflags.h
index 838f7f5f30..975038d26a 100644
--- a/src/test/jtx/txflags.h
+++ b/src/test/jtx/txflags.h
@@ -5,13 +5,13 @@
 namespace xrpl::test::jtx {
 
 /** Set the flags on a JTx. */
-class txflags
+class Txflags
 {
 private:
     std::uint32_t v_;
 
 public:
-    explicit txflags(std::uint32_t v) : v_(v)
+    explicit Txflags(std::uint32_t v) : v_(v)
     {
     }
 
diff --git a/src/test/jtx/utility.h b/src/test/jtx/utility.h
index b00f5b433e..535e14cf1d 100644
--- a/src/test/jtx/utility.h
+++ b/src/test/jtx/utility.h
@@ -11,10 +11,10 @@
 namespace xrpl::test::jtx {
 
 /** Thrown when parse fails. */
-struct parse_error : std::logic_error
+struct ParseError : std::logic_error
 {
     template <class String>
-    explicit parse_error(String const& s) : logic_error(s)
+    explicit ParseError(String const& s) : logic_error(s)
     {
     }
 };
@@ -25,30 +25,30 @@ struct parse_error : std::logic_error
           this set of unit test routines.
 */
 STObject
-parse(Json::Value const& jv);
+parse(json::Value const& jv);
 
 /** Sign automatically into a specific Json field of the jv object.
     @note This only works on accounts with multi-signing off.
 */
 void
-sign(Json::Value& jv, Account const& account, Json::Value& sigObject);
+sign(json::Value& jv, Account const& account, json::Value& sigObject);
 
 /** Sign automatically.
     @note This only works on accounts with multi-signing off.
 */
 void
-sign(Json::Value& jv, Account const& account);
+sign(json::Value& jv, Account const& account);
 
 /** Set the fee automatically. */
 void
-fill_fee(Json::Value& jv, ReadView const& view);
+fillFee(json::Value& jv, ReadView const& view);
 
 /** Set the sequence number automatically. */
 void
-fill_seq(Json::Value& jv, ReadView const& view);
+fillSeq(json::Value& jv, ReadView const& view);
 
 /** Given an xrpld unit test rpc command, return the corresponding JSON. */
-Json::Value
+json::Value
 cmdToJSONRPC(std::vector<std::string> const& args, beast::Journal j, unsigned int apiVersion);
 
 }  // namespace xrpl::test::jtx
diff --git a/src/test/jtx/vault.h b/src/test/jtx/vault.h
index f8883630c4..c1e0831a66 100644
--- a/src/test/jtx/vault.h
+++ b/src/test/jtx/vault.h
@@ -28,7 +28,7 @@ struct Vault
     };
 
     /** Return a VaultCreate transaction and the Vault's expected keylet. */
-    [[nodiscard]] std::tuple<Json::Value, Keylet>
+    [[nodiscard]] std::tuple<json::Value, Keylet>
     create(CreateArgs const& args) const;
 
     struct SetArgs
@@ -37,7 +37,7 @@ struct Vault
         uint256 id;
     };
 
-    static Json::Value
+    static json::Value
     set(SetArgs const& args);
 
     struct DeleteArgs
@@ -46,7 +46,7 @@ struct Vault
         uint256 id;
     };
 
-    static Json::Value
+    static json::Value
     del(DeleteArgs const& args);
 
     struct DepositArgs
@@ -56,7 +56,7 @@ struct Vault
         STAmount amount;
     };
 
-    static Json::Value
+    static json::Value
     deposit(DepositArgs const& args);
 
     struct WithdrawArgs
@@ -66,7 +66,7 @@ struct Vault
         STAmount amount;
     };
 
-    static Json::Value
+    static json::Value
     withdraw(WithdrawArgs const& args);
 
     struct ClawbackArgs
@@ -77,7 +77,7 @@ struct Vault
         std::optional<STAmount> amount = std::nullopt;  // NOLINT(readability-redundant-member-init)
     };
 
-    static Json::Value
+    static json::Value
     clawback(ClawbackArgs const& args);
 };
 
diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h
index 7b5b3db0c4..d33b3bf4ac 100644
--- a/src/test/jtx/xchain_bridge.h
+++ b/src/test/jtx/xchain_bridge.h
@@ -10,86 +10,86 @@
 
 namespace xrpl::test::jtx {
 
-using JValueVec = std::vector<Json::Value>;
+using JValueVec = std::vector<json::Value>;
 
-constexpr std::size_t UT_XCHAIN_DEFAULT_NUM_SIGNERS = 5;
-constexpr std::size_t UT_XCHAIN_DEFAULT_QUORUM = 4;
+constexpr std::size_t kUT_XCHAIN_DEFAULT_NUM_SIGNERS = 5;
+constexpr std::size_t kUT_XCHAIN_DEFAULT_QUORUM = 4;
 
-Json::Value
+json::Value
 bridge(
     Account const& lockingChainDoor,
     Issue const& lockingChainIssue,
     Account const& issuingChainDoor,
     Issue const& issuingChainIssue);
 
-Json::Value
-bridge_create(
+json::Value
+bridgeCreate(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     STAmount const& reward,
     std::optional<STAmount> const& minAccountCreate = std::nullopt);
 
-Json::Value
-bridge_modify(
+json::Value
+bridgeModify(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::optional<STAmount> const& reward,
     std::optional<STAmount> const& minAccountCreate = std::nullopt);
 
-Json::Value
-xchain_create_claim_id(
+json::Value
+xchainCreateClaimId(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     STAmount const& reward,
     Account const& otherChainSource);
 
-Json::Value
-xchain_commit(
+json::Value
+xchainCommit(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::uint32_t claimID,
     AnyAmount const& amt,
     std::optional<Account> const& dst = std::nullopt);
 
-Json::Value
-xchain_claim(
+json::Value
+xchainClaim(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     std::uint32_t claimID,
     AnyAmount const& amt,
     Account const& dst);
 
-Json::Value
-sidechain_xchain_account_create(
+json::Value
+sidechainXchainAccountCreate(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     Account const& dst,
     AnyAmount const& amt,
     AnyAmount const& xChainFee);
 
-Json::Value
-sidechain_xchain_account_claim(
+json::Value
+sidechainXchainAccountClaim(
     Account const& acc,
-    Json::Value const& bridge,
+    json::Value const& bridge,
     Account const& dst,
     AnyAmount const& amt);
 
-Json::Value
-claim_attestation(
+json::Value
+claimAttestation(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::Account const& rewardAccount,
     bool wasLockingChainSend,
     std::uint64_t claimID,
     std::optional<jtx::Account> const& dst,
-    jtx::signer const& signer);
+    jtx::Signer const& signer);
 
-Json::Value
-create_account_attestation(
+json::Value
+createAccountAttestation(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::AnyAmount const& rewardAmount,
@@ -97,26 +97,26 @@ create_account_attestation(
     bool wasLockingChainSend,
     std::uint64_t createCount,
     jtx::Account const& dst,
-    jtx::signer const& signer);
+    jtx::Signer const& signer);
 
 JValueVec
-claim_attestations(
+claimAttestations(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     std::vector<jtx::Account> const& rewardAccounts,
     bool wasLockingChainSend,
     std::uint64_t claimID,
     std::optional<jtx::Account> const& dst,
-    std::vector<jtx::signer> const& signers,
-    std::size_t const numAtts = UT_XCHAIN_DEFAULT_QUORUM,
+    std::vector<jtx::Signer> const& signers,
+    std::size_t const numAtts = kUT_XCHAIN_DEFAULT_QUORUM,
     std::size_t const fromIdx = 0);
 
 JValueVec
-create_account_attestations(
+createAccountAttestations(
     jtx::Account const& submittingAccount,
-    Json::Value const& jvBridge,
+    json::Value const& jvBridge,
     jtx::Account const& sendingAccount,
     jtx::AnyAmount const& sendingAmount,
     jtx::AnyAmount const& rewardAmount,
@@ -124,8 +124,8 @@ create_account_attestations(
     bool wasLockingChainSend,
     std::uint64_t createCount,
     jtx::Account const& dst,
-    std::vector<jtx::signer> const& signers,
-    std::size_t const numAtts = UT_XCHAIN_DEFAULT_QUORUM,
+    std::vector<jtx::Signer> const& signers,
+    std::size_t const numAtts = kUT_XCHAIN_DEFAULT_QUORUM,
     std::size_t const fromIdx = 0);
 
 struct XChainBridgeObjects
@@ -159,16 +159,16 @@ struct XChainBridgeObjects
     IOU const mcUSD;
     IOU const scUSD;
 
-    Json::Value const jvXRPBridgeRPC;
-    Json::Value jvb;   // standard xrp bridge def for tx
-    Json::Value jvub;  // standard xrp bridge def for tx, unfunded accounts
+    json::Value const jvXRPBridgeRPC;
+    json::Value jvb;   // standard xrp bridge def for tx
+    json::Value jvub;  // standard xrp bridge def for tx, unfunded accounts
 
     FeatureBitset const features;
-    std::vector<signer> const signers;
-    std::vector<signer> const alt_signers;
+    std::vector<Signer> const signers;
+    std::vector<Signer> const alt_signers;
     std::vector<Account> const payee;
     std::vector<Account> const payees;
-    std::uint32_t const quorum{UT_XCHAIN_DEFAULT_QUORUM};
+    std::uint32_t const quorum{kUT_XCHAIN_DEFAULT_QUORUM};
 
     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 drop_per_xrp = 1000000;
+    static constexpr int kDROP_PER_XRP = 1000000;
 
     XChainBridgeObjects();
 
@@ -195,14 +195,14 @@ struct XChainBridgeObjects
     createBridgeObjects(Env& mcEnv, Env& scEnv);
 
     JValueVec
-    att_create_acct_vec(
+    attCreateAcctVec(
         std::uint64_t createCount,
         jtx::AnyAmount const& amt,
         jtx::Account const& dst,
         std::size_t const numAtts,
         std::size_t const fromIdx = 0)
     {
-        return create_account_attestations(
+        return createAccountAttestations(
             scAttester,
             jvb,
             mcCarol,
@@ -217,15 +217,15 @@ struct XChainBridgeObjects
             fromIdx);
     }
 
-    [[nodiscard]] Json::Value
-    create_bridge(
+    [[nodiscard]] json::Value
+    createBridge(
         Account const& acc,
-        Json::Value const& bridge = Json::nullValue,
-        STAmount const& _reward = XRP(1),
+        json::Value const& bridge = json::NullValue,
+        STAmount const& reward = XRP(1),
         std::optional<STAmount> const& minAccountCreate = std::nullopt) const
     {
-        return bridge_create(
-            acc, bridge == Json::nullValue ? jvb : bridge, _reward, minAccountCreate);
+        return bridgeCreate(
+            acc, bridge == json::NullValue ? jvb : bridge, reward, minAccountCreate);
     }
 };
 
diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp
index efd1688c6f..4fe2c8b8ab 100644
--- a/src/test/ledger/BookDirs_test.cpp
+++ b/src/test/ledger/BookDirs_test.cpp
@@ -17,20 +17,20 @@
 
 namespace xrpl::test {
 
-struct BookDirs_test : public beast::unit_test::suite
+struct BookDirs_test : public beast::unit_test::Suite
 {
     void
-    test_bookdir(FeatureBitset features)
+    testBookdir(FeatureBitset features)
     {
         using namespace jtx;
         Env env(*this, features);
         auto gw = Account("gw");
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
         env.fund(XRP(1000000), "alice", "bob", "gw");
         env.close();
 
         {
-            Book const book(xrpIssue(), USD, std::nullopt);
+            Book const book(xrpIssue(), usd, std::nullopt);
             {
                 auto d = BookDirs(*env.current(), book);
                 BEAST_EXPECT(std::begin(d) == std::end(d));
@@ -58,25 +58,25 @@ struct BookDirs_test : public beast::unit_test::suite
         {
             env.trust(Account("bob")["CNY"](10), "alice");
             env(pay("bob", "alice", Account("bob")["CNY"](10)));
-            env(offer("alice", USD(50), Account("bob")["CNY"](10)));
-            auto d = BookDirs(*env.current(), Book(USD, Account("bob")["CNY"], std::nullopt));
+            env(offer("alice", usd(50), Account("bob")["CNY"](10)));
+            auto d = BookDirs(*env.current(), Book(usd, Account("bob")["CNY"], std::nullopt));
             BEAST_EXPECT(std::distance(d.begin(), d.end()) == 1);
         }
 
         {
-            auto AUD = gw["AUD"];
+            auto aud = gw["AUD"];
             for (auto i = 1, j = 3; i <= 3; ++i, --j)
             {
                 for (auto k = 0; k < 80; ++k)
-                    env(offer("alice", AUD(i), XRP(j)));
+                    env(offer("alice", aud(i), XRP(j)));
             }
 
-            auto d = BookDirs(*env.current(), Book(AUD, xrpIssue(), std::nullopt));
+            auto d = BookDirs(*env.current(), Book(aud, xrpIssue(), std::nullopt));
             BEAST_EXPECT(std::distance(d.begin(), d.end()) == 240);
             auto i = 1, j = 3, k = 0;
             for (auto const& e : d)
             {
-                BEAST_EXPECT(e->getFieldAmount(sfTakerPays) == AUD(i));
+                BEAST_EXPECT(e->getFieldAmount(sfTakerPays) == aud(i));
                 BEAST_EXPECT(e->getFieldAmount(sfTakerGets) == XRP(j));
                 if (++k % 80 == 0)
                 {
@@ -91,9 +91,9 @@ struct BookDirs_test : public beast::unit_test::suite
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
-        test_bookdir(sa - featurePermissionedDEX);
-        test_bookdir(sa);
+        auto const sa = testableAmendments();
+        testBookdir(sa - featurePermissionedDEX);
+        testBookdir(sa);
     }
 };
 
diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp
index f14ce2f0d7..4f3c94f695 100644
--- a/src/test/ledger/Directory_test.cpp
+++ b/src/test/ledger/Directory_test.cpp
@@ -46,7 +46,7 @@
 
 namespace xrpl::test {
 
-struct Directory_test : public beast::unit_test::suite
+struct Directory_test : public beast::unit_test::Suite
 {
     // Map [0-15576] into a unique 3 letter currency code
     std::string
@@ -105,7 +105,7 @@ struct Directory_test : public beast::unit_test::suite
         using namespace jtx;
 
         auto gw = Account("gw");
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
         auto alice = Account("alice");
         auto bob = Account("bob");
 
@@ -116,7 +116,7 @@ struct Directory_test : public beast::unit_test::suite
 
         std::uint32_t const firstOfferSeq{env.seq(alice)};
         for (std::size_t i = 1; i <= 400; ++i)
-            env(offer(alice, USD(i), XRP(i)));
+            env(offer(alice, usd(i), XRP(i)));
         env.close();
 
         // Check Alice's directory: it should contain one
@@ -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 * dirNodeMaxEntries);
-                std::uint32_t const maxSeq = minSeq + dirNodeMaxEntries;
+                std::uint32_t const minSeq = firstOfferSeq + (page * kDIR_NODE_MAX_ENTRIES);
+                std::uint32_t const maxSeq = minSeq + kDIR_NODE_MAX_ENTRIES;
 
                 for (auto const& e : v)
                 {
@@ -154,13 +154,13 @@ struct Directory_test : public beast::unit_test::suite
 
         // Now check the orderbook: it should be in the order we placed
         // the offers.
-        auto book = BookDirs(*env.current(), Book({xrpIssue(), USD, std::nullopt}));
+        auto book = BookDirs(*env.current(), Book({xrpIssue(), usd, std::nullopt}));
         int count = 1;
 
         for (auto const& offer : book)
         {
             count++;
-            BEAST_EXPECT(offer->getFieldAmount(sfTakerPays) == USD(count));
+            BEAST_EXPECT(offer->getFieldAmount(sfTakerPays) == usd(count));
             BEAST_EXPECT(offer->getFieldAmount(sfTakerGets) == XRP(count));
         }
     }
@@ -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::none));
+        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 * dirNodeMaxEntries) + 3);
+            c.reserve((2 * kDIR_NODE_MAX_ENTRIES) + 3);
 
             while (c.size() != c.capacity())
                 c.push_back(gw[currcode(c.size())]);
@@ -217,7 +217,7 @@ struct Directory_test : public beast::unit_test::suite
 
             BEAST_EXPECT(!dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
 
-            std::shuffle(cl.begin(), cl.end(), default_prng());
+            std::shuffle(cl.begin(), cl.end(), defaultPrng());
 
             for (auto const& c : cl)
             {
@@ -250,7 +250,7 @@ struct Directory_test : public beast::unit_test::suite
             // Now fill the offers in a random order. Offer
             // entries will drop, and be replaced by trust
             // lines that are implicitly created.
-            std::shuffle(cl.begin(), cl.end(), default_prng());
+            std::shuffle(cl.begin(), cl.end(), defaultPrng());
 
             for (auto const& c : cl)
             {
@@ -261,7 +261,7 @@ struct Directory_test : public beast::unit_test::suite
             // Finally, Alice now sends the funds back to
             // Charlie. The implicitly created trust lines
             // should drop away:
-            std::shuffle(cl.begin(), cl.end(), default_prng());
+            std::shuffle(cl.begin(), cl.end(), defaultPrng());
 
             for (auto const& c : cl)
             {
@@ -283,29 +283,29 @@ struct Directory_test : public beast::unit_test::suite
 
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice, gw);
         env.close();
-        env.trust(USD(1000), alice);
-        env(pay(gw, alice, USD(1000)));
+        env.trust(usd(1000), alice);
+        env(pay(gw, alice, usd(1000)));
 
         auto const firstOfferSeq = env.seq(alice);
 
         // Fill up three pages of offers
         for (int i = 0; i < 3; ++i)
         {
-            for (int j = 0; j < dirNodeMaxEntries; ++j)
-                env(offer(alice, XRP(1), USD(1)));
+            for (int j = 0; j < kDIR_NODE_MAX_ENTRIES; ++j)
+                env(offer(alice, XRP(1), usd(1)));
         }
         env.close();
 
         // remove all the offers. Remove the middle page last
         for (auto page : {0, 2, 1})
         {
-            for (int i = 0; i < dirNodeMaxEntries; ++i)
+            for (int i = 0; i < kDIR_NODE_MAX_ENTRIES; ++i)
             {
-                env(offer_cancel(alice, firstOfferSeq + (page * dirNodeMaxEntries) + i));
+                env(offerCancel(alice, firstOfferSeq + (page * kDIR_NODE_MAX_ENTRIES) + i));
                 env.close();
             }
         }
@@ -313,8 +313,8 @@ struct Directory_test : public beast::unit_test::suite
         // All the offers have been cancelled, so the book
         // should have no entries and be empty:
         {
-            Sandbox const sb(env.closed().get(), tapNONE);
-            uint256 const bookBase = getBookBase({xrpIssue(), USD, std::nullopt});
+            Sandbox const sb(env.closed().get(), TapNone);
+            uint256 const bookBase = getBookBase({xrpIssue(), usd, std::nullopt});
 
             BEAST_EXPECT(dirIsEmpty(sb, keylet::page(bookBase)));
             BEAST_EXPECT(!sb.succ(bookBase, getQualityNext(bookBase)));
@@ -324,7 +324,7 @@ struct Directory_test : public beast::unit_test::suite
         // and removes her trust line. Her owner directory
         // should now be empty:
         {
-            env.trust(USD(0), alice);
+            env.trust(usd(0), alice);
             env(pay(alice, gw, alice["USD"](1000)));
             env.close();
             BEAST_EXPECT(dirIsEmpty(*env.closed(), keylet::ownerDir(alice)));
@@ -341,59 +341,59 @@ struct Directory_test : public beast::unit_test::suite
 
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(10000), alice);
         env.close();
 
-        constexpr uint256 base("fb71c9aa3310141da4b01d6c744a98286af2d72ab5448d5adc0910ca0c910880");
+        constexpr uint256 kBASE("fb71c9aa3310141da4b01d6c744a98286af2d72ab5448d5adc0910ca0c910880");
 
-        constexpr uint256 item("bad0f021aa3b2f6754a8fe82a5779730aa0bbbab82f17201ef24900efc2c7312");
+        constexpr uint256 kITEM("bad0f021aa3b2f6754a8fe82a5779730aa0bbbab82f17201ef24900efc2c7312");
 
         {
             // Create a chain of three pages:
-            Sandbox sb(env.closed().get(), tapNONE);
-            makePages(sb, base, 3);
+            Sandbox sb(env.closed().get(), TapNone);
+            makePages(sb, kBASE, 3);
 
             // Insert an item in the middle page:
             {
-                auto p = sb.peek(keylet::page(base, 1));
+                auto p = sb.peek(keylet::page(kBASE, 1));
                 BEAST_EXPECT(p);
 
                 STVector256 v;
-                v.push_back(item);
+                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(base, 0), 1, keylet::unchecked(item), false));
-            BEAST_EXPECT(!sb.peek(keylet::page(base, 2)));
-            BEAST_EXPECT(!sb.peek(keylet::page(base, 1)));
-            BEAST_EXPECT(!sb.peek(keylet::page(base, 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, base, 4);
+            Sandbox sb(env.closed().get(), TapNone);
+            makePages(sb, kBASE, 4);
 
             // Now add items on pages 1 and 2:
             {
-                auto p1 = sb.peek(keylet::page(base, 1));
+                auto p1 = sb.peek(keylet::page(kBASE, 1));
                 BEAST_EXPECT(p1);
 
                 STVector256 v1;
-                v1.push_back(~item);
+                v1.pushBack(~kITEM);
                 p1->setFieldV256(sfIndexes, v1);
                 sb.update(p1);
 
-                auto p2 = sb.peek(keylet::page(base, 2));
+                auto p2 = sb.peek(keylet::page(kBASE, 2));
                 BEAST_EXPECT(p2);
 
                 STVector256 v2;
-                v2.push_back(item);
+                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(base, 0), 2, keylet::unchecked(item), false));
-            BEAST_EXPECT(!sb.peek(keylet::page(base, 3)));
-            BEAST_EXPECT(!sb.peek(keylet::page(base, 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(base, 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(base, 0));
+            auto p0 = sb.peek(keylet::page(kBASE, 0));
             BEAST_EXPECT(p0);
             BEAST_EXPECT(p0->getFieldU64(sfIndexNext) == 1);
             BEAST_EXPECT(p0->getFieldU64(sfIndexPrevious) == 1);
@@ -425,10 +425,10 @@ struct Directory_test : public beast::unit_test::suite
 
         auto const gw = Account{"gateway"};
         auto const alice = Account{"alice"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto ledger_data = [this](Env& env) {
-            Json::Value params;
+        auto ledgerData = [this](Env& env) {
+            json::Value params;
             params[jss::type] = jss::directory;
             params[jss::ledger_index] = "validated";
             auto const result = env.rpc("json", "ledger_data", to_string(params))[jss::result];
@@ -437,15 +437,15 @@ struct Directory_test : public beast::unit_test::suite
         };
 
         // fixPreviousTxnID is disabled.
-        Env env(*this, testable_amendments() - fixPreviousTxnID);
+        Env env(*this, testableAmendments() - fixPreviousTxnID);
         env.fund(XRP(10000), alice, gw);
         env.close();
-        env.trust(USD(1000), alice);
-        env(pay(gw, alice, USD(1000)));
+        env.trust(usd(1000), alice);
+        env(pay(gw, alice, usd(1000)));
         env.close();
 
         {
-            auto const jrr = ledger_data(env);
+            auto const jrr = ledgerData(env);
             auto const& jstate = jrr[jss::state];
             BEAST_EXPECTS(checkArraySize(jstate, 2), jrr.toStyledString());
             for (auto const& directory : jstate)
@@ -464,7 +464,7 @@ struct Directory_test : public beast::unit_test::suite
 
         // Make sure the `PreviousTxnID` and `PreviousTxnLgrSeq` fields now
         // exist
-        env(offer(alice, XRP(1), USD(1)));
+        env(offer(alice, XRP(1), usd(1)));
         auto const txID = to_string(env.tx()->getTransactionID());
         auto const ledgerSeq = env.current()->header().seq;
         env.close();
@@ -473,7 +473,7 @@ struct Directory_test : public beast::unit_test::suite
         env.close();
 
         {
-            auto const jrr = ledger_data(env);
+            auto const jrr = ledgerData(env);
             auto const& jstate = jrr[jss::state];
             BEAST_EXPECTS(checkArraySize(jstate, 3), jrr.toStyledString());
             for (auto const& directory : jstate)
@@ -547,7 +547,7 @@ struct Directory_test : public beast::unit_test::suite
             env(credentials::create(alice, alice, std::to_string(63)));
 
             // Not enough space for another object if full
-            auto const expected = full ? ter{tecDIR_FULL} : ter{tesSUCCESS};
+            auto const expected = full ? Ter{tecDIR_FULL} : Ter{tesSUCCESS};
             env(credentials::create(alice, alice, "foo"), expected);
 
             // Destroy all objects in directory
@@ -566,19 +566,19 @@ struct Directory_test : public beast::unit_test::suite
         };
 
         testCase(
-            testable_amendments() - fixDirectoryLimit,
+            testableAmendments() - fixDirectoryLimit,
             [this](Env&) -> std::tuple<std::uint64_t, bool> {
                 testcase("directory full without fixDirectoryLimit");
-                return {dirNodeMaxPages - 1, true};
+                return {kDIR_NODE_MAX_PAGES - 1, true};
             });
         testCase(
-            testable_amendments(),  //
+            testableAmendments(),  //
             [this](Env&) -> std::tuple<std::uint64_t, bool> {
                 testcase("directory not full with fixDirectoryLimit");
-                return {dirNodeMaxPages - 1, false};
+                return {kDIR_NODE_MAX_PAGES - 1, false};
             });
         testCase(
-            testable_amendments(),  //
+            testableAmendments(),  //
             [this](Env&) -> std::tuple<std::uint64_t, bool> {
                 testcase("directory full with fixDirectoryLimit");
                 return {std::numeric_limits<std::uint64_t>::max(), true};
diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp
index a756eb312f..a100b4a51d 100644
--- a/src/test/ledger/PaymentSandbox_test.cpp
+++ b/src/test/ledger/PaymentSandbox_test.cpp
@@ -30,7 +30,7 @@
 
 namespace xrpl::test {
 
-class PaymentSandbox_test : public beast::unit_test::suite
+class PaymentSandbox_test : public beast::unit_test::Suite
 {
     /*
       Create paths so one path funds another path.
@@ -71,28 +71,28 @@ class PaymentSandbox_test : public beast::unit_test::suite
 
         env.fund(XRP(10000), snd, rcv, gw1, gw2);
 
-        auto const USD_gw1 = gw1["USD"];
-        auto const USD_gw2 = gw2["USD"];
+        auto const usdGw1 = gw1["USD"];
+        auto const usdGw2 = gw2["USD"];
 
-        env.trust(USD_gw1(10), snd);
-        env.trust(USD_gw2(10), snd);
-        env.trust(USD_gw1(100), rcv);
-        env.trust(USD_gw2(100), rcv);
+        env.trust(usdGw1(10), snd);
+        env.trust(usdGw2(10), snd);
+        env.trust(usdGw1(100), rcv);
+        env.trust(usdGw2(100), rcv);
 
-        env(pay(gw1, snd, USD_gw1(2)));
-        env(pay(gw2, snd, USD_gw2(4)));
+        env(pay(gw1, snd, usdGw1(2)));
+        env(pay(gw2, snd, usdGw2(4)));
 
-        env(offer(snd, USD_gw1(2), USD_gw2(2)), txflags(tfPassive));
-        env(offer(snd, USD_gw2(2), USD_gw1(2)), txflags(tfPassive));
+        env(offer(snd, usdGw1(2), usdGw2(2)), Txflags(tfPassive));
+        env(offer(snd, usdGw2(2), usdGw1(2)), Txflags(tfPassive));
 
-        PathSet const paths(Path(gw1, USD_gw2, gw2), Path(gw2, USD_gw1, gw1));
+        PathSet const paths(TestPath(gw1, usdGw2, gw2), TestPath(gw2, usdGw1, gw1));
 
-        env(pay(snd, rcv, any(USD_gw1(4))),
-            json(paths.json()),
-            txflags(tfNoRippleDirect | tfPartialPayment));
+        env(pay(snd, rcv, kANY(usdGw1(4))),
+            Json(paths.json()),
+            Txflags(tfNoRippleDirect | tfPartialPayment));
 
-        env.require(balance("rcv", USD_gw1(0)));
-        env.require(balance("rcv", USD_gw2(2)));
+        env.require(Balance("rcv", usdGw1(0)));
+        env.require(Balance("rcv", usdGw2(2)));
     }
 
     void
@@ -110,31 +110,31 @@ class PaymentSandbox_test : public beast::unit_test::suite
 
         auto j = env.app().getJournal("View");
 
-        auto const USD_gw1 = gw1["USD"];
-        auto const USD_gw2 = gw2["USD"];
+        auto const usdGw1 = gw1["USD"];
+        auto const usdGw2 = gw2["USD"];
 
-        env.trust(USD_gw1(100), alice);
-        env.trust(USD_gw2(100), alice);
+        env.trust(usdGw1(100), alice);
+        env.trust(usdGw2(100), alice);
 
-        env(pay(gw1, alice, USD_gw1(50)));
-        env(pay(gw2, alice, USD_gw2(50)));
+        env(pay(gw1, alice, usdGw1(50)));
+        env(pay(gw2, alice, usdGw2(50)));
 
-        STAmount const toCredit(USD_gw1(30));
-        STAmount const toDebit(USD_gw1(20));
+        STAmount const toCredit(usdGw1(30));
+        STAmount const toDebit(usdGw1(20));
         {
             // accountSend, no deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
             {
                 auto r = accountSend(av, gw1, alice, toCredit, j);
                 BEAST_EXPECT(isTesSuccess(r));
             }
             BEAST_EXPECT(
                 accountHolds(
-                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount + toCredit);
             {
                 auto r = accountSend(av, alice, gw1, toDebit, j);
@@ -142,39 +142,39 @@ class PaymentSandbox_test : public beast::unit_test::suite
             }
             BEAST_EXPECT(
                 accountHolds(
-                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount + toCredit - toDebit);
         }
 
         {
             // directSendNoFee, no deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             directSendNoFee(av, gw1, alice, toCredit, true, j);
             BEAST_EXPECT(
                 accountHolds(
-                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount + toCredit);
 
             directSendNoFee(av, alice, gw1, toDebit, true, j);
             BEAST_EXPECT(
                 accountHolds(
-                    av, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    av, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount + toCredit - toDebit);
         }
 
         {
             // accountSend, w/ deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             PaymentSandbox pv(&av);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             {
                 auto r = accountSend(pv, gw1, alice, toCredit, j);
@@ -182,7 +182,7 @@ class PaymentSandbox_test : public beast::unit_test::suite
             }
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount);
 
             {
@@ -191,66 +191,66 @@ class PaymentSandbox_test : public beast::unit_test::suite
             }
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount - toDebit);
         }
 
         {
             // directSendNoFee, w/ deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             PaymentSandbox pv(&av);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             directSendNoFee(pv, gw1, alice, toCredit, true, j);
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount);
         }
 
         {
             // redeemIOU, w/ deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             PaymentSandbox pv(&av);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             BEAST_EXPECT(redeemIOU(pv, alice, toDebit, iss, j) == tesSUCCESS);
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount - toDebit);
         }
 
         {
             // issueIOU, w/ deferredCredits
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             PaymentSandbox pv(&av);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             BEAST_EXPECT(issueIOU(pv, alice, toCredit, iss, j) == tesSUCCESS);
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount);
         }
 
         {
             // accountSend, w/ deferredCredits and stacked views
-            ApplyViewImpl av(&*env.current(), tapNONE);
+            ApplyViewImpl av(&*env.current(), TapNone);
             PaymentSandbox pv(&av);
 
-            auto const iss = USD_gw1;
-            auto const startingAmount = accountHolds(
-                pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j);
+            auto const iss = usdGw1;
+            auto const startingAmount =
+                accountHolds(pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j);
 
             {
                 auto r = accountSend(pv, gw1, alice, toCredit, j);
@@ -258,31 +258,23 @@ class PaymentSandbox_test : public beast::unit_test::suite
             }
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount);
 
             {
                 PaymentSandbox pv2(&pv);
                 BEAST_EXPECT(
                     accountHolds(
-                        pv2,
-                        alice,
-                        iss.currency,
-                        iss.account,
-                        FreezeHandling::fhIGNORE_FREEZE,
-                        j) == startingAmount);
+                        pv2, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
+                    startingAmount);
                 {
                     auto r = accountSend(pv2, gw1, alice, toCredit, j);
                     BEAST_EXPECT(isTesSuccess(r));
                 }
                 BEAST_EXPECT(
                     accountHolds(
-                        pv2,
-                        alice,
-                        iss.currency,
-                        iss.account,
-                        FreezeHandling::fhIGNORE_FREEZE,
-                        j) == startingAmount);
+                        pv2, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
+                    startingAmount);
             }
 
             {
@@ -291,7 +283,7 @@ class PaymentSandbox_test : public beast::unit_test::suite
             }
             BEAST_EXPECT(
                 accountHolds(
-                    pv, alice, iss.currency, iss.account, FreezeHandling::fhIGNORE_FREEZE, j) ==
+                    pv, alice, iss.currency, iss.account, FreezeHandling::IgnoreFreeze, j) ==
                 startingAmount - toDebit);
         }
     }
@@ -311,15 +303,15 @@ class PaymentSandbox_test : public beast::unit_test::suite
 
         Account const gw("gw");
         Account const alice("alice");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        auto const issue = USD;
+        auto const issue = usd;
         STAmount const tinyAmt(
-            issue, STAmount::cMinValue, STAmount::cMinOffset + 1, false, STAmount::unchecked{});
+            issue, STAmount::kMIN_VALUE, STAmount::kMIN_OFFSET + 1, false, STAmount::Unchecked{});
         STAmount const hugeAmt(
-            issue, STAmount::cMaxValue, STAmount::cMaxOffset - 1, false, STAmount::unchecked{});
+            issue, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET - 1, false, STAmount::Unchecked{});
 
-        ApplyViewImpl av(&*env.current(), tapNONE);
+        ApplyViewImpl av(&*env.current(), TapNone);
         PaymentSandbox pv(&av);
         pv.creditHookIOU(gw, alice, hugeAmt, -tinyAmt);
         BEAST_EXPECT(pv.balanceHookIOU(alice, gw, hugeAmt) == tinyAmt);
@@ -334,7 +326,7 @@ class PaymentSandbox_test : public beast::unit_test::suite
         auto accountFundsXRP =
             [](ReadView const& view, AccountID const& id, beast::Journal j) -> XRPAmount {
             return toAmount<XRPAmount>(accountHolds(
-                view, id, xrpCurrency(), xrpAccount(), FreezeHandling::fhZERO_IF_FROZEN, j));
+                view, id, xrpCurrency(), xrpAccount(), FreezeHandling::ZeroIfFrozen, j));
         };
 
         auto reserve = [](jtx::Env& env, std::uint32_t count) -> XRPAmount {
@@ -347,7 +339,7 @@ class PaymentSandbox_test : public beast::unit_test::suite
         env.fund(reserve(env, 1), alice);
 
         env.close();
-        ApplyViewImpl av(&*env.current(), tapNONE);
+        ApplyViewImpl av(&*env.current(), TapNone);
         PaymentSandbox sb(&av);
         {
             // Send alice an amount and spend it. The deferredCredits will cause
@@ -362,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::zero);
+            BEAST_EXPECT(accountFundsXRP(sb, alice, env.journal) == beast::kZERO);
         }
     }
 
@@ -377,25 +369,24 @@ class PaymentSandbox_test : public beast::unit_test::suite
         Env const env(*this, features);
 
         Account const gw("gw");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         Account const alice("alice");
 
-        ApplyViewImpl av(&*env.current(), tapNONE);
+        ApplyViewImpl av(&*env.current(), TapNone);
         PaymentSandbox sb(&av);
 
         // The currency we pass for the last argument mimics the currency that
         // is typically passed to creditHookIOU, since it comes from a trust
         // line.
         Issue tlIssue = noIssue();
-        tlIssue.currency = USD.currency;
+        tlIssue.currency = usd.currency;
 
-        sb.creditHookIOU(gw.id(), alice.id(), {USD, 400}, {tlIssue, 600});
-        sb.creditHookIOU(gw.id(), alice.id(), {USD, 100}, {tlIssue, 600});
+        sb.creditHookIOU(gw.id(), alice.id(), {usd, 400}, {tlIssue, 600});
+        sb.creditHookIOU(gw.id(), alice.id(), {usd, 100}, {tlIssue, 600});
 
-        // Expect that the STAmount issuer returned by balanceHookIOU() is
-        // correct.
-        STAmount const balance = sb.balanceHookIOU(gw.id(), alice.id(), {USD, 600});
-        BEAST_EXPECT(balance.getIssuer() == USD.account.id());
+        // Expect that the STAmount issuer returned by balanceHookIOU() is correct.
+        STAmount const balance = sb.balanceHookIOU(gw.id(), alice.id(), {usd, 600});
+        BEAST_EXPECT(balance.getIssuer() == usd.account.id());
     }
 
 public:
@@ -410,7 +401,7 @@ public:
             testBalanceHook(features);
         };
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         testAll(sa - featurePermissionedDEX);
         testAll(sa);
     }
diff --git a/src/test/ledger/PendingSaves_test.cpp b/src/test/ledger/PendingSaves_test.cpp
index deca50c9be..59a6c47615 100644
--- a/src/test/ledger/PendingSaves_test.cpp
+++ b/src/test/ledger/PendingSaves_test.cpp
@@ -3,7 +3,7 @@
 
 namespace xrpl::test {
 
-struct PendingSaves_test : public beast::unit_test::suite
+struct PendingSaves_test : public beast::unit_test::Suite
 {
     void
     testSaves()
diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp
index 33f6f505f1..dd4ebd27fd 100644
--- a/src/test/ledger/SkipList_test.cpp
+++ b/src/test/ledger/SkipList_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl::test {
 
-class SkipList_test : public beast::unit_test::suite
+class SkipList_test : public beast::unit_test::Suite
 {
     void
     testSkipList()
@@ -23,7 +23,7 @@ class SkipList_test : public beast::unit_test::suite
         {
             Config const config;
             auto prev = std::make_shared<Ledger>(
-                create_genesis,
+                kCREATE_GENESIS,
                 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 e0d757c0d3..2cf6517c8a 100644
--- a/src/test/ledger/View_test.cpp
+++ b/src/test/ledger/View_test.cpp
@@ -51,7 +51,7 @@
 
 namespace xrpl::test {
 
-class View_test : public beast::unit_test::suite
+class View_test : public beast::unit_test::Suite
 {
     // Convert a small integer to a key
     static Keylet
@@ -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>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -189,7 +189,7 @@ class View_test : public beast::unit_test::suite
         Env env(*this);
         wipe(env.app().getOpenLedger());
         auto const open = env.current();
-        ApplyViewImpl v(&*open, tapNONE);
+        ApplyViewImpl v(&*open, TapNone);
         succ(v, 0, std::nullopt);
         v.insert(sle(1));
         BEAST_EXPECT(v.exists(k(1)));
@@ -222,7 +222,7 @@ class View_test : public beast::unit_test::suite
         Env env(*this);
         wipe(env.app().getOpenLedger());
         auto const open = env.current();
-        ApplyViewImpl v0(&*open, tapNONE);
+        ApplyViewImpl v0(&*open, TapNone);
         v0.insert(sle(1));
         v0.insert(sle(2));
         v0.insert(sle(4));
@@ -288,7 +288,7 @@ class View_test : public beast::unit_test::suite
         Env env(*this);
         wipe(env.app().getOpenLedger());
         auto const open = env.current();
-        ApplyViewImpl v0(&*open, tapNONE);
+        ApplyViewImpl v0(&*open, TapNone);
         v0.rawInsert(sle(1, 1));
         v0.rawInsert(sle(2, 2));
         v0.rawInsert(sle(4, 4));
@@ -368,22 +368,22 @@ class View_test : public beast::unit_test::suite
                 BEAST_EXPECT(v1.seq() == v0.seq());
                 BEAST_EXPECT(v1.parentCloseTime() == v1.parentCloseTime());
 
-                ApplyViewImpl v2(&v1, tapRETRY);
+                ApplyViewImpl v2(&v1, TapRetry);
                 BEAST_EXPECT(v2.parentCloseTime() == v1.parentCloseTime());
                 BEAST_EXPECT(v2.seq() == v1.seq());
-                BEAST_EXPECT(v2.flags() == tapRETRY);
+                BEAST_EXPECT(v2.flags() == TapRetry);
 
                 Sandbox const v3(&v2);
                 BEAST_EXPECT(v3.seq() == v2.seq());
                 BEAST_EXPECT(v3.parentCloseTime() == v2.parentCloseTime());
-                BEAST_EXPECT(v3.flags() == tapRETRY);
+                BEAST_EXPECT(v3.flags() == TapRetry);
             }
             {
-                ApplyViewImpl v1(&v0, tapRETRY);
+                ApplyViewImpl v1(&v0, TapRetry);
                 PaymentSandbox v2(&v1);
                 BEAST_EXPECT(v2.seq() == v0.seq());
                 BEAST_EXPECT(v2.parentCloseTime() == v0.parentCloseTime());
-                BEAST_EXPECT(v2.flags() == tapRETRY);
+                BEAST_EXPECT(v2.flags() == TapRetry);
                 PaymentSandbox const v3(&v2);
                 BEAST_EXPECT(v3.seq() == v2.seq());
                 BEAST_EXPECT(v3.parentCloseTime() == v2.parentCloseTime());
@@ -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>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -439,20 +439,20 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(sles(*ledger) == list(1, 2, 3));
             auto e = ledger->stateMap().end();
             auto b1 = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(1)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(2)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(1)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(2)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(3)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(3)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(4)) == b1);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(5)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(4)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(5)) == b1);
             b1 = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(0)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(0)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(1)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(1)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(2)) == b1);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(3)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(2)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(3)) == e);
         }
 
         {
@@ -460,77 +460,77 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(sles(*ledger) == list(2, 4, 6));
             auto e = ledger->stateMap().end();
             auto b1 = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(1)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(2)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(3)) == b1);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(4)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(1)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(2)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(3)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(4)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(5)) == b1);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(6)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(5)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(6)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(7)) == b1);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(7)) == b1);
             b1 = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(1)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(1)) == b1);
             ++b1;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(2)) == b1);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(3)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(2)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(3)) == b1);
             ++b1;
 
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(4)) == b1);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(5)) == b1);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(6)) == e);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(7)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(4)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(5)) == b1);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(6)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(7)) == e);
         }
         {
             setup({2, 3, 5, 6, 10, 15});
             BEAST_EXPECT(sles(*ledger) == list(2, 3, 5, 6, 10, 15));
             auto e = ledger->stateMap().end();
             auto b = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(1)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(2)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(3)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(1)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(2)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(4)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(5)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(4)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(5)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(6)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(6)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(7)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(8)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(9)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(10)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(7)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(8)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(9)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(10)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(11)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(12)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(13)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(14)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(15)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(11)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(12)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(13)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(14)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(15)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(16)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(16)) == b);
             b = ledger->stateMap().begin();
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(0)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(1)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(0)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(1)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(2)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(2)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(3)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(3)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(5)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(6)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(7)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(8)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(9)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(6)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(7)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(8)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(9)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(10)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(11)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(12)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(13)) == b);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(14)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(10)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(11)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(12)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(13)) == b);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(14)) == b);
             ++b;
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(15)) == e);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(16)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(15)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(16)) == e);
         }
         {
             // some full trees, some empty trees, etc
@@ -580,42 +580,42 @@ class View_test : public beast::unit_test::suite
                     100));
             auto b = ledger->stateMap().begin();
             auto e = ledger->stateMap().end();
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(0)) == e);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(1)) == b);
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(5))->key() == uint256(4));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(15))->key() == uint256(14));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(16))->key() == uint256(15));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(19))->key() == uint256(16));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(20))->key() == uint256(16));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(24))->key() == uint256(20));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(31))->key() == uint256(30));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(32))->key() == uint256(30));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(40))->key() == uint256(39));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(47))->key() == uint256(46));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(48))->key() == uint256(47));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(64))->key() == uint256(48));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(0)) == e);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(1)) == b);
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(5))->key() == uint256(4));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(15))->key() == uint256(14));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(16))->key() == uint256(15));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(19))->key() == uint256(16));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(20))->key() == uint256(16));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(24))->key() == uint256(20));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(31))->key() == uint256(30));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(32))->key() == uint256(30));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(40))->key() == uint256(39));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(47))->key() == uint256(46));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(48))->key() == uint256(47));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(64))->key() == uint256(48));
 
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(90))->key() == uint256(66));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(96))->key() == uint256(66));
-            BEAST_EXPECT(ledger->stateMap().lower_bound(uint256(100))->key() == uint256(66));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(90))->key() == uint256(66));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(96))->key() == uint256(66));
+            BEAST_EXPECT(ledger->stateMap().lowerBound(uint256(100))->key() == uint256(66));
 
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(0))->key() == uint256(1));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(5))->key() == uint256(6));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(15))->key() == uint256(16));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(16))->key() == uint256(20));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(18))->key() == uint256(20));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(20))->key() == uint256(25));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(31))->key() == uint256(32));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(32))->key() == uint256(33));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(47))->key() == uint256(48));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(48))->key() == uint256(66));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(53))->key() == uint256(66));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(66))->key() == uint256(100));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(70))->key() == uint256(100));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(85))->key() == uint256(100));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(98))->key() == uint256(100));
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(100)) == e);
-            BEAST_EXPECT(ledger->stateMap().upper_bound(uint256(155)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(0))->key() == uint256(1));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(5))->key() == uint256(6));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(15))->key() == uint256(16));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(16))->key() == uint256(20));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(18))->key() == uint256(20));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(20))->key() == uint256(25));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(31))->key() == uint256(32));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(32))->key() == uint256(33));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(47))->key() == uint256(48));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(48))->key() == uint256(66));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(53))->key() == uint256(66));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(66))->key() == uint256(100));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(70))->key() == uint256(100));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(85))->key() == uint256(100));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(98))->key() == uint256(100));
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(100)) == e);
+            BEAST_EXPECT(ledger->stateMap().upperBound(uint256(155)) == e);
         }
     }
 
@@ -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>(
-            create_genesis,
+            kCREATE_GENESIS,
             Rules{config.features},
             config.FEES.toFees(),
             std::vector<uint256>{},
@@ -651,15 +651,15 @@ class View_test : public beast::unit_test::suite
             view.rawInsert(sle(5));
             BEAST_EXPECT(sles(view) == list(2, 3, 4, 5));
             auto b = view.sles.begin();
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
         }
         {
             setup123();
@@ -670,14 +670,14 @@ class View_test : public beast::unit_test::suite
             view.rawInsert(sle(5));
             BEAST_EXPECT(sles(view) == list(3, 4, 5));
             auto b = view.sles.begin();
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
         }
         {
             setup123();
@@ -689,13 +689,13 @@ class View_test : public beast::unit_test::suite
             view.rawInsert(sle(5));
             BEAST_EXPECT(sles(view) == list(4, 5));
             auto b = view.sles.begin();
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
         }
         {
             setup123();
@@ -706,14 +706,14 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(sles(view) == list(1, 2, 4, 5));
             auto b = view.sles.begin();
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
         }
         {
             setup123();
@@ -729,12 +729,12 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(sles(view) == list(1, 2));
             auto b = view.sles.begin();
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
 
             view.rawInsert(sle(5));
             view.rawInsert(sle(4));
@@ -742,15 +742,15 @@ class View_test : public beast::unit_test::suite
             BEAST_EXPECT(sles(view) == list(1, 2, 3, 4, 5));
             b = view.sles.begin();
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(1)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(1)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(2)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(2)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(3)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(3)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(4)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(4)) == b);
             ++b;
-            BEAST_EXPECT(view.sles.upper_bound(uint256(5)) == b);
+            BEAST_EXPECT(view.sles.upperBound(uint256(5)) == b);
         }
     }
 
@@ -766,97 +766,97 @@ class View_test : public beast::unit_test::suite
         auto const bob = Account("bob");
         auto const carol = Account("carol");
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         env.fund(XRP(10000), alice, bob, carol, gw);
         env.close();
-        env.trust(USD(100), alice, bob, carol);
+        env.trust(usd(100), alice, bob, carol);
         {
             // Global freezing.
-            env(pay(gw, alice, USD(50)));
-            env(offer(alice, XRP(5), USD(5)));
+            env(pay(gw, alice, usd(50)));
+            env(offer(alice, XRP(5), usd(5)));
 
             // Now freeze gw.
             env(fset(gw, asfGlobalFreeze));
             env.close();
-            env(offer(alice, XRP(4), USD(5)), ter(tecFROZEN));
+            env(offer(alice, XRP(4), usd(5)), Ter(tecFROZEN));
             env.close();
 
             // Alice's USD balance should be zero if frozen.
             BEAST_EXPECT(
-                USD(0) ==
+                usd(0) ==
                 accountHolds(
                     *env.closed(),
                     alice,
-                    USD.currency,
+                    usd.currency,
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
 
             // Thaw gw and try again.
             env(fclear(gw, asfGlobalFreeze));
             env.close();
-            env(offer("alice", XRP(4), USD(5)));
+            env(offer("alice", XRP(4), usd(5)));
         }
         {
             // Local freezing.
-            env(pay(gw, bob, USD(50)));
+            env(pay(gw, bob, usd(50)));
             env.close();
 
             // Now gw freezes bob's USD trust line.
-            env(trust(gw, USD(100), bob, tfSetFreeze));
+            env(trust(gw, usd(100), bob, tfSetFreeze));
             env.close();
 
             // Bob's balance should be zero if frozen.
             BEAST_EXPECT(
-                USD(0) ==
+                usd(0) ==
                 accountHolds(
                     *env.closed(),
                     bob,
-                    USD.currency,
+                    usd.currency,
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
 
             // gw thaws bob's trust line.  bob gets his money back.
-            env(trust(gw, USD(100), bob, tfClearFreeze));
+            env(trust(gw, usd(100), bob, tfClearFreeze));
             env.close();
             BEAST_EXPECT(
-                USD(50) ==
+                usd(50) ==
                 accountHolds(
                     *env.closed(),
                     bob,
-                    USD.currency,
+                    usd.currency,
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
         }
         {
             // accountHolds().
-            env(pay(gw, carol, USD(50)));
+            env(pay(gw, carol, usd(50)));
             env.close();
 
             // carol has no EUR.
             BEAST_EXPECT(
-                EUR(0) ==
+                eur(0) ==
                 accountHolds(
                     *env.closed(),
                     carol,
-                    EUR.currency,
+                    eur.currency,
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
 
             // But carol does have USD.
             BEAST_EXPECT(
-                USD(50) ==
+                usd(50) ==
                 accountHolds(
                     *env.closed(),
                     carol,
-                    USD.currency,
+                    usd.currency,
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
 
             // carol's XRP balance should be her holdings minus her reserve.
@@ -865,7 +865,7 @@ class View_test : public beast::unit_test::suite
                 carol,
                 xrpCurrency(),
                 xrpAccount(),
-                FreezeHandling::fhZERO_IF_FROZEN,
+                FreezeHandling::ZeroIfFrozen,
                 env.journal);
             // carol's XRP balance:              10000
             // base reserve:                      -200
@@ -876,7 +876,7 @@ class View_test : public beast::unit_test::suite
 
             // carol should be able to spend *more* than her XRP balance on
             // a fee by eating into her reserve.
-            env(noop(carol), fee(carolsXRP + XRP(10)));
+            env(noop(carol), Fee(carolsXRP + XRP(10)));
             env.close();
 
             // carol's XRP balance should now show as zero.
@@ -887,32 +887,32 @@ class View_test : public beast::unit_test::suite
                     carol,
                     xrpCurrency(),
                     gw,
-                    FreezeHandling::fhZERO_IF_FROZEN,
+                    FreezeHandling::ZeroIfFrozen,
                     env.journal));
         }
         {
             // accountFunds().
             // Gateways have whatever funds they claim to have.
             auto const gwUSD = accountFunds(
-                *env.closed(), gw, USD(314159), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
-            BEAST_EXPECT(gwUSD == USD(314159));
+                *env.closed(), gw, usd(314159), FreezeHandling::ZeroIfFrozen, env.journal);
+            BEAST_EXPECT(gwUSD == usd(314159));
 
             // carol has funds from the gateway.
             auto carolsUSD = accountFunds(
-                *env.closed(), carol, USD(0), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
-            BEAST_EXPECT(carolsUSD == USD(50));
+                *env.closed(), carol, usd(0), FreezeHandling::ZeroIfFrozen, env.journal);
+            BEAST_EXPECT(carolsUSD == usd(50));
 
             // If carol's funds are frozen she has no funds...
             env(fset(gw, asfGlobalFreeze));
             env.close();
             carolsUSD = accountFunds(
-                *env.closed(), carol, USD(0), FreezeHandling::fhZERO_IF_FROZEN, env.journal);
-            BEAST_EXPECT(carolsUSD == USD(0));
+                *env.closed(), carol, usd(0), FreezeHandling::ZeroIfFrozen, env.journal);
+            BEAST_EXPECT(carolsUSD == usd(0));
 
             // ... unless the query ignores the FROZEN state.
             carolsUSD = accountFunds(
-                *env.closed(), carol, USD(0), FreezeHandling::fhIGNORE_FREEZE, env.journal);
-            BEAST_EXPECT(carolsUSD == USD(50));
+                *env.closed(), carol, usd(0), FreezeHandling::IgnoreFreeze, env.journal);
+            BEAST_EXPECT(carolsUSD == usd(50));
 
             // Just to be tidy, thaw gw.
             env(fclear(gw, asfGlobalFreeze));
@@ -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) == parityRate);
+        BEAST_EXPECT(transferRate(*rdView, gw1) == kPARITY_RATE);
 
         env(rate(gw1, 1.02));
         env.close();
@@ -958,7 +958,7 @@ class View_test : public beast::unit_test::suite
         auto const bob = Account("bob");
 
         // The first Env.
-        Env eA(*this, envconfig(), nullptr, beast::severities::kDisabled);
+        Env eA(*this, envconfig(), nullptr, beast::severities::KDisabled);
 
         eA.fund(XRP(10000), alice);
         eA.close();
@@ -970,7 +970,7 @@ class View_test : public beast::unit_test::suite
 
         // The two Env's can't share the same ports, so modify the config
         // of the second Env to use higher port numbers
-        Env eB{*this, envconfig(), nullptr, beast::severities::kDisabled};
+        Env eB{*this, envconfig(), nullptr, beast::severities::KDisabled};
 
         // Make ledgers that are incompatible with the first ledgers.  Note
         // that bob is funded before alice.
@@ -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>(
-                create_genesis,
+                kCREATE_GENESIS,
                 Rules{config.features},
                 config.FEES.toFees(),
                 std::vector<uint256>{},
@@ -1028,7 +1028,7 @@ class View_test : public beast::unit_test::suite
             wipe(*ledger);
             ledger->rawInsert(sle(1));
             ReadView const& v0 = *ledger;
-            ApplyViewImpl v1(&v0, tapNONE);
+            ApplyViewImpl v1(&v0, TapNone);
             {
                 Sandbox v2(&v1);
                 v2.erase(v2.peek(k(1)));
@@ -1066,7 +1066,7 @@ class View_test : public beast::unit_test::suite
     }
 };
 
-class GetAmendments_test : public beast::unit_test::suite
+class GetAmendments_test : public beast::unit_test::Suite
 {
     void
     testGetAmendments()
diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp
index 0bba847c30..110d142f57 100644
--- a/src/test/nodestore/Backend_test.cpp
+++ b/src/test/nodestore/Backend_test.cpp
@@ -31,7 +31,7 @@ public:
         testcase("Backend type=" + type);
 
         Section params;
-        beast::temp_dir const tempDir;
+        beast::TempDir const tempDir;
         params.set("type", type);
         params.set("path", tempDir.path());
 
@@ -46,7 +46,7 @@ public:
         {
             // Open the backend
             std::unique_ptr<Backend> backend =
-                Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
             backend->open();
 
             // Write the batch
@@ -71,7 +71,7 @@ public:
         {
             // Re-open the backend
             std::unique_ptr<Backend> backend =
-                Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
             backend->open();
 
             // Read it back in
diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp
index f31111eed5..d0445cc1ab 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(numObjectsToTest, seedValue);
+        auto batch1 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
 
-        auto batch2 = createPredictableBatch(numObjectsToTest, seedValue);
+        auto batch2 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
 
         BEAST_EXPECT(areBatchesEqual(batch1, batch2));
 
-        auto batch3 = createPredictableBatch(numObjectsToTest, seedValue + 1);
+        auto batch3 = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue + 1);
 
         BEAST_EXPECT(!areBatchesEqual(batch1, batch3));
     }
@@ -38,7 +38,7 @@ public:
     {
         testcase("encoding");
 
-        auto batch = createPredictableBatch(numObjectsToTest, seedValue);
+        auto batch = createPredictableBatch(kNUM_OBJECTS_TO_TEST, 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 684347c6cc..a152bb3a2d 100644
--- a/src/test/nodestore/Database_test.cpp
+++ b/src/test/nodestore/Database_test.cpp
@@ -54,7 +54,7 @@ public:
             // defaults
             Env env(*this);
 
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
 
             if (BEAST_EXPECT(s.globalPragma->size() == 3))
             {
@@ -80,11 +80,11 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(integrityWarning, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
             }();
 
             BEAST_EXPECT(!found);
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.globalPragma->size() == 3))
             {
                 BEAST_EXPECT(s.globalPragma->at(0) == "PRAGMA journal_mode=wal;");
@@ -109,11 +109,11 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(integrityWarning, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
             }();
 
             BEAST_EXPECT(found);
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.globalPragma->size() == 3))
             {
                 BEAST_EXPECT(s.globalPragma->at(0) == "PRAGMA journal_mode=memory;");
@@ -139,13 +139,13 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(integrityWarning, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
             }();
 
             // No warning, even though higher risk settings were used because
             // LEDGER_HISTORY is small
             BEAST_EXPECT(!found);
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.globalPragma->size() == 3))
             {
                 BEAST_EXPECT(s.globalPragma->at(0) == "PRAGMA journal_mode=off;");
@@ -172,13 +172,13 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(integrityWarning, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
             }();
 
             // No warning, even though higher risk settings were used because
             // LEDGER_HISTORY is small
             BEAST_EXPECT(found);
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.globalPragma->size() == 3))
             {
                 BEAST_EXPECT(s.globalPragma->at(0) == "PRAGMA journal_mode=off;");
@@ -210,7 +210,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -239,7 +239,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -268,7 +268,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -297,7 +297,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -325,7 +325,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -353,7 +353,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -381,7 +381,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -409,7 +409,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -420,7 +420,7 @@ public:
         {
             // N/A: Default values
             Env env(*this);
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.txPragma.size() == 4))
             {
                 BEAST_EXPECT(s.txPragma.at(0) == "PRAGMA page_size=4096;");
@@ -440,7 +440,7 @@ public:
                 }
                 return Env(*this, std::move(p));
             }();
-            auto const s = setup_DatabaseCon(env.app().config());
+            auto const s = setupDatabaseCon(env.app().config());
             if (BEAST_EXPECT(s.txPragma.size() == 4))
             {
                 BEAST_EXPECT(s.txPragma.at(0) == "PRAGMA page_size=512;");
@@ -464,7 +464,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -487,7 +487,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -510,7 +510,7 @@ public:
                     *this,
                     std::move(p),
                     std::make_unique<CheckMessageLogs>(expected, &found),
-                    beast::severities::kWarning);
+                    beast::severities::KWarning);
                 fail();
             }
             catch (...)
@@ -530,18 +530,18 @@ public:
     {
         DummyScheduler scheduler;
 
-        beast::temp_dir const node_db;
+        beast::TempDir const nodeDb;
         Section srcParams;
         srcParams.set("type", srcBackendType);
-        srcParams.set("path", node_db.path());
+        srcParams.set("path", nodeDb.path());
 
         // Create a batch
-        auto batch = createPredictableBatch(numObjectsToTest, seedValue);
+        auto batch = createPredictableBatch(kNUM_OBJECTS_TO_TEST, seedValue);
 
         // Write to source db
         {
             std::unique_ptr<Database> src =
-                Manager::instance().make_Database(megabytes(4), scheduler, 2, srcParams, journal_);
+                Manager::instance().makeDatabase(megabytes(4), scheduler, 2, srcParams, journal_);
             storeBatch(*src, batch);
         }
 
@@ -550,16 +550,16 @@ public:
         {
             // Re-open the db
             std::unique_ptr<Database> src =
-                Manager::instance().make_Database(megabytes(4), scheduler, 2, srcParams, journal_);
+                Manager::instance().makeDatabase(megabytes(4), scheduler, 2, srcParams, journal_);
 
             // Set up the destination database
-            beast::temp_dir const dest_db;
+            beast::TempDir const destDb;
             Section destParams;
             destParams.set("type", destBackendType);
-            destParams.set("path", dest_db.path());
+            destParams.set("path", destDb.path());
 
             std::unique_ptr<Database> dest =
-                Manager::instance().make_Database(megabytes(4), scheduler, 2, destParams, journal_);
+                Manager::instance().makeDatabase(megabytes(4), scheduler, 2, destParams, journal_);
 
             testcase("import into '" + destBackendType + "' from '" + srcBackendType + "'");
 
@@ -591,10 +591,10 @@ public:
 
         testcase(s);
 
-        beast::temp_dir const node_db;
+        beast::TempDir const nodeDb;
         Section nodeParams;
         nodeParams.set("type", type);
-        nodeParams.set("path", node_db.path());
+        nodeParams.set("path", nodeDb.path());
 
         beast::xor_shift_engine rng(seedValue);
 
@@ -604,7 +604,7 @@ public:
         {
             // Open the database
             std::unique_ptr<Database> db =
-                Manager::instance().make_Database(megabytes(4), scheduler, 2, nodeParams, journal_);
+                Manager::instance().makeDatabase(megabytes(4), scheduler, 2, nodeParams, journal_);
 
             // Write the batch
             storeBatch(*db, batch);
@@ -629,7 +629,7 @@ public:
         {
             // Re-open the database without the ephemeral DB
             std::unique_ptr<Database> db =
-                Manager::instance().make_Database(megabytes(4), scheduler, 2, nodeParams, journal_);
+                Manager::instance().makeDatabase(megabytes(4), scheduler, 2, nodeParams, journal_);
 
             // Read it back in
             Batch copy;
@@ -645,16 +645,16 @@ public:
         {
             // Verify default earliest ledger sequence
             {
-                std::unique_ptr<Database> db = Manager::instance().make_Database(
+                std::unique_ptr<Database> db = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
-                BEAST_EXPECT(db->earliestLedgerSeq() == XRP_LEDGER_EARLIEST_SEQ);
+                BEAST_EXPECT(db->earliestLedgerSeq() == kXRP_LEDGER_EARLIEST_SEQ);
             }
 
             // Set an invalid earliest ledger sequence
             try
             {
                 nodeParams.set("earliest_seq", "0");
-                std::unique_ptr<Database> const db = Manager::instance().make_Database(
+                std::unique_ptr<Database> const db = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
             }
             catch (std::runtime_error const& e)
@@ -665,7 +665,7 @@ public:
             {
                 // Set a valid earliest ledger sequence
                 nodeParams.set("earliest_seq", "1");
-                std::unique_ptr<Database> db = Manager::instance().make_Database(
+                std::unique_ptr<Database> db = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
 
                 // Verify database uses the earliest ledger sequence setting
@@ -676,8 +676,8 @@ public:
             try
             {
                 // Set to default earliest ledger sequence
-                nodeParams.set("earliest_seq", std::to_string(XRP_LEDGER_EARLIEST_SEQ));
-                std::unique_ptr<Database> const db2 = Manager::instance().make_Database(
+                nodeParams.set("earliest_seq", std::to_string(kXRP_LEDGER_EARLIEST_SEQ));
+                std::unique_ptr<Database> const db2 = Manager::instance().makeDatabase(
                     megabytes(4), scheduler, 2, nodeParams, journal_);
             }
             catch (std::runtime_error const& e)
diff --git a/src/test/nodestore/NuDBFactory_test.cpp b/src/test/nodestore/NuDBFactory_test.cpp
index 0755708cee..2c817c0d6c 100644
--- a/src/test/nodestore/NuDBFactory_test.cpp
+++ b/src/test/nodestore/NuDBFactory_test.cpp
@@ -46,7 +46,7 @@ private:
             test::SuiteJournal journal("NuDBFactory_test", *this);
 
             auto backend =
-                Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
 
             if (!BEAST_EXPECT(backend))
                 return false;
@@ -87,7 +87,7 @@ private:
         beast::Journal const journal(sink);
 
         DummyScheduler scheduler;
-        auto backend = Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+        auto backend = Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
 
         std::string const logOutput = sink.messages().str();
         BEAST_EXPECT(logOutput.find(expectedMessage) != std::string::npos);
@@ -97,14 +97,14 @@ private:
     void
     testPowerOfTwoValidation(std::string const& size, bool shouldWork)
     {
-        beast::temp_dir const tempDir;
+        beast::TempDir const tempDir;
         auto params = createSection(tempDir.path(), size);
 
-        test::StreamSink sink(beast::severities::kWarning);
+        test::StreamSink sink(beast::severities::KWarning);
         beast::Journal const journal(sink);
 
         DummyScheduler scheduler;
-        auto backend = Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+        auto backend = Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
 
         std::string const logOutput = sink.messages().str();
         bool const hasWarning = logOutput.find("Invalid nudb_block_size") != std::string::npos;
@@ -118,7 +118,7 @@ public:
     {
         testcase("Default block size (no nudb_block_size specified)");
 
-        beast::temp_dir const tempDir;
+        beast::TempDir const tempDir;
         auto params = createSection(tempDir.path());
 
         // Should work with default 4096 block size
@@ -134,14 +134,14 @@ public:
 
         for (auto const& size : validSizes)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), to_string(size));
 
             BEAST_EXPECT(testBackendFunctionality(params, size));
         }
         // Empty value is ignored by the config parser, so uses the
         // default
-        beast::temp_dir const tempDir;
+        beast::TempDir const tempDir;
         auto params = createSection(tempDir.path(), "");
 
         BEAST_EXPECT(testBackendFunctionality(params, 4096));
@@ -169,7 +169,7 @@ public:
 
         for (auto const& size : invalidSizes)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), size);
 
             // Fails
@@ -184,7 +184,7 @@ public:
 
         for (auto const& size : whitespaceInvalidSizes)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), size);
 
             // Fails
@@ -199,25 +199,25 @@ public:
 
         // Test valid custom block size logging
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), "8192");
 
-            testLogMessage(params, beast::severities::kInfo, "Using custom NuDB block size: 8192");
+            testLogMessage(params, beast::severities::KInfo, "Using custom NuDB block size: 8192");
         }
 
         // Test invalid block size failure
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), "5000");
 
-            test::StreamSink sink(beast::severities::kWarning);
+            test::StreamSink sink(beast::severities::KWarning);
             beast::Journal const journal(sink);
 
             DummyScheduler scheduler;
             try
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
                 fail();
             }
             catch (std::exception const& e)
@@ -232,17 +232,17 @@ public:
 
         // Test non-numeric value failure
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), "invalid");
 
-            test::StreamSink sink(beast::severities::kWarning);
+            test::StreamSink sink(beast::severities::KWarning);
             beast::Journal const journal(sink);
 
             DummyScheduler scheduler;
             try
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
 
                 fail();
             }
@@ -275,19 +275,19 @@ public:
 
         for (auto const& [size, shouldWork] : testCases)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), size);
 
             // We test the validation logic by catching exceptions for invalid
             // values
-            test::StreamSink sink(beast::severities::kWarning);
+            test::StreamSink sink(beast::severities::KWarning);
             beast::Journal const journal(sink);
 
             DummyScheduler scheduler;
             try
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
                 BEAST_EXPECT(shouldWork);
             }
             catch (std::exception const& e)
@@ -303,7 +303,7 @@ public:
     {
         testcase("Both constructor variants work with custom block size");
 
-        beast::temp_dir const tempDir;
+        beast::TempDir const tempDir;
         auto params = createSection(tempDir.path(), "16384");
 
         DummyScheduler scheduler;
@@ -312,7 +312,7 @@ public:
         // Test first constructor (without nudb::context)
         {
             auto backend1 =
-                Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
             BEAST_EXPECT(backend1 != nullptr);
             BEAST_EXPECT(testBackendFunctionality(params, 16384));
         }
@@ -345,15 +345,15 @@ public:
         // Test basic valid format
         for (auto const& format : validFormats)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), format);
 
-            test::StreamSink sink(beast::severities::kInfo);
+            test::StreamSink sink(beast::severities::KInfo);
             beast::Journal const journal(sink);
 
             DummyScheduler scheduler;
             auto backend =
-                Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
 
             // Should log success message for valid values
             std::string const logOutput = sink.messages().str();
@@ -366,18 +366,18 @@ public:
         // them
         for (auto const& format : whitespaceFormats)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), format);
 
             // Use a lower threshold to capture both info and warning messages
-            test::StreamSink sink(beast::severities::kDebug);
+            test::StreamSink sink(beast::severities::KDebug);
             beast::Journal const journal(sink);
 
             DummyScheduler scheduler;
             try
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
                 fail();
             }
             catch (...)
@@ -397,7 +397,7 @@ public:
 
         for (auto const& size : blockSizes)
         {
-            beast::temp_dir const tempDir;
+            beast::TempDir const tempDir;
             auto params = createSection(tempDir.path(), size);
 
             DummyScheduler scheduler;
@@ -409,7 +409,7 @@ public:
             // Store data
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
                 backend->open();
                 storeBatch(*backend, batch);
                 backend->close();
@@ -418,7 +418,7 @@ public:
             // Retrieve data in new backend instance
             {
                 auto backend =
-                    Manager::instance().make_Backend(params, megabytes(4), scheduler, journal);
+                    Manager::instance().makeBackend(params, megabytes(4), scheduler, journal);
                 backend->open();
 
                 Batch copy;
diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h
index 8ea32517d5..7cde0266ab 100644
--- a/src/test/nodestore/TestBase.h
+++ b/src/test/nodestore/TestBase.h
@@ -42,14 +42,14 @@ isSame(std::shared_ptr<NodeObject> const& lhs, std::shared_ptr<NodeObject> const
 
 // Some common code for the unit tests
 //
-class TestBase : public beast::unit_test::suite
+class TestBase : public beast::unit_test::Suite
 {
 public:
     // Tunable parameters
     //
-    static std::size_t const minPayloadBytes = 1;
-    static std::size_t const maxPayloadBytes = 2000;
-    static int const numObjectsToTest = 2000;
+    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;
 
 public:
     // Create a predictable batch of objects
@@ -64,26 +64,26 @@ public:
         for (int i = 0; i < numObjects; ++i)
         {
             NodeObjectType const type = [&] {
-                switch (rand_int(rng, 3))
+                switch (randInt(rng, 3))
                 {
                     case 0:
-                        return NodeObjectType::hotLEDGER;
+                        return NodeObjectType::Ledger;
                     case 1:
-                        return NodeObjectType::hotACCOUNT_NODE;
+                        return NodeObjectType::AccountNode;
                     case 2:
-                        return NodeObjectType::hotTRANSACTION_NODE;
+                        return NodeObjectType::TransactionNode;
                     case 3:
-                        return NodeObjectType::hotUNKNOWN;
+                        return NodeObjectType::Unknown;
                     default:
                         // will never happen, but make static analysis tool happy.
-                        return NodeObjectType::hotUNKNOWN;
+                        return NodeObjectType::Unknown;
                 }
             }();
 
             uint256 hash;
             beast::rngfill(hash.begin(), hash.size(), rng);
 
-            Blob blob(rand_int(rng, minPayloadBytes, maxPayloadBytes));
+            Blob blob(randInt(rng, kMIN_PAYLOAD_BYTES, kMAX_PAYLOAD_BYTES));
             beast::rngfill(blob.data(), blob.size(), rng);
 
             batch.push_back(NodeObject::createObject(type, std::move(blob), hash));
@@ -140,9 +140,9 @@ public:
 
             Status const status = backend.fetch(batch[i]->getHash(), &object);
 
-            BEAST_EXPECT(status == Status::ok);
+            BEAST_EXPECT(status == Status::Ok);
 
-            if (status == Status::ok)
+            if (status == Status::Ok)
             {
                 BEAST_EXPECT(object != nullptr);
 
@@ -160,7 +160,7 @@ public:
 
             Status const status = backend.fetch(batch[i]->getHash(), &object);
 
-            BEAST_EXPECT(status == Status::notFound);
+            BEAST_EXPECT(status == Status::NotFound);
         }
     }
 
diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp
index 1145bc80f4..dfc1a0235d 100644
--- a/src/test/nodestore/Timing_test.cpp
+++ b/src/test/nodestore/Timing_test.cpp
@@ -46,9 +46,9 @@
 namespace xrpl::NodeStore {
 
 std::unique_ptr<Backend>
-make_Backend(Section const& config, Scheduler& scheduler, beast::Journal journal)
+makeBackend(Section const& config, Scheduler& scheduler, beast::Journal journal)
 {
-    return Manager::instance().make_Backend(config, megabytes(4), scheduler, journal);
+    return Manager::instance().makeBackend(config, megabytes(4), scheduler, journal);
 }
 
 // Fill memory with random bits
@@ -79,7 +79,7 @@ class Sequence
 private:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { minLedger = 1, maxLedger = 1000000, minSize = 250, maxSize = 1250 };
+    enum { MinLedger = 1, MaxLedger = 1000000, MinSize = 250, MaxSize = 1250 };
 
     beast::xor_shift_engine gen_;
     std::uint8_t prefix_;
@@ -92,7 +92,7 @@ public:
         // uniform distribution over hotLEDGER - hotTRANSACTION_NODE
         // but exclude  hotTRANSACTION = 2 (removed)
         , d_type_({1, 1, 0, 1, 1})
-        , d_size_(minSize, maxSize)
+        , d_size_(MinSize, MaxSize)
     {
     }
 
@@ -118,7 +118,7 @@ public:
         Blob value(d_size_(gen_));
         rngcpy(&value[0], value.size(), gen_);
         return NodeObject::createObject(
-            safe_cast<NodeObjectType>(d_type_(gen_)), std::move(value), key);
+            safeCast<NodeObjectType>(d_type_(gen_)), std::move(value), key);
     }
 
     // returns a batch of NodeObjects starting at n
@@ -134,14 +134,14 @@ public:
 
 //----------------------------------------------------------------------------------
 
-class Timing_test : public beast::unit_test::suite
+class Timing_test : public beast::unit_test::Suite
 {
 public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // percent of fetches for missing nodes
-        missingNodePercent = 20
+        MissingNodePercent = 20
     };
 
     std::size_t const default_repeat = 3;
@@ -161,7 +161,7 @@ public:
     };
 
     static std::string
-    to_string(Section const& config)
+    toString(Section const& config)
     {
         std::string s;
         for (auto iter = config.begin(); iter != config.end(); ++iter)
@@ -170,7 +170,7 @@ public:
     }
 
     static std::string
-    to_string(duration_type const& d)
+    toString(duration_type const& d)
     {
         std::stringstream ss;
         ss << std::fixed << std::setprecision(3) << (d.count() / 1000.) << "s";
@@ -192,14 +192,14 @@ public:
     // Workaround for GCC's parameter pack expansion in lambdas
     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47226
     template <class Body>
-    class parallel_for_lambda
+    class ParallelForLambda
     {
     private:
         std::size_t const n_;
         std::atomic<std::size_t>& c_;
 
     public:
-        parallel_for_lambda(std::size_t n, std::atomic<std::size_t>& c) : n_(n), c_(c)
+        ParallelForLambda(std::size_t n, std::atomic<std::size_t>& c) : n_(n), c_(c)
         {
         }
 
@@ -226,26 +226,26 @@ public:
     */
     template <class Body, class... Args>
     void
-    parallel_for(std::size_t const n, std::size_t number_of_threads, Args const&... args)
+    parallelFor(std::size_t const n, std::size_t numberOfThreads, Args const&... args)
     {
         std::atomic<std::size_t> c(0);
         std::vector<beast::unit_test::Thread> t;
-        t.reserve(number_of_threads);
-        for (std::size_t id = 0; id < number_of_threads; ++id)
-            t.emplace_back(*this, parallel_for_lambda<Body>(n, c), args...);
+        t.reserve(numberOfThreads);
+        for (std::size_t id = 0; id < numberOfThreads; ++id)
+            t.emplace_back(*this, ParallelForLambda<Body>(n, c), args...);
         for (auto& _ : t)
             _.join();
     }
 
     template <class Body, class... Args>
     void
-    parallel_for_id(std::size_t const n, std::size_t number_of_threads, Args const&... args)
+    parallelForId(std::size_t const n, std::size_t numberOfThreads, Args const&... args)
     {
         std::atomic<std::size_t> c(0);
         std::vector<beast::unit_test::Thread> t;
-        t.reserve(number_of_threads);
-        for (std::size_t id = 0; id < number_of_threads; ++id)
-            t.emplace_back(*this, parallel_for_lambda<Body>(n, c), id, args...);
+        t.reserve(numberOfThreads);
+        for (std::size_t id = 0; id < numberOfThreads; ++id)
+            t.emplace_back(*this, ParallelForLambda<Body>(n, c), id, args...);
         for (auto& _ : t)
             _.join();
     }
@@ -254,22 +254,22 @@ public:
 
     // Insert only
     void
-    do_insert(Section const& config, Params const& params, beast::Journal journal)
+    doInsert(Section const& config, Params const& params, beast::Journal journal)
     {
         DummyScheduler scheduler;
-        auto backend = make_Backend(config, scheduler, journal);
+        auto backend = makeBackend(config, scheduler, journal);
         BEAST_EXPECT(backend != nullptr);
         backend->open();
 
         class Body
         {
         private:
-            suite& suite_;
+            Suite& suite_;
             Backend& backend_;
             Sequence seq_;
 
         public:
-            explicit Body(suite& s, Backend& backend) : suite_(s), backend_(backend), seq_(1)
+            explicit Body(Suite& s, Backend& backend) : suite_(s), backend_(backend), seq_(1)
             {
             }
 
@@ -289,38 +289,38 @@ public:
 
         try
         {
-            parallel_for<Body>(params.items, params.threads, std::ref(*this), std::ref(*backend));
+            parallelFor<Body>(params.items, params.threads, std::ref(*this), std::ref(*backend));
         }
         catch (std::exception const&)
         {
 #if NODESTORE_TIMING_DO_VERIFY
             backend->verify();
 #endif
-            Rethrow();
+            rethrow();
         }
         backend->close();
     }
 
     // Fetch existing keys
     void
-    do_fetch(Section const& config, Params const& params, beast::Journal journal)
+    doFetch(Section const& config, Params const& params, beast::Journal journal)
     {
         DummyScheduler scheduler;
-        auto backend = make_Backend(config, scheduler, journal);
+        auto backend = makeBackend(config, scheduler, journal);
         BEAST_EXPECT(backend != nullptr);
         backend->open();
 
         class Body
         {
         private:
-            suite& suite_;
+            Suite& suite_;
             Backend& backend_;
             Sequence seq1_;
             beast::xor_shift_engine gen_;
             std::uniform_int_distribution<std::size_t> dist_;
 
         public:
-            Body(std::size_t id, suite& s, Params const& params, Backend& backend)
+            Body(std::size_t id, Suite& s, Params const& params, Backend& backend)
                 : suite_(s), backend_(backend), seq1_(1), gen_(id + 1), dist_(0, params.items - 1)
             {
             }
@@ -344,7 +344,7 @@ public:
         };
         try
         {
-            parallel_for_id<Body>(
+            parallelForId<Body>(
                 params.items,
                 params.threads,
                 std::ref(*this),
@@ -356,24 +356,24 @@ public:
 #if NODESTORE_TIMING_DO_VERIFY
             backend->verify();
 #endif
-            Rethrow();
+            rethrow();
         }
         backend->close();
     }
 
     // Perform lookups of non-existent keys
     void
-    do_missing(Section const& config, Params const& params, beast::Journal journal)
+    doMissing(Section const& config, Params const& params, beast::Journal journal)
     {
         DummyScheduler scheduler;
-        auto backend = make_Backend(config, scheduler, journal);
+        auto backend = makeBackend(config, scheduler, journal);
         BEAST_EXPECT(backend != nullptr);
         backend->open();
 
         class Body
         {
         private:
-            suite& suite_;
+            Suite& suite_;
             // Params const& params_;
             Backend& backend_;
             Sequence seq2_;
@@ -381,7 +381,7 @@ public:
             std::uniform_int_distribution<std::size_t> dist_;
 
         public:
-            Body(std::size_t id, suite& s, Params const& params, Backend& backend)
+            Body(std::size_t id, Suite& s, Params const& params, Backend& backend)
                 : suite_(s)
                 //, params_ (params)
                 , backend_(backend)
@@ -410,7 +410,7 @@ public:
 
         try
         {
-            parallel_for_id<Body>(
+            parallelForId<Body>(
                 params.items,
                 params.threads,
                 std::ref(*this),
@@ -422,24 +422,24 @@ public:
 #if NODESTORE_TIMING_DO_VERIFY
             backend->verify();
 #endif
-            Rethrow();
+            rethrow();
         }
         backend->close();
     }
 
     // Fetch with present and missing keys
     void
-    do_mixed(Section const& config, Params const& params, beast::Journal journal)
+    doMixed(Section const& config, Params const& params, beast::Journal journal)
     {
         DummyScheduler scheduler;
-        auto backend = make_Backend(config, scheduler, journal);
+        auto backend = makeBackend(config, scheduler, journal);
         BEAST_EXPECT(backend != nullptr);
         backend->open();
 
         class Body
         {
         private:
-            suite& suite_;
+            Suite& suite_;
             // Params const& params_;
             Backend& backend_;
             Sequence seq1_;
@@ -449,7 +449,7 @@ public:
             std::uniform_int_distribution<std::size_t> dist_;
 
         public:
-            Body(std::size_t id, suite& s, Params const& params, Backend& backend)
+            Body(std::size_t id, Suite& s, Params const& params, Backend& backend)
                 : suite_(s)
                 //, params_ (params)
                 , backend_(backend)
@@ -466,7 +466,7 @@ public:
             {
                 try
                 {
-                    if (rand_(gen_) < missingNodePercent)
+                    if (rand_(gen_) < MissingNodePercent)
                     {
                         auto const hash = seq2_.key(dist_(gen_));
                         std::shared_ptr<NodeObject> result;
@@ -491,7 +491,7 @@ public:
 
         try
         {
-            parallel_for_id<Body>(
+            parallelForId<Body>(
                 params.items,
                 params.threads,
                 std::ref(*this),
@@ -503,7 +503,7 @@ public:
 #if NODESTORE_TIMING_DO_VERIFY
             backend->verify();
 #endif
-            Rethrow();
+            rethrow();
         }
         backend->close();
     }
@@ -514,10 +514,10 @@ public:
     //      fetches an old key
     //      fetches recent, possibly non existent data
     void
-    do_work(Section const& config, Params const& params, beast::Journal journal)
+    doWork(Section const& config, Params const& params, beast::Journal journal)
     {
         DummyScheduler scheduler;
-        auto backend = make_Backend(config, scheduler, journal);
+        auto backend = makeBackend(config, scheduler, journal);
         BEAST_EXPECT(backend != nullptr);
         backend->setDeletePath();
         backend->open();
@@ -525,7 +525,7 @@ public:
         class Body
         {
         private:
-            suite& suite_;
+            Suite& suite_;
             Params const& params_;
             Backend& backend_;
             Sequence seq1_;
@@ -535,7 +535,7 @@ public:
             std::uniform_int_distribution<std::size_t> older_;
 
         public:
-            Body(std::size_t id, suite& s, Params const& params, Backend& backend)
+            Body(std::size_t id, Suite& s, Params const& params, Backend& backend)
                 : suite_(s)
                 , params_(params)
                 , backend_(backend)
@@ -601,7 +601,7 @@ public:
 
         try
         {
-            parallel_for_id<Body>(
+            parallelForId<Body>(
                 params.items,
                 params.threads,
                 std::ref(*this),
@@ -613,7 +613,7 @@ public:
 #if NODESTORE_TIMING_DO_VERIFY
             backend->verify();
 #endif
-            Rethrow();
+            rethrow();
         }
         backend->close();
     }
@@ -624,7 +624,7 @@ public:
     using test_list = std::vector<std::pair<std::string, test_func>>;
 
     duration_type
-    do_test(test_func f, Section const& config, Params const& params, beast::Journal journal)
+    doTest(test_func f, Section const& config, Params const& params, beast::Journal journal)
     {
         auto const start = clock_type::now();
         (this->*f)(config, params, journal);
@@ -632,10 +632,10 @@ public:
     }
 
     void
-    do_tests(
+    doTests(
         std::size_t threads,
         test_list const& tests,
-        std::vector<std::string> const& config_strings)
+        std::vector<std::string> const& configStrings)
     {
         using std::setw;
         int w = 8;
@@ -656,24 +656,23 @@ public:
         using namespace beast::severities;
         test::SuiteJournal journal("Timing_test", *this);
 
-        for (auto const& config_string : config_strings)
+        for (auto const& configString : configStrings)
         {
             Params params{};
             params.items = default_items;
             params.threads = threads;
             for (auto i = default_repeat; (i--) != 0u;)
             {
-                beast::temp_dir const tempDir;
-                Section config = parse(config_string);
+                beast::TempDir const tempDir;
+                Section config = parse(configString);
                 config.set("path", tempDir.path());
                 std::stringstream ss;
                 ss << std::left << setw(10) << get(config, "type", std::string()) << std::right;
                 for (auto const& test : tests)
                 {
-                    ss << " " << setw(w)
-                       << to_string(do_test(test.second, config, params, journal));
+                    ss << " " << setw(w) << toString(doTest(test.second, config, params, journal));
                 }
-                ss << "   " << to_string(config);
+                ss << "   " << toString(config);
                 log << ss.str() << std::endl;
             }
         }
@@ -682,7 +681,7 @@ public:
     void
     run() override
     {
-        testcase("Timing", beast::unit_test::abort_t::abort_on_fail);
+        testcase("Timing", beast::unit_test::AbortT::AbortOnFail);
 
         /*  Parameters:
 
@@ -690,7 +689,7 @@ public:
             items           Number of objects to create in the database
 
         */
-        std::string const default_args =
+        std::string const defaultArgs =
             "type=nudb"
 #if XRPL_ROCKSDB_AVAILABLE
             ";type=rocksdb,open_files=2000,filter_bits=12,cache_mb=256,"
@@ -702,20 +701,20 @@ public:
             ;
 
         test_list const tests = {
-            {"Insert", &Timing_test::do_insert},
-            {"Fetch", &Timing_test::do_fetch},
-            {"Missing", &Timing_test::do_missing},
-            {"Mixed", &Timing_test::do_mixed},
-            {"Work", &Timing_test::do_work}};
+            {"Insert", &Timing_test::doInsert},
+            {"Fetch", &Timing_test::doFetch},
+            {"Missing", &Timing_test::doMissing},
+            {"Mixed", &Timing_test::doMixed},
+            {"Work", &Timing_test::doWork}};
 
-        auto args = arg().empty() ? default_args : arg();
-        std::vector<std::string> config_strings;
-        boost::split(config_strings, args, boost::algorithm::is_any_of(";"));
-        for (auto iter = config_strings.begin(); iter != config_strings.end();)
+        auto args = arg().empty() ? defaultArgs : arg();
+        std::vector<std::string> configStrings;
+        boost::split(configStrings, args, boost::algorithm::is_any_of(";"));
+        for (auto iter = configStrings.begin(); iter != configStrings.end();)
         {
             if (iter->empty())
             {
-                iter = config_strings.erase(iter);
+                iter = configStrings.erase(iter);
             }
             else
             {
@@ -723,9 +722,9 @@ public:
             }
         }
 
-        do_tests(1, tests, config_strings);
-        do_tests(4, tests, config_strings);
-        do_tests(8, tests, config_strings);
+        doTests(1, tests, configStrings);
+        doTests(4, tests, configStrings);
+        doTests(8, tests, configStrings);
         // do_tests (16, tests, config_strings);
     }
 };
diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp
index 359f27ef7d..0ef7b2314f 100644
--- a/src/test/nodestore/import_test.cpp
+++ b/src/test/nodestore/import_test.cpp
@@ -67,7 +67,7 @@ namespace xrpl {
 
 namespace detail {
 
-class save_stream_state
+class SaveStreamState
 {
     std::ostream& os_;
     std::streamsize precision_;
@@ -75,16 +75,16 @@ class save_stream_state
     std::ios::char_type fill_;
 
 public:
-    ~save_stream_state()
+    ~SaveStreamState()
     {
         os_.precision(precision_);
         os_.flags(flags_);
         os_.fill(fill_);
     }
-    save_stream_state(save_stream_state const&) = delete;
-    save_stream_state&
-    operator=(save_stream_state const&) = delete;
-    explicit save_stream_state(std::ostream& os)
+    SaveStreamState(SaveStreamState const&) = delete;
+    SaveStreamState&
+    operator=(SaveStreamState const&) = delete;
+    explicit SaveStreamState(std::ostream& os)
         : os_(os), precision_(os.precision()), flags_(os.flags()), fill_(os.fill())
     {
     }
@@ -92,9 +92,9 @@ public:
 
 template <class Rep, class Period>
 std::ostream&
-pretty_time(std::ostream& os, std::chrono::duration<Rep, Period> d)
+prettyTime(std::ostream& os, std::chrono::duration<Rep, Period> d)
 {
-    save_stream_state const _(os);
+    SaveStreamState const _(os);
     using namespace std::chrono;
     if (d < microseconds{1})
     {
@@ -184,7 +184,7 @@ inline std::string
 fmtdur(std::chrono::duration<Period, Rep> const& d)
 {
     std::stringstream ss;
-    pretty_time(ss, d);
+    prettyTime(ss, d);
     return ss.str();
 }
 
@@ -194,10 +194,10 @@ namespace NodeStore {
 
 //------------------------------------------------------------------------------
 
-class progress
+class Progress
 {
 private:
-    using clock_type = beast::basic_seconds_clock;
+    using clock_type = beast::BasicSecondsClock;
 
     std::size_t const work_;
     clock_type::time_point start_ = clock_type::now();
@@ -207,7 +207,7 @@ private:
     bool estimate_ = false;
 
 public:
-    explicit progress(std::size_t work) : work_(work)
+    explicit Progress(std::size_t work) : work_(work)
     {
     }
 
@@ -250,10 +250,10 @@ public:
 };
 
 std::map<std::string, std::string, boost::beast::iless>
-parse_args(std::string const& s)
+parseArgs(std::string const& s)
 {
     // <key> '=' <value>
-    static boost::regex const re1(
+    static boost::regex const kRE1(
         "^"                        // start of line
         "(?:\\s*)"                 // whitespace (optional)
         "([a-zA-Z][_a-zA-Z0-9]*)"  // <key>
@@ -269,7 +269,7 @@ parse_args(std::string const& s)
     for (auto const& kv : v)
     {
         boost::smatch m;
-        if (!boost::regex_match(kv, m, re1))
+        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)
@@ -282,19 +282,19 @@ parse_args(std::string const& s)
 
 #if XRPL_ROCKSDB_AVAILABLE
 
-class import_test : public beast::unit_test::suite
+class import_test : public beast::unit_test::Suite
 {
 public:
     void
     run() override
     {
-        testcase(beast::unit_test::abort_t::abort_on_fail) << arg();
+        testcase(beast::unit_test::AbortT::AbortOnFail) << arg();
 
         using namespace nudb;
         using namespace nudb::detail;
 
         pass();
-        auto const args = parse_args(arg());
+        auto const args = parseArgs(arg());
         bool usage = args.empty();
 
         if (!usage && args.find("from") == args.end())
@@ -328,26 +328,26 @@ public:
         // For a 1TB data file, a 32GB bucket buffer is suggested.
         // The larger the buffer, the faster the import.
         //
-        std::size_t const buffer_size = std::stoull(args.at("buffer"));
-        auto const from_path = args.at("from");
-        auto const to_path = args.at("to");
+        std::size_t const bufferSize = std::stoull(args.at("buffer"));
+        auto const fromPath = args.at("from");
+        auto const toPath = args.at("to");
 
         using hash_type = nudb::xxhasher;
-        auto const bulk_size = 64 * 1024 * 1024;
-        float const load_factor = 0.5;
+        auto const bulkSize = 64 * 1024 * 1024;
+        float const loadFactor = 0.5;
 
-        auto const dp = to_path + ".dat";
-        auto const kp = to_path + ".key";
+        auto const dp = toPath + ".dat";
+        auto const kp = toPath + ".key";
 
         auto const start = std::chrono::steady_clock::now();
 
-        log << "from:    " << from_path
+        log << "from:    " << fromPath
             << "\n"
                "to:      "
-            << to_path
+            << toPath
             << "\n"
                "buffer:  "
-            << buffer_size;
+            << bufferSize;
 
         std::unique_ptr<rocksdb::DB> db;
         {
@@ -355,9 +355,9 @@ public:
             options.create_if_missing = false;
             options.max_open_files = 2000;  // 5000?
             rocksdb::DB* pdb = nullptr;
-            rocksdb::Status const status = rocksdb::DB::OpenForReadOnly(options, from_path, &pdb);
+            rocksdb::Status const status = rocksdb::DB::OpenForReadOnly(options, fromPath, &pdb);
             if (!status.ok() || (pdb == nullptr))
-                Throw<std::runtime_error>("Can't open '" + from_path + "': " + status.ToString());
+                Throw<std::runtime_error>("Can't open '" + fromPath + "': " + status.ToString());
             db.reset(pdb);
         }
         // Create data file with values
@@ -373,7 +373,7 @@ public:
         df.create(file_mode::append, dp, ec);
         if (ec)
             Throw<nudb::system_error>(ec);
-        bulk_writer<native_file> dw(df, 0, bulk_size);
+        bulk_writer<native_file> dw(df, 0, bulkSize);
         {
             {
                 auto os = dw.prepare(dat_file_header::size, ec);
@@ -399,12 +399,12 @@ public:
                 auto const size = it->value().size();
                 std::unique_ptr<char[]> const clean(new char[size]);
                 std::memcpy(clean.get(), data, size);
-                filter_inner(clean.get(), size);
-                auto const out = nodeobject_compress(clean.get(), size, buf);
+                filterInner(clean.get(), size);
+                auto const out = nodeobjectCompress(clean.get(), size, buf);
                 // Verify codec correctness
                 {
                     buffer buf2;
-                    auto const check = nodeobject_decompress(out.first, out.second, buf2);
+                    auto const check = nodeobjectDecompress(out.first, out.second, buf2);
                     BEAST_EXPECT(check.second == size);
                     BEAST_EXPECT(std::memcmp(check.first, clean.get(), size) == 0);
                 }
@@ -427,7 +427,7 @@ public:
         }
         db.reset();
         log << "Import data: " << detail::fmtdur(std::chrono::steady_clock::now() - start);
-        auto const df_size = df.size(ec);
+        auto const dfSize = df.size(ec);
         if (ec)
             Throw<nudb::system_error>(ec);
         // Create key file
@@ -439,8 +439,8 @@ public:
         kh.salt = make_salt();
         kh.pepper = pepper<hash_type>(kh.salt);
         kh.block_size = block_size(kp);
-        kh.load_factor = std::min<std::size_t>(65536.0 * load_factor, 65535);
-        kh.buckets = std::ceil(nitems / (bucket_capacity(kh.block_size) * load_factor));
+        kh.load_factor = std::min<std::size_t>(65536.0 * loadFactor, 65535);
+        kh.buckets = std::ceil(nitems / (bucket_capacity(kh.block_size) * loadFactor));
         kh.modulus = ceil_pow2(kh.buckets);
         native_file kf;
         kf.create(file_mode::append, kp, ec);
@@ -458,7 +458,7 @@ public:
         // Build contiguous sequential sections of the
         // key file using multiple passes over the data.
         //
-        auto const buckets = std::max<std::size_t>(1, buffer_size / kh.block_size);
+        auto const buckets = std::max<std::size_t>(1, bufferSize / kh.block_size);
         buf.reserve(buckets * kh.block_size);
         auto const passes = (kh.buckets + buckets - 1) / buckets;
         log << "items:   " << nitems
@@ -467,11 +467,11 @@ public:
             << kh.buckets
             << "\n"
                "data:    "
-            << df_size
+            << dfSize
             << "\n"
                "passes:  "
             << passes;
-        progress p(df_size * passes);
+        Progress p(dfSize * passes);
         std::size_t npass = 0;
         for (std::size_t b0 = 0; b0 < kh.buckets; b0 += buckets)
         {
@@ -485,7 +485,7 @@ public:
             }
             // Insert all keys into buckets
             // Iterate Data File
-            bulk_reader<native_file> r(df, dat_file_header::size, df_size, bulk_size);
+            bulk_reader<native_file> r(df, dat_file_header::size, dfSize, bulkSize);
             while (!r.eof())
             {
                 auto const offset = r.offset();
@@ -507,7 +507,7 @@ public:
                     std::uint8_t const* const key = is.data(dh.key_size);
                     auto const h = hash<hash_type>(key, kh.key_size, kh.salt);
                     auto const n = bucket_index(h, kh.buckets, kh.modulus);
-                    p(log, (npass * df_size) + r.offset());
+                    p(log, (npass * dfSize) + r.offset());
                     if (n < b0 || n >= b1)
                         continue;
                     bucket b(kh.block_size, buf.get() + ((n - b0) * kh.block_size));
diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp
index b97b31f1fe..f45de568f3 100644
--- a/src/test/nodestore/varint_test.cpp
+++ b/src/test/nodestore/varint_test.cpp
@@ -8,21 +8,21 @@
 
 namespace xrpl::NodeStore::tests {
 
-class varint_test : public beast::unit_test::suite
+class varint_test : public beast::unit_test::Suite
 {
 public:
     void
-    test_varints(std::vector<std::size_t> vv)
+    testVarints(std::vector<std::size_t> vv)
     {
         testcase("encode, decode");
         for (auto const v : vv)
         {
-            std::array<std::uint8_t, varint_traits<std::size_t>::max> vi{};
-            auto const n0 = write_varint(vi.data(), v);
+            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 == size_varint(v), "size error");
+            expect(n0 == sizeVarint(v), "size error");
             std::size_t v1 = 0;
-            auto const n1 = read_varint(vi.data(), n0, v1);
+            auto const n1 = readVarint(vi.data(), n0, v1);
             expect(n1 == n0, "read error");
             expect(v == v1, "wrong value");
         }
@@ -31,7 +31,7 @@ public:
     void
     run() override
     {
-        test_varints(
+        testVarints(
             {0,
              1,
              2,
diff --git a/src/test/overlay/ProtocolVersion_test.cpp b/src/test/overlay/ProtocolVersion_test.cpp
index a04bb3b36e..2fc8e4447d 100644
--- a/src/test/overlay/ProtocolVersion_test.cpp
+++ b/src/test/overlay/ProtocolVersion_test.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-class ProtocolVersion_test : public beast::unit_test::suite
+class ProtocolVersion_test : public beast::unit_test::Suite
 {
 private:
     void
@@ -34,10 +34,10 @@ public:
     run() override
     {
         testcase("Convert protocol version to string");
-        BEAST_EXPECT(to_string(make_protocol(1, 3)) == "XRPL/1.3");
-        BEAST_EXPECT(to_string(make_protocol(2, 0)) == "XRPL/2.0");
-        BEAST_EXPECT(to_string(make_protocol(2, 1)) == "XRPL/2.1");
-        BEAST_EXPECT(to_string(make_protocol(10, 10)) == "XRPL/10.10");
+        BEAST_EXPECT(to_string(makeProtocol(1, 3)) == "XRPL/1.3");
+        BEAST_EXPECT(to_string(makeProtocol(2, 0)) == "XRPL/2.0");
+        BEAST_EXPECT(to_string(makeProtocol(2, 1)) == "XRPL/2.1");
+        BEAST_EXPECT(to_string(makeProtocol(10, 10)) == "XRPL/10.10");
 
         {
             testcase("Convert strings to protocol versions");
@@ -60,11 +60,11 @@ public:
 
             BEAST_EXPECT(negotiateProtocolVersion("RTXP/1.2") == std::nullopt);
             BEAST_EXPECT(
-                negotiateProtocolVersion("RTXP/1.2, XRPL/2.0, XRPL/2.1") == make_protocol(2, 1));
-            BEAST_EXPECT(negotiateProtocolVersion("XRPL/2.2") == make_protocol(2, 2));
+                negotiateProtocolVersion("RTXP/1.2, XRPL/2.0, XRPL/2.1") == makeProtocol(2, 1));
+            BEAST_EXPECT(negotiateProtocolVersion("XRPL/2.2") == makeProtocol(2, 2));
             BEAST_EXPECT(
                 negotiateProtocolVersion("RTXP/1.2, XRPL/2.2, XRPL/2.3, XRPL/999.999") ==
-                make_protocol(2, 2));
+                makeProtocol(2, 2));
             BEAST_EXPECT(negotiateProtocolVersion("XRPL/999.999, WebSocket/1.0") == std::nullopt);
             BEAST_EXPECT(negotiateProtocolVersion("") == std::nullopt);
         }
diff --git a/src/test/overlay/TMGetObjectByHash_test.cpp b/src/test/overlay/TMGetObjectByHash_test.cpp
index e42d4ffe75..fa47f42740 100644
--- a/src/test/overlay/TMGetObjectByHash_test.cpp
+++ b/src/test/overlay/TMGetObjectByHash_test.cpp
@@ -47,7 +47,7 @@ using namespace jtx;
  * Tuning::hardMaxReplyNodes to prevent excessive memory usage and
  * potential DoS attacks from peers requesting large numbers of objects.
  */
-class TMGetObjectByHash_test : public beast::unit_test::suite
+class TMGetObjectByHash_test : public beast::unit_test::Suite
 {
     using middle_type = boost::beast::tcp_stream;
     using stream_type = boost::beast::ssl_stream<middle_type>;
@@ -66,17 +66,17 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
             PublicKey const& publicKey,
             ProtocolVersion protocol,
             Resource::Consumer consumer,
-            std::unique_ptr<TMGetObjectByHash_test::stream_type>&& stream_ptr,
+            std::unique_ptr<TMGetObjectByHash_test::stream_type>&& streamPtr,
             OverlayImpl& overlay)
             : PeerImp(
                   app,
-                  id_++,
+                  id++,
                   slot,
                   std::move(request),
                   publicKey,
                   protocol,
                   consumer,
-                  std::move(stream_ptr),
+                  std::move(streamPtr),
                   overlay)
         {
         }
@@ -103,15 +103,15 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
         static void
         resetId()
         {
-            id_ = 0;
+            id = 0;
         }
 
     private:
-        inline static Peer::id_t id_ = 0;
+        inline static Peer::id_t id = 0;
         std::shared_ptr<Message> lastSentMessage_;
     };
 
-    shared_context context_{make_SSLContext("")};
+    shared_context context_{makeSslContext("")};
     ProtocolVersion protocolVersion_{1, 7};
 
     std::shared_ptr<PeerTest>
@@ -119,15 +119,15 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
     {
         auto& overlay = dynamic_cast<OverlayImpl&>(env.app().getOverlay());
         boost::beast::http::request<boost::beast::http::dynamic_body> request;
-        auto stream_ptr =
+        auto streamPtr =
             std::make_unique<stream_type>(socket_type(env.app().getIOContext()), *context_);
 
         beast::IP::Endpoint const local(boost::asio::ip::make_address("172.1.1.1"), 51235);
         beast::IP::Endpoint const remote(boost::asio::ip::make_address("172.1.1.2"), 51235);
 
-        PublicKey const key(std::get<0>(randomKeyPair(KeyType::ed25519)));
+        PublicKey const key(std::get<0>(randomKeyPair(KeyType::Ed25519)));
         auto consumer = overlay.resourceManager().newInboundEndpoint(remote);
-        auto [slot, _] = overlay.peerFinder().new_inbound_slot(local, remote);
+        auto [slot, _] = overlay.peerFinder().newInboundSlot(local, remote);
 
         auto peer = std::make_shared<PeerTest>(
             env.app(),
@@ -136,10 +136,10 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
             key,
             protocolVersion_,
             consumer,
-            std::move(stream_ptr),
+            std::move(streamPtr),
             overlay);
 
-        overlay.add_active(peer);
+        overlay.addActive(peer);
         return peer;
     }
 
@@ -159,7 +159,7 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
 
             Blob data(100, static_cast<unsigned char>(i % 256));
             nodeStore.store(
-                NodeObjectType::hotLEDGER, std::move(data), hash, nodeStore.earliestLedgerSeq());
+                NodeObjectType::Ledger, std::move(data), hash, nodeStore.earliestLedgerSeq());
         }
 
         // Create a request with more objects than hardMaxReplyNodes
@@ -213,7 +213,7 @@ class TMGetObjectByHash_test : public beast::unit_test::suite
     void
     run() override
     {
-        int const limit = static_cast<int>(Tuning::hardMaxReplyNodes);
+        int const limit = static_cast<int>(Tuning::HardMaxReplyNodes);
         testReplyLimit(limit + 1, limit);
         testReplyLimit(limit, limit);
         testReplyLimit(limit - 1, limit - 1);
diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp
index 41db90dc57..0c164dfded 100644
--- a/src/test/overlay/cluster_test.cpp
+++ b/src/test/overlay/cluster_test.cpp
@@ -42,7 +42,7 @@ public:
     static PublicKey
     randomNode()
     {
-        return derivePublicKey(KeyType::secp256k1, randomSecretKey());
+        return derivePublicKey(KeyType::Secp256k1, randomSecretKey());
     }
 
     void
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index 02a3786476..0e75b26d51 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -59,7 +59,7 @@ static uint256
 ledgerHash(LedgerHeader const& info)
 {
     return xrpl::sha512Half(
-        HashPrefix::ledgerMaster,
+        HashPrefix::LedgerMaster,
         std::uint32_t(info.seq),
         std::uint64_t(info.drops.drops()),
         info.parentHash,
@@ -71,7 +71,7 @@ ledgerHash(LedgerHeader const& info)
         std::uint8_t(info.closeFlags));
 }
 
-class compression_test : public beast::unit_test::suite
+class compression_test : public beast::unit_test::Suite
 {
     using Compressed = compression::Compressed;
     using Algorithm = compression::Algorithm;
@@ -128,7 +128,7 @@ public:
         auto uncompressed = m.getBuffer(Compressed::Off);
         BEAST_EXPECT(
             std::equal(
-                uncompressed.begin() + xrpl::compression::headerBytes,
+                uncompressed.begin() + xrpl::compression::kHEADER_BYTES,
                 uncompressed.end(),
                 decompressed.begin()));
     }
@@ -140,17 +140,17 @@ public:
         manifests->mutable_list()->Reserve(n);
         for (int i = 0; i < n; i++)
         {
-            auto master = randomKeyPair(KeyType::ed25519);
-            auto signing = randomKeyPair(KeyType::ed25519);
-            STObject st(sfGeneric);
+            auto master = randomKeyPair(KeyType::Ed25519);
+            auto signing = randomKeyPair(KeyType::Ed25519);
+            STObject st(kSF_GENERIC);
             st[sfSequence] = i;
             st[sfPublicKey] = std::get<0>(master);
             st[sfSigningPubKey] = std::get<0>(signing);
             st[sfDomain] =
                 makeSlice(std::string("example") + std::to_string(i) + std::string(".com"));
             sign(
-                st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(master), sfMasterSignature);
-            sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(signing));
+                st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(master), sfMasterSignature);
+            sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(signing));
             Serializer s;
             st.add(s);
             auto* manifest = manifests->add_list();
@@ -195,10 +195,10 @@ public:
         std::string usdTxBlob;
         auto wsc = makeWSClient(env.app().config());
         {
-            Json::Value requestUSD;
+            json::Value requestUSD;
             requestUSD[jss::secret] = toBase58(generateSeed("bob"));
             requestUSD[jss::tx_json] = pay("bob", "alice", bob["USD"](fund / 2));
-            Json::Value replyUSD = wsc->invoke("sign", requestUSD);
+            json::Value replyUSD = wsc->invoke("sign", requestUSD);
 
             usdTxBlob = toBinary(replyUSD[jss::result][jss::tx_blob].asString());
         }
@@ -206,7 +206,7 @@ public:
         auto transaction = std::make_shared<protocol::TMTransaction>();
         transaction->set_rawtransaction(usdTxBlob);
         transaction->set_status(protocol::tsNEW);
-        transaction->set_receivetimestamp(rand_int<std::uint64_t>());
+        transaction->set_receivetimestamp(randInt<std::uint64_t>());
         transaction->set_deferred(true);
 
         return transaction;
@@ -297,21 +297,21 @@ public:
     {
         auto list = std::make_shared<protocol::TMValidatorList>();
 
-        auto master = randomKeyPair(KeyType::ed25519);
-        auto signing = randomKeyPair(KeyType::ed25519);
-        STObject st(sfGeneric);
+        auto master = randomKeyPair(KeyType::Ed25519);
+        auto signing = randomKeyPair(KeyType::Ed25519);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = 0;
         st[sfPublicKey] = std::get<0>(master);
         st[sfSigningPubKey] = std::get<0>(signing);
         st[sfDomain] = makeSlice(std::string("example.com"));
-        sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(master), sfMasterSignature);
-        sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(signing));
+        sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(master), sfMasterSignature);
+        sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(signing));
         Serializer s;
         st.add(s);
         list->set_manifest(s.data(), s.size());
         list->set_version(3);
         STObject const signature(sfSignature);
-        xrpl::sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(signing));
+        xrpl::sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(signing));
         Serializer s1;
         st.add(s1);
         list->set_signature(s1.data(), s1.size());
@@ -324,21 +324,21 @@ public:
     {
         auto list = std::make_shared<protocol::TMValidatorListCollection>();
 
-        auto master = randomKeyPair(KeyType::ed25519);
-        auto signing = randomKeyPair(KeyType::ed25519);
-        STObject st(sfGeneric);
+        auto master = randomKeyPair(KeyType::Ed25519);
+        auto signing = randomKeyPair(KeyType::Ed25519);
+        STObject st(kSF_GENERIC);
         st[sfSequence] = 0;
         st[sfPublicKey] = std::get<0>(master);
         st[sfSigningPubKey] = std::get<0>(signing);
         st[sfDomain] = makeSlice(std::string("example.com"));
-        sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(master), sfMasterSignature);
-        sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(signing));
+        sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(master), sfMasterSignature);
+        sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(signing));
         Serializer s;
         st.add(s);
         list->set_manifest(s.data(), s.size());
         list->set_version(4);
         STObject const signature(sfSignature);
-        xrpl::sign(st, HashPrefix::manifest, KeyType::ed25519, std::get<1>(signing));
+        xrpl::sign(st, HashPrefix::Manifest, KeyType::Ed25519, std::get<1>(signing));
         Serializer s1;
         st.add(s1);
         auto& blob = *list->add_blobs();
@@ -350,17 +350,17 @@ public:
     void
     testProtocol()
     {
-        auto thresh = beast::severities::Severity::kInfo;
+        auto thresh = beast::severities::Severity::KInfo;
         auto logs = std::make_unique<Logs>(thresh);
 
         protocol::TMManifests const manifests;
         protocol::TMEndpoints const endpoints;
         protocol::TMTransaction const transaction;
-        protocol::TMGetLedger const get_ledger;
-        protocol::TMLedgerData const ledger_data;
-        protocol::TMGetObjectByHash const get_object;
-        protocol::TMValidatorList const validator_list;
-        protocol::TMValidatorListCollection const validator_list_collection;
+        protocol::TMGetLedger const getLedger;
+        protocol::TMLedgerData const ledgerData;
+        protocol::TMGetObjectByHash const getObject;
+        protocol::TMValidatorList const validatorList;
+        protocol::TMValidatorListCollection const validatorListCollection;
 
         // 4.5KB
         doTest(buildManifests(20), protocol::mtMANIFESTS, 4, "TMManifests20");
@@ -423,26 +423,26 @@ public:
                 false,
                 env->app().config().TX_REDUCE_RELAY_ENABLE,
                 env->app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE);
-            http_request_type http_request;
-            http_request.version(request.version());
-            http_request.base() = request.base();
+            http_request_type httpRequest;
+            httpRequest.version(request.version());
+            httpRequest.base() = request.base();
             // feature enabled on the peer's connection only if both sides are
             // enabled
             auto const peerEnabled = inboundEnable && outboundEnable;
             // inbound is enabled if the request's header has the feature
             // enabled and the peer's configuration is enabled
             auto const inboundEnabled =
-                peerFeatureEnabled(http_request, FEATURE_COMPR, "lz4", inboundEnable);
+                peerFeatureEnabled(httpRequest, kFEATURE_COMPR, "lz4", inboundEnable);
             BEAST_EXPECT(!(peerEnabled ^ inboundEnabled));
 
             env.reset();
             env = getEnv(inboundEnable);
-            auto http_resp = xrpl::makeResponse(
-                true, http_request, addr, addr, uint256{1}, 1, {1, 0}, env->app());
+            auto httpResp = xrpl::makeResponse(
+                true, httpRequest, addr, addr, uint256{1}, 1, {1, 0}, env->app());
             // outbound is enabled if the response's header has the feature
             // enabled and the peer's configuration is enabled
             auto const outboundEnabled =
-                peerFeatureEnabled(http_resp, FEATURE_COMPR, "lz4", outboundEnable);
+                peerFeatureEnabled(httpResp, kFEATURE_COMPR, "lz4", outboundEnable);
             BEAST_EXPECT(!(peerEnabled ^ outboundEnabled));
         };
         handshake(1, 1);
diff --git a/src/test/overlay/handshake_test.cpp b/src/test/overlay/handshake_test.cpp
index 50b987f794..f2a7af293e 100644
--- a/src/test/overlay/handshake_test.cpp
+++ b/src/test/overlay/handshake_test.cpp
@@ -4,7 +4,7 @@
 
 namespace xrpl::test {
 
-class handshake_test : public beast::unit_test::suite
+class handshake_test : public beast::unit_test::Suite
 {
 public:
     handshake_test() = default;
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index 1a650655f2..842e739fa6 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 MAX_PEERS = 10;
-static constexpr std::uint32_t MAX_VALIDATORS = 10;
-static constexpr std::uint32_t MAX_MESSAGES = 200000;
+static constexpr std::uint32_t kMAX_PEERS = 10;
+static constexpr std::uint32_t kMAX_VALIDATORS = 10;
+static constexpr std::uint32_t kMAX_MESSAGES = 200000;
 
 /** Simulate two entities - peer directly connected to the server
  * (via squelch in PeerSim) and PeerImp (via Overlay)
@@ -70,11 +70,11 @@ static constexpr std::uint32_t MAX_MESSAGES = 200000;
 class PeerPartial : public Peer
 {
 public:
-    PeerPartial() : nodePublicKey_(derivePublicKey(KeyType::ed25519, randomSecretKey()))
+    PeerPartial() : nodePublicKey(derivePublicKey(KeyType::Ed25519, randomSecretKey()))
     {
     }
 
-    PublicKey nodePublicKey_;
+    PublicKey nodePublicKey;
     ~PeerPartial() override = default;
     virtual void
     onMessage(MessageSPtr const& m, SquelchCB f) = 0;
@@ -118,9 +118,9 @@ public:
     [[nodiscard]] PublicKey const&
     getNodePublic() const override
     {
-        return nodePublicKey_;
+        return nodePublicKey;
     }
-    Json::Value
+    json::Value
     json() override
     {
         return {};
@@ -142,8 +142,8 @@ public:
     [[nodiscard]] uint256 const&
     getClosedLedgerHash() const override
     {
-        static uint256 const hash{};
-        return hash;
+        static uint256 const kHASH{};
+        return kHASH;
     }
     [[nodiscard]] bool
     hasLedger(uint256 const& hash, std::uint32_t seq) const override
@@ -200,42 +200,42 @@ public:
     using period = std::milli;
     using duration = std::chrono::duration<std::uint32_t, period>;
     using time_point = std::chrono::time_point<ManualClock>;
-    inline static bool const is_steady = false;
+    inline static bool const is_steady = false;  // NOLINT(readability-identifier-naming)
 
     static void
     advance(duration d) noexcept
     {
-        now_ += d;
+        kNOW += d;
     }
 
     static void
     randAdvance(milliseconds min, milliseconds max)
     {
-        now_ += randDuration(min, max);
+        kNOW += randDuration(min, max);
     }
 
     static void
     reset() noexcept
     {
-        now_ = time_point(seconds(0));
+        kNOW = time_point(seconds(0));
     }
 
     static time_point
     now() noexcept
     {
-        return now_;
+        return kNOW;
     }
 
     static duration
     randDuration(milliseconds min, milliseconds max)
     {
-        return duration(milliseconds(rand_int(min.count(), max.count())));
+        return duration(milliseconds(randInt(min.count(), max.count())));
     }
 
     explicit ManualClock() = default;
 
 private:
-    inline static time_point now_ = time_point(seconds(0));
+    inline static time_point kNOW = time_point(seconds(0));
 };
 
 /** Simulate server's OverlayImpl */
@@ -323,12 +323,12 @@ class Validator
     using Links = std::unordered_map<Peer::id_t, LinkSPtr>;
 
 public:
-    Validator() : pkey_(std::get<0>(randomKeyPair(KeyType::ed25519)))
+    Validator() : pkey_(std::get<0>(randomKeyPair(KeyType::Ed25519)))
     {
         protocol::TMValidation v;
         v.set_validation("validation");
         message_ = std::make_shared<Message>(v, protocol::mtVALIDATION, pkey_);
-        id_ = sid_++;
+        id_ = sid++;
     }
     Validator(Validator const&) = default;
     Validator(Validator&&) = default;
@@ -350,7 +350,7 @@ public:
     static void
     resetId()
     {
-        sid_ = 0;
+        sid = 0;
     }
 
     PublicKey const&
@@ -377,7 +377,7 @@ public:
     }
 
     void
-    for_links(std::vector<Peer::id_t> peers, LinkIterCB f)
+    forLinks(std::vector<Peer::id_t> peers, LinkIterCB f)
     {
         for (auto id : peers)
         {
@@ -387,7 +387,7 @@ public:
     }
 
     void
-    for_links(LinkIterCB f, bool simulateSlow = false)
+    forLinks(LinkIterCB f, bool simulateSlow = false)
     {
         std::vector<LinkSPtr> v;
         std::ranges::transform(links_, std::back_inserter(v), [](auto& kv) { return kv.second; });
@@ -405,14 +405,14 @@ public:
     void
     send(std::vector<Peer::id_t> peers, SquelchCB f)
     {
-        for_links(peers, [&](Link& link, MessageSPtr m) { link.send(m, f); });
+        forLinks(peers, [&](Link& link, MessageSPtr m) { link.send(m, f); });
     }
 
     /** Send to all peers */
     void
     send(SquelchCB f)
     {
-        for_links([&](Link& link, MessageSPtr m) { link.send(m, f); });
+        forLinks([&](Link& link, MessageSPtr m) { link.send(m, f); });
     }
 
     MessageSPtr
@@ -447,7 +447,7 @@ private:
     Links links_;
     PublicKey pkey_;
     MessageSPtr message_ = nullptr;
-    inline static std::uint16_t sid_ = 0;
+    inline static std::uint16_t sid = 0;
     std::uint16_t id_ = 0;
 };
 
@@ -457,7 +457,7 @@ public:
     using id_t = Peer::id_t;
     PeerSim(Overlay& overlay, beast::Journal journal) : overlay_(overlay), squelch_(journal)
     {
-        id_ = sid_++;
+        id_ = sid++;
     }
 
     ~PeerSim() override = default;
@@ -477,7 +477,7 @@ public:
     static void
     resetId()
     {
-        sid_ = 0;
+        sid = 0;
     }
 
     /** Local Peer (PeerImp) */
@@ -510,7 +510,7 @@ public:
     }
 
 private:
-    inline static id_t sid_ = 0;
+    inline static id_t sid = 0;
     std::string fingerprint_;
     id_t id_;
     Overlay& overlay_;
@@ -704,8 +704,8 @@ public:
     void
     init()
     {
-        validators_.resize(MAX_VALIDATORS);
-        for (int p = 0; p < MAX_PEERS; p++)
+        validators_.resize(kMAX_VALIDATORS);
+        for (int p = 0; p < kMAX_PEERS; p++)
         {
             auto peer = overlay_.addPeer();
             for (auto& v : validators_)
@@ -749,7 +749,7 @@ public:
     void
     purgePeers()
     {
-        while (overlay_.getNumPeers() > MAX_PEERS)
+        while (overlay_.getNumPeers() > kMAX_PEERS)
             deleteLastPeer();
     }
 
@@ -795,14 +795,14 @@ public:
             PublicKey const key = v;
             squelch.clear_validatorpubkey();
             squelch.set_validatorpubkey(key.data(), key.size());
-            v.for_links({peer}, [&](Link& l, MessageSPtr) {
+            v.forLinks({peer}, [&](Link& l, MessageSPtr) {
                 std::dynamic_pointer_cast<PeerSim>(l.getPeer())->send(squelch);
             });
         }
     }
 
     static void
-    for_rand(std::uint32_t min, std::uint32_t max, std::function<void(std::uint32_t)> f)
+    forRand(std::uint32_t min, std::uint32_t max, std::function<void(std::uint32_t)> f)
     {
         auto size = max - min;
         std::vector<std::uint32_t> s(size);
@@ -817,8 +817,8 @@ public:
     void
     propagate(
         LinkIterCB link,
-        std::uint16_t nValidators = MAX_VALIDATORS,
-        std::uint32_t nMessages = MAX_MESSAGES,
+        std::uint16_t nValidators = kMAX_VALIDATORS,
+        std::uint32_t nMessages = kMAX_MESSAGES,
         bool purge = true,
         bool resetClock = true)
     {
@@ -834,7 +834,7 @@ public:
         for (int m = 0; m < nMessages; ++m)
         {
             ManualClock::randAdvance(milliseconds(1800), milliseconds(2200));
-            for_rand(0, nValidators, [&](std::uint32_t v) { validators_[v].for_links(link); });
+            forRand(0, nValidators, [&](std::uint32_t v) { validators_[v].forLinks(link); });
         }
     }
 
@@ -877,7 +877,7 @@ private:
     std::vector<Validator> validators_;
 };
 
-class reduce_relay_test : public beast::unit_test::suite
+class reduce_relay_test : public beast::unit_test::Suite
 {
     using Slot = reduce_relay::Slot<ManualClock>;
     using id_t = Peer::id_t;
@@ -921,15 +921,15 @@ protected:
     //       time in any quantity
     struct Event
     {
-        State state_ = State::Off;
-        std::uint32_t cnt_ = 0;
-        std::uint32_t handledCnt_ = 0;
-        bool isSelected_ = false;
-        Peer::id_t peer_{};
-        std::uint16_t validator_{};
-        std::optional<PublicKey> key_;
-        time_point<ManualClock> time_;
-        bool handled_ = false;
+        State state = State::Off;
+        std::uint32_t cnt = 0;
+        std::uint32_t handledCnt = 0;
+        bool isSelected = false;
+        Peer::id_t peer{};
+        std::uint16_t validator{};
+        std::optional<PublicKey> key;
+        time_point<ManualClock> time;
+        bool handled = false;
     };
 
     /** Randomly brings the link between a validator and a peer down.
@@ -979,56 +979,56 @@ protected:
 
             // Trigger Link Down or Peer Disconnect event
             // Only one Link Down at a time
-            if (events[EventType::LinkDown].state_ == State::Off)
+            if (events[EventType::LinkDown].state == State::Off)
             {
                 auto update = [&](EventType event) {
-                    events[event].cnt_++;
-                    events[event].validator_ = validator.id();
-                    events[event].key_ = validator;
-                    events[event].peer_ = link.peerId();
-                    events[event].state_ = State::On;
-                    events[event].time_ = now;
+                    events[event].cnt++;
+                    events[event].validator = validator.id();
+                    events[event].key = validator;
+                    events[event].peer = link.peerId();
+                    events[event].state = State::On;
+                    events[event].time = now;
                     if (event == EventType::LinkDown)
                     {
                         network_.enableLink(validator.id(), link.peerId(), false);
-                        events[event].isSelected_ =
+                        events[event].isSelected =
                             network_.overlay().isSelected(validator, link.peerId());
                     }
                     else
                     {
-                        events[event].isSelected_ = network_.isSelected(link.peerId());
+                        events[event].isSelected = network_.isSelected(link.peerId());
                     }
                 };
-                auto r = rand_int(0, 1000);
+                auto r = randInt(0, 1000);
                 if (r == (int)EventType::LinkDown || r == (int)EventType::PeerDisconnected)
                 {
                     update(static_cast<EventType>(r));
                 }
             }
 
-            if (events[EventType::PeerDisconnected].state_ == State::On)
+            if (events[EventType::PeerDisconnected].state == State::On)
             {
                 auto& event = events[EventType::PeerDisconnected];
-                bool const allCounting = network_.allCounting(event.peer_);
+                bool const allCounting = network_.allCounting(event.peer);
                 network_.overlay().deletePeer(
-                    event.peer_, [&](PublicKey const& v, PeerWPtr const& peerPtr) {
-                        if (event.isSelected_)
+                    event.peer, [&](PublicKey const& v, PeerWPtr const& peerPtr) {
+                        if (event.isSelected)
                             sendSquelch(v, peerPtr, {});
-                        event.handled_ = true;
+                        event.handled = true;
                     });
                 // Should only be unsquelched if the peer is in Selected state
                 // If in Selected state it's possible unsquelching didn't
                 // take place because there is no peers in Squelched state in
                 // any of the slots where the peer is in Selected state
                 // (allCounting is true)
-                bool const handled = (!event.isSelected_ && !event.handled_) ||
-                    (event.isSelected_ && (event.handled_ || allCounting));
+                bool const handled = (!event.isSelected && !event.handled) ||
+                    (event.isSelected && (event.handled || allCounting));
                 BEAST_EXPECT(handled);
-                event.state_ = State::Off;
-                event.isSelected_ = false;
-                event.handledCnt_ += handled;
-                event.handled_ = false;
-                network_.onDisconnectPeer(event.peer_);
+                event.state = State::Off;
+                event.isSelected = false;
+                event.handledCnt += handled;
+                event.handled = false;
+                network_.onDisconnectPeer(event.peer);
             }
 
             auto& event = events[EventType::LinkDown];
@@ -1044,55 +1044,55 @@ protected:
                 // 4) peer is in Slot's peers_ (if not then it is deleted
                 //    by Slots::deleteIdlePeers())
                 bool mustHandle = false;
-                if (event.state_ == State::On && BEAST_EXPECT(event.key_))
+                if (event.state == State::On && BEAST_EXPECT(event.key))
                 {
-                    event.isSelected_ = network_.overlay().isSelected(*event.key_, event.peer_);
-                    auto peers = network_.overlay().getPeers(*event.key_);
+                    event.isSelected = network_.overlay().isSelected(*event.key, event.peer);
+                    auto peers = network_.overlay().getPeers(*event.key);
                     auto d = reduce_relay::epoch<milliseconds>(now).count() -
-                        std::get<3>(peers[event.peer_]);
-                    mustHandle = event.isSelected_ &&
-                        d > milliseconds(reduce_relay::IDLED).count() &&
-                        network_.overlay().inState(
-                            *event.key_, reduce_relay::PeerState::Squelched) > 0 &&
-                        peers.contains(event.peer_);
+                        std::get<3>(peers[event.peer]);
+                    mustHandle = event.isSelected &&
+                        d > milliseconds(reduce_relay::kIDLED).count() &&
+                        network_.overlay().inState(*event.key, reduce_relay::PeerState::Squelched) >
+                            0 &&
+                        peers.contains(event.peer);
                 }
                 network_.overlay().deleteIdlePeers([&](PublicKey const& v, PeerWPtr const& ptr) {
-                    event.handled_ = true;
-                    if (mustHandle && v == event.key_)
+                    event.handled = true;
+                    if (mustHandle && v == event.key)
                     {
-                        event.state_ = State::WaitReset;
+                        event.state = State::WaitReset;
                         sendSquelch(validator, ptr, {});
                     }
                 });
-                bool const handled = (event.handled_ && event.state_ == State::WaitReset) ||
-                    (!event.handled_ && !mustHandle);
+                bool const handled = (event.handled && event.state == State::WaitReset) ||
+                    (!event.handled && !mustHandle);
                 BEAST_EXPECT(handled);
             }
-            if (event.state_ == State::WaitReset ||
-                (event.state_ == State::On &&
-                 (now - event.time_ > (reduce_relay::IDLED + seconds(2)))))
+            if (event.state == State::WaitReset ||
+                (event.state == State::On &&
+                 (now - event.time > (reduce_relay::kIDLED + seconds(2)))))
             {
-                bool const handled = event.state_ == State::WaitReset || !event.handled_;
+                bool const handled = event.state == State::WaitReset || !event.handled;
                 BEAST_EXPECT(handled);
-                event.state_ = State::Off;
-                event.isSelected_ = false;
-                event.handledCnt_ += handled;
-                event.handled_ = false;
-                network_.enableLink(event.validator_, event.peer_, true);
+                event.state = State::Off;
+                event.isSelected = false;
+                event.handledCnt += handled;
+                event.handled = false;
+                network_.enableLink(event.validator, event.peer, true);
             }
         });
 
         auto& down = events[EventType::LinkDown];
         auto& disconnected = events[EventType::PeerDisconnected];
         // It's possible the last Down Link event is not handled
-        BEAST_EXPECT(down.handledCnt_ >= down.cnt_ - 1);
+        BEAST_EXPECT(down.handledCnt >= down.cnt - 1);
         // All Peer Disconnect events must be handled
-        BEAST_EXPECT(disconnected.cnt_ == disconnected.handledCnt_);
+        BEAST_EXPECT(disconnected.cnt == disconnected.handledCnt);
         if (log)
         {
-            std::cout << "link down count: " << down.cnt_ << "/" << down.handledCnt_
-                      << " peer disconnect count: " << disconnected.cnt_ << "/"
-                      << disconnected.handledCnt_;
+            std::cout << "link down count: " << down.cnt << "/" << down.handledCnt
+                      << " peer disconnect count: " << disconnected.cnt << "/"
+                      << disconnected.handledCnt;
         }
     }
 
@@ -1163,12 +1163,13 @@ protected:
                 {
                     BEAST_EXPECT(
                         squelched ==
-                        MAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                        kMAX_PEERS -
+                            env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
                     n++;
                 }
             },
             1,
-            reduce_relay::MAX_MESSAGE_THRESHOLD + 2,
+            reduce_relay::kMAX_MESSAGE_THRESHOLD + 2,
             purge,
             resetClock);
         auto selected = network_.overlay().getSelected(network_.validator(0));
@@ -1234,7 +1235,7 @@ protected:
                 id, [&](PublicKey const& key, PeerWPtr const& peer) { unsquelched++; });
             BEAST_EXPECT(
                 unsquelched ==
-                MAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                kMAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
             BEAST_EXPECT(checkCounting(network_.validator(0), true));
         });
     }
@@ -1247,14 +1248,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::IDLED + 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 ==
-                MAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
+                kMAX_PEERS - env_.app().config().VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS);
             BEAST_EXPECT(checkCounting(network_.validator(0), true));
         });
     }
@@ -1432,7 +1433,7 @@ vp_base_squelch_max_selected_peers=2
             // bootup
             BEAST_EXPECT(!createSlots(true).baseSquelchReady());
 
-            ManualClock::advance(reduce_relay::WAIT_ON_BOOTUP + minutes{1});
+            ManualClock::advance(reduce_relay::kWAIT_ON_BOOTUP + minutes{1});
 
             // base squelch enabled and bootup time passed
             BEAST_EXPECT(createSlots(true).baseSquelchReady());
@@ -1469,7 +1470,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::IDLED + 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));
@@ -1484,30 +1485,30 @@ vp_base_squelch_max_selected_peers=2
         void
         squelch(PublicKey const&, Peer::id_t, std::uint32_t duration) const override
         {
-            maxDuration_ = std::max<uint32_t>(duration, maxDuration_);
+            maxDuration = std::max<uint32_t>(duration, maxDuration);
         }
         void
         unsquelch(PublicKey const&, Peer::id_t) const override
         {
         }
-        mutable int maxDuration_{0};
+        mutable int maxDuration{0};
     };
 
     void
     testRandomSquelch(bool l)
     {
         doTest("Random Squelch", l, [&](bool l) {
-            PublicKey validator = std::get<0>(randomKeyPair(KeyType::ed25519));
+            PublicKey validator = std::get<0>(randomKeyPair(KeyType::Ed25519));
             Handler handler;
 
             auto run = [&](int npeers) {
-                handler.maxDuration_ = 0;
+                handler.maxDuration = 0;
                 reduce_relay::Slots<ManualClock> slots(env_.app(), handler, env_.app().config());
                 // 1st message from a new peer switches the slot
                 // 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::MAX_MESSAGE_THRESHOLD + 2; m++)
+                for (int m = 1; m <= reduce_relay::kMAX_MESSAGE_THRESHOLD + 2; m++)
                 {
                     for (int peer = 0; peer < npeers; peer++)
                     {
@@ -1524,41 +1525,41 @@ vp_base_squelch_max_selected_peers=2
             };
 
             using namespace reduce_relay;
-            // expect max duration less than MAX_UNSQUELCH_EXPIRE_DEFAULT with
+            // expect max duration less than kMAX_UNSQUELCH_EXPIRE_DEFAULT with
             // less than or equal to 60 peers
             run(20);
             BEAST_EXPECT(
-                handler.maxDuration_ >= MIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_DEFAULT.count());
+                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
+                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count());
             run(60);
             BEAST_EXPECT(
-                handler.maxDuration_ >= MIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_DEFAULT.count());
-            // expect max duration greater than MIN_UNSQUELCH_EXPIRE and less
-            // than MAX_UNSQUELCH_EXPIRE_PEERS with peers greater than 60
+                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
             // 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_ >= MIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_PEERS.count());
+                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
+                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS.count());
             using namespace beast::unit_test::detail;
-            if (handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_DEFAULT.count())
+            if (handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count())
             {
-                log << make_reason("warning: squelch duration is low", __FILE__, __LINE__)
+                log << makeReason("warning: squelch duration is low", __FILE__, __LINE__)
                     << std::endl
                     << std::flush;
             }
-            // more than 400 is still less than MAX_UNSQUELCH_EXPIRE_PEERS
+            // more than 400 is still less than kMAX_UNSQUELCH_EXPIRE_PEERS
             run(400);
             BEAST_EXPECT(
-                handler.maxDuration_ >= MIN_UNSQUELCH_EXPIRE.count() &&
-                handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_PEERS.count());
-            if (handler.maxDuration_ <= MAX_UNSQUELCH_EXPIRE_DEFAULT.count())
+                handler.maxDuration >= kMIN_UNSQUELCH_EXPIRE.count() &&
+                handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS.count());
+            if (handler.maxDuration <= kMAX_UNSQUELCH_EXPIRE_DEFAULT.count())
             {
-                log << make_reason("warning: squelch duration is low", __FILE__, __LINE__)
+                log << makeReason("warning: squelch duration is low", __FILE__, __LINE__)
                     << std::endl
                     << std::flush;
             }
@@ -1592,25 +1593,25 @@ vp_base_squelch_max_selected_peers=2
                     false,
                     env_.app().config().TX_REDUCE_RELAY_ENABLE,
                     env_.app().config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE);
-                http_request_type http_request;
-                http_request.version(request.version());
-                http_request.base() = request.base();
+                http_request_type httpRequest;
+                httpRequest.version(request.version());
+                httpRequest.base() = request.base();
                 // feature enabled on the peer's connection only if both sides
                 // are enabled
                 auto const peerEnabled = inboundEnable && outboundEnable;
                 // inbound is enabled if the request's header has the feature
                 // enabled and the peer's configuration is enabled
                 auto const inboundEnabled =
-                    peerFeatureEnabled(http_request, FEATURE_VPRR, inboundEnable);
+                    peerFeatureEnabled(httpRequest, kFEATURE_VPRR, inboundEnable);
                 BEAST_EXPECT(!(peerEnabled ^ inboundEnabled));
 
                 setEnv(inboundEnable);
-                auto http_resp = xrpl::makeResponse(
-                    true, http_request, addr, addr, uint256{1}, 1, {1, 0}, env_.app());
+                auto httpResp = xrpl::makeResponse(
+                    true, httpRequest, addr, addr, uint256{1}, 1, {1, 0}, env_.app());
                 // outbound is enabled if the response's header has the feature
                 // enabled and the peer's configuration is enabled
                 auto const outboundEnabled =
-                    peerFeatureEnabled(http_resp, FEATURE_VPRR, outboundEnable);
+                    peerFeatureEnabled(httpResp, kFEATURE_VPRR, outboundEnable);
                 BEAST_EXPECT(!(peerEnabled ^ outboundEnabled));
             };
             handshake(1, 1);
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 42959000a1..1b608edee7 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -49,7 +49,7 @@ will complete with eof.
 
 */
 
-class short_read_test : public beast::unit_test::suite
+class short_read_test : public beast::unit_test::Suite
 {
 private:
     using io_context_type = boost::asio::io_context;
@@ -174,144 +174,142 @@ private:
 
         struct Acceptor : Child, std::enable_shared_from_this<Acceptor>
         {
-            Server& server_;
-            short_read_test& test_;
-            acceptor_type acceptor_;
-            socket_type socket_;
-            strand_type strand_;
+            Server& server;
+            short_read_test& test;
+            acceptor_type acceptor;
+            socket_type socket;
+            strand_type strand;
 
             explicit Acceptor(Server& server)
                 : Child(server)
-                , server_(server)
-                , test_(server_.test_)
-                , acceptor_(
-                      test_.io_context_,
+                , server(server)
+                , test(server.test_)
+                , acceptor(
+                      test.io_context_,
                       endpoint_type(boost::asio::ip::make_address(test::getEnvLocalhostAddr()), 0))
-                , socket_(test_.io_context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
+                , socket(test.io_context_)
+                , strand(boost::asio::make_strand(test.io_context_))
             {
-                acceptor_.listen();
-                server_.endpoint_ = acceptor_.local_endpoint();
+                acceptor.listen();
+                server.endpoint_ = acceptor.local_endpoint();
             }
 
             void
             close() override
             {
-                if (!strand_.running_in_this_thread())
+                if (!strand.running_in_this_thread())
                 {
-                    post(strand_, std::bind(&Acceptor::close, shared_from_this()));
+                    post(strand, std::bind(&Acceptor::close, shared_from_this()));
                     return;
                 }
-                acceptor_.close();
+                acceptor.close();
             }
 
             void
             run()
             {
-                acceptor_.async_accept(
-                    socket_,
+                acceptor.async_accept(
+                    socket,
                     bind_executor(
-                        strand_,
-                        std::bind(
-                            &Acceptor::on_accept, shared_from_this(), std::placeholders::_1)));
+                        strand,
+                        std::bind(&Acceptor::onAccept, shared_from_this(), std::placeholders::_1)));
             }
 
             void
             fail(std::string const& what, error_code ec)
             {
-                if (acceptor_.is_open())
+                if (acceptor.is_open())
                 {
                     if (ec != boost::asio::error::operation_aborted)
-                        test_.log << what << ": " << ec.message() << std::endl;
-                    acceptor_.close();
+                        test.log << what << ": " << ec.message() << std::endl;
+                    acceptor.close();
                 }
             }
 
             void
-            on_accept(error_code ec)
+            onAccept(error_code ec)
             {
                 if (ec)
                 {
                     fail("accept", ec);
                     return;
                 }
-                auto const p = std::make_shared<Connection>(server_, std::move(socket_));
-                server_.add(p);
+                auto const p = std::make_shared<Connection>(server, std::move(socket));
+                server.add(p);
                 p->run();
-                acceptor_.async_accept(
-                    socket_,
+                acceptor.async_accept(
+                    socket,
                     bind_executor(
-                        strand_,
-                        std::bind(
-                            &Acceptor::on_accept, shared_from_this(), std::placeholders::_1)));
+                        strand,
+                        std::bind(&Acceptor::onAccept, shared_from_this(), std::placeholders::_1)));
             }
         };
 
         struct Connection : Child, std::enable_shared_from_this<Connection>
         {
-            Server& server_;
-            short_read_test& test_;
-            socket_type socket_;
-            stream_type stream_;
-            strand_type strand_;
-            timer_type timer_;
-            boost::asio::streambuf buf_;
+            Server& server;
+            short_read_test& test;
+            socket_type socket;
+            stream_type stream;
+            strand_type strand;
+            timer_type timer;
+            boost::asio::streambuf buf;
 
-            Connection(Server& server, socket_type&& socket)
-                : Child(server)
-                , server_(server)
-                , test_(server_.test_)
-                , socket_(std::move(socket))
-                , stream_(socket_, *test_.context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
-                , timer_(test_.io_context_)
+            Connection(Server& inServer, socket_type&& inSocket)
+                : Child(inServer)
+                , server(inServer)
+                , test(server.test_)
+                , socket(std::move(inSocket))
+                , stream(socket, *test.context_)
+                , strand(boost::asio::make_strand(test.io_context_))
+                , timer(test.io_context_)
             {
             }
 
             void
             close() override
             {
-                if (!strand_.running_in_this_thread())
+                if (!strand.running_in_this_thread())
                 {
-                    post(strand_, std::bind(&Connection::close, shared_from_this()));
+                    post(strand, std::bind(&Connection::close, shared_from_this()));
                     return;
                 }
-                if (socket_.is_open())
+                if (socket.is_open())
                 {
-                    socket_.close();
-                    timer_.cancel();
+                    socket.close();
+                    timer.cancel();
                 }
             }
 
             void
             run()
             {
-                timer_.expires_after(std::chrono::seconds(3));
-                timer_.async_wait(bind_executor(
-                    strand_,
-                    std::bind(&Connection::on_timer, shared_from_this(), std::placeholders::_1)));
-                stream_.async_handshake(
+                timer.expires_after(std::chrono::seconds(3));
+                timer.async_wait(bind_executor(
+                    strand,
+                    std::bind(&Connection::onTimer, shared_from_this(), std::placeholders::_1)));
+                stream.async_handshake(
                     stream_type::server,
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_handshake, shared_from_this(), std::placeholders::_1)));
+                            &Connection::onHandshake, shared_from_this(), std::placeholders::_1)));
             }
 
             void
             fail(std::string const& what, error_code ec)
             {
-                if (socket_.is_open())
+                if (socket.is_open())
                 {
                     if (ec != boost::asio::error::operation_aborted)
-                        test_.log << "[server] " << what << ": " << ec.message() << std::endl;
-                    socket_.close();
-                    timer_.cancel();
+                        test.log << "[server] " << what << ": " << ec.message() << std::endl;
+                    socket.close();
+                    timer.cancel();
                 }
             }
 
             void
-            on_timer(error_code ec)
+            onTimer(error_code ec)
             {
                 if (ec == boost::asio::error::operation_aborted)
                     return;
@@ -320,12 +318,12 @@ private:
                     fail("timer", ec);
                     return;
                 }
-                test_.log << "[server] timeout" << std::endl;
-                socket_.close();
+                test.log << "[server] timeout" << std::endl;
+                socket.close();
             }
 
             void
-            on_handshake(error_code ec)
+            onHandshake(error_code ec)
             {
                 if (ec)
                 {
@@ -334,13 +332,13 @@ private:
                 }
 #if 1
                 boost::asio::async_read_until(
-                    stream_,
-                    buf_,
+                    stream,
+                    buf,
                     "\n",
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_read,
+                            &Connection::onRead,
                             shared_from_this(),
                             std::placeholders::_1,
                             std::placeholders::_2)));
@@ -350,15 +348,15 @@ private:
             }
 
             void
-            on_read(error_code ec, std::size_t bytes_transferred)
+            onRead(error_code ec, std::size_t bytesTransferred)
             {
                 if (ec == boost::asio::error::eof)
                 {
-                    server_.test_.log << "[server] read: EOF" << std::endl;
-                    stream_.async_shutdown(bind_executor(
-                        strand_,
+                    server.test_.log << "[server] read: EOF" << std::endl;
+                    stream.async_shutdown(bind_executor(
+                        strand,
                         std::bind(
-                            &Connection::on_shutdown, shared_from_this(), std::placeholders::_1)));
+                            &Connection::onShutdown, shared_from_this(), std::placeholders::_1)));
                     return;
                 }
                 if (ec)
@@ -367,46 +365,45 @@ private:
                     return;
                 }
 
-                buf_.commit(bytes_transferred);
-                buf_.consume(bytes_transferred);
-                write(buf_, "BYE\n");
+                buf.commit(bytesTransferred);
+                buf.consume(bytesTransferred);
+                write(buf, "BYE\n");
                 boost::asio::async_write(
-                    stream_,
-                    buf_.data(),
+                    stream,
+                    buf.data(),
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_write,
+                            &Connection::onWrite,
                             shared_from_this(),
                             std::placeholders::_1,
                             std::placeholders::_2)));
             }
 
             void
-            on_write(error_code ec, std::size_t bytes_transferred)
+            onWrite(error_code ec, std::size_t bytesTransferred)
             {
-                buf_.consume(bytes_transferred);
+                buf.consume(bytesTransferred);
                 if (ec)
                 {
                     fail("write", ec);
                     return;
                 }
-                stream_.async_shutdown(bind_executor(
-                    strand_,
-                    std::bind(
-                        &Connection::on_shutdown, shared_from_this(), std::placeholders::_1)));
+                stream.async_shutdown(bind_executor(
+                    strand,
+                    std::bind(&Connection::onShutdown, shared_from_this(), std::placeholders::_1)));
             }
 
             void
-            on_shutdown(error_code ec)
+            onShutdown(error_code ec)
             {
                 if (ec)
                 {
                     fail("shutdown", ec);
                     return;
                 }
-                socket_.close();
-                timer_.cancel();
+                socket.close();
+                timer.cancel();
             }
         };
 
@@ -440,71 +437,71 @@ private:
 
         struct Connection : Child, std::enable_shared_from_this<Connection>
         {
-            Client& client_;
-            short_read_test& test_;
-            socket_type socket_;
-            stream_type stream_;
-            strand_type strand_;
-            timer_type timer_;
-            boost::asio::streambuf buf_;
-            endpoint_type const& ep_;
+            Client& client;
+            short_read_test& test;
+            socket_type socket;
+            stream_type stream;
+            strand_type strand;
+            timer_type timer;
+            boost::asio::streambuf buf;
+            endpoint_type const& ep;
 
             Connection(Client& client, endpoint_type const& ep)
                 : Child(client)
-                , client_(client)
-                , test_(client_.test_)
-                , socket_(test_.io_context_)
-                , stream_(socket_, *test_.context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
-                , timer_(test_.io_context_)
-                , ep_(ep)
+                , client(client)
+                , test(client.test_)
+                , socket(test.io_context_)
+                , stream(socket, *test.context_)
+                , strand(boost::asio::make_strand(test.io_context_))
+                , timer(test.io_context_)
+                , ep(ep)
             {
             }
 
             void
             close() override
             {
-                if (!strand_.running_in_this_thread())
+                if (!strand.running_in_this_thread())
                 {
-                    post(strand_, std::bind(&Connection::close, shared_from_this()));
+                    post(strand, std::bind(&Connection::close, shared_from_this()));
                     return;
                 }
-                if (socket_.is_open())
+                if (socket.is_open())
                 {
-                    socket_.close();
-                    timer_.cancel();
+                    socket.close();
+                    timer.cancel();
                 }
             }
 
             void
             run(endpoint_type const& ep)
             {
-                timer_.expires_after(std::chrono::seconds(3));
-                timer_.async_wait(bind_executor(
-                    strand_,
-                    std::bind(&Connection::on_timer, shared_from_this(), std::placeholders::_1)));
-                socket_.async_connect(
+                timer.expires_after(std::chrono::seconds(3));
+                timer.async_wait(bind_executor(
+                    strand,
+                    std::bind(&Connection::onTimer, shared_from_this(), std::placeholders::_1)));
+                socket.async_connect(
                     ep,
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_connect, shared_from_this(), std::placeholders::_1)));
+                            &Connection::onConnect, shared_from_this(), std::placeholders::_1)));
             }
 
             void
             fail(std::string const& what, error_code ec)
             {
-                if (socket_.is_open())
+                if (socket.is_open())
                 {
                     if (ec != boost::asio::error::operation_aborted)
-                        test_.log << "[client] " << what << ": " << ec.message() << std::endl;
-                    socket_.close();
-                    timer_.cancel();
+                        test.log << "[client] " << what << ": " << ec.message() << std::endl;
+                    socket.close();
+                    timer.cancel();
                 }
             }
 
             void
-            on_timer(error_code ec)
+            onTimer(error_code ec)
             {
                 if (ec == boost::asio::error::operation_aborted)
                     return;
@@ -513,44 +510,44 @@ private:
                     fail("timer", ec);
                     return;
                 }
-                test_.log << "[client] timeout";
-                socket_.close();
+                test.log << "[client] timeout";
+                socket.close();
             }
 
             void
-            on_connect(error_code ec)
+            onConnect(error_code ec)
             {
                 if (ec)
                 {
                     fail("connect", ec);
                     return;
                 }
-                stream_.async_handshake(
+                stream.async_handshake(
                     stream_type::client,
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_handshake, shared_from_this(), std::placeholders::_1)));
+                            &Connection::onHandshake, shared_from_this(), std::placeholders::_1)));
             }
 
             void
-            on_handshake(error_code ec)
+            onHandshake(error_code ec)
             {
                 if (ec)
                 {
                     fail("handshake", ec);
                     return;
                 }
-                write(buf_, "HELLO\n");
+                write(buf, "HELLO\n");
 
 #if 1
                 boost::asio::async_write(
-                    stream_,
-                    buf_.data(),
+                    stream,
+                    buf.data(),
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_write,
+                            &Connection::onWrite,
                             shared_from_this(),
                             std::placeholders::_1,
                             std::placeholders::_2)));
@@ -563,9 +560,9 @@ private:
             }
 
             void
-            on_write(error_code ec, std::size_t bytes_transferred)
+            onWrite(error_code ec, std::size_t bytesTransferred)
             {
-                buf_.consume(bytes_transferred);
+                buf.consume(bytesTransferred);
                 if (ec)
                 {
                     fail("write", ec);
@@ -573,13 +570,13 @@ private:
                 }
 #if 1
                 boost::asio::async_read_until(
-                    stream_,
-                    buf_,
+                    stream,
+                    buf,
                     "\n",
                     bind_executor(
-                        strand_,
+                        strand,
                         std::bind(
-                            &Connection::on_read,
+                            &Connection::onRead,
                             shared_from_this(),
                             std::placeholders::_1,
                             std::placeholders::_2)));
@@ -592,30 +589,29 @@ private:
             }
 
             void
-            on_read(error_code ec, std::size_t bytes_transferred)
+            onRead(error_code ec, std::size_t bytesTransferred)
             {
                 if (ec)
                 {
                     fail("read", ec);
                     return;
                 }
-                buf_.commit(bytes_transferred);
-                stream_.async_shutdown(bind_executor(
-                    strand_,
-                    std::bind(
-                        &Connection::on_shutdown, shared_from_this(), std::placeholders::_1)));
+                buf.commit(bytesTransferred);
+                stream.async_shutdown(bind_executor(
+                    strand,
+                    std::bind(&Connection::onShutdown, shared_from_this(), std::placeholders::_1)));
             }
 
             void
-            on_shutdown(error_code ec)
+            onShutdown(error_code ec)
             {
                 if (ec)
                 {
                     fail("shutdown", ec);
                     return;
                 }
-                socket_.close();
-                timer_.cancel();
+                socket.close();
+                timer.cancel();
             }
         };
 
@@ -641,7 +637,7 @@ public:
             beast::setCurrentThreadName("io_context");
             this->io_context_.run();
         }))
-        , context_(make_SSLContext(""))
+        , context_(makeSslContext(""))
     {
     }
 
diff --git a/src/test/overlay/traffic_count_test.cpp b/src/test/overlay/traffic_count_test.cpp
index b5cb73c65d..a8a14ed111 100644
--- a/src/test/overlay/traffic_count_test.cpp
+++ b/src/test/overlay/traffic_count_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl::test {
 
-class traffic_count_test : public beast::unit_test::suite
+class traffic_count_test : public beast::unit_test::Suite
 {
 public:
     traffic_count_test() = default;
@@ -23,12 +23,12 @@ public:
 
         // a known message is categorized to a proper category
         auto const known = TrafficCount::categorize(message, protocol::mtPING, false);
-        BEAST_EXPECT(known == TrafficCount::category::base);
+        BEAST_EXPECT(known == TrafficCount::Category::Base);
 
         // an unknown message type is categorized as unknown
         auto const unknown =
             TrafficCount::categorize(message, static_cast<protocol::MessageType>(99), false);
-        BEAST_EXPECT(unknown == TrafficCount::category::unknown);
+        BEAST_EXPECT(unknown == TrafficCount::Category::Unknown);
     }
 
     struct TestCase
@@ -48,16 +48,16 @@ public:
     {
         auto run = [&](TestCase const& tc) {
             testcase(tc.name);
-            TrafficCount m_traffic;
+            TrafficCount traffic;
 
-            auto const counts = m_traffic.getCounts();
+            auto const counts = traffic.getCounts();
             std::ranges::for_each(counts, [&](auto const& pair) {
                 for (auto i = 0; i < tc.messageCount; ++i)
-                    m_traffic.addCount(pair.first, tc.inbound, tc.size);
+                    traffic.addCount(pair.first, tc.inbound, tc.size);
             });
 
-            auto const counts_new = m_traffic.getCounts();
-            std::ranges::for_each(counts_new, [&](auto const& pair) {
+            auto const countsNew = traffic.getCounts();
+            std::ranges::for_each(countsNew, [&](auto const& pair) {
                 BEAST_EXPECT(pair.second.bytesIn.load() == tc.expectedBytesIn);
                 BEAST_EXPECT(pair.second.bytesOut.load() == tc.expectedBytesOut);
                 BEAST_EXPECT(pair.second.messagesIn.load() == tc.expectedMessagesIn);
@@ -108,11 +108,11 @@ public:
         testcase("category-to-string");
 
         // known category returns known string value
-        BEAST_EXPECT(TrafficCount::to_string(TrafficCount::category::total) == "total");
+        BEAST_EXPECT(TrafficCount::toString(TrafficCount::Category::Total) == "total");
 
         // return "unknown" for unknown categories
         BEAST_EXPECT(
-            TrafficCount::to_string(static_cast<TrafficCount::category>(1000)) == "unknown");
+            TrafficCount::toString(static_cast<TrafficCount::Category>(1000)) == "unknown");
     }
 
     void
diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp
index bbb31fd38b..e053774108 100644
--- a/src/test/overlay/tx_reduce_relay_test.cpp
+++ b/src/test/overlay/tx_reduce_relay_test.cpp
@@ -45,7 +45,7 @@
 
 namespace xrpl::test {
 
-class tx_reduce_relay_test : public beast::unit_test::suite
+class tx_reduce_relay_test : public beast::unit_test::Suite
 {
 public:
     using socket_type = boost::asio::ip::tcp::socket;
@@ -126,20 +126,20 @@ private:
             PublicKey const& publicKey,
             ProtocolVersion protocol,
             Resource::Consumer consumer,
-            std::unique_ptr<tx_reduce_relay_test::stream_type>&& stream_ptr,
+            std::unique_ptr<tx_reduce_relay_test::stream_type>&& streamPtr,
             OverlayImpl& overlay)
             : PeerImp(
                   app,
-                  sid_,
+                  sid,
                   slot,
                   std::move(request),
                   publicKey,
                   protocol,
                   consumer,
-                  std::move(stream_ptr),
+                  std::move(streamPtr),
                   overlay)
         {
-            sid_++;
+            sid++;
         }
         ~PeerTest() override = default;
 
@@ -150,23 +150,23 @@ private:
         void
         send(std::shared_ptr<Message> const&) override
         {
-            sendTx_++;
+            sendTx++;
         }
         void
         addTxQueue(uint256 const& hash) override
         {
-            queueTx_++;
+            queueTx++;
         }
         static void
         init()
         {
-            queueTx_ = 0;
-            sendTx_ = 0;
-            sid_ = 0;
+            queueTx = 0;
+            sendTx = 0;
+            sid = 0;
         }
-        inline static std::size_t sid_ = 0;
-        inline static std::uint16_t queueTx_ = 0;
-        inline static std::uint16_t sendTx_ = 0;
+        inline static std::size_t sid = 0;
+        inline static std::uint16_t queueTx = 0;
+        inline static std::uint16_t sendTx = 0;
     };
 
     std::uint16_t lid_{0};
@@ -176,7 +176,7 @@ private:
     boost::beast::multi_buffer read_buf_;
 
 public:
-    tx_reduce_relay_test() : context_(make_SSLContext("")), protocolVersion_{1, 7}
+    tx_reduce_relay_test() : context_(makeSslContext("")), protocolVersion_{1, 7}
     {
     }
 
@@ -189,16 +189,16 @@ private:
         (nDisabled == 0)
             ? request.insert("X-Protocol-Ctl", makeFeaturesRequestHeader(false, false, true, false))
             : (void)nDisabled--;
-        auto stream_ptr = std::make_unique<stream_type>(
+        auto streamPtr = std::make_unique<stream_type>(
             socket_type(std::forward<boost::asio::io_context&>(env.app().getIOContext())),
             *context_);
         beast::IP::Endpoint const local(
             boost::asio::ip::make_address("172.1.1." + std::to_string(lid_)));
         beast::IP::Endpoint const remote(
             boost::asio::ip::make_address("172.1.1." + std::to_string(rid_)));
-        PublicKey const key(std::get<0>(randomKeyPair(KeyType::ed25519)));
+        PublicKey const key(std::get<0>(randomKeyPair(KeyType::Ed25519)));
         auto consumer = overlay.resourceManager().newInboundEndpoint(remote);
-        auto [slot, _] = overlay.peerFinder().new_inbound_slot(local, remote);
+        auto [slot, _] = overlay.peerFinder().newInboundSlot(local, remote);
         auto const peer = std::make_shared<PeerTest>(
             env.app(),
             slot,
@@ -206,10 +206,10 @@ private:
             key,
             protocolVersion_,
             consumer,
-            std::move(stream_ptr),
+            std::move(streamPtr),
             overlay);
         BEAST_EXPECT(overlay.findPeerByPublicKey(key) == std::shared_ptr<PeerImp>{});
-        overlay.add_active(peer);
+        overlay.addActive(peer);
         BEAST_EXPECT(overlay.findPeerByPublicKey(key) == peer);
         peers.emplace_back(peer);  // overlay stores week ptr to PeerImp
         lid_ += 2;
@@ -251,7 +251,7 @@ private:
             m.set_deferred(false);
             m.set_status(protocol::TransactionStatus::tsNEW);
             env.app().getOverlay().relay(uint256{0}, m, toSkip);
-            BEAST_EXPECT(PeerTest::sendTx_ == expectRelay && PeerTest::queueTx_ == expectQueue);
+            BEAST_EXPECT(PeerTest::sendTx == expectRelay && PeerTest::queueTx == expectQueue);
         }
     }
 
diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp
index 561b17f71c..28d5beef88 100644
--- a/src/test/peerfinder/Livecache_test.cpp
+++ b/src/test/peerfinder/Livecache_test.cpp
@@ -30,7 +30,7 @@ operator==(Endpoint const& a, Endpoint const& b)
     return (a.hops == b.hops && a.address == b.address);
 }
 
-class Livecache_test : public beast::unit_test::suite
+class Livecache_test : public beast::unit_test::Suite
 {
     TestStopwatch clock_;
     test::SuiteJournal journal_;
@@ -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::liveCacheSecondsToLive - 1s);
+        clock_.advance(Tuning::kLIVE_CACHE_SECONDS_TO_LIVE - 1s);
         c.expire();
         BEAST_EXPECT(c.size() == 1);
         // now advance to the point of expiration
@@ -129,10 +129,10 @@ public:
     testHistogram()
     {
         testcase("Histogram");
-        constexpr auto num_eps = 40;
+        constexpr auto kNUM_EPS = 40;
         Livecache<> c(clock_, journal_);
-        for (auto i = 0; i < num_eps; ++i)
-            add(beast::IP::randomEP(true), c, xrpl::rand_int<std::uint32_t>());
+        for (auto i = 0; i < kNUM_EPS; ++i)
+            add(beast::IP::randomEP(true), c, xrpl::randInt<std::uint32_t>());
         auto h = c.hops.histogram();
         if (!BEAST_EXPECT(!h.empty()))
             return;
@@ -145,7 +145,7 @@ public:
             sum += val;
             BEAST_EXPECT(val >= 0);
         }
-        BEAST_EXPECT(sum == num_eps);
+        BEAST_EXPECT(sum == kNUM_EPS);
     }
 
     void
@@ -154,48 +154,48 @@ public:
         testcase("Shuffle");
         Livecache<> c(clock_, journal_);
         for (auto i = 0; i < 100; ++i)
-            add(beast::IP::randomEP(true), c, xrpl::rand_int(Tuning::maxHops + 1));
+            add(beast::IP::randomEP(true), c, xrpl::randInt(Tuning::kMAX_HOPS + 1));
 
         using at_hop = std::vector<xrpl::PeerFinder::Endpoint>;
-        using all_hops = std::array<at_hop, 1 + Tuning::maxHops + 1>;
+        using all_hops = std::array<at_hop, 1 + Tuning::kMAX_HOPS + 1>;
 
-        auto cmp_EP = [](Endpoint const& a, Endpoint const& b) {
+        auto cmpEp = [](Endpoint const& a, Endpoint const& b) {
             return (b.hops < a.hops || (b.hops == a.hops && b.address < a.address));
         };
         all_hops before;
-        all_hops before_sorted;
+        all_hops beforeSorted;
         for (auto i = std::make_pair(0, c.hops.begin()); i.second != c.hops.end();
              ++i.first, ++i.second)
         {
             std::copy((*i.second).begin(), (*i.second).end(), std::back_inserter(before[i.first]));
             std::copy(
-                (*i.second).begin(), (*i.second).end(), std::back_inserter(before_sorted[i.first]));
-            std::sort(before_sorted[i.first].begin(), before_sorted[i.first].end(), cmp_EP);
+                (*i.second).begin(), (*i.second).end(), std::back_inserter(beforeSorted[i.first]));
+            std::sort(beforeSorted[i.first].begin(), beforeSorted[i.first].end(), cmpEp);
         }
 
         c.hops.shuffle();
 
         all_hops after;
-        all_hops after_sorted;
+        all_hops afterSorted;
         for (auto i = std::make_pair(0, c.hops.begin()); i.second != c.hops.end();
              ++i.first, ++i.second)
         {
             std::copy((*i.second).begin(), (*i.second).end(), std::back_inserter(after[i.first]));
             std::copy(
-                (*i.second).begin(), (*i.second).end(), std::back_inserter(after_sorted[i.first]));
-            std::sort(after_sorted[i.first].begin(), after_sorted[i.first].end(), cmp_EP);
+                (*i.second).begin(), (*i.second).end(), std::back_inserter(afterSorted[i.first]));
+            std::sort(afterSorted[i.first].begin(), afterSorted[i.first].end(), cmpEp);
         }
 
         // each hop bucket should contain the same items
         // before and after sort, albeit in different order
-        bool all_match = true;
+        bool allMatch = true;
         for (auto i = 0; i < before.size(); ++i)
         {
             BEAST_EXPECT(before[i].size() == after[i].size());
-            all_match = all_match && (before[i] == after[i]);
-            BEAST_EXPECT(before_sorted[i] == after_sorted[i]);
+            allMatch = allMatch && (before[i] == after[i]);
+            BEAST_EXPECT(beforeSorted[i] == afterSorted[i]);
         }
-        BEAST_EXPECT(!all_match);
+        BEAST_EXPECT(!allMatch);
     }
 
     void
diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp
index 0e37c7baf4..17ce6835ef 100644
--- a/src/test/peerfinder/PeerFinder_test.cpp
+++ b/src/test/peerfinder/PeerFinder_test.cpp
@@ -25,7 +25,7 @@
 
 namespace xrpl::PeerFinder {
 
-class PeerFinder_test : public beast::unit_test::suite
+class PeerFinder_test : public beast::unit_test::Suite
 {
     test::SuiteJournal journal_;
 
@@ -62,7 +62,7 @@ public:
 
         template <class Handler>
         void
-        async_connect(beast::IP::Endpoint const& ep, Handler&& handler)
+        asyncConnect(beast::IP::Endpoint const& ep, Handler&& handler)
         {
             boost::system::error_code ec;
             handler(ep, ep, ec);
@@ -70,7 +70,7 @@ public:
     };
 
     void
-    test_backoff1()
+    testBackoff1()
     {
         auto const seconds = 10000;
         testcase("backoff 1");
@@ -78,7 +78,7 @@ public:
         TestChecker checker;
         TestStopwatch clock;
         Logic<TestChecker> logic(clock, store, checker, journal_);
-        logic.addFixedPeer("test", beast::IP::Endpoint::from_string("65.0.0.1:5"));
+        logic.addFixedPeer("test", beast::IP::Endpoint::fromString("65.0.0.1:5"));
         {
             Config c;
             c.autoConnect = false;
@@ -92,14 +92,14 @@ public:
             if (!list.empty())
             {
                 BEAST_EXPECT(list.size() == 1);
-                auto const [slot, _] = logic.new_outbound_slot(list.front());
+                auto const [slot, _] = logic.newOutboundSlot(list.front());
                 BEAST_EXPECT(
-                    logic.onConnected(slot, beast::IP::Endpoint::from_string("65.0.0.2:5")));
-                logic.on_closed(slot);
+                    logic.onConnected(slot, beast::IP::Endpoint::fromString("65.0.0.2:5")));
+                logic.onClosed(slot);
                 ++n;
             }
             clock.advance(std::chrono::seconds(1));
-            logic.once_per_second();
+            logic.oncePerSecond();
         }
         // Less than 20 attempts
         BEAST_EXPECT(n < 20);
@@ -107,7 +107,7 @@ public:
 
     // with activate
     void
-    test_backoff2()
+    testBackoff2()
     {
         auto const seconds = 10000;
         testcase("backoff 2");
@@ -115,7 +115,7 @@ public:
         TestChecker checker;
         TestStopwatch clock;
         Logic<TestChecker> logic(clock, store, checker, journal_);
-        logic.addFixedPeer("test", beast::IP::Endpoint::from_string("65.0.0.1:5"));
+        logic.addFixedPeer("test", beast::IP::Endpoint::fromString("65.0.0.1:5"));
         {
             Config c;
             c.autoConnect = false;
@@ -123,7 +123,7 @@ public:
             logic.config(c);
         }
 
-        PublicKey const pk(randomKeyPair(KeyType::secp256k1).first);
+        PublicKey const pk(randomKeyPair(KeyType::Secp256k1).first);
         std::size_t n = 0;
 
         for (std::size_t i = 0; i < seconds; ++i)
@@ -132,17 +132,17 @@ public:
             if (!list.empty())
             {
                 BEAST_EXPECT(list.size() == 1);
-                auto const [slot, _] = logic.new_outbound_slot(list.front());
+                auto const [slot, _] = logic.newOutboundSlot(list.front());
                 if (!BEAST_EXPECT(
-                        logic.onConnected(slot, beast::IP::Endpoint::from_string("65.0.0.2:5"))))
+                        logic.onConnected(slot, beast::IP::Endpoint::fromString("65.0.0.2:5"))))
                     return;
-                if (!BEAST_EXPECT(logic.activate(slot, pk, false) == PeerFinder::Result::success))
+                if (!BEAST_EXPECT(logic.activate(slot, pk, false) == PeerFinder::Result::Success))
                     return;
-                logic.on_closed(slot);
+                logic.onClosed(slot);
                 ++n;
             }
             clock.advance(std::chrono::seconds(1));
-            logic.once_per_second();
+            logic.oncePerSecond();
         }
         // No more often than once per minute
         BEAST_EXPECT(n <= (seconds + 59) / 60);
@@ -150,7 +150,7 @@ public:
 
     // test accepting an incoming slot for an already existing outgoing slot
     void
-    test_duplicateOutIn()
+    testDuplicateOutIn()
     {
         testcase("duplicate out/in");
         TestStore store;
@@ -165,26 +165,26 @@ public:
             logic.config(c);
         }
 
-        auto const remote = beast::IP::Endpoint::from_string("65.0.0.1:5");
-        auto const [slot1, r] = logic.new_outbound_slot(remote);
+        auto const remote = beast::IP::Endpoint::fromString("65.0.0.1:5");
+        auto const [slot1, r] = logic.newOutboundSlot(remote);
         BEAST_EXPECT(slot1 != nullptr);
-        BEAST_EXPECT(r == Result::success);
-        BEAST_EXPECT(logic.connectedAddresses_.count(remote.address()) == 1);
+        BEAST_EXPECT(r == Result::Success);
+        BEAST_EXPECT(logic.connectedAddresses.count(remote.address()) == 1);
 
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1024");
-        auto const [slot2, r2] = logic.new_inbound_slot(local, remote);
-        BEAST_EXPECT(logic.connectedAddresses_.count(remote.address()) == 1);
-        BEAST_EXPECT(r2 == Result::duplicatePeer);
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1024");
+        auto const [slot2, r2] = logic.newInboundSlot(local, remote);
+        BEAST_EXPECT(logic.connectedAddresses.count(remote.address()) == 1);
+        BEAST_EXPECT(r2 == Result::DuplicatePeer);
 
         if (!BEAST_EXPECT(slot2 == nullptr))
-            logic.on_closed(slot2);
+            logic.onClosed(slot2);
 
-        logic.on_closed(slot1);
+        logic.onClosed(slot1);
     }
 
     // test establishing outgoing slot for an already existing incoming slot
     void
-    test_duplicateInOut()
+    testDuplicateInOut()
     {
         testcase("duplicate in/out");
         TestStore store;
@@ -199,24 +199,24 @@ public:
             logic.config(c);
         }
 
-        auto const remote = beast::IP::Endpoint::from_string("65.0.0.1:5");
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1024");
+        auto const remote = beast::IP::Endpoint::fromString("65.0.0.1:5");
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1024");
 
-        auto const [slot1, r] = logic.new_inbound_slot(local, remote);
+        auto const [slot1, r] = logic.newInboundSlot(local, remote);
         BEAST_EXPECT(slot1 != nullptr);
-        BEAST_EXPECT(r == Result::success);
-        BEAST_EXPECT(logic.connectedAddresses_.count(remote.address()) == 1);
+        BEAST_EXPECT(r == Result::Success);
+        BEAST_EXPECT(logic.connectedAddresses.count(remote.address()) == 1);
 
-        auto const [slot2, r2] = logic.new_outbound_slot(remote);
-        BEAST_EXPECT(r2 == Result::duplicatePeer);
-        BEAST_EXPECT(logic.connectedAddresses_.count(remote.address()) == 1);
+        auto const [slot2, r2] = logic.newOutboundSlot(remote);
+        BEAST_EXPECT(r2 == Result::DuplicatePeer);
+        BEAST_EXPECT(logic.connectedAddresses.count(remote.address()) == 1);
         if (!BEAST_EXPECT(slot2 == nullptr))
-            logic.on_closed(slot2);
-        logic.on_closed(slot1);
+            logic.onClosed(slot2);
+        logic.onClosed(slot1);
     }
 
     void
-    test_peerLimitExceeded()
+    testPeerLimitExceeded()
     {
         testcase("peer limit exceeded");
         TestStore store;
@@ -231,29 +231,29 @@ public:
             logic.config(c);
         }
 
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1024");
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1024");
         auto const [slot, r] =
-            logic.new_inbound_slot(local, beast::IP::Endpoint::from_string("55.104.0.2:1025"));
+            logic.newInboundSlot(local, beast::IP::Endpoint::fromString("55.104.0.2:1025"));
         BEAST_EXPECT(slot != nullptr);
-        BEAST_EXPECT(r == Result::success);
+        BEAST_EXPECT(r == Result::Success);
 
         auto const [slot1, r1] =
-            logic.new_inbound_slot(local, beast::IP::Endpoint::from_string("55.104.0.2:1026"));
+            logic.newInboundSlot(local, beast::IP::Endpoint::fromString("55.104.0.2:1026"));
         BEAST_EXPECT(slot1 != nullptr);
-        BEAST_EXPECT(r1 == Result::success);
+        BEAST_EXPECT(r1 == Result::Success);
 
         auto const [slot2, r2] =
-            logic.new_inbound_slot(local, beast::IP::Endpoint::from_string("55.104.0.2:1027"));
-        BEAST_EXPECT(r2 == Result::ipLimitExceeded);
+            logic.newInboundSlot(local, beast::IP::Endpoint::fromString("55.104.0.2:1027"));
+        BEAST_EXPECT(r2 == Result::IpLimitExceeded);
 
         if (!BEAST_EXPECT(slot2 == nullptr))
-            logic.on_closed(slot2);
-        logic.on_closed(slot1);
-        logic.on_closed(slot);
+            logic.onClosed(slot2);
+        logic.onClosed(slot1);
+        logic.onClosed(slot);
     }
 
     void
-    test_activate_duplicate_peer()
+    testActivateDuplicatePeer()
     {
         testcase("test activate duplicate peer");
         TestStore store;
@@ -268,37 +268,37 @@ public:
             logic.config(c);
         }
 
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1024");
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1024");
 
-        PublicKey const pk1(randomKeyPair(KeyType::secp256k1).first);
+        PublicKey const pk1(randomKeyPair(KeyType::Secp256k1).first);
 
         auto const [slot, rSlot] =
-            logic.new_outbound_slot(beast::IP::Endpoint::from_string("55.104.0.2:1025"));
+            logic.newOutboundSlot(beast::IP::Endpoint::fromString("55.104.0.2:1025"));
         BEAST_EXPECT(slot != nullptr);
-        BEAST_EXPECT(rSlot == Result::success);
+        BEAST_EXPECT(rSlot == Result::Success);
 
         auto const [slot2, r2Slot] =
-            logic.new_outbound_slot(beast::IP::Endpoint::from_string("55.104.0.2:1026"));
+            logic.newOutboundSlot(beast::IP::Endpoint::fromString("55.104.0.2:1026"));
         BEAST_EXPECT(slot2 != nullptr);
-        BEAST_EXPECT(r2Slot == Result::success);
+        BEAST_EXPECT(r2Slot == Result::Success);
 
         BEAST_EXPECT(logic.onConnected(slot, local));
         BEAST_EXPECT(logic.onConnected(slot2, local));
 
-        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::success);
+        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::Success);
 
         // activating a different slot with the same node ID (pk) must fail
-        BEAST_EXPECT(logic.activate(slot2, pk1, false) == Result::duplicatePeer);
+        BEAST_EXPECT(logic.activate(slot2, pk1, false) == Result::DuplicatePeer);
 
-        logic.on_closed(slot);
+        logic.onClosed(slot);
 
         // accept the same key for a new slot after removing the old slot
-        BEAST_EXPECT(logic.activate(slot2, pk1, false) == Result::success);
-        logic.on_closed(slot2);
+        BEAST_EXPECT(logic.activate(slot2, pk1, false) == Result::Success);
+        logic.onClosed(slot2);
     }
 
     void
-    test_activate_inbound_disabled()
+    testActivateInboundDisabled()
     {
         testcase("test activate inbound disabled");
         TestStore store;
@@ -313,15 +313,15 @@ public:
             logic.config(c);
         }
 
-        PublicKey const pk1(randomKeyPair(KeyType::secp256k1).first);
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1024");
+        PublicKey const pk1(randomKeyPair(KeyType::Secp256k1).first);
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1024");
 
         auto const [slot, rSlot] =
-            logic.new_inbound_slot(local, beast::IP::Endpoint::from_string("55.104.0.2:1025"));
+            logic.newInboundSlot(local, beast::IP::Endpoint::fromString("55.104.0.2:1025"));
         BEAST_EXPECT(slot != nullptr);
-        BEAST_EXPECT(rSlot == Result::success);
+        BEAST_EXPECT(rSlot == Result::Success);
 
-        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::inboundDisabled);
+        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::InboundDisabled);
 
         {
             Config c;
@@ -332,25 +332,25 @@ public:
             logic.config(c);
         }
         // new inbound slot must succeed when inbound connections are enabled
-        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::success);
+        BEAST_EXPECT(logic.activate(slot, pk1, false) == Result::Success);
 
         // creating a new inbound slot must succeed as IP Limit is not exceeded
         auto const [slot2, r2Slot] =
-            logic.new_inbound_slot(local, beast::IP::Endpoint::from_string("55.104.0.2:1026"));
+            logic.newInboundSlot(local, beast::IP::Endpoint::fromString("55.104.0.2:1026"));
         BEAST_EXPECT(slot2 != nullptr);
-        BEAST_EXPECT(r2Slot == Result::success);
+        BEAST_EXPECT(r2Slot == Result::Success);
 
-        PublicKey const pk2(randomKeyPair(KeyType::secp256k1).first);
+        PublicKey const pk2(randomKeyPair(KeyType::Secp256k1).first);
 
         // an inbound slot exceeding inPeers limit must fail
-        BEAST_EXPECT(logic.activate(slot2, pk2, false) == Result::full);
+        BEAST_EXPECT(logic.activate(slot2, pk2, false) == Result::Full);
 
-        logic.on_closed(slot2);
-        logic.on_closed(slot);
+        logic.onClosed(slot2);
+        logic.onClosed(slot);
     }
 
     void
-    test_addFixedPeer_no_port()
+    testAddFixedPeerNoPort()
     {
         testcase("test addFixedPeer no port");
         TestStore store;
@@ -359,7 +359,7 @@ public:
         Logic<TestChecker> logic(clock, store, checker, journal_);
         try
         {
-            logic.addFixedPeer("test", beast::IP::Endpoint::from_string("65.0.0.2"));
+            logic.addFixedPeer("test", beast::IP::Endpoint::fromString("65.0.0.2"));
             fail("invalid endpoint successfully added");
         }
         catch (std::runtime_error const& e)
@@ -369,7 +369,7 @@ public:
     }
 
     void
-    test_onConnected_self_connection()
+    testOnConnectedSelfConnection()
     {
         testcase("test onConnected self connection");
         TestStore store;
@@ -377,18 +377,18 @@ public:
         TestStopwatch clock;
         Logic<TestChecker> logic(clock, store, checker, journal_);
 
-        auto const local = beast::IP::Endpoint::from_string("65.0.0.2:1234");
-        auto const [slot, r] = logic.new_outbound_slot(local);
+        auto const local = beast::IP::Endpoint::fromString("65.0.0.2:1234");
+        auto const [slot, r] = logic.newOutboundSlot(local);
         BEAST_EXPECT(slot != nullptr);
-        BEAST_EXPECT(r == Result::success);
+        BEAST_EXPECT(r == Result::Success);
 
         // Must fail when a slot is to our own IP address
         BEAST_EXPECT(!logic.onConnected(slot, local));
-        logic.on_closed(slot);
+        logic.onClosed(slot);
     }
 
     void
-    test_config()
+    testConfig()
     {
         // if peers_max is configured then peers_in_max and peers_out_max
         // are ignored
@@ -429,7 +429,7 @@ public:
             Counts counts;
             counts.onConfig(config);
             BEAST_EXPECT(
-                counts.out_max() == expectOut && counts.in_max() == expectIn &&
+                counts.outMax() == expectOut && counts.inMax() == expectIn &&
                 config.ipLimit == expectIpLimit);
 
             TestStore store;
@@ -466,7 +466,7 @@ public:
     }
 
     void
-    test_invalid_config()
+    testInvalidConfig()
     {
         testcase("invalid config");
 
@@ -513,17 +513,17 @@ public:
     void
     run() override
     {
-        test_backoff1();
-        test_backoff2();
-        test_duplicateOutIn();
-        test_duplicateInOut();
-        test_config();
-        test_invalid_config();
-        test_peerLimitExceeded();
-        test_activate_duplicate_peer();
-        test_activate_inbound_disabled();
-        test_addFixedPeer_no_port();
-        test_onConnected_self_connection();
+        testBackoff1();
+        testBackoff2();
+        testDuplicateOutIn();
+        testDuplicateInOut();
+        testConfig();
+        testInvalidConfig();
+        testPeerLimitExceeded();
+        testActivateDuplicatePeer();
+        testActivateInboundDisabled();
+        testAddFixedPeerNoPort();
+        testOnConnectedSelfConnection();
     }
 };
 
diff --git a/src/test/protocol/ApiVersion_test.cpp b/src/test/protocol/ApiVersion_test.cpp
index 569aed5fa2..588de6ee80 100644
--- a/src/test/protocol/ApiVersion_test.cpp
+++ b/src/test/protocol/ApiVersion_test.cpp
@@ -2,7 +2,7 @@
 #include <xrpl/protocol/ApiVersion.h>
 
 namespace xrpl::test {
-struct ApiVersion_test : beast::unit_test::suite
+struct ApiVersion_test : beast::unit_test::Suite
 {
     void
     run() override
@@ -10,10 +10,11 @@ struct ApiVersion_test : beast::unit_test::suite
         {
             testcase("API versions invariants");
 
-            static_assert(RPC::apiMinimumSupportedVersion <= RPC::apiMaximumSupportedVersion);
-            static_assert(RPC::apiMinimumSupportedVersion <= RPC::apiMaximumValidVersion);
-            static_assert(RPC::apiMaximumSupportedVersion <= RPC::apiMaximumValidVersion);
-            static_assert(RPC::apiBetaVersion <= RPC::apiMaximumValidVersion);
+            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);
 
             BEAST_EXPECT(true);
         }
@@ -22,14 +23,14 @@ struct ApiVersion_test : beast::unit_test::suite
             // Update when we change versions
             testcase("API versions");
 
-            static_assert(RPC::apiMinimumSupportedVersion >= 1);
-            static_assert(RPC::apiMinimumSupportedVersion < 2);
-            static_assert(RPC::apiMaximumSupportedVersion >= 2);
-            static_assert(RPC::apiMaximumSupportedVersion < 3);
-            static_assert(RPC::apiMaximumValidVersion >= 3);
-            static_assert(RPC::apiMaximumValidVersion < 4);
-            static_assert(RPC::apiBetaVersion >= 3);
-            static_assert(RPC::apiBetaVersion < 4);
+            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);
 
             BEAST_EXPECT(true);
         }
diff --git a/src/test/protocol/BuildInfo_test.cpp b/src/test/protocol/BuildInfo_test.cpp
index d157978744..1741f45938 100644
--- a/src/test/protocol/BuildInfo_test.cpp
+++ b/src/test/protocol/BuildInfo_test.cpp
@@ -3,7 +3,7 @@
 
 namespace xrpl {
 
-class BuildInfo_test : public beast::unit_test::suite
+class BuildInfo_test : public beast::unit_test::Suite
 {
 public:
     void
diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp
index bd6e0a1859..e948c76365 100644
--- a/src/test/protocol/Hooks_test.cpp
+++ b/src/test/protocol/Hooks_test.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl {
 
-class Hooks_test : public beast::unit_test::suite
+class Hooks_test : public beast::unit_test::Suite
 {
     /**
      * This unit test was requested here:
@@ -31,7 +31,7 @@ class Hooks_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        std::vector<std::reference_wrapper<SField const>> const fields_to_test = {
+        std::vector<std::reference_wrapper<SField const>> const fieldsToTest = {
             sfHookResult,
             sfHookStateChangeCount,
             sfHookEmitCount,
@@ -69,11 +69,11 @@ class Hooks_test : public beast::unit_test::suite
             sfHooks,
             sfHookGrants};
 
-        for (auto const& rf : fields_to_test)
+        for (auto const& rf : fieldsToTest)
         {
             SField const& f = rf.get();
 
-            STObject dummy{sfGeneric};
+            STObject dummy{kSF_GENERIC};
 
             BEAST_EXPECT(!dummy.isFieldPresent(f));
 
@@ -153,7 +153,7 @@ class Hooks_test : public beast::unit_test::suite
                 }
 
                 case STI_OBJECT: {
-                    dummy.emplace_back(STObject{f});
+                    dummy.emplaceBack(STObject{f});
                     BEAST_EXPECT(dummy.getField(f).getFName() == f);
                     BEAST_EXPECT(dummy.isFieldPresent(f));
                     break;
@@ -161,8 +161,8 @@ class Hooks_test : public beast::unit_test::suite
 
                 case STI_ARRAY: {
                     STArray dummy2{f, 2};
-                    dummy2.push_back(STObject{sfGeneric});
-                    dummy2.push_back(STObject{sfGeneric});
+                    dummy2.pushBack(STObject{kSF_GENERIC});
+                    dummy2.pushBack(STObject{kSF_GENERIC});
                     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 8a4d527db3..efef209c6b 100644
--- a/src/test/protocol/InnerObjectFormats_test.cpp
+++ b/src/test/protocol/InnerObjectFormats_test.cpp
@@ -3,7 +3,7 @@
 
 #include <xrpl/basics/contract.h>
 #include <xrpl/beast/unit_test/suite.h>
-#include <xrpl/json/json_reader.h>  // Json::Reader
+#include <xrpl/json/json_reader.h>  // json::Reader
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/ErrorCodes.h>    // RPC::containsError
 #include <xrpl/protocol/STParsedJSON.h>  // STParsedJSONObject
@@ -21,7 +21,7 @@ struct TestJSONTxt
     bool const expectFail;
 };
 
-static TestJSONTxt const testArray[] = {
+static TestJSONTxt const kTEST_ARRAY[] = {
 
     // Valid SignerEntry
     {.txt = R"({
@@ -151,7 +151,7 @@ static TestJSONTxt const testArray[] = {
 
 }  // namespace InnerObjectFormatsUnitTestDetail
 
-class InnerObjectFormatsParsedJSON_test : public beast::unit_test::suite
+class InnerObjectFormatsParsedJSON_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -162,11 +162,11 @@ public:
         // Instantiate a jtx::Env so debugLog writes are exercised.
         test::jtx::Env const env(*this);
 
-        for (auto const& test : testArray)
+        for (auto const& test : kTEST_ARRAY)
         {
-            Json::Value req;
-            Json::Reader().parse(test.txt, req);
-            if (RPC::contains_error(req))
+            json::Value req;
+            json::Reader().parse(test.txt, req);
+            if (RPC::containsError(req))
             {
                 Throw<std::runtime_error>(
                     "Internal InnerObjectFormatsParsedJSON error.  Bad JSON.");
diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp
index 116ac7ca27..44a36b7dcf 100644
--- a/src/test/protocol/Issue_test.cpp
+++ b/src/test/protocol/Issue_test.cpp
@@ -20,7 +20,7 @@
 
 namespace xrpl {
 
-class Issue_test : public beast::unit_test::suite
+class Issue_test : public beast::unit_test::Suite
 {
 public:
     using Domain = uint256;
@@ -563,10 +563,10 @@ public:
         uint256 const domain1{1};
         uint256 const domain2{2};
 
-        Book const b1_d1(a1, a2, domain1);
-        Book const b2_d1(a2, a1, domain1);
-        Book const b1_d2(a1, a2, domain2);
-        Book const b2_d2(a2, a1, domain2);
+        Book const b1D1(a1, a2, domain1);
+        Book const b2D1(a2, a1, domain1);
+        Book const b1D2(a1, a2, domain2);
+        Book const b2D2(a2, a1, domain2);
 
         {
             Set c;
@@ -620,16 +620,16 @@ public:
         {
             Set c;
 
-            c.insert(b1_d1);
+            c.insert(b1D1);
             if (!BEAST_EXPECT(c.size() == 1))
                 return;
-            c.insert(b2_d1);
+            c.insert(b2D1);
             if (!BEAST_EXPECT(c.size() == 2))
                 return;
-            c.insert(b1_d2);
+            c.insert(b1D2);
             if (!BEAST_EXPECT(c.size() == 3))
                 return;
-            c.insert(b2_d2);
+            c.insert(b2D2);
             if (!BEAST_EXPECT(c.size() == 4))
                 return;
 
@@ -657,8 +657,8 @@ public:
 
             c.insert(b1);
             c.insert(b2);
-            c.insert(b1_d1);
-            c.insert(b2_d1);
+            c.insert(b1D1);
+            c.insert(b2D1);
             if (!BEAST_EXPECT(c.size() == 4))
                 return;
 
@@ -694,10 +694,10 @@ public:
         uint256 const domain1{1};
         uint256 const domain2{2};
 
-        Book const b1_d1(a1, a2, domain1);
-        Book const b2_d1(a2, a1, domain1);
-        Book const b1_d2(a1, a2, domain2);
-        Book const b2_d2(a2, a1, domain2);
+        Book const b1D1(a1, a2, domain1);
+        Book const b2D1(a2, a1, domain1);
+        Book const b1D2(a1, a2, domain2);
+        Book const b2D2(a2, a1, domain2);
 
         // typename Map::value_type value_type;
         // std::pair <Book const, int> value_type;
@@ -749,16 +749,16 @@ public:
         {
             Map c;
 
-            c.insert(std::make_pair(b1_d1, 10));
+            c.insert(std::make_pair(b1D1, 10));
             if (!BEAST_EXPECT(c.size() == 1))
                 return;
-            c.insert(std::make_pair(b2_d1, 20));
+            c.insert(std::make_pair(b2D1, 20));
             if (!BEAST_EXPECT(c.size() == 2))
                 return;
-            c.insert(std::make_pair(b1_d2, 30));
+            c.insert(std::make_pair(b1D2, 30));
             if (!BEAST_EXPECT(c.size() == 3))
                 return;
-            c.insert(std::make_pair(b2_d2, 40));
+            c.insert(std::make_pair(b2D2, 40));
             if (!BEAST_EXPECT(c.size() == 4))
                 return;
 
@@ -786,8 +786,8 @@ public:
 
             c.insert(std::make_pair(b1, 1));
             c.insert(std::make_pair(b2, 2));
-            c.insert(std::make_pair(b1_d1, 3));
-            c.insert(std::make_pair(b2_d1, 4));
+            c.insert(std::make_pair(b1D1, 3));
+            c.insert(std::make_pair(b2D1, 4));
             if (!BEAST_EXPECT(c.size() == 4))
                 return;
 
diff --git a/src/test/protocol/Memo_test.cpp b/src/test/protocol/Memo_test.cpp
index fa6d7905a4..238dbe9f1d 100644
--- a/src/test/protocol/Memo_test.cpp
+++ b/src/test/protocol/Memo_test.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl {
 
-class Memo_test : public beast::unit_test::suite
+class Memo_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -34,7 +34,7 @@ public:
         // This is the basis for building tests of invalid states.
         auto makeJtxWithMemo = [&env, &alice]() {
             JTx example = noop(alice);
-            memo const exampleMemo{"tic", "tac", "toe"};
+            Memo const exampleMemo{"tic", "tac", "toe"};
             exampleMemo(env, example);
             return example;
         };
@@ -49,7 +49,7 @@ public:
             memoSize.jv[sfMemos.jsonName][0u][sfMemo.jsonName][sfMemoData.jsonName] =
                 std::string(2020, '0');
             env(memoSize,
-                rpc("invalidTransaction",
+                Rpc("invalidTransaction",
                     "fails local checks: The memo exceeds the maximum allowed "
                     "size."));
 
@@ -68,7 +68,7 @@ public:
             m[sfMemoData.jsonName] = "3030303030";
 
             env(memoNonMemo,
-                rpc("invalidTransaction",
+                Rpc("invalidTransaction",
                     "fails local checks: A memo array may contain only Memo "
                     "objects."));
         }
@@ -77,7 +77,7 @@ public:
             JTx memoExtra = makeJtxWithMemo();
             memoExtra.jv[sfMemos.jsonName][0u][sfMemo.jsonName][sfFlags.jsonName] = 13;
             env(memoExtra,
-                rpc("invalidTransaction",
+                Rpc("invalidTransaction",
                     "fails local checks: A memo may contain only MemoType, "
                     "MemoData or MemoFormat fields."));
         }
@@ -87,7 +87,7 @@ public:
             memoBadChar.jv[sfMemos.jsonName][0u][sfMemo.jsonName][sfMemoType.jsonName] =
                 strHex(std::string_view("ONE<INFINITY"));
             env(memoBadChar,
-                rpc("invalidTransaction",
+                Rpc("invalidTransaction",
                     "fails local checks: The MemoType and MemoFormat fields "
                     "may only contain characters that are allowed in URLs "
                     "under RFC 3986."));
@@ -106,7 +106,7 @@ public:
             memoBadChar.jv[sfMemos.jsonName][0u][sfMemo.jsonName][sfMemoFormat.jsonName] =
                 strHex(std::string_view("NoBraces{}InURL"));
             env(memoBadChar,
-                rpc("invalidTransaction",
+                Rpc("invalidTransaction",
                     "fails local checks: The MemoType and MemoFormat fields "
                     "may only contain characters that are allowed in URLs "
                     "under RFC 3986."));
diff --git a/src/test/protocol/MultiApiJson_test.cpp b/src/test/protocol/MultiApiJson_test.cpp
index f9f1ff1373..e66403e0ae 100644
--- a/src/test/protocol/MultiApiJson_test.cpp
+++ b/src/test/protocol/MultiApiJson_test.cpp
@@ -25,12 +25,12 @@ Overload(Ts...) -> Overload<Ts...>;
 
 }  // namespace
 
-struct MultiApiJson_test : beast::unit_test::suite
+struct MultiApiJson_test : beast::unit_test::Suite
 {
     static auto
     makeJson(char const* key, int val)
     {
-        Json::Value obj1(Json::objectValue);
+        json::Value obj1(json::ObjectValue);
         obj1[key] = val;
         return obj1;
     }
@@ -40,18 +40,18 @@ struct MultiApiJson_test : beast::unit_test::suite
     {
         using xrpl::detail::MultiApiJson;
 
-        Json::Value const obj1 = makeJson("value", 1);
-        Json::Value const obj2 = makeJson("value", 2);
-        Json::Value const obj3 = makeJson("value", 3);
-        Json::Value const jsonNull{};
+        json::Value const obj1 = makeJson("value", 1);
+        json::Value const obj2 = makeJson("value", 2);
+        json::Value const obj3 = makeJson("value", 3);
+        json::Value const jsonNull{};
 
         MultiApiJson<1, 3> subject{};
         static_assert(sizeof(subject) == sizeof(subject.val));
-        static_assert(subject.size == subject.val.size());
-        static_assert(std::is_same_v<decltype(subject.val), std::array<Json::Value, 3>>);
+        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);
-        BEAST_EXPECT((subject.val == std::array<Json::Value, 3>{jsonNull, jsonNull, jsonNull}));
+        BEAST_EXPECT((subject.val == std::array<json::Value, 3>{jsonNull, jsonNull, jsonNull}));
 
         subject.val[0] = obj1;
         subject.val[1] = obj2;
@@ -60,37 +60,42 @@ struct MultiApiJson_test : beast::unit_test::suite
             testcase("forApiVersions, forAllApiVersions");
 
             // Some static data for test inputs
-            static int const primes[] = {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(primes) > RPC::apiMaximumValidVersion);
+            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);
 
             MultiApiJson<1, 3> s1{};
             static_assert(
-                s1.size == RPC::apiMaximumValidVersion + 1 - RPC::apiMinimumSupportedVersion);
+                s1.kSIZE ==
+                RPC::kAPI_MAXIMUM_VALID_VERSION + 1 - RPC::kAPI_MINIMUM_SUPPORTED_VERSION);
 
             int productAllVersions = 1;
-            for (unsigned i = RPC::apiMinimumSupportedVersion; i <= RPC::apiMaximumValidVersion;
+            for (unsigned i = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
+                 i <= RPC::kAPI_MAXIMUM_VALID_VERSION;
                  ++i)
             {
-                auto const index = i - RPC::apiMinimumSupportedVersion;
+                auto const index = i - RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
                 BEAST_EXPECT(index == s1.index(i));
                 BEAST_EXPECT(s1.valid(i));
-                s1.val[index] = makeJson("value", primes[i]);
-                productAllVersions *= primes[i];
+                s1.val[index] = makeJson("value", kPRIMES[i]);
+                productAllVersions *= kPRIMES[i];
             }
             BEAST_EXPECT(!s1.valid(0));
-            BEAST_EXPECT(!s1.valid(RPC::apiMaximumValidVersion + 1));
-            BEAST_EXPECT(
-                !s1.valid(std::numeric_limits<decltype(RPC::apiMaximumValidVersion.value)>::max()));
+            BEAST_EXPECT(!s1.valid(RPC::kAPI_MAXIMUM_VALID_VERSION + 1));
+            BEAST_EXPECT(!s1.valid(
+                std::numeric_limits<decltype(RPC::kAPI_MAXIMUM_VALID_VERSION.value)>::max()));
 
             int result = 1;
-            static_assert(RPC::apiMinimumSupportedVersion + 1 <= RPC::apiMaximumValidVersion);
-            forApiVersions<RPC::apiMinimumSupportedVersion, RPC::apiMinimumSupportedVersion + 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>(
                 std::as_const(s1).visit(),
-                [this](Json::Value const& json, unsigned int version, int* result) {
+                [this](json::Value const& json, unsigned int version, int* result) {
                     BEAST_EXPECT(
-                        version >= RPC::apiMinimumSupportedVersion &&
-                        version <= RPC::apiMinimumSupportedVersion + 1);
+                        version >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
+                        version <= RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1);
                     if (BEAST_EXPECT(json.isMember("value")))
                     {
                         *result *= json["value"].asInt();
@@ -99,25 +104,25 @@ struct MultiApiJson_test : beast::unit_test::suite
                 &result);
             BEAST_EXPECT(
                 result ==
-                primes[RPC::apiMinimumSupportedVersion] *
-                    primes[RPC::apiMinimumSupportedVersion + 1]);
+                kPRIMES[RPC::kAPI_MINIMUM_SUPPORTED_VERSION] *
+                    kPRIMES[RPC::kAPI_MINIMUM_SUPPORTED_VERSION + 1]);
 
             // Check all the values with mutable data
-            forAllApiVersions(s1.visit(), [&s1, this](Json::Value& json, auto version) {
+            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() == primes[version]);
+                    BEAST_EXPECT(json["value"].asInt() == kPRIMES[version]);
                 }
             });
 
             result = 1;
             forAllApiVersions(
                 std::as_const(s1).visit(),
-                [this](Json::Value const& json, unsigned int version, int* result) {
+                [this](json::Value const& json, unsigned int version, int* result) {
                     BEAST_EXPECT(
-                        version >= RPC::apiMinimumSupportedVersion &&
-                        version <= RPC::apiMaximumValidVersion);
+                        version >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
+                        version <= RPC::kAPI_MAXIMUM_VALID_VERSION);
                     if (BEAST_EXPECT(json.isMember("value")))
                     {
                         *result *= json["value"].asInt();
@@ -132,14 +137,14 @@ struct MultiApiJson_test : beast::unit_test::suite
                 return !requires {
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
-                        [](Json::Value&, auto) {});            // missing const
+                        [](json::Value&, auto) {});            // missing const
                 };
             }(std::as_const(s1)));
             static_assert([](auto&& v) {
                 return !requires {
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
-                        [](Json::Value&) {});                  // missing const
+                        [](json::Value&) {});                  // missing const
                 };
             }(std::as_const(s1)));
             static_assert([](auto&& v) {
@@ -186,7 +191,7 @@ struct MultiApiJson_test : beast::unit_test::suite
                 return requires {
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
-                        [](Json::Value const&) {});
+                        [](json::Value const&) {});
                 };
             }(std::as_const(s1)));
             static_assert([](auto&& v) {
@@ -200,14 +205,14 @@ struct MultiApiJson_test : beast::unit_test::suite
                 return requires {
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
-                        [](Json::Value const&, auto...) {});
+                        [](json::Value const&, auto...) {});
                 };
             }(std::as_const(s1)));
             static_assert([](auto&& v) {
                 return requires {
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
-                        [](Json::Value&, auto, auto, auto...) {},
+                        [](json::Value&, auto, auto, auto...) {},
                         0,
                         "");
                 };
@@ -217,7 +222,7 @@ struct MultiApiJson_test : beast::unit_test::suite
                     forAllApiVersions(
                         std::forward<decltype(v)>(v).visit(),  //
                         []<unsigned int Version>(
-                            Json::Value const&,
+                            json::Value const&,
                             std::integral_constant<unsigned int, Version>,
                             int,
                             char const*) {},
@@ -256,7 +261,7 @@ struct MultiApiJson_test : beast::unit_test::suite
             BEAST_EXPECT(&x.val[2] != &subject.val[2]);
 
             MultiApiJson<1, 3> y;
-            BEAST_EXPECT((y.val == std::array<Json::Value, 3>{}));
+            BEAST_EXPECT((y.val == std::array<json::Value, 3>{}));
             y = subject;
             BEAST_EXPECT(y.val == subject.val);
             BEAST_EXPECT(&y.val[0] != &subject.val[0]);
@@ -273,7 +278,7 @@ struct MultiApiJson_test : beast::unit_test::suite
         {
             testcase("set");
 
-            auto x = MultiApiJson<1, 2>{Json::objectValue};
+            auto x = MultiApiJson<1, 2>{json::ObjectValue};
             x.set("name1", 42);
             BEAST_EXPECT(x.val[0].isMember("name1"));
             BEAST_EXPECT(x.val[1].isMember("name1"));
@@ -291,16 +296,16 @@ struct MultiApiJson_test : beast::unit_test::suite
             BEAST_EXPECT(x.val[1]["name2"].asString() == "bar");
 
             // Tests of requires clause - these are expected to match
-            static_assert([](auto&& v) { return requires { v.set("name", Json::nullValue); }; }(x));
+            static_assert([](auto&& v) { return requires { v.set("name", json::NullValue); }; }(x));
             static_assert([](auto&& v) { return requires { v.set("name", "value"); }; }(x));
             static_assert([](auto&& v) { return requires { v.set("name", true); }; }(x));
             static_assert([](auto&& v) { return requires { v.set("name", 42); }; }(x));
 
             // Tests of requires clause - these are expected NOT to match
-            struct foo_t final
+            struct FooT final
             {
             };
-            static_assert([](auto&& v) { return !requires { v.set("name", foo_t{}); }; }(x));
+            static_assert([](auto&& v) { return !requires { v.set("name", FooT{}); }; }(x));
             static_assert([](auto&& v) { return !requires { v.set("name", std::nullopt); }; }(x));
         }
 
@@ -308,15 +313,15 @@ struct MultiApiJson_test : beast::unit_test::suite
             testcase("isMember");
 
             // Well defined behaviour even if we have different types of members
-            BEAST_EXPECT(subject.isMember("foo") == decltype(subject)::IsMemberResult::none);
+            BEAST_EXPECT(subject.isMember("foo") == decltype(subject)::IsMemberResult::None);
 
             {
                 // All variants have element "One", none have element "Two"
                 MultiApiJson<1, 2> s1{};
                 s1.val[0] = makeJson("One", 12);
                 s1.val[1] = makeJson("One", 42);
-                BEAST_EXPECT(s1.isMember("One") == decltype(s1)::IsMemberResult::all);
-                BEAST_EXPECT(s1.isMember("Two") == decltype(s1)::IsMemberResult::none);
+                BEAST_EXPECT(s1.isMember("One") == decltype(s1)::IsMemberResult::All);
+                BEAST_EXPECT(s1.isMember("Two") == decltype(s1)::IsMemberResult::None);
             }
 
             {
@@ -324,8 +329,8 @@ struct MultiApiJson_test : beast::unit_test::suite
                 MultiApiJson<1, 2> s2{};
                 s2.val[0] = makeJson("One", 12);
                 s2.val[1] = makeJson("Two", 42);
-                BEAST_EXPECT(s2.isMember("One") == decltype(s2)::IsMemberResult::some);
-                BEAST_EXPECT(s2.isMember("Two") == decltype(s2)::IsMemberResult::some);
+                BEAST_EXPECT(s2.isMember("One") == decltype(s2)::IsMemberResult::Some);
+                BEAST_EXPECT(s2.isMember("Two") == decltype(s2)::IsMemberResult::Some);
             }
 
             {
@@ -333,8 +338,8 @@ struct MultiApiJson_test : beast::unit_test::suite
                 MultiApiJson<1, 3> s3{};
                 s3.val[0] = makeJson("One", 12);
                 s3.val[1] = makeJson("One", 42);
-                BEAST_EXPECT(s3.isMember("One") == decltype(s3)::IsMemberResult::some);
-                BEAST_EXPECT(s3.isMember("Two") == decltype(s3)::IsMemberResult::none);
+                BEAST_EXPECT(s3.isMember("One") == decltype(s3)::IsMemberResult::Some);
+                BEAST_EXPECT(s3.isMember("Two") == decltype(s3)::IsMemberResult::None);
             }
         }
 
@@ -357,189 +362,189 @@ struct MultiApiJson_test : beast::unit_test::suite
             // Test different overloads
             static_assert([](auto&& v) {
                 return requires {
-                    v.visitor(
+                    v.kVISITOR(
                         v,
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value&, std::integral_constant<unsigned, 1>) {});
                 };
             }(s1));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v, std::integral_constant<unsigned, 1>) {
+                        [](json::Value& v, std::integral_constant<unsigned, 1>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value const&, auto) { return 0; },
+                        [](json::Value const&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 2);
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.visitor(v, std::integral_constant<unsigned, 1>{}, [](Json::Value&) {});
+                    v.kVISITOR(v, std::integral_constant<unsigned, 1>{}, [](json::Value&) {});
                 };
             }(s1));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 2);
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.visitor(
+                    v.kVISITOR(
                         v,
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value const&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value const&, std::integral_constant<unsigned, 1>) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v, std::integral_constant<unsigned, 2>) {
+                        [](json::Value const& v, std::integral_constant<unsigned, 2>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value&, auto) { return 0; },
+                        [](json::Value&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.visitor(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.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value&, unsigned) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value&, unsigned) {}); };
             }(s1));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  //
                     3u,
                     Overload{
-                        [](Json::Value& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, unsigned) { return 0; },
+                        [](json::Value& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, unsigned) { return 0; },
                         [](auto, auto) { return 0; }}) == 5);
 
             static_assert(
-                [](auto&& v) { return requires { v.visitor(v, 1, [](Json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](json::Value&) {}); }; }(s1));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  //
                     3,
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 5);
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value const&, unsigned) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value const&, unsigned) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),  //
                     2u,
                     Overload{
-                        [](Json::Value const& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, auto) { return 0; },
+                        [](json::Value const& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value const&) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value const&) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),  //
                     2,
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
 
             // Test type conversions
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     std::integral_constant<unsigned, 1>{},  // to unsigned
-                    [](Json::Value& v, unsigned) { return v["value"].asInt(); }) == 2);
+                    [](json::Value& v, unsigned) { return v["value"].asInt(); }) == 2);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),
                     std::integral_constant<unsigned, 2>{},  // to unsigned
-                    [](Json::Value const& v, unsigned) { return v["value"].asInt(); }) == 3);
+                    [](json::Value const& v, unsigned) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // to const
                     std::integral_constant<unsigned, 3>{},
-                    [](Json::Value const& v, auto) { return v["value"].asInt(); }) == 5);
+                    [](json::Value const& v, auto) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // to const
                     std::integral_constant<unsigned, 3>{},
-                    [](Json::Value const& v) { return v["value"].asInt(); }) == 5);
+                    [](json::Value const& v) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     3,  // to long
-                    [](Json::Value& v, long) { return v["value"].asInt(); }) == 5);
+                    [](json::Value& v, long) { return v["value"].asInt(); }) == 5);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     std::as_const(s1),
                     1,  // to long
-                    [](Json::Value const& v, long) { return v["value"].asInt(); }) == 2);
+                    [](json::Value const& v, long) { return v["value"].asInt(); }) == 2);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // to const
                     2,
-                    [](Json::Value const& v, auto) { return v["value"].asInt(); }) == 3);
+                    [](json::Value const& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // type deduction
                     2,
                     [](auto& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // to const, type deduction
                     2,
                     [](auto const& v, auto) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // type deduction
                     2,
                     [](auto& v) { return v["value"].asInt(); }) == 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,  // to const, type deduction
                     2,
                     [](auto const& v) { return v["value"].asInt(); }) == 3);
 
             // Test passing of additional arguments
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     std::integral_constant<unsigned, 2>{},
-                    [](Json::Value& v, auto ver, auto a1, auto a2) {
+                    [](json::Value& v, auto ver, auto a1, auto a2) {
                         return ver * a1 * a2 * v["value"].asInt();
                     },
                     5,
                     7) == 2 * 5 * 7 * 3);
             BEAST_EXPECT(
-                s1.visitor(
+                s1.kVISITOR(
                     s1,
                     std::integral_constant<unsigned, 2>{},
-                    [](Json::Value& v, auto ver, auto... args) {
+                    [](json::Value& v, auto ver, auto... args) {
                         return ver * (1 * ... * args) * v["value"].asInt();
                     },
                     5,
@@ -548,25 +553,25 @@ struct MultiApiJson_test : beast::unit_test::suite
             // Several overloads we want to fail
             static_assert([](auto&& v) {
                 return !requires {
-                    v.visitor(
+                    v.kVISITOR(
                         v,
                         1,                           //
-                        [](Json::Value&, auto) {});  // missing const
+                        [](json::Value&, auto) {});  // missing const
                 };
             }(std::as_const(s1)));
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.visitor(
+                    v.kVISITOR(
                         decltype(v){},  // cannot bind rvalue
                         1,
-                        [](Json::Value&, auto) {});
+                        [](json::Value&, auto) {});
                 };
             }(s1));
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.visitor(
+                    v.kVISITOR(
                         v,
                         1,         //
                         []() {});  // missing parameter
@@ -575,47 +580,47 @@ struct MultiApiJson_test : beast::unit_test::suite
 
             static_assert([](auto&& v) {
                 return !requires {
-                    v.visitor(
+                    v.kVISITOR(
                         v,
                         1,                               //
-                        [](Json::Value&, int, int) {});  // too many parameters
+                        [](json::Value&, int, int) {});  // too many parameters
                 };
             }(s1));
 
             // Want these to be unambiguous
-            static_assert([](auto&& v) { return requires { v.visitor(v, 1, [](auto) {}); }; }(s1));
+            static_assert([](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto) {}); }; }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.visitor(v, 1, [](Json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](json::Value&) {}); }; }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value&, auto...) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value&, auto...) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value const&) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value const&) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](Json::Value const&, auto...) {}); };
+                return requires { v.kVISITOR(v, 1, [](json::Value const&, auto...) {}); };
             }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.visitor(v, 1, [](auto...) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto...) {}); }; }(s1));
 
             static_assert(
-                [](auto&& v) { return requires { v.visitor(v, 1, [](auto, auto...) {}); }; }(s1));
+                [](auto&& v) { return requires { v.kVISITOR(v, 1, [](auto, auto...) {}); }; }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](auto, auto, auto...) {}); };
+                return requires { v.kVISITOR(v, 1, [](auto, auto, auto...) {}); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](auto, auto, auto...) {}, ""); };
+                return requires { v.kVISITOR(v, 1, [](auto, auto, auto...) {}, ""); };
             }(s1));
 
             static_assert([](auto&& v) {
-                return requires { v.visitor(v, 1, [](auto, auto, auto, auto...) {}, ""); };
+                return requires { v.kVISITOR(v, 1, [](auto, auto, auto, auto...) {}, ""); };
             }(s1));
         }
 
@@ -632,269 +637,269 @@ struct MultiApiJson_test : beast::unit_test::suite
                 return requires {
                     v.visit(
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value&, std::integral_constant<unsigned, 1>) {});
                 };
             }(s1));
             BEAST_EXPECT(
                 s1.visit(
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v, std::integral_constant<unsigned, 1>) {
+                        [](json::Value& v, std::integral_constant<unsigned, 1>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value const&, auto) { return 0; },
+                        [](json::Value const&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 2);
             static_assert([](auto&& v) {
                 return requires {
                     v.visit()(
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value&, std::integral_constant<unsigned, 1>) {});
                 };
             }(s1));
             BEAST_EXPECT(
                 s1.visit()(
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v, std::integral_constant<unsigned, 1>) {
+                        [](json::Value& v, std::integral_constant<unsigned, 1>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value const&, auto) { return 0; },
+                        [](json::Value const&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 2);
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.visit(std::integral_constant<unsigned, 1>{}, [](Json::Value&) {});
+                    v.visit(std::integral_constant<unsigned, 1>{}, [](json::Value&) {});
                 };
             }(s1));
             BEAST_EXPECT(
                 s1.visit(
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 2);
             static_assert([](auto&& v) {
                 return requires {
-                    v.visit()(std::integral_constant<unsigned, 1>{}, [](Json::Value&) {});
+                    v.visit()(std::integral_constant<unsigned, 1>{}, [](json::Value&) {});
                 };
             }(s1));
             BEAST_EXPECT(
                 s1.visit()(
                     std::integral_constant<unsigned, 1>{},
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 2);
 
             static_assert([](auto&& v) {
                 return requires {
                     v.visit(
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value const&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value const&, std::integral_constant<unsigned, 1>) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit(
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v, std::integral_constant<unsigned, 2>) {
+                        [](json::Value const& v, std::integral_constant<unsigned, 2>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value&, auto) { return 0; },
+                        [](json::Value&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
             static_assert([](auto&& v) {
                 return requires {
                     v.visit()(
                         std::integral_constant<unsigned, 1>{},
-                        [](Json::Value const&, std::integral_constant<unsigned, 1>) {});
+                        [](json::Value const&, std::integral_constant<unsigned, 1>) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit()(
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v, std::integral_constant<unsigned, 2>) {
+                        [](json::Value const& v, std::integral_constant<unsigned, 2>) {
                             return v["value"].asInt();
                         },
-                        [](Json::Value&, auto) { return 0; },
+                        [](json::Value&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
                 return requires {
-                    v.visit(std::integral_constant<unsigned, 1>{}, [](Json::Value const&) {});
+                    v.visit(std::integral_constant<unsigned, 1>{}, [](json::Value const&) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit(
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
             static_assert([](auto&& v) {
                 return requires {
-                    v.visit()(std::integral_constant<unsigned, 1>{}, [](Json::Value const&) {});
+                    v.visit()(std::integral_constant<unsigned, 1>{}, [](json::Value const&) {});
                 };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit()(
                     std::integral_constant<unsigned, 2>{},
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.visit(1, [](Json::Value&, unsigned) {}); };
+                return requires { v.visit(1, [](json::Value&, unsigned) {}); };
             }(s1));
             BEAST_EXPECT(
                 s1.visit(
                     3u,
                     Overload{
-                        [](Json::Value& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, unsigned) { return 0; },
-                        [](Json::Value&, auto) { return 0; },
+                        [](json::Value& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, unsigned) { return 0; },
+                        [](json::Value&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 5);
             static_assert([](auto&& v) {
-                return requires { v.visit()(1, [](Json::Value&, unsigned) {}); };
+                return requires { v.visit()(1, [](json::Value&, unsigned) {}); };
             }(s1));
             BEAST_EXPECT(
                 s1.visit()(
                     3u,
                     Overload{
-                        [](Json::Value& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, unsigned) { return 0; },
-                        [](Json::Value&, auto) { return 0; },
+                        [](json::Value& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, unsigned) { return 0; },
+                        [](json::Value&, auto) { return 0; },
                         [](auto, auto) { return 0; }}) == 5);
 
             static_assert(
-                [](auto&& v) { return requires { v.visit(1, [](Json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.visit(1, [](json::Value&) {}); }; }(s1));
             BEAST_EXPECT(
                 s1.visit(
                     3,
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 5);
             static_assert(
-                [](auto&& v) { return requires { v.visit()(1, [](Json::Value&) {}); }; }(s1));
+                [](auto&& v) { return requires { v.visit()(1, [](json::Value&) {}); }; }(s1));
             BEAST_EXPECT(
                 s1.visit()(
                     3,
                     Overload{
-                        [](Json::Value& v) { return v["value"].asInt(); },
-                        [](Json::Value const&) { return 0; },
+                        [](json::Value& v) { return v["value"].asInt(); },
+                        [](json::Value const&) { return 0; },
                         [](auto...) { return 0; }}) == 5);
 
             static_assert([](auto&& v) {
-                return requires { v.visit(1, [](Json::Value const&, unsigned) {}); };
+                return requires { v.visit(1, [](json::Value const&, unsigned) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit(
                     2u,
                     Overload{
-                        [](Json::Value const& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, auto) { return 0; },
-                        [](Json::Value&, unsigned) { return 0; },
+                        [](json::Value const& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, auto) { return 0; },
+                        [](json::Value&, unsigned) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
             static_assert([](auto&& v) {
-                return requires { v.visit()(1, [](Json::Value const&, unsigned) {}); };
+                return requires { v.visit()(1, [](json::Value const&, unsigned) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit()(
                     2u,
                     Overload{
-                        [](Json::Value const& v, unsigned) { return v["value"].asInt(); },
-                        [](Json::Value const&, auto) { return 0; },
-                        [](Json::Value&, unsigned) { return 0; },
+                        [](json::Value const& v, unsigned) { return v["value"].asInt(); },
+                        [](json::Value const&, auto) { return 0; },
+                        [](json::Value&, unsigned) { return 0; },
                         [](auto, auto) { return 0; }}) == 3);
 
             static_assert([](auto&& v) {
-                return requires { v.visit(1, [](Json::Value const&) {}); };
+                return requires { v.visit(1, [](json::Value const&) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit(
                     2,
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
             static_assert([](auto&& v) {
-                return requires { v.visit()(1, [](Json::Value const&) {}); };
+                return requires { v.visit()(1, [](json::Value const&) {}); };
             }(std::as_const(s1)));
             BEAST_EXPECT(
                 std::as_const(s1).visit()(
                     2,
                     Overload{
-                        [](Json::Value const& v) { return v["value"].asInt(); },
-                        [](Json::Value&) { return 0; },
+                        [](json::Value const& v) { return v["value"].asInt(); },
+                        [](json::Value&) { return 0; },
                         [](auto...) { return 0; }}) == 3);
 
             // Rvalue MultivarJson visitor only binds to regular reference
             static_assert([](auto&& v) {
                 // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
-                return !requires { std::forward<decltype(v)>(v).visit(1, [](Json::Value&&) {}); };
+                return !requires { std::forward<decltype(v)>(v).visit(1, [](json::Value&&) {}); };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit(1, [](Json::Value const&&) {});
+                    std::forward<decltype(v)>(v).visit(1, [](json::Value const&&) {});
                 };
             }(std::move(s1)));
             static_assert([](auto&& v) {
-                return requires { std::forward<decltype(v)>(v).visit(1, [](Json::Value&) {}); };
+                return requires { std::forward<decltype(v)>(v).visit(1, [](json::Value&) {}); };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 return requires {
-                    std::forward<decltype(v)>(v).visit(1, [](Json::Value const&) {});
+                    std::forward<decltype(v)>(v).visit(1, [](json::Value const&) {});
                 };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
-                return !requires { std::forward<decltype(v)>(v).visit()(1, [](Json::Value&&) {}); };
+                return !requires { std::forward<decltype(v)>(v).visit()(1, [](json::Value&&) {}); };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit()(1, [](Json::Value const&&) {});
+                    std::forward<decltype(v)>(v).visit()(1, [](json::Value const&&) {});
                 };
             }(std::move(s1)));
             static_assert([](auto&& v) {
-                return requires { std::forward<decltype(v)>(v).visit()(1, [](Json::Value&) {}); };
+                return requires { std::forward<decltype(v)>(v).visit()(1, [](json::Value&) {}); };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 return requires {
-                    std::forward<decltype(v)>(v).visit()(1, [](Json::Value const&) {});
+                    std::forward<decltype(v)>(v).visit()(1, [](json::Value const&) {});
                 };
             }(std::move(s1)));
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit(1, [](Json::Value const&&) {});
+                    std::forward<decltype(v)>(v).visit(1, [](json::Value const&&) {});
                 };
             }(std::move(std::as_const(s1))));  // NOLINT(performance-move-const-arg)
             static_assert([](auto&& v) {
                 return requires {
-                    std::forward<decltype(v)>(v).visit(1, [](Json::Value const&) {});
+                    std::forward<decltype(v)>(v).visit(1, [](json::Value const&) {});
                 };
             }(std::move(std::as_const(s1))));  // NOLINT(performance-move-const-arg)
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit()(1, [](Json::Value const&&) {});
+                    std::forward<decltype(v)>(v).visit()(1, [](json::Value const&&) {});
                 };
             }(std::move(std::as_const(s1))));  // NOLINT(performance-move-const-arg)
             static_assert([](auto&& v) {
                 return requires {
-                    std::forward<decltype(v)>(v).visit()(1, [](Json::Value const&) {});
+                    std::forward<decltype(v)>(v).visit()(1, [](json::Value const&) {});
                 };
             }(std::move(std::as_const(s1))));  // NOLINT(performance-move-const-arg)
 
             // Missing const
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit(1, [](Json::Value&, auto) {});
+                    std::forward<decltype(v)>(v).visit(1, [](json::Value&, auto) {});
                 };
             }(std::as_const(s1)));
             static_assert([](auto&& v) {
                 return !requires {
-                    std::forward<decltype(v)>(v).visit()(1, [](Json::Value&, auto) {});
+                    std::forward<decltype(v)>(v).visit()(1, [](json::Value&, auto) {});
                 };
             }(std::as_const(s1)));
 
diff --git a/src/test/protocol/PublicKey_test.cpp b/src/test/protocol/PublicKey_test.cpp
index cc5658d1c1..874eda8c65 100644
--- a/src/test/protocol/PublicKey_test.cpp
+++ b/src/test/protocol/PublicKey_test.cpp
@@ -16,14 +16,14 @@
 
 namespace xrpl {
 
-class PublicKey_test : public beast::unit_test::suite
+class PublicKey_test : public beast::unit_test::Suite
 {
 public:
     using blob = std::vector<std::uint8_t>;
 
     template <class FwdIter, class Container>
     static void
-    hex_to_binary(FwdIter first, FwdIter last, Container& out)
+    hexToBinary(FwdIter first, FwdIter last, Container& out)
     {
         struct Table
         {
@@ -46,12 +46,12 @@ public:
             }
         };
 
-        static Table lut;
+        static Table kLUT;
         out.reserve(std::distance(first, last) / 2);
         while (first != last)
         {
-            auto const hi(lut[(*first++)]);
-            auto const lo(lut[(*first++)]);
+            auto const hi(kLUT[(*first++)]);
+            auto const lo(kLUT[(*first++)]);
             out.push_back((hi * 16) + lo);
         }
     }
@@ -60,7 +60,7 @@ public:
     sig(std::string const& hex)
     {
         blob b;
-        hex_to_binary(hex.begin(), hex.end(), b);
+        hexToBinary(hex.begin(), hex.end(), b);
         return b;
     }
 
@@ -77,35 +77,35 @@ public:
 
         // Fully canonical
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3045"
             "022100FF478110D1D4294471EC76E0157540C2181F47DEBD25D7F9E7DDCCCD47EE"
             "E905"
             "0220078F07CDAE6C240855D084AD91D1479609533C147C93B0AEF19BC9724D003F"
             "28"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3045"
             "0221009218248292F1762D8A51BE80F8A7F2CD288D810CE781D5955700DA1684DF"
             "1D2D"
             "022041A1EE1746BFD72C9760CC93A7AAA8047D52C8833A03A20EAAE92EA19717B4"
             "54"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3044"
             "02206A9E43775F73B6D1EC420E4DDD222A80D4C6DF5D1BEECC431A91B63C928B75"
             "81"
             "022023E9CC2D61DDA6F73EAA6BCB12688BEB0F434769276B3127E4044ED895C9D9"
             "6B"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3044"
             "022056E720007221F3CD4EFBB6352741D8E5A0968D48D8D032C2FBC4F6304AD1D0"
             "4E"
             "02201F39EB392C20D7801C3E8D81D487E742FA84A1665E923225BD6323847C7187"
             "9F"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3045"
             "022100FDFD5AD05518CEA0017A2DCB5C4DF61E7C73B6D3A38E7AE93210A1564E8C"
             "2F12"
@@ -114,28 +114,28 @@ public:
 
         // Canonical but not fully canonical
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3046"
             "022100F477B3FA6F31C7CB3A0D1AD94A231FDD24B8D78862EE334CEA7CD08F6CBC"
             "0A1B"
             "022100928E6BCF1ED2684679730C5414AEC48FD62282B090041C41453C1D064AF5"
             "97A1"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3045"
             "022063E7C7CA93CB2400E413A342C027D00665F8BAB9C22EF0A7B8AE3AAF092230"
             "B6"
             "0221008F2E8BB7D09521ABBC277717B14B93170AE6465C5A1B36561099319C4BEB"
             "254C"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3046"
             "02210099DCA1188663DDEA506A06A7B20C2B7D8C26AFF41DECE69D6C5F7C967D32"
             "625F"
             "022100897658A6B1F9EEE5D140D7A332DA0BD73BB98974EA53F6201B01C1B594F2"
             "86EA"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3045"
             "02200855DE366E4E323AA2CE2A25674401A7D11F72EC432770D07F7B57DF7387AE"
             "C0"
@@ -144,26 +144,26 @@ public:
 
         // valid
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3006"
             "020101"
             "020102"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::fullyCanonical,
+            ECDSACanonicality::FullyCanonical,
             "3044"
             "02203932c892e2e550f3af8ee4ce9c215a87f9bb831dcac87b2838e2c2eaa891df"
             "0c"
             "022030b61dd36543125d56b9f9f3a1f53189e5af33cdda8d77a5209aec03978fa0"
             "01"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3045"
             "0220076045be6f9eca28ff1ec606b833d0b87e70b2a630f5e3a496b110967a40f9"
             "0a"
             "0221008fffd599910eefe00bc803c688eca1d2ba7f6b180620eaa03488e6585db6"
             "ba01"));
         BEAST_EXPECT(check(
-            ECDSACanonicality::canonical,
+            ECDSACanonicality::Canonical,
             "3046"
             "022100876045be6f9eca28ff1ec606b833d0b87e70b2a630f5e3a496b110967a40"
             "f90a"
@@ -393,8 +393,8 @@ public:
 
         {
             auto const pk1 = derivePublicKey(
-                KeyType::secp256k1,
-                generateSecretKey(KeyType::secp256k1, generateSeed("masterpassphrase")));
+                KeyType::Secp256k1,
+                generateSecretKey(KeyType::Secp256k1, generateSeed("masterpassphrase")));
 
             auto const pk2 = parseBase58<PublicKey>(
                 TokenType::NodePublic, "n94a1u4jAz288pZLtw6yFWVbi89YamiC6JBXPVUj5zmExe5fTVg9");
@@ -403,14 +403,14 @@ public:
             BEAST_EXPECT(pk1 == *pk2);  // NOLINT(bugprone-unchecked-optional-access)
         }
 
-        testBase58(KeyType::secp256k1);
+        testBase58(KeyType::Secp256k1);
 
         testcase("Base58: ed25519");
 
         {
             auto const pk1 = derivePublicKey(
-                KeyType::ed25519,
-                generateSecretKey(KeyType::ed25519, generateSeed("masterpassphrase")));
+                KeyType::Ed25519,
+                generateSecretKey(KeyType::Ed25519, generateSeed("masterpassphrase")));
 
             auto const pk2 = parseBase58<PublicKey>(
                 TokenType::NodePublic, "nHUeeJCSY2dM71oxM8Cgjouf5ekTuev2mwDpc374aLMxzDLXNmjf");
@@ -419,7 +419,7 @@ public:
             BEAST_EXPECT(pk1 == *pk2);  // NOLINT(bugprone-unchecked-optional-access)
         }
 
-        testBase58(KeyType::ed25519);
+        testBase58(KeyType::Ed25519);
     }
 
     void
@@ -428,16 +428,16 @@ public:
         testcase("Miscellaneous operations");
 
         auto const pk1 = derivePublicKey(
-            KeyType::secp256k1,
-            generateSecretKey(KeyType::secp256k1, generateSeed("masterpassphrase")));
+            KeyType::Secp256k1,
+            generateSecretKey(KeyType::Secp256k1, generateSeed("masterpassphrase")));
 
         PublicKey const pk2(pk1);
         BEAST_EXPECT(pk1 == pk2);
         BEAST_EXPECT(pk2 == pk1);
 
         PublicKey pk3 = derivePublicKey(
-            KeyType::secp256k1,
-            generateSecretKey(KeyType::secp256k1, generateSeed("arbitraryPassPhrase")));
+            KeyType::Secp256k1,
+            generateSecretKey(KeyType::Secp256k1, generateSeed("arbitraryPassPhrase")));
         // Testing the copy assignment operation of PublicKey class
         pk3 = pk2;
         BEAST_EXPECT(pk3 == pk2);
diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp
index 09308c71a8..fe049f11f2 100644
--- a/src/test/protocol/Quality_test.cpp
+++ b/src/test/protocol/Quality_test.cpp
@@ -11,7 +11,7 @@
 
 namespace xrpl {
 
-class Quality_test : public beast::unit_test::suite
+class Quality_test : public beast::unit_test::Suite
 {
 public:
     // Create a raw, non-integral amount from mantissa and exponent
@@ -47,26 +47,26 @@ public:
 
     template <class In1, class Out1, class Int, class In2, class Out2>
     void
-    ceil_in(Quality const& q, In1 in, Out1 out, Int limit, In2 in_expected, Out2 out_expected)
+    ceilIn(Quality const& q, In1 in, Out1 out, Int limit, In2 inExpected, Out2 outExpected)
     {
-        auto expect_result(amounts(in_expected, out_expected));
-        auto actual_result(q.ceil_in(amounts(in, out), amount(limit)));
+        auto expectResult(amounts(inExpected, outExpected));
+        auto actualResult(q.ceilIn(amounts(in, out), amount(limit)));
 
-        BEAST_EXPECT(actual_result == expect_result);
+        BEAST_EXPECT(actualResult == expectResult);
     }
 
     template <class In1, class Out1, class Int, class In2, class Out2>
     void
-    ceil_out(Quality const& q, In1 in, Out1 out, Int limit, In2 in_expected, Out2 out_expected)
+    ceilOut(Quality const& q, In1 in, Out1 out, Int limit, In2 inExpected, Out2 outExpected)
     {
-        auto const expect_result(amounts(in_expected, out_expected));
-        auto const actual_result(q.ceil_out(amounts(in, out), amount(limit)));
+        auto const expectResult(amounts(inExpected, outExpected));
+        auto const actualResult(q.ceilOut(amounts(in, out), amount(limit)));
 
-        BEAST_EXPECT(actual_result == expect_result);
+        BEAST_EXPECT(actualResult == expectResult);
     }
 
     void
-    test_ceil_in()
+    testCeilIn()
     {
         testcase("ceil_in");
 
@@ -74,7 +74,7 @@ public:
             // 1 in, 1 out:
             Quality const q(Amounts(amount(1), amount(1)));
 
-            ceil_in(
+            ceilIn(
                 q,
                 1,
                 1,  // 1 in, 1 out
@@ -82,7 +82,7 @@ public:
                 1,
                 1);  // 1 in, 1 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 10,
                 10,  // 10 in, 10 out
@@ -90,7 +90,7 @@ public:
                 5,
                 5);  // 5 in, 5 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 5,
                 5,   // 5 in, 5 out
@@ -103,7 +103,7 @@ public:
             // 1 in, 2 out:
             Quality const q(Amounts(amount(1), amount(2)));
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 80,  // 40 in, 80 out
@@ -111,7 +111,7 @@ public:
                 40,
                 80);  // 40 in, 20 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 80,  // 40 in, 80 out
@@ -119,7 +119,7 @@ public:
                 20,
                 40);  // 20 in, 40 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 80,  // 40 in, 80 out
@@ -132,7 +132,7 @@ public:
             // 2 in, 1 out:
             Quality const q(Amounts(amount(2), amount(1)));
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -140,7 +140,7 @@ public:
                 20,
                 10);  // 20 in, 10 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -148,7 +148,7 @@ public:
                 40,
                 20);  // 40 in, 20 out
 
-            ceil_in(
+            ceilIn(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -159,7 +159,7 @@ public:
     }
 
     void
-    test_ceil_out()
+    testCeilOut()
     {
         testcase("ceil_out");
 
@@ -167,7 +167,7 @@ public:
             // 1 in, 1 out:
             Quality const q(Amounts(amount(1), amount(1)));
 
-            ceil_out(
+            ceilOut(
                 q,
                 1,
                 1,  // 1 in, 1 out
@@ -175,7 +175,7 @@ public:
                 1,
                 1);  // 1 in, 1 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 10,
                 10,  // 10 in, 10 out
@@ -183,7 +183,7 @@ public:
                 5,
                 5);  // 5 in, 5 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 10,
                 10,  // 10 in, 10 out
@@ -196,7 +196,7 @@ public:
             // 1 in, 2 out:
             Quality const q(Amounts(amount(1), amount(2)));
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 80,  // 40 in, 80 out
@@ -204,7 +204,7 @@ public:
                 20,
                 40);  // 20 in, 40 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 80,  // 40 in, 80 out
@@ -212,7 +212,7 @@ public:
                 40,
                 80);  // 40 in, 80 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 80,   // 40 in, 80 out
@@ -225,7 +225,7 @@ public:
             // 2 in, 1 out:
             Quality const q(Amounts(amount(2), amount(1)));
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -233,7 +233,7 @@ public:
                 40,
                 20);  // 40 in, 20 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -241,7 +241,7 @@ public:
                 40,
                 20);  // 40 in, 20 out
 
-            ceil_out(
+            ceilOut(
                 q,
                 40,
                 20,  // 40 in, 20 out
@@ -252,7 +252,7 @@ public:
     }
 
     void
-    test_raw()
+    testRaw()
     {
         testcase("raw");
 
@@ -262,13 +262,13 @@ public:
                 amount(349469768),                             // 349.469768 XRP
                 raw(2755280000000000ull, -15));                // 2.75528
             STAmount const limit(raw(4131113916555555, -16));  // .4131113916555555
-            Amounts const result(q.ceil_out(value, limit));
-            BEAST_EXPECT(result.in != beast::zero);
+            Amounts const result(q.ceilOut(value, limit));
+            BEAST_EXPECT(result.in != beast::kZERO);
         }
     }
 
     void
-    test_round()
+    testRound()
     {
         testcase("round");
 
@@ -290,7 +290,7 @@ public:
     }
 
     void
-    test_comparisons()
+    testComparisons()
     {
         testcase("comparisons");
 
@@ -327,7 +327,7 @@ public:
     }
 
     void
-    test_composition()
+    testComposition()
     {
         testcase("composition");
 
@@ -341,17 +341,17 @@ public:
         Quality const q21(Amounts(amount2, amount1));
         Quality const q31(Amounts(amount3, amount1));
 
-        BEAST_EXPECT(composed_quality(q12, q21) == q11);
+        BEAST_EXPECT(composedQuality(q12, q21) == q11);
 
-        Quality const q13_31(composed_quality(q13, q31));
-        Quality const q31_13(composed_quality(q31, q13));
+        Quality const q1331(composedQuality(q13, q31));
+        Quality const q3113(composedQuality(q31, q13));
 
-        BEAST_EXPECT(q13_31 == q31_13);
-        BEAST_EXPECT(q13_31 == q11);
+        BEAST_EXPECT(q1331 == q3113);
+        BEAST_EXPECT(q1331 == q11);
     }
 
     void
-    test_operations()
+    testOperations()
     {
         testcase("operations");
 
@@ -374,13 +374,13 @@ public:
     void
     run() override
     {
-        test_comparisons();
-        test_composition();
-        test_operations();
-        test_ceil_in();
-        test_ceil_out();
-        test_raw();
-        test_round();
+        testComparisons();
+        testComposition();
+        testOperations();
+        testCeilIn();
+        testCeilOut();
+        testRaw();
+        testRound();
     }
 };
 
diff --git a/src/test/protocol/STAccount_test.cpp b/src/test/protocol/STAccount_test.cpp
index eb356ecb8d..b2d012783d 100644
--- a/src/test/protocol/STAccount_test.cpp
+++ b/src/test/protocol/STAccount_test.cpp
@@ -10,7 +10,7 @@
 
 namespace xrpl {
 
-struct STAccount_test : public beast::unit_test::suite
+struct STAccount_test : public beast::unit_test::Suite
 {
     void
     testSTAccount()
diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp
index 78ef9c2a8a..7c37d3e9bc 100644
--- a/src/test/protocol/STAmount_test.cpp
+++ b/src/test/protocol/STAmount_test.cpp
@@ -27,7 +27,7 @@
 
 namespace xrpl {
 
-class STAmount_test : public beast::unit_test::suite
+class STAmount_test : public beast::unit_test::Suite
 {
 public:
     static STAmount
@@ -37,7 +37,7 @@ public:
         s.add(ser);
 
         SerialIter sit(ser.slice());
-        return STAmount(sit, sfGeneric);
+        return STAmount(sit, kSF_GENERIC);
     }
 
     //--------------------------------------------------------------------------
@@ -54,7 +54,7 @@ public:
         {
             mantissa--;
 
-            if (mantissa < STAmount::cMinValue)
+            if (mantissa < STAmount::kMIN_VALUE)
                 return {amount.asset(), mantissa, amount.exponent(), amount.negative()};
 
             return {
@@ -62,14 +62,14 @@ public:
                 mantissa,
                 amount.exponent(),
                 amount.negative(),
-                STAmount::unchecked{}};
+                STAmount::Unchecked{}};
         }
 
         if (valueDigits == 999999999)
         {
             mantissa++;
 
-            if (mantissa > STAmount::cMaxValue)
+            if (mantissa > STAmount::kMAX_VALUE)
                 return {amount.asset(), mantissa, amount.exponent(), amount.negative()};
 
             return {
@@ -77,7 +77,7 @@ public:
                 mantissa,
                 amount.exponent(),
                 amount.negative(),
-                STAmount::unchecked{}};
+                STAmount::Unchecked{}};
         }
 
         return amount;
@@ -228,9 +228,9 @@ public:
         unexpected(serializeAndDeserialize(hundred) != hundred, "STAmount fail");
         unexpected(!zeroSt.native(), "STAmount fail");
         unexpected(!hundred.native(), "STAmount fail");
-        unexpected(zeroSt != beast::zero, "STAmount fail");
-        unexpected(one == beast::zero, "STAmount fail");
-        unexpected(hundred == beast::zero, "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");
@@ -290,11 +290,11 @@ public:
         unexpected(STAmount(310).getText() != "310", "STAmount fail");
         unexpected(to_string(Currency()) != "XRP", "cHC(XRP)");
         Currency c;
-        unexpected(!to_currency(c, "USD"), "create USD currency");
+        unexpected(!toCurrency(c, "USD"), "create USD currency");
         unexpected(to_string(c) != "USD", "check USD currency");
 
         std::string const cur = "015841551A748AD2C1F76FF6ECB0CCCD00000000";
-        unexpected(!to_currency(c, cur), "create custom currency");
+        unexpected(!toCurrency(c, cur), "create custom currency");
         unexpected(to_string(c) != cur, "check custom currency");
     }
 
@@ -314,9 +314,9 @@ public:
         unexpected(serializeAndDeserialize(hundred) != hundred, "STAmount fail");
         unexpected(zeroSt.native(), "STAmount fail");
         unexpected(hundred.native(), "STAmount fail");
-        unexpected(zeroSt != beast::zero, "STAmount fail");
-        unexpected(one == beast::zero, "STAmount fail");
-        unexpected(hundred == beast::zero, "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");
@@ -483,7 +483,7 @@ public:
 
         for (int i = 0; i <= 100000; ++i)
         {
-            mulTest(rand_int(10000000), rand_int(10000000));
+            mulTest(randInt(10000000), randInt(10000000));
         }
     }
 
@@ -494,30 +494,34 @@ public:
     {
         testcase("underflow");
 
-        STAmount const bigNative(STAmount::cMaxNative / 2);
+        STAmount const bigNative(STAmount::kMAX_NATIVE / 2);
         STAmount const bigValue(
-            noIssue(), (STAmount::cMinValue + STAmount::cMaxValue) / 2, STAmount::cMaxOffset - 1);
+            noIssue(),
+            (STAmount::kMIN_VALUE + STAmount::kMAX_VALUE) / 2,
+            STAmount::kMAX_OFFSET - 1);
         STAmount const smallValue(
-            noIssue(), (STAmount::cMinValue + STAmount::cMaxValue) / 2, STAmount::cMinOffset + 1);
+            noIssue(),
+            (STAmount::kMIN_VALUE + STAmount::kMAX_VALUE) / 2,
+            STAmount::kMIN_OFFSET + 1);
         STAmount const zeroSt(noIssue(), 0);
 
         STAmount const smallXSmall = multiply(smallValue, smallValue, noIssue());
 
-        BEAST_EXPECT(smallXSmall == beast::zero);
+        BEAST_EXPECT(smallXSmall == beast::kZERO);
 
         STAmount bigDsmall = divide(smallValue, bigValue, noIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::zero);
+        BEAST_EXPECT(bigDsmall == beast::kZERO);
 
-        BEAST_EXPECT(bigDsmall == beast::zero);
+        BEAST_EXPECT(bigDsmall == beast::kZERO);
 
         bigDsmall = divide(smallValue, bigValue, xrpIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::zero);
+        BEAST_EXPECT(bigDsmall == beast::kZERO);
 
         bigDsmall = divide(smallValue, bigNative, xrpIssue());
 
-        BEAST_EXPECT(bigDsmall == beast::zero);
+        BEAST_EXPECT(bigDsmall == beast::kZERO);
 
         // very bad offer
         std::uint64_t r = getRate(smallValue, bigValue);
@@ -598,10 +602,10 @@ public:
         }
 
         {
-            BEAST_EXPECT(amountFromJson(sfNumber, Json::Value(42)) == XRPAmount(42));
-            BEAST_EXPECT(amountFromJson(sfNumber, Json::Value(-42)) == XRPAmount(-42));
+            BEAST_EXPECT(amountFromJson(sfNumber, json::Value(42)) == XRPAmount(42));
+            BEAST_EXPECT(amountFromJson(sfNumber, json::Value(-42)) == XRPAmount(-42));
 
-            BEAST_EXPECT(amountFromJson(sfNumber, Json::UInt(42)) == XRPAmount(42));
+            BEAST_EXPECT(amountFromJson(sfNumber, json::UInt(42)) == XRPAmount(42));
 
             BEAST_EXPECT(amountFromJson(sfNumber, "-123") == XRPAmount(-123));
 
@@ -614,17 +618,17 @@ public:
             BEAST_EXPECT(amountFromJson(sfNumber, "0") == XRPAmount(0));
             BEAST_EXPECT(amountFromJson(sfNumber, "-0") == XRPAmount(0));
 
-            constexpr auto imin = std::numeric_limits<int>::min();
-            BEAST_EXPECT(amountFromJson(sfNumber, imin) == XRPAmount(imin));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(imin)) == XRPAmount(imin));
+            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 imax = std::numeric_limits<int>::max();
-            BEAST_EXPECT(amountFromJson(sfNumber, imax) == XRPAmount(imax));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(imax)) == XRPAmount(imax));
+            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 umax = std::numeric_limits<unsigned int>::max();
-            BEAST_EXPECT(amountFromJson(sfNumber, umax) == XRPAmount(umax));
-            BEAST_EXPECT(amountFromJson(sfNumber, std::to_string(umax)) == XRPAmount(umax));
+            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
@@ -697,7 +701,7 @@ public:
 
             try
             {
-                auto _ = amountFromJson(sfNumber, Json::Value());
+                auto _ = amountFromJson(sfNumber, json::Value());
                 BEAST_EXPECT(false);
             }
             catch (std::runtime_error const& e)
diff --git a/src/test/protocol/STInteger_test.cpp b/src/test/protocol/STInteger_test.cpp
index ccb3e726da..b28273ffb9 100644
--- a/src/test/protocol/STInteger_test.cpp
+++ b/src/test/protocol/STInteger_test.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-struct STInteger_test : public beast::unit_test::suite
+struct STInteger_test : public beast::unit_test::Suite
 {
     void
     testUInt8()
@@ -17,7 +17,7 @@ struct STInteger_test : public beast::unit_test::suite
         BEAST_EXPECT(u8.value() == 255);
         BEAST_EXPECT(u8.getText() == "255");
         BEAST_EXPECT(u8.getSType() == STI_UINT8);
-        BEAST_EXPECT(u8.getJson(JsonOptions::none) == 255);
+        BEAST_EXPECT(u8.getJson(JsonOptions::KNone) == 255);
 
         // there is some special handling for sfTransactionResult
         STUInt8 const tr(sfTransactionResult, 0);
@@ -25,14 +25,14 @@ struct STInteger_test : public beast::unit_test::suite
         BEAST_EXPECT(
             tr.getText() == "The transaction was applied. Only final in a validated ledger.");
         BEAST_EXPECT(tr.getSType() == STI_UINT8);
-        BEAST_EXPECT(tr.getJson(JsonOptions::none) == "tesSUCCESS");
+        BEAST_EXPECT(tr.getJson(JsonOptions::KNone) == "tesSUCCESS");
 
         // invalid transaction result
         STUInt8 const tr2(sfTransactionResult, 255);
         BEAST_EXPECT(tr2.value() == 255);
         BEAST_EXPECT(tr2.getText() == "255");
         BEAST_EXPECT(tr2.getSType() == STI_UINT8);
-        BEAST_EXPECT(tr2.getJson(JsonOptions::none) == 255);
+        BEAST_EXPECT(tr2.getJson(JsonOptions::KNone) == 255);
     }
 
     void
@@ -43,21 +43,21 @@ struct STInteger_test : public beast::unit_test::suite
         BEAST_EXPECT(u16.value() == 65535);
         BEAST_EXPECT(u16.getText() == "65535");
         BEAST_EXPECT(u16.getSType() == STI_UINT16);
-        BEAST_EXPECT(u16.getJson(JsonOptions::none) == 65535);
+        BEAST_EXPECT(u16.getJson(JsonOptions::KNone) == 65535);
 
         // there is some special handling for sfLedgerEntryType
         STUInt16 const let(sfLedgerEntryType, ltACCOUNT_ROOT);
         BEAST_EXPECT(let.value() == ltACCOUNT_ROOT);
         BEAST_EXPECT(let.getText() == "AccountRoot");
         BEAST_EXPECT(let.getSType() == STI_UINT16);
-        BEAST_EXPECT(let.getJson(JsonOptions::none) == "AccountRoot");
+        BEAST_EXPECT(let.getJson(JsonOptions::KNone) == "AccountRoot");
 
         // there is some special handling for sfTransactionType
         STUInt16 const tlt(sfTransactionType, ttPAYMENT);
         BEAST_EXPECT(tlt.value() == ttPAYMENT);
         BEAST_EXPECT(tlt.getText() == "Payment");
         BEAST_EXPECT(tlt.getSType() == STI_UINT16);
-        BEAST_EXPECT(tlt.getJson(JsonOptions::none) == "Payment");
+        BEAST_EXPECT(tlt.getJson(JsonOptions::KNone) == "Payment");
     }
 
     void
@@ -68,19 +68,19 @@ struct STInteger_test : public beast::unit_test::suite
         BEAST_EXPECT(u32.value() == 4'294'967'295u);
         BEAST_EXPECT(u32.getText() == "4294967295");
         BEAST_EXPECT(u32.getSType() == STI_UINT32);
-        BEAST_EXPECT(u32.getJson(JsonOptions::none) == 4'294'967'295u);
+        BEAST_EXPECT(u32.getJson(JsonOptions::KNone) == 4'294'967'295u);
 
         // there is some special handling for sfPermissionValue
         STUInt32 const pv(sfPermissionValue, ttPAYMENT + 1);
         BEAST_EXPECT(pv.value() == ttPAYMENT + 1);
         BEAST_EXPECT(pv.getText() == "Payment");
         BEAST_EXPECT(pv.getSType() == STI_UINT32);
-        BEAST_EXPECT(pv.getJson(JsonOptions::none) == "Payment");
+        BEAST_EXPECT(pv.getJson(JsonOptions::KNone) == "Payment");
         STUInt32 const pv2(sfPermissionValue, PaymentMint);
         BEAST_EXPECT(pv2.value() == PaymentMint);
         BEAST_EXPECT(pv2.getText() == "PaymentMint");
         BEAST_EXPECT(pv2.getSType() == STI_UINT32);
-        BEAST_EXPECT(pv2.getJson(JsonOptions::none) == "PaymentMint");
+        BEAST_EXPECT(pv2.getJson(JsonOptions::KNone) == "PaymentMint");
     }
 
     void
@@ -93,15 +93,15 @@ struct STInteger_test : public beast::unit_test::suite
         BEAST_EXPECT(u64.getSType() == STI_UINT64);
 
         // By default, getJson returns hex string
-        auto jsonVal = u64.getJson(JsonOptions::none);
+        auto jsonVal = u64.getJson(JsonOptions::KNone);
         BEAST_EXPECT(jsonVal.isString());
         BEAST_EXPECT(jsonVal.asString() == "ffffffffffffffff");
 
-        STUInt64 const u64_2(sfMaximumAmount, 0xFFFFFFFFFFFFFFFFull);
-        BEAST_EXPECT(u64_2.value() == 0xFFFFFFFFFFFFFFFFull);
-        BEAST_EXPECT(u64_2.getText() == "18446744073709551615");
-        BEAST_EXPECT(u64_2.getSType() == STI_UINT64);
-        BEAST_EXPECT(u64_2.getJson(JsonOptions::none) == "18446744073709551615");
+        STUInt64 const u642(sfMaximumAmount, 0xFFFFFFFFFFFFFFFFull);
+        BEAST_EXPECT(u642.value() == 0xFFFFFFFFFFFFFFFFull);
+        BEAST_EXPECT(u642.getText() == "18446744073709551615");
+        BEAST_EXPECT(u642.getSType() == STI_UINT64);
+        BEAST_EXPECT(u642.getJson(JsonOptions::KNone) == "18446744073709551615");
     }
 
     void
@@ -114,7 +114,7 @@ struct STInteger_test : public beast::unit_test::suite
             BEAST_EXPECT(i32.value() == minInt32);
             BEAST_EXPECT(i32.getText() == "-2147483648");
             BEAST_EXPECT(i32.getSType() == STI_INT32);
-            BEAST_EXPECT(i32.getJson(JsonOptions::none) == minInt32);
+            BEAST_EXPECT(i32.getJson(JsonOptions::KNone) == minInt32);
         }
 
         {
@@ -123,7 +123,7 @@ struct STInteger_test : public beast::unit_test::suite
             BEAST_EXPECT(i32.value() == maxInt32);
             BEAST_EXPECT(i32.getText() == "2147483647");
             BEAST_EXPECT(i32.getSType() == STI_INT32);
-            BEAST_EXPECT(i32.getJson(JsonOptions::none) == maxInt32);
+            BEAST_EXPECT(i32.getJson(JsonOptions::KNone) == maxInt32);
         }
     }
 
diff --git a/src/test/protocol/STIssue_test.cpp b/src/test/protocol/STIssue_test.cpp
index 41b8e27d7b..04364510f0 100644
--- a/src/test/protocol/STIssue_test.cpp
+++ b/src/test/protocol/STIssue_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl::test {
 
-class STIssue_test : public beast::unit_test::suite
+class STIssue_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -22,7 +22,7 @@ public:
         testcase("Constructor");
         using namespace jtx;
         Account const alice{"alice"};
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
         Issue issue;
 
         try
@@ -39,7 +39,7 @@ public:
 
         try
         {
-            issue = USD;
+            issue = usd;
             issue.account = xrpAccount();
             STIssue const stissue(sfAsset, Asset{issue});
             fail("Inconsistent IOU Issue doesn't fail");
@@ -55,7 +55,7 @@ public:
             auto const data =
                 "00000000000000000000000055534400000000000000000000000000000000"
                 "000000000000000000";
-            base_uint<320> uint;
+            BaseUint<320> uint;
             (void)uint.parseHex(data);
             SerialIter iter(Slice(uint.data(), uint.size()));
             STIssue const stissue(iter, sfAsset);
@@ -77,7 +77,7 @@ public:
 
         try
         {
-            STIssue const stissue(sfAsset, Asset{USD});
+            STIssue const stissue(sfAsset, Asset{usd});
         }
         catch (...)
         {
@@ -89,11 +89,11 @@ public:
             auto const data =
                 "0000000000000000000000005553440000000000ae123a8556f3cf91154711"
                 "376afb0f894f832b3d";
-            base_uint<320> uint;
+            BaseUint<320> uint;
             (void)uint.parseHex(data);
             SerialIter iter(Slice(uint.data(), uint.size()));
             STIssue const stissue(iter, sfAsset);
-            BEAST_EXPECT(stissue.value() == USD);
+            BEAST_EXPECT(stissue.value() == usd);
         }
         catch (...)
         {
@@ -103,7 +103,7 @@ public:
         try
         {
             auto const data = "0000000000000000000000000000000000000000";
-            base_uint<160> uint;
+            BaseUint<160> uint;
             (void)uint.parseHex(data);
             SerialIter iter(Slice(uint.data(), uint.size()));
             STIssue const stissue(iter, sfAsset);
@@ -121,9 +121,9 @@ public:
         testcase("Compare");
         using namespace jtx;
         Account const alice{"alice"};
-        auto const USD = alice["USD"];
+        auto const usd = alice["USD"];
         Asset const asset1{xrpIssue()};
-        Asset const asset2{USD};
+        Asset const asset2{usd};
         Asset const asset3{MPTID{2}};
 
         BEAST_EXPECT(STIssue(sfAsset, asset1) != asset2);
diff --git a/src/test/protocol/STNumber_test.cpp b/src/test/protocol/STNumber_test.cpp
index e2c1a91e64..914e2d003f 100644
--- a/src/test/protocol/STNumber_test.cpp
+++ b/src/test/protocol/STNumber_test.cpp
@@ -18,7 +18,7 @@
 
 namespace xrpl {
 
-struct STNumber_test : public beast::unit_test::suite
+struct STNumber_test : public beast::unit_test::Suite
 {
     void
     testCombo(Number number)
@@ -55,7 +55,7 @@ struct STNumber_test : public beast::unit_test::suite
             testCombo(Number{mantissa});
 
         std::initializer_list<std::int32_t> const exponents = {
-            Number::minExponent, -1, 0, 1, Number::maxExponent - 1};
+            Number::kMIN_EXPONENT, -1, 0, 1, Number::kMAX_EXPONENT - 1};
         for (std::int32_t const exponent : exponents)
             testCombo(Number{123, exponent});
 
@@ -69,10 +69,10 @@ struct STNumber_test : public beast::unit_test::suite
         }
 
         {
-            BEAST_EXPECT(numberFromJson(sfNumber, Json::Value(42)) == STNumber(sfNumber, 42));
-            BEAST_EXPECT(numberFromJson(sfNumber, Json::Value(-42)) == STNumber(sfNumber, -42));
+            BEAST_EXPECT(numberFromJson(sfNumber, json::Value(42)) == STNumber(sfNumber, 42));
+            BEAST_EXPECT(numberFromJson(sfNumber, json::Value(-42)) == STNumber(sfNumber, -42));
 
-            BEAST_EXPECT(numberFromJson(sfNumber, Json::UInt(42)) == STNumber(sfNumber, 42));
+            BEAST_EXPECT(numberFromJson(sfNumber, json::UInt(42)) == STNumber(sfNumber, 42));
 
             BEAST_EXPECT(numberFromJson(sfNumber, "-123") == STNumber(sfNumber, -123));
 
@@ -101,12 +101,12 @@ struct STNumber_test : public beast::unit_test::suite
             BEAST_EXPECT(numberFromJson(sfNumber, "-0.000e6") == STNumber(sfNumber, 0));
 
             {
-                NumberRoundModeGuard const mg(Number::rounding_mode::towards_zero);
+                NumberRoundModeGuard const mg(Number::RoundingMode::TowardsZero);
                 // maxint64 9,223,372,036,854,775,807
                 auto const maxInt = std::to_string(std::numeric_limits<std::int64_t>::max());
                 // minint64 -9,223,372,036,854,775,808
                 auto const minInt = std::to_string(std::numeric_limits<std::int64_t>::min());
-                if (Number::getMantissaScale() == MantissaRange::mantissa_scale::small)
+                if (Number::getMantissaScale() == MantissaRange::MantissaScale::Small)
                 {
                     BEAST_EXPECT(
                         numberFromJson(sfNumber, maxInt) ==
@@ -124,27 +124,27 @@ struct STNumber_test : public beast::unit_test::suite
                         numberFromJson(sfNumber, minInt) ==
                         STNumber(
                             sfNumber,
-                            Number{true, 9'223'372'036'854'775'808ULL, 0, Number::normalized{}}));
+                            Number{true, 9'223'372'036'854'775'808ULL, 0, Number::Normalized{}}));
                 }
             }
 
-            constexpr auto imin = std::numeric_limits<int>::min();
-            BEAST_EXPECT(numberFromJson(sfNumber, imin) == STNumber(sfNumber, Number(imin, 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(imin)) ==
-                STNumber(sfNumber, Number(imin, 0)));
+                numberFromJson(sfNumber, std::to_string(kIMIN)) ==
+                STNumber(sfNumber, Number(kIMIN, 0)));
 
-            constexpr auto imax = std::numeric_limits<int>::max();
-            BEAST_EXPECT(numberFromJson(sfNumber, imax) == STNumber(sfNumber, Number(imax, 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(imax)) ==
-                STNumber(sfNumber, Number(imax, 0)));
+                numberFromJson(sfNumber, std::to_string(kIMAX)) ==
+                STNumber(sfNumber, Number(kIMAX, 0)));
 
-            constexpr auto umax = std::numeric_limits<unsigned int>::max();
-            BEAST_EXPECT(numberFromJson(sfNumber, umax) == STNumber(sfNumber, Number(umax, 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(umax)) ==
-                STNumber(sfNumber, Number(umax, 0)));
+                numberFromJson(sfNumber, std::to_string(kUMAX)) ==
+                STNumber(sfNumber, Number(kUMAX, 0)));
 
             // Obvious non-numbers tested here
             try
@@ -193,7 +193,7 @@ struct STNumber_test : public beast::unit_test::suite
 
             try
             {
-                auto _ = numberFromJson(sfNumber, Json::Value());
+                auto _ = numberFromJson(sfNumber, json::Value());
                 BEAST_EXPECT(false);
             }
             catch (std::runtime_error const& e)
@@ -281,7 +281,7 @@ struct STNumber_test : public beast::unit_test::suite
         static_assert(!std::is_convertible_v<STNumber*, Number*>);
 
         for (auto const scale :
-             {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
+             {MantissaRange::MantissaScale::Small, MantissaRange::MantissaScale::Large})
         {
             NumberMantissaScaleGuard const sg(scale);
             testcase << to_string(Number::getMantissaScale());
diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp
index d76446599c..a408f2503b 100644
--- a/src/test/protocol/STObject_test.cpp
+++ b/src/test/protocol/STObject_test.cpp
@@ -28,7 +28,7 @@
 
 namespace xrpl {
 
-class STObject_test : public beast::unit_test::suite
+class STObject_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -36,19 +36,19 @@ public:
     {
         testcase("serialization");
 
-        unexpected(sfGeneric.isUseful(), "sfGeneric must not be useful");
+        unexpected(kSF_GENERIC.isUseful(), "sfGeneric must not be useful");
         {
             // Try to put sfGeneric in an SOTemplate.
             except<std::runtime_error>(
-                [&]() { SOTemplate const elements{{sfGeneric, soeREQUIRED}}; });
+                [&]() { SOTemplate const elements{{kSF_GENERIC, SoeRequired}}; });
         }
 
-        unexpected(sfInvalid.isUseful(), "sfInvalid must not be useful");
+        unexpected(kSF_INVALID.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 == sfInvalid);
+                BEAST_EXPECT(shouldBeInvalid == kSF_INVALID);
             };
             testInvalid(STI_VL, 255);
             testInvalid(STI_UINT256, 255);
@@ -59,14 +59,14 @@ public:
         {
             // Try to put sfInvalid in an SOTemplate.
             except<std::runtime_error>(
-                [&]() { SOTemplate const elements{{sfInvalid, soeREQUIRED}}; });
+                [&]() { SOTemplate const elements{{kSF_INVALID, SoeRequired}}; });
         }
         {
             // Try to put the same SField into an SOTemplate twice.
             except<std::runtime_error>([&]() {
                 SOTemplate const elements{
-                    {sfAccount, soeREQUIRED},
-                    {sfAccount, soeREQUIRED},
+                    {sfAccount, SoeRequired},
+                    {sfAccount, SoeRequired},
                 };
             });
         }
@@ -79,11 +79,11 @@ public:
         SField const& sfTestObject = sfMajority;
 
         SOTemplate const elements{
-            {sfFlags, soeREQUIRED},
-            {sfTestVL, soeREQUIRED},
-            {sfTestH256, soeOPTIONAL},
-            {sfTestU32, soeREQUIRED},
-            {sfTestV256, soeOPTIONAL},
+            {sfFlags, SoeRequired},
+            {sfTestVL, SoeRequired},
+            {sfTestH256, SoeOptional},
+            {sfTestU32, SoeRequired},
+            {sfTestV256, SoeOptional},
         };
 
         STObject object1(elements, sfTestObject);
@@ -103,8 +103,8 @@ public:
 
         if (object1.getSerializer() == object2.getSerializer())
         {
-            log << "O1: " << object1.getJson(JsonOptions::none) << '\n'
-                << "O2: " << object2.getJson(JsonOptions::none) << std::endl;
+            log << "O1: " << object1.getJson(JsonOptions::KNone) << '\n'
+                << "O2: " << object2.getJson(JsonOptions::KNone) << std::endl;
             fail("STObject error 4");
         }
         else
@@ -188,7 +188,7 @@ public:
 
         {
             auto const st = [&]() {
-                STObject s(sfGeneric);
+                STObject s(kSF_GENERIC);
                 s.setFieldU32(sf1Outer, 1);
                 s.setFieldU32(sf2Outer, 2);
                 return s;
@@ -209,17 +209,17 @@ public:
 
         // read templated object
         SOTemplate const sotOuter{
-            {sf1Outer, soeREQUIRED},
-            {sf2Outer, soeOPTIONAL},
-            {sf3Outer, soeDEFAULT},
-            {sf4Outer, soeOPTIONAL},
-            {sf4, soeOPTIONAL},
-            {sf5, soeDEFAULT},
+            {sf1Outer, SoeRequired},
+            {sf2Outer, SoeOptional},
+            {sf3Outer, SoeDefault},
+            {sf4Outer, SoeOptional},
+            {sf4, SoeOptional},
+            {sf5, SoeDefault},
         };
 
         {
             auto const st = [&]() {
-                STObject s(sotOuter, sfGeneric);
+                STObject s(sotOuter, kSF_GENERIC);
                 s.setFieldU32(sf1Outer, 1);
                 s.setFieldU32(sf2Outer, 2);
                 return s;
@@ -239,7 +239,7 @@ public:
         // write free object
 
         {
-            STObject st(sfGeneric);
+            STObject st(kSF_GENERIC);
             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, sfGeneric);
+            STObject st(sotOuter, kSF_GENERIC);
             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(sfGeneric);
+            STObject st(kSF_GENERIC);
             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(sfGeneric);
+            STObject st(kSF_GENERIC);
             st[sfAmount] = STAmount{};
             st[sfAccount] = AccountID{};
             st[sfDigest] = uint256{};
@@ -375,7 +375,7 @@ public:
 
         {
             {
-                STObject st(sfGeneric);
+                STObject st(kSF_GENERIC);
                 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, sfGeneric);
+                STObject st(sotOuter, kSF_GENERIC);
                 BEAST_EXPECT(st[sf5] == Slice{});
                 BEAST_EXPECT(!!st[~sf5]);
                 BEAST_EXPECT(!!~st[~sf5]);
@@ -408,9 +408,9 @@ public:
         // UDT blobs
 
         {
-            STObject st(sfGeneric);
+            STObject st(kSF_GENERIC);
             BEAST_EXPECT(!st[~sf5]);
-            auto const kp = generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase"));
+            auto const kp = generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase"));
             st[sf5] = kp.first;
             st[~sf5] = std::nullopt;
         }
@@ -419,7 +419,7 @@ public:
 
         {
             auto const& sf = sfIndexes;
-            STObject st(sfGeneric);
+            STObject st(kSF_GENERIC);
             std::vector<uint256> v;
             v.emplace_back(1);
             v.emplace_back(2);
@@ -441,12 +441,12 @@ public:
             auto const& sf2 = sfHashes;
             auto const& sf3 = sfAmendments;
             SOTemplate const sot{
-                {sf1, soeREQUIRED},
-                {sf2, soeOPTIONAL},
-                {sf3, soeDEFAULT},
+                {sf1, SoeRequired},
+                {sf2, SoeOptional},
+                {sf3, SoeDefault},
             };
 
-            STObject st(sot, sfGeneric);
+            STObject st(sot, kSF_GENERIC);
             auto const& cst(st);
             BEAST_EXPECT(cst[sf1].empty());
             BEAST_EXPECT(!cst[~sf2]);
diff --git a/src/test/protocol/STParsedJSON_test.cpp b/src/test/protocol/STParsedJSON_test.cpp
index 75d3d74ddd..ef2f8e971e 100644
--- a/src/test/protocol/STParsedJSON_test.cpp
+++ b/src/test/protocol/STParsedJSON_test.cpp
@@ -25,12 +25,12 @@
 
 namespace xrpl {
 
-class STParsedJSON_test : public beast::unit_test::suite
+class STParsedJSON_test : public beast::unit_test::Suite
 {
     static bool
-    parseJSONString(std::string const& json, Json::Value& to)
+    parseJSONString(std::string const& json, json::Value& to)
     {
-        Json::Reader reader;
+        json::Reader reader;
         return reader.parse(json, to) && to.isObject();
     }
 
@@ -39,7 +39,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt8");
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = 255;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -51,7 +51,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // test with uint value
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = 255u;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -63,7 +63,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with string value
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = "255";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -75,7 +75,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test min value for uint8
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = 0;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -85,7 +85,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for UInt8 (negative)
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = -1;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -93,7 +93,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for UInt8 (too large)
         {
-            Json::Value j;
+            json::Value j;
             j[sfCloseResolution] = 256;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -101,16 +101,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test bad_type (not a string/int/uint)
         {
-            Json::Value j;
-            j[sfCloseResolution] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfCloseResolution] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Test bad_type (not a string/int/uint)
         {
-            Json::Value j;
-            j[sfCloseResolution] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfCloseResolution] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -122,7 +122,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("UInt16");
         // Test with int value
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = 65535;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -134,7 +134,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with uint value
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = 65535u;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -146,7 +146,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with string value
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = "65535";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -158,7 +158,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test min value for uint16
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = 0;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -168,7 +168,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for UInt16 (negative)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = -1;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -176,7 +176,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for UInt16 (too large)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = 65536;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -184,7 +184,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test string value out of range
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntryType] = "65536";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -192,23 +192,23 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test bad_type (not a string/int/uint)
         {
-            Json::Value j;
-            j[sfLedgerEntryType] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfLedgerEntryType] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Test bad_type (not a string/int/uint)
         {
-            Json::Value j;
-            j[sfLedgerEntryType] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfLedgerEntryType] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Invalid input for other field
         {
-            Json::Value j;
+            json::Value j;
             j[sfTransferFee] = "Payment";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -220,7 +220,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt32");
         {
-            Json::Value j;
+            json::Value j;
             j[sfNetworkID] = 4294967295u;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -232,7 +232,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with string value
         {
-            Json::Value j;
+            json::Value j;
             j[sfNetworkID] = "4294967295";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -244,7 +244,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test min value for uint32
         {
-            Json::Value j;
+            json::Value j;
             j[sfNetworkID] = 0;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -254,7 +254,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for uint32 (negative)
         {
-            Json::Value j;
+            json::Value j;
             j[sfNetworkID] = -1;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -262,7 +262,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test string value out of range
         {
-            Json::Value j;
+            json::Value j;
             j[sfNetworkID] = "4294967296";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -270,16 +270,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test bad_type (arrayValue)
         {
-            Json::Value j;
-            j[sfNetworkID] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfNetworkID] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Test bad_type (objectValue)
         {
-            Json::Value j;
-            j[sfNetworkID] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfNetworkID] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -290,7 +290,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt64");
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = "ffffffffffffffff";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -302,7 +302,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test min value for uint64
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = 0;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -312,7 +312,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for uint64 (negative)
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = -1;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -323,7 +323,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test string value out of range
         // string is interpreted as hex
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = "10000000000000000";  // uint64 max + 1 (in hex)
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -331,7 +331,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test hex string value with 0x prefix (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = "0xabcdefabcdef";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -339,7 +339,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test hex string value with invalid characters
         {
-            Json::Value j;
+            json::Value j;
             j[sfIndexNext] = "abcdefga";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -347,16 +347,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // test arrayValue
         {
-            Json::Value j;
-            j[sfIndexNext] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfIndexNext] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // test objectValue
         {
-            Json::Value j;
-            j[sfIndexNext] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfIndexNext] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -367,7 +367,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt128");
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "0123456789ABCDEF0123456789ABCDEF";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -398,7 +398,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid lowercase hex string for UInt128
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "0123456789abcdef0123456789abcdef";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -410,7 +410,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for UInt128 (should be valid, all zero)
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -425,7 +425,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Odd-length hex string for UInt128 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "0123456789ABCDEF0123456789ABCDE";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -433,7 +433,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Non-hex string for UInt128 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "nothexstring";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -441,7 +441,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too short for UInt128 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "01234567";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -449,7 +449,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too long for UInt128 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfEmailHash] = "0123456789ABCDEF0123456789ABCDEF00";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -457,16 +457,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for UInt128 (should fail)
         {
-            Json::Value j;
-            j[sfEmailHash] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfEmailHash] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for UInt128 (should fail)
         {
-            Json::Value j;
-            j[sfEmailHash] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfEmailHash] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -477,7 +477,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt160");
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "0123456789ABCDEF0123456789ABCDEF01234567";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -493,7 +493,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         }
         // Valid lowercase hex string for UInt160
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "0123456789abcdef0123456789abcdef01234567";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -505,7 +505,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for UInt160 (should be valid, all zero)
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -520,7 +520,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Non-hex string for UInt160 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "nothexstring";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -528,7 +528,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too short for UInt160 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "01234567";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -536,7 +536,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too long for UInt160 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfTakerPaysCurrency] = "0123456789ABCDEF0123456789ABCDEF0123456789";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -544,16 +544,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for UInt160 (should fail)
         {
-            Json::Value j;
-            j[sfTakerPaysCurrency] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfTakerPaysCurrency] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for UInt160 (should fail)
         {
-            Json::Value j;
-            j[sfTakerPaysCurrency] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfTakerPaysCurrency] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -564,7 +564,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("UInt192");
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -581,7 +581,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid lowercase hex string for UInt192
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "ffffffffffffffffffffffffffffffffffffffffffffffff";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -593,7 +593,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for UInt192 (should be valid, all zero)
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -608,7 +608,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Odd-length hex string for UInt192 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "0123456789ABCDEF0123456789ABCDEF0123456789ABCDE";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -616,7 +616,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Non-hex string for UInt192 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "nothexstring";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -624,7 +624,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too short for UInt192 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "01234567";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -632,7 +632,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too long for UInt192 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfMPTokenIssuanceID] = "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF00";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -640,16 +640,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for UInt192 (should fail)
         {
-            Json::Value j;
-            j[sfMPTokenIssuanceID] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfMPTokenIssuanceID] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for UInt192 (should fail)
         {
-            Json::Value j;
-            j[sfMPTokenIssuanceID] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfMPTokenIssuanceID] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -661,7 +661,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("UInt256");
         // Test with valid hex string for UInt256
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] =
                 "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCD"
                 "EF";
@@ -680,7 +680,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         }
         // Valid lowercase hex string for UInt256
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] =
                 "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"
                 "ef";
@@ -694,7 +694,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for UInt256 (should be valid, all zero)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -709,7 +709,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Odd-length hex string for UInt256 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] =
                 "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCD"
                 "E";
@@ -719,7 +719,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Non-hex string for UInt256 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] = "nothexstring";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -727,7 +727,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too short for UInt256 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] = "01234567";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -735,7 +735,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Hex string too long for UInt256 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerHash] =
                 "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCD"
                 "EF00";
@@ -745,16 +745,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for UInt256 (should fail)
         {
-            Json::Value j;
-            j[sfLedgerHash] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfLedgerHash] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for UInt256 (should fail)
         {
-            Json::Value j;
-            j[sfLedgerHash] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfLedgerHash] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -765,7 +765,7 @@ class STParsedJSON_test : public beast::unit_test::suite
     {
         testcase("Int32");
         {
-            Json::Value j;
+            json::Value j;
             int const minInt32 = -2147483648;
             j[sfLoanScale] = minInt32;
             STParsedJSONObject obj("Test", j);
@@ -780,7 +780,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // max value
         {
-            Json::Value j;
+            json::Value j;
             int const maxInt32 = 2147483647;
             j[sfLoanScale] = maxInt32;
             STParsedJSONObject obj("Test", j);
@@ -795,7 +795,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // max uint value
         {
-            Json::Value j;
+            json::Value j;
             unsigned int const maxUInt32 = 2147483647u;
             j[sfLoanScale] = maxUInt32;
             STParsedJSONObject obj("Test", j);
@@ -811,7 +811,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with string value
         {
-            Json::Value j;
+            json::Value j;
             j[sfLoanScale] = "2147483647";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -825,7 +825,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with string negative value
         {
-            Json::Value j;
+            json::Value j;
             int const value = -2147483648;
             j[sfLoanScale] = std::to_string(value);
             STParsedJSONObject obj("Test", j);
@@ -840,7 +840,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for int32 (negative)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLoanScale] = "-2147483649";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -848,7 +848,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test out of range value for int32 (positive)
         {
-            Json::Value j;
+            json::Value j;
             j[sfLoanScale] = 2147483648u;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -856,7 +856,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test string value out of range
         {
-            Json::Value j;
+            json::Value j;
             j[sfLoanScale] = "2147483648";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -864,16 +864,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test bad_type (arrayValue)
         {
-            Json::Value j;
-            j[sfLoanScale] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfLoanScale] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Test bad_type (objectValue)
         {
-            Json::Value j;
-            j[sfLoanScale] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfLoanScale] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -885,7 +885,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Blob");
         // Test with valid hex string for blob
         {
-            Json::Value j;
+            json::Value j;
             j[sfPublicKey] = "DEADBEEF";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -902,7 +902,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test empty string for blob (should be valid, size 0)
         {
-            Json::Value j;
+            json::Value j;
             j[sfPublicKey] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -915,7 +915,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test lowercase hex string for blob
         {
-            Json::Value j;
+            json::Value j;
             j[sfPublicKey] = "deadbeef";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -932,7 +932,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test non-hex string for blob (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfPublicKey] = "XYZ123";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -940,16 +940,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test array value for blob (should fail)
         {
-            Json::Value j;
-            j[sfPublicKey] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfPublicKey] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Test object value for blob (should fail)
         {
-            Json::Value j;
-            j[sfPublicKey] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfPublicKey] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -961,8 +961,8 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Vector256");
         // Test with valid array of hex strings for Vector256
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append(
                 "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCD"
                 "EF");
@@ -982,8 +982,8 @@ class STParsedJSON_test : public beast::unit_test::suite
         }
         // Test empty array for Vector256 (should be valid, size 0)
         {
-            Json::Value j;
-            Json::Value const arr(Json::arrayValue);
+            json::Value j;
+            json::Value const arr(json::ArrayValue);
             j[sfHashes] = arr;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -996,8 +996,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test array with invalid hex string (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append("nothexstring");
             j[sfHashes] = arr;
             STParsedJSONObject const obj("Test", j);
@@ -1006,8 +1006,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test array with string of wrong length (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append("0123456789ABCDEF");  // too short for uint256
             j[sfHashes] = arr;
             STParsedJSONObject const obj("Test", j);
@@ -1016,8 +1016,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test array with non-string element (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append(12345);
             j[sfHashes] = arr;
             STParsedJSONObject const obj("Test", j);
@@ -1026,7 +1026,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test non-array value for Vector256 (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfHashes] = "notanarray";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1034,9 +1034,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test array with object element (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
-            Json::Value objElem(Json::objectValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
+            json::Value objElem(json::ObjectValue);
             objElem["foo"] = "bar";
             arr.append(objElem);
             j[sfHashes] = arr;
@@ -1051,7 +1051,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Account");
         // Test with valid base58 string for AccountID
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1065,7 +1065,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid hex string for AccountID
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "000102030405060708090A0B0C0D0E0F10111213";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1078,7 +1078,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid base58 string for AccountID
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "notAValidBase58Account";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1086,7 +1086,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid hex string for AccountID (too short)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "001122334455";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1094,7 +1094,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid hex string for AccountID (too long)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "000102030405060708090A0B0C0D0E0F101112131415";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1102,7 +1102,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid hex string for AccountID (bad chars)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "000102030405060708090A0B0C0D0E0F1011121G";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1110,7 +1110,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for AccountID (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAccount] = "";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1118,16 +1118,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for AccountID (should fail)
         {
-            Json::Value j;
-            j[sfAccount] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfAccount] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for AccountID (should fail)
         {
-            Json::Value j;
-            j[sfAccount] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfAccount] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -1139,7 +1139,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Currency");
         // Test with valid ISO code for currency
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "USD";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1152,7 +1152,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid ISO code
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "EUR";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1165,7 +1165,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid hex string for currency
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "0123456789ABCDEF01230123456789ABCDEF0123";
             STParsedJSONObject obj("Test", j);
             if (BEAST_EXPECT(obj.object); obj.object.has_value())
@@ -1178,7 +1178,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid ISO code (too long)
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "USDD";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1186,7 +1186,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // lowercase ISO code
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "usd";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1199,7 +1199,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid hex string (too short)
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "0123456789AB";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1207,7 +1207,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid hex string (too long)
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "0123456789ABCDEF0123456789";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1215,7 +1215,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Empty string for currency (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfBaseAsset] = "";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1228,16 +1228,16 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Array value for currency (should fail)
         {
-            Json::Value j;
-            j[sfBaseAsset] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfBaseAsset] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Object value for currency (should fail)
         {
-            Json::Value j;
-            j[sfBaseAsset] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfBaseAsset] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -1249,7 +1249,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Amount");
         // Test with string value for Amount
         {
-            Json::Value j;
+            json::Value j;
             j[sfAmount] = "100000000000000000";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1261,7 +1261,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with int value for Amount
         {
-            Json::Value j;
+            json::Value j;
             j[sfAmount] = 4294967295u;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1273,7 +1273,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with decimal string for Amount (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAmount] = "123.45";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1281,7 +1281,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with empty string for Amount (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAmount] = "";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1289,7 +1289,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with non-numeric string for Amount (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfAmount] = "notanumber";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1297,8 +1297,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with object value for Amount (should fail)
         {
-            Json::Value j;
-            j[sfAmount] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfAmount] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -1310,14 +1310,14 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("PathSet");
         // Valid test: single path with single element
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["account"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             elem["currency"] = "USD";
             elem["issuer"] = "rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe";
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject obj("Test", j);
@@ -1342,14 +1342,14 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid test: non-standard currency code
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["account"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             elem["currency"] = "0123456789ABCDEF01230123456789ABCDEF0123";
             elem["issuer"] = "rPT1Sjq2YGrBMTttX4GZHjKu9dyfzbpAYe";
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject obj("Test", j);
@@ -1363,7 +1363,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with non-array value for PathSet (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfPaths] = "notanarray";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1371,8 +1371,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with array containing non-array element (should fail)
         {
-            Json::Value j;
-            Json::Value pathset(Json::arrayValue);
+            json::Value j;
+            json::Value pathset(json::ArrayValue);
             pathset.append("notanarray");
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1382,10 +1382,10 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test with array containing array with non-object element (should
         // fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
             path.append("notanobject");
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1395,12 +1395,12 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test with array containing array with object missing required keys
         // (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["foo"] = "bar";  // not a valid path element key
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1410,12 +1410,12 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test with array containing array with object with invalid account
         // value (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["account"] = "notAValidBase58Account";
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1424,12 +1424,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with account not string (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["account"] = 12345;
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1438,12 +1438,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with currency not string (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["currency"] = 12345;
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1452,12 +1452,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with non-standard currency not hex (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["currency"] = "notAValidCurrency";
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1466,12 +1466,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with issuer not string (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["issuer"] = 12345;
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1480,12 +1480,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with issuer not base58 (should fail)
         {
-            Json::Value j;
-            Json::Value path(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value path(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["issuer"] = "notAValidBase58Account";
             path.append(elem);
-            Json::Value pathset(Json::arrayValue);
+            json::Value pathset(json::ArrayValue);
             pathset.append(path);
             j[sfPaths] = pathset;
             STParsedJSONObject const obj("Test", j);
@@ -1499,8 +1499,8 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Issue");
         // Valid Issue: currency and issuer as base58
         {
-            Json::Value j;
-            Json::Value issueJson(Json::objectValue);
+            json::Value j;
+            json::Value issueJson(json::ObjectValue);
             issueJson["currency"] = "USD";
             issueJson["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             j[sfAsset] = issueJson;
@@ -1522,8 +1522,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid Issue: currency as hex
         {
-            Json::Value j;
-            Json::Value issueJson(Json::objectValue);
+            json::Value j;
+            json::Value issueJson(json::ObjectValue);
             issueJson["currency"] = "0123456789ABCDEF01230123456789ABCDEF0123";
             issueJson["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             j[sfAsset] = issueJson;
@@ -1540,8 +1540,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid Issue: MPTID
         {
-            Json::Value j;
-            Json::Value issueJson(Json::objectValue);
+            json::Value j;
+            json::Value issueJson(json::ObjectValue);
             issueJson["mpt_issuance_id"] = "0000000000000000000000004D5054494431323334234234";
             j[sfAsset] = issueJson;
             STParsedJSONObject obj("Test", j);
@@ -1556,8 +1556,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: missing currency
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
             issue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             j[sfAsset] = issue;
             STParsedJSONObject const obj("Test", j);
@@ -1566,8 +1566,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: missing issuer
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
             issue["currency"] = "USD";
             j[sfAsset] = issue;
             STParsedJSONObject const obj("Test", j);
@@ -1576,8 +1576,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: currency too long
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
             issue["currency"] = "USDD";
             issue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             j[sfAsset] = issue;
@@ -1587,8 +1587,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: issuer not base58 or hex
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
             issue["currency"] = "USD";
             issue["issuer"] = "notAValidIssuer";
             j[sfAsset] = issue;
@@ -1598,9 +1598,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: currency not string
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
-            issue["currency"] = Json::Value(Json::arrayValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
+            issue["currency"] = json::Value(json::ArrayValue);
             issue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             j[sfAsset] = issue;
             STParsedJSONObject const obj("Test", j);
@@ -1609,10 +1609,10 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: issuer not string
         {
-            Json::Value j;
-            Json::Value issue(Json::objectValue);
+            json::Value j;
+            json::Value issue(json::ObjectValue);
             issue["currency"] = "USD";
-            issue["issuer"] = Json::Value(Json::objectValue);
+            issue["issuer"] = json::Value(json::ObjectValue);
             j[sfAsset] = issue;
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1620,7 +1620,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid Issue: not an object
         {
-            Json::Value j;
+            json::Value j;
             j[sfAsset] = "notanobject";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1633,12 +1633,12 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("XChainBridge");
         // Valid XChainBridge
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value issuingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value issuingChainIssue(json::ObjectValue);
             issuingChainIssue["currency"] = "USD";
             issuingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1658,12 +1658,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid XChainBridge: issues as hex currency
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value issuingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value issuingChainIssue(json::ObjectValue);
             issuingChainIssue["currency"] = "0123456789ABCDEF01230123456789ABCDEF0123";
             issuingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "0123456789ABCDEF01230123456789ABCDEF0123";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1683,9 +1683,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: missing LockingChainIssue
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value issuingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value issuingChainIssue(json::ObjectValue);
             issuingChainIssue["currency"] = "USD";
             issuingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["IssuingChainIssue"] = issuingChainIssue;
@@ -1698,9 +1698,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: missing IssuingChainIssue
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1713,13 +1713,13 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: missing LockingChainDoor
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value issuingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value issuingChainIssue(json::ObjectValue);
             issuingChainIssue["currency"] = "USD";
             issuingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["IssuingChainIssue"] = issuingChainIssue;
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1731,13 +1731,13 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: missing IssuingChainDoor
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value issuingChainIssue(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value issuingChainIssue(json::ObjectValue);
             issuingChainIssue["currency"] = "USD";
             issuingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["IssuingChainIssue"] = issuingChainIssue;
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1749,8 +1749,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: IssuingChainIssue not an object
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
             bridge["LockingChainIssue"] = "notanobject";
             bridge["IssuingChainIssue"] = "notanobject";
             j[sfXChainBridge] = bridge;
@@ -1760,11 +1760,11 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: IssuingChainIssue missing currency
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value asset(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value asset(json::ObjectValue);
             asset["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1776,11 +1776,11 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: asset missing issuer
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value asset(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value asset(json::ObjectValue);
             asset["currency"] = "USD";
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1792,12 +1792,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: asset issuer not base58
         {
-            Json::Value j;
-            Json::Value bridge(Json::objectValue);
-            Json::Value asset(Json::objectValue);
+            json::Value j;
+            json::Value bridge(json::ObjectValue);
+            json::Value asset(json::ObjectValue);
             asset["currency"] = "USD";
             asset["issuer"] = "notAValidBase58Account";
-            Json::Value lockingChainIssue(Json::objectValue);
+            json::Value lockingChainIssue(json::ObjectValue);
             lockingChainIssue["currency"] = "EUR";
             lockingChainIssue["issuer"] = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             bridge["LockingChainIssue"] = lockingChainIssue;
@@ -1809,7 +1809,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid XChainBridge: not an object
         {
-            Json::Value j;
+            json::Value j;
             j[sfXChainBridge] = "notanobject";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1822,7 +1822,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Number");
         // Valid integer value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = 12345;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1834,7 +1834,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid uint value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = 12345u;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1846,7 +1846,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid string integer value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = "67890";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1858,7 +1858,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid negative integer value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = -42;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1870,7 +1870,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid string negative integer value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = "-123";
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -1882,7 +1882,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Valid floating point value for STNumber
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = "3.14159";
             STParsedJSONObject obj("Test", j);
             if (BEAST_EXPECT(obj.object); obj.object.has_value())
@@ -1894,7 +1894,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid string value for STNumber (not a number)
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = "notanumber";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1902,23 +1902,23 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Invalid array value for STNumber
         {
-            Json::Value j;
-            j[sfNumber] = Json::Value(Json::arrayValue);
+            json::Value j;
+            j[sfNumber] = json::Value(json::ArrayValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Invalid object value for STNumber
         {
-            Json::Value j;
-            j[sfNumber] = Json::Value(Json::objectValue);
+            json::Value j;
+            j[sfNumber] = json::Value(json::ObjectValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
 
         // Empty string for STNumber (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfNumber] = "";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1931,8 +1931,8 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Object");
         // Test with valid object for Object
         {
-            Json::Value j;
-            Json::Value objVal(Json::objectValue);
+            json::Value j;
+            json::Value objVal(json::ObjectValue);
             objVal[sfTransactionResult] = 1;
             j[sfTransactionMetaData] = objVal;
             STParsedJSONObject obj("Test", j);
@@ -1946,7 +1946,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with non-object value for Object (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfTransactionMetaData] = "notanobject";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -1954,8 +1954,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with array value for Object (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append(1);
             j[sfTransactionMetaData] = arr;
             STParsedJSONObject const obj("Test", j);
@@ -1964,8 +1964,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with null value for Object (should fail)
         {
-            Json::Value j;
-            j[sfTransactionMetaData] = Json::Value(Json::nullValue);
+            json::Value j;
+            j[sfTransactionMetaData] = json::Value(json::NullValue);
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
         }
@@ -1973,12 +1973,12 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test with max depth (should succeed)
         // max depth is 64
         {
-            Json::Value j;
-            Json::Value obj(Json::objectValue);
-            Json::Value* current = &obj;
+            json::Value j;
+            json::Value obj(json::ObjectValue);
+            json::Value* current = &obj;
             for (int i = 0; i < 63; ++i)
             {
-                Json::Value const next(Json::objectValue);
+                json::Value const next(json::ObjectValue);
                 (*current)[sfTransactionMetaData] = next;
                 current = &((*current)[sfTransactionMetaData]);
             }
@@ -1992,12 +1992,12 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with depth exceeding maxDepth (should fail)
         {
-            Json::Value j;
-            Json::Value obj(Json::objectValue);
-            Json::Value* current = &obj;
+            json::Value j;
+            json::Value obj(json::ObjectValue);
+            json::Value* current = &obj;
             for (int i = 0; i < 64; ++i)
             {
-                Json::Value const next(Json::objectValue);
+                json::Value const next(json::ObjectValue);
                 (*current)[sfTransactionMetaData] = next;
                 current = &((*current)[sfTransactionMetaData]);
             }
@@ -2014,11 +2014,11 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("Array");
         // Test with valid array for Array
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem[sfTransactionResult] = 2;
-            Json::Value elem2(Json::objectValue);
+            json::Value elem2(json::ObjectValue);
             elem2[sfTransactionMetaData] = elem;
             arr.append(elem2);
             j[sfSignerEntries] = arr;
@@ -2037,8 +2037,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with array containing non-object element (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
             arr.append("notanobject");
             j[sfSignerEntries] = arr;
             STParsedJSONObject const obj("Test", j);
@@ -2047,9 +2047,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with array containing object with invalid field (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem["invalidField"] = 1;
             arr.append(elem);
             j[sfSignerEntries] = arr;
@@ -2059,9 +2059,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with array containing object with multiple keys (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem[sfTransactionResult] = 2;
             elem[sfNetworkID] = 3;
             arr.append(elem);
@@ -2072,7 +2072,7 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with non-array value for Array (should fail)
         {
-            Json::Value j;
+            json::Value j;
             j[sfSignerEntries] = "notanarray";
             STParsedJSONObject const obj("Test", j);
             BEAST_EXPECT(!obj.object.has_value());
@@ -2081,9 +2081,9 @@ class STParsedJSON_test : public beast::unit_test::suite
         // Test with array containing object with valid field but invalid value
         // (should fail)
         {
-            Json::Value j;
-            Json::Value arr(Json::arrayValue);
-            Json::Value elem(Json::objectValue);
+            json::Value j;
+            json::Value arr(json::ArrayValue);
+            json::Value elem(json::ObjectValue);
             elem[sfTransactionResult] = "notanint";
             arr.append(elem);
             j[sfSignerEntries] = arr;
@@ -2093,8 +2093,8 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with empty array for Array (should be valid)
         {
-            Json::Value j;
-            Json::Value const arr(Json::arrayValue);
+            json::Value j;
+            json::Value const arr(json::ArrayValue);
             j[sfSignerEntries] = arr;
             STParsedJSONObject obj("Test", j);
             BEAST_EXPECT(obj.object.has_value());
@@ -2104,9 +2104,9 @@ class STParsedJSON_test : public beast::unit_test::suite
 
         // Test with object provided but not object SField
         {
-            Json::Value j;
-            Json::Value obj(Json::arrayValue);
-            obj.append(Json::Value(Json::objectValue));
+            json::Value j;
+            json::Value obj(json::ArrayValue);
+            obj.append(json::Value(json::ObjectValue));
             obj[0u][sfTransactionResult] = 1;
             j[sfSignerEntries] = obj;
             STParsedJSONObject const parsed("Test", j);
@@ -2136,7 +2136,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                     "}]}");
 
                 std::unique_ptr<STObject> const so;
-                Json::Value faultyJson;
+                json::Value faultyJson;
                 bool const parsedOK(parseJSONString(faulty, faultyJson));
                 unexpected(!parsedOK, "failed to parse");
                 STParsedJSONObject const parsed("test", faultyJson);
@@ -2156,7 +2156,7 @@ class STParsedJSON_test : public beast::unit_test::suite
         testcase("General Invalid Cases");
 
         {
-            Json::Value j;
+            json::Value j;
             j[sfLedgerEntry] = 1;  // not a valid SField for STParsedJSON
         }
 
@@ -2165,7 +2165,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransactionResult":"tecFROZEN"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(goodJson, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2173,7 +2173,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 {
                     std::string const& serialized(
                         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                        to_string(parsed.object->getJson(JsonOptions::none)));
+                        to_string(parsed.object->getJson(JsonOptions::KNone)));
                     BEAST_EXPECT(serialized == goodJson);
                 }
             }
@@ -2187,18 +2187,18 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransactionResult":"tecFROZEN"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(goodJson, jv)))
             {
                 // Integer values are always parsed as int,
                 // unless they're too big. We want a small uint.
-                jv["CloseResolution"] = Json::UInt(19);
+                jv["CloseResolution"] = json::UInt(19);
                 STParsedJSONObject parsed("test", jv);
                 if (BEAST_EXPECT(parsed.object))
                 {
                     std::string const& serialized(
                         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                        to_string(parsed.object->getJson(JsonOptions::none)));
+                        to_string(parsed.object->getJson(JsonOptions::KNone)));
                     BEAST_EXPECT(serialized == expectedJson);
                 }
             }
@@ -2212,18 +2212,18 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransactionResult":"tecFROZEN"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(goodJson, jv)))
             {
                 // Integer values are always parsed as int,
                 // unless they're too big. We want a small uint.
-                jv["CloseResolution"] = Json::UInt(19);
+                jv["CloseResolution"] = json::UInt(19);
                 STParsedJSONObject parsed("test", jv);
                 if (BEAST_EXPECT(parsed.object))
                 {
                     std::string const& serialized(
                         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                        to_string(parsed.object->getJson(JsonOptions::none)));
+                        to_string(parsed.object->getJson(JsonOptions::KNone)));
                     BEAST_EXPECT(serialized == expectedJson);
                 }
             }
@@ -2234,7 +2234,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransactionResult":"terQUEUED"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2252,7 +2252,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":"pony",)"
                 R"("TransactionResult":"tesSUCCESS"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2269,7 +2269,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":3294967296,)"
                 R"("TransactionResult":"tesSUCCESS"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2286,7 +2286,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":-10,"Method":42,)"
                 R"("TransactionResult":"tesSUCCESS"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2304,7 +2304,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":3.141592653,)"
                 R"("TransactionResult":"tesSUCCESS"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2324,7 +2324,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransferFee":65535})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(goodJson, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2332,7 +2332,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 {
                     std::string const& serialized(
                         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-                        to_string(parsed.object->getJson(JsonOptions::none)));
+                        to_string(parsed.object->getJson(JsonOptions::KNone)));
                     BEAST_EXPECT(serialized == expectedJson);
                 }
             }
@@ -2343,7 +2343,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransferFee":"65536"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2361,7 +2361,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransferFee":"Payment"})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
@@ -2379,7 +2379,7 @@ class STParsedJSON_test : public beast::unit_test::suite
                 R"({"CloseResolution":19,"Method":250,)"
                 R"("TransferFee":true})");
 
-            Json::Value jv;
+            json::Value jv;
             if (BEAST_EXPECT(parseJSONString(json, jv)))
             {
                 STParsedJSONObject parsed("test", jv);
diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp
index 70074ed496..87cbb56a6b 100644
--- a/src/test/protocol/STTx_test.cpp
+++ b/src/test/protocol/STTx_test.cpp
@@ -43,7 +43,7 @@ matches(char const* string, char const* regex)
     return std::regex_search(string, std::basic_regex<char>(regex, std::regex_constants::icase));
 }
 
-class STTx_test : public beast::unit_test::suite
+class STTx_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -52,10 +52,10 @@ public:
         testMalformedSerializedForm();
 
         testcase("secp256k1 signatures");
-        testSTTx(KeyType::secp256k1);
+        testSTTx(KeyType::Secp256k1);
 
         testcase("ed25519 signatures");
-        testSTTx(KeyType::ed25519);
+        testSTTx(KeyType::Ed25519);
 
         testcase("STObject constructor errors");
         testObjectCtorErrors();
@@ -66,12 +66,12 @@ public:
     {
         testcase("Malformed serialized form");
 
-        constexpr unsigned char payload1[] = {
+        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 payload2[] = {
+        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 payload3[] = {
+        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 payload4[] = {
+        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,
@@ -1109,8 +1109,8 @@ public:
             // Construct an SOTemplate to get the ball rolling on building
             // an STObject that can contain another STObject.
             SOTemplate const recurse{
-                {sfTransactionMetaData, soeOPTIONAL},
-                {sfTransactionHash, soeOPTIONAL},
+                {sfTransactionMetaData, SoeOptional},
+                {sfTransactionHash, SoeOptional},
             };
 
             // Make an STObject that nests objects ten levels deep.  There's
@@ -1169,9 +1169,9 @@ public:
             // Construct an SOTemplate to get the ball rolling on building
             // an STObject that can contain an STArray.
             SOTemplate const recurse{
-                {sfTransactionMetaData, soeOPTIONAL},
-                {sfTransactionHash, soeOPTIONAL},
-                {sfTemplate, soeOPTIONAL},
+                {sfTransactionMetaData, SoeOptional},
+                {sfTransactionHash, SoeOptional},
+                {sfTemplate, SoeOptional},
             };
 
             // Make an STObject that nests ten levels deep alternating objects
@@ -1186,7 +1186,7 @@ public:
                 STObject outer{recurse, sfTransactionMetaData};
                 outer.setFieldH256(sfTransactionHash, hash);
                 STArray& array{outer.peekFieldArray(sfTemplate)};
-                array.push_back(std::move(inner));
+                array.pushBack(std::move(inner));
                 inner = std::move(outer);
             }
             {
@@ -1210,7 +1210,7 @@ public:
             STObject outer{recurse, sfTransactionMetaData};
             outer.setFieldH256(sfTransactionHash, hash);
             STArray& array{outer.peekFieldArray(sfTemplate)};
-            array.push_back(std::move(inner));
+            array.pushBack(std::move(inner));
 
             Serializer const tooDeep{outer.getSerializer()};
             SerialIter tooDeepSit{tooDeep.slice()};
@@ -1229,7 +1229,7 @@ public:
         {
             // Make an otherwise legit STTx with a duplicate field.  Should
             // generate an exception when we deserialize.
-            auto const keypair = randomKeyPair(KeyType::secp256k1);
+            auto const keypair = randomKeyPair(KeyType::Secp256k1);
             STTx const acctSet(ttACCOUNT_SET, [&keypair](auto& obj) {
                 obj.setAccountID(sfAccount, calcAccountID(keypair.first));
                 obj.setFieldU32(sfSequence, 7);
@@ -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(payload1, sizeof(payload1)));
+            BEAST_EXPECT(!tx2.ParseFromArray(kPAYLOAD1, sizeof(kPAYLOAD1)));
 
             xrpl::SerialIter sit(xrpl::makeSlice(tx2.rawtransaction()));
 
@@ -1293,7 +1293,7 @@ public:
 
         try
         {
-            xrpl::SerialIter sit{payload2};
+            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{payload3};
+            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{payload4};
+            xrpl::SerialIter sit{kPAYLOAD4};
             auto stx = std::make_shared<xrpl::STTx const>(sit);
             fail("An exception should have been thrown");
         }
@@ -1339,7 +1339,7 @@ public:
 
         // Rules store a reference to the presets. Create a local to guarantee
         // proper lifetime.
-        std::unordered_set<uint256, beast::uhash<>> const presets;
+        std::unordered_set<uint256, beast::Uhash<>> const presets;
         Rules const defaultRules{presets};
         BEAST_EXPECT(!defaultRules.enabled(featureAMM));
 
@@ -1352,8 +1352,8 @@ public:
 
         if (copy != j)
         {
-            log << "j=" << j.getJson(JsonOptions::none) << '\n'
-                << "copy=" << copy.getJson(JsonOptions::none) << std::endl;
+            log << "j=" << j.getJson(JsonOptions::KNone) << '\n'
+                << "copy=" << copy.getJson(JsonOptions::KNone) << std::endl;
             fail("Transaction fails serialize/deserialize test");
         }
         else
@@ -1361,15 +1361,15 @@ public:
             pass();
         }
 
-        STParsedJSONObject parsed("test", j.getJson(JsonOptions::none));
+        STParsedJSONObject parsed("test", j.getJson(JsonOptions::KNone));
         if (!parsed.object.has_value())
         {
             fail("Unable to build object from json");
         }
         else if (STObject(j) != parsed.object)
         {
-            log << "ORIG: " << j.getJson(JsonOptions::none) << '\n'
-                << "BUILT " << parsed.object->getJson(JsonOptions::none) << std::endl;
+            log << "ORIG: " << j.getJson(JsonOptions::KNone) << '\n'
+                << "BUILT " << parsed.object->getJson(JsonOptions::KNone) << std::endl;
             fail("Built a different transaction");
         }
         else
@@ -1381,16 +1381,16 @@ public:
     void
     testObjectCtorErrors()
     {
-        auto const kp1 = randomKeyPair(KeyType::secp256k1);
+        auto const kp1 = randomKeyPair(KeyType::Secp256k1);
         auto const id1 = calcAccountID(kp1.first);
 
-        auto const kp2 = randomKeyPair(KeyType::secp256k1);
+        auto const kp2 = randomKeyPair(KeyType::Secp256k1);
         auto const id2 = calcAccountID(kp2.first);
 
         // Lambda that returns a Payment STObject.
         auto getPayment = [kp1, id1, id2]() {
             // Account id1 pays account id2 10,000 XRP.
-            STObject payment(sfGeneric);
+            STObject payment(kSF_GENERIC);
             payment.setFieldU16(sfTransactionType, ttPAYMENT);
             payment.setAccountID(sfAccount, id1);
             payment.setAccountID(sfDestination, id2);
@@ -1464,13 +1464,13 @@ public:
     }
 };
 
-class InnerObjectFormatsSerializer_test : public beast::unit_test::suite
+class InnerObjectFormatsSerializer_test : public beast::unit_test::Suite
 {
 public:
     void
     run() override
     {
-        auto const kp1 = randomKeyPair(KeyType::secp256k1);
+        auto const kp1 = randomKeyPair(KeyType::Secp256k1);
         auto const id1 = calcAccountID(kp1.first);
 
         STTx txn(ttACCOUNT_SET, [&id1, &kp1](auto& obj) {
@@ -1481,7 +1481,7 @@ public:
         });
 
         // Create fields for a SigningAccount
-        auto const kp2 = randomKeyPair(KeyType::secp256k1);
+        auto const kp2 = randomKeyPair(KeyType::Secp256k1);
         auto const id2 = calcAccountID(kp2.first);
 
         // Get the stream of the transaction for use in multi-signing.
@@ -1504,7 +1504,7 @@ public:
         auto testMalformedSigningAccount = [this, &txn](STObject const& signer, bool expectPass) {
             // Create SigningAccounts array.
             STArray signers(sfSigners, 1);
-            signers.push_back(signer);
+            signers.pushBack(signer);
 
             // Insert signers into transaction.
             STTx tempTxn(txn);
diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp
index 779e4d4c55..6ad0f92b42 100644
--- a/src/test/protocol/STValidation_test.cpp
+++ b/src/test/protocol/STValidation_test.cpp
@@ -19,10 +19,10 @@
 
 namespace xrpl {
 
-class STValidation_test : public beast::unit_test::suite
+class STValidation_test : public beast::unit_test::Suite
 {
     // No public key:
-    static constexpr std::uint8_t payload1[] = {
+    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 payload2[] = {
+    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 payload3[] = {
+    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 payload4[] = {
+    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 payload5[] = {
+    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 payload6[] = {
+    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 payload7[] = {
+    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 payload8[] = {
+    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{payload8};
+            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{payload1};
+            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{payload2};
+            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{payload3};
+            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{payload4};
+            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{payload5};
+            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{payload6};
+            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{payload7};
+            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 : payload8)
+        for (auto c : kPAYLOAD8)
             v.push_back(c);
 
         beast::xor_shift_engine g(148979842);
@@ -272,7 +272,7 @@ public:
             auto v2 = v;
 
             while (v2[i] == v[i])
-                v2[i] = rand_byte<std::uint8_t>(g);
+                v2[i] = randByte<std::uint8_t>(g);
 
             try
             {
diff --git a/src/test/protocol/SecretKey_test.cpp b/src/test/protocol/SecretKey_test.cpp
index 7e71775988..5dbb0727e8 100644
--- a/src/test/protocol/SecretKey_test.cpp
+++ b/src/test/protocol/SecretKey_test.cpp
@@ -22,7 +22,7 @@
 
 namespace xrpl {
 
-class SecretKey_test : public beast::unit_test::suite
+class SecretKey_test : public beast::unit_test::Suite
 {
     struct TestKeyData
     {
@@ -83,7 +83,7 @@ public:
             BEAST_EXPECT(canonicality);
 
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            BEAST_EXPECT(*canonicality == ECDSACanonicality::fullyCanonical);
+            BEAST_EXPECT(*canonicality == ECDSACanonicality::FullyCanonical);
         }
 
         {
@@ -91,7 +91,7 @@ public:
             BEAST_EXPECT(canonicality);
 
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            BEAST_EXPECT(*canonicality != ECDSACanonicality::fullyCanonical);
+            BEAST_EXPECT(*canonicality != ECDSACanonicality::FullyCanonical);
         }
 
         BEAST_EXPECT(verifyDigest(pk, digest, makeSlice(sig), false));
@@ -107,17 +107,17 @@ public:
 
         for (std::size_t i = 0; i < 32; i++)
         {
-            auto const [pk, sk] = randomKeyPair(KeyType::secp256k1);
+            auto const [pk, sk] = randomKeyPair(KeyType::Secp256k1);
 
-            BEAST_EXPECT(pk == derivePublicKey(KeyType::secp256k1, sk));
+            BEAST_EXPECT(pk == derivePublicKey(KeyType::Secp256k1, sk));
 
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            BEAST_EXPECT(*publicKeyType(pk) == KeyType::secp256k1);
+            BEAST_EXPECT(*publicKeyType(pk) == KeyType::Secp256k1);
 
             for (std::size_t j = 0; j < 32; j++)
             {
                 uint256 digest;
-                beast::rngfill(digest.data(), digest.size(), crypto_prng());
+                beast::rngfill(digest.data(), digest.size(), cryptoPrng());
 
                 auto sig = signDigest(pk, sk, digest);
 
@@ -155,7 +155,7 @@ public:
             for (std::size_t j = 0; j < 32; j++)
             {
                 std::vector<std::uint8_t> data(64 + (8 * i) + j);
-                beast::rngfill(data.data(), data.size(), crypto_prng());
+                beast::rngfill(data.data(), data.size(), cryptoPrng());
 
                 auto sig = sign(pk, sk, makeSlice(data));
 
@@ -193,7 +193,7 @@ public:
         // Ensure that parsing some well-known secret keys works
         {
             auto const sk1 =
-                generateSecretKey(KeyType::secp256k1, generateSeed("masterpassphrase"));
+                generateSecretKey(KeyType::Secp256k1, generateSeed("masterpassphrase"));
 
             auto const sk2 = parseBase58<SecretKey>(
                 TokenType::NodePrivate, "pnen77YEeUd4fFKG7iycBWcwKpTaeFRkW2WFostaATy1DSupwXe");
@@ -203,7 +203,7 @@ public:
         }
 
         {
-            auto const sk1 = generateSecretKey(KeyType::ed25519, generateSeed("masterpassphrase"));
+            auto const sk1 = generateSecretKey(KeyType::Ed25519, generateSeed("masterpassphrase"));
 
             auto const sk2 = parseBase58<SecretKey>(
                 TokenType::NodePrivate, "paKv46LztLqK3GaKz1rG2nQGN6M4JLyRtxFBYFTw4wAVHtGys36");
@@ -301,12 +301,12 @@ public:
     {
         testcase("secp256k1: key derivation");
 
-        for (auto const& test : secp256k1TestVectors)
+        for (auto const& test : kSECP256K1_TEST_VECTORS)
         {
             auto const id = parseBase58<AccountID>(test.addr);
             BEAST_EXPECT(id);
 
-            auto kp = generateKeyPair(KeyType::secp256k1, Seed{makeSlice(test.seed)});
+            auto kp = generateKeyPair(KeyType::Secp256k1, Seed{makeSlice(test.seed)});
 
             BEAST_EXPECT(kp.first == PublicKey{makeSlice(test.pubkey)});
             BEAST_EXPECT(test::equal(kp.second, SecretKey{makeSlice(test.seckey)}));
@@ -320,12 +320,12 @@ public:
     {
         testcase("ed25519: key derivation");
 
-        for (auto const& test : ed25519TestVectors)
+        for (auto const& test : kED25519_TEST_VECTORS)
         {
             auto const id = parseBase58<AccountID>(test.addr);
             BEAST_EXPECT(id);
 
-            auto kp = generateKeyPair(KeyType::ed25519, Seed{makeSlice(test.seed)});
+            auto kp = generateKeyPair(KeyType::Ed25519, Seed{makeSlice(test.seed)});
 
             BEAST_EXPECT(kp.first == PublicKey{makeSlice(test.pubkey)});
             BEAST_EXPECT(test::equal(kp.second, SecretKey{makeSlice(test.seckey)}));
@@ -341,18 +341,18 @@ public:
 
         // secp256k1
         testKeyDerivationSecp256k1();
-        testSigning(KeyType::secp256k1);
+        testSigning(KeyType::Secp256k1);
         testDigestSigning();
         testCanonicality();
 
         // Ed25519
         testKeyDerivationEd25519();
-        testSigning(KeyType::ed25519);
+        testSigning(KeyType::Ed25519);
     }
 
 private:
     // clang-format off
-inline static TestKeyData const secp256k1TestVectors[] = {
+inline static TestKeyData const kSECP256K1_TEST_VECTORS[] = {
     {.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 secp256k1TestVectors[] = {
      .addr="rsYryUWhbYRiQivh693pgjnseAwPHezNj1"}
 };
 
-inline static TestKeyData const ed25519TestVectors[] = {
+inline static TestKeyData const kED25519_TEST_VECTORS[] = {
     {.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/Seed_test.cpp b/src/test/protocol/Seed_test.cpp
index ee4709a780..ef4719fd3e 100644
--- a/src/test/protocol/Seed_test.cpp
+++ b/src/test/protocol/Seed_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl {
 
-class Seed_test : public beast::unit_test::suite
+class Seed_test : public beast::unit_test::Suite
 {
     static bool
     equal(Seed const& lhs, Seed const& rhs)
@@ -35,7 +35,7 @@ public:
 
             for (std::uint8_t i = 0; i < 64; i++)
             {
-                beast::rngfill(src, sizeof(src), default_prng());
+                beast::rngfill(src, sizeof(src), defaultPrng());
                 Seed const seed({src, sizeof(src)});
                 BEAST_EXPECT(memcmp(seed.data(), src, sizeof(src)) == 0);
             }
@@ -44,7 +44,7 @@ public:
         for (int i = 0; i < 64; i++)
         {
             uint128 src;
-            beast::rngfill(src.data(), src.size(), default_prng());
+            beast::rngfill(src.data(), src.size(), defaultPrng());
             Seed const seed(src);
             BEAST_EXPECT(memcmp(seed.data(), src.data(), src.size()) == 0);
         }
@@ -114,8 +114,8 @@ public:
             testcase("Node keypair generation & signing (secp256k1)");
 
             auto const secretKey =
-                generateSecretKey(KeyType::secp256k1, generateSeed("masterpassphrase"));
-            auto const publicKey = derivePublicKey(KeyType::secp256k1, secretKey);
+                generateSecretKey(KeyType::Secp256k1, generateSeed("masterpassphrase"));
+            auto const publicKey = derivePublicKey(KeyType::Secp256k1, secretKey);
 
             BEAST_EXPECT(
                 toBase58(TokenType::NodePublic, publicKey) ==
@@ -136,8 +136,8 @@ public:
             // Verify with incorrect public key
             {
                 auto const otherPublicKey = derivePublicKey(
-                    KeyType::secp256k1,
-                    generateSecretKey(KeyType::secp256k1, generateSeed("otherpassphrase")));
+                    KeyType::Secp256k1,
+                    generateSecretKey(KeyType::Secp256k1, generateSeed("otherpassphrase")));
 
                 BEAST_EXPECT(!verify(otherPublicKey, makeSlice(message1), sig));
             }
@@ -156,8 +156,8 @@ public:
             testcase("Node keypair generation & signing (ed25519)");
 
             auto const secretKey =
-                generateSecretKey(KeyType::ed25519, generateSeed("masterpassphrase"));
-            auto const publicKey = derivePublicKey(KeyType::ed25519, secretKey);
+                generateSecretKey(KeyType::Ed25519, generateSeed("masterpassphrase"));
+            auto const publicKey = derivePublicKey(KeyType::Ed25519, secretKey);
 
             BEAST_EXPECT(
                 toBase58(TokenType::NodePublic, publicKey) ==
@@ -178,8 +178,8 @@ public:
             // Verify with incorrect public key
             {
                 auto const otherPublicKey = derivePublicKey(
-                    KeyType::ed25519,
-                    generateSecretKey(KeyType::ed25519, generateSeed("otherpassphrase")));
+                    KeyType::Ed25519,
+                    generateSecretKey(KeyType::Ed25519, generateSeed("otherpassphrase")));
 
                 BEAST_EXPECT(!verify(otherPublicKey, makeSlice(message1), sig));
             }
@@ -198,7 +198,7 @@ public:
             testcase("Account keypair generation & signing (secp256k1)");
 
             auto const [pk, sk] =
-                generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase"));
+                generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase"));
 
             BEAST_EXPECT(toBase58(calcAccountID(pk)) == "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh");
             BEAST_EXPECT(
@@ -218,7 +218,7 @@ public:
             // Verify with incorrect public key
             {
                 auto const otherKeyPair =
-                    generateKeyPair(KeyType::secp256k1, generateSeed("otherpassphrase"));
+                    generateKeyPair(KeyType::Secp256k1, generateSeed("otherpassphrase"));
 
                 BEAST_EXPECT(!verify(otherKeyPair.first, makeSlice(message1), sig));
             }
@@ -237,7 +237,7 @@ public:
             testcase("Account keypair generation & signing (ed25519)");
 
             auto const [pk, sk] =
-                generateKeyPair(KeyType::ed25519, generateSeed("masterpassphrase"));
+                generateKeyPair(KeyType::Ed25519, generateSeed("masterpassphrase"));
 
             BEAST_EXPECT(to_string(calcAccountID(pk)) == "rGWrZyQqhTp9Xu7G5Pkayo7bXjH4k4QYpf");
             BEAST_EXPECT(
@@ -257,7 +257,7 @@ public:
             // Verify with incorrect public key
             {
                 auto const otherKeyPair =
-                    generateKeyPair(KeyType::ed25519, generateSeed("otherpassphrase"));
+                    generateKeyPair(KeyType::Ed25519, generateSeed("otherpassphrase"));
 
                 BEAST_EXPECT(!verify(otherKeyPair.first, makeSlice(message1), sig));
             }
@@ -281,23 +281,23 @@ public:
         // account IDs and node and account public and private
         // keys should not be parsable as seeds.
 
-        auto const node1 = randomKeyPair(KeyType::secp256k1);
+        auto const node1 = randomKeyPair(KeyType::Secp256k1);
 
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::NodePublic, node1.first)));
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::NodePrivate, node1.second)));
 
-        auto const node2 = randomKeyPair(KeyType::ed25519);
+        auto const node2 = randomKeyPair(KeyType::Ed25519);
 
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::NodePublic, node2.first)));
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::NodePrivate, node2.second)));
 
-        auto const account1 = generateKeyPair(KeyType::secp256k1, randomSeed());
+        auto const account1 = generateKeyPair(KeyType::Secp256k1, randomSeed());
 
         BEAST_EXPECT(!parseGenericSeed(toBase58(calcAccountID(account1.first))));
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::AccountPublic, account1.first)));
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::AccountSecret, account1.second)));
 
-        auto const account2 = generateKeyPair(KeyType::ed25519, randomSeed());
+        auto const account2 = generateKeyPair(KeyType::Ed25519, randomSeed());
 
         BEAST_EXPECT(!parseGenericSeed(toBase58(calcAccountID(account2.first))));
         BEAST_EXPECT(!parseGenericSeed(toBase58(TokenType::AccountPublic, account2.first)));
diff --git a/src/test/protocol/SeqProxy_test.cpp b/src/test/protocol/SeqProxy_test.cpp
index 71b483425b..7da5751506 100644
--- a/src/test/protocol/SeqProxy_test.cpp
+++ b/src/test/protocol/SeqProxy_test.cpp
@@ -8,13 +8,13 @@
 
 namespace xrpl {
 
-struct SeqProxy_test : public beast::unit_test::suite
+struct SeqProxy_test : public beast::unit_test::Suite
 {
     // Exercise value(), isSeq(), and isTicket().
     static constexpr bool
     expectValues(SeqProxy seqProx, std::uint32_t value, SeqProxy::Type type)
     {
-        bool const expectSeq{type == SeqProxy::Type::seq};
+        bool const expectSeq{type == SeqProxy::Type::Seq};
         return (seqProx.value() == value) && (seqProx.isSeq() == expectSeq) &&
             (seqProx.isTicket() == !expectSeq);
     }
@@ -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 uintMax{std::numeric_limits<std::uint32_t>::max()};
-        static constexpr SeqProxy::Type seq{SeqProxy::Type::seq};
-        static constexpr SeqProxy::Type ticket{SeqProxy::Type::ticket};
+        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 SeqProxy seqZero{seq, 0};
-        static constexpr SeqProxy seqSmall{seq, 1};
-        static constexpr SeqProxy seqMid0{seq, 2};
-        static constexpr SeqProxy seqMid1{seqMid0};
-        static constexpr SeqProxy seqBig{seq, uintMax};
+        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 ticZero{ticket, 0};
-        static constexpr SeqProxy ticSmall{ticket, 1};
-        static constexpr SeqProxy ticMid0{ticket, 2};
-        static constexpr SeqProxy ticMid1{ticMid0};
-        static constexpr SeqProxy ticBig{ticket, uintMax};
+        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};
 
         // Verify operation of value(), isSeq() and isTicket().
-        static_assert(expectValues(seqZero, 0, seq), "");
-        static_assert(expectValues(seqSmall, 1, seq), "");
-        static_assert(expectValues(seqMid0, 2, seq), "");
-        static_assert(expectValues(seqMid1, 2, seq), "");
-        static_assert(expectValues(seqBig, uintMax, seq), "");
+        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(ticZero, 0, ticket), "");
-        static_assert(expectValues(ticSmall, 1, ticket), "");
-        static_assert(expectValues(ticMid0, 2, ticket), "");
-        static_assert(expectValues(ticMid1, 2, ticket), "");
-        static_assert(expectValues(ticBig, uintMax, ticket), "");
+        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), "");
 
         // Verify expected behavior of comparison operators.
-        static_assert(expectEq(seqZero, seqZero), "");
-        static_assert(expectLt(seqZero, seqSmall), "");
-        static_assert(expectLt(seqZero, seqMid0), "");
-        static_assert(expectLt(seqZero, seqMid1), "");
-        static_assert(expectLt(seqZero, seqBig), "");
-        static_assert(expectLt(seqZero, ticZero), "");
-        static_assert(expectLt(seqZero, ticSmall), "");
-        static_assert(expectLt(seqZero, ticMid0), "");
-        static_assert(expectLt(seqZero, ticMid1), "");
-        static_assert(expectLt(seqZero, ticBig), "");
+        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(expectGt(seqSmall, seqZero), "");
-        static_assert(expectEq(seqSmall, seqSmall), "");
-        static_assert(expectLt(seqSmall, seqMid0), "");
-        static_assert(expectLt(seqSmall, seqMid1), "");
-        static_assert(expectLt(seqSmall, seqBig), "");
-        static_assert(expectLt(seqSmall, ticZero), "");
-        static_assert(expectLt(seqSmall, ticSmall), "");
-        static_assert(expectLt(seqSmall, ticMid0), "");
-        static_assert(expectLt(seqSmall, ticMid1), "");
-        static_assert(expectLt(seqSmall, ticBig), "");
+        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(seqMid0, seqZero), "");
-        static_assert(expectGt(seqMid0, seqSmall), "");
-        static_assert(expectEq(seqMid0, seqMid0), "");
-        static_assert(expectEq(seqMid0, seqMid1), "");
-        static_assert(expectLt(seqMid0, seqBig), "");
-        static_assert(expectLt(seqMid0, ticZero), "");
-        static_assert(expectLt(seqMid0, ticSmall), "");
-        static_assert(expectLt(seqMid0, ticMid0), "");
-        static_assert(expectLt(seqMid0, ticMid1), "");
-        static_assert(expectLt(seqMid0, ticBig), "");
+        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(seqMid1, seqZero), "");
-        static_assert(expectGt(seqMid1, seqSmall), "");
-        static_assert(expectEq(seqMid1, seqMid0), "");
-        static_assert(expectEq(seqMid1, seqMid1), "");
-        static_assert(expectLt(seqMid1, seqBig), "");
-        static_assert(expectLt(seqMid1, ticZero), "");
-        static_assert(expectLt(seqMid1, ticSmall), "");
-        static_assert(expectLt(seqMid1, ticMid0), "");
-        static_assert(expectLt(seqMid1, ticMid1), "");
-        static_assert(expectLt(seqMid1, ticBig), "");
+        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(seqBig, seqZero), "");
-        static_assert(expectGt(seqBig, seqSmall), "");
-        static_assert(expectGt(seqBig, seqMid0), "");
-        static_assert(expectGt(seqBig, seqMid1), "");
-        static_assert(expectEq(seqBig, seqBig), "");
-        static_assert(expectLt(seqBig, ticZero), "");
-        static_assert(expectLt(seqBig, ticSmall), "");
-        static_assert(expectLt(seqBig, ticMid0), "");
-        static_assert(expectLt(seqBig, ticMid1), "");
-        static_assert(expectLt(seqBig, ticBig), "");
+        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(ticZero, seqZero), "");
-        static_assert(expectGt(ticZero, seqSmall), "");
-        static_assert(expectGt(ticZero, seqMid0), "");
-        static_assert(expectGt(ticZero, seqMid1), "");
-        static_assert(expectGt(ticZero, seqBig), "");
-        static_assert(expectEq(ticZero, ticZero), "");
-        static_assert(expectLt(ticZero, ticSmall), "");
-        static_assert(expectLt(ticZero, ticMid0), "");
-        static_assert(expectLt(ticZero, ticMid1), "");
-        static_assert(expectLt(ticZero, ticBig), "");
+        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(ticSmall, seqZero), "");
-        static_assert(expectGt(ticSmall, seqSmall), "");
-        static_assert(expectGt(ticSmall, seqMid0), "");
-        static_assert(expectGt(ticSmall, seqMid1), "");
-        static_assert(expectGt(ticSmall, seqBig), "");
-        static_assert(expectGt(ticSmall, ticZero), "");
-        static_assert(expectEq(ticSmall, ticSmall), "");
-        static_assert(expectLt(ticSmall, ticMid0), "");
-        static_assert(expectLt(ticSmall, ticMid1), "");
-        static_assert(expectLt(ticSmall, ticBig), "");
+        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(ticMid0, seqZero), "");
-        static_assert(expectGt(ticMid0, seqSmall), "");
-        static_assert(expectGt(ticMid0, seqMid0), "");
-        static_assert(expectGt(ticMid0, seqMid1), "");
-        static_assert(expectGt(ticMid0, seqBig), "");
-        static_assert(expectGt(ticMid0, ticZero), "");
-        static_assert(expectGt(ticMid0, ticSmall), "");
-        static_assert(expectEq(ticMid0, ticMid0), "");
-        static_assert(expectEq(ticMid0, ticMid1), "");
-        static_assert(expectLt(ticMid0, ticBig), "");
+        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(ticMid1, seqZero), "");
-        static_assert(expectGt(ticMid1, seqSmall), "");
-        static_assert(expectGt(ticMid1, seqMid0), "");
-        static_assert(expectGt(ticMid1, seqMid1), "");
-        static_assert(expectGt(ticMid1, seqBig), "");
-        static_assert(expectGt(ticMid1, ticZero), "");
-        static_assert(expectGt(ticMid1, ticSmall), "");
-        static_assert(expectEq(ticMid1, ticMid0), "");
-        static_assert(expectEq(ticMid1, ticMid1), "");
-        static_assert(expectLt(ticMid1, ticBig), "");
+        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(ticBig, seqZero), "");
-        static_assert(expectGt(ticBig, seqSmall), "");
-        static_assert(expectGt(ticBig, seqMid0), "");
-        static_assert(expectGt(ticBig, seqMid1), "");
-        static_assert(expectGt(ticBig, seqBig), "");
-        static_assert(expectGt(ticBig, ticZero), "");
-        static_assert(expectGt(ticBig, ticSmall), "");
-        static_assert(expectGt(ticBig, ticMid0), "");
-        static_assert(expectGt(ticBig, ticMid1), "");
-        static_assert(expectEq(ticBig, ticBig), "");
+        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), "");
 
         // Verify streaming.
-        BEAST_EXPECT(streamTest(seqZero));
-        BEAST_EXPECT(streamTest(seqSmall));
-        BEAST_EXPECT(streamTest(seqMid0));
-        BEAST_EXPECT(streamTest(seqMid1));
-        BEAST_EXPECT(streamTest(seqBig));
-        BEAST_EXPECT(streamTest(ticZero));
-        BEAST_EXPECT(streamTest(ticSmall));
-        BEAST_EXPECT(streamTest(ticMid0));
-        BEAST_EXPECT(streamTest(ticMid1));
-        BEAST_EXPECT(streamTest(ticBig));
+        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));
     }
 };
 
diff --git a/src/test/protocol/Serializer_test.cpp b/src/test/protocol/Serializer_test.cpp
index 7cf27b4348..b490e0476b 100644
--- a/src/test/protocol/Serializer_test.cpp
+++ b/src/test/protocol/Serializer_test.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-struct Serializer_test : public beast::unit_test::suite
+struct Serializer_test : public beast::unit_test::Suite
 {
     void
     run() override
diff --git a/src/test/protocol/TER_test.cpp b/src/test/protocol/TER_test.cpp
index 5b83a7905b..d9028fa941 100644
--- a/src/test/protocol/TER_test.cpp
+++ b/src/test/protocol/TER_test.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl {
 
-struct TER_test : public beast::unit_test::suite
+struct TER_test : public beast::unit_test::Suite
 {
     void
     testTransResultInfo()
@@ -44,7 +44,7 @@ struct TER_test : public beast::unit_test::suite
     public:
         template <typename Tup>
         void
-        operator()(Tup const& tup, beast::unit_test::suite&) const
+        operator()(Tup const& tup, beast::unit_test::Suite&) const
         {
             // Entries in the tuple should not be convertible or assignable
             // unless they are the same types.
@@ -73,7 +73,7 @@ struct TER_test : public beast::unit_test::suite
         template <std::size_t, std::size_t> class Func,
         typename Tup>
     std::enable_if_t<I1 != 0>
-    testIterate(Tup const& tup, beast::unit_test::suite& s)
+    testIterate(Tup const& tup, beast::unit_test::Suite& s)
     {
         Func<I1, I2> const func;
         func(tup, s);
@@ -87,7 +87,7 @@ struct TER_test : public beast::unit_test::suite
         template <std::size_t, std::size_t> class Func,
         typename Tup>
     std::enable_if_t<I1 == 0 && I2 != 0>
-    testIterate(Tup const& tup, beast::unit_test::suite& s)
+    testIterate(Tup const& tup, beast::unit_test::Suite& s)
     {
         Func<I1, I2> const func;
         func(tup, s);
@@ -101,7 +101,7 @@ struct TER_test : public beast::unit_test::suite
         template <std::size_t, std::size_t> class Func,
         typename Tup>
     std::enable_if_t<I1 == 0 && I2 == 0>
-    testIterate(Tup const& tup, beast::unit_test::suite& s)
+    testIterate(Tup const& tup, beast::unit_test::Suite& s)
     {
         Func<I1, I2> const func;
         func(tup, s);
@@ -114,12 +114,12 @@ struct TER_test : public beast::unit_test::suite
         // are not valid.
 
         // Examples of each kind of enum.
-        static auto const terEnums = std::make_tuple(
+        static auto const kTER_ENUMS = std::make_tuple(
             telLOCAL_ERROR, temMALFORMED, tefFAILURE, terRETRY, tesSUCCESS, tecCLAIM);
-        static int const hiIndex{std::tuple_size_v<decltype(terEnums)> - 1};
+        static int const kHI_INDEX{std::tuple_size_v<decltype(kTER_ENUMS)> - 1};
 
         // Verify that enums cannot be converted to other enum types.
-        testIterate<hiIndex, hiIndex, NotConvertible>(terEnums, *this);
+        testIterate<kHI_INDEX, kHI_INDEX, NotConvertible>(kTER_ENUMS, *this);
 
         // Lambda that verifies assignability and convertibility.
         auto isConvertible = [](auto from, auto to) {
@@ -181,7 +181,7 @@ struct TER_test : public beast::unit_test::suite
     public:
         template <typename Tup>
         void
-        operator()(Tup const& tup, beast::unit_test::suite& s) const
+        operator()(Tup const& tup, beast::unit_test::Suite& s) const
         {
             // All entries in the tuple should be comparable one to the other.
             auto const lhs = std::get<I1>(tup);
@@ -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 ters = 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 hiIndex{std::tuple_size_v<decltype(ters)> - 1};
+        static int const kHI_INDEX{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<hiIndex, hiIndex, CheckComparable>(ters, *this);
+        testIterate<kHI_INDEX, kHI_INDEX, CheckComparable>(kTERS, *this);
     }
 
     void
diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp
index 53fb81e436..1f2dc8f4dc 100644
--- a/src/test/resource/Logic_test.cpp
+++ b/src/test/resource/Logic_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl::Resource {
 
-class ResourceManager_test : public beast::unit_test::suite
+class ResourceManager_test : public beast::unit_test::Suite
 {
 public:
     class TestLogic : private boost::base_from_member<TestStopwatch>, public Logic
@@ -34,7 +34,7 @@ public:
 
     public:
         explicit TestLogic(beast::Journal journal)
-            : Logic(beast::insight::NullCollector::New(), member, journal)
+            : Logic(beast::insight::NullCollector::make(), member, journal)
         {
         }
 
@@ -56,13 +56,13 @@ public:
     static void
     createGossip(Gossip& gossip)
     {
-        std::uint8_t const v(10 + rand_int(9));
-        std::uint8_t const n(10 + rand_int(9));
+        std::uint8_t const v(10 + randInt(9));
+        std::uint8_t const n(10 + randInt(9));
         gossip.items.reserve(n);
         for (std::uint8_t i = 0; i < n; ++i)
         {
             Gossip::Item item;
-            item.balance = 100 + rand_int(499);
+            item.balance = 100 + randInt(499);
             beast::IP::AddressV4::bytes_type const d = {
                 {192, 0, 2, static_cast<std::uint8_t>(v + i)}};
             item.address = beast::IP::Endpoint{beast::IP::AddressV4{d}};
@@ -86,8 +86,8 @@ public:
 
         TestLogic logic(j);
 
-        Charge const fee(dropThreshold + 1);
-        beast::IP::Endpoint const addr(beast::IP::Endpoint::from_string("192.0.2.2"));
+        Charge const fee(DropThreshold + 1);
+        beast::IP::Endpoint const addr(beast::IP::Endpoint::fromString("192.0.2.2"));
 
         std::function<Consumer(beast::IP::Endpoint)> const ep = limited
             ? std::bind(&TestLogic::newInboundEndpoint, &logic, std::placeholders::_1)
@@ -114,7 +114,7 @@ public:
                     return;
                 }
 
-                if (c.charge(fee) == Disposition::warn)
+                if (c.charge(fee) == Disposition::Warn)
                 {
                     if (limited)
                     {
@@ -145,7 +145,7 @@ public:
                     return;
                 }
 
-                if (c.charge(fee) == Disposition::drop)
+                if (c.charge(fee) == Disposition::Drop)
                 {
                     // Disconnect abusive Consumer
                     BEAST_EXPECT(c.disconnect(j) == limited);
@@ -159,7 +159,7 @@ public:
         {
             Consumer const c(logic.newInboundEndpoint(addr));
             logic.periodicActivity();
-            if (c.disposition() != Disposition::drop)
+            if (c.disposition() != Disposition::Drop)
             {
                 if (limited)
                 {
@@ -179,13 +179,13 @@ public:
             using namespace std::chrono_literals;
             // Give Consumer time to become readmitted.  Should never
             // exceed expiration time.
-            auto n = secondsUntilExpiration + 1s;
+            auto n = kSECONDS_UNTIL_EXPIRATION + 1s;
             while (--n > 0s)
             {
                 ++logic.clock();
                 logic.periodicActivity();
                 Consumer const c(logic.newInboundEndpoint(addr));
-                if (c.disposition() != Disposition::drop)
+                if (c.disposition() != Disposition::Drop)
                 {
                     readmitted = true;
                     break;
@@ -245,10 +245,10 @@ public:
         TestLogic logic(j);
 
         {
-            beast::IP::Endpoint const address(beast::IP::Endpoint::from_string("192.0.2.1"));
+            beast::IP::Endpoint const address(beast::IP::Endpoint::fromString("192.0.2.1"));
             Consumer c(logic.newInboundEndpoint(address));
             Charge const fee(1000);
-            JLOG(j.info()) << "Charging " << c.to_string() << " " << fee << " per second";
+            JLOG(j.info()) << "Charging " << c.toString() << " " << fee << " per second";
             c.charge(fee);
             for (int i = 0; i < 128; ++i)
             {
@@ -259,10 +259,10 @@ public:
         }
 
         {
-            beast::IP::Endpoint const address(beast::IP::Endpoint::from_string("192.0.2.2"));
+            beast::IP::Endpoint const address(beast::IP::Endpoint::fromString("192.0.2.2"));
             Consumer c(logic.newInboundEndpoint(address));
             Charge const fee(1000);
-            JLOG(j.info()) << "Charging " << c.to_string() << " " << fee << " per second";
+            JLOG(j.info()) << "Charging " << c.toString() << " " << fee << " per second";
             for (int i = 0; i < 128; ++i)
             {
                 c.charge(fee);
diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp
index 726d23db1d..28c536aab9 100644
--- a/src/test/rpc/AMMInfo_test.cpp
+++ b/src/test/rpc/AMMInfo_test.cpp
@@ -54,8 +54,8 @@ public:
         // Invalid tokens pair
         testAMM([&](AMM& ammAlice, Env&) {
             Account const gw("gw");
-            auto const USD = gw["USD"];
-            auto const jv = ammAlice.ammRpcInfo({}, {}, USD, USD);
+            auto const usd = gw["USD"];
+            auto const jv = ammAlice.ammRpcInfo({}, {}, usd, usd);
             BEAST_EXPECT(jv[jss::error_message] == "Account not found.");
         });
 
@@ -189,20 +189,20 @@ public:
 
         {
             Env env{*this};
-            env.fund(XRP(1'000), gw);
-            MPTTester mpt(env, gw, {.fund = false});
-            mpt.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            MPTTester mpt1(env, gw, {.fund = false});
-            mpt1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
-            auto const MPT = mpt["MPT"];
-            auto const MPT1 = mpt1["MPT"];
+            env.fund(XRP(1'000), gw_);
+            MPTTester mptTester(env, gw_, {.fund = false});
+            mptTester.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            MPTTester mptTester1(env, gw_, {.fund = false});
+            mptTester1.create({.flags = tfMPTCanTransfer | tfMPTCanTrade});
+            auto const mpt = mptTester["MPT"];
+            auto const mpt1 = mptTester1["MPT"];
             std::vector<std::tuple<PrettyAmount, PrettyAmount, IOUAmount>> pools = {
-                {XRP(100), MPT(100), IOUAmount{100'000}},
-                {USD(100), MPT(100), IOUAmount{100}},
-                {MPT(100), MPT1(100), IOUAmount{100}}};
+                {XRP(100), mpt(100), IOUAmount{100'000}},
+                {USD(100), mpt(100), IOUAmount{100}},
+                {mpt(100), mpt1(100), IOUAmount{100}}};
             for (auto& pool : pools)
             {
-                AMM const amm(env, gw, std::get<0>(pool), std::get<1>(pool));
+                AMM const amm(env, gw_, std::get<0>(pool), std::get<1>(pool));
                 BEAST_EXPECT(amm.expectAmmRpcInfo(
                     std::get<0>(pool),
                     std::get<1>(pool),
@@ -225,18 +225,18 @@ public:
                 BEAST_EXPECT(
                     ammAlice.expectAmmRpcInfo(XRP(10000), USD(10000), IOUAmount{10000000, 0}));
                 std::unordered_map<std::string, std::uint16_t> votes;
-                votes.insert({alice.human(), 0});
+                votes.insert({alice_.human(), 0});
                 for (int i = 0; i < 7; ++i)
                 {
                     Account a(std::to_string(i));
                     votes.insert({a.human(), 50 * (i + 1)});
                     if (!features[fixAMMv1_3])
                     {
-                        fund(env, gw, {a}, {USD(10000)}, Fund::Acct);
+                        fund(env, gw_, {a}, {USD(10000)}, Fund::Acct);
                     }
                     else
                     {
-                        fund(env, gw, {a}, {USD(10001)}, Fund::Acct);
+                        fund(env, gw_, {a}, {USD(10001)}, Fund::Acct);
                     }
                     ammAlice.deposit(a, 10000000);
                     ammAlice.vote(a, 50 * (i + 1));
@@ -244,8 +244,8 @@ public:
                 BEAST_EXPECT(ammAlice.expectTradingFee(175));
                 Account ed("ed");
                 Account bill("bill");
-                env.fund(XRP(1000), bob, ed, bill);
-                env(ammAlice.bid({.bidMin = 100, .authAccounts = {carol, bob, ed, bill}}));
+                env.fund(XRP(1000), bob_, ed, bill);
+                env(ammAlice.bid({.bidMin = 100, .authAccounts = {carol_, bob_, ed, bill}}));
                 if (!features[fixAMMv1_3])
                 {
                     BEAST_EXPECT(ammAlice.expectAmmRpcInfo(
@@ -269,7 +269,7 @@ public:
                 for (auto i = 0; i < 2; ++i)
                 {
                     std::unordered_set<std::string> authAccounts = {
-                        carol.human(), bob.human(), ed.human(), bill.human()};
+                        carol_.human(), bob_.human(), ed.human(), bill.human()};
                     auto const ammInfo = i ? ammAlice.ammRpcInfo()
                                            : ammAlice.ammRpcInfo(
                                                  std::nullopt,
@@ -309,7 +309,7 @@ public:
                         if (!BEAST_EXPECT(authAccounts.empty()))
                             return;
                         BEAST_EXPECT(
-                            auctionSlot[jss::account].asString() == alice.human() &&
+                            auctionSlot[jss::account].asString() == alice_.human() &&
                             auctionSlot[jss::discounted_fee].asUInt() == 17 &&
                             auctionSlot[jss::price][jss::value].asString() == "5600" &&
                             auctionSlot[jss::price][jss::currency].asString() ==
@@ -334,14 +334,14 @@ public:
     {
         using namespace jtx;
         testAMM([&](AMM& ammAlice, Env& env) {
-            env(fset(gw, asfGlobalFreeze));
+            env(fset(gw_, asfGlobalFreeze));
             env.close();
             auto test = [&](bool freeze) {
                 auto const info = ammAlice.ammRpcInfo();
                 BEAST_EXPECT(info[jss::amm][jss::asset2_frozen].asBool() == freeze);
             };
             test(true);
-            env(fclear(gw, asfGlobalFreeze));
+            env(fclear(gw_, asfGlobalFreeze));
             env.close();
             test(false);
         });
@@ -355,7 +355,7 @@ public:
 
         testAMM([&](AMM& amm, Env&) {
             auto const resp = amm.ammRpcInfo(
-                std::nullopt, jss::validated.c_str(), std::nullopt, std::nullopt, gw);
+                std::nullopt, jss::validated.cStr(), std::nullopt, std::nullopt, gw_);
             BEAST_EXPECT(resp.isMember("error") && resp["error"] == "actNotFound");
         });
     }
@@ -364,7 +364,7 @@ public:
     run() override
     {
         using namespace jtx;
-        auto const all = testable_amendments();
+        auto const all = testableAmendments();
         testErrors();
         testSimpleRpc();
         testVoteAndBid(all);
diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp
index c3b9135f07..5e8100f76f 100644
--- a/src/test/rpc/AccountCurrencies_test.cpp
+++ b/src/test/rpc/AccountCurrencies_test.cpp
@@ -18,7 +18,7 @@
 
 namespace xrpl {
 
-class AccountCurrencies_test : public beast::unit_test::suite
+class AccountCurrencies_test : public beast::unit_test::Suite
 {
     void
     testBadInput()
@@ -33,7 +33,7 @@ class AccountCurrencies_test : public beast::unit_test::suite
         env.close();
 
         {  // invalid ledger (hash)
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"bob"}.human();
             params[jss::ledger_hash] = 1;
             auto const result =
@@ -52,7 +52,7 @@ class AccountCurrencies_test : public beast::unit_test::suite
         {
             // test account non-string
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_currencies", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -62,15 +62,15 @@ class AccountCurrencies_test : public beast::unit_test::suite
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
 
         {
             // test ident non-string
             auto testInvalidIdentParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::ident] = param;
                 auto jrr = env.rpc("json", "account_currencies", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -80,13 +80,13 @@ class AccountCurrencies_test : public beast::unit_test::suite
             testInvalidIdentParam(1);
             testInvalidIdentParam(1.1);
             testInvalidIdentParam(true);
-            testInvalidIdentParam(Json::Value(Json::nullValue));
-            testInvalidIdentParam(Json::Value(Json::objectValue));
-            testInvalidIdentParam(Json::Value(Json::arrayValue));
+            testInvalidIdentParam(json::Value(json::NullValue));
+            testInvalidIdentParam(json::Value(json::ObjectValue));
+            testInvalidIdentParam(json::Value(json::ArrayValue));
         }
 
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "llIIOO";  // these are invalid in bitcoin alphabet
             auto const result =
                 env.rpc("json", "account_currencies", to_string(params))[jss::result];
@@ -96,7 +96,7 @@ class AccountCurrencies_test : public beast::unit_test::suite
 
         {
             // Cannot use a seed as account
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "Bob";
             auto const result =
                 env.rpc("json", "account_currencies", to_string(params))[jss::result];
@@ -105,7 +105,7 @@ class AccountCurrencies_test : public beast::unit_test::suite
         }
 
         {  // ask for nonexistent account
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"bob"}.human();
             auto const result =
                 env.rpc("json", "account_currencies", to_string(params))[jss::result];
@@ -134,12 +134,12 @@ class AccountCurrencies_test : public beast::unit_test::suite
         });
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::account] = alice.human();
         auto result = env.rpc("json", "account_currencies", to_string(params))[jss::result];
 
         auto arrayCheck = [&result](
-                              Json::StaticString const& fld,
+                              json::StaticString const& fld,
                               std::vector<std::optional<IOU>> const& expected) -> bool {
             bool stat = result.isMember(fld) && result[fld].isArray() &&
                 result[fld].size() == expected.size();
diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp
index a8f849b6d2..2739b84d50 100644
--- a/src/test/rpc/AccountInfo_test.cpp
+++ b/src/test/rpc/AccountInfo_test.cpp
@@ -22,7 +22,7 @@
 
 namespace xrpl::test {
 
-class AccountInfo_test : public beast::unit_test::suite
+class AccountInfo_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -43,29 +43,29 @@ public:
                 "account_info",
                 "{\"account\": "
                 "\"n94JNrQYkDrpt62bbSR7nVEhdyAvcJXRAsjEkFYyqRkh9SUTYEqV\"}");
-            BEAST_EXPECT(info[jss::result][jss::error_code] == rpcACT_MALFORMED);
+            BEAST_EXPECT(info[jss::result][jss::error_code] == RpcActMalformed);
             BEAST_EXPECT(info[jss::result][jss::error_message] == "Account malformed.");
         }
         {
             // account_info with an account that's not in the ledger.
             Account const bogie{"bogie"};
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bogie.human();
             auto const info = env.rpc("json", "account_info", to_string(params));
-            BEAST_EXPECT(info[jss::result][jss::error_code] == rpcACT_NOT_FOUND);
+            BEAST_EXPECT(info[jss::result][jss::error_code] == RpcActNotFound);
             BEAST_EXPECT(info[jss::result][jss::error_message] == "Account not found.");
         }
         {
             // Cannot use a seed as account
             auto const info = env.rpc("json", "account_info", R"({"account": "foo"})");
-            BEAST_EXPECT(info[jss::result][jss::error_code] == rpcACT_MALFORMED);
+            BEAST_EXPECT(info[jss::result][jss::error_code] == RpcActMalformed);
             BEAST_EXPECT(info[jss::result][jss::error_message] == "Account malformed.");
         }
         {
             // Cannot pass a non-string into the `account` param
 
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_info", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -75,15 +75,15 @@ public:
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
         {
             // Cannot pass a non-string into the `ident` param
 
             auto testInvalidIdentParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::ident] = param;
                 auto jrr = env.rpc("json", "account_info", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -93,9 +93,9 @@ public:
             testInvalidIdentParam(1);
             testInvalidIdentParam(1.1);
             testInvalidIdentParam(true);
-            testInvalidIdentParam(Json::Value(Json::nullValue));
-            testInvalidIdentParam(Json::Value(Json::objectValue));
-            testInvalidIdentParam(Json::Value(Json::arrayValue));
+            testInvalidIdentParam(json::Value(json::NullValue));
+            testInvalidIdentParam(json::Value(json::ObjectValue));
+            testInvalidIdentParam(json::Value(json::ArrayValue));
         }
     }
 
@@ -109,10 +109,10 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(1000), alice);
 
-        Json::Value withoutSigners;
+        json::Value withoutSigners;
         withoutSigners[jss::account] = alice.human();
 
-        Json::Value withSigners;
+        json::Value withSigners;
         withSigners[jss::account] = alice.human();
         withSigners[jss::signer_lists] = true;
 
@@ -139,7 +139,7 @@ public:
         // Give alice a SignerList.
         Account const bogie{"bogie"};
 
-        Json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
+        json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
         env(smallSigners);
         {
             // account_info without the "signer_lists" argument.
@@ -176,7 +176,7 @@ public:
         Account const shade{"shade"};
         Account const spook{"spook"};
 
-        Json::Value const bigSigners = signers(
+        json::Value const bigSigners = signers(
             alice,
             4,
             {
@@ -225,11 +225,11 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(1000), alice);
 
-        Json::Value withoutSigners;
+        json::Value withoutSigners;
         withoutSigners[jss::api_version] = 2;
         withoutSigners[jss::account] = alice.human();
 
-        Json::Value withSigners;
+        json::Value withSigners;
         withSigners[jss::api_version] = 2;
         withSigners[jss::account] = alice.human();
         withSigners[jss::signer_lists] = true;
@@ -258,7 +258,7 @@ public:
         // Give alice a SignerList.
         Account const bogie{"bogie"};
 
-        Json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
+        json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
         env(smallSigners);
         {
             // account_info without the "signer_lists" argument.
@@ -299,7 +299,7 @@ public:
         Account const shade{"shade"};
         Account const spook{"spook"};
 
-        Json::Value const bigSigners = signers(
+        json::Value const bigSigners = signers(
             alice,
             4,
             {
@@ -416,7 +416,7 @@ public:
         // Give alice a SignerList.
         Account const bogie{"bogie"};
 
-        Json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
+        json::Value const smallSigners = signers(alice, 2, {{bogie, 3}});
         env(smallSigners);
         {
             // account_info without the "signer_lists" argument.
@@ -459,7 +459,7 @@ public:
         Account const shade{"shade"};
         Account const spook{"spook"};
 
-        Json::Value const bigSigners = signers(
+        json::Value const bigSigners = signers(
             alice,
             4,
             {
@@ -513,7 +513,7 @@ public:
         env.fund(XRP(1000), alice, bob);
 
         auto getAccountFlag = [&env](std::string_view fName, Account const& account) {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = account.human();
             auto const info = env.rpc("json", "account_info", to_string(params));
             auto const name = std::string(fName);
@@ -526,7 +526,7 @@ public:
             return res;
         };
 
-        static constexpr std::array<std::pair<std::string_view, std::uint32_t>, 7> asFlags{
+        static constexpr std::array<std::pair<std::string_view, std::uint32_t>, 7> kAS_FLAGS{
             {{"defaultRipple", asfDefaultRipple},
              {"depositAuth", asfDepositAuth},
              {"disallowIncomingXRP", asfDisallowXRP},
@@ -535,7 +535,7 @@ public:
              {"requireAuthorization", asfRequireAuth},
              {"requireDestinationTag", asfRequireDest}}};
 
-        for (auto& asf : asFlags)
+        for (auto& asf : kAS_FLAGS)
         {
             // 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>
-            disallowIncomingFlags{
+            kDISALLOW_INCOMING_FLAGS{
                 {{"disallowIncomingCheck", asfDisallowIncomingCheck},
                  {"disallowIncomingNFTokenOffer", asfDisallowIncomingNFTokenOffer},
                  {"disallowIncomingPayChan", asfDisallowIncomingPayChan},
                  {"disallowIncomingTrustline", asfDisallowIncomingTrustline}}};
 
-        for (auto& asf : disallowIncomingFlags)
+        for (auto& asf : kDISALLOW_INCOMING_FLAGS)
         {
             // 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> allowTrustLineClawbackFlag{
+        static constexpr std::pair<std::string_view, std::uint32_t> kALLOW_TRUST_LINE_CLAWBACK_FLAG{
             "allowTrustLineClawback", asfAllowTrustLineClawback};
 
         if (features[featureClawback])
         {
             // must use bob's account because alice has noFreeze set
-            auto const f1 = getAccountFlag(allowTrustLineClawbackFlag.first, bob);
+            auto const f1 = getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob);
             BEAST_EXPECT(f1.has_value());
             BEAST_EXPECT(!f1.value());  // NOLINT(bugprone-unchecked-optional-access)
 
             // Set allowTrustLineClawback
-            env(fset(bob, allowTrustLineClawbackFlag.second));
+            env(fset(bob, kALLOW_TRUST_LINE_CLAWBACK_FLAG.second));
             env.close();
-            auto const f2 = getAccountFlag(allowTrustLineClawbackFlag.first, bob);
+            auto const f2 = getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob);
             BEAST_EXPECT(f2.has_value());
             BEAST_EXPECT(f2.value());  // NOLINT(bugprone-unchecked-optional-access)
         }
         else
         {
-            BEAST_EXPECT(!getAccountFlag(allowTrustLineClawbackFlag.first, bob));
+            BEAST_EXPECT(!getAccountFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.first, bob));
         }
 
-        static constexpr std::pair<std::string_view, std::uint32_t> allowTrustLineLockingFlag{
+        static constexpr std::pair<std::string_view, std::uint32_t> kALLOW_TRUST_LINE_LOCKING_FLAG{
             "allowTrustLineLocking", asfAllowTrustLineLocking};
 
         if (features[featureTokenEscrow])
         {
-            auto const f1 = getAccountFlag(allowTrustLineLockingFlag.first, bob);
+            auto const f1 = getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob);
             BEAST_EXPECT(f1.has_value());
             BEAST_EXPECT(!f1.value());  // NOLINT(bugprone-unchecked-optional-access)
 
             // Set allowTrustLineLocking
-            env(fset(bob, allowTrustLineLockingFlag.second));
+            env(fset(bob, kALLOW_TRUST_LINE_LOCKING_FLAG.second));
             env.close();
-            auto const f2 = getAccountFlag(allowTrustLineLockingFlag.first, bob);
+            auto const f2 = getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob);
             BEAST_EXPECT(f2.has_value());
             BEAST_EXPECT(f2.value());  // NOLINT(bugprone-unchecked-optional-access)
         }
         else
         {
-            BEAST_EXPECT(!getAccountFlag(allowTrustLineLockingFlag.first, bob));
+            BEAST_EXPECT(!getAccountFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.first, bob));
         }
     }
 
@@ -632,7 +632,7 @@ public:
         testSignerListsApiVersion2();
         testSignerListsV2();
 
-        FeatureBitset const allFeatures{xrpl::test::jtx::testable_amendments()};
+        FeatureBitset const allFeatures{xrpl::test::jtx::testableAmendments()};
         testAccountFlags(allFeatures);
         testAccountFlags(allFeatures - featureClawback);
         testAccountFlags(allFeatures - featureClawback - featureTokenEscrow);
diff --git a/src/test/rpc/AccountLines_test.cpp b/src/test/rpc/AccountLines_test.cpp
index 6f50c93bd8..750ba9cc78 100644
--- a/src/test/rpc/AccountLines_test.cpp
+++ b/src/test/rpc/AccountLines_test.cpp
@@ -36,7 +36,7 @@
 
 namespace xrpl::RPC {
 
-class AccountLines_test : public beast::unit_test::suite
+class AccountLines_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -51,21 +51,21 @@ public:
             auto const lines = env.rpc("json", "account_lines", "{ }");
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::missing_field_error(jss::account)[jss::error_message]);
+                RPC::missingFieldError(jss::account)[jss::error_message]);
         }
         {
             // account_lines with a malformed account.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "n9MJkEKHDhy5eTLuHUQeAAjo382frHNbFK4C8hcwN4nwM2SrLdBj";
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
+                RPC::makeError(RpcActMalformed)[jss::error_message]);
         }
         {
             // test account non-string
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_lines", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -75,19 +75,19 @@ public:
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
         Account const alice{"alice"};
         {
             // account_lines on an unfunded account.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::make_error(rpcACT_NOT_FOUND)[jss::error_message]);
+                RPC::makeError(RpcActNotFound)[jss::error_message]);
         }
         env.fund(XRP(10000), alice);
         env.close();
@@ -96,7 +96,7 @@ public:
 
         {
             // alice is funded but has no lines.  An empty array is returned.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(lines[jss::result][jss::lines].isArray());
@@ -104,7 +104,7 @@ public:
         }
         {
             // Specify a ledger that doesn't exist.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_index] = "nonsense";
             auto const lines = env.rpc("json", "account_lines", to_string(params));
@@ -114,7 +114,7 @@ public:
         }
         {
             // Specify a different ledger that doesn't exist.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_index] = 50000;
             auto const lines = env.rpc("json", "account_lines", to_string(params));
@@ -173,7 +173,7 @@ public:
         auto testAccountLinesHistory =
             [this, &env](Account const& account, LedgerHeader const& info, int count) {
                 // Get account_lines by ledger index.
-                Json::Value paramsSeq;
+                json::Value paramsSeq;
                 paramsSeq[jss::account] = account.human();
                 paramsSeq[jss::ledger_index] = info.seq;
                 auto const linesSeq = env.rpc("json", "account_lines", to_string(paramsSeq));
@@ -181,7 +181,7 @@ public:
                 BEAST_EXPECT(linesSeq[jss::result][jss::lines].size() == count);
 
                 // Get account_lines by ledger hash.
-                Json::Value paramsHash;
+                json::Value paramsHash;
                 paramsHash[jss::account] = account.human();
                 paramsHash[jss::ledger_hash] = to_string(info.hash);
                 auto const linesHash = env.rpc("json", "account_lines", to_string(paramsHash));
@@ -200,7 +200,7 @@ public:
 
         {
             // Invalid to specify both index and hash
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_hash] = to_string(ledger4Info.hash);
             params[jss::ledger_index] = ledger58Info.seq;
@@ -213,9 +213,9 @@ public:
         }
         {
             // Invalid index
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
-            params[jss::ledger_index] = Json::objectValue;
+            params[jss::ledger_index] = json::ObjectValue;
             auto const lines = env.rpc("json", "account_lines", to_string(params))[jss::result];
             BEAST_EXPECT(lines[jss::error] == "invalidParams");
             BEAST_EXPECT(
@@ -223,7 +223,7 @@ public:
         }
         {
             // alice should have 52 trust lines in the current ledger.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(lines[jss::result][jss::lines].isArray());
@@ -231,7 +231,7 @@ public:
         }
         {
             // alice should have 26 trust lines with gw1.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::peer] = gw1.human();
             auto const lines = env.rpc("json", "account_lines", to_string(params));
@@ -244,27 +244,27 @@ public:
         }
         {
             // Use a malformed peer.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::peer] = "n9MJkEKHDhy5eTLuHUQeAAjo382frHNbFK4C8hcwN4nwM2SrLdBj";
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
+                RPC::makeError(RpcActMalformed)[jss::error_message]);
         }
         {
             // A negative limit should fail.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::limit] = -1;
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
         }
         {
             // Limit the response to 1 trust line.
-            Json::Value paramsA;
+            json::Value paramsA;
             paramsA[jss::account] = alice.human();
             paramsA[jss::limit] = 1;
             auto const linesA = env.rpc("json", "account_lines", to_string(paramsA));
@@ -273,7 +273,7 @@ public:
 
             // Pick up from where the marker left off.  We should get 51.
             auto marker = linesA[jss::result][jss::marker].asString();
-            Json::Value paramsB;
+            json::Value paramsB;
             paramsB[jss::account] = alice.human();
             paramsB[jss::marker] = marker;
             auto const linesB = env.rpc("json", "account_lines", to_string(paramsB));
@@ -281,7 +281,7 @@ public:
             BEAST_EXPECT(linesB[jss::result][jss::lines].size() == 51);
 
             // Go again from where the marker left off, but set a limit of 3.
-            Json::Value paramsC;
+            json::Value paramsC;
             paramsC[jss::account] = alice.human();
             paramsC[jss::limit] = 3;
             paramsC[jss::marker] = marker;
@@ -291,27 +291,27 @@ public:
 
             // Mess with the marker so it becomes bad and check for the error.
             marker[5] = marker[5] == '7' ? '8' : '7';
-            Json::Value paramsD;
+            json::Value paramsD;
             paramsD[jss::account] = alice.human();
             paramsD[jss::marker] = marker;
             auto const linesD = env.rpc("json", "account_lines", to_string(paramsD));
             BEAST_EXPECT(
                 linesD[jss::result][jss::error_message] ==
-                RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
+                RPC::makeError(RpcInvalidParams)[jss::error_message]);
         }
         {
             // A non-string marker should also fail.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::marker] = true;
             auto const lines = env.rpc("json", "account_lines", to_string(params));
             BEAST_EXPECT(
                 lines[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::marker, "string"));
+                RPC::expectedFieldMessage(jss::marker, "string"));
         }
         {
             // Check that the flags we expect from alice to gw2 are present.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::limit] = 10;
             params[jss::peer] = gw2.human();
@@ -324,7 +324,7 @@ public:
         }
         {
             // Check that the flags we expect from gw2 to alice are present.
-            Json::Value paramsA;
+            json::Value paramsA;
             paramsA[jss::account] = gw2.human();
             paramsA[jss::limit] = 1;
             paramsA[jss::peer] = alice.human();
@@ -338,7 +338,7 @@ public:
             // Continue from the returned marker to make sure that works.
             BEAST_EXPECT(linesA[jss::result].isMember(jss::marker));
             auto const marker = linesA[jss::result][jss::marker].asString();
-            Json::Value paramsB;
+            json::Value paramsB;
             paramsB[jss::account] = gw2.human();
             paramsB[jss::limit] = 25;
             paramsB[jss::marker] = marker;
@@ -374,21 +374,21 @@ public:
         env(signers(alice, 2, {{bogie, 3}}));
         env.close();
 
-        auto const EUR = gw1["EUR"];
-        env(trust(alice, EUR(200)));
-        env(trust(becky, EUR(200)));
+        auto const eur = gw1["EUR"];
+        env(trust(alice, eur(200)));
+        env(trust(becky, eur(200)));
         env.close();
 
         // Get all account objects for alice and verify that her
         // signerlist is first.  This is only a (reliable) coincidence of
         // object naming.  So if any of alice's objects are renamed this
         // may fail.
-        Json::Value aliceObjectsParams;
+        json::Value aliceObjectsParams;
         aliceObjectsParams[jss::account] = alice.human();
         aliceObjectsParams[jss::limit] = 10;
-        Json::Value const aliceObjects =
+        json::Value const aliceObjects =
             env.rpc("json", "account_objects", to_string(aliceObjectsParams));
-        Json::Value const& aliceSignerList = aliceObjects[jss::result][jss::account_objects][0u];
+        json::Value const& aliceSignerList = aliceObjects[jss::result][jss::account_objects][0u];
         if (!(aliceSignerList[sfLedgerEntryType.jsonName] == jss::SignerList))
         {
             fail(
@@ -401,7 +401,7 @@ public:
 
         // Get account_lines for alice.  Limit at 1, so we get a marker
         // pointing to her SignerList.
-        Json::Value aliceLines1Params;
+        json::Value aliceLines1Params;
         aliceLines1Params[jss::account] = alice.human();
         aliceLines1Params[jss::limit] = 1;
         auto const aliceLines1 = env.rpc("json", "account_lines", to_string(aliceLines1Params));
@@ -413,7 +413,7 @@ public:
         BEAST_EXPECT(markerIndex == aliceSignerList[jss::index].asString());
 
         // When we fetch Alice's remaining lines we should find one and no more.
-        Json::Value aliceLines2Params;
+        json::Value aliceLines2Params;
         aliceLines2Params[jss::account] = alice.human();
         aliceLines2Params[jss::marker] = aliceMarker;
         auto const aliceLines2 = env.rpc("json", "account_lines", to_string(aliceLines2Params));
@@ -422,7 +422,7 @@ public:
 
         // Get account lines for becky's account, using alice's SignerList as a
         // marker. This should cause an error.
-        Json::Value beckyLinesParams;
+        json::Value beckyLinesParams;
         beckyLinesParams[jss::account] = becky.human();
         beckyLinesParams[jss::marker] = aliceMarker;
         auto const beckyLines = env.rpc("json", "account_lines", to_string(beckyLinesParams));
@@ -455,29 +455,29 @@ public:
         env.fund(XRP(10000), alice, becky, cheri, gw1, gw2);
         env.close();
 
-        auto const USD = gw1["USD"];
-        auto const AUD = gw1["AUD"];
-        auto const EUR = gw2["EUR"];
-        env(trust(alice, USD(200)));
-        env(trust(alice, AUD(200)));
-        env(trust(becky, EUR(200)));
-        env(trust(cheri, EUR(200)));
+        auto const usd = gw1["USD"];
+        auto const aud = gw1["AUD"];
+        auto const eur = gw2["EUR"];
+        env(trust(alice, usd(200)));
+        env(trust(alice, aud(200)));
+        env(trust(becky, eur(200)));
+        env(trust(cheri, eur(200)));
         env.close();
 
         // becky gets 100 USD from gw1.
-        env(pay(gw2, becky, EUR(100)));
+        env(pay(gw2, becky, eur(100)));
         env.close();
 
         // alice offers to buy 100 EUR for 100 XRP.
-        env(offer(alice, EUR(100), XRP(100)));
+        env(offer(alice, eur(100), XRP(100)));
         env.close();
 
         // becky offers to buy 100 XRP for 100 EUR.
-        env(offer(becky, XRP(100), EUR(100)));
+        env(offer(becky, XRP(100), eur(100)));
         env.close();
 
         // Get account_lines for alice.  Limit at 1, so we get a marker.
-        Json::Value linesBegParams;
+        json::Value linesBegParams;
         linesBegParams[jss::account] = alice.human();
         linesBegParams[jss::limit] = 2;
         auto const linesBeg = env.rpc("json", "account_lines", to_string(linesBegParams));
@@ -485,18 +485,18 @@ public:
         BEAST_EXPECT(linesBeg[jss::result].isMember(jss::marker));
 
         // alice pays 100 EUR to cheri.
-        env(pay(alice, cheri, EUR(100)));
+        env(pay(alice, cheri, eur(100)));
         env.close();
 
         // Since alice paid all her EUR to cheri, alice should no longer
         // have a trust line to gw1.  So the old marker should now be invalid.
-        Json::Value linesEndParams;
+        json::Value linesEndParams;
         linesEndParams[jss::account] = alice.human();
         linesEndParams[jss::marker] = linesBeg[jss::result][jss::marker];
         auto const linesEnd = env.rpc("json", "account_lines", to_string(linesEndParams));
         BEAST_EXPECT(
             linesEnd[jss::result][jss::error_message] ==
-            RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
+            RPC::makeError(RpcInvalidParams)[jss::error_message]);
     }
 
     void
@@ -524,11 +524,11 @@ public:
                           STAmount const& amount,
                           NetClock::duration const& settleDelay,
                           PublicKey const& pk) {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::PaymentChannelCreate;
             jv[jss::Account] = account.human();
             jv[jss::Destination] = to.human();
-            jv[jss::Amount] = amount.getJson(JsonOptions::none);
+            jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
             jv["SettleDelay"] = settleDelay.count();
             jv["PublicKey"] = strHex(pk.slice());
             return jv;
@@ -548,14 +548,14 @@ public:
         env.close();
 
         // Trust lines
-        auto const EUR = gw1["EUR"];
-        env(trust(alice, EUR(200)));
-        env(trust(becky, EUR(200)));
+        auto const eur = gw1["EUR"];
+        env(trust(alice, eur(200)));
+        env(trust(becky, eur(200)));
         env.close();
 
         // Escrow, in each direction
-        env(escrow::create(alice, becky, XRP(1000)), escrow::finish_time(env.now() + 1s));
-        env(escrow::create(becky, alice, XRP(1000)), escrow::finish_time(env.now() + 1s));
+        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));
 
         // Pay channels, in each direction
         env(payChan(alice, becky, XRP(1000), 100s, alice.pk()));
@@ -563,31 +563,31 @@ public:
 
         // Mint NFTs, for each account
         uint256 const aliceNFtokenID = token::getNextID(env, alice, 0, tfTransferable);
-        env(token::mint(alice, 0), txflags(tfTransferable));
+        env(token::mint(alice, 0), Txflags(tfTransferable));
 
         uint256 const beckyNFtokenID = token::getNextID(env, becky, 0, tfTransferable);
-        env(token::mint(becky, 0), txflags(tfTransferable));
+        env(token::mint(becky, 0), Txflags(tfTransferable));
 
         // NFT Offers, for each other's NFTs
-        env(token::createOffer(alice, beckyNFtokenID, drops(1)), token::owner(becky));
-        env(token::createOffer(becky, aliceNFtokenID, drops(1)), token::owner(alice));
+        env(token::createOffer(alice, beckyNFtokenID, drops(1)), token::Owner(becky));
+        env(token::createOffer(becky, aliceNFtokenID, drops(1)), token::Owner(alice));
 
         env(token::createOffer(becky, beckyNFtokenID, drops(1)),
-            txflags(tfSellNFToken),
-            token::destination(alice));
+            Txflags(tfSellNFToken),
+            token::Destination(alice));
         env(token::createOffer(alice, aliceNFtokenID, drops(1)),
-            txflags(tfSellNFToken),
-            token::destination(becky));
+            Txflags(tfSellNFToken),
+            token::Destination(becky));
 
         env(token::createOffer(gw1, beckyNFtokenID, drops(1)),
-            token::owner(becky),
-            token::destination(alice));
+            token::Owner(becky),
+            token::Destination(alice));
         env(token::createOffer(gw1, aliceNFtokenID, drops(1)),
-            token::owner(alice),
-            token::destination(becky));
+            token::Owner(alice),
+            token::Destination(becky));
 
-        env(token::createOffer(becky, beckyNFtokenID, drops(1)), txflags(tfSellNFToken));
-        env(token::createOffer(alice, aliceNFtokenID, drops(1)), txflags(tfSellNFToken));
+        env(token::createOffer(becky, beckyNFtokenID, drops(1)), Txflags(tfSellNFToken));
+        env(token::createOffer(alice, aliceNFtokenID, drops(1)), Txflags(tfSellNFToken));
 
         // Checks, in each direction
         env(check::create(alice, becky, XRP(50)));
@@ -599,16 +599,16 @@ public:
 
         // Offers, one where alice is the owner, and one where alice is the
         // issuer
-        auto const USDalice = alice["USD"];
-        env(offer(alice, EUR(10), XRP(100)));
-        env(offer(becky, USDalice(10), XRP(100)));
+        auto const usDalice = alice["USD"];
+        env(offer(alice, eur(10), XRP(100)));
+        env(offer(becky, usDalice(10), XRP(100)));
 
         // Tickets
         env(ticket::create(alice, 2));
 
         // Add another trustline for good measure
-        auto const BTCbecky = becky["BTC"];
-        env(trust(alice, BTCbecky(200)));
+        auto const btCbecky = becky["BTC"];
+        env(trust(alice, btCbecky(200)));
 
         env.close();
 
@@ -618,7 +618,7 @@ public:
             // the list will be empty for most calls.
             auto getNextLine =
                 [](Env& env, Account const& alice, std::optional<std::string> const marker) {
-                    Json::Value params(Json::objectValue);
+                    json::Value params(json::ObjectValue);
                     params[jss::account] = alice.human();
                     params[jss::limit] = 1;
                     if (marker)
@@ -628,9 +628,9 @@ public:
                 };
 
             auto aliceLines = getNextLine(env, alice, std::nullopt);
-            constexpr std::size_t expectedIterations = 16;
-            constexpr std::size_t expectedLines = 2;
-            constexpr std::size_t expectedNFTs = 1;
+            constexpr std::size_t kEXPECTED_ITERATIONS = 16;
+            constexpr std::size_t kEXPECTED_LINES = 2;
+            constexpr std::size_t kEXPECTED_NF_TS = 1;
             std::size_t foundLines = 0;
 
             auto hasMarker = [](auto const& aliceLines) {
@@ -661,12 +661,12 @@ public:
                 foundLines += aliceLines[jss::result][jss::lines].size();
                 ++iterations;
             }
-            BEAST_EXPECT(expectedLines == foundLines);
+            BEAST_EXPECT(kEXPECTED_LINES == foundLines);
 
-            Json::Value aliceObjectsParams2;
+            json::Value aliceObjectsParams2;
             aliceObjectsParams2[jss::account] = alice.human();
             aliceObjectsParams2[jss::limit] = 200;
-            Json::Value const aliceObjects =
+            json::Value const aliceObjects =
                 env.rpc("json", "account_objects", to_string(aliceObjectsParams2));
             BEAST_EXPECT(aliceObjects.isMember(jss::result));
             BEAST_EXPECT(!aliceObjects[jss::result].isMember(jss::error_message));
@@ -677,16 +677,16 @@ public:
             // this test will need to be updated.
             BEAST_EXPECT(
                 aliceObjects[jss::result][jss::account_objects].size() ==
-                iterations + expectedNFTs);
+                iterations + kEXPECTED_NF_TS);
             // If ledger object association ever changes, for whatever
             // reason, this test will need to be updated.
-            BEAST_EXPECTS(iterations == expectedIterations, std::to_string(iterations));
+            BEAST_EXPECTS(iterations == kEXPECTED_ITERATIONS, std::to_string(iterations));
 
             // Get becky's objects just to confirm that they're symmetrical
-            Json::Value beckyObjectsParams;
+            json::Value beckyObjectsParams;
             beckyObjectsParams[jss::account] = becky.human();
             beckyObjectsParams[jss::limit] = 200;
-            Json::Value const beckyObjects =
+            json::Value const beckyObjects =
                 env.rpc("json", "account_objects", to_string(beckyObjectsParams));
             BEAST_EXPECT(beckyObjects.isMember(jss::result));
             BEAST_EXPECT(!beckyObjects[jss::result].isMember(jss::error_message));
@@ -710,7 +710,7 @@ public:
         Env env(*this);
         {
             // account_lines with mal-formed json2 (missing id field).
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -720,7 +720,7 @@ public:
         }
         {
             // account_lines with no account.
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -728,16 +728,16 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::missing_field_error(jss::account)[jss::error_message]);
+                RPC::missingFieldError(jss::account)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
             // account_lines with a malformed account.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "n9MJkEKHDhy5eTLuHUQeAAjo382frHNbFK4C8hcwN4nwM2SrLdBj";
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -746,7 +746,7 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
+                RPC::makeError(RpcActMalformed)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
@@ -754,9 +754,9 @@ public:
         Account const alice{"alice"};
         {
             // account_lines on an unfunded account.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -765,7 +765,7 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::make_error(rpcACT_NOT_FOUND)[jss::error_message]);
+                RPC::makeError(RpcActNotFound)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
@@ -777,9 +777,9 @@ public:
 
         {
             // alice is funded but has no lines.  An empty array is returned.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -794,10 +794,10 @@ public:
         }
         {
             // Specify a ledger that doesn't exist.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_index] = "nonsense";
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -813,10 +813,10 @@ public:
         }
         {
             // Specify a different ledger that doesn't exist.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_index] = 50000;
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -883,10 +883,10 @@ public:
                                            LedgerHeader const& info,
                                            int count) {
             // Get account_lines by ledger index.
-            Json::Value paramsSeq;
+            json::Value paramsSeq;
             paramsSeq[jss::account] = account.human();
             paramsSeq[jss::ledger_index] = info.seq;
-            Json::Value requestSeq;
+            json::Value requestSeq;
             requestSeq[jss::method] = "account_lines";
             requestSeq[jss::jsonrpc] = "2.0";
             requestSeq[jss::ripplerpc] = "2.0";
@@ -900,10 +900,10 @@ public:
             BEAST_EXPECT(linesSeq.isMember(jss::id) && linesSeq[jss::id] == 5);
 
             // Get account_lines by ledger hash.
-            Json::Value paramsHash;
+            json::Value paramsHash;
             paramsHash[jss::account] = account.human();
             paramsHash[jss::ledger_hash] = to_string(info.hash);
-            Json::Value requestHash;
+            json::Value requestHash;
             requestHash[jss::method] = "account_lines";
             requestHash[jss::jsonrpc] = "2.0";
             requestHash[jss::ripplerpc] = "2.0";
@@ -929,11 +929,11 @@ public:
         {
             // Surprisingly, it's valid to specify both index and hash, in
             // which case the hash wins.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::ledger_hash] = to_string(ledger4Info.hash);
             params[jss::ledger_index] = ledger58Info.seq;
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -951,9 +951,9 @@ public:
         }
         {
             // alice should have 52 trust lines in the current ledger.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -968,10 +968,10 @@ public:
         }
         {
             // alice should have 26 trust lines with gw1.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::peer] = gw1.human();
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -986,10 +986,10 @@ public:
         }
         {
             // Use a malformed peer.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::peer] = "n9MJkEKHDhy5eTLuHUQeAAjo382frHNbFK4C8hcwN4nwM2SrLdBj";
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -998,17 +998,17 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::make_error(rpcACT_MALFORMED)[jss::error_message]);
+                RPC::makeError(RpcActMalformed)[jss::error_message]);
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
             // A negative limit should fail.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::limit] = -1;
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -1017,17 +1017,17 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
             // Limit the response to 1 trust line.
-            Json::Value paramsA;
+            json::Value paramsA;
             paramsA[jss::account] = alice.human();
             paramsA[jss::limit] = 1;
-            Json::Value requestA;
+            json::Value requestA;
             requestA[jss::method] = "account_lines";
             requestA[jss::jsonrpc] = "2.0";
             requestA[jss::ripplerpc] = "2.0";
@@ -1042,10 +1042,10 @@ public:
 
             // Pick up from where the marker left off.  We should get 51.
             auto marker = linesA[jss::result][jss::marker].asString();
-            Json::Value paramsB;
+            json::Value paramsB;
             paramsB[jss::account] = alice.human();
             paramsB[jss::marker] = marker;
-            Json::Value requestB;
+            json::Value requestB;
             requestB[jss::method] = "account_lines";
             requestB[jss::jsonrpc] = "2.0";
             requestB[jss::ripplerpc] = "2.0";
@@ -1059,11 +1059,11 @@ public:
             BEAST_EXPECT(linesB.isMember(jss::id) && linesB[jss::id] == 5);
 
             // Go again from where the marker left off, but set a limit of 3.
-            Json::Value paramsC;
+            json::Value paramsC;
             paramsC[jss::account] = alice.human();
             paramsC[jss::limit] = 3;
             paramsC[jss::marker] = marker;
-            Json::Value requestC;
+            json::Value requestC;
             requestC[jss::method] = "account_lines";
             requestC[jss::jsonrpc] = "2.0";
             requestC[jss::ripplerpc] = "2.0";
@@ -1078,10 +1078,10 @@ public:
 
             // Mess with the marker so it becomes bad and check for the error.
             marker[5] = marker[5] == '7' ? '8' : '7';
-            Json::Value paramsD;
+            json::Value paramsD;
             paramsD[jss::account] = alice.human();
             paramsD[jss::marker] = marker;
-            Json::Value requestD;
+            json::Value requestD;
             requestD[jss::method] = "account_lines";
             requestD[jss::jsonrpc] = "2.0";
             requestD[jss::ripplerpc] = "2.0";
@@ -1090,17 +1090,17 @@ public:
             auto const linesD = env.rpc("json2", to_string(requestD));
             BEAST_EXPECT(
                 linesD[jss::error][jss::message] ==
-                RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
+                RPC::makeError(RpcInvalidParams)[jss::error_message]);
             BEAST_EXPECT(linesD.isMember(jss::jsonrpc) && linesD[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(linesD.isMember(jss::ripplerpc) && linesD[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(linesD.isMember(jss::id) && linesD[jss::id] == 5);
         }
         {
             // A non-string marker should also fail.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::marker] = true;
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -1109,18 +1109,18 @@ public:
             auto const lines = env.rpc("json2", to_string(request));
             BEAST_EXPECT(
                 lines[jss::error][jss::message] ==
-                RPC::expected_field_message(jss::marker, "string"));
+                RPC::expectedFieldMessage(jss::marker, "string"));
             BEAST_EXPECT(lines.isMember(jss::jsonrpc) && lines[jss::jsonrpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::ripplerpc) && lines[jss::ripplerpc] == "2.0");
             BEAST_EXPECT(lines.isMember(jss::id) && lines[jss::id] == 5);
         }
         {
             // Check that the flags we expect from alice to gw2 are present.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::limit] = 10;
             params[jss::peer] = gw2.human();
-            Json::Value request;
+            json::Value request;
             request[jss::method] = "account_lines";
             request[jss::jsonrpc] = "2.0";
             request[jss::ripplerpc] = "2.0";
@@ -1138,11 +1138,11 @@ public:
         }
         {
             // Check that the flags we expect from gw2 to alice are present.
-            Json::Value paramsA;
+            json::Value paramsA;
             paramsA[jss::account] = gw2.human();
             paramsA[jss::limit] = 1;
             paramsA[jss::peer] = alice.human();
-            Json::Value requestA;
+            json::Value requestA;
             requestA[jss::method] = "account_lines";
             requestA[jss::jsonrpc] = "2.0";
             requestA[jss::ripplerpc] = "2.0";
@@ -1161,12 +1161,12 @@ public:
             // Continue from the returned marker to make sure that works.
             BEAST_EXPECT(linesA[jss::result].isMember(jss::marker));
             auto const marker = linesA[jss::result][jss::marker].asString();
-            Json::Value paramsB;
+            json::Value paramsB;
             paramsB[jss::account] = gw2.human();
             paramsB[jss::limit] = 25;
             paramsB[jss::marker] = marker;
             paramsB[jss::peer] = alice.human();
-            Json::Value requestB;
+            json::Value requestB;
             requestB[jss::method] = "account_lines";
             requestB[jss::jsonrpc] = "2.0";
             requestB[jss::ripplerpc] = "2.0";
@@ -1210,32 +1210,32 @@ public:
         env.fund(XRP(10000), alice, becky, cheri, gw1, gw2);
         env.close();
 
-        auto const USD = gw1["USD"];
-        auto const AUD = gw1["AUD"];
-        auto const EUR = gw2["EUR"];
-        env(trust(alice, USD(200)));
-        env(trust(alice, AUD(200)));
-        env(trust(becky, EUR(200)));
-        env(trust(cheri, EUR(200)));
+        auto const usd = gw1["USD"];
+        auto const aud = gw1["AUD"];
+        auto const eur = gw2["EUR"];
+        env(trust(alice, usd(200)));
+        env(trust(alice, aud(200)));
+        env(trust(becky, eur(200)));
+        env(trust(cheri, eur(200)));
         env.close();
 
         // becky gets 100 EUR from gw1.
-        env(pay(gw2, becky, EUR(100)));
+        env(pay(gw2, becky, eur(100)));
         env.close();
 
         // alice offers to buy 100 EUR for 100 XRP.
-        env(offer(alice, EUR(100), XRP(100)));
+        env(offer(alice, eur(100), XRP(100)));
         env.close();
 
         // becky offers to buy 100 XRP for 100 EUR.
-        env(offer(becky, XRP(100), EUR(100)));
+        env(offer(becky, XRP(100), eur(100)));
         env.close();
 
         // Get account_lines for alice.  Limit at 1, so we get a marker.
-        Json::Value linesBegParams;
+        json::Value linesBegParams;
         linesBegParams[jss::account] = alice.human();
         linesBegParams[jss::limit] = 2;
-        Json::Value linesBegRequest;
+        json::Value linesBegRequest;
         linesBegRequest[jss::method] = "account_lines";
         linesBegRequest[jss::jsonrpc] = "2.0";
         linesBegRequest[jss::ripplerpc] = "2.0";
@@ -1249,15 +1249,15 @@ public:
         BEAST_EXPECT(linesBeg.isMember(jss::id) && linesBeg[jss::id] == 5);
 
         // alice pays 100 USD to cheri.
-        env(pay(alice, cheri, EUR(100)));
+        env(pay(alice, cheri, eur(100)));
         env.close();
 
         // Since alice paid all her EUR to cheri, alice should no longer
         // have a trust line to gw1.  So the old marker should now be invalid.
-        Json::Value linesEndParams;
+        json::Value linesEndParams;
         linesEndParams[jss::account] = alice.human();
         linesEndParams[jss::marker] = linesBeg[jss::result][jss::marker];
-        Json::Value linesEndRequest;
+        json::Value linesEndRequest;
         linesEndRequest[jss::method] = "account_lines";
         linesEndRequest[jss::jsonrpc] = "2.0";
         linesEndRequest[jss::ripplerpc] = "2.0";
@@ -1266,7 +1266,7 @@ public:
         auto const linesEnd = env.rpc("json2", to_string(linesEndRequest));
         BEAST_EXPECT(
             linesEnd[jss::error][jss::message] ==
-            RPC::make_error(rpcINVALID_PARAMS)[jss::error_message]);
+            RPC::makeError(RpcInvalidParams)[jss::error_message]);
         BEAST_EXPECT(linesEnd.isMember(jss::jsonrpc) && linesEnd[jss::jsonrpc] == "2.0");
         BEAST_EXPECT(linesEnd.isMember(jss::ripplerpc) && linesEnd[jss::ripplerpc] == "2.0");
         BEAST_EXPECT(linesEnd.isMember(jss::id) && linesEnd[jss::id] == 5);
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 6f3ae2e2b3..6feec6334b 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -36,7 +36,7 @@
 
 namespace xrpl::test {
 
-static char const* bob_account_objects[] = {
+static char const* gBobAccountObjects[] = {
     R"json({
   "Account" : "rPMh7Pi9ct699iZUTWaytJUoHcJ7cgyziK",
   "BookDirectory" : "50AD0A9E54D2B381288D535EB724E4275FFBF41580D28A925D038D7EA4C68000",
@@ -114,7 +114,7 @@ static char const* bob_account_objects[] = {
     "index" : "F03ABE26CB8C5F4AFB31A86590BD25C64C5756FCE5CE9704C27AFE291A4A29A1"
 })json"};
 
-class AccountObjects_test : public beast::unit_test::suite
+class AccountObjects_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -127,14 +127,14 @@ public:
 
         // test error on no account
         {
-            Json::Value const params;
+            json::Value const params;
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Missing field 'account'.");
         }
         // test account non-string
         {
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_objects", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -144,20 +144,20 @@ public:
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
         // test error on  malformed account string.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "n94JNrQYkDrpt62bbSR7nVEhdyAvcJXRAsjEkFYyqRkh9SUTYEqV";
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Account malformed.");
         }
         // test error on account that's not in the ledger.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"bogie"}.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Account not found.");
@@ -165,7 +165,7 @@ public:
         Account const bob{"bob"};
         // test error on large ledger_index.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::ledger_index] = 10;
             auto resp = env.rpc("json", "account_objects", to_string(params));
@@ -175,7 +175,7 @@ public:
         env.fund(XRP(1000), bob);
         // test error on type param not a string
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = 10;
             auto resp = env.rpc("json", "account_objects", to_string(params));
@@ -184,7 +184,7 @@ public:
         }
         // test error on type param not a valid type
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = "expedited";
             auto resp = env.rpc("json", "account_objects", to_string(params));
@@ -192,7 +192,7 @@ public:
         }
         // test error on limit -ve
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = -1;
             auto resp = env.rpc("json", "account_objects", to_string(params));
@@ -204,18 +204,18 @@ public:
         {
             Account const gw{"G"};
             env.fund(XRP(1000), gw);
-            auto const USD = gw["USD"];
-            env.trust(USD(1000), bob);
+            auto const usd = gw["USD"];
+            env.trust(usd(1000), bob);
             env(pay(gw, bob, XRP(1)));
-            env(offer(bob, XRP(100), bob["USD"](1)), txflags(tfPassive));
+            env(offer(bob, XRP(100), bob["USD"](1)), Txflags(tfPassive));
 
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 1;
             auto resp = env.rpc("json", "account_objects", to_string(params));
 
-            auto resume_marker = resp[jss::result][jss::marker];
-            std::string mark = to_string(resume_marker);
+            auto resumeMarker = resp[jss::result][jss::marker];
+            std::string mark = to_string(resumeMarker);
             params[jss::marker] = 10;
             resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(
@@ -262,27 +262,27 @@ public:
         Account const gw2{"G2"};
         Account const bob{"bob"};
 
-        auto const USD1 = gw1["USD"];
-        auto const USD2 = gw2["USD"];
+        auto const usD1 = gw1["USD"];
+        auto const usD2 = gw2["USD"];
 
         env.fund(XRP(1000), gw1, gw2, bob);
-        env.trust(USD1(1000), bob);
-        env.trust(USD2(1000), bob);
+        env.trust(usD1(1000), bob);
+        env.trust(usD2(1000), bob);
 
-        env(pay(gw1, bob, USD1(1000)));
-        env(pay(gw2, bob, USD2(1000)));
+        env(pay(gw1, bob, usD1(1000)));
+        env(pay(gw2, bob, usD2(1000)));
 
-        env(offer(bob, XRP(100), bob["USD"](1)), txflags(tfPassive));
-        env(offer(bob, XRP(100), USD1(1)), txflags(tfPassive));
+        env(offer(bob, XRP(100), bob["USD"](1)), Txflags(tfPassive));
+        env(offer(bob, XRP(100), usD1(1)), Txflags(tfPassive));
 
-        Json::Value bobj[4];
+        json::Value bobj[4];
         for (int i = 0; i < 4; ++i)
-            Json::Reader{}.parse(bob_account_objects[i], bobj[i]);
+            json::Reader{}.parse(gBobAccountObjects[i], bobj[i]);
 
         // test 'unstepped'
         // i.e. request account objects without explicit limit/marker paging
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
@@ -298,7 +298,7 @@ public:
         }
         // test request with type parameter as filter, unstepped
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = jss::state;
             auto resp = env.rpc("json", "account_objects", to_string(params));
@@ -315,7 +315,7 @@ public:
         }
         // test stepped one-at-a-time with limit=1, resume from prev marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 1;
             for (int i = 0; i < 4; ++i)
@@ -358,8 +358,8 @@ public:
         Account const gw2{"G2"};
         Account const bob{"bob"};
 
-        auto const USD1 = gw1["USD"];
-        auto const USD2 = gw2["USD"];
+        auto const usD1 = gw1["USD"];
+        auto const usD2 = gw2["USD"];
 
         env.fund(XRP(1000), gw1, gw2, bob);
         env.close();
@@ -367,7 +367,7 @@ public:
         // Check behavior if there are no account objects.
         {
             // Unpaged
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
@@ -381,14 +381,14 @@ public:
         }
 
         // Check behavior if there are only NFTokens.
-        env(token::mint(bob, 0u), txflags(tfTransferable));
+        env(token::mint(bob, 0u), Txflags(tfTransferable));
         env.close();
 
         // test 'unstepped'
         // i.e. request account objects without explicit limit/marker paging
-        Json::Value unpaged;
+        json::Value unpaged;
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
@@ -398,24 +398,24 @@ public:
         }
         // test request with type parameter as filter, unstepped
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = jss::nft_page;
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
-            Json::Value& aobjs = resp[jss::result][jss::account_objects];
+            json::Value& aobjs = resp[jss::result][jss::account_objects];
             BEAST_EXPECT(aobjs.size() == 1);
             BEAST_EXPECT(aobjs[0u][sfLedgerEntryType.jsonName] == jss::NFTokenPage);
             BEAST_EXPECT(aobjs[0u][sfNFTokens.jsonName].size() == 1);
         }
         // test stepped one-at-a-time with limit=1, resume from prev marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 1;
 
-            Json::Value resp = env.rpc("json", "account_objects", to_string(params));
-            Json::Value& aobjs = resp[jss::result][jss::account_objects];
+            json::Value resp = env.rpc("json", "account_objects", to_string(params));
+            json::Value& aobjs = resp[jss::result][jss::account_objects];
             BEAST_EXPECT(aobjs.size() == 1);
             auto& aobj = aobjs[0U];
             BEAST_EXPECT(!resp[jss::result].isMember(jss::limit));
@@ -425,19 +425,19 @@ public:
         }
 
         // Add more objects in addition to the NFToken Page.
-        env.trust(USD1(1000), bob);
-        env.trust(USD2(1000), bob);
+        env.trust(usD1(1000), bob);
+        env.trust(usD2(1000), bob);
 
-        env(pay(gw1, bob, USD1(1000)));
-        env(pay(gw2, bob, USD2(1000)));
+        env(pay(gw1, bob, usD1(1000)));
+        env(pay(gw2, bob, usD2(1000)));
 
-        env(offer(bob, XRP(100), bob["USD"](1)), txflags(tfPassive));
-        env(offer(bob, XRP(100), USD1(1)), txflags(tfPassive));
+        env(offer(bob, XRP(100), bob["USD"](1)), Txflags(tfPassive));
+        env(offer(bob, XRP(100), usD1(1)), Txflags(tfPassive));
         env.close();
 
         // test 'unstepped'
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
@@ -447,25 +447,25 @@ public:
         }
         // test request with type parameter as filter, unstepped
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = jss::nft_page;
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
-            Json::Value& aobjs = resp[jss::result][jss::account_objects];
+            json::Value& aobjs = resp[jss::result][jss::account_objects];
             BEAST_EXPECT(aobjs.size() == 1);
             BEAST_EXPECT(aobjs[0u][sfLedgerEntryType.jsonName] == jss::NFTokenPage);
             BEAST_EXPECT(aobjs[0u][sfNFTokens.jsonName].size() == 1);
         }
         // test stepped one-at-a-time with limit=1, resume from prev marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 1;
             for (int i = 0; i < 5; ++i)
             {
-                Json::Value resp = env.rpc("json", "account_objects", to_string(params));
-                Json::Value& aobjs = resp[jss::result][jss::account_objects];
+                json::Value resp = env.rpc("json", "account_objects", to_string(params));
+                json::Value& aobjs = resp[jss::result][jss::account_objects];
                 BEAST_EXPECT(aobjs.size() == 1);
                 auto& aobj = aobjs[0U];
                 if (i < 4)
@@ -488,12 +488,12 @@ public:
         // Make sure things still work if there is more than 1 NFT Page.
         for (int i = 0; i < 32; ++i)
         {
-            env(token::mint(bob, 0u), txflags(tfTransferable));
+            env(token::mint(bob, 0u), Txflags(tfTransferable));
             env.close();
         }
         // test 'unstepped'
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
@@ -503,23 +503,23 @@ public:
         }
         // test request with type parameter as filter, unstepped
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::type] = jss::nft_page;
             auto resp = env.rpc("json", "account_objects", to_string(params));
             BEAST_EXPECT(!resp.isMember(jss::marker));
-            Json::Value const& aobjs = resp[jss::result][jss::account_objects];
+            json::Value const& aobjs = resp[jss::result][jss::account_objects];
             BEAST_EXPECT(aobjs.size() == 2);
         }
         // test stepped one-at-a-time with limit=1, resume from prev marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 1;
             for (int i = 0; i < 6; ++i)
             {
-                Json::Value resp = env.rpc("json", "account_objects", to_string(params));
-                Json::Value& aobjs = resp[jss::result][jss::account_objects];
+                json::Value resp = env.rpc("json", "account_objects", to_string(params));
+                json::Value& aobjs = resp[jss::result][jss::account_objects];
                 BEAST_EXPECT(aobjs.size() == 1);
                 auto& aobj = aobjs[0U];
                 if (i < 5)
@@ -551,19 +551,19 @@ public:
 
         Account const alice{"alice"};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         auto const features =
-            testable_amendments() | featureXChainBridge | featurePermissionedDomains;
+            testableAmendments() | featureXChainBridge | featurePermissionedDomains;
         Env env(*this, features);
 
         // Make a lambda we can use to get "account_objects" easily.
         auto acctObjs = [&env](
                             AccountID const& acct,
-                            std::optional<Json::StaticString> const& type,
+                            std::optional<json::StaticString> const& type,
                             std::optional<std::uint16_t> limit = std::nullopt,
                             std::optional<std::string> marker = std::nullopt) {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = to_string(acct);
             if (type)
                 params[jss::type] = *type;
@@ -576,13 +576,13 @@ public:
         };
 
         // Make a lambda that easily identifies the size of account objects.
-        auto acctObjsIsSize = [](Json::Value const& resp, unsigned size) {
+        auto acctObjsIsSize = [](json::Value const& resp, unsigned size) {
             return resp[jss::result][jss::account_objects].isArray() &&
                 (resp[jss::result][jss::account_objects].size() == size);
         };
 
         // Make a lambda that checks if the response has error for invalid type
-        auto acctObjsTypeIsInvalid = [](Json::Value const& resp) {
+        auto acctObjsTypeIsInvalid = [](json::Value const& resp) {
             return resp[jss::result].isMember(jss::error) &&
                 resp[jss::result][jss::error_message] == "Invalid field \'type\'.";
         };
@@ -615,11 +615,11 @@ public:
 
         // gw mints an NFT so we can find it.
         uint256 const nftID{token::getNextID(env, gw, 0u, tfTransferable)};
-        env(token::mint(gw, 0u), txflags(tfTransferable));
+        env(token::mint(gw, 0u), Txflags(tfTransferable));
         env.close();
         {
             // Find the NFToken page and make sure it's the right one.
-            Json::Value const resp = acctObjs(gw, jss::nft_page);
+            json::Value const resp = acctObjs(gw, jss::nft_page);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& nftPage = resp[jss::result][jss::account_objects][0u];
@@ -630,13 +630,13 @@ public:
         }
 
         // Set up a trust line so we can find it.
-        env.trust(USD(1000), alice);
+        env.trust(usd(1000), alice);
         env.close();
-        env(pay(gw, alice, USD(5)));
+        env(pay(gw, alice, usd(5)));
         env.close();
         {
             // Find the trustline and make sure it's the right one.
-            Json::Value const resp = acctObjs(gw, jss::state);
+            json::Value const resp = acctObjs(gw, jss::state);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& state = resp[jss::result][jss::account_objects][0u];
@@ -644,11 +644,11 @@ public:
             BEAST_EXPECT(state[sfHighLimit.jsonName][jss::value].asUInt() == 1000);
         }
         // gw writes a check for USD(10) to alice.
-        env(check::create(gw, alice, USD(10)));
+        env(check::create(gw, alice, usd(10)));
         env.close();
         {
             // Find the check.
-            Json::Value const resp = acctObjs(gw, jss::check);
+            json::Value const resp = acctObjs(gw, jss::check);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& check = resp[jss::result][jss::account_objects][0u];
@@ -661,7 +661,7 @@ public:
         env.close();
         {
             // Find the pre-authorization.
-            Json::Value const resp = acctObjs(gw, jss::deposit_preauth);
+            json::Value const resp = acctObjs(gw, jss::deposit_preauth);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& preauth = resp[jss::result][jss::account_objects][0u];
@@ -670,18 +670,18 @@ public:
         }
         {
             // gw creates an escrow that we can look for in the ledger.
-            Json::Value jvEscrow;
+            json::Value jvEscrow;
             jvEscrow[jss::TransactionType] = jss::EscrowCreate;
             jvEscrow[jss::Account] = gw.human();
             jvEscrow[jss::Destination] = gw.human();
-            jvEscrow[jss::Amount] = XRP(100).value().getJson(JsonOptions::none);
+            jvEscrow[jss::Amount] = XRP(100).value().getJson(JsonOptions::KNone);
             jvEscrow[sfFinishAfter.jsonName] = env.now().time_since_epoch().count() + 1;
             env(jvEscrow);
             env.close();
         }
         {
             // Find the escrow.
-            Json::Value const resp = acctObjs(gw, jss::escrow);
+            json::Value const resp = acctObjs(gw, jss::escrow);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& escrow = resp[jss::result][jss::account_objects][0u];
@@ -700,7 +700,7 @@ public:
             env.close();
 
             // Find the PermissionedDomain.
-            Json::Value const resp = acctObjs(gw, jss::permissioned_domain);
+            json::Value const resp = acctObjs(gw, jss::permissioned_domain);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& permissionedDomain = resp[jss::result][jss::account_objects][0u];
@@ -733,25 +733,25 @@ public:
             x.createScBridgeObjects(scEnv);
 
             auto scEnvAcctObjs = [&](Account const& acct, char const* type) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = acct.human();
                 params[jss::type] = type;
                 params[jss::ledger_index] = "validated";
                 return scEnv.rpc("json", "account_objects", to_string(params));
             };
 
-            Json::Value const resp = scEnvAcctObjs(Account::master, jss::bridge);
+            json::Value const resp = scEnvAcctObjs(Account::kMASTER, jss::bridge);
 
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
-            auto const& acct_bridge = resp[jss::result][jss::account_objects][0u];
-            BEAST_EXPECT(acct_bridge[sfAccount.jsonName] == Account::master.human());
-            BEAST_EXPECT(acct_bridge[sfLedgerEntryType.getJsonName()] == "Bridge");
-            BEAST_EXPECT(acct_bridge[sfXChainClaimID.getJsonName()].asUInt() == 0);
-            BEAST_EXPECT(acct_bridge[sfXChainAccountClaimCount.getJsonName()].asUInt() == 0);
-            BEAST_EXPECT(acct_bridge[sfXChainAccountCreateCount.getJsonName()].asUInt() == 0);
-            BEAST_EXPECT(acct_bridge[sfMinAccountCreateAmount.getJsonName()].asUInt() == 20000000);
-            BEAST_EXPECT(acct_bridge[sfSignatureReward.getJsonName()].asUInt() == 1000000);
-            BEAST_EXPECT(acct_bridge[sfXChainBridge.getJsonName()] == x.jvb);
+            auto const& acctBridge = resp[jss::result][jss::account_objects][0u];
+            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);
+            BEAST_EXPECT(acctBridge[sfXChainAccountCreateCount.getJsonName()].asUInt() == 0);
+            BEAST_EXPECT(acctBridge[sfMinAccountCreateAmount.getJsonName()].asUInt() == 20000000);
+            BEAST_EXPECT(acctBridge[sfSignatureReward.getJsonName()].asUInt() == 1000000);
+            BEAST_EXPECT(acctBridge[sfXChainBridge.getJsonName()] == x.jvb);
         }
         {
             // Alice and Bob create a xchain sequence number that we can look
@@ -760,13 +760,13 @@ public:
             Env scEnv(*this, envconfig(), features);
             x.createScBridgeObjects(scEnv);
 
-            scEnv(xchain_create_claim_id(x.scAlice, x.jvb, x.reward, x.mcAlice));
+            scEnv(xchainCreateClaimId(x.scAlice, x.jvb, x.reward, x.mcAlice));
             scEnv.close();
-            scEnv(xchain_create_claim_id(x.scBob, x.jvb, x.reward, x.mcBob));
+            scEnv(xchainCreateClaimId(x.scBob, x.jvb, x.reward, x.mcBob));
             scEnv.close();
 
             auto scEnvAcctObjs = [&](Account const& acct, char const* type) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = acct.human();
                 params[jss::type] = type;
                 params[jss::ledger_index] = "validated";
@@ -775,21 +775,21 @@ public:
 
             {
                 // Find the xchain sequence number for Andrea.
-                Json::Value const resp = scEnvAcctObjs(x.scAlice, jss::xchain_owned_claim_id);
+                json::Value const resp = scEnvAcctObjs(x.scAlice, jss::xchain_owned_claim_id);
                 BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
-                auto const& xchain_seq = resp[jss::result][jss::account_objects][0u];
-                BEAST_EXPECT(xchain_seq[sfAccount.jsonName] == x.scAlice.human());
-                BEAST_EXPECT(xchain_seq[sfXChainClaimID.getJsonName()].asUInt() == 1);
+                auto const& xchainSeq = resp[jss::result][jss::account_objects][0u];
+                BEAST_EXPECT(xchainSeq[sfAccount.jsonName] == x.scAlice.human());
+                BEAST_EXPECT(xchainSeq[sfXChainClaimID.getJsonName()].asUInt() == 1);
             }
             {
                 // and the one for Bob
-                Json::Value const resp = scEnvAcctObjs(x.scBob, jss::xchain_owned_claim_id);
+                json::Value const resp = scEnvAcctObjs(x.scBob, jss::xchain_owned_claim_id);
                 BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
-                auto const& xchain_seq = resp[jss::result][jss::account_objects][0u];
-                BEAST_EXPECT(xchain_seq[sfAccount.jsonName] == x.scBob.human());
-                BEAST_EXPECT(xchain_seq[sfXChainClaimID.getJsonName()].asUInt() == 2);
+                auto const& xchainSeq = resp[jss::result][jss::account_objects][0u];
+                BEAST_EXPECT(xchainSeq[sfAccount.jsonName] == x.scBob.human());
+                BEAST_EXPECT(xchainSeq[sfXChainClaimID.getJsonName()].asUInt() == 2);
             }
         }
         {
@@ -799,11 +799,11 @@ public:
             auto const amt = XRP(1000);
 
             // send first batch of account create attestations, so the
-            // xchain_create_account_claim_id should be present on the door
-            // account (Account::master) to collect the signatures until a
+            // xchain_create_account_claim_id_ should be present on the door
+            // account (Account::kMASTER) to collect the signatures until a
             // quorum is reached
             scEnv(
-                test::jtx::create_account_attestation(
+                test::jtx::createAccountAttestation(
                     x.scAttester,
                     x.jvb,
                     x.mcCarol,
@@ -817,7 +817,7 @@ public:
             scEnv.close();
 
             auto scEnvAcctObjs = [&](Account const& acct, char const* type) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = acct.human();
                 params[jss::type] = type;
                 params[jss::ledger_index] = "validated";
@@ -825,27 +825,27 @@ public:
             };
 
             {
-                // Find the xchain_create_account_claim_id
-                Json::Value const resp =
-                    scEnvAcctObjs(Account::master, jss::xchain_owned_create_account_claim_id);
+                // Find the xchain_create_account_claim_id_
+                json::Value const resp =
+                    scEnvAcctObjs(Account::kMASTER, jss::xchain_owned_create_account_claim_id);
                 BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
-                auto const& xchain_create_account_claim_id =
+                auto const& xchainCreateAccountClaimId =
                     resp[jss::result][jss::account_objects][0u];
                 BEAST_EXPECT(
-                    xchain_create_account_claim_id[sfAccount.jsonName] == Account::master.human());
+                    xchainCreateAccountClaimId[sfAccount.jsonName] == Account::kMASTER.human());
                 BEAST_EXPECT(
-                    xchain_create_account_claim_id[sfXChainAccountCreateCount.getJsonName()]
-                        .asUInt() == 1);
+                    xchainCreateAccountClaimId[sfXChainAccountCreateCount.getJsonName()].asUInt() ==
+                    1);
             }
         }
 
         // gw creates an offer that we can look for in the ledger.
-        env(offer(gw, USD(7), XRP(14)));
+        env(offer(gw, usd(7), XRP(14)));
         env.close();
         {
             // Find the offer.
-            Json::Value const resp = acctObjs(gw, jss::offer);
+            json::Value const resp = acctObjs(gw, jss::offer);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& offer = resp[jss::result][jss::account_objects][0u];
@@ -856,11 +856,11 @@ public:
         {
             // Create a payment channel from qw to alice that we can look
             // for.
-            Json::Value jvPayChan;
+            json::Value jvPayChan;
             jvPayChan[jss::TransactionType] = jss::PaymentChannelCreate;
             jvPayChan[jss::Account] = gw.human();
             jvPayChan[jss::Destination] = alice.human();
-            jvPayChan[jss::Amount] = XRP(300).value().getJson(JsonOptions::none);
+            jvPayChan[jss::Amount] = XRP(300).value().getJson(JsonOptions::KNone);
             jvPayChan[sfSettleDelay.jsonName] = 24 * 60 * 60;
             jvPayChan[sfPublicKey.jsonName] = strHex(gw.pk().slice());
             env(jvPayChan);
@@ -868,7 +868,7 @@ public:
         }
         {
             // Find the payment channel.
-            Json::Value const resp = acctObjs(gw, jss::payment_channel);
+            json::Value const resp = acctObjs(gw, jss::payment_channel);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& payChan = resp[jss::result][jss::account_objects][0u];
@@ -879,7 +879,7 @@ public:
 
         {
             // gw creates a DID that we can look for in the ledger.
-            Json::Value jvDID;
+            json::Value jvDID;
             jvDID[jss::TransactionType] = jss::DIDSet;
             jvDID[jss::Account] = gw.human();
             jvDID[sfURI.jsonName] = strHex(std::string{"uri"});
@@ -888,7 +888,7 @@ public:
         }
         {
             // Find the DID.
-            Json::Value const resp = acctObjs(gw, jss::did);
+            json::Value const resp = acctObjs(gw, jss::did);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& did = resp[jss::result][jss::account_objects][0u];
@@ -900,7 +900,7 @@ public:
         env.close();
         {
             // Find the signer list.
-            Json::Value const resp = acctObjs(gw, jss::signer_list);
+            json::Value const resp = acctObjs(gw, jss::signer_list);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& signerList = resp[jss::result][jss::account_objects][0u];
@@ -917,7 +917,7 @@ public:
             env.close();
 
             // Find the ticket.
-            Json::Value const resp = acctObjs(gw, jss::ticket);
+            json::Value const resp = acctObjs(gw, jss::ticket);
             BEAST_EXPECT(acctObjsIsSize(resp, 1));
 
             auto const& ticket = resp[jss::result][jss::account_objects][0u];
@@ -928,19 +928,19 @@ public:
 
         {
             // See how "deletion_blockers_only" handles gw's directory.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = gw.human();
             params[jss::deletion_blockers_only] = true;
             auto resp = env.rpc("json", "account_objects", to_string(params));
 
             std::vector<std::string> const expectedLedgerTypes = [] {
                 std::vector<std::string> v{
-                    jss::Escrow.c_str(),
-                    jss::Check.c_str(),
-                    jss::NFTokenPage.c_str(),
-                    jss::RippleState.c_str(),
-                    jss::PayChannel.c_str(),
-                    jss::PermissionedDomain.c_str()};
+                    jss::Escrow.cStr(),
+                    jss::Check.cStr(),
+                    jss::NFTokenPage.cStr(),
+                    jss::RippleState.cStr(),
+                    jss::PayChannel.cStr(),
+                    jss::PermissionedDomain.cStr()};
                 std::ranges::sort(v);
                 return v;
             }();
@@ -964,7 +964,7 @@ public:
         {
             // See how "deletion_blockers_only" with `type` handles gw's
             // directory.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = gw.human();
             params[jss::deletion_blockers_only] = true;
             params[jss::type] = jss::escrow;
@@ -978,7 +978,7 @@ public:
         }
         {
             // Make a lambda to get the types
-            auto getTypes = [&](Json::Value const& resp, std::vector<std::string>& typesOut) {
+            auto getTypes = [&](json::Value const& resp, std::vector<std::string>& typesOut) {
                 auto const objs = resp[jss::result][jss::account_objects];
                 for (auto const& obj : resp[jss::result][jss::account_objects])
                     typesOut.push_back(obj[sfLedgerEntryType.fieldName].asString());
@@ -986,7 +986,7 @@ public:
             };
             // Make a lambda we can use to check the number of fetched
             // account objects and their ledger type
-            auto expectObjects = [&](Json::Value const& resp,
+            auto expectObjects = [&](json::Value const& resp,
                                      std::vector<std::string> const& types) -> bool {
                 if (!acctObjsIsSize(resp, types.size()))
                     return false;
@@ -995,8 +995,8 @@ public:
                 return types == typesOut;
             };
             // Find AMM objects
-            AMM amm(env, gw, XRP(1'000), USD(1'000));
-            amm.deposit(alice, USD(1));
+            AMM amm(env, gw, XRP(1'000), usd(1'000));
+            amm.deposit(alice, usd(1));
             // AMM account has 4 objects: AMM object and 3 trustlines
             auto const lines = getAccountLines(env, amm.ammAccount());
             BEAST_EXPECT(lines[jss::lines].size() == 3);
@@ -1013,15 +1013,14 @@ public:
             BEAST_EXPECT(
                 (typesOut ==
                  std::vector<std::string>{
-                     jss::AMM.c_str(),
-                     jss::RippleState.c_str(),
-                     jss::RippleState.c_str(),
-                     jss::RippleState.c_str()}));
+                     jss::AMM.cStr(),
+                     jss::RippleState.cStr(),
+                     jss::RippleState.cStr(),
+                     jss::RippleState.cStr()}));
             // filter by state: there are three trustlines
             resp = acctObjs(amm.ammAccount(), jss::state, 10);
             BEAST_EXPECT(expectObjects(
-                resp,
-                {jss::RippleState.c_str(), jss::RippleState.c_str(), jss::RippleState.c_str()}));
+                resp, {jss::RippleState.cStr(), jss::RippleState.cStr(), jss::RippleState.cStr()}));
             // AMM account doesn't own offers
             BEAST_EXPECT(acctObjsIsSize(acctObjs(amm.ammAccount(), jss::offer), 0));
             // gw account doesn't own AMM object
@@ -1039,7 +1038,7 @@ public:
         // directory nodes.
         for (int d = 1'000'032; d >= 1'000'000; --d)
         {
-            env(offer(gw, USD(1), drops(d)));
+            env(offer(gw, usd(1), drops(d)));
             env.close();
         }
 
@@ -1062,8 +1061,8 @@ public:
         Account const bob{"bob"};
         env.fund(XRP(10000), bob);
 
-        static constexpr unsigned nftsSize = 10;
-        for (unsigned i = 0; i < nftsSize; i++)
+        static constexpr unsigned kNFTS_SIZE = 10;
+        for (unsigned i = 0; i < kNFTS_SIZE; i++)
         {
             env(token::mint(bob, 0));
         }
@@ -1071,14 +1070,14 @@ public:
         env.close();
 
         // save the NFTokenIDs to use later
-        std::vector<Json::Value> tokenIDs;
+        std::vector<json::Value> tokenIDs;
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::ledger_index] = "validated";
-            Json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
-            Json::Value const& nfts = resp[jss::result][jss::account_nfts];
-            for (Json::Value const& nft : nfts)
+            json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
+            json::Value const& nfts = resp[jss::result][jss::account_nfts];
+            for (json::Value const& nft : nfts)
                 tokenIDs.push_back(nft["NFTokenID"]);
         }
 
@@ -1086,17 +1085,17 @@ public:
         // returns the correct token information. lastIndex is used to query the
         // last marker.
         auto compareNFTs = [&tokenIDs, &env, &bob](unsigned const limit, unsigned const lastIndex) {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::marker] = tokenIDs[lastIndex];
             params[jss::ledger_index] = "validated";
-            Json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
+            json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
 
             if (resp[jss::result].isMember(jss::error))
                 return false;
 
-            Json::Value const& nfts = resp[jss::result][jss::account_nfts];
+            json::Value const& nfts = resp[jss::result][jss::account_nfts];
             unsigned const nftsCount =
                 tokenIDs.size() - lastIndex - 1 < limit ? tokenIDs.size() - lastIndex - 1 : limit;
 
@@ -1120,12 +1119,12 @@ public:
 
         // lambda that holds common code for invalid cases.
         auto testInvalidMarker = [&env, &bob](auto marker, char const* errorMessage) {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = 4;
             params[jss::ledger_index] = jss::validated;
             params[jss::marker] = marker;
-            Json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
+            json::Value const resp = env.rpc("json", "account_nfts", to_string(params));
             return resp[jss::result][jss::error_message] == errorMessage;
         };
 
@@ -1171,7 +1170,7 @@ public:
         // test validation
         {
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_nfts", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -1181,9 +1180,9 @@ public:
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
     }
 
@@ -1210,11 +1209,11 @@ public:
         env.close();
 
         unsigned const limit = 11;
-        Json::Value marker;
+        json::Value marker;
 
         // test account_objects with a limit and update marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::ledger_index] = "validated";
@@ -1227,7 +1226,7 @@ public:
 
         // test account_objects with valid marker and update marker
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::marker] = marker;
@@ -1241,12 +1240,12 @@ public:
 
         // this lambda function is used to check invalid marker response.
         auto testInvalidMarker = [&](std::string& marker) {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::ledger_index] = jss::validated;
             params[jss::marker] = marker;
-            Json::Value const resp = env.rpc("json", "account_objects", to_string(params));
+            json::Value const resp = env.rpc("json", "account_objects", to_string(params));
             return resp[jss::result][jss::error_message] == "Invalid field \'marker\'.";
         };
 
@@ -1297,7 +1296,7 @@ public:
         // dir.
         {
             std::string const s = "0," + entryIndex;
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::marker] = s;
@@ -1325,7 +1324,7 @@ public:
         // continue getting account_objects with valid marker. This will be the
         // last page, so response will not contain any marker.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = bob.human();
             params[jss::limit] = limit;
             params[jss::marker] = marker;
@@ -1340,7 +1339,7 @@ public:
         // test account_objects when the account only have nft pages, but
         // provided invalid entry index.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = carol.human();
             params[jss::limit] = 10;
             params[jss::marker] = "0," + entryIndex;
diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp
index 8c93b15c4a..8236439a37 100644
--- a/src/test/rpc/AccountOffers_test.cpp
+++ b/src/test/rpc/AccountOffers_test.cpp
@@ -16,12 +16,12 @@
 
 namespace xrpl::test {
 
-class AccountOffers_test : public beast::unit_test::suite
+class AccountOffers_test : public beast::unit_test::Suite
 {
 public:
     // test helper
     static bool
-    checkMarker(Json::Value const& val)
+    checkMarker(json::Value const& val)
     {
         return val.isMember(jss::marker) && val[jss::marker].isString() &&
             !val[jss::marker].asString().empty();
@@ -33,43 +33,42 @@ public:
         testcase("Non-Admin Min Limit");
 
         using namespace jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
         Account const gw("G1");
-        auto const USD_gw = gw["USD"];
+        auto const usdGw = gw["USD"];
         Account const bob("bob");
-        auto const USD_bob = bob["USD"];
+        auto const usdBob = bob["USD"];
 
         env.fund(XRP(10000), gw, bob);
-        env.trust(USD_gw(1000), bob);
+        env.trust(usdGw(1000), bob);
 
         // this is to provide some USD from gw in the
         // bob account so that it can rightly
         // make offers that give those USDs
-        env(pay(gw, bob, USD_gw(10)));
-        unsigned const offer_count = 12u;
-        for (auto i = 0u; i < offer_count; i++)
+        env(pay(gw, bob, usdGw(10)));
+        unsigned const offerCount = 12u;
+        for (auto i = 0u; i < offerCount; i++)
         {
-            Json::Value jvo = offer(bob, XRP(100 + i), USD_gw(1));
+            json::Value jvo = offer(bob, XRP(100 + i), usdGw(1));
             jvo[sfExpiration.fieldName] = 10000000u;
             env(jvo);
         }
 
         // make non-limited RPC call
-        auto const jro_nl = env.rpc("account_offers", bob.human())[jss::result][jss::offers];
-        BEAST_EXPECT(checkArraySize(jro_nl, offer_count));
+        auto const jroNl = env.rpc("account_offers", bob.human())[jss::result][jss::offers];
+        BEAST_EXPECT(checkArraySize(jroNl, offerCount));
 
         // now make a low-limit query, should get "corrected"
         // to a min of 10 results with a marker set since there
         // are more than 10 total
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::account] = bob.human();
         jvParams[jss::limit] = 1u;
-        auto const jrr_l =
-            env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
-        auto const& jro_l = jrr_l[jss::offers];
-        BEAST_EXPECT(checkMarker(jrr_l));
+        auto const jrrL = env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
+        auto const& jroL = jrrL[jss::offers];
+        BEAST_EXPECT(checkMarker(jrrL));
         // 9u is the expected size, since one account object is a trustline
-        BEAST_EXPECT(checkArraySize(jro_l, 9u));
+        BEAST_EXPECT(checkArraySize(jroL, 9u));
     }
 
     void
@@ -78,23 +77,23 @@ public:
         testcase(std::string("Sequential - ") + (asAdmin ? "admin" : "non-admin"));
 
         using namespace jtx;
-        Env env{*this, asAdmin ? envconfig() : envconfig(no_admin)};
+        Env env{*this, asAdmin ? envconfig() : envconfig(noAdmin)};
         Account const gw("G1");
-        auto const USD_gw = gw["USD"];
+        auto const usdGw = gw["USD"];
         Account const bob("bob");
-        auto const USD_bob = bob["USD"];
+        auto const usdBob = bob["USD"];
 
         env.fund(XRP(10000), gw, bob);
-        env.trust(USD_gw(1000), bob);
+        env.trust(usdGw(1000), bob);
 
         // this is to provide some USD from gw in the
         // bob account so that it can rightly
         // make offers that give those USDs
-        env(pay(gw, bob, USD_gw(10)));
+        env(pay(gw, bob, usdGw(10)));
 
-        env(offer(bob, XRP(100), USD_bob(1)));
-        env(offer(bob, XRP(200), USD_gw(2)));
-        env(offer(bob, XRP(30), USD_gw(6)));
+        env(offer(bob, XRP(100), usdBob(1)));
+        env(offer(bob, XRP(200), usdGw(2)));
+        env(offer(bob, XRP(30), usdGw(6)));
 
         // make the RPC call
         auto const jroOuter = env.rpc("account_offers", bob.human())[jss::result][jss::offers];
@@ -125,50 +124,50 @@ public:
 
         {
             // now make a limit (= 1) query for the same data
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::limit] = 1u;
-            auto const jrr_l_1 =
+            auto const jrrL1 =
                 env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
-            auto const& jro_l_1 = jrr_l_1[jss::offers];
+            auto const& jroL1 = jrrL1[jss::offers];
             // there is a difference in the validation of the limit param
             // between admin and non-admin requests. with admin requests, the
             // limit parameter is NOT subject to sane defaults, but with a
             // non-admin there are pre-configured limit ranges applied. That's
             // why we have different BEAST_EXPECT()s here for the two scenarios
-            BEAST_EXPECT(checkArraySize(jro_l_1, asAdmin ? 1u : 3u));
-            BEAST_EXPECT(asAdmin ? checkMarker(jrr_l_1) : (!jrr_l_1.isMember(jss::marker)));
+            BEAST_EXPECT(checkArraySize(jroL1, asAdmin ? 1u : 3u));
+            BEAST_EXPECT(asAdmin ? checkMarker(jrrL1) : (!jrrL1.isMember(jss::marker)));
             if (asAdmin)
             {
-                BEAST_EXPECT(jroOuter[0u] == jro_l_1[0u]);
+                BEAST_EXPECT(jroOuter[0u] == jroL1[0u]);
 
                 // second item...with previous marker passed
-                jvParams[jss::marker] = jrr_l_1[jss::marker];
-                auto const jrr_l_2 =
+                jvParams[jss::marker] = jrrL1[jss::marker];
+                auto const jrrL2 =
                     env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
-                auto const& jro_l_2 = jrr_l_2[jss::offers];
-                BEAST_EXPECT(checkMarker(jrr_l_2));
-                BEAST_EXPECT(checkArraySize(jro_l_2, 1u));
-                BEAST_EXPECT(jroOuter[1u] == jro_l_2[0u]);
+                auto const& jroL2 = jrrL2[jss::offers];
+                BEAST_EXPECT(checkMarker(jrrL2));
+                BEAST_EXPECT(checkArraySize(jroL2, 1u));
+                BEAST_EXPECT(jroOuter[1u] == jroL2[0u]);
 
                 // last item...with previous marker passed
-                jvParams[jss::marker] = jrr_l_2[jss::marker];
+                jvParams[jss::marker] = jrrL2[jss::marker];
                 jvParams[jss::limit] = 10u;
-                auto const jrr_l_3 =
+                auto const jrrL3 =
                     env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
-                auto const& jro_l_3 = jrr_l_3[jss::offers];
-                BEAST_EXPECT(!jrr_l_3.isMember(jss::marker));
-                BEAST_EXPECT(checkArraySize(jro_l_3, 1u));
-                BEAST_EXPECT(jroOuter[2u] == jro_l_3[0u]);
+                auto const& jroL3 = jrrL3[jss::offers];
+                BEAST_EXPECT(!jrrL3.isMember(jss::marker));
+                BEAST_EXPECT(checkArraySize(jroL3, 1u));
+                BEAST_EXPECT(jroOuter[2u] == jroL3[0u]);
             }
             else
             {
-                BEAST_EXPECT(jroOuter == jro_l_1);
+                BEAST_EXPECT(jroOuter == jroL1);
             }
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::limit] = 0u;
             auto const jrr =
@@ -185,12 +184,12 @@ public:
         using namespace jtx;
         Env env(*this);
         Account const gw("G1");
-        auto const USD_gw = gw["USD"];
+        auto const usdGw = gw["USD"];
         Account const bob("bob");
-        auto const USD_bob = bob["USD"];
+        auto const usdBob = bob["USD"];
 
         env.fund(XRP(10000), gw, bob);
-        env.trust(USD_gw(1000), bob);
+        env.trust(usdGw(1000), bob);
 
         {
             // no account field
@@ -203,7 +202,7 @@ public:
         {
             // test account non-string
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_offers", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -213,14 +212,14 @@ public:
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
 
         {
             // empty string account
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = "";
             auto const jrr =
                 env.rpc("json", "account_offers", jvParams.toStyledString())[jss::result];
@@ -239,7 +238,7 @@ public:
 
         {
             // bad limit
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::limit] = "0";  // NOT an integer
             auto const jrr =
@@ -251,7 +250,7 @@ public:
 
         {
             // invalid marker
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::marker] = "NOT_A_MARKER";
             auto const jrr =
@@ -264,7 +263,7 @@ public:
 
         {
             // invalid marker - not a string
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::marker] = 1;
             auto const jrr =
@@ -276,7 +275,7 @@ public:
 
         {
             // ask for a bad ledger index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = bob.human();
             jvParams[jss::ledger_index] = 10u;
             auto const jrr =
diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp
index 60ad83934a..4de0928555 100644
--- a/src/test/rpc/AccountTx_test.cpp
+++ b/src/test/rpc/AccountTx_test.cpp
@@ -50,21 +50,21 @@
 
 namespace xrpl::test {
 
-class AccountTx_test : public beast::unit_test::suite
+class AccountTx_test : public beast::unit_test::Suite
 {
     // A data structure used to describe the basic structure of a
     // transactions array node as returned by the account_tx RPC command.
     struct NodeSanity
     {
         int const index;
-        Json::StaticString const& txType;
+        json::StaticString const& txType;
         boost::container::flat_set<std::string> created;
         boost::container::flat_set<std::string> deleted;
         boost::container::flat_set<std::string> modified;
 
         NodeSanity(
             int idx,
-            Json::StaticString const& t,
+            json::StaticString const& t,
             std::initializer_list<char const*> c,
             std::initializer_list<char const*> d,
             std::initializer_list<char const*> m)
@@ -86,7 +86,7 @@ class AccountTx_test : public beast::unit_test::suite
 
     // A helper method tests can use to validate returned JSON vs NodeSanity.
     void
-    checkSanity(Json::Value const& txNode, NodeSanity const& sane)
+    checkSanity(json::Value const& txNode, NodeSanity const& sane)
     {
         BEAST_EXPECT(txNode[jss::validated].asBool() == true);
         BEAST_EXPECT(txNode[jss::tx][sfTransactionType.jsonName].asString() == sane.txType);
@@ -96,7 +96,7 @@ class AccountTx_test : public beast::unit_test::suite
         boost::container::flat_set<std::string> deletedNodes;
         boost::container::flat_set<std::string> modifiedNodes;
 
-        for (Json::Value const& metaNode : txNode[jss::meta][sfAffectedNodes.jsonName])
+        for (json::Value const& metaNode : txNode[jss::meta][sfAffectedNodes.jsonName])
         {
             if (metaNode.isMember(sfCreatedNode.jsonName))
             {
@@ -134,14 +134,14 @@ class AccountTx_test : public beast::unit_test::suite
             cfg->FEES.reference_fee = 10;
             return cfg;
         }));
-        Account const A1{"A1"};
-        env.fund(XRP(10000), A1);
+        Account const a1{"A1"};
+        env.fund(XRP(10000), a1);
         env.close();
 
         // Ledger 3 has the two txs associated with funding the account
         // All other ledgers have no txs
 
-        auto hasTxs = [apiVersion](Json::Value const& j) {
+        auto hasTxs = [apiVersion](json::Value const& j) {
             switch (apiVersion)
             {
                 case 1:
@@ -189,31 +189,31 @@ class AccountTx_test : public beast::unit_test::suite
             }
         };
 
-        auto noTxs = [](Json::Value const& j) {
+        auto noTxs = [](json::Value const& j) {
             return j.isMember(jss::result) && (j[jss::result][jss::status] == "success") &&
                 (j[jss::result][jss::transactions].size() == 0);
         };
 
-        auto isErr = [](Json::Value const& j, error_code_i code) {
+        auto isErr = [](json::Value const& j, ErrorCodeI code) {
             return j.isMember(jss::result) && j[jss::result].isMember(jss::error) &&
-                j[jss::result][jss::error] == RPC::get_error_info(code).token;
+                j[jss::result][jss::error] == RPC::getErrorInfo(code).token;
         };
 
-        Json::Value jParams;
+        json::Value jParams;
         jParams[jss::api_version] = apiVersion;
 
-        BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(jParams)), rpcINVALID_PARAMS));
+        BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(jParams)), RpcInvalidParams));
 
         jParams[jss::account] = "0xDEADBEEF";
 
-        BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(jParams)), rpcACT_MALFORMED));
+        BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(jParams)), RpcActMalformed));
 
-        jParams[jss::account] = A1.human();
+        jParams[jss::account] = a1.human();
         BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(jParams))));
 
         // Ledger min/max index
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
             p[jss::ledger_index_min] = -1;
             p[jss::ledger_index_max] = -1;
             BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(p))));
@@ -227,7 +227,7 @@ class AccountTx_test : public beast::unit_test::suite
             else
             {
                 BEAST_EXPECT(
-                    isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_IDX_MALFORMED));
+                    isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrIdxMalformed));
             }
 
             p[jss::ledger_index_min] = 1;
@@ -239,18 +239,18 @@ class AccountTx_test : public beast::unit_test::suite
             else
             {
                 BEAST_EXPECT(
-                    isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_IDX_MALFORMED));
+                    isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrIdxMalformed));
             }
 
             p[jss::ledger_index_min] = 2;
             p[jss::ledger_index_max] = 1;
             BEAST_EXPECT(isErr(
                 env.rpc("json", "account_tx", to_string(p)),
-                (apiVersion == 1 ? rpcLGR_IDXS_INVALID : rpcINVALID_LGR_RANGE)));
+                (apiVersion == 1 ? RpcLgrIdxsInvalid : RpcInvalidLgrRange)));
         }
         // Ledger index min only
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
             p[jss::ledger_index_min] = -1;
             BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(p))));
 
@@ -262,18 +262,18 @@ class AccountTx_test : public beast::unit_test::suite
             else
             {
                 BEAST_EXPECT(
-                    isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_IDX_MALFORMED));
+                    isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrIdxMalformed));
             }
 
             p[jss::ledger_index_min] = env.current()->header().seq;
             BEAST_EXPECT(isErr(
                 env.rpc("json", "account_tx", to_string(p)),
-                (apiVersion == 1 ? rpcLGR_IDXS_INVALID : rpcINVALID_LGR_RANGE)));
+                (apiVersion == 1 ? RpcLgrIdxsInvalid : RpcInvalidLgrRange)));
         }
 
         // Ledger index max only
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
             p[jss::ledger_index_max] = -1;
             BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(p))));
 
@@ -285,7 +285,7 @@ class AccountTx_test : public beast::unit_test::suite
             else
             {
                 BEAST_EXPECT(
-                    isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_IDX_MALFORMED));
+                    isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrIdxMalformed));
             }
 
             p[jss::ledger_index_max] = 3;
@@ -300,7 +300,7 @@ class AccountTx_test : public beast::unit_test::suite
 
         // Ledger Sequence
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
 
             p[jss::ledger_index] = env.closed()->header().seq;
             BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(p))));
@@ -309,15 +309,15 @@ class AccountTx_test : public beast::unit_test::suite
             BEAST_EXPECT(noTxs(env.rpc("json", "account_tx", to_string(p))));
 
             p[jss::ledger_index] = env.current()->header().seq;
-            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_NOT_VALIDATED));
+            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrNotValidated));
 
             p[jss::ledger_index] = env.current()->header().seq + 1;
-            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_NOT_FOUND));
+            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrNotFound));
         }
 
         // Ledger Hash
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
 
             p[jss::ledger_hash] = to_string(env.closed()->header().hash);
             BEAST_EXPECT(hasTxs(env.rpc(apiVersion, "json", "account_tx", to_string(p))));
@@ -330,8 +330,8 @@ class AccountTx_test : public beast::unit_test::suite
         // ERRORS out with invalid Parenthesis
         {
             jParams[jss::account] = "0xDEADBEEF";
-            jParams[jss::account] = A1.human();
-            Json::Value p{jParams};
+            jParams[jss::account] = a1.human();
+            json::Value p{jParams};
 
             p[jss::ledger_index_max] = -1;
             p[jss::ledger_index_min] = -1;
@@ -343,13 +343,13 @@ class AccountTx_test : public beast::unit_test::suite
             }
             else
             {
-                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcINVALID_PARAMS));
+                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcInvalidParams));
             }
         }
 
         // Ledger index max only
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
             p[jss::ledger_index_max] = env.current()->header().seq;
             if (apiVersion < 2u)
             {
@@ -358,13 +358,13 @@ class AccountTx_test : public beast::unit_test::suite
             else
             {
                 BEAST_EXPECT(
-                    isErr(env.rpc("json", "account_tx", to_string(p)), rpcLGR_IDX_MALFORMED));
+                    isErr(env.rpc("json", "account_tx", to_string(p)), RpcLgrIdxMalformed));
             }
         }
         // test account non-string
         {
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 auto jrr = env.rpc("json", "account_tx", to_string(params))[jss::result];
                 BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -374,26 +374,26 @@ class AccountTx_test : public beast::unit_test::suite
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
         // test binary and forward for bool/non bool values
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
             p[jss::binary] = "asdf";
             if (apiVersion < 2u)
             {
-                Json::Value result{env.rpc("json", "account_tx", to_string(p))};
+                json::Value result{env.rpc("json", "account_tx", to_string(p))};
                 BEAST_EXPECT(result[jss::result][jss::status] == "success");
             }
             else
             {
-                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcINVALID_PARAMS));
+                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcInvalidParams));
             }
 
             p[jss::binary] = true;
-            Json::Value result{env.rpc("json", "account_tx", to_string(p))};
+            json::Value result{env.rpc("json", "account_tx", to_string(p))};
             BEAST_EXPECT(result[jss::result][jss::status] == "success");
 
             p[jss::forward] = "true";
@@ -403,7 +403,7 @@ class AccountTx_test : public beast::unit_test::suite
             }
             else
             {
-                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcINVALID_PARAMS));
+                BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcInvalidParams));
             }
 
             p[jss::forward] = false;
@@ -412,74 +412,74 @@ class AccountTx_test : public beast::unit_test::suite
         }
         // test limit with malformed values
         {
-            Json::Value p{jParams};
+            json::Value p{jParams};
 
             // Test case: limit = 0 should fail (below minimum)
             p[jss::limit] = 0;
-            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), rpcINVALID_PARAMS));
+            BEAST_EXPECT(isErr(env.rpc("json", "account_tx", to_string(p)), RpcInvalidParams));
 
             // Test case: limit = 1.2 should fail (not an integer)
             p[jss::limit] = 1.2;
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = "10" should fail (string instead of integer)
             p[jss::limit] = "10";
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = true should fail (boolean instead of integer)
             p[jss::limit] = true;
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = false should fail (boolean instead of integer)
             p[jss::limit] = false;
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = -1 should fail (negative number)
             p[jss::limit] = -1;
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = [] should fail (array instead of integer)
-            p[jss::limit] = Json::Value(Json::arrayValue);
+            p[jss::limit] = json::Value(json::ArrayValue);
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = {} should fail (object instead of integer)
-            p[jss::limit] = Json::Value(Json::objectValue);
+            p[jss::limit] = json::Value(json::ObjectValue);
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = "malformed" should fail (malformed string)
             p[jss::limit] = "malformed";
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = ["limit"] should fail (array with string)
-            p[jss::limit] = Json::Value(Json::arrayValue);
+            p[jss::limit] = json::Value(json::ArrayValue);
             p[jss::limit].append("limit");
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = {"limit": 10} should fail (object with
             // property)
-            p[jss::limit] = Json::Value(Json::objectValue);
+            p[jss::limit] = json::Value(json::ObjectValue);
             p[jss::limit][jss::limit] = 10;
             BEAST_EXPECT(
                 env.rpc("json", "account_tx", to_string(p))[jss::result][jss::error_message] ==
-                RPC::expected_field_message(jss::limit, "unsigned integer"));
+                RPC::expectedFieldMessage(jss::limit, "unsigned integer"));
 
             // Test case: limit = 10 should succeed (valid integer)
             p[jss::limit] = 10;
@@ -502,7 +502,7 @@ class AccountTx_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const alie{"alie"};
         Account const gw{"gw"};
-        auto const USD{gw["USD"]};
+        auto const usd{gw["USD"]};
 
         env.fund(XRP(1000000), alice, gw);
         env.close();
@@ -518,60 +518,60 @@ class AccountTx_test : public beast::unit_test::suite
         env.close();
 
         // Trust and Offers
-        env(trust(alice, USD(200)), sig(alie));
+        env(trust(alice, usd(200)), Sig(alie));
         std::uint32_t const offerSeq{env.seq(alice)};
-        env(offer(alice, USD(50), XRP(150)), sig(alie));
+        env(offer(alice, usd(50), XRP(150)), Sig(alie));
         env.close();
 
-        env(offer_cancel(alice, offerSeq), sig(alie));
+        env(offerCancel(alice, offerSeq), Sig(alie));
         env.close();
 
         // SignerListSet
-        env(signers(alice, 1, {{"bogie", 1}, {"demon", 1}}), sig(alie));
+        env(signers(alice, 1, {{"bogie", 1}, {"demon", 1}}), Sig(alie));
 
         // Escrow
         {
             // Create an escrow.  Requires either a CancelAfter or FinishAfter.
             auto escrow = [](Account const& account, Account const& to, STAmount const& amount) {
-                Json::Value escrow;
+                json::Value escrow;
                 escrow[jss::TransactionType] = jss::EscrowCreate;
                 escrow[jss::Account] = account.human();
                 escrow[jss::Destination] = to.human();
-                escrow[jss::Amount] = amount.getJson(JsonOptions::none);
+                escrow[jss::Amount] = amount.getJson(JsonOptions::KNone);
                 return escrow;
             };
 
             NetClock::time_point const nextTime{env.now() + 2s};
 
-            Json::Value escrowWithFinish{escrow(alice, alice, XRP(500))};
+            json::Value escrowWithFinish{escrow(alice, alice, XRP(500))};
             escrowWithFinish[sfFinishAfter.jsonName] = nextTime.time_since_epoch().count();
 
             std::uint32_t const escrowFinishSeq{env.seq(alice)};
-            env(escrowWithFinish, sig(alie));
+            env(escrowWithFinish, Sig(alie));
 
-            Json::Value escrowWithCancel{escrow(alice, alice, XRP(500))};
+            json::Value escrowWithCancel{escrow(alice, alice, XRP(500))};
             escrowWithCancel[sfFinishAfter.jsonName] = nextTime.time_since_epoch().count();
             escrowWithCancel[sfCancelAfter.jsonName] = nextTime.time_since_epoch().count() + 1;
 
             std::uint32_t const escrowCancelSeq{env.seq(alice)};
-            env(escrowWithCancel, sig(alie));
+            env(escrowWithCancel, Sig(alie));
             env.close();
 
             {
-                Json::Value escrowFinish;
+                json::Value escrowFinish;
                 escrowFinish[jss::TransactionType] = jss::EscrowFinish;
                 escrowFinish[jss::Account] = alice.human();
                 escrowFinish[sfOwner.jsonName] = alice.human();
                 escrowFinish[sfOfferSequence.jsonName] = escrowFinishSeq;
-                env(escrowFinish, sig(alie));
+                env(escrowFinish, Sig(alie));
             }
             {
-                Json::Value escrowCancel;
+                json::Value escrowCancel;
                 escrowCancel[jss::TransactionType] = jss::EscrowCancel;
                 escrowCancel[jss::Account] = alice.human();
                 escrowCancel[sfOwner.jsonName] = alice.human();
                 escrowCancel[sfOfferSequence.jsonName] = escrowCancelSeq;
-                env(escrowCancel, sig(alie));
+                env(escrowCancel, Sig(alie));
             }
             env.close();
         }
@@ -579,29 +579,29 @@ class AccountTx_test : public beast::unit_test::suite
         // PayChan
         {
             std::uint32_t const payChanSeq{env.seq(alice)};
-            Json::Value payChanCreate;
+            json::Value payChanCreate;
             payChanCreate[jss::TransactionType] = jss::PaymentChannelCreate;
             payChanCreate[jss::Account] = alice.human();
             payChanCreate[jss::Destination] = gw.human();
-            payChanCreate[jss::Amount] = XRP(500).value().getJson(JsonOptions::none);
+            payChanCreate[jss::Amount] = XRP(500).value().getJson(JsonOptions::KNone);
             payChanCreate[sfSettleDelay.jsonName] = NetClock::duration{100s}.count();
             payChanCreate[sfPublicKey.jsonName] = strHex(alice.pk().slice());
-            env(payChanCreate, sig(alie));
+            env(payChanCreate, Sig(alie));
             env.close();
 
             std::string const payChanIndex{strHex(keylet::payChan(alice, gw, payChanSeq).key)};
 
             {
-                Json::Value payChanFund;
+                json::Value payChanFund;
                 payChanFund[jss::TransactionType] = jss::PaymentChannelFund;
                 payChanFund[jss::Account] = alice.human();
                 payChanFund[sfChannel.jsonName] = payChanIndex;
-                payChanFund[jss::Amount] = XRP(200).value().getJson(JsonOptions::none);
-                env(payChanFund, sig(alie));
+                payChanFund[jss::Amount] = XRP(200).value().getJson(JsonOptions::KNone);
+                env(payChanFund, Sig(alie));
                 env.close();
             }
             {
-                Json::Value payChanClaim;
+                json::Value payChanClaim;
                 payChanClaim[jss::TransactionType] = jss::PaymentChannelClaim;
                 payChanClaim[jss::Flags] = tfClose;
                 payChanClaim[jss::Account] = gw.human();
@@ -615,43 +615,43 @@ class AccountTx_test : public beast::unit_test::suite
         // Check
         {
             auto const aliceCheckId = keylet::check(alice, env.seq(alice)).key;
-            env(check::create(alice, gw, XRP(300)), sig(alie));
+            env(check::create(alice, gw, XRP(300)), Sig(alie));
 
             auto const gwCheckId = keylet::check(gw, env.seq(gw)).key;
             env(check::create(gw, alice, XRP(200)));
             env.close();
 
-            env(check::cash(alice, gwCheckId, XRP(200)), sig(alie));
-            env(check::cancel(alice, aliceCheckId), sig(alie));
+            env(check::cash(alice, gwCheckId, XRP(200)), Sig(alie));
+            env(check::cancel(alice, aliceCheckId), Sig(alie));
             env.close();
         }
         {
             // Deposit pre-authorization with a Ticket.
             std::uint32_t const tktSeq{env.seq(alice) + 1};
-            env(ticket::create(alice, 1), sig(alie));
+            env(ticket::create(alice, 1), Sig(alie));
             env.close();
 
-            env(deposit::auth(alice, gw), ticket::use(tktSeq), sig(alie));
+            env(deposit::auth(alice, gw), ticket::Use(tktSeq), Sig(alie));
             env.close();
         }
 
         // Setup is done.  Look at the transactions returned by account_tx.
-        Json::Value params;
+        json::Value params;
         params[jss::account] = alice.human();
         params[jss::ledger_index_min] = -1;
         params[jss::ledger_index_max] = -1;
 
-        Json::Value const result{env.rpc("json", "account_tx", to_string(params))};
+        json::Value const result{env.rpc("json", "account_tx", to_string(params))};
 
         BEAST_EXPECT(result[jss::result][jss::status] == "success");
         BEAST_EXPECT(result[jss::result][jss::transactions].isArray());
 
-        Json::Value const& txs{result[jss::result][jss::transactions]};
+        json::Value const& txs{result[jss::result][jss::transactions]};
 
         // 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 sanity[]{
+        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(sanity) == 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(sanity); ++index)
+        for (unsigned int index{0}; index < std::size(kSANITY); ++index)
         {
-            checkSanity(txs[index], sanity[index]);
+            checkSanity(txs[index], kSANITY[index]);
         }
     }
 
@@ -720,7 +720,7 @@ class AccountTx_test : public beast::unit_test::suite
         auto const beckyPreDelBalance{env.balance(becky)};
 
         auto const acctDelFee{drops(env.current()->fees().increment)};
-        env(acctdelete(becky, alice), fee(acctDelFee));
+        env(acctdelete(becky, alice), Fee(acctDelFee));
         env.close();
 
         // Verify that becky's account root is gone.
@@ -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 sanity[]
+        static const NodeSanity kSANITY[]
         {
                                     //   txType,                    created,            deleted,            modified
 /* becky pays alice              */ { 0, jss::Payment,              {},                 {},                 {jss::AccountRoot, jss::AccountRoot}},
@@ -748,34 +748,34 @@ class AccountTx_test : public beast::unit_test::suite
         // Verify that we can recover becky's account_tx information even
         // after the account is deleted.
         {
-            Json::Value params;
+            json::Value params;
             params[jss::account] = becky.human();
             params[jss::ledger_index_min] = -1;
             params[jss::ledger_index_max] = -1;
 
-            Json::Value const result{env.rpc("json", "account_tx", to_string(params))};
+            json::Value const result{env.rpc("json", "account_tx", to_string(params))};
 
             BEAST_EXPECT(result[jss::result][jss::status] == "success");
             BEAST_EXPECT(result[jss::result][jss::transactions].isArray());
 
             // The first two transactions listed in sanity haven't happened yet.
-            constexpr unsigned int beckyDeletedOffset = 2;
+            constexpr unsigned int kBECKY_DELETED_OFFSET = 2;
             BEAST_EXPECT(
-                std::size(sanity) ==
-                result[jss::result][jss::transactions].size() + beckyDeletedOffset);
+                std::size(kSANITY) ==
+                result[jss::result][jss::transactions].size() + kBECKY_DELETED_OFFSET);
 
-            Json::Value const& txs{result[jss::result][jss::transactions]};
+            json::Value const& txs{result[jss::result][jss::transactions]};
 
-            for (unsigned int index = beckyDeletedOffset; index < std::size(sanity); ++index)
+            for (unsigned int index = kBECKY_DELETED_OFFSET; index < std::size(kSANITY); ++index)
             {
-                checkSanity(txs[index - beckyDeletedOffset], sanity[index]);
+                checkSanity(txs[index - kBECKY_DELETED_OFFSET], kSANITY[index]);
             }
         }
 
         // All it takes is a large enough XRP payment to resurrect
         // becky's account.  Try too small a payment.
         env(pay(alice, becky, drops(env.current()->fees().accountReserve(0)) - XRP(1)),
-            ter(tecNO_DST_INSUF_XRP));
+            Ter(tecNO_DST_INSUF_XRP));
         env.close();
 
         // Actually resurrect becky's account.
@@ -792,23 +792,23 @@ class AccountTx_test : public beast::unit_test::suite
 
         // Setup is done.  Look at the transactions returned by account_tx.
         // Verify that account_tx locates all of becky's transactions.
-        Json::Value params;
+        json::Value params;
         params[jss::account] = becky.human();
         params[jss::ledger_index_min] = -1;
         params[jss::ledger_index_max] = -1;
 
-        Json::Value const result{env.rpc("json", "account_tx", to_string(params))};
+        json::Value const result{env.rpc("json", "account_tx", to_string(params))};
 
         BEAST_EXPECT(result[jss::result][jss::status] == "success");
         BEAST_EXPECT(result[jss::result][jss::transactions].isArray());
 
-        BEAST_EXPECT(std::size(sanity) == 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]};
+        json::Value const& txs{result[jss::result][jss::transactions]};
 
-        for (unsigned int index = 0; index < std::size(sanity); ++index)
+        for (unsigned int index = 0; index < std::size(kSANITY); ++index)
         {
-            checkSanity(txs[index], sanity[index]);
+            checkSanity(txs[index], kSANITY[index]);
         }
     }
 
@@ -831,8 +831,8 @@ class AccountTx_test : public beast::unit_test::suite
         MPTTester mptAlice(env, alice, {.holders = {bob, carol}});
 
         // check the latest mpt-related txn is in alice's account history
-        auto const checkAliceAcctTx = [&](size_t size, Json::StaticString txType) {
-            Json::Value params;
+        auto const checkAliceAcctTx = [&](size_t size, json::StaticString txType) {
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::limit] = 100;
             auto const jv = env.rpc("json", "account_tx", to_string(params))[jss::result];
@@ -841,7 +841,7 @@ class AccountTx_test : public beast::unit_test::suite
             auto const& tx0(jv[jss::transactions][0u][jss::tx]);
             BEAST_EXPECT(tx0[jss::TransactionType] == txType);
 
-            std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+            std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
             BEAST_EXPECT(tx0[jss::hash] == txHash);
         };
 
diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp
index 0476b7406a..4e0daaef0d 100644
--- a/src/test/rpc/AmendmentBlocked_test.cpp
+++ b/src/test/rpc/AmendmentBlocked_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl {
 
-class AmendmentBlocked_test : public beast::unit_test::suite
+class AmendmentBlocked_test : public beast::unit_test::Suite
 {
     void
     testBlockedMethods()
@@ -34,10 +34,10 @@ class AmendmentBlocked_test : public beast::unit_test::suite
                     return cfg;
                 })};
         auto const gw = Account{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         auto const alice = Account{"alice"};
         auto const bob = Account{"bob"};
-        Account const ali{"ali", KeyType::secp256k1};
+        Account const ali{"ali", KeyType::Secp256k1};
         env.fund(XRP(10000), alice, bob, gw);
         env.memoize(ali);
         // This close() ensures that all the accounts get created and their
@@ -46,10 +46,10 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         // noRipple set on gw's end. The existing tests pass either way, but
         // better to do it right.
         env.close();
-        env.trust(USD(600), alice);
-        env.trust(USD(700), bob);
-        env(pay(gw, alice, USD(70)));
-        env(pay(gw, bob, USD(50)));
+        env.trust(usd(600), alice);
+        env.trust(usd(700), bob);
+        env(pay(gw, alice, usd(70)));
+        env(pay(gw, bob, usd(50)));
         env.close();
 
         auto wsc = test::makeWSClient(env.app().config());
@@ -71,12 +71,12 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // path_find
-        Json::Value pf_req;
-        pf_req[jss::subcommand] = "create";
-        pf_req[jss::source_account] = alice.human();
-        pf_req[jss::destination_account] = bob.human();
-        pf_req[jss::destination_amount] = bob["USD"](20).value().getJson(JsonOptions::none);
-        jr = wsc->invoke("path_find", pf_req)[jss::result];
+        json::Value pfReq;
+        pfReq[jss::subcommand] = "create";
+        pfReq[jss::source_account] = alice.human();
+        pfReq[jss::destination_account] = bob.human();
+        pfReq[jss::destination_amount] = bob["USD"](20).value().getJson(JsonOptions::KNone);
+        jr = wsc->invoke("path_find", pfReq)[jss::result];
         BEAST_EXPECT(
             jr.isMember(jss::alternatives) && jr[jss::alternatives].isArray() &&
             jr[jss::alternatives].size() == 1);
@@ -91,28 +91,28 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // submit_multisigned
-        env(signers(bob, 1, {{alice, 1}}), sig(bob));
+        env(signers(bob, 1, {{alice, 1}}), Sig(bob));
         env(regkey(alice, ali));
         env.close();
 
-        Json::Value set_tx;
-        set_tx[jss::Account] = bob.human();
-        set_tx[jss::TransactionType] = jss::AccountSet;
-        set_tx[jss::Fee] = (8 * env.current()->fees().base).jsonClipped();
-        set_tx[jss::Sequence] = env.seq(bob);
-        set_tx[jss::SigningPubKey] = "";
+        json::Value setTx;
+        setTx[jss::Account] = bob.human();
+        setTx[jss::TransactionType] = jss::AccountSet;
+        setTx[jss::Fee] = (8 * env.current()->fees().base).jsonClipped();
+        setTx[jss::Sequence] = env.seq(bob);
+        setTx[jss::SigningPubKey] = "";
 
-        Json::Value sign_for;
-        sign_for[jss::tx_json] = set_tx;
-        sign_for[jss::account] = alice.human();
-        sign_for[jss::secret] = ali.name();
-        jr = env.rpc("json", "sign_for", to_string(sign_for))[jss::result];
+        json::Value signFor;
+        signFor[jss::tx_json] = setTx;
+        signFor[jss::account] = alice.human();
+        signFor[jss::secret] = ali.name();
+        jr = env.rpc("json", "sign_for", to_string(signFor))[jss::result];
         BEAST_EXPECT(jr[jss::status] == "success");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
-        Json::Value ms_req;
-        ms_req[jss::tx_json] = jr[jss::tx_json];
-        jr = env.rpc("json", "submit_multisigned", to_string(ms_req))[jss::result];
+        json::Value msReq;
+        msReq[jss::tx_json] = jr[jss::tx_json];
+        jr = env.rpc("json", "submit_multisigned", to_string(msReq))[jss::result];
         BEAST_EXPECT(jr.isMember(jss::engine_result) && jr[jss::engine_result] == "tesSUCCESS");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
@@ -137,11 +137,11 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // path_find
-        pf_req[jss::subcommand] = "create";
-        pf_req[jss::source_account] = alice.human();
-        pf_req[jss::destination_account] = bob.human();
-        pf_req[jss::destination_amount] = bob["USD"](20).value().getJson(JsonOptions::none);
-        jr = wsc->invoke("path_find", pf_req)[jss::result];
+        pfReq[jss::subcommand] = "create";
+        pfReq[jss::source_account] = alice.human();
+        pfReq[jss::destination_account] = bob.human();
+        pfReq[jss::destination_amount] = bob["USD"](20).value().getJson(JsonOptions::KNone);
+        jr = wsc->invoke("path_find", pfReq)[jss::result];
         BEAST_EXPECT(
             jr.isMember(jss::alternatives) && jr[jss::alternatives].isArray() &&
             jr[jss::alternatives].size() == 1);
@@ -156,25 +156,25 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // submit_multisigned
-        env(signers(bob, 1, {{alice, 1}}), sig(bob));
+        env(signers(bob, 1, {{alice, 1}}), Sig(bob));
         env(regkey(alice, ali));
         env.close();
 
-        set_tx[jss::Account] = bob.human();
-        set_tx[jss::TransactionType] = jss::AccountSet;
-        set_tx[jss::Fee] = (8 * env.current()->fees().base).jsonClipped();
-        set_tx[jss::Sequence] = env.seq(bob);
-        set_tx[jss::SigningPubKey] = "";
+        setTx[jss::Account] = bob.human();
+        setTx[jss::TransactionType] = jss::AccountSet;
+        setTx[jss::Fee] = (8 * env.current()->fees().base).jsonClipped();
+        setTx[jss::Sequence] = env.seq(bob);
+        setTx[jss::SigningPubKey] = "";
 
-        sign_for[jss::tx_json] = set_tx;
-        sign_for[jss::account] = alice.human();
-        sign_for[jss::secret] = ali.name();
-        jr = env.rpc("json", "sign_for", to_string(sign_for))[jss::result];
+        signFor[jss::tx_json] = setTx;
+        signFor[jss::account] = alice.human();
+        signFor[jss::secret] = ali.name();
+        jr = env.rpc("json", "sign_for", to_string(signFor))[jss::result];
         BEAST_EXPECT(jr[jss::status] == "success");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
-        ms_req[jss::tx_json] = jr[jss::tx_json];
-        jr = env.rpc("json", "submit_multisigned", to_string(ms_req))[jss::result];
+        msReq[jss::tx_json] = jr[jss::tx_json];
+        jr = env.rpc("json", "submit_multisigned", to_string(msReq))[jss::result];
         BEAST_EXPECT(jr.isMember(jss::engine_result) && jr[jss::engine_result] == "tesSUCCESS");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
@@ -202,7 +202,7 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // path_find
-        jr = wsc->invoke("path_find", pf_req)[jss::result];
+        jr = wsc->invoke("path_find", pfReq)[jss::result];
         BEAST_EXPECT(jr.isMember(jss::error) && jr[jss::error] == "amendmentBlocked");
         BEAST_EXPECT(jr[jss::status] == "error");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
@@ -214,12 +214,12 @@ class AmendmentBlocked_test : public beast::unit_test::suite
         BEAST_EXPECT(!jr.isMember(jss::warnings));
 
         // submit_multisigned
-        set_tx[jss::Sequence] = env.seq(bob);
-        sign_for[jss::tx_json] = set_tx;
-        jr = env.rpc("json", "sign_for", to_string(sign_for))[jss::result];
+        setTx[jss::Sequence] = env.seq(bob);
+        signFor[jss::tx_json] = setTx;
+        jr = env.rpc("json", "sign_for", to_string(signFor))[jss::result];
         BEAST_EXPECT(jr[jss::status] == "success");
-        ms_req[jss::tx_json] = jr[jss::tx_json];
-        jr = env.rpc("json", "submit_multisigned", to_string(ms_req))[jss::result];
+        msReq[jss::tx_json] = jr[jss::tx_json];
+        jr = env.rpc("json", "submit_multisigned", to_string(msReq))[jss::result];
         BEAST_EXPECT(jr.isMember(jss::error) && jr[jss::error] == "amendmentBlocked");
         BEAST_EXPECT(!jr.isMember(jss::warnings));
     }
diff --git a/src/test/rpc/BookChanges_test.cpp b/src/test/rpc/BookChanges_test.cpp
index d6881217b5..182b569fde 100644
--- a/src/test/rpc/BookChanges_test.cpp
+++ b/src/test/rpc/BookChanges_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::test {
 
-class BookChanges_test : public beast::unit_test::suite
+class BookChanges_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -25,7 +25,7 @@ public:
     {
         testcase("Specify well-known strings as ledger input");
         jtx::Env env(*this);
-        Json::Value params, resp;
+        json::Value params, resp;
 
         // As per convention in XRPL, ledgers can be specified with strings
         // "closed", "validated" or "current"
@@ -68,7 +68,7 @@ public:
 
         // As per convention in XRPL, ledgers can be specified with strings
         // "closed", "validated" or "current"
-        Json::Value const resp = env.rpc("json", "book_changes", to_string(Json::Value{}));
+        json::Value const resp = env.rpc("json", "book_changes", to_string(json::Value{}));
         BEAST_EXPECT(!resp[jss::result].isMember(jss::error));
         BEAST_EXPECT(resp[jss::result][jss::status] == "success");
 
@@ -84,7 +84,7 @@ public:
         using namespace jtx;
 
         FeatureBitset const all{
-            jtx::testable_amendments() | featurePermissionedDomains | featureCredentials |
+            jtx::testableAmendments() | featurePermissionedDomains | featureCredentials |
             featurePermissionedDEX};
 
         Env env(*this, all);
@@ -93,18 +93,18 @@ public:
 
         auto wsc = makeWSClient(env.app().config());
 
-        env(offer(alice, XRP(10), USD(10)), domain(domainID));
+        env(offer(alice, XRP(10), USD(10)), Domain(domainID));
         env.close();
 
-        env(pay(bob, carol, USD(10)), path(~USD), sendmax(XRP(10)), domain(domainID));
+        env(pay(bob, carol, USD(10)), Path(~USD), Sendmax(XRP(10)), Domain(domainID));
         env.close();
 
-        std::string const txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
+        std::string const txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
 
-        Json::Value const txResult = env.rpc("tx", txHash)[jss::result];
+        json::Value const txResult = env.rpc("tx", txHash)[jss::result];
         auto const ledgerIndex = txResult[jss::ledger_index].asInt();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = ledgerIndex;
 
         auto jv = wsc->invoke("book_changes", jvParams);
diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp
index 90a621c693..d7de678933 100644
--- a/src/test/rpc/Book_test.cpp
+++ b/src/test/rpc/Book_test.cpp
@@ -35,7 +35,7 @@
 
 namespace xrpl::test {
 
-class Book_test : public beast::unit_test::suite
+class Book_test : public beast::unit_test::Suite
 {
     static std::string
     getBookDir(
@@ -70,15 +70,15 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
+        auto usd = Account("alice")["USD"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
@@ -102,21 +102,21 @@ public:
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 1)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 1)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 2)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 2)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
@@ -140,22 +140,22 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
+        auto usd = Account("alice")["USD"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         // Create an ask: TakerPays 500, TakerGets 100/USD
-        env(offer("alice", XRP(500), USD(100)), require(owners("alice", 1)));
+        env(offer("alice", XRP(500), usd(100)), Require(Owners("alice", 1)));
 
         // Create a bid: TakerPays 100/USD, TakerGets 200
-        env(offer("alice", USD(100), XRP(200)), require(owners("alice", 2)));
+        env(offer("alice", usd(100), XRP(200)), Require(Owners("alice", 2)));
         env.close();
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
@@ -175,31 +175,31 @@ public:
                 jv[jss::result].isMember(jss::offers) && jv[jss::result][jss::offers].size() == 1);
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerGets] ==
-                XRP(200).value().getJson(JsonOptions::none));
+                XRP(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerPays] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::asks));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::bids));
         }
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 3)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 3)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 4)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 4)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
@@ -223,15 +223,15 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
+        auto usd = Account("alice")["USD"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
@@ -257,29 +257,29 @@ public:
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 1)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 1)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 2)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 2)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == USD(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
@@ -302,22 +302,22 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
+        auto usd = Account("alice")["USD"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         // Create an ask: TakerPays 500, TakerGets 100/USD
-        env(offer("alice", XRP(500), USD(100)), require(owners("alice", 1)));
+        env(offer("alice", XRP(500), usd(100)), Require(Owners("alice", 1)));
 
         // Create a bid: TakerPays 100/USD, TakerGets 200
-        env(offer("alice", USD(100), XRP(200)), require(owners("alice", 2)));
+        env(offer("alice", usd(100), XRP(200)), Require(Owners("alice", 2)));
         env.close();
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
@@ -340,44 +340,44 @@ public:
                 jv[jss::result].isMember(jss::bids) && jv[jss::result][jss::bids].size() == 1);
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][0u][jss::TakerGets] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][0u][jss::TakerPays] ==
-                XRP(500).value().getJson(JsonOptions::none));
+                XRP(500).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][0u][jss::TakerGets] ==
-                XRP(200).value().getJson(JsonOptions::none));
+                XRP(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][0u][jss::TakerPays] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::offers));
         }
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 3)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 3)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 4)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 4)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == USD(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
@@ -400,24 +400,24 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
-        auto CNY = Account("alice")["CNY"];
-        auto JPY = Account("alice")["JPY"];
+        auto usd = Account("alice")["USD"];
+        auto cny = Account("alice")["CNY"];
+        auto jpy = Account("alice")["JPY"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
                 j[jss::taker_pays][jss::issuer] = Account("alice").human();
             }
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "CNY";
                 j[jss::taker_gets][jss::issuer] = Account("alice").human();
@@ -442,42 +442,42 @@ public:
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 1)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 1)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 2)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 2)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
 
         {
             // Create an ask: TakerPays 700/CNY, TakerGets 100/JPY
-            env(offer("alice", CNY(700), JPY(100)), require(owners("alice", 3)));
+            env(offer("alice", cny(700), jpy(100)), Require(Owners("alice", 3)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == JPY(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == CNY(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == jpy(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == cny(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/JPY, TakerGets 75/CNY
-            env(offer("alice", JPY(100), CNY(75)), require(owners("alice", 4)));
+            env(offer("alice", jpy(100), cny(75)), Require(Owners("alice", 4)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
@@ -501,37 +501,37 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
-        auto CNY = Account("alice")["CNY"];
-        auto JPY = Account("alice")["JPY"];
+        auto usd = Account("alice")["USD"];
+        auto cny = Account("alice")["CNY"];
+        auto jpy = Account("alice")["JPY"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         // Create an ask: TakerPays 500, TakerGets 100/USD
-        env(offer("alice", XRP(500), USD(100)), require(owners("alice", 1)));
+        env(offer("alice", XRP(500), usd(100)), Require(Owners("alice", 1)));
 
         // Create an ask: TakerPays 500/CNY, TakerGets 100/JPY
-        env(offer("alice", CNY(500), JPY(100)), require(owners("alice", 2)));
+        env(offer("alice", cny(500), jpy(100)), Require(Owners("alice", 2)));
 
         // Create a bid: TakerPays 100/USD, TakerGets 200
-        env(offer("alice", USD(100), XRP(200)), require(owners("alice", 3)));
+        env(offer("alice", usd(100), XRP(200)), Require(Owners("alice", 3)));
 
         // Create a bid: TakerPays 100/JPY, TakerGets 200/CNY
-        env(offer("alice", JPY(100), CNY(200)), require(owners("alice", 4)));
+        env(offer("alice", jpy(100), cny(200)), Require(Owners("alice", 4)));
         env.close();
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
                 j[jss::taker_pays][jss::issuer] = Account("alice").human();
             }
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "CNY";
                 j[jss::taker_gets][jss::issuer] = Account("alice").human();
@@ -552,58 +552,58 @@ public:
                 jv[jss::result].isMember(jss::offers) && jv[jss::result][jss::offers].size() == 2);
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerGets] ==
-                XRP(200).value().getJson(JsonOptions::none));
+                XRP(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerPays] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][1u][jss::TakerGets] ==
-                CNY(200).value().getJson(JsonOptions::none));
+                cny(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][1u][jss::TakerPays] ==
-                JPY(100).value().getJson(JsonOptions::none));
+                jpy(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::asks));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::bids));
         }
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 5)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 5)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 6)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 6)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
 
         {
             // Create an ask: TakerPays 700/CNY, TakerGets 100/JPY
-            env(offer("alice", CNY(700), JPY(100)), require(owners("alice", 7)));
+            env(offer("alice", cny(700), jpy(100)), Require(Owners("alice", 7)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == JPY(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == CNY(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == jpy(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == cny(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/JPY, TakerGets 75/CNY
-            env(offer("alice", JPY(100), CNY(75)), require(owners("alice", 8)));
+            env(offer("alice", jpy(100), cny(75)), Require(Owners("alice", 8)));
             env.close();
             BEAST_EXPECT(!wsc->getMsg(10ms));
         }
@@ -627,17 +627,17 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
-        auto CNY = Account("alice")["CNY"];
-        auto JPY = Account("alice")["JPY"];
+        auto usd = Account("alice")["USD"];
+        auto cny = Account("alice")["CNY"];
+        auto jpy = Account("alice")["JPY"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
@@ -645,7 +645,7 @@ public:
                 j[jss::taker_pays][jss::issuer] = Account("alice").human();
             }
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "CNY";
@@ -672,57 +672,57 @@ public:
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 1)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 1)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 2)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 2)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == USD(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create an ask: TakerPays 700/CNY, TakerGets 100/JPY
-            env(offer("alice", CNY(700), JPY(100)), require(owners("alice", 3)));
+            env(offer("alice", cny(700), jpy(100)), Require(Owners("alice", 3)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == JPY(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == CNY(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == jpy(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == cny(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/JPY, TakerGets 75/CNY
-            env(offer("alice", JPY(100), CNY(75)), require(owners("alice", 4)));
+            env(offer("alice", jpy(100), cny(75)), Require(Owners("alice", 4)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == CNY(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == JPY(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == cny(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == jpy(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
@@ -745,30 +745,30 @@ public:
         using namespace jtx;
         Env env(*this);
         env.fund(XRP(10000), "alice");
-        auto USD = Account("alice")["USD"];
-        auto CNY = Account("alice")["CNY"];
-        auto JPY = Account("alice")["JPY"];
+        auto usd = Account("alice")["USD"];
+        auto cny = Account("alice")["CNY"];
+        auto jpy = Account("alice")["JPY"];
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         // Create an ask: TakerPays 500, TakerGets 100/USD
-        env(offer("alice", XRP(500), USD(100)), require(owners("alice", 1)));
+        env(offer("alice", XRP(500), usd(100)), Require(Owners("alice", 1)));
 
         // Create an ask: TakerPays 500/CNY, TakerGets 100/JPY
-        env(offer("alice", CNY(500), JPY(100)), require(owners("alice", 2)));
+        env(offer("alice", cny(500), jpy(100)), Require(Owners("alice", 2)));
 
         // Create a bid: TakerPays 100/USD, TakerGets 200
-        env(offer("alice", USD(100), XRP(200)), require(owners("alice", 3)));
+        env(offer("alice", usd(100), XRP(200)), Require(Owners("alice", 3)));
 
         // Create a bid: TakerPays 100/JPY, TakerGets 200/CNY
-        env(offer("alice", JPY(100), CNY(200)), require(owners("alice", 4)));
+        env(offer("alice", jpy(100), cny(200)), Require(Owners("alice", 4)));
         env.close();
 
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
@@ -777,7 +777,7 @@ public:
             }
             // RPC subscribe to books stream
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::both] = true;
                 j[jss::taker_gets][jss::currency] = "CNY";
@@ -801,84 +801,84 @@ public:
                 jv[jss::result].isMember(jss::bids) && jv[jss::result][jss::bids].size() == 2);
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][0u][jss::TakerGets] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][0u][jss::TakerPays] ==
-                XRP(500).value().getJson(JsonOptions::none));
+                XRP(500).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][1u][jss::TakerGets] ==
-                JPY(100).value().getJson(JsonOptions::none));
+                jpy(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::asks][1u][jss::TakerPays] ==
-                CNY(500).value().getJson(JsonOptions::none));
+                cny(500).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][0u][jss::TakerGets] ==
-                XRP(200).value().getJson(JsonOptions::none));
+                XRP(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][0u][jss::TakerPays] ==
-                USD(100).value().getJson(JsonOptions::none));
+                usd(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][1u][jss::TakerGets] ==
-                CNY(200).value().getJson(JsonOptions::none));
+                cny(200).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::bids][1u][jss::TakerPays] ==
-                JPY(100).value().getJson(JsonOptions::none));
+                jpy(100).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(!jv[jss::result].isMember(jss::offers));
         }
 
         {
             // Create an ask: TakerPays 700, TakerGets 100/USD
-            env(offer("alice", XRP(700), USD(100)), require(owners("alice", 5)));
+            env(offer("alice", XRP(700), usd(100)), Require(Owners("alice", 5)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == USD(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == usd(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == XRP(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/USD, TakerGets 75
-            env(offer("alice", USD(100), XRP(75)), require(owners("alice", 6)));
+            env(offer("alice", usd(100), XRP(75)), Require(Owners("alice", 6)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == USD(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == XRP(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == usd(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create an ask: TakerPays 700/CNY, TakerGets 100/JPY
-            env(offer("alice", CNY(700), JPY(100)), require(owners("alice", 7)));
+            env(offer("alice", cny(700), jpy(100)), Require(Owners("alice", 7)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == JPY(100).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == CNY(700).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == jpy(100).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == cny(700).value().getJson(JsonOptions::KNone);
             }));
         }
 
         {
             // Create a bid: TakerPays 100/JPY, TakerGets 75/CNY
-            env(offer("alice", JPY(100), CNY(75)), require(owners("alice", 8)));
+            env(offer("alice", jpy(100), cny(75)), Require(Owners("alice", 8)));
             env.close();
 
             // Check stream update
             BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
                 auto const& t = jv[jss::transaction];
                 return t[jss::TransactionType] == jss::OfferCreate &&
-                    t[jss::TakerGets] == CNY(75).value().getJson(JsonOptions::none) &&
-                    t[jss::TakerPays] == JPY(100).value().getJson(JsonOptions::none);
+                    t[jss::TakerGets] == cny(75).value().getJson(JsonOptions::KNone) &&
+                    t[jss::TakerPays] == jpy(100).value().getJson(JsonOptions::KNone);
             }));
         }
 
@@ -905,13 +905,13 @@ public:
         auto wsc = makeWSClient(env.app().config());
         env.fund(XRP(20000), alice, bob, gw);
         env.close();
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
 
-        Json::Value books;
+        json::Value books;
         {
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
@@ -935,14 +935,14 @@ public:
 
         env(rate(gw, 1.1));
         env.close();
-        env.trust(USD(1000), alice);
-        env.trust(USD(1000), bob);
-        env(pay(gw, alice, USD(100)));
-        env(pay(gw, bob, USD(50)));
-        env(offer(alice, XRP(4000), USD(10)));
+        env.trust(usd(1000), alice);
+        env.trust(usd(1000), bob);
+        env(pay(gw, alice, usd(100)));
+        env(pay(gw, bob, usd(50)));
+        env(offer(alice, XRP(4000), usd(10)));
         env.close();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::taker] = env.master.human();
         jvParams[jss::taker_pays][jss::currency] = "XRP";
         jvParams[jss::ledger_index] = "validated";
@@ -962,14 +962,14 @@ public:
         BEAST_EXPECT(jrr[jss::offers].size() == 1);
         auto const jrOffer = jrr[jss::offers][0u];
         BEAST_EXPECT(jrOffer[sfAccount.fieldName] == alice.human());
-        BEAST_EXPECT(jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, USD));
+        BEAST_EXPECT(jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, usd));
         BEAST_EXPECT(jrOffer[sfBookNode.fieldName] == "0");
         BEAST_EXPECT(jrOffer[jss::Flags] == 0);
         BEAST_EXPECT(jrOffer[sfLedgerEntryType.fieldName] == jss::Offer);
         BEAST_EXPECT(jrOffer[sfOwnerNode.fieldName] == "0");
         BEAST_EXPECT(jrOffer[sfSequence.fieldName] == 5);
-        BEAST_EXPECT(jrOffer[jss::TakerGets] == USD(10).value().getJson(JsonOptions::none));
-        BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(4000).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jrOffer[jss::TakerGets] == usd(10).value().getJson(JsonOptions::KNone));
+        BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(4000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(jrOffer[jss::owner_funds] == "100");
         BEAST_EXPECT(jrOffer[jss::quality] == "400000000");
 
@@ -977,20 +977,20 @@ public:
         BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jval) {
             auto const& t = jval[jss::transaction];
             return t[jss::TransactionType] == jss::OfferCreate &&
-                t[jss::TakerGets] == USD(10).value().getJson(JsonOptions::none) &&
+                t[jss::TakerGets] == usd(10).value().getJson(JsonOptions::KNone) &&
                 t[jss::owner_funds] == "100" &&
-                t[jss::TakerPays] == XRP(4000).value().getJson(JsonOptions::none);
+                t[jss::TakerPays] == XRP(4000).value().getJson(JsonOptions::KNone);
         }));
 
-        env(offer(bob, XRP(2000), USD(5)));
+        env(offer(bob, XRP(2000), usd(5)));
         env.close();
 
         BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jval) {
             auto const& t = jval[jss::transaction];
             return t[jss::TransactionType] == jss::OfferCreate &&
-                t[jss::TakerGets] == USD(5).value().getJson(JsonOptions::none) &&
+                t[jss::TakerGets] == usd(5).value().getJson(JsonOptions::KNone) &&
                 t[jss::owner_funds] == "50" &&
-                t[jss::TakerPays] == XRP(2000).value().getJson(JsonOptions::none);
+                t[jss::TakerPays] == XRP(2000).value().getJson(JsonOptions::KNone);
         }));
 
         jv = wsc->invoke("book_offers", jvParams);
@@ -1006,14 +1006,14 @@ public:
         BEAST_EXPECT(jrr[jss::offers].size() == 2);
         auto const jrNextOffer = jrr[jss::offers][1u];
         BEAST_EXPECT(jrNextOffer[sfAccount.fieldName] == bob.human());
-        BEAST_EXPECT(jrNextOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, USD));
+        BEAST_EXPECT(jrNextOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, usd));
         BEAST_EXPECT(jrNextOffer[sfBookNode.fieldName] == "0");
         BEAST_EXPECT(jrNextOffer[jss::Flags] == 0);
         BEAST_EXPECT(jrNextOffer[sfLedgerEntryType.fieldName] == jss::Offer);
         BEAST_EXPECT(jrNextOffer[sfOwnerNode.fieldName] == "0");
         BEAST_EXPECT(jrNextOffer[sfSequence.fieldName] == 5);
-        BEAST_EXPECT(jrNextOffer[jss::TakerGets] == USD(5).value().getJson(JsonOptions::none));
-        BEAST_EXPECT(jrNextOffer[jss::TakerPays] == XRP(2000).value().getJson(JsonOptions::none));
+        BEAST_EXPECT(jrNextOffer[jss::TakerGets] == usd(5).value().getJson(JsonOptions::KNone));
+        BEAST_EXPECT(jrNextOffer[jss::TakerPays] == XRP(2000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(jrNextOffer[jss::owner_funds] == "50");
         BEAST_EXPECT(jrNextOffer[jss::quality] == "400000000");
 
@@ -1044,8 +1044,8 @@ public:
             return false;
         auto const& t = (*maybeJv)[jss::transaction];
         if (t[jss::TransactionType] != jss::OfferCreate ||
-            t[jss::TakerGets] != takerGets.value().getJson(JsonOptions::none) ||
-            t[jss::TakerPays] != takerPays.value().getJson(JsonOptions::none))
+            t[jss::TakerGets] != takerGets.value().getJson(JsonOptions::KNone) ||
+            t[jss::TakerPays] != takerPays.value().getJson(JsonOptions::KNone))
             return false;
         // Make sure no other message is waiting
         return wsc->getMsg(timeout) == std::nullopt;
@@ -1071,31 +1071,31 @@ public:
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const charlie = Account("charlie");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         env.fund(XRP(1000000), gw, alice, bob, charlie);
         env.close();
 
-        env(trust(alice, USD(500)));
-        env(trust(bob, USD(500)));
+        env(trust(alice, usd(500)));
+        env(trust(bob, usd(500)));
         env.close();
 
-        env(pay(gw, alice, USD(500)));
-        env(pay(gw, bob, USD(500)));
+        env(pay(gw, alice, usd(500)));
+        env(pay(gw, bob, usd(500)));
         env.close();
 
         // Alice and Bob offer $500 for 500 XRP
-        env(offer(alice, XRP(500), USD(500)));
-        env(offer(bob, XRP(500), USD(500)));
+        env(offer(alice, XRP(500), usd(500)));
+        env(offer(bob, XRP(500), usd(500)));
         env.close();
 
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
         {
             // RPC subscribe to books stream
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = false;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
@@ -1108,11 +1108,11 @@ public:
         }
 
         // Charlie places an offer that crosses Alice and Charlie's offers
-        env(offer(charlie, USD(1000), XRP(1000)));
+        env(offer(charlie, usd(1000), XRP(1000)));
         env.close();
         env.require(offers(alice, 0), offers(bob, 0), offers(charlie, 0));
         using namespace std::chrono_literals;
-        BEAST_EXPECT(offerOnlyOnceInStream(wsc, 1s, XRP(1000), USD(1000)));
+        BEAST_EXPECT(offerOnlyOnceInStream(wsc, 1s, XRP(1000), usd(1000)));
 
         // RPC unsubscribe
         auto jv = wsc->invoke("unsubscribe", books);
@@ -1141,37 +1141,37 @@ public:
         auto const alice = Account("alice");
         auto const bob = Account("bob");
         auto const charlie = Account("charlie");
-        auto const USD = gw["USD"];
-        auto const EUR = gw["EUR"];
+        auto const usd = gw["USD"];
+        auto const eur = gw["EUR"];
 
         env.fund(XRP(1000000), gw, alice, bob, charlie);
         env.close();
 
         for (auto const& account : {alice, bob, charlie})
         {
-            for (auto const& iou : {USD, EUR})
+            for (auto const& iou : {usd, eur})
             {
                 env(trust(account, iou(1)));
             }
         }
         env.close();
 
-        env(pay(gw, alice, USD(1)));
-        env(pay(gw, charlie, EUR(1)));
+        env(pay(gw, alice, usd(1)));
+        env(pay(gw, charlie, eur(1)));
         env.close();
 
-        env(offer(alice, XRP(100), USD(1)));
-        env(offer(bob, EUR(1), XRP(100)));
+        env(offer(alice, XRP(100), usd(1)));
+        env(offer(bob, eur(1), XRP(100)));
         env.close();
 
         auto wsc = makeWSClient(env.app().config());
-        Json::Value books;
+        json::Value books;
 
         {
             // RPC subscribe to multiple book streams
-            books[jss::books] = Json::arrayValue;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = false;
                 j[jss::taker_gets][jss::currency] = "XRP";
                 j[jss::taker_pays][jss::currency] = "USD";
@@ -1179,7 +1179,7 @@ public:
             }
 
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = false;
                 j[jss::taker_gets][jss::currency] = "EUR";
                 j[jss::taker_gets][jss::issuer] = gw.human();
@@ -1192,10 +1192,10 @@ public:
         }
 
         // Charlies places an on offer for EUR -> USD that should auto-bridge
-        env(offer(charlie, USD(1), EUR(1)));
+        env(offer(charlie, usd(1), eur(1)));
         env.close();
         using namespace std::chrono_literals;
-        BEAST_EXPECT(offerOnlyOnceInStream(wsc, 1s, EUR(1), USD(1)));
+        BEAST_EXPECT(offerOnlyOnceInStream(wsc, 1s, eur(1), usd(1)));
 
         // RPC unsubscribe
         auto jv = wsc->invoke("unsubscribe", books);
@@ -1212,10 +1212,10 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(10000), alice, gw);
         env.close();
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 10u;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "lgrNotFound");
@@ -1223,7 +1223,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -1231,28 +1231,28 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
-            jvParams[jss::taker_pays] = Json::objectValue;
+            jvParams[jss::taker_pays] = json::ObjectValue;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(jrr[jss::error_message] == "Missing field 'taker_gets'.");
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays] = "not an object";
-            jvParams[jss::taker_gets] = Json::objectValue;
+            jvParams[jss::taker_gets] = json::ObjectValue;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(jrr[jss::error_message] == "Invalid field 'taker_pays', not object.");
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
-            jvParams[jss::taker_pays] = Json::objectValue;
+            jvParams[jss::taker_pays] = json::ObjectValue;
             jvParams[jss::taker_gets] = "not an object";
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -1260,20 +1260,20 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
-            jvParams[jss::taker_pays] = Json::objectValue;
-            jvParams[jss::taker_gets] = Json::objectValue;
+            jvParams[jss::taker_pays] = json::ObjectValue;
+            jvParams[jss::taker_gets] = json::ObjectValue;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(jrr[jss::error_message] == "Missing field 'taker_pays.currency'.");
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = 1;
-            jvParams[jss::taker_gets] = Json::objectValue;
+            jvParams[jss::taker_gets] = json::ObjectValue;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(
@@ -1281,17 +1281,17 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
-            jvParams[jss::taker_gets] = Json::objectValue;
+            jvParams[jss::taker_gets] = json::ObjectValue;
             auto const jrr = env.rpc("json", "book_offers", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
             BEAST_EXPECT(jrr[jss::error_message] == "Missing field 'taker_gets.currency'.");
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_gets][jss::currency] = 1;
@@ -1302,7 +1302,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "NOT_VALID";
             jvParams[jss::taker_gets][jss::currency] = "XRP";
@@ -1313,7 +1313,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_gets][jss::currency] = "NOT_VALID";
@@ -1324,7 +1324,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_gets][jss::currency] = "USD";
@@ -1336,7 +1336,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_pays][jss::issuer] = 1;
@@ -1348,7 +1348,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_pays][jss::issuer] = gw.human() + "DEAD";
@@ -1360,7 +1360,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_pays][jss::issuer] = toBase58(noAccount());
@@ -1373,7 +1373,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_gets][jss::currency] = "USD";
@@ -1385,7 +1385,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_gets][jss::currency] = "USD";
@@ -1398,7 +1398,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::taker_pays][jss::issuer] = alice.human();
@@ -1413,7 +1413,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "USD";
             jvParams[jss::taker_pays][jss::issuer] = toBase58(xrpAccount());
@@ -1427,7 +1427,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker] = 1;
             jvParams[jss::taker_pays][jss::currency] = "XRP";
@@ -1439,7 +1439,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker] = env.master.human() + "DEAD";
             jvParams[jss::taker_pays][jss::currency] = "XRP";
@@ -1451,7 +1451,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::taker_pays][jss::currency] = "USD";
@@ -1464,7 +1464,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::limit] = "0";  // NOT an integer
@@ -1477,7 +1477,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::limit] = 0;  // must be > 0
@@ -1490,7 +1490,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "USD";
             jvParams[jss::taker_pays][jss::issuer] = gw.human();
@@ -1504,7 +1504,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "USD";
             jvParams[jss::taker_pays][jss::issuer] = gw.human();
@@ -1518,7 +1518,7 @@ public:
                 "for XRP currency specification.");
         }
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::taker_pays][jss::currency] = "USD";
             jvParams[jss::taker_pays][jss::issuer] = gw.human();
@@ -1536,22 +1536,22 @@ public:
     {
         testcase("BookOffer Limits");
         using namespace jtx;
-        Env env{*this, asAdmin ? envconfig() : envconfig(no_admin)};
+        Env env{*this, asAdmin ? envconfig() : envconfig(noAdmin)};
         Account const gw{"gw"};
         env.fund(XRP(200000), gw);
         // Note that calls to env.close() fail without admin permission.
         if (asAdmin)
             env.close();
 
-        auto USD = gw["USD"];
+        auto usd = gw["USD"];
 
-        for (auto i = 0; i <= RPC::Tuning::bookOffers.rmax; i++)
-            env(offer(gw, XRP(50 + (1 * i)), USD(1.0 + (0.1 * i))));
+        for (auto i = 0; i <= RPC::Tuning::kBOOK_OFFERS.rmax; i++)
+            env(offer(gw, XRP(50 + (1 * i)), usd(1.0 + (0.1 * i))));
 
         if (asAdmin)
             env.close();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::limit] = 1;
         jvParams[jss::ledger_index] = "validated";
         jvParams[jss::taker_pays][jss::currency] = "XRP";
@@ -1562,15 +1562,17 @@ 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::bookOffers.rmax + 1;
+        jvParams[jss::limit] = RPC::Tuning::kBOOK_OFFERS.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::bookOffers.rmax + 1 : 0u));
+        BEAST_EXPECT(
+            jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBOOK_OFFERS.rmax + 1 : 0u));
 
-        jvParams[jss::limit] = Json::nullValue;
+        jvParams[jss::limit] = json::NullValue;
         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::bookOffers.rDefault : 0u));
+        BEAST_EXPECT(
+            jrr[jss::offers].size() == (asAdmin ? RPC::Tuning::kBOOK_OFFERS.rDefault : 0u));
     }
 
     void
@@ -1580,7 +1582,7 @@ public:
         using namespace jtx;
 
         FeatureBitset const all{
-            jtx::testable_amendments() | featurePermissionedDomains | featureCredentials |
+            jtx::testableAmendments() | featurePermissionedDomains | featureCredentials |
             featurePermissionedDEX};
 
         Env env(*this, all);
@@ -1590,32 +1592,32 @@ public:
         auto const carol = permDex.carol;
         auto const domainID = permDex.domainID;
         auto const gw = permDex.gw;
-        auto const USD = permDex.USD;
+        auto const usd = permDex.USD;
 
         auto wsc = makeWSClient(env.app().config());
 
-        env(offer(alice, XRP(10), USD(10)), domain(domainID));
+        env(offer(alice, XRP(10), usd(10)), Domain(domainID));
         env.close();
 
-        auto checkBookOffers = [&](Json::Value const& jrr) {
+        auto checkBookOffers = [&](json::Value const& jrr) {
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 1);
             auto const jrOffer = jrr[jss::offers][0u];
             BEAST_EXPECT(jrOffer[sfAccount.fieldName] == alice.human());
             BEAST_EXPECT(
-                jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, USD.issue(), domainID));
+                jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, usd.issue(), domainID));
             BEAST_EXPECT(jrOffer[sfBookNode.fieldName] == "0");
             BEAST_EXPECT(jrOffer[jss::Flags] == 0);
             BEAST_EXPECT(jrOffer[sfLedgerEntryType.fieldName] == jss::Offer);
             BEAST_EXPECT(jrOffer[sfOwnerNode.fieldName] == "0");
-            BEAST_EXPECT(jrOffer[jss::TakerGets] == USD(10).value().getJson(JsonOptions::none));
-            BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(10).value().getJson(JsonOptions::none));
+            BEAST_EXPECT(jrOffer[jss::TakerGets] == usd(10).value().getJson(JsonOptions::KNone));
+            BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(jrOffer[sfDomainID.jsonName].asString() == to_string(domainID));
         };
 
         // book_offers: open book doesn't return offer
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::ledger_index] = "validated";
@@ -1628,15 +1630,15 @@ public:
             BEAST_EXPECT(jrr[jss::offers].size() == 0);
         }
 
-        auto checkSubBooks = [&](Json::Value const& jv) {
+        auto checkSubBooks = [&](json::Value const& jv) {
             BEAST_EXPECT(
                 jv[jss::result].isMember(jss::offers) && jv[jss::result][jss::offers].size() == 1);
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerGets] ==
-                USD(10).value().getJson(JsonOptions::none));
+                usd(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerPays] ==
-                XRP(10).value().getJson(JsonOptions::none));
+                XRP(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][sfDomainID.jsonName].asString() ==
                 to_string(domainID));
@@ -1644,7 +1646,7 @@ public:
 
         // book_offers: requesting domain book returns hybrid offer
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::ledger_index] = "validated";
@@ -1659,10 +1661,10 @@ public:
 
         // subscribe to domain book should return domain offer
         {
-            Json::Value books;
-            books[jss::books] = Json::arrayValue;
+            json::Value books;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_pays][jss::currency] = "XRP";
                 j[jss::taker_gets][jss::currency] = "USD";
@@ -1678,10 +1680,10 @@ public:
 
         // subscribe to open book should not return domain offer
         {
-            Json::Value books;
-            books[jss::books] = Json::arrayValue;
+            json::Value books;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_pays][jss::currency] = "XRP";
                 j[jss::taker_gets][jss::currency] = "USD";
@@ -1703,7 +1705,7 @@ public:
         using namespace jtx;
 
         FeatureBitset const all{
-            jtx::testable_amendments() | featurePermissionedDomains | featureCredentials |
+            jtx::testableAmendments() | featurePermissionedDomains | featureCredentials |
             featurePermissionedDEX};
 
         Env env(*this, all);
@@ -1713,33 +1715,33 @@ public:
         auto const carol = permDex.carol;
         auto const domainID = permDex.domainID;
         auto const gw = permDex.gw;
-        auto const USD = permDex.USD;
+        auto const usd = permDex.USD;
 
         auto wsc = makeWSClient(env.app().config());
 
-        env(offer(alice, XRP(10), USD(10)), domain(domainID), txflags(tfHybrid));
+        env(offer(alice, XRP(10), usd(10)), Domain(domainID), Txflags(tfHybrid));
         env.close();
 
-        auto checkBookOffers = [&](Json::Value const& jrr) {
+        auto checkBookOffers = [&](json::Value const& jrr) {
             BEAST_EXPECT(jrr[jss::offers].isArray());
             BEAST_EXPECT(jrr[jss::offers].size() == 1);
             auto const jrOffer = jrr[jss::offers][0u];
             BEAST_EXPECT(jrOffer[sfAccount.fieldName] == alice.human());
             BEAST_EXPECT(
-                jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, USD.issue(), domainID));
+                jrOffer[sfBookDirectory.fieldName] == getBookDir(env, XRP, usd.issue(), domainID));
             BEAST_EXPECT(jrOffer[sfBookNode.fieldName] == "0");
             BEAST_EXPECT(jrOffer[jss::Flags] == lsfHybrid);
             BEAST_EXPECT(jrOffer[sfLedgerEntryType.fieldName] == jss::Offer);
             BEAST_EXPECT(jrOffer[sfOwnerNode.fieldName] == "0");
-            BEAST_EXPECT(jrOffer[jss::TakerGets] == USD(10).value().getJson(JsonOptions::none));
-            BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(10).value().getJson(JsonOptions::none));
+            BEAST_EXPECT(jrOffer[jss::TakerGets] == usd(10).value().getJson(JsonOptions::KNone));
+            BEAST_EXPECT(jrOffer[jss::TakerPays] == XRP(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(jrOffer[sfDomainID.jsonName].asString() == to_string(domainID));
             BEAST_EXPECT(jrOffer[sfAdditionalBooks.jsonName].size() == 1);
         };
 
         // book_offers: open book returns hybrid offer
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::ledger_index] = "validated";
@@ -1751,15 +1753,15 @@ public:
             checkBookOffers(jrr);
         }
 
-        auto checkSubBooks = [&](Json::Value const& jv) {
+        auto checkSubBooks = [&](json::Value const& jv) {
             BEAST_EXPECT(
                 jv[jss::result].isMember(jss::offers) && jv[jss::result][jss::offers].size() == 1);
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerGets] ==
-                USD(10).value().getJson(JsonOptions::none));
+                usd(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][jss::TakerPays] ==
-                XRP(10).value().getJson(JsonOptions::none));
+                XRP(10).value().getJson(JsonOptions::KNone));
             BEAST_EXPECT(
                 jv[jss::result][jss::offers][0u][sfDomainID.jsonName].asString() ==
                 to_string(domainID));
@@ -1767,7 +1769,7 @@ public:
 
         // book_offers: requesting domain book returns hybrid offer
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::taker] = env.master.human();
             jvParams[jss::taker_pays][jss::currency] = "XRP";
             jvParams[jss::ledger_index] = "validated";
@@ -1782,10 +1784,10 @@ public:
 
         // subscribe to domain book should return hybrid offer
         {
-            Json::Value books;
-            books[jss::books] = Json::arrayValue;
+            json::Value books;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_pays][jss::currency] = "XRP";
                 j[jss::taker_gets][jss::currency] = "USD";
@@ -1806,10 +1808,10 @@ public:
 
         // subscribe to open book should return hybrid offer
         {
-            Json::Value books;
-            books[jss::books] = Json::arrayValue;
+            json::Value books;
+            books[jss::books] = json::ArrayValue;
             {
-                auto& j = books[jss::books].append(Json::objectValue);
+                auto& j = books[jss::books].append(json::ObjectValue);
                 j[jss::snapshot] = true;
                 j[jss::taker_pays][jss::currency] = "XRP";
                 j[jss::taker_gets][jss::currency] = "USD";
diff --git a/src/test/rpc/Connect_test.cpp b/src/test/rpc/Connect_test.cpp
index a37c36d907..6f88bbb715 100644
--- a/src/test/rpc/Connect_test.cpp
+++ b/src/test/rpc/Connect_test.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-class Connect_test : public beast::unit_test::suite
+class Connect_test : public beast::unit_test::Suite
 {
     void
     testErrors()
diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp
index abbeb5c81a..213b4afd01 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 increment 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
@@ -103,7 +103,7 @@ public:
     // variable. After all the txns are checked, all the `numExpected` variables
     // should be zero.
     bool
-    checkTxn(Json::Value const& t, Json::Value const& metaData)
+    checkTxn(json::Value const& t, json::Value const& metaData)
     {
         if (t[jss::TransactionType].asString() != jss::Payment)
             return true;
@@ -187,7 +187,7 @@ public:
     }
 };
 
-class DeliveredAmount_test : public beast::unit_test::suite
+class DeliveredAmount_test : public beast::unit_test::Suite
 {
     void
     testAccountDeliveredAmountSubscribe()
@@ -201,7 +201,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
         Account const bob("bob");
         Account const carol("carol");
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         for (bool const afterSwitchTime : {true, false})
         {
@@ -209,7 +209,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
             cfg->FEES.reference_fee = 10;
             Env env(*this, std::move(cfg));
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
             if (afterSwitchTime)
             {
                 env.close(NetClock::time_point{446000000s});
@@ -224,30 +224,30 @@ class DeliveredAmount_test : public beast::unit_test::suite
                 // add payments, but do no close until subscribed
 
                 // normal payments
-                env(pay(gw, alice, USD(50)));
+                env(pay(gw, alice, usd(50)));
                 checkDeliveredAmount.adjCountersSuccess();
                 env(pay(gw, alice, XRP(50)));
                 checkDeliveredAmount.adjCountersSuccess();
 
                 // partial payment
-                env(pay(gw, bob, USD(9999999)), txflags(tfPartialPayment));
+                env(pay(gw, bob, usd(9999999)), Txflags(tfPartialPayment));
                 checkDeliveredAmount.adjCountersPartialPayment();
-                env.require(balance(bob, USD(1000)));
+                env.require(Balance(bob, usd(1000)));
 
                 // failed payment
-                env(pay(bob, carol, USD(9999999)), ter(tecPATH_PARTIAL));
+                env(pay(bob, carol, usd(9999999)), Ter(tecPATH_PARTIAL));
                 checkDeliveredAmount.adjCountersFail();
-                env.require(balance(carol, USD(0)));
+                env.require(Balance(carol, usd(0)));
             }
 
             auto wsc = makeWSClient(env.app().config());
 
             {
-                Json::Value stream;
+                json::Value stream;
                 // RPC subscribe to ledger stream
-                stream[jss::streams] = Json::arrayValue;
+                stream[jss::streams] = json::ArrayValue;
                 stream[jss::streams].append("ledger");
-                stream[jss::accounts] = Json::arrayValue;
+                stream[jss::accounts] = json::ArrayValue;
                 stream[jss::accounts].append(toBase58(alice.id()));
                 stream[jss::accounts].append(toBase58(bob.id()));
                 stream[jss::accounts].append(toBase58(carol.id()));
@@ -292,7 +292,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
         Account const bob("bob");
         Account const carol("carol");
         auto const gw = Account("gateway");
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
         for (bool const afterSwitchTime : {true, false})
         {
@@ -300,7 +300,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
             cfg->FEES.reference_fee = 10;
             Env env(*this, std::move(cfg));
             env.fund(XRP(10000), alice, bob, carol, gw);
-            env.trust(USD(1000), alice, bob, carol);
+            env.trust(usd(1000), alice, bob, carol);
             if (afterSwitchTime)
             {
                 env.close(NetClock::time_point{446000000s});
@@ -312,23 +312,23 @@ class DeliveredAmount_test : public beast::unit_test::suite
 
             CheckDeliveredAmount checkDeliveredAmount{afterSwitchTime};
             // normal payments
-            env(pay(gw, alice, USD(50)));
+            env(pay(gw, alice, usd(50)));
             checkDeliveredAmount.adjCountersSuccess();
             env(pay(gw, alice, XRP(50)));
             checkDeliveredAmount.adjCountersSuccess();
 
             // partial payment
-            env(pay(gw, bob, USD(9999999)), txflags(tfPartialPayment));
+            env(pay(gw, bob, usd(9999999)), Txflags(tfPartialPayment));
             checkDeliveredAmount.adjCountersPartialPayment();
-            env.require(balance(bob, USD(1000)));
+            env.require(Balance(bob, usd(1000)));
 
             // failed payment
-            env(pay(gw, carol, USD(9999999)), ter(tecPATH_PARTIAL));
+            env(pay(gw, carol, usd(9999999)), Ter(tecPATH_PARTIAL));
             checkDeliveredAmount.adjCountersFail();
-            env.require(balance(carol, USD(0)));
+            env.require(Balance(carol, usd(0)));
 
             env.close();
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 4u;
             jvParams[jss::transactions] = true;
             jvParams[jss::expand] = true;
@@ -355,7 +355,7 @@ class DeliveredAmount_test : public beast::unit_test::suite
 
         mptAlice.create(
             {.transferFee = 25000, .ownerCount = 1, .holderCount = 0, .flags = tfMPTCanTransfer});
-        auto const MPT = mptAlice["MPT"];
+        auto const mpt = mptAlice["MPT"];
 
         mptAlice.authorize({.account = bob});
         mptAlice.authorize({.account = carol});
@@ -364,43 +364,43 @@ class DeliveredAmount_test : public beast::unit_test::suite
         mptAlice.pay(alice, bob, 10000);
 
         // holder to holder
-        env(pay(bob, carol, mptAlice.mpt(1000)), txflags(tfPartialPayment));
+        env(pay(bob, carol, mptAlice.mpt(1000)), Txflags(tfPartialPayment));
         env.close();
 
         // Get the hash for the most recent transaction.
-        std::string txHash{env.tx()->getJson(JsonOptions::none)[jss::hash].asString()};
-        Json::Value meta = env.rpc("tx", txHash)[jss::result][jss::meta];
+        std::string txHash{env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString()};
+        json::Value meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         if (features[fixMPTDeliveredAmount])
         {
             BEAST_EXPECT(
-                meta[sfDeliveredAmount.jsonName] == STAmount{MPT(800)}.getJson(JsonOptions::none));
+                meta[sfDeliveredAmount.jsonName] == STAmount{mpt(800)}.getJson(JsonOptions::KNone));
             BEAST_EXPECT(
-                meta[jss::delivered_amount] == STAmount{MPT(800)}.getJson(JsonOptions::none));
+                meta[jss::delivered_amount] == STAmount{mpt(800)}.getJson(JsonOptions::KNone));
         }
         else
         {
             BEAST_EXPECT(!meta.isMember(sfDeliveredAmount.jsonName));
-            BEAST_EXPECT(meta[jss::delivered_amount] = Json::Value("unavailable"));
+            BEAST_EXPECT(meta[jss::delivered_amount] = json::Value("unavailable"));
         }
 
-        env(pay(bob, carol, MPT(1000)), sendmax(MPT(1200)), txflags(tfPartialPayment));
+        env(pay(bob, carol, mpt(1000)), Sendmax(mpt(1200)), Txflags(tfPartialPayment));
         env.close();
 
-        txHash = env.tx()->getJson(JsonOptions::none)[jss::hash].asString();
+        txHash = env.tx()->getJson(JsonOptions::KNone)[jss::hash].asString();
         meta = env.rpc("tx", txHash)[jss::result][jss::meta];
 
         if (features[fixMPTDeliveredAmount])
         {
             BEAST_EXPECT(
-                meta[sfDeliveredAmount.jsonName] == STAmount{MPT(960)}.getJson(JsonOptions::none));
+                meta[sfDeliveredAmount.jsonName] == STAmount{mpt(960)}.getJson(JsonOptions::KNone));
             BEAST_EXPECT(
-                meta[jss::delivered_amount] == STAmount{MPT(960)}.getJson(JsonOptions::none));
+                meta[jss::delivered_amount] == STAmount{mpt(960)}.getJson(JsonOptions::KNone));
         }
         else
         {
             BEAST_EXPECT(!meta.isMember(sfDeliveredAmount.jsonName));
-            BEAST_EXPECT(meta[jss::delivered_amount] = Json::Value("unavailable"));
+            BEAST_EXPECT(meta[jss::delivered_amount] = json::Value("unavailable"));
         }
     }
 
@@ -409,7 +409,7 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
 
         testTxDeliveredAmountRPC();
         testAccountDeliveredAmountSubscribe();
diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp
index 900adb5c7e..542f1c2c85 100644
--- a/src/test/rpc/DepositAuthorized_test.cpp
+++ b/src/test/rpc/DepositAuthorized_test.cpp
@@ -8,6 +8,7 @@
 
 #include <xrpl/beast/unit_test/suite.h>
 #include <xrpl/json/json_value.h>
+#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
@@ -20,18 +21,18 @@
 
 namespace xrpl::test {
 
-class DepositAuthorized_test : public beast::unit_test::suite
+class DepositAuthorized_test : public beast::unit_test::Suite
 {
 public:
     // Helper function that builds arguments for a deposit_authorized command.
-    static Json::Value
+    static json::Value
     depositAuthArgs(
         jtx::Account const& source,
         jtx::Account const& dest,
         std::string const& ledger = "",
         std::vector<std::string> const& credentials = {})
     {
-        Json::Value args{Json::objectValue};
+        json::Value args{json::ObjectValue};
         args[jss::source_account] = source.human();
         args[jss::destination_account] = dest.human();
         if (!ledger.empty())
@@ -39,7 +40,7 @@ public:
 
         if (!credentials.empty())
         {
-            auto& arr(args[jss::credentials] = Json::arrayValue);
+            auto& arr(args[jss::credentials] = json::ArrayValue);
             for (auto const& s : credentials)
                 arr.append(s);
         }
@@ -50,9 +51,9 @@ public:
     // Helper function that verifies a deposit_authorized request was
     // successful and returned the expected value.
     void
-    validateDepositAuthResult(Json::Value const& result, bool authorized)
+    validateDepositAuthResult(json::Value const& result, bool authorized)
     {
-        Json::Value const& results{result[jss::result]};
+        json::Value const& results{result[jss::result]};
         BEAST_EXPECT(results[jss::deposit_authorized] == authorized);
         BEAST_EXPECT(results[jss::status] == jss::success);
     }
@@ -154,7 +155,7 @@ public:
 
         // Lambda that checks the (error) result of deposit_authorized.
         auto verifyErr = [this](
-                             Json::Value const& result, char const* error, char const* errorMsg) {
+                             json::Value const& result, char const* error, char const* errorMsg) {
             BEAST_EXPECT(result[jss::result][jss::status] == jss::error);
             BEAST_EXPECT(result[jss::result][jss::error] == error);
             BEAST_EXPECT(result[jss::result][jss::error_message] == errorMsg);
@@ -163,94 +164,94 @@ public:
         Env env(*this);
         {
             // Missing source_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args.removeMember(jss::source_account);
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "invalidParams", "Missing field 'source_account'.");
         }
         {
             // Non-string source_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args[jss::source_account] = 7.3;
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "invalidParams", "Invalid field 'source_account', not a string.");
         }
         {
             // Corrupt source_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args[jss::source_account] = "rG1QQv2nh2gr7RCZ!P8YYcBUKCCN633jCn";
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "actMalformed", "Account malformed.");
         }
         {
             // Missing destination_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args.removeMember(jss::destination_account);
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "invalidParams", "Missing field 'destination_account'.");
         }
         {
             // Non-string destination_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args[jss::destination_account] = 7.3;
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(
                 result, "invalidParams", "Invalid field 'destination_account', not a string.");
         }
         {
             // Corrupt destination_account field.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args[jss::destination_account] = "rP6P9ypfAmc!pw8SZHNwM4nvZHFXDraQas";
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "actMalformed", "Account malformed.");
         }
         {
             // Request an invalid ledger.
-            Json::Value const args{depositAuthArgs(alice, becky, "-1")};
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const args{depositAuthArgs(alice, becky, "-1")};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(
                 result, "invalidParams", "Invalid field 'ledger_index', not string or number.");
         }
         {
             // Request a ledger that doesn't exist yet as a string.
-            Json::Value const args{depositAuthArgs(alice, becky, "17")};
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const args{depositAuthArgs(alice, becky, "17")};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "lgrNotFound", "ledgerNotFound");
         }
         {
             // Request a ledger that doesn't exist yet.
-            Json::Value args{depositAuthArgs(alice, becky)};
+            json::Value args{depositAuthArgs(alice, becky)};
             args[jss::ledger_index] = 17;
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "lgrNotFound", "ledgerNotFound");
         }
         {
             // alice is not yet funded.
-            Json::Value const args{depositAuthArgs(alice, becky)};
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const args{depositAuthArgs(alice, becky)};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "srcActNotFound", "Source account not found.");
         }
         env.fund(XRP(1000), alice);
         env.close();
         {
             // becky is not yet funded.
-            Json::Value const args{depositAuthArgs(alice, becky)};
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const args{depositAuthArgs(alice, becky)};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             verifyErr(result, "dstActNotFound", "Destination account not found.");
         }
         env.fund(XRP(1000), becky);
         env.close();
         {
             // Once becky is funded try it again and see it succeed.
-            Json::Value const args{depositAuthArgs(alice, becky)};
-            Json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
+            json::Value const args{depositAuthArgs(alice, becky)};
+            json::Value const result{env.rpc("json", "deposit_authorized", args.toStyledString())};
             validateDepositAuthResult(result, true);
         }
     }
 
     void
     checkCredentialsResponse(
-        Json::Value const& result,
+        json::Value const& result,
         jtx::Account const& src,
         jtx::Account const& dst,
         bool authorized,
@@ -330,7 +331,7 @@ public:
             testcase("deposit_authorized with credentials failure: empty array.");
 
             auto args = depositAuthArgs(alice, becky, "validated");
-            args[jss::credentials] = Json::arrayValue;
+            args[jss::credentials] = json::ArrayValue;
 
             auto const jv = env.rpc("json", "deposit_authorized", args.toStyledString());
             checkCredentialsResponse(jv[jss::result], alice, becky, false, {}, "invalidParams");
@@ -342,7 +343,7 @@ public:
                 "credentials");
 
             auto args = depositAuthArgs(alice, becky, "validated");
-            args[jss::credentials] = Json::arrayValue;
+            args[jss::credentials] = json::ArrayValue;
             args[jss::credentials].append(1);
             args[jss::credentials].append(3);
 
@@ -356,7 +357,7 @@ public:
                 "credentials");
 
             auto args = depositAuthArgs(alice, becky, "validated");
-            args[jss::credentials] = Json::arrayValue;
+            args[jss::credentials] = json::ArrayValue;
             args[jss::credentials].append("hello world");
 
             auto const jv = env.rpc("json", "deposit_authorized", args.toStyledString());
@@ -414,7 +415,7 @@ public:
         }
 
         {
-            static std::vector<std::string> const credIds = {
+            static std::vector<std::string> const kCRED_IDS = {
                 "18004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "28004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "38004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
@@ -425,15 +426,15 @@ public:
                 "88004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
                 "98004829F915654A81B11C4AB8218D96FED67F209B58328A72314FB6EA288BE4",
             };
-            assert(credIds.size() > maxCredentialsArraySize);
+            assert(kCRED_IDS.size() > kMAX_CREDENTIALS_ARRAY_SIZE);
 
             testcase("deposit_authorized too long credentials");
             auto const jv = env.rpc(
                 "json",
                 "deposit_authorized",
-                depositAuthArgs(alice, becky, "validated", credIds).toStyledString());
+                depositAuthArgs(alice, becky, "validated", kCRED_IDS).toStyledString());
             checkCredentialsResponse(
-                jv[jss::result], alice, becky, false, credIds, "invalidParams");
+                jv[jss::result], alice, becky, false, kCRED_IDS, "invalidParams");
         }
 
         {
diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp
index cdeff57131..3eedc5fa14 100644
--- a/src/test/rpc/Feature_test.cpp
+++ b/src/test/rpc/Feature_test.cpp
@@ -22,7 +22,7 @@
 
 namespace xrpl {
 
-class Feature_test : public beast::unit_test::suite
+class Feature_test : public beast::unit_test::Suite
 {
     void
     testInternals()
@@ -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 ok63Name = [] {
+        constexpr auto kOK63_NAME = [] {
             return "123456789012345678901234567890123456789012345678901234567890123";
         };
-        static_assert(validFeatureNameSize(ok63Name));
+        static_assert(validFeatureNameSize(kOK63_NAME));
 
-        constexpr auto bad64Name = [] {
+        constexpr auto kBAD64_NAME = [] {
             return "1234567890123456789012345678901234567890123456789012345678901234";
         };
-        static_assert(!validFeatureNameSize(bad64Name));
+        static_assert(!validFeatureNameSize(kBAD64_NAME));
 
-        constexpr auto ok31Name = [] { return "1234567890123456789012345678901"; };
-        static_assert(validFeatureNameSize(ok31Name));
+        constexpr auto kOK31_NAME = [] { return "1234567890123456789012345678901"; };
+        static_assert(validFeatureNameSize(kOK31_NAME));
 
-        constexpr auto bad32Name = [] { return "12345678901234567890123456789012"; };
-        static_assert(!validFeatureNameSize(bad32Name));
+        constexpr auto kBAD32_NAME = [] { return "12345678901234567890123456789012"; };
+        static_assert(!validFeatureNameSize(kBAD32_NAME));
 
-        constexpr auto ok33Name = [] { return "123456789012345678901234567890123"; };
-        static_assert(validFeatureNameSize(ok33Name));
+        constexpr auto kOK33_NAME = [] { return "123456789012345678901234567890123"; };
+        static_assert(validFeatureNameSize(kOK33_NAME));
 
         // Test feature character set checks
-        constexpr auto okName = [] { return "AMM_123"; };
-        static_assert(validFeatureName(okName));
+        constexpr auto kOK_NAME = [] { return "AMM_123"; };
+        static_assert(validFeatureName(kOK_NAME));
 
         // First character is Greek Capital Alpha, visually confusable with ASCII 'A'
-        constexpr auto badName = [] { return "ΑMM_123"; };
-        static_assert(!validFeatureName(badName));
+        constexpr auto kBAD_NAME = [] { return "ΑMM_123"; };
+        static_assert(!validFeatureName(kBAD_NAME));
 
-        constexpr auto badEmoji = [] { return "🔥"; };
-        static_assert(!validFeatureName(badEmoji));
+        constexpr auto kBAD_EMOJI = [] { return "🔥"; };
+        static_assert(!validFeatureName(kBAD_EMOJI));
     }
 
     void
@@ -248,7 +248,7 @@ class Feature_test : public beast::unit_test::suite
         Env env{*this};
 
         auto testInvalidParam = [&](auto const& param) {
-            Json::Value params;
+            json::Value params;
             params[jss::feature] = param;
             auto jrr = env.rpc("json", "feature", to_string(params))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -258,9 +258,9 @@ class Feature_test : public beast::unit_test::suite
         testInvalidParam(1);
         testInvalidParam(1.1);
         testInvalidParam(true);
-        testInvalidParam(Json::Value(Json::nullValue));
-        testInvalidParam(Json::Value(Json::objectValue));
-        testInvalidParam(Json::Value(Json::arrayValue));
+        testInvalidParam(json::Value(json::NullValue));
+        testInvalidParam(json::Value(json::ObjectValue));
+        testInvalidParam(json::Value(json::ArrayValue));
 
         {
             auto jrr = env.rpc("feature", "AllTheThings")[jss::result];
@@ -312,7 +312,7 @@ class Feature_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value params;
+            json::Value params;
             // invalid feature
             params[jss::feature] =
                 "1234567890ABCDEF1234567890ABCDEF1234567890ABCDEF1234567890ABCD"
@@ -323,7 +323,7 @@ class Feature_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value params;
+            json::Value params;
             params[jss::feature] =
                 "93E516234E35E08CA689FA33A6D38E103881F8DCB53023F728C307AA89D515"
                 "A7";
@@ -474,40 +474,40 @@ class Feature_test : public beast::unit_test::suite
 
         using namespace test::jtx;
         Env env{*this, FeatureBitset{featurePriceOracle}};
-        constexpr char const* featureName = "fixAMMOverflowOffer";
+        constexpr char const* kFEATURE_NAME = "fixAMMOverflowOffer";
 
-        auto jrr = env.rpc("feature", featureName)[jss::result];
+        auto jrr = env.rpc("feature", kFEATURE_NAME)[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] == featureName, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "name");
         BEAST_EXPECTS(feature[jss::vetoed].isBool() && !feature[jss::vetoed].asBool(), "vetoed");
 
-        jrr = env.rpc("feature", featureName, "reject")[jss::result];
+        jrr = env.rpc("feature", kFEATURE_NAME, "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] == featureName, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "name");
         BEAST_EXPECTS(feature[jss::vetoed].isBool() && feature[jss::vetoed].asBool(), "vetoed");
 
-        jrr = env.rpc("feature", featureName, "accept")[jss::result];
+        jrr = env.rpc("feature", kFEATURE_NAME, "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] == featureName, "name");
+        BEAST_EXPECTS(feature[jss::name] == kFEATURE_NAME, "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", featureName, "maybe");
+        jrr = env.rpc("feature", kFEATURE_NAME, "maybe");
         BEAST_EXPECT(jrr[jss::error] == "invalidParams");
         BEAST_EXPECT(jrr[jss::error_message] == "Invalid parameters.");
     }
diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h
index 495dcc22bc..15d335781d 100644
--- a/src/test/rpc/GRPCTestClientBase.h
+++ b/src/test/rpc/GRPCTestClientBase.h
@@ -12,7 +12,7 @@ namespace test {
 struct GRPCTestClientBase
 {
     explicit GRPCTestClientBase(std::string const& port)
-        : stub_(
+        : stub(
               org::xrpl::rpc::v1::XRPLedgerAPIService::NewStub(
                   grpc::CreateChannel(
                       beast::IP::Endpoint(
@@ -25,7 +25,7 @@ struct GRPCTestClientBase
 
     grpc::Status status;
     grpc::ClientContext context;
-    std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stub> stub_;
+    std::unique_ptr<org::xrpl::rpc::v1::XRPLedgerAPIService::Stub> stub;
 };
 
 }  // namespace test
diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp
index 95c7d425c1..4f23db7b66 100644
--- a/src/test/rpc/GatewayBalances_test.cpp
+++ b/src/test/rpc/GatewayBalances_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::test {
 
-class GatewayBalances_test : public beast::unit_test::suite
+class GatewayBalances_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -31,44 +31,44 @@ public:
             // Gateway account and assets
             Account const alice{"alice"};
             env.fund(XRP(10000), "alice");
-            auto USD = alice["USD"];
-            auto CNY = alice["CNY"];
-            auto JPY = alice["JPY"];
+            auto usd = alice["USD"];
+            auto cny = alice["CNY"];
+            auto jpy = alice["JPY"];
 
             // Create a hotwallet
             Account const hw{"hw"};
             env.fund(XRP(10000), "hw");
             env.close();
-            env(trust(hw, USD(10000)));
-            env(trust(hw, JPY(10000)));
-            env(pay(alice, hw, USD(5000)));
-            env(pay(alice, hw, JPY(5000)));
+            env(trust(hw, usd(10000)));
+            env(trust(hw, jpy(10000)));
+            env(pay(alice, hw, usd(5000)));
+            env(pay(alice, hw, jpy(5000)));
 
             // Create some clients
             Account const bob{"bob"};
             env.fund(XRP(10000), "bob");
             env.close();
-            env(trust(bob, USD(100)));
-            env(trust(bob, CNY(100)));
-            env(pay(alice, bob, USD(50)));
+            env(trust(bob, usd(100)));
+            env(trust(bob, cny(100)));
+            env(pay(alice, bob, usd(50)));
 
             Account const charley{"charley"};
             env.fund(XRP(10000), "charley");
             env.close();
-            env(trust(charley, CNY(500)));
-            env(trust(charley, JPY(500)));
-            env(pay(alice, charley, CNY(250)));
-            env(pay(alice, charley, JPY(250)));
+            env(trust(charley, cny(500)));
+            env(trust(charley, jpy(500)));
+            env(pay(alice, charley, cny(250)));
+            env(pay(alice, charley, jpy(250)));
 
             Account const dave{"dave"};
             env.fund(XRP(10000), "dave");
             env.close();
-            env(trust(dave, CNY(100)));
-            env(pay(alice, dave, CNY(30)));
+            env(trust(dave, cny(100)));
+            env(pay(alice, dave, cny(30)));
 
             // give the gateway an asset
             env(trust(alice, charley["USD"](50)));
-            env(pay(charley, alice, USD(10)));
+            env(pay(charley, alice, usd(10)));
 
             // freeze dave
             env(trust(alice, dave["CNY"](0), dave, tfSetFreeze));
@@ -77,7 +77,7 @@ public:
 
             auto wsc = makeWSClient(env.app().config());
 
-            Json::Value qry;
+            json::Value qry;
             qry[jss::account] = alice.human();
             qry[jss::hotwallet] = hw.human();
 
@@ -161,7 +161,7 @@ public:
 
         auto wsc = makeWSClient(env.app().config());
 
-        Json::Value qry2;
+        json::Value qry2;
         qry2[jss::account] = alice.human();
         qry2[jss::hotwallet] = "asdf";
 
@@ -187,10 +187,10 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(10000), alice);
         env.close();
-        auto USD = alice["USD"];
+        auto usd = alice["USD"];
 
         // The largest valid STAmount of USD:
-        STAmount const maxUSD(USD, STAmount::cMaxValue, STAmount::cMaxOffset);
+        STAmount const maxUSD(usd, STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
 
         // Create a hotwallet
         Account const hw{"hw"};
@@ -219,7 +219,7 @@ public:
 
         auto wsc = makeWSClient(env.app().config());
 
-        Json::Value query;
+        json::Value query;
         query[jss::account] = alice.human();
         query[jss::hotwallet] = hw.human();
 
@@ -239,8 +239,8 @@ public:
         using namespace std::chrono_literals;
         using namespace jtx;
 
-        // testable_amendments() includes MPT
-        FeatureBitset const features = testable_amendments();
+        // testableAmendments() includes MPT
+        FeatureBitset const features = testableAmendments();
         Env env(*this, features);
 
         Account const alice{"alice"};
@@ -258,13 +258,13 @@ public:
         mpt.pay(alice, bob, 1000);
 
         // Bob creates an escrow of MPT to Alice.
-        auto const MPT = mpt["MPT"];
-        env(escrow::create(bob, alice, MPT(100)), escrow::finish_time(env.now() + 10s));
+        auto const MPT = mpt["MPT"];  // NOLINT(readability-identifier-naming)
+        env(escrow::create(bob, alice, MPT(100)), escrow::kFINISH_TIME(env.now() + 10s));
         env.close();
 
         // Query gateway_balances for Bob.
         auto wsc = makeWSClient(env.app().config());
-        Json::Value qry;
+        json::Value qry;
         qry[jss::account] = bob.human();
 
         auto jv = wsc->invoke("gateway_balances", qry);
@@ -275,7 +275,7 @@ public:
     run() override
     {
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         for (auto feature : {sa - featurePermissionedDEX, sa})
         {
             testGWB(feature);
diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp
index ea8c498619..418b36d703 100644
--- a/src/test/rpc/GetAggregatePrice_test.cpp
+++ b/src/test/rpc/GetAggregatePrice_test.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl::test::jtx::oracle {
 
-class GetAggregatePrice_test : public beast::unit_test::suite
+class GetAggregatePrice_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -25,22 +25,22 @@ public:
         using namespace jtx;
         Account const owner{"owner"};
         Account const some{"some"};
-        static OraclesData oracles = {{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", oracles);
+            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, oracles);
+            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 = {
-                NoneTag,
+                kNONE_TAG,
                 1,
                 -1,
                 1.2,
@@ -56,11 +56,11 @@ public:
                 "012345678901234567890123456789012345678G"};
             for (auto const& v : invalidAsset)
             {
-                ret = Oracle::aggregatePrice(env, "USD", v, oracles);
+                ret = Oracle::aggregatePrice(env, "USD", v, kORACLES);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
-                ret = Oracle::aggregatePrice(env, v, "USD", oracles);
+                ret = Oracle::aggregatePrice(env, v, "USD", kORACLES);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
-                ret = Oracle::aggregatePrice(env, v, v, oracles);
+                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", oracles);
+            ret = Oracle::aggregatePrice(env, "YAN", "USD", kORACLES);
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
 
             // invalid oracle document id
@@ -81,11 +81,11 @@ public:
             ret = Oracle::aggregatePrice(env, "XRP", "USD", {{{owner, 2}}});
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
             // invalid values
-            std::vector<AnyValue> const invalidDocument = {NoneTag, 1.2, -1, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidDocument = {kNONE_TAG, 1.2, -1, "", "none", "1.2"};
             for (auto const& v : invalidDocument)
             {
                 ret = Oracle::aggregatePrice(env, "XRP", "USD", {{{owner, v}}});
-                Json::Value jv;
+                json::Value jv;
                 toJson(jv, v);
                 BEAST_EXPECT(ret[jss::error].asString() == "invalidParams");
             }
@@ -111,7 +111,8 @@ public:
             BEAST_EXPECT(ret[jss::error].asString() == "objectNotFound");
 
             // invalid trim value
-            std::vector<AnyValue> const invalidTrim = {NoneTag, 0, 26, -1, 1.2, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidTrim = {
+                kNONE_TAG, 0, 26, -1, 1.2, "", "none", "1.2"};
             for (auto const& v : invalidTrim)
             {
                 ret =
@@ -120,7 +121,7 @@ public:
             }
 
             // invalid time threshold value
-            std::vector<AnyValue> const invalidTime = {NoneTag, -1, 1.2, "", "none", "1.2"};
+            std::vector<AnyValue> const invalidTime = {kNONE_TAG, -1, 1.2, "", "none", "1.2"};
             for (auto const& v : invalidTime)
             {
                 ret = Oracle::aggregatePrice(
@@ -174,11 +175,11 @@ public:
         // Aggregate data set includes all price oracle instances, no trimming
         // or time threshold
         {
-            auto const all = testable_amendments();
+            auto const all = testableAmendments();
             for (auto const& feats : {all - featureSingleAssetVault - featureLendingProtocol, all})
             {
                 for (auto const mantissaSize :
-                     {MantissaRange::mantissa_scale::small, MantissaRange::mantissa_scale::large})
+                     {MantissaRange::MantissaScale::Small, MantissaRange::MantissaScale::Large})
                 {
                     // Regardless of the features enabled, RPC is controlled by
                     // the global mantissa size. And since it's a thread-local,
diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp
index 62e2aadfe6..3b1fc59af5 100644
--- a/src/test/rpc/GetCounts_test.cpp
+++ b/src/test/rpc/GetCounts_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl {
 
-class GetCounts_test : public beast::unit_test::suite
+class GetCounts_test : public beast::unit_test::Suite
 {
     void
     testGetCounts()
@@ -21,7 +21,7 @@ class GetCounts_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env(*this);
 
-        Json::Value result;
+        json::Value result;
         {
             using namespace std::chrono_literals;
             // Add a little delay so the App's "uptime" will have a value.
diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp
index bb9b72c63f..e900b92fc3 100644
--- a/src/test/rpc/Handler_test.cpp
+++ b/src/test/rpc/Handler_test.cpp
@@ -35,7 +35,7 @@ operator<<(std::ostream& os, std::chrono::nanoseconds ns)
 // dissimilar to how xrpld will normally work.
 // TODO as https://github.com/XRPLF/rippled/issues/4765
 
-class Handler_test : public beast::unit_test::suite
+class Handler_test : public beast::unit_test::Suite
 {
     auto
     time(std::size_t n, auto f, auto prng) -> auto
@@ -43,7 +43,7 @@ class Handler_test : public beast::unit_test::suite
         using clock = std::chrono::steady_clock;
         assert(n > 0);
         double sum = 0;
-        double sum_squared = 0;
+        double sumSquared = 0;
         std::size_t j = 0;
         while (j < n)
         {
@@ -69,14 +69,14 @@ class Handler_test : public beast::unit_test::suite
             {
                 j += 1;
                 sum += samples[k];
-                sum_squared += (samples[k] * samples[k]);
+                sumSquared += (samples[k] * samples[k]);
             }
         }
 
-        double const mean_squared = (sum * sum) / (j * j);
+        double const meanSquared = (sum * sum) / (j * j);
         return std::make_tuple(
             clock::duration{static_cast<long>(sum / j)},
-            clock::duration{static_cast<long>(std::sqrt((sum_squared / j) - mean_squared))},
+            clock::duration{static_cast<long>(std::sqrt((sumSquared / j) - meanSquared))},
             j);
     }
 
@@ -88,7 +88,7 @@ class Handler_test : public beast::unit_test::suite
         std::random_device dev;
         std::ranlux48 prng(dev());
 
-        std::vector<char const*> names = test::jtx::make_vector(xrpl::RPC::getHandlerNames());
+        std::vector<char const*> names = test::jtx::makeVector(xrpl::RPC::getHandlerNames());
 
         std::uniform_int_distribution<std::size_t> distr{0, names.size() - 1};
 
@@ -97,7 +97,7 @@ class Handler_test : public beast::unit_test::suite
             1'000'000,
             [&](std::size_t i) {
                 auto const d = RPC::getHandler(1, false, names[i]);
-                dummy = dummy + i + (int)d->role_;
+                dummy = dummy + i + (int)d->role;
             },
             [&]() -> std::size_t { return distr(prng); });
 
diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp
index 40c2389617..6c45815555 100644
--- a/src/test/rpc/JSONRPC_test.cpp
+++ b/src/test/rpc/JSONRPC_test.cpp
@@ -49,17 +49,17 @@ struct TxnTestData
     //   3. sign_for, and
     //   4. submit_multisigned.
     // The JSON is not valid for all of these interfaces, but it should
-    // crash none 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;
 
     constexpr TxnTestData(
-        char const* description_,
-        int line_,
-        char const* json_,
-        std::array<char const* const, 4> const& expMsg_)
-        : description(description_), line(line_), json(json_), expMsg{expMsg_}
+        char const* description,
+        int line,
+        char const* json,
+        std::array<char const* const, 4> const& expMsg)
+        : description(description), line(line), json(json), expMsg{expMsg}
     {
     }
 
@@ -72,7 +72,7 @@ struct TxnTestData
     operator=(TxnTestData&&) = delete;
 };
 
-static constexpr TxnTestData txnTestArray[] = {
+static constexpr TxnTestData kTXN_TEST_ARRAY[] = {
 
     {"Minimal payment, no Amount only DeliverMax",
      __LINE__,
@@ -2094,7 +2094,7 @@ static constexpr TxnTestData txnTestArray[] = {
 
 };
 
-class JSONRPC_test : public beast::unit_test::suite
+class JSONRPC_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -2102,7 +2102,7 @@ public:
     {
         testcase("bad RPC command");
         test::jtx::Env env(*this);
-        Json::Value const result{env.rpc("bad_command", R"({"MakingThisUp": 0})")};
+        json::Value const result{env.rpc("bad_command", R"({"MakingThisUp": 0})")};
 
         BEAST_EXPECT(result[jss::result][jss::error] == "unknownCmd");
         BEAST_EXPECT(result[jss::result][jss::request][jss::command] == "bad_command");
@@ -2119,7 +2119,7 @@ public:
             Env env(*this);
             auto ledger = env.current();
             auto const& feeTrack = env.app().getFeeTrack();
-            Json::Value req;
+            json::Value req;
             Account const alice("alice");
             Account const bob("bob");
             env.fund(XRP(100000), alice);
@@ -2129,20 +2129,20 @@ public:
             auto const seq = env.seq(alice);
             auto jt = env.jtnofill(
                 batch::outer(alice, env.seq(alice), batchFee, tfAllOrNothing),
-                batch::inner(pay(alice, bob, XRP(1)), seq + 1),
-                batch::inner(pay(alice, bob, XRP(2)), seq + 2),
-                batch::inner(pay(alice, bob, XRP(3)), seq + 3),
-                batch::inner(pay(alice, bob, XRP(4)), seq + 4),
-                batch::inner(pay(alice, bob, XRP(5)), seq + 5),
-                batch::inner(pay(alice, bob, XRP(6)), seq + 6),
-                batch::inner(pay(alice, bob, XRP(7)), seq + 7),
-                batch::inner(pay(alice, bob, XRP(8)), seq + 8),
-                batch::inner(pay(alice, bob, XRP(9)), seq + 9));
+                batch::Inner(pay(alice, bob, XRP(1)), seq + 1),
+                batch::Inner(pay(alice, bob, XRP(2)), seq + 2),
+                batch::Inner(pay(alice, bob, XRP(3)), seq + 3),
+                batch::Inner(pay(alice, bob, XRP(4)), seq + 4),
+                batch::Inner(pay(alice, bob, XRP(5)), seq + 5),
+                batch::Inner(pay(alice, bob, XRP(6)), seq + 6),
+                batch::Inner(pay(alice, bob, XRP(7)), seq + 7),
+                batch::Inner(pay(alice, bob, XRP(8)), seq + 8),
+                batch::Inner(pay(alice, bob, XRP(9)), seq + 9));
 
             jt.jv.removeMember(jss::Fee);
             jt.jv.removeMember(jss::TxnSignature);
             req[jss::tx_json] = jt.jv;
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2161,7 +2161,7 @@ public:
             Env env(*this);
             auto ledger = env.current();
             auto const& feeTrack = env.app().getFeeTrack();
-            Json::Value req;
+            json::Value req;
             Account const alice("alice");
             Account const bob("bob");
             env.fund(XRP(100000), alice, bob);
@@ -2169,7 +2169,7 @@ public:
 
             auto jt = env.jtnofill(
                 noop(alice),
-                msig(
+                Msig(
                     alice,
                     alice,
                     alice,
@@ -2212,7 +2212,7 @@ public:
                     alice));
 
             req[jss::tx_json] = jt.jv;
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2237,9 +2237,9 @@ public:
         auto const& feeTrack = env.app().getFeeTrack();
 
         {
-            Json::Value req;
-            Json::Reader().parse("{ \"fee_mult_max\" : 1, \"tx_json\" : { } } ", req);
-            Json::Value const result = checkFee(
+            json::Value req;
+            json::Reader().parse("{ \"fee_mult_max\" : 1, \"tx_json\" : { } } ", req);
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2248,18 +2248,18 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == baseFee);
         }
 
         {
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 "{ \"fee_mult_max\" : 3, \"fee_div_max\" : 2, "
                 "\"tx_json\" : { } } ",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2268,15 +2268,15 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == baseFee);
         }
 
         {
-            Json::Value req;
-            Json::Reader().parse("{ \"fee_mult_max\" : 0, \"tx_json\" : { } } ", req);
-            Json::Value const result = checkFee(
+            json::Value req;
+            json::Reader().parse("{ \"fee_mult_max\" : 0, \"tx_json\" : { } } ", req);
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2285,19 +2285,19 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
             // 3/6 = 1/2, but use the bigger number make sure
             // we're dividing.
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 "{ \"fee_mult_max\" : 3, \"fee_div_max\" : 6, "
                 "\"tx_json\" : { } } ",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2306,17 +2306,17 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 "{ \"fee_mult_max\" : 0, \"fee_div_max\" : 2, "
                 "\"tx_json\" : { } } ",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2325,17 +2325,17 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 "{ \"fee_mult_max\" : 10, \"fee_div_max\" : 0, "
                 "\"tx_json\" : { } } ",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2344,16 +2344,16 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
             // transaction with a higher base fee
-            Json::Value req;
+            json::Value req;
             test::jtx::Account const alice("alice");
             req[jss::tx_json] = test::jtx::acctdelete(env.master.human(), alice.human());
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2383,14 +2383,14 @@ public:
 
         {
             // high mult, no tx
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 1000,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2399,20 +2399,20 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 10);
         }
 
         {
             // low mult, no tx
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 5,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2421,7 +2421,7 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 10);
         }
 
@@ -2433,14 +2433,14 @@ public:
 
         {
             // high mult, 4 txs
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 1000,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2449,21 +2449,21 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 8889);
         }
 
         {
             // low mult, 4 tx
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 5,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2472,21 +2472,21 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
             // different low mult, 4 tx
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 1000,
                 "fee_div_max" : 3,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2495,21 +2495,21 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
             BEAST_EXPECT(!req[jss::tx_json].isMember(jss::Fee));
         }
 
         {
             // high mult, 4 tx
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : 8000,
                 "fee_div_max" : 3,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2518,21 +2518,21 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 req[jss::tx_json].isMember(jss::Fee) && req[jss::tx_json][jss::Fee] == 8889);
         }
 
         {
             // negative mult
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : -5,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2541,19 +2541,19 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
         }
 
         {
             // negative div
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_div_max" : -2,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2562,20 +2562,20 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
         }
 
         {
             // negative mult & div
-            Json::Value req;
-            Json::Reader().parse(
+            json::Value req;
+            json::Reader().parse(
                 R"({
                 "fee_mult_max" : -2,
                 "fee_div_max" : -3,
                 "tx_json" : { }
             })",
                 req);
-            Json::Value const result = checkFee(
+            json::Value const result = checkFee(
                 req,
                 Role::ADMIN,
                 true,
@@ -2584,25 +2584,25 @@ public:
                 env.app().getTxQ(),
                 env.app());
 
-            BEAST_EXPECT(RPC::contains_error(result));
+            BEAST_EXPECT(RPC::containsError(result));
         }
 
         env.close();
 
         {
             // Call "sign" with nothing in the open ledger
-            Json::Value toSign;
+            json::Value toSign;
             toSign[jss::tx_json] = noop(env.master);
             toSign[jss::secret] = "masterpassphrase";
             auto rpcResult = env.rpc("json", "sign", to_string(toSign));
             auto result = rpcResult[jss::result];
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "10");
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Sequence) &&
-                result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
+                result[jss::tx_json][jss::Sequence].isConvertibleTo(json::ValueType::UintValue));
         }
 
         {
@@ -2616,20 +2616,20 @@ public:
                 env(noop(env.master));
             }
 
-            Json::Value toSign;
+            json::Value toSign;
             toSign[jss::tx_json] = noop(env.master);
             toSign[jss::secret] = "masterpassphrase";
             toSign[jss::fee_mult_max] = 900;
             auto rpcResult = env.rpc("json", "sign", to_string(toSign));
             auto result = rpcResult[jss::result];
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Fee) &&
                 result[jss::tx_json][jss::Fee] == "7813");
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Sequence) &&
-                result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
+                result[jss::tx_json][jss::Sequence].isConvertibleTo(json::ValueType::UintValue));
 
             env.close();
         }
@@ -2644,18 +2644,18 @@ public:
                 BEAST_EXPECT(feeTrack.getLoadFactor() == 1220);
             }
 
-            Json::Value toSign;
+            json::Value toSign;
             toSign[jss::tx_json] = noop(env.master);
             toSign[jss::secret] = "masterpassphrase";
             auto rpcResult = env.rpc("json", "sign", to_string(toSign));
             auto result = rpcResult[jss::result];
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Fee) && result[jss::tx_json][jss::Fee] == "47");
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Sequence) &&
-                result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
+                result[jss::tx_json][jss::Sequence].isConvertibleTo(json::ValueType::UintValue));
         }
 
         {
@@ -2668,12 +2668,12 @@ public:
                 auto metrics = env.app().getTxQ().getMetrics(*env.current());
                 if (metrics.openLedgerFeeLevel > metrics.minProcessingFeeLevel)
                     break;
-                env(noop(env.master), fee(47));
+                env(noop(env.master), Fee(47));
             }
 
-            Env_ss const envs(env);
+            EnvSs const envs(env);
 
-            Json::Value toSign;
+            json::Value toSign;
             toSign[jss::tx_json] = noop(env.master);
             toSign[jss::secret] = "masterpassphrase";
             // Max fee = 7000 drops
@@ -2681,13 +2681,13 @@ public:
             auto rpcResult = env.rpc("json", "sign", to_string(toSign));
             auto result = rpcResult[jss::result];
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Fee) &&
                 result[jss::tx_json][jss::Fee] == "6806");
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::Sequence) &&
-                result[jss::tx_json][jss::Sequence].isConvertibleTo(Json::ValueType::uintValue));
+                result[jss::tx_json][jss::Sequence].isConvertibleTo(json::ValueType::UintValue));
         }
     }
 
@@ -2702,7 +2702,7 @@ public:
                 })};
 
         {
-            Json::Value toSign;
+            json::Value toSign;
             toSign[jss::tx_json] = noop(env.master);
 
             BEAST_EXPECT(!toSign[jss::tx_json].isMember(jss::NetworkID));
@@ -2710,7 +2710,7 @@ public:
             auto rpcResult = env.rpc("json", "sign", to_string(toSign));
             auto result = rpcResult[jss::result];
 
-            BEAST_EXPECT(!RPC::contains_error(result));
+            BEAST_EXPECT(!RPC::containsError(result));
             BEAST_EXPECT(
                 result[jss::tx_json].isMember(jss::NetworkID) &&
                 result[jss::tx_json][jss::NetworkID] == 1025);
@@ -2733,11 +2733,11 @@ public:
         // Use jtx to set up a ledger so the tests will do the right thing.
         Account const a{"a"};  // rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA
         Account const g{"g"};  // rLPwWB1itaUGMV8kbMLLysjGkEpTM2Soy4
-        auto const USD = g["USD"];
+        auto const usd = g["USD"];
 
         // Account: rJrxi4Wxev4bnAGVNP9YCdKPdAoKfAmcsi
         // seed:    sh1yJfwoi98zCygwijUzuHmJDeVKd
-        Account const ed{"ed", KeyType::ed25519};
+        Account const ed{"ed", KeyType::Ed25519};
         // master is rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh.
         // "b" (not in the ledger) is rDg53Haik2475DJx8bjMDSDPj4VX7htaMd.
         // "c" (phantom signer) is rPcNzota6B8YBokhYtcTNqQVCngtbnWfux.
@@ -2749,25 +2749,25 @@ public:
         env.fund(XRP(100000), a, ed, g);
         env.close();
 
-        env(trust(a, USD(1000)));
-        env(trust(env.master, USD(1000)));
-        env(pay(g, a, USD(50)));
-        env(pay(g, env.master, USD(50)));
+        env(trust(a, usd(1000)));
+        env(trust(env.master, usd(1000)));
+        env(pay(g, a, usd(50)));
+        env(pay(g, env.master, usd(50)));
         env.close();
 
         ProcessTransactionFn const processTxn = fakeProcessTransaction;
 
         // A list of all the functions we want to test.
-        using signFunc = Json::Value (*)(
-            Json::Value params,
+        using signFunc = json::Value (*)(
+            json::Value params,
             unsigned int apiVersion,
             NetworkOPs::FailHard failType,
             Role role,
             std::chrono::seconds validatedLedgerAge,
             Application& app);
 
-        using submitFunc = Json::Value (*)(
-            Json::Value params,
+        using submitFunc = json::Value (*)(
+            json::Value params,
             unsigned int apiVersion,
             NetworkOPs::FailHard failType,
             Role role,
@@ -2777,44 +2777,44 @@ public:
 
         using TestStuff = std::tuple<signFunc, submitFunc, char const*, unsigned int>;
 
-        static TestStuff const testFuncs[] = {
+        static TestStuff const kTEST_FUNCS[] = {
             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 : testFuncs)
+        for (auto testFunc : kTEST_FUNCS)
         {
             // For each JSON test.
-            for (auto const& txnTest : txnTestArray)
+            for (auto const& txnTest : kTXN_TEST_ARRAY)
             {
-                Json::Value req;
-                Json::Reader().parse(txnTest.json, req);
-                if (RPC::contains_error(req))
+                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 testedRoles[] = {
+                static Role const kTESTED_ROLES[] = {
                     Role::GUEST, Role::USER, Role::ADMIN, Role::FORBID};
 
-                for (Role const testRole : testedRoles)
+                for (Role const testRole : kTESTED_ROLES)
                 {
-                    Json::Value result;
+                    json::Value result;
                     auto const signFn = get<0>(testFunc);
                     if (signFn != nullptr)
                     {
                         assert(get<1>(testFunc) == nullptr);
-                        result = signFn(req, 1, NetworkOPs::FailHard::yes, testRole, 1s, env.app());
+                        result = signFn(req, 1, NetworkOPs::FailHard::Yes, testRole, 1s, env.app());
                     }
                     else
                     {
                         auto const submitFn = get<1>(testFunc);
                         assert(submitFn != nullptr);
                         result = submitFn(
-                            req, 1, NetworkOPs::FailHard::yes, testRole, 1s, env.app(), processTxn);
+                            req, 1, NetworkOPs::FailHard::Yes, testRole, 1s, env.app(), processTxn);
                     }
 
                     std::string errStr;
-                    if (RPC::contains_error(result))
+                    if (RPC::containsError(result))
                         errStr = result["error_message"].asString();
 
                     if (errStr == txnTest.expMsg[get<3>(testFunc)])
diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp
index a496664ef0..0195657d7f 100644
--- a/src/test/rpc/KeyGeneration_test.cpp
+++ b/src/test/rpc/KeyGeneration_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl::RPC {
 
-struct key_strings
+struct KeyStrings
 {
     char const* account_id;
     char const* master_key;
@@ -31,43 +31,43 @@ struct key_strings
 };
 
 namespace common {
-static char const* passphrase = "REINDEER FLOTILLA";
-static char const* master_key = "SCAT BERN ISLE FOR ROIL BUS SOAK AQUA FREE FOR DRAM BRIG";
-static char const* master_seed = "snMwVWs2hZzfDUF3p2tHZ3EgmyhFs";
-static char const* master_seed_hex = "BE6A670A19B209E112146D0A7ED2AAD7";
+static char const* gPassphrase = "REINDEER FLOTILLA";
+static char const* gMasterKey = "SCAT BERN ISLE FOR ROIL BUS SOAK AQUA FREE FOR DRAM BRIG";
+static char const* gMasterSeed = "snMwVWs2hZzfDUF3p2tHZ3EgmyhFs";
+static char const* gMasterSeedHex = "BE6A670A19B209E112146D0A7ED2AAD7";
 }  // namespace common
 
-static key_strings const secp256k1_strings = {
+static KeyStrings const kSECP256K1_STRINGS = {
     .account_id = "r4Vtj2jrfmTVZGfSP3gH9hQPMqFPQFin8f",
-    .master_key = common::master_key,
-    .master_seed = common::master_seed,
-    .master_seed_hex = common::master_seed_hex,
+    .master_key = common::gMasterKey,
+    .master_seed = common::gMasterSeed,
+    .master_seed_hex = common::gMasterSeedHex,
     .public_key = "aBQxK2YFNqzmAaXNczYcjqDjfiKkLsJUizsr1UBf44RCF8FHdrmX",
     .public_key_hex = "038AAE247B2344B1837FBED8F57389C8C11774510A3F7D784F2A09F0CB6843236C",
     .secret_key_hex = "1949ECD889EA71324BC7A30C8E81F4E93CB73EE19D59E9082111E78CC3DDABC2",
-    .passphrase = common::passphrase,
+    .passphrase = common::gPassphrase,
     .passphrase_warning =
         "This wallet was generated using a user-supplied "
         "passphrase that has low entropy and is vulnerable "
         "to brute-force attacks.",
 };
 
-static key_strings const ed25519_strings = {
+static KeyStrings const kED25519_STRINGS = {
     .account_id = "r4qV6xTXerqaZav3MJfSY79ynmc1BSBev1",
-    .master_key = common::master_key,
-    .master_seed = common::master_seed,
-    .master_seed_hex = common::master_seed_hex,
+    .master_key = common::gMasterKey,
+    .master_seed = common::gMasterSeed,
+    .master_seed_hex = common::gMasterSeedHex,
     .public_key = "aKEQmgLMyZPMruJFejUuedp169LgW6DbJt1rej1DJ5hWUMH4pHJ7",
     .public_key_hex = "ED54C3F5BEDA8BD588B203D23A27398FAD9D20F88A974007D6994659CD7273FE1D",
     .secret_key_hex = "77AAED2698D56D6676323629160F4EEF21CFD9EE3D0745CC78FA291461F98278",
-    .passphrase = common::passphrase,
+    .passphrase = common::gPassphrase,
     .passphrase_warning =
         "This wallet was generated using a user-supplied "
         "passphrase that has low entropy and is vulnerable "
         "to brute-force attacks.",
 };
 
-static key_strings const strong_brain_strings = {
+static KeyStrings const kSTRONG_BRAIN_STRINGS = {
     .account_id = "rBcvXmNb7KPkNdMkpckdWPpbvkWgcV3nir",
     .master_key = "TED AVON CAVE HOUR BRAG JEFF RIFT NEAL TOLD FAT SEW SAN",
     .master_seed = "shKdhWka8hS7Es3bpctCZXBiAwfUN",
@@ -88,12 +88,12 @@ public:
     void
     testRandomWallet(std::optional<std::string> const& keyType)
     {
-        Json::Value params;
+        json::Value params;
         if (keyType)
             params[jss::key_type] = *keyType;
-        Json::Value result = walletPropose(params);
+        json::Value result = walletPropose(params);
 
-        BEAST_EXPECT(!contains_error(result));
+        BEAST_EXPECT(!containsError(result));
         BEAST_EXPECT(result.isMember(jss::account_id));
         BEAST_EXPECT(result.isMember(jss::master_seed));
         BEAST_EXPECT(result.isMember(jss::master_seed_hex));
@@ -114,12 +114,12 @@ public:
         BEAST_EXPECT(result[jss::master_seed].asString() != seed);
     }
 
-    Json::Value
-    testSecretWallet(Json::Value const& params, key_strings const& s)
+    json::Value
+    testSecretWallet(json::Value const& params, KeyStrings const& s)
     {
-        Json::Value result = walletPropose(params);
+        json::Value result = walletPropose(params);
 
-        BEAST_EXPECT(!contains_error(result));
+        BEAST_EXPECT(!containsError(result));
         expectEquals(result[jss::account_id], s.account_id);
         expectEquals(result[jss::master_seed], s.master_seed);
         expectEquals(result[jss::master_seed_hex], s.master_seed_hex);
@@ -132,11 +132,11 @@ public:
     }
 
     void
-    testSeed(std::optional<std::string> const& keyType, key_strings const& strings)
+    testSeed(std::optional<std::string> const& keyType, KeyStrings const& strings)
     {
         testcase("seed");
 
-        Json::Value params;
+        json::Value params;
         if (keyType)
             params[jss::key_type] = *keyType;
         params[jss::seed] = strings.master_seed;
@@ -146,11 +146,11 @@ public:
     }
 
     void
-    testSeedHex(std::optional<std::string> const& keyType, key_strings const& strings)
+    testSeedHex(std::optional<std::string> const& keyType, KeyStrings const& strings)
     {
         testcase("seed_hex");
 
-        Json::Value params;
+        json::Value params;
         if (keyType)
             params[jss::key_type] = *keyType;
         params[jss::seed_hex] = strings.master_seed_hex;
@@ -163,9 +163,9 @@ public:
     testLegacyPassphrase(
         char const* value,
         std::optional<std::string> const& keyType,
-        key_strings const& strings)
+        KeyStrings const& strings)
     {
-        Json::Value params;
+        json::Value params;
         if (keyType)
             params[jss::key_type] = *keyType;
         params[jss::passphrase] = value;
@@ -182,7 +182,7 @@ public:
     }
 
     void
-    testLegacyPassphrase(std::optional<std::string> const& keyType, key_strings const& strings)
+    testLegacyPassphrase(std::optional<std::string> const& keyType, KeyStrings const& strings)
     {
         testcase("passphrase");
 
@@ -193,7 +193,7 @@ public:
     }
 
     void
-    testKeyType(std::optional<std::string> const& keyType, key_strings const& strings)
+    testKeyType(std::optional<std::string> const& keyType, KeyStrings const& strings)
     {
         testcase(keyType ? *keyType : "no key_type");
 
@@ -202,14 +202,14 @@ public:
         testSeedHex(keyType, strings);
         testLegacyPassphrase(keyType, strings);
 
-        Json::Value params;
+        json::Value params;
         if (keyType)
             params[jss::key_type] = *keyType;
         params[jss::seed] = strings.master_seed;
         params[jss::seed_hex] = strings.master_seed_hex;
 
         // Secret fields are mutually exclusive.
-        BEAST_EXPECT(contains_error(walletPropose(params)));
+        BEAST_EXPECT(containsError(walletPropose(params)));
     }
 
     void
@@ -219,41 +219,41 @@ public:
 
         // Passing non-strings where strings are required
         {
-            Json::Value params;
+            json::Value params;
             params[jss::key_type] = "secp256k1";
             params[jss::passphrase] = 20160506;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid field 'passphrase', not string.");
         }
 
         {
-            Json::Value params;
+            json::Value params;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed] = Json::objectValue;
+            params[jss::seed] = json::ObjectValue;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid field 'seed', not string.");
         }
 
         {
-            Json::Value params;
+            json::Value params;
             params[jss::key_type] = "ed25519";
-            params[jss::seed_hex] = Json::arrayValue;
+            params[jss::seed_hex] = json::ArrayValue;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid field 'seed_hex', not string.");
         }
 
         // Specifying multiple items at once
         {
-            Json::Value params;
+            json::Value params;
             params[jss::key_type] = "secp256k1";
-            params[jss::passphrase] = common::master_key;
-            params[jss::seed_hex] = common::master_seed_hex;
-            params[jss::seed] = common::master_seed;
+            params[jss::passphrase] = common::gMasterKey;
+            params[jss::seed_hex] = common::gMasterSeedHex;
+            params[jss::seed] = common::gMasterSeed;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(
                 result[jss::error_message] ==
                 "Exactly one of the following must be specified: passphrase, "
@@ -262,35 +262,35 @@ public:
 
         // Specifying bad key types:
         {
-            Json::Value params;
+            json::Value params;
             params[jss::key_type] = "prime256v1";
-            params[jss::passphrase] = common::master_key;
+            params[jss::passphrase] = common::gMasterKey;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid parameters.");
         }
 
         {
-            Json::Value params;
-            params[jss::key_type] = Json::objectValue;
-            params[jss::seed_hex] = common::master_seed_hex;
+            json::Value params;
+            params[jss::key_type] = json::ObjectValue;
+            params[jss::seed_hex] = common::gMasterSeedHex;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid field 'key_type', not string.");
         }
 
         {
-            Json::Value params;
-            params[jss::key_type] = Json::arrayValue;
-            params[jss::seed] = common::master_seed;
+            json::Value params;
+            params[jss::key_type] = json::ArrayValue;
+            params[jss::seed] = common::gMasterSeed;
             auto result = walletPropose(params);
-            BEAST_EXPECT(contains_error(result));
+            BEAST_EXPECT(containsError(result));
             BEAST_EXPECT(result[jss::error_message] == "Invalid field 'key_type', not string.");
         }
     }
 
     void
-    testKeypairForSignature(std::optional<std::string> keyType, key_strings const& strings)
+    testKeypairForSignature(std::optional<std::string> keyType, KeyStrings const& strings)
     {
         testcase("keypairForSignature - " + (keyType ? *keyType : "no key_type"));
 
@@ -300,12 +300,12 @@ public:
         if (!keyType)
         {
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
                 params[jss::secret] = strings.master_seed;
 
                 auto ret = keypairForSignature(params, error);
-                BEAST_EXPECT(!contains_error(error));
+                BEAST_EXPECT(!containsError(error));
                 if (BEAST_EXPECT(ret); ret.has_value())
                 {
                     BEAST_EXPECT(ret->first.size() != 0);
@@ -314,12 +314,12 @@ public:
             }
 
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
                 params[jss::secret] = strings.master_seed_hex;
 
                 auto ret = keypairForSignature(params, error);
-                BEAST_EXPECT(!contains_error(error));
+                BEAST_EXPECT(!containsError(error));
                 if (BEAST_EXPECT(ret); ret.has_value())
                 {
                     BEAST_EXPECT(ret->first.size() != 0);
@@ -328,12 +328,12 @@ public:
             }
 
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
                 params[jss::secret] = strings.master_key;
 
                 auto ret = keypairForSignature(params, error);
-                BEAST_EXPECT(!contains_error(error));
+                BEAST_EXPECT(!containsError(error));
                 if (BEAST_EXPECT(ret); ret.has_value())
                 {
                     BEAST_EXPECT(ret->first.size() != 0);
@@ -345,14 +345,14 @@ public:
         }
 
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
 
             params[jss::key_type] = *keyType;
             params[jss::seed] = strings.master_seed;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(!contains_error(error));
+            BEAST_EXPECT(!containsError(error));
             if (BEAST_EXPECT(ret); ret.has_value())
             {
                 BEAST_EXPECT(ret->first.size() != 0);
@@ -361,14 +361,14 @@ public:
         }
 
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
 
             params[jss::key_type] = *keyType;
             params[jss::seed_hex] = strings.master_seed_hex;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(!contains_error(error));
+            BEAST_EXPECT(!containsError(error));
             if (BEAST_EXPECT(ret); ret.has_value())
             {
                 BEAST_EXPECT(ret->first.size() != 0);
@@ -377,14 +377,14 @@ public:
         }
 
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
 
             params[jss::key_type] = *keyType;
             params[jss::passphrase] = strings.master_key;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(!contains_error(error));
+            BEAST_EXPECT(!containsError(error));
             if (BEAST_EXPECT(ret); ret.has_value())
             {
                 BEAST_EXPECT(ret->first.size() != 0);
@@ -398,49 +398,49 @@ public:
     {
         // Specify invalid "secret"
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::secret] = 314159265;
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
         }
 
         {
-            Json::Value params;
-            Json::Value error;
-            params[jss::secret] = Json::arrayValue;
+            json::Value params;
+            json::Value error;
+            params[jss::secret] = json::ArrayValue;
             params[jss::secret].append("array:0");
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
         }
 
         {
-            Json::Value params;
-            Json::Value error;
-            params[jss::secret] = Json::objectValue;
+            json::Value params;
+            json::Value error;
+            params[jss::secret] = json::ObjectValue;
             params[jss::secret]["string"] = "string";
             params[jss::secret]["number"] = 702;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'secret', not string.");
         }
 
         // Specify "secret" and "key_type"
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "ed25519";
-            params[jss::secret] = common::master_seed;
+            params[jss::secret] = common::gMasterSeed;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(
                 error[jss::error_message] ==
@@ -449,244 +449,244 @@ public:
 
         // Specify unknown or bad "key_type"
         {
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "prime256v1";
-            params[jss::passphrase] = common::master_key;
+            params[jss::passphrase] = common::gMasterKey;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type'.");
         }
 
         {
-            Json::Value params;
-            Json::Value error;
-            params[jss::key_type] = Json::objectValue;
-            params[jss::seed_hex] = common::master_seed_hex;
+            json::Value params;
+            json::Value error;
+            params[jss::key_type] = json::ObjectValue;
+            params[jss::seed_hex] = common::gMasterSeedHex;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type', not string.");
         }
 
         {
-            Json::Value params;
-            Json::Value error;
-            params[jss::key_type] = Json::arrayValue;
-            params[jss::seed] = common::master_seed;
+            json::Value params;
+            json::Value error;
+            params[jss::key_type] = json::ArrayValue;
+            params[jss::seed] = common::gMasterSeed;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'key_type', not string.");
         }
 
         // Specify non-string passphrase
         {  // not a passphrase: number
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::passphrase] = 1234567890;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
         }
 
         {  // not a passphrase: object
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::passphrase] = Json::objectValue;
+            params[jss::passphrase] = json::ObjectValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
         }
 
         {  // not a passphrase: array
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::passphrase] = Json::arrayValue;
+            params[jss::passphrase] = json::ArrayValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'passphrase', not string.");
         }
 
         {  // not a passphrase: empty string
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::passphrase] = "";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         // Specify non-string or invalid seed
         {  // not a seed: number
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed] = 443556;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
         }
 
         {  // not a string: object
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed] = Json::objectValue;
+            params[jss::seed] = json::ObjectValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
         }
 
         {  // not a string: array
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed] = Json::arrayValue;
+            params[jss::seed] = json::ArrayValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed', not string.");
         }
 
         {  // not a seed: empty
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed] = "";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         {  // not a seed: invalid characters
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed] = "s M V s h z D F p t Z E m h s";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         {  // not a seed: random string
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed] = "pnnjkbnobnml43679nbvjdsklnbjs";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         // Specify non-string or invalid seed_hex
         {  // not a string: number
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed_hex] = 443556;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
         }
 
         {  // not a string: object
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed_hex] = Json::objectValue;
+            params[jss::seed_hex] = json::ObjectValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
         }
 
         {  // not a string: array
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed_hex] = Json::arrayValue;
+            params[jss::seed_hex] = json::ArrayValue;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Invalid field 'seed_hex', not string.");
         }
 
         {  // empty
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed_hex] = "";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         {  // short
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed_hex] = "A670A19B";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         {  // not hex
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
-            params[jss::seed_hex] = common::passphrase;
+            params[jss::seed_hex] = common::gPassphrase;
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
 
         {  // overlong
-            Json::Value params;
-            Json::Value error;
+            json::Value params;
+            json::Value error;
             params[jss::key_type] = "secp256k1";
             params[jss::seed_hex] = "BE6A670A19B209E112146D0A7ED2AAD72567D0FC913";
 
             auto ret = keypairForSignature(params, error);
-            BEAST_EXPECT(contains_error(error));
+            BEAST_EXPECT(containsError(error));
             BEAST_EXPECT(!ret);
             BEAST_EXPECT(error[jss::error_message] == "Disallowed seed.");
         }
@@ -699,14 +699,14 @@ public:
 
         auto test = [this](char const* seed, char const* addr) {
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
 
                 params[jss::passphrase] = seed;
 
                 auto ret = keypairForSignature(params, error);
 
-                BEAST_EXPECT(!contains_error(error));
+                BEAST_EXPECT(!containsError(error));
                 if (BEAST_EXPECT(ret); ret.has_value())
                 {
                     BEAST_EXPECT(ret->first.size() != 0);
@@ -715,29 +715,29 @@ public:
             }
 
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
 
                 params[jss::key_type] = "secp256k1";
                 params[jss::passphrase] = seed;
 
                 auto ret = keypairForSignature(params, error);
 
-                BEAST_EXPECT(contains_error(error));
+                BEAST_EXPECT(containsError(error));
                 BEAST_EXPECT(
                     error[jss::error_message] == "Specified seed is for an Ed25519 wallet.");
             }
 
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
 
                 params[jss::key_type] = "ed25519";
                 params[jss::seed] = seed;
 
                 auto ret = keypairForSignature(params, error);
 
-                BEAST_EXPECT(!contains_error(error));
+                BEAST_EXPECT(!containsError(error));
                 if (BEAST_EXPECT(ret); ret.has_value())
                 {
                     BEAST_EXPECT(ret->first.size() != 0);
@@ -746,15 +746,15 @@ public:
             }
 
             {
-                Json::Value params;
-                Json::Value error;
+                json::Value params;
+                json::Value error;
 
                 params[jss::key_type] = "secp256k1";
                 params[jss::seed] = seed;
 
                 auto ret = keypairForSignature(params, error);
 
-                BEAST_EXPECT(contains_error(error));
+                BEAST_EXPECT(containsError(error));
                 BEAST_EXPECT(
                     error[jss::error_message] == "Specified seed is for an Ed25519 wallet.");
             }
@@ -781,16 +781,16 @@ public:
     void
     run() override
     {
-        testKeyType(std::nullopt, secp256k1_strings);
-        testKeyType(std::string("secp256k1"), secp256k1_strings);
-        testKeyType(std::string("ed25519"), ed25519_strings);
-        testKeyType(std::string("secp256k1"), strong_brain_strings);
+        testKeyType(std::nullopt, kSECP256K1_STRINGS);
+        testKeyType(std::string("secp256k1"), kSECP256K1_STRINGS);
+        testKeyType(std::string("ed25519"), kED25519_STRINGS);
+        testKeyType(std::string("secp256k1"), kSTRONG_BRAIN_STRINGS);
         testBadInput();
 
-        testKeypairForSignature(std::nullopt, secp256k1_strings);
-        testKeypairForSignature(std::string("secp256k1"), secp256k1_strings);
-        testKeypairForSignature(std::string("ed25519"), ed25519_strings);
-        testKeypairForSignature(std::string("secp256k1"), strong_brain_strings);
+        testKeypairForSignature(std::nullopt, kSECP256K1_STRINGS);
+        testKeypairForSignature(std::string("secp256k1"), kSECP256K1_STRINGS);
+        testKeypairForSignature(std::string("ed25519"), kED25519_STRINGS);
+        testKeypairForSignature(std::string("secp256k1"), kSTRONG_BRAIN_STRINGS);
 
         testXrplLibEd25519();
 
diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp
index efe7c2a815..81919e04d0 100644
--- a/src/test/rpc/LedgerClosed_test.cpp
+++ b/src/test/rpc/LedgerClosed_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl {
 
-class LedgerClosed_test : public beast::unit_test::suite
+class LedgerClosed_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -28,26 +28,26 @@ public:
         Account const alice{"alice"};
         env.fund(XRP(10000), alice);
 
-        auto lc_result = env.rpc("ledger_closed")[jss::result];
+        auto lcResult = env.rpc("ledger_closed")[jss::result];
         BEAST_EXPECT(
-            lc_result[jss::ledger_hash] ==
+            lcResult[jss::ledger_hash] ==
             "CCC3B3E88CCAC17F1BE6B4A648A55999411F19E3FE55EB721960EB0DF28EDDA5");
-        BEAST_EXPECT(lc_result[jss::ledger_index] == 2);
+        BEAST_EXPECT(lcResult[jss::ledger_index] == 2);
 
         env.close();
-        auto const ar_master = env.le(env.master);
-        BEAST_EXPECT(ar_master->getAccountID(sfAccount) == env.master.id());
-        BEAST_EXPECT((*ar_master)[sfBalance] == drops(99999989999999980));
+        auto const arMaster = env.le(env.master);
+        BEAST_EXPECT(arMaster->getAccountID(sfAccount) == env.master.id());
+        BEAST_EXPECT((*arMaster)[sfBalance] == drops(99999989999999980));
 
-        auto const ar_alice = env.le(alice);
-        BEAST_EXPECT(ar_alice->getAccountID(sfAccount) == alice.id());
-        BEAST_EXPECT((*ar_alice)[sfBalance] == XRP(10000));
+        auto const arAlice = env.le(alice);
+        BEAST_EXPECT(arAlice->getAccountID(sfAccount) == alice.id());
+        BEAST_EXPECT((*arAlice)[sfBalance] == XRP(10000));
 
-        lc_result = env.rpc("ledger_closed")[jss::result];
+        lcResult = env.rpc("ledger_closed")[jss::result];
         BEAST_EXPECT(
-            lc_result[jss::ledger_hash] ==
+            lcResult[jss::ledger_hash] ==
             "0F1A9E0C109ADEF6DA2BDE19217C12BBEC57174CBDBD212B0EBDC1CEDB853185");
-        BEAST_EXPECT(lc_result[jss::ledger_index] == 3);
+        BEAST_EXPECT(lcResult[jss::ledger_index] == 3);
     }
 
     void
diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp
index 32d26f770c..f11b807529 100644
--- a/src/test/rpc/LedgerData_test.cpp
+++ b/src/test/rpc/LedgerData_test.cpp
@@ -28,12 +28,12 @@
 
 namespace xrpl {
 
-class LedgerData_test : public beast::unit_test::suite
+class LedgerData_test : public beast::unit_test::Suite
 {
 public:
     // test helper
     static bool
-    checkMarker(Json::Value const& val)
+    checkMarker(json::Value const& val)
     {
         return val.isMember(jss::marker) && val[jss::marker].isString() &&
             !val[jss::marker].asString().empty();
@@ -43,15 +43,15 @@ public:
     testCurrentLedgerToLimits(bool asAdmin)
     {
         using namespace test::jtx;
-        Env env{*this, asAdmin ? envconfig() : envconfig(no_admin)};
+        Env env{*this, asAdmin ? envconfig() : envconfig(noAdmin)};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
 
-        int const max_limit = 256;  // would be 2048 for binary requests, no
-                                    // need to test that here
+        int const maxLimit = 256;  // would be 2048 for binary requests, no
+                                   // need to test that here
 
-        for (auto i = 0; i < max_limit + 10; i++)
+        for (auto i = 0; i < maxLimit + 10; i++)
         {
             Account const bob{std::string("bob") + std::to_string(i)};
             env.fund(XRP(1000), bob);
@@ -62,7 +62,7 @@ public:
 
         // with no limit specified, we get the max_limit if the total number of
         // accounts is greater than max, which it is here
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = "current";
         jvParams[jss::binary] = false;
         {
@@ -71,16 +71,16 @@ public:
                 jrr[jss::ledger_current_index].isIntegral() &&
                 jrr[jss::ledger_current_index].asInt() > 0);
             BEAST_EXPECT(checkMarker(jrr));
-            BEAST_EXPECT(checkArraySize(jrr[jss::state], max_limit));
+            BEAST_EXPECT(checkArraySize(jrr[jss::state], maxLimit));
         }
 
         // check limits values around the max_limit (+/- 1)
         for (auto delta = -1; delta <= 1; delta++)
         {
-            jvParams[jss::limit] = max_limit + delta;
+            jvParams[jss::limit] = maxLimit + delta;
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(checkArraySize(
-                jrr[jss::state], (delta > 0 && !asAdmin) ? max_limit : max_limit + delta));
+                jrr[jss::state], (delta > 0 && !asAdmin) ? maxLimit : maxLimit + delta));
         }
     }
 
@@ -88,14 +88,14 @@ public:
     testCurrentLedgerBinary()
     {
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
 
-        int const num_accounts = 10;
+        int const numAccounts = 10;
 
-        for (auto i = 0; i < num_accounts; i++)
+        for (auto i = 0; i < numAccounts; i++)
         {
             Account const bob{std::string("bob") + std::to_string(i)};
             env.fund(XRP(1000), bob);
@@ -103,7 +103,7 @@ public:
 
         // with no limit specified, we should get all of our fund entries
         // plus three more related to the gateway setup
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = "current";
         jvParams[jss::binary] = true;
         auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
@@ -111,7 +111,7 @@ public:
             jrr[jss::ledger_current_index].isIntegral() &&
             jrr[jss::ledger_current_index].asInt() > 0);
         BEAST_EXPECT(!jrr.isMember(jss::marker));
-        BEAST_EXPECT(checkArraySize(jrr[jss::state], num_accounts + 4));
+        BEAST_EXPECT(checkArraySize(jrr[jss::state], numAccounts + 4));
     }
 
     void
@@ -120,15 +120,15 @@ public:
         using namespace test::jtx;
         Env env{*this};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         Account const bob{"bob"};
 
         env.fund(XRP(10000), gw, bob);
-        env.trust(USD(1000), bob);
+        env.trust(usd(1000), bob);
 
         {
             // bad limit
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::limit] = "0";  // NOT an integer
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -138,7 +138,7 @@ public:
 
         {
             // invalid marker
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::marker] = "NOT_A_MARKER";
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -148,7 +148,7 @@ public:
 
         {
             // invalid marker - not a string
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::marker] = 1;
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -158,7 +158,7 @@ public:
 
         {
             // ask for a bad ledger index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 10u;
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "lgrNotFound");
@@ -168,7 +168,7 @@ public:
 
         {
             // binary not a boolean
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::binary] = "true";
             auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "invalidParams");
@@ -181,14 +181,14 @@ public:
     testMarkerFollow()
     {
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
 
-        int const num_accounts = 20;
+        int const numAccounts = 20;
 
-        for (auto i = 0; i < num_accounts; i++)
+        for (auto i = 0; i < numAccounts; i++)
         {
             Account const bob{std::string("bob") + std::to_string(i)};
             env.fund(XRP(1000), bob);
@@ -196,24 +196,24 @@ public:
 
         // with no limit specified, we should get all of our fund entries
         // plus three more related to the gateway setup
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = "current";
         jvParams[jss::binary] = false;
         auto jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
-        auto const total_count = jrr[jss::state].size();
+        auto const totalCount = jrr[jss::state].size();
 
         // now make request with a limit and loop until we get all
         jvParams[jss::limit] = 5;
         jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
         BEAST_EXPECT(checkMarker(jrr));
-        auto running_total = jrr[jss::state].size();
+        auto runningTotal = jrr[jss::state].size();
         while (jrr.isMember(jss::marker))
         {
             jvParams[jss::marker] = jrr[jss::marker];
             jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
-            running_total += jrr[jss::state].size();
+            runningTotal += jrr[jss::state].size();
         }
-        BEAST_EXPECT(running_total == total_count);
+        BEAST_EXPECT(runningTotal == totalCount);
     }
 
     void
@@ -227,7 +227,7 @@ public:
         // Ledger header should be present in the first query
         {
             // Closed ledger with non binary form
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "closed";
             auto jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             if (BEAST_EXPECT(jrr.isMember(jss::ledger)))
@@ -238,7 +238,7 @@ public:
         }
         {
             // Closed ledger with binary form
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "closed";
             jvParams[jss::binary] = true;
             auto jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
@@ -256,7 +256,7 @@ public:
         }
         {
             // Current ledger with binary form
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::binary] = true;
             auto jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::ledger));
@@ -272,18 +272,18 @@ public:
 
         // Make sure fixInnerObjTemplate2 doesn't break amendments.
         for (FeatureBitset const& features :
-             {testable_amendments() - fixInnerObjTemplate2,
-              testable_amendments() | fixInnerObjTemplate2})
+             {testableAmendments() - fixInnerObjTemplate2,
+              testableAmendments() | fixInnerObjTemplate2})
         {
             using namespace std::chrono;
             Env env{*this, envconfig(validator, ""), features};
 
             Account const gw{"gateway"};
-            auto const USD = gw["USD"];
+            auto const usd = gw["USD"];
             env.fund(XRP(100000), gw);
 
-            auto makeRequest = [&env](Json::StaticString const& type) {
-                Json::Value jvParams;
+            auto makeRequest = [&env](json::StaticString const& type) {
+                json::Value jvParams;
                 jvParams[jss::ledger_index] = "current";
                 jvParams[jss::type] = type;
                 return env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
@@ -306,14 +306,14 @@ public:
                 BEAST_EXPECT(checkArraySize(jrr[jss::state], 0));
             }
 
-            int const num_accounts = 10;
+            int const numAccounts = 10;
 
-            for (auto i = 0; i < num_accounts; i++)
+            for (auto i = 0; i < numAccounts; i++)
             {
                 Account const bob{std::string("bob") + std::to_string(i)};
                 env.fund(XRP(1000), bob);
             }
-            env(offer(Account{"bob0"}, USD(100), XRP(100)));
+            env(offer(Account{"bob0"}, usd(100), XRP(100)));
             env.trust(Account{"bob2"}["USD"](100), Account{"bob3"});
 
             auto majorities = getMajorityAmendments(*env.closed());
@@ -329,22 +329,22 @@ public:
             env(ticket::create(env.master, 1));
 
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::EscrowCreate;
                 jv[jss::Account] = Account{"bob5"}.human();
                 jv[jss::Destination] = Account{"bob6"}.human();
-                jv[jss::Amount] = XRP(50).value().getJson(JsonOptions::none);
+                jv[jss::Amount] = XRP(50).value().getJson(JsonOptions::KNone);
                 jv[sfFinishAfter.fieldName] =
                     NetClock::time_point{env.now() + 10s}.time_since_epoch().count();
                 env(jv);
             }
 
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[jss::TransactionType] = jss::PaymentChannelCreate;
                 jv[jss::Account] = Account{"bob6"}.human();
                 jv[jss::Destination] = Account{"bob7"}.human();
-                jv[jss::Amount] = XRP(100).value().getJson(JsonOptions::none);
+                jv[jss::Amount] = XRP(100).value().getJson(JsonOptions::KNone);
                 jv[jss::SettleDelay] = NetClock::duration{10s}.count();
                 jv[sfPublicKey.fieldName] = strHex(Account{"bob6"}.pk().slice());
                 jv[sfCancelAfter.fieldName] =
@@ -453,7 +453,7 @@ public:
             }
 
             {  // jvParams[jss::type] = "misspelling";
-                Json::Value jvParams;
+                json::Value jvParams;
                 jvParams[jss::ledger_index] = "current";
                 jvParams[jss::type] = "misspelling";
                 auto const jrr = env.rpc("json", "ledger_data", to_string(jvParams))[jss::result];
diff --git a/src/test/rpc/LedgerEntry_test.cpp b/src/test/rpc/LedgerEntry_test.cpp
index d6e1ccc2ce..298d0e5149 100644
--- a/src/test/rpc/LedgerEntry_test.cpp
+++ b/src/test/rpc/LedgerEntry_test.cpp
@@ -80,7 +80,7 @@ enum class FieldType {
     UInt64Field,
 };
 
-std::vector<std::pair<Json::StaticString, FieldType>> mappings{
+std::vector<std::pair<json::StaticString, FieldType>> gMappings{
     {jss::account, FieldType::AccountField},
     {jss::accounts, FieldType::TwoAccountArrayField},
     {jss::asset, FieldType::AssetField},
@@ -98,16 +98,16 @@ std::vector<std::pair<Json::StaticString, FieldType>> mappings{
 };
 
 FieldType
-getFieldType(Json::StaticString fieldName)
+getFieldType(json::StaticString fieldName)
 {
     auto it = std::ranges::find_if(
-        mappings, [&fieldName](auto const& pair) { return pair.first == fieldName; });
-    if (it != mappings.end())
+        gMappings, [&fieldName](auto const& pair) { return pair.first == fieldName; });
+    if (it != gMappings.end())
     {
         return it->second;
     }
 
-    Throw<std::runtime_error>("`mappings` is missing field " + std::string(fieldName.c_str()));
+    Throw<std::runtime_error>("`mappings` is missing field " + std::string(fieldName.cStr()));
 }
 
 std::string
@@ -142,11 +142,11 @@ getTypeName(FieldType typeID)
     }
 }
 
-class LedgerEntry_test : public beast::unit_test::suite
+class LedgerEntry_test : public beast::unit_test::Suite
 {
     void
     checkErrorValue(
-        Json::Value const& jv,
+        json::Value const& jv,
         std::string const& err,
         std::string const& msg,
         std::source_location const location = std::source_location::current())
@@ -163,7 +163,7 @@ class LedgerEntry_test : public beast::unit_test::suite
         if (msg.empty())
         {
             BEAST_EXPECTS(
-                jv[jss::error_message] == Json::nullValue || jv[jss::error_message] == "",
+                jv[jss::error_message] == json::NullValue || jv[jss::error_message] == "",
                 "Expected no error message, received \"" + jv[jss::error_message].asString() +
                     "\", at line " + std::to_string(location.line()) + ", " + jv.toStyledString());
         }
@@ -177,22 +177,22 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
     }
 
-    static std::vector<Json::Value>
+    static std::vector<json::Value>
     getBadValues(FieldType fieldType)
     {
-        static Json::Value const injectObject = []() {
-            Json::Value obj(Json::objectValue);
+        static json::Value const kINJECT_OBJECT = []() {
+            json::Value obj(json::ObjectValue);
             obj[jss::account] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             obj[jss::ledger_index] = "validated";
             return obj;
         }();
-        static Json::Value const injectArray = []() {
-            Json::Value arr(Json::arrayValue);
+        static json::Value const kINJECT_ARRAY = []() {
+            json::Value arr(json::ArrayValue);
             arr[0u] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             arr[1u] = "validated";
             return arr;
         }();
-        static std::array<Json::Value, 21> const allBadValues = {
+        static std::array<json::Value, 21> const kALL_BAD_VALUES = {
             "",                                                      // 0
             true,                                                    // 1
             1,                                                       // 2
@@ -211,77 +211,77 @@ class LedgerEntry_test : public beast::unit_test::suite
             "USDollars",                                             // 15
             "5233D68B4D44388F98559DE42903767803EFA7C1F8D01413FC16EE6B01403D"
             "6D",               // 16
-            Json::arrayValue,   // 17
-            Json::objectValue,  // 18
-            injectObject,       // 19
-            injectArray         // 20
+            json::ArrayValue,   // 17
+            json::ObjectValue,  // 18
+            kINJECT_OBJECT,     // 19
+            kINJECT_ARRAY       // 20
         };
 
-        auto remove = [&](std::vector<std::uint8_t> indices) -> std::vector<Json::Value> {
+        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(allBadValues.size() - indexSet.size());
-            for (std::size_t i = 0; i < allBadValues.size(); ++i)
+            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)
             {
                 if (!indexSet.contains(i))
                 {
-                    values.push_back(allBadValues[i]);
+                    values.push_back(kALL_BAD_VALUES[i]);
                 }
             }
             return values;
         };
 
-        static auto const& badAccountValues = remove({12});
-        static auto const& badArrayValues = remove({17, 20});
-        static auto const& badBlobValues = remove({3, 7, 8, 16});
-        static auto const& badCurrencyValues = remove({14});
-        static auto const& badHashValues = remove({2, 3, 7, 8, 16});
-        static auto const& badFixedHashValues = remove({1, 2, 3, 4, 7, 8, 16});
-        static auto const& badIndexValues = remove({12, 16, 18, 19});
-        static auto const& badUInt32Values = remove({2, 3});
-        static auto const& badUInt64Values = remove({2, 3});
-        static auto const& badAssetValues = remove({});
+        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({});
 
         switch (fieldType)
         {
             case FieldType::AccountField:
-                return badAccountValues;
+                return kBAD_ACCOUNT_VALUES;
             case FieldType::ArrayField:
             case FieldType::TwoAccountArrayField:
-                return badArrayValues;
+                return kBAD_ARRAY_VALUES;
             case FieldType::BlobField:
-                return badBlobValues;
+                return kBAD_BLOB_VALUES;
             case FieldType::CurrencyField:
-                return badCurrencyValues;
+                return kBAD_CURRENCY_VALUES;
             case FieldType::HashField:
-                return badHashValues;
+                return kBAD_HASH_VALUES;
             case FieldType::HashOrObjectField:
-                return badIndexValues;
+                return kBAD_INDEX_VALUES;
             case FieldType::FixedHashField:
-                return badFixedHashValues;
+                return kBAD_FIXED_HASH_VALUES;
             case FieldType::AssetField:
-                return badAssetValues;
+                return kBAD_ISSUE_VALUES;
             case FieldType::UInt32Field:
-                return badUInt32Values;
+                return kBAD_U_INT32_VALUES;
             case FieldType::UInt64Field:
-                return badUInt64Values;
+                return kBAD_U_INT64_VALUES;
             default:
                 Throw<std::runtime_error>(
                     "unknown type " + std::to_string(static_cast<uint8_t>(fieldType)));
         }
     }
 
-    static Json::Value
-    getCorrectValue(Json::StaticString fieldName)
+    static json::Value
+    getCorrectValue(json::StaticString fieldName)
     {
-        static Json::Value const twoAccountArray = []() {
-            Json::Value arr(Json::arrayValue);
+        static json::Value const kTWO_ACCOUNT_ARRAY = []() {
+            json::Value arr(json::ArrayValue);
             arr[0u] = "rhigTLJJyXXSRUyRCQtqi1NoAZZzZnS4KU";
             arr[1u] = "r4MrUGTdB57duTnRs6KbsRGQXgkseGb1b5";
             return arr;
         }();
-        static Json::Value const issueObject = []() {
-            Json::Value arr(Json::objectValue);
+        static json::Value const kISSUE_OBJECT = []() {
+            json::Value arr(json::ObjectValue);
             arr[jss::currency] = "XRP";
             return arr;
         }();
@@ -292,7 +292,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             case FieldType::AccountField:
                 return "r4MrUGTdB57duTnRs6KbsRGQXgkseGb1b5";
             case FieldType::ArrayField:
-                return Json::arrayValue;
+                return json::ArrayValue;
             case FieldType::BlobField:
                 return "ABCDEF";
             case FieldType::CurrencyField:
@@ -301,12 +301,12 @@ class LedgerEntry_test : public beast::unit_test::suite
                 return "5233D68B4D44388F98559DE42903767803EFA7C1F8D01413FC16EE6"
                        "B01403D6D";
             case FieldType::AssetField:
-                return issueObject;
+                return kISSUE_OBJECT;
             case FieldType::HashOrObjectField:
                 return "5233D68B4D44388F98559DE42903767803EFA7C1F8D01413FC16EE6"
                        "B01403D6D";
             case FieldType::TwoAccountArrayField:
-                return twoAccountArray;
+                return kTWO_ACCOUNT_ARRAY;
             case FieldType::UInt32Field:
                 return 1;
             case FieldType::UInt64Field:
@@ -320,8 +320,8 @@ class LedgerEntry_test : public beast::unit_test::suite
     void
     testMalformedField(
         test::jtx::Env& env,
-        Json::Value correctRequest,
-        Json::StaticString const fieldName,
+        json::Value correctRequest,
+        json::StaticString const fieldName,
         FieldType const typeID,
         std::string const& expectedError,
         bool required = true,
@@ -331,7 +331,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             if (required)
             {
                 correctRequest.removeMember(fieldName);
-                Json::Value const jrr = env.rpc(
+                json::Value const jrr = env.rpc(
                     apiVersion, "json", "ledger_entry", to_string(correctRequest))[jss::result];
                 if (apiVersion < 2u)
                 {
@@ -343,12 +343,12 @@ class LedgerEntry_test : public beast::unit_test::suite
                         jrr, "invalidParams", "No ledger_entry params provided.", location);
                 }
             }
-            auto tryField = [&](Json::Value fieldValue) -> void {
+            auto tryField = [&](json::Value fieldValue) -> void {
                 correctRequest[fieldName] = fieldValue;
-                Json::Value const jrr = env.rpc(
+                json::Value const jrr = env.rpc(
                     apiVersion, "json", "ledger_entry", to_string(correctRequest))[jss::result];
                 auto const expectedErrMsg =
-                    RPC::expected_field_message(fieldName, getTypeName(typeID));
+                    RPC::expectedFieldMessage(fieldName, getTypeName(typeID));
                 checkErrorValue(jrr, expectedError, expectedErrMsg, location);
             };
 
@@ -359,7 +359,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
             if (required)
             {
-                tryField(Json::nullValue);
+                tryField(json::NullValue);
             }
         });
     }
@@ -367,9 +367,9 @@ class LedgerEntry_test : public beast::unit_test::suite
     void
     testMalformedSubfield(
         test::jtx::Env& env,
-        Json::Value correctRequest,
-        Json::StaticString parentFieldName,
-        Json::StaticString fieldName,
+        json::Value correctRequest,
+        json::StaticString parentFieldName,
+        json::StaticString fieldName,
         FieldType typeID,
         std::string const& expectedError,
         bool required = true,
@@ -379,32 +379,26 @@ class LedgerEntry_test : public beast::unit_test::suite
             if (required)
             {
                 correctRequest[parentFieldName].removeMember(fieldName);
-                Json::Value const jrr = env.rpc(
+                json::Value const jrr = env.rpc(
                     apiVersion, "json", "ledger_entry", to_string(correctRequest))[jss::result];
                 checkErrorValue(
-                    jrr,
-                    "malformedRequest",
-                    RPC::missing_field_message(fieldName.c_str()),
-                    location);
+                    jrr, "malformedRequest", RPC::missingFieldMessage(fieldName.cStr()), location);
 
-                correctRequest[parentFieldName][fieldName] = Json::nullValue;
-                Json::Value const jrr2 = env.rpc(
+                correctRequest[parentFieldName][fieldName] = json::NullValue;
+                json::Value const jrr2 = env.rpc(
                     apiVersion, "json", "ledger_entry", to_string(correctRequest))[jss::result];
                 checkErrorValue(
-                    jrr2,
-                    "malformedRequest",
-                    RPC::missing_field_message(fieldName.c_str()),
-                    location);
+                    jrr2, "malformedRequest", RPC::missingFieldMessage(fieldName.cStr()), location);
             }
-            auto tryField = [&](Json::Value fieldValue) -> void {
+            auto tryField = [&](json::Value fieldValue) -> void {
                 correctRequest[parentFieldName][fieldName] = fieldValue;
 
-                Json::Value const jrr = env.rpc(
+                json::Value const jrr = env.rpc(
                     apiVersion, "json", "ledger_entry", to_string(correctRequest))[jss::result];
                 checkErrorValue(
                     jrr,
                     expectedError,
-                    RPC::expected_field_message(fieldName, getTypeName(typeID)),
+                    RPC::expectedFieldMessage(fieldName, getTypeName(typeID)),
                     location);
             };
 
@@ -420,12 +414,12 @@ class LedgerEntry_test : public beast::unit_test::suite
     void
     runLedgerEntryTest(
         test::jtx::Env& env,
-        Json::StaticString const& parentField,
+        json::StaticString const& parentField,
         std::source_location const location = std::source_location::current())
     {
         testMalformedField(
             env,
-            Json::Value{},
+            json::Value{},
             parentField,
             FieldType::HashField,
             "malformedRequest",
@@ -435,7 +429,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
     struct Subfield
     {
-        Json::StaticString fieldName;
+        json::StaticString fieldName;
         std::string malformedErrorMsg;
         bool required = true;
     };
@@ -443,21 +437,21 @@ class LedgerEntry_test : public beast::unit_test::suite
     void
     runLedgerEntryTest(
         test::jtx::Env& env,
-        Json::StaticString const& parentField,
+        json::StaticString const& parentField,
         std::vector<Subfield> const& subfields,
         std::source_location const location = std::source_location::current())
     {
         testMalformedField(
             env,
-            Json::Value{},
+            json::Value{},
             parentField,
             FieldType::HashOrObjectField,
             "malformedRequest",
             true,
             location);
 
-        Json::Value correctOutput;
-        correctOutput[parentField] = Json::objectValue;
+        json::Value correctOutput;
+        correctOutput[parentField] = json::ObjectValue;
         for (auto const& subfield : subfields)
         {
             correctOutput[parentField][subfield.fieldName] = getCorrectValue(subfield.fieldName);
@@ -489,7 +483,7 @@ class LedgerEntry_test : public beast::unit_test::suite
         env.close();
         {
             // Missing ledger_entry ledger_hash
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account_root] = alice.human();
             jvParams[jss::ledger_hash] =
                 "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
@@ -499,14 +493,14 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Missing ledger_entry ledger_hash
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account_root] = alice.human();
             auto const typeId = FieldType::HashField;
 
             forAllApiVersions([&, this](unsigned apiVersion) {
-                auto tryField = [&](Json::Value fieldValue) -> void {
+                auto tryField = [&](json::Value fieldValue) -> void {
                     jvParams[jss::ledger_hash] = fieldValue;
-                    Json::Value const jrr = env.rpc(
+                    json::Value const jrr = env.rpc(
                         apiVersion, "json", "ledger_entry", to_string(jvParams))[jss::result];
                     checkErrorValue(
                         jrr, "invalidParams", "Invalid field 'ledger_hash', not hex string.");
@@ -522,7 +516,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // ask for an zero index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::index] =
                 "00000000000000000000000000000000000000000000000000000000000000"
@@ -534,12 +528,12 @@ class LedgerEntry_test : public beast::unit_test::suite
         forAllApiVersions([&, this](unsigned apiVersion) {
             // "features" is not an option supported by ledger_entry.
             {
-                Json::Value jvParams = Json::objectValue;
+                json::Value jvParams = json::ObjectValue;
                 jvParams[jss::features] =
                     "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                     "AAAAAAAAAA";
                 jvParams[jss::api_version] = apiVersion;
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
                 if (apiVersion < 2u)
@@ -571,7 +565,7 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string const ledgerHash{to_string(env.closed()->header().hash)};
         {
             // Exercise ledger_closed along the way.
-            Json::Value const jrr = env.rpc("ledger_closed")[jss::result];
+            json::Value const jrr = env.rpc("ledger_closed")[jss::result];
             BEAST_EXPECT(jrr[jss::ledger_hash] == ledgerHash);
             BEAST_EXPECT(jrr[jss::ledger_index] == 3);
         }
@@ -579,10 +573,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string accountRootIndex;
         {
             // Request alice's account root.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account_root] = alice.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::node));
             BEAST_EXPECT(jrr[jss::node][jss::Account] == alice.human());
@@ -590,26 +584,26 @@ class LedgerEntry_test : public beast::unit_test::suite
             accountRootIndex = jrr[jss::index].asString();
         }
         {
-            constexpr char aliceAcctRootBinary[]{
+            constexpr char kALICE_ACCT_ROOT_BINARY[]{
                 "1100612200800000240000000425000000032D00000000559CE54C3B934E4"
                 "73A995B477E92EC229F99CED5B62BF4D2ACE4DC42719103AE2F6240000002"
                 "540BE4008114AE123A8556F3CF91154711376AFB0F894F832B3D"};
 
             // Request alice's account root, but with binary == true;
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account_root] = alice.human();
             jvParams[jss::binary] = 1;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            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] == aliceAcctRootBinary);
+            BEAST_EXPECT(jrr[jss::node_binary] == kALICE_ACCT_ROOT_BINARY);
         }
         {
             // Request alice's account root using the index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::index] = accountRootIndex;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(!jrr.isMember(jss::node_binary));
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -618,10 +612,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Request alice's account root by index, but with binary == false.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::index] = accountRootIndex;
             jvParams[jss::binary] = 0;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::node));
             BEAST_EXPECT(jrr[jss::node][jss::Account] == alice.human());
@@ -629,10 +623,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Check alias
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account] = alice.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::node));
             BEAST_EXPECT(jrr[jss::node][jss::Account] == alice.human());
@@ -641,16 +635,16 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Check malformed cases
-            Json::Value const jvParams;
+            json::Value const jvParams;
             testMalformedField(
                 env, jvParams, jss::account_root, FieldType::AccountField, "malformedAddress");
         }
         {
             // Request an account that is not in the ledger.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::account_root] = Account("bob").human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
@@ -703,7 +697,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                             "7BB62DC13EC72B775091E9C71BF8CF97E122"
                             "647693B50C5E87A80DFD6FCFAC50"));
                     majority1.setFieldU32(sfCloseTime, 779561310);
-                    majorities.push_back(std::move(majority1));
+                    majorities.pushBack(std::move(majority1));
 
                     auto majority2 = STObject::makeInnerObject(sfMajority);
                     majority2.setFieldH256(
@@ -712,7 +706,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                             "755C971C29971C9F20C6F080F2ED96F87884"
                             "E40AD19554A5EBECDCEC8A1F77FE"));
                     majority2.setFieldU32(sfCloseTime, 779561310);
-                    majorities.push_back(std::move(majority2));
+                    majorities.pushBack(std::move(majority2));
 
                     sle->setFieldArray(sfMajorities, majorities);
 
@@ -722,16 +716,16 @@ class LedgerEntry_test : public beast::unit_test::suite
                 env.app().getOpenLedger().modify(amendments);
             }
 
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::amendments] = to_string(keylet.key);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Amendments);
         }
 
         // negative tests
         testMalformedField(
-            env, Json::Value{}, jss::amendments, FieldType::FixedHashField, "malformedRequest");
+            env, json::Value{}, jss::amendments, FieldType::FixedHashField, "malformedRequest");
     }
 
     void
@@ -747,12 +741,12 @@ class LedgerEntry_test : public beast::unit_test::suite
             // positive test
             env.fund(XRP(10000), alice);
             env.close();
-            PrettyAsset const USD = getAsset(env);
-            AMM const amm(env, alice, XRP(10), USD(1000));
+            PrettyAsset const usd = getAsset(env);
+            AMM const amm(env, alice, XRP(10), usd(1000));
             env.close();
 
             {
-                Json::Value jvParams;
+                json::Value jvParams;
                 jvParams[jss::amm] = to_string(amm.ammID());
                 auto const result = env.rpc("json", "ledger_entry", to_string(jvParams));
                 BEAST_EXPECT(
@@ -764,16 +758,16 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value jvParams;
-                Json::Value ammParams(Json::objectValue);
+                json::Value jvParams;
+                json::Value ammParams(json::ObjectValue);
                 {
-                    Json::Value obj(Json::objectValue);
+                    json::Value obj(json::ObjectValue);
                     obj[jss::currency] = "XRP";
                     ammParams[jss::asset] = obj;
                 }
                 {
-                    Json::Value const obj(Json::objectValue);
-                    ammParams[jss::asset2] = to_json(USD.raw());
+                    json::Value const obj(json::ObjectValue);
+                    ammParams[jss::asset2] = toJson(usd.raw());
                 }
                 jvParams[jss::amm] = ammParams;
                 auto const result = env.rpc("json", "ledger_entry", to_string(jvParams));
@@ -820,10 +814,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string const ledgerHash{to_string(env.closed()->header().hash)};
         {
             // Request a check.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::check] = to_string(checkId.key);
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Check);
             BEAST_EXPECT(jrr[jss::node][sfSendMax.jsonName] == "100000000");
@@ -833,16 +827,16 @@ class LedgerEntry_test : public beast::unit_test::suite
             // account root index.
             std::string accountRootIndex;
             {
-                Json::Value jvParams;
+                json::Value jvParams;
                 jvParams[jss::account_root] = alice.human();
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 accountRootIndex = jrr[jss::index].asString();
             }
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::check] = accountRootIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "unexpectedLedgerType", "Unexpected ledger type.");
         }
@@ -931,11 +925,11 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string delegateIndex;
         {
             // Request by account and authorize
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::delegate][jss::account] = alice.human();
             jvParams[jss::delegate][jss::authorize] = bob.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Delegate);
             BEAST_EXPECT(jrr[jss::node][sfAccount.jsonName] == alice.human());
@@ -944,10 +938,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Request by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::delegate] = delegateIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Delegate);
             BEAST_EXPECT(jrr[jss::node][sfAccount.jsonName] == alice.human());
@@ -987,11 +981,11 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string depositPreauthIndex;
         {
             // Request a depositPreauth by owner and authorized.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::deposit_preauth][jss::owner] = alice.human();
             jvParams[jss::deposit_preauth][jss::authorized] = becky.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::DepositPreauth);
@@ -1001,10 +995,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Request a depositPreauth by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::deposit_preauth] = depositPreauthIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::DepositPreauth);
@@ -1049,14 +1043,14 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Succeed
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
 
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
 
-            Json::Value jo;
+            json::Value jo;
             jo[jss::issuer] = issuer.human();
             jo[jss::credential_type] = strHex(std::string_view(credType));
             arr.append(std::move(jo));
@@ -1071,23 +1065,23 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, invalid account
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
 
-            auto tryField = [&](Json::Value fieldValue) -> void {
-                Json::Value arr = Json::arrayValue;
-                Json::Value jo;
+            auto tryField = [&](json::Value fieldValue) -> void {
+                json::Value arr = json::ArrayValue;
+                json::Value jo;
                 jo[jss::issuer] = fieldValue;
                 jo[jss::credential_type] = strHex(std::string_view(credType));
                 arr.append(jo);
                 jvParams[jss::deposit_preauth][jss::authorized_credentials] = arr;
 
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 auto const expectedErrMsg = fieldValue.isNull()
-                    ? RPC::missing_field_message(jss::issuer.c_str())
-                    : RPC::expected_field_message(jss::issuer, "AccountID");
+                    ? RPC::missingFieldMessage(jss::issuer.cStr())
+                    : RPC::expectedFieldMessage(jss::issuer, "AccountID");
                 checkErrorValue(jrr, "malformedAuthorizedCredentials", expectedErrMsg);
             };
 
@@ -1096,19 +1090,19 @@ class LedgerEntry_test : public beast::unit_test::suite
             {
                 tryField(value);
             }
-            tryField(Json::nullValue);
+            tryField(json::NullValue);
         }
 
         {
             // Failed, duplicates in credentials
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
 
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
 
-            Json::Value jo;
+            json::Value jo;
             jo[jss::issuer] = issuer.human();
             jo[jss::credential_type] = strHex(std::string_view(credType));
             arr.append(jo);
@@ -1117,28 +1111,28 @@ class LedgerEntry_test : public beast::unit_test::suite
             checkErrorValue(
                 jrr[jss::result],
                 "malformedAuthorizedCredentials",
-                RPC::expected_field_message(jss::authorized_credentials, "array"));
+                RPC::expectedFieldMessage(jss::authorized_credentials, "array"));
         }
 
         {
             // Failed, invalid credential_type
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
 
-            auto tryField = [&](Json::Value fieldValue) -> void {
-                Json::Value arr = Json::arrayValue;
-                Json::Value jo;
+            auto tryField = [&](json::Value fieldValue) -> void {
+                json::Value arr = json::ArrayValue;
+                json::Value jo;
                 jo[jss::issuer] = issuer.human();
                 jo[jss::credential_type] = fieldValue;
                 arr.append(jo);
                 jvParams[jss::deposit_preauth][jss::authorized_credentials] = arr;
 
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 auto const expectedErrMsg = fieldValue.isNull()
-                    ? RPC::missing_field_message(jss::credential_type.c_str())
-                    : RPC::expected_field_message(jss::credential_type, "hex string");
+                    ? RPC::missingFieldMessage(jss::credential_type.cStr())
+                    : RPC::expectedFieldMessage(jss::credential_type, "hex string");
                 checkErrorValue(jrr, "malformedAuthorizedCredentials", expectedErrMsg);
             };
 
@@ -1147,20 +1141,20 @@ class LedgerEntry_test : public beast::unit_test::suite
             {
                 tryField(value);
             }
-            tryField(Json::nullValue);
+            tryField(json::NullValue);
         }
 
         {
             // Failed, authorized and authorized_credentials both present
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
             jvParams[jss::deposit_preauth][jss::authorized] = alice.human();
 
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
 
-            Json::Value jo;
+            json::Value jo;
             jo[jss::issuer] = issuer.human();
             jo[jss::credential_type] = strHex(std::string_view(credType));
             arr.append(std::move(jo));
@@ -1175,7 +1169,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, authorized_credentials is not an array
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
             testMalformedSubfield(
@@ -1190,10 +1184,10 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, authorized_credentials contains string data
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
             arr.append("foobar");
 
@@ -1206,12 +1200,12 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, authorized_credentials contains arrays
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
-            Json::Value payload = Json::arrayValue;
+            json::Value payload = json::ArrayValue;
             payload.append(42);
             arr.append(std::move(payload));
 
@@ -1224,10 +1218,10 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, authorized_credentials is empty array
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
 
             auto const jrr = env.rpc("json", "ledger_entry", to_string(jvParams));
             checkErrorValue(
@@ -1238,20 +1232,21 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Failed, authorized_credentials is too long
-            static std::array<std::string_view, 9> const credTypes = {
+            static std::array<std::string_view, 9> const kCRED_TYPES = {
                 "cred1", "cred2", "cred3", "cred4", "cred5", "cred6", "cred7", "cred8", "cred9"};
-            static_assert(sizeof(credTypes) / sizeof(credTypes[0]) > maxCredentialsArraySize);
+            static_assert(
+                sizeof(kCRED_TYPES) / sizeof(kCRED_TYPES[0]) > kMAX_CREDENTIALS_ARRAY_SIZE);
 
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = jss::validated;
             jvParams[jss::deposit_preauth][jss::owner] = bob.human();
-            jvParams[jss::deposit_preauth][jss::authorized_credentials] = Json::arrayValue;
+            jvParams[jss::deposit_preauth][jss::authorized_credentials] = json::ArrayValue;
 
             auto& arr(jvParams[jss::deposit_preauth][jss::authorized_credentials]);
 
-            for (auto cred : credTypes)
+            for (auto cred : kCRED_TYPES)
             {
-                Json::Value jo;
+                json::Value jo;
                 jo[jss::issuer] = issuer.human();
                 jo[jss::credential_type] = strHex(std::string_view(cred));
                 arr.append(std::move(jo));
@@ -1273,25 +1268,25 @@ class LedgerEntry_test : public beast::unit_test::suite
         Env env{*this};
         Account const alice{"alice"};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, gw);
         env.close();
 
-        env.trust(USD(1000), alice);
+        env.trust(usd(1000), alice);
         env.close();
 
         // Run up the number of directory entries so alice has two
         // directory nodes.
         for (int d = 1'000'032; d >= 1'000'000; --d)
         {
-            env(offer(alice, USD(1), drops(d)));
+            env(offer(alice, usd(1), drops(d)));
         }
         env.close();
 
         std::string const ledgerHash{to_string(env.closed()->header().hash)};
         {
             // Exercise ledger_closed along the way.
-            Json::Value const jrr = env.rpc("ledger_closed")[jss::result];
+            json::Value const jrr = env.rpc("ledger_closed")[jss::result];
             BEAST_EXPECT(jrr[jss::ledger_hash] == ledgerHash);
             BEAST_EXPECT(jrr[jss::ledger_index] == 5);
         }
@@ -1300,66 +1295,66 @@ class LedgerEntry_test : public beast::unit_test::suite
             "A33EC6BB85FB5674074C4A3A43373BB17645308F3EAE1933E3E35252162B217D";
         {
             // Locate directory by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::directory] = dirRootIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfIndexes.jsonName].size() == 32);
         }
         {
             // Locate directory by directory root.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::dir_root] = dirRootIndex;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::index] == dirRootIndex);
         }
         {
             // Locate directory by owner.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::owner] = alice.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::index] == dirRootIndex);
         }
         {
             // Locate directory by directory root and sub_index.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::dir_root] = dirRootIndex;
             jvParams[jss::directory][jss::sub_index] = 1;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::index] != dirRootIndex);
             BEAST_EXPECT(jrr[jss::node][sfIndexes.jsonName].size() == 2);
         }
         {
             // Locate directory by owner and sub_index.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::owner] = alice.human();
             jvParams[jss::directory][jss::sub_index] = 1;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::index] != dirRootIndex);
             BEAST_EXPECT(jrr[jss::node][sfIndexes.jsonName].size() == 2);
         }
         {
             // Bad directory argument.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_hash] = ledgerHash;
             testMalformedField(
                 env, jvParams, jss::directory, FieldType::HashOrObjectField, "malformedRequest");
         }
         {
             // Non-integer sub_index.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::dir_root] = dirRootIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
             testMalformedSubfield(
@@ -1373,8 +1368,8 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Malformed owner entry.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
 
             jvParams[jss::ledger_hash] = ledgerHash;
             testMalformedSubfield(
@@ -1388,23 +1383,23 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Malformed directory object.  Specifies both dir_root and owner.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::owner] = alice.human();
             jvParams[jss::directory][jss::dir_root] = dirRootIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(
                 jrr, "malformedRequest", "Must have exactly one of `owner` and `dir_root` fields.");
         }
         {
             // Incomplete directory object.  Missing both dir_root and owner.
-            Json::Value jvParams;
-            jvParams[jss::directory] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::directory] = json::ObjectValue;
             jvParams[jss::directory][jss::sub_index] = 1;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(
                 jrr, "malformedRequest", "Must have exactly one of `owner` and `dir_root` fields.");
@@ -1426,11 +1421,11 @@ class LedgerEntry_test : public beast::unit_test::suite
                                test::jtx::Account const& to,
                                STAmount const& amount,
                                NetClock::time_point const& cancelAfter) {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::EscrowCreate;
             jv[jss::Account] = account.human();
             jv[jss::Destination] = to.human();
-            jv[jss::Amount] = amount.getJson(JsonOptions::none);
+            jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
             jv[sfFinishAfter.jsonName] = cancelAfter.time_since_epoch().count() + 2;
             return jv;
         };
@@ -1443,21 +1438,21 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string escrowIndex;
         {
             // Request the escrow using owner and sequence.
-            Json::Value jvParams;
-            jvParams[jss::escrow] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::escrow] = json::ObjectValue;
             jvParams[jss::escrow][jss::owner] = alice.human();
             jvParams[jss::escrow][jss::seq] = env.seq(alice) - 1;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][jss::Amount] == XRP(333).value().getText());
             escrowIndex = jrr[jss::index].asString();
         }
         {
             // Request the escrow by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::escrow] = escrowIndex;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][jss::Amount] == XRP(333).value().getText());
         }
@@ -1478,16 +1473,16 @@ class LedgerEntry_test : public beast::unit_test::suite
         // positive test
         {
             Keylet const keylet = keylet::fees();
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::fee] = to_string(keylet.key);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::FeeSettings);
         }
 
         // negative tests
         testMalformedField(
-            env, Json::Value{}, jss::fee, FieldType::FixedHashField, "malformedRequest");
+            env, json::Value{}, jss::fee, FieldType::FixedHashField, "malformedRequest");
     }
 
     void
@@ -1500,16 +1495,16 @@ class LedgerEntry_test : public beast::unit_test::suite
         // positive test
         {
             Keylet const keylet = keylet::skip();
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::hashes] = to_string(keylet.key);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::LedgerHashes);
         }
 
         // negative tests
         testMalformedField(
-            env, Json::Value{}, jss::hashes, FieldType::FixedHashField, "malformedRequest");
+            env, json::Value{}, jss::hashes, FieldType::FixedHashField, "malformedRequest");
     }
 
     void
@@ -1525,17 +1520,17 @@ class LedgerEntry_test : public beast::unit_test::suite
         env.fund(XRP(1000), issuer, buyer);
 
         uint256 const nftokenID0 = token::getNextID(env, issuer, 0, tfTransferable);
-        env(token::mint(issuer, 0), txflags(tfTransferable));
+        env(token::mint(issuer, 0), Txflags(tfTransferable));
         env.close();
         uint256 const offerID = keylet::nftoffer(issuer, env.seq(issuer)).key;
         env(token::createOffer(issuer, nftokenID0, drops(1)),
-            token::destination(buyer),
-            txflags(tfSellNFToken));
+            token::Destination(buyer),
+            Txflags(tfSellNFToken));
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::nft_offer] = to_string(offerID);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::NFTokenOffer);
             BEAST_EXPECT(jrr[jss::node][sfOwner.jsonName] == issuer.human());
@@ -1558,16 +1553,16 @@ class LedgerEntry_test : public beast::unit_test::suite
         Account const issuer{"issuer"};
         env.fund(XRP(1000), issuer);
 
-        env(token::mint(issuer, 0), txflags(tfTransferable));
+        env(token::mint(issuer, 0), Txflags(tfTransferable));
         env.close();
 
-        auto const nftpage = keylet::nftpage_max(issuer);
+        auto const nftpage = keylet::nftpageMax(issuer);
         BEAST_EXPECT(env.le(nftpage) != nullptr);
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::nft_page] = to_string(nftpage.key);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::NFTokenPage);
         }
@@ -1601,7 +1596,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                         "2DA79C58A3AB");
                     disabledValidator.setFieldVL(sfPublicKey, *pubKeyBlob);
                     disabledValidator.setFieldU32(sfFirstLedgerSequence, 91371264);
-                    disabledValidators.push_back(std::move(disabledValidator));
+                    disabledValidators.pushBack(std::move(disabledValidator));
 
                     sle->setFieldArray(sfDisabledValidators, disabledValidators);
                     sle->setFieldH256(
@@ -1618,16 +1613,16 @@ class LedgerEntry_test : public beast::unit_test::suite
                 env.app().getOpenLedger().modify(nUNL);
             }
 
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::nunl] = to_string(keylet.key);
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::NegativeUNL);
         }
 
         // negative tests
         testMalformedField(
-            env, Json::Value{}, jss::nunl, FieldType::FixedHashField, "malformedRequest");
+            env, json::Value{}, jss::nunl, FieldType::FixedHashField, "malformedRequest");
     }
 
     void
@@ -1638,32 +1633,32 @@ class LedgerEntry_test : public beast::unit_test::suite
         Env env{*this};
         Account const alice{"alice"};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, gw);
         env.close();
 
-        env(offer(alice, USD(321), XRP(322)));
+        env(offer(alice, usd(321), XRP(322)));
         env.close();
 
         std::string const ledgerHash{to_string(env.closed()->header().hash)};
         std::string offerIndex;
         {
             // Request the offer using owner and sequence.
-            Json::Value jvParams;
-            jvParams[jss::offer] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::offer] = json::ObjectValue;
             jvParams[jss::offer][jss::account] = alice.human();
             jvParams[jss::offer][jss::seq] = env.seq(alice) - 1;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][jss::TakerGets] == "322000000");
             offerIndex = jrr[jss::index].asString();
         }
         {
             // Request the offer using its index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::offer] = offerIndex;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][jss::TakerGets] == "322000000");
         }
@@ -1695,11 +1690,11 @@ class LedgerEntry_test : public beast::unit_test::suite
                                 STAmount const& amount,
                                 NetClock::duration const& settleDelay,
                                 PublicKey const& pk) {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::PaymentChannelCreate;
             jv[jss::Account] = account.human();
             jv[jss::Destination] = to.human();
-            jv[jss::Amount] = amount.getJson(JsonOptions::none);
+            jv[jss::Amount] = amount.getJson(JsonOptions::KNone);
             jv[sfSettleDelay.jsonName] = settleDelay.count();
             jv[sfPublicKey.jsonName] = strHex(pk.slice());
             return jv;
@@ -1713,10 +1708,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         uint256 const payChanIndex{keylet::payChan(alice, env.master, env.seq(alice) - 1).key};
         {
             // Request the payment channel using its index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::payment_channel] = to_string(payChanIndex);
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfAmount.jsonName] == "57000000");
             BEAST_EXPECT(jrr[jss::node][sfBalance.jsonName] == "0");
@@ -1724,10 +1719,10 @@ class LedgerEntry_test : public beast::unit_test::suite
         }
         {
             // Request an index that is not a payment channel.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::payment_channel] = ledgerHash;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
@@ -1746,14 +1741,14 @@ class LedgerEntry_test : public beast::unit_test::suite
         Env env{*this};
         Account const alice{"alice"};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(10000), alice, gw);
         env.close();
 
-        env.trust(USD(999), alice);
+        env.trust(usd(999), alice);
         env.close();
 
-        env(pay(gw, alice, USD(97)));
+        env(pay(gw, alice, usd(97)));
         env.close();
 
         // check both aliases
@@ -1762,14 +1757,14 @@ class LedgerEntry_test : public beast::unit_test::suite
             std::string const ledgerHash{to_string(env.closed()->header().hash)};
             {
                 // Request the trust line using the accounts and currency.
-                Json::Value jvParams;
-                jvParams[fieldName] = Json::objectValue;
-                jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                json::Value jvParams;
+                jvParams[fieldName] = json::ObjectValue;
+                jvParams[fieldName][jss::accounts] = json::ArrayValue;
                 jvParams[fieldName][jss::accounts][0u] = alice.human();
                 jvParams[fieldName][jss::accounts][1u] = gw.human();
                 jvParams[fieldName][jss::currency] = "USD";
                 jvParams[jss::ledger_hash] = ledgerHash;
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 BEAST_EXPECT(jrr[jss::node][sfBalance.jsonName][jss::value] == "-97");
                 BEAST_EXPECT(jrr[jss::node][sfHighLimit.jsonName][jss::value] == "999");
@@ -1786,13 +1781,13 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
             {
                 // ripple_state one of the accounts is missing.
-                Json::Value jvParams;
-                jvParams[fieldName] = Json::objectValue;
-                jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                json::Value jvParams;
+                jvParams[fieldName] = json::ObjectValue;
+                jvParams[fieldName][jss::accounts] = json::ArrayValue;
                 jvParams[fieldName][jss::accounts][0u] = alice.human();
                 jvParams[fieldName][jss::currency] = "USD";
                 jvParams[jss::ledger_hash] = ledgerHash;
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 checkErrorValue(
                     jrr,
@@ -1802,15 +1797,15 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
             {
                 // ripple_state more than 2 accounts.
-                Json::Value jvParams;
-                jvParams[fieldName] = Json::objectValue;
-                jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                json::Value jvParams;
+                jvParams[fieldName] = json::ObjectValue;
+                jvParams[fieldName][jss::accounts] = json::ArrayValue;
                 jvParams[fieldName][jss::accounts][0u] = alice.human();
                 jvParams[fieldName][jss::accounts][1u] = gw.human();
                 jvParams[fieldName][jss::accounts][2u] = alice.human();
                 jvParams[fieldName][jss::currency] = "USD";
                 jvParams[jss::ledger_hash] = ledgerHash;
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 checkErrorValue(
                     jrr,
@@ -1820,37 +1815,37 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
             {
                 // ripple_state account[0] / account[1] is not an account.
-                Json::Value jvParams;
-                jvParams[fieldName] = Json::objectValue;
-                auto tryField = [&](Json::Value badAccount) -> void {
+                json::Value jvParams;
+                jvParams[fieldName] = json::ObjectValue;
+                auto tryField = [&](json::Value badAccount) -> void {
                     {
                         // account[0]
-                        jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                        jvParams[fieldName][jss::accounts] = json::ArrayValue;
                         jvParams[fieldName][jss::accounts][0u] = badAccount;
                         jvParams[fieldName][jss::accounts][1u] = gw.human();
                         jvParams[fieldName][jss::currency] = "USD";
 
-                        Json::Value const jrr =
+                        json::Value const jrr =
                             env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                         checkErrorValue(
                             jrr,
                             "malformedAddress",
-                            RPC::expected_field_message(jss::accounts, "array of Accounts"));
+                            RPC::expectedFieldMessage(jss::accounts, "array of Accounts"));
                     }
 
                     {
                         // account[1]
-                        jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                        jvParams[fieldName][jss::accounts] = json::ArrayValue;
                         jvParams[fieldName][jss::accounts][0u] = alice.human();
                         jvParams[fieldName][jss::accounts][1u] = badAccount;
                         jvParams[fieldName][jss::currency] = "USD";
 
-                        Json::Value const jrr =
+                        json::Value const jrr =
                             env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                         checkErrorValue(
                             jrr,
                             "malformedAddress",
-                            RPC::expected_field_message(jss::accounts, "array of Accounts"));
+                            RPC::expectedFieldMessage(jss::accounts, "array of Accounts"));
                     }
                 };
 
@@ -1859,18 +1854,18 @@ class LedgerEntry_test : public beast::unit_test::suite
                 {
                     tryField(value);
                 }
-                tryField(Json::nullValue);
+                tryField(json::NullValue);
             }
             {
                 // ripple_state account[0] == account[1].
-                Json::Value jvParams;
-                jvParams[fieldName] = Json::objectValue;
-                jvParams[fieldName][jss::accounts] = Json::arrayValue;
+                json::Value jvParams;
+                jvParams[fieldName] = json::ObjectValue;
+                jvParams[fieldName][jss::accounts] = json::ArrayValue;
                 jvParams[fieldName][jss::accounts][0u] = alice.human();
                 jvParams[fieldName][jss::accounts][1u] = alice.human();
                 jvParams[fieldName][jss::currency] = "USD";
                 jvParams[jss::ledger_hash] = ledgerHash;
-                Json::Value const jrr =
+                json::Value const jrr =
                     env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
                 checkErrorValue(jrr, "malformedRequest", "Cannot have a trustline to self.");
             }
@@ -1905,52 +1900,52 @@ class LedgerEntry_test : public beast::unit_test::suite
         // last created ticket.
         {
             // Not a valid ticket requested by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ticket] = to_string(getTicketIndex(env.master, tkt1 - 1));
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
         {
             // First real ticket requested by index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ticket] = to_string(getTicketIndex(env.master, tkt1));
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Ticket);
             BEAST_EXPECT(jrr[jss::node][sfTicketSequence.jsonName] == tkt1);
         }
         {
             // Second real ticket requested by account and sequence.
-            Json::Value jvParams;
-            jvParams[jss::ticket] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::ticket] = json::ObjectValue;
             jvParams[jss::ticket][jss::account] = env.master.human();
             jvParams[jss::ticket][jss::ticket_seq] = tkt1 + 1;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(
                 jrr[jss::node][jss::index] == to_string(getTicketIndex(env.master, tkt1 + 1)));
         }
         {
             // Not a valid ticket requested by account and sequence.
-            Json::Value jvParams;
-            jvParams[jss::ticket] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::ticket] = json::ObjectValue;
             jvParams[jss::ticket][jss::account] = env.master.human();
             jvParams[jss::ticket][jss::ticket_seq] = tkt1 + 2;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
         {
             // Request a ticket using an account root entry.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ticket] = to_string(keylet::account(env.master).key);
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "unexpectedLedgerType", "Unexpected ledger type.");
         }
@@ -1981,7 +1976,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         // Lambda to create a DID.
         auto didCreate = [](test::jtx::Account const& account) {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::TransactionType] = jss::DIDSet;
             jv[jss::Account] = account.human();
             jv[sfDIDDocument.jsonName] = strHex(std::string{"data"});
@@ -1996,26 +1991,26 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Request the DID using its index.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::did] = alice.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfDIDDocument.jsonName] == strHex(std::string{"data"}));
             BEAST_EXPECT(jrr[jss::node][sfURI.jsonName] == strHex(std::string{"uri"}));
         }
         {
             // Request an index that is not a DID.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::did] = env.master.human();
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
         {
             // Malformed DID index
-            Json::Value const jvParams;
+            json::Value const jvParams;
             testMalformedField(
                 env, jvParams, jss::did, FieldType::AccountField, "malformedAddress");
         }
@@ -2114,49 +2109,49 @@ class LedgerEntry_test : public beast::unit_test::suite
         std::string const badMptID = "00000193B9DDCAF401B5B3B26875986043F82CD0D13B4315";
         {
             // Request the MPTIssuance using its MPTIssuanceID.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::mpt_issuance] = strHex(mptAlice.issuanceID());
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::node][sfMPTokenMetadata.jsonName] == strHex(std::string{"123"}));
             BEAST_EXPECT(jrr[jss::node][jss::mpt_issuance_id] == strHex(mptAlice.issuanceID()));
         }
         {
             // Request an index that is not a MPTIssuance.
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::mpt_issuance] = badMptID;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
         {
             // Request the MPToken using its owner + mptIssuanceID.
-            Json::Value jvParams;
-            jvParams[jss::mptoken] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::mptoken] = json::ObjectValue;
             jvParams[jss::mptoken][jss::account] = bob.human();
             jvParams[jss::mptoken][jss::mpt_issuance_id] = strHex(mptAlice.issuanceID());
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             BEAST_EXPECT(
                 jrr[jss::node][sfMPTokenIssuanceID.jsonName] == strHex(mptAlice.issuanceID()));
         }
         {
             // Request the MPToken using a bad mptIssuanceID.
-            Json::Value jvParams;
-            jvParams[jss::mptoken] = Json::objectValue;
+            json::Value jvParams;
+            jvParams[jss::mptoken] = json::ObjectValue;
             jvParams[jss::mptoken][jss::account] = bob.human();
             jvParams[jss::mptoken][jss::mpt_issuance_id] = badMptID;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 env.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
         {
             // Malformed MPTIssuance index
-            Json::Value const jvParams;
+            json::Value const jvParams;
             testMalformedField(
                 env, jvParams, jss::mptoken, FieldType::HashOrObjectField, "malformedRequest");
         }
@@ -2169,7 +2164,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        Env env(*this, testable_amendments() | featurePermissionedDomains);
+        Env env(*this, testableAmendments() | featurePermissionedDomains);
         Account const issuer{"issuer"};
         Account const alice{"alice"};
         Account const bob{"bob"};
@@ -2186,7 +2181,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Succeed
-            Json::Value params;
+            json::Value params;
             params[jss::ledger_index] = jss::validated;
             params[jss::permissioned_domain][jss::account] = alice.human();
             params[jss::permissioned_domain][jss::seq] = seq;
@@ -2213,7 +2208,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
         {
             // Fail, invalid permissioned domain index
-            Json::Value params;
+            json::Value params;
             params[jss::ledger_index] = jss::validated;
             params[jss::permissioned_domain] =
                 "12F1F1F1F180D67377B2FAB292A31C922470326268D2B9B74CD1E582645B9A"
@@ -2260,8 +2255,8 @@ class LedgerEntry_test : public beast::unit_test::suite
          *   good. Defaults to "entryNotFound".
          */
         auto checkResult = [&](bool good,
-                               Json::Value const& jv,
-                               Json::StaticString const& expectedType,
+                               json::Value const& jv,
+                               json::StaticString const& expectedType,
                                std::optional<std::string> const& expectedError = {}) {
             if (good)
             {
@@ -2294,27 +2289,27 @@ class LedgerEntry_test : public beast::unit_test::suite
          * @param good: Indicates whether the object is expected to
          *   exist.
          */
-        auto test = [&](Json::StaticString const& field,
-                        Json::StaticString const& expectedType,
+        auto test = [&](json::StaticString const& field,
+                        json::StaticString const& expectedType,
                         Keylet const& expectedKey,
                         bool good) {
-            testcase << expectedType.c_str() << (good ? "" : " not") << " found";
+            testcase << expectedType.cStr() << (good ? "" : " not") << " found";
 
             auto const hexKey = strHex(expectedKey.key);
 
             {
                 // Test bad values
                 // "field":null
-                Json::Value params;
+                json::Value params;
                 params[jss::ledger_index] = jss::validated;
-                params[field] = Json::nullValue;
+                params[field] = json::NullValue;
                 auto const jv = env.rpc("json", "ledger_entry", to_string(params));
                 checkResult(false, jv, expectedType, "malformedRequest");
                 BEAST_EXPECT(!jv[jss::result].isMember(jss::index));
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 // "field":"string"
                 params[jss::ledger_index] = jss::validated;
                 params[field] = "arbitrary string";
@@ -2324,7 +2319,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 // "field":false
                 params[jss::ledger_index] = jss::validated;
                 params[field] = false;
@@ -2334,7 +2329,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
 
                 // "field":[incorrect index hash]
                 auto const badKey = strHex(expectedKey.key + uint256{1});
@@ -2346,7 +2341,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 // "index":"field" using API 2
                 params[jss::ledger_index] = jss::validated;
                 params[jss::index] = field;
@@ -2358,7 +2353,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
             std::string const pdIdx = [&]() {
                 {
-                    Json::Value params;
+                    json::Value params;
                     // Test good values
                     // Use the "field":true notation
                     params[jss::ledger_index] = jss::validated;
@@ -2374,7 +2369,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }();
 
             {
-                Json::Value params;
+                json::Value params;
                 // "field":"[index hash]"
                 params[jss::ledger_index] = jss::validated;
                 params[field] = hexKey;
@@ -2386,7 +2381,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             {
                 // Bad value
                 // Use the "index":"field" notation with API 2
-                Json::Value params;
+                json::Value params;
                 params[jss::ledger_index] = jss::validated;
                 params[jss::index] = field;
                 params[jss::api_version] = 2;
@@ -2396,7 +2391,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 // Use the "index":"field" notation with API 3
                 params[jss::ledger_index] = jss::validated;
                 params[jss::index] = field;
@@ -2408,7 +2403,7 @@ class LedgerEntry_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value params;
+                json::Value params;
                 // Use the "index":"[index hash]" notation
                 params[jss::ledger_index] = jss::validated;
                 params[jss::index] = pdIdx;
@@ -2453,7 +2448,7 @@ class LedgerEntry_test : public beast::unit_test::suite
          *   good. Defaults to "entryNotFound".
          */
         auto checkResult = [&](bool good,
-                               Json::Value const& jv,
+                               json::Value const& jv,
                                int expectedCount,
                                std::optional<std::string> const& expectedError = {}) {
             if (good)
@@ -2493,7 +2488,7 @@ class LedgerEntry_test : public beast::unit_test::suite
          *   object if "good".
          */
         auto test =
-            [&](Json::Value ledger, Keylet const& expectedKey, bool good, int expectedCount = 0) {
+            [&](json::Value ledger, Keylet const& expectedKey, bool good, int expectedCount = 0) {
                 testcase << "LedgerHashes: seq: " << env.current()->header().seq
                          << " \"hashes\":" << to_string(ledger) << (good ? "" : " not") << " found";
 
@@ -2502,16 +2497,16 @@ class LedgerEntry_test : public beast::unit_test::suite
                 {
                     // Test bad values
                     // "hashes":null
-                    Json::Value params;
+                    json::Value params;
                     params[jss::ledger_index] = jss::validated;
-                    params[jss::hashes] = Json::nullValue;
+                    params[jss::hashes] = json::NullValue;
                     auto jv = env.rpc("json", "ledger_entry", to_string(params));
                     checkResult(false, jv, 0, "malformedRequest");
                     BEAST_EXPECT(!jv[jss::result].isMember(jss::index));
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // "hashes":"non-uint string"
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = "arbitrary string";
@@ -2521,7 +2516,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // "hashes":"uint string" is invalid, too
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = "10";
@@ -2531,7 +2526,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // "hashes":false
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = false;
@@ -2541,7 +2536,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // "hashes":-1
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = -1;
@@ -2552,7 +2547,7 @@ class LedgerEntry_test : public beast::unit_test::suite
 
                 // "hashes":[incorrect index hash]
                 {
-                    Json::Value params;
+                    json::Value params;
                     auto const badKey = strHex(expectedKey.key + uint256{1});
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = badKey;
@@ -2562,7 +2557,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // Test good values
                     // Use the "hashes":ledger notation
                     params[jss::ledger_index] = jss::validated;
@@ -2575,7 +2570,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // "hashes":"[index hash]"
                     params[jss::ledger_index] = jss::validated;
                     params[jss::hashes] = hexKey;
@@ -2588,7 +2583,7 @@ class LedgerEntry_test : public beast::unit_test::suite
                 }
 
                 {
-                    Json::Value params;
+                    json::Value params;
                     // Use the "index":"[index hash]" notation
                     params[jss::ledger_index] = jss::validated;
                     params[jss::index] = hexKey;
@@ -2648,7 +2643,7 @@ class LedgerEntry_test : public beast::unit_test::suite
         env.close();
 
         // Request a check.
-        Json::Value const jrr = env.rpc("ledger_entry", to_string(checkId.key))[jss::result];
+        json::Value const jrr = env.rpc("ledger_entry", to_string(checkId.key))[jss::result];
         BEAST_EXPECT(jrr[jss::node][sfLedgerEntryType.jsonName] == jss::Check);
         BEAST_EXPECT(jrr[jss::node][sfSendMax.jsonName] == "100000000");
     }
@@ -2689,11 +2684,11 @@ public:
     }
 };
 
-class LedgerEntry_XChain_test : public beast::unit_test::suite,
+class LedgerEntry_XChain_test : public beast::unit_test::Suite,
                                 public test::jtx::XChainBridgeObjects
 {
     void
-    checkErrorValue(Json::Value const& jv, std::string const& err, std::string const& msg)
+    checkErrorValue(json::Value const& jv, std::string const& err, std::string const& msg)
     {
         if (BEAST_EXPECT(jv.isMember(jss::status)))
             BEAST_EXPECT(jv[jss::status] == "error");
@@ -2701,7 +2696,7 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
             BEAST_EXPECT(jv[jss::error] == err);
         if (msg.empty())
         {
-            BEAST_EXPECT(jv[jss::error_message] == Json::nullValue || jv[jss::error_message] == "");
+            BEAST_EXPECT(jv[jss::error_message] == json::NullValue || jv[jss::error_message] == "");
         }
         else if (BEAST_EXPECT(jv.isMember(jss::error_message)))
         {
@@ -2721,14 +2716,14 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
         createBridgeObjects(mcEnv, scEnv);
 
         std::string const ledgerHash{to_string(mcEnv.closed()->header().hash)};
-        std::string bridge_index;
-        Json::Value mcBridge;
+        std::string bridgeIndex;
+        json::Value mcBridge;
         {
             // request the bridge via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::bridge_account] = mcDoor.human();
             jvParams[jss::bridge] = jvb;
-            Json::Value const jrr =
+            json::Value const jrr =
                 mcEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -2751,14 +2746,14 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
             BEAST_EXPECT(r[sfXChainAccountClaimCount.jsonName].asInt() == 0);
 
             BEAST_EXPECT(r.isMember(jss::index));
-            bridge_index = r[jss::index].asString();
+            bridgeIndex = r[jss::index].asString();
             mcBridge = r;
         }
         {
             // request the bridge via RPC by index
-            Json::Value jvParams;
-            jvParams[jss::index] = bridge_index;
-            Json::Value const jrr =
+            json::Value jvParams;
+            jvParams[jss::index] = bridgeIndex;
+            json::Value const jrr =
                 mcEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -2766,12 +2761,12 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
         }
         {
             // swap door accounts and make sure we get an error value
-            Json::Value jvParams;
+            json::Value jvParams;
             // Sidechain door account is "master", not scDoor
-            jvParams[jss::bridge_account] = Account::master.human();
+            jvParams[jss::bridge_account] = Account::kMASTER.human();
             jvParams[jss::bridge] = jvb;
             jvParams[jss::ledger_hash] = ledgerHash;
-            Json::Value const jrr =
+            json::Value const jrr =
                 mcEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
@@ -2779,16 +2774,16 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
         {
             // create two claim ids and verify that the bridge counter was
             // incremented
-            mcEnv(xchain_create_claim_id(mcAlice, jvb, reward, scAlice));
+            mcEnv(xchainCreateClaimId(mcAlice, jvb, reward, scAlice));
             mcEnv.close();
-            mcEnv(xchain_create_claim_id(mcBob, jvb, reward, scBob));
+            mcEnv(xchainCreateClaimId(mcBob, jvb, reward, scBob));
             mcEnv.close();
 
             // request the bridge via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::bridge_account] = mcDoor.human();
             jvParams[jss::bridge] = jvb;
-            Json::Value const jrr =
+            json::Value const jrr =
                 mcEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -2811,17 +2806,17 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
 
         createBridgeObjects(mcEnv, scEnv);
 
-        scEnv(xchain_create_claim_id(scAlice, jvb, reward, mcAlice));
+        scEnv(xchainCreateClaimId(scAlice, jvb, reward, mcAlice));
         scEnv.close();
-        scEnv(xchain_create_claim_id(scBob, jvb, reward, mcBob));
+        scEnv(xchainCreateClaimId(scBob, jvb, reward, mcBob));
         scEnv.close();
 
         {
             // request the xchain_claim_id via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::xchain_owned_claim_id] = jvXRPBridgeRPC;
             jvParams[jss::xchain_owned_claim_id][jss::xchain_owned_claim_id] = 1;
-            Json::Value const jrr =
+            json::Value const jrr =
                 scEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -2836,10 +2831,10 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
 
         {
             // request the xchain_claim_id via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::xchain_owned_claim_id] = jvXRPBridgeRPC;
             jvParams[jss::xchain_owned_claim_id][jss::xchain_owned_claim_id] = 2;
-            Json::Value const jrr =
+            json::Value const jrr =
                 scEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
@@ -2868,13 +2863,13 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
         auto scCarol = Account("scCarol");  // Don't fund it - it will be created with the
                                             // xchain transaction
         auto const amt = XRP(1000);
-        mcEnv(sidechain_xchain_account_create(mcAlice, jvb, scCarol, amt, reward));
+        mcEnv(sidechainXchainAccountCreate(mcAlice, jvb, scCarol, amt, reward));
         mcEnv.close();
 
         // send less than quorum of attestations (otherwise funds are
         // immediately transferred and no "claim" object is created)
-        size_t constexpr num_attest = 3;
-        auto attestations = create_account_attestations(
+        size_t constexpr kNUM_ATTEST = 3;
+        auto attestations = createAccountAttestations(
             scAttester,
             jvb,
             mcAlice,
@@ -2885,8 +2880,8 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
             1,
             scCarol,
             signers,
-            UT_XCHAIN_DEFAULT_NUM_SIGNERS);
-        for (size_t i = 0; i < num_attest; ++i)
+            kUT_XCHAIN_DEFAULT_NUM_SIGNERS);
+        for (size_t i = 0; i < kNUM_ATTEST; ++i)
         {
             scEnv(attestations[i]);
         }
@@ -2894,18 +2889,18 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
 
         {
             // request the create account claim_id via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::xchain_owned_create_account_claim_id] = jvXRPBridgeRPC;
             jvParams[jss::xchain_owned_create_account_claim_id]
                     [jss::xchain_owned_create_account_claim_id] = 1;
-            Json::Value const jrr =
+            json::Value const jrr =
                 scEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
 
             BEAST_EXPECT(jrr.isMember(jss::node));
             auto r = jrr[jss::node];
 
             BEAST_EXPECT(r.isMember(jss::Account));
-            BEAST_EXPECT(r[jss::Account] == Account::master.human());
+            BEAST_EXPECT(r[jss::Account] == Account::kMASTER.human());
 
             BEAST_EXPECT(r.isMember(sfXChainAccountCreateCount.jsonName));
             BEAST_EXPECT(r[sfXChainAccountCreateCount.jsonName].asInt() == 1);
@@ -2915,18 +2910,19 @@ class LedgerEntry_XChain_test : public beast::unit_test::suite,
             BEAST_EXPECT(attest.isArray());
             BEAST_EXPECT(attest.size() == 3);
             BEAST_EXPECT(
-                attest[Json::Value::UInt(0)].isMember(sfXChainCreateAccountProofSig.jsonName));
-            Json::Value a[num_attest];
-            for (size_t i = 0; i < num_attest; ++i)
+                attest[json::Value::UInt(0)].isMember(sfXChainCreateAccountProofSig.jsonName));
+            json::Value a[kNUM_ATTEST];
+            for (size_t i = 0; i < kNUM_ATTEST; ++i)
             {
-                a[i] = attest[Json::Value::UInt(0)][sfXChainCreateAccountProofSig.jsonName];
+                a[i] = attest[json::Value::UInt(0)][sfXChainCreateAccountProofSig.jsonName];
                 BEAST_EXPECT(
-                    a[i].isMember(jss::Amount) && a[i][jss::Amount].asInt() == 1000 * drop_per_xrp);
+                    a[i].isMember(jss::Amount) &&
+                    a[i][jss::Amount].asInt() == 1000 * kDROP_PER_XRP);
                 BEAST_EXPECT(
                     a[i].isMember(jss::Destination) && a[i][jss::Destination] == scCarol.human());
                 BEAST_EXPECT(
                     a[i].isMember(sfAttestationSignerAccount.jsonName) &&
-                    std::ranges::any_of(signers, [&](signer const& s) {
+                    std::ranges::any_of(signers, [&](Signer const& s) {
                         return a[i][sfAttestationSignerAccount.jsonName] == s.account.human();
                     }));
                 BEAST_EXPECT(
@@ -2939,24 +2935,24 @@ 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 * drop_per_xrp);
+                    a[i][sfSignatureReward.jsonName].asInt() == 1 * kDROP_PER_XRP);
             }
         }
 
         // complete attestations quorum - CreateAccountClaimID should not be
         // present anymore
-        for (size_t i = num_attest; i < UT_XCHAIN_DEFAULT_NUM_SIGNERS; ++i)
+        for (size_t i = kNUM_ATTEST; i < kUT_XCHAIN_DEFAULT_NUM_SIGNERS; ++i)
         {
             scEnv(attestations[i]);
         }
         scEnv.close();
         {
             // request the create account claim_id via RPC
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::xchain_owned_create_account_claim_id] = jvXRPBridgeRPC;
             jvParams[jss::xchain_owned_create_account_claim_id]
                     [jss::xchain_owned_create_account_claim_id] = 1;
-            Json::Value const jrr =
+            json::Value const jrr =
                 scEnv.rpc("json", "ledger_entry", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "entryNotFound", "Entry not found.");
         }
diff --git a/src/test/rpc/LedgerHeader_test.cpp b/src/test/rpc/LedgerHeader_test.cpp
index bb1ce8b51f..885fabb255 100644
--- a/src/test/rpc/LedgerHeader_test.cpp
+++ b/src/test/rpc/LedgerHeader_test.cpp
@@ -7,16 +7,16 @@
 
 namespace xrpl {
 
-class LedgerHeader_test : public beast::unit_test::suite
+class LedgerHeader_test : public beast::unit_test::Suite
 {
     void
     testSimpleCurrent()
     {
         testcase("Current ledger");
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
-        Json::Value params{Json::objectValue};
+        json::Value params{json::ObjectValue};
         params[jss::api_version] = 1;
         params[jss::ledger_index] = "current";
         auto const result = env.client().invoke("ledger_header", params)[jss::result];
@@ -31,9 +31,9 @@ class LedgerHeader_test : public beast::unit_test::suite
     {
         testcase("Validated ledger");
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
-        Json::Value params{Json::objectValue};
+        json::Value params{json::ObjectValue};
         params[jss::api_version] = 1;
         params[jss::ledger_index] = "validated";
         auto const result = env.client().invoke("ledger_header", params)[jss::result];
@@ -48,9 +48,9 @@ class LedgerHeader_test : public beast::unit_test::suite
     {
         testcase("Command retired from API v2");
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
-        Json::Value params{Json::objectValue};
+        json::Value params{json::ObjectValue};
         params[jss::api_version] = 2;
         auto const result = env.client().invoke("ledger_header", params)[jss::result];
         BEAST_EXPECT(result[jss::error] == "unknownCmd");
diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp
index 48fcfd2dec..13887e5710 100644
--- a/src/test/rpc/LedgerRPC_test.cpp
+++ b/src/test/rpc/LedgerRPC_test.cpp
@@ -27,10 +27,10 @@
 
 namespace xrpl::test {
 
-class LedgerRPC_test : public beast::unit_test::suite
+class LedgerRPC_test : public beast::unit_test::Suite
 {
     void
-    checkErrorValue(Json::Value const& jv, std::string const& err, std::string const& msg)
+    checkErrorValue(json::Value const& jv, std::string const& err, std::string const& msg)
     {
         if (BEAST_EXPECT(jv.isMember(jss::status)))
             BEAST_EXPECT(jv[jss::status] == "error");
@@ -38,7 +38,7 @@ class LedgerRPC_test : public beast::unit_test::suite
             BEAST_EXPECT(jv[jss::error] == err);
         if (msg.empty())
         {
-            BEAST_EXPECT(jv[jss::error_message] == Json::nullValue || jv[jss::error_message] == "");
+            BEAST_EXPECT(jv[jss::error_message] == json::NullValue || jv[jss::error_message] == "");
         }
         else if (BEAST_EXPECT(jv.isMember(jss::error_message)))
         {
@@ -71,7 +71,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         BEAST_EXPECT(env.current()->header().seq == 4);
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             // can be either numeric or quoted numeric
             jvParams[jss::ledger_index] = 1;
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
@@ -80,7 +80,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "1";
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr[jss::ledger][jss::closed] == true);
@@ -104,17 +104,17 @@ class LedgerRPC_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         Account const bob{"bob"};
 
         env.fund(XRP(10000), gw, bob);
         env.close();
-        env.trust(USD(1000), bob);
+        env.trust(usd(1000), bob);
         env.close();
 
         {
             // ask for an arbitrary string - index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "potato";
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             checkErrorValue(
@@ -123,7 +123,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // ask for a negative index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = -1;
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             checkErrorValue(
@@ -132,7 +132,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // ask for a bad ledger index
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 10u;
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             checkErrorValue(jrr, "lgrNotFound", "ledgerNotFound");
@@ -146,7 +146,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // Request queue for closed ledger
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "validated";
             jvParams[jss::queue] = true;
             auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
@@ -156,7 +156,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         {
             // Request a ledger with a very large (double) sequence.
             auto const ret = env.rpc("json", "ledger", "{ \"ledger_index\" : 2e15 }");
-            BEAST_EXPECT(RPC::contains_error(ret));
+            BEAST_EXPECT(RPC::containsError(ret));
             BEAST_EXPECT(ret[jss::error_message] == "Invalid parameters.");
         }
 
@@ -168,8 +168,8 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // test all boolean fields with non-boolean values
-            auto testBooleanField = [&](Json::StaticString const& field) {
-                Json::Value jvParams;
+            auto testBooleanField = [&](json::StaticString const& field) {
+                json::Value jvParams;
                 jvParams[field] = "blah";
                 auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
                 checkErrorValue(jrr, "invalidParams", "Invalid parameters.");
@@ -211,7 +211,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         env.close();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = 3u;
         jvParams[jss::full] = true;
         auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
@@ -226,11 +226,11 @@ class LedgerRPC_test : public beast::unit_test::suite
         testcase("Ledger Request, Full Option Without Admin");
         using namespace test::jtx;
 
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
         //        env.close();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = 1u;
         jvParams[jss::full] = true;
         auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
@@ -247,7 +247,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         env.close();
 
-        Json::Value jvParams;
+        json::Value jvParams;
         jvParams[jss::ledger_index] = 3u;
         jvParams[jss::accounts] = true;
         auto const jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
@@ -280,7 +280,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // access via the legacy ledger field, keyword index values
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger] = "closed";
             auto jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::ledger));
@@ -324,7 +324,7 @@ class LedgerRPC_test : public beast::unit_test::suite
                 "0F1A9E0C109ADEF6DA2BDE19217C12BBEC57174CBDBD212B0EBDC1CEDB8531"
                 "85"};
             // access via the ledger_hash field
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_hash] = hash3;
             auto jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::ledger));
@@ -362,7 +362,7 @@ class LedgerRPC_test : public beast::unit_test::suite
 
         {
             // access via the ledger_index field, keyword index values
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "closed";
             auto jrr = env.rpc("json", "ledger", to_string(jvParams))[jss::result];
             BEAST_EXPECT(jrr.isMember(jss::ledger));
@@ -415,7 +415,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this};
 
-        Json::Value jv;
+        json::Value jv;
         jv[jss::ledger_index] = "current";
         jv[jss::queue] = true;
         jv[jss::expand] = true;
@@ -439,7 +439,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         cfg->FEES.reference_fee = 10;
         Env env(*this, std::move(cfg));
 
-        Json::Value jv;
+        json::Value jv;
         jv[jss::ledger_index] = "current";
         jv[jss::queue] = true;
         jv[jss::expand] = true;
@@ -471,16 +471,16 @@ class LedgerRPC_test : public beast::unit_test::suite
         // Put some txs in the queue
         // Alice
         auto aliceSeq = env.seq(alice);
-        env(pay(alice, "george", XRP(1000)), last_ledger_seq(7), ter(terQUEUED));
-        env(offer(alice, XRP(50000), alice["USD"](5000)), seq(aliceSeq + 1), ter(terQUEUED));
-        env(noop(alice), seq(aliceSeq + 2), ter(terQUEUED));
+        env(pay(alice, "george", XRP(1000)), LastLedgerSeq(7), Ter(terQUEUED));
+        env(offer(alice, XRP(50000), alice["USD"](5000)), Seq(aliceSeq + 1), Ter(terQUEUED));
+        env(noop(alice), Seq(aliceSeq + 2), Ter(terQUEUED));
         // Bob
         auto batch = [&env](Account a) {
             auto aSeq = env.seq(a);
             // Enough fee to get in front of alice in the queue
             for (int i = 0; i < 10; ++i)
             {
-                env(noop(a), fee(1000 + i), seq(aSeq + i), ter(terQUEUED));
+                env(noop(a), Fee(1000 + i), Seq(aSeq + i), Ter(terQUEUED));
             }
         };
         batch(bob);
@@ -654,7 +654,7 @@ class LedgerRPC_test : public beast::unit_test::suite
         std::string index;
         int hashesLedgerEntryIndex = -1;
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 3u;
             jvParams[jss::accounts] = true;
             jvParams[jss::expand] = true;
@@ -682,10 +682,10 @@ class LedgerRPC_test : public beast::unit_test::suite
             BEAST_EXPECT(
                 jrr.isMember(jss::warnings) && jrr[jss::warnings].isArray() &&
                 jrr[jss::warnings].size() == 1 &&
-                jrr[jss::warnings][0u][jss::id].asInt() == warnRPC_FIELDS_DEPRECATED);
+                jrr[jss::warnings][0u][jss::id].asInt() == WarnRpcFieldsDeprecated);
         }
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = 3u;
             jvParams[jss::accounts] = true;
             jvParams[jss::expand] = false;
@@ -701,7 +701,7 @@ class LedgerRPC_test : public beast::unit_test::suite
             BEAST_EXPECT(
                 jrr.isMember(jss::warnings) && jrr[jss::warnings].isArray() &&
                 jrr[jss::warnings].size() == 1 &&
-                jrr[jss::warnings][0u][jss::id].asInt() == warnRPC_FIELDS_DEPRECATED);
+                jrr[jss::warnings][0u][jss::id].asInt() == WarnRpcFieldsDeprecated);
         }
     }
 
diff --git a/src/test/rpc/LedgerRequest_test.cpp b/src/test/rpc/LedgerRequest_test.cpp
index 496cd9478a..65c5a57712 100644
--- a/src/test/rpc/LedgerRequest_test.cpp
+++ b/src/test/rpc/LedgerRequest_test.cpp
@@ -18,14 +18,14 @@
 
 namespace xrpl::RPC {
 
-class LedgerRequest_test : public beast::unit_test::suite
+class LedgerRequest_test : public beast::unit_test::Suite
 {
-    static constexpr char const* hash1 =
+    static constexpr char const* kHASH1 =
         "3020EB9E7BE24EF7D7A060CB051583EC117384636D1781AFB5B87F3E348DA489";
-    static constexpr char const* accounthash1 =
+    static constexpr char const* kACCOUNTHASH1 =
         "BD8A3D72CA73DDE887AD63666EC2BAD07875CBA997A102579B5B95ECDFFEAED8";
 
-    static constexpr char const* zerohash =
+    static constexpr char const* kZEROHASH =
         "0000000000000000000000000000000000000000000000000000000000000000";
 
 public:
@@ -44,28 +44,28 @@ public:
             // arbitrary text is converted to 0.
             auto const result = env.rpc("ledger_request", "arbitrary_text");
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] == "Ledger index too small");
         }
 
         {
             auto const result = env.rpc("ledger_request", "-1");
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] == "Ledger index too small");
         }
 
         {
             auto const result = env.rpc("ledger_request", "0");
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] == "Ledger index too small");
         }
 
         {
             auto const result = env.rpc("ledger_request", "1");
             BEAST_EXPECT(
-                !RPC::contains_error(result[jss::result]) &&
+                !RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::ledger_index] == 1 &&
                 result[jss::result].isMember(jss::ledger));
             BEAST_EXPECT(
@@ -76,7 +76,7 @@ public:
         {
             auto const result = env.rpc("ledger_request", "2");
             BEAST_EXPECT(
-                !RPC::contains_error(result[jss::result]) &&
+                !RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::ledger_index] == 2 &&
                 result[jss::result].isMember(jss::ledger));
             BEAST_EXPECT(
@@ -87,7 +87,7 @@ public:
         {
             auto const result = env.rpc("ledger_request", "3");
             BEAST_EXPECT(
-                !RPC::contains_error(result[jss::result]) &&
+                !RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::ledger_index] == 3 &&
                 result[jss::result].isMember(jss::ledger));
             BEAST_EXPECT(
@@ -99,8 +99,8 @@ public:
             {
                 auto const r = env.rpc("ledger_request", ledgerHash);
                 BEAST_EXPECT(
-                    !RPC::contains_error(r[jss::result]) &&
-                    r[jss::result][jss::ledger_index] == 3 && r[jss::result].isMember(jss::ledger));
+                    !RPC::containsError(r[jss::result]) && r[jss::result][jss::ledger_index] == 3 &&
+                    r[jss::result].isMember(jss::ledger));
                 BEAST_EXPECT(
                     r[jss::result][jss::ledger].isMember(jss::ledger_hash) &&
                     r[jss::result][jss::ledger][jss::ledger_hash] == ledgerHash);
@@ -113,7 +113,7 @@ public:
             auto const result = env.rpc("ledger_request", ledgerHash);
 
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] ==
                     "Invalid field 'ledger_hash', not hex string.");
         }
@@ -124,21 +124,21 @@ public:
             auto const result = env.rpc("ledger_request", ledgerHash);
 
             BEAST_EXPECT(
-                !RPC::contains_error(result[jss::result]) &&
+                !RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::have_header] == false);
         }
 
         {
             auto const result = env.rpc("ledger_request", "4");
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] == "Ledger index too large");
         }
 
         {
             auto const result = env.rpc("ledger_request", "5");
             BEAST_EXPECT(
-                RPC::contains_error(result[jss::result]) &&
+                RPC::containsError(result[jss::result]) &&
                 result[jss::result][jss::error_message] == "Ledger index too large");
         }
     }
@@ -153,7 +153,7 @@ public:
         Env env{*this, std::move(cfg), FeatureBitset{}};  // the hashes being checked below
                                                           // assume no amendments
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
         env.close();
 
@@ -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] == hash1);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == zerohash);
-        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == accounthash1);
-        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == zerohash);
+        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* hash2 =
+        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] == hash2);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == hash1);
+        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] == zerohash);
+        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == kZEROHASH);
 
         result = env.rpc("ledger_request", "3")[jss::result];
-        constexpr char const* hash3 =
+        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] == hash3);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == hash2);
+        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* hash4 =
+        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] == hash4);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == hash3);
+        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* hash5 =
+        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] == hash5);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == hash4);
+        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");
@@ -248,12 +248,12 @@ public:
         using namespace test::jtx;
         Env env{*this};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
         env.close();
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_hash] =
                 "AB868A6CFEEC779C2FF845C0AF00A642259986AF40C01976A7F842B6918936"
                 "C7";
@@ -269,7 +269,7 @@ public:
         }
 
         {
-            Json::Value jvParams;
+            json::Value jvParams;
             jvParams[jss::ledger_index] = "index";
             auto const result =
                 env.rpc("json", "ledger_request", jvParams.toStyledString())[jss::result];
@@ -306,12 +306,12 @@ public:
                     return cfg;
                 })};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
 
-        int const max_limit = 256;
+        int const maxLimit = 256;
 
-        for (auto i = 0; i < max_limit + 10; i++)
+        for (auto i = 0; i < maxLimit + 10; i++)
         {
             Account const bob{std::string("bob") + std::to_string(i)};
             env.fund(XRP(1000), bob);
@@ -322,27 +322,27 @@ 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] == hash1);
-        BEAST_EXPECT(result[jss::ledger][jss::parent_hash] == zerohash);
-        BEAST_EXPECT(result[jss::ledger][jss::account_hash] == accounthash1);
-        BEAST_EXPECT(result[jss::ledger][jss::transaction_hash] == zerohash);
+        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
     testNonAdmin()
     {
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
         Account const gw{"gateway"};
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
         env.fund(XRP(100000), gw);
 
-        env.set_retries(0);
+        env.setRetries(0);
         auto const result = env.rpc("ledger_request", "1")[jss::result];
         // The current HTTP/S ServerHandler returns an HTTP 403 error code here
         // rather than a noPermission JSON error.  The JSONRPCClient just eats
         // that error and returns an null result.
-        BEAST_EXPECT(result.type() == Json::nullValue);
+        BEAST_EXPECT(result.type() == json::NullValue);
     }
 
     void
diff --git a/src/test/rpc/ManifestRPC_test.cpp b/src/test/rpc/ManifestRPC_test.cpp
index aa27c67ca9..c29f3d4e39 100644
--- a/src/test/rpc/ManifestRPC_test.cpp
+++ b/src/test/rpc/ManifestRPC_test.cpp
@@ -14,7 +14,7 @@
 
 namespace xrpl::test {
 
-class ManifestRPC_test : public beast::unit_test::suite
+class ManifestRPC_test : public beast::unit_test::Suite
 {
 public:
     void
diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp
index ac283a54b1..5099a2da2f 100644
--- a/src/test/rpc/NoRippleCheck_test.cpp
+++ b/src/test/rpc/NoRippleCheck_test.cpp
@@ -34,7 +34,7 @@
 
 namespace xrpl {
 
-class NoRippleCheck_test : public beast::unit_test::suite
+class NoRippleCheck_test : public beast::unit_test::Suite
 {
     void
     testBadInput()
@@ -55,7 +55,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         }
 
         {  // missing role field
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             auto const result = env.rpc("json", "noripple_check", to_string(params))[jss::result];
             BEAST_EXPECT(result[jss::error] == "invalidParams");
@@ -65,7 +65,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         // test account non-string
         {
             auto testInvalidAccountParam = [&](auto const& param) {
-                Json::Value params;
+                json::Value params;
                 params[jss::account] = param;
                 params[jss::role] = "user";
                 auto jrr = env.rpc("json", "noripple_check", to_string(params))[jss::result];
@@ -76,13 +76,13 @@ class NoRippleCheck_test : public beast::unit_test::suite
             testInvalidAccountParam(1);
             testInvalidAccountParam(1.1);
             testInvalidAccountParam(true);
-            testInvalidAccountParam(Json::Value(Json::nullValue));
-            testInvalidAccountParam(Json::Value(Json::objectValue));
-            testInvalidAccountParam(Json::Value(Json::arrayValue));
+            testInvalidAccountParam(json::Value(json::NullValue));
+            testInvalidAccountParam(json::Value(json::ObjectValue));
+            testInvalidAccountParam(json::Value(json::ArrayValue));
         }
 
         {  // invalid role field
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::role] = "not_a_role";
             auto const result = env.rpc("json", "noripple_check", to_string(params))[jss::result];
@@ -91,7 +91,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         }
 
         {  // invalid limit
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::role] = "user";
             params[jss::limit] = -1;
@@ -102,7 +102,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         }
 
         {  // invalid ledger (hash)
-            Json::Value params;
+            json::Value params;
             params[jss::account] = alice.human();
             params[jss::role] = "user";
             params[jss::ledger_hash] = 1;
@@ -113,7 +113,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         }
 
         {  // account not found
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"nobody"}.human();
             params[jss::role] = "user";
             params[jss::ledger] = "current";
@@ -124,7 +124,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
 
         {  // passing an account private key will cause
            // parsing as a seed to fail
-            Json::Value params;
+            json::Value params;
             params[jss::account] = toBase58(TokenType::NodePrivate, alice.sk());
             params[jss::role] = "user";
             params[jss::ledger] = "current";
@@ -135,7 +135,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
 
         {
             // ledger and ledger_hash are included
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"nobody"}.human();
             params[jss::role] = "user";
             params[jss::ledger] = "current";
@@ -150,10 +150,10 @@ class NoRippleCheck_test : public beast::unit_test::suite
 
         {
             // invalid ledger
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"nobody"}.human();
             params[jss::role] = "user";
-            params[jss::ledger] = Json::objectValue;
+            params[jss::ledger] = json::ObjectValue;
             auto const result = env.rpc("json", "noripple_check", to_string(params))[jss::result];
             BEAST_EXPECT(result[jss::error] == "invalidParams");
             BEAST_EXPECT(
@@ -186,7 +186,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
         }
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::account] = alice.human();
         params[jss::role] = (user ? "user" : "gateway");
         params[jss::ledger] = "current";
@@ -241,7 +241,7 @@ class NoRippleCheck_test : public beast::unit_test::suite
                 result[jss::transactions][txs.size() - 1][jss::TransactionType] == jss::TrustSet);
             BEAST_EXPECT(
                 result[jss::transactions][txs.size() - 1][jss::LimitAmount] ==
-                gw["USD"](100).value().getJson(JsonOptions::none));
+                gw["USD"](100).value().getJson(JsonOptions::KNone));
         }
         else
         {
@@ -262,7 +262,7 @@ public:
     }
 };
 
-class NoRippleCheckLimits_test : public beast::unit_test::suite
+class NoRippleCheckLimits_test : public beast::unit_test::Suite
 {
     void
     testLimits(bool admin)
@@ -271,7 +271,7 @@ class NoRippleCheckLimits_test : public beast::unit_test::suite
 
         using namespace test::jtx;
 
-        Env env{*this, admin ? envconfig() : envconfig(no_admin)};
+        Env env{*this, admin ? envconfig() : envconfig(noAdmin)};
 
         auto const alice = Account{"alice"};
         env.fund(XRP(100000), alice);
@@ -290,18 +290,18 @@ class NoRippleCheckLimits_test : public beast::unit_test::suite
             using namespace std::chrono;
             using namespace beast::IP;
             auto c = env.app().getResourceManager().newInboundEndpoint(
-                Endpoint::from_string(test::getEnvLocalhostAddr()));
+                Endpoint::fromString(test::getEnvLocalhostAddr()));
 
             // if we go above the warning threshold, reset
-            if (c.balance() > warningThreshold)
+            if (c.balance() > WarningThreshold)
             {
-                using ct = beast::abstract_clock<steady_clock>;
+                using ct = beast::AbstractClock<steady_clock>;
                 c.entry().local_balance =
-                    DecayingSample<decayWindowSeconds, ct>{steady_clock::now()};
+                    DecayingSample<DecayWindowSeconds, ct>{steady_clock::now()};
             }
         };
 
-        for (auto i = 0; i < xrpl::RPC::Tuning::noRippleCheck.rmax + 5; ++i)
+        for (auto i = 0; i < xrpl::RPC::Tuning::kNO_RIPPLE_CHECK.rmax + 5; ++i)
         {
             if (!admin)
                 checkBalance();
@@ -311,20 +311,20 @@ 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(autofill),
-                fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
-                sig(autofill));
+                Seq(kAUTOFILL),
+                Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
+                Sig(kAUTOFILL));
             env(fset(gw, asfDefaultRipple),
-                seq(autofill),
-                fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
-                sig(autofill));
+                Seq(kAUTOFILL),
+                Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1),
+                Sig(kAUTOFILL));
             env(trust(alice, gw["USD"](10)),
-                fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1));
+                Fee(toDrops(txq.getMetrics(*env.current()).openLedgerFeeLevel, baseFee) + 1));
             env.close();
         }
 
         // default limit value
-        Json::Value params;
+        json::Value params;
         params[jss::account] = alice.human();
         params[jss::role] = "user";
         params[jss::ledger] = "current";
diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp
index 75d26ca208..3b3f8b3674 100644
--- a/src/test/rpc/NoRipple_test.cpp
+++ b/src/test/rpc/NoRipple_test.cpp
@@ -23,7 +23,7 @@
 
 namespace xrpl::test {
 
-class NoRipple_test : public beast::unit_test::suite
+class NoRipple_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -39,28 +39,28 @@ public:
 
         env.fund(XRP(10000), gw, alice);
 
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        Json::Value account_gw;
-        account_gw[jss::account] = gw.human();
-        Json::Value account_alice;
-        account_alice[jss::account] = alice.human();
+        json::Value accountGw;
+        accountGw[jss::account] = gw.human();
+        json::Value accountAlice;
+        accountAlice[jss::account] = alice.human();
 
-        for (auto SetOrClear : {true, false})
+        for (auto setOrClear : {true, false})
         {
             // Create a trust line with no-ripple flag setting
-            env(trust(gw, USD(100), alice, SetOrClear ? tfSetNoRipple : tfClearNoRipple));
+            env(trust(gw, usd(100), alice, setOrClear ? tfSetNoRipple : tfClearNoRipple));
             env.close();
 
             // Check no-ripple flag on sender 'gateway'
-            Json::Value lines{env.rpc("json", "account_lines", to_string(account_gw))};
+            json::Value lines{env.rpc("json", "account_lines", to_string(accountGw))};
             auto const& gwLine0 = lines[jss::result][jss::lines][0u];
-            BEAST_EXPECT(gwLine0[jss::no_ripple].asBool() == SetOrClear);
+            BEAST_EXPECT(gwLine0[jss::no_ripple].asBool() == setOrClear);
 
             // Check no-ripple peer flag on destination 'alice'
-            lines = env.rpc("json", "account_lines", to_string(account_alice));
+            lines = env.rpc("json", "account_lines", to_string(accountAlice));
             auto const& aline0 = lines[jss::result][jss::lines][0u];
-            BEAST_EXPECT(aline0[jss::no_ripple_peer].asBool() == SetOrClear);
+            BEAST_EXPECT(aline0[jss::no_ripple_peer].asBool() == setOrClear);
         }
     }
 
@@ -87,24 +87,24 @@ public:
         // After this payment alice has a -50 USD balance with bob, and
         // bob has a -50 USD balance with carol.  So neither alice nor
         // bob should be able to clear the noRipple flag.
-        env(pay(alice, carol, carol["USD"](50)), path(bob));
+        env(pay(alice, carol, carol["USD"](50)), Path(bob));
         env.close();
 
         TER const terNeg{TER{tecNO_PERMISSION}};
 
-        env(trust(alice, bob["USD"](100), bob, tfSetNoRipple), ter(terNeg));
-        env(trust(bob, carol["USD"](100), carol, tfSetNoRipple), ter(terNeg));
+        env(trust(alice, bob["USD"](100), bob, tfSetNoRipple), Ter(terNeg));
+        env(trust(bob, carol["USD"](100), carol, tfSetNoRipple), Ter(terNeg));
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::source_account] = alice.human();
         params[jss::destination_account] = carol.human();
         params[jss::destination_amount] = [] {
-            Json::Value dest_amt;
-            dest_amt[jss::currency] = "USD";
-            dest_amt[jss::value] = "1";
-            dest_amt[jss::issuer] = Account("carol").human();
-            return dest_amt;
+            json::Value destAmt;
+            destAmt[jss::currency] = "USD";
+            destAmt[jss::value] = "1";
+            destAmt[jss::issuer] = Account("carol").human();
+            return destAmt;
         }();
 
         auto const resp = env.rpc("json", "ripple_path_find", to_string(params));
@@ -127,7 +127,7 @@ public:
 
         // Now carol sends the 50 USD back to alice.  Then alice and
         // bob can set the noRipple flag.
-        env(pay(carol, alice, alice["USD"](50)), path(bob));
+        env(pay(carol, alice, alice["USD"](50)), Path(bob));
         env.close();
 
         env(trust(alice, bob["USD"](100), bob, tfSetNoRipple));
@@ -166,21 +166,21 @@ public:
         env(trust(bob, carol["USD"](100), carol, tfSetNoRipple));
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::source_account] = alice.human();
         params[jss::destination_account] = carol.human();
         params[jss::destination_amount] = [] {
-            Json::Value dest_amt;
-            dest_amt[jss::currency] = "USD";
-            dest_amt[jss::value] = "1";
-            dest_amt[jss::issuer] = Account("carol").human();
-            return dest_amt;
+            json::Value destAmt;
+            destAmt[jss::currency] = "USD";
+            destAmt[jss::value] = "1";
+            destAmt[jss::issuer] = Account("carol").human();
+            return destAmt;
         }();
 
-        Json::Value const resp{env.rpc("json", "ripple_path_find", to_string(params))};
+        json::Value const resp{env.rpc("json", "ripple_path_find", to_string(params))};
         BEAST_EXPECT(resp[jss::result][jss::alternatives].size() == 0);
 
-        env(pay(alice, carol, bob["USD"](50)), ter(tecPATH_DRY));
+        env(pay(alice, carol, bob["USD"](50)), Ter(tecPATH_DRY));
     }
 
     void
@@ -202,11 +202,11 @@ public:
 
         env(fset(bob, asfDefaultRipple));
 
-        auto const USD = gw["USD"];
+        auto const usd = gw["USD"];
 
-        env(trust(gw, USD(100), alice, 0));
-        env(trust(gw, USD(100), bob, 0));
-        Json::Value params;
+        env(trust(gw, usd(100), alice, 0));
+        env(trust(gw, usd(100), bob, 0));
+        json::Value params;
         params[jss::api_version] = apiVersion;
 
         {
@@ -273,7 +273,7 @@ public:
             testPairwise(features);
         };
         using namespace jtx;
-        auto const sa = testable_amendments();
+        auto const sa = testableAmendments();
         withFeatsTests(sa - featurePermissionedDEX);
         withFeatsTests(sa);
     }
diff --git a/src/test/rpc/OwnerInfo_test.cpp b/src/test/rpc/OwnerInfo_test.cpp
index fb0cc47995..5704138272 100644
--- a/src/test/rpc/OwnerInfo_test.cpp
+++ b/src/test/rpc/OwnerInfo_test.cpp
@@ -17,7 +17,7 @@
 
 namespace xrpl {
 
-class OwnerInfo_test : public beast::unit_test::suite
+class OwnerInfo_test : public beast::unit_test::Suite
 {
     void
     testBadInput()
@@ -38,7 +38,7 @@ class OwnerInfo_test : public beast::unit_test::suite
         }
 
         {  // ask for empty account
-            Json::Value params;
+            json::Value params;
             params[jss::account] = "";
             auto const result = env.rpc("json", "owner_info", to_string(params))[jss::result];
             if (BEAST_EXPECT(result.isMember(jss::accepted) && result.isMember(jss::current)))
@@ -53,11 +53,11 @@ class OwnerInfo_test : public beast::unit_test::suite
         {  // ask for nonexistent account
            // this seems like it should be an error, but current impl
            // (deprecated) does not return an error, just empty fields.
-            Json::Value params;
+            json::Value params;
             params[jss::account] = Account{"bob"}.human();
             auto const result = env.rpc("json", "owner_info", to_string(params))[jss::result];
-            BEAST_EXPECT(result[jss::accepted] == Json::objectValue);
-            BEAST_EXPECT(result[jss::current] == Json::objectValue);
+            BEAST_EXPECT(result[jss::accepted] == json::ObjectValue);
+            BEAST_EXPECT(result[jss::current] == json::ObjectValue);
             BEAST_EXPECT(result[jss::status] == "success");
         }
     }
@@ -74,18 +74,18 @@ class OwnerInfo_test : public beast::unit_test::suite
         auto const gw = Account{"gateway"};
         env.fund(XRP(10000), alice, gw);
         env.close();
-        auto const USD = gw["USD"];
-        auto const CNY = gw["CNY"];
-        env(trust(alice, USD(1000)));
-        env(trust(alice, CNY(1000)));
-        env(offer(alice, USD(1), XRP(1000)));
+        auto const usd = gw["USD"];
+        auto const cny = gw["CNY"];
+        env(trust(alice, usd(1000)));
+        env(trust(alice, cny(1000)));
+        env(offer(alice, usd(1), XRP(1000)));
         env.close();
 
-        env(pay(gw, alice, USD(50)));
-        env(pay(gw, alice, CNY(50)));
-        env(offer(alice, CNY(2), XRP(1000)));
+        env(pay(gw, alice, usd(50)));
+        env(pay(gw, alice, cny(50)));
+        env(offer(alice, cny(2), XRP(1000)));
 
-        Json::Value params;
+        json::Value params;
         params[jss::account] = alice.human();
         auto const result = env.rpc("json", "owner_info", to_string(params))[jss::result];
         if (!BEAST_EXPECT(result.isMember(jss::accepted) && result.isMember(jss::current)))
@@ -102,22 +102,22 @@ class OwnerInfo_test : public beast::unit_test::suite
 
         BEAST_EXPECT(
             lines[0u][sfBalance.fieldName] ==
-            (STAmount{Issue{to_currency("CNY"), noAccount()}, 0}.value().getJson(
-                JsonOptions::none)));
+            (STAmount{Issue{toCurrency("CNY"), noAccount()}, 0}.value().getJson(
+                JsonOptions::KNone)));
         BEAST_EXPECT(
             lines[0u][sfHighLimit.fieldName] ==
-            alice["CNY"](1000).value().getJson(JsonOptions::none));
+            alice["CNY"](1000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(
-            lines[0u][sfLowLimit.fieldName] == gw["CNY"](0).value().getJson(JsonOptions::none));
+            lines[0u][sfLowLimit.fieldName] == gw["CNY"](0).value().getJson(JsonOptions::KNone));
 
         BEAST_EXPECT(
             lines[1u][sfBalance.fieldName] ==
-            (STAmount{Issue{to_currency("USD"), noAccount()}, 0}.value().getJson(
-                JsonOptions::none)));
+            (STAmount{Issue{toCurrency("USD"), noAccount()}, 0}.value().getJson(
+                JsonOptions::KNone)));
         BEAST_EXPECT(
             lines[1u][sfHighLimit.fieldName] ==
-            alice["USD"](1000).value().getJson(JsonOptions::none));
-        BEAST_EXPECT(lines[1u][sfLowLimit.fieldName] == USD(0).value().getJson(JsonOptions::none));
+            alice["USD"](1000).value().getJson(JsonOptions::KNone));
+        BEAST_EXPECT(lines[1u][sfLowLimit.fieldName] == usd(0).value().getJson(JsonOptions::KNone));
 
         if (!BEAST_EXPECT(result[jss::accepted].isMember(jss::offers)))
             return;
@@ -127,9 +127,9 @@ class OwnerInfo_test : public beast::unit_test::suite
 
         BEAST_EXPECT(offers[0u][jss::Account] == alice.human());
         BEAST_EXPECT(
-            offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(JsonOptions::none));
+            offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(
-            offers[0u][sfTakerPays.fieldName] == USD(1).value().getJson(JsonOptions::none));
+            offers[0u][sfTakerPays.fieldName] == usd(1).value().getJson(JsonOptions::KNone));
 
         // current ledger entry
         if (!BEAST_EXPECT(result[jss::current].isMember(jss::ripple_lines)))
@@ -140,23 +140,23 @@ class OwnerInfo_test : public beast::unit_test::suite
 
         BEAST_EXPECT(
             lines[0u][sfBalance.fieldName] ==
-            (STAmount{Issue{to_currency("CNY"), noAccount()}, -50}.value().getJson(
-                JsonOptions::none)));
+            (STAmount{Issue{toCurrency("CNY"), noAccount()}, -50}.value().getJson(
+                JsonOptions::KNone)));
         BEAST_EXPECT(
             lines[0u][sfHighLimit.fieldName] ==
-            alice["CNY"](1000).value().getJson(JsonOptions::none));
+            alice["CNY"](1000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(
-            lines[0u][sfLowLimit.fieldName] == gw["CNY"](0).value().getJson(JsonOptions::none));
+            lines[0u][sfLowLimit.fieldName] == gw["CNY"](0).value().getJson(JsonOptions::KNone));
 
         BEAST_EXPECT(
             lines[1u][sfBalance.fieldName] ==
-            (STAmount{Issue{to_currency("USD"), noAccount()}, -50}.value().getJson(
-                JsonOptions::none)));
+            (STAmount{Issue{toCurrency("USD"), noAccount()}, -50}.value().getJson(
+                JsonOptions::KNone)));
         BEAST_EXPECT(
             lines[1u][sfHighLimit.fieldName] ==
-            alice["USD"](1000).value().getJson(JsonOptions::none));
+            alice["USD"](1000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(
-            lines[1u][sfLowLimit.fieldName] == gw["USD"](0).value().getJson(JsonOptions::none));
+            lines[1u][sfLowLimit.fieldName] == gw["USD"](0).value().getJson(JsonOptions::KNone));
 
         if (!BEAST_EXPECT(result[jss::current].isMember(jss::offers)))
             return;
@@ -168,9 +168,9 @@ class OwnerInfo_test : public beast::unit_test::suite
         BEAST_EXPECT(offers[1u] == result[jss::accepted][jss::offers][0u]);
         BEAST_EXPECT(offers[0u][jss::Account] == alice.human());
         BEAST_EXPECT(
-            offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(JsonOptions::none));
+            offers[0u][sfTakerGets.fieldName] == XRP(1000).value().getJson(JsonOptions::KNone));
         BEAST_EXPECT(
-            offers[0u][sfTakerPays.fieldName] == CNY(2).value().getJson(JsonOptions::none));
+            offers[0u][sfTakerPays.fieldName] == cny(2).value().getJson(JsonOptions::KNone));
     }
 
 public:
diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp
index 3e36ddb5d7..bcb89fa6cb 100644
--- a/src/test/rpc/Peers_test.cpp
+++ b/src/test/rpc/Peers_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl {
 
-class Peers_test : public beast::unit_test::suite
+class Peers_test : public beast::unit_test::Suite
 {
     void
     testRequest()
@@ -35,7 +35,7 @@ class Peers_test : public beast::unit_test::suite
         std::unordered_map<std::string, std::string> nodes;
         for (auto i = 0; i < 3; ++i)
         {
-            auto kp = generateKeyPair(KeyType::secp256k1, generateSeed("seed" + std::to_string(i)));
+            auto kp = generateKeyPair(KeyType::Secp256k1, generateSeed("seed" + std::to_string(i)));
 
             std::string const name = "Node " + std::to_string(i);
 
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index 409ba660d8..436044e771 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -31,29 +31,29 @@ struct RPCCallTestData
     std::vector<char const*> const args;
 
     // If it throws, what does it throw?
-    enum class Exception { no_exception = 0, bad_cast };
+    enum class Exception { NoException = 0, BadCast };
     Exception const throwsWhat;
 
     // Expected JSON response.
     std::vector<char const*> exp;
 
     RPCCallTestData(
-        char const* description_,
-        int line_,
-        std::initializer_list<char const*> const& args_,
-        Exception throwsWhat_,
-        char const* exp_)
-        : description(description_), line(line_), args(args_), throwsWhat(throwsWhat_), exp(1, exp_)
+        char const* description,
+        int line,
+        std::initializer_list<char const*> const& args,
+        Exception throwsWhat,
+        char const* exp)
+        : description(description), line(line), args(args), throwsWhat(throwsWhat), exp(1, exp)
     {
     }
 
     RPCCallTestData(
-        char const* description_,
-        int line_,
-        std::initializer_list<char const*> const& args_,
-        Exception throwsWhat_,
-        std::initializer_list<char const*> exp_)
-        : description(description_), line(line_), args(args_), throwsWhat(throwsWhat_), exp(exp_)
+        char const* description,
+        int line,
+        std::initializer_list<char const*> const& args,
+        Exception throwsWhat,
+        std::initializer_list<char const*> exp)
+        : description(description), line(line), args(args), throwsWhat(throwsWhat), exp(exp)
     {
     }
 
@@ -66,13 +66,13 @@ struct RPCCallTestData
     operator=(RPCCallTestData&&) = delete;
 };
 
-static RPCCallTestData const rpcCallTestArray[] = {
+static RPCCallTestData const kRPC_CALL_TEST_ARRAY[] = {
     // account_channels
     // ------------------------------------------------------------
     {"account_channels: minimal.",
      __LINE__,
      {"account_channels", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -87,7 +87,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rD5MbavGfiSC5m7mkxy1FANuT7s3HxqpoF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -103,7 +103,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "r9emE59aTWb85t64dAebKrxYMBTpzK5yR7"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -119,7 +119,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_channels",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -136,7 +136,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -154,7 +154,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "90210"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -171,7 +171,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_channels",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -189,7 +189,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -206,7 +206,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "account_channels",
          "",  // Note: very few values are detected as bad!
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_channels",
     "params" : [
@@ -223,7 +223,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 1.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -236,7 +236,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: minimal 2.",
      __LINE__,
      {"account_currencies", "racb4o3DrdYxuCfyVa6vsLb7vgju9RFbBr"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -249,7 +249,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: ledger index.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "42"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -263,7 +263,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: validated ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -277,7 +277,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: current ledger.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -293,7 +293,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_currencies",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -307,7 +307,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: too many arguments.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "spare1", "spare2"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -321,7 +321,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_currencies: invalid second argument.",
      __LINE__,
      {"account_currencies", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "yup"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_currencies",
     "params" : [
@@ -339,7 +339,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_currencies",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_currencies",
     "params" : [
@@ -357,7 +357,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: minimal.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -370,7 +370,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with numeric ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -384,7 +384,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with text ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -400,7 +400,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -414,7 +414,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: with ledger index.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -430,7 +430,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_info",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -444,7 +444,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_info: too many arguments.",
      __LINE__,
      {"account_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "extra1", "extra2"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_info",
     "params" : [
@@ -462,7 +462,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_info",
     "params" : [
@@ -480,7 +480,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_lines: minimal.",
      __LINE__,
      {"account_lines", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -493,7 +493,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_lines: peer.",
      __LINE__,
      {"account_lines", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -510,7 +510,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "888888888"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -528,7 +528,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "closed"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -546,7 +546,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "FFFFEEEEDDDDCCCCBBBBAAAA9999888877776666555544443333222211110000"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -563,7 +563,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_lines",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -582,7 +582,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "12345678",
       "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -603,7 +603,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "12345678",
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -624,7 +624,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "current",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_lines",
     "params" : [
@@ -642,7 +642,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_lines",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -662,7 +662,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
             ""  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -680,7 +680,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
          "not_a_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_lines",
     "params" : [
@@ -699,7 +699,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: minimal.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -712,7 +712,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with numeric ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "77777"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -726,7 +726,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with text ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "closed"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -742,7 +742,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_objects",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -756,7 +756,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_objects: with ledger index.",
      __LINE__,
      {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -772,7 +772,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_objects",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -793,7 +793,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -814,7 +814,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -835,7 +835,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra3",
          "extra4",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_objects",
     "params" : [
@@ -853,7 +853,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_objects",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -871,7 +871,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 1.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -889,7 +889,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_objects: invalid ledger selection 2.",
         __LINE__,
         {"account_objects", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_objects",
     "params" : [
@@ -907,7 +907,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: minimal.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -920,7 +920,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with numeric ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -934,7 +934,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with text ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -950,7 +950,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"account_offers",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -964,7 +964,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_offers: with ledger index.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -980,7 +980,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_offers",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -995,7 +995,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "account_offers: four arguments.",
      __LINE__,
      {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "current", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1015,7 +1015,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra2",
          "extra3",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_offers",
     "params" : [
@@ -1033,7 +1033,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "account_offers",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1051,7 +1051,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 1.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1069,7 +1069,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_offers: invalid ledger selection 2.",
         __LINE__,
         {"account_offers", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_offers",
     "params" : [
@@ -1087,7 +1087,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: minimal.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1100,7 +1100,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index .",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "444"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1114,7 +1114,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index plus trailing params.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "707", "descending", "binary", "count"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1131,7 +1131,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1152,7 +1152,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "binary",
       "count",
       "descending"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1170,7 +1170,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max plus limit.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "247", "-1", "300"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1193,7 +1193,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "count",
       "descending",
       "binary"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1212,7 +1212,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"account_tx: ledger_index_min and _max plus limit and offset.",
      __LINE__,
      {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "589", "590", "67", "45"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1236,7 +1236,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "45",
       "descending",
       "count"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1257,7 +1257,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "account_tx",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1280,7 +1280,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "descending",
       "count",
       "binary"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "account_tx",
     "params" : [
@@ -1295,7 +1295,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid accountID.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj9!VRWn96DkukG4bwdtyTh"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1312,7 +1312,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: invalid ledger.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-478.7"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "account_tx",
     "params" : [
@@ -1328,7 +1328,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: max less than min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "580", "579"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         {
             R"({
     "method" : "account_tx",
@@ -1356,7 +1356,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer min.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "Binary", "-1"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {
@@ -1364,7 +1364,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer max.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "counts"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {
@@ -1372,7 +1372,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer offset.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1", "decending"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {
@@ -1380,7 +1380,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "account_tx: non-integer limit.",
         __LINE__,
         {"account_tx", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "-1", "-1", "300", "false"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {// Note: this really shouldn't throw, but does at the moment.
@@ -1394,7 +1394,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "false",
       "false",
       "false"},
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
 
     // book_offers
@@ -1406,7 +1406,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD",
          "EUR",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1428,7 +1428,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1450,7 +1450,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "book_offers: add issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1473,7 +1473,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "666"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1498,7 +1498,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1523,7 +1523,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1552,7 +1552,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "200",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1583,7 +1583,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "200",
       "0",
       "MyMarker"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1609,7 +1609,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "book_offers",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1631,7 +1631,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0",
       "MyMarker",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1650,7 +1650,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1668,7 +1668,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "USD/rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1682,7 +1682,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"book_offers: invalid issuer.",
      __LINE__,
      {"book_offers", "USD", "EUR", "not_a_valid_issuer"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1705,7 +1705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "EUR/rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
       "not_a_ledger"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1734,7 +1734,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789",
          "not_a_number",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "book_offers",
     "params" : [
@@ -1753,7 +1753,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "can_delete",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1768,7 +1768,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967295",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1784,7 +1784,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1800,7 +1800,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "always",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1816,7 +1816,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "never",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1832,7 +1832,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "now",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1845,7 +1845,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: too many arguments.",
      __LINE__,
      {"can_delete", "always", "never"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1859,7 +1859,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"can_delete: invalid argument.",
      __LINE__,
      {"can_delete", "invalid"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "can_delete",
     "params" : [
@@ -1876,7 +1876,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "4294967296",
      },
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
     {// Note: this really shouldn't throw since it's a legitimate ledger hash.
      "can_delete: ledger hash with no alphas.",
@@ -1885,7 +1885,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "can_delete",
          "0123456701234567012345670123456701234567012345670123456701234567",
      },
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
 
     // channel_authorize
@@ -1896,7 +1896,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1915,7 +1915,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "secret_can_be_anything",
          "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1934,7 +1934,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "whatever",
       "whenever"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1952,7 +1952,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "whatever"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1969,7 +1969,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -1986,7 +1986,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2003,7 +2003,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEZ",
       "2000"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2020,7 +2020,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2037,7 +2037,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "secret_can_be_anything",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_authorize",
     "params" : [
@@ -2058,7 +2058,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "0",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2078,7 +2078,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551615",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2096,7 +2096,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"channel_verify",
       "aB4BXXLuPu8DpVuyq1DBiu3SrPdtK9AYZisKhu8mvkoiUD8J9Gov",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2115,7 +2115,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "2000",
       "DEADBEEF",
       "Whatever"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2133,7 +2133,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2151,7 +2151,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2169,7 +2169,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "10123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2187,7 +2187,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "2000",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2205,7 +2205,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "-1",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2223,7 +2223,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "18446744073709551616",
       "DEADBEEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2241,7 +2241,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
       "40000000",
       "ThisIsNotHexadecimal"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "channel_verify",
     "params" : [
@@ -2263,7 +2263,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "connect",
          "ThereIsNoCheckingOnTheIPFormat",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "connect",
     "params" : [
@@ -2276,7 +2276,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: ip and port.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "connect",
     "params" : [
@@ -2292,7 +2292,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "connect",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "connect",
     "params" : [
@@ -2306,7 +2306,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"connect: too many arguments.",
      __LINE__,
      {"connect", "ThereIsNoCheckingOnTheIPFormat", "6561", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "connect",
     "params" : [
@@ -2325,7 +2325,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "-1",
      },
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
     {// Note: this should return an error but not throw.
      "connect: port too large.",
@@ -2335,7 +2335,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ThereIsNoCheckingOnTheIPFormat",
          "4294967296",
      },
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
 
     // consensus_info
@@ -2345,7 +2345,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "consensus_info",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2357,7 +2357,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"consensus_info: too many arguments.",
      __LINE__,
      {"consensus_info", "whatever"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "consensus_info",
     "params" : [
@@ -2378,7 +2378,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "source_account_NotValidated",
          "destination_account_NotValidated",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2395,7 +2395,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2421,7 +2421,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred6",
       "cred7",
       "cred8"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2440,7 +2440,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "source_account_NotValidated",
       "destination_account_NotValidated",
       "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2458,7 +2458,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "deposit_authorized",
          "source_account_NotValidated",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2484,7 +2484,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "cred7",
       "cred8",
       "too_much"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2503,7 +2503,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "destination_account_NotValidated",
          "NotALedger",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "deposit_authorized",
     "params" : [
@@ -2523,7 +2523,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "feature",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2535,7 +2535,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: with name.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2551,7 +2551,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA98"
       "76543210",
       "accept"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2565,7 +2565,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: reject.",
      __LINE__,
      {"feature", "0", "reject"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2579,7 +2579,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"feature: too many arguments.",
      __LINE__,
      {"feature", "featureNameOrHexIsNotValidated", "accept", "anotherArg"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2597,7 +2597,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "featureNameOrHexIsNotValidated",
          "veto",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "feature",
     "params" : [
@@ -2616,7 +2616,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "fetch_info",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2628,7 +2628,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: clear.",
      __LINE__,
      {"fetch_info", "clear"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2641,7 +2641,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: too many arguments.",
      __LINE__,
      {"fetch_info", "clear", "other"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2655,7 +2655,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"fetch_info: other trailing argument.",
      __LINE__,
      {"fetch_info", "too"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "fetch_info",
     "params" : [
@@ -2671,7 +2671,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: minimal.",
      __LINE__,
      {"gateway_balances", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2684,7 +2684,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with ledger index.",
      __LINE__,
      {"gateway_balances", "890765", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2698,7 +2698,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: with text ledger index.",
      __LINE__,
      {"gateway_balances", "current", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2714,7 +2714,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"gateway_balances",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2728,7 +2728,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: 1 hotwallet.",
      __LINE__,
      {"gateway_balances", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "hotwallet_is_not_validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2749,7 +2749,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "hotwallet_is_not_validated_2",
          "hotwallet_is_not_validated_3",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2770,7 +2770,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "gateway_balances",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2784,7 +2784,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"gateway_balances: empty first argument.",
      __LINE__,
      {"gateway_balances", ""},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2801,7 +2801,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "890765",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2818,7 +2818,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "current",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2835,7 +2835,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "gateway_balances",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "gateway_balances",
     "params" : [
@@ -2854,7 +2854,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "get_counts",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2866,7 +2866,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: with maximum count.",
      __LINE__,
      {"get_counts", "100"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2879,7 +2879,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"get_counts: too many arguments.",
      __LINE__,
      {"get_counts", "100", "whatever"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "get_counts",
     "params" : [
@@ -2896,12 +2896,12 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "get_counts",
          "-1",
      },
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
     {"get_counts: count too large.",
      __LINE__,
      {"get_counts", "4294967296"},
-     RPCCallTestData::Exception::bad_cast,
+     RPCCallTestData::Exception::BadCast,
      R"()"},
 
     // json
@@ -2913,7 +2913,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "command",
     "params" : [
@@ -2931,7 +2931,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "command",
     "params" : [
@@ -2944,7 +2944,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too few arguments.",
      __LINE__,
      {"json", "command"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json",
     "params" : [
@@ -2958,7 +2958,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json: too many arguments.",
      __LINE__,
      {"json", "command", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json",
     "params" : [
@@ -2976,7 +2976,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"(["arg1","arg2"])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json",
     "params" : [
@@ -2994,7 +2994,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "command",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json",
     "params" : [
@@ -3014,7 +3014,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3042,7 +3042,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]
         })",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3067,7 +3067,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1"}])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3094,7 +3094,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : [{"inner_arg" : "yup"}]}
         ])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
    "params" : [
@@ -3116,7 +3116,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "json2",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3130,7 +3130,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"json2: too many arguments.",
      __LINE__,
      {"json2", R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_this"})", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3147,7 +3147,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3170,7 +3170,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "method" : "json2",
@@ -3191,7 +3191,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.1","ripplerpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.1",
@@ -3214,7 +3214,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3235,7 +3235,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.00","id":"A1","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3258,7 +3258,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","method":"call_1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "jsonrpc" : "2.0",
     "method" : "json2",
@@ -3279,7 +3279,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"({"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1"})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "id" : "A1",
     "jsonrpc" : "2.0",
@@ -3302,7 +3302,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3319,7 +3319,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "json2",
          R"([{"jsonrpc":"2.0","ripplerpc":"2.0","id":"A1","method":"call_1",[]}])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3342,7 +3342,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             }
         ])",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "json2",
     "params" : [
@@ -3365,7 +3365,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "params" : true
         })",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
    "id" : "A1",
    "jsonrpc" : "2.0",
@@ -3388,7 +3388,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: minimal.",
      __LINE__,
      {"ledger"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3400,7 +3400,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index.",
      __LINE__,
      {"ledger", "4294967295"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3413,7 +3413,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: text ledger index.",
      __LINE__,
      {"ledger", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3426,7 +3426,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger hash.",
      __LINE__,
      {"ledger", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3439,7 +3439,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: full.",
      __LINE__,
      {"ledger", "current", "full"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3453,7 +3453,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: tx.",
      __LINE__,
      {"ledger", "closed", "tx"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3468,7 +3468,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: too many arguments.",
      __LINE__,
      {"ledger", "4294967295", "spare"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3481,7 +3481,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too small.",
      __LINE__,
      {"ledger", "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3494,7 +3494,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: ledger index too big.",
      __LINE__,
      {"ledger", "4294967296"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3507,7 +3507,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: invalid ledger text.",
      __LINE__,
      {"ledger", "latest"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3520,7 +3520,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger: unsupported final argument.",
      __LINE__,
      {"ledger", "current", "expand"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger",
     "params" : [
@@ -3536,7 +3536,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: minimal.",
      __LINE__,
      {"ledger_closed"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3548,7 +3548,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_closed: too many arguments.",
      __LINE__,
      {"ledger_closed", "today"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_closed",
     "params" : [
@@ -3565,7 +3565,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: minimal.",
      __LINE__,
      {"ledger_current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3577,7 +3577,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_current: too many arguments.",
      __LINE__,
      {"ledger_current", "today"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_current",
     "params" : [
@@ -3594,7 +3594,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index.",
      __LINE__,
      {"ledger_header", "4294967295"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3607,7 +3607,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger hash.",
      __LINE__,
      {"ledger_header", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3622,7 +3622,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_header",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3636,7 +3636,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: too many arguments.",
      __LINE__,
      {"ledger_header", "4294967295", "spare"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3650,7 +3650,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: text ledger index.",
      __LINE__,
      {"ledger_header", "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3663,7 +3663,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too small.",
      __LINE__,
      {"ledger_header", "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3676,7 +3676,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_header: ledger index too big.",
      __LINE__,
      {"ledger_header", "4294967296"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_header",
     "params" : [
@@ -3692,7 +3692,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index.",
      __LINE__,
      {"ledger_request", "4294967295"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3705,7 +3705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger hash.",
      __LINE__,
      {"ledger_request", "ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3720,7 +3720,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ledger_request",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3734,7 +3734,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: too many arguments.",
      __LINE__,
      {"ledger_request", "4294967295", "spare"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3748,7 +3748,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: text ledger index.",
      __LINE__,
      {"ledger_request", "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3761,7 +3761,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too small.",
      __LINE__,
      {"ledger_request", "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3774,7 +3774,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ledger_request: ledger index too big.",
      __LINE__,
      {"ledger_request", "4294967296"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ledger_request",
     "params" : [
@@ -3792,7 +3792,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "log_level",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3804,7 +3804,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: fatal.",
      __LINE__,
      {"log_level", "fatal"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3817,7 +3817,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: error.",
      __LINE__,
      {"log_level", "error"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3830,7 +3830,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: warn.",
      __LINE__,
      {"log_level", "warn"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3843,7 +3843,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: debug.",
      __LINE__,
      {"log_level", "debug"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3856,7 +3856,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: trace.",
      __LINE__,
      {"log_level", "trace"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3869,7 +3869,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: base partition.",
      __LINE__,
      {"log_level", "base", "trace"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3883,7 +3883,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: partition_name.",
      __LINE__,
      {"log_level", "partition_name", "fatal"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3897,7 +3897,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: too many arguments.",
      __LINE__,
      {"log_level", "partition_name", "fatal", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3911,7 +3911,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"log_level: invalid severity.",
      __LINE__,
      {"log_level", "err"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3928,7 +3928,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "fatal",
          "partition_name",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "log_level",
     "params" : [
@@ -3947,7 +3947,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "logrotate",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -3959,7 +3959,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"logrotate: too many arguments.",
      __LINE__,
      {"logrotate", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "logrotate",
     "params" : [
@@ -3976,7 +3976,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: minimal.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -3989,7 +3989,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with numeric ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "987654321"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4003,7 +4003,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with text ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4019,7 +4019,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"owner_info",
       "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
       "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4033,7 +4033,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"owner_info: with ledger index.",
      __LINE__,
      {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4049,7 +4049,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "owner_info",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4069,7 +4069,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "extra1",
          "extra2",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "owner_info",
     "params" : [
@@ -4087,7 +4087,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
             "owner_info",
             "",  // Note: very few values are detected as bad!
         },
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4105,7 +4105,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4123,7 +4123,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "owner_info: invalid ledger selection.",
         __LINE__,
         {"owner_info", "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh", "no_ledger"},
-        RPCCallTestData::Exception::no_exception,
+        RPCCallTestData::Exception::NoException,
         R"({
     "method" : "owner_info",
     "params" : [
@@ -4143,7 +4143,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "peers",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peers",
     "params" : [
@@ -4155,7 +4155,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peers: too many arguments.",
      __LINE__,
      {"peers", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peers",
     "params" : [
@@ -4172,7 +4172,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: minimal.",
      __LINE__,
      {"peer_reservations_add", "public_key_string"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4185,7 +4185,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: with description.",
      __LINE__,
      {"peer_reservations_add", "public_key_string", "public_key_description"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4199,7 +4199,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: too few arguments.",
      __LINE__,
      {"peer_reservations_add"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4213,7 +4213,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_add: too many arguments.",
      __LINE__,
      {"peer_reservations_add", "public_key_string", "public_key_description", "spare"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_add",
     "params" : [
@@ -4230,7 +4230,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: minimal.",
      __LINE__,
      {"peer_reservations_del", "public_key_string"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4243,7 +4243,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: too few arguments.",
      __LINE__,
      {"peer_reservations_del"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4257,7 +4257,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"peer_reservations_del: too many arguments.",
      __LINE__,
      {"peer_reservations_del", "public_key_string", "public_key_description", "spare"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "peer_reservations_del",
     "params" : [
@@ -4276,7 +4276,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ping",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ping",
     "params" : [
@@ -4288,7 +4288,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ping: too many arguments.",
      __LINE__,
      {"ping", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ping",
     "params" : [
@@ -4307,7 +4307,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "print",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "print",
     "params" : [
@@ -4320,7 +4320,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "print: extra argument.",
      __LINE__,
      {"print", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "print",
     "params" : [
@@ -4333,7 +4333,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"print: too many arguments.",
      __LINE__,
      {"print", "extra1", "extra2"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "print",
     "params" : [
@@ -4352,7 +4352,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "random",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "random",
     "params" : [
@@ -4364,7 +4364,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"random: too many arguments.",
      __LINE__,
      {"random", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "random",
     "params" : [
@@ -4384,7 +4384,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4397,7 +4397,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967295"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4411,7 +4411,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "closed"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4427,7 +4427,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"ripple_path_find",
       R"({"json_argument":true})",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4444,7 +4444,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "ripple_path_find",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4458,7 +4458,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: too many arguments.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "current", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4475,7 +4475,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "ripple_path_find",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4489,7 +4489,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too small.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "-1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4503,7 +4503,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: ledger index too big.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "4294967296"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4517,7 +4517,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"ripple_path_find: invalid text ledger index.",
      __LINE__,
      {"ripple_path_find", R"({"json_argument":true})", "cur"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "ripple_path_find",
     "params" : [
@@ -4538,7 +4538,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign",
     "params" : [
@@ -4554,7 +4554,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign",
     "params" : [
@@ -4571,7 +4571,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: too few arguments.",
      __LINE__,
      {"sign", "contents_of_blob"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign",
     "params" : [
@@ -4585,7 +4585,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: offline flag with signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
         "method" : "sign",
         "params" : [
@@ -4609,7 +4609,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign",
     "params" : [
@@ -4627,7 +4627,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign",
     "params" : [
@@ -4641,7 +4641,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"sign: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"sign", "my_secret", R"({"json_argument":true})", "offlin"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
         "method" : "sign",
         "params" : [
@@ -4667,7 +4667,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4688,7 +4688,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "offline"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4710,7 +4710,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
          "my_secret",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4729,7 +4729,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       R"({"json_argument":true})",
       "offline",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4748,7 +4748,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4766,7 +4766,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "my_secret",
       R"({"json_argument":true})",
       "ofline"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "sign_for",
     "params" : [
@@ -4783,7 +4783,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: blob.",
      __LINE__,
      {"submit", "the blob is unvalidated and may be any length..."},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4800,7 +4800,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4818,7 +4818,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4833,7 +4833,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      "submit: four arguments.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4850,7 +4850,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: offline flag with signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offline", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
         "method" : "submit",
         "params" : [
@@ -4874,7 +4874,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "offline",
       "CounterpartySignature",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4892,7 +4892,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "my_secret",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit",
     "params" : [
@@ -4906,7 +4906,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit: misspelled offline flag interpreted as signature_target.",
      __LINE__,
      {"submit", "my_secret", R"({"json_argument":true})", "offlne"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
         "method" : "submit",
         "params" : [
@@ -4930,7 +4930,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4947,7 +4947,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "submit_multisigned",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4961,7 +4961,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"submit_multisigned: too many arguments.",
      __LINE__,
      {"submit_multisigned", R"({"json_argument":true})", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4978,7 +4978,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "submit_multisigned",
          R"({"json_argument":true,})",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "submit_multisigned",
     "params" : [
@@ -4998,7 +4998,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_info",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5010,7 +5010,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: counters.",
      __LINE__,
      {"server_info", "counters"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5023,7 +5023,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: too many arguments.",
      __LINE__,
      {"server_info", "counters", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5037,7 +5037,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_info: non-counters argument.",
      __LINE__,
      {"server_info", "counter"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_info",
     "params" : [
@@ -5054,7 +5054,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "server_state",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5066,7 +5066,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: counters.",
      __LINE__,
      {"server_state", "counters"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5079,7 +5079,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: too many arguments.",
      __LINE__,
      {"server_state", "counters", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5093,7 +5093,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"server_state: non-counters argument.",
      __LINE__,
      {"server_state", "counter"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "server_state",
     "params" : [
@@ -5110,7 +5110,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "stop",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "stop",
     "params" : [
@@ -5122,7 +5122,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"stop: too many arguments.",
      __LINE__,
      {"stop", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "stop",
     "params" : [
@@ -5141,7 +5141,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "4294967295"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5157,7 +5157,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "current"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5173,7 +5173,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {"transaction_entry",
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5190,7 +5190,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "transaction_entry",
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5207,7 +5207,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
       "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
       "validated",
       "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5225,7 +5225,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "validated",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5243,7 +5243,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUVW",
          "validated",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5261,7 +5261,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "0",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5279,7 +5279,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "4294967296",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5297,7 +5297,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA987654321",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5315,7 +5315,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
          "0123456789ABCDEFGHIJKLMNOPQRSTUV0123456789ABCDEFGHIJKLMNOPQRSTUV",
          "VUTSRQPONMLKJIHGFEDCBA9876543210VUTSRQPONMLKJIHGFEDCBA9876543210Z",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "transaction_entry",
     "params" : [
@@ -5332,7 +5332,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. minimal",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "1", "2"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5347,7 +5347,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: ctid. binary",
      __LINE__,
      {"tx", "FFFFFFFFFFFFFFFF", "binary", "1", "2"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5363,7 +5363,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: minimal.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5376,7 +5376,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: binary.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5392,7 +5392,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5406,7 +5406,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: too many arguments.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "binary", "1", "2", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5420,7 +5420,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx: invalid final argument is apparently ignored.",
      __LINE__,
      {"tx", "transaction_hash_is_not_validated", "bin"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx",
     "params" : [
@@ -5436,7 +5436,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: minimal.",
      __LINE__,
      {"tx_history", "0"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5451,7 +5451,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "tx_history",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5465,7 +5465,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"tx_history: too many arguments.",
      __LINE__,
      {"tx_history", "0", "1"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "tx_history",
     "params" : [
@@ -5481,7 +5481,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too small.",
         __LINE__,
         {"tx_history", "-1"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {
@@ -5489,7 +5489,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start too big.",
         __LINE__,
         {"tx_history", "4294967296"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
     {
@@ -5497,7 +5497,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
         "tx_history: start not integer.",
         __LINE__,
         {"tx_history", "beginning"},
-        RPCCallTestData::Exception::bad_cast,
+        RPCCallTestData::Exception::BadCast,
         R"()",
     },
 
@@ -5508,7 +5508,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unl_list",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5520,7 +5520,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unl_list: too many arguments.",
      __LINE__,
      {"unl_list", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unl_list",
     "params" : [
@@ -5539,7 +5539,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "validation_create",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5551,7 +5551,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: with secret.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5564,7 +5564,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"validation_create: too many arguments.",
      __LINE__,
      {"validation_create", "the form of the secret is not validated", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "validation_create",
     "params" : [
@@ -5583,7 +5583,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "version",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "version",
     "params" : [
@@ -5595,7 +5595,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"version: too many arguments.",
      __LINE__,
      {"version", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "version",
     "params" : [
@@ -5614,7 +5614,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "wallet_propose",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5626,7 +5626,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: with passphrase.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5639,7 +5639,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"wallet_propose: too many arguments.",
      __LINE__,
      {"wallet_propose", "the form of the passphrase is not validated", "extra"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "wallet_propose",
     "params" : [
@@ -5656,7 +5656,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"internal: minimal.",
      __LINE__,
      {"internal", "command_name"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "internal",
     "params" : [
@@ -5670,7 +5670,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"internal: with parameters.",
      __LINE__,
      {"internal", "command_name", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "internal",
     "params" : [
@@ -5686,7 +5686,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "internal",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "internal",
     "params" : [
@@ -5705,7 +5705,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "path_find",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5719,7 +5719,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"path_find: with arguments.",
      __LINE__,
      {"path_find", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "path_find",
     "params" : [
@@ -5738,7 +5738,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "subscribe",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5752,7 +5752,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"subscribe: with arguments.",
      __LINE__,
      {"subscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "subscribe",
     "params" : [
@@ -5771,7 +5771,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unsubscribe",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5785,7 +5785,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unsubscribe: with arguments.",
      __LINE__,
      {"unsubscribe", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unsubscribe",
     "params" : [
@@ -5804,7 +5804,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
      {
          "unknown_command",
      },
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -5816,7 +5816,7 @@ static RPCCallTestData const rpcCallTestArray[] = {
     {"unknown_command: with arguments.",
      __LINE__,
      {"unknown_command", "string_arg", "1", "-1", "4294967296", "3.14159"},
-     RPCCallTestData::Exception::no_exception,
+     RPCCallTestData::Exception::NoException,
      R"({
     "method" : "unknown_command",
     "params" : [
@@ -5831,10 +5831,10 @@ static RPCCallTestData const rpcCallTestArray[] = {
 std::string
 updateAPIVersionString(char const* const req, unsigned apiVersion)
 {
-    std::string const version_str = std::to_string(apiVersion);
-    static auto const place_holder = "%API_VER%";
+    std::string const versionStr = std::to_string(apiVersion);
+    static auto const kPLACE_HOLDER = "%API_VER%";
     std::string jr(req);
-    boost::replace_all(jr, place_holder, version_str);
+    boost::replace_all(jr, kPLACE_HOLDER, versionStr);
     return jr;
 }
 
@@ -5848,7 +5848,7 @@ makeNetworkConfig(uint32_t networkID)
     });
 }
 
-class RPCCall_test : public beast::unit_test::suite
+class RPCCall_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -5856,14 +5856,14 @@ public:
     {
         testcase << "RPCCall API version " << apiVersion;
         if (!BEAST_EXPECT(
-                apiVersion >= RPC::apiMinimumSupportedVersion &&
-                apiVersion <= RPC::apiMaximumValidVersion))
+                apiVersion >= RPC::kAPI_MINIMUM_SUPPORTED_VERSION &&
+                apiVersion <= RPC::kAPI_MAXIMUM_VALID_VERSION))
             return;
 
         test::jtx::Env const env(*this, makeNetworkConfig(11111));  // Used only for its Journal.
 
         // For each RPCCall test.
-        for (RPCCallTestData const& rpcCallTest : rpcCallTestArray)
+        for (RPCCallTestData const& rpcCallTest : kRPC_CALL_TEST_ARRAY)
         {
             if (!BEAST_EXPECT(!rpcCallTest.exp.empty()))
                 break;
@@ -5871,20 +5871,20 @@ public:
             std::vector<std::string> const args{rpcCallTest.args.begin(), rpcCallTest.args.end()};
 
             char const* const expVersioned =
-                (apiVersion - RPC::apiMinimumSupportedVersion) < rpcCallTest.exp.size()
-                ? rpcCallTest.exp[apiVersion - RPC::apiMinimumSupportedVersion]
+                (apiVersion - RPC::kAPI_MINIMUM_SUPPORTED_VERSION) < rpcCallTest.exp.size()
+                ? rpcCallTest.exp[apiVersion - RPC::kAPI_MINIMUM_SUPPORTED_VERSION]
                 : rpcCallTest.exp.back();
 
-            // Note that, over the long term, none 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;
+            json::Value got;
             try
             {
                 got = jtx::cmdToJSONRPC(args, env.journal, apiVersion);
             }
             catch (std::bad_cast const&)
             {
-                if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::bad_cast) &&
+                if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::BadCast) &&
                     (std::strlen(expVersioned) == 0))
                 {
                     pass();
@@ -5897,12 +5897,12 @@ public:
                 continue;
             }
 
-            Json::Value exp;
-            Json::Reader{}.parse(updateAPIVersionString(expVersioned, apiVersion), exp);
+            json::Value exp;
+            json::Reader{}.parse(updateAPIVersionString(expVersioned, apiVersion), exp);
 
             // Lambda to remove the "params[0u]:error_code" field if present.
             // Error codes are not expected to be stable between releases.
-            auto rmErrorCode = [](Json::Value& json) {
+            auto rmErrorCode = [](json::Value& json) {
                 if (json.isMember(jss::params) && json[jss::params].isArray() &&
                     json[jss::params].size() > 0 && json[jss::params][0u].isObject())
                 {
@@ -5913,8 +5913,7 @@ public:
             rmErrorCode(exp);
 
             // Pass if we didn't expect a throw and we got what we expected.
-            if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::no_exception) &&
-                (got == exp))
+            if ((rpcCallTest.throwsWhat == RPCCallTestData::Exception::NoException) && (got == exp))
             {
                 pass();
             }
diff --git a/src/test/rpc/RPCHelpers_test.cpp b/src/test/rpc/RPCHelpers_test.cpp
index e87ac50bcf..8896bd081b 100644
--- a/src/test/rpc/RPCHelpers_test.cpp
+++ b/src/test/rpc/RPCHelpers_test.cpp
@@ -9,7 +9,7 @@
 
 namespace xrpl::test {
 
-class RPCHelpers_test : public beast::unit_test::suite
+class RPCHelpers_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -18,51 +18,51 @@ public:
         testcase("ChooseLedgerEntryType");
 
         // Test no type.
-        Json::Value tx = Json::objectValue;
+        json::Value tx = json::ObjectValue;
         auto result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status::OK);
+        BEAST_EXPECT(result.first == RPC::Status::kOK);
         BEAST_EXPECT(result.second == 0);
 
         // Test empty type.
         tx[jss::type] = "";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status{rpcINVALID_PARAMS});
+        BEAST_EXPECT(result.first == RPC::Status{RpcInvalidParams});
         BEAST_EXPECT(result.second == 0);
 
         // Test type using canonical name in mixedcase.
         tx[jss::type] = "MPTokenIssuance";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status::OK);
+        BEAST_EXPECT(result.first == RPC::Status::kOK);
         BEAST_EXPECT(result.second == ltMPTOKEN_ISSUANCE);
 
         // Test type using canonical name in lowercase.
         tx[jss::type] = "mptokenissuance";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status::OK);
+        BEAST_EXPECT(result.first == RPC::Status::kOK);
         BEAST_EXPECT(result.second == ltMPTOKEN_ISSUANCE);
 
         // Test type using RPC name with exact match.
         tx[jss::type] = "mpt_issuance";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status::OK);
+        BEAST_EXPECT(result.first == RPC::Status::kOK);
         BEAST_EXPECT(result.second == ltMPTOKEN_ISSUANCE);
 
         // Test type using RPC name with inexact match.
         tx[jss::type] = "MPT_Issuance";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status{rpcINVALID_PARAMS});
+        BEAST_EXPECT(result.first == RPC::Status{RpcInvalidParams});
         BEAST_EXPECT(result.second == 0);
 
         // Test invalid type.
         tx[jss::type] = 1234;
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status{rpcINVALID_PARAMS});
+        BEAST_EXPECT(result.first == RPC::Status{RpcInvalidParams});
         BEAST_EXPECT(result.second == 0);
 
         // Test unknown type.
         tx[jss::type] = "unknown";
         result = RPC::chooseLedgerEntryType(tx);
-        BEAST_EXPECT(result.first == RPC::Status{rpcINVALID_PARAMS});
+        BEAST_EXPECT(result.first == RPC::Status{RpcInvalidParams});
         BEAST_EXPECT(result.second == 0);
     }
 
diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp
index a49b52578a..c483c2f694 100644
--- a/src/test/rpc/RPCOverload_test.cpp
+++ b/src/test/rpc/RPCOverload_test.cpp
@@ -20,7 +20,7 @@
 
 namespace xrpl::test {
 
-class RPCOverload_test : public beast::unit_test::suite
+class RPCOverload_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -30,7 +30,7 @@ public:
         using namespace jtx;
         Env env{*this, envconfig([](std::unique_ptr<Config> cfg) {
                     cfg->loadFromString("[" SECTION_SIGNING_SUPPORT "]\ntrue");
-                    return no_admin(std::move(cfg));
+                    return noAdmin(std::move(cfg));
                 })};
 
         Account const alice{"alice"};
@@ -40,7 +40,7 @@ public:
         std::unique_ptr<AbstractClient> client =
             useWS ? makeWSClient(env.app().config()) : makeJSONRPCClient(env.app().config());
 
-        Json::Value tx = Json::objectValue;
+        json::Value tx = json::ObjectValue;
         tx[jss::tx_json] = pay(alice, bob, XRP(1));
         tx[jss::secret] = toBase58(generateSeed("alice"));
 
diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp
index 96a8c5f869..03339e1a78 100644
--- a/src/test/rpc/RobustTransaction_test.cpp
+++ b/src/test/rpc/RobustTransaction_test.cpp
@@ -16,7 +16,7 @@
 
 namespace xrpl::test {
 
-class RobustTransaction_test : public beast::unit_test::suite
+class RobustTransaction_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -31,8 +31,8 @@ public:
 
         {
             // RPC subscribe to transactions stream
-            Json::Value jv;
-            jv[jss::streams] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::streams] = json::ArrayValue;
             jv[jss::streams].append("transactions");
             jv = wsc->invoke("subscribe", jv);
             BEAST_EXPECT(jv[jss::status] == "success");
@@ -46,7 +46,7 @@ public:
 
         {
             // Submit past ledger sequence transaction
-            Json::Value payment;
+            json::Value payment;
             payment[jss::secret] = toBase58(generateSeed("alice"));
             payment[jss::tx_json] = pay("alice", "bob", XRP(1));
             payment[jss::tx_json][sfLastLedgerSequence.fieldName] = 1;
@@ -122,8 +122,8 @@ public:
 
         {
             // RPC unsubscribe to transactions stream
-            Json::Value jv;
-            jv[jss::streams] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::streams] = json::ArrayValue;
             jv[jss::streams].append("transactions");
             jv = wsc->invoke("unsubscribe", jv);
             if (wsc->version() == 2)
@@ -158,7 +158,7 @@ public:
 
         {
             // Submit normal payment
-            Json::Value jv;
+            json::Value jv;
             jv[jss::secret] = toBase58(generateSeed("alice"));
             jv[jss::tx_json] = pay("alice", "bob", XRP(1));
             jv = wsc->invoke("submit", jv);
@@ -179,7 +179,7 @@ public:
 
         {
             // RPC account_tx
-            Json::Value jv;
+            json::Value jv;
             jv[jss::account] = Account("bob").human();
             jv[jss::ledger_index_min] = -1;
             jv[jss::ledger_index_max] = -1;
@@ -212,7 +212,7 @@ public:
 
         {
             // Submit normal payment
-            Json::Value jv;
+            json::Value jv;
             jv[jss::secret] = toBase58(generateSeed("alice"));
             jv[jss::tx_json] = pay("alice", "bob", XRP(1));
             jv = wsc->invoke("submit", jv);
@@ -241,8 +241,8 @@ public:
         {
             {
                 // RPC subscribe to ledger stream
-                Json::Value jv;
-                jv[jss::streams] = Json::arrayValue;
+                json::Value jv;
+                jv[jss::streams] = json::ArrayValue;
                 jv[jss::streams].append("ledger");
                 jv = wsc->invoke("subscribe", jv);
                 if (wsc->version() == 2)
@@ -275,8 +275,8 @@ public:
 
             {
                 // RPC unsubscribe to ledger stream
-                Json::Value jv;
-                jv[jss::streams] = Json::arrayValue;
+                json::Value jv;
+                jv[jss::streams] = json::ArrayValue;
                 jv[jss::streams].append("ledger");
                 jv = wsc->invoke("unsubscribe", jv);
                 if (wsc->version() == 2)
@@ -294,8 +294,8 @@ public:
             wsc = makeWSClient(env.app().config());
             {
                 // RPC subscribe to ledger stream
-                Json::Value jv;
-                jv[jss::streams] = Json::arrayValue;
+                json::Value jv;
+                jv[jss::streams] = json::ArrayValue;
                 jv[jss::streams].append("ledger");
                 jv = wsc->invoke("subscribe", jv);
                 if (wsc->version() == 2)
@@ -328,8 +328,8 @@ public:
 
             {
                 // RPC unsubscribe to ledger stream
-                Json::Value jv;
-                jv[jss::streams] = Json::arrayValue;
+                json::Value jv;
+                jv[jss::streams] = json::ArrayValue;
                 jv[jss::streams].append("ledger");
                 jv = wsc->invoke("unsubscribe", jv);
                 if (wsc->version() == 2)
@@ -344,7 +344,7 @@ public:
 
         {
             // RPC account_tx
-            Json::Value jv;
+            json::Value jv;
             jv[jss::account] = Account("bob").human();
             jv[jss::ledger_index_min] = -1;
             jv[jss::ledger_index_max] = -1;
@@ -377,8 +377,8 @@ public:
 
         {
             // RPC subscribe to accounts_proposed stream
-            Json::Value jv;
-            jv[jss::accounts_proposed] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::accounts_proposed] = json::ArrayValue;
             jv[jss::accounts_proposed].append(Account("alice").human());
             jv = wsc->invoke("subscribe", jv);
             if (wsc->version() == 2)
@@ -392,7 +392,7 @@ public:
 
         {
             // Submit account_set transaction
-            Json::Value jv;
+            json::Value jv;
             jv[jss::secret] = toBase58(generateSeed("alice"));
             jv[jss::tx_json] = fset("alice", 0);
             jv[jss::tx_json][jss::Fee] = static_cast<int>(env.current()->fees().base.drops());
@@ -415,8 +415,8 @@ public:
 
         {
             // RPC unsubscribe to accounts_proposed stream
-            Json::Value jv;
-            jv[jss::accounts_proposed] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::accounts_proposed] = json::ArrayValue;
             jv[jss::accounts_proposed].append(Account("alice").human());
             jv = wsc->invoke("unsubscribe", jv);
             if (wsc->version() == 2)
diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp
index c2b1d36a0b..f8aaffdf7f 100644
--- a/src/test/rpc/Roles_test.cpp
+++ b/src/test/rpc/Roles_test.cpp
@@ -12,7 +12,7 @@
 
 namespace xrpl::test {
 
-class Roles_test : public beast::unit_test::suite
+class Roles_test : public beast::unit_test::Suite
 {
     static bool
     isValidIpAddress(std::string const& addr)
@@ -36,14 +36,14 @@ class Roles_test : public beast::unit_test::suite
                 makeWSClient(env.app().config())->invoke("ping")["result"]["unlimited"].asBool());
         }
         {
-            Env env{*this, envconfig(no_admin)};
+            Env env{*this, envconfig(noAdmin)};
 
             BEAST_EXPECT(!env.rpc("ping")["result"].isMember("role"));
             auto wsRes = makeWSClient(env.app().config())->invoke("ping")["result"];
             BEAST_EXPECT(!wsRes.isMember("unlimited") || !wsRes["unlimited"].asBool());
         }
         {
-            Env env{*this, envconfig(secure_gateway)};
+            Env env{*this, envconfig(secureGateway)};
 
             BEAST_EXPECT(env.rpc("ping")["result"]["role"] == "proxied");
             BEAST_EXPECT(!env.rpc("ping")["result"].isMember("ip"));
@@ -51,7 +51,7 @@ class Roles_test : public beast::unit_test::suite
             BEAST_EXPECT(!wsRes.isMember("unlimited") || !wsRes["unlimited"].asBool());
 
             std::unordered_map<std::string, std::string> headers;
-            Json::Value rpcRes;
+            json::Value rpcRes;
 
             // IPv4 tests.
             headers["X-Forwarded-For"] = "12.34.56.78";
@@ -243,21 +243,21 @@ class Roles_test : public beast::unit_test::suite
         }
 
         {
-            Env env{*this, envconfig(admin_localnet)};
+            Env env{*this, envconfig(adminLocalnet)};
             BEAST_EXPECT(env.rpc("ping")["result"]["role"] == "admin");
             BEAST_EXPECT(
                 makeWSClient(env.app().config())->invoke("ping")["result"]["unlimited"].asBool());
         }
 
         {
-            Env env{*this, envconfig(secure_gateway_localnet)};
+            Env env{*this, envconfig(secureGatewayLocalnet)};
             BEAST_EXPECT(env.rpc("ping")["result"]["role"] == "proxied");
             auto wsRes = makeWSClient(env.app().config())->invoke("ping")["result"];
             BEAST_EXPECT(!wsRes.isMember("unlimited") || !wsRes["unlimited"].asBool());
 
             std::unordered_map<std::string, std::string> headers;
             headers["X-Forwarded-For"] = "12.34.56.78";
-            Json::Value rpcRes = env.rpc(headers, "ping")["result"];
+            json::Value rpcRes = env.rpc(headers, "ping")["result"];
             BEAST_EXPECT(rpcRes["role"] == "proxied");
             BEAST_EXPECT(rpcRes["ip"] == "12.34.56.78");
             BEAST_EXPECT(isValidIpAddress(rpcRes["ip"].asString()));
@@ -274,7 +274,7 @@ class Roles_test : public beast::unit_test::suite
             Env env(*this);
 
             std::unordered_map<std::string, std::string> headers;
-            Json::Value rpcRes;
+            json::Value rpcRes;
 
             // No "for=" in Forwarded.
             headers["Forwarded"] = "for 88.77.66.55";
diff --git a/src/test/rpc/ServerDefinitions_test.cpp b/src/test/rpc/ServerDefinitions_test.cpp
index 14567dfd25..d53c845726 100644
--- a/src/test/rpc/ServerDefinitions_test.cpp
+++ b/src/test/rpc/ServerDefinitions_test.cpp
@@ -10,7 +10,7 @@
 
 namespace xrpl::test {
 
-class ServerDefinitions_test : public beast::unit_test::suite
+class ServerDefinitions_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -88,7 +88,7 @@ public:
             // test the properties of the LEDGER_ENTRY_FLAGS section
             {
                 BEAST_EXPECT(result[jss::result].isMember(jss::LEDGER_ENTRY_FLAGS));
-                Json::Value const& leFlags = result[jss::result][jss::LEDGER_ENTRY_FLAGS];
+                json::Value const& leFlags = result[jss::result][jss::LEDGER_ENTRY_FLAGS];
 
                 // sanity test the mapped value of a few arbitrarily chosen flags
                 BEAST_EXPECT(leFlags["AccountRoot"]["lsfDisallowXRP"] == 0x00080000);
@@ -109,7 +109,7 @@ public:
             // validate the correctness of few chosen transaction flags
             {
                 BEAST_EXPECT(result[jss::result].isMember(jss::TRANSACTION_FLAGS));
-                Json::Value const& txFlags = result[jss::result][jss::TRANSACTION_FLAGS];
+                json::Value const& txFlags = result[jss::result][jss::TRANSACTION_FLAGS];
 
                 BEAST_EXPECT(txFlags["universal"]["tfFullyCanonicalSig"] == 0x80000000);
                 BEAST_EXPECT(txFlags["universal"]["tfInnerBatchTxn"] == 0x40000000);
@@ -127,7 +127,7 @@ public:
             // validate the correctness of the AccountSpecificFlags section
             {
                 BEAST_EXPECT(result[jss::result].isMember(jss::ACCOUNT_SET_FLAGS));
-                Json::Value const& asFlags = result[jss::result][jss::ACCOUNT_SET_FLAGS];
+                json::Value const& asFlags = result[jss::result][jss::ACCOUNT_SET_FLAGS];
 
                 BEAST_EXPECT(asFlags["asfDisallowXRP"] == 3);
                 BEAST_EXPECT(asFlags["asfGlobalFreeze"] == 7);
@@ -138,139 +138,139 @@ public:
             // test the response fields of the TRANSACTION_FORMATS section
             {
                 BEAST_EXPECT(result[jss::result].isMember(jss::TRANSACTION_FORMATS));
-                Json::Value const& txnFormats = result[jss::result][jss::TRANSACTION_FORMATS];
+                json::Value const& txnFormats = result[jss::result][jss::TRANSACTION_FORMATS];
 
                 // first validate the contents of "common"
                 {
                     BEAST_EXPECT(txnFormats.isMember("common"));
-                    Json::Value const& section = txnFormats["common"];
+                    json::Value const& section = txnFormats["common"];
 
                     BEAST_EXPECT(section[0u][jss::name] == "TransactionType");
-                    BEAST_EXPECT(section[0u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[0u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[1u][jss::name] == "Flags");
-                    BEAST_EXPECT(section[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[1u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[2u][jss::name] == "SourceTag");
-                    BEAST_EXPECT(section[2u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[2u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[3u][jss::name] == "Account");
-                    BEAST_EXPECT(section[3u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[3u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[4u][jss::name] == "Sequence");
-                    BEAST_EXPECT(section[4u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[4u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[5u][jss::name] == "PreviousTxnID");
-                    BEAST_EXPECT(section[5u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[5u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[6u][jss::name] == "LastLedgerSequence");
-                    BEAST_EXPECT(section[6u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[6u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[7u][jss::name] == "AccountTxnID");
-                    BEAST_EXPECT(section[7u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[7u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[8u][jss::name] == "Fee");
-                    BEAST_EXPECT(section[8u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[8u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[9u][jss::name] == "OperationLimit");
-                    BEAST_EXPECT(section[9u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[9u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[10u][jss::name] == "Memos");
-                    BEAST_EXPECT(section[10u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[10u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[11u][jss::name] == "SigningPubKey");
-                    BEAST_EXPECT(section[11u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[11u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[12u][jss::name] == "TicketSequence");
-                    BEAST_EXPECT(section[12u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[12u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[13u][jss::name] == "TxnSignature");
-                    BEAST_EXPECT(section[13u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[13u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[14u][jss::name] == "Signers");
-                    BEAST_EXPECT(section[14u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[14u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[15u][jss::name] == "NetworkID");
-                    BEAST_EXPECT(section[15u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[15u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[16u][jss::name] == "Delegate");
-                    BEAST_EXPECT(section[16u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[16u][jss::optionality] == SoeOptional);
                 }
 
                 // validate the contents of four arbitrarily selected transactions validate the
                 // format of the OracleSet transaction
                 {
                     BEAST_EXPECT(txnFormats.isMember("OracleSet"));
-                    Json::Value const& section = txnFormats["OracleSet"];
+                    json::Value const& section = txnFormats["OracleSet"];
 
                     BEAST_EXPECT(section[0u][jss::name] == "OracleDocumentID");
-                    BEAST_EXPECT(section[0u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[0u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[1u][jss::name] == "Provider");
-                    BEAST_EXPECT(section[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[1u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[2u][jss::name] == "URI");
-                    BEAST_EXPECT(section[2u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[2u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[3u][jss::name] == "AssetClass");
-                    BEAST_EXPECT(section[3u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[3u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[4u][jss::name] == "LastUpdateTime");
-                    BEAST_EXPECT(section[4u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[4u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[5u][jss::name] == "PriceDataSeries");
-                    BEAST_EXPECT(section[5u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[5u][jss::optionality] == SoeRequired);
                 }
 
                 // validate the format of the PermissionedDomainDelete transaction
                 {
                     BEAST_EXPECT(txnFormats.isMember("PermissionedDomainDelete"));
-                    Json::Value const& section = txnFormats["PermissionedDomainDelete"];
+                    json::Value const& section = txnFormats["PermissionedDomainDelete"];
 
                     BEAST_EXPECT(section[0u][jss::name] == "DomainID");
-                    BEAST_EXPECT(section[0u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[0u][jss::optionality] == SoeRequired);
                 }
 
                 // validate the format of the Clawback transaction
                 {
                     BEAST_EXPECT(txnFormats.isMember("Clawback"));
-                    Json::Value const& section = txnFormats["Clawback"];
+                    json::Value const& section = txnFormats["Clawback"];
 
                     BEAST_EXPECT(section[0u][jss::name] == "Amount");
-                    BEAST_EXPECT(section[0u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(section[0u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(section[1u][jss::name] == "Holder");
-                    BEAST_EXPECT(section[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[1u][jss::optionality] == SoeOptional);
                 }
 
                 // validate the format of the SetFee transaction
                 {
                     BEAST_EXPECT(txnFormats.isMember("SetFee"));
-                    Json::Value const& section = txnFormats["SetFee"];
+                    json::Value const& section = txnFormats["SetFee"];
 
                     BEAST_EXPECT(section[0u][jss::name] == "LedgerSequence");
-                    BEAST_EXPECT(section[0u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[0u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[1u][jss::name] == "BaseFee");
-                    BEAST_EXPECT(section[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[1u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[2u][jss::name] == "ReferenceFeeUnits");
-                    BEAST_EXPECT(section[2u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[2u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[3u][jss::name] == "ReserveBase");
-                    BEAST_EXPECT(section[3u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[3u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[4u][jss::name] == "ReserveIncrement");
-                    BEAST_EXPECT(section[4u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[4u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[5u][jss::name] == "BaseFeeDrops");
-                    BEAST_EXPECT(section[5u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[5u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[6u][jss::name] == "ReserveBaseDrops");
-                    BEAST_EXPECT(section[6u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[6u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(section[7u][jss::name] == "ReserveIncrementDrops");
-                    BEAST_EXPECT(section[7u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(section[7u][jss::optionality] == SoeOptional);
                 }
             }
 
@@ -284,72 +284,72 @@ public:
 
                 // check "common" first
                 {
-                    Json::Value const& observedCommonLedgerEntry =
+                    json::Value const& observedCommonLedgerEntry =
                         result[jss::result][jss::LEDGER_ENTRY_FORMATS]["common"];
 
                     BEAST_EXPECT(observedCommonLedgerEntry[0u][jss::name] == "LedgerIndex");
-                    BEAST_EXPECT(observedCommonLedgerEntry[0u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedCommonLedgerEntry[0u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedCommonLedgerEntry[1u][jss::name] == "LedgerEntryType");
-                    BEAST_EXPECT(observedCommonLedgerEntry[1u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedCommonLedgerEntry[1u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(observedCommonLedgerEntry[2u][jss::name] == "Flags");
-                    BEAST_EXPECT(observedCommonLedgerEntry[2u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedCommonLedgerEntry[2u][jss::optionality] == SoeRequired);
                 }
 
                 // test the contents of an arbitrary ledger-entry (DID)
                 {
-                    Json::Value const& observedDIDLedgerEntry =
+                    json::Value const& observedDIDLedgerEntry =
                         result[jss::result][jss::LEDGER_ENTRY_FORMATS]["DID"];
 
                     BEAST_EXPECT(observedDIDLedgerEntry[0u][jss::name] == "Account");
-                    BEAST_EXPECT(observedDIDLedgerEntry[0u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedDIDLedgerEntry[0u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[1u][jss::name] == "DIDDocument");
-                    BEAST_EXPECT(observedDIDLedgerEntry[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedDIDLedgerEntry[1u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[2u][jss::name] == "URI");
-                    BEAST_EXPECT(observedDIDLedgerEntry[2u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedDIDLedgerEntry[2u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[3u][jss::name] == "Data");
-                    BEAST_EXPECT(observedDIDLedgerEntry[3u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedDIDLedgerEntry[3u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[4u][jss::name] == "OwnerNode");
-                    BEAST_EXPECT(observedDIDLedgerEntry[4u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedDIDLedgerEntry[4u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[5u][jss::name] == "PreviousTxnID");
-                    BEAST_EXPECT(observedDIDLedgerEntry[5u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedDIDLedgerEntry[5u][jss::optionality] == SoeRequired);
 
                     BEAST_EXPECT(observedDIDLedgerEntry[6u][jss::name] == "PreviousTxnLgrSeq");
-                    BEAST_EXPECT(observedDIDLedgerEntry[6u][jss::optionality] == soeREQUIRED);
+                    BEAST_EXPECT(observedDIDLedgerEntry[6u][jss::optionality] == SoeRequired);
                 }
 
                 // test the contents of an arbitrary ledger-entry (NegativeUNL)
                 {
-                    Json::Value const& observedNunlLedgerEntry =
+                    json::Value const& observedNunlLedgerEntry =
                         result[jss::result][jss::LEDGER_ENTRY_FORMATS]["NegativeUNL"];
 
                     BEAST_EXPECT(observedNunlLedgerEntry[0u][jss::name] == "DisabledValidators");
-                    BEAST_EXPECT(observedNunlLedgerEntry[0u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedNunlLedgerEntry[0u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedNunlLedgerEntry[1u][jss::name] == "ValidatorToDisable");
-                    BEAST_EXPECT(observedNunlLedgerEntry[1u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedNunlLedgerEntry[1u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedNunlLedgerEntry[2u][jss::name] == "ValidatorToReEnable");
-                    BEAST_EXPECT(observedNunlLedgerEntry[2u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedNunlLedgerEntry[2u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedNunlLedgerEntry[3u][jss::name] == "PreviousTxnID");
-                    BEAST_EXPECT(observedNunlLedgerEntry[3u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedNunlLedgerEntry[3u][jss::optionality] == SoeOptional);
 
                     BEAST_EXPECT(observedNunlLedgerEntry[4u][jss::name] == "PreviousTxnLgrSeq");
-                    BEAST_EXPECT(observedNunlLedgerEntry[4u][jss::optionality] == soeOPTIONAL);
+                    BEAST_EXPECT(observedNunlLedgerEntry[4u][jss::optionality] == SoeOptional);
                 }
             }
 
             // Exhaustive test: verify all transaction flags from getAllTxFlags() appear in the
             // output
             {
-                Json::Value const& txFlags = result[jss::result][jss::TRANSACTION_FLAGS];
+                json::Value const& txFlags = result[jss::result][jss::TRANSACTION_FLAGS];
 
                 for (auto const& [txName, flagMap] : getAllTxFlags())
                 {
@@ -371,7 +371,7 @@ public:
             // Exhaustive test: verify all ledger entry flags from getAllLedgerFlags() appear in the
             // output
             {
-                Json::Value const& leFlags = result[jss::result][jss::LEDGER_ENTRY_FLAGS];
+                json::Value const& leFlags = result[jss::result][jss::LEDGER_ENTRY_FLAGS];
 
                 for (auto const& [ledgerType, flagMap] : getAllLedgerFlags())
                 {
@@ -393,7 +393,7 @@ public:
             // Exhaustive test: verify all AccountSet flags from getAsfFlagMap() appear in the
             // output
             {
-                Json::Value const& asFlags = result[jss::result][jss::ACCOUNT_SET_FLAGS];
+                json::Value const& asFlags = result[jss::result][jss::ACCOUNT_SET_FLAGS];
 
                 for (auto const& [flagName, flagValue] : getAsfFlagMap())
                 {
diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp
index f94fe51d5d..b47d37c0cf 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 public_key = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
+static auto const kPUBLIC_KEY = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
 
-static auto const token =
+static auto const kTOKEN =
     "eyJ2YWxpZGF0aW9uX3NlY3JldF9rZXkiOiI5ZWQ0NWY4NjYyNDFjYzE4YTI3NDdiNT\n"
     "QzODdjMDYyNTkwNzk3MmY0ZTcxOTAyMzFmYWE5Mzc0NTdmYTlkYWY2IiwibWFuaWZl\n"
     "c3QiOiJKQUFBQUFGeEllMUZ0d21pbXZHdEgyaUNjTUpxQzlnVkZLaWxHZncxL3ZDeE\n"
@@ -29,7 +29,7 @@ static auto const token =
     "VUSmEydzBpMjFlcTNNWXl3TFZKWm5GT3I3QzBrdzJBaVR6U0NqSXpkaXRROD0ifQ==\n";
 }  // namespace validator_data
 
-class ServerInfo_test : public beast::unit_test::suite
+class ServerInfo_test : public beast::unit_test::Suite
 {
 public:
     static std::unique_ptr<Config>
@@ -54,7 +54,8 @@ protocol = wss2
 admin = 127.0.0.1
 )xrpldConfig");
 
-        p->loadFromString(boost::str(toLoad % validator_data::token % validator_data::public_key));
+        p->loadFromString(
+            boost::str(toLoad % validator_data::kTOKEN % validator_data::kPUBLIC_KEY));
 
         setupConfigForUnitTests(*p);
 
@@ -108,12 +109,12 @@ admin = 127.0.0.1
             Env env(*this, makeValidatorConfig());
             auto const& config = env.app().config();
 
-            auto const rpc_port = config["port_rpc"].get<unsigned int>("port");
-            auto const grpc_port = config[SECTION_PORT_GRPC].get<unsigned int>("port");
-            auto const ws_port = config["port_ws"].get<unsigned int>("port");
-            BEAST_EXPECT(grpc_port);
-            BEAST_EXPECT(rpc_port);
-            BEAST_EXPECT(ws_port);
+            auto const rpcPort = config["port_rpc"].get<unsigned int>("port");
+            auto const grpcPort = config[SECTION_PORT_GRPC].get<unsigned int>("port");
+            auto const wsPort = config["port_ws"].get<unsigned int>("port");
+            BEAST_EXPECT(grpcPort);
+            BEAST_EXPECT(rpcPort);
+            BEAST_EXPECT(wsPort);
 
             auto const result = env.rpc("server_info");
             BEAST_EXPECT(!result[jss::result].isMember(jss::error));
@@ -121,7 +122,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::public_key);
+                validator_data::kPUBLIC_KEY);
 
             auto const& ports = result[jss::result][jss::info][jss::ports];
             BEAST_EXPECT(ports.isArray() && ports.size() == 3);
@@ -130,19 +131,19 @@ admin = 127.0.0.1
                 auto const& proto = port[jss::protocol];
                 BEAST_EXPECT(proto.isArray());
                 auto const p = port[jss::port].asUInt();
-                BEAST_EXPECT(p == rpc_port || p == ws_port || p == grpc_port);
-                if (p == grpc_port)
+                BEAST_EXPECT(p == rpcPort || p == wsPort || p == grpcPort);
+                if (p == grpcPort)
                 {
                     BEAST_EXPECT(proto.size() == 1);
                     BEAST_EXPECT(proto[0u].asString() == "grpc");
                 }
-                if (p == rpc_port)
+                if (p == rpcPort)
                 {
                     BEAST_EXPECT(proto.size() == 2);
                     BEAST_EXPECT(proto[0u].asString() == "http");
                     BEAST_EXPECT(proto[1u].asString() == "ws2");
                 }
-                if (p == ws_port)
+                if (p == wsPort)
                 {
                     BEAST_EXPECT(proto.size() == 1);
                     BEAST_EXPECT(proto[0u].asString() == "ws");
diff --git a/src/test/rpc/Simulate_test.cpp b/src/test/rpc/Simulate_test.cpp
index 0ef66d67d9..ca5fa2133c 100644
--- a/src/test/rpc/Simulate_test.cpp
+++ b/src/test/rpc/Simulate_test.cpp
@@ -42,12 +42,12 @@
 
 namespace xrpl::test {
 
-class Simulate_test : public beast::unit_test::suite
+class Simulate_test : public beast::unit_test::Suite
 {
     void
     checkBasicReturnValidity(
-        Json::Value const& result,
-        Json::Value const& tx,
+        json::Value const& result,
+        json::Value const& tx,
         int const expectedSequence,
         std::string const& expectedFee)
     {
@@ -57,29 +57,29 @@ class Simulate_test : public beast::unit_test::suite
         BEAST_EXPECT(result.isMember(jss::engine_result_message));
         BEAST_EXPECT(result.isMember(jss::tx_json) || result.isMember(jss::tx_blob));
 
-        Json::Value tx_json;
+        json::Value txJson;
         if (result.isMember(jss::tx_json))
         {
-            tx_json = result[jss::tx_json];
+            txJson = result[jss::tx_json];
         }
         else
         {
             auto const unHexed = strUnHex(result[jss::tx_blob].asString());
             SerialIter sitTrans(makeSlice(*unHexed));  // NOLINT(bugprone-unchecked-optional-access)
-            tx_json = STObject(std::ref(sitTrans), sfGeneric).getJson(JsonOptions::none);
+            txJson = STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::KNone);
         }
-        BEAST_EXPECT(tx_json[jss::TransactionType] == tx[jss::TransactionType]);
-        BEAST_EXPECT(tx_json[jss::Account] == tx[jss::Account]);
-        BEAST_EXPECT(tx_json[jss::SigningPubKey] == tx.get(jss::SigningPubKey, ""));
-        BEAST_EXPECT(tx_json[jss::TxnSignature] == tx.get(jss::TxnSignature, ""));
-        BEAST_EXPECT(tx_json[jss::Fee] == tx.get(jss::Fee, expectedFee));
-        BEAST_EXPECT(tx_json[jss::Sequence] == tx.get(jss::Sequence, expectedSequence));
+        BEAST_EXPECT(txJson[jss::TransactionType] == tx[jss::TransactionType]);
+        BEAST_EXPECT(txJson[jss::Account] == tx[jss::Account]);
+        BEAST_EXPECT(txJson[jss::SigningPubKey] == tx.get(jss::SigningPubKey, ""));
+        BEAST_EXPECT(txJson[jss::TxnSignature] == tx.get(jss::TxnSignature, ""));
+        BEAST_EXPECT(txJson[jss::Fee] == tx.get(jss::Fee, expectedFee));
+        BEAST_EXPECT(txJson[jss::Sequence] == tx.get(jss::Sequence, expectedSequence));
     }
 
     void
     checkBasicReturnValidity(
-        Json::Value const& result,
-        Json::Value const& tx,
+        json::Value const& result,
+        json::Value const& tx,
         int const expectedSequence,
         XRPAmount const& expectedFee)
     {
@@ -90,13 +90,13 @@ class Simulate_test : public beast::unit_test::suite
     void
     testTx(
         jtx::Env& env,
-        Json::Value const& tx,
-        std::function<void(Json::Value const&, Json::Value const&)> const& validate,
+        json::Value const& tx,
+        std::function<void(json::Value const&, json::Value const&)> const& validate,
         bool testSerialized = true)
     {
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::tx_json] = tx;
         validate(env.rpc("json", "simulate", to_string(params)), tx);
 
@@ -112,17 +112,17 @@ class Simulate_test : public beast::unit_test::suite
             // will crash
             STParsedJSONObject const parsed(std::string(jss::tx_json), tx);
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            auto const tx_blob = strHex(parsed.object->getSerializer().peekData());
+            auto const txBlob = strHex(parsed.object->getSerializer().peekData());
             if (BEAST_EXPECT(parsed.object.has_value()))
             {
-                Json::Value params;
-                params[jss::tx_blob] = tx_blob;
+                json::Value params;
+                params[jss::tx_blob] = txBlob;
                 validate(env.rpc("json", "simulate", to_string(params)), tx);
                 params[jss::binary] = true;
                 validate(env.rpc("json", "simulate", to_string(params)), tx);
             }
-            validate(env.rpc("simulate", tx_blob), tx);
-            validate(env.rpc("simulate", tx_blob, "binary"), tx);
+            validate(env.rpc("simulate", txBlob), tx);
+            validate(env.rpc("simulate", txBlob, "binary"), tx);
         }
 
         BEAST_EXPECTS(env.current()->txCount() == 0, std::to_string(env.current()->txCount()));
@@ -131,18 +131,18 @@ class Simulate_test : public beast::unit_test::suite
     void
     testTxJsonMetadataField(
         jtx::Env& env,
-        Json::Value const& tx,
+        json::Value const& tx,
         std::function<void(
-            Json::Value const&,
-            Json::Value const&,
-            Json::Value const&,
-            Json::Value const&)> const& validate,
-        Json::Value const& expectedMetadataKey,
-        Json::Value const& expectedMetadataValue)
+            json::Value const&,
+            json::Value const&,
+            json::Value const&,
+            json::Value const&)> const& validate,
+        json::Value const& expectedMetadataKey,
+        json::Value const& expectedMetadataValue)
     {
         env.close();
 
-        Json::Value params;
+        json::Value params;
         params[jss::tx_json] = tx;
         validate(
             env.rpc("json", "simulate", to_string(params)),
@@ -155,14 +155,14 @@ class Simulate_test : public beast::unit_test::suite
         BEAST_EXPECTS(env.current()->txCount() == 0, std::to_string(env.current()->txCount()));
     }
 
-    static Json::Value
-    getJsonMetadata(Json::Value txResult)
+    static json::Value
+    getJsonMetadata(json::Value txResult)
     {
         if (txResult.isMember(jss::meta_blob))
         {
             auto unHexed = strUnHex(txResult[jss::meta_blob].asString());
             SerialIter sitTrans(makeSlice(*unHexed));  // NOLINT(bugprone-unchecked-optional-access)
-            return STObject(std::ref(sitTrans), sfGeneric).getJson(JsonOptions::none);
+            return STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::KNone);
         }
 
         return txResult[jss::meta];
@@ -179,7 +179,7 @@ class Simulate_test : public beast::unit_test::suite
 
         {
             // No params
-            Json::Value const params = Json::objectValue;
+            json::Value const params = json::ObjectValue;
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
                 resp[jss::result][jss::error_message] ==
@@ -187,8 +187,8 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Providing both `tx_json` and `tx_blob`
-            Json::Value params = Json::objectValue;
-            params[jss::tx_json] = Json::objectValue;
+            json::Value params = json::ObjectValue;
+            params[jss::tx_json] = json::ObjectValue;
             params[jss::tx_blob] = "1200";
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -198,7 +198,7 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // `binary` isn't a boolean
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::tx_blob] = "1200";
             params[jss::binary] = "100";
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -206,7 +206,7 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Invalid `tx_blob`
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::tx_blob] = "12";
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -214,8 +214,8 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Empty `tx_json`
-            Json::Value params = Json::objectValue;
-            params[jss::tx_json] = Json::objectValue;
+            json::Value params = json::ObjectValue;
+            params[jss::tx_json] = json::ObjectValue;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
@@ -223,17 +223,17 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // No tx.Account
-            Json::Value params = Json::objectValue;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::Payment;
-            params[jss::tx_json] = tx_json;
+            json::Value params = json::ObjectValue;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::Payment;
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Missing field 'tx.Account'.");
         }
         {
             // Empty `tx_blob`
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::tx_blob] = "";
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -241,7 +241,7 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Non-string `tx_blob`
-            Json::Value params;
+            json::Value params;
             params[jss::tx_blob] = 1.1;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -249,7 +249,7 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Non-object `tx_json`
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::tx_json] = "";
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -258,55 +258,55 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // `seed` field included
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::seed] = "random_data";
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            params[jss::tx_json] = tx_json;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            params[jss::tx_json] = txJson;
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'seed'.");
         }
         {
             // `secret` field included
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::secret] = "random_data";
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            params[jss::tx_json] = tx_json;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            params[jss::tx_json] = txJson;
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'secret'.");
         }
         {
             // `seed_hex` field included
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::seed_hex] = "random_data";
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            params[jss::tx_json] = tx_json;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            params[jss::tx_json] = txJson;
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'seed_hex'.");
         }
         {
             // `passphrase` field included
-            Json::Value params = Json::objectValue;
+            json::Value params = json::ObjectValue;
             params[jss::passphrase] = "random_data";
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            params[jss::tx_json] = tx_json;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            params[jss::tx_json] = txJson;
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'passphrase'.");
         }
         {
             // Invalid transaction
-            Json::Value params = Json::objectValue;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::Payment;
-            tx_json[jss::Account] = env.master.human();
-            params[jss::tx_json] = tx_json;
+            json::Value params = json::ObjectValue;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::Payment;
+            txJson[jss::Account] = env.master.human();
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
@@ -315,11 +315,11 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Bad account
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = "badAccount";
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = "badAccount";
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECTS(
@@ -329,48 +329,48 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Account doesn't exist for Sequence autofill
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = alice.human();
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = alice.human();
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Source account not found.");
         }
         {
             // Invalid Signers field
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            tx_json[sfSigners] = "1";
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            txJson[sfSigners] = "1";
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'tx.Signers'.");
         }
         {
             // Invalid Signers field
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            tx_json[sfSigners] = Json::arrayValue;
-            tx_json[sfSigners].append("1");
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            txJson[sfSigners] = json::ArrayValue;
+            txJson[sfSigners].append("1");
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(resp[jss::result][jss::error_message] == "Invalid field 'tx.Signers[0]'.");
         }
         {
             // Invalid transaction
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            tx_json["foo"] = "bar";
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            txJson["foo"] = "bar";
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
@@ -378,20 +378,20 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // non-`"binary"` second param for CLI
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = alice.human();
-            auto const resp = env.rpc("simulate", to_string(tx_json), "1");
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = alice.human();
+            auto const resp = env.rpc("simulate", to_string(txJson), "1");
             BEAST_EXPECT(resp[jss::error_message] == "Invalid parameters.");
         }
         {
             // Signed transaction
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            tx_json[jss::TxnSignature] = "1200ABCD";
-            params[jss::tx_json] = tx_json;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            txJson[jss::TxnSignature] = "1200ABCD";
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
@@ -399,21 +399,21 @@ class Simulate_test : public beast::unit_test::suite
         }
         {
             // Signed multisig transaction
-            Json::Value params;
-            Json::Value tx_json = Json::objectValue;
-            tx_json[jss::TransactionType] = jss::AccountSet;
-            tx_json[jss::Account] = env.master.human();
-            tx_json[sfSigners] = Json::arrayValue;
+            json::Value params;
+            json::Value txJson = json::ObjectValue;
+            txJson[jss::TransactionType] = jss::AccountSet;
+            txJson[jss::Account] = env.master.human();
+            txJson[sfSigners] = json::ArrayValue;
             {
-                Json::Value signer;
+                json::Value signer;
                 signer[jss::Account] = alice.human();
                 signer[jss::SigningPubKey] = alice.human();
                 signer[jss::TxnSignature] = "1200ABCD";
-                Json::Value signerOuter;
+                json::Value signerOuter;
                 signerOuter[sfSigner] = signer;
-                tx_json[sfSigners].append(signerOuter);
+                txJson[sfSigners].append(signerOuter);
             }
-            params[jss::tx_json] = tx_json;
+            params[jss::tx_json] = txJson;
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
             BEAST_EXPECT(
@@ -443,7 +443,7 @@ class Simulate_test : public beast::unit_test::suite
             env(noop(alice));
 
         {
-            Json::Value params;
+            json::Value params;
             params[jss::tx_json] = noop(alice);
 
             auto const resp = env.rpc("json", "simulate", to_string(params));
@@ -451,7 +451,7 @@ class Simulate_test : public beast::unit_test::suite
             if (BEAST_EXPECT(result.isMember(jss::error)))
             {
                 BEAST_EXPECT(result[jss::error] == "highFee");
-                BEAST_EXPECT(result[jss::error_code] == rpcHIGH_FEE);
+                BEAST_EXPECT(result[jss::error_code] == RpcHighFee);
             }
         }
     }
@@ -474,11 +474,11 @@ class Simulate_test : public beast::unit_test::suite
         auto const seq = env.seq(alice);
         auto jt = env.jtnofill(
             batch::outer(alice, env.seq(alice), batchFee, tfAllOrNothing),
-            batch::inner(pay(alice, bob, XRP(10)), seq + 1),
-            batch::inner(pay(alice, bob, XRP(10)), seq + 1));
+            batch::Inner(pay(alice, bob, XRP(10)), seq + 1),
+            batch::Inner(pay(alice, bob, XRP(10)), seq + 1));
 
         jt.jv.removeMember(jss::TxnSignature);
-        Json::Value params;
+        json::Value params;
         params[jss::tx_json] = jt.jv;
         auto const resp = env.rpc("json", "simulate", to_string(params));
         BEAST_EXPECT(resp[jss::result][jss::error] == "notImpl");
@@ -495,10 +495,10 @@ class Simulate_test : public beast::unit_test::suite
                     cfg->NETWORK_ID = 0;
                     return cfg;
                 })};
-        static auto const newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
 
         {
-            auto validateOutput = [&](Json::Value const& resp, Json::Value const& tx) {
+            auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
                 auto result = resp[jss::result];
                 checkBasicReturnValidity(result, tx, 1, env.current()->fees().base);
 
@@ -510,7 +510,7 @@ class Simulate_test : public beast::unit_test::suite
 
                 if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                 {
-                    Json::Value const metadata = getJsonMetadata(result);
+                    json::Value const metadata = getJsonMetadata(result);
 
                     if (BEAST_EXPECT(metadata.isMember(sfAffectedNodes.jsonName)))
                     {
@@ -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] == newDomain);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -529,11 +529,11 @@ class Simulate_test : public beast::unit_test::suite
                 }
             };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
+            tx[sfDomain] = kNEW_DOMAIN;
 
             // test with autofill
             testTx(env, tx, validateOutput);
@@ -558,8 +558,8 @@ class Simulate_test : public beast::unit_test::suite
         Account const alice("alice");
 
         {
-            std::function<void(Json::Value const&, Json::Value const&)> const& testSimulation =
-                [&](Json::Value const& resp, Json::Value const& tx) {
+            std::function<void(json::Value const&, json::Value const&)> const& testSimulation =
+                [&](json::Value const& resp, json::Value const& tx) {
                     auto result = resp[jss::result];
                     checkBasicReturnValidity(result, tx, 1, env.current()->fees().base);
 
@@ -570,7 +570,7 @@ class Simulate_test : public beast::unit_test::suite
                     BEAST_EXPECT(!result.isMember(jss::meta) && !result.isMember(jss::meta_blob));
                 };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::Payment;
@@ -600,8 +600,8 @@ class Simulate_test : public beast::unit_test::suite
         Account const alice("alice");
 
         {
-            std::function<void(Json::Value const&, Json::Value const&)> const& testSimulation =
-                [&](Json::Value const& resp, Json::Value const& tx) {
+            std::function<void(json::Value const&, json::Value const&)> const& testSimulation =
+                [&](json::Value const& resp, json::Value const& tx) {
                     auto result = resp[jss::result];
                     checkBasicReturnValidity(result, tx, 1, env.current()->fees().base);
 
@@ -615,7 +615,7 @@ class Simulate_test : public beast::unit_test::suite
 
                     if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                     {
-                        Json::Value const metadata = getJsonMetadata(result);
+                        json::Value const metadata = getJsonMetadata(result);
 
                         if (BEAST_EXPECT(metadata.isMember(sfAffectedNodes.jsonName)))
                         {
@@ -639,7 +639,7 @@ class Simulate_test : public beast::unit_test::suite
                     }
                 };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::Payment;
@@ -666,7 +666,7 @@ class Simulate_test : public beast::unit_test::suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -678,7 +678,7 @@ class Simulate_test : public beast::unit_test::suite
         env.close();
 
         {
-            auto validateOutput = [&](Json::Value const& resp, Json::Value const& tx) {
+            auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
                 auto result = resp[jss::result];
                 checkBasicReturnValidity(
                     result,
@@ -695,7 +695,7 @@ class Simulate_test : public beast::unit_test::suite
 
                 if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                 {
-                    Json::Value const metadata = getJsonMetadata(result);
+                    json::Value const metadata = getJsonMetadata(result);
 
                     if (BEAST_EXPECT(metadata.isMember(sfAffectedNodes.jsonName)))
                     {
@@ -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] == newDomain);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -714,20 +714,20 @@ class Simulate_test : public beast::unit_test::suite
                 }
             };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = alice.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
+            tx[sfDomain] = kNEW_DOMAIN;
 
             // test with autofill
             testTx(env, tx, validateOutput, false);
 
-            tx[sfSigners] = Json::arrayValue;
+            tx[sfSigners] = json::ArrayValue;
             {
-                Json::Value signer;
+                json::Value signer;
                 signer[jss::Account] = becky.human();
-                Json::Value signerOuter;
+                json::Value signerOuter;
                 signerOuter[sfSigner] = signer;
                 tx[sfSigners].append(signerOuter);
             }
@@ -755,15 +755,15 @@ class Simulate_test : public beast::unit_test::suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
         Account const alice{"alice"};
         env(regkey(env.master, alice));
-        env(fset(env.master, asfDisableMaster), sig(env.master));
+        env(fset(env.master, asfDisableMaster), Sig(env.master));
         env.close();
 
         {
-            std::function<void(Json::Value const&, Json::Value const&)> const& testSimulation =
-                [&](Json::Value const& resp, Json::Value const& tx) {
+            std::function<void(json::Value const&, json::Value const&)> const& testSimulation =
+                [&](json::Value const& resp, json::Value const& tx) {
                     auto result = resp[jss::result];
                     checkBasicReturnValidity(
                         result, tx, env.seq(env.master), env.current()->fees().base);
@@ -775,11 +775,11 @@ class Simulate_test : public beast::unit_test::suite
                     BEAST_EXPECT(!result.isMember(jss::meta) && !result.isMember(jss::meta_blob));
                 };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
+            tx[sfDomain] = kNEW_DOMAIN;
             // 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 newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -816,8 +816,8 @@ class Simulate_test : public beast::unit_test::suite
         env.close();
 
         {
-            std::function<void(Json::Value const&, Json::Value const&)> const& testSimulation =
-                [&](Json::Value const& resp, Json::Value const& tx) {
+            std::function<void(json::Value const&, json::Value const&)> const& testSimulation =
+                [&](json::Value const& resp, json::Value const& tx) {
                     auto result = resp[jss::result];
                     checkBasicReturnValidity(
                         result, tx, env.seq(env.master), env.current()->fees().base * 2);
@@ -830,18 +830,18 @@ class Simulate_test : public beast::unit_test::suite
                     BEAST_EXPECT(!result.isMember(jss::meta) && !result.isMember(jss::meta_blob));
                 };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
+            tx[sfDomain] = kNEW_DOMAIN;
             // master key is disabled, so this is invalid
             tx[jss::SigningPubKey] = strHex(env.master.pk().slice());
-            tx[sfSigners] = Json::arrayValue;
+            tx[sfSigners] = json::ArrayValue;
             {
-                Json::Value signer;
+                json::Value signer;
                 signer[jss::Account] = becky.human();
-                Json::Value signerOuter;
+                json::Value signerOuter;
                 signerOuter[sfSigner] = signer;
                 tx[sfSigners].append(signerOuter);
             }
@@ -867,7 +867,7 @@ class Simulate_test : public beast::unit_test::suite
 
         using namespace jtx;
         Env env(*this);
-        static auto const newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
         Account const alice("alice");
         Account const becky("becky");
         Account const carol("carol");
@@ -879,7 +879,7 @@ class Simulate_test : public beast::unit_test::suite
         env(signers(alice, 1, {{becky, 1}, {carol, 1}}));
 
         {
-            auto validateOutput = [&](Json::Value const& resp, Json::Value const& tx) {
+            auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
                 auto result = resp[jss::result];
                 checkBasicReturnValidity(
                     result, tx, env.seq(alice), env.current()->fees().base * 2);
@@ -895,17 +895,17 @@ class Simulate_test : public beast::unit_test::suite
                 BEAST_EXPECT(!result.isMember(jss::meta) && !result.isMember(jss::meta_blob));
             };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = alice.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
-            tx[sfSigners] = Json::arrayValue;
+            tx[sfDomain] = kNEW_DOMAIN;
+            tx[sfSigners] = json::ArrayValue;
             {
-                Json::Value signer;
+                json::Value signer;
                 signer[jss::Account] = becky.human();
                 signer[jss::SigningPubKey] = strHex(dylan.pk().slice());
-                Json::Value signerOuter;
+                json::Value signerOuter;
                 signerOuter[sfSigner] = signer;
                 tx[sfSigners].append(signerOuter);
             }
@@ -950,7 +950,7 @@ class Simulate_test : public beast::unit_test::suite
         env.close();
 
         {
-            auto validateOutput = [&](Json::Value const& resp, Json::Value const& tx) {
+            auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
                 auto result = resp[jss::result];
                 checkBasicReturnValidity(result, tx, env.seq(subject), env.current()->fees().base);
 
@@ -960,7 +960,7 @@ class Simulate_test : public beast::unit_test::suite
 
                 if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                 {
-                    Json::Value const metadata = getJsonMetadata(result);
+                    json::Value const metadata = getJsonMetadata(result);
 
                     if (BEAST_EXPECT(metadata.isMember(sfAffectedNodes.jsonName)))
                     {
@@ -996,7 +996,7 @@ class Simulate_test : public beast::unit_test::suite
                 }
             };
 
-            Json::Value tx = credentials::accept(subject, issuer, credType);
+            json::Value tx = credentials::accept(subject, issuer, credType);
 
             // test with autofill
             testTx(env, tx, validateOutput);
@@ -1035,10 +1035,10 @@ class Simulate_test : public beast::unit_test::suite
                     cfg->NETWORK_ID = 1025;
                     return cfg;
                 })};
-        static auto const newDomain = "123ABC";
+        static auto const kNEW_DOMAIN = "123ABC";
 
         {
-            auto validateOutput = [&](Json::Value const& resp, Json::Value const& tx) {
+            auto validateOutput = [&](json::Value const& resp, json::Value const& tx) {
                 auto result = resp[jss::result];
                 checkBasicReturnValidity(result, tx, 1, env.current()->fees().base);
 
@@ -1050,7 +1050,7 @@ class Simulate_test : public beast::unit_test::suite
 
                 if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                 {
-                    Json::Value const metadata = getJsonMetadata(result);
+                    json::Value const metadata = getJsonMetadata(result);
 
                     if (BEAST_EXPECT(metadata.isMember(sfAffectedNodes.jsonName)))
                     {
@@ -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] == newDomain);
+                            BEAST_EXPECT(finalFields[sfDomain] == kNEW_DOMAIN);
                         }
                     }
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
@@ -1069,11 +1069,11 @@ class Simulate_test : public beast::unit_test::suite
                 }
             };
 
-            Json::Value tx;
+            json::Value tx;
 
             tx[jss::Account] = env.master.human();
             tx[jss::TransactionType] = jss::AccountSet;
-            tx[sfDomain] = newDomain;
+            tx[sfDomain] = kNEW_DOMAIN;
 
             // test with autofill
             testTx(env, tx, validateOutput);
@@ -1111,10 +1111,10 @@ class Simulate_test : public beast::unit_test::suite
         env.close(NetClock::time_point{446000000s});
 
         {
-            auto validateOutput = [&](Json::Value const& resp,
-                                      Json::Value const& tx,
-                                      Json::Value const& expectedMetadataKey,
-                                      Json::Value const& expectedMetadataValue) {
+            auto validateOutput = [&](json::Value const& resp,
+                                      json::Value const& tx,
+                                      json::Value const& expectedMetadataKey,
+                                      json::Value const& expectedMetadataValue) {
                 auto result = resp[jss::result];
 
                 BEAST_EXPECT(result[jss::engine_result] == "tesSUCCESS");
@@ -1125,7 +1125,7 @@ class Simulate_test : public beast::unit_test::suite
 
                 if (BEAST_EXPECT(result.isMember(jss::meta) || result.isMember(jss::meta_blob)))
                 {
-                    Json::Value const metadata = getJsonMetadata(result);
+                    json::Value const metadata = getJsonMetadata(result);
 
                     BEAST_EXPECT(metadata[sfTransactionIndex.jsonName] == 0);
                     BEAST_EXPECT(metadata[sfTransactionResult.jsonName] == "tesSUCCESS");
@@ -1135,7 +1135,7 @@ class Simulate_test : public beast::unit_test::suite
             };
 
             {
-                Json::Value tx;
+                json::Value tx;
                 tx[jss::Account] = alice.human();
                 tx[jss::TransactionType] = jss::Payment;
                 tx[sfDestination] = bob.human();
@@ -1146,22 +1146,22 @@ class Simulate_test : public beast::unit_test::suite
             }
 
             {
-                Json::Value tx;
+                json::Value tx;
                 tx[jss::Account] = alice.human();
                 tx[jss::TransactionType] = jss::NFTokenMint;
                 tx[sfNFTokenTaxon] = 1;
 
-                Json::Value const nftokenId = to_string(token::getNextID(env, alice, 1));
+                json::Value const nftokenId = to_string(token::getNextID(env, alice, 1));
                 // test nft synthetic
                 testTxJsonMetadataField(env, tx, validateOutput, jss::nftoken_id, nftokenId);
             }
 
             {
-                Json::Value tx;
+                json::Value tx;
                 tx[jss::Account] = alice.human();
                 tx[jss::TransactionType] = jss::MPTokenIssuanceCreate;
 
-                Json::Value const mptIssuanceId = to_string(makeMptID(env.seq(alice), alice));
+                json::Value const mptIssuanceId = to_string(makeMptID(env.seq(alice), alice));
                 // test mpt issuance id
                 testTxJsonMetadataField(
                     env, tx, validateOutput, jss::mpt_issuance_id, mptIssuanceId);
diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp
index d1a5684262..c4f8544980 100644
--- a/src/test/rpc/Status_test.cpp
+++ b/src/test/rpc/Status_test.cpp
@@ -14,7 +14,7 @@
 
 namespace xrpl::RPC {
 
-class codeString_test : public beast::unit_test::suite
+class codeString_test : public beast::unit_test::Suite
 {
 private:
     template <typename Type>
@@ -25,7 +25,7 @@ private:
     }
 
     void
-    test_OK()
+    testOk()
     {
         testcase("OK");
         {
@@ -34,7 +34,7 @@ private:
         }
 
         {
-            auto s = codeString(Status::OK);
+            auto s = codeString(Status::kOK);
             expect(s.empty(), "String for OK status");
         }
 
@@ -49,13 +49,13 @@ private:
         }
 
         {
-            auto s = codeString(rpcSUCCESS);
+            auto s = codeString(RpcSuccess);
             expect(s.empty(), "String for rpcSUCCESS");
         }
     }
 
     void
-    test_error()
+    testError()
     {
         testcase("error");
         {
@@ -69,7 +69,7 @@ private:
         }
 
         {
-            auto s = codeString(rpcBAD_SYNTAX);
+            auto s = codeString(RpcBadSyntax);
             expect(s == "badSyntax: Syntax error.", s);
         }
     }
@@ -78,17 +78,17 @@ public:
     void
     run() override
     {
-        test_OK();
-        test_error();
+        testOk();
+        testError();
     }
 };
 
 BEAST_DEFINE_TESTSUITE(codeString, rpc, RPC);
 
-class fillJson_test : public beast::unit_test::suite
+class fillJson_test : public beast::unit_test::Suite
 {
 private:
-    Json::Value value_;
+    json::Value value_;
 
     template <typename Type>
     void
@@ -99,7 +99,7 @@ private:
     }
 
     void
-    test_OK()
+    testOk()
     {
         testcase("OK");
         fillJson(Status());
@@ -108,13 +108,13 @@ private:
         fillJson(0);
         expect(!value_, "Value for 0 status");
 
-        fillJson(Status::OK);
+        fillJson(Status::kOK);
         expect(!value_, "Value for OK status");
 
         fillJson(tesSUCCESS);
         expect(!value_, "Value for tesSUCCESS");
 
-        fillJson(rpcSUCCESS);
+        fillJson(RpcSuccess);
         expect(!value_, "Value for rpcSUCCESS");
     }
 
@@ -157,14 +157,14 @@ private:
     }
 
     void
-    test_error()
+    testError()
     {
         testcase("error");
         expectFill("temBAD_AMOUNT", temBAD_AMOUNT, {}, "temBAD_AMOUNT: Malformed: Bad amount.");
 
         expectFill(
-            "rpcBAD_SYNTAX",
-            rpcBAD_SYNTAX,
+            "RpcBadSyntax",
+            RpcBadSyntax,
             {"An error.", "Another error."},
             "badSyntax: Syntax error.");
 
@@ -172,7 +172,7 @@ private:
     }
 
     void
-    test_throw()
+    testThrow()
     {
         testcase("throw");
         try
@@ -196,9 +196,9 @@ public:
     void
     run() override
     {
-        test_OK();
-        test_error();
-        test_throw();
+        testOk();
+        testError();
+        testThrow();
     }
 };
 
diff --git a/src/test/rpc/Submit_test.cpp b/src/test/rpc/Submit_test.cpp
index ea5ef145c4..fe86a6c550 100644
--- a/src/test/rpc/Submit_test.cpp
+++ b/src/test/rpc/Submit_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl::test {
 
-class Submit_test : public beast::unit_test::suite
+class Submit_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -34,7 +34,7 @@ public:
                 JTx const jt = env.jt(pay(alice, bob, XRP(1)));
                 auto const txBlob = strHex(jt.stx->getSerializer().slice());
 
-                Json::Value params;
+                json::Value params;
                 params[jss::tx_blob] = txBlob;
                 params[jss::fail_hard] = param;
                 auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
@@ -44,7 +44,7 @@ public:
 
             // Test with tx_json path (deprecated signing)
             {
-                Json::Value params;
+                json::Value params;
                 params[jss::secret] = toBase58(generateSeed("alice"));
                 params[jss::tx_json] = pay("alice", "bob", XRP(1));
                 params[jss::fail_hard] = param;
@@ -60,15 +60,15 @@ public:
         testInvalidFailHard(1);
         testInvalidFailHard(0);
         testInvalidFailHard(1.5);
-        testInvalidFailHard(Json::Value(Json::objectValue));
-        testInvalidFailHard(Json::Value(Json::arrayValue));
+        testInvalidFailHard(json::Value(json::ObjectValue));
+        testInvalidFailHard(json::Value(json::ArrayValue));
 
         // Valid boolean values should work (not return invalidParams)
         {
             JTx const jt = env.jt(pay(alice, bob, XRP(1)));
             auto const txBlob = strHex(jt.stx->getSerializer().slice());
 
-            Json::Value params;
+            json::Value params;
             params[jss::tx_blob] = txBlob;
             params[jss::fail_hard] = true;
             auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
@@ -78,7 +78,7 @@ public:
             JTx const jt = env.jt(pay(alice, bob, XRP(1)));
             auto const txBlob = strHex(jt.stx->getSerializer().slice());
 
-            Json::Value params;
+            json::Value params;
             params[jss::tx_blob] = txBlob;
             params[jss::fail_hard] = false;
             auto const jrr = env.rpc("json", "submit", to_string(params))[jss::result];
diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp
index 0e43713c2a..78dc7fcf30 100644
--- a/src/test/rpc/Subscribe_test.cpp
+++ b/src/test/rpc/Subscribe_test.cpp
@@ -56,7 +56,7 @@
 
 namespace xrpl::test {
 
-class Subscribe_test : public beast::unit_test::suite
+class Subscribe_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -64,13 +64,13 @@ public:
     {
         using namespace std::chrono_literals;
         using namespace jtx;
-        Env env{*this, single_thread_io(envconfig())};
+        Env env{*this, singleThreadIo(envconfig())};
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream;
+        json::Value stream;
 
         {
             // RPC subscribe to server stream
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("server");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -130,13 +130,13 @@ public:
     {
         using namespace std::chrono_literals;
         using namespace jtx;
-        Env env{*this, single_thread_io(envconfig())};
+        Env env{*this, singleThreadIo(envconfig())};
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream;
+        json::Value stream;
 
         {
             // RPC subscribe to ledger stream
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("ledger");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -184,18 +184,18 @@ public:
     }
 
     void
-    testTransactions_APIv1()
+    testTransactionsAPIv1()
     {
         using namespace std::chrono_literals;
         using namespace jtx;
-        Env env(*this, single_thread_io(envconfig()));
+        Env env(*this, singleThreadIo(envconfig()));
         auto baseFee = env.current()->fees().base.drops();
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream;
+        json::Value stream;
 
         {
             // RPC subscribe to transactions stream
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("transactions");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -267,8 +267,8 @@ public:
 
         {
             // RPC subscribe to accounts stream
-            stream = Json::objectValue;
-            stream[jss::accounts] = Json::arrayValue;
+            stream = json::ObjectValue;
+            stream[jss::accounts] = json::ArrayValue;
             stream[jss::accounts].append(Account("alice").human());
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -314,7 +314,7 @@ public:
     }
 
     void
-    testTransactions_APIv2()
+    testTransactionsAPIv2()
     {
         testcase("transactions API version 2");
 
@@ -322,16 +322,16 @@ public:
         using namespace jtx;
         Env env(*this, envconfig([](std::unique_ptr<Config> cfg) {
             cfg->FEES.reference_fee = 10;
-            cfg = single_thread_io(std::move(cfg));
+            cfg = singleThreadIo(std::move(cfg));
             return cfg;
         }));
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream{Json::objectValue};
+        json::Value stream{json::ObjectValue};
 
         {
             // RPC subscribe to transactions stream
             stream[jss::api_version] = 2;
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("transactions");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -395,13 +395,13 @@ public:
     testManifests()
     {
         using namespace jtx;
-        Env env(*this, single_thread_io(envconfig()));
+        Env env(*this, singleThreadIo(envconfig()));
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream;
+        json::Value stream;
 
         {
             // RPC subscribe to manifests stream
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("manifests");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -429,7 +429,7 @@ public:
     {
         using namespace jtx;
 
-        Env env{*this, single_thread_io(envconfig(validator, "")), features};
+        Env env{*this, singleThreadIo(envconfig(validator, "")), features};
         auto& cfg = env.app().config();
         if (!BEAST_EXPECT(cfg.section(SECTION_VALIDATION_SEED).empty()))
             return;
@@ -440,14 +440,14 @@ public:
         std::string const valPublicKey = toBase58(
             TokenType::NodePublic,
             derivePublicKey(
-                KeyType::secp256k1, generateSecretKey(KeyType::secp256k1, *parsedseed)));
+                KeyType::Secp256k1, generateSecretKey(KeyType::Secp256k1, *parsedseed)));
 
         auto wsc = makeWSClient(env.app().config());
-        Json::Value stream;
+        json::Value stream;
 
         {
             // RPC subscribe to validations stream
-            stream[jss::streams] = Json::arrayValue;
+            stream[jss::streams] = json::ArrayValue;
             stream[jss::streams].append("validations");
             auto jv = wsc->invoke("subscribe", stream);
             if (wsc->version() == 2)
@@ -461,7 +461,7 @@ public:
 
         {
             // Lambda to check ledger validations from the stream.
-            auto validValidationFields = [&env, &valPublicKey](Json::Value const& jv) {
+            auto validValidationFields = [&env, &valPublicKey](json::Value const& jv) {
                 if (jv[jss::type] != "validationReceived")
                     return false;
 
@@ -474,7 +474,7 @@ public:
                 if (jv[jss::ledger_index] != std::to_string(env.closed()->header().seq))
                     return false;
 
-                if (jv[jss::flags] != (vfFullyCanonicalSig | vfFullValidation))
+                if (jv[jss::flags] != (kVF_FULLY_CANONICAL_SIG | kVF_FULL_VALIDATION))
                     return false;
 
                 if (jv[jss::full] != true)
@@ -540,13 +540,13 @@ public:
     {
         using namespace jtx;
         testcase("Subscribe by url");
-        Env env{*this, single_thread_io(envconfig())};
+        Env env{*this, singleThreadIo(envconfig())};
 
-        Json::Value jv;
+        json::Value jv;
         jv[jss::url] = "http://localhost/events";
         jv[jss::url_username] = "admin";
         jv[jss::url_password] = "password";
-        jv[jss::streams] = Json::arrayValue;
+        jv[jss::streams] = json::ArrayValue;
         jv[jss::streams][0u] = "validations";
         auto jr = env.rpc("json", "subscribe", to_string(jv))[jss::result];
         BEAST_EXPECT(jr[jss::status] == "success");
@@ -571,7 +571,7 @@ public:
         auto const method = subscribe ? "subscribe" : "unsubscribe";
         testcase << "Error cases for " << method;
 
-        Env env{*this, single_thread_io(envconfig())};
+        Env env{*this, singleThreadIo(envconfig())};
         auto wsc = makeWSClient(env.app().config());
 
         {
@@ -581,7 +581,7 @@ public:
         }
 
         {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::url] = "not-a-url";
             jv[jss::username] = "admin";
             jv[jss::password] = "password";
@@ -596,7 +596,7 @@ public:
         }
 
         {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::url] = "ftp://scheme.not.supported.tld";
             auto const jr = env.rpc("json", method, to_string(jv))[jss::result];
             if (subscribe)
@@ -607,28 +607,28 @@ public:
         }
 
         {
-            Env env_nonadmin{*this, single_thread_io(no_admin(envconfig()))};
-            Json::Value jv;
+            Env envNonadmin{*this, singleThreadIo(noAdmin(envconfig()))};
+            json::Value jv;
             jv[jss::url] = "no-url";
-            auto const jr = env_nonadmin.rpc("json", method, to_string(jv))[jss::result];
+            auto const jr = envNonadmin.rpc("json", method, to_string(jv))[jss::result];
             BEAST_EXPECT(jr[jss::error] == "noPermission");
             BEAST_EXPECT(jr[jss::error_message] == "You don't have permission for this command.");
         }
 
-        std::initializer_list<Json::Value> const nonArrays{
-            Json::nullValue,
-            Json::intValue,
-            Json::uintValue,
-            Json::realValue,
+        std::initializer_list<json::Value> const nonArrays{
+            json::NullValue,
+            json::IntValue,
+            json::UintValue,
+            json::RealValue,
             "",
-            Json::booleanValue,
-            Json::objectValue};
+            json::BooleanValue,
+            json::ObjectValue};
 
         for (auto const& f : {jss::accounts_proposed, jss::accounts})
         {
             for (auto const& nonArray : nonArrays)
             {
-                Json::Value jv;
+                json::Value jv;
                 jv[f] = nonArray;
                 auto const jr = wsc->invoke(method, jv)[jss::result];
                 BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -636,8 +636,8 @@ public:
             }
 
             {
-                Json::Value jv;
-                jv[f] = Json::arrayValue;
+                json::Value jv;
+                jv[f] = json::ArrayValue;
                 auto const jr = wsc->invoke(method, jv)[jss::result];
                 BEAST_EXPECT(jr[jss::error] == "actMalformed");
                 BEAST_EXPECT(jr[jss::error_message] == "Account malformed.");
@@ -646,7 +646,7 @@ public:
 
         for (auto const& nonArray : nonArrays)
         {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::books] = nonArray;
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -654,8 +654,8 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
             jv[jss::books][0u] = 1;
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -663,22 +663,23 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_gets] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_pays] = json::ObjectValue;
             auto const jr = wsc->invoke(method, jv)[jss::result];
+
             BEAST_EXPECT(jr[jss::error] == "srcCurMalformed");
             BEAST_EXPECT(jr[jss::error_message] == "Source currency is malformed.");
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_gets] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_pays] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "ZZZZ";
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "srcCurMalformed");
@@ -686,11 +687,11 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_gets] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_pays] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_pays][jss::issuer] = 1;
             auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -699,11 +700,11 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
-            jv[jss::books][0u][jss::taker_pays] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_gets] = json::ObjectValue;
+            jv[jss::books][0u][jss::taker_pays] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_pays][jss::issuer] = Account{"gateway"}.human() + "DEAD";
             auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -712,26 +713,25 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
-            jv[jss::books][0u][jss::taker_gets] = Json::objectValue;
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
+            jv[jss::books][0u][jss::taker_gets] = json::ObjectValue;
             auto const jr = wsc->invoke(method, jv)[jss::result];
-            // NOTE: this error is slightly incongruous with the
-            // equivalent source currency error
+            // NOTE: this error is slightly incongruous with the equivalent source currency error
             BEAST_EXPECT(jr[jss::error] == "dstAmtMalformed");
             BEAST_EXPECT(
                 jr[jss::error_message] == "Destination amount/currency/issuer is malformed.");
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "ZZZZ";
             auto const jr = wsc->invoke(method, jv)[jss::result];
             // NOTE: this error is slightly incongruous with the
@@ -742,11 +742,11 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_gets][jss::issuer] = 1;
             auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -755,11 +755,11 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
             jv[jss::books][0u][jss::taker_gets][jss::currency] = "USD";
             jv[jss::books][0u][jss::taker_gets][jss::issuer] = Account{"gateway"}.human() + "DEAD";
             auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -768,13 +768,13 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::books] = Json::arrayValue;
-            jv[jss::books][0u] = Json::objectValue;
+            json::Value jv;
+            jv[jss::books] = json::ArrayValue;
+            jv[jss::books][0u] = json::ObjectValue;
             jv[jss::books][0u][jss::taker_pays] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
             jv[jss::books][0u][jss::taker_gets] =
-                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "badMarket");
             BEAST_EXPECT(jr[jss::error_message] == "No such market.");
@@ -782,7 +782,7 @@ public:
 
         for (auto const& nonArray : nonArrays)
         {
-            Json::Value jv;
+            json::Value jv;
             jv[jss::streams] = nonArray;
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "invalidParams");
@@ -790,8 +790,8 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::streams] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::streams] = json::ArrayValue;
             jv[jss::streams][0u] = 1;
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "malformedStream");
@@ -799,8 +799,8 @@ public:
         }
 
         {
-            Json::Value jv;
-            jv[jss::streams] = Json::arrayValue;
+            json::Value jv;
+            jv[jss::streams] = json::ArrayValue;
             jv[jss::streams][0u] = "not_a_stream";
             auto const jr = wsc->invoke(method, jv)[jss::result];
             BEAST_EXPECT(jr[jss::error] == "malformedStream");
@@ -811,11 +811,11 @@ public:
         {
             // invalid taker - not a string
             {
-                Json::Value jv;
-                jv[jss::books] = Json::arrayValue;
-                jv[jss::books][0u] = Json::objectValue;
+                json::Value jv;
+                jv[jss::books] = json::ArrayValue;
+                jv[jss::books][0u] = json::ObjectValue;
                 jv[jss::books][0u][jss::taker_pays] =
-                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
                 jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
                 jv[jss::books][0u][jss::taker] = 1;
                 auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -825,11 +825,11 @@ public:
 
             // invalid taker - malformed account string
             {
-                Json::Value jv;
-                jv[jss::books] = Json::arrayValue;
-                jv[jss::books][0u] = Json::objectValue;
+                json::Value jv;
+                jv[jss::books] = json::ArrayValue;
+                jv[jss::books][0u] = json::ObjectValue;
                 jv[jss::books][0u][jss::taker_pays] =
-                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
                 jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
                 jv[jss::books][0u][jss::taker] = "not_an_account";
                 auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -839,11 +839,11 @@ public:
 
             // invalid taker - account string with extra characters
             {
-                Json::Value jv;
-                jv[jss::books] = Json::arrayValue;
-                jv[jss::books][0u] = Json::objectValue;
+                json::Value jv;
+                jv[jss::books] = json::ArrayValue;
+                jv[jss::books][0u] = json::ObjectValue;
                 jv[jss::books][0u][jss::taker_pays] =
-                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::include_date);
+                    Account{"gateway"}["USD"](1).value().getJson(JsonOptions::KIncludeDate);
                 jv[jss::books][0u][jss::taker_gets][jss::currency] = "XRP";
                 jv[jss::books][0u][jss::taker] = Account{"alice"}.human() + "DEAD";
                 auto const jr = wsc->invoke(method, jv)[jss::result];
@@ -871,7 +871,7 @@ public:
         /*
          * return true if the subscribe or unsubscribe result is a success
          */
-        auto goodSubRPC = [](Json::Value const& subReply) -> bool {
+        auto goodSubRPC = [](json::Value const& subReply) -> bool {
             return subReply.isMember(jss::result) && subReply[jss::result].isMember(jss::status) &&
                 subReply[jss::result][jss::status] == jss::success;
         };
@@ -886,7 +886,7 @@ public:
                             int numReplies,
                             std::chrono::milliseconds timeout =
                                 std::chrono::milliseconds{5000}) -> std::pair<bool, bool> {
-            bool first_flag = false;
+            bool firstFlag = false;
 
             for (int i = 0; i < numReplies; ++i)
             {
@@ -898,20 +898,20 @@ public:
                     if (r.isMember(jss::account_history_tx_index))
                         idx = r[jss::account_history_tx_index].asInt();
                     if (r.isMember(jss::account_history_tx_first))
-                        first_flag = true;
+                        firstFlag = true;
                     bool const boundary = r.isMember(jss::account_history_boundary);
-                    int const ledger_idx = r[jss::ledger_index].asInt();
+                    int const ledgerIdx = r[jss::ledger_index].asInt();
                     if (r.isMember(jss::transaction) && r[jss::transaction].isMember(jss::hash))
                     {
                         auto t{r[jss::transaction]};
-                        v.emplace_back(idx, t[jss::hash].asString(), boundary, ledger_idx);
+                        v.emplace_back(idx, t[jss::hash].asString(), boundary, ledgerIdx);
                         continue;
                     }
                 }
-                return {false, first_flag};
+                return {false, firstFlag};
             }
 
-            return {true, first_flag};
+            return {true, firstFlag};
         };
 
         /*
@@ -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::autofill),
-                    jtx::fee(jtx::autofill),
-                    jtx::sig(jtx::autofill));
+                    jtx::Seq(jtx::kAUTOFILL),
+                    jtx::Fee(jtx::kAUTOFILL),
+                    jtx::Sig(jtx::kAUTOFILL));
             }
             for (int i = 0; i < ledgersToClose; ++i)
                 BEAST_EXPECT(env.syncClose());
@@ -1011,11 +1011,11 @@ public:
         // (-10, "E5B8B...", true, 4
 
         auto checkBoundary = [](IdxHashVec const& vec, bool /* forward */) {
-            size_t const num_tx = vec.size();
-            for (size_t i = 0; i < num_tx; ++i)
+            size_t const numTx = vec.size();
+            for (size_t i = 0; i < numTx; ++i)
             {
                 auto [idx, hash, boundary, ledger] = vec[i];
-                if ((i + 1 == num_tx || ledger != std::get<3>(vec[i + 1])) != boundary)
+                if ((i + 1 == numTx || ledger != std::get<3>(vec[i + 1])) != boundary)
                     return false;
             }
             return true;
@@ -1030,10 +1030,10 @@ public:
              *
              * also test subscribe to the account before it is created
              */
-            Env env(*this, single_thread_io(envconfig()));
+            Env env(*this, singleThreadIo(envconfig()));
             auto wscTxHistory = makeWSClient(env.app().config());
-            Json::Value request;
-            request[jss::account_history_tx_stream] = Json::objectValue;
+            json::Value request;
+            request[jss::account_history_tx_stream] = json::ObjectValue;
             request[jss::account_history_tx_stream][jss::account] = alice.human();
             auto jv = wscTxHistory->invoke("subscribe", request);
             if (!BEAST_EXPECT(goodSubRPC(jv)))
@@ -1073,10 +1073,10 @@ public:
              * subscribe genesis account tx history without txns
              * subscribe to bob's account after it is created
              */
-            Env env(*this, single_thread_io(envconfig()));
+            Env env(*this, singleThreadIo(envconfig()));
             auto wscTxHistory = makeWSClient(env.app().config());
-            Json::Value request;
-            request[jss::account_history_tx_stream] = Json::objectValue;
+            json::Value request;
+            request[jss::account_history_tx_stream] = json::ObjectValue;
             request[jss::account_history_tx_stream][jss::account] =
                 "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
             auto jv = wscTxHistory->invoke("subscribe", request);
@@ -1150,7 +1150,7 @@ public:
              * subscribe account and subscribe account tx history
              * and compare txns streamed
              */
-            Env env(*this, single_thread_io(envconfig()));
+            Env env(*this, singleThreadIo(envconfig()));
             auto wscAccount = makeWSClient(env.app().config());
             auto wscTxHistory = makeWSClient(env.app().config());
 
@@ -1159,8 +1159,8 @@ public:
             BEAST_EXPECT(env.syncClose());
 
             // subscribe account
-            Json::Value stream = Json::objectValue;
-            stream[jss::accounts] = Json::arrayValue;
+            json::Value stream = json::ObjectValue;
+            stream[jss::accounts] = json::ArrayValue;
             stream[jss::accounts].append(alice.human());
             auto jv = wscAccount->invoke("subscribe", stream);
 
@@ -1171,8 +1171,8 @@ public:
                 return;
 
             // subscribe account tx history
-            Json::Value request;
-            request[jss::account_history_tx_stream] = Json::objectValue;
+            json::Value request;
+            request[jss::account_history_tx_stream] = json::ObjectValue;
             request[jss::account_history_tx_stream][jss::account] = alice.human();
             jv = wscTxHistory->invoke("subscribe", request);
 
@@ -1219,24 +1219,24 @@ public:
              * alice issues USD to carol
              * mix USD and XRP payments
              */
-            Env env(*this, single_thread_io(envconfig()));
-            auto const USD_a = alice["USD"];
+            Env env(*this, singleThreadIo(envconfig()));
+            auto const usdA = alice["USD"];
 
             std::array<Account, 2> const accounts = {alice, carol};
             env.fund(XRP(333333), accounts);
-            env.trust(USD_a(20000), carol);
+            env.trust(usdA(20000), carol);
             BEAST_EXPECT(env.syncClose());
 
             auto mixedPayments = [&]() -> int {
                 sendPayments(env, alice, carol, 1, 0);
-                env(pay(alice, carol, USD_a(100)));
+                env(pay(alice, carol, usdA(100)));
                 BEAST_EXPECT(env.syncClose());
                 return 2;
             };
 
             // subscribe
-            Json::Value request;
-            request[jss::account_history_tx_stream] = Json::objectValue;
+            json::Value request;
+            request[jss::account_history_tx_stream] = json::ObjectValue;
             request[jss::account_history_tx_stream][jss::account] = carol.human();
             auto ws = makeWSClient(env.app().config());
             auto jv = ws->invoke("subscribe", request);
@@ -1258,7 +1258,7 @@ public:
             /*
              * long transaction history
              */
-            Env env(*this, single_thread_io(envconfig()));
+            Env env(*this, singleThreadIo(envconfig()));
             std::array<Account, 2> const accounts = {alice, carol};
             env.fund(XRP(444444), accounts);
             BEAST_EXPECT(env.syncClose());
@@ -1269,8 +1269,8 @@ public:
             };
 
             // subscribe
-            Json::Value request;
-            request[jss::account_history_tx_stream] = Json::objectValue;
+            json::Value request;
+            request[jss::account_history_tx_stream] = json::ObjectValue;
             request[jss::account_history_tx_stream][jss::account] = carol.human();
             auto wscLong = makeWSClient(env.app().config());
             auto jv = wscLong->invoke("subscribe", request);
@@ -1309,31 +1309,31 @@ public:
         using namespace jtx;
         using namespace std::chrono_literals;
         FeatureBitset const all{
-            jtx::testable_amendments() | featurePermissionedDomains | featureCredentials |
+            jtx::testableAmendments() | featurePermissionedDomains | featureCredentials |
             featurePermissionedDEX};
 
-        Env env(*this, single_thread_io(envconfig()), all);
+        Env env(*this, singleThreadIo(envconfig()), all);
         PermissionedDEX const permDex(env);
         auto const alice = permDex.alice;
         auto const bob = permDex.bob;
         auto const carol = permDex.carol;
         auto const domainID = permDex.domainID;
         auto const gw = permDex.gw;
-        auto const USD = permDex.USD;
+        auto const usd = permDex.USD;
 
         auto wsc = makeWSClient(env.app().config());
 
-        Json::Value streams;
-        streams[jss::streams] = Json::arrayValue;
+        json::Value streams;
+        streams[jss::streams] = json::ArrayValue;
         streams[jss::streams][0u] = "book_changes";
 
         auto jv = wsc->invoke("subscribe", streams);
         if (!BEAST_EXPECT(jv[jss::status] == "success"))
             return;
-        env(offer(alice, XRP(10), USD(10)), domain(domainID), txflags(tfHybrid));
+        env(offer(alice, XRP(10), usd(10)), Domain(domainID), Txflags(tfHybrid));
         BEAST_EXPECT(env.syncClose());
 
-        env(pay(bob, carol, USD(5)), path(~USD), sendmax(XRP(5)), domain(domainID));
+        env(pay(bob, carol, usd(5)), Path(~usd), Sendmax(XRP(5)), Domain(domainID));
         BEAST_EXPECT(env.syncClose());
 
         BEAST_EXPECT(wsc->findMsg(5s, [&](auto const& jv) {
@@ -1374,13 +1374,13 @@ public:
         Account const bob{"bob"};
         Account const broker{"broker"};
 
-        Env env{*this, single_thread_io(envconfig()), features};
+        Env env{*this, singleThreadIo(envconfig()), features};
         env.fund(XRP(10000), alice, bob, broker);
         BEAST_EXPECT(env.syncClose());
 
         auto wsc = test::makeWSClient(env.app().config());
-        Json::Value stream;
-        stream[jss::streams] = Json::arrayValue;
+        json::Value stream;
+        stream[jss::streams] = json::ArrayValue;
         stream[jss::streams].append("transactions");
         auto jv = wsc->invoke("subscribe", stream);
 
@@ -1404,7 +1404,7 @@ public:
                     jv[jss::meta][jss::nftoken_ids].begin(),
                     jv[jss::meta][jss::nftoken_ids].end(),
                     std::back_inserter(metaIDs),
-                    [this](Json::Value id) {
+                    [this](json::Value id) {
                         uint256 nftID;
                         BEAST_EXPECT(nftID.parseHex(id.asString()));
                         return nftID;
@@ -1439,12 +1439,12 @@ public:
             // Alice mints 2 NFTs
             // Verify the NFTokenIDs are correct in the NFTokenMint tx meta
             uint256 const nftId1{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenID(nftId1);
 
             uint256 const nftId2{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenID(nftId2);
 
@@ -1452,12 +1452,12 @@ public:
             // Verify the offer indexes are correct in the NFTokenCreateOffer tx
             // meta
             uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId1, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId1, drops(1)), Txflags(tfSellNFToken));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(aliceOfferIndex1);
 
             uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId2, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId2, drops(1)), Txflags(tfSellNFToken));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(aliceOfferIndex2);
 
@@ -1471,7 +1471,7 @@ public:
             // Bobs creates a buy offer for nftId1
             // Verify the offer id is correct in the NFTokenCreateOffer tx meta
             auto const bobBuyOfferIndex = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId1, drops(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId1, drops(1)), token::Owner(alice));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(bobBuyOfferIndex);
 
@@ -1486,21 +1486,21 @@ public:
         {
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenID(nftId);
 
             // Alice creates sell offer and set broker as destination
             uint256 const offerAliceToBroker = keylet::nftoffer(alice, env.seq(alice)).key;
             env(token::createOffer(alice, nftId, drops(1)),
-                token::destination(broker),
-                txflags(tfSellNFToken));
+                token::Destination(broker),
+                Txflags(tfSellNFToken));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(offerAliceToBroker);
 
             // Bob creates buy offer
             uint256 const offerBobToBroker = keylet::nftoffer(bob, env.seq(bob)).key;
-            env(token::createOffer(bob, nftId, drops(1)), token::owner(alice));
+            env(token::createOffer(bob, nftId, drops(1)), token::Owner(alice));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(offerBobToBroker);
 
@@ -1515,18 +1515,18 @@ public:
         {
             // Alice mints a NFT
             uint256 const nftId{token::getNextID(env, alice, 0u, tfTransferable)};
-            env(token::mint(alice, 0u), txflags(tfTransferable));
+            env(token::mint(alice, 0u), Txflags(tfTransferable));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenID(nftId);
 
             // Alice creates 2 sell offers for the same NFT
             uint256 const aliceOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId, drops(1)), Txflags(tfSellNFToken));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(aliceOfferIndex1);
 
             uint256 const aliceOfferIndex2 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::createOffer(alice, nftId, drops(1)), txflags(tfSellNFToken));
+            env(token::createOffer(alice, nftId, drops(1)), Txflags(tfSellNFToken));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(aliceOfferIndex2);
 
@@ -1540,7 +1540,7 @@ public:
         if (features[featureNFTokenMintOffer])
         {
             uint256 const aliceMintWithOfferIndex1 = keylet::nftoffer(alice, env.seq(alice)).key;
-            env(token::mint(alice), token::amount(XRP(0)));
+            env(token::mint(alice), token::Amount(XRP(0)));
             BEAST_EXPECT(env.syncClose());
             verifyNFTokenOfferID(aliceMintWithOfferIndex1);
         }
@@ -1550,13 +1550,13 @@ public:
     run() override
     {
         using namespace test::jtx;
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         FeatureBitset const xrpFees{featureXRPFees};
 
         testServer();
         testLedger();
-        testTransactions_APIv1();
-        testTransactions_APIv2();
+        testTransactionsAPIv1();
+        testTransactionsAPIv2();
         testManifests();
         testValidations(all - xrpFees);
         testValidations(all);
diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp
index 1940194937..ff0897f59a 100644
--- a/src/test/rpc/TransactionEntry_test.cpp
+++ b/src/test/rpc/TransactionEntry_test.cpp
@@ -24,7 +24,7 @@
 
 namespace xrpl {
 
-class TransactionEntry_test : public beast::unit_test::suite
+class TransactionEntry_test : public beast::unit_test::Suite
 {
     void
     testBadInput()
@@ -44,7 +44,7 @@ class TransactionEntry_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::ledger] = 20;
             auto const result = env.client().invoke("transaction_entry", params)[jss::result];
             BEAST_EXPECT(result[jss::error] == "lgrNotFound");
@@ -52,7 +52,7 @@ class TransactionEntry_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::ledger] = "current";
             params[jss::tx_hash] = "DEADBEEF";
             auto const result = env.client().invoke("transaction_entry", params)[jss::result];
@@ -61,7 +61,7 @@ class TransactionEntry_test : public beast::unit_test::suite
         }
 
         {
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::ledger] = "closed";
             params[jss::tx_hash] = "DEADBEEF";
             auto const result = env.client().invoke("transaction_entry", params)[jss::result];
@@ -76,7 +76,7 @@ class TransactionEntry_test : public beast::unit_test::suite
         // Command line format
         {
             // No arguments
-            Json::Value const result{env.rpc("transaction_entry")};
+            json::Value const result{env.rpc("transaction_entry")};
             BEAST_EXPECT(result[jss::ledger_hash].asString().empty());
             BEAST_EXPECT(result[jss::error] == "badSyntax");
             BEAST_EXPECT(result[jss::status] == "error");
@@ -84,49 +84,49 @@ class TransactionEntry_test : public beast::unit_test::suite
 
         {
             // One argument
-            Json::Value const result{env.rpc("transaction_entry", txHash)};
+            json::Value const result{env.rpc("transaction_entry", txHash)};
             BEAST_EXPECT(result[jss::error] == "badSyntax");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // First argument with too few characters
-            Json::Value const result{env.rpc("transaction_entry", txHash.substr(1), "closed")};
+            json::Value const result{env.rpc("transaction_entry", txHash.substr(1), "closed")};
             BEAST_EXPECT(result[jss::error] == "invalidParams");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // First argument with too many characters
-            Json::Value const result{env.rpc("transaction_entry", txHash + "A", "closed")};
+            json::Value const result{env.rpc("transaction_entry", txHash + "A", "closed")};
             BEAST_EXPECT(result[jss::error] == "invalidParams");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // Second argument not valid
-            Json::Value const result{env.rpc("transaction_entry", txHash, "closer")};
+            json::Value const result{env.rpc("transaction_entry", txHash, "closer")};
             BEAST_EXPECT(result[jss::error] == "invalidParams");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // Ledger index of 0 is not valid
-            Json::Value const result{env.rpc("transaction_entry", txHash, "0")};
+            json::Value const result{env.rpc("transaction_entry", txHash, "0")};
             BEAST_EXPECT(result[jss::error] == "invalidParams");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // Three arguments
-            Json::Value const result{env.rpc("transaction_entry", txHash, "closed", "extra")};
+            json::Value const result{env.rpc("transaction_entry", txHash, "closed", "extra")};
             BEAST_EXPECT(result[jss::error] == "badSyntax");
             BEAST_EXPECT(result[jss::status] == "error");
         }
 
         {
             // Valid structure, but transaction not found.
-            Json::Value const result{env.rpc("transaction_entry", txHash, "closed")};
+            json::Value const result{env.rpc("transaction_entry", txHash, "closed")};
             BEAST_EXPECT(!result[jss::result][jss::ledger_hash].asString().empty());
             BEAST_EXPECT(result[jss::result][jss::error] == "transactionNotFound");
             BEAST_EXPECT(result[jss::result][jss::status] == "error");
@@ -143,15 +143,15 @@ class TransactionEntry_test : public beast::unit_test::suite
                     return cfg;
                 })};
 
-        auto check_tx = [this, &env, apiVersion](
-                            int index,
-                            std::string const txhash,
-                            std::string const expected_json = "",
-                            std::string const expected_ledger_hash = "",
-                            std::string const close_time_iso = "") {
+        auto checkTx = [this, &env, apiVersion](
+                           int index,
+                           std::string const txhash,
+                           std::string const expectedJson = "",
+                           std::string const expectedLedgerHash = "",
+                           std::string const closeTimeIso = "") {
             // first request using ledger_index to lookup
-            Json::Value const resIndex{[&env, index, &txhash, apiVersion]() {
-                Json::Value params{Json::objectValue};
+            json::Value const resIndex{[&env, index, &txhash, apiVersion]() {
+                json::Value params{json::ObjectValue};
                 params[jss::ledger_index] = index;
                 params[jss::tx_hash] = txhash;
                 params[jss::api_version] = apiVersion;
@@ -163,15 +163,15 @@ class TransactionEntry_test : public beast::unit_test::suite
 
             BEAST_EXPECT(resIndex[jss::validated] == true);
             BEAST_EXPECT(resIndex[jss::ledger_index] == index);
-            BEAST_EXPECT(resIndex[jss::ledger_hash] == expected_ledger_hash);
+            BEAST_EXPECT(resIndex[jss::ledger_hash] == expectedLedgerHash);
             if (apiVersion > 1)
             {
                 BEAST_EXPECT(resIndex[jss::hash] == txhash);
                 BEAST_EXPECT(!resIndex[jss::tx_json].isMember(jss::hash));
                 BEAST_EXPECT(!resIndex[jss::tx_json].isMember(jss::Amount));
 
-                if (BEAST_EXPECT(!close_time_iso.empty()))
-                    BEAST_EXPECT(resIndex[jss::close_time_iso] == close_time_iso);
+                if (BEAST_EXPECT(!closeTimeIso.empty()))
+                    BEAST_EXPECT(resIndex[jss::close_time_iso] == closeTimeIso);
             }
             else
             {
@@ -180,11 +180,11 @@ class TransactionEntry_test : public beast::unit_test::suite
                 BEAST_EXPECT(!resIndex.isMember(jss::close_time_iso));
             }
 
-            if (!expected_json.empty())
+            if (!expectedJson.empty())
             {
-                Json::Value expected;
-                Json::Reader().parse(expected_json, expected);
-                if (RPC::contains_error(expected))
+                json::Value expected;
+                json::Reader().parse(expectedJson, expected);
+                if (RPC::containsError(expected))
                     Throw<std::runtime_error>("Internal JSONRPC_test error.  Bad test JSON.");
 
                 for (auto memberIt = expected.begin(); memberIt != expected.end(); memberIt++)
@@ -206,46 +206,44 @@ class TransactionEntry_test : public beast::unit_test::suite
             // second request using ledger_hash to lookup and verify
             // both responses match
             {
-                Json::Value params{Json::objectValue};
+                json::Value params{json::ObjectValue};
                 params[jss::ledger_hash] = resIndex[jss::ledger_hash];
                 params[jss::tx_hash] = txhash;
                 params[jss::api_version] = apiVersion;
-                Json::Value const resHash =
+                json::Value const resHash =
                     env.client().invoke("transaction_entry", params)[jss::result];
                 BEAST_EXPECT(resHash == resIndex);
             }
 
             // Use the command line form with the index.
-            Json::Value const clIndex{
+            json::Value const clIndex{
                 env.rpc(apiVersion, "transaction_entry", txhash, std::to_string(index))};
             BEAST_EXPECT(clIndex["result"] == resIndex);
 
             // Use the command line form with the ledger_hash.
-            Json::Value const clHash{env.rpc(
+            json::Value const clHash{env.rpc(
                 apiVersion, "transaction_entry", txhash, resIndex[jss::ledger_hash].asString())};
             BEAST_EXPECT(clHash["result"] == resIndex);
         };
 
-        Account const A1{"A1"};
-        Account const A2{"A2"};
+        Account const a1{"A1"};
+        Account const a2{"A2"};
 
-        env.fund(XRP(10000), A1);
-        auto fund_1_tx = to_string(env.tx()->getTransactionID());
-        BEAST_EXPECT(
-            fund_1_tx == "F4E9DF90D829A9E8B423FF68C34413E240D8D8BB0EFD080DF08114ED398E2506");
+        env.fund(XRP(10000), a1);
+        auto fund1Tx = to_string(env.tx()->getTransactionID());
+        BEAST_EXPECT(fund1Tx == "F4E9DF90D829A9E8B423FF68C34413E240D8D8BB0EFD080DF08114ED398E2506");
 
-        env.fund(XRP(10000), A2);
-        auto fund_2_tx = to_string(env.tx()->getTransactionID());
-        BEAST_EXPECT(
-            fund_2_tx == "6853CD8226A05068C951CB1F54889FF4E40C5B440DC1C5BA38F114C4E0B1E705");
+        env.fund(XRP(10000), a2);
+        auto fund2Tx = to_string(env.tx()->getTransactionID());
+        BEAST_EXPECT(fund2Tx == "6853CD8226A05068C951CB1F54889FF4E40C5B440DC1C5BA38F114C4E0B1E705");
 
         env.close();
 
         // these are actually AccountSet txs because fund does two txs and
         // env.tx only reports the last one
-        check_tx(
+        checkTx(
             env.closed()->seq(),
-            fund_1_tx,
+            fund1Tx,
             R"({
             "Account" : "r4nmQNH4Fhjfh6cHDbvVSsBv7KySbj4cBf",
             "Fee" : "10",
@@ -257,9 +255,9 @@ class TransactionEntry_test : public beast::unit_test::suite
 })",
             "ADB727BCC74B29421BB01B847740B179B8A0ED3248D76A89ED2E39B02C427784",
             "2000-01-01T00:00:10Z");
-        check_tx(
+        checkTx(
             env.closed()->seq(),
-            fund_2_tx,
+            fund2Tx,
             R"({
             "Account" : "rGpeQzUWFu4fMhJHZ1Via5aqFC3A5twZUD",
             "Fee" : "10",
@@ -272,22 +270,21 @@ class TransactionEntry_test : public beast::unit_test::suite
             "ADB727BCC74B29421BB01B847740B179B8A0ED3248D76A89ED2E39B02C427784",
             "2000-01-01T00:00:10Z");
 
-        env.trust(A2["USD"](1000), A1);
+        env.trust(a2["USD"](1000), a1);
         // the trust tx is actually a payment since the trust method
         // refunds fees with a payment after TrustSet..so just ignore the type
         // in the check below
-        auto trust_tx = to_string(env.tx()->getTransactionID());
-        BEAST_EXPECT(
-            trust_tx == "C992D97D88FF444A1AB0C06B27557EC54B7F7DA28254778E60238BEA88E0C101");
+        auto trustTx = to_string(env.tx()->getTransactionID());
+        BEAST_EXPECT(trustTx == "C992D97D88FF444A1AB0C06B27557EC54B7F7DA28254778E60238BEA88E0C101");
 
-        env(pay(A2, A1, A2["USD"](5)));
-        auto pay_tx = to_string(env.tx()->getTransactionID());
+        env(pay(a2, a1, a2["USD"](5)));
+        auto payTx = to_string(env.tx()->getTransactionID());
         env.close();
-        BEAST_EXPECT(pay_tx == "988046D484ACE9F5F6A8C792D89C6EA2DB307B5DDA9864AEBA88E6782ABD0865");
+        BEAST_EXPECT(payTx == "988046D484ACE9F5F6A8C792D89C6EA2DB307B5DDA9864AEBA88E6782ABD0865");
 
-        check_tx(
+        checkTx(
             env.closed()->seq(),
-            trust_tx,
+            trustTx,
             R"({
             "Account" : "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh",
             "DeliverMax" : "10",
@@ -302,9 +299,9 @@ class TransactionEntry_test : public beast::unit_test::suite
             "3A6E375BFDFF029A571AFBB3BC46C4F52963FAF043B406D0E59A7194C1A8F98E",
             "2000-01-01T00:00:20Z");
 
-        check_tx(
+        checkTx(
             env.closed()->seq(),
-            pay_tx,
+            payTx,
             R"({
             "Account" : "rGpeQzUWFu4fMhJHZ1Via5aqFC3A5twZUD",
             "DeliverMax" :
@@ -324,15 +321,14 @@ class TransactionEntry_test : public beast::unit_test::suite
             "3A6E375BFDFF029A571AFBB3BC46C4F52963FAF043B406D0E59A7194C1A8F98E",
             "2000-01-01T00:00:20Z");
 
-        env(offer(A2, XRP(100), A2["USD"](1)));
-        auto offer_tx = to_string(env.tx()->getTransactionID());
-        BEAST_EXPECT(
-            offer_tx == "5FCC1A27A7664F82A0CC4BE5766FBBB7C560D52B93AA7B550CD33B27AEC7EFFB");
+        env(offer(a2, XRP(100), a2["USD"](1)));
+        auto offerTx = to_string(env.tx()->getTransactionID());
+        BEAST_EXPECT(offerTx == "5FCC1A27A7664F82A0CC4BE5766FBBB7C560D52B93AA7B550CD33B27AEC7EFFB");
 
         env.close();
-        check_tx(
+        checkTx(
             env.closed()->seq(),
-            offer_tx,
+            offerTx,
             R"({
             "Account" : "rGpeQzUWFu4fMhJHZ1Via5aqFC3A5twZUD",
             "Fee" : "10",
diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp
index bc6d2910d9..8adf28fc9b 100644
--- a/src/test/rpc/TransactionHistory_test.cpp
+++ b/src/test/rpc/TransactionHistory_test.cpp
@@ -18,14 +18,14 @@
 
 namespace xrpl {
 
-class TransactionHistory_test : public beast::unit_test::suite
+class TransactionHistory_test : public beast::unit_test::Suite
 {
     void
     testBadInput()
     {
         testcase("Invalid request params");
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
         {
             // no params
@@ -36,7 +36,7 @@ class TransactionHistory_test : public beast::unit_test::suite
 
         {
             // test at 1 greater than the allowed non-admin limit
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::start] = 10001;  // limited to <= 10000 for non admin
             auto const result = env.client().invoke("tx_history", params)[jss::result];
             BEAST_EXPECT(result[jss::error] == "noPermission");
@@ -49,9 +49,9 @@ class TransactionHistory_test : public beast::unit_test::suite
     {
         testcase("Command retired from API v2");
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
+        Env env{*this, envconfig(noAdmin)};
 
-        Json::Value params{Json::objectValue};
+        json::Value params{json::ObjectValue};
         params[jss::api_version] = 2;
         auto const result = env.client().invoke("tx_history", params)[jss::result];
         BEAST_EXPECT(result[jss::error] == "unknownCmd");
@@ -86,7 +86,7 @@ class TransactionHistory_test : public beast::unit_test::suite
 
             // verify the latest transaction in env (offer)
             // is available in tx_history.
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::start] = 0;
             auto result = env.client().invoke("tx_history", params)[jss::result];
             if (!BEAST_EXPECT(result[jss::txs].isArray() && result[jss::txs].size() > 0))
@@ -94,7 +94,7 @@ class TransactionHistory_test : public beast::unit_test::suite
 
             // search for a tx in history matching the last offer
             bool const txFound = [&] {
-                auto const toFind = env.tx()->getJson(JsonOptions::none);
+                auto const toFind = env.tx()->getJson(JsonOptions::KNone);
                 for (auto tx : result[jss::txs])
                 {
                     tx.removeMember(jss::inLedger);
@@ -113,7 +113,7 @@ class TransactionHistory_test : public beast::unit_test::suite
         std::unordered_map<std::string, unsigned> typeCounts;
         while (start < 120)
         {
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::start] = start;
             auto result = env.client().invoke("tx_history", params)[jss::result];
             if (!BEAST_EXPECT(result[jss::txs].isArray() && result[jss::txs].size() > 0))
@@ -126,14 +126,14 @@ class TransactionHistory_test : public beast::unit_test::suite
             }
         }
         BEAST_EXPECT(total == 117);
-        BEAST_EXPECT(typeCounts[jss::AccountSet.c_str()] == 20);
-        BEAST_EXPECT(typeCounts[jss::TrustSet.c_str()] == 19);
-        BEAST_EXPECT(typeCounts[jss::Payment.c_str()] == 58);
-        BEAST_EXPECT(typeCounts[jss::OfferCreate.c_str()] == 20);
+        BEAST_EXPECT(typeCounts[jss::AccountSet.cStr()] == 20);
+        BEAST_EXPECT(typeCounts[jss::TrustSet.cStr()] == 19);
+        BEAST_EXPECT(typeCounts[jss::Payment.cStr()] == 58);
+        BEAST_EXPECT(typeCounts[jss::OfferCreate.cStr()] == 20);
 
         // also, try a request with max non-admin start value
         {
-            Json::Value params{Json::objectValue};
+            json::Value params{json::ObjectValue};
             params[jss::start] = 10000;  // limited to <= 10000 for non admin
             auto const result = env.client().invoke("tx_history", params)[jss::result];
             BEAST_EXPECT(result[jss::status] == "success");
diff --git a/src/test/rpc/Transaction_test.cpp b/src/test/rpc/Transaction_test.cpp
index fdb0ed1c8f..8374abe445 100644
--- a/src/test/rpc/Transaction_test.cpp
+++ b/src/test/rpc/Transaction_test.cpp
@@ -40,7 +40,7 @@
 
 namespace xrpl {
 
-class Transaction_test : public beast::unit_test::suite
+class Transaction_test : public beast::unit_test::Suite
 {
     static std::unique_ptr<Config>
     makeNetworkConfig(uint32_t networkID)
@@ -60,11 +60,11 @@ class Transaction_test : public beast::unit_test::suite
         using namespace test::jtx;
         using std::to_string;
 
-        char const* COMMAND = jss::tx.c_str();
-        char const* BINARY = jss::binary.c_str();
-        char const* NOT_FOUND = RPC::get_error_info(rpcTXN_NOT_FOUND).token;
-        char const* INVALID = RPC::get_error_info(rpcINVALID_LGR_RANGE).token;
-        char const* EXCESSIVE = RPC::get_error_info(rpcEXCESSIVE_LGR_RANGE).token;
+        char const* command = jss::tx.cStr();
+        char const* binary = jss::binary.cStr();
+        char const* notFound = RPC::getErrorInfo(RpcTxnNotFound).token;
+        char const* invalid = RPC::getErrorInfo(RpcInvalidLgrRange).token;
+        char const* excessive = RPC::getErrorInfo(RpcExcessiveLgrRange).token;
 
         Env env{*this, features};
         auto const alice = Account("alice");
@@ -89,9 +89,9 @@ class Transaction_test : public beast::unit_test::suite
             auto const& tx = txns[i];
             auto const& meta = metas[i];
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(startLegSeq),
                 to_string(endLegSeq));
 
@@ -100,19 +100,19 @@ class Transaction_test : public beast::unit_test::suite
             BEAST_EXPECT(result[jss::result][jss::meta] == strHex(meta->getSerializer().getData()));
         }
 
-        auto const tx = env.jt(noop(alice), seq(env.seq(alice))).stx;
+        auto const tx = env.jt(noop(alice), Seq(env.seq(alice))).stx;
         for (int deltaEndSeq = 0; deltaEndSeq < 2; ++deltaEndSeq)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(startLegSeq),
                 to_string(endLegSeq + deltaEndSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             if (deltaEndSeq != 0)
             {
@@ -128,9 +128,9 @@ class Transaction_test : public beast::unit_test::suite
         for (auto&& tx : txns)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(endLegSeq + 1),
                 to_string(endLegSeq + 100));
 
@@ -147,15 +147,15 @@ class Transaction_test : public beast::unit_test::suite
         for (int deltaEndSeq = 0; deltaEndSeq < 2; ++deltaEndSeq)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(startLegSeq),
                 to_string(endLegSeq + deltaEndSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
             BEAST_EXPECT(!result[jss::result][jss::searched_all].asBool());
         }
 
@@ -163,14 +163,14 @@ class Transaction_test : public beast::unit_test::suite
         // field. (Tests parameter parsing)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
                 to_string(startLegSeq),
                 to_string(endLegSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             BEAST_EXPECT(!result[jss::result][jss::searched_all].asBool());
         }
@@ -179,14 +179,14 @@ class Transaction_test : public beast::unit_test::suite
         // field. (Tests parameter parsing)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
                 to_string(startLegSeq),
                 to_string(deletedLedger - 1));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             BEAST_EXPECT(result[jss::result][jss::searched_all].asBool());
         }
@@ -195,7 +195,7 @@ class Transaction_test : public beast::unit_test::suite
         // field. (Tests parameter parsing)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(txns[0]->getTransactionID()),
                 to_string(startLegSeq),
                 to_string(deletedLedger - 1));
@@ -207,15 +207,15 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (min > max)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(deletedLedger - 1),
                 to_string(startLegSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -223,15 +223,15 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (min < 0)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(-1),
                 to_string(deletedLedger - 1));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -239,11 +239,11 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (min < 0, max < 0)
         {
             auto const result = env.rpc(
-                COMMAND, to_string(tx->getTransactionID()), BINARY, to_string(-20), to_string(-10));
+                command, to_string(tx->getTransactionID()), binary, to_string(-20), to_string(-10));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -251,18 +251,18 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (only one value)
         {
             auto const result =
-                env.rpc(COMMAND, to_string(tx->getTransactionID()), BINARY, to_string(20));
+                env.rpc(command, to_string(tx->getTransactionID()), binary, to_string(20));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
 
         // Provide an invalid range: (only one value)
         {
-            auto const result = env.rpc(COMMAND, to_string(tx->getTransactionID()), to_string(20));
+            auto const result = env.rpc(command, to_string(tx->getTransactionID()), to_string(20));
 
             // Since we only provided one value for the range,
             // the interface parses it as a false binary flag,
@@ -277,15 +277,15 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (max - min > 1000)
         {
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 to_string(tx->getTransactionID()),
-                BINARY,
+                binary,
                 to_string(startLegSeq),
                 to_string(startLegSeq + 1001));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == EXCESSIVE);
+                result[jss::result][jss::error] == excessive);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -299,11 +299,11 @@ class Transaction_test : public beast::unit_test::suite
         using namespace test::jtx;
         using std::to_string;
 
-        char const* COMMAND = jss::tx.c_str();
-        char const* BINARY = jss::binary.c_str();
-        char const* NOT_FOUND = RPC::get_error_info(rpcTXN_NOT_FOUND).token;
-        char const* INVALID = RPC::get_error_info(rpcINVALID_LGR_RANGE).token;
-        char const* EXCESSIVE = RPC::get_error_info(rpcEXCESSIVE_LGR_RANGE).token;
+        char const* command = jss::tx.cStr();
+        char const* binary = jss::binary.cStr();
+        char const* notFound = RPC::getErrorInfo(RpcTxnNotFound).token;
+        char const* invalid = RPC::getErrorInfo(RpcInvalidLgrRange).token;
+        char const* excessive = RPC::getErrorInfo(RpcExcessiveLgrRange).token;
 
         Env env{*this, makeNetworkConfig(11111)};
         uint32_t const netID = env.app().getNetworkIDService().getNetworkID();
@@ -331,10 +331,10 @@ class Transaction_test : public beast::unit_test::suite
             auto const& meta = metas[i];
             uint32_t const txnIdx = meta->getFieldU32(sfTransactionIndex);
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
                 *RPC::encodeCTID(startLegSeq + i, txnIdx, netID),
-                BINARY,
+                binary,
                 to_string(startLegSeq),
                 to_string(endLegSeq));
 
@@ -343,17 +343,17 @@ class Transaction_test : public beast::unit_test::suite
             BEAST_EXPECT(result[jss::result][jss::meta] == strHex(meta->getSerializer().getData()));
         }
 
-        auto const tx = env.jt(noop(alice), seq(env.seq(alice))).stx;
+        auto const tx = env.jt(noop(alice), Seq(env.seq(alice))).stx;
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
         auto const ctid = *RPC::encodeCTID(endLegSeq, tx->getSeqValue(), netID);
         for (int deltaEndSeq = 0; deltaEndSeq < 2; ++deltaEndSeq)
         {
             auto const result = env.rpc(
-                COMMAND, ctid, BINARY, to_string(startLegSeq), to_string(endLegSeq + deltaEndSeq));
+                command, ctid, binary, to_string(startLegSeq), to_string(endLegSeq + deltaEndSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             if (deltaEndSeq != 0)
             {
@@ -372,10 +372,10 @@ class Transaction_test : public beast::unit_test::suite
             auto const& meta = metas[i];
             uint32_t const txnIdx = meta->getFieldU32(sfTransactionIndex);
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
                 *RPC::encodeCTID(startLegSeq + i, txnIdx, netID),
-                BINARY,
+                binary,
                 to_string(endLegSeq + 1),
                 to_string(endLegSeq + 100));
 
@@ -392,11 +392,11 @@ class Transaction_test : public beast::unit_test::suite
         for (int deltaEndSeq = 0; deltaEndSeq < 2; ++deltaEndSeq)
         {
             auto const result = env.rpc(
-                COMMAND, ctid, BINARY, to_string(startLegSeq), to_string(endLegSeq + deltaEndSeq));
+                command, ctid, binary, to_string(startLegSeq), to_string(endLegSeq + deltaEndSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
             BEAST_EXPECT(!result[jss::result][jss::searched_all].asBool());
         }
 
@@ -404,11 +404,11 @@ class Transaction_test : public beast::unit_test::suite
         // field. (Tests parameter parsing)
         {
             auto const result =
-                env.rpc(COMMAND, ctid, to_string(startLegSeq), to_string(endLegSeq));
+                env.rpc(command, ctid, to_string(startLegSeq), to_string(endLegSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             BEAST_EXPECT(!result[jss::result][jss::searched_all].asBool());
         }
@@ -417,11 +417,11 @@ class Transaction_test : public beast::unit_test::suite
         // field. (Tests parameter parsing)
         {
             auto const result =
-                env.rpc(COMMAND, ctid, to_string(startLegSeq), to_string(deletedLedger - 1));
+                env.rpc(command, ctid, to_string(startLegSeq), to_string(deletedLedger - 1));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == NOT_FOUND);
+                result[jss::result][jss::error] == notFound);
 
             BEAST_EXPECT(!result[jss::result][jss::searched_all].asBool());
         }
@@ -432,7 +432,7 @@ class Transaction_test : public beast::unit_test::suite
             auto const& meta = metas[0];
             uint32_t const txnIdx = meta->getFieldU32(sfTransactionIndex);
             auto const result = env.rpc(
-                COMMAND,
+                command,
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
                 *RPC::encodeCTID(endLegSeq, txnIdx, netID),
                 to_string(startLegSeq),
@@ -445,11 +445,11 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (min > max)
         {
             auto const result = env.rpc(
-                COMMAND, ctid, BINARY, to_string(deletedLedger - 1), to_string(startLegSeq));
+                command, ctid, binary, to_string(deletedLedger - 1), to_string(startLegSeq));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -457,40 +457,40 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (min < 0)
         {
             auto const result =
-                env.rpc(COMMAND, ctid, BINARY, to_string(-1), to_string(deletedLedger - 1));
+                env.rpc(command, ctid, binary, to_string(-1), to_string(deletedLedger - 1));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
 
         // Provide an invalid range: (min < 0, max < 0)
         {
-            auto const result = env.rpc(COMMAND, ctid, BINARY, to_string(-20), to_string(-10));
+            auto const result = env.rpc(command, ctid, binary, to_string(-20), to_string(-10));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
 
         // Provide an invalid range: (only one value)
         {
-            auto const result = env.rpc(COMMAND, ctid, BINARY, to_string(20));
+            auto const result = env.rpc(command, ctid, binary, to_string(20));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == INVALID);
+                result[jss::result][jss::error] == invalid);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
 
         // Provide an invalid range: (only one value)
         {
-            auto const result = env.rpc(COMMAND, ctid, to_string(20));
+            auto const result = env.rpc(command, ctid, to_string(20));
 
             // Since we only provided one value for the range,
             // the interface parses it as a false binary flag,
@@ -505,11 +505,11 @@ class Transaction_test : public beast::unit_test::suite
         // Provide an invalid range: (max - min > 1000)
         {
             auto const result = env.rpc(
-                COMMAND, ctid, BINARY, to_string(startLegSeq), to_string(startLegSeq + 1001));
+                command, ctid, binary, to_string(startLegSeq), to_string(startLegSeq + 1001));
 
             BEAST_EXPECT(
                 result[jss::result][jss::status] == jss::error &&
-                result[jss::result][jss::error] == EXCESSIVE);
+                result[jss::result][jss::error] == excessive);
 
             BEAST_EXPECT(!result[jss::result].isMember(jss::searched_all));
         }
@@ -627,7 +627,7 @@ class Transaction_test : public beast::unit_test::suite
                 continue;
             }
 
-            Json::Value jsonTx;
+            json::Value jsonTx;
             jsonTx[jss::binary] = false;
             jsonTx[jss::ctid] = *ctid;  // NOLINT(bugprone-unchecked-optional-access)
             jsonTx[jss::id] = 1;
@@ -665,11 +665,11 @@ class Transaction_test : public beast::unit_test::suite
                 }
                 BEAST_EXPECT(ctid != mixedCase);
 
-                Json::Value jsonTx;
+                json::Value jsonTx;
                 jsonTx[jss::binary] = false;
                 jsonTx[jss::ctid] = mixedCase;
                 jsonTx[jss::id] = 1;
-                Json::Value const jrr = env.rpc("json", "tx", to_string(jsonTx))[jss::result];
+                json::Value const jrr = env.rpc("json", "tx", to_string(jsonTx))[jss::result];
                 BEAST_EXPECT(jrr[jss::ctid] == ctid);
                 BEAST_EXPECT(jrr[jss::hash]);
             }
@@ -692,12 +692,12 @@ class Transaction_test : public beast::unit_test::suite
 
             auto const ledgerSeq = env.current()->header().seq;
 
-            env(noop(alice), ter(tesSUCCESS));
+            env(noop(alice), Ter(tesSUCCESS));
             env.close();
 
-            Json::Value params;
+            json::Value params;
             params[jss::id] = 1;
-            auto const hash = env.tx()->getJson(JsonOptions::none)[jss::hash];
+            auto const hash = env.tx()->getJson(JsonOptions::KNone)[jss::hash];
             params[jss::transaction] = hash;
             auto const jrr = env.rpc("json", "tx", to_string(params))[jss::result];
             BEAST_EXPECT(jrr[jss::hash] == hash);
@@ -726,13 +726,13 @@ class Transaction_test : public beast::unit_test::suite
 
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             auto const ctid = *RPC::encodeCTID(startLegSeq, 0, netID + 1);
-            Json::Value jsonTx;
+            json::Value jsonTx;
             jsonTx[jss::binary] = false;
             jsonTx[jss::ctid] = ctid;
             jsonTx[jss::id] = 1;
             auto const jrr = env.rpc("json", "tx", to_string(jsonTx))[jss::result];
             BEAST_EXPECT(jrr[jss::error] == "wrongNetwork");
-            BEAST_EXPECT(jrr[jss::error_code] == rpcWRONG_NETWORK);
+            BEAST_EXPECT(jrr[jss::error_code] == RpcWrongNetwork);
             BEAST_EXPECT(
                 jrr[jss::error_message] ==
                 "Wrong network. You should submit this request to a node "
@@ -755,7 +755,7 @@ class Transaction_test : public beast::unit_test::suite
         Account const alice{"alice"};
         Account const alie{"alie"};
         Account const gw{"gw"};
-        auto const USD{gw["USD"]};
+        auto const usd{gw["USD"]};
 
         env.fund(XRP(1000000), alice, gw);
         env.close();
@@ -771,7 +771,7 @@ class Transaction_test : public beast::unit_test::suite
         std::shared_ptr<STObject const> const meta =
             env.closed()->txRead(env.tx()->getTransactionID()).second;
 
-        Json::Value expected = txn->getJson(JsonOptions::none);
+        json::Value expected = txn->getJson(JsonOptions::KNone);
         expected[jss::DeliverMax] = expected[jss::Amount];
         if (apiVersion > 1)
         {
@@ -779,8 +779,8 @@ class Transaction_test : public beast::unit_test::suite
             expected.removeMember(jss::Amount);
         }
 
-        Json::Value const result = {[&env, txn, apiVersion]() {
-            Json::Value params{Json::objectValue};
+        json::Value const result = {[&env, txn, apiVersion]() {
+            json::Value params{json::ObjectValue};
             params[jss::transaction] = to_string(txn->getTransactionID());
             params[jss::binary] = false;
             params[jss::api_version] = apiVersion;
@@ -803,11 +803,11 @@ class Transaction_test : public beast::unit_test::suite
         for (auto memberIt = expected.begin(); memberIt != expected.end(); memberIt++)
         {
             std::string const name = memberIt.memberName();
-            auto const& result_transaction =
+            auto const& resultTransaction =
                 (apiVersion > 1 ? result[jss::result][jss::tx_json] : result[jss::result]);
-            if (BEAST_EXPECT(result_transaction.isMember(name)))
+            if (BEAST_EXPECT(resultTransaction.isMember(name)))
             {
-                auto const received = result_transaction[name];
+                auto const received = resultTransaction[name];
                 BEAST_EXPECTS(
                     received == *memberIt,
                     "Transaction contains \n\"" + name + "\": "  //
@@ -832,7 +832,7 @@ class Transaction_test : public beast::unit_test::suite
                 })};
         Account const alice{"alice"};
         Account const gw{"gw"};
-        auto const USD{gw["USD"]};
+        auto const usd{gw["USD"]};
 
         env.fund(XRP(1000000), alice, gw);
         std::shared_ptr<STTx const> const txn = env.tx();
@@ -843,11 +843,11 @@ class Transaction_test : public beast::unit_test::suite
         std::shared_ptr<STObject const> const meta =
             env.closed()->txRead(txn->getTransactionID()).second;
 
-        std::string const expected_tx_blob = serializeHex(*txn);
-        std::string const expected_meta_blob = serializeHex(*meta);
+        std::string const expectedTxBlob = serializeHex(*txn);
+        std::string const expectedMetaBlob = serializeHex(*meta);
 
-        Json::Value const result = [&env, txn, apiVersion]() {
-            Json::Value params{Json::objectValue};
+        json::Value const result = [&env, txn, apiVersion]() {
+            json::Value params{json::ObjectValue};
             params[jss::transaction] = to_string(txn->getTransactionID());
             params[jss::binary] = true;
             params[jss::api_version] = apiVersion;
@@ -864,8 +864,8 @@ class Transaction_test : public beast::unit_test::suite
 
             if (apiVersion > 1)
             {
-                BEAST_EXPECT(result[jss::result][jss::tx_blob] == expected_tx_blob);
-                BEAST_EXPECT(result[jss::result][jss::meta_blob] == expected_meta_blob);
+                BEAST_EXPECT(result[jss::result][jss::tx_blob] == expectedTxBlob);
+                BEAST_EXPECT(result[jss::result][jss::meta_blob] == expectedMetaBlob);
                 BEAST_EXPECT(
                     result[jss::result][jss::ledger_hash] ==
                     "2D5150E5A5AA436736A732291E437ABF01BC9E206C2DF3C77C4F856915"
@@ -874,8 +874,8 @@ class Transaction_test : public beast::unit_test::suite
             }
             else
             {
-                BEAST_EXPECT(result[jss::result][jss::tx] == expected_tx_blob);
-                BEAST_EXPECT(result[jss::result][jss::meta] == expected_meta_blob);
+                BEAST_EXPECT(result[jss::result][jss::tx] == expectedTxBlob);
+                BEAST_EXPECT(result[jss::result][jss::meta] == expectedMetaBlob);
                 BEAST_EXPECT(result[jss::result][jss::date] == 10);
             }
         }
@@ -888,7 +888,7 @@ public:
         using namespace test::jtx;
         forAllApiVersions(std::bind_front(&Transaction_test::testBinaryRequest, this));
 
-        FeatureBitset const all{testable_amendments()};
+        FeatureBitset const all{testableAmendments()};
         testWithFeats(all);
     }
 
diff --git a/src/test/rpc/ValidatorInfo_test.cpp b/src/test/rpc/ValidatorInfo_test.cpp
index 71760b601b..8acdca8a1f 100644
--- a/src/test/rpc/ValidatorInfo_test.cpp
+++ b/src/test/rpc/ValidatorInfo_test.cpp
@@ -15,7 +15,7 @@
 
 namespace xrpl::test {
 
-class ValidatorInfo_test : public beast::unit_test::suite
+class ValidatorInfo_test : public beast::unit_test::Suite
 {
 public:
     void
@@ -35,8 +35,8 @@ public:
     testPrivileges()
     {
         using namespace test::jtx;
-        Env env{*this, envconfig(no_admin)};
-        env.set_retries(0);
+        Env env{*this, envconfig(noAdmin)};
+        env.setRetries(0);
         auto const info = env.rpc("validator_info")[jss::result];
         BEAST_EXPECT(info.isNull());
     }
@@ -58,8 +58,8 @@ public:
             "VUSmEydzBpMjFlcTNNWXl3TFZKWm5GT3I3QzBrdzJBaVR6U0NqSXpkaXRROD0ifQ==\n",
         };
 
-        std::string const master_key = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
-        std::string const ephemeral_key = "n9KsDYGKhABVc4wK5u3MnVhgPinyJimyKGpr9VJYuBaY8EnJXR2x";
+        std::string const masterKey = "nHBt9fsb4849WmZiCds4r5TXyBeQjqnH5kzPtqgMAQMgi39YZRPa";
+        std::string const ephemeralKey = "n9KsDYGKhABVc4wK5u3MnVhgPinyJimyKGpr9VJYuBaY8EnJXR2x";
         std::string const manifest =
             "JAAAAAFxIe1FtwmimvGtH2iCcMJqC9gVFKilGfw1/"
             "vCxHXXLplc2GnMhAkE1agqXxBwDwDbID6OMSYuM0FDAlpAgNk8SKFn7MO2fdkcwRQI"
@@ -75,9 +75,9 @@ public:
             auto const info = env.rpc("validator_info");
             BEAST_EXPECT(info[jss::result][jss::status] == "success");
             BEAST_EXPECT(info[jss::result][jss::seq] == 1);
-            BEAST_EXPECT(info[jss::result][jss::master_key] == master_key);
+            BEAST_EXPECT(info[jss::result][jss::master_key] == masterKey);
             BEAST_EXPECT(info[jss::result][jss::manifest] == manifest);
-            BEAST_EXPECT(info[jss::result][jss::ephemeral_key] == ephemeral_key);
+            BEAST_EXPECT(info[jss::result][jss::ephemeral_key] == ephemeralKey);
         }
     }
 
diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp
index 2d8a73e31d..1c6fb94fac 100644
--- a/src/test/rpc/ValidatorRPC_test.cpp
+++ b/src/test/rpc/ValidatorRPC_test.cpp
@@ -30,7 +30,7 @@
 
 namespace xrpl::test {
 
-class ValidatorRPC_test : public beast::unit_test::suite
+class ValidatorRPC_test : public beast::unit_test::Suite
 {
     using Validator = TrustedPublisherServer::Validator;
 
@@ -44,8 +44,8 @@ public:
         {
             for (std::string const cmd : {"validators", "validator_list_sites"})
             {
-                Env env{*this, isAdmin ? envconfig() : envconfig(no_admin)};
-                env.set_retries(isAdmin ? 5 : 0);
+                Env env{*this, isAdmin ? envconfig() : envconfig(noAdmin)};
+                env.setRetries(isAdmin ? 5 : 0);
                 auto const jrr = env.rpc(cmd)[jss::result];
                 if (isAdmin)
                 {
@@ -63,14 +63,14 @@ public:
             }
 
             {
-                Env env{*this, isAdmin ? envconfig() : envconfig(no_admin)};
+                Env env{*this, isAdmin ? envconfig() : envconfig(noAdmin)};
                 auto const jrr = env.rpc("server_info")[jss::result];
                 BEAST_EXPECT(jrr[jss::status] == "success");
                 BEAST_EXPECT(jrr[jss::info].isMember(jss::validator_list) == isAdmin);
             }
 
             {
-                Env env{*this, isAdmin ? envconfig() : envconfig(no_admin)};
+                Env env{*this, isAdmin ? envconfig() : envconfig(noAdmin)};
                 auto const jrr = env.rpc("server_state")[jss::result];
                 BEAST_EXPECT(jrr[jss::status] == "success");
                 BEAST_EXPECT(jrr[jss::state].isMember(jss::validator_list_expires) == isAdmin);
@@ -133,8 +133,8 @@ public:
         // Negative UNL update
         {
             hash_set<PublicKey> disabledKeys;
-            auto k1 = randomKeyPair(KeyType::ed25519).first;
-            auto k2 = randomKeyPair(KeyType::ed25519).first;
+            auto k1 = randomKeyPair(KeyType::Ed25519).first;
+            auto k2 = randomKeyPair(KeyType::Ed25519).first;
             disabledKeys.insert(k1);
             disabledKeys.insert(k2);
             env.app().getValidators().setNegativeUNL(disabledKeys);
@@ -181,8 +181,8 @@ public:
         NetClock::time_point const validUntil{3600s};
         NetClock::time_point const validFrom2{validUntil - 60s};
         NetClock::time_point const validUntil2{validFrom2 + 3600s};
-        auto server = make_TrustedPublisherServer(
-            worker.get_io_context(),
+        auto server = makeTrustedPublisherServer(
+            worker.getIoContext(),
             validators,
             validUntil,
             {{validFrom2, validUntil2}},
@@ -317,7 +317,7 @@ public:
         // Publisher list site available v1
         {
             std::stringstream uri;
-            uri << "http://" << server->local_endpoint() << "/validators";
+            uri << "http://" << server->localEndpoint() << "/validators";
             auto siteURI = uri.str();
 
             Env env{
@@ -410,7 +410,7 @@ public:
         // Publisher list site available v2
         {
             std::stringstream uri;
-            uri << "http://" << server->local_endpoint() << "/validators2";
+            uri << "http://" << server->localEndpoint() << "/validators2";
             auto siteURI = uri.str();
 
             Env env{
@@ -522,7 +522,7 @@ public:
     }
 
     void
-    test_validation_create()
+    testValidationCreate()
     {
         using namespace test::jtx;
         Env env{*this};
@@ -539,7 +539,7 @@ public:
         testPrivileges();
         testStaticUNL();
         testDynamicUNL();
-        test_validation_create();
+        testValidationCreate();
     }
 };
 
diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp
index 39983ac09e..d465672aa7 100644
--- a/src/test/rpc/Version_test.cpp
+++ b/src/test/rpc/Version_test.cpp
@@ -13,7 +13,7 @@
 
 namespace xrpl {
 
-class Version_test : public beast::unit_test::suite
+class Version_test : public beast::unit_test::Suite
 {
     void
     testCorrectVersionNumber()
@@ -23,7 +23,7 @@ class Version_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this};
 
-        auto isCorrectReply = [](Json::Value const& re) -> bool {
+        auto isCorrectReply = [](json::Value const& re) -> bool {
             if (re.isMember(jss::error))
                 return false;
             return re.isMember(jss::version);
@@ -32,7 +32,7 @@ class Version_test : public beast::unit_test::suite
         auto jrr = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::apiMaximumSupportedVersion) +
+            "{\"api_version\": " + std::to_string(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION) +
                 "}")[jss::result];
         BEAST_EXPECT(isCorrectReply(jrr));
 
@@ -48,13 +48,12 @@ class Version_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this};
 
-        auto badVersion = [](Json::Value const& re) -> bool {
+        auto badVersion = [](json::Value const& re) -> bool {
             if (re.isMember("error_what"))
             {
                 if (re["error_what"].isString())
                 {
-                    return re["error_what"].asString().starts_with(
-                        jss::invalid_API_version.c_str());
+                    return re["error_what"].asString().starts_with(jss::invalid_API_version.cStr());
                 }
             }
             return false;
@@ -63,7 +62,7 @@ class Version_test : public beast::unit_test::suite
         auto re = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::apiMinimumSupportedVersion - 1) + "}");
+            "{\"api_version\": " + std::to_string(RPC::kAPI_MINIMUM_SUPPORTED_VERSION - 1) + "}");
         BEAST_EXPECT(badVersion(re));
 
         BEAST_EXPECT(env.app().config().BETA_RPC_API);
@@ -72,7 +71,8 @@ class Version_test : public beast::unit_test::suite
             "version",
             "{\"api_version\": " +
                 std::to_string(
-                    std::max(RPC::apiMaximumSupportedVersion.value, RPC::apiBetaVersion.value) +
+                    std::max(
+                        RPC::kAPI_MAXIMUM_SUPPORTED_VERSION.value, RPC::kAPI_BETA_VERSION.value) +
                     1) +
                 "}");
         BEAST_EXPECT(badVersion(re));
@@ -87,38 +87,40 @@ class Version_test : public beast::unit_test::suite
         testcase("test getAPIVersionNumber function");
 
         unsigned int const versionIfUnspecified =
-            RPC::apiVersionIfUnspecified < RPC::apiMinimumSupportedVersion
-            ? RPC::apiInvalidVersion
-            : RPC::apiVersionIfUnspecified;
+            RPC::kAPI_VERSION_IF_UNSPECIFIED < RPC::kAPI_MINIMUM_SUPPORTED_VERSION
+            ? RPC::kAPI_INVALID_VERSION
+            : RPC::kAPI_VERSION_IF_UNSPECIFIED;
 
-        Json::Value const j_array = Json::Value(Json::arrayValue);
-        Json::Value const j_null = Json::Value(Json::nullValue);
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_array, false) == versionIfUnspecified);
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_null, false) == versionIfUnspecified);
+        json::Value const jArray = json::Value(json::ArrayValue);
+        json::Value const jNull = json::Value(json::NullValue);
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jArray, false) == versionIfUnspecified);
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jNull, false) == versionIfUnspecified);
 
-        Json::Value j_object = Json::Value(Json::objectValue);
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
-        j_object[jss::api_version] = RPC::apiVersionIfUnspecified.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == versionIfUnspecified);
+        json::Value jObject = json::Value(json::ObjectValue);
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == versionIfUnspecified);
+        jObject[jss::api_version] = RPC::kAPI_VERSION_IF_UNSPECIFIED.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == versionIfUnspecified);
 
-        j_object[jss::api_version] = RPC::apiMinimumSupportedVersion.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiMinimumSupportedVersion);
-        j_object[jss::api_version] = RPC::apiMaximumSupportedVersion.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiMaximumSupportedVersion);
+        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);
 
-        j_object[jss::api_version] = RPC::apiMinimumSupportedVersion - 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
-        j_object[jss::api_version] = RPC::apiMaximumSupportedVersion + 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
-        j_object[jss::api_version] = RPC::apiBetaVersion.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, true) == RPC::apiBetaVersion);
-        j_object[jss::api_version] = RPC::apiBetaVersion + 1;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, true) == RPC::apiInvalidVersion);
+        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);
 
-        j_object[jss::api_version] = RPC::apiInvalidVersion.value;
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
-        j_object[jss::api_version] = "a";
-        BEAST_EXPECT(RPC::getAPIVersionNumber(j_object, false) == RPC::apiInvalidVersion);
+        jObject[jss::api_version] = RPC::kAPI_INVALID_VERSION.value;
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
+        jObject[jss::api_version] = "a";
+        BEAST_EXPECT(RPC::getAPIVersionNumber(jObject, false) == RPC::kAPI_INVALID_VERSION);
     }
 
     void
@@ -129,21 +131,21 @@ class Version_test : public beast::unit_test::suite
         using namespace test::jtx;
         Env env{*this};
 
-        auto const without_api_verion = std::string("{ ") +
+        auto const withoutApiVerion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
             "\"ripplerpc\": \"2.0\", "
             "\"id\": 5, "
             "\"method\": \"version\", "
             "\"params\": {}}";
-        auto const with_api_verion = std::string("{ ") +
+        auto const withApiVerion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
             "\"ripplerpc\": \"2.0\", "
             "\"id\": 6, "
             "\"method\": \"version\", "
             "\"params\": { "
             "\"api_version\": " +
-            std::to_string(RPC::apiMaximumSupportedVersion) + "}}";
-        auto re = env.rpc("json2", '[' + without_api_verion + ", " + with_api_verion + ']');
+            std::to_string(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION) + "}}";
+        auto re = env.rpc("json2", '[' + withoutApiVerion + ", " + withApiVerion + ']');
 
         if (!BEAST_EXPECT(re.isArray()))
             return;
@@ -162,13 +164,13 @@ class Version_test : public beast::unit_test::suite
         Env env{*this};
 
         BEAST_EXPECT(env.app().config().BETA_RPC_API);
-        auto const without_api_verion = std::string("{ ") +
+        auto const withoutApiVerion = std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
             "\"ripplerpc\": \"2.0\", "
             "\"id\": 5, "
             "\"method\": \"version\", "
             "\"params\": {}}";
-        auto const with_wrong_api_verion =
+        auto const withWrongApiVerion =
             std::string("{ ") +
             "\"jsonrpc\": \"2.0\", "
             "\"ripplerpc\": \"2.0\", "
@@ -177,9 +179,10 @@ class Version_test : public beast::unit_test::suite
             "\"params\": { "
             "\"api_version\": " +
             std::to_string(
-                std::max(RPC::apiMaximumSupportedVersion.value, RPC::apiBetaVersion.value) + 1) +
+                std::max(RPC::kAPI_MAXIMUM_SUPPORTED_VERSION.value, RPC::kAPI_BETA_VERSION.value) +
+                1) +
             "}}";
-        auto re = env.rpc("json2", '[' + without_api_verion + ", " + with_wrong_api_verion + ']');
+        auto re = env.rpc("json2", '[' + withoutApiVerion + ", " + withWrongApiVerion + ']');
 
         if (!BEAST_EXPECT(re.isArray()))
             return;
@@ -227,15 +230,15 @@ class Version_test : public beast::unit_test::suite
         auto jrr = env.rpc(
             "json",
             "version",
-            "{\"api_version\": " + std::to_string(RPC::apiBetaVersion) + "}")[jss::result];
+            "{\"api_version\": " + std::to_string(RPC::kAPI_BETA_VERSION) + "}")[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::apiMinimumSupportedVersion.value);
-        BEAST_EXPECT(jrr[jss::version][jss::last] == RPC::apiBetaVersion.value);
+        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);
     }
 
 public:
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index 09282c9d14..87f1d0e927 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -46,26 +46,26 @@
 
 namespace xrpl::test {
 
-class ServerStatus_test : public beast::unit_test::suite, public beast::test::enable_yield_to
+class ServerStatus_test : public beast::unit_test::Suite, public beast::test::EnableYieldTo
 {
-    class myFields : public boost::beast::http::fields
+    class MyFields : public boost::beast::http::fields
     {
     };
 
     static auto
     makeConfig(std::string const& proto, bool admin = true, bool credentials = false)
     {
-        auto const section_name = boost::starts_with(proto, "h") ? "port_rpc" : "port_ws";
+        auto const sectionName = boost::starts_with(proto, "h") ? "port_rpc" : "port_ws";
         auto p = jtx::envconfig();
 
-        p->overwrite(section_name, "protocol", proto);
+        p->overwrite(sectionName, "protocol", proto);
         if (!admin)
-            p->overwrite(section_name, "admin", "");
+            p->overwrite(sectionName, "admin", "");
 
         if (credentials)
         {
-            (*p)[section_name].set("admin_password", "p");
-            (*p)[section_name].set("admin_user", "u");
+            (*p)[sectionName].set("admin_password", "p");
+            (*p)[sectionName].set("admin_user", "u");
         }
 
         p->overwrite(
@@ -109,7 +109,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
             std::array<std::uint8_t, 16> key{};
             for (auto& v : key)
                 v = d(e);
-            req.insert("Sec-WebSocket-Key", base64_encode(key.data(), key.size()));
+            req.insert("Sec-WebSocket-Key", base64Encode(key.data(), key.size()));
         };
         req.insert("Sec-WebSocket-Version", "13");
         req.insert(boost::beast::http::field::connection, "upgrade");
@@ -121,7 +121,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         std::string const& host,
         uint16_t port,
         std::string const& body,
-        myFields const& fields)
+        MyFields const& fields)
     {
         using namespace boost::asio;
         using namespace boost::beast::http;
@@ -160,7 +160,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
     {
         using namespace boost::asio;
         using namespace boost::beast::http;
-        io_context& ios = get_io_context();
+        io_context& ios = getIoContext();
         ip::tcp::resolver r{ios};
         boost::beast::multi_buffer sb;
 
@@ -227,7 +227,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         boost::beast::http::response<boost::beast::http::string_body>& resp,
         boost::system::error_code& ec,
         std::string const& body = "",
-        myFields const& fields = {})
+        MyFields const& fields = {})
     {
         auto const port = env.app().config()["port_rpc"].get<std::uint16_t>("port");
         auto const ip = env.app().config()["port_rpc"].get<std::string>("ip");
@@ -244,16 +244,16 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         std::string const& password,
         bool subobject = false)
     {
-        Json::Value jrr;
+        json::Value jrr;
 
-        Json::Value jp = Json::objectValue;
+        json::Value jp = json::ObjectValue;
         if (!user.empty())
         {
             jp["admin_user"] = user;
             if (subobject)
             {
                 // special case of bad password..passed as object
-                Json::Value jpi = Json::objectValue;
+                json::Value jpi = json::ObjectValue;
                 jpi["admin_password"] = password;
                 jp["admin_password"] = jpi;
             }
@@ -290,8 +290,8 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         using namespace jtx;
         Env env{*this, makeConfig(proto, admin, credentials)};
 
-        Json::Value jrr;
-        auto const proto_ws = boost::starts_with(proto, "w");
+        json::Value jrr;
+        auto const protoWs = boost::starts_with(proto, "w");
 
         // the set of checks we do are different depending
         // on how the admin config options are set
@@ -299,43 +299,42 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         if (admin && credentials)
         {
             auto const user =
-                env.app().config()[proto_ws ? "port_ws" : "port_rpc"].get<std::string>(
-                    "admin_user");
+                env.app().config()[protoWs ? "port_ws" : "port_rpc"].get<std::string>("admin_user");
 
             auto const password =
-                env.app().config()[proto_ws ? "port_ws" : "port_rpc"].get<std::string>(
+                env.app().config()[protoWs ? "port_ws" : "port_rpc"].get<std::string>(
                     "admin_password");
 
             // 1 - FAILS with wrong pass
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             jrr = makeAdminRequest(env, proto, *user, *password + "_")[jss::result];
-            BEAST_EXPECT(jrr["error"] == proto_ws ? "forbidden" : "noPermission");
+            BEAST_EXPECT(jrr["error"] == protoWs ? "forbidden" : "noPermission");
             BEAST_EXPECT(
-                jrr["error_message"] == proto_ws ? "Bad credentials."
-                                                 : "You don't have permission for this command.");
+                jrr["error_message"] == protoWs ? "Bad credentials."
+                                                : "You don't have permission for this command.");
 
             // 2 - FAILS with password in an object
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             jrr = makeAdminRequest(env, proto, *user, *password, true)[jss::result];
-            BEAST_EXPECT(jrr["error"] == proto_ws ? "forbidden" : "noPermission");
+            BEAST_EXPECT(jrr["error"] == protoWs ? "forbidden" : "noPermission");
             BEAST_EXPECT(
-                jrr["error_message"] == proto_ws ? "Bad credentials."
-                                                 : "You don't have permission for this command.");
+                jrr["error_message"] == protoWs ? "Bad credentials."
+                                                : "You don't have permission for this command.");
 
             // 3 - FAILS with wrong user
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
             jrr = makeAdminRequest(env, proto, *user + "_", *password)[jss::result];
-            BEAST_EXPECT(jrr["error"] == proto_ws ? "forbidden" : "noPermission");
+            BEAST_EXPECT(jrr["error"] == protoWs ? "forbidden" : "noPermission");
             BEAST_EXPECT(
-                jrr["error_message"] == proto_ws ? "Bad credentials."
-                                                 : "You don't have permission for this command.");
+                jrr["error_message"] == protoWs ? "Bad credentials."
+                                                : "You don't have permission for this command.");
 
             // 4 - FAILS no credentials
             jrr = makeAdminRequest(env, proto, "", "")[jss::result];
-            BEAST_EXPECT(jrr["error"] == proto_ws ? "forbidden" : "noPermission");
+            BEAST_EXPECT(jrr["error"] == protoWs ? "forbidden" : "noPermission");
             BEAST_EXPECT(
-                jrr["error_message"] == proto_ws ? "Bad credentials."
-                                                 : "You don't have permission for this command.");
+                jrr["error_message"] == protoWs ? "Bad credentials."
+                                                : "You don't have permission for this command.");
 
             // 5 - SUCCEEDS with proper credentials
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
@@ -356,10 +355,10 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         {
             // 1 - FAILS - admin disabled
             jrr = makeAdminRequest(env, proto, "", "")[jss::result];
-            BEAST_EXPECT(jrr["error"] == proto_ws ? "forbidden" : "noPermission");
+            BEAST_EXPECT(jrr["error"] == protoWs ? "forbidden" : "noPermission");
             BEAST_EXPECT(
-                jrr["error_message"] == proto_ws ? "Bad credentials."
-                                                 : "You don't have permission for this command.");
+                jrr["error_message"] == protoWs ? "Bad credentials."
+                                                : "You don't have permission for this command.");
         }
     }
 
@@ -446,10 +445,10 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         auto req = makeWSUpgrade(*ip, *port);  // NOLINT(bugprone-unchecked-optional-access)
 
         // truncate the request message to near the value of the version header
-        auto req_string = boost::lexical_cast<std::string>(req);
-        req_string.erase(req_string.find_last_of("13"), std::string::npos);
+        auto reqString = boost::lexical_cast<std::string>(req);
+        reqString.erase(reqString.find_last_of("13"), std::string::npos);
 
-        io_context& ios = get_io_context();
+        io_context& ios = getIoContext();
         ip::tcp::resolver r{ios};
         boost::beast::multi_buffer sb;
 
@@ -462,7 +461,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         async_connect(sock, it, yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
-        async_write(sock, boost::asio::buffer(req_string), yield[ec]);
+        async_write(sock, boost::asio::buffer(reqString), yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
         // since we've sent an incomplete request, the server will
@@ -473,29 +472,28 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
     void
     testCantConnect(
-        std::string const& client_protocol,
-        std::string const& server_protocol,
+        std::string const& clientProtocol,
+        std::string const& serverProtocol,
         boost::asio::yield_context& yield)
     {
         // The essence of this test is to have a client and server configured
         // out-of-phase with respect to ssl (secure client and insecure server
         // or vice-versa)
-        testcase << "Connect fails: " << client_protocol << " client to " << server_protocol
+        testcase << "Connect fails: " << clientProtocol << " client to " << serverProtocol
                  << " server";
         using namespace jtx;
-        Env env{*this, makeConfig(server_protocol)};
+        Env env{*this, makeConfig(serverProtocol)};
 
         boost::beast::http::response<boost::beast::http::string_body> resp;
         boost::system::error_code ec;
-        if (boost::starts_with(client_protocol, "h"))
+        if (boost::starts_with(clientProtocol, "h"))
         {
-            doHTTPRequest(env, yield, client_protocol == "https", resp, ec);
+            doHTTPRequest(env, yield, clientProtocol == "https", resp, ec);
             BEAST_EXPECT(ec);
         }
         else
         {
-            doWSRequest(
-                env, yield, client_protocol == "wss" || client_protocol == "wss2", resp, ec);
+            doWSRequest(env, yield, clientProtocol == "wss" || clientProtocol == "wss2", resp, ec);
             BEAST_EXPECT(ec);
         }
     }
@@ -515,14 +513,14 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
                     return cfg;
                 })};
 
-        Json::Value jr;
+        json::Value jr;
         jr[jss::method] = "server_info";
         boost::beast::http::response<boost::beast::http::string_body> resp;
         boost::system::error_code ec;
         doHTTPRequest(env, yield, secure, resp, ec, to_string(jr));
         BEAST_EXPECT(resp.result() == boost::beast::http::status::forbidden);
 
-        myFields auth;
+        MyFields auth;
         auth.insert("Authorization", "");
         doHTTPRequest(env, yield, secure, resp, ec, to_string(jr), auth);
         BEAST_EXPECT(resp.result() == boost::beast::http::status::forbidden);
@@ -531,7 +529,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         doHTTPRequest(env, yield, secure, resp, ec, to_string(jr), auth);
         BEAST_EXPECT(resp.result() == boost::beast::http::status::forbidden);
 
-        auth.set("Authorization", "Basic " + base64_encode("me:badpass"));
+        auth.set("Authorization", "Basic " + base64Encode("me:badpass"));
         doHTTPRequest(env, yield, secure, resp, ec, to_string(jr), auth);
         BEAST_EXPECT(resp.result() == boost::beast::http::status::forbidden);
 
@@ -547,7 +545,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(resp.result() == boost::beast::http::status::forbidden);
 
         // finally if we use the correct user/pass encoded, we should get a 200
-        auth.set("Authorization", "Basic " + base64_encode(user + ":" + pass));
+        auth.set("Authorization", "Basic " + base64Encode(user + ":" + pass));
         doHTTPRequest(env, yield, secure, resp, ec, to_string(jr), auth);
         BEAST_EXPECT(resp.result() == boost::beast::http::status::ok);
         BEAST_EXPECT(!resp.body().empty());
@@ -573,10 +571,10 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         auto const ip = env.app().config()["port_rpc"].get<std::string>("ip").value();
 
         boost::system::error_code ec;
-        io_context& ios = get_io_context();
+        io_context& ios = getIoContext();
         ip::tcp::resolver r{ios};
 
-        Json::Value jr;
+        json::Value jr;
         jr[jss::method] = "server_info";
 
         auto it = r.async_resolve(ip, std::to_string(port), yield[ec]);
@@ -675,7 +673,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         auto const ip = env.app().config()["port_ws"].get<std::string>("ip").value();
         boost::system::error_code ec;
 
-        io_context& ios = get_io_context();
+        io_context& ios = getIoContext();
         ip::tcp::resolver r{ios};
 
         auto it = r.async_resolve(ip, std::to_string(port), yield[ec]);
@@ -691,22 +689,22 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         ws.handshake(ip + ":" + std::to_string(port), "/");
 
         // helper lambda, used below
-        auto sendAndParse = [&](std::string const& req) -> Json::Value {
+        auto sendAndParse = [&](std::string const& req) -> json::Value {
             ws.async_write_some(true, buffer(req), yield[ec]);
             if (!BEAST_EXPECT(!ec))
-                return Json::objectValue;
+                return json::ObjectValue;
 
             boost::beast::multi_buffer sb;
             ws.async_read(sb, yield[ec]);
             if (!BEAST_EXPECT(!ec))
-                return Json::objectValue;
+                return json::ObjectValue;
 
-            Json::Value resp;
-            Json::Reader jr;
+            json::Value resp;
+            json::Reader jr;
             if (!BEAST_EXPECT(jr.parse(
                     boost::lexical_cast<std::string>(boost::beast::make_printable(sb.data())),
                     resp)))
-                return Json::objectValue;
+                return json::ObjectValue;
             sb.consume(sb.size());
             return resp;
         };
@@ -718,7 +716,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         }
 
         {  // send incorrect json (method and command fields differ)
-            Json::Value jv;
+            json::Value jv;
             jv[jss::command] = "foo";
             jv[jss::method] = "bar";
             auto resp = sendAndParse(to_string(jv));
@@ -727,7 +725,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         }
 
         {  // send a ping (not an error)
-            Json::Value jv;
+            json::Value jv;
             jv[jss::command] = "ping";
             auto resp = sendAndParse(to_string(jv));
             BEAST_EXPECT(resp.isMember(jss::status) && resp[jss::status] == "success");
@@ -776,8 +774,8 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(env.app().getOPs().getConsensusInfo()["validating"] == true);
         BEAST_EXPECT(!si[jss::state].isMember(jss::warnings));
 
-        auto const port_ws = env.app().config()["port_ws"].get<std::uint16_t>("port");
-        auto const ip_ws = env.app().config()["port_ws"].get<std::string>("ip");
+        auto const portWs = env.app().config()["port_ws"].get<std::uint16_t>("port");
+        auto const ipWs = env.app().config()["port_ws"].get<std::string>("ip");
 
         boost::system::error_code ec;
         response<string_body> resp;
@@ -785,11 +783,11 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -814,7 +812,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(
             si[jss::info].isMember(jss::warnings) && si[jss::info][jss::warnings].isArray() &&
             si[jss::info][jss::warnings].size() == 1 &&
-            si[jss::info][jss::warnings][0u][jss::id].asInt() == warnRPC_UNSUPPORTED_MAJORITY);
+            si[jss::info][jss::warnings][0u][jss::id].asInt() == WarnRpcUnsupportedMajority);
 
         // RPC request server_state again, now unsupported majority should be
         // returned
@@ -824,17 +822,17 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(
             si[jss::state].isMember(jss::warnings) && si[jss::state][jss::warnings].isArray() &&
             si[jss::state][jss::warnings].size() == 1 &&
-            si[jss::state][jss::warnings][0u][jss::id].asInt() == warnRPC_UNSUPPORTED_MAJORITY);
+            si[jss::state][jss::warnings][0u][jss::id].asInt() == WarnRpcUnsupportedMajority);
 
         // but status does not indicate a problem
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -850,11 +848,11 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -904,8 +902,8 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(env.app().getOPs().getConsensusInfo()["validating"] == true);
         BEAST_EXPECT(!si[jss::state].isMember(jss::warnings));
 
-        auto const port_ws = env.app().config()["port_ws"].get<std::uint16_t>("port");
-        auto const ip_ws = env.app().config()["port_ws"].get<std::string>("ip");
+        auto const portWs = env.app().config()["port_ws"].get<std::uint16_t>("port");
+        auto const ipWs = env.app().config()["port_ws"].get<std::string>("ip");
 
         boost::system::error_code ec;
         response<string_body> resp;
@@ -913,11 +911,11 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -944,7 +942,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(
             si[jss::info].isMember(jss::warnings) && si[jss::info][jss::warnings].isArray() &&
             si[jss::info][jss::warnings].size() == 1 &&
-            si[jss::info][jss::warnings][0u][jss::id].asInt() == warnRPC_AMENDMENT_BLOCKED);
+            si[jss::info][jss::warnings][0u][jss::id].asInt() == WarnRpcAmendmentBlocked);
 
         // RPC request server_state again, now AB should be returned
         si = env.rpc("server_state")[jss::result];
@@ -954,18 +952,18 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         BEAST_EXPECT(
             si[jss::state].isMember(jss::warnings) && si[jss::state][jss::warnings].isArray() &&
             si[jss::state][jss::warnings].size() == 1 &&
-            si[jss::state][jss::warnings][0u][jss::id].asInt() == warnRPC_AMENDMENT_BLOCKED);
+            si[jss::state][jss::warnings][0u][jss::id].asInt() == WarnRpcAmendmentBlocked);
 
         // but status does not indicate because it still relies on ELB
         // being enabled
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -980,11 +978,11 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
         doRequest(
             yield,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            makeHTTPRequest(*ip_ws, *port_ws, "", {}),
+            makeHTTPRequest(*ipWs, *portWs, "", {}),
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *ip_ws,
+            *ipWs,
             // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-            *port_ws,
+            *portWs,
             false,
             resp,
             ec);
@@ -1014,7 +1012,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            Json::Value jv;
+            json::Value jv;
             jv["invalid"] = 1;
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
             BEAST_EXPECT(resp.result() == boost::beast::http::status::bad_request);
@@ -1023,7 +1021,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            Json::Value jv(Json::arrayValue);
+            json::Value jv(json::ArrayValue);
             jv.append("invalid");
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
             BEAST_EXPECT(resp.result() == boost::beast::http::status::bad_request);
@@ -1032,8 +1030,8 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            Json::Value jv(Json::arrayValue);
-            Json::Value j;
+            json::Value jv(json::ArrayValue);
+            json::Value j;
             j["invalid"] = 1;
             jv.append(j);
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
@@ -1043,7 +1041,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            Json::Value jv;
+            json::Value jv;
             jv[jss::method] = "batch";
             jv[jss::params] = 2;
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
@@ -1053,19 +1051,19 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            Json::Value jv;
+            json::Value jv;
             jv[jss::method] = "batch";
-            jv[jss::params] = Json::objectValue;
+            jv[jss::params] = json::ObjectValue;
             jv[jss::params]["invalid"] = 3;
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
             BEAST_EXPECT(resp.result() == boost::beast::http::status::bad_request);
             BEAST_EXPECT(resp.body() == "Malformed batch request\r\n");
         }
 
-        Json::Value jv;
+        json::Value jv;
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            jv[jss::method] = Json::nullValue;
+            jv[jss::method] = json::NullValue;
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
             BEAST_EXPECT(resp.result() == boost::beast::http::status::bad_request);
             BEAST_EXPECT(resp.body() == "Null method\r\n");
@@ -1098,7 +1096,7 @@ class ServerStatus_test : public beast::unit_test::suite, public beast::test::en
 
         {
             boost::beast::http::response<boost::beast::http::string_body> resp;
-            jv[jss::params] = Json::arrayValue;
+            jv[jss::params] = json::ArrayValue;
             jv[jss::params][0u] = "not an object";
             doHTTPRequest(env, yield, false, resp, ec, to_string(jv));
             BEAST_EXPECT(resp.result() == boost::beast::http::status::bad_request);
@@ -1139,7 +1137,7 @@ public:
             testAdminRequest(it, false, false);
         }
 
-        yield_to([&](boost::asio::yield_context& yield) {
+        yieldTo([&](boost::asio::yield_context& yield) {
             testWSClientToHttpServer(yield);
             testStatusRequest(yield);
             testTruncatedWSUpgrade(yield);
diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp
index 462df0d707..3bddf489d6 100644
--- a/src/test/server/Server_test.cpp
+++ b/src/test/server/Server_test.cpp
@@ -42,7 +42,7 @@ namespace xrpl::test {
 using socket_type = boost::beast::tcp_stream;
 using stream_type = boost::beast::ssl_stream<socket_type>;
 
-class Server_test : public beast::unit_test::suite
+class Server_test : public beast::unit_test::Suite
 {
 public:
     class TestThread
@@ -67,7 +67,7 @@ public:
         }
 
         boost::asio::io_context&
-        get_io_context()
+        getIoContext()
         {
             return io_context_;
         }
@@ -77,11 +77,11 @@ public:
 
     class TestSink : public beast::Journal::Sink
     {
-        beast::unit_test::suite& suite_;
+        beast::unit_test::Suite& suite_;
 
     public:
-        explicit TestSink(beast::unit_test::suite& suite)
-            : Sink(beast::severities::kWarning, false), suite_(suite)
+        explicit TestSink(beast::unit_test::Suite& suite)
+            : Sink(beast::severities::KWarning, false), suite_(suite)
         {
         }
 
@@ -116,7 +116,7 @@ public:
             Session& session,
             std::unique_ptr<stream_type> const& bundle,
             http_request_type const& request,
-            boost::asio::ip::tcp::endpoint remote_address)
+            boost::asio::ip::tcp::endpoint remoteAddress)
         {
             return Handoff{};
         }
@@ -125,7 +125,7 @@ public:
         onHandoff(
             Session& session,
             http_request_type const& request,
-            boost::asio::ip::tcp::endpoint remote_address)
+            boost::asio::ip::tcp::endpoint remoteAddress)
         {
             return Handoff{};
         }
@@ -134,7 +134,7 @@ public:
         onRequest(Session& session)
         {
             session.write(std::string("Hello, world!\n"));
-            if (beast::rfc2616::is_keep_alive(session.request()))
+            if (beast::rfc2616::isKeepAlive(session.request()))
             {
                 session.complete();
             }
@@ -204,7 +204,7 @@ public:
     // Expect that reading the stream produces a matching string
     template <class SyncReadStream>
     bool
-    expect_read(SyncReadStream& s, std::string const& match)
+    expectRead(SyncReadStream& s, std::string const& match)
     {
         boost::asio::streambuf b(1000);  // limit on read
         try
@@ -230,7 +230,7 @@ public:
     }
 
     void
-    test_request(boost::asio::ip::tcp::endpoint const& ep)
+    testRequest(boost::asio::ip::tcp::endpoint const& ep)
     {
         boost::asio::io_context ios;
         using socket = boost::asio::ip::tcp::socket;
@@ -246,7 +246,7 @@ public:
                 "\r\n"))
             return;
 
-        if (!expect_read(s, "Hello, world!\n"))
+        if (!expectRead(s, "Hello, world!\n"))
             return;
 
         boost::system::error_code ec;
@@ -256,7 +256,7 @@ public:
     }
 
     void
-    test_keepalive(boost::asio::ip::tcp::endpoint const& ep)
+    testKeepalive(boost::asio::ip::tcp::endpoint const& ep)
     {
         boost::asio::io_context ios;
         using socket = boost::asio::ip::tcp::socket;
@@ -272,7 +272,7 @@ public:
                 "\r\n"))
             return;
 
-        if (!expect_read(s, "Hello, world!\n"))
+        if (!expectRead(s, "Hello, world!\n"))
             return;
 
         if (!write(
@@ -282,7 +282,7 @@ public:
                 "\r\n"))
             return;
 
-        if (!expect_read(s, "Hello, world!\n"))
+        if (!expectRead(s, "Hello, world!\n"))
             return;
 
         boost::system::error_code ec;
@@ -295,17 +295,17 @@ public:
         testcase("Basic client/server");
         TestSink sink{*this};
         TestThread thread;
-        sink.threshold(beast::severities::Severity::kAll);
+        sink.threshold(beast::severities::Severity::KAll);
         beast::Journal const journal{sink};
         TestHandler handler;
-        auto s = make_Server(handler, thread.get_io_context(), journal);
+        auto s = makeServer(handler, thread.getIoContext(), journal);
         std::vector<Port> serverPort(1);
         serverPort.back().ip = boost::asio::ip::make_address(getEnvLocalhostAddr()),
         serverPort.back().port = 0;
         serverPort.back().protocol.insert("http");
         auto eps = s->ports(serverPort);
-        test_request(eps.begin()->second);
-        test_keepalive(eps.begin()->second);
+        testRequest(eps.begin()->second);
+        testKeepalive(eps.begin()->second);
         // s->close();
         s = nullptr;
         pass();
@@ -328,7 +328,7 @@ public:
                 Session& session,
                 std::unique_ptr<stream_type> const& bundle,
                 http_request_type const& request,
-                boost::asio::ip::tcp::endpoint remote_address)
+                boost::asio::ip::tcp::endpoint remoteAddress)
             {
                 return Handoff{};
             }
@@ -337,7 +337,7 @@ public:
             onHandoff(
                 Session& session,
                 http_request_type const& request,
-                boost::asio::ip::tcp::endpoint remote_address)
+                boost::asio::ip::tcp::endpoint remoteAddress)
             {
                 return Handoff{};
             }
@@ -372,7 +372,7 @@ public:
         for (int i = 0; i < 1000; ++i)
         {
             TestThread thread;
-            auto s = make_Server(h, thread.get_io_context(), journal);
+            auto s = makeServer(h, thread.getIoContext(), journal);
             std::vector<Port> serverPort(1);
             serverPort.back().ip = boost::asio::ip::make_address(getEnvLocalhostAddr()),
             serverPort.back().port = 0;
diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp
index a68b0442d0..85cccfd6ab 100644
--- a/src/test/shamap/FetchPack_test.cpp
+++ b/src/test/shamap/FetchPack_test.cpp
@@ -30,12 +30,12 @@
 
 namespace xrpl::tests {
 
-class FetchPack_test : public beast::unit_test::suite
+class FetchPack_test : public beast::unit_test::Suite
 {
 public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { tableItems = 100, tableItemsExtra = 20 };
+    enum { TableItems = 100, TableItemsExtra = 20 };
 
     using Map = hash_map<SHAMapHash, Blob>;
     using Table = SHAMap;
@@ -52,7 +52,7 @@ public:
 
     struct TestFilter : SHAMapSyncFilter
     {
-        TestFilter(Map& map, beast::Journal journal) : mMap(map), mJournal(journal)
+        TestFilter(Map& map, beast::Journal journal) : map(map), journal(journal)
         {
         }
 
@@ -69,43 +69,43 @@ public:
         [[nodiscard]] std::optional<Blob>
         getNode(SHAMapHash const& nodeHash) const override
         {
-            Map::iterator const it = mMap.find(nodeHash);
-            if (it == mMap.end())
+            Map::iterator const it = map.find(nodeHash);
+            if (it == map.end())
             {
-                JLOG(mJournal.fatal()) << "Test filter missing node";
+                JLOG(journal.fatal()) << "Test filter missing node";
                 return std::nullopt;
             }
             return it->second;
         }
 
-        Map& mMap;
-        beast::Journal mJournal;
+        Map& map;
+        beast::Journal journal;
     };
 
     static boost::intrusive_ptr<Item>
-    make_random_item(beast::xor_shift_engine& r)
+    makeRandomItemMember(beast::xor_shift_engine& r)
     {
         Serializer s;
         for (int d = 0; d < 3; ++d)
-            s.add32(xrpl::rand_int<std::uint32_t>(r));
-        return make_shamapitem(s.getSHA512Half(), s.slice());
+            s.add32(xrpl::randInt<std::uint32_t>(r));
+        return makeShamapitem(s.getSHA512Half(), s.slice());
     }
 
     static void
-    add_random_items(std::size_t n, Table& t, beast::xor_shift_engine& r)
+    addRandomItems(std::size_t n, Table& t, beast::xor_shift_engine& r)
     {
         while ((n--) != 0u)
         {
-            auto const result(t.addItem(SHAMapNodeType::tnACCOUNT_STATE, make_random_item(r)));
+            auto const result(t.addItem(SHAMapNodeType::TnAccountState, makeRandomItemMember(r)));
             assert(result);
             (void)result;
         }
     }
 
     void
-    on_fetch(Map& map, SHAMapHash const& hash, Blob const& blob)
+    onFetch(Map& map, SHAMapHash const& hash, Blob const& blob)
     {
-        BEAST_EXPECT(sha512Half(makeSlice(blob)) == hash.as_uint256());
+        BEAST_EXPECT(sha512Half(makeSlice(blob)) == hash.asUint256());
         map.emplace(hash, blob);
     }
 
@@ -121,11 +121,11 @@ public:
         pass();
 
         //         beast::Random r;
-        //         add_random_items (tableItems, *t1, r);
+        //         add_random_items_ (tableItems, *t1, r);
         //         std::shared_ptr <Table> t2 (t1->snapShot (true));
         //
-        //         add_random_items (tableItemsExtra, *t1, r);
-        //         add_random_items (tableItemsExtra, *t2, r);
+        //         add_random_items_ (tableItemsExtra, *t1, r);
+        //         add_random_items_ (tableItemsExtra, *t2, r);
 
         // turn t1 into t2
         //         Map map;
diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp
index a1db1875d3..18ab73fc96 100644
--- a/src/test/shamap/SHAMapSync_test.cpp
+++ b/src/test/shamap/SHAMapSync_test.cpp
@@ -26,10 +26,10 @@
 
 namespace xrpl::tests {
 
-class SHAMapSync_test : public beast::unit_test::suite
+class SHAMapSync_test : public beast::unit_test::Suite
 {
 public:
-    beast::xor_shift_engine eng_;
+    beast::xor_shift_engine eng;
 
     boost::intrusive_ptr<SHAMapItem>
     makeRandomAS()
@@ -37,8 +37,8 @@ public:
         Serializer s;
 
         for (int d = 0; d < 3; ++d)
-            s.add32(rand_int<std::uint32_t>(eng_));
-        return make_shamapitem(s.getSHA512Half(), s.slice());
+            s.add32(randInt<std::uint32_t>(eng));
+        return makeShamapitem(s.getSHA512Half(), s.slice());
     }
 
     bool
@@ -55,7 +55,7 @@ public:
             auto item = makeRandomAS();
             items.push_back(item->key());
 
-            if (!map.addItem(SHAMapNodeType::tnACCOUNT_STATE, item))
+            if (!map.addItem(SHAMapNodeType::TnAccountState, item))
             {
                 log << "Unable to add item to map\n";
                 return false;
@@ -93,7 +93,7 @@ public:
         int const items = 10000;
         for (int i = 0; i < items; ++i)
         {
-            source.addItem(SHAMapNodeType::tnACCOUNT_STATE, makeRandomAS());
+            source.addItem(SHAMapNodeType::TnAccountState, makeRandomAS());
             if (i % 100 == 0)
                 source.invariants();
         }
@@ -117,7 +117,7 @@ public:
         {
             std::vector<std::pair<SHAMapNodeID, Blob>> a;
 
-            BEAST_EXPECT(source.getNodeFat(SHAMapNodeID(), a, rand_bool(eng_), rand_int(eng_, 2)));
+            BEAST_EXPECT(source.getNodeFat(SHAMapNodeID(), a, randBool(eng), randInt(eng, 2)));
 
             unexpected(a.empty(), "NodeSize");
 
@@ -143,7 +143,7 @@ public:
                 // Don't use BEAST_EXPECT here b/c it will be called a
                 // non-deterministic number of times and the number of tests run
                 // should be deterministic
-                if (!source.getNodeFat(it.first, b, rand_bool(eng_), rand_int(eng_, 2)))
+                if (!source.getNodeFat(it.first, b, randBool(eng), randInt(eng, 2)))
                     fail("", __FILE__, __LINE__);
             }
 
diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp
index 8bbc4ae084..37def20f81 100644
--- a/src/test/shamap/SHAMap_test.cpp
+++ b/src/test/shamap/SHAMap_test.cpp
@@ -33,11 +33,11 @@ static_assert(!std::is_copy_assignable<SHAMap>{}, "");
 static_assert(!std::is_move_constructible<SHAMap>{}, "");
 static_assert(!std::is_move_assignable<SHAMap>{}, "");
 
-static_assert(std::is_nothrow_destructible<SHAMap::const_iterator>{}, "");
-static_assert(std::is_copy_constructible<SHAMap::const_iterator>{}, "");
-static_assert(std::is_copy_assignable<SHAMap::const_iterator>{}, "");
-static_assert(std::is_move_constructible<SHAMap::const_iterator>{}, "");
-static_assert(std::is_move_assignable<SHAMap::const_iterator>{}, "");
+static_assert(std::is_nothrow_destructible<SHAMap::ConstIterator>{}, "");
+static_assert(std::is_copy_constructible<SHAMap::ConstIterator>{}, "");
+static_assert(std::is_copy_assignable<SHAMap::ConstIterator>{}, "");
+static_assert(std::is_move_constructible<SHAMap::ConstIterator>{}, "");
+static_assert(std::is_move_assignable<SHAMap::ConstIterator>{}, "");
 
 static_assert(std::is_nothrow_destructible<SHAMapItem>{}, "");
 static_assert(!std::is_default_constructible<SHAMapItem>{}, "");
@@ -100,11 +100,11 @@ operator!=(SHAMapItem const& a, uint256 const& b)
     return a.key() != b;
 }
 
-class SHAMap_test : public beast::unit_test::suite
+class SHAMap_test : public beast::unit_test::Suite
 {
 public:
     static Buffer
-    IntToVUC(int v)
+    intToVuc(int v)
     {
         Buffer vuc(32);
         std::fill_n(vuc.data(), vuc.size(), static_cast<std::uint8_t>(v));
@@ -136,26 +136,26 @@ public:
         tests::TestNodeFamily f(journal);
 
         // h3 and h4 differ only in the leaf, same terminal node (level 19)
-        constexpr uint256 h1("092891fe4ef6cee585fdc6fda0e09eb4d386363158ec3321b8123e5a772c6ca7");
-        constexpr uint256 h2("436ccbac3347baa1f1e53baeef1f43334da88f1f6d70d963b833afd6dfa289fe");
-        constexpr uint256 h3("b92891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e5a772c6ca8");
-        constexpr uint256 h4("b92891fe4ef6cee585fdc6fda2e09eb4d386363158ec3321b8123e5a772c6ca8");
-        constexpr uint256 h5("a92891fe4ef6cee585fdc6fda0e09eb4d386363158ec3321b8123e5a772c6ca7");
+        constexpr uint256 kH1("092891fe4ef6cee585fdc6fda0e09eb4d386363158ec3321b8123e5a772c6ca7");
+        constexpr uint256 kH2("436ccbac3347baa1f1e53baeef1f43334da88f1f6d70d963b833afd6dfa289fe");
+        constexpr uint256 kH3("b92891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e5a772c6ca8");
+        constexpr uint256 kH4("b92891fe4ef6cee585fdc6fda2e09eb4d386363158ec3321b8123e5a772c6ca8");
+        constexpr uint256 kH5("a92891fe4ef6cee585fdc6fda0e09eb4d386363158ec3321b8123e5a772c6ca7");
 
         SHAMap sMap(SHAMapType::FREE, f);
         sMap.invariants();
         if (!backed)
             sMap.setUnbacked();
 
-        auto i1 = make_shamapitem(h1, IntToVUC(1));
-        auto i2 = make_shamapitem(h2, IntToVUC(2));
-        auto i3 = make_shamapitem(h3, IntToVUC(3));
-        auto i4 = make_shamapitem(h4, IntToVUC(4));
-        auto i5 = make_shamapitem(h5, IntToVUC(5));
+        auto i1 = makeShamapitem(kH1, intToVuc(1));
+        auto i2 = makeShamapitem(kH2, intToVuc(2));
+        auto i3 = makeShamapitem(kH3, intToVuc(3));
+        auto i4 = makeShamapitem(kH4, intToVuc(4));
+        auto i5 = makeShamapitem(kH5, intToVuc(5));
 
-        unexpected(!sMap.addItem(SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(*i2)), "no add");
+        unexpected(!sMap.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(*i2)), "no add");
         sMap.invariants();
-        unexpected(!sMap.addItem(SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(*i1)), "no add");
+        unexpected(!sMap.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(*i1)), "no add");
         sMap.invariants();
 
         auto i = sMap.begin();
@@ -165,11 +165,11 @@ public:
         unexpected(i == e || (*i != *i2), "bad traverse");
         ++i;
         unexpected(i != e, "bad traverse");
-        sMap.addItem(SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(*i4));
+        sMap.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(*i4));
         sMap.invariants();
         sMap.delItem(i2->key());
         sMap.invariants();
-        sMap.addItem(SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(*i3));
+        sMap.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(*i3));
         sMap.invariants();
         i = sMap.begin();
         e = sMap.end();
@@ -207,9 +207,9 @@ public:
 
         BEAST_EXPECT(sMap.compare(*map2, delta, 100));
         BEAST_EXPECT(delta.size() == 1);
-        BEAST_EXPECT(delta.begin()->first == h1);
+        BEAST_EXPECT(delta.begin()->first == kH1);
         BEAST_EXPECT(delta.begin()->second.first == nullptr);
-        BEAST_EXPECT(delta.begin()->second.second->key() == h1);
+        BEAST_EXPECT(delta.begin()->second.second->key() == kH1);
 
         sMap.dump();
 
@@ -222,7 +222,7 @@ public:
             testcase("build/tear unbacked");
         }
         {
-            constexpr std::array keys{
+            constexpr std::array kEYS{
                 uint256(
                     "b92891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8"),
@@ -248,7 +248,7 @@ public:
                     "292891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8")};
 
-            constexpr std::array hashes{
+            constexpr std::array kHASHES{
                 uint256(
                     "B7387CFEA0465759ADC718E8C42B52D2309D179B326E239EB5075C"
                     "64B6281F7F"),
@@ -278,21 +278,21 @@ public:
             if (!backed)
                 map.setUnbacked();
 
-            BEAST_EXPECT(map.getHash() == beast::zero);
-            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::tnTRANSACTION_NM, make_shamapitem(keys[k], IntToVUC(k))));
-                BEAST_EXPECT(map.getHash().as_uint256() == hashes[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().as_uint256() == hashes[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::zero);
+            BEAST_EXPECT(map.getHash() == beast::kZERO);
         }
 
         if (backed)
@@ -305,7 +305,7 @@ public:
         }
 
         {
-            constexpr std::array keys{
+            constexpr std::array kEYS{
                 uint256(
                     "f22891fe4ef6cee585fdc6fda1e09eb4d386363158ec3321b8123e"
                     "5a772c6ca8"),
@@ -335,23 +335,23 @@ public:
             SHAMap map{SHAMapType::FREE, tf};
             if (!backed)
                 map.setUnbacked();
-            for (auto const& k : keys)
+            for (auto const& k : kEYS)
             {
-                map.addItem(SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(k, IntToVUC(0)));
+                map.addItem(SHAMapNodeType::TnTransactionNm, makeShamapitem(k, intToVuc(0)));
                 map.invariants();
             }
 
             int h = 7;
             for (auto const& k : map)
             {
-                BEAST_EXPECT(k.key() == keys[h]);
+                BEAST_EXPECT(k.key() == kEYS[h]);
                 --h;
             }
         }
     }
 };
 
-class SHAMapPathProof_test : public beast::unit_test::suite
+class SHAMapPathProof_test : public beast::unit_test::Suite
 {
     void
     run() override
@@ -370,10 +370,10 @@ class SHAMapPathProof_test : public beast::unit_test::suite
         {
             uint256 k(c);
             map.addItem(
-                SHAMapNodeType::tnACCOUNT_STATE, make_shamapitem(k, Slice{k.data(), k.size()}));
+                SHAMapNodeType::TnAccountState, makeShamapitem(k, Slice{k.data(), k.size()}));
             map.invariants();
 
-            auto root = map.getHash().as_uint256();
+            auto root = map.getHash().asUint256();
             auto path = map.getProofPath(k);
             BEAST_EXPECT(path);
             if (!path)
diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h
index 3f05bc2c57..49f1c07741 100644
--- a/src/test/shamap/common.h
+++ b/src/test/shamap/common.h
@@ -35,7 +35,7 @@ public:
         Section testSection;
         testSection.set("type", "memory");
         testSection.set("path", "SHAMap_test");
-        db_ = NodeStore::Manager::instance().make_Database(
+        db_ = NodeStore::Manager::instance().makeDatabase(
             megabytes(4), scheduler_, 1, testSection, j);
     }
 
@@ -95,7 +95,7 @@ public:
         (*tnCache_).reset();
     }
 
-    beast::manual_clock<std::chrono::steady_clock>
+    beast::ManualClock<std::chrono::steady_clock>
     clock()
     {
         return clock_;
diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h
index 20520eac3d..4966b8089c 100644
--- a/src/test/unit_test/FileDirGuard.h
+++ b/src/test/unit_test/FileDirGuard.h
@@ -23,7 +23,7 @@ private:
     bool rmSubDir_{false};
 
 protected:
-    beast::unit_test::suite& test_;
+    beast::unit_test::Suite& test_;
 
     auto
     rmDir(path const& toRm)
@@ -40,14 +40,14 @@ protected:
     }
 
 public:
-    DirGuard(beast::unit_test::suite& test, path subDir, bool useCounter = true)
+    DirGuard(beast::unit_test::Suite& test, path subDir, bool useCounter = true)
         : subDir_(std::move(subDir)), test_(test)
     {
         using namespace boost::filesystem;
 
-        static auto subDirCounter = 0;
+        static auto kSUB_DIR_COUNTER = 0;
         if (useCounter)
-            subDir_ += std::to_string(++subDirCounter);
+            subDir_ += std::to_string(++kSUB_DIR_COUNTER);
         if (!exists(subDir_))
         {
             create_directory(subDir_);
@@ -99,7 +99,7 @@ protected:
 
 public:
     FileDirGuard(
-        beast::unit_test::suite& test,
+        beast::unit_test::Suite& test,
         path subDir,
         path file,
         std::string const& contents,
diff --git a/src/test/unit_test/SuiteJournal.h b/src/test/unit_test/SuiteJournal.h
index b0b3807dd3..32b085ffe6 100644
--- a/src/test/unit_test/SuiteJournal.h
+++ b/src/test/unit_test/SuiteJournal.h
@@ -9,13 +9,13 @@ namespace xrpl::test {
 class SuiteJournalSink : public beast::Journal::Sink
 {
     std::string partition_;
-    beast::unit_test::suite& suite_;
+    beast::unit_test::Suite& suite_;
 
 public:
     SuiteJournalSink(
         std::string const& partition,
         beast::severities::Severity threshold,
-        beast::unit_test::suite& suite)
+        beast::unit_test::Suite& suite)
         : Sink(threshold, false), partition_(partition + " "), suite_(suite)
     {
     }
@@ -50,26 +50,26 @@ SuiteJournalSink::writeAlways(beast::severities::Severity level, std::string con
     char const* const s = [level]() {
         switch (level)
         {
-            case kTrace:
+            case KTrace:
                 return "TRC:";
-            case kDebug:
+            case KDebug:
                 return "DBG:";
-            case kInfo:
+            case KInfo:
                 return "INF:";
-            case kWarning:
+            case KWarning:
                 return "WRN:";
-            case kError:
+            case KError:
                 return "ERR:";
             default:
                 break;
-            case kFatal:
+            case KFatal:
                 break;
         }
         return "FTL:";
     }();
 
-    static std::mutex log_mutex;
-    std::scoped_lock const lock(log_mutex);
+    static std::mutex kLOG_MUTEX;
+    std::scoped_lock const lock(kLOG_MUTEX);
     suite_.log << s << partition_ << text << std::endl;
 }
 
@@ -81,8 +81,8 @@ class SuiteJournal
 public:
     SuiteJournal(
         std::string const& partition,
-        beast::unit_test::suite& suite,
-        beast::severities::Severity threshold = beast::severities::kFatal)
+        beast::unit_test::Suite& suite,
+        beast::severities::Severity threshold = beast::severities::KFatal)
         : sink_(partition, threshold, suite), journal_(sink_)
     {
     }
@@ -100,7 +100,7 @@ class StreamSink : public beast::Journal::Sink
     std::stringstream strm_;
 
 public:
-    StreamSink(beast::severities::Severity threshold = beast::severities::kDebug)
+    StreamSink(beast::severities::Severity threshold = beast::severities::KDebug)
         : Sink(threshold, false)
     {
     }
diff --git a/src/test/unit_test/multi_runner.cpp b/src/test/unit_test/multi_runner.cpp
index 1dffece1da..86c075caf2 100644
--- a/src/test/unit_test/multi_runner.cpp
+++ b/src/test/unit_test/multi_runner.cpp
@@ -45,7 +45,7 @@ fmtdur(typename clock_type::duration const& d)
 //------------------------------------------------------------------------------
 
 void
-suite_results::add(case_results const& r)
+SuiteResults::add(CaseResults const& r)
 {
     ++cases;
     total += r.total;
@@ -55,7 +55,7 @@ suite_results::add(case_results const& r)
 //------------------------------------------------------------------------------
 
 void
-results::add(suite_results const& r)
+Results::add(SuiteResults const& r)
 {
     ++suites;
     total += r.total;
@@ -75,19 +75,19 @@ results::add(suite_results const& r)
 
         if (iter != top.end())
         {
-            if (top.size() == max_top && iter == top.end() - 1)
+            if (top.size() == MaxTop && 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() == max_top)
+                if (top.size() == MaxTop)
                     top.resize(top.size() - 1);
                 top.emplace(iter, static_string{static_string::string_view_type{r.name}}, elapsed);
             }
         }
-        else if (top.size() < max_top)
+        else if (top.size() < MaxTop)
         {
             top.emplace_back(static_string{static_string::string_view_type{r.name}}, elapsed);
         }
@@ -95,7 +95,7 @@ results::add(suite_results const& r)
 }
 
 void
-results::merge(results const& r)
+Results::merge(Results const& r)
 {
     suites += r.suites;
     total += r.total;
@@ -103,21 +103,21 @@ results::merge(results const& r)
     failed += r.failed;
 
     // combine the two top collections
-    boost::container::static_vector<run_time, 2 * max_top> top_result;
-    top_result.resize(top.size() + r.top.size());
-    std::ranges::merge(top, r.top, top_result.begin(), [](run_time const& t1, run_time const& t2) {
+    boost::container::static_vector<run_time, 2 * MaxTop> 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 (top_result.size() > max_top)
-        top_result.resize(max_top);
+    if (topResult.size() > MaxTop)
+        topResult.resize(MaxTop);
 
-    top = top_result;
+    top = topResult;
 }
 
 template <class S>
 void
-results::print(S& s)
+Results::print(S& s)
 {
     using namespace beast::unit_test;
 
@@ -129,97 +129,97 @@ results::print(S& s)
     }
 
     auto const elapsed = clock_type::now() - start;
-    s << fmtdur(elapsed) << ", " << amount{suites, "suite"} << ", " << amount{cases, "case"} << ", "
-      << amount{total, "test"} << " total, " << amount{failed, "failure"} << std::endl;
+    s << fmtdur(elapsed) << ", " << Amount{suites, "suite"} << ", " << Amount{cases, "case"} << ", "
+      << Amount{total, "test"} << " total, " << Amount{failed, "failure"} << std::endl;
 }
 
 //------------------------------------------------------------------------------
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::inner::checkout_job_index()
+MultiRunnerBase<IsParent>::Inner::checkoutJobIndex()
 {
-    return job_index_++;
+    return job_index++;
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::inner::checkout_test_index()
+MultiRunnerBase<IsParent>::Inner::checkoutTestIndex()
 {
-    return test_index_++;
+    return test_index++;
 }
 
 template <bool IsParent>
 bool
-multi_runner_base<IsParent>::inner::any_failed() const
+MultiRunnerBase<IsParent>::Inner::anyFailed() const
 {
-    return any_failed_;
+    return any_failed;
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::inner::any_failed(bool v)
+MultiRunnerBase<IsParent>::Inner::anyFailed(bool v)
 {
-    any_failed_ = any_failed_ || v;
+    any_failed = any_failed || v;
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::inner::tests() const
+MultiRunnerBase<IsParent>::Inner::tests() const
 {
-    std::scoped_lock const l{m_};
-    return results_.total;
+    std::scoped_lock const l{m};
+    return results.total;
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::inner::suites() const
+MultiRunnerBase<IsParent>::Inner::suites() const
 {
-    std::scoped_lock const l{m_};
-    return results_.suites;
+    std::scoped_lock const l{m};
+    return results.suites;
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::inner::inc_keep_alive_count()
+MultiRunnerBase<IsParent>::Inner::incKeepAliveCount()
 {
-    ++keep_alive_;
+    ++keep_alive;
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::inner::get_keep_alive_count()
+MultiRunnerBase<IsParent>::Inner::getKeepAliveCount()
 {
-    return keep_alive_;
+    return keep_alive;
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::inner::add(results const& r)
+MultiRunnerBase<IsParent>::Inner::add(Results const& r)
 {
-    std::scoped_lock const l{m_};
-    results_.merge(r);
+    std::scoped_lock const l{m};
+    results.merge(r);
 }
 
 template <bool IsParent>
 template <class S>
 void
-multi_runner_base<IsParent>::inner::print_results(S& s)
+MultiRunnerBase<IsParent>::Inner::printResults(S& s)
 {
-    std::scoped_lock const l{m_};
-    results_.print(s);
+    std::scoped_lock const l{m};
+    results.print(s);
 }
 
 template <bool IsParent>
-multi_runner_base<IsParent>::multi_runner_base()
+MultiRunnerBase<IsParent>::MultiRunnerBase()
 {
     try
     {
         if (IsParent)
         {
             // cleanup any leftover state for any previous failed runs
-            boost::interprocess::shared_memory_object::remove(shared_mem_name_);
-            boost::interprocess::message_queue::remove(message_queue_name_);
+            boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
+            boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
         }
 
         shared_mem_ = boost::interprocess::shared_memory_object{
@@ -227,145 +227,145 @@ multi_runner_base<IsParent>::multi_runner_base()
                 IsParent,
                 boost::interprocess::create_only_t,
                 boost::interprocess::open_only_t>{},
-            shared_mem_name_,
+            kSHARED_MEM_NAME,
             boost::interprocess::read_write};
 
         if (IsParent)
         {
-            shared_mem_.truncate(sizeof(inner));
+            shared_mem_.truncate(sizeof(Inner));
             message_queue_ = std::make_unique<boost::interprocess::message_queue>(
                 boost::interprocess::create_only,
-                message_queue_name_,
+                kMESSAGE_QUEUE_NAME,
                 /*max messages*/ 16,
                 /*max message size*/ 1 << 20);
         }
         else
         {
             message_queue_ = std::make_unique<boost::interprocess::message_queue>(
-                boost::interprocess::open_only, message_queue_name_);
+                boost::interprocess::open_only, kMESSAGE_QUEUE_NAME);
         }
 
         region_ = boost::interprocess::mapped_region{shared_mem_, boost::interprocess::read_write};
         if (IsParent)
         {
-            inner_ = new (region_.get_address()) inner{};
+            inner_ = new (region_.get_address()) Inner{};
         }
         else
         {
-            inner_ = reinterpret_cast<inner*>(region_.get_address());
+            inner_ = reinterpret_cast<Inner*>(region_.get_address());
         }
     }
     catch (...)
     {
         if (IsParent)
         {
-            boost::interprocess::shared_memory_object::remove(shared_mem_name_);
-            boost::interprocess::message_queue::remove(message_queue_name_);
+            boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
+            boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
         }
         throw;
     }
 }
 
 template <bool IsParent>
-multi_runner_base<IsParent>::~multi_runner_base()
+MultiRunnerBase<IsParent>::~MultiRunnerBase()
 {
     if (IsParent)
     {
-        inner_->~inner();
-        boost::interprocess::shared_memory_object::remove(shared_mem_name_);
-        boost::interprocess::message_queue::remove(message_queue_name_);
+        inner_->~Inner();
+        boost::interprocess::shared_memory_object::remove(kSHARED_MEM_NAME);
+        boost::interprocess::message_queue::remove(kMESSAGE_QUEUE_NAME);
     }
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::checkout_test_index()
+MultiRunnerBase<IsParent>::checkoutTestIndex()
 {
-    return inner_->checkout_test_index();
+    return inner_->checkoutTestIndex();
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::checkout_job_index()
+MultiRunnerBase<IsParent>::checkoutJobIndex()
 {
-    return inner_->checkout_job_index();
+    return inner_->checkoutJobIndex();
 }
 
 template <bool IsParent>
 bool
-multi_runner_base<IsParent>::any_failed() const
+MultiRunnerBase<IsParent>::anyFailed() const
 {
-    return inner_->any_failed();
+    return inner_->anyFailed();
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::any_failed(bool v)
+MultiRunnerBase<IsParent>::anyFailed(bool v)
 {
-    return inner_->any_failed(v);
+    return inner_->anyFailed(v);
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::add(results const& r)
+MultiRunnerBase<IsParent>::add(Results const& r)
 {
     inner_->add(r);
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::inc_keep_alive_count()
+MultiRunnerBase<IsParent>::incKeepAliveCount()
 {
-    inner_->inc_keep_alive_count();
+    inner_->incKeepAliveCount();
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::get_keep_alive_count()
+MultiRunnerBase<IsParent>::getKeepAliveCount()
 {
-    return inner_->get_keep_alive_count();
+    return inner_->getKeepAliveCount();
 }
 
 template <bool IsParent>
 template <class S>
 void
-multi_runner_base<IsParent>::print_results(S& s)
+MultiRunnerBase<IsParent>::printResults(S& s)
 {
-    inner_->print_results(s);
+    inner_->printResults(s);
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::message_queue_send(MessageType mt, std::string const& s)
+MultiRunnerBase<IsParent>::messageQueueSend(MessageType mt, std::string const& s)
 {
     // must use a mutex since the two "sends" must happen in order
-    std::scoped_lock const l{inner_->m_};
+    std::scoped_lock const l{inner_->m};
     message_queue_->send(&mt, sizeof(mt), /*priority*/ 0);
     message_queue_->send(s.c_str(), s.size(), /*priority*/ 0);
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::tests() const
+MultiRunnerBase<IsParent>::tests() const
 {
     return inner_->tests();
 }
 
 template <bool IsParent>
 std::size_t
-multi_runner_base<IsParent>::suites() const
+MultiRunnerBase<IsParent>::suites() const
 {
     return inner_->suites();
 }
 
 template <bool IsParent>
 void
-multi_runner_base<IsParent>::add_failures(std::size_t failures)
+MultiRunnerBase<IsParent>::addFailures(std::size_t failures)
 {
-    results results;
+    Results results;
     results.failed += failures;
     add(results);
-    any_failed(failures != 0);
+    anyFailed(failures != 0);
 }
 
 }  // namespace detail
@@ -374,14 +374,14 @@ namespace test {
 
 //------------------------------------------------------------------------------
 
-multi_runner_parent::multi_runner_parent() : os_(std::cout)
+MultiRunnerParent::MultiRunnerParent() : os_(std::cout)
 {
     message_queue_thread_ = std::thread([this] {
         std::vector<char> buf(1 << 20);
         while (this->continue_message_queue_ || this->message_queue_->get_num_msg())
         {
             // let children know the parent is still alive
-            this->inc_keep_alive_count();
+            this->incKeepAliveCount();
             if (!this->message_queue_->get_num_msg())
             {
                 // If a child does not see the keep alive count incremented,
@@ -393,28 +393,28 @@ multi_runner_parent::multi_runner_parent() : os_(std::cout)
             }
             try
             {
-                std::size_t recvd_size = 0;
+                std::size_t recvdSize = 0;
                 unsigned int priority = 0;
-                this->message_queue_->receive(buf.data(), buf.size(), recvd_size, priority);
-                if (!recvd_size)
+                this->message_queue_->receive(buf.data(), buf.size(), recvdSize, priority);
+                if (!recvdSize)
                     continue;
-                assert(recvd_size == 1);
+                assert(recvdSize == 1);
                 MessageType const mt{*reinterpret_cast<MessageType*>(buf.data())};
 
-                this->message_queue_->receive(buf.data(), buf.size(), recvd_size, priority);
-                if (recvd_size)
+                this->message_queue_->receive(buf.data(), buf.size(), recvdSize, priority);
+                if (recvdSize)
                 {
-                    std::string s{buf.data(), recvd_size};
+                    std::string s{buf.data(), recvdSize};
                     switch (mt)
                     {
-                        case MessageType::log:
+                        case MessageType::Log:
                             this->os_ << s;
                             this->os_.flush();
                             break;
-                        case MessageType::test_start:
+                        case MessageType::TestStart:
                             running_suites_.insert(std::move(s));
                             break;
-                        case MessageType::test_end:
+                        case MessageType::TestEnd:
                             running_suites_.erase(s);
                             break;
                         default:
@@ -436,16 +436,16 @@ multi_runner_parent::multi_runner_parent() : os_(std::cout)
     });
 }
 
-multi_runner_parent::~multi_runner_parent()
+MultiRunnerParent::~MultiRunnerParent()
 {
     using namespace beast::unit_test;
 
     continue_message_queue_ = false;
     message_queue_thread_.join();
 
-    add_failures(running_suites_.size());
+    addFailures(running_suites_.size());
 
-    print_results(os_);
+    printResults(os_);
 
     for (auto const& s : running_suites_)
     {
@@ -454,54 +454,54 @@ multi_runner_parent::~multi_runner_parent()
 }
 
 bool
-multi_runner_parent::any_failed() const
+MultiRunnerParent::anyFailed() const
 {
-    return multi_runner_base<true>::any_failed();
+    return MultiRunnerBase<true>::anyFailed();
 }
 
 std::size_t
-multi_runner_parent::tests() const
+MultiRunnerParent::tests() const
 {
-    return multi_runner_base<true>::tests();
+    return MultiRunnerBase<true>::tests();
 }
 
 std::size_t
-multi_runner_parent::suites() const
+MultiRunnerParent::suites() const
 {
-    return multi_runner_base<true>::suites();
+    return MultiRunnerBase<true>::suites();
 }
 
 void
-multi_runner_parent::add_failures(std::size_t failures)
+MultiRunnerParent::addFailures(std::size_t failures)
 {
-    multi_runner_base<true>::add_failures(failures);
+    MultiRunnerBase<true>::addFailures(failures);
 }
 
 //------------------------------------------------------------------------------
 
-multi_runner_child::multi_runner_child(std::size_t num_jobs, bool quiet, bool print_log)
-    : job_index_{checkout_job_index()}
-    , num_jobs_{num_jobs}
+MultiRunnerChild::MultiRunnerChild(std::size_t numJobs, bool quiet, bool printLog)
+    : job_index_{checkoutJobIndex()}
+    , num_jobs_{numJobs}
     , quiet_{quiet}
-    , print_log_{!quiet || print_log}
+    , print_log_{!quiet || printLog}
 {
     if (num_jobs_ > 1)
     {
         keep_alive_thread_ = std::thread([this] {
-            std::size_t last_count = get_keep_alive_count();
+            std::size_t lastCount = getKeepAliveCount();
             while (this->continue_keep_alive_)
             {
                 // Use a small sleep time so in the normal case the child
                 // process may shutdown quickly. However, to protect against
                 // false alarms, use a longer sleep time later on.
                 std::this_thread::sleep_for(std::chrono::milliseconds(500));
-                auto cur_count = this->get_keep_alive_count();
-                if (cur_count == last_count)
+                auto curCount = this->getKeepAliveCount();
+                if (curCount == lastCount)
                 {
                     // longer sleep time to protect against false alarms
                     std::this_thread::sleep_for(std::chrono::seconds(2));
-                    cur_count = this->get_keep_alive_count();
-                    if (cur_count == last_count)
+                    curCount = this->getKeepAliveCount();
+                    if (curCount == lastCount)
                     {
                         // assume parent process is no longer alive
                         std::cerr << "multi_runner_child " << job_index_
@@ -509,13 +509,13 @@ multi_runner_child::multi_runner_child(std::size_t num_jobs, bool quiet, bool pr
                         std::exit(EXIT_FAILURE);
                     }
                 }
-                last_count = cur_count;
+                lastCount = curCount;
             }
         });
     }
 }
 
-multi_runner_child::~multi_runner_child()
+MultiRunnerChild::~MultiRunnerChild()
 {
     if (num_jobs_ > 1)
     {
@@ -527,33 +527,33 @@ multi_runner_child::~multi_runner_child()
 }
 
 std::size_t
-multi_runner_child::tests() const
+MultiRunnerChild::tests() const
 {
     return results_.total;
 }
 
 std::size_t
-multi_runner_child::suites() const
+MultiRunnerChild::suites() const
 {
     return results_.suites;
 }
 
 void
-multi_runner_child::add_failures(std::size_t failures)
+MultiRunnerChild::addFailures(std::size_t failures)
 {
     results_.failed += failures;
-    any_failed(failures != 0);
+    anyFailed(failures != 0);
 }
 
 void
-multi_runner_child::on_suite_begin(beast::unit_test::suite_info const& info)
+MultiRunnerChild::onSuiteBegin(beast::unit_test::SuiteInfo const& info)
 {
-    suite_results_ = detail::suite_results{info.full_name()};
-    message_queue_send(MessageType::test_start, suite_results_.name);
+    suite_results_ = detail::SuiteResults{info.fullName()};
+    messageQueueSend(MessageType::TestStart, suite_results_.name);
 }
 
 void
-multi_runner_child::on_suite_end()
+MultiRunnerChild::onSuiteEnd()
 {
     if (print_log_ || suite_results_.failed > 0)
     {
@@ -562,16 +562,16 @@ multi_runner_child::on_suite_end()
             s << job_index_ << "> ";
         s << (suite_results_.failed > 0 ? "failed: " : "") << suite_results_.name << " had "
           << suite_results_.failed << " failures." << std::endl;
-        message_queue_send(MessageType::log, s.str());
+        messageQueueSend(MessageType::Log, s.str());
     }
     results_.add(suite_results_);
-    message_queue_send(MessageType::test_end, suite_results_.name);
+    messageQueueSend(MessageType::TestEnd, suite_results_.name);
 }
 
 void
-multi_runner_child::on_case_begin(std::string const& name)
+MultiRunnerChild::onCaseBegin(std::string const& name)
 {
-    case_results_ = detail::case_results(name);
+    case_results_ = detail::CaseResults(name);
 
     if (quiet_)
         return;
@@ -581,23 +581,23 @@ multi_runner_child::on_case_begin(std::string const& name)
         s << job_index_ << "> ";
     s << suite_results_.name << (case_results_.name.empty() ? "" : (" " + case_results_.name))
       << '\n';
-    message_queue_send(MessageType::log, s.str());
+    messageQueueSend(MessageType::Log, s.str());
 }
 
 void
-multi_runner_child::on_case_end()
+MultiRunnerChild::onCaseEnd()
 {
     suite_results_.add(case_results_);
 }
 
 void
-multi_runner_child::on_pass()
+MultiRunnerChild::onPass()
 {
     ++case_results_.total;
 }
 
 void
-multi_runner_child::on_fail(std::string const& reason)
+MultiRunnerChild::onFail(std::string const& reason)
 {
     ++case_results_.failed;
     ++case_results_.total;
@@ -605,11 +605,11 @@ multi_runner_child::on_fail(std::string const& reason)
     if (num_jobs_ > 1)
         s << job_index_ << "> ";
     s << "#" << case_results_.total << " failed" << (reason.empty() ? "" : ": ") << reason << '\n';
-    message_queue_send(MessageType::log, s.str());
+    messageQueueSend(MessageType::Log, s.str());
 }
 
 void
-multi_runner_child::on_log(std::string const& msg)
+MultiRunnerChild::onLog(std::string const& msg)
 {
     if (!print_log_)
         return;
@@ -618,14 +618,14 @@ multi_runner_child::on_log(std::string const& msg)
     if (num_jobs_ > 1)
         s << job_index_ << "> ";
     s << msg;
-    message_queue_send(MessageType::log, s.str());
+    messageQueueSend(MessageType::Log, s.str());
 }
 
 }  // namespace test
 
 namespace detail {
-template class multi_runner_base<true>;
-template class multi_runner_base<false>;
+template class MultiRunnerBase<true>;
+template class MultiRunnerBase<false>;
 }  // namespace detail
 
 }  // namespace xrpl
diff --git a/src/test/unit_test/multi_runner.h b/src/test/unit_test/multi_runner.h
index 4ccedf9498..9c83c29141 100644
--- a/src/test/unit_test/multi_runner.h
+++ b/src/test/unit_test/multi_runner.h
@@ -25,18 +25,18 @@ namespace detail {
 
 using clock_type = std::chrono::steady_clock;
 
-struct case_results
+struct CaseResults
 {
     std::string name;
     std::size_t total = 0;
     std::size_t failed = 0;
 
-    explicit case_results(std::string name_ = "") : name(std::move(name_))
+    explicit CaseResults(std::string name = "") : name(std::move(name))
     {
     }
 };
 
-struct suite_results
+struct SuiteResults
 {
     std::string name;
     std::size_t cases = 0;
@@ -44,15 +44,15 @@ struct suite_results
     std::size_t failed = 0;
     typename clock_type::time_point start = clock_type::now();
 
-    explicit suite_results(std::string name_ = "") : name(std::move(name_))
+    explicit SuiteResults(std::string name = "") : name(std::move(name))
     {
     }
 
     void
-    add(case_results const& r);
+    add(CaseResults const& r);
 };
 
-struct results
+struct Results
 {
     using static_string = boost::beast::static_string<256>;
     // results may be stored in shared memory. Use `static_string` to ensure
@@ -61,20 +61,20 @@ struct results
 
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
-    enum { max_top = 10 };
+    enum { MaxTop = 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, max_top> top;
+    boost::container::static_vector<run_time, MaxTop> top;
     typename clock_type::time_point start = clock_type::now();
 
     void
-    add(suite_results const& r);
+    add(SuiteResults const& r);
 
     void
-    merge(results const& r);
+    merge(Results const& r);
 
     template <class S>
     void
@@ -82,36 +82,36 @@ struct results
 };
 
 template <bool IsParent>
-class multi_runner_base
+class MultiRunnerBase
 {
     // `inner` will be created in shared memory. This is one way
     // multi_runner_parent and multi_runner_child object communicate. The other
     // way they communicate is through message queues.
-    struct inner
+    struct Inner
     {
-        std::atomic<std::size_t> job_index_{0};
-        std::atomic<std::size_t> test_index_{0};
-        std::atomic<bool> any_failed_{false};
+        std::atomic<std::size_t> job_index{0};
+        std::atomic<std::size_t> test_index{0};
+        std::atomic<bool> any_failed{false};
         // A parent process will periodically increment `keep_alive_`. The child
         // processes will check if `keep_alive_` is being incremented. If it is
         // not incremented for a sufficiently long time, the child will assume
         // the parent process has died.
-        std::atomic<std::size_t> keep_alive_{0};
+        std::atomic<std::size_t> keep_alive{0};
 
-        mutable boost::interprocess::interprocess_mutex m_;
-        detail::results results_;
+        mutable boost::interprocess::interprocess_mutex m;
+        detail::Results results;
 
         std::size_t
-        checkout_job_index();
+        checkoutJobIndex();
 
         std::size_t
-        checkout_test_index();
+        checkoutTestIndex();
 
         bool
-        any_failed() const;
+        anyFailed() const;
 
         void
-        any_failed(bool v);
+        anyFailed(bool v);
 
         std::size_t
         tests() const;
@@ -120,26 +120,26 @@ class multi_runner_base
         suites() const;
 
         void
-        inc_keep_alive_count();
+        incKeepAliveCount();
 
         std::size_t
-        get_keep_alive_count();
+        getKeepAliveCount();
 
         void
-        add(results const& r);
+        add(Results const& r);
 
         template <class S>
         void
-        print_results(S& s);
+        printResults(S& s);
     };
 
-    static constexpr char const* shared_mem_name_ = "XrpldUnitTestSharedMem";
+    static constexpr char const* kSHARED_MEM_NAME = "XrpldUnitTestSharedMem";
     // name of the message queue a multi_runner_child will use to communicate
     // with multi_runner_parent
-    static constexpr char const* message_queue_name_ = "XrpldUnitTestMessageQueue";
+    static constexpr char const* kMESSAGE_QUEUE_NAME = "XrpldUnitTestMessageQueue";
 
     // `inner_` will be created in shared memory
-    inner* inner_;
+    Inner* inner_;
     // shared memory to use for the `inner` member
     boost::interprocess::shared_memory_object shared_mem_;
     boost::interprocess::mapped_region region_;
@@ -147,38 +147,38 @@ class multi_runner_base
 protected:
     std::unique_ptr<boost::interprocess::message_queue> message_queue_;
 
-    enum class MessageType : std::uint8_t { test_start, test_end, log };
+    enum class MessageType : std::uint8_t { TestStart, TestEnd, Log };
     void
-    message_queue_send(MessageType mt, std::string const& s);
+    messageQueueSend(MessageType mt, std::string const& s);
 
 public:
-    multi_runner_base();
-    ~multi_runner_base();
+    MultiRunnerBase();
+    ~MultiRunnerBase();
 
     std::size_t
-    checkout_test_index();
+    checkoutTestIndex();
 
     std::size_t
-    checkout_job_index();
+    checkoutJobIndex();
 
     void
-    any_failed(bool v);
+    anyFailed(bool v);
 
     void
-    add(results const& r);
+    add(Results const& r);
 
     void
-    inc_keep_alive_count();
+    incKeepAliveCount();
 
     std::size_t
-    get_keep_alive_count();
+    getKeepAliveCount();
 
     template <class S>
     void
-    print_results(S& s);
+    printResults(S& s);
 
     [[nodiscard]] bool
-    any_failed() const;
+    anyFailed() const;
 
     [[nodiscard]] std::size_t
     tests() const;
@@ -187,7 +187,7 @@ public:
     suites() const;
 
     void
-    add_failures(std::size_t failures);
+    addFailures(std::size_t failures);
 };
 
 }  // namespace detail
@@ -198,7 +198,7 @@ namespace test {
 
 /** Manager for children running unit tests
  */
-class multi_runner_parent : private detail::multi_runner_base</*IsParent*/ true>
+class MultiRunnerParent : private detail::MultiRunnerBase</*IsParent*/ true>
 {
 private:
     // message_queue_ is used to collect log messages from the children
@@ -209,15 +209,15 @@ private:
     std::set<std::string> running_suites_;
 
 public:
-    multi_runner_parent(multi_runner_parent const&) = delete;
-    multi_runner_parent&
-    operator=(multi_runner_parent const&) = delete;
+    MultiRunnerParent(MultiRunnerParent const&) = delete;
+    MultiRunnerParent&
+    operator=(MultiRunnerParent const&) = delete;
 
-    multi_runner_parent();
-    ~multi_runner_parent();
+    MultiRunnerParent();
+    ~MultiRunnerParent();
 
     [[nodiscard]] bool
-    any_failed() const;
+    anyFailed() const;
 
     [[nodiscard]] std::size_t
     tests() const;
@@ -226,21 +226,21 @@ public:
     suites() const;
 
     void
-    add_failures(std::size_t failures);
+    addFailures(std::size_t failures);
 };
 
 //------------------------------------------------------------------------------
 
 /** A class to run a subset of unit tests
  */
-class multi_runner_child : public beast::unit_test::runner,
-                           private detail::multi_runner_base</*IsParent*/ false>
+class MultiRunnerChild : public beast::unit_test::Runner,
+                         private detail::MultiRunnerBase</*IsParent*/ false>
 {
 private:
     std::size_t job_index_;
-    detail::results results_;
-    detail::suite_results suite_results_;
-    detail::case_results case_results_;
+    detail::Results results_;
+    detail::SuiteResults suite_results_;
+    detail::CaseResults case_results_;
     std::size_t num_jobs_{0};
     bool quiet_{false};
     bool print_log_{true};
@@ -249,12 +249,12 @@ private:
     std::thread keep_alive_thread_;
 
 public:
-    multi_runner_child(multi_runner_child const&) = delete;
-    multi_runner_child&
-    operator=(multi_runner_child const&) = delete;
+    MultiRunnerChild(MultiRunnerChild const&) = delete;
+    MultiRunnerChild&
+    operator=(MultiRunnerChild const&) = delete;
 
-    multi_runner_child(std::size_t num_jobs, bool quiet, bool print_log);
-    ~multi_runner_child() override;
+    MultiRunnerChild(std::size_t numJobs, bool quiet, bool printLog);
+    ~MultiRunnerChild() override;
 
     [[nodiscard]] std::size_t
     tests() const;
@@ -263,54 +263,54 @@ public:
     suites() const;
 
     void
-    add_failures(std::size_t failures);
+    addFailures(std::size_t failures);
 
     template <class Pred>
     bool
-    run_multi(Pred pred);
+    runMulti(Pred pred);
 
 private:
     void
-    on_suite_begin(beast::unit_test::suite_info const& info) override;
+    onSuiteBegin(beast::unit_test::SuiteInfo const& info) override;
 
     void
-    on_suite_end() override;
+    onSuiteEnd() override;
 
     void
-    on_case_begin(std::string const& name) override;
+    onCaseBegin(std::string const& name) override;
 
     void
-    on_case_end() override;
+    onCaseEnd() override;
 
     void
-    on_pass() override;
+    onPass() override;
 
     void
-    on_fail(std::string const& reason) override;
+    onFail(std::string const& reason) override;
 
     void
-    on_log(std::string const& s) override;
+    onLog(std::string const& s) override;
 };
 
 //------------------------------------------------------------------------------
 
 template <class Pred>
 bool
-multi_runner_child::run_multi(Pred pred)
+MultiRunnerChild::runMulti(Pred pred)
 {
-    auto const& suite = beast::unit_test::global_suites();
-    auto const num_tests = suite.size();
+    auto const& suite = beast::unit_test::globalSuites();
+    auto const numTests = suite.size();
     bool failed = false;
 
-    auto get_test = [&]() -> beast::unit_test::suite_info const* {
-        auto const cur_test_index = checkout_test_index();
-        if (cur_test_index >= num_tests)
+    auto getTest = [&]() -> beast::unit_test::SuiteInfo const* {
+        auto const curTestIndex = checkoutTestIndex();
+        if (curTestIndex >= numTests)
             return nullptr;
         auto iter = suite.begin();
-        std::advance(iter, cur_test_index);
+        std::advance(iter, curTestIndex);
         return &*iter;
     };
-    while (auto t = get_test())
+    while (auto t = getTest())
     {
         if (!pred(*t))
             continue;
@@ -326,11 +326,11 @@ multi_runner_child::run_multi(Pred pred)
             // inform the parent
             std::stringstream s;
             s << job_index_ << ">  failed Unhandled exception in test.\n";
-            message_queue_send(MessageType::log, s.str());
+            messageQueueSend(MessageType::Log, s.str());
             failed = true;
         }
     }
-    any_failed(failed);
+    anyFailed(failed);
     return failed;
 }
 
diff --git a/src/test/unit_test/utils.h b/src/test/unit_test/utils.h
index d386818e10..beccf1c92e 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::size_ && rhs.size() == SecretKey::size_ &&
-        std::memcmp(lhs.data(), rhs.data(), SecretKey::size_) == 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/MallocTrim.cpp b/src/tests/libxrpl/basics/MallocTrim.cpp
index 7c72cd6781..b8e2c9fd30 100644
--- a/src/tests/libxrpl/basics/MallocTrim.cpp
+++ b/src/tests/libxrpl/basics/MallocTrim.cpp
@@ -161,7 +161,7 @@ TEST(mallocTrim, with_debug_logging)
 {
     struct DebugSink : public beast::Journal::Sink
     {
-        DebugSink() : Sink(beast::severities::kDebug, false)
+        DebugSink() : Sink(beast::severities::KDebug, false)
         {
         }
         void
diff --git a/src/tests/libxrpl/basics/Mutex.cpp b/src/tests/libxrpl/basics/Mutex.cpp
index 260bd49da1..b925191455 100644
--- a/src/tests/libxrpl/basics/Mutex.cpp
+++ b/src/tests/libxrpl/basics/Mutex.cpp
@@ -186,8 +186,8 @@ TEST_F(MutexConstCorrectnessTest, non_const_allows_modification)
 TEST_F(MutexConstCorrectnessTest, const_reference_provides_const_access)
 {
     Mutex<std::vector<int>> const m({1, 2, 3, 4, 5, 6});
-    Mutex<std::vector<int>> const& const_ref = m;
-    auto lock = const_ref.lock();
+    Mutex<std::vector<int>> const& constRef = m;
+    auto lock = constRef.lock();
     static_assert(std::is_const_v<std::remove_reference_t<decltype(*lock)>>);
     EXPECT_EQ(lock->size(), 6);
     EXPECT_EQ(lock->at(5), 6);
@@ -228,8 +228,8 @@ struct MutexSharedMutexTest : ::testing::Test
 TEST_F(MutexSharedMutexTest, shared_lock_for_const_access)
 {
     Mutex<int, std::shared_mutex> const m(100);
-    Mutex<int, std::shared_mutex> const& const_ref = m;
-    auto lock = const_ref.lock<std::shared_lock>();
+    Mutex<int, std::shared_mutex> const& constRef = m;
+    auto lock = constRef.lock<std::shared_lock>();
     EXPECT_EQ(*lock, 100);
 }
 
@@ -251,7 +251,7 @@ struct MutexComplexTypeTest : ::testing::Test
         int x;
         std::string y;
 
-        Data(int x_, std::string y_) : x(x_), y(std::move(y_))
+        Data(int x, std::string y) : x(x), y(std::move(y))
         {
         }
     };
diff --git a/src/tests/libxrpl/basics/RangeSet.cpp b/src/tests/libxrpl/basics/RangeSet.cpp
index 1d5d2391f8..44b13ad581 100644
--- a/src/tests/libxrpl/basics/RangeSet.cpp
+++ b/src/tests/libxrpl/basics/RangeSet.cpp
@@ -58,34 +58,34 @@ TEST(RangeSet, fromString)
 {
     RangeSet<std::uint32_t> set;
 
-    EXPECT_FALSE(from_string(set, ""));
+    EXPECT_FALSE(fromString(set, ""));
     EXPECT_EQ(boost::icl::length(set), 0);
 
-    EXPECT_FALSE(from_string(set, "#"));
+    EXPECT_FALSE(fromString(set, "#"));
     EXPECT_EQ(boost::icl::length(set), 0);
 
-    EXPECT_FALSE(from_string(set, ","));
+    EXPECT_FALSE(fromString(set, ","));
     EXPECT_EQ(boost::icl::length(set), 0);
 
-    EXPECT_FALSE(from_string(set, ",-"));
+    EXPECT_FALSE(fromString(set, ",-"));
     EXPECT_EQ(boost::icl::length(set), 0);
 
-    EXPECT_FALSE(from_string(set, "1,,2"));
+    EXPECT_FALSE(fromString(set, "1,,2"));
     EXPECT_EQ(boost::icl::length(set), 0);
 
-    EXPECT_TRUE(from_string(set, "1"));
+    EXPECT_TRUE(fromString(set, "1"));
     EXPECT_EQ(boost::icl::length(set), 1);
     EXPECT_EQ(boost::icl::first(set), 1);
 
-    EXPECT_TRUE(from_string(set, "1,1"));
+    EXPECT_TRUE(fromString(set, "1,1"));
     EXPECT_EQ(boost::icl::length(set), 1);
     EXPECT_EQ(boost::icl::first(set), 1);
 
-    EXPECT_TRUE(from_string(set, "1-1"));
+    EXPECT_TRUE(fromString(set, "1-1"));
     EXPECT_EQ(boost::icl::length(set), 1);
     EXPECT_EQ(boost::icl::first(set), 1);
 
-    EXPECT_TRUE(from_string(set, "1,4-6"));
+    EXPECT_TRUE(fromString(set, "1,4-6"));
     EXPECT_EQ(boost::icl::length(set), 4);
     EXPECT_EQ(boost::icl::first(set), 1);
     EXPECT_FALSE(boost::icl::contains(set, 2));
@@ -94,14 +94,14 @@ TEST(RangeSet, fromString)
     EXPECT_TRUE(boost::icl::contains(set, 5));
     EXPECT_EQ(boost::icl::last(set), 6);
 
-    EXPECT_TRUE(from_string(set, "1-2,4-6"));
+    EXPECT_TRUE(fromString(set, "1-2,4-6"));
     EXPECT_EQ(boost::icl::length(set), 5);
     EXPECT_EQ(boost::icl::first(set), 1);
     EXPECT_TRUE(boost::icl::contains(set, 2));
     EXPECT_TRUE(boost::icl::contains(set, 4));
     EXPECT_EQ(boost::icl::last(set), 6);
 
-    EXPECT_TRUE(from_string(set, "1-2,6"));
+    EXPECT_TRUE(fromString(set, "1-2,6"));
     EXPECT_EQ(boost::icl::length(set), 3);
     EXPECT_EQ(boost::icl::first(set), 1);
     EXPECT_TRUE(boost::icl::contains(set, 2));
diff --git a/src/tests/libxrpl/basics/Slice.cpp b/src/tests/libxrpl/basics/Slice.cpp
index b7ef9f6a33..f999d99934 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 data[] = {
+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(data); ++i)
+    for (std::size_t i = 0; i != sizeof(kDATA); ++i)
     {
-        Slice const s1{data, 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(data); ++j)
+        for (std::size_t j = 0; j != sizeof(kDATA); ++j)
         {
-            Slice const s2{data, 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(data)> a{};
-    std::array<std::uint8_t, sizeof(data)> 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(data); ++i)
-        a[i] = b[i] = data[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{data, sizeof(data)};
+    Slice const s{kDATA, sizeof(kDATA)};
 
-    for (std::size_t i = 0; i != sizeof(data); ++i)
-        EXPECT_EQ(s[i], data[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(data); ++i)
+    for (std::size_t i = 0; i < sizeof(kDATA); ++i)
     {
-        for (std::size_t j = 0; i + j < sizeof(data); ++j)
+        for (std::size_t j = 0; i + j < sizeof(kDATA); ++j)
         {
-            Slice s(data + i, sizeof(data) - i);
+            Slice s(kDATA + i, sizeof(kDATA) - i);
             s += j;
 
-            EXPECT_EQ(s.data(), data + i + j);
-            EXPECT_EQ(s.size(), sizeof(data) - i - j);
+            EXPECT_EQ(s.data(), kDATA + i + j);
+            EXPECT_EQ(s.size(), sizeof(kDATA) - i - j);
         }
     }
 }
diff --git a/src/tests/libxrpl/basics/base64.cpp b/src/tests/libxrpl/basics/base64.cpp
index cfffadf660..d26d23700a 100644
--- a/src/tests/libxrpl/basics/base64.cpp
+++ b/src/tests/libxrpl/basics/base64.cpp
@@ -9,9 +9,9 @@ using namespace xrpl;
 static void
 check(std::string const& in, std::string const& out)
 {
-    auto const encoded = base64_encode(in);
+    auto const encoded = base64Encode(in);
     EXPECT_EQ(encoded, out);
-    EXPECT_EQ(base64_decode(encoded), in);
+    EXPECT_EQ(base64Decode(encoded), in);
 }
 
 TEST(base64, base64)
@@ -46,5 +46,5 @@ TEST(base64, base64)
 
     std::string const notBase64 = "not_base64!!";
     std::string const truncated = "not";
-    EXPECT_EQ(base64_decode(notBase64), base64_decode(truncated));
+    EXPECT_EQ(base64Decode(notBase64), base64Decode(truncated));
 }
diff --git a/src/tests/libxrpl/basics/contract.cpp b/src/tests/libxrpl/basics/contract.cpp
index 721aa19fd3..0c6b32a7ad 100644
--- a/src/tests/libxrpl/basics/contract.cpp
+++ b/src/tests/libxrpl/basics/contract.cpp
@@ -18,7 +18,7 @@ TEST(contract, contract)
 
         try
         {
-            Rethrow();
+            rethrow();
         }
         catch (std::runtime_error const& e2)
         {
diff --git a/src/tests/libxrpl/basics/scope.cpp b/src/tests/libxrpl/basics/scope.cpp
index a13bab30df..dc5623e967 100644
--- a/src/tests/libxrpl/basics/scope.cpp
+++ b/src/tests/libxrpl/basics/scope.cpp
@@ -6,27 +6,27 @@
 
 using namespace xrpl;
 
-TEST(scope, scope_exit)
+TEST(scope, ScopeExit)
 {
-    // scope_exit always executes the functor on destruction,
+    // ScopeExit always executes the functor on destruction,
     // unless release() is called
     int i = 0;
     {
-        scope_exit const x{[&i]() { i = 1; }};
+        ScopeExit const x{[&i]() { i = 1; }};
     }
     EXPECT_EQ(i, 1);
     {
-        scope_exit x{[&i]() { i = 2; }};
+        ScopeExit x{[&i]() { i = 2; }};
         x.release();
     }
     EXPECT_EQ(i, 1);
     {
-        scope_exit x{[&i]() { i += 2; }};
+        ScopeExit x{[&i]() { i += 2; }};
         auto x2 = std::move(x);
     }
     EXPECT_EQ(i, 3);
     {
-        scope_exit x{[&i]() { i = 4; }};
+        ScopeExit x{[&i]() { i = 4; }};
         x.release();
         auto x2 = std::move(x);
     }
@@ -34,7 +34,7 @@ TEST(scope, scope_exit)
     {
         try
         {
-            scope_exit const x{[&i]() { i = 5; }};
+            ScopeExit const x{[&i]() { i = 5; }};
             throw 1;
         }
         catch (...)  // NOLINT(bugprone-empty-catch)
@@ -45,7 +45,7 @@ TEST(scope, scope_exit)
     {
         try
         {
-            scope_exit x{[&i]() { i = 6; }};
+            ScopeExit x{[&i]() { i = 6; }};
             x.release();
             throw 1;
         }
@@ -56,27 +56,27 @@ TEST(scope, scope_exit)
     EXPECT_EQ(i, 5);
 }
 
-TEST(scope, scope_fail)
+TEST(scope, ScopeFail)
 {
-    // scope_fail executes the functor on destruction only
+    // ScopeFail executes the functor on destruction only
     // if an exception is unwinding, unless release() is called
     int i = 0;
     {
-        scope_fail const x{[&i]() { i = 1; }};
+        ScopeFail const x{[&i]() { i = 1; }};
     }
     EXPECT_EQ(i, 0);
     {
-        scope_fail x{[&i]() { i = 2; }};
+        ScopeFail x{[&i]() { i = 2; }};
         x.release();
     }
     EXPECT_EQ(i, 0);
     {
-        scope_fail x{[&i]() { i = 3; }};
+        ScopeFail x{[&i]() { i = 3; }};
         auto x2 = std::move(x);
     }
     EXPECT_EQ(i, 0);
     {
-        scope_fail x{[&i]() { i = 4; }};
+        ScopeFail x{[&i]() { i = 4; }};
         x.release();
         auto x2 = std::move(x);
     }
@@ -84,7 +84,7 @@ TEST(scope, scope_fail)
     {
         try
         {
-            scope_fail const x{[&i]() { i = 5; }};
+            ScopeFail const x{[&i]() { i = 5; }};
             throw 1;
         }
         catch (...)  // NOLINT(bugprone-empty-catch)
@@ -95,7 +95,7 @@ TEST(scope, scope_fail)
     {
         try
         {
-            scope_fail x{[&i]() { i = 6; }};
+            ScopeFail x{[&i]() { i = 6; }};
             x.release();
             throw 1;
         }
@@ -106,27 +106,27 @@ TEST(scope, scope_fail)
     EXPECT_EQ(i, 5);
 }
 
-TEST(scope, scope_success)
+TEST(scope, ScopeSuccess)
 {
-    // scope_success executes the functor on destruction only
+    // ScopeSuccess executes the functor on destruction only
     // if an exception is not unwinding, unless release() is called
     int i = 0;
     {
-        scope_success const x{[&i]() { i = 1; }};
+        ScopeSuccess const x{[&i]() { i = 1; }};
     }
     EXPECT_EQ(i, 1);
     {
-        scope_success x{[&i]() { i = 2; }};
+        ScopeSuccess x{[&i]() { i = 2; }};
         x.release();
     }
     EXPECT_EQ(i, 1);
     {
-        scope_success x{[&i]() { i += 2; }};
+        ScopeSuccess x{[&i]() { i += 2; }};
         auto x2 = std::move(x);
     }
     EXPECT_EQ(i, 3);
     {
-        scope_success x{[&i]() { i = 4; }};
+        ScopeSuccess x{[&i]() { i = 4; }};
         x.release();
         auto x2 = std::move(x);
     }
@@ -134,7 +134,7 @@ TEST(scope, scope_success)
     {
         try
         {
-            scope_success const x{[&i]() { i = 5; }};
+            ScopeSuccess const x{[&i]() { i = 5; }};
             throw 1;
         }
         catch (...)  // NOLINT(bugprone-empty-catch)
@@ -145,7 +145,7 @@ TEST(scope, scope_success)
     {
         try
         {
-            scope_success x{[&i]() { i = 6; }};
+            ScopeSuccess x{[&i]() { i = 6; }};
             x.release();
             throw 1;
         }
diff --git a/src/tests/libxrpl/basics/tagged_integer.cpp b/src/tests/libxrpl/basics/tagged_integer.cpp
index 53e0ddc1d9..7382527d4d 100644
--- a/src/tests/libxrpl/basics/tagged_integer.cpp
+++ b/src/tests/libxrpl/basics/tagged_integer.cpp
@@ -16,9 +16,9 @@ struct Tag2
 
 // Static checks that types are not interoperable
 
-using TagUInt1 = tagged_integer<std::uint32_t, Tag1>;
-using TagUInt2 = tagged_integer<std::uint32_t, Tag2>;
-using TagUInt3 = tagged_integer<std::uint64_t, Tag1>;
+using TagUInt1 = TaggedInteger<std::uint32_t, Tag1>;
+using TagUInt2 = TaggedInteger<std::uint32_t, Tag2>;
+using TagUInt3 = TaggedInteger<std::uint64_t, Tag1>;
 
 // Check construction of tagged_integers
 static_assert(
@@ -103,7 +103,7 @@ static_assert(
     !std::is_convertible_v<TagUInt2, TagUInt3>,
     "TagUInt2 should not be convertible to a TagUInt3");
 
-using TagInt = tagged_integer<std::int32_t, Tag1>;
+using TagInt = TaggedInteger<std::int32_t, Tag1>;
 
 TEST(tagged_integer, comparison_operators)
 {
diff --git a/src/tests/libxrpl/crypto/csprng.cpp b/src/tests/libxrpl/crypto/csprng.cpp
index 4a383cae62..957f7f5c56 100644
--- a/src/tests/libxrpl/crypto/csprng.cpp
+++ b/src/tests/libxrpl/crypto/csprng.cpp
@@ -8,10 +8,10 @@ using namespace xrpl;
 
 TEST(csprng, get_values)
 {
-    auto& engine = crypto_prng();
-    auto rand_val = engine();
-    EXPECT_GE(rand_val, engine.min());
-    EXPECT_LE(rand_val, engine.max());
+    auto& engine = cryptoPrng();
+    auto randVal = engine();
+    EXPECT_GE(randVal, engine.min());
+    EXPECT_LE(randVal, engine.max());
     uint16_t twoByte{0};
     engine(&twoByte, sizeof(uint16_t));
 }
diff --git a/src/tests/libxrpl/helpers/Account.h b/src/tests/libxrpl/helpers/Account.h
index 9c3ad19bbb..4e2d6e547f 100644
--- a/src/tests/libxrpl/helpers/Account.h
+++ b/src/tests/libxrpl/helpers/Account.h
@@ -36,7 +36,7 @@ public:
      * @param name Human-readable name for the account.
      * @param type Key type to use (defaults to secp256k1).
      */
-    explicit Account(std::string_view name, KeyType type = KeyType::secp256k1);
+    explicit Account(std::string_view name, KeyType type = KeyType::Secp256k1);
 
     /** @brief Return the human-readable name. */
     std::string const&
diff --git a/src/tests/libxrpl/helpers/IOU.h b/src/tests/libxrpl/helpers/IOU.h
index 1e845f5ae6..18bc69cf33 100644
--- a/src/tests/libxrpl/helpers/IOU.h
+++ b/src/tests/libxrpl/helpers/IOU.h
@@ -39,7 +39,7 @@ public:
      * @param issuer The account that issues this currency.
      */
     IOU(std::string_view currencyCode, Account const& issuer)
-        : currency_(to_currency(std::string(currencyCode))), issuer_(issuer.id())
+        : currency_(toCurrency(std::string(currencyCode))), issuer_(issuer.id())
     {
         XRPL_ASSERT(!isXRP(currency_), "IOU: currency code must not resolve to XRP");
     }
diff --git a/src/tests/libxrpl/helpers/TestFamily.h b/src/tests/libxrpl/helpers/TestFamily.h
index 98c5a379e4..2f69a26faf 100644
--- a/src/tests/libxrpl/helpers/TestFamily.h
+++ b/src/tests/libxrpl/helpers/TestFamily.h
@@ -40,7 +40,7 @@ public:
         Section config;
         config.set("type", "memory");
         config.set("path", "TestFamily");
-        db_ = NodeStore::Manager::instance().make_Database(megabytes(4), scheduler_, 1, config, j);
+        db_ = NodeStore::Manager::instance().makeDatabase(megabytes(4), scheduler_, 1, config, j);
     }
 
     NodeStore::Database&
diff --git a/src/tests/libxrpl/helpers/TestServiceRegistry.h b/src/tests/libxrpl/helpers/TestServiceRegistry.h
index 4f39124087..bb92a71e5d 100644
--- a/src/tests/libxrpl/helpers/TestServiceRegistry.h
+++ b/src/tests/libxrpl/helpers/TestServiceRegistry.h
@@ -23,7 +23,7 @@ namespace test {
 class TestLogs : public Logs
 {
 public:
-    explicit TestLogs(beast::severities::Severity level = beast::severities::kWarning) : Logs(level)
+    explicit TestLogs(beast::severities::Severity level = beast::severities::KWarning) : Logs(level)
     {
     }
 
@@ -62,7 +62,7 @@ private:
 */
 class TestServiceRegistry : public ServiceRegistry
 {
-    TestLogs logs_{beast::severities::kWarning};
+    TestLogs logs_{beast::severities::KWarning};
     boost::asio::io_context io_context_;
     TestFamily family_{logs_.journal("TestFamily")};
     LoadFeeTrack feeTrack_{logs_.journal("LoadFeeTrack")};
diff --git a/src/tests/libxrpl/helpers/TestSink.cpp b/src/tests/libxrpl/helpers/TestSink.cpp
index 3b138edfd8..403fd23392 100644
--- a/src/tests/libxrpl/helpers/TestSink.cpp
+++ b/src/tests/libxrpl/helpers/TestSink.cpp
@@ -64,17 +64,17 @@ TestSink::writeAlways(beast::severities::Severity level, std::string const& text
     auto color = [level]() {
         switch (level)
         {
-            case beast::severities::kTrace:
+            case beast::severities::KTrace:
                 return "\033[34m";  // blue
-            case beast::severities::kDebug:
+            case beast::severities::KDebug:
                 return "\033[32m";  // green
-            case beast::severities::kInfo:
+            case beast::severities::KInfo:
                 return "\033[36m";  // cyan
-            case beast::severities::kWarning:
+            case beast::severities::KWarning:
                 return "\033[33m";  // yellow
-            case beast::severities::kError:
+            case beast::severities::KError:
                 return "\033[31m";  // red
-            case beast::severities::kFatal:
+            case beast::severities::KFatal:
             default:
                 break;
         }
@@ -84,17 +84,17 @@ TestSink::writeAlways(beast::severities::Severity level, std::string const& text
     auto prefix = [level]() {
         switch (level)
         {
-            case beast::severities::kTrace:
+            case beast::severities::KTrace:
                 return "TRC:";
-            case beast::severities::kDebug:
+            case beast::severities::KDebug:
                 return "DBG:";
-            case beast::severities::kInfo:
+            case beast::severities::KInfo:
                 return "INF:";
-            case beast::severities::kWarning:
+            case beast::severities::KWarning:
                 return "WRN:";
-            case beast::severities::kError:
+            case beast::severities::KError:
                 return "ERR:";
-            case beast::severities::kFatal:
+            case beast::severities::KFatal:
             default:
                 break;
         }
@@ -104,19 +104,19 @@ TestSink::writeAlways(beast::severities::Severity level, std::string const& text
     auto& stream = [level]() -> std::ostream& {
         switch (level)
         {
-            case beast::severities::kError:
-            case beast::severities::kFatal:
+            case beast::severities::KError:
+            case beast::severities::KFatal:
                 return std::cerr;
             default:
                 return std::cout;
         }
     }();
 
-    constexpr auto reset = "\033[0m";
+    constexpr auto kRESET = "\033[0m";
 
     if (supportsColor)
     {
-        stream << color << prefix << " " << text << reset << std::endl;
+        stream << color << prefix << " " << text << kRESET << std::endl;
     }
     else
     {
diff --git a/src/tests/libxrpl/helpers/TestSink.h b/src/tests/libxrpl/helpers/TestSink.h
index daa40d014f..a96000b04f 100644
--- a/src/tests/libxrpl/helpers/TestSink.h
+++ b/src/tests/libxrpl/helpers/TestSink.h
@@ -13,7 +13,7 @@ public:
         return sink;
     }
 
-    TestSink(beast::severities::Severity threshold = beast::severities::kDebug);
+    TestSink(beast::severities::Severity threshold = beast::severities::KDebug);
 
     void
     write(beast::severities::Severity level, std::string const& text) override;
diff --git a/src/tests/libxrpl/helpers/TxTest.cpp b/src/tests/libxrpl/helpers/TxTest.cpp
index d88f700356..29db311fce 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 features = [] {
+    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 features;
+    return kFEATURES;
 }
 
 //------------------------------------------------------------------------------
@@ -73,7 +73,7 @@ TxTest::TxTest(std::optional<FeatureBitset> features)
 
     // Create a genesis ledger as the base
     closedLedger_ = std::make_shared<Ledger>(
-        create_genesis,
+        kCREATE_GENESIS,
         // 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>(open_ledger, closedLedger_.get(), *rules_, closedLedger_);
+        std::make_shared<OpenView>(kOPEN_LEDGER, closedLedger_.get(), *rules_, closedLedger_);
 }
 
 bool
@@ -105,7 +105,7 @@ TxTest::getRules() const
 [[nodiscard]] TxResult
 TxTest::submit(std::shared_ptr<STTx const> stx)
 {
-    auto result = apply(registry_, *openLedger_, *stx, tapNONE, registry_.getJournal("apply"));
+    auto result = apply(registry_, *openLedger_, *stx, TapNone, registry_.getJournal("apply"));
 
     // Track successfully applied transactions for canonical reordering on close
     // We make a copy since the TransactionBase doesn't own the STTx
@@ -196,7 +196,7 @@ TxTest::close()
         OpenView accum(&*newLedger);
         for (auto const& [key, tx] : txSet)
         {
-            auto result = apply(registry_, accum, *tx, tapNONE, registry_.getJournal("apply"));
+            auto result = apply(registry_, accum, *tx, TapNone, registry_.getJournal("apply"));
             if (!result.applied)
             {
                 throw std::runtime_error("TxTest::close: failed to apply transaction");
@@ -213,7 +213,7 @@ TxTest::close()
 
     openLedger_ =
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access)
-        std::make_shared<OpenView>(open_ledger, closedLedger_.get(), *rules_, closedLedger_);
+        std::make_shared<OpenView>(kOPEN_LEDGER, closedLedger_.get(), *rules_, closedLedger_);
 }
 
 void
diff --git a/src/tests/libxrpl/helpers/TxTest.h b/src/tests/libxrpl/helpers/TxTest.h
index 864b19c399..8ba9898d99 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) * DROPS_PER_XRP.drops()};
+    return XRPAmount{static_cast<std::int64_t>(xrp) * kDROPS_PER_XRP.drops()};
 }
 
 /**
@@ -58,7 +58,7 @@ template <std::floating_point T>
 XRPAmount
 XRP(T xrp)
 {
-    return XRPAmount{static_cast<std::int64_t>(std::round(xrp * DROPS_PER_XRP.drops()))};
+    return XRPAmount{static_cast<std::int64_t>(std::round(xrp * kDROPS_PER_XRP.drops()))};
 }
 
 /**
@@ -69,7 +69,7 @@ XRP(T xrp)
 inline XRPAmount
 XRP(Number const& xrp)
 {
-    return XRPAmount{static_cast<std::int64_t>(xrp * DROPS_PER_XRP.drops())};
+    return XRPAmount{static_cast<std::int64_t>(xrp * kDROPS_PER_XRP.drops())};
 }
 
 //------------------------------------------------------------------------------
@@ -349,7 +349,7 @@ public:
 
 private:
     TestServiceRegistry registry_;
-    std::unordered_set<uint256, beast::uhash<>> featureSet_;
+    std::unordered_set<uint256, beast::Uhash<>> featureSet_;
     std::optional<Rules> rules_;
     std::shared_ptr<Ledger const> closedLedger_;
     std::shared_ptr<OpenView> openLedger_;
diff --git a/src/tests/libxrpl/json/Output.cpp b/src/tests/libxrpl/json/Output.cpp
index bc26c068ca..18d7cad019 100644
--- a/src/tests/libxrpl/json/Output.cpp
+++ b/src/tests/libxrpl/json/Output.cpp
@@ -8,18 +8,18 @@
 #include <string>
 
 using namespace xrpl;
-using namespace Json;
+using namespace json;
 
 static void
 checkOutput(std::string const& valueDesc)
 {
     std::string output;
-    Json::Value value;
-    ASSERT_TRUE(Json::Reader().parse(valueDesc, value));
+    json::Value value;
+    ASSERT_TRUE(json::Reader().parse(valueDesc, value));
     auto out = stringOutput(output);
     outputJson(value, out);
 
-    auto expected = Json::FastWriter().write(value);
+    auto expected = json::FastWriter().write(value);
     EXPECT_EQ(output, expected);
     EXPECT_EQ(output, valueDesc);
     EXPECT_EQ(output, jsonAsString(value));
diff --git a/src/tests/libxrpl/json/Value.cpp b/src/tests/libxrpl/json/Value.cpp
index 2790f0e963..994491b4db 100644
--- a/src/tests/libxrpl/json/Value.cpp
+++ b/src/tests/libxrpl/json/Value.cpp
@@ -22,49 +22,49 @@ namespace xrpl {
 
 TEST(json_value, limits)
 {
-    using namespace Json;
-    static_assert(Value::minInt == Int(~(UInt(-1) / 2)));
-    static_assert(Value::maxInt == Int(UInt(-1) / 2));
-    static_assert(Value::maxUInt == UInt(-1));
+    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_U_INT == UInt(-1));
 }
 
 TEST(json_value, construct_and_compare_Json_StaticString)
 {
-    static constexpr char sample[]{"Contents of a Json::StaticString"};
+    static constexpr char kSAMPLE[]{"Contents of a json::StaticString"};
 
-    static constexpr Json::StaticString test1(sample);
-    char const* addrTest1{test1};
+    static constexpr json::StaticString kTEST1(kSAMPLE);
+    char const* addrTest1{kTEST1};
 
-    EXPECT_EQ(addrTest1, &sample[0]);
-    EXPECT_EQ(test1.c_str(), &sample[0]);
+    EXPECT_EQ(addrTest1, &kSAMPLE[0]);
+    EXPECT_EQ(kTEST1.cStr(), &kSAMPLE[0]);
 
-    static constexpr Json::StaticString test2{"Contents of a Json::StaticString"};
-    static constexpr Json::StaticString test3{"Another StaticString"};
+    static constexpr json::StaticString kTEST2{"Contents of a json::StaticString"};
+    static constexpr json::StaticString kTEST3{"Another StaticString"};
 
-    EXPECT_EQ(test1, test2);
-    EXPECT_NE(test1, test3);
+    EXPECT_EQ(kTEST1, kTEST2);
+    EXPECT_NE(kTEST1, kTEST3);
 
-    std::string const str{sample};
-    EXPECT_EQ(str, test2);
-    EXPECT_NE(str, test3);
-    EXPECT_EQ(test2, str);
-    EXPECT_NE(test3, 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 staticStr{"staticStr"};
+    static constexpr json::StaticString kSTATIC_STR{"staticStr"};
 
-    auto testCopy = [](Json::ValueType typ) {
-        Json::Value val{typ};
-        Json::Value const cpy{val};
+    auto testCopy = [](json::ValueType typ) {
+        json::Value val{typ};
+        json::Value const cpy{val};
         EXPECT_EQ(val.type(), typ);
         EXPECT_EQ(cpy.type(), typ);
         return val;
     };
     {
-        Json::Value const nullV{testCopy(Json::nullValue)};
+        json::Value const nullV{testCopy(json::NullValue)};
         EXPECT_TRUE(nullV.isNull());
         EXPECT_FALSE(nullV.isBool());
         EXPECT_FALSE(nullV.isInt());
@@ -79,7 +79,7 @@ TEST(json_value, different_types)
         EXPECT_TRUE(nullV.isObjectOrNull());
     }
     {
-        Json::Value const intV{testCopy(Json::intValue)};
+        json::Value const intV{testCopy(json::IntValue)};
         EXPECT_FALSE(intV.isNull());
         EXPECT_FALSE(intV.isBool());
         EXPECT_TRUE(intV.isInt());
@@ -94,7 +94,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(intV.isObjectOrNull());
     }
     {
-        Json::Value const uintV{testCopy(Json::uintValue)};
+        json::Value const uintV{testCopy(json::UintValue)};
         EXPECT_FALSE(uintV.isNull());
         EXPECT_FALSE(uintV.isBool());
         EXPECT_FALSE(uintV.isInt());
@@ -109,7 +109,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(uintV.isObjectOrNull());
     }
     {
-        Json::Value const realV{testCopy(Json::realValue)};
+        json::Value const realV{testCopy(json::RealValue)};
         EXPECT_FALSE(realV.isNull());
         EXPECT_FALSE(realV.isBool());
         EXPECT_FALSE(realV.isInt());
@@ -124,7 +124,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(realV.isObjectOrNull());
     }
     {
-        Json::Value const stringV{testCopy(Json::stringValue)};
+        json::Value const stringV{testCopy(json::StringValue)};
         EXPECT_FALSE(stringV.isNull());
         EXPECT_FALSE(stringV.isBool());
         EXPECT_FALSE(stringV.isInt());
@@ -139,11 +139,11 @@ TEST(json_value, different_types)
         EXPECT_FALSE(stringV.isObjectOrNull());
     }
     {
-        Json::Value const staticStrV{staticStr};
+        json::Value const staticStrV{kSTATIC_STR};
         {
-            Json::Value const cpy{staticStrV};
-            EXPECT_EQ(staticStrV.type(), Json::stringValue);
-            EXPECT_EQ(cpy.type(), Json::stringValue);
+            json::Value const cpy{staticStrV};
+            EXPECT_EQ(staticStrV.type(), json::StringValue);
+            EXPECT_EQ(cpy.type(), json::StringValue);
         }
         EXPECT_FALSE(staticStrV.isNull());
         EXPECT_FALSE(staticStrV.isBool());
@@ -159,7 +159,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(staticStrV.isObjectOrNull());
     }
     {
-        Json::Value const boolV{testCopy(Json::booleanValue)};
+        json::Value const boolV{testCopy(json::BooleanValue)};
         EXPECT_FALSE(boolV.isNull());
         EXPECT_TRUE(boolV.isBool());
         EXPECT_FALSE(boolV.isInt());
@@ -174,7 +174,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(boolV.isObjectOrNull());
     }
     {
-        Json::Value const arrayV{testCopy(Json::arrayValue)};
+        json::Value const arrayV{testCopy(json::ArrayValue)};
         EXPECT_FALSE(arrayV.isNull());
         EXPECT_FALSE(arrayV.isBool());
         EXPECT_FALSE(arrayV.isInt());
@@ -189,7 +189,7 @@ TEST(json_value, different_types)
         EXPECT_FALSE(arrayV.isObjectOrNull());
     }
     {
-        Json::Value const objectV{testCopy(Json::objectValue)};
+        json::Value const objectV{testCopy(json::ObjectValue)};
         EXPECT_FALSE(objectV.isNull());
         EXPECT_FALSE(objectV.isBool());
         EXPECT_FALSE(objectV.isInt());
@@ -207,8 +207,8 @@ TEST(json_value, different_types)
 
 TEST(json_value, compare_strings)
 {
-    auto doCompare = [&](Json::Value const& lhs,
-                         Json::Value const& rhs,
+    auto doCompare = [&](json::Value const& lhs,
+                         json::Value const& rhs,
                          bool lhsEqRhs,
                          bool lhsLtRhs,
                          int line) {
@@ -221,28 +221,28 @@ TEST(json_value, compare_strings)
         EXPECT_EQ((lhs > rhs), (!lhsEqRhs && !lhsLtRhs));
     };
 
-    Json::Value const null0;
-    Json::Value const intNeg1{-1};
-    Json::Value const int0{Json::intValue};
-    Json::Value const intPos1{1};
-    Json::Value const uint0{Json::uintValue};
-    Json::Value const uint1{1u};
-    Json::Value const realNeg1{-1.0};
-    Json::Value const real0{Json::realValue};
-    Json::Value const realPos1{1.0};
-    Json::Value const str0{Json::stringValue};
-    Json::Value const str1{"1"};
-    Json::Value const boolF{false};
-    Json::Value const boolT{true};
-    Json::Value const array0{Json::arrayValue};
-    Json::Value const array1{[]() {
-        Json::Value array1;
+    json::Value const null0;
+    json::Value const intNeg1{-1};
+    json::Value const int0{json::IntValue};
+    json::Value const intPos1{1};
+    json::Value const uint0{json::UintValue};
+    json::Value const uint1{1u};
+    json::Value const realNeg1{-1.0};
+    json::Value const real0{json::RealValue};
+    json::Value const realPos1{1.0};
+    json::Value const str0{json::StringValue};
+    json::Value const str1{"1"};
+    json::Value const boolF{false};
+    json::Value const boolT{true};
+    json::Value const array0{json::ArrayValue};
+    json::Value const array1{[]() {
+        json::Value array1;
         array1[0u] = 1;
         return array1;
     }()};
-    Json::Value const obj0{Json::objectValue};
-    Json::Value const obj1{[]() {
-        Json::Value obj1;
+    json::Value const obj0{json::ObjectValue};
+    json::Value const obj1{[]() {
+        json::Value obj1;
         obj1["one"] = 1;
         return obj1;
     }()};
@@ -250,7 +250,7 @@ TEST(json_value, compare_strings)
 #pragma push_macro("DO_COMPARE")
     // DO_COMPARE(lhs, rhs, lhsEqualsToRhs lhsLessThanRhs)
 #define DO_COMPARE(lhs, rhs, eq, lt) doCompare(lhs, rhs, eq, lt, __LINE__)
-    DO_COMPARE(null0, Json::Value{}, true, false);
+    DO_COMPARE(null0, json::Value{}, true, false);
     DO_COMPARE(null0, intNeg1, false, true);
     DO_COMPARE(null0, int0, false, true);
     DO_COMPARE(null0, intPos1, false, true);
@@ -561,22 +561,22 @@ TEST(json_value, compare_strings)
 
 TEST(json_value, bool)
 {
-    EXPECT_FALSE(Json::Value());
+    EXPECT_FALSE(json::Value());
 
-    EXPECT_FALSE(Json::Value(""));
+    EXPECT_FALSE(json::Value(""));
 
-    EXPECT_TRUE(bool(Json::Value("empty")));
-    EXPECT_TRUE(bool(Json::Value(false)));
-    EXPECT_TRUE(bool(Json::Value(true)));
-    EXPECT_TRUE(bool(Json::Value(0)));
-    EXPECT_TRUE(bool(Json::Value(1)));
+    EXPECT_TRUE(bool(json::Value("empty")));
+    EXPECT_TRUE(bool(json::Value(false)));
+    EXPECT_TRUE(bool(json::Value(true)));
+    EXPECT_TRUE(bool(json::Value(0)));
+    EXPECT_TRUE(bool(json::Value(1)));
 
-    Json::Value array(Json::arrayValue);
+    json::Value array(json::ArrayValue);
     EXPECT_FALSE(array);
     array.append(0);
     EXPECT_TRUE(bool(array));
 
-    Json::Value object(Json::objectValue);
+    json::Value object(json::ObjectValue);
     EXPECT_FALSE(object);
     object[""] = false;
     EXPECT_TRUE(bool(object));
@@ -586,82 +586,82 @@ TEST(json_value, bad_json)
 {
     char const* s(R"({"method":"ledger","params":[{"ledger_index":1e300}]})");
 
-    Json::Value j;
-    Json::Reader r;
+    json::Value j;
+    json::Reader r;
 
     EXPECT_TRUE(r.parse(s, j));
 }
 
 TEST(json_value, edge_cases)
 {
-    std::uint32_t const max_uint = std::numeric_limits<std::uint32_t>::max();
-    std::int32_t const max_int = std::numeric_limits<std::int32_t>::max();
-    std::int32_t const min_int = std::numeric_limits<std::int32_t>::min();
+    std::uint32_t const maxUint = std::numeric_limits<std::uint32_t>::max();
+    std::int32_t const maxInt = std::numeric_limits<std::int32_t>::max();
+    std::int32_t const minInt = std::numeric_limits<std::int32_t>::min();
 
-    std::uint32_t const a_uint = max_uint - 1978;
-    std::int32_t const a_large_int = max_int - 1978;
-    std::int32_t const a_small_int = min_int + 1978;
+    std::uint32_t const aUint = maxUint - 1978;
+    std::int32_t const aLargeInt = maxInt - 1978;
+    std::int32_t const aSmallInt = minInt + 1978;
 
     {
-        std::string json = "{\"max_uint\":" + std::to_string(max_uint);
-        json += ",\"max_int\":" + std::to_string(max_int);
-        json += ",\"min_int\":" + std::to_string(min_int);
-        json += ",\"a_uint\":" + std::to_string(a_uint);
-        json += ",\"a_large_int\":" + std::to_string(a_large_int);
-        json += ",\"a_small_int\":" + std::to_string(a_small_int);
+        std::string json = "{\"max_uint\":" + std::to_string(maxUint);
+        json += ",\"max_int\":" + std::to_string(maxInt);
+        json += ",\"min_int\":" + std::to_string(minInt);
+        json += ",\"a_uint\":" + std::to_string(aUint);
+        json += ",\"a_large_int\":" + std::to_string(aLargeInt);
+        json += ",\"a_small_int\":" + std::to_string(aSmallInt);
         json += "}";
 
-        Json::Value j1;
-        Json::Reader r1;
+        json::Value j1;
+        json::Reader r1;
 
         EXPECT_TRUE(r1.parse(json, j1));
-        EXPECT_EQ(j1["max_uint"].asUInt(), max_uint);
-        EXPECT_EQ(j1["max_uint"].asAbsUInt(), max_uint);
-        EXPECT_EQ(j1["max_int"].asInt(), max_int);
-        EXPECT_EQ(j1["max_int"].asAbsUInt(), max_int);
-        EXPECT_EQ(j1["min_int"].asInt(), min_int);
-        EXPECT_EQ(j1["min_int"].asAbsUInt(), static_cast<std::int64_t>(min_int) * -1);
-        EXPECT_EQ(j1["a_uint"].asUInt(), a_uint);
-        EXPECT_EQ(j1["a_uint"].asAbsUInt(), a_uint);
-        EXPECT_GT(j1["a_uint"], a_large_int);
-        EXPECT_GT(j1["a_uint"], a_small_int);
-        EXPECT_EQ(j1["a_large_int"].asInt(), a_large_int);
-        EXPECT_EQ(j1["a_large_int"].asAbsUInt(), a_large_int);
-        EXPECT_EQ(j1["a_large_int"].asUInt(), a_large_int);
-        EXPECT_LT(j1["a_large_int"], a_uint);
-        EXPECT_EQ(j1["a_small_int"].asInt(), a_small_int);
-        EXPECT_EQ(j1["a_small_int"].asAbsUInt(), static_cast<std::int64_t>(a_small_int) * -1);
-        EXPECT_LT(j1["a_small_int"], a_uint);
+        EXPECT_EQ(j1["max_uint"].asUInt(), maxUint);
+        EXPECT_EQ(j1["max_uint"].asAbsUInt(), maxUint);
+        EXPECT_EQ(j1["max_int"].asInt(), maxInt);
+        EXPECT_EQ(j1["max_int"].asAbsUInt(), maxInt);
+        EXPECT_EQ(j1["min_int"].asInt(), minInt);
+        EXPECT_EQ(j1["min_int"].asAbsUInt(), static_cast<std::int64_t>(minInt) * -1);
+        EXPECT_EQ(j1["a_uint"].asUInt(), aUint);
+        EXPECT_EQ(j1["a_uint"].asAbsUInt(), aUint);
+        EXPECT_GT(j1["a_uint"], aLargeInt);
+        EXPECT_GT(j1["a_uint"], aSmallInt);
+        EXPECT_EQ(j1["a_large_int"].asInt(), aLargeInt);
+        EXPECT_EQ(j1["a_large_int"].asAbsUInt(), aLargeInt);
+        EXPECT_EQ(j1["a_large_int"].asUInt(), aLargeInt);
+        EXPECT_LT(j1["a_large_int"], aUint);
+        EXPECT_EQ(j1["a_small_int"].asInt(), aSmallInt);
+        EXPECT_EQ(j1["a_small_int"].asAbsUInt(), static_cast<std::int64_t>(aSmallInt) * -1);
+        EXPECT_LT(j1["a_small_int"], aUint);
     }
 
-    std::uint64_t const overflow = std::uint64_t(max_uint) + 1;
+    std::uint64_t const overflow = std::uint64_t(maxUint) + 1;
     {
         std::string json = "{\"overflow\":";
         json += std::to_string(overflow);
         json += "}";
 
-        Json::Value j2;
-        Json::Reader r2;
+        json::Value j2;
+        json::Reader r2;
 
         EXPECT_FALSE(r2.parse(json, j2));
     }
 
-    std::int64_t const underflow = std::int64_t(min_int) - 1;
+    std::int64_t const underflow = std::int64_t(minInt) - 1;
     {
         std::string json = "{\"underflow\":";
         json += std::to_string(underflow);
         json += "}";
 
-        Json::Value j3;
-        Json::Reader r3;
+        json::Value j3;
+        json::Reader r3;
 
         EXPECT_FALSE(r3.parse(json, j3));
     }
 
     {
-        Json::Value intString{std::to_string(overflow)};
+        json::Value intString{std::to_string(overflow)};
         EXPECT_THROW([&] { return intString.asUInt(); }(), beast::BadLexicalCast);
-        EXPECT_THROW([&] { return intString.asAbsUInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intString.asAbsUInt(); }(), json::Error);
 
         intString = "4294967295";
         EXPECT_EQ(intString.asUInt(), 4294967295u);
@@ -679,7 +679,7 @@ TEST(json_value, edge_cases)
         EXPECT_EQ(intString.asAbsUInt(), 4294967295);
 
         intString = "-4294967296";
-        EXPECT_THROW([&] { return intString.asAbsUInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intString.asAbsUInt(); }(), json::Error);
 
         intString = "2147483648";
         EXPECT_THROW([&] { return intString.asInt(); }(), beast::BadLexicalCast);
@@ -699,9 +699,9 @@ TEST(json_value, edge_cases)
     }
 
     {
-        Json::Value intReal{4294967297.0};
-        EXPECT_THROW([&] { return intReal.asUInt(); }(), Json::error);
-        EXPECT_THROW([&] { return intReal.asAbsUInt(); }(), Json::error);
+        json::Value intReal{4294967297.0};
+        EXPECT_THROW([&] { return intReal.asUInt(); }(), json::Error);
+        EXPECT_THROW([&] { return intReal.asAbsUInt(); }(), json::Error);
 
         intReal = 4294967295.0;
         EXPECT_EQ(intReal.asUInt(), 4294967295u);
@@ -712,17 +712,17 @@ TEST(json_value, edge_cases)
         EXPECT_EQ(intReal.asAbsUInt(), 0);
 
         intReal = -1.0;
-        EXPECT_THROW([&] { return intReal.asUInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intReal.asUInt(); }(), json::Error);
         EXPECT_EQ(intReal.asAbsUInt(), 1);
 
         intReal = -4294967295.0;
         EXPECT_EQ(intReal.asAbsUInt(), 4294967295);
 
         intReal = -4294967296.0;
-        EXPECT_THROW([&] { return intReal.asAbsUInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intReal.asAbsUInt(); }(), json::Error);
 
         intReal = 2147483648.0;
-        EXPECT_THROW([&] { return intReal.asInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intReal.asInt(); }(), json::Error);
         EXPECT_EQ(intReal.asAbsUInt(), 2147483648);
 
         intReal = 2147483647.0;
@@ -734,18 +734,18 @@ TEST(json_value, edge_cases)
         EXPECT_EQ(intReal.asAbsUInt(), 2147483648LL);
 
         intReal = -2147483649.0;
-        EXPECT_THROW([&] { return intReal.asInt(); }(), Json::error);
+        EXPECT_THROW([&] { return intReal.asInt(); }(), json::Error);
         EXPECT_EQ(intReal.asAbsUInt(), 2147483649);
     }
 }
 
 TEST(json_value, copy)
 {
-    Json::Value v1{2.5};
+    json::Value v1{2.5};
     EXPECT_TRUE(v1.isDouble());
     EXPECT_EQ(v1.asDouble(), 2.5);
 
-    Json::Value const v2 = v1;
+    json::Value const v2 = v1;
     EXPECT_TRUE(v1.isDouble());
     EXPECT_EQ(v1.asDouble(), 2.5);
     EXPECT_TRUE(v2.isDouble());
@@ -762,11 +762,11 @@ TEST(json_value, copy)
 
 TEST(json_value, move)
 {
-    Json::Value v1{2.5};
+    json::Value v1{2.5};
     EXPECT_TRUE(v1.isDouble());
     EXPECT_EQ(v1.asDouble(), 2.5);
 
-    Json::Value v2 = std::move(v1);
+    json::Value v2 = std::move(v1);
     EXPECT_FALSE(v1);  // NOLINT(bugprone-use-after-move)
     EXPECT_TRUE(v2.isDouble());
     EXPECT_EQ(v2.asDouble(), 2.5);
@@ -781,7 +781,7 @@ TEST(json_value, move)
 
 TEST(json_value, comparisons)
 {
-    Json::Value a, b;
+    json::Value a, b;
     auto testEquals = [&](std::string const& name) {
         EXPECT_TRUE(a == b);
         EXPECT_TRUE(a <= b);
@@ -818,15 +818,15 @@ TEST(json_value, comparisons)
         EXPECT_FALSE(b > a);
     };
 
-    a["a"] = Json::UInt(0);
-    b["a"] = Json::Int(0);
+    a["a"] = json::UInt(0);
+    b["a"] = json::Int(0);
     testEquals("zero");
 
-    b["a"] = Json::Int(-1);
+    b["a"] = json::Int(-1);
     testGreaterThan("negative");
 
-    Json::Int const big = std::numeric_limits<int>::max();
-    Json::UInt bigger = big;
+    json::Int const big = std::numeric_limits<int>::max();
+    json::UInt bigger = big;
     bigger++;
 
     a["a"] = bigger;
@@ -836,8 +836,8 @@ TEST(json_value, comparisons)
 
 TEST(json_value, compact)
 {
-    Json::Value j;
-    Json::Reader r;
+    json::Value j;
+    json::Reader r;
     char const* s("{\"array\":[{\"12\":23},{},null,false,0.5]}");
 
     auto countLines = [](std::string const& str) {
@@ -852,20 +852,20 @@ TEST(json_value, compact)
     }
     {
         std::stringstream ss;
-        ss << Json::Compact(std::move(j));
+        ss << json::Compact(std::move(j));
         EXPECT_EQ(countLines(ss.str()), 1);
     }
 }
 
 TEST(json_value, conversions)
 {
-    // We have Json::Int, but not Json::Double or Json::Real.
-    // We have Json::Int, Json::Value::Int, and Json::ValueType::intValue.
-    // We have Json::ValueType::realValue but Json::Value::asDouble.
+    // We have json::Int, but not json::Double or json::Real.
+    // We have json::Int, json::Value::Int, and json::ValueType::intValue.
+    // We have json::ValueType::realValue but json::Value::asDouble.
     // TODO: What's the thinking here?
     {
         // null
-        Json::Value const val;
+        json::Value const val;
         EXPECT_TRUE(val.isNull());
         // val.asCString() should trigger an assertion failure
         EXPECT_EQ(val.asString(), "");
@@ -875,39 +875,39 @@ TEST(json_value, conversions)
         EXPECT_EQ(val.asDouble(), 0.0);
         EXPECT_FALSE(val.asBool());
 
-        EXPECT_TRUE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // int
-        Json::Value const val = -1234;
+        json::Value const val = -1234;
         EXPECT_TRUE(val.isInt());
         // val.asCString() should trigger an assertion failure
         EXPECT_EQ(val.asString(), "-1234");
         EXPECT_EQ(val.asInt(), -1234);
-        EXPECT_THROW([&] { return val.asUInt(); }(), Json::error);
+        EXPECT_THROW([&] { return val.asUInt(); }(), json::Error);
         EXPECT_EQ(val.asAbsUInt(), 1234u);
         EXPECT_EQ(val.asDouble(), -1234.0);
         EXPECT_TRUE(val.asBool());
 
-        EXPECT_FALSE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // uint
-        Json::Value const val = 1234U;
+        json::Value const val = 1234U;
         EXPECT_TRUE(val.isUInt());
         // val.asCString() should trigger an assertion failure
         EXPECT_EQ(val.asString(), "1234");
@@ -917,18 +917,18 @@ TEST(json_value, conversions)
         EXPECT_EQ(val.asDouble(), 1234.0);
         EXPECT_TRUE(val.asBool());
 
-        EXPECT_FALSE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // real
-        Json::Value const val = 2.0;
+        json::Value const val = 2.0;
         EXPECT_TRUE(val.isDouble());
         // val.asCString() should trigger an assertion failure
         EXPECT_TRUE(std::regex_match(val.asString(), std::regex("^2\\.0*$")));
@@ -938,39 +938,39 @@ TEST(json_value, conversions)
         EXPECT_EQ(val.asDouble(), 2.0);
         EXPECT_TRUE(val.asBool());
 
-        EXPECT_FALSE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // numeric string
-        Json::Value const val = "54321";
+        json::Value const val = "54321";
         EXPECT_TRUE(val.isString());
         EXPECT_EQ(strcmp(val.asCString(), "54321"), 0);
         EXPECT_EQ(val.asString(), "54321");
         EXPECT_EQ(val.asInt(), 54321);
         EXPECT_EQ(val.asUInt(), 54321u);
         EXPECT_EQ(val.asAbsUInt(), 54321);
-        EXPECT_THROW([&] { return val.asDouble(); }(), Json::error);
+        EXPECT_THROW([&] { return val.asDouble(); }(), json::Error);
         EXPECT_TRUE(val.asBool());
 
-        EXPECT_FALSE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::intValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::NullValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::IntValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::UintValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // non-numeric string
-        Json::Value const val(Json::stringValue);
+        json::Value const val(json::StringValue);
         EXPECT_TRUE(val.isString());
         EXPECT_EQ(val.asCString(), nullptr);
         EXPECT_EQ(val.asString(), "");
@@ -980,18 +980,18 @@ TEST(json_value, conversions)
         EXPECT_THROW([&] { return val.asDouble(); }(), std::exception);
         EXPECT_TRUE(val.asBool() == false);
 
-        EXPECT_TRUE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::intValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::NullValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::IntValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::UintValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // bool false
-        Json::Value const val = false;
+        json::Value const val = false;
         EXPECT_TRUE(val.isBool());
         // val.asCString() should trigger an assertion failure
         EXPECT_EQ(val.asString(), "false");
@@ -1001,18 +1001,18 @@ TEST(json_value, conversions)
         EXPECT_EQ(val.asDouble(), 0.0);
         EXPECT_FALSE(val.asBool());
 
-        EXPECT_TRUE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // bool true
-        Json::Value const val = true;
+        json::Value const val = true;
         EXPECT_TRUE(val.isBool());
         // val.asCString() should trigger an assertion failure
         EXPECT_EQ(val.asString(), "true");
@@ -1022,71 +1022,71 @@ TEST(json_value, conversions)
         EXPECT_EQ(val.asDouble(), 1.0);
         EXPECT_TRUE(val.asBool());
 
-        EXPECT_FALSE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::intValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::realValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::NullValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::IntValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::UintValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::RealValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::StringValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // array type
-        Json::Value const val(Json::arrayValue);
+        json::Value const val(json::ArrayValue);
         EXPECT_TRUE(val.isArray());
         // val.asCString should trigger an assertion failure
-        EXPECT_THROW([&] { return val.asString(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asUInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asAbsUInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asDouble(); }(), Json::error);
+        EXPECT_THROW([&] { return val.asString(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asUInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asAbsUInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asDouble(); }(), json::Error);
         EXPECT_FALSE(val.asBool());  // empty or not
 
-        EXPECT_TRUE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::intValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::realValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::NullValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::IntValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::UintValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::RealValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::StringValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ObjectValue));
     }
     {
         // object type
-        Json::Value const val(Json::objectValue);
+        json::Value const val(json::ObjectValue);
         EXPECT_TRUE(val.isObject());
         // val.asCString should trigger an assertion failure
-        EXPECT_THROW([&] { return val.asString(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asUInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asAbsUInt(); }(), Json::error);
-        EXPECT_THROW([&] { return val.asDouble(); }(), Json::error);
+        EXPECT_THROW([&] { return val.asString(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asUInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asAbsUInt(); }(), json::Error);
+        EXPECT_THROW([&] { return val.asDouble(); }(), json::Error);
         EXPECT_FALSE(val.asBool());  // empty or not
 
-        EXPECT_TRUE(val.isConvertibleTo(Json::nullValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::intValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::uintValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::realValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::stringValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::booleanValue));
-        EXPECT_FALSE(val.isConvertibleTo(Json::arrayValue));
-        EXPECT_TRUE(val.isConvertibleTo(Json::objectValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::NullValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::IntValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::UintValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::RealValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::StringValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::BooleanValue));
+        EXPECT_FALSE(val.isConvertibleTo(json::ArrayValue));
+        EXPECT_TRUE(val.isConvertibleTo(json::ObjectValue));
     }
 }
 
 TEST(json_value, access_members)
 {
-    Json::Value val;
-    EXPECT_EQ(val.type(), Json::nullValue);
+    json::Value val;
+    EXPECT_EQ(val.type(), json::NullValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
     {
-        Json::Value const constVal = val;
-        EXPECT_EQ(constVal[7u].type(), Json::nullValue);
+        json::Value const constVal = val;
+        EXPECT_EQ(constVal[7u].type(), json::NullValue);
         EXPECT_FALSE(constVal.isMember("key"));
-        EXPECT_EQ(constVal["key"].type(), Json::nullValue);
+        EXPECT_EQ(constVal["key"].type(), json::NullValue);
         EXPECT_TRUE(constVal.getMemberNames().empty());
         EXPECT_EQ(constVal.get(1u, "default0"), "default0");
         EXPECT_EQ(constVal.get(std::string("not"), "oh"), "oh");
@@ -1094,74 +1094,74 @@ TEST(json_value, access_members)
     }
 
     val = -7;
-    EXPECT_EQ(val.type(), Json::intValue);
+    EXPECT_EQ(val.type(), json::IntValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
 
     val = 42u;
-    EXPECT_EQ(val.type(), Json::uintValue);
+    EXPECT_EQ(val.type(), json::UintValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
 
     val = std::numbers::pi;
-    EXPECT_EQ(val.type(), Json::realValue);
+    EXPECT_EQ(val.type(), json::RealValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
 
     val = true;
-    EXPECT_EQ(val.type(), Json::booleanValue);
+    EXPECT_EQ(val.type(), json::BooleanValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
 
     val = "string";
-    EXPECT_EQ(val.type(), Json::stringValue);
+    EXPECT_EQ(val.type(), json::StringValue);
     EXPECT_EQ(val.size(), 0);
     EXPECT_FALSE(val.isValidIndex(0));
     EXPECT_FALSE(val.isMember("key"));
 
-    val = Json::Value(Json::objectValue);
-    EXPECT_EQ(val.type(), Json::objectValue);
+    val = json::Value(json::ObjectValue);
+    EXPECT_EQ(val.type(), json::ObjectValue);
     EXPECT_EQ(val.size(), 0);
-    static Json::StaticString const staticThree("three");
-    val[staticThree] = 3;
+    static json::StaticString const kSTATIC_THREE("three");
+    val[kSTATIC_THREE] = 3;
     val["two"] = 2;
     EXPECT_EQ(val.size(), 2);
     EXPECT_TRUE(val.isValidIndex(1));
     EXPECT_FALSE(val.isValidIndex(2));
-    EXPECT_EQ(val[staticThree], 3);
+    EXPECT_EQ(val[kSTATIC_THREE], 3);
     EXPECT_TRUE(val.isMember("two"));
-    EXPECT_TRUE(val.isMember(staticThree));
+    EXPECT_TRUE(val.isMember(kSTATIC_THREE));
     EXPECT_FALSE(val.isMember("key"));
     {
-        Json::Value const constVal = val;
+        json::Value const constVal = val;
         EXPECT_EQ(constVal["two"], 2);
-        EXPECT_EQ(constVal["four"].type(), Json::nullValue);
-        EXPECT_EQ(constVal[staticThree], 3);
+        EXPECT_EQ(constVal["four"].type(), json::NullValue);
+        EXPECT_EQ(constVal[kSTATIC_THREE], 3);
         EXPECT_TRUE(constVal.isMember("two"));
-        EXPECT_TRUE(constVal.isMember(staticThree));
+        EXPECT_TRUE(constVal.isMember(kSTATIC_THREE));
         EXPECT_FALSE(constVal.isMember("key"));
         EXPECT_EQ(val.get(std::string("two"), "backup"), 2);
         EXPECT_EQ(val.get("missing", "default2"), "default2");
     }
 
-    val = Json::Value(Json::arrayValue);
-    EXPECT_EQ(val.type(), Json::arrayValue);
+    val = json::Value(json::ArrayValue);
+    EXPECT_EQ(val.type(), json::ArrayValue);
     EXPECT_EQ(val.size(), 0);
     val[0u] = "zero";
     val[1u] = "one";
     EXPECT_EQ(val.size(), 2);
     EXPECT_TRUE(val.isValidIndex(1));
     EXPECT_FALSE(val.isValidIndex(2));
-    EXPECT_EQ(val[20u].type(), Json::nullValue);
+    EXPECT_EQ(val[20u].type(), json::NullValue);
     EXPECT_FALSE(val.isMember("key"));
     {
-        Json::Value const constVal = val;
+        json::Value const constVal = val;
         EXPECT_EQ(constVal[0u], "zero");
-        EXPECT_EQ(constVal[2u].type(), Json::nullValue);
+        EXPECT_EQ(constVal[2u].type(), json::NullValue);
         EXPECT_FALSE(constVal.isMember("key"));
         EXPECT_EQ(val.get(1u, "default0"), "one");
         EXPECT_EQ(val.get(3u, "default1"), "default1");
@@ -1170,28 +1170,28 @@ TEST(json_value, access_members)
 
 TEST(json_value, remove_members)
 {
-    Json::Value val;
-    EXPECT_EQ(val.removeMember(std::string("member")).type(), Json::nullValue);
+    json::Value val;
+    EXPECT_EQ(val.removeMember(std::string("member")).type(), json::NullValue);
 
-    val = Json::Value(Json::objectValue);
-    static Json::StaticString const staticThree("three");
-    val[staticThree] = 3;
+    val = json::Value(json::ObjectValue);
+    static json::StaticString const kSTATIC_THREE("three");
+    val[kSTATIC_THREE] = 3;
     val["two"] = 2;
     EXPECT_EQ(val.size(), 2);
 
-    EXPECT_EQ(val.removeMember(std::string("six")).type(), Json::nullValue);
+    EXPECT_EQ(val.removeMember(std::string("six")).type(), json::NullValue);
     EXPECT_EQ(val.size(), 2);
 
-    EXPECT_EQ(val.removeMember(staticThree), 3);
+    EXPECT_EQ(val.removeMember(kSTATIC_THREE), 3);
     EXPECT_EQ(val.size(), 1);
 
-    EXPECT_EQ(val.removeMember(staticThree).type(), Json::nullValue);
+    EXPECT_EQ(val.removeMember(kSTATIC_THREE).type(), json::NullValue);
     EXPECT_EQ(val.size(), 1);
 
     EXPECT_EQ(val.removeMember(std::string("two")), 2);
     EXPECT_EQ(val.size(), 0);
 
-    EXPECT_EQ(val.removeMember(std::string("two")).type(), Json::nullValue);
+    EXPECT_EQ(val.removeMember(std::string("two")).type(), json::NullValue);
     EXPECT_EQ(val.size(), 0);
 }
 
@@ -1199,17 +1199,17 @@ TEST(json_value, iterator)
 {
     {
         // Iterating an array.
-        Json::Value arr{Json::arrayValue};
+        json::Value arr{json::ArrayValue};
         arr[0u] = "zero";
         arr[1u] = "one";
         arr[2u] = "two";
         arr[3u] = "three";
 
-        Json::ValueIterator const b{arr.begin()};
-        Json::ValueIterator const e{arr.end()};
+        json::ValueIterator const b{arr.begin()};
+        json::ValueIterator const e{arr.end()};
 
-        Json::ValueIterator i1 = b;
-        Json::ValueIterator i2 = e;
+        json::ValueIterator i1 = b;
+        json::ValueIterator i2 = e;
         --i2;
 
         // key(), index(), and memberName() on an array iterator.
@@ -1236,8 +1236,8 @@ TEST(json_value, iterator)
     }
     {
         // Iterating a const object.
-        Json::Value const obj{[]() {
-            Json::Value obj{Json::objectValue};
+        json::Value const obj{[]() {
+            json::Value obj{json::ObjectValue};
             obj["0"] = 0;
             obj["1"] = 1;
             obj["2"] = 2;
@@ -1245,8 +1245,8 @@ TEST(json_value, iterator)
             return obj;
         }()};
 
-        Json::ValueConstIterator i1{obj.begin()};
-        Json::ValueConstIterator i2{obj.end()};
+        json::ValueConstIterator i1{obj.begin()};
+        json::ValueConstIterator i2{obj.end()};
         --i2;
 
         // key(), index(), and memberName() on an object iterator.
@@ -1271,19 +1271,19 @@ TEST(json_value, iterator)
     }
     {
         // Iterating a non-const null object.
-        Json::Value nul{};
+        json::Value nul{};
         EXPECT_EQ(nul.begin(), nul.end());
     }
     {
         // Iterating a const Int.
-        Json::Value const i{-3};
+        json::Value const i{-3};
         EXPECT_EQ(i.begin(), i.end());
     }
 }
 
 TEST(json_value, nest_limits)
 {
-    Json::Reader r;
+    json::Reader r;
     {
         auto nest = [](std::uint32_t depth) -> std::string {
             std::string s = "{";
@@ -1297,15 +1297,15 @@ TEST(json_value, nest_limits)
 
         {
             // Within object nest limit
-            auto json{nest(std::min(10u, Json::Reader::nest_limit))};
-            Json::Value j;
+            auto json{nest(std::min(10u, json::Reader::kNEST_LIMIT))};
+            json::Value j;
             EXPECT_TRUE(r.parse(json, j));
         }
 
         {
             // Exceed object nest limit
-            auto json{nest(Json::Reader::nest_limit + 1)};
-            Json::Value j;
+            auto json{nest(json::Reader::kNEST_LIMIT + 1)};
+            json::Value j;
             EXPECT_FALSE(r.parse(json, j));
         }
     }
@@ -1321,8 +1321,8 @@ TEST(json_value, nest_limits)
     };
     {
         // Exceed array nest limit
-        auto json{nest(Json::Reader::nest_limit + 1)};
-        Json::Value j;
+        auto json{nest(json::Reader::kNEST_LIMIT + 1)};
+        json::Value j;
         EXPECT_FALSE(r.parse(json, j));
     }
 }
@@ -1332,21 +1332,21 @@ TEST(json_value, memory_leak)
     // When run with the address sanitizer, this test confirms there is no
     // memory leak with the scenarios below.
     {
-        Json::Value a;
+        json::Value a;
         a[0u] = 1;
-        EXPECT_EQ(a.type(), Json::arrayValue);
-        EXPECT_EQ(a[0u].type(), Json::intValue);
+        EXPECT_EQ(a.type(), json::ArrayValue);
+        EXPECT_EQ(a[0u].type(), json::IntValue);
         a = std::move(a[0u]);
-        EXPECT_EQ(a.type(), Json::intValue);
+        EXPECT_EQ(a.type(), json::IntValue);
     }
     {
-        Json::Value b;
-        Json::Value temp;
+        json::Value b;
+        json::Value temp;
         temp["a"] = "Probably avoids the small string optimization";
         temp["b"] = "Also probably avoids the small string optimization";
-        EXPECT_EQ(temp.type(), Json::objectValue);
+        EXPECT_EQ(temp.type(), json::ObjectValue);
         b.append(temp);
-        EXPECT_EQ(temp.type(), Json::objectValue);
+        EXPECT_EQ(temp.type(), json::ObjectValue);
         EXPECT_EQ(b.size(), 1);
 
         b.append(std::move(temp));
@@ -1354,7 +1354,7 @@ TEST(json_value, memory_leak)
 
         // Note that the type() == nullValue check is implementation
         // specific and not guaranteed to be valid in the future.
-        EXPECT_EQ(temp.type(), Json::nullValue);  // NOLINT(bugprone-use-after-move)
+        EXPECT_EQ(temp.type(), json::NullValue);  // NOLINT(bugprone-use-after-move)
     }
 }
 
diff --git a/src/tests/libxrpl/json/Writer.cpp b/src/tests/libxrpl/json/Writer.cpp
index 71fead1b69..772428ecb5 100644
--- a/src/tests/libxrpl/json/Writer.cpp
+++ b/src/tests/libxrpl/json/Writer.cpp
@@ -9,31 +9,31 @@
 #include <string>
 
 using namespace xrpl;
-using namespace Json;
+using namespace json;
 
 class WriterFixture : public ::testing::Test
 {
 protected:
-    std::string output;
-    std::unique_ptr<Writer> writer;
+    std::string output_;
+    std::unique_ptr<Writer> writer_;
 
     void
     SetUp() override
     {
-        writer = std::make_unique<Writer>(stringOutput(output));
+        writer_ = std::make_unique<Writer>(stringOutput(output_));
     }
 
     void
     reset()
     {
-        output.clear();
-        writer = std::make_unique<Writer>(stringOutput(output));
+        output_.clear();
+        writer_ = std::make_unique<Writer>(stringOutput(output_));
     }
 
     void
     expectOutput(std::string const& expected) const
     {
-        EXPECT_EQ(output, expected);
+        EXPECT_EQ(output_, expected);
     }
 
     void
@@ -46,128 +46,128 @@ protected:
 
 TEST_F(WriterFixture, trivial)
 {
-    EXPECT_TRUE(output.empty());
+    EXPECT_TRUE(output_.empty());
     checkOutputAndReset("");
 }
 
 TEST_F(WriterFixture, near_trivial)
 {
-    EXPECT_TRUE(output.empty());
-    writer->output(0);
+    EXPECT_TRUE(output_.empty());
+    writer_->output(0);
     checkOutputAndReset("0");
 }
 
 TEST_F(WriterFixture, primitives)
 {
-    writer->output(true);
+    writer_->output(true);
     checkOutputAndReset("true");
 
-    writer->output(false);
+    writer_->output(false);
     checkOutputAndReset("false");
 
-    writer->output(23);
+    writer_->output(23);
     checkOutputAndReset("23");
 
-    writer->output(23.0);
+    writer_->output(23.0);
     checkOutputAndReset("23.0");
 
-    writer->output(23.5);
+    writer_->output(23.5);
     checkOutputAndReset("23.5");
 
-    writer->output("a string");
+    writer_->output("a string");
     checkOutputAndReset(R"("a string")");
 
-    writer->output(nullptr);
+    writer_->output(nullptr);
     checkOutputAndReset("null");
 }
 
 TEST_F(WriterFixture, empty)
 {
-    writer->startRoot(Writer::CollectionType::array);
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Array);
+    writer_->finish();
     checkOutputAndReset("[]");
 
-    writer->startRoot(Writer::CollectionType::object);
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Object);
+    writer_->finish();
     checkOutputAndReset("{}");
 }
 
 TEST_F(WriterFixture, escaping)
 {
-    writer->output("\\");
+    writer_->output("\\");
     checkOutputAndReset(R"("\\")");
 
-    writer->output("\"");
+    writer_->output("\"");
     checkOutputAndReset(R"("\"")");
 
-    writer->output("\\\"");
+    writer_->output("\\\"");
     checkOutputAndReset(R"("\\\"")");
 
-    writer->output("this contains a \\ in the middle of it.");
+    writer_->output("this contains a \\ in the middle of it.");
     checkOutputAndReset(R"("this contains a \\ in the middle of it.")");
 
-    writer->output("\b\f\n\r\t");
+    writer_->output("\b\f\n\r\t");
     checkOutputAndReset(R"("\b\f\n\r\t")");
 }
 
 TEST_F(WriterFixture, array)
 {
-    writer->startRoot(Writer::CollectionType::array);
-    writer->append(12);
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Array);
+    writer_->append(12);
+    writer_->finish();
     checkOutputAndReset("[12]");
 }
 
 TEST_F(WriterFixture, long_array)
 {
-    writer->startRoot(Writer::CollectionType::array);
-    writer->append(12);
-    writer->append(true);
-    writer->append("hello");
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Array);
+    writer_->append(12);
+    writer_->append(true);
+    writer_->append("hello");
+    writer_->finish();
     checkOutputAndReset(R"([12,true,"hello"])");
 }
 
 TEST_F(WriterFixture, embedded_array_simple)
 {
-    writer->startRoot(Writer::CollectionType::array);
-    writer->startAppend(Writer::CollectionType::array);
-    writer->finish();
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Array);
+    writer_->startAppend(Writer::CollectionType::Array);
+    writer_->finish();
+    writer_->finish();
     checkOutputAndReset("[[]]");
 }
 
 TEST_F(WriterFixture, object)
 {
-    writer->startRoot(Writer::CollectionType::object);
-    writer->set("hello", "world");
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Object);
+    writer_->set("hello", "world");
+    writer_->finish();
     checkOutputAndReset(R"({"hello":"world"})");
 }
 
 TEST_F(WriterFixture, complex_object)
 {
-    writer->startRoot(Writer::CollectionType::object);
-    writer->set("hello", "world");
-    writer->startSet(Writer::CollectionType::array, "array");
-    writer->append(true);
-    writer->append(12);
-    writer->startAppend(Writer::CollectionType::array);
-    writer->startAppend(Writer::CollectionType::object);
-    writer->set("goodbye", "cruel world.");
-    writer->startSet(Writer::CollectionType::array, "subarray");
-    writer->append(23.5);
-    writer->finishAll();
+    writer_->startRoot(Writer::CollectionType::Object);
+    writer_->set("hello", "world");
+    writer_->startSet(Writer::CollectionType::Array, "array");
+    writer_->append(true);
+    writer_->append(12);
+    writer_->startAppend(Writer::CollectionType::Array);
+    writer_->startAppend(Writer::CollectionType::Object);
+    writer_->set("goodbye", "cruel world.");
+    writer_->startSet(Writer::CollectionType::Array, "subarray");
+    writer_->append(23.5);
+    writer_->finishAll();
     checkOutputAndReset(
         R"({"hello":"world","array":[true,12,[{"goodbye":"cruel world.","subarray":[23.5]}]]})");
 }
 
 TEST_F(WriterFixture, json_value)
 {
-    Json::Value value(Json::objectValue);
+    json::Value value(json::ObjectValue);
     value["foo"] = 23;
-    writer->startRoot(Writer::CollectionType::object);
-    writer->set("hello", value);
-    writer->finish();
+    writer_->startRoot(Writer::CollectionType::Object);
+    writer_->set("hello", value);
+    writer_->finish();
     checkOutputAndReset(R"({"hello":{"foo":23}})");
 }
diff --git a/src/tests/libxrpl/protocol_autogen/TestHelpers.h b/src/tests/libxrpl/protocol_autogen/TestHelpers.h
index cf2d7ffe6a..dbc5aac40a 100644
--- a/src/tests/libxrpl/protocol_autogen/TestHelpers.h
+++ b/src/tests/libxrpl/protocol_autogen/TestHelpers.h
@@ -159,14 +159,14 @@ canonical_ARRAY()
 inline STObject
 canonical_OBJECT()
 {
-    return STObject{sfGeneric};
+    return STObject{kSF_GENERIC};
 }
 
 inline STPathSet
 canonical_PATHSET()
 {
     STPathSet result{};
-    result.push_back(STPath{});
+    result.pushBack(STPath{});
     return result;
 }
 
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMBidTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMBidTests.cpp
index c9db0cabcf..89c8736279 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMBidTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMBidTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMBidTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMBid"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMBid"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -108,7 +108,7 @@ TEST(TransactionsAMMBidTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMBidFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMBidFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -192,7 +192,7 @@ TEST(TransactionsAMMBidTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -206,7 +206,7 @@ TEST(TransactionsAMMBidTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -220,7 +220,7 @@ TEST(TransactionsAMMBidTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMBidNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMBidNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMClawbackTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMClawbackTests.cpp
index d01e840ce5..13a6d67d51 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMClawbackTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMClawbackTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMClawbackTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMClawback"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMClawback"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -96,7 +96,7 @@ TEST(TransactionsAMMClawbackTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMClawbackFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMClawbackFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -170,7 +170,7 @@ TEST(TransactionsAMMClawbackTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -184,7 +184,7 @@ TEST(TransactionsAMMClawbackTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -198,7 +198,7 @@ TEST(TransactionsAMMClawbackTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMClawbackNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMClawbackNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMCreateTests.cpp
index b55c9f377e..a8a36270d6 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -86,7 +86,7 @@ TEST(TransactionsAMMCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -151,7 +151,7 @@ TEST(TransactionsAMMCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -165,7 +165,7 @@ TEST(TransactionsAMMCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMDeleteTests.cpp
index 774d993a1a..adde343090 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsAMMDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsAMMDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsAMMDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMDepositTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMDepositTests.cpp
index 9917848f0a..407095eea6 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMDepositTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMDepositTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMDepositTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMDeposit"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMDeposit"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -128,7 +128,7 @@ TEST(TransactionsAMMDepositTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMDepositFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMDepositFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -230,7 +230,7 @@ TEST(TransactionsAMMDepositTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -244,7 +244,7 @@ TEST(TransactionsAMMDepositTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -258,7 +258,7 @@ TEST(TransactionsAMMDepositTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMDepositNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMDepositNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMVoteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMVoteTests.cpp
index 6a47b7613e..4e131a3b42 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMVoteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMVoteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMVoteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMVote"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMVote"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -86,7 +86,7 @@ TEST(TransactionsAMMVoteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMVoteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMVoteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -151,7 +151,7 @@ TEST(TransactionsAMMVoteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -165,7 +165,7 @@ TEST(TransactionsAMMVoteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AMMWithdrawTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AMMWithdrawTests.cpp
index 0fd529c282..d99dc5c3cd 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AMMWithdrawTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AMMWithdrawTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAMMWithdrawTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMWithdraw"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMWithdraw"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -118,7 +118,7 @@ TEST(TransactionsAMMWithdrawTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMWithdrawFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMWithdrawFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -211,7 +211,7 @@ TEST(TransactionsAMMWithdrawTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -225,7 +225,7 @@ TEST(TransactionsAMMWithdrawTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -239,7 +239,7 @@ TEST(TransactionsAMMWithdrawTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAMMWithdrawNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAMMWithdrawNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AccountDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AccountDeleteTests.cpp
index 0fb951221b..2bbd2104fd 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AccountDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AccountDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAccountDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -90,7 +90,7 @@ TEST(TransactionsAccountDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -157,7 +157,7 @@ TEST(TransactionsAccountDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -171,7 +171,7 @@ TEST(TransactionsAccountDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -185,7 +185,7 @@ TEST(TransactionsAccountDeleteTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountDeleteNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountDeleteNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/AccountSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/AccountSetTests.cpp
index 993fe55742..98a90964be 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/AccountSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/AccountSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsAccountSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -162,7 +162,7 @@ TEST(TransactionsAccountSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -293,7 +293,7 @@ TEST(TransactionsAccountSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     OfferCancelBuilder wrongBuilder{account, canonical_UINT32(), 1, canonical_AMOUNT()};
@@ -307,7 +307,7 @@ TEST(TransactionsAccountSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     OfferCancelBuilder wrongBuilder{account, canonical_UINT32(), 1, canonical_AMOUNT()};
@@ -321,7 +321,7 @@ TEST(TransactionsAccountSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testAccountSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testAccountSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/BatchTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/BatchTests.cpp
index c6818a26d7..6596e6026f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/BatchTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/BatchTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsBatchTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testBatch"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testBatch"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsBatchTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testBatchFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testBatchFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsBatchTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsBatchTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsBatchTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testBatchNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testBatchNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CheckCancelTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CheckCancelTests.cpp
index afdc2d6d66..330a8851c6 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CheckCancelTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CheckCancelTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCheckCancelTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCancel"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCancel"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsCheckCancelTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCancelFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCancelFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsCheckCancelTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsCheckCancelTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CheckCashTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CheckCashTests.cpp
index b8c4dccd55..3a00c95593 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CheckCashTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CheckCashTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCheckCashTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCash"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCash"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -90,7 +90,7 @@ TEST(TransactionsCheckCashTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCashFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCashFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -157,7 +157,7 @@ TEST(TransactionsCheckCashTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -171,7 +171,7 @@ TEST(TransactionsCheckCashTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -185,7 +185,7 @@ TEST(TransactionsCheckCashTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCashNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCashNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CheckCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CheckCreateTests.cpp
index 9b8a831913..f4f10d850f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CheckCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CheckCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCheckCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -108,7 +108,7 @@ TEST(TransactionsCheckCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -192,7 +192,7 @@ TEST(TransactionsCheckCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -206,7 +206,7 @@ TEST(TransactionsCheckCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -220,7 +220,7 @@ TEST(TransactionsCheckCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCheckCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCheckCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/ClawbackTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/ClawbackTests.cpp
index 2f9b7f1e3a..0ee34304d7 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/ClawbackTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/ClawbackTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsClawbackTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testClawback"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testClawback"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsClawbackTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testClawbackFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testClawbackFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsClawbackTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsClawbackTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsClawbackTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testClawbackNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testClawbackNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CredentialAcceptTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CredentialAcceptTests.cpp
index 5ae9c8a181..509a80a306 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CredentialAcceptTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CredentialAcceptTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCredentialAcceptTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialAccept"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialAccept"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsCredentialAcceptTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialAcceptFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialAcceptFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsCredentialAcceptTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsCredentialAcceptTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CredentialCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CredentialCreateTests.cpp
index 0bfa9def33..0ed801a56b 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CredentialCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CredentialCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCredentialCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -98,7 +98,7 @@ TEST(TransactionsCredentialCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -173,7 +173,7 @@ TEST(TransactionsCredentialCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -187,7 +187,7 @@ TEST(TransactionsCredentialCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -201,7 +201,7 @@ TEST(TransactionsCredentialCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/CredentialDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/CredentialDeleteTests.cpp
index 26bba2ba1a..910599a1e1 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/CredentialDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/CredentialDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsCredentialDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -90,7 +90,7 @@ TEST(TransactionsCredentialDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -157,7 +157,7 @@ TEST(TransactionsCredentialDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -171,7 +171,7 @@ TEST(TransactionsCredentialDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -185,7 +185,7 @@ TEST(TransactionsCredentialDeleteTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testCredentialDeleteNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testCredentialDeleteNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/DIDDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/DIDDeleteTests.cpp
index e60ef99fb1..fb23d78e88 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/DIDDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/DIDDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsDIDDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDIDDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDIDDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -62,7 +62,7 @@ TEST(TransactionsDIDDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDIDDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDIDDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -103,7 +103,7 @@ TEST(TransactionsDIDDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -117,7 +117,7 @@ TEST(TransactionsDIDDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/DIDSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/DIDSetTests.cpp
index 07215e6966..fc52ffc749 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/DIDSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/DIDSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsDIDSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDIDSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDIDSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -92,7 +92,7 @@ TEST(TransactionsDIDSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDIDSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDIDSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -160,7 +160,7 @@ TEST(TransactionsDIDSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -174,7 +174,7 @@ TEST(TransactionsDIDSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -188,7 +188,7 @@ TEST(TransactionsDIDSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDIDSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDIDSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/DelegateSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/DelegateSetTests.cpp
index 8e7fed9419..86af2905c9 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/DelegateSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/DelegateSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsDelegateSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDelegateSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDelegateSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsDelegateSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDelegateSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDelegateSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsDelegateSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsDelegateSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/DepositPreauthTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/DepositPreauthTests.cpp
index 36232eb220..e02cae0a84 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/DepositPreauthTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/DepositPreauthTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsDepositPreauthTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDepositPreauth"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDepositPreauth"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -102,7 +102,7 @@ TEST(TransactionsDepositPreauthTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDepositPreauthFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDepositPreauthFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -179,7 +179,7 @@ TEST(TransactionsDepositPreauthTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -193,7 +193,7 @@ TEST(TransactionsDepositPreauthTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -207,7 +207,7 @@ TEST(TransactionsDepositPreauthTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testDepositPreauthNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testDepositPreauthNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/EnableAmendmentTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/EnableAmendmentTests.cpp
index e9dfe892e4..7586c89bce 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/EnableAmendmentTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/EnableAmendmentTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsEnableAmendmentTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEnableAmendment"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEnableAmendment"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsEnableAmendmentTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEnableAmendmentFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEnableAmendmentFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsEnableAmendmentTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsEnableAmendmentTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/EscrowCancelTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/EscrowCancelTests.cpp
index 300a9b7615..73a0a12bca 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/EscrowCancelTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/EscrowCancelTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsEscrowCancelTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowCancel"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowCancel"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsEscrowCancelTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowCancelFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowCancelFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsEscrowCancelTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsEscrowCancelTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/EscrowCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/EscrowCreateTests.cpp
index 1f9b3d30a9..1d62fadb20 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/EscrowCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/EscrowCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsEscrowCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -118,7 +118,7 @@ TEST(TransactionsEscrowCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -211,7 +211,7 @@ TEST(TransactionsEscrowCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -225,7 +225,7 @@ TEST(TransactionsEscrowCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -239,7 +239,7 @@ TEST(TransactionsEscrowCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/EscrowFinishTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/EscrowFinishTests.cpp
index f729d0fda3..f76bfffb59 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/EscrowFinishTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/EscrowFinishTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsEscrowFinishTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowFinish"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowFinish"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -108,7 +108,7 @@ TEST(TransactionsEscrowFinishTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowFinishFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowFinishFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -192,7 +192,7 @@ TEST(TransactionsEscrowFinishTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -206,7 +206,7 @@ TEST(TransactionsEscrowFinishTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -220,7 +220,7 @@ TEST(TransactionsEscrowFinishTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testEscrowFinishNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testEscrowFinishNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LedgerStateFixTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LedgerStateFixTests.cpp
index b366605a4f..60034255c7 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LedgerStateFixTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LedgerStateFixTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLedgerStateFixTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLedgerStateFix"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLedgerStateFix"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsLedgerStateFixTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLedgerStateFixFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLedgerStateFixFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsLedgerStateFixTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsLedgerStateFixTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsLedgerStateFixTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLedgerStateFixNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLedgerStateFixNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverClawbackTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverClawbackTests.cpp
index 1e6c72f458..34ea31178f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverClawbackTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverClawbackTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanBrokerCoverClawbackTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverClawback"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverClawback"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -82,7 +82,7 @@ TEST(TransactionsLoanBrokerCoverClawbackTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverClawbackFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverClawbackFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -141,7 +141,7 @@ TEST(TransactionsLoanBrokerCoverClawbackTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -155,7 +155,7 @@ TEST(TransactionsLoanBrokerCoverClawbackTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -169,7 +169,7 @@ TEST(TransactionsLoanBrokerCoverClawbackTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverClawbackNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverClawbackNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverDepositTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverDepositTests.cpp
index d6addb2fef..7d659ee28f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverDepositTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverDepositTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanBrokerCoverDepositTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverDeposit"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverDeposit"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsLoanBrokerCoverDepositTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverDepositFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverDepositFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsLoanBrokerCoverDepositTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsLoanBrokerCoverDepositTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverWithdrawTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverWithdrawTests.cpp
index 3e66944e39..5b0a8c9146 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverWithdrawTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerCoverWithdrawTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanBrokerCoverWithdrawTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverWithdraw"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverWithdraw"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -98,7 +98,7 @@ TEST(TransactionsLoanBrokerCoverWithdrawTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverWithdrawFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverWithdrawFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -173,7 +173,7 @@ TEST(TransactionsLoanBrokerCoverWithdrawTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -187,7 +187,7 @@ TEST(TransactionsLoanBrokerCoverWithdrawTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -201,7 +201,7 @@ TEST(TransactionsLoanBrokerCoverWithdrawTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerCoverWithdrawNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerCoverWithdrawNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerDeleteTests.cpp
index b557ab4397..e81cf2f613 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanBrokerDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsLoanBrokerDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsLoanBrokerDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsLoanBrokerDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerSetTests.cpp
index e270332f42..bcf0a65755 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanBrokerSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanBrokerSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -130,7 +130,7 @@ TEST(TransactionsLoanBrokerSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -233,7 +233,7 @@ TEST(TransactionsLoanBrokerSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -247,7 +247,7 @@ TEST(TransactionsLoanBrokerSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -261,7 +261,7 @@ TEST(TransactionsLoanBrokerSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanBrokerSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanBrokerSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanDeleteTests.cpp
index 0edcdf4d06..bafd277e0d 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsLoanDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsLoanDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsLoanDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanManageTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanManageTests.cpp
index bb842330d6..b70b28ba3a 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanManageTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanManageTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanManageTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanManage"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanManage"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsLoanManageTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanManageFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanManageFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsLoanManageTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsLoanManageTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanPayTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanPayTests.cpp
index 2b0f16f25c..79b7b08732 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanPayTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanPayTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanPayTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanPay"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanPay"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsLoanPayTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanPayFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanPayFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsLoanPayTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsLoanPayTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/LoanSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/LoanSetTests.cpp
index 4141a958a0..8774a38a3b 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/LoanSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/LoanSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsLoanSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -228,7 +228,7 @@ TEST(TransactionsLoanSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -420,7 +420,7 @@ TEST(TransactionsLoanSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -434,7 +434,7 @@ TEST(TransactionsLoanSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -448,7 +448,7 @@ TEST(TransactionsLoanSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testLoanSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testLoanSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenAuthorizeTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenAuthorizeTests.cpp
index bde6df05ff..b156e4d68e 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenAuthorizeTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenAuthorizeTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsMPTokenAuthorizeTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenAuthorize"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenAuthorize"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsMPTokenAuthorizeTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenAuthorizeFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenAuthorizeFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsMPTokenAuthorizeTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsMPTokenAuthorizeTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsMPTokenAuthorizeTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenAuthorizeNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenAuthorizeNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceCreateTests.cpp
index dd4874e268..f7151fc749 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsMPTokenIssuanceCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -122,7 +122,7 @@ TEST(TransactionsMPTokenIssuanceCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -217,7 +217,7 @@ TEST(TransactionsMPTokenIssuanceCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -231,7 +231,7 @@ TEST(TransactionsMPTokenIssuanceCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -245,7 +245,7 @@ TEST(TransactionsMPTokenIssuanceCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceDestroyTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceDestroyTests.cpp
index 8a69c1f63a..488077325c 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceDestroyTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceDestroyTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsMPTokenIssuanceDestroyTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceDestroy"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceDestroy"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsMPTokenIssuanceDestroyTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceDestroyFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceDestroyFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsMPTokenIssuanceDestroyTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsMPTokenIssuanceDestroyTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceSetTests.cpp
index 2ed9e42184..5c97ae8871 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/MPTokenIssuanceSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsMPTokenIssuanceSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -120,7 +120,7 @@ TEST(TransactionsMPTokenIssuanceSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -214,7 +214,7 @@ TEST(TransactionsMPTokenIssuanceSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -228,7 +228,7 @@ TEST(TransactionsMPTokenIssuanceSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -242,7 +242,7 @@ TEST(TransactionsMPTokenIssuanceSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testMPTokenIssuanceSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testMPTokenIssuanceSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenAcceptOfferTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenAcceptOfferTests.cpp
index e2fb8d29ec..e9fc370c35 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenAcceptOfferTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenAcceptOfferTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenAcceptOfferTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenAcceptOffer"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenAcceptOffer"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -92,7 +92,7 @@ TEST(TransactionsNFTokenAcceptOfferTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenAcceptOfferFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenAcceptOfferFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -160,7 +160,7 @@ TEST(TransactionsNFTokenAcceptOfferTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -174,7 +174,7 @@ TEST(TransactionsNFTokenAcceptOfferTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -188,7 +188,7 @@ TEST(TransactionsNFTokenAcceptOfferTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenAcceptOfferNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenAcceptOfferNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenBurnTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenBurnTests.cpp
index 128ff51794..423ddfadce 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenBurnTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenBurnTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenBurnTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenBurn"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenBurn"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsNFTokenBurnTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenBurnFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenBurnFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsNFTokenBurnTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsNFTokenBurnTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsNFTokenBurnTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenBurnNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenBurnNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCancelOfferTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCancelOfferTests.cpp
index f8ab0f7da1..f995009738 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCancelOfferTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCancelOfferTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenCancelOfferTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenCancelOffer"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenCancelOffer"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsNFTokenCancelOfferTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenCancelOfferFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenCancelOfferFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsNFTokenCancelOfferTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsNFTokenCancelOfferTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCreateOfferTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCreateOfferTests.cpp
index c57ede25c4..aceac00a26 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCreateOfferTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenCreateOfferTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenCreateOfferTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenCreateOffer"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenCreateOffer"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -108,7 +108,7 @@ TEST(TransactionsNFTokenCreateOfferTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenCreateOfferFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenCreateOfferFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -192,7 +192,7 @@ TEST(TransactionsNFTokenCreateOfferTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -206,7 +206,7 @@ TEST(TransactionsNFTokenCreateOfferTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -220,7 +220,7 @@ TEST(TransactionsNFTokenCreateOfferTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenCreateOfferNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenCreateOfferNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenMintTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenMintTests.cpp
index e85dbd238c..6c380d68d4 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenMintTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenMintTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenMintTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenMint"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenMint"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -130,7 +130,7 @@ TEST(TransactionsNFTokenMintTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenMintFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenMintFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -233,7 +233,7 @@ TEST(TransactionsNFTokenMintTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -247,7 +247,7 @@ TEST(TransactionsNFTokenMintTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -261,7 +261,7 @@ TEST(TransactionsNFTokenMintTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenMintNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenMintNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenModifyTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenModifyTests.cpp
index 9f5eeb052d..33447560c4 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/NFTokenModifyTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/NFTokenModifyTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsNFTokenModifyTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenModify"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenModify"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -90,7 +90,7 @@ TEST(TransactionsNFTokenModifyTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenModifyFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenModifyFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -157,7 +157,7 @@ TEST(TransactionsNFTokenModifyTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -171,7 +171,7 @@ TEST(TransactionsNFTokenModifyTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -185,7 +185,7 @@ TEST(TransactionsNFTokenModifyTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testNFTokenModifyNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testNFTokenModifyNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/OfferCancelTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/OfferCancelTests.cpp
index 0e3c8a4224..07397f3154 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/OfferCancelTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/OfferCancelTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsOfferCancelTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOfferCancel"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOfferCancel"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsOfferCancelTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOfferCancelFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOfferCancelFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsOfferCancelTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsOfferCancelTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/OfferCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/OfferCreateTests.cpp
index 3dde69574e..c0aac0a265 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/OfferCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/OfferCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsOfferCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOfferCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOfferCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -108,7 +108,7 @@ TEST(TransactionsOfferCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOfferCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOfferCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -192,7 +192,7 @@ TEST(TransactionsOfferCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -206,7 +206,7 @@ TEST(TransactionsOfferCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -220,7 +220,7 @@ TEST(TransactionsOfferCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOfferCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOfferCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/OracleDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/OracleDeleteTests.cpp
index 631ad0861a..8ab372f230 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/OracleDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/OracleDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsOracleDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOracleDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOracleDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsOracleDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOracleDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOracleDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsOracleDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsOracleDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/OracleSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/OracleSetTests.cpp
index e13e8a8374..49964181ad 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/OracleSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/OracleSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsOracleSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOracleSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOracleSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -116,7 +116,7 @@ TEST(TransactionsOracleSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOracleSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOracleSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -208,7 +208,7 @@ TEST(TransactionsOracleSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -222,7 +222,7 @@ TEST(TransactionsOracleSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -236,7 +236,7 @@ TEST(TransactionsOracleSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testOracleSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testOracleSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelClaimTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelClaimTests.cpp
index 1b742196a5..e48a2c589a 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelClaimTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelClaimTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPaymentChannelClaimTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelClaim"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelClaim"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -120,7 +120,7 @@ TEST(TransactionsPaymentChannelClaimTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelClaimFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelClaimFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -214,7 +214,7 @@ TEST(TransactionsPaymentChannelClaimTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -228,7 +228,7 @@ TEST(TransactionsPaymentChannelClaimTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -242,7 +242,7 @@ TEST(TransactionsPaymentChannelClaimTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelClaimNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelClaimNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelCreateTests.cpp
index e3ba999d0b..afda539b2f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPaymentChannelCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -114,7 +114,7 @@ TEST(TransactionsPaymentChannelCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -205,7 +205,7 @@ TEST(TransactionsPaymentChannelCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -219,7 +219,7 @@ TEST(TransactionsPaymentChannelCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -233,7 +233,7 @@ TEST(TransactionsPaymentChannelCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelFundTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelFundTests.cpp
index ce070c0761..00eb52d55d 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelFundTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PaymentChannelFundTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPaymentChannelFundTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelFund"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelFund"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -88,7 +88,7 @@ TEST(TransactionsPaymentChannelFundTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelFundFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelFundFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -154,7 +154,7 @@ TEST(TransactionsPaymentChannelFundTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -168,7 +168,7 @@ TEST(TransactionsPaymentChannelFundTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -182,7 +182,7 @@ TEST(TransactionsPaymentChannelFundTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentChannelFundNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentChannelFundNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PaymentTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PaymentTests.cpp
index 7e5c046fca..d77aedf6c5 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PaymentTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PaymentTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPaymentTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPayment"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPayment"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -148,7 +148,7 @@ TEST(TransactionsPaymentTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -268,7 +268,7 @@ TEST(TransactionsPaymentTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -282,7 +282,7 @@ TEST(TransactionsPaymentTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -296,7 +296,7 @@ TEST(TransactionsPaymentTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPaymentNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPaymentNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainDeleteTests.cpp
index e9f92fb5b3..74e5dd0d47 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPermissionedDomainDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPermissionedDomainDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPermissionedDomainDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsPermissionedDomainDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPermissionedDomainDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPermissionedDomainDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsPermissionedDomainDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsPermissionedDomainDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainSetTests.cpp
index eeec170f4c..c55c53efd4 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/PermissionedDomainSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsPermissionedDomainSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPermissionedDomainSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPermissionedDomainSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsPermissionedDomainSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPermissionedDomainSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPermissionedDomainSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsPermissionedDomainSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsPermissionedDomainSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsPermissionedDomainSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testPermissionedDomainSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testPermissionedDomainSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/SetFeeTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/SetFeeTests.cpp
index 981bf72ea7..9605daee9f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/SetFeeTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/SetFeeTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsSetFeeTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetFee"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetFee"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -142,7 +142,7 @@ TEST(TransactionsSetFeeTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetFeeFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetFeeFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -255,7 +255,7 @@ TEST(TransactionsSetFeeTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -269,7 +269,7 @@ TEST(TransactionsSetFeeTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -283,7 +283,7 @@ TEST(TransactionsSetFeeTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetFeeNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetFeeNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/SetRegularKeyTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/SetRegularKeyTests.cpp
index ce4f8ce2ef..7f50470a1e 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/SetRegularKeyTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/SetRegularKeyTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsSetRegularKeyTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetRegularKey"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetRegularKey"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -72,7 +72,7 @@ TEST(TransactionsSetRegularKeyTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetRegularKeyFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetRegularKeyFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -122,7 +122,7 @@ TEST(TransactionsSetRegularKeyTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -136,7 +136,7 @@ TEST(TransactionsSetRegularKeyTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -150,7 +150,7 @@ TEST(TransactionsSetRegularKeyTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSetRegularKeyNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSetRegularKeyNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/SignerListSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/SignerListSetTests.cpp
index 8d027823d0..22c348d5a4 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/SignerListSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/SignerListSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsSignerListSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSignerListSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSignerListSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -80,7 +80,7 @@ TEST(TransactionsSignerListSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSignerListSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSignerListSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -138,7 +138,7 @@ TEST(TransactionsSignerListSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -152,7 +152,7 @@ TEST(TransactionsSignerListSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -166,7 +166,7 @@ TEST(TransactionsSignerListSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testSignerListSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testSignerListSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/TicketCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/TicketCreateTests.cpp
index bb07cdef84..38bbdf2681 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/TicketCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/TicketCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsTicketCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testTicketCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testTicketCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsTicketCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testTicketCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testTicketCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsTicketCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsTicketCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/TrustSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/TrustSetTests.cpp
index 12b243ca5c..081902bc58 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/TrustSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/TrustSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsTrustSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testTrustSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testTrustSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -92,7 +92,7 @@ TEST(TransactionsTrustSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testTrustSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testTrustSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -160,7 +160,7 @@ TEST(TransactionsTrustSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -174,7 +174,7 @@ TEST(TransactionsTrustSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -188,7 +188,7 @@ TEST(TransactionsTrustSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testTrustSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testTrustSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/UNLModifyTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/UNLModifyTests.cpp
index 3481460641..e6d920538e 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/UNLModifyTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/UNLModifyTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsUNLModifyTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testUNLModify"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testUNLModify"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -86,7 +86,7 @@ TEST(TransactionsUNLModifyTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testUNLModifyFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testUNLModifyFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -151,7 +151,7 @@ TEST(TransactionsUNLModifyTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -165,7 +165,7 @@ TEST(TransactionsUNLModifyTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultClawbackTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultClawbackTests.cpp
index d089e3d097..f63e6a3ddf 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultClawbackTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultClawbackTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultClawbackTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultClawback"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultClawback"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -88,7 +88,7 @@ TEST(TransactionsVaultClawbackTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultClawbackFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultClawbackFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -154,7 +154,7 @@ TEST(TransactionsVaultClawbackTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -168,7 +168,7 @@ TEST(TransactionsVaultClawbackTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -182,7 +182,7 @@ TEST(TransactionsVaultClawbackTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultClawbackNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultClawbackNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultCreateTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultCreateTests.cpp
index da141ce812..9c1e14f6f4 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultCreateTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultCreateTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultCreateTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultCreate"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultCreate"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -130,7 +130,7 @@ TEST(TransactionsVaultCreateTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultCreateFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultCreateFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -233,7 +233,7 @@ TEST(TransactionsVaultCreateTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -247,7 +247,7 @@ TEST(TransactionsVaultCreateTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -261,7 +261,7 @@ TEST(TransactionsVaultCreateTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultCreateNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultCreateNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp
index 24c89d249a..70747af1ed 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultDeleteTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultDeleteTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultDelete"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultDelete"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -70,7 +70,7 @@ TEST(TransactionsVaultDeleteTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultDeleteFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultDeleteFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -119,7 +119,7 @@ TEST(TransactionsVaultDeleteTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -133,7 +133,7 @@ TEST(TransactionsVaultDeleteTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultDepositTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultDepositTests.cpp
index c18ee8bd62..383e04bbee 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultDepositTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultDepositTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultDepositTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultDeposit"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultDeposit"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -78,7 +78,7 @@ TEST(TransactionsVaultDepositTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultDepositFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultDepositFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -135,7 +135,7 @@ TEST(TransactionsVaultDepositTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -149,7 +149,7 @@ TEST(TransactionsVaultDepositTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultSetTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultSetTests.cpp
index 995c1019f3..b67a003ec5 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultSetTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultSetTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultSetTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultSet"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultSet"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -100,7 +100,7 @@ TEST(TransactionsVaultSetTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultSetFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultSetFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -176,7 +176,7 @@ TEST(TransactionsVaultSetTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -190,7 +190,7 @@ TEST(TransactionsVaultSetTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -204,7 +204,7 @@ TEST(TransactionsVaultSetTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultSetNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultSetNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/VaultWithdrawTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/VaultWithdrawTests.cpp
index 9d8a7fecb9..4067a6551d 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/VaultWithdrawTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/VaultWithdrawTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsVaultWithdrawTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultWithdraw"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultWithdraw"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -98,7 +98,7 @@ TEST(TransactionsVaultWithdrawTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultWithdrawFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultWithdrawFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -173,7 +173,7 @@ TEST(TransactionsVaultWithdrawTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -187,7 +187,7 @@ TEST(TransactionsVaultWithdrawTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -201,7 +201,7 @@ TEST(TransactionsVaultWithdrawTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testVaultWithdrawNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testVaultWithdrawNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainAccountCreateCommitTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainAccountCreateCommitTests.cpp
index c3f2f11a00..3c7ac4e193 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainAccountCreateCommitTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainAccountCreateCommitTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainAccountCreateCommitTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAccountCreateCommit"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAccountCreateCommit"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -94,7 +94,7 @@ TEST(TransactionsXChainAccountCreateCommitTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAccountCreateCommitFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAccountCreateCommitFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -167,7 +167,7 @@ TEST(TransactionsXChainAccountCreateCommitTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -181,7 +181,7 @@ TEST(TransactionsXChainAccountCreateCommitTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestationTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestationTests.cpp
index 82f9c6afc1..9bb79f31f6 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestationTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainAddAccountCreateAttestationTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainAddAccountCreateAttestationTests, BuilderSettersRoundTrip
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAddAccountCreateAttestation"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAddAccountCreateAttestation"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -150,7 +150,7 @@ TEST(TransactionsXChainAddAccountCreateAttestationTests, BuilderFromStTxRoundTri
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAddAccountCreateAttestationFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAddAccountCreateAttestationFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -279,7 +279,7 @@ TEST(TransactionsXChainAddAccountCreateAttestationTests, WrapperThrowsOnWrongTxT
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -293,7 +293,7 @@ TEST(TransactionsXChainAddAccountCreateAttestationTests, BuilderThrowsOnWrongTxT
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainAddClaimAttestationTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainAddClaimAttestationTests.cpp
index 6b9144fa68..661e5020f9 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainAddClaimAttestationTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainAddClaimAttestationTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainAddClaimAttestationTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAddClaimAttestation"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAddClaimAttestation"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -144,7 +144,7 @@ TEST(TransactionsXChainAddClaimAttestationTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAddClaimAttestationFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAddClaimAttestationFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -266,7 +266,7 @@ TEST(TransactionsXChainAddClaimAttestationTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -280,7 +280,7 @@ TEST(TransactionsXChainAddClaimAttestationTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -294,7 +294,7 @@ TEST(TransactionsXChainAddClaimAttestationTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainAddClaimAttestationNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainAddClaimAttestationNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainClaimTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainClaimTests.cpp
index 69101c843d..472bf4c91d 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainClaimTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainClaimTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainClaimTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainClaim"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainClaim"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -104,7 +104,7 @@ TEST(TransactionsXChainClaimTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainClaimFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainClaimFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -186,7 +186,7 @@ TEST(TransactionsXChainClaimTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -200,7 +200,7 @@ TEST(TransactionsXChainClaimTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -214,7 +214,7 @@ TEST(TransactionsXChainClaimTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainClaimNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainClaimNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainCommitTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainCommitTests.cpp
index e6c72ec908..121ab84a16 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainCommitTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainCommitTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainCommitTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCommit"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCommit"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -96,7 +96,7 @@ TEST(TransactionsXChainCommitTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCommitFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCommitFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -170,7 +170,7 @@ TEST(TransactionsXChainCommitTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -184,7 +184,7 @@ TEST(TransactionsXChainCommitTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -198,7 +198,7 @@ TEST(TransactionsXChainCommitTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCommitNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCommitNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateBridgeTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateBridgeTests.cpp
index 5f529440f3..7b06c4f52f 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateBridgeTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateBridgeTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainCreateBridgeTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCreateBridge"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCreateBridge"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -88,7 +88,7 @@ TEST(TransactionsXChainCreateBridgeTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCreateBridgeFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCreateBridgeFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -154,7 +154,7 @@ TEST(TransactionsXChainCreateBridgeTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -168,7 +168,7 @@ TEST(TransactionsXChainCreateBridgeTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -182,7 +182,7 @@ TEST(TransactionsXChainCreateBridgeTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCreateBridgeNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCreateBridgeNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateClaimIDTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateClaimIDTests.cpp
index 41c71b9d8d..814785bc4e 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateClaimIDTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainCreateClaimIDTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainCreateClaimIDTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCreateClaimID"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCreateClaimID"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -86,7 +86,7 @@ TEST(TransactionsXChainCreateClaimIDTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainCreateClaimIDFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainCreateClaimIDFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -151,7 +151,7 @@ TEST(TransactionsXChainCreateClaimIDTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -165,7 +165,7 @@ TEST(TransactionsXChainCreateClaimIDTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
diff --git a/src/tests/libxrpl/protocol_autogen/transactions/XChainModifyBridgeTests.cpp b/src/tests/libxrpl/protocol_autogen/transactions/XChainModifyBridgeTests.cpp
index 7b3c4be5ce..da854976b9 100644
--- a/src/tests/libxrpl/protocol_autogen/transactions/XChainModifyBridgeTests.cpp
+++ b/src/tests/libxrpl/protocol_autogen/transactions/XChainModifyBridgeTests.cpp
@@ -21,7 +21,7 @@ TEST(TransactionsXChainModifyBridgeTests, BuilderSettersRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainModifyBridge"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainModifyBridge"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -90,7 +90,7 @@ TEST(TransactionsXChainModifyBridgeTests, BuilderFromStTxRoundTrip)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainModifyBridgeFromTx"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainModifyBridgeFromTx"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
@@ -157,7 +157,7 @@ TEST(TransactionsXChainModifyBridgeTests, WrapperThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongType"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongType"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -171,7 +171,7 @@ TEST(TransactionsXChainModifyBridgeTests, BuilderThrowsOnWrongTxType)
 {
     // Build a valid transaction of a different type
     auto const [pk, sk] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testWrongTypeBuilder"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testWrongTypeBuilder"));
     auto const account = calcAccountID(pk);
 
     AccountSetBuilder wrongBuilder{account, 1, canonical_AMOUNT()};
@@ -185,7 +185,7 @@ TEST(TransactionsXChainModifyBridgeTests, OptionalFieldsReturnNullopt)
 {
     // Generate a deterministic keypair for signing
     auto const [publicKey, secretKey] =
-        generateKeyPair(KeyType::secp256k1, generateSeed("testXChainModifyBridgeNullopt"));
+        generateKeyPair(KeyType::Secp256k1, generateSeed("testXChainModifyBridgeNullopt"));
 
     // Common transaction fields
     auto const accountValue = calcAccountID(publicKey);
diff --git a/src/tests/libxrpl/tx/AccountSet.cpp b/src/tests/libxrpl/tx/AccountSet.cpp
index 3dbe7a4903..4187ec1115 100644
--- a/src/tests/libxrpl/tx/AccountSet.cpp
+++ b/src/tests/libxrpl/tx/AccountSet.cpp
@@ -68,7 +68,7 @@ TEST(AccountSet, MostFlags)
 
     // Give alice a regular key so she can legally set and clear
     // her asfDisableMaster flag.
-    Account const aliceRegularKey{"aliceRegularKey", KeyType::secp256k1};
+    Account const aliceRegularKey{"aliceRegularKey", KeyType::Secp256k1};
 
     env.createAccount(aliceRegularKey, XRP(10000));
     env.close();
@@ -81,7 +81,7 @@ TEST(AccountSet, MostFlags)
 
     auto testFlags = [&alice, &aliceRegularKey, &env](
                          std::initializer_list<std::uint32_t> goodFlags) {
-        std::uint32_t const orig_flags = env.getAccountRoot(alice).getFlags();
+        std::uint32_t const origFlags = env.getAccountRoot(alice).getFlags();
         for (std::uint32_t flag{1u}; flag < std::numeric_limits<std::uint32_t>::digits; ++flag)
         {
             if (flag == asfNoFreeze)
@@ -139,18 +139,18 @@ TEST(AccountSet, MostFlags)
 
                 EXPECT_FALSE(env.getAccountRoot(alice).isFlag(asfToLsf(flag)));
 
-                std::uint32_t const now_flags = env.getAccountRoot(alice).getFlags();
-                EXPECT_EQ(now_flags, orig_flags);
+                std::uint32_t const nowFlags = env.getAccountRoot(alice).getFlags();
+                EXPECT_EQ(nowFlags, origFlags);
             }
             else
             {
                 // Bad flag
-                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), orig_flags);
+                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), origFlags);
                 EXPECT_EQ(
                     env.submit(transactions::AccountSetBuilder{alice}.setSetFlag(flag), alice).ter,
                     tesSUCCESS);
                 env.close();
-                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), orig_flags);
+                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), origFlags);
 
                 EXPECT_EQ(
                     env.submit(
@@ -159,7 +159,7 @@ TEST(AccountSet, MostFlags)
                         .ter,
                     tesSUCCESS);
                 env.close();
-                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), orig_flags);
+                EXPECT_EQ(env.getAccountRoot(alice).getFlags(), origFlags);
             }
         }
     };
@@ -181,7 +181,7 @@ TEST(AccountSet, SetAndResetAccountTxnID)
 
     env.createAccount(alice, XRP(10000));
 
-    std::uint32_t const orig_flags = env.getAccountRoot(alice).getFlags();
+    std::uint32_t const origFlags = env.getAccountRoot(alice).getFlags();
 
     // asfAccountTxnID is special and not actually set as a flag,
     // so we check the field presence instead
@@ -201,8 +201,8 @@ TEST(AccountSet, SetAndResetAccountTxnID)
 
     EXPECT_FALSE(env.getAccountRoot(alice).hasAccountTxnID());
 
-    std::uint32_t const now_flags = env.getAccountRoot(alice).getFlags();
-    EXPECT_EQ(now_flags, orig_flags);
+    std::uint32_t const nowFlags = env.getAccountRoot(alice).getFlags();
+    EXPECT_EQ(nowFlags, origFlags);
 }
 
 TEST(AccountSet, SetNoFreeze)
@@ -325,7 +325,7 @@ TEST(AccountSet, MessageKey)
     env.close();
 
     // Generate a random ed25519 key pair for the message key
-    auto const rkp = randomKeyPair(KeyType::ed25519);
+    auto const rkp = randomKeyPair(KeyType::Ed25519);
 
     // Set the message key
     EXPECT_EQ(
@@ -382,7 +382,8 @@ TEST(AccountSet, WalletID)
 
     // Clear the wallet locator by setting to zero
     EXPECT_EQ(
-        env.submit(transactions::AccountSetBuilder{alice}.setWalletLocator(beast::zero), alice).ter,
+        env.submit(transactions::AccountSetBuilder{alice}.setWalletLocator(beast::kZERO), alice)
+            .ter,
         tesSUCCESS);
     env.close();
 
@@ -413,7 +414,7 @@ TEST(AccountSet, EmailHash)
 
     // Clear the email hash by setting to zero
     EXPECT_EQ(
-        env.submit(transactions::AccountSetBuilder{alice}.setEmailHash(beast::zero), alice).ter,
+        env.submit(transactions::AccountSetBuilder{alice}.setEmailHash(beast::kZERO), alice).ter,
         tesSUCCESS);
     env.close();
 
@@ -618,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::ticket(alice.id(), ticketSeq)));
+    EXPECT_TRUE(env.getClosedLedger().exists(keylet::kTICKET(alice.id(), ticketSeq)));
 
     // Try using a ticket that alice doesn't have
     EXPECT_EQ(
@@ -628,7 +629,7 @@ TEST(AccountSet, Ticket)
     env.close();
 
     // Verify ticket still exists
-    EXPECT_TRUE(env.getClosedLedger().exists(keylet::ticket(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();
@@ -641,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::ticket(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);
@@ -681,7 +682,7 @@ TEST(AccountSet, Gateway)
     Account const alice("alice");
     Account const bob("bob");
     Account const gw("gateway");
-    IOU const USD("USD", gw);
+    IOU const usd("USD", gw);
 
     // Test gateway with a variety of allowed transfer rates
     for (double transferRate = 1.0; transferRate <= 2.0; transferRate += 0.03125)
@@ -695,11 +696,11 @@ TEST(AccountSet, Gateway)
 
         // Set up trust lines: alice and bob trust gw for USD
         EXPECT_EQ(
-            env.submit(transactions::TrustSetBuilder{alice}.setLimitAmount(USD.amount(10)), alice)
+            env.submit(transactions::TrustSetBuilder{alice}.setLimitAmount(usd.amount(10)), alice)
                 .ter,
             tesSUCCESS);
         EXPECT_EQ(
-            env.submit(transactions::TrustSetBuilder{bob}.setLimitAmount(USD.amount(10)), bob).ter,
+            env.submit(transactions::TrustSetBuilder{bob}.setLimitAmount(usd.amount(10)), bob).ter,
             tesSUCCESS);
         env.close();
 
@@ -714,29 +715,29 @@ TEST(AccountSet, Gateway)
         env.close();
 
         // Calculate the amount with transfer rate applied
-        auto const amount = USD.amount(1);
+        auto const amount = usd.amount(1);
         Rate const rate(static_cast<std::uint32_t>(transferRate * QUALITY_ONE));
         auto const amountWithRate = multiply(amount, rate);
 
         // Gateway pays alice 10 USD
         EXPECT_EQ(
-            env.submit(transactions::PaymentBuilder{gw, alice, USD.amount(10)}, gw).ter,
+            env.submit(transactions::PaymentBuilder{gw, alice, usd.amount(10)}, gw).ter,
             tesSUCCESS);
         env.close();
 
         // Alice pays bob 1 USD (with sendmax to cover transfer fee)
         EXPECT_EQ(
             env.submit(
-                   transactions::PaymentBuilder{alice, bob, USD.amount(1)}.setSendMax(
-                       USD.amount(10)),
+                   transactions::PaymentBuilder{alice, bob, usd.amount(1)}.setSendMax(
+                       usd.amount(10)),
                    alice)
                 .ter,
             tesSUCCESS);
         env.close();
 
         // Check balances
-        EXPECT_EQ(env.getBalance(alice.id(), USD), USD.amount(10) - amountWithRate);
-        EXPECT_EQ(env.getBalance(bob.id(), USD), USD.amount(1));
+        EXPECT_EQ(env.getBalance(alice.id(), usd), usd.amount(10) - amountWithRate);
+        EXPECT_EQ(env.getBalance(bob.id(), usd), usd.amount(1));
     }
 
     // Test out-of-bounds legacy transfer rates (4.0 and 4.294967295)
@@ -751,11 +752,11 @@ TEST(AccountSet, Gateway)
 
         // Set up trust lines
         EXPECT_EQ(
-            env.submit(transactions::TrustSetBuilder{alice}.setLimitAmount(USD.amount(10)), alice)
+            env.submit(transactions::TrustSetBuilder{alice}.setLimitAmount(usd.amount(10)), alice)
                 .ter,
             tesSUCCESS);
         EXPECT_EQ(
-            env.submit(transactions::TrustSetBuilder{bob}.setLimitAmount(USD.amount(10)), bob).ter,
+            env.submit(transactions::TrustSetBuilder{bob}.setLimitAmount(usd.amount(10)), bob).ter,
             tesSUCCESS);
         env.close();
 
@@ -779,25 +780,25 @@ TEST(AccountSet, Gateway)
         view.rawReplace(sleCopy);
 
         // Calculate the amount with the legacy transfer rate
-        auto const amount = USD.amount(1);
+        auto const amount = usd.amount(1);
         auto const amountWithRate = multiply(amount, Rate(transferRate));
 
         // Gateway pays alice 10 USD
         EXPECT_EQ(
-            env.submit(transactions::PaymentBuilder{gw, alice, USD.amount(10)}, gw).ter,
+            env.submit(transactions::PaymentBuilder{gw, alice, usd.amount(10)}, gw).ter,
             tesSUCCESS);
 
         // Alice pays bob 1 USD
         EXPECT_EQ(
             env.submit(
-                   transactions::PaymentBuilder{alice, bob, amount}.setSendMax(USD.amount(10)),
+                   transactions::PaymentBuilder{alice, bob, amount}.setSendMax(usd.amount(10)),
                    alice)
                 .ter,
             tesSUCCESS);
 
         // Check balances
-        EXPECT_EQ(env.getBalance(alice.id(), USD), USD.amount(10) - amountWithRate);
-        EXPECT_EQ(env.getBalance(bob.id(), USD), amount);
+        EXPECT_EQ(env.getBalance(alice.id(), usd), usd.amount(10) - amountWithRate);
+        EXPECT_EQ(env.getBalance(bob.id(), usd), amount);
     }
 }
 
diff --git a/src/xrpld/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h
index fbdc6c2397..48df7368d9 100644
--- a/src/xrpld/app/consensus/RCLCensorshipDetector.h
+++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h
@@ -18,7 +18,7 @@ public:
         TxID txid;
         Sequence seq;
 
-        TxIDSeq(TxID const& txid_, Sequence const& seq_) : txid(txid_), seq(seq_)
+        TxIDSeq(TxID const& txid, Sequence const& seq) : txid(txid), seq(seq)
         {
         }
     };
@@ -64,7 +64,7 @@ public:
         // And we also want to preserve the Sequence of entries that we proposed
         // in the last round and want to propose again.
         std::sort(proposed.begin(), proposed.end());
-        generalized_set_intersection(
+        generalizedSetIntersection(
             proposed.begin(),
             proposed.end(),
             tracker_.cbegin(),
@@ -98,7 +98,7 @@ public:
         // We want to remove all tracking entries for transactions that were
         // accepted as well as those which match the predicate.
 
-        auto i = remove_if_intersect_or_match(
+        auto i = removeIfIntersectOrMatch(
             tracker_.begin(),
             tracker_.end(),
             accepted.begin(),
diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp
index 262f217680..b5a643568b 100644
--- a/src/xrpld/app/consensus/RCLConsensus.cpp
+++ b/src/xrpld/app/consensus/RCLConsensus.cpp
@@ -123,14 +123,14 @@ RCLConsensus::Adaptor::Adaptor(
     , inboundTransactions_{inboundTransactions}
     , j_(journal)
     , validatorKeys_(validatorKeys)
-    , valCookie_(1 + rand_int(crypto_prng(), std::numeric_limits<std::uint64_t>::max() - 1))
+    , valCookie_(1 + randInt(cryptoPrng(), std::numeric_limits<std::uint64_t>::max() - 1))
     , nUnlVote_(validatorKeys_.nodeID, j_)
 {
     XRPL_ASSERT(valCookie_, "xrpl::RCLConsensus::Adaptor::Adaptor : nonzero cookie");
 
     JLOG(j_.info()) << "Consensus engine started (cookie: " + std::to_string(valCookie_) + ")";
 
-    if (validatorKeys_.nodeID != beast::zero && validatorKeys_.keys)
+    if (validatorKeys_.nodeID != beast::kZERO && validatorKeys_.keys)
     {
         JLOG(j_.info()) << "Validator identity: "
                         << toBase58(TokenType::NodePublic, validatorKeys_.keys->masterPublicKey);
@@ -159,7 +159,7 @@ RCLConsensus::Adaptor::acquireLedger(LedgerHash const& hash)
             // Tell the ledger acquire system that we need the consensus ledger
             acquiringLedger_ = hash;
 
-            app_.getJobQueue().addJob(jtADVANCE, "GetConsL1", [id = hash, &app = app_, this]() {
+            app_.getJobQueue().addJob(JtAdvance, "GetConsL1", [id = hash, &app = app_, this]() {
                 JLOG(j_.debug()) << "JOB advanceLedger getConsensusLedger1 started";
                 app.getInboundLedgers().acquireAsync(id, 0, InboundLedger::Reason::CONSENSUS);
             });
@@ -209,13 +209,13 @@ RCLConsensus::Adaptor::share(RCLCxTx const& tx)
     if (app_.getHashRouter().shouldRelay(tx.id()))
     {
         JLOG(j_.debug()) << "Relaying disputed tx " << tx.id();
-        auto const slice = tx.tx_->slice();
+        auto const slice = tx.tx->slice();
         protocol::TMTransaction msg;
         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 skip{};
-        app_.getOverlay().relay(tx.id(), msg, skip);
+        static std::set<Peer::id_t> const kSKIP{};
+        app_.getOverlay().relay(tx.id(), msg, kSKIP);
     }
     else
     {
@@ -267,7 +267,7 @@ RCLConsensus::Adaptor::propose(RCLCxPeerPos::Proposal const& proposal)
 void
 RCLConsensus::Adaptor::share(RCLTxSet const& txns)
 {
-    inboundTransactions_.giveSet(txns.id(), txns.map_, false);
+    inboundTransactions_.giveSet(txns.id(), txns.map, false);
 }
 
 std::optional<RCLTxSet>
@@ -296,7 +296,7 @@ std::size_t
 RCLConsensus::Adaptor::proposersFinished(RCLCxLedger const& ledger, LedgerHash const& h) const
 {
     RCLValidations& vals = app_.getValidations();
-    return vals.getNodesAfter(RCLValidatedLedger(ledger.ledger_, vals.adaptor().journal()), h);
+    return vals.getNodesAfter(RCLValidatedLedger(ledger.ledger, vals.adaptor().journal()), h);
 }
 
 uint256
@@ -307,15 +307,15 @@ RCLConsensus::Adaptor::getPrevLedger(
 {
     RCLValidations& vals = app_.getValidations();
     uint256 netLgr = vals.getPreferred(
-        RCLValidatedLedger{ledger.ledger_, vals.adaptor().journal()},
+        RCLValidatedLedger{ledger.ledger, vals.adaptor().journal()},
         ledgerMaster_.getValidLedgerIndex());
 
     if (netLgr != ledgerID)
     {
-        if (mode != ConsensusMode::wrongLedger)
+        if (mode != ConsensusMode::WrongLedger)
             app_.getOPs().consensusViewChange();
 
-        JLOG(j_.debug()) << Json::Compact(app_.getValidations().getJsonTrie());
+        JLOG(j_.debug()) << json::Compact(app_.getValidations().getJsonTrie());
     }
 
     return netLgr;
@@ -327,12 +327,12 @@ RCLConsensus::Adaptor::onClose(
     NetClock::time_point const& closeTime,
     ConsensusMode mode) -> Result
 {
-    bool const wrongLCL = mode == ConsensusMode::wrongLedger;
-    bool const proposing = mode == ConsensusMode::proposing;
+    bool const wrongLCL = mode == ConsensusMode::WrongLedger;
+    bool const proposing = mode == ConsensusMode::Proposing;
 
     notify(protocol::neCLOSING_LEDGER, ledger, !wrongLCL);
 
-    auto const& prevLedger = ledger.ledger_;
+    auto const& prevLedger = ledger.ledger;
 
     ledgerMaster_.applyHeldTransactions();
     // Tell the ledger master not to acquire the ledger we're probably building
@@ -350,8 +350,8 @@ RCLConsensus::Adaptor::onClose(
         Serializer s(2048);
         tx.first->add(s);
         initialSet->addItem(
-            SHAMapNodeType::tnTRANSACTION_NM,
-            make_shamapitem(tx.first->getTransactionID(), s.slice()));
+            SHAMapNodeType::TnTransactionNm,
+            makeShamapitem(tx.first->getTransactionID(), s.slice()));
     }
 
     // Add pseudo-transactions to the set
@@ -400,13 +400,13 @@ RCLConsensus::Adaptor::onClose(
     }
 
     // Needed because of the move below.
-    auto const setHash = initialSet->getHash().as_uint256();
+    auto const setHash = initialSet->getHash().asUint256();
 
     return Result{
         std::move(initialSet),
         RCLCxPeerPos::Proposal{
             initialLedger->header().parentHash,
-            RCLCxPeerPos::Proposal::seqJoin,
+            RCLCxPeerPos::Proposal::kSEQ_JOIN,
             setHash,
             closeTime,
             app_.getTimeKeeper().closeTime(),
@@ -420,7 +420,7 @@ RCLConsensus::Adaptor::onForceAccept(
     NetClock::duration const& closeResolution,
     ConsensusCloseTimes const& rawCloseTimes,
     ConsensusMode const& mode,
-    Json::Value&& consensusJson)
+    json::Value&& consensusJson)
 {
     doAccept(result, prevLedger, closeResolution, rawCloseTimes, mode, std::move(consensusJson));
 }
@@ -432,11 +432,11 @@ RCLConsensus::Adaptor::onAccept(
     NetClock::duration const& closeResolution,
     ConsensusCloseTimes const& rawCloseTimes,
     ConsensusMode const& mode,
-    Json::Value&& consensusJson,
+    json::Value&& consensusJson,
     bool const validating)
 {
     app_.getJobQueue().addJob(
-        jtACCEPT,
+        JtAccept,
         "AcceptLedger",
         // NOLINTNEXTLINE(cppcoreguidelines-misleading-capture-default-by-value)
         [=, this, cj = std::move(consensusJson)]() mutable {
@@ -458,15 +458,15 @@ RCLConsensus::Adaptor::doAccept(
     NetClock::duration closeResolution,
     ConsensusCloseTimes const& rawCloseTimes,
     ConsensusMode const& mode,
-    Json::Value&& consensusJson)
+    json::Value&& consensusJson)
 {
     prevProposers_ = result.proposers;
     prevRoundTime_ = result.roundTime.read();
 
     bool closeTimeCorrect = false;
 
-    bool const proposing = mode == ConsensusMode::proposing;
-    bool const haveCorrectLCL = mode != ConsensusMode::wrongLedger;
+    bool const proposing = mode == ConsensusMode::Proposing;
+    bool const haveCorrectLCL = mode != ConsensusMode::WrongLedger;
     bool const consensusFail = result.state == ConsensusState::MovedOn;
 
     auto consensusCloseTime = result.position.closeTime();
@@ -499,11 +499,11 @@ RCLConsensus::Adaptor::doAccept(
     // we use the hash of the set.
     //
     // FIXME: Use a std::vector and a custom sorter instead of CanonicalTXSet?
-    CanonicalTXSet retriableTxs{result.txns.map_->getHash().as_uint256()};
+    CanonicalTXSet retriableTxs{result.txns.map->getHash().asUint256()};
 
     JLOG(j_.debug()) << "Building canonical tx set: " << retriableTxs.key();
 
-    for (auto const& item : *result.txns.map_)
+    for (auto const& item : *result.txns.map)
     {
         try
         {
@@ -539,7 +539,7 @@ RCLConsensus::Adaptor::doAccept(
     {
         std::vector<TxID> accepted;
 
-        result.txns.map_->visitLeaves(
+        result.txns.map->visitLeaves(
             [&accepted](boost::intrusive_ptr<SHAMapItem const> const& item) {
                 accepted.push_back(item->key());
             });
@@ -557,7 +557,7 @@ RCLConsensus::Adaptor::doAccept(
 
                 auto const wait = curr - seq;
 
-                if (wait && (wait % censorshipWarnInternal == 0))
+                if (wait && (wait % kCENSORSHIP_WARN_INTERNAL == 0))
                 {
                     std::ostringstream ss;
                     ss << "Potential Censorship: Eligible tx " << id
@@ -572,7 +572,7 @@ RCLConsensus::Adaptor::doAccept(
     }
 
     if (validating_)
-        validating_ = ledgerMaster_.isCompatible(*built.ledger_, j_.warn(), "Not validating");
+        validating_ = ledgerMaster_.isCompatible(*built.ledger, j_.warn(), "Not validating");
 
     if (validating_ && !consensusFail && app_.getValidations().canValidateSeq(built.seq()))
     {
@@ -583,7 +583,7 @@ RCLConsensus::Adaptor::doAccept(
         JLOG(j_.info()) << "CNF buildLCL " << newLCLHash;
 
     // See if we can accept a ledger as fully-validated
-    ledgerMaster_.consensusBuilt(built.ledger_, result.txns.id(), std::move(consensusJson));
+    ledgerMaster_.consensusBuilt(built.ledger, result.txns.id(), std::move(consensusJson));
 
     //-------------------------------------------------------------------------
     {
@@ -610,7 +610,7 @@ RCLConsensus::Adaptor::doAccept(
                     JLOG(j_.debug()) << "Test applying disputed transaction that did"
                                      << " not get in " << dispute.tx().id();
 
-                    SerialIter sit(dispute.tx().tx_->slice());
+                    SerialIter sit(dispute.tx().tx->slice());
                     auto txn = std::make_shared<STTx const>(sit);
 
                     // Disputed pseudo-transactions that were not accepted
@@ -649,11 +649,11 @@ RCLConsensus::Adaptor::doAccept(
         app_.getOpenLedger().accept(
             app_,
             *rules,
-            built.ledger_,
+            built.ledger,
             localTxs_.getTxSet(),
             anyDisputes,
             retriableTxs,
-            tapNONE,
+            TapNone,
             "consensus",
             [&](OpenView& view, beast::Journal j) {
                 // Stuff the ledger with transactions from the queue.
@@ -667,7 +667,7 @@ RCLConsensus::Adaptor::doAccept(
 
     //-------------------------------------------------------------------------
     {
-        ledgerMaster_.switchLCL(built.ledger_);
+        ledgerMaster_.switchLCL(built.ledger);
 
         // Do these need to exist?
         XRPL_ASSERT(
@@ -682,7 +682,7 @@ RCLConsensus::Adaptor::doAccept(
     // we entered the round with the network,
     // see how close our close time is to other node's
     //  close time reports, and update our clock.
-    if ((mode == ConsensusMode::proposing || mode == ConsensusMode::observing) && !consensusFail)
+    if ((mode == ConsensusMode::Proposing || mode == ConsensusMode::Observing) && !consensusFail)
     {
         auto closeTime = rawCloseTimes.self;
 
@@ -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())>::bytes);
-    s.set_ledgerhash(ledger.id().begin(), std::decay_t<decltype(ledger.id())>::bytes);
+        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))
@@ -749,7 +749,7 @@ RCLConsensus::Adaptor::notify(
     }
     s.set_firstseq(uMin);
     s.set_lastseq(uMax);
-    app_.getOverlay().foreach(send_always(std::make_shared<Message>(s, protocol::mtSTATUS_CHANGE)));
+    app_.getOverlay().foreach(SendAlways(std::make_shared<Message>(s, protocol::mtSTATUS_CHANGE)));
     JLOG(j_.trace()) << "send status change to peer";
 }
 
@@ -769,10 +769,10 @@ RCLConsensus::Adaptor::buildLCL(
             XRPL_ASSERT(
                 replayData->parent()->header().hash == previousLedger.id(),
                 "xrpl::RCLConsensus::Adaptor::buildLCL : parent hash match");
-            return buildLedger(*replayData, tapNONE, app_, j_);
+            return buildLedger(*replayData, TapNone, app_, j_);
         }
         return buildLedger(
-            previousLedger.ledger_,
+            previousLedger.ledger,
             closeTime,
             closeTimeCorrect,
             closeResolution,
@@ -831,7 +831,7 @@ RCLConsensus::Adaptor::validate(RCLCxLedger const& ledger, RCLTxSet const& txns,
             v.setFieldU32(sfLedgerSequence, ledger.seq());
 
             if (proposing)
-                v.setFlag(vfFullValidation);
+                v.setFlag(kVF_FULL_VALIDATION);
 
             // 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
@@ -842,7 +842,7 @@ RCLConsensus::Adaptor::validate(RCLCxLedger const& ledger, RCLTxSet const& txns,
             v.setFieldU64(sfCookie, valCookie_);
 
             // Report our server version every flag ledger:
-            if (ledger.ledger_->isVotingLedger())
+            if (ledger.ledger->isVotingLedger())
                 v.setFieldU64(sfServerVersion, BuildInfo::getEncodedVersion());
 
             // Report our load
@@ -855,16 +855,16 @@ RCLConsensus::Adaptor::validate(RCLCxLedger const& ledger, RCLTxSet const& txns,
 
             // If the next ledger is a flag ledger, suggest fee changes and
             // new features:
-            if (ledger.ledger_->isVotingLedger())
+            if (ledger.ledger->isVotingLedger())
             {
                 // Fees:
-                feeVote_->doValidation(ledger.ledger_->fees(), ledger.ledger_->rules(), v);
+                feeVote_->doValidation(ledger.ledger->fees(), ledger.ledger->rules(), v);
 
                 // Amendments
                 // FIXME: pass `v` and have the function insert the array
                 // directly?
                 auto const amendments =
-                    app_.getAmendmentTable().doValidation(getEnabledAmendments(*ledger.ledger_));
+                    app_.getAmendmentTable().doValidation(getEnabledAmendments(*ledger.ledger));
 
                 if (!amendments.empty())
                     v.setFieldV256(sfAmendments, STVector256(sfAmendments, amendments));
@@ -895,17 +895,17 @@ RCLConsensus::Adaptor::onModeChange(ConsensusMode before, ConsensusMode after)
 
     // If we were proposing but aren't any longer, we need to reset the
     // censorship tracking to avoid bogus warnings.
-    if ((before == ConsensusMode::proposing || before == ConsensusMode::observing) &&
+    if ((before == ConsensusMode::Proposing || before == ConsensusMode::Observing) &&
         before != after)
         censorshipDetector_.reset();
 
     mode_ = after;
 }
 
-Json::Value
+json::Value
 RCLConsensus::getJson(bool full) const
 {
-    Json::Value ret;
+    json::Value ret;
     {
         std::scoped_lock const _{mutex_};
         ret = consensus_.getJson(full);
@@ -931,7 +931,7 @@ RCLConsensus::timerEntry(
         ss << "During consensus timerEntry: " << mn.what();
         JLOG(j_.error()) << ss.str();
         CLOG(clog) << ss.str();
-        Rethrow();
+        rethrow();
     }
 }
 
@@ -947,7 +947,7 @@ RCLConsensus::gotTxSet(NetClock::time_point const& now, RCLTxSet const& txSet)
     {
         // This should never happen
         JLOG(j_.error()) << "During consensus gotTxSet: " << mn.what();
-        Rethrow();
+        rethrow();
     }
 }
 
@@ -1090,7 +1090,7 @@ RclConsensusLogger::~RclConsensusLogger()
     std::stringstream outSs;
     outSs << header_ << "duration " << (duration.count() / 1000) << '.' << std::setw(3)
           << std::setfill('0') << (duration.count() % 1000) << "s. " << ss_->str();
-    j_.sink().writeAlways(beast::severities::kInfo, outSs.str());
+    j_.sink().writeAlways(beast::severities::KInfo, outSs.str());
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h
index b8695fd46e..62a83d107e 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 censorshipWarnInternal = 15;
+    constexpr static unsigned int kCENSORSHIP_WARN_INTERNAL = 15;
 
     // Implements the Adaptor template interface required by Consensus.
     class Adaptor
@@ -63,7 +63,7 @@ class RCLConsensus
         std::atomic<bool> validating_{false};
         std::atomic<std::size_t> prevProposers_{0};
         std::atomic<std::chrono::milliseconds> prevRoundTime_{std::chrono::milliseconds{0}};
-        std::atomic<ConsensusMode> mode_{ConsensusMode::observing};
+        std::atomic<ConsensusMode> mode_{ConsensusMode::Observing};
 
         RCLCensorshipDetector<TxID, LedgerIndex> censorshipDetector_;
         NegativeUNLVote nUnlVote_;
@@ -300,7 +300,7 @@ class RCLConsensus
             NetClock::duration const& closeResolution,
             ConsensusCloseTimes const& rawCloseTimes,
             ConsensusMode const& mode,
-            Json::Value&& consensusJson,
+            json::Value&& consensusJson,
             bool const validating);
 
         /** Process the accepted ledger that was a result of simulation/force
@@ -315,7 +315,7 @@ class RCLConsensus
             NetClock::duration const& closeResolution,
             ConsensusCloseTimes const& rawCloseTimes,
             ConsensusMode const& mode,
-            Json::Value&& consensusJson);
+            json::Value&& consensusJson);
 
         /** Notify peers of a consensus state change
 
@@ -337,7 +337,7 @@ class RCLConsensus
             NetClock::duration closeResolution,
             ConsensusCloseTimes const& rawCloseTimes,
             ConsensusMode const& mode,
-            Json::Value&& consensusJson);
+            json::Value&& consensusJson);
 
         /** Build the new last closed ledger.
 
@@ -443,7 +443,7 @@ public:
     }
 
     //! @see Consensus::getJson
-    Json::Value
+    json::Value
     getJson(bool full) const;
 
     /** Adjust the set of trusted validators and kick-off the next round of
diff --git a/src/xrpld/app/consensus/RCLCxLedger.h b/src/xrpld/app/consensus/RCLCxLedger.h
index 3c5175a04d..3d6ed4912b 100644
--- a/src/xrpld/app/consensus/RCLCxLedger.h
+++ b/src/xrpld/app/consensus/RCLCxLedger.h
@@ -32,7 +32,7 @@ public:
 
         @param l The ledger to wrap.
     */
-    RCLCxLedger(std::shared_ptr<Ledger const> const& l) : ledger_{l}
+    RCLCxLedger(std::shared_ptr<Ledger const> const& l) : ledger{l}
     {
     }
 
@@ -40,56 +40,56 @@ public:
     [[nodiscard]] Seq const&
     seq() const
     {
-        return ledger_->header().seq;
+        return ledger->header().seq;
     }
 
     //! Unique identifier (hash) of this ledger.
     [[nodiscard]] ID const&
     id() const
     {
-        return ledger_->header().hash;
+        return ledger->header().hash;
     }
 
     //! Unique identifier (hash) of this ledger's parent.
     [[nodiscard]] ID const&
     parentID() const
     {
-        return ledger_->header().parentHash;
+        return ledger->header().parentHash;
     }
 
     //! Resolution used when calculating this ledger's close time.
     [[nodiscard]] NetClock::duration
     closeTimeResolution() const
     {
-        return ledger_->header().closeTimeResolution;
+        return ledger->header().closeTimeResolution;
     }
 
     //! Whether consensus process agreed on close time of the ledger.
     [[nodiscard]] bool
     closeAgree() const
     {
-        return xrpl::getCloseAgree(ledger_->header());
+        return xrpl::getCloseAgree(ledger->header());
     }
 
     //! The close time of this ledger
     [[nodiscard]] NetClock::time_point
     closeTime() const
     {
-        return ledger_->header().closeTime;
+        return ledger->header().closeTime;
     }
 
     //! The close time of this ledger's parent.
     [[nodiscard]] NetClock::time_point
     parentCloseTime() const
     {
-        return ledger_->header().parentCloseTime;
+        return ledger->header().parentCloseTime;
     }
 
     //! JSON representation of this ledger.
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson() const
     {
-        return xrpl::getJson({*ledger_, {}});
+        return xrpl::getJson({*ledger, {}});
     }
 
     /** The ledger instance.
@@ -97,6 +97,6 @@ public:
         TODO: Make this shared_ptr<ReadView const> .. requires ability to create
         a new ledger from a readView?
     */
-    std::shared_ptr<Ledger const> ledger_;
+    std::shared_ptr<Ledger const> ledger;
 };
 }  // namespace xrpl
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.cpp b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
index 7cc2ab8b90..781582c925 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.cpp
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.cpp
@@ -38,7 +38,7 @@ RCLCxPeerPos::checkSign() const
     return verifyDigest(publicKey(), proposal_.signingHash(), signature(), false);
 }
 
-Json::Value
+json::Value
 RCLCxPeerPos::getJson() const
 {
     auto ret = proposal().getJson();
diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.h b/src/xrpld/app/consensus/RCLCxPeerPos.h
index f5d3f0e8f0..4618bdb746 100644
--- a/src/xrpld/app/consensus/RCLCxPeerPos.h
+++ b/src/xrpld/app/consensus/RCLCxPeerPos.h
@@ -74,7 +74,7 @@ public:
     }
 
     //! JSON representation of proposal
-    Json::Value
+    json::Value
     getJson() const;
 
     std::string
@@ -91,10 +91,10 @@ private:
 
     template <class Hasher>
     void
-    hash_append(Hasher& h) const
+    hash_append(Hasher& h) const  // NOLINT(readability-identifier-naming)
     {
         using beast::hash_append;
-        hash_append(h, HashPrefix::proposal);
+        hash_append(h, HashPrefix::Proposal);
         hash_append(h, proposal().proposeSeq());
         hash_append(h, proposal().closeTime());
         hash_append(h, proposal().prevLedger());
diff --git a/src/xrpld/app/consensus/RCLCxTx.h b/src/xrpld/app/consensus/RCLCxTx.h
index dc99ea66e3..634b8ca915 100644
--- a/src/xrpld/app/consensus/RCLCxTx.h
+++ b/src/xrpld/app/consensus/RCLCxTx.h
@@ -19,7 +19,7 @@ public:
 
         @param txn The transaction to wrap
     */
-    RCLCxTx(boost::intrusive_ptr<SHAMapItem const> txn) : tx_(std::move(txn))
+    RCLCxTx(boost::intrusive_ptr<SHAMapItem const> txn) : tx(std::move(txn))
     {
     }
 
@@ -27,11 +27,11 @@ public:
     [[nodiscard]] ID const&
     id() const
     {
-        return tx_->key();
+        return tx->key();
     }
 
     //! The SHAMapItem that represents the transaction.
-    boost::intrusive_ptr<SHAMapItem const> tx_;
+    boost::intrusive_ptr<SHAMapItem const> tx;
 };
 
 /** Represents a set of transactions in RCLConsensus.
@@ -55,7 +55,7 @@ public:
         std::shared_ptr<SHAMap> map_;
 
     public:
-        MutableTxSet(RCLTxSet const& src) : map_{src.map_->snapShot(true)}
+        MutableTxSet(RCLTxSet const& src) : map_{src.map->snapShot(true)}
         {
         }
 
@@ -67,7 +67,7 @@ public:
         bool
         insert(Tx const& t)
         {
-            return map_->addItem(SHAMapNodeType::tnTRANSACTION_NM, t.tx_);
+            return map_->addItem(SHAMapNodeType::TnTransactionNm, t.tx);
         }
 
         /** Remove a transaction from the set.
@@ -86,16 +86,16 @@ public:
 
         @param m SHAMap to wrap
     */
-    RCLTxSet(std::shared_ptr<SHAMap> m) : map_{std::move(m)}
+    RCLTxSet(std::shared_ptr<SHAMap> m) : map{std::move(m)}
     {
-        XRPL_ASSERT(map_, "xrpl::RCLTxSet::MutableTxSet::RCLTxSet : non-null input");
+        XRPL_ASSERT(map, "xrpl::RCLTxSet::MutableTxSet::RCLTxSet : non-null input");
     }
 
     /** Constructor from a previously created MutableTxSet
 
         @param m MutableTxSet that will become fixed
      */
-    RCLTxSet(MutableTxSet const& m) : map_{m.map_->snapShot(false)}
+    RCLTxSet(MutableTxSet const& m) : map{m.map_->snapShot(false)}
     {
     }
 
@@ -107,7 +107,7 @@ public:
     [[nodiscard]] bool
     exists(Tx::ID const& entry) const
     {
-        return map_->hasItem(entry);
+        return map->hasItem(entry);
     }
 
     /** Lookup a transaction.
@@ -124,14 +124,14 @@ public:
     [[nodiscard]] boost::intrusive_ptr<SHAMapItem const> const&
     find(Tx::ID const& entry) const
     {
-        return map_->peekItem(entry);
+        return map->peekItem(entry);
     }
 
     //! The unique ID/hash of the transaction set
     [[nodiscard]] ID
     id() const
     {
-        return map_->getHash().as_uint256();
+        return map->getHash().asUint256();
     }
 
     /** Find transactions not in common between this and another transaction
@@ -148,8 +148,8 @@ public:
         SHAMap::Delta delta;
 
         // Bound the work we do in case of a malicious
-        // map_ from a trusted validator
-        map_->compare(*(j.map_), delta, 65536);
+        // map from a trusted validator
+        map->compare(*(j.map), delta, 65536);
 
         std::map<uint256, bool> ret;
         for (auto const& [k, v] : delta)
@@ -164,6 +164,6 @@ public:
     }
 
     //! The SHAMap representing the transactions.
-    std::shared_ptr<SHAMap> map_;
+    std::shared_ptr<SHAMap> map;
 };
 }  // namespace xrpl
diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp
index b969774954..02ff86b23d 100644
--- a/src/xrpld/app/consensus/RCLValidations.cpp
+++ b/src/xrpld/app/consensus/RCLValidations.cpp
@@ -130,7 +130,7 @@ RCLValidationsAdaptor::acquire(LedgerHash const& hash)
 
         Application* pApp = &app_;
 
-        app_.getJobQueue().addJob(jtADVANCE, "GetConsL2", [pApp, hash, this]() {
+        app_.getJobQueue().addJob(JtAdvance, "GetConsL2", [pApp, hash, this]() {
             JLOG(j_.debug()) << "JOB advanceLedger getConsensusLedger2 started";
             pApp->getInboundLedgers().acquireAsync(hash, 0, InboundLedger::Reason::CONSENSUS);
         });
@@ -173,11 +173,11 @@ handleNewValidation(
     // masterKey is seated only if validator is trusted or listed
     auto const outcome = validations.add(calcNodeID(masterKey.value_or(signingKey)), val);
 
-    if (outcome == ValStatus::current)
+    if (outcome == ValStatus::Current)
     {
         if (val->isTrusted())
         {
-            if (bypassAccept == BypassAccept::yes)
+            if (bypassAccept == BypassAccept::Yes)
             {
                 XRPL_ASSERT(j, "xrpl::handleNewValidation : journal is available");
                 if (j.has_value())
@@ -215,14 +215,14 @@ handleNewValidation(
             return ret;
         }();
 
-        if (outcome == ValStatus::conflicting)
+        if (outcome == ValStatus::Conflicting)
         {
             ls << "Byzantine Behavior Detector: " << (val->isTrusted() ? "trusted " : "untrusted ")
                << id << ": Conflicting validation for " << seq << "!\n["
                << val->getSerializer().slice() << "]";
         }
 
-        if (outcome == ValStatus::multiple)
+        if (outcome == ValStatus::Multiple)
         {
             ls << "Byzantine Behavior Detector: " << (val->isTrusted() ? "trusted " : "untrusted ")
                << id << ": Multiple validations for " << seq << "/" << hash << "!\n["
diff --git a/src/xrpld/app/consensus/RCLValidations.h b/src/xrpld/app/consensus/RCLValidations.h
index cddcedc224..16f6e15d4d 100644
--- a/src/xrpld/app/consensus/RCLValidations.h
+++ b/src/xrpld/app/consensus/RCLValidations.h
@@ -14,7 +14,7 @@ namespace xrpl {
 
 class Application;
 
-enum class BypassAccept : bool { no = false, yes };
+enum class BypassAccept : bool { No = false, Yes };
 
 /** Wrapper over STValidation for generic Validation code
 
@@ -232,7 +232,7 @@ handleNewValidation(
     Application& app,
     std::shared_ptr<STValidation> const& val,
     std::string const& source,
-    BypassAccept const bypassAccept = BypassAccept::no,
+    BypassAccept const bypassAccept = BypassAccept::No,
     std::optional<beast::Journal> j = std::nullopt);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/AcceptedLedger.cpp b/src/xrpld/app/ledger/AcceptedLedger.cpp
index f866a5f3bc..ea594308bd 100644
--- a/src/xrpld/app/ledger/AcceptedLedger.cpp
+++ b/src/xrpld/app/ledger/AcceptedLedger.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl {
 
-AcceptedLedger::AcceptedLedger(std::shared_ptr<ReadView const> const& ledger) : mLedger(ledger)
+AcceptedLedger::AcceptedLedger(std::shared_ptr<ReadView const> const& ledger) : ledger_(ledger)
 {
     transactions_.reserve(256);
 
diff --git a/src/xrpld/app/ledger/AcceptedLedger.h b/src/xrpld/app/ledger/AcceptedLedger.h
index a024e24cb2..621bea9e0d 100644
--- a/src/xrpld/app/ledger/AcceptedLedger.h
+++ b/src/xrpld/app/ledger/AcceptedLedger.h
@@ -30,7 +30,7 @@ public:
     [[nodiscard]] std::shared_ptr<ReadView const> const&
     getLedger() const
     {
-        return mLedger;
+        return ledger_;
     }
 
     [[nodiscard]] std::size_t
@@ -52,7 +52,7 @@ public:
     }
 
 private:
-    std::shared_ptr<ReadView const> mLedger;
+    std::shared_ptr<ReadView const> ledger_;
     std::vector<std::unique_ptr<AcceptedLedgerTx>> transactions_;
 };
 
diff --git a/src/xrpld/app/ledger/AccountStateSF.cpp b/src/xrpld/app/ledger/AccountStateSF.cpp
index bca527d3d0..c12c2864ec 100644
--- a/src/xrpld/app/ledger/AccountStateSF.cpp
+++ b/src/xrpld/app/ledger/AccountStateSF.cpp
@@ -19,14 +19,13 @@ AccountStateSF::gotNode(
     Blob&& nodeData,
     SHAMapNodeType) const
 {
-    db_.store(
-        NodeObjectType::hotACCOUNT_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
+    db_.store(NodeObjectType::AccountNode, std::move(nodeData), nodeHash.asUint256(), ledgerSeq);
 }
 
 std::optional<Blob>
 AccountStateSF::getNode(SHAMapHash const& nodeHash) const
 {
-    return fp_.getFetchPack(nodeHash.as_uint256());
+    return fp_.getFetchPack(nodeHash.asUint256());
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
index d42ff0a9e0..029c16e7e4 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp
@@ -24,7 +24,7 @@
 namespace xrpl {
 
 ConsensusTransSetSF::ConsensusTransSetSF(Application& app, NodeCache& nodeCache)
-    : app_(app), m_nodeCache(nodeCache), j_(app.getJournal("TransactionAcquire"))
+    : app_(app), nodeCache_(nodeCache), j_(app.getJournal("TransactionAcquire"))
 {
 }
 
@@ -39,9 +39,9 @@ ConsensusTransSetSF::gotNode(
     if (fromFilter)
         return;
 
-    m_nodeCache.insert(nodeHash, nodeData);
+    nodeCache_.insert(nodeHash, nodeData);
 
-    if ((type == SHAMapNodeType::tnTRANSACTION_NM) && (nodeData.size() > 16))
+    if ((type == SHAMapNodeType::TnTransactionNm) && (nodeData.size() > 16))
     {
         // this is a transaction, and we didn't have it
         JLOG(j_.debug()) << "Node on our acquiring TX set is TXN we may not have";
@@ -53,12 +53,12 @@ ConsensusTransSetSF::gotNode(
             SerialIter sit(s.slice());
             auto stx = std::make_shared<STTx const>(std::ref(sit));
             XRPL_ASSERT(
-                stx->getTransactionID() == nodeHash.as_uint256(),
+                stx->getTransactionID() == nodeHash.asUint256(),
                 "xrpl::ConsensusTransSetSF::gotNode : transaction hash "
                 "match");
             auto const pap = &app_;
             app_.getJobQueue().addJob(
-                jtTRANSACTION, "TxsToTxn", [pap, stx]() { pap->getOPs().submitTransaction(stx); });
+                JtTransaction, "TxsToTxn", [pap, stx]() { pap->getOPs().submitTransaction(stx); });
         }
         catch (std::exception const& ex)
         {
@@ -72,20 +72,20 @@ std::optional<Blob>
 ConsensusTransSetSF::getNode(SHAMapHash const& nodeHash) const
 {
     Blob nodeData;
-    if (m_nodeCache.retrieve(nodeHash, nodeData))
+    if (nodeCache_.retrieve(nodeHash, nodeData))
         return nodeData;
 
-    auto txn = app_.getMasterTransaction().fetch_from_cache(nodeHash.as_uint256());
+    auto txn = app_.getMasterTransaction().fetchFromCache(nodeHash.asUint256());
 
     if (txn)
     {
         // this is a transaction, and we have it
         JLOG(j_.trace()) << "Node in our acquiring TX set is TXN we have";
         Serializer s;
-        s.add32(HashPrefix::transactionID);
+        s.add32(HashPrefix::TransactionId);
         txn->getSTransaction()->add(s);
         XRPL_ASSERT(
-            sha512Half(s.slice()) == nodeHash.as_uint256(),
+            sha512Half(s.slice()) == nodeHash.asUint256(),
             "xrpl::ConsensusTransSetSF::getNode : transaction hash match");
         nodeData = s.peekData();
         return nodeData;
diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h
index b666fbf750..f1d0e26d26 100644
--- a/src/xrpld/app/ledger/ConsensusTransSetSF.h
+++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h
@@ -33,7 +33,7 @@ public:
 
 private:
     Application& app_;
-    NodeCache& m_nodeCache;
+    NodeCache& nodeCache_;
     beast::Journal const j_;
 };
 
diff --git a/src/xrpld/app/ledger/InboundLedger.h b/src/xrpld/app/ledger/InboundLedger.h
index 4176aa0b09..5f27c0c2c4 100644
--- a/src/xrpld/app/ledger/InboundLedger.h
+++ b/src/xrpld/app/ledger/InboundLedger.h
@@ -19,7 +19,7 @@ class InboundLedger final : public TimeoutCounter,
                             public CountedObject<InboundLedger>
 {
 public:
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
     // These are the reasons we might acquire a ledger
     enum class Reason {
@@ -59,13 +59,13 @@ public:
     std::shared_ptr<Ledger const>
     getLedger() const
     {
-        return mLedger;
+        return ledger_;
     }
 
     std::uint32_t
     getSeq() const
     {
-        return mSeq;
+        return seq_;
     }
 
     bool
@@ -78,8 +78,8 @@ public:
 
     using neededHash_t = std::pair<protocol::TMGetObjectByHash::ObjectType, uint256>;
 
-    /** Return a Json::objectValue. */
-    Json::Value
+    /** Return a json::objectValue. */
+    json::Value
     getJson(int);
 
     void
@@ -88,17 +88,17 @@ public:
     void
     touch()
     {
-        mLastAction = m_clock.now();
+        lastAction_ = clock_.now();
     }
 
     clock_type::time_point
     getLastAction() const
     {
-        return mLastAction;
+        return lastAction_;
     }
 
 private:
-    enum class TriggerReason { added, reply, timeout };
+    enum class TriggerReason { Added, Reply, Timeout };
 
     void
     filterNodes(std::vector<std::pair<SHAMapNodeID, uint256>>& nodes, TriggerReason reason);
@@ -148,28 +148,28 @@ private:
     std::vector<uint256>
     neededStateHashes(int max, SHAMapSyncFilter* filter) const;
 
-    clock_type& m_clock;
-    clock_type::time_point mLastAction;
+    clock_type& clock_;
+    clock_type::time_point lastAction_;
 
-    std::shared_ptr<Ledger> mLedger;
-    bool mHaveHeader{false};
-    bool mHaveState{false};
-    bool mHaveTransactions{false};
-    bool mSignaled{false};
-    bool mByHash{true};
-    std::uint32_t mSeq;
-    Reason const mReason;
+    std::shared_ptr<Ledger> ledger_;
+    bool haveHeader_{false};
+    bool haveState_{false};
+    bool haveTransactions_{false};
+    bool signaled_{false};
+    bool byHash_{true};
+    std::uint32_t seq_;
+    Reason const reason_;
 
-    std::set<uint256> mRecentNodes;
+    std::set<uint256> recentNodes_;
 
-    SHAMapAddNode mStats;
+    SHAMapAddNode stats_;
 
     // Data we have received from peers
-    std::mutex mReceivedDataLock;
+    std::mutex receivedDataLock_;
     std::vector<std::pair<std::weak_ptr<Peer>, std::shared_ptr<protocol::TMLedgerData>>>
-        mReceivedData;
-    bool mReceiveDispatched{false};
-    std::unique_ptr<PeerSet> mPeerSet;
+        receivedData_;
+    bool receiveDispatched_{false};
+    std::unique_ptr<PeerSet> peerSet_;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/InboundLedgers.h b/src/xrpld/app/ledger/InboundLedgers.h
index ecac6e07e4..f6c864f777 100644
--- a/src/xrpld/app/ledger/InboundLedgers.h
+++ b/src/xrpld/app/ledger/InboundLedgers.h
@@ -13,7 +13,7 @@ namespace xrpl {
 class InboundLedgers
 {
 public:
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
     virtual ~InboundLedgers() = default;
 
@@ -51,7 +51,7 @@ public:
     virtual void
     clearFailures() = 0;
 
-    virtual Json::Value
+    virtual json::Value
     getInfo() = 0;
 
     /** Returns the rate of historical ledger fetches per minute. */
@@ -75,7 +75,7 @@ public:
 };
 
 std::unique_ptr<InboundLedgers>
-make_InboundLedgers(
+makeInboundLedgers(
     Application& app,
     InboundLedgers::clock_type& clock,
     beast::insight::Collector::ptr const& collector);
diff --git a/src/xrpld/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h
index 21c7ba0159..bd176dbd95 100644
--- a/src/xrpld/app/ledger/InboundTransactions.h
+++ b/src/xrpld/app/ledger/InboundTransactions.h
@@ -17,7 +17,7 @@ class Application;
 class InboundTransactions
 {
 public:
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
     InboundTransactions() = default;
     InboundTransactions(InboundTransactions const&) = delete;
@@ -69,7 +69,7 @@ public:
 };
 
 std::unique_ptr<InboundTransactions>
-make_InboundTransactions(
+makeInboundTransactions(
     Application& app,
     beast::insight::Collector::ptr const& collector,
     std::function<void(std::shared_ptr<SHAMap> const&, bool)> gotSet);
diff --git a/src/xrpld/app/ledger/LedgerCleaner.h b/src/xrpld/app/ledger/LedgerCleaner.h
index a5ad4f981b..3f76f5593c 100644
--- a/src/xrpld/app/ledger/LedgerCleaner.h
+++ b/src/xrpld/app/ledger/LedgerCleaner.h
@@ -36,10 +36,10 @@ public:
         @param parameters A Json object with configurable parameters.
     */
     virtual void
-    clean(Json::Value const& parameters) = 0;
+    clean(json::Value const& parameters) = 0;
 };
 
 std::unique_ptr<LedgerCleaner>
-make_LedgerCleaner(Application& app, beast::Journal journal);
+makeLedgerCleaner(Application& app, beast::Journal journal);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/LedgerHistory.cpp b/src/xrpld/app/ledger/LedgerHistory.cpp
index 535acbf63e..76bf4122e1 100644
--- a/src/xrpld/app/ledger/LedgerHistory.cpp
+++ b/src/xrpld/app/ledger/LedgerHistory.cpp
@@ -36,14 +36,14 @@ namespace xrpl {
 LedgerHistory::LedgerHistory(beast::insight::Collector::ptr const& collector, Application& app)
     : app_(app)
     , collector_(collector)
-    , mismatch_counter_(collector->make_counter("ledger.history", "mismatch"))
-    , m_ledgers_by_hash(
+    , mismatch_counter_(collector->makeCounter("ledger.history", "mismatch"))
+    , ledgers_by_hash_(
           "LedgerCache",
-          app_.config().getValueFor(SizedItem::ledgerSize),
-          std::chrono::seconds{app_.config().getValueFor(SizedItem::ledgerAge)},
+          app_.config().getValueFor(SizedItem::LedgerSize),
+          std::chrono::seconds{app_.config().getValueFor(SizedItem::LedgerAge)},
           stopwatch(),
           app_.getJournal("TaggedCache"))
-    , m_consensus_validated(
+    , consensus_validated_(
           "ConsensusValidated",
           64,
           std::chrono::minutes{5},
@@ -57,17 +57,17 @@ bool
 LedgerHistory::insert(std::shared_ptr<Ledger const> const& ledger, bool validated)
 {
     if (!ledger->isImmutable())
-        LogicError("mutable Ledger in insert");
+        logicError("mutable Ledger in insert");
 
     XRPL_ASSERT(
         ledger->stateMap().getHash().isNonZero(), "xrpl::LedgerHistory::insert : nonzero hash");
 
-    std::unique_lock const sl(m_ledgers_by_hash.peekMutex());
+    std::unique_lock const sl(ledgers_by_hash_.peekMutex());
 
     bool const alreadyHad =
-        m_ledgers_by_hash.canonicalize_replace_cache(ledger->header().hash, ledger);
+        ledgers_by_hash_.canonicalizeReplaceCache(ledger->header().hash, ledger);
     if (validated)
-        mLedgersByIndex[ledger->header().seq] = ledger->header().hash;
+        ledgersByIndex_[ledger->header().seq] = ledger->header().hash;
 
     return alreadyHad;
 }
@@ -75,8 +75,8 @@ LedgerHistory::insert(std::shared_ptr<Ledger const> const& ledger, bool validate
 LedgerHash
 LedgerHistory::getLedgerHash(LedgerIndex index)
 {
-    std::unique_lock const sl(m_ledgers_by_hash.peekMutex());
-    if (auto it = mLedgersByIndex.find(index); it != mLedgersByIndex.end())
+    std::unique_lock const sl(ledgers_by_hash_.peekMutex());
+    if (auto it = ledgersByIndex_.find(index); it != ledgersByIndex_.end())
         return it->second;
     return {};
 }
@@ -85,10 +85,10 @@ std::shared_ptr<Ledger const>
 LedgerHistory::getLedgerBySeq(LedgerIndex index)
 {
     {
-        std::unique_lock sl(m_ledgers_by_hash.peekMutex());
-        auto it = mLedgersByIndex.find(index);
+        std::unique_lock sl(ledgers_by_hash_.peekMutex());
+        auto it = ledgersByIndex_.find(index);
 
-        if (it != mLedgersByIndex.end())
+        if (it != ledgersByIndex_.end())
         {
             uint256 const hash = it->second;
             sl.unlock();
@@ -108,12 +108,12 @@ LedgerHistory::getLedgerBySeq(LedgerIndex index)
 
     {
         // Add this ledger to the local tracking by index
-        std::unique_lock const sl(m_ledgers_by_hash.peekMutex());
+        std::unique_lock const sl(ledgers_by_hash_.peekMutex());
 
         XRPL_ASSERT(
             ret->isImmutable(), "xrpl::LedgerHistory::getLedgerBySeq : immutable result ledger");
-        m_ledgers_by_hash.canonicalize_replace_client(ret->header().hash, ret);
-        mLedgersByIndex[ret->header().seq] = ret->header().hash;
+        ledgers_by_hash_.canonicalizeReplaceClient(ret->header().hash, ret);
+        ledgersByIndex_[ret->header().seq] = ret->header().hash;
         return (ret->header().seq == index) ? ret : nullptr;
     }
 }
@@ -121,7 +121,7 @@ LedgerHistory::getLedgerBySeq(LedgerIndex index)
 std::shared_ptr<Ledger const>
 LedgerHistory::getLedgerByHash(LedgerHash const& hash)
 {
-    auto ret = m_ledgers_by_hash.fetch(hash);
+    auto ret = ledgers_by_hash_.fetch(hash);
 
     if (ret)
     {
@@ -148,7 +148,7 @@ LedgerHistory::getLedgerByHash(LedgerHash const& hash)
     XRPL_ASSERT(
         ret->header().hash == hash,
         "xrpl::LedgerHistory::getLedgerByHash : loaded ledger hash match");
-    m_ledgers_by_hash.canonicalize_replace_client(ret->header().hash, ret);
+    ledgers_by_hash_.canonicalizeReplaceClient(ret->header().hash, ret);
     XRPL_ASSERT(
         ret->header().hash == hash, "xrpl::LedgerHistory::getLedgerByHash : result hash match");
 
@@ -156,7 +156,7 @@ LedgerHistory::getLedgerByHash(LedgerHash const& hash)
 }
 
 static void
-log_one(ReadView const& ledger, uint256 const& tx, char const* msg, beast::Journal& j)
+logOne(ReadView const& ledger, uint256 const& tx, char const* msg, beast::Journal& j)
 {
     auto metaData = ledger.txRead(tx).second;
 
@@ -164,7 +164,7 @@ log_one(ReadView const& ledger, uint256 const& tx, char const* msg, beast::Journ
     {
         JLOG(j.debug()) << "MISMATCH on TX " << tx << ": " << msg
                         << " is missing this transaction:\n"
-                        << metaData->getJson(JsonOptions::none);
+                        << metaData->getJson(JsonOptions::KNone);
     }
     else
     {
@@ -174,7 +174,7 @@ log_one(ReadView const& ledger, uint256 const& tx, char const* msg, beast::Journ
 }
 
 static void
-log_metadata_difference(
+logMetadataDifference(
     ReadView const& builtLedger,
     ReadView const& validLedger,
     uint256 const& tx,
@@ -198,21 +198,21 @@ log_metadata_difference(
         auto const& validNodes = validMetaData->getNodes();
         auto const& builtNodes = builtMetaData->getNodes();
 
-        bool const result_diff = validMetaData->getResultTER() != builtMetaData->getResultTER();
+        bool const resultDiff = validMetaData->getResultTER() != builtMetaData->getResultTER();
 
-        bool const index_diff = validMetaData->getIndex() != builtMetaData->getIndex();
+        bool const indexDiff = validMetaData->getIndex() != builtMetaData->getIndex();
 
-        bool const nodes_diff = validNodes != builtNodes;
+        bool const nodesDiff = validNodes != builtNodes;
 
-        if (!result_diff && !index_diff && !nodes_diff)
+        if (!resultDiff && !indexDiff && !nodesDiff)
         {
             JLOG(j.error()) << "MISMATCH on TX " << tx << ": No apparent mismatches detected!";
             return;
         }
 
-        if (!nodes_diff)
+        if (!nodesDiff)
         {
-            if (result_diff && index_diff)
+            if (resultDiff && indexDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different result and index!";
                 JLOG(j.debug()) << " Built:"
@@ -222,7 +222,7 @@ log_metadata_difference(
                                 << " Result: " << validMetaData->getResult()
                                 << " Index: " << validMetaData->getIndex();
             }
-            else if (result_diff)
+            else if (resultDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different result!";
                 JLOG(j.debug()) << " Built:"
@@ -230,7 +230,7 @@ log_metadata_difference(
                 JLOG(j.debug()) << " Valid:"
                                 << " Result: " << validMetaData->getResult();
             }
-            else if (index_diff)
+            else if (indexDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different index!";
                 JLOG(j.debug()) << " Built:"
@@ -241,42 +241,42 @@ log_metadata_difference(
         }
         else
         {
-            if (result_diff && index_diff)
+            if (resultDiff && indexDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx
                                 << ": Different result, index and nodes!";
-                JLOG(j.debug()) << " Built:\n" << builtMetaData->getJson(JsonOptions::none);
-                JLOG(j.debug()) << " Valid:\n" << validMetaData->getJson(JsonOptions::none);
+                JLOG(j.debug()) << " Built:\n" << builtMetaData->getJson(JsonOptions::KNone);
+                JLOG(j.debug()) << " Valid:\n" << validMetaData->getJson(JsonOptions::KNone);
             }
-            else if (result_diff)
+            else if (resultDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different result and nodes!";
                 JLOG(j.debug()) << " Built:"
                                 << " Result: " << builtMetaData->getResult() << " Nodes:\n"
-                                << builtNodes.getJson(JsonOptions::none);
+                                << builtNodes.getJson(JsonOptions::KNone);
                 JLOG(j.debug()) << " Valid:"
                                 << " Result: " << validMetaData->getResult() << " Nodes:\n"
-                                << validNodes.getJson(JsonOptions::none);
+                                << validNodes.getJson(JsonOptions::KNone);
             }
-            else if (index_diff)
+            else if (indexDiff)
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different index and nodes!";
                 JLOG(j.debug()) << " Built:"
                                 << " Index: " << builtMetaData->getIndex() << " Nodes:\n"
-                                << builtNodes.getJson(JsonOptions::none);
+                                << builtNodes.getJson(JsonOptions::KNone);
                 JLOG(j.debug()) << " Valid:"
                                 << " Index: " << validMetaData->getIndex() << " Nodes:\n"
-                                << validNodes.getJson(JsonOptions::none);
+                                << validNodes.getJson(JsonOptions::KNone);
             }
             else  // nodes_diff
             {
                 JLOG(j.debug()) << "MISMATCH on TX " << tx << ": Different nodes!";
                 JLOG(j.debug()) << " Built:"
                                 << " Nodes:\n"
-                                << builtNodes.getJson(JsonOptions::none);
+                                << builtNodes.getJson(JsonOptions::KNone);
                 JLOG(j.debug()) << " Valid:"
                                 << " Nodes:\n"
-                                << validNodes.getJson(JsonOptions::none);
+                                << validNodes.getJson(JsonOptions::KNone);
             }
         }
 
@@ -286,13 +286,13 @@ log_metadata_difference(
     if (validMetaData)
     {
         JLOG(j.error()) << "MISMATCH on TX " << tx << ": Metadata Difference. Valid=\n"
-                        << validMetaData->getJson(JsonOptions::none);
+                        << validMetaData->getJson(JsonOptions::KNone);
     }
 
     if (builtMetaData)
     {
         JLOG(j.error()) << "MISMATCH on TX " << tx << ": Metadata Difference. Built=\n"
-                        << builtMetaData->getJson(JsonOptions::none);
+                        << builtMetaData->getJson(JsonOptions::KNone);
     }
 }
 
@@ -316,7 +316,7 @@ LedgerHistory::handleMismatch(
     LedgerHash const& valid,
     std::optional<uint256> const& builtConsensusHash,
     std::optional<uint256> const& validatedConsensusHash,
-    Json::Value const& consensus)
+    json::Value const& consensus)
 {
     XRPL_ASSERT(built != valid, "xrpl::LedgerHistory::handleMismatch : unequal hashes");
     ++mismatch_counter_;
@@ -395,12 +395,12 @@ LedgerHistory::handleMismatch(
     {
         if ((*b)->key() < (*v)->key())
         {
-            log_one(*builtLedger, (*b)->key(), "valid", j_);
+            logOne(*builtLedger, (*b)->key(), "valid", j_);
             ++b;
         }
         else if ((*b)->key() > (*v)->key())
         {
-            log_one(*validLedger, (*v)->key(), "built", j_);
+            logOne(*validLedger, (*v)->key(), "built", j_);
             ++v;
         }
         else
@@ -408,32 +408,32 @@ LedgerHistory::handleMismatch(
             if ((*b)->slice() != (*v)->slice())
             {
                 // Same transaction with different metadata
-                log_metadata_difference(*builtLedger, *validLedger, (*b)->key(), j_);
+                logMetadataDifference(*builtLedger, *validLedger, (*b)->key(), j_);
             }
             ++b;
             ++v;
         }
     }
     for (; b != builtTx.end(); ++b)
-        log_one(*builtLedger, (*b)->key(), "valid", j_);
+        logOne(*builtLedger, (*b)->key(), "valid", j_);
     for (; v != validTx.end(); ++v)
-        log_one(*validLedger, (*v)->key(), "built", j_);
+        logOne(*validLedger, (*v)->key(), "built", j_);
 }
 
 void
 LedgerHistory::builtLedger(
     std::shared_ptr<Ledger const> const& ledger,
     uint256 const& consensusHash,
-    Json::Value consensus)
+    json::Value consensus)
 {
     LedgerIndex const index = ledger->header().seq;
     LedgerHash const hash = ledger->header().hash;
     XRPL_ASSERT(!hash.isZero(), "xrpl::LedgerHistory::builtLedger : nonzero hash");
 
-    std::unique_lock const sl(m_consensus_validated.peekMutex());
+    std::unique_lock const sl(consensus_validated_.peekMutex());
 
-    auto entry = std::make_shared<cv_entry>();
-    m_consensus_validated.canonicalize_replace_client(index, entry);
+    auto entry = std::make_shared<CvEntry>();
+    consensus_validated_.canonicalizeReplaceClient(index, entry);
 
     if (entry->validated && !entry->built)
     {
@@ -469,10 +469,10 @@ LedgerHistory::validatedLedger(
     LedgerHash const hash = ledger->header().hash;
     XRPL_ASSERT(!hash.isZero(), "xrpl::LedgerHistory::validatedLedger : nonzero hash");
 
-    std::unique_lock const sl(m_consensus_validated.peekMutex());
+    std::unique_lock const sl(consensus_validated_.peekMutex());
 
-    auto entry = std::make_shared<cv_entry>();
-    m_consensus_validated.canonicalize_replace_client(index, entry);
+    auto entry = std::make_shared<CvEntry>();
+    consensus_validated_.canonicalizeReplaceClient(index, entry);
 
     if (entry->built && !entry->validated)
     {
@@ -499,15 +499,15 @@ LedgerHistory::validatedLedger(
     entry->validatedConsensusHash = consensusHash;
 }
 
-/** Ensure m_ledgers_by_hash doesn't have the wrong hash for a particular index
+/** Ensure ledgers_by_hash_ doesn't have the wrong hash for a particular index
  */
 bool
 LedgerHistory::fixIndex(LedgerIndex ledgerIndex, LedgerHash const& ledgerHash)
 {
-    std::unique_lock const sl(m_ledgers_by_hash.peekMutex());
-    auto it = mLedgersByIndex.find(ledgerIndex);
+    std::unique_lock const sl(ledgers_by_hash_.peekMutex());
+    auto it = ledgersByIndex_.find(ledgerIndex);
 
-    if ((it != mLedgersByIndex.end()) && (it->second != ledgerHash))
+    if ((it != ledgersByIndex_.end()) && (it->second != ledgerHash))
     {
         it->second = ledgerHash;
         return false;
@@ -518,11 +518,11 @@ LedgerHistory::fixIndex(LedgerIndex ledgerIndex, LedgerHash const& ledgerHash)
 void
 LedgerHistory::clearLedgerCachePrior(LedgerIndex seq)
 {
-    for (LedgerHash const it : m_ledgers_by_hash.getKeys())
+    for (LedgerHash const it : ledgers_by_hash_.getKeys())
     {
         auto const ledger = getLedgerByHash(it);
         if (!ledger || ledger->header().seq < seq)
-            m_ledgers_by_hash.del(it, false);
+            ledgers_by_hash_.del(it, false);
     }
 }
 
diff --git a/src/xrpld/app/ledger/LedgerHistory.h b/src/xrpld/app/ledger/LedgerHistory.h
index b988d152ad..01c88b1517 100644
--- a/src/xrpld/app/ledger/LedgerHistory.h
+++ b/src/xrpld/app/ledger/LedgerHistory.h
@@ -30,7 +30,7 @@ public:
     float
     getCacheHitRate()
     {
-        return m_ledgers_by_hash.getHitRate();
+        return ledgers_by_hash_.getHitRate();
     }
 
     /** Get a ledger given its sequence number */
@@ -53,13 +53,13 @@ public:
     void
     sweep()
     {
-        m_ledgers_by_hash.sweep();
-        m_consensus_validated.sweep();
+        ledgers_by_hash_.sweep();
+        consensus_validated_.sweep();
     }
 
     /** Report that we have locally built a particular ledger */
     void
-    builtLedger(std::shared_ptr<Ledger const> const&, uint256 const& consensusHash, Json::Value);
+    builtLedger(std::shared_ptr<Ledger const> const&, uint256 const& consensusHash, json::Value);
 
     /** Report that we have validated a particular ledger */
     void
@@ -95,7 +95,7 @@ private:
         LedgerHash const& valid,
         std::optional<uint256> const& builtConsensusHash,
         std::optional<uint256> const& validatedConsensusHash,
-        Json::Value const& consensus);
+        json::Value const& consensus);
 
     Application& app_;
     beast::insight::Collector::ptr collector_;
@@ -103,11 +103,11 @@ private:
 
     using LedgersByHash = TaggedCache<LedgerHash, Ledger const>;
 
-    LedgersByHash m_ledgers_by_hash;
+    LedgersByHash ledgers_by_hash_;
 
     // Maps ledger indexes to the corresponding hashes
     // For debug and logging purposes
-    struct cv_entry
+    struct CvEntry
     {
         // Hash of locally built ledger
         std::optional<LedgerHash> built;
@@ -118,13 +118,13 @@ private:
         // Hash of validated consensus transaction set
         std::optional<uint256> validatedConsensusHash;
         // Consensus metadata of built ledger
-        std::optional<Json::Value> consensus;
+        std::optional<json::Value> consensus;
     };
-    using ConsensusValidated = TaggedCache<LedgerIndex, cv_entry>;
-    ConsensusValidated m_consensus_validated;
+    using ConsensusValidated = TaggedCache<LedgerIndex, CvEntry>;
+    ConsensusValidated consensus_validated_;
 
     // Maps ledger indexes to the corresponding hash.
-    std::map<LedgerIndex, LedgerHash> mLedgersByIndex;  // validated ledgers
+    std::map<LedgerIndex, LedgerHash> ledgersByIndex_;  // validated ledgers
 
     beast::Journal j_;
 };
diff --git a/src/xrpld/app/ledger/LedgerHolder.h b/src/xrpld/app/ledger/LedgerHolder.h
index 322ad85e23..69fe00b439 100644
--- a/src/xrpld/app/ledger/LedgerHolder.h
+++ b/src/xrpld/app/ledger/LedgerHolder.h
@@ -25,31 +25,31 @@ public:
     set(std::shared_ptr<Ledger const> ledger)
     {
         if (!ledger)
-            LogicError("LedgerHolder::set with nullptr");
+            logicError("LedgerHolder::set with nullptr");
         if (!ledger->isImmutable())
-            LogicError("LedgerHolder::set with mutable Ledger");
-        std::scoped_lock const sl(m_lock);
-        m_heldLedger = std::move(ledger);
+            logicError("LedgerHolder::set with mutable Ledger");
+        std::scoped_lock const sl(lock_);
+        heldLedger_ = std::move(ledger);
     }
 
     // Return the (immutable) held ledger
     std::shared_ptr<Ledger const>
     get()
     {
-        std::scoped_lock const sl(m_lock);
-        return m_heldLedger;
+        std::scoped_lock const sl(lock_);
+        return heldLedger_;
     }
 
     bool
     empty()
     {
-        std::scoped_lock const sl(m_lock);
-        return m_heldLedger == nullptr;
+        std::scoped_lock const sl(lock_);
+        return heldLedger_ == nullptr;
     }
 
 private:
-    std::mutex m_lock;
-    std::shared_ptr<Ledger const> m_heldLedger;
+    std::mutex lock_;
+    std::shared_ptr<Ledger const> heldLedger_;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/LedgerMaster.h b/src/xrpld/app/ledger/LedgerMaster.h
index 62970eab15..0b3310ea79 100644
--- a/src/xrpld/app/ledger/LedgerMaster.h
+++ b/src/xrpld/app/ledger/LedgerMaster.h
@@ -59,7 +59,7 @@ public:
     std::shared_ptr<Ledger const>
     getClosedLedger()
     {
-        return mClosedLedger.get();
+        return closedLedger_.get();
     }
 
     // The validated ledger is the last fully validated ledger.
@@ -189,7 +189,7 @@ public:
     consensusBuilt(
         std::shared_ptr<Ledger const> const& ledger,
         uint256 const& consensusHash,
-        Json::Value consensus);
+        json::Value consensus);
 
     void
     setBuildingLedger(LedgerIndex index);
@@ -242,7 +242,7 @@ public:
     bool
     haveValidated()
     {
-        return !mValidLedger.empty();
+        return !validLedger_.empty();
     }
 
     // Returns the minimum ledger sequence in SQL database, if any.
@@ -277,7 +277,7 @@ private:
         InboundLedger::Reason reason,
         std::unique_lock<std::recursive_mutex>&);
     // Try to publish ledgers, acquire missing ledgers.  Always called with
-    // m_mutex locked.  The passed lock is a reminder to callers.
+    // mutex_ locked.  The passed lock is a reminder to callers.
     void
     doAdvance(std::unique_lock<std::recursive_mutex>&);
 
@@ -287,61 +287,61 @@ private:
     void
     updatePaths();
 
-    // Returns true if work started.  Always called with m_mutex locked.
+    // Returns true if work started.  Always called with mutex_ locked.
     // The passed lock is a reminder to callers.
     bool
     newPFWork(char const* name, std::unique_lock<std::recursive_mutex>&);
 
     Application& app_;
-    beast::Journal m_journal;
+    beast::Journal journal_;
 
-    std::recursive_mutex mutable m_mutex;
+    std::recursive_mutex mutable mutex_;
 
     // The ledger that most recently closed.
-    LedgerHolder mClosedLedger;
+    LedgerHolder closedLedger_;
 
     // The highest-sequence ledger we have fully accepted.
-    LedgerHolder mValidLedger;
+    LedgerHolder validLedger_;
 
     // The last ledger we have published.
-    std::shared_ptr<Ledger const> mPubLedger;
+    std::shared_ptr<Ledger const> pubLedger_;
 
     // The last ledger we did pathfinding against.
-    std::shared_ptr<Ledger const> mPathLedger;
+    std::shared_ptr<Ledger const> pathLedger_;
 
     // The last ledger we handled fetching history
-    std::shared_ptr<Ledger const> mHistLedger;
+    std::shared_ptr<Ledger const> histLedger_;
 
     // Fully validated ledger, whether or not we have the ledger resident.
-    std::pair<uint256, LedgerIndex> mLastValidLedger{uint256(), 0};
+    std::pair<uint256, LedgerIndex> lastValidLedger_{uint256(), 0};
 
-    LedgerHistory mLedgerHistory;
+    LedgerHistory ledgerHistory_;
 
-    CanonicalTXSet mHeldTransactions{uint256()};
+    CanonicalTXSet heldTransactions_{uint256()};
 
     // A set of transactions to replay during the next close
-    std::unique_ptr<LedgerReplay> replayData;
+    std::unique_ptr<LedgerReplay> replayData_;
 
-    std::recursive_mutex mCompleteLock;
-    RangeSet<std::uint32_t> mCompleteLedgers;
+    std::recursive_mutex completeLock_;
+    RangeSet<std::uint32_t> completeLedgers_;
 
     // Publish thread is running.
-    bool mAdvanceThread{false};
+    bool advanceThread_{false};
 
     // Publish thread has work to do.
-    bool mAdvanceWork{false};
-    int mFillInProgress{0};
+    bool advanceWork_{false};
+    int fillInProgress_{0};
 
-    int mPathFindThread{0};  // Pathfinder jobs dispatched
-    bool mPathFindNewRequest{false};
+    int pathFindThread_{0};  // Pathfinder jobs dispatched
+    bool pathFindNewRequest_{false};
 
-    std::atomic_flag mGotFetchPackThread = ATOMIC_FLAG_INIT;  // GotFetchPack jobs dispatched
+    std::atomic_flag gotFetchPackThread_ = ATOMIC_FLAG_INIT;  // GotFetchPack jobs dispatched
 
-    std::atomic<std::uint32_t> mPubLedgerClose{0};
-    std::atomic<LedgerIndex> mPubLedgerSeq{0};
-    std::atomic<std::uint32_t> mValidLedgerSign{0};
-    std::atomic<LedgerIndex> mValidLedgerSeq{0};
-    std::atomic<LedgerIndex> mBuildingLedgerSeq{0};
+    std::atomic<std::uint32_t> pubLedgerClose_{0};
+    std::atomic<LedgerIndex> pubLedgerSeq_{0};
+    std::atomic<std::uint32_t> validLedgerSign_{0};
+    std::atomic<LedgerIndex> validLedgerSeq_{0};
+    std::atomic<LedgerIndex> buildingLedgerSeq_{0};
 
     // The server is in standalone mode
     bool const standalone_;
@@ -370,9 +370,9 @@ private:
     {
         template <class Handler>
         Stats(Handler const& handler, beast::insight::Collector::ptr const& collector)
-            : hook(collector->make_hook(handler))
-            , validatedLedgerAge(collector->make_gauge("LedgerMaster", "Validated_Ledger_Age"))
-            , publishedLedgerAge(collector->make_gauge("LedgerMaster", "Published_Ledger_Age"))
+            : hook(collector->makeHook(handler))
+            , validatedLedgerAge(collector->makeGauge("LedgerMaster", "Validated_Ledger_Age"))
+            , publishedLedgerAge(collector->makeGauge("LedgerMaster", "Published_Ledger_Age"))
         {
         }
 
@@ -381,15 +381,15 @@ private:
         beast::insight::Gauge publishedLedgerAge;
     };
 
-    Stats m_stats;
+    Stats stats_;
 
 private:
     void
-    collect_metrics()
+    collectMetrics()
     {
-        std::scoped_lock const lock(m_mutex);
-        m_stats.validatedLedgerAge.set(getValidatedLedgerAge().count());
-        m_stats.publishedLedgerAge.set(getPublishedLedgerAge().count());
+        std::scoped_lock const lock(mutex_);
+        stats_.validatedLedgerAge.set(getValidatedLedgerAge().count());
+        stats_.publishedLedgerAge.set(getPublishedLedgerAge().count());
     }
 };
 
diff --git a/src/xrpld/app/ledger/LedgerReplayTask.h b/src/xrpld/app/ledger/LedgerReplayTask.h
index 4eaed49d1b..7bb75253f2 100644
--- a/src/xrpld/app/ledger/LedgerReplayTask.h
+++ b/src/xrpld/app/ledger/LedgerReplayTask.h
@@ -25,16 +25,16 @@ public:
     {
     public:
         // set on construct
-        InboundLedger::Reason reason_;
-        uint256 finishHash_;
-        std::uint32_t totalLedgers_;  // including the start and the finish
+        InboundLedger::Reason reason;
+        uint256 finishHash;
+        std::uint32_t totalLedgers;  // including the start and the finish
 
         // to be updated
-        std::uint32_t finishSeq_ = 0;
-        std::vector<uint256> skipList_;  // including the finishHash
-        uint256 startHash_;
-        std::uint32_t startSeq_ = 0;
-        bool full_ = false;
+        std::uint32_t finishSeq = 0;
+        std::vector<uint256> skipList;  // including the finishHash
+        uint256 startHash;
+        std::uint32_t startSeq = 0;
+        bool full = false;
 
         /**
          * constructor
diff --git a/src/xrpld/app/ledger/LedgerReplayer.h b/src/xrpld/app/ledger/LedgerReplayer.h
index 9ea544c79b..5d537bfd24 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 TASK_TIMEOUT = std::chrono::milliseconds{500};
+auto constexpr kTASK_TIMEOUT = std::chrono::milliseconds{500};
 
 // for LedgerReplayTask to calculate max allowed timeouts
-// = max( TASK_MAX_TIMEOUTS_MINIMUM,
-//        (# of ledger to replay) * TASK_MAX_TIMEOUTS_MULTIPLIER)
-std::uint32_t constexpr TASK_MAX_TIMEOUTS_MULTIPLIER = 2;
-std::uint32_t constexpr TASK_MAX_TIMEOUTS_MINIMUM = 10;
+// = 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;
 
 // timeout value for subtasks: LedgerDeltaAcquire and SkipListAcquire
-auto constexpr SUB_TASK_TIMEOUT = std::chrono::milliseconds{250};
+auto constexpr kSUB_TASK_TIMEOUT = std::chrono::milliseconds{250};
 // max of allowed subtask timeouts
-std::uint32_t constexpr SUB_TASK_MAX_TIMEOUTS = 10;
+std::uint32_t constexpr kSUB_TASK_MAX_TIMEOUTS = 10;
 
 // max number of peers that do not support the ledger replay feature
 // returned by the PeerSet before switch to fallback
-auto constexpr MAX_NO_FEATURE_PEER_COUNT = 2;
+auto constexpr kMAX_NO_FEATURE_PEER_COUNT = 2;
 // subtask timeout value after fallback
-auto constexpr SUB_TASK_FALLBACK_TIMEOUT = std::chrono::milliseconds{1000};
+auto constexpr kSUB_TASK_FALLBACK_TIMEOUT = std::chrono::milliseconds{1000};
 
 // for LedgerReplayer to limit the number of LedgerReplayTask
-std::uint32_t constexpr MAX_TASKS = 10;
+std::uint32_t constexpr kMAX_TASKS = 10;
 
 // for LedgerReplayer to limit the number of ledgers to replay in one task
-std::uint32_t constexpr MAX_TASK_SIZE = 256;
+std::uint32_t constexpr kMAX_TASK_SIZE = 256;
 
 // to limit the number of LedgerReplay related jobs in JobQueue
-std::uint32_t constexpr MAX_QUEUED_TASKS = 100;
+std::uint32_t constexpr kMAX_QUEUED_TASKS = 100;
 }  // namespace LedgerReplayParameters
 
 /**
diff --git a/src/xrpld/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h
index 91878c3c1b..981af07a0e 100644
--- a/src/xrpld/app/ledger/LedgerToJson.h
+++ b/src/xrpld/app/ledger/LedgerToJson.h
@@ -26,13 +26,13 @@ struct LedgerFill
     // Bitwise bitmask
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum Options {
-        dumpTxrp = 1,
-        dumpState = 2,
-        expand = 4,
-        full = 8,
-        binary = 16,
-        ownerFunds = 32,
-        dumpQueue = 64
+        DumpTxrp = 1,
+        DumpState = 2,
+        Expand = 4,
+        Full = 8,
+        Binary = 16,
+        OwnerFunds = 32,
+        DumpQueue = 64
     };
 
     ReadView const& ledger;
@@ -42,18 +42,18 @@ struct LedgerFill
     std::optional<NetClock::time_point> closeTime;
 };
 
-/** Given a Ledger and options, fill a Json::Value with a
+/** Given a Ledger and options, fill a json::Value with a
     description of the ledger.
  */
 void
-addJson(Json::Value&, LedgerFill const&);
+addJson(json::Value&, LedgerFill const&);
 
-/** Return a new Json::Value representing the ledger with given options.*/
-Json::Value
+/** Return a new json::Value representing the ledger with given options.*/
+json::Value
 getJson(LedgerFill const&);
 
 /** Copy all the keys and values from one object into another. */
 void
-copyFrom(Json::Value& to, Json::Value const& from);
+copyFrom(json::Value& to, json::Value const& from);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/LocalTxs.h b/src/xrpld/app/ledger/LocalTxs.h
index cb17be5bdb..779dd4f02c 100644
--- a/src/xrpld/app/ledger/LocalTxs.h
+++ b/src/xrpld/app/ledger/LocalTxs.h
@@ -17,13 +17,13 @@ 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 holdLedgers = 5;
+    static constexpr int kHOLD_LEDGERS = 5;
 
     virtual ~LocalTxs() = default;
 
     // Add a new local transaction
     virtual void
-    push_back(LedgerIndex index, std::shared_ptr<STTx const> const& txn) = 0;
+    pushBack(LedgerIndex index, std::shared_ptr<STTx const> const& txn) = 0;
 
     // Return the set of local transactions to a new open ledger
     virtual CanonicalTXSet
@@ -38,6 +38,6 @@ public:
 };
 
 std::unique_ptr<LocalTxs>
-make_LocalTxs();
+makeLocalTxs();
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h
index d55c9c97e3..884b6b02db 100644
--- a/src/xrpld/app/ledger/OpenLedger.h
+++ b/src/xrpld/app/ledger/OpenLedger.h
@@ -169,13 +169,13 @@ private:
         ApplyFlags flags,
         beast::Journal j);
 
-    enum class Result { success, failure, retry };
+    enum class Result { Success, Failure, Retry };
 
     std::shared_ptr<OpenView>
     create(Rules const& rules, std::shared_ptr<Ledger const> const& ledger);
 
     static Result
-    apply_one(
+    applyOne(
         Application& app,
         OpenView& view,
         std::shared_ptr<STTx const> const& tx,
@@ -206,8 +206,8 @@ OpenLedger::apply(
             auto const txId = tx->getTransactionID();
             if (check.txExists(txId))
                 continue;
-            auto const result = apply_one(app, view, tx, true, flags, j);
-            if (result == Result::retry)
+            auto const result = applyOne(app, view, tx, true, flags, j);
+            if (result == Result::Retry)
                 retries.insert(tx);
         }
         catch (std::exception const& e)
@@ -222,15 +222,15 @@ OpenLedger::apply(
         auto iter = retries.begin();
         while (iter != retries.end())
         {
-            switch (apply_one(app, view, iter->second, retry, flags, j))
+            switch (applyOne(app, view, iter->second, retry, flags, j))
             {
-                case Result::success:
+                case Result::Success:
                     ++changes;
                     [[fallthrough]];
-                case Result::failure:
+                case Result::Failure:
                     iter = retries.erase(iter);
                     break;
-                case Result::retry:
+                case Result::Retry:
                     ++iter;
             }
         }
diff --git a/src/xrpld/app/ledger/OrderBookDBImpl.cpp b/src/xrpld/app/ledger/OrderBookDBImpl.cpp
index 4bfa982082..658ec4ea7a 100644
--- a/src/xrpld/app/ledger/OrderBookDBImpl.cpp
+++ b/src/xrpld/app/ledger/OrderBookDBImpl.cpp
@@ -42,7 +42,7 @@ OrderBookDBImpl::OrderBookDBImpl(ServiceRegistry& registry, OrderBookDBConfig co
 }
 
 std::unique_ptr<OrderBookDB>
-make_OrderBookDB(ServiceRegistry& registry, OrderBookDBConfig const& config)
+makeOrderBookDb(ServiceRegistry& registry, OrderBookDBConfig const& config)
 {
     return std::make_unique<OrderBookDBImpl>(registry, config);
 }
@@ -83,7 +83,7 @@ OrderBookDBImpl::setup(std::shared_ptr<ReadView const> const& ledger)
             // Shorten job name to fit Linux 15-char thread name limit with "j:" prefix
             // "OB" + seq (max 9 digits) = 11 chars, + "j:" = 13 chars (fits in 15)
             registry_.get().getJobQueue().addJob(
-                jtUPDATE_PF, "OB" + std::to_string(ledger->seq() % 1000000000), [this, ledger]() {
+                JtUpdatePf, "OB" + std::to_string(ledger->seq() % 1000000000), [this, ledger]() {
                     update(ledger);
                 });
         }
@@ -210,7 +210,7 @@ OrderBookDBImpl::update(std::shared_ptr<ReadView const> const& ledger)
     JLOG(j_.debug()) << "Update completed (" << ledger->seq() << "): " << cnt << " books found";
 
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
         allBooks_.swap(allBooks);
         xrpBooks_.swap(xrpBooks);
         domainBooks_.swap(domainBooks);
@@ -225,7 +225,7 @@ OrderBookDBImpl::addOrderBook(Book const& book)
 {
     bool const toXRP = isXRP(book.out);
 
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     if (book.domain)
     {
@@ -253,7 +253,7 @@ OrderBookDBImpl::getBooksByTakerPays(Asset const& asset, std::optional<uint256>
     std::vector<Book> ret;
 
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
 
         auto getBooks = [&](auto const& container, auto const& key) {
             if (auto it = container.find(key); it != container.end())
@@ -282,7 +282,7 @@ OrderBookDBImpl::getBooksByTakerPays(Asset const& asset, std::optional<uint256>
 int
 OrderBookDBImpl::getBookSize(Asset const& asset, std::optional<uint256> const& domain)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     if (!domain)
     {
@@ -301,7 +301,7 @@ OrderBookDBImpl::getBookSize(Asset const& asset, std::optional<uint256> const& d
 bool
 OrderBookDBImpl::isBookToXRP(Asset const& asset, std::optional<Domain> const& domain)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
     if (domain)
         return xrpDomainBooks_.contains({asset, *domain});
     return xrpBooks_.contains(asset);
@@ -310,14 +310,14 @@ OrderBookDBImpl::isBookToXRP(Asset const& asset, std::optional<Domain> const& do
 BookListeners::pointer
 OrderBookDBImpl::makeBookListeners(Book const& book)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
     auto ret = getBookListeners(book);
 
     if (!ret)
     {
         ret = std::make_shared<BookListeners>();
 
-        mListeners[book] = ret;
+        listeners_[book] = ret;
         XRPL_ASSERT(
             getBookListeners(book) == ret,
             "xrpl::OrderBookDB::makeBookListeners : result roundtrip "
@@ -331,10 +331,10 @@ BookListeners::pointer
 OrderBookDBImpl::getBookListeners(Book const& book)
 {
     BookListeners::pointer ret;
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
-    auto it0 = mListeners.find(book);
-    if (it0 != mListeners.end())
+    auto it0 = listeners_.find(book);
+    if (it0 != listeners_.end())
         ret = it0->second;
 
     return ret;
@@ -348,7 +348,7 @@ OrderBookDBImpl::processTxn(
     AcceptedLedgerTx const& alTx,
     MultiApiJson const& jvObj)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     // For this particular transaction, maintain the set of unique
     // subscriptions that have already published it.  This prevents sending
diff --git a/src/xrpld/app/ledger/OrderBookDBImpl.h b/src/xrpld/app/ledger/OrderBookDBImpl.h
index a72669bef2..a50f512441 100644
--- a/src/xrpld/app/ledger/OrderBookDBImpl.h
+++ b/src/xrpld/app/ledger/OrderBookDBImpl.h
@@ -26,7 +26,7 @@ struct OrderBookDBConfig
     @return A new OrderBookDB instance
 */
 std::unique_ptr<OrderBookDB>
-make_OrderBookDB(ServiceRegistry& registry, OrderBookDBConfig const& config);
+makeOrderBookDb(ServiceRegistry& registry, OrderBookDBConfig const& config);
 
 class OrderBookDBImpl final : public OrderBookDB
 {
@@ -82,11 +82,11 @@ private:
     // does an order book to XRP exist
     hash_set<std::pair<Asset, Domain>> xrpDomainBooks_;
 
-    std::recursive_mutex mLock;
+    std::recursive_mutex lock_;
 
     using BookToListenersMap = hash_map<Book, BookListeners::pointer>;
 
-    BookToListenersMap mListeners;
+    BookToListenersMap listeners_;
 
     std::atomic<std::uint32_t> seq_;
 
diff --git a/src/xrpld/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h
index 1c5894d3bb..84cbf56e8b 100644
--- a/src/xrpld/app/ledger/TransactionMaster.h
+++ b/src/xrpld/app/ledger/TransactionMaster.h
@@ -24,10 +24,10 @@ public:
     operator=(TransactionMaster const&) = delete;
 
     std::shared_ptr<Transaction>
-    fetch_from_cache(uint256 const&);
+    fetchFromCache(uint256 const&);
 
     std::variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
-    fetch(uint256 const&, error_code_i& ec);
+    fetch(uint256 const&, ErrorCodeI& ec);
 
     /**
      * Fetch transaction from the cache or database.
@@ -39,7 +39,7 @@ public:
      *         the database while the search was conducted.
      */
     std::variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
-    fetch(uint256 const&, ClosedInterval<uint32_t> const& range, error_code_i& ec);
+    fetch(uint256 const&, ClosedInterval<uint32_t> const& range, ErrorCodeI& ec);
 
     std::shared_ptr<STTx const>
     fetch(
@@ -65,8 +65,8 @@ public:
     getCache();
 
 private:
-    Application& mApp;
-    TaggedCache<uint256, Transaction> mCache;
+    Application& app_;
+    TaggedCache<uint256, Transaction> cache_;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/TransactionStateSF.cpp b/src/xrpld/app/ledger/TransactionStateSF.cpp
index 201a2204a5..fc57c567eb 100644
--- a/src/xrpld/app/ledger/TransactionStateSF.cpp
+++ b/src/xrpld/app/ledger/TransactionStateSF.cpp
@@ -22,16 +22,15 @@ TransactionStateSF::gotNode(
 
 {
     XRPL_ASSERT(
-        type != SHAMapNodeType::tnTRANSACTION_NM,
-        "xrpl::TransactionStateSF::gotNode : valid input");
+        type != SHAMapNodeType::TnTransactionNm, "xrpl::TransactionStateSF::gotNode : valid input");
     db_.store(
-        NodeObjectType::hotTRANSACTION_NODE, std::move(nodeData), nodeHash.as_uint256(), ledgerSeq);
+        NodeObjectType::TransactionNode, std::move(nodeData), nodeHash.asUint256(), ledgerSeq);
 }
 
 std::optional<Blob>
 TransactionStateSF::getNode(SHAMapHash const& nodeHash) const
 {
-    return fp_.getFetchPack(nodeHash.as_uint256());
+    return fp_.getFetchPack(nodeHash.asUint256());
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/detail/BuildLedger.cpp b/src/xrpld/app/ledger/detail/BuildLedger.cpp
index c75b1e0a12..5143769178 100644
--- a/src/xrpld/app/ledger/detail/BuildLedger.cpp
+++ b/src/xrpld/app/ledger/detail/BuildLedger.cpp
@@ -13,8 +13,10 @@
 #include <xrpl/ledger/Ledger.h>
 #include <xrpl/ledger/OpenView.h>
 #include <xrpl/nodestore/NodeObject.h>
+#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/Protocol.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/tx/apply.h>
 
 #include <cstddef>
@@ -63,15 +65,15 @@ buildLedgerImpl(
         // Write the final version of all modified SHAMap
         // nodes to the node store to preserve the new LCL
 
-        int const asf = built->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
-        int const tmf = built->txMap().flushDirty(NodeObjectType::hotTRANSACTION_NODE);
+        int const asf = built->stateMap().flushDirty(NodeObjectType::AccountNode);
+        int const tmf = built->txMap().flushDirty(NodeObjectType::TransactionNode);
         JLOG(j.debug()) << "Flushed " << asf << " accounts and " << tmf << " transaction nodes";
     }
     built->unshare();
 
     // Accept ledger
     XRPL_ASSERT(
-        built->header().seq < XRP_LEDGER_EARLIEST_FEES || built->read(keylet::fees()),
+        built->header().seq < kXRP_LEDGER_EARLIEST_FEES || built->read(keylet::fees()),
         "xrpl::buildLedgerImpl : valid ledger fees");
     built->setAccepted(closeTime, closeResolution, closeTimeCorrect);
 
@@ -121,7 +123,7 @@ applyTransactions(
                     continue;
                 }
 
-                switch (applyTransaction(app, view, *it->second, certainRetry, tapNONE, j))
+                switch (applyTransaction(app, view, *it->second, certainRetry, TapNone, j))
                 {
                     case ApplyTransactionResult::Success:
                         it = txns.erase(it);
@@ -223,7 +225,7 @@ buildLedger(
     return buildLedgerImpl(
         replayData.parent(),
         replayLedger->header().closeTime,
-        ((replayLedger->header().closeFlags & sLCF_NoConsensusTime) == 0),
+        ((replayLedger->header().closeFlags & kS_LCF_NO_CONSENSUS_TIME) == 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 52636d08c6..b4082485d3 100644
--- a/src/xrpld/app/ledger/detail/InboundLedger.cpp
+++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp
@@ -21,9 +21,11 @@
 #include <xrpl/nodestore/Database.h>
 #include <xrpl/nodestore/NodeObject.h>
 #include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/LedgerHeader.h>
 #include <xrpl/protocol/Rules.h>
 #include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/Fees.h>
 #include <xrpl/shamap/SHAMapNodeID.h>
@@ -57,35 +59,35 @@ using namespace std::chrono_literals;
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Number of peers to start with
-    peerCountStart = 5
+    PeerCountStart = 5
 
     // Number of peers to add on a timeout
     ,
-    peerCountAdd = 3
+    PeerCountAdd = 3
 
     // how many timeouts before we give up
     ,
-    ledgerTimeoutRetriesMax = 6
+    LedgerTimeoutRetriesMax = 6
 
     // how many timeouts before we get aggressive
     ,
-    ledgerBecomeAggressiveThreshold = 4
+    LedgerBecomeAggressiveThreshold = 4
 
     // Number of nodes to find initially
     ,
-    missingNodesFind = 256
+    MissingNodesFind = 256
 
     // Number of nodes to request for a reply
     ,
-    reqNodesReply = 128
+    ReqNodesReply = 128
 
     // Number of nodes to request blindly
     ,
-    reqNodes = 12
+    ReqNodes = 12
 };
 
 // millisecond for each ledger timeout
-auto constexpr ledgerAcquireTimeout = 3000ms;
+auto constexpr kLEDGER_ACQUIRE_TIMEOUT = 3000ms;
 
 InboundLedger::InboundLedger(
     Application& app,
@@ -97,13 +99,13 @@ InboundLedger::InboundLedger(
     : TimeoutCounter(
           app,
           hash,
-          ledgerAcquireTimeout,
-          {.jobType = jtLEDGER_DATA, .jobName = "InboundLedger", .jobLimit = 5},
+          kLEDGER_ACQUIRE_TIMEOUT,
+          {.jobType = JtLedgerData, .jobName = "InboundLedger", .jobLimit = 5},
           app.getJournal("InboundLedger"))
-    , m_clock(clock)
-    , mSeq(seq)
-    , mReason(reason)
-    , mPeerSet(std::move(peerSet))
+    , clock_(clock)
+    , seq_(seq)
+    , reason_(reason)
+    , peerSet_(std::move(peerSet))
 {
     JLOG(journal_.trace()) << "Acquiring ledger " << hash_;
     touch();
@@ -129,24 +131,24 @@ InboundLedger::init(ScopedLockType& collectionLock)
     JLOG(journal_.debug()) << "Acquiring ledger we already have in "
                            << " local store. " << hash_;
     XRPL_ASSERT(
-        mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
+        ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
         "xrpl::InboundLedger::init : valid ledger fees");
-    mLedger->setImmutable();
+    ledger_->setImmutable();
 
-    if (mReason == Reason::HISTORY)
+    if (reason_ == Reason::HISTORY)
         return;
 
-    app_.getLedgerMaster().storeLedger(mLedger);
+    app_.getLedgerMaster().storeLedger(ledger_);
 
     // Check if this could be a newer fully-validated ledger
-    if (mReason == Reason::CONSENSUS)
-        app_.getLedgerMaster().checkAccept(mLedger);
+    if (reason_ == Reason::CONSENSUS)
+        app_.getLedgerMaster().checkAccept(ledger_);
 }
 
 std::size_t
 InboundLedger::getPeerCount() const
 {
-    auto const& peerIds = mPeerSet->getPeerIds();
+    auto const& peerIds = peerSet_->getPeerIds();
     return std::count_if(peerIds.begin(), peerIds.end(), [this](auto id) {
         return (app_.getOverlay().findPeerByShortID(id) != nullptr);
     });
@@ -158,8 +160,8 @@ InboundLedger::update(std::uint32_t seq)
     ScopedLockType const sl(mtx_);
 
     // If we didn't know the sequence number, but now do, save it
-    if ((seq != 0) && (mSeq == 0))
-        mSeq = seq;
+    if ((seq != 0) && (seq_ == 0))
+        seq_ = seq;
 
     // Prevent this from being swept
     touch();
@@ -171,9 +173,9 @@ InboundLedger::checkLocal()
     ScopedLockType const sl(mtx_);
     if (!isDone())
     {
-        if (mLedger)
+        if (ledger_)
         {
-            tryDB(mLedger->stateMap().family().db());
+            tryDB(ledger_->stateMap().family().db());
         }
         else
         {
@@ -192,7 +194,7 @@ InboundLedger::~InboundLedger()
 {
     // Save any received AS data not processed. It could be useful
     // for populating a different ledger
-    for (auto& entry : mReceivedData)
+    for (auto& entry : receivedData_)
     {
         if (entry.second->type() == protocol::liAS_NODE)
             app_.getInboundLedgers().gotStaleData(entry.second);
@@ -203,7 +205,7 @@ InboundLedger::~InboundLedger()
                                << ((timeouts_ == 0) ? std::string()
                                                     : (std::string("timeouts:") +
                                                        std::to_string(timeouts_) + " "))
-                               << mStats.get();
+                               << stats_.get();
     }
 }
 
@@ -233,13 +235,13 @@ neededHashes(uint256 const& root, SHAMap& map, int max, SHAMapSyncFilter* filter
 std::vector<uint256>
 InboundLedger::neededTxHashes(int max, SHAMapSyncFilter* filter) const
 {
-    return neededHashes(mLedger->header().txHash, mLedger->txMap(), max, filter);
+    return neededHashes(ledger_->header().txHash, ledger_->txMap(), max, filter);
 }
 
 std::vector<uint256>
 InboundLedger::neededStateHashes(int max, SHAMapSyncFilter* filter) const
 {
-    return neededHashes(mLedger->header().accountHash, mLedger->stateMap(), max, filter);
+    return neededHashes(ledger_->header().accountHash, ledger_->stateMap(), max, filter);
 }
 
 // See how much of the ledger data is stored locally
@@ -247,25 +249,25 @@ InboundLedger::neededStateHashes(int max, SHAMapSyncFilter* filter) const
 void
 InboundLedger::tryDB(NodeStore::Database& srcDB)
 {
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         auto makeLedger = [&, this](Blob const& data) {
             JLOG(journal_.trace()) << "Ledger header found in fetch pack";
             Rules const rules{app_.config().features};
-            mLedger = std::make_shared<Ledger>(
+            ledger_ = std::make_shared<Ledger>(
                 deserializePrefixedHeader(makeSlice(data)), rules, app_.getNodeFamily());
-            if (mLedger->header().hash != hash_ || (mSeq != 0 && mSeq != mLedger->header().seq))
+            if (ledger_->header().hash != hash_ || (seq_ != 0 && seq_ != ledger_->header().seq))
             {
                 // We know for a fact the ledger can never be acquired
                 JLOG(journal_.warn())
-                    << "hash " << hash_ << " seq " << std::to_string(mSeq) << " cannot be a ledger";
-                mLedger.reset();
+                    << "hash " << hash_ << " seq " << std::to_string(seq_) << " cannot be a ledger";
+                ledger_.reset();
                 failed_ = true;
             }
         };
 
         // Try to fetch the ledger header from the DB
-        if (auto nodeObject = srcDB.fetchNodeObject(hash_, mSeq))
+        if (auto nodeObject = srcDB.fetchNodeObject(hash_, seq_))
         {
             JLOG(journal_.trace()) << "Ledger header found in local store";
 
@@ -274,12 +276,11 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
                 return;
 
             // Store the ledger header if the source and destination differ
-            auto& dstDB{mLedger->stateMap().family().db()};
+            auto& dstDB{ledger_->stateMap().family().db()};
             if (std::addressof(dstDB) != std::addressof(srcDB))
             {
                 Blob blob{nodeObject->getData()};
-                dstDB.store(
-                    NodeObjectType::hotLEDGER, std::move(blob), hash_, mLedger->header().seq);
+                dstDB.store(NodeObjectType::Ledger, std::move(blob), hash_, ledger_->header().seq);
             }
         }
         else
@@ -296,65 +297,65 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
                 return;
 
             // Store the ledger header in the ledger's database
-            mLedger->stateMap().family().db().store(
-                NodeObjectType::hotLEDGER, std::move(*data), hash_, mLedger->header().seq);
+            ledger_->stateMap().family().db().store(
+                NodeObjectType::Ledger, std::move(*data), hash_, ledger_->header().seq);
         }
 
-        if (mSeq == 0)
-            mSeq = mLedger->header().seq;
-        mLedger->stateMap().setLedgerSeq(mSeq);
-        mLedger->txMap().setLedgerSeq(mSeq);
-        mHaveHeader = true;
+        if (seq_ == 0)
+            seq_ = ledger_->header().seq;
+        ledger_->stateMap().setLedgerSeq(seq_);
+        ledger_->txMap().setLedgerSeq(seq_);
+        haveHeader_ = true;
     }
 
-    if (!mHaveTransactions)
+    if (!haveTransactions_)
     {
-        if (mLedger->header().txHash.isZero())
+        if (ledger_->header().txHash.isZero())
         {
             JLOG(journal_.trace()) << "No TXNs to fetch";
-            mHaveTransactions = true;
+            haveTransactions_ = true;
         }
         else
         {
-            TransactionStateSF filter(mLedger->txMap().family().db(), app_.getLedgerMaster());
-            if (mLedger->txMap().fetchRoot(SHAMapHash{mLedger->header().txHash}, &filter))
+            TransactionStateSF filter(ledger_->txMap().family().db(), app_.getLedgerMaster());
+            if (ledger_->txMap().fetchRoot(SHAMapHash{ledger_->header().txHash}, &filter))
             {
                 if (neededTxHashes(1, &filter).empty())
                 {
                     JLOG(journal_.trace()) << "Had full txn map locally";
-                    mHaveTransactions = true;
+                    haveTransactions_ = true;
                 }
             }
         }
     }
 
-    if (!mHaveState)
+    if (!haveState_)
     {
-        if (mLedger->header().accountHash.isZero())
+        if (ledger_->header().accountHash.isZero())
         {
             JLOG(journal_.fatal()) << "We are acquiring a ledger with a zero account hash";
             failed_ = true;
             return;
         }
-        AccountStateSF filter(mLedger->stateMap().family().db(), app_.getLedgerMaster());
-        if (mLedger->stateMap().fetchRoot(SHAMapHash{mLedger->header().accountHash}, &filter))
+        AccountStateSF filter(ledger_->stateMap().family().db(), app_.getLedgerMaster());
+        if (ledger_->stateMap().fetchRoot(SHAMapHash{ledger_->header().accountHash}, &filter))
         {
             if (neededStateHashes(1, &filter).empty())
             {
                 JLOG(journal_.trace()) << "Had full AS map locally";
-                mHaveState = true;
+                haveState_ = true;
             }
         }
     }
 
-    if (mHaveTransactions && mHaveState)
+    if (haveTransactions_ && haveState_)
     {
         JLOG(journal_.debug()) << "Had everything locally";
         complete_ = true;
         XRPL_ASSERT(
-            mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
+            ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
             "xrpl::InboundLedger::tryDB : valid ledger fees");
-        mLedger->setImmutable();
+        ledger_->setImmutable();
     }
 }
 
@@ -363,7 +364,7 @@ InboundLedger::tryDB(NodeStore::Database& srcDB)
 void
 InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
 {
-    mRecentNodes.clear();
+    recentNodes_.clear();
 
     if (isDone())
     {
@@ -371,11 +372,11 @@ InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
         return;
     }
 
-    if (timeouts_ > ledgerTimeoutRetriesMax)
+    if (timeouts_ > LedgerTimeoutRetriesMax)
     {
-        if (mSeq != 0)
+        if (seq_ != 0)
         {
-            JLOG(journal_.warn()) << timeouts_ << " timeouts for ledger " << mSeq;
+            JLOG(journal_.warn()) << timeouts_ << " timeouts for ledger " << seq_;
         }
         else
         {
@@ -390,7 +391,7 @@ InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
     {
         checkLocal();
 
-        mByHash = true;
+        byHash_ = true;
 
         std::size_t const pc = getPeerCount();
         JLOG(journal_.debug()) << "No progress(" << pc << ") for ledger " << hash_;
@@ -399,11 +400,11 @@ InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
         // So if the reason IS HISTORY, need to trigger after we add
         // otherwise, we need to trigger before we add
         // so each peer gets triggered once
-        if (mReason != Reason::HISTORY)
-            trigger(nullptr, TriggerReason::timeout);
+        if (reason_ != Reason::HISTORY)
+            trigger(nullptr, TriggerReason::Timeout);
         addPeers();
-        if (mReason == Reason::HISTORY)
-            trigger(nullptr, TriggerReason::timeout);
+        if (reason_ == Reason::HISTORY)
+            trigger(nullptr, TriggerReason::Timeout);
     }
 }
 
@@ -411,14 +412,14 @@ InboundLedger::onTimer(bool wasProgress, ScopedLockType&)
 void
 InboundLedger::addPeers()
 {
-    mPeerSet->addPeers(
-        (getPeerCount() == 0) ? peerCountStart : peerCountAdd,
-        [this](auto peer) { return peer->hasLedger(hash_, mSeq); },
+    peerSet_->addPeers(
+        (getPeerCount() == 0) ? PeerCountStart : PeerCountAdd,
+        [this](auto peer) { return peer->hasLedger(hash_, seq_); },
         [this](auto peer) {
             // For historical nodes, do not trigger too soon
             // since a fetch pack is probably coming
-            if (mReason != Reason::HISTORY)
-                trigger(peer, TriggerReason::added);
+            if (reason_ != Reason::HISTORY)
+                trigger(peer, TriggerReason::Added);
         });
 }
 
@@ -431,39 +432,39 @@ InboundLedger::pmDowncast()
 void
 InboundLedger::done()
 {
-    if (mSignaled)
+    if (signaled_)
         return;
 
-    mSignaled = true;
+    signaled_ = true;
     touch();
 
     JLOG(journal_.debug()) << "Acquire " << hash_ << (failed_ ? " fail " : " ")
                            << ((timeouts_ == 0)
                                    ? std::string()
                                    : (std::string("timeouts:") + std::to_string(timeouts_) + " "))
-                           << mStats.get();
+                           << stats_.get();
 
     XRPL_ASSERT(complete_ || failed_, "xrpl::InboundLedger::done : complete or failed");
 
-    if (complete_ && !failed_ && mLedger)
+    if (complete_ && !failed_ && ledger_)
     {
         XRPL_ASSERT(
-            mLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || mLedger->read(keylet::fees()),
+            ledger_->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger_->read(keylet::fees()),
             "xrpl::InboundLedger::done : valid ledger fees");
-        mLedger->setImmutable();
-        switch (mReason)
+        ledger_->setImmutable();
+        switch (reason_)
         {
             case Reason::HISTORY:
                 app_.getInboundLedgers().onLedgerFetched();
                 break;
             default:
-                app_.getLedgerMaster().storeLedger(mLedger);
+                app_.getLedgerMaster().storeLedger(ledger_);
                 break;
         }
     }
 
     // We hold the PeerSet lock, so must dispatch
-    app_.getJobQueue().addJob(jtLEDGER_DATA, "AcqDone", [self = shared_from_this()]() {
+    app_.getJobQueue().addJob(JtLedgerData, "AcqDone", [self = shared_from_this()]() {
         if (self->complete_ && !self->failed_)
         {
             self->app_.getLedgerMaster().checkAccept(self->getLedger());
@@ -471,7 +472,7 @@ InboundLedger::done()
         }
         else
         {
-            self->app_.getInboundLedgers().logFailure(self->hash_, self->mSeq);
+            self->app_.getInboundLedgers().logFailure(self->hash_, self->seq_);
         }
     });
 }
@@ -503,12 +504,12 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
         }
         else
         {
-            ss << " header=" << mHaveHeader << " tx=" << mHaveTransactions << " as=" << mHaveState;
+            ss << " header=" << haveHeader_ << " tx=" << haveTransactions_ << " as=" << haveState_;
         }
         stream << ss.str();
     }
 
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         tryDB(app_.getNodeFamily().db());
         if (failed_)
@@ -526,7 +527,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_ && mByHash && (timeouts_ > ledgerBecomeAggressiveThreshold))
+        if (!progress_ && !failed_ && byHash_ && (timeouts_ > LedgerBecomeAggressiveThreshold))
         {
             auto need = getNeededHashes();
 
@@ -550,17 +551,17 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
                     {
                         protocol::TMIndexedObject* io = tmBH.add_objects();
                         io->set_hash(p.second.begin(), p.second.size());
-                        if (mSeq != 0)
-                            io->set_ledgerseq(mSeq);
+                        if (seq_ != 0)
+                            io->set_ledgerseq(seq_);
                     }
                 }
 
                 auto packet = std::make_shared<Message>(tmBH, protocol::mtGET_OBJECTS);
-                auto const& peerIds = mPeerSet->getPeerIds();
+                auto const& peerIds = peerSet_->getPeerIds();
                 std::ranges::for_each(peerIds, [this, &packet](auto id) {
                     if (auto p = app_.getOverlay().findPeerByShortID(id))
                     {
-                        mByHash = false;
+                        byHash_ = false;
                         p->send(packet);
                     }
                 });
@@ -568,9 +569,9 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
             else
             {
                 JLOG(journal_.info()) << "getNeededHashes says acquire is complete";
-                mHaveHeader = true;
-                mHaveTransactions = true;
-                mHaveState = true;
+                haveHeader_ = true;
+                haveTransactions_ = true;
+                haveState_ = true;
                 complete_ = true;
             }
         }
@@ -578,21 +579,21 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
 
     // We can't do much without the header data because we don't know the
     // state or transaction root hashes.
-    if (!mHaveHeader && !failed_)
+    if (!haveHeader_ && !failed_)
     {
         tmGL.set_itype(protocol::liBASE);
-        if (mSeq != 0)
-            tmGL.set_ledgerseq(mSeq);
+        if (seq_ != 0)
+            tmGL.set_ledgerseq(seq_);
         JLOG(journal_.trace()) << "Sending header request to "
                                << (peer ? "selected peer" : "all peers");
-        mPeerSet->sendRequest(tmGL, peer);
+        peerSet_->sendRequest(tmGL, peer);
         return;
     }
 
-    if (mLedger)
-        tmGL.set_ledgerseq(mLedger->header().seq);
+    if (ledger_)
+        tmGL.set_ledgerseq(ledger_->header().seq);
 
-    if (reason != TriggerReason::reply)
+    if (reason != TriggerReason::Reply)
     {
         // If we're querying blind, don't query deep
         tmGL.set_querydepth(0);
@@ -609,50 +610,50 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
 
     // Get the state data first because it's the most likely to be useful
     // if we wind up abandoning this fetch.
-    if (mHaveHeader && !mHaveState && !failed_)
+    if (haveHeader_ && !haveState_ && !failed_)
     {
         XRPL_ASSERT(
-            mLedger,
+            ledger_,
             "xrpl::InboundLedger::trigger : non-null ledger to read state "
             "from");
 
-        if (!mLedger->stateMap().isValid())
+        if (!ledger_->stateMap().isValid())
         {
             failed_ = true;
         }
-        else if (mLedger->stateMap().getHash().isZero())
+        else if (ledger_->stateMap().getHash().isZero())
         {
             // we need the root node
             tmGL.set_itype(protocol::liAS_NODE);
             *tmGL.add_nodeids() = SHAMapNodeID().getRawString();
             JLOG(journal_.trace())
                 << "Sending AS root request to " << (peer ? "selected peer" : "all peers");
-            mPeerSet->sendRequest(tmGL, peer);
+            peerSet_->sendRequest(tmGL, peer);
             return;
         }
         else
         {
-            AccountStateSF filter(mLedger->stateMap().family().db(), app_.getLedgerMaster());
+            AccountStateSF filter(ledger_->stateMap().family().db(), app_.getLedgerMaster());
 
             // Release the lock while we process the large state map
             sl.unlock();
-            auto nodes = mLedger->stateMap().getMissingNodes(missingNodesFind, &filter);
+            auto nodes = ledger_->stateMap().getMissingNodes(MissingNodesFind, &filter);
             sl.lock();
 
             // Make sure nothing happened while we released the lock
-            if (!failed_ && !complete_ && !mHaveState)
+            if (!failed_ && !complete_ && !haveState_)
             {
                 if (nodes.empty())
                 {
-                    if (!mLedger->stateMap().isValid())
+                    if (!ledger_->stateMap().isValid())
                     {
                         failed_ = true;
                     }
                     else
                     {
-                        mHaveState = true;
+                        haveState_ = true;
 
-                        if (mHaveTransactions)
+                        if (haveTransactions_)
                             complete_ = true;
                     }
                 }
@@ -670,7 +671,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
 
                         JLOG(journal_.trace()) << "Sending AS node request (" << nodes.size()
                                                << ") to " << (peer ? "selected peer" : "all peers");
-                        mPeerSet->sendRequest(tmGL, peer);
+                        peerSet_->sendRequest(tmGL, peer);
                         return;
                     }
 
@@ -680,44 +681,44 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
         }
     }
 
-    if (mHaveHeader && !mHaveTransactions && !failed_)
+    if (haveHeader_ && !haveTransactions_ && !failed_)
     {
         XRPL_ASSERT(
-            mLedger,
+            ledger_,
             "xrpl::InboundLedger::trigger : non-null ledger to read "
             "transactions from");
 
-        if (!mLedger->txMap().isValid())
+        if (!ledger_->txMap().isValid())
         {
             failed_ = true;
         }
-        else if (mLedger->txMap().getHash().isZero())
+        else if (ledger_->txMap().getHash().isZero())
         {
             // we need the root node
             tmGL.set_itype(protocol::liTX_NODE);
             *(tmGL.add_nodeids()) = SHAMapNodeID().getRawString();
             JLOG(journal_.trace())
                 << "Sending TX root request to " << (peer ? "selected peer" : "all peers");
-            mPeerSet->sendRequest(tmGL, peer);
+            peerSet_->sendRequest(tmGL, peer);
             return;
         }
         else
         {
-            TransactionStateSF filter(mLedger->txMap().family().db(), app_.getLedgerMaster());
+            TransactionStateSF filter(ledger_->txMap().family().db(), app_.getLedgerMaster());
 
-            auto nodes = mLedger->txMap().getMissingNodes(missingNodesFind, &filter);
+            auto nodes = ledger_->txMap().getMissingNodes(MissingNodesFind, &filter);
 
             if (nodes.empty())
             {
-                if (!mLedger->txMap().isValid())
+                if (!ledger_->txMap().isValid())
                 {
                     failed_ = true;
                 }
                 else
                 {
-                    mHaveTransactions = true;
+                    haveTransactions_ = true;
 
-                    if (mHaveState)
+                    if (haveState_)
                         complete_ = true;
                 }
             }
@@ -734,7 +735,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
                     }
                     JLOG(journal_.trace()) << "Sending TX node request (" << nodes.size() << ") to "
                                            << (peer ? "selected peer" : "all peers");
-                    mPeerSet->sendRequest(tmGL, peer);
+                    peerSet_->sendRequest(tmGL, peer);
                     return;
                 }
 
@@ -746,7 +747,7 @@ InboundLedger::trigger(std::shared_ptr<Peer> const& peer, TriggerReason reason)
     if (complete_ || failed_)
     {
         JLOG(journal_.debug()) << "Done:" << (complete_ ? " complete" : "")
-                               << (failed_ ? " failed " : " ") << mLedger->header().seq;
+                               << (failed_ ? " failed " : " ") << ledger_->header().seq;
         sl.unlock();
         done();
     }
@@ -760,7 +761,7 @@ InboundLedger::filterNodes(
     // Sort nodes so that the ones we haven't recently
     // requested come before the ones we have.
     auto dup = std::ranges::stable_partition(
-        nodes, [this](auto const& item) { return mRecentNodes.count(item.second) == 0; });
+        nodes, [this](auto const& item) { return recentNodes_.count(item.second) == 0; });
 
     // If everything is a duplicate we don't want to send
     // any query at all except on a timeout where we need
@@ -769,7 +770,7 @@ InboundLedger::filterNodes(
     {
         JLOG(journal_.trace()) << "filterNodes: all duplicates";
 
-        if (reason != TriggerReason::timeout)
+        if (reason != TriggerReason::Timeout)
         {
             nodes.clear();
             return;
@@ -782,13 +783,13 @@ InboundLedger::filterNodes(
         nodes.erase(dup.begin(), dup.end());
     }
 
-    std::size_t const limit = (reason == TriggerReason::reply) ? reqNodesReply : reqNodes;
+    std::size_t const limit = (reason == TriggerReason::Reply) ? ReqNodesReply : ReqNodes;
 
     if (nodes.size() > limit)
         nodes.resize(limit);
 
     for (auto const& n : nodes)
-        mRecentNodes.insert(n.second);
+        recentNodes_.insert(n.second);
 }
 
 /** Take ledger header data
@@ -801,38 +802,38 @@ InboundLedger::takeHeader(std::string const& data)
     // Return value: true=normal, false=bad data
     JLOG(journal_.trace()) << "got header acquiring ledger " << hash_;
 
-    if (complete_ || failed_ || mHaveHeader)
+    if (complete_ || failed_ || haveHeader_)
         return true;
 
     auto* f = &app_.getNodeFamily();
     Rules const rules{app_.config().features};
-    mLedger = std::make_shared<Ledger>(deserializeHeader(makeSlice(data)), rules, *f);
-    if (mLedger->header().hash != hash_ || (mSeq != 0 && mSeq != mLedger->header().seq))
+    ledger_ = std::make_shared<Ledger>(deserializeHeader(makeSlice(data)), rules, *f);
+    if (ledger_->header().hash != hash_ || (seq_ != 0 && seq_ != ledger_->header().seq))
     {
-        JLOG(journal_.warn()) << "Acquire hash mismatch: " << mLedger->header().hash
+        JLOG(journal_.warn()) << "Acquire hash mismatch: " << ledger_->header().hash
                               << "!=" << hash_;
-        mLedger.reset();
+        ledger_.reset();
         return false;
     }
-    if (mSeq == 0)
-        mSeq = mLedger->header().seq;
-    mLedger->stateMap().setLedgerSeq(mSeq);
-    mLedger->txMap().setLedgerSeq(mSeq);
-    mHaveHeader = true;
+    if (seq_ == 0)
+        seq_ = ledger_->header().seq;
+    ledger_->stateMap().setLedgerSeq(seq_);
+    ledger_->txMap().setLedgerSeq(seq_);
+    haveHeader_ = true;
 
     Serializer s(data.size() + 4);
-    s.add32(HashPrefix::ledgerMaster);
+    s.add32(HashPrefix::LedgerMaster);
     s.addRaw(data.data(), data.size());
-    f->db().store(NodeObjectType::hotLEDGER, std::move(s.modData()), hash_, mSeq);
+    f->db().store(NodeObjectType::Ledger, std::move(s.modData()), hash_, seq_);
 
-    if (mLedger->header().txHash.isZero())
-        mHaveTransactions = true;
+    if (ledger_->header().txHash.isZero())
+        haveTransactions_ = true;
 
-    if (mLedger->header().accountHash.isZero())
-        mHaveState = true;
+    if (ledger_->header().accountHash.isZero())
+        haveState_ = true;
 
-    mLedger->txMap().setSynching();
-    mLedger->stateMap().setSynching();
+    ledger_->txMap().setSynching();
+    ledger_->stateMap().setSynching();
 
     return true;
 }
@@ -843,7 +844,7 @@ InboundLedger::takeHeader(std::string const& data)
 void
 InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
 {
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         JLOG(journal_.warn()) << "Missing ledger header";
         san.incInvalid();
@@ -851,13 +852,13 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
     }
     if (packet.type() == protocol::liTX_NODE)
     {
-        if (mHaveTransactions || failed_)
+        if (haveTransactions_ || failed_)
         {
             san.incDuplicate();
             return;
         }
     }
-    else if (mHaveState || failed_)
+    else if (haveState_ || failed_)
     {
         san.incDuplicate();
         return;
@@ -868,16 +869,16 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
         if (packet.type() == protocol::liTX_NODE)
         {
             return {
-                mLedger->txMap(),
-                SHAMapHash{mLedger->header().txHash},
+                ledger_->txMap(),
+                SHAMapHash{ledger_->header().txHash},
                 std::make_unique<TransactionStateSF>(
-                    mLedger->txMap().family().db(), app_.getLedgerMaster())};
+                    ledger_->txMap().family().db(), app_.getLedgerMaster())};
         }
         return {
-            mLedger->stateMap(),
-            SHAMapHash{mLedger->header().accountHash},
+            ledger_->stateMap(),
+            SHAMapHash{ledger_->header().accountHash},
             std::make_unique<AccountStateSF>(
-                mLedger->stateMap().family().db(), app_.getLedgerMaster())};
+                ledger_->stateMap().family().db(), app_.getLedgerMaster())};
     }();
 
     try
@@ -918,14 +919,14 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
     {
         if (packet.type() == protocol::liTX_NODE)
         {
-            mHaveTransactions = true;
+            haveTransactions_ = true;
         }
         else
         {
-            mHaveState = true;
+            haveState_ = true;
         }
 
-        if (mHaveTransactions && mHaveState)
+        if (haveTransactions_ && haveState_)
         {
             complete_ = true;
             done();
@@ -939,13 +940,13 @@ InboundLedger::receiveNode(protocol::TMLedgerData& packet, SHAMapAddNode& san)
 bool
 InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
 {
-    if (failed_ || mHaveState)
+    if (failed_ || haveState_)
     {
         san.incDuplicate();
         return true;
     }
 
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::InboundLedger::takeAsRootNode : no ledger header");
@@ -953,9 +954,9 @@ InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
         // LCOV_EXCL_STOP
     }
 
-    AccountStateSF filter(mLedger->stateMap().family().db(), app_.getLedgerMaster());
+    AccountStateSF filter(ledger_->stateMap().family().db(), app_.getLedgerMaster());
     san +=
-        mLedger->stateMap().addRootNode(SHAMapHash{mLedger->header().accountHash}, data, &filter);
+        ledger_->stateMap().addRootNode(SHAMapHash{ledger_->header().accountHash}, data, &filter);
     return san.isGood();
 }
 
@@ -965,13 +966,13 @@ InboundLedger::takeAsRootNode(Slice const& data, SHAMapAddNode& san)
 bool
 InboundLedger::takeTxRootNode(Slice const& data, SHAMapAddNode& san)
 {
-    if (failed_ || mHaveTransactions)
+    if (failed_ || haveTransactions_)
     {
         san.incDuplicate();
         return true;
     }
 
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::InboundLedger::takeTxRootNode : no ledger header");
@@ -979,8 +980,8 @@ InboundLedger::takeTxRootNode(Slice const& data, SHAMapAddNode& san)
         // LCOV_EXCL_STOP
     }
 
-    TransactionStateSF filter(mLedger->txMap().family().db(), app_.getLedgerMaster());
-    san += mLedger->txMap().addRootNode(SHAMapHash{mLedger->header().txHash}, data, &filter);
+    TransactionStateSF filter(ledger_->txMap().family().db(), app_.getLedgerMaster());
+    san += ledger_->txMap().addRootNode(SHAMapHash{ledger_->header().txHash}, data, &filter);
     return san.isGood();
 }
 
@@ -989,24 +990,24 @@ InboundLedger::getNeededHashes()
 {
     std::vector<neededHash_t> ret;
 
-    if (!mHaveHeader)
+    if (!haveHeader_)
     {
         ret.emplace_back(protocol::TMGetObjectByHash::otLEDGER, hash_);
         return ret;
     }
 
-    if (!mHaveState)
+    if (!haveState_)
     {
-        AccountStateSF filter(mLedger->stateMap().family().db(), app_.getLedgerMaster());
+        AccountStateSF filter(ledger_->stateMap().family().db(), app_.getLedgerMaster());
         for (auto const& h : neededStateHashes(4, &filter))
         {
             ret.emplace_back(protocol::TMGetObjectByHash::otSTATE_NODE, h);
         }
     }
 
-    if (!mHaveTransactions)
+    if (!haveTransactions_)
     {
-        TransactionStateSF filter(mLedger->txMap().family().db(), app_.getLedgerMaster());
+        TransactionStateSF filter(ledger_->txMap().family().db(), app_.getLedgerMaster());
         for (auto const& h : neededTxHashes(4, &filter))
         {
             ret.emplace_back(protocol::TMGetObjectByHash::otTRANSACTION_NODE, h);
@@ -1024,17 +1025,17 @@ InboundLedger::gotData(
     std::weak_ptr<Peer> peer,
     std::shared_ptr<protocol::TMLedgerData> const& data)
 {
-    std::scoped_lock const sl(mReceivedDataLock);
+    std::scoped_lock const sl(receivedDataLock_);
 
     if (isDone())
         return false;
 
-    mReceivedData.emplace_back(peer, data);
+    receivedData_.emplace_back(peer, data);
 
-    if (mReceiveDispatched)
+    if (receiveDispatched_)
         return false;
 
-    mReceiveDispatched = true;
+    receiveDispatched_ = true;
     return true;
 }
 
@@ -1054,7 +1055,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::feeMalformedRequest, "ledger_data empty header");
+            peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data empty header");
             return -1;
         }
 
@@ -1064,25 +1065,25 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
 
         try
         {
-            if (!mHaveHeader)
+            if (!haveHeader_)
             {
                 if (!takeHeader(packet.nodes(0).nodedata()))
                 {
                     JLOG(journal_.warn()) << "Got invalid header data";
-                    peer->charge(Resource::feeMalformedRequest, "ledger_data invalid header");
+                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data invalid header");
                     return -1;
                 }
 
                 san.incUseful();
             }
 
-            if (!mHaveState && (packet.nodes().size() > 1) &&
+            if (!haveState_ && (packet.nodes().size() > 1) &&
                 !takeAsRootNode(makeSlice(packet.nodes(1).nodedata()), san))
             {
                 JLOG(journal_.warn()) << "Included AS root invalid";
             }
 
-            if (!mHaveTransactions && (packet.nodes().size() > 2) &&
+            if (!haveTransactions_ && (packet.nodes().size() > 2) &&
                 !takeTxRootNode(makeSlice(packet.nodes(2).nodedata()), san))
             {
                 JLOG(journal_.warn()) << "Included TX root invalid";
@@ -1092,14 +1093,14 @@ 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::feeInvalidData, "ledger_data "s + ex.what());
+            peer->charge(Resource::kFEE_INVALID_DATA, "ledger_data "s + ex.what());
             return -1;
         }
 
         if (san.isUseful())
             progress_ = true;
 
-        mStats += san;
+        stats_ += san;
         return san.getGood();
     }
 
@@ -1108,7 +1109,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::feeMalformedRequest, "ledger_data no nodes");
+            peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data no nodes");
             return -1;
         }
 
@@ -1120,7 +1121,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::feeMalformedRequest, "ledger_data bad node");
+                peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data bad node");
                 return -1;
             }
         }
@@ -1135,7 +1136,7 @@ InboundLedger::processData(std::shared_ptr<Peer> peer, protocol::TMLedgerData& p
         if (san.isUseful())
             progress_ = true;
 
-        mStats += san;
+        stats_ += san;
         return san.getGood();
     }
 
@@ -1222,9 +1223,9 @@ void
 InboundLedger::runData()
 {
     // Maximum number of peers to request data from
-    constexpr std::size_t maxUsefulPeers = 6;
+    constexpr std::size_t kMAX_USEFUL_PEERS = 6;
 
-    decltype(mReceivedData) data;
+    decltype(receivedData_) data;
 
     // Reserve some memory so the first couple iterations don't reallocate
     data.reserve(8);
@@ -1236,15 +1237,15 @@ InboundLedger::runData()
         data.clear();
 
         {
-            std::scoped_lock const sl(mReceivedDataLock);
+            std::scoped_lock const sl(receivedDataLock_);
 
-            if (mReceivedData.empty())
+            if (receivedData_.empty())
             {
-                mReceiveDispatched = false;
+                receiveDispatched_ = false;
                 break;
             }
 
-            data.swap(mReceivedData);
+            data.swap(receivedData_);
         }
 
         for (auto& entry : data)
@@ -1260,15 +1261,15 @@ InboundLedger::runData()
     // Select a random sample of the peers that gives us the most nodes that are
     // useful
     dataCounts.prune();
-    dataCounts.sampleN(maxUsefulPeers, [&](std::shared_ptr<Peer> const& peer) {
-        trigger(peer, TriggerReason::reply);
+    dataCounts.sampleN(kMAX_USEFUL_PEERS, [&](std::shared_ptr<Peer> const& peer) {
+        trigger(peer, TriggerReason::Reply);
     });
 }
 
-Json::Value
+json::Value
 InboundLedger::getJson(int)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ScopedLockType const sl(mtx_);
 
@@ -1281,21 +1282,21 @@ InboundLedger::getJson(int)
         ret[jss::failed] = true;
 
     if (!complete_ && !failed_)
-        ret[jss::peers] = static_cast<int>(mPeerSet->getPeerIds().size());
+        ret[jss::peers] = static_cast<int>(peerSet_->getPeerIds().size());
 
-    ret[jss::have_header] = mHaveHeader;
+    ret[jss::have_header] = haveHeader_;
 
-    if (mHaveHeader)
+    if (haveHeader_)
     {
-        ret[jss::have_state] = mHaveState;
-        ret[jss::have_transactions] = mHaveTransactions;
+        ret[jss::have_state] = haveState_;
+        ret[jss::have_transactions] = haveTransactions_;
     }
 
     ret[jss::timeouts] = timeouts_;
 
-    if (mHaveHeader && !mHaveState)
+    if (haveHeader_ && !haveState_)
     {
-        Json::Value hv(Json::arrayValue);
+        json::Value hv(json::ArrayValue);
         for (auto const& h : neededStateHashes(16, nullptr))
         {
             hv.append(to_string(h));
@@ -1303,9 +1304,9 @@ InboundLedger::getJson(int)
         ret[jss::needed_state_hashes] = hv;
     }
 
-    if (mHaveHeader && !mHaveTransactions)
+    if (haveHeader_ && !haveTransactions_)
     {
-        Json::Value hv(Json::arrayValue);
+        json::Value hv(json::ArrayValue);
         for (auto const& h : neededTxHashes(16, nullptr))
         {
             hv.append(to_string(h));
diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp
index a882f5be73..a175528978 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 kReacquireInterval{5};
+    static constexpr std::chrono::minutes const kREACQUIRE_INTERVAL{5};
 
     InboundLedgersImp(
         Application& app,
@@ -63,10 +63,10 @@ public:
         : app_(app)
         , fetchRate_(clock.now())
         , j_(app.getJournal("InboundLedger"))
-        , m_clock(clock)
-        , mRecentFailures(clock)
-        , mCounter(collector->make_counter("ledger_fetches"))
-        , mPeerSetBuilder(std::move(peerSetBuilder))
+        , clock_(clock)
+        , recentFailures_(clock)
+        , counter_(collector->makeCounter("ledger_fetches"))
+        , peerSetBuilder_(std::move(peerSetBuilder))
     {
     }
 
@@ -86,14 +86,14 @@ public:
             bool isNew = true;
             std::shared_ptr<InboundLedger> inbound;
             {
-                ScopedLockType sl(mLock);
+                ScopedLockType sl(lock_);
                 if (stopping_)
                 {
                     return {};
                 }
 
-                auto it = mLedgers.find(hash);
-                if (it != mLedgers.end())
+                auto it = ledgers_.find(hash);
+                if (it != ledgers_.end())
                 {
                     isNew = false;
                     inbound = it->second;
@@ -101,10 +101,10 @@ public:
                 else
                 {
                     inbound = std::make_shared<InboundLedger>(
-                        app_, hash, seq, reason, std::ref(m_clock), mPeerSetBuilder->build());
-                    mLedgers.emplace(hash, inbound);
+                        app_, hash, seq, reason, std::ref(clock_), peerSetBuilder_->build());
+                    ledgers_.emplace(hash, inbound);
                     inbound->init(sl);
-                    ++mCounter;
+                    ++counter_;
                 }
             }
 
@@ -135,7 +135,7 @@ public:
             if (pendingAcquires_.contains(hash))
                 return;
             pendingAcquires_.insert(hash);
-            scope_unlock const unlock(lock);
+            ScopeUnlock const unlock(lock);
             acquire(hash, seq, reason);
         }
         catch (std::exception const& e)
@@ -158,10 +158,10 @@ public:
         std::shared_ptr<InboundLedger> ret;
 
         {
-            ScopedLockType const sl(mLock);
+            ScopedLockType const sl(lock_);
 
-            auto it = mLedgers.find(hash);
-            if (it != mLedgers.end())
+            auto it = ledgers_.find(hash);
+            if (it != ledgers_.end())
             {
                 ret = it->second;
             }
@@ -200,7 +200,7 @@ public:
             if (ledger->gotData(std::weak_ptr<Peer>(peer), packet))
             {
                 app_.getJobQueue().addJob(
-                    jtLEDGER_DATA, "ProcessLData", [ledger]() { ledger->runData(); });
+                    JtLedgerData, "ProcessLData", [ledger]() { ledger->runData(); });
             }
 
             return true;
@@ -213,7 +213,7 @@ public:
         if (packet->type() == protocol::liAS_NODE)
         {
             app_.getJobQueue().addJob(
-                jtLEDGER_DATA, "GotStaleData", [this, packet]() { gotStaleData(packet); });
+                JtLedgerData, "GotStaleData", [this, packet]() { gotStaleData(packet); });
         }
 
         return false;
@@ -222,18 +222,18 @@ public:
     void
     logFailure(uint256 const& h, std::uint32_t seq) override
     {
-        ScopedLockType const sl(mLock);
+        ScopedLockType const sl(lock_);
 
-        mRecentFailures.emplace(h, seq);
+        recentFailures_.emplace(h, seq);
     }
 
     bool
     isFailure(uint256 const& h) override
     {
-        ScopedLockType const sl(mLock);
+        ScopedLockType const sl(lock_);
 
-        beast::expire(mRecentFailures, kReacquireInterval);
-        return mRecentFailures.find(h) != mRecentFailures.end();
+        beast::expire(recentFailures_, kREACQUIRE_INTERVAL);
+        return recentFailures_.find(h) != recentFailures_.end();
     }
 
     /** We got some data for a ledger we are no longer acquiring Since we paid
@@ -243,14 +243,14 @@ public:
         format
     */
     void
-    gotStaleData(std::shared_ptr<protocol::TMLedgerData> packet_ptr) override
+    gotStaleData(std::shared_ptr<protocol::TMLedgerData> packetPtr) override
     {
         Serializer s;
         try
         {
-            for (int i = 0; i < packet_ptr->nodes().size(); ++i)
+            for (int i = 0; i < packetPtr->nodes().size(); ++i)
             {
-                auto const& node = packet_ptr->nodes(i);
+                auto const& node = packetPtr->nodes(i);
 
                 if (!node.has_nodeid() || !node.has_nodedata())
                     return;
@@ -264,7 +264,7 @@ public:
                 newNode->serializeWithPrefix(s);
 
                 app_.getLedgerMaster().addFetchPack(
-                    newNode->getHash().as_uint256(), std::make_shared<Blob>(s.begin(), s.end()));
+                    newNode->getHash().asUint256(), std::make_shared<Blob>(s.begin(), s.end()));
             }
         }
         catch (std::exception const&)  // NOLINT(bugprone-empty-catch)
@@ -275,17 +275,17 @@ public:
     void
     clearFailures() override
     {
-        ScopedLockType const sl(mLock);
+        ScopedLockType const sl(lock_);
 
-        mRecentFailures.clear();
-        mLedgers.clear();
+        recentFailures_.clear();
+        ledgers_.clear();
     }
 
     std::size_t
     fetchRate() override
     {
         std::scoped_lock const lock(fetchRateMutex_);
-        return 60 * fetchRate_.value(m_clock.now());
+        return 60 * fetchRate_.value(clock_.now());
     }
 
     // Should only be called with an inboundledger that has
@@ -294,26 +294,26 @@ public:
     onLedgerFetched() override
     {
         std::scoped_lock const lock(fetchRateMutex_);
-        fetchRate_.add(1, m_clock.now());
+        fetchRate_.add(1, clock_.now());
     }
 
-    Json::Value
+    json::Value
     getInfo() override
     {
-        Json::Value ret(Json::objectValue);
+        json::Value ret(json::ObjectValue);
 
         std::vector<std::pair<uint256, std::shared_ptr<InboundLedger>>> acqs;
 
         {
-            ScopedLockType const sl(mLock);
+            ScopedLockType const sl(lock_);
 
-            acqs.reserve(mLedgers.size());
-            for (auto const& it : mLedgers)
+            acqs.reserve(ledgers_.size());
+            for (auto const& it : ledgers_)
             {
                 XRPL_ASSERT(it.second, "xrpl::InboundLedgersImp::getInfo : non-null ledger");
                 acqs.emplace_back(it);
             }
-            for (auto const& it : mRecentFailures)
+            for (auto const& it : recentFailures_)
             {
                 if (it.second > 1)
                 {
@@ -348,10 +348,10 @@ public:
     {
         std::vector<std::shared_ptr<InboundLedger>> acquires;
         {
-            ScopedLockType const sl(mLock);
+            ScopedLockType const sl(lock_);
 
-            acquires.reserve(mLedgers.size());
-            for (auto const& it : mLedgers)
+            acquires.reserve(ledgers_.size());
+            for (auto const& it : ledgers_)
             {
                 XRPL_ASSERT(
                     it.second,
@@ -370,20 +370,20 @@ public:
     void
     sweep() override
     {
-        auto const start = m_clock.now();
+        auto const start = clock_.now();
 
         // Make a list of things to sweep, while holding the lock
         std::vector<MapType::mapped_type> stuffToSweep;
         std::size_t total = 0;
 
         {
-            ScopedLockType const sl(mLock);
-            MapType::iterator it(mLedgers.begin());
-            total = mLedgers.size();
+            ScopedLockType const sl(lock_);
+            MapType::iterator it(ledgers_.begin());
+            total = ledgers_.size();
 
             stuffToSweep.reserve(total);
 
-            while (it != mLedgers.end())
+            while (it != ledgers_.end())
             {
                 auto const la = it->second->getLastAction();
 
@@ -397,7 +397,7 @@ public:
                     stuffToSweep.push_back(it->second);
                     // shouldn't cause the actual final delete
                     // since we are holding a reference in the vector.
-                    it = mLedgers.erase(it);
+                    it = ledgers_.erase(it);
                 }
                 else
                 {
@@ -405,47 +405,47 @@ public:
                 }
             }
 
-            beast::expire(mRecentFailures, kReacquireInterval);
+            beast::expire(recentFailures_, kREACQUIRE_INTERVAL);
         }
 
         JLOG(j_.debug())
             << "Swept " << stuffToSweep.size() << " out of " << total
             << " inbound ledgers. Duration: "
-            << std::chrono::duration_cast<std::chrono::milliseconds>(m_clock.now() - start).count()
+            << std::chrono::duration_cast<std::chrono::milliseconds>(clock_.now() - start).count()
             << "ms";
     }
 
     void
     stop() override
     {
-        ScopedLockType const lock(mLock);
+        ScopedLockType const lock(lock_);
         stopping_ = true;
-        mLedgers.clear();
-        mRecentFailures.clear();
+        ledgers_.clear();
+        recentFailures_.clear();
     }
 
     std::size_t
     cacheSize() override
     {
-        ScopedLockType const lock(mLock);
-        return mLedgers.size();
+        ScopedLockType const lock(lock_);
+        return ledgers_.size();
     }
 
 private:
-    clock_type& m_clock;
+    clock_type& clock_;
 
     using ScopedLockType = std::unique_lock<std::recursive_mutex>;
-    std::recursive_mutex mLock;
+    std::recursive_mutex lock_;
 
     bool stopping_ = false;
     using MapType = hash_map<uint256, std::shared_ptr<InboundLedger>>;
-    MapType mLedgers;
+    MapType ledgers_;
 
-    beast::aged_map<uint256, std::uint32_t> mRecentFailures;
+    beast::aged_map<uint256, std::uint32_t> recentFailures_;
 
-    beast::insight::Counter mCounter;
+    beast::insight::Counter counter_;
 
-    std::unique_ptr<PeerSetBuilder> mPeerSetBuilder;
+    std::unique_ptr<PeerSetBuilder> peerSetBuilder_;
 
     std::set<uint256> pendingAcquires_;
     std::mutex acquiresMutex_;
@@ -454,12 +454,12 @@ private:
 //------------------------------------------------------------------------------
 
 std::unique_ptr<InboundLedgers>
-make_InboundLedgers(
+makeInboundLedgers(
     Application& app,
     InboundLedgers::clock_type& clock,
     beast::insight::Collector::ptr const& collector)
 {
-    return std::make_unique<InboundLedgersImp>(app, clock, collector, make_PeerSetBuilder(app));
+    return std::make_unique<InboundLedgersImp>(app, clock, collector, makePeerSetBuilder(app));
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
index cbf0ac04d5..598a8b5c4c 100644
--- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp
+++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp
@@ -31,26 +31,26 @@ namespace xrpl {
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Ideal number of peers to start with
-    startPeers = 2,
+    StartPeers = 2,
 
     // How many rounds to keep a set
-    setKeepRounds = 3,
+    SetKeepRounds = 3,
 };
 
 class InboundTransactionSet
 {
     // A transaction set we generated, acquired, or are acquiring
 public:
-    std::uint32_t mSeq;
-    TransactionAcquire::pointer mAcquire;
-    std::shared_ptr<SHAMap> mSet;
+    std::uint32_t seq;
+    TransactionAcquire::pointer acquire;
+    std::shared_ptr<SHAMap> set;
 
     InboundTransactionSet(std::uint32_t seq, std::shared_ptr<SHAMap> const& set)
-        : mSeq(seq), mSet(set)
+        : seq(seq), set(set)
     {
         ;
     }
-    InboundTransactionSet() : mSeq(0)
+    InboundTransactionSet() : seq(0)
     {
         ;
     }
@@ -65,26 +65,26 @@ public:
         std::function<void(std::shared_ptr<SHAMap> const&, bool)> gotSet,
         std::unique_ptr<PeerSetBuilder> peerSetBuilder)
         : app_(app)
-        , m_zeroSet(m_map[uint256()])
-        , m_gotSet(std::move(gotSet))
-        , m_peerSetBuilder(std::move(peerSetBuilder))
+        , zeroSet_(map_[uint256()])
+        , gotSet_(std::move(gotSet))
+        , peerSetBuilder_(std::move(peerSetBuilder))
         , j_(app_.getJournal("InboundTransactions"))
     {
-        m_zeroSet.mSet =
+        zeroSet_.set =
             std::make_shared<SHAMap>(SHAMapType::TRANSACTION, uint256(), app_.getNodeFamily());
-        m_zeroSet.mSet->setUnbacked();
+        zeroSet_.set->setUnbacked();
     }
 
     TransactionAcquire::pointer
     getAcquire(uint256 const& hash)
     {
         {
-            std::scoped_lock const sl(mLock);
+            std::scoped_lock const sl(lock_);
 
-            auto it = m_map.find(hash);
+            auto it = map_.find(hash);
 
-            if (it != m_map.end())
-                return it->second.mAcquire;
+            if (it != map_.end())
+                return it->second.acquire;
         }
         return {};
     }
@@ -95,32 +95,32 @@ public:
         TransactionAcquire::pointer ta;
 
         {
-            std::scoped_lock const sl(mLock);
+            std::scoped_lock const sl(lock_);
 
-            if (auto it = m_map.find(hash); it != m_map.end())
+            if (auto it = map_.find(hash); it != map_.end())
             {
                 if (acquire)
                 {
-                    it->second.mSeq = m_seq;
-                    if (it->second.mAcquire)
+                    it->second.seq = seq_;
+                    if (it->second.acquire)
                     {
-                        it->second.mAcquire->stillNeed();
+                        it->second.acquire->stillNeed();
                     }
                 }
-                return it->second.mSet;
+                return it->second.set;
             }
 
             if (!acquire || stopping_)
                 return std::shared_ptr<SHAMap>();
 
-            ta = std::make_shared<TransactionAcquire>(app_, hash, m_peerSetBuilder->build());
+            ta = std::make_shared<TransactionAcquire>(app_, hash, peerSetBuilder_->build());
 
-            auto& obj = m_map[hash];
-            obj.mAcquire = ta;
-            obj.mSeq = m_seq;
+            auto& obj = map_[hash];
+            obj.acquire = ta;
+            obj.seq = seq_;
         }
 
-        ta->init(startPeers);
+        ta->init(StartPeers);
 
         return {};
     }
@@ -131,9 +131,9 @@ public:
     gotData(
         LedgerHash const& hash,
         std::shared_ptr<Peer> peer,
-        std::shared_ptr<protocol::TMLedgerData> packet_ptr) override
+        std::shared_ptr<protocol::TMLedgerData> packetPtr) override
     {
-        protocol::TMLedgerData const& packet = *packet_ptr;
+        protocol::TMLedgerData const& packet = *packetPtr;
 
         JLOG(j_.trace()) << "Got data (" << packet.nodes().size()
                          << ") for acquiring ledger: " << hash;
@@ -142,7 +142,7 @@ public:
 
         if (ta == nullptr)
         {
-            peer->charge(Resource::feeUselessData, "ledger_data");
+            peer->charge(Resource::kFEE_USELESS_DATA, "ledger_data");
             return;
         }
 
@@ -153,7 +153,7 @@ public:
         {
             if (!node.has_nodeid() || !node.has_nodedata())
             {
-                peer->charge(Resource::feeMalformedRequest, "ledger_data");
+                peer->charge(Resource::kFEE_MALFORMED_REQUEST, "ledger_data");
                 return;
             }
 
@@ -161,7 +161,7 @@ public:
 
             if (!id)
             {
-                peer->charge(Resource::feeInvalidData, "ledger_data");
+                peer->charge(Resource::kFEE_INVALID_DATA, "ledger_data");
                 return;
             }
 
@@ -169,7 +169,7 @@ public:
         }
 
         if (!ta->takeNodes(data, peer).isUseful())
-            peer->charge(Resource::feeUselessData, "ledger_data not useful");
+            peer->charge(Resource::kFEE_USELESS_DATA, "ledger_data not useful");
     }
 
     void
@@ -178,50 +178,50 @@ public:
         bool isNew = true;
 
         {
-            std::scoped_lock const sl(mLock);
+            std::scoped_lock const sl(lock_);
 
-            auto& inboundSet = m_map[hash];
+            auto& inboundSet = map_[hash];
 
-            inboundSet.mSeq = std::max(inboundSet.mSeq, m_seq);
+            inboundSet.seq = std::max(inboundSet.seq, seq_);
 
-            if (inboundSet.mSet)
+            if (inboundSet.set)
             {
                 isNew = false;
             }
             else
             {
-                inboundSet.mSet = set;
+                inboundSet.set = set;
             }
 
-            inboundSet.mAcquire.reset();
+            inboundSet.acquire.reset();
         }
 
         if (isNew)
-            m_gotSet(set, fromAcquire);
+            gotSet_(set, fromAcquire);
     }
 
     void
     newRound(std::uint32_t seq) override
     {
-        std::scoped_lock const lock(mLock);
+        std::scoped_lock const lock(lock_);
 
         // Protect zero set from expiration
-        m_zeroSet.mSeq = seq;
+        zeroSet_.seq = seq;
 
-        if (m_seq != seq)
+        if (seq_ != seq)
         {
-            m_seq = seq;
+            seq_ = seq;
 
-            auto it = m_map.begin();
+            auto it = map_.begin();
 
-            std::uint32_t const minSeq = (seq < setKeepRounds) ? 0 : (seq - setKeepRounds);
-            std::uint32_t const maxSeq = seq + setKeepRounds;
+            std::uint32_t const minSeq = (seq < SetKeepRounds) ? 0 : (seq - SetKeepRounds);
+            std::uint32_t const maxSeq = seq + SetKeepRounds;
 
-            while (it != m_map.end())
+            while (it != map_.end())
             {
-                if (it->second.mSeq < minSeq || it->second.mSeq > maxSeq)
+                if (it->second.seq < minSeq || it->second.seq > maxSeq)
                 {
-                    it = m_map.erase(it);
+                    it = map_.erase(it);
                 }
                 else
                 {
@@ -234,9 +234,9 @@ public:
     void
     stop() override
     {
-        std::scoped_lock const lock(mLock);
+        std::scoped_lock const lock(lock_);
         stopping_ = true;
-        m_map.clear();
+        map_.clear();
     }
 
 private:
@@ -244,18 +244,18 @@ private:
 
     Application& app_;
 
-    std::recursive_mutex mLock;
+    std::recursive_mutex lock_;
 
     bool stopping_{false};
-    MapType m_map;
-    std::uint32_t m_seq{0};
+    MapType map_;
+    std::uint32_t seq_{0};
 
     // The empty transaction set whose hash is zero
-    InboundTransactionSet& m_zeroSet;
+    InboundTransactionSet& zeroSet_;
 
-    std::function<void(std::shared_ptr<SHAMap> const&, bool)> m_gotSet;
+    std::function<void(std::shared_ptr<SHAMap> const&, bool)> gotSet_;
 
-    std::unique_ptr<PeerSetBuilder> m_peerSetBuilder;
+    std::unique_ptr<PeerSetBuilder> peerSetBuilder_;
 
     beast::Journal j_;
 };
@@ -265,13 +265,13 @@ private:
 InboundTransactions::~InboundTransactions() = default;
 
 std::unique_ptr<InboundTransactions>
-make_InboundTransactions(
+makeInboundTransactions(
     Application& app,
     beast::insight::Collector::ptr const& collector,
     std::function<void(std::shared_ptr<SHAMap> const&, bool)> gotSet)
 {
     return std::make_unique<InboundTransactionsImp>(
-        app, collector, std::move(gotSet), make_PeerSetBuilder(app));
+        app, collector, std::move(gotSet), makePeerSetBuilder(app));
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
index d500c8ee7b..86201ca627 100644
--- a/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerCleaner.cpp
@@ -56,8 +56,8 @@ class LedgerCleanerImp : public LedgerCleaner
 
     std::thread thread_;
 
-    enum class State : char { notCleaning = 0, cleaning };
-    State state_ = State::notCleaning;
+    enum class State : char { NotCleaning = 0, Cleaning };
+    State state_ = State::NotCleaning;
     bool shouldExit_ = false;
 
     // The lowest ledger in the range we're checking.
@@ -84,7 +84,7 @@ public:
     ~LedgerCleanerImp() override
     {
         if (thread_.joinable())
-            LogicError("LedgerCleanerImp::stop not called.");
+            logicError("LedgerCleanerImp::stop not called.");
     }
 
     void
@@ -139,7 +139,7 @@ public:
     //--------------------------------------------------------------------------
 
     void
-    clean(Json::Value const& params) override
+    clean(json::Value const& params) override
     {
         LedgerIndex minRange = 0;
         LedgerIndex maxRange = 0;
@@ -211,7 +211,7 @@ public:
             if (params.isMember(jss::stop) && params[jss::stop].asBool())
                 minRange_ = maxRange_ = 0;
 
-            state_ = State::cleaning;
+            state_ = State::Cleaning;
             wakeup_.notify_one();
         }
     }
@@ -232,11 +232,11 @@ private:
         {
             {
                 std::unique_lock<std::mutex> lock(mutex_);
-                state_ = State::notCleaning;
-                wakeup_.wait(lock, [this]() { return (shouldExit_ || state_ == State::cleaning); });
+                state_ = State::NotCleaning;
+                wakeup_.wait(lock, [this]() { return (shouldExit_ || state_ == State::Cleaning); });
                 if (shouldExit_)
                     break;
-                XRPL_ASSERT(state_ == State::cleaning, "xrpl::LedgerCleanerImp::run : is cleaning");
+                XRPL_ASSERT(state_ == State::Cleaning, "xrpl::LedgerCleanerImp::run : is cleaning");
             }
             doLedgerCleaner();
         }
@@ -257,7 +257,7 @@ private:
             app_.getInboundLedgers().acquire(
                 ledger->header().hash, ledger->header().seq, InboundLedger::Reason::GENERIC);
         }
-        return hash ? *hash : beast::zero;  // kludge
+        return hash ? *hash : beast::kZERO;  // kludge
     }
 
     /** Process a single ledger
@@ -449,7 +449,7 @@ private:
 };
 
 std::unique_ptr<LedgerCleaner>
-make_LedgerCleaner(Application& app, beast::Journal journal)
+makeLedgerCleaner(Application& app, beast::Journal journal)
 {
     return std::make_unique<LedgerCleanerImp>(app, journal);
 }
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.cpp
index 0ff9a0ed98..9ebe890ae1 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::SUB_TASK_TIMEOUT,
-          {.jobType = jtREPLAY_TASK,
+          LedgerReplayParameters::kSUB_TASK_TIMEOUT,
+          {.jobType = JtReplayTask,
            .jobName = "LedReplDelta",
-           .jobLimit = LedgerReplayParameters::MAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
           app.getJournal("LedgerReplayDelta"))
     , inboundLedgers_(inboundLedgers)
     , ledgerSeq_(ledgerSeq)
@@ -99,10 +99,10 @@ LedgerDeltaAcquire::trigger(std::size_t limit, ScopedLockType& sl)
                 }
                 else
                 {
-                    if (++noFeaturePeerCount >= LedgerReplayParameters::MAX_NO_FEATURE_PEER_COUNT)
+                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMAX_NO_FEATURE_PEER_COUNT)
                     {
                         JLOG(journal_.debug()) << "Fall back for " << hash_;
-                        timerInterval_ = LedgerReplayParameters::SUB_TASK_FALLBACK_TIMEOUT;
+                        timerInterval_ = LedgerReplayParameters::kSUB_TASK_FALLBACK_TIMEOUT;
                         fallBack_ = true;
                     }
                 }
@@ -116,8 +116,8 @@ LedgerDeltaAcquire::trigger(std::size_t limit, ScopedLockType& sl)
 void
 LedgerDeltaAcquire::onTimer(bool progress, ScopedLockType& sl)
 {
-    JLOG(journal_.trace()) << "mTimeouts=" << timeouts_ << " for " << hash_;
-    if (timeouts_ > LedgerReplayParameters::SUB_TASK_MAX_TIMEOUTS)
+    JLOG(journal_.trace()) << "timeouts_=" << timeouts_ << " for " << hash_;
+    if (timeouts_ > LedgerReplayParameters::kSUB_TASK_MAX_TIMEOUTS)
     {
         failed_ = true;
         JLOG(journal_.debug()) << "too many timeouts " << hash_;
@@ -203,7 +203,7 @@ LedgerDeltaAcquire::tryBuild(std::shared_ptr<Ledger const> const& parent)
         "xrpl::LedgerDeltaAcquire::tryBuild : parent hash match");
     // build ledger
     LedgerReplay const replayData(parent, replayTemp_, std::move(orderedTxns_));
-    fullLedger_ = buildLedger(replayData, tapNONE, app_, journal_);
+    fullLedger_ = buildLedger(replayData, TapNone, app_, journal_);
     if (fullLedger_ && fullLedger_->header().hash == hash_)
     {
         JLOG(journal_.info()) << "Built " << hash_;
@@ -232,7 +232,7 @@ LedgerDeltaAcquire::onLedgerBuilt(ScopedLockType& sl, std::optional<InboundLedge
         firstTime = false;
     }
     app_.getJobQueue().addJob(
-        jtREPLAY_TASK, "OnLedBuilt", [=, ledger = this->fullLedger_, &app = this->app_]() {
+        JtReplayTask, "OnLedBuilt", [=, ledger = this->fullLedger_, &app = this->app_]() {
             for (auto reason : reasons)
             {
                 switch (reason)
diff --git a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
index 6839c44386..57e8fb5652 100644
--- a/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
+++ b/src/xrpld/app/ledger/detail/LedgerDeltaAcquire.h
@@ -130,7 +130,7 @@ private:
     std::map<std::uint32_t, std::shared_ptr<STTx const>> orderedTxns_;
     std::vector<OnDeltaDataCB> dataReadyCallbacks_;
     std::set<InboundLedger::Reason> reasons_;
-    std::uint32_t noFeaturePeerCount = 0;
+    std::uint32_t noFeaturePeerCount_ = 0;
     bool fallBack_ = false;
 
     friend class LedgerReplayTask;  // for asserts only
diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp
index 1c0e627cd0..34ded1d14f 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 MAX_LEDGER_GAP{100};
+static constexpr int kMAX_LEDGER_GAP{100};
 
 // Don't acquire history if ledger is too old
-static constexpr std::chrono::minutes MAX_LEDGER_AGE_ACQUIRE{1};
+static constexpr std::chrono::minutes kMAX_LEDGER_AGE_ACQUIRE{1};
 
 // Don't acquire history if write load is too high
-static constexpr int MAX_WRITE_LOAD_ACQUIRE{8192};
+static constexpr int kMAX_WRITE_LOAD_ACQUIRE{8192};
 
 // Helper function for LedgerMaster::doAdvance()
 // Return true if candidateLedger should be fetched from the network.
@@ -124,19 +124,19 @@ LedgerMaster::LedgerMaster(
     beast::insight::Collector::ptr const& collector,
     beast::Journal journal)
     : app_(app)
-    , m_journal(journal)
-    , mLedgerHistory(collector, app)
+    , journal_(journal)
+    , ledgerHistory_(collector, app)
     , standalone_(app_.config().standalone())
     , fetch_depth_(app_.getSHAMapStore().clampFetchDepth(app_.config().FETCH_DEPTH))
     , ledger_history_(app_.config().LEDGER_HISTORY)
-    , ledger_fetch_size_(app_.config().getValueFor(SizedItem::ledgerFetch))
+    , ledger_fetch_size_(app_.config().getValueFor(SizedItem::LedgerFetch))
     , fetch_packs_(
           "FetchPack",
           65536,
           std::chrono::seconds{45},
           stopwatch,
           app_.getJournal("TaggedCache"))
-    , m_stats(std::bind(&LedgerMaster::collect_metrics, this), collector)
+    , stats_(std::bind(&LedgerMaster::collectMetrics, this), collector)
 {
 }
 
@@ -149,7 +149,7 @@ LedgerMaster::getCurrentLedgerIndex()
 LedgerIndex
 LedgerMaster::getValidLedgerIndex()
 {
-    return mValidLedgerSeq;
+    return validLedgerSeq_;
 }
 
 bool
@@ -163,10 +163,10 @@ LedgerMaster::isCompatible(ReadView const& view, beast::Journal::Stream s, char
     }
 
     {
-        std::scoped_lock const sl(m_mutex);
+        std::scoped_lock const sl(mutex_);
 
-        if ((mLastValidLedger.second != 0) &&
-            !areCompatible(mLastValidLedger.first, mLastValidLedger.second, view, s, reason))
+        if ((lastValidLedger_.second != 0) &&
+            !areCompatible(lastValidLedger_.first, lastValidLedger_.second, view, s, reason))
         {
             return false;
         }
@@ -179,22 +179,22 @@ std::chrono::seconds
 LedgerMaster::getPublishedLedgerAge()
 {
     using namespace std::chrono_literals;
-    std::chrono::seconds const pubClose{mPubLedgerClose.load()};
+    std::chrono::seconds const pubClose{pubLedgerClose_.load()};
     if (pubClose == 0s)
     {
-        JLOG(m_journal.debug()) << "No published ledger";
+        JLOG(journal_.debug()) << "No published ledger";
         return weeks{2};
     }
 
     std::chrono::seconds ret = app_.getTimeKeeper().closeTime().time_since_epoch();
     ret -= pubClose;
     ret = (ret > 0s) ? ret : 0s;
-    static std::chrono::seconds lastRet = -1s;
+    static std::chrono::seconds kLAST_RET = -1s;
 
-    if (ret != lastRet)
+    if (ret != kLAST_RET)
     {
-        JLOG(m_journal.trace()) << "Published ledger age is " << ret.count();
-        lastRet = ret;
+        JLOG(journal_.trace()) << "Published ledger age is " << ret.count();
+        kLAST_RET = ret;
     }
     return ret;
 }
@@ -204,22 +204,22 @@ LedgerMaster::getValidatedLedgerAge()
 {
     using namespace std::chrono_literals;
 
-    std::chrono::seconds const valClose{mValidLedgerSign.load()};
+    std::chrono::seconds const valClose{validLedgerSign_.load()};
     if (valClose == 0s)
     {
-        JLOG(m_journal.debug()) << "No validated ledger";
+        JLOG(journal_.debug()) << "No validated ledger";
         return weeks{2};
     }
 
     std::chrono::seconds ret = app_.getTimeKeeper().closeTime().time_since_epoch();
     ret -= valClose;
     ret = (ret > 0s) ? ret : 0s;
-    static std::chrono::seconds lastRet = -1s;
+    static std::chrono::seconds kLAST_RET = -1s;
 
-    if (ret != lastRet)
+    if (ret != kLAST_RET)
     {
-        JLOG(m_journal.trace()) << "Validated ledger age is " << ret.count();
-        lastRet = ret;
+        JLOG(journal_.trace()) << "Validated ledger age is " << ret.count();
+        kLAST_RET = ret;
     }
     return ret;
 }
@@ -234,8 +234,8 @@ LedgerMaster::isCaughtUp(std::string& reason)
         reason = "No recently-published ledger";
         return false;
     }
-    std::uint32_t const validClose = mValidLedgerSign.load();
-    std::uint32_t const pubClose = mPubLedgerClose.load();
+    std::uint32_t const validClose = validLedgerSign_.load();
+    std::uint32_t const pubClose = pubLedgerClose_.load();
     if ((validClose == 0u) || (pubClose == 0u))
     {
         reason = "No published ledger";
@@ -282,25 +282,25 @@ LedgerMaster::setValidLedger(std::shared_ptr<Ledger const> const& l)
         signTime = l->header().closeTime;
     }
 
-    mValidLedger.set(l);
-    mValidLedgerSign = signTime.time_since_epoch().count();
+    validLedger_.set(l);
+    validLedgerSign_ = signTime.time_since_epoch().count();
     XRPL_ASSERT(
-        mValidLedgerSeq || !app_.getMaxDisallowedLedger() ||
+        validLedgerSeq_ || !app_.getMaxDisallowedLedger() ||
             l->header().seq + max_ledger_difference_ > app_.getMaxDisallowedLedger(),
         "xrpl::LedgerMaster::setValidLedger : valid ledger sequence");
     (void)max_ledger_difference_;
-    mValidLedgerSeq = l->header().seq;
+    validLedgerSeq_ = l->header().seq;
 
     app_.getOPs().updateLocalTx(*l);
     app_.getSHAMapStore().onLedgerClosed(getValidatedLedger());
-    mLedgerHistory.validatedLedger(l, consensusHash);
+    ledgerHistory_.validatedLedger(l, consensusHash);
     app_.getAmendmentTable().doValidatedLedger(l);
     if (!app_.getOPs().isBlocked())
     {
         if (app_.getAmendmentTable().hasUnsupportedEnabled())
         {
-            JLOG(m_journal.error()) << "One or more unsupported amendments "
-                                       "activated: server blocked.";
+            JLOG(journal_.error()) << "One or more unsupported amendments "
+                                      "activated: server blocked.";
             app_.getOPs().setAmendmentBlocked();
         }
         else if (!app_.getOPs().isAmendmentWarned() || l->isFlagLedger())
@@ -316,11 +316,11 @@ LedgerMaster::setValidLedger(std::shared_ptr<Ledger const> const& l)
             // operators an opportunity to see and resolve the warning.
             if (auto const first = app_.getAmendmentTable().firstUnsupportedExpected())
             {
-                JLOG(m_journal.error()) << "One or more unsupported amendments "
-                                           "reached majority. Upgrade before "
-                                        << to_string(*first)
-                                        << " to prevent your server from "
-                                           "becoming amendment blocked.";
+                JLOG(journal_.error()) << "One or more unsupported amendments "
+                                          "reached majority. Upgrade before "
+                                       << to_string(*first)
+                                       << " to prevent your server from "
+                                          "becoming amendment blocked.";
                 app_.getOPs().setAmendmentWarned();
             }
             else
@@ -334,16 +334,16 @@ LedgerMaster::setValidLedger(std::shared_ptr<Ledger const> const& l)
 void
 LedgerMaster::setPubLedger(std::shared_ptr<Ledger const> const& l)
 {
-    mPubLedger = l;
-    mPubLedgerClose = l->header().closeTime.time_since_epoch().count();
-    mPubLedgerSeq = l->header().seq;
+    pubLedger_ = l;
+    pubLedgerClose_ = l->header().closeTime.time_since_epoch().count();
+    pubLedgerSeq_ = l->header().seq;
 }
 
 void
 LedgerMaster::addHeldTransaction(std::shared_ptr<Transaction> const& transaction)
 {
-    std::scoped_lock const ml(m_mutex);
-    mHeldTransactions.insert(transaction->getSTransaction());
+    std::scoped_lock const ml(mutex_);
+    heldTransactions_.insert(transaction->getSTransaction());
 }
 
 // Validate a ledger's close time and sequence number if we're considering
@@ -360,8 +360,8 @@ LedgerMaster::canBeCurrent(std::shared_ptr<Ledger const> const& ledger)
     auto validLedger = getValidatedLedger();
     if (validLedger && (ledger->header().seq < validLedger->header().seq))
     {
-        JLOG(m_journal.trace()) << "Candidate for current ledger has low seq "
-                                << ledger->header().seq << " < " << validLedger->header().seq;
+        JLOG(journal_.trace()) << "Candidate for current ledger has low seq "
+                               << ledger->header().seq << " < " << validLedger->header().seq;
         return false;
     }
 
@@ -377,9 +377,9 @@ LedgerMaster::canBeCurrent(std::shared_ptr<Ledger const> const& ledger)
     if ((validLedger || (ledger->header().seq > 10)) &&
         ((std::max(closeTime, ledgerClose) - std::min(closeTime, ledgerClose)) > 5min))
     {
-        JLOG(m_journal.warn()) << "Candidate for current ledger has close time "
-                               << to_string(ledgerClose) << " at network time "
-                               << to_string(closeTime) << " seq " << ledger->header().seq;
+        JLOG(journal_.warn()) << "Candidate for current ledger has close time "
+                              << to_string(ledgerClose) << " at network time "
+                              << to_string(closeTime) << " seq " << ledger->header().seq;
         return false;
     }
 
@@ -402,13 +402,13 @@ LedgerMaster::canBeCurrent(std::shared_ptr<Ledger const> const& ledger)
 
         if (ledger->header().seq > maxSeq)
         {
-            JLOG(m_journal.warn()) << "Candidate for current ledger has high seq "
-                                   << ledger->header().seq << " > " << maxSeq;
+            JLOG(journal_.warn()) << "Candidate for current ledger has high seq "
+                                  << ledger->header().seq << " > " << maxSeq;
             return false;
         }
 
-        JLOG(m_journal.trace()) << "Acceptable seq range: " << validLedger->header().seq
-                                << " <= " << ledger->header().seq << " <= " << maxSeq;
+        JLOG(journal_.trace()) << "Acceptable seq range: " << validLedger->header().seq
+                               << " <= " << ledger->header().seq << " <= " << maxSeq;
     }
 
     return true;
@@ -419,14 +419,14 @@ LedgerMaster::switchLCL(std::shared_ptr<Ledger const> const& lastClosed)
 {
     XRPL_ASSERT(lastClosed, "xrpl::LedgerMaster::switchLCL : non-null input");
     if (!lastClosed->isImmutable())
-        LogicError("mutable ledger in switchLCL");
+        logicError("mutable ledger in switchLCL");
 
     if (lastClosed->open())
-        LogicError("The new last closed ledger is open!");
+        logicError("The new last closed ledger is open!");
 
     {
-        std::scoped_lock const ml(m_mutex);
-        mClosedLedger.set(lastClosed);
+        std::scoped_lock const ml(mutex_);
+        closedLedger_.set(lastClosed);
     }
 
     if (standalone_)
@@ -443,7 +443,7 @@ LedgerMaster::switchLCL(std::shared_ptr<Ledger const> const& lastClosed)
 bool
 LedgerMaster::fixIndex(LedgerIndex ledgerIndex, LedgerHash const& ledgerHash)
 {
-    return mLedgerHistory.fixIndex(ledgerIndex, ledgerHash);
+    return ledgerHistory_.fixIndex(ledgerIndex, ledgerHash);
 }
 
 bool
@@ -451,7 +451,7 @@ LedgerMaster::storeLedger(std::shared_ptr<Ledger const> ledger)
 {
     bool const validated = ledger->header().validated;
     // Returns true if we already had the ledger
-    return mLedgerHistory.insert(ledger, validated);
+    return ledgerHistory_.insert(ledger, validated);
 }
 
 /** Apply held transactions to the open ledger
@@ -463,11 +463,11 @@ void
 LedgerMaster::applyHeldTransactions()
 {
     CanonicalTXSet const set = [this]() {
-        std::scoped_lock const sl(m_mutex);
+        std::scoped_lock const sl(mutex_);
         // VFALCO NOTE The hash for an open ledger is undefined so we use
         // something that is a reasonable substitute.
         CanonicalTXSet set(app_.getOpenLedger().current()->header().parentHash);
-        std::swap(mHeldTransactions, set);
+        std::swap(heldTransactions_, set);
         return set;
     }();
 
@@ -478,29 +478,29 @@ LedgerMaster::applyHeldTransactions()
 std::shared_ptr<STTx const>
 LedgerMaster::popAcctTransaction(std::shared_ptr<STTx const> const& tx)
 {
-    std::scoped_lock const sl(m_mutex);
+    std::scoped_lock const sl(mutex_);
 
-    return mHeldTransactions.popAcctTransaction(tx);
+    return heldTransactions_.popAcctTransaction(tx);
 }
 
 void
 LedgerMaster::setBuildingLedger(LedgerIndex i)
 {
-    mBuildingLedgerSeq.store(i);
+    buildingLedgerSeq_.store(i);
 }
 
 bool
 LedgerMaster::haveLedger(std::uint32_t seq)
 {
-    std::scoped_lock const sl(mCompleteLock);
-    return boost::icl::contains(mCompleteLedgers, seq);
+    std::scoped_lock const sl(completeLock_);
+    return boost::icl::contains(completeLedgers_, seq);
 }
 
 void
 LedgerMaster::clearLedger(std::uint32_t seq)
 {
-    std::scoped_lock const sl(mCompleteLock);
-    mCompleteLedgers.erase(seq);
+    std::scoped_lock const sl(completeLock_);
+    completeLedgers_.erase(seq);
 }
 
 bool
@@ -538,7 +538,7 @@ LedgerMaster::isValidated(ReadView const& ledger)
     }
     catch (SHAMapMissingNode const& mn)
     {
-        JLOG(m_journal.warn()) << "Ledger #" << seq << ": " << mn.what();
+        JLOG(journal_.warn()) << "Ledger #" << seq << ": " << mn.what();
         return false;
     }
 
@@ -553,15 +553,15 @@ LedgerMaster::getFullValidatedRange(std::uint32_t& minVal, std::uint32_t& maxVal
 {
     // Validated ledger is likely not stored in the DB yet so we use the
     // published ledger which is.
-    maxVal = mPubLedgerSeq.load();
+    maxVal = pubLedgerSeq_.load();
 
     if (maxVal == 0u)
         return false;
 
     std::optional<std::uint32_t> maybeMin;
     {
-        std::scoped_lock const sl(mCompleteLock);
-        maybeMin = prevMissing(mCompleteLedgers, maxVal);
+        std::scoped_lock const sl(completeLock_);
+        maybeMin = prevMissing(completeLedgers_, maxVal);
     }
 
     if (maybeMin == std::nullopt)
@@ -655,7 +655,7 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
     while (!app_.getJobQueue().isStopping() && seq > 0)
     {
         {
-            std::scoped_lock const ml(m_mutex);
+            std::scoped_lock const ml(mutex_);
             minHas = seq;
             --seq;
 
@@ -671,8 +671,8 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
                 return;
 
             {
-                std::scoped_lock const ml(mCompleteLock);
-                mCompleteLedgers.insert(range(minHas, maxHas));
+                std::scoped_lock const ml(completeLock_);
+                completeLedgers_.insert(range(minHas, maxHas));
             }
             maxHas = minHas;
             ledgerHashes =
@@ -686,7 +686,7 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
                     ledgerHashes.begin()->second.ledgerHash, ledgerHashes.begin()->first))
             {
                 // The ledger is not backed by the node store
-                JLOG(m_journal.warn())
+                JLOG(journal_.warn())
                     << "SQL DB ledger sequence " << seq << " mismatches node store";
                 break;
             }
@@ -699,12 +699,12 @@ LedgerMaster::tryFill(std::shared_ptr<Ledger const> ledger)
     }
 
     {
-        std::scoped_lock const ml(mCompleteLock);
-        mCompleteLedgers.insert(range(minHas, maxHas));
+        std::scoped_lock const ml(completeLock_);
+        completeLedgers_.insert(range(minHas, maxHas));
     }
     {
-        std::scoped_lock const ml(m_mutex);
-        mFillInProgress = 0;
+        std::scoped_lock const ml(mutex_);
+        fillInProgress_ = 0;
         tryAdvance();
     }
 }
@@ -719,7 +719,7 @@ LedgerMaster::getFetchPack(LedgerIndex missing, InboundLedger::Reason reason)
     auto const haveHash{getLedgerHashForHistory(ledgerIndex, reason)};
     if (!haveHash || haveHash->isZero())
     {
-        JLOG(m_journal.error()) << "No hash for fetch pack. Missing Index " << missing;
+        JLOG(journal_.error()) << "No hash for fetch pack. Missing Index " << missing;
         return;
     }
 
@@ -752,10 +752,10 @@ LedgerMaster::getFetchPack(LedgerIndex missing, InboundLedger::Reason reason)
         auto packet = std::make_shared<Message>(tmBH, protocol::mtGET_OBJECTS);
 
         target->send(packet);
-        JLOG(m_journal.trace()) << "Requested fetch pack for " << missing;
+        JLOG(journal_.trace()) << "Requested fetch pack for " << missing;
     }
     else
-        JLOG(m_journal.debug()) << "No peer for fetch pack";
+        JLOG(journal_.debug()) << "No peer for fetch pack";
 }
 
 void
@@ -770,11 +770,11 @@ LedgerMaster::fixMismatch(ReadView const& ledger)
         {
             try
             {
-                hash = hashOfSeq(ledger, lSeq, m_journal);
+                hash = hashOfSeq(ledger, lSeq, journal_);
             }
             catch (std::exception const& ex)
             {
-                JLOG(m_journal.warn())
+                JLOG(journal_.warn())
                     << "fixMismatch encounters partial ledger. Exception: " << ex.what();
                 clearLedger(lSeq);
                 return;
@@ -790,8 +790,8 @@ LedgerMaster::fixMismatch(ReadView const& ledger)
                     // we closed the seam
                     if (invalidate != 0)
                     {
-                        JLOG(m_journal.warn()) << "Match at " << lSeq << ", " << invalidate
-                                               << " prior ledgers invalidated";
+                        JLOG(journal_.warn()) << "Match at " << lSeq << ", " << invalidate
+                                              << " prior ledgers invalidated";
                     }
 
                     return;
@@ -806,7 +806,7 @@ LedgerMaster::fixMismatch(ReadView const& ledger)
     // all prior ledgers invalidated
     if (invalidate != 0)
     {
-        JLOG(m_journal.warn()) << "All " << invalidate << " prior ledgers invalidated";
+        JLOG(journal_.warn()) << "All " << invalidate << " prior ledgers invalidated";
     }
 }
 
@@ -817,8 +817,8 @@ LedgerMaster::setFullLedger(
     bool isCurrent)
 {
     // A new ledger has been accepted as part of the trusted chain
-    JLOG(m_journal.debug()) << "Ledger " << ledger->header().seq
-                            << " accepted :" << ledger->header().hash;
+    JLOG(journal_.debug()) << "Ledger " << ledger->header().seq
+                           << " accepted :" << ledger->header().hash;
     XRPL_ASSERT(
         ledger->stateMap().getHash().isNonZero(),
         "xrpl::LedgerMaster::setFullLedger : nonzero ledger state hash");
@@ -827,7 +827,7 @@ LedgerMaster::setFullLedger(
     ledger->setFull();
 
     if (isCurrent)
-        mLedgerHistory.insert(ledger, true);
+        ledgerHistory_.insert(ledger, true);
 
     {
         // Check the SQL database's entry for the sequence before this
@@ -841,16 +841,16 @@ LedgerMaster::setFullLedger(
     pendSaveValidated(app_, ledger, isSynchronous, isCurrent);
 
     {
-        std::scoped_lock const ml(mCompleteLock);
-        mCompleteLedgers.insert(ledger->header().seq);
+        std::scoped_lock const ml(completeLock_);
+        completeLedgers_.insert(ledger->header().seq);
     }
 
     {
-        std::scoped_lock const ml(m_mutex);
+        std::scoped_lock const ml(mutex_);
 
-        if (ledger->header().seq > mValidLedgerSeq)
+        if (ledger->header().seq > validLedgerSeq_)
             setValidLedger(ledger);
-        if (!mPubLedger)
+        if (!pubLedger_)
         {
             setPubLedger(ledger);
             app_.getOrderBookDB().setup(ledger);
@@ -863,8 +863,8 @@ LedgerMaster::setFullLedger(
 
             if (!prevLedger || (prevLedger->header().hash != ledger->header().parentHash))
             {
-                JLOG(m_journal.warn()) << "Acquired ledger invalidates previous ledger: "
-                                       << (prevLedger ? "hashMismatch" : "missingLedger");
+                JLOG(journal_.warn()) << "Acquired ledger invalidates previous ledger: "
+                                      << (prevLedger ? "hashMismatch" : "missingLedger");
                 fixMismatch(*ledger);
             }
         }
@@ -888,7 +888,7 @@ LedgerMaster::checkAccept(uint256 const& hash, std::uint32_t seq)
     if (seq != 0)
     {
         // Ledger is too old
-        if (seq < mValidLedgerSeq)
+        if (seq < validLedgerSeq_)
             return;
 
         auto validations = app_.getValidators().negativeUNLFilter(
@@ -896,20 +896,20 @@ LedgerMaster::checkAccept(uint256 const& hash, std::uint32_t seq)
         valCount = validations.size();
         if (valCount >= app_.getValidators().quorum())
         {
-            std::scoped_lock const ml(m_mutex);
-            if (seq > mLastValidLedger.second)
-                mLastValidLedger = std::make_pair(hash, seq);
+            std::scoped_lock const ml(mutex_);
+            if (seq > lastValidLedger_.second)
+                lastValidLedger_ = std::make_pair(hash, seq);
         }
 
-        if (seq == mValidLedgerSeq)
+        if (seq == validLedgerSeq_)
             return;
 
         // Ledger could match the ledger we're already building
-        if (seq == mBuildingLedgerSeq)
+        if (seq == buildingLedgerSeq_)
             return;
     }
 
-    auto ledger = mLedgerHistory.getLedgerByHash(hash);
+    auto ledger = ledgerHistory_.getLedgerByHash(hash);
 
     if (!ledger)
     {
@@ -950,9 +950,9 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
 
     // Can we advance the last fully-validated ledger? If so, can we
     // publish?
-    std::scoped_lock const ml(m_mutex);
+    std::scoped_lock const ml(mutex_);
 
-    if (ledger->header().seq <= mValidLedgerSeq)
+    if (ledger->header().seq <= validLedgerSeq_)
         return;
 
     auto const minVal = getNeededValidations();
@@ -961,17 +961,17 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
     auto const tvc = validations.size();
     if (tvc < minVal)  // nothing we can do
     {
-        JLOG(m_journal.trace()) << "Only " << tvc << " validations for " << ledger->header().hash;
+        JLOG(journal_.trace()) << "Only " << tvc << " validations for " << ledger->header().hash;
         return;
     }
 
-    JLOG(m_journal.info()) << "Advancing accepted ledger to " << ledger->header().seq
-                           << " with >= " << minVal << " validations";
+    JLOG(journal_.info()) << "Advancing accepted ledger to " << ledger->header().seq
+                          << " with >= " << minVal << " validations";
 
     ledger->setValidated();
     ledger->setFull();
     setValidLedger(ledger);
-    if (!mPubLedger)
+    if (!pubLedger_)
     {
         pendSaveValidated(app_, ledger, true, true);
         setPubLedger(ledger);
@@ -989,7 +989,7 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
     if (!fees.empty())
     {
         std::ranges::sort(fees);
-        if (auto stream = m_journal.debug())
+        if (auto stream = journal_.debug())
         {
             std::stringstream s;
             s << "Received fees from validations: (" << fees.size() << ") ";
@@ -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 reportingPercent = 90;
-                constexpr std::size_t cutoffPercent = 60;
+                constexpr std::size_t kREPORTING_PERCENT = 90;
+                constexpr std::size_t kCUTOFF_PERCENT = 60;
                 auto const unlSize{app_.getValidators().getQuorumKeys().second.size()};
                 needPrint = unlSize > 0 &&
-                    calculatePercent(vals.size(), unlSize) >= reportingPercent &&
-                    calculatePercent(higherVersionCount, xrpldCount) >= cutoffPercent;
+                    calculatePercent(vals.size(), unlSize) >= kREPORTING_PERCENT &&
+                    calculatePercent(higherVersionCount, xrpldCount) >= kCUTOFF_PERCENT;
             }
         }
         // To throttle the warning messages, instead of printing a warning
@@ -1073,7 +1073,7 @@ LedgerMaster::checkAccept(std::shared_ptr<Ledger const> const& ledger)
                 "A majority of trusted validators are "
                 "running a newer version.";
             std::cerr << upgradeMsg << std::endl;
-            JLOG(m_journal.error()) << upgradeMsg;
+            JLOG(journal_.error()) << upgradeMsg;
         }
     }
 }
@@ -1083,7 +1083,7 @@ void
 LedgerMaster::consensusBuilt(
     std::shared_ptr<Ledger const> const& ledger,
     uint256 const& consensusHash,
-    Json::Value consensus)
+    json::Value consensus)
 {
     // Because we just built a ledger, we are no longer building one
     setBuildingLedger(0);
@@ -1092,20 +1092,20 @@ LedgerMaster::consensusBuilt(
     if (standalone_)
         return;
 
-    mLedgerHistory.builtLedger(ledger, consensusHash, std::move(consensus));
+    ledgerHistory_.builtLedger(ledger, consensusHash, std::move(consensus));
 
-    if (ledger->header().seq <= mValidLedgerSeq)
+    if (ledger->header().seq <= validLedgerSeq_)
     {
         auto stream = app_.getJournal("LedgerConsensus").info();
         JLOG(stream) << "Consensus built old ledger: " << ledger->header().seq
-                     << " <= " << mValidLedgerSeq;
+                     << " <= " << validLedgerSeq_;
         return;
     }
 
     // See if this ledger can be the new fully-validated ledger
     checkAccept(ledger);
 
-    if (ledger->header().seq <= mValidLedgerSeq)
+    if (ledger->header().seq <= validLedgerSeq_)
     {
         auto stream = app_.getJournal("LedgerConsensus").debug();
         JLOG(stream) << "Consensus ledger fully validated";
@@ -1119,59 +1119,59 @@ LedgerMaster::consensusBuilt(
         app_.getValidators().negativeUNLFilter(app_.getValidations().currentTrusted());
 
     // Track validation counts with sequence numbers
-    class valSeq
+    class ValSeq
     {
     public:
-        valSeq() = default;
+        ValSeq() = default;
 
         void
         mergeValidation(LedgerIndex seq)
         {
-            valCount_++;
+            valCount++;
 
             // If we didn't already know the sequence, now we do
-            if (ledgerSeq_ == 0)
-                ledgerSeq_ = seq;
+            if (ledgerSeq == 0)
+                ledgerSeq = seq;
         }
 
-        std::size_t valCount_{0};
-        LedgerIndex ledgerSeq_{0};
+        std::size_t valCount{0};
+        LedgerIndex ledgerSeq{0};
     };
 
     // Count the number of current, trusted validations
-    hash_map<uint256, valSeq> count;
+    hash_map<uint256, ValSeq> count;
     for (auto const& v : validations)
     {
-        valSeq& vs = count[v->getLedgerHash()];
+        ValSeq& vs = count[v->getLedgerHash()];
         vs.mergeValidation(v->getFieldU32(sfLedgerSequence));
     }
 
     auto const neededValidations = getNeededValidations();
-    auto maxSeq = mValidLedgerSeq.load();
+    auto maxSeq = validLedgerSeq_.load();
     auto maxLedger = ledger->header().hash;
 
     // Of the ledgers with sufficient validations,
     // find the one with the highest sequence
     for (auto& v : count)
     {
-        if (v.second.valCount_ > neededValidations)
+        if (v.second.valCount > neededValidations)
         {
             // If we still don't know the sequence, get it
-            if (v.second.ledgerSeq_ == 0)
+            if (v.second.ledgerSeq == 0)
             {
                 if (auto l = getLedgerByHash(v.first))
-                    v.second.ledgerSeq_ = l->header().seq;
+                    v.second.ledgerSeq = l->header().seq;
             }
 
-            if (v.second.ledgerSeq_ > maxSeq)
+            if (v.second.ledgerSeq > maxSeq)
             {
-                maxSeq = v.second.ledgerSeq_;
+                maxSeq = v.second.ledgerSeq;
                 maxLedger = v.first;
             }
         }
     }
 
-    if (maxSeq > mValidLedgerSeq)
+    if (maxSeq > validLedgerSeq_)
     {
         auto stream = app_.getJournal("LedgerConsensus").debug();
         JLOG(stream) << "Consensus triggered check of ledger";
@@ -1184,11 +1184,11 @@ LedgerMaster::getLedgerHashForHistory(LedgerIndex index, InboundLedger::Reason r
 {
     // Try to get the hash of a ledger we need to fetch for history
     std::optional<LedgerHash> ret;
-    auto const& l{mHistLedger};
+    auto const& l{histLedger_};
 
     if (l && l->header().seq >= index)
     {
-        ret = hashOfSeq(*l, index, m_journal);
+        ret = hashOfSeq(*l, index, journal_);
         if (!ret)
             ret = walkHashBySeq(index, l, reason);
     }
@@ -1204,27 +1204,27 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
 {
     std::vector<std::shared_ptr<Ledger const>> ret;
 
-    JLOG(m_journal.trace()) << "findNewLedgersToPublish<";
+    JLOG(journal_.trace()) << "findNewLedgersToPublish<";
 
     // No valid ledger, nothing to do
-    if (mValidLedger.empty())
+    if (validLedger_.empty())
     {
-        JLOG(m_journal.trace()) << "No valid journal, nothing to publish.";
+        JLOG(journal_.trace()) << "No valid journal, nothing to publish.";
         return {};
     }
 
-    if (!mPubLedger)
+    if (!pubLedger_)
     {
-        JLOG(m_journal.info()) << "First published ledger will be " << mValidLedgerSeq;
-        return {mValidLedger.get()};
+        JLOG(journal_.info()) << "First published ledger will be " << validLedgerSeq_;
+        return {validLedger_.get()};
     }
 
-    if (mValidLedgerSeq > (mPubLedgerSeq + MAX_LEDGER_GAP))
+    if (validLedgerSeq_ > (pubLedgerSeq_ + kMAX_LEDGER_GAP))
     {
-        JLOG(m_journal.warn()) << "Gap in validated ledger stream " << mPubLedgerSeq << " - "
-                               << mValidLedgerSeq - 1;
+        JLOG(journal_.warn()) << "Gap in validated ledger stream " << pubLedgerSeq_ << " - "
+                              << validLedgerSeq_ - 1;
 
-        auto valLedger = mValidLedger.get();
+        auto valLedger = validLedger_.get();
         ret.push_back(valLedger);
         setPubLedger(valLedger);
         app_.getOrderBookDB().setup(valLedger);
@@ -1232,32 +1232,32 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
         return {valLedger};
     }
 
-    if (mValidLedgerSeq <= mPubLedgerSeq)
+    if (validLedgerSeq_ <= pubLedgerSeq_)
     {
-        JLOG(m_journal.trace()) << "No valid journal, nothing to publish.";
+        JLOG(journal_.trace()) << "No valid journal, nothing to publish.";
         return {};
     }
 
     int acqCount = 0;
 
-    auto pubSeq = mPubLedgerSeq + 1;  // Next sequence to publish
-    auto valLedger = mValidLedger.get();
+    auto pubSeq = pubLedgerSeq_ + 1;  // Next sequence to publish
+    auto valLedger = validLedger_.get();
     std::uint32_t const valSeq = valLedger->header().seq;
 
-    scope_unlock const sul{sl};
+    ScopeUnlock const sul{sl};
     try
     {
         for (std::uint32_t seq = pubSeq; seq <= valSeq; ++seq)
         {
-            JLOG(m_journal.trace()) << "Trying to fetch/publish valid ledger " << seq;
+            JLOG(journal_.trace()) << "Trying to fetch/publish valid ledger " << seq;
 
             std::shared_ptr<Ledger const> ledger;
             // This can throw
-            auto hash = hashOfSeq(*valLedger, seq, m_journal);
+            auto hash = hashOfSeq(*valLedger, seq, journal_);
             // VFALCO TODO Restructure this code so that zero is not
             // used.
             if (!hash)
-                hash = beast::zero;  // kludge
+                hash = beast::kZERO;  // kludge
             if (seq == valSeq)
             {
                 // We need to publish the ledger we just fully validated
@@ -1266,8 +1266,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
             else if (hash->isZero())
             {
                 // LCOV_EXCL_START
-                JLOG(m_journal.fatal())
-                    << "Ledger: " << valSeq << " does not have hash for " << seq;
+                JLOG(journal_.fatal()) << "Ledger: " << valSeq << " does not have hash for " << seq;
                 UNREACHABLE(
                     "xrpl::LedgerMaster::findNewLedgersToPublish : ledger "
                     "not found");
@@ -1275,7 +1274,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
             }
             else
             {
-                ledger = mLedgerHistory.getLedgerByHash(*hash);
+                ledger = ledgerHistory_.getLedgerByHash(*hash);
             }
 
             if (!app_.config().LEDGER_REPLAY)
@@ -1297,12 +1296,12 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
             }
         }
 
-        JLOG(m_journal.trace()) << "ready to publish " << ret.size() << " ledgers.";
+        JLOG(journal_.trace()) << "ready to publish " << ret.size() << " ledgers.";
     }
     catch (std::exception const& ex)
     {
-        JLOG(m_journal.error()) << "Exception while trying to find ledgers to publish: "
-                                << ex.what();
+        JLOG(journal_.error()) << "Exception while trying to find ledgers to publish: "
+                               << ex.what();
     }
 
     if (app_.config().LEDGER_REPLAY)
@@ -1313,12 +1312,12 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
          * acquire. If the local node has the finish ledger, it
          * saves a skip list acquire.
          */
-        auto const& startLedger = ret.empty() ? mPubLedger : ret.back();
+        auto const& startLedger = ret.empty() ? pubLedger_ : ret.back();
         auto finishLedger = valLedger;
         while (startLedger->seq() + 1 < finishLedger->seq())
         {
             if (auto const parent =
-                    mLedgerHistory.getLedgerByHash(finishLedger->header().parentHash);
+                    ledgerHistory_.getLedgerByHash(finishLedger->header().parentHash);
                 parent)
             {
                 finishLedger = parent;
@@ -1326,7 +1325,7 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
             else
             {
                 auto numberLedgers = finishLedger->seq() - startLedger->seq() + 1;
-                JLOG(m_journal.debug())
+                JLOG(journal_.debug())
                     << "Publish LedgerReplays " << numberLedgers
                     << " ledgers, from seq=" << startLedger->header().seq << ", "
                     << startLedger->header().hash << " to seq=" << finishLedger->header().seq
@@ -1344,21 +1343,21 @@ LedgerMaster::findNewLedgersToPublish(std::unique_lock<std::recursive_mutex>& sl
 void
 LedgerMaster::tryAdvance()
 {
-    std::scoped_lock const ml(m_mutex);
+    std::scoped_lock const ml(mutex_);
 
     // Can't advance without at least one fully-valid ledger
-    mAdvanceWork = true;
-    if (!mAdvanceThread && !mValidLedger.empty())
+    advanceWork_ = true;
+    if (!advanceThread_ && !validLedger_.empty())
     {
-        mAdvanceThread = true;
-        app_.getJobQueue().addJob(jtADVANCE, "AdvanceLedger", [this]() {
-            std::unique_lock sl(m_mutex);
+        advanceThread_ = true;
+        app_.getJobQueue().addJob(JtAdvance, "AdvanceLedger", [this]() {
+            std::unique_lock sl(mutex_);
 
             XRPL_ASSERT(
-                !mValidLedger.empty() && mAdvanceThread,
+                !validLedger_.empty() && advanceThread_,
                 "xrpl::LedgerMaster::tryAdvance : has valid ledger");
 
-            JLOG(m_journal.trace()) << "advanceThread<";
+            JLOG(journal_.trace()) << "advanceThread<";
 
             try
             {
@@ -1366,11 +1365,11 @@ LedgerMaster::tryAdvance()
             }
             catch (std::exception const& ex)
             {
-                JLOG(m_journal.fatal()) << "doAdvance throws: " << ex.what();
+                JLOG(journal_.fatal()) << "doAdvance throws: " << ex.what();
             }
 
-            mAdvanceThread = false;
-            JLOG(m_journal.trace()) << "advanceThread>";
+            advanceThread_ = false;
+            JLOG(journal_.trace()) << "advanceThread>";
         });
     }
 }
@@ -1379,38 +1378,38 @@ void
 LedgerMaster::updatePaths()
 {
     {
-        std::scoped_lock const ml(m_mutex);
+        std::scoped_lock const ml(mutex_);
         if (app_.getOPs().isNeedNetworkLedger())
         {
-            --mPathFindThread;
-            mPathLedger.reset();
-            JLOG(m_journal.debug()) << "Need network ledger for updating paths";
+            --pathFindThread_;
+            pathLedger_.reset();
+            JLOG(journal_.debug()) << "Need network ledger for updating paths";
             return;
         }
     }
 
     while (!app_.getJobQueue().isStopping())
     {
-        JLOG(m_journal.debug()) << "updatePaths running";
+        JLOG(journal_.debug()) << "updatePaths running";
         std::shared_ptr<ReadView const> lastLedger;
         {
-            std::scoped_lock const ml(m_mutex);
+            std::scoped_lock const ml(mutex_);
 
-            if (!mValidLedger.empty() &&
-                (!mPathLedger || (mPathLedger->header().seq != mValidLedgerSeq)))
+            if (!validLedger_.empty() &&
+                (!pathLedger_ || (pathLedger_->header().seq != validLedgerSeq_)))
             {  // We have a new valid ledger since the last full pathfinding
-                mPathLedger = mValidLedger.get();
-                lastLedger = mPathLedger;
+                pathLedger_ = validLedger_.get();
+                lastLedger = pathLedger_;
             }
-            else if (mPathFindNewRequest)
+            else if (pathFindNewRequest_)
             {  // We have a new request but no new ledger
                 lastLedger = app_.getOpenLedger().current();
             }
             else
             {  // Nothing to do
-                --mPathFindThread;
-                mPathLedger.reset();
-                JLOG(m_journal.debug()) << "Nothing to do for updating paths";
+                --pathFindThread_;
+                pathLedger_.reset();
+                JLOG(journal_.debug()) << "Nothing to do for updating paths";
                 return;
             }
         }
@@ -1422,10 +1421,10 @@ LedgerMaster::updatePaths()
                 lastLedger->header().closeTime;
             if (age > 1min)
             {
-                JLOG(m_journal.debug()) << "Published ledger too old for updating paths";
-                std::scoped_lock const ml(m_mutex);
-                --mPathFindThread;
-                mPathLedger.reset();
+                JLOG(journal_.debug()) << "Published ledger too old for updating paths";
+                std::scoped_lock const ml(mutex_);
+                --pathFindThread_;
+                pathLedger_.reset();
                 return;
             }
         }
@@ -1434,33 +1433,33 @@ LedgerMaster::updatePaths()
         {
             auto& pathRequests = app_.getPathRequestManager();
             {
-                std::scoped_lock const ml(m_mutex);
+                std::scoped_lock const ml(mutex_);
                 if (!pathRequests.requestsPending())
                 {
-                    --mPathFindThread;
-                    mPathLedger.reset();
-                    JLOG(m_journal.debug()) << "No path requests found. Nothing to do for updating "
-                                               "paths. "
-                                            << mPathFindThread << " jobs remaining";
+                    --pathFindThread_;
+                    pathLedger_.reset();
+                    JLOG(journal_.debug()) << "No path requests found. Nothing to do for updating "
+                                              "paths. "
+                                           << pathFindThread_ << " jobs remaining";
                     return;
                 }
             }
-            JLOG(m_journal.debug()) << "Updating paths";
+            JLOG(journal_.debug()) << "Updating paths";
             pathRequests.updateAll(lastLedger);
 
-            std::scoped_lock const ml(m_mutex);
+            std::scoped_lock const ml(mutex_);
             if (!pathRequests.requestsPending())
             {
-                JLOG(m_journal.debug()) << "No path requests left. No need for further updating "
-                                           "paths";
-                --mPathFindThread;
-                mPathLedger.reset();
+                JLOG(journal_.debug()) << "No path requests left. No need for further updating "
+                                          "paths";
+                --pathFindThread_;
+                pathLedger_.reset();
                 return;
             }
         }
         catch (SHAMapMissingNode const& mn)
         {
-            JLOG(m_journal.info()) << "During pathfinding: " << mn.what();
+            JLOG(journal_.info()) << "During pathfinding: " << mn.what();
             if (lastLedger->open())
             {
                 // our parent is the problem
@@ -1484,17 +1483,17 @@ LedgerMaster::updatePaths()
 bool
 LedgerMaster::newPathRequest()
 {
-    std::unique_lock ml(m_mutex);
-    mPathFindNewRequest = newPFWork("PthFindNewReq", ml);
-    return mPathFindNewRequest;
+    std::unique_lock ml(mutex_);
+    pathFindNewRequest_ = newPFWork("PthFindNewReq", ml);
+    return pathFindNewRequest_;
 }
 
 bool
 LedgerMaster::isNewPathRequest()
 {
-    std::scoped_lock const ml(m_mutex);
-    bool const ret = mPathFindNewRequest;
-    mPathFindNewRequest = false;
+    std::scoped_lock const ml(mutex_);
+    bool const ret = pathFindNewRequest_;
+    pathFindNewRequest_ = false;
     return ret;
 }
 
@@ -1503,8 +1502,8 @@ LedgerMaster::isNewPathRequest()
 bool
 LedgerMaster::newOrderBookDB()
 {
-    std::unique_lock ml(m_mutex);
-    mPathLedger.reset();
+    std::unique_lock ml(mutex_);
+    pathLedger_.reset();
 
     return newPFWork("PthFindOBDB", ml);
 }
@@ -1514,24 +1513,23 @@ LedgerMaster::newOrderBookDB()
 bool
 LedgerMaster::newPFWork(char const* name, std::unique_lock<std::recursive_mutex>&)
 {
-    if (!app_.isStopping() && mPathFindThread < 2 && app_.getPathRequestManager().requestsPending())
+    if (!app_.isStopping() && pathFindThread_ < 2 && app_.getPathRequestManager().requestsPending())
     {
-        JLOG(m_journal.debug()) << "newPFWork: Creating job. path find threads: "
-                                << mPathFindThread;
-        if (app_.getJobQueue().addJob(jtUPDATE_PF, name, [this]() { updatePaths(); }))
+        JLOG(journal_.debug()) << "newPFWork: Creating job. path find threads: " << pathFindThread_;
+        if (app_.getJobQueue().addJob(JtUpdatePf, name, [this]() { updatePaths(); }))
         {
-            ++mPathFindThread;
+            ++pathFindThread_;
         }
     }
     // If we're stopping don't give callers the expectation that their
     // request will be fulfilled, even if it may be serviced.
-    return mPathFindThread > 0 && !app_.isStopping();
+    return pathFindThread_ > 0 && !app_.isStopping();
 }
 
 std::recursive_mutex&
 LedgerMaster::peekMutex()
 {
-    return m_mutex;
+    return mutex_;
 }
 
 // The current ledger is the ledger we believe new transactions should go in
@@ -1544,7 +1542,7 @@ LedgerMaster::getCurrentLedger()
 std::shared_ptr<Ledger const>
 LedgerMaster::getValidatedLedger()
 {
-    return mValidLedger.get();
+    return validLedger_.get();
 }
 
 Rules
@@ -1565,15 +1563,15 @@ LedgerMaster::getValidatedRules()
 std::shared_ptr<ReadView const>
 LedgerMaster::getPublishedLedger()
 {
-    std::scoped_lock const lock(m_mutex);
-    return mPubLedger;
+    std::scoped_lock const lock(mutex_);
+    return pubLedger_;
 }
 
 std::string
 LedgerMaster::getCompleteLedgers()
 {
-    std::scoped_lock const sl(mCompleteLock);
-    return to_string(mCompleteLedgers);
+    std::scoped_lock const sl(completeLock_);
+    return to_string(completeLedgers_);
 }
 
 std::optional<NetClock::time_point>
@@ -1590,7 +1588,7 @@ LedgerMaster::getCloseTimeByHash(LedgerHash const& ledgerHash, std::uint32_t ind
     if (nodeObject && (nodeObject->getData().size() >= 120))
     {
         SerialIter it(nodeObject->getData().data(), nodeObject->getData().size());
-        if (safe_cast<HashPrefix>(it.get32()) == HashPrefix::ledgerMaster)
+        if (safeCast<HashPrefix>(it.get32()) == HashPrefix::LedgerMaster)
         {
             it.skip(
                 4 + 8 + 32 +   // seq drops parentHash
@@ -1605,7 +1603,7 @@ LedgerMaster::getCloseTimeByHash(LedgerHash const& ledgerHash, std::uint32_t ind
 uint256
 LedgerMaster::getHashBySeq(std::uint32_t index)
 {
-    uint256 hash = mLedgerHistory.getLedgerHash(index);
+    uint256 hash = ledgerHistory_.getLedgerHash(index);
 
     if (hash.isNonZero())
         return hash;
@@ -1618,7 +1616,7 @@ LedgerMaster::walkHashBySeq(std::uint32_t index, InboundLedger::Reason reason)
 {
     std::optional<LedgerHash> ledgerHash;
 
-    if (auto referenceLedger = mValidLedger.get())
+    if (auto referenceLedger = validLedger_.get())
         ledgerHash = walkHashBySeq(index, referenceLedger, reason);
 
     return ledgerHash;
@@ -1637,25 +1635,25 @@ LedgerMaster::walkHashBySeq(
     }
 
     // See if the hash for the ledger we need is in the reference ledger
-    auto ledgerHash = hashOfSeq(*referenceLedger, index, m_journal);
+    auto ledgerHash = hashOfSeq(*referenceLedger, index, journal_);
     if (ledgerHash)
         return ledgerHash;
 
     // The hash is not in the reference ledger. Get another ledger which can
     // be located easily and should contain the hash.
     LedgerIndex const refIndex = getCandidateLedger(index);
-    auto const refHash = hashOfSeq(*referenceLedger, refIndex, m_journal);
+    auto const refHash = hashOfSeq(*referenceLedger, refIndex, journal_);
     XRPL_ASSERT(refHash, "xrpl::LedgerMaster::walkHashBySeq : found ledger");
     if (refHash)
     {
         // Try the hash and sequence of a better reference ledger just found
-        auto ledger = mLedgerHistory.getLedgerByHash(*refHash);
+        auto ledger = ledgerHistory_.getLedgerByHash(*refHash);
 
         if (ledger)
         {
             try
             {
-                ledgerHash = hashOfSeq(*ledger, index, m_journal);
+                ledgerHash = hashOfSeq(*ledger, index, journal_);
             }
             catch (SHAMapMissingNode const&)
             {
@@ -1668,7 +1666,7 @@ LedgerMaster::walkHashBySeq(
         {
             if (auto const l = app_.getInboundLedgers().acquire(*refHash, refIndex, reason))
             {
-                ledgerHash = hashOfSeq(*l, index, m_journal);
+                ledgerHash = hashOfSeq(*l, index, journal_);
                 XRPL_ASSERT(
                     ledgerHash,
                     "xrpl::LedgerMaster::walkHashBySeq : has complete "
@@ -1682,20 +1680,20 @@ LedgerMaster::walkHashBySeq(
 std::shared_ptr<Ledger const>
 LedgerMaster::getLedgerBySeq(std::uint32_t index)
 {
-    if (index <= mValidLedgerSeq)
+    if (index <= validLedgerSeq_)
     {
         // Always prefer a validated ledger
-        if (auto valid = mValidLedger.get())
+        if (auto valid = validLedger_.get())
         {
             if (valid->header().seq == index)
                 return valid;
 
             try
             {
-                auto const hash = hashOfSeq(*valid, index, m_journal);
+                auto const hash = hashOfSeq(*valid, index, journal_);
 
                 if (hash)
-                    return mLedgerHistory.getLedgerByHash(*hash);
+                    return ledgerHistory_.getLedgerByHash(*hash);
             }
             catch (std::exception const&)  // NOLINT(bugprone-empty-catch)
             {
@@ -1704,10 +1702,10 @@ LedgerMaster::getLedgerBySeq(std::uint32_t index)
         }
     }
 
-    if (auto ret = mLedgerHistory.getLedgerBySeq(index))
+    if (auto ret = ledgerHistory_.getLedgerBySeq(index))
         return ret;
 
-    auto ret = mClosedLedger.get();
+    auto ret = closedLedger_.get();
     if (ret && (ret->header().seq == index))
         return ret;
 
@@ -1718,10 +1716,10 @@ LedgerMaster::getLedgerBySeq(std::uint32_t index)
 std::shared_ptr<Ledger const>
 LedgerMaster::getLedgerByHash(uint256 const& hash)
 {
-    if (auto ret = mLedgerHistory.getLedgerByHash(hash))
+    if (auto ret = ledgerHistory_.getLedgerByHash(hash))
         return ret;
 
-    auto ret = mClosedLedger.get();
+    auto ret = closedLedger_.get();
     if (ret && (ret->header().hash == hash))
         return ret;
 
@@ -1731,47 +1729,47 @@ LedgerMaster::getLedgerByHash(uint256 const& hash)
 void
 LedgerMaster::setLedgerRangePresent(std::uint32_t minV, std::uint32_t maxV)
 {
-    std::scoped_lock const sl(mCompleteLock);
-    mCompleteLedgers.insert(range(minV, maxV));
+    std::scoped_lock const sl(completeLock_);
+    completeLedgers_.insert(range(minV, maxV));
 }
 
 void
 LedgerMaster::sweep()
 {
-    mLedgerHistory.sweep();
+    ledgerHistory_.sweep();
     fetch_packs_.sweep();
 }
 
 float
 LedgerMaster::getCacheHitRate()
 {
-    return mLedgerHistory.getCacheHitRate();
+    return ledgerHistory_.getCacheHitRate();
 }
 
 void
 LedgerMaster::clearPriorLedgers(LedgerIndex seq)
 {
-    std::scoped_lock const sl(mCompleteLock);
+    std::scoped_lock const sl(completeLock_);
     if (seq > 0)
-        mCompleteLedgers.erase(range(0u, seq - 1));
+        completeLedgers_.erase(range(0u, seq - 1));
 }
 
 void
 LedgerMaster::clearLedgerCachePrior(LedgerIndex seq)
 {
-    mLedgerHistory.clearLedgerCachePrior(seq);
+    ledgerHistory_.clearLedgerCachePrior(seq);
 }
 
 void
 LedgerMaster::takeReplay(std::unique_ptr<LedgerReplay> replay)
 {
-    replayData = std::move(replay);
+    replayData_ = std::move(replay);
 }
 
 std::unique_ptr<LedgerReplay>
 LedgerMaster::releaseReplay()
 {
-    return std::move(replayData);
+    return std::move(replayData_);
 }
 
 void
@@ -1781,7 +1779,7 @@ LedgerMaster::fetchForHistory(
     InboundLedger::Reason reason,
     std::unique_lock<std::recursive_mutex>& sl)
 {
-    scope_unlock const sul{sl};
+    ScopeUnlock const sul{sl};
     if (auto hash = getLedgerHashForHistory(missing, reason))
     {
         XRPL_ASSERT(hash->isNonZero(), "xrpl::LedgerMaster::fetchForHistory : found ledger");
@@ -1794,38 +1792,38 @@ LedgerMaster::fetchForHistory(
                 if (!ledger && missing != fetch_seq_ &&
                     missing > app_.getNodeStore().earliestLedgerSeq())
                 {
-                    JLOG(m_journal.trace()) << "fetchForHistory want fetch pack " << missing;
+                    JLOG(journal_.trace()) << "fetchForHistory want fetch pack " << missing;
                     fetch_seq_ = missing;
                     getFetchPack(missing, reason);
                 }
                 else
-                    JLOG(m_journal.trace()) << "fetchForHistory no fetch pack for " << missing;
+                    JLOG(journal_.trace()) << "fetchForHistory no fetch pack for " << missing;
             }
             else
-                JLOG(m_journal.debug()) << "fetchForHistory found failed acquire";
+                JLOG(journal_.debug()) << "fetchForHistory found failed acquire";
         }
         if (ledger)
         {
             auto seq = ledger->header().seq;
             XRPL_ASSERT(seq == missing, "xrpl::LedgerMaster::fetchForHistory : sequence match");
-            JLOG(m_journal.trace()) << "fetchForHistory acquired " << seq;
+            JLOG(journal_.trace()) << "fetchForHistory acquired " << seq;
             setFullLedger(ledger, false, false);
             int fillInProgress = 0;
             {
-                std::scoped_lock const lock(m_mutex);
-                mHistLedger = ledger;
-                fillInProgress = mFillInProgress;
+                std::scoped_lock const lock(mutex_);
+                histLedger_ = ledger;
+                fillInProgress = fillInProgress_;
             }
             if (fillInProgress == 0 &&
                 app_.getRelationalDatabase().getHashByIndex(seq - 1) == ledger->header().parentHash)
             {
                 {
                     // Previous ledger is in DB
-                    std::scoped_lock const lock(m_mutex);
-                    mFillInProgress = seq;
+                    std::scoped_lock const lock(mutex_);
+                    fillInProgress_ = seq;
                 }
                 app_.getJobQueue().addJob(
-                    jtADVANCE, "TryFill", [this, ledger]() { tryFill(ledger); });
+                    JtAdvance, "TryFill", [this, ledger]() { tryFill(ledger); });
             }
             progress = true;
         }
@@ -1854,18 +1852,18 @@ LedgerMaster::fetchForHistory(
             }
             catch (std::exception const& ex)
             {
-                JLOG(m_journal.warn()) << "Threw while prefetching: " << ex.what();
+                JLOG(journal_.warn()) << "Threw while prefetching: " << ex.what();
             }
         }
     }
     else
     {
-        JLOG(m_journal.fatal()) << "Can't find ledger following prevMissing " << missing;
-        JLOG(m_journal.fatal()) << "Pub:" << mPubLedgerSeq << " Val:" << mValidLedgerSeq;
-        JLOG(m_journal.fatal()) << "Ledgers: " << app_.getLedgerMaster().getCompleteLedgers();
-        JLOG(m_journal.fatal()) << "Acquire reason: "
-                                << (reason == InboundLedger::Reason::HISTORY ? "HISTORY"
-                                                                             : "NOT HISTORY");
+        JLOG(journal_.fatal()) << "Can't find ledger following prevMissing " << missing;
+        JLOG(journal_.fatal()) << "Pub:" << pubLedgerSeq_ << " Val:" << validLedgerSeq_;
+        JLOG(journal_.fatal()) << "Ledgers: " << app_.getLedgerMaster().getCompleteLedgers();
+        JLOG(journal_.fatal()) << "Acquire reason: "
+                               << (reason == InboundLedger::Reason::HISTORY ? "HISTORY"
+                                                                            : "NOT HISTORY");
         clearLedger(missing + 1);
         progress = true;
     }
@@ -1877,40 +1875,40 @@ LedgerMaster::doAdvance(std::unique_lock<std::recursive_mutex>& sl)
 {
     do
     {
-        mAdvanceWork = false;  // If there's work to do, we'll make progress
+        advanceWork_ = false;  // If there's work to do, we'll make progress
         bool progress = false;
 
         auto const pubLedgers = findNewLedgersToPublish(sl);
         if (pubLedgers.empty())
         {
             if (!standalone_ && !app_.getFeeTrack().isLoadedLocal() &&
-                (app_.getJobQueue().getJobCount(jtPUBOLDLEDGER) < 10) &&
-                (mValidLedgerSeq == mPubLedgerSeq) &&
-                (getValidatedLedgerAge() < MAX_LEDGER_AGE_ACQUIRE) &&
-                (app_.getNodeStore().getWriteLoad() < MAX_WRITE_LOAD_ACQUIRE))
+                (app_.getJobQueue().getJobCount(JtPuboldledger) < 10) &&
+                (validLedgerSeq_ == pubLedgerSeq_) &&
+                (getValidatedLedgerAge() < kMAX_LEDGER_AGE_ACQUIRE) &&
+                (app_.getNodeStore().getWriteLoad() < kMAX_WRITE_LOAD_ACQUIRE))
             {
                 // We are in sync, so can acquire
                 InboundLedger::Reason const reason = InboundLedger::Reason::HISTORY;
                 std::optional<std::uint32_t> missing;
                 {
-                    std::scoped_lock const sll(mCompleteLock);
+                    std::scoped_lock const sll(completeLock_);
                     missing = prevMissing(
-                        mCompleteLedgers,
-                        mPubLedger->header().seq,
+                        completeLedgers_,
+                        pubLedger_->header().seq,
                         app_.getNodeStore().earliestLedgerSeq());
                 }
                 if (missing)
                 {
-                    JLOG(m_journal.trace()) << "tryAdvance discovered missing " << *missing;
-                    if ((mFillInProgress == 0 || *missing > mFillInProgress) &&
+                    JLOG(journal_.trace()) << "tryAdvance discovered missing " << *missing;
+                    if ((fillInProgress_ == 0 || *missing > fillInProgress_) &&
                         shouldAcquire(
-                            mValidLedgerSeq,
+                            validLedgerSeq_,
                             ledger_history_,
                             app_.getSHAMapStore().minimumOnline(),
                             *missing,
-                            m_journal))
+                            journal_))
                     {
-                        JLOG(m_journal.trace()) << "advanceThread should acquire";
+                        JLOG(journal_.trace()) << "advanceThread should acquire";
                     }
                     else
                     {
@@ -1920,35 +1918,35 @@ LedgerMaster::doAdvance(std::unique_lock<std::recursive_mutex>& sl)
                 if (missing)
                 {
                     fetchForHistory(*missing, progress, reason, sl);
-                    if (mValidLedgerSeq != mPubLedgerSeq)
+                    if (validLedgerSeq_ != pubLedgerSeq_)
                     {
-                        JLOG(m_journal.debug()) << "tryAdvance found last valid changed";
+                        JLOG(journal_.debug()) << "tryAdvance found last valid changed";
                         progress = true;
                     }
                 }
             }
             else
             {
-                mHistLedger.reset();
-                JLOG(m_journal.trace()) << "tryAdvance not fetching history";
+                histLedger_.reset();
+                JLOG(journal_.trace()) << "tryAdvance not fetching history";
             }
         }
         else
         {
-            JLOG(m_journal.trace())
+            JLOG(journal_.trace())
                 << "tryAdvance found " << pubLedgers.size() << " ledgers to publish";
             for (auto const& ledger : pubLedgers)
             {
                 {
-                    scope_unlock const sul{sl};
-                    JLOG(m_journal.debug()) << "tryAdvance publishing seq " << ledger->header().seq;
+                    ScopeUnlock const sul{sl};
+                    JLOG(journal_.debug()) << "tryAdvance publishing seq " << ledger->header().seq;
                     setFullLedger(ledger, true, true);
                 }
 
                 setPubLedger(ledger);
 
                 {
-                    scope_unlock const sul{sl};
+                    ScopeUnlock const sul{sl};
                     app_.getOPs().pubLedger(ledger);
                 }
             }
@@ -1957,14 +1955,14 @@ LedgerMaster::doAdvance(std::unique_lock<std::recursive_mutex>& sl)
             progress = newPFWork("PthFindNewLed", sl);
         }
         if (progress)
-            mAdvanceWork = true;
-    } while (mAdvanceWork);
+            advanceWork_ = true;
+    } while (advanceWork_);
 }
 
 void
 LedgerMaster::addFetchPack(uint256 const& hash, std::shared_ptr<Blob> data)
 {
-    fetch_packs_.canonicalize_replace_client(hash, data);
+    fetch_packs_.canonicalizeReplaceClient(hash, data);
 }
 
 std::optional<Blob>
@@ -1983,11 +1981,11 @@ LedgerMaster::getFetchPack(uint256 const& hash)
 void
 LedgerMaster::gotFetchPack(bool progress, std::uint32_t seq)
 {
-    if (!mGotFetchPackThread.test_and_set(std::memory_order_acquire))
+    if (!gotFetchPackThread_.test_and_set(std::memory_order_acquire))
     {
-        app_.getJobQueue().addJob(jtLEDGER_DATA, "GotFetchPack", [&]() {
+        app_.getJobQueue().addJob(JtLedgerData, "GotFetchPack", [&]() {
             app_.getInboundLedgers().gotFetchPack();
-            mGotFetchPackThread.clear(std::memory_order_release);
+            gotFetchPackThread_.clear(std::memory_order_release);
         });
     }
 }
@@ -2037,7 +2035,7 @@ populateFetchPack(
         s.erase();
         n.serializeWithPrefix(s);
 
-        auto const& hash = n.getHash().as_uint256();
+        auto const& hash = n.getHash().asUint256();
 
         protocol::TMIndexedObject* obj = into->add_objects();
         obj->set_ledgerseq(seq);
@@ -2058,13 +2056,13 @@ LedgerMaster::makeFetchPack(
     using namespace std::chrono_literals;
     if (UptimeClock::now() > uptime + 1s)
     {
-        JLOG(m_journal.info()) << "Fetch pack request got stale";
+        JLOG(journal_.info()) << "Fetch pack request got stale";
         return;
     }
 
     if (app_.getFeeTrack().isLoadedLocal() || (getValidatedLedgerAge() > 40s))
     {
-        JLOG(m_journal.info()) << "Too busy to make fetch pack";
+        JLOG(journal_.info()) << "Too busy to make fetch pack";
         return;
     }
 
@@ -2077,22 +2075,22 @@ LedgerMaster::makeFetchPack(
 
     if (!have)
     {
-        JLOG(m_journal.info()) << "Peer requests fetch pack for ledger we don't have: " << have;
-        peer->charge(Resource::feeRequestNoReply, "get_object ledger");
+        JLOG(journal_.info()) << "Peer requests fetch pack for ledger we don't have: " << have;
+        peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "get_object ledger");
         return;
     }
 
     if (have->open())
     {
-        JLOG(m_journal.warn()) << "Peer requests fetch pack from open ledger: " << have;
-        peer->charge(Resource::feeMalformedRequest, "get_object ledger open");
+        JLOG(journal_.warn()) << "Peer requests fetch pack from open ledger: " << have;
+        peer->charge(Resource::kFEE_MALFORMED_REQUEST, "get_object ledger open");
         return;
     }
 
     if (have->header().seq < getEarliestFetch())
     {
-        JLOG(m_journal.debug()) << "Peer requests fetch pack that is too early";
-        peer->charge(Resource::feeMalformedRequest, "get_object ledger early");
+        JLOG(journal_.debug()) << "Peer requests fetch pack that is too early";
+        peer->charge(Resource::kFEE_MALFORMED_REQUEST, "get_object ledger early");
         return;
     }
 
@@ -2100,9 +2098,9 @@ LedgerMaster::makeFetchPack(
 
     if (!want)
     {
-        JLOG(m_journal.info()) << "Peer requests fetch pack for ledger whose predecessor we "
-                               << "don't have: " << have;
-        peer->charge(Resource::feeRequestNoReply, "get_object ledger no parent");
+        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");
         return;
     }
 
@@ -2132,7 +2130,7 @@ LedgerMaster::makeFetchPack(
                 // Serialize the ledger header:
                 hdr.erase();
 
-                hdr.add32(HashPrefix::ledgerMaster);
+                hdr.add32(HashPrefix::LedgerMaster);
                 addRaw(want->header(), hdr);
 
                 // Add the data
@@ -2158,14 +2156,14 @@ LedgerMaster::makeFetchPack(
 
         auto msg = std::make_shared<Message>(reply, protocol::mtGET_OBJECTS);
 
-        JLOG(m_journal.info()) << "Built fetch pack with " << reply.objects().size() << " nodes ("
-                               << msg->getBufferSize() << " bytes)";
+        JLOG(journal_.info()) << "Built fetch pack with " << reply.objects().size() << " nodes ("
+                              << msg->getBufferSize() << " bytes)";
 
         peer->send(msg);
     }
     catch (std::exception const& ex)
     {
-        JLOG(m_journal.warn()) << "Exception building fetch pack. Exception: " << ex.what();
+        JLOG(journal_.warn()) << "Exception building fetch pack. Exception: " << ex.what();
     }
 }
 
diff --git a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
index 0edf425f13..70e2684e1c 100644
--- a/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerPersistence.cpp
@@ -8,7 +8,9 @@
 #include <xrpl/core/JobQueue.h>
 #include <xrpl/core/ServiceRegistry.h>
 #include <xrpl/ledger/PendingSaves.h>
+#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/rdb/RelationalDatabase.h>
 
 #include <cstdint>
@@ -78,7 +80,7 @@ pendSaveValidated(
     // See if we can use the JobQueue.
     if (!isSynchronous &&
         registry.getJobQueue().addJob(
-            isCurrent ? jtPUBLEDGER : jtPUBOLDLEDGER,
+            isCurrent ? JtPubledger : JtPuboldledger,
             "Pub" + std::to_string(ledger->seq()),
             [&registry, ledger, isCurrent]() { saveValidatedLedger(registry, ledger, isCurrent); }))
     {
@@ -120,7 +122,7 @@ finishLoadByIndexOrHash(std::shared_ptr<Ledger> const& ledger, beast::Journal j)
         return;
 
     XRPL_ASSERT(
-        ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
+        ledger->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
         "xrpl::finishLoadByIndexOrHash : valid ledger fees");
     ledger->setImmutable();
 
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
index 9facb24c9d..3df1e99cae 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayMsgHandler.cpp
@@ -160,7 +160,7 @@ LedgerReplayMsgHandler::processProofPathResponse(
         return false;
     }
 
-    if (auto item = safe_downcast<SHAMapLeafNode*>(node.get())->peekItem())
+    if (auto item = safeDowncast<SHAMapLeafNode*>(node.get())->peekItem())
     {
         replayer_.gotSkipList(info, item);
         return true;
@@ -205,7 +205,7 @@ LedgerReplayMsgHandler::processReplayDeltaRequest(
     });
 
     JLOG(journal_.debug()) << "getReplayDelta for ledger " << ledgerHash << " txMap hash "
-                           << txMap.getHash().as_uint256();
+                           << txMap.getHash().asUint256();
     return reply;
 }
 
@@ -258,7 +258,7 @@ LedgerReplayMsgHandler::processReplayDeltaResponse(
             orderedTxns.emplace(meta[sfTransactionIndex], std::move(tx));
 
             if (!txMap.addGiveItem(
-                    SHAMapNodeType::tnTRANSACTION_MD, make_shamapitem(tid, shaMapItemData.slice())))
+                    SHAMapNodeType::TnTransactionMd, makeShamapitem(tid, shaMapItemData.slice())))
             {
                 JLOG(journal_.debug()) << "Bad message: Cannot deserialize";
                 return false;
@@ -271,7 +271,7 @@ LedgerReplayMsgHandler::processReplayDeltaResponse(
         return false;
     }
 
-    if (txMap.getHash().as_uint256() != info.txHash)
+    if (txMap.getHash().asUint256() != info.txHash)
     {
         JLOG(journal_.debug()) << "Bad message: Transactions verify failed";
         return false;
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
index 1afe94bbc8..dcc09faa13 100644
--- a/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerReplayTask.cpp
@@ -25,7 +25,7 @@ LedgerReplayTask::TaskParameter::TaskParameter(
     InboundLedger::Reason r,
     uint256 const& finishLedgerHash,
     std::uint32_t totalNumLedgers)
-    : reason_(r), finishHash_(finishLedgerHash), totalLedgers_(totalNumLedgers)
+    : reason(r), finishHash(finishLedgerHash), totalLedgers(totalNumLedgers)
 {
     XRPL_ASSERT(
         finishLedgerHash.isNonZero() && totalNumLedgers > 0,
@@ -39,37 +39,37 @@ LedgerReplayTask::TaskParameter::update(
     std::uint32_t seq,
     std::vector<uint256> const& sList)
 {
-    if (finishHash_ != hash || sList.size() + 1 < totalLedgers_ || full_)
+    if (finishHash != hash || sList.size() + 1 < totalLedgers || full)
         return false;
 
-    finishSeq_ = seq;
-    skipList_ = sList;
-    skipList_.emplace_back(finishHash_);
-    startHash_ = skipList_[skipList_.size() - totalLedgers_];
+    finishSeq = seq;
+    skipList = sList;
+    skipList.emplace_back(finishHash);
+    startHash = skipList[skipList.size() - totalLedgers];
     XRPL_ASSERT(
-        startHash_.isNonZero(),
+        startHash.isNonZero(),
         "xrpl::LedgerReplayTask::TaskParameter::update : nonzero start hash");
-    startSeq_ = finishSeq_ - totalLedgers_ + 1;
-    full_ = true;
+    startSeq = finishSeq - totalLedgers + 1;
+    full = true;
     return true;
 }
 
 bool
 LedgerReplayTask::TaskParameter::canMergeInto(TaskParameter const& existingTask) const
 {
-    if (reason_ == existingTask.reason_)
+    if (reason == existingTask.reason)
     {
-        if (finishHash_ == existingTask.finishHash_ && totalLedgers_ <= existingTask.totalLedgers_)
+        if (finishHash == existingTask.finishHash && totalLedgers <= existingTask.totalLedgers)
         {
             return true;
         }
 
-        if (existingTask.full_)
+        if (existingTask.full)
         {
-            auto const& exList = existingTask.skipList_;
-            if (auto i = std::ranges::find(exList, finishHash_); i != exList.end())
+            auto const& exList = existingTask.skipList;
+            if (auto i = std::ranges::find(exList, finishHash); i != exList.end())
             {
-                return existingTask.totalLedgers_ >= totalLedgers_ + (exList.end() - i) - 1;
+                return existingTask.totalLedgers >= totalLedgers + (exList.end() - i) - 1;
             }
         }
     }
@@ -85,19 +85,19 @@ LedgerReplayTask::LedgerReplayTask(
     TaskParameter const& parameter)
     : TimeoutCounter(
           app,
-          parameter.finishHash_,
-          LedgerReplayParameters::TASK_TIMEOUT,
-          {.jobType = jtREPLAY_TASK,
+          parameter.finishHash,
+          LedgerReplayParameters::kTASK_TIMEOUT,
+          {.jobType = JtReplayTask,
            .jobName = "LedReplTask",
-           .jobLimit = LedgerReplayParameters::MAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
           app.getJournal("LedgerReplayTask"))
     , inboundLedgers_(inboundLedgers)
     , replayer_(replayer)
     , parameter_(parameter)
     , maxTimeouts_(
           std::max(
-              LedgerReplayParameters::TASK_MAX_TIMEOUTS_MINIMUM,
-              parameter.totalLedgers_ * LedgerReplayParameters::TASK_MAX_TIMEOUTS_MULTIPLIER))
+              LedgerReplayParameters::kTASK_MAX_TIMEOUTS_MINIMUM,
+              parameter.totalLedgers * LedgerReplayParameters::kTASK_MAX_TIMEOUTS_MULTIPLIER))
     , skipListAcquirer_(skipListAcquirer)
 {
     JLOG(journal_.trace()) << "Create " << hash_;
@@ -141,21 +141,21 @@ void
 LedgerReplayTask::trigger(ScopedLockType& sl)
 {
     JLOG(journal_.trace()) << "trigger " << hash_;
-    if (!parameter_.full_)
+    if (!parameter_.full)
         return;
 
     if (!parent_)
     {
-        parent_ = app_.getLedgerMaster().getLedgerByHash(parameter_.startHash_);
+        parent_ = app_.getLedgerMaster().getLedgerByHash(parameter_.startHash);
         if (!parent_)
         {
             parent_ = inboundLedgers_.acquire(
-                parameter_.startHash_, parameter_.startSeq_, InboundLedger::Reason::GENERIC);
+                parameter_.startHash, parameter_.startSeq, InboundLedger::Reason::GENERIC);
         }
         if (parent_)
         {
             JLOG(journal_.trace())
-                << "Got start ledger " << parameter_.startHash_ << " for task " << hash_;
+                << "Got start ledger " << parameter_.startHash << " for task " << hash_;
         }
     }
 
@@ -175,13 +175,12 @@ void
 LedgerReplayTask::tryAdvance(ScopedLockType& sl)
 {
     JLOG(journal_.trace()) << "tryAdvance task " << hash_
-                           << (parameter_.full_ ? ", full parameter"
-                                                : ", waiting to fill parameter")
+                           << (parameter_.full ? ", full parameter" : ", waiting to fill parameter")
                            << ", deltaIndex=" << deltaToBuild_ << ", totalDeltas=" << deltas_.size()
                            << ", parent " << (parent_ ? parent_->header().hash : uint256());
 
     bool const shouldTry =
-        parent_ && parameter_.full_ && parameter_.totalLedgers_ - 1 == deltas_.size();
+        parent_ && parameter_.full && parameter_.totalLedgers - 1 == deltas_.size();
     if (!shouldTry)
         return;
 
@@ -242,7 +241,7 @@ LedgerReplayTask::updateSkipList(
 void
 LedgerReplayTask::onTimer(bool progress, ScopedLockType& sl)
 {
-    JLOG(journal_.trace()) << "mTimeouts=" << timeouts_ << " for " << hash_;
+    JLOG(journal_.trace()) << "timeouts_=" << timeouts_ << " for " << hash_;
     if (timeouts_ > maxTimeouts_)
     {
         failed_ = true;
@@ -264,7 +263,7 @@ void
 LedgerReplayTask::addDelta(std::shared_ptr<LedgerDeltaAcquire> const& delta)
 {
     std::weak_ptr<LedgerReplayTask> const wptr = shared_from_this();
-    delta->addDataCallback(parameter_.reason_, [wptr](bool good, uint256 const& hash) {
+    delta->addDataCallback(parameter_.reason, [wptr](bool good, uint256 const& hash) {
         if (auto sptr = wptr.lock(); sptr)
         {
             if (!good)
diff --git a/src/xrpld/app/ledger/detail/LedgerReplayer.cpp b/src/xrpld/app/ledger/detail/LedgerReplayer.cpp
index 8f5d38132c..132bf9ccaa 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::MAX_TASK_SIZE,
+            totalNumLedgers <= LedgerReplayParameters::kMAX_TASK_SIZE,
         "xrpl::LedgerReplayer::replay : valid inputs");
 
     // NOLINTNEXTLINE(misc-const-correctness)
@@ -64,9 +64,9 @@ LedgerReplayer::replay(
         std::scoped_lock const lock(mtx_);
         if (app_.isStopping())
             return;
-        if (tasks_.size() >= LedgerReplayParameters::MAX_TASKS)
+        if (tasks_.size() >= LedgerReplayParameters::kMAX_TASKS)
         {
-            JLOG(j_.info()) << "Too many replay tasks, dropping new task " << parameter.finishHash_;
+            JLOG(j_.info()) << "Too many replay tasks, dropping new task " << parameter.finishHash;
             return;
         }
 
@@ -74,23 +74,23 @@ LedgerReplayer::replay(
         {
             if (parameter.canMergeInto(t->getTaskParameter()))
             {
-                JLOG(j_.info()) << "Task " << parameter.finishHash_ << " with " << totalNumLedgers
+                JLOG(j_.info()) << "Task " << parameter.finishHash << " with " << totalNumLedgers
                                 << " ledgers merged into an existing task.";
                 return;
             }
         }
         JLOG(j_.info()) << "Replay " << totalNumLedgers << " ledgers. Finish ledger hash "
-                        << parameter.finishHash_;
+                        << parameter.finishHash;
 
-        auto i = skipLists_.find(parameter.finishHash_);
+        auto i = skipLists_.find(parameter.finishHash);
         if (i != skipLists_.end())
             skipList = i->second.lock();
 
         if (!skipList)  // cannot find, or found but cannot lock
         {
             skipList = std::make_shared<SkipListAcquire>(
-                app_, inboundLedgers_, parameter.finishHash_, peerSetBuilder_->build());
-            skipLists_[parameter.finishHash_] = skipList;
+                app_, inboundLedgers_, parameter.finishHash, peerSetBuilder_->build());
+            skipLists_[parameter.finishHash] = skipList;
             newSkipList = true;
         }
 
@@ -116,24 +116,24 @@ LedgerReplayer::createDeltas(std::shared_ptr<LedgerReplayTask> task)
     }
 
     auto const& parameter = task->getTaskParameter();
-    JLOG(j_.trace()) << "Creating " << parameter.totalLedgers_ - 1 << " deltas";
-    if (parameter.totalLedgers_ > 1)
+    JLOG(j_.trace()) << "Creating " << parameter.totalLedgers - 1 << " deltas";
+    if (parameter.totalLedgers > 1)
     {
-        auto skipListItem = std::ranges::find(parameter.skipList_, parameter.startHash_);
-        auto const wasLast = skipListItem == parameter.skipList_.end();
+        auto skipListItem = std::ranges::find(parameter.skipList, parameter.startHash);
+        auto const wasLast = skipListItem == parameter.skipList.end();
         if (not wasLast)
             ++skipListItem;
-        auto const isLast = skipListItem == parameter.skipList_.end();
+        auto const isLast = skipListItem == parameter.skipList.end();
 
         if (wasLast || isLast)
         {
             JLOG(j_.error()) << "Task parameter error when creating deltas "
-                             << parameter.finishHash_;
+                             << parameter.finishHash;
             return;
         }
 
-        for (std::uint32_t seq = parameter.startSeq_ + 1;
-             seq <= parameter.finishSeq_ && skipListItem != parameter.skipList_.end();
+        for (std::uint32_t seq = parameter.startSeq + 1;
+             seq <= parameter.finishSeq && skipListItem != parameter.skipList.end();
              ++seq, ++skipListItem)
         {
             std::shared_ptr<LedgerDeltaAcquire> delta;
@@ -224,7 +224,7 @@ LedgerReplayer::sweep()
                 [this](auto const& t) -> bool {
                     if (t->finished())
                     {
-                        JLOG(j_.debug()) << "Sweep task " << t->getTaskParameter().finishHash_;
+                        JLOG(j_.debug()) << "Sweep task " << t->getTaskParameter().finishHash;
                         return true;
                     }
                     return false;
diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
index 2d244942e7..5248c3621a 100644
--- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp
+++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp
@@ -38,27 +38,27 @@ namespace {
 bool
 isFull(LedgerFill const& fill)
 {
-    return (fill.options & LedgerFill::full) != 0;
+    return (fill.options & LedgerFill::Full) != 0;
 }
 
 bool
 isExpanded(LedgerFill const& fill)
 {
-    return isFull(fill) || ((fill.options & LedgerFill::expand) != 0);
+    return isFull(fill) || ((fill.options & LedgerFill::Expand) != 0);
 }
 
 bool
 isBinary(LedgerFill const& fill)
 {
-    return (fill.options & LedgerFill::binary) != 0;
+    return (fill.options & LedgerFill::Binary) != 0;
 }
 
 void
-fillJson(Json::Value& json, bool closed, LedgerHeader const& info, bool bFull, unsigned apiVersion)
+fillJson(json::Value& json, bool closed, LedgerHeader const& info, bool bFull, unsigned apiVersion)
 {
     json[jss::parent_hash] = to_string(info.parentHash);
     json[jss::ledger_index] =
-        (apiVersion > 1) ? Json::Value(info.seq) : Json::Value(std::to_string(info.seq));
+        (apiVersion > 1) ? json::Value(info.seq) : json::Value(std::to_string(info.seq));
 
     if (closed)
     {
@@ -87,12 +87,12 @@ fillJson(Json::Value& json, bool closed, LedgerHeader const& info, bool bFull, u
         json[jss::close_time_human] = to_string(info.closeTime);
         if (!getCloseAgree(info))
             json[jss::close_time_estimated] = true;
-        json[jss::close_time_iso] = to_string_iso(info.closeTime);
+        json[jss::close_time_iso] = toStringIso(info.closeTime);
     }
 }
 
 void
-fillJsonBinary(Json::Value& json, bool closed, LedgerHeader const& info)
+fillJsonBinary(json::Value& json, bool closed, LedgerHeader const& info)
 {
     if (!closed)
     {
@@ -108,7 +108,7 @@ fillJsonBinary(Json::Value& json, bool closed, LedgerHeader const& info)
     }
 }
 
-Json::Value
+json::Value
 fillJsonTx(
     LedgerFill const& fill,
     bool bBinary,
@@ -119,7 +119,7 @@ fillJsonTx(
     if (!bExpanded)
         return to_string(txn->getTransactionID());
 
-    Json::Value txJson{Json::objectValue};
+    json::Value txJson{json::ObjectValue};
     auto const txnType = txn->getTxnType();
     if (bBinary)
     {
@@ -127,19 +127,19 @@ fillJsonTx(
         if (fill.context->apiVersion > 1)
             txJson[jss::hash] = to_string(txn->getTransactionID());
 
-        auto const json_meta = (fill.context->apiVersion > 1 ? jss::meta_blob : jss::meta);
+        auto const jsonMeta = (fill.context->apiVersion > 1 ? jss::meta_blob : jss::meta);
         if (stMeta)
-            txJson[json_meta] = serializeHex(*stMeta);
+            txJson[jsonMeta] = serializeHex(*stMeta);
     }
     else if (fill.context->apiVersion > 1)
     {
-        copyFrom(txJson[jss::tx_json], txn->getJson(JsonOptions::disable_API_prior_V2, false));
+        copyFrom(txJson[jss::tx_json], txn->getJson(JsonOptions::KDisableApiPriorV2, false));
         txJson[jss::hash] = to_string(txn->getTransactionID());
         RPC::insertDeliverMax(txJson[jss::tx_json], txnType, fill.context->apiVersion);
 
         if (stMeta)
         {
-            txJson[jss::meta] = stMeta->getJson(JsonOptions::none);
+            txJson[jss::meta] = stMeta->getJson(JsonOptions::KNone);
 
             // If applicable, insert delivered amount
             if (txnType == ttPAYMENT || txnType == ttCHECK_CASH)
@@ -166,16 +166,16 @@ fillJsonTx(
             auto const seq = fill.ledger.seq();
             txJson[jss::ledger_index] = seq;
             if (fill.closeTime)
-                txJson[jss::close_time_iso] = to_string_iso(*fill.closeTime);
+                txJson[jss::close_time_iso] = toStringIso(*fill.closeTime);
         }
     }
     else
     {
-        copyFrom(txJson, txn->getJson(JsonOptions::none));
+        copyFrom(txJson, txn->getJson(JsonOptions::KNone));
         RPC::insertDeliverMax(txJson, txnType, fill.context->apiVersion);
         if (stMeta)
         {
-            txJson[jss::metaData] = stMeta->getJson(JsonOptions::none);
+            txJson[jss::metaData] = stMeta->getJson(JsonOptions::KNone);
 
             // If applicable, insert delivered amount
             if (txnType == ttPAYMENT || txnType == ttCHECK_CASH)
@@ -193,7 +193,7 @@ fillJsonTx(
         }
     }
 
-    if (((fill.options & LedgerFill::ownerFunds) != 0) && txn->getTxnType() == ttOFFER_CREATE)
+    if (((fill.options & LedgerFill::OwnerFunds) != 0) && txn->getTxnType() == ttOFFER_CREATE)
     {
         auto const account = txn->getAccountID(sfAccount);
         auto const amount = txn->getFieldAmount(sfTakerGets);
@@ -206,7 +206,7 @@ fillJsonTx(
                 fill.ledger,
                 account,
                 amount,
-                FreezeHandling::fhIGNORE_FREEZE,
+                FreezeHandling::IgnoreFreeze,
                 beast::Journal{beast::Journal::getNullSink()});
             txJson[jss::owner_funds] = ownerFunds.getText();
         }
@@ -216,9 +216,9 @@ fillJsonTx(
 }
 
 void
-fillJsonTx(Json::Value& json, LedgerFill const& fill)
+fillJsonTx(json::Value& json, LedgerFill const& fill)
 {
-    auto& txns = json[jss::transactions] = Json::arrayValue;
+    auto& txns = json[jss::transactions] = json::ArrayValue;
     auto bBinary = isBinary(fill);
     auto bExpanded = isExpanded(fill);
 
@@ -244,10 +244,10 @@ fillJsonTx(Json::Value& json, LedgerFill const& fill)
 }
 
 void
-fillJsonState(Json::Value& json, LedgerFill const& fill)
+fillJsonState(json::Value& json, LedgerFill const& fill)
 {
     auto& ledger = fill.ledger;
-    auto& array = json[jss::accountState] = Json::arrayValue;
+    auto& array = json[jss::accountState] = json::ArrayValue;
     auto expanded = isExpanded(fill);
     auto binary = isBinary(fill);
 
@@ -255,13 +255,13 @@ fillJsonState(Json::Value& json, LedgerFill const& fill)
     {
         if (binary)
         {
-            auto& obj = array.append(Json::objectValue);
+            auto& obj = array.append(json::ObjectValue);
             obj[jss::hash] = to_string(sle->key());
             obj[jss::tx_blob] = serializeHex(*sle);
         }
         else if (expanded)
         {
-            array.append(sle->getJson(JsonOptions::none));
+            array.append(sle->getJson(JsonOptions::KNone));
         }
         else
         {
@@ -271,15 +271,15 @@ fillJsonState(Json::Value& json, LedgerFill const& fill)
 }
 
 void
-fillJsonQueue(Json::Value& json, LedgerFill const& fill)
+fillJsonQueue(json::Value& json, LedgerFill const& fill)
 {
-    auto& queueData = json[jss::queue_data] = Json::arrayValue;
+    auto& queueData = json[jss::queue_data] = json::ArrayValue;
     auto bBinary = isBinary(fill);
     auto bExpanded = isExpanded(fill);
 
     for (auto const& tx : fill.txQueue)
     {
-        auto& txJson = queueData.append(Json::objectValue);
+        auto& txJson = queueData.append(json::ObjectValue);
         txJson[jss::fee_level] = to_string(tx.feeLevel);
         if (tx.lastValid)
             txJson[jss::LastLedgerSequence] = *tx.lastValid;
@@ -308,7 +308,7 @@ fillJsonQueue(Json::Value& json, LedgerFill const& fill)
 }
 
 void
-fillJson(Json::Value& json, LedgerFill const& fill)
+fillJson(json::Value& json, LedgerFill const& fill)
 {
     // TODO: what happens if bBinary and bExtracted are both set?
     // Is there a way to report this back?
@@ -325,38 +325,38 @@ fillJson(Json::Value& json, LedgerFill const& fill)
             fill.ledger.header(),
             bFull,
             ((fill.context != nullptr) ? fill.context->apiVersion
-                                       : RPC::apiMaximumSupportedVersion));
+                                       : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION));
     }
 
-    if (bFull || ((fill.options & LedgerFill::dumpTxrp) != 0))
+    if (bFull || ((fill.options & LedgerFill::DumpTxrp) != 0))
         fillJsonTx(json, fill);
 
-    if (bFull || ((fill.options & LedgerFill::dumpState) != 0))
+    if (bFull || ((fill.options & LedgerFill::DumpState) != 0))
         fillJsonState(json, fill);
 }
 
 }  // namespace
 
 void
-addJson(Json::Value& json, LedgerFill const& fill)
+addJson(json::Value& json, LedgerFill const& fill)
 {
-    auto& object = json[jss::ledger] = Json::objectValue;
+    auto& object = json[jss::ledger] = json::ObjectValue;
     fillJson(object, fill);
 
-    if (((fill.options & LedgerFill::dumpQueue) != 0) && !fill.txQueue.empty())
+    if (((fill.options & LedgerFill::DumpQueue) != 0) && !fill.txQueue.empty())
         fillJsonQueue(json, fill);
 }
 
-Json::Value
+json::Value
 getJson(LedgerFill const& fill)
 {
-    Json::Value json;
+    json::Value json;
     fillJson(json, fill);
     return json;
 }
 
 void
-copyFrom(Json::Value& to, Json::Value const& from)
+copyFrom(json::Value& to, json::Value const& from)
 {
     if (!to)
     {  // Short circuit this very common case.
diff --git a/src/xrpld/app/ledger/detail/LocalTxs.cpp b/src/xrpld/app/ledger/detail/LocalTxs.cpp
index 6cc83261d1..0f355367e5 100644
--- a/src/xrpld/app/ledger/detail/LocalTxs.cpp
+++ b/src/xrpld/app/ledger/detail/LocalTxs.cpp
@@ -47,52 +47,52 @@ class LocalTx
 {
 public:
     LocalTx(LedgerIndex index, std::shared_ptr<STTx const> const& txn)
-        : m_txn(txn)
-        , m_expire(index + LocalTxs::holdLedgers)
-        , m_id(txn->getTransactionID())
-        , m_account(txn->getAccountID(sfAccount))
-        , m_seqProxy(txn->getSeqProxy())
+        : txn_(txn)
+        , expire_(index + LocalTxs::kHOLD_LEDGERS)
+        , id_(txn->getTransactionID())
+        , account_(txn->getAccountID(sfAccount))
+        , seqProxy_(txn->getSeqProxy())
     {
         if (txn->isFieldPresent(sfLastLedgerSequence))
-            m_expire = std::min(m_expire, txn->getFieldU32(sfLastLedgerSequence) + 1);
+            expire_ = std::min(expire_, txn->getFieldU32(sfLastLedgerSequence) + 1);
     }
 
     [[nodiscard]] uint256 const&
     getID() const
     {
-        return m_id;
+        return id_;
     }
 
     [[nodiscard]] SeqProxy
     getSeqProxy() const
     {
-        return m_seqProxy;
+        return seqProxy_;
     }
 
     [[nodiscard]] bool
     isExpired(LedgerIndex i) const
     {
-        return i > m_expire;
+        return i > expire_;
     }
 
     [[nodiscard]] std::shared_ptr<STTx const> const&
     getTX() const
     {
-        return m_txn;
+        return txn_;
     }
 
     [[nodiscard]] AccountID const&
     getAccount() const
     {
-        return m_account;
+        return account_;
     }
 
 private:
-    std::shared_ptr<STTx const> m_txn;
-    LedgerIndex m_expire;
-    uint256 m_id;
-    AccountID m_account;
-    SeqProxy m_seqProxy;
+    std::shared_ptr<STTx const> txn_;
+    LedgerIndex expire_;
+    uint256 id_;
+    AccountID account_;
+    SeqProxy seqProxy_;
 };
 
 //------------------------------------------------------------------------------
@@ -104,11 +104,11 @@ public:
 
     // Add a new transaction to the set of local transactions
     void
-    push_back(LedgerIndex index, std::shared_ptr<STTx const> const& txn) override
+    pushBack(LedgerIndex index, std::shared_ptr<STTx const> const& txn) override
     {
-        std::scoped_lock const lock(m_lock);
+        std::scoped_lock const lock(lock_);
 
-        m_txns.emplace_back(index, txn);
+        txns_.emplace_back(index, txn);
     }
 
     CanonicalTXSet
@@ -119,9 +119,9 @@ public:
         // Get the set of local transactions as a canonical
         // set (so they apply in a valid order)
         {
-            std::scoped_lock const lock(m_lock);
+            std::scoped_lock const lock(lock_);
 
-            for (auto const& it : m_txns)
+            for (auto const& it : txns_)
                 tset.insert(it.getTX());
         }
         return tset;
@@ -133,9 +133,9 @@ public:
     void
     sweep(ReadView const& view) override
     {
-        std::scoped_lock const lock(m_lock);
+        std::scoped_lock const lock(lock_);
 
-        m_txns.remove_if([&view](auto const& txn) {
+        txns_.remove_if([&view](auto const& txn) {
             if (txn.isExpired(view.header().seq))
                 return true;
             if (view.txExists(txn.getID()))
@@ -163,25 +163,25 @@ public:
 
             // Ticket should have been created by now.  Remove if ticket
             // does not exist.
-            return !view.exists(keylet::ticket(acctID, seqProx));
+            return !view.exists(keylet::kTICKET(acctID, seqProx));
         });
     }
 
     std::size_t
     size() override
     {
-        std::scoped_lock const lock(m_lock);
+        std::scoped_lock const lock(lock_);
 
-        return m_txns.size();
+        return txns_.size();
     }
 
 private:
-    std::mutex m_lock;
-    std::list<LocalTx> m_txns;
+    std::mutex lock_;
+    std::list<LocalTx> txns_;
 };
 
 std::unique_ptr<LocalTxs>
-make_LocalTxs()
+makeLocalTxs()
 {
     return std::make_unique<LocalTxsImp>();
 }
diff --git a/src/xrpld/app/ledger/detail/OpenLedger.cpp b/src/xrpld/app/ledger/detail/OpenLedger.cpp
index 20ddf27237..5774dd8863 100644
--- a/src/xrpld/app/ledger/detail/OpenLedger.cpp
+++ b/src/xrpld/app/ledger/detail/OpenLedger.cpp
@@ -14,6 +14,7 @@
 #include <xrpl/ledger/OpenView.h>
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/Rules.h>
+#include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STObject.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/Serializer.h>
@@ -163,11 +164,11 @@ std::shared_ptr<OpenView>
 OpenLedger::create(Rules const& rules, std::shared_ptr<Ledger const> const& ledger)
 {
     return std::make_shared<OpenView>(
-        open_ledger, rules, std::make_shared<CachedLedger const>(ledger, cache_));
+        kOPEN_LEDGER, rules, std::make_shared<CachedLedger const>(ledger, cache_));
 }
 
 auto
-OpenLedger::apply_one(
+OpenLedger::applyOne(
     Application& app,
     OpenView& view,
     std::shared_ptr<STTx const> const& tx,
@@ -176,14 +177,14 @@ OpenLedger::apply_one(
     beast::Journal j) -> Result
 {
     if (retry)
-        flags = flags | tapRETRY;
+        flags = flags | TapRetry;
     // If it's in anybody's proposed set, try to keep it in the ledger
     auto const result = xrpl::apply(app, view, *tx, flags, j);
     if (result.applied || result.ter == terQUEUED)
-        return Result::success;
+        return Result::Success;
     if (isTefFailure(result.ter) || isTemMalformed(result.ter) || isTelLocal(result.ter))
-        return Result::failure;
-    return Result::retry;
+        return Result::Failure;
+    return Result::Retry;
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/xrpld/app/ledger/detail/SkipListAcquire.cpp b/src/xrpld/app/ledger/detail/SkipListAcquire.cpp
index c77c0f1b03..e6b41198bb 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::SUB_TASK_TIMEOUT,
-          {.jobType = jtREPLAY_TASK,
+          LedgerReplayParameters::kSUB_TASK_TIMEOUT,
+          {.jobType = JtReplayTask,
            .jobName = "SkipListAcq",
-           .jobLimit = LedgerReplayParameters::MAX_QUEUED_TASKS},
+           .jobLimit = LedgerReplayParameters::kMAX_QUEUED_TASKS},
           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::MAX_NO_FEATURE_PEER_COUNT)
+                    if (++noFeaturePeerCount_ >= LedgerReplayParameters::kMAX_NO_FEATURE_PEER_COUNT)
                     {
                         JLOG(journal_.debug()) << "Fall back for " << hash_;
-                        timerInterval_ = LedgerReplayParameters::SUB_TASK_FALLBACK_TIMEOUT;
+                        timerInterval_ = LedgerReplayParameters::kSUB_TASK_FALLBACK_TIMEOUT;
                         fallBack_ = true;
                     }
                 }
@@ -111,8 +111,8 @@ SkipListAcquire::trigger(std::size_t limit, ScopedLockType& sl)
 void
 SkipListAcquire::onTimer(bool progress, ScopedLockType& sl)
 {
-    JLOG(journal_.trace()) << "mTimeouts=" << timeouts_ << " for " << hash_;
-    if (timeouts_ > LedgerReplayParameters::SUB_TASK_MAX_TIMEOUTS)
+    JLOG(journal_.trace()) << "timeouts_=" << timeouts_ << " for " << hash_;
+    if (timeouts_ > LedgerReplayParameters::kSUB_TASK_MAX_TIMEOUTS)
     {
         failed_ = true;
         JLOG(journal_.debug()) << "too many timeouts " << hash_;
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h
index a7e4c043be..18b443c67d 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.h
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h
@@ -21,7 +21,7 @@ namespace xrpl {
 
     1. The entry point is `setTimer`.
 
-    2. After `mTimerInterval`, `queueJob` is called, which schedules a job to
+    2. After `timerInterval_`, `queueJob` is called, which schedules a job to
        call `invokeOnTimer` (or loops back to setTimer if there are too many
        concurrent jobs).
 
@@ -30,7 +30,7 @@ namespace xrpl {
 
     4. `onTimer` is the only "real" virtual method in this class. It is the
        callback for when the timeout expires. Generally, its only responsibility
-       is to set `mFailed = true`. However, if it wants to implement a policy of
+       is to set `failed_ = true`. However, if it wants to implement a policy of
        retries, then it has a chance to just increment a count of expired
        timeouts.
 
@@ -39,11 +39,11 @@ namespace xrpl {
 
    This loop executes concurrently with another asynchronous sequence,
    implemented by the subtype, that is trying to make progress and eventually
-   set `mComplete = true`. While it is making progress but not complete, it
-   should set `mProgress = true`, which is passed to onTimer so it can decide
+   set `complete_ = true`. While it is making progress but not complete, it
+   should set `progress_ = true`, which is passed to onTimer so it can decide
    whether to postpone failure and reset the timeout. However, if it can
    complete all its work in one synchronous step (while it holds the lock), then
-   it can ignore `mProgress`.
+   it can ignore `progress_`.
 */
 class TimeoutCounter
 {
@@ -78,7 +78,7 @@ protected:
         QueueJobParameter&& jobParameter,
         beast::Journal journal);
 
-    /** Schedule a call to queueJob() after mTimerInterval. */
+    /** Schedule a call to queueJob() after timerInterval_. */
     void
     setTimer(ScopedLockType&);
 
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
index 686d33ce63..f79620f99d 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
@@ -29,13 +29,13 @@ namespace xrpl {
 using namespace std::chrono_literals;
 
 // Timeout interval in milliseconds
-auto constexpr TX_ACQUIRE_TIMEOUT = 250ms;
+auto constexpr kTX_ACQUIRE_TIMEOUT = 250ms;
 
 // Need to be named before converting
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
-    NORM_TIMEOUTS = 4,
-    MAX_TIMEOUTS = 20,
+    NormTimeouts = 4,
+    MaxTimeouts = 20,
 };
 
 TransactionAcquire::TransactionAcquire(
@@ -45,13 +45,13 @@ TransactionAcquire::TransactionAcquire(
     : TimeoutCounter(
           app,
           hash,
-          TX_ACQUIRE_TIMEOUT,
-          {.jobType = jtTXN_DATA, .jobName = "TxAcq", .jobLimit = {}},
+          kTX_ACQUIRE_TIMEOUT,
+          {.jobType = JtTxnData, .jobName = "TxAcq", .jobLimit = {}},
           app.getJournal("TransactionAcquire"))
-    , mPeerSet(std::move(peerSet))
+    , peerSet_(std::move(peerSet))
 {
-    mMap = std::make_shared<SHAMap>(SHAMapType::TRANSACTION, hash, app.getNodeFamily());
-    mMap->setUnbacked();
+    map_ = std::make_shared<SHAMap>(SHAMapType::TRANSACTION, hash, app_.getNodeFamily());
+    map_->setUnbacked();
 }
 
 void
@@ -66,17 +66,17 @@ TransactionAcquire::done()
     else
     {
         JLOG(journal_.debug()) << "Acquired TX set " << hash_;
-        mMap->setImmutable();
+        map_->setImmutable();
 
         uint256 const& hash(hash_);
-        std::shared_ptr<SHAMap> const& map(mMap);
+        std::shared_ptr<SHAMap> const& map(map_);
         auto const pap = &app_;
         // Note that, when we're in the process of shutting down, addJob()
         // may reject the request.  If that happens then giveSet() will
         // not be called.  That's fine.  According to David the giveSet() call
         // just updates the consensus and related structures when we acquire
         // a transaction set. No need to update them if we're shutting down.
-        app_.getJobQueue().addJob(jtTXN_DATA, "ComplAcquire", [pap, hash, map]() {
+        app_.getJobQueue().addJob(JtTxnData, "ComplAcquire", [pap, hash, map]() {
             pap->getInboundTransactions().giveSet(hash, map, true);
         });
     }
@@ -85,14 +85,14 @@ TransactionAcquire::done()
 void
 TransactionAcquire::onTimer(bool progress, ScopedLockType& psl)
 {
-    if (timeouts_ > MAX_TIMEOUTS)
+    if (timeouts_ > MaxTimeouts)
     {
         failed_ = true;
         done();
         return;
     }
 
-    if (timeouts_ >= NORM_TIMEOUTS)
+    if (timeouts_ >= NormTimeouts)
         trigger(nullptr);
 
     addPeers(1);
@@ -118,7 +118,7 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
         return;
     }
 
-    if (!mHaveRoot)
+    if (!haveRoot_)
     {
         JLOG(journal_.trace()) << "TransactionAcquire::trigger " << (peer ? "havePeer" : "noPeer")
                                << " no root";
@@ -131,9 +131,9 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
             tmGL.set_querytype(protocol::qtINDIRECT);
 
         *(tmGL.add_nodeids()) = SHAMapNodeID().getRawString();
-        mPeerSet->sendRequest(tmGL, peer);
+        peerSet_->sendRequest(tmGL, peer);
     }
-    else if (!mMap->isValid())
+    else if (!map_->isValid())
     {
         failed_ = true;
         done();
@@ -141,11 +141,11 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
     else
     {
         ConsensusTransSetSF sf(app_, app_.getTempNodeCache());
-        auto nodes = mMap->getMissingNodes(256, &sf);
+        auto nodes = map_->getMissingNodes(256, &sf);
 
         if (nodes.empty())
         {
-            if (mMap->isValid())
+            if (map_->isValid())
             {
                 complete_ = true;
             }
@@ -169,7 +169,7 @@ TransactionAcquire::trigger(std::shared_ptr<Peer> const& peer)
         {
             *tmGL.add_nodeids() = node.first.getRawString();
         }
-        mPeerSet->sendRequest(tmGL, peer);
+        peerSet_->sendRequest(tmGL, peer);
     }
 }
 
@@ -203,20 +203,20 @@ TransactionAcquire::takeNodes(
         {
             if (d.first.isRoot())
             {
-                if (mHaveRoot)
+                if (haveRoot_)
                 {
                     JLOG(journal_.debug()) << "Got root TXS node, already have it";
                 }
-                else if (!mMap->addRootNode(SHAMapHash{hash_}, d.second, nullptr).isGood())
+                else if (!map_->addRootNode(SHAMapHash{hash_}, d.second, nullptr).isGood())
                 {
                     JLOG(journal_.warn()) << "TX acquire got bad root node";
                 }
                 else
                 {
-                    mHaveRoot = true;
+                    haveRoot_ = true;
                 }
             }
-            else if (!mMap->addKnownNode(d.first, d.second, &sf).isGood())
+            else if (!map_->addKnownNode(d.first, d.second, &sf).isGood())
             {
                 JLOG(journal_.warn()) << "TX acquire got bad non-root node";
                 return SHAMapAddNode::invalid();
@@ -238,7 +238,7 @@ TransactionAcquire::takeNodes(
 void
 TransactionAcquire::addPeers(std::size_t limit)
 {
-    mPeerSet->addPeers(
+    peerSet_->addPeers(
         limit,
         [this](auto peer) { return peer->hasTxSet(hash_); },
         [this](auto peer) { trigger(peer); });
@@ -259,7 +259,7 @@ TransactionAcquire::stillNeed()
 {
     ScopedLockType const sl(mtx_);
 
-    timeouts_ = std::min<int>(timeouts_, NORM_TIMEOUTS);
+    timeouts_ = std::min<int>(timeouts_, NormTimeouts);
     failed_ = false;
 }
 
diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.h b/src/xrpld/app/ledger/detail/TransactionAcquire.h
index d0887f8418..b94a9f4bfc 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.h
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.h
@@ -31,9 +31,9 @@ public:
     stillNeed();
 
 private:
-    std::shared_ptr<SHAMap> mMap;
-    bool mHaveRoot{false};
-    std::unique_ptr<PeerSet> mPeerSet;
+    std::shared_ptr<SHAMap> map_;
+    bool haveRoot_{false};
+    std::unique_ptr<PeerSet> peerSet_;
 
     void
     onTimer(bool progress, ScopedLockType& peerSetLock) override;
diff --git a/src/xrpld/app/ledger/detail/TransactionMaster.cpp b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
index bc0b7ca4ab..71a1ca629f 100644
--- a/src/xrpld/app/ledger/detail/TransactionMaster.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionMaster.cpp
@@ -28,13 +28,13 @@
 namespace xrpl {
 
 TransactionMaster::TransactionMaster(Application& app)
-    : mApp(app)
-    , mCache(
+    : app_(app)
+    , cache_(
           "TransactionCache",
           65536,
           std::chrono::minutes{30},
           stopwatch(),
-          mApp.getJournal("TaggedCache"))
+          app_.getJournal("TaggedCache"))
 {
 }
 
@@ -45,7 +45,7 @@ TransactionMaster::inLedger(
     std::optional<uint32_t> tseq,
     std::optional<uint32_t> netID)
 {
-    auto txn = mCache.fetch(hash);
+    auto txn = cache_.fetch(hash);
 
     if (!txn)
         return false;
@@ -55,20 +55,20 @@ TransactionMaster::inLedger(
 }
 
 std::shared_ptr<Transaction>
-TransactionMaster::fetch_from_cache(uint256 const& txnID)
+TransactionMaster::fetchFromCache(uint256 const& txnID)
 {
-    return mCache.fetch(txnID);
+    return cache_.fetch(txnID);
 }
 
 std::variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
-TransactionMaster::fetch(uint256 const& txnID, error_code_i& ec)
+TransactionMaster::fetch(uint256 const& txnID, ErrorCodeI& ec)
 {
     using TxPair = std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>;
 
-    if (auto txn = fetch_from_cache(txnID); txn && !txn->isValidated())
+    if (auto txn = fetchFromCache(txnID); txn && !txn->isValidated())
         return std::pair{std::move(txn), nullptr};
 
-    auto v = Transaction::load(txnID, mApp, ec);
+    auto v = Transaction::load(txnID, app_, ec);
 
     if (std::holds_alternative<TxSearched>(v))
         return v;
@@ -76,7 +76,7 @@ TransactionMaster::fetch(uint256 const& txnID, error_code_i& ec)
     auto [txn, txnMeta] = std::get<TxPair>(v);
 
     if (txn)
-        mCache.canonicalize_replace_client(txnID, txn);
+        cache_.canonicalizeReplaceClient(txnID, txn);
 
     return std::pair{std::move(txn), std::move(txnMeta)};
 }
@@ -85,14 +85,14 @@ std::variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, T
 TransactionMaster::fetch(
     uint256 const& txnID,
     ClosedInterval<uint32_t> const& range,
-    error_code_i& ec)
+    ErrorCodeI& ec)
 {
     using TxPair = std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>;
 
-    if (auto txn = fetch_from_cache(txnID); txn && !txn->isValidated())
+    if (auto txn = fetchFromCache(txnID); txn && !txn->isValidated())
         return std::pair{std::move(txn), nullptr};
 
-    auto v = Transaction::load(txnID, mApp, range, ec);
+    auto v = Transaction::load(txnID, app_, range, ec);
 
     if (std::holds_alternative<TxSearched>(v))
         return v;
@@ -100,7 +100,7 @@ TransactionMaster::fetch(
     auto [txn, txnMeta] = std::get<TxPair>(v);
 
     if (txn)
-        mCache.canonicalize_replace_client(txnID, txn);
+        cache_.canonicalizeReplaceClient(txnID, txn);
 
     return std::pair{std::move(txn), std::move(txnMeta)};
 }
@@ -112,16 +112,16 @@ TransactionMaster::fetch(
     std::uint32_t uCommitLedger)
 {
     std::shared_ptr<STTx const> txn;
-    auto iTx = fetch_from_cache(item->key());
+    auto iTx = fetchFromCache(item->key());
 
     if (!iTx)
     {
-        if (type == SHAMapNodeType::tnTRANSACTION_NM)
+        if (type == SHAMapNodeType::TnTransactionNm)
         {
             SerialIter sit(item->slice());
             txn = std::make_shared<STTx const>(std::ref(sit));
         }
-        else if (type == SHAMapNodeType::tnTRANSACTION_MD)
+        else if (type == SHAMapNodeType::TnTransactionMd)
         {
             auto blob = SerialIter{item->slice()}.getVL();
             txn = std::make_shared<STTx const>(SerialIter{blob.data(), blob.size()});
@@ -142,11 +142,11 @@ void
 TransactionMaster::canonicalize(std::shared_ptr<Transaction>* pTransaction)
 {
     uint256 const tid = (*pTransaction)->getID();
-    if (tid != beast::zero)
+    if (tid != beast::kZERO)
     {
         auto txn = *pTransaction;
         // VFALCO NOTE canonicalize can change the value of txn!
-        mCache.canonicalize_replace_client(tid, txn);
+        cache_.canonicalizeReplaceClient(tid, txn);
         *pTransaction = txn;
     }
 }
@@ -154,13 +154,13 @@ TransactionMaster::canonicalize(std::shared_ptr<Transaction>* pTransaction)
 void
 TransactionMaster::sweep(void)
 {
-    mCache.sweep();
+    cache_.sweep();
 }
 
 TaggedCache<uint256, Transaction>&
 TransactionMaster::getCache()
 {
-    return mCache;
+    return cache_;
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index d43f842eed..800d398eca 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -78,9 +78,11 @@
 #include <xrpl/protocol/ApiVersion.h>
 #include <xrpl/protocol/BuildInfo.h>
 #include <xrpl/protocol/Feature.h>
+#include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/STParsedJSON.h>
 #include <xrpl/protocol/Serializer.h>
+#include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/rdb/DatabaseCon.h>
 #include <xrpl/resource/Charge.h>
@@ -139,28 +141,28 @@ fixConfigPorts(Config& config, Endpoints const& endpoints);
 class ApplicationImp : public Application, public BasicApp
 {
 private:
-    class io_latency_sampler
+    class IoLatencySampler
     {
     private:
-        beast::insight::Event m_event;
-        beast::Journal m_journal;
-        beast::io_latency_probe<std::chrono::steady_clock> m_probe;
+        beast::insight::Event event_;
+        beast::Journal journal_;
+        beast::IoLatencyProbe<std::chrono::steady_clock> probe_;
         std::atomic<std::chrono::milliseconds> lastSample_;
 
     public:
-        io_latency_sampler(
+        IoLatencySampler(
             beast::insight::Event ev,
             beast::Journal journal,
             std::chrono::milliseconds interval,
             boost::asio::io_context& ios)
-            : m_event(std::move(ev)), m_journal(journal), m_probe(interval, ios)
+            : event_(std::move(ev)), journal_(journal), probe_(interval, ios)
         {
         }
 
         void
         start()
         {
-            m_probe.sample(std::ref(*this));
+            probe_.sample(std::ref(*this));
         }
 
         template <class Duration>
@@ -173,10 +175,10 @@ private:
             lastSample_ = lastSample;
 
             if (lastSample >= 10ms)
-                m_event.notify(lastSample);
+                event_.notify(lastSample);
             if (lastSample >= 500ms)
             {
-                JLOG(m_journal.warn()) << "io_context latency = " << lastSample.count();
+                JLOG(journal_.warn()) << "io_context latency = " << lastSample.count();
             }
         }
 
@@ -189,56 +191,57 @@ private:
         void
         cancel()
         {
-            m_probe.cancel();
+            probe_.cancel();
         }
 
         void
-        cancel_async()
+        cancelAsync()
         {
-            m_probe.cancel_async();
+            probe_.cancelAsync();
         }
     };
 
 public:
+    // NOLINTBEGIN(readability-identifier-naming)
     std::unique_ptr<Config> config_;
     std::unique_ptr<Logs> logs_;
     std::unique_ptr<TimeKeeper> timeKeeper_;
 
     std::uint64_t const instanceCookie_;
 
-    beast::Journal m_journal;
+    beast::Journal journal_;
     std::unique_ptr<perf::PerfLog> perfLog_;
-    Application::MutexType m_masterMutex;
+    Application::MutexType masterMutex_;
 
     // Required by the SHAMapStore
-    TransactionMaster m_txMaster;
+    TransactionMaster txMaster_;
 
-    std::unique_ptr<CollectorManager> m_collectorManager;
-    std::unique_ptr<JobQueue> m_jobQueue;
-    NodeStoreScheduler m_nodeStoreScheduler;
-    std::unique_ptr<SHAMapStore> m_shaMapStore;
+    std::unique_ptr<CollectorManager> collectorManager_;
+    std::unique_ptr<JobQueue> jobQueue_;
+    NodeStoreScheduler nodeStoreScheduler_;
+    std::unique_ptr<SHAMapStore> shaMapStore_;
     PendingSaves pendingSaves_;
     std::optional<OpenLedger> openLedger_;
 
-    NodeCache m_tempNodeCache;
+    NodeCache tempNodeCache_;
     CachedSLEs cachedSLEs_;
     std::unique_ptr<NetworkIDService> networkIDService_;
     std::optional<std::pair<PublicKey, SecretKey>> nodeIdentity_;
     ValidatorKeys const validatorKeys_;
 
-    std::unique_ptr<Resource::Manager> m_resourceManager;
+    std::unique_ptr<Resource::Manager> resourceManager_;
 
-    std::unique_ptr<NodeStore::Database> m_nodeStore;
+    std::unique_ptr<NodeStore::Database> nodeStore_;
     NodeFamily nodeFamily_;
-    std::unique_ptr<OrderBookDB> m_orderBookDB;
-    std::unique_ptr<PathRequestManager> m_pathRequestManager;
-    std::unique_ptr<LedgerMaster> m_ledgerMaster;
+    std::unique_ptr<OrderBookDB> orderBookDB_;
+    std::unique_ptr<PathRequestManager> pathRequestManager_;
+    std::unique_ptr<LedgerMaster> ledgerMaster_;
     std::unique_ptr<LedgerCleaner> ledgerCleaner_;
-    std::unique_ptr<InboundLedgers> m_inboundLedgers;
-    std::unique_ptr<InboundTransactions> m_inboundTransactions;
-    std::unique_ptr<LedgerReplayer> m_ledgerReplayer;
-    TaggedCache<uint256, AcceptedLedger> m_acceptedLedgerCache;
-    std::unique_ptr<NetworkOPs> m_networkOPs;
+    std::unique_ptr<InboundLedgers> inboundLedgers_;
+    std::unique_ptr<InboundTransactions> inboundTransactions_;
+    std::unique_ptr<LedgerReplayer> ledgerReplayer_;
+    TaggedCache<uint256, AcceptedLedger> acceptedLedgerCache_;
+    std::unique_ptr<NetworkOPs> networkOPs_;
     std::unique_ptr<Cluster> cluster_;
     std::unique_ptr<PeerReservationTable> peerReservations_;
     std::unique_ptr<ManifestCache> validatorManifests_;
@@ -246,32 +249,33 @@ public:
     std::unique_ptr<ValidatorList> validators_;
     std::unique_ptr<ValidatorSite> validatorSites_;
     std::unique_ptr<ServerHandler> serverHandler_;
-    std::unique_ptr<AmendmentTable> m_amendmentTable;
-    std::unique_ptr<LoadFeeTrack> mFeeTrack;
+    std::unique_ptr<AmendmentTable> amendmentTable_;
+    std::unique_ptr<LoadFeeTrack> feeTrack_;
     std::unique_ptr<HashRouter> hashRouter_;
-    RCLValidations mValidations;
-    std::unique_ptr<LoadManager> m_loadManager;
+    RCLValidations validations_;
+    std::unique_ptr<LoadManager> loadManager_;
     std::unique_ptr<TxQ> txQ_;
     ClosureCounter<void, boost::system::error_code const&> waitHandlerCounter_;
     boost::asio::steady_timer sweepTimer_;
     boost::asio::steady_timer entropyTimer_;
 
     std::optional<SQLiteDatabase> relationalDatabase_;
-    std::unique_ptr<DatabaseCon> mWalletDB;
+    std::unique_ptr<DatabaseCon> walletDB_;
     std::unique_ptr<Overlay> overlay_;
     std::optional<uint256> trapTxID_;
 
-    boost::asio::signal_set m_signals;
+    boost::asio::signal_set signals_;
 
     std::atomic_flag isTimeToStop;
 
     std::atomic<bool> checkSigs_;
 
-    std::unique_ptr<ResolverAsio> m_resolver;
+    std::unique_ptr<ResolverAsio> resolver_;
 
-    io_latency_sampler m_io_latency_sampler;
+    IoLatencySampler io_latency_sampler_;
 
     std::unique_ptr<GRPCServer> grpcServer_;
+    // NOLINTEND(readability-identifier-naming)
 
     //--------------------------------------------------------------------------
 
@@ -307,24 +311,19 @@ public:
         , config_(std::move(config))
         , logs_(std::move(logs))
         , timeKeeper_(std::move(timeKeeper))
-        , instanceCookie_(
-              1 + rand_int(crypto_prng(), std::numeric_limits<std::uint64_t>::max() - 1))
-        , m_journal(logs_->journal("Application"))
-
+        , instanceCookie_(1 + randInt(cryptoPrng(), std::numeric_limits<std::uint64_t>::max() - 1))
+        , journal_(logs_->journal("Application"))
         // PerfLog must be started before any other threads are launched.
         , perfLog_(
-              perf::make_PerfLog(
-                  perf::setup_PerfLog(config_->section("perf"), config_->CONFIG_DIR),
+              perf::makePerfLog(
+                  perf::setupPerfLog(config_->section("perf"), config_->CONFIG_DIR),
                   *this,
                   logs_->journal("PerfLog"),
                   [this] { signalStop("PerfLog"); }))
-
-        , m_txMaster(*this)
-
-        , m_collectorManager(
-              make_CollectorManager(config_->section(SECTION_INSIGHT), logs_->journal("Collector")))
-
-        , m_jobQueue(
+        , txMaster_(*this)
+        , collectorManager_(
+              makeCollectorManager(config_->section(SECTION_INSIGHT), logs_->journal("Collector")))
+        , jobQueue_(
               std::make_unique<JobQueue>(
                   [](std::unique_ptr<Config> const& config) {
                       if (config->standalone() && !config->FORCE_MULTI_THREAD)
@@ -353,108 +352,82 @@ public:
 
                       return count;
                   }(config_),
-                  m_collectorManager->group("jobq"),
+                  collectorManager_->group("jobq"),
                   logs_->journal("JobQueue"),
                   *logs_,
                   *perfLog_))
-
-        , m_nodeStoreScheduler(*m_jobQueue)
-
-        , m_shaMapStore(
-              make_SHAMapStore(*this, m_nodeStoreScheduler, logs_->journal("SHAMapStore")))
-
-        , m_tempNodeCache(
+        , nodeStoreScheduler_(*jobQueue_)
+        , shaMapStore_(makeSHAMapStore(*this, nodeStoreScheduler_, logs_->journal("SHAMapStore")))
+        , tempNodeCache_(
               "NodeCache",
               16384,
               std::chrono::seconds{90},
               stopwatch(),
               logs_->journal("TaggedCache"))
-
         , cachedSLEs_(
               "Cached SLEs",
               0,
               std::chrono::minutes(1),
               stopwatch(),
               logs_->journal("CachedSLEs"))
-
         , networkIDService_(std::make_unique<NetworkIDServiceImpl>(config_->NETWORK_ID))
-
-        , validatorKeys_(*config_, m_journal)
-
-        , m_resourceManager(
-              Resource::make_Manager(m_collectorManager->collector(), logs_->journal("Resource")))
-
-        , m_nodeStore(m_shaMapStore->makeNodeStore(
+        , validatorKeys_(*config_, journal_)
+        , resourceManager_(
+              Resource::makeManager(collectorManager_->collector(), logs_->journal("Resource")))
+        , nodeStore_(shaMapStore_->makeNodeStore(
               config_->PREFETCH_WORKERS > 0 ? config_->PREFETCH_WORKERS : 4))
-
-        , nodeFamily_(*this, *m_collectorManager)
-
-        , m_orderBookDB(make_OrderBookDB(
+        , nodeFamily_(*this, *collectorManager_)
+        , orderBookDB_(makeOrderBookDb(
               *this,
               {.pathSearchMax = config_->PATH_SEARCH_MAX, .standalone = config_->standalone()}))
-
-        , m_pathRequestManager(
+        , pathRequestManager_(
               std::make_unique<PathRequestManager>(
                   *this,
                   logs_->journal("PathRequest"),
-                  m_collectorManager->collector()))
-
-        , m_ledgerMaster(
+                  collectorManager_->collector()))
+        , ledgerMaster_(
               std::make_unique<LedgerMaster>(
                   *this,
                   stopwatch(),
-                  m_collectorManager->collector(),
+                  collectorManager_->collector(),
                   logs_->journal("LedgerMaster")))
-
-        , ledgerCleaner_(make_LedgerCleaner(*this, logs_->journal("LedgerCleaner")))
+        , ledgerCleaner_(makeLedgerCleaner(*this, logs_->journal("LedgerCleaner")))
 
         // VFALCO NOTE must come before NetworkOPs to prevent a crash due
         //             to dependencies in the destructor.
         //
-        , m_inboundLedgers(make_InboundLedgers(*this, stopwatch(), m_collectorManager->collector()))
-
-        , m_inboundTransactions(make_InboundTransactions(
+        , inboundLedgers_(makeInboundLedgers(*this, stopwatch(), collectorManager_->collector()))
+        , inboundTransactions_(makeInboundTransactions(
               *this,
-              m_collectorManager->collector(),
+              collectorManager_->collector(),
               [this](std::shared_ptr<SHAMap> const& set, bool fromAcquire) {
                   gotTXSet(set, fromAcquire);
               }))
-
-        , m_ledgerReplayer(
-              std::make_unique<LedgerReplayer>(
-                  *this,
-                  *m_inboundLedgers,
-                  make_PeerSetBuilder(*this)))
-
-        , m_acceptedLedgerCache(
+        , ledgerReplayer_(
+              std::make_unique<LedgerReplayer>(*this, *inboundLedgers_, makePeerSetBuilder(*this)))
+        , acceptedLedgerCache_(
               "AcceptedLedger",
               4,
               std::chrono::minutes{1},
               stopwatch(),
               logs_->journal("TaggedCache"))
-
-        , m_networkOPs(make_NetworkOPs(
+        , networkOPs_(makeNetworkOPs(
               *this,
               stopwatch(),
               config_->standalone(),
               config_->NETWORK_QUORUM,
               config_->START_VALID,
-              *m_jobQueue,
-              *m_ledgerMaster,
+              *jobQueue_,
+              *ledgerMaster_,
               validatorKeys_,
-              get_io_context(),
+              getIoContext(),
               logs_->journal("NetworkOPs"),
-              m_collectorManager->collector()))
-
+              collectorManager_->collector()))
         , cluster_(std::make_unique<Cluster>(logs_->journal("Overlay")))
-
         , peerReservations_(
               std::make_unique<PeerReservationTable>(logs_->journal("PeerReservationTable")))
-
         , validatorManifests_(std::make_unique<ManifestCache>(logs_->journal("ManifestCache")))
-
         , publisherManifests_(std::make_unique<ManifestCache>(logs_->journal("ManifestCache")))
-
         , validators_(
               std::make_unique<ValidatorList>(
                   *validatorManifests_,
@@ -463,47 +436,34 @@ public:
                   config_->legacy("database_path"),
                   logs_->journal("ValidatorList"),
                   config_->VALIDATION_QUORUM))
-
         , validatorSites_(std::make_unique<ValidatorSite>(*this))
-
-        , serverHandler_(make_ServerHandler(
+        , serverHandler_(makeServerHandler(
               *this,
-              get_io_context(),
-              *m_jobQueue,
-              *m_networkOPs,
-              *m_resourceManager,
-              *m_collectorManager))
-
-        , mFeeTrack(std::make_unique<LoadFeeTrack>(logs_->journal("LoadManager")))
-
-        , hashRouter_(std::make_unique<HashRouter>(setup_HashRouter(*config_), stopwatch()))
-
-        , mValidations(ValidationParms(), stopwatch(), *this, logs_->journal("Validations"))
-
-        , m_loadManager(make_LoadManager(*this, logs_->journal("LoadManager")))
-
-        , txQ_(std::make_unique<TxQ>(setup_TxQ(*config_), logs_->journal("TxQ")))
-
-        , sweepTimer_(get_io_context())
-
-        , entropyTimer_(get_io_context())
-
-        , m_signals(get_io_context())
-
+              getIoContext(),
+              *jobQueue_,
+              *networkOPs_,
+              *resourceManager_,
+              *collectorManager_))
+        , feeTrack_(std::make_unique<LoadFeeTrack>(logs_->journal("LoadManager")))
+        , hashRouter_(std::make_unique<HashRouter>(setupHashRouter(*config_), stopwatch()))
+        , validations_(ValidationParms(), stopwatch(), *this, logs_->journal("Validations"))
+        , loadManager_(makeLoadManager(*this, logs_->journal("LoadManager")))
+        , txQ_(std::make_unique<TxQ>(setupTxQ(*config_), logs_->journal("TxQ")))
+        , sweepTimer_(getIoContext())
+        , entropyTimer_(getIoContext())
+        , signals_(getIoContext())
         , checkSigs_(true)
-
-        , m_resolver(ResolverAsio::New(get_io_context(), logs_->journal("Resolver")))
-
-        , m_io_latency_sampler(
-              m_collectorManager->collector()->make_event("ios_latency"),
+        , resolver_(ResolverAsio::make(getIoContext(), logs_->journal("Resolver")))
+        , io_latency_sampler_(
+              collectorManager_->collector()->makeEvent("ios_latency"),
               logs_->journal("Application"),
               std::chrono::milliseconds(100),
-              get_io_context())
+              getIoContext())
         , grpcServer_(std::make_unique<GRPCServer>(*this))
     {
-        initAccountIdCache(config_->getValueFor(SizedItem::accountIdCacheSize));
+        initAccountIdCache(config_->getValueFor(SizedItem::AccountIdCacheSize));
 
-        add(m_resourceManager.get());
+        add(resourceManager_.get());
 
         //
         // VFALCO - READ THIS!
@@ -565,7 +525,7 @@ public:
     CollectorManager&
     getCollectorManager() override
     {
-        return *m_collectorManager;
+        return *collectorManager_;
     }
 
     Family&
@@ -583,7 +543,7 @@ public:
     JobQueue&
     getJobQueue() override
     {
-        return *m_jobQueue;
+        return *jobQueue_;
     }
 
     std::pair<PublicKey, SecretKey> const&
@@ -592,7 +552,7 @@ public:
         if (nodeIdentity_)
             return *nodeIdentity_;
 
-        LogicError("Accessing Application::nodeIdentity() before it is initialized.");
+        logicError("Accessing Application::nodeIdentity() before it is initialized.");
     }
 
     std::optional<PublicKey const>
@@ -607,7 +567,7 @@ public:
     NetworkOPs&
     getOPs() override
     {
-        return *m_networkOPs;
+        return *networkOPs_;
     }
 
     ServerHandler&
@@ -623,19 +583,19 @@ public:
     boost::asio::io_context&
     getIOContext() override
     {
-        return get_io_context();
+        return getIoContext();
     }
 
     std::chrono::milliseconds
     getIOLatency() override
     {
-        return m_io_latency_sampler.get();
+        return io_latency_sampler_.get();
     }
 
     LedgerMaster&
     getLedgerMaster() override
     {
-        return *m_ledgerMaster;
+        return *ledgerMaster_;
     }
 
     LedgerCleaner&
@@ -647,38 +607,38 @@ public:
     LedgerReplayer&
     getLedgerReplayer() override
     {
-        return *m_ledgerReplayer;
+        return *ledgerReplayer_;
     }
 
     InboundLedgers&
     getInboundLedgers() override
     {
-        return *m_inboundLedgers;
+        return *inboundLedgers_;
     }
 
     InboundTransactions&
     getInboundTransactions() override
     {
-        return *m_inboundTransactions;
+        return *inboundTransactions_;
     }
 
     TaggedCache<uint256, AcceptedLedger>&
     getAcceptedLedgerCache() override
     {
-        return m_acceptedLedgerCache;
+        return acceptedLedgerCache_;
     }
 
     void
     gotTXSet(std::shared_ptr<SHAMap> const& set, bool fromAcquire) const
     {
         if (set)
-            m_networkOPs->mapComplete(set, fromAcquire);
+            networkOPs_->mapComplete(set, fromAcquire);
     }
 
     TransactionMaster&
     getMasterTransaction() override
     {
-        return m_txMaster;
+        return txMaster_;
     }
 
     perf::PerfLog&
@@ -690,43 +650,43 @@ public:
     NodeCache&
     getTempNodeCache() override
     {
-        return m_tempNodeCache;
+        return tempNodeCache_;
     }
 
     NodeStore::Database&
     getNodeStore() override
     {
-        return *m_nodeStore;
+        return *nodeStore_;
     }
 
     Application::MutexType&
     getMasterMutex() override
     {
-        return m_masterMutex;
+        return masterMutex_;
     }
 
     LoadManager&
     getLoadManager() override
     {
-        return *m_loadManager;
+        return *loadManager_;
     }
 
     Resource::Manager&
     getResourceManager() override
     {
-        return *m_resourceManager;
+        return *resourceManager_;
     }
 
     OrderBookDB&
     getOrderBookDB() override
     {
-        return *m_orderBookDB;
+        return *orderBookDB_;
     }
 
     PathRequestManager&
     getPathRequestManager() override
     {
-        return *m_pathRequestManager;
+        return *pathRequestManager_;
     }
 
     CachedSLEs&
@@ -744,13 +704,13 @@ public:
     AmendmentTable&
     getAmendmentTable() override
     {
-        return *m_amendmentTable;
+        return *amendmentTable_;
     }
 
     LoadFeeTrack&
     getFeeTrack() override
     {
-        return *mFeeTrack;
+        return *feeTrack_;
     }
 
     HashRouter&
@@ -762,7 +722,7 @@ public:
     RCLValidations&
     getValidations() override
     {
-        return mValidations;
+        return validations_;
     }
 
     ValidatorList&
@@ -804,7 +764,7 @@ public:
     SHAMapStore&
     getSHAMapStore() override
     {
-        return *m_shaMapStore;
+        return *shaMapStore_;
     }
 
     PendingSaves&
@@ -853,8 +813,8 @@ public:
     DatabaseCon&
     getWalletDB() override
     {
-        XRPL_ASSERT(mWalletDB, "xrpl::ApplicationImp::getWalletDB : non-null wallet database");
-        return *mWalletDB;
+        XRPL_ASSERT(walletDB_, "xrpl::ApplicationImp::getWalletDB : non-null wallet database");
+        return *walletDB_;
     }
 
     bool
@@ -869,23 +829,23 @@ public:
     initRelationalDatabase()
     {
         XRPL_ASSERT(
-            mWalletDB.get() == nullptr,
+            walletDB_.get() == nullptr,
             "xrpl::ApplicationImp::initRelationalDatabase : null wallet "
             "database");
 
         try
         {
-            relationalDatabase_.emplace(setup_RelationalDatabase(*this, *config_, *m_jobQueue));
+            relationalDatabase_.emplace(setupRelationalDatabase(*this, *config_, *jobQueue_));
 
             // wallet database
-            auto setup = setup_DatabaseCon(*config_, m_journal);
+            auto setup = setupDatabaseCon(*config_, journal_);
             setup.useGlobalPragma = false;
 
-            mWalletDB = makeWalletDB(setup, m_journal);
+            walletDB_ = makeWalletDB(setup, journal_);
         }
         catch (std::exception const& e)
         {
-            JLOG(m_journal.fatal()) << "Failed to initialize SQL databases: " << e.what();
+            JLOG(journal_.fatal()) << "Failed to initialize SQL databases: " << e.what();
             return false;
         }
 
@@ -900,20 +860,20 @@ public:
             auto j = logs_->journal("NodeObject");
             NodeStore::DummyScheduler dummyScheduler;
             std::unique_ptr<NodeStore::Database> source =
-                NodeStore::Manager::instance().make_Database(
-                    megabytes(config_->getValueFor(SizedItem::burstSize, std::nullopt)),
+                NodeStore::Manager::instance().makeDatabase(
+                    megabytes(config_->getValueFor(SizedItem::BurstSize, std::nullopt)),
                     dummyScheduler,
                     0,
                     config_->section(ConfigSection::importNodeDatabase()),
                     j);
 
             JLOG(j.warn()) << "Starting node import from '" << source->getName() << "' to '"
-                           << m_nodeStore->getName() << "'.";
+                           << nodeStore_->getName() << "'.";
 
             using namespace std::chrono;
             auto const start = steady_clock::now();
 
-            m_nodeStore->importDatabase(*source);
+            nodeStore_->importDatabase(*source);
 
             auto const elapsed = duration_cast<seconds>(steady_clock::now() - start);
             JLOG(j.warn()) << "Node import from '" << source->getName() << "' took "
@@ -943,14 +903,14 @@ public:
                 waitHandlerCounter_.wrap([this](boost::system::error_code const& e) {
                     if (e.value() == boost::system::errc::success)
                     {
-                        m_jobQueue->addJob(jtSWEEP, "sweep", [this]() { doSweep(); });
+                        jobQueue_->addJob(JtSweep, "sweep", [this]() { doSweep(); });
                     }
                     // Recover as best we can if an unexpected error occurs.
                     if (e.value() != boost::system::errc::success &&
                         e.value() != boost::asio::error::operation_aborted)
                     {
                         // Try again later and hope for the best.
-                        JLOG(m_journal.error())
+                        JLOG(journal_.error())
                             << "Sweep timer got error '" << e.message() << "'.  Restarting timer.";
                         setSweepTimer();
                     }
@@ -959,7 +919,7 @@ public:
             using namespace std::chrono;
             sweepTimer_.expires_after(
                 seconds{config_->SWEEP_INTERVAL.value_or(
-                    config_->getValueFor(SizedItem::sweepInterval))});
+                    config_->getValueFor(SizedItem::SweepInterval))});
             sweepTimer_.async_wait(std::move(*optionalCountedHandler));
         }
     }
@@ -972,7 +932,7 @@ public:
                 waitHandlerCounter_.wrap([this](boost::system::error_code const& e) {
                     if (e.value() == boost::system::errc::success)
                     {
-                        crypto_prng().mix_entropy();
+                        cryptoPrng().mixEntropy();
                         setEntropyTimer();
                     }
                     // Recover as best we can if an unexpected error occurs.
@@ -980,8 +940,8 @@ public:
                         e.value() != boost::asio::error::operation_aborted)
                     {
                         // Try again later and hope for the best.
-                        JLOG(m_journal.error()) << "Entropy timer got error '" << e.message()
-                                                << "'.  Restarting timer.";
+                        JLOG(journal_.error()) << "Entropy timer got error '" << e.message()
+                                               << "'.  Restarting timer.";
                         setEntropyTimer();
                     }
                 }))
@@ -1019,11 +979,11 @@ public:
 
             nodeFamily_.sweep();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "NodeFamily::FullBelowCache sweep.  Size before: " << oldFullBelowSize
                 << "; size after: " << fullBelowCache->size();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "NodeFamily::TreeNodeCache sweep.  Size before: " << oldTreeNodeSize
                 << "; size after: " << treeNodeCache->size();
         }
@@ -1035,15 +995,15 @@ public:
 
             getMasterTransaction().sweep();
 
-            JLOG(m_journal.debug()) << "MasterTransaction sweep.  Size before: " << oldMasterTxSize
-                                    << "; size after: " << masterTxCache.size();
+            JLOG(journal_.debug()) << "MasterTransaction sweep.  Size before: " << oldMasterTxSize
+                                   << "; size after: " << masterTxCache.size();
         }
         {
             std::size_t const oldLedgerMasterCacheSize = getLedgerMaster().getFetchPackCacheSize();
 
             getLedgerMaster().sweep();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "LedgerMaster sweep.  Size before: " << oldLedgerMasterCacheSize
                 << "; size after: " << getLedgerMaster().getFetchPackCacheSize();
         }
@@ -1053,8 +1013,8 @@ public:
 
             getTempNodeCache().sweep();
 
-            JLOG(m_journal.debug()) << "TempNodeCache sweep.  Size before: " << oldTempNodeCacheSize
-                                    << "; size after: " << getTempNodeCache().size();
+            JLOG(journal_.debug()) << "TempNodeCache sweep.  Size before: " << oldTempNodeCacheSize
+                                   << "; size after: " << getTempNodeCache().size();
         }
         {
             std::size_t const oldCurrentCacheSize = getValidations().sizeOfCurrentCache();
@@ -1062,21 +1022,21 @@ public:
             std::size_t const oldByLedgerSize = getValidations().sizeOfByLedgerCache();
             std::size_t const oldBySequenceSize = getValidations().sizeOfBySequenceCache();
 
-            getValidations().expire(m_journal);
+            getValidations().expire(journal_);
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "Validations Current expire.  Size before: " << oldCurrentCacheSize
                 << "; size after: " << getValidations().sizeOfCurrentCache();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "Validations SeqEnforcer expire.  Size before: " << oldSizeSeqEnforcesSize
                 << "; size after: " << getValidations().sizeOfSeqEnforcersCache();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "Validations ByLedger expire.  Size before: " << oldByLedgerSize
                 << "; size after: " << getValidations().sizeOfByLedgerCache();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "Validations BySequence expire.  Size before: " << oldBySequenceSize
                 << "; size after: " << getValidations().sizeOfBySequenceCache();
         }
@@ -1085,7 +1045,7 @@ public:
 
             getInboundLedgers().sweep();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "InboundLedgers sweep.  Size before: " << oldInboundLedgersSize
                 << "; size after: " << getInboundLedgers().cacheSize();
         }
@@ -1096,36 +1056,35 @@ public:
 
             getLedgerReplayer().sweep();
 
-            JLOG(m_journal.debug()) << "LedgerReplayer tasks sweep.  Size before: " << oldTasksSize
-                                    << "; size after: " << getLedgerReplayer().tasksSize();
+            JLOG(journal_.debug()) << "LedgerReplayer tasks sweep.  Size before: " << oldTasksSize
+                                   << "; size after: " << getLedgerReplayer().tasksSize();
 
-            JLOG(m_journal.debug())
-                << "LedgerReplayer deltas sweep.  Size before: " << oldDeltasSize
-                << "; size after: " << getLedgerReplayer().deltasSize();
+            JLOG(journal_.debug()) << "LedgerReplayer deltas sweep.  Size before: " << oldDeltasSize
+                                   << "; size after: " << getLedgerReplayer().deltasSize();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "LedgerReplayer skipLists sweep.  Size before: " << oldSkipListsSize
                 << "; size after: " << getLedgerReplayer().skipListsSize();
         }
         {
-            std::size_t const oldAcceptedLedgerSize = m_acceptedLedgerCache.size();
+            std::size_t const oldAcceptedLedgerSize = acceptedLedgerCache_.size();
 
-            m_acceptedLedgerCache.sweep();
+            acceptedLedgerCache_.sweep();
 
-            JLOG(m_journal.debug())
+            JLOG(journal_.debug())
                 << "AcceptedLedgerCache sweep.  Size before: " << oldAcceptedLedgerSize
-                << "; size after: " << m_acceptedLedgerCache.size();
+                << "; size after: " << acceptedLedgerCache_.size();
         }
         {
             std::size_t const oldCachedSLEsSize = cachedSLEs_.size();
 
             cachedSLEs_.sweep();
 
-            JLOG(m_journal.debug()) << "CachedSLEs sweep.  Size before: " << oldCachedSLEsSize
-                                    << "; size after: " << cachedSLEs_.size();
+            JLOG(journal_.debug()) << "CachedSLEs sweep.  Size before: " << oldCachedSLEsSize
+                                   << "; size after: " << cachedSLEs_.size();
         }
 
-        mallocTrim("doSweep", m_journal);
+        mallocTrim("doSweep", journal_);
 
         // Set timer to do another sweep later.
         setSweepTimer();
@@ -1146,7 +1105,7 @@ public:
     size_t
     getNumberOfThreads() const override
     {
-        return get_number_of_threads();
+        return BasicApp::getNumberOfThreads();
     }
 
 private:
@@ -1194,41 +1153,41 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
     // signal set occurs or the signal set is cancelled. Subsequent signals are
     // effectively ignored (technically, they are queued up, waiting for a call
     // to async_wait).
-    m_signals.add(SIGINT);
-    m_signals.add(SIGTERM);
-    m_signals.async_wait([this](boost::system::error_code const& ec, int signum) {
+    signals_.add(SIGINT);
+    signals_.add(SIGTERM);
+    signals_.async_wait([this](boost::system::error_code const& ec, int signum) {
         // Indicates the signal handler has been aborted; do nothing
         if (ec == boost::asio::error::operation_aborted)
             return;
 
-        JLOG(m_journal.info()) << "Received signal " << signum;
+        JLOG(journal_.info()) << "Received signal " << signum;
 
         if (signum == SIGTERM || signum == SIGINT)
             signalStop("Signal: " + to_string(signum));
     });
 
-    auto debug_log = config_->getDebugLogFile();
+    auto debugLog = config_->getDebugLogFile();
 
-    if (!debug_log.empty())
+    if (!debugLog.empty())
     {
         // Let debug messages go to the file but only WARNING or higher to
         // regular output (unless verbose)
 
-        if (!logs_->open(debug_log))
-            std::cerr << "Can't open log file " << debug_log << '\n';
+        if (!logs_->open(debugLog))
+            std::cerr << "Can't open log file " << debugLog << '\n';
 
         using namespace beast::severities;
-        if (logs_->threshold() > kDebug)
-            logs_->threshold(kDebug);
+        if (logs_->threshold() > KDebug)
+            logs_->threshold(KDebug);
     }
 
-    JLOG(m_journal.info()) << "Process starting: " << BuildInfo::getFullVersionString()
-                           << ", Instance Cookie: " << instanceCookie_;
+    JLOG(journal_.info()) << "Process starting: " << BuildInfo::getFullVersionString()
+                          << ", Instance Cookie: " << instanceCookie_;
 
     if (numberOfThreads(*config_) < 2)
     {
-        JLOG(m_journal.warn()) << "Limited to a single I/O service thread by "
-                                  "system configuration.";
+        JLOG(journal_.warn()) << "Limited to a single I/O service thread by "
+                                 "system configuration.";
     }
 
     // Optionally turn off logging to console.
@@ -1239,7 +1198,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
 
     if (!peerReservations_->load(getWalletDB()))
     {
-        JLOG(m_journal.fatal()) << "Cannot find peer reservations!";
+        JLOG(journal_.fatal()) << "Cannot find peer reservations!";
         return false;
     }
 
@@ -1265,7 +1224,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
 
         Section const& upVoted = config_->section(SECTION_AMENDMENTS);
 
-        m_amendmentTable = make_AmendmentTable(
+        amendmentTable_ = makeAmendmentTable(
             *this,
             config().AMENDMENT_MAJORITY_TIME,
             supported,
@@ -1277,10 +1236,10 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
     Pathfinder::initPathTable();
 
     auto const startUp = config_->START_UP;
-    JLOG(m_journal.debug()) << "startUp: " << startUp;
+    JLOG(journal_.debug()) << "startUp: " << startUp;
     if (startUp == StartUpType::Fresh)
     {
-        JLOG(m_journal.info()) << "Starting new Ledger";
+        JLOG(journal_.info()) << "Starting new Ledger";
 
         startGenesisLedger();
     }
@@ -1288,7 +1247,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
         startUp == StartUpType::Load || startUp == StartUpType::LoadFile ||
         startUp == StartUpType::Replay)
     {
-        JLOG(m_journal.info()) << "Loading specified Ledger";
+        JLOG(journal_.info()) << "Loading specified Ledger";
 
         if (!loadOldLedger(
                 config_->START_LEDGER,
@@ -1296,7 +1255,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
                 startUp == StartUpType::LoadFile,
                 config_->TRAP_TX_HASH))
         {
-            JLOG(m_journal.error()) << "The specified ledger could not be loaded.";
+            JLOG(journal_.error()) << "The specified ledger could not be loaded.";
             if (config_->FAST_LOAD)
             {
                 // Fall back to syncing from the network, such as
@@ -1314,7 +1273,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
         // This should probably become the default once we have a stable
         // network.
         if (!config_->standalone())
-            m_networkOPs->setNeedNetworkLedger();
+            networkOPs_->setNeedNetworkLedger();
 
         startGenesisLedger();
     }
@@ -1325,16 +1284,16 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
 
     if (auto const& forcedRange = config().FORCED_LEDGER_RANGE_PRESENT)
     {
-        m_ledgerMaster->setLedgerRangePresent(forcedRange->first, forcedRange->second);
+        ledgerMaster_->setLedgerRangePresent(forcedRange->first, forcedRange->second);
     }
 
-    m_orderBookDB->setup(getLedgerMaster().getCurrentLedger());
+    orderBookDB_->setup(getLedgerMaster().getCurrentLedger());
 
     nodeIdentity_ = getNodeIdentity(*this, cmdline);
 
     if (!cluster_->load(config().section(SECTION_CLUSTER_NODES)))
     {
-        JLOG(m_journal.fatal()) << "Invalid entry in cluster configuration.";
+        JLOG(journal_.fatal()) << "Invalid entry in cluster configuration.";
         return false;
     }
 
@@ -1348,7 +1307,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
                 validatorKeys_.manifest,
                 config().section(SECTION_VALIDATOR_KEY_REVOCATION).values()))
         {
-            JLOG(m_journal.fatal()) << "Invalid configured validator manifest.";
+            JLOG(journal_.fatal()) << "Invalid configured validator manifest.";
             return false;
         }
 
@@ -1371,19 +1330,19 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
                 config().section(SECTION_VALIDATOR_LIST_KEYS).values(),
                 config().VALIDATOR_LIST_THRESHOLD))
         {
-            JLOG(m_journal.fatal()) << "Invalid entry in validator configuration.";
+            JLOG(journal_.fatal()) << "Invalid entry in validator configuration.";
             return false;
         }
     }
 
     if (!validatorSites_->load(config().section(SECTION_VALIDATOR_LIST_SITES).values()))
     {
-        JLOG(m_journal.fatal()) << "Invalid entry in [" << SECTION_VALIDATOR_LIST_SITES << "]";
+        JLOG(journal_.fatal()) << "Invalid entry in [" << SECTION_VALIDATOR_LIST_SITES << "]";
         return false;
     }
 
     // Tell the AmendmentTable who the trusted validators are.
-    m_amendmentTable->trustChanged(validators_->getQuorumKeys().second);
+    amendmentTable_->trustChanged(validators_->getQuorumKeys().second);
 
     //----------------------------------------------------------------------
     //
@@ -1396,36 +1355,36 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
     //             move the instantiation inside a conditional:
     //
     //             if (!config_.standalone())
-    overlay_ = make_Overlay(
+    overlay_ = makeOverlay(
         *this,
-        setup_Overlay(*config_),
+        setupOverlay(*config_),
         *serverHandler_,
-        *m_resourceManager,
-        *m_resolver,
-        get_io_context(),
+        *resourceManager_,
+        *resolver_,
+        getIoContext(),
         *config_,
-        m_collectorManager->collector());
+        collectorManager_->collector());
     add(*overlay_);  // add to PropertyStream
 
     // start first consensus round
-    if (!m_networkOPs->beginConsensus(m_ledgerMaster->getClosedLedger()->header().hash, {}))
+    if (!networkOPs_->beginConsensus(ledgerMaster_->getClosedLedger()->header().hash, {}))
     {
-        JLOG(m_journal.fatal()) << "Unable to start consensus";
+        JLOG(journal_.fatal()) << "Unable to start consensus";
         return false;
     }
 
     {
         try
         {
-            beast::logstream logStream{m_journal.error()};
-            auto setup = setup_ServerHandler(*config_, logStream);
+            auto logStream = beast::logstream{journal_.error()};
+            auto setup = setupServerHandler(*config_, logStream);
             setup.makeContexts();
-            serverHandler_->setup(setup, m_journal);
+            serverHandler_->setup(setup, journal_);
             fixConfigPorts(*config_, serverHandler_->endpoints());
         }
         catch (std::exception const& e)
         {
-            if (auto stream = m_journal.fatal())
+            if (auto stream = journal_.fatal())
             {
                 stream << "Unable to setup server handler";
                 if (std::strlen(e.what()) > 0)
@@ -1442,35 +1401,35 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
         // of message, if displayed, should be displayed from PeerFinder.
         if (config_->PEER_PRIVATE && config_->IPS_FIXED.empty())
         {
-            JLOG(m_journal.warn()) << "No outbound peer connections will be made";
+            JLOG(journal_.warn()) << "No outbound peer connections will be made";
         }
 
         // VFALCO NOTE the state timer resets the deadlock detector.
         //
-        m_networkOPs->setStateTimer();
+        networkOPs_->setStateTimer();
     }
     else
     {
-        JLOG(m_journal.warn()) << "Running in standalone mode";
+        JLOG(journal_.warn()) << "Running in standalone mode";
 
-        m_networkOPs->setStandAlone();
+        networkOPs_->setStandAlone();
     }
 
     if (config_->canSign())
     {
-        JLOG(m_journal.warn()) << "*** The server is configured to allow the "
-                                  "'sign' and 'sign_for'";
-        JLOG(m_journal.warn()) << "*** commands. These commands have security "
-                                  "implications and have";
-        JLOG(m_journal.warn()) << "*** been deprecated. They will be removed "
-                                  "in a future release of";
-        JLOG(m_journal.warn()) << "*** xrpld.";
-        JLOG(m_journal.warn()) << "*** If you do not use them to sign "
-                                  "transactions please edit your";
-        JLOG(m_journal.warn()) << "*** configuration file and remove the [enable_signing] stanza.";
-        JLOG(m_journal.warn()) << "*** If you do use them to sign transactions "
-                                  "please migrate to a";
-        JLOG(m_journal.warn()) << "*** standalone signing solution as soon as possible.";
+        JLOG(journal_.warn()) << "*** The server is configured to allow the "
+                                 "'sign' and 'sign_for'";
+        JLOG(journal_.warn()) << "*** commands. These commands have security "
+                                 "implications and have";
+        JLOG(journal_.warn()) << "*** been deprecated. They will be removed "
+                                 "in a future release of";
+        JLOG(journal_.warn()) << "*** xrpld.";
+        JLOG(journal_.warn()) << "*** If you do not use them to sign "
+                                 "transactions please edit your";
+        JLOG(journal_.warn()) << "*** configuration file and remove the [enable_signing] stanza.";
+        JLOG(journal_.warn()) << "*** If you do use them to sign transactions "
+                                 "please migrate to a";
+        JLOG(journal_.warn()) << "*** standalone signing solution as soon as possible.";
     }
 
     //
@@ -1478,21 +1437,21 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
     //
     for (auto const& cmd : config_->section(SECTION_RPC_STARTUP).lines())
     {
-        Json::Reader jrReader;
-        Json::Value jvCommand;
+        json::Reader jrReader;
+        json::Value jvCommand;
 
         if (!jrReader.parse(cmd, jvCommand))
         {
-            JLOG(m_journal.fatal())
+            JLOG(journal_.fatal())
                 << "Couldn't parse entry in [" << SECTION_RPC_STARTUP << "]: '" << cmd;
         }
 
         if (!config_->quiet())
         {
-            JLOG(m_journal.fatal()) << "Startup RPC: " << jvCommand << std::endl;
+            JLOG(journal_.fatal()) << "Startup RPC: " << jvCommand << std::endl;
         }
 
-        Resource::Charge loadType = Resource::feeReferenceRPC;
+        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
         Resource::Consumer c;
         RPC::JsonContext context{
             {.j = getJournal("RPCHandler"),
@@ -1504,15 +1463,15 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
              .role = Role::ADMIN,
              .coro = {},
              .infoSub = {},
-             .apiVersion = RPC::apiMaximumSupportedVersion},
+             .apiVersion = RPC::kAPI_MAXIMUM_SUPPORTED_VERSION},
             jvCommand};
 
-        Json::Value jvResult;
+        json::Value jvResult;
         RPC::doCommand(context, jvResult);
 
         if (!config_->quiet())
         {
-            JLOG(m_journal.fatal()) << "Result: " << jvResult << std::endl;
+            JLOG(journal_.fatal()) << "Result: " << jvResult << std::endl;
         }
     }
 
@@ -1524,7 +1483,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
 void
 ApplicationImp::start(bool withTimers)
 {
-    JLOG(m_journal.info()) << "Application starting. Version is " << BuildInfo::getVersionString();
+    JLOG(journal_.info()) << "Application starting. Version is " << BuildInfo::getVersionString();
 
     if (withTimers)
     {
@@ -1532,10 +1491,10 @@ ApplicationImp::start(bool withTimers)
         setEntropyTimer();
     }
 
-    m_io_latency_sampler.start();
-    m_resolver->start();
-    m_loadManager->start();
-    m_shaMapStore->start();
+    io_latency_sampler_.start();
+    resolver_->start();
+    loadManager_->start();
+    shaMapStore_->start();
     if (overlay_)
         overlay_->start();
 
@@ -1560,9 +1519,9 @@ ApplicationImp::run()
 
     isTimeToStop.wait(false, std::memory_order_relaxed);
 
-    JLOG(m_journal.debug()) << "Application stopping";
+    JLOG(journal_.debug()) << "Application stopping";
 
-    m_io_latency_sampler.cancel_async();
+    io_latency_sampler_.cancelAsync();
 
     // VFALCO Enormous hack, we have to force the probe to cancel
     //        before we stop the io_context queue or else it never
@@ -1570,14 +1529,14 @@ ApplicationImp::run()
     //        io_objects gracefully handle exit so that we can
     //        naturally return from io_context::run() instead of
     //        forcing a call to io_context::stop()
-    m_io_latency_sampler.cancel();
+    io_latency_sampler_.cancel();
 
-    m_resolver->stop_async();
+    resolver_->stopAsync();
 
     // NIKB This is a hack - we need to wait for the resolver to
     //      stop. before we stop the io_server_queue or weird
     //      things will happen.
-    m_resolver->stop();
+    resolver_->stop();
 
     {
         try
@@ -1586,7 +1545,7 @@ ApplicationImp::run()
         }
         catch (boost::system::system_error const& e)
         {
-            JLOG(m_journal.error()) << "Application: sweepTimer cancel error: " << e.what();
+            JLOG(journal_.error()) << "Application: sweepTimer cancel error: " << e.what();
         }
 
         try
@@ -1595,7 +1554,7 @@ ApplicationImp::run()
         }
         catch (boost::system::system_error const& e)
         {
-            JLOG(m_journal.error()) << "Application: entropyTimer cancel error: " << e.what();
+            JLOG(journal_.error()) << "Application: entropyTimer cancel error: " << e.what();
         }
     }
 
@@ -1603,9 +1562,9 @@ ApplicationImp::run()
     // before we declare ourselves stopped.
     using namespace std::chrono_literals;
 
-    waitHandlerCounter_.join("Application", 1s, m_journal);
+    waitHandlerCounter_.join("Application", 1s, journal_);
 
-    mValidations.flush();
+    validations_.flush();
 
     validatorSites_->stop();
 
@@ -1620,22 +1579,22 @@ ApplicationImp::run()
 
     // The order of these stop calls is delicate.
     // Re-ordering them risks undefined behavior.
-    m_loadManager->stop();
-    m_shaMapStore->stop();
-    m_jobQueue->stop();
+    loadManager_->stop();
+    shaMapStore_->stop();
+    jobQueue_->stop();
     if (overlay_)
         overlay_->stop();
     grpcServer_->stop();
-    m_networkOPs->stop();
+    networkOPs_->stop();
     serverHandler_->stop();
-    m_ledgerReplayer->stop();
-    m_inboundTransactions->stop();
-    m_inboundLedgers->stop();
+    ledgerReplayer_->stop();
+    inboundTransactions_->stop();
+    inboundLedgers_->stop();
     ledgerCleaner_->stop();
-    m_nodeStore->stop();
+    nodeStore_->stop();
     perfLog_->stop();
 
-    JLOG(m_journal.info()) << "Done.";
+    JLOG(journal_.info()) << "Done.";
 }
 
 void
@@ -1645,10 +1604,10 @@ ApplicationImp::signalStop(std::string msg)
     {
         if (msg.empty())
         {
-            JLOG(m_journal.warn()) << "Server stopping";
+            JLOG(journal_.warn()) << "Server stopping";
         }
         else
-            JLOG(m_journal.warn()) << "Server stopping: " << msg;
+            JLOG(journal_.warn()) << "Server stopping: " << msg;
 
         isTimeToStop.notify_all();
     }
@@ -1684,7 +1643,7 @@ ApplicationImp::fdRequired() const
 
     // the number of fds needed by the backend (internally
     // doubled if online delete is enabled).
-    needed += std::max(5, m_shaMapStore->fdRequired());
+    needed += std::max(5, shaMapStore_->fdRequired());
 
     // One fd per incoming connection a port can accept, or
     // if no limit is set, assume it'll handle 256 clients.
@@ -1701,26 +1660,26 @@ void
 ApplicationImp::startGenesisLedger()
 {
     std::vector<uint256> const initialAmendments = (config_->START_UP == StartUpType::Fresh)
-        ? m_amendmentTable->getDesired()
+        ? amendmentTable_->getDesired()
         : std::vector<uint256>{};
 
     std::shared_ptr<Ledger> const genesis = std::make_shared<Ledger>(
-        create_genesis,
+        kCREATE_GENESIS,
         Rules{config_->features},
         config_->FEES.toFees(),
         initialAmendments,
         nodeFamily_);
-    m_ledgerMaster->storeLedger(genesis);
+    ledgerMaster_->storeLedger(genesis);
 
     auto const next = std::make_shared<Ledger>(*genesis, getTimeKeeper().closeTime());
     next->updateSkipList();
     XRPL_ASSERT(
-        next->header().seq < XRP_LEDGER_EARLIEST_FEES || next->read(keylet::fees()),
+        next->header().seq < kXRP_LEDGER_EARLIEST_FEES || next->read(keylet::fees()),
         "xrpl::ApplicationImp::startGenesisLedger : valid ledger fees");
     next->setImmutable();
     openLedger_.emplace(next, cachedSLEs_, logs_->journal("OpenLedger"));
-    m_ledgerMaster->storeLedger(next);
-    m_ledgerMaster->switchLCL(next);
+    ledgerMaster_->storeLedger(next);
+    ledgerMaster_->switchLCL(next);
 }
 
 std::shared_ptr<Ledger>
@@ -1737,7 +1696,7 @@ ApplicationImp::getLastFullLedger()
             return ledger;
 
         XRPL_ASSERT(
-            ledger->header().seq < XRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
+            ledger->header().seq < kXRP_LEDGER_EARLIEST_FEES || ledger->read(keylet::fees()),
             "xrpl::ApplicationImp::getLastFullLedger : valid ledger fees");
         ledger->setImmutable();
 
@@ -1753,8 +1712,8 @@ ApplicationImp::getLastFullLedger()
         if (auto stream = j.error())
         {
             stream << "Failed on ledger";
-            Json::Value p;
-            addJson(p, {*ledger, nullptr, LedgerFill::full});
+            json::Value p;
+            addJson(p, {*ledger, nullptr, LedgerFill::Full});
             stream << p;
         }
 
@@ -1776,20 +1735,20 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
 
         if (!ledgerFile)
         {
-            JLOG(m_journal.fatal()) << "Unable to open file '" << name << "'";
+            JLOG(journal_.fatal()) << "Unable to open file '" << name << "'";
             return nullptr;
         }
 
-        Json::Reader reader;
-        Json::Value jLedger;
+        json::Reader reader;
+        json::Value jLedger;
 
         if (!reader.parse(ledgerFile, jLedger))
         {
-            JLOG(m_journal.fatal()) << "Unable to parse ledger JSON";
+            JLOG(journal_.fatal()) << "Unable to parse ledger JSON";
             return nullptr;
         }
 
-        std::reference_wrapper<Json::Value> ledger(jLedger);
+        std::reference_wrapper<json::Value> ledger(jLedger);
 
         // accept a wrapped ledger
         if (ledger.get().isMember("result"))
@@ -1838,7 +1797,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
 
         if (!ledger.get().isArrayOrNull())
         {
-            JLOG(m_journal.fatal()) << "State nodes must be an array";
+            JLOG(journal_.fatal()) << "State nodes must be an array";
             return nullptr;
         }
 
@@ -1846,13 +1805,13 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
             seq, closeTime, Rules{config_->features}, config_->FEES.toFees(), nodeFamily_);
         loadLedger->setTotalDrops(totalDrops);
 
-        for (Json::UInt index = 0; index < ledger.get().size(); ++index)
+        for (json::UInt index = 0; index < ledger.get().size(); ++index)
         {
-            Json::Value& entry = ledger.get()[index];
+            json::Value& entry = ledger.get()[index];
 
             if (!entry.isObjectOrNull())
             {
-                JLOG(m_journal.fatal()) << "Invalid entry in ledger";
+                JLOG(journal_.fatal()) << "Invalid entry in ledger";
                 return nullptr;
             }
 
@@ -1860,7 +1819,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
 
             if (!uIndex.parseHex(entry[jss::index].asString()))
             {
-                JLOG(m_journal.fatal()) << "Invalid entry in ledger";
+                JLOG(journal_.fatal()) << "Invalid entry in ledger";
                 return nullptr;
             }
 
@@ -1870,7 +1829,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
 
             if (!stp.object || uIndex.isZero())
             {
-                JLOG(m_journal.fatal()) << "Invalid entry in ledger";
+                JLOG(journal_.fatal()) << "Invalid entry in ledger";
                 return nullptr;
             }
 
@@ -1880,15 +1839,16 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
 
             if (!loadLedger->addSLE(sle))
             {
-                JLOG(m_journal.fatal()) << "Couldn't add serialized ledger: " << uIndex;
+                JLOG(journal_.fatal()) << "Couldn't add serialized ledger: " << uIndex;
                 return nullptr;
             }
         }
 
-        loadLedger->stateMap().flushDirty(NodeObjectType::hotACCOUNT_NODE);
+        loadLedger->stateMap().flushDirty(NodeObjectType::AccountNode);
 
         XRPL_ASSERT(
-            loadLedger->header().seq < XRP_LEDGER_EARLIEST_FEES || loadLedger->read(keylet::fees()),
+            loadLedger->header().seq < kXRP_LEDGER_EARLIEST_FEES ||
+                loadLedger->read(keylet::fees()),
             "xrpl::ApplicationImp::loadLedgerFromFile : valid ledger fees");
         loadLedger->setAccepted(closeTime, closeTimeResolution, !closeTimeEstimated);
 
@@ -1896,7 +1856,7 @@ ApplicationImp::loadLedgerFromFile(std::string const& name)
     }
     catch (std::exception const& x)
     {
-        JLOG(m_journal.fatal()) << "Ledger contains invalid data: " << x.what();
+        JLOG(journal_.fatal()) << "Ledger contains invalid data: " << x.what();
         return nullptr;
     }
 }
@@ -1935,7 +1895,7 @@ ApplicationImp::loadOldLedger(
                         0,
                         InboundLedger::Reason::GENERIC,
                         stopwatch(),
-                        make_DummyPeerSet(*this));
+                        makeDummyPeerSet(*this));
                     if (il->checkLocal())
                         loadLedger = il->getLedger();
                 }
@@ -1967,7 +1927,7 @@ ApplicationImp::loadOldLedger(
             // this ledger holds the transactions we want to replay
             replayLedger = loadLedger;
 
-            JLOG(m_journal.info()) << "Loading parent ledger";
+            JLOG(journal_.info()) << "Loading parent ledger";
 
             loadLedger = loadByHash(
                 replayLedger->header().parentHash,
@@ -1976,7 +1936,7 @@ ApplicationImp::loadOldLedger(
                 *this);
             if (!loadLedger)
             {
-                JLOG(m_journal.info()) << "Loading parent ledger from node store";
+                JLOG(journal_.info()) << "Loading parent ledger from node store";
 
                 // Try to build the ledger from the back end
                 auto il = std::make_shared<InboundLedger>(
@@ -1985,7 +1945,7 @@ ApplicationImp::loadOldLedger(
                     0,
                     InboundLedger::Reason::GENERIC,
                     stopwatch(),
-                    make_DummyPeerSet(*this));
+                    makeDummyPeerSet(*this));
 
                 if (il->checkLocal())
                     loadLedger = il->getLedger();
@@ -1993,7 +1953,7 @@ ApplicationImp::loadOldLedger(
                 if (!loadLedger)
                 {
                     // LCOV_EXCL_START
-                    JLOG(m_journal.fatal()) << "Replay ledger missing/damaged";
+                    JLOG(journal_.fatal()) << "Replay ledger missing/damaged";
                     UNREACHABLE(
                         "xrpl::ApplicationImp::loadOldLedger : replay ledger "
                         "missing/damaged");
@@ -2004,28 +1964,28 @@ ApplicationImp::loadOldLedger(
         }
         using namespace std::chrono_literals;
         using namespace date;
-        static constexpr NetClock::time_point ledgerWarnTimePoint{
+        static constexpr NetClock::time_point kLEDGER_WARN_TIME_POINT{
             sys_days{January / 1 / 2018} - sys_days{January / 1 / 2000}};
-        if (loadLedger->header().closeTime < ledgerWarnTimePoint)
+        if (loadLedger->header().closeTime < kLEDGER_WARN_TIME_POINT)
         {
-            JLOG(m_journal.fatal()) << "\n\n***  WARNING   ***\n"
-                                       "You are replaying a ledger from before "
-                                    << to_string(ledgerWarnTimePoint)
-                                    << " UTC.\n"
-                                       "This replay will not handle your ledger as it was "
-                                       "originally "
-                                       "handled.\nConsider running an earlier version of xrpld "
-                                       "to "
-                                       "get the older rules.\n*** CONTINUING ***\n";
+            JLOG(journal_.fatal()) << "\n\n***  WARNING   ***\n"
+                                      "You are replaying a ledger from before "
+                                   << to_string(kLEDGER_WARN_TIME_POINT)
+                                   << " UTC.\n"
+                                      "This replay will not handle your ledger as it was "
+                                      "originally "
+                                      "handled.\nConsider running an earlier version of xrpld "
+                                      "to "
+                                      "get the older rules.\n*** CONTINUING ***\n";
         }
 
-        JLOG(m_journal.info()) << "Loading ledger " << loadLedger->header().hash
-                               << " seq:" << loadLedger->header().seq;
+        JLOG(journal_.info()) << "Loading ledger " << loadLedger->header().hash
+                              << " seq:" << loadLedger->header().seq;
 
         if (loadLedger->header().accountHash.isZero())
         {
             // LCOV_EXCL_START
-            JLOG(m_journal.fatal()) << "Ledger is empty.";
+            JLOG(journal_.fatal()) << "Ledger is empty.";
             UNREACHABLE("xrpl::ApplicationImp::loadOldLedger : ledger is empty");
             return false;
             // LCOV_EXCL_STOP
@@ -2034,7 +1994,7 @@ ApplicationImp::loadOldLedger(
         if (!loadLedger->walkLedger(getJournal("Ledger"), true))
         {
             // LCOV_EXCL_START
-            JLOG(m_journal.fatal()) << "Ledger is missing nodes.";
+            JLOG(journal_.fatal()) << "Ledger is missing nodes.";
             UNREACHABLE(
                 "xrpl::ApplicationImp::loadOldLedger : ledger is missing "
                 "nodes");
@@ -2045,10 +2005,10 @@ ApplicationImp::loadOldLedger(
         if (!loadLedger->isSensible())
         {
             // LCOV_EXCL_START
-            Json::Value j = getJson({*loadLedger, {}});
+            json::Value j = getJson({*loadLedger, {}});
             j[jss::accountTreeHash] = to_string(loadLedger->header().accountHash);
             j[jss::transTreeHash] = to_string(loadLedger->header().txHash);
-            JLOG(m_journal.fatal()) << "Ledger is not sensible: " << j;
+            JLOG(journal_.fatal()) << "Ledger is not sensible: " << j;
             UNREACHABLE(
                 "xrpl::ApplicationImp::loadOldLedger : ledger is not "
                 "sensible");
@@ -2056,11 +2016,11 @@ ApplicationImp::loadOldLedger(
             // LCOV_EXCL_STOP
         }
 
-        m_ledgerMaster->setLedgerRangePresent(loadLedger->header().seq, loadLedger->header().seq);
+        ledgerMaster_->setLedgerRangePresent(loadLedger->header().seq, loadLedger->header().seq);
 
-        m_ledgerMaster->switchLCL(loadLedger);
+        ledgerMaster_->switchLCL(loadLedger);
         loadLedger->setValidated();
-        m_ledgerMaster->setFullLedger(loadLedger, true, false);
+        ledgerMaster_->setFullLedger(loadLedger, true, false);
         openLedger_.emplace(loadLedger, cachedSLEs_, logs_->journal("OpenLedger"));
 
         if (replay)
@@ -2076,7 +2036,7 @@ ApplicationImp::loadOldLedger(
                 if (trapTxID == txID)
                 {
                     trapTxID_ = txID;
-                    JLOG(m_journal.debug()) << "Trap transaction set: " << txID;
+                    JLOG(journal_.debug()) << "Trap transaction set: " << txID;
                 }
 
                 auto s = std::make_shared<Serializer>();
@@ -2092,24 +2052,24 @@ ApplicationImp::loadOldLedger(
                 });
             }
 
-            m_ledgerMaster->takeReplay(std::move(replayData));
+            ledgerMaster_->takeReplay(std::move(replayData));
 
             if (trapTxID && !trapTxID_)
             {
-                JLOG(m_journal.fatal()) << "Ledger " << replayLedger->header().seq
-                                        << " does not contain the transaction hash " << *trapTxID;
+                JLOG(journal_.fatal()) << "Ledger " << replayLedger->header().seq
+                                       << " does not contain the transaction hash " << *trapTxID;
                 return false;
             }
         }
     }
     catch (SHAMapMissingNode const& mn)
     {
-        JLOG(m_journal.fatal()) << "While loading specified ledger: " << mn.what();
+        JLOG(journal_.fatal()) << "While loading specified ledger: " << mn.what();
         return false;
     }
     catch (boost::bad_lexical_cast&)
     {
-        JLOG(m_journal.fatal()) << "Ledger specified '" << ledgerID << "' is not valid";
+        JLOG(journal_.fatal()) << "Ledger specified '" << ledgerID << "' is not valid";
         return false;
     }
 
@@ -2177,7 +2137,7 @@ ApplicationImp::setMaxDisallowedLedger()
     if (seq)
         maxDisallowedLedger_ = *seq;
 
-    JLOG(m_journal.trace()) << "Max persisted ledger is " << maxDisallowedLedger_;
+    JLOG(journal_.trace()) << "Max persisted ledger is " << maxDisallowedLedger_;
 }
 
 //------------------------------------------------------------------------------
@@ -2189,7 +2149,7 @@ Application::Application() : beast::PropertyStream::Source("app")
 //------------------------------------------------------------------------------
 
 std::unique_ptr<Application>
-make_Application(
+makeApplication(
     std::unique_ptr<Config> config,
     std::unique_ptr<Logs> logs,
     std::unique_ptr<TimeKeeper> timeKeeper)
diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h
index aa1c789381..200fed7cf9 100644
--- a/src/xrpld/app/main/Application.h
+++ b/src/xrpld/app/main/Application.h
@@ -155,7 +155,7 @@ public:
 };
 
 std::unique_ptr<Application>
-make_Application(
+makeApplication(
     std::unique_ptr<Config> config,
     std::unique_ptr<Logs> logs,
     std::unique_ptr<TimeKeeper> timeKeeper);
diff --git a/src/xrpld/app/main/BasicApp.h b/src/xrpld/app/main/BasicApp.h
index 62757da836..d55ab858db 100644
--- a/src/xrpld/app/main/BasicApp.h
+++ b/src/xrpld/app/main/BasicApp.h
@@ -19,13 +19,13 @@ public:
     ~BasicApp();
 
     boost::asio::io_context&
-    get_io_context()
+    getIoContext()
     {
         return io_context_;
     }
 
     [[nodiscard]] size_t
-    get_number_of_threads() const
+    getNumberOfThreads() const
     {
         return threads_.size();
     }
diff --git a/src/xrpld/app/main/CollectorManager.cpp b/src/xrpld/app/main/CollectorManager.cpp
index a722e1447d..6cdbca8d8a 100644
--- a/src/xrpld/app/main/CollectorManager.cpp
+++ b/src/xrpld/app/main/CollectorManager.cpp
@@ -17,28 +17,30 @@ namespace xrpl {
 class CollectorManagerImp : public CollectorManager
 {
 public:
-    beast::Journal m_journal;
-    beast::insight::Collector::ptr m_collector;
-    std::unique_ptr<beast::insight::Groups> m_groups;
+    // NOLINTBEGIN(readability-identifier-naming)
+    beast::Journal journal_;
+    beast::insight::Collector::ptr collector_;
+    std::unique_ptr<beast::insight::Groups> groups_;
+    // NOLINTEND(readability-identifier-naming)
 
-    CollectorManagerImp(Section const& params, beast::Journal journal) : m_journal(journal)
+    CollectorManagerImp(Section const& params, beast::Journal journal) : journal_(journal)
     {
         std::string const& server = get(params, "server");
 
         if (server == "statsd")
         {
             beast::IP::Endpoint const address(
-                beast::IP::Endpoint::from_string(get(params, "address")));
+                beast::IP::Endpoint::fromString(get(params, "address")));
             std::string const& prefix(get(params, "prefix"));
 
-            m_collector = beast::insight::StatsDCollector::New(address, prefix, journal);
+            collector_ = beast::insight::StatsDCollector::make(address, prefix, journal);
         }
         else
         {
-            m_collector = beast::insight::NullCollector::New();
+            collector_ = beast::insight::NullCollector::make();
         }
 
-        m_groups = beast::insight::make_Groups(m_collector);
+        groups_ = beast::insight::makeGroups(collector_);
     }
 
     ~CollectorManagerImp() override = default;
@@ -46,20 +48,20 @@ public:
     beast::insight::Collector::ptr const&
     collector() override
     {
-        return m_collector;
+        return collector_;
     }
 
     beast::insight::Group::ptr const&
     group(std::string const& name) override
     {
-        return m_groups->get(name);
+        return groups_->get(name);
     }
 };
 
 //------------------------------------------------------------------------------
 
 std::unique_ptr<CollectorManager>
-make_CollectorManager(Section const& params, beast::Journal journal)
+makeCollectorManager(Section const& params, beast::Journal journal)
 {
     return std::make_unique<CollectorManagerImp>(params, journal);
 }
diff --git a/src/xrpld/app/main/CollectorManager.h b/src/xrpld/app/main/CollectorManager.h
index 15785ec292..e736ae57db 100644
--- a/src/xrpld/app/main/CollectorManager.h
+++ b/src/xrpld/app/main/CollectorManager.h
@@ -19,6 +19,6 @@ public:
 };
 
 std::unique_ptr<CollectorManager>
-make_CollectorManager(Section const& params, beast::Journal journal);
+makeCollectorManager(Section const& params, beast::Journal journal);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index 3c64606516..e0f0798dbc 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -71,9 +71,9 @@ getEndpoint(std::string const& peer)
         }
 
         std::optional<beast::IP::Endpoint> endpoint =
-            beast::IP::Endpoint::from_string_checked(peerClean);
+            beast::IP::Endpoint::fromStringChecked(peerClean);
         if (endpoint)
-            return beast::IP::to_asio_endpoint(endpoint.value());
+            return beast::IP::toAsioEndpoint(endpoint.value());
     }
     catch (std::exception const&)  // NOLINT(bugprone-empty-catch)
     {
@@ -146,7 +146,7 @@ GRPCServerImpl::CallData<Request, Response>::process()
     // is returned as a tag in handleRpcs(), after sending the response
     finished_ = true;
     auto coro = app_.getJobQueue().postCoro(
-        JobType::jtRPC, "gRPC-Client", [thisShared](std::shared_ptr<JobQueue::Coro> coro) {
+        JobType::JtRpc, "gRPC-Client", [thisShared](std::shared_ptr<JobQueue::Coro> coro) {
             thisShared->process(coro);
         });
 
@@ -204,17 +204,17 @@ GRPCServerImpl::CallData<Request, Response>::process(std::shared_ptr<JobQueue::C
                  role,
                  coro,
                  InfoSub::pointer(),
-                 apiVersion},
+                 kAPI_VERSION},
                 request_};
 
             // Make sure we can currently handle the rpc
-            error_code_i const conditionMetRes = RPC::conditionMet(requiredCondition_, context);
+            ErrorCodeI const conditionMetRes = RPC::conditionMet(requiredCondition_, context);
 
-            if (conditionMetRes != rpcSUCCESS)
+            if (conditionMetRes != RpcSuccess)
             {
-                RPC::ErrorInfo const errorInfo = RPC::get_error_info(conditionMetRes);
+                RPC::ErrorInfo const errorInfo = RPC::getErrorInfo(conditionMetRes);
                 grpc::Status const status{
-                    grpc::StatusCode::FAILED_PRECONDITION, errorInfo.message.c_str()};
+                    grpc::StatusCode::FAILED_PRECONDITION, errorInfo.message.cStr()};
                 responder_.FinishWithError(status, this);
             }
             else
@@ -327,7 +327,7 @@ GRPCServerImpl::CallData<Request, Response>::getUsage()
 {
     auto endpoint = getClientEndpoint();
     if (endpoint)
-        return app_.getResourceManager().newInboundEndpoint(beast::IP::from_asio(endpoint.value()));
+        return app_.getResourceManager().newInboundEndpoint(beast::IP::fromAsio(endpoint.value()));
     Throw<std::runtime_error>("Failed to get client endpoint");
 }
 
@@ -361,7 +361,7 @@ GRPCServerImpl::GRPCServerImpl(Application& app)
             Throw<std::runtime_error>("Error setting grpc server address");
         }
 
-        auto const optSecureGateway = section.get("secure_gateway");
+        auto const optSecureGateway = section.get("secureGateway");
         if (optSecureGateway)
         {
             try
@@ -376,8 +376,8 @@ GRPCServerImpl::GRPCServerImpl(Application& app)
                     if (addr.is_unspecified())
                     {
                         JLOG(journal_.error()) << "Can't pass unspecified IP in "
-                                               << "secure_gateway section of port_grpc";
-                        Throw<std::runtime_error>("Unspecified IP in secure_gateway section");
+                                               << "secureGateway section of port_grpc";
+                        Throw<std::runtime_error>("Unspecified IP in secureGateway section");
                     }
 
                     secureGatewayIPs_.emplace_back(addr);
@@ -386,7 +386,7 @@ GRPCServerImpl::GRPCServerImpl(Application& app)
             catch (std::exception const&)
             {
                 JLOG(journal_.error()) << "Error parsing secure gateway IPs for grpc server";
-                Throw<std::runtime_error>("Error parsing secure_gateway section");
+                Throw<std::runtime_error>("Error parsing secureGateway section");
             }
         }
 
@@ -542,8 +542,8 @@ GRPCServerImpl::setupListeners()
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::AsyncService::RequestGetLedger,
                 doLedgerGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedger,
-                RPC::NO_CONDITION,
-                Resource::feeMediumBurdenRPC,
+                RPC::NoCondition,
+                Resource::kFEE_MEDIUM_BURDEN_RPC,
                 secureGatewayIPs_));
     }
     {
@@ -559,8 +559,8 @@ GRPCServerImpl::setupListeners()
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::AsyncService::RequestGetLedgerData,
                 doLedgerDataGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerData,
-                RPC::NO_CONDITION,
-                Resource::feeMediumBurdenRPC,
+                RPC::NoCondition,
+                Resource::kFEE_MEDIUM_BURDEN_RPC,
                 secureGatewayIPs_));
     }
     {
@@ -576,8 +576,8 @@ GRPCServerImpl::setupListeners()
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::AsyncService::RequestGetLedgerDiff,
                 doLedgerDiffGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerDiff,
-                RPC::NO_CONDITION,
-                Resource::feeMediumBurdenRPC,
+                RPC::NoCondition,
+                Resource::kFEE_MEDIUM_BURDEN_RPC,
                 secureGatewayIPs_));
     }
     {
@@ -593,8 +593,8 @@ GRPCServerImpl::setupListeners()
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::AsyncService::RequestGetLedgerEntry,
                 doLedgerEntryGrpc,
                 &org::xrpl::rpc::v1::XRPLedgerAPIService::Stub::GetLedgerEntry,
-                RPC::NO_CONDITION,
-                Resource::feeMediumBurdenRPC,
+                RPC::NoCondition,
+                Resource::kFEE_MEDIUM_BURDEN_RPC,
                 secureGatewayIPs_));
     }
     return requests;
diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h
index 489a11d24a..6d9af236dc 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 apiVersion = 1;
+    static unsigned constexpr kAPI_VERSION = 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 4f9023dbc5..2b7bc27cd3 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 reportingIntervalSeconds = 10s;
-        constexpr auto stallFatalLogMessageTimeLimit = 90s;
-        constexpr auto stallLogicErrorTimeLimit = 600s;
+        constexpr auto kREPORTING_INTERVAL_SECONDS = 10s;
+        constexpr auto kSTALL_FATAL_LOG_MESSAGE_TIME_LIMIT = 90s;
+        constexpr auto kSTALL_LOGIC_ERROR_TIME_LIMIT = 600s;
 
-        if (armed && (timeSpentStalled >= reportingIntervalSeconds))
+        if (armed && (timeSpentStalled >= kREPORTING_INTERVAL_SECONDS))
         {
             // Report the stalled condition every reportingIntervalSeconds
-            if ((timeSpentStalled % reportingIntervalSeconds) == 0s)
+            if ((timeSpentStalled % kREPORTING_INTERVAL_SECONDS) == 0s)
             {
-                if (timeSpentStalled < stallFatalLogMessageTimeLimit)
+                if (timeSpentStalled < kSTALL_FATAL_LOG_MESSAGE_TIME_LIMIT)
                 {
                     JLOG(journal_.warn())
                         << "Server stalled for " << timeSpentStalled.count() << " seconds.";
@@ -141,12 +141,12 @@ 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 >= stallLogicErrorTimeLimit)
+            if (timeSpentStalled >= kSTALL_LOGIC_ERROR_TIME_LIMIT)
             {
                 JLOG(journal_.fatal()) << "LogicError: Fatal server stall detected. Stalled time: "
                                        << timeSpentStalled.count() << "s";
                 JLOG(journal_.fatal()) << "JobQueue: " << app_.getJobQueue().getJson(0);
-                LogicError("Fatal server stall detected");
+                logicError("Fatal server stall detected");
             }
         }
     }
@@ -174,7 +174,7 @@ LoadManager::run()
 //------------------------------------------------------------------------------
 
 std::unique_ptr<LoadManager>
-make_LoadManager(Application& app, beast::Journal journal)
+makeLoadManager(Application& app, beast::Journal journal)
 {
     return std::unique_ptr<LoadManager>{new LoadManager{app, journal}};
 }
diff --git a/src/xrpld/app/main/LoadManager.h b/src/xrpld/app/main/LoadManager.h
index 3ae1f45e3b..5baa01550e 100644
--- a/src/xrpld/app/main/LoadManager.h
+++ b/src/xrpld/app/main/LoadManager.h
@@ -88,10 +88,10 @@ private:
     bool armed_;
 
     friend std::unique_ptr<LoadManager>
-    make_LoadManager(Application& app, beast::Journal journal);
+    makeLoadManager(Application& app, beast::Journal journal);
 };
 
 std::unique_ptr<LoadManager>
-make_LoadManager(Application& app, beast::Journal journal);
+makeLoadManager(Application& app, beast::Journal journal);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp
index c774c77253..167cd2b023 100644
--- a/src/xrpld/app/main/Main.cpp
+++ b/src/xrpld/app/main/Main.cpp
@@ -101,7 +101,7 @@ adjustDescriptorLimit(int needed, beast::Journal j)
 
         if (available < needed)
         {
-            // Ignore the rlim_max, as the process may
+            // Ignore the rlimit_max_, as the process may
             // be configured to override it anyways. We
             // ask for the number descriptors we need.
             rl.rlim_cur = needed;
@@ -199,13 +199,13 @@ printHelp(po::options_description const& desc)
 /* simple unit test selector that allows a comma separated list
  * of selectors
  */
-class multi_selector
+class MultiSelector
 {
 private:
-    std::vector<beast::unit_test::selector> selectors_;
+    std::vector<beast::unit_test::Selector> selectors_;
 
 public:
-    explicit multi_selector(std::string const& patterns = "")
+    explicit MultiSelector(std::string const& patterns = "")
     {
         std::vector<std::string> v;
         boost::split(v, patterns, boost::algorithm::is_any_of(","));
@@ -213,12 +213,12 @@ public:
         std::ranges::for_each(v, [this](std::string s) {
             boost::trim(s);
             if (selectors_.empty() || !s.empty())
-                selectors_.emplace_back(beast::unit_test::selector::mode_t::automatch, s);
+                selectors_.emplace_back(beast::unit_test::Selector::ModeT::Automatch, s);
         });
     }
 
     bool
-    operator()(beast::unit_test::suite_info const& s)
+    operator()(beast::unit_test::SuiteInfo const& s)
     {
         for (auto& sel : selectors_)
         {
@@ -236,23 +236,23 @@ public:
 };
 
 namespace test {
-extern std::atomic<bool> envUseIPv4;
+extern std::atomic<bool> gEnvUseIPv4;
 }  // namespace test
 
 template <class Runner>
 static bool
-anyMissing(Runner& runner, multi_selector const& pred)
+anyMissing(Runner& runner, MultiSelector const& pred)
 {
     if (runner.tests() == 0)
     {
-        runner.add_failures(1);
+        runner.addFailures(1);
         std::cout << "Failed: No tests run" << std::endl;
         return true;
     }
     if (runner.suites() < pred.size())
     {
         auto const missing = pred.size() - runner.suites();
-        runner.add_failures(missing);
+        runner.addFailures(missing);
         std::cout << "Failed: " << missing << " filters did not match any existing test suites"
                   << std::endl;
         return true;
@@ -268,34 +268,34 @@ runUnitTests(
     bool log,
     bool child,
     bool ipv6,
-    std::size_t num_jobs,
+    std::size_t numJobs,
     int argc,
     char** argv)
 {
     using namespace beast::unit_test;
     using namespace xrpl::test;
 
-    xrpl::test::envUseIPv4 = (!ipv6);
+    xrpl::test::gEnvUseIPv4 = (!ipv6);
 
-    if (!child && num_jobs == 1)
+    if (!child && numJobs == 1)
     {
-        multi_runner_parent const parent_runner;
+        MultiRunnerParent const parentRunner;
 
-        multi_runner_child child_runner{num_jobs, quiet, log};
-        child_runner.arg(argument);
-        multi_selector const pred(pattern);
-        auto const any_failed = child_runner.run_multi(pred) || anyMissing(child_runner, pred);
+        MultiRunnerChild childRunner{numJobs, quiet, log};
+        childRunner.arg(argument);
+        MultiSelector const pred(pattern);
+        auto const anyFailed = childRunner.runMulti(pred) || anyMissing(childRunner, pred);
 
-        if (any_failed)
+        if (anyFailed)
             return EXIT_FAILURE;
         return EXIT_SUCCESS;
     }
     if (!child)
     {
-        multi_runner_parent parent_runner;
+        MultiRunnerParent parentRunner;
         std::vector<boost::process::v1::child> children;
 
-        std::string const exe_name = argv[0];
+        std::string const exeName = argv[0];
         std::vector<std::string> args;
         {
             args.reserve(argc);
@@ -304,43 +304,43 @@ runUnitTests(
             args.emplace_back("--unittest-child");
         }
 
-        children.reserve(num_jobs);
-        for (std::size_t i = 0; i < num_jobs; ++i)
+        children.reserve(numJobs);
+        for (std::size_t i = 0; i < numJobs; ++i)
         {
             children.emplace_back(
-                boost::process::v1::exe = exe_name, boost::process::v1::args = args);
+                boost::process::v1::exe = exeName, boost::process::v1::args = args);
         }
 
-        int bad_child_exits = 0;
-        int terminated_child_exits = 0;
+        int badChildExits = 0;
+        int terminatedChildExits = 0;
         for (auto& c : children)
         {
             try
             {
                 c.wait();
                 if (c.exit_code() != 0)
-                    ++bad_child_exits;
+                    ++badChildExits;
             }
             catch (...)
             {
                 // wait throws if process was terminated with a signal
-                ++bad_child_exits;
-                ++terminated_child_exits;
+                ++badChildExits;
+                ++terminatedChildExits;
             }
         }
 
-        parent_runner.add_failures(terminated_child_exits);
-        anyMissing(parent_runner, multi_selector(pattern));
+        parentRunner.addFailures(terminatedChildExits);
+        anyMissing(parentRunner, MultiSelector(pattern));
 
-        if (parent_runner.any_failed() || (bad_child_exits != 0))
+        if (parentRunner.anyFailed() || (badChildExits != 0))
             return EXIT_FAILURE;
         return EXIT_SUCCESS;
     }
 
     // child
-    multi_runner_child runner{num_jobs, quiet, log};
+    MultiRunnerChild runner{numJobs, quiet, log};
     runner.arg(argument);
-    auto const anyFailed = runner.run_multi(multi_selector(pattern));
+    auto const anyFailed = runner.runMulti(MultiSelector(pattern));
 
     if (anyFailed)
         return EXIT_FAILURE;
@@ -516,7 +516,7 @@ run(int argc, char** argv)
     if (vm.contains("definitions"))
     {
         // LCOV_EXCL_START
-        std::cout << Json::FastWriter().write(getServerDefinitionsJson());
+        std::cout << json::FastWriter().write(getServerDefinitionsJson());
         return 0;
         // LCOV_EXCL_STOP
     }
@@ -588,7 +588,7 @@ run(int argc, char** argv)
 
         try
         {
-            auto setup = setup_DatabaseCon(*config);
+            auto setup = setupDatabaseCon(*config);
             if (!doVacuumDB(setup, config->journal()))
                 return -1;
         }
@@ -716,7 +716,7 @@ run(int argc, char** argv)
     // happen after the config file is loaded.
     if (vm.contains("rpc_ip"))
     {
-        auto endpoint = beast::IP::Endpoint::from_string_checked(vm["rpc_ip"].as<std::string>());
+        auto endpoint = beast::IP::Endpoint::fromStringChecked(vm["rpc_ip"].as<std::string>());
         if (!endpoint)
         {
             std::cerr << "Invalid rpc_ip = " << vm["rpc_ip"].as<std::string>() << "\n";
@@ -731,7 +731,7 @@ run(int argc, char** argv)
                 std::cerr << "WARNING: using deprecated rpc_port param.\n";
                 try
                 {
-                    endpoint = endpoint->at_port(vm["rpc_port"].as<std::uint16_t>());
+                    endpoint = endpoint->atPort(vm["rpc_port"].as<std::uint16_t>());
                     if (endpoint->port() == 0)
                         throw std::domain_error("0");
                 }
@@ -769,15 +769,15 @@ run(int argc, char** argv)
 
     // Construct the logs object at the configured severity
     using namespace beast::severities;
-    Severity thresh = kInfo;
+    Severity thresh = KInfo;
 
     if (vm.contains("quiet"))
     {
-        thresh = kFatal;
+        thresh = KFatal;
     }
     else if (vm.contains("verbose"))
     {
-        thresh = kTrace;
+        thresh = KTrace;
     }
 
     auto logs = std::make_unique<Logs>(thresh);
@@ -785,7 +785,7 @@ run(int argc, char** argv)
     // No arguments. Run server.
     if (!vm.contains("parameters"))
     {
-        if (config->had_trailing_comments())
+        if (config->hadTrailingComments())
         {
             JLOG(logs->journal("Application").warn())
                 << "Trailing comments were seen in your config file. "
@@ -802,10 +802,10 @@ run(int argc, char** argv)
             return -1;
 
         if (vm.contains("debug"))
-            setDebugLogSink(logs->makeSink("Debug", beast::severities::kTrace));
+            setDebugLogSink(logs->makeSink("Debug", beast::severities::KTrace));
 
         auto app =
-            make_Application(std::move(config), std::move(logs), std::make_unique<TimeKeeper>());
+            makeApplication(std::move(config), std::move(logs), std::make_unique<TimeKeeper>());
 
         if (!app->setup(vm))
             return -1;
diff --git a/src/xrpld/app/main/NodeIdentity.cpp b/src/xrpld/app/main/NodeIdentity.cpp
index f52e7e372e..656e2b91a2 100644
--- a/src/xrpld/app/main/NodeIdentity.cpp
+++ b/src/xrpld/app/main/NodeIdentity.cpp
@@ -41,8 +41,8 @@ getNodeIdentity(Application& app, boost::program_options::variables_map const& c
 
     if (seed)
     {
-        auto secretKey = generateSecretKey(KeyType::secp256k1, *seed);
-        auto publicKey = derivePublicKey(KeyType::secp256k1, secretKey);
+        auto secretKey = generateSecretKey(KeyType::Secp256k1, *seed);
+        auto publicKey = derivePublicKey(KeyType::Secp256k1, secretKey);
 
         return {publicKey, secretKey};
     }
diff --git a/src/xrpld/app/main/NodeStoreScheduler.cpp b/src/xrpld/app/main/NodeStoreScheduler.cpp
index 2aebe40252..7892503f90 100644
--- a/src/xrpld/app/main/NodeStoreScheduler.cpp
+++ b/src/xrpld/app/main/NodeStoreScheduler.cpp
@@ -17,7 +17,7 @@ NodeStoreScheduler::scheduleTask(NodeStore::Task& task)
     if (jobQueue_.isStopped())
         return;
 
-    if (!jobQueue_.addJob(jtWRITE, "NObjStore", [&task]() { task.performScheduledTask(); }))
+    if (!jobQueue_.addJob(JtWrite, "NObjStore", [&task]() { task.performScheduledTask(); }))
     {
         // Job not added, presumably because we're shutting down.
         // Recover by executing the task synchronously.
@@ -32,7 +32,7 @@ NodeStoreScheduler::onFetch(NodeStore::FetchReport const& report)
         return;
 
     jobQueue_.addLoadEvents(
-        report.fetchType == NodeStore::FetchType::async ? jtNS_ASYNC_READ : jtNS_SYNC_READ,
+        report.fetchType == NodeStore::FetchType::Async ? JtNsAsyncRead : JtNsSyncRead,
         1,
         report.elapsed);
 }
@@ -43,7 +43,7 @@ NodeStoreScheduler::onBatchWrite(NodeStore::BatchWriteReport const& report)
     if (jobQueue_.isStopped())
         return;
 
-    jobQueue_.addLoadEvents(jtNS_WRITE, report.writeCount, report.elapsed);
+    jobQueue_.addLoadEvents(JtNsWrite, report.writeCount, report.elapsed);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/main/Tuning.h b/src/xrpld/app/main/Tuning.h
index 0f612b1b1c..4d2c4e01e7 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 fullBelowTargetSize = 524288;
-constexpr std::chrono::seconds fullBelowExpiration = std::chrono::minutes{10};
+constexpr std::size_t kFULL_BELOW_TARGET_SIZE = 524288;
+constexpr std::chrono::seconds kFULL_BELOW_EXPIRATION = std::chrono::minutes{10};
 
-constexpr std::size_t maxPoppedTransactions = 10;
+constexpr std::size_t kMAX_POPPED_TRANSACTIONS = 10;
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/misc/DeliverMax.h b/src/xrpld/app/misc/DeliverMax.h
index 8610a6a529..fefa59d46b 100644
--- a/src/xrpld/app/misc/DeliverMax.h
+++ b/src/xrpld/app/misc/DeliverMax.h
@@ -2,9 +2,9 @@
 
 #include <xrpl/protocol/TxFormats.h>
 
-namespace Json {
+namespace json {
 class Value;
-}  // namespace Json
+}  // namespace json
 
 namespace xrpl::RPC {
 
@@ -18,7 +18,7 @@ namespace xrpl::RPC {
  */
 
 void
-insertDeliverMax(Json::Value& tx_json, TxType txnType, unsigned int apiVersion);
+insertDeliverMax(json::Value& txJson, TxType txnType, unsigned int apiVersion);
 
 /** @} */
 
diff --git a/src/xrpld/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h
index 3ecf474867..5c6206558a 100644
--- a/src/xrpld/app/misc/FeeVote.h
+++ b/src/xrpld/app/misc/FeeVote.h
@@ -38,6 +38,6 @@ struct FeeSetup;
     @param journal Where to log.
 */
 std::unique_ptr<FeeVote>
-make_FeeVote(FeeSetup const& setup, beast::Journal journal);
+makeFeeVote(FeeSetup const& setup, beast::Journal journal);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/misc/FeeVoteImpl.cpp b/src/xrpld/app/misc/FeeVoteImpl.cpp
index f6c60bc572..4369a4642d 100644
--- a/src/xrpld/app/misc/FeeVoteImpl.cpp
+++ b/src/xrpld/app/misc/FeeVoteImpl.cpp
@@ -8,6 +8,7 @@
 #include <xrpl/ledger/ReadView.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Fees.h>
+#include <xrpl/protocol/Protocol.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STTx.h>
 #include <xrpl/protocol/STValidation.h>
@@ -232,9 +233,9 @@ FeeVoteImpl::doVoting(
                 using XRPType = XRPAmount::value_type;
                 auto const vote = *field;
                 if (vote <= std::numeric_limits<XRPType>::max() &&
-                    isLegalAmountSigned(XRPAmount{unsafe_cast<XRPType>(vote)}))
+                    isLegalAmountSigned(XRPAmount{unsafeCast<XRPType>(vote)}))
                 {
-                    value.addVote(XRPAmount{unsafe_cast<XRPType>(vote)});
+                    value.addVote(XRPAmount{unsafeCast<XRPType>(vote)});
                 }
                 else
                 {
@@ -294,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] = FEE_UNITS_DEPRECATED;
+                obj[sfReferenceFeeUnits] = kFEE_UNITS_DEPRECATED;
             }
         });
 
@@ -306,7 +307,7 @@ FeeVoteImpl::doVoting(
         feeTx.add(s);
 
         if (!initialPosition->addGiveItem(
-                SHAMapNodeType::tnTRANSACTION_NM, make_shamapitem(txID, s.slice())))
+                SHAMapNodeType::TnTransactionNm, makeShamapitem(txID, s.slice())))
         {
             JLOG(journal_.warn()) << "Ledger already had fee change";
         }
@@ -316,7 +317,7 @@ FeeVoteImpl::doVoting(
 //------------------------------------------------------------------------------
 
 std::unique_ptr<FeeVote>
-make_FeeVote(FeeSetup const& setup, beast::Journal journal)
+makeFeeVote(FeeSetup const& setup, beast::Journal journal)
 {
     return std::make_unique<FeeVoteImpl>(setup, journal);
 }
diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp
index c733de3bd3..0da94ad75f 100644
--- a/src/xrpld/app/misc/NegativeUNLVote.cpp
+++ b/src/xrpld/app/misc/NegativeUNLVote.cpp
@@ -122,8 +122,8 @@ NegativeUNLVote::addTx(
     Serializer s;
     negUnlTx.add(s);
     if (!initialSet->addGiveItem(
-            SHAMapNodeType::tnTRANSACTION_NM,
-            make_shamapitem(negUnlTx.getTransactionID(), s.slice())))
+            SHAMapNodeType::TnTransactionNm,
+            makeShamapitem(negUnlTx.getTransactionID(), s.slice())))
     {
         JLOG(j_.warn()) << "N-UNL: ledger seq=" << seq << ", add ttUNL_MODIFY tx failed";
     }
@@ -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::bytes <= uint256::bytes);
+    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 + FLAG_LEDGER_INTERVAL);
+    validations.setSeqToKeep(seq - 1, seq + kFLAG_LEDGER_INTERVAL);
 
     // 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 < FLAG_LEDGER_INTERVAL)
+    if (numAncestors < kFLAG_LEDGER_INTERVAL)
     {
         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 < FLAG_LEDGER_INTERVAL; ++i)
+    for (int i = 0; i < kFLAG_LEDGER_INTERVAL; ++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 < negativeUNLMinLocalValsToVote)
+    if (myValidationCount < kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE)
     {
         JLOG(j_.debug()) << "N-UNL: ledger " << seq << ". Local node only issued "
-                         << myValidationCount << " validations in last " << FLAG_LEDGER_INTERVAL
+                         << myValidationCount << " validations in last " << kFLAG_LEDGER_INTERVAL
                          << " ledgers."
                          << " The reliability measurement could be wrong.";
         return {};
     }
-    if (myValidationCount > negativeUNLMinLocalValsToVote &&
-        myValidationCount <= FLAG_LEDGER_INTERVAL)
+    if (myValidationCount > kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE &&
+        myValidationCount <= kFLAG_LEDGER_INTERVAL)
     {
         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 " << FLAG_LEDGER_INTERVAL << " ledgers. Too many!";
+                     << " validations in last " << kFLAG_LEDGER_INTERVAL << " 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() * negativeUNLMaxListed));
+            static_cast<std::size_t>(std::ceil(unl.size() * kNEGATIVE_UNL_MAX_LISTED));
         std::size_t negativeListed = 0;
         for (auto const& n : unl)
         {
@@ -249,8 +249,9 @@ NegativeUNLVote::findAllCandidates(
                 ++negativeListed;
         }
         bool const result = negativeListed < maxNegativeListed;
-        JLOG(j_.trace()) << "N-UNL: nodeId " << myId_ << " lowWaterMark " << negativeUNLLowWaterMark
-                         << " highWaterMark " << negativeUNLHighWaterMark << " canAdd " << result
+        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;
         return result;
@@ -266,7 +267,7 @@ NegativeUNLVote::findAllCandidates(
         //  (2) has less than negativeUNLLowWaterMark validations,
         //  (3) is not in negUnl, and
         //  (4) is not a new validator.
-        if (canAdd && score < negativeUNLLowWaterMark && !negUnl.contains(nodeId) &&
+        if (canAdd && score < kNEGATIVE_UNL_LOW_WATER_MARK && !negUnl.contains(nodeId) &&
             !newValidators_.contains(nodeId))
         {
             JLOG(j_.trace()) << "N-UNL: toDisable candidate " << nodeId;
@@ -276,7 +277,7 @@ NegativeUNLVote::findAllCandidates(
         // Find toReEnable Candidates: check if
         //  (1) has more than negativeUNLHighWaterMark validations,
         //  (2) is in negUnl
-        if (score > negativeUNLHighWaterMark && negUnl.contains(nodeId))
+        if (score > kNEGATIVE_UNL_HIGH_WATER_MARK && negUnl.contains(nodeId))
         {
             JLOG(j_.trace()) << "N-UNL: toReEnable candidate " << nodeId;
             candidates.toReEnableCandidates.push_back(nodeId);
@@ -327,7 +328,7 @@ NegativeUNLVote::purgeNewValidators(LedgerIndex seq)
     auto i = newValidators_.begin();
     while (i != newValidators_.end())
     {
-        if (seq - i->second > newValidatorDisableSkip)
+        if (seq - i->second > kNEW_VALIDATOR_DISABLE_SKIP)
         {
             i = newValidators_.erase(i);
         }
diff --git a/src/xrpld/app/misc/NegativeUNLVote.h b/src/xrpld/app/misc/NegativeUNLVote.h
index 02e84ccca1..4cedc4743f 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 negativeUNLLowWaterMark = FLAG_LEDGER_INTERVAL * 50 / 100;
+    static constexpr size_t kNEGATIVE_UNL_LOW_WATER_MARK = kFLAG_LEDGER_INTERVAL * 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 negativeUNLHighWaterMark = FLAG_LEDGER_INTERVAL * 80 / 100;
+    static constexpr size_t kNEGATIVE_UNL_HIGH_WATER_MARK = kFLAG_LEDGER_INTERVAL * 80 / 100;
     /**
      * The minimum number of validations of the local node for it to
      * participate in the voting.
      */
-    static constexpr size_t negativeUNLMinLocalValsToVote = FLAG_LEDGER_INTERVAL * 90 / 100;
+    static constexpr size_t kNEGATIVE_UNL_MIN_LOCAL_VALS_TO_VOTE = kFLAG_LEDGER_INTERVAL * 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 newValidatorDisableSkip = FLAG_LEDGER_INTERVAL * 2;
+    static constexpr size_t kNEW_VALIDATOR_DISABLE_SKIP = kFLAG_LEDGER_INTERVAL * 2;
     /**
      * We only want to put 25% of the UNL on the NegativeUNL.
      */
-    static constexpr float negativeUNLMaxListed = 0.25;
+    static constexpr float kNEGATIVE_UNL_MAX_LISTED = 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 964a51e15e..638489a9fa 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -174,7 +174,7 @@ class NetworkOPsImp final : public NetworkOPs
             : transaction(std::move(t)), admin(a), local(l), failType(f)
         {
             XRPL_ASSERT(
-                local || failType == FailHard::no,
+                local || failType == FailHard::No,
                 "xrpl::NetworkOPsImp::TransactionStatus::TransactionStatus : "
                 "valid inputs");
         }
@@ -184,12 +184,12 @@ class NetworkOPsImp final : public NetworkOPs
      * Synchronization states for transaction batches.
      */
     enum class DispatchState : unsigned char {
-        none,
-        scheduled,
-        running,
+        None,
+        Scheduled,
+        Running,
     };
 
-    static std::array<char const*, 5> const states_;
+    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 states_;
+        static std::array<json::StaticString const, 5> const kSTATES;
 
     public:
         explicit StateAccounting()
@@ -244,7 +244,7 @@ class NetworkOPsImp final : public NetworkOPs
          * @obj Json object to which to add state accounting data.
          */
         void
-        json(Json::Value& obj) const;
+        json(json::Value& obj) const;
 
         struct CounterData
         {
@@ -296,29 +296,29 @@ public:
         NetworkOPs::clock_type& clock,
         bool standalone,
         std::size_t minPeerCount,
-        bool start_valid,
-        JobQueue& job_queue,
+        bool startValid,
+        JobQueue& jobQueue,
         LedgerMaster& ledgerMaster,
         ValidatorKeys const& validatorKeys,
         boost::asio::io_context& ioCtx,
         beast::Journal journal,
         beast::insight::Collector::ptr const& collector)
         : registry_(registry)
-        , m_journal(journal)
-        , m_localTX(make_LocalTxs())
-        , mMode(start_valid ? OperatingMode::FULL : OperatingMode::DISCONNECTED)
+        , journal_(journal)
+        , localTX_(makeLocalTxs())
+        , mode_(startValid ? OperatingMode::FULL : OperatingMode::DISCONNECTED)
         , heartbeatTimer_(ioCtx)
         , clusterTimer_(ioCtx)
         , accountHistoryTxTimer_(ioCtx)
-        , mConsensus(
+        , consensus_(
               registry_.get().getApp(),
-              make_FeeVote(
-                  setup_FeeVote(registry_.get().getApp().config().section("voting")),
+              makeFeeVote(
+                  setupFeeVote(registry_.get().getApp().config().section("voting")),
                   registry_.get().getJournal("FeeVote")),
               ledgerMaster,
-              *m_localTX,
+              *localTX_,
               registry.getInboundTransactions(),
-              beast::get_abstract_clock<std::chrono::steady_clock>(),
+              beast::getAbstractClock<std::chrono::steady_clock>(),
               validatorKeys,
               registry_.get().getJournal("LedgerConsensus"))
         , validatorPK_(
@@ -326,11 +326,11 @@ public:
         , validatorMasterPK_(
               validatorKeys.keys ? validatorKeys.keys->masterPublicKey
                                  : decltype(validatorMasterPK_){})
-        , m_ledgerMaster(ledgerMaster)
-        , m_job_queue(job_queue)
-        , m_standalone(standalone)
-        , minPeerCount_(start_valid ? 0 : minPeerCount)
-        , m_stats(std::bind(&NetworkOPsImp::collect_metrics, this), collector)
+        , ledgerMaster_(ledgerMaster)
+        , job_queue_(jobQueue)
+        , standalone_(standalone)
+        , minPeerCount_(startValid ? 0 : minPeerCount)
+        , stats_(std::bind(&NetworkOPsImp::collectMetrics, this), collector)
     {
     }
 
@@ -339,7 +339,7 @@ public:
         // This clear() is necessary to ensure the shared_ptrs in this map get
         // destroyed NOW because the objects in this map invoke methods on this
         // class when they are destroyed
-        mRpcSubMap.clear();
+        rpcSubMap_.clear();
     }
 
 public:
@@ -424,7 +424,7 @@ public:
     // Owner functions.
     //
 
-    Json::Value
+    json::Value
     getOwnerInfo(std::shared_ptr<ReadView const> lpLedger, AccountID const& account) override;
 
     //
@@ -438,8 +438,8 @@ public:
         AccountID const& uTakerID,
         bool const bProof,
         unsigned int iLimit,
-        Json::Value const& jvMarker,
-        Json::Value& jvResult) override;
+        json::Value const& jvMarker,
+        json::Value& jvResult) override;
 
     // Ledger proposal/close functions.
     bool
@@ -508,13 +508,13 @@ public:
     void
     consensusViewChange() override;
 
-    Json::Value
+    json::Value
     getConsensusInfo() override;
-    Json::Value
+    json::Value
     getServerInfo(bool human, bool admin, bool counters) override;
     void
     clearLedgerFetch() override;
-    Json::Value
+    json::Value
     getLedgerFetchInfo() override;
     std::uint32_t
     acceptLedger(std::optional<std::chrono::milliseconds> consensusDelay) override;
@@ -558,7 +558,7 @@ public:
     unsubAccountInternal(std::uint64_t seq, hash_set<AccountID> const& vnaAccountIDs, bool rt)
         override;
 
-    error_code_i
+    ErrorCodeI
     subAccountHistory(InfoSub::ref ispListener, AccountID const& account) override;
     void
     unsubAccountHistory(InfoSub::ref ispListener, AccountID const& account, bool historyOnly)
@@ -569,7 +569,7 @@ public:
         override;
 
     bool
-    subLedger(InfoSub::ref ispListener, Json::Value& jvResult) override;
+    subLedger(InfoSub::ref ispListener, json::Value& jvResult) override;
     bool
     unsubLedger(std::uint64_t uListener) override;
 
@@ -579,7 +579,7 @@ public:
     unsubBookChanges(std::uint64_t uListener) override;
 
     bool
-    subServer(InfoSub::ref ispListener, Json::Value& jvResult, bool admin) override;
+    subServer(InfoSub::ref ispListener, json::Value& jvResult, bool admin) override;
     bool
     unsubServer(std::uint64_t uListener) override;
 
@@ -615,7 +615,7 @@ public:
     bool
     unsubPeerStatus(std::uint64_t uListener) override;
     void
-    pubPeerStatus(std::function<Json::Value(void)> const&) override;
+    pubPeerStatus(std::function<json::Value(void)> const&) override;
 
     bool
     subConsensus(InfoSub::ref ispListener) override;
@@ -639,7 +639,7 @@ public:
             }
             catch (boost::system::system_error const& e)
             {
-                JLOG(m_journal.error()) << "NetworkOPs: heartbeatTimer cancel error: " << e.what();
+                JLOG(journal_.error()) << "NetworkOPs: heartbeatTimer cancel error: " << e.what();
             }
 
             try
@@ -648,7 +648,7 @@ public:
             }
             catch (boost::system::system_error const& e)
             {
-                JLOG(m_journal.error()) << "NetworkOPs: clusterTimer cancel error: " << e.what();
+                JLOG(journal_.error()) << "NetworkOPs: clusterTimer cancel error: " << e.what();
             }
 
             try
@@ -657,23 +657,23 @@ public:
             }
             catch (boost::system::system_error const& e)
             {
-                JLOG(m_journal.error())
+                JLOG(journal_.error())
                     << "NetworkOPs: accountHistoryTxTimer cancel error: " << e.what();
             }
         }
         // Make sure that any waitHandlers pending in our timers are done.
         using namespace std::chrono_literals;
-        waitHandlerCounter_.join("NetworkOPs", 1s, m_journal);
+        waitHandlerCounter_.join("NetworkOPs", 1s, journal_);
     }
 
     void
-    stateAccounting(Json::Value& obj) override;
+    stateAccounting(json::Value& obj) override;
 
 private:
     void
     setTimer(
         boost::asio::steady_timer& timer,
-        std::chrono::milliseconds const& expiry_time,
+        std::chrono::milliseconds const& expiryTime,
         std::function<void()> onExpire,
         std::function<void()> onError);
     void
@@ -734,36 +734,36 @@ private:
      */
     struct SubAccountHistoryIndex
     {
-        AccountID const accountId_;
+        AccountID const accountId;
         // forward
-        std::uint32_t forwardTxIndex_{0};
+        std::uint32_t forwardTxIndex{0};
         // separate backward and forward
-        std::uint32_t separationLedgerSeq_{0};
+        std::uint32_t separationLedgerSeq{0};
         // history, backward
-        std::uint32_t historyLastLedgerSeq_{0};
-        std::int32_t historyTxIndex_{-1};
-        bool haveHistorical_{false};
-        std::atomic<bool> stopHistorical_{false};
+        std::uint32_t historyLastLedgerSeq{0};
+        std::int32_t historyTxIndex{-1};
+        bool haveHistorical{false};
+        std::atomic<bool> stopHistorical{false};
 
-        SubAccountHistoryIndex(AccountID const& accountId) : accountId_(accountId)
+        SubAccountHistoryIndex(AccountID const& accountId) : accountId(accountId)
         {
         }
     };
     struct SubAccountHistoryInfo
     {
-        InfoSub::pointer sink_;
-        std::shared_ptr<SubAccountHistoryIndex> index_;
+        InfoSub::pointer sink;
+        std::shared_ptr<SubAccountHistoryIndex> index;
     };
     struct SubAccountHistoryInfoWeak
     {
-        InfoSub::wptr sinkWptr_;
-        std::shared_ptr<SubAccountHistoryIndex> index_;
+        InfoSub::wptr sinkWptr;
+        std::shared_ptr<SubAccountHistoryIndex> index;
     };
     using SubAccountHistoryMapType =
         hash_map<AccountID, hash_map<std::uint64_t, SubAccountHistoryInfoWeak>>;
 
     /**
-     * @note called while holding mSubLock
+     * @note called while holding subLock_
      */
     void
     subAccountHistoryStart(
@@ -775,13 +775,13 @@ private:
     setAccountHistoryJobTimer(SubAccountHistoryInfoWeak subInfo);
 
     std::reference_wrapper<ServiceRegistry> registry_;
-    beast::Journal m_journal;
+    beast::Journal journal_;
 
-    std::unique_ptr<LocalTxs> m_localTX;
+    std::unique_ptr<LocalTxs> localTX_;
 
-    std::recursive_mutex mSubLock;
+    std::recursive_mutex subLock_;
 
-    std::atomic<OperatingMode> mMode;
+    std::atomic<OperatingMode> mode_;
 
     std::atomic<bool> needNetworkLedger_{false};
     std::atomic<bool> amendmentBlocked_{false};
@@ -793,54 +793,54 @@ private:
     boost::asio::steady_timer clusterTimer_;
     boost::asio::steady_timer accountHistoryTxTimer_;
 
-    RCLConsensus mConsensus;
+    RCLConsensus consensus_;
 
     std::optional<PublicKey> const validatorPK_;
     std::optional<PublicKey> const validatorMasterPK_;
 
-    ConsensusPhase mLastConsensusPhase{ConsensusPhase::open};
+    ConsensusPhase lastConsensusPhase_{ConsensusPhase::Open};
 
-    LedgerMaster& m_ledgerMaster;
+    LedgerMaster& ledgerMaster_;
 
-    SubInfoMapType mSubAccount;
-    SubInfoMapType mSubRTAccount;
+    SubInfoMapType subAccount_;
+    SubInfoMapType subRTAccount_;
 
-    subRpcMapType mRpcSubMap;
+    subRpcMapType rpcSubMap_;
 
-    SubAccountHistoryMapType mSubAccountHistory;
+    SubAccountHistoryMapType subAccountHistory_;
 
     // Used as array indices; converting to enum class would require casts at ~40 call sites.
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum SubTypes {
-        sLedger,          // Accepted ledgers.
-        sManifests,       // Received validator manifests.
-        sServer,          // When server changes connectivity state.
-        sTransactions,    // All accepted transactions.
-        sRTTransactions,  // All proposed and accepted transactions.
-        sValidations,     // Received validations.
-        sPeerStatus,      // Peer status changes.
-        sConsensusPhase,  // Consensus phase
-        sBookChanges,     // Per-ledger order book changes
-        sLastEntry        // Any new entry must be ADDED ABOVE this one
+        SLedger,          // Accepted ledgers.
+        SManifests,       // Received validator manifests.
+        SServer,          // When server changes connectivity state.
+        STransactions,    // All accepted transactions.
+        SRtTransactions,  // All proposed and accepted transactions.
+        SValidations,     // Received validations.
+        SPeerStatus,      // Peer status changes.
+        SConsensusPhase,  // Consensus phase
+        SBookChanges,     // Per-ledger order book changes
+        SLastEntry        // Any new entry must be ADDED ABOVE this one
     };
 
-    std::array<SubMapType, SubTypes::sLastEntry> mStreamMaps;
+    std::array<SubMapType, SubTypes::SLastEntry> streamMaps_;
 
-    ServerFeeSummary mLastFeeSummary;
+    ServerFeeSummary lastFeeSummary_;
 
-    JobQueue& m_job_queue;
+    JobQueue& job_queue_;
 
     // Whether we are in standalone mode.
-    bool const m_standalone;
+    bool const standalone_;
 
     // The number of nodes that we need to consider ourselves connected.
     std::size_t const minPeerCount_;
 
     // Transaction batching.
-    std::condition_variable mCond;
-    std::mutex mMutex;
-    DispatchState mDispatchState = DispatchState::none;
-    std::vector<TransactionStatus> mTransactions;
+    std::condition_variable cond_;
+    std::mutex mutex_;
+    DispatchState dispatchState_ = DispatchState::None;
+    std::vector<TransactionStatus> transactions_;
 
     StateAccounting accounting_;
 
@@ -852,21 +852,20 @@ private:
     {
         template <class Handler>
         Stats(Handler const& handler, beast::insight::Collector::ptr const& collector)
-            : hook(collector->make_hook(handler))
+            : hook(collector->makeHook(handler))
             , disconnected_duration(
-                  collector->make_gauge("State_Accounting", "Disconnected_duration"))
-            , connected_duration(collector->make_gauge("State_Accounting", "Connected_duration"))
-            , syncing_duration(collector->make_gauge("State_Accounting", "Syncing_duration"))
-            , tracking_duration(collector->make_gauge("State_Accounting", "Tracking_duration"))
-            , full_duration(collector->make_gauge("State_Accounting", "Full_duration"))
+                  collector->makeGauge("State_Accounting", "Disconnected_duration"))
+            , connected_duration(collector->makeGauge("State_Accounting", "Connected_duration"))
+            , syncing_duration(collector->makeGauge("State_Accounting", "Syncing_duration"))
+            , tracking_duration(collector->makeGauge("State_Accounting", "Tracking_duration"))
+            , full_duration(collector->makeGauge("State_Accounting", "Full_duration"))
             , disconnected_transitions(
-                  collector->make_gauge("State_Accounting", "Disconnected_transitions"))
+                  collector->makeGauge("State_Accounting", "Disconnected_transitions"))
             , connected_transitions(
-                  collector->make_gauge("State_Accounting", "Connected_transitions"))
-            , syncing_transitions(collector->make_gauge("State_Accounting", "Syncing_transitions"))
-            , tracking_transitions(
-                  collector->make_gauge("State_Accounting", "Tracking_transitions"))
-            , full_transitions(collector->make_gauge("State_Accounting", "Full_transitions"))
+                  collector->makeGauge("State_Accounting", "Connected_transitions"))
+            , syncing_transitions(collector->makeGauge("State_Accounting", "Syncing_transitions"))
+            , tracking_transitions(collector->makeGauge("State_Accounting", "Tracking_transitions"))
+            , full_transitions(collector->makeGauge("State_Accounting", "Full_transitions"))
         {
         }
 
@@ -884,42 +883,42 @@ private:
         beast::insight::Gauge full_transitions;
     };
 
-    std::mutex m_statsMutex;  // Mutex to lock m_stats
-    Stats m_stats;
+    std::mutex statsMutex_;  // Mutex to lock stats_
+    Stats stats_;
 
 private:
     void
-    collect_metrics();
+    collectMetrics();
 };
 
 //------------------------------------------------------------------------------
 
-static std::array<char const*, 5> const stateNames{
+static std::array<char const*, 5> const kSTATE_NAMES{
     {"disconnected", "connected", "syncing", "tracking", "full"}};
 
-std::array<char const*, 5> const NetworkOPsImp::states_ = stateNames;
+std::array<char const*, 5> const NetworkOPsImp::kSTATES = kSTATE_NAMES;
 
-std::array<Json::StaticString const, 5> const NetworkOPsImp::StateAccounting::states_ = {
-    {Json::StaticString(stateNames[0]),
-     Json::StaticString(stateNames[1]),
-     Json::StaticString(stateNames[2]),
-     Json::StaticString(stateNames[3]),
-     Json::StaticString(stateNames[4])}};
+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])}};
 
-static auto const genesisAccountId =
-    calcAccountID(generateKeyPair(KeyType::secp256k1, generateSeed("masterpassphrase")).first);
+static auto const kGENESIS_ACCOUNT_ID =
+    calcAccountID(generateKeyPair(KeyType::Secp256k1, generateSeed("masterpassphrase")).first);
 
 //------------------------------------------------------------------------------
 inline OperatingMode
 NetworkOPsImp::getOperatingMode() const
 {
-    return mMode;
+    return mode_;
 }
 
 inline std::string
 NetworkOPsImp::strOperatingMode(bool const admin /* = false */) const
 {
-    return strOperatingMode(mMode, admin);
+    return strOperatingMode(mode_, admin);
 }
 
 inline void
@@ -949,26 +948,26 @@ NetworkOPsImp::isNeedNetworkLedger()
 inline bool
 NetworkOPsImp::isFull()
 {
-    return !needNetworkLedger_ && (mMode == OperatingMode::FULL);
+    return !needNetworkLedger_ && (mode_ == OperatingMode::FULL);
 }
 
 std::string
 NetworkOPsImp::getHostId(bool forAdmin)
 {
-    static std::string const hostname = boost::asio::ip::host_name();
+    static std::string const kHOSTNAME = boost::asio::ip::host_name();
 
     if (forAdmin)
-        return hostname;
+        return kHOSTNAME;
 
     // For non-admin uses hash the node public key into a
     // single RFC1751 word:
-    static std::string const shroudedHostId = [this]() {
+    static std::string const kSHROUDED_HOST_ID = [this]() {
         auto const& id = registry_.get().getApp().nodeIdentity();
 
         return RFC1751::getWordFromBlob(id.first.data(), id.first.size());
     }();
 
-    return shroudedHostId;
+    return kSHROUDED_HOST_ID;
 }
 
 void
@@ -984,14 +983,14 @@ NetworkOPsImp::setStateTimer()
 void
 NetworkOPsImp::setTimer(
     boost::asio::steady_timer& timer,
-    std::chrono::milliseconds const& expiry_time,
+    std::chrono::milliseconds const& expiryTime,
     std::function<void()> onExpire,
     std::function<void()> onError)
 {
     // Only start the timer if waitHandlerCounter_ is not yet joined.
     if (auto optionalCountedHandler =
             waitHandlerCounter_.wrap([this, onExpire, onError](boost::system::error_code const& e) {
-                if ((e.value() == boost::system::errc::success) && (!m_job_queue.isStopped()))
+                if ((e.value() == boost::system::errc::success) && (!job_queue_.isStopped()))
                 {
                     onExpire();
                 }
@@ -1000,13 +999,13 @@ NetworkOPsImp::setTimer(
                     e.value() != boost::asio::error::operation_aborted)
                 {
                     // Try again later and hope for the best.
-                    JLOG(m_journal.error())
+                    JLOG(journal_.error())
                         << "Timer got error '" << e.message() << "'.  Restarting timer.";
                     onError();
                 }
             }))
     {
-        timer.expires_after(expiry_time);
+        timer.expires_after(expiryTime);
         timer.async_wait(std::move(*optionalCountedHandler));
     }
 }
@@ -1016,9 +1015,9 @@ NetworkOPsImp::setHeartbeatTimer()
 {
     setTimer(
         heartbeatTimer_,
-        mConsensus.parms().ledgerGRANULARITY,
+        consensus_.parms().ledgerGRANULARITY,
         [this]() {
-            m_job_queue.addJob(jtNETOP_TIMER, "NetHeart", [this]() { processHeartbeatTimer(); });
+            job_queue_.addJob(JtNetopTimer, "NetHeart", [this]() { processHeartbeatTimer(); });
         },
         [this]() { setHeartbeatTimer(); });
 }
@@ -1032,7 +1031,7 @@ NetworkOPsImp::setClusterTimer()
         clusterTimer_,
         10s,
         [this]() {
-            m_job_queue.addJob(jtNETOP_CLUSTER, "NetCluster", [this]() { processClusterTimer(); });
+            job_queue_.addJob(JtNetopCluster, "NetCluster", [this]() { processClusterTimer(); });
         },
         [this]() { setClusterTimer(); });
 }
@@ -1040,8 +1039,8 @@ NetworkOPsImp::setClusterTimer()
 void
 NetworkOPsImp::setAccountHistoryJobTimer(SubAccountHistoryInfoWeak subInfo)
 {
-    JLOG(m_journal.debug()) << "Scheduling AccountHistory job for account "
-                            << toBase58(subInfo.index_->accountId_);
+    JLOG(journal_.debug()) << "Scheduling AccountHistory job for account "
+                           << toBase58(subInfo.index->accountId);
     using namespace std::chrono_literals;
     setTimer(
         accountHistoryTxTimer_,
@@ -1053,7 +1052,7 @@ NetworkOPsImp::setAccountHistoryJobTimer(SubAccountHistoryInfoWeak subInfo)
 void
 NetworkOPsImp::processHeartbeatTimer()
 {
-    RclConsensusLogger clog("Heartbeat Timer", mConsensus.validating(), m_journal);
+    RclConsensusLogger clog("Heartbeat Timer", consensus_.validating(), journal_);
     {
         std::unique_lock lock{registry_.get().getApp().getMasterMutex()};
 
@@ -1066,13 +1065,13 @@ NetworkOPsImp::processHeartbeatTimer()
         // do we have sufficient peers? If not, we are disconnected.
         if (numPeers < minPeerCount_)
         {
-            if (mMode != OperatingMode::DISCONNECTED)
+            if (mode_ != OperatingMode::DISCONNECTED)
             {
                 setMode(OperatingMode::DISCONNECTED);
                 std::stringstream ss;
                 ss << "Node count (" << numPeers << ") has fallen "
                    << "below required minimum (" << minPeerCount_ << ").";
-                JLOG(m_journal.warn()) << ss.str();
+                JLOG(journal_.warn()) << ss.str();
                 CLOG(clog.ss()) << "set mode to DISCONNECTED: " << ss.str();
             }
             else
@@ -1083,33 +1082,33 @@ NetworkOPsImp::processHeartbeatTimer()
 
             // MasterMutex lock need not be held to call setHeartbeatTimer()
             lock.unlock();
-            // We do not call mConsensus.timerEntry until there are enough
+            // We do not call consensus_.timerEntry until there are enough
             // peers providing meaningful inputs to consensus
             setHeartbeatTimer();
 
             return;
         }
 
-        if (mMode == OperatingMode::DISCONNECTED)
+        if (mode_ == OperatingMode::DISCONNECTED)
         {
             setMode(OperatingMode::CONNECTED);
-            JLOG(m_journal.info()) << "Node count (" << numPeers << ") is sufficient.";
+            JLOG(journal_.info()) << "Node count (" << numPeers << ") is sufficient.";
             CLOG(clog.ss()) << "setting mode to CONNECTED based on " << numPeers << " peers. ";
         }
 
         // Check if the last validated ledger forces a change between these
         // states.
-        auto origMode = mMode.load();
+        auto origMode = mode_.load();
         CLOG(clog.ss()) << "mode: " << strOperatingMode(origMode, true);
-        if (mMode == OperatingMode::SYNCING)
+        if (mode_ == OperatingMode::SYNCING)
         {
             setMode(OperatingMode::SYNCING);
         }
-        else if (mMode == OperatingMode::CONNECTED)
+        else if (mode_ == OperatingMode::CONNECTED)
         {
             setMode(OperatingMode::CONNECTED);
         }
-        auto newMode = mMode.load();
+        auto newMode = mode_.load();
         if (origMode != newMode)
         {
             CLOG(clog.ss()) << ", changing to " << strOperatingMode(newMode, true);
@@ -1117,15 +1116,15 @@ NetworkOPsImp::processHeartbeatTimer()
         CLOG(clog.ss()) << ". ";
     }
 
-    mConsensus.timerEntry(registry_.get().getTimeKeeper().closeTime(), clog.ss());
+    consensus_.timerEntry(registry_.get().getTimeKeeper().closeTime(), clog.ss());
 
-    CLOG(clog.ss()) << "consensus phase " << to_string(mLastConsensusPhase);
-    ConsensusPhase const currPhase = mConsensus.phase();
-    if (mLastConsensusPhase != currPhase)
+    CLOG(clog.ss()) << "consensus phase " << to_string(lastConsensusPhase_);
+    ConsensusPhase const currPhase = consensus_.phase();
+    if (lastConsensusPhase_ != currPhase)
     {
         reportConsensusStateChange(currPhase);
-        mLastConsensusPhase = currPhase;
-        CLOG(clog.ss()) << " changed to " << to_string(mLastConsensusPhase);
+        lastConsensusPhase_ = currPhase;
+        CLOG(clog.ss()) << " changed to " << to_string(lastConsensusPhase_);
     }
     CLOG(clog.ss()) << ". ";
 
@@ -1143,20 +1142,20 @@ NetworkOPsImp::processClusterTimer()
     bool const update = registry_.get().getCluster().update(
         registry_.get().getApp().nodeIdentity().first,
         "",
-        (m_ledgerMaster.getValidatedLedgerAge() <= 4min)
+        (ledgerMaster_.getValidatedLedgerAge() <= 4min)
             ? registry_.get().getFeeTrack().getLocalFee()
             : 0,
         registry_.get().getTimeKeeper().now());
 
     if (!update)
     {
-        JLOG(m_journal.debug()) << "Too soon to send cluster update";
+        JLOG(journal_.debug()) << "Too soon to send cluster update";
         setClusterTimer();
         return;
     }
 
     protocol::TMCluster cluster;
-    registry_.get().getCluster().for_each([&cluster](ClusterNode const& node) {
+    registry_.get().getCluster().forEach([&cluster](ClusterNode const& node) {
         protocol::TMClusterNode& n = *cluster.add_clusternodes();
         n.set_publickey(toBase58(TokenType::NodePublic, node.identity()));
         n.set_reporttime(node.getReportTime().time_since_epoch().count());
@@ -1173,7 +1172,7 @@ NetworkOPsImp::processClusterTimer()
         node.set_cost(item.balance);
     }
     registry_.get().getOverlay().foreach(
-        send_if(std::make_shared<Message>(cluster, protocol::mtCLUSTER), peer_in_cluster()));
+        sendIf(std::make_shared<Message>(cluster, protocol::mtCLUSTER), PeerInCluster()));
     setClusterTimer();
 }
 
@@ -1184,18 +1183,18 @@ NetworkOPsImp::strOperatingMode(OperatingMode const mode, bool const admin) cons
 {
     if (mode == OperatingMode::FULL && admin)
     {
-        auto const consensusMode = mConsensus.mode();
-        if (consensusMode != ConsensusMode::wrongLedger)
+        auto const consensusMode = consensus_.mode();
+        if (consensusMode != ConsensusMode::WrongLedger)
         {
-            if (consensusMode == ConsensusMode::proposing)
+            if (consensusMode == ConsensusMode::Proposing)
                 return "proposing";
 
-            if (mConsensus.validating())
+            if (consensus_.validating())
                 return "validating";
         }
     }
 
-    return states_[static_cast<std::size_t>(mode)];
+    return kSTATES[static_cast<std::size_t>(mode)];
 }
 
 void
@@ -1208,9 +1207,9 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
     }
 
     // Enforce Network bar for batch txn
-    if (iTrans->isFlag(tfInnerBatchTxn) && m_ledgerMaster.getValidatedRules().enabled(featureBatch))
+    if (iTrans->isFlag(tfInnerBatchTxn) && ledgerMaster_.getValidatedRules().enabled(featureBatch))
     {
-        JLOG(m_journal.error()) << "Submitted transaction invalid: tfInnerBatchTxn flag present.";
+        JLOG(journal_.error()) << "Submitted transaction invalid: tfInnerBatchTxn flag present.";
         return;
     }
 
@@ -1222,24 +1221,24 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
 
     if ((flags & HashRouterFlags::BAD) != HashRouterFlags::UNDEFINED)
     {
-        JLOG(m_journal.warn()) << "Submitted transaction cached bad";
+        JLOG(journal_.warn()) << "Submitted transaction cached bad";
         return;
     }
 
     try
     {
         auto const [validity, reason] = checkValidity(
-            registry_.get().getHashRouter(), *trans, m_ledgerMaster.getValidatedRules());
+            registry_.get().getHashRouter(), *trans, ledgerMaster_.getValidatedRules());
 
         if (validity != Validity::Valid)
         {
-            JLOG(m_journal.warn()) << "Submitted transaction invalid: " << reason;
+            JLOG(journal_.warn()) << "Submitted transaction invalid: " << reason;
             return;
         }
     }
     catch (std::exception const& ex)
     {
-        JLOG(m_journal.warn()) << "Exception checking transaction " << txid << ": " << ex.what();
+        JLOG(journal_.warn()) << "Exception checking transaction " << txid << ": " << ex.what();
 
         return;
     }
@@ -1248,9 +1247,9 @@ NetworkOPsImp::submitTransaction(std::shared_ptr<STTx const> const& iTrans)
 
     auto tx = std::make_shared<Transaction>(trans, reason, registry_.get().getApp());
 
-    m_job_queue.addJob(jtTRANSACTION, "SubmitTxn", [this, tx]() {
+    job_queue_.addJob(JtTransaction, "SubmitTxn", [this, tx]() {
         auto t = tx;
-        processTransaction(t, false, false, FailHard::no);
+        processTransaction(t, false, false, FailHard::No);
     });
 }
 
@@ -1262,13 +1261,13 @@ NetworkOPsImp::preProcessTransaction(std::shared_ptr<Transaction>& transaction)
     if ((newFlags & HashRouterFlags::BAD) != HashRouterFlags::UNDEFINED)
     {
         // cached bad
-        JLOG(m_journal.warn()) << transaction->getID() << ": cached bad!\n";
+        JLOG(journal_.warn()) << transaction->getID() << ": cached bad!\n";
         transaction->setStatus(TransStatus::INVALID);
         transaction->setResult(temBAD_SIGNATURE);
         return false;
     }
 
-    auto const view = m_ledgerMaster.getCurrentLedger();
+    auto const view = ledgerMaster_.getCurrentLedger();
 
     // This function is called by several different parts of the codebase
     // under no circumstances will we ever accept an inner txn within a batch
@@ -1293,7 +1292,7 @@ NetworkOPsImp::preProcessTransaction(std::shared_ptr<Transaction>& transaction)
     // Not concerned with local checks at this point.
     if (validity == Validity::SigBad)
     {
-        JLOG(m_journal.info()) << "Transaction has bad signature: " << reason;
+        JLOG(journal_.info()) << "Transaction has bad signature: " << reason;
         transaction->setStatus(TransStatus::INVALID);
         transaction->setResult(temBAD_SIGNATURE);
         registry_.get().getHashRouter().setFlags(transaction->getID(), HashRouterFlags::BAD);
@@ -1313,7 +1312,7 @@ NetworkOPsImp::processTransaction(
     bool bLocal,
     FailHard failType)
 {
-    auto ev = m_job_queue.makeLoadEvent(jtTXN_PROC, "ProcessTXN");
+    auto ev = job_queue_.makeLoadEvent(JtTxnProc, "ProcessTXN");
 
     // preProcessTransaction can change our pointer
     if (!preProcessTransaction(transaction))
@@ -1335,19 +1334,19 @@ NetworkOPsImp::doTransactionAsync(
     bool bUnlimited,
     FailHard failType)
 {
-    std::scoped_lock const lock(mMutex);
+    std::scoped_lock const lock(mutex_);
 
     if (transaction->getApplying())
         return;
 
-    mTransactions.emplace_back(transaction, bUnlimited, false, failType);
+    transactions_.emplace_back(transaction, bUnlimited, false, failType);
     transaction->setApplying();
 
-    if (mDispatchState == DispatchState::none)
+    if (dispatchState_ == DispatchState::None)
     {
-        if (m_job_queue.addJob(jtBATCH, "TxBatchAsync", [this]() { transactionBatch(); }))
+        if (job_queue_.addJob(JtBatch, "TxBatchAsync", [this]() { transactionBatch(); }))
         {
-            mDispatchState = DispatchState::scheduled;
+            dispatchState_ = DispatchState::Scheduled;
         }
     }
 }
@@ -1358,11 +1357,11 @@ NetworkOPsImp::doTransactionSync(
     bool bUnlimited,
     FailHard failType)
 {
-    std::unique_lock<std::mutex> lock(mMutex);
+    std::unique_lock<std::mutex> lock(mutex_);
 
     if (!transaction->getApplying())
     {
-        mTransactions.emplace_back(transaction, bUnlimited, true, failType);
+        transactions_.emplace_back(transaction, bUnlimited, true, failType);
         transaction->setApplying();
     }
 
@@ -1378,21 +1377,21 @@ NetworkOPsImp::doTransactionSyncBatch(
 {
     do
     {
-        if (mDispatchState == DispatchState::running)
+        if (dispatchState_ == DispatchState::Running)
         {
             // A batch processing job is already running, so wait.
-            mCond.wait(lock);
+            cond_.wait(lock);
         }
         else
         {
             apply(lock);
 
-            if (!mTransactions.empty())
+            if (!transactions_.empty())
             {
                 // More transactions need to be applied, but by another job.
-                if (m_job_queue.addJob(jtBATCH, "TxBatchSync", [this]() { transactionBatch(); }))
+                if (job_queue_.addJob(JtBatch, "TxBatchSync", [this]() { transactionBatch(); }))
                 {
-                    mDispatchState = DispatchState::scheduled;
+                    dispatchState_ = DispatchState::Scheduled;
                 }
             }
         }
@@ -1402,7 +1401,7 @@ NetworkOPsImp::doTransactionSyncBatch(
 void
 NetworkOPsImp::processTransactionSet(CanonicalTXSet const& set)
 {
-    auto ev = m_job_queue.makeLoadEvent(jtTXN_PROC, "ProcessTXNSet");
+    auto ev = job_queue_.makeLoadEvent(JtTxnProc, "ProcessTXNSet");
     std::vector<std::shared_ptr<Transaction>> candidates;
     candidates.reserve(set.size());
     for (auto const& [_, tx] : set)
@@ -1414,7 +1413,7 @@ NetworkOPsImp::processTransactionSet(CanonicalTXSet const& set)
         {
             if (!reason.empty())
             {
-                JLOG(m_journal.trace()) << "Exception checking transaction: " << reason;
+                JLOG(journal_.trace()) << "Exception checking transaction: " << reason;
             }
             registry_.get().getHashRouter().setFlags(tx->getTransactionID(), HashRouterFlags::BAD);
             continue;
@@ -1430,49 +1429,49 @@ NetworkOPsImp::processTransactionSet(CanonicalTXSet const& set)
     std::vector<TransactionStatus> transactions;
     transactions.reserve(candidates.size());
 
-    std::unique_lock lock(mMutex);
+    std::unique_lock lock(mutex_);
 
     for (auto& transaction : candidates)
     {
         if (!transaction->getApplying())
         {
-            transactions.emplace_back(transaction, false, false, FailHard::no);
+            transactions.emplace_back(transaction, false, false, FailHard::No);
             transaction->setApplying();
         }
     }
 
-    if (mTransactions.empty())
+    if (transactions_.empty())
     {
-        mTransactions.swap(transactions);
+        transactions_.swap(transactions);
     }
     else
     {
-        mTransactions.reserve(mTransactions.size() + transactions.size());
+        transactions_.reserve(transactions_.size() + transactions.size());
         for (auto& t : transactions)
-            mTransactions.push_back(std::move(t));
+            transactions_.push_back(std::move(t));
     }
-    if (mTransactions.empty())
+    if (transactions_.empty())
     {
-        JLOG(m_journal.debug()) << "No transaction to process!";
+        JLOG(journal_.debug()) << "No transaction to process!";
         return;
     }
 
     doTransactionSyncBatch(lock, [&](std::unique_lock<std::mutex> const&) {
         XRPL_ASSERT(lock.owns_lock(), "xrpl::NetworkOPsImp::processTransactionSet has lock");
         return std::ranges::any_of(
-            mTransactions, [](auto const& t) { return t.transaction->getApplying(); });
+            transactions_, [](auto const& t) { return t.transaction->getApplying(); });
     });
 }
 
 void
 NetworkOPsImp::transactionBatch()
 {
-    std::unique_lock<std::mutex> lock(mMutex);
+    std::unique_lock<std::mutex> lock(mutex_);
 
-    if (mDispatchState == DispatchState::running)
+    if (dispatchState_ == DispatchState::Running)
         return;
 
-    while (!mTransactions.empty())
+    while (!transactions_.empty())
     {
         apply(lock);
     }
@@ -1481,14 +1480,14 @@ NetworkOPsImp::transactionBatch()
 void
 NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
 {
-    std::vector<TransactionStatus> submit_held;
+    std::vector<TransactionStatus> submitHeld;
     std::vector<TransactionStatus> transactions;
-    mTransactions.swap(transactions);
+    transactions_.swap(transactions);
     XRPL_ASSERT(!transactions.empty(), "xrpl::NetworkOPsImp::apply : non-empty transactions");
     XRPL_ASSERT(
-        mDispatchState != DispatchState::running, "xrpl::NetworkOPsImp::apply : is not running");
+        dispatchState_ != DispatchState::Running, "xrpl::NetworkOPsImp::apply : is not running");
 
-    mDispatchState = DispatchState::running;
+    dispatchState_ = DispatchState::Running;
 
     batchLock.unlock();
 
@@ -1496,18 +1495,18 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
         std::unique_lock masterLock{registry_.get().getApp().getMasterMutex(), std::defer_lock};
         bool changed = false;
         {
-            std::unique_lock ledgerLock{m_ledgerMaster.peekMutex(), std::defer_lock};
+            std::unique_lock ledgerLock{ledgerMaster_.peekMutex(), std::defer_lock};
             std::lock(masterLock, ledgerLock);
             registry_.get().getOpenLedger().modify([&](OpenView& view, beast::Journal j) {
                 for (TransactionStatus& e : transactions)
                 {
                     // we check before adding to the batch
-                    ApplyFlags flags = tapNONE;
+                    ApplyFlags flags = TapNone;
                     if (e.admin)
-                        flags |= tapUNLIMITED;
+                        flags |= TapUnlimited;
 
-                    if (e.failType == FailHard::yes)
-                        flags |= tapFAIL_HARD;
+                    if (e.failType == FailHard::Yes)
+                        flags |= TapFailHard;
 
                     auto const result = registry_.get().getTxQ().apply(
                         registry_.get().getApp(), view, e.transaction->getSTransaction(), flags, j);
@@ -1522,7 +1521,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             reportFeeChange();
 
         std::optional<LedgerIndex> validatedLedgerIndex;
-        if (auto const l = m_ledgerMaster.getValidatedLedger())
+        if (auto const l = ledgerMaster_.getValidatedLedger())
             validatedLedgerIndex = l->header().seq;
 
         auto newOL = registry_.get().getOpenLedger().current();
@@ -1551,7 +1550,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
 
                 if (transResultInfo(e.result, token, human))
                 {
-                    JLOG(m_journal.info()) << "TransactionResult: " << token << ": " << human;
+                    JLOG(journal_.info()) << "TransactionResult: " << token << ": " << human;
                 }
             }
 #endif
@@ -1560,7 +1559,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
 
             if (isTesSuccess(e.result))
             {
-                JLOG(m_journal.debug()) << "Transaction is now included in open ledger";
+                JLOG(journal_.debug()) << "Transaction is now included in open ledger";
                 e.transaction->setStatus(TransStatus::INCLUDED);
 
                 // Pop as many "reasonable" transactions for this account as
@@ -1569,9 +1568,9 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                 auto const& txCur = e.transaction->getSTransaction();
 
                 std::size_t count = 0;
-                for (auto txNext = m_ledgerMaster.popAcctTransaction(txCur);
-                     txNext && count < maxPoppedTransactions;
-                     txNext = m_ledgerMaster.popAcctTransaction(txCur), ++count)
+                for (auto txNext = ledgerMaster_.popAcctTransaction(txCur);
+                     txNext && count < kMAX_POPPED_TRANSACTIONS;
+                     txNext = ledgerMaster_.popAcctTransaction(txCur), ++count)
                 {
                     if (!batchLock.owns_lock())
                         batchLock.lock();
@@ -1580,7 +1579,7 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
                     auto t = std::make_shared<Transaction>(trans, reason, registry_.get().getApp());
                     if (t->getApplying())
                         break;
-                    submit_held.emplace_back(t, false, false, FailHard::no);
+                    submitHeld.emplace_back(t, false, false, FailHard::No);
                     t->setApplying();
                 }
                 if (batchLock.owns_lock())
@@ -1589,37 +1588,37 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             else if (e.result == tefPAST_SEQ)
             {
                 // duplicate or conflict
-                JLOG(m_journal.info()) << "Transaction is obsolete";
+                JLOG(journal_.info()) << "Transaction is obsolete";
                 e.transaction->setStatus(TransStatus::OBSOLETE);
             }
             else if (e.result == terQUEUED)
             {
-                JLOG(m_journal.debug()) << "Transaction is likely to claim a"
-                                        << " fee, but is queued until fee drops";
+                JLOG(journal_.debug()) << "Transaction is likely to claim a"
+                                       << " fee, but is queued until fee drops";
 
                 e.transaction->setStatus(TransStatus::HELD);
                 // Add to held transactions, because it could get
                 // kicked out of the queue, and this will try to
                 // put it back.
-                m_ledgerMaster.addHeldTransaction(e.transaction);
+                ledgerMaster_.addHeldTransaction(e.transaction);
                 e.transaction->setQueued();
                 e.transaction->setKept();
             }
             else if (isTerRetry(e.result) || isTelLocal(e.result) || isTefFailure(e.result))
             {
-                if (e.failType != FailHard::yes)
+                if (e.failType != FailHard::Yes)
                 {
                     auto const lastLedgerSeq =
                         e.transaction->getSTransaction()->at(~sfLastLedgerSequence);
                     auto const ledgersLeft = lastLedgerSeq
-                        ? *lastLedgerSeq - m_ledgerMaster.getCurrentLedgerIndex()
+                        ? *lastLedgerSeq - ledgerMaster_.getCurrentLedgerIndex()
                         : std::optional<LedgerIndex>{};
                     // If any of these conditions are met, the transaction can
                     // be held:
                     // 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::holdLedgers
+                    //    LastLedgerSequence is fewer than LocalTxs::kHOLD_LEDGERS
                     //    (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.)
@@ -1630,18 +1629,18 @@ 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::holdLedgers) ||
+                    if (e.local || (ledgersLeft && ledgersLeft <= LocalTxs::kHOLD_LEDGERS) ||
                         registry_.get().getHashRouter().setFlags(
                             e.transaction->getID(), HashRouterFlags::HELD))
                     {
                         // transaction should be held
-                        JLOG(m_journal.debug()) << "Transaction should be held: " << e.result;
+                        JLOG(journal_.debug()) << "Transaction should be held: " << e.result;
                         e.transaction->setStatus(TransStatus::HELD);
-                        m_ledgerMaster.addHeldTransaction(e.transaction);
+                        ledgerMaster_.addHeldTransaction(e.transaction);
                         e.transaction->setKept();
                     }
                     else
-                        JLOG(m_journal.debug())
+                        JLOG(journal_.debug())
                             << "Not holding transaction " << e.transaction->getID() << ": "
                             << (e.local ? "local" : "network") << ", "
                             << "result: " << e.result << " ledgers left: "
@@ -1650,21 +1649,21 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
             }
             else
             {
-                JLOG(m_journal.debug()) << "Status other than success " << e.result;
+                JLOG(journal_.debug()) << "Status other than success " << e.result;
                 e.transaction->setStatus(TransStatus::INVALID);
             }
 
-            auto const enforceFailHard = e.failType == FailHard::yes && !isTesSuccess(e.result);
+            auto const enforceFailHard = e.failType == FailHard::Yes && !isTesSuccess(e.result);
 
             if (addLocal && !enforceFailHard)
             {
-                m_localTX->push_back(
-                    m_ledgerMaster.getCurrentLedgerIndex(), e.transaction->getSTransaction());
+                localTX_->pushBack(
+                    ledgerMaster_.getCurrentLedgerIndex(), e.transaction->getSTransaction());
                 e.transaction->setKept();
             }
 
             if ((e.applied ||
-                 ((mMode != OperatingMode::FULL) && (e.failType != FailHard::yes) && e.local) ||
+                 ((mode_ != OperatingMode::FULL) && (e.failType != FailHard::Yes) && e.local) ||
                  (e.result == terQUEUED)) &&
                 !enforceFailHard)
             {
@@ -1708,33 +1707,33 @@ NetworkOPsImp::apply(std::unique_lock<std::mutex>& batchLock)
     for (TransactionStatus const& e : transactions)
         e.transaction->clearApplying();
 
-    if (!submit_held.empty())
+    if (!submitHeld.empty())
     {
-        if (mTransactions.empty())
+        if (transactions_.empty())
         {
-            mTransactions.swap(submit_held);
+            transactions_.swap(submitHeld);
         }
         else
         {
-            mTransactions.reserve(mTransactions.size() + submit_held.size());
-            for (auto& e : submit_held)
-                mTransactions.push_back(std::move(e));
+            transactions_.reserve(transactions_.size() + submitHeld.size());
+            for (auto& e : submitHeld)
+                transactions_.push_back(std::move(e));
         }
     }
 
-    mCond.notify_all();
+    cond_.notify_all();
 
-    mDispatchState = DispatchState::none;
+    dispatchState_ = DispatchState::None;
 }
 
 //
 // Owner functions
 //
 
-Json::Value
+json::Value
 NetworkOPsImp::getOwnerInfo(std::shared_ptr<ReadView const> lpLedger, AccountID const& account)
 {
-    Json::Value jvObjects(Json::objectValue);
+    json::Value jvObjects(json::ObjectValue);
     auto root = keylet::ownerDir(account);
     auto sleNode = lpLedger->read(keylet::page(root));
     if (sleNode)
@@ -1752,18 +1751,18 @@ NetworkOPsImp::getOwnerInfo(std::shared_ptr<ReadView const> lpLedger, AccountID
                 {
                     case ltOFFER:
                         if (!jvObjects.isMember(jss::offers))
-                            jvObjects[jss::offers] = Json::Value(Json::arrayValue);
+                            jvObjects[jss::offers] = json::Value(json::ArrayValue);
 
-                        jvObjects[jss::offers].append(sleCur->getJson(JsonOptions::none));
+                        jvObjects[jss::offers].append(sleCur->getJson(JsonOptions::KNone));
                         break;
 
                     case ltRIPPLE_STATE:
                         if (!jvObjects.isMember(jss::ripple_lines))
                         {
-                            jvObjects[jss::ripple_lines] = Json::Value(Json::arrayValue);
+                            jvObjects[jss::ripple_lines] = json::Value(json::ArrayValue);
                         }
 
-                        jvObjects[jss::ripple_lines].append(sleCur->getJson(JsonOptions::none));
+                        jvObjects[jss::ripple_lines].append(sleCur->getJson(JsonOptions::KNone));
                         break;
 
                     case ltACCOUNT_ROOT:
@@ -1859,28 +1858,28 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
     // our last closed ledger? Or do sufficient nodes agree? And do we have no
     // better ledger available?  If so, we are either tracking or full.
 
-    JLOG(m_journal.trace()) << "NetworkOPsImp::checkLastClosedLedger";
+    JLOG(journal_.trace()) << "NetworkOPsImp::checkLastClosedLedger";
 
-    auto const ourClosed = m_ledgerMaster.getClosedLedger();
+    auto const ourClosed = ledgerMaster_.getClosedLedger();
 
     if (!ourClosed)
         return false;
 
     uint256 closedLedger = ourClosed->header().hash;
     uint256 const prevClosedLedger = ourClosed->header().parentHash;
-    JLOG(m_journal.trace()) << "OurClosed:  " << closedLedger;
-    JLOG(m_journal.trace()) << "PrevClosed: " << prevClosedLedger;
+    JLOG(journal_.trace()) << "OurClosed:  " << closedLedger;
+    JLOG(journal_.trace()) << "PrevClosed: " << prevClosedLedger;
 
     //-------------------------------------------------------------------------
     // Determine preferred last closed ledger
 
     auto& validations = registry_.get().getValidations();
-    JLOG(m_journal.debug()) << "ValidationTrie " << Json::Compact(validations.getJsonTrie());
+    JLOG(journal_.debug()) << "ValidationTrie " << json::Compact(validations.getJsonTrie());
 
     // Will rely on peer LCL if no trusted validations exist
     hash_map<uint256, std::uint32_t> peerCounts;
     peerCounts[closedLedger] = 0;
-    if (mMode >= OperatingMode::TRACKING)
+    if (mode_ >= OperatingMode::TRACKING)
         peerCounts[closedLedger]++;
 
     for (auto& peer : peerList)
@@ -1892,11 +1891,11 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
     }
 
     for (auto const& it : peerCounts)
-        JLOG(m_journal.debug()) << "L: " << it.first << " n=" << it.second;
+        JLOG(journal_.debug()) << "L: " << it.first << " n=" << it.second;
 
     uint256 const preferredLCL = validations.getPreferredLCL(
         RCLValidatedLedger{ourClosed, validations.adaptor().journal()},
-        m_ledgerMaster.getValidLedgerIndex(),
+        ledgerMaster_.getValidLedgerIndex(),
         peerCounts);
 
     bool switchLedgers = preferredLCL != closedLedger;
@@ -1906,7 +1905,7 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
     if (switchLedgers && (closedLedger == prevClosedLedger))
     {
         // don't switch to our own previous ledger
-        JLOG(m_journal.info()) << "We won't switch to our own previous ledger";
+        JLOG(journal_.info()) << "We won't switch to our own previous ledger";
         networkClosed = ourClosed->header().hash;
         switchLedgers = false;
     }
@@ -1918,7 +1917,7 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
     if (!switchLedgers)
         return false;
 
-    auto consensus = m_ledgerMaster.getLedgerByHash(closedLedger);
+    auto consensus = ledgerMaster_.getLedgerByHash(closedLedger);
 
     if (!consensus)
     {
@@ -1927,8 +1926,8 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
     }
 
     if (consensus &&
-        (!m_ledgerMaster.canBeCurrent(consensus) ||
-         !m_ledgerMaster.isCompatible(*consensus, m_journal.debug(), "Not switching")))
+        (!ledgerMaster_.canBeCurrent(consensus) ||
+         !ledgerMaster_.isCompatible(*consensus, journal_.debug(), "Not switching")))
     {
         // Don't switch to a ledger not on the validated chain
         // or with an invalid close time or sequence
@@ -1936,11 +1935,11 @@ NetworkOPsImp::checkLastClosedLedger(Overlay::PeerSequence const& peerList, uint
         return false;
     }
 
-    JLOG(m_journal.warn()) << "We are not running on the consensus ledger";
-    JLOG(m_journal.info()) << "Our LCL: " << ourClosed->header().hash << getJson({*ourClosed, {}});
-    JLOG(m_journal.info()) << "Net LCL " << closedLedger;
+    JLOG(journal_.warn()) << "We are not running on the consensus ledger";
+    JLOG(journal_.info()) << "Our LCL: " << ourClosed->header().hash << getJson({*ourClosed, {}});
+    JLOG(journal_.info()) << "Net LCL " << closedLedger;
 
-    if ((mMode == OperatingMode::TRACKING) || (mMode == OperatingMode::FULL))
+    if ((mode_ == OperatingMode::TRACKING) || (mode_ == OperatingMode::FULL))
     {
         setMode(OperatingMode::CONNECTED);
     }
@@ -1960,7 +1959,7 @@ void
 NetworkOPsImp::switchLastClosedLedger(std::shared_ptr<Ledger const> const& newLCL)
 {
     // set the newLCL as our last closed ledger -- this is abnormal code
-    JLOG(m_journal.error()) << "JUMP last closed ledger to " << newLCL->header().hash;
+    JLOG(journal_.error()) << "JUMP last closed ledger to " << newLCL->header().hash;
 
     clearNeedNetworkLedger();
 
@@ -1972,7 +1971,7 @@ NetworkOPsImp::switchLastClosedLedger(std::shared_ptr<Ledger const> const& newLC
         // Apply tx in old open ledger to new
         // open ledger. Then apply local tx.
 
-        auto retries = m_localTX->getTxSet();
+        auto retries = localTX_->getTxSet();
         auto const lastVal = registry_.get().getLedgerMaster().getValidatedLedger();
         std::optional<Rules> rules;
         if (lastVal)
@@ -1990,7 +1989,7 @@ NetworkOPsImp::switchLastClosedLedger(std::shared_ptr<Ledger const> const& newLC
             OrderedTxs({}),
             false,
             retries,
-            tapNONE,
+            TapNone,
             "jump",
             [&](OpenView& view, beast::Journal j) {
                 // Stuff the ledger with transactions from the queue.
@@ -1998,7 +1997,7 @@ NetworkOPsImp::switchLastClosedLedger(std::shared_ptr<Ledger const> const& newLC
             });
     }
 
-    m_ledgerMaster.switchLCL(newLCL);
+    ledgerMaster_.switchLCL(newLCL);
 
     protocol::TMStatusChange s;
     s.set_newevent(protocol::neSWITCHED_LEDGER);
@@ -2008,7 +2007,7 @@ NetworkOPsImp::switchLastClosedLedger(std::shared_ptr<Ledger const> const& newLC
         newLCL->header().parentHash.begin(), newLCL->header().parentHash.size());
     s.set_ledgerhash(newLCL->header().hash.begin(), newLCL->header().hash.size());
     registry_.get().getOverlay().foreach(
-        send_always(std::make_shared<Message>(s, protocol::mtSTATUS_CHANGE)));
+        SendAlways(std::make_shared<Message>(s, protocol::mtSTATUS_CHANGE)));
 }
 
 bool
@@ -2018,19 +2017,19 @@ NetworkOPsImp::beginConsensus(
 {
     XRPL_ASSERT(networkClosed.isNonZero(), "xrpl::NetworkOPsImp::beginConsensus : nonzero input");
 
-    auto closingInfo = m_ledgerMaster.getCurrentLedger()->header();
+    auto closingInfo = ledgerMaster_.getCurrentLedger()->header();
 
-    JLOG(m_journal.info()) << "Consensus time for #" << closingInfo.seq << " with LCL "
-                           << closingInfo.parentHash;
+    JLOG(journal_.info()) << "Consensus time for #" << closingInfo.seq << " with LCL "
+                          << closingInfo.parentHash;
 
-    auto prevLedger = m_ledgerMaster.getLedgerByHash(closingInfo.parentHash);
+    auto prevLedger = ledgerMaster_.getLedgerByHash(closingInfo.parentHash);
 
     if (!prevLedger)
     {
         // this shouldn't happen unless we jump ledgers
-        if (mMode == OperatingMode::FULL)
+        if (mode_ == OperatingMode::FULL)
         {
-            JLOG(m_journal.warn()) << "Don't have LCL, going to tracking";
+            JLOG(journal_.warn()) << "Don't have LCL, going to tracking";
             setMode(OperatingMode::TRACKING);
             CLOG(clog) << "beginConsensus Don't have LCL, going to tracking. ";
         }
@@ -2044,7 +2043,7 @@ NetworkOPsImp::beginConsensus(
         "xrpl::NetworkOPsImp::beginConsensus : prevLedger hash matches "
         "parent");
     XRPL_ASSERT(
-        closingInfo.parentHash == m_ledgerMaster.getClosedLedger()->header().hash,
+        closingInfo.parentHash == ledgerMaster_.getClosedLedger()->header().hash,
         "xrpl::NetworkOPsImp::beginConsensus : closedLedger parent matches "
         "hash");
 
@@ -2064,7 +2063,7 @@ NetworkOPsImp::beginConsensus(
             registry_.get().getValidators().getQuorumKeys().second);
     }
 
-    mConsensus.startRound(
+    consensus_.startRound(
         registry_.get().getTimeKeeper().closeTime(),
         networkClosed,
         prevLedger,
@@ -2072,14 +2071,14 @@ NetworkOPsImp::beginConsensus(
         changes.added,
         clog);
 
-    ConsensusPhase const currPhase = mConsensus.phase();
-    if (mLastConsensusPhase != currPhase)
+    ConsensusPhase const currPhase = consensus_.phase();
+    if (lastConsensusPhase_ != currPhase)
     {
         reportConsensusStateChange(currPhase);
-        mLastConsensusPhase = currPhase;
+        lastConsensusPhase_ = currPhase;
     }
 
-    JLOG(m_journal.debug()) << "Initiating consensus engine";
+    JLOG(journal_.debug()) << "Initiating consensus engine";
     return true;
 }
 
@@ -2098,14 +2097,14 @@ NetworkOPsImp::processTrustedProposal(RCLCxPeerPos peerPos)
         //
         // Another, innocuous explanation is unusual message routing and delays,
         // causing this node to receive its own messages back.
-        JLOG(m_journal.error()) << "Received a proposal signed by MY KEY from a peer. This may "
-                                   "indicate a misconfiguration where another node has the same "
-                                   "validator key, or may be caused by unusual message routing and "
-                                   "delays.";
+        JLOG(journal_.error()) << "Received a proposal signed by MY KEY from a peer. This may "
+                                  "indicate a misconfiguration where another node has the same "
+                                  "validator key, or may be caused by unusual message routing and "
+                                  "delays.";
         return false;
     }
 
-    return mConsensus.peerProposal(registry_.get().getTimeKeeper().closeTime(), peerPos);
+    return consensus_.peerProposal(registry_.get().getTimeKeeper().closeTime(), peerPos);
 }
 
 void
@@ -2114,25 +2113,25 @@ NetworkOPsImp::mapComplete(std::shared_ptr<SHAMap> const& map, bool fromAcquire)
     // We now have an additional transaction set
     // Inform peers we have this set
     protocol::TMHaveTransactionSet msg;
-    msg.set_hash(map->getHash().as_uint256().begin(), 256 / 8);
+    msg.set_hash(map->getHash().asUint256().begin(), 256 / 8);
     msg.set_status(protocol::tsHAVE);
     registry_.get().getOverlay().foreach(
-        send_always(std::make_shared<Message>(msg, protocol::mtHAVE_SET)));
+        SendAlways(std::make_shared<Message>(msg, protocol::mtHAVE_SET)));
 
     // We acquired it because consensus asked us to
     if (fromAcquire)
-        mConsensus.gotTxSet(registry_.get().getTimeKeeper().closeTime(), RCLTxSet{map});
+        consensus_.gotTxSet(registry_.get().getTimeKeeper().closeTime(), RCLTxSet{map});
 }
 
 void
 NetworkOPsImp::endConsensus(std::unique_ptr<std::stringstream> const& clog)
 {
-    uint256 const deadLedger = m_ledgerMaster.getClosedLedger()->header().parentHash;
+    uint256 const deadLedger = ledgerMaster_.getClosedLedger()->header().parentHash;
     for (auto const& it : registry_.get().getOverlay().getActivePeers())
     {
         if (it && (it->getClosedLedgerHash() == deadLedger))
         {
-            JLOG(m_journal.trace()) << "Killing obsolete peer status";
+            JLOG(journal_.trace()) << "Killing obsolete peer status";
             it->cycleStatus();
         }
     }
@@ -2153,7 +2152,7 @@ NetworkOPsImp::endConsensus(std::unique_ptr<std::stringstream> const& clog)
     // timing to make sure there shouldn't be a newer LCL. We need this
     // information to do the next three tests.
 
-    if (((mMode == OperatingMode::CONNECTED) || (mMode == OperatingMode::SYNCING)) && !ledgerChange)
+    if (((mode_ == OperatingMode::CONNECTED) || (mode_ == OperatingMode::SYNCING)) && !ledgerChange)
     {
         // Count number of peers that agree with us and UNL nodes whose
         // validations we have for LCL.  If the ledger is good enough, go to
@@ -2162,13 +2161,13 @@ NetworkOPsImp::endConsensus(std::unique_ptr<std::stringstream> const& clog)
             setMode(OperatingMode::TRACKING);
     }
 
-    if (((mMode == OperatingMode::CONNECTED) || (mMode == OperatingMode::TRACKING)) &&
+    if (((mode_ == OperatingMode::CONNECTED) || (mode_ == OperatingMode::TRACKING)) &&
         !ledgerChange)
     {
         // check if the ledger is good enough to go to FULL
         // Note: Do not go to FULL if we don't have the previous ledger
         // check if the ledger is bad enough to go to CONNECTED -- TODO
-        auto current = m_ledgerMaster.getCurrentLedger();
+        auto current = ledgerMaster_.getCurrentLedger();
         if (registry_.get().getTimeKeeper().now() <
             (current->header().parentCloseTime + 2 * current->header().closeTimeResolution))
         {
@@ -2182,7 +2181,7 @@ NetworkOPsImp::endConsensus(std::unique_ptr<std::stringstream> const& clog)
 void
 NetworkOPsImp::consensusViewChange()
 {
-    if ((mMode == OperatingMode::FULL) || (mMode == OperatingMode::TRACKING))
+    if ((mode_ == OperatingMode::FULL) || (mode_ == OperatingMode::TRACKING))
     {
         setMode(OperatingMode::CONNECTED);
     }
@@ -2192,17 +2191,17 @@ void
 NetworkOPsImp::pubManifest(Manifest const& mo)
 {
     // VFALCO consider std::shared_mutex
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    if (!mStreamMaps[sManifests].empty())
+    if (!streamMaps_[SManifests].empty())
     {
-        Json::Value jvObj(Json::objectValue);
+        json::Value jvObj(json::ObjectValue);
 
         jvObj[jss::type] = "manifestReceived";
         jvObj[jss::master_key] = toBase58(TokenType::NodePublic, mo.masterKey);
         if (mo.signingKey)
             jvObj[jss::signing_key] = toBase58(TokenType::NodePublic, *mo.signingKey);
-        jvObj[jss::seq] = Json::UInt(mo.sequence);
+        jvObj[jss::seq] = json::UInt(mo.sequence);
         if (auto sig = mo.getSignature())
             jvObj[jss::signature] = strHex(*sig);
         jvObj[jss::master_signature] = strHex(mo.getMasterSignature());
@@ -2210,7 +2209,7 @@ NetworkOPsImp::pubManifest(Manifest const& mo)
             jvObj[jss::domain] = mo.domain;
         jvObj[jss::manifest] = strHex(mo.serialized);
 
-        for (auto i = mStreamMaps[sManifests].begin(); i != mStreamMaps[sManifests].end();)
+        for (auto i = streamMaps_[SManifests].begin(); i != streamMaps_[SManifests].end();)
         {
             if (auto p = i->second.lock())
             {
@@ -2219,7 +2218,7 @@ NetworkOPsImp::pubManifest(Manifest const& mo)
             }
             else
             {
-                i = mStreamMaps[sManifests].erase(i);
+                i = streamMaps_[SManifests].erase(i);
             }
         }
     }
@@ -2258,9 +2257,9 @@ NetworkOPsImp::ServerFeeSummary::operator!=(NetworkOPsImp::ServerFeeSummary cons
 static std::uint32_t
 trunc32(std::uint64_t v)
 {
-    constexpr std::uint64_t max32 = std::numeric_limits<std::uint32_t>::max();
+    constexpr std::uint64_t kMAX32 = std::numeric_limits<std::uint32_t>::max();
 
-    return std::min(max32, v);
+    return std::min(kMAX32, v);
 };
 
 void
@@ -2270,11 +2269,11 @@ NetworkOPsImp::pubServer()
     //             list into a local array while holding the lock then release
     //             the lock and call send on everyone.
     //
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    if (!mStreamMaps[sServer].empty())
+    if (!streamMaps_[SServer].empty())
     {
-        Json::Value jvObj(Json::objectValue);
+        json::Value jvObj(json::ObjectValue);
 
         ServerFeeSummary f{
             registry_.get().getOpenLedger().current()->fees().base,
@@ -2290,9 +2289,9 @@ NetworkOPsImp::pubServer()
         if (f.em)
         {
             auto const loadFactor = std::max(
-                safe_cast<std::uint64_t>(f.loadFactorServer),
+                safeCast<std::uint64_t>(f.loadFactorServer),
                 mulDiv(f.em->openLedgerFeeLevel, f.loadBaseServer, f.em->referenceFeeLevel)
-                    .value_or(xrpl::muldiv_max));
+                    .value_or(xrpl::kMULDIV_MAX));
 
             jvObj[jss::load_factor] = trunc32(loadFactor);
             jvObj[jss::load_factor_fee_escalation] = f.em->openLedgerFeeLevel.jsonClipped();
@@ -2304,9 +2303,9 @@ NetworkOPsImp::pubServer()
             jvObj[jss::load_factor] = f.loadFactorServer;
         }
 
-        mLastFeeSummary = f;
+        lastFeeSummary_ = f;
 
-        for (auto i = mStreamMaps[sServer].begin(); i != mStreamMaps[sServer].end();)
+        for (auto i = streamMaps_[SServer].begin(); i != streamMaps_[SServer].end();)
         {
             InfoSub::pointer const p = i->second.lock();
 
@@ -2320,7 +2319,7 @@ NetworkOPsImp::pubServer()
             }
             else
             {
-                i = mStreamMaps[sServer].erase(i);
+                i = streamMaps_[SServer].erase(i);
             }
         }
     }
@@ -2329,12 +2328,12 @@ NetworkOPsImp::pubServer()
 void
 NetworkOPsImp::pubConsensus(ConsensusPhase phase)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    auto& streamMap = mStreamMaps[sConsensusPhase];
+    auto& streamMap = streamMaps_[SConsensusPhase];
     if (!streamMap.empty())
     {
-        Json::Value jvObj(Json::objectValue);
+        json::Value jvObj(json::ObjectValue);
         jvObj[jss::type] = "consensusPhase";
         jvObj[jss::consensus] = to_string(phase);
 
@@ -2357,11 +2356,11 @@ void
 NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 {
     // VFALCO consider std::shared_mutex
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    if (!mStreamMaps[sValidations].empty())
+    if (!streamMaps_[SValidations].empty())
     {
-        Json::Value jvObj(Json::objectValue);
+        json::Value jvObj(json::ObjectValue);
 
         auto const signerPublic = val->getSignerPublic();
 
@@ -2396,7 +2395,7 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
 
         if (val->isFieldPresent(sfAmendments))
         {
-            jvObj[jss::amendments] = Json::Value(Json::arrayValue);
+            jvObj[jss::amendments] = json::Value(json::ArrayValue);
             for (auto const& amendment : val->getFieldV256(sfAmendments))
                 jvObj[jss::amendments].append(to_string(amendment));
         }
@@ -2433,8 +2432,8 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
         // for consumers supporting different API versions
         MultiApiJson multiObj{jvObj};
         multiObj.visit(
-            RPC::apiVersion<1>,  //
-            [](Json::Value& jvTx) {
+            RPC::kAPI_VERSION<1>,  //
+            [](json::Value& jvTx) {
                 // Type conversion for older API versions to string
                 if (jvTx.isMember(jss::ledger_index))
                 {
@@ -2442,35 +2441,35 @@ NetworkOPsImp::pubValidation(std::shared_ptr<STValidation> const& val)
                 }
             });
 
-        for (auto i = mStreamMaps[sValidations].begin(); i != mStreamMaps[sValidations].end();)
+        for (auto i = streamMaps_[SValidations].begin(); i != streamMaps_[SValidations].end();)
         {
             if (auto p = i->second.lock())
             {
                 multiObj.visit(
                     p->getApiVersion(),  //
-                    [&](Json::Value const& jv) { p->send(jv, true); });
+                    [&](json::Value const& jv) { p->send(jv, true); });
                 ++i;
             }
             else
             {
-                i = mStreamMaps[sValidations].erase(i);
+                i = streamMaps_[SValidations].erase(i);
             }
         }
     }
 }
 
 void
-NetworkOPsImp::pubPeerStatus(std::function<Json::Value(void)> const& func)
+NetworkOPsImp::pubPeerStatus(std::function<json::Value(void)> const& func)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    if (!mStreamMaps[sPeerStatus].empty())
+    if (!streamMaps_[SPeerStatus].empty())
     {
-        Json::Value jvObj(func());
+        json::Value jvObj(func());
 
         jvObj[jss::type] = "peerStatusChange";
 
-        for (auto i = mStreamMaps[sPeerStatus].begin(); i != mStreamMaps[sPeerStatus].end();)
+        for (auto i = streamMaps_[SPeerStatus].begin(); i != streamMaps_[SPeerStatus].end();)
         {
             InfoSub::pointer const p = i->second.lock();
 
@@ -2481,7 +2480,7 @@ NetworkOPsImp::pubPeerStatus(std::function<Json::Value(void)> const& func)
             }
             else
             {
-                i = mStreamMaps[sPeerStatus].erase(i);
+                i = streamMaps_[SPeerStatus].erase(i);
             }
         }
     }
@@ -2505,48 +2504,48 @@ NetworkOPsImp::setMode(OperatingMode om)
     if ((om > OperatingMode::CONNECTED) && isBlocked())
         om = OperatingMode::CONNECTED;
 
-    if (mMode == om)
+    if (mode_ == om)
         return;
 
-    mMode = om;
+    mode_ = om;
 
     accounting_.mode(om);
 
-    JLOG(m_journal.info()) << "STATE->" << strOperatingMode();
+    JLOG(journal_.info()) << "STATE->" << strOperatingMode();
     pubServer();
 }
 
 bool
 NetworkOPsImp::recvValidation(std::shared_ptr<STValidation> const& val, std::string const& source)
 {
-    JLOG(m_journal.trace()) << "recvValidation " << val->getLedgerHash() << " from " << source;
+    JLOG(journal_.trace()) << "recvValidation " << val->getLedgerHash() << " from " << source;
 
     std::unique_lock lock(validationsMutex_);
-    BypassAccept bypassAccept = BypassAccept::no;
+    BypassAccept bypassAccept = BypassAccept::No;
     try
     {
         if (pendingValidations_.contains(val->getLedgerHash()))
         {
-            bypassAccept = BypassAccept::yes;
+            bypassAccept = BypassAccept::Yes;
         }
         else
         {
             pendingValidations_.insert(val->getLedgerHash());
         }
-        scope_unlock const unlock(lock);
-        handleNewValidation(registry_.get().getApp(), val, source, bypassAccept, m_journal);
+        ScopeUnlock const unlock(lock);
+        handleNewValidation(registry_.get().getApp(), val, source, bypassAccept, journal_);
     }
     catch (std::exception const& e)
     {
-        JLOG(m_journal.warn()) << "Exception thrown for handling new validation "
-                               << val->getLedgerHash() << ": " << e.what();
+        JLOG(journal_.warn()) << "Exception thrown for handling new validation "
+                              << val->getLedgerHash() << ": " << e.what();
     }
     catch (...)
     {
-        JLOG(m_journal.warn()) << "Unknown exception thrown for handling new validation "
-                               << val->getLedgerHash();
+        JLOG(journal_.warn()) << "Unknown exception thrown for handling new validation "
+                              << val->getLedgerHash();
     }
-    if (bypassAccept == BypassAccept::no)
+    if (bypassAccept == BypassAccept::No)
     {
         pendingValidations_.erase(val->getLedgerHash());
     }
@@ -2554,7 +2553,7 @@ NetworkOPsImp::recvValidation(std::shared_ptr<STValidation> const& val, std::str
 
     pubValidation(val);
 
-    JLOG(m_journal.debug()) << [this, &val]() -> auto {
+    JLOG(journal_.debug()) << [this, &val]() -> auto {
         std::stringstream ss;
         ss << "VALIDATION: " << val->render() << " master_key: ";
         auto master = registry_.get().getValidators().getTrustedKey(val->getSignerPublic());
@@ -2574,32 +2573,32 @@ NetworkOPsImp::recvValidation(std::shared_ptr<STValidation> const& val, std::str
     return registry_.get().getApp().config().RELAY_UNTRUSTED_VALIDATIONS == 1 || val->isTrusted();
 }
 
-Json::Value
+json::Value
 NetworkOPsImp::getConsensusInfo()
 {
-    return mConsensus.getJson(true);
+    return consensus_.getJson(true);
 }
 
-Json::Value
+json::Value
 NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
 {
-    Json::Value info = Json::objectValue;
+    json::Value info = json::ObjectValue;
 
     // System-level warnings
     {
-        Json::Value warnings{Json::arrayValue};
+        json::Value warnings{json::ArrayValue};
         if (isAmendmentBlocked())
         {
-            Json::Value& w = warnings.append(Json::objectValue);
-            w[jss::id] = warnRPC_AMENDMENT_BLOCKED;
+            json::Value& w = warnings.append(json::ObjectValue);
+            w[jss::id] = WarnRpcAmendmentBlocked;
             w[jss::message] =
                 "This server is amendment blocked, and must be updated to be "
                 "able to stay in sync with the network.";
         }
         if (isUNLBlocked())
         {
-            Json::Value& w = warnings.append(Json::objectValue);
-            w[jss::id] = warnRPC_EXPIRED_VALIDATOR_LIST;
+            json::Value& w = warnings.append(json::ObjectValue);
+            w[jss::id] = WarnRpcExpiredValidatorList;
             w[jss::message] =
                 "This server has an expired validator list. validators.txt "
                 "may be incorrectly configured or some [validator_list_sites] "
@@ -2607,8 +2606,8 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         }
         if (admin && isAmendmentWarned())
         {
-            Json::Value& w = warnings.append(Json::objectValue);
-            w[jss::id] = warnRPC_UNSUPPORTED_MAJORITY;
+            json::Value& w = warnings.append(json::ObjectValue);
+            w[jss::id] = WarnRpcUnsupportedMajority;
             w[jss::message] =
                 "One or more unsupported amendments have reached majority. "
                 "Upgrade to the latest version before they are activated "
@@ -2616,7 +2615,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             if (auto const expected =
                     registry_.get().getAmendmentTable().firstUnsupportedExpected())
             {
-                auto& d = w[jss::details] = Json::objectValue;
+                auto& d = w[jss::details] = json::ObjectValue;
                 d[jss::expected_date] = expected->time_since_epoch().count();
                 d[jss::expected_date_UTC] = to_string(*expected);
             }
@@ -2645,7 +2644,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         info[jss::network_ledger] = "waiting";
 
     info[jss::validation_quorum] =
-        static_cast<Json::UInt>(registry_.get().getValidators().quorum());
+        static_cast<json::UInt>(registry_.get().getValidators().quorum());
 
     if (admin)
     {
@@ -2678,7 +2677,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             if (when)
             {
                 info[jss::validator_list_expires] =
-                    safe_cast<Json::UInt>(when->time_since_epoch().count());
+                    safeCast<json::UInt>(when->time_since_epoch().count());
             }
             else
             {
@@ -2687,9 +2686,9 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         }
         else
         {
-            auto& x = (info[jss::validator_list] = Json::objectValue);
+            auto& x = (info[jss::validator_list] = json::ObjectValue);
 
-            x[jss::count] = static_cast<Json::UInt>(registry_.get().getValidators().count());
+            x[jss::count] = static_cast<json::UInt>(registry_.get().getValidators().count());
 
             if (when)
             {
@@ -2721,7 +2720,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
 
         if (!xrpl::git::getCommitHash().empty() || !xrpl::git::getBuildBranch().empty())
         {
-            auto& x = (info[jss::git] = Json::objectValue);
+            auto& x = (info[jss::git] = json::ObjectValue);
             if (!xrpl::git::getCommitHash().empty())
                 x[jss::hash] = xrpl::git::getCommitHash();
             if (!xrpl::git::getBuildBranch().empty())
@@ -2729,7 +2728,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         }
     }
     info[jss::io_latency_ms] =
-        static_cast<Json::UInt>(registry_.get().getApp().getIOLatency().count());
+        static_cast<json::UInt>(registry_.get().getApp().getIOLatency().count());
 
     if (admin)
     {
@@ -2748,7 +2747,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
     {
         info[jss::counters] = registry_.get().getPerfLog().countersJson();
 
-        Json::Value nodestore(Json::objectValue);
+        json::Value nodestore(json::ObjectValue);
         registry_.get().getNodeStore().getCountsJson(nodestore);
         info[jss::counters][jss::nodestore] = nodestore;
         info[jss::current_activities] = registry_.get().getPerfLog().currentJson();
@@ -2762,35 +2761,35 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
     if (amendmentBlocked_)
         info[jss::amendment_blocked] = true;
 
-    auto const fp = m_ledgerMaster.getFetchPackCacheSize();
+    auto const fp = ledgerMaster_.getFetchPackCacheSize();
 
     if (fp != 0)
-        info[jss::fetch_pack] = Json::UInt(fp);
+        info[jss::fetch_pack] = json::UInt(fp);
 
-    info[jss::peers] = Json::UInt(registry_.get().getOverlay().size());
+    info[jss::peers] = json::UInt(registry_.get().getOverlay().size());
 
-    Json::Value lastClose = Json::objectValue;
-    lastClose[jss::proposers] = Json::UInt(mConsensus.prevProposers());
+    json::Value lastClose = json::ObjectValue;
+    lastClose[jss::proposers] = json::UInt(consensus_.prevProposers());
 
     if (human)
     {
         lastClose[jss::converge_time_s] =
-            std::chrono::duration<double>{mConsensus.prevRoundTime()}.count();
+            std::chrono::duration<double>{consensus_.prevRoundTime()}.count();
     }
     else
     {
-        lastClose[jss::converge_time] = Json::Int(mConsensus.prevRoundTime().count());
+        lastClose[jss::converge_time] = json::Int(consensus_.prevRoundTime().count());
     }
 
     info[jss::last_close] = lastClose;
 
-    //  info[jss::consensus] = mConsensus.getJson();
+    //  info[jss::consensus] = consensus_.getJson();
 
     if (admin)
-        info[jss::load] = m_job_queue.getJson();
+        info[jss::load] = job_queue_.getJson();
 
     if (auto const netid = registry_.get().getOverlay().networkID())
-        info[jss::network_id] = static_cast<Json::UInt>(*netid);
+        info[jss::network_id] = static_cast<json::UInt>(*netid);
 
     auto const escalationMetrics =
         registry_.get().getTxQ().getMetrics(*registry_.get().getOpenLedger().current());
@@ -2804,10 +2803,10 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
                                              escalationMetrics.openLedgerFeeLevel,
                                              loadBaseServer,
                                              escalationMetrics.referenceFeeLevel)
-                                             .value_or(xrpl::muldiv_max);
+                                             .value_or(xrpl::kMULDIV_MAX);
 
     auto const loadFactor =
-        std::max(safe_cast<std::uint64_t>(loadFactorServer), loadFactorFeeEscalation);
+        std::max(safeCast<std::uint64_t>(loadFactorServer), loadFactorFeeEscalation);
 
     if (!human)
     {
@@ -2815,7 +2814,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
         info[jss::load_factor] = trunc32(loadFactor);
         info[jss::load_factor_server] = loadFactorServer;
 
-        /* Json::Value doesn't support uint64, so clamp to max
+        /* json::Value doesn't support uint64, so clamp to max
             uint32 value. This is mostly theoretical, since there
             probably isn't enough extant XRP to drive the factor
             that high.
@@ -2859,7 +2858,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
     }
 
     bool valid = false;
-    auto lpClosed = m_ledgerMaster.getValidatedLedger();
+    auto lpClosed = ledgerMaster_.getValidatedLedger();
 
     if (lpClosed)
     {
@@ -2867,14 +2866,14 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
     }
     else
     {
-        lpClosed = m_ledgerMaster.getClosedLedger();
+        lpClosed = ledgerMaster_.getClosedLedger();
     }
 
     if (lpClosed)
     {
         XRPAmount const baseFee = lpClosed->fees().base;
-        Json::Value l(Json::objectValue);
-        l[jss::seq] = Json::UInt(lpClosed->header().seq);
+        json::Value l(json::ObjectValue);
+        l[jss::seq] = json::UInt(lpClosed->header().seq);
         l[jss::hash] = to_string(lpClosed->header().hash);
 
         if (!human)
@@ -2883,7 +2882,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             l[jss::reserve_base] = lpClosed->fees().reserve.jsonClipped();
             l[jss::reserve_inc] = lpClosed->fees().increment.jsonClipped();
             l[jss::close_time] =
-                Json::Value::UInt(lpClosed->header().closeTime.time_since_epoch().count());
+                json::Value::UInt(lpClosed->header().closeTime.time_since_epoch().count());
         }
         else
         {
@@ -2895,11 +2894,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 highAgeThreshold{1000000};
-            if (m_ledgerMaster.haveValidated())
+            constexpr std::chrono::seconds kHIGH_AGE_THRESHOLD{1000000};
+            if (ledgerMaster_.haveValidated())
             {
-                auto const age = m_ledgerMaster.getValidatedLedgerAge();
-                l[jss::age] = Json::UInt(age < highAgeThreshold ? age.count() : 0);
+                auto const age = ledgerMaster_.getValidatedLedgerAge();
+                l[jss::age] = json::UInt(age < kHIGH_AGE_THRESHOLD ? age.count() : 0);
             }
             else
             {
@@ -2909,7 +2908,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
                 {
                     using namespace std::chrono_literals;
                     auto age = closeTime - lCloseTime;
-                    l[jss::age] = Json::UInt(age < highAgeThreshold ? age.count() : 0);
+                    l[jss::age] = json::UInt(age < kHIGH_AGE_THRESHOLD ? age.count() : 0);
                 }
             }
         }
@@ -2923,7 +2922,7 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             info[jss::closed_ledger] = l;
         }
 
-        auto lpPublished = m_ledgerMaster.getPublishedLedger();
+        auto lpPublished = ledgerMaster_.getPublishedLedger();
         if (!lpPublished)
         {
             info[jss::published_ledger] = "none";
@@ -2943,11 +2942,11 @@ 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> protocols{
+    static constexpr std::array<std::string_view, 7> kPROTOCOLS{
         "http", "https", "peer", "ws", "ws2", "wss", "wss2"};
-    static_assert(std::ranges::is_sorted(protocols));
+    static_assert(std::ranges::is_sorted(kPROTOCOLS));
     {
-        Json::Value ports{Json::arrayValue};
+        json::Value ports{json::ArrayValue};
         for (auto const& port : registry_.get().getServerHandler().setup().ports)
         {
             // Don't publish admin ports for non-admin users
@@ -2960,14 +2959,14 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             std::set_intersection(
                 std::begin(port.protocol),
                 std::end(port.protocol),
-                std::begin(protocols),
-                std::end(protocols),
+                std::begin(kPROTOCOLS),
+                std::end(kPROTOCOLS),
                 std::back_inserter(proto));
             if (!proto.empty())
             {
-                auto& jv = ports.append(Json::Value(Json::objectValue));
+                auto& jv = ports.append(json::Value(json::ObjectValue));
                 jv[jss::port] = std::to_string(port.port);
-                jv[jss::protocol] = Json::Value{Json::arrayValue};
+                jv[jss::protocol] = json::Value{json::ArrayValue};
                 for (auto const& p : proto)
                     jv[jss::protocol].append(p);
             }
@@ -2979,9 +2978,9 @@ NetworkOPsImp::getServerInfo(bool human, bool admin, bool counters)
             auto const optPort = grpcSection.get("port");
             if (optPort && grpcSection.get("ip"))
             {
-                auto& jv = ports.append(Json::Value(Json::objectValue));
+                auto& jv = ports.append(json::Value(json::ObjectValue));
                 jv[jss::port] = *optPort;
-                jv[jss::protocol] = Json::Value{Json::arrayValue};
+                jv[jss::protocol] = json::Value{json::ArrayValue};
                 jv[jss::protocol].append("grpc");
             }
         }
@@ -2997,7 +2996,7 @@ NetworkOPsImp::clearLedgerFetch()
     registry_.get().getInboundLedgers().clearFailures();
 }
 
-Json::Value
+json::Value
 NetworkOPsImp::getLedgerFetchInfo()
 {
     return registry_.get().getInboundLedgers().getInfo();
@@ -3019,10 +3018,10 @@ NetworkOPsImp::pubProposedTransaction(
     MultiApiJson jvObj = transJson(transaction, result, false, ledger, std::nullopt);
 
     {
-        std::scoped_lock const sl(mSubLock);
+        std::scoped_lock const sl(subLock_);
 
-        auto it = mStreamMaps[sRTTransactions].begin();
-        while (it != mStreamMaps[sRTTransactions].end())
+        auto it = streamMaps_[SRtTransactions].begin();
+        while (it != streamMaps_[SRtTransactions].end())
         {
             InfoSub::pointer p = it->second.lock();
 
@@ -3030,12 +3029,12 @@ NetworkOPsImp::pubProposedTransaction(
             {
                 jvObj.visit(
                     p->getApiVersion(),  //
-                    [&](Json::Value const& jv) { p->send(jv, true); });
+                    [&](json::Value const& jv) { p->send(jv, true); });
                 ++it;
             }
             else
             {
-                it = mStreamMaps[sRTTransactions].erase(it);
+                it = streamMaps_[SRtTransactions].erase(it);
             }
         }
     }
@@ -3054,7 +3053,7 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
     if (!alpAccepted)
     {
         alpAccepted = std::make_shared<AcceptedLedger>(lpAccepted);
-        registry_.get().getAcceptedLedgerCache().canonicalize_replace_client(
+        registry_.get().getAcceptedLedgerCache().canonicalizeReplaceClient(
             lpAccepted->header().hash, alpAccepted);
     }
 
@@ -3063,39 +3062,39 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
         "xrpl::NetworkOPsImp::pubLedger : accepted input");
 
     {
-        JLOG(m_journal.debug()) << "Publishing ledger " << lpAccepted->header().seq << " "
-                                << lpAccepted->header().hash;
+        JLOG(journal_.debug()) << "Publishing ledger " << lpAccepted->header().seq << " "
+                               << lpAccepted->header().hash;
 
-        std::scoped_lock const sl(mSubLock);
+        std::scoped_lock const sl(subLock_);
 
-        if (!mStreamMaps[sLedger].empty())
+        if (!streamMaps_[SLedger].empty())
         {
-            Json::Value jvObj(Json::objectValue);
+            json::Value jvObj(json::ObjectValue);
 
             jvObj[jss::type] = "ledgerClosed";
             jvObj[jss::ledger_index] = lpAccepted->header().seq;
             jvObj[jss::ledger_hash] = to_string(lpAccepted->header().hash);
             jvObj[jss::ledger_time] =
-                Json::Value::UInt(lpAccepted->header().closeTime.time_since_epoch().count());
+                json::Value::UInt(lpAccepted->header().closeTime.time_since_epoch().count());
 
             jvObj[jss::network_id] = registry_.get().getNetworkIDService().getNetworkID();
 
             if (!lpAccepted->rules().enabled(featureXRPFees))
-                jvObj[jss::fee_ref] = FEE_UNITS_DEPRECATED;
+                jvObj[jss::fee_ref] = kFEE_UNITS_DEPRECATED;
             jvObj[jss::fee_base] = lpAccepted->fees().base.jsonClipped();
             jvObj[jss::reserve_base] = lpAccepted->fees().reserve.jsonClipped();
             jvObj[jss::reserve_inc] = lpAccepted->fees().increment.jsonClipped();
 
-            jvObj[jss::txn_count] = Json::UInt(alpAccepted->size());
+            jvObj[jss::txn_count] = json::UInt(alpAccepted->size());
 
-            if (mMode >= OperatingMode::SYNCING)
+            if (mode_ >= OperatingMode::SYNCING)
             {
                 jvObj[jss::validated_ledgers] =
                     registry_.get().getLedgerMaster().getCompleteLedgers();
             }
 
-            auto it = mStreamMaps[sLedger].begin();
-            while (it != mStreamMaps[sLedger].end())
+            auto it = streamMaps_[SLedger].begin();
+            while (it != streamMaps_[SLedger].end())
             {
                 InfoSub::pointer const p = it->second.lock();
                 if (p)
@@ -3105,17 +3104,17 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
                 }
                 else
                 {
-                    it = mStreamMaps[sLedger].erase(it);
+                    it = streamMaps_[SLedger].erase(it);
                 }
             }
         }
 
-        if (!mStreamMaps[sBookChanges].empty())
+        if (!streamMaps_[SBookChanges].empty())
         {
-            Json::Value const jvObj = xrpl::RPC::computeBookChanges(lpAccepted);
+            json::Value const jvObj = xrpl::RPC::computeBookChanges(lpAccepted);
 
-            auto it = mStreamMaps[sBookChanges].begin();
-            while (it != mStreamMaps[sBookChanges].end())
+            auto it = streamMaps_[SBookChanges].begin();
+            while (it != streamMaps_[SBookChanges].end())
             {
                 InfoSub::pointer const p = it->second.lock();
                 if (p)
@@ -3125,23 +3124,23 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
                 }
                 else
                 {
-                    it = mStreamMaps[sBookChanges].erase(it);
+                    it = streamMaps_[SBookChanges].erase(it);
                 }
             }
         }
 
         {
-            static bool firstTime = true;
-            if (firstTime)
+            static bool kFIRST_TIME = true;
+            if (kFIRST_TIME)
             {
                 // First validated ledger, start delayed SubAccountHistory
-                firstTime = false;
-                for (auto& outer : mSubAccountHistory)
+                kFIRST_TIME = false;
+                for (auto& outer : subAccountHistory_)
                 {
                     for (auto& inner : outer.second)
                     {
                         auto& subInfo = inner.second;
-                        if (subInfo.index_->separationLedgerSeq_ == 0)
+                        if (subInfo.index->separationLedgerSeq == 0)
                         {
                             subAccountHistoryStart(alpAccepted->getLedger(), subInfo);
                         }
@@ -3154,7 +3153,7 @@ NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
     // Don't lock since pubAcceptedTransaction is locking.
     for (auto const& accTx : *alpAccepted)
     {
-        JLOG(m_journal.trace()) << "pubAccepted: " << accTx->getJson();
+        JLOG(journal_.trace()) << "pubAccepted: " << accTx->getJson();
         pubValidatedTransaction(lpAccepted, *accTx, accTx == *(--alpAccepted->end()));
     }
 }
@@ -3168,27 +3167,27 @@ NetworkOPsImp::reportFeeChange()
         registry_.get().getFeeTrack()};
 
     // only schedule the job if something has changed
-    if (f != mLastFeeSummary)
+    if (f != lastFeeSummary_)
     {
-        m_job_queue.addJob(jtCLIENT_FEE_CHANGE, "PubFee", [this]() { pubServer(); });
+        job_queue_.addJob(JtClientFeeChange, "PubFee", [this]() { pubServer(); });
     }
 }
 
 void
 NetworkOPsImp::reportConsensusStateChange(ConsensusPhase phase)
 {
-    m_job_queue.addJob(jtCLIENT_CONSENSUS, "PubCons", [this, phase]() { pubConsensus(phase); });
+    job_queue_.addJob(JtClientConsensus, "PubCons", [this, phase]() { pubConsensus(phase); });
 }
 
 inline void
 NetworkOPsImp::updateLocalTx(ReadView const& view)
 {
-    m_localTX->sweep(view);
+    localTX_->sweep(view);
 }
 inline std::size_t
 NetworkOPsImp::getLocalTxCount()
 {
-    return m_localTX->size();
+    return localTX_->size();
 }
 
 // This routine should only be used to publish accepted or validated
@@ -3201,7 +3200,7 @@ NetworkOPsImp::transJson(
     std::shared_ptr<ReadView const> const& ledger,
     std::optional<std::reference_wrapper<TxMeta const>> meta)
 {
-    Json::Value jvObj(Json::objectValue);
+    json::Value jvObj(json::ObjectValue);
     std::string sToken;
     std::string sHuman;
 
@@ -3211,11 +3210,11 @@ NetworkOPsImp::transJson(
     // NOTE jvObj is not a finished object for either API version. After
     // it's populated, we need to finish it for a specific API version. This is
     // done in a loop, near the end of this function.
-    jvObj[jss::transaction] = transaction->getJson(JsonOptions::disable_API_prior_V2, false);
+    jvObj[jss::transaction] = transaction->getJson(JsonOptions::KDisableApiPriorV2, false);
 
     if (meta)
     {
-        jvObj[jss::meta] = meta->get().getJson(JsonOptions::none);
+        jvObj[jss::meta] = meta->get().getJson(JsonOptions::KNone);
         RPC::insertDeliveredAmount(jvObj[jss::meta], *ledger, transaction, meta->get());
         RPC::insertNFTSyntheticInJson(jvObj, transaction, meta->get());
         RPC::insertMPTokenIssuanceID(jvObj[jss::meta], transaction, meta->get());
@@ -3242,7 +3241,7 @@ NetworkOPsImp::transJson(
         jvObj[jss::ledger_index] = ledger->header().seq;
         jvObj[jss::transaction][jss::date] = ledger->header().closeTime.time_since_epoch().count();
         jvObj[jss::validated] = true;
-        jvObj[jss::close_time_iso] = to_string_iso(ledger->header().closeTime);
+        jvObj[jss::close_time_iso] = toStringIso(ledger->header().closeTime);
 
         // WRITEME: Put the account next seq here
     }
@@ -3269,8 +3268,8 @@ NetworkOPsImp::transJson(
                 *ledger,
                 account,
                 amount,
-                FreezeHandling::fhIGNORE_FREEZE,
-                AuthHandling::ahIGNORE_AUTH,
+                FreezeHandling::IgnoreFreeze,
+                AuthHandling::IgnoreAuth,
                 registry_.get().getJournal("View"));
             jvObj[jss::transaction][jss::owner_funds] = ownerFunds.getText();
         }
@@ -3280,7 +3279,7 @@ NetworkOPsImp::transJson(
     MultiApiJson multiObj{jvObj};
     forAllApiVersions(
         multiObj.visit(),  //
-        [&]<unsigned Version>(Json::Value& jvTx, std::integral_constant<unsigned, Version>) {
+        [&]<unsigned Version>(json::Value& jvTx, std::integral_constant<unsigned, Version>) {
             RPC::insertDeliverMax(jvTx[jss::transaction], transaction->getTxnType(), Version);
 
             if constexpr (Version > 1)
@@ -3311,10 +3310,10 @@ NetworkOPsImp::pubValidatedTransaction(
     MultiApiJson jvObj = transJson(stTxn, trResult, true, ledger, metaRef);
 
     {
-        std::scoped_lock const sl(mSubLock);
+        std::scoped_lock const sl(subLock_);
 
-        auto it = mStreamMaps[sTransactions].begin();
-        while (it != mStreamMaps[sTransactions].end())
+        auto it = streamMaps_[STransactions].begin();
+        while (it != streamMaps_[STransactions].end())
         {
             InfoSub::pointer p = it->second.lock();
 
@@ -3322,18 +3321,18 @@ NetworkOPsImp::pubValidatedTransaction(
             {
                 jvObj.visit(
                     p->getApiVersion(),  //
-                    [&](Json::Value const& jv) { p->send(jv, true); });
+                    [&](json::Value const& jv) { p->send(jv, true); });
                 ++it;
             }
             else
             {
-                it = mStreamMaps[sTransactions].erase(it);
+                it = streamMaps_[STransactions].erase(it);
             }
         }
 
-        it = mStreamMaps[sRTTransactions].begin();
+        it = streamMaps_[SRtTransactions].begin();
 
-        while (it != mStreamMaps[sRTTransactions].end())
+        while (it != streamMaps_[SRtTransactions].end())
         {
             InfoSub::pointer p = it->second.lock();
 
@@ -3341,12 +3340,12 @@ NetworkOPsImp::pubValidatedTransaction(
             {
                 jvObj.visit(
                     p->getApiVersion(),  //
-                    [&](Json::Value const& jv) { p->send(jv, true); });
+                    [&](json::Value const& jv) { p->send(jv, true); });
                 ++it;
             }
             else
             {
-                it = mStreamMaps[sRTTransactions].erase(it);
+                it = streamMaps_[SRtTransactions].erase(it);
             }
         }
     }
@@ -3370,14 +3369,14 @@ NetworkOPsImp::pubAccountTransaction(
     std::vector<SubAccountHistoryInfo> accountHistoryNotify;
     auto const currLedgerSeq = ledger->seq();
     {
-        std::scoped_lock const sl(mSubLock);
+        std::scoped_lock const sl(subLock_);
 
-        if (!mSubAccount.empty() || !mSubRTAccount.empty() || !mSubAccountHistory.empty())
+        if (!subAccount_.empty() || !subRTAccount_.empty() || !subAccountHistory_.empty())
         {
             for (auto const& affectedAccount : transaction.getAffected())
             {
-                if (auto simiIt = mSubRTAccount.find(affectedAccount);
-                    simiIt != mSubRTAccount.end())
+                if (auto simiIt = subRTAccount_.find(affectedAccount);
+                    simiIt != subRTAccount_.end())
                 {
                     auto it = simiIt->second.begin();
 
@@ -3398,7 +3397,7 @@ NetworkOPsImp::pubAccountTransaction(
                     }
                 }
 
-                if (auto simiIt = mSubAccount.find(affectedAccount); simiIt != mSubAccount.end())
+                if (auto simiIt = subAccount_.find(affectedAccount); simiIt != subAccount_.end())
                 {
                     auto it = simiIt->second.begin();
                     while (it != simiIt->second.end())
@@ -3418,24 +3417,24 @@ NetworkOPsImp::pubAccountTransaction(
                     }
                 }
 
-                if (auto historyIt = mSubAccountHistory.find(affectedAccount);
-                    historyIt != mSubAccountHistory.end())
+                if (auto historyIt = subAccountHistory_.find(affectedAccount);
+                    historyIt != subAccountHistory_.end())
                 {
                     auto& subs = historyIt->second;
                     auto it = subs.begin();
                     while (it != subs.end())
                     {
                         SubAccountHistoryInfoWeak const& info = it->second;
-                        if (currLedgerSeq <= info.index_->separationLedgerSeq_)
+                        if (currLedgerSeq <= info.index->separationLedgerSeq)
                         {
                             ++it;
                             continue;
                         }
 
-                        if (auto isSptr = info.sinkWptr_.lock(); isSptr)
+                        if (auto isSptr = info.sinkWptr.lock(); isSptr)
                         {
                             accountHistoryNotify.emplace_back(
-                                SubAccountHistoryInfo{.sink_ = isSptr, .index_ = info.index_});
+                                SubAccountHistoryInfo{.sink = isSptr, .index = info.index});
                             ++it;
                         }
                         else
@@ -3444,14 +3443,14 @@ NetworkOPsImp::pubAccountTransaction(
                         }
                     }
                     if (subs.empty())
-                        mSubAccountHistory.erase(historyIt);
+                        subAccountHistory_.erase(historyIt);
                 }
             }
         }
     }
 
-    JLOG(m_journal.trace()) << "pubAccountTransaction: "
-                            << "proposed=" << iProposed << ", accepted=" << iAccepted;
+    JLOG(journal_.trace()) << "pubAccountTransaction: "
+                           << "proposed=" << iProposed << ", accepted=" << iAccepted;
 
     if (!notify.empty() || !accountHistoryNotify.empty())
     {
@@ -3466,27 +3465,27 @@ NetworkOPsImp::pubAccountTransaction(
         {
             jvObj.visit(
                 isrListener->getApiVersion(),  //
-                [&](Json::Value const& jv) { isrListener->send(jv, true); });
+                [&](json::Value const& jv) { isrListener->send(jv, true); });
         }
 
         if (last)
             jvObj.set(jss::account_history_boundary, true);
 
         XRPL_ASSERT(
-            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::none,
+            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::None,
             "xrpl::NetworkOPsImp::pubAccountTransaction : "
             "account_history_tx_stream not set");
         for (auto& info : accountHistoryNotify)
         {
-            auto& index = info.index_;
-            if (index->forwardTxIndex_ == 0 && !index->haveHistorical_)
+            auto& index = info.index;
+            if (index->forwardTxIndex == 0 && !index->haveHistorical)
                 jvObj.set(jss::account_history_tx_first, true);
 
-            jvObj.set(jss::account_history_tx_index, index->forwardTxIndex_++);
+            jvObj.set(jss::account_history_tx_index, index->forwardTxIndex++);
 
             jvObj.visit(
-                info.sink_->getApiVersion(),  //
-                [&](Json::Value const& jv) { info.sink_->send(jv, true); });
+                info.sink->getApiVersion(),  //
+                [&](json::Value const& jv) { info.sink->send(jv, true); });
         }
     }
 }
@@ -3503,17 +3502,17 @@ NetworkOPsImp::pubProposedAccountTransaction(
     std::vector<SubAccountHistoryInfo> accountHistoryNotify;
 
     {
-        std::scoped_lock const sl(mSubLock);
+        std::scoped_lock const sl(subLock_);
 
-        if (mSubRTAccount.empty())
+        if (subRTAccount_.empty())
             return;
 
-        if (!mSubAccount.empty() || !mSubRTAccount.empty() || !mSubAccountHistory.empty())
+        if (!subAccount_.empty() || !subRTAccount_.empty() || !subAccountHistory_.empty())
         {
             for (auto const& affectedAccount : tx->getMentionedAccounts())
             {
-                if (auto simiIt = mSubRTAccount.find(affectedAccount);
-                    simiIt != mSubRTAccount.end())
+                if (auto simiIt = subRTAccount_.find(affectedAccount);
+                    simiIt != subRTAccount_.end())
                 {
                     auto it = simiIt->second.begin();
 
@@ -3537,7 +3536,7 @@ NetworkOPsImp::pubProposedAccountTransaction(
         }
     }
 
-    JLOG(m_journal.trace()) << "pubProposedAccountTransaction: " << iProposed;
+    JLOG(journal_.trace()) << "pubProposedAccountTransaction: " << iProposed;
 
     if (!notify.empty() || !accountHistoryNotify.empty())
     {
@@ -3548,22 +3547,22 @@ NetworkOPsImp::pubProposedAccountTransaction(
         {
             jvObj.visit(
                 isrListener->getApiVersion(),  //
-                [&](Json::Value const& jv) { isrListener->send(jv, true); });
+                [&](json::Value const& jv) { isrListener->send(jv, true); });
         }
 
         XRPL_ASSERT(
-            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::none,
+            jvObj.isMember(jss::account_history_tx_stream) == MultiApiJson::IsMemberResult::None,
             "xrpl::NetworkOPs::pubProposedAccountTransaction : "
             "account_history_tx_stream not set");
         for (auto& info : accountHistoryNotify)
         {
-            auto& index = info.index_;
-            if (index->forwardTxIndex_ == 0 && !index->haveHistorical_)
+            auto& index = info.index;
+            if (index->forwardTxIndex == 0 && !index->haveHistorical)
                 jvObj.set(jss::account_history_tx_first, true);
-            jvObj.set(jss::account_history_tx_index, index->forwardTxIndex_++);
+            jvObj.set(jss::account_history_tx_index, index->forwardTxIndex++);
             jvObj.visit(
-                info.sink_->getApiVersion(),  //
-                [&](Json::Value const& jv) { info.sink_->send(jv, true); });
+                info.sink->getApiVersion(),  //
+                [&](json::Value const& jv) { info.sink->send(jv, true); });
         }
     }
 }
@@ -3578,16 +3577,16 @@ NetworkOPsImp::subAccount(
     hash_set<AccountID> const& vnaAccountIDs,
     bool rt)
 {
-    SubInfoMapType& subMap = rt ? mSubRTAccount : mSubAccount;
+    SubInfoMapType& subMap = rt ? subRTAccount_ : subAccount_;
 
     for (auto const& naAccountID : vnaAccountIDs)
     {
-        JLOG(m_journal.trace()) << "subAccount: account: " << toBase58(naAccountID);
+        JLOG(journal_.trace()) << "subAccount: account: " << toBase58(naAccountID);
 
         isrListener->insertSubAccountInfo(naAccountID, rt);
     }
 
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
     for (auto const& naAccountID : vnaAccountIDs)
     {
@@ -3630,9 +3629,9 @@ NetworkOPsImp::unsubAccountInternal(
     hash_set<AccountID> const& vnaAccountIDs,
     bool rt)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    SubInfoMapType& subMap = rt ? mSubRTAccount : mSubAccount;
+    SubInfoMapType& subMap = rt ? subRTAccount_ : subAccount_;
 
     for (auto const& naAccountID : vnaAccountIDs)
     {
@@ -3655,13 +3654,13 @@ NetworkOPsImp::unsubAccountInternal(
 void
 NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
 {
-    registry_.get().getJobQueue().addJob(jtCLIENT_ACCT_HIST, "HistTxStream", [this, subInfo]() {
-        auto const& accountId = subInfo.index_->accountId_;
-        auto& lastLedgerSeq = subInfo.index_->historyLastLedgerSeq_;
-        auto& txHistoryIndex = subInfo.index_->historyTxIndex_;
+    registry_.get().getJobQueue().addJob(JtClientAcctHist, "HistTxStream", [this, subInfo]() {
+        auto const& accountId = subInfo.index->accountId;
+        auto& lastLedgerSeq = subInfo.index->historyLastLedgerSeq;
+        auto& txHistoryIndex = subInfo.index->historyTxIndex;
 
-        JLOG(m_journal.trace()) << "AccountHistory job for account " << toBase58(accountId)
-                                << " started. lastLedgerSeq=" << lastLedgerSeq;
+        JLOG(journal_.trace()) << "AccountHistory job for account " << toBase58(accountId)
+                               << " started. lastLedgerSeq=" << lastLedgerSeq;
 
         auto isFirstTx = [&](std::shared_ptr<Transaction> const& tx,
                              std::shared_ptr<TxMeta> const& meta) -> bool {
@@ -3669,7 +3668,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 == genesisAccountId)
+            if (accountId == kGENESIS_ACCOUNT_ID)
             {
                 auto stx = tx->getSTransaction();
                 if (stx->getAccountID(sfAccount) == accountId && stx->getSeqValue() == 1)
@@ -3698,8 +3697,8 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
             return false;
         };
 
-        auto send = [&](Json::Value const& jvObj, bool unsubscribe) -> bool {
-            if (auto sptr = subInfo.sinkWptr_.lock())
+        auto send = [&](json::Value const& jvObj, bool unsubscribe) -> bool {
+            if (auto sptr = subInfo.sinkWptr.lock())
             {
                 sptr->send(jvObj, true);
                 if (unsubscribe)
@@ -3711,11 +3710,11 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
         };
 
         auto sendMultiApiJson = [&](MultiApiJson const& jvObj, bool unsubscribe) -> bool {
-            if (auto sptr = subInfo.sinkWptr_.lock())
+            if (auto sptr = subInfo.sinkWptr.lock())
             {
                 jvObj.visit(
                     sptr->getApiVersion(),  //
-                    [&](Json::Value const& jv) { sptr->send(jv, true); });
+                    [&](json::Value const& jv) { sptr->send(jv, true); });
 
                 if (unsubscribe)
                     unsubAccountHistory(sptr, accountId, false);
@@ -3744,17 +3743,17 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
         /*
          * search backward until the genesis ledger or asked to stop
          */
-        while (lastLedgerSeq >= 2 && !subInfo.index_->stopHistorical_)
+        while (lastLedgerSeq >= 2 && !subInfo.index->stopHistorical)
         {
             int feeChargeCount = 0;
-            if (auto sptr = subInfo.sinkWptr_.lock(); sptr)
+            if (auto sptr = subInfo.sinkWptr.lock(); sptr)
             {
-                sptr->getConsumer().charge(Resource::feeMediumBurdenRPC);
+                sptr->getConsumer().charge(Resource::kFEE_MEDIUM_BURDEN_RPC);
                 ++feeChargeCount;
             }
             else
             {
-                JLOG(m_journal.trace())
+                JLOG(journal_.trace())
                     << "AccountHistory job for account " << toBase58(accountId)
                     << " no InfoSub. Fee charged " << feeChargeCount << " times.";
                 return;
@@ -3762,7 +3761,7 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
 
             // try to search in 1024 ledgers till reaching genesis ledgers
             auto startLedgerSeq = (lastLedgerSeq > 1024 + 2 ? lastLedgerSeq - 1024 : 2);
-            JLOG(m_journal.trace())
+            JLOG(journal_.trace())
                 << "AccountHistory job for account " << toBase58(accountId)
                 << ", working on ledger range [" << startLedgerSeq << "," << lastLedgerSeq << "]";
 
@@ -3778,30 +3777,30 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
 
             if (!haveRange)
             {
-                JLOG(m_journal.debug()) << "AccountHistory reschedule job for account "
-                                        << toBase58(accountId) << ", incomplete ledger range ["
-                                        << startLedgerSeq << "," << lastLedgerSeq << "]";
+                JLOG(journal_.debug()) << "AccountHistory reschedule job for account "
+                                       << toBase58(accountId) << ", incomplete ledger range ["
+                                       << startLedgerSeq << "," << lastLedgerSeq << "]";
                 setAccountHistoryJobTimer(subInfo);
                 return;
             }
 
             std::optional<RelationalDatabase::AccountTxMarker> marker{};
-            while (!subInfo.index_->stopHistorical_)
+            while (!subInfo.index->stopHistorical)
             {
                 auto dbResult = getMoreTxns(startLedgerSeq, lastLedgerSeq, marker);
 
                 auto const& txns = dbResult.first;
                 marker = dbResult.second;
-                size_t const num_txns = txns.size();
-                for (size_t i = 0; i < num_txns; ++i)
+                size_t const numTxns = txns.size();
+                for (size_t i = 0; i < numTxns; ++i)
                 {
                     auto const& [tx, meta] = txns[i];
 
                     if (!tx || !meta)
                     {
-                        JLOG(m_journal.debug()) << "AccountHistory job for account "
-                                                << toBase58(accountId) << " empty tx or meta.";
-                        send(rpcError(rpcINTERNAL), true);
+                        JLOG(journal_.debug()) << "AccountHistory job for account "
+                                               << toBase58(accountId) << " empty tx or meta.";
+                        send(rpcError(RpcInternal), true);
                         return;
                     }
                     auto curTxLedger =
@@ -3812,9 +3811,9 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
                         UNREACHABLE(
                             "xrpl::NetworkOPsImp::addAccountHistoryJob : "
                             "getLedgerBySeq failed");
-                        JLOG(m_journal.debug()) << "AccountHistory job for account "
-                                                << toBase58(accountId) << " no ledger.";
-                        send(rpcError(rpcINTERNAL), true);
+                        JLOG(journal_.debug()) << "AccountHistory job for account "
+                                               << toBase58(accountId) << " no ledger.";
+                        send(rpcError(RpcInternal), true);
                         return;
                         // LCOV_EXCL_STOP
                     }
@@ -3825,20 +3824,19 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
                         UNREACHABLE(
                             "NetworkOPsImp::addAccountHistoryJob : "
                             "getSTransaction failed");
-                        JLOG(m_journal.debug())
-                            << "AccountHistory job for account " << toBase58(accountId)
-                            << " getSTransaction failed.";
-                        send(rpcError(rpcINTERNAL), true);
+                        JLOG(journal_.debug()) << "AccountHistory job for account "
+                                               << toBase58(accountId) << " getSTransaction failed.";
+                        send(rpcError(RpcInternal), true);
                         return;
                         // LCOV_EXCL_STOP
                     }
 
-                    auto const mRef = std::ref(*meta);
+                    auto const ref = std::ref(*meta);
                     auto const trR = meta->getResultTER();
-                    MultiApiJson jvTx = transJson(stTxn, trR, true, curTxLedger, mRef);
+                    MultiApiJson jvTx = transJson(stTxn, trR, true, curTxLedger, ref);
 
                     jvTx.set(jss::account_history_tx_index, txHistoryIndex--);
-                    if (i + 1 == num_txns || txns[i + 1].first->getLedger() != tx->getLedger())
+                    if (i + 1 == numTxns || txns[i + 1].first->getLedger() != tx->getLedger())
                         jvTx.set(jss::account_history_boundary, true);
 
                     if (isFirstTx(tx, meta))
@@ -3846,8 +3844,8 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
                         jvTx.set(jss::account_history_tx_first, true);
                         sendMultiApiJson(jvTx, false);
 
-                        JLOG(m_journal.trace()) << "AccountHistory job for account "
-                                                << toBase58(accountId) << " done, found last tx.";
+                        JLOG(journal_.trace()) << "AccountHistory job for account "
+                                               << toBase58(accountId) << " done, found last tx.";
                         return;
                     }
 
@@ -3856,7 +3854,7 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
 
                 if (marker)
                 {
-                    JLOG(m_journal.trace())
+                    JLOG(journal_.trace())
                         << "AccountHistory job for account " << toBase58(accountId)
                         << " paging, marker=" << marker->ledgerSeq << ":" << marker->txnSeq;
                 }
@@ -3866,12 +3864,12 @@ NetworkOPsImp::addAccountHistoryJob(SubAccountHistoryInfoWeak subInfo)
                 }
             }
 
-            if (!subInfo.index_->stopHistorical_)
+            if (!subInfo.index->stopHistorical)
             {
                 lastLedgerSeq = startLedgerSeq - 1;
                 if (lastLedgerSeq <= 1)
                 {
-                    JLOG(m_journal.trace())
+                    JLOG(journal_.trace())
                         << "AccountHistory job for account " << toBase58(accountId)
                         << " done, reached genesis ledger.";
                     return;
@@ -3886,22 +3884,22 @@ NetworkOPsImp::subAccountHistoryStart(
     std::shared_ptr<ReadView const> const& ledger,
     SubAccountHistoryInfoWeak& subInfo)
 {
-    subInfo.index_->separationLedgerSeq_ = ledger->seq();
-    auto const& accountId = subInfo.index_->accountId_;
+    subInfo.index->separationLedgerSeq = ledger->seq();
+    auto const& accountId = subInfo.index->accountId;
     auto const accountKeylet = keylet::account(accountId);
     if (!ledger->exists(accountKeylet))
     {
-        JLOG(m_journal.debug()) << "subAccountHistoryStart, no account " << toBase58(accountId)
-                                << ", no need to add AccountHistory job.";
+        JLOG(journal_.debug()) << "subAccountHistoryStart, no account " << toBase58(accountId)
+                               << ", no need to add AccountHistory job.";
         return;
     }
-    if (accountId == genesisAccountId)
+    if (accountId == kGENESIS_ACCOUNT_ID)
     {
         if (auto const sleAcct = ledger->read(accountKeylet); sleAcct)
         {
             if (sleAcct->getFieldU32(sfSequence) == 1)
             {
-                JLOG(m_journal.debug())
+                JLOG(journal_.debug())
                     << "subAccountHistoryStart, genesis account " << toBase58(accountId)
                     << " does not have tx, no need to add AccountHistory job.";
                 return;
@@ -3917,34 +3915,34 @@ NetworkOPsImp::subAccountHistoryStart(
             // LCOV_EXCL_STOP
         }
     }
-    subInfo.index_->historyLastLedgerSeq_ = ledger->seq();
-    subInfo.index_->haveHistorical_ = true;
+    subInfo.index->historyLastLedgerSeq = ledger->seq();
+    subInfo.index->haveHistorical = true;
 
-    JLOG(m_journal.debug()) << "subAccountHistoryStart, add AccountHistory job: accountId="
-                            << toBase58(accountId) << ", currentLedgerSeq=" << ledger->seq();
+    JLOG(journal_.debug()) << "subAccountHistoryStart, add AccountHistory job: accountId="
+                           << toBase58(accountId) << ", currentLedgerSeq=" << ledger->seq();
 
     addAccountHistoryJob(subInfo);
 }
 
-error_code_i
+ErrorCodeI
 NetworkOPsImp::subAccountHistory(InfoSub::ref isrListener, AccountID const& accountId)
 {
     if (!isrListener->insertSubAccountHistory(accountId))
     {
-        JLOG(m_journal.debug()) << "subAccountHistory, already subscribed to account "
-                                << toBase58(accountId);
-        return rpcINVALID_PARAMS;
+        JLOG(journal_.debug()) << "subAccountHistory, already subscribed to account "
+                               << toBase58(accountId);
+        return RpcInvalidParams;
     }
 
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
     SubAccountHistoryInfoWeak ahi{
-        .sinkWptr_ = isrListener, .index_ = std::make_shared<SubAccountHistoryIndex>(accountId)};
-    auto simIterator = mSubAccountHistory.find(accountId);
-    if (simIterator == mSubAccountHistory.end())
+        .sinkWptr = isrListener, .index = std::make_shared<SubAccountHistoryIndex>(accountId)};
+    auto simIterator = subAccountHistory_.find(accountId);
+    if (simIterator == subAccountHistory_.end())
     {
         hash_map<std::uint64_t, SubAccountHistoryInfoWeak> inner;
         inner.emplace(isrListener->getSeq(), ahi);
-        mSubAccountHistory.insert(simIterator, std::make_pair(accountId, inner));
+        subAccountHistory_.insert(simIterator, std::make_pair(accountId, inner));
     }
     else
     {
@@ -3961,10 +3959,10 @@ NetworkOPsImp::subAccountHistory(InfoSub::ref isrListener, AccountID const& acco
         // The node does not have validated ledgers, so wait for
         // one before start streaming.
         // In this case, the subscription is also considered successful.
-        JLOG(m_journal.debug()) << "subAccountHistory, no validated ledger yet, delay start";
+        JLOG(journal_.debug()) << "subAccountHistory, no validated ledger yet, delay start";
     }
 
-    return rpcSUCCESS;
+    return RpcSuccess;
 }
 
 void
@@ -3984,15 +3982,15 @@ NetworkOPsImp::unsubAccountHistoryInternal(
     AccountID const& account,
     bool historyOnly)
 {
-    std::scoped_lock const sl(mSubLock);
-    auto simIterator = mSubAccountHistory.find(account);
-    if (simIterator != mSubAccountHistory.end())
+    std::scoped_lock const sl(subLock_);
+    auto simIterator = subAccountHistory_.find(account);
+    if (simIterator != subAccountHistory_.end())
     {
         auto& subInfoMap = simIterator->second;
         auto subInfoIter = subInfoMap.find(seq);
         if (subInfoIter != subInfoMap.end())
         {
-            subInfoIter->second.index_->stopHistorical_ = true;
+            subInfoIter->second.index->stopHistorical = true;
         }
 
         if (!historyOnly)
@@ -4000,11 +3998,11 @@ NetworkOPsImp::unsubAccountHistoryInternal(
             simIterator->second.erase(seq);
             if (simIterator->second.empty())
             {
-                mSubAccountHistory.erase(simIterator);
+                subAccountHistory_.erase(simIterator);
             }
         }
-        JLOG(m_journal.debug()) << "unsubAccountHistory, account " << toBase58(account)
-                                << ", historyOnly = " << (historyOnly ? "true" : "false");
+        JLOG(journal_.debug()) << "unsubAccountHistory, account " << toBase58(account)
+                               << ", historyOnly = " << (historyOnly ? "true" : "false");
     }
 }
 
@@ -4038,96 +4036,96 @@ NetworkOPsImp::acceptLedger(std::optional<std::chrono::milliseconds> consensusDe
 {
     // This code-path is exclusively used when the server is in standalone
     // mode via `ledger_accept`
-    XRPL_ASSERT(m_standalone, "xrpl::NetworkOPsImp::acceptLedger : is standalone");
+    XRPL_ASSERT(standalone_, "xrpl::NetworkOPsImp::acceptLedger : is standalone");
 
-    if (!m_standalone)
+    if (!standalone_)
         Throw<std::runtime_error>("Operation only possible in STANDALONE mode.");
 
     // FIXME Could we improve on this and remove the need for a specialized
     // API in Consensus?
-    beginConsensus(m_ledgerMaster.getClosedLedger()->header().hash, {});
-    mConsensus.simulate(registry_.get().getTimeKeeper().closeTime(), consensusDelay);
-    return m_ledgerMaster.getCurrentLedger()->header().seq;
+    beginConsensus(ledgerMaster_.getClosedLedger()->header().hash, {});
+    consensus_.simulate(registry_.get().getTimeKeeper().closeTime(), consensusDelay);
+    return ledgerMaster_.getCurrentLedger()->header().seq;
 }
 
 // <-- bool: true=added, false=already there
 bool
-NetworkOPsImp::subLedger(InfoSub::ref isrListener, Json::Value& jvResult)
+NetworkOPsImp::subLedger(InfoSub::ref isrListener, json::Value& jvResult)
 {
-    if (auto lpClosed = m_ledgerMaster.getValidatedLedger())
+    if (auto lpClosed = ledgerMaster_.getValidatedLedger())
     {
         jvResult[jss::ledger_index] = lpClosed->header().seq;
         jvResult[jss::ledger_hash] = to_string(lpClosed->header().hash);
         jvResult[jss::ledger_time] =
-            Json::Value::UInt(lpClosed->header().closeTime.time_since_epoch().count());
+            json::Value::UInt(lpClosed->header().closeTime.time_since_epoch().count());
         if (!lpClosed->rules().enabled(featureXRPFees))
-            jvResult[jss::fee_ref] = FEE_UNITS_DEPRECATED;
+            jvResult[jss::fee_ref] = kFEE_UNITS_DEPRECATED;
         jvResult[jss::fee_base] = lpClosed->fees().base.jsonClipped();
         jvResult[jss::reserve_base] = lpClosed->fees().reserve.jsonClipped();
         jvResult[jss::reserve_inc] = lpClosed->fees().increment.jsonClipped();
         jvResult[jss::network_id] = registry_.get().getNetworkIDService().getNetworkID();
     }
 
-    if ((mMode >= OperatingMode::SYNCING) && !isNeedNetworkLedger())
+    if ((mode_ >= OperatingMode::SYNCING) && !isNeedNetworkLedger())
     {
         jvResult[jss::validated_ledgers] = registry_.get().getLedgerMaster().getCompleteLedgers();
     }
 
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sLedger].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SLedger].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subBookChanges(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sBookChanges].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SBookChanges].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubLedger(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sLedger].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SLedger].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubBookChanges(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sBookChanges].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SBookChanges].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subManifests(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sManifests].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SManifests].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubManifests(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sManifests].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SManifests].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
-NetworkOPsImp::subServer(InfoSub::ref isrListener, Json::Value& jvResult, bool admin)
+NetworkOPsImp::subServer(InfoSub::ref isrListener, json::Value& jvResult, bool admin)
 {
     uint256 uRandom;
 
-    if (m_standalone)
-        jvResult[jss::stand_alone] = m_standalone;
+    if (standalone_)
+        jvResult[jss::stand_alone] = standalone_;
 
     // CHECKME: is it necessary to provide a random number here?
-    beast::rngfill(uRandom.begin(), uRandom.size(), crypto_prng());
+    beast::rngfill(uRandom.begin(), uRandom.size(), cryptoPrng());
 
     auto const& feeTrack = registry_.get().getFeeTrack();
     jvResult[jss::random] = to_string(uRandom);
@@ -4138,60 +4136,60 @@ NetworkOPsImp::subServer(InfoSub::ref isrListener, Json::Value& jvResult, bool a
     jvResult[jss::pubkey_node] =
         toBase58(TokenType::NodePublic, registry_.get().getApp().nodeIdentity().first);
 
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sServer].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SServer].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubServer(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sServer].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SServer].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subTransactions(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sTransactions].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[STransactions].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubTransactions(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sTransactions].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[STransactions].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subRTTransactions(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sRTTransactions].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SRtTransactions].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubRTTransactions(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sRTTransactions].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SRtTransactions].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subValidations(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sValidations].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SValidations].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 void
-NetworkOPsImp::stateAccounting(Json::Value& obj)
+NetworkOPsImp::stateAccounting(json::Value& obj)
 {
     accounting_.json(obj);
 }
@@ -4200,50 +4198,50 @@ NetworkOPsImp::stateAccounting(Json::Value& obj)
 bool
 NetworkOPsImp::unsubValidations(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sValidations].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SValidations].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subPeerStatus(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sPeerStatus].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SPeerStatus].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubPeerStatus(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sPeerStatus].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SPeerStatus].erase(uSeq) != 0u;
 }
 
 // <-- bool: true=added, false=already there
 bool
 NetworkOPsImp::subConsensus(InfoSub::ref isrListener)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sConsensusPhase].emplace(isrListener->getSeq(), isrListener).second;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SConsensusPhase].emplace(isrListener->getSeq(), isrListener).second;
 }
 
 // <-- bool: true=erased, false=was not there
 bool
 NetworkOPsImp::unsubConsensus(std::uint64_t uSeq)
 {
-    std::scoped_lock const sl(mSubLock);
-    return mStreamMaps[sConsensusPhase].erase(uSeq) != 0u;
+    std::scoped_lock const sl(subLock_);
+    return streamMaps_[SConsensusPhase].erase(uSeq) != 0u;
 }
 
 InfoSub::pointer
 NetworkOPsImp::findRpcSub(std::string const& strUrl)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    subRpcMapType::iterator const it = mRpcSubMap.find(strUrl);
+    subRpcMapType::iterator const it = rpcSubMap_.find(strUrl);
 
-    if (it != mRpcSubMap.end())
+    if (it != rpcSubMap_.end())
         return it->second;
 
     return InfoSub::pointer();
@@ -4252,9 +4250,9 @@ NetworkOPsImp::findRpcSub(std::string const& strUrl)
 InfoSub::pointer
 NetworkOPsImp::addRpcSub(std::string const& strUrl, InfoSub::ref rspEntry)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
 
-    mRpcSubMap.emplace(strUrl, rspEntry);
+    rpcSubMap_.emplace(strUrl, rspEntry);
 
     return rspEntry;
 }
@@ -4262,7 +4260,7 @@ NetworkOPsImp::addRpcSub(std::string const& strUrl, InfoSub::ref rspEntry)
 bool
 NetworkOPsImp::tryRemoveRpcSub(std::string const& strUrl)
 {
-    std::scoped_lock const sl(mSubLock);
+    std::scoped_lock const sl(subLock_);
     auto pInfo = findRpcSub(strUrl);
 
     if (!pInfo)
@@ -4270,12 +4268,12 @@ NetworkOPsImp::tryRemoveRpcSub(std::string const& strUrl)
 
     // check to see if any of the stream maps still hold a weak reference to
     // this entry before removing
-    for (SubMapType const& map : mStreamMaps)
+    for (SubMapType const& map : streamMaps_)
     {
         if (map.contains(pInfo->getSeq()))
             return false;
     }
-    mRpcSubMap.erase(strUrl);
+    rpcSubMap_.erase(strUrl);
     return true;
 }
 
@@ -4291,17 +4289,17 @@ NetworkOPsImp::getBookPage(
     AccountID const& uTakerID,
     bool const bProof,
     unsigned int iLimit,
-    Json::Value const& jvMarker,
-    Json::Value& jvResult)
+    json::Value const& jvMarker,
+    json::Value& jvResult)
 {  // CAUTION: This is the old get book page logic
-    Json::Value& jvOffers = (jvResult[jss::offers] = Json::Value(Json::arrayValue));
+    json::Value& jvOffers = (jvResult[jss::offers] = json::Value(json::ArrayValue));
 
     std::unordered_map<AccountID, STAmount> umBalance;
     uint256 const uBookBase = getBookBase(book);
     uint256 const uBookEnd = getQualityNext(uBookBase);
     uint256 uTipIndex = uBookBase;
 
-    if (auto stream = m_journal.trace())
+    if (auto stream = journal_.trace())
     {
         stream << "getBookPage:" << book;
         stream << "getBookPage: uBookBase=" << uBookBase;
@@ -4331,7 +4329,7 @@ NetworkOPsImp::getBookPage(
         {
             bDirectAdvance = false;
 
-            JLOG(m_journal.trace()) << "getBookPage: bDirectAdvance";
+            JLOG(journal_.trace()) << "getBookPage: bDirectAdvance";
 
             auto const ledgerIndex = view.succ(uTipIndex, uBookEnd);
             if (ledgerIndex)
@@ -4345,7 +4343,7 @@ NetworkOPsImp::getBookPage(
 
             if (!sleOfferDir)
             {
-                JLOG(m_journal.trace()) << "getBookPage: bDone";
+                JLOG(journal_.trace()) << "getBookPage: bDone";
                 bDone = true;
             }
             else
@@ -4355,8 +4353,8 @@ NetworkOPsImp::getBookPage(
 
                 cdirFirst(view, uTipIndex, sleOfferDir, uBookEntry, offerIndex);
 
-                JLOG(m_journal.trace()) << "getBookPage:   uTipIndex=" << uTipIndex;
-                JLOG(m_journal.trace()) << "getBookPage: offerIndex=" << offerIndex;
+                JLOG(journal_.trace()) << "getBookPage:   uTipIndex=" << uTipIndex;
+                JLOG(journal_.trace()) << "getBookPage: offerIndex=" << offerIndex;
             }
         }
 
@@ -4402,11 +4400,11 @@ NetworkOPsImp::getBookPage(
                             view,
                             uOfferOwnerID,
                             book.out,
-                            FreezeHandling::fhZERO_IF_FROZEN,
-                            AuthHandling::ahZERO_IF_UNAUTHORIZED,
+                            FreezeHandling::ZeroIfFrozen,
+                            AuthHandling::ZeroIfUnauthorized,
                             viewJ);
 
-                        if (saOwnerFunds < beast::zero)
+                        if (saOwnerFunds < beast::kZERO)
                         {
                             // Treat negative funds as zero.
 
@@ -4415,13 +4413,13 @@ NetworkOPsImp::getBookPage(
                     }
                 }
 
-                Json::Value jvOffer = sleOffer->getJson(JsonOptions::none);
+                json::Value jvOffer = sleOffer->getJson(JsonOptions::KNone);
 
                 STAmount saTakerGetsFunded;
                 STAmount saOwnerFundsLimit = saOwnerFunds;
-                Rate offerRate = parityRate;
+                Rate offerRate = kPARITY_RATE;
 
-                if (rate != parityRate
+                if (rate != kPARITY_RATE
                     // Have a transfer fee.
                     && uTakerID != book.out.getIssuer()
                     // Not taking offers of own IOUs.
@@ -4450,14 +4448,14 @@ NetworkOPsImp::getBookPage(
                         .setJson(jvOffer[jss::taker_pays_funded]);
                 }
 
-                STAmount const saOwnerPays = (parityRate == offerRate)
+                STAmount const saOwnerPays = (kPARITY_RATE == offerRate)
                     ? saTakerGetsFunded
                     : std::min(saOwnerFunds, multiply(saTakerGetsFunded, offerRate));
 
                 umBalance[uOfferOwnerID] = saOwnerFunds - saOwnerPays;
 
                 // Include all offers funded and unfunded
-                Json::Value& jvOf = jvOffers.append(jvOffer);
+                json::Value& jvOf = jvOffers.append(jvOffer);
                 jvOf[jss::quality] = saDirRate.getText();
 
                 if (firstOwnerOffer)
@@ -4465,7 +4463,7 @@ NetworkOPsImp::getBookPage(
             }
             else
             {
-                JLOG(m_journal.warn()) << "Missing offer";
+                JLOG(journal_.warn()) << "Missing offer";
             }
 
             if (!cdirNext(view, uTipIndex, sleOfferDir, uBookEntry, offerIndex))
@@ -4474,13 +4472,13 @@ NetworkOPsImp::getBookPage(
             }
             else
             {
-                JLOG(m_journal.trace()) << "getBookPage: offerIndex=" << offerIndex;
+                JLOG(journal_.trace()) << "getBookPage: offerIndex=" << offerIndex;
             }
         }
     }
 
-    //  jvResult[jss::marker]  = Json::Value(Json::arrayValue);
-    //  jvResult[jss::nodes]   = Json::Value(Json::arrayValue);
+    //  jvResult[jss::marker]  = json::Value(json::arrayValue);
+    //  jvResult[jss::nodes]   = json::Value(json::arrayValue);
 }
 
 #else
@@ -4495,10 +4493,10 @@ NetworkOPsImp::getBookPage(
     AccountID const& uTakerID,
     bool const bProof,
     unsigned int iLimit,
-    Json::Value const& jvMarker,
-    Json::Value& jvResult)
+    json::Value const& jvMarker,
+    json::Value& jvResult)
 {
-    auto& jvOffers = (jvResult[jss::offers] = Json::Value(Json::arrayValue));
+    auto& jvOffers = (jvResult[jss::offers] = json::Value(json::arrayValue));
 
     std::map<AccountID, STAmount> umBalance;
 
@@ -4561,7 +4559,7 @@ NetworkOPsImp::getBookPage(
                 }
             }
 
-            Json::Value jvOffer = sleOffer->getJson(JsonOptions::none);
+            json::Value jvOffer = sleOffer->getJson(JsonOptions::KNone);
 
             STAmount saTakerGetsFunded;
             STAmount saOwnerFundsLimit = saOwnerFunds;
@@ -4606,46 +4604,46 @@ NetworkOPsImp::getBookPage(
             if (!saOwnerFunds.isZero() || uOfferOwnerID == uTakerID)
             {
                 // Only provide funded offers and offers of the taker.
-                Json::Value& jvOf = jvOffers.append(jvOffer);
+                json::Value& jvOf = jvOffers.append(jvOffer);
                 jvOf[jss::quality] = saDirRate.getText();
             }
         }
     }
 
-    //  jvResult[jss::marker]  = Json::Value(Json::arrayValue);
-    //  jvResult[jss::nodes]   = Json::Value(Json::arrayValue);
+    //  jvResult[jss::marker]  = json::Value(json::arrayValue);
+    //  jvResult[jss::nodes]   = json::Value(json::arrayValue);
 }
 
 #endif
 
 inline void
-NetworkOPsImp::collect_metrics()
+NetworkOPsImp::collectMetrics()
 {
     auto [counters, mode, start, initialSync] = accounting_.getCounterData();
     auto const current = std::chrono::duration_cast<std::chrono::microseconds>(
         std::chrono::steady_clock::now() - start);
     counters[static_cast<std::size_t>(mode)].dur += current;
 
-    std::scoped_lock const lock(m_statsMutex);
-    m_stats.disconnected_duration.set(
+    std::scoped_lock const lock(statsMutex_);
+    stats_.disconnected_duration.set(
         counters[static_cast<std::size_t>(OperatingMode::DISCONNECTED)].dur.count());
-    m_stats.connected_duration.set(
+    stats_.connected_duration.set(
         counters[static_cast<std::size_t>(OperatingMode::CONNECTED)].dur.count());
-    m_stats.syncing_duration.set(
+    stats_.syncing_duration.set(
         counters[static_cast<std::size_t>(OperatingMode::SYNCING)].dur.count());
-    m_stats.tracking_duration.set(
+    stats_.tracking_duration.set(
         counters[static_cast<std::size_t>(OperatingMode::TRACKING)].dur.count());
-    m_stats.full_duration.set(counters[static_cast<std::size_t>(OperatingMode::FULL)].dur.count());
+    stats_.full_duration.set(counters[static_cast<std::size_t>(OperatingMode::FULL)].dur.count());
 
-    m_stats.disconnected_transitions.set(
+    stats_.disconnected_transitions.set(
         counters[static_cast<std::size_t>(OperatingMode::DISCONNECTED)].transitions);
-    m_stats.connected_transitions.set(
+    stats_.connected_transitions.set(
         counters[static_cast<std::size_t>(OperatingMode::CONNECTED)].transitions);
-    m_stats.syncing_transitions.set(
+    stats_.syncing_transitions.set(
         counters[static_cast<std::size_t>(OperatingMode::SYNCING)].transitions);
-    m_stats.tracking_transitions.set(
+    stats_.tracking_transitions.set(
         counters[static_cast<std::size_t>(OperatingMode::TRACKING)].transitions);
-    m_stats.full_transitions.set(
+    stats_.full_transitions.set(
         counters[static_cast<std::size_t>(OperatingMode::FULL)].transitions);
 }
 
@@ -4669,20 +4667,20 @@ NetworkOPsImp::StateAccounting::mode(OperatingMode om)
 }
 
 void
-NetworkOPsImp::StateAccounting::json(Json::Value& obj) const
+NetworkOPsImp::StateAccounting::json(json::Value& obj) const
 {
     auto [counters, mode, start, initialSync] = getCounterData();
     auto const current = std::chrono::duration_cast<std::chrono::microseconds>(
         std::chrono::steady_clock::now() - start);
     counters[static_cast<std::size_t>(mode)].dur += current;
 
-    obj[jss::state_accounting] = Json::objectValue;
+    obj[jss::state_accounting] = json::ObjectValue;
     for (std::size_t i = static_cast<std::size_t>(OperatingMode::DISCONNECTED);
          i <= static_cast<std::size_t>(OperatingMode::FULL);
          ++i)
     {
-        obj[jss::state_accounting][states_[i]] = Json::objectValue;
-        auto& state = obj[jss::state_accounting][states_[i]];
+        obj[jss::state_accounting][kSTATES[i]] = json::ObjectValue;
+        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());
     }
@@ -4694,7 +4692,7 @@ NetworkOPsImp::StateAccounting::json(Json::Value& obj) const
 //------------------------------------------------------------------------------
 
 std::unique_ptr<NetworkOPs>
-make_NetworkOPs(
+makeNetworkOPs(
     ServiceRegistry& registry,
     NetworkOPs::clock_type& clock,
     bool standalone,
diff --git a/src/xrpld/app/misc/SHAMapStore.h b/src/xrpld/app/misc/SHAMapStore.h
index 22ba0cdbe2..3f43bc8fa4 100644
--- a/src/xrpld/app/misc/SHAMapStore.h
+++ b/src/xrpld/app/misc/SHAMapStore.h
@@ -34,7 +34,7 @@ public:
     stop() = 0;
 
     [[nodiscard]] virtual std::uint32_t
-    clampFetchDepth(std::uint32_t fetch_depth) const = 0;
+    clampFetchDepth(std::uint32_t fetchDepth) const = 0;
 
     virtual std::unique_ptr<NodeStore::Database>
     makeNodeStore(int readThreads) = 0;
@@ -84,5 +84,5 @@ public:
 //------------------------------------------------------------------------------
 
 std::unique_ptr<SHAMapStore>
-make_SHAMapStore(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal);
+makeSHAMapStore(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal);
 }  // namespace xrpl
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp
index 3a6cb1742d..6fa1fbda61 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.cpp
+++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp
@@ -45,46 +45,46 @@ namespace xrpl {
 void
 SHAMapStoreImp::SavedStateDB::init(BasicConfig const& config, std::string const& dbName)
 {
-    std::scoped_lock const lock(mutex_);
-    initStateDB(sqlDb_, config, dbName);
+    std::scoped_lock const lock(mutex);
+    initStateDB(sqlDb, config, dbName);
 }
 
 LedgerIndex
 SHAMapStoreImp::SavedStateDB::getCanDelete()
 {
-    std::scoped_lock const lock(mutex_);
+    std::scoped_lock const lock(mutex);
 
-    return xrpl::getCanDelete(sqlDb_);
+    return xrpl::getCanDelete(sqlDb);
 }
 
 LedgerIndex
 SHAMapStoreImp::SavedStateDB::setCanDelete(LedgerIndex canDelete)
 {
-    std::scoped_lock const lock(mutex_);
+    std::scoped_lock const lock(mutex);
 
-    return xrpl::setCanDelete(sqlDb_, canDelete);
+    return xrpl::setCanDelete(sqlDb, canDelete);
 }
 
 SavedState
 SHAMapStoreImp::SavedStateDB::getState()
 {
-    std::scoped_lock const lock(mutex_);
+    std::scoped_lock const lock(mutex);
 
-    return xrpl::getSavedState(sqlDb_);
+    return xrpl::getSavedState(sqlDb);
 }
 
 void
 SHAMapStoreImp::SavedStateDB::setState(SavedState const& state)
 {
-    std::scoped_lock const lock(mutex_);
-    xrpl::setSavedState(sqlDb_, state);
+    std::scoped_lock const lock(mutex);
+    xrpl::setSavedState(sqlDb, state);
 }
 
 void
 SHAMapStoreImp::SavedStateDB::setLastRotated(LedgerIndex seq)
 {
-    std::scoped_lock const lock(mutex_);
-    xrpl::setLastRotated(sqlDb_, seq);
+    std::scoped_lock const lock(mutex);
+    xrpl::setLastRotated(sqlDb, seq);
 }
 
 //------------------------------------------------------------------------------
@@ -113,35 +113,35 @@ SHAMapStoreImp::SHAMapStoreImp(
     {
         if (!section.exists("cache_mb"))
         {
-            section.set("cache_mb", std::to_string(config.getValueFor(SizedItem::hashNodeDBCache)));
+            section.set("cache_mb", std::to_string(config.getValueFor(SizedItem::HashNodeDbCache)));
         }
 
         if (!section.exists("filter_bits") && (config.NODE_SIZE >= 2))
             section.set("filter_bits", "10");
     }
 
-    get_if_exists(section, "online_delete", deleteInterval_);
+    getIfExists(section, "online_delete", deleteInterval_);
 
     if (deleteInterval_ != 0u)
     {
         // Configuration that affects the behavior of online delete
-        get_if_exists(section, "delete_batch", deleteBatch_);
+        getIfExists(section, "delete_batch", deleteBatch_);
         std::uint32_t temp = 0;
-        if (get_if_exists(section, "back_off_milliseconds", temp) ||
+        if (getIfExists(section, "back_off_milliseconds", temp) ||
             // Included for backward compatibility with an undocumented setting
-            get_if_exists(section, "backOff", temp))
+            getIfExists(section, "backOff", temp))
         {
             backOff_ = std::chrono::milliseconds{temp};
         }
-        if (get_if_exists(section, "age_threshold_seconds", temp))
+        if (getIfExists(section, "age_threshold_seconds", temp))
             ageThreshold_ = std::chrono::seconds{temp};
-        if (get_if_exists(section, "recovery_wait_seconds", temp))
+        if (getIfExists(section, "recovery_wait_seconds", temp))
             recoveryWaitTime_ = std::chrono::seconds{temp};
 
-        get_if_exists(section, "advisory_delete", advisoryDelete_);
+        getIfExists(section, "advisory_delete", advisoryDelete_);
 
         auto const minInterval =
-            config.standalone() ? minimumDeletionIntervalSA_ : minimumDeletionInterval_;
+            config.standalone() ? kMINIMUM_DELETION_INTERVAL_SA : kMINIMUM_DELETION_INTERVAL;
         if (deleteInterval_ < minInterval)
         {
             Throw<std::runtime_error>(
@@ -187,19 +187,19 @@ SHAMapStoreImp::makeNodeStore(int readThreads)
             std::move(writableBackend),
             std::move(archiveBackend),
             nscfg,
-            app_.getJournal(nodeStoreName_));
+            app_.getJournal(kNODE_STORE_NAME));
         fdRequired_ += dbr->fdRequired();
         dbRotating_ = dbr.get();
         db.reset(dynamic_cast<NodeStore::Database*>(dbr.release()));
     }
     else
     {
-        db = NodeStore::Manager::instance().make_Database(
-            megabytes(app_.config().getValueFor(SizedItem::burstSize, std::nullopt)),
+        db = NodeStore::Manager::instance().makeDatabase(
+            megabytes(app_.config().getValueFor(SizedItem::BurstSize, std::nullopt)),
             scheduler_,
             readThreads,
             nscfg,
-            app_.getJournal(nodeStoreName_));
+            app_.getJournal(kNODE_STORE_NAME));
         fdRequired_ += db->fdRequired();
     }
     return db;
@@ -237,10 +237,10 @@ SHAMapStoreImp::copyNode(std::uint64_t& nodeCount, SHAMapTreeNode const& node)
 {
     // Copy a single record from node to dbRotating_
     dbRotating_->fetchNodeObject(
-        node.getHash().as_uint256(), 0, NodeStore::FetchType::synchronous, true);
+        node.getHash().asUint256(), 0, NodeStore::FetchType::Synchronous, true);
     if ((++nodeCount % checkHealthInterval_) == 0u)
     {
-        if (healthWait() == HealthResult::stopping)
+        if (healthWait() == HealthResult::Stopping)
             return false;
     }
 
@@ -290,7 +290,7 @@ SHAMapStoreImp::run()
         }
 
         bool const readyToRotate = validatedSeq >= lastRotated + deleteInterval_ &&
-            canDelete_ >= lastRotated - 1 && healthWait() == HealthResult::keepGoing;
+            canDelete_ >= lastRotated - 1 && healthWait() == HealthResult::KeepGoing;
 
         // will delete up to (not including) lastRotated
         if (readyToRotate)
@@ -302,7 +302,7 @@ SHAMapStoreImp::run()
                                   << ledgerMaster_->getValidatedLedgerAge().count() << 's';
 
             clearPrior(lastRotated);
-            if (healthWait() == HealthResult::stopping)
+            if (healthWait() == HealthResult::Stopping)
                 return;
 
             JLOG(journal_.debug()) << "copying ledger " << validatedSeq;
@@ -324,7 +324,7 @@ SHAMapStoreImp::run()
                 continue;
             }
 
-            if (healthWait() == HealthResult::stopping)
+            if (healthWait() == HealthResult::Stopping)
                 return;
             // Only log if we completed without a "health" abort
             JLOG(journal_.debug())
@@ -332,7 +332,7 @@ SHAMapStoreImp::run()
 
             JLOG(journal_.debug()) << "freshening caches";
             freshenCaches();
-            if (healthWait() == HealthResult::stopping)
+            if (healthWait() == HealthResult::Stopping)
                 return;
             // Only log if we completed without a "health" abort
             JLOG(journal_.debug()) << validatedSeq << " freshened caches";
@@ -342,7 +342,7 @@ SHAMapStoreImp::run()
             JLOG(journal_.debug()) << validatedSeq << " new backend " << newBackend->getName();
 
             clearCaches(validatedSeq);
-            if (healthWait() == HealthResult::stopping)
+            if (healthWait() == HealthResult::Stopping)
                 return;
 
             lastRotated = validatedSeq;
@@ -478,11 +478,11 @@ SHAMapStoreImp::makeBackendRotating(std::string path)
     }
     section.set("path", newPath.string());
 
-    auto backend{NodeStore::Manager::instance().make_Backend(
+    auto backend{NodeStore::Manager::instance().makeBackend(
         section,
-        megabytes(app_.config().getValueFor(SizedItem::burstSize, std::nullopt)),
+        megabytes(app_.config().getValueFor(SizedItem::BurstSize, std::nullopt)),
         scheduler_,
-        app_.getJournal(nodeStoreName_))};
+        app_.getJournal(kNODE_STORE_NAME))};
     backend->open();
     return backend;
 }
@@ -490,7 +490,7 @@ SHAMapStoreImp::makeBackendRotating(std::string path)
 void
 SHAMapStoreImp::clearSql(
     LedgerIndex lastRotated,
-    std::string const& TableName,
+    std::string const& tableName,
     std::function<std::optional<LedgerIndex>()> const& getMinSeq,
     std::function<void(LedgerIndex)> const& deleteBeforeSeq)
 {
@@ -498,41 +498,41 @@ SHAMapStoreImp::clearSql(
     LedgerIndex min = std::numeric_limits<LedgerIndex>::max();
 
     {
-        JLOG(journal_.trace()) << "Begin: Look up lowest value of: " << TableName;
+        JLOG(journal_.trace()) << "Begin: Look up lowest value of: " << tableName;
         auto m = getMinSeq();
-        JLOG(journal_.trace()) << "End: Look up lowest value of: " << TableName;
+        JLOG(journal_.trace()) << "End: Look up lowest value of: " << tableName;
         if (!m)
             return;
         min = *m;
     }
 
-    if (min > lastRotated || healthWait() == HealthResult::stopping)
+    if (min > lastRotated || healthWait() == HealthResult::Stopping)
         return;
     if (min == lastRotated)
     {
         // Micro-optimization mainly to clarify logs
-        JLOG(journal_.trace()) << "Nothing to delete from " << TableName;
+        JLOG(journal_.trace()) << "Nothing to delete from " << tableName;
         return;
     }
 
-    JLOG(journal_.debug()) << "start deleting in: " << TableName << " from " << min << " to "
+    JLOG(journal_.debug()) << "start deleting in: " << tableName << " from " << min << " to "
                            << lastRotated;
     while (min < lastRotated)
     {
         min = std::min(lastRotated, min + deleteBatch_);
         JLOG(journal_.trace()) << "Begin: Delete up to " << deleteBatch_
-                               << " rows with LedgerSeq < " << min << " from: " << TableName;
+                               << " rows with LedgerSeq < " << min << " from: " << tableName;
         deleteBeforeSeq(min);
         JLOG(journal_.trace()) << "End: Delete up to " << deleteBatch_ << " rows with LedgerSeq < "
-                               << min << " from: " << TableName;
-        if (healthWait() == HealthResult::stopping)
+                               << min << " from: " << tableName;
+        if (healthWait() == HealthResult::Stopping)
             return;
         if (min < lastRotated)
             std::this_thread::sleep_for(backOff_);
-        if (healthWait() == HealthResult::stopping)
+        if (healthWait() == HealthResult::Stopping)
             return;
     }
-    JLOG(journal_.debug()) << "finished deleting from: " << TableName;
+    JLOG(journal_.debug()) << "finished deleting from: " << tableName;
 }
 
 void
@@ -563,7 +563,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
     JLOG(journal_.trace()) << "Begin: Clear internal ledgers up to " << lastRotated;
     ledgerMaster_->clearPriorLedgers(lastRotated);
     JLOG(journal_.trace()) << "End: Clear internal ledgers up to " << lastRotated;
-    if (healthWait() == HealthResult::stopping)
+    if (healthWait() == HealthResult::Stopping)
         return;
 
     auto& db = app_.getRelationalDatabase();
@@ -573,7 +573,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "Ledgers",
         [&db]() -> std::optional<LedgerIndex> { return db.getMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteBeforeLedgerSeq(min); });
-    if (healthWait() == HealthResult::stopping)
+    if (healthWait() == HealthResult::Stopping)
         return;
 
     if (!app_.config().useTxTables())
@@ -584,7 +584,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "Transactions",
         [&db]() -> std::optional<LedgerIndex> { return db.getTransactionsMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteTransactionsBeforeLedgerSeq(min); });
-    if (healthWait() == HealthResult::stopping)
+    if (healthWait() == HealthResult::Stopping)
         return;
 
     clearSql(
@@ -592,7 +592,7 @@ SHAMapStoreImp::clearPrior(LedgerIndex lastRotated)
         "AccountTransactions",
         [&db]() -> std::optional<LedgerIndex> { return db.getAccountTransactionsMinLedgerSeq(); },
         [&db](LedgerIndex min) -> void { db.deleteAccountTransactionsBeforeLedgerSeq(min); });
-    if (healthWait() == HealthResult::stopping)
+    if (healthWait() == HealthResult::Stopping)
         return;
 }
 
@@ -615,7 +615,7 @@ SHAMapStoreImp::healthWait()
         lock.lock();
     }
 
-    return stop_ ? HealthResult::stopping : HealthResult::keepGoing;
+    return stop_ ? HealthResult::Stopping : HealthResult::KeepGoing;
 }
 
 void
@@ -645,7 +645,7 @@ SHAMapStoreImp::minimumOnline() const
 //------------------------------------------------------------------------------
 
 std::unique_ptr<SHAMapStore>
-make_SHAMapStore(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal)
+makeSHAMapStore(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal)
 {
     return std::make_unique<SHAMapStoreImp>(app, scheduler, journal);
 }
diff --git a/src/xrpld/app/misc/SHAMapStoreImp.h b/src/xrpld/app/misc/SHAMapStoreImp.h
index 22cb06c0e4..c205d2dd90 100644
--- a/src/xrpld/app/misc/SHAMapStoreImp.h
+++ b/src/xrpld/app/misc/SHAMapStoreImp.h
@@ -22,13 +22,13 @@ private:
     class SavedStateDB
     {
     public:
-        soci::session sqlDb_;
-        std::mutex mutex_;
-        beast::Journal const journal_;
+        soci::session sqlDb;
+        std::mutex mutex;
+        beast::Journal const journal;
 
         // Just instantiate without any logic in case online delete is not
         // configured
-        explicit SavedStateDB() : journal_{beast::Journal::getNullSink()}
+        explicit SavedStateDB() : journal{beast::Journal::getNullSink()}
         {
         }
 
@@ -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 minimumDeletionInterval_ = 256;
+    static std::uint32_t const kMINIMUM_DELETION_INTERVAL = 256;
     // minimum # of ledgers required for standalone mode.
-    static std::uint32_t const minimumDeletionIntervalSA_ = 8;
+    static std::uint32_t const kMINIMUM_DELETION_INTERVAL_SA = 8;
     // minimum ledger to maintain online.
     std::atomic<LedgerIndex> minimumOnline_;
 
@@ -94,15 +94,15 @@ private:
     NetworkOPs* netOPs_ = nullptr;
     LedgerMaster* ledgerMaster_ = nullptr;
 
-    static constexpr auto nodeStoreName_ = "NodeStore";
+    static constexpr auto kNODE_STORE_NAME = "NodeStore";
 
 public:
     SHAMapStoreImp(Application& app, NodeStore::Scheduler& scheduler, beast::Journal journal);
 
     std::uint32_t
-    clampFetchDepth(std::uint32_t fetch_depth) const override
+    clampFetchDepth(std::uint32_t fetchDepth) const override
     {
-        return (deleteInterval_ != 0u) ? std::min(fetch_depth, deleteInterval_) : fetch_depth;
+        return (deleteInterval_ != 0u) ? std::min(fetchDepth, deleteInterval_) : fetchDepth;
     }
 
     std::unique_ptr<NodeStore::Database>
@@ -169,8 +169,8 @@ private:
 
         for (auto const& key : cache.getKeys())
         {
-            dbRotating_->fetchNodeObject(key, 0, NodeStore::FetchType::synchronous, true);
-            if (!(++check % checkHealthInterval_) && healthWait() == HealthResult::stopping)
+            dbRotating_->fetchNodeObject(key, 0, NodeStore::FetchType::Synchronous, true);
+            if (!(++check % checkHealthInterval_) && healthWait() == HealthResult::Stopping)
                 return true;
         }
 
@@ -184,7 +184,7 @@ private:
     void
     clearSql(
         LedgerIndex lastRotated,
-        std::string const& TableName,
+        std::string const& tableName,
         std::function<std::optional<LedgerIndex>()> const& getMinSeq,
         std::function<void(LedgerIndex)> const& deleteBeforeSeq);
     void
@@ -201,7 +201,7 @@ private:
      *
      * @return Whether the server is stopping.
      */
-    enum class HealthResult { stopping, keepGoing };
+    enum class HealthResult { Stopping, KeepGoing };
     [[nodiscard]] HealthResult
     healthWait();
 
diff --git a/src/xrpld/app/misc/Transaction.h b/src/xrpld/app/misc/Transaction.h
index 43ef2094fe..80e041f5b7 100644
--- a/src/xrpld/app/misc/Transaction.h
+++ b/src/xrpld/app/misc/Transaction.h
@@ -63,43 +63,43 @@ public:
     std::shared_ptr<STTx const> const&
     getSTransaction()
     {
-        return mTransaction;
+        return transaction_;
     }
 
     uint256 const&
     getID() const
     {
-        return mTransactionID;
+        return transactionID_;
     }
 
     LedgerIndex
     getLedger() const
     {
-        return mLedgerIndex;
+        return ledgerIndex_;
     }
 
     bool
     isValidated() const
     {
-        return mLedgerIndex != 0;
+        return ledgerIndex_ != 0;
     }
 
     TransStatus
     getStatus() const
     {
-        return mStatus;
+        return status_;
     }
 
     TER
     getResult()
     {
-        return mResult;
+        return result_;
     }
 
     void
     setResult(TER terResult)
     {
-        mResult = terResult;
+        result_ = terResult;
     }
 
     void
@@ -112,13 +112,13 @@ public:
     void
     setStatus(TransStatus status)
     {
-        mStatus = status;
+        status_ = status;
     }
 
     void
     setLedger(LedgerIndex ledger)
     {
-        mLedgerIndex = ledger;
+        ledgerIndex_ = ledger;
     }
 
     /**
@@ -127,9 +127,9 @@ public:
     void
     setApplying()
     {
-        // Note that all access to mApplying are made by NetworkOPsImp, and must
+        // Note that all access to applying_ are made by NetworkOPsImp, and must
         // be done under that class's lock.
-        mApplying = true;
+        applying_ = true;
     }
 
     /**
@@ -140,9 +140,9 @@ public:
     bool
     getApplying() const
     {
-        // Note that all access to mApplying are made by NetworkOPsImp, and must
+        // Note that all access to applying_ are made by NetworkOPsImp, and must
         // be done under that class's lock.
-        return mApplying;
+        return applying_;
     }
 
     /**
@@ -151,9 +151,9 @@ public:
     void
     clearApplying()
     {
-        // Note that all access to mApplying are made by NetworkOPsImp, and must
+        // Note that all access to applying_ are made by NetworkOPsImp, and must
         // be done under that class's lock.
-        mApplying = false;
+        applying_ = false;
     }
 
     struct SubmitResult
@@ -290,7 +290,7 @@ public:
         currentLedgerState_.emplace(validatedLedger, fee, accountSeq, availableSeq);
     }
 
-    Json::Value
+    json::Value
     getJson(JsonOptions options, bool binary = false) const;
 
     // Information used to locate a transaction.
@@ -345,7 +345,7 @@ public:
 
     static std::
         variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
-        load(uint256 const& id, Application& app, error_code_i& ec);
+        load(uint256 const& id, Application& app, ErrorCodeI& ec);
 
     static std::
         variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
@@ -353,7 +353,7 @@ public:
             uint256 const& id,
             Application& app,
             ClosedInterval<uint32_t> const& range,
-            error_code_i& ec);
+            ErrorCodeI& ec);
 
 private:
     static std::
@@ -362,16 +362,16 @@ private:
             uint256 const& id,
             Application& app,
             std::optional<ClosedInterval<uint32_t>> const& range,
-            error_code_i& ec);
+            ErrorCodeI& ec);
 
-    uint256 mTransactionID;
+    uint256 transactionID_;
 
-    LedgerIndex mLedgerIndex = 0;
-    std::optional<uint32_t> mTxnSeq;
-    std::optional<uint32_t> mNetworkID;
-    TransStatus mStatus = TransStatus::INVALID;
-    TER mResult = temUNCERTAIN;
-    /* Note that all access to mApplying are made by NetworkOPsImp,
+    LedgerIndex ledgerIndex_ = 0;
+    std::optional<uint32_t> txnSeq_;
+    std::optional<uint32_t> networkID_;
+    TransStatus status_ = TransStatus::INVALID;
+    TER result_ = temUNCERTAIN;
+    /* Note that all access to applying_ are made by NetworkOPsImp,
         and must be done under that class's lock. This avoids the overhead of
         taking a separate lock, and the consequences of a race condition are
         nearly-zero.
@@ -389,15 +389,15 @@ private:
             cleared, then it might get attempted again later as is the case with
             item 1.
     */
-    bool mApplying = false;
+    bool applying_ = false;
 
     /** different ways for transaction to be accepted */
     SubmitResult submitResult_;
 
     std::optional<CurrentLedgerState> currentLedgerState_;
 
-    std::shared_ptr<STTx const> mTransaction;
-    Application& mApp;
+    std::shared_ptr<STTx const> transaction_;
+    Application& app_;
     beast::Journal j_;
 };
 
diff --git a/src/xrpld/app/misc/TxQ.h b/src/xrpld/app/misc/TxQ.h
index c3dddd12ba..4cd73acaec 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 baseLevel{256};
+    static constexpr FeeLevel64 kBASE_LEVEL{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 = baseLevel * 500;
+        FeeLevel64 minimumEscalationMultiplier = kBASE_LEVEL * 500;
         /// Minimum number of transactions to allow into the ledger
         /// before escalation, regardless of the prior ledger's size.
         std::uint32_t minimumTxnInLedger = 32;
@@ -174,24 +174,24 @@ public:
     {
         /// Full initialization
         TxDetails(
-            FeeLevel64 feeLevel_,
-            std::optional<LedgerIndex> const& lastValid_,
-            TxConsequences const& consequences_,
-            AccountID const& account_,
-            SeqProxy seqProxy_,
-            std::shared_ptr<STTx const> const& txn_,
-            int retriesRemaining_,
-            TER preflightResult_,
-            std::optional<TER> lastResult_)
-            : feeLevel(feeLevel_)
-            , lastValid(lastValid_)
-            , consequences(consequences_)
-            , account(account_)
-            , seqProxy(seqProxy_)
-            , txn(txn_)
-            , retriesRemaining(retriesRemaining_)
-            , preflightResult(preflightResult_)
-            , lastResult(lastResult_)
+            FeeLevel64 feeLevel,
+            std::optional<LedgerIndex> const& lastValid,
+            TxConsequences const& consequences,
+            AccountID const& account,
+            SeqProxy seqProxy,
+            std::shared_ptr<STTx const> const& txn,
+            int retriesRemaining,
+            TER preflightResult,
+            std::optional<TER> lastResult)
+            : feeLevel(feeLevel)
+            , lastValid(lastValid)
+            , consequences(consequences)
+            , account(account)
+            , seqProxy(seqProxy)
+            , txn(txn)
+            , retriesRemaining(retriesRemaining)
+            , preflightResult(preflightResult)
+            , lastResult(lastResult)
         {
         }
 
@@ -336,7 +336,7 @@ public:
 
         @returns a `Json objectvalue`
     */
-    Json::Value
+    json::Value
     doRPC(Application& app) const;
 
 private:
@@ -512,7 +512,7 @@ private:
             their `retriesRemaining` forced down as part of the
             penalty.
         */
-        int retriesRemaining{retriesAllowed};
+        int retriesRemaining{kRETRIES_ALLOWED};
         /// 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 retriesAllowed = 10;
+        static constexpr int kRETRIES_ALLOWED = 10;
 
         /** The hash of the parent ledger.
 
@@ -761,7 +761,7 @@ private:
     /**
         parentHash_ used for logging only
     */
-    LedgerHash parentHash_{beast::zero};
+    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.
@@ -770,7 +770,7 @@ private:
 
 private:
     /// Is the queue at least `fillPercentage` full?
-    template <size_t fillPercentage = 100>
+    template <size_t FillPercentage = 100>
     bool
     isFull() const;
 
@@ -825,19 +825,19 @@ private:
     Build a @ref TxQ::Setup object from application configuration.
 */
 TxQ::Setup
-setup_TxQ(Config const&);
+setupTxQ(Config const&);
 
 template <class T>
 XRPAmount
 toDrops(FeeLevel<T> const& level, XRPAmount baseFee)
 {
-    return mulDiv(level, baseFee, TxQ::baseLevel).value_or(XRPAmount(STAmount::cMaxNativeN));
+    return mulDiv(level, baseFee, TxQ::kBASE_LEVEL).value_or(XRPAmount(STAmount::kMAX_NATIVE_N));
 }
 
 inline FeeLevel64
 toFeeLevel(XRPAmount const& drops, XRPAmount const& baseFee)
 {
-    return mulDiv(drops, TxQ::baseLevel, baseFee)
+    return mulDiv(drops, TxQ::kBASE_LEVEL, baseFee)
         .value_or(FeeLevel64(std::numeric_limits<std::uint64_t>::max()));
 }
 
diff --git a/src/xrpld/app/misc/ValidatorKeys.h b/src/xrpld/app/misc/ValidatorKeys.h
index d3ce996065..1f96815681 100644
--- a/src/xrpld/app/misc/ValidatorKeys.h
+++ b/src/xrpld/app/misc/ValidatorKeys.h
@@ -25,8 +25,8 @@ public:
         SecretKey secretKey;
 
         Keys() = delete;
-        Keys(PublicKey const& masterPublic_, PublicKey const& public_, SecretKey const& secret_)
-            : masterPublicKey(masterPublic_), publicKey(public_), secretKey(secret_)
+        Keys(PublicKey const& masterPublic, PublicKey const& pub, SecretKey const& secret)
+            : masterPublicKey(masterPublic), publicKey(pub), secretKey(secret)
         {
         }
     };
diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h
index ee6f14ed4c..5f051fe527 100644
--- a/src/xrpld/app/misc/ValidatorList.h
+++ b/src/xrpld/app/misc/ValidatorList.h
@@ -34,31 +34,31 @@ class STValidation;
    "worse" dispositions */
 enum class ListDisposition {
     /// List is valid
-    accepted = 0,
+    Accepted = 0,
 
     /// List is expired, but has the largest non-pending sequence seen so far
-    expired,
+    Expired,
 
     /// List will be valid in the future
-    pending,
+    Pending,
 
     /// Same sequence as current list
-    same_sequence,
+    SameSequence,
 
     /// Future sequence already seen
-    known_sequence,
+    KnownSequence,
 
     /// Trusted publisher key, but seq is too old
-    stale,
+    Stale,
 
     /// List signed by untrusted publisher key
-    untrusted,
+    Untrusted,
 
     /// List version is not supported
-    unsupported_version,
+    UnsupportedVersion,
 
     /// Invalid format or signature
-    invalid
+    Invalid
 };
 
 /* Entries in this enum are ordered by "desirability".
@@ -66,16 +66,16 @@ enum class ListDisposition {
    "worse" dispositions */
 enum class PublisherStatus {
     // Publisher has provided a valid file
-    available = 0,
+    Available = 0,
 
     // Current list is expired without replacement
-    expired,
+    Expired,
 
     // No file seen yet
-    unavailable,
+    Unavailable,
 
     // Publisher has revoked their manifest key
-    revoked,
+    Revoked,
 
 };
 
@@ -173,7 +173,7 @@ class ValidatorList
 
     struct PublisherListCollection
     {
-        PublisherStatus status = PublisherStatus::unavailable;
+        PublisherStatus status = PublisherStatus::Unavailable;
         /*
         The `current` VL is the one which
          1. Has the largest sequence number that
@@ -240,18 +240,18 @@ class ValidatorList
     // have any "remaining" manifests. It is assumed to be perennially
     // "available". The "validUntil" field is set to the highest possible
     // value of the field, hence this list is always valid.
-    PublisherList localPublisherList;
+    PublisherList localPublisherList_;
 
     // The master public keys of the current negative UNL
     hash_set<PublicKey> negativeUNL_;
 
     // Currently supported versions of publisher list format
-    static constexpr std::uint32_t supportedListVersions[]{1, 2};
+    static constexpr std::uint32_t kSUPPORTED_LIST_VERSIONS[]{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 maxSupportedBlobs = 5;
+    static constexpr std::size_t kMAX_SUPPORTED_BLOBS = 5;
     // Prefix of the file name used to store cache files.
-    static std::string const filePrefix_;
+    static std::string const kFILE_PREFIX;
 
 public:
     ValidatorList(
@@ -285,7 +285,7 @@ public:
         // occurred
         std::map<ListDisposition, std::size_t> dispositions;
         std::optional<PublicKey> publisherKey;
-        PublisherStatus status = PublisherStatus::unavailable;
+        PublisherStatus status = PublisherStatus::Unavailable;
         std::size_t sequence = 0;
     };
 
@@ -293,9 +293,9 @@ public:
     {
         explicit MessageWithHash() = default;
         explicit MessageWithHash(
-            std::shared_ptr<Message> const& message_,
-            uint256 hash_,
-            std::size_t num_);
+            std::shared_ptr<Message> const& message,
+            uint256 hash,
+            std::size_t num);
         std::shared_ptr<Message> message;
         uint256 hash;
         std::size_t numVLs = 0;
@@ -331,7 +331,7 @@ public:
         @return An empty vector indicates malformed Json.
      */
     static std::vector<ValidatorBlobInfo>
-    parseBlobs(std::uint32_t version, Json::Value const& body);
+    parseBlobs(std::uint32_t version, json::Value const& body);
 
     static std::vector<ValidatorBlobInfo>
     parseBlobs(protocol::TMValidatorList const& body);
@@ -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 = maximumMessageSize);
+        std::size_t maxSize = kMAXIMUM_MESSAGE_SIZE);
 
     /** Apply multiple published lists of public keys, then broadcast it to all
         peers that have not seen it or sent it.
@@ -384,7 +384,7 @@ public:
         @param networkOPs NetworkOPs object which will be informed if there
             is a valid VL
 
-        @return `ListDisposition::accepted`, plus some of the publisher
+        @return `ListDisposition::Accepted`, plus some of the publisher
             information, if list was successfully applied
 
         @par Thread Safety
@@ -415,7 +415,7 @@ public:
 
         @param hash Optional hash of the data parameters
 
-        @return `ListDisposition::accepted`, plus some of the publisher
+        @return `ListDisposition::Accepted`, plus some of the publisher
         information, if list was successfully applied
 
         @par Thread Safety
@@ -569,7 +569,7 @@ public:
         May be called concurrently
     */
     void
-    for_each_listed(std::function<void(PublicKey const&, bool)> func) const;
+    forEachListed(std::function<void(PublicKey const&, bool)> func) const;
 
     /** Invokes the callback once for every available publisher list's raw
         data members
@@ -599,7 +599,7 @@ public:
         May be called concurrently
     */
     void
-    for_each_available(
+    forEachAvailable(
         std::function<void(
             std::string const& manifest,
             std::uint32_t version,
@@ -611,7 +611,7 @@ public:
     /** Returns the current valid list for the given publisher key,
         if available, as a Json object.
     */
-    std::optional<Json::Value>
+    std::optional<json::Value>
     getAvailable(std::string_view pubKey, std::optional<std::uint32_t> forceVersion = {});
 
     /** Return the number of configured validator list sites. */
@@ -635,7 +635,7 @@ public:
         @par Thread Safety
         May be called concurrently
     */
-    Json::Value
+    json::Value
     getJson() const;
 
     using QuorumKeys = std::pair<std::size_t const, hash_set<PublicKey>>;
@@ -646,7 +646,7 @@ public:
     QuorumKeys
     getQuorumKeys() const
     {
-        shared_lock const read_lock{mutex_};
+        shared_lock const readLock{mutex_};
         return {quorum_, trustedSigningKeys_};
     }
 
@@ -743,7 +743,7 @@ private:
         @param hash Optional hash of the data parameters.
             Defaults to uninitialized
 
-        @return `ListDisposition::accepted`, plus some of the publisher
+        @return `ListDisposition::Accepted`, plus some of the publisher
             information, if list was successfully applied
 
         @par Thread Safety
@@ -809,7 +809,7 @@ private:
     /** Build a Json representation of the collection, suitable for
         writing to a cache file, or serving to a /vl/ query
     */
-    static Json::Value
+    static json::Value
     buildFileData(
         std::string const& pubKey,
         PublisherListCollection const& pubCollection,
@@ -818,7 +818,7 @@ private:
     /** Build a Json representation of the collection, suitable for
     writing to a cache file, or serving to a /vl/ query
     */
-    static Json::Value
+    static json::Value
     buildFileData(
         std::string const& pubKey,
         PublisherListCollection const& pubCollection,
@@ -840,7 +840,7 @@ private:
 
     /** Check response for trusted valid published list
 
-        @return `ListDisposition::accepted` if list can be applied
+        @return `ListDisposition::Accepted` if list can be applied
 
         @par Thread Safety
 
@@ -849,7 +849,7 @@ private:
     std::pair<ListDisposition, std::optional<PublicKey>>
     verify(
         scoped_lock const&,
-        Json::Value& list,
+        json::Value& list,
         Manifest manifest,
         std::string const& blob,
         std::string const& signature);
diff --git a/src/xrpld/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h
index 308b8f72bc..c4d2545217 100644
--- a/src/xrpld/app/misc/ValidatorSite.h
+++ b/src/xrpld/app/misc/ValidatorSite.h
@@ -65,9 +65,9 @@ private:
 
         struct Resource
         {
-            explicit Resource(std::string uri_);
+            explicit Resource(std::string uri);
             std::string const uri;
-            parsedURL pUrl;
+            ParsedUrl pUrl;
         };
 
         explicit Site(std::string uri);
@@ -171,7 +171,7 @@ public:
 
     /** Return JSON representation of configured validator sites
      */
-    Json::Value
+    json::Value
     getJson() const;
 
 private:
diff --git a/src/xrpld/app/misc/detail/AccountTxPaging.cpp b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
index d29bedc19d..183d1568e8 100644
--- a/src/xrpld/app/misc/detail/AccountTxPaging.cpp
+++ b/src/xrpld/app/misc/detail/AccountTxPaging.cpp
@@ -23,7 +23,7 @@ namespace xrpl {
 void
 convertBlobsToTxResult(
     RelationalDatabase::AccountTxs& to,
-    std::uint32_t ledger_index,
+    std::uint32_t ledgerIndex,
     std::string const& status,
     Blob const& rawTxn,
     Blob const& rawMeta,
@@ -35,20 +35,20 @@ convertBlobsToTxResult(
 
     auto tr = std::make_shared<Transaction>(txn, reason, app);
 
-    auto metaset = std::make_shared<TxMeta>(tr->getID(), ledger_index, rawMeta);
+    auto metaset = std::make_shared<TxMeta>(tr->getID(), ledgerIndex, rawMeta);
 
     // if properly formed meta is available we can use it to generate ctid
     if (metaset->getAsObject().isFieldPresent(sfTransactionIndex))
     {
         tr->setStatus(
             Transaction::sqlTransactionStatus(status),
-            ledger_index,
+            ledgerIndex,
             metaset->getAsObject().getFieldU32(sfTransactionIndex),
             app.getNetworkIDService().getNetworkID());
     }
     else
     {
-        tr->setStatus(Transaction::sqlTransactionStatus(status), ledger_index);
+        tr->setStatus(Transaction::sqlTransactionStatus(status), ledgerIndex);
     }
 
     to.emplace_back(std::move(tr), metaset);
diff --git a/src/xrpld/app/misc/detail/AccountTxPaging.h b/src/xrpld/app/misc/detail/AccountTxPaging.h
index 209ca67ab6..a895549322 100644
--- a/src/xrpld/app/misc/detail/AccountTxPaging.h
+++ b/src/xrpld/app/misc/detail/AccountTxPaging.h
@@ -11,7 +11,7 @@ namespace xrpl {
 void
 convertBlobsToTxResult(
     RelationalDatabase::AccountTxs& to,
-    std::uint32_t ledger_index,
+    std::uint32_t ledgerIndex,
     std::string const& status,
     Blob const& rawTxn,
     Blob const& rawMeta,
diff --git a/src/xrpld/app/misc/detail/AmendmentTable.cpp b/src/xrpld/app/misc/detail/AmendmentTable.cpp
index 1eee034a16..56b97d3f7e 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 re1(
+    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, re1))
+        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 expiresAfter = 24h;
+        static constexpr NetClock::duration kEXPIRES_AFTER = 24h;
 
-        auto const newTimeout = closeTime + expiresAfter;
+        auto const newTimeout = closeTime + kEXPIRES_AFTER;
 
         // Walk all validations and replace previous votes from trusted
         // validators with these newest votes.
@@ -286,7 +286,7 @@ public:
 struct AmendmentState
 {
     /** If an amendment is down-voted, a server will not vote to enable it */
-    AmendmentVote vote = AmendmentVote::down;
+    AmendmentVote vote = AmendmentVote::Down;
 
     /** Indicates that the amendment has been enabled.
         This is a one-way switch: once an amendment is enabled
@@ -330,8 +330,8 @@ public:
         threshold_ = std::max(
             1L,
             static_cast<long>(
-                (trustedValidations_ * amendmentMajorityCalcThreshold.num) /
-                amendmentMajorityCalcThreshold.den));
+                (trustedValidations_ * kAMENDMENT_MAJORITY_CALC_THRESHOLD.num) /
+                kAMENDMENT_MAJORITY_CALC_THRESHOLD.den));
     }
 
     [[nodiscard]] bool
@@ -427,7 +427,7 @@ private:
     // Injects amendment json into v.  Must be called with mutex_ locked.
     void
     injectJson(
-        Json::Value& v,
+        json::Value& v,
         uint256 const& amendment,
         AmendmentState const& state,
         bool isAdmin,
@@ -467,9 +467,9 @@ public:
     std::optional<NetClock::time_point>
     firstUnsupportedExpected() const override;
 
-    Json::Value
+    json::Value
     getJson(bool isAdmin) const override;
-    Json::Value
+    json::Value
     getJson(uint256 const&, bool isAdmin) const override;
 
     bool
@@ -528,25 +528,25 @@ AmendmentTableImpl::AmendmentTableImpl(
         switch (votebehavior)
         {
             case VoteBehavior::DefaultYes:
-                s.vote = AmendmentVote::up;
+                s.vote = AmendmentVote::Up;
                 break;
 
             case VoteBehavior::DefaultNo:
-                s.vote = AmendmentVote::down;
+                s.vote = AmendmentVote::Down;
                 break;
 
             case VoteBehavior::Obsolete:
-                s.vote = AmendmentVote::obsolete;
+                s.vote = AmendmentVote::Obsolete;
                 break;
         }
 
         JLOG(j_.debug()) << "Amendment " << amendment << " (" << s.name
                          << ") is supported and will be "
-                         << (s.vote == AmendmentVote::up ? "up" : "down")
+                         << (s.vote == AmendmentVote::Up ? "up" : "down")
                          << " voted by default if not enabled on the ledger.";
     }
 
-    hash_set<uint256> detect_conflict;
+    hash_set<uint256> detectConflict;
     // Parse enabled amendments from config
     for (std::pair<uint256, std::string> const& a : parseSection(enabled))
     {
@@ -558,8 +558,8 @@ AmendmentTableImpl::AmendmentTableImpl(
         }
 
         // Otherwise transfer config data into the table
-        detect_conflict.insert(a.first);
-        persistVote(a.first, a.second, AmendmentVote::up);
+        detectConflict.insert(a.first);
+        persistVote(a.first, a.second, AmendmentVote::Up);
     }
 
     // Parse vetoed amendments from config
@@ -573,9 +573,9 @@ AmendmentTableImpl::AmendmentTableImpl(
         }
 
         // Otherwise transfer config data into the table
-        if (!detect_conflict.contains(a.first))
+        if (!detectConflict.contains(a.first))
         {
-            persistVote(a.first, a.second, AmendmentVote::down);
+            persistVote(a.first, a.second, AmendmentVote::Down);
         }
         else
         {
@@ -589,44 +589,44 @@ AmendmentTableImpl::AmendmentTableImpl(
     auto db = db_.checkoutDb();
     readAmendments(
         *db,
-        [&](boost::optional<std::string> amendment_hash,
-            boost::optional<std::string> amendment_name,
+        [&](boost::optional<std::string> amendmentHash,
+            boost::optional<std::string> amendmentName,
             boost::optional<AmendmentVote> vote) {
-            uint256 amend_hash;
-            if (!amendment_hash || !amendment_name || !vote)
+            uint256 amendHash;
+            if (!amendmentHash || !amendmentName || !vote)
             {
                 // These fields should never have nulls, but check
                 Throw<std::runtime_error>("Invalid FeatureVotes row in wallet.db");
             }
-            if (!amend_hash.parseHex(*amendment_hash))
+            if (!amendHash.parseHex(*amendmentHash))
             {
                 Throw<std::runtime_error>(
-                    "Invalid amendment ID '" + *amendment_hash + " in wallet.db");
+                    "Invalid amendment ID '" + *amendmentHash + " in wallet.db");
             }
-            if (*vote == AmendmentVote::down)
+            if (*vote == AmendmentVote::Down)
             {
                 // Unknown amendments are effectively vetoed already
-                if (auto s = get(amend_hash, lock))
+                if (auto s = get(amendHash, lock))
                 {
-                    JLOG(j_.info()) << "Amendment {" << *amendment_name << ", " << amend_hash
+                    JLOG(j_.info()) << "Amendment {" << *amendmentName << ", " << amendHash
                                     << "} is downvoted.";
-                    if (!amendment_name->empty())
-                        s->name = *amendment_name;
+                    if (!amendmentName->empty())
+                        s->name = *amendmentName;
                     // An obsolete amendment's vote can never be changed
-                    if (s->vote != AmendmentVote::obsolete)
+                    if (s->vote != AmendmentVote::Obsolete)
                         s->vote = *vote;
                 }
             }
             else  // up-vote
             {
-                AmendmentState& s = add(amend_hash, lock);
+                AmendmentState& s = add(amendHash, lock);
 
-                JLOG(j_.debug()) << "Amendment {" << *amendment_name << ", " << amend_hash
+                JLOG(j_.debug()) << "Amendment {" << *amendmentName << ", " << amendHash
                                  << "} is upvoted.";
-                if (!amendment_name->empty())
-                    s.name = *amendment_name;
+                if (!amendmentName->empty())
+                    s.name = *amendmentName;
                 // An obsolete amendment's vote can never be changed
-                if (s.vote != AmendmentVote::obsolete)
+                if (s.vote != AmendmentVote::Obsolete)
                     s.vote = *vote;
             }
         });
@@ -679,7 +679,7 @@ AmendmentTableImpl::persistVote(
     AmendmentVote vote) const
 {
     XRPL_ASSERT(
-        vote != AmendmentVote::obsolete,
+        vote != AmendmentVote::Obsolete,
         "xrpl::AmendmentTableImpl::persistVote : valid vote input");
     auto db = db_.checkoutDb();
     voteAmendment(*db, amendment, name, vote);
@@ -691,9 +691,9 @@ AmendmentTableImpl::veto(uint256 const& amendment)
     std::scoped_lock const lock(mutex_);
     AmendmentState& s = add(amendment, lock);
 
-    if (s.vote != AmendmentVote::up)
+    if (s.vote != AmendmentVote::Up)
         return false;
-    s.vote = AmendmentVote::down;
+    s.vote = AmendmentVote::Down;
     persistVote(amendment, s.name, s.vote);
     return true;
 }
@@ -704,9 +704,9 @@ AmendmentTableImpl::unVeto(uint256 const& amendment)
     std::scoped_lock const lock(mutex_);
     AmendmentState* const s = get(amendment, lock);
 
-    if ((s == nullptr) || s->vote != AmendmentVote::down)
+    if ((s == nullptr) || s->vote != AmendmentVote::Down)
         return false;
-    s->vote = AmendmentVote::up;
+    s->vote = AmendmentVote::Up;
     persistVote(amendment, s->name, s->vote);
     return true;
 }
@@ -773,7 +773,7 @@ AmendmentTableImpl::doValidation(std::set<uint256> const& enabled) const
         amendments.reserve(amendmentMap_.size());
         for (auto const& e : amendmentMap_)
         {
-            if (e.second.supported && e.second.vote == AmendmentVote::up &&
+            if (e.second.supported && e.second.vote == AmendmentVote::Up &&
                 (!enabled.contains(e.first)))
             {
                 amendments.push_back(e.first);
@@ -849,7 +849,7 @@ AmendmentTableImpl::doVoting(
             return ss.str();
         }();
 
-        if (hasValMajority && !hasLedgerMajority && entry.second.vote == AmendmentVote::up)
+        if (hasValMajority && !hasLedgerMajority && entry.second.vote == AmendmentVote::Up)
         {
             // Ledger says no majority, validators say yes, and voting yes
             // locally
@@ -864,7 +864,7 @@ AmendmentTableImpl::doVoting(
         }
         else if (
             hasLedgerMajority && ((*majorityTime + majorityTime_) <= closeTime) &&
-            entry.second.vote == AmendmentVote::up)
+            entry.second.vote == AmendmentVote::Up)
         {
             // Ledger says majority held
             JLOG(j_.debug()) << logStr << ": amendment majority held";
@@ -943,7 +943,7 @@ AmendmentTableImpl::trustChanged(hash_set<PublicKey> const& allTrusted)
 
 void
 AmendmentTableImpl::injectJson(
-    Json::Value& v,
+    json::Value& v,
     uint256 const& id,
     AmendmentState const& fs,
     bool isAdmin,
@@ -955,13 +955,13 @@ AmendmentTableImpl::injectJson(
     v[jss::supported] = fs.supported;
     if (!fs.enabled && isAdmin)
     {
-        if (fs.vote == AmendmentVote::obsolete)
+        if (fs.vote == AmendmentVote::Obsolete)
         {
             v[jss::vetoed] = "Obsolete";
         }
         else
         {
-            v[jss::vetoed] = fs.vote == AmendmentVote::down;
+            v[jss::vetoed] = fs.vote == AmendmentVote::Down;
         }
     }
     v[jss::enabled] = fs.enabled;
@@ -980,32 +980,32 @@ AmendmentTableImpl::injectJson(
     }
 }
 
-Json::Value
+json::Value
 AmendmentTableImpl::getJson(bool isAdmin) const
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
     {
         std::scoped_lock const lock(mutex_);
         for (auto const& e : amendmentMap_)
         {
             injectJson(
-                ret[to_string(e.first)] = Json::objectValue, e.first, e.second, isAdmin, lock);
+                ret[to_string(e.first)] = json::ObjectValue, e.first, e.second, isAdmin, lock);
         }
     }
     return ret;
 }
 
-Json::Value
+json::Value
 AmendmentTableImpl::getJson(uint256 const& amendmentID, bool isAdmin) const
 {
-    Json::Value ret = Json::objectValue;
+    json::Value ret = json::ObjectValue;
 
     {
         std::scoped_lock const lock(mutex_);
         AmendmentState const* a = get(amendmentID, lock);
         if (a != nullptr)
         {
-            Json::Value& jAmendment = (ret[to_string(amendmentID)] = Json::objectValue);
+            json::Value& jAmendment = (ret[to_string(amendmentID)] = json::ObjectValue);
             injectJson(jAmendment, amendmentID, *a, isAdmin, lock);
         }
     }
@@ -1014,7 +1014,7 @@ AmendmentTableImpl::getJson(uint256 const& amendmentID, bool isAdmin) const
 }
 
 std::unique_ptr<AmendmentTable>
-make_AmendmentTable(
+makeAmendmentTable(
     ServiceRegistry& registry,
     std::chrono::seconds majorityTime,
     std::vector<AmendmentTable::FeatureInfo> const& supported,
diff --git a/src/xrpld/app/misc/detail/DeliverMax.cpp b/src/xrpld/app/misc/detail/DeliverMax.cpp
index 4e3d6563f9..add3cf89ee 100644
--- a/src/xrpld/app/misc/detail/DeliverMax.cpp
+++ b/src/xrpld/app/misc/detail/DeliverMax.cpp
@@ -6,15 +6,15 @@
 namespace xrpl::RPC {
 
 void
-insertDeliverMax(Json::Value& tx_json, TxType txnType, unsigned int apiVersion)
+insertDeliverMax(json::Value& txJson, TxType txnType, unsigned int apiVersion)
 {
-    if (tx_json.isMember(jss::Amount))
+    if (txJson.isMember(jss::Amount))
     {
         if (txnType == ttPAYMENT)
         {
-            tx_json[jss::DeliverMax] = tx_json[jss::Amount];
+            txJson[jss::DeliverMax] = txJson[jss::Amount];
             if (apiVersion > 1)
-                tx_json.removeMember(jss::Amount);
+                txJson.removeMember(jss::Amount);
         }
     }
 }
diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp
index 34a9613171..2975a5f622 100644
--- a/src/xrpld/app/misc/detail/Transaction.cpp
+++ b/src/xrpld/app/misc/detail/Transaction.cpp
@@ -36,11 +36,11 @@ Transaction::Transaction(
     std::shared_ptr<STTx const> const& stx,
     std::string& reason,
     Application& app) noexcept
-    : mTransaction(stx), mApp(app), j_(app.getJournal("Ledger"))
+    : transaction_(stx), app_(app), j_(app.getJournal("Ledger"))
 {
     try
     {
-        mTransactionID = mTransaction->getTransactionID();
+        transactionID_ = transaction_->getTransactionID();
     }
     catch (std::exception& e)
     {
@@ -48,7 +48,7 @@ Transaction::Transaction(
         return;
     }
 
-    mStatus = TransStatus::NEW;
+    status_ = TransStatus::NEW;
 }
 
 //
@@ -62,34 +62,34 @@ Transaction::setStatus(
     std::optional<std::uint32_t> tseq,
     std::optional<std::uint32_t> netID)
 {
-    mStatus = ts;
-    mLedgerIndex = lseq;
+    status_ = ts;
+    ledgerIndex_ = lseq;
     if (tseq)
-        mTxnSeq = tseq;
+        txnSeq_ = tseq;
     if (netID)
-        mNetworkID = netID;
+        networkID_ = netID;
 }
 
 TransStatus
 Transaction::sqlTransactionStatus(boost::optional<std::string> const& status)
 {
-    auto const c = (status) ? safe_cast<TxnSql>((*status)[0]) : TxnSql::txnSqlUnknown;
+    auto const c = (status) ? safeCast<TxnSql>((*status)[0]) : TxnSql::Unknown;
 
     switch (static_cast<TxnSql>(c))
     {
-        case TxnSql::txnSqlNew:
+        case TxnSql::New:
             return TransStatus::NEW;
-        case TxnSql::txnSqlConflict:
+        case TxnSql::Conflict:
             return TransStatus::CONFLICTED;
-        case TxnSql::txnSqlHeld:
+        case TxnSql::Held:
             return TransStatus::HELD;
-        case TxnSql::txnSqlValidated:
+        case TxnSql::Validated:
             return TransStatus::COMMITTED;
-        case TxnSql::txnSqlIncluded:
+        case TxnSql::Included:
             return TransStatus::INCLUDED;
         default:
             XRPL_ASSERT(
-                c == TxnSql::txnSqlUnknown,
+                c == TxnSql::Unknown,
                 "xrpl::Transaction::sqlTransactionStatus : unknown transaction status");
     }
 
@@ -116,7 +116,7 @@ Transaction::transactionFromSQL(
 }
 
 std::variant<std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>, TxSearched>
-Transaction::load(uint256 const& id, Application& app, error_code_i& ec)
+Transaction::load(uint256 const& id, Application& app, ErrorCodeI& ec)
 {
     return load(id, app, std::nullopt, ec);
 }
@@ -126,7 +126,7 @@ Transaction::load(
     uint256 const& id,
     Application& app,
     ClosedInterval<uint32_t> const& range,
-    error_code_i& ec)
+    ErrorCodeI& ec)
 {
     using op = std::optional<ClosedInterval<uint32_t>>;
 
@@ -138,7 +138,7 @@ Transaction::load(
     uint256 const& id,
     Application& app,
     std::optional<ClosedInterval<uint32_t>> const& range,
-    error_code_i& ec)
+    ErrorCodeI& ec)
 {
     auto& db = app.getRelationalDatabase();
 
@@ -146,41 +146,41 @@ Transaction::load(
 }
 
 // options 1 to include the date of the transaction
-Json::Value
+json::Value
 Transaction::getJson(JsonOptions options, bool binary) const
 {
     // Note, we explicitly suppress `include_date` option here
-    Json::Value ret(mTransaction->getJson(options & ~JsonOptions::include_date, binary));
+    json::Value ret(transaction_->getJson(options & ~JsonOptions::KIncludeDate, binary));
 
     // NOTE Binary STTx::getJson output might not be a JSON object
-    if (ret.isObject() && (mLedgerIndex != 0u))
+    if (ret.isObject() && (ledgerIndex_ != 0u))
     {
-        if (!(options & JsonOptions::disable_API_prior_V2))
+        if (!(options & JsonOptions::KDisableApiPriorV2))
         {
             // Behaviour before API version 2
-            ret[jss::inLedger] = mLedgerIndex;
+            ret[jss::inLedger] = ledgerIndex_;
         }
 
         // TODO: disable_API_prior_V3 to disable output of both `date` and
         // `ledger_index` elements (taking precedence over include_date)
-        ret[jss::ledger_index] = mLedgerIndex;
+        ret[jss::ledger_index] = ledgerIndex_;
 
-        if (options & JsonOptions::include_date)
+        if (options & JsonOptions::KIncludeDate)
         {
-            auto ct = mApp.getLedgerMaster().getCloseTimeBySeq(mLedgerIndex);
+            auto ct = app_.getLedgerMaster().getCloseTimeBySeq(ledgerIndex_);
             if (ct)
                 ret[jss::date] = ct->time_since_epoch().count();
         }
 
         // compute outgoing CTID
         // override local network id if it's explicitly in the txn
-        std::optional netID = mNetworkID;
-        if (mTransaction->isFieldPresent(sfNetworkID))
-            netID = mTransaction->getFieldU32(sfNetworkID);
+        std::optional netID = networkID_;
+        if (transaction_->isFieldPresent(sfNetworkID))
+            netID = transaction_->getFieldU32(sfNetworkID);
 
-        if (mTxnSeq && netID)
+        if (txnSeq_ && netID)
         {
-            std::optional<std::string> const ctid = RPC::encodeCTID(mLedgerIndex, *mTxnSeq, *netID);
+            std::optional<std::string> const ctid = RPC::encodeCTID(ledgerIndex_, *txnSeq_, *netID);
             if (ctid)
                 ret[jss::ctid] = *ctid;
         }
diff --git a/src/xrpld/app/misc/detail/TxQ.cpp b/src/xrpld/app/misc/detail/TxQ.cpp
index 3e4a420e48..8b478f964e 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::baseLevel, baseFee)
+    return mulDiv(effectiveFeePaid, TxQ::kBASE_LEVEL, 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::muldiv_max));
+        .value_or(static_cast<FeeLevel64>(xrpl::kMULDIV_MAX));
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -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::muldiv_max), minimumTxnCount_);
+            mulDiv(txnsExpected_, cutPct, 100).value_or(xrpl::kMULDIV_MAX), minimumTxnCount_);
         txnsExpected_ = std::clamp<std::uint64_t>(
-            mulDiv(size, cutPct, 100).value_or(xrpl::muldiv_max), minimumTxnCount_, upperLimit);
+            mulDiv(size, cutPct, 100).value_or(xrpl::kMULDIV_MAX), minimumTxnCount_, upperLimit);
         recentTxnCounts_.clear();
     }
     else if (size > txnsExpected_ || size > targetTxnCount_)
     {
         recentTxnCounts_.push_back(mulDiv(size, 100 + setup.normalConsensusIncreasePercent, 100)
-                                       .value_or(xrpl::muldiv_max));
+                                       .value_or(xrpl::kMULDIV_MAX));
         auto const iter = std::ranges::max_element(recentTxnCounts_);
         BOOST_ASSERT(iter != recentTxnCounts_.end());
         auto const next = [&] {
@@ -194,10 +194,10 @@ 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::muldiv_max));
+            .value_or(static_cast<FeeLevel64>(xrpl::kMULDIV_MAX));
     }
 
-    return baseLevel;
+    return kBASE_LEVEL;
 }
 
 namespace detail {
@@ -284,19 +284,19 @@ TxQ::FeeMetrics::escalatedSeriesFeeLevel(
 LedgerHash TxQ::MaybeTx::parentHashComp{};
 
 TxQ::MaybeTx::MaybeTx(
-    std::shared_ptr<STTx const> const& txn_,
-    TxID const& txID_,
-    FeeLevel64 feeLevel_,
-    ApplyFlags const flags_,
-    PreflightResult const& pfResult_)
-    : txn(txn_)
-    , feeLevel(feeLevel_)
-    , txID(txID_)
-    , account(txn_->getAccountID(sfAccount))
-    , lastValid(getLastLedgerSequence(*txn_))
-    , seqProxy(txn_->getSeqProxy())
-    , flags(flags_)
-    , pfResult(pfResult_)
+    std::shared_ptr<STTx const> const& txn,
+    TxID const& txId,
+    FeeLevel64 feeLevel,
+    ApplyFlags const flags,
+    PreflightResult const& pfResult)
+    : txn(txn)
+    , feeLevel(feeLevel)
+    , txID(txId)
+    , account(txn->getAccountID(sfAccount))
+    , lastValid(getLastLedgerSequence(*txn))
+    , seqProxy(txn->getSeqProxy())
+    , flags(flags)
+    , pfResult(pfResult)
 {
 }
 
@@ -328,7 +328,7 @@ TxQ::TxQAccount::TxQAccount(std::shared_ptr<STTx const> const& txn)
 {
 }
 
-TxQ::TxQAccount::TxQAccount(AccountID const& account_) : account(account_)
+TxQ::TxQAccount::TxQAccount(AccountID const& account) : account(account)
 {
 }
 
@@ -374,12 +374,12 @@ TxQ::~TxQ()
     byFee_.clear();
 }
 
-template <size_t fillPercentage>
+template <size_t FillPercentage>
 bool
 TxQ::isFull() const
 {
-    static_assert(fillPercentage > 0 && fillPercentage <= 100, "Invalid fill percentage");
-    return maxSize_ && byFee_.size() >= (*maxSize_ * fillPercentage / 100);
+    static_assert(FillPercentage > 0 && FillPercentage <= 100, "Invalid fill percentage");
+    return maxSize_ && byFee_.size() >= (*maxSize_ * FillPercentage / 100);
 }
 
 TER
@@ -397,7 +397,7 @@ TxQ::canBeHeld(
     // queue yet, but should be added in the future.
     // tapFAIL_HARD transactions are never held
     if (tx.isFieldPresent(sfPreviousTxnID) || tx.isFieldPresent(sfAccountTxnID) ||
-        ((flags & tapFAIL_HARD) != 0u))
+        ((flags & TapFailHard) != 0u))
         return telCAN_NOT_QUEUE;
 
     {
@@ -761,7 +761,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::ticket(account, txSeqProx)))
+    if (txSeqProx.isTicket() && !view.exists(keylet::kTICKET(account, txSeqProx)))
     {
         if (txSeqProx.value() < acctSeqProx.value())
         {
@@ -791,8 +791,8 @@ TxQ::apply(
     // to individually check each queued ticket against the ledger.
     struct TxIter
     {
-        TxIter(TxQAccount::TxMap::iterator first_, TxQAccount::TxMap::iterator end_)
-            : first(first_), end(end_)
+        TxIter(TxQAccount::TxMap::iterator first, TxQAccount::TxMap::iterator end)
+            : first(first), end(end)
         {
         }
 
@@ -1027,8 +1027,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::zero;
-            XRPAmount totalFee = beast::zero;
+            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
@@ -1151,7 +1151,7 @@ TxQ::apply(
         return {pcresult.ter, false};
 
     // Too low of a fee should get caught by preclaim
-    XRPL_ASSERT(feeLevelPaid >= baseLevel, "xrpl::TxQ::apply : minimum fee");
+    XRPL_ASSERT(feeLevelPaid >= kBASE_LEVEL, "xrpl::TxQ::apply : minimum fee");
 
     JLOG(j_.trace()) << "Transaction " << transactionID << " from account " << account
                      << " has fee level of " << feeLevelPaid << " needs at least "
@@ -1176,10 +1176,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::retriesAllowed &&
-        feeLevelPaid > requiredFeeLevel && requiredFeeLevel > baseLevel)
+        txIter->first->second.retriesRemaining == MaybeTx::kRETRIES_ALLOWED &&
+        feeLevelPaid > requiredFeeLevel && requiredFeeLevel > kBASE_LEVEL)
     {
-        OpenView sandbox(open_ledger, &view, view.rules());
+        OpenView sandbox(kOPEN_LEDGER, &view, view.rules());
 
         auto result = tryClearAccountQueueUpThruTx(
             app,
@@ -1246,7 +1246,7 @@ TxQ::apply(
             if (lastRIter->feeLevel > feeLevelPaid || endAccount.transactions.size() == 1)
                 return lastRIter->feeLevel;
 
-            constexpr FeeLevel64 max{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(),
@@ -1255,8 +1255,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 >= max - next || total.second >= max - mod)
-                        return {max, FeeLevel64{0}};
+                    if (total.first >= kMAX - next || total.second >= kMAX - mod)
+                        return {kMAX, FeeLevel64{0}};
 
                     return {total.first + next, total.second + mod};
                 });
@@ -1302,7 +1302,7 @@ TxQ::apply(
     // will not be checked again, so the cost should be minimal.
 
     // Don't allow soft failures, which can lead to retries
-    flags &= ~tapRETRY;
+    flags &= ~TapRetry;
 
     auto& candidate = accountIter->second.add({tx, transactionID, feeLevelPaid, flags, pfResult});
 
@@ -1430,7 +1430,7 @@ TxQ::accept(Application& app, OpenView& view)
             candidateIter++;
             continue;
         }
-        auto const requiredFeeLevel = getRequiredFeeLevel(view, tapNONE, metricsSnapshot, lock);
+        auto const requiredFeeLevel = getRequiredFeeLevel(view, TapNone, metricsSnapshot, lock);
         auto const feeLevelPaid = candidateIter->feeLevel;
         JLOG(j_.trace()) << "Queued transaction " << candidateIter->txID << " from account "
                          << candidateIter->account << " has fee level of " << feeLevelPaid
@@ -1747,8 +1747,9 @@ TxQ::getMetrics(OpenView const& view) const
     result.txQMaxSize = maxSize_;
     result.txInLedger = view.txCount();
     result.txPerLedger = snapshot.txnsExpected;
-    result.referenceFeeLevel = baseLevel;
-    result.minProcessingFeeLevel = isFull() ? byFee_.rbegin()->feeLevel + FeeLevel64{1} : baseLevel;
+    result.referenceFeeLevel = kBASE_LEVEL;
+    result.minProcessingFeeLevel =
+        isFull() ? byFee_.rbegin()->feeLevel + FeeLevel64{1} : kBASE_LEVEL;
     result.medFeeLevel = snapshot.escalationMultiplier;
     result.openLedgerFeeLevel = FeeMetrics::scaleFeeLevel(snapshot, view);
 
@@ -1771,7 +1772,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, baseLevel)
+        .fee = mulDiv(fee, baseFee, kBASE_LEVEL)
                    .value_or(XRPAmount(std::numeric_limits<std::int64_t>::max())),
         .accountSeq = accountSeq,
         .availableSeq = availableSeq};
@@ -1812,7 +1813,7 @@ TxQ::getTxs() const
     return result;
 }
 
-Json::Value
+json::Value
 TxQ::doRPC(Application& app) const
 {
     auto const view = app.getOpenLedger().current();
@@ -1824,9 +1825,9 @@ TxQ::doRPC(Application& app) const
 
     auto const metrics = getMetrics(*view);
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
-    auto& levels = ret[jss::levels] = Json::objectValue;
+    auto& levels = ret[jss::levels] = json::ObjectValue;
 
     ret[jss::ledger_current_index] = view->header().seq;
     ret[jss::expected_ledger_size] = std::to_string(metrics.txPerLedger);
@@ -1849,7 +1850,7 @@ TxQ::doRPC(Application& app) const
             return XRPAmount{1};
         return baseFee;
     }();
-    auto& drops = ret[jss::drops] = Json::Value();
+    auto& drops = ret[jss::drops] = json::Value();
 
     drops[jss::base_fee] = to_string(baseFee);
     drops[jss::median_fee] = to_string(toDrops(metrics.medFeeLevel, baseFee));
@@ -1867,7 +1868,7 @@ TxQ::doRPC(Application& app) const
 //////////////////////////////////////////////////////////////////////////
 
 TxQ::Setup
-setup_TxQ(Config const& config)
+setupTxQ(Config const& config)
 {
     TxQ::Setup setup;
     auto const& section = config.section("transaction_queue");
@@ -1905,7 +1906,7 @@ setup_TxQ(Config const& config)
        MAXINT, but put a reasonable limit on this percentage so that
        the factor can't be configured to render escalation effectively
        moot. (There are other ways to do that, including
-       minimum_txn_in_ledger.)
+       minimum_txn_in_ledger_.)
     */
     set(setup.normalConsensusIncreasePercent, "normal_consensus_increase_percent", section);
     setup.normalConsensusIncreasePercent =
diff --git a/src/xrpld/app/misc/detail/ValidatorKeys.cpp b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
index bd9c723acb..0380e2e294 100644
--- a/src/xrpld/app/misc/detail/ValidatorKeys.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorKeys.cpp
@@ -30,8 +30,8 @@ ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j)
         // token is non-const so it can be moved from
         if (auto token = loadValidatorToken(config.section(SECTION_VALIDATOR_TOKEN).lines()))
         {
-            auto const pk = derivePublicKey(KeyType::secp256k1, token->validationSecret);
-            auto const m = deserializeManifest(base64_decode(token->manifest));
+            auto const pk = derivePublicKey(KeyType::Secp256k1, token->validationSecret);
+            auto const m = deserializeManifest(base64Decode(token->manifest));
 
             if (!m || pk != m->signingKey)
             {
@@ -63,8 +63,8 @@ ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j)
         }
         else
         {
-            SecretKey const sk = generateSecretKey(KeyType::secp256k1, *seed);
-            PublicKey const pk = derivePublicKey(KeyType::secp256k1, sk);
+            SecretKey const sk = generateSecretKey(KeyType::Secp256k1, *seed);
+            PublicKey const pk = derivePublicKey(KeyType::Secp256k1, sk);
             keys.emplace(pk, pk, sk);
             nodeID = calcNodeID(pk);
             sequence = 0;
diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp
index b9a32f1463..1576d398f8 100644
--- a/src/xrpld/app/misc/detail/ValidatorList.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorList.cpp
@@ -64,23 +64,23 @@ to_string(ListDisposition disposition)
 {
     switch (disposition)
     {
-        case ListDisposition::accepted:
+        case ListDisposition::Accepted:
             return "accepted";
-        case ListDisposition::expired:
+        case ListDisposition::Expired:
             return "expired";
-        case ListDisposition::same_sequence:
+        case ListDisposition::SameSequence:
             return "same_sequence";
-        case ListDisposition::pending:
+        case ListDisposition::Pending:
             return "pending";
-        case ListDisposition::known_sequence:
+        case ListDisposition::KnownSequence:
             return "known_sequence";
-        case ListDisposition::unsupported_version:
+        case ListDisposition::UnsupportedVersion:
             return "unsupported_version";
-        case ListDisposition::untrusted:
+        case ListDisposition::Untrusted:
             return "untrusted";
-        case ListDisposition::stale:
+        case ListDisposition::Stale:
             return "stale";
-        case ListDisposition::invalid:
+        case ListDisposition::Invalid:
             return "invalid";
     }
     return "unknown";
@@ -104,13 +104,13 @@ ValidatorList::PublisherListStats::PublisherListStats(
 ListDisposition
 ValidatorList::PublisherListStats::bestDisposition() const
 {
-    return dispositions.empty() ? ListDisposition::invalid : dispositions.begin()->first;
+    return dispositions.empty() ? ListDisposition::Invalid : dispositions.begin()->first;
 }
 
 ListDisposition
 ValidatorList::PublisherListStats::worstDisposition() const
 {
-    return dispositions.empty() ? ListDisposition::invalid : dispositions.rbegin()->first;
+    return dispositions.empty() ? ListDisposition::Invalid : dispositions.rbegin()->first;
 }
 
 void
@@ -123,14 +123,14 @@ ValidatorList::PublisherListStats::mergeDispositions(PublisherListStats const& s
 }
 
 ValidatorList::MessageWithHash::MessageWithHash(
-    std::shared_ptr<Message> const& message_,
-    uint256 hash_,
-    std::size_t num_)
-    : message(message_), hash(hash_), numVLs(num_)
+    std::shared_ptr<Message> const& message,
+    uint256 hash,
+    std::size_t num)
+    : message(message), hash(hash), numVLs(num)
 {
 }
 
-std::string const ValidatorList::filePrefix_ = "cache.";
+std::string const ValidatorList::kFILE_PREFIX = "cache.";
 
 ValidatorList::ValidatorList(
     ManifestCache& validatorManifests,
@@ -157,7 +157,7 @@ ValidatorList::load(
     std::vector<std::string> const& publisherKeys,
     std::optional<std::size_t> listThreshold)
 {
-    static boost::regex const re(
+    static boost::regex const kRE(
         "[[:space:]]*"       // skip leading whitespace
         "([[:alnum:]]+)"     // node identity
         "(?:"                // begin optional comment block
@@ -187,12 +187,12 @@ ValidatorList::load(
         }
 
         auto id = PublicKey(makeSlice(*ret));
-        auto status = PublisherStatus::unavailable;
+        auto status = PublisherStatus::Unavailable;
 
         if (publisherManifests_.revoked(id))
         {
             JLOG(j_.warn()) << "Configured validator list publisher key is revoked: " << key;
-            status = PublisherStatus::revoked;
+            status = PublisherStatus::Revoked;
         }
 
         if (publisherLists_.contains(id))
@@ -249,7 +249,7 @@ ValidatorList::load(
 
         boost::smatch match;
 
-        if (!boost::regex_match(n, match, re))
+        if (!boost::regex_match(n, match, kRE))
         {
             JLOG(j_.error()) << "Malformed entry: '" << n << "'";
             return false;
@@ -273,7 +273,7 @@ ValidatorList::load(
             JLOG(j_.warn()) << "Duplicate node identity: " << match[1];
             continue;
         }
-        localPublisherList.list.emplace_back(*id);
+        localPublisherList_.list.emplace_back(*id);
         ++count;
     }
 
@@ -281,7 +281,7 @@ ValidatorList::load(
     // set the expiration time for the newly created publisher list
     // exactly once
     if (count > 0)
-        localPublisherList.validUntil = TimeKeeper::time_point::max();
+        localPublisherList_.validUntil = TimeKeeper::time_point::max();
 
     JLOG(j_.debug()) << "Loaded " << count << " entries";
 
@@ -291,11 +291,11 @@ ValidatorList::load(
 boost::filesystem::path
 ValidatorList::getCacheFileName(ValidatorList::scoped_lock const&, PublicKey const& pubKey) const
 {
-    return dataPath_ / (filePrefix_ + strHex(pubKey));
+    return dataPath_ / (kFILE_PREFIX + strHex(pubKey));
 }
 
 // static
-Json::Value
+json::Value
 ValidatorList::buildFileData(
     std::string const& pubKey,
     ValidatorList::PublisherListCollection const& pubCollection,
@@ -305,14 +305,14 @@ ValidatorList::buildFileData(
 }
 
 // static
-Json::Value
+json::Value
 ValidatorList::buildFileData(
     std::string const& pubKey,
     ValidatorList::PublisherListCollection const& pubCollection,
     std::optional<std::uint32_t> forceVersion,
     beast::Journal j)
 {
-    Json::Value value(Json::objectValue);
+    json::Value value(json::ObjectValue);
 
     XRPL_ASSERT(
         pubCollection.rawVersion == 2 || pubCollection.remaining.empty(),
@@ -336,11 +336,11 @@ ValidatorList::buildFileData(
             break;
         }
         case 2: {
-            Json::Value blobs(Json::arrayValue);
+            json::Value blobs(json::ArrayValue);
 
             auto add = [&blobs,
                         &outerManifest = pubCollection.rawManifest](PublisherList const& pubList) {
-                auto& blob = blobs.append(Json::objectValue);
+                auto& blob = blobs.append(json::ObjectValue);
                 blob[jss::blob] = pubList.rawBlob;
                 blob[jss::signature] = pubList.rawSignature;
                 if (pubList.rawManifest && *pubList.rawManifest != outerManifest)
@@ -359,7 +359,7 @@ ValidatorList::buildFileData(
         }
         default:
             JLOG(j.trace()) << "Invalid VL version provided: " << effectiveVersion;
-            value = Json::nullValue;
+            value = json::NullValue;
     }
 
     return value;
@@ -376,7 +376,7 @@ ValidatorList::cacheValidatorFile(ValidatorList::scoped_lock const& lock, Public
 
     boost::system::error_code ec;
 
-    Json::Value value = buildFileData(strHex(pubKey), publisherLists_.at(pubKey), j_);
+    json::Value value = buildFileData(strHex(pubKey), publisherLists_.at(pubKey), j_);
     // xrpld should be the only process writing to this file, so
     // if it ever needs to be read, it is not expected to change externally, so
     // delay the refresh as long as possible: 24 hours. (See also
@@ -395,7 +395,7 @@ ValidatorList::cacheValidatorFile(ValidatorList::scoped_lock const& lock, Public
 
 // static
 std::vector<ValidatorBlobInfo>
-ValidatorList::parseBlobs(std::uint32_t version, Json::Value const& body)
+ValidatorList::parseBlobs(std::uint32_t version, json::Value const& body)
 {
     std::vector<ValidatorBlobInfo> result;
     switch (version)
@@ -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() > maxSupportedBlobs ||
+                body[jss::blobs_v2].size() > kMAX_SUPPORTED_BLOBS ||
                 // 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() > maxSupportedBlobs)
+    if (body.blobs_size() > kMAX_SUPPORTED_BLOBS)
         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) <= maximumMessageSize,
+            Message::totalSize(smallMsg) <= kMAXIMUM_MESSAGE_SIZE,
             "xrpl::splitMessageParts : maximum message size");
 
         messages.emplace_back(
@@ -593,7 +593,7 @@ buildValidatorListMessage(
     msg.set_version(version);
 
     XRPL_ASSERT(
-        Message::totalSize(msg) <= maximumMessageSize,
+        Message::totalSize(msg) <= kMAXIMUM_MESSAGE_SIZE,
         "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 /*= maximumMessageSize*/)
+    std::size_t maxSize /*= kMAXIMUM_MESSAGE_SIZE*/)
 {
     XRPL_ASSERT(
         !blobInfos.empty(),
@@ -923,7 +923,7 @@ ValidatorList::applyListsAndBroadcast(
     auto const result = applyLists(manifest, version, blobs, std::move(siteUri), hash);
     auto const disposition = result.bestDisposition();
 
-    if (disposition == ListDisposition::accepted)
+    if (disposition == ListDisposition::Accepted)
     {
         bool good = true;
 
@@ -931,7 +931,7 @@ ValidatorList::applyListsAndBroadcast(
         // from the below check.
         for (auto const& [_, listCollection] : publisherLists_)
         {
-            if (listCollection.status != PublisherStatus::available)
+            if (listCollection.status != PublisherStatus::Available)
             {
                 good = false;
                 break;
@@ -942,12 +942,12 @@ ValidatorList::applyListsAndBroadcast(
             networkOPs.clearUNLBlocked();
         }
     }
-    bool const broadcast = disposition <= ListDisposition::known_sequence;
+    bool const broadcast = disposition <= ListDisposition::KnownSequence;
 
     // this function is only called for PublicKeys which are not specified
     // in the config file (Note: Keys specified in the local config file are
     // stored in ValidatorList::localPublisherList data member).
-    if (broadcast && result.status <= PublisherStatus::expired && result.publisherKey &&
+    if (broadcast && result.status <= PublisherStatus::Expired && result.publisherKey &&
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access) publisherKey checked in condition
         // above
         publisherLists_[*result.publisherKey].maxSequence)
@@ -978,9 +978,9 @@ ValidatorList::applyLists(
     std::string siteUri,
     std::optional<uint256> const& hash /* = {} */)
 {
-    if (std::count(std::begin(supportedListVersions), std::end(supportedListVersions), version) !=
-        1)
-        return PublisherListStats{ListDisposition::unsupported_version};
+    if (std::count(
+            std::begin(kSUPPORTED_LIST_VERSIONS), std::end(kSUPPORTED_LIST_VERSIONS), version) != 1)
+        return PublisherListStats{ListDisposition::UnsupportedVersion};
 
     std::scoped_lock const lock{mutex_};
 
@@ -1094,7 +1094,7 @@ ValidatorList::updatePublisherList(
 
     for (auto const& valManifest : manifests)
     {
-        auto m = deserializeManifest(base64_decode(valManifest));
+        auto m = deserializeManifest(base64Decode(valManifest));
 
         if (!m || !keyListings_.contains(m->masterKey))
         {
@@ -1104,7 +1104,7 @@ ValidatorList::updatePublisherList(
         }
 
         if (auto const r = validatorManifests_.applyManifest(std::move(*m));
-            r == ManifestDisposition::invalid)
+            r == ManifestDisposition::Invalid)
         {
             JLOG(j_.warn()) << "List for " << strHex(pubKey)
                             << " contained invalid validator manifest";
@@ -1125,13 +1125,13 @@ ValidatorList::applyList(
 {
     using namespace std::string_literals;
 
-    Json::Value list;
+    json::Value list;
     auto const& manifest = localManifest ? *localManifest : globalManifest;
-    auto m = deserializeManifest(base64_decode(manifest));
+    auto m = deserializeManifest(base64Decode(manifest));
     if (!m)
     {
         JLOG(j_.warn()) << "UNL manifest cannot be deserialized";
-        return PublisherListStats{ListDisposition::invalid};
+        return PublisherListStats{ListDisposition::Invalid};
     }
 
     auto [result, pubKeyOpt] = verify(lock, list, std::move(*m), blob, signature);
@@ -1155,14 +1155,14 @@ ValidatorList::applyList(
     }
 
     PublicKey const pubKey = *pubKeyOpt;
-    if (result > ListDisposition::pending)
+    if (result > ListDisposition::Pending)
     {
         if (publisherLists_.contains(pubKey))
         {
             auto const& pubCollection = publisherLists_[pubKey];
             if (pubCollection.maxSequence &&
-                (result == ListDisposition::same_sequence ||
-                 result == ListDisposition::known_sequence))
+                (result == ListDisposition::SameSequence ||
+                 result == ListDisposition::KnownSequence))
             {
                 // We've seen something valid list for this publisher
                 // already, so return what we know about it.
@@ -1177,18 +1177,18 @@ ValidatorList::applyList(
     auto& pubCollection = publisherLists_[pubKey];
     auto const sequence = list[jss::sequence].asUInt();
     auto const accepted =
-        (result == ListDisposition::accepted || result == ListDisposition::expired);
+        (result == ListDisposition::Accepted || result == ListDisposition::Expired);
 
     if (accepted)
     {
-        pubCollection.status = result == ListDisposition::accepted ? PublisherStatus::available
-                                                                   : PublisherStatus::expired;
+        pubCollection.status = result == ListDisposition::Accepted ? PublisherStatus::Available
+                                                                   : PublisherStatus::Expired;
     }
     pubCollection.rawManifest = globalManifest;
     if (!pubCollection.maxSequence || sequence > *pubCollection.maxSequence)
         pubCollection.maxSequence = sequence;
 
-    Json::Value const& newList = list[jss::validators];
+    json::Value const& newList = list[jss::validators];
     std::vector<PublicKey> oldList;
     if (accepted && pubCollection.remaining.contains(sequence))
     {
@@ -1294,7 +1294,7 @@ ValidatorList::loadLists()
     {
         boost::system::error_code ec;
 
-        if (publisherCollection.status == PublisherStatus::available)
+        if (publisherCollection.status == PublisherStatus::Available)
             continue;
 
         boost::filesystem::path const filename = getCacheFileName(lock, pubKey);
@@ -1337,39 +1337,39 @@ ValidatorList::loadLists()
 std::pair<ListDisposition, std::optional<PublicKey>>
 ValidatorList::verify(
     ValidatorList::scoped_lock const& lock,
-    Json::Value& list,
+    json::Value& list,
     Manifest manifest,
     std::string const& blob,
     std::string const& signature)
 {
     if (!publisherLists_.contains(manifest.masterKey))
-        return {ListDisposition::untrusted, {}};
+        return {ListDisposition::Untrusted, {}};
 
     PublicKey masterPubKey = manifest.masterKey;
     auto const revoked = manifest.revoked();
 
     auto const result = publisherManifests_.applyManifest(std::move(manifest));
 
-    if (revoked && result == ManifestDisposition::accepted)
+    if (revoked && result == ManifestDisposition::Accepted)
     {
-        removePublisherList(lock, masterPubKey, PublisherStatus::revoked);
+        removePublisherList(lock, masterPubKey, PublisherStatus::Revoked);
         // If the manifest is revoked, no future list is valid either
         publisherLists_[masterPubKey].remaining.clear();
     }
 
     auto const signingKey = publisherManifests_.getSigningKey(masterPubKey);
 
-    if (revoked || !signingKey || result == ManifestDisposition::invalid)
-        return {ListDisposition::untrusted, masterPubKey};
+    if (revoked || !signingKey || result == ManifestDisposition::Invalid)
+        return {ListDisposition::Untrusted, masterPubKey};
 
     auto const sig = strUnHex(signature);
-    auto const data = base64_decode(blob);
+    auto const data = base64Decode(blob);
     if (!sig || !xrpl::verify(*signingKey, makeSlice(data), makeSlice(*sig)))
-        return {ListDisposition::invalid, masterPubKey};
+        return {ListDisposition::Invalid, masterPubKey};
 
-    Json::Reader r;
+    json::Reader r;
     if (!r.parse(data, list))
-        return {ListDisposition::invalid, masterPubKey};
+        return {ListDisposition::Invalid, masterPubKey};
 
     if (list.isMember(jss::sequence) && list[jss::sequence].isInt() &&
         list.isMember(jss::expiration) && list[jss::expiration].isInt() &&
@@ -1385,19 +1385,19 @@ ValidatorList::verify(
         auto const& listCollection = publisherLists_[masterPubKey];
         if (validUntil <= validFrom)
         {
-            return {ListDisposition::invalid, masterPubKey};
+            return {ListDisposition::Invalid, masterPubKey};
         }
         if (sequence < listCollection.current.sequence)
         {
-            return {ListDisposition::stale, masterPubKey};
+            return {ListDisposition::Stale, masterPubKey};
         }
         if (sequence == listCollection.current.sequence)
         {
-            return {ListDisposition::same_sequence, masterPubKey};
+            return {ListDisposition::SameSequence, masterPubKey};
         }
         if (validUntil <= now)
         {
-            return {ListDisposition::expired, masterPubKey};
+            return {ListDisposition::Expired, masterPubKey};
         }
         if (validFrom > now)
         {
@@ -1414,22 +1414,22 @@ ValidatorList::verify(
             return !listCollection.maxSequence || sequence > *listCollection.maxSequence ||
                     (!listCollection.remaining.contains(sequence) &&
                      validFrom < listCollection.remaining.at(*listCollection.maxSequence).validFrom)
-                ? std::make_pair(ListDisposition::pending, masterPubKey)
-                : std::make_pair(ListDisposition::known_sequence, masterPubKey);
+                ? std::make_pair(ListDisposition::Pending, masterPubKey)
+                : std::make_pair(ListDisposition::KnownSequence, masterPubKey);
         }
     }
     else
     {
-        return {ListDisposition::invalid, masterPubKey};
+        return {ListDisposition::Invalid, masterPubKey};
     }
 
-    return {ListDisposition::accepted, masterPubKey};
+    return {ListDisposition::Accepted, masterPubKey};
 }
 
 bool
 ValidatorList::listed(PublicKey const& identity) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
     auto const pubKey = validatorManifests_.getMasterKey(identity);
     return keyListings_.contains(pubKey);
@@ -1445,14 +1445,14 @@ ValidatorList::trusted(ValidatorList::shared_lock const&, PublicKey const& ident
 bool
 ValidatorList::trusted(PublicKey const& identity) const
 {
-    std::shared_lock const read_lock{mutex_};
-    return trusted(read_lock, identity);
+    std::shared_lock const readLock{mutex_};
+    return trusted(readLock, identity);
 }
 
 std::optional<PublicKey>
 ValidatorList::getListedKey(PublicKey const& identity) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
     auto pubKey = validatorManifests_.getMasterKey(identity);
     if (keyListings_.contains(pubKey))
@@ -1472,23 +1472,23 @@ ValidatorList::getTrustedKey(ValidatorList::shared_lock const&, PublicKey const&
 std::optional<PublicKey>
 ValidatorList::getTrustedKey(PublicKey const& identity) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
-    return getTrustedKey(read_lock, identity);
+    return getTrustedKey(readLock, identity);
 }
 
 bool
 ValidatorList::trustedPublisher(PublicKey const& identity) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
     return (identity.size() != 0u) && publisherLists_.contains(identity) &&
-        publisherLists_.at(identity).status < PublisherStatus::revoked;
+        publisherLists_.at(identity).status < PublisherStatus::Revoked;
 }
 
 std::optional<PublicKey>
 ValidatorList::localPublicKey() const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
     return localPubKey_;
 }
 
@@ -1499,7 +1499,7 @@ ValidatorList::removePublisherList(
     PublisherStatus reason)
 {
     XRPL_ASSERT(
-        reason != PublisherStatus::available && reason != PublisherStatus::unavailable,
+        reason != PublisherStatus::Available && reason != PublisherStatus::Unavailable,
         "xrpl::ValidatorList::removePublisherList : valid reason input");
     auto const iList = publisherLists_.find(publisherKey);
     if (iList == publisherLists_.end())
@@ -1532,14 +1532,14 @@ ValidatorList::removePublisherList(
 std::size_t
 ValidatorList::count(ValidatorList::shared_lock const&) const
 {
-    return publisherLists_.size() + static_cast<size_t>(!localPublisherList.list.empty());
+    return publisherLists_.size() + static_cast<size_t>(!localPublisherList_.list.empty());
 }
 
 std::size_t
 ValidatorList::count() const
 {
-    std::shared_lock const read_lock{mutex_};
-    return count(read_lock);
+    std::shared_lock const readLock{mutex_};
+    return count(readLock);
 }
 
 std::optional<TimeKeeper::time_point>
@@ -1579,9 +1579,9 @@ ValidatorList::expires(ValidatorList::shared_lock const&) const
         }
     }
 
-    if (!localPublisherList.list.empty())
+    if (!localPublisherList_.list.empty())
     {
-        PublisherList const collection = localPublisherList;
+        PublisherList const collection = localPublisherList_;
         // Unfetched
         auto const& current = collection;
         auto chainedExpiration = current.validUntil;
@@ -1598,25 +1598,25 @@ ValidatorList::expires(ValidatorList::shared_lock const&) const
 std::optional<TimeKeeper::time_point>
 ValidatorList::expires() const
 {
-    std::shared_lock const read_lock{mutex_};
-    return expires(read_lock);
+    std::shared_lock const readLock{mutex_};
+    return expires(readLock);
 }
 
-Json::Value
+json::Value
 ValidatorList::getJson() const
 {
-    Json::Value res(Json::objectValue);
+    json::Value res(json::ObjectValue);
 
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
-    res[jss::validation_quorum] = static_cast<Json::UInt>(quorum_);
+    res[jss::validation_quorum] = static_cast<json::UInt>(quorum_);
 
     {
-        auto& x = (res[jss::validator_list] = Json::objectValue);
+        auto& x = (res[jss::validator_list] = json::ObjectValue);
 
-        x[jss::count] = static_cast<Json::UInt>(count(read_lock));
+        x[jss::count] = static_cast<json::UInt>(count(readLock));
 
-        if (auto when = expires(read_lock))
+        if (auto when = expires(readLock))
         {
             if (*when == TimeKeeper::time_point::max())
             {
@@ -1643,33 +1643,33 @@ ValidatorList::getJson() const
             x[jss::expiration] = "unknown";
         }
 
-        x[jss::validator_list_threshold] = Json::UInt(listThreshold_);
+        x[jss::validator_list_threshold] = json::UInt(listThreshold_);
     }
 
     // Validator keys listed in the local config file
-    Json::Value& jLocalStaticKeys = (res[jss::local_static_keys] = Json::arrayValue);
+    json::Value& jLocalStaticKeys = (res[jss::local_static_keys] = json::ArrayValue);
 
-    for (auto const& key : localPublisherList.list)
+    for (auto const& key : localPublisherList_.list)
         jLocalStaticKeys.append(toBase58(TokenType::NodePublic, key));
 
     // Publisher lists
-    Json::Value& jPublisherLists = (res[jss::publisher_lists] = Json::arrayValue);
+    json::Value& jPublisherLists = (res[jss::publisher_lists] = json::ArrayValue);
     for (auto const& [publicKey, pubCollection] : publisherLists_)
     {
-        Json::Value& curr = jPublisherLists.append(Json::objectValue);
+        json::Value& curr = jPublisherLists.append(json::ObjectValue);
         curr[jss::pubkey_publisher] = strHex(publicKey);
-        curr[jss::available] = pubCollection.status == PublisherStatus::available;
+        curr[jss::available] = pubCollection.status == PublisherStatus::Available;
 
-        auto appendList = [](PublisherList const& publisherList, Json::Value& target) {
+        auto appendList = [](PublisherList const& publisherList, json::Value& target) {
             target[jss::uri] = publisherList.siteUri;
             if (publisherList.validUntil != TimeKeeper::time_point{})
             {
-                target[jss::seq] = static_cast<Json::UInt>(publisherList.sequence);
+                target[jss::seq] = static_cast<json::UInt>(publisherList.sequence);
                 target[jss::expiration] = to_string(publisherList.validUntil);
             }
             if (publisherList.validFrom != TimeKeeper::time_point{})
                 target[jss::effective] = to_string(publisherList.validFrom);
-            Json::Value& keys = (target[jss::list] = Json::arrayValue);
+            json::Value& keys = (target[jss::list] = json::ArrayValue);
             for (auto const& key : publisherList.list)
             {
                 keys.append(toBase58(TokenType::NodePublic, key));
@@ -1684,13 +1684,13 @@ ValidatorList::getJson() const
             }
         }
 
-        Json::Value remaining(Json::arrayValue);
+        json::Value remaining(json::ArrayValue);
         for (auto const& [sequence, future] : pubCollection.remaining)
         {
             using namespace std::chrono_literals;
 
             (void)sequence;
-            Json::Value& r = remaining.append(Json::objectValue);
+            json::Value& r = remaining.append(json::ObjectValue);
             appendList(future, r);
             // Race conditions can happen, so make this check "fuzzy"
             XRPL_ASSERT(
@@ -1702,15 +1702,15 @@ ValidatorList::getJson() const
     }
 
     // Trusted validator keys
-    Json::Value& jValidatorKeys = (res[jss::trusted_validator_keys] = Json::arrayValue);
+    json::Value& jValidatorKeys = (res[jss::trusted_validator_keys] = json::ArrayValue);
     for (auto const& k : trustedMasterKeys_)
     {
         jValidatorKeys.append(toBase58(TokenType::NodePublic, k));
     }
 
     // signing keys
-    Json::Value& jSigningKeys = (res[jss::signing_keys] = Json::objectValue);
-    validatorManifests_.for_each_manifest([&jSigningKeys, this](Manifest const& manifest) {
+    json::Value& jSigningKeys = (res[jss::signing_keys] = json::ObjectValue);
+    validatorManifests_.forEachManifest([&jSigningKeys, this](Manifest const& manifest) {
         auto it = keyListings_.find(manifest.masterKey);
         if (it != keyListings_.end() && manifest.signingKey)
         {
@@ -1722,7 +1722,7 @@ ValidatorList::getJson() const
     // Negative UNL
     if (!negativeUNL_.empty())
     {
-        Json::Value& jNegativeUNL = (res[jss::NegativeUNL] = Json::arrayValue);
+        json::Value& jNegativeUNL = (res[jss::NegativeUNL] = json::ArrayValue);
         for (auto const& k : negativeUNL_)
         {
             jNegativeUNL.append(toBase58(TokenType::NodePublic, k));
@@ -1733,16 +1733,16 @@ ValidatorList::getJson() const
 }
 
 void
-ValidatorList::for_each_listed(std::function<void(PublicKey const&, bool)> func) const
+ValidatorList::forEachListed(std::function<void(PublicKey const&, bool)> func) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
     for (auto const& v : keyListings_)
-        func(v.first, trusted(read_lock, v.first));
+        func(v.first, trusted(readLock, v.first));
 }
 
 void
-ValidatorList::for_each_available(
+ValidatorList::forEachAvailable(
     std::function<void(
         std::string const& manifest,
         std::uint32_t version,
@@ -1751,11 +1751,11 @@ ValidatorList::for_each_available(
         std::size_t maxSequence,
         uint256 const& hash)> func) const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
     for (auto const& [key, plCollection] : publisherLists_)
     {
-        if (plCollection.status != PublisherStatus::available)
+        if (plCollection.status != PublisherStatus::Available)
             continue;
         XRPL_ASSERT(
             plCollection.maxSequence.value_or(0) != 0,
@@ -1770,12 +1770,12 @@ ValidatorList::for_each_available(
     }
 }
 
-std::optional<Json::Value>
+std::optional<json::Value>
 ValidatorList::getAvailable(
     std::string_view pubKey,
     std::optional<std::uint32_t> forceVersion /* = {} */)
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
 
     auto const keyBlob = strViewUnHex(pubKey);
 
@@ -1789,10 +1789,10 @@ ValidatorList::getAvailable(
 
     auto const iter = publisherLists_.find(id);
 
-    if (iter == publisherLists_.end() || iter->second.status != PublisherStatus::available)
+    if (iter == publisherLists_.end() || iter->second.status != PublisherStatus::Available)
         return {};
 
-    Json::Value value = buildFileData(std::string{pubKey}, iter->second, forceVersion, j_);
+    json::Value value = buildFileData(std::string{pubKey}, iter->second, forceVersion, j_);
 
     return value;
 }
@@ -1820,7 +1820,7 @@ ValidatorList::calculateQuorum(
         std::size_t unavailable = 0;
         for (auto const& list : publisherLists_)
         {
-            if (list.second.status != PublisherStatus::available)
+            if (list.second.status != PublisherStatus::Available)
                 unavailable += 1;
         }
         // There are two, subtly different, sides to list threshold:
@@ -1941,8 +1941,8 @@ ValidatorList::updateTrusted(
 
                 auto const oldList = current.list;
                 current = std::move(candidate);
-                if (collection.status != PublisherStatus::available)
-                    collection.status = PublisherStatus::available;
+                if (collection.status != PublisherStatus::Available)
+                    collection.status = PublisherStatus::Available;
                 XRPL_ASSERT(
                     current.sequence == sequence,
                     "xrpl::ValidatorList::updateTrusted : sequence match");
@@ -1968,13 +1968,13 @@ ValidatorList::updateTrusted(
         // Remove if expired
         // ValidatorLists specified in the local config file never expire.
         // Hence, the below steps are not relevant for localPublisherList
-        if (collection.status == PublisherStatus::available &&
+        if (collection.status == PublisherStatus::Available &&
             collection.current.validUntil <= closeTime)
         {
-            removePublisherList(lock, pubKey, PublisherStatus::expired);
+            removePublisherList(lock, pubKey, PublisherStatus::Expired);
             ops.setUNLBlocked();
         }
-        if (collection.status != PublisherStatus::available)
+        if (collection.status != PublisherStatus::Available)
             good = false;
     }
     if (good)
@@ -2062,7 +2062,7 @@ ValidatorList::updateTrusted(
                         << " exceeds the number of trusted validators (" << unlSize << ")";
     }
 
-    if ((!publisherLists_.empty() || !localPublisherList.list.empty()) && unlSize == 0)
+    if ((!publisherLists_.empty() || !localPublisherList_.list.empty()) && unlSize == 0)
     {
         // No validators. Lock down.
         ops.setUNLBlocked();
@@ -2074,21 +2074,21 @@ ValidatorList::updateTrusted(
 hash_set<PublicKey>
 ValidatorList::getTrustedMasterKeys() const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
     return trustedMasterKeys_;
 }
 
 std::size_t
 ValidatorList::getListThreshold() const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
     return listThreshold_;
 }
 
 hash_set<PublicKey>
 ValidatorList::getNegativeUNL() const
 {
-    std::shared_lock const read_lock{mutex_};
+    std::shared_lock const readLock{mutex_};
     return negativeUNL_;
 }
 
@@ -2105,14 +2105,14 @@ ValidatorList::negativeUNLFilter(std::vector<std::shared_ptr<STValidation>>&& va
     // Remove validations that are from validators on the negative UNL.
     auto ret = std::move(validations);
 
-    std::shared_lock read_lock{mutex_};
+    std::shared_lock readLock{mutex_};
     if (!negativeUNL_.empty())
     {
         ret.erase(
             std::ranges::remove_if(
                 ret,
                 [&](auto const& v) -> bool {
-                    if (auto const masterKey = getTrustedKey(read_lock, v->getSignerPublic());
+                    if (auto const masterKey = getTrustedKey(readLock, v->getSignerPublic());
                         masterKey)
                     {
                         return negativeUNL_.contains(*masterKey);
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index 4c05ce5f09..57734ef956 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -44,11 +44,11 @@
 
 namespace xrpl {
 
-auto constexpr default_refresh_interval = std::chrono::minutes{5};
-auto constexpr error_retry_interval = std::chrono::seconds{30};
-unsigned short constexpr max_redirects = 3;
+auto constexpr kDEFAULT_REFRESH_INTERVAL = std::chrono::minutes{5};
+auto constexpr kERROR_RETRY_INTERVAL = std::chrono::seconds{30};
+unsigned short constexpr kMAX_REDIRECTS = 3;
 
-ValidatorSite::Site::Resource::Resource(std::string uri_) : uri{std::move(uri_)}
+ValidatorSite::Site::Resource::Resource(std::string inUri) : uri{std::move(inUri)}
 {
     if (!parseUrl(pUrl, uri))
         throw std::runtime_error("URI '" + uri + "' cannot be parsed");
@@ -92,7 +92,7 @@ ValidatorSite::Site::Resource::Resource(std::string uri_) : uri{std::move(uri_)}
 ValidatorSite::Site::Site(std::string uri)
     : loadedResource{std::make_shared<Resource>(std::move(uri))}
     , startingResource{loadedResource}
-    , refreshInterval{default_refresh_interval}
+    , refreshInterval{kDEFAULT_REFRESH_INTERVAL}
     , nextRefresh{clock_type::now()}
 
 {
@@ -130,10 +130,10 @@ ValidatorSite::~ValidatorSite()
 }
 
 bool
-ValidatorSite::missingSite(std::scoped_lock<std::mutex> const& lock_sites)
+ValidatorSite::missingSite(std::scoped_lock<std::mutex> const& lockSites)
 {
     auto const sites = app_.getValidators().loadLists();
-    return sites.empty() || load(sites, lock_sites);
+    return sites.empty() || load(sites, lockSites);
 }
 
 bool
@@ -149,12 +149,12 @@ ValidatorSite::load(std::vector<std::string> const& siteURIs)
 bool
 ValidatorSite::load(
     std::vector<std::string> const& siteURIs,
-    std::scoped_lock<std::mutex> const& lock_sites)
+    std::scoped_lock<std::mutex> const& lockSites)
 {
     // If no sites are provided, act as if a site failed to load.
     if (siteURIs.empty())
     {
-        return missingSite(lock_sites);
+        return missingSite(lockSites);
     }
 
     for (auto const& uri : siteURIs)
@@ -219,8 +219,8 @@ ValidatorSite::stop()
 
 void
 ValidatorSite::setTimer(
-    std::scoped_lock<std::mutex> const& site_lock,
-    std::scoped_lock<std::mutex> const& state_lock)
+    std::scoped_lock<std::mutex> const& siteLock,
+    std::scoped_lock<std::mutex> const& stateLock)
 {
     auto next = std::ranges::min_element(
         sites_, [](Site const& a, Site const& b) { return a.nextRefresh < b.nextRefresh; });
@@ -240,13 +240,13 @@ void
 ValidatorSite::makeRequest(
     std::shared_ptr<Site::Resource> resource,
     std::size_t siteIdx,
-    std::scoped_lock<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sitesLock)
 {
     fetching_ = true;
     sites_[siteIdx].activeResource = resource;
     std::shared_ptr<detail::Work> sp;
     auto timeoutCancel = [this]() {
-        std::scoped_lock const lock_state{state_mutex_};
+        std::scoped_lock const lockState{state_mutex_};
         // docs indicate cancel_one() can throw, but this
         // should be reconsidered if it changes to noexcept
         try
@@ -312,7 +312,7 @@ ValidatorSite::makeRequest(
     sp->run();
     // start a timer for the request, which shouldn't take more
     // than requestTimeout_ to complete
-    std::scoped_lock const lock_state{state_mutex_};
+    std::scoped_lock const lockState{state_mutex_};
     timer_.expires_after(requestTimeout_);
     timer_.async_wait([this, siteIdx](boost::system::error_code const& ec) {
         this->onRequestTimeout(siteIdx, ec);
@@ -326,7 +326,7 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
         return;
 
     {
-        std::scoped_lock const lock_site{sites_mutex_};
+        std::scoped_lock const lockSite{sites_mutex_};
         // In some circumstances, both this function and the response
         // handler (onSiteFetch or onTextFetch) can get queued and
         // processed. In all observed cases, the response handler
@@ -343,7 +343,7 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
                                 "already been processed";
     }
 
-    std::scoped_lock const lock_state{state_mutex_};
+    std::scoped_lock const lockState{state_mutex_};
     if (auto sp = work_.lock())
         sp->cancel();
 }
@@ -383,11 +383,11 @@ void
 ValidatorSite::parseJsonResponse(
     std::string const& res,
     std::size_t siteIdx,
-    std::scoped_lock<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sitesLock)
 {
-    Json::Value const body = [&res, siteIdx, this]() {
-        Json::Reader r;
-        Json::Value body;
+    json::Value const body = [&res, siteIdx, this]() {
+        json::Reader r;
+        json::Value body;
         if (!r.parse(res.data(), body))
         {
             JLOG(j_.warn()) << "Unable to parse JSON response from  "
@@ -447,36 +447,36 @@ ValidatorSite::parseJsonResponse(
     {
         switch (disp)
         {
-            case ListDisposition::accepted:
+            case ListDisposition::Accepted:
                 JLOG(j_.debug()) << "Applied " << count << " new validator list(s) from " << uri;
                 break;
-            case ListDisposition::expired:
+            case ListDisposition::Expired:
                 JLOG(j_.debug()) << "Applied " << count << " expired validator list(s) from "
                                  << uri;
                 break;
-            case ListDisposition::same_sequence:
+            case ListDisposition::SameSequence:
                 JLOG(j_.debug()) << "Ignored " << count
                                  << " validator list(s) with current sequence from " << uri;
                 break;
-            case ListDisposition::pending:
+            case ListDisposition::Pending:
                 JLOG(j_.debug()) << "Processed " << count << " future validator list(s) from "
                                  << uri;
                 break;
-            case ListDisposition::known_sequence:
+            case ListDisposition::KnownSequence:
                 JLOG(j_.debug()) << "Ignored " << count
                                  << " validator list(s) with future known sequence from " << uri;
                 break;
-            case ListDisposition::stale:
+            case ListDisposition::Stale:
                 JLOG(j_.warn()) << "Ignored " << count << "stale validator list(s) from " << uri;
                 break;
-            case ListDisposition::untrusted:
+            case ListDisposition::Untrusted:
                 JLOG(j_.warn()) << "Ignored " << count << " untrusted validator list(s) from "
                                 << uri;
                 break;
-            case ListDisposition::invalid:
+            case ListDisposition::Invalid:
                 JLOG(j_.warn()) << "Ignored " << count << " invalid validator list(s) from " << uri;
                 break;
-            case ListDisposition::unsupported_version:
+            case ListDisposition::UnsupportedVersion:
                 JLOG(j_.warn()) << "Ignored " << count
                                 << " unsupported version validator list(s) from " << uri;
                 break;
@@ -501,7 +501,7 @@ std::shared_ptr<ValidatorSite::Site::Resource>
 ValidatorSite::processRedirect(
     detail::response_type const& res,
     std::size_t siteIdx,
-    std::scoped_lock<std::mutex> const& sites_lock)
+    std::scoped_lock<std::mutex> const& sitesLock)
 {
     using namespace boost::beast::http;
     std::shared_ptr<Site::Resource> newLocation;
@@ -512,7 +512,7 @@ ValidatorSite::processRedirect(
         throw std::runtime_error{"missing location"};
     }
 
-    if (sites_[siteIdx].redirCount == max_redirects)
+    if (sites_[siteIdx].redirCount == kMAX_REDIRECTS)
     {
         JLOG(j_.warn()) << "Exceeded max redirects for validator list at "
                         << sites_[siteIdx].loadedResource->uri;
@@ -545,7 +545,7 @@ ValidatorSite::onSiteFetch(
     detail::response_type const& res,
     std::size_t siteIdx)
 {
-    std::scoped_lock lock_sites{sites_mutex_};
+    std::scoped_lock lockSites{sites_mutex_};
     {
         if (endpoint != endpoint_type{})
             sites_[siteIdx].lastRequestEndpoint = endpoint;
@@ -555,14 +555,14 @@ ValidatorSite::onSiteFetch(
             sites_[siteIdx].lastRefreshStatus.emplace(
                 Site::Status{
                     .refreshed = clock_type::now(),
-                    .disposition = ListDisposition::invalid,
+                    .disposition = ListDisposition::Invalid,
                     .message = errMsg});
             if (retry)
-                sites_[siteIdx].nextRefresh = clock_type::now() + error_retry_interval;
+                sites_[siteIdx].nextRefresh = clock_type::now() + kERROR_RETRY_INTERVAL;
 
             // See if there's a copy saved locally from last time we
             // saw the list.
-            missingSite(lock_sites);
+            missingSite(lockSites);
         };
         if (ec)
         {
@@ -579,13 +579,13 @@ ValidatorSite::onSiteFetch(
                 {
                     case status::ok:
                         sites_[siteIdx].lastRequestSuccessful = true;
-                        parseJsonResponse(res.body(), siteIdx, lock_sites);
+                        parseJsonResponse(res.body(), siteIdx, lockSites);
                         break;
                     case status::moved_permanently:
                     case status::permanent_redirect:
                     case status::found:
                     case status::temporary_redirect: {
-                        auto newLocation = processRedirect(res, siteIdx, lock_sites);
+                        auto newLocation = processRedirect(res, siteIdx, lockSites);
                         XRPL_ASSERT(
                             newLocation,
                             "xrpl::ValidatorSite::onSiteFetch : non-null "
@@ -596,7 +596,7 @@ ValidatorSite::onSiteFetch(
                         {
                             sites_[siteIdx].startingResource = newLocation;
                         }
-                        makeRequest(newLocation, siteIdx, lock_sites);
+                        makeRequest(newLocation, siteIdx, lockSites);
                         return;  // we are still fetching, so skip
                                  // state update/notify below
                     }
@@ -617,10 +617,10 @@ ValidatorSite::onSiteFetch(
         sites_[siteIdx].activeResource.reset();
     }
 
-    std::scoped_lock const lock_state{state_mutex_};
+    std::scoped_lock const lockState{state_mutex_};
     fetching_ = false;
     if (!stopping_)
-        setTimer(lock_sites, lock_state);
+        setTimer(lockSites, lockState);
     cv_.notify_all();
 }
 
@@ -630,7 +630,7 @@ ValidatorSite::onTextFetch(
     std::string const& res,
     std::size_t siteIdx)
 {
-    std::scoped_lock const lock_sites{sites_mutex_};
+    std::scoped_lock const lockSites{sites_mutex_};
     {
         try
         {
@@ -643,7 +643,7 @@ ValidatorSite::onTextFetch(
 
             sites_[siteIdx].lastRequestSuccessful = true;
 
-            parseJsonResponse(res, siteIdx, lock_sites);
+            parseJsonResponse(res, siteIdx, lockSites);
         }
         catch (std::exception const& ex)
         {
@@ -651,32 +651,32 @@ ValidatorSite::onTextFetch(
             sites_[siteIdx].lastRefreshStatus.emplace(
                 Site::Status{
                     .refreshed = clock_type::now(),
-                    .disposition = ListDisposition::invalid,
+                    .disposition = ListDisposition::Invalid,
                     .message = ex.what()});
         }
         sites_[siteIdx].activeResource.reset();
     }
 
-    std::scoped_lock const lock_state{state_mutex_};
+    std::scoped_lock const lockState{state_mutex_};
     fetching_ = false;
     if (!stopping_)
-        setTimer(lock_sites, lock_state);
+        setTimer(lockSites, lockState);
     cv_.notify_all();
 }
 
-Json::Value
+json::Value
 ValidatorSite::getJson() const
 {
     using namespace std::chrono;
-    using Int = Json::Value::Int;
+    using Int = json::Value::Int;
 
-    Json::Value jrr(Json::objectValue);
-    Json::Value& jSites = (jrr[jss::validator_sites] = Json::arrayValue);
+    json::Value jrr(json::ObjectValue);
+    json::Value& jSites = (jrr[jss::validator_sites] = json::ArrayValue);
     {
         std::scoped_lock const lock{sites_mutex_};
         for (Site const& site : sites_)
         {
-            Json::Value& v = jSites.append(Json::objectValue);
+            json::Value& v = jSites.append(json::ObjectValue);
             std::stringstream uri;
             uri << site.loadedResource->uri;
             if (site.loadedResource != site.startingResource)
diff --git a/src/xrpld/app/misc/detail/setup_HashRouter.cpp b/src/xrpld/app/misc/detail/setup_HashRouter.cpp
index 57e2b9b282..9727f5d733 100644
--- a/src/xrpld/app/misc/detail/setup_HashRouter.cpp
+++ b/src/xrpld/app/misc/detail/setup_HashRouter.cpp
@@ -13,7 +13,7 @@
 namespace xrpl {
 
 HashRouter::Setup
-setup_HashRouter(Config const& config)
+setupHashRouter(Config const& config)
 {
     using namespace std::chrono;
 
diff --git a/src/xrpld/app/misc/make_NetworkOPs.h b/src/xrpld/app/misc/make_NetworkOPs.h
index e250a147b7..a848067e36 100644
--- a/src/xrpld/app/misc/make_NetworkOPs.h
+++ b/src/xrpld/app/misc/make_NetworkOPs.h
@@ -16,7 +16,7 @@ class LedgerMaster;
 class ValidatorKeys;
 
 std::unique_ptr<NetworkOPs>
-make_NetworkOPs(
+makeNetworkOPs(
     ServiceRegistry& registry,
     NetworkOPs::clock_type& clock,
     bool standalone,
@@ -25,7 +25,7 @@ make_NetworkOPs(
     JobQueue& jobQueue,
     LedgerMaster& ledgerMaster,
     ValidatorKeys const& validatorKeys,
-    boost::asio::io_context& ioCtx,
+    boost::asio::io_context& ioSvc,
     beast::Journal journal,
     beast::insight::Collector::ptr const& collector);
 
diff --git a/src/xrpld/app/misc/setup_HashRouter.h b/src/xrpld/app/misc/setup_HashRouter.h
index 9b767d0170..665366ba03 100644
--- a/src/xrpld/app/misc/setup_HashRouter.h
+++ b/src/xrpld/app/misc/setup_HashRouter.h
@@ -9,6 +9,6 @@ class Config;
 
 /** Create HashRouter setup from configuration */
 HashRouter::Setup
-setup_HashRouter(Config const& config);
+setupHashRouter(Config const& config);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/rdb/backend/SQLiteDatabase.h b/src/xrpld/app/rdb/backend/SQLiteDatabase.h
index 05e0175732..e5c69c2703 100644
--- a/src/xrpld/app/rdb/backend/SQLiteDatabase.h
+++ b/src/xrpld/app/rdb/backend/SQLiteDatabase.h
@@ -339,7 +339,7 @@ public:
     getTransaction(
         uint256 const& id,
         std::optional<ClosedInterval<std::uint32_t>> const& range,
-        error_code_i& ec) override;
+        ErrorCodeI& ec) override;
 
     /**
      * @brief getKBUsedAll Returns the amount of space used by all databases.
@@ -469,7 +469,7 @@ private:
 };
 
 /**
- * @brief setup_RelationalDatabase Creates and returns a SQLiteDatabase
+ * @brief setupRelationalDatabase Creates and returns a SQLiteDatabase
  *        instance based on configuration. It's recommended to use it as
  *        a singleton, but it's not enforced (e.g. if you have more than one
  *        database).
@@ -479,6 +479,6 @@ private:
  * @return SQLiteDatabase instance.
  */
 SQLiteDatabase
-setup_RelationalDatabase(ServiceRegistry& registry, Config const& config, JobQueue& jobQueue);
+setupRelationalDatabase(ServiceRegistry& registry, Config const& config, JobQueue& jobQueue);
 
 }  // namespace xrpl
diff --git a/src/xrpld/app/rdb/backend/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/Node.cpp
index c698c7ca76..8530fb2e65 100644
--- a/src/xrpld/app/rdb/backend/detail/Node.cpp
+++ b/src/xrpld/app/rdb/backend/detail/Node.cpp
@@ -73,9 +73,9 @@ namespace xrpl::detail {
  * @return Name of the table.
  */
 static std::string
-to_string(TableType type)
+toString(TableType type)
 {
-    static_assert(TableTypeCount == 3, "Need to modify switch statement if enum is modified");
+    static_assert(kTABLE_TYPE_COUNT == 3, "Need to modify switch statement if enum is modified");
 
     switch (type)
     {
@@ -102,26 +102,26 @@ makeLedgerDBs(
 {
     // ledger database
     auto lgr{std::make_unique<DatabaseCon>(
-        setup, LgrDBName, setup.lgrPragma, LgrDBInit, checkpointerSetup, j)};
+        setup, kLGR_DB_NAME, setup.lgrPragma, kLGR_DB_INIT, checkpointerSetup, j)};
     lgr->getSession() << boost::str(
         boost::format("PRAGMA cache_size=-%d;") %
-        kilobytes(config.getValueFor(SizedItem::lgrDBCache)));
+        kilobytes(config.getValueFor(SizedItem::LgrDbCache)));
 
     if (config.useTxTables())
     {
         // transaction database
         auto tx{std::make_unique<DatabaseCon>(
-            setup, TxDBName, setup.txPragma, TxDBInit, checkpointerSetup, j)};
+            setup, kTX_DB_NAME, setup.txPragma, kTX_DB_INIT, checkpointerSetup, j)};
         tx->getSession() << boost::str(
             boost::format("PRAGMA cache_size=-%d;") %
-            kilobytes(config.getValueFor(SizedItem::txnDBCache)));
+            kilobytes(config.getValueFor(SizedItem::TxnDbCache)));
 
         if (!setup.standAlone || setup.startUp == StartUpType::Load ||
             setup.startUp == StartUpType::LoadFile || setup.startUp == StartUpType::Replay)
         {
             // Check if AccountTransactions has primary key
             std::string cid, name, type;
-            std::size_t notnull = 0, dflt_value = 0, pk = 0;
+            std::size_t notnull = 0, dfltValue = 0, pk = 0;
             soci::indicator ind = soci::i_null;
             soci::statement st =
                 (tx->getSession().prepare << ("PRAGMA table_info(AccountTransactions);"),
@@ -129,7 +129,7 @@ makeLedgerDBs(
                  soci::into(name),
                  soci::into(type),
                  soci::into(notnull),
-                 soci::into(dflt_value, ind),
+                 soci::into(dfltValue, ind),
                  soci::into(pk));
 
             st.execute();
@@ -152,7 +152,7 @@ makeLedgerDBs(
 std::optional<LedgerIndex>
 getMinLedgerSeq(soci::session& session, TableType type)
 {
-    std::string const query = "SELECT MIN(LedgerSeq) FROM " + to_string(type) + ";";
+    std::string const query = "SELECT MIN(LedgerSeq) FROM " + toString(type) + ";";
     // SOCI requires boost::optional (not std::optional) as the parameter.
     boost::optional<LedgerIndex> m;
     session << query, soci::into(m);
@@ -162,7 +162,7 @@ getMinLedgerSeq(soci::session& session, TableType type)
 std::optional<LedgerIndex>
 getMaxLedgerSeq(soci::session& session, TableType type)
 {
-    std::string const query = "SELECT MAX(LedgerSeq) FROM " + to_string(type) + ";";
+    std::string const query = "SELECT MAX(LedgerSeq) FROM " + toString(type) + ";";
     // SOCI requires boost::optional (not std::optional) as the parameter.
     boost::optional<LedgerIndex> m;
     session << query, soci::into(m);
@@ -172,13 +172,13 @@ getMaxLedgerSeq(soci::session& session, TableType type)
 void
 deleteByLedgerSeq(soci::session& session, TableType type, LedgerIndex ledgerSeq)
 {
-    session << "DELETE FROM " << to_string(type) << " WHERE LedgerSeq == " << ledgerSeq << ";";
+    session << "DELETE FROM " << toString(type) << " WHERE LedgerSeq == " << ledgerSeq << ";";
 }
 
 void
 deleteBeforeLedgerSeq(soci::session& session, TableType type, LedgerIndex ledgerSeq)
 {
-    session << "DELETE FROM " << to_string(type) << " WHERE LedgerSeq < " << ledgerSeq << ";";
+    session << "DELETE FROM " << toString(type) << " WHERE LedgerSeq < " << ledgerSeq << ";";
 }
 
 std::size_t
@@ -187,7 +187,7 @@ getRows(soci::session& session, TableType type)
     std::size_t rows = 0;
     session << "SELECT COUNT(*) AS rows "
                "FROM "
-            << to_string(type) << ";",
+            << toString(type) << ";",
         soci::into(rows);
 
     return rows;
@@ -201,7 +201,7 @@ getRowsMinMax(soci::session& session, TableType type)
                "MIN(LedgerSeq) AS first, "
                "MAX(LedgerSeq) AS last "
                "FROM "
-            << to_string(type) << ";",
+            << toString(type) << ";",
         soci::into(res.numberOfRows), soci::into(res.minLedgerSequence),
         soci::into(res.maxLedgerSequence);
 
@@ -230,7 +230,7 @@ saveValidatedLedger(
         // LCOV_EXCL_STOP
     }
 
-    if (ledger->header().accountHash != ledger->stateMap().getHash().as_uint256())
+    if (ledger->header().accountHash != ledger->stateMap().getHash().asUint256())
     {
         // LCOV_EXCL_START
         JLOG(j.fatal()) << "sAL: " << ledger->header().accountHash
@@ -241,16 +241,16 @@ saveValidatedLedger(
     }
 
     XRPL_ASSERT(
-        ledger->header().txHash == ledger->txMap().getHash().as_uint256(),
+        ledger->header().txHash == ledger->txMap().getHash().asUint256(),
         "xrpl::detail::saveValidatedLedger : transaction hash match");
 
     // Save the ledger header in the hashed object store
     {
         Serializer s(128);
-        s.add32(HashPrefix::ledgerMaster);
+        s.add32(HashPrefix::LedgerMaster);
         addRaw(ledger->header(), s);
         app.getNodeStore().store(
-            NodeObjectType::hotLEDGER, std::move(s.modData()), ledger->header().hash, seq);
+            NodeObjectType::Ledger, std::move(s.modData()), ledger->header().hash, seq);
     }
 
     std::shared_ptr<AcceptedLedger> aLedger;
@@ -260,8 +260,7 @@ saveValidatedLedger(
         if (!aLedger)
         {
             aLedger = std::make_shared<AcceptedLedger>(ledger);
-            app.getAcceptedLedgerCache().canonicalize_replace_client(
-                ledger->header().hash, aLedger);
+            app.getAcceptedLedgerCache().canonicalizeReplaceClient(ledger->header().hash, aLedger);
         }
     }
     catch (std::exception const&)
@@ -275,15 +274,16 @@ saveValidatedLedger(
     }
 
     {
-        static boost::format deleteLedger("DELETE FROM Ledgers WHERE LedgerSeq = %u;");
-        static boost::format deleteTrans1("DELETE FROM Transactions WHERE LedgerSeq = %u;");
-        static boost::format deleteTrans2("DELETE FROM AccountTransactions WHERE LedgerSeq = %u;");
-        static boost::format deleteAcctTrans(
+        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(
             "DELETE FROM AccountTransactions WHERE TransID = '%s';");
 
         {
             auto db = ldgDB.checkoutDb();
-            *db << boost::str(deleteLedger % seq);
+            *db << boost::str(kDELETE_LEDGER % seq);
         }
 
         if (app.config().useTxTables())
@@ -300,8 +300,8 @@ saveValidatedLedger(
 
             soci::transaction tr(*db);
 
-            *db << boost::str(deleteTrans1 % seq);
-            *db << boost::str(deleteTrans2 % seq);
+            *db << boost::str(kDELETE_TRANS1 % seq);
+            *db << boost::str(kDELETE_TRANS2 % seq);
 
             std::string const ledgerSeq(std::to_string(seq));
 
@@ -312,7 +312,7 @@ saveValidatedLedger(
                 std::string const txnId(to_string(transactionID));
                 std::string const txnSeq(std::to_string(acceptedLedgerTx->getTxnSeq()));
 
-                *db << boost::str(deleteAcctTrans % transactionID);
+                *db << boost::str(kDELETE_ACCT_TRANS % transactionID);
 
                 auto const& accts = acceptedLedgerTx->getAffected();
 
@@ -358,7 +358,7 @@ saveValidatedLedger(
                     // It's okay for pseudo transactions to not affect any
                     // accounts.  But otherwise...
                     JLOG(j.warn()) << "Transaction in ledger " << seq << " affects no accounts";
-                    JLOG(j.warn()) << sleTxn->getJson(JsonOptions::none);
+                    JLOG(j.warn()) << sleTxn->getJson(JsonOptions::KNone);
                 }
 
                 *db
@@ -378,7 +378,7 @@ saveValidatedLedger(
         }
 
         {
-            static std::string const addLedger(
+            static std::string const kADD_LEDGER(
                 R"sql(INSERT OR REPLACE INTO Ledgers
                 (LedgerHash,LedgerSeq,PrevHash,TotalCoins,ClosingTime,PrevClosingTime,
                 CloseTimeRes,CloseFlags,AccountSetHash,TransSetHash)
@@ -401,7 +401,7 @@ saveValidatedLedger(
             auto const accountHash = to_string(ledger->header().accountHash);
             auto const txHash = to_string(ledger->header().txHash);
 
-            *db << addLedger, soci::use(hash), soci::use(seq), soci::use(parentHash),
+            *db << kADD_LEDGER, 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 +697,8 @@ transactionsSQL(
     bool count,
     beast::Journal j)
 {
-    constexpr std::uint32_t NONBINARY_PAGE_LENGTH = 200;
-    constexpr std::uint32_t BINARY_PAGE_LENGTH = 500;
+    constexpr std::uint32_t kNONBINARY_PAGE_LENGTH = 200;
+    constexpr std::uint32_t kBINARY_PAGE_LENGTH = 500;
 
     std::uint32_t numberOfResults = 0;
 
@@ -708,12 +708,12 @@ transactionsSQL(
     }
     else if (options.limit == UINT32_MAX)
     {
-        numberOfResults = binary ? BINARY_PAGE_LENGTH : NONBINARY_PAGE_LENGTH;
+        numberOfResults = binary ? kBINARY_PAGE_LENGTH : kNONBINARY_PAGE_LENGTH;
     }
     else if (!options.bUnlimited)
     {
         numberOfResults =
-            std::min(binary ? BINARY_PAGE_LENGTH : NONBINARY_PAGE_LENGTH, options.limit);
+            std::min(binary ? kBINARY_PAGE_LENGTH : kNONBINARY_PAGE_LENGTH, options.limit);
     }
     else
     {
@@ -1000,7 +1000,7 @@ getNewestAccountTxsB(
  *        match: the account, the ledger search range, the marker of the first
  *        returned entry, the number of transactions to return, and a flag if
  *        this number unlimited.
- * @param page_length Total number of transactions to return.
+ * @param pageLength Total number of transactions to return.
  * @param forward True for ascending order, false for descending.
  * @return Vector of tuples of found transactions, their metadata and account
  *         sequences sorted in the specified order by account sequence, a marker
@@ -1013,7 +1013,7 @@ accountTxPage(
     std::function<void(std::uint32_t)> const& onUnsavedLedger,
     std::function<void(std::uint32_t, std::string const&, Blob&&, Blob&&)> const& onTransaction,
     RelationalDatabase::AccountTxPageOptions const& options,
-    std::uint32_t page_length,
+    std::uint32_t pageLength,
     bool forward)
 {
     int total = 0;
@@ -1023,9 +1023,9 @@ accountTxPage(
     std::uint32_t numberOfResults = 0;
 
     if (options.limit == 0 || options.limit == UINT32_MAX ||
-        (options.limit > page_length && !options.bAdmin))
+        (options.limit > pageLength && !options.bAdmin))
     {
-        numberOfResults = page_length;
+        numberOfResults = pageLength;
     }
     else
     {
@@ -1048,7 +1048,7 @@ accountTxPage(
 
     std::optional<RelationalDatabase::AccountTxMarker> newmarker;
 
-    static std::string const prefix(
+    static std::string const kPREFIX(
         R"(SELECT AccountTransactions.LedgerSeq,AccountTransactions.TxnSeq,
           Status,RawTxn,TxnMeta
           FROM AccountTransactions INNER JOIN Transactions
@@ -1065,7 +1065,7 @@ accountTxPage(
     if (findLedger == 0)
     {
         sql = boost::str(
-            boost::format(prefix + (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;)")) %
@@ -1196,9 +1196,9 @@ oldestAccountTxPage(
     std::function<void(std::uint32_t)> const& onUnsavedLedger,
     std::function<void(std::uint32_t, std::string const&, Blob&&, Blob&&)> const& onTransaction,
     RelationalDatabase::AccountTxPageOptions const& options,
-    std::uint32_t page_length)
+    std::uint32_t pageLength)
 {
-    return accountTxPage(session, onUnsavedLedger, onTransaction, options, page_length, true);
+    return accountTxPage(session, onUnsavedLedger, onTransaction, options, pageLength, true);
 }
 
 std::pair<std::optional<RelationalDatabase::AccountTxMarker>, int>
@@ -1207,9 +1207,9 @@ newestAccountTxPage(
     std::function<void(std::uint32_t)> const& onUnsavedLedger,
     std::function<void(std::uint32_t, std::string const&, Blob&&, Blob&&)> const& onTransaction,
     RelationalDatabase::AccountTxPageOptions const& options,
-    std::uint32_t page_length)
+    std::uint32_t pageLength)
 {
-    return accountTxPage(session, onUnsavedLedger, onTransaction, options, page_length, false);
+    return accountTxPage(session, onUnsavedLedger, onTransaction, options, pageLength, false);
 }
 
 std::variant<RelationalDatabase::AccountTx, TxSearched>
@@ -1218,7 +1218,7 @@ getTransaction(
     Application& app,
     uint256 const& id,
     std::optional<ClosedInterval<uint32_t>> const& range,
-    error_code_i& ec)
+    ErrorCodeI& ec)
 {
     std::string sql =
         "SELECT LedgerSeq,Status,RawTxn,TxnMeta "
@@ -1238,12 +1238,12 @@ getTransaction(
         session << sql, soci::into(ledgerSeq), soci::into(status), soci::into(sociRawTxnBlob, txn),
             soci::into(sociRawMetaBlob, meta);
 
-        auto const got_data = session.got_data();
+        auto const gotData = session.got_data();
 
-        if ((!got_data || txn != soci::i_ok || meta != soci::i_ok) && !range)
+        if ((!gotData || txn != soci::i_ok || meta != soci::i_ok) && !range)
             return TxSearched::Unknown;
 
-        if (!got_data)
+        if (!gotData)
         {
             uint64_t count = 0;
             soci::indicator rti = soci::i_null;
@@ -1282,7 +1282,7 @@ getTransaction(
         JLOG(app.getJournal("Ledger").warn())
             << "Unable to deserialize transaction from raw SQL value. Error: " << e.what();
 
-        ec = rpcDB_DESERIALIZATION;
+        ec = RpcDbDeserialization;
     }
 
     return TxSearched::Unknown;
@@ -1302,8 +1302,8 @@ dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
 
     if (config.useTxTables())
     {
-        DatabaseCon::Setup const dbSetup = setup_DatabaseCon(config);
-        boost::filesystem::path const dbPath = dbSetup.dataDir / TxDBName;
+        DatabaseCon::Setup const dbSetup = setupDatabaseCon(config);
+        boost::filesystem::path const dbPath = dbSetup.dataDir / kTX_DB_NAME;
         boost::system::error_code ec;
         std::optional<std::uint64_t> dbSize = boost::filesystem::file_size(dbPath, ec);
         if (ec)
@@ -1312,23 +1312,23 @@ dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
             dbSize.reset();
         }
 
-        static auto const pageSize = [&] {
+        static auto const kPAGE_SIZE = [&] {
             std::uint32_t ps = 0;
             session << "PRAGMA page_size;", soci::into(ps);
             return ps;
         }();
-        static auto const maxPages = [&] {
+        static auto const kMAX_PAGES = [&] {
             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 = maxPages - pageCount;
-        std::uint64_t const freeSpace = safe_cast<std::uint64_t>(freePages) * pageSize;
+        std::uint32_t const freePages = kMAX_PAGES - pageCount;
+        std::uint64_t const freeSpace = safeCast<std::uint64_t>(freePages) * kPAGE_SIZE;
         JLOG(j.info()) << "Transaction DB pathname: " << dbPath.string()
                        << "; file size: " << dbSize.value_or(-1) << " bytes"
-                       << "; SQLite page size: " << pageSize << " bytes"
+                       << "; SQLite page size: " << kPAGE_SIZE << " 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 7ea2992447..f5beb230b1 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 TableTypeCount = 3;
+constexpr int kTABLE_TYPE_COUNT = 3;
 
 struct DatabasePairValid
 {
@@ -327,7 +327,7 @@ getNewestAccountTxsB(
  *        match: the account, minimum and maximum ledger numbers to search,
  *        marker of first returned entry, number of transactions to return,
  *        flag if this number unlimited.
- * @param page_length Total number of transactions to return.
+ * @param pageLength Total number of transactions to return.
  * @return Vector of tuples of found transactions, their metadata and
  *         account sequences sorted in ascending order by account
  *         sequence and marker for next search if search not finished.
@@ -339,7 +339,7 @@ oldestAccountTxPage(
     std::function<void(std::uint32_t)> const& onUnsavedLedger,
     std::function<void(std::uint32_t, std::string const&, Blob&&, Blob&&)> const& onTransaction,
     RelationalDatabase::AccountTxPageOptions const& options,
-    std::uint32_t page_length);
+    std::uint32_t pageLength);
 
 /**
  * @brief newestAccountTxPage Searches newest transactions for given
@@ -353,7 +353,7 @@ oldestAccountTxPage(
  *        match: the account, minimum and maximum ledger numbers to search,
  *        marker of first returned entry, number of transactions to return,
  *        flag if this number unlimited.
- * @param page_length Total number of transactions to return.
+ * @param pageLength Total number of transactions to return.
  * @return Vector of tuples of found transactions, their metadata and
  *         account sequences sorted in descending order by account
  *         sequence and marker for next search if search not finished.
@@ -365,7 +365,7 @@ newestAccountTxPage(
     std::function<void(std::uint32_t)> const& onUnsavedLedger,
     std::function<void(std::uint32_t, std::string const&, Blob&&, Blob&&)> const& onTransaction,
     RelationalDatabase::AccountTxPageOptions const& options,
-    std::uint32_t page_length);
+    std::uint32_t pageLength);
 
 /**
  * @brief getTransaction Returns transaction with given hash. If not found
@@ -389,7 +389,7 @@ getTransaction(
     Application& app,
     uint256 const& id,
     std::optional<ClosedInterval<uint32_t>> const& range,
-    error_code_i& ec);
+    ErrorCodeI& ec);
 
 /**
  * @brief dbHasSpace Checks if given database has available space.
diff --git a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
index 59f77142f8..a50d17bf2b 100644
--- a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
+++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp
@@ -420,23 +420,23 @@ SQLiteDatabase::oldestAccountTxPage(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const page_length(200);
+    static std::uint32_t const kPAGE_LENGTH(200);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     AccountTxs ret;
     auto onTransaction = [&ret, &app = registry_.get().getApp()](
-                             std::uint32_t ledger_index,
+                             std::uint32_t ledgerIndex,
                              std::string const& status,
                              Blob const& rawTxn,
                              Blob const& rawMeta) {
-        convertBlobsToTxResult(ret, ledger_index, status, rawTxn, rawMeta, app);
+        convertBlobsToTxResult(ret, ledgerIndex, status, rawTxn, rawMeta, app);
     };
 
     if (existsTransaction())
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, page_length)
+            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
                 .first;
         return {ret, newmarker};
     }
@@ -450,23 +450,23 @@ SQLiteDatabase::newestAccountTxPage(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const page_length(200);
+    static std::uint32_t const kPAGE_LENGTH(200);
     auto onUnsavedLedger =
         std::bind(saveLedgerAsync, std::ref(registry_.get().getApp()), std::placeholders::_1);
     AccountTxs ret;
     auto onTransaction = [&ret, &app = registry_.get().getApp()](
-                             std::uint32_t ledger_index,
+                             std::uint32_t ledgerIndex,
                              std::string const& status,
                              Blob const& rawTxn,
                              Blob const& rawMeta) {
-        convertBlobsToTxResult(ret, ledger_index, status, rawTxn, rawMeta, app);
+        convertBlobsToTxResult(ret, ledgerIndex, status, rawTxn, rawMeta, app);
     };
 
     if (existsTransaction())
     {
         auto db = checkoutTransaction();
         auto newmarker =
-            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, page_length)
+            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
                 .first;
         return {ret, newmarker};
     }
@@ -480,7 +480,7 @@ SQLiteDatabase::oldestAccountTxPageB(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const page_length(500);
+    static std::uint32_t const kPAGE_LENGTH(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, page_length)
+            detail::oldestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
                 .first;
         return {ret, newmarker};
     }
@@ -508,7 +508,7 @@ SQLiteDatabase::newestAccountTxPageB(AccountTxPageOptions const& options)
     if (!useTxTables_)
         return {};
 
-    static std::uint32_t const page_length(500);
+    static std::uint32_t const kPAGE_LENGTH(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, page_length)
+            detail::newestAccountTxPage(*db, onUnsavedLedger, onTransaction, options, kPAGE_LENGTH)
                 .first;
         return {ret, newmarker};
     }
@@ -534,7 +534,7 @@ std::variant<RelationalDatabase::AccountTx, TxSearched>
 SQLiteDatabase::getTransaction(
     uint256 const& id,
     std::optional<ClosedInterval<std::uint32_t>> const& range,
-    error_code_i& ec)
+    ErrorCodeI& ec)
 {
     if (!useTxTables_)
         return TxSearched::Unknown;
@@ -635,21 +635,21 @@ SQLiteDatabase::SQLiteDatabase(ServiceRegistry& registry, Config const& config,
     , useTxTables_(config.useTxTables())
     , j_(registry.getJournal("SQLiteDatabase"))
 {
-    DatabaseCon::Setup const setup = setup_DatabaseCon(config, j_);
+    DatabaseCon::Setup const setup = setupDatabaseCon(config, j_);
     if (!makeLedgerDBs(
             config,
             setup,
             DatabaseCon::CheckpointerSetup{.jobQueue = &jobQueue, .registry = registry_}))
     {
-        std::string_view constexpr error = "Failed to create ledger databases";
+        std::string_view constexpr kERROR = "Failed to create ledger databases";
 
-        JLOG(j_.fatal()) << error;
-        Throw<std::runtime_error>(error.data());
+        JLOG(j_.fatal()) << kERROR;
+        Throw<std::runtime_error>(kERROR.data());
     }
 }
 
 SQLiteDatabase
-setup_RelationalDatabase(ServiceRegistry& registry, Config const& config, JobQueue& jobQueue)
+setupRelationalDatabase(ServiceRegistry& registry, Config const& config, JobQueue& jobQueue)
 {
     return {registry, config, jobQueue};
 }
diff --git a/src/xrpld/app/rdb/detail/PeerFinder.cpp b/src/xrpld/app/rdb/detail/PeerFinder.cpp
index 2f8d0355af..7227c65663 100644
--- a/src/xrpld/app/rdb/detail/PeerFinder.cpp
+++ b/src/xrpld/app/rdb/detail/PeerFinder.cpp
@@ -27,10 +27,10 @@ namespace xrpl {
 void
 initPeerFinderDB(soci::session& session, BasicConfig const& config, beast::Journal j)
 {
-    DBConfig const m_sociConfig(config, "peerfinder");
-    m_sociConfig.open(session);
+    DBConfig const sociConfig(config, "peerfinder");
+    sociConfig.open(session);
 
-    JLOG(j.info()) << "Opening database at '" << m_sociConfig.connectionString() << "'";
+    JLOG(j.info()) << "Opening database at '" << sociConfig.connectionString() << "'";
 
     soci::transaction tr(session);
     session << "PRAGMA encoding=\"UTF-8\";";
@@ -126,8 +126,8 @@ updatePeerFinderDB(soci::session& session, int currentSchemaVersion, beast::Jour
             while (st.fetch())
             {
                 PeerFinder::Store::Entry entry;
-                entry.endpoint = beast::IP::Endpoint::from_string(s);
-                if (!is_unspecified(entry.endpoint))
+                entry.endpoint = beast::IP::Endpoint::fromString(s);
+                if (!isUnspecified(entry.endpoint))
                 {
                     entry.valence = valence;
                     list.push_back(entry);
diff --git a/src/xrpld/consensus/Consensus.cpp b/src/xrpld/consensus/Consensus.cpp
index 309813cf7e..5498f7cf79 100644
--- a/src/xrpld/consensus/Consensus.cpp
+++ b/src/xrpld/consensus/Consensus.cpp
@@ -93,14 +93,14 @@ bool
 checkConsensusReached(
     std::size_t agreeing,
     std::size_t total,
-    bool count_self,
+    bool countSelf,
     std::size_t minConsensusPct,
     bool reachedMax,
     bool stalled,
     std::unique_ptr<std::stringstream> const& clog)
 {
     CLOG(clog) << "checkConsensusReached params: agreeing: " << agreeing << ", total: " << total
-               << ", count_self: " << count_self << ", minConsensusPct: " << minConsensusPct
+               << ", count_self: " << countSelf << ", minConsensusPct: " << minConsensusPct
                << ", reachedMax: " << reachedMax << ". ";
 
     // If we are alone for too long, we have consensus.
@@ -135,7 +135,7 @@ checkConsensusReached(
         return true;
     }
 
-    if (count_self)
+    if (countSelf)
     {
         ++agreeing;
         ++total;
diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h
index 32460516bd..e5c06bd1c8 100644
--- a/src/xrpld/consensus/Consensus.h
+++ b/src/xrpld/consensus/Consensus.h
@@ -180,7 +180,7 @@ checkConsensus(
     auto closeAgree() const;
     auto closeTime() const;
     auto parentCloseTime() const;
-    Json::Value getJson() const;
+    json::Value getJson() const;
   };
 
   // Wraps a peer's ConsensusProposal
@@ -311,7 +311,7 @@ class Consensus
 
 public:
     //! Clock type for measuring time within the consensus code
-    using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+    using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
     Consensus(Consensus&&) noexcept = default;
 
@@ -421,7 +421,7 @@ public:
         @param full True if verbose response desired.
         @return     The Json state.
     */
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson(bool full) const;
 
 private:
@@ -535,8 +535,8 @@ private:
 private:
     Adaptor& adaptor_;
 
-    ConsensusPhase phase_{ConsensusPhase::accepted};
-    MonitoredMode mode_{ConsensusMode::observing};
+    ConsensusPhase phase_{ConsensusPhase::Accepted};
+    MonitoredMode mode_{ConsensusMode::Observing};
     bool firstRound_ = true;
     bool haveCloseTimeConsensus_ = false;
 
@@ -549,9 +549,9 @@ private:
     // How long has this round been open
     ConsensusTimer openTime_;
 
-    NetClock::duration closeResolution_ = ledgerDefaultTimeResolution;
+    NetClock::duration closeResolution_ = kLEDGER_DEFAULT_TIME_RESOLUTION;
 
-    ConsensusParms::AvalancheState closeTimeAvalancheState_ = ConsensusParms::AvalancheState::init;
+    ConsensusParms::AvalancheState closeTimeAvalancheState_ = ConsensusParms::AvalancheState::Init;
 
     // Time it took for the last consensus round to converge
     std::chrono::milliseconds prevRoundTime_{};
@@ -637,7 +637,7 @@ Consensus<Adaptor>::startRound(
     for (NodeID_t const& n : nowUntrusted)
         recentPeerPositions_.erase(n);
 
-    ConsensusMode startMode = proposing ? ConsensusMode::proposing : ConsensusMode::observing;
+    ConsensusMode startMode = proposing ? ConsensusMode::Proposing : ConsensusMode::Observing;
 
     // We were handed the wrong ledger
     if (prevLedger.id() != prevLedgerID)
@@ -649,7 +649,7 @@ Consensus<Adaptor>::startRound(
         }
         else  // Unable to acquire the correct ledger
         {
-            startMode = ConsensusMode::wrongLedger;
+            startMode = ConsensusMode::WrongLedger;
             JLOG(j_.info()) << "Entering consensus with: " << previousLedger_.id();
             JLOG(j_.info()) << "Correct LCL is: " << prevLedgerID;
         }
@@ -666,9 +666,9 @@ Consensus<Adaptor>::startRoundInternal(
     ConsensusMode mode,
     std::unique_ptr<std::stringstream> const& clog)
 {
-    phase_ = ConsensusPhase::open;
-    JLOG(j_.debug()) << "transitioned to ConsensusPhase::open ";
-    CLOG(clog) << "startRoundInternal transitioned to ConsensusPhase::open, "
+    phase_ = ConsensusPhase::Open;
+    JLOG(j_.debug()) << "transitioned to ConsensusPhase::Open ";
+    CLOG(clog) << "startRoundInternal transitioned to ConsensusPhase::Open, "
                   "previous ledgerID: "
                << prevLedgerID << ", seq: " << prevLedger.seq() << ". ";
     mode_.set(mode, adaptor_);
@@ -677,7 +677,7 @@ Consensus<Adaptor>::startRoundInternal(
     previousLedger_ = prevLedger;
     result_.reset();
     convergePercent_ = 0;
-    closeTimeAvalancheState_ = ConsensusParms::AvalancheState::init;
+    closeTimeAvalancheState_ = ConsensusParms::AvalancheState::Init;
     haveCloseTimeConsensus_ = false;
     openTime_.reset(clock_.now());
     currPeerPositions_.clear();
@@ -729,7 +729,7 @@ Consensus<Adaptor>::peerProposalInternal(
     PeerPosition_t const& newPeerPos)
 {
     // Nothing to do for now if we are currently working on a ledger
-    if (phase_ == ConsensusPhase::accepted)
+    if (phase_ == ConsensusPhase::Accepted)
         return false;
 
     now_ = now;
@@ -830,7 +830,7 @@ Consensus<Adaptor>::timerEntry(
 {
     CLOG(clog) << "Consensus<Adaptor>::timerEntry. ";
     // Nothing to do if we are currently working on a ledger
-    if (phase_ == ConsensusPhase::accepted)
+    if (phase_ == ConsensusPhase::Accepted)
     {
         CLOG(clog) << "Nothing to do during accepted phase. ";
         return;
@@ -848,11 +848,11 @@ Consensus<Adaptor>::timerEntry(
         CLOG(clog) << "Changed phase to << " << to_string(phase_) << ". ";
     }
 
-    if (phase_ == ConsensusPhase::open)
+    if (phase_ == ConsensusPhase::Open)
     {
         phaseOpen(clog);
     }
-    else if (phase_ == ConsensusPhase::establish)
+    else if (phase_ == ConsensusPhase::Establish)
     {
         phaseEstablish(clog);
     }
@@ -864,7 +864,7 @@ void
 Consensus<Adaptor>::gotTxSet(NetClock::time_point const& now, TxSet_t const& txSet)
 {
     // Nothing to do if we've finished work on a ledger
-    if (phase_ == ConsensusPhase::accepted)
+    if (phase_ == ConsensusPhase::Accepted)
         return;
 
     now_ = now;
@@ -918,7 +918,7 @@ Consensus<Adaptor>::simulate(
     result_->roundTime.tick(consensusDelay.value_or(100ms));
     result_->proposers = prevProposers_ = currPeerPositions_.size();
     prevRoundTime_ = result_->roundTime.read();
-    phase_ = ConsensusPhase::accepted;
+    phase_ = ConsensusPhase::Accepted;
     adaptor_.onForceAccept(
         *result_, previousLedger_, closeResolution_, rawCloseTimes_, mode_.get(), getJson(true));
     // NOLINTEND(bugprone-unchecked-optional-access)
@@ -926,18 +926,18 @@ Consensus<Adaptor>::simulate(
 }
 
 template <class Adaptor>
-Json::Value
+json::Value
 Consensus<Adaptor>::getJson(bool full) const
 {
     using std::to_string;
-    using Int = Json::Value::Int;
+    using Int = json::Value::Int;
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
-    ret["proposing"] = (mode_.get() == ConsensusMode::proposing);
+    ret["proposing"] = (mode_.get() == ConsensusMode::Proposing);
     ret["proposers"] = static_cast<int>(currPeerPositions_.size());
 
-    if (mode_.get() != ConsensusMode::wrongLedger)
+    if (mode_.get() != ConsensusMode::WrongLedger)
     {
         ret["synched"] = true;
         ret["ledger_seq"] = static_cast<std::uint32_t>(previousLedger_.seq()) + 1;
@@ -968,7 +968,7 @@ Consensus<Adaptor>::getJson(bool full) const
 
         if (!currPeerPositions_.empty())
         {
-            Json::Value ppj(Json::objectValue);
+            json::Value ppj(json::ObjectValue);
 
             for (auto const& [nodeId, peerPos] : currPeerPositions_)
             {
@@ -979,7 +979,7 @@ Consensus<Adaptor>::getJson(bool full) const
 
         if (!acquired_.empty())
         {
-            Json::Value acq(Json::arrayValue);
+            json::Value acq(json::ArrayValue);
             for (auto const& at : acquired_)
             {
                 acq.append(to_string(at.first));
@@ -989,7 +989,7 @@ Consensus<Adaptor>::getJson(bool full) const
 
         if (result_ && !result_->disputes.empty())
         {
-            Json::Value dsj(Json::objectValue);
+            json::Value dsj(json::ObjectValue);
             for (auto const& [txId, dispute] : result_->disputes)
             {
                 dsj[to_string(txId)] = dispute.getJson();
@@ -999,7 +999,7 @@ Consensus<Adaptor>::getJson(bool full) const
 
         if (!rawCloseTimes_.peers.empty())
         {
-            Json::Value ctj(Json::objectValue);
+            json::Value ctj(json::ObjectValue);
             for (auto const& ct : rawCloseTimes_.peers)
             {
                 ctj[std::to_string(ct.first.time_since_epoch().count())] = ct.second;
@@ -1009,7 +1009,7 @@ Consensus<Adaptor>::getJson(bool full) const
 
         if (!deadNodes_.empty())
         {
-            Json::Value dnj(Json::arrayValue);
+            json::Value dnj(json::ArrayValue);
             for (auto const& dn : deadNodes_)
             {
                 dnj.append(to_string(dn));
@@ -1067,12 +1067,12 @@ Consensus<Adaptor>::handleWrongLedger(
     {
         JLOG(j_.info()) << "Have the consensus ledger " << prevLedgerID_;
         CLOG(clog) << "Have the consensus ledger " << prevLedgerID_ << ". ";
-        startRoundInternal(now_, lgrId, *newLedger, ConsensusMode::switchedLedger, clog);
+        startRoundInternal(now_, lgrId, *newLedger, ConsensusMode::SwitchedLedger, clog);
     }
     else
     {
         CLOG(clog) << "Still on wrong ledger. ";
-        mode_.set(ConsensusMode::wrongLedger, adaptor_);
+        mode_.set(ConsensusMode::WrongLedger, adaptor_);
     }
 }
 
@@ -1091,10 +1091,10 @@ Consensus<Adaptor>::checkLedger(std::unique_ptr<std::stringstream> const& clog)
         std::stringstream ss;
         ss << "View of consensus changed during " << to_string(phase_)
            << " mode=" << to_string(mode_.get()) << ", " << prevLedgerID_ << " to " << netLgr
-           << ", " << Json::Compact{previousLedger_.getJson()} << ". ";
+           << ", " << json::Compact{previousLedger_.getJson()} << ". ";
         JLOG(j_.warn()) << ss.str();
         CLOG(clog) << ss.str();
-        CLOG(clog) << "State on consensus change " << Json::Compact{getJson(true)} << ". ";
+        CLOG(clog) << "State on consensus change " << json::Compact{getJson(true)} << ". ";
         handleWrongLedger(netLgr, clog);
     }
     else if (previousLedger_.id() != prevLedgerID_)
@@ -1143,7 +1143,7 @@ Consensus<Adaptor>::phaseOpen(std::unique_ptr<std::stringstream> const& clog)
         bool const closeAgree = previousLedger_.closeAgree();
         auto const prevCloseTime = previousLedger_.closeTime();
         auto const prevParentCloseTimePlus1 = previousLedger_.parentCloseTime() + 1s;
-        bool const previousCloseCorrect = (mode != ConsensusMode::wrongLedger) && closeAgree &&
+        bool const previousCloseCorrect = (mode != ConsensusMode::WrongLedger) && closeAgree &&
             (prevCloseTime != prevParentCloseTimePlus1);
 
         auto const lastCloseTime = previousCloseCorrect
@@ -1249,7 +1249,7 @@ Consensus<Adaptor>::shouldPause(std::unique_ptr<std::stringstream> const& clog)
      *  3: >=95%
      *  4: =100%
      */
-    constexpr static std::size_t maxPausePhase = 4;
+    constexpr static std::size_t kMAX_PAUSE_PHASE = 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) % (maxPausePhase + 1);
+    std::size_t const phase = (ahead - 1) % (kMAX_PAUSE_PHASE + 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 maxPausePhase:
+        case kMAX_PAUSE_PHASE:
             // 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) / maxPausePhase;
+            float const phaseFactor = static_cast<float>(phase) / kMAX_PAUSE_PHASE;
 
             if (nonLaggards / totalValidators < quorumRatio + (allowedDissent * phaseFactor))
             {
@@ -1367,12 +1367,12 @@ Consensus<Adaptor>::phaseEstablish(std::unique_ptr<std::stringstream> const& clo
 
     JLOG(j_.info()) << "Converge cutoff (" << currPeerPositions_.size() << " participants)";
     CLOG(clog) << "Converge cutoff (" << currPeerPositions_.size()
-               << " participants). Transitioned to ConsensusPhase::accepted. ";
+               << " participants). Transitioned to ConsensusPhase::Accepted. ";
     adaptor_.updateOperatingMode(currPeerPositions_.size());
     prevProposers_ = currPeerPositions_.size();
     prevRoundTime_ = result_->roundTime.read();
-    phase_ = ConsensusPhase::accepted;
-    JLOG(j_.debug()) << "transitioned to ConsensusPhase::accepted";
+    phase_ = ConsensusPhase::Accepted;
+    JLOG(j_.debug()) << "transitioned to ConsensusPhase::Accepted";
     adaptor_.onAccept(
         *result_,
         previousLedger_,
@@ -1391,8 +1391,8 @@ Consensus<Adaptor>::closeLedger(std::unique_ptr<std::stringstream> const& clog)
     // We should not be closing if we already have a position
     XRPL_ASSERT(!result_, "xrpl::Consensus::closeLedger : result is not set");
 
-    phase_ = ConsensusPhase::establish;
-    JLOG(j_.debug()) << "transitioned to ConsensusPhase::establish";
+    phase_ = ConsensusPhase::Establish;
+    JLOG(j_.debug()) << "transitioned to ConsensusPhase::Establish";
     rawCloseTimes_.self = now_;
     peerUnchangedCounter_ = 0;
     establishCounter_ = 0;
@@ -1405,9 +1405,9 @@ Consensus<Adaptor>::closeLedger(std::unique_ptr<std::stringstream> const& clog)
         adaptor_.share(result_->txns);
 
     auto const mode = mode_.get();
-    CLOG(clog) << "closeLedger transitioned to ConsensusPhase::establish, mode: " << to_string(mode)
+    CLOG(clog) << "closeLedger transitioned to ConsensusPhase::Establish, mode: " << to_string(mode)
                << ", number of peer positions: " << currPeerPositions_.size() << ". ";
-    if (mode == ConsensusMode::proposing)
+    if (mode == ConsensusMode::Proposing)
         adaptor_.propose(result_->position);
 
     // Create disputes with any peer positions we have transactions for
@@ -1491,7 +1491,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&
             // Because the threshold for inclusion increases,
             //  time can change our position on a dispute
             if (dispute.updateVote(
-                    convergePercent_, mode_.get() == ConsensusMode::proposing, parms))
+                    convergePercent_, mode_.get() == ConsensusMode::Proposing, parms))
             {
                 if (!mutableSet)
                     mutableSet.emplace(result_->txns);
@@ -1532,7 +1532,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&
         CLOG(clog) << "neededWeight " << neededWeight << ". ";
 
         int participants = currPeerPositions_.size();
-        if (mode_.get() == ConsensusMode::proposing)
+        if (mode_.get() == ConsensusMode::Proposing)
         {
             ++closeTimeVotes[asCloseTime(result_->position.closeTime())];
             ++participants;
@@ -1616,7 +1616,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&
         }
 
         // Share our new position if we are still participating this round
-        if (!result_->position.isBowOut() && (mode_.get() == ConsensusMode::proposing))
+        if (!result_->position.isBowOut() && (mode_.get() == ConsensusMode::Proposing))
             adaptor_.propose(result_->position);
     }
     // NOLINTEND(bugprone-unchecked-optional-access)
@@ -1662,7 +1662,7 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
         haveCloseTimeConsensus_ && !result_->disputes.empty() &&
         std::ranges::all_of(result_->disputes, [this, &parms, &clog](auto const& dispute) {
             return dispute.second.stalled(
-                parms, mode_.get() == ConsensusMode::proposing, peerUnchangedCounter_, j_, clog);
+                parms, mode_.get() == ConsensusMode::Proposing, peerUnchangedCounter_, j_, clog);
         });
     if (stalled)
     {
@@ -1683,7 +1683,7 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
         result_->roundTime.read(),
         stalled,
         parms,
-        mode_.get() == ConsensusMode::proposing,
+        mode_.get() == ConsensusMode::Proposing,
         j_,
         clog);
 
@@ -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 minimumCounter = parms.avalancheCutoffs.size() * parms.avMIN_ROUNDS;
+        static auto const kMINIMUM_COUNTER = parms.avalancheCutoffs.size() * parms.avMIN_ROUNDS;
         std::stringstream ss;
-        if (establishCounter_ < minimumCounter)
+        if (establishCounter_ < kMINIMUM_COUNTER)
         {
             // If each round of phaseEstablish takes a very long time, we may
             // "expire" before we've given consensus enough time at each
@@ -1708,13 +1708,13 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
             // amount of time.
 
             ss << "Consensus time has expired in round " << establishCounter_
-               << "; continue until round " << minimumCounter << ". "
-               << Json::Compact{getJson(false)};
+               << "; continue until round " << kMINIMUM_COUNTER << ". "
+               << json::Compact{getJson(false)};
             JLOG(j_.error()) << ss.str();
             CLOG(clog) << ss.str() << ". ";
             return false;
         }
-        ss << "Consensus expired. " << Json::Compact{getJson(true)};
+        ss << "Consensus expired. " << json::Compact{getJson(true)};
         JLOG(j_.error()) << ss.str();
         CLOG(clog) << ss.str() << ". ";
         leaveConsensus(clog);
@@ -1724,8 +1724,8 @@ Consensus<Adaptor>::haveConsensus(std::unique_ptr<std::stringstream> const& clog
     if (result_->state == ConsensusState::MovedOn)
     {
         JLOG(j_.error()) << "Unable to reach consensus";
-        JLOG(j_.error()) << Json::Compact{getJson(true)};
-        CLOG(clog) << "Unable to reach consensus " << Json::Compact{getJson(true)} << ". ";
+        JLOG(j_.error()) << json::Compact{getJson(true)};
+        CLOG(clog) << "Unable to reach consensus " << json::Compact{getJson(true)} << ". ";
     }
 
     CLOG(clog) << "Consensus has been reached. ";
@@ -1737,7 +1737,7 @@ template <class Adaptor>
 void
 Consensus<Adaptor>::leaveConsensus(std::unique_ptr<std::stringstream> const& clog)
 {
-    if (mode_.get() == ConsensusMode::proposing)
+    if (mode_.get() == ConsensusMode::Proposing)
     {
         if (result_ && !result_->position.isBowOut())
         {
@@ -1745,7 +1745,7 @@ Consensus<Adaptor>::leaveConsensus(std::unique_ptr<std::stringstream> const& clo
             adaptor_.propose(result_->position);
         }
 
-        mode_.set(ConsensusMode::observing, adaptor_);
+        mode_.set(ConsensusMode::Observing, adaptor_);
         JLOG(j_.info()) << "Bowing out of consensus";
         CLOG(clog) << "Bowing out of consensus. ";
     }
diff --git a/src/xrpld/consensus/ConsensusParms.h b/src/xrpld/consensus/ConsensusParms.h
index 7b9ec5dcff..88a6318b3c 100644
--- a/src/xrpld/consensus/ConsensusParms.h
+++ b/src/xrpld/consensus/ConsensusParms.h
@@ -106,7 +106,7 @@ struct ConsensusParms
     // As a function of the percent this round's duration is of the prior round,
     // we increase the threshold for yes votes to add a transaction to our
     // position.
-    enum class AvalancheState { init, mid, late, stuck };
+    enum class AvalancheState { Init, Mid, Late, Stuck };
     struct AvalancheCutoff
     {
         int const consensusTime;
@@ -121,18 +121,18 @@ struct ConsensusParms
     std::map<AvalancheState, AvalancheCutoff> const avalancheCutoffs{
         // {state, {time, percent, nextState}},
         // Initial state: 50% of nodes must vote yes
-        {AvalancheState::init,
-         {.consensusTime = 0, .consensusPct = 50, .next = AvalancheState::mid}},
+        {AvalancheState::Init,
+         {.consensusTime = 0, .consensusPct = 50, .next = AvalancheState::Mid}},
         // mid-consensus starts after 50% of the previous round time, and
         // requires 65% yes
-        {AvalancheState::mid,
-         {.consensusTime = 50, .consensusPct = 65, .next = AvalancheState::late}},
+        {AvalancheState::Mid,
+         {.consensusTime = 50, .consensusPct = 65, .next = AvalancheState::Late}},
         // late consensus starts after 85% time, and requires 70% yes
-        {AvalancheState::late,
-         {.consensusTime = 85, .consensusPct = 70, .next = AvalancheState::stuck}},
+        {AvalancheState::Late,
+         {.consensusTime = 85, .consensusPct = 70, .next = AvalancheState::Stuck}},
         // we're stuck after 2x time, requires 95% yes votes
-        {AvalancheState::stuck,
-         {.consensusTime = 200, .consensusPct = 95, .next = AvalancheState::stuck}},
+        {AvalancheState::Stuck,
+         {.consensusTime = 200, .consensusPct = 95, .next = AvalancheState::Stuck}},
     };
 
     //! Percentage of nodes required to reach agreement on ledger close time
diff --git a/src/xrpld/consensus/ConsensusProposal.h b/src/xrpld/consensus/ConsensusProposal.h
index d2dfcc1afa..ebfe61711a 100644
--- a/src/xrpld/consensus/ConsensusProposal.h
+++ b/src/xrpld/consensus/ConsensusProposal.h
@@ -26,26 +26,26 @@ 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 `seqLeave`).
+    the special value `kSEQ_LEAVE`).
 
     Refer to @ref Consensus for requirements of the template arguments.
 
-    @tparam NodeID_t Type used to uniquely identify nodes/peers
-    @tparam LedgerID_t Type used to uniquely identify ledgers
-    @tparam Position_t Type used to represent the position taken on transactions
+    @tparam NodeId Type used to uniquely identify nodes/peers
+    @tparam LedgerId Type used to uniquely identify ledgers
+    @tparam Position Type used to represent the position taken on transactions
                        under consideration during this round of consensus
  */
-template <class NodeID_t, class LedgerID_t, class Position_t>
+template <class NodeId, class LedgerId, class Position>
 class ConsensusProposal
 {
 public:
-    using NodeID = NodeID_t;
+    using NodeID = NodeId;
 
     //< Sequence value when a peer initially joins consensus
-    static std::uint32_t const seqJoin = 0;
+    static std::uint32_t const kSEQ_JOIN = 0;
 
     //< Sequence number when  a peer wants to bow out and leave consensus
-    static std::uint32_t const seqLeave = 0xffffffff;
+    static std::uint32_t const kSEQ_LEAVE = 0xffffffff;
 
     /** Constructor
 
@@ -57,12 +57,12 @@ public:
         @param nodeID ID of node/peer taking this position.
     */
     ConsensusProposal(
-        LedgerID_t const& prevLedger,
+        LedgerId const& prevLedger,
         std::uint32_t seq,
-        Position_t const& position,
+        Position const& position,
         NetClock::time_point closeTime,
         NetClock::time_point now,
-        NodeID_t const& nodeID)
+        NodeId const& nodeID)
         : previousLedger_(prevLedger)
         , position_(position)
         , closeTime_(closeTime)
@@ -73,21 +73,21 @@ public:
     }
 
     //! Identifying which peer took this position.
-    NodeID_t const&
+    NodeId const&
     nodeID() const
     {
         return nodeID_;
     }
 
     //! Get the proposed position.
-    Position_t const&
+    Position const&
     position() const
     {
         return position_;
     }
 
     //! Get the prior accepted ledger this position is based on.
-    LedgerID_t const&
+    LedgerId const&
     prevLedger() const
     {
         return previousLedger_;
@@ -95,7 +95,7 @@ public:
 
     /** Get the sequence number of this proposal
 
-        Starting with an initial sequence number of `seqJoin`, successive
+        Starting with an initial sequence number of `kSEQ_JOIN`, successive
         proposals from a peer will increase the sequence number.
 
         @return the sequence number
@@ -126,14 +126,14 @@ public:
     bool
     isInitial() const
     {
-        return proposeSeq_ == seqJoin;
+        return proposeSeq_ == kSEQ_JOIN;
     }
 
     //! Get whether this node left the consensus process
     bool
     isBowOut() const
     {
-        return proposeSeq_ == seqLeave;
+        return proposeSeq_ == kSEQ_LEAVE;
     }
 
     //! Get whether this position is stale relative to the provided cutoff
@@ -152,7 +152,7 @@ public:
      */
     void
     changePosition(
-        Position_t const& newPosition,
+        Position const& newPosition,
         NetClock::time_point newCloseTime,
         NetClock::time_point now)
     {
@@ -160,7 +160,7 @@ public:
         position_ = newPosition;
         closeTime_ = newCloseTime;
         time_ = now;
-        if (proposeSeq_ != seqLeave)
+        if (proposeSeq_ != kSEQ_LEAVE)
             ++proposeSeq_;
     }
 
@@ -175,7 +175,7 @@ public:
     {
         signingHash_.reset();
         time_ = now;
-        proposeSeq_ = seqLeave;
+        proposeSeq_ = kSEQ_LEAVE;
     }
 
     std::string
@@ -190,12 +190,12 @@ public:
     }
 
     //! Get JSON representation for debugging
-    Json::Value
+    json::Value
     getJson() const
     {
         using std::to_string;
 
-        Json::Value ret = Json::objectValue;
+        json::Value ret = json::ObjectValue;
         ret[jss::previous_ledger] = to_string(prevLedger());
 
         if (!isBowOut())
@@ -216,7 +216,7 @@ public:
         if (!signingHash_)
         {
             signingHash_ = sha512Half(
-                HashPrefix::proposal,
+                HashPrefix::Proposal,
                 std::uint32_t(proposeSeq()),
                 closeTime().time_since_epoch().count(),
                 prevLedger(),
@@ -228,10 +228,10 @@ public:
 
 private:
     //! Unique identifier of prior ledger this proposal is based on
-    LedgerID_t previousLedger_;
+    LedgerId previousLedger_;
 
     //! Unique identifier of the position this proposal is taking
-    Position_t position_;
+    Position position_;
 
     //! The ledger close time this position is taking
     NetClock::time_point closeTime_;
@@ -243,17 +243,17 @@ private:
     std::uint32_t proposeSeq_;
 
     //! The identifier of the node taking this position
-    NodeID_t nodeID_;
+    NodeId nodeID_;
 
     //! The signing hash for this proposal
     mutable std::optional<uint256> signingHash_;
 };
 
-template <class NodeID_t, class LedgerID_t, class Position_t>
+template <class NodeId, class LedgerId, class Position>
 bool
 operator==(
-    ConsensusProposal<NodeID_t, LedgerID_t, Position_t> const& a,
-    ConsensusProposal<NodeID_t, LedgerID_t, Position_t> const& b)
+    ConsensusProposal<NodeId, LedgerId, Position> const& a,
+    ConsensusProposal<NodeId, LedgerId, Position> const& b)
 {
     return a.nodeID() == b.nodeID() && a.proposeSeq() == b.proposeSeq() &&
         a.prevLedger() == b.prevLedger() && a.position() == b.position() &&
diff --git a/src/xrpld/consensus/ConsensusTypes.h b/src/xrpld/consensus/ConsensusTypes.h
index 8a81211722..64a7f5fdea 100644
--- a/src/xrpld/consensus/ConsensusTypes.h
+++ b/src/xrpld/consensus/ConsensusTypes.h
@@ -36,16 +36,16 @@ namespace xrpl {
 */
 enum class ConsensusMode {
     //! We are normal participant in consensus and propose our position
-    proposing,
+    Proposing,
     //! We are observing peer positions, but not proposing our position
-    observing,
+    Observing,
     //! We have the wrong ledger and are attempting to acquire it
-    wrongLedger,
+    WrongLedger,
     //! We switched ledgers since we started this consensus round but are now
     //! running on what we believe is the correct ledger.  This mode is as
     //! if we entered the round observing, but is used to indicate we did
     //! have the wrongLedger at some point.
-    switchedLedger
+    SwitchedLedger
 };
 
 inline std::string
@@ -53,13 +53,13 @@ to_string(ConsensusMode m)
 {
     switch (m)
     {
-        case ConsensusMode::proposing:
+        case ConsensusMode::Proposing:
             return "proposing";
-        case ConsensusMode::observing:
+        case ConsensusMode::Observing:
             return "observing";
-        case ConsensusMode::wrongLedger:
+        case ConsensusMode::WrongLedger:
             return "wrongLedger";
-        case ConsensusMode::switchedLedger:
+        case ConsensusMode::SwitchedLedger:
             return "switchedLedger";
         default:
             return "unknown";
@@ -84,15 +84,15 @@ to_string(ConsensusMode m)
 */
 enum class ConsensusPhase {
     //! We haven't closed our ledger yet, but others might have
-    open,
+    Open,
 
     //! Establishing consensus by exchanging proposals with our peers
-    establish,
+    Establish,
 
     //! We have accepted a new last closed ledger and are waiting on a call
     //! to startRound to begin the next consensus round.  No changes
     //! to consensus phase occur while in this phase.
-    accepted,
+    Accepted,
 };
 
 inline std::string
@@ -100,11 +100,11 @@ to_string(ConsensusPhase p)
 {
     switch (p)
     {
-        case ConsensusPhase::open:
+        case ConsensusPhase::Open:
             return "open";
-        case ConsensusPhase::establish:
+        case ConsensusPhase::Establish:
             return "establish";
-        case ConsensusPhase::accepted:
+        case ConsensusPhase::Accepted:
             return "accepted";
         default:
             return "unknown";
diff --git a/src/xrpld/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h
index 4320505d0f..795f399d1f 100644
--- a/src/xrpld/consensus/DisputedTx.h
+++ b/src/xrpld/consensus/DisputedTx.h
@@ -22,15 +22,15 @@ namespace xrpl {
 
     Refer to @ref Consensus for details on the template type requirements.
 
-    @tparam Tx_t The type for a transaction
-    @tparam NodeID_t The type for a node identifier
+    @tparam Tx The type for a transaction
+    @tparam NodeId The type for a node identifier
 */
 
-template <class Tx_t, class NodeID_t>
+template <class Tx, class NodeId>
 class DisputedTx
 {
-    using TxID_t = typename Tx_t::ID;
-    using Map_t = boost::container::flat_map<NodeID_t, bool>;
+    using TxID_t = typename Tx::ID;
+    using Map_t = boost::container::flat_map<NodeId, bool>;
 
 public:
     /** Constructor
@@ -40,7 +40,7 @@ public:
         @param numPeers Anticipated number of peer votes
         @param j Journal for debugging
     */
-    DisputedTx(Tx_t tx, bool ourVote, std::size_t numPeers, beast::Journal j)
+    DisputedTx(Tx tx, bool ourVote, std::size_t numPeers, beast::Journal j)
         : ourVote_(ourVote), tx_(std::move(tx)), j_(j)
     {
         votes_.reserve(numPeers);
@@ -48,7 +48,7 @@ public:
 
     //! The unique id/hash of the disputed transaction.
     [[nodiscard]] TxID_t const&
-    ID() const
+    id() const
     {
         return tx_.id();
     }
@@ -115,7 +115,7 @@ public:
             // stalling is an error condition for even a single
             // transaction.
             std::stringstream s;
-            s << "Transaction " << ID() << " is stalled. We have been voting "
+            s << "Transaction " << id() << " is stalled. We have been voting "
               << (getOurVote() ? "YES" : "NO") << " for " << currentVoteCounter_
               << " rounds. Peers have not changed their votes in " << peersUnchanged
               << " rounds. The transaction has " << weight << "% support. ";
@@ -127,7 +127,7 @@ public:
     }
 
     //! The disputed transaction.
-    [[nodiscard]] Tx_t const&
+    [[nodiscard]] Tx const&
     tx() const
     {
         return tx_;
@@ -149,14 +149,14 @@ public:
        change.)
     */
     [[nodiscard]] bool
-    setVote(NodeID_t const& peer, bool votesYes);
+    setVote(NodeId const& peer, bool votesYes);
 
     /** Remove a peer's vote
 
         @param peer Identifier of peer.
     */
     void
-    unVote(NodeID_t const& peer);
+    unVote(NodeId const& peer);
 
     /** Update our vote given progression of consensus.
 
@@ -173,28 +173,28 @@ public:
     updateVote(int percentTime, bool proposing, ConsensusParms const& p);
 
     //! JSON representation of dispute, used for debugging
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson() const;
 
 private:
     int yays_{0};   //< Number of yes votes
     int nays_{0};   //< Number of no votes
     bool ourVote_;  //< Our vote (true is yes)
-    Tx_t tx_;       //< Transaction under dispute
+    Tx tx_;         //< Transaction under dispute
     Map_t votes_;   //< Map from NodeID to vote
     //! The number of rounds we've gone without changing our vote
     std::size_t currentVoteCounter_ = 0;
     //! Which minimum acceptance percentage phase we are currently in
-    ConsensusParms::AvalancheState avalancheState_ = ConsensusParms::AvalancheState::init;
+    ConsensusParms::AvalancheState avalancheState_ = ConsensusParms::AvalancheState::Init;
     //! How long we have been in the current acceptance phase
     std::size_t avalancheCounter_ = 0;
     beast::Journal const j_;
 };
 
 // Track a peer's yes/no vote on a particular disputed tx_
-template <class Tx_t, class NodeID_t>
+template <class Tx, class NodeId>
 bool
-DisputedTx<Tx_t, NodeID_t>::setVote(NodeID_t const& peer, bool votesYes)
+DisputedTx<Tx, NodeId>::setVote(NodeId const& peer, bool votesYes)
 {
     auto const [it, inserted] = votes_.insert(std::make_pair(peer, votesYes));
 
@@ -235,9 +235,9 @@ DisputedTx<Tx_t, NodeID_t>::setVote(NodeID_t const& peer, bool votesYes)
 }
 
 // Remove a peer's vote on this disputed transaction
-template <class Tx_t, class NodeID_t>
+template <class Tx, class NodeId>
 void
-DisputedTx<Tx_t, NodeID_t>::unVote(NodeID_t const& peer)
+DisputedTx<Tx, NodeId>::unVote(NodeId const& peer)
 {
     auto it = votes_.find(peer);
 
@@ -256,9 +256,9 @@ DisputedTx<Tx_t, NodeID_t>::unVote(NodeID_t const& peer)
     }
 }
 
-template <class Tx_t, class NodeID_t>
+template <class Tx, class NodeId>
 bool
-DisputedTx<Tx_t, NodeID_t>::updateVote(int percentTime, bool proposing, ConsensusParms const& p)
+DisputedTx<Tx, NodeId>::updateVote(int percentTime, bool proposing, ConsensusParms const& p)
 {
     if (ourVote_ && (nays_ == 0))
         return false;
@@ -303,24 +303,24 @@ DisputedTx<Tx_t, NodeID_t>::updateVote(int percentTime, bool proposing, Consensu
         JLOG(j_.info()) << "No change (" << (ourVote_ ? "YES" : "NO") << ") on " << tx_.id()
                         << " : weight " << weight << ", percent " << percentTime
                         << ", round(s) with this vote: " << currentVoteCounter_;
-        JLOG(j_.debug()) << Json::Compact{getJson()};
+        JLOG(j_.debug()) << json::Compact{getJson()};
         return false;
     }
 
     currentVoteCounter_ = 0;
     ourVote_ = newPosition;
     JLOG(j_.debug()) << "We now vote " << (ourVote_ ? "YES" : "NO") << " on " << tx_.id();
-    JLOG(j_.debug()) << Json::Compact{getJson()};
+    JLOG(j_.debug()) << json::Compact{getJson()};
     return true;
 }
 
-template <class Tx_t, class NodeID_t>
-Json::Value
-DisputedTx<Tx_t, NodeID_t>::getJson() const
+template <class Tx, class NodeId>
+json::Value
+DisputedTx<Tx, NodeId>::getJson() const
 {
     using std::to_string;
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret["yays"] = yays_;
     ret["nays"] = nays_;
@@ -328,7 +328,7 @@ DisputedTx<Tx_t, NodeID_t>::getJson() const
 
     if (!votes_.empty())
     {
-        Json::Value votes(Json::objectValue);
+        json::Value votes(json::ObjectValue);
         for (auto const& [nodeId, vote] : votes_)
             votes[to_string(nodeId)] = vote;
         ret["votes"] = std::move(votes);
diff --git a/src/xrpld/consensus/LedgerTrie.h b/src/xrpld/consensus/LedgerTrie.h
index d151802158..022219f822 100644
--- a/src/xrpld/consensus/LedgerTrie.h
+++ b/src/xrpld/consensus/LedgerTrie.h
@@ -24,7 +24,7 @@ public:
     using Seq = typename Ledger::Seq;
     using ID = typename Ledger::ID;
 
-    SpanTip(Seq s, ID i, Ledger const lgr) : seq{s}, id{i}, ledger{std::move(lgr)}
+    SpanTip(Seq s, ID i, Ledger const lgr) : seq{s}, id{i}, ledger_{std::move(lgr)}
     {
     }
 
@@ -45,11 +45,11 @@ public:
     ancestor(Seq const& s) const
     {
         XRPL_ASSERT(s <= seq, "xrpl::SpanTip::ancestor : valid input");
-        return ledger[s];
+        return ledger_[s];
     }
 
 private:
-    Ledger const ledger;
+    Ledger const ledger_;
 };
 
 namespace ledger_trie_detail {
@@ -219,10 +219,10 @@ struct Node
         return o << s.span << "(T:" << s.tipSupport << ",B:" << s.branchSupport << ")";
     }
 
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson() const
     {
-        Json::Value res;
+        json::Value res;
         std::stringstream sps;
         sps << span;
         res["span"] = sps.str();
@@ -232,7 +232,7 @@ struct Node
         res["branchSupport"] = branchSupport;
         if (!children.empty())
         {
-            Json::Value& cs = (res["children"] = Json::arrayValue);
+            json::Value& cs = (res["children"] = json::ArrayValue);
             for (auto const& child : children)
             {
                 cs.append(child->getJson());
@@ -331,10 +331,10 @@ class LedgerTrie
 
     // The root of the trie. The root is allowed to break the no-single child
     // invariant.
-    std::unique_ptr<Node> root;
+    std::unique_ptr<Node> root_;
 
     // Count of the tip support for each sequence number
-    std::map<Seq, std::uint32_t> seqSupport;
+    std::map<Seq, std::uint32_t> seqSupport_;
 
     /** Find the node in the trie that represents the longest common ancestry
         with the given ledger.
@@ -346,7 +346,7 @@ class LedgerTrie
     find(Ledger const& ledger) const
     {
         // NOLINTNEXTLINE(misc-const-correctness)
-        Node* curr = root.get();
+        Node* curr = root_.get();
 
         // Root is always defined and is in common with all ledgers
         XRPL_ASSERT(curr, "xrpl::LedgerTrie::find : non-null root");
@@ -385,7 +385,7 @@ class LedgerTrie
     findByLedgerID(Ledger const& ledger, Node* parent = nullptr) const
     {
         if (parent == nullptr)
-            parent = root.get();
+            parent = root_.get();
         if (ledger.id() == parent->span.tip().id)
             return parent;
         for (auto const& child : parent->children)
@@ -414,7 +414,7 @@ class LedgerTrie
     }
 
 public:
-    LedgerTrie() : root{std::make_unique<Node>()}
+    LedgerTrie() : root_{std::make_unique<Node>()}
     {
     }
 
@@ -499,7 +499,7 @@ public:
             incNode = incNode->parent;
         }
 
-        seqSupport[ledger.seq()] += count;
+        seqSupport_[ledger.seq()] += count;
     }
 
     /** Decrease support for a ledger, removing and compressing if possible.
@@ -521,13 +521,13 @@ public:
         count = std::min(count, loc->tipSupport);
         loc->tipSupport -= count;
 
-        auto const it = seqSupport.find(ledger.seq());
+        auto const it = seqSupport_.find(ledger.seq());
         XRPL_ASSERT(
-            it != seqSupport.end() && it->second >= count,
+            it != seqSupport_.end() && it->second >= count,
             "xrpl::LedgerTrie::remove : valid input ledger");
         it->second -= count;
         if (it->second == 0)
-            seqSupport.erase(it->first);
+            seqSupport_.erase(it->first);
 
         Node* decNode = loc;
         while (decNode)
@@ -536,7 +536,7 @@ public:
             decNode = decNode->parent;
         }
 
-        while (loc->tipSupport == 0 && loc != root.get())
+        while (loc->tipSupport == 0 && loc != root_.get())
         {
             Node* parent = loc->parent;
             if (loc->children.empty())
@@ -661,12 +661,12 @@ public:
         if (empty())
             return std::nullopt;
 
-        Node* curr = root.get();
+        Node* curr = root_.get();
 
         bool done = false;
 
         std::uint32_t uncommitted = 0;
-        auto uncommittedIt = seqSupport.begin();
+        auto uncommittedIt = seqSupport_.begin();
 
         while (curr && !done)
         {
@@ -677,7 +677,7 @@ public:
                 // Add any initial uncommitted support prior for ledgers
                 // earlier than nextSeq or earlier than largestIssued
                 Seq nextSeq = curr->span.start() + Seq{1};
-                while (uncommittedIt != seqSupport.end() &&
+                while (uncommittedIt != seqSupport_.end() &&
                        uncommittedIt->first < std::max(nextSeq, largestIssued))
                 {
                     uncommitted += uncommittedIt->second;
@@ -688,7 +688,7 @@ public:
                 while (nextSeq < curr->span.end() && curr->branchSupport > uncommitted)
                 {
                     // Jump to the next seqSupport change
-                    if (uncommittedIt != seqSupport.end() &&
+                    if (uncommittedIt != seqSupport_.end() &&
                         uncommittedIt->first < curr->span.end())
                     {
                         nextSeq = uncommittedIt->first + Seq{1};
@@ -761,7 +761,7 @@ public:
     [[nodiscard]] bool
     empty() const
     {
-        return !root || root->branchSupport == 0;
+        return !root_ || root_->branchSupport == 0;
     }
 
     /** Dump an ascii representation of the trie to the stream
@@ -769,18 +769,18 @@ public:
     void
     dump(std::ostream& o) const
     {
-        dumpImpl(o, root, 0);
+        dumpImpl(o, root_, 0);
     }
 
     /** Dump JSON representation of trie state
      */
-    [[nodiscard]] Json::Value
+    [[nodiscard]] json::Value
     getJson() const
     {
-        Json::Value res;
-        res["trie"] = root->getJson();
-        res["seq_support"] = Json::objectValue;
-        for (auto const& [seq, sup] : seqSupport)
+        json::Value res;
+        res["trie"] = root_->getJson();
+        res["seq_support"] = json::ObjectValue;
+        for (auto const& [seq, sup] : seqSupport_)
             res["seq_support"][to_string(seq)] = sup;
         return res;
     }
@@ -793,7 +793,7 @@ public:
         std::map<Seq, std::uint32_t> expectedSeqSupport;
 
         std::stack<Node const*> nodes;
-        nodes.push(root.get());
+        nodes.push(root_.get());
         while (!nodes.empty())
         {
             Node const* curr = nodes.top();
@@ -803,7 +803,7 @@ public:
 
             // Node with 0 tip support must have multiple children
             // unless it is the root node
-            if (curr != root.get() && curr->tipSupport == 0 && curr->children.size() < 2)
+            if (curr != root_.get() && curr->tipSupport == 0 && curr->children.size() < 2)
                 return false;
 
             // branchSupport = tipSupport + sum(child->branchSupport)
@@ -822,7 +822,7 @@ public:
             if (support != curr->branchSupport)
                 return false;
         }
-        return expectedSeqSupport == seqSupport;
+        return expectedSeqSupport == seqSupport_;
     }
 };
 
diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h
index 5edb1db77f..825d0f6076 100644
--- a/src/xrpld/consensus/Validations.h
+++ b/src/xrpld/consensus/Validations.h
@@ -147,15 +147,15 @@ isCurrent(
 /** Status of validation we received */
 enum class ValStatus {
     /// This was a new validation and was added
-    current,
+    Current,
     /// Not current or was older than current from this node
-    stale,
+    Stale,
     /// A validation violates the increasing seq requirement
-    badSeq,
+    BadSeq,
     /// Multiple validations by a validator for the same ledger
-    multiple,
+    Multiple,
     /// Multiple validations by a validator for different ledgers
-    conflicting
+    Conflicting
 };
 
 inline std::string
@@ -163,15 +163,15 @@ to_string(ValStatus m)
 {
     switch (m)
     {
-        case ValStatus::current:
+        case ValStatus::Current:
             return "current";
-        case ValStatus::stale:
+        case ValStatus::Stale:
             return "stale";
-        case ValStatus::badSeq:
+        case ValStatus::BadSeq:
             return "badSeq";
-        case ValStatus::multiple:
+        case ValStatus::Multiple:
             return "multiple";
-        case ValStatus::conflicting:
+        case ValStatus::Conflicting:
             return "conflicting";
         default:
             return "unknown";
@@ -295,7 +295,7 @@ class Validations
         ID,
         hash_map<NodeID, Validation>,
         std::chrono::steady_clock,
-        beast::uhash<>>
+        beast::Uhash<>>
         byLedger_;
 
     // Partial and full validations indexed by sequence
@@ -303,14 +303,14 @@ class Validations
         Seq,
         hash_map<NodeID, Validation>,
         std::chrono::steady_clock,
-        beast::uhash<>>
+        beast::Uhash<>>
         bySequence_;
 
     // A range [low_, high_) of validations to keep from expire
     struct KeepRange
     {
-        Seq low_;
-        Seq high_;
+        Seq low;
+        Seq high;
     };
     std::optional<KeepRange> toKeep_;
 
@@ -543,7 +543,7 @@ public:
     template <class... Ts>
     Validations(
         ValidationParms const& p,
-        beast::abstract_clock<std::chrono::steady_clock>& c,
+        beast::AbstractClock<std::chrono::steady_clock>& c,
         Ts&&... ts)
         : byLedger_(c), bySequence_(c), parms_(p), adaptor_(std::forward<Ts>(ts)...)
     {
@@ -591,7 +591,7 @@ public:
     add(NodeID const& nodeID, Validation const& val)
     {
         if (!isCurrent(parms_, adaptor_.now(), val.signTime(), val.seenTime()))
-            return ValStatus::stale;
+            return ValStatus::Stale;
 
         {
             std::scoped_lock const lock{mutex_};
@@ -627,22 +627,22 @@ public:
                     // ledgers. This could be the result of misconfiguration
                     // but it can also mean a Byzantine validator.
                     if (seqit->second.ledgerID() != val.ledgerID())
-                        return ValStatus::conflicting;
+                        return ValStatus::Conflicting;
 
                     // Two validations for the same sequence and for the same
                     // ledger with different sign times. This could be the
                     // result of a misconfiguration but it can also mean a
                     // Byzantine validator.
                     if (seqit->second.signTime() != val.signTime())
-                        return ValStatus::conflicting;
+                        return ValStatus::Conflicting;
 
                     // Two validations for the same sequence but with different
                     // cookies. This is probably accidental misconfiguration.
                     if (seqit->second.cookie() != val.cookie())
-                        return ValStatus::multiple;
+                        return ValStatus::Multiple;
                 }
 
-                return ValStatus::badSeq;
+                return ValStatus::BadSeq;
             }
 
             byLedger_[val.ledgerID()].insert_or_assign(nodeID, val);
@@ -661,7 +661,7 @@ public:
                 }
                 else
                 {
-                    return ValStatus::stale;
+                    return ValStatus::Stale;
                 }
             }
             else if (val.trusted())
@@ -670,7 +670,7 @@ public:
             }
         }
 
-        return ValStatus::current;
+        return ValStatus::Current;
     }
 
     /**
@@ -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 refreshTime;
-                if (auto const now = byLedger_.clock().now(); refreshTime <= now)
+                static std::chrono::steady_clock::time_point kREFRESH_TIME;
+                if (auto const now = byLedger_.clock().now(); kREFRESH_TIME <= now)
                 {
                     // The next refresh time is shortly before the expiration
                     // time from now.
-                    refreshTime = now + parms_.validationSET_EXPIRES - parms_.validationFRESHNESS;
+                    kREFRESH_TIME = now + parms_.validationSET_EXPIRES - parms_.validationFRESHNESS;
 
                     for (auto i = byLedger_.begin(); i != byLedger_.end(); ++i)
                     {
@@ -715,7 +715,7 @@ public:
                         if (!validationMap.empty())
                         {
                             auto const seq = validationMap.begin()->second.seq();
-                            if (toKeep_->low_ <= seq && seq < toKeep_->high_)
+                            if (toKeep_->low <= seq && seq < toKeep_->high)
                             {
                                 byLedger_.touch(i);
                             }
@@ -724,7 +724,7 @@ public:
 
                     for (auto i = bySequence_.begin(); i != bySequence_.end(); ++i)
                     {
-                        if (toKeep_->low_ <= i->first && i->first < toKeep_->high_)
+                        if (toKeep_->low <= i->first && i->first < toKeep_->high)
                         {
                             bySequence_.touch(i);
                         }
@@ -787,7 +787,7 @@ public:
         }
     }
 
-    Json::Value
+    json::Value
     getJsonTrie() const
     {
         std::scoped_lock const lock{mutex_};
diff --git a/src/xrpld/core/Config.h b/src/xrpld/core/Config.h
index 5dd08de74f..10fbadaae7 100644
--- a/src/xrpld/core/Config.h
+++ b/src/xrpld/core/Config.h
@@ -25,19 +25,19 @@ class Rules;
 //------------------------------------------------------------------------------
 
 enum class SizedItem : std::size_t {
-    sweepInterval = 0,
-    treeCacheSize,
-    treeCacheAge,
-    ledgerSize,
-    ledgerAge,
-    ledgerFetch,
-    hashNodeDBCache,
-    txnDBCache,
-    lgrDBCache,
-    openFinalLimit,
-    burstSize,
-    ramSizeGB,
-    accountIdCacheSize,
+    SweepInterval = 0,
+    TreeCacheSize,
+    TreeCacheAge,
+    LedgerSize,
+    LedgerAge,
+    LedgerFetch,
+    HashNodeDbCache,
+    TxnDbCache,
+    LgrDbCache,
+    OpenFinalLimit,
+    BurstSize,
+    RamSizeGb,
+    AccountIdCacheSize,
 };
 
 /** Fee schedule for startup / standalone, and to vote for.
@@ -51,10 +51,10 @@ struct FeeSetup
     XRPAmount reference_fee{10};
 
     /** The account reserve requirement in drops. */
-    XRPAmount account_reserve{10 * DROPS_PER_XRP};
+    XRPAmount account_reserve{10 * kDROPS_PER_XRP};
 
     /** The per-owned item reserve requirement in drops. */
-    XRPAmount owner_reserve{2 * DROPS_PER_XRP};
+    XRPAmount owner_reserve{2 * kDROPS_PER_XRP};
 
     /* (Remember to update the example cfg files when changing any of these
      * values.) */
@@ -76,30 +76,30 @@ class Config : public BasicConfig
 {
 public:
     // Settings related to the configuration file location and directories
-    static char const* const configFileName;
-    static char const* const configLegacyName;
-    static char const* const databaseDirName;
-    static char const* const validatorsFileName;
+    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;
 
     /** Returns the full path and filename of the debug log file. */
     [[nodiscard]] boost::filesystem::path
     getDebugLogFile() const;
 
 private:
-    boost::filesystem::path CONFIG_FILE;
+    boost::filesystem::path CONFIG_FILE_;
 
 public:
     boost::filesystem::path CONFIG_DIR;
 
 private:
-    boost::filesystem::path DEBUG_LOGFILE;
+    boost::filesystem::path DEBUG_LOGFILE_;
 
     void
     load();
     beast::Journal const j_;
 
-    bool QUIET = false;   // Minimize logging verbosity.
-    bool SILENT = false;  // No output to console after startup.
+    bool QUIET_ = false;   // Minimize logging verbosity.
+    bool SILENT_ = false;  // No output to console after startup.
     /** Operate in stand-alone mode.
 
         In stand alone mode:
@@ -109,9 +109,9 @@ private:
         - If no ledger is loaded, the default ledger with the root
           account is created.
     */
-    bool RUN_STANDALONE = false;
+    bool RUN_STANDALONE_ = false;
 
-    bool USE_TX_TABLES = true;
+    bool USE_TX_TABLES_ = true;
 
     /** Determines if the server will sign a tx, given an account's secret seed.
 
@@ -209,11 +209,11 @@ public:
 
     // Work queue limits
     int MAX_TRANSACTIONS = 250;
-    static constexpr int MAX_JOB_QUEUE_TX = 1000;
-    static constexpr int MIN_JOB_QUEUE_TX = 100;
+    static constexpr int kMAX_JOB_QUEUE_TX = 1000;
+    static constexpr int kMIN_JOB_QUEUE_TX = 100;
 
     // Amendment majority time
-    std::chrono::seconds AMENDMENT_MAJORITY_TIME = defaultAmendmentMajorityTime;
+    std::chrono::seconds AMENDMENT_MAJORITY_TIME = kDEFAULT_AMENDMENT_MAJORITY_TIME;
 
     // Thread pool configuration (0 = choose for me)
     int WORKERS = 0;           // jobqueue thread count. default: upto 6
@@ -258,7 +258,7 @@ public:
     // These override the command line client settings
     std::optional<beast::IP::Endpoint> rpc_ip;
 
-    std::unordered_set<uint256, beast::uhash<>> features;
+    std::unordered_set<uint256, beast::Uhash<>> features;
 
     std::string SERVER_DOMAIN;
 
@@ -305,23 +305,23 @@ public:
     [[nodiscard]] bool
     quiet() const
     {
-        return QUIET;
+        return QUIET_;
     }
     [[nodiscard]] bool
     silent() const
     {
-        return SILENT;
+        return SILENT_;
     }
     [[nodiscard]] bool
     standalone() const
     {
-        return RUN_STANDALONE;
+        return RUN_STANDALONE_;
     }
 
     [[nodiscard]] bool
     useTxTables() const
     {
-        return USE_TX_TABLES;
+        return USE_TX_TABLES_;
     }
 
     [[nodiscard]] bool
@@ -358,9 +358,9 @@ public:
 };
 
 FeeSetup
-setup_FeeVote(Section const& section);
+setupFeeVote(Section const& section);
 
 DatabaseCon::Setup
-setup_DatabaseCon(Config const& c, std::optional<beast::Journal> j = std::nullopt);
+setupDatabaseCon(Config const& c, std::optional<beast::Journal> j = std::nullopt);
 
 }  // namespace xrpl
diff --git a/src/xrpld/core/TimeKeeper.h b/src/xrpld/core/TimeKeeper.h
index 8f2bbbcd53..a21f5aa6e8 100644
--- a/src/xrpld/core/TimeKeeper.h
+++ b/src/xrpld/core/TimeKeeper.h
@@ -8,7 +8,7 @@
 namespace xrpl {
 
 /** Manages various times used by the server. */
-class TimeKeeper : public beast::abstract_clock<NetClock>
+class TimeKeeper : public beast::AbstractClock<NetClock>
 {
 private:
     std::atomic<std::chrono::seconds> closeOffset_;
@@ -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() - epoch_offset));
+            std::chrono::duration_cast<duration>(when.time_since_epoch() - kEPOCH_OFFSET));
     }
 
 public:
diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp
index b7063287bb..11ee43e9cc 100644
--- a/src/xrpld/core/detail/Config.cpp
+++ b/src/xrpld/core/detail/Config.cpp
@@ -114,26 +114,26 @@ 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>
-sizedItems
+kSIZED_ITEMS
 {{
     // FIXME: We should document each of these items, explaining exactly
     //        what they control and whether there exists an explicit
     //        config option that can be used to override the default.
 
     //                                   tiny    small   medium    large     huge
-    {SizedItem::sweepInterval,      {{     10,      30,      60,      90,     120 }}},
-    {SizedItem::treeCacheSize,      {{ 262144,  524288, 2097152, 4194304, 8388608 }}},
-    {SizedItem::treeCacheAge,       {{     30,      60,      90,     120,     900 }}},
-    {SizedItem::ledgerSize,         {{     32,      32,      64,     256,     384 }}},
-    {SizedItem::ledgerAge,          {{     30,      60,     180,     300,     600 }}},
-    {SizedItem::ledgerFetch,        {{      2,       3,       4,       5,       8 }}},
-    {SizedItem::hashNodeDBCache,    {{      4,      12,      24,      64,     128 }}},
-    {SizedItem::txnDBCache,         {{      4,      12,      24,      64,     128 }}},
-    {SizedItem::lgrDBCache,         {{      4,       8,      16,      32,     128 }}},
-    {SizedItem::openFinalLimit,     {{      8,      16,      32,      64,     128 }}},
-    {SizedItem::burstSize,          {{      4,       8,      16,      32,      48 }}},
-    {SizedItem::ramSizeGB,          {{      6,       8,      12,      24,       0 }}},
-    {SizedItem::accountIdCacheSize, {{  20047,   50053,   77081,  150061,  300007 }}}
+    {SizedItem::SweepInterval,      {{     10,      30,      60,      90,     120 }}},
+    {SizedItem::TreeCacheSize,      {{ 262144,  524288, 2097152, 4194304, 8388608 }}},
+    {SizedItem::TreeCacheAge,       {{     30,      60,      90,     120,     900 }}},
+    {SizedItem::LedgerSize,         {{     32,      32,      64,     256,     384 }}},
+    {SizedItem::LedgerAge,          {{     30,      60,     180,     300,     600 }}},
+    {SizedItem::LedgerFetch,        {{      2,       3,       4,       5,       8 }}},
+    {SizedItem::HashNodeDbCache,    {{      4,      12,      24,      64,     128 }}},
+    {SizedItem::TxnDbCache,         {{      4,      12,      24,      64,     128 }}},
+    {SizedItem::LgrDbCache,         {{      4,       8,      16,      32,     128 }}},
+    {SizedItem::OpenFinalLimit,     {{      8,      16,      32,      64,     128 }}},
+    {SizedItem::BurstSize,          {{      4,       8,      16,      32,      48 }}},
+    {SizedItem::RamSizeGb,          {{      6,       8,      12,      24,       0 }}},
+    {SizedItem::AccountIdCacheSize, {{  20047,   50053,   77081,  150061,  300007 }}}
 }};
 // clang-format on
 
@@ -143,7 +143,7 @@ static_assert(
     []() constexpr -> bool {
         std::underlying_type_t<SizedItem> idx = 0;
 
-        for (auto const& i : sizedItems)
+        for (auto const& i : kSIZED_ITEMS)
         {
             if (static_cast<std::underlying_type_t<SizedItem>>(i.first) != idx)
                 return false;
@@ -248,10 +248,10 @@ getSingleSection(
 //
 //------------------------------------------------------------------------------
 
-char const* const Config::configFileName = "xrpld.cfg";
-char const* const Config::configLegacyName = "rippled.cfg";
-char const* const Config::databaseDirName = "db";
-char const* const Config::validatorsFileName = "validators.txt";
+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";
 
 [[nodiscard]] static std::string
 getEnvVar(char const* name)
@@ -274,16 +274,17 @@ Config::setupControl(bool bQuiet, bool bSilent, bool bStandalone)
 {
     XRPL_ASSERT(NODE_SIZE == 0, "xrpl::Config::setupControl : node size not set");
 
-    QUIET = bQuiet || bSilent;
-    SILENT = bSilent;
-    RUN_STANDALONE = bStandalone;
+    QUIET_ = bQuiet || bSilent;
+    SILENT_ = bSilent;
+    RUN_STANDALONE_ = bStandalone;
 
     // We try to autodetect the appropriate node size by checking available
     // RAM and CPU resources. We default to "tiny" for standalone mode.
     if (!bStandalone)
     {
         // First, check against 'minimum' RAM requirements per node size:
-        auto const& threshold = sizedItems[std::underlying_type_t<SizedItem>(SizedItem::ramSizeGB)];
+        auto const& threshold =
+            kSIZED_ITEMS[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);
@@ -318,10 +319,10 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
     if (!strConf.empty())
     {
         // --conf=<path> : everything is relative that file.
-        CONFIG_FILE = strConf;
-        CONFIG_DIR = boost::filesystem::absolute(CONFIG_FILE);
+        CONFIG_FILE_ = strConf;
+        CONFIG_DIR = boost::filesystem::absolute(CONFIG_FILE_);
         CONFIG_DIR.remove_filename();
-        dataDir = CONFIG_DIR / databaseDirName;
+        dataDir = CONFIG_DIR / kDATABASE_DIR_NAME;
     }
     else
     {
@@ -331,12 +332,12 @@ 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 / databaseDirName;
-            CONFIG_FILE = CONFIG_DIR / configFileName;
-            if (boost::filesystem::exists(CONFIG_FILE))
+            dataDir = CONFIG_DIR / kDATABASE_DIR_NAME;
+            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+            if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
-            CONFIG_FILE = CONFIG_DIR / configLegacyName;
-            if (boost::filesystem::exists(CONFIG_FILE))
+            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
+            if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
 
             // Check if the home directory is set, and optionally the XDG config
@@ -362,21 +363,21 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
                 // dir.
                 dataDir = strXdgDataHome + "/" + systemName();
                 CONFIG_DIR = strXdgConfigHome + "/" + systemName();
-                CONFIG_FILE = CONFIG_DIR / configFileName;
-                if (boost::filesystem::exists(CONFIG_FILE))
+                CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+                if (boost::filesystem::exists(CONFIG_FILE_))
                     break;
-                CONFIG_FILE = CONFIG_DIR / configLegacyName;
-                if (boost::filesystem::exists(CONFIG_FILE))
+                CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
+                if (boost::filesystem::exists(CONFIG_FILE_))
                     break;
             }
 
             // As a last resort, check the system config directory.
             dataDir = "/var/opt/" + systemName();
             CONFIG_DIR = "/etc/opt/" + systemName();
-            CONFIG_FILE = CONFIG_DIR / configFileName;
-            if (boost::filesystem::exists(CONFIG_FILE))
+            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_FILE_NAME;
+            if (boost::filesystem::exists(CONFIG_FILE_))
                 break;
-            CONFIG_FILE = CONFIG_DIR / configLegacyName;
+            CONFIG_FILE_ = CONFIG_DIR / kCONFIG_LEGACY_NAME;
         } while (false);
     }
 
@@ -389,7 +390,7 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
         {
             dataDir = boost::filesystem::path(dbPath);
         }
-        else if (RUN_STANDALONE)
+        else if (RUN_STANDALONE_)
         {
             dataDir.clear();
         }
@@ -409,14 +410,14 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
     HTTPClient::initializeSSLContext(
         this->SSL_VERIFY_DIR, this->SSL_VERIFY_FILE, this->SSL_VERIFY, j_);
 
-    if (RUN_STANDALONE)
+    if (RUN_STANDALONE_)
         LEDGER_HISTORY = 0;
 
     Section const ledgerTxTablesSection = section("ledger_tx_tables");
-    get_if_exists(ledgerTxTablesSection, "use_tx_tables", USE_TX_TABLES);
+    getIfExists(ledgerTxTablesSection, "use_tx_tables", USE_TX_TABLES_);
 
     Section const& nodeDbSection{section(ConfigSection::nodeDatabase())};
-    get_if_exists(nodeDbSection, "fast_load", FAST_LOAD);
+    getIfExists(nodeDbSection, "fast_load", FAST_LOAD);
 }
 
 // 0 ports are allowed for unit tests, but still not allowed to be present in
@@ -453,16 +454,16 @@ Config::load()
     // NOTE: this writes to cerr because we want cout to be reserved
     // for the writing of the json response (so that stdout can be part of a
     // pipeline, for instance)
-    if (!QUIET)
-        std::cerr << "Loading: " << CONFIG_FILE << "\n";
+    if (!QUIET_)
+        std::cerr << "Loading: " << CONFIG_FILE_ << "\n";
 
     boost::system::error_code ec;
-    auto const fileContents = getFileContents(ec, CONFIG_FILE);
+    auto const fileContents = getFileContents(ec, CONFIG_FILE_);
 
     if (ec)
     {
-        std::cerr << "Failed to read '" << CONFIG_FILE << "'." << ec.value() << ": " << ec.message()
-                  << std::endl;
+        std::cerr << "Failed to read '" << CONFIG_FILE_ << "'." << ec.value() << ": "
+                  << ec.message() << std::endl;
         return;
     }
 
@@ -486,14 +487,14 @@ Config::loadFromString(std::string const& fileContents)
     // if the user has specified ip:port then replace : with a space.
     {
         auto replaceColons = [](std::vector<std::string>& strVec) {
-            static std::regex const e(":([0-9]+)$");
+            static std::regex const kE(":([0-9]+)$");
             for (auto& line : strVec)
             {
                 // skip anything that might be an ipv6 address
                 if (std::count(line.begin(), line.end(), ':') != 1)
                     continue;
 
-                std::string const result = std::regex_replace(line, e, " $1");
+                std::string const result = std::regex_replace(line, kE, " $1");
                 // sanity check the result of the replace, should be same length
                 // as input
                 if (result.size() == line.size())
@@ -545,22 +546,22 @@ Config::loadFromString(std::string const& fileContents)
     }
     else
     {
-        std::optional<std::size_t> peers_in_max{};
+        std::optional<std::size_t> peersInMax{};
         if (getSingleSection(secConfig, SECTION_PEERS_IN_MAX, strTemp, j_))
         {
-            peers_in_max = beast::lexicalCastThrow<std::size_t>(strTemp);
-            if (*peers_in_max > 1000)
+            peersInMax = beast::lexicalCastThrow<std::size_t>(strTemp);
+            if (*peersInMax > 1000)
             {
                 Throw<std::runtime_error>("Invalid value specified in [" SECTION_PEERS_IN_MAX
                                           "] section; the value must be less or equal than 1000");
             }
         }
 
-        std::optional<std::size_t> peers_out_max{};
+        std::optional<std::size_t> peersOutMax{};
         if (getSingleSection(secConfig, SECTION_PEERS_OUT_MAX, strTemp, j_))
         {
-            peers_out_max = beast::lexicalCastThrow<std::size_t>(strTemp);
-            if (*peers_out_max < 10 || *peers_out_max > 1000)
+            peersOutMax = beast::lexicalCastThrow<std::size_t>(strTemp);
+            if (*peersOutMax < 10 || *peersOutMax > 1000)
             {
                 Throw<std::runtime_error>("Invalid value specified in [" SECTION_PEERS_OUT_MAX
                                           "] section; the value must be in range 10-1000");
@@ -568,17 +569,17 @@ Config::loadFromString(std::string const& fileContents)
         }
 
         // if one section is configured then the other must be configured too
-        if ((peers_in_max && !peers_out_max) || (peers_out_max && !peers_in_max))
+        if ((peersInMax && !peersOutMax) || (peersOutMax && !peersInMax))
         {
             Throw<std::runtime_error>("Both sections [" SECTION_PEERS_IN_MAX
                                       "]"
                                       "and [" SECTION_PEERS_OUT_MAX "] must be configured");
         }
 
-        if (peers_in_max && peers_out_max)
+        if (peersInMax && peersOutMax)
         {
-            PEERS_IN_MAX = *peers_in_max;
-            PEERS_OUT_MAX = *peers_out_max;
+            PEERS_IN_MAX = *peersInMax;
+            PEERS_OUT_MAX = *peersOutMax;
         }
     }
 
@@ -673,7 +674,7 @@ Config::loadFromString(std::string const& fileContents)
     if (getSingleSection(secConfig, SECTION_NETWORK_QUORUM, strTemp, j_))
         NETWORK_QUORUM = beast::lexicalCastThrow<std::size_t>(strTemp);
 
-    FEES = setup_FeeVote(section("voting"));
+    FEES = setupFeeVote(section("voting"));
     /* [fee_default] is documented in the example config files as useful for
      * things like offline transaction signing. Until that's completely
      * deprecated, allow it to override the [voting] section. */
@@ -729,7 +730,7 @@ Config::loadFromString(std::string const& fileContents)
         PATH_SEARCH_MAX = beast::lexicalCastThrow<int>(strTemp);
 
     if (getSingleSection(secConfig, SECTION_DEBUG_LOGFILE, strTemp, j_))
-        DEBUG_LOGFILE = strTemp;
+        DEBUG_LOGFILE_ = strTemp;
 
     if (getSingleSection(secConfig, SECTION_SWEEP_INTERVAL, strTemp, j_))
     {
@@ -802,11 +803,11 @@ Config::loadFromString(std::string const& fileContents)
 
         if (sec.exists("vp_base_squelch_enable"))
         {
-            VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = sec.value_or("vp_base_squelch_enable", false);
+            VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = sec.valueOr("vp_base_squelch_enable", false);
         }
         else if (sec.exists("vp_enable"))
         {
-            VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = sec.value_or("vp_enable", false);
+            VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE = sec.valueOr("vp_enable", false);
         }
         else
         {
@@ -819,7 +820,7 @@ Config::loadFromString(std::string const& fileContents)
         // validator messages. The config must be removed once squelching is //
         // made the default routing algorithm.                               //
         VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS =
-            sec.value_or("vp_base_squelch_max_selected_peers", 5);
+            sec.valueOr("vp_base_squelch_max_selected_peers", 5);
         if (VP_REDUCE_RELAY_SQUELCH_MAX_SELECTED_PEERS < 3)
         {
             Throw<std::runtime_error>("Invalid " SECTION_REDUCE_RELAY
@@ -828,10 +829,10 @@ Config::loadFromString(std::string const& fileContents)
         }
         /////////////////  !!END OF TEMPORARY CODE BLOCK!! /////////////////////
 
-        TX_REDUCE_RELAY_ENABLE = sec.value_or("tx_enable", false);
-        TX_REDUCE_RELAY_METRICS = sec.value_or("tx_metrics", false);
-        TX_REDUCE_RELAY_MIN_PEERS = sec.value_or("tx_min_peers", 20);
-        TX_RELAY_PERCENTAGE = sec.value_or("tx_relay_percentage", 25);
+        TX_REDUCE_RELAY_ENABLE = sec.valueOr("tx_enable", false);
+        TX_REDUCE_RELAY_METRICS = sec.valueOr("tx_metrics", false);
+        TX_REDUCE_RELAY_MIN_PEERS = sec.valueOr("tx_min_peers", 20);
+        TX_RELAY_PERCENTAGE = sec.valueOr("tx_relay_percentage", 25);
         if (TX_RELAY_PERCENTAGE < 10 || TX_RELAY_PERCENTAGE > 100 || TX_REDUCE_RELAY_MIN_PEERS < 10)
         {
             Throw<std::runtime_error>("Invalid " SECTION_REDUCE_RELAY
@@ -844,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), MIN_JOB_QUEUE_TX, MAX_JOB_QUEUE_TX);
+            std::clamp(beast::lexicalCastThrow<int>(strTemp), kMIN_JOB_QUEUE_TX, kMAX_JOB_QUEUE_TX);
     }
 
     if (getSingleSection(secConfig, SECTION_SERVER_DOMAIN, strTemp, j_))
@@ -943,7 +944,7 @@ Config::loadFromString(std::string const& fileContents)
         BETA_RPC_API = beast::lexicalCastThrow<bool>(strTemp);
 
     // Do not load trusted validator configuration for standalone mode
-    if (!RUN_STANDALONE)
+    if (!RUN_STANDALONE_)
     {
         // If a file was explicitly specified, then throw if the
         // path is malformed or if the file does not exist or is
@@ -987,7 +988,7 @@ Config::loadFromString(std::string const& fileContents)
         }
         else if (!CONFIG_DIR.empty())
         {
-            validatorsFile = CONFIG_DIR / validatorsFileName;
+            validatorsFile = CONFIG_DIR / kVALIDATORS_FILE_NAME;
 
             if (!validatorsFile.empty())
             {
@@ -1137,48 +1138,48 @@ Config::loadFromString(std::string const& fileContents)
 boost::filesystem::path
 Config::getDebugLogFile() const
 {
-    auto log_file = DEBUG_LOGFILE;
+    auto logFile = DEBUG_LOGFILE_;
 
-    if (!log_file.empty() && !log_file.is_absolute())
+    if (!logFile.empty() && !logFile.is_absolute())
     {
         // Unless an absolute path for the log file is specified, the
         // path is relative to the config file directory.
-        log_file = boost::filesystem::absolute(log_file, CONFIG_DIR);
+        logFile = boost::filesystem::absolute(logFile, CONFIG_DIR);
     }
 
-    if (!log_file.empty())
+    if (!logFile.empty())
     {
-        auto log_dir = log_file.parent_path();
+        auto logDir = logFile.parent_path();
 
-        if (!boost::filesystem::is_directory(log_dir))
+        if (!boost::filesystem::is_directory(logDir))
         {
             boost::system::error_code ec;
-            boost::filesystem::create_directories(log_dir, ec);
+            boost::filesystem::create_directories(logDir, ec);
 
             // If we fail, we warn but continue so that the calling code can
             // decide how to handle this situation.
             if (ec)
             {
-                std::cerr << "Unable to create log file path " << log_dir << ": " << ec.message()
+                std::cerr << "Unable to create log file path " << logDir << ": " << ec.message()
                           << '\n';
             }
         }
     }
 
-    return log_file;
+    return logFile;
 }
 
 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 < sizedItems.size(), "xrpl::Config::getValueFor : valid index input");
+    XRPL_ASSERT(index < kSIZED_ITEMS.size(), "xrpl::Config::getValueFor : valid index input");
     XRPL_ASSERT(!node || *node <= 4, "xrpl::Config::getValueFor : unset or valid node");
-    return sizedItems.at(index).second.at(node.value_or(NODE_SIZE));
+    return kSIZED_ITEMS.at(index).second.at(node.value_or(NODE_SIZE));
 }
 
 FeeSetup
-setup_FeeVote(Section const& section)
+setupFeeVote(Section const& section)
 {
     FeeSetup setup;
     {
@@ -1198,7 +1199,7 @@ setup_FeeVote(Section const& section)
 }
 
 DatabaseCon::Setup
-setup_DatabaseCon(Config const& c, std::optional<beast::Journal> j)
+setupDatabaseCon(Config const& c, std::optional<beast::Journal> j)
 {
     DatabaseCon::Setup setup;
 
@@ -1217,56 +1218,56 @@ setup_DatabaseCon(Config const& c, std::optional<beast::Journal> j)
         result->reserve(3);
 
         // defaults
-        std::string safety_level;
-        std::string journal_mode = "wal";
+        std::string safetyLevel;
+        std::string journalMode = "wal";
         std::string synchronous = "normal";
-        std::string temp_store = "file";
+        std::string tempStore = "file";
         bool showRiskWarning = false;
 
-        if (set(safety_level, "safety_level", sqlite))
+        if (set(safetyLevel, "safety_level", sqlite))
         {
-            if (boost::iequals(safety_level, "low"))
+            if (boost::iequals(safetyLevel, "low"))
             {
                 // low safety defaults
-                journal_mode = "memory";
+                journalMode = "memory";
                 synchronous = "off";
-                temp_store = "memory";
+                tempStore = "memory";
                 showRiskWarning = true;
             }
-            else if (!boost::iequals(safety_level, "high"))
+            else if (!boost::iequals(safetyLevel, "high"))
             {
-                Throw<std::runtime_error>("Invalid safety_level value: " + safety_level);
+                Throw<std::runtime_error>("Invalid safety_level value: " + safetyLevel);
             }
         }
 
         {
             // #journal_mode Valid values : delete, truncate, persist,
             // memory, wal, off
-            if (set(journal_mode, "journal_mode", sqlite) && !safety_level.empty())
+            if (set(journalMode, "journal_mode", sqlite) && !safetyLevel.empty())
             {
                 Throw<std::runtime_error>(
                     "Configuration file may not define both "
                     "\"safety_level\" and \"journal_mode\"");
             }
             bool const higherRisk =
-                boost::iequals(journal_mode, "memory") || boost::iequals(journal_mode, "off");
+                boost::iequals(journalMode, "memory") || boost::iequals(journalMode, "off");
             showRiskWarning = showRiskWarning || higherRisk;
-            if (higherRisk || boost::iequals(journal_mode, "delete") ||
-                boost::iequals(journal_mode, "truncate") ||
-                boost::iequals(journal_mode, "persist") || boost::iequals(journal_mode, "wal"))
+            if (higherRisk || boost::iequals(journalMode, "delete") ||
+                boost::iequals(journalMode, "truncate") || boost::iequals(journalMode, "persist") ||
+                boost::iequals(journalMode, "wal"))
             {
                 result->emplace_back(
-                    boost::str(boost::format(CommonDBPragmaJournal) % journal_mode));
+                    boost::str(boost::format(kCOMMON_DB_PRAGMA_JOURNAL) % journalMode));
             }
             else
             {
-                Throw<std::runtime_error>("Invalid journal_mode value: " + journal_mode);
+                Throw<std::runtime_error>("Invalid journal_mode value: " + journalMode);
             }
         }
 
         {
             // #synchronous Valid values : off, normal, full, extra
-            if (set(synchronous, "synchronous", sqlite) && !safety_level.empty())
+            if (set(synchronous, "synchronous", sqlite) && !safetyLevel.empty())
             {
                 Throw<std::runtime_error>(
                     "Configuration file may not define both "
@@ -1277,7 +1278,8 @@ setup_DatabaseCon(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(CommonDBPragmaSync) % synchronous));
+                result->emplace_back(
+                    boost::str(boost::format(kCOMMON_DB_PRAGMA_SYNC) % synchronous));
             }
             else
             {
@@ -1287,26 +1289,26 @@ setup_DatabaseCon(Config const& c, std::optional<beast::Journal> j)
 
         {
             // #temp_store Valid values : default, file, memory
-            if (set(temp_store, "temp_store", sqlite) && !safety_level.empty())
+            if (set(tempStore, "temp_store", sqlite) && !safetyLevel.empty())
             {
                 Throw<std::runtime_error>(
                     "Configuration file may not define both "
                     "\"safety_level\" and \"temp_store\"");
             }
-            bool const higherRisk = boost::iequals(temp_store, "memory");
+            bool const higherRisk = boost::iequals(tempStore, "memory");
             showRiskWarning = showRiskWarning || higherRisk;
-            if (higherRisk || boost::iequals(temp_store, "default") ||
-                boost::iequals(temp_store, "file"))
+            if (higherRisk || boost::iequals(tempStore, "default") ||
+                boost::iequals(tempStore, "file"))
             {
-                result->emplace_back(boost::str(boost::format(CommonDBPragmaTemp) % temp_store));
+                result->emplace_back(boost::str(boost::format(kCOMMON_DB_PRAGMA_TEMP) % tempStore));
             }
             else
             {
-                Throw<std::runtime_error>("Invalid temp_store value: " + temp_store);
+                Throw<std::runtime_error>("Invalid temp_store value: " + tempStore);
             }
         }
 
-        if (showRiskWarning && j && c.LEDGER_HISTORY > SQLITE_TUNING_CUTOFF)
+        if (showRiskWarning && j && c.LEDGER_HISTORY > kSQLITE_TUNING_CUTOFF)
         {
             JLOG(j->warn()) << "reducing the data integrity guarantees from the "
                                "default [sqlite] behavior is not recommended for "
@@ -1327,22 +1329,22 @@ setup_DatabaseCon(Config const& c, std::optional<beast::Journal> j)
     setPragma(setup.lgrPragma[0], "journal_size_limit", 1582080);
 
     // TX Pragma
-    int64_t page_size = 4096;
-    int64_t journal_size_limit = 1582080;
+    int64_t pageSize = 4096;
+    int64_t journalSizeLimit = 1582080;
     if (c.exists("sqlite"))
     {
         auto& s = c.section("sqlite");
-        set(journal_size_limit, "journal_size_limit", s);
-        set(page_size, "page_size", s);
-        if (page_size < 512 || page_size > 65536)
+        set(journalSizeLimit, "journal_size_limit", s);
+        set(pageSize, "page_size", s);
+        if (pageSize < 512 || pageSize > 65536)
             Throw<std::runtime_error>("Invalid page_size. Must be between 512 and 65536.");
 
-        if ((page_size & (page_size - 1)) != 0)
+        if ((pageSize & (pageSize - 1)) != 0)
             Throw<std::runtime_error>("Invalid page_size. Must be a power of 2.");
     }
 
-    setPragma(setup.txPragma[0], "page_size", page_size);
-    setPragma(setup.txPragma[1], "journal_size_limit", journal_size_limit);
+    setPragma(setup.txPragma[0], "page_size", pageSize);
+    setPragma(setup.txPragma[1], "journal_size_limit", journalSizeLimit);
     setPragma(setup.txPragma[2], "max_page_count", 4294967294);
     setPragma(setup.txPragma[3], "mmap_size", 17179869184);
 
diff --git a/src/xrpld/overlay/Cluster.h b/src/xrpld/overlay/Cluster.h
index 7783d96100..982f11aaae 100644
--- a/src/xrpld/overlay/Cluster.h
+++ b/src/xrpld/overlay/Cluster.h
@@ -77,7 +77,7 @@ public:
               within the callback.
     */
     void
-    for_each(std::function<void(ClusterNode const&)> func) const;
+    forEach(std::function<void(ClusterNode const&)> func) const;
 
     /** Load the list of cluster nodes.
 
diff --git a/src/xrpld/overlay/ClusterNode.h b/src/xrpld/overlay/ClusterNode.h
index 3a504a5733..16c8062840 100644
--- a/src/xrpld/overlay/ClusterNode.h
+++ b/src/xrpld/overlay/ClusterNode.h
@@ -19,7 +19,7 @@ public:
         std::string name,
         std::uint32_t fee = 0,
         NetClock::time_point rtime = NetClock::time_point{})
-        : identity_(identity), name_(std::move(name)), mLoadFee(fee), mReportTime(rtime)
+        : identity_(identity), name_(std::move(name)), loadFee_(fee), reportTime_(rtime)
     {
     }
 
@@ -32,13 +32,13 @@ public:
     [[nodiscard]] std::uint32_t
     getLoadFee() const
     {
-        return mLoadFee;
+        return loadFee_;
     }
 
     [[nodiscard]] NetClock::time_point
     getReportTime() const
     {
-        return mReportTime;
+        return reportTime_;
     }
 
     [[nodiscard]] PublicKey const&
@@ -50,8 +50,8 @@ public:
 private:
     PublicKey const identity_;
     std::string name_;
-    std::uint32_t mLoadFee = 0;
-    NetClock::time_point mReportTime;
+    std::uint32_t loadFee_ = 0;
+    NetClock::time_point reportTime_;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/Compression.h b/src/xrpld/overlay/Compression.h
index cb60b4bb48..91417913e3 100644
--- a/src/xrpld/overlay/Compression.h
+++ b/src/xrpld/overlay/Compression.h
@@ -5,8 +5,8 @@
 
 namespace xrpl::compression {
 
-std::size_t constexpr headerBytes = 6;
-std::size_t constexpr headerBytesCompressed = 10;
+std::size_t constexpr kHEADER_BYTES = 6;
+std::size_t constexpr kHEADER_BYTES_COMPRESSED = 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 df59656ac2..7c2701d443 100644
--- a/src/xrpld/overlay/Message.h
+++ b/src/xrpld/overlay/Message.h
@@ -11,7 +11,7 @@
 
 namespace xrpl {
 
-constexpr std::size_t maximumMessageSize = megabytes(64);
+constexpr std::size_t kMAXIMUM_MESSAGE_SIZE = 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/Overlay.h b/src/xrpld/overlay/Overlay.h
index f42ef64b9a..80430293d8 100644
--- a/src/xrpld/overlay/Overlay.h
+++ b/src/xrpld/overlay/Overlay.h
@@ -35,14 +35,14 @@ protected:
     }
 
 public:
-    enum class Promote { automatic, never, always };
+    enum class Promote { Automatic, Never, Always };
 
     struct Setup
     {
         explicit Setup() = default;
 
         std::shared_ptr<boost::asio::ssl::context> context;
-        beast::IP::Address public_ip;
+        beast::IP::Address publicIp;
         int ipLimit = 0;
         std::uint32_t crawlOptions = 0;
         std::optional<std::uint32_t> networkID;
@@ -68,7 +68,7 @@ public:
     onHandoff(
         std::unique_ptr<stream_type>&& bundle,
         http_request_type&& request,
-        boost::asio::ip::tcp::endpoint remote_address) = 0;
+        boost::asio::ip::tcp::endpoint remoteAddress) = 0;
 
     /** Establish a peer connection to the specified endpoint.
         The call returns immediately, the connection attempt is
@@ -91,7 +91,7 @@ public:
     /** Return diagnostics on the status of all peers.
         @deprecated This is superseded by PropertyStream
     */
-    virtual Json::Value
+    virtual json::Value
     json() = 0;
 
     /** Returns a sequence representing the current list of peers.
@@ -200,7 +200,7 @@ public:
     /** Returns tx reduce-relay metrics
         @return json value of tx reduce-relay metrics
      */
-    [[nodiscard]] virtual Json::Value
+    [[nodiscard]] virtual json::Value
     txMetrics() const = 0;
 };
 
diff --git a/src/xrpld/overlay/Peer.h b/src/xrpld/overlay/Peer.h
index 5955c97838..0c86776030 100644
--- a/src/xrpld/overlay/Peer.h
+++ b/src/xrpld/overlay/Peer.h
@@ -80,7 +80,7 @@ public:
     [[nodiscard]] virtual PublicKey const&
     getNodePublic() const = 0;
 
-    virtual Json::Value
+    virtual json::Value
     json() = 0;
 
     [[nodiscard]] virtual bool
diff --git a/src/xrpld/overlay/PeerSet.h b/src/xrpld/overlay/PeerSet.h
index 83cb40d84f..f50b7130f4 100644
--- a/src/xrpld/overlay/PeerSet.h
+++ b/src/xrpld/overlay/PeerSet.h
@@ -62,7 +62,7 @@ public:
 };
 
 std::unique_ptr<PeerSetBuilder>
-make_PeerSetBuilder(Application& app);
+makePeerSetBuilder(Application& app);
 
 /**
  * Make a dummy PeerSet that does not do anything.
@@ -70,6 +70,6 @@ make_PeerSetBuilder(Application& app);
  *       where a real PeerSet is not needed.
  */
 std::unique_ptr<PeerSet>
-make_DummyPeerSet(Application& app);
+makeDummyPeerSet(Application& app);
 
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/ReduceRelayCommon.h b/src/xrpld/overlay/ReduceRelayCommon.h
index 84e9cf9994..4105003315 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 MIN_UNSQUELCH_EXPIRE = std::chrono::seconds{300};
-static constexpr auto MAX_UNSQUELCH_EXPIRE_DEFAULT = std::chrono::seconds{600};
-static constexpr auto SQUELCH_PER_PEER = std::chrono::seconds(10);
-static constexpr auto MAX_UNSQUELCH_EXPIRE_PEERS = std::chrono::seconds{3600};
+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};
 // No message received threshold before identifying a peer as idled
-static constexpr auto IDLED = 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
-// MIN_MESSAGE_THRESHOLD to considered pool once MAX_SELECTED_PEERS
-// reach MAX_MESSAGE_THRESHOLD.
-static constexpr uint16_t MIN_MESSAGE_THRESHOLD = 19;
-static constexpr uint16_t MAX_MESSAGE_THRESHOLD = 20;
+// 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;
 // Max selected peers to choose as the source of messages from validator
-static constexpr uint16_t MAX_SELECTED_PEERS = 5;
+static constexpr uint16_t kMAX_SELECTED_PEERS = 5;
 // Wait before reduce-relay feature is enabled on boot up to let
 // the server establish peer connections
-static constexpr auto WAIT_ON_BOOTUP = std::chrono::minutes{10};
+static constexpr auto kWAIT_ON_BOOTUP = 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 MAX_TX_QUEUE_SIZE = 10000;
+static constexpr std::size_t kMAX_TX_QUEUE_SIZE = 10000;
 
 }  // namespace xrpl::reduce_relay
diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h
index 896bf56659..26be3946c1 100644
--- a/src/xrpld/overlay/Slot.h
+++ b/src/xrpld/overlay/Slot.h
@@ -21,7 +21,7 @@
 
 namespace xrpl::reduce_relay {
 
-template <typename clock_type>
+template <typename ClockType>
 class Slots;
 
 /** Peer's State */
@@ -76,13 +76,13 @@ public:
  * unsquelched, disconnected peer, or idling peer may transition Slot to
  * Counting state.
  */
-template <typename clock_type>
+template <typename ClockType>
 class Slot final
 {
 private:
-    friend class Slots<clock_type>;
+    friend class Slots<ClockType>;
     using id_t = Peer::id_t;
-    using time_point = typename clock_type::time_point;
+    using time_point = typename ClockType::time_point;
 
     // a callback to report ignored squelches
     using ignored_squelch_callback = std::function<void()>;
@@ -94,7 +94,7 @@ private:
      * validator message source
      */
     Slot(SquelchHandler const& handler, beast::Journal journal, uint16_t maxSelectedPeers)
-        : lastSelected_(clock_type::now())
+        : lastSelected_(ClockType::now())
         , handler_(handler)
         , journal_(journal)
         , maxSelectedPeers_(maxSelectedPeers)
@@ -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 * MAX_UNSQUELCH_EXPIRE_DEFAULT then switch the
+     * selection round is > 2 * kMAX_UNSQUELCH_EXPIRE_DEFAULT then switch the
      * slot's state to Counting. If the number of messages for the peer is >
-     * MIN_MESSAGE_THRESHOLD then add peer to considered peers pool. If the
-     * number of considered peers who reached MAX_MESSAGE_THRESHOLD is
+     * kMIN_MESSAGE_THRESHOLD then add peer to considered peers pool. If the
+     * number of considered peers who reached kMAX_MESSAGE_THRESHOLD 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 MIN_UNSQUELCH_EXPIRE and
-     * min(max(MAX_UNSQUELCH_EXPIRE_DEFAULT, SQUELCH_PER_PEER * npeers),
-     *     MAX_UNSQUELCH_EXPIRE_PEERS)
+    /** Get random squelch duration between kMIN_UNSQUELCH_EXPIRE and
+     * min(max(kMAX_UNSQUELCH_EXPIRE_DEFAULT, kSQUELCH_PER_PEER * npeers),
+     *     kMAX_UNSQUELCH_EXPIRE_PEERS)
      * @param npeers number of peers that can be squelched in the Slot
      */
     std::chrono::seconds
@@ -210,14 +210,14 @@ 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 MIN_MESSAGE_THRESHOLD
+    // from validator - peers that reached kMIN_MESSAGE_THRESHOLD
     std::unordered_set<id_t> considered_;
 
-    // number of peers that reached MAX_MESSAGE_THRESHOLD
+    // number of peers that reached kMAX_MESSAGE_THRESHOLD
     std::uint16_t reachedThreshold_{0};
 
     // last time peers were selected, used to age the slot
-    typename clock_type::time_point lastSelected_;
+    typename ClockType::time_point lastSelected_;
 
     SlotState state_{SlotState::Counting};  // slot's state
     SquelchHandler const& handler_;         // squelch/unsquelch handler
@@ -228,18 +228,18 @@ private:
     uint16_t const maxSelectedPeers_;
 };
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slot<clock_type>::deleteIdlePeer(PublicKey const& validator)
+Slot<ClockType>::deleteIdlePeer(PublicKey const& validator)
 {
     using namespace std::chrono;
-    auto now = clock_type::now();
+    auto now = ClockType::now();
     for (auto it = peers_.begin(); it != peers_.end();)
     {
         auto& peer = it->second;
         auto id = it->first;
         ++it;
-        if (now - peer.lastMessage > IDLED)
+        if (now - peer.lastMessage > kIDLED)
         {
             JLOG(journal_.trace())
                 << "deleteIdlePeer: " << Slice(validator) << " " << id << " idled "
@@ -250,16 +250,16 @@ Slot<clock_type>::deleteIdlePeer(PublicKey const& validator)
     }
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slot<clock_type>::update(
+Slot<ClockType>::update(
     PublicKey const& validator,
     id_t id,
     protocol::MessageType type,
     ignored_squelch_callback callback)
 {
     using namespace std::chrono;
-    auto now = clock_type::now();
+    auto now = ClockType::now();
     auto it = peers_.find(id);
     // First message from this peer
     if (it == peers_.end())
@@ -297,12 +297,12 @@ Slot<clock_type>::update(
     if (state_ != SlotState::Counting || peer.state == PeerState::Squelched)
         return;
 
-    if (++peer.count > MIN_MESSAGE_THRESHOLD)
+    if (++peer.count > kMIN_MESSAGE_THRESHOLD)
         considered_.insert(id);
-    if (peer.count == (MAX_MESSAGE_THRESHOLD + 1))
+    if (peer.count == (kMAX_MESSAGE_THRESHOLD + 1))
         ++reachedThreshold_;
 
-    if (now - lastSelected_ > 2 * MAX_UNSQUELCH_EXPIRE_DEFAULT)
+    if (now - lastSelected_ > 2 * kMAX_UNSQUELCH_EXPIRE_DEFAULT)
     {
         JLOG(journal_.trace()) << "update: resetting due to inactivity " << Slice(validator) << " "
                                << id << " " << duration_cast<seconds>(now - lastSelected_).count();
@@ -322,7 +322,7 @@ Slot<clock_type>::update(
         auto const consideredPoolSize = considered_.size();
         while (selected.size() != maxSelectedPeers_ && !considered_.empty())
         {
-            auto i = considered_.size() == 1 ? 0 : rand_int(considered_.size() - 1);
+            auto i = considered_.size() == 1 ? 0 : randInt(considered_.size() - 1);
             auto it = std::next(considered_.begin(), i);
             auto id = *it;
             considered_.erase(it);
@@ -333,7 +333,7 @@ Slot<clock_type>::update(
                     << "update: peer not found " << Slice(validator) << " " << id;
                 continue;
             }
-            if (now - itPeers->second.lastMessage < IDLED)
+            if (now - itPeers->second.lastMessage < kIDLED)
                 selected.insert(id);
         }
 
@@ -384,23 +384,23 @@ Slot<clock_type>::update(
     }
 }
 
-template <typename clock_type>
+template <typename ClockType>
 std::chrono::seconds
-Slot<clock_type>::getSquelchDuration(std::size_t npeers)
+Slot<ClockType>::getSquelchDuration(std::size_t npeers)
 {
     using namespace std::chrono;
-    auto m = std::max(MAX_UNSQUELCH_EXPIRE_DEFAULT, seconds{SQUELCH_PER_PEER * npeers});
-    if (m > MAX_UNSQUELCH_EXPIRE_PEERS)
+    auto m = std::max(kMAX_UNSQUELCH_EXPIRE_DEFAULT, seconds{kSQUELCH_PER_PEER * npeers});
+    if (m > kMAX_UNSQUELCH_EXPIRE_PEERS)
     {
-        m = MAX_UNSQUELCH_EXPIRE_PEERS;
+        m = kMAX_UNSQUELCH_EXPIRE_PEERS;
         JLOG(journal_.warn()) << "getSquelchDuration: unexpected squelch duration " << npeers;
     }
-    return seconds{xrpl::rand_int(MIN_UNSQUELCH_EXPIRE / 1s, m / 1s)};
+    return seconds{xrpl::randInt(kMIN_UNSQUELCH_EXPIRE / 1s, m / 1s)};
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slot<clock_type>::deletePeer(PublicKey const& validator, id_t id, bool erase)
+Slot<ClockType>::deletePeer(PublicKey const& validator, id_t id, bool erase)
 {
     auto it = peers_.find(id);
     if (it != peers_.end())
@@ -410,7 +410,7 @@ Slot<clock_type>::deletePeer(PublicKey const& validator, id_t id, bool erase)
         JLOG(journal_.trace()) << "deletePeer: " << Slice(validator) << " " << id << " selected "
                                << (it->second.state == PeerState::Selected) << " considered "
                                << (considered_.contains(id)) << " erase " << erase;
-        auto now = clock_type::now();
+        auto now = ClockType::now();
         if (it->second.state == PeerState::Selected)
         {
             for (auto& [k, v] : peers_)
@@ -428,7 +428,7 @@ Slot<clock_type>::deletePeer(PublicKey const& validator, id_t id, bool erase)
         }
         else if (considered_.contains(id))
         {
-            if (it->second.count > MAX_MESSAGE_THRESHOLD)
+            if (it->second.count > kMAX_MESSAGE_THRESHOLD)
                 --reachedThreshold_;
             considered_.erase(id);
         }
@@ -445,9 +445,9 @@ Slot<clock_type>::deletePeer(PublicKey const& validator, id_t id, bool erase)
     }
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slot<clock_type>::resetCounts()
+Slot<ClockType>::resetCounts()
 {
     for (auto& [_, peer] : peers_)
     {
@@ -456,9 +456,9 @@ Slot<clock_type>::resetCounts()
     }
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slot<clock_type>::initCounting()
+Slot<ClockType>::initCounting()
 {
     state_ = SlotState::Counting;
     considered_.clear();
@@ -466,25 +466,25 @@ Slot<clock_type>::initCounting()
     resetCounts();
 }
 
-template <typename clock_type>
+template <typename ClockType>
 std::uint16_t
-Slot<clock_type>::inState(PeerState state) const
+Slot<ClockType>::inState(PeerState state) const
 {
     return std::count_if(
         peers_.begin(), peers_.end(), [&](auto const& it) { return (it.second.state == state); });
 }
 
-template <typename clock_type>
+template <typename ClockType>
 std::uint16_t
-Slot<clock_type>::notInState(PeerState state) const
+Slot<ClockType>::notInState(PeerState state) const
 {
     return std::count_if(
         peers_.begin(), peers_.end(), [&](auto const& it) { return (it.second.state != state); });
 }
 
-template <typename clock_type>
+template <typename ClockType>
 std::set<typename Peer::id_t>
-Slot<clock_type>::getSelected() const
+Slot<ClockType>::getSelected() const
 {
     std::set<id_t> r;
     for (auto const& [id, info] : peers_)
@@ -495,9 +495,9 @@ Slot<clock_type>::getSelected() const
     return r;
 }
 
-template <typename clock_type>
+template <typename ClockType>
 std::unordered_map<typename Peer::id_t, std::tuple<PeerState, uint16_t, uint32_t, uint32_t>>
-Slot<clock_type>::getPeers() const
+Slot<ClockType>::getPeers() const
 {
     using namespace std::chrono;
     auto r = std::
@@ -523,16 +523,16 @@ Slot<clock_type>::getPeers() const
  * when a message is received from a validator. It also handles Slot aging
  * and checks for peers which are disconnected or stopped relaying the messages.
  */
-template <typename clock_type>
+template <typename ClockType>
 class Slots final
 {
-    using time_point = typename clock_type::time_point;
+    using time_point = typename ClockType::time_point;
     using id_t = typename Peer::id_t;
     using messages = beast::aged_unordered_map<
         uint256,
         std::unordered_set<Peer::id_t>,
-        clock_type,
-        hardened_hash<strong_hash>>;
+        ClockType,
+        HardenedHash<strong_hash>>;
 
 public:
     /**
@@ -557,14 +557,14 @@ public:
         return baseSquelchEnabled_ && reduceRelayReady();
     }
 
-    /** Check if reduce_relay::WAIT_ON_BOOTUP time passed since startup */
+    /** Check if reduce_relay::kWAIT_ON_BOOTUP time passed since startup */
     bool
     reduceRelayReady()
     {
         if (!reduceRelayReady_)
         {
-            reduceRelayReady_ = reduce_relay::epoch<std::chrono::minutes>(clock_type::now()) >
-                reduce_relay::WAIT_ON_BOOTUP;
+            reduceRelayReady_ = reduce_relay::epoch<std::chrono::minutes>(ClockType::now()) >
+                reduce_relay::kWAIT_ON_BOOTUP;
         }
 
         return reduceRelayReady_;
@@ -600,7 +600,7 @@ public:
         PublicKey const& validator,
         id_t id,
         protocol::MessageType type,
-        typename Slot<clock_type>::ignored_squelch_callback callback);
+        typename Slot<ClockType>::ignored_squelch_callback callback);
 
     /** Check if peers stopped relaying messages
      * and if slots stopped receiving messages from the validator.
@@ -689,7 +689,7 @@ private:
 
     std::atomic_bool reduceRelayReady_{false};
 
-    hash_map<PublicKey, Slot<clock_type>> slots_;
+    hash_map<PublicKey, Slot<ClockType>> slots_;
     SquelchHandler const& handler_;  // squelch/unsquelch handler
     Logs& logs_;
     beast::Journal const journal_;
@@ -701,22 +701,22 @@ private:
     // to discard duplicate message from the same peer. A message
     // is aged after IDLED seconds. A message received IDLED seconds
     // after it was relayed is ignored by PeerImp.
-    inline static messages peersWithMessage_{beast::get_abstract_clock<clock_type>()};
+    inline static messages peersWithMessage{beast::getAbstractClock<ClockType>()};
 };
 
-template <typename clock_type>
+template <typename ClockType>
 bool
-Slots<clock_type>::addPeerMessage(uint256 const& key, id_t id)
+Slots<ClockType>::addPeerMessage(uint256 const& key, id_t id)
 {
-    beast::expire(peersWithMessage_, reduce_relay::IDLED);
+    beast::expire(peersWithMessage, reduce_relay::kIDLED);
 
     if (key.isNonZero())
     {
-        auto it = peersWithMessage_.find(key);
-        if (it == peersWithMessage_.end())
+        auto it = peersWithMessage.find(key);
+        if (it == peersWithMessage.end())
         {
             JLOG(journal_.trace()) << "addPeerMessage: new " << to_string(key) << " " << id;
-            peersWithMessage_.emplace(key, std::unordered_set<id_t>{id});
+            peersWithMessage.emplace(key, std::unordered_set<id_t>{id});
             return true;
         }
 
@@ -735,14 +735,14 @@ Slots<clock_type>::addPeerMessage(uint256 const& key, id_t id)
     return true;
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slots<clock_type>::updateSlotAndSquelch(
+Slots<ClockType>::updateSlotAndSquelch(
     uint256 const& key,
     PublicKey const& validator,
     id_t id,
     protocol::MessageType type,
-    typename Slot<clock_type>::ignored_squelch_callback callback)
+    typename Slot<ClockType>::ignored_squelch_callback callback)
 {
     if (!addPeerMessage(key, id))
         return;
@@ -755,7 +755,7 @@ Slots<clock_type>::updateSlotAndSquelch(
                       .emplace(
                           std::make_pair(
                               validator,
-                              Slot<clock_type>(handler_, logs_.journal("Slot"), maxSelectedPeers_)))
+                              Slot<ClockType>(handler_, logs_.journal("Slot"), maxSelectedPeers_)))
                       .first;
         it->second.update(validator, id, type, callback);
     }
@@ -765,24 +765,24 @@ Slots<clock_type>::updateSlotAndSquelch(
     }
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slots<clock_type>::deletePeer(id_t id, bool erase)
+Slots<ClockType>::deletePeer(id_t id, bool erase)
 {
     for (auto& [validator, slot] : slots_)
         slot.deletePeer(validator, id, erase);
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Slots<clock_type>::deleteIdlePeers()
+Slots<ClockType>::deleteIdlePeers()
 {
-    auto now = clock_type::now();
+    auto now = ClockType::now();
 
     for (auto it = slots_.begin(); it != slots_.end();)
     {
         it->second.deleteIdlePeer(it->first);
-        if (now - it->second.getLastSelected() > MAX_UNSQUELCH_EXPIRE_DEFAULT)
+        if (now - it->second.getLastSelected() > kMAX_UNSQUELCH_EXPIRE_DEFAULT)
         {
             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 3f1d1b3192..21a1b228a1 100644
--- a/src/xrpld/overlay/Squelch.h
+++ b/src/xrpld/overlay/Squelch.h
@@ -11,10 +11,10 @@
 namespace xrpl::reduce_relay {
 
 /** Maintains squelching of relaying messages from validators */
-template <typename clock_type>
+template <typename ClockType>
 class Squelch
 {
-    using time_point = typename clock_type::time_point;
+    using time_point = typename ClockType::time_point;
 
 public:
     explicit Squelch(beast::Journal journal) : journal_(journal)
@@ -50,15 +50,15 @@ private:
     beast::Journal const journal_;
 };
 
-template <typename clock_type>
+template <typename ClockType>
 bool
-Squelch<clock_type>::addSquelch(
+Squelch<ClockType>::addSquelch(
     PublicKey const& validator,
     std::chrono::seconds const& squelchDuration)
 {
-    if (squelchDuration >= MIN_UNSQUELCH_EXPIRE && squelchDuration <= MAX_UNSQUELCH_EXPIRE_PEERS)
+    if (squelchDuration >= kMIN_UNSQUELCH_EXPIRE && squelchDuration <= kMAX_UNSQUELCH_EXPIRE_PEERS)
     {
-        squelched_[validator] = clock_type::now() + squelchDuration;
+        squelched_[validator] = ClockType::now() + squelchDuration;
         return true;
     }
 
@@ -70,18 +70,18 @@ Squelch<clock_type>::addSquelch(
     return false;
 }
 
-template <typename clock_type>
+template <typename ClockType>
 void
-Squelch<clock_type>::removeSquelch(PublicKey const& validator)
+Squelch<ClockType>::removeSquelch(PublicKey const& validator)
 {
     squelched_.erase(validator);
 }
 
-template <typename clock_type>
+template <typename ClockType>
 bool
-Squelch<clock_type>::expireSquelch(PublicKey const& validator)
+Squelch<ClockType>::expireSquelch(PublicKey const& validator)
 {
-    auto now = clock_type::now();
+    auto now = ClockType::now();
 
     auto const& it = squelched_.find(validator);
     if (it == squelched_.end())
diff --git a/src/xrpld/overlay/detail/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp
index b15ed1859c..dcb40a54f5 100644
--- a/src/xrpld/overlay/detail/Cluster.cpp
+++ b/src/xrpld/overlay/detail/Cluster.cpp
@@ -72,7 +72,7 @@ Cluster::update(
 }
 
 void
-Cluster::for_each(std::function<void(ClusterNode const&)> func) const
+Cluster::forEach(std::function<void(ClusterNode const&)> func) const
 {
     std::scoped_lock const lock(mutex_);
     for (auto const& ni : nodes_)
@@ -82,7 +82,7 @@ Cluster::for_each(std::function<void(ClusterNode const&)> func) const
 bool
 Cluster::load(Section const& nodes)
 {
-    static boost::regex const re(
+    static boost::regex const kRE(
         "[[:space:]]*"       // skip leading whitespace
         "([[:alnum:]]+)"     // node identity
         "(?:"                // begin optional comment block
@@ -98,7 +98,7 @@ Cluster::load(Section const& nodes)
     {
         boost::smatch match;
 
-        if (!boost::regex_match(n, match, re))
+        if (!boost::regex_match(n, match, kRE))
         {
             JLOG(j_.error()) << "Malformed entry: '" << n << "'";
             return false;
@@ -118,7 +118,7 @@ Cluster::load(Section const& nodes)
             continue;
         }
 
-        update(*id, trim_whitespace(match[2]));
+        update(*id, trimWhitespace(match[2]));
     }
 
     return true;
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp
index a90400dd2d..c83478ce1e 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.cpp
+++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp
@@ -48,8 +48,8 @@ namespace xrpl {
 
 ConnectAttempt::ConnectAttempt(
     Application& app,
-    boost::asio::io_context& io_context,
-    endpoint_type remote_endpoint,
+    boost::asio::io_context& ioContext,
+    endpoint_type remoteEndpoint,
     Resource::Consumer usage,
     shared_context const& context,
     std::uint32_t id,
@@ -61,17 +61,17 @@ ConnectAttempt::ConnectAttempt(
     , id_(id)
     , sink_(journal, OverlayImpl::makePrefix(id))
     , journal_(sink_)
-    , remote_endpoint_(std::move(remote_endpoint))
+    , remoteEndpoint_(std::move(remoteEndpoint))
     , usage_(usage)
-    , strand_(boost::asio::make_strand(io_context))
-    , timer_(io_context)
-    , stepTimer_(io_context)
-    , stream_ptr_(
+    , strand_(boost::asio::make_strand(ioContext))
+    , timer_(ioContext)
+    , stepTimer_(ioContext)
+    , streamPtr_(
           std::make_unique<stream_type>(
-              socket_type(std::forward<boost::asio::io_context&>(io_context)),
+              socket_type(std::forward<boost::asio::io_context&>(ioContext)),
               *context))
-    , socket_(stream_ptr_->next_layer().socket())
-    , stream_(*stream_ptr_)
+    , socket_(streamPtr_->next_layer().socket())
+    , stream_(*streamPtr_)
     , slot_(slot)
 {
 }
@@ -81,7 +81,7 @@ ConnectAttempt::~ConnectAttempt()
     // slot_ will be null if we successfully connected
     // and transferred ownership to a PeerImp
     if (slot_ != nullptr)
-        overlay_.peerFinder().on_closed(slot_);
+        overlay_.peerFinder().onClosed(slot_);
 }
 
 void
@@ -110,7 +110,7 @@ ConnectAttempt::run()
         return;
     }
 
-    JLOG(journal_.debug()) << "run: connecting to " << remote_endpoint_;
+    JLOG(journal_.debug()) << "run: connecting to " << remoteEndpoint_;
 
     ioPending_ = true;
 
@@ -118,7 +118,7 @@ ConnectAttempt::run()
     setTimer(ConnectionStep::TcpConnect);
 
     stream_.next_layer().async_connect(
-        remote_endpoint_,
+        remoteEndpoint_,
         boost::asio::bind_executor(
             strand_,
             std::bind(&ConnectAttempt::onConnect, shared_from_this(), std::placeholders::_1)));
@@ -231,7 +231,7 @@ ConnectAttempt::setTimer(ConnectionStep step)
     {
         try
         {
-            timer_.expires_after(connectTimeout);
+            timer_.expires_after(kCONNECT_TIMEOUT);
             timer_.async_wait(
                 boost::asio::bind_executor(
                     strand_,
@@ -253,19 +253,19 @@ ConnectAttempt::setTimer(ConnectionStep step)
         switch (step)
         {
             case ConnectionStep::TcpConnect:
-                stepTimeout = StepTimeouts::tcpConnect;
+                stepTimeout = StepTimeouts::kTCP_CONNECT;
                 break;
             case ConnectionStep::TlsHandshake:
-                stepTimeout = StepTimeouts::tlsHandshake;
+                stepTimeout = StepTimeouts::kTLS_HANDSHAKE;
                 break;
             case ConnectionStep::HttpWrite:
-                stepTimeout = StepTimeouts::httpWrite;
+                stepTimeout = StepTimeouts::kHTTP_WRITE;
                 break;
             case ConnectionStep::HttpRead:
-                stepTimeout = StepTimeouts::httpRead;
+                stepTimeout = StepTimeouts::kHTTP_READ;
                 break;
             case ConnectionStep::ShutdownStarted:
-                stepTimeout = StepTimeouts::tlsShutdown;
+                stepTimeout = StepTimeouts::kTLS_SHUTDOWN;
                 break;
             case ConnectionStep::Complete:
             case ConnectionStep::Init:
@@ -406,7 +406,7 @@ ConnectAttempt::onHandshake(error_code ec)
         return;
     }
 
-    auto const local_endpoint = socket_.local_endpoint(ec);
+    auto const localEndpoint = socket_.local_endpoint(ec);
     if (ec)
     {
         fail("onHandshake", ec);
@@ -417,13 +417,13 @@ ConnectAttempt::onHandshake(error_code ec)
 
     // check if we connected to ourselves
     if (!overlay_.peerFinder().onConnected(
-            slot_, beast::IPAddressConversion::from_asio(local_endpoint)))
+            slot_, beast::IPAddressConversion::fromAsio(localEndpoint)))
     {
         fail("Self connection");
         return;
     }
 
-    auto const sharedValue = makeSharedValue(*stream_ptr_, journal_);
+    auto const sharedValue = makeSharedValue(*streamPtr_, journal_);
     if (!sharedValue)
     {
         shutdown();
@@ -441,8 +441,8 @@ ConnectAttempt::onHandshake(error_code ec)
         req_,
         *sharedValue,
         overlay_.setup().networkID,
-        overlay_.setup().public_ip,
-        remote_endpoint_.address(),
+        overlay_.setup().publicIp,
+        remoteEndpoint_.address(),
         app_);
 
     if (shutdown_)
@@ -490,7 +490,7 @@ ConnectAttempt::onWrite(error_code ec)
 
     boost::beast::http::async_read(
         stream_,
-        read_buf_,
+        readBuf_,
         response_,
         boost::asio::bind_executor(
             strand_,
@@ -559,8 +559,8 @@ ConnectAttempt::processResponse()
                 static_cast<char const*>(buffer.data()), boost::asio::buffer_size(buffer));
         }
 
-        Json::Value json;
-        Json::Reader reader;
+        json::Value json;
+        json::Reader reader;
         auto const isValidJson = reader.parse(responseBody, json);
 
         // Check if this is a redirect response (contains peer-ips field)
@@ -568,7 +568,7 @@ ConnectAttempt::processResponse()
 
         if (!isRedirect)
         {
-            JLOG(journal_.warn()) << "processResponse: " << remote_endpoint_
+            JLOG(journal_.warn()) << "processResponse: " << remoteEndpoint_
                                   << " failed to upgrade to peer protocol: " << response_.result()
                                   << " (" << response_.reason() << ")";
 
@@ -576,7 +576,7 @@ ConnectAttempt::processResponse()
             return;
         }
 
-        Json::Value const& peerIps = json["peer-ips"];
+        json::Value const& peerIps = json["peer-ips"];
         if (!peerIps.isArray())
         {
             fail("processResponse: invalid peer-ips format");
@@ -593,13 +593,13 @@ ConnectAttempt::processResponse()
                 continue;
 
             error_code ec;
-            auto const endpoint = parse_endpoint(ipValue.asString(), ec);
+            auto const endpoint = parseEndpoint(ipValue.asString(), ec);
             if (!ec)
                 redirectEndpoints.push_back(endpoint);
         }
 
         // Notify PeerFinder about the redirect redirectEndpoints may be empty
-        overlay_.peerFinder().onRedirects(remote_endpoint_, redirectEndpoints);
+        overlay_.peerFinder().onRedirects(remoteEndpoint_, redirectEndpoints);
 
         fail("processResponse: failed to connect to peer: redirected");
         return;
@@ -622,7 +622,7 @@ ConnectAttempt::processResponse()
         }
     }
 
-    auto const sharedValue = makeSharedValue(*stream_ptr_, journal_);
+    auto const sharedValue = makeSharedValue(*streamPtr_, journal_);
     if (!sharedValue)
     {
         shutdown();
@@ -635,8 +635,8 @@ ConnectAttempt::processResponse()
             response_,
             *sharedValue,
             overlay_.setup().networkID,
-            overlay_.setup().public_ip,
-            remote_endpoint_.address(),
+            overlay_.setup().publicIp,
+            remoteEndpoint_.address(),
             app_);
 
         usage_.setPublicKey(publicKey);
@@ -651,10 +651,10 @@ ConnectAttempt::processResponse()
         }
 
         auto const result = overlay_.peerFinder().activate(slot_, publicKey, member.has_value());
-        if (result != PeerFinder::Result::success)
+        if (result != PeerFinder::Result::Success)
         {
             std::stringstream ss;
-            ss << "Outbound Connect Attempt " << remote_endpoint_ << " " << to_string(result);
+            ss << "Outbound Connect Attempt " << remoteEndpoint_ << " " << to_string(result);
             fail(ss.str());
             return;
         }
@@ -670,8 +670,8 @@ ConnectAttempt::processResponse()
 
         auto const peer = std::make_shared<PeerImp>(
             app_,
-            std::move(stream_ptr_),
-            read_buf_.data(),
+            std::move(streamPtr_),
+            readBuf_.data(),
             std::move(slot_),
             std::move(response_),
             usage_,
@@ -680,7 +680,7 @@ ConnectAttempt::processResponse()
             id_,
             overlay_);
 
-        overlay_.add_active(peer);
+        overlay_.addActive(peer);
     }
     catch (std::exception const& e)
     {
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.h b/src/xrpld/overlay/detail/ConnectAttempt.h
index 0626efd9c7..70ce7912ba 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 connectTimeout{25};
+    static constexpr std::chrono::seconds kCONNECT_TIMEOUT{25};
 
     /**
      * @struct StepTimeouts
@@ -81,15 +81,15 @@ private:
     struct StepTimeouts
     {
         // TCP connection timeout
-        static constexpr std::chrono::seconds tcpConnect{8};
+        static constexpr std::chrono::seconds kTCP_CONNECT{8};
         // SSL handshake timeout
-        static constexpr std::chrono::seconds tlsHandshake{8};
+        static constexpr std::chrono::seconds kTLS_HANDSHAKE{8};
         // HTTP write timeout
-        static constexpr std::chrono::seconds httpWrite{3};
+        static constexpr std::chrono::seconds kHTTP_WRITE{3};
         // HTTP read timeout
-        static constexpr std::chrono::seconds httpRead{3};
+        static constexpr std::chrono::seconds kHTTP_READ{3};
         // SSL shutdown timeout
-        static constexpr std::chrono::seconds tlsShutdown{2};
+        static constexpr std::chrono::seconds kTLS_SHUTDOWN{2};
     };
 
     // Core application and networking components
@@ -97,17 +97,17 @@ private:
     Peer::id_t const id_;
     beast::WrappedSink sink_;
     beast::Journal const journal_;
-    endpoint_type remote_endpoint_;
+    endpoint_type remoteEndpoint_;
     Resource::Consumer usage_;
 
     boost::asio::strand<boost::asio::io_context::executor_type> strand_;
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> timer_;
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> stepTimer_;
 
-    std::unique_ptr<stream_type> stream_ptr_;  // SSL stream (owned)
+    std::unique_ptr<stream_type> streamPtr_;  // SSL stream (owned)
     socket_type& socket_;
     stream_type& stream_;
-    boost::beast::multi_buffer read_buf_;
+    boost::beast::multi_buffer readBuf_;
 
     response_type response_;
     std::shared_ptr<PeerFinder::Slot> slot_;
@@ -122,8 +122,8 @@ public:
      * @brief Construct a new ConnectAttempt object
      *
      * @param app Application context providing configuration and services
-     * @param io_context ASIO I/O context for async operations
-     * @param remote_endpoint Target peer endpoint to connect to
+     * @param ioContext ASIO I/O context for async operations
+     * @param remoteEndpoint Target peer endpoint to connect to
      * @param usage Resource usage tracker for rate limiting
      * @param context Shared SSL context for encryption
      * @param id Unique peer identifier for this connection attempt
@@ -136,8 +136,8 @@ public:
      */
     ConnectAttempt(
         Application& app,
-        boost::asio::io_context& io_context,
-        endpoint_type remote_endpoint,
+        boost::asio::io_context& ioContext,
+        endpoint_type remoteEndpoint,
         Resource::Consumer usage,
         shared_context const& context,
         Peer::id_t id,
@@ -254,7 +254,7 @@ private:
 
     template <class = void>
     static boost::asio::ip::tcp::endpoint
-    parse_endpoint(std::string const& s, boost::system::error_code& ec)
+    parseEndpoint(std::string const& s, boost::system::error_code& ec)
     {
         beast::IP::Endpoint bep;
         std::istringstream is(s);
@@ -265,7 +265,7 @@ private:
             return boost::asio::ip::tcp::endpoint{};
         }
 
-        return beast::IPAddressConversion::to_asio_endpoint(bep);
+        return beast::IPAddressConversion::toAsioEndpoint(bep);
     }
 };
 
diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp
index 22e971dd6e..af0585f8ad 100644
--- a/src/xrpld/overlay/detail/Handshake.cpp
+++ b/src/xrpld/overlay/detail/Handshake.cpp
@@ -68,7 +68,7 @@ isFeatureValue(
     std::string const& value)
 {
     if (auto const fvalue = getFeatureValue(headers, feature))
-        return beast::rfc2616::token_in_list(fvalue.value(), value);
+        return beast::rfc2616::tokenInList(fvalue.value(), value);
 
     return false;
 }
@@ -88,13 +88,13 @@ makeFeaturesRequestHeader(
 {
     std::stringstream str;
     if (comprEnabled)
-        str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
+        str << kFEATURE_COMPR << "=lz4" << kDELIM_FEATURE;
     if (ledgerReplayEnabled)
-        str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
+        str << kFEATURE_LEDGER_REPLAY << "=1" << kDELIM_FEATURE;
     if (txReduceRelayEnabled)
-        str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
+        str << kFEATURE_TXRR << "=1" << kDELIM_FEATURE;
     if (vpReduceRelayEnabled)
-        str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
+        str << kFEATURE_VPRR << "=1" << kDELIM_FEATURE;
     return str.str();
 }
 
@@ -107,14 +107,14 @@ makeFeaturesResponseHeader(
     bool vpReduceRelayEnabled)
 {
     std::stringstream str;
-    if (comprEnabled && isFeatureValue(headers, FEATURE_COMPR, "lz4"))
-        str << FEATURE_COMPR << "=lz4" << DELIM_FEATURE;
-    if (ledgerReplayEnabled && featureEnabled(headers, FEATURE_LEDGER_REPLAY))
-        str << FEATURE_LEDGER_REPLAY << "=1" << DELIM_FEATURE;
-    if (txReduceRelayEnabled && featureEnabled(headers, FEATURE_TXRR))
-        str << FEATURE_TXRR << "=1" << DELIM_FEATURE;
-    if (vpReduceRelayEnabled && featureEnabled(headers, FEATURE_VPRR))
-        str << FEATURE_VPRR << "=1" << DELIM_FEATURE;
+    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;
     return str.str();
 }
 
@@ -132,20 +132,20 @@ makeFeaturesResponseHeader(
           this topic, see https://github.com/openssl/openssl/issues/5509 and
           https://github.com/XRPLF/rippled/issues/2413.
 */
-static std::optional<base_uint<512>>
+static std::optional<BaseUint<512>>
 hashLastMessage(SSL const* ssl, size_t (*get)(const SSL*, void*, size_t))
 {
-    constexpr std::size_t sslMinimumFinishedLength = 12;
+    constexpr std::size_t kSSL_MINIMUM_FINISHED_LENGTH = 12;
 
     unsigned char buf[1024];
     size_t const len = get(ssl, buf, sizeof(buf));
 
-    if (len < sslMinimumFinishedLength)
+    if (len < kSSL_MINIMUM_FINISHED_LENGTH)
         return std::nullopt;
 
     sha512_hasher const h;
 
-    base_uint<512> cookie;
+    BaseUint<512> cookie;
     SHA512(buf, len, cookie.data());
     return cookie;
 }
@@ -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::zero)
+    if (result == beast::kZERO)
     {
         JLOG(journal.error()) << "Cookie generation: identical finished messages";
         return std::nullopt;
@@ -185,8 +185,8 @@ buildHandshake(
     boost::beast::http::fields& h,
     xrpl::uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
-    beast::IP::Address public_ip,
-    beast::IP::Address remote_ip,
+    beast::IP::Address publicIp,
+    beast::IP::Address remoteIp,
     Application& app)
 {
     if (networkID)
@@ -204,7 +204,7 @@ buildHandshake(
     {
         auto const sig =
             signDigest(app.nodeIdentity().first, app.nodeIdentity().second, sharedValue);
-        h.insert("Session-Signature", base64_encode(sig.data(), sig.size()));
+        h.insert("Session-Signature", base64Encode(sig.data(), sig.size()));
     }
 
     h.insert("Instance-Cookie", std::to_string(app.instanceID()));
@@ -212,11 +212,11 @@ buildHandshake(
     if (!app.config().SERVER_DOMAIN.empty())
         h.insert("Server-Domain", app.config().SERVER_DOMAIN);
 
-    if (beast::IP::is_public(remote_ip))
-        h.insert("Remote-IP", remote_ip.to_string());
+    if (beast::IP::isPublic(remoteIp))
+        h.insert("Remote-IP", remoteIp.to_string());
 
-    if (!public_ip.is_unspecified())
-        h.insert("Local-IP", public_ip.to_string());
+    if (!publicIp.is_unspecified())
+        h.insert("Local-IP", publicIp.to_string());
 
     if (auto const cl = app.getLedgerMaster().getClosedLedger())
     {
@@ -230,7 +230,7 @@ verifyHandshake(
     boost::beast::http::fields const& headers,
     xrpl::uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
-    beast::IP::Address public_ip,
+    beast::IP::Address publicIp,
     beast::IP::Address remote,
     Application& app)
 {
@@ -291,7 +291,7 @@ verifyHandshake(
 
             if (pk)
             {
-                if (publicKeyType(*pk) != KeyType::secp256k1)
+                if (publicKeyType(*pk) != KeyType::Secp256k1)
                     throw std::runtime_error("Unsupported public key type");
 
                 return *pk;
@@ -313,7 +313,7 @@ verifyHandshake(
         if (iter == headers.end())
             throw std::runtime_error("No session signature specified");
 
-        auto sig = base64_decode(iter->value());
+        auto sig = base64Decode(iter->value());
 
         if (!verifyDigest(publicKey, sharedValue, makeSlice(sig), false))
             throw std::runtime_error("Failed to verify session");
@@ -325,36 +325,35 @@ verifyHandshake(
     if (auto const iter = headers.find("Local-IP"); iter != headers.end())
     {
         boost::system::error_code ec;
-        auto const local_ip = boost::asio::ip::make_address(std::string_view(iter->value()), ec);
+        auto const localIp = boost::asio::ip::make_address(std::string_view(iter->value()), ec);
 
         if (ec)
             throw std::runtime_error("Invalid Local-IP");
 
-        if (beast::IP::is_public(remote) && remote != local_ip)
+        if (beast::IP::isPublic(remote) && remote != localIp)
         {
             throw std::runtime_error(
-                "Incorrect Local-IP: " + remote.to_string() + " instead of " +
-                local_ip.to_string());
+                "Incorrect Local-IP: " + remote.to_string() + " instead of " + localIp.to_string());
         }
     }
 
     if (auto const iter = headers.find("Remote-IP"); iter != headers.end())
     {
         boost::system::error_code ec;
-        auto const remote_ip = boost::asio::ip::make_address(std::string_view(iter->value()), ec);
+        auto const remoteIp = boost::asio::ip::make_address(std::string_view(iter->value()), ec);
 
         if (ec)
             throw std::runtime_error("Invalid Remote-IP");
 
-        if (beast::IP::is_public(remote) && !beast::IP::is_unspecified(public_ip))
+        if (beast::IP::isPublic(remote) && !beast::IP::isUnspecified(publicIp))
         {
             // We know our public IP and peer reports our connection came
             // from some other IP.
-            if (remote_ip != public_ip)
+            if (remoteIp != publicIp)
             {
                 throw std::runtime_error(
-                    "Incorrect Remote-IP: " + public_ip.to_string() + " instead of " +
-                    remote_ip.to_string());
+                    "Incorrect Remote-IP: " + publicIp.to_string() + " instead of " +
+                    remoteIp.to_string());
             }
         }
     }
@@ -390,8 +389,8 @@ http_response_type
 makeResponse(
     bool crawlPublic,
     http_request_type const& req,
-    beast::IP::Address public_ip,
-    beast::IP::Address remote_ip,
+    beast::IP::Address publicIp,
+    beast::IP::Address remoteIp,
     uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
     ProtocolVersion protocol,
@@ -414,7 +413,7 @@ makeResponse(
             app.config().TX_REDUCE_RELAY_ENABLE,
             app.config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE));
 
-    buildHandshake(resp, sharedValue, networkID, public_ip, remote_ip, app);
+    buildHandshake(resp, sharedValue, networkID, publicIp, remoteIp, app);
 
     return resp;
 }
diff --git a/src/xrpld/overlay/detail/Handshake.h b/src/xrpld/overlay/detail/Handshake.h
index 5965fd3435..77a346477f 100644
--- a/src/xrpld/overlay/detail/Handshake.h
+++ b/src/xrpld/overlay/detail/Handshake.h
@@ -43,8 +43,8 @@ buildHandshake(
     boost::beast::http::fields& h,
     uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
-    beast::IP::Address public_ip,
-    beast::IP::Address remote_ip,
+    beast::IP::Address publicIp,
+    beast::IP::Address remoteIp,
     Application& app);
 
 /** Validate header fields necessary for upgrading the link to the peer
@@ -63,7 +63,7 @@ verifyHandshake(
     boost::beast::http::fields const& headers,
     uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
-    beast::IP::Address public_ip,
+    beast::IP::Address publicIp,
     beast::IP::Address remote,
     Application& app);
 
@@ -90,8 +90,8 @@ makeRequest(
 
    @param crawlPublic if true then server's IP/Port are included in crawl
    @param req incoming http request
-   @param public_ip server's public IP
-   @param remote_ip peer's IP
+   @param publicIp server's public IP
+   @param remoteIp peer's IP
    @param sharedValue shared value based on the SSL connection state
    @param networkID specifies what network we intend to connect to
    @param version supported protocol version
@@ -102,8 +102,8 @@ http_response_type
 makeResponse(
     bool crawlPublic,
     http_request_type const& req,
-    beast::IP::Address public_ip,
-    beast::IP::Address remote_ip,
+    beast::IP::Address publicIp,
+    beast::IP::Address remoteIp,
     uint256 const& sharedValue,
     std::optional<std::uint32_t> networkID,
     ProtocolVersion version,
@@ -115,15 +115,15 @@ makeResponse(
 // value: \S+
 
 // compression feature
-static constexpr char FEATURE_COMPR[] = "compr";
+static constexpr char kFEATURE_COMPR[] = "compr";
 // validation/proposal reduce-relay base squelch feature
-static constexpr char FEATURE_VPRR[] = "vprr";
+static constexpr char kFEATURE_VPRR[] = "vprr";
 // transaction reduce-relay feature
-static constexpr char FEATURE_TXRR[] = "txrr";
+static constexpr char kFEATURE_TXRR[] = "txrr";
 // ledger replay
-static constexpr char FEATURE_LEDGER_REPLAY[] = "ledgerreplay";
-static constexpr char DELIM_FEATURE[] = ";";
-static constexpr char DELIM_VALUE[] = ",";
+static constexpr char kFEATURE_LEDGER_REPLAY[] = "ledgerreplay";
+static constexpr char kDELIM_FEATURE[] = ";";
+static constexpr char kDELIM_VALUE[] = ",";
 
 /** Get feature's header value
    @param headers request/response header
@@ -166,10 +166,10 @@ featureEnabled(boost::beast::http::fields const& headers, std::string const& fea
    @param value feature's value to check in the headers
    @return true if the feature is enabled
  */
-template <typename headers>
+template <typename Headers>
 bool
 peerFeatureEnabled(
-    headers const& request,
+    Headers const& request,
     std::string const& feature,
     std::string value,
     bool config)
@@ -178,9 +178,9 @@ peerFeatureEnabled(
 }
 
 /** Wrapper for enable(1)/disable type(0) of feature */
-template <typename headers>
+template <typename Headers>
 bool
-peerFeatureEnabled(headers const& request, std::string const& feature, bool config)
+peerFeatureEnabled(Headers const& request, std::string const& feature, bool config)
 {
     return config && peerFeatureEnabled(request, feature, "1", config);
 }
diff --git a/src/xrpld/overlay/detail/Message.cpp b/src/xrpld/overlay/detail/Message.cpp
index eb8add8666..30f4c281ed 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(headerBytes + messageBytes);
+    buffer_.resize(kHEADER_BYTES + messageBytes);
 
     setHeader(buffer_.data(), messageBytes, type, Algorithm::None, 0);
 
     if (messageBytes != 0)
-        message.SerializeToArray(buffer_.data() + headerBytes, messageBytes);
+        message.SerializeToArray(buffer_.data() + kHEADER_BYTES, 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::headerBytes;
+    return messageSize(message) + compression::kHEADER_BYTES;
 }
 
 void
 Message::compress()
 {
     using namespace xrpl::compression;
-    auto const messageBytes = buffer_.size() - headerBytes;
+    auto const messageBytes = buffer_.size() - kHEADER_BYTES;
 
     auto type = getType(buffer_.data());
 
@@ -104,19 +104,19 @@ Message::compress()
 
     if (compressible)
     {
-        auto payload = static_cast<void const*>(buffer_.data() + headerBytes);
+        auto payload = static_cast<void const*>(buffer_.data() + kHEADER_BYTES);
 
         auto compressedSize = xrpl::compression::compress(
             payload,
             messageBytes,
             [&](std::size_t inSize) {  // size of required compressed buffer
-                bufferCompressed_.resize(inSize + headerBytesCompressed);
-                return (bufferCompressed_.data() + headerBytesCompressed);
+                bufferCompressed_.resize(inSize + kHEADER_BYTES_COMPRESSED);
+                return (bufferCompressed_.data() + kHEADER_BYTES_COMPRESSED);
             });
 
-        if (compressedSize < (messageBytes - (headerBytesCompressed - headerBytes)))
+        if (compressedSize < (messageBytes - (kHEADER_BYTES_COMPRESSED - kHEADER_BYTES)))
         {
-            bufferCompressed_.resize(headerBytesCompressed + compressedSize);
+            bufferCompressed_.resize(kHEADER_BYTES_COMPRESSED + 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 d17a556dd8..e21d00a1e7 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -116,7 +116,7 @@ OverlayImpl::Child::~Child()
 
 //------------------------------------------------------------------------------
 
-OverlayImpl::Timer::Timer(OverlayImpl& overlay) : Child(overlay), timer_(overlay_.io_context_)
+OverlayImpl::Timer::Timer(OverlayImpl& overlay) : Child(overlay), timer(overlay_.io_context_)
 {
 }
 
@@ -125,24 +125,24 @@ OverlayImpl::Timer::stop()
 {
     // This method is only ever called from the same strand that calls
     // Timer::on_timer, ensuring they never execute concurrently.
-    stopping_ = true;
-    timer_.cancel();
+    stopping = true;
+    timer.cancel();
 }
 
 void
-OverlayImpl::Timer::async_wait()
+OverlayImpl::Timer::asyncWait()
 {
-    timer_.expires_after(std::chrono::seconds(1));
-    timer_.async_wait(
+    timer.expires_after(std::chrono::seconds(1));
+    timer.async_wait(
         boost::asio::bind_executor(
             overlay_.strand_,
-            std::bind(&Timer::on_timer, shared_from_this(), std::placeholders::_1)));
+            std::bind(&Timer::onTimer, shared_from_this(), std::placeholders::_1)));
 }
 
 void
-OverlayImpl::Timer::on_timer(error_code ec)
+OverlayImpl::Timer::onTimer(error_code ec)
 {
-    if (ec || stopping_)
+    if (ec || stopping)
     {
         if (ec && ec != boost::asio::error::operation_aborted)
         {
@@ -151,16 +151,16 @@ OverlayImpl::Timer::on_timer(error_code ec)
         return;
     }
 
-    overlay_.m_peerFinder->once_per_second();
+    overlay_.peerFinder_->oncePerSecond();
     overlay_.sendEndpoints();
     overlay_.autoConnect();
     if (overlay_.app_.config().TX_REDUCE_RELAY_ENABLE)
         overlay_.sendTxQueue();
 
-    if ((++overlay_.timer_count_ % Tuning::checkIdlePeers) == 0)
+    if ((++overlay_.timer_count_ % Tuning::CheckIdlePeers) == 0)
         overlay_.deleteIdlePeers();
 
-    async_wait();
+    asyncWait();
 }
 
 //------------------------------------------------------------------------------
@@ -171,32 +171,32 @@ OverlayImpl::OverlayImpl(
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
     : app_(app)
-    , io_context_(io_context)
+    , io_context_(ioContext)
     , work_(std::in_place, boost::asio::make_work_guard(io_context_))
     , strand_(boost::asio::make_strand(io_context_))
     , setup_(std::move(setup))
     , journal_(app_.getJournal("Overlay"))
     , serverHandler_(serverHandler)
-    , m_resourceManager(resourceManager)
-    , m_peerFinder(
-          PeerFinder::make_Manager(
-              io_context,
+    , resourceManager_(resourceManager)
+    , peerFinder_(
+          PeerFinder::makeManager(
+              ioContext,
               stopwatch(),
               app_.getJournal("PeerFinder"),
               config,
               collector))
-    , m_resolver(resolver)
+    , resolver_(resolver)
     , next_id_(1)
     , slots_(app, *this, app.config())
-    , m_stats(
-          std::bind(&OverlayImpl::collect_metrics, this),
+    , stats_(
+          std::bind(&OverlayImpl::collectMetrics, this),
           collector,
-          [counts = m_traffic.getCounts(), collector]() {
-              std::unordered_map<TrafficCount::category, TrafficGauges> ret;
+          [counts = traffic_.getCounts(), collector]() {
+              std::unordered_map<TrafficCount::Category, TrafficGauges> ret;
 
               for (auto const& pair : counts)
                   ret.emplace(pair.first, TrafficGauges(pair.second.name, collector));
@@ -204,14 +204,14 @@ OverlayImpl::OverlayImpl(
               return ret;
           }())
 {
-    beast::PropertyStream::Source::add(m_peerFinder.get());
+    beast::PropertyStream::Source::add(peerFinder_.get());
 }
 
 Handoff
 OverlayImpl::onHandoff(
-    std::unique_ptr<stream_type>&& stream_ptr,
+    std::unique_ptr<stream_type>&& streamPtr,
     http_request_type&& request,
-    endpoint_type remote_endpoint)
+    endpoint_type remoteEndpoint)
 {
     auto const id = next_id_++;
     auto peerJournal = app_.getJournal("Peer");
@@ -226,44 +226,44 @@ OverlayImpl::onHandoff(
 
     handoff.moved = true;
 
-    JLOG(journal.debug()) << "Peer connection upgrade from " << remote_endpoint;
+    JLOG(journal.debug()) << "Peer connection upgrade from " << remoteEndpoint;
 
     error_code ec;
-    auto const local_endpoint(stream_ptr->next_layer().socket().local_endpoint(ec));
+    auto const localEndpoint(streamPtr->next_layer().socket().local_endpoint(ec));
     if (ec)
     {
-        JLOG(journal.debug()) << remote_endpoint << " failed: " << ec.message();
+        JLOG(journal.debug()) << remoteEndpoint << " failed: " << ec.message();
         return handoff;
     }
 
-    auto consumer = m_resourceManager.newInboundEndpoint(
-        beast::IPAddressConversion::from_asio(remote_endpoint));
+    auto consumer =
+        resourceManager_.newInboundEndpoint(beast::IPAddressConversion::fromAsio(remoteEndpoint));
     if (consumer.disconnect(journal))
         return handoff;
 
-    auto const [slot, result] = m_peerFinder->new_inbound_slot(
-        beast::IPAddressConversion::from_asio(local_endpoint),
-        beast::IPAddressConversion::from_asio(remote_endpoint));
+    auto const [slot, result] = peerFinder_->newInboundSlot(
+        beast::IPAddressConversion::fromAsio(localEndpoint),
+        beast::IPAddressConversion::fromAsio(remoteEndpoint));
 
     if (slot == nullptr)
     {
         // connection refused either IP limit exceeded or self-connect
         handoff.moved = false;
-        JLOG(journal.debug()) << "Peer " << remote_endpoint << " refused, " << to_string(result);
+        JLOG(journal.debug()) << "Peer " << remoteEndpoint << " refused, " << to_string(result);
         return handoff;
     }
 
     // Validate HTTP request
 
     {
-        auto const types = beast::rfc2616::split_commas(request["Connect-As"]);
+        auto const types = beast::rfc2616::splitCommas(request["Connect-As"]);
         if (std::ranges::find_if(types, [](std::string const& s) {
                 return boost::iequals(s, "peer");
             }) == types.end())
         {
             handoff.moved = false;
-            handoff.response = makeRedirectResponse(slot, request, remote_endpoint.address());
-            handoff.keep_alive = beast::rfc2616::is_keep_alive(request);
+            handoff.response = makeRedirectResponse(slot, request, remoteEndpoint.address());
+            handoff.keep_alive = beast::rfc2616::isKeepAlive(request);
             return handoff;
         }
     }
@@ -271,21 +271,21 @@ OverlayImpl::onHandoff(
     auto const negotiatedVersion = negotiateProtocolVersion(request["Upgrade"]);
     if (!negotiatedVersion)
     {
-        m_peerFinder->on_closed(slot);
+        peerFinder_->onClosed(slot);
         handoff.moved = false;
         handoff.response = makeErrorResponse(
-            slot, request, remote_endpoint.address(), "Unable to agree on a protocol version");
+            slot, request, remoteEndpoint.address(), "Unable to agree on a protocol version");
         handoff.keep_alive = false;
         return handoff;
     }
 
-    auto const sharedValue = makeSharedValue(*stream_ptr, journal);
+    auto const sharedValue = makeSharedValue(*streamPtr, journal);
     if (!sharedValue)
     {
-        m_peerFinder->on_closed(slot);
+        peerFinder_->onClosed(slot);
         handoff.moved = false;
-        handoff.response = makeErrorResponse(
-            slot, request, remote_endpoint.address(), "Incorrect security cookie");
+        handoff.response =
+            makeErrorResponse(slot, request, remoteEndpoint.address(), "Incorrect security cookie");
         handoff.keep_alive = false;
         return handoff;
     }
@@ -296,8 +296,8 @@ OverlayImpl::onHandoff(
             request,
             *sharedValue,
             setup_.networkID,
-            setup_.public_ip,
-            remote_endpoint.address(),
+            setup_.publicIp,
+            remoteEndpoint.address(),
             app_);
 
         consumer.setPublicKey(publicKey);
@@ -307,14 +307,14 @@ OverlayImpl::onHandoff(
             // or if it has a reservation.
             bool const reserved = static_cast<bool>(app_.getCluster().member(publicKey)) ||
                 app_.getPeerReservations().contains(publicKey);
-            auto const result = m_peerFinder->activate(slot, publicKey, reserved);
-            if (result != PeerFinder::Result::success)
+            auto const result = peerFinder_->activate(slot, publicKey, reserved);
+            if (result != PeerFinder::Result::Success)
             {
-                m_peerFinder->on_closed(slot);
+                peerFinder_->onClosed(slot);
                 JLOG(journal.debug())
-                    << "Peer " << remote_endpoint << " redirected, " << to_string(result);
+                    << "Peer " << remoteEndpoint << " redirected, " << to_string(result);
                 handoff.moved = false;
-                handoff.response = makeRedirectResponse(slot, request, remote_endpoint.address());
+                handoff.response = makeRedirectResponse(slot, request, remoteEndpoint.address());
                 handoff.keep_alive = false;
                 return handoff;
             }
@@ -328,7 +328,7 @@ OverlayImpl::onHandoff(
             publicKey,
             *negotiatedVersion,
             consumer,
-            std::move(stream_ptr),
+            std::move(streamPtr),
             *this);
         {
             // As we are not on the strand, run() must be called
@@ -336,7 +336,7 @@ OverlayImpl::onHandoff(
             // queued after a call to stop().
             std::scoped_lock const lock(mutex_);
             {
-                auto const result = m_peers.emplace(peer->slot(), peer);
+                auto const result = peers_.emplace(peer->slot(), peer);
                 XRPL_ASSERT(result.second, "xrpl::OverlayImpl::onHandoff : peer is inserted");
                 (void)result.second;
             }
@@ -349,12 +349,12 @@ OverlayImpl::onHandoff(
     }
     catch (std::exception const& e)
     {
-        JLOG(journal.debug()) << "Peer " << remote_endpoint << " fails handshake (" << e.what()
+        JLOG(journal.debug()) << "Peer " << remoteEndpoint << " fails handshake (" << e.what()
                               << ")";
 
-        m_peerFinder->on_closed(slot);
+        peerFinder_->onClosed(slot);
         handoff.moved = false;
-        handoff.response = makeErrorResponse(slot, request, remote_endpoint.address(), e.what());
+        handoff.response = makeErrorResponse(slot, request, remoteEndpoint.address(), e.what());
         handoff.keep_alive = false;
         return handoff;
     }
@@ -365,7 +365,7 @@ OverlayImpl::onHandoff(
 bool
 OverlayImpl::isPeerUpgrade(http_request_type const& request)
 {
-    if (!is_upgrade(request))
+    if (!isUpgrade(request))
         return false;
     auto const versions = parseProtocolVersions(request["Upgrade"]);
     return !versions.empty();
@@ -383,24 +383,24 @@ std::shared_ptr<Writer>
 OverlayImpl::makeRedirectResponse(
     std::shared_ptr<PeerFinder::Slot> const& slot,
     http_request_type const& request,
-    address_type remote_address)
+    address_type remoteAddress)
 {
-    boost::beast::http::response<json_body> msg;
+    boost::beast::http::response<JsonBody> msg;
     msg.version(request.version());
     msg.result(boost::beast::http::status::service_unavailable);
     msg.insert("Server", BuildInfo::getFullVersionString());
     {
         std::ostringstream ostr;
-        ostr << remote_address;
+        ostr << remoteAddress;
         msg.insert("Remote-Address", ostr.str());
     }
     msg.insert("Content-Type", "application/json");
     msg.insert(boost::beast::http::field::connection, "close");
-    msg.body() = Json::objectValue;
+    msg.body() = json::ObjectValue;
     {
-        Json::Value& ips = (msg.body()["peer-ips"] = Json::arrayValue);
-        for (auto const& _ : m_peerFinder->redirect(slot))
-            ips.append(_.address.to_string());
+        json::Value& ips = (msg.body()["peer-ips"] = json::ArrayValue);
+        for (auto const& _ : peerFinder_->redirect(slot))
+            ips.append(_.address.toString());
     }
     msg.prepare_payload();
     return std::make_shared<SimpleWriter>(msg);
@@ -410,7 +410,7 @@ std::shared_ptr<Writer>
 OverlayImpl::makeErrorResponse(
     std::shared_ptr<PeerFinder::Slot> const& slot,
     http_request_type const& request,
-    address_type remote_address,
+    address_type remoteAddress,
     std::string text)
 {
     boost::beast::http::response<boost::beast::http::empty_body> msg;
@@ -418,7 +418,7 @@ OverlayImpl::makeErrorResponse(
     msg.result(boost::beast::http::status::bad_request);
     msg.reason("Bad Request (" + text + ")");
     msg.insert("Server", BuildInfo::getFullVersionString());
-    msg.insert("Remote-Address", remote_address.to_string());
+    msg.insert("Remote-Address", remoteAddress.to_string());
     msg.insert(boost::beast::http::field::connection, "close");
     msg.prepare_payload();
     return std::make_shared<SimpleWriter>(msg);
@@ -427,21 +427,21 @@ OverlayImpl::makeErrorResponse(
 //------------------------------------------------------------------------------
 
 void
-OverlayImpl::connect(beast::IP::Endpoint const& remote_endpoint)
+OverlayImpl::connect(beast::IP::Endpoint const& remoteEndpoint)
 {
     XRPL_ASSERT(work_, "xrpl::OverlayImpl::connect : work is set");
 
-    auto usage = resourceManager().newOutboundEndpoint(remote_endpoint);
+    auto usage = resourceManager().newOutboundEndpoint(remoteEndpoint);
     if (usage.disconnect(journal_))
     {
-        JLOG(journal_.info()) << "Over resource limit: " << remote_endpoint;
+        JLOG(journal_.info()) << "Over resource limit: " << remoteEndpoint;
         return;
     }
 
-    auto const [slot, result] = peerFinder().new_outbound_slot(remote_endpoint);
+    auto const [slot, result] = peerFinder().newOutboundSlot(remoteEndpoint);
     if (slot == nullptr)
     {
-        JLOG(journal_.debug()) << "Connect: No slot for " << remote_endpoint << ": "
+        JLOG(journal_.debug()) << "Connect: No slot for " << remoteEndpoint << ": "
                                << to_string(result);
         return;
     }
@@ -449,7 +449,7 @@ OverlayImpl::connect(beast::IP::Endpoint const& remote_endpoint)
     auto const p = std::make_shared<ConnectAttempt>(
         app_,
         io_context_,
-        beast::IPAddressConversion::to_asio_endpoint(remote_endpoint),
+        beast::IPAddressConversion::toAsioEndpoint(remoteEndpoint),
         usage,
         setup_.context,
         next_id_++,
@@ -466,7 +466,7 @@ OverlayImpl::connect(beast::IP::Endpoint const& remote_endpoint)
 
 // Adds a peer that is already handshaked and active
 void
-OverlayImpl::add_active(std::shared_ptr<PeerImp> const& peer)
+OverlayImpl::addActive(std::shared_ptr<PeerImp> const& peer)
 {
     beast::WrappedSink sink{journal_.sink(), peer->prefix()};
     beast::Journal const journal{sink};
@@ -474,7 +474,7 @@ OverlayImpl::add_active(std::shared_ptr<PeerImp> const& peer)
     std::scoped_lock const lock(mutex_);
 
     {
-        auto const result = m_peers.emplace(peer->slot(), peer);
+        auto const result = peers_.emplace(peer->slot(), peer);
         XRPL_ASSERT(result.second, "xrpl::OverlayImpl::add_active : peer is inserted");
         (void)result.second;
     }
@@ -500,9 +500,9 @@ void
 OverlayImpl::remove(std::shared_ptr<PeerFinder::Slot> const& slot)
 {
     std::scoped_lock const lock(mutex_);
-    auto const iter = m_peers.find(slot);
-    XRPL_ASSERT(iter != m_peers.end(), "xrpl::OverlayImpl::remove : valid input");
-    m_peers.erase(iter);
+    auto const iter = peers_.find(slot);
+    XRPL_ASSERT(iter != peers_.end(), "xrpl::OverlayImpl::remove : valid input");
+    peers_.erase(iter);
 }
 
 void
@@ -514,8 +514,8 @@ OverlayImpl::start()
         app_.getValidationPublicKey().has_value(),
         setup_.ipLimit);
 
-    m_peerFinder->setConfig(config);
-    m_peerFinder->start();
+    peerFinder_->setConfig(config);
+    peerFinder_->start();
 
     // Populate our boot cache: if there are no entries in [ips] then we use
     // the entries in [ips_fixed].
@@ -538,7 +538,7 @@ OverlayImpl::start()
         bootstrapIps.emplace_back("hub.xrpl-commons.org 51235");
     }
 
-    m_resolver.resolve(
+    resolver_.resolve(
         bootstrapIps,
         [this](std::string const& name, std::vector<beast::IP::Endpoint> const& addresses) {
             std::vector<std::string> ips;
@@ -547,7 +547,7 @@ OverlayImpl::start()
             {
                 if (addr.port() == 0)
                 {
-                    ips.push_back(to_string(addr.at_port(DEFAULT_PEER_PORT)));
+                    ips.push_back(to_string(addr.atPort(kDEFAULT_PEER_PORT)));
                 }
                 else
                 {
@@ -557,13 +557,13 @@ OverlayImpl::start()
 
             std::string const base("config: ");
             if (!ips.empty())
-                m_peerFinder->addFallbackStrings(base + name, ips);
+                peerFinder_->addFallbackStrings(base + name, ips);
         });
 
     // Add the ips_fixed from the xrpld.cfg file
     if (!app_.config().standalone() && !app_.config().IPS_FIXED.empty())
     {
-        m_resolver.resolve(
+        resolver_.resolve(
             app_.config().IPS_FIXED,
             [this](std::string const& name, std::vector<beast::IP::Endpoint> const& addresses) {
                 std::vector<beast::IP::Endpoint> ips;
@@ -573,7 +573,7 @@ OverlayImpl::start()
                 {
                     if (addr.port() == 0)
                     {
-                        ips.emplace_back(addr.address(), DEFAULT_PEER_PORT);
+                        ips.emplace_back(addr.address(), kDEFAULT_PEER_PORT);
                     }
                     else
                     {
@@ -582,14 +582,14 @@ OverlayImpl::start()
                 }
 
                 if (!ips.empty())
-                    m_peerFinder->addFixedPeer(name, ips);
+                    peerFinder_->addFixedPeer(name, ips);
             });
     }
     auto const timer = std::make_shared<Timer>(*this);
     std::scoped_lock const lock(mutex_);
     list_.emplace(timer.get(), timer);
     timer_ = timer;
-    timer->async_wait();
+    timer->asyncWait();
 }
 
 void
@@ -600,7 +600,7 @@ OverlayImpl::stop()
         std::unique_lock<decltype(mutex_)> lock(mutex_);
         cond_.wait(lock, [this] { return list_.empty(); });
     }
-    m_peerFinder->stop();
+    peerFinder_->stop();
 }
 
 //------------------------------------------------------------------------------
@@ -613,7 +613,7 @@ void
 OverlayImpl::onWrite(beast::PropertyStream::Map& stream)
 {
     beast::PropertyStream::Set set("traffic", stream);
-    auto const stats = m_traffic.getCounts();
+    auto const stats = traffic_.getCounts();
     for (auto const& pair : stats)
     {
         beast::PropertyStream::Map item(set);
@@ -679,7 +679,7 @@ OverlayImpl::onManifests(
 
             auto const result = app_.getValidatorManifests().applyManifest(std::move(*mo));
 
-            if (result == ManifestDisposition::accepted)
+            if (result == ManifestDisposition::Accepted)
             {
                 relay.add_list()->set_stobject(s);
 
@@ -711,21 +711,21 @@ OverlayImpl::onManifests(
 
     if (!relay.list().empty())
     {
-        for_each([m2 = std::make_shared<Message>(relay, protocol::mtMANIFESTS)](
-                     std::shared_ptr<PeerImp> const& p) { p->send(m2); });
+        forEach([m2 = std::make_shared<Message>(relay, protocol::mtMANIFESTS)](
+                    std::shared_ptr<PeerImp> const& p) { p->send(m2); });
     }
 }
 
 void
-OverlayImpl::reportInboundTraffic(TrafficCount::category cat, int size)
+OverlayImpl::reportInboundTraffic(TrafficCount::Category cat, int size)
 {
-    m_traffic.addCount(cat, true, size);
+    traffic_.addCount(cat, true, size);
 }
 
 void
-OverlayImpl::reportOutboundTraffic(TrafficCount::category cat, int size)
+OverlayImpl::reportOutboundTraffic(TrafficCount::Category cat, int size)
 {
-    m_traffic.addCount(cat, false, size);
+    traffic_.addCount(cat, false, size);
 }
 /** The number of active peers on the network
     Active peers are only those peers that have completed the handshake
@@ -741,19 +741,19 @@ OverlayImpl::size() const
 int
 OverlayImpl::limit()
 {
-    return m_peerFinder->config().maxPeers;
+    return peerFinder_->config().maxPeers;
 }
 
-Json::Value
+json::Value
 OverlayImpl::getOverlayInfo() const
 {
     using namespace std::chrono;
-    Json::Value jv;
-    auto& av = jv[jss::active] = Json::Value(Json::arrayValue);
+    json::Value jv;
+    auto& av = jv[jss::active] = json::Value(json::ArrayValue);
 
-    for_each([&](std::shared_ptr<PeerImp> const& sp) {
-        auto& pv = av.append(Json::Value(Json::objectValue));
-        pv[jss::public_key] = base64_encode(sp->getNodePublic().data(), sp->getNodePublic().size());
+    forEach([&](std::shared_ptr<PeerImp> const& sp) {
+        auto& pv = av.append(json::Value(json::ObjectValue));
+        pv[jss::public_key] = base64Encode(sp->getNodePublic().data(), sp->getNodePublic().size());
         pv[jss::type] = sp->slot()->inbound() ? jss::in : jss::out;
         pv[jss::uptime] = static_cast<std::uint32_t>(duration_cast<seconds>(sp->uptime()).count());
         if (sp->crawl())
@@ -761,7 +761,7 @@ OverlayImpl::getOverlayInfo() const
             pv[jss::ip] = sp->getRemoteAddress().address().to_string();
             if (sp->slot()->inbound())
             {
-                if (auto port = sp->slot()->listening_port())
+                if (auto port = sp->slot()->listeningPort())
                     pv[jss::port] = *port;
             }
             else
@@ -774,7 +774,7 @@ OverlayImpl::getOverlayInfo() const
             auto version{sp->getVersion()};
             if (!version.empty())
             {
-                // Could move here if Json::value supported moving from strings
+                // Could move here if json::value supported moving from strings
                 pv[jss::version] = std::string{version};
             }
         }
@@ -788,49 +788,49 @@ OverlayImpl::getOverlayInfo() const
     return jv;
 }
 
-Json::Value
+json::Value
 OverlayImpl::getServerInfo()
 {
     bool const humanReadable = false;
     bool const admin = false;
     bool const counters = false;
 
-    Json::Value server_info = app_.getOPs().getServerInfo(humanReadable, admin, counters);
+    json::Value serverInfo = app_.getOPs().getServerInfo(humanReadable, admin, counters);
 
     // Filter out some information
-    server_info.removeMember(jss::hostid);
-    server_info.removeMember(jss::load_factor_fee_escalation);
-    server_info.removeMember(jss::load_factor_fee_queue);
-    server_info.removeMember(jss::validation_quorum);
+    serverInfo.removeMember(jss::hostid);
+    serverInfo.removeMember(jss::load_factor_fee_escalation);
+    serverInfo.removeMember(jss::load_factor_fee_queue);
+    serverInfo.removeMember(jss::validation_quorum);
 
-    if (server_info.isMember(jss::validated_ledger))
+    if (serverInfo.isMember(jss::validated_ledger))
     {
-        Json::Value& validated_ledger = server_info[jss::validated_ledger];
+        json::Value& validatedLedger = serverInfo[jss::validated_ledger];
 
-        validated_ledger.removeMember(jss::base_fee);
-        validated_ledger.removeMember(jss::reserve_base_xrp);
-        validated_ledger.removeMember(jss::reserve_inc_xrp);
+        validatedLedger.removeMember(jss::base_fee);
+        validatedLedger.removeMember(jss::reserve_base_xrp);
+        validatedLedger.removeMember(jss::reserve_inc_xrp);
     }
 
-    return server_info;
+    return serverInfo;
 }
 
-Json::Value
+json::Value
 OverlayImpl::getServerCounts()
 {
     return getCountsJson(app_, 10);
 }
 
-Json::Value
+json::Value
 OverlayImpl::getUnlInfo()
 {
-    Json::Value validators = app_.getValidators().getJson();
+    json::Value validators = app_.getValidators().getJson();
 
     if (validators.isMember(jss::publisher_lists))
     {
-        Json::Value& publisher_lists = validators[jss::publisher_lists];
+        json::Value& publisherLists = validators[jss::publisher_lists];
 
-        for (auto& publisher : publisher_lists)
+        for (auto& publisher : publisherLists)
         {
             publisher.removeMember(jss::list);
         }
@@ -840,7 +840,7 @@ OverlayImpl::getUnlInfo()
     validators.removeMember(jss::trusted_validator_keys);
     validators.removeMember(jss::validation_quorum);
 
-    Json::Value validatorSites = app_.getValidatorSites().getJson();
+    json::Value validatorSites = app_.getValidatorSites().getJson();
 
     if (validatorSites.isMember(jss::validator_sites))
     {
@@ -851,10 +851,10 @@ OverlayImpl::getUnlInfo()
 }
 
 // Returns information on verified peers.
-Json::Value
+json::Value
 OverlayImpl::json()
 {
-    Json::Value json;
+    json::Value json;
     for (auto const& peer : getActivePeers())
     {
         json.append(peer->json());
@@ -868,13 +868,13 @@ OverlayImpl::processCrawl(http_request_type const& req, Handoff& handoff)
     if (req.target() != "/crawl" || setup_.crawlOptions == CrawlOptions::Disabled)
         return false;
 
-    boost::beast::http::response<json_body> msg;
+    boost::beast::http::response<JsonBody> msg;
     msg.version(req.version());
     msg.result(boost::beast::http::status::ok);
     msg.insert("Server", BuildInfo::getFullVersionString());
     msg.insert("Content-Type", "application/json");
     msg.insert("Connection", "close");
-    msg.body()["version"] = Json::Value(2u);
+    msg.body()["version"] = json::Value(2u);
 
     if ((setup_.crawlOptions & CrawlOptions::Overlay) != 0u)
     {
@@ -903,14 +903,14 @@ 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 prefix("/vl/");
+    constexpr std::string_view kPREFIX("/vl/");
 
-    if (!req.target().starts_with(prefix) || !setup_.vlEnabled)
+    if (!req.target().starts_with(kPREFIX) || !setup_.vlEnabled)
         return false;
 
     std::uint32_t version = 1;
 
-    boost::beast::http::response<json_body> msg;
+    boost::beast::http::response<JsonBody> msg;
     msg.version(req.version());
     msg.insert("Server", BuildInfo::getFullVersionString());
     msg.insert("Content-Type", "application/json");
@@ -920,14 +920,14 @@ OverlayImpl::processValidatorList(http_request_type const& req, Handoff& handoff
         msg.result(status);
         msg.insert("Content-Length", "0");
 
-        msg.body() = Json::nullValue;
+        msg.body() = json::NullValue;
 
         msg.prepare_payload();
         handoff.response = std::make_shared<SimpleWriter>(msg);
         return true;
     };
 
-    std::string_view key = req.target().substr(prefix.size());
+    std::string_view key = req.target().substr(kPREFIX.size());
 
     if (auto slash = key.find('/'); slash != std::string_view::npos)
     {
@@ -967,7 +967,7 @@ OverlayImpl::processHealth(http_request_type const& req, Handoff& handoff)
 {
     if (req.target() != "/health")
         return false;
-    boost::beast::http::response<json_body> msg;
+    boost::beast::http::response<JsonBody> msg;
     msg.version(req.version());
     msg.insert("Server", BuildInfo::getFullVersionString());
     msg.insert("Content-Type", "application/json");
@@ -975,88 +975,88 @@ OverlayImpl::processHealth(http_request_type const& req, Handoff& handoff)
 
     auto info = getServerInfo();
 
-    int last_validated_ledger_age = -1;
+    int lastValidatedLedgerAge = -1;
     if (info.isMember(jss::validated_ledger))
-        last_validated_ledger_age = info[jss::validated_ledger][jss::age].asInt();
-    bool amendment_blocked = false;
+        lastValidatedLedgerAge = info[jss::validated_ledger][jss::age].asInt();
+    bool amendmentBlocked = false;
     if (info.isMember(jss::amendment_blocked))
-        amendment_blocked = true;
-    int const number_peers = info[jss::peers].asInt();
-    std::string const server_state = info[jss::server_state].asString();
-    auto load_factor = info[jss::load_factor_server].asDouble() / info[jss::load_base].asDouble();
+        amendmentBlocked = true;
+    int const numberPeers = info[jss::peers].asInt();
+    std::string const serverState = info[jss::server_state].asString();
+    auto loadFactor = info[jss::load_factor_server].asDouble() / info[jss::load_base].asDouble();
 
-    enum class HealthState { healthy, warning, critical };
-    auto health = HealthState::healthy;
-    auto set_health = [&health](HealthState state) { health = std::max(health, state); };
+    enum class HealthState { Healthy, Warning, Critical };
+    auto health = HealthState::Healthy;
+    auto setHealth = [&health](HealthState state) { health = std::max(health, state); };
 
-    msg.body()[jss::info] = Json::objectValue;
-    if (last_validated_ledger_age >= 7 || last_validated_ledger_age < 0)
+    msg.body()[jss::info] = json::ObjectValue;
+    if (lastValidatedLedgerAge >= 7 || lastValidatedLedgerAge < 0)
     {
-        msg.body()[jss::info][jss::validated_ledger] = last_validated_ledger_age;
-        if (last_validated_ledger_age < 20)
+        msg.body()[jss::info][jss::validated_ledger] = lastValidatedLedgerAge;
+        if (lastValidatedLedgerAge < 20)
         {
-            set_health(HealthState::warning);
+            setHealth(HealthState::Warning);
         }
         else
         {
-            set_health(HealthState::critical);
+            setHealth(HealthState::Critical);
         }
     }
 
-    if (amendment_blocked)
+    if (amendmentBlocked)
     {
         msg.body()[jss::info][jss::amendment_blocked] = true;
-        set_health(HealthState::critical);
+        setHealth(HealthState::Critical);
     }
 
-    if (number_peers <= 7)
+    if (numberPeers <= 7)
     {
-        msg.body()[jss::info][jss::peers] = number_peers;
-        if (number_peers != 0)
+        msg.body()[jss::info][jss::peers] = numberPeers;
+        if (numberPeers != 0)
         {
-            set_health(HealthState::warning);
+            setHealth(HealthState::Warning);
         }
         else
         {
-            set_health(HealthState::critical);
+            setHealth(HealthState::Critical);
         }
     }
 
-    if (!(server_state == "full" || server_state == "validating" || server_state == "proposing"))
+    if (!(serverState == "full" || serverState == "validating" || serverState == "proposing"))
     {
-        msg.body()[jss::info][jss::server_state] = server_state;
-        if (server_state == "syncing" || server_state == "tracking" || server_state == "connected")
+        msg.body()[jss::info][jss::server_state] = serverState;
+        if (serverState == "syncing" || serverState == "tracking" || serverState == "connected")
         {
-            set_health(HealthState::warning);
+            setHealth(HealthState::Warning);
         }
         else
         {
-            set_health(HealthState::critical);
+            setHealth(HealthState::Critical);
         }
     }
 
-    if (load_factor > 100)
+    if (loadFactor > 100)
     {
-        msg.body()[jss::info][jss::load_factor] = load_factor;
-        if (load_factor < 1000)
+        msg.body()[jss::info][jss::load_factor] = loadFactor;
+        if (loadFactor < 1000)
         {
-            set_health(HealthState::warning);
+            setHealth(HealthState::Warning);
         }
         else
         {
-            set_health(HealthState::critical);
+            setHealth(HealthState::Critical);
         }
     }
 
     switch (health)
     {
-        case HealthState::healthy:
+        case HealthState::Healthy:
             msg.result(boost::beast::http::status::ok);
             break;
-        case HealthState::warning:
+        case HealthState::Warning:
             msg.result(boost::beast::http::status::service_unavailable);
             break;
-        case HealthState::critical:
+        case HealthState::Critical:
             msg.result(boost::beast::http::status::internal_server_error);
             break;
     }
@@ -1080,7 +1080,7 @@ OverlayImpl::getActivePeers() const
     Overlay::PeerSequence ret;
     ret.reserve(size());
 
-    for_each([&ret](std::shared_ptr<PeerImp> const& sp) { ret.emplace_back(sp); });
+    forEach([&ret](std::shared_ptr<PeerImp> const& sp) { ret.emplace_back(sp); });
 
     return ret;
 }
@@ -1127,7 +1127,7 @@ OverlayImpl::getActivePeers(
 void
 OverlayImpl::checkTracking(std::uint32_t index)
 {
-    for_each([index](std::shared_ptr<PeerImp> const& sp) { sp->checkTracking(index); });
+    forEach([index](std::shared_ptr<PeerImp> const& sp) { sp->checkTracking(index); });
 }
 
 std::shared_ptr<Peer>
@@ -1163,7 +1163,7 @@ void
 OverlayImpl::broadcast(protocol::TMProposeSet& m)
 {
     auto const sm = std::make_shared<Message>(m, protocol::mtPROPOSE_LEDGER);
-    for_each([&](std::shared_ptr<PeerImp> const& p) { p->send(sm); });
+    forEach([&](std::shared_ptr<PeerImp> const& p) { p->send(sm); });
 }
 
 std::set<Peer::id_t>
@@ -1172,7 +1172,7 @@ OverlayImpl::relay(protocol::TMProposeSet& m, uint256 const& uid, PublicKey cons
     if (auto const toSkip = app_.getHashRouter().shouldRelay(uid))
     {
         auto const sm = std::make_shared<Message>(m, protocol::mtPROPOSE_LEDGER, validator);
-        for_each([&](std::shared_ptr<PeerImp> const& p) {
+        forEach([&](std::shared_ptr<PeerImp> const& p) {
             if (!toSkip->contains(p->id()))
                 p->send(sm);
         });
@@ -1185,7 +1185,7 @@ void
 OverlayImpl::broadcast(protocol::TMValidation& m)
 {
     auto const sm = std::make_shared<Message>(m, protocol::mtVALIDATION);
-    for_each([sm](std::shared_ptr<PeerImp> const& p) { p->send(sm); });
+    forEach([sm](std::shared_ptr<PeerImp> const& p) { p->send(sm); });
 }
 
 std::set<Peer::id_t>
@@ -1194,7 +1194,7 @@ OverlayImpl::relay(protocol::TMValidation& m, uint256 const& uid, PublicKey cons
     if (auto const toSkip = app_.getHashRouter().shouldRelay(uid))
     {
         auto const sm = std::make_shared<Message>(m, protocol::mtVALIDATION, validator);
-        for_each([&](std::shared_ptr<PeerImp> const& p) {
+        forEach([&](std::shared_ptr<PeerImp> const& p) {
             if (!toSkip->contains(p->id()))
                 p->send(sm);
         });
@@ -1212,7 +1212,7 @@ OverlayImpl::getManifestsMessage()
     {
         protocol::TMManifests tm;
 
-        app_.getValidatorManifests().for_each_manifest(
+        app_.getValidatorManifests().forEachManifest(
             [&tm](std::size_t s) { tm.mutable_list()->Reserve(s); },
             [&tm, &hr = app_.getHashRouter()](Manifest const& manifest) {
                 tm.add_list()->set_stobject(manifest.serialized.data(), manifest.serialized.size());
@@ -1293,7 +1293,7 @@ OverlayImpl::relay(
     txMetrics_.addMetrics(enabledTarget, toSkip.size(), disabled);
 
     if (enabledTarget > enabledInSkip)
-        std::shuffle(peers.begin(), peers.end(), default_prng());
+        std::shuffle(peers.begin(), peers.end(), defaultPrng());
 
     JLOG(journal_.trace()) << "relaying tx, total peers " << peers.size() << " selected "
                            << enabledTarget << " skip " << toSkip.size() << " disabled "
@@ -1366,7 +1366,7 @@ OverlayImpl::stopChildren()
 void
 OverlayImpl::autoConnect()
 {
-    auto const result = m_peerFinder->autoconnect();
+    auto const result = peerFinder_->autoconnect();
     for (auto const& addr : result)
         connect(addr);
 }
@@ -1374,14 +1374,14 @@ OverlayImpl::autoConnect()
 void
 OverlayImpl::sendEndpoints()
 {
-    auto const result = m_peerFinder->buildEndpointsForPeers();
+    auto const result = peerFinder_->buildEndpointsForPeers();
     for (auto const& e : result)
     {
         std::shared_ptr<PeerImp> peer;
         {
             std::scoped_lock const lock(mutex_);
-            auto const iter = m_peers.find(e.first);
-            if (iter != m_peers.end())
+            auto const iter = peers_.find(e.first);
+            if (iter != peers_.end())
                 peer = iter->second.lock();
         }
         if (peer)
@@ -1392,7 +1392,7 @@ OverlayImpl::sendEndpoints()
 void
 OverlayImpl::sendTxQueue() const
 {
-    for_each([](auto const& p) {
+    forEach([](auto const& p) {
         if (p->txReduceRelayEnabled())
             p->sendTxQueue();
     });
@@ -1454,7 +1454,7 @@ OverlayImpl::updateSlotAndSquelch(
     for (auto id : peers)
     {
         slots_.updateSlotAndSquelch(key, validator, id, type, [&]() {
-            reportInboundTraffic(TrafficCount::category::squelch_ignored, 0);
+            reportInboundTraffic(TrafficCount::Category::SquelchIgnored, 0);
         });
     }
 }
@@ -1483,7 +1483,7 @@ OverlayImpl::updateSlotAndSquelch(
     }
 
     slots_.updateSlotAndSquelch(key, validator, peer, type, [&]() {
-        reportInboundTraffic(TrafficCount::category::squelch_ignored, 0);
+        reportInboundTraffic(TrafficCount::Category::SquelchIgnored, 0);
     });
 }
 
@@ -1514,13 +1514,13 @@ OverlayImpl::deleteIdlePeers()
 //------------------------------------------------------------------------------
 
 Overlay::Setup
-setup_Overlay(BasicConfig const& config)
+setupOverlay(BasicConfig const& config)
 {
     Overlay::Setup setup;
 
     {
         auto const& section = config.section("overlay");
-        setup.context = make_SSLContext("");
+        setup.context = makeSslContext("");
 
         set(setup.ipLimit, "ip_limit", section);
         if (setup.ipLimit < 0)
@@ -1531,8 +1531,8 @@ setup_Overlay(BasicConfig const& config)
         if (!ip.empty())
         {
             boost::system::error_code ec;
-            setup.public_ip = boost::asio::ip::make_address(ip, ec);
-            if (ec || beast::IP::is_private(setup.public_ip))
+            setup.publicIp = boost::asio::ip::make_address(ip, ec);
+            if (ec || beast::IP::isPrivate(setup.publicIp))
                 Throw<std::runtime_error>("Configured public IP is invalid");
         }
     }
@@ -1617,18 +1617,18 @@ setup_Overlay(BasicConfig const& config)
 }
 
 std::unique_ptr<Overlay>
-make_Overlay(
+makeOverlay(
     Application& app,
     Overlay::Setup const& setup,
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
 {
     return std::make_unique<OverlayImpl>(
-        app, setup, serverHandler, resourceManager, resolver, io_context, config, collector);
+        app, setup, serverHandler, resourceManager, resolver, ioContext, config, collector);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h
index caccd35562..65c93a5845 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.h
+++ b/src/xrpld/overlay/detail/OverlayImpl.h
@@ -64,8 +64,8 @@ private:
 
     struct Timer : Child, std::enable_shared_from_this<Timer>
     {
-        boost::asio::basic_waitable_timer<clock_type> timer_;
-        bool stopping_{false};
+        boost::asio::basic_waitable_timer<clock_type> timer;
+        bool stopping{false};
 
         explicit Timer(OverlayImpl& overlay);
 
@@ -73,10 +73,10 @@ private:
         stop() override;
 
         void
-        async_wait();
+        asyncWait();
 
         void
-        on_timer(error_code ec);
+        onTimer(error_code ec);
     };
 
     Application& app_;
@@ -90,12 +90,12 @@ private:
     Setup setup_;
     beast::Journal const journal_;
     ServerHandler& serverHandler_;
-    Resource::Manager& m_resourceManager;
-    std::unique_ptr<PeerFinder::Manager> m_peerFinder;
-    TrafficCount m_traffic;
-    hash_map<std::shared_ptr<PeerFinder::Slot>, std::weak_ptr<PeerImp>> m_peers;
+    Resource::Manager& resourceManager_;
+    std::unique_ptr<PeerFinder::Manager> peerFinder_;
+    TrafficCount traffic_;
+    hash_map<std::shared_ptr<PeerFinder::Slot>, std::weak_ptr<PeerImp>> peers_;
     hash_map<Peer::id_t, std::weak_ptr<PeerImp>> ids_;
-    Resolver& m_resolver;
+    Resolver& resolver_;
     std::atomic<Peer::id_t> next_id_;
     int timer_count_{0};
     std::atomic<uint64_t> jqTransOverflow_{0};
@@ -123,7 +123,7 @@ public:
         ServerHandler& serverHandler,
         Resource::Manager& resourceManager,
         Resolver& resolver,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         BasicConfig const& config,
         beast::insight::Collector::ptr const& collector);
 
@@ -140,13 +140,13 @@ public:
     PeerFinder::Manager&
     peerFinder()
     {
-        return *m_peerFinder;
+        return *peerFinder_;
     }
 
     Resource::Manager&
     resourceManager()
     {
-        return m_resourceManager;
+        return resourceManager_;
     }
 
     Setup const&
@@ -159,10 +159,10 @@ public:
     onHandoff(
         std::unique_ptr<stream_type>&& bundle,
         http_request_type&& request,
-        endpoint_type remote_endpoint) override;
+        endpoint_type remoteEndpoint) override;
 
     void
-    connect(beast::IP::Endpoint const& remote_endpoint) override;
+    connect(beast::IP::Endpoint const& remoteEndpoint) override;
 
     int
     limit() override;
@@ -170,7 +170,7 @@ public:
     std::size_t
     size() const override;
 
-    Json::Value
+    json::Value
     json() override;
 
     PeerSequence
@@ -228,7 +228,7 @@ public:
     //
 
     void
-    add_active(std::shared_ptr<PeerImp> const& peer);
+    addActive(std::shared_ptr<PeerImp> const& peer);
 
     void
     remove(std::shared_ptr<PeerFinder::Slot> const& slot);
@@ -250,7 +250,7 @@ public:
     //
     template <class UnaryFunc>
     void
-    for_each(UnaryFunc&& f) const
+    forEach(UnaryFunc&& f) const
     {
         std::vector<std::weak_ptr<PeerImp>> wp;
         {
@@ -284,14 +284,14 @@ public:
     static bool
     isPeerUpgrade(boost::beast::http::response<Body> const& response)
     {
-        if (!is_upgrade(response))
+        if (!isUpgrade(response))
             return false;
         return response.result() == boost::beast::http::status::switching_protocols;
     }
 
     template <class Fields>
     static bool
-    is_upgrade(boost::beast::http::header<true, Fields> const& req)
+    isUpgrade(boost::beast::http::header<true, Fields> const& req)
     {
         if (req.version() < 11)
             return false;
@@ -304,7 +304,7 @@ public:
 
     template <class Fields>
     static bool
-    is_upgrade(boost::beast::http::header<false, Fields> const& req)
+    isUpgrade(boost::beast::http::header<false, Fields> const& req)
     {
         if (req.version() < 11)
             return false;
@@ -317,10 +317,10 @@ public:
     makePrefix(std::uint32_t id);
 
     void
-    reportInboundTraffic(TrafficCount::category cat, int bytes);
+    reportInboundTraffic(TrafficCount::Category cat, int bytes);
 
     void
-    reportOutboundTraffic(TrafficCount::category cat, int bytes);
+    reportOutboundTraffic(TrafficCount::Category cat, int bytes);
 
     void
     incJqTransOverflow() override
@@ -397,7 +397,7 @@ public:
     void
     deletePeer(Peer::id_t id);
 
-    Json::Value
+    json::Value
     txMetrics() const override
     {
         return txMetrics_.json();
@@ -426,13 +426,13 @@ private:
     makeRedirectResponse(
         std::shared_ptr<PeerFinder::Slot> const& slot,
         http_request_type const& request,
-        address_type remote_address);
+        address_type remoteAddress);
 
     static std::shared_ptr<Writer>
     makeErrorResponse(
         std::shared_ptr<PeerFinder::Slot> const& slot,
         http_request_type const& request,
-        address_type remote_address,
+        address_type remoteAddress,
         std::string msg);
 
     /** Handles crawl requests. Crawl returns information about the
@@ -472,28 +472,28 @@ private:
         Reported through the /crawl API
         Controlled through the config section [crawl] overlay=[0|1]
     */
-    Json::Value
+    json::Value
     getOverlayInfo() const;
 
     /** Returns information about the local server.
         Reported through the /crawl API
         Controlled through the config section [crawl] server=[0|1]
     */
-    Json::Value
+    json::Value
     getServerInfo();
 
     /** Returns information about the local server's performance counters.
         Reported through the /crawl API
         Controlled through the config section [crawl] counts=[0|1]
     */
-    Json::Value
+    json::Value
     getServerCounts();
 
     /** Returns information about the local server's UNL.
         Reported through the /crawl API
         Controlled through the config section [crawl] unl=[0|1]
     */
-    Json::Value
+    json::Value
     getUnlInfo();
 
     //--------------------------------------------------------------------------
@@ -533,10 +533,10 @@ private:
     {
         TrafficGauges(std::string const& name, beast::insight::Collector::ptr const& collector)
             : name(name)
-            , bytesIn(collector->make_gauge(name, "Bytes_In"))
-            , bytesOut(collector->make_gauge(name, "Bytes_Out"))
-            , messagesIn(collector->make_gauge(name, "Messages_In"))
-            , messagesOut(collector->make_gauge(name, "Messages_Out"))
+            , bytesIn(collector->makeGauge(name, "Bytes_In"))
+            , bytesOut(collector->makeGauge(name, "Bytes_Out"))
+            , messagesIn(collector->makeGauge(name, "Messages_In"))
+            , messagesOut(collector->makeGauge(name, "Messages_Out"))
         {
         }
         std::string const name;
@@ -552,35 +552,35 @@ private:
         Stats(
             Handler const& handler,
             beast::insight::Collector::ptr const& collector,
-            std::unordered_map<TrafficCount::category, TrafficGauges>&& trafficGauges_)
-            : peerDisconnects(collector->make_gauge("Overlay", "Peer_Disconnects"))
-            , trafficGauges(std::move(trafficGauges_))
-            , hook(collector->make_hook(handler))
+            std::unordered_map<TrafficCount::Category, TrafficGauges>&& trafficGauges)
+            : peerDisconnects(collector->makeGauge("Overlay", "Peer_Disconnects"))
+            , trafficGauges(std::move(trafficGauges))
+            , hook(collector->makeHook(handler))
         {
         }
 
         beast::insight::Gauge peerDisconnects;
-        std::unordered_map<TrafficCount::category, TrafficGauges> trafficGauges;
+        std::unordered_map<TrafficCount::Category, TrafficGauges> trafficGauges;
         beast::insight::Hook hook;
     };
 
-    Stats m_stats;
-    std::mutex m_statsMutex;
+    Stats stats_;
+    std::mutex statsMutex_;
 
 private:
     void
-    collect_metrics()
+    collectMetrics()
     {
-        auto counts = m_traffic.getCounts();
-        std::scoped_lock const lock(m_statsMutex);
+        auto counts = traffic_.getCounts();
+        std::scoped_lock const lock(statsMutex_);
         XRPL_ASSERT(
-            counts.size() == m_stats.trafficGauges.size(),
+            counts.size() == stats_.trafficGauges.size(),
             "xrpl::OverlayImpl::collect_metrics : counts size do match");
 
         for (auto const& [key, value] : counts)
         {
-            auto it = m_stats.trafficGauges.find(key);
-            if (it == m_stats.trafficGauges.end())
+            auto it = stats_.trafficGauges.find(key);
+            if (it == stats_.trafficGauges.end())
                 continue;
 
             auto& gauge = it->second;
@@ -596,7 +596,7 @@ private:
             gauge.messagesOut = value.messagesOut;
         }
 
-        m_stats.peerDisconnects = getPeerDisconnect();
+        stats_.peerDisconnects = getPeerDisconnect();
     }
 };
 
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index d90bbaff22..fa65cb604a 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 peerHighLatency{300};
+std::chrono::milliseconds constexpr kPEER_HIGH_LATENCY{300};
 
 /** How often we PING the peer to check for latency and sendq probe */
-std::chrono::seconds constexpr peerTimerInterval{60};
+std::chrono::seconds constexpr kPEER_TIMER_INTERVAL{60};
 
 /** The timeout for a shutdown timer */
-std::chrono::seconds constexpr shutdownTimerInterval{5};
+std::chrono::seconds constexpr kSHUTDOWN_TIMER_INTERVAL{5};
 
 }  // namespace
 
@@ -126,52 +126,52 @@ PeerImp::PeerImp(
     PublicKey const& publicKey,
     ProtocolVersion protocol,
     Resource::Consumer consumer,
-    std::unique_ptr<stream_type>&& stream_ptr,
+    std::unique_ptr<stream_type>&& streamPtr,
     OverlayImpl& overlay)
     : Child(overlay)
     , app_(app)
     , id_(id)
-    , fingerprint_(getFingerprint(slot->remote_endpoint(), publicKey, to_string(id)))
+    , fingerprint_(getFingerprint(slot->remoteEndpoint(), publicKey, to_string(id)))
     , prefix_(makePrefix(fingerprint_))
     , sink_(app_.getJournal("Peer"), prefix_)
-    , p_sink_(app_.getJournal("Protocol"), prefix_)
+    , pSink_(app_.getJournal("Protocol"), prefix_)
     , journal_(sink_)
-    , p_journal_(p_sink_)
-    , stream_ptr_(std::move(stream_ptr))
-    , socket_(stream_ptr_->next_layer().socket())
-    , stream_(*stream_ptr_)
+    , pJournal_(pSink_)
+    , streamPtr_(std::move(streamPtr))
+    , socket_(streamPtr_->next_layer().socket())
+    , stream_(*streamPtr_)
     , strand_(boost::asio::make_strand(socket_.get_executor()))
     , timer_(waitable_timer{socket_.get_executor()})
-    , remote_address_(slot->remote_endpoint())
+    , remoteAddress_(slot->remoteEndpoint())
     , overlay_(overlay)
     , inbound_(true)
     , protocol_(std::move(protocol))
-    , tracking_(Tracking::unknown)
+    , tracking_(Tracking::Unknown)
     , trackingTime_(clock_type::now())
     , publicKey_(publicKey)
     , lastPingTime_(clock_type::now())
     , creationTime_(clock_type::now())
     , squelch_(app_.getJournal("Squelch"))
     , usage_(consumer)
-    , fee_{.fee = Resource::feeTrivialPeer, .context = ""}
+    , fee_{.fee = Resource::kFEE_TRIVIAL_PEER, .context = ""}
     , slot_(slot)
     , request_(std::move(request))
     , headers_(request_)
     , compressionEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_COMPR, "lz4", app_.config().COMPRESSION)
+          peerFeatureEnabled(headers_, kFEATURE_COMPR, "lz4", app_.config().COMPRESSION)
               ? Compressed::On
               : Compressed::Off)
     , txReduceRelayEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
+          peerFeatureEnabled(headers_, kFEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
     , ledgerReplayEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
+          peerFeatureEnabled(headers_, kFEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
     , ledgerReplayMsgHandler_(app, app.getLedgerReplayer())
 {
     JLOG(journal_.info()) << "compression enabled " << (compressionEnabled_ == Compressed::On)
                           << " vp reduce-relay base squelch enabled "
                           << peerFeatureEnabled(
                                  headers_,
-                                 FEATURE_VPRR,
+                                 kFEATURE_VPRR,
                                  app_.config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE)
                           << " tx reduce-relay enabled " << txReduceRelayEnabled_;
 }
@@ -182,7 +182,7 @@ PeerImp::~PeerImp()
 
     overlay_.deletePeer(id_);
     overlay_.onPeerDeactivate(id_);
-    overlay_.peerFinder().on_closed(slot_);
+    overlay_.peerFinder().onClosed(slot_);
     overlay_.remove(slot_);
 
     if (inCluster)
@@ -211,7 +211,7 @@ PeerImp::run()
         if (uint256 ret; ret.parseHex(value))
             return ret;
 
-        if (auto const s = base64_decode(value); s.size() == uint256::size())
+        if (auto const s = base64Decode(value); s.size() == uint256::size())
             return uint256{s};
 
         return std::nullopt;
@@ -306,44 +306,44 @@ PeerImp::send(std::shared_ptr<Message> const& m)
     if (validator && !squelch_.expireSquelch(*validator))
     {
         overlay_.reportOutboundTraffic(
-            TrafficCount::category::squelch_suppressed,
+            TrafficCount::Category::SquelchSuppressed,
             static_cast<int>(m->getBuffer(compressionEnabled_).size()));
         return;
     }
 
     // report categorized outgoing traffic
     overlay_.reportOutboundTraffic(
-        safe_cast<TrafficCount::category>(m->getCategory()),
+        safeCast<TrafficCount::Category>(m->getCategory()),
         static_cast<int>(m->getBuffer(compressionEnabled_).size()));
 
     // report total outgoing traffic
     overlay_.reportOutboundTraffic(
-        TrafficCount::category::total, static_cast<int>(m->getBuffer(compressionEnabled_).size()));
+        TrafficCount::Category::Total, static_cast<int>(m->getBuffer(compressionEnabled_).size()));
 
-    auto sendq_size = send_queue_.size();
+    auto sendqSize = sendQueue_.size();
 
-    if (sendq_size < Tuning::targetSendQueue)
+    if (sendqSize < Tuning::TargetSendQueue)
     {
         // To detect a peer that does not read from their
         // side of the connection, we expect a peer to have
         // a small senq periodically
-        large_sendq_ = 0;
+        largeSendq_ = 0;
     }
-    else if (auto sink = journal_.debug(); sink && (sendq_size % Tuning::sendQueueLogFreq) == 0)
+    else if (auto sink = journal_.debug(); sink && (sendqSize % Tuning::SendQueueLogFreq) == 0)
     {
         std::string const n = name();
-        sink << n << " sendq: " << sendq_size;
+        sink << n << " sendq: " << sendqSize;
     }
 
-    send_queue_.push(m);
+    sendQueue_.push(m);
 
-    if (sendq_size != 0)
+    if (sendqSize != 0)
         return;
 
     writePending_ = true;
     boost::asio::async_write(
         stream_,
-        boost::asio::buffer(send_queue_.front()->getBuffer(compressionEnabled_)),
+        boost::asio::buffer(sendQueue_.front()->getBuffer(compressionEnabled_)),
         bind_executor(
             strand_,
             std::bind(
@@ -367,7 +367,7 @@ PeerImp::sendTxQueue()
         protocol::TMHaveTransactions ht;
         std::ranges::for_each(
             txQueue_, [&](auto const& hash) { ht.add_hashes(hash.data(), hash.size()); });
-        JLOG(p_journal_.trace()) << "sendTxQueue " << txQueue_.size();
+        JLOG(pJournal_.trace()) << "sendTxQueue " << txQueue_.size();
         txQueue_.clear();
         send(std::make_shared<Message>(ht, protocol::mtHAVE_TRANSACTIONS));
     }
@@ -382,14 +382,14 @@ PeerImp::addTxQueue(uint256 const& hash)
         return;
     }
 
-    if (txQueue_.size() == reduce_relay::MAX_TX_QUEUE_SIZE)
+    if (txQueue_.size() == reduce_relay::kMAX_TX_QUEUE_SIZE)
     {
-        JLOG(p_journal_.warn()) << "addTxQueue exceeds the cap";
+        JLOG(pJournal_.warn()) << "addTxQueue exceeds the cap";
         sendTxQueue();
     }
 
     txQueue_.insert(hash);
-    JLOG(p_journal_.trace()) << "addTxQueue " << txQueue_.size();
+    JLOG(pJournal_.trace()) << "addTxQueue " << txQueue_.size();
 }
 
 void
@@ -402,14 +402,14 @@ PeerImp::removeTxQueue(uint256 const& hash)
     }
 
     auto removed = txQueue_.erase(hash);
-    JLOG(p_journal_.trace()) << "removeTxQueue " << removed;
+    JLOG(pJournal_.trace()) << "removeTxQueue " << removed;
 }
 
 void
 PeerImp::charge(Resource::Charge const& fee, std::string const& context)
 {
-    if ((usage_.charge(fee, context) == Resource::Disposition::drop) &&
-        usage_.disconnect(p_journal_) && strand_.running_in_this_thread())
+    if ((usage_.charge(fee, context) == Resource::Disposition::Drop) &&
+        usage_.disconnect(pJournal_) && strand_.running_in_this_thread())
     {
         // Sever the connection
         overlay_.incPeerDisconnectCharges();
@@ -442,13 +442,13 @@ PeerImp::getVersion() const
     return headers_["Server"];
 }
 
-Json::Value
+json::Value
 PeerImp::json()
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret[jss::public_key] = toBase58(TokenType::NodePublic, publicKey_);
-    ret[jss::address] = remote_address_.to_string();
+    ret[jss::address] = remoteAddress_.toString();
 
     if (inbound_)
         ret[jss::inbound] = true;
@@ -459,7 +459,7 @@ PeerImp::json()
 
         if (auto const n = name(); !n.empty())
         {
-            // Could move here if Json::Value supported moving from a string
+            // Could move here if json::Value supported moving from a string
             ret[jss::name] = n;
         }
     }
@@ -480,11 +480,11 @@ PeerImp::json()
     {
         std::scoped_lock const sl(recentLock_);
         if (latency_)
-            ret[jss::latency] = static_cast<Json::UInt>(latency_->count());
+            ret[jss::latency] = static_cast<json::UInt>(latency_->count());
     }
 
     ret[jss::uptime] =
-        static_cast<Json::UInt>(std::chrono::duration_cast<std::chrono::seconds>(uptime()).count());
+        static_cast<json::UInt>(std::chrono::duration_cast<std::chrono::seconds>(uptime()).count());
 
     std::uint32_t minSeq = 0, maxSeq = 0;
     ledgerRange(minSeq, maxSeq);
@@ -494,33 +494,33 @@ PeerImp::json()
 
     switch (tracking_.load())
     {
-        case Tracking::diverged:
+        case Tracking::Diverged:
             ret[jss::track] = "diverged";
             break;
 
-        case Tracking::unknown:
+        case Tracking::Unknown:
             ret[jss::track] = "unknown";
             break;
 
-        case Tracking::converged:
+        case Tracking::Converged:
             // Nothing to do here
             break;
     }
 
     uint256 closedLedgerHash;
-    protocol::TMStatusChange last_status;
+    protocol::TMStatusChange lastStatus;
     {
         std::scoped_lock const sl(recentLock_);
         closedLedgerHash = closedLedgerHash_;
-        last_status = last_status_;
+        lastStatus = lastStatus_;
     }
 
-    if (closedLedgerHash != beast::zero)
+    if (closedLedgerHash != beast::kZERO)
         ret[jss::ledger] = to_string(closedLedgerHash);
 
-    if (last_status.has_newstatus())
+    if (lastStatus.has_newstatus())
     {
-        switch (last_status.newstatus())
+        switch (lastStatus.newstatus())
         {
             case protocol::nsCONNECTING:
                 ret[jss::status] = "connecting";
@@ -543,15 +543,15 @@ PeerImp::json()
                 break;
 
             default:
-                JLOG(p_journal_.warn()) << "Unknown status: " << last_status.newstatus();
+                JLOG(pJournal_.warn()) << "Unknown status: " << lastStatus.newstatus();
         }
     }
 
-    ret[jss::metrics] = Json::Value(Json::objectValue);
-    ret[jss::metrics][jss::total_bytes_recv] = std::to_string(metrics_.recv.total_bytes());
-    ret[jss::metrics][jss::total_bytes_sent] = std::to_string(metrics_.sent.total_bytes());
-    ret[jss::metrics][jss::avg_bps_recv] = std::to_string(metrics_.recv.average_bytes());
-    ret[jss::metrics][jss::avg_bps_sent] = std::to_string(metrics_.sent.average_bytes());
+    ret[jss::metrics] = json::Value(json::ObjectValue);
+    ret[jss::metrics][jss::total_bytes_recv] = std::to_string(metrics_.recv.totalBytes());
+    ret[jss::metrics][jss::total_bytes_sent] = std::to_string(metrics_.sent.totalBytes());
+    ret[jss::metrics][jss::avg_bps_recv] = std::to_string(metrics_.recv.averageBytes());
+    ret[jss::metrics][jss::avg_bps_sent] = std::to_string(metrics_.sent.averageBytes());
 
     return ret;
 }
@@ -562,9 +562,9 @@ PeerImp::supportsFeature(ProtocolFeature f) const
     switch (f)
     {
         case ProtocolFeature::ValidatorListPropagation:
-            return protocol_ >= make_protocol(2, 1);
+            return protocol_ >= makeProtocol(2, 1);
         case ProtocolFeature::ValidatorList2Propagation:
-            return protocol_ >= make_protocol(2, 2);
+            return protocol_ >= makeProtocol(2, 2);
         case ProtocolFeature::LedgerReplay:
             return ledgerReplayEnabled_;
     }
@@ -579,7 +579,7 @@ PeerImp::hasLedger(uint256 const& hash, std::uint32_t seq) const
     {
         std::scoped_lock const sl(recentLock_);
         if ((seq != 0) && (seq >= minLedger_) && (seq <= maxLedger_) &&
-            (tracking_.load() == Tracking::converged))
+            (tracking_.load() == Tracking::Converged))
             return true;
         if (std::ranges::find(recentLedgers_, hash) != recentLedgers_.end())
             return true;
@@ -617,7 +617,7 @@ bool
 PeerImp::hasRange(std::uint32_t uMin, std::uint32_t uMax)
 {
     std::scoped_lock const sl(recentLock_);
-    return (tracking_ != Tracking::diverged) && (uMin >= minLedger_) && (uMax <= maxLedger_);
+    return (tracking_ != Tracking::Diverged) && (uMin >= minLedger_) && (uMax <= maxLedger_);
 }
 
 //------------------------------------------------------------------------------
@@ -651,7 +651,7 @@ PeerImp::fail(std::string const& reason)
         return;
 
     // Call to name() locks, log only if the message will be outputted
-    if (journal_.active(beast::severities::kWarning))
+    if (journal_.active(beast::severities::KWarning))
     {
         std::string const n = name();
         JLOG(journal_.warn()) << n << " failed: " << reason;
@@ -675,7 +675,7 @@ PeerImp::tryAsyncShutdown()
 
     shutdownStarted_ = true;
 
-    setTimer(shutdownTimerInterval);
+    setTimer(kSHUTDOWN_TIMER_INTERVAL);
 
     // gracefully shutdown the SSL socket, performing a shutdown handshake
     stream_.async_shutdown(bind_executor(
@@ -802,13 +802,13 @@ PeerImp::onTimer(error_code const& ec)
         return;
     }
 
-    if (large_sendq_++ >= Tuning::sendqIntervals)
+    if (largeSendq_++ >= Tuning::SendqIntervals)
     {
         fail("Large send queue");
         return;
     }
 
-    if (auto const t = tracking_.load(); !inbound_ && t != Tracking::converged)
+    if (auto const t = tracking_.load(); !inbound_ && t != Tracking::Converged)
     {
         clock_type::duration duration;
 
@@ -817,10 +817,10 @@ PeerImp::onTimer(error_code const& ec)
             duration = clock_type::now() - trackingTime_;
         }
 
-        if ((t == Tracking::diverged && (duration > app_.config().MAX_DIVERGED_TIME)) ||
-            (t == Tracking::unknown && (duration > app_.config().MAX_UNKNOWN_TIME)))
+        if ((t == Tracking::Diverged && (duration > app_.config().MAX_DIVERGED_TIME)) ||
+            (t == Tracking::Unknown && (duration > app_.config().MAX_UNKNOWN_TIME)))
         {
-            overlay_.peerFinder().on_failure(slot_);
+            overlay_.peerFinder().onFailure(slot_);
             fail("Not useful");
             return;
         }
@@ -834,7 +834,7 @@ PeerImp::onTimer(error_code const& ec)
     }
 
     lastPingTime_ = clock_type::now();
-    lastPingSeq_ = rand_int<std::uint32_t>();
+    lastPingSeq_ = randInt<std::uint32_t>();
 
     protocol::TMPing message;
     message.set_type(protocol::TMPing::ptPING);
@@ -842,7 +842,7 @@ PeerImp::onTimer(error_code const& ec)
 
     send(std::make_shared<Message>(message, protocol::mtPING));
 
-    setTimer(peerTimerInterval);
+    setTimer(kPEER_TIMER_INTERVAL);
 }
 
 void
@@ -862,7 +862,7 @@ PeerImp::cancelTimer() noexcept
 void
 PeerImp::doAccept()
 {
-    XRPL_ASSERT(read_buffer_.size() == 0, "xrpl::PeerImp::doAccept : empty read buffer");
+    XRPL_ASSERT(readBuffer_.size() == 0, "xrpl::PeerImp::doAccept : empty read buffer");
 
     JLOG(journal_.debug()) << "doAccept";
 
@@ -873,7 +873,7 @@ PeerImp::doAccept()
         return;
     }
 
-    auto const sharedValue = makeSharedValue(*stream_ptr_, journal_);
+    auto const sharedValue = makeSharedValue(*streamPtr_, journal_);
 
     // This shouldn't fail since we already computed
     // the shared value successfully in OverlayImpl
@@ -900,13 +900,13 @@ PeerImp::doAccept()
     // XXX Set timer: connection idle (idle may vary depending on connection
     // type.)
 
-    auto write_buffer = std::make_shared<boost::beast::multi_buffer>();
+    auto writeBuffer = std::make_shared<boost::beast::multi_buffer>();
 
-    boost::beast::ostream(*write_buffer) << makeResponse(
+    boost::beast::ostream(*writeBuffer) << makeResponse(
         !overlay_.peerFinder().config().peerPrivate,
         request_,
-        overlay_.setup().public_ip,
-        remote_address_.address(),
+        overlay_.setup().publicIp,
+        remoteAddress_.address(),
         *sharedValue,
         overlay_.setup().networkID,
         protocol_,
@@ -915,12 +915,12 @@ PeerImp::doAccept()
     // Write the whole buffer and only start protocol when that's done.
     boost::asio::async_write(
         stream_,
-        write_buffer->data(),
+        writeBuffer->data(),
         boost::asio::transfer_all(),
         bind_executor(
             strand_,
-            [this, write_buffer, self = shared_from_this()](
-                error_code ec, std::size_t bytes_transferred) {
+            [this, writeBuffer, self = shared_from_this()](
+                error_code ec, std::size_t bytesTransferred) {
                 if (!socket_.is_open())
                     return;
                 if (ec == boost::asio::error::operation_aborted)
@@ -933,7 +933,7 @@ PeerImp::doAccept()
                     fail("onWriteResponse", ec);
                     return;
                 }
-                if (write_buffer->size() == bytes_transferred)
+                if (writeBuffer->size() == bytesTransferred)
                 {
                     doProtocolStart();
                     return;
@@ -946,7 +946,7 @@ PeerImp::doAccept()
 std::string
 PeerImp::name() const
 {
-    std::shared_lock const read_lock{nameMutex_};
+    std::shared_lock const readLock{nameMutex_};
     return name_;
 }
 
@@ -975,7 +975,7 @@ PeerImp::doProtocolStart()
     // Send all the validator lists that have been loaded
     if (inbound_ && supportsFeature(ProtocolFeature::ValidatorListPropagation))
     {
-        app_.getValidators().for_each_available(
+        app_.getValidators().forEachAvailable(
             [&](std::string const& manifest,
                 std::uint32_t version,
                 std::map<std::size_t, ValidatorBlobInfo> const& blobInfos,
@@ -991,7 +991,7 @@ PeerImp::doProtocolStart()
                     manifest,
                     blobInfos,
                     app_.getHashRouter(),
-                    p_journal_);
+                    pJournal_);
 
                 // Don't send it next time.
                 app_.getHashRouter().addSuppressionPeer(hash, id_);
@@ -1001,12 +1001,12 @@ PeerImp::doProtocolStart()
     if (auto m = overlay_.getManifestsMessage())
         send(m);
 
-    setTimer(peerTimerInterval);
+    setTimer(kPEER_TIMER_INTERVAL);
 }
 
 // Called repeatedly with protocol message data
 void
-PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
+PeerImp::onReadMessage(error_code ec, std::size_t bytesTransferred)
 {
     XRPL_ASSERT(
         strand_.running_in_this_thread(), "xrpl::PeerImp::onReadMessage : strand in this thread");
@@ -1044,22 +1044,22 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
     if (auto stream = journal_.trace())
     {
         stream << "onReadMessage: "
-               << (bytes_transferred > 0 ? to_string(bytes_transferred) + " bytes" : "");
+               << (bytesTransferred > 0 ? to_string(bytesTransferred) + " bytes" : "");
     }
 
-    metrics_.recv.add_message(bytes_transferred);
+    metrics_.recv.addMessage(bytesTransferred);
 
-    read_buffer_.commit(bytes_transferred);
+    readBuffer_.commit(bytesTransferred);
 
-    auto hint = Tuning::readBufferBytes;
+    auto hint = Tuning::kREAD_BUFFER_BYTES;
 
-    while (read_buffer_.size() > 0)
+    while (readBuffer_.size() > 0)
     {
-        std::size_t bytes_consumed = 0;
+        std::size_t bytesConsumed = 0;
 
         using namespace std::chrono_literals;
-        std::tie(bytes_consumed, ec) = perf::measureDurationAndLog(
-            [&]() { return invokeProtocolMessage(read_buffer_.data(), *this, hint); },
+        std::tie(bytesConsumed, ec) = perf::measureDurationAndLog(
+            [&]() { return invokeProtocolMessage(readBuffer_.data(), *this, hint); },
             "invokeProtocolMessage",
             350ms,
             journal_);
@@ -1075,10 +1075,10 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
             return;
         }
 
-        if (bytes_consumed == 0)
+        if (bytesConsumed == 0)
             break;
 
-        read_buffer_.consume(bytes_consumed);
+        readBuffer_.consume(bytesConsumed);
     }
 
     // check if a shutdown was initiated while processing messages
@@ -1094,7 +1094,7 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
 
     // Timeout on writes only
     stream_.async_read_some(
-        read_buffer_.prepare(std::max(Tuning::readBufferBytes, hint)),
+        readBuffer_.prepare(std::max(Tuning::kREAD_BUFFER_BYTES, hint)),
         bind_executor(
             strand_,
             std::bind(
@@ -1105,7 +1105,7 @@ PeerImp::onReadMessage(error_code ec, std::size_t bytes_transferred)
 }
 
 void
-PeerImp::onWriteMessage(error_code ec, std::size_t bytes_transferred)
+PeerImp::onWriteMessage(error_code ec, std::size_t bytesTransferred)
 {
     XRPL_ASSERT(
         strand_.running_in_this_thread(), "xrpl::PeerImp::onWriteMessage : strand in this thread");
@@ -1130,13 +1130,13 @@ PeerImp::onWriteMessage(error_code ec, std::size_t bytes_transferred)
     if (auto stream = journal_.trace())
     {
         stream << "onWriteMessage: "
-               << (bytes_transferred > 0 ? to_string(bytes_transferred) + " bytes" : "");
+               << (bytesTransferred > 0 ? to_string(bytesTransferred) + " bytes" : "");
     }
 
-    metrics_.sent.add_message(bytes_transferred);
+    metrics_.sent.addMessage(bytesTransferred);
 
-    XRPL_ASSERT(!send_queue_.empty(), "xrpl::PeerImp::onWriteMessage : non-empty send buffer");
-    send_queue_.pop();
+    XRPL_ASSERT(!sendQueue_.empty(), "xrpl::PeerImp::onWriteMessage : non-empty send buffer");
+    sendQueue_.pop();
 
     if (shutdown_)
     {
@@ -1144,7 +1144,7 @@ PeerImp::onWriteMessage(error_code ec, std::size_t bytes_transferred)
         return;
     }
 
-    if (!send_queue_.empty())
+    if (!sendQueue_.empty())
     {
         writePending_ = true;
         XRPL_ASSERT(!shutdownStarted_, "xrpl::PeerImp::onWriteMessage : shutdown started");
@@ -1152,7 +1152,7 @@ PeerImp::onWriteMessage(error_code ec, std::size_t bytes_transferred)
         // Timeout on writes only
         boost::asio::async_write(
             stream_,
-            boost::asio::buffer(send_queue_.front()->getBuffer(compressionEnabled_)),
+            boost::asio::buffer(sendQueue_.front()->getBuffer(compressionEnabled_)),
             bind_executor(
                 strand_,
                 std::bind(
@@ -1181,18 +1181,18 @@ PeerImp::onMessageBegin(
     std::uint16_t type,
     std::shared_ptr<::google::protobuf::Message> const& m,
     std::size_t size,
-    std::size_t uncompressed_size,
+    std::size_t uncompressedSize,
     bool isCompressed)
 {
     auto const name = protocolMessageName(type);
-    load_event_ = app_.getJobQueue().makeLoadEvent(jtPEER, name);
-    fee_ = {.fee = Resource::feeTrivialPeer, .context = name};
+    loadEvent_ = app_.getJobQueue().makeLoadEvent(JtPeer, name);
+    fee_ = {.fee = Resource::kFEE_TRIVIAL_PEER, .context = name};
 
     auto const category =
         TrafficCount::categorize(*m, static_cast<protocol::MessageType>(type), true);
 
     // report total incoming traffic
-    overlay_.reportInboundTraffic(TrafficCount::category::total, static_cast<int>(size));
+    overlay_.reportInboundTraffic(TrafficCount::Category::Total, static_cast<int>(size));
 
     // increase the traffic received for a specific category
     overlay_.reportInboundTraffic(category, static_cast<int>(size));
@@ -1201,25 +1201,25 @@ PeerImp::onMessageBegin(
     if ((type == MessageType::mtTRANSACTION || type == MessageType::mtHAVE_TRANSACTIONS ||
          type == MessageType::mtTRANSACTIONS ||
          // GET_OBJECTS
-         category == TrafficCount::category::get_transactions ||
+         category == TrafficCount::Category::GetTransactions ||
          // GET_LEDGER
-         category == TrafficCount::category::ld_tsc_get ||
-         category == TrafficCount::category::ld_tsc_share ||
+         category == TrafficCount::Category::LdTscGet ||
+         category == TrafficCount::Category::LdTscShare ||
          // LEDGER_DATA
-         category == TrafficCount::category::gl_tsc_share ||
-         category == TrafficCount::category::gl_tsc_get) &&
+         category == TrafficCount::Category::GlTscShare ||
+         category == TrafficCount::Category::GlTscGet) &&
         (txReduceRelayEnabled() || app_.config().TX_REDUCE_RELAY_METRICS))
     {
         overlay_.addTxMetrics(static_cast<MessageType>(type), static_cast<std::uint64_t>(size));
     }
-    JLOG(journal_.trace()) << "onMessageBegin: " << type << " " << size << " " << uncompressed_size
+    JLOG(journal_.trace()) << "onMessageBegin: " << type << " " << size << " " << uncompressedSize
                            << " " << isCompressed;
 }
 
 void
 PeerImp::onMessageEnd(std::uint16_t, std::shared_ptr<::google::protobuf::Message> const&)
 {
-    load_event_.reset();
+    loadEvent_.reset();
     charge(fee_.fee, fee_.context);
 }
 
@@ -1230,14 +1230,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMManifests> const& m)
 
     if (s == 0)
     {
-        fee_.update(Resource::feeUselessData, "empty");
+        fee_.update(Resource::kFEE_USELESS_DATA, "empty");
         return;
     }
 
     if (s > 100)
-        fee_.update(Resource::feeModerateBurdenPeer, "oversize");
+        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "oversize");
 
-    app_.getJobQueue().addJob(jtMANIFEST, "RcvManifests", [this, that = shared_from_this(), m]() {
+    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::feeModerateBurdenPeer, "ping request");
+        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "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::feeUselessData, "unknown cluster");
+        fee_.update(Resource::kFEE_USELESS_DATA, "unknown cluster");
         return;
     }
 
@@ -1322,7 +1322,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMCluster> const& m)
         {
             protocol::TMLoadSource const& node = m->loadsources(i);
             Resource::Gossip::Item item;
-            item.address = beast::IP::Endpoint::from_string(node.name());
+            item.address = beast::IP::Endpoint::fromString(node.name());
             item.balance = node.cost();
             if (item.address != beast::IP::Endpoint())
                 gossip.items.push_back(item);
@@ -1337,7 +1337,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMCluster> const& m)
     std::vector<std::uint32_t> fees;
     fees.reserve(app_.getCluster().size());
 
-    app_.getCluster().for_each([&fees, thresh](ClusterNode const& status) {
+    app_.getCluster().forEach([&fees, thresh](ClusterNode const& status) {
         if (status.getReportTime() >= thresh)
             fees.push_back(status.getLoadFee());
     });
@@ -1357,14 +1357,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
 {
     // Don't allow endpoints from peers that are not known tracking or are
     // not using a version of the message that we support:
-    if (tracking_.load() != Tracking::converged || m->version() != 2)
+    if (tracking_.load() != Tracking::Converged || m->version() != 2)
         return;
 
     // The number is arbitrary and doesn't have any real significance or
     // implication for the protocol.
     if (m->endpoints_v2().size() >= 1024)
     {
-        fee_.update(Resource::feeUselessData, "endpoints too large");
+        fee_.update(Resource::kFEE_USELESS_DATA, "endpoints too large");
         return;
     }
 
@@ -1374,11 +1374,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
     auto malformed = 0;
     for (auto const& tm : m->endpoints_v2())
     {
-        auto result = beast::IP::Endpoint::from_string_checked(tm.endpoint());
+        auto result = beast::IP::Endpoint::fromStringChecked(tm.endpoint());
 
         if (!result)
         {
-            JLOG(p_journal_.error())
+            JLOG(pJournal_.error())
                 << "failed to parse incoming endpoint: {" << tm.endpoint() << "}";
             malformed++;
             continue;
@@ -1391,7 +1391,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
         // by performing a connectivity test.  if hops > 0, then we just
         // take the address/port we were given
         if (tm.hops() == 0)
-            result = remote_address_.at_port(result->port());
+            result = remoteAddress_.atPort(result->port());
 
         endpoints.emplace_back(*result, tm.hops());
     }
@@ -1401,12 +1401,12 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMEndpoints> const& m)
     if (malformed > 0)
     {
         fee_.update(
-            Resource::feeInvalidData * malformed,
+            Resource::kFEE_INVALID_DATA * malformed,
             std::to_string(malformed) + " malformed endpoints");
     }
 
     if (!endpoints.empty())
-        overlay_.peerFinder().on_endpoints(slot_, endpoints);
+        overlay_.peerFinder().onEndpoints(slot_, endpoints);
 }
 
 void
@@ -1422,14 +1422,14 @@ PeerImp::handleTransaction(
     bool batch)
 {
     XRPL_ASSERT(eraseTxQueue != batch, ("xrpl::PeerImp::handleTransaction : valid inputs"));
-    if (tracking_.load() == Tracking::diverged)
+    if (tracking_.load() == Tracking::Diverged)
         return;
 
     if (app_.getOPs().isNeedNetworkLedger())
     {
         // If we've never been in synch, there's nothing we can do
         // with a transaction
-        JLOG(p_journal_.debug()) << "Ignoring incoming transaction: Need network ledger";
+        JLOG(pJournal_.debug()) << "Ignoring incoming transaction: Need network ledger";
         return;
     }
 
@@ -1460,23 +1460,23 @@ PeerImp::handleTransaction(
         */
         if (stx->isFlag(tfInnerBatchTxn))
         {
-            JLOG(p_journal_.warn()) << "Ignoring Network relayed Tx containing "
-                                       "tfInnerBatchTxn (handleTransaction).";
-            fee_.update(Resource::feeModerateBurdenPeer, "inner batch txn");
+            JLOG(pJournal_.warn()) << "Ignoring Network relayed Tx containing "
+                                      "tfInnerBatchTxn (handleTransaction).";
+            fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "inner batch txn");
             return;
         }
         // LCOV_EXCL_STOP
 
         HashRouterFlags flags = HashRouterFlags::UNDEFINED;
-        constexpr std::chrono::seconds tx_interval = 10s;
+        constexpr std::chrono::seconds kTX_INTERVAL = 10s;
 
-        if (!app_.getHashRouter().shouldProcess(txID, id_, flags, tx_interval))
+        if (!app_.getHashRouter().shouldProcess(txID, id_, flags, kTX_INTERVAL))
         {
             // we have seen this transaction recently
             if (any(flags & HashRouterFlags::BAD))
             {
-                fee_.update(Resource::feeUselessData, "known bad");
-                JLOG(p_journal_.debug()) << "Ignoring known bad tx " << txID;
+                fee_.update(Resource::kFEE_USELESS_DATA, "known bad");
+                JLOG(pJournal_.debug()) << "Ignoring known bad tx " << txID;
             }
 
             // Erase only if the server has seen this tx. If the server has not
@@ -1487,12 +1487,12 @@ PeerImp::handleTransaction(
             }
 
             overlay_.reportInboundTraffic(
-                TrafficCount::category::transaction_duplicate, Message::messageSize(*m));
+                TrafficCount::Category::TransactionDuplicate, Message::messageSize(*m));
 
             return;
         }
 
-        JLOG(p_journal_.debug()) << "Got tx " << txID;
+        JLOG(pJournal_.debug()) << "Got tx " << txID;
 
         bool checkSignature = true;
         if (cluster())
@@ -1516,17 +1516,17 @@ PeerImp::handleTransaction(
 
         if (app_.getLedgerMaster().getValidatedLedgerAge() > 4min)
         {
-            JLOG(p_journal_.trace()) << "No new transactions until synchronized";
+            JLOG(pJournal_.trace()) << "No new transactions until synchronized";
         }
-        else if (app_.getJobQueue().getJobCount(jtTRANSACTION) > app_.config().MAX_TRANSACTIONS)
+        else if (app_.getJobQueue().getJobCount(JtTransaction) > app_.config().MAX_TRANSACTIONS)
         {
             overlay_.incJqTransOverflow();
-            JLOG(p_journal_.info()) << "Transaction queue is full";
+            JLOG(pJournal_.info()) << "Transaction queue is full";
         }
         else
         {
             app_.getJobQueue().addJob(
-                jtTRANSACTION,
+                JtTransaction,
                 "RcvCheckTx",
                 [weak = std::weak_ptr<PeerImp>(shared_from_this()),
                  flags,
@@ -1540,8 +1540,8 @@ PeerImp::handleTransaction(
     }
     catch (std::exception const& ex)
     {
-        JLOG(p_journal_.warn()) << "Transaction invalid: " << strHex(m->rawtransaction())
-                                << ". Exception: " << ex.what();
+        JLOG(pJournal_.warn()) << "Transaction invalid: " << strHex(m->rawtransaction())
+                               << ". Exception: " << ex.what();
     }
 }
 
@@ -1549,8 +1549,8 @@ void
 PeerImp::onMessage(std::shared_ptr<protocol::TMGetLedger> const& m)
 {
     auto badData = [&](std::string const& msg) {
-        fee_.update(Resource::feeInvalidData, "get_ledger " + msg);
-        JLOG(p_journal_.warn()) << "TMGetLedger: " << msg;
+        fee_.update(Resource::kFEE_INVALID_DATA, "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::maxQueryDepth || itype == protocol::liBASE)
+        if (m->querydepth() > Tuning::MaxQueryDepth || itype == protocol::liBASE)
         {
             badData("Invalid query depth");
             return;
@@ -1649,7 +1649,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetLedger> const& m)
 
     // Queue a job to process the request
     std::weak_ptr<PeerImp> const weak = shared_from_this();
-    app_.getJobQueue().addJob(jtLEDGER_REQ, "RcvGetLedger", [weak, m]() {
+    app_.getJobQueue().addJob(JtLedgerReq, "RcvGetLedger", [weak, m]() {
         if (auto peer = weak.lock())
             peer->processLedgerRequest(m);
     });
@@ -1658,16 +1658,16 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetLedger> const& m)
 void
 PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathRequest> const& m)
 {
-    JLOG(p_journal_.trace()) << "onMessage, TMProofPathRequest";
+    JLOG(pJournal_.trace()) << "onMessage, TMProofPathRequest";
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::feeMalformedRequest, "proof_path_request disabled");
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "proof_path_request disabled");
         return;
     }
 
-    fee_.update(Resource::feeModerateBurdenPeer, "received a proof path request");
+    fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, "received a proof path request");
     std::weak_ptr<PeerImp> const weak = shared_from_this();
-    app_.getJobQueue().addJob(jtREPLAY_REQ, "RcvProofPReq", [weak, m]() {
+    app_.getJobQueue().addJob(JtReplayReq, "RcvProofPReq", [weak, m]() {
         if (auto peer = weak.lock())
         {
             auto reply = peer->ledgerReplayMsgHandler_.processProofPathRequest(m);
@@ -1675,11 +1675,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathRequest> const& m)
             {
                 if (reply.error() == protocol::TMReplyError::reBAD_REQUEST)
                 {
-                    peer->charge(Resource::feeMalformedRequest, "proof_path_request");
+                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "proof_path_request");
                 }
                 else
                 {
-                    peer->charge(Resource::feeRequestNoReply, "proof_path_request");
+                    peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "proof_path_request");
                 }
             }
             else
@@ -1695,29 +1695,29 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProofPathResponse> const& m)
 {
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::feeMalformedRequest, "proof_path_response disabled");
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "proof_path_response disabled");
         return;
     }
 
     if (!ledgerReplayMsgHandler_.processProofPathResponse(m))
     {
-        fee_.update(Resource::feeInvalidData, "proof_path_response");
+        fee_.update(Resource::kFEE_INVALID_DATA, "proof_path_response");
     }
 }
 
 void
 PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaRequest> const& m)
 {
-    JLOG(p_journal_.trace()) << "onMessage, TMReplayDeltaRequest";
+    JLOG(pJournal_.trace()) << "onMessage, TMReplayDeltaRequest";
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::feeMalformedRequest, "replay_delta_request disabled");
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_request disabled");
         return;
     }
 
-    fee_.fee = Resource::feeModerateBurdenPeer;
+    fee_.fee = Resource::kFEE_MODERATE_BURDEN_PEER;
     std::weak_ptr<PeerImp> const weak = shared_from_this();
-    app_.getJobQueue().addJob(jtREPLAY_REQ, "RcvReplDReq", [weak, m]() {
+    app_.getJobQueue().addJob(JtReplayReq, "RcvReplDReq", [weak, m]() {
         if (auto peer = weak.lock())
         {
             auto reply = peer->ledgerReplayMsgHandler_.processReplayDeltaRequest(m);
@@ -1725,11 +1725,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaRequest> const& m)
             {
                 if (reply.error() == protocol::TMReplyError::reBAD_REQUEST)
                 {
-                    peer->charge(Resource::feeMalformedRequest, "replay_delta_request");
+                    peer->charge(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_request");
                 }
                 else
                 {
-                    peer->charge(Resource::feeRequestNoReply, "replay_delta_request");
+                    peer->charge(Resource::kFEE_REQUEST_NO_REPLY, "replay_delta_request");
                 }
             }
             else
@@ -1745,13 +1745,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMReplayDeltaResponse> const& m)
 {
     if (!ledgerReplayEnabled_)
     {
-        fee_.update(Resource::feeMalformedRequest, "replay_delta_response disabled");
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "replay_delta_response disabled");
         return;
     }
 
     if (!ledgerReplayMsgHandler_.processReplayDeltaResponse(m))
     {
-        fee_.update(Resource::feeInvalidData, "replay_delta_response");
+        fee_.update(Resource::kFEE_INVALID_DATA, "replay_delta_response");
     }
 }
 
@@ -1759,8 +1759,8 @@ void
 PeerImp::onMessage(std::shared_ptr<protocol::TMLedgerData> const& m)
 {
     auto badData = [&](std::string const& msg) {
-        fee_.update(Resource::feeInvalidData, msg);
-        JLOG(p_journal_.warn()) << "TMLedgerData: " << msg;
+        fee_.update(Resource::kFEE_INVALID_DATA, msg);
+        JLOG(pJournal_.warn()) << "TMLedgerData: " << msg;
     };
 
     // Verify ledger hash
@@ -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::hardMaxReplyNodes)
+    if (m->nodes_size() <= 0 || m->nodes_size() > Tuning::HardMaxReplyNodes)
     {
         badData("Invalid Ledger/TXset nodes " + std::to_string(m->nodes_size()));
         return;
@@ -1826,7 +1826,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMLedgerData> const& m)
         }
         else
         {
-            JLOG(p_journal_.info()) << "Unable to route TX/ledger data reply";
+            JLOG(pJournal_.info()) << "Unable to route TX/ledger data reply";
         }
         return;
     }
@@ -1837,7 +1837,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMLedgerData> const& m)
     if (m->type() == protocol::liTS_CANDIDATE)
     {
         std::weak_ptr<PeerImp> const weak{shared_from_this()};
-        app_.getJobQueue().addJob(jtTXN_DATA, "RcvPeerData", [weak, ledgerHash, m]() {
+        app_.getJobQueue().addJob(JtTxnData, "RcvPeerData", [weak, ledgerHash, m]() {
             if (auto peer = weak.lock())
             {
                 peer->app_.getInboundTransactions().gotData(ledgerHash, peer, m);
@@ -1860,17 +1860,17 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
     // Preliminary check for the validity of the signature: A DER encoded
     // signature can't be longer than 72 bytes.
     if ((std::clamp<std::size_t>(sig.size(), 64, 72) != sig.size()) ||
-        (publicKeyType(makeSlice(set.nodepubkey())) != KeyType::secp256k1))
+        (publicKeyType(makeSlice(set.nodepubkey())) != KeyType::Secp256k1))
     {
-        JLOG(p_journal_.warn()) << "Proposal: malformed";
-        fee_.update(Resource::feeInvalidSignature, " signature can't be longer than 72 bytes");
+        JLOG(pJournal_.warn()) << "Proposal: malformed";
+        fee_.update(Resource::kFEE_INVALID_SIGNATURE, " signature can't be longer than 72 bytes");
         return;
     }
 
     if (!stringIsUint256Sized(set.currenttxhash()) || !stringIsUint256Sized(set.previousledger()))
     {
-        JLOG(p_journal_.warn()) << "Proposal: malformed";
-        fee_.update(Resource::feeMalformedRequest, "bad hashes");
+        JLOG(pJournal_.warn()) << "Proposal: malformed";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "bad hashes");
         return;
     }
 
@@ -1887,7 +1887,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
     {
         // report untrusted proposal messages
         overlay_.reportInboundTraffic(
-            TrafficCount::category::proposal_untrusted, Message::messageSize(*m));
+            TrafficCount::Category::ProposalUntrusted, Message::messageSize(*m));
 
         if (app_.config().RELAY_UNTRUSTED_PROPOSALS == -1)
             return;
@@ -1906,34 +1906,34 @@ 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::IDLED)
+        if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIDLED)
             overlay_.updateSlotAndSquelch(suppression, publicKey, id_, protocol::mtPROPOSE_LEDGER);
 
         // report duplicate proposal messages
         overlay_.reportInboundTraffic(
-            TrafficCount::category::proposal_duplicate, Message::messageSize(*m));
+            TrafficCount::Category::ProposalDuplicate, Message::messageSize(*m));
 
-        JLOG(p_journal_.trace()) << "Proposal: duplicate";
+        JLOG(pJournal_.trace()) << "Proposal: duplicate";
 
         return;
     }
 
     if (!isTrusted)
     {
-        if (tracking_.load() == Tracking::diverged)
+        if (tracking_.load() == Tracking::Diverged)
         {
-            JLOG(p_journal_.debug()) << "Proposal: Dropping untrusted (peer divergence)";
+            JLOG(pJournal_.debug()) << "Proposal: Dropping untrusted (peer divergence)";
             return;
         }
 
         if (!cluster() && app_.getFeeTrack().isLoadedLocal())
         {
-            JLOG(p_journal_.debug()) << "Proposal: Dropping untrusted (load)";
+            JLOG(pJournal_.debug()) << "Proposal: Dropping untrusted (load)";
             return;
         }
     }
 
-    JLOG(p_journal_.trace()) << "Proposal: " << (isTrusted ? "trusted" : "untrusted");
+    JLOG(pJournal_.trace()) << "Proposal: " << (isTrusted ? "trusted" : "untrusted");
 
     auto proposal = RCLCxPeerPos(
         publicKey,
@@ -1949,7 +1949,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
 
     std::weak_ptr<PeerImp> const weak = shared_from_this();
     app_.getJobQueue().addJob(
-        isTrusted ? jtPROPOSAL_t : jtPROPOSAL_ut, "checkPropose", [weak, isTrusted, m, proposal]() {
+        isTrusted ? JtProposalT : JtProposalUt, "checkPropose", [weak, isTrusted, m, proposal]() {
             if (auto peer = weak.lock())
                 peer->checkPropose(isTrusted, m, proposal);
         });
@@ -1958,22 +1958,22 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMProposeSet> const& m)
 void
 PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
 {
-    JLOG(p_journal_.trace()) << "Status: Change";
+    JLOG(pJournal_.trace()) << "Status: Change";
 
     if (!m->has_networktime())
         m->set_networktime(app_.getTimeKeeper().now().time_since_epoch().count());
 
     {
         std::scoped_lock const sl(recentLock_);
-        if (!last_status_.has_newstatus() || m->has_newstatus())
+        if (!lastStatus_.has_newstatus() || m->has_newstatus())
         {
-            last_status_ = *m;
+            lastStatus_ = *m;
         }
         else
         {
             // preserve old status
-            protocol::NodeStatus const status = last_status_.newstatus();
-            last_status_ = *m;
+            protocol::NodeStatus const status = lastStatus_.newstatus();
+            lastStatus_ = *m;
             m->set_newstatus(status);
         }
     }
@@ -1994,7 +1994,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         }
         if (outOfSync)
         {
-            JLOG(p_journal_.debug()) << "Status: Out of sync";
+            JLOG(pJournal_.debug()) << "Status: Out of sync";
         }
         return;
     }
@@ -2030,11 +2030,11 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         }
         if (peerChangedLedgers)
         {
-            JLOG(p_journal_.debug()) << "LCL is " << closedLedgerHash;
+            JLOG(pJournal_.debug()) << "LCL is " << closedLedgerHash;
         }
         else
         {
-            JLOG(p_journal_.debug()) << "Status: No ledger";
+            JLOG(pJournal_.debug()) << "Status: No ledger";
         }
     }
 
@@ -2054,8 +2054,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
         checkTracking(m->ledgerseq(), app_.getLedgerMaster().getValidLedgerIndex());
     }
 
-    app_.getOPs().pubPeerStatus([m, this]() -> Json::Value {
-        Json::Value j = Json::objectValue;
+    app_.getOPs().pubPeerStatus([m, this]() -> json::Value {
+        json::Value j = json::ObjectValue;
 
         if (m->has_newstatus())
         {
@@ -2115,13 +2115,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMStatusChange> const& m)
 
         if (m->has_networktime())
         {
-            j[jss::date] = Json::UInt(m->networktime());
+            j[jss::date] = json::UInt(m->networktime());
         }
 
         if (m->has_firstseq() && m->has_lastseq())
         {
-            j[jss::ledger_index_min] = Json::UInt(m->firstseq());
-            j[jss::ledger_index_max] = Json::UInt(m->lastseq());
+            j[jss::ledger_index_min] = json::UInt(m->firstseq());
+            j[jss::ledger_index_max] = json::UInt(m->lastseq());
         }
 
         return j;
@@ -2152,18 +2152,18 @@ PeerImp::checkTracking(std::uint32_t seq1, std::uint32_t seq2)
 {
     int const diff = std::max(seq1, seq2) - std::min(seq1, seq2);
 
-    if (diff < Tuning::convergedLedgerLimit)
+    if (diff < Tuning::ConvergedLedgerLimit)
     {
         // The peer's ledger sequence is close to the validation's
-        tracking_ = Tracking::converged;
+        tracking_ = Tracking::Converged;
     }
 
-    if ((diff > Tuning::divergedLedgerLimit) && (tracking_.load() != Tracking::diverged))
+    if ((diff > Tuning::DivergedLedgerLimit) && (tracking_.load() != Tracking::Diverged))
     {
         // The peer's ledger sequence is way off the validation's
         std::scoped_lock const sl(recentLock_);
 
-        tracking_ = Tracking::diverged;
+        tracking_ = Tracking::Diverged;
         trackingTime_ = clock_type::now();
     }
 }
@@ -2173,7 +2173,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactionSet> const& m)
 {
     if (!stringIsUint256Sized(m->hash()))
     {
-        fee_.update(Resource::feeMalformedRequest, "bad hash");
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "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::feeUselessData, "duplicate (tsHAVE)");
+            fee_.update(Resource::kFEE_USELESS_DATA, "duplicate (tsHAVE)");
             return;
         }
 
@@ -2204,23 +2204,23 @@ PeerImp::onValidatorListMessage(
     // ValidatorList class rules), so charge accordingly and skip processing.
     if (blobs.empty())
     {
-        JLOG(p_journal_.warn()) << "Ignored malformed " << messageType;
+        JLOG(pJournal_.warn()) << "Ignored malformed " << messageType;
         // This shouldn't ever happen with a well-behaved peer
-        fee_.update(Resource::feeHeavyBurdenPeer, "no blobs");
+        fee_.update(Resource::kFEE_HEAVY_BURDEN_PEER, "no blobs");
         return;
     }
 
     auto const hash = sha512Half(manifest, blobs, version);
 
-    JLOG(p_journal_.debug()) << "Received " << messageType;
+    JLOG(pJournal_.debug()) << "Received " << messageType;
 
     if (!app_.getHashRouter().addSuppressionPeer(hash, id_))
     {
-        JLOG(p_journal_.debug()) << messageType << ": received duplicate " << messageType;
+        JLOG(pJournal_.debug()) << messageType << ": received duplicate " << messageType;
         // 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::feeUselessData, "duplicate");
+        fee_.update(Resource::kFEE_USELESS_DATA, "duplicate");
         return;
     }
 
@@ -2228,27 +2228,27 @@ PeerImp::onValidatorListMessage(
         manifest,
         version,
         blobs,
-        remote_address_.to_string(),
+        remoteAddress_.toString(),
         hash,
         app_.getOverlay(),
         app_.getHashRouter(),
         app_.getOPs());
 
-    JLOG(p_journal_.debug()) << "Processed " << messageType << " version " << version << " from "
-                             << (applyResult.publisherKey ? strHex(*applyResult.publisherKey)
-                                                          : "unknown or invalid publisher")
-                             << " with best result " << to_string(applyResult.bestDisposition());
+    JLOG(pJournal_.debug()) << "Processed " << messageType << " version " << version << " from "
+                            << (applyResult.publisherKey ? strHex(*applyResult.publisherKey)
+                                                         : "unknown or invalid publisher")
+                            << " with best result " << to_string(applyResult.bestDisposition());
 
     // Act based on the best result
     switch (applyResult.bestDisposition())
     {
         // New list
-        case ListDisposition::accepted:
+        case ListDisposition::Accepted:
         // Newest list is expired, and that needs to be broadcast, too
-        case ListDisposition::expired:
+        case ListDisposition::Expired:
         // Future list
-        case ListDisposition::pending: {
-            std::scoped_lock const sl(recentLock_);
+        case ListDisposition::Pending: {
+            std::scoped_lock<std::mutex> const sl(recentLock_);
 
             XRPL_ASSERT(
                 applyResult.publisherKey,
@@ -2268,8 +2268,8 @@ PeerImp::onValidatorListMessage(
             publisherListSequences_[pubKey] = applyResult.sequence;
         }
         break;
-        case ListDisposition::same_sequence:
-        case ListDisposition::known_sequence:
+        case ListDisposition::SameSequence:
+        case ListDisposition::KnownSequence:
 #ifndef NDEBUG
         {
             std::scoped_lock<std::mutex> const sl(recentLock_);
@@ -2284,10 +2284,10 @@ PeerImp::onValidatorListMessage(
 #endif  // !NDEBUG
 
         break;
-        case ListDisposition::stale:
-        case ListDisposition::untrusted:
-        case ListDisposition::invalid:
-        case ListDisposition::unsupported_version:
+        case ListDisposition::Stale:
+        case ListDisposition::Untrusted:
+        case ListDisposition::Invalid:
+        case ListDisposition::UnsupportedVersion:
             break;
         // LCOV_EXCL_START
         default:
@@ -2300,37 +2300,38 @@ PeerImp::onValidatorListMessage(
     // Charge based on the worst result
     switch (applyResult.worstDisposition())
     {
-        case ListDisposition::accepted:
-        case ListDisposition::expired:
-        case ListDisposition::pending:
+        case ListDisposition::Accepted:
+        case ListDisposition::Expired:
+        case ListDisposition::Pending:
             // No charges for good data
             break;
-        case ListDisposition::same_sequence:
-        case ListDisposition::known_sequence:
+        case ListDisposition::SameSequence:
+        case ListDisposition::KnownSequence:
             // 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::feeUselessData, " duplicate (same_sequence or known_sequence)");
+            fee_.update(
+                Resource::kFEE_USELESS_DATA, " duplicate (same_sequence or known_sequence)");
             break;
-        case ListDisposition::stale:
+        case ListDisposition::Stale:
             // There are very few good reasons for a peer to send an
             // old list, particularly more than once.
-            fee_.update(Resource::feeInvalidData, "expired");
+            fee_.update(Resource::kFEE_INVALID_DATA, "expired");
             break;
-        case ListDisposition::untrusted:
+        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::feeUselessData, "untrusted");
+            fee_.update(Resource::kFEE_USELESS_DATA, "untrusted");
             break;
-        case ListDisposition::invalid:
+        case ListDisposition::Invalid:
             // This shouldn't ever happen with a well-behaved peer
-            fee_.update(Resource::feeInvalidSignature, "invalid list disposition");
+            fee_.update(Resource::kFEE_INVALID_SIGNATURE, "invalid list disposition");
             break;
-        case ListDisposition::unsupported_version:
+        case ListDisposition::UnsupportedVersion:
             // During a version transition, this may be legitimate.
             // If it happens frequently, that's probably bad.
-            fee_.update(Resource::feeInvalidData, "version");
+            fee_.update(Resource::kFEE_INVALID_DATA, "version");
             break;
         // LCOV_EXCL_START
         default:
@@ -2346,37 +2347,37 @@ PeerImp::onValidatorListMessage(
         switch (disp)
         {
             // New list
-            case ListDisposition::accepted:
-                JLOG(p_journal_.debug()) << "Applied " << count << " new " << messageType;
+            case ListDisposition::Accepted:
+                JLOG(pJournal_.debug()) << "Applied " << count << " new " << messageType;
                 break;
             // Newest list is expired, and that needs to be broadcast, too
-            case ListDisposition::expired:
-                JLOG(p_journal_.debug()) << "Applied " << count << " expired " << messageType;
+            case ListDisposition::Expired:
+                JLOG(pJournal_.debug()) << "Applied " << count << " expired " << messageType;
                 break;
             // Future list
-            case ListDisposition::pending:
-                JLOG(p_journal_.debug()) << "Processed " << count << " future " << messageType;
+            case ListDisposition::Pending:
+                JLOG(pJournal_.debug()) << "Processed " << count << " future " << messageType;
                 break;
-            case ListDisposition::same_sequence:
-                JLOG(p_journal_.warn())
+            case ListDisposition::SameSequence:
+                JLOG(pJournal_.warn())
                     << "Ignored " << count << " " << messageType << "(s) with current sequence";
                 break;
-            case ListDisposition::known_sequence:
-                JLOG(p_journal_.warn())
+            case ListDisposition::KnownSequence:
+                JLOG(pJournal_.warn())
                     << "Ignored " << count << " " << messageType << "(s) with future sequence";
                 break;
-            case ListDisposition::stale:
-                JLOG(p_journal_.warn()) << "Ignored " << count << "stale " << messageType;
+            case ListDisposition::Stale:
+                JLOG(pJournal_.warn()) << "Ignored " << count << "stale " << messageType;
                 break;
-            case ListDisposition::untrusted:
-                JLOG(p_journal_.warn()) << "Ignored " << count << " untrusted " << messageType;
+            case ListDisposition::Untrusted:
+                JLOG(pJournal_.warn()) << "Ignored " << count << " untrusted " << messageType;
                 break;
-            case ListDisposition::unsupported_version:
-                JLOG(p_journal_.warn())
+            case ListDisposition::UnsupportedVersion:
+                JLOG(pJournal_.warn())
                     << "Ignored " << count << "unsupported version " << messageType;
                 break;
-            case ListDisposition::invalid:
-                JLOG(p_journal_.warn()) << "Ignored " << count << "invalid " << messageType;
+            case ListDisposition::Invalid:
+                JLOG(pJournal_.warn()) << "Ignored " << count << "invalid " << messageType;
                 break;
             // LCOV_EXCL_START
             default:
@@ -2395,10 +2396,10 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorList> const& m)
     {
         if (!supportsFeature(ProtocolFeature::ValidatorListPropagation))
         {
-            JLOG(p_journal_.debug()) << "ValidatorList: received validator list from peer using "
-                                     << "protocol version " << to_string(protocol_)
-                                     << " which shouldn't support this feature.";
-            fee_.update(Resource::feeUselessData, "unsupported peer");
+            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");
             return;
         }
         onValidatorListMessage(
@@ -2406,9 +2407,9 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorList> const& m)
     }
     catch (std::exception const& e)
     {
-        JLOG(p_journal_.warn()) << "ValidatorList: Exception, " << e.what();
+        JLOG(pJournal_.warn()) << "ValidatorList: Exception, " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::feeInvalidData, e.what());
+        fee_.update(Resource::kFEE_INVALID_DATA, e.what());
     }
 }
 
@@ -2419,20 +2420,19 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorListCollection> const& m
     {
         if (!supportsFeature(ProtocolFeature::ValidatorList2Propagation))
         {
-            JLOG(p_journal_.debug())
-                << "ValidatorListCollection: received validator list from peer "
-                << "using protocol version " << to_string(protocol_)
-                << " which shouldn't support this feature.";
-            fee_.update(Resource::feeUselessData, "unsupported peer");
+            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");
             return;
         }
         if (m->version() < 2)
         {
-            JLOG(p_journal_.debug())
+            JLOG(pJournal_.debug())
                 << "ValidatorListCollection: received invalid validator list "
                    "version "
                 << m->version() << " from peer using protocol version " << to_string(protocol_);
-            fee_.update(Resource::feeInvalidData, "wrong version");
+            fee_.update(Resource::kFEE_INVALID_DATA, "wrong version");
             return;
         }
         onValidatorListMessage(
@@ -2440,9 +2440,9 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidatorListCollection> const& m
     }
     catch (std::exception const& e)
     {
-        JLOG(p_journal_.warn()) << "ValidatorListCollection: Exception, " << e.what();
+        JLOG(pJournal_.warn()) << "ValidatorListCollection: Exception, " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::feeInvalidData, e.what());
+        fee_.update(Resource::kFEE_INVALID_DATA, e.what());
     }
 }
 
@@ -2451,8 +2451,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
 {
     if (m->validation().size() < 50)
     {
-        JLOG(p_journal_.warn()) << "Validation: Too small";
-        fee_.update(Resource::feeMalformedRequest, "too small");
+        JLOG(pJournal_.warn()) << "Validation: Too small";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "too small");
         return;
     }
 
@@ -2478,8 +2478,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
                 val->getSignTime(),
                 val->getSeenTime()))
         {
-            JLOG(p_journal_.trace()) << "Validation: Not current";
-            fee_.update(Resource::feeUselessData, "not current");
+            JLOG(pJournal_.trace()) << "Validation: Not current";
+            fee_.update(Resource::kFEE_USELESS_DATA, "not current");
             return;
         }
 
@@ -2495,7 +2495,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
         {
             // increase untrusted validations received
             overlay_.reportInboundTraffic(
-                TrafficCount::category::validation_untrusted, Message::messageSize(*m));
+                TrafficCount::Category::ValidationUntrusted, Message::messageSize(*m));
 
             if (app_.config().RELAY_UNTRUSTED_VALIDATIONS == -1)
                 return;
@@ -2510,7 +2510,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::IDLED)
+            if (relayed && (stopwatch().now() - *relayed) < reduce_relay::kIDLED)
             {
                 overlay_.updateSlotAndSquelch(
                     key, val->getSignerPublic(), id_, protocol::mtVALIDATION);
@@ -2518,15 +2518,15 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
 
             // increase duplicate validations received
             overlay_.reportInboundTraffic(
-                TrafficCount::category::validation_duplicate, Message::messageSize(*m));
+                TrafficCount::Category::ValidationDuplicate, Message::messageSize(*m));
 
-            JLOG(p_journal_.trace()) << "Validation: duplicate";
+            JLOG(pJournal_.trace()) << "Validation: duplicate";
             return;
         }
 
-        if (!isTrusted && (tracking_.load() == Tracking::diverged))
+        if (!isTrusted && (tracking_.load() == Tracking::Diverged))
         {
-            JLOG(p_journal_.debug()) << "Dropping untrusted validation from diverged peer";
+            JLOG(pJournal_.debug()) << "Dropping untrusted validation from diverged peer";
         }
         else if (isTrusted || !app_.getFeeTrack().isLoadedLocal())
         {
@@ -2534,21 +2534,21 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMValidation> const& m)
 
             std::weak_ptr<PeerImp> const weak = shared_from_this();
             app_.getJobQueue().addJob(
-                isTrusted ? jtVALIDATION_t : jtVALIDATION_ut, name, [weak, val, m, key]() {
+                isTrusted ? JtValidationT : JtValidationUt, name, [weak, val, m, key]() {
                     if (auto peer = weak.lock())
                         peer->checkValidation(val, key, m);
                 });
         }
         else
         {
-            JLOG(p_journal_.debug()) << "Dropping untrusted validation for load";
+            JLOG(pJournal_.debug()) << "Dropping untrusted validation for load";
         }
     }
     catch (std::exception const& e)
     {
-        JLOG(p_journal_.warn()) << "Exception processing validation: " << e.what();
+        JLOG(pJournal_.warn()) << "Exception processing validation: " << e.what();
         using namespace std::string_literals;
-        fee_.update(Resource::feeMalformedRequest, e.what());
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, e.what());
     }
 }
 
@@ -2557,15 +2557,15 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
 {
     protocol::TMGetObjectByHash const& packet = *m;
 
-    JLOG(p_journal_.trace()) << "received TMGetObjectByHash " << packet.type() << " "
-                             << packet.objects_size();
+    JLOG(pJournal_.trace()) << "received TMGetObjectByHash " << packet.type() << " "
+                            << packet.objects_size();
 
     if (packet.query())
     {
         // this is a query
-        if (send_queue_.size() >= Tuning::dropSendQueue)
+        if (sendQueue_.size() >= Tuning::DropSendQueue)
         {
-            JLOG(p_journal_.debug()) << "GetObject: Large send queue";
+            JLOG(pJournal_.debug()) << "GetObject: Large send queue";
             return;
         }
 
@@ -2579,13 +2579,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
         {
             if (!txReduceRelayEnabled())
             {
-                JLOG(p_journal_.error()) << "TMGetObjectByHash: tx reduce-relay is disabled";
-                fee_.update(Resource::feeMalformedRequest, "disabled");
+                JLOG(pJournal_.error()) << "TMGetObjectByHash: tx reduce-relay is disabled";
+                fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
                 return;
             }
 
             std::weak_ptr<PeerImp> const weak = shared_from_this();
-            app_.getJobQueue().addJob(jtREQUESTED_TXN, "DoTxs", [weak, m]() {
+            app_.getJobQueue().addJob(JtRequestedTxn, "DoTxs", [weak, m]() {
                 if (auto peer = weak.lock())
                     peer->doTransactions(m);
             });
@@ -2602,14 +2602,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
         {
             if (!stringIsUint256Sized(packet.ledgerhash()))
             {
-                fee_.update(Resource::feeMalformedRequest, "ledger hash");
+                fee_.update(Resource::kFEE_MALFORMED_REQUEST, "ledger hash");
                 return;
             }
 
             reply.set_ledgerhash(packet.ledgerhash());
         }
 
-        fee_.update(Resource::feeModerateBurdenPeer, " received a get object by hash request");
+        fee_.update(Resource::kFEE_MODERATE_BURDEN_PEER, " received a get object by hash request");
 
         // This is a very minimal implementation
         for (int i = 0; i < packet.objects_size(); ++i)
@@ -2635,10 +2635,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::hardMaxReplyNodes)
+                    if (reply.objects_size() >= Tuning::HardMaxReplyNodes)
                     {
                         fee_.update(
-                            Resource::feeModerateBurdenPeer,
+                            Resource::kFEE_MODERATE_BURDEN_PEER,
                             "Reply limit reached. Truncating reply.");
                         break;
                     }
@@ -2646,8 +2646,8 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
             }
         }
 
-        JLOG(p_journal_.trace()) << "GetObj: " << reply.objects_size() << " of "
-                                 << packet.objects_size();
+        JLOG(pJournal_.trace()) << "GetObj: " << reply.objects_size() << " of "
+                                << packet.objects_size();
         send(std::make_shared<Message>(reply, protocol::mtGET_OBJECTS));
     }
     else
@@ -2669,14 +2669,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
                     {
                         if (pLDo && (pLSeq != 0))
                         {
-                            JLOG(p_journal_.debug()) << "GetObj: Full fetch pack for " << pLSeq;
+                            JLOG(pJournal_.debug()) << "GetObj: Full fetch pack for " << pLSeq;
                         }
                         pLSeq = obj.ledgerseq();
                         pLDo = !app_.getLedgerMaster().haveLedger(pLSeq);
 
                         if (!pLDo)
                         {
-                            JLOG(p_journal_.debug()) << "GetObj: Late fetch pack for " << pLSeq;
+                            JLOG(pJournal_.debug()) << "GetObj: Late fetch pack for " << pLSeq;
                         }
                         else
                         {
@@ -2697,7 +2697,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMGetObjectByHash> const& m)
 
         if (pLDo && (pLSeq != 0))
         {
-            JLOG(p_journal_.debug()) << "GetObj: Partial fetch pack for " << pLSeq;
+            JLOG(pJournal_.debug()) << "GetObj: Partial fetch pack for " << pLSeq;
         }
         if (packet.type() == protocol::TMGetObjectByHash::otFETCH_PACK)
             app_.getLedgerMaster().gotFetchPack(progress, pLSeq);
@@ -2709,13 +2709,13 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMHaveTransactions> const& m)
 {
     if (!txReduceRelayEnabled())
     {
-        JLOG(p_journal_.error()) << "TMHaveTransactions: tx reduce-relay is disabled";
-        fee_.update(Resource::feeMalformedRequest, "disabled");
+        JLOG(pJournal_.error()) << "TMHaveTransactions: tx reduce-relay is disabled";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
         return;
     }
 
     std::weak_ptr<PeerImp> const weak = shared_from_this();
-    app_.getJobQueue().addJob(jtMISSING_TXN, "HandleHaveTxs", [weak, m]() {
+    app_.getJobQueue().addJob(JtMissingTxn, "HandleHaveTxs", [weak, m]() {
         if (auto peer = weak.lock())
             peer->handleHaveTransactions(m);
     });
@@ -2728,26 +2728,26 @@ PeerImp::handleHaveTransactions(std::shared_ptr<protocol::TMHaveTransactions> co
     tmBH.set_type(protocol::TMGetObjectByHash_ObjectType_otTRANSACTIONS);
     tmBH.set_query(true);
 
-    JLOG(p_journal_.trace()) << "received TMHaveTransactions " << m->hashes_size();
+    JLOG(pJournal_.trace()) << "received TMHaveTransactions " << m->hashes_size();
 
     for (std::uint32_t i = 0; i < m->hashes_size(); i++)
     {
         if (!stringIsUint256Sized(m->hashes(i)))
         {
-            JLOG(p_journal_.error()) << "TMHaveTransactions with invalid hash size";
-            fee_.update(Resource::feeMalformedRequest, "hash size");
+            JLOG(pJournal_.error()) << "TMHaveTransactions with invalid hash size";
+            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
             return;
         }
 
         uint256 hash(m->hashes(i));
 
-        auto txn = app_.getMasterTransaction().fetch_from_cache(hash);
+        auto txn = app_.getMasterTransaction().fetchFromCache(hash);
 
-        JLOG(p_journal_.trace()) << "checking transaction " << (bool)txn;
+        JLOG(pJournal_.trace()) << "checking transaction " << (bool)txn;
 
         if (!txn)
         {
-            JLOG(p_journal_.debug()) << "adding transaction to request";
+            JLOG(pJournal_.debug()) << "adding transaction to request";
 
             auto obj = tmBH.add_objects();
             obj->set_hash(hash.data(), hash.size());
@@ -2761,7 +2761,7 @@ PeerImp::handleHaveTransactions(std::shared_ptr<protocol::TMHaveTransactions> co
         }
     }
 
-    JLOG(p_journal_.trace()) << "transaction request object is " << tmBH.objects_size();
+    JLOG(pJournal_.trace()) << "transaction request object is " << tmBH.objects_size();
 
     if (tmBH.objects_size() > 0)
         send(std::make_shared<Message>(tmBH, protocol::mtGET_OBJECTS));
@@ -2772,12 +2772,12 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMTransactions> const& m)
 {
     if (!txReduceRelayEnabled())
     {
-        JLOG(p_journal_.error()) << "TMTransactions: tx reduce-relay is disabled";
-        fee_.update(Resource::feeMalformedRequest, "disabled");
+        JLOG(pJournal_.error()) << "TMTransactions: tx reduce-relay is disabled";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "disabled");
         return;
     }
 
-    JLOG(p_journal_.trace()) << "received TMTransactions " << m->transactions_size();
+    JLOG(pJournal_.trace()) << "received TMTransactions " << m->transactions_size();
 
     overlay_.addTxMetrics(m->transactions_size());
 
@@ -2803,14 +2803,14 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
 
     if (!m->has_validatorpubkey())
     {
-        fee_.update(Resource::feeInvalidData, "squelch no pubkey");
+        fee_.update(Resource::kFEE_INVALID_DATA, "squelch no pubkey");
         return;
     }
     auto validator = m->validatorpubkey();
     auto const slice{makeSlice(validator)};
     if (!publicKeyType(slice))
     {
-        fee_.update(Resource::feeInvalidData, "squelch bad pubkey");
+        fee_.update(Resource::kFEE_INVALID_DATA, "squelch bad pubkey");
         return;
     }
     PublicKey const key(slice);
@@ -2818,7 +2818,7 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
     // Ignore the squelch for validator's own messages.
     if (key == app_.getValidationPublicKey())
     {
-        JLOG(p_journal_.debug()) << "onMessage: TMSquelch discarding validator's squelch " << slice;
+        JLOG(pJournal_.debug()) << "onMessage: TMSquelch discarding validator's squelch " << slice;
         return;
     }
 
@@ -2829,10 +2829,10 @@ PeerImp::onMessage(std::shared_ptr<protocol::TMSquelch> const& m)
     }
     else if (!squelch_.addSquelch(key, std::chrono::seconds{duration}))
     {
-        fee_.update(Resource::feeInvalidData, "squelch duration");
+        fee_.update(Resource::kFEE_INVALID_DATA, "squelch duration");
     }
 
-    JLOG(p_journal_.debug()) << "onMessage: TMSquelch " << slice << " " << id() << " " << duration;
+    JLOG(pJournal_.debug()) << "onMessage: TMSquelch " << slice << " " << id() << " " << duration;
 }
 
 //--------------------------------------------------------------------------
@@ -2858,27 +2858,27 @@ PeerImp::doFetchPack(std::shared_ptr<protocol::TMGetObjectByHash> const& packet)
     // have some queued.
     if (app_.getFeeTrack().isLoadedLocal() ||
         (app_.getLedgerMaster().getValidatedLedgerAge() > 40s) ||
-        (app_.getJobQueue().getJobCount(jtPACK) > 10))
+        (app_.getJobQueue().getJobCount(JtPack) > 10))
     {
-        JLOG(p_journal_.info()) << "Too busy to make fetch pack";
+        JLOG(pJournal_.info()) << "Too busy to make fetch pack";
         return;
     }
 
     if (!stringIsUint256Sized(packet->ledgerhash()))
     {
-        JLOG(p_journal_.warn()) << "FetchPack hash size malformed";
-        fee_.update(Resource::feeMalformedRequest, "hash size");
+        JLOG(pJournal_.warn()) << "FetchPack hash size malformed";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
         return;
     }
 
-    fee_.fee = Resource::feeHeavyBurdenPeer;
+    fee_.fee = Resource::kFEE_HEAVY_BURDEN_PEER;
 
     uint256 const hash{packet->ledgerhash()};
 
     std::weak_ptr<PeerImp> const weak = shared_from_this();
     auto elapsed = UptimeClock::now();
     auto const pap = &app_;
-    app_.getJobQueue().addJob(jtPACK, "MakeFetchPack", [pap, weak, packet, hash, elapsed]() {
+    app_.getJobQueue().addJob(JtPack, "MakeFetchPack", [pap, weak, packet, hash, elapsed]() {
         pap->getLedgerMaster().makeFetchPack(weak, packet, hash, elapsed);
     });
 }
@@ -2888,13 +2888,13 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
 {
     protocol::TMTransactions reply;
 
-    JLOG(p_journal_.trace()) << "received TMGetObjectByHash requesting tx "
-                             << packet->objects_size();
+    JLOG(pJournal_.trace()) << "received TMGetObjectByHash requesting tx "
+                            << packet->objects_size();
 
-    if (packet->objects_size() > reduce_relay::MAX_TX_QUEUE_SIZE)
+    if (packet->objects_size() > reduce_relay::kMAX_TX_QUEUE_SIZE)
     {
-        JLOG(p_journal_.error()) << "doTransactions, invalid number of hashes";
-        fee_.update(Resource::feeMalformedRequest, "too big");
+        JLOG(pJournal_.error()) << "doTransactions, invalid number of hashes";
+        fee_.update(Resource::kFEE_MALFORMED_REQUEST, "too big");
         return;
     }
 
@@ -2904,19 +2904,19 @@ PeerImp::doTransactions(std::shared_ptr<protocol::TMGetObjectByHash> const& pack
 
         if (!stringIsUint256Sized(obj.hash()))
         {
-            fee_.update(Resource::feeMalformedRequest, "hash size");
+            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "hash size");
             return;
         }
 
         uint256 hash(obj.hash());
 
-        auto txn = app_.getMasterTransaction().fetch_from_cache(hash);
+        auto txn = app_.getMasterTransaction().fetchFromCache(hash);
 
         if (!txn)
         {
-            JLOG(p_journal_.error())
+            JLOG(pJournal_.error())
                 << "doTransactions, transaction not found " << Slice(hash.data(), hash.size());
-            fee_.update(Resource::feeMalformedRequest, "tx not found");
+            fee_.update(Resource::kFEE_MALFORMED_REQUEST, "tx not found");
             return;
         }
 
@@ -2965,9 +2965,9 @@ PeerImp::checkTransaction(
         */
         if (stx->isFlag(tfInnerBatchTxn))
         {
-            JLOG(p_journal_.warn()) << "Ignoring Network relayed Tx containing "
-                                       "tfInnerBatchTxn (checkSignature).";
-            charge(Resource::feeModerateBurdenPeer, "inner batch txn");
+            JLOG(pJournal_.warn()) << "Ignoring Network relayed Tx containing "
+                                      "tfInnerBatchTxn (checkSignature).";
+            charge(Resource::kFEE_MODERATE_BURDEN_PEER, "inner batch txn");
             return;
         }
         // LCOV_EXCL_STOP
@@ -2976,10 +2976,10 @@ PeerImp::checkTransaction(
         if (stx->isFieldPresent(sfLastLedgerSequence) &&
             (stx->getFieldU32(sfLastLedgerSequence) < app_.getLedgerMaster().getValidLedgerIndex()))
         {
-            JLOG(p_journal_.info()) << "Marking transaction " << stx->getTransactionID()
-                                    << "as BAD because it's expired";
+            JLOG(pJournal_.info()) << "Marking transaction " << stx->getTransactionID()
+                                   << "as BAD because it's expired";
             app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-            charge(Resource::feeUselessData, "expired tx");
+            charge(Resource::kFEE_USELESS_DATA, "expired tx");
             return;
         }
 
@@ -2995,23 +2995,22 @@ PeerImp::checkTransaction(
                 "correctly");
             if (tx->getStatus() == TransStatus::NEW)
             {
-                JLOG(p_journal_.debug()) << "Processing " << (batch ? "batch" : "unsolicited")
-                                         << " pseudo-transaction tx " << tx->getID();
+                JLOG(pJournal_.debug()) << "Processing " << (batch ? "batch" : "unsolicited")
+                                        << " pseudo-transaction tx " << tx->getID();
 
                 app_.getMasterTransaction().canonicalize(&tx);
                 // Tell the overlay about it, but don't relay it.
                 auto const toSkip = app_.getHashRouter().shouldRelay(tx->getID());
                 if (toSkip)
                 {
-                    JLOG(p_journal_.debug())
+                    JLOG(pJournal_.debug())
                         << "Passing skipped pseudo pseudo-transaction tx " << tx->getID();
                     app_.getOverlay().relay(tx->getID(), {}, *toSkip);
                 }
                 if (!batch)
                 {
-                    JLOG(p_journal_.debug())
-                        << "Charging for pseudo-transaction tx " << tx->getID();
-                    charge(Resource::feeUselessData, "pseudo tx");
+                    JLOG(pJournal_.debug()) << "Charging for pseudo-transaction tx " << tx->getID();
+                    charge(Resource::kFEE_USELESS_DATA, "pseudo tx");
                 }
 
                 return;
@@ -3027,13 +3026,13 @@ PeerImp::checkTransaction(
             {
                 if (!validReason.empty())
                 {
-                    JLOG(p_journal_.debug()) << "Exception checking transaction: " << validReason;
+                    JLOG(pJournal_.debug()) << "Exception checking transaction: " << validReason;
                 }
 
                 // Probably not necessary to set HashRouterFlags::BAD, but
                 // doesn't hurt.
                 app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-                charge(Resource::feeInvalidSignature, "check transaction signature failure");
+                charge(Resource::kFEE_INVALID_SIGNATURE, "check transaction signature failure");
                 return;
             }
         }
@@ -3049,22 +3048,22 @@ PeerImp::checkTransaction(
         {
             if (!reason.empty())
             {
-                JLOG(p_journal_.debug()) << "Exception checking transaction: " << reason;
+                JLOG(pJournal_.debug()) << "Exception checking transaction: " << reason;
             }
             app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
-            charge(Resource::feeInvalidSignature, "tx (impossible)");
+            charge(Resource::kFEE_INVALID_SIGNATURE, "tx (impossible)");
             return;
         }
 
         bool const trusted = any(flags & HashRouterFlags::TRUSTED);
-        app_.getOPs().processTransaction(tx, trusted, false, NetworkOPs::FailHard::no);
+        app_.getOPs().processTransaction(tx, trusted, false, NetworkOPs::FailHard::No);
     }
     catch (std::exception const& ex)
     {
-        JLOG(p_journal_.warn()) << "Exception in " << __func__ << ": " << ex.what();
+        JLOG(pJournal_.warn()) << "Exception in " << __func__ << ": " << ex.what();
         app_.getHashRouter().setFlags(stx->getTransactionID(), HashRouterFlags::BAD);
         using namespace std::string_literals;
-        charge(Resource::feeInvalidData, "tx "s + ex.what());
+        charge(Resource::kFEE_INVALID_DATA, "tx "s + ex.what());
     }
 }
 
@@ -3075,15 +3074,15 @@ PeerImp::checkPropose(
     std::shared_ptr<protocol::TMProposeSet> const& packet,
     RCLCxPeerPos peerPos)
 {
-    JLOG(p_journal_.trace()) << "Checking " << (isTrusted ? "trusted" : "UNTRUSTED") << " proposal";
+    JLOG(pJournal_.trace()) << "Checking " << (isTrusted ? "trusted" : "UNTRUSTED") << " proposal";
 
     XRPL_ASSERT(packet, "xrpl::PeerImp::checkPropose : non-null packet");
 
     if (!cluster() && !peerPos.checkSign())
     {
         std::string const desc{"Proposal fails sig check"};
-        JLOG(p_journal_.warn()) << desc;
-        charge(Resource::feeInvalidSignature, desc);
+        JLOG(pJournal_.warn()) << desc;
+        charge(Resource::kFEE_INVALID_SIGNATURE, desc);
         return;
     }
 
@@ -3126,8 +3125,8 @@ PeerImp::checkValidation(
     if (!val->isValid())
     {
         std::string const desc{"Validation forwarded by peer is invalid"};
-        JLOG(p_journal_.debug()) << desc;
-        charge(Resource::feeInvalidSignature, desc);
+        JLOG(pJournal_.debug()) << desc;
+        charge(Resource::kFEE_INVALID_SIGNATURE, desc);
         return;
     }
 
@@ -3150,9 +3149,9 @@ PeerImp::checkValidation(
     }
     catch (std::exception const& ex)
     {
-        JLOG(p_journal_.trace()) << "Exception processing validation: " << ex.what();
+        JLOG(pJournal_.trace()) << "Exception processing validation: " << ex.what();
         using namespace std::string_literals;
-        charge(Resource::feeMalformedRequest, "validation "s + ex.what());
+        charge(Resource::kFEE_MALFORMED_REQUEST, "validation "s + ex.what());
     }
 }
 
@@ -3165,7 +3164,7 @@ getPeerWithTree(OverlayImpl& ov, uint256 const& rootHash, PeerImp const* skip)
     std::shared_ptr<PeerImp> ret;
     int retScore = 0;
 
-    ov.for_each([&](std::shared_ptr<PeerImp>&& p) {
+    ov.forEach([&](std::shared_ptr<PeerImp>&& p) {
         if (p->hasTxSet(rootHash) && p.get() != skip)
         {
             auto score = p->getScore(true);
@@ -3193,7 +3192,7 @@ getPeerWithLedger(
     std::shared_ptr<PeerImp> ret;
     int retScore = 0;
 
-    ov.for_each([&](std::shared_ptr<PeerImp>&& p) {
+    ov.forEach([&](std::shared_ptr<PeerImp>&& p) {
         if (p->hasLedger(ledgerHash, ledger) && p.get() != skip)
         {
             auto score = p->getScore(true);
@@ -3213,14 +3212,14 @@ PeerImp::sendLedgerBase(
     std::shared_ptr<Ledger const> const& ledger,
     protocol::TMLedgerData& ledgerData)
 {
-    JLOG(p_journal_.trace()) << "sendLedgerBase: Base data";
+    JLOG(pJournal_.trace()) << "sendLedgerBase: Base data";
 
     Serializer s(sizeof(LedgerHeader));
     addRaw(ledger->header(), s);
     ledgerData.add_nodes()->set_nodedata(s.getDataPtr(), s.getLength());
 
     auto const& stateMap{ledger->stateMap()};
-    if (stateMap.getHash() != beast::zero)
+    if (stateMap.getHash() != beast::kZERO)
     {
         // Return account state root node if possible
         Serializer root(768);
@@ -3228,10 +3227,10 @@ PeerImp::sendLedgerBase(
         stateMap.serializeRoot(root);
         ledgerData.add_nodes()->set_nodedata(root.getDataPtr(), root.getLength());
 
-        if (ledger->header().txHash != beast::zero)
+        if (ledger->header().txHash != beast::kZERO)
         {
             auto const& txMap{ledger->txMap()};
-            if (txMap.getHash() != beast::zero)
+            if (txMap.getHash() != beast::kZERO)
             {
                 // Return TX root node if possible
                 root.erase();
@@ -3248,7 +3247,7 @@ PeerImp::sendLedgerBase(
 std::shared_ptr<Ledger const>
 PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
 {
-    JLOG(p_journal_.trace()) << "getLedger: Ledger";
+    JLOG(pJournal_.trace()) << "getLedger: Ledger";
 
     std::shared_ptr<Ledger const> ledger;
 
@@ -3259,7 +3258,7 @@ PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
         ledger = app_.getLedgerMaster().getLedgerByHash(ledgerHash);
         if (!ledger)
         {
-            JLOG(p_journal_.trace()) << "getLedger: Don't have ledger with hash " << ledgerHash;
+            JLOG(pJournal_.trace()) << "getLedger: Don't have ledger with hash " << ledgerHash;
 
             if (m->has_querytype() && !m->has_requestcookie())
             {
@@ -3269,11 +3268,11 @@ PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
                 {
                     m->set_requestcookie(id());
                     peer->send(std::make_shared<Message>(*m, protocol::mtGET_LEDGER));
-                    JLOG(p_journal_.debug()) << "getLedger: Request relayed to peer";
+                    JLOG(pJournal_.debug()) << "getLedger: Request relayed to peer";
                     return ledger;
                 }
 
-                JLOG(p_journal_.trace()) << "getLedger: Failed to find peer to relay request";
+                JLOG(pJournal_.trace()) << "getLedger: Failed to find peer to relay request";
             }
         }
     }
@@ -3282,14 +3281,14 @@ PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
         // Attempt to find ledger by sequence
         if (m->ledgerseq() < app_.getLedgerMaster().getEarliestFetch())
         {
-            JLOG(p_journal_.debug()) << "getLedger: Early ledger sequence request";
+            JLOG(pJournal_.debug()) << "getLedger: Early ledger sequence request";
         }
         else
         {
             ledger = app_.getLedgerMaster().getLedgerBySeq(m->ledgerseq());
             if (!ledger)
             {
-                JLOG(p_journal_.debug())
+                JLOG(pJournal_.debug())
                     << "getLedger: Don't have ledger with sequence " << m->ledgerseq();
             }
         }
@@ -3309,21 +3308,21 @@ 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::feeMalformedRequest, "get_ledger ledgerSeq");
+                    charge(Resource::kFEE_MALFORMED_REQUEST, "get_ledger ledgerSeq");
 
                 ledger.reset();
-                JLOG(p_journal_.warn()) << "getLedger: Invalid ledger sequence " << ledgerSeq;
+                JLOG(pJournal_.warn()) << "getLedger: Invalid ledger sequence " << ledgerSeq;
             }
         }
         else if (ledgerSeq < app_.getLedgerMaster().getEarliestFetch())
         {
             ledger.reset();
-            JLOG(p_journal_.debug()) << "getLedger: Early ledger sequence request " << ledgerSeq;
+            JLOG(pJournal_.debug()) << "getLedger: Early ledger sequence request " << ledgerSeq;
         }
     }
     else
     {
-        JLOG(p_journal_.debug()) << "getLedger: Unable to find ledger";
+        JLOG(pJournal_.debug()) << "getLedger: Unable to find ledger";
     }
 
     return ledger;
@@ -3332,7 +3331,7 @@ PeerImp::getLedger(std::shared_ptr<protocol::TMGetLedger> const& m)
 std::shared_ptr<SHAMap const>
 PeerImp::getTxSet(std::shared_ptr<protocol::TMGetLedger> const& m) const
 {
-    JLOG(p_journal_.trace()) << "getTxSet: TX set";
+    JLOG(pJournal_.trace()) << "getTxSet: TX set";
 
     uint256 const txSetHash{m->ledgerhash()};
     std::shared_ptr<SHAMap> shaMap{app_.getInboundTransactions().getSet(txSetHash, false)};
@@ -3345,16 +3344,16 @@ PeerImp::getTxSet(std::shared_ptr<protocol::TMGetLedger> const& m) const
             {
                 m->set_requestcookie(id());
                 peer->send(std::make_shared<Message>(*m, protocol::mtGET_LEDGER));
-                JLOG(p_journal_.debug()) << "getTxSet: Request relayed";
+                JLOG(pJournal_.debug()) << "getTxSet: Request relayed";
             }
             else
             {
-                JLOG(p_journal_.debug()) << "getTxSet: Failed to find relay peer";
+                JLOG(pJournal_.debug()) << "getTxSet: Failed to find relay peer";
             }
         }
         else
         {
-            JLOG(p_journal_.debug()) << "getTxSet: Failed to find TX set";
+            JLOG(pJournal_.debug()) << "getTxSet: Failed to find TX set";
         }
     }
 
@@ -3366,7 +3365,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::feeModerateBurdenPeer, "received a get ledger request");
+        charge(Resource::kFEE_MODERATE_BURDEN_PEER, "received a get ledger request");
 
     std::shared_ptr<Ledger const> ledger;
     std::shared_ptr<SHAMap const> sharedMap;
@@ -3393,14 +3392,14 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
     }
     else
     {
-        if (send_queue_.size() >= Tuning::dropSendQueue)
+        if (sendQueue_.size() >= Tuning::DropSendQueue)
         {
-            JLOG(p_journal_.debug()) << "processLedgerRequest: Large send queue";
+            JLOG(pJournal_.debug()) << "processLedgerRequest: Large send queue";
             return;
         }
         if (app_.getFeeTrack().isLoadedLocal() && !cluster())
         {
-            JLOG(p_journal_.debug()) << "processLedgerRequest: Too busy";
+            JLOG(pJournal_.debug()) << "processLedgerRequest: Too busy";
             return;
         }
 
@@ -3423,26 +3422,26 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
 
             case protocol::liTX_NODE:
                 map = &ledger->txMap();
-                JLOG(p_journal_.trace())
+                JLOG(pJournal_.trace())
                     << "processLedgerRequest: TX map hash " << to_string(map->getHash());
                 break;
 
             case protocol::liAS_NODE:
                 map = &ledger->stateMap();
-                JLOG(p_journal_.trace())
+                JLOG(pJournal_.trace())
                     << "processLedgerRequest: Account state map hash " << to_string(map->getHash());
                 break;
 
             default:
                 // This case should not be possible here
-                JLOG(p_journal_.error()) << "processLedgerRequest: Invalid ledger info type";
+                JLOG(pJournal_.error()) << "processLedgerRequest: Invalid ledger info type";
                 return;
         }
     }
 
     if (map == nullptr)
     {
-        JLOG(p_journal_.warn()) << "processLedgerRequest: Unable to find map";
+        JLOG(pJournal_.warn()) << "processLedgerRequest: Unable to find map";
         return;
     }
 
@@ -3455,25 +3454,25 @@ 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::softMaxReplyNodes;
+             i < m->nodeids_size() && ledgerData.nodes_size() < Tuning::SoftMaxReplyNodes;
              ++i)
         {
             auto const shaMapNodeId{deserializeSHAMapNodeID(m->nodeids(i))};
 
             data.clear();
-            data.reserve(Tuning::softMaxReplyNodes);
+            data.reserve(Tuning::SoftMaxReplyNodes);
 
             try
             {
                 // NOLINTNEXTLINE(bugprone-unchecked-optional-access) nodeids checked in onGetLedger
                 if (map->getNodeFat(*shaMapNodeId, data, fatLeaves, queryDepth))
                 {
-                    JLOG(p_journal_.trace())
+                    JLOG(pJournal_.trace())
                         << "processLedgerRequest: getNodeFat got " << data.size() << " nodes";
 
                     for (auto const& d : data)
                     {
-                        if (ledgerData.nodes_size() >= Tuning::hardMaxReplyNodes)
+                        if (ledgerData.nodes_size() >= Tuning::HardMaxReplyNodes)
                             break;
                         protocol::TMLedgerNode* node{ledgerData.add_nodes()};
                         node->set_nodeid(d.first.getRawString());
@@ -3482,7 +3481,7 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
                 }
                 else
                 {
-                    JLOG(p_journal_.warn()) << "processLedgerRequest: getNodeFat returns false";
+                    JLOG(pJournal_.warn()) << "processLedgerRequest: getNodeFat returns false";
                 }
             }
             catch (std::exception const& e)
@@ -3515,15 +3514,15 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
                 if (!m->has_ledgerhash())
                     info += ", no hash specified";
 
-                JLOG(p_journal_.warn())
+                JLOG(pJournal_.warn())
                     << "processLedgerRequest: getNodeFat with nodeId " << *shaMapNodeId
                     << " and ledger info type " << info << " throws exception: " << e.what();
             }
         }
 
-        JLOG(p_journal_.info()) << "processLedgerRequest: Got request for " << m->nodeids_size()
-                                << " nodes at depth " << queryDepth << ", return "
-                                << ledgerData.nodes_size() << " nodes";
+        JLOG(pJournal_.info()) << "processLedgerRequest: Got request for " << m->nodeids_size()
+                               << " nodes at depth " << queryDepth << ", return "
+                               << ledgerData.nodes_size() << " nodes";
     }
 
     if (ledgerData.nodes_size() == 0)
@@ -3537,24 +3536,24 @@ PeerImp::getScore(bool haveItem) const
 {
     // Random component of score, used to break ties and avoid
     // overloading the "best" peer
-    static int const spRandomMax = 9999;
+    static int const kSP_RANDOM_MAX = 9999;
 
     // Score for being very likely to have the thing we are
     // look for; should be roughly spRandomMax
-    static int const spHaveItem = 10000;
+    static int const kSP_HAVE_ITEM = 10000;
 
     // Score reduction for each millisecond of latency; should
     // be roughly spRandomMax divided by the maximum reasonable
     // latency
-    static int const spLatency = 30;
+    static int const kSP_LATENCY = 30;
 
     // Penalty for unknown latency; should be roughly spRandomMax
-    static int const spNoLatency = 8000;
+    static int const kSP_NO_LATENCY = 8000;
 
-    int score = rand_int(spRandomMax);
+    int score = randInt(kSP_RANDOM_MAX);
 
     if (haveItem)
-        score += spHaveItem;
+        score += kSP_HAVE_ITEM;
 
     std::optional<std::chrono::milliseconds> latency;
     {
@@ -3564,11 +3563,11 @@ PeerImp::getScore(bool haveItem) const
 
     if (latency)
     {
-        score -= latency->count() * spLatency;
+        score -= latency->count() * kSP_LATENCY;
     }
     else
     {
-        score -= spNoLatency;
+        score -= kSP_NO_LATENCY;
     }
 
     return score;
@@ -3578,11 +3577,11 @@ bool
 PeerImp::isHighLatency() const
 {
     std::scoped_lock const sl(recentLock_);
-    return latency_ >= peerHighLatency;
+    return latency_ >= kPEER_HIGH_LATENCY;
 }
 
 void
-PeerImp::Metrics::add_message(std::uint64_t bytes)
+PeerImp::Metrics::addMessage(std::uint64_t bytes)
 {
     using namespace std::chrono_literals;
     std::unique_lock const lock{mutex_};
@@ -3606,14 +3605,14 @@ PeerImp::Metrics::add_message(std::uint64_t bytes)
 }
 
 std::uint64_t
-PeerImp::Metrics::average_bytes() const
+PeerImp::Metrics::averageBytes() const
 {
     std::shared_lock const lock{mutex_};
     return rollingAvgBytes_;
 }
 
 std::uint64_t
-PeerImp::Metrics::total_bytes() const
+PeerImp::Metrics::totalBytes() const
 {
     std::shared_lock const lock{mutex_};
     return totalBytes_;
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index d2cf46e838..676057ad82 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -96,7 +96,7 @@ class PeerImp : public Peer, public std::enable_shared_from_this<PeerImp>, publi
 {
 public:
     /** Whether the peer's view of the ledger converges or diverges from ours */
-    enum class Tracking { diverged, unknown, converged };
+    enum class Tracking { Diverged, Unknown, Converged };
 
 private:
     using clock_type = std::chrono::steady_clock;
@@ -114,10 +114,10 @@ private:
     std::string fingerprint_;
     std::string prefix_;
     beast::WrappedSink sink_;
-    beast::WrappedSink p_sink_;
+    beast::WrappedSink pSink_;
     beast::Journal const journal_;
-    beast::Journal const p_journal_;
-    std::unique_ptr<stream_type> stream_ptr_;
+    beast::Journal const pJournal_;
+    std::unique_ptr<stream_type> streamPtr_;
     socket_type& socket_;
     stream_type& stream_;
     boost::asio::strand<boost::asio::executor> strand_;
@@ -127,7 +127,7 @@ private:
 
     // Updated at each stage of the connection process to reflect
     // the current conditions as closely as possible.
-    beast::IP::Endpoint const remote_address_;
+    beast::IP::Endpoint const remoteAddress_;
 
     // These are up here to prevent warnings about order of initializations
     //
@@ -184,13 +184,13 @@ private:
     // The following variables are being protected preemptively:
     //
     // o name_
-    // o last_status_
+    // o lastStatus_
     //
     // June 2019
 
     struct ChargeWithContext
     {
-        Resource::Charge fee = Resource::feeTrivialPeer;
+        Resource::Charge fee = Resource::kFEE_TRIVIAL_PEER;
         std::string context{};  // NOLINT(readability-redundant-member-init)
 
         void
@@ -207,15 +207,15 @@ private:
     };
 
     std::mutex mutable recentLock_;
-    protocol::TMStatusChange last_status_;
+    protocol::TMStatusChange lastStatus_;
     Resource::Consumer usage_;
     ChargeWithContext fee_;
     std::shared_ptr<PeerFinder::Slot> const slot_;
-    boost::beast::multi_buffer read_buffer_;
+    boost::beast::multi_buffer readBuffer_;
     http_request_type request_;
     http_response_type response_;
     boost::beast::http::fields const& headers_;
-    std::queue<std::shared_ptr<Message>> send_queue_;
+    std::queue<std::shared_ptr<Message>> sendQueue_;
 
     // Primary shutdown flag set when shutdown is requested
     bool shutdown_ = false;
@@ -229,8 +229,8 @@ private:
     // Indicates a write operation is currently pending
     bool writePending_ = false;
 
-    int large_sendq_ = 0;
-    std::unique_ptr<LoadEvent> load_event_;
+    int largeSendq_ = 0;
+    std::unique_ptr<LoadEvent> loadEvent_;
     // The highest sequence of each PublisherList that has
     // been sent to or received from this peer.
     hash_map<PublicKey, std::size_t> publisherListSequences_;
@@ -261,11 +261,11 @@ private:
         operator=(Metrics&&) = delete;
 
         void
-        add_message(std::uint64_t bytes);
+        addMessage(std::uint64_t bytes);
         std::uint64_t
-        average_bytes() const;
+        averageBytes() const;
         std::uint64_t
-        total_bytes() const;
+        totalBytes() const;
 
     private:
         std::shared_mutex mutable mutex_;
@@ -296,7 +296,7 @@ public:
         PublicKey const& publicKey,
         ProtocolVersion protocol,
         Resource::Consumer consumer,
-        std::unique_ptr<stream_type>&& stream_ptr,
+        std::unique_ptr<stream_type>&& streamPtr,
         OverlayImpl& overlay);
 
     /** Create outgoing, handshaked peer. */
@@ -304,7 +304,7 @@ public:
     template <class Buffers>
     PeerImp(
         Application& app,
-        std::unique_ptr<stream_type>&& stream_ptr,
+        std::unique_ptr<stream_type>&& streamPtr,
         Buffers const& buffers,
         std::shared_ptr<PeerFinder::Slot>&& slot,
         http_response_type&& response,
@@ -319,7 +319,7 @@ public:
     beast::Journal const&
     pJournal() const
     {
-        return p_journal_;
+        return pJournal_;
     }
 
     std::shared_ptr<PeerFinder::Slot> const&
@@ -370,7 +370,7 @@ public:
     beast::IP::Endpoint
     getRemoteAddress() const override
     {
-        return remote_address_;
+        return remoteAddress_;
     }
 
     void
@@ -419,7 +419,7 @@ public:
         return clock_type::now() - creationTime_;
     }
 
-    Json::Value
+    json::Value
     json() override;
 
     bool
@@ -631,11 +631,11 @@ private:
 
     // Called when protocol message bytes are received
     void
-    onReadMessage(error_code ec, std::size_t bytes_transferred);
+    onReadMessage(error_code ec, std::size_t bytesTransferred);
 
     // Called when protocol messages bytes are sent
     void
-    onWriteMessage(error_code ec, std::size_t bytes_transferred);
+    onWriteMessage(error_code ec, std::size_t bytesTransferred);
 
     /** Called from onMessage(TMTransaction(s)).
        @param m Transaction protocol message
@@ -690,7 +690,7 @@ public:
         std::uint16_t type,
         std::shared_ptr<::google::protobuf::Message> const& m,
         std::size_t size,
-        std::size_t uncompressed_size,
+        std::size_t uncompressedSize,
         bool isCompressed);
 
     void
@@ -800,7 +800,7 @@ private:
 template <class Buffers>
 PeerImp::PeerImp(
     Application& app,
-    std::unique_ptr<stream_type>&& stream_ptr,
+    std::unique_ptr<stream_type>&& streamPtr,
     Buffers const& buffers,
     std::shared_ptr<PeerFinder::Slot>&& slot,
     http_response_type&& response,
@@ -812,52 +812,52 @@ PeerImp::PeerImp(
     : Child(overlay)
     , app_(app)
     , id_(id)
-    , fingerprint_(getFingerprint(slot->remote_endpoint(), publicKey, to_string(id_)))
+    , fingerprint_(getFingerprint(slot->remoteEndpoint(), publicKey, to_string(id_)))
     , prefix_(makePrefix(fingerprint_))
     , sink_(app_.getJournal("Peer"), prefix_)
-    , p_sink_(app_.getJournal("Protocol"), prefix_)
+    , pSink_(app_.getJournal("Protocol"), prefix_)
     , journal_(sink_)
-    , p_journal_(p_sink_)
-    , stream_ptr_(std::move(stream_ptr))
-    , socket_(stream_ptr_->next_layer().socket())
-    , stream_(*stream_ptr_)
+    , pJournal_(pSink_)
+    , streamPtr_(std::move(streamPtr))
+    , socket_(streamPtr_->next_layer().socket())
+    , stream_(*streamPtr_)
     , strand_(boost::asio::make_strand(socket_.get_executor()))
     , timer_(waitable_timer{socket_.get_executor()})
-    , remote_address_(slot->remote_endpoint())
+    , remoteAddress_(slot->remoteEndpoint())
     , overlay_(overlay)
     , inbound_(false)
     , protocol_(std::move(protocol))
-    , tracking_(Tracking::unknown)
+    , tracking_(Tracking::Unknown)
     , trackingTime_(clock_type::now())
     , publicKey_(publicKey)
     , lastPingTime_(clock_type::now())
     , creationTime_(clock_type::now())
     , squelch_(app_.getJournal("Squelch"))
     , usage_(usage)
-    , fee_{.fee = Resource::feeTrivialPeer}
+    , fee_{.fee = Resource::kFEE_TRIVIAL_PEER}
     , slot_(std::move(slot))
     , response_(std::move(response))
     , headers_(response_)
     , compressionEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_COMPR, "lz4", app_.config().COMPRESSION)
+          peerFeatureEnabled(headers_, kFEATURE_COMPR, "lz4", app_.config().COMPRESSION)
               ? Compressed::On
               : Compressed::Off)
     , txReduceRelayEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
+          peerFeatureEnabled(headers_, kFEATURE_TXRR, app_.config().TX_REDUCE_RELAY_ENABLE))
     , ledgerReplayEnabled_(
-          peerFeatureEnabled(headers_, FEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
+          peerFeatureEnabled(headers_, kFEATURE_LEDGER_REPLAY, app_.config().LEDGER_REPLAY))
     , ledgerReplayMsgHandler_(app, app.getLedgerReplayer())
 {
-    read_buffer_.commit(
-        boost::asio::buffer_copy(read_buffer_.prepare(boost::asio::buffer_size(buffers)), buffers));
+    readBuffer_.commit(
+        boost::asio::buffer_copy(readBuffer_.prepare(boost::asio::buffer_size(buffers)), buffers));
     JLOG(journal_.info()) << "compression enabled " << (compressionEnabled_ == Compressed::On)
                           << " vp reduce-relay base squelch enabled "
                           << peerFeatureEnabled(
                                  headers_,
-                                 FEATURE_VPRR,
+                                 kFEATURE_VPRR,
                                  app_.config().VP_REDUCE_RELAY_BASE_SQUELCH_ENABLE)
                           << " tx reduce-relay enabled " << txReduceRelayEnabled_ << " on "
-                          << remote_address_ << " " << id_;
+                          << remoteAddress_ << " " << id_;
 }
 
 template <class FwdIt, class>
@@ -869,7 +869,7 @@ PeerImp::sendEndpoints(FwdIt first, FwdIt last)
     while (first != last)
     {
         auto& tme2(*tm.add_endpoints_v2());
-        tme2.set_endpoint(first->address.to_string());
+        tme2.set_endpoint(first->address.toString());
         tme2.set_hops(first->hops);
         first++;
     }
diff --git a/src/xrpld/overlay/detail/PeerReservationTable.cpp b/src/xrpld/overlay/detail/PeerReservationTable.cpp
index 6f004a3b39..ec0f914dd6 100644
--- a/src/xrpld/overlay/detail/PeerReservationTable.cpp
+++ b/src/xrpld/overlay/detail/PeerReservationTable.cpp
@@ -16,9 +16,9 @@
 namespace xrpl {
 
 auto
-PeerReservation::toJson() const -> Json::Value
+PeerReservation::toJson() const -> json::Value
 {
-    Json::Value result{Json::objectValue};
+    json::Value result{json::ObjectValue};
     result[jss::node] = toBase58(TokenType::NodePublic, nodeId);
     if (!description.empty())
     {
@@ -60,7 +60,7 @@ PeerReservationTable::load(DatabaseCon& connection)
 }
 
 std::optional<PeerReservation>
-PeerReservationTable::insert_or_assign(PeerReservation const& reservation)
+PeerReservationTable::insertOrAssign(PeerReservation const& reservation)
 {
     std::optional<PeerReservation> previous;
 
@@ -70,7 +70,7 @@ PeerReservationTable::insert_or_assign(PeerReservation const& reservation)
     if (hint != table_.end())
     {
         // The node already has a reservation. Remove it.
-        // `std::unordered_set` does not have an `insert_or_assign` method,
+        // `std::unordered_set` does not have an `insertOrAssign` method,
         // and sadly makes it impossible for us to implement one efficiently:
         // https://stackoverflow.com/q/49651835/618906
         // Regardless, we don't expect this function to be called often, or
diff --git a/src/xrpld/overlay/detail/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp
index a1eb41d023..6dda492315 100644
--- a/src/xrpld/overlay/detail/PeerSet.cpp
+++ b/src/xrpld/overlay/detail/PeerSet.cpp
@@ -134,7 +134,7 @@ private:
 };
 
 std::unique_ptr<PeerSetBuilder>
-make_PeerSetBuilder(Application& app)
+makePeerSetBuilder(Application& app)
 {
     return std::make_unique<PeerSetBuilderImpl>(app);
 }
@@ -167,9 +167,9 @@ public:
     [[nodiscard]] std::set<Peer::id_t> const&
     getPeerIds() const override
     {
-        static std::set<Peer::id_t> const emptyPeers;
+        static std::set<Peer::id_t> const kEMPTY_PEERS;
         JLOG(j_.error()) << "DummyPeerSet getPeerIds should not be called";
-        return emptyPeers;
+        return kEMPTY_PEERS;
     }
 
 private:
@@ -177,7 +177,7 @@ private:
 };
 
 std::unique_ptr<PeerSet>
-make_DummyPeerSet(Application& app)
+makeDummyPeerSet(Application& app)
 {
     return std::make_unique<DummyPeerSet>(app);
 }
diff --git a/src/xrpld/overlay/detail/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h
index 6b5b746ffd..0550cf68e0 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 = headerBytesCompressed;
+        hdr.header_size = kHEADER_BYTES_COMPRESSED;
 
         // 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 = headerBytes;
+        hdr.header_size = kHEADER_BYTES;
 
         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 > maximumMessageSize ||
-        header->uncompressed_size > maximumMessageSize)
+    if (header->payload_wire_size > kMAXIMUM_MESSAGE_SIZE ||
+        header->uncompressed_size > kMAXIMUM_MESSAGE_SIZE)
     {
         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 c7416973ba..86525068f8 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 supportedProtocolList[]{
+constexpr ProtocolVersion const kSUPPORTED_PROTOCOL_LIST[]{
     {2, 1},
     {2, 2},
 };
@@ -36,7 +36,7 @@ constexpr ProtocolVersion const supportedProtocolList[]{
 static_assert(
     []() constexpr -> bool {
         auto const len =
-            std::distance(std::begin(supportedProtocolList), std::end(supportedProtocolList));
+            std::distance(std::begin(kSUPPORTED_PROTOCOL_LIST), std::end(kSUPPORTED_PROTOCOL_LIST));
 
         // 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 (supportedProtocolList[i] >= supportedProtocolList[i + 1])
+                if (kSUPPORTED_PROTOCOL_LIST[i] >= kSUPPORTED_PROTOCOL_LIST[i + 1])
                     return false;
             }
         }
@@ -66,7 +66,7 @@ to_string(ProtocolVersion const& p)
 std::vector<ProtocolVersion>
 parseProtocolVersions(boost::beast::string_view const& value)
 {
-    static boost::regex const re(
+    static boost::regex const kRE(
         "^"                        // start of line
         "XRPL/"                    // The string "XRPL/"
         "([2-9]|(?:[1-9][0-9]+))"  // a number (greater than 2 with no leading
@@ -80,11 +80,11 @@ parseProtocolVersions(boost::beast::string_view const& value)
 
     std::vector<ProtocolVersion> result;
 
-    for (auto const& s : beast::rfc2616::split_commas(value))
+    for (auto const& s : beast::rfc2616::splitCommas(value))
     {
         boost::smatch m;
 
-        if (boost::regex_match(s, m, re))
+        if (boost::regex_match(s, m, kRE))
         {
             std::uint16_t major = 0;
             std::uint16_t minor = 0;
@@ -94,12 +94,12 @@ parseProtocolVersions(boost::beast::string_view const& value)
             if (!beast::lexicalCastChecked(minor, std::string(m[2])))
                 continue;
 
-            auto const proto = make_protocol(major, minor);
+            auto const proto = makeProtocol(major, minor);
 
             // This is an extra sanity check: we check that the protocol we just
             // decoded corresponds to the token we were parsing.
             if (to_string(proto) == s)
-                result.push_back(make_protocol(major, minor));
+                result.push_back(makeProtocol(major, minor));
         }
     }
 
@@ -125,7 +125,7 @@ negotiateProtocolVersion(std::vector<ProtocolVersion> const& versions)
         [&result](ProtocolVersion const& v) { result = v; };
 
     std::ranges::set_intersection(
-        versions, supportedProtocolList, boost::make_function_output_iterator(pickVersion));
+        versions, kSUPPORTED_PROTOCOL_LIST, 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 supported = []() {
+    static std::string const kSUPPORTED = []() {
         std::string ret;
-        for (auto const& v : supportedProtocolList)
+        for (auto const& v : kSUPPORTED_PROTOCOL_LIST)
         {
             if (!ret.empty())
                 ret += ", ";
@@ -153,13 +153,13 @@ supportedProtocolVersions()
         return ret;
     }();
 
-    return supported;
+    return kSUPPORTED;
 }
 
 bool
 isProtocolSupported(ProtocolVersion const& v)
 {
-    return std::end(supportedProtocolList) != std::ranges::find(supportedProtocolList, v);
+    return std::end(kSUPPORTED_PROTOCOL_LIST) != std::ranges::find(kSUPPORTED_PROTOCOL_LIST, v);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/detail/ProtocolVersion.h b/src/xrpld/overlay/detail/ProtocolVersion.h
index c4fa7ced0b..d6d9da7ad3 100644
--- a/src/xrpld/overlay/detail/ProtocolVersion.h
+++ b/src/xrpld/overlay/detail/ProtocolVersion.h
@@ -18,7 +18,7 @@ namespace xrpl {
 using ProtocolVersion = std::pair<std::uint16_t, std::uint16_t>;
 
 constexpr ProtocolVersion
-make_protocol(std::uint16_t major, std::uint16_t minor)
+makeProtocol(std::uint16_t major, std::uint16_t minor)
 {
     return {major, minor};
 }
diff --git a/src/xrpld/overlay/detail/TrafficCount.cpp b/src/xrpld/overlay/detail/TrafficCount.cpp
index 3841be28b0..4dc99e3e37 100644
--- a/src/xrpld/overlay/detail/TrafficCount.cpp
+++ b/src/xrpld/overlay/detail/TrafficCount.cpp
@@ -8,130 +8,130 @@
 
 namespace xrpl {
 
-std::unordered_map<protocol::MessageType, TrafficCount::category> const type_lookup = {
-    {protocol::mtPING, TrafficCount::category::base},
-    {protocol::mtSTATUS_CHANGE, TrafficCount::category::base},
-    {protocol::mtMANIFESTS, TrafficCount::category::manifests},
-    {protocol::mtENDPOINTS, TrafficCount::category::overlay},
-    {protocol::mtTRANSACTION, TrafficCount::category::transaction},
-    {protocol::mtVALIDATOR_LIST, TrafficCount::category::validatorlist},
-    {protocol::mtVALIDATOR_LIST_COLLECTION, TrafficCount::category::validatorlist},
-    {protocol::mtVALIDATION, TrafficCount::category::validation},
-    {protocol::mtPROPOSE_LEDGER, TrafficCount::category::proposal},
-    {protocol::mtPROOF_PATH_REQ, TrafficCount::category::proof_path_request},
-    {protocol::mtPROOF_PATH_RESPONSE, TrafficCount::category::proof_path_response},
-    {protocol::mtREPLAY_DELTA_REQ, TrafficCount::category::replay_delta_request},
-    {protocol::mtREPLAY_DELTA_RESPONSE, TrafficCount::category::replay_delta_response},
-    {protocol::mtHAVE_TRANSACTIONS, TrafficCount::category::have_transactions},
-    {protocol::mtTRANSACTIONS, TrafficCount::category::requested_transactions},
-    {protocol::mtSQUELCH, TrafficCount::category::squelch},
+std::unordered_map<protocol::MessageType, TrafficCount::Category> const kTYPE_LOOKUP = {
+    {protocol::mtPING, TrafficCount::Category::Base},
+    {protocol::mtSTATUS_CHANGE, TrafficCount::Category::Base},
+    {protocol::mtMANIFESTS, TrafficCount::Category::Manifests},
+    {protocol::mtENDPOINTS, TrafficCount::Category::Overlay},
+    {protocol::mtTRANSACTION, TrafficCount::Category::Transaction},
+    {protocol::mtVALIDATOR_LIST, TrafficCount::Category::Validatorlist},
+    {protocol::mtVALIDATOR_LIST_COLLECTION, TrafficCount::Category::Validatorlist},
+    {protocol::mtVALIDATION, TrafficCount::Category::Validation},
+    {protocol::mtPROPOSE_LEDGER, TrafficCount::Category::Proposal},
+    {protocol::mtPROOF_PATH_REQ, TrafficCount::Category::ProofPathRequest},
+    {protocol::mtPROOF_PATH_RESPONSE, TrafficCount::Category::ProofPathResponse},
+    {protocol::mtREPLAY_DELTA_REQ, TrafficCount::Category::ReplayDeltaRequest},
+    {protocol::mtREPLAY_DELTA_RESPONSE, TrafficCount::Category::ReplayDeltaResponse},
+    {protocol::mtHAVE_TRANSACTIONS, TrafficCount::Category::HaveTransactions},
+    {protocol::mtTRANSACTIONS, TrafficCount::Category::RequestedTransactions},
+    {protocol::mtSQUELCH, TrafficCount::Category::Squelch},
 };
 
-TrafficCount::category
+TrafficCount::Category
 TrafficCount::categorize(
     ::google::protobuf::Message const& message,
     protocol::MessageType type,
     bool inbound)
 {
-    if (auto item = type_lookup.find(type); item != type_lookup.end())
+    if (auto item = kTYPE_LOOKUP.find(type); item != kTYPE_LOOKUP.end())
         return item->second;
 
     if (type == protocol::mtHAVE_SET)
-        return inbound ? TrafficCount::category::get_set : TrafficCount::category::share_set;
+        return inbound ? TrafficCount::Category::GetSet : TrafficCount::Category::ShareSet;
 
     if (auto msg = dynamic_cast<protocol::TMLedgerData const*>(&message))
     {
         if (msg->type() == protocol::liTS_CANDIDATE)
         {
-            return (inbound && !msg->has_requestcookie()) ? TrafficCount::category::ld_tsc_get
-                                                          : TrafficCount::category::ld_tsc_share;
+            return (inbound && !msg->has_requestcookie()) ? TrafficCount::Category::LdTscGet
+                                                          : TrafficCount::Category::LdTscShare;
         }
 
         if (msg->type() == protocol::liTX_NODE)
         {
-            return (inbound && !msg->has_requestcookie()) ? TrafficCount::category::ld_txn_get
-                                                          : TrafficCount::category::ld_txn_share;
+            return (inbound && !msg->has_requestcookie()) ? TrafficCount::Category::LdTxnGet
+                                                          : TrafficCount::Category::LdTxnShare;
         }
 
         if (msg->type() == protocol::liAS_NODE)
         {
-            return (inbound && !msg->has_requestcookie()) ? TrafficCount::category::ld_asn_get
-                                                          : TrafficCount::category::ld_asn_share;
+            return (inbound && !msg->has_requestcookie()) ? TrafficCount::Category::LdAsnGet
+                                                          : TrafficCount::Category::LdAsnShare;
         }
 
-        return (inbound && !msg->has_requestcookie()) ? TrafficCount::category::ld_get
-                                                      : TrafficCount::category::ld_share;
+        return (inbound && !msg->has_requestcookie()) ? TrafficCount::Category::LdGet
+                                                      : TrafficCount::Category::LdShare;
     }
 
     if (auto msg = dynamic_cast<protocol::TMGetLedger const*>(&message))
     {
         if (msg->itype() == protocol::liTS_CANDIDATE)
         {
-            return (inbound || msg->has_requestcookie()) ? TrafficCount::category::gl_tsc_share
-                                                         : TrafficCount::category::gl_tsc_get;
+            return (inbound || msg->has_requestcookie()) ? TrafficCount::Category::GlTscShare
+                                                         : TrafficCount::Category::GlTscGet;
         }
 
         if (msg->itype() == protocol::liTX_NODE)
         {
-            return (inbound || msg->has_requestcookie()) ? TrafficCount::category::gl_txn_share
-                                                         : TrafficCount::category::gl_txn_get;
+            return (inbound || msg->has_requestcookie()) ? TrafficCount::Category::GlTxnShare
+                                                         : TrafficCount::Category::GlTxnGet;
         }
 
         if (msg->itype() == protocol::liAS_NODE)
         {
-            return (inbound || msg->has_requestcookie()) ? TrafficCount::category::gl_asn_share
-                                                         : TrafficCount::category::gl_asn_get;
+            return (inbound || msg->has_requestcookie()) ? TrafficCount::Category::GlAsnShare
+                                                         : TrafficCount::Category::GlAsnGet;
         }
 
-        return (inbound || msg->has_requestcookie()) ? TrafficCount::category::gl_share
-                                                     : TrafficCount::category::gl_get;
+        return (inbound || msg->has_requestcookie()) ? TrafficCount::Category::GlShare
+                                                     : TrafficCount::Category::GlGet;
     }
 
     if (auto msg = dynamic_cast<protocol::TMGetObjectByHash const*>(&message))
     {
         if (msg->type() == protocol::TMGetObjectByHash::otLEDGER)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_hash_ledger
-                                             : TrafficCount::category::get_hash_ledger;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareHashLedger
+                                             : TrafficCount::Category::GetHashLedger;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otTRANSACTION)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_hash_tx
-                                             : TrafficCount::category::get_hash_tx;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareHashTx
+                                             : TrafficCount::Category::GetHashTx;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otTRANSACTION_NODE)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_hash_txnode
-                                             : TrafficCount::category::get_hash_txnode;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareHashTxnode
+                                             : TrafficCount::Category::GetHashTxnode;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otSTATE_NODE)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_hash_asnode
-                                             : TrafficCount::category::get_hash_asnode;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareHashAsnode
+                                             : TrafficCount::Category::GetHashAsnode;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otCAS_OBJECT)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_cas_object
-                                             : TrafficCount::category::get_cas_object;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareCasObject
+                                             : TrafficCount::Category::GetCasObject;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otFETCH_PACK)
         {
-            return (msg->query() == inbound) ? TrafficCount::category::share_fetch_pack
-                                             : TrafficCount::category::get_fetch_pack;
+            return (msg->query() == inbound) ? TrafficCount::Category::ShareFetchPack
+                                             : TrafficCount::Category::GetFetchPack;
         }
 
         if (msg->type() == protocol::TMGetObjectByHash::otTRANSACTIONS)
-            return TrafficCount::category::get_transactions;
+            return TrafficCount::Category::GetTransactions;
 
-        return (msg->query() == inbound) ? TrafficCount::category::share_hash
-                                         : TrafficCount::category::get_hash;
+        return (msg->query() == inbound) ? TrafficCount::Category::ShareHash
+                                         : TrafficCount::Category::GetHash;
     }
 
-    return TrafficCount::category::unknown;
+    return TrafficCount::Category::Unknown;
 }
 }  // namespace xrpl
diff --git a/src/xrpld/overlay/detail/TrafficCount.h b/src/xrpld/overlay/detail/TrafficCount.h
index 8597ca897c..233f06b70f 100644
--- a/src/xrpld/overlay/detail/TrafficCount.h
+++ b/src/xrpld/overlay/detail/TrafficCount.h
@@ -29,7 +29,7 @@ namespace xrpl {
 class TrafficCount
 {
 public:
-    enum class category : std::size_t;
+    enum class Category : std::size_t;
 
     class TrafficStats
     {
@@ -41,7 +41,7 @@ public:
         std::atomic<std::uint64_t> messagesIn{0};
         std::atomic<std::uint64_t> messagesOut{0};
 
-        TrafficStats(TrafficCount::category cat) : name(TrafficCount::to_string(cat))
+        TrafficStats(TrafficCount::Category cat) : name(TrafficCount::toString(cat))
         {
         }
 
@@ -63,126 +63,126 @@ public:
     // If you add entries to this enum, you need to update the initialization
     // of the arrays at the bottom of this file which map array numbers to
     // human-readable, monitoring-tool friendly names.
-    enum class category : std::size_t {
-        base,  // basic peer overhead, must be first
+    enum class Category : std::size_t {
+        Base,  // basic peer overhead, must be first
 
-        cluster,    // cluster overhead
-        overlay,    // overlay management
-        manifests,  // manifest management
+        Cluster,    // cluster overhead
+        Overlay,    // overlay management
+        Manifests,  // manifest management
 
-        transaction,  // transaction messages
+        Transaction,  // transaction messages
         // The following categories breakdown transaction message type
-        transaction_duplicate,  // duplicate transaction messages
+        TransactionDuplicate,  // duplicate transaction messages
 
-        proposal,  // proposal messages
+        Proposal,  // proposal messages
         // The following categories breakdown proposal message type
-        proposal_untrusted,  // proposals from untrusted validators
-        proposal_duplicate,  // proposals seen previously
+        ProposalUntrusted,  // proposals from untrusted validators
+        ProposalDuplicate,  // proposals seen previously
 
-        validation,  // validation messages
+        Validation,  // validation messages
         // The following categories breakdown validation message type
-        validation_untrusted,  // validations from untrusted validators
-        validation_duplicate,  // validations seen previously
+        ValidationUntrusted,  // validations from untrusted validators
+        ValidationDuplicate,  // validations seen previously
 
-        validatorlist,
+        Validatorlist,
 
-        squelch,
-        squelch_suppressed,  // egress traffic amount suppressed by squelching
-        squelch_ignored,     // the traffic amount that came from peers ignoring
-                             // squelch messages
+        Squelch,
+        SquelchSuppressed,  // egress traffic amount suppressed by squelching
+        SquelchIgnored,     // the traffic amount that came from peers ignoring
+                            // squelch messages
 
         // TMHaveSet message:
-        get_set,    // transaction sets we try to get
-        share_set,  // transaction sets we get
+        GetSet,    // transaction sets we try to get
+        ShareSet,  // transaction sets we get
 
         // TMLedgerData: transaction set candidate
-        ld_tsc_get,
-        ld_tsc_share,
+        LdTscGet,
+        LdTscShare,
 
         // TMLedgerData: transaction node
-        ld_txn_get,
-        ld_txn_share,
+        LdTxnGet,
+        LdTxnShare,
 
         // TMLedgerData: account state node
-        ld_asn_get,
-        ld_asn_share,
+        LdAsnGet,
+        LdAsnShare,
 
         // TMLedgerData: generic
-        ld_get,
-        ld_share,
+        LdGet,
+        LdShare,
 
         // TMGetLedger: transaction set candidate
-        gl_tsc_share,
-        gl_tsc_get,
+        GlTscShare,
+        GlTscGet,
 
         // TMGetLedger: transaction node
-        gl_txn_share,
-        gl_txn_get,
+        GlTxnShare,
+        GlTxnGet,
 
         // TMGetLedger: account state node
-        gl_asn_share,
-        gl_asn_get,
+        GlAsnShare,
+        GlAsnGet,
 
         // TMGetLedger: generic
-        gl_share,
-        gl_get,
+        GlShare,
+        GlGet,
 
         // TMGetObjectByHash:
-        share_hash_ledger,
-        get_hash_ledger,
+        ShareHashLedger,
+        GetHashLedger,
 
         // TMGetObjectByHash:
-        share_hash_tx,
-        get_hash_tx,
+        ShareHashTx,
+        GetHashTx,
 
         // TMGetObjectByHash: transaction node
-        share_hash_txnode,
-        get_hash_txnode,
+        ShareHashTxnode,
+        GetHashTxnode,
 
         // TMGetObjectByHash: account state node
-        share_hash_asnode,
-        get_hash_asnode,
+        ShareHashAsnode,
+        GetHashAsnode,
 
         // TMGetObjectByHash: CAS
-        share_cas_object,
-        get_cas_object,
+        ShareCasObject,
+        GetCasObject,
 
         // TMGetObjectByHash: fetch packs
-        share_fetch_pack,
-        get_fetch_pack,
+        ShareFetchPack,
+        GetFetchPack,
 
         // TMGetObjectByHash: transactions
-        get_transactions,
+        GetTransactions,
 
         // TMGetObjectByHash: generic
-        share_hash,
-        get_hash,
+        ShareHash,
+        GetHash,
 
         // TMProofPathRequest and TMProofPathResponse
-        proof_path_request,
-        proof_path_response,
+        ProofPathRequest,
+        ProofPathResponse,
 
         // TMReplayDeltaRequest and TMReplayDeltaResponse
-        replay_delta_request,
-        replay_delta_response,
+        ReplayDeltaRequest,
+        ReplayDeltaResponse,
 
         // TMHaveTransactions
-        have_transactions,
+        HaveTransactions,
 
         // TMTransactions
-        requested_transactions,
+        RequestedTransactions,
 
         // The total p2p bytes sent and received on the wire
-        total,
+        Total,
 
-        unknown  // must be last
+        Unknown  // must be last
     };
 
     TrafficCount() = default;
 
     /** Given a protocol message, determine which traffic category it belongs to
      */
-    static category
+    static Category
     categorize(
         ::google::protobuf::Message const& message,
         protocol::MessageType type,
@@ -190,11 +190,10 @@ public:
 
     /** Account for traffic associated with the given category */
     void
-    addCount(category cat, bool inbound, int bytes)
+    addCount(Category cat, bool inbound, int bytes)
     {
         XRPL_ASSERT(
-            static_cast<std::size_t>(cat) <= static_cast<std::size_t>(category::unknown),
-            "xrpl::TrafficCount::addCount : valid category input");
+            cat <= Category::Unknown, "xrpl::TrafficCount::addCount : valid category input");
 
         auto it = counts_.find(cat);
 
@@ -225,131 +224,131 @@ public:
     }
 
     static std::string
-    to_string(category cat)
+    toString(Category cat)
     {
-        static std::unordered_map<category, std::string> const category_map = {
-            {category::base, "overhead"},
-            {category::cluster, "overhead_cluster"},
-            {category::overlay, "overhead_overlay"},
-            {category::manifests, "overhead_manifest"},
-            {category::transaction, "transactions"},
-            {category::transaction_duplicate, "transactions_duplicate"},
-            {category::proposal, "proposals"},
-            {category::proposal_untrusted, "proposals_untrusted"},
-            {category::proposal_duplicate, "proposals_duplicate"},
-            {category::validation, "validations"},
-            {category::validation_untrusted, "validations_untrusted"},
-            {category::validation_duplicate, "validations_duplicate"},
-            {category::validatorlist, "validator_lists"},
-            {category::squelch, "squelch"},
-            {category::squelch_suppressed, "squelch_suppressed"},
-            {category::squelch_ignored, "squelch_ignored"},
-            {category::get_set, "set_get"},
-            {category::share_set, "set_share"},
-            {category::ld_tsc_get, "ledger_data_Transaction_Set_candidate_get"},
-            {category::ld_tsc_share, "ledger_data_Transaction_Set_candidate_share"},
-            {category::ld_txn_get, "ledger_data_Transaction_Node_get"},
-            {category::ld_txn_share, "ledger_data_Transaction_Node_share"},
-            {category::ld_asn_get, "ledger_data_Account_State_Node_get"},
-            {category::ld_asn_share, "ledger_data_Account_State_Node_share"},
-            {category::ld_get, "ledger_data_get"},
-            {category::ld_share, "ledger_data_share"},
-            {category::gl_tsc_share, "ledger_Transaction_Set_candidate_share"},
-            {category::gl_tsc_get, "ledger_Transaction_Set_candidate_get"},
-            {category::gl_txn_share, "ledger_Transaction_node_share"},
-            {category::gl_txn_get, "ledger_Transaction_node_get"},
-            {category::gl_asn_share, "ledger_Account_State_node_share"},
-            {category::gl_asn_get, "ledger_Account_State_node_get"},
-            {category::gl_share, "ledger_share"},
-            {category::gl_get, "ledger_get"},
-            {category::share_hash_ledger, "getobject_Ledger_share"},
-            {category::get_hash_ledger, "getobject_Ledger_get"},
-            {category::share_hash_tx, "getobject_Transaction_share"},
-            {category::get_hash_tx, "getobject_Transaction_get"},
-            {category::share_hash_txnode, "getobject_Transaction_node_share"},
-            {category::get_hash_txnode, "getobject_Transaction_node_get"},
-            {category::share_hash_asnode, "getobject_Account_State_node_share"},
-            {category::get_hash_asnode, "getobject_Account_State_node_get"},
-            {category::share_cas_object, "getobject_CAS_share"},
-            {category::get_cas_object, "getobject_CAS_get"},
-            {category::share_fetch_pack, "getobject_Fetch_Pack_share"},
-            {category::get_fetch_pack, "getobject_Fetch Pack_get"},
-            {category::get_transactions, "getobject_Transactions_get"},
-            {category::share_hash, "getobject_share"},
-            {category::get_hash, "getobject_get"},
-            {category::proof_path_request, "proof_path_request"},
-            {category::proof_path_response, "proof_path_response"},
-            {category::replay_delta_request, "replay_delta_request"},
-            {category::replay_delta_response, "replay_delta_response"},
-            {category::have_transactions, "have_transactions"},
-            {category::requested_transactions, "requested_transactions"},
-            {category::total, "total"}};
+        static std::unordered_map<Category, std::string> const kCATEGORY_MAP = {
+            {Category::Base, "overhead"},
+            {Category::Cluster, "overhead_cluster"},
+            {Category::Overlay, "overhead_overlay"},
+            {Category::Manifests, "overhead_manifest"},
+            {Category::Transaction, "transactions"},
+            {Category::TransactionDuplicate, "transactions_duplicate"},
+            {Category::Proposal, "proposals"},
+            {Category::ProposalUntrusted, "proposals_untrusted"},
+            {Category::ProposalDuplicate, "proposals_duplicate"},
+            {Category::Validation, "validations"},
+            {Category::ValidationUntrusted, "validations_untrusted"},
+            {Category::ValidationDuplicate, "validations_duplicate"},
+            {Category::Validatorlist, "validator_lists"},
+            {Category::Squelch, "squelch"},
+            {Category::SquelchSuppressed, "squelch_suppressed"},
+            {Category::SquelchIgnored, "squelch_ignored"},
+            {Category::GetSet, "set_get"},
+            {Category::ShareSet, "set_share"},
+            {Category::LdTscGet, "ledger_data_Transaction_Set_candidate_get"},
+            {Category::LdTscShare, "ledger_data_Transaction_Set_candidate_share"},
+            {Category::LdTxnGet, "ledger_data_Transaction_Node_get"},
+            {Category::LdTxnShare, "ledger_data_Transaction_Node_share"},
+            {Category::LdAsnGet, "ledger_data_Account_State_Node_get"},
+            {Category::LdAsnShare, "ledger_data_Account_State_Node_share"},
+            {Category::LdGet, "ledger_data_get"},
+            {Category::LdShare, "ledger_data_share"},
+            {Category::GlTscShare, "ledger_Transaction_Set_candidate_share"},
+            {Category::GlTscGet, "ledger_Transaction_Set_candidate_get"},
+            {Category::GlTxnShare, "ledger_Transaction_node_share"},
+            {Category::GlTxnGet, "ledger_Transaction_node_get"},
+            {Category::GlAsnShare, "ledger_Account_State_node_share"},
+            {Category::GlAsnGet, "ledger_Account_State_node_get"},
+            {Category::GlShare, "ledger_share"},
+            {Category::GlGet, "ledger_get"},
+            {Category::ShareHashLedger, "getobject_Ledger_share"},
+            {Category::GetHashLedger, "getobject_Ledger_get"},
+            {Category::ShareHashTx, "getobject_Transaction_share"},
+            {Category::GetHashTx, "getobject_Transaction_get"},
+            {Category::ShareHashTxnode, "getobject_Transaction_node_share"},
+            {Category::GetHashTxnode, "getobject_Transaction_node_get"},
+            {Category::ShareHashAsnode, "getobject_Account_State_node_share"},
+            {Category::GetHashAsnode, "getobject_Account_State_node_get"},
+            {Category::ShareCasObject, "getobject_CAS_share"},
+            {Category::GetCasObject, "getobject_CAS_get"},
+            {Category::ShareFetchPack, "getobject_Fetch_Pack_share"},
+            {Category::GetFetchPack, "getobject_Fetch Pack_get"},
+            {Category::GetTransactions, "getobject_Transactions_get"},
+            {Category::ShareHash, "getobject_share"},
+            {Category::GetHash, "getobject_get"},
+            {Category::ProofPathRequest, "proof_path_request"},
+            {Category::ProofPathResponse, "proof_path_response"},
+            {Category::ReplayDeltaRequest, "replay_delta_request"},
+            {Category::ReplayDeltaResponse, "replay_delta_response"},
+            {Category::HaveTransactions, "have_transactions"},
+            {Category::RequestedTransactions, "requested_transactions"},
+            {Category::Total, "total"}};
 
-        if (auto it = category_map.find(cat); it != category_map.end())
+        if (auto it = kCATEGORY_MAP.find(cat); it != kCATEGORY_MAP.end())
             return it->second;
 
         return "unknown";
     }
 
 protected:
-    std::unordered_map<category, TrafficStats> counts_{
-        {category::base, {category::base}},
-        {category::cluster, {category::cluster}},
-        {category::overlay, {category::overlay}},
-        {category::manifests, {category::manifests}},
-        {category::transaction, {category::transaction}},
-        {category::transaction_duplicate, {category::transaction_duplicate}},
-        {category::proposal, {category::proposal}},
-        {category::proposal_untrusted, {category::proposal_untrusted}},
-        {category::proposal_duplicate, {category::proposal_duplicate}},
-        {category::validation, {category::validation}},
-        {category::validation_untrusted, {category::validation_untrusted}},
-        {category::validation_duplicate, {category::validation_duplicate}},
-        {category::validatorlist, {category::validatorlist}},
-        {category::squelch, {category::squelch}},
-        {category::squelch_suppressed, {category::squelch_suppressed}},
-        {category::squelch_ignored, {category::squelch_ignored}},
-        {category::get_set, {category::get_set}},
-        {category::share_set, {category::share_set}},
-        {category::ld_tsc_get, {category::ld_tsc_get}},
-        {category::ld_tsc_share, {category::ld_tsc_share}},
-        {category::ld_txn_get, {category::ld_txn_get}},
-        {category::ld_txn_share, {category::ld_txn_share}},
-        {category::ld_asn_get, {category::ld_asn_get}},
-        {category::ld_asn_share, {category::ld_asn_share}},
-        {category::ld_get, {category::ld_get}},
-        {category::ld_share, {category::ld_share}},
-        {category::gl_tsc_share, {category::gl_tsc_share}},
-        {category::gl_tsc_get, {category::gl_tsc_get}},
-        {category::gl_txn_share, {category::gl_txn_share}},
-        {category::gl_txn_get, {category::gl_txn_get}},
-        {category::gl_asn_share, {category::gl_asn_share}},
-        {category::gl_asn_get, {category::gl_asn_get}},
-        {category::gl_share, {category::gl_share}},
-        {category::gl_get, {category::gl_get}},
-        {category::share_hash_ledger, {category::share_hash_ledger}},
-        {category::get_hash_ledger, {category::get_hash_ledger}},
-        {category::share_hash_tx, {category::share_hash_tx}},
-        {category::get_hash_tx, {category::get_hash_tx}},
-        {category::share_hash_txnode, {category::share_hash_txnode}},
-        {category::get_hash_txnode, {category::get_hash_txnode}},
-        {category::share_hash_asnode, {category::share_hash_asnode}},
-        {category::get_hash_asnode, {category::get_hash_asnode}},
-        {category::share_cas_object, {category::share_cas_object}},
-        {category::get_cas_object, {category::get_cas_object}},
-        {category::share_fetch_pack, {category::share_fetch_pack}},
-        {category::get_fetch_pack, {category::get_fetch_pack}},
-        {category::get_transactions, {category::get_transactions}},
-        {category::share_hash, {category::share_hash}},
-        {category::get_hash, {category::get_hash}},
-        {category::proof_path_request, {category::proof_path_request}},
-        {category::proof_path_response, {category::proof_path_response}},
-        {category::replay_delta_request, {category::replay_delta_request}},
-        {category::replay_delta_response, {category::replay_delta_response}},
-        {category::have_transactions, {category::have_transactions}},
-        {category::requested_transactions, {category::requested_transactions}},
-        {category::total, {category::total}},
-        {category::unknown, {category::unknown}},
+    std::unordered_map<Category, TrafficStats> counts_{
+        {Category::Base, {Category::Base}},
+        {Category::Cluster, {Category::Cluster}},
+        {Category::Overlay, {Category::Overlay}},
+        {Category::Manifests, {Category::Manifests}},
+        {Category::Transaction, {Category::Transaction}},
+        {Category::TransactionDuplicate, {Category::TransactionDuplicate}},
+        {Category::Proposal, {Category::Proposal}},
+        {Category::ProposalUntrusted, {Category::ProposalUntrusted}},
+        {Category::ProposalDuplicate, {Category::ProposalDuplicate}},
+        {Category::Validation, {Category::Validation}},
+        {Category::ValidationUntrusted, {Category::ValidationUntrusted}},
+        {Category::ValidationDuplicate, {Category::ValidationDuplicate}},
+        {Category::Validatorlist, {Category::Validatorlist}},
+        {Category::Squelch, {Category::Squelch}},
+        {Category::SquelchSuppressed, {Category::SquelchSuppressed}},
+        {Category::SquelchIgnored, {Category::SquelchIgnored}},
+        {Category::GetSet, {Category::GetSet}},
+        {Category::ShareSet, {Category::ShareSet}},
+        {Category::LdTscGet, {Category::LdTscGet}},
+        {Category::LdTscShare, {Category::LdTscShare}},
+        {Category::LdTxnGet, {Category::LdTxnGet}},
+        {Category::LdTxnShare, {Category::LdTxnShare}},
+        {Category::LdAsnGet, {Category::LdAsnGet}},
+        {Category::LdAsnShare, {Category::LdAsnShare}},
+        {Category::LdGet, {Category::LdGet}},
+        {Category::LdShare, {Category::LdShare}},
+        {Category::GlTscShare, {Category::GlTscShare}},
+        {Category::GlTscGet, {Category::GlTscGet}},
+        {Category::GlTxnShare, {Category::GlTxnShare}},
+        {Category::GlTxnGet, {Category::GlTxnGet}},
+        {Category::GlAsnShare, {Category::GlAsnShare}},
+        {Category::GlAsnGet, {Category::GlAsnGet}},
+        {Category::GlShare, {Category::GlShare}},
+        {Category::GlGet, {Category::GlGet}},
+        {Category::ShareHashLedger, {Category::ShareHashLedger}},
+        {Category::GetHashLedger, {Category::GetHashLedger}},
+        {Category::ShareHashTx, {Category::ShareHashTx}},
+        {Category::GetHashTx, {Category::GetHashTx}},
+        {Category::ShareHashTxnode, {Category::ShareHashTxnode}},
+        {Category::GetHashTxnode, {Category::GetHashTxnode}},
+        {Category::ShareHashAsnode, {Category::ShareHashAsnode}},
+        {Category::GetHashAsnode, {Category::GetHashAsnode}},
+        {Category::ShareCasObject, {Category::ShareCasObject}},
+        {Category::GetCasObject, {Category::GetCasObject}},
+        {Category::ShareFetchPack, {Category::ShareFetchPack}},
+        {Category::GetFetchPack, {Category::GetFetchPack}},
+        {Category::GetTransactions, {Category::GetTransactions}},
+        {Category::ShareHash, {Category::ShareHash}},
+        {Category::GetHash, {Category::GetHash}},
+        {Category::ProofPathRequest, {Category::ProofPathRequest}},
+        {Category::ProofPathResponse, {Category::ProofPathResponse}},
+        {Category::ReplayDeltaRequest, {Category::ReplayDeltaRequest}},
+        {Category::ReplayDeltaResponse, {Category::ReplayDeltaResponse}},
+        {Category::HaveTransactions, {Category::HaveTransactions}},
+        {Category::RequestedTransactions, {Category::RequestedTransactions}},
+        {Category::Total, {Category::Total}},
+        {Category::Unknown, {Category::Unknown}},
     };
 };
 
diff --git a/src/xrpld/overlay/detail/Tuning.h b/src/xrpld/overlay/detail/Tuning.h
index 07cf2d2238..c54fa24498 100644
--- a/src/xrpld/overlay/detail/Tuning.h
+++ b/src/xrpld/overlay/detail/Tuning.h
@@ -9,39 +9,39 @@ namespace xrpl::Tuning {
 enum {
     /** How many ledgers off a server can be and we will
         still consider it converged */
-    convergedLedgerLimit = 24,
+    ConvergedLedgerLimit = 24,
 
     /** How many ledgers off a server has to be before we
         consider it diverged */
-    divergedLedgerLimit = 128,
+    DivergedLedgerLimit = 128,
 
     /** The soft cap on the number of ledger entries in a single reply. */
-    softMaxReplyNodes = 8192,
+    SoftMaxReplyNodes = 8192,
 
     /** The hard cap on the number of ledger entries in a single reply. */
-    hardMaxReplyNodes = 12288,
+    HardMaxReplyNodes = 12288,
 
     /** How many timer intervals a sendq has to stay large before we disconnect
      */
-    sendqIntervals = 4,
+    SendqIntervals = 4,
 
     /** How many messages on a send queue before we refuse queries */
-    dropSendQueue = 192,
+    DropSendQueue = 192,
 
     /** How many messages we consider reasonable sustained on a send queue */
-    targetSendQueue = 128,
+    TargetSendQueue = 128,
 
     /** How often to log send queue size */
-    sendQueueLogFreq = 64,
+    SendQueueLogFreq = 64,
 
     /** How often we check for idle peers (seconds) */
-    checkIdlePeers = 4,
+    CheckIdlePeers = 4,
 
     /** The maximum number of levels to search */
-    maxQueryDepth = 3,
+    MaxQueryDepth = 3,
 };
 
 /** Size of buffer used to read from the socket. */
-std::size_t constexpr readBufferBytes = 16384;
+std::size_t constexpr kREAD_BUFFER_BYTES = 16384;
 
 }  // namespace xrpl::Tuning
diff --git a/src/xrpld/overlay/detail/TxMetrics.cpp b/src/xrpld/overlay/detail/TxMetrics.cpp
index 2bcf5f2f2f..c1a336b11e 100644
--- a/src/xrpld/overlay/detail/TxMetrics.cpp
+++ b/src/xrpld/overlay/detail/TxMetrics.cpp
@@ -96,12 +96,12 @@ SingleMetrics::addMetrics(std::uint32_t val)
     }
 }
 
-Json::Value
+json::Value
 TxMetrics::json() const
 {
     std::scoped_lock const l(mutex);
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret[jss::txr_tx_cnt] = std::to_string(tx.m1.rollingAvg);
     ret[jss::txr_tx_sz] = std::to_string(tx.m2.rollingAvg);
diff --git a/src/xrpld/overlay/detail/TxMetrics.h b/src/xrpld/overlay/detail/TxMetrics.h
index a5aea854cc..7b8b4bae1b 100644
--- a/src/xrpld/overlay/detail/TxMetrics.h
+++ b/src/xrpld/overlay/detail/TxMetrics.h
@@ -105,7 +105,7 @@ struct TxMetrics
     /** Get json representation of the metrics
        @return json object
      */
-    Json::Value
+    json::Value
     json() const;
 };
 
diff --git a/src/xrpld/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h
index 936d3abc0f..94d1110f4b 100644
--- a/src/xrpld/overlay/make_Overlay.h
+++ b/src/xrpld/overlay/make_Overlay.h
@@ -10,17 +10,17 @@
 namespace xrpl {
 
 Overlay::Setup
-setup_Overlay(BasicConfig const& config);
+setupOverlay(BasicConfig const& config);
 
 /** Creates the implementation of Overlay. */
 std::unique_ptr<Overlay>
-make_Overlay(
+makeOverlay(
     Application& app,
     Overlay::Setup const& setup,
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector);
 
diff --git a/src/xrpld/overlay/predicates.h b/src/xrpld/overlay/predicates.h
index e0b4a626ec..d7c2add937 100644
--- a/src/xrpld/overlay/predicates.h
+++ b/src/xrpld/overlay/predicates.h
@@ -8,13 +8,13 @@
 namespace xrpl {
 
 /** Sends a message to all peers */
-struct send_always
+struct SendAlways
 {
     using return_type = void;
 
     std::shared_ptr<Message> const& msg;
 
-    send_always(std::shared_ptr<Message> const& m) : msg(m)
+    SendAlways(std::shared_ptr<Message> const& m) : msg(m)
     {
     }
 
@@ -29,14 +29,14 @@ struct send_always
 
 /** Sends a message to match peers */
 template <typename Predicate>
-struct send_if_pred
+struct SendIfPred
 {
     using return_type = void;
 
     std::shared_ptr<Message> const& msg;
     Predicate const& predicate;
 
-    send_if_pred(std::shared_ptr<Message> const& m, Predicate const& p) : msg(m), predicate(p)
+    SendIfPred(std::shared_ptr<Message> const& m, Predicate const& p) : msg(m), predicate(p)
     {
     }
 
@@ -50,24 +50,24 @@ struct send_if_pred
 
 /** Helper function to aid in type deduction */
 template <typename Predicate>
-send_if_pred<Predicate>
-send_if(std::shared_ptr<Message> const& m, Predicate const& f)
+SendIfPred<Predicate>
+sendIf(std::shared_ptr<Message> const& m, Predicate const& f)
 {
-    return send_if_pred<Predicate>(m, f);
+    return SendIfPred<Predicate>(m, f);
 }
 
 //------------------------------------------------------------------------------
 
 /** Sends a message to non-matching peers */
 template <typename Predicate>
-struct send_if_not_pred
+struct SendIfNotPred
 {
     using return_type = void;
 
     std::shared_ptr<Message> const& msg;
     Predicate const& predicate;
 
-    send_if_not_pred(std::shared_ptr<Message> const& m, Predicate const& p) : msg(m), predicate(p)
+    SendIfNotPred(std::shared_ptr<Message> const& m, Predicate const& p) : msg(m), predicate(p)
     {
     }
 
@@ -81,20 +81,20 @@ struct send_if_not_pred
 
 /** Helper function to aid in type deduction */
 template <typename Predicate>
-send_if_not_pred<Predicate>
-send_if_not(std::shared_ptr<Message> const& m, Predicate const& f)
+SendIfNotPred<Predicate>
+sendIfNot(std::shared_ptr<Message> const& m, Predicate const& f)
 {
-    return send_if_not_pred<Predicate>(m, f);
+    return SendIfNotPred<Predicate>(m, f);
 }
 
 //------------------------------------------------------------------------------
 
 /** Select the specific peer */
-struct match_peer
+struct MatchPeer
 {
     Peer const* matchPeer;
 
-    match_peer(Peer const* match = nullptr) : matchPeer(match)
+    MatchPeer(Peer const* match = nullptr) : matchPeer(match)
     {
     }
 
@@ -108,11 +108,11 @@ struct match_peer
 //------------------------------------------------------------------------------
 
 /** Select all peers (except optional excluded) that are in our cluster */
-struct peer_in_cluster
+struct PeerInCluster
 {
-    match_peer skipPeer;
+    MatchPeer skipPeer;
 
-    peer_in_cluster(Peer const* skip = nullptr) : skipPeer(skip)
+    PeerInCluster(Peer const* skip = nullptr) : skipPeer(skip)
     {
     }
 
@@ -132,11 +132,11 @@ struct peer_in_cluster
 //------------------------------------------------------------------------------
 
 /** Select all peers that are in the specified set */
-struct peer_in_set
+struct PeerInSet
 {
     std::set<Peer::id_t> const& peerSet;
 
-    peer_in_set(std::set<Peer::id_t> const& peers) : peerSet(peers)
+    PeerInSet(std::set<Peer::id_t> const& peers) : peerSet(peers)
     {
     }
 
diff --git a/src/xrpld/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h
index f5a7b044b5..072750efe7 100644
--- a/src/xrpld/peerfinder/PeerfinderManager.h
+++ b/src/xrpld/peerfinder/PeerfinderManager.h
@@ -13,7 +13,7 @@
 
 namespace xrpl::PeerFinder {
 
-using clock_type = beast::abstract_clock<std::chrono::steady_clock>;
+using clock_type = beast::AbstractClock<std::chrono::steady_clock>;
 
 /** Represents a set of addresses. */
 using IPAddresses = std::vector<beast::IP::Endpoint>;
@@ -27,7 +27,7 @@ struct Config
         This includes both inbound and outbound, but does not include
         fixed peers.
     */
-    std::size_t maxPeers{Tuning::defaultMaxPeers};
+    std::size_t maxPeers{Tuning::DefaultMaxPeers};
 
     /** The number of automatic outbound connections to maintain.
         Outbound connections are only maintained if autoConnect
@@ -101,7 +101,7 @@ struct Endpoint
 {
     Endpoint() = default;
 
-    Endpoint(beast::IP::Endpoint ep, std::uint32_t hops_);
+    Endpoint(beast::IP::Endpoint ep, std::uint32_t hops);
 
     std::uint32_t hops = 0;
     beast::IP::Endpoint address;
@@ -119,7 +119,7 @@ using Endpoints = std::vector<Endpoint>;
 //------------------------------------------------------------------------------
 
 /** Possible results from activating a slot. */
-enum class Result { inboundDisabled, duplicatePeer, ipLimitExceeded, full, success };
+enum class Result { InboundDisabled, DuplicatePeer, IpLimitExceeded, Full, Success };
 
 /**
  * @brief Converts a `Result` enum value to its string representation.
@@ -140,15 +140,15 @@ to_string(Result result) noexcept
 {
     switch (result)
     {
-        case Result::inboundDisabled:
+        case Result::InboundDisabled:
             return "inbound disabled";
-        case Result::duplicatePeer:
+        case Result::DuplicatePeer:
             return "peer already connected";
-        case Result::ipLimitExceeded:
+        case Result::IpLimitExceeded:
             return "ip limit exceeded";
-        case Result::full:
+        case Result::Full:
             return "slots full";
-        case Result::success:
+        case Result::Success:
             return "success";
     }
 
@@ -218,36 +218,36 @@ public:
         Usually this is because of a detected self-connection.
     */
     virtual std::pair<std::shared_ptr<Slot>, Result>
-    new_inbound_slot(
-        beast::IP::Endpoint const& local_endpoint,
-        beast::IP::Endpoint const& remote_endpoint) = 0;
+    newInboundSlot(
+        beast::IP::Endpoint const& localEndpoint,
+        beast::IP::Endpoint const& remoteEndpoint) = 0;
 
     /** Create a new outbound slot with the specified remote endpoint.
         If nullptr is returned, then the slot could not be assigned.
         Usually this is because of a duplicate connection.
     */
     virtual std::pair<std::shared_ptr<Slot>, Result>
-    new_outbound_slot(beast::IP::Endpoint const& remote_endpoint) = 0;
+    newOutboundSlot(beast::IP::Endpoint const& remoteEndpoint) = 0;
 
     /** Called when mtENDPOINTS is received. */
     virtual void
-    on_endpoints(std::shared_ptr<Slot> const& slot, Endpoints const& endpoints) = 0;
+    onEndpoints(std::shared_ptr<Slot> const& slot, Endpoints const& endpoints) = 0;
 
     /** Called when the slot is closed.
         This always happens when the socket is closed, unless the socket
         was canceled.
     */
     virtual void
-    on_closed(std::shared_ptr<Slot> const& slot) = 0;
+    onClosed(std::shared_ptr<Slot> const& slot) = 0;
 
     /** Called when an outbound connection is deemed to have failed */
     virtual void
-    on_failure(std::shared_ptr<Slot> const& slot) = 0;
+    onFailure(std::shared_ptr<Slot> const& slot) = 0;
 
     /** Called when we received redirect IPs from a busy peer. */
     virtual void
     onRedirects(
-        boost::asio::ip::tcp::endpoint const& remote_address,
+        boost::asio::ip::tcp::endpoint const& remoteAddress,
         std::vector<boost::asio::ip::tcp::endpoint> const& eps) = 0;
 
     //--------------------------------------------------------------------------
@@ -260,7 +260,7 @@ public:
         @return `true` if the connection should be kept
     */
     virtual bool
-    onConnected(std::shared_ptr<Slot> const& slot, beast::IP::Endpoint const& local_endpoint) = 0;
+    onConnected(std::shared_ptr<Slot> const& slot, beast::IP::Endpoint const& localEndpoint) = 0;
 
     /** Request an active slot type. */
     virtual Result
@@ -281,7 +281,7 @@ public:
         This should be called once per second.
     */
     virtual void
-    once_per_second() = 0;
+    oncePerSecond() = 0;
 };
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/Slot.h b/src/xrpld/peerfinder/Slot.h
index e67df7ee17..289252e3fa 100644
--- a/src/xrpld/peerfinder/Slot.h
+++ b/src/xrpld/peerfinder/Slot.h
@@ -13,7 +13,7 @@ class Slot
 public:
     using ptr = std::shared_ptr<Slot>;
 
-    enum class State { accept, connect, connected, active, closing };
+    enum class State { Accept, Connect, Connected, Active, Closing };
 
     virtual ~Slot() = 0;
 
@@ -41,20 +41,20 @@ public:
 
     /** The remote endpoint of socket. */
     [[nodiscard]] virtual beast::IP::Endpoint const&
-    remote_endpoint() const = 0;
+    remoteEndpoint() const = 0;
 
     /** The local endpoint of the socket, when known. */
     [[nodiscard]] virtual std::optional<beast::IP::Endpoint> const&
-    local_endpoint() const = 0;
+    localEndpoint() const = 0;
 
     [[nodiscard]] virtual std::optional<std::uint16_t>
-    listening_port() const = 0;
+    listeningPort() const = 0;
 
     /** The peer's public key, when known.
         The public key is established when the handshake is complete.
     */
     [[nodiscard]] virtual std::optional<PublicKey> const&
-    public_key() const = 0;
+    publicKey() const = 0;
 };
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp
index 7b26bc8d9a..140d0f01c6 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.cpp
+++ b/src/xrpld/peerfinder/detail/Bootcache.cpp
@@ -19,7 +19,7 @@
 namespace xrpl::PeerFinder {
 
 Bootcache::Bootcache(Store& store, clock_type& clock, beast::Journal journal)
-    : m_store(store), m_clock(clock), m_journal(journal), m_whenUpdate(m_clock.now())
+    : store_(store), clock_(clock), journal_(journal), whenUpdate_(clock_.now())
 
 {
 }
@@ -32,44 +32,44 @@ Bootcache::~Bootcache()
 bool
 Bootcache::empty() const
 {
-    return m_map.empty();
+    return map_.empty();
 }
 
 Bootcache::map_type::size_type
 Bootcache::size() const
 {
-    return m_map.size();
+    return map_.size();
 }
 
 Bootcache::const_iterator
 Bootcache::begin() const
 {
-    return const_iterator(m_map.right.begin());
+    return const_iterator(map_.right.begin());
 }
 
 Bootcache::const_iterator
 Bootcache::cbegin() const
 {
-    return const_iterator(m_map.right.begin());
+    return const_iterator(map_.right.begin());
 }
 
 Bootcache::const_iterator
 Bootcache::end() const
 {
-    return const_iterator(m_map.right.end());
+    return const_iterator(map_.right.end());
 }
 
 Bootcache::const_iterator
 Bootcache::cend() const
 {
-    return const_iterator(m_map.right.end());
+    return const_iterator(map_.right.end());
 }
 
 void
 Bootcache::clear()
 {
-    m_map.clear();
-    m_needsUpdate = true;
+    map_.clear();
+    needsUpdate_ = true;
 }
 
 //--------------------------------------------------------------------------
@@ -78,18 +78,18 @@ void
 Bootcache::load()
 {
     clear();
-    auto const n(m_store.load([this](beast::IP::Endpoint const& endpoint, int valence) {
-        auto const result(this->m_map.insert(value_type(endpoint, valence)));
+    auto const n(store_.load([this](beast::IP::Endpoint const& endpoint, int valence) {
+        auto const result(this->map_.insert(value_type(endpoint, valence)));
         if (!result.second)
         {
-            JLOG(this->m_journal.error()) << beast::leftw(18) << "Bootcache discard " << endpoint;
+            JLOG(this->journal_.error()) << beast::Leftw(18) << "Bootcache discard " << endpoint;
         }
     }));
 
     if (n > 0)
     {
-        JLOG(m_journal.info()) << beast::leftw(18) << "Bootcache loaded " << n
-                               << ((n > 1) ? " addresses" : " address");
+        JLOG(journal_.info()) << beast::Leftw(18) << "Bootcache loaded " << n
+                              << ((n > 1) ? " addresses" : " address");
         prune();
     }
 }
@@ -97,10 +97,10 @@ Bootcache::load()
 bool
 Bootcache::insert(beast::IP::Endpoint const& endpoint)
 {
-    auto const result(m_map.insert(value_type(endpoint, 0)));
+    auto const result(map_.insert(value_type(endpoint, 0)));
     if (result.second)
     {
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Bootcache insert " << endpoint;
+        JLOG(journal_.trace()) << beast::Leftw(18) << "Bootcache insert " << endpoint;
         prune();
         flagForUpdate();
     }
@@ -110,18 +110,18 @@ Bootcache::insert(beast::IP::Endpoint const& endpoint)
 bool
 Bootcache::insertStatic(beast::IP::Endpoint const& endpoint)
 {
-    auto result(m_map.insert(value_type(endpoint, staticValence)));
+    auto result(map_.insert(value_type(endpoint, kSTATIC_VALENCE)));
 
-    if (!result.second && (result.first->right.valence() < staticValence))
+    if (!result.second && (result.first->right.valence() < kSTATIC_VALENCE))
     {
         // An existing entry has too low a valence, replace it
-        m_map.erase(result.first);
-        result = m_map.insert(value_type(endpoint, staticValence));
+        map_.erase(result.first);
+        result = map_.insert(value_type(endpoint, kSTATIC_VALENCE));
     }
 
     if (result.second)
     {
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Bootcache insert " << endpoint;
+        JLOG(journal_.trace()) << beast::Leftw(18) << "Bootcache insert " << endpoint;
         prune();
         flagForUpdate();
     }
@@ -129,9 +129,9 @@ Bootcache::insertStatic(beast::IP::Endpoint const& endpoint)
 }
 
 void
-Bootcache::on_success(beast::IP::Endpoint const& endpoint)
+Bootcache::onSuccess(beast::IP::Endpoint const& endpoint)
 {
-    auto result(m_map.insert(value_type(endpoint, 1)));
+    auto result(map_.insert(value_type(endpoint, 1)));
     if (result.second)
     {
         prune();
@@ -141,21 +141,20 @@ Bootcache::on_success(beast::IP::Endpoint const& endpoint)
         Entry entry(result.first->right);
         entry.valence() = std::max(entry.valence(), 0);
         ++entry.valence();
-        m_map.erase(result.first);
-        result = m_map.insert(value_type(endpoint, entry));
+        map_.erase(result.first);
+        result = map_.insert(value_type(endpoint, entry));
         XRPL_ASSERT(result.second, "xrpl::PeerFinder::Bootcache::on_success : endpoint inserted");
     }
     Entry const& entry(result.first->right);
-    JLOG(m_journal.info()) << beast::leftw(18) << "Bootcache connect " << endpoint << " with "
-                           << entry.valence()
-                           << ((entry.valence() > 1) ? " successes" : " success");
+    JLOG(journal_.info()) << beast::Leftw(18) << "Bootcache connect " << endpoint << " with "
+                          << entry.valence() << ((entry.valence() > 1) ? " successes" : " success");
     flagForUpdate();
 }
 
 void
-Bootcache::on_failure(beast::IP::Endpoint const& endpoint)
+Bootcache::onFailure(beast::IP::Endpoint const& endpoint)
 {
-    auto result(m_map.insert(value_type(endpoint, -1)));
+    auto result(map_.insert(value_type(endpoint, -1)));
     if (result.second)
     {
         prune();
@@ -165,14 +164,14 @@ Bootcache::on_failure(beast::IP::Endpoint const& endpoint)
         Entry entry(result.first->right);
         entry.valence() = std::min(entry.valence(), 0);
         --entry.valence();
-        m_map.erase(result.first);
-        result = m_map.insert(value_type(endpoint, entry));
+        map_.erase(result.first);
+        result = map_.insert(value_type(endpoint, entry));
         XRPL_ASSERT(result.second, "xrpl::PeerFinder::Bootcache::on_failure : endpoint inserted");
     }
     Entry const& entry(result.first->right);
     auto const n(std::abs(entry.valence()));
-    JLOG(m_journal.debug()) << beast::leftw(18) << "Bootcache failed " << endpoint << " with " << n
-                            << ((n > 1) ? " attempts" : " attempt");
+    JLOG(journal_.debug()) << beast::Leftw(18) << "Bootcache failed " << endpoint << " with " << n
+                           << ((n > 1) ? " attempts" : " attempt");
     flagForUpdate();
 }
 
@@ -188,10 +187,10 @@ void
 Bootcache::onWrite(beast::PropertyStream::Map& map)
 {
     beast::PropertyStream::Set entries("entries", map);
-    for (auto iter = m_map.right.begin(); iter != m_map.right.end(); ++iter)
+    for (auto iter = map_.right.begin(); iter != map_.right.end(); ++iter)
     {
         beast::PropertyStream::Map entry(entries);
-        entry["endpoint"] = iter->get_left().to_string();
+        entry["endpoint"] = iter->get_left().toString();
         entry["valence"] = std::int32_t(iter->get_right().valence());
     }
 }
@@ -200,56 +199,55 @@ Bootcache::onWrite(beast::PropertyStream::Map& map)
 void
 Bootcache::prune()
 {
-    if (size() <= Tuning::bootcacheSize)
+    if (size() <= Tuning::BootcacheSize)
         return;
 
     // Calculate the amount to remove
-    auto count((size() * Tuning::bootcachePrunePercent) / 100);
+    auto count((size() * Tuning::BootcachePrunePercent) / 100);
     decltype(count) pruned(0);
 
     // Work backwards because bimap doesn't handle
     // erasing using a reverse iterator very well.
     //
-    for (auto iter(m_map.right.end()); count-- > 0 && iter != m_map.right.begin(); ++pruned)
+    for (auto iter(map_.right.end()); count-- > 0 && iter != map_.right.begin(); ++pruned)
     {
         --iter;
         beast::IP::Endpoint const& endpoint(iter->get_left());
         Entry const& entry(iter->get_right());
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Bootcache pruned" << endpoint
-                                << " at valence " << entry.valence();
-        iter = m_map.right.erase(iter);
+        JLOG(journal_.trace()) << beast::Leftw(18) << "Bootcache pruned" << endpoint
+                               << " at valence " << entry.valence();
+        iter = map_.right.erase(iter);
     }
 
-    JLOG(m_journal.debug()) << beast::leftw(18) << "Bootcache pruned " << pruned
-                            << " entries total";
+    JLOG(journal_.debug()) << beast::Leftw(18) << "Bootcache pruned " << pruned << " entries total";
 }
 
 // Updates the Store with the current set of entries if needed.
 void
 Bootcache::update()
 {
-    if (!m_needsUpdate)
+    if (!needsUpdate_)
         return;
     std::vector<Store::Entry> list;
-    list.reserve(m_map.size());
-    for (auto const& e : m_map)
+    list.reserve(map_.size());
+    for (auto const& e : map_)
     {
         Store::Entry se;
         se.endpoint = e.get_left();
         se.valence = e.get_right().valence();
         list.push_back(se);
     }
-    m_store.save(list);
+    store_.save(list);
     // Reset the flag and cooldown timer
-    m_needsUpdate = false;
-    m_whenUpdate = m_clock.now() + Tuning::bootcacheCooldownTime;
+    needsUpdate_ = false;
+    whenUpdate_ = clock_.now() + Tuning::kBOOTCACHE_COOLDOWN_TIME;
 }
 
 // Checks the clock and calls update if we are off the cooldown.
 void
 Bootcache::checkUpdate()
 {
-    if (m_needsUpdate && m_whenUpdate < m_clock.now())
+    if (needsUpdate_ && whenUpdate_ < clock_.now())
         update();
 }
 
@@ -257,7 +255,7 @@ Bootcache::checkUpdate()
 void
 Bootcache::flagForUpdate()
 {
-    m_needsUpdate = true;
+    needsUpdate_ = true;
     checkUpdate();
 }
 
diff --git a/src/xrpld/peerfinder/detail/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h
index 0fc0be33db..c061f37595 100644
--- a/src/xrpld/peerfinder/detail/Bootcache.h
+++ b/src/xrpld/peerfinder/detail/Bootcache.h
@@ -35,20 +35,20 @@ private:
     class Entry
     {
     public:
-        Entry(int valence) : m_valence(valence)
+        Entry(int valence) : valence_(valence)
         {
         }
 
         int&
         valence()
         {
-            return m_valence;
+            return valence_;
         }
 
         [[nodiscard]] int
         valence() const
         {
-            return m_valence;
+            return valence_;
         }
 
         friend bool
@@ -58,7 +58,7 @@ private:
         }
 
     private:
-        int m_valence;
+        int valence_;
     };
 
     using left_t = boost::bimaps::unordered_set_of<
@@ -84,20 +84,20 @@ private:
     };
 
 private:
-    map_type m_map;
+    map_type map_;
 
-    Store& m_store;
-    clock_type& m_clock;
-    beast::Journal m_journal;
+    Store& store_;
+    clock_type& clock_;
+    beast::Journal journal_;
 
     // Time after which we can update the database again
-    clock_type::time_point m_whenUpdate;
+    clock_type::time_point whenUpdate_;
 
     // Set to true when a database update is needed
-    bool m_needsUpdate{false};
+    bool needsUpdate_{false};
 
 public:
-    static constexpr int staticValence = 32;
+    static constexpr int kSTATIC_VALENCE = 32;
 
     using iterator = boost::transform_iterator<Transform, map_type::right_map::const_iterator>;
 
@@ -143,11 +143,11 @@ public:
 
     /** Called when an outbound connection handshake completes. */
     void
-    on_success(beast::IP::Endpoint const& endpoint);
+    onSuccess(beast::IP::Endpoint const& endpoint);
 
     /** Called when an outbound connection attempt fails to handshake. */
     void
-    on_failure(beast::IP::Endpoint const& endpoint);
+    onFailure(beast::IP::Endpoint const& endpoint);
 
     /** Stores the cache in the persistent database on a timer. */
     void
diff --git a/src/xrpld/peerfinder/detail/Checker.h b/src/xrpld/peerfinder/detail/Checker.h
index 820d030b23..8ab084830c 100644
--- a/src/xrpld/peerfinder/detail/Checker.h
+++ b/src/xrpld/peerfinder/detail/Checker.h
@@ -19,10 +19,10 @@ class Checker
 private:
     using error_code = boost::system::error_code;
 
-    struct basic_async_op : boost::intrusive::list_base_hook<
-                                boost::intrusive::link_mode<boost::intrusive::normal_link>>
+    struct BasicAsyncOp : boost::intrusive::list_base_hook<
+                              boost::intrusive::link_mode<boost::intrusive::normal_link>>
     {
-        virtual ~basic_async_op() = default;
+        virtual ~BasicAsyncOp() = default;
 
         virtual void
         stop() = 0;
@@ -32,42 +32,42 @@ private:
     };
 
     template <class Handler>
-    struct async_op : basic_async_op
+    struct AsyncOp : BasicAsyncOp
     {
         using socket_type = typename Protocol::socket;
         using endpoint_type = typename Protocol::endpoint;
 
-        Checker& checker_;
-        socket_type socket_;
-        Handler handler_;
+        Checker& checker;
+        socket_type socket;
+        Handler handler;
 
-        async_op(Checker& owner, boost::asio::io_context& io_context, Handler&& handler);
+        AsyncOp(Checker& owner, boost::asio::io_context& ioContext, Handler&& handler);
 
-        ~async_op() override
+        ~AsyncOp() override
         {
-            checker_.remove(*this);
+            checker.remove(*this);
         }
 
         void
         stop() override;
 
         void
-        operator()(error_code const& ec) override;
+        operator()(error_code const& ec) override;  // NOLINT(readability-identifier-naming)
     };
 
     //--------------------------------------------------------------------------
 
     using list_type = typename boost::intrusive::
-        make_list<basic_async_op, boost::intrusive::constant_time_size<true>>::type;
+        make_list<BasicAsyncOp, boost::intrusive::constant_time_size<true>>::type;
 
     std::mutex mutex_;
     std::condition_variable cond_;
-    boost::asio::io_context& io_context_;
+    boost::asio::io_context& ioContext_;
     list_type list_;
     bool stop_ = false;
 
 public:
-    explicit Checker(boost::asio::io_context& io_context);
+    explicit Checker(boost::asio::io_context& ioContext);
 
     /** Destroy the service.
         Any pending I/O operations will be canceled. This call blocks until
@@ -96,46 +96,47 @@ public:
     */
     template <class Handler>
     void
-    async_connect(beast::IP::Endpoint const& endpoint, Handler&& handler);
+    asyncConnect(beast::IP::Endpoint const& endpoint, Handler&& handler);
 
 private:
     void
-    remove(basic_async_op& op);
+    remove(BasicAsyncOp& op);
 };
 
 //------------------------------------------------------------------------------
 
 template <class Protocol>
 template <class Handler>
-Checker<Protocol>::async_op<Handler>::async_op(
+Checker<Protocol>::AsyncOp<Handler>::AsyncOp(
     Checker& owner,
-    boost::asio::io_context& io_context,
-    Handler&& handler)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
-    : checker_(owner), socket_(io_context), handler_(std::forward<Handler>(handler))
+    boost::asio::io_context& ioContext,
+    Handler&&
+        handler)  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved) -- forwarded in init
+    : checker(owner), socket(ioContext), handler(std::forward<Handler>(handler))
 {
 }
 
 template <class Protocol>
 template <class Handler>
 void
-Checker<Protocol>::async_op<Handler>::stop()
+Checker<Protocol>::AsyncOp<Handler>::stop()
 {
     error_code ec;
-    socket_.cancel(ec);
+    socket.cancel(ec);
 }
 
 template <class Protocol>
 template <class Handler>
 void
-Checker<Protocol>::async_op<Handler>::operator()(error_code const& ec)
+Checker<Protocol>::AsyncOp<Handler>::operator()(error_code const& ec)
 {
-    handler_(ec);
+    handler(ec);
 }
 
 //------------------------------------------------------------------------------
 
 template <class Protocol>
-Checker<Protocol>::Checker(boost::asio::io_context& io_context) : io_context_(io_context)
+Checker<Protocol>::Checker(boost::asio::io_context& ioContext) : ioContext_(ioContext)
 {
 }
 
@@ -170,22 +171,22 @@ Checker<Protocol>::wait()
 template <class Protocol>
 template <class Handler>
 void
-Checker<Protocol>::async_connect(beast::IP::Endpoint const& endpoint, Handler&& handler)
+Checker<Protocol>::asyncConnect(beast::IP::Endpoint const& endpoint, Handler&& handler)
 {
     auto const op =
-        std::make_shared<async_op<Handler>>(*this, io_context_, std::forward<Handler>(handler));
+        std::make_shared<AsyncOp<Handler>>(*this, ioContext_, std::forward<Handler>(handler));
     {
         std::scoped_lock const lock(mutex_);
         list_.push_back(*op);
     }
-    op->socket_.async_connect(
-        beast::IPAddressConversion::to_asio_endpoint(endpoint),
-        std::bind(&basic_async_op::operator(), op, std::placeholders::_1));
+    op->socket.async_connect(
+        beast::IPAddressConversion::toAsioEndpoint(endpoint),
+        std::bind(&BasicAsyncOp::operator(), op, std::placeholders::_1));
 }
 
 template <class Protocol>
 void
-Checker<Protocol>::remove(basic_async_op& op)
+Checker<Protocol>::remove(BasicAsyncOp& op)
 {
     std::scoped_lock const lock(mutex_);
     list_.erase(list_.iterator_to(op));
diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h
index 367caed54b..e859b09d21 100644
--- a/src/xrpld/peerfinder/detail/Counts.h
+++ b/src/xrpld/peerfinder/detail/Counts.h
@@ -31,66 +31,66 @@ public:
 
     /** Returns `true` if the slot can become active. */
     [[nodiscard]] bool
-    can_activate(Slot const& s) const
+    canActivate(Slot const& s) const
     {
         // Must be handshaked and in the right state
         XRPL_ASSERT(
-            s.state() == Slot::State::connected || s.state() == Slot::State::accept,
+            s.state() == Slot::State::Connected || s.state() == Slot::State::Accept,
             "xrpl::PeerFinder::Counts::can_activate : valid input state");
 
         if (s.fixed() || s.reserved())
             return true;
 
         if (s.inbound())
-            return m_in_active < m_in_max;
+            return in_active_ < in_max_;
 
-        return m_out_active < m_out_max;
+        return out_active_ < out_max_;
     }
 
     /** Returns the number of attempts needed to bring us to the max. */
     [[nodiscard]] std::size_t
-    attempts_needed() const
+    attemptsNeeded() const
     {
-        if (m_attempts >= Tuning::maxConnectAttempts)
+        if (attempts_ >= Tuning::MaxConnectAttempts)
             return 0;
-        return Tuning::maxConnectAttempts - m_attempts;
+        return Tuning::MaxConnectAttempts - attempts_;
     }
 
     /** Returns the number of outbound connection attempts. */
     [[nodiscard]] std::size_t
     attempts() const
     {
-        return m_attempts;
+        return attempts_;
     }
 
     /** Returns the total number of outbound slots. */
     [[nodiscard]] int
-    out_max() const
+    outMax() const
     {
-        return m_out_max;
+        return out_max_;
     }
 
     /** Returns the number of outbound peers assigned an open slot.
         Fixed peers do not count towards outbound slots used.
     */
     [[nodiscard]] int
-    out_active() const
+    outActive() const
     {
-        return m_out_active;
+        return out_active_;
     }
 
     /** Returns the number of fixed connections. */
     [[nodiscard]] std::size_t
     fixed() const
     {
-        return m_fixed;
+        return fixed_;
     }
 
     /** Returns the number of active fixed connections. */
     [[nodiscard]] std::size_t
-    fixed_active() const
+    fixedActive() const
     {
-        return m_fixed_active;
+        return fixed_active_;
     }
 
     //--------------------------------------------------------------------------
@@ -99,51 +99,51 @@ public:
     void
     onConfig(Config const& config)
     {
-        m_out_max = config.outPeers;
+        out_max_ = config.outPeers;
         if (config.wantIncoming)
-            m_in_max = config.inPeers;
+            in_max_ = config.inPeers;
     }
 
     /** Returns the number of accepted connections that haven't handshaked. */
     [[nodiscard]] int
     acceptCount() const
     {
-        return m_acceptCount;
+        return acceptCount_;
     }
 
     /** Returns the number of connection attempts currently active. */
     [[nodiscard]] int
     connectCount() const
     {
-        return m_attempts;
+        return attempts_;
     }
 
     /** Returns the number of connections that are gracefully closing. */
     [[nodiscard]] int
     closingCount() const
     {
-        return m_closingCount;
+        return closingCount_;
     }
 
     /** Returns the total number of inbound slots. */
     [[nodiscard]] int
-    in_max() const
+    inMax() const
     {
-        return m_in_max;
+        return in_max_;
     }
 
     /** Returns the number of inbound peers assigned an open slot. */
     [[nodiscard]] int
     inboundActive() const
     {
-        return m_in_active;
+        return in_active_;
     }
 
     /** Returns the total number of active peers excluding fixed peers. */
     [[nodiscard]] int
     totalActive() const
     {
-        return m_in_active + m_out_active;
+        return in_active_ + out_active_;
     }
 
     /** Returns the number of unused inbound slots.
@@ -152,8 +152,8 @@ public:
     [[nodiscard]] int
     inboundSlotsFree() const
     {
-        if (m_in_active < m_in_max)
-            return m_in_max - m_in_active;
+        if (in_active_ < in_max_)
+            return in_max_ - in_active_;
         return 0;
     }
 
@@ -163,8 +163,8 @@ public:
     [[nodiscard]] int
     outboundSlotsFree() const
     {
-        if (m_out_active < m_out_max)
-            return m_out_max - m_out_active;
+        if (out_active_ < out_max_)
+            return out_max_ - out_active_;
         return 0;
     }
 
@@ -181,7 +181,7 @@ public:
         //
         // Fixed peers do not count towards the active outgoing total.
 
-        return m_out_max <= 0;
+        return out_max_ <= 0;
     }
 
     /** Output statistics. */
@@ -191,20 +191,20 @@ public:
         map["accept"] = acceptCount();
         map["connect"] = connectCount();
         map["close"] = closingCount();
-        map["in"] << m_in_active << "/" << m_in_max;
-        map["out"] << m_out_active << "/" << m_out_max;
-        map["fixed"] = m_fixed_active;
-        map["reserved"] = m_reserved;
-        map["total"] = m_active;
+        map["in"] << in_active_ << "/" << in_max_;
+        map["out"] << out_active_ << "/" << out_max_;
+        map["fixed"] = fixed_active_;
+        map["reserved"] = reserved_;
+        map["total"] = active_;
     }
 
     /** Records the state for diagnostics. */
     [[nodiscard]] std::string
-    state_string() const
+    stateString() const
     {
         std::stringstream ss;
-        ss << m_out_active << "/" << m_out_max << " out, " << m_in_active << "/" << m_in_max
-           << " in, " << connectCount() << " connecting, " << closingCount() << " closing";
+        ss << out_active_ << "/" << out_max_ << " out, " << in_active_ << "/" << in_max_ << " in, "
+           << connectCount() << " connecting, " << closingCount() << " closing";
         return ss.str();
     }
 
@@ -227,53 +227,58 @@ private:
     }
 
     // Adjusts counts based on the specified slot, in the direction indicated.
-    // Using ++/-- instead of += on std::size_t counters avoids UBSan
-    // unsigned-integer-overflow from implicit conversion of -1 to SIZE_MAX.
-    // A decrement on a zero counter is a real bug that UBSan should catch.
+    //
+    // IMPORTANT: All std::size_t counters MUST be adjusted via adjustCounter()
+    // and NEVER via `+= n` where n = static_cast<int>(dir).  When dir is
+    // Decrement, n == -1; adding -1 to a std::size_t implicitly converts -1 to
+    // SIZE_MAX, which UBSan flags as unsigned-integer-overflow and masks real
+    // underflow bugs (decrementing a counter already at zero).  Plain int
+    // counters (acceptCount_, attempts_, closingCount_) are safe with += n.
     void
     adjust(Slot const& s, CountAdjustment const dir)
     {
+        int const n = static_cast<int>(dir);
         if (s.fixed())
-            adjustCounter(m_fixed, dir);
+            adjustCounter(fixed_, dir);
 
         if (s.reserved())
-            adjustCounter(m_reserved, dir);
+            adjustCounter(reserved_, dir);
 
         switch (s.state())
         {
-            case Slot::State::accept:
+            case Slot::State::Accept:
                 XRPL_ASSERT(s.inbound(), "xrpl::PeerFinder::Counts::adjust : input is inbound");
-                adjustCounter(m_acceptCount, dir);
+                acceptCount_ += n;
                 break;
 
-            case Slot::State::connect:
-            case Slot::State::connected:
+            case Slot::State::Connect:
+            case Slot::State::Connected:
                 XRPL_ASSERT(
                     !s.inbound(),
                     "xrpl::PeerFinder::Counts::adjust : input is not "
                     "inbound");
-                adjustCounter(m_attempts, dir);
+                attempts_ += n;
                 break;
 
-            case Slot::State::active:
+            case Slot::State::Active:
                 if (s.fixed())
-                    adjustCounter(m_fixed_active, dir);
+                    adjustCounter(fixed_active_, dir);
                 if (!s.fixed() && !s.reserved())
                 {
                     if (s.inbound())
                     {
-                        adjustCounter(m_in_active, dir);
+                        adjustCounter(in_active_, dir);
                     }
                     else
                     {
-                        adjustCounter(m_out_active, dir);
+                        adjustCounter(out_active_, dir);
                     }
                 }
-                adjustCounter(m_active, dir);
+                adjustCounter(active_, dir);
                 break;
 
-            case Slot::State::closing:
-                adjustCounter(m_closingCount, dir);
+            case Slot::State::Closing:
+                closingCount_ += n;
                 break;
 
             // LCOV_EXCL_START
@@ -286,38 +291,38 @@ private:
 
 private:
     /** Outbound connection attempts. */
-    int m_attempts{0};
+    int attempts_{0};
 
     /** Active connections, including fixed and reserved. */
-    std::size_t m_active{0};
+    std::size_t active_{0};
 
     /** Total number of inbound slots. */
-    std::size_t m_in_max{0};
+    std::size_t in_max_{0};
 
     /** Number of inbound slots assigned to active peers. */
-    std::size_t m_in_active{0};
+    std::size_t in_active_{0};
 
     /** Maximum desired outbound slots. */
-    std::size_t m_out_max{0};
+    std::size_t out_max_{0};
 
     /** Active outbound slots. */
-    std::size_t m_out_active{0};
+    std::size_t out_active_{0};
 
     /** Fixed connections. */
-    std::size_t m_fixed{0};
+    std::size_t fixed_{0};
 
     /** Active fixed connections. */
-    std::size_t m_fixed_active{0};
+    std::size_t fixed_active_{0};
 
     /** Reserved connections. */
-    std::size_t m_reserved{0};
+    std::size_t reserved_{0};
 
     // Number of inbound connections that are
     // not active or gracefully closing.
-    int m_acceptCount{0};
+    int acceptCount_{0};
 
     // Number of connections that are gracefully closing.
-    int m_closingCount{0};
+    int closingCount_{0};
 };
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/Endpoint.cpp b/src/xrpld/peerfinder/detail/Endpoint.cpp
index 5d58e6c9bb..ab9cd66809 100644
--- a/src/xrpld/peerfinder/detail/Endpoint.cpp
+++ b/src/xrpld/peerfinder/detail/Endpoint.cpp
@@ -9,8 +9,8 @@
 
 namespace xrpl::PeerFinder {
 
-Endpoint::Endpoint(beast::IP::Endpoint ep, std::uint32_t hops_)
-    : hops(std::min(hops_, Tuning::maxHops + 1)), address(std::move(ep))
+Endpoint::Endpoint(beast::IP::Endpoint ep, std::uint32_t hops)
+    : hops(std::min(hops, Tuning::kMAX_HOPS + 1)), address(std::move(ep))
 {
 }
 
diff --git a/src/xrpld/peerfinder/detail/Fixed.h b/src/xrpld/peerfinder/detail/Fixed.h
index 497658fd40..c334b9ac99 100644
--- a/src/xrpld/peerfinder/detail/Fixed.h
+++ b/src/xrpld/peerfinder/detail/Fixed.h
@@ -8,7 +8,7 @@ namespace xrpl::PeerFinder {
 class Fixed
 {
 public:
-    explicit Fixed(clock_type& clock) : m_when(clock.now())
+    explicit Fixed(clock_type& clock) : when_(clock.now())
     {
     }
 
@@ -18,28 +18,28 @@ public:
     [[nodiscard]] clock_type::time_point const&
     when() const
     {
-        return m_when;
+        return when_;
     }
 
     /** Updates metadata to reflect a failed connection. */
     void
     failure(clock_type::time_point const& now)
     {
-        m_failures = std::min(m_failures + 1, Tuning::connectionBackoff.size() - 1);
-        m_when = now + std::chrono::minutes(Tuning::connectionBackoff[m_failures]);
+        failures_ = std::min(failures_ + 1, Tuning::kCONNECTION_BACKOFF.size() - 1);
+        when_ = now + std::chrono::minutes(Tuning::kCONNECTION_BACKOFF[failures_]);
     }
 
     /** Updates metadata to reflect a successful connection. */
     void
     success(clock_type::time_point const& now)
     {
-        m_failures = 0;
-        m_when = now;
+        failures_ = 0;
+        when_ = now;
     }
 
 private:
-    clock_type::time_point m_when;
-    std::size_t m_failures{0};
+    clock_type::time_point when_;
+    std::size_t failures_{0};
 };
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h
index b93b0a32b8..f4c7483e3f 100644
--- a/src/xrpld/peerfinder/detail/Handouts.h
+++ b/src/xrpld/peerfinder/detail/Handouts.h
@@ -21,15 +21,15 @@ namespace detail {
 //
 template <class Target, class HopContainer>
 std::size_t
-handout_one(Target& t, HopContainer& h)
+handoutOne(Target& t, HopContainer& h)
 {
     XRPL_ASSERT(!t.full(), "xrpl::PeerFinder::detail::handout_one : target is not full");
     for (auto it = h.begin(); it != h.end(); ++it)
     {
         auto const& e = *it;
-        if (t.try_insert(e))
+        if (t.tryInsert(e))
         {
-            h.move_back(it);
+            h.moveBack(it);
             return 1;
         }
     }
@@ -44,25 +44,25 @@ handout_one(Target& t, HopContainer& h)
 */
 template <class TargetFwdIter, class SeqFwdIter>
 void
-handout(TargetFwdIter first, TargetFwdIter last, SeqFwdIter seq_first, SeqFwdIter seq_last)
+handout(TargetFwdIter first, TargetFwdIter last, SeqFwdIter seqFirst, SeqFwdIter seqLast)
 {
     for (;;)
     {
         std::size_t n(0);
-        for (auto si = seq_first; si != seq_last; ++si)
+        for (auto si = seqFirst; si != seqLast; ++si)
         {
             auto c = *si;
-            bool all_full(true);
+            bool allFull(true);
             for (auto ti = first; ti != last; ++ti)
             {
                 auto& t = *ti;
                 if (!t.full())
                 {
-                    n += detail::handout_one(t, c);
-                    all_full = false;
+                    n += detail::handoutOne(t, c);
+                    allFull = false;
                 }
             }
-            if (all_full)
+            if (allFull)
                 return;
         }
         if (!n)
@@ -83,12 +83,12 @@ public:
 
     template <class = void>
     bool
-    try_insert(Endpoint const& ep);
+    tryInsert(Endpoint const& ep);
 
     [[nodiscard]] bool
     full() const
     {
-        return list_.size() >= Tuning::redirectEndpointCount;
+        return list_.size() >= Tuning::kREDIRECT_ENDPOINT_COUNT;
     }
 
     [[nodiscard]] SlotImp::ptr const&
@@ -117,12 +117,12 @@ private:
 template <class>
 RedirectHandouts::RedirectHandouts(SlotImp::ptr slot) : slot_(std::move(slot))
 {
-    list_.reserve(Tuning::redirectEndpointCount);
+    list_.reserve(Tuning::kREDIRECT_ENDPOINT_COUNT);
 }
 
 template <class>
 bool
-RedirectHandouts::try_insert(Endpoint const& ep)
+RedirectHandouts::tryInsert(Endpoint const& ep)
 {
     if (full())
         return false;
@@ -131,7 +131,7 @@ RedirectHandouts::try_insert(Endpoint const& ep)
     //             addresses in a peer HTTP handshake instead of
     //             the tmENDPOINTS message.
     //
-    if (ep.hops > Tuning::maxHops)
+    if (ep.hops > Tuning::kMAX_HOPS)
         return false;
 
     // Don't send them our address
@@ -139,7 +139,7 @@ RedirectHandouts::try_insert(Endpoint const& ep)
         return false;
 
     // Don't send them their own address
-    if (slot_->remote_endpoint().address() == ep.address.address())
+    if (slot_->remoteEndpoint().address() == ep.address.address())
         return false;
 
     // Make sure the address isn't already in our list
@@ -167,12 +167,12 @@ public:
 
     template <class = void>
     bool
-    try_insert(Endpoint const& ep);
+    tryInsert(Endpoint const& ep);
 
     [[nodiscard]] bool
     full() const
     {
-        return list_.size() >= Tuning::numberOfEndpoints;
+        return list_.size() >= Tuning::kNUMBER_OF_ENDPOINTS;
     }
 
     void
@@ -201,24 +201,24 @@ private:
 template <class>
 SlotHandouts::SlotHandouts(SlotImp::ptr slot) : slot_(std::move(slot))
 {
-    list_.reserve(Tuning::numberOfEndpoints);
+    list_.reserve(Tuning::kNUMBER_OF_ENDPOINTS);
 }
 
 template <class>
 bool
-SlotHandouts::try_insert(Endpoint const& ep)
+SlotHandouts::tryInsert(Endpoint const& ep)
 {
     if (full())
         return false;
 
-    if (ep.hops > Tuning::maxHops)
+    if (ep.hops > Tuning::kMAX_HOPS)
         return false;
 
     if (slot_->recent.filter(ep.address, ep.hops))
         return false;
 
     // Don't send them their own address
-    if (slot_->remote_endpoint().address() == ep.address.address())
+    if (slot_->remoteEndpoint().address() == ep.address.address())
         return false;
 
     // Make sure the address isn't already in our list
@@ -253,9 +253,9 @@ public:
     using list_type = std::vector<beast::IP::Endpoint>;
 
 private:
-    std::size_t m_needed;
-    Squelches& m_squelches;
-    list_type m_list;
+    std::size_t needed_;
+    Squelches& squelches_;
+    list_type list_;
 
 public:
     template <class = void>
@@ -263,55 +263,55 @@ public:
 
     template <class = void>
     bool
-    try_insert(beast::IP::Endpoint const& endpoint);
+    tryInsert(beast::IP::Endpoint const& endpoint);
 
     [[nodiscard]] bool
     empty() const
     {
-        return m_list.empty();
+        return list_.empty();
     }
 
     [[nodiscard]] bool
     full() const
     {
-        return m_list.size() >= m_needed;
+        return list_.size() >= needed_;
     }
 
     bool
-    try_insert(Endpoint const& endpoint)
+    tryInsert(Endpoint const& endpoint)
     {
-        return try_insert(endpoint.address);
+        return tryInsert(endpoint.address);
     }
 
     list_type&
     list()
     {
-        return m_list;
+        return list_;
     }
 
     [[nodiscard]] list_type const&
     list() const
     {
-        return m_list;
+        return list_;
     }
 };
 
 template <class>
 ConnectHandouts::ConnectHandouts(std::size_t needed, Squelches& squelches)
-    : m_needed(needed), m_squelches(squelches)
+    : needed_(needed), squelches_(squelches)
 {
-    m_list.reserve(needed);
+    list_.reserve(needed);
 }
 
 template <class>
 bool
-ConnectHandouts::try_insert(beast::IP::Endpoint const& endpoint)
+ConnectHandouts::tryInsert(beast::IP::Endpoint const& endpoint)
 {
     if (full())
         return false;
 
     // Make sure the address isn't already in our list
-    if (std::any_of(m_list.begin(), m_list.end(), [&endpoint](beast::IP::Endpoint const& other) {
+    if (std::any_of(list_.begin(), list_.end(), [&endpoint](beast::IP::Endpoint const& other) {
             // Ignore port for security reasons
             return other.address() == endpoint.address();
         }))
@@ -321,11 +321,11 @@ ConnectHandouts::try_insert(beast::IP::Endpoint const& endpoint)
 
     // Add to squelch list so we don't try it too often.
     // If its already there, then make try_insert fail.
-    auto const result(m_squelches.insert(endpoint.address()));
+    auto const result(squelches_.insert(endpoint.address()));
     if (!result.second)
         return false;
 
-    m_list.push_back(endpoint);
+    list_.push_back(endpoint);
 
     return true;
 }
diff --git a/src/xrpld/peerfinder/detail/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h
index 9b177d22bc..063fb622cf 100644
--- a/src/xrpld/peerfinder/detail/Livecache.h
+++ b/src/xrpld/peerfinder/detail/Livecache.h
@@ -30,7 +30,7 @@ public:
 protected:
     struct Element : boost::intrusive::list_base_hook<>
     {
-        Element(Endpoint endpoint_) : endpoint(std::move(endpoint_))
+        Element(Endpoint endpoint) : endpoint(std::move(endpoint))
         {
         }
 
@@ -77,75 +77,75 @@ public:
         [[nodiscard]] iterator
         begin() const
         {
-            return iterator(m_list.get().cbegin(), Transform());
+            return iterator(list_.get().cbegin(), Transform());
         }
 
         [[nodiscard]] iterator
         cbegin() const
         {
-            return iterator(m_list.get().cbegin(), Transform());
+            return iterator(list_.get().cbegin(), Transform());
         }
 
         [[nodiscard]] iterator
         end() const
         {
-            return iterator(m_list.get().cend(), Transform());
+            return iterator(list_.get().cend(), Transform());
         }
 
         [[nodiscard]] iterator
         cend() const
         {
-            return iterator(m_list.get().cend(), Transform());
+            return iterator(list_.get().cend(), Transform());
         }
 
         [[nodiscard]] reverse_iterator
         rbegin() const
         {
-            return reverse_iterator(m_list.get().crbegin(), Transform());
+            return reverse_iterator(list_.get().crbegin(), Transform());
         }
 
         [[nodiscard]] reverse_iterator
         crbegin() const
         {
-            return reverse_iterator(m_list.get().crbegin(), Transform());
+            return reverse_iterator(list_.get().crbegin(), Transform());
         }
 
         [[nodiscard]] reverse_iterator
         rend() const
         {
-            return reverse_iterator(m_list.get().crend(), Transform());
+            return reverse_iterator(list_.get().crend(), Transform());
         }
 
         [[nodiscard]] reverse_iterator
         crend() const
         {
-            return reverse_iterator(m_list.get().crend(), Transform());
+            return reverse_iterator(list_.get().crend(), Transform());
         }
 
         // move the element to the end of the container
         void
-        move_back(const_iterator pos)
+        moveBack(const_iterator pos)
         {
             auto& e(const_cast<Element&>(*pos.base()));
-            m_list.get().erase(m_list.get().iterator_to(e));
-            m_list.get().push_back(e);
+            list_.get().erase(list_.get().iterator_to(e));
+            list_.get().push_back(e);
         }
 
     private:
-        explicit Hop(typename beast::maybe_const<IsConst, list_type>::type& list) : m_list(list)
+        explicit Hop(typename beast::MaybeConst<IsConst, list_type>::type& list) : list_(list)
         {
         }
 
         friend class LivecacheBase;
 
-        std::reference_wrapper<typename beast::maybe_const<IsConst, list_type>::type> m_list;
+        std::reference_wrapper<typename beast::MaybeConst<IsConst, list_type>::type> list_;
     };
 
 protected:
     // Work-around to call Hop's private constructor from Livecache
     template <bool IsConst>
     static Hop<IsConst>
-    make_hop(typename beast::maybe_const<IsConst, list_type>::type& list)
+    makeHop(typename beast::MaybeConst<IsConst, list_type>::type& list)
     {
         return Hop<IsConst>(list);
     }
@@ -178,8 +178,8 @@ private:
         std::less<beast::IP::Endpoint>,
         Allocator>;
 
-    beast::Journal m_journal;
-    cache_type m_cache;
+    beast::Journal journal_;
+    cache_type cache_;
 
 public:
     using allocator_type = Allocator;
@@ -194,7 +194,7 @@ public:
     // where each list contains endpoints at a given hops.
     //
 
-    class hops_t
+    class HopsT
     {
     private:
         // An endpoint at hops=0 represents the local node.
@@ -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::maxHops + 1>;
-        using lists_type = std::array<list_type, 1 + Tuning::maxHops + 1>;
+        using Histogram = std::array<int, 1 + Tuning::kMAX_HOPS + 1>;
+        using lists_type = std::array<list_type, 1 + Tuning::kMAX_HOPS + 1>;
 
         template <bool IsConst>
         struct Transform
@@ -214,10 +214,10 @@ public:
             explicit Transform() = default;
 
             Hop<IsConst>
-            operator()(typename beast::maybe_const<IsConst, typename lists_type::value_type>::type&
+            operator()(typename beast::MaybeConst<IsConst, typename lists_type::value_type>::type&
                            list) const
             {
-                return make_hop<IsConst>(list);
+                return makeHop<IsConst>(list);
             }
         };
 
@@ -236,73 +236,73 @@ public:
         iterator
         begin()
         {
-            return iterator(m_lists.begin(), Transform<false>());
+            return iterator(lists_.begin(), Transform<false>());
         }
 
         [[nodiscard]] const_iterator
         begin() const
         {
-            return const_iterator(m_lists.cbegin(), Transform<true>());
+            return const_iterator(lists_.cbegin(), Transform<true>());
         }
 
         [[nodiscard]] const_iterator
         cbegin() const
         {
-            return const_iterator(m_lists.cbegin(), Transform<true>());
+            return const_iterator(lists_.cbegin(), Transform<true>());
         }
 
         iterator
         end()
         {
-            return iterator(m_lists.end(), Transform<false>());
+            return iterator(lists_.end(), Transform<false>());
         }
 
         [[nodiscard]] const_iterator
         end() const
         {
-            return const_iterator(m_lists.cend(), Transform<true>());
+            return const_iterator(lists_.cend(), Transform<true>());
         }
 
         [[nodiscard]] const_iterator
         cend() const
         {
-            return const_iterator(m_lists.cend(), Transform<true>());
+            return const_iterator(lists_.cend(), Transform<true>());
         }
 
         reverse_iterator
         rbegin()
         {
-            return reverse_iterator(m_lists.rbegin(), Transform<false>());
+            return reverse_iterator(lists_.rbegin(), Transform<false>());
         }
 
         [[nodiscard]] const_reverse_iterator
         rbegin() const
         {
-            return const_reverse_iterator(m_lists.crbegin(), Transform<true>());
+            return const_reverse_iterator(lists_.crbegin(), Transform<true>());
         }
 
         [[nodiscard]] const_reverse_iterator
         crbegin() const
         {
-            return const_reverse_iterator(m_lists.crbegin(), Transform<true>());
+            return const_reverse_iterator(lists_.crbegin(), Transform<true>());
         }
 
         reverse_iterator
         rend()
         {
-            return reverse_iterator(m_lists.rend(), Transform<false>());
+            return reverse_iterator(lists_.rend(), Transform<false>());
         }
 
         [[nodiscard]] const_reverse_iterator
         rend() const
         {
-            return const_reverse_iterator(m_lists.crend(), Transform<true>());
+            return const_reverse_iterator(lists_.crend(), Transform<true>());
         }
 
         [[nodiscard]] const_reverse_iterator
         crend() const
         {
-            return const_reverse_iterator(m_lists.crend(), Transform<true>());
+            return const_reverse_iterator(lists_.crend(), Transform<true>());
         }
 
         /** Shuffle each hop list. */
@@ -313,7 +313,7 @@ public:
         histogram() const;
 
     private:
-        explicit hops_t(Allocator const& alloc);
+        explicit HopsT(Allocator const& alloc);
 
         void
         insert(Element& e);
@@ -326,22 +326,22 @@ public:
         remove(Element& e);
 
         friend class Livecache;
-        lists_type m_lists;
-        Histogram m_hist{};
+        lists_type lists_;
+        Histogram hist_{};
     } hops;
 
     /** Returns `true` if the cache is empty. */
     [[nodiscard]] bool
     empty() const
     {
-        return m_cache.empty();
+        return cache_.empty();
     }
 
     /** Returns the number of entries in the cache. */
     typename cache_type::size_type
     size() const
     {
-        return m_cache.size();
+        return cache_.size();
     }
 
     /** Erase entries whose time has expired. */
@@ -361,7 +361,7 @@ public:
 
 template <class Allocator>
 Livecache<Allocator>::Livecache(clock_type& clock, beast::Journal journal, Allocator alloc)
-    : m_journal(journal), m_cache(clock, alloc), hops(alloc)
+    : journal_(journal), cache_(clock, alloc), hops(alloc)
 {
 }
 
@@ -371,19 +371,19 @@ Livecache<Allocator>::expire()
 {
     std::size_t n(0);
     typename cache_type::time_point const expired(
-        m_cache.clock().now() - Tuning::liveCacheSecondsToLive);
-    for (auto iter(m_cache.chronological.begin());
-         iter != m_cache.chronological.end() && iter.when() <= expired;)
+        cache_.clock().now() - Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
+    for (auto iter(cache_.chronological.begin());
+         iter != cache_.chronological.end() && iter.when() <= expired;)
     {
         Element& e(iter->second);
         hops.remove(e);
-        iter = m_cache.erase(iter);
+        iter = cache_.erase(iter);
         ++n;
     }
     if (n > 0)
     {
-        JLOG(m_journal.debug()) << beast::leftw(18) << "Livecache expired " << n
-                                << ((n > 1) ? " entries" : " entry");
+        JLOG(journal_.debug()) << beast::Leftw(18) << "Livecache expired " << n
+                               << ((n > 1) ? " entries" : " entry");
     }
 }
 
@@ -398,39 +398,39 @@ Livecache<Allocator>::insert(Endpoint const& ep)
     // when redirecting.
     //
     XRPL_ASSERT(
-        ep.hops <= (Tuning::maxHops + 1),
+        ep.hops <= (Tuning::kMAX_HOPS + 1),
         "xrpl::PeerFinder::Livecache::insert : maximum input hops");
-    auto result = m_cache.emplace(ep.address, ep);
+    auto result = cache_.emplace(ep.address, ep);
     Element& e(result.first->second);
     if (result.second)
     {
         hops.insert(e);
-        JLOG(m_journal.debug()) << beast::leftw(18) << "Livecache insert " << ep.address
-                                << " at hops " << ep.hops;
+        JLOG(journal_.debug()) << beast::Leftw(18) << "Livecache insert " << ep.address
+                               << " at hops " << ep.hops;
         return;
     }
     if (!result.second && (ep.hops > e.endpoint.hops))
     {
         // Drop duplicates at higher hops
         std::size_t const excess(ep.hops - e.endpoint.hops);
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Livecache drop " << ep.address
-                                << " at hops +" << excess;
+        JLOG(journal_.trace()) << beast::Leftw(18) << "Livecache drop " << ep.address
+                               << " at hops +" << excess;
         return;
     }
 
-    m_cache.touch(result.first);
+    cache_.touch(result.first);
 
     // Address already in the cache so update metadata
     if (ep.hops < e.endpoint.hops)
     {
         hops.reinsert(e, ep.hops);
-        JLOG(m_journal.debug()) << beast::leftw(18) << "Livecache update " << ep.address
-                                << " at hops " << ep.hops;
+        JLOG(journal_.debug()) << beast::Leftw(18) << "Livecache update " << ep.address
+                               << " at hops " << ep.hops;
     }
     else
     {
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Livecache refresh " << ep.address
-                                << " at hops " << ep.hops;
+        JLOG(journal_.trace()) << beast::Leftw(18) << "Livecache refresh " << ep.address
+                               << " at hops " << ep.hops;
     }
 }
 
@@ -439,16 +439,16 @@ void
 Livecache<Allocator>::onWrite(beast::PropertyStream::Map& map)
 {
     typename cache_type::time_point const expired(
-        m_cache.clock().now() - Tuning::liveCacheSecondsToLive);
+        cache_.clock().now() - Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
     map["size"] = size();
     map["hist"] = hops.histogram();
     beast::PropertyStream::Set set("entries", map);
-    for (auto iter(m_cache.cbegin()); iter != m_cache.cend(); ++iter)
+    for (auto iter(cache_.cbegin()); iter != cache_.cend(); ++iter)
     {
         auto const& e(iter->second);
         beast::PropertyStream::Map item(set);
         item["hops"] = e.endpoint.hops;
-        item["address"] = e.endpoint.address.to_string();
+        item["address"] = e.endpoint.address.toString();
         std::stringstream ss;
         ss << (iter.when() - expired).count();
         item["expires"] = ss.str();
@@ -459,14 +459,14 @@ Livecache<Allocator>::onWrite(beast::PropertyStream::Map& map)
 
 template <class Allocator>
 void
-Livecache<Allocator>::hops_t::shuffle()
+Livecache<Allocator>::HopsT::shuffle()
 {
-    for (auto& list : m_lists)
+    for (auto& list : lists_)
     {
         std::vector<std::reference_wrapper<Element>> v;
         v.reserve(list.size());
         std::ranges::copy(list, std::back_inserter(v));
-        std::shuffle(v.begin(), v.end(), default_prng());
+        std::shuffle(v.begin(), v.end(), defaultPrng());
         list.clear();
         for (auto& e : v)
             list.push_back(e);
@@ -475,10 +475,10 @@ Livecache<Allocator>::hops_t::shuffle()
 
 template <class Allocator>
 std::string
-Livecache<Allocator>::hops_t::histogram() const
+Livecache<Allocator>::HopsT::histogram() const
 {
     std::string s;
-    for (auto const& h : m_hist)
+    for (auto const& h : hist_)
     {
         if (!s.empty())
             s += ", ";
@@ -488,35 +488,35 @@ Livecache<Allocator>::hops_t::histogram() const
 }
 
 template <class Allocator>
-Livecache<Allocator>::hops_t::hops_t(Allocator const& alloc)
+Livecache<Allocator>::HopsT::HopsT(Allocator const& alloc)
 {
-    std::ranges::fill(m_hist, 0);
+    std::ranges::fill(hist_, 0);
 }
 
 template <class Allocator>
 void
-Livecache<Allocator>::hops_t::insert(Element& e)
+Livecache<Allocator>::HopsT::insert(Element& e)
 {
     XRPL_ASSERT(
-        e.endpoint.hops <= Tuning::maxHops + 1,
+        e.endpoint.hops <= Tuning::kMAX_HOPS + 1,
         "xrpl::PeerFinder::Livecache::hops_t::insert : maximum input hops");
     // This has security implications without a shuffle
-    m_lists[e.endpoint.hops].push_front(e);
-    ++m_hist[e.endpoint.hops];
+    lists_[e.endpoint.hops].push_front(e);
+    ++hist_[e.endpoint.hops];
 }
 
 template <class Allocator>
 void
-Livecache<Allocator>::hops_t::reinsert(Element& e, std::uint32_t numHops)
+Livecache<Allocator>::HopsT::reinsert(Element& e, std::uint32_t numHops)
 {
     XRPL_ASSERT(
-        numHops <= Tuning::maxHops + 1,
+        numHops <= Tuning::kMAX_HOPS + 1,
         "xrpl::PeerFinder::Livecache::hops_t::reinsert : maximum hops input");
 
-    auto& list = m_lists[e.endpoint.hops];
+    auto& list = lists_[e.endpoint.hops];
     list.erase(list.iterator_to(e));
 
-    --m_hist[e.endpoint.hops];
+    --hist_[e.endpoint.hops];
 
     e.endpoint.hops = numHops;
     insert(e);
@@ -524,11 +524,11 @@ Livecache<Allocator>::hops_t::reinsert(Element& e, std::uint32_t numHops)
 
 template <class Allocator>
 void
-Livecache<Allocator>::hops_t::remove(Element& e)
+Livecache<Allocator>::HopsT::remove(Element& e)
 {
-    --m_hist[e.endpoint.hops];
+    --hist_[e.endpoint.hops];
 
-    auto& list = m_lists[e.endpoint.hops];
+    auto& list = lists_[e.endpoint.hops];
     list.erase(list.iterator_to(e));
 }
 
diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h
index c7e6c7d1f2..89e7336a33 100644
--- a/src/xrpld/peerfinder/detail/Logic.h
+++ b/src/xrpld/peerfinder/detail/Logic.h
@@ -34,24 +34,25 @@ class Logic
 {
 public:
     // Maps remote endpoints to slots. Since a slot has a
-    // remote endpoint upon construction, this holds all counts.
+    // remote endpoint upon construction, this holds all counts_.
     //
     using Slots = std::map<beast::IP::Endpoint, std::shared_ptr<SlotImp>>;
 
-    beast::Journal m_journal;
-    clock_type& m_clock;
-    Store& m_store;
-    Checker& m_checker;
+    beast::Journal journal;
+    clock_type& clock;
+    Store& store;
+    Checker& checker;
 
-    std::recursive_mutex lock_;
+    std::recursive_mutex lock;
 
     // True if we are stopping.
-    bool stopping_ = false;
+    bool stopping = false;
 
     // The source we are currently fetching.
     // This is used to cancel I/O during program exit.
-    std::shared_ptr<Source> fetchSource_;
+    std::shared_ptr<Source> fetchSource;
 
+private:
     // Configuration settings
     Config config_;
 
@@ -61,41 +62,42 @@ public:
     // A list of slots that should always be connected
     std::map<beast::IP::Endpoint, Fixed> fixed_;
 
+public:
     // Live livecache from mtENDPOINTS messages
-    Livecache<> livecache_;
+    Livecache<> livecache;
 
     // LiveCache of addresses suitable for gaining initial connections
-    Bootcache bootcache_;
+    Bootcache bootcache;
 
     // Holds all counts
-    Slots slots_;
+    Slots slots;
 
     // The addresses (but not port) we are connected to. This includes
     // outgoing connection attempts. Note that this set can contain
     // duplicates (since the port is not set)
-    std::multiset<beast::IP::Address> connectedAddresses_;
+    std::multiset<beast::IP::Address> connectedAddresses;
 
     // Set of public keys belonging to active peers
-    std::set<PublicKey> keys_;
+    std::set<PublicKey> keys;
 
     // A list of dynamic sources to consult as a fallback
-    std::vector<std::shared_ptr<Source>> m_sources;
+    std::vector<std::shared_ptr<Source>> sources;
 
-    clock_type::time_point m_whenBroadcast;
+    clock_type::time_point whenBroadcast;
 
-    ConnectHandouts::Squelches m_squelches;
+    ConnectHandouts::Squelches squelches;
 
     //--------------------------------------------------------------------------
-
+public:
     Logic(clock_type& clock, Store& store, Checker& checker, beast::Journal journal)
-        : m_journal(journal)
-        , m_clock(clock)
-        , m_store(store)
-        , m_checker(checker)
-        , livecache_(m_clock, journal)
-        , bootcache_(store, m_clock, journal)
-        , m_whenBroadcast(m_clock.now())
-        , m_squelches(m_clock)
+        : journal(journal)
+        , clock(clock)
+        , store(store)
+        , checker(checker)
+        , livecache(clock, journal)
+        , bootcache(store, clock, journal)
+        , whenBroadcast(clock.now())
+        , squelches(clock)
     {
         config({});
     }
@@ -105,8 +107,8 @@ public:
     void
     load()
     {
-        std::scoped_lock const _(lock_);
-        bootcache_.load();
+        std::scoped_lock const _(lock);
+        bootcache.load();
     }
 
     /** Stop the logic.
@@ -118,10 +120,10 @@ public:
     void
     stop()
     {
-        std::scoped_lock const _(lock_);
-        stopping_ = true;
-        if (fetchSource_ != nullptr)
-            fetchSource_->cancel();
+        std::scoped_lock const _(lock);
+        stopping = true;
+        if (fetchSource != nullptr)
+            fetchSource->cancel();
     }
 
     //--------------------------------------------------------------------------
@@ -133,7 +135,7 @@ public:
     void
     config(Config const& c)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
         config_ = c;
         counts_.onConfig(config_);
     }
@@ -141,7 +143,7 @@ public:
     Config
     config()
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
         return config_;
     }
 
@@ -154,31 +156,31 @@ public:
     void
     addFixedPeer(std::string const& name, std::vector<beast::IP::Endpoint> const& addresses)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         if (addresses.empty())
         {
-            JLOG(m_journal.info()) << "Could not resolve fixed slot '" << name << "'";
+            JLOG(journal.info()) << "Could not resolve fixed slot '" << name << "'";
             return;
         }
 
-        for (auto const& remote_address : addresses)
+        for (auto const& remoteAddress : addresses)
         {
-            if (remote_address.port() == 0)
+            if (remoteAddress.port() == 0)
             {
                 Throw<std::runtime_error>(
-                    "Port not specified for address:" + remote_address.to_string());
+                    "Port not specified for address:" + remoteAddress.toString());
             }
 
             auto result(fixed_.emplace(
                 std::piecewise_construct,
-                std::forward_as_tuple(remote_address),
-                std::make_tuple(std::ref(m_clock))));
+                std::forward_as_tuple(remoteAddress),
+                std::make_tuple(std::ref(clock))));
 
             if (result.second)
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Logic add fixed '" << name << "' at " << remote_address;
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Logic add fixed '" << name << "' at " << remoteAddress;
                 return;
             }
         }
@@ -196,13 +198,13 @@ public:
         if (ec == boost::asio::error::operation_aborted)
             return;
 
-        std::scoped_lock const _(lock_);
-        auto const iter(slots_.find(remoteAddress));
-        if (iter == slots_.end())
+        std::scoped_lock const _(lock);
+        auto const iter(slots.find(remoteAddress));
+        if (iter == slots.end())
         {
             // The slot disconnected before we finished the check
-            JLOG(m_journal.debug()) << beast::leftw(18) << "Logic tested " << checkedAddress
-                                    << " but the connection was closed";
+            JLOG(journal.debug()) << beast::Leftw(18) << "Logic tested " << checkedAddress
+                                  << " but the connection was closed";
             return;
         }
 
@@ -210,7 +212,7 @@ public:
         slot.checked = true;
         slot.connectivityCheckInProgress = false;
 
-        beast::WrappedSink sink{m_journal.sink(), slot.prefix()};
+        beast::WrappedSink sink{journal.sink(), slot.prefix()};
         beast::Journal const journal{sink};
 
         if (ec)
@@ -219,89 +221,89 @@ public:
             slot.canAccept = false;
             JLOG(journal.error()) << "Logic testing " << iter->first << " with error, "
                                   << ec.message();
-            bootcache_.on_failure(checkedAddress);
+            bootcache.onFailure(checkedAddress);
             return;
         }
 
         slot.canAccept = true;
-        slot.set_listening_port(checkedAddress.port());
+        slot.setListeningPort(checkedAddress.port());
         JLOG(journal.debug()) << "Logic testing " << checkedAddress << " succeeded";
     }
 
     //--------------------------------------------------------------------------
 
     std::pair<SlotImp::ptr, Result>
-    new_inbound_slot(
-        beast::IP::Endpoint const& local_endpoint,
-        beast::IP::Endpoint const& remote_endpoint)
+    newInboundSlot(
+        beast::IP::Endpoint const& localEndpoint,
+        beast::IP::Endpoint const& remoteEndpoint)
     {
-        JLOG(m_journal.debug()) << beast::leftw(18) << "Logic accept" << remote_endpoint
-                                << " on local " << local_endpoint;
+        JLOG(journal.debug()) << beast::Leftw(18) << "Logic accept" << remoteEndpoint
+                              << " on local " << localEndpoint;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // Check for connection limit per address
-        if (is_public(remote_endpoint))
+        if (isPublic(remoteEndpoint))
         {
-            auto const count = connectedAddresses_.count(remote_endpoint.address());
+            auto const count = connectedAddresses.count(remoteEndpoint.address());
             if (count + 1 > config_.ipLimit)
             {
-                JLOG(m_journal.debug()) << beast::leftw(18) << "Logic dropping inbound "
-                                        << remote_endpoint << " because of ip limits.";
-                return {SlotImp::ptr(), Result::ipLimitExceeded};
+                JLOG(journal.debug()) << beast::Leftw(18) << "Logic dropping inbound "
+                                      << remoteEndpoint << " because of ip limits.";
+                return {SlotImp::ptr(), Result::IpLimitExceeded};
             }
         }
 
         // Check for duplicate connection
-        if (slots_.contains(remote_endpoint))
+        if (slots.contains(remoteEndpoint))
         {
-            JLOG(m_journal.debug()) << beast::leftw(18) << "Logic dropping " << remote_endpoint
-                                    << " as duplicate incoming";
-            return {SlotImp::ptr(), Result::duplicatePeer};
+            JLOG(journal.debug()) << beast::Leftw(18) << "Logic dropping " << remoteEndpoint
+                                  << " as duplicate incoming";
+            return {SlotImp::ptr(), Result::DuplicatePeer};
         }
 
         // Create the slot
         SlotImp::ptr const slot(
             std::make_shared<SlotImp>(
-                local_endpoint, remote_endpoint, fixed(remote_endpoint.address()), m_clock));
+                localEndpoint, remoteEndpoint, fixed(remoteEndpoint.address()), clock));
         // Add slot to table
-        auto const result(slots_.emplace(slot->remote_endpoint(), slot));
+        auto const result(slots.emplace(slot->remoteEndpoint(), slot));
         // Remote address must not already exist
         XRPL_ASSERT(
             result.second,
             "xrpl::PeerFinder::Logic::new_inbound_slot : remote endpoint "
             "inserted");
         // Add to the connected address list
-        connectedAddresses_.emplace(remote_endpoint.address());
+        connectedAddresses.emplace(remoteEndpoint.address());
 
         // Update counts
         counts_.add(*slot);
 
-        return {result.first->second, Result::success};
+        return {result.first->second, Result::Success};
     }
 
     // Can't check for self-connect because we don't know the local endpoint
     std::pair<SlotImp::ptr, Result>
-    new_outbound_slot(beast::IP::Endpoint const& remote_endpoint)
+    newOutboundSlot(beast::IP::Endpoint const& remoteEndpoint)
     {
-        JLOG(m_journal.debug()) << beast::leftw(18) << "Logic connect " << remote_endpoint;
+        JLOG(journal.debug()) << beast::Leftw(18) << "Logic connect " << remoteEndpoint;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // Check for duplicate connection
-        if (slots_.contains(remote_endpoint))
+        if (slots.contains(remoteEndpoint))
         {
-            JLOG(m_journal.debug()) << beast::leftw(18) << "Logic dropping " << remote_endpoint
-                                    << " as duplicate connect";
-            return {SlotImp::ptr(), Result::duplicatePeer};
+            JLOG(journal.debug()) << beast::Leftw(18) << "Logic dropping " << remoteEndpoint
+                                  << " as duplicate connect";
+            return {SlotImp::ptr(), Result::DuplicatePeer};
         }
 
         // Create the slot
         SlotImp::ptr const slot(
-            std::make_shared<SlotImp>(remote_endpoint, fixed(remote_endpoint), m_clock));
+            std::make_shared<SlotImp>(remoteEndpoint, fixed(remoteEndpoint), clock));
 
         // Add slot to table
-        auto const result = slots_.emplace(slot->remote_endpoint(), slot);
+        auto const result = slots.emplace(slot->remoteEndpoint(), slot);
         // Remote address must not already exist
         XRPL_ASSERT(
             result.second,
@@ -309,38 +311,38 @@ public:
             "inserted");
 
         // Add to the connected address list
-        connectedAddresses_.emplace(remote_endpoint.address());
+        connectedAddresses.emplace(remoteEndpoint.address());
 
         // Update counts
         counts_.add(*slot);
 
-        return {result.first->second, Result::success};
+        return {result.first->second, Result::Success};
     }
 
     bool
-    onConnected(SlotImp::ptr const& slot, beast::IP::Endpoint const& local_endpoint)
+    onConnected(SlotImp::ptr const& slot, beast::IP::Endpoint const& localEndpoint)
     {
-        beast::WrappedSink sink{m_journal.sink(), slot->prefix()};
+        beast::WrappedSink sink{journal.sink(), slot->prefix()};
         beast::Journal const journal{sink};
 
-        JLOG(journal.trace()) << "Logic connected on local " << local_endpoint;
+        JLOG(journal.trace()) << "Logic connected on local " << localEndpoint;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // The object must exist in our table
         XRPL_ASSERT(
-            slots_.find(slot->remote_endpoint()) != slots_.end(),
+            slots.contains(slot->remoteEndpoint()),
             "xrpl::PeerFinder::Logic::onConnected : valid slot input");
         // Assign the local endpoint now that it's known
-        slot->local_endpoint(local_endpoint);
+        slot->localEndpoint(localEndpoint);
 
         // Check for self-connect by address
         {
-            auto const iter(slots_.find(local_endpoint));
-            if (iter != slots_.end())
+            auto const iter(slots.find(localEndpoint));
+            if (iter != slots.end())
             {
                 XRPL_ASSERT(
-                    iter->second->local_endpoint() == slot->remote_endpoint(),
+                    iter->second->localEndpoint() == slot->remoteEndpoint(),
                     "xrpl::PeerFinder::Logic::onConnected : local and remote "
                     "endpoints do match");
                 JLOG(journal.warn()) << "Logic dropping as self connect";
@@ -350,7 +352,7 @@ public:
 
         // Update counts
         counts_.remove(*slot);
-        slot->state(Slot::State::connected);
+        slot->state(Slot::State::Connected);
         counts_.add(*slot);
         return true;
     }
@@ -358,26 +360,26 @@ public:
     Result
     activate(SlotImp::ptr const& slot, PublicKey const& key, bool reserved)
     {
-        beast::WrappedSink sink{m_journal.sink(), slot->prefix()};
+        beast::WrappedSink sink{journal.sink(), slot->prefix()};
         beast::Journal const journal{sink};
 
-        JLOG(journal.debug()) << "Logic handshake " << slot->remote_endpoint() << " with "
+        JLOG(journal.debug()) << "Logic handshake " << slot->remoteEndpoint() << " with "
                               << (reserved ? "reserved " : "") << "key " << key;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // The object must exist in our table
         XRPL_ASSERT(
-            slots_.find(slot->remote_endpoint()) != slots_.end(),
+            slots.contains(slot->remoteEndpoint()),
             "xrpl::PeerFinder::Logic::activate : valid slot input");
         // Must be accepted or connected
         XRPL_ASSERT(
-            slot->state() == Slot::State::accept || slot->state() == Slot::State::connected,
+            slot->state() == Slot::State::Accept || slot->state() == Slot::State::Connected,
             "xrpl::PeerFinder::Logic::activate : valid slot state");
 
         // Check for duplicate connection by key
-        if (keys_.contains(key))
-            return Result::duplicatePeer;
+        if (keys.contains(key))
+            return Result::DuplicatePeer;
 
         // If the peer belongs to a cluster or is reserved,
         // update the slot to reflect that.
@@ -386,48 +388,48 @@ public:
         counts_.add(*slot);
 
         // See if we have an open space for this slot
-        if (!counts_.can_activate(*slot))
+        if (!counts_.canActivate(*slot))
         {
             if (!slot->inbound())
-                bootcache_.on_success(slot->remote_endpoint());
-            if (slot->inbound() && counts_.in_max() == 0)
-                return Result::inboundDisabled;
-            return Result::full;
+                bootcache.onSuccess(slot->remoteEndpoint());
+            if (slot->inbound() && counts_.inMax() == 0)
+                return Result::InboundDisabled;
+            return Result::Full;
         }
 
         // Set the key right before adding to the map, otherwise we might
         // assert later when erasing the key.
-        slot->public_key(key);
+        slot->publicKey(key);
         {
-            [[maybe_unused]] bool const inserted = keys_.insert(key).second;
+            [[maybe_unused]] bool const inserted = keys.insert(key).second;
             // Public key must not already exist
             XRPL_ASSERT(inserted, "xrpl::PeerFinder::Logic::activate : public key inserted");
         }
 
         // Change state and update counts
         counts_.remove(*slot);
-        slot->activate(m_clock.now());
+        slot->activate(clock.now());
         counts_.add(*slot);
 
         if (!slot->inbound())
-            bootcache_.on_success(slot->remote_endpoint());
+            bootcache.onSuccess(slot->remoteEndpoint());
 
         // Mark fixed slot success
         if (slot->fixed() && !slot->inbound())
         {
-            auto iter(fixed_.find(slot->remote_endpoint()));
+            auto iter(fixed_.find(slot->remoteEndpoint()));
             if (iter == fixed_.end())
             {
-                LogicError(
+                logicError(
                     "PeerFinder::Logic::activate(): remote_endpoint "
                     "missing from fixed_");
             }
 
-            iter->second.success(m_clock.now());
+            iter->second.success(clock.now());
             JLOG(journal.trace()) << "Logic fixed success";
         }
 
-        return Result::success;
+        return Result::Success;
     }
 
     /** Return a list of addresses suitable for redirection.
@@ -437,10 +439,10 @@ public:
     std::vector<Endpoint>
     redirect(SlotImp::ptr const& slot)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
         RedirectHandouts h(slot);
-        livecache_.hops.shuffle();
-        handout(&h, (&h) + 1, livecache_.hops.begin(), livecache_.hops.end());
+        livecache.hops.shuffle();
+        handout(&h, (&h) + 1, livecache.hops.begin(), livecache.hops.end());
         return std::move(h.list());
     }
 
@@ -455,22 +457,22 @@ public:
     {
         std::vector<beast::IP::Endpoint> none;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // Count how many more outbound attempts to make
         //
-        auto needed(counts_.attempts_needed());
+        auto needed(counts_.attemptsNeeded());
         if (needed == 0)
             return none;
 
-        ConnectHandouts h(needed, m_squelches);
+        ConnectHandouts h(needed, squelches);
 
         // Make sure we don't connect to already-connected entries.
-        for (auto const& s : slots_)
+        for (auto const& s : slots)
         {
-            auto const result(m_squelches.insert(s.second->remote_endpoint().address()));
+            auto const result(squelches.insert(s.second->remoteEndpoint().address()));
             if (!result.second)
-                m_squelches.touch(result.first);
+                squelches.touch(result.first);
         }
 
         // 1. Use Fixed if:
@@ -478,21 +480,21 @@ public:
         //      ( There are eligible fixed addresses to try OR
         //        Any outbound attempts are in progress)
         //
-        if (counts_.fixed_active() < fixed_.size())
+        if (counts_.fixedActive() < fixed_.size())
         {
-            get_fixed(needed, h.list(), m_squelches);
+            getFixed(needed, h.list(), squelches);
 
             if (!h.list().empty())
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Logic connect " << h.list().size() << " fixed";
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Logic connect " << h.list().size() << " fixed";
                 return h.list();
             }
 
             if (counts_.attempts() > 0)
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Logic waiting on " << counts_.attempts() << " attempts";
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Logic waiting on " << counts_.attempts() << " attempts";
                 return none;
             }
         }
@@ -500,7 +502,7 @@ public:
         // Only proceed if auto connect is enabled and we
         // have less than the desired number of outbound slots
         //
-        if (!config_.autoConnect || counts_.out_active() >= counts_.out_max())
+        if (!config_.autoConnect || counts_.outActive() >= counts_.outMax())
             return none;
 
         // 2. Use Livecache if:
@@ -508,19 +510,19 @@ public:
         //    Any outbound attempts are in progress
         //
         {
-            livecache_.hops.shuffle();
-            handout(&h, (&h) + 1, livecache_.hops.rbegin(), livecache_.hops.rend());
+            livecache.hops.shuffle();
+            handout(&h, (&h) + 1, livecache.hops.rbegin(), livecache.hops.rend());
             if (!h.list().empty())
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Logic connect " << h.list().size() << " live "
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Logic connect " << h.list().size() << " live "
                     << ((h.list().size() > 1) ? "endpoints" : "endpoint");
                 return h.list();
             }
             if (counts_.attempts() > 0)
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Logic waiting on " << counts_.attempts() << " attempts";
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Logic waiting on " << counts_.attempts() << " attempts";
                 return none;
             }
         }
@@ -541,14 +543,13 @@ public:
         // 4. Use Bootcache if:
         //    There are any entries we haven't tried lately
         //
-        for (auto iter(bootcache_.begin()); !h.full() && iter != bootcache_.end(); ++iter)
-            h.try_insert(*iter);
+        for (auto iter(bootcache.begin()); !h.full() && iter != bootcache.end(); ++iter)
+            h.tryInsert(*iter);
 
         if (!h.list().empty())
         {
-            JLOG(m_journal.debug())
-                << beast::leftw(18) << "Logic connect " << h.list().size() << " boot "
-                << ((h.list().size() > 1) ? "addresses" : "address");
+            JLOG(journal.debug()) << beast::Leftw(18) << "Logic connect " << h.list().size()
+                                  << " boot " << ((h.list().size() > 1) ? "addresses" : "address");
             return h.list();
         }
 
@@ -561,29 +562,30 @@ public:
     {
         std::vector<std::pair<std::shared_ptr<Slot>, std::vector<Endpoint>>> result;
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
-        clock_type::time_point const now = m_clock.now();
-        if (m_whenBroadcast <= now)
+        clock_type::time_point const now = clock.now();
+        if (whenBroadcast <= now)
         {
             std::vector<SlotHandouts> targets;
 
             {
                 // build list of active slots
-                std::vector<SlotImp::ptr> slots;
-                slots.reserve(slots_.size());
+                std::vector<SlotImp::ptr> activeSlots;
+                activeSlots.reserve(slots.size());
                 std::for_each(
-                    slots_.cbegin(), slots_.cend(), [&slots](Slots::value_type const& value) {
-                        if (value.second->state() == Slot::State::active)
-                            slots.emplace_back(value.second);
+                    slots.cbegin(), slots.cend(), [&activeSlots](Slots::value_type const& value) {
+                        if (value.second->state() == Slot::State::Active)
+                            activeSlots.emplace_back(value.second);
                     });
-                std::shuffle(slots.begin(), slots.end(), default_prng());
+                std::shuffle(activeSlots.begin(), activeSlots.end(), defaultPrng());
 
                 // build target vector
-                targets.reserve(slots.size());
-                std::for_each(slots.cbegin(), slots.cend(), [&targets](SlotImp::ptr const& slot) {
-                    targets.emplace_back(slot);
-                });
+                targets.reserve(activeSlots.size());
+                std::for_each(
+                    activeSlots.cbegin(), activeSlots.cend(), [&targets](SlotImp::ptr const& slot) {
+                        targets.emplace_back(slot);
+                    });
             }
 
             /* VFALCO NOTE
@@ -598,7 +600,7 @@ public:
             // 2. We have slots
             // 3. We haven't failed the firewalled test
             //
-            if (config_.wantIncoming && counts_.in_max() > 0)
+            if (config_.wantIncoming && counts_.inMax() > 0)
             {
                 Endpoint ep;
                 ep.hops = 0;
@@ -610,49 +612,49 @@ public:
                 // either. ipv6 has a slightly more compact string
                 // representation of 0, so use that for self entries.
                 ep.address =
-                    beast::IP::Endpoint(beast::IP::AddressV6()).at_port(config_.listeningPort);
+                    beast::IP::Endpoint(beast::IP::AddressV6()).atPort(config_.listeningPort);
                 for (auto& t : targets)
                     t.insert(ep);
             }
 
             // build sequence of endpoints by hops
-            livecache_.hops.shuffle();
-            handout(targets.begin(), targets.end(), livecache_.hops.begin(), livecache_.hops.end());
+            livecache.hops.shuffle();
+            handout(targets.begin(), targets.end(), livecache.hops.begin(), livecache.hops.end());
 
             // broadcast
             for (auto const& t : targets)
             {
                 SlotImp::ptr const& slot = t.slot();
                 auto const& list = t.list();
-                beast::WrappedSink sink{m_journal.sink(), slot->prefix()};
+                beast::WrappedSink sink{journal.sink(), slot->prefix()};
                 beast::Journal const journal{sink};
                 JLOG(journal.trace()) << "Logic sending " << list.size()
                                       << ((list.size() == 1) ? " endpoint" : " endpoints");
                 result.emplace_back(slot, list);
             }
 
-            m_whenBroadcast = now + Tuning::secondsPerMessage;
+            whenBroadcast = now + Tuning::kSECONDS_PER_MESSAGE;
         }
 
         return result;
     }
 
     void
-    once_per_second()
+    oncePerSecond()
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // Expire the Livecache
-        livecache_.expire();
+        livecache.expire();
 
         // Expire the recent cache in each slot
-        for (auto const& entry : slots_)
+        for (auto const& entry : slots)
             entry.second->expire();
 
         // Expire the recent attempts table
-        beast::expire(m_squelches, Tuning::recentAttemptDuration);
+        beast::expire(squelches, Tuning::kRECENT_ATTEMPT_DURATION);
 
-        bootcache_.periodicActivity();
+        bootcache.periodicActivity();
     }
 
     //--------------------------------------------------------------------------
@@ -667,10 +669,10 @@ public:
             Endpoint& ep(*iter);
 
             // Enforce hop limit
-            if (ep.hops > Tuning::maxHops)
+            if (ep.hops > Tuning::kMAX_HOPS)
             {
-                JLOG(m_journal.debug()) << beast::leftw(18) << "Endpoints drop " << ep.address
-                                        << " for excess hops " << ep.hops;
+                JLOG(journal.debug()) << beast::Leftw(18) << "Endpoints drop " << ep.address
+                                      << " for excess hops " << ep.hops;
                 iter = list.erase(iter);
                 continue;
             }
@@ -682,22 +684,22 @@ public:
                 {
                     // Fill in our neighbors remote address
                     neighbor = true;
-                    ep.address = slot->remote_endpoint().at_port(ep.address.port());
+                    ep.address = slot->remoteEndpoint().atPort(ep.address.port());
                 }
                 else
                 {
-                    JLOG(m_journal.debug())
-                        << beast::leftw(18) << "Endpoints drop " << ep.address << " for extra self";
+                    JLOG(journal.debug())
+                        << beast::Leftw(18) << "Endpoints drop " << ep.address << " for extra self";
                     iter = list.erase(iter);
                     continue;
                 }
             }
 
             // Discard invalid addresses
-            if (!is_valid_address(ep.address))
+            if (!isValidAddress(ep.address))
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Endpoints drop " << ep.address << " as invalid";
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Endpoints drop " << ep.address << " as invalid";
                 iter = list.erase(iter);
                 continue;
             }
@@ -707,8 +709,8 @@ public:
                     return ep.address == other.address;
                 }))
             {
-                JLOG(m_journal.debug())
-                    << beast::leftw(18) << "Endpoints drop " << ep.address << " as duplicate";
+                JLOG(journal.debug())
+                    << beast::Leftw(18) << "Endpoints drop " << ep.address << " as duplicate";
                 iter = list.erase(iter);
                 continue;
             }
@@ -723,34 +725,34 @@ public:
     }
 
     void
-    on_endpoints(SlotImp::ptr const& slot, Endpoints list)
+    onEndpoints(SlotImp::ptr const& slot, Endpoints list)
     {
-        beast::WrappedSink sink{m_journal.sink(), slot->prefix()};
+        beast::WrappedSink sink{journal.sink(), slot->prefix()};
         beast::Journal const journal{sink};
 
         // If we're sent too many endpoints, sample them at random:
-        if (list.size() > Tuning::numberOfEndpointsMax)
+        if (list.size() > Tuning::kNUMBER_OF_ENDPOINTS_MAX)
         {
-            std::shuffle(list.begin(), list.end(), default_prng());
-            list.resize(Tuning::numberOfEndpointsMax);
+            std::shuffle(list.begin(), list.end(), defaultPrng());
+            list.resize(Tuning::kNUMBER_OF_ENDPOINTS_MAX);
         }
 
         JLOG(journal.trace()) << "Endpoints contained " << list.size()
                               << ((list.size() > 1) ? " entries" : " entry");
 
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // The object must exist in our table
         XRPL_ASSERT(
-            slots_.find(slot->remote_endpoint()) != slots_.end(),
+            slots.contains(slot->remoteEndpoint()),
             "xrpl::PeerFinder::Logic::on_endpoints : valid slot input");
 
         // Must be handshaked!
         XRPL_ASSERT(
-            slot->state() == Slot::State::active,
+            slot->state() == Slot::State::Active,
             "xrpl::PeerFinder::Logic::on_endpoints : valid slot state");
 
-        clock_type::time_point const now(m_clock.now());
+        clock_type::time_point const now(clock.now());
 
         // Limit how often we accept new endpoints
         if (slot->whenAcceptEndpoints > now)
@@ -784,12 +786,12 @@ public:
                     // Test the slot's listening port before
                     // adding it to the livecache for the first time.
                     //
-                    m_checker.async_connect(
+                    checker.asyncConnect(
                         ep.address,
                         std::bind(
                             &Logic::checkComplete,
                             this,
-                            slot->remote_endpoint(),
+                            slot->remoteEndpoint(),
                             ep.address,
                             std::placeholders::_1));
 
@@ -810,11 +812,11 @@ public:
             // listening test, else we silently drop neighbor endpoint
             // since their listening port is misconfigured.
             //
-            livecache_.insert(ep);
-            bootcache_.insert(ep.address);
+            livecache.insert(ep);
+            bootcache.insert(ep.address);
         }
 
-        slot->whenAcceptEndpoints = now + Tuning::secondsPerMessage;
+        slot->whenAcceptEndpoints = now + Tuning::kSECONDS_PER_MESSAGE;
     }
 
     //--------------------------------------------------------------------------
@@ -823,44 +825,44 @@ public:
     remove(SlotImp::ptr const& slot)
     {
         {
-            auto const iter = slots_.find(slot->remote_endpoint());
+            auto const iter = slots.find(slot->remoteEndpoint());
             // The slot must exist in the table
-            if (iter == slots_.end())
+            if (iter == slots.end())
             {
-                LogicError(
+                logicError(
                     "PeerFinder::Logic::remove(): remote_endpoint "
                     "missing from slots_");
             }
 
             // Remove from slot by IP table
-            slots_.erase(iter);
+            slots.erase(iter);
         }
         // Remove the key if present
-        if (slot->public_key() != std::nullopt)
+        if (slot->publicKey() != std::nullopt)
         {
-            auto const iter = keys_.find(*slot->public_key());
+            auto const iter = keys.find(*slot->publicKey());
             // Key must exist
-            if (iter == keys_.end())
+            if (iter == keys.end())
             {
-                LogicError(
+                logicError(
                     "PeerFinder::Logic::remove(): public_key missing "
                     "from keys_");
             }
 
-            keys_.erase(iter);
+            keys.erase(iter);
         }
         // Remove from connected address table
         {
-            auto const iter(connectedAddresses_.find(slot->remote_endpoint().address()));
+            auto const iter(connectedAddresses.find(slot->remoteEndpoint().address()));
             // Address must exist
-            if (iter == connectedAddresses_.end())
+            if (iter == connectedAddresses.end())
             {
-                LogicError(
+                logicError(
                     "PeerFinder::Logic::remove(): remote_endpoint "
                     "address missing from connectedAddresses_");
             }
 
-            connectedAddresses_.erase(iter);
+            connectedAddresses.erase(iter);
         }
 
         // Update counts
@@ -868,40 +870,40 @@ public:
     }
 
     void
-    on_closed(SlotImp::ptr const& slot)
+    onClosed(SlotImp::ptr const& slot)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         remove(slot);
 
-        beast::WrappedSink sink{m_journal.sink(), slot->prefix()};
+        beast::WrappedSink sink{journal.sink(), slot->prefix()};
         beast::Journal const journal{sink};
 
         // Mark fixed slot failure
-        if (slot->fixed() && !slot->inbound() && slot->state() != Slot::State::active)
+        if (slot->fixed() && !slot->inbound() && slot->state() != Slot::State::Active)
         {
-            auto iter(fixed_.find(slot->remote_endpoint()));
+            auto iter(fixed_.find(slot->remoteEndpoint()));
             if (iter == fixed_.end())
             {
-                LogicError(
+                logicError(
                     "PeerFinder::Logic::on_closed(): remote_endpoint "
                     "missing from fixed_");
             }
 
-            iter->second.failure(m_clock.now());
+            iter->second.failure(clock.now());
             JLOG(journal.debug()) << "Logic fixed failed";
         }
 
         // Do state specific bookkeeping
         switch (slot->state())
         {
-            case Slot::State::accept:
+            case Slot::State::Accept:
                 JLOG(journal.trace()) << "Logic accept failed";
                 break;
 
-            case Slot::State::connect:
-            case Slot::State::connected:
-                bootcache_.on_failure(slot->remote_endpoint());
+            case Slot::State::Connect:
+            case Slot::State::Connected:
+                bootcache.onFailure(slot->remoteEndpoint());
                 // VFALCO TODO If the address exists in the ephemeral/live
                 //             endpoint livecache then we should mark the
                 //             failure
@@ -909,11 +911,11 @@ public:
                 // avoid propagating the address.
                 break;
 
-            case Slot::State::active:
+            case Slot::State::Active:
                 JLOG(journal.trace()) << "Logic close";
                 break;
 
-            case Slot::State::closing:
+            case Slot::State::Closing:
                 JLOG(journal.trace()) << "Logic finished";
                 break;
 
@@ -928,17 +930,17 @@ public:
     }
 
     void
-    on_failure(SlotImp::ptr const& slot)
+    onFailure(SlotImp::ptr const& slot)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
-        bootcache_.on_failure(slot->remote_endpoint());
+        bootcache.onFailure(slot->remoteEndpoint());
     }
 
     // Insert a set of redirect IP addresses into the Bootcache
     template <class FwdIter>
     void
-    onRedirects(FwdIter first, FwdIter last, boost::asio::ip::tcp::endpoint const& remote_address);
+    onRedirects(FwdIter first, FwdIter last, boost::asio::ip::tcp::endpoint const& remoteAddress);
 
     //--------------------------------------------------------------------------
 
@@ -978,14 +980,14 @@ public:
     /** Adds eligible Fixed addresses for outbound attempts. */
     template <class Container>
     void
-    get_fixed(std::size_t needed, Container& c, typename ConnectHandouts::Squelches& squelches)
+    getFixed(std::size_t needed, Container& c, typename ConnectHandouts::Squelches& squelches)
     {
-        auto const now(m_clock.now());
+        auto const now(clock.now());
         for (auto iter = fixed_.begin(); needed && iter != fixed_.end(); ++iter)
         {
             auto const& address(iter->first.address());
             if (iter->second.when() <= now && squelches.find(address) == squelches.end() &&
-                std::none_of(slots_.cbegin(), slots_.cend(), [address](Slots::value_type const& v) {
+                std::none_of(slots.cbegin(), slots.cend(), [address](Slots::value_type const& v) {
                     return address == v.first.address();
                 }))
             {
@@ -1007,7 +1009,7 @@ public:
     void
     addSource(std::shared_ptr<Source> const& source)
     {
-        m_sources.push_back(source);
+        sources.push_back(source);
     }
 
     //--------------------------------------------------------------------------
@@ -1023,10 +1025,10 @@ public:
     addBootcacheAddresses(IPAddresses const& list)
     {
         int count(0);
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
         for (auto const& addr : list)
         {
-            if (bootcache_.insertStatic(addr))
+            if (bootcache.insertStatic(addr))
                 ++count;
         }
         return count;
@@ -1040,37 +1042,37 @@ public:
 
         {
             {
-                std::scoped_lock const _(lock_);
-                if (stopping_)
+                std::scoped_lock const _(lock);
+                if (stopping)
                     return;
-                fetchSource_ = source;
+                fetchSource = source;
             }
 
             // VFALCO NOTE The fetch is synchronous,
             //             not sure if that's a good thing.
             //
-            source->fetch(results, m_journal);
+            source->fetch(results, journal);
 
             {
-                std::scoped_lock const _(lock_);
-                if (stopping_)
+                std::scoped_lock const _(lock);
+                if (stopping)
                     return;
-                fetchSource_ = nullptr;
+                fetchSource = nullptr;
             }
         }
 
         if (!results.error)
         {
             int const count(addBootcacheAddresses(results.addresses));
-            JLOG(m_journal.info())
-                << beast::leftw(18) << "Logic added " << count << " new "
-                << ((count == 1) ? "address" : "addresses") << " from " << source->name();
+            JLOG(journal.info()) << beast::Leftw(18) << "Logic added " << count << " new "
+                                 << ((count == 1) ? "address" : "addresses") << " from "
+                                 << source->name();
         }
         else
         {
-            JLOG(m_journal.error())
-                << beast::leftw(18) << "Logic failed "
-                << "'" << source->name() << "' fetch, " << results.error.message();
+            JLOG(journal.error()) << beast::Leftw(18) << "Logic failed "
+                                  << "'" << source->name() << "' fetch, "
+                                  << results.error.message();
         }
     }
 
@@ -1082,11 +1084,11 @@ public:
 
     // Returns true if the IP::Endpoint contains no invalid data.
     bool
-    is_valid_address(beast::IP::Endpoint const& address)
+    isValidAddress(beast::IP::Endpoint const& address)
     {
-        if (is_unspecified(address))
+        if (isUnspecified(address))
             return false;
-        if (!is_public(address))
+        if (!isPublic(address))
             return false;
         if (address.port() == 0)
             return false;
@@ -1106,9 +1108,9 @@ public:
         {
             beast::PropertyStream::Map item(set);
             SlotImp const& slot(*entry.second);
-            if (slot.local_endpoint() != std::nullopt)
-                item["local_address"] = to_string(*slot.local_endpoint());
-            item["remote_address"] = to_string(slot.remote_endpoint());
+            if (slot.localEndpoint() != std::nullopt)
+                item["local_address"] = to_string(*slot.localEndpoint());
+            item["remote_address"] = to_string(slot.remoteEndpoint());
             if (slot.inbound())
                 item["inbound"] = "yes";
             if (slot.fixed())
@@ -1123,17 +1125,17 @@ public:
     void
     onWrite(beast::PropertyStream::Map& map)
     {
-        std::scoped_lock const _(lock_);
+        std::scoped_lock const _(lock);
 
         // VFALCO NOTE These ugly casts are needed because
         //             of how std::size_t is declared on some linuxes
         //
-        map["bootcache"] = std::uint32_t(bootcache_.size());
+        map["bootcache"] = std::uint32_t(bootcache.size());
         map["fixed"] = std::uint32_t(fixed_.size());
 
         {
             beast::PropertyStream::Set child("peers", map);
-            writeSlots(child, slots_);
+            writeSlots(child, slots);
         }
 
         {
@@ -1148,12 +1150,12 @@ public:
 
         {
             beast::PropertyStream::Map child("livecache", map);
-            livecache_.onWrite(child);
+            livecache.onWrite(child);
         }
 
         {
             beast::PropertyStream::Map child("bootcache", map);
-            bootcache_.onWrite(child);
+            bootcache.onWrite(child);
         }
     }
 
@@ -1174,15 +1176,15 @@ public:
     {
         switch (state)
         {
-            case Slot::State::accept:
+            case Slot::State::Accept:
                 return "accept";
-            case Slot::State::connect:
+            case Slot::State::Connect:
                 return "connect";
-            case Slot::State::connected:
+            case Slot::State::Connected:
                 return "connected";
-            case Slot::State::active:
+            case Slot::State::Active:
                 return "active";
-            case Slot::State::closing:
+            case Slot::State::Closing:
                 return "closing";
             default:
                 break;
@@ -1199,16 +1201,16 @@ void
 Logic<Checker>::onRedirects(
     FwdIter first,
     FwdIter last,
-    boost::asio::ip::tcp::endpoint const& remote_address)
+    boost::asio::ip::tcp::endpoint const& remoteAddress)
 {
-    std::scoped_lock const _(lock_);
+    std::scoped_lock const _(lock);
     std::size_t n = 0;
-    for (; first != last && n < Tuning::maxRedirects; ++first, ++n)
-        bootcache_.insert(beast::IPAddressConversion::from_asio(*first));
+    for (; first != last && n < Tuning::MaxRedirects; ++first, ++n)
+        bootcache.insert(beast::IPAddressConversion::fromAsio(*first));
     if (n > 0)
     {
-        JLOG(m_journal.trace()) << beast::leftw(18) << "Logic add " << n << " redirect IPs from "
-                                << remote_address;
+        JLOG(journal.trace()) << beast::Leftw(18) << "Logic add " << n << " redirect IPs from "
+                              << remoteAddress;
     }
 }
 
diff --git a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
index 1c57f5187e..ed9bba0ee4 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderConfig.cpp
@@ -28,7 +28,7 @@ operator==(Config const& lhs, Config const& rhs)
 std::size_t
 Config::calcOutPeers() const
 {
-    return std::max((maxPeers * Tuning::outPercent + 50) / 100, std::size_t(Tuning::minOutCount));
+    return std::max((maxPeers * Tuning::OutPercent + 50) / 100, std::size_t(Tuning::MinOutCount));
 }
 
 void
@@ -41,8 +41,8 @@ Config::applyTuning()
         // IP addresses.
         ipLimit = 2;
 
-        if (inPeers > Tuning::defaultMaxPeers)
-            ipLimit += std::min(5, static_cast<int>(inPeers / Tuning::defaultMaxPeers));
+        if (inPeers > Tuning::DefaultMaxPeers)
+            ipLimit += std::min(5, static_cast<int>(inPeers / Tuning::DefaultMaxPeers));
     }
 
     // We don't allow a single IP to consume all incoming slots,
@@ -81,7 +81,7 @@ Config::makeConfig(
         if (cfg.PEERS_MAX != 0)
             config.maxPeers = cfg.PEERS_MAX;
 
-        config.maxPeers = std::max<std::size_t>(config.maxPeers, Tuning::minOutCount);
+        config.maxPeers = std::max<std::size_t>(config.maxPeers, Tuning::MinOutCount);
         config.outPeers = config.calcOutPeers();
 
         // Calculate the number of outbound peers we want. If we dont want
diff --git a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
index d2378a2fbb..873c18aad9 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
@@ -33,32 +33,34 @@ namespace xrpl::PeerFinder {
 class ManagerImp : public Manager
 {
 public:
+    // NOLINTBEGIN(readability-identifier-naming)
     boost::asio::io_context& io_context_;
     std::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> work_;
-    clock_type& m_clock;
-    beast::Journal m_journal;
-    StoreSqdb m_store;
+    clock_type& clock_;
+    beast::Journal journal_;
+    StoreSqdb store_;
     Checker<boost::asio::ip::tcp> checker_;
-    Logic<decltype(checker_)> m_logic;
-    BasicConfig const& m_config;
+    Logic<decltype(checker_)> logic_;
+    BasicConfig const& config_;
+    // NOLINTEND(readability-identifier-naming)
 
     //--------------------------------------------------------------------------
 
     ManagerImp(
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         clock_type& clock,
         beast::Journal journal,
         BasicConfig const& config,
         beast::insight::Collector::ptr const& collector)
-        : io_context_(io_context)
+        : io_context_(ioContext)
         , work_(std::in_place, boost::asio::make_work_guard(io_context_))
-        , m_clock(clock)
-        , m_journal(journal)
-        , m_store(journal)
+        , clock_(clock)
+        , journal_(journal)
+        , store_(journal)
         , checker_(io_context_)
-        , m_logic(clock, m_store, checker_, journal)
-        , m_config(config)
-        , m_stats(std::bind(&ManagerImp::collect_metrics, this), collector)
+        , logic_(clock, store_, checker_, journal)
+        , config_(config)
+        , stats_(std::bind(&ManagerImp::collectMetrics, this), collector)
     {
     }
 
@@ -74,7 +76,7 @@ public:
         {
             work_.reset();
             checker_.stop();
-            m_logic.stop();
+            logic_.stop();
         }
     }
 
@@ -87,26 +89,26 @@ public:
     void
     setConfig(Config const& config) override
     {
-        m_logic.config(config);
+        logic_.config(config);
     }
 
     Config
     config() override
     {
-        return m_logic.config();
+        return logic_.config();
     }
 
     void
     addFixedPeer(std::string const& name, std::vector<beast::IP::Endpoint> const& addresses)
         override
     {
-        m_logic.addFixedPeer(name, addresses);
+        logic_.addFixedPeer(name, addresses);
     }
 
     void
     addFallbackStrings(std::string const& name, std::vector<std::string> const& strings) override
     {
-        m_logic.addStaticSource(SourceStrings::New(name, strings));
+        logic_.addStaticSource(SourceStrings::make(name, strings));
     }
 
     void
@@ -118,95 +120,95 @@ public:
     //--------------------------------------------------------------------------
 
     std::pair<std::shared_ptr<Slot>, Result>
-    new_inbound_slot(
-        beast::IP::Endpoint const& local_endpoint,
-        beast::IP::Endpoint const& remote_endpoint) override
+    newInboundSlot(
+        beast::IP::Endpoint const& localEndpoint,
+        beast::IP::Endpoint const& remoteEndpoint) override
     {
-        return m_logic.new_inbound_slot(local_endpoint, remote_endpoint);
+        return logic_.newInboundSlot(localEndpoint, remoteEndpoint);
     }
 
     std::pair<std::shared_ptr<Slot>, Result>
-    new_outbound_slot(beast::IP::Endpoint const& remote_endpoint) override
+    newOutboundSlot(beast::IP::Endpoint const& remoteEndpoint) override
     {
-        return m_logic.new_outbound_slot(remote_endpoint);
+        return logic_.newOutboundSlot(remoteEndpoint);
     }
 
     void
-    on_endpoints(std::shared_ptr<Slot> const& slot, Endpoints const& endpoints) override
+    onEndpoints(std::shared_ptr<Slot> const& slot, Endpoints const& endpoints) override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        m_logic.on_endpoints(impl, endpoints);
+        logic_.onEndpoints(impl, endpoints);
     }
 
     void
-    on_closed(std::shared_ptr<Slot> const& slot) override
+    onClosed(std::shared_ptr<Slot> const& slot) override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        m_logic.on_closed(impl);
+        logic_.onClosed(impl);
     }
 
     void
-    on_failure(std::shared_ptr<Slot> const& slot) override
+    onFailure(std::shared_ptr<Slot> const& slot) override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        m_logic.on_failure(impl);
+        logic_.onFailure(impl);
     }
 
     void
     onRedirects(
-        boost::asio::ip::tcp::endpoint const& remote_address,
+        boost::asio::ip::tcp::endpoint const& remoteAddress,
         std::vector<boost::asio::ip::tcp::endpoint> const& eps) override
     {
-        m_logic.onRedirects(eps.begin(), eps.end(), remote_address);
+        logic_.onRedirects(eps.begin(), eps.end(), remoteAddress);
     }
 
     //--------------------------------------------------------------------------
 
     bool
-    onConnected(std::shared_ptr<Slot> const& slot, beast::IP::Endpoint const& local_endpoint)
+    onConnected(std::shared_ptr<Slot> const& slot, beast::IP::Endpoint const& localEndpoint)
         override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        return m_logic.onConnected(impl, local_endpoint);
+        return logic_.onConnected(impl, localEndpoint);
     }
 
     Result
     activate(std::shared_ptr<Slot> const& slot, PublicKey const& key, bool reserved) override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        return m_logic.activate(impl, key, reserved);
+        return logic_.activate(impl, key, reserved);
     }
 
     std::vector<Endpoint>
     redirect(std::shared_ptr<Slot> const& slot) override
     {
         SlotImp::ptr const impl(std::dynamic_pointer_cast<SlotImp>(slot));
-        return m_logic.redirect(impl);
+        return logic_.redirect(impl);
     }
 
     std::vector<beast::IP::Endpoint>
     autoconnect() override
     {
-        return m_logic.autoconnect();
+        return logic_.autoconnect();
     }
 
     void
-    once_per_second() override
+    oncePerSecond() override
     {
-        m_logic.once_per_second();
+        logic_.oncePerSecond();
     }
 
     std::vector<std::pair<std::shared_ptr<Slot>, std::vector<Endpoint>>>
     buildEndpointsForPeers() override
     {
-        return m_logic.buildEndpointsForPeers();
+        return logic_.buildEndpointsForPeers();
     }
 
     void
     start() override
     {
-        m_store.open(m_config);
-        m_logic.load();
+        store_.open(config_);
+        logic_.load();
     }
 
     //--------------------------------------------------------------------------
@@ -218,7 +220,7 @@ public:
     void
     onWrite(beast::PropertyStream::Map& map) override
     {
-        m_logic.onWrite(map);
+        logic_.onWrite(map);
     }
 
 private:
@@ -226,9 +228,9 @@ private:
     {
         template <class Handler>
         Stats(Handler const& handler, beast::insight::Collector::ptr const& collector)
-            : hook(collector->make_hook(handler))
-            , activeInboundPeers(collector->make_gauge("Peer_Finder", "Active_Inbound_Peers"))
-            , activeOutboundPeers(collector->make_gauge("Peer_Finder", "Active_Outbound_Peers"))
+            : hook(collector->makeHook(handler))
+            , activeInboundPeers(collector->makeGauge("Peer_Finder", "Active_Inbound_Peers"))
+            , activeOutboundPeers(collector->makeGauge("Peer_Finder", "Active_Outbound_Peers"))
         {
         }
 
@@ -237,15 +239,15 @@ private:
         beast::insight::Gauge activeOutboundPeers;
     };
 
-    std::mutex m_statsMutex;
-    Stats m_stats;
+    std::mutex statsMutex_;
+    Stats stats_;
 
     void
-    collect_metrics()
+    collectMetrics()
     {
-        std::scoped_lock const lock(m_statsMutex);
-        m_stats.activeInboundPeers = m_logic.counts_.inboundActive();
-        m_stats.activeOutboundPeers = m_logic.counts_.out_active();
+        std::scoped_lock const lock(statsMutex_);
+        stats_.activeInboundPeers = logic_.counts().inboundActive();
+        stats_.activeOutboundPeers = logic_.counts().outActive();
     }
 };
 
@@ -256,14 +258,14 @@ Manager::Manager() noexcept : beast::PropertyStream::Source("peerfinder")
 }
 
 std::unique_ptr<Manager>
-make_Manager(
-    boost::asio::io_context& io_context,
+makeManager(
+    boost::asio::io_context& ioContext,
     clock_type& clock,
     beast::Journal journal,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
 {
-    return std::make_unique<ManagerImp>(io_context, clock, journal, config, collector);
+    return std::make_unique<ManagerImp>(ioContext, clock, journal, config, collector);
 }
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/SlotImp.cpp b/src/xrpld/peerfinder/detail/SlotImp.cpp
index e7cc751472..b941f54b48 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.cpp
+++ b/src/xrpld/peerfinder/detail/SlotImp.cpp
@@ -14,32 +14,32 @@
 namespace xrpl::PeerFinder {
 
 SlotImp::SlotImp(
-    beast::IP::Endpoint const& local_endpoint,
-    beast::IP::Endpoint remote_endpoint,
+    beast::IP::Endpoint const& localEndpoint,
+    beast::IP::Endpoint remoteEndpoint,
     bool fixed,
     clock_type& clock)
     : recent(clock)
-    , m_inbound(true)
-    , m_fixed(fixed)
-    , m_reserved(false)
-    , m_state(State::accept)
-    , m_remote_endpoint(std::move(remote_endpoint))
-    , m_local_endpoint(local_endpoint)
-    , m_listening_port(unknownPort)
+    , inbound_(true)
+    , fixed_(fixed)
+    , reserved_(false)
+    , state_(State::Accept)
+    , remote_endpoint_(std::move(remoteEndpoint))
+    , local_endpoint_(localEndpoint)
+    , listening_port_(kUNKNOWN_PORT)
     , checked(false)
     , canAccept(false)
     , connectivityCheckInProgress(false)
 {
 }
 
-SlotImp::SlotImp(beast::IP::Endpoint remote_endpoint, bool fixed, clock_type& clock)
+SlotImp::SlotImp(beast::IP::Endpoint remoteEndpoint, bool fixed, clock_type& clock)
     : recent(clock)
-    , m_inbound(false)
-    , m_fixed(fixed)
-    , m_reserved(false)
-    , m_state(State::connect)
-    , m_remote_endpoint(std::move(remote_endpoint))
-    , m_listening_port(unknownPort)
+    , inbound_(false)
+    , fixed_(fixed)
+    , reserved_(false)
+    , state_(State::Connect)
+    , remote_endpoint_(std::move(remoteEndpoint))
+    , listening_port_(kUNKNOWN_PORT)
     , checked(true)
     , canAccept(true)
     , connectivityCheckInProgress(false)
@@ -47,36 +47,36 @@ SlotImp::SlotImp(beast::IP::Endpoint remote_endpoint, bool fixed, clock_type& cl
 }
 
 void
-SlotImp::state(State state_)
+SlotImp::state(State state)
 {
     // Must go through activate() to set active state
     XRPL_ASSERT(
-        state_ != State::active, "xrpl::PeerFinder::SlotImp::state : input state is not active");
+        state != State::Active, "xrpl::PeerFinder::SlotImp::state : input state is not active");
 
     // The state must be different
     XRPL_ASSERT(
-        state_ != m_state,
+        state_ != state,
         "xrpl::PeerFinder::SlotImp::state : input state is different from "
         "current");
 
     // You can't transition into the initial states
     XRPL_ASSERT(
-        state_ != State::accept && state_ != State::connect,
+        state != State::Accept && state != State::Connect,
         "xrpl::PeerFinder::SlotImp::state : input state is not an initial");
 
     // Can only become connected from outbound connect state
     XRPL_ASSERT(
-        state_ != State::connected || (!m_inbound && m_state == State::connect),
+        state != State::Connected || (!inbound_ && state_ == State::Connect),
         "xrpl::PeerFinder::SlotImp::state : input state is not connected an "
         "invalid state");
 
     // Can't gracefully close on an outbound connection attempt
     XRPL_ASSERT(
-        state_ != State::closing || m_state != State::connect,
+        state != State::Closing || state_ != State::Connect,
         "xrpl::PeerFinder::SlotImp::state : input state is not closing an "
         "invalid state");
 
-    m_state = state_;
+    state_ = state;
 }
 
 void
@@ -84,10 +84,10 @@ SlotImp::activate(clock_type::time_point const& now)
 {
     // Can only become active from the accept or connected state
     XRPL_ASSERT(
-        m_state == State::accept || m_state == State::connected,
+        state_ == State::Accept || state_ == State::Connected,
         "xrpl::PeerFinder::SlotImp::activate : valid state");
 
-    m_state = State::active;
+    state_ = State::Active;
     whenAcceptEndpoints = now;
 }
 
@@ -97,30 +97,30 @@ Slot::~Slot() = default;
 
 //------------------------------------------------------------------------------
 
-SlotImp::recent_t::recent_t(clock_type& clock) : cache(clock)
+SlotImp::RecentT::RecentT(clock_type& clock) : cache_(clock)
 {
 }
 
 void
-SlotImp::recent_t::insert(beast::IP::Endpoint const& ep, std::uint32_t hops)
+SlotImp::RecentT::insert(beast::IP::Endpoint const& ep, std::uint32_t hops)
 {
-    auto const result(cache.emplace(ep, hops));
+    auto const result(cache_.emplace(ep, hops));
     if (!result.second)
     {
         // NOTE Other logic depends on this <= inequality.
         if (hops <= result.first->second)
         {
             result.first->second = hops;
-            cache.touch(result.first);
+            cache_.touch(result.first);
         }
     }
 }
 
 bool
-SlotImp::recent_t::filter(beast::IP::Endpoint const& ep, std::uint32_t hops)
+SlotImp::RecentT::filter(beast::IP::Endpoint const& ep, std::uint32_t hops)
 {
-    auto const iter(cache.find(ep));
-    if (iter == cache.end())
+    auto const iter(cache_.find(ep));
+    if (iter == cache_.end())
         return false;
     // We avoid sending an endpoint if we heard it
     // from them recently at the same or lower hop count.
@@ -129,9 +129,9 @@ SlotImp::recent_t::filter(beast::IP::Endpoint const& ep, std::uint32_t hops)
 }
 
 void
-SlotImp::recent_t::expire()
+SlotImp::RecentT::expire()
 {
-    beast::expire(cache, Tuning::liveCacheSecondsToLive);
+    beast::expire(cache_, Tuning::kLIVE_CACHE_SECONDS_TO_LIVE);
 }
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h
index a94473be87..b198c93e5d 100644
--- a/src/xrpld/peerfinder/detail/SlotImp.h
+++ b/src/xrpld/peerfinder/detail/SlotImp.h
@@ -17,105 +17,105 @@ public:
 
     // inbound
     SlotImp(
-        beast::IP::Endpoint const& local_endpoint,
-        beast::IP::Endpoint remote_endpoint,
+        beast::IP::Endpoint const& localEndpoint,
+        beast::IP::Endpoint remoteEndpoint,
         bool fixed,
         clock_type& clock);
 
     // outbound
-    SlotImp(beast::IP::Endpoint remote_endpoint, bool fixed, clock_type& clock);
+    SlotImp(beast::IP::Endpoint remoteEndpoint, bool fixed, clock_type& clock);
 
     bool
     inbound() const override
     {
-        return m_inbound;
+        return inbound_;
     }
 
     bool
     fixed() const override
     {
-        return m_fixed;
+        return fixed_;
     }
 
     bool
     reserved() const override
     {
-        return m_reserved;
+        return reserved_;
     }
 
     State
     state() const override
     {
-        return m_state;
+        return state_;
     }
 
     beast::IP::Endpoint const&
-    remote_endpoint() const override
+    remoteEndpoint() const override
     {
-        return m_remote_endpoint;
+        return remote_endpoint_;
     }
 
     std::optional<beast::IP::Endpoint> const&
-    local_endpoint() const override
+    localEndpoint() const override
     {
-        return m_local_endpoint;
+        return local_endpoint_;
     }
 
     std::optional<PublicKey> const&
-    public_key() const override
+    publicKey() const override
     {
-        return m_public_key;
+        return public_key_;
     }
 
     std::string
     prefix() const
     {
-        return "[" + getFingerprint(remote_endpoint(), public_key()) + "] ";
+        return "[" + getFingerprint(remoteEndpoint(), publicKey()) + "] ";
     }
 
     std::optional<std::uint16_t>
-    listening_port() const override
+    listeningPort() const override
     {
-        std::uint32_t const value = m_listening_port;
-        if (value == unknownPort)
+        std::uint32_t const value = listening_port_;
+        if (value == kUNKNOWN_PORT)
             return std::nullopt;
         return value;
     }
 
     void
-    set_listening_port(std::uint16_t port)
+    setListeningPort(std::uint16_t port)
     {
-        m_listening_port = port;
+        listening_port_ = port;
     }
 
     void
-    local_endpoint(beast::IP::Endpoint const& endpoint)
+    localEndpoint(beast::IP::Endpoint const& endpoint)
     {
-        m_local_endpoint = endpoint;
+        local_endpoint_ = endpoint;
     }
 
     void
-    remote_endpoint(beast::IP::Endpoint const& endpoint)
+    remoteEndpoint(beast::IP::Endpoint const& endpoint)
     {
-        m_remote_endpoint = endpoint;
+        remote_endpoint_ = endpoint;
     }
 
     void
-    public_key(PublicKey const& key)
+    publicKey(PublicKey const& key)
     {
-        m_public_key = key;
+        public_key_ = key;
     }
 
     void
-    reserved(bool reserved_)
+    reserved(bool reserved)
     {
-        m_reserved = reserved_;
+        reserved_ = reserved;
     }
 
     //--------------------------------------------------------------------------
 
     void
-    state(State state_);
+    state(State state);
 
     void
     activate(clock_type::time_point const& now);
@@ -125,10 +125,10 @@ public:
     // The set of all recent addresses that we have seen from this peer.
     // We try to avoid sending a peer the same addresses they gave us.
     //
-    class recent_t
+    class RecentT
     {
     public:
-        explicit recent_t(clock_type& clock);
+        explicit RecentT(clock_type& clock);
 
         /** Called for each valid endpoint received for a slot.
             We also insert messages that we send to the slot to prevent
@@ -146,7 +146,7 @@ public:
         expire();
 
         friend class SlotImp;
-        beast::aged_unordered_map<beast::IP::Endpoint, std::uint32_t> cache;
+        beast::aged_unordered_map<beast::IP::Endpoint, std::uint32_t> cache_;
     } recent;
 
     void
@@ -156,16 +156,16 @@ public:
     }
 
 private:
-    bool const m_inbound;
-    bool const m_fixed;
-    bool m_reserved;
-    State m_state;
-    beast::IP::Endpoint m_remote_endpoint;
-    std::optional<beast::IP::Endpoint> m_local_endpoint;
-    std::optional<PublicKey> m_public_key;
+    bool const inbound_;
+    bool const fixed_;
+    bool reserved_;
+    State state_;
+    beast::IP::Endpoint remote_endpoint_;
+    std::optional<beast::IP::Endpoint> local_endpoint_;
+    std::optional<PublicKey> public_key_;
 
-    static std::int32_t constexpr unknownPort = -1;
-    std::atomic<std::int32_t> m_listening_port;
+    static std::int32_t constexpr kUNKNOWN_PORT = -1;
+    std::atomic<std::int32_t> listening_port_;
 
 public:
     // DEPRECATED public data members
diff --git a/src/xrpld/peerfinder/detail/SourceStrings.cpp b/src/xrpld/peerfinder/detail/SourceStrings.cpp
index 4f6d58450c..61a3e0c021 100644
--- a/src/xrpld/peerfinder/detail/SourceStrings.cpp
+++ b/src/xrpld/peerfinder/detail/SourceStrings.cpp
@@ -15,7 +15,7 @@ class SourceStringsImp : public SourceStrings
 {
 public:
     SourceStringsImp(std::string name, Strings strings)
-        : m_name(std::move(name)), m_strings(std::move(strings))
+        : name_(std::move(name)), strings_(std::move(strings))
     {
     }
 
@@ -24,33 +24,33 @@ public:
     std::string const&
     name() override
     {
-        return m_name;
+        return name_;
     }
 
     void
     fetch(Results& results, beast::Journal journal) override
     {
         results.addresses.resize(0);
-        results.addresses.reserve(m_strings.size());
-        for (int i = 0; i < m_strings.size(); ++i)
+        results.addresses.reserve(strings_.size());
+        for (int i = 0; i < strings_.size(); ++i)
         {
-            beast::IP::Endpoint ep(beast::IP::Endpoint::from_string(m_strings[i]));
-            if (is_unspecified(ep))
-                ep = beast::IP::Endpoint::from_string(m_strings[i]);
-            if (!is_unspecified(ep))
+            beast::IP::Endpoint ep(beast::IP::Endpoint::fromString(strings_[i]));
+            if (isUnspecified(ep))
+                ep = beast::IP::Endpoint::fromString(strings_[i]);
+            if (!isUnspecified(ep))
                 results.addresses.push_back(ep);
         }
     }
 
 private:
-    std::string m_name;
-    Strings m_strings;
+    std::string name_;
+    Strings strings_;
 };
 
 //------------------------------------------------------------------------------
 
 std::shared_ptr<Source>
-SourceStrings::New(std::string const& name, Strings const& strings)
+SourceStrings::make(std::string const& name, Strings const& strings)
 {
     return std::make_shared<SourceStringsImp>(name, strings);
 }
diff --git a/src/xrpld/peerfinder/detail/SourceStrings.h b/src/xrpld/peerfinder/detail/SourceStrings.h
index 11b2b927ee..156db0ce85 100644
--- a/src/xrpld/peerfinder/detail/SourceStrings.h
+++ b/src/xrpld/peerfinder/detail/SourceStrings.h
@@ -15,7 +15,7 @@ public:
     using Strings = std::vector<std::string>;
 
     static std::shared_ptr<Source>
-    New(std::string const& name, Strings const& strings);
+    make(std::string const& name, Strings const& strings);
 };
 
 }  // namespace xrpl::PeerFinder
diff --git a/src/xrpld/peerfinder/detail/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h
index 1d5ce50184..13338cbd73 100644
--- a/src/xrpld/peerfinder/detail/StoreSqdb.h
+++ b/src/xrpld/peerfinder/detail/StoreSqdb.h
@@ -11,19 +11,19 @@ namespace xrpl::PeerFinder {
 class StoreSqdb : public Store
 {
 private:
-    beast::Journal m_journal;
-    soci::session m_sqlDb;
+    beast::Journal journal_;
+    soci::session sqlDb_;
 
 public:
     // Need to be named before converting
     // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
     enum {
         // This determines the on-database format of the data
-        currentSchemaVersion = 4
+        CurrentSchemaVersion = 4
     };
 
     explicit StoreSqdb(beast::Journal journal = beast::Journal{beast::Journal::getNullSink()})
-        : m_journal(journal)
+        : journal_(journal)
     {
     }
 
@@ -43,17 +43,17 @@ public:
     {
         std::size_t n(0);
 
-        readPeerFinderDB(m_sqlDb, [&](std::string const& s, int valence) {
-            beast::IP::Endpoint const endpoint(beast::IP::Endpoint::from_string(s));
+        readPeerFinderDB(sqlDb_, [&](std::string const& s, int valence) {
+            beast::IP::Endpoint const endpoint(beast::IP::Endpoint::fromString(s));
 
-            if (!is_unspecified(endpoint))
+            if (!isUnspecified(endpoint))
             {
                 cb(endpoint, valence);
                 ++n;
             }
             else
             {
-                JLOG(m_journal.error()) << "Bad address string '" << s << "' in Bootcache table";
+                JLOG(journal_.error()) << "Bad address string '" << s << "' in Bootcache table";
             }
         });
 
@@ -65,7 +65,7 @@ public:
     void
     save(std::vector<Entry> const& v) override
     {
-        savePeerFinderDB(m_sqlDb, v);
+        savePeerFinderDB(sqlDb_, v);
     }
 
     // Convert any existing entries from an older schema to the
@@ -73,14 +73,14 @@ public:
     void
     update()
     {
-        updatePeerFinderDB(m_sqlDb, currentSchemaVersion, m_journal);
+        updatePeerFinderDB(sqlDb_, CurrentSchemaVersion, journal_);
     }
 
 private:
     void
     init(BasicConfig const& config)
     {
-        initPeerFinderDB(m_sqlDb, config, m_journal);
+        initPeerFinderDB(sqlDb_, config, journal_);
     }
 };
 
diff --git a/src/xrpld/peerfinder/detail/Tuning.h b/src/xrpld/peerfinder/detail/Tuning.h
index e166ae32b8..4fc57a69a0 100644
--- a/src/xrpld/peerfinder/detail/Tuning.h
+++ b/src/xrpld/peerfinder/detail/Tuning.h
@@ -16,11 +16,11 @@ enum {
     //---------------------------------------------------------
 
     /** Time to wait between making batches of connection attempts */
-    secondsPerConnect = 10
+    SecondsPerConnect = 10
 
     /** Maximum number of simultaneous connection attempts. */
     ,
-    maxConnectAttempts = 20
+    MaxConnectAttempts = 20
 
     /** The percentage of total peer slots that are outbound.
         The number of outbound peers will be the larger of the
@@ -28,25 +28,25 @@ enum {
         rounded.
     */
     ,
-    outPercent = 15
+    OutPercent = 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.
     */
     ,
-    minOutCount = 10
+    MinOutCount = 10
 
     /** The default value of Config::maxPeers. */
     ,
-    defaultMaxPeers = 21
+    DefaultMaxPeers = 21
 
     /** Max redirects we will accept from one connection.
         Redirects are limited for security purposes, to prevent
         the address caches from getting flooded.
     */
     ,
-    maxRedirects = 30
+    MaxRedirects = 30
 };
 
 //------------------------------------------------------------------------------
@@ -55,7 +55,7 @@ enum {
 //
 //------------------------------------------------------------------------------
 
-static std::array<int, 10> const connectionBackoff{{1, 1, 2, 3, 5, 8, 13, 21, 34, 55}};
+static std::array<int, 10> const kCONNECTION_BACKOFF{{1, 1, 2, 3, 5, 8, 13, 21, 34, 55}};
 
 //------------------------------------------------------------------------------
 //
@@ -67,18 +67,18 @@ static std::array<int, 10> const connectionBackoff{{1, 1, 2, 3, 5, 8, 13, 21, 34
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum {
     // Threshold of cache entries above which we trim.
-    bootcacheSize = 1000
+    BootcacheSize = 1000
 
     // The percentage of addresses we prune when we trim the cache.
     ,
-    bootcachePrunePercent = 10
+    BootcachePrunePercent = 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 bootcacheCooldownTime(60);
+static std::chrono::seconds const kBOOTCACHE_COOLDOWN_TIME(60);
 
 //------------------------------------------------------------------------------
 //
@@ -87,29 +87,29 @@ static std::chrono::seconds const bootcacheCooldownTime(60);
 //------------------------------------------------------------------------------
 
 // Drop incoming messages with hops greater than this number
-std::uint32_t constexpr maxHops = 6;
+std::uint32_t constexpr kMAX_HOPS = 6;
 
 // How many Endpoint to send in each mtENDPOINTS
-std::uint32_t constexpr numberOfEndpoints = 2 * maxHops;
+std::uint32_t constexpr kNUMBER_OF_ENDPOINTS = 2 * kMAX_HOPS;
 
 // The most Endpoint we will accept in mtENDPOINTS
-std::uint32_t constexpr numberOfEndpointsMax =
-    std::max<decltype(numberOfEndpoints)>(numberOfEndpoints * 2, 64);
+std::uint32_t constexpr kNUMBER_OF_ENDPOINTS_MAX =
+    std::max<decltype(kNUMBER_OF_ENDPOINTS)>(kNUMBER_OF_ENDPOINTS * 2, 64);
 
 // Number of addresses we provide when redirecting.
-std::uint32_t constexpr redirectEndpointCount = 10;
+std::uint32_t constexpr kREDIRECT_ENDPOINT_COUNT = 10;
 
 // How often we send or accept mtENDPOINTS messages per peer
 // (we use a prime number of purpose)
-std::chrono::seconds constexpr secondsPerMessage(151);
+std::chrono::seconds constexpr kSECONDS_PER_MESSAGE(151);
 
 // How long an Endpoint will stay in the cache
 // This should be a small multiple of the broadcast frequency
-std::chrono::seconds constexpr liveCacheSecondsToLive(30);
+std::chrono::seconds constexpr kLIVE_CACHE_SECONDS_TO_LIVE(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 recentAttemptDuration(60);
+std::chrono::seconds constexpr kRECENT_ATTEMPT_DURATION(60);
 
 }  // namespace xrpl::PeerFinder::Tuning
 /** @} */
diff --git a/src/xrpld/peerfinder/detail/iosformat.h b/src/xrpld/peerfinder/detail/iosformat.h
index 325a453bac..632ac10c16 100644
--- a/src/xrpld/peerfinder/detail/iosformat.h
+++ b/src/xrpld/peerfinder/detail/iosformat.h
@@ -10,15 +10,15 @@ namespace beast {
 // functions to produce nice looking log output.
 
 /** Left justifies a field at the specified width. */
-struct leftw
+struct Leftw
 {
-    explicit leftw(int width_) : width(width_)
+    explicit Leftw(int width) : width(width)
     {
     }
     int const width;
     template <class CharT, class Traits>
     friend std::basic_ios<CharT, Traits>&
-    operator<<(std::basic_ios<CharT, Traits>& ios, leftw const& p)
+    operator<<(std::basic_ios<CharT, Traits>& ios, Leftw const& p)
     {
         ios.setf(std::ios_base::left, std::ios_base::adjustfield);
         ios.width(p.width);
@@ -38,17 +38,17 @@ heading(std::basic_string<CharT, Traits, Allocator> title, int width = 80, CharT
 }
 
 /** Produce a dashed line separator, with a specified or default size. */
-struct divider
+struct Divider
 {
     using CharT = char;
-    explicit divider(int width_ = 80, CharT fill_ = CharT('-')) : width(width_), fill(fill_)
+    explicit Divider(int width = 80, CharT fill = CharT('-')) : width(width), fill(fill)
     {
     }
     int const width;
     CharT const fill;
     template <class CharT, class Traits>
     friend std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, divider const& d)
+    operator<<(std::basic_ostream<CharT, Traits>& os, Divider const& d)
     {
         os << std::basic_string<CharT, Traits>(d.width, d.fill);
         return os;
@@ -56,16 +56,16 @@ struct divider
 };
 
 /** Creates a padded field with an optional fill character. */
-struct fpad
+struct Fpad
 {
-    explicit fpad(int width_, int pad_ = 0, char fill_ = ' ') : width(width_ + pad_), fill(fill_)
+    explicit Fpad(int width, int pad = 0, char fill = ' ') : width(width + pad), fill(fill)
     {
     }
     int const width;
     char const fill;
     template <class CharT, class Traits>
     friend std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, fpad const& f)
+    operator<<(std::basic_ostream<CharT, Traits>& os, Fpad const& f)
     {
         os << std::basic_string<CharT, Traits>(f.width, f.fill);
         return os;
@@ -93,12 +93,12 @@ template <
     class CharT,
     class Traits = std::char_traits<CharT>,
     class Allocator = std::allocator<CharT>>
-class field_t
+class FieldT
 {
 public:
     using string_t = std::basic_string<CharT, Traits, Allocator>;
-    field_t(string_t const& text_, int width_, int pad_, bool right_)
-        : text(text_), width(width_), pad(pad_), right(right_)
+    FieldT(string_t const& text, int width, int pad, bool right)
+        : text(text), width(width), pad(pad), right(right)
     {
     }
     string_t const text;
@@ -107,7 +107,7 @@ public:
     bool const right;
     template <class CharT2, class Traits2>
     friend std::basic_ostream<CharT2, Traits2>&
-    operator<<(std::basic_ostream<CharT2, Traits2>& os, field_t<CharT, Traits, Allocator> const& f)
+    operator<<(std::basic_ostream<CharT2, Traits2>& os, FieldT<CharT, Traits, Allocator> const& f)
     {
         std::size_t const length(f.text.length());
         if (f.right)
@@ -129,21 +129,21 @@ public:
 };
 
 template <class CharT, class Traits, class Allocator>
-field_t<CharT, Traits, Allocator>
+FieldT<CharT, Traits, Allocator>
 field(
     std::basic_string<CharT, Traits, Allocator> const& text,
     int width = 8,
     int pad = 0,
     bool right = false)
 {
-    return field_t<CharT, Traits, Allocator>(text, width, pad, right);
+    return FieldT<CharT, Traits, Allocator>(text, width, pad, right);
 }
 
 template <class CharT>
-field_t<CharT>
+FieldT<CharT>
 field(CharT const* text, int width = 8, int pad = 0, bool right = false)
 {
-    return field_t<CharT, std::char_traits<CharT>, std::allocator<CharT>>(
+    return FieldT<CharT, std::char_traits<CharT>, std::allocator<CharT>>(
         std::basic_string<CharT, std::char_traits<CharT>, std::allocator<CharT>>(text),
         width,
         pad,
@@ -151,7 +151,7 @@ field(CharT const* text, int width = 8, int pad = 0, bool right = false)
 }
 
 template <typename T>
-field_t<char>
+FieldT<char>
 field(T const& t, int width = 8, int pad = 0, bool right = false)
 {
     std::string const text(detail::to_string(t));
@@ -159,17 +159,17 @@ field(T const& t, int width = 8, int pad = 0, bool right = false)
 }
 
 template <class CharT, class Traits, class Allocator>
-field_t<CharT, Traits, Allocator>
+FieldT<CharT, Traits, Allocator>
 rField(std::basic_string<CharT, Traits, Allocator> const& text, int width = 8, int pad = 0)
 {
-    return field_t<CharT, Traits, Allocator>(text, width, pad, true);
+    return FieldT<CharT, Traits, Allocator>(text, width, pad, true);
 }
 
 template <class CharT>
-field_t<CharT>
+FieldT<CharT>
 rField(CharT const* text, int width = 8, int pad = 0)
 {
-    return field_t<CharT, std::char_traits<CharT>, std::allocator<CharT>>(
+    return FieldT<CharT, std::char_traits<CharT>, std::allocator<CharT>>(
         std::basic_string<CharT, std::char_traits<CharT>, std::allocator<CharT>>(text),
         width,
         pad,
@@ -177,7 +177,7 @@ rField(CharT const* text, int width = 8, int pad = 0)
 }
 
 template <typename T>
-field_t<char>
+FieldT<char>
 rField(T const& t, int width = 8, int pad = 0)
 {
     std::string const text(detail::to_string(t));
diff --git a/src/xrpld/peerfinder/make_Manager.h b/src/xrpld/peerfinder/make_Manager.h
index 8350255ae2..846330988b 100644
--- a/src/xrpld/peerfinder/make_Manager.h
+++ b/src/xrpld/peerfinder/make_Manager.h
@@ -10,8 +10,8 @@ namespace xrpl::PeerFinder {
 
 /** Create a new Manager. */
 std::unique_ptr<Manager>
-make_Manager(
-    boost::asio::io_context& io_context,
+makeManager(
+    boost::asio::io_context& ioContext,
     clock_type& clock,
     beast::Journal journal,
     BasicConfig const& config,
diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp
index 64950fc689..d50a4ab863 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.cpp
+++ b/src/xrpld/perflog/detail/PerfLogImp.cpp
@@ -35,10 +35,10 @@ PerfLogImp::Counters::Counters(std::set<char const*> const& labels, JobTypes con
 {
     {
         // populateRpc
-        rpc_.reserve(labels.size());
+        rpc.reserve(labels.size());
         for (std::string const label : labels)
         {
-            auto const inserted = rpc_.emplace(label, Rpc()).second;
+            auto const inserted = rpc.emplace(label, Rpc()).second;
             if (!inserted)
             {
                 // Ensure that no other function populates this entry.
@@ -52,10 +52,10 @@ PerfLogImp::Counters::Counters(std::set<char const*> const& labels, JobTypes con
     }
     {
         // populateJq
-        jq_.reserve(jobTypes.size());
+        jq.reserve(jobTypes.size());
         for (auto const& [jobType, _] : jobTypes)
         {
-            auto const inserted = jq_.emplace(jobType, Jq()).second;
+            auto const inserted = jq.emplace(jobType, Jq()).second;
             if (!inserted)
             {
                 // Ensure that no other function populates this entry.
@@ -69,13 +69,13 @@ PerfLogImp::Counters::Counters(std::set<char const*> const& labels, JobTypes con
     }
 }
 
-Json::Value
+json::Value
 PerfLogImp::Counters::countersJson() const
 {
-    Json::Value rpcobj(Json::objectValue);
+    json::Value rpcobj(json::ObjectValue);
     // totalRpc represents all rpc methods. All that started, finished, etc.
     Rpc totalRpc;
-    for (auto const& proc : rpc_)
+    for (auto const& proc : rpc)
     {
         Rpc value;
         {
@@ -88,7 +88,7 @@ PerfLogImp::Counters::countersJson() const
             value = proc.second.value;
         }
 
-        Json::Value p(Json::objectValue);
+        json::Value p(json::ObjectValue);
         p[jss::started] = std::to_string(value.started);
         totalRpc.started += value.started;
         p[jss::finished] = std::to_string(value.finished);
@@ -102,7 +102,7 @@ PerfLogImp::Counters::countersJson() const
 
     if (totalRpc.started != 0u)
     {
-        Json::Value totalRpcJson(Json::objectValue);
+        json::Value totalRpcJson(json::ObjectValue);
         totalRpcJson[jss::started] = std::to_string(totalRpc.started);
         totalRpcJson[jss::finished] = std::to_string(totalRpc.finished);
         totalRpcJson[jss::errored] = std::to_string(totalRpc.errored);
@@ -110,10 +110,10 @@ PerfLogImp::Counters::countersJson() const
         rpcobj[jss::total] = totalRpcJson;
     }
 
-    Json::Value jobQueueObj(Json::objectValue);
+    json::Value jobQueueObj(json::ObjectValue);
     // totalJq represents all jobs. All enqueued, started, finished, etc.
     Jq totalJq;
-    for (auto const& proc : jq_)
+    for (auto const& proc : jq)
     {
         Jq value;
         {
@@ -126,7 +126,7 @@ PerfLogImp::Counters::countersJson() const
             value = proc.second.value;
         }
 
-        Json::Value j(Json::objectValue);
+        json::Value j(json::ObjectValue);
         j[jss::queued] = std::to_string(value.queued);
         totalJq.queued += value.queued;
         j[jss::started] = std::to_string(value.started);
@@ -142,7 +142,7 @@ PerfLogImp::Counters::countersJson() const
 
     if (totalJq.queued != 0u)
     {
-        Json::Value totalJqJson(Json::objectValue);
+        json::Value totalJqJson(json::ObjectValue);
         totalJqJson[jss::queued] = std::to_string(totalJq.queued);
         totalJqJson[jss::started] = std::to_string(totalJq.started);
         totalJqJson[jss::finished] = std::to_string(totalJq.finished);
@@ -151,7 +151,7 @@ PerfLogImp::Counters::countersJson() const
         jobQueueObj[jss::total] = totalJqJson;
     }
 
-    Json::Value counters(Json::objectValue);
+    json::Value counters(json::ObjectValue);
     // Be kind to reporting tools and let them expect rpc and jq objects
     // even if empty.
     counters[jss::rpc] = rpcobj;
@@ -159,46 +159,46 @@ PerfLogImp::Counters::countersJson() const
     return counters;
 }
 
-Json::Value
+json::Value
 PerfLogImp::Counters::currentJson() const
 {
     auto const present = steady_clock::now();
 
-    Json::Value jobsArray(Json::arrayValue);
+    json::Value jobsArray(json::ArrayValue);
     auto const jobs = [this] {
-        std::scoped_lock const lock(jobsMutex_);
-        return jobs_;
+        std::scoped_lock const lock(jobsMutex);
+        return this->jobs;
     }();
 
     for (auto const& j : jobs)
     {
-        if (j.first == jtINVALID)
+        if (j.first == JtInvalid)
             continue;
-        Json::Value jobj(Json::objectValue);
+        json::Value jobj(json::ObjectValue);
         jobj[jss::job] = JobTypes::name(j.first);
         jobj[jss::duration_us] =
             std::to_string(std::chrono::duration_cast<microseconds>(present - j.second).count());
         jobsArray.append(jobj);
     }
 
-    Json::Value methodsArray(Json::arrayValue);
+    json::Value methodsArray(json::ArrayValue);
     std::vector<MethodStart> methods;
     {
-        std::scoped_lock const lock(methodsMutex_);
-        methods.reserve(methods_.size());
-        for (auto const& m : methods_)
+        std::scoped_lock const lock(methodsMutex);
+        methods.reserve(this->methods.size());
+        for (auto const& m : this->methods)
             methods.push_back(m.second);
     }
     for (auto m : methods)
     {
-        Json::Value methodobj(Json::objectValue);
+        json::Value methodobj(json::ObjectValue);
         methodobj[jss::method] = m.first;
         methodobj[jss::duration_us] =
             std::to_string(std::chrono::duration_cast<microseconds>(present - m.second).count());
         methodsArray.append(methodobj);
     }
 
-    Json::Value current(Json::objectValue);
+    json::Value current(json::ObjectValue);
     current[jss::jobs] = jobsArray;
     current[jss::methods] = methodsArray;
     return current;
@@ -277,20 +277,20 @@ PerfLogImp::report()
         return;
     lastLog_ = present;
 
-    Json::Value report(Json::objectValue);
+    json::Value report(json::ObjectValue);
     report[jss::time] = to_string(std::chrono::floor<microseconds>(present));
     {
-        std::scoped_lock const lock{counters_.jobsMutex_};
-        report[jss::workers] = static_cast<unsigned int>(counters_.jobs_.size());
+        std::scoped_lock const lock{counters_.jobsMutex};
+        report[jss::workers] = static_cast<unsigned int>(counters_.jobs.size());
     }
     report[jss::hostid] = hostname_;
     report[jss::counters] = counters_.countersJson();
-    report[jss::nodestore] = Json::objectValue;
+    report[jss::nodestore] = json::ObjectValue;
     app_.getNodeStore().getCountsJson(report[jss::nodestore]);
     report[jss::current_activities] = counters_.currentJson();
     app_.getOPs().stateAccounting(report);
 
-    logFile_ << Json::Compact{std::move(report)} << std::endl;
+    logFile_ << json::Compact{std::move(report)} << std::endl;
 }
 
 PerfLogImp::PerfLogImp(
@@ -311,8 +311,8 @@ PerfLogImp::~PerfLogImp()
 void
 PerfLogImp::rpcStart(std::string const& method, std::uint64_t const requestId)
 {
-    auto counter = counters_.rpc_.find(method);
-    if (counter == counters_.rpc_.end())
+    auto counter = counters_.rpc.find(method);
+    if (counter == counters_.rpc.end())
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::perf::PerfLogImp::rpcStart : valid method input");
@@ -324,15 +324,15 @@ PerfLogImp::rpcStart(std::string const& method, std::uint64_t const requestId)
         std::scoped_lock const lock(counter->second.mutex);
         ++counter->second.value.started;
     }
-    std::scoped_lock const lock(counters_.methodsMutex_);
-    counters_.methods_[requestId] = {counter->first.c_str(), steady_clock::now()};
+    std::scoped_lock const lock(counters_.methodsMutex);
+    counters_.methods[requestId] = {counter->first.c_str(), steady_clock::now()};
 }
 
 void
 PerfLogImp::rpcEnd(std::string const& method, std::uint64_t const requestId, bool finish)
 {
-    auto counter = counters_.rpc_.find(method);
-    if (counter == counters_.rpc_.end())
+    auto counter = counters_.rpc.find(method);
+    if (counter == counters_.rpc.end())
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::perf::PerfLogImp::rpcEnd : valid method input");
@@ -341,12 +341,12 @@ PerfLogImp::rpcEnd(std::string const& method, std::uint64_t const requestId, boo
     }
     steady_time_point startTime;
     {
-        std::scoped_lock const lock(counters_.methodsMutex_);
-        auto const e = counters_.methods_.find(requestId);
-        if (e != counters_.methods_.end())
+        std::scoped_lock const lock(counters_.methodsMutex);
+        auto const e = counters_.methods.find(requestId);
+        if (e != counters_.methods.end())
         {
             startTime = e->second.second;
-            counters_.methods_.erase(e);
+            counters_.methods.erase(e);
         }
         else
         {
@@ -371,8 +371,8 @@ PerfLogImp::rpcEnd(std::string const& method, std::uint64_t const requestId, boo
 void
 PerfLogImp::jobQueue(JobType const type)
 {
-    auto counter = counters_.jq_.find(type);
-    if (counter == counters_.jq_.end())
+    auto counter = counters_.jq.find(type);
+    if (counter == counters_.jq.end())
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::perf::PerfLogImp::jobQueue : valid job type input");
@@ -390,8 +390,8 @@ PerfLogImp::jobStart(
     steady_time_point startTime,
     int instance)
 {
-    auto counter = counters_.jq_.find(type);
-    if (counter == counters_.jq_.end())
+    auto counter = counters_.jq.find(type);
+    if (counter == counters_.jq.end())
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::perf::PerfLogImp::jobStart : valid job type input");
@@ -404,16 +404,16 @@ PerfLogImp::jobStart(
         ++counter->second.value.started;
         counter->second.value.queuedDuration += dur;
     }
-    std::scoped_lock const lock(counters_.jobsMutex_);
-    if (instance >= 0 && instance < counters_.jobs_.size())
-        counters_.jobs_[instance] = {type, startTime};
+    std::scoped_lock const lock(counters_.jobsMutex);
+    if (instance >= 0 && instance < counters_.jobs.size())
+        counters_.jobs[instance] = {type, startTime};
 }
 
 void
 PerfLogImp::jobFinish(JobType const type, microseconds dur, int instance)
 {
-    auto counter = counters_.jq_.find(type);
-    if (counter == counters_.jq_.end())
+    auto counter = counters_.jq.find(type);
+    if (counter == counters_.jq.end())
     {
         // LCOV_EXCL_START
         UNREACHABLE("xrpl::perf::PerfLogImp::jobFinish : valid job type input");
@@ -426,17 +426,17 @@ PerfLogImp::jobFinish(JobType const type, microseconds dur, int instance)
         ++counter->second.value.finished;
         counter->second.value.runningDuration += dur;
     }
-    std::scoped_lock const lock(counters_.jobsMutex_);
-    if (instance >= 0 && instance < counters_.jobs_.size())
-        counters_.jobs_[instance] = {jtINVALID, steady_time_point()};
+    std::scoped_lock const lock(counters_.jobsMutex);
+    if (instance >= 0 && instance < counters_.jobs.size())
+        counters_.jobs[instance] = {JtInvalid, steady_time_point()};
 }
 
 void
 PerfLogImp::resizeJobs(int const resize)
 {
-    std::scoped_lock const lock(counters_.jobsMutex_);
-    if (resize > counters_.jobs_.size())
-        counters_.jobs_.resize(resize, {jtINVALID, steady_time_point()});
+    std::scoped_lock const lock(counters_.jobsMutex);
+    if (resize > counters_.jobs.size())
+        counters_.jobs.resize(resize, {JtInvalid, steady_time_point()});
 }
 
 void
@@ -474,7 +474,7 @@ PerfLogImp::stop()
 //-----------------------------------------------------------------------------
 
 PerfLog::Setup
-setup_PerfLog(Section const& section, boost::filesystem::path const& configDir)
+setupPerfLog(Section const& section, boost::filesystem::path const& configDir)
 {
     PerfLog::Setup setup;
     std::string perfLog;
@@ -489,13 +489,13 @@ setup_PerfLog(Section const& section, boost::filesystem::path const& configDir)
     }
 
     std::uint64_t logInterval = 0;
-    if (get_if_exists(section, "log_interval", logInterval))
+    if (getIfExists(section, "log_interval", logInterval))
         setup.logInterval = std::chrono::seconds(logInterval);
     return setup;
 }
 
 std::unique_ptr<PerfLog>
-make_PerfLog(
+makePerfLog(
     PerfLog::Setup const& setup,
     Application& app,
     beast::Journal journal,
diff --git a/src/xrpld/perflog/detail/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h
index 2898158ea5..bd60912c18 100644
--- a/src/xrpld/perflog/detail/PerfLogImp.h
+++ b/src/xrpld/perflog/detail/PerfLogImp.h
@@ -81,19 +81,19 @@ class PerfLogImp : public PerfLog
             microseconds runningDuration{0};
         };
 
-        // rpc_ and jq_ do not need mutex protection because all
+        // rpc and jq do not need mutex protection because all
         // keys and values are created before more threads are started.
-        std::unordered_map<std::string, Locked<Rpc>> rpc_;
-        std::unordered_map<JobType, Locked<Jq>> jq_;
-        std::vector<std::pair<JobType, steady_time_point>> jobs_;
-        mutable std::mutex jobsMutex_;
-        std::unordered_map<std::uint64_t, MethodStart> methods_;
-        mutable std::mutex methodsMutex_;
+        std::unordered_map<std::string, Locked<Rpc>> rpc;
+        std::unordered_map<JobType, Locked<Jq>> jq;
+        std::vector<std::pair<JobType, steady_time_point>> jobs;
+        mutable std::mutex jobsMutex;
+        std::unordered_map<std::uint64_t, MethodStart> methods;
+        mutable std::mutex methodsMutex;
 
         Counters(std::set<char const*> const& labels, JobTypes const& jobTypes);
-        Json::Value
+        json::Value
         countersJson() const;
-        Json::Value
+        json::Value
         currentJson() const;
     };
 
@@ -152,13 +152,13 @@ public:
     void
     jobFinish(JobType const type, microseconds dur, int instance) override;
 
-    Json::Value
+    json::Value
     countersJson() const override
     {
         return counters_.countersJson();
     }
 
-    Json::Value
+    json::Value
     currentJson() const override
     {
         return counters_.currentJson();
diff --git a/src/xrpld/rpc/BookChanges.h b/src/xrpld/rpc/BookChanges.h
index 89b99cabe3..f80de30b09 100644
--- a/src/xrpld/rpc/BookChanges.h
+++ b/src/xrpld/rpc/BookChanges.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
-namespace Json {
+namespace json {
 class Value;
-}  // namespace Json
+}  // namespace json
 
 namespace xrpl {
 
@@ -23,7 +23,7 @@ class STTx;
 namespace RPC {
 
 template <class L>
-Json::Value
+json::Value
 computeBookChanges(std::shared_ptr<L const> const& lpAccepted)
 {
     std::map<
@@ -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::zero)
+            if (second == beast::kZERO)
                 continue;
 
             STAmount const rate = divide(first, second, noIssue());
 
-            if (first < beast::zero)
+            if (first < beast::kZERO)
                 first = -first;
 
-            if (second < beast::zero)
+            if (second < beast::kZERO)
                 second = -second;
 
             std::stringstream ss;
@@ -164,7 +164,7 @@ computeBookChanges(std::shared_ptr<L const> const& lpAccepted)
         }
     }
 
-    Json::Value jvObj(Json::objectValue);
+    json::Value jvObj(json::ObjectValue);
     jvObj[jss::type] = "bookChanges";
 
     // retrieve validated information from LedgerHeader class
@@ -172,9 +172,9 @@ computeBookChanges(std::shared_ptr<L const> const& lpAccepted)
     jvObj[jss::ledger_index] = lpAccepted->header().seq;
     jvObj[jss::ledger_hash] = to_string(lpAccepted->header().hash);
     jvObj[jss::ledger_time] =
-        Json::Value::UInt(lpAccepted->header().closeTime.time_since_epoch().count());
+        json::Value::UInt(lpAccepted->header().closeTime.time_since_epoch().count());
 
-    jvObj[jss::changes] = Json::arrayValue;
+    jvObj[jss::changes] = json::ArrayValue;
 
     auto volToStr = [](STAmount const& vol) {
         return vol.asset().visit(
@@ -188,7 +188,7 @@ computeBookChanges(std::shared_ptr<L const> const& lpAccepted)
 
     for (auto const& entry : tally)
     {
-        Json::Value& inner = jvObj[jss::changes].append(Json::objectValue);
+        json::Value& inner = jvObj[jss::changes].append(json::ObjectValue);
 
         STAmount const volA = std::get<0>(entry.second);
         STAmount const volB = std::get<1>(entry.second);
diff --git a/src/xrpld/rpc/CTID.h b/src/xrpld/rpc/CTID.h
index 9b36cf167d..6c7e95a246 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 maxLedgerSeq = 0x0FFF'FFFF;
-    constexpr uint32_t maxTxnIndex = 0xFFFF;
-    constexpr uint32_t maxNetworkID = 0xFFFF;
+    constexpr uint32_t kMAX_LEDGER_SEQ = 0x0FFF'FFFF;
+    constexpr uint32_t kMAX_TXN_INDEX = 0xFFFF;
+    constexpr uint32_t kMAX_NETWORK_ID = 0xFFFF;
 
-    if (ledgerSeq > maxLedgerSeq || txnIndex > maxTxnIndex || networkID > maxNetworkID)
+    if (ledgerSeq > kMAX_LEDGER_SEQ || txnIndex > kMAX_TXN_INDEX || networkID > kMAX_NETWORK_ID)
         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 hexRegex("^[0-9A-Fa-f]{16}$");
-        if (!boost::regex_match(ctidString, hexRegex))
+        static boost::regex const kHEX_REGEX("^[0-9A-Fa-f]{16}$");
+        if (!boost::regex_match(ctidString, kHEX_REGEX))
             return std::nullopt;
 
         try
@@ -94,9 +94,9 @@ decodeCTID(T const ctid) noexcept
     }
 
     // Validate CTID prefix.
-    constexpr uint64_t ctidPrefixMask = 0xF000'0000'0000'0000ULL;
-    constexpr uint64_t ctidPrefix = 0xC000'0000'0000'0000ULL;
-    if ((ctidValue & ctidPrefixMask) != ctidPrefix)
+    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)
         return std::nullopt;
 
     uint32_t const ledgerSeq = static_cast<uint32_t>((ctidValue >> 32) & 0x0FFF'FFFF);
diff --git a/src/xrpld/rpc/Context.h b/src/xrpld/rpc/Context.h
index 58768d028a..3724ce1783 100644
--- a/src/xrpld/rpc/Context.h
+++ b/src/xrpld/rpc/Context.h
@@ -40,7 +40,7 @@ struct JsonContext : public Context
         std::string_view forwardedFor;
     };
 
-    Json::Value params;
+    json::Value params;
 
     Headers headers{};
 };
diff --git a/src/xrpld/rpc/DeliveredAmount.h b/src/xrpld/rpc/DeliveredAmount.h
index 65f11e9736..b603fa4acd 100644
--- a/src/xrpld/rpc/DeliveredAmount.h
+++ b/src/xrpld/rpc/DeliveredAmount.h
@@ -6,9 +6,9 @@
 #include <functional>
 #include <memory>
 
-namespace Json {
+namespace json {
 class Value;
-}  // namespace Json
+}  // namespace json
 
 namespace xrpl {
 
@@ -34,20 +34,20 @@ struct Context;
  */
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     ReadView const&,
     std::shared_ptr<STTx const> const& serializedTx,
     TxMeta const&);
 
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     RPC::JsonContext const&,
     std::shared_ptr<Transaction> const&,
     TxMeta const&);
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     RPC::JsonContext const&,
     std::shared_ptr<STTx const> const&,
     TxMeta const&);
diff --git a/src/xrpld/rpc/MPTokenIssuanceID.h b/src/xrpld/rpc/MPTokenIssuanceID.h
index b48f785f87..8a8f6f3d51 100644
--- a/src/xrpld/rpc/MPTokenIssuanceID.h
+++ b/src/xrpld/rpc/MPTokenIssuanceID.h
@@ -28,7 +28,7 @@ getIDFromCreatedIssuance(TxMeta const& transactionMeta);
 
 void
 insertMPTokenIssuanceID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta);
 /** @} */
diff --git a/src/xrpld/rpc/RPCCall.h b/src/xrpld/rpc/RPCCall.h
index 9994195bb0..7a09115e42 100644
--- a/src/xrpld/rpc/RPCCall.h
+++ b/src/xrpld/rpc/RPCCall.h
@@ -28,33 +28,33 @@ fromCommandLine(Config const& config, std::vector<std::string> const& vCmd, Logs
 
 void
 fromNetwork(
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     std::string const& strIp,
     std::uint16_t const iPort,
     std::string const& strUsername,
     std::string const& strPassword,
     std::string const& strPath,
     std::string const& strMethod,
-    Json::Value const& jvParams,
+    json::Value const& jvParams,
     bool const bSSL,
     bool quiet,
     Logs& logs,
-    std::function<void(Json::Value const& jvInput)> callbackFuncP =
-        std::function<void(Json::Value const& jvInput)>(),
+    std::function<void(json::Value const& jvInput)> callbackFuncP =
+        std::function<void(json::Value const& jvInput)>(),
     std::unordered_map<std::string, std::string> headers = {});
 }  // namespace RPCCall
 
-Json::Value
+json::Value
 rpcCmdToJson(
     std::vector<std::string> const& args,
-    Json::Value& retParams,
+    json::Value& retParams,
     unsigned int apiVersion,
     beast::Journal j);
 
 /** Internal invocation of RPC client.
  *  Used by both xrpld command line as well as xrpld unit tests
  */
-std::pair<int, Json::Value>
+std::pair<int, json::Value>
 rpcClient(
     std::vector<std::string> const& args,
     Config const& config,
diff --git a/src/xrpld/rpc/RPCHandler.h b/src/xrpld/rpc/RPCHandler.h
index c8133f3fe6..7e57b456fc 100644
--- a/src/xrpld/rpc/RPCHandler.h
+++ b/src/xrpld/rpc/RPCHandler.h
@@ -7,9 +7,9 @@ namespace xrpl::RPC {
 
 struct JsonContext;
 
-/** Execute an RPC command and store the results in a Json::Value. */
+/** Execute an RPC command and store the results in a json::Value. */
 Status
-doCommand(RPC::JsonContext&, Json::Value&);
+doCommand(RPC::JsonContext&, json::Value&);
 
 Role
 roleRequired(unsigned int version, bool betaEnabled, std::string const& method);
diff --git a/src/xrpld/rpc/RPCSub.h b/src/xrpld/rpc/RPCSub.h
index e96234ee02..4c0903ed3e 100644
--- a/src/xrpld/rpc/RPCSub.h
+++ b/src/xrpld/rpc/RPCSub.h
@@ -21,11 +21,11 @@ protected:
     explicit RPCSub(InfoSub::Source& source);
 };
 
-// VFALCO Why is the io_context needed?
+// VFALCO Why is the ioContext needed?
 std::shared_ptr<RPCSub>
-make_RPCSub(
+makeRPCSub(
     InfoSub::Source& source,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     JobQueue& jobQueue,
     std::string const& strUrl,
     std::string const& strUsername,
diff --git a/src/xrpld/rpc/Request.h b/src/xrpld/rpc/Request.h
deleted file mode 100644
index 69f064e9de..0000000000
--- a/src/xrpld/rpc/Request.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include <xrpl/beast/utility/Journal.h>
-#include <xrpl/json/json_value.h>
-#include <xrpl/resource/Charge.h>
-#include <xrpl/resource/Fees.h>
-
-namespace xrpl {
-
-class Application;
-
-namespace RPC {
-
-struct Request
-{
-    explicit Request(
-        beast::Journal journal_,
-        std::string const& method_,
-        Json::Value& params_,
-        Application& app_)
-        : journal(journal_)
-        , method(method_)
-        , params(params_)
-        , fee(Resource::feeReferenceRPC)
-        , app(app_)
-    {
-    }
-
-    // [in] The Journal for logging
-    beast::Journal const journal;
-
-    // [in] The JSON-RPC method
-    std::string method;
-
-    // [in] The Ripple-specific "params" object
-    Json::Value params;
-
-    // [in, out] The resource cost for the command
-    Resource::Charge fee;
-
-    // [out] The JSON-RPC response
-    Json::Value result;
-
-    // [in] The Application instance
-    Application& app;
-
-private:
-    Request&
-    operator=(Request const&);
-};
-
-}  // namespace RPC
-}  // namespace xrpl
diff --git a/src/xrpld/rpc/Role.h b/src/xrpld/rpc/Role.h
index 554f9c1765..d1b641f067 100644
--- a/src/xrpld/rpc/Role.h
+++ b/src/xrpld/rpc/Role.h
@@ -29,13 +29,13 @@ enum class Role { GUEST, USER, IDENTIFIED, ADMIN, PROXY, FORBID };
     which is an array with at least one object. Inside this object
     are the optional keys 'admin_user' and 'admin_password' used to
     validate the credentials. If user is non-blank, it's username
-    passed in the HTTP header by a secure_gateway proxy.
+    passed in the HTTP header by a secureGateway proxy.
 */
 Role
 requestRole(
     Role const& required,
     Port const& port,
-    Json::Value const& params,
+    json::Value const& params,
     beast::IP::Endpoint const& remoteIp,
     std::string_view user);
 
diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h
index da6e36fc33..6b4cc34cc5 100644
--- a/src/xrpld/rpc/ServerHandler.h
+++ b/src/xrpld/rpc/ServerHandler.h
@@ -37,9 +37,9 @@ public:
         std::vector<Port> ports;
 
         // Memberspace
-        struct client_t
+        struct ClientT
         {
-            explicit client_t() = default;
+            explicit ClientT() = default;
 
             bool secure = false;
             std::string ip;
@@ -51,7 +51,7 @@ public:
         };
 
         // Configuration when acting in client role
-        client_t client;
+        ClientT client;
 
         // Configuration for the Overlay
         boost::asio::ip::tcp::endpoint overlay;
@@ -65,13 +65,13 @@ private:
     using stream_type = boost::beast::ssl_stream<socket_type>;
 
     Application& app_;
-    Resource::Manager& m_resourceManager;
-    beast::Journal m_journal;
-    NetworkOPs& m_networkOPs;
-    std::unique_ptr<Server> m_server;
+    Resource::Manager& resourceManager_;
+    beast::Journal journal_;
+    NetworkOPs& networkOPs_;
+    std::unique_ptr<Server> server_;
     Setup setup_;
     Endpoints endpoints_;
-    JobQueue& m_jobQueue;
+    JobQueue& jobQueue_;
     beast::insight::Counter rpc_requests_;
     beast::insight::Event rpc_size_;
     beast::insight::Event rpc_time_;
@@ -89,7 +89,7 @@ private:
     // Friend declaration that allows make_ServerHandler to access the
     // private type that restricts access to the ServerHandler ctor.
     friend std::unique_ptr<ServerHandler>
-    make_ServerHandler(
+    makeServerHandler(
         Application& app,
         boost::asio::io_context&,
         JobQueue&,
@@ -102,7 +102,7 @@ public:
     ServerHandler(
         ServerHandlerCreator const&,
         Application& app,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         JobQueue& jobQueue,
         NetworkOPs& networkOPs,
         Resource::Manager& resourceManager,
@@ -110,7 +110,7 @@ public:
 
     ~ServerHandler();
 
-    using Output = Json::Output;
+    using Output = json::Output;
 
     void
     setup(Setup const& setup, beast::Journal journal);
@@ -142,15 +142,15 @@ public:
         Session& session,
         std::unique_ptr<stream_type>&& bundle,
         http_request_type&& request,
-        boost::asio::ip::tcp::endpoint const& remote_address);
+        boost::asio::ip::tcp::endpoint const& remoteAddress);
 
     Handoff
     onHandoff(
         Session& session,
         http_request_type&& request,  // NOLINT(cppcoreguidelines-rvalue-reference-param-not-moved)
-        boost::asio::ip::tcp::endpoint const& remote_address)
+        boost::asio::ip::tcp::endpoint const& remoteAddress)
     {
-        return onHandoff(session, {}, std::forward<http_request_type>(request), remote_address);
+        return onHandoff(session, {}, std::forward<http_request_type>(request), remoteAddress);
     }
 
     void
@@ -168,11 +168,11 @@ public:
     onStopped(Server&);
 
 private:
-    Json::Value
+    json::Value
     processSession(
         std::shared_ptr<WSSession> const& session,
         std::shared_ptr<JobQueue::Coro> const& coro,
-        Json::Value const& jv);
+        json::Value const& jv);
 
     void
     processSession(std::shared_ptr<Session> const&, std::shared_ptr<JobQueue::Coro> coro);
@@ -192,10 +192,10 @@ private:
 };
 
 ServerHandler::Setup
-setup_ServerHandler(Config const& c, std::ostream& log);
+setupServerHandler(Config const& c, std::ostream& log);
 
 std::unique_ptr<ServerHandler>
-make_ServerHandler(
+makeServerHandler(
     Application& app,
     boost::asio::io_context&,
     JobQueue&,
diff --git a/src/xrpld/rpc/Status.h b/src/xrpld/rpc/Status.h
index ecd4c2c058..8f7c620baa 100644
--- a/src/xrpld/rpc/Status.h
+++ b/src/xrpld/rpc/Status.h
@@ -12,17 +12,17 @@ namespace xrpl::RPC {
     interface and a way to attach additional information to existing status
     returns.
 
-    A Status can also be used to fill a Json::Value with a JSON-RPC 2.0
+    A Status can also be used to fill a json::Value with a JSON-RPC 2.0
     error response:  see http://www.jsonrpc.org/specification#error_object
  */
 struct Status : public std::exception
 {
 public:
-    enum class Type { none, TER, error_code_i };
+    enum class Type { None, TER, ErrorCodeI };
     using Code = int;
     using Strings = std::vector<std::string>;
 
-    static constexpr Code OK = 0;
+    static constexpr Code kOK = 0;
 
     Status() = default;
 
@@ -37,13 +37,12 @@ public:
     {
     }
 
-    Status(error_code_i e, Strings d = {})
-        : type_(Type::error_code_i), code_(e), messages_(std::move(d))
+    Status(ErrorCodeI e, Strings d = {})
+        : type_(Type::ErrorCodeI), code_(e), messages_(std::move(d))
     {
     }
 
-    Status(error_code_i e, std::string const& s)
-        : type_(Type::error_code_i), code_(e), messages_({s})
+    Status(ErrorCodeI e, std::string const& s) : type_(Type::ErrorCodeI), code_(e), messages_({s})
     {
     }
 
@@ -56,7 +55,7 @@ public:
     /** Returns true if the Status is *not* OK. */
     operator bool() const
     {
-        return code_ != OK;
+        return code_ != kOK;
     }
 
     /** Returns true if the Status is OK. */
@@ -76,28 +75,28 @@ public:
     }
 
     /** Returns the Status as an error_code_i.
-        This may only be called if type() == Type::error_code_i. */
-    [[nodiscard]] error_code_i
+        This may only be called if type() == Type::ErrorCodeI. */
+    [[nodiscard]] ErrorCodeI
     toErrorCode() const
     {
-        XRPL_ASSERT(type_ == Type::error_code_i, "xrpl::RPC::Status::toTER : type is error code");
-        return error_code_i(code_);
+        XRPL_ASSERT(type_ == Type::ErrorCodeI, "xrpl::RPC::Status::toTER : type is error code");
+        return ErrorCodeI(code_);
     }
 
     /** Apply the Status to a JsonObject
      */
     void
-    inject(Json::Value& object) const
+    inject(json::Value& object) const
     {
         if (auto ec = toErrorCode())
         {
             if (messages_.empty())
             {
-                inject_error(ec, object);
+                injectError(ec, object);
             }
             else
             {
-                inject_error(ec, message(), object);
+                injectError(ec, message(), object);
             }
         }
     }
@@ -121,15 +120,15 @@ public:
     [[nodiscard]] std::string
     toString() const;
 
-    /** Fill a Json::Value with an RPC 2.0 response.
+    /** Fill a json::Value with an RPC 2.0 response.
         If the Status is OK, fillJson has no effect.
         Not currently used. */
     void
-    fillJson(Json::Value&);
+    fillJson(json::Value&);
 
 private:
-    Type type_ = Type::none;
-    Code code_ = OK;
+    Type type_ = Type::None;
+    Code code_ = kOK;
     Strings messages_;
 };
 
diff --git a/src/xrpld/rpc/detail/AccountAssets.cpp b/src/xrpld/rpc/detail/AccountAssets.cpp
index b990939bd6..5bc4360a0e 100644
--- a/src/xrpld/rpc/detail/AccountAssets.cpp
+++ b/src/xrpld/rpc/detail/AccountAssets.cpp
@@ -25,14 +25,14 @@ accountSourceAssets(
     if (includeXRP)
         assets.insert(xrpCurrency());
 
-    if (auto const lines = lrCache->getRippleLines(account, LineDirection::outgoing))
+    if (auto const lines = lrCache->getRippleLines(account, LineDirection::Outgoing))
     {
         for (auto const& rspEntry : *lines)
         {
             auto& saBalance = rspEntry.getBalance();
 
             // Filter out non
-            if (saBalance > beast::zero
+            if (saBalance > beast::kZERO
                 // Have IOUs to send.
                 || (rspEntry.getLimitPeer()
                     // Peer extends credit.
@@ -69,7 +69,7 @@ accountDestAssets(
         assets.insert(xrpCurrency());
     // Even if account doesn't exist
 
-    if (auto const lines = lrCache->getRippleLines(account, LineDirection::outgoing))
+    if (auto const lines = lrCache->getRippleLines(account, LineDirection::Outgoing))
     {
         for (auto const& rspEntry : *lines)
         {
diff --git a/src/xrpld/rpc/detail/AssetCache.cpp b/src/xrpld/rpc/detail/AssetCache.cpp
index 28924ceb5f..a0743a2303 100644
--- a/src/xrpld/rpc/detail/AssetCache.cpp
+++ b/src/xrpld/rpc/detail/AssetCache.cpp
@@ -42,10 +42,10 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
     AccountKey key(accountID, direction, hash);
     AccountKey otherkey(
         accountID,
-        direction == LineDirection::outgoing ? LineDirection::incoming : LineDirection::outgoing,
+        direction == LineDirection::Outgoing ? LineDirection::Incoming : LineDirection::Outgoing,
         hash);
 
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     auto [it, inserted] = [&]() {
         if (auto otheriter = lines_.find(otherkey); otheriter != lines_.end())
@@ -56,14 +56,14 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
             auto const size = otheriter->second ? otheriter->second->size() : 0;
             JLOG(journal_.info())
                 << "Request for "
-                << (direction == LineDirection::outgoing ? "outgoing" : "incoming")
+                << (direction == LineDirection::Outgoing ? "outgoing" : "incoming")
                 << " trust lines for account " << accountID << " found " << size
-                << (direction == LineDirection::outgoing ? " incoming" : " outgoing")
+                << (direction == LineDirection::Outgoing ? " incoming" : " outgoing")
                 << " trust lines. "
-                << (direction == LineDirection::outgoing ? "Deleting the subset of incoming"
+                << (direction == LineDirection::Outgoing ? "Deleting the subset of incoming"
                                                          : "Returning the superset of outgoing")
                 << " trust lines. ";
-            if (direction == LineDirection::outgoing)
+            if (direction == LineDirection::Outgoing)
             {
                 // This request is for the outgoing set, but there is already a
                 // subset of incoming lines in the cache. Erase that subset
@@ -106,8 +106,7 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
     auto const size = it->second ? it->second->size() : 0;
     JLOG(journal_.trace()) << "getRippleLines for ledger " << ledger_->header().seq << " found "
                            << size
-                           << (key.direction_ == LineDirection::outgoing ? " outgoing"
-                                                                         : " incoming")
+                           << (key.direction == LineDirection::Outgoing ? " outgoing" : " incoming")
                            << " lines for " << (inserted ? "new " : "existing ") << accountID
                            << " out of a total of " << lines_.size() << " accounts and "
                            << totalLineCount_ << " trust lines";
@@ -118,7 +117,7 @@ AssetCache::getRippleLines(AccountID const& accountID, LineDirection direction)
 std::shared_ptr<std::vector<PathFindMPT>> const&
 AssetCache::getMPTs(xrpl::AccountID const& account)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     if (auto it = mpts_.find(account); it != mpts_.end())
         return it->second;
diff --git a/src/xrpld/rpc/detail/AssetCache.h b/src/xrpld/rpc/detail/AssetCache.h
index 0597c729f1..9112d78715 100644
--- a/src/xrpld/rpc/detail/AssetCache.h
+++ b/src/xrpld/rpc/detail/AssetCache.h
@@ -45,21 +45,21 @@ public:
     getMPTs(AccountID const& account);
 
 private:
-    std::mutex mLock;
+    std::mutex lock_;
 
-    xrpl::hardened_hash<> hasher_;
+    xrpl::HardenedHash<> hasher_;
     std::shared_ptr<ReadView const> ledger_;
 
     beast::Journal journal_;
 
     struct AccountKey final : public CountedObject<AccountKey>
     {
-        AccountID account_;
-        LineDirection direction_;
-        std::size_t hash_value_;
+        AccountID account;
+        LineDirection direction;
+        std::size_t hash_value;
 
         AccountKey(AccountID const& account, LineDirection direction, std::size_t hash)
-            : account_(account), direction_(direction), hash_value_(hash)
+            : account(account), direction(direction), hash_value(hash)
         {
         }
 
@@ -71,14 +71,14 @@ private:
         bool
         operator==(AccountKey const& lhs) const
         {
-            return hash_value_ == lhs.hash_value_ && account_ == lhs.account_ &&
-                direction_ == lhs.direction_;
+            return hash_value == lhs.hash_value && account == lhs.account &&
+                direction == lhs.direction;
         }
 
         [[nodiscard]] std::size_t
-        get_hash() const
+        getHash() const
         {
-            return hash_value_;
+            return hash_value;
         }
 
         struct Hash
@@ -88,7 +88,7 @@ private:
             std::size_t
             operator()(AccountKey const& key) const noexcept
             {
-                return key.get_hash();
+                return key.getHash();
             }
         };
     };
diff --git a/src/xrpld/rpc/detail/DeliveredAmount.cpp b/src/xrpld/rpc/detail/DeliveredAmount.cpp
index 6b9ef15db5..32554e8b5f 100644
--- a/src/xrpld/rpc/detail/DeliveredAmount.cpp
+++ b/src/xrpld/rpc/detail/DeliveredAmount.cpp
@@ -85,7 +85,7 @@ canHaveDeliveredAmount(
 
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     ReadView const& ledger,
     std::shared_ptr<STTx const> const& serializedTx,
     TxMeta const& transactionMeta)
@@ -100,13 +100,13 @@ insertDeliveredAmount(
         auto amt = getDeliveredAmount(getLedgerIndex, getCloseTime, serializedTx, transactionMeta);
         if (amt)
         {
-            meta[jss::delivered_amount] = amt->getJson(JsonOptions::include_date);
+            meta[jss::delivered_amount] = amt->getJson(JsonOptions::KIncludeDate);
         }
         else
         {
             // report "unavailable" which cannot be parsed into a sensible
             // amount.
-            meta[jss::delivered_amount] = Json::Value("unavailable");
+            meta[jss::delivered_amount] = json::Value("unavailable");
         }
     }
 }
@@ -144,7 +144,7 @@ getDeliveredAmount(
 
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     RPC::JsonContext const& context,
     std::shared_ptr<Transaction> const& transaction,
     TxMeta const& transactionMeta)
@@ -154,7 +154,7 @@ insertDeliveredAmount(
 
 void
 insertDeliveredAmount(
-    Json::Value& meta,
+    json::Value& meta,
     RPC::JsonContext const& context,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta)
@@ -167,13 +167,13 @@ insertDeliveredAmount(
 
         if (amt)
         {
-            meta[jss::delivered_amount] = amt->getJson(JsonOptions::include_date);
+            meta[jss::delivered_amount] = amt->getJson(JsonOptions::KIncludeDate);
         }
         else
         {
             // report "unavailable" which cannot be parsed into a sensible
             // amount.
-            meta[jss::delivered_amount] = Json::Value("unavailable");
+            meta[jss::delivered_amount] = json::Value("unavailable");
         }
     }
 }
diff --git a/src/xrpld/rpc/detail/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp
index b8489e0b34..6b04f24094 100644
--- a/src/xrpld/rpc/detail/Handler.cpp
+++ b/src/xrpld/rpc/detail/Handler.cpp
@@ -23,12 +23,12 @@ namespace {
 
 /** Adjust an old-style handler to be call-by-reference. */
 template <typename Function>
-Handler::Method<Json::Value>
+Handler::Method<json::Value>
 byRef(Function const& f)
 {
-    return [f](JsonContext& context, Json::Value& result) {
+    return [f](JsonContext& context, json::Value& result) {
         result = f(context);
-        if (result.type() != Json::objectValue)
+        if (result.type() != json::ObjectValue)
         {
             // LCOV_EXCL_START
             UNREACHABLE("xrpl::RPC::byRef : result is object");
@@ -68,303 +68,294 @@ handlerFrom()
 {
     return {
         HandlerImpl::name,
-        &handle<Json::Value, HandlerImpl>,
+        &handle<json::Value, HandlerImpl>,
         HandlerImpl::role,
         HandlerImpl::condition,
         HandlerImpl::minApiVer,
         HandlerImpl::maxApiVer};
 }
 
-Handler const handlerArray[]{
+Handler const kHANDLER_ARRAY[]{
     // Some handlers not specified here are added to the table via addHandler()
     // Request-response methods
-    {.name_ = "account_info",
-     .valueMethod_ = byRef(&doAccountInfo),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_currencies",
-     .valueMethod_ = byRef(&doAccountCurrencies),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_lines",
-     .valueMethod_ = byRef(&doAccountLines),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_channels",
-     .valueMethod_ = byRef(&doAccountChannels),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_nfts",
-     .valueMethod_ = byRef(&doAccountNFTs),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_objects",
-     .valueMethod_ = byRef(&doAccountObjects),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_offers",
-     .valueMethod_ = byRef(&doAccountOffers),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "account_tx",
-     .valueMethod_ = byRef(&doAccountTx),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "amm_info",
-     .valueMethod_ = byRef(&doAMMInfo),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "blacklist",
-     .valueMethod_ = byRef(&doBlackList),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "book_changes",
-     .valueMethod_ = byRef(&doBookChanges),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "book_offers",
-     .valueMethod_ = byRef(&doBookOffers),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "can_delete",
-     .valueMethod_ = byRef(&doCanDelete),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "channel_authorize",
-     .valueMethod_ = byRef(&doChannelAuthorize),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "channel_verify",
-     .valueMethod_ = byRef(&doChannelVerify),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "connect",
-     .valueMethod_ = byRef(&doConnect),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "consensus_info",
-     .valueMethod_ = byRef(&doConsensusInfo),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "deposit_authorized",
-     .valueMethod_ = byRef(&doDepositAuthorized),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "feature",
-     .valueMethod_ = byRef(&doFeature),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "fee",
-     .valueMethod_ = byRef(&doFee),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "fetch_info",
-     .valueMethod_ = byRef(&doFetchInfo),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "gateway_balances",
-     .valueMethod_ = byRef(&doGatewayBalances),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "get_counts",
-     .valueMethod_ = byRef(&doGetCounts),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "get_aggregate_price",
-     .valueMethod_ = byRef(&doGetAggregatePrice),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "ledger_accept",
-     .valueMethod_ = byRef(&doLedgerAccept),
-     .role_ = Role::ADMIN,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "ledger_cleaner",
-     .valueMethod_ = byRef(&doLedgerCleaner),
-     .role_ = Role::ADMIN,
-     .condition_ = NEEDS_NETWORK_CONNECTION},
-    {.name_ = "ledger_closed",
-     .valueMethod_ = byRef(&doLedgerClosed),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CLOSED_LEDGER},
-    {.name_ = "ledger_current",
-     .valueMethod_ = byRef(&doLedgerCurrent),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "ledger_data",
-     .valueMethod_ = byRef(&doLedgerData),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "ledger_entry",
-     .valueMethod_ = byRef(&doLedgerEntry),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "ledger_header",
-     .valueMethod_ = byRef(&doLedgerHeader),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION,
-     .minApiVer_ = 1,
-     .maxApiVer_ = 1},
-    {.name_ = "ledger_request",
-     .valueMethod_ = byRef(&doLedgerRequest),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "log_level",
-     .valueMethod_ = byRef(&doLogLevel),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "logrotate",
-     .valueMethod_ = byRef(&doLogRotate),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "manifest",
-     .valueMethod_ = byRef(&doManifest),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "nft_buy_offers",
-     .valueMethod_ = byRef(&doNFTBuyOffers),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "nft_sell_offers",
-     .valueMethod_ = byRef(&doNFTSellOffers),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "noripple_check",
-     .valueMethod_ = byRef(&doNoRippleCheck),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "owner_info",
-     .valueMethod_ = byRef(&doOwnerInfo),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "peers",
-     .valueMethod_ = byRef(&doPeers),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "path_find",
-     .valueMethod_ = byRef(&doPathFind),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "ping",
-     .valueMethod_ = byRef(&doPing),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "print",
-     .valueMethod_ = byRef(&doPrint),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
+    {.name = "account_info",
+     .valueMethod = byRef(&doAccountInfo),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_currencies",
+     .valueMethod = byRef(&doAccountCurrencies),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_lines",
+     .valueMethod = byRef(&doAccountLines),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_channels",
+     .valueMethod = byRef(&doAccountChannels),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_nfts",
+     .valueMethod = byRef(&doAccountNFTs),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_objects",
+     .valueMethod = byRef(&doAccountObjects),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_offers",
+     .valueMethod = byRef(&doAccountOffers),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "account_tx",
+     .valueMethod = byRef(&doAccountTx),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "amm_info",
+     .valueMethod = byRef(&doAMMInfo),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "blacklist",
+     .valueMethod = byRef(&doBlackList),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "book_changes",
+     .valueMethod = byRef(&doBookChanges),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "book_offers",
+     .valueMethod = byRef(&doBookOffers),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "can_delete",
+     .valueMethod = byRef(&doCanDelete),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "channel_authorize",
+     .valueMethod = byRef(&doChannelAuthorize),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "channel_verify",
+     .valueMethod = byRef(&doChannelVerify),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "connect",
+     .valueMethod = byRef(&doConnect),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "consensus_info",
+     .valueMethod = byRef(&doConsensusInfo),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "deposit_authorized",
+     .valueMethod = byRef(&doDepositAuthorized),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "feature",
+     .valueMethod = byRef(&doFeature),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "fee",
+     .valueMethod = byRef(&doFee),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "fetch_info",
+     .valueMethod = byRef(&doFetchInfo),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "gateway_balances",
+     .valueMethod = byRef(&doGatewayBalances),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "get_counts",
+     .valueMethod = byRef(&doGetCounts),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "get_aggregate_price",
+     .valueMethod = byRef(&doGetAggregatePrice),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "ledger_accept",
+     .valueMethod = byRef(&doLedgerAccept),
+     .role = Role::ADMIN,
+     .condition = NeedsCurrentLedger},
+    {.name = "ledger_cleaner",
+     .valueMethod = byRef(&doLedgerCleaner),
+     .role = Role::ADMIN,
+     .condition = NeedsNetworkConnection},
+    {.name = "ledger_closed",
+     .valueMethod = byRef(&doLedgerClosed),
+     .role = Role::USER,
+     .condition = NeedsClosedLedger},
+    {.name = "ledger_current",
+     .valueMethod = byRef(&doLedgerCurrent),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "ledger_data",
+     .valueMethod = byRef(&doLedgerData),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "ledger_entry",
+     .valueMethod = byRef(&doLedgerEntry),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "ledger_header",
+     .valueMethod = byRef(&doLedgerHeader),
+     .role = Role::USER,
+     .condition = NoCondition,
+     .minApiVer = 1,
+     .maxApiVer = 1},
+    {.name = "ledger_request",
+     .valueMethod = byRef(&doLedgerRequest),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "log_level",
+     .valueMethod = byRef(&doLogLevel),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "logrotate",
+     .valueMethod = byRef(&doLogRotate),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "manifest",
+     .valueMethod = byRef(&doManifest),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "nft_buy_offers",
+     .valueMethod = byRef(&doNFTBuyOffers),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "nft_sell_offers",
+     .valueMethod = byRef(&doNFTSellOffers),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "noripple_check",
+     .valueMethod = byRef(&doNoRippleCheck),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "owner_info",
+     .valueMethod = byRef(&doOwnerInfo),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "peers",
+     .valueMethod = byRef(&doPeers),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "path_find",
+     .valueMethod = byRef(&doPathFind),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "ping", .valueMethod = byRef(&doPing), .role = Role::USER, .condition = NoCondition},
+    {.name = "print",
+     .valueMethod = byRef(&doPrint),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
     //      {   "profile",              byRef (&doProfile), Role::USER,
     //      NEEDS_CURRENT_LEDGER  },
-    {.name_ = "random",
-     .valueMethod_ = byRef(&doRandom),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "peer_reservations_add",
-     .valueMethod_ = byRef(&doPeerReservationsAdd),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "peer_reservations_del",
-     .valueMethod_ = byRef(&doPeerReservationsDel),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "peer_reservations_list",
-     .valueMethod_ = byRef(&doPeerReservationsList),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "ripple_path_find",
-     .valueMethod_ = byRef(&doRipplePathFind),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "server_definitions",
-     .valueMethod_ = byRef(&doServerDefinitions),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "server_info",
-     .valueMethod_ = byRef(&doServerInfo),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "server_state",
-     .valueMethod_ = byRef(&doServerState),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "sign",
-     .valueMethod_ = byRef(&doSign),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "sign_for",
-     .valueMethod_ = byRef(&doSignFor),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "simulate",
-     .valueMethod_ = byRef(&doSimulate),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "stop",
-     .valueMethod_ = byRef(&doStop),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "submit",
-     .valueMethod_ = byRef(&doSubmit),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "submit_multisigned",
-     .valueMethod_ = byRef(&doSubmitMultiSigned),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_CURRENT_LEDGER},
-    {.name_ = "transaction_entry",
-     .valueMethod_ = byRef(&doTransactionEntry),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "tx",
-     .valueMethod_ = byRef(&doTxJson),
-     .role_ = Role::USER,
-     .condition_ = NEEDS_NETWORK_CONNECTION},
-    {.name_ = "tx_history",
-     .valueMethod_ = byRef(&doTxHistory),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION,
-     .minApiVer_ = 1,
-     .maxApiVer_ = 1},
-    {.name_ = "tx_reduce_relay",
-     .valueMethod_ = byRef(&doTxReduceRelay),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "unl_list",
-     .valueMethod_ = byRef(&doUnlList),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "validation_create",
-     .valueMethod_ = byRef(&doValidationCreate),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "validators",
-     .valueMethod_ = byRef(&doValidators),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "validator_list_sites",
-     .valueMethod_ = byRef(&doValidatorListSites),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "validator_info",
-     .valueMethod_ = byRef(&doValidatorInfo),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
-    {.name_ = "vault_info",
-     .valueMethod_ = byRef(&doVaultInfo),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "wallet_propose",
-     .valueMethod_ = byRef(&doWalletPropose),
-     .role_ = Role::ADMIN,
-     .condition_ = NO_CONDITION},
+    {.name = "random",
+     .valueMethod = byRef(&doRandom),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "peer_reservations_add",
+     .valueMethod = byRef(&doPeerReservationsAdd),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "peer_reservations_del",
+     .valueMethod = byRef(&doPeerReservationsDel),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "peer_reservations_list",
+     .valueMethod = byRef(&doPeerReservationsList),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "ripple_path_find",
+     .valueMethod = byRef(&doRipplePathFind),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "server_definitions",
+     .valueMethod = byRef(&doServerDefinitions),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "server_info",
+     .valueMethod = byRef(&doServerInfo),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "server_state",
+     .valueMethod = byRef(&doServerState),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "sign", .valueMethod = byRef(&doSign), .role = Role::USER, .condition = NoCondition},
+    {.name = "sign_for",
+     .valueMethod = byRef(&doSignFor),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "simulate",
+     .valueMethod = byRef(&doSimulate),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "stop", .valueMethod = byRef(&doStop), .role = Role::ADMIN, .condition = NoCondition},
+    {.name = "submit",
+     .valueMethod = byRef(&doSubmit),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "submit_multisigned",
+     .valueMethod = byRef(&doSubmitMultiSigned),
+     .role = Role::USER,
+     .condition = NeedsCurrentLedger},
+    {.name = "transaction_entry",
+     .valueMethod = byRef(&doTransactionEntry),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "tx",
+     .valueMethod = byRef(&doTxJson),
+     .role = Role::USER,
+     .condition = NeedsNetworkConnection},
+    {.name = "tx_history",
+     .valueMethod = byRef(&doTxHistory),
+     .role = Role::USER,
+     .condition = NoCondition,
+     .minApiVer = 1,
+     .maxApiVer = 1},
+    {.name = "tx_reduce_relay",
+     .valueMethod = byRef(&doTxReduceRelay),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "unl_list",
+     .valueMethod = byRef(&doUnlList),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "validation_create",
+     .valueMethod = byRef(&doValidationCreate),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "validators",
+     .valueMethod = byRef(&doValidators),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "validator_list_sites",
+     .valueMethod = byRef(&doValidatorListSites),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "validator_info",
+     .valueMethod = byRef(&doValidatorInfo),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
+    {.name = "vault_info",
+     .valueMethod = byRef(&doVaultInfo),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "wallet_propose",
+     .valueMethod = byRef(&doWalletPropose),
+     .role = Role::ADMIN,
+     .condition = NoCondition},
     // Event methods
-    {.name_ = "subscribe",
-     .valueMethod_ = byRef(&doSubscribe),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
-    {.name_ = "unsubscribe",
-     .valueMethod_ = byRef(&doUnsubscribe),
-     .role_ = Role::USER,
-     .condition_ = NO_CONDITION},
+    {.name = "subscribe",
+     .valueMethod = byRef(&doSubscribe),
+     .role = Role::USER,
+     .condition = NoCondition},
+    {.name = "unsubscribe",
+     .valueMethod = byRef(&doUnsubscribe),
+     .role = Role::USER,
+     .condition = NoCondition},
 };
 
 class HandlerTable
@@ -382,14 +373,14 @@ private:
     {
         XRPL_ASSERT(minVer <= maxVer, "xrpl::RPC::HandlerTable : valid API version range");
         XRPL_ASSERT(
-            maxVer <= RPC::apiMaximumValidVersion,
+            maxVer <= RPC::kAPI_MAXIMUM_VALID_VERSION,
             "xrpl::RPC::HandlerTable : valid max API version");
 
         return std::any_of(
             range.first,
             range.second,  //
             [minVer, maxVer](auto const& item) {
-                return item.second.minApiVer_ <= maxVer && item.second.maxApiVer_ >= minVer;
+                return item.second.minApiVer <= maxVer && item.second.maxApiVer >= minVer;
             });
     }
 
@@ -399,14 +390,14 @@ private:
         for (auto const& entry : entries)
         {
             if (overlappingApiVersion(
-                    table_.equal_range(entry.name_), entry.minApiVer_, entry.maxApiVer_))
+                    table_.equal_range(entry.name), entry.minApiVer, entry.maxApiVer))
             {
-                LogicError(
-                    std::string("Handler for ") + entry.name_ +
+                logicError(
+                    std::string("Handler for ") + entry.name +
                     " overlaps with an existing handler");
             }
 
-            table_.insert({entry.name_, entry});
+            table_.insert({entry.name, entry});
         }
 
         // This is where the new-style handlers are added.
@@ -418,20 +409,20 @@ public:
     static HandlerTable const&
     instance()
     {
-        static HandlerTable const handlerTable(handlerArray);
-        return handlerTable;
+        static HandlerTable const kHANDLER_TABLE(kHANDLER_ARRAY);
+        return kHANDLER_TABLE;
     }
 
     [[nodiscard]] Handler const*
     getHandler(unsigned version, bool betaEnabled, std::string const& name) const
     {
-        if (version < RPC::apiMinimumSupportedVersion ||
-            version > (betaEnabled ? RPC::apiBetaVersion : RPC::apiMaximumSupportedVersion))
+        if (version < RPC::kAPI_MINIMUM_SUPPORTED_VERSION ||
+            version > (betaEnabled ? RPC::kAPI_BETA_VERSION : RPC::kAPI_MAXIMUM_SUPPORTED_VERSION))
             return nullptr;
 
         auto const range = table_.equal_range(name);
         auto const i = std::find_if(range.first, range.second, [version](auto const& entry) {
-            return entry.second.minApiVer_ <= version && version <= entry.second.maxApiVer_;
+            return entry.second.minApiVer <= version && version <= entry.second.maxApiVer;
         });
 
         return i == range.second ? nullptr : &i->second;
@@ -442,7 +433,7 @@ public:
     {
         std::set<char const*> ret;
         for (auto const& i : table_)
-            ret.insert(i.second.name_);
+            ret.insert(i.second.name);
 
         return ret;
     }
@@ -455,15 +446,15 @@ private:
     addHandler()
     {
         static_assert(HandlerImpl::minApiVer <= HandlerImpl::maxApiVer);
-        static_assert(HandlerImpl::maxApiVer <= RPC::apiMaximumValidVersion);
-        static_assert(RPC::apiMinimumSupportedVersion <= HandlerImpl::minApiVer);
+        static_assert(HandlerImpl::maxApiVer <= RPC::kAPI_MAXIMUM_VALID_VERSION);
+        static_assert(RPC::kAPI_MINIMUM_SUPPORTED_VERSION <= HandlerImpl::minApiVer);
 
         if (overlappingApiVersion(
                 table_.equal_range(HandlerImpl::name),
                 HandlerImpl::minApiVer,
                 HandlerImpl::maxApiVer))
         {
-            LogicError(
+            logicError(
                 std::string("Handler for ") + HandlerImpl::name +
                 " overlaps with an existing handler");
         }
diff --git a/src/xrpld/rpc/detail/Handler.h b/src/xrpld/rpc/detail/Handler.h
index 94d0ca87cf..1e1db7bb99 100644
--- a/src/xrpld/rpc/detail/Handler.h
+++ b/src/xrpld/rpc/detail/Handler.h
@@ -8,9 +8,9 @@
 #include <xrpl/protocol/ApiVersion.h>
 #include <xrpl/server/NetworkOPs.h>
 
-namespace Json {
+namespace json {
 class Object;
-}  // namespace Json
+}  // namespace json
 
 namespace xrpl::RPC {
 
@@ -18,10 +18,10 @@ namespace xrpl::RPC {
 // Bitwise flags
 // NOLINTNEXTLINE(cppcoreguidelines-use-enum-class)
 enum Condition {
-    NO_CONDITION = 0,
-    NEEDS_NETWORK_CONNECTION = 1,
-    NEEDS_CURRENT_LEDGER = 1 << 1,
-    NEEDS_CLOSED_LEDGER = 1 << 2,
+    NoCondition = 0,
+    NeedsNetworkConnection = 1,
+    NeedsCurrentLedger = 1 << 1,
+    NeedsClosedLedger = 1 << 2,
 };
 
 struct Handler
@@ -29,24 +29,24 @@ struct Handler
     template <class JsonValue>
     using Method = std::function<Status(JsonContext&, JsonValue&)>;
 
-    char const* name_;
-    Method<Json::Value> valueMethod_;
-    Role role_;
-    RPC::Condition condition_;
+    char const* name;
+    Method<json::Value> valueMethod;
+    Role role;
+    RPC::Condition condition;
 
-    unsigned minApiVer_ = apiMinimumSupportedVersion;
-    unsigned maxApiVer_ = apiMaximumValidVersion;
+    unsigned minApiVer = kAPI_MINIMUM_SUPPORTED_VERSION;
+    unsigned maxApiVer = kAPI_MAXIMUM_VALID_VERSION;
 };
 
 Handler const*
 getHandler(unsigned int version, bool betaEnabled, std::string const&);
 
-/** Return a Json::objectValue with a single entry. */
+/** Return a json::objectValue with a single entry. */
 template <class Value>
-Json::Value
-makeObjectValue(Value const& value, Json::StaticString const& field = jss::message)
+json::Value
+makeObjectValue(Value const& value, json::StaticString const& field = jss::message)
 {
-    Json::Value result(Json::objectValue);
+    json::Value result(json::ObjectValue);
     result[field] = value;
     return result;
 }
@@ -56,37 +56,37 @@ std::set<char const*>
 getHandlerNames();
 
 template <class T>
-error_code_i
-conditionMet(Condition condition_required, T& context)
+ErrorCodeI
+conditionMet(Condition conditionRequired, T& context)
 {
-    if (context.app.getOPs().isAmendmentBlocked() && (condition_required != NO_CONDITION))
+    if (context.app.getOPs().isAmendmentBlocked() && (conditionRequired != NoCondition))
     {
-        return rpcAMENDMENT_BLOCKED;
+        return RpcAmendmentBlocked;
     }
 
-    if (context.app.getOPs().isUNLBlocked() && (condition_required != NO_CONDITION))
+    if (context.app.getOPs().isUNLBlocked() && (conditionRequired != NoCondition))
     {
-        return rpcEXPIRED_VALIDATOR_LIST;
+        return RpcExpiredValidatorList;
     }
 
-    if ((condition_required != NO_CONDITION) &&
+    if ((conditionRequired != NoCondition) &&
         (context.netOps.getOperatingMode() < OperatingMode::SYNCING))
     {
         JLOG(context.j.info()) << "Insufficient network mode for RPC: "
                                << context.netOps.strOperatingMode();
 
         if (context.apiVersion == 1)
-            return rpcNO_NETWORK;
-        return rpcNOT_SYNCED;
+            return RpcNoNetwork;
+        return RpcNotSynced;
     }
 
-    if (!context.app.config().standalone() && condition_required != NO_CONDITION)
+    if (!context.app.config().standalone() && conditionRequired != NoCondition)
     {
-        if (context.ledgerMaster.getValidatedLedgerAge() > Tuning::maxValidatedLedgerAge)
+        if (context.ledgerMaster.getValidatedLedgerAge() > Tuning::kMAX_VALIDATED_LEDGER_AGE)
         {
             if (context.apiVersion == 1)
-                return rpcNO_CURRENT;
-            return rpcNOT_SYNCED;
+                return RpcNoCurrent;
+            return RpcNotSynced;
         }
 
         auto const cID = context.ledgerMaster.getCurrentLedgerIndex();
@@ -97,19 +97,19 @@ conditionMet(Condition condition_required, T& context)
             JLOG(context.j.debug()) << "Current ledger ID(" << cID
                                     << ") is less than validated ledger ID(" << vID << ")";
             if (context.apiVersion == 1)
-                return rpcNO_CURRENT;
-            return rpcNOT_SYNCED;
+                return RpcNoCurrent;
+            return RpcNotSynced;
         }
     }
 
-    if ((condition_required != NO_CONDITION) && !context.ledgerMaster.getClosedLedger())
+    if ((conditionRequired != NoCondition) && !context.ledgerMaster.getClosedLedger())
     {
         if (context.apiVersion == 1)
-            return rpcNO_CLOSED;
-        return rpcNOT_SYNCED;
+            return RpcNoClosed;
+        return RpcNotSynced;
     }
 
-    return rpcSUCCESS;
+    return RpcSuccess;
 }
 
 }  // namespace xrpl::RPC
diff --git a/src/xrpld/rpc/detail/LegacyPathFind.cpp b/src/xrpld/rpc/detail/LegacyPathFind.cpp
index 11debe00c1..83c7c30549 100644
--- a/src/xrpld/rpc/detail/LegacyPathFind.cpp
+++ b/src/xrpld/rpc/detail/LegacyPathFind.cpp
@@ -16,24 +16,24 @@ LegacyPathFind::LegacyPathFind(bool isAdmin, Application& app)
     if (isAdmin)
     {
         ++inProgress;
-        m_isOk = true;
+        isOk_ = true;
         return;
     }
 
-    auto const& jobCount = app.getJobQueue().getJobCountGE(jtCLIENT);
-    if (jobCount > Tuning::maxPathfindJobCount || app.getFeeTrack().isLoadedLocal())
+    auto const& jobCount = app.getJobQueue().getJobCountGE(JtClient);
+    if (jobCount > Tuning::kMAX_PATHFIND_JOB_COUNT || app.getFeeTrack().isLoadedLocal())
         return;
 
     while (true)
     {
         int prevVal = inProgress.load();
-        if (prevVal >= Tuning::maxPathfindsInProgress)
+        if (prevVal >= Tuning::kMAX_PATHFINDS_IN_PROGRESS)
             return;
 
         if (inProgress.compare_exchange_strong(
                 prevVal, prevVal + 1, std::memory_order_release, std::memory_order_relaxed))
         {
-            m_isOk = true;
+            isOk_ = true;
             return;
         }
     }
@@ -41,7 +41,7 @@ LegacyPathFind::LegacyPathFind(bool isAdmin, Application& app)
 
 LegacyPathFind::~LegacyPathFind()
 {
-    if (m_isOk)
+    if (isOk_)
         --inProgress;
 }
 
diff --git a/src/xrpld/rpc/detail/LegacyPathFind.h b/src/xrpld/rpc/detail/LegacyPathFind.h
index c9ac08f549..226191848f 100644
--- a/src/xrpld/rpc/detail/LegacyPathFind.h
+++ b/src/xrpld/rpc/detail/LegacyPathFind.h
@@ -17,13 +17,13 @@ public:
     [[nodiscard]] bool
     isOk() const
     {
-        return m_isOk;
+        return isOk_;
     }
 
 private:
     static std::atomic<int> inProgress;
 
-    bool m_isOk{false};
+    bool isOk_{false};
 };
 
 }  // namespace RPC
diff --git a/src/xrpld/rpc/detail/MPTokenIssuanceID.cpp b/src/xrpld/rpc/detail/MPTokenIssuanceID.cpp
index 8af745122a..e34980aee2 100644
--- a/src/xrpld/rpc/detail/MPTokenIssuanceID.cpp
+++ b/src/xrpld/rpc/detail/MPTokenIssuanceID.cpp
@@ -55,7 +55,7 @@ getIDFromCreatedIssuance(TxMeta const& transactionMeta)
 
 void
 insertMPTokenIssuanceID(
-    Json::Value& response,
+    json::Value& response,
     std::shared_ptr<STTx const> const& transaction,
     TxMeta const& transactionMeta)
 {
diff --git a/src/xrpld/rpc/detail/PathRequest.cpp b/src/xrpld/rpc/detail/PathRequest.cpp
index 9707536cc8..46069ce3bb 100644
--- a/src/xrpld/rpc/detail/PathRequest.cpp
+++ b/src/xrpld/rpc/detail/PathRequest.cpp
@@ -55,19 +55,19 @@ PathRequest::PathRequest(
     PathRequestManager& owner,
     beast::Journal journal)
     : app_(app)
-    , m_journal(journal)
-    , mOwner(owner)
-    , wpSubscriber(subscriber)
+    , journal_(journal)
+    , owner_(owner)
+    , wpSubscriber_(subscriber)
     , consumer_(subscriber->getConsumer())
-    , jvStatus(Json::objectValue)
-    , mLastIndex(0)
-    , mInProgress(false)
-    , iLevel(0)
-    , bLastSuccess(false)
-    , iIdentifier(id)
+    , jvStatus_(json::ObjectValue)
+    , lastIndex_(0)
+    , inProgress_(false)
+    , iLevel_(0)
+    , bLastSuccess_(false)
+    , iIdentifier_(id)
     , created_(std::chrono::steady_clock::now())
 {
-    JLOG(m_journal.debug()) << iIdentifier << " created";
+    JLOG(journal_.debug()) << iIdentifier_ << " created";
 }
 
 PathRequest::PathRequest(
@@ -78,25 +78,25 @@ PathRequest::PathRequest(
     PathRequestManager& owner,
     beast::Journal journal)
     : app_(app)
-    , m_journal(journal)
-    , mOwner(owner)
-    , fCompletion(completion)
+    , journal_(journal)
+    , owner_(owner)
+    , fCompletion_(completion)
     , consumer_(consumer)
-    , jvStatus(Json::objectValue)
-    , mLastIndex(0)
-    , mInProgress(false)
-    , iLevel(0)
-    , bLastSuccess(false)
-    , iIdentifier(id)
+    , jvStatus_(json::ObjectValue)
+    , lastIndex_(0)
+    , inProgress_(false)
+    , iLevel_(0)
+    , bLastSuccess_(false)
+    , iIdentifier_(id)
     , created_(std::chrono::steady_clock::now())
 {
-    JLOG(m_journal.debug()) << iIdentifier << " created";
+    JLOG(journal_.debug()) << iIdentifier_ << " created";
 }
 
 PathRequest::~PathRequest()
 {
     using namespace std::chrono;
-    auto stream = m_journal.info();
+    auto stream = journal_.info();
     if (!stream)
         return;
 
@@ -113,7 +113,7 @@ PathRequest::~PathRequest()
         full += std::to_string(duration_cast<milliseconds>(full_reply_ - created_).count());
         full += "ms";
     }
-    stream << iIdentifier << " complete:" << fast << full
+    stream << iIdentifier_ << " complete:" << fast << full
            << " total:" << duration_cast<milliseconds>(steady_clock::now() - created_).count()
            << "ms";
 }
@@ -121,99 +121,99 @@ PathRequest::~PathRequest()
 bool
 PathRequest::isNew()
 {
-    std::scoped_lock const sl(mIndexLock);
+    std::scoped_lock const sl(indexLock_);
 
     // does this path request still need its first full path
-    return mLastIndex == 0;
+    return lastIndex_ == 0;
 }
 
 bool
 PathRequest::needsUpdate(bool newOnly, LedgerIndex index)
 {
-    std::scoped_lock const sl(mIndexLock);
+    std::scoped_lock const sl(indexLock_);
 
-    if (mInProgress)
+    if (inProgress_)
     {
         // Another thread is handling this
         return false;
     }
 
-    if (newOnly && (mLastIndex != 0))
+    if (newOnly && (lastIndex_ != 0))
     {
         // Only handling new requests, this isn't new
         return false;
     }
 
-    if (mLastIndex >= index)
+    if (lastIndex_ >= index)
     {
         return false;
     }
 
-    mInProgress = true;
+    inProgress_ = true;
     return true;
 }
 
 bool
 PathRequest::hasCompletion()
 {
-    return bool(fCompletion);
+    return bool(fCompletion_);
 }
 
 void
 PathRequest::updateComplete()
 {
-    std::scoped_lock const sl(mIndexLock);
+    std::scoped_lock const sl(indexLock_);
 
-    XRPL_ASSERT(mInProgress, "xrpl::PathRequest::updateComplete : in progress");
-    mInProgress = false;
+    XRPL_ASSERT(inProgress_, "xrpl::PathRequest::updateComplete : in progress");
+    inProgress_ = false;
 
-    if (fCompletion)
+    if (fCompletion_)
     {
-        fCompletion();
-        fCompletion = std::function<void(void)>();
+        fCompletion_();
+        fCompletion_ = std::function<void(void)>();
     }
 }
 
 bool
 PathRequest::isValid(std::shared_ptr<AssetCache> const& crCache)
 {
-    if (!raSrcAccount || !raDstAccount)
+    if (!raSrcAccount_ || !raDstAccount_)
         return false;
 
-    if (!convert_all_ && (saSendMax || saDstAmount <= beast::zero))
+    if (!convert_all_ && (saSendMax_ || saDstAmount_ <= beast::kZERO))
     {
         // If send max specified, dst amt must be -1.
-        jvStatus = rpcError(rpcDST_AMT_MALFORMED);
+        jvStatus_ = rpcError(RpcDstAmtMalformed);
         return false;
     }
 
     auto const& lrLedger = crCache->getLedger();
 
-    if (!lrLedger->exists(keylet::account(*raSrcAccount)))
+    if (!lrLedger->exists(keylet::account(*raSrcAccount_)))
     {
         // Source account does not exist.
-        jvStatus = rpcError(rpcSRC_ACT_NOT_FOUND);
+        jvStatus_ = rpcError(RpcSrcActNotFound);
         return false;
     }
 
-    auto const sleDest = lrLedger->read(keylet::account(*raDstAccount));
+    auto const sleDest = lrLedger->read(keylet::account(*raDstAccount_));
 
-    Json::Value& jvDestCur = (jvStatus[jss::destination_currencies] = Json::arrayValue);
+    json::Value& jvDestCur = (jvStatus_[jss::destination_currencies] = json::ArrayValue);
 
     if (!sleDest)
     {
-        jvDestCur.append(Json::Value(systemCurrencyCode()));
-        if (!saDstAmount.native())
+        jvDestCur.append(json::Value(systemCurrencyCode()));
+        if (!saDstAmount_.native())
         {
             // Only XRP can be send to a non-existent account.
-            jvStatus = rpcError(rpcACT_NOT_FOUND);
+            jvStatus_ = rpcError(RpcActNotFound);
             return false;
         }
 
-        if (!convert_all_ && saDstAmount < STAmount(lrLedger->fees().reserve))
+        if (!convert_all_ && saDstAmount_ < STAmount(lrLedger->fees().reserve))
         {
             // Payment must meet reserve.
-            jvStatus = rpcError(rpcDST_AMT_MALFORMED);
+            jvStatus_ = rpcError(RpcDstAmtMalformed);
             return false;
         }
     }
@@ -221,16 +221,16 @@ PathRequest::isValid(std::shared_ptr<AssetCache> const& crCache)
     {
         bool const disallowXRP((sleDest->getFlags() & lsfDisallowXRP) != 0u);
 
-        auto const destAssets = accountDestAssets(*raDstAccount, crCache, !disallowXRP);
+        auto const destAssets = accountDestAssets(*raDstAccount_, crCache, !disallowXRP);
 
         for (auto const& asset : destAssets)
             jvDestCur.append(to_string(asset));
 
-        jvStatus[jss::destination_tag] = (sleDest->getFlags() & lsfRequireDestTag);
+        jvStatus_[jss::destination_tag] = (sleDest->getFlags() & lsfRequireDestTag);
     }
 
-    jvStatus[jss::ledger_hash] = to_string(lrLedger->header().hash);
-    jvStatus[jss::ledger_index] = lrLedger->seq();
+    jvStatus_[jss::ledger_hash] = to_string(lrLedger->header().hash);
+    jvStatus_[jss::ledger_index] = lrLedger->seq();
     return true;
 }
 
@@ -243,8 +243,8 @@ PathRequest::isValid(std::shared_ptr<AssetCache> const& crCache)
     If there's an error, we need to be sure to return it to the caller
     in all cases.
 */
-std::pair<bool, Json::Value>
-PathRequest::doCreate(std::shared_ptr<AssetCache> const& cache, Json::Value const& value)
+std::pair<bool, json::Value>
+PathRequest::doCreate(std::shared_ptr<AssetCache> const& cache, json::Value const& value)
 {
     bool valid = false;
 
@@ -255,68 +255,68 @@ PathRequest::doCreate(std::shared_ptr<AssetCache> const& cache, Json::Value cons
             doUpdate(cache, true);
     }
 
-    if (auto stream = m_journal.debug())
+    if (auto stream = journal_.debug())
     {
         if (valid)
         {
-            stream << iIdentifier << " valid: " << toBase58(*raSrcAccount);
-            stream << iIdentifier << " deliver: " << saDstAmount.getFullText();
+            stream << iIdentifier_ << " valid: " << toBase58(*raSrcAccount_);
+            stream << iIdentifier_ << " deliver: " << saDstAmount_.getFullText();
         }
         else
         {
-            stream << iIdentifier << " invalid";
+            stream << iIdentifier_ << " invalid";
         }
     }
 
-    return {valid, jvStatus};
+    return {valid, jvStatus_};
 }
 
 int
-PathRequest::parseJson(Json::Value const& jvParams)
+PathRequest::parseJson(json::Value const& jvParams)
 {
     if (!jvParams.isMember(jss::source_account))
     {
-        jvStatus = rpcError(rpcSRC_ACT_MISSING);
+        jvStatus_ = rpcError(RpcSrcActMissing);
         return PFR_PJ_INVALID;
     }
 
     if (!jvParams.isMember(jss::destination_account))
     {
-        jvStatus = rpcError(rpcDST_ACT_MISSING);
+        jvStatus_ = rpcError(RpcDstActMissing);
         return PFR_PJ_INVALID;
     }
 
     if (!jvParams.isMember(jss::destination_amount))
     {
-        jvStatus = rpcError(rpcDST_AMT_MISSING);
+        jvStatus_ = rpcError(RpcDstAmtMissing);
         return PFR_PJ_INVALID;
     }
 
-    raSrcAccount = parseBase58<AccountID>(jvParams[jss::source_account].asString());
-    if (!raSrcAccount)
+    raSrcAccount_ = parseBase58<AccountID>(jvParams[jss::source_account].asString());
+    if (!raSrcAccount_)
     {
-        jvStatus = rpcError(rpcSRC_ACT_MALFORMED);
+        jvStatus_ = rpcError(RpcSrcActMalformed);
         return PFR_PJ_INVALID;
     }
 
-    raDstAccount = parseBase58<AccountID>(jvParams[jss::destination_account].asString());
-    if (!raDstAccount)
+    raDstAccount_ = parseBase58<AccountID>(jvParams[jss::destination_account].asString());
+    if (!raDstAccount_)
     {
-        jvStatus = rpcError(rpcDST_ACT_MALFORMED);
+        jvStatus_ = rpcError(RpcDstActMalformed);
         return PFR_PJ_INVALID;
     }
 
-    if (!amountFromJsonNoThrow(saDstAmount, jvParams[jss::destination_amount]))
+    if (!amountFromJsonNoThrow(saDstAmount_, jvParams[jss::destination_amount]))
     {
-        jvStatus = rpcError(rpcDST_AMT_MALFORMED);
+        jvStatus_ = rpcError(RpcDstAmtMalformed);
         return PFR_PJ_INVALID;
     }
 
-    convert_all_ = saDstAmount == STAmount(saDstAmount.asset(), 1u, 0, true);
+    convert_all_ = saDstAmount_ == STAmount(saDstAmount_.asset(), 1u, 0, true);
 
-    if (!validAsset(saDstAmount.asset()) || (!convert_all_ && saDstAmount <= beast::zero))
+    if (!validAsset(saDstAmount_.asset()) || (!convert_all_ && saDstAmount_ <= beast::kZERO))
     {
-        jvStatus = rpcError(rpcDST_AMT_MALFORMED);
+        jvStatus_ = rpcError(RpcDstAmtMalformed);
         return PFR_PJ_INVALID;
     }
 
@@ -325,38 +325,39 @@ PathRequest::parseJson(Json::Value const& jvParams)
         // Send_max requires destination amount to be -1.
         if (!convert_all_)
         {
-            jvStatus = rpcError(rpcDST_AMT_MALFORMED);
+            jvStatus_ = rpcError(RpcDstAmtMalformed);
             return PFR_PJ_INVALID;
         }
 
-        saSendMax.emplace();
-        if (!amountFromJsonNoThrow(*saSendMax, jvParams[jss::send_max]) ||
-            !validAsset(saSendMax->asset()) ||
-            (*saSendMax <= beast::zero && *saSendMax != STAmount(saSendMax->asset(), 1u, 0, true)))
+        saSendMax_.emplace();
+        if (!amountFromJsonNoThrow(*saSendMax_, jvParams[jss::send_max]) ||
+            !validAsset(saSendMax_->asset()) ||
+            (*saSendMax_ <= beast::kZERO &&
+             *saSendMax_ != STAmount(saSendMax_->asset(), 1u, 0, true)))
         {
-            jvStatus = rpcError(rpcSENDMAX_MALFORMED);
+            jvStatus_ = rpcError(RpcSendmaxMalformed);
             return PFR_PJ_INVALID;
         }
     }
 
     if (jvParams.isMember(jss::source_currencies))
     {
-        Json::Value const& jvSrcCurrencies = jvParams[jss::source_currencies];
+        json::Value const& jvSrcCurrencies = jvParams[jss::source_currencies];
         if (!jvSrcCurrencies.isArray() || jvSrcCurrencies.size() == 0 ||
-            jvSrcCurrencies.size() > RPC::Tuning::max_src_cur)
+            jvSrcCurrencies.size() > RPC::Tuning::kMAX_SRC_CUR)
         {
-            jvStatus = rpcError(rpcSRC_CUR_MALFORMED);
+            jvStatus_ = rpcError(RpcSrcCurMalformed);
             return PFR_PJ_INVALID;
         }
 
-        sciSourceAssets.clear();
+        sciSourceAssets_.clear();
 
         for (auto const& c : jvSrcCurrencies)
         {
             // Mandatory currency or MPT
             if (!validJSONAsset(c) || !c.isObject())
             {
-                jvStatus = rpcError(rpcSRC_CUR_MALFORMED);
+                jvStatus_ = rpcError(RpcSrcCurMalformed);
                 return PFR_PJ_INVALID;
             }
 
@@ -365,9 +366,9 @@ PathRequest::parseJson(Json::Value const& jvParams)
             {
                 Currency currency;
                 if (!c[jss::currency].isString() ||
-                    !to_currency(currency, c[jss::currency].asString()))
+                    !toCurrency(currency, c[jss::currency].asString()))
                 {
-                    jvStatus = rpcError(rpcSRC_CUR_MALFORMED);
+                    jvStatus_ = rpcError(RpcSrcCurMalformed);
                     return PFR_PJ_INVALID;
                 }
                 srcPathAsset = currency;
@@ -378,7 +379,7 @@ PathRequest::parseJson(Json::Value const& jvParams)
                 if (!c[jss::mpt_issuance_id].isString() ||
                     !u.parseHex(c[jss::mpt_issuance_id].asString()))
                 {
-                    jvStatus = rpcError(rpcSRC_CUR_MALFORMED);
+                    jvStatus_ = rpcError(RpcSrcCurMalformed);
                     return PFR_PJ_INVALID;
                 }
                 srcPathAsset = u;
@@ -388,9 +389,9 @@ PathRequest::parseJson(Json::Value const& jvParams)
             AccountID srcIssuerID;
             if (c.isMember(jss::issuer) &&
                 (c.isMember(jss::mpt_issuance_id) || !c[jss::issuer].isString() ||
-                 !to_issuer(srcIssuerID, c[jss::issuer].asString())))
+                 !toIssuer(srcIssuerID, c[jss::issuer].asString())))
             {
-                jvStatus = rpcError(rpcSRC_ISR_MALFORMED);
+                jvStatus_ = rpcError(RpcSrcIsrMalformed);
                 return PFR_PJ_INVALID;
             }
 
@@ -400,27 +401,28 @@ PathRequest::parseJson(Json::Value const& jvParams)
                 {
                     if (srcIssuerID.isNonZero())
                     {
-                        jvStatus = rpcError(rpcSRC_CUR_MALFORMED);
+                        jvStatus_ = rpcError(RpcSrcCurMalformed);
                         return PFR_PJ_INVALID;
                     }
                 }
                 else if (srcIssuerID.isZero())
                 {
-                    srcIssuerID = *raSrcAccount;
+                    srcIssuerID = *raSrcAccount_;
                 }
             }
 
-            if (saSendMax)
+            if (saSendMax_)
             {
                 // If the assets don't match, ignore the source asset.
-                if (srcPathAsset == saSendMax->asset())
+                if (srcPathAsset == saSendMax_->asset())
                 {
                     // If neither is the source and they are not equal, then the
                     // source issuer is illegal.
-                    if (srcIssuerID != *raSrcAccount && saSendMax->getIssuer() != *raSrcAccount &&
-                        srcIssuerID != saSendMax->getIssuer())
+                    if (srcIssuerID != *raSrcAccount_ &&
+                        saSendMax_->getIssuer() != *raSrcAccount_ &&
+                        srcIssuerID != saSendMax_->getIssuer())
                     {
-                        jvStatus = rpcError(rpcSRC_ISR_MALFORMED);
+                        jvStatus_ = rpcError(RpcSrcIsrMalformed);
                         return PFR_PJ_INVALID;
                     }
 
@@ -428,138 +430,138 @@ PathRequest::parseJson(Json::Value const& jvParams)
                     // Otherwise, use the one that's not the source.
                     srcPathAsset.visit(
                         [&](Currency const& currency) {
-                            if (srcIssuerID != *raSrcAccount)
+                            if (srcIssuerID != *raSrcAccount_)
                             {
-                                sciSourceAssets.insert(Issue{currency, srcIssuerID});
+                                sciSourceAssets_.insert(Issue{currency, srcIssuerID});
                             }
-                            else if (saSendMax->getIssuer() != *raSrcAccount)
+                            else if (saSendMax_->getIssuer() != *raSrcAccount_)
                             {
-                                sciSourceAssets.insert(Issue{currency, saSendMax->getIssuer()});
+                                sciSourceAssets_.insert(Issue{currency, saSendMax_->getIssuer()});
                             }
                             {
-                                sciSourceAssets.insert(Issue{currency, *raSrcAccount});
+                                sciSourceAssets_.insert(Issue{currency, *raSrcAccount_});
                             }
                         },
-                        [&](MPTID const& mpt) { sciSourceAssets.insert(mpt); });
+                        [&](MPTID const& mpt) { sciSourceAssets_.insert(mpt); });
                 }
             }
             else
             {
                 srcPathAsset.visit(
                     [&](Currency const& currency) {
-                        sciSourceAssets.insert(Issue{currency, srcIssuerID});
+                        sciSourceAssets_.insert(Issue{currency, srcIssuerID});
                     },
-                    [&](MPTID const& mpt) { sciSourceAssets.insert(MPTIssue{mpt}); });
+                    [&](MPTID const& mpt) { sciSourceAssets_.insert(MPTIssue{mpt}); });
             }
         }
     }
 
     if (jvParams.isMember(jss::id))
-        jvId = jvParams[jss::id];
+        jvId_ = jvParams[jss::id];
 
     if (jvParams.isMember(jss::domain))
     {
         uint256 num;
         if (!jvParams[jss::domain].isString() || !num.parseHex(jvParams[jss::domain].asString()))
         {
-            jvStatus = rpcError(rpcDOMAIN_MALFORMED);
+            jvStatus_ = rpcError(RpcDomainMalformed);
             return PFR_PJ_INVALID;
         }
 
-        domain = num;
+        domain_ = num;
     }
 
     return PFR_PJ_NOCHANGE;
 }
 
-Json::Value
+json::Value
 PathRequest::doClose()
 {
-    JLOG(m_journal.debug()) << iIdentifier << " closed";
-    std::scoped_lock const sl(mLock);
-    jvStatus[jss::closed] = true;
-    return jvStatus;
+    JLOG(journal_.debug()) << iIdentifier_ << " closed";
+    std::scoped_lock const sl(lock_);
+    jvStatus_[jss::closed] = true;
+    return jvStatus_;
 }
 
-Json::Value
-PathRequest::doStatus(Json::Value const&)
+json::Value
+PathRequest::doStatus(json::Value const&)
 {
-    std::scoped_lock const sl(mLock);
-    jvStatus[jss::status] = jss::success;
-    return jvStatus;
+    std::scoped_lock const sl(lock_);
+    jvStatus_[jss::status] = jss::success;
+    return jvStatus_;
 }
 
 void
 PathRequest::doAborting() const
 {
-    JLOG(m_journal.info()) << iIdentifier << " aborting early";
+    JLOG(journal_.info()) << iIdentifier_ << " aborting early";
 }
 
 std::unique_ptr<Pathfinder> const&
 PathRequest::getPathFinder(
     std::shared_ptr<AssetCache> const& cache,
-    hash_map<PathAsset, std::unique_ptr<Pathfinder>>& pathasset_map,
-    PathAsset const& asset,
-    STAmount const& dst_amount,
+    hash_map<PathAsset, std::unique_ptr<Pathfinder>>& currencyMap,
+    PathAsset const& currency,
+    STAmount const& dstAmount,
     int const level,
     std::function<bool(void)> const& continueCallback)
 {
-    auto i = pathasset_map.find(asset);
-    if (i != pathasset_map.end())
+    auto i = currencyMap.find(currency);
+    if (i != currencyMap.end())
         return i->second;
     // NOLINTBEGIN(bugprone-unchecked-optional-access) isValid() ensures both are set
     auto pathfinder = std::make_unique<Pathfinder>(
         cache,
-        *raSrcAccount,
-        *raDstAccount,
-        asset,
+        *raSrcAccount_,
+        *raDstAccount_,
+        currency,
         std::nullopt,
-        dst_amount,
-        saSendMax,
-        domain,
+        dstAmount,
+        saSendMax_,
+        domain_,
         app_);
     // NOLINTEND(bugprone-unchecked-optional-access)
     if (pathfinder->findPaths(level, continueCallback))
     {
-        pathfinder->computePathRanks(max_paths_, continueCallback);
+        pathfinder->computePathRanks(kMAX_PATHS, continueCallback);
     }
     else
     {
         pathfinder.reset();  // It's a bad request - clear it.
     }
-    return pathasset_map[asset] = std::move(pathfinder);
+    return currencyMap[currency] = std::move(pathfinder);
 }
 
 bool
 PathRequest::findPaths(
     std::shared_ptr<AssetCache> const& cache,
     int const level,
-    Json::Value& jvArray,
+    json::Value& jvArray,
     std::function<bool(void)> const& continueCallback)
 {
-    auto sourceAssets = sciSourceAssets;
-    if (sourceAssets.empty() && saSendMax)
+    auto sourceAssets = sciSourceAssets_;
+    if (sourceAssets.empty() && saSendMax_)
     {
-        sourceAssets.insert(saSendMax->asset());
+        sourceAssets.insert(saSendMax_->asset());
     }
     if (sourceAssets.empty())
     {
         // NOLINTBEGIN(bugprone-unchecked-optional-access) isValid() ensures both are set
-        auto assets = accountSourceAssets(*raSrcAccount, cache, true);
-        bool const sameAccount = *raSrcAccount == *raDstAccount;
+        auto assets = accountSourceAssets(*raSrcAccount_, cache, true);
+        bool const sameAccount = *raSrcAccount_ == *raDstAccount_;
         // NOLINTEND(bugprone-unchecked-optional-access)
         for (auto const& asset : assets)
         {
             if (!std::visit(
                     [&]<typename TAsset>(TAsset const& a) {
-                        if (!sameAccount || a != saDstAmount.asset())
+                        if (!sameAccount || a != saDstAmount_.asset())
                         {
-                            if (sourceAssets.size() >= RPC::Tuning::max_auto_src_cur)
+                            if (sourceAssets.size() >= RPC::Tuning::kMAX_AUTO_SRC_CUR)
                                 return false;
                             if constexpr (std::is_same_v<TAsset, Currency>)
                             {
                                 sourceAssets.insert(
-                                    Issue{a, a.isZero() ? xrpAccount() : *raSrcAccount});
+                                    Issue{a, a.isZero() ? xrpAccount() : *raSrcAccount_});
                             }
                             else
                             {
@@ -575,27 +577,27 @@ PathRequest::findPaths(
         }
     }
 
-    auto const dst_amount = convertAmount(saDstAmount, convert_all_);
-    hash_map<PathAsset, std::unique_ptr<Pathfinder>> pathasset_map;
+    auto const dstAmount = convertAmount(saDstAmount_, convert_all_);
+    hash_map<PathAsset, std::unique_ptr<Pathfinder>> currencyMap;
     for (auto const& asset : sourceAssets)
     {
         if (continueCallback && !continueCallback())
             break;
-        JLOG(m_journal.debug()) << iIdentifier
-                                << " Trying to find paths: " << STAmount(asset, 1).getFullText();
+        JLOG(journal_.debug()) << iIdentifier_
+                               << " Trying to find paths: " << STAmount(asset, 1).getFullText();
 
         auto& pathfinder =
-            getPathFinder(cache, pathasset_map, asset, dst_amount, level, continueCallback);
+            getPathFinder(cache, currencyMap, PathAsset(asset), dstAmount, level, continueCallback);
         if (!pathfinder)
         {
-            JLOG(m_journal.debug()) << iIdentifier << " No paths found";
+            JLOG(journal_.debug()) << iIdentifier_ << " No paths found";
             continue;
         }
 
         STPath fullLiquidityPath;
         auto ps = pathfinder->getBestPaths(
-            max_paths_, fullLiquidityPath, mContext[asset], asset.getIssuer(), continueCallback);
-        mContext[asset] = ps;
+            kMAX_PATHS, fullLiquidityPath, context_[asset], asset.getIssuer(), continueCallback);
+        context_[asset] = ps;
 
         auto const& sourceAccount = [&] {
             if (!isXRP(asset.getIssuer()))
@@ -604,12 +606,12 @@ PathRequest::findPaths(
             if (isXRP(asset))
                 return xrpAccount();
 
-            return *raSrcAccount;
+            return *raSrcAccount_;
         }();
 
         STAmount const saMaxAmount = [&]() {
-            if (saSendMax)
-                return *saSendMax;
+            if (saSendMax_)
+                return *saSendMax_;
             return asset.visit(
                 [&](Issue const& issue) {
                     return STAmount(Issue{issue.currency, sourceAccount}, 1u, 0, true);
@@ -617,81 +619,81 @@ PathRequest::findPaths(
                 [](MPTIssue const& issue) { return STAmount(issue, 1u, 0, true); });
         }();
 
-        JLOG(m_journal.debug()) << iIdentifier << " Paths found, calling rippleCalc";
+        JLOG(journal_.debug()) << iIdentifier_ << " Paths found, calling rippleCalc";
 
         path::RippleCalc::Input rcInput;
         if (convert_all_)
             rcInput.partialPaymentAllowed = true;
-        auto sandbox = std::make_unique<PaymentSandbox>(&*cache->getLedger(), tapNONE);
+        auto sandbox = std::make_unique<PaymentSandbox>(&*cache->getLedger(), TapNone);
         auto rc = path::RippleCalc::rippleCalculate(
             *sandbox,
             saMaxAmount,  // --> Amount to send is unlimited
                           //     to get an estimate.
-            dst_amount,   // --> Amount to deliver.
+            dstAmount,    // --> Amount to deliver.
             // NOLINTBEGIN(bugprone-unchecked-optional-access) isValid() ensures both are set
-            *raDstAccount,  // --> Account to deliver to.
-            *raSrcAccount,  // --> Account sending from.
+            *raDstAccount_,  // --> Account to deliver to.
+            *raSrcAccount_,  // --> Account sending from.
             // NOLINTEND(bugprone-unchecked-optional-access)
-            ps,      // --> Path set.
-            domain,  // --> Domain.
+            ps,       // --> Path set.
+            domain_,  // --> Domain.
             app_,
             &rcInput);
 
         if (!convert_all_ && !fullLiquidityPath.empty() &&
             (rc.result() == terNO_LINE || rc.result() == tecPATH_PARTIAL))
         {
-            JLOG(m_journal.debug()) << iIdentifier << " Trying with an extra path element";
+            JLOG(journal_.debug()) << iIdentifier_ << " Trying with an extra path element";
 
-            ps.push_back(fullLiquidityPath);
-            sandbox = std::make_unique<PaymentSandbox>(&*cache->getLedger(), tapNONE);
+            ps.pushBack(fullLiquidityPath);
+            sandbox = std::make_unique<PaymentSandbox>(&*cache->getLedger(), TapNone);
             rc = path::RippleCalc::rippleCalculate(
                 *sandbox,
                 saMaxAmount,  // --> Amount to send is unlimited
                               //     to get an estimate.
-                dst_amount,   // --> Amount to deliver.
+                dstAmount,    // --> Amount to deliver.
                 // NOLINTBEGIN(bugprone-unchecked-optional-access) isValid() ensures both are set
-                *raDstAccount,  // --> Account to deliver to.
-                *raSrcAccount,  // --> Account sending from.
+                *raDstAccount_,  // --> Account to deliver to.
+                *raSrcAccount_,  // --> Account sending from.
                 // NOLINTEND(bugprone-unchecked-optional-access)
-                ps,      // --> Path set.
-                domain,  // --> Domain.
+                ps,       // --> Path set.
+                domain_,  // --> Domain.
                 app_);
 
             if (!isTesSuccess(rc.result()))
             {
-                JLOG(m_journal.warn())
-                    << iIdentifier << " Failed with covering path " << transHuman(rc.result());
+                JLOG(journal_.warn())
+                    << iIdentifier_ << " Failed with covering path " << transHuman(rc.result());
             }
             else
             {
-                JLOG(m_journal.debug())
-                    << iIdentifier << " Extra path element gives " << transHuman(rc.result());
+                JLOG(journal_.debug())
+                    << iIdentifier_ << " Extra path element gives " << transHuman(rc.result());
             }
         }
 
         if (rc.result() == tesSUCCESS)
         {
-            Json::Value jvEntry(Json::objectValue);
+            json::Value jvEntry(json::ObjectValue);
             if (rc.actualAmountIn.holds<Issue>())
                 rc.actualAmountIn.get<Issue>().account = sourceAccount;
-            jvEntry[jss::source_amount] = rc.actualAmountIn.getJson(JsonOptions::none);
-            jvEntry[jss::paths_computed] = ps.getJson(JsonOptions::none);
+            jvEntry[jss::source_amount] = rc.actualAmountIn.getJson(JsonOptions::KNone);
+            jvEntry[jss::paths_computed] = ps.getJson(JsonOptions::KNone);
 
             if (convert_all_)
-                jvEntry[jss::destination_amount] = rc.actualAmountOut.getJson(JsonOptions::none);
+                jvEntry[jss::destination_amount] = rc.actualAmountOut.getJson(JsonOptions::KNone);
 
             if (hasCompletion())
             {
                 // Old ripple_path_find API requires this
-                jvEntry[jss::paths_canonical] = Json::arrayValue;
+                jvEntry[jss::paths_canonical] = json::ArrayValue;
             }
 
             jvArray.append(jvEntry);
         }
         else
         {
-            JLOG(m_journal.debug())
-                << iIdentifier << " rippleCalc returns " << transHuman(rc.result());
+            JLOG(journal_.debug())
+                << iIdentifier_ << " rippleCalc returns " << transHuman(rc.result());
         }
     }
 
@@ -704,119 +706,119 @@ PathRequest::findPaths(
     return true;
 }
 
-Json::Value
+json::Value
 PathRequest::doUpdate(
     std::shared_ptr<AssetCache> const& cache,
     bool fast,
     std::function<bool(void)> const& continueCallback)
 {
     using namespace std::chrono;
-    JLOG(m_journal.debug()) << iIdentifier << " update " << (fast ? "fast" : "normal");
+    JLOG(journal_.debug()) << iIdentifier_ << " update " << (fast ? "fast" : "normal");
 
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
 
         if (!isValid(cache))
-            return jvStatus;
+            return jvStatus_;
     }
 
-    Json::Value newStatus = Json::objectValue;
+    json::Value newStatus = json::ObjectValue;
 
     if (hasCompletion())
     {
         // Old ripple_path_find API gives destination_currencies
-        auto& destAssets = (newStatus[jss::destination_currencies] = Json::arrayValue);
+        auto& destAssets = (newStatus[jss::destination_currencies] = json::ArrayValue);
         // NOLINTNEXTLINE(bugprone-unchecked-optional-access) isValid() ensures both are set
-        auto const assets = accountDestAssets(*raDstAccount, cache, true);
+        auto const assets = accountDestAssets(*raDstAccount_, cache, true);
         for (auto const& asset : assets)
             destAssets.append(to_string(asset));
     }
 
     // NOLINTBEGIN(bugprone-unchecked-optional-access) isValid() ensures both are set
-    newStatus[jss::source_account] = toBase58(*raSrcAccount);
-    newStatus[jss::destination_account] = toBase58(*raDstAccount);
+    newStatus[jss::source_account] = toBase58(*raSrcAccount_);
+    newStatus[jss::destination_account] = toBase58(*raDstAccount_);
     // NOLINTEND(bugprone-unchecked-optional-access)
-    newStatus[jss::destination_amount] = saDstAmount.getJson(JsonOptions::none);
+    newStatus[jss::destination_amount] = saDstAmount_.getJson(JsonOptions::KNone);
     newStatus[jss::full_reply] = !fast;
 
-    if (jvId)
-        newStatus[jss::id] = jvId;
+    if (jvId_)
+        newStatus[jss::id] = jvId_;
 
     bool const loaded = app_.getFeeTrack().isLoadedLocal();
 
-    if (iLevel == 0)
+    if (iLevel_ == 0)
     {
         // first pass
         if (loaded || fast)
         {
-            iLevel = app_.config().PATH_SEARCH_FAST;
+            iLevel_ = app_.config().PATH_SEARCH_FAST;
         }
         else
         {
-            iLevel = app_.config().PATH_SEARCH;
+            iLevel_ = app_.config().PATH_SEARCH;
         }
     }
-    else if ((iLevel == app_.config().PATH_SEARCH_FAST) && !fast)
+    else if ((iLevel_ == app_.config().PATH_SEARCH_FAST) && !fast)
     {
         // leaving fast pathfinding
-        iLevel = app_.config().PATH_SEARCH;
-        if (loaded && (iLevel > app_.config().PATH_SEARCH_FAST))
-            --iLevel;
+        iLevel_ = app_.config().PATH_SEARCH;
+        if (loaded && (iLevel_ > app_.config().PATH_SEARCH_FAST))
+            --iLevel_;
     }
-    else if (bLastSuccess)
+    else if (bLastSuccess_)
     {
         // decrement, if possible
-        if (iLevel > app_.config().PATH_SEARCH ||
-            (loaded && (iLevel > app_.config().PATH_SEARCH_FAST)))
-            --iLevel;
+        if (iLevel_ > app_.config().PATH_SEARCH ||
+            (loaded && (iLevel_ > app_.config().PATH_SEARCH_FAST)))
+            --iLevel_;
     }
     else
     {
         // adjust as needed
-        if (!loaded && (iLevel < app_.config().PATH_SEARCH_MAX))
-            ++iLevel;
-        if (loaded && (iLevel > app_.config().PATH_SEARCH_FAST))
-            --iLevel;
+        if (!loaded && (iLevel_ < app_.config().PATH_SEARCH_MAX))
+            ++iLevel_;
+        if (loaded && (iLevel_ > app_.config().PATH_SEARCH_FAST))
+            --iLevel_;
     }
 
-    JLOG(m_journal.debug()) << iIdentifier << " processing at level " << iLevel;
+    JLOG(journal_.debug()) << iIdentifier_ << " processing at level " << iLevel_;
 
-    Json::Value jvArray = Json::arrayValue;
-    if (findPaths(cache, iLevel, jvArray, continueCallback))
+    json::Value jvArray = json::ArrayValue;
+    if (findPaths(cache, iLevel_, jvArray, continueCallback))
     {
-        bLastSuccess = jvArray.size() != 0;
+        bLastSuccess_ = jvArray.size() != 0;
         newStatus[jss::alternatives] = std::move(jvArray);
     }
     else
     {
-        bLastSuccess = false;
-        newStatus = rpcError(rpcINTERNAL);
+        bLastSuccess_ = false;
+        newStatus = rpcError(RpcInternal);
     }
 
     if (fast && quick_reply_ == steady_clock::time_point{})
     {
         quick_reply_ = steady_clock::now();
-        mOwner.reportFast(duration_cast<milliseconds>(quick_reply_ - created_));
+        owner_.reportFast(duration_cast<milliseconds>(quick_reply_ - created_));
     }
     else if (!fast && full_reply_ == steady_clock::time_point{})
     {
         full_reply_ = steady_clock::now();
-        mOwner.reportFull(duration_cast<milliseconds>(full_reply_ - created_));
+        owner_.reportFull(duration_cast<milliseconds>(full_reply_ - created_));
     }
 
     {
-        std::scoped_lock const sl(mLock);
-        jvStatus = newStatus;
+        std::scoped_lock const sl(lock_);
+        jvStatus_ = newStatus;
     }
 
-    JLOG(m_journal.debug()) << iIdentifier << " update finished " << (fast ? "fast" : "normal");
+    JLOG(journal_.debug()) << iIdentifier_ << " update finished " << (fast ? "fast" : "normal");
     return newStatus;
 }
 
 InfoSub::pointer
 PathRequest::getSubscriber() const
 {
-    return wpSubscriber.lock();
+    return wpSubscriber_.lock();
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/PathRequest.h b/src/xrpld/rpc/detail/PathRequest.h
index 046c643a84..b74d4c6ade 100644
--- a/src/xrpld/rpc/detail/PathRequest.h
+++ b/src/xrpld/rpc/detail/PathRequest.h
@@ -68,18 +68,18 @@ public:
     void
     updateComplete();
 
-    std::pair<bool, Json::Value>
-    doCreate(std::shared_ptr<AssetCache> const&, Json::Value const&);
+    std::pair<bool, json::Value>
+    doCreate(std::shared_ptr<AssetCache> const&, json::Value const&);
 
-    Json::Value
+    json::Value
     doClose() override;
-    Json::Value
-    doStatus(Json::Value const&) override;
+    json::Value
+    doStatus(json::Value const&) override;
     void
     doAborting() const;
 
     // update jvStatus
-    Json::Value
+    json::Value
     doUpdate(
         std::shared_ptr<AssetCache> const&,
         bool fast,
@@ -109,53 +109,53 @@ private:
     findPaths(
         std::shared_ptr<AssetCache> const&,
         int const,
-        Json::Value&,
+        json::Value&,
         std::function<bool(void)> const&);
 
     int
-    parseJson(Json::Value const&);
+    parseJson(json::Value const&);
 
     Application& app_;
-    beast::Journal m_journal;
+    beast::Journal journal_;
 
-    std::recursive_mutex mLock;
+    std::recursive_mutex lock_;
 
-    PathRequestManager& mOwner;
+    PathRequestManager& owner_;
 
-    std::weak_ptr<InfoSub> wpSubscriber;  // Who this request came from
-    std::function<void(void)> fCompletion;
+    std::weak_ptr<InfoSub> wpSubscriber_;  // Who this request came from
+    std::function<void(void)> fCompletion_;
     Resource::Consumer& consumer_;  // Charge according to source currencies
 
-    Json::Value jvId;
-    Json::Value jvStatus;  // Last result
+    json::Value jvId_;
+    json::Value jvStatus_;  // Last result
 
     // Client request parameters
-    std::optional<AccountID> raSrcAccount;
-    std::optional<AccountID> raDstAccount;
-    STAmount saDstAmount;
-    std::optional<STAmount> saSendMax;
+    std::optional<AccountID> raSrcAccount_;
+    std::optional<AccountID> raDstAccount_;
+    STAmount saDstAmount_;
+    std::optional<STAmount> saSendMax_;
 
-    std::set<Asset> sciSourceAssets;
-    std::map<Asset, STPathSet> mContext;
+    std::set<Asset> sciSourceAssets_;
+    std::map<Asset, STPathSet> context_;
 
-    std::optional<uint256> domain;
+    std::optional<uint256> domain_;
 
     bool convert_all_{};
 
-    std::recursive_mutex mIndexLock;
-    LedgerIndex mLastIndex;
-    bool mInProgress;
+    std::recursive_mutex indexLock_;
+    LedgerIndex lastIndex_;
+    bool inProgress_;
 
-    int iLevel;
-    bool bLastSuccess;
+    int iLevel_;
+    bool bLastSuccess_;
 
-    int const iIdentifier;
+    int const iIdentifier_;
 
     std::chrono::steady_clock::time_point const created_;
     std::chrono::steady_clock::time_point quick_reply_;
     std::chrono::steady_clock::time_point full_reply_;
 
-    static unsigned int const max_paths_ = 4;
+    static unsigned int const kMAX_PATHS = 4;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/PathRequestManager.cpp b/src/xrpld/rpc/detail/PathRequestManager.cpp
index b05737197e..ba42a0122f 100644
--- a/src/xrpld/rpc/detail/PathRequestManager.cpp
+++ b/src/xrpld/rpc/detail/PathRequestManager.cpp
@@ -32,13 +32,13 @@ namespace xrpl {
 std::shared_ptr<AssetCache>
 PathRequestManager::getAssetCache(std::shared_ptr<ReadView const> const& ledger, bool authoritative)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     auto assetCache = assetCache_.lock();
 
     std::uint32_t const lineSeq = assetCache ? assetCache->getLedger()->seq() : 0;
     std::uint32_t const lgrSeq = ledger->seq();
-    JLOG(mJournal.debug()) << "getAssetCache has cache for " << lineSeq << ", considering "
+    JLOG(journal_.debug()) << "getLineCache has cache for " << lineSeq << ", considering "
                            << lgrSeq;
 
     if ((lineSeq == 0) ||                               // no ledger
@@ -46,7 +46,7 @@ PathRequestManager::getAssetCache(std::shared_ptr<ReadView const> const& ledger,
         (authoritative && ((lgrSeq + 8) < lineSeq)) ||  // we jumped way back for some reason
         (lgrSeq > (lineSeq + 8)))                       // we jumped way forward for some reason
     {
-        JLOG(mJournal.debug()) << "getAssetCache creating new cache for " << lgrSeq;
+        JLOG(journal_.debug()) << "getLineCache creating new cache for " << lgrSeq;
         // Assign to the local before the member, because the member is a
         // weak_ptr, and will immediately discard it if there are no other
         // references.
@@ -59,14 +59,14 @@ PathRequestManager::getAssetCache(std::shared_ptr<ReadView const> const& ledger,
 void
 PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 {
-    auto event = app_.getJobQueue().makeLoadEvent(jtPATH_FIND, "PathRequest::updateAll");
+    auto event = app_.getJobQueue().makeLoadEvent(JtPathFind, "PathRequest::updateAll");
 
     std::vector<PathRequest::wptr> requests;
     std::shared_ptr<AssetCache> cache;
 
     // Get the ledger and cache we should be using
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
         requests = requests_;
         cache = getAssetCache(inLedger, true);
     }
@@ -74,7 +74,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
     bool newRequests = app_.getLedgerMaster().isNewPathRequest();
     bool mustBreak = false;
 
-    JLOG(mJournal.trace()) << "updateAll seq=" << cache->getLedger()->seq() << ", "
+    JLOG(journal_.trace()) << "updateAll seq=" << cache->getLedger()->seq() << ", "
                            << requests.size() << " requests";
 
     int processed = 0, removed = 0;
@@ -90,7 +90,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 
     do
     {
-        JLOG(mJournal.trace()) << "updateAll looping";
+        JLOG(journal_.trace()) << "updateAll looping";
         for (auto const& wr : requests)
         {
             if (app_.getJobQueue().isStopping())
@@ -98,7 +98,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 
             auto request = wr.lock();
             bool remove = true;
-            JLOG(mJournal.trace()) << "updateAll request " << (request ? "" : "not ") << "found";
+            JLOG(journal_.trace()) << "updateAll request " << (request ? "" : "not ") << "found";
 
             if (request)
             {
@@ -122,7 +122,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
                             // it can be freed if the client disconnects, and
                             // thus fail to lock later.
                             ipSub.reset();
-                            Json::Value update = request->doUpdate(cache, false, continueCallback);
+                            json::Value update = request->doUpdate(cache, false, continueCallback);
                             request->updateComplete();
                             update[jss::type] = "path_find";
                             if ((ipSub = getSubscriber(request)))
@@ -145,7 +145,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
 
             if (remove)
             {
-                std::scoped_lock const sl(mLock);
+                std::scoped_lock const sl(lock_);
 
                 // Remove any dangling weak pointers or weak
                 // pointers that refer to this path request.
@@ -189,7 +189,7 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
         std::shared_ptr<AssetCache> lastCache;
         {
             // Get the latest requests, cache, and ledger for next pass
-            std::scoped_lock const sl(mLock);
+            std::scoped_lock const sl(lock_);
 
             if (requests_.empty())
                 break;
@@ -199,21 +199,21 @@ PathRequestManager::updateAll(std::shared_ptr<ReadView const> const& inLedger)
         }
     } while (!app_.getJobQueue().isStopping());
 
-    JLOG(mJournal.debug()) << "updateAll complete: " << processed << " processed and " << removed
+    JLOG(journal_.debug()) << "updateAll complete: " << processed << " processed and " << removed
                            << " removed";
 }
 
 bool
 PathRequestManager::requestsPending() const
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
     return !requests_.empty();
 }
 
 void
 PathRequestManager::insertPathRequest(PathRequest::pointer const& req)
 {
-    std::scoped_lock const sl(mLock);
+    std::scoped_lock const sl(lock_);
 
     // Insert after any older unserviced requests but before
     // any serviced requests
@@ -228,13 +228,13 @@ PathRequestManager::insertPathRequest(PathRequest::pointer const& req)
 }
 
 // Make a new-style path_find request
-Json::Value
+json::Value
 PathRequestManager::makePathRequest(
     std::shared_ptr<InfoSub> const& subscriber,
     std::shared_ptr<ReadView const> const& inLedger,
-    Json::Value const& requestJson)
+    json::Value const& requestJson)
 {
-    auto req = std::make_shared<PathRequest>(app_, subscriber, ++mLastIdentifier, *this, mJournal);
+    auto req = std::make_shared<PathRequest>(app_, subscriber, ++lastIdentifier_, *this, journal_);
 
     auto [valid, jvRes] = req->doCreate(getAssetCache(inLedger, false), requestJson);
 
@@ -248,18 +248,18 @@ PathRequestManager::makePathRequest(
 }
 
 // Make an old-style ripple_path_find request
-Json::Value
+json::Value
 PathRequestManager::makeLegacyPathRequest(
     PathRequest::pointer& req,
     std::function<void(void)> completion,
     Resource::Consumer& consumer,
     std::shared_ptr<ReadView const> const& inLedger,
-    Json::Value const& request)
+    json::Value const& request)
 {
     // This assignment must take place before the
     // completion function is called
     req = std::make_shared<PathRequest>(
-        app_, completion, consumer, ++mLastIdentifier, *this, mJournal);
+        app_, completion, consumer, ++lastIdentifier_, *this, journal_);
 
     auto [valid, jvRes] = req->doCreate(getAssetCache(inLedger, false), request);
 
@@ -273,7 +273,7 @@ PathRequestManager::makeLegacyPathRequest(
         if (!app_.getLedgerMaster().newPathRequest())
         {
             // The newPathRequest failed.  Tell the caller.
-            jvRes = rpcError(rpcTOO_BUSY);
+            jvRes = rpcError(RpcTooBusy);
             req.reset();
         }
     }
@@ -281,16 +281,16 @@ PathRequestManager::makeLegacyPathRequest(
     return std::move(jvRes);
 }
 
-Json::Value
+json::Value
 PathRequestManager::doLegacyPathRequest(
     Resource::Consumer& consumer,
     std::shared_ptr<ReadView const> const& inLedger,
-    Json::Value const& request)
+    json::Value const& request)
 {
     auto cache = std::make_shared<AssetCache>(inLedger, app_.getJournal("AssetCache"));
 
     auto req =
-        std::make_shared<PathRequest>(app_, [] {}, consumer, ++mLastIdentifier, *this, mJournal);
+        std::make_shared<PathRequest>(app_, [] {}, consumer, ++lastIdentifier_, *this, journal_);
 
     auto [valid, jvRes] = req->doCreate(cache, request);
     if (valid)
diff --git a/src/xrpld/rpc/detail/PathRequestManager.h b/src/xrpld/rpc/detail/PathRequestManager.h
index f76a52bc1c..5a5cfde402 100644
--- a/src/xrpld/rpc/detail/PathRequestManager.h
+++ b/src/xrpld/rpc/detail/PathRequestManager.h
@@ -19,10 +19,10 @@ public:
         Application& app,
         beast::Journal journal,
         beast::insight::Collector::ptr const& collector)
-        : app_(app), mJournal(journal), mLastIdentifier(0)
+        : app_(app), journal_(journal), lastIdentifier_(0)
     {
-        mFast = collector->make_event("pathfind_fast");
-        mFull = collector->make_event("pathfind_full");
+        fast_ = collector->makeEvent("pathfind_fast");
+        full_ = collector->makeEvent("pathfind_full");
     }
 
     /** Update all of the contained PathRequest instances.
@@ -40,41 +40,41 @@ public:
 
     // Create a new-style path request that pushes
     // updates to a subscriber
-    Json::Value
+    json::Value
     makePathRequest(
         std::shared_ptr<InfoSub> const& subscriber,
         std::shared_ptr<ReadView const> const& ledger,
-        Json::Value const& request);
+        json::Value const& request);
 
     // Create an old-style path request that is
     // managed by a coroutine and updated by
     // the path engine
-    Json::Value
+    json::Value
     makeLegacyPathRequest(
         PathRequest::pointer& req,
         std::function<void(void)> completion,
         Resource::Consumer& consumer,
         std::shared_ptr<ReadView const> const& inLedger,
-        Json::Value const& request);
+        json::Value const& request);
 
     // Execute an old-style path request immediately
     // with the ledger specified by the caller
-    Json::Value
+    json::Value
     doLegacyPathRequest(
         Resource::Consumer& consumer,
         std::shared_ptr<ReadView const> const& inLedger,
-        Json::Value const& request);
+        json::Value const& request);
 
     void
     reportFast(std::chrono::milliseconds ms)
     {
-        mFast.notify(ms);
+        fast_.notify(ms);
     }
 
     void
     reportFull(std::chrono::milliseconds ms)
     {
-        mFull.notify(ms);
+        full_.notify(ms);
     }
 
 private:
@@ -82,10 +82,10 @@ private:
     insertPathRequest(PathRequest::pointer const&);
 
     Application& app_;
-    beast::Journal mJournal;
+    beast::Journal journal_;
 
-    beast::insight::Event mFast;
-    beast::insight::Event mFull;
+    beast::insight::Event fast_;
+    beast::insight::Event full_;
 
     // Track all requests
     std::vector<PathRequest::wptr> requests_;
@@ -93,9 +93,9 @@ private:
     // Use a AssetCache
     std::weak_ptr<AssetCache> assetCache_;
 
-    std::atomic<int> mLastIdentifier;
+    std::atomic<int> lastIdentifier_;
 
-    std::recursive_mutex mutable mLock;
+    std::recursive_mutex mutable lock_;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/Pathfinder.cpp b/src/xrpld/rpc/detail/Pathfinder.cpp
index ed486c80a8..9a34cf44f1 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 PATHFINDER_MAX_COMPLETE_PATHS = 1000;
+constexpr std::size_t kPATHFINDER_MAX_COMPLETE_PATHS = 1000;
 
 struct AccountCandidate
 {
     int priority;
     AccountID account;
 
-    static int const highPriority = 10000;
+    static int const kHIGH_PRIORITY = 10000;
 };
 
 bool
@@ -142,7 +142,7 @@ struct PathCost
 };
 using PathCostList = std::vector<PathCost>;
 
-PathTable mPathTable;
+PathTable gPathTable;
 
 std::string
 pathTypeToString(Pathfinder::PathType const& type)
@@ -153,22 +153,22 @@ pathTypeToString(Pathfinder::PathType const& type)
     {
         switch (node)
         {
-            case Pathfinder::NodeType::nt_SOURCE:
+            case Pathfinder::NodeType::Source:
                 ret.append("s");
                 break;
-            case Pathfinder::NodeType::nt_ACCOUNTS:
+            case Pathfinder::NodeType::Accounts:
                 ret.append("a");
                 break;
-            case Pathfinder::NodeType::nt_BOOKS:
+            case Pathfinder::NodeType::Books:
                 ret.append("b");
                 break;
-            case Pathfinder::NodeType::nt_XRP_BOOK:
+            case Pathfinder::NodeType::XrpBook:
                 ret.append("x");
                 break;
-            case Pathfinder::NodeType::nt_DEST_BOOK:
+            case Pathfinder::NodeType::DestBook:
                 ret.append("f");
                 break;
-            case Pathfinder::NodeType::nt_DESTINATION:
+            case Pathfinder::NodeType::Destination:
                 ret.append("d");
                 break;
         }
@@ -219,17 +219,17 @@ Pathfinder::Pathfinder(
     std::optional<STAmount> const& srcAmount,
     std::optional<uint256> const& domain,
     Application& app)
-    : mSrcAccount(uSrcAccount)
-    , mDstAccount(uDstAccount)
-    , mEffectiveDst(isXRP(saDstAmount.getIssuer()) ? uDstAccount : saDstAmount.getIssuer())
-    , mDstAmount(saDstAmount)
-    , mSrcPathAsset(uSrcPathAsset)
-    , mSrcIssuer(uSrcIssuer)
-    , mSrcAmount(amountFromPathAsset(uSrcPathAsset, uSrcIssuer, uSrcAccount))
-    , convert_all_(convertAllCheck(mDstAmount))
-    , mDomain(domain)
-    , mLedger(cache->getLedger())
-    , mAssetCache(cache)
+    : srcAccount_(uSrcAccount)
+    , dstAccount_(uDstAccount)
+    , effectiveDst_(isXRP(saDstAmount.getIssuer()) ? uDstAccount : saDstAmount.getIssuer())
+    , dstAmount_(saDstAmount)
+    , srcPathAsset_(uSrcPathAsset)
+    , srcIssuer_(uSrcIssuer)
+    , srcAmount_(amountFromPathAsset(uSrcPathAsset, uSrcIssuer, uSrcAccount))
+    , convert_all_(convertAllCheck(dstAmount_))
+    , domain_(domain)
+    , ledger_(cache->getLedger())
+    , rLCache_(cache)
     , app_(app)
     , j_(app.getJournal("Pathfinder"))
 {
@@ -242,68 +242,68 @@ bool
 Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continueCallback)
 {
     JLOG(j_.trace()) << "findPaths start";
-    if (mDstAmount == beast::zero)
+    if (dstAmount_ == beast::kZERO)
     {
         // No need to send zero money.
         JLOG(j_.debug()) << "Destination amount was zero.";
-        mLedger.reset();
+        ledger_.reset();
         return false;
 
         // TODO(tom): why do we reset the ledger just in this case and the one
         // below - why don't we do it each time we return false?
     }
 
-    if (mSrcAccount == mDstAccount && mDstAccount == mEffectiveDst &&
-        mSrcPathAsset == mDstAmount.asset())
+    if (srcAccount_ == dstAccount_ && dstAccount_ == effectiveDst_ &&
+        srcPathAsset_ == dstAmount_.asset())
     {
         // No need to send to same account with same currency.
         JLOG(j_.debug()) << "Tried to send to same issuer";
-        mLedger.reset();
+        ledger_.reset();
         return false;
     }
 
-    if (mSrcAccount == mEffectiveDst && mSrcPathAsset == mDstAmount.asset())
+    if (srcAccount_ == effectiveDst_ && srcPathAsset_ == dstAmount_.asset())
     {
         // Default path might work, but any path would loop
         return true;
     }
 
-    m_loadEvent = app_.getJobQueue().makeLoadEvent(jtPATH_FIND, "FindPath");
-    auto currencyIsXRP = isXRP(mSrcPathAsset);
+    loadEvent_ = app_.getJobQueue().makeLoadEvent(JtPathFind, "FindPath");
+    auto currencyIsXRP = isXRP(srcPathAsset_);
 
-    bool const useIssuerAccount = mSrcIssuer && !currencyIsXRP && !isXRP(*mSrcIssuer);
-    auto& account = useIssuerAccount ? *mSrcIssuer : mSrcAccount;
+    bool const useIssuerAccount = srcIssuer_ && !currencyIsXRP && !isXRP(*srcIssuer_);
+    auto& account = useIssuerAccount ? *srcIssuer_ : srcAccount_;
     auto issuer = currencyIsXRP ? AccountID() : account;
-    mSource = STPathElement(account, mSrcPathAsset, issuer);
-    auto issuerString = mSrcIssuer ? to_string(*mSrcIssuer) : std::string("none");
+    source_ = STPathElement(account, srcPathAsset_, issuer);
+    auto issuerString = srcIssuer_ ? to_string(*srcIssuer_) : std::string("none");
     JLOG(j_.trace()) << "findPaths>"
-                     << " mSrcAccount=" << mSrcAccount << " mDstAccount=" << mDstAccount
-                     << " mDstAmount=" << mDstAmount.getFullText()
-                     << " mSrcPathAsset=" << mSrcPathAsset << " mSrcIssuer=" << issuerString;
+                     << " srcAccount_=" << srcAccount_ << " dstAccount_=" << dstAccount_
+                     << " dstAmount_=" << dstAmount_.getFullText()
+                     << " srcPathAsset_=" << srcPathAsset_ << " srcIssuer_=" << issuerString;
 
-    if (!mLedger)
+    if (!ledger_)
     {
         JLOG(j_.debug()) << "findPaths< no ledger";
         return false;
     }
 
-    bool const bSrcXrp = isXRP(mSrcPathAsset);
-    bool const bDstXrp = isXRP(mDstAmount.asset());
+    bool const bSrcXrp = isXRP(srcPathAsset_);
+    bool const bDstXrp = isXRP(dstAmount_.asset());
 
-    if (!mLedger->exists(keylet::account(mSrcAccount)))
+    if (!ledger_->exists(keylet::account(srcAccount_)))
     {
         // We can't even start without a source account.
         JLOG(j_.debug()) << "invalid source account";
         return false;
     }
 
-    if ((mEffectiveDst != mDstAccount) && !mLedger->exists(keylet::account(mEffectiveDst)))
+    if ((effectiveDst_ != dstAccount_) && !ledger_->exists(keylet::account(effectiveDst_)))
     {
         JLOG(j_.debug()) << "Non-existent gateway";
         return false;
     }
 
-    if (!mLedger->exists(keylet::account(mDstAccount)))
+    if (!ledger_->exists(keylet::account(dstAccount_)))
     {
         // Can't find the destination account - we must be funding a new
         // account.
@@ -313,10 +313,10 @@ Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continue
             return false;
         }
 
-        auto const reserve = STAmount(mLedger->fees().reserve);
-        if (mDstAmount < reserve)
+        auto const reserve = STAmount(ledger_->fees().reserve);
+        if (dstAmount_ < reserve)
         {
-            JLOG(j_.debug()) << "New account not getting enough funding: " << mDstAmount << " < "
+            JLOG(j_.debug()) << "New account not getting enough funding: " << dstAmount_ << " < "
                              << reserve;
             return false;
         }
@@ -324,40 +324,40 @@ Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continue
 
     // Now compute the payment type from the types of the source and destination
     // currencies.
-    PaymentType paymentType = PaymentType::pt_XRP_to_XRP;
+    PaymentType paymentType = PaymentType::XrpToXrp;
     if (bSrcXrp && bDstXrp)
     {
         // XRP -> XRP
         JLOG(j_.debug()) << "XRP to XRP payment";
-        paymentType = PaymentType::pt_XRP_to_XRP;
+        paymentType = PaymentType::XrpToXrp;
     }
     else if (bSrcXrp)
     {
         // XRP -> non-XRP
         JLOG(j_.debug()) << "XRP to non-XRP payment";
-        paymentType = PaymentType::pt_XRP_to_nonXRP;
+        paymentType = PaymentType::XrpToNonXrp;
     }
     else if (bDstXrp)
     {
         // non-XRP -> XRP
         JLOG(j_.debug()) << "non-XRP to XRP payment";
-        paymentType = PaymentType::pt_nonXRP_to_XRP;
+        paymentType = PaymentType::NonXrpToXrp;
     }
-    else if (mSrcPathAsset == mDstAmount.asset())
+    else if (srcPathAsset_ == dstAmount_.asset())
     {
         // non-XRP -> non-XRP - Same currency
         JLOG(j_.debug()) << "non-XRP to non-XRP - same currency";
-        paymentType = PaymentType::pt_nonXRP_to_same;
+        paymentType = PaymentType::NonXrpToSame;
     }
     else
     {
         // non-XRP to non-XRP - Different currency
         JLOG(j_.debug()) << "non-XRP to non-XRP - cross currency";
-        paymentType = PaymentType::pt_nonXRP_to_nonXRP;
+        paymentType = PaymentType::NonXrpToNonXrp;
     }
 
     // Now iterate over all paths for that paymentType.
-    for (auto const& costedPath : mPathTable[paymentType])
+    for (auto const& costedPath : gPathTable[paymentType])
     {
         if (continueCallback && !continueCallback())
             return false;
@@ -367,12 +367,12 @@ Pathfinder::findPaths(int searchLevel, std::function<bool(void)> const& continue
             JLOG(j_.trace()) << "findPaths trying payment type " << paymentType;
             addPathsForType(costedPath.type, continueCallback);
 
-            if (mCompletePaths.size() > PATHFINDER_MAX_COMPLETE_PATHS)
+            if (completePaths_.size() > kPATHFINDER_MAX_COMPLETE_PATHS)
                 break;
         }
     }
 
-    JLOG(j_.debug()) << mCompletePaths.size() << " complete paths found";
+    JLOG(j_.debug()) << completePaths_.size() << " complete paths found";
 
     // Even if we find no paths, default paths may work, and we don't check them
     // currently.
@@ -388,12 +388,12 @@ Pathfinder::getPathLiquidity(
     uint64_t& qualityOut) const    // OUT: The returned initial quality
 {
     STPathSet pathSet;
-    pathSet.push_back(path);
+    pathSet.pushBack(path);
 
     path::RippleCalc::Input rcInput;
     rcInput.defaultPathsAllowed = false;
 
-    PaymentSandbox sandbox(&*mLedger, tapNONE);
+    PaymentSandbox sandbox(&*ledger_, TapNone);
 
     try
     {
@@ -403,12 +403,12 @@ Pathfinder::getPathLiquidity(
 
         auto rc = path::RippleCalc::rippleCalculate(
             sandbox,
-            mSrcAmount,
+            srcAmount_,
             minDstAmount,
-            mDstAccount,
-            mSrcAccount,
+            dstAccount_,
+            srcAccount_,
             pathSet,
-            mDomain,
+            domain_,
             app_,
             &rcInput);
         // If we can't get even the minimum liquidity requested, we're done.
@@ -424,12 +424,12 @@ Pathfinder::getPathLiquidity(
             rcInput.partialPaymentAllowed = true;
             rc = path::RippleCalc::rippleCalculate(
                 sandbox,
-                mSrcAmount,
-                mDstAmount - amountOut,
-                mDstAccount,
-                mSrcAccount,
+                srcAmount_,
+                dstAmount_ - amountOut,
+                dstAccount_,
+                srcAccount_,
                 pathSet,
-                mDomain,
+                domain_,
                 app_,
                 &rcInput);
 
@@ -443,7 +443,7 @@ Pathfinder::getPathLiquidity(
     catch (std::exception const& e)
     {
         JLOG(j_.info()) << "checkpath: exception (" << e.what() << ") "
-                        << path.getJson(JsonOptions::none);
+                        << path.getJson(JsonOptions::KNone);
         return tefEXCEPTION;
     }
 }
@@ -451,30 +451,30 @@ Pathfinder::getPathLiquidity(
 void
 Pathfinder::computePathRanks(int maxPaths, std::function<bool(void)> const& continueCallback)
 {
-    mRemainingAmount = convertAmount(mDstAmount, convert_all_);
+    remainingAmount_ = convertAmount(dstAmount_, convert_all_);
 
     // Must subtract liquidity in default path from remaining amount.
     try
     {
-        PaymentSandbox sandbox(&*mLedger, tapNONE);
+        PaymentSandbox sandbox(&*ledger_, TapNone);
 
         path::RippleCalc::Input rcInput;
         rcInput.partialPaymentAllowed = true;
         auto rc = path::RippleCalc::rippleCalculate(
             sandbox,
-            mSrcAmount,
-            mRemainingAmount,
-            mDstAccount,
-            mSrcAccount,
+            srcAmount_,
+            remainingAmount_,
+            dstAccount_,
+            srcAccount_,
             STPathSet(),
-            mDomain,
+            domain_,
             app_,
             &rcInput);
 
         if (rc.result() == tesSUCCESS)
         {
             JLOG(j_.debug()) << "Default path contributes: " << rc.actualAmountIn;
-            mRemainingAmount -= rc.actualAmountOut;
+            remainingAmount_ -= rc.actualAmountOut;
         }
         else
         {
@@ -486,7 +486,7 @@ Pathfinder::computePathRanks(int maxPaths, std::function<bool(void)> const& cont
         JLOG(j_.debug()) << "Default path causes exception";
     }
 
-    rankPaths(maxPaths, mCompletePaths, mPathRanks, continueCallback);
+    rankPaths(maxPaths, completePaths_, pathRanks_, continueCallback);
 }
 
 static bool
@@ -516,7 +516,7 @@ removeIssuer(STPath const& path)
     STPath ret;
 
     for (auto it = path.begin() + 1; it != path.end(); ++it)
-        ret.push_back(*it);
+        ret.pushBack(*it);
 
     return ret;
 }
@@ -539,12 +539,12 @@ Pathfinder::rankPaths(
         if (!convert_all_)
         {
             // Ignore paths that move only very small amounts.
-            return smallestUsefulAmount(mDstAmount, maxPaths);
+            return smallestUsefulAmount(dstAmount_, maxPaths);
         }
 
         // On convert_all_ partialPaymentAllowed will be set to true
         // and requiring a huge amount will find the highest liquidity.
-        return largestAmount(mDstAmount);
+        return largestAmount(dstAmount_);
     }();
 
     for (int i = 0; i < paths.size(); ++i)
@@ -561,12 +561,12 @@ Pathfinder::rankPaths(
             if (!isTesSuccess(resultCode))
             {
                 JLOG(j_.debug()) << "findPaths: dropping : " << transToken(resultCode) << ": "
-                                 << currentPath.getJson(JsonOptions::none);
+                                 << currentPath.getJson(JsonOptions::KNone);
             }
             else
             {
                 JLOG(j_.debug()) << "findPaths: quality: " << uQuality << ": "
-                                 << currentPath.getJson(JsonOptions::none);
+                                 << currentPath.getJson(JsonOptions::KNone);
 
                 rankedPaths.push_back({uQuality, currentPath.size(), liquidity, i});
             }
@@ -605,15 +605,15 @@ Pathfinder::getBestPaths(
     AccountID const& srcIssuer,
     std::function<bool(void)> const& continueCallback)
 {
-    JLOG(j_.debug()) << "findPaths: " << mCompletePaths.size() << " paths and " << extraPaths.size()
+    JLOG(j_.debug()) << "findPaths: " << completePaths_.size() << " paths and " << extraPaths.size()
                      << " extras";
 
-    if (mCompletePaths.empty() && extraPaths.empty())
-        return mCompletePaths;
+    if (completePaths_.empty() && extraPaths.empty())
+        return completePaths_;
 
     XRPL_ASSERT(
         fullLiquidityPath.empty(), "xrpl::Pathfinder::getBestPaths : first empty path result");
-    bool const issuerIsSender = isXRP(mSrcPathAsset) || (srcIssuer == mSrcAccount);
+    bool const issuerIsSender = isXRP(srcPathAsset_) || (srcIssuer == srcAccount_);
 
     std::vector<PathRank> extraPathRanks;
     rankPaths(maxPaths, extraPaths, extraPathRanks, continueCallback);
@@ -623,19 +623,19 @@ Pathfinder::getBestPaths(
     // The best PathRanks are now at the start.  Pull off enough of them to
     // fill bestPaths, then look through the rest for the best individual
     // path that can satisfy the entire liquidity - if one exists.
-    STAmount remaining = mRemainingAmount;
+    STAmount remaining = remainingAmount_;
 
-    auto pathsIterator = mPathRanks.begin();
+    auto pathsIterator = pathRanks_.begin();
     auto extraPathsIterator = extraPathRanks.begin();
 
-    while (pathsIterator != mPathRanks.end() || extraPathsIterator != extraPathRanks.end())
+    while (pathsIterator != pathRanks_.end() || extraPathsIterator != extraPathRanks.end())
     {
         if (continueCallback && !continueCallback())
             break;
         bool usePath = false;
         bool useExtraPath = false;
 
-        if (pathsIterator == mPathRanks.end())
+        if (pathsIterator == pathRanks_.end())
         {
             useExtraPath = true;
         }
@@ -668,7 +668,7 @@ Pathfinder::getBestPaths(
 
         auto& pathRank = usePath ? *pathsIterator : *extraPathsIterator;
 
-        auto const& path = usePath ? mCompletePaths[pathRank.index] : extraPaths[pathRank.index];
+        auto const& path = usePath ? completePaths_[pathRank.index] : extraPaths[pathRank.index];
 
         if (useExtraPath)
             ++extraPathsIterator;
@@ -706,30 +706,30 @@ Pathfinder::getBestPaths(
         {
             --iPathsLeft;
             remaining -= pathRank.liquidity;
-            bestPaths.push_back(startsWithIssuer ? removeIssuer(path) : path);
+            bestPaths.pushBack(startsWithIssuer ? removeIssuer(path) : path);
         }
-        else if (iPathsLeft == 0 && pathRank.liquidity >= mDstAmount && fullLiquidityPath.empty())
+        else if (iPathsLeft == 0 && pathRank.liquidity >= dstAmount_ && fullLiquidityPath.empty())
         {
             // We found an extra path that can move the whole amount.
             fullLiquidityPath = (startsWithIssuer ? removeIssuer(path) : path);
             JLOG(j_.debug()) << "Found extra full path: "
-                             << fullLiquidityPath.getJson(JsonOptions::none);
+                             << fullLiquidityPath.getJson(JsonOptions::KNone);
         }
         else
         {
-            JLOG(j_.debug()) << "Skipping a non-filling path: " << path.getJson(JsonOptions::none);
+            JLOG(j_.debug()) << "Skipping a non-filling path: " << path.getJson(JsonOptions::KNone);
         }
     }
 
-    if (remaining > beast::zero)
+    if (remaining > beast::kZERO)
     {
         XRPL_ASSERT(
             fullLiquidityPath.empty(), "xrpl::Pathfinder::getBestPaths : second empty path result");
-        JLOG(j_.info()) << "Paths could not send " << remaining << " of " << mDstAmount;
+        JLOG(j_.info()) << "Paths could not send " << remaining << " of " << dstAmount_;
     }
     else
     {
-        JLOG(j_.debug()) << "findPaths: RESULTS: " << bestPaths.getJson(JsonOptions::none);
+        JLOG(j_.debug()) << "findPaths: RESULTS: " << bestPaths.getJson(JsonOptions::KNone);
     }
     return bestPaths;
 }
@@ -737,9 +737,9 @@ Pathfinder::getBestPaths(
 bool
 Pathfinder::issueMatchesOrigin(Asset const& asset)
 {
-    bool const matchingAsset = (asset == mSrcPathAsset);
-    bool const matchingAccount = isXRP(asset) || (mSrcIssuer && asset.getIssuer() == mSrcIssuer) ||
-        asset.getIssuer() == mSrcAccount;
+    bool const matchingAsset = (asset == srcPathAsset_);
+    bool const matchingAccount = isXRP(asset) || (srcIssuer_ && asset.getIssuer() == srcIssuer_) ||
+        asset.getIssuer() == srcAccount_;
 
     return matchingAsset && matchingAccount;
 }
@@ -755,13 +755,13 @@ Pathfinder::getPathsOut(
 {
     Asset const asset = assetFromPathAsset(pathAsset, account);
 
-    auto [it, inserted] = mPathsOutCountMap.emplace(asset, 0);
+    auto [it, inserted] = pathsOutCountMap_.emplace(asset, 0);
 
     // If it was already present, return the stored number of paths
     if (!inserted)
         return it->second;
 
-    auto sleAccount = mLedger->read(keylet::account(account));
+    auto sleAccount = ledger_->read(keylet::account(account));
 
     if (!sleAccount)
         return 0;
@@ -770,23 +770,23 @@ Pathfinder::getPathsOut(
     bool const bAuthRequired = [&]() {
         if (pathAsset.holds<Currency>())
             return (aFlags & lsfRequireAuth) != 0;
-        return !isTesSuccess(requireAuth(*mLedger, asset.get<MPTIssue>(), account));
+        return !isTesSuccess(requireAuth(*ledger_, asset.get<MPTIssue>(), account));
     }();
     bool const bFrozen = [&]() {
         if (pathAsset.holds<Currency>())
             return (aFlags & lsfGlobalFreeze) != 0;
-        return isGlobalFrozen(*mLedger, asset.get<MPTIssue>());
+        return isGlobalFrozen(*ledger_, asset.get<MPTIssue>());
     }();
 
     int count = 0;
 
     if (!bFrozen)
     {
-        count = app_.getOrderBookDB().getBookSize(asset, mDomain);
+        count = app_.getOrderBookDB().getBookSize(asset, domain_);
 
         asset.visit(
             [&](Issue const&) {
-                if (auto const lines = mAssetCache->getRippleLines(account, direction))
+                if (auto const lines = rLCache_->getRippleLines(account, direction))
                 {
                     for (auto const& rspEntry : *lines)
                     {
@@ -794,7 +794,7 @@ Pathfinder::getPathsOut(
                         {
                         }
                         else if (
-                            rspEntry.getBalance() <= beast::zero &&
+                            rspEntry.getBalance() <= beast::kZERO &&
                             (!rspEntry.getLimitPeer() ||
                              -rspEntry.getBalance() >= rspEntry.getLimitPeer() ||
                              (bAuthRequired && !rspEntry.getAuth())))
@@ -820,7 +820,7 @@ Pathfinder::getPathsOut(
                 }
             },
             [&](MPTIssue const&) {
-                if (auto const mpts = mAssetCache->getMPTs(account))
+                if (auto const mpts = rLCache_->getMPTs(account))
                 {
                     for (auto const& mpt : *mpts)
                     {
@@ -837,7 +837,7 @@ Pathfinder::getPathsOut(
                         {
                             count += 10000;
                         }
-                        else if (isIndividualFrozen(*mLedger, account, MPTIssue{mpt.getMptID()}))
+                        else if (isIndividualFrozen(*ledger_, account, MPTIssue{mpt.getMptID()}))
                         {
                         }
                         else
@@ -875,15 +875,15 @@ Pathfinder::addPathsForType(
 {
     JLOG(j_.debug()) << "addPathsForType " << CollectionAndDelimiter(pathType, ", ");
     // See if the set of paths for this type already exists.
-    auto it = mPaths.find(pathType);
-    if (it != mPaths.end())
+    auto it = paths_.find(pathType);
+    if (it != paths_.end())
         return it->second;
 
     // Otherwise, if the type has no nodes, return the empty path.
     if (pathType.empty())
-        return mPaths[pathType];
+        return paths_[pathType];
     if (continueCallback && !continueCallback())
-        return mPaths[{}];
+        return paths_[{}];
 
     // Otherwise, get the paths for the parent PathType by calling
     // addPathsForType recursively.
@@ -891,50 +891,50 @@ Pathfinder::addPathsForType(
     parentPathType.pop_back();
 
     STPathSet const& parentPaths = addPathsForType(parentPathType, continueCallback);
-    STPathSet& pathsOut = mPaths[pathType];
+    STPathSet& pathsOut = paths_[pathType];
 
     JLOG(j_.debug()) << "getPaths< adding onto '" << pathTypeToString(parentPathType)
                      << "' to get '" << pathTypeToString(pathType) << "'";
 
-    int const initialSize = mCompletePaths.size();
+    int const initialSize = completePaths_.size();
 
     // Add the last NodeType to the lists.
     auto nodeType = pathType.back();
     switch (nodeType)
     {
-        case NodeType::nt_SOURCE:
+        case NodeType::Source:
             // Source must always be at the start, so pathsOut has to be empty.
             XRPL_ASSERT(pathsOut.empty(), "xrpl::Pathfinder::addPathsForType : empty paths");
-            pathsOut.push_back(STPath());
+            pathsOut.pushBack(STPath());
             break;
 
-        case NodeType::nt_ACCOUNTS:
-            addLinks(parentPaths, pathsOut, afADD_ACCOUNTS, continueCallback);
+        case NodeType::Accounts:
+            addLinks(parentPaths, pathsOut, kAF_ADD_ACCOUNTS, continueCallback);
             break;
 
-        case NodeType::nt_BOOKS:
-            addLinks(parentPaths, pathsOut, afADD_BOOKS, continueCallback);
+        case NodeType::Books:
+            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS, continueCallback);
             break;
 
-        case NodeType::nt_XRP_BOOK:
-            addLinks(parentPaths, pathsOut, afADD_BOOKS | afOB_XRP, continueCallback);
+        case NodeType::XrpBook:
+            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS | kAF_OB_XRP, continueCallback);
             break;
 
-        case NodeType::nt_DEST_BOOK:
-            addLinks(parentPaths, pathsOut, afADD_BOOKS | afOB_LAST, continueCallback);
+        case NodeType::DestBook:
+            addLinks(parentPaths, pathsOut, kAF_ADD_BOOKS | kAF_OB_LAST, continueCallback);
             break;
 
-        case NodeType::nt_DESTINATION:
+        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, afADD_ACCOUNTS | afAC_LAST, continueCallback);
+            addLinks(parentPaths, pathsOut, kAF_ADD_ACCOUNTS | kAF_AC_LAST, continueCallback);
             break;
     }
 
-    if (mCompletePaths.size() != initialSize)
+    if (completePaths_.size() != initialSize)
     {
-        JLOG(j_.debug()) << (mCompletePaths.size() - initialSize) << " complete paths added";
+        JLOG(j_.debug()) << (completePaths_.size() - initialSize) << " complete paths added";
     }
 
     JLOG(j_.debug()) << "getPaths> " << pathsOut.size() << " partial paths found";
@@ -947,7 +947,7 @@ Pathfinder::isNoRipple(
     AccountID const& toAccount,
     Currency const& currency)
 {
-    auto sleRipple = mLedger->read(keylet::line(toAccount, fromAccount, currency));
+    auto sleRipple = ledger_->read(keylet::line(toAccount, fromAccount, currency));
 
     auto const flag((toAccount > fromAccount) ? lsfHighNoRipple : lsfLowNoRipple);
 
@@ -965,14 +965,14 @@ Pathfinder::isNoRippleOut(STPath const& currentPath)
 
     // Last link must be an account.
     STPathElement const& endElement = currentPath.back();
-    if ((endElement.getNodeType() & STPathElement::typeAccount) == 0u)
+    if ((endElement.getNodeType() & STPathElement::TypeAccount) == 0u)
         return false;
 
     // If there's only one item in the path, return true if that item specifies
     // no ripple on the output. A path with no ripple on its output can't be
     // followed by a link with no ripple on its input.
     auto const& fromAccount =
-        (currentPath.size() == 1) ? mSrcAccount : (currentPath.end() - 2)->getAccountID();
+        (currentPath.size() == 1) ? srcAccount_ : (currentPath.end() - 2)->getAccountID();
     auto const& toAccount = endElement.getAccountID();
     return endElement.hasCurrency() && isNoRipple(fromAccount, toAccount, endElement.getCurrency());
 }
@@ -987,7 +987,7 @@ addUniquePath(STPathSet& pathSet, STPath const& path)
         if (p == path)
             return;
     }
-    pathSet.push_back(path);
+    pathSet.pushBack(path);
 }
 
 void
@@ -997,7 +997,7 @@ Pathfinder::addLink(
     int addFlags,
     std::function<bool(void)> const& continueCallback)
 {
-    auto const& pathEnd = currentPath.empty() ? mSource : currentPath.back();
+    auto const& pathEnd = currentPath.empty() ? source_ : currentPath.back();
     auto const& uEndPathAsset = pathEnd.getPathAsset();
     auto const& uEndIssuer = pathEnd.getIssuerID();
     auto const& uEndAccount = pathEnd.getAccountID();
@@ -1006,44 +1006,44 @@ Pathfinder::addLink(
     // Does pathfinding really need to get this to
     // a gateway (the issuer of the destination amount)
     // rather than the ultimate destination?
-    bool const hasEffectiveDestination = mEffectiveDst != mDstAccount;
+    bool const hasEffectiveDestination = effectiveDst_ != dstAccount_;
 
     JLOG(j_.trace()) << "addLink< flags=" << addFlags << " onXRP=" << bOnXRP
-                     << " completePaths size=" << mCompletePaths.size();
-    JLOG(j_.trace()) << currentPath.getJson(JsonOptions::none);
+                     << " completePaths size=" << completePaths_.size();
+    JLOG(j_.trace()) << currentPath.getJson(JsonOptions::KNone);
 
-    if ((addFlags & afADD_ACCOUNTS) != 0u)
+    if ((addFlags & kAF_ADD_ACCOUNTS) != 0u)
     {
         // add accounts
         if (bOnXRP)
         {
-            if (mDstAmount.native() && !currentPath.empty())
+            if (dstAmount_.native() && !currentPath.empty())
             {  // non-default path to XRP destination
                 JLOG(j_.trace()) << "complete path found ax: "
-                                 << currentPath.getJson(JsonOptions::none);
-                addUniquePath(mCompletePaths, currentPath);
+                                 << currentPath.getJson(JsonOptions::KNone);
+                addUniquePath(completePaths_, currentPath);
             }
         }
         else
         {
             // search for accounts to add
-            auto const sleEnd = mLedger->read(keylet::account(uEndAccount));
+            auto const sleEnd = ledger_->read(keylet::account(uEndAccount));
 
             if (sleEnd)
             {
                 bool const bRequireAuth((sleEnd->getFieldU32(sfFlags) & lsfRequireAuth) != 0u);
-                bool const bIsEndAsset(uEndPathAsset == mDstAmount.asset());
+                bool const bIsEndAsset(uEndPathAsset == dstAmount_.asset());
                 bool const bIsNoRippleOut(isNoRippleOut(currentPath));
-                bool const bDestOnly((addFlags & afAC_LAST) != 0u);
+                bool const bDestOnly((addFlags & kAF_AC_LAST) != 0u);
 
                 AccountCandidates candidates;
 
                 auto forAssets = [&]<typename AssetType>(AssetType const& assets) {
                     candidates.reserve(assets.size());
 
-                    static bool constexpr isLine =
+                    static bool constexpr kIS_LINE =
                         std::is_same_v<AssetType, std::vector<PathFindTrustLine>>;
-                    static bool constexpr isMPT =
+                    static bool constexpr kIS_MPT =
                         std::is_same_v<AssetType, std::vector<PathFindMPT>>;
 
                     for (auto const& asset : assets)
@@ -1051,27 +1051,27 @@ Pathfinder::addLink(
                         if (continueCallback && !continueCallback())
                             return;
                         auto const& acct = [&]() constexpr {
-                            if constexpr (isLine)
+                            if constexpr (kIS_LINE)
                                 return asset.getAccountIDPeer();
                             // Unlike trustline, MPT is not bidirectional
-                            if constexpr (isMPT)
+                            if constexpr (kIS_MPT)
                                 return getMPTIssuer(asset);
                         }();
                         auto const direction = [&]() constexpr -> LineDirection {
-                            if constexpr (isLine)
+                            if constexpr (kIS_LINE)
                                 return asset.getDirectionPeer();
                             // incoming for MPT since MPT doesn't support
                             // rippling (see LineDirection comments)
-                            return LineDirection::incoming;
+                            return LineDirection::Incoming;
                         }();
 
-                        if (hasEffectiveDestination && (acct == mDstAccount))
+                        if (hasEffectiveDestination && (acct == dstAccount_))
                         {
                             // We skipped the gateway
                             continue;
                         }
 
-                        bool const bToDestination = acct == mEffectiveDst;
+                        bool const bToDestination = acct == effectiveDst_;
 
                         if (bDestOnly && !bToDestination)
                         {
@@ -1079,30 +1079,30 @@ Pathfinder::addLink(
                         }
 
                         auto const correctAsset = [&]() {
-                            if constexpr (isLine)
+                            if constexpr (kIS_LINE)
                             {
                                 return uEndPathAsset.get<Currency>() ==
                                     asset.getLimit().template get<Issue>().currency;
                             }
-                            if constexpr (isMPT)
+                            if constexpr (kIS_MPT)
                             {
                                 return uEndPathAsset.get<MPTID>() == asset.getMptID();
                             }
                         }();
                         auto checkAsset = [&]() {
-                            if constexpr (isLine)
+                            if constexpr (kIS_LINE)
                             {
                                 return (
-                                    (asset.getBalance() <= beast::zero &&
+                                    (asset.getBalance() <= beast::kZERO &&
                                      (!asset.getLimitPeer() ||
                                       -asset.getBalance() >= asset.getLimitPeer() ||
                                       (bRequireAuth && !asset.getAuth()))) ||
                                     (bIsNoRippleOut && asset.getNoRipple()));
                             }
-                            if constexpr (isMPT)
+                            if constexpr (kIS_MPT)
                             {
                                 return asset.isZeroBalance() || asset.isMaxedOut() ||
-                                    requireAuth(*mLedger, MPTIssue{asset}, acct);
+                                    requireAuth(*ledger_, MPTIssue{asset}, acct);
                             }
                         };
 
@@ -1117,23 +1117,23 @@ Pathfinder::addLink(
                             else if (bToDestination)
                             {
                                 // destination is always worth trying
-                                if (uEndPathAsset == mDstAmount.asset())
+                                if (uEndPathAsset == dstAmount_.asset())
                                 {
                                     // this is a complete path
                                     if (!currentPath.empty())
                                     {
                                         JLOG(j_.trace()) << "complete path found ae: "
-                                                         << currentPath.getJson(JsonOptions::none);
-                                        addUniquePath(mCompletePaths, currentPath);
+                                                         << currentPath.getJson(JsonOptions::KNone);
+                                        addUniquePath(completePaths_, currentPath);
                                     }
                                 }
                                 else if (!bDestOnly)
                                 {
                                     // this is a high-priority candidate
-                                    candidates.push_back({AccountCandidate::highPriority, acct});
+                                    candidates.push_back({AccountCandidate::kHIGH_PRIORITY, acct});
                                 }
                             }
-                            else if (acct == mSrcAccount)
+                            else if (acct == srcAccount_)
                             {
                                 // going back to the source is bad
                             }
@@ -1145,7 +1145,7 @@ Pathfinder::addLink(
                                     acct,
                                     direction,
                                     bIsEndAsset,
-                                    mEffectiveDst,
+                                    effectiveDst_,
                                     continueCallback);
                                 if (out != 0)
                                     candidates.push_back({out, acct});
@@ -1156,15 +1156,15 @@ Pathfinder::addLink(
 
                 uEndPathAsset.visit(
                     [&](Currency const&) {
-                        if (auto const lines = mAssetCache->getRippleLines(
+                        if (auto const lines = rLCache_->getRippleLines(
                                 uEndAccount,
-                                bIsNoRippleOut ? LineDirection::incoming : LineDirection::outgoing))
+                                bIsNoRippleOut ? LineDirection::Incoming : LineDirection::Outgoing))
                         {
                             forAssets(*lines);
                         }
                     },
                     [&](MPTID const&) {
-                        if (auto const mpts = mAssetCache->getMPTs(uEndAccount))
+                        if (auto const mpts = rLCache_->getMPTs(uEndAccount))
                         {
                             forAssets(*mpts);
                         }
@@ -1174,16 +1174,15 @@ Pathfinder::addLink(
                 {
                     std::ranges::sort(
                         candidates,
-
                         std::bind(
                             compareAccountCandidate,
-                            mLedger->seq(),
+                            ledger_->seq(),
                             std::placeholders::_1,
                             std::placeholders::_2));
 
                     int count = candidates.size();
                     // allow more paths from source
-                    if ((count > 10) && (uEndAccount != mSrcAccount))
+                    if ((count > 10) && (uEndAccount != srcAccount_))
                     {
                         count = 10;
                     }
@@ -1199,7 +1198,7 @@ Pathfinder::addLink(
                             return;
                         // Add accounts to incompletePaths
                         STPathElement const pathElement(
-                            STPathElement::typeAccount, it->account, uEndPathAsset, it->account);
+                            STPathElement::TypeAccount, it->account, uEndPathAsset, it->account);
                         incompletePaths.assembleAdd(currentPath, pathElement);
                         ++it;
                     }
@@ -1211,26 +1210,26 @@ Pathfinder::addLink(
             }
         }
     }
-    if ((addFlags & afADD_BOOKS) != 0u)
+    if ((addFlags & kAF_ADD_BOOKS) != 0u)
     {
         // add order books
-        if ((addFlags & afOB_XRP) != 0u)
+        if ((addFlags & kAF_OB_XRP) != 0u)
         {
             // to XRP only
             if (!bOnXRP &&
                 app_.getOrderBookDB().isBookToXRP(
-                    assetFromPathAsset(uEndPathAsset, uEndIssuer), mDomain))
+                    assetFromPathAsset(uEndPathAsset, uEndIssuer), domain_))
             {
                 STPathElement const pathElement(
-                    STPathElement::typeCurrency, xrpAccount(), xrpCurrency(), xrpAccount());
+                    STPathElement::TypeCurrency, xrpAccount(), xrpCurrency(), xrpAccount());
                 incompletePaths.assembleAdd(currentPath, pathElement);
             }
         }
         else
         {
-            bool const bDestOnly = (addFlags & afOB_LAST) != 0;
+            bool const bDestOnly = (addFlags & kAF_OB_LAST) != 0;
             auto books = app_.getOrderBookDB().getBooksByTakerPays(
-                assetFromPathAsset(uEndPathAsset, uEndIssuer), mDomain);
+                assetFromPathAsset(uEndPathAsset, uEndIssuer), domain_);
             JLOG(j_.trace()) << books.size() << " books found from this currency/issuer";
 
             for (auto const& book : books)
@@ -1239,7 +1238,7 @@ Pathfinder::addLink(
                     return;
                 if (!currentPath.hasSeen(xrpAccount(), book.out, book.out.getIssuer()) &&
                     !issueMatchesOrigin(book.out) &&
-                    (!bDestOnly || equalTokens(book.out, mDstAmount.asset())))
+                    (!bDestOnly || equalTokens(book.out, dstAmount_.asset())))
                 {
                     STPath newPath(currentPath);
 
@@ -1247,27 +1246,27 @@ Pathfinder::addLink(
                     {  // to XRP
 
                         // add the order book itself
-                        newPath.emplace_back(
-                            STPathElement::typeCurrency, xrpAccount(), xrpCurrency(), xrpAccount());
+                        newPath.emplaceBack(
+                            STPathElement::TypeCurrency, xrpAccount(), xrpCurrency(), xrpAccount());
 
-                        if (isXRP(mDstAmount.asset()))
+                        if (isXRP(dstAmount_.asset()))
                         {
                             // destination is XRP, add account and path is
                             // complete
                             JLOG(j_.trace()) << "complete path found bx: "
-                                             << currentPath.getJson(JsonOptions::none);
-                            addUniquePath(mCompletePaths, newPath);
+                                             << currentPath.getJson(JsonOptions::KNone);
+                            addUniquePath(completePaths_, newPath);
                         }
                         else
                         {
-                            incompletePaths.push_back(newPath);
+                            incompletePaths.pushBack(newPath);
                         }
                     }
                     else if (!currentPath.hasSeen(
                                  book.out.getIssuer(), book.out, book.out.getIssuer()))
                     {
-                        auto const assetType = book.out.holds<Issue>() ? STPathElement::typeCurrency
-                                                                       : STPathElement::typeMPT;
+                        auto const assetType = book.out.holds<Issue>() ? STPathElement::TypeCurrency
+                                                                       : STPathElement::TypeMpt;
                         // Don't want the book if we've already seen the issuer
                         // book -> account -> book
                         if ((newPath.size() >= 2) && (newPath.back().isAccount()) &&
@@ -1275,7 +1274,7 @@ Pathfinder::addLink(
                         {
                             // replace the redundant account with the order book
                             newPath[newPath.size() - 1] = STPathElement(
-                                assetType | STPathElement::typeIssuer,
+                                assetType | STPathElement::TypeIssuer,
                                 xrpAccount(),
                                 book.out,
                                 book.out.getIssuer());
@@ -1283,26 +1282,26 @@ Pathfinder::addLink(
                         else
                         {
                             // add the order book
-                            newPath.emplace_back(
-                                assetType | STPathElement::typeIssuer,
+                            newPath.emplaceBack(
+                                assetType | STPathElement::TypeIssuer,
                                 xrpAccount(),
                                 book.out,
                                 book.out.getIssuer());
                         }
 
-                        if (hasEffectiveDestination && book.out.getIssuer() == mDstAccount &&
-                            equalTokens(book.out, mDstAmount.asset()))
+                        if (hasEffectiveDestination && book.out.getIssuer() == dstAccount_ &&
+                            equalTokens(book.out, dstAmount_.asset()))
                         {
                             // We skipped a required issuer
                         }
                         else if (
-                            book.out.getIssuer() == mEffectiveDst &&
-                            equalTokens(book.out, mDstAmount.asset()))
+                            book.out.getIssuer() == effectiveDst_ &&
+                            equalTokens(book.out, dstAmount_.asset()))
                         {  // with the destination account, this path is
                            // complete
                             JLOG(j_.trace()) << "complete path found ba: "
-                                             << currentPath.getJson(JsonOptions::none);
-                            addUniquePath(mCompletePaths, newPath);
+                                             << currentPath.getJson(JsonOptions::KNone);
+                            addUniquePath(completePaths_, newPath);
                         }
                         else
                         {
@@ -1310,7 +1309,7 @@ Pathfinder::addLink(
                             incompletePaths.assembleAdd(
                                 newPath,
                                 STPathElement(
-                                    STPathElement::typeAccount,
+                                    STPathElement::TypeAccount,
                                     book.out.getIssuer(),
                                     book.out,
                                     book.out.getIssuer()));
@@ -1335,29 +1334,29 @@ makePath(char const* string)
         switch (*string++)
         {
             case 's':  // source
-                ret.push_back(Pathfinder::NodeType::nt_SOURCE);
+                ret.push_back(Pathfinder::NodeType::Source);
                 break;
 
             case 'a':  // accounts
-                ret.push_back(Pathfinder::NodeType::nt_ACCOUNTS);
+                ret.push_back(Pathfinder::NodeType::Accounts);
                 break;
 
             case 'b':  // books
-                ret.push_back(Pathfinder::NodeType::nt_BOOKS);
+                ret.push_back(Pathfinder::NodeType::Books);
                 break;
 
             case 'x':  // xrp book
-                ret.push_back(Pathfinder::NodeType::nt_XRP_BOOK);
+                ret.push_back(Pathfinder::NodeType::XrpBook);
                 break;
 
             case 'f':  // book to final currency
-                ret.push_back(Pathfinder::NodeType::nt_DEST_BOOK);
+                ret.push_back(Pathfinder::NodeType::DestBook);
                 break;
 
             case 'd':
                 // Destination (with account, if required and not already
                 // present).
-                ret.push_back(Pathfinder::NodeType::nt_DESTINATION);
+                ret.push_back(Pathfinder::NodeType::Destination);
                 break;
 
             case 0:
@@ -1369,7 +1368,7 @@ makePath(char const* string)
 void
 fillPaths(Pathfinder::PaymentType type, PathCostList const& costs)
 {
-    auto& list = mPathTable[type];
+    auto& list = gPathTable[type];
     XRPL_ASSERT(list.empty(), "xrpl::fillPaths : empty paths");
     for (auto& cost : costs)
         list.push_back({cost.cost, makePath(cost.path)});
@@ -1389,12 +1388,12 @@ Pathfinder::initPathTable()
 {
     // CAUTION: Do not include rules that build default paths
 
-    mPathTable.clear();
-    fillPaths(PaymentType::pt_XRP_to_XRP, {});
+    gPathTable.clear();
+    fillPaths(PaymentType::XrpToXrp, {});
     /* cspell: disable */
 
     fillPaths(
-        PaymentType::pt_XRP_to_nonXRP,
+        PaymentType::XrpToNonXrp,
         {{1, "sfd"},    // source -> book -> gateway
          {3, "sfad"},   // source -> book -> account -> destination
          {5, "sfaad"},  // source -> book -> account -> account -> destination
@@ -1404,7 +1403,7 @@ Pathfinder::initPathTable()
          {10, "sbafad"}});
 
     fillPaths(
-        PaymentType::pt_nonXRP_to_XRP,
+        PaymentType::NonXrpToXrp,
         {{1, "sxd"},   // gateway buys XRP
          {2, "saxd"},  // source -> gateway -> book(XRP) -> dest
          {6, "saaxd"},
@@ -1414,7 +1413,7 @@ Pathfinder::initPathTable()
 
     // non-XRP to non-XRP (same currency)
     fillPaths(
-        PaymentType::pt_nonXRP_to_same,
+        PaymentType::NonXrpToSame,
         {
             {1, "sad"},   // source -> gateway -> destination
             {1, "sfd"},   // source -> book -> destination
@@ -1433,7 +1432,7 @@ Pathfinder::initPathTable()
 
     // non-XRP to non-XRP (different currency)
     fillPaths(
-        PaymentType::pt_nonXRP_to_nonXRP,
+        PaymentType::NonXrpToNonXrp,
         {
             {1, "sfad"},
             {1, "safd"},
diff --git a/src/xrpld/rpc/detail/Pathfinder.h b/src/xrpld/rpc/detail/Pathfinder.h
index b4380c04ca..ba1fc453b3 100644
--- a/src/xrpld/rpc/detail/Pathfinder.h
+++ b/src/xrpld/rpc/detail/Pathfinder.h
@@ -47,7 +47,7 @@ public:
     void
     computePathRanks(int maxPaths, std::function<bool(void)> const& continueCallback = {});
 
-    /* Get the best paths, up to maxPaths in number, from mCompletePaths.
+    /* Get the best paths, up to maxPaths in number, from completePaths_.
 
        On return, if fullLiquidityPath is not empty, then it contains the best
        additional single path which can consume all the liquidity.
@@ -61,12 +61,12 @@ public:
         std::function<bool(void)> const& continueCallback = {});
 
     enum class NodeType {
-        nt_SOURCE,      // The source account: with an issuer account, if needed.
-        nt_ACCOUNTS,    // Accounts that connect from this source/currency.
-        nt_BOOKS,       // Order books that connect to this currency.
-        nt_XRP_BOOK,    // The order book from this currency to XRP.
-        nt_DEST_BOOK,   // The order book to the destination currency/issuer.
-        nt_DESTINATION  // The destination account only.
+        Source,      // The source account: with an issuer account, if needed.
+        Accounts,    // Accounts that connect from this source/currency.
+        Books,       // Order books that connect to this currency.
+        XrpBook,     // The order book from this currency to XRP.
+        DestBook,    // The order book to the destination currency/issuer.
+        Destination  // The destination account only.
     };
 
     // The PathType is a list of the NodeTypes for a path.
@@ -75,11 +75,11 @@ public:
     // PaymentType represents the types of the source and destination currencies
     // in a path request.
     enum class PaymentType {
-        pt_XRP_to_XRP,
-        pt_XRP_to_nonXRP,
-        pt_nonXRP_to_XRP,
-        pt_nonXRP_to_same,   // Destination currency is the same as source.
-        pt_nonXRP_to_nonXRP  // Destination currency is NOT the same as source.
+        XrpToXrp,
+        XrpToNonXrp,
+        NonXrpToXrp,
+        NonXrpToSame,   // Destination currency is the same as source.
+        NonXrpToNonXrp  // Destination currency is NOT the same as source.
     };
 
     struct PathRank
@@ -111,7 +111,7 @@ private:
       getBestPaths
      */
 
-    // Add all paths of one type to mCompletePaths.
+    // Add all paths of one type to completePaths_.
     STPathSet&
     addPathsForType(PathType const& type, std::function<bool(void)> const& continueCallback);
 
@@ -168,47 +168,47 @@ private:
         std::vector<PathRank>& rankedPaths,
         std::function<bool(void)> const& continueCallback);
 
-    AccountID mSrcAccount;
-    AccountID mDstAccount;
-    AccountID mEffectiveDst;  // The account the paths need to end at
-    STAmount mDstAmount;
-    PathAsset mSrcPathAsset;
-    std::optional<AccountID> mSrcIssuer;
-    STAmount mSrcAmount;
-    /** The amount remaining from mSrcAccount after the default liquidity has
+    AccountID srcAccount_;
+    AccountID dstAccount_;
+    AccountID effectiveDst_;  // The account the paths need to end at
+    STAmount dstAmount_;
+    PathAsset srcPathAsset_;
+    std::optional<AccountID> srcIssuer_;
+    STAmount srcAmount_;
+    /** The amount remaining from srcAccount_ after the default liquidity has
         been removed. */
-    STAmount mRemainingAmount;
+    STAmount remainingAmount_;
     bool convert_all_;
-    std::optional<uint256> mDomain;
+    std::optional<uint256> domain_;
 
-    std::shared_ptr<ReadView const> mLedger;
-    std::unique_ptr<LoadEvent> m_loadEvent;
-    std::shared_ptr<AssetCache> mAssetCache;
+    std::shared_ptr<ReadView const> ledger_;
+    std::unique_ptr<LoadEvent> loadEvent_;
+    std::shared_ptr<AssetCache> rLCache_;
 
-    STPathElement mSource;
-    STPathSet mCompletePaths;
-    std::vector<PathRank> mPathRanks;
-    std::map<PathType, STPathSet> mPaths;
+    STPathElement source_;
+    STPathSet completePaths_;
+    std::vector<PathRank> pathRanks_;
+    std::map<PathType, STPathSet> paths_;
 
-    hash_map<Asset, int> mPathsOutCountMap;
+    hash_map<Asset, int> pathsOutCountMap_;
 
     Application& app_;
     beast::Journal const j_;
 
     // Add ripple paths
-    static std::uint32_t const afADD_ACCOUNTS = 0x001;
+    static std::uint32_t const kAF_ADD_ACCOUNTS = 0x001;
 
     // Add order books
-    static std::uint32_t const afADD_BOOKS = 0x002;
+    static std::uint32_t const kAF_ADD_BOOKS = 0x002;
 
     // Add order book to XRP only
-    static std::uint32_t const afOB_XRP = 0x010;
+    static std::uint32_t const kAF_OB_XRP = 0x010;
 
     // Must link to destination currency
-    static std::uint32_t const afOB_LAST = 0x040;
+    static std::uint32_t const kAF_OB_LAST = 0x040;
 
     // Destination account only
-    static std::uint32_t const afAC_LAST = 0x080;
+    static std::uint32_t const kAF_AC_LAST = 0x080;
 };
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/detail/PathfinderUtils.h b/src/xrpld/rpc/detail/PathfinderUtils.h
index 4f5566bdec..ff47de3217 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 INITIAL_XRP;
-            return STAmount(amt.asset(), STAmount::cMaxValue, STAmount::cMaxOffset);
+                return kINITIAL_XRP;
+            return STAmount(amt.asset(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
         },
-        [&](MPTIssue const&) { return STAmount(amt.asset(), maxMPTokenAmount, 0); });
+        [&](MPTIssue const&) { return STAmount(amt.asset(), kMAX_MP_TOKEN_AMOUNT, 0); });
 }
 
 inline STAmount
diff --git a/src/xrpld/rpc/detail/RPCCall.cpp b/src/xrpld/rpc/detail/RPCCall.cpp
index 749b66791e..98cb7ee9ba 100644
--- a/src/xrpld/rpc/detail/RPCCall.cpp
+++ b/src/xrpld/rpc/detail/RPCCall.cpp
@@ -100,7 +100,7 @@ private:
     // TODO New routine for parsing ledger parameters, other routines should
     // standardize on this.
     static bool
-    jvParseLedger(Json::Value& jvRequest, std::string const& strLedger)
+    jvParseLedger(json::Value& jvRequest, std::string const& strLedger)
     {
         if (strLedger == "current" || strLedger == "closed" || strLedger == "validated")
         {
@@ -120,7 +120,7 @@ private:
     }
 
     // Build a object { "currency" : "XYZ", "issuer" : "rXYX" }
-    static Json::Value
+    static json::Value
     jvParseCurrencyIssuer(std::string const& strCurrencyIssuer)
     {
         // Matches a sequence of 3 characters from
@@ -128,13 +128,13 @@ 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 reCurIss("\\`([][:alnum:]<>(){}[|?!@#$%^&*]{3})(?:/(.+))?\\'");
+        static boost::regex const kRE_CUR_ISS("\\`([][:alnum:]<>(){}[|?!@#$%^&*]{3})(?:/(.+))?\\'");
 
         boost::smatch smMatch;
 
-        if (boost::regex_match(strCurrencyIssuer, smMatch, reCurIss))
+        if (boost::regex_match(strCurrencyIssuer, smMatch, kRE_CUR_ISS))
         {
-            Json::Value jvResult(Json::objectValue);
+            json::Value jvResult(json::ObjectValue);
             std::string const strCurrency = smMatch[1];
             std::string const strIssuer = smMatch[2];
 
@@ -149,7 +149,7 @@ private:
             return jvResult;
         }
 
-        return RPC::make_param_error(
+        return RPC::makeParamError(
             std::string("Invalid currency/issuer '") + strCurrencyIssuer + "'");
     }
 
@@ -170,13 +170,13 @@ private:
     }
 
 private:
-    using parseFuncPtr = Json::Value (RPCParser::*)(Json::Value const& jvParams);
+    using parseFuncPtr = json::Value (RPCParser::*)(json::Value const& jvParams);
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseAsIs(Json::Value const& jvParams)
+    parseAsIs(json::Value const& jvParams)
     {
-        Json::Value v(Json::objectValue);
+        json::Value v(json::ObjectValue);
 
         if (jvParams.isArray() && (jvParams.size() > 0))
             v[jss::params] = jvParams;
@@ -184,14 +184,14 @@ private:
         return v;
     }
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseInternal(Json::Value const& jvParams)
+    parseInternal(json::Value const& jvParams)
     {
-        Json::Value v(Json::objectValue);
+        json::Value v(json::ObjectValue);
         v[jss::internal_command] = jvParams[0u];
 
-        Json::Value params(Json::arrayValue);
+        json::Value params(json::ArrayValue);
 
         for (unsigned i = 1; i < jvParams.size(); ++i)
             params.append(jvParams[i]);
@@ -201,32 +201,32 @@ private:
         return v;
     }
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseManifest(Json::Value const& jvParams)
+    parseManifest(json::Value const& jvParams)
     {
         if (jvParams.size() == 1)
         {
-            Json::Value jvRequest(Json::objectValue);
+            json::Value jvRequest(json::ObjectValue);
 
             std::string const strPk = jvParams[0u].asString();
             if (!validPublicKey(strPk, TokenType::NodePublic))
-                return rpcError(rpcPUBLIC_MALFORMED);
+                return rpcError(RpcPublicMalformed);
 
             jvRequest[jss::public_key] = strPk;
 
             return jvRequest;
         }
 
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // fetch_info [clear]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseFetchInfo(Json::Value const& jvParams)
+    parseFetchInfo(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         unsigned int const iParams = jvParams.size();
 
         if (iParams != 0)
@@ -237,16 +237,16 @@ private:
 
     // account_tx accountID [ledger_min [ledger_max [limit [offset]]]] [binary]
     // [count] [descending]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-make-member-function-const)
-    parseAccountTransactions(Json::Value const& jvParams)
+    parseAccountTransactions(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         unsigned int iParams = jvParams.size();
 
         auto const account = parseBase58<AccountID>(jvParams[0u].asString());
         if (!account)
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
 
         jvRequest[jss::account] = toBase58(*account);
 
@@ -254,7 +254,7 @@ private:
 
         while (!bDone && iParams >= 2)
         {
-            // VFALCO Why is Json::StaticString appearing on the right side?
+            // VFALCO Why is json::StaticString appearing on the right side?
             if (jvParams[iParams - 1].asString() == jss::binary)
             {
                 jvRequest[jss::binary] = true;
@@ -292,8 +292,8 @@ private:
             if (uLedgerMax != -1 && uLedgerMax < uLedgerMin)
             {
                 if (apiVersion_ == 1)
-                    return rpcError(rpcLGR_IDXS_INVALID);
-                return rpcError(rpcNOT_SYNCED);
+                    return rpcError(RpcLgrIdxsInvalid);
+                return rpcError(RpcNotSynced);
             }
 
             jvRequest[jss::ledger_index_min] = jvParams[1u].asInt();
@@ -313,14 +313,14 @@ private:
     // [<proof> [<marker>]]]]] limit: 0 = no limit proof: 0 or 1
     //
     // Mnemonic: taker pays --> offer --> taker gets
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseBookOffers(Json::Value const& jvParams)
+    parseBookOffers(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
-        Json::Value jvTakerPays = jvParseCurrencyIssuer(jvParams[0u].asString());
-        Json::Value jvTakerGets = jvParseCurrencyIssuer(jvParams[1u].asString());
+        json::Value jvTakerPays = jvParseCurrencyIssuer(jvParams[0u].asString());
+        json::Value jvTakerGets = jvParseCurrencyIssuer(jvParams[1u].asString());
 
         if (isRpcError(jvTakerPays))
         {
@@ -355,7 +355,7 @@ private:
             }
             catch (std::exception const&)
             {
-                return RPC::invalid_field_error(jss::limit);
+                return RPC::invalidFieldError(jss::limit);
             }
         }
 
@@ -369,7 +369,7 @@ private:
             }
             catch (std::exception const&)
             {
-                return RPC::invalid_field_error(jss::proof);
+                return RPC::invalidFieldError(jss::proof);
             }
         }
 
@@ -380,11 +380,11 @@ private:
     }
 
     // can_delete [<ledgerid>|<ledgerhash>|now|always|never]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseCanDelete(Json::Value const& jvParams)
+    parseCanDelete(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         if (jvParams.size() == 0u)
             return jvRequest;
@@ -403,11 +403,11 @@ private:
     }
 
     // connect <ip[:port]> [port]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseConnect(Json::Value const& jvParams)
+    parseConnect(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         std::string ip = jvParams[0u].asString();
         if (jvParams.size() == 2)
         {
@@ -421,7 +421,7 @@ private:
         {
             std::size_t const colon = ip.find_last_of(':');
             jvRequest[jss::ip] = std::string{ip, 0, colon};
-            jvRequest[jss::port] = Json::Value{std::string{ip, colon + 1}}.asUInt();
+            jvRequest[jss::port] = json::Value{std::string{ip, colon + 1}}.asUInt();
             return jvRequest;
         }
 
@@ -432,11 +432,11 @@ private:
 
     // deposit_authorized <source_account> <destination_account>
     // [<ledger> [<credentials>, ...]]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseDepositAuthorized(Json::Value const& jvParams)
+    parseDepositAuthorized(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         jvRequest[jss::source_account] = jvParams[0u].asString();
         jvRequest[jss::destination_account] = jvParams[1u].asString();
 
@@ -446,7 +446,7 @@ private:
         // 8 credentials max
         if ((jvParams.size() >= 4) && (jvParams.size() <= 11))
         {
-            jvRequest[jss::credentials] = Json::Value(Json::arrayValue);
+            jvRequest[jss::credentials] = json::Value(json::ArrayValue);
             for (uint32_t i = 3; i < jvParams.size(); ++i)
                 jvRequest[jss::credentials].append(jvParams[i].asString());
         }
@@ -455,19 +455,19 @@ private:
     }
 
     // Return an error for attempting to subscribe/unsubscribe via RPC.
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseEvented(Json::Value const& jvParams)
+    parseEvented(json::Value const& jvParams)
     {
-        return rpcError(rpcNO_EVENTS);
+        return rpcError(RpcNoEvents);
     }
 
     // feature [<feature>] [accept|reject]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseFeature(Json::Value const& jvParams)
+    parseFeature(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         if (jvParams.size() > 0)
             jvRequest[jss::feature] = jvParams[0u].asString();
@@ -481,15 +481,15 @@ private:
             // that jss::vetoed is true.
             if (boost::iequals(action, "reject"))
             {
-                jvRequest[jss::vetoed] = Json::Value(true);
+                jvRequest[jss::vetoed] = json::Value(true);
             }
             else if (boost::iequals(action, "accept"))
             {
-                jvRequest[jss::vetoed] = Json::Value(false);
+                jvRequest[jss::vetoed] = json::Value(false);
             }
             else
             {
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
             }
         }
 
@@ -497,11 +497,11 @@ private:
     }
 
     // get_counts [<min_count>]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseGetCounts(Json::Value const& jvParams)
+    parseGetCounts(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         if (jvParams.size() != 0u)
             jvRequest[jss::min_count] = jvParams[0u].asUInt();
@@ -511,20 +511,20 @@ private:
 
     // sign_for <account> <secret> <json> offline
     // sign_for <account> <secret> <json>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseSignFor(Json::Value const& jvParams)
+    parseSignFor(json::Value const& jvParams)
     {
         bool const bOffline = 4 == jvParams.size() && jvParams[3u].asString() == "offline";
 
         if (3 == jvParams.size() || bOffline)
         {
-            Json::Value txJSON;
-            Json::Reader reader;
+            json::Value txJSON;
+            json::Reader reader;
             if (reader.parse(jvParams[2u].asString(), txJSON))
             {
                 // sign_for txJSON.
-                Json::Value jvRequest{Json::objectValue};
+                json::Value jvRequest{json::ObjectValue};
 
                 jvRequest[jss::account] = jvParams[0u].asString();
                 jvRequest[jss::secret] = jvParams[1u].asString();
@@ -536,15 +536,15 @@ private:
                 return jvRequest;
             }
         }
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // json <command> <json>
-    Json::Value
-    parseJson(Json::Value const& jvParams)
+    json::Value
+    parseJson(json::Value const& jvParams)
     {
-        Json::Reader reader;
-        Json::Value jvRequest;
+        json::Reader reader;
+        json::Value jvRequest;
 
         JLOG(j_.trace()) << "RPC method: " << jvParams[0u];
         JLOG(j_.trace()) << "RPC json: " << jvParams[1u];
@@ -552,18 +552,18 @@ private:
         if (reader.parse(jvParams[1u].asString(), jvRequest))
         {
             if (!jvRequest.isObjectOrNull())
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
 
             jvRequest[jss::method] = jvParams[0u];
 
             return jvRequest;
         }
 
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     bool
-    isValidJson2(Json::Value const& jv)
+    isValidJson2(json::Value const& jv)
     {
         if (jv.isArray())
         {
@@ -590,17 +590,17 @@ private:
         return false;
     }
 
-    Json::Value
-    parseJson2(Json::Value const& jvParams)
+    json::Value
+    parseJson2(json::Value const& jvParams)
     {
-        Json::Reader reader;
-        Json::Value jv;
-        bool const valid_parse = reader.parse(jvParams[0u].asString(), jv);
-        if (valid_parse && isValidJson2(jv))
+        json::Reader reader;
+        json::Value jv;
+        bool const validParse = reader.parse(jvParams[0u].asString(), jv);
+        if (validParse && isValidJson2(jv))
         {
             if (jv.isObject())
             {
-                Json::Value jv1{Json::objectValue};
+                json::Value jv1{json::ObjectValue};
                 if (jv.isMember(jss::params))
                 {
                     auto const& params = jv[jss::params];
@@ -614,8 +614,8 @@ private:
                 return jv1;
             }
             // else jv.isArray()
-            Json::Value jv1{Json::arrayValue};
-            for (Json::UInt j = 0; j < jv.size(); ++j)
+            json::Value jv1{json::ArrayValue};
+            for (json::UInt j = 0; j < jv.size(); ++j)
             {
                 if (jv[j].isMember(jss::params))
                 {
@@ -630,22 +630,22 @@ private:
             }
             return jv1;
         }
-        auto jv_error = rpcError(rpcINVALID_PARAMS);
+        auto jvError = rpcError(RpcInvalidParams);
         if (jv.isMember(jss::jsonrpc))
-            jv_error[jss::jsonrpc] = jv[jss::jsonrpc];
+            jvError[jss::jsonrpc] = jv[jss::jsonrpc];
         if (jv.isMember(jss::ripplerpc))
-            jv_error[jss::ripplerpc] = jv[jss::ripplerpc];
+            jvError[jss::ripplerpc] = jv[jss::ripplerpc];
         if (jv.isMember(jss::id))
-            jv_error[jss::id] = jv[jss::id];
-        return jv_error;
+            jvError[jss::id] = jv[jss::id];
+        return jvError;
     }
 
     // ledger [id|index|current|closed|validated] [full|tx]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseLedger(Json::Value const& jvParams)
+    parseLedger(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         if (jvParams.size() == 0u)
         {
@@ -671,11 +671,11 @@ private:
     }
 
     // ledger_header <id>|<index>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseLedgerId(Json::Value const& jvParams)
+    parseLedgerId(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         std::string const strLedger = jvParams[0u].asString();
 
@@ -692,16 +692,16 @@ private:
     }
 
     // ledger_entry [id] [<index>]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseLedgerEntry(Json::Value const& jvParams)
+    parseLedgerEntry(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         jvRequest[jss::index] = jvParams[0u].asString();
 
         if (jvParams.size() == 2 && !jvParseLedger(jvRequest, jvParams[1u].asString()))
-            return rpcError(rpcLGR_IDX_MALFORMED);
+            return rpcError(RpcLgrIdxMalformed);
 
         return jvRequest;
     }
@@ -710,11 +710,11 @@ private:
     // log_level <severity>:                Set master log level to the
     // specified severity log_level <partition> <severity>:    Set specified
     // partition to specified severity
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseLogLevel(Json::Value const& jvParams)
+    parseLogLevel(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         if (jvParams.size() == 1)
         {
@@ -732,38 +732,38 @@ private:
     // owner_info <account>
     // account_info <account> [<ledger>]
     // account_offers <account> [<ledger>]
-    Json::Value
-    parseAccountItems(Json::Value const& jvParams)
+    json::Value
+    parseAccountItems(json::Value const& jvParams)
     {
         return parseAccountRaw1(jvParams);
     }
 
-    Json::Value
-    parseAccountCurrencies(Json::Value const& jvParams)
+    json::Value
+    parseAccountCurrencies(json::Value const& jvParams)
     {
         return parseAccountRaw1(jvParams);
     }
 
     // account_lines <account> <account>|"" [<ledger>]
-    Json::Value
-    parseAccountLines(Json::Value const& jvParams)
+    json::Value
+    parseAccountLines(json::Value const& jvParams)
     {
         return parseAccountRaw2(jvParams, jss::peer);
     }
 
     // account_channels <account> <account>|"" [<ledger>]
-    Json::Value
-    parseAccountChannels(Json::Value const& jvParams)
+    json::Value
+    parseAccountChannels(json::Value const& jvParams)
     {
         return parseAccountRaw2(jvParams, jss::destination_account);
     }
 
     // channel_authorize: <private_key> [<key_type>] <channel_id> <drops>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseChannelAuthorize(Json::Value const& jvParams)
+    parseChannelAuthorize(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         unsigned int index = 0;
 
@@ -773,7 +773,7 @@ private:
             index++;
 
             if (!keyTypeFromString(jvParams[index].asString()))
-                return rpcError(rpcBAD_KEY_TYPE);
+                return rpcError(RpcBadKeyType);
             jvRequest[jss::key_type] = jvParams[index];
             index++;
         }
@@ -787,13 +787,13 @@ private:
             // verify the channel id is a valid 256 bit number
             uint256 channelId;
             if (!channelId.parseHex(jvParams[index].asString()))
-                return rpcError(rpcCHANNEL_MALFORMED);
+                return rpcError(RpcChannelMalformed);
             jvRequest[jss::channel_id] = to_string(channelId);
             index++;
         }
 
-        if (!jvParams[index].isString() || !to_uint64(jvParams[index].asString()))
-            return rpcError(rpcCHANNEL_AMT_MALFORMED);
+        if (!jvParams[index].isString() || !toUint64(jvParams[index].asString()))
+            return rpcError(RpcChannelAmtMalformed);
         jvRequest[jss::amount] = jvParams[index];
 
         // If additional parameters are appended, be sure to increment index
@@ -803,28 +803,28 @@ private:
     }
 
     // channel_verify <public_key> <channel_id> <drops> <signature>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseChannelVerify(Json::Value const& jvParams)
+    parseChannelVerify(json::Value const& jvParams)
     {
         std::string const strPk = jvParams[0u].asString();
 
         if (!validPublicKey(strPk))
-            return rpcError(rpcPUBLIC_MALFORMED);
+            return rpcError(RpcPublicMalformed);
 
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         jvRequest[jss::public_key] = strPk;
         {
             // verify the channel id is a valid 256 bit number
             uint256 channelId;
             if (!channelId.parseHex(jvParams[1u].asString()))
-                return rpcError(rpcCHANNEL_MALFORMED);
+                return rpcError(RpcChannelMalformed);
         }
         jvRequest[jss::channel_id] = jvParams[1u].asString();
 
-        if (!jvParams[2u].isString() || !to_uint64(jvParams[2u].asString()))
-            return rpcError(rpcCHANNEL_AMT_MALFORMED);
+        if (!jvParams[2u].isString() || !toUint64(jvParams[2u].asString()))
+            return rpcError(RpcChannelAmtMalformed);
         jvRequest[jss::amount] = jvParams[2u];
 
         jvRequest[jss::signature] = jvParams[3u].asString();
@@ -832,13 +832,13 @@ private:
         return jvRequest;
     }
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseAccountRaw2(Json::Value const& jvParams, char const* const acc2Field)
+    parseAccountRaw2(json::Value const& jvParams, char const* const acc2Field)
     {
         std::array<char const* const, 2> accFields{{jss::account, acc2Field}};
         auto const nParams = jvParams.size();
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         for (auto i = 0; i < nParams; ++i)
         {
             // This was non-const. see comment below
@@ -859,14 +859,14 @@ private:
                 }
                 else
                 {
-                    return rpcError(rpcACT_MALFORMED);
+                    return rpcError(RpcActMalformed);
                 }
             }
             else
             {
                 if (jvParseLedger(jvRequest, strParam))
                     return jvRequest;
-                return rpcError(rpcLGR_IDX_MALFORMED);
+                return rpcError(RpcLgrIdxMalformed);
             }
         }
 
@@ -874,37 +874,37 @@ private:
     }
 
     // TODO: Get index from an alternate syntax: rXYZ:<index>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseAccountRaw1(Json::Value const& jvParams)
+    parseAccountRaw1(json::Value const& jvParams)
     {
         std::string const strIdent = jvParams[0u].asString();
         unsigned int const iCursor = jvParams.size();
 
         if (!parseBase58<AccountID>(strIdent))
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
 
         // Get info on account.
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
 
         jvRequest[jss::account] = strIdent;
 
         if (iCursor == 2 && !jvParseLedger(jvRequest, jvParams[1u].asString()))
-            return rpcError(rpcLGR_IDX_MALFORMED);
+            return rpcError(RpcLgrIdxMalformed);
 
         return jvRequest;
     }
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseVault(Json::Value const& jvParams)
+    parseVault(json::Value const& jvParams)
     {
         std::string const strVaultID = jvParams[0u].asString();
-        uint256 id = beast::zero;
+        uint256 id = beast::kZERO;
         if (!id.parseHex(strVaultID))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         jvRequest[jss::vault_id] = strVaultID;
 
         if (jvParams.size() > 1)
@@ -914,11 +914,11 @@ private:
     }
 
     // peer_reservations_add <public_key> [<name>]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parsePeerReservationsAdd(Json::Value const& jvParams)
+    parsePeerReservationsAdd(json::Value const& jvParams)
     {
-        Json::Value jvRequest;
+        json::Value jvRequest;
         jvRequest[jss::public_key] = jvParams[0u].asString();
         if (jvParams.size() > 1)
         {
@@ -928,21 +928,21 @@ private:
     }
 
     // peer_reservations_del <public_key>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parsePeerReservationsDel(Json::Value const& jvParams)
+    parsePeerReservationsDel(json::Value const& jvParams)
     {
-        Json::Value jvRequest;
+        json::Value jvRequest;
         jvRequest[jss::public_key] = jvParams[0u].asString();
         return jvRequest;
     }
 
     // ripple_path_find <json> [<ledger>]
-    Json::Value
-    parseRipplePathFind(Json::Value const& jvParams)
+    json::Value
+    parseRipplePathFind(json::Value const& jvParams)
     {
-        Json::Reader reader;
-        Json::Value jvRequest{Json::objectValue};
+        json::Reader reader;
+        json::Value jvRequest{json::ObjectValue};
         bool const bLedger = 2 == jvParams.size();
 
         JLOG(j_.trace()) << "RPC json: " << jvParams[0u];
@@ -957,20 +957,20 @@ private:
             return jvRequest;
         }
 
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // simulate any transaction on the network
     //
     // simulate <tx_blob> [binary]
     // simulate <tx_json> [binary]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseSimulate(Json::Value const& jvParams)
+    parseSimulate(json::Value const& jvParams)
     {
-        Json::Value txJSON;
-        Json::Reader reader;
-        Json::Value jvRequest{Json::objectValue};
+        json::Value txJSON;
+        json::Reader reader;
+        json::Value jvRequest{json::ObjectValue};
 
         if (reader.parse(jvParams[0u].asString(), txJSON))
         {
@@ -984,7 +984,7 @@ private:
         if (jvParams.size() == 2)
         {
             if (!jvParams[1u].isString() || jvParams[1u].asString() != "binary")
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
             jvRequest[jss::binary] = true;
         }
 
@@ -996,12 +996,12 @@ private:
     // sign <private_key> <json> offline
     // submit <private_key> <json>
     // submit <tx_blob>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseSignSubmit(Json::Value const& jvParams)
+    parseSignSubmit(json::Value const& jvParams)
     {
-        Json::Value txJSON;
-        Json::Reader reader;
+        json::Value txJSON;
+        json::Reader reader;
         bool const bOffline = jvParams.size() >= 3 && jvParams[2u].asString() == "offline";
         std::optional<std::string> const field = [&jvParams,
                                                   bOffline]() -> std::optional<std::string> {
@@ -1009,7 +1009,7 @@ private:
                 return std::nullopt;
             if (jvParams.size() < 4 && bOffline)
                 return std::nullopt;
-            Json::UInt const index = bOffline ? 3u : 2u;
+            json::UInt const index = bOffline ? 3u : 2u;
             return jvParams[index].asString();
         }();
 
@@ -1017,7 +1017,7 @@ private:
         {
             // Submitting tx_blob
 
-            Json::Value jvRequest{Json::objectValue};
+            json::Value jvRequest{json::ObjectValue};
 
             jvRequest[jss::tx_blob] = jvParams[0u].asString();
 
@@ -1026,7 +1026,7 @@ private:
         if ((jvParams.size() >= 2 || bOffline) && reader.parse(jvParams[1u].asString(), txJSON))
         {
             // Signing or submitting tx_json.
-            Json::Value jvRequest{Json::objectValue};
+            json::Value jvRequest{json::ObjectValue};
 
             jvRequest[jss::secret] = jvParams[0u].asString();
             jvRequest[jss::tx_json] = txJSON;
@@ -1040,35 +1040,35 @@ private:
             return jvRequest;
         }
 
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // submit any multisigned transaction to the network
     //
     // submit_multisigned <json>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseSubmitMultiSigned(Json::Value const& jvParams)
+    parseSubmitMultiSigned(json::Value const& jvParams)
     {
         if (1 == jvParams.size())
         {
-            Json::Value txJSON;
-            Json::Reader reader;
+            json::Value txJSON;
+            json::Reader reader;
             if (reader.parse(jvParams[0u].asString(), txJSON))
             {
-                Json::Value jvRequest{Json::objectValue};
+                json::Value jvRequest{json::ObjectValue};
                 jvRequest[jss::tx_json] = txJSON;
                 return jvRequest;
             }
         }
 
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // transaction_entry <tx_hash> <ledger_hash/ledger_index>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseTransactionEntry(Json::Value const& jvParams)
+    parseTransactionEntry(json::Value const& jvParams)
     {
         // Parameter count should have already been verified.
         XRPL_ASSERT(
@@ -1076,9 +1076,9 @@ private:
 
         std::string const txHash = jvParams[0u].asString();
         if (txHash.length() != 64)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
         jvRequest[jss::tx_hash] = txHash;
 
         jvParseLedger(jvRequest, jvParams[1u].asString());
@@ -1086,17 +1086,17 @@ private:
         // jvParseLedger inserts a "ledger_index" of 0 if it doesn't
         // find a match.
         if (jvRequest.isMember(jss::ledger_index) && jvRequest[jss::ledger_index] == 0)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         return jvRequest;
     }
 
     // tx <transaction_id>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseTx(Json::Value const& jvParams)
+    parseTx(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         if (jvParams.size() == 2 || jvParams.size() == 4)
         {
@@ -1125,11 +1125,11 @@ private:
     }
 
     // tx_history <index>
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseTxHistory(Json::Value const& jvParams)
+    parseTxHistory(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         jvRequest[jss::start] = jvParams[0u].asUInt();
 
@@ -1142,11 +1142,11 @@ private:
     // line.  This information might be saved in the command shell history file
     // (e.g. .bash_history) and it may be leaked via the process status command
     // (i.e. ps).
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseValidationCreate(Json::Value const& jvParams)
+    parseValidationCreate(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         if (jvParams.size() != 0u)
             jvRequest[jss::secret] = jvParams[0u].asString();
@@ -1157,11 +1157,11 @@ private:
     // wallet_propose [<passphrase>]
     // <passphrase> is only for testing. Master seeds should only be generated
     // randomly.
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseWalletPropose(Json::Value const& jvParams)
+    parseWalletPropose(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         if (jvParams.size() != 0u)
             jvRequest[jss::passphrase] = jvParams[0u].asString();
@@ -1173,18 +1173,18 @@ private:
     // gateway_balances [<ledger>] <issuer_account> [ <hotwallet> [ <hotwallet>
     // ]]
 
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseGatewayBalances(Json::Value const& jvParams)
+    parseGatewayBalances(json::Value const& jvParams)
     {
         unsigned int index = 0;
         unsigned int const size = jvParams.size();
 
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         std::string param = jvParams[index++].asString();
         if (param.empty())
-            return RPC::make_param_error("Invalid first parameter");
+            return RPC::makeParamError("Invalid first parameter");
 
         if (param[0] != 'r')
         {
@@ -1198,7 +1198,7 @@ private:
             }
 
             if (size <= index)
-                return RPC::make_param_error("Invalid hotwallet");
+                return RPC::makeParamError("Invalid hotwallet");
 
             param = jvParams[index++].asString();
         }
@@ -1207,7 +1207,7 @@ private:
 
         if (index < size)
         {
-            Json::Value& hotWallets = (jvRequest["hotwallet"] = Json::arrayValue);
+            json::Value& hotWallets = (jvRequest["hotwallet"] = json::ArrayValue);
             while (index < size)
                 hotWallets.append(jvParams[index++].asString());
         }
@@ -1216,11 +1216,11 @@ private:
     }
 
     // server_definitions [hash]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseServerDefinitions(Json::Value const& jvParams)
+    parseServerDefinitions(json::Value const& jvParams)
     {
-        Json::Value jvRequest{Json::objectValue};
+        json::Value jvRequest{json::ObjectValue};
 
         if (jvParams.size() == 1)
         {
@@ -1231,11 +1231,11 @@ private:
     }
 
     // server_info [counters]
-    Json::Value
+    json::Value
     // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-    parseServerInfo(Json::Value const& jvParams)
+    parseServerInfo(json::Value const& jvParams)
     {
-        Json::Value jvRequest(Json::objectValue);
+        json::Value jvRequest(json::ObjectValue);
         if (jvParams.size() == 1 && jvParams[0u].asString() == "counters")
             jvRequest[jss::counters] = true;
         return jvRequest;
@@ -1252,8 +1252,8 @@ public:
 
     // Convert a rpc method and params to a request.
     // <-- { method: xyz, params: [... ] } or { error: ..., ... }
-    Json::Value
-    parseCommand(std::string strMethod, Json::Value jvParams, bool allowAnyCommand)
+    json::Value
+    parseCommand(std::string strMethod, json::Value jvParams, bool allowAnyCommand)
     {
         if (auto stream = j_.trace())
         {
@@ -1269,7 +1269,7 @@ public:
             int maxParams;
         };
 
-        static constexpr Command commands[] = {
+        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 : commands)
+        for (auto const& command : kCOMMANDS)
         {
             if (strMethod == command.name)
             {
@@ -1494,7 +1494,7 @@ public:
                                      << " minimum=" << command.minParams
                                      << " maximum=" << command.maxParams << " actual=" << count;
 
-                    return rpcError(rpcBAD_SYNTAX);
+                    return rpcError(RpcBadSyntax);
                 }
 
                 return (this->*(command.parse))(jvParams);
@@ -1503,7 +1503,7 @@ public:
 
         // The command could not be found
         if (!allowAnyCommand)
-            return rpcError(rpcUNKNOWN_COMMAND);
+            return rpcError(RpcUnknownCommand);
 
         return parseAsIs(jvParams);
     }
@@ -1521,9 +1521,9 @@ public:
 //
 
 std::string
-JSONRPCRequest(std::string const& strMethod, Json::Value const& params, Json::Value const& id)
+jsonrpcRequest(std::string const& strMethod, json::Value const& params, json::Value const& id)
 {
-    Json::Value request;
+    json::Value request;
     request[jss::method] = strMethod;
     request[jss::params] = params;
     request[jss::id] = id;
@@ -1545,14 +1545,14 @@ struct RPCCallImp
     // VFALCO NOTE Is this a to-do comment or a doc comment?
     // Place the async result somewhere useful.
     static void
-    callRPCHandler(Json::Value* jvOutput, Json::Value const& jvInput)
+    callRPCHandler(json::Value* jvOutput, json::Value const& jvInput)
     {
         (*jvOutput) = jvInput;
     }
 
     static bool
     onResponse(
-        std::function<void(Json::Value const& jvInput)> callbackFuncP,
+        std::function<void(json::Value const& jvInput)> callbackFuncP,
         boost::system::error_code const& ecResult,
         int iStatus,
         std::string const& strData,
@@ -1575,17 +1575,17 @@ struct RPCCallImp
             // Parse reply
             JLOG(j.debug()) << "RPC reply: " << strData << std::endl;
             if (strData.starts_with("Unable to parse request") ||
-                strData.starts_with(jss::invalid_API_version.c_str()))
+                strData.starts_with(jss::invalid_API_version.cStr()))
                 Throw<RequestNotParsable>(strData);
-            Json::Reader reader;
-            Json::Value jvReply;
+            json::Reader reader;
+            json::Value jvReply;
             if (!reader.parse(strData, jvReply))
                 Throw<std::runtime_error>("couldn't parse reply from server");
 
             if (!jvReply)
                 Throw<std::runtime_error>("expected reply to have result, error and id properties");
 
-            Json::Value jvResult(Json::objectValue);
+            json::Value jvResult(json::ObjectValue);
 
             jvResult["result"] = jvReply;
 
@@ -1599,7 +1599,7 @@ struct RPCCallImp
     static void
     onRequest(
         std::string const& strMethod,
-        Json::Value const& jvParams,
+        json::Value const& jvParams,
         std::unordered_map<std::string, std::string> const& headers,
         std::string const& strPath,
         boost::asio::streambuf& sb,
@@ -1610,36 +1610,36 @@ struct RPCCallImp
 
         std::ostream osRequest(&sb);
         osRequest << createHTTPPost(
-            strHost, strPath, JSONRPCRequest(strMethod, jvParams, Json::Value(1)), headers);
+            strHost, strPath, jsonrpcRequest(strMethod, jvParams, json::Value(1)), headers);
     }
 };
 
 //------------------------------------------------------------------------------
 
 // Used internally by rpcClient.
-Json::Value
+json::Value
 rpcCmdToJson(
     std::vector<std::string> const& args,
-    Json::Value& retParams,
+    json::Value& retParams,
     unsigned int apiVersion,
     beast::Journal j)
 {
-    Json::Value jvRequest(Json::objectValue);
+    json::Value jvRequest(json::ObjectValue);
 
     RPCParser rpParser(apiVersion, j);
-    Json::Value jvRpcParams(Json::arrayValue);
+    json::Value jvRpcParams(json::ArrayValue);
 
     for (int i = 1; i != args.size(); i++)
         jvRpcParams.append(args[i]);
 
-    retParams = Json::Value(Json::objectValue);
+    retParams = json::Value(json::ObjectValue);
 
     retParams[jss::method] = args[0];
     retParams[jss::params] = jvRpcParams;
 
     jvRequest = rpParser.parseCommand(args[0], jvRpcParams, true);
 
-    auto insert_api_version = [apiVersion](Json::Value& jr) {
+    auto insertApiVersion = [apiVersion](json::Value& jr) {
         if (jr.isObject() && !jr.isMember(jss::error) && !jr.isMember(jss::api_version))
         {
             jr[jss::api_version] = apiVersion;
@@ -1648,12 +1648,12 @@ rpcCmdToJson(
 
     if (jvRequest.isObject())
     {
-        insert_api_version(jvRequest);
+        insertApiVersion(jvRequest);
     }
     else if (jvRequest.isArray())
     {
         // NOLINTNEXTLINE(modernize-use-ranges)
-        std::for_each(jvRequest.begin(), jvRequest.end(), insert_api_version);
+        std::for_each(jvRequest.begin(), jvRequest.end(), insertApiVersion);
     }
 
     JLOG(j.trace()) << "RPC Request: " << jvRequest << std::endl;
@@ -1662,7 +1662,7 @@ rpcCmdToJson(
 
 //------------------------------------------------------------------------------
 
-std::pair<int, Json::Value>
+std::pair<int, json::Value>
 rpcClient(
     std::vector<std::string> const& args,
     Config const& config,
@@ -1670,17 +1670,17 @@ rpcClient(
     unsigned int apiVersion,
     std::unordered_map<std::string, std::string> const& headers)
 {
-    static_assert(rpcBAD_SYNTAX == 1 && rpcSUCCESS == 0, "Expect specific rpc enum values.");
+    static_assert(RpcBadSyntax == 1 && RpcSuccess == 0, "Expect specific rpc enum values.");
     if (args.empty())
-        return {rpcBAD_SYNTAX, {}};  // rpcBAD_SYNTAX = print usage
+        return {RpcBadSyntax, {}};  // rpcBAD_SYNTAX = print usage
 
-    int nRet = rpcSUCCESS;
-    Json::Value jvOutput;
-    Json::Value jvRequest(Json::objectValue);
+    int nRet = RpcSuccess;
+    json::Value jvOutput;
+    json::Value jvRequest(json::ObjectValue);
 
     try
     {
-        Json::Value jvRpc = Json::Value(Json::objectValue);
+        json::Value jvRpc = json::Value(json::ObjectValue);
         jvRequest = rpcCmdToJson(args, jvRpc, apiVersion, logs.journal("RPCParser"));
 
         if (jvRequest.isMember(jss::error))
@@ -1694,7 +1694,7 @@ rpcClient(
             try
             {
                 beast::logstream rpcCallLog{logs.journal("HTTPClient").warn()};
-                setup = setup_ServerHandler(config, rpcCallLog);
+                setup = setupServerHandler(config, rpcCallLog);
             }
             catch (std::exception const&)  // NOLINT(bugprone-empty-catch)
             {
@@ -1708,7 +1708,7 @@ rpcClient(
                 setup.client.port = config.rpc_ip->port();
             }
 
-            Json::Value jvParams(Json::arrayValue);
+            json::Value jvParams(json::ArrayValue);
 
             if (!setup.client.admin_user.empty())
                 jvRequest["admin_user"] = setup.client.admin_user;
@@ -1722,7 +1722,7 @@ rpcClient(
             }
             else if (jvRequest.isArray())
             {
-                for (Json::UInt i = 0; i < jvRequest.size(); ++i)
+                for (json::UInt i = 0; i < jvRequest.size(); ++i)
                     jvParams.append(jvRequest[i]);
             }
 
@@ -1761,9 +1761,9 @@ rpcClient(
             else
             {
                 // Transport error.
-                Json::Value const jvRpcError = jvOutput;
+                json::Value const jvRpcError = jvOutput;
 
-                jvOutput = rpcError(rpcJSON_RPC);
+                jvOutput = rpcError(RpcJsonRpc);
                 jvOutput["result"] = jvRpcError;
             }
 
@@ -1788,7 +1788,7 @@ rpcClient(
             }
             else
             {
-                nRet = rpcBAD_SYNTAX;
+                nRet = RpcBadSyntax;
             }
         }
 
@@ -1797,15 +1797,15 @@ rpcClient(
     }
     catch (RequestNotParsable const& e)
     {
-        jvOutput = rpcError(rpcINVALID_PARAMS);
+        jvOutput = rpcError(RpcInvalidParams);
         jvOutput["error_what"] = e.what();
-        nRet = rpcINVALID_PARAMS;
+        nRet = RpcInvalidParams;
     }
     catch (std::exception& e)
     {
-        jvOutput = rpcError(rpcINTERNAL);
+        jvOutput = rpcError(RpcInternal);
         jvOutput["error_what"] = e.what();
-        nRet = rpcINTERNAL;
+        nRet = RpcInternal;
     }
 
     return {nRet, std::move(jvOutput)};
@@ -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::apiCommandLineVersion);
+    auto const result = rpcClient(vCmd, config, logs, RPC::kAPI_COMMAND_LINE_VERSION);
 
     std::cout << result.second.toStyledString();
 
@@ -1829,18 +1829,18 @@ fromCommandLine(Config const& config, std::vector<std::string> const& vCmd, Logs
 
 void
 fromNetwork(
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     std::string const& strIp,
     std::uint16_t const iPort,
     std::string const& strUsername,
     std::string const& strPassword,
     std::string const& strPath,
     std::string const& strMethod,
-    Json::Value const& jvParams,
+    json::Value const& jvParams,
     bool const bSSL,
     bool const quiet,
     Logs& logs,
-    std::function<void(Json::Value const& jvInput)> callbackFuncP,
+    std::function<void(json::Value const& jvInput)> callbackFuncP,
     std::unordered_map<std::string, std::string> headers)
 {
     auto j = logs.journal("HTTPClient");
@@ -1854,20 +1854,20 @@ fromNetwork(
 
     // HTTP basic authentication
     headers["Authorization"] =
-        std::string("Basic ") + base64_encode(strUsername + ":" + strPassword);
+        std::string("Basic ") + base64Encode(strUsername + ":" + strPassword);
 
     // Send request
 
     // Number of bytes to try to receive if no
     // Content-Length header received
-    constexpr auto RPC_REPLY_MAX_BYTES = megabytes(256);
+    constexpr auto kRPC_REPLY_MAX_BYTES = megabytes(256);
 
     using namespace std::chrono_literals;
-    auto constexpr RPC_WEBHOOK_TIMEOUT = 30s;
+    auto constexpr kRPC_WEBHOOK_TIMEOUT = 30s;
 
     HTTPClient::request(
         bSSL,
-        io_context,
+        ioContext,
         strIp,
         iPort,
         std::bind(
@@ -1879,8 +1879,8 @@ fromNetwork(
             std::placeholders::_1,
             std::placeholders::_2,
             j),
-        RPC_REPLY_MAX_BYTES,
-        RPC_WEBHOOK_TIMEOUT,
+        kRPC_REPLY_MAX_BYTES,
+        kRPC_WEBHOOK_TIMEOUT,
         std::bind(
             &RPCCallImp::onResponse,
             callbackFuncP,
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index cbd08a2677..fb99aa682a 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -107,26 +107,26 @@ namespace {
 
  */
 
-error_code_i
+ErrorCodeI
 fillHandler(JsonContext& context, Handler const*& result)
 {
     if (!isUnlimited(context.role))
     {
         // Count all jobs at jtCLIENT priority or higher.
-        int const jobCount = context.app.getJobQueue().getJobCountGE(jtCLIENT);
-        if (jobCount > Tuning::maxJobQueueClients)
+        int const jobCount = context.app.getJobQueue().getJobCountGE(JtClient);
+        if (jobCount > Tuning::kMAX_JOB_QUEUE_CLIENTS)
         {
             JLOG(context.j.debug()) << "Too busy for command: " << jobCount;
-            return rpcTOO_BUSY;
+            return RpcTooBusy;
         }
     }
 
     if (!context.params.isMember(jss::command) && !context.params.isMember(jss::method))
-        return rpcCOMMAND_MISSING;
+        return RpcCommandMissing;
     if (context.params.isMember(jss::command) && context.params.isMember(jss::method))
     {
         if (context.params[jss::command].asString() != context.params[jss::method].asString())
-            return rpcUNKNOWN_COMMAND;
+            return RpcUnknownCommand;
     }
 
     std::string const strCommand = context.params.isMember(jss::command)
@@ -138,32 +138,32 @@ fillHandler(JsonContext& context, Handler const*& result)
     auto handler = getHandler(context.apiVersion, context.app.config().BETA_RPC_API, strCommand);
 
     if (handler == nullptr)
-        return rpcUNKNOWN_COMMAND;
+        return RpcUnknownCommand;
 
-    if (handler->role_ == Role::ADMIN && context.role != Role::ADMIN)
-        return rpcNO_PERMISSION;
+    if (handler->role == Role::ADMIN && context.role != Role::ADMIN)
+        return RpcNoPermission;
 
-    error_code_i const res = conditionMet(handler->condition_, context);
-    if (res != rpcSUCCESS)
+    ErrorCodeI const res = conditionMet(handler->condition, context);
+    if (res != RpcSuccess)
     {
         return res;
     }
 
     result = handler;
-    return rpcSUCCESS;
+    return RpcSuccess;
 }
 
 template <class Object, class Method>
 Status
 callMethod(JsonContext& context, Method method, std::string const& name, Object& result)
 {
-    static std::atomic<std::uint64_t> requestId{0};
+    static std::atomic<std::uint64_t> kREQUEST_ID{0};
     auto& perfLog = context.app.getPerfLog();
-    std::uint64_t const curId = ++requestId;
+    std::uint64_t const curId = ++kREQUEST_ID;
     try
     {
         perfLog.rpcStart(name, curId);
-        auto v = context.app.getJobQueue().makeLoadEvent(jtGENERIC, "cmd:" + name);
+        auto v = context.app.getJobQueue().makeLoadEvent(JtGeneric, "cmd:" + name);
 
         auto start = std::chrono::system_clock::now();
         auto ret = method(context, result);
@@ -179,48 +179,48 @@ 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::feeReferenceRPC)
-            context.loadType = Resource::feeExceptionRPC;
+        if (context.loadType == Resource::kFEE_REFERENCE_RPC)
+            context.loadType = Resource::kFEE_EXCEPTION_RPC;
 
-        inject_error(rpcINTERNAL, result);
-        return rpcINTERNAL;
+        injectError(RpcInternal, result);
+        return RpcInternal;
     }
 }
 
 }  // namespace
 
 Status
-doCommand(RPC::JsonContext& context, Json::Value& result)
+doCommand(RPC::JsonContext& context, json::Value& result)
 {
     Handler const* handler = nullptr;
     if (auto error = fillHandler(context, handler))
     {
-        inject_error(error, result);
+        injectError(error, result);
         return error;
     }
 
-    if (auto method = handler->valueMethod_)
+    if (auto method = handler->valueMethod)
     {
         if (!context.headers.user.empty() || !context.headers.forwardedFor.empty())
         {
             JLOG(context.j.debug())
-                << "start command: " << handler->name_ << ", user: " << context.headers.user
+                << "start command: " << handler->name << ", user: " << context.headers.user
                 << ", forwarded for: " << context.headers.forwardedFor;
 
-            auto ret = callMethod(context, method, handler->name_, result);
+            auto ret = callMethod(context, method, handler->name, result);
 
             JLOG(context.j.debug())
-                << "finish command: " << handler->name_ << ", user: " << context.headers.user
+                << "finish command: " << handler->name << ", user: " << context.headers.user
                 << ", forwarded for: " << context.headers.forwardedFor;
 
             return ret;
         }
 
-        auto ret = callMethod(context, method, handler->name_, result);
+        auto ret = callMethod(context, method, handler->name, result);
         return ret;
     }
 
-    return rpcUNKNOWN_COMMAND;
+    return RpcUnknownCommand;
 }
 
 Role
@@ -231,7 +231,7 @@ roleRequired(unsigned int version, bool betaEnabled, std::string const& method)
     if (handler == nullptr)
         return Role::FORBID;
 
-    return handler->role_;
+    return handler->role;
 }
 
 }  // namespace xrpl::RPC
diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp
index 1bf6d32bf9..84ecd4e607 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCHelpers.cpp
@@ -104,7 +104,7 @@ isRelatedToAccount(
 }
 
 hash_set<AccountID>
-parseAccountIds(Json::Value const& jvArray)
+parseAccountIds(json::Value const& jvArray)
 {
     hash_set<AccountID> result;
     for (auto const& jv : jvArray)
@@ -119,7 +119,7 @@ parseAccountIds(Json::Value const& jvArray)
     return result;
 }
 
-std::optional<Json::Value>
+std::optional<json::Value>
 readLimitField(unsigned int& limit, Tuning::LimitRange const& range, JsonContext const& context)
 {
     limit = range.rDefault;
@@ -128,11 +128,11 @@ readLimitField(unsigned int& limit, Tuning::LimitRange const& range, JsonContext
 
     auto const& jvLimit = context.params[jss::limit];
     if (!jvLimit.isUInt() && (!jvLimit.isInt() || jvLimit.asInt() < 0))
-        return RPC::expected_field_error(jss::limit, "unsigned integer");
+        return RPC::expectedFieldError(jss::limit, "unsigned integer");
 
     limit = jvLimit.asUInt();
     if (limit == 0)
-        return RPC::invalid_field_error(jss::limit);
+        return RPC::invalidFieldError(jss::limit);
 
     if (!isUnlimited(context.role))
         limit = std::max(range.rmin, std::min(range.rmax, limit));
@@ -141,7 +141,7 @@ readLimitField(unsigned int& limit, Tuning::LimitRange const& range, JsonContext
 }
 
 std::optional<Seed>
-parseXrplLibSeed(Json::Value const& value)
+parseXrplLibSeed(json::Value const& value)
 {
     // XrplLib encodes seed used to generate an Ed25519 wallet in a
     // non-standard way. While xrpld never encode seeds that way, we
@@ -159,15 +159,15 @@ parseXrplLibSeed(Json::Value const& value)
 }
 
 std::optional<Seed>
-getSeedFromRPC(Json::Value const& params, Json::Value& error)
+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 seedTypes[]{
-        {jss::passphrase.c_str(), [](std::string const& s) { return parseGenericSeed(s); }},
-        {jss::seed.c_str(), [](std::string const& s) { return parseBase58<Seed>(s); }},
-        {jss::seed_hex.c_str(), [](std::string const& s) {
+    static seed_match_t const kSEED_TYPES[]{
+        {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) {
              uint128 i;
              if (i.parseHex(s))
                  return std::optional<Seed>(Slice(i.data(), i.size()));
@@ -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 : seedTypes)
+    for (auto const& t : kSEED_TYPES)
     {
         if (params.isMember(t.first))
         {
@@ -188,7 +188,7 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error)
 
     if (count != 1)
     {
-        error = RPC::make_param_error(
+        error = RPC::makeParamError(
             "Exactly one of the following must be specified: " + std::string(jss::passphrase) +
             ", " + std::string(jss::seed) + " or " + std::string(jss::seed_hex));
         return std::nullopt;
@@ -198,7 +198,7 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error)
     auto const& param = params[seedType->first];
     if (!param.isString())
     {
-        error = RPC::expected_field_error(seedType->first, "string");
+        error = RPC::expectedFieldError(seedType->first, "string");
         return std::nullopt;
     }
 
@@ -208,24 +208,24 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error)
     std::optional<Seed> seed = seedType->second(fieldContents);
 
     if (!seed)
-        error = rpcError(rpcBAD_SEED);
+        error = rpcError(RpcBadSeed);
 
     return seed;
 }
 
 std::optional<std::pair<PublicKey, SecretKey>>
-keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int apiVersion)
+keypairForSignature(json::Value const& params, json::Value& error, unsigned int apiVersion)
 {
-    bool const has_key_type = params.isMember(jss::key_type);
+    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 secretTypes[]{
-        jss::passphrase.c_str(), jss::secret.c_str(), jss::seed.c_str(), jss::seed_hex.c_str()};
+    static char const* const kSECRET_TYPES[]{
+        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 : secretTypes)
+    for (auto t : kSECRET_TYPES)
     {
         if (params.isMember(t))
         {
@@ -236,13 +236,13 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
 
     if (count == 0 || secretType == nullptr)
     {
-        error = RPC::missing_field_error(jss::secret);
+        error = RPC::missingFieldError(jss::secret);
         return {};
     }
 
     if (count > 1)
     {
-        error = RPC::make_param_error(
+        error = RPC::makeParamError(
             "Exactly one of the following must be specified: " + std::string(jss::passphrase) +
             ", " + std::string(jss::secret) + ", " + std::string(jss::seed) + " or " +
             std::string(jss::seed_hex));
@@ -252,11 +252,11 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
     std::optional<KeyType> keyType;
     std::optional<Seed> seed;
 
-    if (has_key_type)
+    if (hasKeyType)
     {
         if (!params[jss::key_type].isString())
         {
-            error = RPC::expected_field_error(jss::key_type, "string");
+            error = RPC::expectedFieldError(jss::key_type, "string");
             return {};
         }
 
@@ -266,20 +266,20 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
         {
             if (apiVersion > 1u)
             {
-                error = RPC::make_error(rpcBAD_KEY_TYPE);
+                error = RPC::makeError(RpcBadKeyType);
             }
             else
             {
-                error = RPC::invalid_field_error(jss::key_type);
+                error = RPC::invalidFieldError(jss::key_type);
             }
             return {};
         }
 
         // using strcmp as pointers may not match (see
         // https://developercommunity.visualstudio.com/t/assigning-constexpr-char--to-static-cha/10021357?entry=problem)
-        if (strcmp(secretType, jss::secret.c_str()) == 0)
+        if (strcmp(secretType, jss::secret.cStr()) == 0)
         {
-            error = RPC::make_param_error(
+            error = RPC::makeParamError(
                 "The secret field is not allowed if " + std::string(jss::key_type) + " is used.");
             return {};
         }
@@ -290,7 +290,7 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
     // to detect such keys to avoid user confusion.
     // using strcmp as pointers may not match (see
     // https://developercommunity.visualstudio.com/t/assigning-constexpr-char--to-static-cha/10021357?entry=problem)
-    if (strcmp(secretType, jss::seed_hex.c_str()) != 0)
+    if (strcmp(secretType, jss::seed_hex.cStr()) != 0)
     {
         seed = RPC::parseXrplLibSeed(params[secretType]);
 
@@ -298,22 +298,22 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
         {
             // If the user passed in an Ed25519 seed but *explicitly*
             // requested another key type, return an error.
-            if (keyType.value_or(KeyType::ed25519) != KeyType::ed25519)
+            if (keyType.value_or(KeyType::Ed25519) != KeyType::Ed25519)
             {
-                error = RPC::make_error(rpcBAD_SEED, "Specified seed is for an Ed25519 wallet.");
+                error = RPC::makeError(RpcBadSeed, "Specified seed is for an Ed25519 wallet.");
                 return {};
             }
 
-            keyType = KeyType::ed25519;
+            keyType = KeyType::Ed25519;
         }
     }
 
     if (!keyType)
-        keyType = KeyType::secp256k1;
+        keyType = KeyType::Secp256k1;
 
     if (!seed)
     {
-        if (has_key_type)
+        if (hasKeyType)
         {
             seed = getSeedFromRPC(params, error);
         }
@@ -321,7 +321,7 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
         {
             if (!params[jss::secret].isString())
             {
-                error = RPC::expected_field_error(jss::secret, "string");
+                error = RPC::expectedFieldError(jss::secret, "string");
                 return {};
             }
 
@@ -331,27 +331,27 @@ keypairForSignature(Json::Value const& params, Json::Value& error, unsigned int
 
     if (!seed)
     {
-        if (!contains_error(error))
+        if (!containsError(error))
         {
-            error = RPC::make_error(rpcBAD_SEED, RPC::invalid_field_message(secretType));
+            error = RPC::makeError(RpcBadSeed, RPC::invalidFieldMessage(secretType));
         }
 
         return {};
     }
 
-    if (keyType != KeyType::secp256k1 && keyType != KeyType::ed25519)
-        LogicError("keypairForSignature: invalid key type");
+    if (keyType != KeyType::Secp256k1 && keyType != KeyType::Ed25519)
+        logicError("keypairForSignature: invalid key type");
 
     return generateKeyPair(*keyType, *seed);
 }
 
 std::pair<RPC::Status, LedgerEntryType>
-chooseLedgerEntryType(Json::Value const& params)
+chooseLedgerEntryType(json::Value const& params)
 {
-    std::pair<RPC::Status, LedgerEntryType> result{RPC::Status::OK, ltANY};
+    std::pair<RPC::Status, LedgerEntryType> result{RPC::Status::kOK, ltANY};
     if (params.isMember(jss::type))
     {
-        static constexpr auto types =
+        static constexpr auto kTYPES =
             std::to_array<std::tuple<char const*, char const*, LedgerEntryType>>({
 #pragma push_macro("LEDGER_ENTRY")
 #undef LEDGER_ENTRY
@@ -367,9 +367,9 @@ chooseLedgerEntryType(Json::Value const& params)
         auto const& p = params[jss::type];
         if (!p.isString())
         {
-            result.first = RPC::Status{rpcINVALID_PARAMS, "Invalid field 'type', not string."};
+            result.first = RPC::Status{RpcInvalidParams, "Invalid field 'type', not string."};
             XRPL_ASSERT(
-                result.first.type() == RPC::Status::Type::error_code_i,
+                result.first.type() == RPC::Status::Type::ErrorCodeI,
                 "xrpl::RPC::chooseLedgerEntryType : first valid result type");
             return result;
         }
@@ -378,14 +378,14 @@ 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(types, [&filter](decltype(types.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 == types.end())
+        if (iter == kTYPES.end())
         {
-            result.first = RPC::Status{rpcINVALID_PARAMS, "Invalid field 'type'."};
+            result.first = RPC::Status{RpcInvalidParams, "Invalid field 'type'."};
             XRPL_ASSERT(
-                result.first.type() == RPC::Status::Type::error_code_i,
+                result.first.type() == RPC::Status::Type::ErrorCodeI,
                 "xrpl::RPC::chooseLedgerEntryType : second valid result "
                 "type");
             return result;
@@ -411,25 +411,25 @@ isAccountObjectsValidType(LedgerEntryType const& type)
     }
 }
 
-error_code_i
+ErrorCodeI
 parseSubUnsubJson(
     Asset& asset,
-    Json::Value const& params,
-    Json::StaticString const& name,
+    json::Value const& params,
+    json::StaticString const& name,
     beast::Journal j)
 {
     auto const& jv = params[name];
     auto const [issuerError, assetError] = [&]() {
         if (name == jss::taker_pays)
-            return std::make_pair(rpcSRC_ISR_MALFORMED, rpcSRC_CUR_MALFORMED);
-        return std::make_pair(rpcDST_ISR_MALFORMED, rpcDST_AMT_MALFORMED);
+            return std::make_pair(RpcSrcIsrMalformed, RpcSrcCurMalformed);
+        return std::make_pair(RpcDstIsrMalformed, RpcDstAmtMalformed);
     }();
 
     if (jv.isMember(jss::mpt_issuance_id) &&
         (jv.isMember(jss::currency) || jv.isMember(jss::issuer)))
     {
-        JLOG(j.info()) << boost::format("Bad %s currency or MPT.") % name.c_str();
-        return rpcINVALID_PARAMS;
+        JLOG(j.info()) << boost::format("Bad %s currency or MPT.") % name.cStr();
+        return RpcInvalidParams;
     }
 
     if (jv.isMember(jss::currency))
@@ -437,19 +437,19 @@ parseSubUnsubJson(
         Issue issue = xrpIssue();
         // Parse mandatory currency.
         if (!jv.isMember(jss::currency) ||
-            !to_currency(issue.currency, jv[jss::currency].asString()))
+            !toCurrency(issue.currency, jv[jss::currency].asString()))
         {
-            JLOG(j.info()) << boost::format("Bad %s currency.") % name.c_str();
+            JLOG(j.info()) << boost::format("Bad %s currency.") % name.cStr();
             return assetError;
         }
 
         // Parse optional issuer.
         if (((jv.isMember(jss::issuer)) &&
-             (!jv[jss::issuer].isString() || !to_issuer(issue.account, jv[jss::issuer].asString())))
+             (!jv[jss::issuer].isString() || !toIssuer(issue.account, jv[jss::issuer].asString())))
             // Don't allow illegal issuers.
             || (!issue.currency != !issue.account) || noAccount() == issue.account)
         {
-            JLOG(j.info()) << boost::format("Bad %s issuer.") % name.c_str();
+            JLOG(j.info()) << boost::format("Bad %s issuer.") % name.cStr();
             return issuerError;
         }
         asset = issue;
@@ -463,11 +463,11 @@ parseSubUnsubJson(
     }
     else
     {
-        JLOG(j.info()) << boost::format("Neither %s currency or MPT is present.") % name.c_str();
+        JLOG(j.info()) << boost::format("Neither %s currency or MPT is present.") % name.cStr();
         return assetError;
     }
 
-    return rpcSUCCESS;
+    return RpcSuccess;
 }
 
 }  // namespace xrpl::RPC
diff --git a/src/xrpld/rpc/detail/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h
index 64f7d223a6..cdebd592c7 100644
--- a/src/xrpld/rpc/detail/RPCHelpers.h
+++ b/src/xrpld/rpc/detail/RPCHelpers.h
@@ -61,7 +61,7 @@ isRelatedToAccount(
  * @return A hash_set containing the parsed AccountID objects.
  */
 hash_set<AccountID>
-parseAccountIds(Json::Value const& jvArray);
+parseAccountIds(json::Value const& jvArray);
 
 /**
  * @brief Retrieves the limit value from a JsonContext or sets a default.
@@ -76,7 +76,7 @@ parseAccountIds(Json::Value const& jvArray);
  * @return An optional JSON value containing an error if one occurred, or
  * std::nullopt on success.
  */
-std::optional<Json::Value>
+std::optional<json::Value>
 readLimitField(unsigned int& limit, Tuning::LimitRange const& range, JsonContext const& context);
 
 /**
@@ -91,7 +91,7 @@ readLimitField(unsigned int& limit, Tuning::LimitRange const& range, JsonContext
  * @return An optional Seed if parsing is successful, or std::nullopt otherwise.
  */
 std::optional<Seed>
-getSeedFromRPC(Json::Value const& params, Json::Value& error);
+getSeedFromRPC(json::Value const& params, json::Value& error);
 
 /**
  * @brief Parses a XrplLib seed from RPC parameters.
@@ -103,7 +103,7 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error);
  * @return An optional Seed if parsing is successful, or std::nullopt otherwise.
  */
 std::optional<Seed>
-parseXrplLibSeed(Json::Value const& params);
+parseXrplLibSeed(json::Value const& params);
 
 /**
  * @brief Chooses the ledger entry type based on RPC parameters.
@@ -116,7 +116,7 @@ parseXrplLibSeed(Json::Value const& params);
  * @return A pair consisting of the RPC status and the chosen LedgerEntryType.
  */
 std::pair<RPC::Status, LedgerEntryType>
-chooseLedgerEntryType(Json::Value const& params);
+chooseLedgerEntryType(json::Value const& params);
 
 /**
  * @brief Checks if the type is a valid filtering type for the account_objects
@@ -150,17 +150,17 @@ isAccountObjectsValidType(LedgerEntryType const& type);
  */
 std::optional<std::pair<PublicKey, SecretKey>>
 keypairForSignature(
-    Json::Value const& params,
-    Json::Value& error,
-    unsigned int apiVersion = apiVersionIfUnspecified);
+    json::Value const& params,
+    json::Value& error,
+    unsigned int apiVersion = kAPI_VERSION_IF_UNSPECIFIED);
 
 /** Parse subscribe/unsubscribe parameters
  */
-error_code_i
+ErrorCodeI
 parseSubUnsubJson(
     Asset& asset,
-    Json::Value const& jv,
-    Json::StaticString const& name,
+    json::Value const& jv,
+    json::StaticString const& name,
     beast::Journal j);
 
 }  // namespace RPC
diff --git a/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp b/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
index b4c654e245..f8ab42f499 100644
--- a/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
+++ b/src/xrpld/rpc/detail/RPCLedgerHelpers.cpp
@@ -36,20 +36,20 @@ isValidatedOld(LedgerMaster& ledgerMaster, bool standalone)
     if (standalone)
         return false;
 
-    return ledgerMaster.getValidatedLedgerAge() > Tuning::maxValidatedLedgerAge;
+    return ledgerMaster.getValidatedLedgerAge() > Tuning::kMAX_VALIDATED_LEDGER_AGE;
 }
 
 template <class T>
 Status
 ledgerFromHash(
     T& ledger,
-    Json::Value hash,
+    json::Value hash,
     Context const& context,
-    Json::StaticString const fieldName)
+    json::StaticString const fieldName)
 {
     uint256 ledgerHash;
     if (!ledgerHash.parseHex(hash.asString()))
-        return {rpcINVALID_PARAMS, expected_field_message(fieldName, "hex string")};
+        return {RpcInvalidParams, expectedFieldMessage(fieldName, "hex string")};
     return getLedger(ledger, ledgerHash, context);
 }
 
@@ -57,9 +57,9 @@ template <class T>
 Status
 ledgerFromIndex(
     T& ledger,
-    Json::Value indexValue,
+    json::Value indexValue,
     Context const& context,
-    Json::StaticString const fieldName)
+    json::StaticString const fieldName)
 {
     auto const index = indexValue.asString();
 
@@ -74,7 +74,7 @@ ledgerFromIndex(
 
     std::uint32_t iVal = 0;
     if (!beast::lexicalCastChecked(iVal, index))
-        return {rpcINVALID_PARAMS, expected_field_message(fieldName, "string or number")};
+        return {RpcInvalidParams, expectedFieldMessage(fieldName, "string or number")};
 
     return getLedger(ledger, iVal, context);
 }
@@ -97,12 +97,12 @@ ledgerFromRequest(T& ledger, JsonContext const& context)
         if (hasLedger)
         {
             return {
-                rpcINVALID_PARAMS,
+                RpcInvalidParams,
                 "Exactly one of 'ledger', 'ledger_hash', or "
                 "'ledger_index' can be specified."};
         }
         return {
-            rpcINVALID_PARAMS,
+            RpcInvalidParams,
             "Exactly one of 'ledger_hash' or "
             "'ledger_index' can be specified."};
     }
@@ -113,7 +113,7 @@ ledgerFromRequest(T& ledger, JsonContext const& context)
         auto& legacyLedger = params[jss::ledger];
         if (!legacyLedger.isString() && !legacyLedger.isUInt() && !legacyLedger.isInt())
         {
-            return {rpcINVALID_PARAMS, expected_field_message(jss::ledger, "string or number")};
+            return {RpcInvalidParams, expectedFieldMessage(jss::ledger, "string or number")};
         }
         if (legacyLedger.isString() && legacyLedger.asString().size() == 64)
         {
@@ -127,7 +127,7 @@ ledgerFromRequest(T& ledger, JsonContext const& context)
     {
         auto const& ledgerHash = params[jss::ledger_hash];
         if (!ledgerHash.isString())
-            return {rpcINVALID_PARAMS, expected_field_message(jss::ledger_hash, "hex string")};
+            return {RpcInvalidParams, expectedFieldMessage(jss::ledger_hash, "hex string")};
         return ledgerFromHash(ledger, ledgerHash, context, jss::ledger_hash);
     }
 
@@ -136,8 +136,7 @@ ledgerFromRequest(T& ledger, JsonContext const& context)
         auto const& ledgerIndex = params[jss::ledger_index];
         if (!ledgerIndex.isString() && !ledgerIndex.isUInt() && !ledgerIndex.isInt())
         {
-            return {
-                rpcINVALID_PARAMS, expected_field_message(jss::ledger_index, "string or number")};
+            return {RpcInvalidParams, expectedFieldMessage(jss::ledger_index, "string or number")};
         }
         return ledgerFromIndex(ledger, ledgerIndex, context, jss::ledger_index);
     }
@@ -191,7 +190,7 @@ ledgerFromSpecifier(
             {
                 return getLedger(ledger, *hash, context);
             }
-            return {rpcINVALID_PARAMS, "ledgerHashMalformed"};
+            return {RpcInvalidParams, "ledgerHashMalformed"};
         }
         case LedgerCase::kSequence:
             return getLedger(ledger, specifier.sequence(), context);
@@ -216,7 +215,7 @@ ledgerFromSpecifier(
         }
     }
 
-    return Status::OK;
+    return Status::kOK;
 }
 
 template <class T>
@@ -225,8 +224,8 @@ getLedger(T& ledger, uint256 const& ledgerHash, Context const& context)
 {
     ledger = context.ledgerMaster.getLedgerByHash(ledgerHash);
     if (ledger == nullptr)
-        return {rpcLGR_NOT_FOUND, "ledgerNotFound"};
-    return Status::OK;
+        return {RpcLgrNotFound, "ledgerNotFound"};
+    return Status::kOK;
 }
 
 template <class T>
@@ -244,18 +243,18 @@ getLedger(T& ledger, uint32_t ledgerIndex, Context const& context)
     }
 
     if (ledger == nullptr)
-        return {rpcLGR_NOT_FOUND, "ledgerNotFound"};
+        return {RpcLgrNotFound, "ledgerNotFound"};
 
     if (ledger->header().seq > context.ledgerMaster.getValidLedgerIndex() &&
         isValidatedOld(context.ledgerMaster, context.app.config().standalone()))
     {
         ledger.reset();
         if (context.apiVersion == 1)
-            return {rpcNO_NETWORK, "InsufficientNetworkMode"};
-        return {rpcNOT_SYNCED, "notSynced"};
+            return {RpcNoNetwork, "InsufficientNetworkMode"};
+        return {RpcNotSynced, "notSynced"};
     }
 
-    return Status::OK;
+    return Status::kOK;
 }
 
 template <class T>
@@ -265,8 +264,8 @@ getLedger(T& ledger, LedgerShortcut shortcut, Context const& context)
     if (isValidatedOld(context.ledgerMaster, context.app.config().standalone()))
     {
         if (context.apiVersion == 1)
-            return {rpcNO_NETWORK, "InsufficientNetworkMode"};
-        return {rpcNOT_SYNCED, "notSynced"};
+            return {RpcNoNetwork, "InsufficientNetworkMode"};
+        return {RpcNotSynced, "notSynced"};
     }
 
     if (shortcut == LedgerShortcut::Validated)
@@ -275,8 +274,8 @@ getLedger(T& ledger, LedgerShortcut shortcut, Context const& context)
         if (ledger == nullptr)
         {
             if (context.apiVersion == 1)
-                return {rpcNO_NETWORK, "InsufficientNetworkMode"};
-            return {rpcNOT_SYNCED, "notSynced"};
+                return {RpcNoNetwork, "InsufficientNetworkMode"};
+            return {RpcNotSynced, "notSynced"};
         }
 
         XRPL_ASSERT(!ledger->open(), "xrpl::RPC::getLedger : validated is not open");
@@ -295,27 +294,27 @@ getLedger(T& ledger, LedgerShortcut shortcut, Context const& context)
         }
         else
         {
-            return {rpcINVALID_PARAMS, "ledgerIndexMalformed"};
+            return {RpcInvalidParams, "ledgerIndexMalformed"};
         }
 
         if (ledger == nullptr)
         {
             if (context.apiVersion == 1)
-                return {rpcNO_NETWORK, "InsufficientNetworkMode"};
-            return {rpcNOT_SYNCED, "notSynced"};
+                return {RpcNoNetwork, "InsufficientNetworkMode"};
+            return {RpcNotSynced, "notSynced"};
         }
 
-        static auto const minSequenceGap = 10;
+        static auto const kMIN_SEQUENCE_GAP = 10;
 
-        if (ledger->header().seq + minSequenceGap < context.ledgerMaster.getValidLedgerIndex())
+        if (ledger->header().seq + kMIN_SEQUENCE_GAP < context.ledgerMaster.getValidLedgerIndex())
         {
             ledger.reset();
             if (context.apiVersion == 1)
-                return {rpcNO_NETWORK, "InsufficientNetworkMode"};
-            return {rpcNOT_SYNCED, "notSynced"};
+                return {RpcNoNetwork, "InsufficientNetworkMode"};
+            return {RpcNotSynced, "notSynced"};
         }
     }
-    return Status::OK;
+    return Status::kOK;
 }
 
 // Explicit instantiation of above three functions
@@ -343,7 +342,7 @@ getLedger<>(std::shared_ptr<ReadView const>&, uint256 const&, Context const&);
 // In the absence of the "ledger_hash" or "ledger_index" parameters, the code
 // assumes that "ledger_index" has the value "current".
 //
-// Returns a Json::objectValue.  If there was an error, it will be in that
+// Returns a json::objectValue.  If there was an error, it will be in that
 // return value.  Otherwise, the object contains the field "validated" and
 // optionally the fields "ledger_hash", "ledger_index" and
 // "ledger_current_index", if they are defined.
@@ -351,7 +350,7 @@ Status
 lookupLedger(
     std::shared_ptr<ReadView const>& ledger,
     JsonContext const& context,
-    Json::Value& result)
+    json::Value& result)
 {
     if (auto status = ledgerFromRequest(ledger, context))
         return status;
@@ -369,20 +368,20 @@ lookupLedger(
     }
 
     result[jss::validated] = context.ledgerMaster.isValidated(*ledger);
-    return Status::OK;
+    return Status::kOK;
 }
 
-Json::Value
+json::Value
 lookupLedger(std::shared_ptr<ReadView const>& ledger, JsonContext const& context)
 {
-    Json::Value result;
+    json::Value result;
     if (auto status = lookupLedger(ledger, context, result))
         status.inject(result);
 
     return result;
 }
 
-Expected<std::shared_ptr<Ledger const>, Json::Value>
+Expected<std::shared_ptr<Ledger const>, json::Value>
 getOrAcquireLedger(RPC::JsonContext const& context)
 {
     auto const hasHash = context.params.isMember(jss::ledger_hash);
@@ -395,38 +394,38 @@ getOrAcquireLedger(RPC::JsonContext const& context)
     if ((static_cast<int>(hasHash) + static_cast<int>(hasIndex)) != 1)
     {
         return Unexpected(
-            RPC::make_param_error(
+            RPC::makeParamError(
                 "Exactly one of 'ledger_hash' or "
                 "'ledger_index' can be specified."));
     }
 
     if (hasHash)
     {
-        auto const& jsonHash = context.params.get(jss::ledger_hash, Json::nullValue);
+        auto const& jsonHash = context.params.get(jss::ledger_hash, json::NullValue);
         if (!jsonHash.isString() || !ledgerHash.parseHex(jsonHash.asString()))
-            return Unexpected(RPC::expected_field_error(jss::ledger_hash, "hex string"));
+            return Unexpected(RPC::expectedFieldError(jss::ledger_hash, "hex string"));
     }
     else
     {
-        auto const& jsonIndex = context.params.get(jss::ledger_index, Json::nullValue);
+        auto const& jsonIndex = context.params.get(jss::ledger_index, json::NullValue);
         if (!jsonIndex.isInt() && !jsonIndex.isUInt())
-            return Unexpected(RPC::expected_field_error(jss::ledger_index, "number"));
+            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::maxValidatedLedgerAge)
+        if (ledgerMaster.getValidatedLedgerAge() > RPC::Tuning::kMAX_VALIDATED_LEDGER_AGE)
         {
             if (context.apiVersion == 1)
-                return Unexpected(rpcError(rpcNO_CURRENT));
-            return Unexpected(rpcError(rpcNOT_SYNCED));
+                return Unexpected(rpcError(RpcNoCurrent));
+            return Unexpected(rpcError(RpcNotSynced));
         }
 
         ledgerIndex = jsonIndex.asInt();
         auto ledger = ledgerMaster.getValidatedLedger();
 
         if (ledgerIndex >= ledger->header().seq)
-            return Unexpected(RPC::make_param_error("Ledger index too large"));
+            return Unexpected(RPC::makeParamError("Ledger index too large"));
         if (ledgerIndex <= 0)
-            return Unexpected(RPC::make_param_error("Ledger index too small"));
+            return Unexpected(RPC::makeParamError("Ledger index too small"));
 
         auto const j = context.app.getJournal("RPCHandler");
         // Try to get the hash of the desired ledger from the validated
@@ -450,8 +449,8 @@ getOrAcquireLedger(RPC::JsonContext const& context)
                 if (auto il = context.app.getInboundLedgers().acquire(
                         *refHash, refIndex, InboundLedger::Reason::GENERIC))
                 {
-                    Json::Value jvResult = RPC::make_error(
-                        rpcLGR_NOT_FOUND, "acquiring ledger containing requested index");
+                    json::Value jvResult = RPC::makeError(
+                        RpcLgrNotFound, "acquiring ledger containing requested index");
                     jvResult[jss::acquiring] = getJson(LedgerFill(*il, &context));
                     return Unexpected(jvResult);
                 }
@@ -459,20 +458,20 @@ getOrAcquireLedger(RPC::JsonContext const& context)
                 if (auto il = context.app.getInboundLedgers().find(*refHash))
                 // NOLINTEND(bugprone-unchecked-optional-access)
                 {
-                    Json::Value jvResult = RPC::make_error(
-                        rpcLGR_NOT_FOUND, "acquiring ledger containing requested index");
+                    json::Value jvResult = RPC::makeError(
+                        RpcLgrNotFound, "acquiring ledger containing requested index");
                     jvResult[jss::acquiring] = il->getJson(0);
                     return Unexpected(jvResult);
                 }
 
                 // Likely the app is shutting down
-                return Unexpected(Json::Value());
+                return Unexpected(json::Value());
             }
 
             neededHash = hashOfSeq(*ledger, ledgerIndex, j);
         }
         XRPL_ASSERT(neededHash, "xrpl::RPC::getOrAcquireLedger : nonzero needed hash");
-        ledgerHash = neededHash ? *neededHash : beast::zero;  // kludge
+        ledgerHash = neededHash ? *neededHash : beast::kZERO;  // kludge
     }
 
     // Try to get the desired ledger
@@ -490,8 +489,7 @@ getOrAcquireLedger(RPC::JsonContext const& context)
     if (auto il = context.app.getInboundLedgers().find(ledgerHash))
         return Unexpected(il->getJson(0));
 
-    return Unexpected(
-        RPC::make_error(rpcNOT_READY, "findCreate failed to return an inbound ledger"));
+    return Unexpected(RPC::makeError(RpcNotReady, "findCreate failed to return an inbound ledger"));
 }
 
 }  // namespace xrpl::RPC
diff --git a/src/xrpld/rpc/detail/RPCLedgerHelpers.h b/src/xrpld/rpc/detail/RPCLedgerHelpers.h
index 6a04ab41d6..faec4ae069 100644
--- a/src/xrpld/rpc/detail/RPCLedgerHelpers.h
+++ b/src/xrpld/rpc/detail/RPCLedgerHelpers.h
@@ -75,25 +75,25 @@ Status
 getLedger(T& ledger, LedgerShortcut shortcut, Context const& context);
 
 /**
- * @brief Looks up a ledger from a request and returns a Json::Value with either
+ * @brief Looks up a ledger from a request and returns a json::Value with either
  * an error or ledger data.
  *
  * This function attempts to find a ledger based on the parameters in the given
- * JsonContext. On success, the ledger pointer is filled and a Json::Value
- * representing the ledger is returned. On failure, a Json::Value describing the
+ * JsonContext. On success, the ledger pointer is filled and a json::Value
+ * representing the ledger is returned. On failure, a json::Value describing the
  * error is returned.
  *
  * @param ledger Reference to a shared pointer to the ledger to be filled.
  * @param context The RPC JsonContext containing request parameters and
  * environment.
- * @return Json::Value containing either the ledger data or an error
+ * @return json::Value containing either the ledger data or an error
  * description.
  */
-Json::Value
+json::Value
 lookupLedger(std::shared_ptr<ReadView const>&, JsonContext const&);
 
 /**
- * @brief Looks up a ledger from a request and fills a Json::Value with ledger
+ * @brief Looks up a ledger from a request and fills a json::Value with ledger
  * data.
  *
  * This function attempts to find a ledger based on the parameters in the given
@@ -104,11 +104,11 @@ lookupLedger(std::shared_ptr<ReadView const>&, JsonContext const&);
  * @param ledger Reference to a shared pointer to the ledger to be filled.
  * @param context The RPC JsonContext containing request parameters and
  * environment.
- * @param result Reference to a Json::Value to be filled with ledger data.
+ * @param result Reference to a json::Value to be filled with ledger data.
  * @return Status indicating success or failure of the operation.
  */
 Status
-lookupLedger(std::shared_ptr<ReadView const>&, JsonContext const&, Json::Value& result);
+lookupLedger(std::shared_ptr<ReadView const>&, JsonContext const&, json::Value& result);
 
 /**
  * @brief Retrieves a ledger from a gRPC request context.
@@ -155,7 +155,7 @@ ledgerFromSpecifier(
  * that it attempts to either retrieve an existing ledger or acquire it if it is
  * not already available, based on the context of the RPC request. It returns an
  * Expected containing either a shared pointer to the requested immutable Ledger
- * object or a Json::Value describing an error. Unlike the other getLedger or
+ * object or a json::Value describing an error. Unlike the other getLedger or
  * lookupLedger functions, which typically fill a provided ledger pointer or
  * result object and return a Status, this function encapsulates both the result
  * and error in a single return value, making it easier to handle success and
@@ -163,11 +163,11 @@ ledgerFromSpecifier(
  *
  * @param context The RPC JsonContext containing request parameters and
  * environment.
- * @return Expected<std::shared_ptr<Ledger const>, Json::Value>
+ * @return Expected<std::shared_ptr<Ledger const>, json::Value>
  *         On success, contains a shared pointer to the requested Ledger.
- *         On failure, contains a Json::Value describing the error.
+ *         On failure, contains a json::Value describing the error.
  */
-Expected<std::shared_ptr<Ledger const>, Json::Value>
+Expected<std::shared_ptr<Ledger const>, json::Value>
 getOrAcquireLedger(RPC::JsonContext const& context);
 
 }  // namespace RPC
diff --git a/src/xrpld/rpc/detail/RPCSub.cpp b/src/xrpld/rpc/detail/RPCSub.cpp
index f102f919c4..56291ab34b 100644
--- a/src/xrpld/rpc/detail/RPCSub.cpp
+++ b/src/xrpld/rpc/detail/RPCSub.cpp
@@ -32,22 +32,22 @@ class RPCSubImp : public RPCSub
 public:
     RPCSubImp(
         InfoSub::Source& source,
-        boost::asio::io_context& io_context,
+        boost::asio::io_context& ioContext,
         JobQueue& jobQueue,
         std::string const& strUrl,
         std::string strUsername,
         std::string strPassword,
         ServiceRegistry& registry)
         : RPCSub(source)
-        , m_io_context(io_context)
-        , m_jobQueue(jobQueue)
-        , mUrl(strUrl)
-        , mUsername(std::move(strUsername))
-        , mPassword(std::move(strPassword))
+        , io_context_(ioContext)
+        , jobQueue_(jobQueue)
+        , url_(strUrl)
+        , username_(std::move(strUsername))
+        , password_(std::move(strPassword))
         , j_(registry.getJournal("RPCSub"))
         , logs_(registry.getLogs())
     {
-        parsedURL pUrl;
+        ParsedUrl pUrl;
 
         if (!parseUrl(pUrl, strUrl))
         {
@@ -55,66 +55,66 @@ public:
         }
         else if (pUrl.scheme == "https")
         {
-            mSSL = true;
+            ssl_ = true;
         }
         else if (pUrl.scheme != "http")
         {
             Throw<std::runtime_error>("Only http and https is supported.");
         }
 
-        mSeq = 1;
+        seq_ = 1;
 
-        mIp = pUrl.domain;
+        ip_ = pUrl.domain;
         if (!pUrl.port)
         {
-            mPort = mSSL ? 443 : 80;
+            port_ = ssl_ ? 443 : 80;
         }
         else
         {
-            mPort = *pUrl.port;
+            port_ = *pUrl.port;
         }
-        mPath = pUrl.path;
+        path_ = pUrl.path;
 
-        JLOG(j_.info()) << "RPCCall::fromNetwork sub: ip=" << mIp << " port=" << mPort
-                        << " ssl= " << (mSSL ? "yes" : "no") << " path='" << mPath << "'";
+        JLOG(j_.info()) << "RPCCall::fromNetwork sub: ip=" << ip_ << " port=" << port_
+                        << " ssl= " << (ssl_ ? "yes" : "no") << " path='" << path_ << "'";
     }
 
     ~RPCSubImp() override = default;
 
     void
-    send(Json::Value const& jvObj, bool broadcast) override
+    send(json::Value const& jvObj, bool broadcast) override
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
 
         auto jm = broadcast ? j_.debug() : j_.info();
         JLOG(jm) << "RPCCall::fromNetwork push: " << jvObj;
 
-        mDeque.emplace_back(mSeq++, jvObj);
+        deque_.emplace_back(seq_++, jvObj);
 
-        if (!mSending)
+        if (!sending_)
         {
             // Start a sending thread.
             JLOG(j_.info()) << "RPCCall::fromNetwork start";
 
-            mSending =
-                m_jobQueue.addJob(jtCLIENT_SUBSCRIBE, "RPCSubSendThr", [this]() { sendThread(); });
+            sending_ =
+                jobQueue_.addJob(JtClientSubscribe, "RPCSubSendThr", [this]() { sendThread(); });
         }
     }
 
     void
     setUsername(std::string const& strUsername) override
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
 
-        mUsername = strUsername;
+        username_ = strUsername;
     }
 
     void
     setPassword(std::string const& strPassword) override
     {
-        std::scoped_lock const sl(mLock);
+        std::scoped_lock const sl(lock_);
 
-        mPassword = strPassword;
+        password_ = strPassword;
     }
 
 private:
@@ -123,25 +123,25 @@ private:
     void
     sendThread()
     {
-        Json::Value jvEvent;
+        json::Value jvEvent;
         bool bSend = false;
 
         do
         {
             {
                 // Obtain the lock to manipulate the queue and change sending.
-                std::scoped_lock const sl(mLock);
+                std::scoped_lock const sl(lock_);
 
-                if (mDeque.empty())
+                if (deque_.empty())
                 {
-                    mSending = false;
+                    sending_ = false;
                     bSend = false;
                 }
                 else
                 {
-                    auto const [seq, env] = mDeque.front();
+                    auto const [seq, env] = deque_.front();
 
-                    mDeque.pop_front();
+                    deque_.pop_front();
 
                     jvEvent = env;
                     jvEvent["seq"] = seq;
@@ -156,18 +156,18 @@ private:
                 // XXX Might not need this in a try.
                 try
                 {
-                    JLOG(j_.info()) << "RPCCall::fromNetwork: " << mIp;
+                    JLOG(j_.info()) << "RPCCall::fromNetwork: " << ip_;
 
                     RPCCall::fromNetwork(
-                        m_io_context,
-                        mIp,
-                        mPort,
-                        mUsername,
-                        mPassword,
-                        mPath,
+                        io_context_,
+                        ip_,
+                        port_,
+                        username_,
+                        password_,
+                        path_,
                         "event",
                         jvEvent,
-                        mSSL,
+                        ssl_,
                         true,
                         logs_);
                 }
@@ -180,22 +180,22 @@ private:
     }
 
 private:
-    boost::asio::io_context& m_io_context;
-    JobQueue& m_jobQueue;
+    boost::asio::io_context& io_context_;
+    JobQueue& jobQueue_;
 
-    std::string mUrl;
-    std::string mIp;
-    std::uint16_t mPort;
-    bool mSSL{false};
-    std::string mUsername;
-    std::string mPassword;
-    std::string mPath;
+    std::string url_;
+    std::string ip_;
+    std::uint16_t port_;
+    bool ssl_{false};
+    std::string username_;
+    std::string password_;
+    std::string path_;
 
-    int mSeq;  // Next id to allocate.
+    int seq_;  // Next id to allocate.
 
-    bool mSending{false};  // Sending thread is active.
+    bool sending_{false};  // Sending thread is active.
 
-    std::deque<std::pair<int, Json::Value>> mDeque;
+    std::deque<std::pair<int, json::Value>> deque_;
 
     beast::Journal const j_;
     Logs& logs_;
@@ -208,9 +208,9 @@ RPCSub::RPCSub(InfoSub::Source& source) : InfoSub(source, Consumer())
 }
 
 std::shared_ptr<RPCSub>
-make_RPCSub(
+makeRPCSub(
     InfoSub::Source& source,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     JobQueue& jobQueue,
     std::string const& strUrl,
     std::string const& strUsername,
@@ -219,7 +219,7 @@ make_RPCSub(
 {
     return std::make_shared<RPCSubImp>(
         std::ref(source),
-        std::ref(io_context),
+        std::ref(ioContext),
         std::ref(jobQueue),
         strUrl,
         strUsername,
diff --git a/src/xrpld/rpc/detail/Role.cpp b/src/xrpld/rpc/detail/Role.cpp
index f28905ba20..998eea15c9 100644
--- a/src/xrpld/rpc/detail/Role.cpp
+++ b/src/xrpld/rpc/detail/Role.cpp
@@ -24,7 +24,7 @@
 namespace xrpl {
 
 bool
-passwordUnrequiredOrSentCorrect(Port const& port, Json::Value const& params)
+passwordUnrequiredOrSentCorrect(Port const& port, json::Value const& params)
 {
     XRPL_ASSERT(
         !(port.admin_nets_v4.empty() && port.admin_nets_v6.empty()),
@@ -77,7 +77,7 @@ ipAllowed(
 }
 
 bool
-isAdmin(Port const& port, Json::Value const& params, beast::IP::Address const& remoteIp)
+isAdmin(Port const& port, json::Value const& params, beast::IP::Address const& remoteIp)
 {
     return ipAllowed(remoteIp, port.admin_nets_v4, port.admin_nets_v6) &&
         passwordUnrequiredOrSentCorrect(port, params);
@@ -87,7 +87,7 @@ Role
 requestRole(
     Role const& required,
     Port const& port,
-    Json::Value const& params,
+    json::Value const& params,
     beast::IP::Endpoint const& remoteIp,
     std::string_view user)
 {
@@ -120,7 +120,7 @@ bool
 isUnlimited(
     Role const& required,
     Port const& port,
-    Json::Value const& params,
+    json::Value const& params,
     beast::IP::Endpoint const& remoteIp,
     std::string const& user)
 {
@@ -252,23 +252,23 @@ forwardedFor(http_request_type const& request)
     // Look for the Forwarded field in the request.
     if (auto it = request.find(boost::beast::http::field::forwarded); it != request.end())
     {
-        auto ascii_tolower = [](char c) -> char {
+        auto asciiTolower = [](char c) -> char {
             return ((static_cast<unsigned>(c) - 65U) < 26) ? c + 'a' - 'A' : c;
         };
 
         // Look for the first (case insensitive) "for="
-        static std::string const forStr{"for="};
+        static std::string const kFOR_STR{"for="};
         char const* found = std::search(
             it->value().begin(),
             it->value().end(),
-            forStr.begin(),
-            forStr.end(),
-            [&ascii_tolower](char c1, char c2) { return ascii_tolower(c1) == ascii_tolower(c2); });
+            kFOR_STR.begin(),
+            kFOR_STR.end(),
+            [&asciiTolower](char c1, char c2) { return asciiTolower(c1) == asciiTolower(c2); });
 
         if (found == it->value().end())
             return {};
 
-        found += forStr.size();
+        found += kFOR_STR.size();
 
         // We found a "for=".  Scan for the end of the IP address.
         std::size_t const pos = [&found, &it]() {
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index 1000df064f..e81fc37cc5 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -114,7 +114,7 @@ authorized(Port const& port, std::map<std::string, std::string> const& h)
         return false;
     std::string strUserPass64 = it->second.substr(6);
     boost::trim(strUserPass64);
-    std::string const strUserPass = base64_decode(strUserPass64);
+    std::string const strUserPass = base64Decode(strUserPass64);
     std::string::size_type const nColon = strUserPass.find(':');
     if (nColon == std::string::npos)
         return false;
@@ -126,34 +126,34 @@ authorized(Port const& port, std::map<std::string, std::string> const& h)
 ServerHandler::ServerHandler(
     ServerHandlerCreator const&,
     Application& app,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     JobQueue& jobQueue,
     NetworkOPs& networkOPs,
     Resource::Manager& resourceManager,
     CollectorManager& cm)
     : app_(app)
-    , m_resourceManager(resourceManager)
-    , m_journal(app_.getJournal("Server"))
-    , m_networkOPs(networkOPs)
-    , m_server(make_Server(*this, io_context, app_.getJournal("Server")))
-    , m_jobQueue(jobQueue)
+    , resourceManager_(resourceManager)
+    , journal_(app_.getJournal("Server"))
+    , networkOPs_(networkOPs)
+    , server_(makeServer(*this, ioContext, app_.getJournal("Server")))
+    , jobQueue_(jobQueue)
 {
     auto const& group(cm.group("rpc"));
-    rpc_requests_ = group->make_counter("requests");
-    rpc_size_ = group->make_event("size");
-    rpc_time_ = group->make_event("time");
+    rpc_requests_ = group->makeCounter("requests");
+    rpc_size_ = group->makeEvent("size");
+    rpc_time_ = group->makeEvent("time");
 }
 
 ServerHandler::~ServerHandler()
 {
-    m_server = nullptr;
+    server_ = nullptr;
 }
 
 void
 ServerHandler::setup(Setup const& setup, beast::Journal journal)
 {
     setup_ = setup;
-    endpoints_ = m_server->ports(setup.ports);
+    endpoints_ = server_->ports(setup.ports);
 
     // fix auto ports
     for (auto& port : setup_.ports)
@@ -179,7 +179,7 @@ ServerHandler::setup(Setup const& setup, beast::Journal journal)
 void
 ServerHandler::stop()
 {
-    m_server->close();
+    server_->close();
     {
         std::unique_lock lock(mutex_);
         condition_.wait(lock, [this] { return stopped_; });
@@ -200,7 +200,7 @@ ServerHandler::onAccept(Session& session, boost::asio::ip::tcp::endpoint endpoin
 
     if ((port.limit != 0) && c >= port.limit)
     {
-        JLOG(m_journal.trace()) << port.name << " is full; dropping " << endpoint;
+        JLOG(journal_.trace()) << port.name << " is full; dropping " << endpoint;
         return false;
     }
 
@@ -212,16 +212,16 @@ ServerHandler::onHandoff(
     Session& session,
     std::unique_ptr<stream_type>&& bundle,
     http_request_type&& request,
-    boost::asio::ip::tcp::endpoint const& remote_address)
+    boost::asio::ip::tcp::endpoint const& remoteAddress)
 {
     using namespace boost::beast;
     auto const& p{session.port().protocol};
-    bool const is_ws{
+    bool const isWs{
         p.count("ws") > 0 || p.count("ws2") > 0 || p.count("wss") > 0 || p.count("wss2") > 0};
 
     if (websocket::is_upgrade(request))
     {
-        if (!is_ws)
+        if (!isWs)
             return statusRequestResponse(request, http::status::unauthorized);
 
         std::shared_ptr<WSSession> ws;
@@ -231,19 +231,18 @@ ServerHandler::onHandoff(
         }
         catch (std::exception const& e)
         {
-            JLOG(m_journal.error()) << "Exception upgrading websocket: " << e.what() << "\n";
+            JLOG(journal_.error()) << "Exception upgrading websocket: " << e.what() << "\n";
             return statusRequestResponse(request, http::status::internal_server_error);
         }
 
-        auto is{std::make_shared<WSInfoSub>(m_networkOPs, ws)};
-        auto const beast_remote_address = beast::IPAddressConversion::from_asio(remote_address);
+        auto is{std::make_shared<WSInfoSub>(networkOPs_, ws)};
+        auto const beastRemoteAddress = beast::IPAddressConversion::fromAsio(remoteAddress);
         is->getConsumer() = requestInboundEndpoint(
-            m_resourceManager,
-            beast_remote_address,
-            requestRole(
-                Role::GUEST, session.port(), Json::Value(), beast_remote_address, is->user()),
+            resourceManager_,
+            beastRemoteAddress,
+            requestRole(Role::GUEST, session.port(), json::Value(), beastRemoteAddress, is->user()),
             is->user(),
-            is->forwarded_for());
+            is->forwardedFor());
         ws->appDefined = std::move(is);
         ws->run();
 
@@ -253,23 +252,23 @@ ServerHandler::onHandoff(
     }
 
     if (bundle && p.count("peer") > 0)
-        return app_.getOverlay().onHandoff(std::move(bundle), std::move(request), remote_address);
+        return app_.getOverlay().onHandoff(std::move(bundle), std::move(request), remoteAddress);
 
-    if (is_ws && isStatusRequest(request))
+    if (isWs && isStatusRequest(request))
         return statusResponse(request);
 
     // Otherwise pass to legacy onRequest or websocket
     return {};
 }
 
-static inline Json::Output
+static inline json::Output
 makeOutput(Session& session)
 {
     return [&](boost::beast::string_view const& b) { session.write(b.data(), b.size()); };
 }
 
 static std::map<std::string, std::string>
-build_map(boost::beast::http::fields const& h)
+buildMap(boost::beast::http::fields const& h)
 {
     std::map<std::string, std::string> c;
     for (auto const& e : h)
@@ -286,7 +285,7 @@ build_map(boost::beast::http::fields const& h)
 
 template <class ConstBufferSequence>
 static std::string
-buffers_to_string(ConstBufferSequence const& bs)
+buffersToString(ConstBufferSequence const& bs)
 {
     using boost::asio::buffer_size;
     std::string s;
@@ -304,28 +303,28 @@ ServerHandler::onRequest(Session& session)
     // Make sure RPC is enabled on the port
     if (session.port().protocol.count("http") == 0 && session.port().protocol.count("https") == 0)
     {
-        HTTPReply(403, "Forbidden", makeOutput(session), app_.getJournal("RPC"));
+        httpReply(403, "Forbidden", makeOutput(session), app_.getJournal("RPC"));
         session.close(true);
         return;
     }
 
     // Check user/password authorization
-    if (!authorized(session.port(), build_map(session.request())))
+    if (!authorized(session.port(), buildMap(session.request())))
     {
-        HTTPReply(403, "Forbidden", makeOutput(session), app_.getJournal("RPC"));
+        httpReply(403, "Forbidden", makeOutput(session), app_.getJournal("RPC"));
         session.close(true);
         return;
     }
 
     std::shared_ptr<Session> const detachedSession = session.detach();
-    auto const postResult = m_jobQueue.postCoro(
-        jtCLIENT_RPC, "RPC-Client", [this, detachedSession](std::shared_ptr<JobQueue::Coro> coro) {
+    auto const postResult = jobQueue_.postCoro(
+        JtClientRpc, "RPC-Client", [this, detachedSession](std::shared_ptr<JobQueue::Coro> coro) {
             processSession(detachedSession, coro);
         });
     if (postResult == nullptr)
     {
         // The coroutine was rejected, probably because we're shutting down.
-        HTTPReply(503, "Service Unavailable", makeOutput(*detachedSession), app_.getJournal("RPC"));
+        httpReply(503, "Service Unavailable", makeOutput(*detachedSession), app_.getJournal("RPC"));
         detachedSession->close(true);
         return;
     }
@@ -336,28 +335,29 @@ ServerHandler::onWSMessage(
     std::shared_ptr<WSSession> session,
     std::vector<boost::asio::const_buffer> const& buffers)
 {
-    Json::Value jv;
+    json::Value jv;
     auto const size = boost::asio::buffer_size(buffers);
-    if (size > RPC::Tuning::maxRequestSize || !Json::Reader{}.parse(jv, buffers) || !jv.isObject())
+    if (size > RPC::Tuning::kMAX_REQUEST_SIZE || !json::Reader{}.parse(jv, buffers) ||
+        !jv.isObject())
     {
-        Json::Value jvResult(Json::objectValue);
+        json::Value jvResult(json::ObjectValue);
         jvResult[jss::type] = jss::error;
         jvResult[jss::error] = "jsonInvalid";
-        jvResult[jss::value] = buffers_to_string(buffers);
+        jvResult[jss::value] = buffersToString(buffers);
         boost::beast::multi_buffer sb;
-        Json::stream(jvResult, [&sb](auto const p, auto const n) {
+        json::stream(jvResult, [&sb](auto const p, auto const n) {
             sb.commit(boost::asio::buffer_copy(sb.prepare(n), boost::asio::buffer(p, n)));
         });
-        JLOG(m_journal.trace()) << "Websocket sending '" << jvResult << "'";
+        JLOG(journal_.trace()) << "Websocket sending '" << jvResult << "'";
         session->send(std::make_shared<StreambufWSMsg<decltype(sb)>>(std::move(sb)));
         session->complete();
         return;
     }
 
-    JLOG(m_journal.trace()) << "Websocket received '" << jv << "'";
+    JLOG(journal_.trace()) << "Websocket received '" << jv << "'";
 
-    auto const postResult = m_jobQueue.postCoro(
-        jtCLIENT_WEBSOCKET,
+    auto const postResult = jobQueue_.postCoro(
+        JtClientWebsocket,
         "WS-Client",
         [this, session, jv = std::move(jv)](std::shared_ptr<JobQueue::Coro> const& coro) {
             auto const jr = this->processSession(session, coro, jv);
@@ -394,7 +394,7 @@ ServerHandler::onStopped(Server&)
 
 template <class T>
 void
-logDuration(Json::Value const& request, T const& duration, beast::Journal& journal)
+logDuration(json::Value const& request, T const& duration, beast::Journal& journal)
 {
     using namespace std::chrono_literals;
     auto const level = [&]() {
@@ -410,28 +410,28 @@ logDuration(Json::Value const& request, T const& duration, beast::Journal& journ
                 << " microseconds. request = " << request;
 }
 
-Json::Value
+json::Value
 ServerHandler::processSession(
     std::shared_ptr<WSSession> const& session,
     std::shared_ptr<JobQueue::Coro> const& coro,
-    Json::Value const& jv)
+    json::Value const& jv)
 {
     auto is = std::static_pointer_cast<WSInfoSub>(session->appDefined);
-    if (is->getConsumer().disconnect(m_journal))
+    if (is->getConsumer().disconnect(journal_))
     {
         session->close({boost::beast::websocket::policy_error, "threshold exceeded"});
         // FIX: This rpcError is not delivered since the session
         // was just closed.
-        return rpcError(rpcSLOW_DOWN);
+        return rpcError(RpcSlowDown);
     }
 
     // Requests without "command" are invalid.
-    Json::Value jr(Json::objectValue);
-    Resource::Charge loadType = Resource::feeReferenceRPC;
+    json::Value jr(json::ObjectValue);
+    Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
     try
     {
         auto apiVersion = RPC::getAPIVersionNumber(jv, app_.config().BETA_RPC_API);
-        if (apiVersion == RPC::apiInvalidVersion ||
+        if (apiVersion == RPC::kAPI_INVALID_VERSION ||
             (!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 +440,8 @@ ServerHandler::processSession(
         {
             jr[jss::type] = jss::response;
             jr[jss::status] = jss::error;
-            jr[jss::error] = apiVersion == RPC::apiInvalidVersion ? jss::invalid_API_version
-                                                                  : jss::missingCommand;
+            jr[jss::error] = apiVersion == RPC::kAPI_INVALID_VERSION ? jss::invalid_API_version
+                                                                     : jss::missingCommand;
             jr[jss::request] = jv;
             if (jv.isMember(jss::id))
                 jr[jss::id] = jv[jss::id];
@@ -452,7 +452,7 @@ ServerHandler::processSession(
             if (jv.isMember(jss::api_version))
                 jr[jss::api_version] = jv[jss::api_version];
 
-            is->getConsumer().charge(Resource::feeMalformedRPC);
+            is->getConsumer().charge(Resource::kFEE_MALFORMED_RPC);
             return jr;
         }
 
@@ -464,12 +464,12 @@ ServerHandler::processSession(
             required,
             session->port(),
             jv,
-            beast::IP::from_asio(session->remote_endpoint().address()),
+            beast::IP::fromAsio(session->remoteEndpoint().address()),
             is->user());
         if (Role::FORBID == role)
         {
-            loadType = Resource::feeMalformedRPC;
-            jr[jss::result] = rpcError(rpcFORBIDDEN);
+            loadType = Resource::kFEE_MALFORMED_RPC;
+            jr[jss::result] = rpcError(RpcForbidden);
         }
         else
         {
@@ -485,20 +485,20 @@ ServerHandler::processSession(
                  .infoSub = is,
                  .apiVersion = apiVersion},
                 jv,
-                {.user = is->user(), .forwardedFor = is->forwarded_for()}};
+                {.user = is->user(), .forwardedFor = is->forwardedFor()}};
 
             auto start = std::chrono::system_clock::now();
             RPC::doCommand(context, jr[jss::result]);
             auto end = std::chrono::system_clock::now();
-            logDuration(jv, end - start, m_journal);
+            logDuration(jv, end - start, journal_);
         }
     }
     catch (std::exception const& ex)
     {
         // LCOV_EXCL_START
-        jr[jss::result] = RPC::make_error(rpcINTERNAL);
-        JLOG(m_journal.error()) << "Exception while processing WS: " << ex.what() << "\n"
-                                << "Input JSON: " << Json::Compact{Json::Value{jv}};
+        jr[jss::result] = RPC::makeError(RpcInternal);
+        JLOG(journal_.error()) << "Exception while processing WS: " << ex.what() << "\n"
+                               << "Input JSON: " << json::Compact{json::Value{jv}};
         // LCOV_EXCL_STOP
     }
 
@@ -520,14 +520,14 @@ ServerHandler::processSession(
 
         if (rq.isObject())
         {
-            if (rq.isMember(jss::passphrase.c_str()))
-                rq[jss::passphrase.c_str()] = "<masked>";
-            if (rq.isMember(jss::secret.c_str()))
-                rq[jss::secret.c_str()] = "<masked>";
-            if (rq.isMember(jss::seed.c_str()))
-                rq[jss::seed.c_str()] = "<masked>";
-            if (rq.isMember(jss::seed_hex.c_str()))
-                rq[jss::seed_hex.c_str()] = "<masked>";
+            if (rq.isMember(jss::passphrase.cStr()))
+                rq[jss::passphrase.cStr()] = "<masked>";
+            if (rq.isMember(jss::secret.cStr()))
+                rq[jss::secret.cStr()] = "<masked>";
+            if (rq.isMember(jss::seed.cStr()))
+                rq[jss::seed.cStr()] = "<masked>";
+            if (rq.isMember(jss::seed_hex.cStr()))
+                rq[jss::seed_hex.cStr()] = "<masked>";
         }
 
         jr[jss::request] = rq;
@@ -560,8 +560,8 @@ ServerHandler::processSession(
 {
     processRequest(
         session->port(),
-        buffers_to_string(session->request().body().data()),
-        session->remoteAddress().at_port(0),
+        buffersToString(session->request().body().data()),
+        session->remoteAddress().atPort(0),
         makeOutput(*session),
         coro,
         forwardedFor(session->request()),
@@ -572,7 +572,7 @@ ServerHandler::processSession(
             return boost::beast::string_view{};
         }());
 
-    if (beast::rfc2616::is_keep_alive(session->request()))
+    if (beast::rfc2616::isKeepAlive(session->request()))
     {
         session->complete();
     }
@@ -582,21 +582,21 @@ ServerHandler::processSession(
     }
 }
 
-static Json::Value
-make_json_error(Json::Int code, Json::Value&& message)
+static json::Value
+makeJsonError(json::Int code, json::Value&& message)
 {
-    Json::Value sub{Json::objectValue};
+    json::Value sub{json::ObjectValue};
     sub["code"] = code;
     sub["message"] = std::move(message);
-    Json::Value r{Json::objectValue};
+    json::Value r{json::ObjectValue};
     r["error"] = sub;
     return r;
 }
 
-Json::Int constexpr method_not_found = -32601;
-Json::Int constexpr server_overloaded = -32604;
-Json::Int constexpr forbidden = -32605;
-Json::Int constexpr wrong_version = -32606;
+json::Int constexpr kMETHOD_NOT_FOUND = -32601;
+json::Int constexpr kSERVER_OVERLOADED = -32604;
+json::Int constexpr kFORBIDDEN = -32605;
+json::Int constexpr kWRONG_VERSION = -32606;
 
 void
 ServerHandler::processRequest(
@@ -610,13 +610,13 @@ ServerHandler::processRequest(
 {
     auto rpcJ = app_.getJournal("RPC");
 
-    Json::Value jsonOrig;
+    json::Value jsonOrig;
     {
-        Json::Reader reader;
-        if ((request.size() > RPC::Tuning::maxRequestSize) || !reader.parse(request, jsonOrig) ||
+        json::Reader reader;
+        if ((request.size() > RPC::Tuning::kMAX_REQUEST_SIZE) || !reader.parse(request, jsonOrig) ||
             !jsonOrig || !jsonOrig.isObject())
         {
-            HTTPReply(
+            httpReply(
                 400,
                 "Unable to parse request: " + reader.getFormattedErrorMessages(),
                 output,
@@ -632,51 +632,51 @@ ServerHandler::processRequest(
         batch = true;
         if (!jsonOrig.isMember(jss::params) || !jsonOrig[jss::params].isArray())
         {
-            HTTPReply(400, "Malformed batch request", output, rpcJ);
+            httpReply(400, "Malformed batch request", output, rpcJ);
             return;
         }
         size = jsonOrig[jss::params].size();
     }
 
-    Json::Value reply(batch ? Json::arrayValue : Json::objectValue);
+    json::Value reply(batch ? json::ArrayValue : json::ObjectValue);
     auto const start(std::chrono::high_resolution_clock::now());
     for (unsigned i = 0; i < size; ++i)
     {
-        Json::Value const& jsonRPC = batch ? jsonOrig[jss::params][i] : jsonOrig;
+        json::Value const& jsonRPC = batch ? jsonOrig[jss::params][i] : jsonOrig;
 
         if (!jsonRPC.isObject())
         {
-            Json::Value r(Json::objectValue);
+            json::Value r(json::ObjectValue);
             r[jss::request] = jsonRPC;
-            r[jss::error] = make_json_error(method_not_found, "Method not found");
+            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "Method not found");
             reply.append(r);
             continue;
         }
 
-        unsigned apiVersion = RPC::apiVersionIfUnspecified;
+        unsigned apiVersion = RPC::kAPI_VERSION_IF_UNSPECIFIED;
         if (jsonRPC.isMember(jss::params) && jsonRPC[jss::params].isArray() &&
             jsonRPC[jss::params].size() > 0 && jsonRPC[jss::params][0u].isObject())
         {
             apiVersion = RPC::getAPIVersionNumber(
-                jsonRPC[jss::params][Json::UInt(0)], app_.config().BETA_RPC_API);
+                jsonRPC[jss::params][json::UInt(0)], app_.config().BETA_RPC_API);
         }
 
-        if (apiVersion == RPC::apiVersionIfUnspecified && batch)
+        if (apiVersion == RPC::kAPI_VERSION_IF_UNSPECIFIED && batch)
         {
             // for batch request, api_version may be at a different level
             apiVersion = RPC::getAPIVersionNumber(jsonRPC, app_.config().BETA_RPC_API);
         }
 
-        if (apiVersion == RPC::apiInvalidVersion)
+        if (apiVersion == RPC::kAPI_INVALID_VERSION)
         {
             if (!batch)
             {
-                HTTPReply(400, jss::invalid_API_version.c_str(), output, rpcJ);
+                httpReply(400, jss::invalid_API_version.cStr(), output, rpcJ);
                 return;
             }
-            Json::Value r(Json::objectValue);
+            json::Value r(json::ObjectValue);
             r[jss::request] = jsonRPC;
-            r[jss::error] = make_json_error(wrong_version, jss::invalid_API_version.c_str());
+            r[jss::error] = makeJsonError(kWRONG_VERSION, jss::invalid_API_version.cStr());
             reply.append(r);
             continue;
         }
@@ -691,34 +691,34 @@ ServerHandler::processRequest(
         }
 
         if (jsonRPC.isMember(jss::params) && jsonRPC[jss::params].isArray() &&
-            jsonRPC[jss::params].size() > 0 && jsonRPC[jss::params][Json::UInt(0)].isObjectOrNull())
+            jsonRPC[jss::params].size() > 0 && jsonRPC[jss::params][json::UInt(0)].isObjectOrNull())
         {
             role = requestRole(
-                required, port, jsonRPC[jss::params][Json::UInt(0)], remoteIPAddress, user);
+                required, port, jsonRPC[jss::params][json::UInt(0)], remoteIPAddress, user);
         }
         else
         {
-            role = requestRole(required, port, Json::objectValue, remoteIPAddress, user);
+            role = requestRole(required, port, json::ObjectValue, remoteIPAddress, user);
         }
 
         Resource::Consumer usage;
         if (isUnlimited(role))
         {
-            usage = m_resourceManager.newUnlimitedEndpoint(remoteIPAddress);
+            usage = resourceManager_.newUnlimitedEndpoint(remoteIPAddress);
         }
         else
         {
-            usage = m_resourceManager.newInboundEndpoint(
+            usage = resourceManager_.newInboundEndpoint(
                 remoteIPAddress, role == Role::PROXY, forwardedFor);
-            if (usage.disconnect(m_journal))
+            if (usage.disconnect(journal_))
             {
                 if (!batch)
                 {
-                    HTTPReply(503, "Server is overloaded", output, rpcJ);
+                    httpReply(503, "Server is overloaded", output, rpcJ);
                     return;
                 }
-                Json::Value r = jsonRPC;
-                r[jss::error] = make_json_error(server_overloaded, "Server is overloaded");
+                json::Value r = jsonRPC;
+                r[jss::error] = makeJsonError(kSERVER_OVERLOADED, "Server is overloaded");
                 reply.append(r);
                 continue;
             }
@@ -726,43 +726,43 @@ ServerHandler::processRequest(
 
         if (role == Role::FORBID)
         {
-            usage.charge(Resource::feeMalformedRPC);
+            usage.charge(Resource::kFEE_MALFORMED_RPC);
             if (!batch)
             {
-                HTTPReply(403, "Forbidden", output, rpcJ);
+                httpReply(403, "Forbidden", output, rpcJ);
                 return;
             }
-            Json::Value r = jsonRPC;
-            r[jss::error] = make_json_error(forbidden, "Forbidden");
+            json::Value r = jsonRPC;
+            r[jss::error] = makeJsonError(kFORBIDDEN, "Forbidden");
             reply.append(r);
             continue;
         }
 
         if (!jsonRPC.isMember(jss::method) || jsonRPC[jss::method].isNull())
         {
-            usage.charge(Resource::feeMalformedRPC);
+            usage.charge(Resource::kFEE_MALFORMED_RPC);
             if (!batch)
             {
-                HTTPReply(400, "Null method", output, rpcJ);
+                httpReply(400, "Null method", output, rpcJ);
                 return;
             }
-            Json::Value r = jsonRPC;
-            r[jss::error] = make_json_error(method_not_found, "Null method");
+            json::Value r = jsonRPC;
+            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "Null method");
             reply.append(r);
             continue;
         }
 
-        Json::Value const& method = jsonRPC[jss::method];
+        json::Value const& method = jsonRPC[jss::method];
         if (!method.isString())
         {
-            usage.charge(Resource::feeMalformedRPC);
+            usage.charge(Resource::kFEE_MALFORMED_RPC);
             if (!batch)
             {
-                HTTPReply(400, "method is not string", output, rpcJ);
+                httpReply(400, "method is not string", output, rpcJ);
                 return;
             }
-            Json::Value r = jsonRPC;
-            r[jss::error] = make_json_error(method_not_found, "method is not string");
+            json::Value r = jsonRPC;
+            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "method is not string");
             reply.append(r);
             continue;
         }
@@ -770,14 +770,14 @@ ServerHandler::processRequest(
         std::string const strMethod = method.asString();
         if (strMethod.empty())
         {
-            usage.charge(Resource::feeMalformedRPC);
+            usage.charge(Resource::kFEE_MALFORMED_RPC);
             if (!batch)
             {
-                HTTPReply(400, "method is empty", output, rpcJ);
+                httpReply(400, "method is empty", output, rpcJ);
                 return;
             }
-            Json::Value r = jsonRPC;
-            r[jss::error] = make_json_error(method_not_found, "method is empty");
+            json::Value r = jsonRPC;
+            r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "method is empty");
             reply.append(r);
             continue;
         }
@@ -788,18 +788,18 @@ ServerHandler::processRequest(
         //
         // Otherwise, that field must be an array of length 1 (why?)
         // and we take that first entry and validate that it's an object.
-        Json::Value params;
+        json::Value params;
         if (!batch)
         {
             params = jsonRPC[jss::params];
             if (!params)
             {
-                params = Json::Value(Json::objectValue);
+                params = json::Value(json::ObjectValue);
             }
             else if (!params.isArray() || params.size() != 1)
             {
-                usage.charge(Resource::feeMalformedRPC);
-                HTTPReply(400, "params unparsable", output, rpcJ);
+                usage.charge(Resource::kFEE_MALFORMED_RPC);
+                httpReply(400, "params unparsable", output, rpcJ);
                 return;
             }
             else
@@ -807,8 +807,8 @@ ServerHandler::processRequest(
                 params = std::move(params[0u]);
                 if (!params.isObjectOrNull())
                 {
-                    usage.charge(Resource::feeMalformedRPC);
-                    HTTPReply(400, "params unparsable", output, rpcJ);
+                    usage.charge(Resource::kFEE_MALFORMED_RPC);
+                    httpReply(400, "params unparsable", output, rpcJ);
                     return;
                 }
             }
@@ -823,15 +823,15 @@ ServerHandler::processRequest(
         {
             if (!params[jss::ripplerpc].isString())
             {
-                usage.charge(Resource::feeMalformedRPC);
+                usage.charge(Resource::kFEE_MALFORMED_RPC);
                 if (!batch)
                 {
-                    HTTPReply(400, "ripplerpc is not a string", output, rpcJ);
+                    httpReply(400, "ripplerpc is not a string", output, rpcJ);
                     return;
                 }
 
-                Json::Value r = jsonRPC;
-                r[jss::error] = make_json_error(method_not_found, "ripplerpc is not a string");
+                json::Value r = jsonRPC;
+                r[jss::error] = makeJsonError(kMETHOD_NOT_FOUND, "ripplerpc is not a string");
                 reply.append(r);
                 continue;
             }
@@ -840,7 +840,7 @@ ServerHandler::processRequest(
 
         /**
          * Clear header-assigned values if not positively identified from a
-         * secure_gateway.
+         * secureGateway.
          */
         if (role != Role::IDENTIFIED && role != Role::PROXY)
         {
@@ -848,19 +848,19 @@ ServerHandler::processRequest(
             user.remove_suffix(user.size());
         }
 
-        JLOG(m_journal.debug()) << "Query: " << strMethod << params;
+        JLOG(journal_.debug()) << "Query: " << strMethod << params;
 
         // Provide the JSON-RPC method as the field "command" in the request.
         params[jss::command] = strMethod;
-        JLOG(m_journal.trace()) << "doRpcCommand:" << strMethod << ":" << params;
+        JLOG(journal_.trace()) << "doRpcCommand:" << strMethod << ":" << params;
 
-        Resource::Charge loadType = Resource::feeReferenceRPC;
+        Resource::Charge loadType = Resource::kFEE_REFERENCE_RPC;
 
         RPC::JsonContext context{
-            {.j = m_journal,
+            {.j = journal_,
              .app = app_,
              .loadType = loadType,
-             .netOps = m_networkOPs,
+             .netOps = networkOPs_,
              .ledgerMaster = app_.getLedgerMaster(),
              .consumer = usage,
              .role = role,
@@ -869,7 +869,7 @@ ServerHandler::processRequest(
              .apiVersion = apiVersion},
             params,
             {.user = user, .forwardedFor = forwardedFor}};
-        Json::Value result;
+        json::Value result;
 
         auto start = std::chrono::system_clock::now();
 
@@ -880,22 +880,22 @@ ServerHandler::processRequest(
         catch (std::exception const& ex)
         {
             // LCOV_EXCL_START
-            result = RPC::make_error(rpcINTERNAL);
-            JLOG(m_journal.error())
+            result = RPC::makeError(RpcInternal);
+            JLOG(journal_.error())
                 << "Internal error : " << ex.what()
-                << " when processing request: " << Json::Compact{Json::Value{params}};
+                << " when processing request: " << json::Compact{json::Value{params}};
             // LCOV_EXCL_STOP
         }
 
         auto end = std::chrono::system_clock::now();
 
-        logDuration(params, end - start, m_journal);
+        logDuration(params, end - start, journal_);
 
         usage.charge(loadType);
         if (usage.warn())
             result[jss::warning] = jss::load;
 
-        Json::Value r(Json::objectValue);
+        json::Value r(json::ObjectValue);
         if (ripplerpc >= "2.0")
         {
             if (result.isMember(jss::error))
@@ -904,7 +904,7 @@ ServerHandler::processRequest(
                 result["code"] = result[jss::error_code];
                 result["message"] = result[jss::error_message];
                 result.removeMember(jss::error_message);
-                JLOG(m_journal.debug())
+                JLOG(journal_.debug())
                     << "rpcError: " << result[jss::error] << ": " << result[jss::error_message];
                 r[jss::error] = std::move(result);
             }
@@ -924,20 +924,20 @@ ServerHandler::processRequest(
 
                 if (rq.isObject())
                 {  // But mask potentially sensitive information.
-                    if (rq.isMember(jss::passphrase.c_str()))
-                        rq[jss::passphrase.c_str()] = "<masked>";
-                    if (rq.isMember(jss::secret.c_str()))
-                        rq[jss::secret.c_str()] = "<masked>";
-                    if (rq.isMember(jss::seed.c_str()))
-                        rq[jss::seed.c_str()] = "<masked>";
-                    if (rq.isMember(jss::seed_hex.c_str()))
-                        rq[jss::seed_hex.c_str()] = "<masked>";
+                    if (rq.isMember(jss::passphrase.cStr()))
+                        rq[jss::passphrase.cStr()] = "<masked>";
+                    if (rq.isMember(jss::secret.cStr()))
+                        rq[jss::secret.cStr()] = "<masked>";
+                    if (rq.isMember(jss::seed.cStr()))
+                        rq[jss::seed.cStr()] = "<masked>";
+                    if (rq.isMember(jss::seed_hex.cStr()))
+                        rq[jss::seed_hex.cStr()] = "<masked>";
                 }
 
                 result[jss::status] = jss::error;
                 result[jss::request] = rq;
 
-                JLOG(m_journal.debug())
+                JLOG(journal_.debug())
                     << "rpcError: " << result[jss::error] << ": " << result[jss::error_message];
             }
             else
@@ -985,7 +985,7 @@ ServerHandler::processRequest(
                 reply[jss::error][jss::error_code].isInt())
             {
                 int const errCode = reply[jss::error][jss::error_code].asInt();
-                return RPC::error_code_http_status(static_cast<error_code_i>(errCode));
+                return RPC::errorCodeHttpStatus(static_cast<ErrorCodeI>(errCode));
             }
         }
         // Return OK.
@@ -1002,20 +1002,20 @@ ServerHandler::processRequest(
 
     response += '\n';
 
-    if (auto stream = m_journal.debug())
+    if (auto stream = journal_.debug())
     {
-        static int const maxSize = 10000;
-        if (response.size() <= maxSize)
+        static int const kMAX_SIZE = 10000;
+        if (response.size() <= kMAX_SIZE)
         {
             stream << "Reply: " << response;
         }
         else
         {
-            stream << "Reply: " << response.substr(0, maxSize);
+            stream << "Reply: " << response.substr(0, kMAX_SIZE);
         }
     }
 
-    HTTPReply(httpStatus, response, output, rpcJ);
+    httpReply(httpStatus, response, output, rpcJ);
 }
 
 //------------------------------------------------------------------------------
@@ -1063,12 +1063,11 @@ ServerHandler::Setup::makeContexts()
         {
             if (p.ssl_key.empty() && p.ssl_cert.empty() && p.ssl_chain.empty())
             {
-                p.context = make_SSLContext(p.ssl_ciphers);
+                p.context = makeSslContext(p.ssl_ciphers);
             }
             else
             {
-                p.context =
-                    make_SSLContextAuthed(p.ssl_key, p.ssl_cert, p.ssl_chain, p.ssl_ciphers);
+                p.context = makeSslContextAuthed(p.ssl_key, p.ssl_cert, p.ssl_chain, p.ssl_ciphers);
             }
         }
         else
@@ -1080,7 +1079,7 @@ ServerHandler::Setup::makeContexts()
 }
 
 static Port
-to_Port(ParsedPort const& parsed, std::ostream& log)
+toPort(ParsedPort const& parsed, std::ostream& log)
 {
     Port p;
     p.name = parsed.name;
@@ -1126,7 +1125,7 @@ to_Port(ParsedPort const& parsed, std::ostream& log)
 }
 
 static std::vector<Port>
-parse_Ports(Config const& config, std::ostream& log)
+parsePorts(Config const& config, std::ostream& log)
 {
     std::vector<Port> result;
 
@@ -1137,7 +1136,7 @@ parse_Ports(Config const& config, std::ostream& log)
     }
 
     ParsedPort common;
-    parse_Port(common, config["server"], log);
+    parsePort(common, config["server"], log);
 
     auto const& names = config.section("server").values();
     result.reserve(names.size());
@@ -1155,8 +1154,8 @@ parse_Ports(Config const& config, std::ostream& log)
             continue;
 
         ParsedPort parsed = common;
-        parse_Port(parsed, config[name], log);
-        result.push_back(to_Port(parsed, log));
+        parsePort(parsed, config[name], log);
+        result.push_back(toPort(parsed, log));
     }
 
     if (config.standalone())
@@ -1200,7 +1199,7 @@ parse_Ports(Config const& config, std::ostream& log)
 
 // Fill out the client portion of the Setup
 static void
-setup_Client(ServerHandler::Setup& setup)
+setupClient(ServerHandler::Setup& setup)
 {
     decltype(setup.ports)::const_iterator iter;
     for (iter = setup.ports.cbegin(); iter != setup.ports.cend(); ++iter)
@@ -1211,7 +1210,7 @@ setup_Client(ServerHandler::Setup& setup)
     if (iter == setup.ports.cend())
         return;
     setup.client.secure = iter->protocol.count("https") > 0;
-    if (beast::IP::is_unspecified(iter->ip))
+    if (beast::IP::isUnspecified(iter->ip))
     {
         // VFALCO HACK! to make localhost work
         setup.client.ip = iter->ip.is_v6() ? "::1" : "127.0.0.1";
@@ -1229,7 +1228,7 @@ setup_Client(ServerHandler::Setup& setup)
 
 // Fill out the overlay portion of the Setup
 static void
-setup_Overlay(ServerHandler::Setup& setup)
+setupOverlay(ServerHandler::Setup& setup)
 {
     auto const iter = std::ranges::find_if(
         setup.ports, [](Port const& port) { return port.protocol.count("peer") != 0; });
@@ -1242,21 +1241,21 @@ setup_Overlay(ServerHandler::Setup& setup)
 }
 
 ServerHandler::Setup
-setup_ServerHandler(Config const& config, std::ostream& log)
+setupServerHandler(Config const& config, std::ostream& log)
 {
     ServerHandler::Setup setup;
-    setup.ports = parse_Ports(config, log);
+    setup.ports = parsePorts(config, log);
 
-    setup_Client(setup);
-    setup_Overlay(setup);
+    setupClient(setup);
+    setupOverlay(setup);
 
     return setup;
 }
 
 std::unique_ptr<ServerHandler>
-make_ServerHandler(
+makeServerHandler(
     Application& app,
-    boost::asio::io_context& io_context,
+    boost::asio::io_context& ioContext,
     JobQueue& jobQueue,
     NetworkOPs& networkOPs,
     Resource::Manager& resourceManager,
@@ -1265,7 +1264,7 @@ make_ServerHandler(
     return std::make_unique<ServerHandler>(
         ServerHandler::ServerHandlerCreator(),
         app,
-        io_context,
+        ioContext,
         jobQueue,
         networkOPs,
         resourceManager,
diff --git a/src/xrpld/rpc/detail/Status.cpp b/src/xrpld/rpc/detail/Status.cpp
index c622b9a7e2..58d2f8cb80 100644
--- a/src/xrpld/rpc/detail/Status.cpp
+++ b/src/xrpld/rpc/detail/Status.cpp
@@ -17,7 +17,7 @@ Status::codeString() const
     if (!*this)
         return "";
 
-    if (type_ == Type::none)
+    if (type_ == Type::None)
         return std::to_string(code_);
 
     if (type_ == Status::Type::TER)
@@ -30,11 +30,11 @@ Status::codeString() const
         return s1 + ": " + s2;
     }
 
-    if (type_ == Status::Type::error_code_i)
+    if (type_ == Status::Type::ErrorCodeI)
     {
-        auto info = get_error_info(toErrorCode());
+        auto info = getErrorInfo(toErrorCode());
         std::ostringstream sStr;
-        sStr << info.token.c_str() << ": " << info.message.c_str();
+        sStr << info.token.cStr() << ": " << info.message.cStr();
         return sStr.str();
     }
 
@@ -45,7 +45,7 @@ Status::codeString() const
 }
 
 void
-Status::fillJson(Json::Value& value)
+Status::fillJson(json::Value& value)
 {
     if (!*this)
         return;
diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp
index 284279fa3f..c6ceeee65f 100644
--- a/src/xrpld/rpc/detail/TransactionSign.cpp
+++ b/src/xrpld/rpc/detail/TransactionSign.cpp
@@ -116,7 +116,7 @@ public:
     getSigner() const
     {
         if (multiSigningAcctID_ == nullptr)
-            LogicError("Accessing unknown SigningForParams::getSigner()");
+            logicError("Accessing unknown SigningForParams::getSigner()");
         return *multiSigningAcctID_;
     }
 
@@ -124,7 +124,7 @@ public:
     getPublicKey() const
     {
         if (!multiSignPublicKey_)
-            LogicError("Accessing unknown SigningForParams::getPublicKey()");
+            logicError("Accessing unknown SigningForParams::getPublicKey()");
         return *multiSignPublicKey_;
     }
 
@@ -161,7 +161,7 @@ public:
 
 //------------------------------------------------------------------------------
 
-static error_code_i
+static ErrorCodeI
 acctMatchesPubKey(
     std::shared_ptr<SLE const> accountState,
     AccountID const& accountID,
@@ -175,8 +175,8 @@ acctMatchesPubKey(
     if (!accountState)
     {
         if (isMasterKey)
-            return rpcSUCCESS;
-        return rpcBAD_SECRET;
+            return RpcSuccess;
+        return RpcBadSecret;
     }
 
     // If we *can* get to the accountRoot, check for MASTER_DISABLED.
@@ -184,101 +184,100 @@ acctMatchesPubKey(
     if (isMasterKey)
     {
         if (sle.isFlag(lsfDisableMaster))
-            return rpcMASTER_DISABLED;
-        return rpcSUCCESS;
+            return RpcMasterDisabled;
+        return RpcSuccess;
     }
 
     // The last gasp is that we have public Regular key.
     if ((sle.isFieldPresent(sfRegularKey)) && (publicKeyAcctID == sle.getAccountID(sfRegularKey)))
     {
-        return rpcSUCCESS;
+        return RpcSuccess;
     }
-    return rpcBAD_SECRET;
+    return RpcBadSecret;
 }
 
-static Json::Value
+static json::Value
 checkPayment(
-    Json::Value const& params,
-    Json::Value& tx_json,
+    json::Value const& params,
+    json::Value& txJson,
     AccountID const& srcAddressID,
     Role const role,
     Application& app,
     bool doPath)
 {
     // Only path find for Payments.
-    if (tx_json[jss::TransactionType].asString() != jss::Payment)
-        return Json::Value();
+    if (txJson[jss::TransactionType].asString() != jss::Payment)
+        return json::Value();
 
     // DeliverMax is an alias to Amount and we use Amount internally
-    if (tx_json.isMember(jss::DeliverMax))
+    if (txJson.isMember(jss::DeliverMax))
     {
-        if (tx_json.isMember(jss::Amount))
+        if (txJson.isMember(jss::Amount))
         {
-            if (tx_json[jss::DeliverMax] != tx_json[jss::Amount])
+            if (txJson[jss::DeliverMax] != txJson[jss::Amount])
             {
-                return RPC::make_error(
-                    rpcINVALID_PARAMS, "Cannot specify differing 'Amount' and 'DeliverMax'");
+                return RPC::makeError(
+                    RpcInvalidParams, "Cannot specify differing 'Amount' and 'DeliverMax'");
             }
         }
         else
         {
-            tx_json[jss::Amount] = tx_json[jss::DeliverMax];
+            txJson[jss::Amount] = txJson[jss::DeliverMax];
         }
 
-        tx_json.removeMember(jss::DeliverMax);
+        txJson.removeMember(jss::DeliverMax);
     }
 
-    if (!tx_json.isMember(jss::Amount))
-        return RPC::missing_field_error("tx_json.Amount");
+    if (!txJson.isMember(jss::Amount))
+        return RPC::missingFieldError("tx_json.Amount");
 
     STAmount amount;
 
-    if (!amountFromJsonNoThrow(amount, tx_json[jss::Amount]))
-        return RPC::invalid_field_error("tx_json.Amount");
+    if (!amountFromJsonNoThrow(amount, txJson[jss::Amount]))
+        return RPC::invalidFieldError("tx_json.Amount");
 
-    if (!tx_json.isMember(jss::Destination))
-        return RPC::missing_field_error("tx_json.Destination");
+    if (!txJson.isMember(jss::Destination))
+        return RPC::missingFieldError("tx_json.Destination");
 
-    auto const dstAccountID = parseBase58<AccountID>(tx_json[jss::Destination].asString());
+    auto const dstAccountID = parseBase58<AccountID>(txJson[jss::Destination].asString());
     if (!dstAccountID)
-        return RPC::invalid_field_error("tx_json.Destination");
+        return RPC::invalidFieldError("tx_json.Destination");
 
     if (params.isMember(jss::build_path) &&
         (!doPath ||
          (!app.getOpenLedger().current()->rules().enabled(featureMPTokensV2) &&
           amount.holds<MPTIssue>())))
     {
-        return RPC::make_error(
-            rpcINVALID_PARAMS, "Field 'build_path' not allowed in this context.");
+        return RPC::makeError(RpcInvalidParams, "Field 'build_path' not allowed in this context.");
     }
 
-    if (tx_json.isMember(jss::Paths) && params.isMember(jss::build_path))
+    if (txJson.isMember(jss::Paths) && params.isMember(jss::build_path))
     {
-        return RPC::make_error(
-            rpcINVALID_PARAMS, "Cannot specify both 'tx_json.Paths' and 'build_path'");
+        return RPC::makeError(
+            RpcInvalidParams, "Cannot specify both 'tx_json.Paths' and 'build_path'");
     }
 
     std::optional<uint256> domain;
-    if (tx_json.isMember(sfDomainID.jsonName))
+    if (txJson.isMember(sfDomainID.jsonName))
     {
         uint256 num;
-        if (!tx_json[sfDomainID.jsonName].isString() ||
-            !num.parseHex(tx_json[sfDomainID.jsonName].asString()))
+        if (!txJson[sfDomainID.jsonName].isString() ||
+            !num.parseHex(txJson[sfDomainID.jsonName].asString()))
         {
-            return RPC::make_error(rpcDOMAIN_MALFORMED, "Unable to parse 'DomainID'.");
+            return RPC::makeError(RpcDomainMalformed, "Unable to parse 'DomainID'.");
         }
 
         domain = num;
     }
 
-    if (!tx_json.isMember(jss::Paths) && params.isMember(jss::build_path))
+    if (!txJson.isMember(jss::Paths) && params.isMember(jss::build_path))
     {
         STAmount sendMax;
 
-        if (tx_json.isMember(jss::SendMax))
+        if (txJson.isMember(jss::SendMax))
         {
-            if (!amountFromJsonNoThrow(sendMax, tx_json[jss::SendMax]))
-                return RPC::invalid_field_error("tx_json.SendMax");
+            if (!amountFromJsonNoThrow(sendMax, txJson[jss::SendMax]))
+                return RPC::invalidFieldError("tx_json.SendMax");
         }
         else
         {
@@ -290,12 +289,12 @@ checkPayment(
         }
 
         if (sendMax.native() && amount.native())
-            return RPC::make_error(rpcINVALID_PARAMS, "Cannot build XRP to XRP paths.");
+            return RPC::makeError(RpcInvalidParams, "Cannot build XRP to XRP paths.");
 
         {
             LegacyPathFind const lpf(isUnlimited(role), app);
             if (!lpf.isOk())
-                return rpcError(rpcTOO_BUSY);
+                return rpcError(RpcTooBusy);
 
             STPathSet result;
 
@@ -322,28 +321,29 @@ checkPayment(
             }
 
             auto j = app.getJournal("RPCHandler");
-            JLOG(j.debug()) << "transactionSign: build_path: " << result.getJson(JsonOptions::none);
+            JLOG(j.debug()) << "transactionSign: build_path: "
+                            << result.getJson(JsonOptions::KNone);
 
             if (!result.empty())
-                tx_json[jss::Paths] = result.getJson(JsonOptions::none);
+                txJson[jss::Paths] = result.getJson(JsonOptions::KNone);
         }
     }
-    return Json::Value();
+    return json::Value();
 }
 
 //------------------------------------------------------------------------------
 
 // Validate (but don't modify) the contents of the tx_json.
 //
-// Returns a pair<Json::Value, AccountID>.  The Json::Value will contain error
+// Returns a pair<json::Value, AccountID>.  The json::Value will contain error
 // information if there was an error. On success, the account ID is returned
-// and the Json::Value will be empty.
+// and the json::Value will be empty.
 //
 // This code does not check the "Sequence" field, since the expectations
 // for that field are particularly context sensitive.
-static std::pair<Json::Value, AccountID>
+static std::pair<json::Value, AccountID>
 checkTxJsonFields(
-    Json::Value const& tx_json,
+    json::Value const& txJson,
     Role const role,
     bool const verify,
     std::chrono::seconds validatedLedgerAge,
@@ -351,46 +351,44 @@ checkTxJsonFields(
     LoadFeeTrack const& feeTrack,
     unsigned apiVersion)
 {
-    std::pair<Json::Value, AccountID> ret;
+    std::pair<json::Value, AccountID> ret;
 
-    if (!tx_json.isObject())
+    if (!txJson.isObject())
     {
-        ret.first = RPC::object_field_error(jss::tx_json);
+        ret.first = RPC::objectFieldError(jss::tx_json);
         return ret;
     }
 
-    if (!tx_json.isMember(jss::TransactionType))
+    if (!txJson.isMember(jss::TransactionType))
     {
-        ret.first = RPC::missing_field_error("tx_json.TransactionType");
+        ret.first = RPC::missingFieldError("tx_json.TransactionType");
         return ret;
     }
 
-    if (!tx_json.isMember(jss::Account))
+    if (!txJson.isMember(jss::Account))
     {
-        ret.first =
-            RPC::make_error(rpcSRC_ACT_MISSING, RPC::missing_field_message("tx_json.Account"));
+        ret.first = RPC::makeError(RpcSrcActMissing, RPC::missingFieldMessage("tx_json.Account"));
         return ret;
     }
 
-    auto const srcAddressID = parseBase58<AccountID>(tx_json[jss::Account].asString());
+    auto const srcAddressID = parseBase58<AccountID>(txJson[jss::Account].asString());
 
     if (!srcAddressID)
     {
-        ret.first =
-            RPC::make_error(rpcSRC_ACT_MALFORMED, RPC::invalid_field_message("tx_json.Account"));
+        ret.first = RPC::makeError(RpcSrcActMalformed, RPC::invalidFieldMessage("tx_json.Account"));
         return ret;
     }
 
     // Check for current ledger.
-    if (verify && !config.standalone() && (validatedLedgerAge > Tuning::maxValidatedLedgerAge))
+    if (verify && !config.standalone() && (validatedLedgerAge > Tuning::kMAX_VALIDATED_LEDGER_AGE))
     {
         if (apiVersion == 1)
         {
-            ret.first = rpcError(rpcNO_CURRENT);
+            ret.first = rpcError(RpcNoCurrent);
         }
         else
         {
-            ret.first = rpcError(rpcNOT_SYNCED);
+            ret.first = rpcError(RpcNotSynced);
         }
         return ret;
     }
@@ -398,7 +396,7 @@ checkTxJsonFields(
     // Check for load.
     if (feeTrack.isLoadedCluster() && !isUnlimited(role))
     {
-        ret.first = rpcError(rpcTOO_BUSY);
+        ret.first = rpcError(RpcTooBusy);
         return ret;
     }
 
@@ -409,35 +407,35 @@ checkTxJsonFields(
 
 //------------------------------------------------------------------------------
 
-// A move-only struct that makes it easy to return either a Json::Value or a
+// A move-only struct that makes it easy to return either a json::Value or a
 // std::shared_ptr<STTx const> from transactionPreProcessImpl ().
-struct transactionPreProcessResult
+struct TransactionPreProcessResult
 {
-    Json::Value const first;
+    json::Value const first;
     std::shared_ptr<STTx> const second;
 
-    transactionPreProcessResult() = delete;
-    transactionPreProcessResult(transactionPreProcessResult const&) = delete;
-    transactionPreProcessResult(transactionPreProcessResult&& rhs) = default;
+    TransactionPreProcessResult() = delete;
+    TransactionPreProcessResult(TransactionPreProcessResult const&) = delete;
+    TransactionPreProcessResult(TransactionPreProcessResult&& rhs) = default;
 
-    transactionPreProcessResult&
-    operator=(transactionPreProcessResult const&) = delete;
-    transactionPreProcessResult&
-    operator=(transactionPreProcessResult&&) = delete;
+    TransactionPreProcessResult&
+    operator=(TransactionPreProcessResult const&) = delete;
+    TransactionPreProcessResult&
+    operator=(TransactionPreProcessResult&&) = delete;
 
-    transactionPreProcessResult(Json::Value&& json) : first(std::move(json)), second()
+    TransactionPreProcessResult(json::Value&& json) : first(std::move(json)), second()
     {
     }
 
-    explicit transactionPreProcessResult(std::shared_ptr<STTx>&& st)
+    explicit TransactionPreProcessResult(std::shared_ptr<STTx>&& st)
         : first(), second(std::move(st))
     {
     }
 };
 
-static transactionPreProcessResult
+static TransactionPreProcessResult
 transactionPreProcessImpl(
-    Json::Value& params,
+    json::Value& params,
     Role role,
     SigningForParams& signingArgs,
     std::chrono::seconds validatedLedgerAge,
@@ -445,9 +443,9 @@ transactionPreProcessImpl(
 {
     auto j = app.getJournal("RPCHandler");
 
-    Json::Value jvResult;
+    json::Value jvResult;
     std::optional<std::pair<PublicKey, SecretKey>> keyPair = keypairForSignature(params, jvResult);
-    if (!keyPair || contains_error(jvResult))
+    if (!keyPair || containsError(jvResult))
         return jvResult;
 
     PublicKey const& pk = keyPair->first;
@@ -471,19 +469,19 @@ transactionPreProcessImpl(
     {
         if (signatureTemplate == nullptr)
         {  // Invalid target field
-            return RPC::make_error(rpcINVALID_PARAMS, signatureTarget->get().getName());
+            return RPC::makeError(RpcInvalidParams, signatureTarget->get().getName());
         }
         signingArgs.setSignatureTarget(signatureTarget);
     }
 
     if (!params.isMember(jss::tx_json))
-        return RPC::missing_field_error(jss::tx_json);
+        return RPC::missingFieldError(jss::tx_json);
 
-    Json::Value& tx_json(params[jss::tx_json]);
+    json::Value& txJson(params[jss::tx_json]);
 
     // Check tx_json fields, but don't add any.
     auto [txJsonResult, srcAddressID] = checkTxJsonFields(
-        tx_json,
+        txJson,
         role,
         verify,
         validatedLedgerAge,
@@ -491,14 +489,14 @@ transactionPreProcessImpl(
         app.getFeeTrack(),
         getAPIVersionNumber(params, app.config().BETA_RPC_API));
 
-    if (RPC::contains_error(txJsonResult))
+    if (RPC::containsError(txJsonResult))
         return std::move(txJsonResult);
 
     // This test covers the case where we're offline so the sequence number
     // cannot be determined locally.  If we're offline then the caller must
     // provide the sequence number.
-    if (!verify && !tx_json.isMember(jss::Sequence))
-        return RPC::missing_field_error("tx_json.Sequence");
+    if (!verify && !txJson.isMember(jss::Sequence))
+        return RPC::missingFieldError("tx_json.Sequence");
 
     std::shared_ptr<SLE const> sle;
     if (verify)
@@ -510,34 +508,34 @@ transactionPreProcessImpl(
         JLOG(j.debug()) << "transactionSign: Failed to find source account "
                         << "in current ledger: " << toBase58(srcAddressID);
 
-        return rpcError(rpcSRC_ACT_NOT_FOUND);
+        return rpcError(RpcSrcActNotFound);
     }
 
     if (signingArgs.editFields())
     {
-        if (!tx_json.isMember(jss::Sequence))
+        if (!txJson.isMember(jss::Sequence))
         {
-            bool const hasTicketSeq = tx_json.isMember(sfTicketSequence.jsonName);
+            bool const hasTicketSeq = txJson.isMember(sfTicketSequence.jsonName);
             if (!hasTicketSeq && !sle)
             {
                 JLOG(j.debug()) << "transactionSign: Failed to find source account "
                                 << "in current ledger: " << toBase58(srcAddressID);
 
-                return rpcError(rpcSRC_ACT_NOT_FOUND);
+                return rpcError(RpcSrcActNotFound);
             }
-            tx_json[jss::Sequence] = hasTicketSeq ? 0 : app.getTxQ().nextQueuableSeq(sle).value();
+            txJson[jss::Sequence] = hasTicketSeq ? 0 : app.getTxQ().nextQueuableSeq(sle).value();
         }
 
-        if (!tx_json.isMember(jss::NetworkID))
+        if (!txJson.isMember(jss::NetworkID))
         {
             auto const networkId = app.getNetworkIDService().getNetworkID();
             if (networkId > 1024)
-                tx_json[jss::NetworkID] = to_string(networkId);
+                txJson[jss::NetworkID] = to_string(networkId);
         }
     }
 
     {
-        Json::Value err = checkFee(
+        json::Value err = checkFee(
             params,
             role,
             verify && signingArgs.editFields(),
@@ -546,37 +544,36 @@ transactionPreProcessImpl(
             app.getTxQ(),
             app);
 
-        if (RPC::contains_error(err))
+        if (RPC::containsError(err))
             return err;
     }
 
     {
-        Json::Value err = checkPayment(
-            params, tx_json, srcAddressID, role, app, verify && signingArgs.editFields());
+        json::Value err = checkPayment(
+            params, txJson, srcAddressID, role, app, verify && signingArgs.editFields());
 
-        if (RPC::contains_error(err))
+        if (RPC::containsError(err))
             return err;
     }
 
     // If multisigning there should not be a single signature and vice versa.
     if (signingArgs.isMultiSigning())
     {
-        if (tx_json.isMember(jss::TxnSignature))
-            return rpcError(rpcALREADY_SINGLE_SIG);
+        if (txJson.isMember(jss::TxnSignature))
+            return rpcError(RpcAlreadySingleSig);
 
         // If multisigning then we need to return the public key.
         signingArgs.setPublicKey(pk);
     }
     else if (signingArgs.isSingleSigning())
     {
-        if (tx_json.isMember(jss::Signers))
-            return rpcError(rpcALREADY_MULTISIG);
+        if (txJson.isMember(jss::Signers))
+            return rpcError(RpcAlreadyMultisig);
     }
 
     if (verify)
     {
         // sle validity is checked above
-
         JLOG(j.trace()) << "verify: " << toBase58(calcAccountID(pk)) << " : "
                         << toBase58(srcAddressID);
 
@@ -586,45 +583,45 @@ transactionPreProcessImpl(
         if (!signingArgs.isMultiSigning() && !signatureTarget)
         {
             // Make sure the account and secret belong together.
-            if (tx_json.isMember(sfDelegate.jsonName))
+            if (txJson.isMember(sfDelegate.jsonName))
             {
                 // Delegated transaction
-                auto const delegateJson = tx_json[sfDelegate.jsonName];
+                auto const delegateJson = txJson[sfDelegate.jsonName];
                 auto const ptrDelegatedAddressID = delegateJson.isString()
                     ? parseBase58<AccountID>(delegateJson.asString())
                     : std::nullopt;
 
                 if (!ptrDelegatedAddressID)
                 {
-                    return RPC::make_error(
-                        rpcSRC_ACT_MALFORMED, RPC::invalid_field_message("tx_json.Delegate"));
+                    return RPC::makeError(
+                        RpcSrcActMalformed, RPC::invalidFieldMessage("tx_json.Delegate"));
                 }
 
                 auto delegatedAddressID = *ptrDelegatedAddressID;
                 auto delegatedSle =
                     app.getOpenLedger().current()->read(keylet::account(delegatedAddressID));
                 if (!delegatedSle)
-                    return rpcError(rpcDELEGATE_ACT_NOT_FOUND);
+                    return rpcError(RpcDelegateActNotFound);
 
                 auto const err = acctMatchesPubKey(delegatedSle, delegatedAddressID, pk);
 
-                if (err != rpcSUCCESS)
+                if (err != RpcSuccess)
                     return rpcError(err);
             }
             else
             {
                 auto const err = acctMatchesPubKey(sle, srcAddressID, pk);
 
-                if (err != rpcSUCCESS)
+                if (err != RpcSuccess)
                     return rpcError(err);
             }
         }
     }
 
-    STParsedJSONObject parsed(std::string(jss::tx_json), tx_json);
+    STParsedJSONObject parsed(std::string(jss::tx_json), txJson);
     if (!parsed.object.has_value())
     {
-        Json::Value err;
+        json::Value err;
         err[jss::error] = parsed.error[jss::error];
         err[jss::error_code] = parsed.error[jss::error_code];
         err[jss::error_message] = parsed.error[jss::error_message];
@@ -654,17 +651,17 @@ transactionPreProcessImpl(
     }
     catch (STObject::FieldErr const& err)
     {
-        return RPC::make_error(rpcINVALID_PARAMS, err.what());
+        return RPC::makeError(RpcInvalidParams, err.what());
     }
     catch (std::exception&)
     {
-        return RPC::make_error(
-            rpcINTERNAL, "Exception occurred constructing serialized transaction");
+        return RPC::makeError(
+            RpcInternal, "Exception occurred constructing serialized transaction");
     }
 
     std::string reason;
     if (!passesLocalChecks(*stTx, reason))
-        return RPC::make_error(rpcINVALID_PARAMS, reason);
+        return RPC::makeError(RpcInvalidParams, reason);
 
     // If multisign then return multiSignature, else set TxnSignature field.
     if (signingArgs.isMultiSigning())
@@ -680,16 +677,16 @@ transactionPreProcessImpl(
         stTx->sign(pk, sk, signatureTarget);
     }
 
-    return transactionPreProcessResult{std::move(stTx)};
+    return TransactionPreProcessResult{std::move(stTx)};
 }
 
-static std::pair<Json::Value, Transaction::pointer>
+static std::pair<json::Value, Transaction::pointer>
 transactionConstructImpl(
     std::shared_ptr<STTx const> const& stTx,
     Rules const& rules,
     Application& app)
 {
-    std::pair<Json::Value, Transaction::pointer> ret;
+    std::pair<json::Value, Transaction::pointer> ret;
 
     // Turn the passed in STTx into a Transaction.
     Transaction::pointer tpTrans;
@@ -698,7 +695,7 @@ transactionConstructImpl(
         tpTrans = std::make_shared<Transaction>(stTx, reason, app);
         if (tpTrans->getStatus() != TransStatus::NEW)
         {
-            ret.first = RPC::make_error(rpcINTERNAL, "Unable to construct transaction: " + reason);
+            ret.first = RPC::makeError(RpcInternal, "Unable to construct transaction: " + reason);
             return ret;
         }
     }
@@ -723,7 +720,7 @@ transactionConstructImpl(
             }
             if (checkValidity(app.getHashRouter(), *sttxNew, rules).first != Validity::Valid)
             {
-                ret.first = RPC::make_error(rpcINTERNAL, "Invalid signature.");
+                ret.first = RPC::makeError(RpcInternal, "Invalid signature.");
                 return ret;
             }
 
@@ -748,27 +745,27 @@ transactionConstructImpl(
 
     if (!tpTrans)
     {
-        ret.first = RPC::make_error(rpcINTERNAL, "Unable to sterilize transaction.");
+        ret.first = RPC::makeError(RpcInternal, "Unable to sterilize transaction.");
         return ret;
     }
     ret.second = std::move(tpTrans);
     return ret;
 }
 
-static Json::Value
+static json::Value
 transactionFormatResultImpl(Transaction::pointer tpTrans, unsigned apiVersion)
 {
-    Json::Value jvResult;
+    json::Value jvResult;
     try
     {
         if (apiVersion > 1)
         {
-            jvResult[jss::tx_json] = tpTrans->getJson(JsonOptions::disable_API_prior_V2);
+            jvResult[jss::tx_json] = tpTrans->getJson(JsonOptions::KDisableApiPriorV2);
             jvResult[jss::hash] = to_string(tpTrans->getID());
         }
         else
         {
-            jvResult[jss::tx_json] = tpTrans->getJson(JsonOptions::none);
+            jvResult[jss::tx_json] = tpTrans->getJson(JsonOptions::KNone);
         }
 
         RPC::insertDeliverMax(
@@ -790,7 +787,7 @@ transactionFormatResultImpl(Transaction::pointer tpTrans, unsigned apiVersion)
     }
     catch (std::exception&)
     {
-        jvResult = RPC::make_error(rpcINTERNAL, "Exception occurred during JSON handling.");
+        jvResult = RPC::makeError(RpcInternal, "Exception occurred during JSON handling.");
     }
     return jvResult;
 }
@@ -800,7 +797,7 @@ transactionFormatResultImpl(Transaction::pointer tpTrans, unsigned apiVersion)
 //------------------------------------------------------------------------------
 
 [[nodiscard]] static XRPAmount
-getTxFee(Application const& app, Config const& config, Json::Value tx)
+getTxFee(Application const& app, Config const& config, json::Value tx)
 {
     auto const& ledger = app.getOpenLedger().current();
     // autofilling only needed in this function so that the `STParsedJSONObject`
@@ -830,7 +827,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::maxMultiSigners)
+        if (tx[jss::Signers].size() > STTx::kMAX_MULTI_SIGNERS)
             return config.FEES.reference_fee;
 
         // check multi-signed signers
@@ -872,14 +869,14 @@ getTxFee(Application const& app, Config const& config, Json::Value tx)
     }
 }
 
-Json::Value
+json::Value
 getCurrentNetworkFee(
     Role const role,
     Config const& config,
     LoadFeeTrack const& feeTrack,
     TxQ const& txQ,
     Application const& app,
-    Json::Value const& tx,
+    json::Value const& tx,
     int mult,
     int div)
 {
@@ -904,15 +901,15 @@ getCurrentNetworkFee(
     {
         std::stringstream ss;
         ss << "Fee of " << fee << " exceeds the requested tx limit of " << *limit;
-        return RPC::make_error(rpcHIGH_FEE, ss.str());
+        return RPC::makeError(RpcHighFee, ss.str());
     }
 
     return fee.jsonClipped();
 }
 
-Json::Value
+json::Value
 checkFee(
-    Json::Value& request,
+    json::Value& request,
     Role const role,
     bool doAutoFill,
     Config const& config,
@@ -920,15 +917,15 @@ checkFee(
     TxQ const& txQ,
     Application const& app)
 {
-    Json::Value& tx(request[jss::tx_json]);
+    json::Value& tx(request[jss::tx_json]);
     if (tx.isMember(jss::Fee))
-        return Json::Value();
+        return json::Value();
 
     if (!doAutoFill)
-        return RPC::missing_field_error("tx_json.Fee");
+        return RPC::missingFieldError("tx_json.Fee");
 
-    int mult = Tuning::defaultAutoFillFeeMultiplier;
-    int div = Tuning::defaultAutoFillFeeDivisor;
+    int mult = Tuning::kDEFAULT_AUTO_FILL_FEE_MULTIPLIER;
+    int div = Tuning::kDEFAULT_AUTO_FILL_FEE_DIVISOR;
     if (request.isMember(jss::fee_mult_max))
     {
         if (request[jss::fee_mult_max].isInt())
@@ -936,15 +933,15 @@ checkFee(
             mult = request[jss::fee_mult_max].asInt();
             if (mult < 0)
             {
-                return RPC::make_error(
-                    rpcINVALID_PARAMS,
-                    RPC::expected_field_message(jss::fee_mult_max, "a positive integer"));
+                return RPC::makeError(
+                    RpcInvalidParams,
+                    RPC::expectedFieldMessage(jss::fee_mult_max, "a positive integer"));
             }
         }
         else
         {
-            return RPC::make_error(
-                rpcHIGH_FEE, RPC::expected_field_message(jss::fee_mult_max, "a positive integer"));
+            return RPC::makeError(
+                RpcHighFee, RPC::expectedFieldMessage(jss::fee_mult_max, "a positive integer"));
         }
     }
     if (request.isMember(jss::fee_div_max))
@@ -954,15 +951,15 @@ checkFee(
             div = request[jss::fee_div_max].asInt();
             if (div <= 0)
             {
-                return RPC::make_error(
-                    rpcINVALID_PARAMS,
-                    RPC::expected_field_message(jss::fee_div_max, "a positive integer"));
+                return RPC::makeError(
+                    RpcInvalidParams,
+                    RPC::expectedFieldMessage(jss::fee_div_max, "a positive integer"));
             }
         }
         else
         {
-            return RPC::make_error(
-                rpcHIGH_FEE, RPC::expected_field_message(jss::fee_div_max, "a positive integer"));
+            return RPC::makeError(
+                RpcHighFee, RPC::expectedFieldMessage(jss::fee_div_max, "a positive integer"));
         }
     }
 
@@ -970,15 +967,15 @@ checkFee(
     if (feeOrError.isMember(jss::error))
         return feeOrError;
     tx[jss::Fee] = std::move(feeOrError);
-    return Json::Value();
+    return json::Value();
 }
 
 //------------------------------------------------------------------------------
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSign(
-    Json::Value jvRequest,
+    json::Value jvRequest,
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
@@ -992,7 +989,7 @@ transactionSign(
 
     // Add and amend fields based on the transaction type.
     SigningForParams signForParams;
-    transactionPreProcessResult const preprocResult =
+    TransactionPreProcessResult const preprocResult =
         transactionPreProcessImpl(jvRequest, role, signForParams, validatedLedgerAge, app);
 
     if (!preprocResult.second)
@@ -1000,7 +997,7 @@ transactionSign(
 
     std::shared_ptr<ReadView const> const ledger = app.getOpenLedger().current();
     // Make sure the STTx makes a legitimate Transaction.
-    std::pair<Json::Value, Transaction::pointer> const txn =
+    std::pair<json::Value, Transaction::pointer> const txn =
         transactionConstructImpl(preprocResult.second, ledger->rules(), app);
 
     if (!txn.second)
@@ -1009,10 +1006,10 @@ transactionSign(
     return transactionFormatResultImpl(txn.second, apiVersion);
 }
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSubmit(
-    Json::Value jvRequest,
+    json::Value jvRequest,
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
@@ -1028,14 +1025,14 @@ transactionSubmit(
 
     // Add and amend fields based on the transaction type.
     SigningForParams signForParams;
-    transactionPreProcessResult const preprocResult =
+    TransactionPreProcessResult const preprocResult =
         transactionPreProcessImpl(jvRequest, role, signForParams, validatedLedgerAge, app);
 
     if (!preprocResult.second)
         return preprocResult.first;
 
     // Make sure the STTx makes a legitimate Transaction.
-    std::pair<Json::Value, Transaction::pointer> txn =
+    std::pair<json::Value, Transaction::pointer> txn =
         transactionConstructImpl(preprocResult.second, ledger->rules(), app);
 
     if (!txn.second)
@@ -1049,7 +1046,7 @@ transactionSubmit(
     }
     catch (std::exception&)
     {
-        return RPC::make_error(rpcINTERNAL, "Exception occurred during transaction submission.");
+        return RPC::makeError(RpcInternal, "Exception occurred during transaction submission.");
     }
 
     return transactionFormatResultImpl(txn.second, apiVersion);
@@ -1058,47 +1055,47 @@ transactionSubmit(
 namespace detail {
 // There are a some field checks shared by transactionSignFor
 // and transactionSubmitMultiSigned.  Gather them together here.
-static Json::Value
-checkMultiSignFields(Json::Value const& jvRequest)
+static json::Value
+checkMultiSignFields(json::Value const& jvRequest)
 {
     if (!jvRequest.isMember(jss::tx_json))
-        return RPC::missing_field_error(jss::tx_json);
+        return RPC::missingFieldError(jss::tx_json);
 
-    Json::Value const& tx_json(jvRequest[jss::tx_json]);
+    json::Value const& txJson(jvRequest[jss::tx_json]);
 
-    if (!tx_json.isObject())
-        return RPC::invalid_field_message(jss::tx_json);
+    if (!txJson.isObject())
+        return RPC::invalidFieldMessage(jss::tx_json);
 
     // There are a couple of additional fields we need to check before
     // we serialize.  If we serialize first then we generate less useful
     // error messages.
-    if (!tx_json.isMember(jss::Sequence))
-        return RPC::missing_field_error("tx_json.Sequence");
+    if (!txJson.isMember(jss::Sequence))
+        return RPC::missingFieldError("tx_json.Sequence");
 
-    if (!tx_json.isMember(sfSigningPubKey.getJsonName()))
-        return RPC::missing_field_error("tx_json.SigningPubKey");
+    if (!txJson.isMember(sfSigningPubKey.getJsonName()))
+        return RPC::missingFieldError("tx_json.SigningPubKey");
 
     // Multi-signing into a signature_target object field is fine,
     // because it means the signature is not for the transaction
     // Account.
     if (!jvRequest.isMember(jss::signature_target) &&
-        !tx_json[sfSigningPubKey.getJsonName()].asString().empty())
+        !txJson[sfSigningPubKey.getJsonName()].asString().empty())
     {
-        return RPC::make_error(
-            rpcINVALID_PARAMS, "When multi-signing 'tx_json.SigningPubKey' must be empty.");
+        return RPC::makeError(
+            RpcInvalidParams, "When multi-signing 'tx_json.SigningPubKey' must be empty.");
     }
 
-    return Json::Value();
+    return json::Value();
 }
 
 // Sort and validate an stSigners array.
 //
-// Returns a null Json::Value if there are no errors.
-static Json::Value
+// Returns a null json::Value if there are no errors.
+static json::Value
 sortAndValidateSigners(STArray& signers, AccountID const& signingForID)
 {
     if (signers.empty())
-        return RPC::make_param_error("Signers array may not be empty.");
+        return RPC::makeParamError("Signers array may not be empty.");
 
     // Signers must be sorted by Account.
     std::ranges::sort(signers, [](STObject const& a, STObject const& b) {
@@ -1115,7 +1112,7 @@ sortAndValidateSigners(STArray& signers, AccountID const& signingForID)
         std::ostringstream err;
         err << "Duplicate Signers:Signer:Account entries (" << toBase58((*dupIter)[sfAccount])
             << ") are not allowed.";
-        return RPC::make_param_error(err.str());
+        return RPC::makeParamError(err.str());
     }
 
     // An account may not sign for itself.
@@ -1125,17 +1122,17 @@ sortAndValidateSigners(STArray& signers, AccountID const& signingForID)
     {
         std::ostringstream err;
         err << "A Signer may not be the transaction's Account (" << toBase58(signingForID) << ").";
-        return RPC::make_param_error(err.str());
+        return RPC::makeParamError(err.str());
     }
     return {};
 }
 
 }  // namespace detail
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSignFor(
-    Json::Value jvRequest,
+    json::Value jvRequest,
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
@@ -1150,43 +1147,43 @@ transactionSignFor(
     char const accountField[] = "account";
 
     if (!jvRequest.isMember(accountField))
-        return RPC::missing_field_error(accountField);
+        return RPC::missingFieldError(accountField);
 
     // Turn the signer's account into an AccountID for multi-sign.
     auto const signerAccountID = parseBase58<AccountID>(jvRequest[accountField].asString());
     if (!signerAccountID)
     {
-        return RPC::make_error(rpcSRC_ACT_MALFORMED, RPC::invalid_field_message(accountField));
+        return RPC::makeError(RpcSrcActMalformed, RPC::invalidFieldMessage(accountField));
     }
 
     if (!jvRequest.isMember(jss::tx_json))
-        return RPC::missing_field_error(jss::tx_json);
+        return RPC::missingFieldError(jss::tx_json);
 
     {
-        Json::Value& tx_json(jvRequest[jss::tx_json]);
+        json::Value& txJson(jvRequest[jss::tx_json]);
 
-        if (!tx_json.isObject())
-            return RPC::object_field_error(jss::tx_json);
+        if (!txJson.isObject())
+            return RPC::objectFieldError(jss::tx_json);
 
         // If the tx_json.SigningPubKey field is missing,
         // insert an empty one.
-        if (!tx_json.isMember(sfSigningPubKey.getJsonName()))
-            tx_json[sfSigningPubKey.getJsonName()] = "";
+        if (!txJson.isMember(sfSigningPubKey.getJsonName()))
+            txJson[sfSigningPubKey.getJsonName()] = "";
     }
 
     // When multi-signing, the "Sequence" and "SigningPubKey" fields must
     // be passed in by the caller.
     using namespace detail;
     {
-        Json::Value err = checkMultiSignFields(jvRequest);
-        if (RPC::contains_error(err))
+        json::Value err = checkMultiSignFields(jvRequest);
+        if (RPC::containsError(err))
             return err;
     }
 
     // Add and amend fields based on the transaction type.
     SigningForParams signForParams(*signerAccountID);
 
-    transactionPreProcessResult const preprocResult =
+    TransactionPreProcessResult const preprocResult =
         transactionPreProcessImpl(jvRequest, role, signForParams, validatedLedgerAge, app);
 
     if (!preprocResult.second)
@@ -1196,13 +1193,13 @@ transactionSignFor(
         signForParams.validMultiSign(), "xrpl::RPC::transactionSignFor : valid multi-signature");
 
     {
-        std::shared_ptr<SLE const> const account_state =
+        std::shared_ptr<SLE const> const accountState =
             ledger->read(keylet::account(*signerAccountID));
         // Make sure the account and secret belong together.
         auto const err =
-            acctMatchesPubKey(account_state, *signerAccountID, signForParams.getPublicKey());
+            acctMatchesPubKey(accountState, *signerAccountID, signForParams.getPublicKey());
 
-        if (err != rpcSUCCESS)
+        if (err != RpcSuccess)
             return rpcError(err);
     }
 
@@ -1226,16 +1223,16 @@ transactionSignFor(
             sigTarget.setFieldArray(sfSigners, {});
 
         auto& signers = sigTarget.peekFieldArray(sfSigners);
-        signers.emplace_back(std::move(signer));
+        signers.emplaceBack(std::move(signer));
 
         // The array must be sorted and validated.
         auto err = sortAndValidateSigners(signers, (*sttx)[sfAccount]);
-        if (RPC::contains_error(err))
+        if (RPC::containsError(err))
             return err;
     }
 
     // Make sure the STTx makes a legitimate Transaction.
-    std::pair<Json::Value, Transaction::pointer> const txn =
+    std::pair<json::Value, Transaction::pointer> const txn =
         transactionConstructImpl(sttx, ledger->rules(), app);
 
     if (!txn.second)
@@ -1244,10 +1241,10 @@ transactionSignFor(
     return transactionFormatResultImpl(txn.second, apiVersion);
 }
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSubmitMultiSigned(
-    Json::Value jvRequest,
+    json::Value jvRequest,
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
@@ -1263,15 +1260,15 @@ transactionSubmitMultiSigned(
     // be passed in by the caller.
     using namespace detail;
     {
-        Json::Value err = checkMultiSignFields(jvRequest);
-        if (RPC::contains_error(err))
+        json::Value err = checkMultiSignFields(jvRequest);
+        if (RPC::containsError(err))
             return err;
     }
 
-    Json::Value& tx_json(jvRequest["tx_json"]);
+    json::Value& txJson(jvRequest["tx_json"]);
 
     auto [txJsonResult, srcAddressID] = checkTxJsonFields(
-        tx_json,
+        txJson,
         role,
         true,
         validatedLedgerAge,
@@ -1279,7 +1276,7 @@ transactionSubmitMultiSigned(
         app.getFeeTrack(),
         getAPIVersionNumber(jvRequest, app.config().BETA_RPC_API));
 
-    if (RPC::contains_error(txJsonResult))
+    if (RPC::containsError(txJsonResult))
         return std::move(txJsonResult);
 
     std::shared_ptr<SLE const> const sle = ledger->read(keylet::account(srcAddressID));
@@ -1290,51 +1287,51 @@ transactionSubmitMultiSigned(
         JLOG(j.debug()) << "transactionSubmitMultiSigned: Failed to find source account "
                         << "in current ledger: " << toBase58(srcAddressID);
 
-        return rpcError(rpcSRC_ACT_NOT_FOUND);
+        return rpcError(RpcSrcActNotFound);
     }
 
     {
-        Json::Value err =
+        json::Value err =
             checkFee(jvRequest, role, false, app.config(), app.getFeeTrack(), app.getTxQ(), app);
 
-        if (RPC::contains_error(err))
+        if (RPC::containsError(err))
             return err;
 
-        err = checkPayment(jvRequest, tx_json, srcAddressID, role, app, false);
+        err = checkPayment(jvRequest, txJson, srcAddressID, role, app, false);
 
-        if (RPC::contains_error(err))
+        if (RPC::containsError(err))
             return err;
     }
 
     // Grind through the JSON in tx_json to produce a STTx.
     std::shared_ptr<STTx> stTx;
     {
-        STParsedJSONObject parsedTx_json("tx_json", tx_json);
-        if (!parsedTx_json.object)
+        STParsedJSONObject parsedTxJson("tx_json", txJson);
+        if (!parsedTxJson.object)
         {
-            Json::Value jvResult;
-            jvResult["error"] = parsedTx_json.error["error"];
-            jvResult["error_code"] = parsedTx_json.error["error_code"];
-            jvResult["error_message"] = parsedTx_json.error["error_message"];
+            json::Value jvResult;
+            jvResult["error"] = parsedTxJson.error["error"];
+            jvResult["error_code"] = parsedTxJson.error["error_code"];
+            jvResult["error_message"] = parsedTxJson.error["error_message"];
             return jvResult;
         }
         try
         {
-            stTx = std::make_shared<STTx>(std::move(parsedTx_json.object.value()));
+            stTx = std::make_shared<STTx>(std::move(parsedTxJson.object.value()));
         }
         catch (STObject::FieldErr const& err)
         {
-            return RPC::make_error(rpcINVALID_PARAMS, err.what());
+            return RPC::makeError(RpcInvalidParams, err.what());
         }
         catch (std::exception& ex)
         {
             std::string const reason(ex.what());
-            return RPC::make_error(
-                rpcINTERNAL, "Exception while serializing transaction: " + reason);
+            return RPC::makeError(
+                RpcInternal, "Exception while serializing transaction: " + reason);
         }
         std::string reason;
         if (!passesLocalChecks(*stTx, reason))
-            return RPC::make_error(rpcINVALID_PARAMS, reason);
+            return RPC::makeError(RpcInvalidParams, reason);
     }
 
     // Validate the fields in the serialized transaction.
@@ -1348,12 +1345,12 @@ transactionSubmitMultiSigned(
             std::ostringstream err;
             err << "Invalid  " << sfSigningPubKey.fieldName
                 << " field.  Field must be empty when multi-signing.";
-            return RPC::make_error(rpcINVALID_PARAMS, err.str());
+            return RPC::makeError(RpcInvalidParams, err.str());
         }
 
         // There may not be a TxnSignature field.
         if (stTx->isFieldPresent(sfTxnSignature))
-            return rpcError(rpcSIGNING_MALFORMED);
+            return rpcError(RpcSigningMalformed);
 
         // The Fee field must be in XRP and greater than zero.
         auto const fee = stTx->getFieldAmount(sfFee);
@@ -1362,26 +1359,26 @@ transactionSubmitMultiSigned(
         {
             std::ostringstream err;
             err << "Invalid " << sfFee.fieldName << " field.  Fees must be specified in XRP.";
-            return RPC::make_error(rpcINVALID_PARAMS, err.str());
+            return RPC::makeError(RpcInvalidParams, err.str());
         }
         if (fee <= STAmount{0})
         {
             std::ostringstream err;
             err << "Invalid " << sfFee.fieldName << " field.  Fees must be greater than zero.";
-            return RPC::make_error(rpcINVALID_PARAMS, err.str());
+            return RPC::makeError(RpcInvalidParams, err.str());
         }
     }
 
     // Verify that the Signers field is present.
     if (!stTx->isFieldPresent(sfSigners))
-        return RPC::missing_field_error("tx_json.Signers");
+        return RPC::missingFieldError("tx_json.Signers");
 
     // If the Signers field is present the SField guarantees it to be an array.
     // Get a reference to the Signers array so we can verify and sort it.
     auto& signers = stTx->peekFieldArray(sfSigners);
 
     if (signers.empty())
-        return RPC::make_param_error("tx_json.Signers array may not be empty.");
+        return RPC::makeParamError("tx_json.Signers array may not be empty.");
 
     // The Signers array may only contain Signer objects.
     if (std::ranges::find_if_not(signers, [](STObject const& obj) {
@@ -1392,16 +1389,16 @@ transactionSubmitMultiSigned(
                 obj.isFieldPresent(sfTxnSignature) && obj.getCount() == 3);
         }) != signers.end())
     {
-        return RPC::make_param_error("Signers array may only contain Signer entries.");
+        return RPC::makeParamError("Signers array may only contain Signer entries.");
     }
 
     // The array must be sorted and validated.
     auto err = sortAndValidateSigners(signers, srcAddressID);
-    if (RPC::contains_error(err))
+    if (RPC::containsError(err))
         return err;
 
     // Make sure the SerializedTransaction makes a legitimate Transaction.
-    std::pair<Json::Value, Transaction::pointer> txn =
+    std::pair<json::Value, Transaction::pointer> txn =
         transactionConstructImpl(stTx, ledger->rules(), app);
 
     if (!txn.second)
@@ -1415,7 +1412,7 @@ transactionSubmitMultiSigned(
     }
     catch (std::exception&)
     {
-        return RPC::make_error(rpcINTERNAL, "Exception occurred during transaction submission.");
+        return RPC::makeError(RpcInternal, "Exception occurred during transaction submission.");
     }
 
     return transactionFormatResultImpl(txn.second, apiVersion);
diff --git a/src/xrpld/rpc/detail/TransactionSign.h b/src/xrpld/rpc/detail/TransactionSign.h
index 8ffcb44a84..3d6f41ba30 100644
--- a/src/xrpld/rpc/detail/TransactionSign.h
+++ b/src/xrpld/rpc/detail/TransactionSign.h
@@ -17,16 +17,16 @@ class TxQ;
 
 namespace RPC {
 
-Json::Value
+json::Value
 getCurrentNetworkFee(
     Role const role,
     Config const& config,
     LoadFeeTrack const& feeTrack,
     TxQ const& txQ,
     Application const& app,
-    Json::Value const& tx,
-    int mult = Tuning::defaultAutoFillFeeMultiplier,
-    int div = Tuning::defaultAutoFillFeeDivisor);
+    json::Value const& tx,
+    int mult = Tuning::kDEFAULT_AUTO_FILL_FEE_MULTIPLIER,
+    int div = Tuning::kDEFAULT_AUTO_FILL_FEE_DIVISOR);
 
 /** Fill in the fee on behalf of the client.
     This is called when the client does not explicitly specify the fee.
@@ -55,9 +55,9 @@ getCurrentNetworkFee(
 
     @return         A JSON object containing the error results, if any
 */
-Json::Value
+json::Value
 checkFee(
-    Json::Value& request,
+    json::Value& request,
     Role const role,
     bool doAutoFill,
     Config const& config,
@@ -84,20 +84,20 @@ getProcessTxnFn(NetworkOPs& netOPs)
     };
 }
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSign(
-    Json::Value params,  // Passed by value so it can be modified locally.
+    json::Value params,  // Passed by value so it can be modified locally.
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
     std::chrono::seconds validatedLedgerAge,
     Application& app);
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSubmit(
-    Json::Value params,  // Passed by value so it can be modified locally.
+    json::Value params,  // Passed by value so it can be modified locally.
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
@@ -105,20 +105,20 @@ transactionSubmit(
     Application& app,
     ProcessTransactionFn const& processTransaction);
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSignFor(
-    Json::Value params,  // Passed by value so it can be modified locally.
+    json::Value params,  // Passed by value so it can be modified locally.
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
     std::chrono::seconds validatedLedgerAge,
     Application& app);
 
-/** Returns a Json::objectValue. */
-Json::Value
+/** Returns a json::objectValue. */
+json::Value
 transactionSubmitMultiSigned(
-    Json::Value params,  // Passed by value so it can be modified locally.
+    json::Value params,  // Passed by value so it can be modified locally.
     unsigned apiVersion,
     NetworkOPs::FailHard failType,
     Role role,
diff --git a/src/xrpld/rpc/detail/TrustLine.cpp b/src/xrpld/rpc/detail/TrustLine.cpp
index 5b7b555eca..4d0393bfed 100644
--- a/src/xrpld/rpc/detail/TrustLine.cpp
+++ b/src/xrpld/rpc/detail/TrustLine.cpp
@@ -17,22 +17,22 @@ namespace xrpl {
 
 TrustLineBase::TrustLineBase(std::shared_ptr<SLE const> const& sle, AccountID const& viewAccount)
     : key_(sle->key())
-    , mLowLimit(sle->getFieldAmount(sfLowLimit))
-    , mHighLimit(sle->getFieldAmount(sfHighLimit))
-    , mBalance(sle->getFieldAmount(sfBalance))
-    , mFlags(sle->getFieldU32(sfFlags))
-    , mViewLowest(mLowLimit.getIssuer() == viewAccount)
+    , lowLimit_(sle->getFieldAmount(sfLowLimit))
+    , highLimit_(sle->getFieldAmount(sfHighLimit))
+    , balance_(sle->getFieldAmount(sfBalance))
+    , flags_(sle->getFieldU32(sfFlags))
+    , viewLowest_(lowLimit_.getIssuer() == viewAccount)
 {
-    if (!mViewLowest)
-        mBalance.negate();
+    if (!viewLowest_)
+        balance_.negate();
 }
 
-Json::Value
+json::Value
 TrustLineBase::getJson(int)
 {
-    Json::Value ret(Json::objectValue);
-    ret["low_id"] = to_string(mLowLimit.getIssuer());
-    ret["high_id"] = to_string(mHighLimit.getIssuer());
+    json::Value ret(json::ObjectValue);
+    ret["low_id"] = to_string(lowLimit_.getIssuer());
+    ret["high_id"] = to_string(highLimit_.getIssuer());
     return ret;
 }
 
@@ -50,7 +50,7 @@ std::vector<T>
 getTrustLineItems(
     AccountID const& accountID,
     ReadView const& view,
-    LineDirection direction = LineDirection::outgoing)
+    LineDirection direction = LineDirection::Outgoing)
 {
     std::vector<T> items;
     forEachItem(
@@ -58,7 +58,7 @@ getTrustLineItems(
         accountID,
         [&items, &accountID, &direction](std::shared_ptr<SLE const> const& sleCur) {
             auto ret = T::makeItem(accountID, sleCur);
-            if (ret && (direction == LineDirection::outgoing || !ret->getNoRipple()))
+            if (ret && (direction == LineDirection::Outgoing || !ret->getNoRipple()))
                 items.push_back(std::move(*ret));
         });
     // This list may be around for a while, so free up any unneeded
diff --git a/src/xrpld/rpc/detail/TrustLine.h b/src/xrpld/rpc/detail/TrustLine.h
index 176bea1759..72d4d44ae3 100644
--- a/src/xrpld/rpc/detail/TrustLine.h
+++ b/src/xrpld/rpc/detail/TrustLine.h
@@ -18,7 +18,7 @@ trustline that has rippling enabled on the account's side.
 disabled on the account's side. Any trust lines for an incoming account that
 have rippling disabled are unusable in paths.
 */
-enum class LineDirection : bool { incoming = false, outgoing = true };
+enum class LineDirection : bool { Incoming = false, Outgoing = true };
 
 /** Wraps a trust line SLE for convenience.
     The complication of trust lines is that there is a
@@ -58,112 +58,112 @@ public:
     [[nodiscard]] AccountID const&
     getAccountID() const
     {
-        return mViewLowest ? mLowLimit.getIssuer() : mHighLimit.getIssuer();
+        return viewLowest_ ? lowLimit_.getIssuer() : highLimit_.getIssuer();
     }
 
     [[nodiscard]] AccountID const&
     getAccountIDPeer() const
     {
-        return !mViewLowest ? mLowLimit.getIssuer() : mHighLimit.getIssuer();
+        return !viewLowest_ ? lowLimit_.getIssuer() : highLimit_.getIssuer();
     }
 
     // True, Provided auth to peer.
     [[nodiscard]] bool
     getAuth() const
     {
-        return (mFlags & (mViewLowest ? lsfLowAuth : lsfHighAuth)) != 0u;
+        return (flags_ & (viewLowest_ ? lsfLowAuth : lsfHighAuth)) != 0u;
     }
 
     [[nodiscard]] bool
     getAuthPeer() const
     {
-        return (mFlags & (!mViewLowest ? lsfLowAuth : lsfHighAuth)) != 0u;
+        return (flags_ & (!viewLowest_ ? lsfLowAuth : lsfHighAuth)) != 0u;
     }
 
     [[nodiscard]] bool
     getNoRipple() const
     {
-        return (mFlags & (mViewLowest ? lsfLowNoRipple : lsfHighNoRipple)) != 0u;
+        return (flags_ & (viewLowest_ ? lsfLowNoRipple : lsfHighNoRipple)) != 0u;
     }
 
     [[nodiscard]] bool
     getNoRipplePeer() const
     {
-        return (mFlags & (!mViewLowest ? lsfLowNoRipple : lsfHighNoRipple)) != 0u;
+        return (flags_ & (!viewLowest_ ? lsfLowNoRipple : lsfHighNoRipple)) != 0u;
     }
 
     [[nodiscard]] LineDirection
     getDirection() const
     {
-        return getNoRipple() ? LineDirection::incoming : LineDirection::outgoing;
+        return getNoRipple() ? LineDirection::Incoming : LineDirection::Outgoing;
     }
 
     [[nodiscard]] LineDirection
     getDirectionPeer() const
     {
-        return getNoRipplePeer() ? LineDirection::incoming : LineDirection::outgoing;
+        return getNoRipplePeer() ? LineDirection::Incoming : LineDirection::Outgoing;
     }
 
     /** Have we set the freeze flag on our peer */
     [[nodiscard]] bool
     getFreeze() const
     {
-        return (mFlags & (mViewLowest ? lsfLowFreeze : lsfHighFreeze)) != 0u;
+        return (flags_ & (viewLowest_ ? lsfLowFreeze : lsfHighFreeze)) != 0u;
     }
 
     /** Have we set the deep freeze flag on our peer */
     [[nodiscard]] bool
     getDeepFreeze() const
     {
-        return (mFlags & (mViewLowest ? lsfLowDeepFreeze : lsfHighDeepFreeze)) != 0u;
+        return (flags_ & (viewLowest_ ? lsfLowDeepFreeze : lsfHighDeepFreeze)) != 0u;
     }
 
     /** Has the peer set the freeze flag on us */
     [[nodiscard]] bool
     getFreezePeer() const
     {
-        return (mFlags & (!mViewLowest ? lsfLowFreeze : lsfHighFreeze)) != 0u;
+        return (flags_ & (!viewLowest_ ? lsfLowFreeze : lsfHighFreeze)) != 0u;
     }
 
     /** Has the peer set the deep freeze flag on us */
     [[nodiscard]] bool
     getDeepFreezePeer() const
     {
-        return (mFlags & (!mViewLowest ? lsfLowDeepFreeze : lsfHighDeepFreeze)) != 0u;
+        return (flags_ & (!viewLowest_ ? lsfLowDeepFreeze : lsfHighDeepFreeze)) != 0u;
     }
 
     [[nodiscard]] STAmount const&
     getBalance() const
     {
-        return mBalance;
+        return balance_;
     }
 
     [[nodiscard]] STAmount const&
     getLimit() const
     {
-        return mViewLowest ? mLowLimit : mHighLimit;
+        return viewLowest_ ? lowLimit_ : highLimit_;
     }
 
     [[nodiscard]] STAmount const&
     getLimitPeer() const
     {
-        return !mViewLowest ? mLowLimit : mHighLimit;
+        return !viewLowest_ ? lowLimit_ : highLimit_;
     }
 
-    Json::Value
+    json::Value
     getJson(int);
 
 protected:
     uint256 key_;
 
-    STAmount const mLowLimit;
-    STAmount const mHighLimit;
+    STAmount const lowLimit_;
+    STAmount const highLimit_;
 
-    STAmount mBalance;
+    STAmount balance_;
 
-    std::uint32_t mFlags;
+    std::uint32_t flags_;
 
-    bool mViewLowest;
+    bool viewLowest_;
 };
 
 // This wrapper is used for the path finder
@@ -195,13 +195,13 @@ public:
     [[nodiscard]] Rate const&
     getQualityIn() const
     {
-        return mViewLowest ? lowQualityIn_ : highQualityIn_;
+        return viewLowest_ ? lowQualityIn_ : highQualityIn_;
     }
 
     [[nodiscard]] Rate const&
     getQualityOut() const
     {
-        return mViewLowest ? lowQualityOut_ : highQualityOut_;
+        return viewLowest_ ? lowQualityOut_ : highQualityOut_;
     }
 
     static std::optional<RPCTrustLine>
diff --git a/src/xrpld/rpc/detail/Tuning.h b/src/xrpld/rpc/detail/Tuning.h
index eb3cfa0ebf..45c164efbe 100644
--- a/src/xrpld/rpc/detail/Tuning.h
+++ b/src/xrpld/rpc/detail/Tuning.h
@@ -11,57 +11,57 @@ struct LimitRange
 };
 
 /** Limits for the account_lines command. */
-static LimitRange constexpr accountLines = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static LimitRange constexpr kACCOUNT_LINES = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_channels command. */
-static LimitRange constexpr accountChannels = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static LimitRange constexpr kACCOUNT_CHANNELS = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_objects command. */
-static LimitRange constexpr accountObjects = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static LimitRange constexpr kACCOUNT_OBJECTS = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_offers command. */
-static LimitRange constexpr accountOffers = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static LimitRange constexpr kACCOUNT_OFFERS = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the account_tx command. */
-static LimitRange constexpr accountTx = {.rmin = 10, .rDefault = 200, .rmax = 400};
+static LimitRange constexpr kACCOUNT_TX = {.rmin = 10, .rDefault = 200, .rmax = 400};
 
 /** Limits for the book_offers command. */
-static LimitRange constexpr bookOffers = {.rmin = 1, .rDefault = 60, .rmax = 100};
+static LimitRange constexpr kBOOK_OFFERS = {.rmin = 1, .rDefault = 60, .rmax = 100};
 
 /** Limits for the no_ripple_check command. */
-static LimitRange constexpr noRippleCheck = {.rmin = 10, .rDefault = 300, .rmax = 400};
+static LimitRange constexpr kNO_RIPPLE_CHECK = {.rmin = 10, .rDefault = 300, .rmax = 400};
 
 /** Limits for the account_nftokens command, in pages. */
-static LimitRange constexpr accountNFTokens = {.rmin = 20, .rDefault = 100, .rmax = 400};
+static LimitRange constexpr kACCOUNT_NF_TOKENS = {.rmin = 20, .rDefault = 100, .rmax = 400};
 
 /** Limits for the nft_buy_offers & nft_sell_offers commands. */
-static LimitRange constexpr nftOffers = {.rmin = 50, .rDefault = 250, .rmax = 500};
+static LimitRange constexpr kNFT_OFFERS = {.rmin = 50, .rDefault = 250, .rmax = 500};
 
-static int constexpr defaultAutoFillFeeMultiplier = 10;
-static int constexpr defaultAutoFillFeeDivisor = 1;
-static int constexpr maxPathfindsInProgress = 2;
-static int constexpr maxPathfindJobCount = 50;
-static int constexpr maxJobQueueClients = 500;
-auto constexpr maxValidatedLedgerAge = std::chrono::minutes{2};
-static int constexpr maxRequestSize = 1000000;
+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;
 
 /** Maximum number of pages in one response from a binary LedgerData request. */
-static int constexpr binaryPageLength = 2048;
+static int constexpr kBINARY_PAGE_LENGTH = 2048;
 
 /** Maximum number of pages in one response from a Json LedgerData request. */
-static int constexpr jsonPageLength = 256;
+static int constexpr kJSON_PAGE_LENGTH = 256;
 
 /** Maximum number of pages in a LedgerData response. */
 int constexpr pageLength(bool isBinary)
 {
-    return isBinary ? binaryPageLength : jsonPageLength;
+    return isBinary ? kBINARY_PAGE_LENGTH : kJSON_PAGE_LENGTH;
 }
 
 /** Maximum number of source currencies allowed in a path find request. */
-static int constexpr max_src_cur = 18;
+static int constexpr kMAX_SRC_CUR = 18;
 
 /** Maximum number of auto source currencies in a path find request. */
-static int constexpr max_auto_src_cur = 88;
+static int constexpr kMAX_AUTO_SRC_CUR = 88;
 
 }  // namespace xrpl::RPC::Tuning
 /** @} */
diff --git a/src/xrpld/rpc/detail/WSInfoSub.h b/src/xrpld/rpc/detail/WSInfoSub.h
index ec85262f61..336f35957f 100644
--- a/src/xrpld/rpc/detail/WSInfoSub.h
+++ b/src/xrpld/rpc/detail/WSInfoSub.h
@@ -23,14 +23,14 @@ public:
     {
         auto const& h = ws->request();
         if (ipAllowed(
-                beast::IPAddressConversion::from_asio(ws->remote_endpoint()).address(),
+                beast::IPAddressConversion::fromAsio(ws->remoteEndpoint()).address(),
                 ws->port().secure_gateway_nets_v4,
                 ws->port().secure_gateway_nets_v6))
         {
             auto it = h.find("X-User");
             if (it != h.end())
                 user_ = it->value();
-            fwdfor_ = std::string(forwardedFor(h));
+            fwdfor_ = std::string(::xrpl::forwardedFor(h));
         }
     }
 
@@ -41,19 +41,19 @@ public:
     }
 
     [[nodiscard]] std::string_view
-    forwarded_for() const
+    forwardedFor() const
     {
         return fwdfor_;
     }
 
     void
-    send(Json::Value const& jv, bool) override
+    send(json::Value const& jv, bool) override
     {
         auto sp = ws_.lock();
         if (!sp)
             return;
         boost::beast::multi_buffer sb;
-        Json::stream(jv, [&](void const* data, std::size_t n) {
+        json::stream(jv, [&](void const* data, std::size_t n) {
             sb.commit(boost::asio::buffer_copy(sb.prepare(n), boost::asio::buffer(data, n)));
         });
         auto m = std::make_shared<StreambufWSMsg<decltype(sb)>>(std::move(sb));
diff --git a/src/xrpld/rpc/handlers/ChannelVerify.cpp b/src/xrpld/rpc/handlers/ChannelVerify.cpp
index c1c7ab750b..082188f8dc 100644
--- a/src/xrpld/rpc/handlers/ChannelVerify.cpp
+++ b/src/xrpld/rpc/handlers/ChannelVerify.cpp
@@ -26,14 +26,14 @@ namespace xrpl {
 //   drops: 64-bit uint (as string)
 //   signature: signature to verify
 // }
-Json::Value
+json::Value
 doChannelVerify(RPC::JsonContext& context)
 {
     auto const& params(context.params);
     for (auto const& p : {jss::public_key, jss::channel_id, jss::amount, jss::signature})
     {
         if (!params.isMember(p))
-            return RPC::missing_field_error(p);
+            return RPC::missingFieldError(p);
     }
 
     std::optional<PublicKey> pk;
@@ -45,34 +45,34 @@ doChannelVerify(RPC::JsonContext& context)
         {
             auto pkHex = strUnHex(strPk);
             if (!pkHex)
-                return rpcError(rpcPUBLIC_MALFORMED);
+                return rpcError(RpcPublicMalformed);
             auto const pkType = publicKeyType(makeSlice(*pkHex));
             if (!pkType)
-                return rpcError(rpcPUBLIC_MALFORMED);
+                return rpcError(RpcPublicMalformed);
             pk.emplace(makeSlice(*pkHex));
         }
     }
 
     uint256 channelId;
     if (!channelId.parseHex(params[jss::channel_id].asString()))
-        return rpcError(rpcCHANNEL_MALFORMED);
+        return rpcError(RpcChannelMalformed);
 
     std::optional<std::uint64_t> const optDrops =
-        params[jss::amount].isString() ? to_uint64(params[jss::amount].asString()) : std::nullopt;
+        params[jss::amount].isString() ? toUint64(params[jss::amount].asString()) : std::nullopt;
 
     if (!optDrops)
-        return rpcError(rpcCHANNEL_AMT_MALFORMED);
+        return rpcError(RpcChannelAmtMalformed);
 
     std::uint64_t const drops = *optDrops;
 
     auto sig = strUnHex(params[jss::signature].asString());
     if (!sig || sig->empty())
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
 
     Serializer msg;
     serializePayChanAuthorization(msg, channelId, XRPAmount(drops));
 
-    Json::Value result;
+    json::Value result;
     result[jss::signature_verified] = verify(*pk, msg.slice(), makeSlice(*sig));
     return result;
 }
diff --git a/src/xrpld/rpc/handlers/Handlers.h b/src/xrpld/rpc/handlers/Handlers.h
index 23328cf52a..2d39e42e02 100644
--- a/src/xrpld/rpc/handlers/Handlers.h
+++ b/src/xrpld/rpc/handlers/Handlers.h
@@ -4,148 +4,148 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doAccountCurrencies(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountLines(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountChannels(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountNFTs(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountObjects(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountOffers(RPC::JsonContext&);
-Json::Value
+json::Value
 doAccountTx(RPC::JsonContext&);
-Json::Value
+json::Value
 doAMMInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doBookOffers(RPC::JsonContext&);
-Json::Value
+json::Value
 doBookChanges(RPC::JsonContext&);
-Json::Value
+json::Value
 doBlackList(RPC::JsonContext&);
-Json::Value
+json::Value
 doCanDelete(RPC::JsonContext&);
-Json::Value
+json::Value
 doChannelAuthorize(RPC::JsonContext&);
-Json::Value
+json::Value
 doChannelVerify(RPC::JsonContext&);
-Json::Value
+json::Value
 doConnect(RPC::JsonContext&);
-Json::Value
+json::Value
 doConsensusInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doDepositAuthorized(RPC::JsonContext&);
-Json::Value
+json::Value
 doFeature(RPC::JsonContext&);
-Json::Value
+json::Value
 doFee(RPC::JsonContext&);
-Json::Value
+json::Value
 doFetchInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doGatewayBalances(RPC::JsonContext&);
-Json::Value
+json::Value
 doGetCounts(RPC::JsonContext&);
-Json::Value
+json::Value
 doGetAggregatePrice(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerAccept(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerCleaner(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerClosed(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerCurrent(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerData(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerEntry(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerHeader(RPC::JsonContext&);
-Json::Value
+json::Value
 doLedgerRequest(RPC::JsonContext&);
-Json::Value
+json::Value
 doLogLevel(RPC::JsonContext&);
-Json::Value
+json::Value
 doLogRotate(RPC::JsonContext&);
-Json::Value
+json::Value
 doManifest(RPC::JsonContext&);
-Json::Value
+json::Value
 doNFTBuyOffers(RPC::JsonContext&);
-Json::Value
+json::Value
 doNFTSellOffers(RPC::JsonContext&);
-Json::Value
+json::Value
 doNoRippleCheck(RPC::JsonContext&);
-Json::Value
+json::Value
 doOwnerInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doPathFind(RPC::JsonContext&);
-Json::Value
+json::Value
 doPause(RPC::JsonContext&);
-Json::Value
+json::Value
 doPeers(RPC::JsonContext&);
-Json::Value
+json::Value
 doPing(RPC::JsonContext&);
-Json::Value
+json::Value
 doPrint(RPC::JsonContext&);
-Json::Value
+json::Value
 doRandom(RPC::JsonContext&);
-Json::Value
+json::Value
 doResume(RPC::JsonContext&);
-Json::Value
+json::Value
 doPeerReservationsAdd(RPC::JsonContext&);
-Json::Value
+json::Value
 doPeerReservationsDel(RPC::JsonContext&);
-Json::Value
+json::Value
 doPeerReservationsList(RPC::JsonContext&);
-Json::Value
+json::Value
 doRipplePathFind(RPC::JsonContext&);
-Json::Value
+json::Value
 doServerDefinitions(RPC::JsonContext&);
-Json::Value
+json::Value
 doServerInfo(RPC::JsonContext&);  // for humans
-Json::Value
+json::Value
 doServerState(RPC::JsonContext&);  // for machines
-Json::Value
+json::Value
 doSign(RPC::JsonContext&);
-Json::Value
+json::Value
 doSignFor(RPC::JsonContext&);
-Json::Value
+json::Value
 doSimulate(RPC::JsonContext&);
-Json::Value
+json::Value
 doStop(RPC::JsonContext&);
-Json::Value
+json::Value
 doSubmit(RPC::JsonContext&);
-Json::Value
+json::Value
 doSubmitMultiSigned(RPC::JsonContext&);
-Json::Value
+json::Value
 doSubscribe(RPC::JsonContext&);
-Json::Value
+json::Value
 doTransactionEntry(RPC::JsonContext&);
-Json::Value
+json::Value
 doTxJson(RPC::JsonContext&);
-Json::Value
+json::Value
 doTxHistory(RPC::JsonContext&);
-Json::Value
+json::Value
 doTxReduceRelay(RPC::JsonContext&);
-Json::Value
+json::Value
 doUnlList(RPC::JsonContext&);
-Json::Value
+json::Value
 doUnsubscribe(RPC::JsonContext&);
-Json::Value
+json::Value
 doValidationCreate(RPC::JsonContext&);
-Json::Value
+json::Value
 doWalletPropose(RPC::JsonContext&);
-Json::Value
+json::Value
 doValidators(RPC::JsonContext&);
-Json::Value
+json::Value
 doValidatorListSites(RPC::JsonContext&);
-Json::Value
+json::Value
 doValidatorInfo(RPC::JsonContext&);
-Json::Value
+json::Value
 doVaultInfo(RPC::JsonContext&);
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/VaultInfo.cpp b/src/xrpld/rpc/handlers/VaultInfo.cpp
index 711478658a..59795736ed 100644
--- a/src/xrpld/rpc/handlers/VaultInfo.cpp
+++ b/src/xrpld/rpc/handlers/VaultInfo.cpp
@@ -16,18 +16,18 @@
 namespace xrpl {
 
 static std::optional<uint256>
-parseVault(Json::Value const& params, Json::Value& jvResult)
+parseVault(json::Value const& params, json::Value& jvResult)
 {
     auto const hasVaultId = params.isMember(jss::vault_id);
     auto const hasOwner = params.isMember(jss::owner);
     auto const hasSeq = params.isMember(jss::seq);
 
-    uint256 uNodeIndex = beast::zero;
+    uint256 uNodeIndex = beast::kZERO;
     if (hasVaultId && !hasOwner && !hasSeq)
     {
         if (!uNodeIndex.parseHex(params[jss::vault_id].asString()))
         {
-            RPC::inject_error(rpcINVALID_PARAMS, jvResult);
+            RPC::injectError(RpcInvalidParams, jvResult);
             return std::nullopt;
         }
         // else uNodeIndex holds the value we need
@@ -37,14 +37,14 @@ parseVault(Json::Value const& params, Json::Value& jvResult)
         auto const id = parseBase58<AccountID>(params[jss::owner].asString());
         if (!id)
         {
-            RPC::inject_error(rpcACT_MALFORMED, jvResult);
+            RPC::injectError(RpcActMalformed, jvResult);
             return std::nullopt;
         }
         if (!(params[jss::seq].isInt() || params[jss::seq].isUInt()) ||
             params[jss::seq].asDouble() <= 0.0 ||
-            params[jss::seq].asDouble() > double(Json::Value::maxUInt))
+            params[jss::seq].asDouble() > double(json::Value::kMAX_U_INT))
         {
-            RPC::inject_error(rpcINVALID_PARAMS, jvResult);
+            RPC::injectError(RpcInvalidParams, jvResult);
             return std::nullopt;
         }
 
@@ -53,14 +53,14 @@ parseVault(Json::Value const& params, Json::Value& jvResult)
     else
     {
         // Invalid combination of fields vault_id/owner/seq
-        RPC::inject_error(rpcINVALID_PARAMS, jvResult);
+        RPC::injectError(RpcInvalidParams, jvResult);
         return std::nullopt;
     }
 
     return uNodeIndex;
 }
 
-Json::Value
+json::Value
 doVaultInfo(RPC::JsonContext& context)
 {
     std::shared_ptr<ReadView const> lpLedger;
@@ -69,8 +69,8 @@ doVaultInfo(RPC::JsonContext& context)
     if (!lpLedger)
         return jvResult;
 
-    auto const uNodeIndex = parseVault(context.params, jvResult).value_or(beast::zero);
-    if (uNodeIndex == beast::zero)
+    auto const uNodeIndex = parseVault(context.params, jvResult).value_or(beast::kZERO);
+    if (uNodeIndex == beast::kZERO)
     {
         jvResult[jss::error] = "malformedRequest";
         return jvResult;
@@ -86,10 +86,10 @@ doVaultInfo(RPC::JsonContext& context)
         return jvResult;
     }
 
-    Json::Value& vault = jvResult[jss::vault];
-    vault = sleVault->getJson(JsonOptions::none);
+    json::Value& vault = jvResult[jss::vault];
+    vault = sleVault->getJson(JsonOptions::KNone);
     auto& share = vault[jss::shares];
-    share = sleIssuance->getJson(JsonOptions::none);
+    share = sleIssuance->getJson(JsonOptions::KNone);
 
     jvResult[jss::vault] = vault;
     return jvResult;
diff --git a/src/xrpld/rpc/handlers/account/AccountChannels.cpp b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
index 51282f699f..52c6b3148f 100644
--- a/src/xrpld/rpc/handlers/account/AccountChannels.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountChannels.cpp
@@ -36,9 +36,9 @@
 namespace xrpl {
 
 void
-addChannel(Json::Value& jsonLines, SLE const& line)
+addChannel(json::Value& jsonLines, SLE const& line)
 {
-    Json::Value& jDst(jsonLines.append(Json::objectValue));
+    json::Value& jDst(jsonLines.append(json::ObjectValue));
     jDst[jss::channel_id] = to_string(line.key());
     jDst[jss::account] = to_string(line[sfAccount]);
     jDst[jss::destination_account] = to_string(line[sfDestination]);
@@ -68,15 +68,15 @@ addChannel(Json::Value& jsonLines, SLE const& line)
 //   limit: integer                 // optional
 //   marker: opaque                 // optional, resume previous query
 // }
-Json::Value
+json::Value
 doAccountChannels(RPC::JsonContext& context)
 {
     auto const& params(context.params);
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     std::shared_ptr<ReadView const> ledger;
     auto result = RPC::lookupLedger(ledger, context);
@@ -86,18 +86,18 @@ doAccountChannels(RPC::JsonContext& context)
     auto id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
     }
     AccountID const accountID{id.value()};
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     std::string strDst;
     if (params.isMember(jss::destination_account))
     {
         if (!params[jss::destination_account].isString())
-            return RPC::invalid_field_error(jss::destination_account);
+            return RPC::invalidFieldError(jss::destination_account);
         strDst = params[jss::destination_account].asString();
     }
 
@@ -105,13 +105,13 @@ doAccountChannels(RPC::JsonContext& context)
         return strDst.empty() ? std::nullopt : parseBase58<AccountID>(strDst);
     }();
     if (!strDst.empty() && !raDstAccount)
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::accountChannels, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_CHANNELS, context))
         return *err;
 
-    Json::Value jsonChannels{Json::arrayValue};
+    json::Value jsonChannels{json::ArrayValue};
     struct VisitData
     {
         std::vector<std::shared_ptr<SLE const>> items;
@@ -120,26 +120,26 @@ doAccountChannels(RPC::JsonContext& context)
     };
     VisitData visitData = {.items = {}, .accountID = accountID, .raDstAccount = raDstAccount};
     visitData.items.reserve(limit);
-    uint256 startAfter = beast::zero;
+    uint256 startAfter = beast::kZERO;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
     {
         if (!params[jss::marker].isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         // Marker is composed of a comma separated index and start hint. The
         // former will be read as hex, and the latter using boost lexical cast.
         std::stringstream marker(params[jss::marker].asString());
         std::string value;
         if (!std::getline(marker, value, ','))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!startAfter.parseHex(value))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!std::getline(marker, value, ','))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         try
         {
@@ -147,7 +147,7 @@ doAccountChannels(RPC::JsonContext& context)
         }
         catch (boost::bad_lexical_cast&)
         {
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
         }
 
         // We then must check if the object pointed to by the marker is actually
@@ -155,10 +155,10 @@ doAccountChannels(RPC::JsonContext& context)
         auto const sle = ledger->read({ltANY, startAfter});
 
         if (!sle)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!RPC::isRelatedToAccount(*ledger, sle, accountID))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
     }
 
     auto count = 0;
@@ -197,7 +197,7 @@ doAccountChannels(RPC::JsonContext& context)
                 return true;
             }))
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // Both conditions need to be checked because marker is set on the limit-th
@@ -214,7 +214,7 @@ doAccountChannels(RPC::JsonContext& context)
     for (auto const& item : visitData.items)
         addChannel(jsonChannels, *item);
 
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     result[jss::channels] = std::move(jsonChannels);
     return result;
 }
diff --git a/src/xrpld/rpc/handlers/account/AccountCurrencies.cpp b/src/xrpld/rpc/handlers/account/AccountCurrencies.cpp
index dfcfffbf27..1ea629c5ff 100644
--- a/src/xrpld/rpc/handlers/account/AccountCurrencies.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountCurrencies.cpp
@@ -18,25 +18,25 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doAccountCurrencies(RPC::JsonContext& context)
 {
     auto& params = context.params;
 
     if (!(params.isMember(jss::account) || params.isMember(jss::ident)))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     std::string strIdent;
     if (params.isMember(jss::account))
     {
         if (!params[jss::account].isString())
-            return RPC::invalid_field_error(jss::account);
+            return RPC::invalidFieldError(jss::account);
         strIdent = params[jss::account].asString();
     }
     else if (params.isMember(jss::ident))
     {
         if (!params[jss::ident].isString())
-            return RPC::invalid_field_error(jss::ident);
+            return RPC::invalidFieldError(jss::ident);
         strIdent = params[jss::ident].asString();
     }
 
@@ -50,13 +50,13 @@ doAccountCurrencies(RPC::JsonContext& context)
     auto id = parseBase58<AccountID>(strIdent);
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     std::set<Currency> send, receive;
     for (auto const& rspEntry : RPCTrustLine::getItems(accountID, *ledger))
@@ -72,11 +72,11 @@ doAccountCurrencies(RPC::JsonContext& context)
     send.erase(badCurrency());
     receive.erase(badCurrency());
 
-    Json::Value& sendCurrencies = (result[jss::send_currencies] = Json::arrayValue);
+    json::Value& sendCurrencies = (result[jss::send_currencies] = json::ArrayValue);
     for (auto const& c : send)
         sendCurrencies.append(to_string(c));
 
-    Json::Value& recvCurrencies = (result[jss::receive_currencies] = Json::arrayValue);
+    json::Value& recvCurrencies = (result[jss::receive_currencies] = json::ArrayValue);
     for (auto const& c : receive)
         recvCurrencies.append(to_string(c));
 
diff --git a/src/xrpld/rpc/handlers/account/AccountInfo.cpp b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
index c1c6c71339..69b0fb2879 100644
--- a/src/xrpld/rpc/handlers/account/AccountInfo.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountInfo.cpp
@@ -47,9 +47,9 @@ namespace xrpl {
  * If the entry is not an account root, sets the 'Invalid' field to true.
  */
 void
-injectSLE(Json::Value& jv, SLE const& sle)
+injectSLE(json::Value& jv, SLE const& sle)
 {
-    jv = sle.getJson(JsonOptions::none);
+    jv = sle.getJson(JsonOptions::KNone);
     if (sle.getType() == ltACCOUNT_ROOT)
     {
         if (sle.isFieldPresent(sfEmailHash))
@@ -83,7 +83,7 @@ injectSLE(Json::Value& jv, SLE const& sle)
 // }
 
 // TODO(tom): what is that "default"?
-Json::Value
+json::Value
 doAccountInfo(RPC::JsonContext& context)
 {
     auto& params = context.params;
@@ -92,18 +92,18 @@ doAccountInfo(RPC::JsonContext& context)
     if (params.isMember(jss::account))
     {
         if (!params[jss::account].isString())
-            return RPC::invalid_field_error(jss::account);
+            return RPC::invalidFieldError(jss::account);
         strIdent = params[jss::account].asString();
     }
     else if (params.isMember(jss::ident))
     {
         if (!params[jss::ident].isString())
-            return RPC::invalid_field_error(jss::ident);
+            return RPC::invalidFieldError(jss::ident);
         strIdent = params[jss::ident].asString();
     }
     else
     {
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
     }
 
     std::shared_ptr<ReadView const> ledger;
@@ -116,12 +116,12 @@ doAccountInfo(RPC::JsonContext& context)
     auto id = parseBase58<AccountID>(strIdent);
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
 
-    static constexpr std::array<std::pair<std::string_view, LedgerSpecificFlags>, 9> lsFlags{
+    static constexpr std::array<std::pair<std::string_view, LedgerSpecificFlags>, 9> kLS_FLAGS{
         {{"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>
-        disallowIncomingFlags{
+        kDISALLOW_INCOMING_FLAGS{
             {{"disallowIncomingNFTokenOffer", lsfDisallowIncomingNFTokenOffer},
              {"disallowIncomingCheck", lsfDisallowIncomingCheck},
              {"disallowIncomingPayChan", lsfDisallowIncomingPayChan},
              {"disallowIncomingTrustline", lsfDisallowIncomingTrustline}}};
 
-    static constexpr std::pair<std::string_view, LedgerSpecificFlags> allowTrustLineClawbackFlag{
-        "allowTrustLineClawback", lsfAllowTrustLineClawback};
+    static constexpr std::pair<std::string_view, LedgerSpecificFlags>
+        kALLOW_TRUST_LINE_CLAWBACK_FLAG{"allowTrustLineClawback", lsfAllowTrustLineClawback};
 
-    static constexpr std::pair<std::string_view, LedgerSpecificFlags> allowTrustLineLockingFlag{
-        "allowTrustLineLocking", lsfAllowTrustLineLocking};
+    static constexpr std::pair<std::string_view, LedgerSpecificFlags>
+        kALLOW_TRUST_LINE_LOCKING_FLAG{"allowTrustLineLocking", lsfAllowTrustLineLocking};
 
     auto const sleAccepted = ledger->read(keylet::account(accountID));
     if (sleAccepted)
@@ -154,31 +154,31 @@ doAccountInfo(RPC::JsonContext& context)
         {
             // It doesn't make sense to request the queue
             // with any closed or validated ledger.
-            RPC::inject_error(rpcINVALID_PARAMS, result);
+            RPC::injectError(RpcInvalidParams, result);
             return result;
         }
 
-        Json::Value jvAccepted(Json::objectValue);
+        json::Value jvAccepted(json::ObjectValue);
         injectSLE(jvAccepted, *sleAccepted);
         result[jss::account_data] = jvAccepted;
 
-        Json::Value acctFlags{Json::objectValue};
-        for (auto const& lsf : lsFlags)
+        json::Value acctFlags{json::ObjectValue};
+        for (auto const& lsf : kLS_FLAGS)
             acctFlags[lsf.first.data()] = sleAccepted->isFlag(lsf.second);
 
-        for (auto const& lsf : disallowIncomingFlags)
+        for (auto const& lsf : kDISALLOW_INCOMING_FLAGS)
             acctFlags[lsf.first.data()] = sleAccepted->isFlag(lsf.second);
 
         if (ledger->rules().enabled(featureClawback))
         {
-            acctFlags[allowTrustLineClawbackFlag.first.data()] =
-                sleAccepted->isFlag(allowTrustLineClawbackFlag.second);
+            acctFlags[kALLOW_TRUST_LINE_CLAWBACK_FLAG.first.data()] =
+                sleAccepted->isFlag(kALLOW_TRUST_LINE_CLAWBACK_FLAG.second);
         }
 
         if (ledger->rules().enabled(featureTokenEscrow))
         {
-            acctFlags[allowTrustLineLockingFlag.first.data()] =
-                sleAccepted->isFlag(allowTrustLineLockingFlag.second);
+            acctFlags[kALLOW_TRUST_LINE_LOCKING_FLAG.first.data()] =
+                sleAccepted->isFlag(kALLOW_TRUST_LINE_LOCKING_FLAG.second);
         }
 
         result[jss::account_flags] = std::move(acctFlags);
@@ -209,7 +209,7 @@ doAccountInfo(RPC::JsonContext& context)
         if (context.apiVersion > 1u && params.isMember(jss::signer_lists) &&
             !params[jss::signer_lists].isBool())
         {
-            RPC::inject_error(rpcINVALID_PARAMS, result);
+            RPC::injectError(RpcInvalidParams, result);
             return result;
         }
 
@@ -218,13 +218,13 @@ doAccountInfo(RPC::JsonContext& context)
         {
             // We put the SignerList in an array because of an anticipated
             // future when we support multiple signer lists on one account.
-            Json::Value jvSignerList = Json::arrayValue;
+            json::Value jvSignerList = json::ArrayValue;
 
             // This code will need to be revisited if in the future we support
             // multiple SignerLists on one account.
             auto const sleSigners = ledger->read(keylet::signers(accountID));
             if (sleSigners)
-                jvSignerList.append(sleSigners->getJson(JsonOptions::none));
+                jvSignerList.append(sleSigners->getJson(JsonOptions::KNone));
 
             // Documentation states this is returned as part of the account_info
             // response, but previously the code put it under account_data. We
@@ -242,15 +242,15 @@ doAccountInfo(RPC::JsonContext& context)
         // Return queue info if that is requested
         if (queue)
         {
-            Json::Value jvQueueData = Json::objectValue;
+            json::Value jvQueueData = json::ObjectValue;
 
             auto const txs = context.app.getTxQ().getAccountTxs(accountID);
             if (!txs.empty())
             {
-                jvQueueData[jss::txn_count] = static_cast<Json::UInt>(txs.size());
+                jvQueueData[jss::txn_count] = static_cast<json::UInt>(txs.size());
 
                 auto& jvQueueTx = jvQueueData[jss::transactions];
-                jvQueueTx = Json::arrayValue;
+                jvQueueTx = json::ArrayValue;
 
                 std::uint32_t seqCount = 0;
                 std::uint32_t ticketCount = 0;
@@ -266,7 +266,7 @@ doAccountInfo(RPC::JsonContext& context)
                 SeqProxy prevSeqProxy = SeqProxy::sequence(0);
                 for (auto const& tx : txs)
                 {
-                    Json::Value jvTx = Json::objectValue;
+                    json::Value jvTx = json::ObjectValue;
 
                     if (tx.seqProxy.isSeq())
                     {
@@ -334,7 +334,7 @@ doAccountInfo(RPC::JsonContext& context)
     else
     {
         result[jss::account] = toBase58(accountID);
-        RPC::inject_error(rpcACT_NOT_FOUND, result);
+        RPC::injectError(RpcActNotFound, result);
     }
 
     return result;
diff --git a/src/xrpld/rpc/handlers/account/AccountLines.cpp b/src/xrpld/rpc/handlers/account/AccountLines.cpp
index 5a879f0cbe..7d0d4daa5a 100644
--- a/src/xrpld/rpc/handlers/account/AccountLines.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountLines.cpp
@@ -35,12 +35,12 @@
 namespace xrpl {
 
 void
-addLine(Json::Value& jsonLines, RPCTrustLine const& line)
+addLine(json::Value& jsonLines, RPCTrustLine const& line)
 {
     STAmount const& saBalance(line.getBalance());
     STAmount const& saLimit(line.getLimit());
     STAmount const& saLimitPeer(line.getLimitPeer());
-    Json::Value& jPeer(jsonLines.append(Json::objectValue));
+    json::Value& jPeer(jsonLines.append(json::ObjectValue));
 
     jPeer[jss::account] = to_string(line.getAccountIDPeer());
     // Amount reported is positive if current account holds other
@@ -81,15 +81,15 @@ addLine(Json::Value& jsonLines, RPCTrustLine const& line)
 //   ignore_default: bool           // do not return lines in default state (on
 //   this account's side)
 // }
-Json::Value
+json::Value
 doAccountLines(RPC::JsonContext& context)
 {
     auto const& params(context.params);
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     std::shared_ptr<ReadView const> ledger;
     auto result = RPC::lookupLedger(ledger, context);
@@ -99,13 +99,13 @@ doAccountLines(RPC::JsonContext& context)
     auto id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     std::string strPeer;
     if (params.isMember(jss::peer))
@@ -116,12 +116,12 @@ doAccountLines(RPC::JsonContext& context)
     }();
     if (!strPeer.empty() && !raPeerAccount)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::accountLines, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_LINES, context))
         return *err;
 
     // this flag allows the requester to ask incoming trustlines in default
@@ -129,7 +129,7 @@ doAccountLines(RPC::JsonContext& context)
     bool const ignoreDefault =
         params.isMember(jss::ignore_default) && params[jss::ignore_default].asBool();
 
-    Json::Value& jsonLines(result[jss::lines] = Json::arrayValue);
+    json::Value& jsonLines(result[jss::lines] = json::ArrayValue);
     struct VisitData
     {
         std::vector<RPCTrustLine> items;
@@ -144,26 +144,26 @@ doAccountLines(RPC::JsonContext& context)
         .raPeerAccount = raPeerAccount,
         .ignoreDefault = ignoreDefault,
         .foundCount = 0};
-    uint256 startAfter = beast::zero;
+    uint256 startAfter = beast::kZERO;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
     {
         if (!params[jss::marker].isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         // Marker is composed of a comma separated index and start hint. The
         // former will be read as hex, and the latter using boost lexical cast.
         std::stringstream marker(params[jss::marker].asString());
         std::string value;
         if (!std::getline(marker, value, ','))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!startAfter.parseHex(value))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!std::getline(marker, value, ','))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         try
         {
@@ -171,7 +171,7 @@ doAccountLines(RPC::JsonContext& context)
         }
         catch (boost::bad_lexical_cast&)
         {
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
         }
 
         // We then must check if the object pointed to by the marker is actually
@@ -179,10 +179,10 @@ doAccountLines(RPC::JsonContext& context)
         auto const sle = ledger->read({ltANY, startAfter});
 
         if (!sle)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!RPC::isRelatedToAccount(*ledger, sle, accountID))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
     }
 
     auto count = 0;
@@ -242,7 +242,7 @@ doAccountLines(RPC::JsonContext& context)
                     return true;
                 }))
         {
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
         }
     }
 
@@ -260,7 +260,7 @@ doAccountLines(RPC::JsonContext& context)
     for (auto const& item : visitData.items)
         addLine(jsonLines, item);
 
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountNFTs.cpp b/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
index 605dd3b07c..077001e543 100644
--- a/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountNFTs.cpp
@@ -32,20 +32,20 @@ namespace xrpl {
       marker: <opaque> // optional, resume previous query
     }
 */
-Json::Value
+json::Value
 doAccountNFTs(RPC::JsonContext& context)
 {
     auto const& params = context.params;
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     auto id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
     }
 
     std::shared_ptr<ReadView const> ledger;
@@ -55,10 +55,10 @@ doAccountNFTs(RPC::JsonContext& context)
     auto const accountID{id.value()};
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::accountNFTokens, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_NF_TOKENS, context))
         return *err;
 
     uint256 marker;
@@ -68,25 +68,25 @@ doAccountNFTs(RPC::JsonContext& context)
     {
         auto const& m = params[jss::marker];
         if (!m.isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         if (!marker.parseHex(m.asString()))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
     }
 
-    auto const first = keylet::nftpage(keylet::nftpage_min(accountID), marker);
-    auto const last = keylet::nftpage_max(accountID);
+    auto const first = keylet::nftpage(keylet::nftpageMin(accountID), marker);
+    auto const last = keylet::nftpageMax(accountID);
 
     auto cp = ledger->read(
         Keylet(ltNFTOKEN_PAGE, ledger->succ(first.key, last.key.next()).value_or(last.key)));
 
     std::uint32_t cnt = 0;
-    auto& nfts = (result[jss::account_nfts] = Json::arrayValue);
+    auto& nfts = (result[jss::account_nfts] = json::ArrayValue);
 
     // Continue iteration from the current page:
     bool pastMarker = marker.isZero();
     bool markerFound = false;
-    uint256 const maskedMarker = marker & nft::pageMask;
+    uint256 const maskedMarker = marker & nft::kPAGE_MASK;
     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::pageMask;
+            uint256 const maskedNftokenID = nftokenID & nft::kPAGE_MASK;
 
             if (!pastMarker)
             {
@@ -123,12 +123,12 @@ doAccountNFTs(RPC::JsonContext& context)
             }
 
             if (markerSet && !markerFound)
-                return RPC::invalid_field_error(jss::marker);
+                return RPC::invalidFieldError(jss::marker);
 
             pastMarker = true;
 
             {
-                Json::Value& obj = nfts.append(o.getJson(JsonOptions::none));
+                json::Value& obj = nfts.append(o.getJson(JsonOptions::KNone));
 
                 // Pull out the components of the nft ID.
                 obj[sfFlags.jsonName] = nft::getFlags(nftokenID);
@@ -158,10 +158,10 @@ doAccountNFTs(RPC::JsonContext& context)
     }
 
     if (markerSet && !markerFound)
-        return RPC::invalid_field_error(jss::marker);
+        return RPC::invalidFieldError(jss::marker);
 
     result[jss::account] = toBase58(accountID);
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountObjects.cpp b/src/xrpld/rpc/handlers/account/AccountObjects.cpp
index 5b172cd4c3..c930333d91 100644
--- a/src/xrpld/rpc/handlers/account/AccountObjects.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountObjects.cpp
@@ -43,7 +43,7 @@ getAccountObjects(
     uint256 dirIndex,
     uint256 entryIndex,
     std::uint32_t const limit,
-    Json::Value& jvResult)
+    json::Value& jvResult)
 {
     // check if dirIndex is valid
     if (!dirIndex.isZero() && !ledger.read({ltDIR_NODE, dirIndex}))
@@ -59,21 +59,21 @@ getAccountObjects(
     // iterate NFT pages if the filter says so AND dirIndex == 0
     bool iterateNFTPages =
         (!typeFilter.has_value() || typeMatchesFilter(typeFilter.value(), ltNFTOKEN_PAGE)) &&
-        dirIndex == beast::zero;
+        dirIndex == beast::kZERO;
 
-    Keylet const firstNFTPage = keylet::nftpage_min(account);
+    Keylet const firstNFTPage = keylet::nftpageMin(account);
 
     // we need to check the marker to see if it is an NFTTokenPage index.
-    if (iterateNFTPages && entryIndex != beast::zero)
+    if (iterateNFTPages && entryIndex != beast::kZERO)
     {
         // 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::pageMask))
+        if (firstNFTPage.key != (entryIndex & ~nft::kPAGE_MASK))
             iterateNFTPages = false;
     }
 
-    auto& jvObjects = (jvResult[jss::account_objects] = Json::arrayValue);
+    auto& jvObjects = (jvResult[jss::account_objects] = json::ArrayValue);
 
     // this is a mutable version of limit, used to seamlessly switch
     // to iterating directory entries when nftokenpages are exhausted
@@ -83,9 +83,9 @@ getAccountObjects(
     if (iterateNFTPages)
     {
         Keylet const first =
-            entryIndex == beast::zero ? firstNFTPage : Keylet{ltNFTOKEN_PAGE, entryIndex};
+            entryIndex == beast::kZERO ? firstNFTPage : Keylet{ltNFTOKEN_PAGE, entryIndex};
 
-        Keylet const last = keylet::nftpage_max(account);
+        Keylet const last = keylet::nftpageMax(account);
 
         // current key
         uint256 ck = ledger.succ(first.key, last.key.next()).value_or(last.key);
@@ -95,7 +95,7 @@ getAccountObjects(
 
         while (cp)
         {
-            jvObjects.append(cp->getJson(JsonOptions::none));
+            jvObjects.append(cp->getJson(JsonOptions::KNone));
             auto const npm = (*cp)[~sfNextPageMin];
             if (npm)
             {
@@ -126,7 +126,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::zero;
+        entryIndex = beast::kZERO;
     }
 
     auto const root = keylet::ownerDir(account);
@@ -145,7 +145,7 @@ getAccountObjects(
         // directory entries. If there's no nftoken page, we will
         // give empty array for account_objects.
         if (mlimit >= limit)
-            jvResult[jss::account_objects] = Json::arrayValue;
+            jvResult[jss::account_objects] = json::ArrayValue;
 
         // non-zero dirIndex validity was checked in the beginning of this
         // function; by this point, it should be zero. This function returns
@@ -187,7 +187,7 @@ getAccountObjects(
             if (!typeFilter.has_value() ||
                 typeMatchesFilter(typeFilter.value(), sleNode->getType()))
             {
-                jvObjects.append(sleNode->getJson(JsonOptions::none));
+                jvObjects.append(sleNode->getJson(JsonOptions::KNone));
             }
 
             if (++i == mlimit)
@@ -226,15 +226,15 @@ getAccountObjects(
     }
 }
 
-Json::Value
+json::Value
 doAccountObjects(RPC::JsonContext& context)
 {
     auto const& params = context.params;
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     std::shared_ptr<ReadView const> ledger;
     auto result = RPC::lookupLedger(ledger, context);
@@ -244,13 +244,13 @@ doAccountObjects(RPC::JsonContext& context)
     auto const id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     std::optional<std::vector<LedgerEntryType>> typeFilter;
 
@@ -259,9 +259,9 @@ doAccountObjects(RPC::JsonContext& context)
     {
         struct
         {
-            Json::StaticString name;
+            json::StaticString name;
             LedgerEntryType type;
-        } static constexpr deletionBlockers[] = {
+        } static constexpr kDELETION_BLOCKERS[] = {
             {.name = jss::check, .type = ltCHECK},
             {.name = jss::escrow, .type = ltESCROW},
             {.name = jss::nft_page, .type = ltNFTOKEN_PAGE},
@@ -278,9 +278,9 @@ doAccountObjects(RPC::JsonContext& context)
         };
 
         typeFilter.emplace();
-        typeFilter->reserve(std::size(deletionBlockers));
+        typeFilter->reserve(std::size(kDELETION_BLOCKERS));
 
-        for (auto [name, type] : deletionBlockers)
+        for (auto [name, type] : kDELETION_BLOCKERS)
         {
             if (params.isMember(jss::type) && name != params[jss::type])
             {
@@ -295,7 +295,7 @@ doAccountObjects(RPC::JsonContext& context)
         auto [rpcStatus, type] = RPC::chooseLedgerEntryType(params);
 
         if (!RPC::isAccountObjectsValidType(type))
-            return RPC::invalid_field_error(jss::type);
+            return RPC::invalidFieldError(jss::type);
 
         if (rpcStatus)
         {
@@ -310,7 +310,7 @@ doAccountObjects(RPC::JsonContext& context)
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::accountObjects, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_OBJECTS, context))
         return *err;
 
     uint256 dirIndex;
@@ -319,25 +319,25 @@ doAccountObjects(RPC::JsonContext& context)
     {
         auto const& marker = params[jss::marker];
         if (!marker.isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         auto const& markerStr = marker.asString();
         auto const& idx = markerStr.find(',');
         if (idx == std::string::npos)
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
 
         if (!dirIndex.parseHex(markerStr.substr(0, idx)))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
 
         if (!entryIndex.parseHex(markerStr.substr(idx + 1)))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
     }
 
     if (!getAccountObjects(*ledger, accountID, typeFilter, dirIndex, entryIndex, limit, result))
-        return RPC::invalid_field_error(jss::marker);
+        return RPC::invalidFieldError(jss::marker);
 
     result[jss::account] = toBase58(accountID);
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountOffers.cpp b/src/xrpld/rpc/handlers/account/AccountOffers.cpp
index 19b88e7499..6314dc8ec2 100644
--- a/src/xrpld/rpc/handlers/account/AccountOffers.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountOffers.cpp
@@ -33,10 +33,10 @@
 namespace xrpl {
 
 void
-appendOfferJson(std::shared_ptr<SLE const> const& offer, Json::Value& offers)
+appendOfferJson(std::shared_ptr<SLE const> const& offer, json::Value& offers)
 {
     STAmount const dirRate = amountFromQuality(getQuality(offer->getFieldH256(sfBookDirectory)));
-    Json::Value& obj(offers.append(Json::objectValue));
+    json::Value& obj(offers.append(json::ObjectValue));
     offer->getFieldAmount(sfTakerPays).setJson(obj[jss::taker_pays]);
     offer->getFieldAmount(sfTakerGets).setJson(obj[jss::taker_gets]);
     obj[jss::seq] = offer->getFieldU32(sfSequence);
@@ -53,15 +53,15 @@ appendOfferJson(std::shared_ptr<SLE const> const& offer, Json::Value& offers)
 //   limit: integer                 // optional
 //   marker: opaque                 // optional, resume previous query
 // }
-Json::Value
+json::Value
 doAccountOffers(RPC::JsonContext& context)
 {
     auto const& params(context.params);
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     std::shared_ptr<ReadView const> ledger;
     auto result = RPC::lookupLedger(ledger, context);
@@ -71,7 +71,7 @@ doAccountOffers(RPC::JsonContext& context)
     auto id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
@@ -80,34 +80,34 @@ doAccountOffers(RPC::JsonContext& context)
     result[jss::account] = toBase58(accountID);
 
     if (!ledger->exists(keylet::account(accountID)))
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::accountOffers, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kACCOUNT_OFFERS, context))
         return *err;
 
-    Json::Value& jsonOffers(result[jss::offers] = Json::arrayValue);
+    json::Value& jsonOffers(result[jss::offers] = json::ArrayValue);
     std::vector<std::shared_ptr<SLE const>> offers;
-    uint256 startAfter = beast::zero;
+    uint256 startAfter = beast::kZERO;
     std::uint64_t startHint = 0;
 
     if (params.isMember(jss::marker))
     {
         if (!params[jss::marker].isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         // Marker is composed of a comma separated index and start hint. The
         // former will be read as hex, and the latter using boost lexical cast.
         std::stringstream marker(params[jss::marker].asString());
         std::string value;
         if (!std::getline(marker, value, ','))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
 
         if (!startAfter.parseHex(value))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
 
         if (!std::getline(marker, value, ','))
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
 
         try
         {
@@ -115,7 +115,7 @@ doAccountOffers(RPC::JsonContext& context)
         }
         catch (boost::bad_lexical_cast&)
         {
-            return RPC::invalid_field_error(jss::marker);
+            return RPC::invalidFieldError(jss::marker);
         }
 
         // We then must check if the object pointed to by the marker is actually
@@ -123,10 +123,10 @@ doAccountOffers(RPC::JsonContext& context)
         auto const sle = ledger->read({ltANY, startAfter});
 
         if (!sle)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         if (!RPC::isRelatedToAccount(*ledger, sle, accountID))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
     }
 
     auto count = 0;
@@ -162,7 +162,7 @@ doAccountOffers(RPC::JsonContext& context)
                 return true;
             }))
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     // Both conditions need to be checked because marker is set on the limit-th
@@ -177,7 +177,7 @@ doAccountOffers(RPC::JsonContext& context)
     for (auto const& offer : offers)
         appendOfferJson(offer, jsonOffers);
 
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/account/AccountTx.cpp b/src/xrpld/rpc/handlers/account/AccountTx.cpp
index c01fc044e7..7c8e45f523 100644
--- a/src/xrpld/rpc/handlers/account/AccountTx.cpp
+++ b/src/xrpld/rpc/handlers/account/AccountTx.cpp
@@ -46,10 +46,10 @@ using AccountTxResult = RelationalDatabase::AccountTxResult;
 using LedgerSpecifier = RelationalDatabase::LedgerSpecifier;
 
 // parses args into a ledger specifier, or returns a Json object on error
-std::variant<std::optional<LedgerSpecifier>, Json::Value>
-parseLedgerArgs(RPC::Context& context, Json::Value const& params)
+std::variant<std::optional<LedgerSpecifier>, json::Value>
+parseLedgerArgs(RPC::Context& context, json::Value const& params)
 {
-    Json::Value response;
+    json::Value response;
     // if ledger_index_min or max is specified, then ledger_hash or ledger_index
     // should not be specified. Error out if it is
     if (context.apiVersion > 1u)
@@ -57,7 +57,7 @@ parseLedgerArgs(RPC::Context& context, Json::Value const& params)
         if ((params.isMember(jss::ledger_index_min) || params.isMember(jss::ledger_index_max)) &&
             (params.isMember(jss::ledger_hash) || params.isMember(jss::ledger_index)))
         {
-            RPC::Status const status{rpcINVALID_PARAMS, "invalidParams"};
+            RPC::Status const status{RpcInvalidParams, "invalidParams"};
             status.inject(response);
             return response;
         }
@@ -80,7 +80,7 @@ parseLedgerArgs(RPC::Context& context, Json::Value const& params)
         auto& hashValue = params[jss::ledger_hash];
         if (!hashValue.isString())
         {
-            RPC::Status const status{rpcINVALID_PARAMS, "ledgerHashNotString"};
+            RPC::Status const status{RpcInvalidParams, "ledgerHashNotString"};
             status.inject(response);
             return response;
         }
@@ -88,7 +88,7 @@ parseLedgerArgs(RPC::Context& context, Json::Value const& params)
         LedgerHash hash;
         if (!hash.parseHex(hashValue.asString()))
         {
-            RPC::Status const status{rpcINVALID_PARAMS, "ledgerHashMalformed"};
+            RPC::Status const status{RpcInvalidParams, "ledgerHashMalformed"};
             status.inject(response);
             return response;
         }
@@ -119,7 +119,7 @@ parseLedgerArgs(RPC::Context& context, Json::Value const& params)
             }
             else
             {
-                RPC::Status const status{rpcINVALID_PARAMS, "ledger_index string malformed"};
+                RPC::Status const status{RpcInvalidParams, "ledger_index string malformed"};
                 status.inject(response);
                 return response;
             }
@@ -140,8 +140,8 @@ getLedgerRange(RPC::Context& context, std::optional<LedgerSpecifier> const& ledg
     {
         // Don't have a validated ledger range.
         if (context.apiVersion == 1)
-            return rpcLGR_IDXS_INVALID;
-        return rpcNOT_SYNCED;
+            return RpcLgrIdxsInvalid;
+        return RpcNotSynced;
     }
 
     std::uint32_t uLedgerMin = uValidatedMin;
@@ -162,7 +162,7 @@ getLedgerRange(RPC::Context& context, std::optional<LedgerSpecifier> const& ledg
                         if ((ls.max > uValidatedMax && ls.max != -1) ||
                             (ls.min < uValidatedMin && ls.min != 0))
                         {
-                            return rpcLGR_IDX_MALFORMED;
+                            return RpcLgrIdxMalformed;
                         }
                     }
                     if (ls.min > uValidatedMin)
@@ -176,8 +176,8 @@ getLedgerRange(RPC::Context& context, std::optional<LedgerSpecifier> const& ledg
                     if (uLedgerMax < uLedgerMin)
                     {
                         if (context.apiVersion == 1)
-                            return rpcLGR_IDXS_INVALID;
-                        return rpcINVALID_LGR_RANGE;
+                            return RpcLgrIdxsInvalid;
+                        return RpcInvalidLgrRange;
                     }
                 }
                 else
@@ -194,11 +194,11 @@ getLedgerRange(RPC::Context& context, std::optional<LedgerSpecifier> const& ledg
                     if (!validated || ledgerView->header().seq > uValidatedMax ||
                         ledgerView->header().seq < uValidatedMin)
                     {
-                        return rpcLGR_NOT_VALIDATED;
+                        return RpcLgrNotValidated;
                     }
                     uLedgerMin = uLedgerMax = ledgerView->header().seq;
                 }
-                return RPC::Status::OK;
+                return RPC::Status::kOK;
             },
             *ledgerSpecifier);
 
@@ -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::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
 
     AccountTxResult result;
 
@@ -269,18 +269,18 @@ doAccountTxHelp(RPC::Context& context, AccountTxArgs const& args)
     result.limit = args.limit;
     JLOG(context.j.debug()) << __func__ << " : finished";
 
-    return {result, rpcSUCCESS};
+    return {result, RpcSuccess};
 }
 
-Json::Value
+json::Value
 populateJsonResponse(
     std::pair<AccountTxResult, RPC::Status> const& res,
     AccountTxArgs const& args,
     RPC::JsonContext const& context)
 {
-    Json::Value response;
+    json::Value response;
     RPC::Status const& error = res.second;
-    if (error.toErrorCode() != rpcSUCCESS)
+    if (error.toErrorCode() != RpcSuccess)
     {
         error.inject(response);
     }
@@ -293,7 +293,7 @@ populateJsonResponse(
         response[jss::ledger_index_min] = result.ledgerRange.min;
         response[jss::ledger_index_max] = result.ledgerRange.max;
 
-        Json::Value& jvTxns = (response[jss::transactions] = Json::arrayValue);
+        json::Value& jvTxns = (response[jss::transactions] = json::ArrayValue);
 
         if (auto txnsData = std::get_if<TxnsData>(&result.transactions))
         {
@@ -303,14 +303,14 @@ populateJsonResponse(
             {
                 if (txn)
                 {
-                    Json::Value& jvObj = jvTxns.append(Json::objectValue);
+                    json::Value& jvObj = jvTxns.append(json::ObjectValue);
                     jvObj[jss::validated] = true;
 
-                    auto const json_tx = (context.apiVersion > 1 ? jss::tx_json : jss::tx);
+                    auto const jsonTx = (context.apiVersion > 1 ? jss::tx_json : jss::tx);
                     if (context.apiVersion > 1)
                     {
-                        jvObj[json_tx] = txn->getJson(
-                            JsonOptions::include_date | JsonOptions::disable_API_prior_V2, false);
+                        jvObj[jsonTx] = txn->getJson(
+                            JsonOptions::KIncludeDate | JsonOptions::KDisableApiPriorV2, false);
                         jvObj[jss::hash] = to_string(txn->getID());
                         jvObj[jss::ledger_index] = txn->getLedger();
                         jvObj[jss::ledger_hash] =
@@ -318,18 +318,18 @@ populateJsonResponse(
 
                         if (auto closeTime =
                                 context.ledgerMaster.getCloseTimeBySeq(txn->getLedger()))
-                            jvObj[jss::close_time_iso] = to_string_iso(*closeTime);
+                            jvObj[jss::close_time_iso] = toStringIso(*closeTime);
                     }
                     else
                     {
-                        jvObj[json_tx] = txn->getJson(JsonOptions::include_date);
+                        jvObj[jsonTx] = txn->getJson(JsonOptions::KIncludeDate);
                     }
 
                     auto const& sttx = txn->getSTransaction();
-                    RPC::insertDeliverMax(jvObj[json_tx], sttx->getTxnType(), context.apiVersion);
+                    RPC::insertDeliverMax(jvObj[jsonTx], sttx->getTxnType(), context.apiVersion);
                     if (txnMeta)
                     {
-                        jvObj[jss::meta] = txnMeta->getJson(JsonOptions::include_date);
+                        jvObj[jss::meta] = txnMeta->getJson(JsonOptions::KIncludeDate);
                         insertDeliveredAmount(jvObj[jss::meta], context, txn, *txnMeta);
                         RPC::insertNFTSyntheticInJson(jvObj, sttx, *txnMeta);
                         RPC::insertMPTokenIssuanceID(jvObj[jss::meta], sttx, *txnMeta);
@@ -351,11 +351,11 @@ populateJsonResponse(
 
             for (auto const& binaryData : std::get<TxnsDataBinary>(result.transactions))
             {
-                Json::Value& jvObj = jvTxns.append(Json::objectValue);
+                json::Value& jvObj = jvTxns.append(json::ObjectValue);
 
                 jvObj[jss::tx_blob] = strHex(std::get<0>(binaryData));
-                auto const json_meta = (context.apiVersion > 1 ? jss::meta_blob : jss::meta);
-                jvObj[json_meta] = strHex(std::get<1>(binaryData));
+                auto const jsonMeta = (context.apiVersion > 1 ? jss::meta_blob : jss::meta);
+                jvObj[jsonMeta] = strHex(std::get<1>(binaryData));
                 jvObj[jss::ledger_index] = std::get<2>(binaryData);
                 jvObj[jss::validated] = true;
             }
@@ -363,7 +363,7 @@ populateJsonResponse(
 
         if (result.marker)
         {
-            response[jss::marker] = Json::objectValue;
+            response[jss::marker] = json::ObjectValue;
             response[jss::marker][jss::ledger] = result.marker->ledgerSeq;
             response[jss::marker][jss::seq] = result.marker->txnSeq;
         }
@@ -383,15 +383,15 @@ populateJsonResponse(
 //   marker: object {ledger: ledger_index, seq: txn_sequence} // optional,
 //   resume previous query
 // }
-Json::Value
+json::Value
 doAccountTx(RPC::JsonContext& context)
 {
     if (!context.app.config().useTxTables())
-        return rpcError(rpcNOT_ENABLED);
+        return rpcError(RpcNotEnabled);
 
     auto& params = context.params;
     AccountTxArgs args;
-    Json::Value response;
+    json::Value response;
 
     // The document[https://xrpl.org/account_tx.html#account_tx] states that
     // binary and forward params are both boolean values, however, assigning any
@@ -399,33 +399,33 @@ doAccountTx(RPC::JsonContext& context)
     // onwards only
     if (context.apiVersion > 1u && params.isMember(jss::binary) && !params[jss::binary].isBool())
     {
-        return RPC::invalid_field_error(jss::binary);
+        return RPC::invalidFieldError(jss::binary);
     }
     if (context.apiVersion > 1u && params.isMember(jss::forward) && !params[jss::forward].isBool())
     {
-        return RPC::invalid_field_error(jss::forward);
+        return RPC::invalidFieldError(jss::forward);
     }
 
-    if (auto const err = RPC::readLimitField(args.limit, RPC::Tuning::accountTx, context))
+    if (auto const err = RPC::readLimitField(args.limit, RPC::Tuning::kACCOUNT_TX, context))
         return *err;
 
     args.binary = params.isMember(jss::binary) && params[jss::binary].asBool();
     args.forward = params.isMember(jss::forward) && params[jss::forward].asBool();
 
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     auto const account = parseBase58<AccountID>(params[jss::account].asString());
     if (!account)
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
 
     args.account = *account;
 
     auto parseRes = parseLedgerArgs(context, params);
-    if (auto jv = std::get_if<Json::Value>(&parseRes))
+    if (auto jv = std::get_if<json::Value>(&parseRes))
     {
         return *jv;
     }
@@ -436,11 +436,11 @@ doAccountTx(RPC::JsonContext& context)
     {
         auto& token = params[jss::marker];
         if (!token.isMember(jss::ledger) || !token.isMember(jss::seq) ||
-            !token[jss::ledger].isConvertibleTo(Json::ValueType::uintValue) ||
-            !token[jss::seq].isConvertibleTo(Json::ValueType::uintValue))
+            !token[jss::ledger].isConvertibleTo(json::ValueType::UintValue) ||
+            !token[jss::seq].isConvertibleTo(json::ValueType::UintValue))
         {
             RPC::Status const status{
-                rpcINVALID_PARAMS,
+                RpcInvalidParams,
                 "invalid marker. Provide ledger index via ledger field, and "
                 "transaction sequence number via seq field"};
             status.inject(response);
diff --git a/src/xrpld/rpc/handlers/account/GatewayBalances.cpp b/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
index 81e464ba87..7b6d6ca07b 100644
--- a/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
+++ b/src/xrpld/rpc/handlers/account/GatewayBalances.cpp
@@ -48,7 +48,7 @@ namespace xrpl {
 
 // gateway_balances [<ledger>] <account> [<hotwallet> [<hotwallet [...
 
-Json::Value
+json::Value
 doGatewayBalances(RPC::JsonContext& context)
 {
     auto& params = context.params;
@@ -61,7 +61,7 @@ doGatewayBalances(RPC::JsonContext& context)
         return result;
 
     if (!(params.isMember(jss::account) || params.isMember(jss::ident)))
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
 
     std::string const strIdent(
         params.isMember(jss::account) ? params[jss::account].asString()
@@ -70,15 +70,15 @@ doGatewayBalances(RPC::JsonContext& context)
     // Get info on account.
     auto id = parseBase58<AccountID>(strIdent);
     if (!id)
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
     auto const accountID{id.value()};
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
 
     result[jss::account] = toBase58(accountID);
 
     if (context.apiVersion > 1u && !ledger->exists(keylet::account(accountID)))
     {
-        RPC::inject_error(rpcACT_NOT_FOUND, result);
+        RPC::injectError(RpcActNotFound, result);
         return result;
     }
 
@@ -87,7 +87,7 @@ doGatewayBalances(RPC::JsonContext& context)
 
     if (params.isMember(jss::hotwallet))
     {
-        auto addHotWallet = [&hotWallets](Json::Value const& j) {
+        auto addHotWallet = [&hotWallets](json::Value const& j) {
             if (j.isString())
             {
                 if (auto id = parseBase58<AccountID>(j.asString()); id)
@@ -100,7 +100,7 @@ doGatewayBalances(RPC::JsonContext& context)
             return false;
         };
 
-        Json::Value const& hw = params[jss::hotwallet];
+        json::Value const& hw = params[jss::hotwallet];
         bool valid = true;
 
         // null is treated as a valid 0-sized array of hotwallet
@@ -126,11 +126,11 @@ doGatewayBalances(RPC::JsonContext& context)
             // not have currency issued by the account from the request.
             if (context.apiVersion < 2u)
             {
-                RPC::inject_error(rpcINVALID_HOTWALLET, result);
+                RPC::injectError(RpcInvalidHotwallet, result);
             }
             else
             {
-                RPC::inject_error(rpcINVALID_PARAMS, result);
+                RPC::injectError(RpcInvalidParams, result);
             }
             return result;
         }
@@ -153,7 +153,7 @@ doGatewayBalances(RPC::JsonContext& context)
                     return;
 
                 auto& bal = locked[escrow.get<Issue>().currency];
-                if (bal == beast::zero)
+                if (bal == beast::kZERO)
                 {
                     // This is needed to set the currency code correctly
                     bal = escrow;
@@ -170,7 +170,8 @@ 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::cMaxValue, STAmount::cMaxOffset);
+                        bal =
+                            STAmount(bal.get<Issue>(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
                     }
                 }
             }
@@ -209,7 +210,7 @@ doGatewayBalances(RPC::JsonContext& context)
             {
                 // normal negative balance, obligation to customer
                 auto& bal = sums[rs->getBalance().get<Issue>().currency];
-                if (bal == beast::zero)
+                if (bal == beast::kZERO)
                 {
                     // This is needed to set the currency code correctly
                     bal = -rs->getBalance();
@@ -226,7 +227,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::cMaxValue, STAmount::cMaxOffset);
+                        bal = STAmount(bal.asset(), STAmount::kMAX_VALUE, STAmount::kMAX_OFFSET);
                     }
                 }
             }
@@ -235,7 +236,7 @@ doGatewayBalances(RPC::JsonContext& context)
 
     if (!sums.empty())
     {
-        Json::Value j;
+        json::Value j;
         for (auto const& [k, v] : sums)
         {
             j[to_string(k)] = v.getText();
@@ -245,16 +246,16 @@ doGatewayBalances(RPC::JsonContext& context)
 
     auto populateResult = [&result](
                               std::map<AccountID, std::vector<STAmount>> const& array,
-                              Json::StaticString const& name) {
+                              json::StaticString const& name) {
         if (!array.empty())
         {
-            Json::Value j;
+            json::Value j;
             for (auto const& [accId, accBalances] : array)
             {
-                Json::Value balanceArray;
+                json::Value balanceArray;
                 for (auto const& balance : accBalances)
                 {
-                    Json::Value entry;
+                    json::Value entry;
                     entry[jss::currency] = to_string(balance.get<Issue>().currency);
                     entry[jss::value] = balance.getText();
                     balanceArray.append(std::move(entry));
@@ -272,7 +273,7 @@ doGatewayBalances(RPC::JsonContext& context)
     // Add total escrow to the result
     if (!locked.empty())
     {
-        Json::Value j;
+        json::Value j;
         for (auto const& [k, v] : locked)
         {
             j[to_string(k)] = v.getText();
diff --git a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
index d05d74170f..2f4c90e4e7 100644
--- a/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
+++ b/src/xrpld/rpc/handlers/account/NoRippleCheck.cpp
@@ -27,12 +27,12 @@ namespace xrpl {
 static void
 fillTransaction(
     RPC::JsonContext& context,
-    Json::Value& txArray,
+    json::Value& txArray,
     AccountID const& accountID,
     std::uint32_t& sequence,
     ReadView const& ledger)
 {
-    txArray["Sequence"] = Json::UInt(sequence++);
+    txArray["Sequence"] = json::UInt(sequence++);
     txArray["Account"] = toBase58(accountID);
     auto& fees = ledger.fees();
     // Convert the reference transaction cost in fee units to drops
@@ -48,18 +48,18 @@ fillTransaction(
 //   role: gateway|user             // account role to assume
 //   transactions: true             // optional, recommend transactions
 // }
-Json::Value
+json::Value
 doNoRippleCheck(RPC::JsonContext& context)
 {
     auto const& params(context.params);
     if (!params.isMember(jss::account))
-        return RPC::missing_field_error("account");
+        return RPC::missingFieldError("account");
 
     if (!params.isMember("role"))
-        return RPC::missing_field_error("role");
+        return RPC::missingFieldError("role");
 
     if (!params[jss::account].isString())
-        return RPC::invalid_field_error(jss::account);
+        return RPC::invalidFieldError(jss::account);
 
     bool roleGateway = false;
     {
@@ -70,12 +70,12 @@ doNoRippleCheck(RPC::JsonContext& context)
         }
         else if (role != "user")
         {
-            return RPC::invalid_field_error("role");
+            return RPC::invalidFieldError("role");
         }
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::noRippleCheck, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kNO_RIPPLE_CHECK, context))
         return *err;
 
     bool transactions = false;
@@ -89,7 +89,7 @@ doNoRippleCheck(RPC::JsonContext& context)
     if (context.apiVersion > 1u && params.isMember(jss::transactions) &&
         !params[jss::transactions].isBool())
     {
-        return RPC::invalid_field_error(jss::transactions);
+        return RPC::invalidFieldError(jss::transactions);
     }
 
     std::shared_ptr<ReadView const> ledger;
@@ -97,24 +97,24 @@ doNoRippleCheck(RPC::JsonContext& context)
     if (!ledger)
         return result;
 
-    Json::Value dummy;  // NOLINT(misc-const-correctness)
-    Json::Value& jvTransactions =
-        transactions ? (result[jss::transactions] = Json::arrayValue) : dummy;
+    json::Value dummy;  // NOLINT(misc-const-correctness)
+    json::Value& jvTransactions =
+        transactions ? (result[jss::transactions] = json::ArrayValue) : dummy;
 
     auto id = parseBase58<AccountID>(params[jss::account].asString());
     if (!id)
     {
-        RPC::inject_error(rpcACT_MALFORMED, result);
+        RPC::injectError(RpcActMalformed, result);
         return result;
     }
     auto const accountID{id.value()};
     auto const sle = ledger->read(keylet::account(accountID));
     if (!sle)
-        return rpcError(rpcACT_NOT_FOUND);
+        return rpcError(RpcActNotFound);
 
     std::uint32_t seq = sle->getFieldU32(sfSequence);
 
-    Json::Value& problems = (result["problems"] = Json::arrayValue);
+    json::Value& problems = (result["problems"] = json::ArrayValue);
 
     bool const bDefaultRipple = (sle->getFieldU32(sfFlags) & lsfDefaultRipple) != 0u;
 
@@ -130,7 +130,7 @@ doNoRippleCheck(RPC::JsonContext& context)
         problems.append("You should immediately set your default ripple flag");
         if (transactions)
         {
-            Json::Value& tx = jvTransactions.append(Json::objectValue);
+            json::Value& tx = jvTransactions.append(json::ObjectValue);
             tx["TransactionType"] = jss::AccountSet;
             tx["SetFlag"] = 8;
             fillTransaction(context, tx, accountID, seq, *ledger);
@@ -173,9 +173,9 @@ doNoRippleCheck(RPC::JsonContext& context)
                         ownedItem->getFieldAmount(bLow ? sfLowLimit : sfHighLimit));
                     limitAmount.get<Issue>().account = peer;
 
-                    Json::Value& tx = jvTransactions.append(Json::objectValue);
+                    json::Value& tx = jvTransactions.append(json::ObjectValue);
                     tx["TransactionType"] = jss::TrustSet;
-                    tx["LimitAmount"] = limitAmount.getJson(JsonOptions::none);
+                    tx["LimitAmount"] = limitAmount.getJson(JsonOptions::KNone);
                     tx["Flags"] = bNoRipple ? tfClearNoRipple : tfSetNoRipple;
                     fillTransaction(context, tx, accountID, seq, *ledger);
 
diff --git a/src/xrpld/rpc/handlers/account/OwnerInfo.cpp b/src/xrpld/rpc/handlers/account/OwnerInfo.cpp
index d287d2fd25..7cfed3cf53 100644
--- a/src/xrpld/rpc/handlers/account/OwnerInfo.cpp
+++ b/src/xrpld/rpc/handlers/account/OwnerInfo.cpp
@@ -16,30 +16,30 @@ namespace xrpl {
 // {
 //   'ident' : <indent>,
 // }
-Json::Value
+json::Value
 doOwnerInfo(RPC::JsonContext& context)
 {
     if (!context.params.isMember(jss::account) && !context.params.isMember(jss::ident))
     {
-        return RPC::missing_field_error(jss::account);
+        return RPC::missingFieldError(jss::account);
     }
 
     std::string const strIdent = context.params.isMember(jss::account)
         ? context.params[jss::account].asString()
         : context.params[jss::ident].asString();
-    Json::Value ret;
+    json::Value ret;
 
     // Get info on account.
     auto const& closedLedger = context.ledgerMaster.getClosedLedger();
     std::optional<AccountID> const accountID = parseBase58<AccountID>(strIdent);
     ret[jss::accepted] = accountID.has_value()
         ? context.netOps.getOwnerInfo(closedLedger, accountID.value())
-        : rpcError(rpcACT_MALFORMED);
+        : rpcError(RpcActMalformed);
 
     auto const& currentLedger = context.ledgerMaster.getCurrentLedger();
     ret[jss::current] = accountID.has_value()
         ? context.netOps.getOwnerInfo(currentLedger, *accountID)
-        : rpcError(rpcACT_MALFORMED);
+        : rpcError(RpcActMalformed);
     return ret;
 }
 
diff --git a/src/xrpld/rpc/handlers/admin/BlackList.cpp b/src/xrpld/rpc/handlers/admin/BlackList.cpp
index dfcb1aaa3a..5065a41ec4 100644
--- a/src/xrpld/rpc/handlers/admin/BlackList.cpp
+++ b/src/xrpld/rpc/handlers/admin/BlackList.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doBlackList(RPC::JsonContext& context)
 {
     auto& rm = context.app.getResourceManager();
diff --git a/src/xrpld/rpc/handlers/admin/UnlList.cpp b/src/xrpld/rpc/handlers/admin/UnlList.cpp
index 79eb2acf29..58a5bd3c25 100644
--- a/src/xrpld/rpc/handlers/admin/UnlList.cpp
+++ b/src/xrpld/rpc/handlers/admin/UnlList.cpp
@@ -11,14 +11,14 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doUnlList(RPC::JsonContext& context)
 {
-    Json::Value obj(Json::objectValue);
+    json::Value obj(json::ObjectValue);
 
-    context.app.getValidators().for_each_listed(
+    context.app.getValidators().forEachListed(
         [&unl = obj[jss::unl]](PublicKey const& publicKey, bool trusted) {
-            Json::Value node(Json::objectValue);
+            json::Value node(json::ObjectValue);
 
             node[jss::pubkey_validator] = toBase58(TokenType::NodePublic, publicKey);
             node[jss::trusted] = trusted;
diff --git a/src/xrpld/rpc/handlers/admin/data/CanDelete.cpp b/src/xrpld/rpc/handlers/admin/data/CanDelete.cpp
index 59d4b3a75c..ae67f1f0dd 100644
--- a/src/xrpld/rpc/handlers/admin/data/CanDelete.cpp
+++ b/src/xrpld/rpc/handlers/admin/data/CanDelete.cpp
@@ -18,17 +18,17 @@
 namespace xrpl {
 
 // can_delete [<ledgerid>|<ledgerhash>|now|always|never]
-Json::Value
+json::Value
 doCanDelete(RPC::JsonContext& context)
 {
     if (!context.app.getSHAMapStore().advisoryDelete())
-        return RPC::make_error(rpcNOT_ENABLED);
+        return RPC::makeError(RpcNotEnabled);
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     if (context.params.isMember(jss::can_delete))
     {
-        Json::Value const canDelete = context.params.get(jss::can_delete, 0);
+        json::Value const canDelete = context.params.get(jss::can_delete, 0);
         std::uint32_t canDeleteSeq = 0;
 
         if (canDelete.isUInt())
@@ -56,20 +56,20 @@ doCanDelete(RPC::JsonContext& context)
             {
                 canDeleteSeq = context.app.getSHAMapStore().getLastRotated();
                 if (canDeleteSeq == 0u)
-                    return RPC::make_error(rpcNOT_READY);
+                    return RPC::makeError(RpcNotReady);
             }
             else if (uint256 lh; lh.parseHex(canDeleteStr))
             {
                 auto ledger = context.ledgerMaster.getLedgerByHash(lh);
 
                 if (!ledger)
-                    return RPC::make_error(rpcLGR_NOT_FOUND, "ledgerNotFound");
+                    return RPC::makeError(RpcLgrNotFound, "ledgerNotFound");
 
                 canDeleteSeq = ledger->header().seq;
             }
             else
             {
-                return RPC::make_error(rpcINVALID_PARAMS);
+                return RPC::makeError(RpcInvalidParams);
             }
         }
 
diff --git a/src/xrpld/rpc/handlers/admin/data/LedgerCleaner.cpp b/src/xrpld/rpc/handlers/admin/data/LedgerCleaner.cpp
index 71dcb6d62f..a62ca44cca 100644
--- a/src/xrpld/rpc/handlers/admin/data/LedgerCleaner.cpp
+++ b/src/xrpld/rpc/handlers/admin/data/LedgerCleaner.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLedgerCleaner(RPC::JsonContext& context)
 {
     context.app.getLedgerCleaner().clean(context.params);
diff --git a/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp b/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
index ec31529226..4b15dbdcaf 100644
--- a/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
+++ b/src/xrpld/rpc/handlers/admin/data/LedgerRequest.cpp
@@ -12,10 +12,10 @@ namespace xrpl {
 //   ledger_hash : <ledger>
 //   ledger_index : <ledger_index>
 // }
-Json::Value
+json::Value
 doLedgerRequest(RPC::JsonContext& context)
 {
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
     auto res = RPC::getOrAcquireLedger(context);
 
     if (!res.has_value())
@@ -23,7 +23,7 @@ doLedgerRequest(RPC::JsonContext& context)
 
     auto const& ledger = res.value();
 
-    Json::Value jvResult;
+    json::Value jvResult;
     jvResult[jss::ledger_index] = ledger->header().seq;
     addJson(jvResult, {*ledger, &context, 0});
     return jvResult;
diff --git a/src/xrpld/rpc/handlers/admin/keygen/ValidationCreate.cpp b/src/xrpld/rpc/handlers/admin/keygen/ValidationCreate.cpp
index 27ae21d393..4ef16c4f97 100644
--- a/src/xrpld/rpc/handlers/admin/keygen/ValidationCreate.cpp
+++ b/src/xrpld/rpc/handlers/admin/keygen/ValidationCreate.cpp
@@ -15,7 +15,7 @@
 namespace xrpl {
 
 static std::optional<Seed>
-validationSeed(Json::Value const& params)
+validationSeed(json::Value const& params)
 {
     if (!params.isMember(jss::secret))
         return randomSeed();
@@ -29,22 +29,22 @@ validationSeed(Json::Value const& params)
 //
 // This command requires Role::ADMIN access because it makes
 // no sense to ask an untrusted server for this.
-Json::Value
+json::Value
 doValidationCreate(RPC::JsonContext& context)
 {
-    Json::Value obj(Json::objectValue);
+    json::Value obj(json::ObjectValue);
 
     auto seed = validationSeed(context.params);
 
     if (!seed)
-        return rpcError(rpcBAD_SEED);
+        return rpcError(RpcBadSeed);
 
-    auto const private_key = generateSecretKey(KeyType::secp256k1, *seed);
+    auto const privateKey = generateSecretKey(KeyType::Secp256k1, *seed);
 
     obj[jss::validation_public_key] =
-        toBase58(TokenType::NodePublic, derivePublicKey(KeyType::secp256k1, private_key));
+        toBase58(TokenType::NodePublic, derivePublicKey(KeyType::Secp256k1, privateKey));
 
-    obj[jss::validation_private_key] = toBase58(TokenType::NodePrivate, private_key);
+    obj[jss::validation_private_key] = toBase58(TokenType::NodePrivate, privateKey);
 
     obj[jss::validation_seed] = toBase58(*seed);
     obj[jss::validation_key] = seedAs1751(*seed);
diff --git a/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.cpp b/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.cpp
index bbd8f622be..3d670b9818 100644
--- a/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.cpp
+++ b/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.cpp
@@ -23,7 +23,7 @@
 namespace xrpl {
 
 double
-estimate_entropy(std::string const& input)
+estimateEntropy(std::string const& input)
 {
     // First, we calculate the Shannon entropy. This gives
     // the average number of bits per symbol that we would
@@ -51,14 +51,14 @@ estimate_entropy(std::string const& input)
 // {
 //  passphrase: <string>
 // }
-Json::Value
+json::Value
 doWalletPropose(RPC::JsonContext& context)
 {
     return walletPropose(context.params);
 }
 
-Json::Value
-walletPropose(Json::Value const& params)
+json::Value
+walletPropose(json::Value const& params)
 {
     std::optional<KeyType> keyType;
     std::optional<Seed> seed;
@@ -68,13 +68,13 @@ walletPropose(Json::Value const& params)
     {
         if (!params[jss::key_type].isString())
         {
-            return RPC::expected_field_error(jss::key_type, "string");
+            return RPC::expectedFieldError(jss::key_type, "string");
         }
 
         keyType = keyTypeFromString(params[jss::key_type].asString());
 
         if (!keyType)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
     }
 
     // XrplLib encodes seed used to generate an Ed25519 wallet in a
@@ -96,10 +96,10 @@ walletPropose(Json::Value const& params)
 
             // If the user *explicitly* requests a key type other than
             // Ed25519 we return an error.
-            if (keyType.value_or(KeyType::ed25519) != KeyType::ed25519)
-                return rpcError(rpcBAD_SEED);
+            if (keyType.value_or(KeyType::Ed25519) != KeyType::Ed25519)
+                return rpcError(RpcBadSeed);
 
-            keyType = KeyType::ed25519;
+            keyType = KeyType::Ed25519;
         }
     }
 
@@ -108,7 +108,7 @@ walletPropose(Json::Value const& params)
         if (params.isMember(jss::passphrase) || params.isMember(jss::seed) ||
             params.isMember(jss::seed_hex))
         {
-            Json::Value err;
+            json::Value err;
 
             seed = RPC::getSeedFromRPC(params, err);
 
@@ -122,11 +122,11 @@ walletPropose(Json::Value const& params)
     }
 
     if (!keyType)
-        keyType = KeyType::secp256k1;
+        keyType = KeyType::Secp256k1;
 
     auto const publicKey = generateKeyPair(*keyType, *seed).first;
 
-    Json::Value obj(Json::objectValue);
+    json::Value obj(json::ObjectValue);
 
     auto const seed1751 = seedAs1751(*seed);
     auto const seedHex = strHex(*seed);
@@ -151,7 +151,7 @@ walletPropose(Json::Value const& params)
         {
             // 80 bits of entropy isn't bad, but it's better to
             // err on the side of caution and be conservative.
-            if (estimate_entropy(passphrase) < 80.0)
+            if (estimateEntropy(passphrase) < 80.0)
             {
                 obj[jss::warning] =
                     "This wallet was generated using a user-supplied "
diff --git a/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.h b/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.h
index 4eb72c7e46..7ee302a014 100644
--- a/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.h
+++ b/src/xrpld/rpc/handlers/admin/keygen/WalletPropose.h
@@ -4,7 +4,7 @@
 
 namespace xrpl {
 
-Json::Value
-walletPropose(Json::Value const& params);
+json::Value
+walletPropose(json::Value const& params);
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/admin/log/LogLevel.cpp b/src/xrpld/rpc/handlers/admin/log/LogLevel.cpp
index 9cfa321654..a18fd8cc89 100644
--- a/src/xrpld/rpc/handlers/admin/log/LogLevel.cpp
+++ b/src/xrpld/rpc/handlers/admin/log/LogLevel.cpp
@@ -15,19 +15,19 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLogLevel(RPC::JsonContext& context)
 {
     // log_level
     if (!context.params.isMember(jss::severity))
     {
         // get log severities
-        Json::Value ret(Json::objectValue);
-        Json::Value lev(Json::objectValue);
+        json::Value ret(json::ObjectValue);
+        json::Value lev(json::ObjectValue);
 
         lev[jss::base] = Logs::toString(Logs::fromSeverity(context.app.getLogs().threshold()));
         std::vector<std::pair<std::string, std::string>> const logTable(
-            context.app.getLogs().partition_severities());
+            context.app.getLogs().partitionSeverities());
         for (auto const& [k, v] : logTable)
             lev[k] = v;
 
@@ -37,8 +37,8 @@ doLogLevel(RPC::JsonContext& context)
 
     LogSeverity const sv(Logs::fromString(context.params[jss::severity].asString()));
 
-    if (sv == lsINVALID)
-        return rpcError(rpcINVALID_PARAMS);
+    if (sv == LSInvalid)
+        return rpcError(RpcInvalidParams);
 
     auto severity = Logs::toSeverity(sv);
     // log_level severity
@@ -46,7 +46,7 @@ doLogLevel(RPC::JsonContext& context)
     {
         // set base log threshold
         context.app.getLogs().threshold(severity);
-        return Json::objectValue;
+        return json::ObjectValue;
     }
 
     // log_level partition severity base?
@@ -64,10 +64,10 @@ doLogLevel(RPC::JsonContext& context)
             context.app.getLogs().get(partition).threshold(severity);
         }
 
-        return Json::objectValue;
+        return json::ObjectValue;
     }
 
-    return rpcError(rpcINVALID_PARAMS);
+    return rpcError(RpcInvalidParams);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/admin/log/LogRotate.cpp b/src/xrpld/rpc/handlers/admin/log/LogRotate.cpp
index c1fdd58c23..5f5c3e64df 100644
--- a/src/xrpld/rpc/handlers/admin/log/LogRotate.cpp
+++ b/src/xrpld/rpc/handlers/admin/log/LogRotate.cpp
@@ -8,7 +8,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLogRotate(RPC::JsonContext& context)
 {
     context.app.getPerfLog().rotate();
diff --git a/src/xrpld/rpc/handlers/admin/peer/Connect.cpp b/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
index 4d9667e4a9..cfa79eeb82 100644
--- a/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/Connect.cpp
@@ -20,21 +20,21 @@ namespace xrpl {
 //   port: <number>
 // }
 // XXX Might allow domain for manual connections.
-Json::Value
+json::Value
 doConnect(RPC::JsonContext& context)
 {
     if (context.app.config().standalone())
     {
-        return RPC::make_error(rpcNOT_SYNCED);
+        return RPC::makeError(RpcNotSynced);
     }
 
     if (!context.params.isMember(jss::ip))
-        return RPC::missing_field_error(jss::ip);
+        return RPC::missingFieldError(jss::ip);
 
     if (context.params.isMember(jss::port) &&
-        !context.params[jss::port].isConvertibleTo(Json::intValue))
+        !context.params[jss::port].isConvertibleTo(json::IntValue))
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     int iPort = 0;
@@ -45,17 +45,17 @@ doConnect(RPC::JsonContext& context)
     }
     else
     {
-        iPort = DEFAULT_PEER_PORT;
+        iPort = kDEFAULT_PEER_PORT;
     }
 
-    auto const ip_str = context.params[jss::ip].asString();
-    auto ip = beast::IP::Endpoint::from_string(ip_str);
+    auto const ipStr = context.params[jss::ip].asString();
+    auto ip = beast::IP::Endpoint::fromString(ipStr);
 
-    if (!is_unspecified(ip))
-        context.app.getOverlay().connect(ip.at_port(iPort));
+    if (!isUnspecified(ip))
+        context.app.getOverlay().connect(ip.atPort(iPort));
 
     return RPC::makeObjectValue(
-        "attempting connection to IP:" + ip_str + " port: " + std::to_string(iPort));
+        "attempting connection to IP:" + ipStr + " port: " + std::to_string(iPort));
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsAdd.cpp b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsAdd.cpp
index 6aaa5cc78a..b437d17c6a 100644
--- a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsAdd.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsAdd.cpp
@@ -14,13 +14,13 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPeerReservationsAdd(RPC::JsonContext& context)
 {
     auto const& params = context.params;
 
     if (!params.isMember(jss::public_key))
-        return RPC::missing_field_error(jss::public_key);
+        return RPC::missingFieldError(jss::public_key);
 
     // Returning JSON from every function ruins any attempt to encapsulate
     // the pattern of "get field F as type T, and diagnose an error if it is
@@ -36,7 +36,7 @@ doPeerReservationsAdd(RPC::JsonContext& context)
     // essentially an optional (the "maybe monad" in Haskell) with a non-unit
     // type for the failure case to capture more information.
     if (!params[jss::public_key].isString())
-        return RPC::expected_field_error(jss::public_key, "a string");
+        return RPC::expectedFieldError(jss::public_key, "a string");
 
     // Same for the pattern of "if field F is present, make sure it has type T
     // and get it".
@@ -44,7 +44,7 @@ doPeerReservationsAdd(RPC::JsonContext& context)
     if (params.isMember(jss::description))
     {
         if (!params[jss::description].isString())
-            return RPC::expected_field_error(jss::description, "a string");
+            return RPC::expectedFieldError(jss::description, "a string");
         desc = params[jss::description].asString();
     }
 
@@ -53,13 +53,13 @@ doPeerReservationsAdd(RPC::JsonContext& context)
     std::optional<PublicKey> optPk =
         parseBase58<PublicKey>(TokenType::NodePublic, params[jss::public_key].asString());
     if (!optPk)
-        return rpcError(rpcPUBLIC_MALFORMED);
+        return rpcError(RpcPublicMalformed);
     PublicKey const& nodeId = *optPk;
 
-    auto const previous = context.app.getPeerReservations().insert_or_assign(
+    auto const previous = context.app.getPeerReservations().insertOrAssign(
         PeerReservation{.nodeId = nodeId, .description = desc});
 
-    Json::Value result{Json::objectValue};
+    json::Value result{json::ObjectValue};
     if (previous)
     {
         result[jss::previous] = previous->toJson();
diff --git a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsDel.cpp b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsDel.cpp
index d60979aab3..374170b135 100644
--- a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsDel.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsDel.cpp
@@ -12,26 +12,26 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPeerReservationsDel(RPC::JsonContext& context)
 {
     auto const& params = context.params;
 
     // We repeat much of the parameter parsing from `doPeerReservationsAdd`.
     if (!params.isMember(jss::public_key))
-        return RPC::missing_field_error(jss::public_key);
+        return RPC::missingFieldError(jss::public_key);
     if (!params[jss::public_key].isString())
-        return RPC::expected_field_error(jss::public_key, "a string");
+        return RPC::expectedFieldError(jss::public_key, "a string");
 
     std::optional<PublicKey> optPk =
         parseBase58<PublicKey>(TokenType::NodePublic, params[jss::public_key].asString());
     if (!optPk)
-        return rpcError(rpcPUBLIC_MALFORMED);
+        return rpcError(RpcPublicMalformed);
     PublicKey const& nodeId = *optPk;
 
     auto const previous = context.app.getPeerReservations().erase(nodeId);
 
-    Json::Value result{Json::objectValue};
+    json::Value result{json::ObjectValue};
     if (previous)
     {
         result[jss::previous] = previous->toJson();
diff --git a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsList.cpp b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsList.cpp
index 119af3f73c..a9323340f9 100644
--- a/src/xrpld/rpc/handlers/admin/peer/PeerReservationsList.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/PeerReservationsList.cpp
@@ -6,14 +6,14 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPeerReservationsList(RPC::JsonContext& context)
 {
     auto const& reservations = context.app.getPeerReservations().list();
     // Enumerate the reservations in context.app.getPeerReservations()
-    // as a Json::Value.
-    Json::Value result{Json::objectValue};
-    Json::Value& jaReservations = result[jss::reservations] = Json::arrayValue;
+    // as a json::Value.
+    json::Value result{json::ObjectValue};
+    json::Value& jaReservations = result[jss::reservations] = json::ArrayValue;
     for (auto const& reservation : reservations)
     {
         jaReservations.append(reservation.toJson());
diff --git a/src/xrpld/rpc/handlers/admin/peer/Peers.cpp b/src/xrpld/rpc/handlers/admin/peer/Peers.cpp
index 9164089e83..41132826e4 100644
--- a/src/xrpld/rpc/handlers/admin/peer/Peers.cpp
+++ b/src/xrpld/rpc/handlers/admin/peer/Peers.cpp
@@ -16,10 +16,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPeers(RPC::JsonContext& context)
 {
-    Json::Value jvResult(Json::objectValue);
+    json::Value jvResult(json::ObjectValue);
 
     jvResult[jss::peers] = context.app.getOverlay().json();
 
@@ -47,14 +47,14 @@ doPeers(RPC::JsonContext& context)
     auto const now = context.app.getTimeKeeper().now();
     auto const self = context.app.nodeIdentity().first;
 
-    Json::Value& cluster = (jvResult[jss::cluster] = Json::objectValue);
+    json::Value& cluster = (jvResult[jss::cluster] = json::ObjectValue);
     std::uint32_t const ref = context.app.getFeeTrack().getLoadBase();
 
-    context.app.getCluster().for_each([&cluster, now, ref, &self](ClusterNode const& node) {
+    context.app.getCluster().forEach([&cluster, now, ref, &self](ClusterNode const& node) {
         if (node.identity() == self)
             return;
 
-        Json::Value& json = cluster[toBase58(TokenType::NodePublic, node.identity())];
+        json::Value& json = cluster[toBase58(TokenType::NodePublic, node.identity())];
 
         if (!node.name().empty())
             json[jss::tag] = node.name();
diff --git a/src/xrpld/rpc/handlers/admin/server_control/LedgerAccept.cpp b/src/xrpld/rpc/handlers/admin/server_control/LedgerAccept.cpp
index 7119b5235e..ce06a6e480 100644
--- a/src/xrpld/rpc/handlers/admin/server_control/LedgerAccept.cpp
+++ b/src/xrpld/rpc/handlers/admin/server_control/LedgerAccept.cpp
@@ -11,10 +11,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLedgerAccept(RPC::JsonContext& context)
 {
-    Json::Value jvResult;
+    json::Value jvResult;
 
     if (!context.app.config().standalone())
     {
diff --git a/src/xrpld/rpc/handlers/admin/server_control/Stop.cpp b/src/xrpld/rpc/handlers/admin/server_control/Stop.cpp
index e3e0f29fa2..3e86bd4632 100644
--- a/src/xrpld/rpc/handlers/admin/server_control/Stop.cpp
+++ b/src/xrpld/rpc/handlers/admin/server_control/Stop.cpp
@@ -10,7 +10,7 @@ namespace RPC {
 struct JsonContext;
 }  // namespace RPC
 
-Json::Value
+json::Value
 doStop(RPC::JsonContext& context)
 {
     context.app.signalStop("RPC");
diff --git a/src/xrpld/rpc/handlers/admin/signing/ChannelAuthorize.cpp b/src/xrpld/rpc/handlers/admin/signing/ChannelAuthorize.cpp
index d93e1efadc..d9b6cfb2eb 100644
--- a/src/xrpld/rpc/handlers/admin/signing/ChannelAuthorize.cpp
+++ b/src/xrpld/rpc/handlers/admin/signing/ChannelAuthorize.cpp
@@ -29,35 +29,35 @@ namespace xrpl {
 //   channel_id: 256-bit channel id
 //   drops: 64-bit uint (as string)
 // }
-Json::Value
+json::Value
 doChannelAuthorize(RPC::JsonContext& context)
 {
     if (context.role != Role::ADMIN && !context.app.config().canSign())
     {
-        return RPC::make_error(rpcNOT_SUPPORTED, "Signing is not supported by this server.");
+        return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
     }
 
     auto const& params(context.params);
     for (auto const& p : {jss::channel_id, jss::amount})
     {
         if (!params.isMember(p))
-            return RPC::missing_field_error(p);
+            return RPC::missingFieldError(p);
     }
 
     // Compatibility if a key type isn't specified. If it is, the
     // keypairForSignature code will validate parameters and return
     // the appropriate error.
     if (!params.isMember(jss::key_type) && !params.isMember(jss::secret))
-        return RPC::missing_field_error(jss::secret);
+        return RPC::missingFieldError(jss::secret);
 
-    Json::Value result;
+    json::Value result;
     std::optional<std::pair<PublicKey, SecretKey>> const keyPair =
         RPC::keypairForSignature(params, result, context.apiVersion);
 
     XRPL_ASSERT(
-        keyPair || RPC::contains_error(result),
+        keyPair || RPC::containsError(result),
         "xrpl::doChannelAuthorize : valid keyPair or an error");
-    if (!keyPair || RPC::contains_error(result))
+    if (!keyPair || RPC::containsError(result))
         return result;
 
     PublicKey const& pk = keyPair->first;
@@ -65,13 +65,13 @@ doChannelAuthorize(RPC::JsonContext& context)
 
     uint256 channelId;
     if (!channelId.parseHex(params[jss::channel_id].asString()))
-        return rpcError(rpcCHANNEL_MALFORMED);
+        return rpcError(RpcChannelMalformed);
 
     std::optional<std::uint64_t> const optDrops =
-        params[jss::amount].isString() ? to_uint64(params[jss::amount].asString()) : std::nullopt;
+        params[jss::amount].isString() ? toUint64(params[jss::amount].asString()) : std::nullopt;
 
     if (!optDrops)
-        return rpcError(rpcCHANNEL_AMT_MALFORMED);
+        return rpcError(RpcChannelAmtMalformed);
 
     std::uint64_t const drops = *optDrops;
 
@@ -86,8 +86,8 @@ doChannelAuthorize(RPC::JsonContext& context)
     catch (std::exception const& ex)
     {
         // LCOV_EXCL_START
-        result = RPC::make_error(
-            rpcINTERNAL, "Exception occurred during signing: " + std::string(ex.what()));
+        result = RPC::makeError(
+            RpcInternal, "Exception occurred during signing: " + std::string(ex.what()));
         // LCOV_EXCL_STOP
     }
     return result;
diff --git a/src/xrpld/rpc/handlers/admin/signing/Sign.cpp b/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
index d92506c672..6953dfd3d8 100644
--- a/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
+++ b/src/xrpld/rpc/handlers/admin/signing/Sign.cpp
@@ -14,15 +14,15 @@ namespace xrpl {
 //   tx_json: <object>,
 //   secret: <secret>
 // }
-Json::Value
+json::Value
 doSign(RPC::JsonContext& context)
 {
     if (context.role != Role::ADMIN && !context.app.config().canSign())
     {
-        return RPC::make_error(rpcNOT_SUPPORTED, "Signing is not supported by this server.");
+        return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
     }
 
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
     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 572093856f..102cea08b4 100644
--- a/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp
+++ b/src/xrpld/rpc/handlers/admin/signing/SignFor.cpp
@@ -15,15 +15,15 @@ namespace xrpl {
 //   account: <signing account>
 //   secret: <secret of signing account>
 // }
-Json::Value
+json::Value
 doSignFor(RPC::JsonContext& context)
 {
     if (context.role != Role::ADMIN && !context.app.config().canSign())
     {
-        return RPC::make_error(rpcNOT_SUPPORTED, "Signing is not supported by this server.");
+        return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
     }
 
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
     auto const failHard = context.params[jss::fail_hard].asBool();
     auto const failType = NetworkOPs::doFailHard(failHard);
 
diff --git a/src/xrpld/rpc/handlers/admin/status/ConsensusInfo.cpp b/src/xrpld/rpc/handlers/admin/status/ConsensusInfo.cpp
index 5ccbda2a16..d55d4bb206 100644
--- a/src/xrpld/rpc/handlers/admin/status/ConsensusInfo.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/ConsensusInfo.cpp
@@ -6,10 +6,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doConsensusInfo(RPC::JsonContext& context)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret[jss::info] = context.netOps.getConsensusInfo();
 
diff --git a/src/xrpld/rpc/handlers/admin/status/FetchInfo.cpp b/src/xrpld/rpc/handlers/admin/status/FetchInfo.cpp
index fd916ef53e..5cf05ee00f 100644
--- a/src/xrpld/rpc/handlers/admin/status/FetchInfo.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/FetchInfo.cpp
@@ -6,10 +6,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doFetchInfo(RPC::JsonContext& context)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     if (context.params.isMember(jss::clear) && context.params[jss::clear].asBool())
     {
diff --git a/src/xrpld/rpc/handlers/admin/status/GetCounts.cpp b/src/xrpld/rpc/handlers/admin/status/GetCounts.cpp
index 8cc687fec2..83a2aa2127 100644
--- a/src/xrpld/rpc/handlers/admin/status/GetCounts.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/GetCounts.cpp
@@ -42,12 +42,12 @@ textTime(
         text += "s";
 }
 
-Json::Value
+json::Value
 getCountsJson(Application& app, int minObjectCount)
 {
     auto objectCounts = CountedObjects::getInstance().getCounts(minObjectCount);
 
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     for (auto const& [k, v] : objectCounts)
     {
@@ -76,7 +76,7 @@ getCountsJson(Application& app, int minObjectCount)
         {
             std::size_t const c = app.getOPs().getLocalTxCount();
             if (c > 0)
-                ret[jss::local_txs] = static_cast<Json::UInt>(c);
+                ret[jss::local_txs] = static_cast<json::UInt>(c);
         }
     }
 
@@ -85,7 +85,7 @@ getCountsJson(Application& app, int minObjectCount)
     ret[jss::historical_perminute] = static_cast<int>(app.getInboundLedgers().fetchRate());
     ret[jss::SLE_hit_rate] = app.getCachedSLEs().rate();
     ret[jss::ledger_hit_rate] = app.getLedgerMaster().getCacheHitRate();
-    ret[jss::AL_size] = Json::UInt(app.getAcceptedLedgerCache().size());
+    ret[jss::AL_size] = json::UInt(app.getAcceptedLedgerCache().size());
     ret[jss::AL_hit_rate] = app.getAcceptedLedgerCache().getHitRate();
 
     ret[jss::fullbelow_size] = static_cast<int>(app.getNodeFamily().getFullBelowCache()->size());
@@ -110,7 +110,7 @@ getCountsJson(Application& app, int minObjectCount)
 // {
 //   min_count: <number>  // optional, defaults to 10
 // }
-Json::Value
+json::Value
 doGetCounts(RPC::JsonContext& context)
 {
     int minCount = 10;
diff --git a/src/xrpld/rpc/handlers/admin/status/GetCounts.h b/src/xrpld/rpc/handlers/admin/status/GetCounts.h
index 286ad38af3..05751637ee 100644
--- a/src/xrpld/rpc/handlers/admin/status/GetCounts.h
+++ b/src/xrpld/rpc/handlers/admin/status/GetCounts.h
@@ -4,7 +4,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 getCountsJson(Application& app, int minObjectCount);
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/admin/status/Print.cpp b/src/xrpld/rpc/handlers/admin/status/Print.cpp
index 6ea1f355aa..99fd01c9f4 100644
--- a/src/xrpld/rpc/handlers/admin/status/Print.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/Print.cpp
@@ -7,7 +7,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPrint(RPC::JsonContext& context)
 {
     JsonPropertyStream stream;
diff --git a/src/xrpld/rpc/handlers/admin/status/ValidatorInfo.cpp b/src/xrpld/rpc/handlers/admin/status/ValidatorInfo.cpp
index c8ec6a2c15..efe1529ccb 100644
--- a/src/xrpld/rpc/handlers/admin/status/ValidatorInfo.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/ValidatorInfo.cpp
@@ -11,15 +11,15 @@
 #include <xrpl/protocol/tokens.h>
 
 namespace xrpl {
-Json::Value
+json::Value
 doValidatorInfo(RPC::JsonContext& context)
 {
     // return error if not configured as validator
     auto const validationPK = context.app.getValidationPublicKey();
     if (!validationPK)
-        return RPC::not_validator_error();
+        return RPC::notValidatorError();
 
-    Json::Value ret;
+    json::Value ret;
 
     // assume validationPK is ephemeral key, get master key
     auto const mk = context.app.getValidatorManifests().getMasterKey(*validationPK);
@@ -33,7 +33,7 @@ doValidatorInfo(RPC::JsonContext& context)
     ret[jss::ephemeral_key] = toBase58(TokenType::NodePublic, *validationPK);
 
     if (auto const manifest = context.app.getValidatorManifests().getManifest(mk))
-        ret[jss::manifest] = base64_encode(*manifest);
+        ret[jss::manifest] = base64Encode(*manifest);
 
     if (auto const seq = context.app.getValidatorManifests().getSequence(mk))
         ret[jss::seq] = *seq;
diff --git a/src/xrpld/rpc/handlers/admin/status/ValidatorListSites.cpp b/src/xrpld/rpc/handlers/admin/status/ValidatorListSites.cpp
index 80823a8936..7497105c50 100644
--- a/src/xrpld/rpc/handlers/admin/status/ValidatorListSites.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/ValidatorListSites.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doValidatorListSites(RPC::JsonContext& context)
 {
     return context.app.getValidatorSites().getJson();
diff --git a/src/xrpld/rpc/handlers/admin/status/Validators.cpp b/src/xrpld/rpc/handlers/admin/status/Validators.cpp
index cf9cab6b84..48e4466861 100644
--- a/src/xrpld/rpc/handlers/admin/status/Validators.cpp
+++ b/src/xrpld/rpc/handlers/admin/status/Validators.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doValidators(RPC::JsonContext& context)
 {
     return context.app.getValidators().getJson();
diff --git a/src/xrpld/rpc/handlers/ledger/Ledger.cpp b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
index dc5f24dffc..2b6116da27 100644
--- a/src/xrpld/rpc/handlers/ledger/Ledger.cpp
+++ b/src/xrpld/rpc/handlers/ledger/Ledger.cpp
@@ -44,14 +44,14 @@ LedgerHandler::check()
 {
     auto const& params = context_.params;
 
-    auto getBool = [&](Json::StaticString const& field) -> Expected<bool, Status> {
+    auto getBool = [&](json::StaticString const& field) -> Expected<bool, Status> {
         if (!params.isMember(field))
         {
             return false;
         }
         if (!params[field].isBool())
         {
-            return Unexpected(rpcINVALID_PARAMS);
+            return Unexpected(RpcInvalidParams);
         }
 
         return params[field].asBool();
@@ -62,7 +62,7 @@ LedgerHandler::check()
     auto const accounts = getBool(jss::accounts);
     auto const expand = getBool(jss::expand);
     auto const binary = getBool(jss::binary);
-    auto const owner_funds = getBool(jss::owner_funds);
+    auto const ownerFunds = getBool(jss::owner_funds);
     auto const queue = getBool(jss::queue);
 
     if (!full.has_value())
@@ -75,20 +75,20 @@ LedgerHandler::check()
         return expand.error();
     if (!binary.has_value())
         return binary.error();
-    if (!owner_funds.has_value())
-        return owner_funds.error();
+    if (!ownerFunds.has_value())
+        return ownerFunds.error();
     if (!queue.has_value())
         return queue.error();
 
-    options_ = (*full ? LedgerFill::full : 0) | (*expand ? LedgerFill::expand : 0) |
-        (*transactions ? LedgerFill::dumpTxrp : 0) | (*accounts ? LedgerFill::dumpState : 0) |
-        (*binary ? LedgerFill::binary : 0) | (*owner_funds ? LedgerFill::ownerFunds : 0) |
-        (*queue ? LedgerFill::dumpQueue : 0);
+    options_ = (*full ? LedgerFill::Full : 0) | (*expand ? LedgerFill::Expand : 0) |
+        (*transactions ? LedgerFill::DumpTxrp : 0) | (*accounts ? LedgerFill::DumpState : 0) |
+        (*binary ? LedgerFill::Binary : 0) | (*ownerFunds ? LedgerFill::OwnerFunds : 0) |
+        (*queue ? LedgerFill::DumpQueue : 0);
 
     bool const needsLedger = params.isMember(jss::ledger) || params.isMember(jss::ledger_hash) ||
         params.isMember(jss::ledger_index);
     if (!needsLedger)
-        return Status::OK;
+        return Status::kOK;
     if (auto s = lookupLedger(ledger_, context_, result_))
         return s;
 
@@ -97,13 +97,14 @@ LedgerHandler::check()
         // Until some sane way to get full ledgers has been implemented,
         // disallow retrieving all state nodes.
         if (!isUnlimited(context_.role))
-            return rpcNO_PERMISSION;
+            return RpcNoPermission;
 
         if (context_.app.getFeeTrack().isLoadedLocal() && !isUnlimited(context_.role))
         {
-            return rpcTOO_BUSY;
+            return RpcTooBusy;
         }
-        context_.loadType = binary ? Resource::feeMediumBurdenRPC : Resource::feeHeavyBurdenRPC;
+        context_.loadType =
+            binary ? Resource::kFEE_MEDIUM_BURDEN_RPC : Resource::kFEE_HEAVY_BURDEN_RPC;
     }
 
     if (*queue)
@@ -112,17 +113,17 @@ LedgerHandler::check()
         {
             // It doesn't make sense to request the queue
             // with a non-existent or closed/validated ledger.
-            return rpcINVALID_PARAMS;
+            return RpcInvalidParams;
         }
 
         queueTxs_ = context_.app.getTxQ().getTxs();
     }
 
-    return Status::OK;
+    return Status::kOK;
 }
 
 void
-LedgerHandler::writeResult(Json::Value& value)
+LedgerHandler::writeResult(json::Value& value)
 {
     if (ledger_)
     {
@@ -133,20 +134,20 @@ LedgerHandler::writeResult(Json::Value& value)
     {
         auto& master = context_.app.getLedgerMaster();
         {
-            auto& closed = value[jss::closed] = Json::objectValue;
+            auto& closed = value[jss::closed] = json::ObjectValue;
             addJson(closed, {*master.getClosedLedger(), &context_, 0});
         }
         {
-            auto& open = value[jss::open] = Json::objectValue;
+            auto& open = value[jss::open] = json::ObjectValue;
             addJson(open, {*master.getCurrentLedger(), &context_, 0});
         }
     }
 
-    Json::Value warnings{Json::arrayValue};
+    json::Value warnings{json::ArrayValue};
     if (context_.params.isMember(jss::type))
     {
-        Json::Value& w = warnings.append(Json::objectValue);
-        w[jss::id] = warnRPC_FIELDS_DEPRECATED;
+        json::Value& w = warnings.append(json::ObjectValue);
+        w[jss::id] = WarnRpcFieldsDeprecated;
         w[jss::message] =
             "Some fields from your request are deprecated. Please check the "
             "documentation at "
@@ -172,7 +173,7 @@ doLedgerGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerRequest>& context)
     if (auto status = RPC::ledgerFromRequest(ledger, context))
     {
         grpc::Status errorStatus;
-        if (status.toErrorCode() == rpcINVALID_PARAMS)
+        if (status.toErrorCode() == RpcInvalidParams)
         {
             errorStatus = grpc::Status(grpc::StatusCode::INVALID_ARGUMENT, status.message());
         }
@@ -286,8 +287,8 @@ doLedgerGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerRequest>& context)
             {
                 if (!(inBase && inDesired))
                 {
-                    auto lb = desired->stateMap().lower_bound(k);
-                    auto ub = desired->stateMap().upper_bound(k);
+                    auto lb = desired->stateMap().lowerBound(k);
+                    auto ub = desired->stateMap().upperBound(k);
                     if (lb != desired->stateMap().end())
                         obj->set_predecessor(lb->key().data(), lb->key().size());
                     if (ub != desired->stateMap().end())
@@ -300,7 +301,7 @@ doLedgerGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerRequest>& context)
                             auto bookBase = keylet::quality({ltDIR_NODE, k}, 0);
                             if (!inBase && inDesired)
                             {
-                                auto firstBook = desired->stateMap().upper_bound(bookBase.key);
+                                auto firstBook = desired->stateMap().upperBound(bookBase.key);
                                 if (firstBook != desired->stateMap().end() &&
                                     firstBook->key() < getQualityNext(bookBase.key) &&
                                     firstBook->key() == k)
@@ -313,7 +314,7 @@ doLedgerGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerRequest>& context)
                             }
                             if (inBase && !inDesired)
                             {
-                                auto oldFirstBook = base->stateMap().upper_bound(bookBase.key);
+                                auto oldFirstBook = base->stateMap().upperBound(bookBase.key);
                                 if (oldFirstBook != base->stateMap().end() &&
                                     oldFirstBook->key() < getQualityNext(bookBase.key) &&
                                     oldFirstBook->key() == k)
@@ -321,7 +322,7 @@ doLedgerGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerRequest>& context)
                                     auto succ = response.add_book_successors();
                                     succ->set_book_base(bookBase.key.data(), bookBase.key.size());
                                     auto newFirstBook =
-                                        desired->stateMap().upper_bound(bookBase.key);
+                                        desired->stateMap().upperBound(bookBase.key);
 
                                     if (newFirstBook != desired->stateMap().end() &&
                                         newFirstBook->key() < getQualityNext(bookBase.key))
diff --git a/src/xrpld/rpc/handlers/ledger/Ledger.h b/src/xrpld/rpc/handlers/ledger/Ledger.h
index db70f35904..2ac9b99a06 100644
--- a/src/xrpld/rpc/handlers/ledger/Ledger.h
+++ b/src/xrpld/rpc/handlers/ledger/Ledger.h
@@ -12,9 +12,9 @@
 #include <xrpl/protocol/ApiVersion.h>
 #include <xrpl/protocol/jss.h>
 
-namespace Json {
+namespace json {
 class Object;
-}  // namespace Json
+}  // namespace json
 
 namespace xrpl::RPC {
 
@@ -35,23 +35,25 @@ public:
     check();
 
     void
-    writeResult(Json::Value&);
+    writeResult(json::Value&);
 
+    // NOLINTBEGIN(readability-identifier-naming)
     static constexpr char name[] = "ledger";
 
-    static constexpr unsigned minApiVer = RPC::apiMinimumSupportedVersion;
+    static constexpr unsigned minApiVer = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
 
-    static constexpr unsigned maxApiVer = RPC::apiMaximumValidVersion;
+    static constexpr unsigned maxApiVer = RPC::kAPI_MAXIMUM_VALID_VERSION;
 
     static constexpr Role role = Role::USER;
 
-    static constexpr Condition condition = NO_CONDITION;
+    static constexpr Condition condition = NoCondition;
+    // NOLINTEND(readability-identifier-naming)
 
 private:
     JsonContext& context_;
     std::shared_ptr<ReadView const> ledger_;
     std::vector<TxQ::TxDetails> queueTxs_;
-    Json::Value result_;
+    json::Value result_;
     int options_ = 0;
 };
 
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerClosed.cpp b/src/xrpld/rpc/handlers/ledger/LedgerClosed.cpp
index 43e6fa686e..7ea314292f 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerClosed.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerClosed.cpp
@@ -9,13 +9,13 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLedgerClosed(RPC::JsonContext& context)
 {
     auto ledger = context.ledgerMaster.getClosedLedger();
     XRPL_ASSERT(ledger, "xrpl::doLedgerClosed : non-null closed ledger");
 
-    Json::Value jvResult;
+    json::Value jvResult;
     jvResult[jss::ledger_index] = ledger->header().seq;
     jvResult[jss::ledger_hash] = to_string(ledger->header().hash);
 
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerCurrent.cpp b/src/xrpld/rpc/handlers/ledger/LedgerCurrent.cpp
index 861080c5f2..1d05774163 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerCurrent.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerCurrent.cpp
@@ -7,10 +7,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doLedgerCurrent(RPC::JsonContext& context)
 {
-    Json::Value jvResult;
+    json::Value jvResult;
     jvResult[jss::ledger_current_index] = context.ledgerMaster.getCurrentLedgerIndex();
     return jvResult;
 }
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerData.cpp b/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
index 367eaa8973..f450c88dab 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerData.cpp
@@ -35,7 +35,7 @@ namespace xrpl {
 //     ledger_index: chosen ledger's index
 //     state:        array of state nodes
 //     marker:       resume point, if any
-Json::Value
+json::Value
 doLedgerData(RPC::JsonContext& context)
 {
     std::shared_ptr<ReadView const> lpLedger;
@@ -49,25 +49,25 @@ doLedgerData(RPC::JsonContext& context)
     ReadView::key_type key = ReadView::key_type();
     if (isMarker)
     {
-        Json::Value const& jMarker = params[jss::marker];
+        json::Value const& jMarker = params[jss::marker];
         if (!(jMarker.isString() && key.parseHex(jMarker.asString())))
-            return RPC::expected_field_error(jss::marker, "valid");
+            return RPC::expectedFieldError(jss::marker, "valid");
     }
 
     bool isBinary = false;
     if (params.isMember(jss::binary))
     {
         if (!params[jss::binary].isBool())
-            return RPC::expected_field_error(jss::binary, "boolean");
+            return RPC::expectedFieldError(jss::binary, "boolean");
         isBinary = params[jss::binary].asBool();
     }
 
     int limit = -1;
     if (params.isMember(jss::limit))
     {
-        Json::Value const& jLimit = params[jss::limit];
+        json::Value const& jLimit = params[jss::limit];
         if (!jLimit.isIntegral())
-            return RPC::expected_field_error(jss::limit, "integer");
+            return RPC::expectedFieldError(jss::limit, "integer");
 
         limit = jLimit.asInt();
     }
@@ -83,7 +83,7 @@ doLedgerData(RPC::JsonContext& context)
     {
         // Return base ledger data on first query
         jvResult[jss::ledger] =
-            getJson(LedgerFill(*lpLedger, &context, isBinary ? LedgerFill::Options::binary : 0));
+            getJson(LedgerFill(*lpLedger, &context, isBinary ? LedgerFill::Options::Binary : 0));
     }
 
     auto [rpcStatus, type] = RPC::chooseLedgerEntryType(params);
@@ -93,14 +93,14 @@ doLedgerData(RPC::JsonContext& context)
         rpcStatus.inject(jvResult);
         return jvResult;
     }
-    Json::Value& nodes = jvResult[jss::state];
-    if (nodes.type() == Json::nullValue)
+    json::Value& nodes = jvResult[jss::state];
+    if (nodes.type() == json::NullValue)
     {
-        nodes = Json::Value(Json::arrayValue);
+        nodes = json::Value(json::ArrayValue);
     }
 
     auto e = lpLedger->sles.end();
-    for (auto i = lpLedger->sles.upper_bound(key); i != e; ++i)
+    for (auto i = lpLedger->sles.upperBound(key); i != e; ++i)
     {
         auto sle = lpLedger->read(keylet::unchecked((*i)->key()));
         if (limit-- <= 0)
@@ -115,13 +115,13 @@ doLedgerData(RPC::JsonContext& context)
         {
             if (isBinary)
             {
-                Json::Value& entry = nodes.append(Json::objectValue);
+                json::Value& entry = nodes.append(json::ObjectValue);
                 entry[jss::data] = serializeHex(*sle);
                 entry[jss::index] = to_string(sle->key());
             }
             else
             {
-                Json::Value& entry = nodes.append(sle->getJson(JsonOptions::none));
+                json::Value& entry = nodes.append(sle->getJson(JsonOptions::KNone));
                 entry[jss::index] = to_string(sle->key());
             }
         }
@@ -141,7 +141,7 @@ doLedgerDataGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerDataRequest>& con
     if (auto status = RPC::ledgerFromRequest(ledger, context))
     {
         grpc::Status errorStatus;
-        if (status.toErrorCode() == rpcINVALID_PARAMS)
+        if (status.toErrorCode() == RpcInvalidParams)
         {
             errorStatus = grpc::Status(grpc::StatusCode::INVALID_ARGUMENT, status.message());
         }
@@ -174,12 +174,12 @@ doLedgerDataGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerDataRequest>& con
         if (*key < startKey)
             return {response, {grpc::StatusCode::INVALID_ARGUMENT, "end marker out of range"}};
 
-        e = ledger->sles.upper_bound(*key);
+        e = ledger->sles.upperBound(*key);
     }
 
     int maxLimit = RPC::Tuning::pageLength(true);
 
-    for (auto i = ledger->sles.upper_bound(startKey); i != e; ++i)
+    for (auto i = ledger->sles.upperBound(startKey); i != e; ++i)
     {
         auto sle = ledger->read(keylet::unchecked((*i)->key()));
         if (maxLimit-- <= 0)
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
index fe59cf27f3..a5fcee7a5e 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerEntry.cpp
@@ -34,16 +34,16 @@
 
 namespace xrpl {
 
-using FunctionType = std::function<Expected<uint256, Json::Value>(
-    Json::Value const&,
-    Json::StaticString const,
+using FunctionType = std::function<Expected<uint256, json::Value>(
+    json::Value const&,
+    json::StaticString const,
     unsigned const apiVersion)>;
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseFixed(
     Keylet const& keylet,
-    Json::Value const& params,
-    Json::StaticString const& fieldName,
+    json::Value const& params,
+    json::StaticString const& fieldName,
     unsigned const apiVersion);
 
 // Helper function to return FunctionType for objects that have a fixed
@@ -53,17 +53,17 @@ static FunctionType
 fixed(Keylet const& keylet)
 {
     return [keylet](
-               Json::Value const& params,
-               Json::StaticString const fieldName,
-               unsigned const apiVersion) -> Expected<uint256, Json::Value> {
+               json::Value const& params,
+               json::StaticString const fieldName,
+               unsigned const apiVersion) -> Expected<uint256, json::Value> {
         return parseFixed(keylet, params, fieldName, apiVersion);
     };
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseObjectID(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& expectedType = "hex string or object")
 {
     if (auto const uNodeIndex = LedgerEntryHelpers::parse<uint256>(params))
@@ -73,15 +73,15 @@ parseObjectID(
     return LedgerEntryHelpers::invalidFieldError("malformedRequest", fieldName, expectedType);
 }
 
-static Expected<uint256, Json::Value>
-parseIndex(Json::Value const& params, Json::StaticString const fieldName, unsigned const apiVersion)
+static Expected<uint256, json::Value>
+parseIndex(json::Value const& params, json::StaticString const fieldName, unsigned const apiVersion)
 {
     if (apiVersion > 2u && params.isString())
     {
         std::string const index = params.asString();
-        if (index == jss::amendments.c_str())
+        if (index == jss::amendments.cStr())
             return keylet::amendments().key;
-        if (index == jss::fee.c_str())
+        if (index == jss::fee.cStr())
             return keylet::fees().key;
         if (index == jss::nunl)
             return keylet::negativeUNL().key;
@@ -95,10 +95,10 @@ parseIndex(Json::Value const& params, Json::StaticString const fieldName, unsign
     return parseObjectID(params, fieldName, "hex string");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseAccountRoot(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (auto const account = LedgerEntryHelpers::parse<AccountID>(params))
@@ -111,10 +111,10 @@ parseAccountRoot(
 
 auto const parseAmendments = fixed(keylet::amendments());
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseAMM(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -139,10 +139,10 @@ parseAMM(
     return keylet::amm(*asset, *asset2).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseBridge(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isMember(jss::bridge))
@@ -172,19 +172,19 @@ parseBridge(
     return keylet::bridge(*bridge, chainType).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseCheck(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     return parseObjectID(params, fieldName, "hex string");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseCredential(
-    Json::Value const& cred,
-    Json::StaticString const fieldName,
+    json::Value const& cred,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!cred.isObject())
@@ -203,17 +203,17 @@ parseCredential(
         return Unexpected(issuer.error());
 
     auto const credType = LedgerEntryHelpers::requiredHexBlob(
-        cred, jss::credential_type, maxCredentialTypeLength, "malformedRequest");
+        cred, jss::credential_type, kMAX_CREDENTIAL_TYPE_LENGTH, "malformedRequest");
     if (!credType)
         return Unexpected(credType.error());
 
     return keylet::credential(*subject, *issuer, Slice(credType->data(), credType->size())).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseDelegate(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -234,8 +234,8 @@ parseDelegate(
     return keylet::delegate(*account, *authorize).key;
 }
 
-static Expected<STArray, Json::Value>
-parseAuthorizeCredentials(Json::Value const& jv)
+static Expected<STArray, json::Value>
+parseAuthorizeCredentials(json::Value const& jv)
 {
     if (!jv.isArray())
     {
@@ -244,7 +244,7 @@ parseAuthorizeCredentials(Json::Value const& jv)
     }
 
     std::uint32_t const n = jv.size();
-    if (n > maxCredentialsArraySize)
+    if (n > kMAX_CREDENTIALS_ARRAY_SIZE)
     {
         return Unexpected(
             LedgerEntryHelpers::malformedError(
@@ -283,23 +283,26 @@ parseAuthorizeCredentials(Json::Value const& jv)
             return Unexpected(issuer.error());
 
         auto const credentialType = LedgerEntryHelpers::requiredHexBlob(
-            jo, jss::credential_type, maxCredentialTypeLength, "malformedAuthorizedCredentials");
+            jo,
+            jss::credential_type,
+            kMAX_CREDENTIAL_TYPE_LENGTH,
+            "malformedAuthorizedCredentials");
         if (!credentialType)
             return Unexpected(credentialType.error());
 
         auto credential = STObject::makeInnerObject(sfCredential);
         credential.setAccountID(sfIssuer, *issuer);
         credential.setFieldVL(sfCredentialType, *credentialType);
-        arr.push_back(std::move(credential));
+        arr.pushBack(std::move(credential));
     }
 
     return arr;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseDepositPreauth(
-    Json::Value const& dp,
-    Json::StaticString const fieldName,
+    json::Value const& dp,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!dp.isObject())
@@ -347,10 +350,10 @@ parseDepositPreauth(
     return keylet::depositPreauth(*owner, sorted).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseDID(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     auto const account = LedgerEntryHelpers::parse<AccountID>(params);
@@ -362,10 +365,10 @@ parseDID(
     return keylet::did(*account).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseDirectoryNode(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -374,7 +377,7 @@ parseDirectoryNode(
     }
 
     if (params.isMember(jss::sub_index) &&
-        (!params[jss::sub_index].isConvertibleTo(Json::uintValue) ||
+        (!params[jss::sub_index].isConvertibleTo(json::UintValue) ||
          params[jss::sub_index].isBool()))
     {
         return LedgerEntryHelpers::invalidFieldError("malformedRequest", jss::sub_index, "number");
@@ -413,10 +416,10 @@ parseDirectoryNode(
     return LedgerEntryHelpers::malformedError("malformedRequest", "");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseEscrow(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -436,11 +439,11 @@ parseEscrow(
 
 auto const parseFeeSettings = fixed(keylet::fees());
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseFixed(
     Keylet const& keylet,
-    Json::Value const& params,
-    Json::StaticString const& fieldName,
+    json::Value const& params,
+    json::StaticString const& fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isBool())
@@ -455,10 +458,10 @@ parseFixed(
     return keylet.key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseLedgerHashes(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     unsigned const apiVersion)
 {
     if (params.isUInt() || params.isInt())
@@ -475,10 +478,10 @@ parseLedgerHashes(
     return parseFixed(keylet::skip(), params, fieldName, apiVersion);
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseLoanBroker(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -496,10 +499,10 @@ parseLoanBroker(
     return keylet::loanbroker(*id, *seq).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseLoan(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -518,10 +521,10 @@ parseLoan(
     return keylet::loan(*id, *seq).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseMPToken(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -542,10 +545,10 @@ parseMPToken(
     return keylet::mptoken(*mptIssuanceID, *account).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseMPTokenIssuance(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     auto const mptIssuanceID = LedgerEntryHelpers::parse<uint192>(params);
@@ -558,19 +561,19 @@ parseMPTokenIssuance(
     return keylet::mptIssuance(*mptIssuanceID).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseNFTokenOffer(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     return parseObjectID(params, fieldName, "hex string");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseNFTokenPage(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     return parseObjectID(params, fieldName, "hex string");
@@ -578,10 +581,10 @@ parseNFTokenPage(
 
 auto const parseNegativeUNL = fixed(keylet::negativeUNL());
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseOffer(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -600,10 +603,10 @@ parseOffer(
     return keylet::offer(*id, *seq).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseOracle(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -623,19 +626,19 @@ parseOracle(
     return keylet::oracle(*id, *seq).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parsePayChannel(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     return parseObjectID(params, fieldName, "hex string");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parsePermissionedDomain(
-    Json::Value const& pd,
-    Json::StaticString const fieldName,
+    json::Value const& pd,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (pd.isString())
@@ -661,10 +664,10 @@ parsePermissionedDomain(
     return keylet::permissionedDomain(*account, pd[jss::seq].asUInt()).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseRippleState(
-    Json::Value const& jvRippleState,
-    Json::StaticString const fieldName,
+    json::Value const& jvRippleState,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     Currency uCurrency;
@@ -701,7 +704,7 @@ parseRippleState(
     }
 
     if (!jvRippleState[jss::currency].isString() || jvRippleState[jss::currency] == "" ||
-        !to_currency(uCurrency, jvRippleState[jss::currency].asString()))
+        !toCurrency(uCurrency, jvRippleState[jss::currency].asString()))
     {
         return LedgerEntryHelpers::invalidFieldError(
             "malformedCurrency", jss::currency, "Currency");
@@ -710,19 +713,19 @@ parseRippleState(
     return keylet::line(*id1, *id2, uCurrency).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseSignerList(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     return parseObjectID(params, fieldName, "hex string");
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseTicket(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -742,10 +745,10 @@ parseTicket(
     return getTicketIndex(*id, *seq);
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseVault(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
     if (!params.isObject())
@@ -764,49 +767,49 @@ parseVault(
     return keylet::vault(*id, *seq).key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseXChainOwnedClaimID(
-    Json::Value const& claim_id,
-    Json::StaticString const fieldName,
+    json::Value const& claimId,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
-    if (!claim_id.isObject())
+    if (!claimId.isObject())
     {
-        return parseObjectID(claim_id, fieldName);
+        return parseObjectID(claimId, fieldName);
     }
 
-    auto const bridge_spec = LedgerEntryHelpers::parseBridgeFields(claim_id);
-    if (!bridge_spec)
-        return Unexpected(bridge_spec.error());
+    auto const bridgeSpec = LedgerEntryHelpers::parseBridgeFields(claimId);
+    if (!bridgeSpec)
+        return Unexpected(bridgeSpec.error());
 
     auto const seq = LedgerEntryHelpers::requiredUInt32(
-        claim_id, jss::xchain_owned_claim_id, "malformedXChainOwnedClaimID");
+        claimId, jss::xchain_owned_claim_id, "malformedXChainOwnedClaimID");
     if (!seq)
     {
         return Unexpected(seq.error());
     }
 
-    Keylet keylet = keylet::xChainClaimID(*bridge_spec, *seq);
+    Keylet keylet = keylet::xChainClaimID(*bridgeSpec, *seq);
     return keylet.key;
 }
 
-static Expected<uint256, Json::Value>
+static Expected<uint256, json::Value>
 parseXChainOwnedCreateAccountClaimID(
-    Json::Value const& claim_id,
-    Json::StaticString const fieldName,
+    json::Value const& claimId,
+    json::StaticString const fieldName,
     [[maybe_unused]] unsigned const apiVersion)
 {
-    if (!claim_id.isObject())
+    if (!claimId.isObject())
     {
-        return parseObjectID(claim_id, fieldName);
+        return parseObjectID(claimId, fieldName);
     }
 
-    auto const bridge_spec = LedgerEntryHelpers::parseBridgeFields(claim_id);
-    if (!bridge_spec)
-        return Unexpected(bridge_spec.error());
+    auto const bridgeSpec = LedgerEntryHelpers::parseBridgeFields(claimId);
+    if (!bridgeSpec)
+        return Unexpected(bridgeSpec.error());
 
     auto const seq = LedgerEntryHelpers::requiredUInt32(
-        claim_id,
+        claimId,
         jss::xchain_owned_create_account_claim_id,
         "malformedXChainOwnedCreateAccountClaimID");
     if (!seq)
@@ -814,13 +817,13 @@ parseXChainOwnedCreateAccountClaimID(
         return Unexpected(seq.error());
     }
 
-    Keylet keylet = keylet::xChainCreateAccountClaimID(*bridge_spec, *seq);
+    Keylet keylet = keylet::xChainCreateAccountClaimID(*bridgeSpec, *seq);
     return keylet.key;
 }
 
 struct LedgerEntry
 {
-    Json::StaticString fieldName;
+    json::StaticString fieldName;
     FunctionType parseFunction;
     LedgerEntryType expectedType;
 };
@@ -830,10 +833,10 @@ struct LedgerEntry
 //   ledger_index : <ledger_index>
 //   ...
 // }
-Json::Value
+json::Value
 doLedgerEntry(RPC::JsonContext& context)
 {
-    static auto ledgerEntryParsers = std::to_array<LedgerEntry>({
+    static auto kLEDGER_ENTRY_PARSERS = std::to_array<LedgerEntry>({
 #pragma push_macro("LEDGER_ENTRY")
 #undef LEDGER_ENTRY
 
@@ -856,7 +859,7 @@ doLedgerEntry(RPC::JsonContext& context)
     auto const hasMoreThanOneMember = [&]() {
         int count = 0;
 
-        for (auto const& ledgerEntry : ledgerEntryParsers)
+        for (auto const& ledgerEntry : kLEDGER_ENTRY_PARSERS)
         {
             if (context.params.isMember(ledgerEntry.fieldName))
             {
@@ -870,7 +873,7 @@ doLedgerEntry(RPC::JsonContext& context)
 
     if (hasMoreThanOneMember)
     {
-        return RPC::make_param_error("Too many fields provided.");
+        return RPC::makeParamError("Too many fields provided.");
     }
 
     std::shared_ptr<ReadView const> lpLedger;
@@ -885,7 +888,7 @@ doLedgerEntry(RPC::JsonContext& context)
     try
     {
         bool found = false;
-        for (auto const& ledgerEntry : ledgerEntryParsers)
+        for (auto const& ledgerEntry : kLEDGER_ENTRY_PARSERS)
         {
             if (context.params.isMember(ledgerEntry.fieldName))
             {
@@ -894,7 +897,7 @@ doLedgerEntry(RPC::JsonContext& context)
                 // `ledger_entry` param level.
                 // So that parser needs to have the whole `params` field.
                 // All other parsers only need the one field name's info.
-                Json::Value const& params = ledgerEntry.fieldName == jss::bridge
+                json::Value const& params = ledgerEntry.fieldName == jss::bridge
                     ? context.params
                     : context.params[ledgerEntry.fieldName];
                 auto const result =
@@ -914,16 +917,16 @@ doLedgerEntry(RPC::JsonContext& context)
                 jvResult[jss::error] = "unknownOption";
                 return jvResult;
             }
-            return RPC::make_param_error("No ledger_entry params provided.");
+            return RPC::makeParamError("No ledger_entry params provided.");
         }
     }
-    catch (Json::error const& e)
+    catch (json::Error const& e)
     {
         if (context.apiVersion > 1u)
         {
             // For apiVersion 2 onwards, any parsing failures that throw
             // this exception return an invalidParam error.
-            return RPC::make_error(rpcINVALID_PARAMS);
+            return RPC::makeError(RpcInvalidParams);
         }
 
         throw;
@@ -934,7 +937,7 @@ doLedgerEntry(RPC::JsonContext& context)
 
     if (uNodeIndex.isZero())
     {
-        RPC::inject_error(rpcENTRY_NOT_FOUND, jvResult);
+        RPC::injectError(RpcEntryNotFound, jvResult);
         return jvResult;
     }
 
@@ -947,13 +950,13 @@ doLedgerEntry(RPC::JsonContext& context)
     if (!sleNode)
     {
         // Not found.
-        RPC::inject_error(rpcENTRY_NOT_FOUND, jvResult);
+        RPC::injectError(RpcEntryNotFound, jvResult);
         return jvResult;
     }
 
     if ((expectedType != ltANY) && (expectedType != sleNode->getType()))
     {
-        RPC::inject_error(rpcUNEXPECTED_LEDGER_TYPE, jvResult);
+        RPC::injectError(RpcUnexpectedLedgerType, jvResult);
         return jvResult;
     }
 
@@ -967,7 +970,7 @@ doLedgerEntry(RPC::JsonContext& context)
     }
     else
     {
-        jvResult[jss::node] = sleNode->getJson(JsonOptions::none);
+        jvResult[jss::node] = sleNode->getJson(JsonOptions::KNone);
     }
 
     return jvResult;
@@ -984,7 +987,7 @@ doLedgerEntryGrpc(RPC::GRPCContext<org::xrpl::rpc::v1::GetLedgerEntryRequest>& c
     if (auto status = RPC::ledgerFromRequest(ledger, context))
     {
         grpc::Status errorStatus;
-        if (status.toErrorCode() == rpcINVALID_PARAMS)
+        if (status.toErrorCode() == RpcInvalidParams)
         {
             errorStatus = grpc::Status(grpc::StatusCode::INVALID_ARGUMENT, status.message());
         }
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerEntryHelpers.h b/src/xrpld/rpc/handlers/ledger/LedgerEntryHelpers.h
index d0d643661d..a5b83e8501 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerEntryHelpers.h
+++ b/src/xrpld/rpc/handlers/ledger/LedgerEntryHelpers.h
@@ -14,40 +14,40 @@
 
 namespace xrpl::LedgerEntryHelpers {
 
-inline Unexpected<Json::Value>
-missingFieldError(Json::StaticString const field, std::optional<std::string> err = std::nullopt)
+inline Unexpected<json::Value>
+missingFieldError(json::StaticString const field, std::optional<std::string> err = std::nullopt)
 {
-    Json::Value json = Json::objectValue;
+    json::Value json = json::ObjectValue;
     json[jss::error] = err.value_or("malformedRequest");
-    json[jss::error_code] = rpcINVALID_PARAMS;
-    json[jss::error_message] = RPC::missing_field_message(std::string(field.c_str()));
+    json[jss::error_code] = RpcInvalidParams;
+    json[jss::error_message] = RPC::missingFieldMessage(std::string(field.cStr()));
     return Unexpected(json);
 }
 
-inline Unexpected<Json::Value>
-invalidFieldError(std::string const& err, Json::StaticString const field, std::string const& type)
+inline Unexpected<json::Value>
+invalidFieldError(std::string const& err, json::StaticString const field, std::string const& type)
 {
-    Json::Value json = Json::objectValue;
+    json::Value json = json::ObjectValue;
     json[jss::error] = err;
-    json[jss::error_code] = rpcINVALID_PARAMS;
-    json[jss::error_message] = RPC::expected_field_message(field, type);
+    json[jss::error_code] = RpcInvalidParams;
+    json[jss::error_message] = RPC::expectedFieldMessage(field, type);
     return Unexpected(json);
 }
 
-inline Unexpected<Json::Value>
+inline Unexpected<json::Value>
 malformedError(std::string const& err, std::string const& message)
 {
-    Json::Value json = Json::objectValue;
+    json::Value json = json::ObjectValue;
     json[jss::error] = err;
-    json[jss::error_code] = rpcINVALID_PARAMS;
+    json[jss::error_code] = RpcInvalidParams;
     json[jss::error_message] = message;
     return Unexpected(json);
 }
 
-inline Expected<bool, Json::Value>
+inline Expected<bool, json::Value>
 hasRequired(
-    Json::Value const& params,
-    std::initializer_list<Json::StaticString> fields,
+    json::Value const& params,
+    std::initializer_list<json::StaticString> fields,
     std::optional<std::string> err = std::nullopt)
 {
     for (auto const field : fields)
@@ -62,13 +62,13 @@ hasRequired(
 
 template <class T>
 std::optional<T>
-parse(Json::Value const& param);
+parse(json::Value const& param);
 
 template <class T>
-Expected<T, Json::Value>
+Expected<T, json::Value>
 required(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& err,
     std::string const& expectedType)
 {
@@ -85,7 +85,7 @@ required(
 
 template <>
 inline std::optional<AccountID>
-parse(Json::Value const& param)
+parse(json::Value const& param)
 {
     if (!param.isString())
         return std::nullopt;
@@ -99,17 +99,17 @@ parse(Json::Value const& param)
     return account;
 }
 
-inline Expected<AccountID, Json::Value>
+inline Expected<AccountID, json::Value>
 requiredAccountID(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& err)
 {
     return required<AccountID>(params, fieldName, err, "AccountID");
 }
 
 inline std::optional<Blob>
-parseHexBlob(Json::Value const& param, std::size_t maxLength)
+parseHexBlob(json::Value const& param, std::size_t maxLength)
 {
     if (!param.isString())
         return std::nullopt;
@@ -121,10 +121,10 @@ parseHexBlob(Json::Value const& param, std::size_t maxLength)
     return blob;
 }
 
-inline Expected<Blob, Json::Value>
+inline Expected<Blob, json::Value>
 requiredHexBlob(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::size_t maxLength,
     std::string const& err)
 {
@@ -141,7 +141,7 @@ requiredHexBlob(
 
 template <>
 inline std::optional<std::uint32_t>
-parse(Json::Value const& param)
+parse(json::Value const& param)
 {
     if (param.isUInt() || (param.isInt() && param.asInt() >= 0))
         return param.asUInt();
@@ -156,10 +156,10 @@ parse(Json::Value const& param)
     return std::nullopt;
 }
 
-inline Expected<std::uint32_t, Json::Value>
+inline Expected<std::uint32_t, json::Value>
 requiredUInt32(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& err)
 {
     return required<std::uint32_t>(params, fieldName, err, "number");
@@ -167,7 +167,7 @@ requiredUInt32(
 
 template <>
 inline std::optional<uint256>
-parse(Json::Value const& param)
+parse(json::Value const& param)
 {
     uint256 uNodeIndex;
     if (!param.isString() || !uNodeIndex.parseHex(param.asString()))
@@ -178,10 +178,10 @@ parse(Json::Value const& param)
     return uNodeIndex;
 }
 
-inline Expected<uint256, Json::Value>
+inline Expected<uint256, json::Value>
 requiredUInt256(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& err)
 {
     return required<uint256>(params, fieldName, err, "Hash256");
@@ -189,7 +189,7 @@ requiredUInt256(
 
 template <>
 inline std::optional<uint192>
-parse(Json::Value const& param)
+parse(json::Value const& param)
 {
     uint192 field;
     if (!param.isString() || !field.parseHex(param.asString()))
@@ -200,10 +200,10 @@ parse(Json::Value const& param)
     return field;
 }
 
-inline Expected<uint192, Json::Value>
+inline Expected<uint192, json::Value>
 requiredUInt192(
-    Json::Value const& params,
-    Json::StaticString const fieldName,
+    json::Value const& params,
+    json::StaticString const fieldName,
     std::string const& err)
 {
     return required<uint192>(params, fieldName, err, "Hash192");
@@ -211,7 +211,7 @@ requiredUInt192(
 
 template <>
 inline std::optional<Asset>
-parse(Json::Value const& param)
+parse(json::Value const& param)
 {
     try
     {
@@ -223,14 +223,14 @@ parse(Json::Value const& param)
     }
 }
 
-inline Expected<Asset, Json::Value>
-requiredAsset(Json::Value const& params, Json::StaticString const fieldName, std::string const& err)
+inline Expected<Asset, json::Value>
+requiredAsset(json::Value const& params, json::StaticString const fieldName, std::string const& err)
 {
     return required<Asset>(params, fieldName, err, "Asset");
 }
 
-inline Expected<STXChainBridge, Json::Value>
-parseBridgeFields(Json::Value const& params)
+inline Expected<STXChainBridge, json::Value>
+parseBridgeFields(json::Value const& params)
 {
     if (auto const value = hasRequired(
             params,
diff --git a/src/xrpld/rpc/handlers/ledger/LedgerHeader.cpp b/src/xrpld/rpc/handlers/ledger/LedgerHeader.cpp
index 6f01889b59..e2cb80615b 100644
--- a/src/xrpld/rpc/handlers/ledger/LedgerHeader.cpp
+++ b/src/xrpld/rpc/handlers/ledger/LedgerHeader.cpp
@@ -17,7 +17,7 @@ namespace xrpl {
 //   ledger_hash : <ledger>
 //   ledger_index : <ledger_index>
 // }
-Json::Value
+json::Value
 doLedgerHeader(RPC::JsonContext& context)
 {
     std::shared_ptr<ReadView const> lpLedger;
diff --git a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
index c093c5fcf5..73dfb178bc 100644
--- a/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/AMMInfo.cpp
@@ -18,6 +18,7 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/ErrorCodes.h>
+#include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STAmount.h>
@@ -34,8 +35,8 @@
 
 namespace xrpl {
 
-Expected<Asset, error_code_i>
-getAsset(Json::Value const& v, beast::Journal j)
+Expected<Asset, ErrorCodeI>
+getAsset(json::Value const& v, beast::Journal j)
 {
     try
     {
@@ -45,25 +46,25 @@ getAsset(Json::Value const& v, beast::Journal j)
     {
         JLOG(j.debug()) << "getAsset " << ex.what();
     }
-    return Unexpected(rpcISSUE_MALFORMED);
+    return Unexpected(RpcIssueMalformed);
 }
 
 std::string
-to_iso8601(NetClock::time_point tp)
+toIso8601(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 date::format(
         "%Y-%Om-%dT%H:%M:%OS%z",
         date::sys_time<system_clock::duration>(
-            system_clock::time_point{tp.time_since_epoch() + epoch_offset}));
+            system_clock::time_point{tp.time_since_epoch() + kEPOCH_OFFSET}));
 }
 
-Json::Value
+json::Value
 doAMMInfo(RPC::JsonContext& context)
 {
     auto const& params(context.params);
-    Json::Value result;
+    json::Value result;
 
     std::shared_ptr<ReadView const> ledger;
     result = RPC::lookupLedger(ledger, context);
@@ -78,20 +79,20 @@ doAMMInfo(RPC::JsonContext& context)
         std::shared_ptr<SLE const> amm;
     };
 
-    auto getValuesFromContextParams = [&]() -> Expected<ValuesFromContextParams, error_code_i> {
+    auto getValuesFromContextParams = [&]() -> Expected<ValuesFromContextParams, ErrorCodeI> {
         std::optional<AccountID> accountID;
         std::optional<Asset> asset1;
         std::optional<Asset> asset2;
         std::optional<uint256> ammID;
 
-        constexpr auto invalid = [](Json::Value const& params) -> bool {
+        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 && invalid(params))
-            return Unexpected(rpcINVALID_PARAMS);
+        if (context.apiVersion < 3 && kINVALID(params))
+            return Unexpected(RpcInvalidParams);
 
         if (params.isMember(jss::asset))
         {
@@ -121,25 +122,25 @@ doAMMInfo(RPC::JsonContext& context)
         {
             auto const id = parseBase58<AccountID>((params[jss::amm_account].asString()));
             if (!id)
-                return Unexpected(rpcACT_MALFORMED);
+                return Unexpected(RpcActMalformed);
             auto const sle = ledger->read(keylet::account(*id));
             if (!sle)
-                return Unexpected(rpcACT_MALFORMED);
+                return Unexpected(RpcActMalformed);
             ammID = sle->getFieldH256(sfAMMID);
             if (ammID->isZero())
-                return Unexpected(rpcACT_NOT_FOUND);
+                return Unexpected(RpcActNotFound);
         }
 
         if (params.isMember(jss::account))
         {
             accountID = parseBase58<AccountID>(params[jss::account].asString());
             if (!accountID || !ledger->read(keylet::account(*accountID)))
-                return Unexpected(rpcACT_MALFORMED);
+                return Unexpected(RpcActMalformed);
         }
 
         // NOTE, identical check for apVersion < 3 above
-        if (context.apiVersion >= 3 && invalid(params))
-            return Unexpected(rpcINVALID_PARAMS);
+        if (context.apiVersion >= 3 && kINVALID(params))
+            return Unexpected(RpcInvalidParams);
 
         XRPL_ASSERT(
             (asset1.has_value() == asset2.has_value()) && (asset1.has_value() != ammID.has_value()),
@@ -153,7 +154,7 @@ doAMMInfo(RPC::JsonContext& context)
         }();
         auto const amm = ledger->read(ammKeylet);
         if (!amm)
-            return Unexpected(rpcACT_NOT_FOUND);
+            return Unexpected(RpcActNotFound);
         if (!asset1 && !asset2)
         {
             asset1 = (*amm)[sfAsset];
@@ -167,7 +168,7 @@ doAMMInfo(RPC::JsonContext& context)
     auto const r = getValuesFromContextParams();
     if (!r)
     {
-        RPC::inject_error(r.error(), result);
+        RPC::injectError(r.error(), result);
         return result;
     }
 
@@ -181,24 +182,24 @@ doAMMInfo(RPC::JsonContext& context)
         ammAccountID,
         asset1,
         asset2,
-        FreezeHandling::fhIGNORE_FREEZE,
-        AuthHandling::ahIGNORE_AUTH,
+        FreezeHandling::IgnoreFreeze,
+        AuthHandling::IgnoreAuth,
         context.j);
     auto const lptAMMBalance =
         accountID ? ammLPHolds(*ledger, *amm, *accountID, context.j) : (*amm)[sfLPTokenBalance];
 
-    Json::Value ammResult;
+    json::Value ammResult;
     asset1Balance.setJson(ammResult[jss::amount]);
     asset2Balance.setJson(ammResult[jss::amount2]);
     lptAMMBalance.setJson(ammResult[jss::lp_token]);
     ammResult[jss::trading_fee] = (*amm)[sfTradingFee];
     ammResult[jss::account] = to_string(ammAccountID);
-    Json::Value voteSlots(Json::arrayValue);
+    json::Value voteSlots(json::ArrayValue);
     if (amm->isFieldPresent(sfVoteSlots))
     {
         for (auto const& voteEntry : amm->getFieldArray(sfVoteSlots))
         {
-            Json::Value vote;
+            json::Value vote;
             vote[jss::account] = to_string(voteEntry.getAccountID(sfAccount));
             vote[jss::trading_fee] = voteEntry[sfTradingFee];
             vote[jss::vote_weight] = voteEntry[sfVoteWeight];
@@ -212,24 +213,24 @@ doAMMInfo(RPC::JsonContext& context)
         "xrpl::doAMMInfo : auction slot is set");
     if (amm->isFieldPresent(sfAuctionSlot))
     {
-        auto const& auctionSlot = safe_downcast<STObject const&>(amm->peekAtField(sfAuctionSlot));
+        auto const& auctionSlot = safeDowncast<STObject const&>(amm->peekAtField(sfAuctionSlot));
         if (auctionSlot.isFieldPresent(sfAccount))
         {
-            Json::Value auction;
+            json::Value auction;
             auto const timeSlot = ammAuctionTimeSlot(
                 ledger->header().parentCloseTime.time_since_epoch().count(), auctionSlot);
-            auction[jss::time_interval] = timeSlot ? *timeSlot : AUCTION_SLOT_TIME_INTERVALS;
+            auction[jss::time_interval] = timeSlot ? *timeSlot : kAUCTION_SLOT_TIME_INTERVALS;
             auctionSlot[sfPrice].setJson(auction[jss::price]);
             auction[jss::discounted_fee] = auctionSlot[sfDiscountedFee];
             auction[jss::account] = to_string(auctionSlot.getAccountID(sfAccount));
             auction[jss::expiration] =
-                to_iso8601(NetClock::time_point{NetClock::duration{auctionSlot[sfExpiration]}});
+                toIso8601(NetClock::time_point{NetClock::duration{auctionSlot[sfExpiration]}});
             if (auctionSlot.isFieldPresent(sfAuthAccounts))
             {
-                Json::Value auth;
+                json::Value auth;
                 for (auto const& acct : auctionSlot.getFieldArray(sfAuthAccounts))
                 {
-                    Json::Value jv;
+                    json::Value jv;
                     jv[jss::account] = to_string(acct.getAccountID(sfAccount));
                     auth.append(jv);
                 }
diff --git a/src/xrpld/rpc/handlers/orderbook/BookChanges.cpp b/src/xrpld/rpc/handlers/orderbook/BookChanges.cpp
index 502895e734..947a257916 100644
--- a/src/xrpld/rpc/handlers/orderbook/BookChanges.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/BookChanges.cpp
@@ -9,12 +9,12 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doBookChanges(RPC::JsonContext& context)
 {
     std::shared_ptr<ReadView const> ledger;
 
-    Json::Value result = RPC::lookupLedger(ledger, context);
+    json::Value result = RPC::lookupLedger(ledger, context);
     if (ledger == nullptr)
         return result;
 
diff --git a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
index 04fceac268..2c9c53620c 100644
--- a/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/BookOffers.cpp
@@ -27,53 +27,53 @@
 
 namespace xrpl {
 
-std::optional<Json::Value>
-validateTakerJSON(Json::Value const& taker, Json::StaticString const& name)
+std::optional<json::Value>
+validateTakerJSON(json::Value const& taker, json::StaticString const& name)
 {
     if (!taker.isMember(jss::currency) && !taker.isMember(jss::mpt_issuance_id))
     {
-        return RPC::missing_field_error((boost::format("%s.currency") % name.c_str()).str());
+        return RPC::missingFieldError((boost::format("%s.currency") % name.cStr()).str());
     }
 
     if (taker.isMember(jss::mpt_issuance_id) &&
         (taker.isMember(jss::currency) || taker.isMember(jss::issuer)))
     {
-        return RPC::invalid_field_error(name.c_str());
+        return RPC::invalidFieldError(name.cStr());
     }
 
     if ((taker.isMember(jss::currency) && !taker[jss::currency].isString()) ||
         (taker.isMember(jss::mpt_issuance_id) && !taker[jss::mpt_issuance_id].isString()))
     {
-        return RPC::expected_field_error(
-            (boost::format("%s.currency") % name.c_str()).str(), "string");
+        return RPC::expectedFieldError(
+            (boost::format("%s.currency") % name.cStr()).str(), "string");
     }
 
     return std::nullopt;
 }
 
-std::optional<Json::Value>
+std::optional<json::Value>
 parseTakerAssetJSON(
     Asset& asset,
-    Json::Value const& taker,
-    Json::StaticString const& name,
+    json::Value const& taker,
+    json::StaticString const& name,
     beast::Journal j)
 {
     auto const assetError = [&]() {
         if (name == jss::taker_pays)
-            return rpcSRC_CUR_MALFORMED;
-        return rpcDST_AMT_MALFORMED;
+            return RpcSrcCurMalformed;
+        return RpcDstAmtMalformed;
     }();
 
     if (taker.isMember(jss::currency))
     {
         Issue issue = xrpIssue();
 
-        if (!to_currency(issue.currency, taker[jss::currency].asString()))
+        if (!toCurrency(issue.currency, taker[jss::currency].asString()))
         {
-            JLOG(j.info()) << boost::format("Bad %s currency.") % name.c_str();
-            return RPC::make_error(
+            JLOG(j.info()) << boost::format("Bad %s currency.") % name.cStr();
+            return RPC::makeError(
                 assetError,
-                (boost::format("Invalid field '%s.currency', bad currency.") % name.c_str()).str());
+                (boost::format("Invalid field '%s.currency', bad currency.") % name.cStr()).str());
         }
         asset = issue;
     }
@@ -82,9 +82,9 @@ parseTakerAssetJSON(
         MPTID mptid;
         if (!mptid.parseHex(taker[jss::mpt_issuance_id].asString()))
         {
-            return RPC::make_error(
+            return RPC::makeError(
                 assetError,
-                (boost::format("Invalid field '%s.mpt_issuance_id'") % name.c_str()).str());
+                (boost::format("Invalid field '%s.mpt_issuance_id'") % name.cStr()).str());
         }
         asset = mptid;
     }
@@ -92,17 +92,17 @@ parseTakerAssetJSON(
     return std::nullopt;
 }
 
-std::optional<Json::Value>
+std::optional<json::Value>
 parseTakerIssuerJSON(
     Asset& asset,
-    Json::Value const& taker,
-    Json::StaticString const& name,
+    json::Value const& taker,
+    json::StaticString const& name,
     beast::Journal j)
 {
     auto const issuerError = [&]() {
         if (name == jss::taker_pays)
-            return rpcSRC_ISR_MALFORMED;
-        return rpcDST_ISR_MALFORMED;
+            return RpcSrcIsrMalformed;
+        return RpcDstIsrMalformed;
     }();
 
     if (taker.isMember(jss::currency))
@@ -113,23 +113,23 @@ parseTakerIssuerJSON(
         {
             if (!taker[jss::issuer].isString())
             {
-                return RPC::expected_field_error(
-                    (boost::format("%s.issuer") % name.c_str()).str(), "string");
+                return RPC::expectedFieldError(
+                    (boost::format("%s.issuer") % name.cStr()).str(), "string");
             }
 
-            if (!to_issuer(issue.account, taker[jss::issuer].asString()))
+            if (!toIssuer(issue.account, taker[jss::issuer].asString()))
             {
-                return RPC::make_error(
+                return RPC::makeError(
                     issuerError,
-                    (boost::format("Invalid field '%s.issuer', bad issuer.") % name.c_str()).str());
+                    (boost::format("Invalid field '%s.issuer', bad issuer.") % name.cStr()).str());
             }
 
             if (issue.account == noAccount())
             {
-                return RPC::make_error(
+                return RPC::makeError(
                     issuerError,
                     (boost::format("Invalid field '%s.issuer', bad issuer account one.") %
-                     name.c_str())
+                     name.cStr())
                         .str());
             }
         }
@@ -140,21 +140,20 @@ parseTakerIssuerJSON(
 
         if (isXRP(issue.currency) && !isXRP(issue.account))
         {
-            return RPC::make_error(
+            return RPC::makeError(
                 issuerError,
                 (boost::format(
                      "Unneeded field '%s.issuer' for XRP currency "
                      "specification.") %
-                 name.c_str())
+                 name.cStr())
                     .str());
         }
 
         if (!isXRP(issue.currency) && isXRP(issue.account))
         {
-            return RPC::make_error(
+            return RPC::makeError(
                 issuerError,
-                (boost::format("Invalid field '%s.issuer', expected non-XRP issuer.") %
-                 name.c_str())
+                (boost::format("Invalid field '%s.issuer', expected non-XRP issuer.") % name.cStr())
                     .str());
         }
     }
@@ -162,14 +161,14 @@ parseTakerIssuerJSON(
     return std::nullopt;
 }
 
-Json::Value
+json::Value
 doBookOffers(RPC::JsonContext& context)
 {
     // VFALCO TODO Here is a terrible place for this kind of business
     //             logic. It needs to be moved elsewhere and documented,
     //             and encapsulated into a function.
-    if (context.app.getJobQueue().getJobCountGE(jtCLIENT) > 200)
-        return rpcError(rpcTOO_BUSY);
+    if (context.app.getJobQueue().getJobCountGE(JtClient) > 200)
+        return rpcError(RpcTooBusy);
 
     std::shared_ptr<ReadView const> lpLedger;
     auto jvResult = RPC::lookupLedger(lpLedger, context);
@@ -178,49 +177,49 @@ doBookOffers(RPC::JsonContext& context)
         return jvResult;
 
     if (!context.params.isMember(jss::taker_pays))
-        return RPC::missing_field_error(jss::taker_pays);
+        return RPC::missingFieldError(jss::taker_pays);
 
     if (!context.params.isMember(jss::taker_gets))
-        return RPC::missing_field_error(jss::taker_gets);
+        return RPC::missingFieldError(jss::taker_gets);
 
-    Json::Value const& taker_pays = context.params[jss::taker_pays];
-    Json::Value const& taker_gets = context.params[jss::taker_gets];
+    json::Value const& takerPays = context.params[jss::taker_pays];
+    json::Value const& takerGets = context.params[jss::taker_gets];
 
-    if (!taker_pays.isObjectOrNull())
-        return RPC::object_field_error(jss::taker_pays);
+    if (!takerPays.isObjectOrNull())
+        return RPC::objectFieldError(jss::taker_pays);
 
-    if (!taker_gets.isObjectOrNull())
-        return RPC::object_field_error(jss::taker_gets);
+    if (!takerGets.isObjectOrNull())
+        return RPC::objectFieldError(jss::taker_gets);
 
-    if (auto const err = validateTakerJSON(taker_pays, jss::taker_pays))
+    if (auto const err = validateTakerJSON(takerPays, jss::taker_pays))
         return *err;
 
-    if (auto const err = validateTakerJSON(taker_gets, jss::taker_gets))
+    if (auto const err = validateTakerJSON(takerGets, jss::taker_gets))
         return *err;
 
     Book book;
 
-    if (auto const err = parseTakerAssetJSON(book.in, taker_pays, jss::taker_pays, context.j))
+    if (auto const err = parseTakerAssetJSON(book.in, takerPays, jss::taker_pays, context.j))
         return *err;
 
-    if (auto const err = parseTakerAssetJSON(book.out, taker_gets, jss::taker_gets, context.j))
+    if (auto const err = parseTakerAssetJSON(book.out, takerGets, jss::taker_gets, context.j))
         return *err;
 
-    if (auto const err = parseTakerIssuerJSON(book.in, taker_pays, jss::taker_pays, context.j))
+    if (auto const err = parseTakerIssuerJSON(book.in, takerPays, jss::taker_pays, context.j))
         return *err;
 
-    if (auto const err = parseTakerIssuerJSON(book.out, taker_gets, jss::taker_gets, context.j))
+    if (auto const err = parseTakerIssuerJSON(book.out, takerGets, jss::taker_gets, context.j))
         return *err;
 
     std::optional<AccountID> takerID;
     if (context.params.isMember(jss::taker))
     {
         if (!context.params[jss::taker].isString())
-            return RPC::expected_field_error(jss::taker, "string");
+            return RPC::expectedFieldError(jss::taker, "string");
 
         takerID = parseBase58<AccountID>(context.params[jss::taker].asString());
         if (!takerID)
-            return RPC::invalid_field_error(jss::taker);
+            return RPC::invalidFieldError(jss::taker);
     }
 
     std::optional<uint256> domain;
@@ -230,7 +229,7 @@ doBookOffers(RPC::JsonContext& context)
         if (!context.params[jss::domain].isString() ||
             !num.parseHex(context.params[jss::domain].asString()))
         {
-            return RPC::make_error(rpcDOMAIN_MALFORMED, "Unable to parse domain.");
+            return RPC::makeError(RpcDomainMalformed, "Unable to parse domain.");
         }
 
         domain = num;
@@ -239,29 +238,29 @@ doBookOffers(RPC::JsonContext& context)
     if (book.in == book.out)
     {
         JLOG(context.j.info()) << "taker_gets same as taker_pays.";
-        return RPC::make_error(rpcBAD_MARKET);
+        return RPC::makeError(RpcBadMarket);
     }
 
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::bookOffers, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kBOOK_OFFERS, context))
         return *err;
 
     bool const bProof(context.params.isMember(jss::proof));
 
-    Json::Value const jvMarker(
+    json::Value const jvMarker(
         context.params.isMember(jss::marker) ? context.params[jss::marker]
-                                             : Json::Value(Json::nullValue));
+                                             : json::Value(json::NullValue));
 
     context.netOps.getBookPage(
         lpLedger,
         {book.in, book.out, domain},
-        takerID ? *takerID : beast::zero,
+        takerID ? *takerID : beast::kZERO,
         bProof,
         limit,
         jvMarker,
         jvResult);
 
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
 
     return jvResult;
 }
diff --git a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
index 95c7238d20..7e9f891e7f 100644
--- a/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/DepositAuthorized.cpp
@@ -31,42 +31,42 @@ namespace xrpl {
 //   credentials : [<credentialID>,...]
 // }
 
-Json::Value
+json::Value
 doDepositAuthorized(RPC::JsonContext& context)
 {
-    Json::Value const& params = context.params;
+    json::Value const& params = context.params;
 
     // Validate source_account.
     if (!params.isMember(jss::source_account))
-        return RPC::missing_field_error(jss::source_account);
+        return RPC::missingFieldError(jss::source_account);
     if (!params[jss::source_account].isString())
     {
-        return RPC::make_error(
-            rpcINVALID_PARAMS, RPC::expected_field_message(jss::source_account, "a string"));
+        return RPC::makeError(
+            RpcInvalidParams, RPC::expectedFieldMessage(jss::source_account, "a string"));
     }
 
     auto srcID = parseBase58<AccountID>(params[jss::source_account].asString());
     if (!srcID)
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
     auto const srcAcct{srcID.value()};
 
     // Validate destination_account.
     if (!params.isMember(jss::destination_account))
-        return RPC::missing_field_error(jss::destination_account);
+        return RPC::missingFieldError(jss::destination_account);
     if (!params[jss::destination_account].isString())
     {
-        return RPC::make_error(
-            rpcINVALID_PARAMS, RPC::expected_field_message(jss::destination_account, "a string"));
+        return RPC::makeError(
+            RpcInvalidParams, RPC::expectedFieldMessage(jss::destination_account, "a string"));
     }
 
     auto dstID = parseBase58<AccountID>(params[jss::destination_account].asString());
     if (!dstID)
-        return rpcError(rpcACT_MALFORMED);
+        return rpcError(RpcActMalformed);
     auto const dstAcct{dstID.value()};
 
     // Validate ledger.
     std::shared_ptr<ReadView const> ledger;
-    Json::Value result = RPC::lookupLedger(ledger, context);
+    json::Value result = RPC::lookupLedger(ledger, context);
 
     if (!ledger)
         return result;
@@ -74,7 +74,7 @@ doDepositAuthorized(RPC::JsonContext& context)
     // If source account is not in the ledger it can't be authorized.
     if (!ledger->exists(keylet::account(srcAcct)))
     {
-        RPC::inject_error(rpcSRC_ACT_NOT_FOUND, result);
+        RPC::injectError(RpcSrcActNotFound, result);
         return result;
     }
 
@@ -82,7 +82,7 @@ doDepositAuthorized(RPC::JsonContext& context)
     auto const sleDest = ledger->read(keylet::account(dstAcct));
     if (!sleDest)
     {
-        RPC::inject_error(rpcDST_ACT_NOT_FOUND, result);
+        RPC::injectError(RpcDstActNotFound, result);
         return result;
     }
 
@@ -96,15 +96,15 @@ doDepositAuthorized(RPC::JsonContext& context)
         auto const& creds(params[jss::credentials]);
         if (!creds.isArray() || !creds)
         {
-            return RPC::make_error(
-                rpcINVALID_PARAMS,
-                RPC::expected_field_message(
+            return RPC::makeError(
+                RpcInvalidParams,
+                RPC::expectedFieldMessage(
                     jss::credentials, "is non-empty array of CredentialID(hash256)"));
         }
-        if (creds.size() > maxCredentialsArraySize)
+        if (creds.size() > kMAX_CREDENTIALS_ARRAY_SIZE)
         {
-            return RPC::make_error(
-                rpcINVALID_PARAMS, RPC::expected_field_message(jss::credentials, "array too long"));
+            return RPC::makeError(
+                RpcInvalidParams, RPC::expectedFieldMessage(jss::credentials, "array too long"));
         }
 
         lifeExtender.reserve(creds.size());
@@ -112,9 +112,9 @@ doDepositAuthorized(RPC::JsonContext& context)
         {
             if (!jo.isString())
             {
-                return RPC::make_error(
-                    rpcINVALID_PARAMS,
-                    RPC::expected_field_message(
+                return RPC::makeError(
+                    RpcInvalidParams,
+                    RPC::expectedFieldMessage(
                         jss::credentials, "an array of CredentialID(hash256)"));
             }
 
@@ -122,42 +122,42 @@ doDepositAuthorized(RPC::JsonContext& context)
             auto const credS = jo.asString();
             if (!credH.parseHex(credS))
             {
-                return RPC::make_error(
-                    rpcINVALID_PARAMS,
-                    RPC::expected_field_message(
+                return RPC::makeError(
+                    RpcInvalidParams,
+                    RPC::expectedFieldMessage(
                         jss::credentials, "an array of CredentialID(hash256)"));
             }
 
             std::shared_ptr<SLE const> sleCred = ledger->read(keylet::credential(credH));
             if (!sleCred)
             {
-                RPC::inject_error(rpcBAD_CREDENTIALS, "credentials don't exist", result);
+                RPC::injectError(RpcBadCredentials, "credentials don't exist", result);
                 return result;
             }
 
             if ((sleCred->getFlags() & lsfAccepted) == 0u)
             {
-                RPC::inject_error(rpcBAD_CREDENTIALS, "credentials aren't accepted", result);
+                RPC::injectError(RpcBadCredentials, "credentials aren't accepted", result);
                 return result;
             }
 
             if (credentials::checkExpired(sleCred, ledger->header().parentCloseTime))
             {
-                RPC::inject_error(rpcBAD_CREDENTIALS, "credentials are expired", result);
+                RPC::injectError(RpcBadCredentials, "credentials are expired", result);
                 return result;
             }
 
             if ((*sleCred)[sfSubject] != srcAcct)
             {
-                RPC::inject_error(
-                    rpcBAD_CREDENTIALS, "credentials doesn't belong to the root account", result);
+                RPC::injectError(
+                    RpcBadCredentials, "credentials doesn't belong to the root account", result);
                 return result;
             }
 
             auto [it, ins] = sorted.emplace((*sleCred)[sfIssuer], (*sleCred)[sfCredentialType]);
             if (!ins)
             {
-                RPC::inject_error(rpcBAD_CREDENTIALS, "duplicates in credentials", result);
+                RPC::injectError(RpcBadCredentials, "duplicates in credentials", result);
                 return result;
             }
             lifeExtender.push_back(std::move(sleCred));
diff --git a/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/orderbook/GetAggregatePrice.cpp
index 7db7c2312e..1d34ca21b2 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 maxHistory = 3;
+    constexpr std::uint8_t kMAX_HISTORY = 3;
     bool isNew = false;
     std::uint8_t history = 0;
 
@@ -82,7 +82,7 @@ iteratePriceData(
         if ((oracle == nullptr) || f(*oracle) || isNew)
             return;
 
-        if (++history > maxHistory)
+        if (++history > kMAX_HISTORY)
             return;
 
         uint256 const prevTx = chain->getFieldH256(sfPreviousTxnID);
@@ -111,8 +111,8 @@ iteratePriceData(
             if (isNew && history == 1)
                 return;
 
-            oracle = isNew ? &safe_downcast<STObject const&>(node.peekAtField(sfNewFields))
-                           : &safe_downcast<STObject const&>(node.peekAtField(sfFinalFields));
+            oracle = isNew ? &safeDowncast<STObject const&>(node.peekAtField(sfNewFields))
+                           : &safeDowncast<STObject const&>(node.peekAtField(sfFinalFields));
             break;
         }
     }
@@ -146,31 +146,31 @@ getStats(Prices::right_const_iterator const& begin, Prices::right_const_iterator
  * time_threshold : defines a range of prices to include based on the timestamp
  *   range - {most recent, most recent - time_threshold} [optional]
  */
-Json::Value
+json::Value
 doGetAggregatePrice(RPC::JsonContext& context)
 {
-    Json::Value result;
+    json::Value result;
     auto const& params(context.params);
 
-    constexpr std::uint16_t maxOracles = 200;
+    constexpr std::uint16_t kMAX_ORACLES = 200;
     if (!params.isMember(jss::oracles))
-        return RPC::missing_field_error(jss::oracles);
+        return RPC::missingFieldError(jss::oracles);
     if (!params[jss::oracles].isArray() || params[jss::oracles].size() == 0 ||
-        params[jss::oracles].size() > maxOracles)
+        params[jss::oracles].size() > kMAX_ORACLES)
     {
-        RPC::inject_error(rpcORACLE_MALFORMED, result);
+        RPC::injectError(RpcOracleMalformed, result);
         return result;
     }
 
     if (!params.isMember(jss::base_asset))
-        return RPC::missing_field_error(jss::base_asset);
+        return RPC::missingFieldError(jss::base_asset);
 
     if (!params.isMember(jss::quote_asset))
-        return RPC::missing_field_error(jss::quote_asset);
+        return RPC::missingFieldError(jss::quote_asset);
 
     // Lambda to validate uint type
     // support positive int, uint, and a number represented as a string
-    auto validUInt = [](Json::Value const& params, Json::StaticString const& field) {
+    auto validUInt = [](json::Value const& params, json::StaticString const& field) {
         auto const& jv = params[field];
         std::uint32_t v = 0;
         return jv.isUInt() || (jv.isInt() && jv.asInt() >= 0) ||
@@ -180,12 +180,12 @@ doGetAggregatePrice(RPC::JsonContext& context)
     // Lambda to get `trim` and `time_threshold` fields. If the field
     // is not included in the input then a default value is returned.
     auto getField = [&params, &validUInt](
-                        Json::StaticString const& field,
-                        unsigned int def = 0) -> std::variant<std::uint32_t, error_code_i> {
+                        json::StaticString const& field,
+                        unsigned int def = 0) -> std::variant<std::uint32_t, ErrorCodeI> {
         if (params.isMember(field))
         {
             if (!validUInt(params, field))
-                return rpcINVALID_PARAMS;
+                return RpcInvalidParams;
             return params[field].asUInt();
         }
         return def;
@@ -193,51 +193,51 @@ doGetAggregatePrice(RPC::JsonContext& context)
 
     // Lambda to get `base_asset` and `quote_asset`. The values have
     // to conform to the Currency type.
-    auto getCurrency = [&params](SField const& sField, Json::StaticString const& field)
-        -> std::variant<Json::Value, error_code_i> {
+    auto getCurrency = [&params](SField const& sField, json::StaticString const& field)
+        -> std::variant<json::Value, ErrorCodeI> {
         try
         {
             if (params[field].asString().empty())
-                return rpcINVALID_PARAMS;
+                return RpcInvalidParams;
             currencyFromJson(sField, params[field]);
             return params[field];
         }
         catch (...)
         {
-            return rpcINVALID_PARAMS;
+            return RpcInvalidParams;
         }
     };
 
     auto const trim = getField(jss::trim);
-    if (std::holds_alternative<error_code_i>(trim))
+    if (std::holds_alternative<ErrorCodeI>(trim))
     {
-        RPC::inject_error(std::get<error_code_i>(trim), result);
+        RPC::injectError(std::get<ErrorCodeI>(trim), result);
         return result;
     }
     if (params.isMember(jss::trim) &&
-        (std::get<std::uint32_t>(trim) == 0 || std::get<std::uint32_t>(trim) > maxTrim))
+        (std::get<std::uint32_t>(trim) == 0 || std::get<std::uint32_t>(trim) > kMAX_TRIM))
     {
-        RPC::inject_error(rpcINVALID_PARAMS, result);
+        RPC::injectError(RpcInvalidParams, result);
         return result;
     }
 
     auto const timeThreshold = getField(jss::time_threshold, 0);
-    if (std::holds_alternative<error_code_i>(timeThreshold))
+    if (std::holds_alternative<ErrorCodeI>(timeThreshold))
     {
-        RPC::inject_error(std::get<error_code_i>(timeThreshold), result);
+        RPC::injectError(std::get<ErrorCodeI>(timeThreshold), result);
         return result;
     }
 
     auto const baseAsset = getCurrency(sfBaseAsset, jss::base_asset);
-    if (std::holds_alternative<error_code_i>(baseAsset))
+    if (std::holds_alternative<ErrorCodeI>(baseAsset))
     {
-        RPC::inject_error(std::get<error_code_i>(baseAsset), result);
+        RPC::injectError(std::get<ErrorCodeI>(baseAsset), result);
         return result;
     }
     auto const quoteAsset = getCurrency(sfQuoteAsset, jss::quote_asset);
-    if (std::holds_alternative<error_code_i>(quoteAsset))
+    if (std::holds_alternative<ErrorCodeI>(quoteAsset))
     {
-        RPC::inject_error(std::get<error_code_i>(quoteAsset), result);
+        RPC::injectError(std::get<ErrorCodeI>(quoteAsset), result);
         return result;
     }
 
@@ -253,7 +253,7 @@ doGetAggregatePrice(RPC::JsonContext& context)
     {
         if (!oracle.isMember(jss::oracle_document_id) || !oracle.isMember(jss::account))
         {
-            RPC::inject_error(rpcORACLE_MALFORMED, result);
+            RPC::injectError(RpcOracleMalformed, result);
             return result;
         }
         auto const documentID = validUInt(oracle, jss::oracle_document_id)
@@ -262,7 +262,7 @@ doGetAggregatePrice(RPC::JsonContext& context)
         auto const account = parseBase58<AccountID>(oracle[jss::account].asString());
         if (!account || account->isZero() || !documentID)
         {
-            RPC::inject_error(rpcINVALID_PARAMS, result);
+            RPC::injectError(RpcInvalidParams, result);
             return result;
         }
 
@@ -274,9 +274,9 @@ doGetAggregatePrice(RPC::JsonContext& context)
                     series,
                     [&](STObject const& o) -> bool {
                         return o.getFieldCurrency(sfBaseAsset).getText() ==
-                            std::get<Json::Value>(baseAsset) &&
+                            std::get<json::Value>(baseAsset) &&
                             o.getFieldCurrency(sfQuoteAsset).getText() ==
-                            std::get<Json::Value>(quoteAsset) &&
+                            std::get<json::Value>(quoteAsset) &&
                             o.isFieldPresent(sfAssetPrice);
                     });
                 iter != series.end())
@@ -296,7 +296,7 @@ doGetAggregatePrice(RPC::JsonContext& context)
 
     if (prices.empty())
     {
-        RPC::inject_error(rpcOBJECT_NOT_FOUND, result);
+        RPC::injectError(RpcObjectNotFound, result);
         return result;
     }
 
@@ -319,7 +319,7 @@ doGetAggregatePrice(RPC::JsonContext& context)
         if (prices.empty())
         {
             // LCOV_EXCL_START
-            RPC::inject_error(rpcINTERNAL, result);
+            RPC::injectError(RpcInternal, result);
             return result;
             // LCOV_EXCL_STOP
         }
@@ -337,15 +337,15 @@ doGetAggregatePrice(RPC::JsonContext& context)
         return it;
     };
 
-    auto const median = [&prices, &itAdvance, &size_ = size]() {
-        auto const middle = size_ / 2;
-        if ((size_ % 2) == 0)
+    auto const median = [&prices, &itAdvance, &size = size]() {
+        auto const middle = size / 2;
+        if ((size % 2) == 0)
         {
-            static STAmount const two{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, two, noIssue());
+            return divide(a1 + a2, kTWO, noIssue());
         }
         return itAdvance(prices.right.begin(), middle)->first;
     }();
diff --git a/src/xrpld/rpc/handlers/orderbook/NFTBuyOffers.cpp b/src/xrpld/rpc/handlers/orderbook/NFTBuyOffers.cpp
index 98c4a73784..88e4392dad 100644
--- a/src/xrpld/rpc/handlers/orderbook/NFTBuyOffers.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/NFTBuyOffers.cpp
@@ -9,18 +9,18 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doNFTBuyOffers(RPC::JsonContext& context)
 {
     if (!context.params.isMember(jss::nft_id))
-        return RPC::missing_field_error(jss::nft_id);
+        return RPC::missingFieldError(jss::nft_id);
 
     uint256 nftId;
 
     if (!nftId.parseHex(context.params[jss::nft_id].asString()))
-        return RPC::invalid_field_error(jss::nft_id);
+        return RPC::invalidFieldError(jss::nft_id);
 
-    return enumerateNFTOffers(context, nftId, keylet::nft_buys(nftId));
+    return enumerateNFTOffers(context, nftId, keylet::nftBuys(nftId));
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
index 8f68aeaadd..ed68ae3ac1 100644
--- a/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
+++ b/src/xrpld/rpc/handlers/orderbook/NFTOffersHelpers.h
@@ -20,9 +20,9 @@ inline void
 appendNftOfferJson(
     Application const& app,
     std::shared_ptr<SLE const> const& offer,
-    Json::Value& offers)
+    json::Value& offers)
 {
-    Json::Value& obj(offers.append(Json::objectValue));
+    json::Value& obj(offers.append(json::ObjectValue));
 
     obj[jss::nft_offer_index] = to_string(offer->key());
     obj[jss::flags] = (*offer)[sfFlags];
@@ -44,11 +44,11 @@ appendNftOfferJson(
 //   limit: integer                 // optional
 //   marker: opaque                 // optional, resume previous query
 // }
-inline Json::Value
+inline json::Value
 enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const& directory)
 {
     unsigned int limit = 0;
-    if (auto err = readLimitField(limit, RPC::Tuning::nftOffers, context))
+    if (auto err = readLimitField(limit, RPC::Tuning::kNFT_OFFERS, context))
         return *err;
 
     std::shared_ptr<ReadView const> ledger;
@@ -57,12 +57,12 @@ enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const
         return result;
 
     if (!ledger->exists(directory))
-        return rpcError(rpcOBJECT_NOT_FOUND);
+        return rpcError(RpcObjectNotFound);
 
-    Json::Value result;
+    json::Value result;
     result[jss::nft_id] = to_string(nftId);
 
-    Json::Value& jsonOffers(result[jss::offers] = Json::arrayValue);
+    json::Value& jsonOffers(result[jss::offers] = json::ArrayValue);
 
     std::vector<std::shared_ptr<SLE const>> offers;
     unsigned int reserve(limit);
@@ -73,18 +73,18 @@ enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const
     {
         // We have a start point. Use limit - 1 from the result and use the
         // very last one for the resume.
-        Json::Value const& marker(context.params[jss::marker]);
+        json::Value const& marker(context.params[jss::marker]);
 
         if (!marker.isString())
-            return RPC::expected_field_error(jss::marker, "string");
+            return RPC::expectedFieldError(jss::marker, "string");
 
         if (!startAfter.parseHex(marker.asString()))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto const sle = ledger->read(keylet::nftoffer(startAfter));
 
         if (!sle || nftId != sle->getFieldH256(sfNFTokenID))
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         startHint = sle->getFieldU64(sfNFTokenOfferNode);
         appendNftOfferJson(context.app, sle, jsonOffers);
@@ -112,7 +112,7 @@ enumerateNFTOffers(RPC::JsonContext& context, uint256 const& nftId, Keylet const
                 return false;
             }))
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     if (offers.size() == reserve)
@@ -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::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
     return result;
 }
 
diff --git a/src/xrpld/rpc/handlers/orderbook/NFTSellOffers.cpp b/src/xrpld/rpc/handlers/orderbook/NFTSellOffers.cpp
index 8612fdf587..309df93605 100644
--- a/src/xrpld/rpc/handlers/orderbook/NFTSellOffers.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/NFTSellOffers.cpp
@@ -9,18 +9,18 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doNFTSellOffers(RPC::JsonContext& context)
 {
     if (!context.params.isMember(jss::nft_id))
-        return RPC::missing_field_error(jss::nft_id);
+        return RPC::missingFieldError(jss::nft_id);
 
     uint256 nftId;
 
     if (!nftId.parseHex(context.params[jss::nft_id].asString()))
-        return RPC::invalid_field_error(jss::nft_id);
+        return RPC::invalidFieldError(jss::nft_id);
 
-    return enumerateNFTOffers(context, nftId, keylet::nft_sells(nftId));
+    return enumerateNFTOffers(context, nftId, keylet::nftSells(nftId));
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/orderbook/PathFind.cpp b/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
index ffe00f54a8..da338dfcc8 100644
--- a/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/PathFind.cpp
@@ -12,21 +12,21 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doPathFind(RPC::JsonContext& context)
 {
     if (context.app.config().PATH_SEARCH_MAX == 0)
-        return rpcError(rpcNOT_SUPPORTED);
+        return rpcError(RpcNotSupported);
 
     auto lpLedger = context.ledgerMaster.getClosedLedger();
 
     if (!context.params.isMember(jss::subcommand) || !context.params[jss::subcommand].isString())
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     if (!context.infoSub)
-        return rpcError(rpcNO_EVENTS);
+        return rpcError(RpcNoEvents);
 
     context.infoSub->setApiVersion(context.apiVersion);
 
@@ -34,7 +34,7 @@ doPathFind(RPC::JsonContext& context)
 
     if (sSubCommand == "create")
     {
-        context.loadType = Resource::feeHeavyBurdenRPC;
+        context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
         context.infoSub->clearRequest();
         return context.app.getPathRequestManager().makePathRequest(
             context.infoSub, lpLedger, context.params);
@@ -45,7 +45,7 @@ doPathFind(RPC::JsonContext& context)
         InfoSubRequest::pointer const request = context.infoSub->getRequest();
 
         if (!request)
-            return rpcError(rpcNO_PF_REQUEST);
+            return rpcError(RpcNoPfRequest);
 
         context.infoSub->clearRequest();
         return request->doClose();
@@ -56,12 +56,12 @@ doPathFind(RPC::JsonContext& context)
         InfoSubRequest::pointer const request = context.infoSub->getRequest();
 
         if (!request)
-            return rpcError(rpcNO_PF_REQUEST);
+            return rpcError(RpcNoPfRequest);
 
         return request->doStatus(context.params);
     }
 
-    return rpcError(rpcINVALID_PARAMS);
+    return rpcError(RpcInvalidParams);
 }
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp b/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
index c0a2a17a49..316f26fa32 100644
--- a/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
+++ b/src/xrpld/rpc/handlers/orderbook/RipplePathFind.cpp
@@ -20,16 +20,16 @@
 namespace xrpl {
 
 // This interface is deprecated.
-Json::Value
+json::Value
 doRipplePathFind(RPC::JsonContext& context)
 {
     if (context.app.config().PATH_SEARCH_MAX == 0)
-        return rpcError(rpcNOT_SUPPORTED);
+        return rpcError(RpcNotSupported);
 
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
 
     std::shared_ptr<ReadView const> lpLedger;
-    Json::Value jvResult;
+    json::Value jvResult;
 
     if (!context.app.config().standalone() && !context.params.isMember(jss::ledger) &&
         !context.params.isMember(jss::ledger_index) && !context.params.isMember(jss::ledger_hash))
@@ -37,11 +37,11 @@ doRipplePathFind(RPC::JsonContext& context)
         // No ledger specified, use pathfinding defaults
         // and dispatch to pathfinding engine
         if (context.app.getLedgerMaster().getValidatedLedgerAge() >
-            RPC::Tuning::maxValidatedLedgerAge)
+            RPC::Tuning::kMAX_VALIDATED_LEDGER_AGE)
         {
             if (context.apiVersion == 1)
-                return rpcError(rpcNO_NETWORK);
-            return rpcError(rpcNOT_SYNCED);
+                return rpcError(RpcNoNetwork);
+            return rpcError(RpcNotSynced);
         }
 
         PathRequest::pointer request;
@@ -152,7 +152,7 @@ doRipplePathFind(RPC::JsonContext& context)
 
     RPC::LegacyPathFind const lpf(isUnlimited(context.role), context.app);
     if (!lpf.isOk())
-        return rpcError(rpcTOO_BUSY);
+        return rpcError(RpcTooBusy);
 
     auto result = context.app.getPathRequestManager().doLegacyPathRequest(
         context.consumer, lpLedger, context.params);
diff --git a/src/xrpld/rpc/handlers/server_info/Feature.cpp b/src/xrpld/rpc/handlers/server_info/Feature.cpp
index f6f5316a55..4de07297d4 100644
--- a/src/xrpld/rpc/handlers/server_info/Feature.cpp
+++ b/src/xrpld/rpc/handlers/server_info/Feature.cpp
@@ -17,7 +17,7 @@ namespace xrpl {
 //   feature : <feature>
 //   vetoed : true/false
 // }
-Json::Value
+json::Value
 doFeature(RPC::JsonContext& context)
 {
     if (context.params.isMember(jss::feature))
@@ -25,7 +25,7 @@ doFeature(RPC::JsonContext& context)
         // ensure that the `feature` param is a string
         if (!context.params[jss::feature].isString())
         {
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
         }
     }
 
@@ -47,7 +47,7 @@ doFeature(RPC::JsonContext& context)
             features[to_string(h)][jss::majority] = t.time_since_epoch().count();
         }
 
-        Json::Value jvReply = Json::objectValue;
+        json::Value jvReply = json::ObjectValue;
         jvReply[jss::features] = features;
         return jvReply;
     }
@@ -57,12 +57,12 @@ doFeature(RPC::JsonContext& context)
     // If the feature is not found by name, try to parse the `feature` param as
     // a feature ID. If that fails, return an error.
     if (!feature && !feature.parseHex(context.params[jss::feature].asString()))
-        return rpcError(rpcBAD_FEATURE);
+        return rpcError(RpcBadFeature);
 
     if (context.params.isMember(jss::vetoed))
     {
         if (!isAdmin)
-            return rpcError(rpcNO_PERMISSION);
+            return rpcError(RpcNoPermission);
 
         if (context.params[jss::vetoed].asBool())
         {
@@ -74,9 +74,9 @@ doFeature(RPC::JsonContext& context)
         }
     }
 
-    Json::Value jvReply = table.getJson(feature, isAdmin);
+    json::Value jvReply = table.getJson(feature, isAdmin);
     if (!jvReply)
-        return rpcError(rpcBAD_FEATURE);
+        return rpcError(RpcBadFeature);
 
     auto m = majorities.find(feature);
     if (m != majorities.end())
diff --git a/src/xrpld/rpc/handlers/server_info/Fee.cpp b/src/xrpld/rpc/handlers/server_info/Fee.cpp
index d943d02f77..a3847d743a 100644
--- a/src/xrpld/rpc/handlers/server_info/Fee.cpp
+++ b/src/xrpld/rpc/handlers/server_info/Fee.cpp
@@ -7,16 +7,16 @@
 #include <xrpl/protocol/ErrorCodes.h>
 
 namespace xrpl {
-Json::Value
+json::Value
 doFee(RPC::JsonContext& context)
 {
     auto result = context.app.getTxQ().doRPC(context.app);
-    if (result.type() == Json::objectValue)
+    if (result.type() == json::ObjectValue)
         return result;
 
     // LCOV_EXCL_START
     UNREACHABLE("xrpl::doFee : invalid result type");
-    RPC::inject_error(rpcINTERNAL, context.params);
+    RPC::injectError(RpcInternal, context.params);
     return context.params;
     // LCOV_EXCL_STOP
 }
diff --git a/src/xrpld/rpc/handlers/server_info/Manifest.cpp b/src/xrpld/rpc/handlers/server_info/Manifest.cpp
index 75533f0e78..cb1771750b 100644
--- a/src/xrpld/rpc/handlers/server_info/Manifest.cpp
+++ b/src/xrpld/rpc/handlers/server_info/Manifest.cpp
@@ -11,23 +11,23 @@
 #include <xrpl/protocol/tokens.h>
 
 namespace xrpl {
-Json::Value
+json::Value
 doManifest(RPC::JsonContext& context)
 {
     auto& params = context.params;
 
     if (!params.isMember(jss::public_key))
-        return RPC::missing_field_error(jss::public_key);
+        return RPC::missingFieldError(jss::public_key);
 
     auto const requested = params[jss::public_key].asString();
 
-    Json::Value ret;
+    json::Value ret;
     ret[jss::requested] = requested;
 
     auto const pk = parseBase58<PublicKey>(TokenType::NodePublic, requested);
     if (!pk)
     {
-        RPC::inject_error(rpcINVALID_PARAMS, ret);
+        RPC::injectError(RpcInvalidParams, ret);
         return ret;
     }
 
@@ -43,8 +43,8 @@ doManifest(RPC::JsonContext& context)
         return ret;
 
     if (auto const manifest = context.app.getValidatorManifests().getManifest(mk))
-        ret[jss::manifest] = base64_encode(*manifest);
-    Json::Value details;
+        ret[jss::manifest] = base64Encode(*manifest);
+    json::Value details;
 
     details[jss::master_key] = toBase58(TokenType::NodePublic, mk);
     details[jss::ephemeral_key] = toBase58(TokenType::NodePublic, *ek);
diff --git a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
index 673d369690..ca887bb0c8 100644
--- a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
+++ b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.cpp
@@ -37,7 +37,7 @@ private:
     translate(std::string const& inp);
 
     uint256 defsHash_;
-    Json::Value defs_;
+    json::Value defs_;
 
 public:
     ServerDefinitions();
@@ -48,7 +48,7 @@ public:
         return defsHash_ == hash;
     }
 
-    [[nodiscard]] Json::Value const&
+    [[nodiscard]] json::Value const&
     get() const
     {
         return defs_;
@@ -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 replacements{
+    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 = replacements.find(inp); it != replacements.end())
+    if (auto const& it = kREPLACEMENTS.find(inp); it != kREPLACEMENTS.end())
     {
         return std::string(it->second);
     }
@@ -122,14 +122,14 @@ ServerDefinitions::translate(std::string const& inp)
     return out;
 };
 
-ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
+ServerDefinitions::ServerDefinitions() : defs_{json::ObjectValue}
 {
     // populate SerializedTypeID names and values
-    defs_[jss::TYPES] = Json::objectValue;
+    defs_[jss::TYPES] = json::ObjectValue;
 
     defs_[jss::TYPES]["Done"] = -1;
     std::map<int32_t, std::string> typeMap{{-1, "Done"}};
-    for (auto const& [rawName, typeValue] : sTypeMap)
+    for (auto const& [rawName, typeValue] : kS_TYPE_MAP)
     {
         std::string const typeName = translate(std::string(rawName).substr(4) /* remove STI_ */);
         defs_[jss::TYPES][typeName] = typeValue;
@@ -137,7 +137,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate LedgerEntryType names and values
-    defs_[jss::LEDGER_ENTRY_TYPES] = Json::objectValue;
+    defs_[jss::LEDGER_ENTRY_TYPES] = json::ObjectValue;
     defs_[jss::LEDGER_ENTRY_TYPES][jss::Invalid] = -1;
 
     for (auto const& f : LedgerFormats::getInstance())
@@ -146,13 +146,13 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate SField serialization data
-    defs_[jss::FIELDS] = Json::arrayValue;
+    defs_[jss::FIELDS] = json::ArrayValue;
 
     uint32_t i = 0;
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "Generic";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = 0;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = false;
@@ -163,9 +163,9 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "Invalid";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = -1;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = false;
@@ -176,9 +176,9 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "ObjectEndMarker";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = 1;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = true;
@@ -189,9 +189,9 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "ArrayEndMarker";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = 1;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = true;
@@ -202,9 +202,9 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "taker_gets_funded";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = 258;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = false;
@@ -215,9 +215,9 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     {
-        Json::Value a = Json::arrayValue;
+        json::Value a = json::ArrayValue;
         a[0U] = "taker_pays_funded";
-        Json::Value v = Json::objectValue;
+        json::Value v = json::ObjectValue;
         v[jss::nth] = 259;
         v[jss::isVLEncoded] = false;
         v[jss::isSerialized] = false;
@@ -232,7 +232,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
         if (field->fieldName.empty())
             continue;
 
-        Json::Value innerObj = Json::objectValue;
+        json::Value innerObj = json::ObjectValue;
 
         uint32_t type = field->fieldType;
 
@@ -254,7 +254,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
 
         innerObj[jss::type] = typeMap[type];
 
-        Json::Value innerArray = Json::arrayValue;
+        json::Value innerArray = json::ArrayValue;
         innerArray[0U] = field->fieldName;
         innerArray[1U] = innerObj;
 
@@ -262,7 +262,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate TER code names and values
-    defs_[jss::TRANSACTION_RESULTS] = Json::objectValue;
+    defs_[jss::TRANSACTION_RESULTS] = json::ObjectValue;
 
     for (auto const& [code, terInfo] : transResults())
     {
@@ -270,7 +270,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate TxType names and values
-    defs_[jss::TRANSACTION_TYPES] = Json::objectValue;
+    defs_[jss::TRANSACTION_TYPES] = json::ObjectValue;
     defs_[jss::TRANSACTION_TYPES][jss::Invalid] = -1;
     for (auto const& f : TxFormats::getInstance())
     {
@@ -278,13 +278,13 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate TxFormats
-    defs_[jss::TRANSACTION_FORMATS] = Json::objectValue;
+    defs_[jss::TRANSACTION_FORMATS] = json::ObjectValue;
 
-    defs_[jss::TRANSACTION_FORMATS][jss::common] = Json::arrayValue;
+    defs_[jss::TRANSACTION_FORMATS][jss::common] = json::ArrayValue;
     auto txCommonFields = std::set<std::string>();
     for (auto const& element : TxFormats::getCommonFields())
     {
-        Json::Value elementObj = Json::objectValue;
+        json::Value elementObj = json::ObjectValue;
         elementObj[jss::name] = element.sField().getName();
         elementObj[jss::optionality] = element.style();
         defs_[jss::TRANSACTION_FORMATS][jss::common].append(elementObj);
@@ -294,12 +294,12 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     for (auto const& format : TxFormats::getInstance())
     {
         auto const& soTemplate = format.getSOTemplate();
-        Json::Value templateArray = Json::arrayValue;
+        json::Value templateArray = json::ArrayValue;
         for (auto const& element : soTemplate)
         {
             if (txCommonFields.contains(element.sField().getName()))
                 continue;  // skip common fields, already added
-            Json::Value elementObj = Json::objectValue;
+            json::Value elementObj = json::ObjectValue;
             elementObj[jss::name] = element.sField().getName();
             elementObj[jss::optionality] = element.style();
             templateArray.append(elementObj);
@@ -308,12 +308,12 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     }
 
     // populate LedgerFormats
-    defs_[jss::LEDGER_ENTRY_FORMATS] = Json::objectValue;
-    defs_[jss::LEDGER_ENTRY_FORMATS][jss::common] = Json::arrayValue;
+    defs_[jss::LEDGER_ENTRY_FORMATS] = json::ObjectValue;
+    defs_[jss::LEDGER_ENTRY_FORMATS][jss::common] = json::ArrayValue;
     auto ledgerCommonFields = std::set<std::string>();
     for (auto const& element : LedgerFormats::getCommonFields())
     {
-        Json::Value elementObj = Json::objectValue;
+        json::Value elementObj = json::ObjectValue;
         elementObj[jss::name] = element.sField().getName();
         elementObj[jss::optionality] = element.style();
         defs_[jss::LEDGER_ENTRY_FORMATS][jss::common].append(elementObj);
@@ -322,12 +322,12 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
     for (auto const& format : LedgerFormats::getInstance())
     {
         auto const& soTemplate = format.getSOTemplate();
-        Json::Value templateArray = Json::arrayValue;
+        json::Value templateArray = json::ArrayValue;
         for (auto const& element : soTemplate)
         {
             if (ledgerCommonFields.contains(element.sField().getName()))
                 continue;  // skip common fields, already added
-            Json::Value elementObj = Json::objectValue;
+            json::Value elementObj = json::ObjectValue;
             elementObj[jss::name] = element.sField().getName();
             elementObj[jss::optionality] = element.style();
             templateArray.append(elementObj);
@@ -335,10 +335,10 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
         defs_[jss::LEDGER_ENTRY_FORMATS][format.getName()] = templateArray;
     }
 
-    defs_[jss::TRANSACTION_FLAGS] = Json::objectValue;
+    defs_[jss::TRANSACTION_FLAGS] = json::ObjectValue;
     for (auto const& [name, value] : getAllTxFlags())
     {
-        Json::Value txObj = Json::objectValue;
+        json::Value txObj = json::ObjectValue;
         for (auto const& [flagName, flagValue] : value)
         {
             txObj[flagName] = flagValue;
@@ -346,10 +346,10 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
         defs_[jss::TRANSACTION_FLAGS][name] = txObj;
     }
 
-    defs_[jss::LEDGER_ENTRY_FLAGS] = Json::objectValue;
+    defs_[jss::LEDGER_ENTRY_FLAGS] = json::ObjectValue;
     for (auto const& [name, value] : getAllLedgerFlags())
     {
-        Json::Value ledgerObj = Json::objectValue;
+        json::Value ledgerObj = json::ObjectValue;
         for (auto const& [flagName, flagValue] : value)
         {
             ledgerObj[flagName] = flagValue;
@@ -357,7 +357,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
         defs_[jss::LEDGER_ENTRY_FLAGS][name] = ledgerObj;
     }
 
-    defs_[jss::ACCOUNT_SET_FLAGS] = Json::objectValue;
+    defs_[jss::ACCOUNT_SET_FLAGS] = json::ObjectValue;
     for (auto const& [name, value] : getAsfFlagMap())
     {
         defs_[jss::ACCOUNT_SET_FLAGS][name] = value;
@@ -365,7 +365,7 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
 
     // generate hash
     {
-        std::string const out = Json::FastWriter().write(defs_);
+        std::string const out = json::FastWriter().write(defs_);
         defsHash_ = xrpl::sha512Half(xrpl::Slice{out.data(), out.size()});
         defs_[jss::hash] = to_string(defsHash_);
     }
@@ -374,19 +374,19 @@ ServerDefinitions::ServerDefinitions() : defs_{Json::objectValue}
 ServerDefinitions const&
 getDefinitions()
 {
-    static ServerDefinitions const defs{};
-    return defs;
+    static ServerDefinitions const kDEFS{};
+    return kDEFS;
 }
 
 }  // namespace detail
 
-Json::Value const&
+json::Value const&
 getServerDefinitionsJson()
 {
     return detail::getDefinitions().get();
 }
 
-Json::Value
+json::Value
 doServerDefinitions(RPC::JsonContext& context)
 {
     auto& params = context.params;
@@ -395,13 +395,13 @@ doServerDefinitions(RPC::JsonContext& context)
     if (params.isMember(jss::hash))
     {
         if (!params[jss::hash].isString() || !hash.parseHex(params[jss::hash].asString()))
-            return RPC::invalid_field_error(jss::hash);
+            return RPC::invalidFieldError(jss::hash);
     }
 
     auto const& defs = detail::getDefinitions();
     if (defs.hashMatches(hash))
     {
-        Json::Value jv = Json::objectValue;
+        json::Value jv = json::ObjectValue;
         jv[jss::hash] = to_string(hash);
         return jv;
     }
diff --git a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.h b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.h
index 5b94a2a518..60143f9811 100644
--- a/src/xrpld/rpc/handlers/server_info/ServerDefinitions.h
+++ b/src/xrpld/rpc/handlers/server_info/ServerDefinitions.h
@@ -4,7 +4,7 @@
 
 namespace xrpl {
 
-Json::Value const&
+json::Value const&
 getServerDefinitionsJson();
 
 }  // namespace xrpl
diff --git a/src/xrpld/rpc/handlers/server_info/ServerInfo.cpp b/src/xrpld/rpc/handlers/server_info/ServerInfo.cpp
index 1086760bf6..af401cd22f 100644
--- a/src/xrpld/rpc/handlers/server_info/ServerInfo.cpp
+++ b/src/xrpld/rpc/handlers/server_info/ServerInfo.cpp
@@ -8,10 +8,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doServerInfo(RPC::JsonContext& context)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret[jss::info] = context.netOps.getServerInfo(
         true,
diff --git a/src/xrpld/rpc/handlers/server_info/ServerState.cpp b/src/xrpld/rpc/handlers/server_info/ServerState.cpp
index 603b9f9c51..a3730ca703 100644
--- a/src/xrpld/rpc/handlers/server_info/ServerState.cpp
+++ b/src/xrpld/rpc/handlers/server_info/ServerState.cpp
@@ -7,10 +7,10 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doServerState(RPC::JsonContext& context)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
 
     ret[jss::state] = context.netOps.getServerInfo(
         false,
diff --git a/src/xrpld/rpc/handlers/server_info/Version.h b/src/xrpld/rpc/handlers/server_info/Version.h
index 233ae3e4d8..04c9d0f75c 100644
--- a/src/xrpld/rpc/handlers/server_info/Version.h
+++ b/src/xrpld/rpc/handlers/server_info/Version.h
@@ -15,24 +15,26 @@ public:
     static Status
     check()
     {
-        return Status::OK;
+        return Status::kOK;
     }
 
     void
-    writeResult(Json::Value& obj) const
+    writeResult(json::Value& obj) const
     {
         setVersion(obj, apiVersion_, betaEnabled_);
     }
 
+    // NOLINTBEGIN(readability-identifier-naming)
     static constexpr char const* name = "version";
 
-    static constexpr unsigned minApiVer = RPC::apiMinimumSupportedVersion;
+    static constexpr unsigned minApiVer = RPC::kAPI_MINIMUM_SUPPORTED_VERSION;
 
-    static constexpr unsigned maxApiVer = RPC::apiMaximumValidVersion;
+    static constexpr unsigned maxApiVer = RPC::kAPI_MAXIMUM_VALID_VERSION;
 
     static constexpr Role role = Role::USER;
 
-    static constexpr Condition condition = NO_CONDITION;
+    static constexpr Condition condition = NoCondition;
+    // NOLINTEND(readability-identifier-naming)
 
 private:
     unsigned int apiVersion_;
diff --git a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
index f5e33922dc..dee88533af 100644
--- a/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/subscribe/Subscribe.cpp
@@ -26,23 +26,23 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doSubscribe(RPC::JsonContext& context)
 {
     InfoSub::pointer ispSub;
-    Json::Value jvResult(Json::objectValue);
+    json::Value jvResult(json::ObjectValue);
 
     if (!context.infoSub && !context.params.isMember(jss::url))
     {
         // Must be a JSON-RPC call.
         JLOG(context.j.info()) << "doSubscribe: RPC subscribe requires a url";
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     if (context.params.isMember(jss::url))
     {
         if (context.role != Role::ADMIN)
-            return rpcError(rpcNO_PERMISSION);
+            return rpcError(RpcNoPermission);
 
         std::string const strUrl = context.params[jss::url].asString();
         std::string strUsername = context.params.isMember(jss::url_username)
@@ -66,7 +66,7 @@ doSubscribe(RPC::JsonContext& context)
             JLOG(context.j.debug()) << "doSubscribe: building: " << strUrl;
             try
             {
-                auto rspSub = make_RPCSub(
+                auto rspSub = makeRPCSub(
                     context.app.getOPs(),
                     context.app.getIOContext(),
                     context.app.getJobQueue(),
@@ -79,7 +79,7 @@ doSubscribe(RPC::JsonContext& context)
             }
             catch (std::runtime_error const& ex)
             {
-                return RPC::make_param_error(ex.what());
+                return RPC::makeParamError(ex.what());
             }
         }
         else
@@ -110,13 +110,13 @@ doSubscribe(RPC::JsonContext& context)
         if (!context.params[jss::streams].isArray())
         {
             JLOG(context.j.info()) << "doSubscribe: streams requires an array.";
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
         }
 
         for (auto const& it : context.params[jss::streams])
         {
             if (!it.isString())
-                return rpcError(rpcSTREAM_MALFORMED);
+                return rpcError(RpcStreamMalformed);
 
             std::string const streamName = it.asString();
             if (streamName == "server")
@@ -152,7 +152,7 @@ doSubscribe(RPC::JsonContext& context)
             else if (streamName == "peer_status")
             {
                 if (context.role != Role::ADMIN)
-                    return rpcError(rpcNO_PERMISSION);
+                    return rpcError(RpcNoPermission);
                 context.netOps.subPeerStatus(ispSub);
             }
             else if (streamName == "consensus")
@@ -161,7 +161,7 @@ doSubscribe(RPC::JsonContext& context)
             }
             else
             {
-                return rpcError(rpcSTREAM_MALFORMED);
+                return rpcError(RpcStreamMalformed);
             }
         }
     }
@@ -172,22 +172,22 @@ doSubscribe(RPC::JsonContext& context)
     if (context.params.isMember(accountsProposed))
     {
         if (!context.params[accountsProposed].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto ids = RPC::parseAccountIds(context.params[accountsProposed]);
         if (ids.empty())
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
         context.netOps.subAccount(ispSub, ids, true);
     }
 
     if (context.params.isMember(jss::accounts))
     {
         if (!context.params[jss::accounts].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto ids = RPC::parseAccountIds(context.params[jss::accounts]);
         if (ids.empty())
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
         context.netOps.subAccount(ispSub, ids, false);
         JLOG(context.j.debug()) << "doSubscribe: accounts: " << ids.size();
     }
@@ -195,18 +195,18 @@ doSubscribe(RPC::JsonContext& context)
     if (context.params.isMember(jss::account_history_tx_stream))
     {
         if (!context.app.config().useTxTables())
-            return rpcError(rpcNOT_ENABLED);
+            return rpcError(RpcNotEnabled);
 
-        context.loadType = Resource::feeMediumBurdenRPC;
+        context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
         auto const& req = context.params[jss::account_history_tx_stream];
         if (!req.isMember(jss::account) || !req[jss::account].isString())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto const id = parseBase58<AccountID>(req[jss::account].asString());
         if (!id)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
-        if (auto result = context.netOps.subAccountHistory(ispSub, *id); result != rpcSUCCESS)
+        if (auto result = context.netOps.subAccountHistory(ispSub, *id); result != RpcSuccess)
         {
             return rpcError(result);
         }
@@ -220,28 +220,28 @@ doSubscribe(RPC::JsonContext& context)
     if (context.params.isMember(jss::books))
     {
         if (!context.params[jss::books].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         for (auto& j : context.params[jss::books])
         {
             if (!j.isObject() || !j.isMember(jss::taker_pays) || !j.isMember(jss::taker_gets) ||
                 !j[jss::taker_pays].isObjectOrNull() || !j[jss::taker_gets].isObjectOrNull())
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
 
             Book book;
 
             if (auto const err = RPC::parseSubUnsubJson(book.in, j, jss::taker_pays, context.j);
-                err != rpcSUCCESS)
+                err != RpcSuccess)
                 return rpcError(err);
 
             if (auto const err = RPC::parseSubUnsubJson(book.out, j, jss::taker_gets, context.j);
-                err != rpcSUCCESS)
+                err != RpcSuccess)
                 return rpcError(err);
 
             if (book.in == book.out)
             {
                 JLOG(context.j.info()) << "taker_gets same as taker_pays.";
-                return rpcError(rpcBAD_MARKET);
+                return rpcError(RpcBadMarket);
             }
 
             std::optional<AccountID> takerID;
@@ -249,10 +249,10 @@ doSubscribe(RPC::JsonContext& context)
             if (j.isMember(jss::taker))
             {
                 if (!j[jss::taker].isString())
-                    return rpcError(rpcACT_MALFORMED);
+                    return rpcError(RpcActMalformed);
                 takerID = parseBase58<AccountID>(j[jss::taker].asString());
                 if (!takerID)
-                    return rpcError(rpcACT_MALFORMED);
+                    return rpcError(RpcActMalformed);
             }
 
             if (j.isMember(jss::domain))
@@ -260,7 +260,7 @@ doSubscribe(RPC::JsonContext& context)
                 uint256 domain;
                 if (!j[jss::domain].isString() || !domain.parseHex(j[jss::domain].asString()))
                 {
-                    return rpcError(rpcDOMAIN_MALFORMED);
+                    return rpcError(RpcDomainMalformed);
                 }
 
                 book.domain = domain;
@@ -269,7 +269,7 @@ doSubscribe(RPC::JsonContext& context)
             if (!isConsistent(book))
             {
                 JLOG(context.j.warn()) << "Bad market: " << book;
-                return rpcError(rpcBAD_MARKET);
+                return rpcError(RpcBadMarket);
             }
 
             context.netOps.subBook(ispSub, book);
@@ -285,27 +285,27 @@ 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::feeMediumBurdenRPC;
+                context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
                 std::shared_ptr<ReadView const> lpLedger =
                     context.app.getLedgerMaster().getPublishedLedger();
                 if (lpLedger)
                 {
-                    Json::Value const jvMarker = Json::Value(Json::nullValue);
-                    Json::Value jvOffers(Json::objectValue);
+                    json::Value const jvMarker = json::Value(json::NullValue);
+                    json::Value jvOffers(json::ObjectValue);
 
-                    auto add = [&](Json::StaticString field) {
+                    auto add = [&](json::StaticString field) {
                         context.netOps.getBookPage(
                             lpLedger,
                             field == jss::asks ? reversed(book) : book,
                             takerID ? *takerID : noAccount(),
                             false,
-                            RPC::Tuning::bookOffers.rDefault,
+                            RPC::Tuning::kBOOK_OFFERS.rDefault,
                             jvMarker,
                             jvOffers);
 
                         if (jvResult.isMember(field))
                         {
-                            Json::Value& results(jvResult[field]);
+                            json::Value& results(jvResult[field]);
                             for (auto const& e : jvOffers[jss::offers])
                                 results.append(e);
                         }
diff --git a/src/xrpld/rpc/handlers/subscribe/Unsubscribe.cpp b/src/xrpld/rpc/handlers/subscribe/Unsubscribe.cpp
index 258774d12a..580f213ec4 100644
--- a/src/xrpld/rpc/handlers/subscribe/Unsubscribe.cpp
+++ b/src/xrpld/rpc/handlers/subscribe/Unsubscribe.cpp
@@ -17,23 +17,23 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doUnsubscribe(RPC::JsonContext& context)
 {
     InfoSub::pointer ispSub;
-    Json::Value jvResult(Json::objectValue);
+    json::Value jvResult(json::ObjectValue);
     bool removeUrl{false};
 
     if (!context.infoSub && !context.params.isMember(jss::url))
     {
         // Must be a JSON-RPC call.
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     if (context.params.isMember(jss::url))
     {
         if (context.role != Role::ADMIN)
-            return rpcError(rpcNO_PERMISSION);
+            return rpcError(RpcNoPermission);
 
         std::string const strUrl = context.params[jss::url].asString();
         ispSub = context.netOps.findRpcSub(strUrl);
@@ -49,12 +49,12 @@ doUnsubscribe(RPC::JsonContext& context)
     if (context.params.isMember(jss::streams))
     {
         if (!context.params[jss::streams].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         for (auto& it : context.params[jss::streams])
         {
             if (!it.isString())
-                return rpcError(rpcSTREAM_MALFORMED);
+                return rpcError(RpcStreamMalformed);
 
             std::string const streamName = it.asString();
             if (streamName == "server")
@@ -93,7 +93,7 @@ doUnsubscribe(RPC::JsonContext& context)
             }
             else
             {
-                return rpcError(rpcSTREAM_MALFORMED);
+                return rpcError(RpcStreamMalformed);
             }
         }
     }
@@ -104,22 +104,22 @@ doUnsubscribe(RPC::JsonContext& context)
     if (context.params.isMember(accountsProposed))
     {
         if (!context.params[accountsProposed].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto ids = RPC::parseAccountIds(context.params[accountsProposed]);
         if (ids.empty())
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
         context.netOps.unsubAccount(ispSub, ids, true);
     }
 
     if (context.params.isMember(jss::accounts))
     {
         if (!context.params[jss::accounts].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto ids = RPC::parseAccountIds(context.params[jss::accounts]);
         if (ids.empty())
-            return rpcError(rpcACT_MALFORMED);
+            return rpcError(RpcActMalformed);
         context.netOps.unsubAccount(ispSub, ids, false);
     }
 
@@ -127,17 +127,17 @@ doUnsubscribe(RPC::JsonContext& context)
     {
         auto const& req = context.params[jss::account_history_tx_stream];
         if (!req.isMember(jss::account) || !req[jss::account].isString())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto const id = parseBase58<AccountID>(req[jss::account].asString());
         if (!id)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         bool stopHistoryOnly = false;
         if (req.isMember(jss::stop_history_tx_only))
         {
             if (!req[jss::stop_history_tx_only].isBool())
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
             stopHistoryOnly = req[jss::stop_history_tx_only].asBool();
         }
         context.netOps.unsubAccountHistory(ispSub, *id, stopHistoryOnly);
@@ -149,30 +149,30 @@ doUnsubscribe(RPC::JsonContext& context)
     if (context.params.isMember(jss::books))
     {
         if (!context.params[jss::books].isArray())
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         for (auto& jv : context.params[jss::books])
         {
             if (!jv.isObject() || !jv.isMember(jss::taker_pays) || !jv.isMember(jss::taker_gets) ||
                 !jv[jss::taker_pays].isObjectOrNull() || !jv[jss::taker_gets].isObjectOrNull())
             {
-                return rpcError(rpcINVALID_PARAMS);
+                return rpcError(RpcInvalidParams);
             }
 
             Book book;
 
             if (auto const err = RPC::parseSubUnsubJson(book.in, jv, jss::taker_pays, context.j);
-                err != rpcSUCCESS)
+                err != RpcSuccess)
                 return rpcError(err);
 
             if (auto const err = RPC::parseSubUnsubJson(book.out, jv, jss::taker_gets, context.j);
-                err != rpcSUCCESS)
+                err != RpcSuccess)
                 return rpcError(err);
 
             if (book.in == book.out)
             {
                 JLOG(context.j.info()) << "taker_gets same as taker_pays.";
-                return rpcError(rpcBAD_MARKET);
+                return rpcError(RpcBadMarket);
             }
 
             if (jv.isMember(jss::domain))
@@ -180,7 +180,7 @@ doUnsubscribe(RPC::JsonContext& context)
                 uint256 domain;
                 if (!jv[jss::domain].isString() || !domain.parseHex(jv[jss::domain].asString()))
                 {
-                    return rpcError(rpcDOMAIN_MALFORMED);
+                    return rpcError(RpcDomainMalformed);
                 }
 
                 book.domain = domain;
diff --git a/src/xrpld/rpc/handlers/transaction/Simulate.cpp b/src/xrpld/rpc/handlers/transaction/Simulate.cpp
index f5004bab13..a119ea94f6 100644
--- a/src/xrpld/rpc/handlers/transaction/Simulate.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Simulate.cpp
@@ -42,24 +42,24 @@
 
 namespace xrpl {
 
-static Expected<std::uint32_t, Json::Value>
-getAutofillSequence(Json::Value const& tx_json, RPC::JsonContext& context)
+static Expected<std::uint32_t, json::Value>
+getAutofillSequence(json::Value const& txJson, RPC::JsonContext& context)
 {
     // autofill Sequence
-    bool const hasTicketSeq = tx_json.isMember(sfTicketSequence.jsonName);
-    auto const& accountStr = tx_json[jss::Account];
+    bool const hasTicketSeq = txJson.isMember(sfTicketSequence.jsonName);
+    auto const& accountStr = txJson[jss::Account];
     if (!accountStr.isString())
     {
         // sanity check, should fail earlier
         // LCOV_EXCL_START
-        return Unexpected(RPC::invalid_field_error("tx.Account"));
+        return Unexpected(RPC::invalidFieldError("tx.Account"));
         // LCOV_EXCL_STOP
     }
     auto const srcAddressID = parseBase58<AccountID>(accountStr.asString());
     if (!srcAddressID.has_value())
     {
         return Unexpected(
-            RPC::make_error(rpcSRC_ACT_MALFORMED, RPC::invalid_field_message("tx.Account")));
+            RPC::makeError(RpcSrcActMalformed, RPC::invalidFieldMessage("tx.Account")));
     }
     std::shared_ptr<SLE const> const sle =
         context.app.getOpenLedger().current()->read(keylet::account(*srcAddressID));
@@ -69,14 +69,14 @@ getAutofillSequence(Json::Value const& tx_json, RPC::JsonContext& context)
             << "Failed to find source account "
             << "in current ledger: " << toBase58(*srcAddressID);
 
-        return Unexpected(rpcError(rpcSRC_ACT_NOT_FOUND));
+        return Unexpected(rpcError(RpcSrcActNotFound));
     }
 
     return hasTicketSeq ? 0 : context.app.getTxQ().nextQueuableSeq(sle).value();
 }
 
-static std::optional<Json::Value>
-autofillSignature(Json::Value& sigObject)
+static std::optional<json::Value>
+autofillSignature(json::Value& sigObject)
 {
     if (!sigObject.isMember(jss::SigningPubKey))
     {
@@ -87,14 +87,14 @@ autofillSignature(Json::Value& sigObject)
     if (sigObject.isMember(jss::Signers))
     {
         if (!sigObject[jss::Signers].isArray())
-            return RPC::invalid_field_error("tx.Signers");
+            return RPC::invalidFieldError("tx.Signers");
         // check multisigned signers
         for (unsigned index = 0; index < sigObject[jss::Signers].size(); index++)
         {
             auto& signer = sigObject[jss::Signers][index];
             if (!signer.isObject() || !signer.isMember(jss::Signer) ||
                 !signer[jss::Signer].isObject())
-                return RPC::invalid_field_error("tx.Signers[" + std::to_string(index) + "]");
+                return RPC::invalidFieldError("tx.Signers[" + std::to_string(index) + "]");
 
             if (!signer[jss::Signer].isMember(jss::SigningPubKey))
             {
@@ -110,7 +110,7 @@ autofillSignature(Json::Value& sigObject)
             else if (signer[jss::Signer][jss::TxnSignature] != "")
             {
                 // Transaction must not be signed
-                return rpcError(rpcTX_SIGNED);
+                return rpcError(RpcTxSigned);
             }
         }
     }
@@ -123,15 +123,15 @@ autofillSignature(Json::Value& sigObject)
     else if (sigObject[jss::TxnSignature] != "")
     {
         // Transaction must not be signed
-        return rpcError(rpcTX_SIGNED);
+        return rpcError(RpcTxSigned);
     }
     return std::nullopt;
 }
 
-static std::optional<Json::Value>
-autofillTx(Json::Value& tx_json, RPC::JsonContext& context)
+static std::optional<json::Value>
+autofillTx(json::Value& txJson, RPC::JsonContext& context)
 {
-    if (!tx_json.isMember(jss::Fee))
+    if (!txJson.isMember(jss::Fee))
     {
         // autofill Fee
         // Must happen after all the other autofills happen
@@ -142,100 +142,100 @@ autofillTx(Json::Value& tx_json, RPC::JsonContext& context)
             context.app.getFeeTrack(),
             context.app.getTxQ(),
             context.app,
-            tx_json);
+            txJson);
         if (feeOrError.isMember(jss::error))
             return feeOrError;
-        tx_json[jss::Fee] = feeOrError;
+        txJson[jss::Fee] = feeOrError;
     }
 
-    if (auto error = autofillSignature(tx_json))
+    if (auto error = autofillSignature(txJson))
         return error;
 
-    if (!tx_json.isMember(jss::Sequence))
+    if (!txJson.isMember(jss::Sequence))
     {
-        auto const seq = getAutofillSequence(tx_json, context);
+        auto const seq = getAutofillSequence(txJson, context);
         if (!seq)
             return seq.error();
-        tx_json[sfSequence.jsonName] = *seq;
+        txJson[sfSequence.jsonName] = *seq;
     }
 
-    if (!tx_json.isMember(jss::NetworkID))
+    if (!txJson.isMember(jss::NetworkID))
     {
         auto const networkId = context.app.getNetworkIDService().getNetworkID();
         if (networkId > 1024)
-            tx_json[jss::NetworkID] = to_string(networkId);
+            txJson[jss::NetworkID] = to_string(networkId);
     }
 
     return std::nullopt;
 }
 
-static Json::Value
-getTxJsonFromParams(Json::Value const& params)
+static json::Value
+getTxJsonFromParams(json::Value const& params)
 {
-    Json::Value tx_json;
+    json::Value txJson;
 
     if (params.isMember(jss::tx_blob))
     {
         if (params.isMember(jss::tx_json))
         {
-            return RPC::make_param_error("Can only include one of `tx_blob` and `tx_json`.");
+            return RPC::makeParamError("Can only include one of `tx_blob` and `tx_json`.");
         }
 
-        auto const tx_blob = params[jss::tx_blob];
-        if (!tx_blob.isString())
+        auto const txBlob = params[jss::tx_blob];
+        if (!txBlob.isString())
         {
-            return RPC::invalid_field_error(jss::tx_blob);
+            return RPC::invalidFieldError(jss::tx_blob);
         }
 
-        auto unHexed = strUnHex(tx_blob.asString());
+        auto unHexed = strUnHex(txBlob.asString());
         if (!unHexed || unHexed->empty())
-            return RPC::invalid_field_error(jss::tx_blob);
+            return RPC::invalidFieldError(jss::tx_blob);
 
         try
         {
             SerialIter sitTrans(makeSlice(*unHexed));
-            tx_json = STObject(std::ref(sitTrans), sfGeneric).getJson(JsonOptions::none);
+            txJson = STObject(std::ref(sitTrans), kSF_GENERIC).getJson(JsonOptions::KNone);
         }
         catch (std::runtime_error const&)
         {
-            return RPC::invalid_field_error(jss::tx_blob);
+            return RPC::invalidFieldError(jss::tx_blob);
         }
     }
     else if (params.isMember(jss::tx_json))
     {
-        tx_json = params[jss::tx_json];
-        if (!tx_json.isObject())
+        txJson = params[jss::tx_json];
+        if (!txJson.isObject())
         {
-            return RPC::object_field_error(jss::tx_json);
+            return RPC::objectFieldError(jss::tx_json);
         }
     }
     else
     {
-        return RPC::make_param_error("Neither `tx_blob` nor `tx_json` included.");
+        return RPC::makeParamError("Neither `tx_blob` nor `tx_json` included.");
     }
 
     // basic sanity checks for transaction shape
-    if (!tx_json.isMember(jss::TransactionType))
+    if (!txJson.isMember(jss::TransactionType))
     {
-        return RPC::missing_field_error("tx.TransactionType");
+        return RPC::missingFieldError("tx.TransactionType");
     }
 
-    if (!tx_json.isMember(jss::Account))
+    if (!txJson.isMember(jss::Account))
     {
-        return RPC::missing_field_error("tx.Account");
+        return RPC::missingFieldError("tx.Account");
     }
 
-    return tx_json;
+    return txJson;
 }
 
-static Json::Value
+static json::Value
 simulateTxn(RPC::JsonContext& context, std::shared_ptr<Transaction> transaction)
 {
-    Json::Value jvResult;
+    json::Value jvResult;
     // Process the transaction
     OpenView view = *context.app.getOpenLedger().current();
     auto const result = context.app.getTxQ().apply(
-        context.app, view, transaction->getSTransaction(), tapDRY_RUN, context.j);
+        context.app, view, transaction->getSTransaction(), TapDryRun, context.j);
 
     jvResult[jss::applied] = result.applied;
     jvResult[jss::ledger_index] = view.seq();
@@ -276,7 +276,7 @@ simulateTxn(RPC::JsonContext& context, std::shared_ptr<Transaction> transaction)
         }
         else
         {
-            jvResult[jss::meta] = result.metadata->getJson(JsonOptions::none);
+            jvResult[jss::meta] = result.metadata->getJson(JsonOptions::KNone);
             RPC::insertDeliveredAmount(
                 jvResult[jss::meta], view, transaction->getSTransaction(), *result.metadata);
             RPC::insertNFTSyntheticInJson(
@@ -293,7 +293,7 @@ simulateTxn(RPC::JsonContext& context, std::shared_ptr<Transaction> transaction)
     }
     else
     {
-        jvResult[jss::tx_json] = transaction->getJson(JsonOptions::none);
+        jvResult[jss::tx_json] = transaction->getJson(JsonOptions::KNone);
     }
 
     return jvResult;
@@ -303,37 +303,37 @@ simulateTxn(RPC::JsonContext& context, std::shared_ptr<Transaction> transaction)
 //   tx_blob: <string> XOR tx_json: <object>,
 //   binary: <bool>
 // }
-Json::Value
+json::Value
 doSimulate(RPC::JsonContext& context)
 {
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
 
-    Json::Value tx_json;  // the tx as a JSON
+    json::Value txJson;  // the tx as a JSON
 
     // check validity of `binary` param
     if (context.params.isMember(jss::binary) && !context.params[jss::binary].isBool())
     {
-        return RPC::invalid_field_error(jss::binary);
+        return RPC::invalidFieldError(jss::binary);
     }
 
     for (auto const field : {jss::secret, jss::seed, jss::seed_hex, jss::passphrase})
     {
         if (context.params.isMember(field))
         {
-            return RPC::invalid_field_error(field);
+            return RPC::invalidFieldError(field);
         }
     }
 
     // get JSON equivalent of transaction
-    tx_json = getTxJsonFromParams(context.params);
-    if (tx_json.isMember(jss::error))
-        return tx_json;
+    txJson = getTxJsonFromParams(context.params);
+    if (txJson.isMember(jss::error))
+        return txJson;
 
     // autofill fields if they're not included (e.g. `Fee`, `Sequence`)
-    if (auto error = autofillTx(tx_json, context))
+    if (auto error = autofillTx(txJson, context))
         return *error;
 
-    STParsedJSONObject parsed(std::string(jss::tx_json), tx_json);
+    STParsedJSONObject parsed(std::string(jss::tx_json), txJson);
     if (!parsed.object.has_value())
         return parsed.error;
 
@@ -344,7 +344,7 @@ doSimulate(RPC::JsonContext& context)
     }
     catch (std::exception& e)
     {
-        Json::Value jvResult = Json::objectValue;
+        json::Value jvResult = json::ObjectValue;
         jvResult[jss::error] = "invalidTransaction";
         jvResult[jss::error_exception] = e.what();
         return jvResult;
@@ -352,7 +352,7 @@ doSimulate(RPC::JsonContext& context)
 
     if (stTx->getTxnType() == ttBATCH)
     {
-        return RPC::make_error(rpcNOT_IMPL);
+        return RPC::makeError(RpcNotImpl);
     }
 
     std::string reason;
@@ -365,7 +365,7 @@ doSimulate(RPC::JsonContext& context)
     // LCOV_EXCL_START this is just in case, so xrpld doesn't crash
     catch (std::exception const& e)
     {
-        Json::Value jvResult = Json::objectValue;
+        json::Value jvResult = json::ObjectValue;
         jvResult[jss::error] = "internalSimulate";
         jvResult[jss::error_exception] = e.what();
         return jvResult;
diff --git a/src/xrpld/rpc/handlers/transaction/Submit.cpp b/src/xrpld/rpc/handlers/transaction/Submit.cpp
index 8b54083628..d3ce5c3fc0 100644
--- a/src/xrpld/rpc/handlers/transaction/Submit.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Submit.cpp
@@ -26,12 +26,12 @@
 
 namespace xrpl {
 
-static Expected<NetworkOPs::FailHard, Json::Value>
+static Expected<NetworkOPs::FailHard, json::Value>
 getFailHard(RPC::JsonContext const& context)
 {
     if (context.params.isMember(jss::fail_hard) && !context.params[jss::fail_hard].isBool())
     {
-        return Unexpected(RPC::expected_field_error(jss::fail_hard, "boolean"));
+        return Unexpected(RPC::expectedFieldError(jss::fail_hard, "boolean"));
     }
     return NetworkOPs::doFailHard(
         context.params.isMember(jss::fail_hard) && context.params[jss::fail_hard].asBool());
@@ -41,10 +41,10 @@ getFailHard(RPC::JsonContext const& context)
 //   tx_blob: <string> XOR tx_json: <object>,
 //   secret: <secret>
 // }
-Json::Value
+json::Value
 doSubmit(RPC::JsonContext& context)
 {
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
 
     if (!context.params.isMember(jss::tx_blob))
     {
@@ -53,7 +53,7 @@ doSubmit(RPC::JsonContext& context)
             return failType.error();
 
         if (context.role != Role::ADMIN && !context.app.config().canSign())
-            return RPC::make_error(rpcNOT_SUPPORTED, "Signing is not supported by this server.");
+            return RPC::makeError(RpcNotSupported, "Signing is not supported by this server.");
 
         auto ret = RPC::transactionSubmit(
             context.params,
@@ -73,12 +73,12 @@ doSubmit(RPC::JsonContext& context)
         return ret;
     }
 
-    Json::Value jvResult;
+    json::Value jvResult;
 
     auto ret = strUnHex(context.params[jss::tx_blob].asString());
 
     if (!ret || ret->empty())
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
 
     SerialIter sitTrans(makeSlice(*ret));
 
@@ -141,7 +141,7 @@ doSubmit(RPC::JsonContext& context)
 
     try
     {
-        jvResult[jss::tx_json] = transaction->getJson(JsonOptions::none);
+        jvResult[jss::tx_json] = transaction->getJson(JsonOptions::KNone);
         jvResult[jss::tx_blob] = strHex(transaction->getSTransaction()->getSerializer().peekData());
 
         if (temUNCERTAIN != transaction->getResult())
@@ -166,12 +166,12 @@ doSubmit(RPC::JsonContext& context)
             if (auto currentLedgerState = transaction->getCurrentLedgerState())
             {
                 jvResult[jss::account_sequence_next] =
-                    safe_cast<Json::Value::UInt>(currentLedgerState->accountSeqNext);
+                    safeCast<json::Value::UInt>(currentLedgerState->accountSeqNext);
                 jvResult[jss::account_sequence_available] =
-                    safe_cast<Json::Value::UInt>(currentLedgerState->accountSeqAvail);
+                    safeCast<json::Value::UInt>(currentLedgerState->accountSeqAvail);
                 jvResult[jss::open_ledger_cost] = to_string(currentLedgerState->minFeeRequired);
                 jvResult[jss::validated_ledger_index] =
-                    safe_cast<Json::Value::UInt>(currentLedgerState->validatedLedger);
+                    safeCast<json::Value::UInt>(currentLedgerState->validatedLedger);
             }
         }
 
diff --git a/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
index d121e9a850..80ec0c6702 100644
--- a/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
+++ b/src/xrpld/rpc/handlers/transaction/SubmitMultiSigned.cpp
@@ -12,10 +12,10 @@ namespace xrpl {
 //   SigningAccounts <array>,
 //   tx_json: <object>,
 // }
-Json::Value
+json::Value
 doSubmitMultiSigned(RPC::JsonContext& context)
 {
-    context.loadType = Resource::feeHeavyBurdenRPC;
+    context.loadType = Resource::kFEE_HEAVY_BURDEN_RPC;
     auto const failHard = context.params[jss::fail_hard].asBool();
     auto const failType = NetworkOPs::doFailHard(failHard);
 
diff --git a/src/xrpld/rpc/handlers/transaction/TransactionEntry.cpp b/src/xrpld/rpc/handlers/transaction/TransactionEntry.cpp
index 67fd2504fe..c951053c51 100644
--- a/src/xrpld/rpc/handlers/transaction/TransactionEntry.cpp
+++ b/src/xrpld/rpc/handlers/transaction/TransactionEntry.cpp
@@ -20,11 +20,11 @@ namespace xrpl {
 //
 // XXX In this case, not specify either ledger does not mean ledger current. It
 // means any ledger.
-Json::Value
+json::Value
 doTransactionEntry(RPC::JsonContext& context)
 {
     std::shared_ptr<ReadView const> lpLedger;
-    Json::Value jvResult = RPC::lookupLedger(lpLedger, context);
+    json::Value jvResult = RPC::lookupLedger(lpLedger, context);
 
     if (!lpLedger)
         return jvResult;
@@ -33,7 +33,7 @@ doTransactionEntry(RPC::JsonContext& context)
     {
         jvResult[jss::error] = "fieldNotFoundTransaction";
     }
-    else if (jvResult.get(jss::ledger_hash, Json::nullValue).isNull())
+    else if (jvResult.get(jss::ledger_hash, json::NullValue).isNull())
     {
         // We don't work on ledger current.
 
@@ -60,7 +60,7 @@ doTransactionEntry(RPC::JsonContext& context)
         {
             if (context.apiVersion > 1)
             {
-                jvResult[jss::tx_json] = sttx->getJson(JsonOptions::disable_API_prior_V2);
+                jvResult[jss::tx_json] = sttx->getJson(JsonOptions::KDisableApiPriorV2);
                 jvResult[jss::hash] = to_string(sttx->getTransactionID());
 
                 if (!lpLedger->open())
@@ -76,19 +76,19 @@ doTransactionEntry(RPC::JsonContext& context)
                 {
                     jvResult[jss::ledger_index] = lpLedger->seq();
                     if (auto closeTime = context.ledgerMaster.getCloseTimeBySeq(lpLedger->seq()))
-                        jvResult[jss::close_time_iso] = to_string_iso(*closeTime);
+                        jvResult[jss::close_time_iso] = toStringIso(*closeTime);
                 }
             }
             else
             {
-                jvResult[jss::tx_json] = sttx->getJson(JsonOptions::none);
+                jvResult[jss::tx_json] = sttx->getJson(JsonOptions::KNone);
             }
 
             RPC::insertDeliverMax(jvResult[jss::tx_json], sttx->getTxnType(), context.apiVersion);
 
-            auto const json_meta = (context.apiVersion > 1 ? jss::meta : jss::metadata);
+            auto const jsonMeta = (context.apiVersion > 1 ? jss::meta : jss::metadata);
             if (stobj)
-                jvResult[json_meta] = stobj->getJson(JsonOptions::none);
+                jvResult[jsonMeta] = stobj->getJson(JsonOptions::KNone);
             // 'accounts'
             // 'engine_...'
             // 'ledger_...'
diff --git a/src/xrpld/rpc/handlers/transaction/Tx.cpp b/src/xrpld/rpc/handlers/transaction/Tx.cpp
index 530b45e225..cddda6d2c2 100644
--- a/src/xrpld/rpc/handlers/transaction/Tx.cpp
+++ b/src/xrpld/rpc/handlers/transaction/Tx.cpp
@@ -77,18 +77,18 @@ doTxHelp(RPC::Context& context, TxArgs args)
 
     if (args.ledgerRange)
     {
-        constexpr uint16_t MAX_RANGE = 1000;
+        constexpr uint16_t kMAX_RANGE = 1000;
 
         if (args.ledgerRange->second < args.ledgerRange->first)
-            return {result, rpcINVALID_LGR_RANGE};
+            return {result, RpcInvalidLgrRange};
 
-        if (args.ledgerRange->second - args.ledgerRange->first > MAX_RANGE)
-            return {result, rpcEXCESSIVE_LGR_RANGE};
+        if (args.ledgerRange->second - args.ledgerRange->first > kMAX_RANGE)
+            return {result, RpcExcessiveLgrRange};
 
         range = ClosedInterval<uint32_t>(args.ledgerRange->first, args.ledgerRange->second);
     }
 
-    auto ec{rpcSUCCESS};
+    auto ec{RpcSuccess};
 
     using TxPair = std::pair<std::shared_ptr<Transaction>, std::shared_ptr<TxMeta>>;
 
@@ -105,7 +105,7 @@ doTxHelp(RPC::Context& context, TxArgs args)
     }
 
     if (!args.hash)
-        return {result, rpcTXN_NOT_FOUND};
+        return {result, RpcTxnNotFound};
 
     if (args.ledgerRange)
     {
@@ -119,25 +119,25 @@ doTxHelp(RPC::Context& context, TxArgs args)
     if (auto e = std::get_if<TxSearched>(&v))
     {
         result.searchedAll = *e;
-        return {result, rpcTXN_NOT_FOUND};
+        return {result, RpcTxnNotFound};
     }
 
     auto [txn, meta] = std::get<TxPair>(v);
 
-    if (ec == rpcDB_DESERIALIZATION)
+    if (ec == RpcDbDeserialization)
     {
         return {result, ec};
     }
     if (!txn)
     {
-        return {result, rpcTXN_NOT_FOUND};
+        return {result, RpcTxnNotFound};
     }
 
     // populate transaction data
     result.txn = txn;
     if (txn->getLedger() == 0)
     {
-        return {result, rpcSUCCESS};
+        return {result, RpcSuccess};
     }
 
     std::shared_ptr<Ledger const> const ledger =
@@ -173,24 +173,24 @@ doTxHelp(RPC::Context& context, TxArgs args)
         }
     }
 
-    return {result, rpcSUCCESS};
+    return {result, RpcSuccess};
 }
 
-Json::Value
+json::Value
 populateJsonResponse(
     std::pair<TxResult, RPC::Status> const& res,
     TxArgs const& args,
     RPC::JsonContext const& context)
 {
-    Json::Value response;
+    json::Value response;
     RPC::Status const& error = res.second;
     TxResult const& result = res.first;
     // handle errors
-    if (error.toErrorCode() != rpcSUCCESS)
+    if (error.toErrorCode() != RpcSuccess)
     {
-        if (error.toErrorCode() == rpcTXN_NOT_FOUND && result.searchedAll != TxSearched::Unknown)
+        if (error.toErrorCode() == RpcTxnNotFound && result.searchedAll != TxSearched::Unknown)
         {
-            response = Json::Value(Json::objectValue);
+            response = json::Value(json::ObjectValue);
             response[jss::searched_all] = (result.searchedAll == TxSearched::All);
             error.inject(response);
         }
@@ -205,15 +205,15 @@ populateJsonResponse(
         auto const& sttx = result.txn->getSTransaction();
         if (context.apiVersion > 1)
         {
-            constexpr auto optionsJson =
-                JsonOptions::include_date | JsonOptions::disable_API_prior_V2;
+            constexpr auto kOPTIONS_JSON =
+                JsonOptions::KIncludeDate | JsonOptions::KDisableApiPriorV2;
             if (args.binary)
             {
-                response[jss::tx_blob] = result.txn->getJson(optionsJson, true);
+                response[jss::tx_blob] = result.txn->getJson(kOPTIONS_JSON, true);
             }
             else
             {
-                response[jss::tx_json] = result.txn->getJson(optionsJson);
+                response[jss::tx_json] = result.txn->getJson(kOPTIONS_JSON);
                 RPC::insertDeliverMax(
                     response[jss::tx_json], sttx->getTxnType(), context.apiVersion);
             }
@@ -228,12 +228,12 @@ populateJsonResponse(
             {
                 response[jss::ledger_index] = result.txn->getLedger();
                 if (result.closeTime)
-                    response[jss::close_time_iso] = to_string_iso(*result.closeTime);
+                    response[jss::close_time_iso] = toStringIso(*result.closeTime);
             }
         }
         else
         {
-            response = result.txn->getJson(JsonOptions::include_date, args.binary);
+            response = result.txn->getJson(JsonOptions::KIncludeDate, args.binary);
             if (!args.binary)
                 RPC::insertDeliverMax(response, sttx->getTxnType(), context.apiVersion);
         }
@@ -242,8 +242,8 @@ populateJsonResponse(
         if (auto blob = std::get_if<Blob>(&result.meta))
         {
             XRPL_ASSERT(args.binary, "xrpl::populateJsonResponse : binary is set");
-            auto json_meta = (context.apiVersion > 1 ? jss::meta_blob : jss::meta);
-            response[json_meta] = strHex(makeSlice(*blob));
+            auto jsonMeta = (context.apiVersion > 1 ? jss::meta_blob : jss::meta);
+            response[jsonMeta] = strHex(makeSlice(*blob));
         }
         // populate meta data
         else if (auto m = std::get_if<std::shared_ptr<TxMeta>>(&result.meta))
@@ -251,7 +251,7 @@ populateJsonResponse(
             auto& meta = *m;
             if (meta)
             {
-                response[jss::meta] = meta->getJson(JsonOptions::none);
+                response[jss::meta] = meta->getJson(JsonOptions::KNone);
                 insertDeliveredAmount(response[jss::meta], context, result.txn, *meta);
                 RPC::insertNFTSyntheticInJson(response, sttx, *meta);
                 RPC::insertMPTokenIssuanceID(response[jss::meta], sttx, *meta);
@@ -265,11 +265,11 @@ populateJsonResponse(
     return response;
 }
 
-Json::Value
+json::Value
 doTxJson(RPC::JsonContext& context)
 {
     if (!context.app.config().useTxTables())
-        return rpcError(rpcNOT_ENABLED);
+        return rpcError(RpcNotEnabled);
 
     // Deserialize and validate JSON arguments
 
@@ -278,21 +278,21 @@ doTxJson(RPC::JsonContext& context)
     if (context.params.isMember(jss::transaction) && context.params.isMember(jss::ctid))
     {
         // specifying both is ambiguous
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     if (context.params.isMember(jss::transaction))
     {
         uint256 hash;
         if (!hash.parseHex(context.params[jss::transaction].asString()))
-            return rpcError(rpcNOT_IMPL);
+            return rpcError(RpcNotImpl);
         args.hash = hash;
     }
     else if (context.params.isMember(jss::ctid))
     {
         auto ctid = RPC::decodeCTID(context.params[jss::ctid].asString());
         if (!ctid)
-            return rpcError(rpcINVALID_PARAMS);
+            return rpcError(RpcInvalidParams);
 
         auto const [lgr_seq, txn_idx, net_id] = *ctid;
         if (net_id != context.app.getNetworkIDService().getNetworkID())
@@ -301,13 +301,13 @@ doTxJson(RPC::JsonContext& context)
             out << "Wrong network. You should submit this request to a node "
                    "running on NetworkID: "
                 << net_id;
-            return RPC::make_error(rpcWRONG_NETWORK, out.str());
+            return RPC::makeError(RpcWrongNetwork, out.str());
         }
         args.ctid = {lgr_seq, txn_idx};
     }
     else
     {
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
     }
 
     args.binary = context.params.isMember(jss::binary) && context.params[jss::binary].asBool();
@@ -322,7 +322,7 @@ doTxJson(RPC::JsonContext& context)
         catch (...)
         {
             // One of the calls to `asUInt ()` failed.
-            return rpcError(rpcINVALID_LGR_RANGE);
+            return rpcError(RpcInvalidLgrRange);
         }
     }
 
diff --git a/src/xrpld/rpc/handlers/transaction/TxHistory.cpp b/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
index 1669d289b4..b7333d0115 100644
--- a/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
+++ b/src/xrpld/rpc/handlers/transaction/TxHistory.cpp
@@ -15,33 +15,33 @@ namespace xrpl {
 // {
 //   start: <index>
 // }
-Json::Value
+json::Value
 doTxHistory(RPC::JsonContext& context)
 {
     if (!context.app.config().useTxTables())
-        return rpcError(rpcNOT_ENABLED);
+        return rpcError(RpcNotEnabled);
 
-    context.loadType = Resource::feeMediumBurdenRPC;
+    context.loadType = Resource::kFEE_MEDIUM_BURDEN_RPC;
 
     if (!context.params.isMember(jss::start))
-        return rpcError(rpcINVALID_PARAMS);
+        return rpcError(RpcInvalidParams);
 
     unsigned int const startIndex = context.params[jss::start].asUInt();
 
     if ((startIndex > 10000) && (!isUnlimited(context.role)))
-        return rpcError(rpcNO_PERMISSION);
+        return rpcError(RpcNoPermission);
 
     auto trans = context.app.getRelationalDatabase().getTxHistory(startIndex);
 
-    Json::Value obj;
-    Json::Value& txs = obj[jss::txs];
+    json::Value obj;
+    json::Value& txs = obj[jss::txs];
     obj[jss::index] = startIndex;
 
     for (auto const& t : trans)
     {
-        Json::Value tx_json = t->getJson(JsonOptions::none);
-        RPC::insertDeliverMax(tx_json, t->getSTransaction()->getTxnType(), context.apiVersion);
-        txs.append(tx_json);
+        json::Value txJson = t->getJson(JsonOptions::KNone);
+        RPC::insertDeliverMax(txJson, t->getSTransaction()->getTxnType(), context.apiVersion);
+        txs.append(txJson);
     }
 
     return obj;
diff --git a/src/xrpld/rpc/handlers/transaction/TxReduceRelay.cpp b/src/xrpld/rpc/handlers/transaction/TxReduceRelay.cpp
index f24f0862ef..edc4eff057 100644
--- a/src/xrpld/rpc/handlers/transaction/TxReduceRelay.cpp
+++ b/src/xrpld/rpc/handlers/transaction/TxReduceRelay.cpp
@@ -6,7 +6,7 @@
 
 namespace xrpl {
 
-Json::Value
+json::Value
 doTxReduceRelay(RPC::JsonContext& context)
 {
     return context.app.getOverlay().txMetrics();
diff --git a/src/xrpld/rpc/handlers/utility/Ping.cpp b/src/xrpld/rpc/handlers/utility/Ping.cpp
index 695d90b964..428b16ddd4 100644
--- a/src/xrpld/rpc/handlers/utility/Ping.cpp
+++ b/src/xrpld/rpc/handlers/utility/Ping.cpp
@@ -10,10 +10,10 @@ namespace RPC {
 struct JsonContext;
 }  // namespace RPC
 
-Json::Value
+json::Value
 doPing(RPC::JsonContext& context)
 {
-    Json::Value ret(Json::objectValue);
+    json::Value ret(json::ObjectValue);
     switch (context.role)
     {
         case Role::ADMIN:
diff --git a/src/xrpld/rpc/handlers/utility/Random.cpp b/src/xrpld/rpc/handlers/utility/Random.cpp
index e17a8928bb..56df442cf1 100644
--- a/src/xrpld/rpc/handlers/utility/Random.cpp
+++ b/src/xrpld/rpc/handlers/utility/Random.cpp
@@ -18,7 +18,7 @@ struct JsonContext;
 // {
 //   random: <uint256>
 // }
-Json::Value
+json::Value
 doRandom(RPC::JsonContext& context)
 {
     // TODO(tom): the try/catch is almost certainly redundant, we catch at the
@@ -26,15 +26,15 @@ doRandom(RPC::JsonContext& context)
     try
     {
         uint256 rand;
-        beast::rngfill(rand.begin(), rand.size(), crypto_prng());
+        beast::rngfill(rand.begin(), rand.size(), cryptoPrng());
 
-        Json::Value jvResult;
+        json::Value jvResult;
         jvResult[jss::random] = to_string(rand);
         return jvResult;
     }
     catch (std::exception const&)
     {
-        return rpcError(rpcINTERNAL);  // LCOV_EXCL_LINE
+        return rpcError(RpcInternal);  // LCOV_EXCL_LINE
     }
 }
 
diff --git a/src/xrpld/rpc/json_body.h b/src/xrpld/rpc/json_body.h
index 2e9e774992..9f881cacbc 100644
--- a/src/xrpld/rpc/json_body.h
+++ b/src/xrpld/rpc/json_body.h
@@ -9,13 +9,13 @@
 namespace xrpl {
 
 /// Body that holds JSON
-struct json_body
+struct JsonBody
 {
-    explicit json_body() = default;
+    explicit JsonBody() = default;
 
-    using value_type = Json::Value;
+    using value_type = json::Value;
 
-    class reader
+    class reader  // NOLINT(readability-identifier-naming) -- Boost.Beast body concept name
     {
         using dynamic_buffer_type = boost::beast::multi_buffer;
 
@@ -26,8 +26,8 @@ struct json_body
 
         using is_deferred = std::false_type;
 
-        template <bool isRequest, class Fields>
-        explicit reader(boost::beast::http::message<isRequest, json_body, Fields> const& m)
+        template <bool IsRequest, class Fields>
+        explicit reader(boost::beast::http::message<IsRequest, JsonBody, Fields> const& m)
         {
             stream(m.body, [&](void const* data, std::size_t n) {
                 buffer_.commit(
@@ -54,16 +54,16 @@ struct json_body
         }
     };
 
-    class writer
+    class writer  // NOLINT(readability-identifier-naming) -- Boost.Beast body concept name
     {
         std::string body_string_;
 
     public:
         using const_buffers_type = boost::asio::const_buffer;
 
-        template <bool isRequest, class Fields>
+        template <bool IsRequest, class Fields>
         explicit writer(
-            boost::beast::http::header<isRequest, Fields> const& fields,
+            boost::beast::http::header<IsRequest, Fields> const& fields,
             value_type const& value)
             : body_string_(to_string(value))
         {
diff --git a/src/xrpld/shamap/NodeFamily.cpp b/src/xrpld/shamap/NodeFamily.cpp
index bf1b598620..aab36b7ca3 100644
--- a/src/xrpld/shamap/NodeFamily.cpp
+++ b/src/xrpld/shamap/NodeFamily.cpp
@@ -30,13 +30,13 @@ NodeFamily::NodeFamily(Application& app, CollectorManager& cm)
               stopwatch(),
               app.getJournal("NodeFamilyFulLBelowCache"),
               cm.collector(),
-              fullBelowTargetSize,
-              fullBelowExpiration))
+              kFULL_BELOW_TARGET_SIZE,
+              kFULL_BELOW_EXPIRATION))
     , tnCache_(
           std::make_shared<TreeNodeCache>(
               "Node family tree node cache",
-              app.config().getValueFor(SizedItem::treeCacheSize),
-              std::chrono::seconds(app.config().getValueFor(SizedItem::treeCacheAge)),
+              app.config().getValueFor(SizedItem::TreeCacheSize),
+              std::chrono::seconds(app.config().getValueFor(SizedItem::TreeCacheAge)),
               stopwatch(),
               j_))
 {